From f51c9ed2abe5c68211bb3736be5f70b1fe2c9ec0 Mon Sep 17 00:00:00 2001 From: M.Gergo Date: Fri, 8 Mar 2019 21:20:34 +0100 Subject: további rendrakás --- mayor-orig/www/include/alert/base.php | 38 - mayor-orig/www/include/alert/hu_HU/base.php | 52 - mayor-orig/www/include/alert/hu_HU/file.php | 9 - mayor-orig/www/include/alert/hu_HU/ldap.php | 11 - mayor-orig/www/include/alert/hu_HU/module-auth.php | 11 - .../www/include/alert/hu_HU/module-naplo.php | 70 - .../www/include/alert/hu_HU/module-password.php | 18 - .../www/include/alert/hu_HU/module-session.php | 10 - mayor-orig/www/include/backend/ads/auth/login.php | 358 -- mayor-orig/www/include/backend/ads/base/attrs.php | 160 - .../backend/ads/password/changePassword.php | 165 - .../include/backend/ads/session/accountInfo.php | 416 -- .../www/include/backend/ads/session/base.php | 188 - .../include/backend/ads/session/createAccount.php | 157 - .../include/backend/ads/session/createGroup.php | 82 - .../backend/ads/session/search/searchAccount.php | 277 - mayor-orig/www/include/backend/file/auth/login.php | 121 - .../www/include/backend/file/session/base.php | 6 - .../www/include/backend/ldap-ng/auth/login.php | 163 - .../www/include/backend/ldap-ng/base/attrs.php | 146 - .../backend/ldap-ng/password/changePassword.php | 161 - .../backend/ldap-ng/session/accountInfo.php | 401 -- .../www/include/backend/ldap-ng/session/base.php | 184 - .../backend/ldap-ng/session/createAccount.php | 157 - .../backend/ldap-ng/session/createGroup.php | 82 - .../ldap-ng/session/search/searchAccount.php | 271 - mayor-orig/www/include/backend/ldap/auth/login.php | 144 - mayor-orig/www/include/backend/ldap/base/attrs.php | 120 - .../www/include/backend/ldap/base/attrs.php.orig | 175 - mayor-orig/www/include/backend/ldap/base/str.php | 53 - .../backend/ldap/password/changePassword.php | 102 - .../include/backend/ldap/session/accountInfo.php | 401 -- .../www/include/backend/ldap/session/base.php | 255 - .../include/backend/ldap/session/createAccount.php | 204 - .../include/backend/ldap/session/createGroup.php | 103 - .../backend/ldap/session/search/searchAccount.php | 311 -- .../www/include/backend/ldapng/auth/login.php | 163 - .../www/include/backend/ldapng/base/attrs.php | 137 - .../backend/ldapng/password/changePassword.php | 160 - .../include/backend/ldapng/session/accountInfo.php | 399 -- .../www/include/backend/ldapng/session/base.php | 190 - .../backend/ldapng/session/createAccount.php | 157 - .../include/backend/ldapng/session/createGroup.php | 82 - .../ldapng/session/search/searchAccount.php | 271 - .../www/include/backend/mysql/auth/login.php | 144 - .../www/include/backend/mysql/base/attrs.php | 48 - .../backend/mysql/password/changePassword.php | 75 - .../include/backend/mysql/session/accountInfo.php | 258 - .../www/include/backend/mysql/session/base.php | 52 - .../backend/mysql/session/createAccount.php | 106 - .../include/backend/mysql/session/createGroup.php | 37 - .../backend/mysql/session/search/searchAccount.php | 169 - mayor-orig/www/include/base/base.php | 233 - mayor-orig/www/include/base/cache.php | 33 - mayor-orig/www/include/base/config.php | 62 - mayor-orig/www/include/base/error.php | 44 - mayor-orig/www/include/base/log.php | 33 - mayor-orig/www/include/base/login.php | 139 - mayor-orig/www/include/base/mysql.php | 396 -- mayor-orig/www/include/base/rights.php | 397 -- mayor-orig/www/include/base/str.php | 230 - mayor-orig/www/include/base/var.php | 134 - mayor-orig/www/include/menu/base.php | 107 - mayor-orig/www/include/menu/parent/hu_HU/base.php | 44 - .../www/include/menu/parent/hu_HU/module-naplo.php | 76 - .../include/menu/parent/hu_HU/module-portal.php | 11 - mayor-orig/www/include/menu/private/hu_HU/base.php | 67 - .../include/menu/private/hu_HU/module-naplo.php | 616 --- .../include/menu/private/hu_HU/module-portal.php | 43 - mayor-orig/www/include/menu/public/hu_HU/base.php | 34 - .../www/include/menu/public/hu_HU/module-naplo.php | 13 - .../include/menu/public/hu_HU/module-portal.php | 8 - .../www/include/modules/auth/base/forgotten.php | 53 - mayor-orig/www/include/modules/auth/base/login.php | 37 - mayor-orig/www/include/modules/auth/base/token.php | 116 - .../www/include/modules/naplo/admin/azonositok.php | 14 - .../www/include/modules/naplo/admin/checksql.php | 98 - .../include/modules/naplo/admin/intezmenyek.php | 117 - .../include/modules/naplo/admin/szemeszterek.php | 48 - .../modules/naplo/admin/szuloiAzonositok.php | 14 - .../www/include/modules/naplo/admin/tanevek.php | 390 -- .../www/include/modules/naplo/admin/tankorok.php | 133 - mayor-orig/www/include/modules/naplo/base/base.php | 298 - mayor-orig/www/include/modules/naplo/base/log.php | 40 - .../www/include/modules/naplo/base/rights.php | 469 -- mayor-orig/www/include/modules/naplo/base/tool.php | 590 -- .../www/include/modules/naplo/base/update.php | 86 - .../www/include/modules/naplo/base/zcheck.php | 100 - .../modules/naplo/bejegyzesek/bejegyzesTipus.php | 87 - .../modules/naplo/bejegyzesek/bejegyzesek.php | 74 - .../www/include/modules/naplo/diakValaszto.php | 10 - .../modules/naplo/ertekeles/kerdoivBetoltes.php | 81 - .../include/modules/naplo/ertekeles/osszesites.php | 57 - .../include/modules/naplo/export/bizonyitvany.php | 88 - .../include/modules/naplo/export/diakExport.php | 144 - .../modules/naplo/export/kirBizonyitvanyExport.php | 24 - .../www/include/modules/naplo/export/kreta.php | 23 - .../www/include/modules/naplo/export/sulix.php | 129 - .../modules/naplo/export/tanarOsztalyOraszam.php | 13 - .../modules/naplo/export/tantargyFelosztas.php | 72 - .../include/modules/naplo/haladasi/elmaradas.php | 27 - .../include/modules/naplo/haladasi/elszamolas.php | 44 - .../include/modules/naplo/haladasi/haladasi.php | 155 - .../modules/naplo/haladasi/helyettesites.php | 945 ---- .../modules/naplo/haladasi/oralatogatas.php | 30 - .../include/modules/naplo/haladasi/osszevonas.php | 38 - .../include/modules/naplo/haladasi/pluszora.php | 55 - .../include/modules/naplo/haladasi/specialis.php | 167 - .../www/include/modules/naplo/haladasi/stat.php | 103 - .../modules/naplo/haladasi/teremModositas.php | 30 - .../www/include/modules/naplo/hianyzas/diak.php | 119 - .../www/include/modules/naplo/hianyzas/oktstat.php | 155 - .../www/include/modules/naplo/hianyzas/ora.php | 8 - .../www/include/modules/naplo/hianyzas/osztaly.php | 232 - .../include/modules/naplo/hibabejelento/admin.php | 28 - .../modules/naplo/hibabejelento/hibabejelento.php | 27 - .../include/modules/naplo/intezmeny/diakExport.php | 137 - .../modules/naplo/intezmeny/diakFelmentes.php | 6 - .../modules/naplo/intezmeny/diakStatusz.php | 12 - .../include/modules/naplo/intezmeny/diakSzulo.php | 98 - .../naplo/intezmeny/diakTankorJelentkezes.php | 97 - .../www/include/modules/naplo/intezmeny/kepzes.php | 64 - .../modules/naplo/intezmeny/kepzesOraterv.php | 92 - .../modules/naplo/intezmeny/munkakozosseg.php | 288 - .../include/modules/naplo/intezmeny/osztaly.php | 474 -- .../www/include/modules/naplo/intezmeny/tanar.php | 54 - .../www/include/modules/naplo/intezmeny/tankor.php | 202 - .../modules/naplo/intezmeny/tankorSzemeszter.php | 200 - .../modules/naplo/intezmeny/tankorTanar.php | 292 - .../naplo/intezmeny/tankorTanarHozzarendeles.php | 224 - .../www/include/modules/naplo/intezmeny/terem.php | 25 - .../modules/naplo/intezmeny/tovabbkepzes.php | 159 - .../www/include/modules/naplo/intezmeny/valtas.php | 9 - .../include/modules/naplo/koszi/esemenyAdmin.php | 86 - .../www/include/modules/naplo/koszi/koszi.php | 40 - .../www/include/modules/naplo/koszi/kosziAdmin.php | 82 - mayor-orig/www/include/modules/naplo/naplo.php | 12 - .../modules/naplo/nyomtatas/beiskolazasiTerv.php | 64 - .../naplo/nyomtatas/bizonyitvanyNyomtatas.php | 164 - .../modules/naplo/nyomtatas/diakAdatlap.php | 22 - .../naplo/nyomtatas/diakTankorJelentkezes.php | 336 -- .../include/modules/naplo/nyomtatas/ertesito.php | 101 - .../modules/naplo/nyomtatas/haladasinaplo.php | 139 - .../naplo/nyomtatas/helyettesitesinaplo.php | 148 - .../include/modules/naplo/nyomtatas/nyomtatas.php | 89 - .../modules/naplo/nyomtatas/osztalyozonaplo.php | 24 - .../naplo/nyomtatas/sniEvVegiJegyzokonyv.php | 48 - .../modules/naplo/nyomtatas/sniHaviJegyzokonyv.php | 41 - .../modules/naplo/nyomtatas/szovegesErtekeles.php | 131 - .../naplo/nyomtatas/tankorNaplohozRendeles.php | 48 - .../www/include/modules/naplo/nyomtatas/tex.php | 1285 ----- .../include/modules/naplo/nyomtatas/torzslap.php | 199 - .../naplo/nyomtatas/tovabbkepzesHatarozat.php | 60 - .../include/modules/naplo/nyomtatas/zaradekok.php | 63 - .../include/modules/naplo/orarend/ascExport.php | 437 -- .../naplo/orarend/convert-Microsoft Excel XML.php | 147 - .../modules/naplo/orarend/convert-RoPaSoft.php | 80 - .../convert-aSc Timetables Ctrl-Shift-E.php | 112 - ...s XML (tank\303\266r n\303\251lk\303\274l).php" | 188 - .../orarend/convert-aSc Timetables XML update.php | 241 - .../naplo/orarend/convert-aSc Timetables XML.php | 217 - .../include/modules/naplo/orarend/convert-csv.php | 79 - .../modules/naplo/orarend/convert-default.php | 33 - .../orarend/convert-eKr\303\251ta import.php" | 128 - .../modules/naplo/orarend/orarendBetolto.php | 82 - .../modules/naplo/orarend/orarendEllenorzes.php | 70 - .../modules/naplo/orarend/orarendModosito.php | 309 -- .../modules/naplo/orarend/orarendTankor.php | 33 - .../naplo/orarend/orarendTeremModositas.php | 3 - .../include/modules/naplo/orarend/tanarOrarend.php | 222 - .../modules/naplo/osztalyozo/bizonyitvany.php | 134 - .../www/include/modules/naplo/osztalyozo/diak.php | 106 - .../include/modules/naplo/osztalyozo/dolgozat.php | 116 - .../www/include/modules/naplo/osztalyozo/stat.php | 247 - .../modules/naplo/osztalyozo/szempontRendszer.php | 56 - .../modules/naplo/osztalyozo/szovegesErtekeles.php | 67 - .../include/modules/naplo/osztalyozo/tankor.php | 205 - .../modules/naplo/osztalyozo/targySorrend.php | 55 - .../include/modules/naplo/osztalyozo/vizsga.php | 138 - .../www/include/modules/naplo/share/bejegyzes.php | 65 - .../modules/naplo/share/bejegyzesModifier.php | 40 - .../www/include/modules/naplo/share/bontas.php | 72 - .../www/include/modules/naplo/share/diak.php | 647 --- .../include/modules/naplo/share/diakModifier.php | 344 -- .../www/include/modules/naplo/share/dolgozat.php | 154 - .../www/include/modules/naplo/share/ertekeles.php | 60 - .../www/include/modules/naplo/share/esemeny.php | 216 - .../www/include/modules/naplo/share/file.php | 662 --- .../include/modules/naplo/share/helyettesites.php | 42 - .../modules/naplo/share/helyettesitesModifier.php | 117 - .../www/include/modules/naplo/share/hetes.php | 48 - .../www/include/modules/naplo/share/hianyzas.php | 541 -- .../modules/naplo/share/hianyzasModifier.php | 363 -- .../www/include/modules/naplo/share/hirnok.php | 357 -- .../include/modules/naplo/share/intezmenyek.php | 134 - .../www/include/modules/naplo/share/jegy.php | 73 - .../include/modules/naplo/share/jegyModifier.php | 68 - .../www/include/modules/naplo/share/jegyzet.php | 216 - .../www/include/modules/naplo/share/kepesites.php | 103 - .../www/include/modules/naplo/share/kepzes.php | 173 - .../www/include/modules/naplo/share/kerdoiv.php | 127 - .../www/include/modules/naplo/share/kerelem.php | 136 - .../www/include/modules/naplo/share/kereso.php | 56 - .../www/include/modules/naplo/share/koszi.php | 141 - .../include/modules/naplo/share/munkakozosseg.php | 84 - .../www/include/modules/naplo/share/mysql.php | 184 - mayor-orig/www/include/modules/naplo/share/nap.php | 332 -- mayor-orig/www/include/modules/naplo/share/ora.php | 625 --- .../include/modules/naplo/share/oraModifier.php | 148 - .../www/include/modules/naplo/share/orarend.php | 422 -- .../www/include/modules/naplo/share/osztaly.php | 735 --- .../modules/naplo/share/osztalyModifier.php | 313 -- .../include/modules/naplo/share/osztalyzatok.php | 342 -- mayor-orig/www/include/modules/naplo/share/rpc.php | 29 - mayor-orig/www/include/modules/naplo/share/sni.php | 54 - .../www/include/modules/naplo/share/szemeszter.php | 176 - .../modules/naplo/share/szovegesErtekeles.php | 206 - .../www/include/modules/naplo/share/szulo.php | 76 - .../www/include/modules/naplo/share/tanar.php | 194 - .../include/modules/naplo/share/tanarModifier.php | 14 - .../www/include/modules/naplo/share/tankor.php | 1180 ---- .../include/modules/naplo/share/tankorBlokk.php | 83 - .../modules/naplo/share/tankorDiakModifier.php | 518 -- .../include/modules/naplo/share/tankorModifier.php | 498 -- .../www/include/modules/naplo/share/tanmenet.php | 208 - .../www/include/modules/naplo/share/targy.php | 432 -- .../www/include/modules/naplo/share/terem.php | 151 - .../www/include/modules/naplo/share/verseny.php | 20 - .../www/include/modules/naplo/share/vizsga.php | 41 - .../www/include/modules/naplo/share/zaradek.php | 543 -- .../modules/naplo/share/zaroJegyModifier.php | 156 - .../www/include/modules/naplo/sni/diakAllapot.php | 91 - .../include/modules/naplo/sni/fejlesztesiTerv.php | 45 - .../modules/naplo/sni/tantargyiFeljegyzesek.php | 26 - .../include/modules/naplo/stat/lemorzsolodas.php | 223 - .../modules/naplo/stat/tantargyFelosztas.php | 236 - .../include/modules/naplo/tanev/checkStatus.php | 33 - .../www/include/modules/naplo/tanev/fogadoOra.php | 142 - .../www/include/modules/naplo/tanev/munkaterv.php | 152 - .../include/modules/naplo/tanev/tankorBlokk.php | 277 - .../include/modules/naplo/tanev/tankorCsoport.php | 164 - .../include/modules/naplo/tanev/targyBontas.php | 240 - .../include/modules/naplo/tanev/targyOraszam.php | 28 - .../modules/naplo/tanev/vegzosOrarendLezaras.php | 33 - .../www/include/modules/naplo/uzeno/uzeno.php | 236 - .../modules/password/base/changePassword.php | 13 - .../www/include/modules/portal/base/rights.php | 10 - .../www/include/modules/portal/hirek/egyhir.php | 47 - .../modules/portal/kerdoiv/kerdoivAdmin.php | 32 - .../www/include/modules/portal/share/hirek.php | 51 - .../www/include/modules/portal/share/kerdoiv.php | 45 - .../www/include/modules/portal/share/nevnap.php | 8 - .../www/include/modules/session/accountInfo.php | 94 - .../www/include/modules/session/base/base.php | 19 - .../www/include/modules/session/createAccount.php | 19 - .../www/include/modules/session/createGroup.php | 16 - .../www/include/modules/session/download.php | 108 - .../www/include/modules/session/groupInfo.php | 38 - .../modules/session/search/searchAccount.php | 37 - .../include/modules/session/search/searchGroup.php | 34 - .../www/include/modules/session/sessionAdmin.php | 24 - mayor-orig/www/include/share/auth/base.php | 118 - mayor-orig/www/include/share/date/names.php | 32 - .../share/facebook/Authentication/AccessToken.php | 160 - .../Authentication/AccessTokenMetadata.php | 390 -- .../share/facebook/Authentication/OAuth2Client.php | 292 - .../Exceptions/FacebookAuthenticationException.php | 33 - .../Exceptions/FacebookAuthorizationException.php | 33 - .../Exceptions/FacebookClientException.php | 33 - .../facebook/Exceptions/FacebookOtherException.php | 33 - .../Exceptions/FacebookResponseException.php | 216 - .../FacebookResumableUploadException.php | 33 - .../facebook/Exceptions/FacebookSDKException.php | 33 - .../Exceptions/FacebookServerException.php | 33 - .../Exceptions/FacebookThrottleException.php | 33 - mayor-orig/www/include/share/facebook/Facebook.php | 635 --- .../www/include/share/facebook/FacebookApp.php | 110 - .../share/facebook/FacebookBatchRequest.php | 322 -- .../share/facebook/FacebookBatchResponse.php | 174 - .../www/include/share/facebook/FacebookClient.php | 250 - .../www/include/share/facebook/FacebookRequest.php | 534 -- .../include/share/facebook/FacebookResponse.php | 410 -- .../share/facebook/FileUpload/FacebookFile.php | 169 - .../FileUpload/FacebookResumableUploader.php | 167 - .../facebook/FileUpload/FacebookTransferChunk.php | 133 - .../share/facebook/FileUpload/FacebookVideo.php | 33 - .../share/facebook/FileUpload/Mimetypes.php | 988 ---- .../include/share/facebook/GraphNodes/Birthday.php | 85 - .../share/facebook/GraphNodes/Collection.php | 242 - .../share/facebook/GraphNodes/GraphAchievement.php | 112 - .../share/facebook/GraphNodes/GraphAlbum.php | 183 - .../share/facebook/GraphNodes/GraphApplication.php | 43 - .../share/facebook/GraphNodes/GraphCoverPhoto.php | 72 - .../share/facebook/GraphNodes/GraphEdge.php | 252 - .../share/facebook/GraphNodes/GraphEvent.php | 242 - .../share/facebook/GraphNodes/GraphGroup.php | 170 - .../share/facebook/GraphNodes/GraphList.php | 36 - .../share/facebook/GraphNodes/GraphLocation.php | 102 - .../share/facebook/GraphNodes/GraphNode.php | 198 - .../share/facebook/GraphNodes/GraphNodeFactory.php | 392 -- .../share/facebook/GraphNodes/GraphObject.php | 36 - .../facebook/GraphNodes/GraphObjectFactory.php | 88 - .../share/facebook/GraphNodes/GraphPage.php | 157 - .../share/facebook/GraphNodes/GraphPicture.php | 72 - .../share/facebook/GraphNodes/GraphSessionInfo.php | 102 - .../share/facebook/GraphNodes/GraphUser.php | 172 - .../facebook/Helpers/FacebookCanvasHelper.php | 52 - .../facebook/Helpers/FacebookJavaScriptHelper.php | 42 - .../facebook/Helpers/FacebookPageTabHelper.php | 95 - .../Helpers/FacebookRedirectLoginHelper.php | 333 -- .../FacebookSignedRequestFromInputHelper.php | 166 - .../share/facebook/Http/GraphRawResponse.php | 137 - .../share/facebook/Http/RequestBodyInterface.php | 39 - .../share/facebook/Http/RequestBodyMultipart.php | 170 - .../share/facebook/Http/RequestBodyUrlEncoded.php | 55 - .../share/facebook/HttpClients/FacebookCurl.php | 129 - .../HttpClients/FacebookCurlHttpClient.php | 163 - .../HttpClients/FacebookGuzzleHttpClient.php | 97 - .../HttpClients/FacebookHttpClientInterface.php | 47 - .../share/facebook/HttpClients/FacebookStream.php | 80 - .../HttpClients/FacebookStreamHttpClient.php | 94 - .../facebook/HttpClients/HttpClientsFactory.php | 99 - .../certs/DigiCertHighAssuranceEVRootCA.pem | 23 - .../FacebookMemoryPersistentDataHandler.php | 53 - .../FacebookSessionPersistentDataHandler.php | 76 - .../PersistentData/PersistentDataFactory.php | 65 - .../PersistentData/PersistentDataInterface.php | 49 - .../McryptPseudoRandomStringGenerator.php | 68 - .../OpenSslPseudoRandomStringGenerator.php | 67 - .../PseudoRandomStringGeneratorFactory.php | 101 - .../PseudoRandomStringGeneratorInterface.php | 45 - .../PseudoRandomStringGeneratorTrait.php | 58 - .../RandomBytesPseudoRandomStringGenerator.php | 59 - .../UrandomPseudoRandomStringGenerator.php | 89 - .../www/include/share/facebook/SignedRequest.php | 326 -- .../facebook/Url/FacebookUrlDetectionHandler.php | 182 - .../share/facebook/Url/FacebookUrlManipulator.php | 167 - .../share/facebook/Url/UrlDetectionInterface.php | 39 - mayor-orig/www/include/share/facebook/autoload.php | 81 - .../www/include/share/facebook/polyfills.php | 49 - mayor-orig/www/include/share/gd/imagefilter.php | 252 - .../www/include/share/googleapi/autoload.php | 7 - .../share/googleapi/composer/ClassLoader.php | 445 -- .../www/include/share/googleapi/composer/LICENSE | 21 - .../share/googleapi/composer/autoload_classmap.php | 35 - .../share/googleapi/composer/autoload_files.php | 13 - .../googleapi/composer/autoload_namespaces.php | 11 - .../share/googleapi/composer/autoload_psr4.php | 19 - .../share/googleapi/composer/autoload_real.php | 70 - .../share/googleapi/composer/autoload_static.php | 140 - .../share/googleapi/composer/installed.json | 707 --- .../share/googleapi/firebase/php-jwt/LICENSE | 30 - .../share/googleapi/firebase/php-jwt/README.md | 119 - .../share/googleapi/firebase/php-jwt/composer.json | 27 - .../share/googleapi/firebase/php-jwt/composer.lock | 19 - .../share/googleapi/firebase/php-jwt/package.xml | 77 - .../firebase/php-jwt/src/BeforeValidException.php | 7 - .../firebase/php-jwt/src/ExpiredException.php | 7 - .../share/googleapi/firebase/php-jwt/src/JWT.php | 370 -- .../php-jwt/src/SignatureInvalidException.php | 7 - .../googleapi/google/apiclient-services/.gitignore | 4 - .../google/apiclient-services/.travis.yml | 15 - .../google/apiclient-services/CONTRIBUTING.md | 22 - .../googleapi/google/apiclient-services/LICENSE | 203 - .../googleapi/google/apiclient-services/README.md | 30 - .../google/apiclient-services/composer.json | 19 - .../google/apiclient-services/phpunit.xml | 11 - .../Google/Service/Acceleratedmobilepageurl.php | 67 - .../Service/Acceleratedmobilepageurl/AmpUrl.php | 48 - .../Acceleratedmobilepageurl/AmpUrlError.php | 48 - .../BatchGetAmpUrlsRequest.php | 40 - .../BatchGetAmpUrlsResponse.php | 42 - .../Acceleratedmobilepageurl/Resource/AmpUrls.php | 42 - .../src/Google/Service/AdExchangeBuyer.php | 679 --- .../src/Google/Service/AdExchangeBuyer/Account.php | 95 - .../AdExchangeBuyer/AccountBidderLocation.php | 57 - .../Service/AdExchangeBuyer/AccountsList.php | 41 - .../AdExchangeBuyer/AddOrderDealsRequest.php | 50 - .../AdExchangeBuyer/AddOrderDealsResponse.php | 41 - .../AdExchangeBuyer/AddOrderNotesRequest.php | 32 - .../AdExchangeBuyer/AddOrderNotesResponse.php | 32 - .../Google/Service/AdExchangeBuyer/BillingInfo.php | 58 - .../Service/AdExchangeBuyer/BillingInfoList.php | 41 - .../src/Google/Service/AdExchangeBuyer/Budget.php | 75 - .../src/Google/Service/AdExchangeBuyer/Buyer.php | 30 - .../Service/AdExchangeBuyer/ContactInformation.php | 39 - .../AdExchangeBuyer/CreateOrdersRequest.php | 41 - .../AdExchangeBuyer/CreateOrdersResponse.php | 32 - .../Google/Service/AdExchangeBuyer/Creative.php | 281 - .../AdExchangeBuyer/CreativeCorrections.php | 50 - .../CreativeCorrectionsContexts.php | 58 - .../Service/AdExchangeBuyer/CreativeDealIds.php | 41 - .../CreativeDealIdsDealStatuses.php | 48 - .../AdExchangeBuyer/CreativeFilteringReasons.php | 41 - .../CreativeFilteringReasonsReasons.php | 39 - .../Service/AdExchangeBuyer/CreativeNativeAd.php | 151 - .../AdExchangeBuyer/CreativeNativeAdAppIcon.php | 48 - .../AdExchangeBuyer/CreativeNativeAdImage.php | 48 - .../AdExchangeBuyer/CreativeNativeAdLogo.php | 48 - .../CreativeServingRestrictions.php | 51 - .../CreativeServingRestrictionsContexts.php | 58 - ...eativeServingRestrictionsDisapprovalReasons.php | 40 - .../Service/AdExchangeBuyer/CreativesList.php | 50 - .../AdExchangeBuyer/DealServingMetadata.php | 40 - .../DealServingMetadataDealPauseStatus.php | 66 - .../Google/Service/AdExchangeBuyer/DealTerms.php | 116 - .../DealTermsGuaranteedFixedPriceTerms.php | 69 - ...alTermsGuaranteedFixedPriceTermsBillingInfo.php | 58 - .../DealTermsNonGuaranteedAuctionTerms.php | 41 - .../DealTermsNonGuaranteedFixedPriceTerms.php | 32 - .../DealTermsRubiconNonGuaranteedTerms.php | 41 - .../AdExchangeBuyer/DeleteOrderDealsRequest.php | 49 - .../AdExchangeBuyer/DeleteOrderDealsResponse.php | 41 - .../Service/AdExchangeBuyer/DeliveryControl.php | 50 - .../DeliveryControlFrequencyCap.php | 48 - .../Google/Service/AdExchangeBuyer/Dimension.php | 41 - .../AdExchangeBuyer/DimensionDimensionValue.php | 48 - .../AdExchangeBuyer/EditAllOrderDealsRequest.php | 60 - .../AdExchangeBuyer/EditAllOrderDealsResponse.php | 41 - .../Service/AdExchangeBuyer/GetOffersResponse.php | 32 - .../AdExchangeBuyer/GetOrderDealsResponse.php | 32 - .../AdExchangeBuyer/GetOrderNotesResponse.php | 32 - .../Service/AdExchangeBuyer/GetOrdersResponse.php | 32 - .../GetPublisherProfilesByAccountIdResponse.php | 32 - .../Service/AdExchangeBuyer/MarketplaceDeal.php | 244 - .../AdExchangeBuyer/MarketplaceDealParty.php | 41 - .../Service/AdExchangeBuyer/MarketplaceLabel.php | 58 - .../Service/AdExchangeBuyer/MarketplaceNote.php | 93 - .../Service/AdExchangeBuyer/PerformanceReport.php | 220 - .../AdExchangeBuyer/PerformanceReportList.php | 41 - .../Service/AdExchangeBuyer/PretargetingConfig.php | 260 - .../PretargetingConfigDimensions.php | 39 - .../PretargetingConfigExcludedPlacements.php | 39 - .../AdExchangeBuyer/PretargetingConfigList.php | 41 - .../PretargetingConfigPlacements.php | 39 - .../PretargetingConfigVideoPlayerSizes.php | 48 - .../src/Google/Service/AdExchangeBuyer/Price.php | 57 - .../Service/AdExchangeBuyer/PricePerBuyer.php | 50 - .../Google/Service/AdExchangeBuyer/PrivateData.php | 39 - .../src/Google/Service/AdExchangeBuyer/Product.php | 245 - .../Google/Service/AdExchangeBuyer/Proposal.php | 236 - .../AdExchangeBuyer/PublisherProfileApiProto.php | 231 - .../AdExchangeBuyer/PublisherProvidedForecast.php | 50 - .../Service/AdExchangeBuyer/Resource/Accounts.php | 88 - .../AdExchangeBuyer/Resource/BillingInfo.php | 55 - .../Service/AdExchangeBuyer/Resource/Budget.php | 81 - .../Service/AdExchangeBuyer/Resource/Creatives.php | 127 - .../AdExchangeBuyer/Resource/Marketplacedeals.php | 88 - .../AdExchangeBuyer/Resource/Marketplacenotes.php | 61 - .../Resource/Marketplaceprivateauction.php | 42 - .../AdExchangeBuyer/Resource/PerformanceReport.php | 52 - .../Resource/PretargetingConfig.php | 118 - .../Service/AdExchangeBuyer/Resource/Products.php | 55 - .../Service/AdExchangeBuyer/Resource/Proposals.php | 122 - .../AdExchangeBuyer/Resource/Pubprofiles.php | 42 - .../src/Google/Service/AdExchangeBuyer/Seller.php | 39 - .../Service/AdExchangeBuyer/SharedTargeting.php | 51 - .../Service/AdExchangeBuyer/TargetingValue.php | 59 - .../AdExchangeBuyer/TargetingValueCreativeSize.php | 60 - .../TargetingValueDayPartTargeting.php | 41 - .../TargetingValueDayPartTargetingDayPart.php | 66 - .../Service/AdExchangeBuyer/TargetingValueSize.php | 39 - .../UpdatePrivateAuctionProposalRequest.php | 58 - .../src/Google/Service/AdExchangeBuyerII.php | 441 -- .../AddDealAssociationRequest.php | 31 - .../AdExchangeBuyerII/Adexchangebuyer2Empty.php | 20 - .../Service/AdExchangeBuyerII/AppContext.php | 31 - .../Service/AdExchangeBuyerII/AuctionContext.php | 31 - .../Google/Service/AdExchangeBuyerII/Client.php | 93 - .../Service/AdExchangeBuyerII/ClientUser.php | 57 - .../AdExchangeBuyerII/ClientUserInvitation.php | 48 - .../Service/AdExchangeBuyerII/Correction.php | 50 - .../Google/Service/AdExchangeBuyerII/Creative.php | 253 - .../AdExchangeBuyerII/CreativeDealAssociation.php | 48 - .../src/Google/Service/AdExchangeBuyerII/Date.php | 48 - .../Service/AdExchangeBuyerII/Disapproval.php | 40 - .../Service/AdExchangeBuyerII/FilteringStats.php | 42 - .../Service/AdExchangeBuyerII/HtmlContent.php | 48 - .../src/Google/Service/AdExchangeBuyerII/Image.php | 48 - .../ListClientUserInvitationsResponse.php | 41 - .../AdExchangeBuyerII/ListClientUsersResponse.php | 41 - .../AdExchangeBuyerII/ListClientsResponse.php | 41 - .../AdExchangeBuyerII/ListCreativesResponse.php | 41 - .../ListDealAssociationsResponse.php | 41 - .../Service/AdExchangeBuyerII/LocationContext.php | 31 - .../Service/AdExchangeBuyerII/NativeContent.php | 141 - .../Service/AdExchangeBuyerII/PlatformContext.php | 31 - .../Google/Service/AdExchangeBuyerII/Reason.php | 39 - .../RemoveDealAssociationRequest.php | 31 - .../AdExchangeBuyerII/Resource/Accounts.php | 28 - .../AdExchangeBuyerII/Resource/AccountsClients.php | 101 - .../Resource/AccountsClientsInvitations.php | 90 - .../Resource/AccountsClientsUsers.php | 93 - .../Resource/AccountsCreatives.php | 151 - .../Resource/AccountsCreativesDealAssociations.php | 94 - .../Service/AdExchangeBuyerII/SecurityContext.php | 31 - .../Service/AdExchangeBuyerII/ServingContext.php | 80 - .../AdExchangeBuyerII/ServingRestriction.php | 51 - .../StopWatchingCreativeRequest.php | 20 - .../Service/AdExchangeBuyerII/VideoContent.php | 30 - .../AdExchangeBuyerII/WatchCreativeRequest.php | 30 - .../src/Google/Service/AdExchangeSeller.php | 428 -- .../Google/Service/AdExchangeSeller/Account.php | 48 - .../Google/Service/AdExchangeSeller/Accounts.php | 59 - .../Google/Service/AdExchangeSeller/AdClient.php | 66 - .../Google/Service/AdExchangeSeller/AdClients.php | 59 - .../src/Google/Service/AdExchangeSeller/Alert.php | 66 - .../src/Google/Service/AdExchangeSeller/Alerts.php | 41 - .../Service/AdExchangeSeller/CustomChannel.php | 67 - .../CustomChannelTargetingInfo.php | 57 - .../Service/AdExchangeSeller/CustomChannels.php | 59 - .../Google/Service/AdExchangeSeller/Metadata.php | 41 - .../Service/AdExchangeSeller/PreferredDeal.php | 93 - .../Service/AdExchangeSeller/PreferredDeals.php | 41 - .../src/Google/Service/AdExchangeSeller/Report.php | 86 - .../Service/AdExchangeSeller/ReportHeaders.php | 48 - .../AdExchangeSeller/ReportingMetadataEntry.php | 85 - .../Service/AdExchangeSeller/Resource/Accounts.php | 61 - .../Resource/AccountsAdclients.php | 48 - .../AdExchangeSeller/Resource/AccountsAlerts.php | 45 - .../Resource/AccountsCustomchannels.php | 65 - .../AdExchangeSeller/Resource/AccountsMetadata.php | 28 - .../Resource/AccountsMetadataDimensions.php | 42 - .../Resource/AccountsMetadataMetrics.php | 42 - .../Resource/AccountsPreferreddeals.php | 57 - .../AdExchangeSeller/Resource/AccountsReports.php | 59 - .../Resource/AccountsReportsSaved.php | 69 - .../Resource/AccountsUrlchannels.php | 49 - .../Service/AdExchangeSeller/SavedReport.php | 48 - .../Service/AdExchangeSeller/SavedReports.php | 59 - .../Google/Service/AdExchangeSeller/UrlChannel.php | 48 - .../Service/AdExchangeSeller/UrlChannels.php | 59 - .../src/Google/Service/AdSense.php | 1060 ---- .../src/Google/Service/AdSense/Account.php | 89 - .../src/Google/Service/AdSense/Accounts.php | 59 - .../src/Google/Service/AdSense/AdClient.php | 66 - .../src/Google/Service/AdSense/AdClients.php | 59 - .../src/Google/Service/AdSense/AdCode.php | 39 - .../src/Google/Service/AdSense/AdStyle.php | 59 - .../src/Google/Service/AdSense/AdStyleColors.php | 66 - .../src/Google/Service/AdSense/AdStyleFont.php | 39 - .../src/Google/Service/AdSense/AdUnit.php | 115 - .../Service/AdSense/AdUnitContentAdsSettings.php | 49 - .../AdUnitContentAdsSettingsBackupOption.php | 48 - .../Service/AdSense/AdUnitFeedAdsSettings.php | 57 - .../AdSense/AdUnitMobileContentAdsSettings.php | 57 - .../src/Google/Service/AdSense/AdUnits.php | 59 - .../AdSense/AdsenseReportsGenerateResponse.php | 104 - .../AdsenseReportsGenerateResponseHeaders.php | 48 - .../src/Google/Service/AdSense/Alert.php | 75 - .../src/Google/Service/AdSense/Alerts.php | 41 - .../src/Google/Service/AdSense/CustomChannel.php | 67 - .../Service/AdSense/CustomChannelTargetingInfo.php | 57 - .../src/Google/Service/AdSense/CustomChannels.php | 59 - .../src/Google/Service/AdSense/Metadata.php | 41 - .../src/Google/Service/AdSense/Payment.php | 66 - .../src/Google/Service/AdSense/Payments.php | 41 - .../Service/AdSense/ReportingMetadataEntry.php | 85 - .../Google/Service/AdSense/Resource/Accounts.php | 61 - .../Service/AdSense/Resource/AccountsAdclients.php | 48 - .../Service/AdSense/Resource/AccountsAdunits.php | 82 - .../Resource/AccountsAdunitsCustomchannels.php | 50 - .../Service/AdSense/Resource/AccountsAlerts.php | 60 - .../AdSense/Resource/AccountsCustomchannels.php | 65 - .../Resource/AccountsCustomchannelsAdunits.php | 52 - .../Service/AdSense/Resource/AccountsPayments.php | 42 - .../Service/AdSense/Resource/AccountsReports.php | 64 - .../AdSense/Resource/AccountsReportsSaved.php | 69 - .../AdSense/Resource/AccountsSavedadstyles.php | 62 - .../AdSense/Resource/AccountsUrlchannels.php | 49 - .../Google/Service/AdSense/Resource/Adclients.php | 46 - .../Google/Service/AdSense/Resource/Adunits.php | 78 - .../AdSense/Resource/AdunitsCustomchannels.php | 49 - .../src/Google/Service/AdSense/Resource/Alerts.php | 57 - .../Service/AdSense/Resource/Customchannels.php | 63 - .../AdSense/Resource/CustomchannelsAdunits.php | 51 - .../Google/Service/AdSense/Resource/Metadata.php | 28 - .../AdSense/Resource/MetadataDimensions.php | 41 - .../Service/AdSense/Resource/MetadataMetrics.php | 41 - .../Google/Service/AdSense/Resource/Payments.php | 40 - .../Google/Service/AdSense/Resource/Reports.php | 64 - .../Service/AdSense/Resource/ReportsSaved.php | 66 - .../Service/AdSense/Resource/Savedadstyles.php | 60 - .../Service/AdSense/Resource/Urlchannels.php | 48 - .../src/Google/Service/AdSense/SavedAdStyle.php | 58 - .../src/Google/Service/AdSense/SavedAdStyles.php | 59 - .../src/Google/Service/AdSense/SavedReport.php | 48 - .../src/Google/Service/AdSense/SavedReports.php | 59 - .../src/Google/Service/AdSense/UrlChannel.php | 48 - .../src/Google/Service/AdSense/UrlChannels.php | 59 - .../src/Google/Service/AdSenseHost.php | 630 --- .../src/Google/Service/AdSenseHost/Account.php | 57 - .../src/Google/Service/AdSenseHost/Accounts.php | 50 - .../src/Google/Service/AdSenseHost/AdClient.php | 66 - .../src/Google/Service/AdSenseHost/AdClients.php | 59 - .../src/Google/Service/AdSenseHost/AdCode.php | 39 - .../src/Google/Service/AdSenseHost/AdStyle.php | 59 - .../Google/Service/AdSenseHost/AdStyleColors.php | 66 - .../src/Google/Service/AdSenseHost/AdStyleFont.php | 39 - .../src/Google/Service/AdSenseHost/AdUnit.php | 96 - .../AdSenseHost/AdUnitContentAdsSettings.php | 49 - .../AdUnitContentAdsSettingsBackupOption.php | 48 - .../AdSenseHost/AdUnitMobileContentAdsSettings.php | 57 - .../src/Google/Service/AdSenseHost/AdUnits.php | 59 - .../Service/AdSenseHost/AssociationSession.php | 103 - .../Google/Service/AdSenseHost/CustomChannel.php | 57 - .../Google/Service/AdSenseHost/CustomChannels.php | 59 - .../src/Google/Service/AdSenseHost/Report.php | 86 - .../Google/Service/AdSenseHost/ReportHeaders.php | 48 - .../Service/AdSenseHost/Resource/Accounts.php | 55 - .../AdSenseHost/Resource/AccountsAdclients.php | 63 - .../AdSenseHost/Resource/AccountsAdunits.php | 150 - .../AdSenseHost/Resource/AccountsReports.php | 59 - .../Service/AdSenseHost/Resource/Adclients.php | 60 - .../AdSenseHost/Resource/Associationsessions.php | 60 - .../AdSenseHost/Resource/Customchannels.php | 125 - .../Service/AdSenseHost/Resource/Reports.php | 58 - .../Service/AdSenseHost/Resource/Urlchannels.php | 77 - .../src/Google/Service/AdSenseHost/UrlChannel.php | 48 - .../src/Google/Service/AdSenseHost/UrlChannels.php | 59 - .../src/Google/Service/Analytics.php | 2103 -------- .../src/Google/Service/Analytics/Account.php | 104 - .../Google/Service/Analytics/AccountChildLink.php | 39 - .../Service/Analytics/AccountPermissions.php | 31 - .../src/Google/Service/Analytics/AccountRef.php | 57 - .../Google/Service/Analytics/AccountSummaries.php | 95 - .../Google/Service/Analytics/AccountSummary.php | 68 - .../src/Google/Service/Analytics/AccountTicket.php | 78 - .../src/Google/Service/Analytics/Accounts.php | 95 - .../Google/Service/Analytics/AdWordsAccount.php | 48 - .../AnalyticsDataimportDeleteUploadDataRequest.php | 31 - .../src/Google/Service/Analytics/Column.php | 48 - .../src/Google/Service/Analytics/Columns.php | 68 - .../Google/Service/Analytics/CustomDataSource.php | 159 - .../Analytics/CustomDataSourceChildLink.php | 39 - .../Analytics/CustomDataSourceParentLink.php | 39 - .../Google/Service/Analytics/CustomDataSources.php | 95 - .../Google/Service/Analytics/CustomDimension.php | 130 - .../Analytics/CustomDimensionParentLink.php | 39 - .../Google/Service/Analytics/CustomDimensions.php | 95 - .../src/Google/Service/Analytics/CustomMetric.php | 161 - .../Service/Analytics/CustomMetricParentLink.php | 39 - .../src/Google/Service/Analytics/CustomMetrics.php | 95 - .../Google/Service/Analytics/EntityAdWordsLink.php | 87 - .../Service/Analytics/EntityAdWordsLinkEntity.php | 31 - .../Service/Analytics/EntityAdWordsLinks.php | 86 - .../Google/Service/Analytics/EntityUserLink.php | 78 - .../Service/Analytics/EntityUserLinkEntity.php | 51 - .../Analytics/EntityUserLinkPermissions.php | 40 - .../Google/Service/Analytics/EntityUserLinks.php | 86 - .../src/Google/Service/Analytics/Experiment.php | 276 - .../Service/Analytics/ExperimentParentLink.php | 39 - .../Service/Analytics/ExperimentVariations.php | 66 - .../src/Google/Service/Analytics/Experiments.php | 95 - .../src/Google/Service/Analytics/Filter.php | 163 - .../Service/Analytics/FilterAdvancedDetails.php | 138 - .../Google/Service/Analytics/FilterExpression.php | 75 - .../Service/Analytics/FilterLowercaseDetails.php | 39 - .../Google/Service/Analytics/FilterParentLink.php | 39 - .../src/Google/Service/Analytics/FilterRef.php | 66 - .../Analytics/FilterSearchAndReplaceDetails.php | 66 - .../Service/Analytics/FilterUppercaseDetails.php | 39 - .../src/Google/Service/Analytics/Filters.php | 95 - .../src/Google/Service/Analytics/GaData.php | 179 - .../Service/Analytics/GaDataColumnHeaders.php | 48 - .../Google/Service/Analytics/GaDataDataTable.php | 42 - .../Service/Analytics/GaDataDataTableCols.php | 48 - .../Service/Analytics/GaDataDataTableRows.php | 32 - .../Service/Analytics/GaDataDataTableRowsC.php | 30 - .../Google/Service/Analytics/GaDataProfileInfo.php | 75 - .../src/Google/Service/Analytics/GaDataQuery.php | 127 - .../src/Google/Service/Analytics/Goal.php | 188 - .../Google/Service/Analytics/GoalEventDetails.php | 41 - .../Analytics/GoalEventDetailsEventConditions.php | 66 - .../Google/Service/Analytics/GoalParentLink.php | 39 - .../Analytics/GoalUrlDestinationDetails.php | 68 - .../Analytics/GoalUrlDestinationDetailsSteps.php | 48 - .../Service/Analytics/GoalVisitNumPagesDetails.php | 39 - .../Analytics/GoalVisitTimeOnSiteDetails.php | 39 - .../src/Google/Service/Analytics/Goals.php | 95 - .../Google/Service/Analytics/IncludeConditions.php | 66 - .../Service/Analytics/LinkedForeignAccount.php | 111 - .../src/Google/Service/Analytics/McfData.php | 161 - .../Service/Analytics/McfDataColumnHeaders.php | 48 - .../Service/Analytics/McfDataProfileInfo.php | 75 - .../src/Google/Service/Analytics/McfDataQuery.php | 127 - .../src/Google/Service/Analytics/McfDataRows.php | 41 - .../Analytics/McfDataRowsConversionPathValue.php | 39 - .../src/Google/Service/Analytics/Profile.php | 258 - .../Google/Service/Analytics/ProfileChildLink.php | 39 - .../Google/Service/Analytics/ProfileFilterLink.php | 77 - .../Service/Analytics/ProfileFilterLinks.php | 95 - .../Google/Service/Analytics/ProfileParentLink.php | 39 - .../Service/Analytics/ProfilePermissions.php | 31 - .../src/Google/Service/Analytics/ProfileRef.php | 84 - .../Google/Service/Analytics/ProfileSummary.php | 66 - .../src/Google/Service/Analytics/Profiles.php | 95 - .../src/Google/Service/Analytics/RealtimeData.php | 106 - .../Analytics/RealtimeDataColumnHeaders.php | 48 - .../Service/Analytics/RealtimeDataProfileInfo.php | 75 - .../Google/Service/Analytics/RealtimeDataQuery.php | 79 - .../Service/Analytics/RemarketingAudience.php | 151 - .../RemarketingAudienceAudienceDefinition.php | 31 - ...rketingAudienceStateBasedAudienceDefinition.php | 41 - ...ateBasedAudienceDefinitionExcludeConditions.php | 39 - .../Service/Analytics/RemarketingAudiences.php | 95 - .../src/Google/Service/Analytics/Resource/Data.php | 28 - .../Google/Service/Analytics/Resource/DataGa.php | 67 - .../Google/Service/Analytics/Resource/DataMcf.php | 63 - .../Service/Analytics/Resource/DataRealtime.php | 53 - .../Service/Analytics/Resource/Management.php | 28 - .../Resource/ManagementAccountSummaries.php | 47 - .../Resource/ManagementAccountUserLinks.php | 91 - .../Analytics/Resource/ManagementAccounts.php | 47 - .../Resource/ManagementCustomDataSources.php | 50 - .../Resource/ManagementCustomDimensions.php | 126 - .../Analytics/Resource/ManagementCustomMetrics.php | 124 - .../Analytics/Resource/ManagementExperiments.php | 132 - .../Analytics/Resource/ManagementFilters.php | 119 - .../Service/Analytics/Resource/ManagementGoals.php | 120 - .../Resource/ManagementProfileFilterLinks.php | 140 - .../Resource/ManagementProfileUserLinks.php | 104 - .../Analytics/Resource/ManagementProfiles.php | 135 - .../Resource/ManagementRemarketingAudience.php | 126 - .../Analytics/Resource/ManagementSegments.php | 47 - .../Resource/ManagementUnsampledReports.php | 105 - .../Analytics/Resource/ManagementUploads.php | 100 - .../Resource/ManagementWebPropertyAdWordsLinks.php | 138 - .../Analytics/Resource/ManagementWebproperties.php | 110 - .../Resource/ManagementWebpropertyUserLinks.php | 98 - .../Google/Service/Analytics/Resource/Metadata.php | 28 - .../Service/Analytics/Resource/MetadataColumns.php | 42 - .../Service/Analytics/Resource/Provisioning.php | 41 - .../src/Google/Service/Analytics/Segment.php | 102 - .../src/Google/Service/Analytics/Segments.php | 95 - .../Google/Service/Analytics/UnsampledReport.php | 198 - .../UnsampledReportCloudStorageDownloadDetails.php | 39 - .../UnsampledReportDriveDownloadDetails.php | 30 - .../Google/Service/Analytics/UnsampledReports.php | 95 - .../src/Google/Service/Analytics/Upload.php | 76 - .../src/Google/Service/Analytics/Uploads.php | 86 - .../src/Google/Service/Analytics/UserRef.php | 48 - .../Google/Service/Analytics/WebPropertyRef.php | 75 - .../Service/Analytics/WebPropertySummary.php | 95 - .../src/Google/Service/Analytics/Webproperties.php | 95 - .../src/Google/Service/Analytics/Webproperty.php | 177 - .../Service/Analytics/WebpropertyChildLink.php | 39 - .../Service/Analytics/WebpropertyParentLink.php | 39 - .../Service/Analytics/WebpropertyPermissions.php | 31 - .../src/Google/Service/AnalyticsReporting.php | 70 - .../Google/Service/AnalyticsReporting/Cohort.php | 49 - .../Service/AnalyticsReporting/CohortGroup.php | 41 - .../Service/AnalyticsReporting/ColumnHeader.php | 41 - .../Service/AnalyticsReporting/DateRange.php | 39 - .../Service/AnalyticsReporting/DateRangeValues.php | 41 - .../Service/AnalyticsReporting/Dimension.php | 40 - .../Service/AnalyticsReporting/DimensionFilter.php | 67 - .../AnalyticsReporting/DimensionFilterClause.php | 41 - .../Service/AnalyticsReporting/DynamicSegment.php | 50 - .../AnalyticsReporting/GetReportsRequest.php | 32 - .../AnalyticsReporting/GetReportsResponse.php | 32 - .../Google/Service/AnalyticsReporting/Metric.php | 48 - .../Service/AnalyticsReporting/MetricFilter.php | 57 - .../AnalyticsReporting/MetricFilterClause.php | 41 - .../Service/AnalyticsReporting/MetricHeader.php | 42 - .../AnalyticsReporting/MetricHeaderEntry.php | 39 - .../AnalyticsReporting/OrFiltersForSegment.php | 32 - .../Google/Service/AnalyticsReporting/OrderBy.php | 48 - .../Google/Service/AnalyticsReporting/Pivot.php | 70 - .../Service/AnalyticsReporting/PivotHeader.php | 41 - .../AnalyticsReporting/PivotHeaderEntry.php | 50 - .../AnalyticsReporting/PivotValueRegion.php | 31 - .../Google/Service/AnalyticsReporting/Report.php | 50 - .../Service/AnalyticsReporting/ReportData.php | 107 - .../Service/AnalyticsReporting/ReportRequest.php | 184 - .../Service/AnalyticsReporting/ReportRow.php | 41 - .../AnalyticsReporting/Resource/Reports.php | 41 - .../Google/Service/AnalyticsReporting/Segment.php | 40 - .../AnalyticsReporting/SegmentDefinition.php | 32 - .../AnalyticsReporting/SegmentDimensionFilter.php | 76 - .../Service/AnalyticsReporting/SegmentFilter.php | 50 - .../AnalyticsReporting/SegmentFilterClause.php | 50 - .../AnalyticsReporting/SegmentMetricFilter.php | 66 - .../AnalyticsReporting/SegmentSequenceStep.php | 41 - .../Service/AnalyticsReporting/SequenceSegment.php | 41 - .../Service/AnalyticsReporting/SimpleSegment.php | 32 - .../src/Google/Service/AndroidEnterprise.php | 1454 ----- .../Service/AndroidEnterprise/Administrator.php | 30 - .../AndroidEnterprise/AdministratorWebToken.php | 39 - .../AdministratorWebTokenSpec.php | 49 - .../AndroidEnterprise/AppRestrictionsSchema.php | 41 - .../AppRestrictionsSchemaChangeEvent.php | 30 - .../AppRestrictionsSchemaRestriction.php | 96 - ...strictionsSchemaRestrictionRestrictionValue.php | 67 - .../Service/AndroidEnterprise/AppUpdateEvent.php | 30 - .../Service/AndroidEnterprise/AppVersion.php | 39 - .../Service/AndroidEnterprise/ApprovalUrlInfo.php | 39 - .../AndroidEnterprise/AuthenticationToken.php | 39 - .../Service/AndroidEnterprise/Collection.php | 67 - .../CollectionViewersListResponse.php | 41 - .../AndroidEnterprise/CollectionsListResponse.php | 41 - .../Google/Service/AndroidEnterprise/Device.php | 48 - .../Service/AndroidEnterprise/DeviceState.php | 39 - .../AndroidEnterprise/DevicesListResponse.php | 41 - .../Service/AndroidEnterprise/Enterprise.php | 68 - .../AndroidEnterprise/EnterpriseAccount.php | 39 - .../AndroidEnterprise/EnterprisesListResponse.php | 41 - ...EnterprisesSendTestPushNotificationResponse.php | 39 - .../Service/AndroidEnterprise/Entitlement.php | 48 - .../AndroidEnterprise/EntitlementsListResponse.php | 41 - .../Service/AndroidEnterprise/GroupLicense.php | 75 - .../GroupLicenseUsersListResponse.php | 41 - .../GroupLicensesListResponse.php | 41 - .../Google/Service/AndroidEnterprise/Install.php | 57 - .../AndroidEnterprise/InstallFailureEvent.php | 66 - .../AndroidEnterprise/InstallsListResponse.php | 41 - .../Service/AndroidEnterprise/LocalizedText.php | 39 - .../AndroidEnterprise/ManagedConfiguration.php | 50 - .../ManagedConfigurationsForDeviceListResponse.php | 41 - .../ManagedConfigurationsForUserListResponse.php | 41 - .../Service/AndroidEnterprise/ManagedProperty.php | 87 - .../AndroidEnterprise/ManagedPropertyBundle.php | 32 - .../Service/AndroidEnterprise/NewDeviceEvent.php | 48 - .../AndroidEnterprise/NewPermissionsEvent.php | 49 - .../Service/AndroidEnterprise/Notification.php | 109 - .../Service/AndroidEnterprise/NotificationSet.php | 50 - .../Google/Service/AndroidEnterprise/PageInfo.php | 48 - .../Service/AndroidEnterprise/Permission.php | 57 - .../Google/Service/AndroidEnterprise/Product.php | 131 - .../AndroidEnterprise/ProductApprovalEvent.php | 39 - .../ProductAvailabilityChangeEvent.php | 39 - .../AndroidEnterprise/ProductPermission.php | 39 - .../AndroidEnterprise/ProductPermissions.php | 50 - .../Service/AndroidEnterprise/ProductSet.php | 49 - .../AndroidEnterprise/ProductsApproveRequest.php | 31 - .../ProductsGenerateApprovalUrlResponse.php | 30 - .../AndroidEnterprise/ProductsListResponse.php | 61 - .../AndroidEnterprise/Resource/Collections.php | 114 - .../Resource/Collectionviewers.php | 115 - .../Service/AndroidEnterprise/Resource/Devices.php | 96 - .../AndroidEnterprise/Resource/Enterprises.php | 317 -- .../AndroidEnterprise/Resource/Entitlements.php | 119 - .../AndroidEnterprise/Resource/Grouplicenses.php | 58 - .../Resource/Grouplicenseusers.php | 44 - .../AndroidEnterprise/Resource/Installs.php | 119 - .../Resource/Managedconfigurationsfordevice.php | 119 - .../Resource/Managedconfigurationsforuser.php | 114 - .../AndroidEnterprise/Resource/Permissions.php | 45 - .../AndroidEnterprise/Resource/Products.php | 175 - .../Resource/Serviceaccountkeys.php | 82 - .../Resource/Storelayoutclusters.php | 120 - .../Resource/Storelayoutpages.php | 114 - .../Service/AndroidEnterprise/Resource/Users.php | 215 - .../Service/AndroidEnterprise/ServiceAccount.php | 49 - .../AndroidEnterprise/ServiceAccountKey.php | 66 - .../ServiceAccountKeysListResponse.php | 32 - .../Service/AndroidEnterprise/SignupInfo.php | 48 - .../Service/AndroidEnterprise/StoreCluster.php | 68 - .../Service/AndroidEnterprise/StoreLayout.php | 48 - .../StoreLayoutClustersListResponse.php | 41 - .../StoreLayoutPagesListResponse.php | 41 - .../Google/Service/AndroidEnterprise/StorePage.php | 59 - .../Service/AndroidEnterprise/TokenPagination.php | 39 - .../src/Google/Service/AndroidEnterprise/User.php | 84 - .../Google/Service/AndroidEnterprise/UserToken.php | 48 - .../AndroidEnterprise/UsersListResponse.php | 41 - .../src/Google/Service/AndroidPublisher.php | 1347 ----- .../src/Google/Service/AndroidPublisher/Apk.php | 40 - .../Google/Service/AndroidPublisher/ApkBinary.php | 30 - .../Google/Service/AndroidPublisher/ApkListing.php | 39 - .../AndroidPublisher/ApkListingsListResponse.php | 41 - .../ApksAddExternallyHostedRequest.php | 31 - .../ApksAddExternallyHostedResponse.php | 31 - .../Service/AndroidPublisher/ApksListResponse.php | 41 - .../Google/Service/AndroidPublisher/AppDetails.php | 57 - .../Google/Service/AndroidPublisher/AppEdit.php | 39 - .../Google/Service/AndroidPublisher/Comment.php | 41 - .../Service/AndroidPublisher/DeobfuscationFile.php | 30 - .../DeobfuscationFilesUploadResponse.php | 31 - .../Service/AndroidPublisher/DeveloperComment.php | 40 - .../Service/AndroidPublisher/DeviceMetadata.php | 120 - .../Service/AndroidPublisher/Entitlement.php | 57 - .../AndroidPublisher/EntitlementsListResponse.php | 52 - .../Service/AndroidPublisher/ExpansionFile.php | 39 - .../ExpansionFilesUploadResponse.php | 31 - .../AndroidPublisher/ExternallyHostedApk.php | 158 - .../ExternallyHostedApkUsesPermission.php | 39 - .../src/Google/Service/AndroidPublisher/Image.php | 48 - .../AndroidPublisher/ImagesDeleteAllResponse.php | 32 - .../AndroidPublisher/ImagesListResponse.php | 32 - .../AndroidPublisher/ImagesUploadResponse.php | 31 - .../Service/AndroidPublisher/InAppProduct.php | 124 - .../AndroidPublisher/InAppProductListing.php | 39 - .../AndroidPublisher/InappproductsBatchRequest.php | 32 - .../InappproductsBatchRequestEntry.php | 59 - .../InappproductsBatchResponse.php | 41 - .../InappproductsBatchResponseEntry.php | 50 - .../InappproductsInsertRequest.php | 31 - .../InappproductsInsertResponse.php | 31 - .../AndroidPublisher/InappproductsListResponse.php | 61 - .../InappproductsUpdateRequest.php | 31 - .../InappproductsUpdateResponse.php | 31 - .../Google/Service/AndroidPublisher/Listing.php | 66 - .../AndroidPublisher/ListingsListResponse.php | 41 - .../Google/Service/AndroidPublisher/MonthDay.php | 39 - .../Google/Service/AndroidPublisher/PageInfo.php | 48 - .../src/Google/Service/AndroidPublisher/Price.php | 39 - .../Service/AndroidPublisher/ProductPurchase.php | 66 - .../Google/Service/AndroidPublisher/Prorate.php | 41 - .../Service/AndroidPublisher/Resource/Edits.php | 107 - .../AndroidPublisher/Resource/EditsApklistings.php | 148 - .../AndroidPublisher/Resource/EditsApks.php | 77 - .../Resource/EditsDeobfuscationfiles.php | 47 - .../AndroidPublisher/Resource/EditsDetails.php | 77 - .../Resource/EditsExpansionfiles.php | 108 - .../AndroidPublisher/Resource/EditsImages.php | 108 - .../AndroidPublisher/Resource/EditsListings.php | 132 - .../AndroidPublisher/Resource/EditsTesters.php | 78 - .../AndroidPublisher/Resource/EditsTracks.php | 99 - .../AndroidPublisher/Resource/Entitlements.php | 49 - .../AndroidPublisher/Resource/Inappproducts.php | 151 - .../AndroidPublisher/Resource/Purchases.php | 28 - .../Resource/PurchasesProducts.php | 46 - .../Resource/PurchasesSubscriptions.php | 123 - .../Resource/PurchasesVoidedpurchases.php | 55 - .../Service/AndroidPublisher/Resource/Reviews.php | 81 - .../src/Google/Service/AndroidPublisher/Review.php | 50 - .../Service/AndroidPublisher/ReviewReplyResult.php | 40 - .../AndroidPublisher/ReviewsListResponse.php | 52 - .../AndroidPublisher/ReviewsReplyRequest.php | 30 - .../AndroidPublisher/ReviewsReplyResponse.php | 31 - .../src/Google/Service/AndroidPublisher/Season.php | 52 - .../AndroidPublisher/SubscriptionDeferralInfo.php | 39 - .../AndroidPublisher/SubscriptionPurchase.php | 120 - .../SubscriptionPurchasesDeferRequest.php | 31 - .../SubscriptionPurchasesDeferResponse.php | 30 - .../Google/Service/AndroidPublisher/Testers.php | 40 - .../Google/Service/AndroidPublisher/Timestamp.php | 39 - .../Service/AndroidPublisher/TokenPagination.php | 39 - .../src/Google/Service/AndroidPublisher/Track.php | 49 - .../AndroidPublisher/TracksListResponse.php | 41 - .../Service/AndroidPublisher/UserComment.php | 131 - .../Service/AndroidPublisher/VoidedPurchase.php | 57 - .../VoidedPurchasesListResponse.php | 52 - .../src/Google/Service/AppState.php | 120 - .../src/Google/Service/AppState/GetResponse.php | 57 - .../src/Google/Service/AppState/ListResponse.php | 50 - .../Google/Service/AppState/Resource/States.php | 113 - .../src/Google/Service/AppState/UpdateRequest.php | 39 - .../src/Google/Service/AppState/WriteResult.php | 48 - .../src/Google/Service/Appengine.php | 520 -- .../Google/Service/Appengine/ApiConfigHandler.php | 66 - .../Service/Appengine/ApiEndpointHandler.php | 30 - .../src/Google/Service/Appengine/Application.php | 104 - .../Google/Service/Appengine/AutomaticScaling.php | 133 - .../src/Google/Service/Appengine/BasicScaling.php | 39 - .../src/Google/Service/Appengine/ContainerInfo.php | 30 - .../Google/Service/Appengine/CpuUtilization.php | 39 - .../Service/Appengine/DebugInstanceRequest.php | 30 - .../src/Google/Service/Appengine/Deployment.php | 51 - .../Google/Service/Appengine/DiskUtilization.php | 57 - .../Service/Appengine/EndpointsApiService.php | 39 - .../src/Google/Service/Appengine/ErrorHandler.php | 48 - .../src/Google/Service/Appengine/FileInfo.php | 48 - .../src/Google/Service/Appengine/HealthCheck.php | 84 - .../src/Google/Service/Appengine/Instance.php | 165 - .../src/Google/Service/Appengine/Library.php | 39 - .../Service/Appengine/ListInstancesResponse.php | 41 - .../Service/Appengine/ListLocationsResponse.php | 41 - .../Service/Appengine/ListOperationsResponse.php | 41 - .../Service/Appengine/ListServicesResponse.php | 41 - .../Service/Appengine/ListVersionsResponse.php | 41 - .../src/Google/Service/Appengine/Location.php | 57 - .../Google/Service/Appengine/LocationMetadata.php | 39 - .../src/Google/Service/Appengine/ManualScaling.php | 30 - .../src/Google/Service/Appengine/Network.php | 58 - .../Service/Appengine/NetworkUtilization.php | 57 - .../src/Google/Service/Appengine/Operation.php | 67 - .../Google/Service/Appengine/OperationMetadata.php | 75 - .../Appengine/OperationMetadataExperimental.php | 66 - .../Service/Appengine/OperationMetadataV1.php | 85 - .../Service/Appengine/OperationMetadataV1Beta5.php | 66 - .../Service/Appengine/RepairApplicationRequest.php | 20 - .../Service/Appengine/RequestUtilization.php | 39 - .../src/Google/Service/Appengine/Resource/Apps.php | 101 - .../Service/Appengine/Resource/AppsLocations.php | 61 - .../Service/Appengine/Resource/AppsOperations.php | 65 - .../Service/Appengine/Resource/AppsServices.php | 109 - .../Appengine/Resource/AppsServicesVersions.php | 138 - .../Resource/AppsServicesVersionsInstances.php | 106 - .../Service/Appengine/Resource/Experimental.php | 28 - .../Appengine/Resource/ExperimentalApps.php | 28 - .../Resource/ExperimentalAppsOperations.php | 65 - .../src/Google/Service/Appengine/Resources.php | 59 - .../src/Google/Service/Appengine/ScriptHandler.php | 30 - .../src/Google/Service/Appengine/Service.php | 49 - .../Google/Service/Appengine/SourceReference.php | 39 - .../Service/Appengine/StaticFilesHandler.php | 84 - .../src/Google/Service/Appengine/Status.php | 49 - .../src/Google/Service/Appengine/TrafficSplit.php | 39 - .../Google/Service/Appengine/UrlDispatchRule.php | 48 - .../src/Google/Service/Appengine/UrlMap.php | 96 - .../src/Google/Service/Appengine/Version.php | 295 - .../src/Google/Service/Appengine/Volume.php | 48 - .../src/Google/Service/Appengine/ZipInfo.php | 39 - .../src/Google/Service/Appsactivity.php | 108 - .../src/Google/Service/Appsactivity/Activity.php | 42 - .../Service/Appsactivity/AppsactivityParent.php | 48 - .../src/Google/Service/Appsactivity/Event.php | 108 - .../Appsactivity/ListActivitiesResponse.php | 41 - .../src/Google/Service/Appsactivity/Move.php | 42 - .../src/Google/Service/Appsactivity/Permission.php | 76 - .../Service/Appsactivity/PermissionChange.php | 42 - .../src/Google/Service/Appsactivity/Photo.php | 30 - .../src/Google/Service/Appsactivity/Rename.php | 39 - .../Service/Appsactivity/Resource/Activities.php | 59 - .../src/Google/Service/Appsactivity/Target.php | 48 - .../src/Google/Service/Appsactivity/User.php | 67 - .../src/Google/Service/Autoscaler.php | 299 - .../src/Google/Service/Autoscaler/Autoscaler.php | 94 - .../Service/Autoscaler/AutoscalerListResponse.php | 50 - .../Service/Autoscaler/AutoscalingPolicy.php | 79 - .../Autoscaler/AutoscalingPolicyCpuUtilization.php | 30 - .../AutoscalingPolicyCustomMetricUtilization.php | 48 - .../AutoscalingPolicyLoadBalancingUtilization.php | 30 - .../Service/Autoscaler/DeprecationStatus.php | 66 - .../src/Google/Service/Autoscaler/Operation.php | 231 - .../Google/Service/Autoscaler/OperationError.php | 32 - .../Service/Autoscaler/OperationErrorErrors.php | 48 - .../Google/Service/Autoscaler/OperationList.php | 68 - .../Service/Autoscaler/OperationWarnings.php | 50 - .../Service/Autoscaler/OperationWarningsData.php | 39 - .../Service/Autoscaler/Resource/Autoscalers.php | 124 - .../Service/Autoscaler/Resource/ZoneOperations.php | 78 - .../Google/Service/Autoscaler/Resource/Zones.php | 45 - .../src/Google/Service/Autoscaler/Zone.php | 103 - .../src/Google/Service/Autoscaler/ZoneList.php | 68 - .../src/Google/Service/Bigquery.php | 520 -- .../src/Google/Service/Bigquery/BigtableColumn.php | 75 - .../Service/Bigquery/BigtableColumnFamily.php | 68 - .../Google/Service/Bigquery/BigtableOptions.php | 50 - .../src/Google/Service/Bigquery/CsvOptions.php | 75 - .../src/Google/Service/Bigquery/Dataset.php | 141 - .../src/Google/Service/Bigquery/DatasetAccess.php | 76 - .../src/Google/Service/Bigquery/DatasetList.php | 59 - .../Service/Bigquery/DatasetListDatasets.php | 67 - .../Google/Service/Bigquery/DatasetReference.php | 39 - .../src/Google/Service/Bigquery/ErrorProto.php | 57 - .../Google/Service/Bigquery/ExplainQueryStage.php | 149 - .../Google/Service/Bigquery/ExplainQueryStep.php | 40 - .../Service/Bigquery/ExternalDataConfiguration.php | 116 - .../Service/Bigquery/GetQueryResultsResponse.php | 134 - .../Service/Bigquery/GoogleSheetsOptions.php | 30 - .../src/Google/Service/Bigquery/Job.php | 109 - .../Google/Service/Bigquery/JobCancelResponse.php | 40 - .../Google/Service/Bigquery/JobConfiguration.php | 79 - .../Service/Bigquery/JobConfigurationExtract.php | 86 - .../Service/Bigquery/JobConfigurationLoad.php | 204 - .../Service/Bigquery/JobConfigurationQuery.php | 189 - .../Service/Bigquery/JobConfigurationTableCopy.php | 70 - .../src/Google/Service/Bigquery/JobList.php | 59 - .../src/Google/Service/Bigquery/JobListJobs.php | 110 - .../src/Google/Service/Bigquery/JobReference.php | 39 - .../src/Google/Service/Bigquery/JobStatistics.php | 87 - .../src/Google/Service/Bigquery/JobStatistics2.php | 116 - .../src/Google/Service/Bigquery/JobStatistics3.php | 57 - .../src/Google/Service/Bigquery/JobStatistics4.php | 31 - .../src/Google/Service/Bigquery/JobStatus.php | 51 - .../src/Google/Service/Bigquery/ProjectList.php | 68 - .../Service/Bigquery/ProjectListProjects.php | 67 - .../Google/Service/Bigquery/ProjectReference.php | 30 - .../src/Google/Service/Bigquery/QueryParameter.php | 50 - .../Google/Service/Bigquery/QueryParameterType.php | 51 - .../Bigquery/QueryParameterTypeStructTypes.php | 49 - .../Service/Bigquery/QueryParameterValue.php | 51 - .../src/Google/Service/Bigquery/QueryRequest.php | 123 - .../src/Google/Service/Bigquery/QueryResponse.php | 125 - .../Google/Service/Bigquery/Resource/Datasets.php | 134 - .../src/Google/Service/Bigquery/Resource/Jobs.php | 140 - .../Google/Service/Bigquery/Resource/Projects.php | 45 - .../Google/Service/Bigquery/Resource/Tabledata.php | 66 - .../Google/Service/Bigquery/Resource/Tables.php | 131 - .../Google/Service/Bigquery/Streamingbuffer.php | 48 - .../src/Google/Service/Bigquery/Table.php | 216 - .../src/Google/Service/Bigquery/TableCell.php | 30 - .../Service/Bigquery/TableDataInsertAllRequest.php | 68 - .../Bigquery/TableDataInsertAllRequestRows.php | 39 - .../Bigquery/TableDataInsertAllResponse.php | 41 - .../TableDataInsertAllResponseInsertErrors.php | 41 - .../src/Google/Service/Bigquery/TableDataList.php | 68 - .../Google/Service/Bigquery/TableFieldSchema.php | 68 - .../src/Google/Service/Bigquery/TableList.php | 68 - .../Google/Service/Bigquery/TableListTables.php | 86 - .../Service/Bigquery/TableListTablesView.php | 30 - .../src/Google/Service/Bigquery/TableReference.php | 48 - .../src/Google/Service/Bigquery/TableRow.php | 32 - .../src/Google/Service/Bigquery/TableSchema.php | 32 - .../Google/Service/Bigquery/TimePartitioning.php | 39 - .../Bigquery/UserDefinedFunctionResource.php | 39 - .../src/Google/Service/Bigquery/ViewDefinition.php | 50 - .../src/Google/Service/Blogger.php | 930 ---- .../src/Google/Service/Blogger/Blog.php | 141 - .../src/Google/Service/Blogger/BlogList.php | 51 - .../src/Google/Service/Blogger/BlogLocale.php | 48 - .../src/Google/Service/Blogger/BlogPages.php | 39 - .../src/Google/Service/Blogger/BlogPerUserInfo.php | 75 - .../src/Google/Service/Blogger/BlogPosts.php | 50 - .../src/Google/Service/Blogger/BlogUserInfo.php | 53 - .../src/Google/Service/Blogger/Comment.php | 124 - .../src/Google/Service/Blogger/CommentAuthor.php | 58 - .../Google/Service/Blogger/CommentAuthorImage.php | 30 - .../src/Google/Service/Blogger/CommentBlog.php | 30 - .../Google/Service/Blogger/CommentInReplyTo.php | 30 - .../src/Google/Service/Blogger/CommentList.php | 68 - .../src/Google/Service/Blogger/CommentPost.php | 30 - .../src/Google/Service/Blogger/Page.php | 131 - .../src/Google/Service/Blogger/PageAuthor.php | 58 - .../src/Google/Service/Blogger/PageAuthorImage.php | 30 - .../src/Google/Service/Blogger/PageBlog.php | 30 - .../src/Google/Service/Blogger/PageList.php | 59 - .../src/Google/Service/Blogger/Pageviews.php | 50 - .../src/Google/Service/Blogger/PageviewsCounts.php | 39 - .../src/Google/Service/Blogger/Post.php | 198 - .../src/Google/Service/Blogger/PostAuthor.php | 58 - .../src/Google/Service/Blogger/PostAuthorImage.php | 30 - .../src/Google/Service/Blogger/PostBlog.php | 30 - .../src/Google/Service/Blogger/PostImages.php | 30 - .../src/Google/Service/Blogger/PostList.php | 59 - .../src/Google/Service/Blogger/PostLocation.php | 57 - .../src/Google/Service/Blogger/PostPerUserInfo.php | 66 - .../src/Google/Service/Blogger/PostReplies.php | 50 - .../src/Google/Service/Blogger/PostUserInfo.php | 53 - .../Google/Service/Blogger/PostUserInfosList.php | 50 - .../Service/Blogger/Resource/BlogUserInfos.php | 46 - .../src/Google/Service/Blogger/Resource/Blogs.php | 86 - .../Google/Service/Blogger/Resource/Comments.php | 159 - .../Google/Service/Blogger/Resource/PageViews.php | 43 - .../src/Google/Service/Blogger/Resource/Pages.php | 163 - .../Service/Blogger/Resource/PostUserInfos.php | 83 - .../src/Google/Service/Blogger/Resource/Posts.php | 241 - .../src/Google/Service/Blogger/Resource/Users.php | 41 - .../src/Google/Service/Blogger/User.php | 104 - .../src/Google/Service/Blogger/UserBlogs.php | 30 - .../src/Google/Service/Blogger/UserLocale.php | 48 - .../src/Google/Service/Books.php | 1508 ------ .../src/Google/Service/Books/Annotation.php | 178 - .../Books/AnnotationClientVersionRanges.php | 70 - .../Books/AnnotationCurrentVersionRanges.php | 70 - .../Service/Books/AnnotationLayerSummary.php | 48 - .../src/Google/Service/Books/Annotationdata.php | 105 - .../src/Google/Service/Books/Annotations.php | 59 - .../Google/Service/Books/AnnotationsSummary.php | 41 - .../Service/Books/AnnotationsSummaryLayers.php | 66 - .../src/Google/Service/Books/Annotationsdata.php | 59 - .../Google/Service/Books/BooksAnnotationsRange.php | 57 - .../Service/Books/BooksCloudloadingResource.php | 57 - .../Books/BooksVolumesRecommendedRateResponse.php | 33 - .../src/Google/Service/Books/Bookshelf.php | 111 - .../src/Google/Service/Books/Bookshelves.php | 41 - .../src/Google/Service/Books/Category.php | 41 - .../src/Google/Service/Books/CategoryItems.php | 48 - .../Service/Books/ConcurrentAccessRestriction.php | 120 - .../src/Google/Service/Books/Dictlayerdata.php | 50 - .../Google/Service/Books/DictlayerdataCommon.php | 30 - .../src/Google/Service/Books/DictlayerdataDict.php | 42 - .../Service/Books/DictlayerdataDictSource.php | 39 - .../Service/Books/DictlayerdataDictWords.php | 62 - .../Books/DictlayerdataDictWordsDerivatives.php | 40 - .../DictlayerdataDictWordsDerivativesSource.php | 39 - .../Books/DictlayerdataDictWordsExamples.php | 40 - .../Books/DictlayerdataDictWordsExamplesSource.php | 39 - .../Service/Books/DictlayerdataDictWordsSenses.php | 98 - .../DictlayerdataDictWordsSensesConjugations.php | 39 - .../DictlayerdataDictWordsSensesDefinitions.php | 41 - ...layerdataDictWordsSensesDefinitionsExamples.php | 40 - ...ataDictWordsSensesDefinitionsExamplesSource.php | 39 - .../Books/DictlayerdataDictWordsSensesSource.php | 39 - .../Books/DictlayerdataDictWordsSensesSynonyms.php | 40 - .../DictlayerdataDictWordsSensesSynonymsSource.php | 39 - .../Service/Books/DictlayerdataDictWordsSource.php | 39 - .../src/Google/Service/Books/Discoveryclusters.php | 50 - .../Service/Books/DiscoveryclustersClusters.php | 81 - ...yclustersClustersBannerWithContentContainer.php | 75 - .../Service/Books/DownloadAccessRestriction.php | 129 - .../src/Google/Service/Books/DownloadAccesses.php | 41 - .../src/Google/Service/Books/Geolayerdata.php | 50 - .../Google/Service/Books/GeolayerdataCommon.php | 66 - .../src/Google/Service/Books/GeolayerdataGeo.php | 96 - .../Service/Books/GeolayerdataGeoBoundary.php | 39 - .../Service/Books/GeolayerdataGeoViewport.php | 41 - .../Service/Books/GeolayerdataGeoViewportHi.php | 39 - .../Service/Books/GeolayerdataGeoViewportLo.php | 39 - .../src/Google/Service/Books/Layersummaries.php | 50 - .../src/Google/Service/Books/Layersummary.php | 139 - .../src/Google/Service/Books/Metadata.php | 41 - .../src/Google/Service/Books/MetadataItems.php | 70 - .../src/Google/Service/Books/Notification.php | 156 - .../src/Google/Service/Books/Offers.php | 41 - .../src/Google/Service/Books/OffersItems.php | 59 - .../src/Google/Service/Books/OffersItemsItems.php | 75 - .../src/Google/Service/Books/ReadingPosition.php | 84 - .../src/Google/Service/Books/RequestAccess.php | 50 - .../Google/Service/Books/Resource/Bookshelves.php | 61 - .../Service/Books/Resource/BookshelvesVolumes.php | 50 - .../Google/Service/Books/Resource/Cloudloading.php | 73 - .../Google/Service/Books/Resource/Dictionary.php | 42 - .../src/Google/Service/Books/Resource/Layers.php | 66 - .../Books/Resource/LayersAnnotationData.php | 90 - .../Books/Resource/LayersVolumeAnnotations.php | 83 - .../src/Google/Service/Books/Resource/Myconfig.php | 126 - .../Google/Service/Books/Resource/Mylibrary.php | 28 - .../Books/Resource/MylibraryAnnotations.php | 119 - .../Books/Resource/MylibraryBookshelves.php | 125 - .../Books/Resource/MylibraryBookshelvesVolumes.php | 53 - .../Books/Resource/MylibraryReadingpositions.php | 71 - .../Google/Service/Books/Resource/Notification.php | 45 - .../Google/Service/Books/Resource/Onboarding.php | 67 - .../Service/Books/Resource/Personalizedstream.php | 47 - .../Google/Service/Books/Resource/Promooffer.php | 86 - .../src/Google/Service/Books/Resource/Series.php | 41 - .../Service/Books/Resource/SeriesMembership.php | 46 - .../src/Google/Service/Books/Resource/Volumes.php | 83 - .../Service/Books/Resource/VolumesAssociated.php | 49 - .../Service/Books/Resource/VolumesMybooks.php | 52 - .../Service/Books/Resource/VolumesRecommended.php | 66 - .../Service/Books/Resource/VolumesUseruploaded.php | 52 - .../src/Google/Service/Books/Review.php | 113 - .../src/Google/Service/Books/ReviewAuthor.php | 30 - .../src/Google/Service/Books/ReviewSource.php | 48 - .../src/Google/Service/Books/Series.php | 41 - .../src/Google/Service/Books/SeriesSeries.php | 66 - .../src/Google/Service/Books/Seriesmembership.php | 50 - .../src/Google/Service/Books/Usersettings.php | 50 - .../Service/Books/UsersettingsNotesExport.php | 39 - .../Service/Books/UsersettingsNotification.php | 41 - .../UsersettingsNotificationMoreFromAuthors.php | 33 - .../UsersettingsNotificationMoreFromSeries.php | 33 - .../src/Google/Service/Books/Volume.php | 127 - .../src/Google/Service/Books/Volume2.php | 50 - .../src/Google/Service/Books/VolumeAccessInfo.php | 150 - .../Google/Service/Books/VolumeAccessInfoEpub.php | 48 - .../Google/Service/Books/VolumeAccessInfoPdf.php | 48 - .../src/Google/Service/Books/VolumeLayerInfo.php | 32 - .../Google/Service/Books/VolumeLayerInfoLayers.php | 39 - .../Google/Service/Books/VolumeRecommendedInfo.php | 30 - .../src/Google/Service/Books/VolumeSaleInfo.php | 97 - .../Service/Books/VolumeSaleInfoListPrice.php | 39 - .../Google/Service/Books/VolumeSaleInfoOffers.php | 69 - .../Books/VolumeSaleInfoOffersListPrice.php | 39 - .../Books/VolumeSaleInfoOffersRentalDuration.php | 39 - .../Books/VolumeSaleInfoOffersRetailPrice.php | 39 - .../Service/Books/VolumeSaleInfoRetailPrice.php | 39 - .../src/Google/Service/Books/VolumeSearchInfo.php | 30 - .../src/Google/Service/Books/VolumeUserInfo.php | 198 - .../Google/Service/Books/VolumeUserInfoCopy.php | 57 - .../Service/Books/VolumeUserInfoFamilySharing.php | 48 - .../Service/Books/VolumeUserInfoRentalPeriod.php | 39 - .../Books/VolumeUserInfoUserUploadedVolumeInfo.php | 30 - .../src/Google/Service/Books/VolumeVolumeInfo.php | 270 - .../Service/Books/VolumeVolumeInfoDimensions.php | 48 - .../Service/Books/VolumeVolumeInfoImageLinks.php | 75 - .../Books/VolumeVolumeInfoIndustryIdentifiers.php | 39 - .../Books/VolumeVolumeInfoPanelizationSummary.php | 57 - .../src/Google/Service/Books/Volumeannotation.php | 149 - .../Books/VolumeannotationContentRanges.php | 60 - .../src/Google/Service/Books/Volumeannotations.php | 68 - .../src/Google/Service/Books/Volumes.php | 50 - .../src/Google/Service/Books/Volumeseriesinfo.php | 59 - .../Service/Books/VolumeseriesinfoVolumeSeries.php | 59 - .../Books/VolumeseriesinfoVolumeSeriesIssue.php | 39 - .../src/Google/Service/Calendar.php | 888 --- .../src/Google/Service/Calendar/Acl.php | 68 - .../src/Google/Service/Calendar/AclRule.php | 67 - .../src/Google/Service/Calendar/AclRuleScope.php | 39 - .../src/Google/Service/Calendar/Calendar.php | 84 - .../src/Google/Service/Calendar/CalendarList.php | 68 - .../Google/Service/Calendar/CalendarListEntry.php | 186 - .../CalendarListEntryNotificationSettings.php | 32 - .../Service/Calendar/CalendarNotification.php | 39 - .../src/Google/Service/Calendar/Channel.php | 111 - .../Google/Service/Calendar/ColorDefinition.php | 39 - .../src/Google/Service/Calendar/Colors.php | 59 - .../src/Google/Service/Calendar/Error.php | 39 - .../src/Google/Service/Calendar/Event.php | 366 -- .../Google/Service/Calendar/EventAttachment.php | 66 - .../src/Google/Service/Calendar/EventAttendee.php | 111 - .../src/Google/Service/Calendar/EventCreator.php | 57 - .../src/Google/Service/Calendar/EventDateTime.php | 48 - .../Service/Calendar/EventExtendedProperties.php | 39 - .../src/Google/Service/Calendar/EventGadget.php | 93 - .../src/Google/Service/Calendar/EventOrganizer.php | 57 - .../src/Google/Service/Calendar/EventReminder.php | 39 - .../src/Google/Service/Calendar/EventReminders.php | 41 - .../src/Google/Service/Calendar/EventSource.php | 39 - .../src/Google/Service/Calendar/Events.php | 123 - .../Google/Service/Calendar/FreeBusyCalendar.php | 42 - .../src/Google/Service/Calendar/FreeBusyGroup.php | 41 - .../Google/Service/Calendar/FreeBusyRequest.php | 77 - .../Service/Calendar/FreeBusyRequestItem.php | 30 - .../Google/Service/Calendar/FreeBusyResponse.php | 68 - .../src/Google/Service/Calendar/Resource/Acl.php | 177 - .../Service/Calendar/Resource/CalendarList.php | 191 - .../Google/Service/Calendar/Resource/Calendars.php | 119 - .../Google/Service/Calendar/Resource/Channels.php | 40 - .../Google/Service/Calendar/Resource/Colors.php | 40 - .../Google/Service/Calendar/Resource/Events.php | 440 -- .../Google/Service/Calendar/Resource/Freebusy.php | 41 - .../Google/Service/Calendar/Resource/Settings.php | 92 - .../src/Google/Service/Calendar/Setting.php | 57 - .../src/Google/Service/Calendar/Settings.php | 68 - .../src/Google/Service/Calendar/TimePeriod.php | 39 - .../src/Google/Service/CivicInfo.php | 166 - .../Service/CivicInfo/AdministrationRegion.php | 73 - .../Service/CivicInfo/AdministrativeBody.php | 154 - .../src/Google/Service/CivicInfo/Candidate.php | 95 - .../src/Google/Service/CivicInfo/Channel.php | 39 - .../src/Google/Service/CivicInfo/Contest.php | 241 - .../src/Google/Service/CivicInfo/ContextParams.php | 30 - .../DivisionRepresentativeInfoRequest.php | 31 - .../Service/CivicInfo/DivisionSearchRequest.php | 31 - .../Service/CivicInfo/DivisionSearchResponse.php | 41 - .../Service/CivicInfo/DivisionSearchResult.php | 49 - .../src/Google/Service/CivicInfo/Election.php | 57 - .../Google/Service/CivicInfo/ElectionOfficial.php | 66 - .../Service/CivicInfo/ElectionsQueryRequest.php | 31 - .../Service/CivicInfo/ElectionsQueryResponse.php | 41 - .../Google/Service/CivicInfo/ElectoralDistrict.php | 57 - .../Service/CivicInfo/GeographicDivision.php | 49 - .../src/Google/Service/CivicInfo/Office.php | 77 - .../src/Google/Service/CivicInfo/Official.php | 96 - .../Google/Service/CivicInfo/PollingLocation.php | 105 - .../src/Google/Service/CivicInfo/PostalAddress.php | 301 -- .../Service/CivicInfo/RepresentativeInfoData.php | 52 - .../CivicInfo/RepresentativeInfoRequest.php | 31 - .../CivicInfo/RepresentativeInfoResponse.php | 71 - .../Service/CivicInfo/Resource/Divisions.php | 47 - .../Service/CivicInfo/Resource/Elections.php | 64 - .../Service/CivicInfo/Resource/Representatives.php | 79 - .../Google/Service/CivicInfo/SimpleAddressType.php | 84 - .../src/Google/Service/CivicInfo/Source.php | 39 - .../Google/Service/CivicInfo/VoterInfoRequest.php | 41 - .../Google/Service/CivicInfo/VoterInfoResponse.php | 129 - .../Service/CivicInfo/VoterInfoSegmentResult.php | 60 - .../src/Google/Service/Classroom.php | 869 --- .../src/Google/Service/Classroom/Assignment.php | 31 - .../Service/Classroom/AssignmentSubmission.php | 32 - .../src/Google/Service/Classroom/Attachment.php | 61 - .../Google/Service/Classroom/ClassroomEmpty.php | 20 - .../src/Google/Service/Classroom/Course.php | 177 - .../src/Google/Service/Classroom/CourseAlias.php | 30 - .../Google/Service/Classroom/CourseMaterial.php | 61 - .../Google/Service/Classroom/CourseMaterialSet.php | 41 - .../src/Google/Service/Classroom/CourseWork.php | 180 - .../src/Google/Service/Classroom/Date.php | 48 - .../src/Google/Service/Classroom/DriveFile.php | 57 - .../src/Google/Service/Classroom/DriveFolder.php | 48 - .../src/Google/Service/Classroom/Form.php | 57 - .../Google/Service/Classroom/GlobalPermission.php | 30 - .../src/Google/Service/Classroom/Guardian.php | 58 - .../Service/Classroom/GuardianInvitation.php | 66 - .../src/Google/Service/Classroom/Invitation.php | 57 - .../src/Google/Service/Classroom/Link.php | 48 - .../Classroom/ListCourseAliasesResponse.php | 41 - .../Service/Classroom/ListCourseWorkResponse.php | 41 - .../Service/Classroom/ListCoursesResponse.php | 41 - .../Classroom/ListGuardianInvitationsResponse.php | 41 - .../Service/Classroom/ListGuardiansResponse.php | 41 - .../Service/Classroom/ListInvitationsResponse.php | 41 - .../Classroom/ListStudentSubmissionsResponse.php | 41 - .../Service/Classroom/ListStudentsResponse.php | 41 - .../Service/Classroom/ListTeachersResponse.php | 41 - .../src/Google/Service/Classroom/Material.php | 61 - .../Service/Classroom/ModifyAttachmentsRequest.php | 32 - .../Service/Classroom/MultipleChoiceQuestion.php | 31 - .../Service/Classroom/MultipleChoiceSubmission.php | 30 - .../src/Google/Service/Classroom/Name.php | 48 - .../Classroom/ReclaimStudentSubmissionRequest.php | 20 - .../Google/Service/Classroom/Resource/Courses.php | 163 - .../Service/Classroom/Resource/CoursesAliases.php | 91 - .../Classroom/Resource/CoursesCourseWork.php | 170 - .../CoursesCourseWorkStudentSubmissions.php | 240 - .../Service/Classroom/Resource/CoursesStudents.php | 123 - .../Service/Classroom/Resource/CoursesTeachers.php | 119 - .../Service/Classroom/Resource/Invitations.php | 131 - .../Service/Classroom/Resource/UserProfiles.php | 47 - .../Resource/UserProfilesGuardianInvitations.php | 166 - .../Classroom/Resource/UserProfilesGuardians.php | 124 - .../Classroom/ReturnStudentSubmissionRequest.php | 20 - .../Google/Service/Classroom/SharedDriveFile.php | 40 - .../Service/Classroom/ShortAnswerSubmission.php | 30 - .../src/Google/Service/Classroom/Student.php | 59 - .../Google/Service/Classroom/StudentSubmission.php | 168 - .../src/Google/Service/Classroom/Teacher.php | 49 - .../src/Google/Service/Classroom/TimeOfDay.php | 57 - .../Classroom/TurnInStudentSubmissionRequest.php | 20 - .../src/Google/Service/Classroom/UserProfile.php | 69 - .../src/Google/Service/Classroom/YouTubeVideo.php | 57 - .../src/Google/Service/CloudBuild.php | 254 - .../src/Google/Service/CloudBuild/Build.php | 189 - .../Service/CloudBuild/BuildOperationMetadata.php | 31 - .../src/Google/Service/CloudBuild/BuildOptions.php | 40 - .../src/Google/Service/CloudBuild/BuildStep.php | 85 - .../src/Google/Service/CloudBuild/BuildTrigger.php | 95 - .../src/Google/Service/CloudBuild/BuiltImage.php | 39 - .../Service/CloudBuild/CancelBuildRequest.php | 20 - .../Service/CloudBuild/CancelOperationRequest.php | 20 - .../Google/Service/CloudBuild/CloudbuildEmpty.php | 20 - .../src/Google/Service/CloudBuild/FileHashes.php | 32 - .../src/Google/Service/CloudBuild/Hash.php | 39 - .../CloudBuild/ListBuildTriggersResponse.php | 32 - .../Service/CloudBuild/ListBuildsResponse.php | 41 - .../Service/CloudBuild/ListOperationsResponse.php | 41 - .../src/Google/Service/CloudBuild/Operation.php | 67 - .../src/Google/Service/CloudBuild/RepoSource.php | 66 - .../Service/CloudBuild/Resource/Operations.php | 87 - .../Service/CloudBuild/Resource/Projects.php | 28 - .../Service/CloudBuild/Resource/ProjectsBuilds.php | 99 - .../CloudBuild/Resource/ProjectsTriggers.php | 109 - .../src/Google/Service/CloudBuild/Results.php | 41 - .../src/Google/Service/CloudBuild/Source.php | 41 - .../Google/Service/CloudBuild/SourceProvenance.php | 51 - .../src/Google/Service/CloudBuild/Status.php | 49 - .../Google/Service/CloudBuild/StorageSource.php | 48 - .../src/Google/Service/CloudDebugger.php | 240 - .../Google/Service/CloudDebugger/AliasContext.php | 39 - .../Google/Service/CloudDebugger/Breakpoint.php | 171 - .../CloudDebugger/CloudRepoSourceContext.php | 59 - .../Service/CloudDebugger/CloudWorkspaceId.php | 40 - .../CloudDebugger/CloudWorkspaceSourceContext.php | 40 - .../Service/CloudDebugger/ClouddebuggerEmpty.php | 20 - .../src/Google/Service/CloudDebugger/Debuggee.php | 124 - .../CloudDebugger/ExtendedSourceContext.php | 40 - .../Google/Service/CloudDebugger/FormatMessage.php | 40 - .../Service/CloudDebugger/GerritSourceContext.php | 67 - .../CloudDebugger/GetBreakpointResponse.php | 31 - .../Service/CloudDebugger/GitSourceContext.php | 39 - .../ListActiveBreakpointsResponse.php | 50 - .../CloudDebugger/ListBreakpointsResponse.php | 41 - .../CloudDebugger/ListDebuggeesResponse.php | 32 - .../Google/Service/CloudDebugger/ProjectRepoId.php | 39 - .../CloudDebugger/RegisterDebuggeeRequest.php | 31 - .../CloudDebugger/RegisterDebuggeeResponse.php | 31 - .../src/Google/Service/CloudDebugger/RepoId.php | 40 - .../Service/CloudDebugger/Resource/Controller.php | 28 - .../CloudDebugger/Resource/ControllerDebuggees.php | 50 - .../Resource/ControllerDebuggeesBreakpoints.php | 85 - .../Service/CloudDebugger/Resource/Debugger.php | 28 - .../CloudDebugger/Resource/DebuggerDebuggees.php | 48 - .../Resource/DebuggerDebuggeesBreakpoints.php | 113 - .../CloudDebugger/SetBreakpointResponse.php | 31 - .../Google/Service/CloudDebugger/SourceContext.php | 61 - .../Service/CloudDebugger/SourceLocation.php | 39 - .../Google/Service/CloudDebugger/StackFrame.php | 61 - .../Google/Service/CloudDebugger/StatusMessage.php | 49 - .../UpdateActiveBreakpointRequest.php | 31 - .../UpdateActiveBreakpointResponse.php | 20 - .../src/Google/Service/CloudDebugger/Variable.php | 78 - .../src/Google/Service/CloudFunctions.php | 207 - .../Service/CloudFunctions/CallFunctionRequest.php | 30 - .../CloudFunctions/CallFunctionResponse.php | 48 - .../Service/CloudFunctions/CloudFunction.php | 132 - .../Google/Service/CloudFunctions/EventTrigger.php | 39 - .../Google/Service/CloudFunctions/HTTPSTrigger.php | 30 - .../CloudFunctions/ListFunctionsResponse.php | 41 - .../CloudFunctions/ListLocationsResponse.php | 41 - .../CloudFunctions/ListOperationsResponse.php | 41 - .../src/Google/Service/CloudFunctions/Location.php | 57 - .../Google/Service/CloudFunctions/Operation.php | 67 - .../CloudFunctions/OperationMetadataV1Beta2.php | 48 - .../Service/CloudFunctions/Resource/Operations.php | 65 - .../Service/CloudFunctions/Resource/Projects.php | 28 - .../CloudFunctions/Resource/ProjectsLocations.php | 47 - .../Resource/ProjectsLocationsFunctions.php | 126 - .../Service/CloudFunctions/SourceRepository.php | 75 - .../src/Google/Service/CloudFunctions/Status.php | 49 - .../src/Google/Service/CloudKMS.php | 389 -- .../src/Google/Service/CloudKMS/AuditConfig.php | 50 - .../src/Google/Service/CloudKMS/AuditLogConfig.php | 40 - .../src/Google/Service/CloudKMS/Binding.php | 40 - .../Google/Service/CloudKMS/CloudAuditOptions.php | 20 - .../src/Google/Service/CloudKMS/Condition.php | 76 - .../src/Google/Service/CloudKMS/CounterOptions.php | 39 - .../src/Google/Service/CloudKMS/CryptoKey.php | 76 - .../Google/Service/CloudKMS/CryptoKeyVersion.php | 66 - .../Google/Service/CloudKMS/DataAccessOptions.php | 20 - .../src/Google/Service/CloudKMS/DecryptRequest.php | 39 - .../Google/Service/CloudKMS/DecryptResponse.php | 30 - .../CloudKMS/DestroyCryptoKeyVersionRequest.php | 20 - .../src/Google/Service/CloudKMS/EncryptRequest.php | 39 - .../Google/Service/CloudKMS/EncryptResponse.php | 39 - .../src/Google/Service/CloudKMS/KeyRing.php | 39 - .../CloudKMS/ListCryptoKeyVersionsResponse.php | 50 - .../Service/CloudKMS/ListCryptoKeysResponse.php | 50 - .../Service/CloudKMS/ListKeyRingsResponse.php | 50 - .../Service/CloudKMS/ListLocationsResponse.php | 41 - .../src/Google/Service/CloudKMS/Location.php | 57 - .../src/Google/Service/CloudKMS/LogConfig.php | 51 - .../src/Google/Service/CloudKMS/Policy.php | 79 - .../Google/Service/CloudKMS/Resource/Projects.php | 28 - .../CloudKMS/Resource/ProjectsLocations.php | 60 - .../Resource/ProjectsLocationsKeyRings.php | 135 - .../ProjectsLocationsKeyRingsCryptoKeys.php | 204 - ...ocationsKeyRingsCryptoKeysCryptoKeyVersions.php | 143 - .../CloudKMS/RestoreCryptoKeyVersionRequest.php | 20 - .../src/Google/Service/CloudKMS/Rule.php | 87 - .../Service/CloudKMS/SetIamPolicyRequest.php | 40 - .../Service/CloudKMS/TestIamPermissionsRequest.php | 31 - .../CloudKMS/TestIamPermissionsResponse.php | 31 - .../UpdateCryptoKeyPrimaryVersionRequest.php | 30 - .../src/Google/Service/CloudMachineLearning.php | 337 -- .../CloudMachineLearning/GoogleApiHttpBody.php | 39 - .../GoogleCloudMlV1beta1CancelJobRequest.php | 20 - .../GoogleCloudMlV1beta1GetConfigResponse.php | 39 - .../GoogleCloudMlV1beta1HyperparameterOutput.php | 60 - ...ta1HyperparameterOutputHyperparameterMetric.php | 39 - .../GoogleCloudMlV1beta1HyperparameterSpec.php | 59 - .../GoogleCloudMlV1beta1Job.php | 115 - .../GoogleCloudMlV1beta1ListJobsResponse.php | 41 - .../GoogleCloudMlV1beta1ListModelsResponse.php | 41 - .../GoogleCloudMlV1beta1ListVersionsResponse.php | 41 - .../GoogleCloudMlV1beta1Model.php | 49 - .../GoogleCloudMlV1beta1OperationMetadata.php | 85 - .../GoogleCloudMlV1beta1ParameterSpec.php | 85 - .../GoogleCloudMlV1beta1PredictRequest.php | 31 - .../GoogleCloudMlV1beta1PredictionInput.php | 85 - .../GoogleCloudMlV1beta1PredictionOutput.php | 48 - ...oogleCloudMlV1beta1SetDefaultVersionRequest.php | 20 - .../GoogleCloudMlV1beta1TrainingInput.php | 122 - .../GoogleCloudMlV1beta1TrainingOutput.php | 50 - .../GoogleCloudMlV1beta1Version.php | 75 - .../GoogleLongrunningListOperationsResponse.php | 41 - .../GoogleLongrunningOperation.php | 67 - .../CloudMachineLearning/GoogleProtobufEmpty.php | 20 - .../CloudMachineLearning/GoogleRpcStatus.php | 49 - .../CloudMachineLearning/Resource/Projects.php | 103 - .../CloudMachineLearning/Resource/ProjectsJobs.php | 103 - .../Resource/ProjectsModels.php | 114 - .../Resource/ProjectsModelsVersions.php | 152 - .../Resource/ProjectsOperations.php | 102 - .../Google/Service/CloudMachineLearningEngine.php | 338 -- .../GoogleApiHttpBody.php | 39 - .../GoogleCloudMlV1CancelJobRequest.php | 20 - .../GoogleCloudMlV1GetConfigResponse.php | 39 - .../GoogleCloudMlV1HyperparameterOutput.php | 60 - ...lV1HyperparameterOutputHyperparameterMetric.php | 39 - .../GoogleCloudMlV1HyperparameterSpec.php | 68 - .../GoogleCloudMlV1Job.php | 115 - .../GoogleCloudMlV1ListJobsResponse.php | 41 - .../GoogleCloudMlV1ListModelsResponse.php | 41 - .../GoogleCloudMlV1ListVersionsResponse.php | 41 - .../GoogleCloudMlV1ManualScaling.php | 30 - .../GoogleCloudMlV1Model.php | 68 - .../GoogleCloudMlV1OperationMetadata.php | 85 - .../GoogleCloudMlV1ParameterSpec.php | 85 - .../GoogleCloudMlV1PredictRequest.php | 31 - .../GoogleCloudMlV1PredictionInput.php | 103 - .../GoogleCloudMlV1PredictionOutput.php | 57 - .../GoogleCloudMlV1SetDefaultVersionRequest.php | 20 - .../GoogleCloudMlV1TrainingInput.php | 140 - .../GoogleCloudMlV1TrainingOutput.php | 59 - .../GoogleCloudMlV1Version.php | 94 - .../GoogleCloudMlV1beta1ManualScaling.php | 30 - .../GoogleCloudMlV1beta1OperationMetadata.php | 85 - .../GoogleCloudMlV1beta1Version.php | 94 - .../GoogleLongrunningListOperationsResponse.php | 41 - .../GoogleLongrunningOperation.php | 67 - .../GoogleProtobufEmpty.php | 20 - .../CloudMachineLearningEngine/GoogleRpcStatus.php | 49 - .../Resource/Projects.php | 64 - .../Resource/ProjectsJobs.php | 103 - .../Resource/ProjectsModels.php | 114 - .../Resource/ProjectsModelsVersions.php | 152 - .../Resource/ProjectsOperations.php | 102 - .../src/Google/Service/CloudMonitoring.php | 243 - .../DeleteMetricDescriptorResponse.php | 30 - .../ListMetricDescriptorsRequest.php | 30 - .../ListMetricDescriptorsResponse.php | 50 - .../ListTimeseriesDescriptorsRequest.php | 30 - .../ListTimeseriesDescriptorsResponse.php | 68 - .../CloudMonitoring/ListTimeseriesRequest.php | 30 - .../CloudMonitoring/ListTimeseriesResponse.php | 68 - .../Service/CloudMonitoring/MetricDescriptor.php | 69 - .../MetricDescriptorLabelDescriptor.php | 39 - .../MetricDescriptorTypeDescriptor.php | 39 - .../src/Google/Service/CloudMonitoring/Point.php | 85 - .../Service/CloudMonitoring/PointDistribution.php | 52 - .../CloudMonitoring/PointDistributionBucket.php | 48 - .../PointDistributionOverflowBucket.php | 39 - .../PointDistributionUnderflowBucket.php | 39 - .../CloudMonitoring/Resource/MetricDescriptors.php | 86 - .../CloudMonitoring/Resource/Timeseries.php | 104 - .../Resource/TimeseriesDescriptors.php | 83 - .../Google/Service/CloudMonitoring/Timeseries.php | 42 - .../CloudMonitoring/TimeseriesDescriptor.php | 48 - .../CloudMonitoring/TimeseriesDescriptorLabel.php | 39 - .../Service/CloudMonitoring/TimeseriesPoint.php | 41 - .../CloudMonitoring/WriteTimeseriesRequest.php | 41 - .../CloudMonitoring/WriteTimeseriesResponse.php | 30 - .../src/Google/Service/CloudNaturalLanguage.php | 81 - .../AnalyzeEntitiesRequest.php | 40 - .../AnalyzeEntitiesResponse.php | 41 - .../AnalyzeSentimentRequest.php | 40 - .../AnalyzeSentimentResponse.php | 51 - .../CloudNaturalLanguage/AnalyzeSyntaxRequest.php | 40 - .../CloudNaturalLanguage/AnalyzeSyntaxResponse.php | 51 - .../CloudNaturalLanguage/AnnotateTextRequest.php | 50 - .../CloudNaturalLanguage/AnnotateTextResponse.php | 71 - .../CloudNaturalLanguage/DependencyEdge.php | 39 - .../Service/CloudNaturalLanguage/Document.php | 57 - .../Google/Service/CloudNaturalLanguage/Entity.php | 68 - .../Service/CloudNaturalLanguage/EntityMention.php | 40 - .../Service/CloudNaturalLanguage/Features.php | 48 - .../Service/CloudNaturalLanguage/PartOfSpeech.php | 129 - .../CloudNaturalLanguage/Resource/Documents.php | 86 - .../Service/CloudNaturalLanguage/Sentence.php | 41 - .../Service/CloudNaturalLanguage/Sentiment.php | 39 - .../Google/Service/CloudNaturalLanguage/Status.php | 49 - .../Service/CloudNaturalLanguage/TextSpan.php | 39 - .../Google/Service/CloudNaturalLanguage/Token.php | 60 - .../src/Google/Service/CloudNaturalLanguageAPI.php | 78 - .../AnalyzeEntitiesRequest.php | 40 - .../AnalyzeEntitiesResponse.php | 41 - .../AnalyzeSentimentRequest.php | 31 - .../AnalyzeSentimentResponse.php | 40 - .../AnnotateTextRequest.php | 50 - .../AnnotateTextResponse.php | 71 - .../CloudNaturalLanguageAPI/DependencyEdge.php | 39 - .../Service/CloudNaturalLanguageAPI/Document.php | 57 - .../Service/CloudNaturalLanguageAPI/Entity.php | 68 - .../CloudNaturalLanguageAPI/EntityMention.php | 31 - .../Service/CloudNaturalLanguageAPI/Features.php | 48 - .../CloudNaturalLanguageAPI/PartOfSpeech.php | 30 - .../CloudNaturalLanguageAPI/Resource/Documents.php | 71 - .../Service/CloudNaturalLanguageAPI/Sentence.php | 31 - .../Service/CloudNaturalLanguageAPI/Sentiment.php | 39 - .../Service/CloudNaturalLanguageAPI/Status.php | 49 - .../Service/CloudNaturalLanguageAPI/TextSpan.php | 39 - .../Service/CloudNaturalLanguageAPI/Token.php | 60 - .../src/Google/Service/CloudResourceManager.php | 286 - .../Service/CloudResourceManager/Ancestor.php | 31 - .../Service/CloudResourceManager/AuditConfig.php | 41 - .../CloudResourceManager/AuditLogConfig.php | 40 - .../Service/CloudResourceManager/Binding.php | 40 - .../CloudresourcemanagerEmpty.php | 20 - .../CloudResourceManager/FolderOperation.php | 57 - .../CloudResourceManager/FolderOperationError.php | 30 - .../CloudResourceManager/GetAncestryRequest.php | 20 - .../CloudResourceManager/GetAncestryResponse.php | 32 - .../CloudResourceManager/GetIamPolicyRequest.php | 20 - .../Google/Service/CloudResourceManager/Lien.php | 76 - .../CloudResourceManager/ListLiensResponse.php | 41 - .../CloudResourceManager/ListProjectsResponse.php | 41 - .../Service/CloudResourceManager/Operation.php | 67 - .../Service/CloudResourceManager/Organization.php | 67 - .../CloudResourceManager/OrganizationOwner.php | 30 - .../Google/Service/CloudResourceManager/Policy.php | 60 - .../Service/CloudResourceManager/Project.php | 85 - .../CloudResourceManager/ProjectCreationStatus.php | 48 - .../CloudResourceManager/Resource/Liens.php | 88 - .../CloudResourceManager/Resource/Operations.php | 43 - .../Resource/Organizations.php | 114 - .../CloudResourceManager/Resource/Projects.php | 286 - .../Service/CloudResourceManager/ResourceId.php | 39 - .../SearchOrganizationsRequest.php | 48 - .../SearchOrganizationsResponse.php | 41 - .../CloudResourceManager/SetIamPolicyRequest.php | 40 - .../Google/Service/CloudResourceManager/Status.php | 49 - .../TestIamPermissionsRequest.php | 31 - .../TestIamPermissionsResponse.php | 31 - .../UndeleteProjectRequest.php | 20 - .../src/Google/Service/CloudRuntimeConfig.php | 109 - .../CloudRuntimeConfig/CancelOperationRequest.php | 20 - .../Service/CloudRuntimeConfig/Cardinality.php | 39 - .../Service/CloudRuntimeConfig/EndCondition.php | 31 - .../CloudRuntimeConfig/ListConfigsResponse.php | 41 - .../CloudRuntimeConfig/ListOperationsResponse.php | 41 - .../CloudRuntimeConfig/ListVariablesResponse.php | 41 - .../CloudRuntimeConfig/ListWaitersResponse.php | 41 - .../Service/CloudRuntimeConfig/Operation.php | 67 - .../CloudRuntimeConfig/Resource/Operations.php | 88 - .../CloudRuntimeConfig/Resource/Projects.php | 28 - .../Resource/ProjectsConfigs.php | 123 - .../Resource/ProjectsConfigsOperations.php | 43 - .../Resource/ProjectsConfigsVariables.php | 170 - .../Resource/ProjectsConfigsWaiters.php | 111 - .../Service/CloudRuntimeConfig/RuntimeConfig.php | 39 - .../CloudRuntimeConfig/RuntimeconfigEmpty.php | 20 - .../Google/Service/CloudRuntimeConfig/Status.php | 49 - .../Google/Service/CloudRuntimeConfig/Variable.php | 66 - .../Google/Service/CloudRuntimeConfig/Waiter.php | 87 - .../CloudRuntimeConfig/WatchVariableRequest.php | 30 - .../src/Google/Service/CloudSourceRepositories.php | 134 - .../CloudSourceRepositories/AuditConfig.php | 50 - .../CloudSourceRepositories/AuditLogConfig.php | 40 - .../Service/CloudSourceRepositories/Binding.php | 40 - .../CloudSourceRepositories/CloudAuditOptions.php | 20 - .../Service/CloudSourceRepositories/Condition.php | 76 - .../CloudSourceRepositories/CounterOptions.php | 39 - .../CloudSourceRepositories/DataAccessOptions.php | 20 - .../CloudSourceRepositories/ListReposResponse.php | 32 - .../Service/CloudSourceRepositories/LogConfig.php | 51 - .../CloudSourceRepositories/MirrorConfig.php | 48 - .../Service/CloudSourceRepositories/Policy.php | 79 - .../Service/CloudSourceRepositories/Repo.php | 58 - .../CloudSourceRepositories/Resource/Projects.php | 28 - .../Resource/ProjectsRepos.php | 139 - .../Service/CloudSourceRepositories/Rule.php | 87 - .../SetIamPolicyRequest.php | 40 - .../CloudSourceRepositories/SourcerepoEmpty.php | 20 - .../TestIamPermissionsRequest.php | 31 - .../TestIamPermissionsResponse.php | 31 - .../src/Google/Service/CloudSpeechAPI.php | 133 - .../CloudSpeechAPI/AsyncRecognizeRequest.php | 41 - .../CloudSpeechAPI/CancelOperationRequest.php | 20 - .../CloudSpeechAPI/ListOperationsResponse.php | 41 - .../Google/Service/CloudSpeechAPI/Operation.php | 67 - .../Service/CloudSpeechAPI/RecognitionAudio.php | 39 - .../Service/CloudSpeechAPI/RecognitionConfig.php | 76 - .../Service/CloudSpeechAPI/Resource/Operations.php | 100 - .../Service/CloudSpeechAPI/Resource/Speech.php | 58 - .../Service/CloudSpeechAPI/SpeechContext.php | 31 - .../Google/Service/CloudSpeechAPI/SpeechEmpty.php | 20 - .../SpeechRecognitionAlternative.php | 39 - .../CloudSpeechAPI/SpeechRecognitionResult.php | 32 - .../src/Google/Service/CloudSpeechAPI/Status.php | 49 - .../CloudSpeechAPI/SyncRecognizeRequest.php | 41 - .../CloudSpeechAPI/SyncRecognizeResponse.php | 32 - .../src/Google/Service/CloudTrace.php | 146 - .../Google/Service/CloudTrace/CloudtraceEmpty.php | 20 - .../Service/CloudTrace/ListTracesResponse.php | 41 - .../Service/CloudTrace/Resource/Projects.php | 47 - .../Service/CloudTrace/Resource/ProjectsTraces.php | 83 - .../src/Google/Service/CloudTrace/Trace.php | 50 - .../src/Google/Service/CloudTrace/TraceSpan.php | 84 - .../src/Google/Service/CloudTrace/Traces.php | 32 - .../src/Google/Service/CloudUserAccounts.php | 514 -- .../Service/CloudUserAccounts/AuditConfig.php | 40 - .../CloudUserAccounts/AuthorizedKeysView.php | 40 - .../Google/Service/CloudUserAccounts/Binding.php | 40 - .../Google/Service/CloudUserAccounts/Condition.php | 76 - .../src/Google/Service/CloudUserAccounts/Group.php | 85 - .../Google/Service/CloudUserAccounts/GroupList.php | 68 - .../CloudUserAccounts/GroupsAddMemberRequest.php | 31 - .../GroupsRemoveMemberRequest.php | 31 - .../CloudUserAccounts/LinuxAccountViews.php | 51 - .../LinuxGetAuthorizedKeysViewResponse.php | 31 - .../LinuxGetLinuxAccountViewsResponse.php | 31 - .../Service/CloudUserAccounts/LinuxGroupView.php | 49 - .../Service/CloudUserAccounts/LinuxUserView.php | 75 - .../Google/Service/CloudUserAccounts/LogConfig.php | 31 - .../CloudUserAccounts/LogConfigCounterOptions.php | 39 - .../Google/Service/CloudUserAccounts/Operation.php | 231 - .../Service/CloudUserAccounts/OperationError.php | 32 - .../CloudUserAccounts/OperationErrorErrors.php | 48 - .../Service/CloudUserAccounts/OperationList.php | 68 - .../CloudUserAccounts/OperationWarnings.php | 50 - .../CloudUserAccounts/OperationWarningsData.php | 39 - .../Google/Service/CloudUserAccounts/Policy.php | 79 - .../Google/Service/CloudUserAccounts/PublicKey.php | 66 - .../Resource/GlobalAccountsOperations.php | 113 - .../Service/CloudUserAccounts/Resource/Groups.php | 206 - .../Service/CloudUserAccounts/Resource/Linux.php | 111 - .../Service/CloudUserAccounts/Resource/Users.php | 209 - .../src/Google/Service/CloudUserAccounts/Rule.php | 87 - .../CloudUserAccounts/TestPermissionsRequest.php | 31 - .../CloudUserAccounts/TestPermissionsResponse.php | 31 - .../src/Google/Service/CloudUserAccounts/User.php | 104 - .../Google/Service/CloudUserAccounts/UserList.php | 68 - .../src/Google/Service/Cloudbilling.php | 147 - .../Google/Service/Cloudbilling/BillingAccount.php | 48 - .../Cloudbilling/ListBillingAccountsResponse.php | 41 - .../ListProjectBillingInfoResponse.php | 41 - .../Service/Cloudbilling/ProjectBillingInfo.php | 57 - .../Cloudbilling/Resource/BillingAccounts.php | 66 - .../Resource/BillingAccountsProjects.php | 53 - .../Service/Cloudbilling/Resource/Projects.php | 89 - .../src/Google/Service/Clouderrorreporting.php | 231 - .../Clouderrorreporting/DeleteEventsResponse.php | 20 - .../Service/Clouderrorreporting/ErrorContext.php | 50 - .../Service/Clouderrorreporting/ErrorEvent.php | 59 - .../Service/Clouderrorreporting/ErrorGroup.php | 50 - .../Clouderrorreporting/ErrorGroupStats.php | 107 - .../Clouderrorreporting/HttpRequestContext.php | 75 - .../Clouderrorreporting/ListEventsResponse.php | 50 - .../Clouderrorreporting/ListGroupStatsResponse.php | 50 - .../ReportErrorEventResponse.php | 20 - .../Clouderrorreporting/ReportedErrorEvent.php | 59 - .../Clouderrorreporting/Resource/Projects.php | 44 - .../Resource/ProjectsEvents.php | 85 - .../Resource/ProjectsGroupStats.php | 71 - .../Resource/ProjectsGroups.php | 62 - .../Service/Clouderrorreporting/ServiceContext.php | 48 - .../Service/Clouderrorreporting/SourceLocation.php | 48 - .../Service/Clouderrorreporting/TimedCount.php | 48 - .../Service/Clouderrorreporting/TrackingIssue.php | 30 - .../src/Google/Service/Cloudlatencytest.php | 71 - .../Service/Cloudlatencytest/AggregatedStats.php | 32 - .../Cloudlatencytest/AggregatedStatsReply.php | 30 - .../Service/Cloudlatencytest/DoubleValue.php | 39 - .../Google/Service/Cloudlatencytest/IntValue.php | 39 - .../src/Google/Service/Cloudlatencytest/Stats.php | 61 - .../Google/Service/Cloudlatencytest/StatsReply.php | 30 - .../Cloudlatencytest/StatscollectionResource.php | 54 - .../Service/Cloudlatencytest/StringValue.php | 39 - .../src/Google/Service/Compute.php | 5692 -------------------- .../src/Google/Service/Compute/AccessConfig.php | 57 - .../src/Google/Service/Compute/Address.php | 112 - .../Service/Compute/AddressAggregatedList.php | 67 - .../src/Google/Service/Compute/AddressList.php | 68 - .../Google/Service/Compute/AddressesScopedList.php | 42 - .../Service/Compute/AddressesScopedListWarning.php | 50 - .../Compute/AddressesScopedListWarningData.php | 39 - .../src/Google/Service/Compute/AttachedDisk.php | 132 - .../Compute/AttachedDiskInitializeParams.php | 67 - .../src/Google/Service/Compute/Autoscaler.php | 112 - .../Service/Compute/AutoscalerAggregatedList.php | 67 - .../src/Google/Service/Compute/AutoscalerList.php | 68 - .../Service/Compute/AutoscalersScopedList.php | 42 - .../Compute/AutoscalersScopedListWarning.php | 50 - .../Compute/AutoscalersScopedListWarningData.php | 39 - .../Google/Service/Compute/AutoscalingPolicy.php | 79 - .../Compute/AutoscalingPolicyCpuUtilization.php | 30 - .../AutoscalingPolicyCustomMetricUtilization.php | 48 - .../AutoscalingPolicyLoadBalancingUtilization.php | 30 - .../src/Google/Service/Compute/Backend.php | 102 - .../src/Google/Service/Compute/BackendBucket.php | 93 - .../Google/Service/Compute/BackendBucketList.php | 68 - .../src/Google/Service/Compute/BackendService.php | 195 - .../Compute/BackendServiceAggregatedList.php | 67 - .../Service/Compute/BackendServiceGroupHealth.php | 41 - .../Google/Service/Compute/BackendServiceList.php | 68 - .../Service/Compute/BackendServicesScopedList.php | 42 - .../Compute/BackendServicesScopedListWarning.php | 50 - .../BackendServicesScopedListWarningData.php | 39 - .../Service/Compute/CacheInvalidationRule.php | 39 - .../Google/Service/Compute/ConnectionDraining.php | 30 - .../Service/Compute/CustomerEncryptionKey.php | 39 - .../Compute/CustomerEncryptionKeyProtectedDisk.php | 40 - .../Google/Service/Compute/DeprecationStatus.php | 66 - .../src/Google/Service/Compute/Disk.php | 223 - .../Google/Service/Compute/DiskAggregatedList.php | 67 - .../src/Google/Service/Compute/DiskList.php | 68 - .../src/Google/Service/Compute/DiskMoveRequest.php | 39 - .../src/Google/Service/Compute/DiskType.php | 112 - .../Service/Compute/DiskTypeAggregatedList.php | 67 - .../src/Google/Service/Compute/DiskTypeList.php | 68 - .../Google/Service/Compute/DiskTypesScopedList.php | 42 - .../Service/Compute/DiskTypesScopedListWarning.php | 50 - .../Compute/DiskTypesScopedListWarningData.php | 39 - .../Google/Service/Compute/DisksResizeRequest.php | 30 - .../src/Google/Service/Compute/DisksScopedList.php | 42 - .../Service/Compute/DisksScopedListWarning.php | 50 - .../Service/Compute/DisksScopedListWarningData.php | 39 - .../src/Google/Service/Compute/Firewall.php | 122 - .../src/Google/Service/Compute/FirewallAllowed.php | 43 - .../src/Google/Service/Compute/FirewallList.php | 68 - .../src/Google/Service/Compute/ForwardingRule.php | 170 - .../Compute/ForwardingRuleAggregatedList.php | 67 - .../Google/Service/Compute/ForwardingRuleList.php | 68 - .../Service/Compute/ForwardingRulesScopedList.php | 42 - .../Compute/ForwardingRulesScopedListWarning.php | 50 - .../ForwardingRulesScopedListWarningData.php | 39 - .../src/Google/Service/Compute/GuestOsFeature.php | 30 - .../Google/Service/Compute/HTTP2HealthCheck.php | 66 - .../src/Google/Service/Compute/HealthCheck.php | 160 - .../src/Google/Service/Compute/HealthCheckList.php | 68 - .../Service/Compute/HealthCheckReference.php | 30 - .../src/Google/Service/Compute/HealthStatus.php | 57 - .../src/Google/Service/Compute/HostRule.php | 49 - .../src/Google/Service/Compute/HttpHealthCheck.php | 138 - .../Google/Service/Compute/HttpHealthCheckList.php | 68 - .../Google/Service/Compute/HttpsHealthCheck.php | 138 - .../Service/Compute/HttpsHealthCheckList.php | 68 - .../src/Google/Service/Compute/Image.php | 198 - .../src/Google/Service/Compute/ImageList.php | 68 - .../src/Google/Service/Compute/ImageRawDisk.php | 48 - .../src/Google/Service/Compute/Instance.php | 190 - .../Service/Compute/InstanceAggregatedList.php | 67 - .../src/Google/Service/Compute/InstanceGroup.php | 140 - .../Compute/InstanceGroupAggregatedList.php | 67 - .../Google/Service/Compute/InstanceGroupList.php | 68 - .../Service/Compute/InstanceGroupManager.php | 168 - .../Compute/InstanceGroupManagerActionsSummary.php | 93 - .../Compute/InstanceGroupManagerAggregatedList.php | 67 - .../Service/Compute/InstanceGroupManagerList.php | 68 - ...nstanceGroupManagersAbandonInstancesRequest.php | 31 - ...InstanceGroupManagersDeleteInstancesRequest.php | 31 - ...ceGroupManagersListManagedInstancesResponse.php | 32 - ...stanceGroupManagersRecreateInstancesRequest.php | 31 - .../Compute/InstanceGroupManagersScopedList.php | 42 - .../InstanceGroupManagersScopedListWarning.php | 50 - .../InstanceGroupManagersScopedListWarningData.php | 39 - ...anceGroupManagersSetInstanceTemplateRequest.php | 30 - .../InstanceGroupManagersSetTargetPoolsRequest.php | 40 - .../Compute/InstanceGroupsAddInstancesRequest.php | 32 - .../Compute/InstanceGroupsListInstances.php | 68 - .../Compute/InstanceGroupsListInstancesRequest.php | 30 - .../InstanceGroupsRemoveInstancesRequest.php | 32 - .../Service/Compute/InstanceGroupsScopedList.php | 42 - .../Compute/InstanceGroupsScopedListWarning.php | 50 - .../InstanceGroupsScopedListWarningData.php | 39 - .../Compute/InstanceGroupsSetNamedPortsRequest.php | 41 - .../src/Google/Service/Compute/InstanceList.php | 68 - .../Google/Service/Compute/InstanceMoveRequest.php | 39 - .../Google/Service/Compute/InstanceProperties.php | 109 - .../Google/Service/Compute/InstanceReference.php | 30 - .../Google/Service/Compute/InstanceTemplate.php | 85 - .../Service/Compute/InstanceTemplateList.php | 68 - .../Service/Compute/InstanceWithNamedPorts.php | 50 - .../Google/Service/Compute/InstancesScopedList.php | 42 - .../Service/Compute/InstancesScopedListWarning.php | 50 - .../Compute/InstancesScopedListWarningData.php | 39 - .../Compute/InstancesSetMachineTypeRequest.php | 30 - .../Compute/InstancesSetServiceAccountRequest.php | 40 - .../InstancesStartWithEncryptionKeyRequest.php | 32 - .../src/Google/Service/Compute/License.php | 57 - .../src/Google/Service/Compute/MachineType.php | 159 - .../Service/Compute/MachineTypeAggregatedList.php | 67 - .../src/Google/Service/Compute/MachineTypeList.php | 68 - .../Service/Compute/MachineTypeScratchDisks.php | 30 - .../Service/Compute/MachineTypesScopedList.php | 42 - .../Compute/MachineTypesScopedListWarning.php | 50 - .../Compute/MachineTypesScopedListWarningData.php | 39 - .../src/Google/Service/Compute/ManagedInstance.php | 67 - .../Service/Compute/ManagedInstanceLastAttempt.php | 31 - .../Compute/ManagedInstanceLastAttemptErrors.php | 32 - .../ManagedInstanceLastAttemptErrorsErrors.php | 48 - .../src/Google/Service/Compute/Metadata.php | 50 - .../src/Google/Service/Compute/MetadataItems.php | 39 - .../src/Google/Service/Compute/NamedPort.php | 39 - .../src/Google/Service/Compute/Network.php | 115 - .../Google/Service/Compute/NetworkInterface.php | 77 - .../src/Google/Service/Compute/NetworkList.php | 68 - .../src/Google/Service/Compute/Operation.php | 231 - .../Service/Compute/OperationAggregatedList.php | 67 - .../src/Google/Service/Compute/OperationError.php | 32 - .../Service/Compute/OperationErrorErrors.php | 48 - .../src/Google/Service/Compute/OperationList.php | 68 - .../Google/Service/Compute/OperationWarnings.php | 50 - .../Service/Compute/OperationWarningsData.php | 39 - .../Service/Compute/OperationsScopedList.php | 42 - .../Compute/OperationsScopedListWarning.php | 50 - .../Compute/OperationsScopedListWarningData.php | 39 - .../src/Google/Service/Compute/PathMatcher.php | 59 - .../src/Google/Service/Compute/PathRule.php | 40 - .../src/Google/Service/Compute/Project.php | 124 - .../src/Google/Service/Compute/Quota.php | 48 - .../src/Google/Service/Compute/Region.php | 114 - .../Service/Compute/RegionAutoscalerList.php | 68 - .../Service/Compute/RegionInstanceGroupList.php | 68 - .../Compute/RegionInstanceGroupManagerList.php | 68 - ...nstanceGroupManagersAbandonInstancesRequest.php | 31 - ...InstanceGroupManagersDeleteInstancesRequest.php | 31 - ...nInstanceGroupManagersListInstancesResponse.php | 32 - .../RegionInstanceGroupManagersRecreateRequest.php | 31 - ...nInstanceGroupManagersSetTargetPoolsRequest.php | 40 - ...gionInstanceGroupManagersSetTemplateRequest.php | 30 - .../Compute/RegionInstanceGroupsListInstances.php | 68 - .../RegionInstanceGroupsListInstancesRequest.php | 39 - .../RegionInstanceGroupsSetNamedPortsRequest.php | 41 - .../src/Google/Service/Compute/RegionList.php | 68 - .../Google/Service/Compute/Resource/Addresses.php | 188 - .../Service/Compute/Resource/Autoscalers.php | 224 - .../Service/Compute/Resource/BackendBuckets.php | 161 - .../Service/Compute/Resource/BackendServices.php | 241 - .../Google/Service/Compute/Resource/DiskTypes.php | 158 - .../src/Google/Service/Compute/Resource/Disks.php | 231 - .../Google/Service/Compute/Resource/Firewalls.php | 160 - .../Service/Compute/Resource/ForwardingRules.php | 207 - .../Service/Compute/Resource/GlobalAddresses.php | 128 - .../Compute/Resource/GlobalForwardingRules.php | 146 - .../Service/Compute/Resource/GlobalOperations.php | 170 - .../Service/Compute/Resource/HealthChecks.php | 162 - .../Service/Compute/Resource/HttpHealthChecks.php | 166 - .../Service/Compute/Resource/HttpsHealthChecks.php | 166 - .../src/Google/Service/Compute/Resource/Images.php | 166 - .../Compute/Resource/InstanceGroupManagers.php | 369 -- .../Service/Compute/Resource/InstanceGroups.php | 309 -- .../Service/Compute/Resource/InstanceTemplates.php | 136 - .../Google/Service/Compute/Resource/Instances.php | 455 -- .../Google/Service/Compute/Resource/Licenses.php | 43 - .../Service/Compute/Resource/MachineTypes.php | 158 - .../Google/Service/Compute/Resource/Networks.php | 144 - .../Google/Service/Compute/Resource/Projects.php | 101 - .../Service/Compute/Resource/RegionAutoscalers.php | 167 - .../Compute/Resource/RegionBackendServices.php | 194 - .../Resource/RegionInstanceGroupManagers.php | 294 - .../Compute/Resource/RegionInstanceGroups.php | 182 - .../Service/Compute/Resource/RegionOperations.php | 117 - .../Google/Service/Compute/Resource/Regions.php | 100 - .../Google/Service/Compute/Resource/Routers.php | 256 - .../src/Google/Service/Compute/Resource/Routes.php | 129 - .../Google/Service/Compute/Resource/Snapshots.php | 119 - .../Service/Compute/Resource/SslCertificates.php | 129 - .../Service/Compute/Resource/Subnetworks.php | 206 - .../Service/Compute/Resource/TargetHttpProxies.php | 147 - .../Compute/Resource/TargetHttpsProxies.php | 164 - .../Service/Compute/Resource/TargetInstances.php | 190 - .../Service/Compute/Resource/TargetPools.php | 293 - .../Service/Compute/Resource/TargetSslProxies.php | 180 - .../Service/Compute/Resource/TargetVpnGateways.php | 190 - .../Google/Service/Compute/Resource/UrlMaps.php | 194 - .../Google/Service/Compute/Resource/VpnTunnels.php | 189 - .../Service/Compute/Resource/ZoneOperations.php | 117 - .../src/Google/Service/Compute/Resource/Zones.php | 100 - .../Service/Compute/ResourceGroupReference.php | 30 - .../src/Google/Service/Compute/Route.php | 167 - .../src/Google/Service/Compute/RouteList.php | 68 - .../src/Google/Service/Compute/RouteWarnings.php | 50 - .../Google/Service/Compute/RouteWarningsData.php | 39 - .../src/Google/Service/Compute/Router.php | 124 - .../Service/Compute/RouterAggregatedList.php | 67 - .../src/Google/Service/Compute/RouterBgp.php | 30 - .../src/Google/Service/Compute/RouterBgpPeer.php | 75 - .../src/Google/Service/Compute/RouterInterface.php | 48 - .../src/Google/Service/Compute/RouterList.php | 68 - .../src/Google/Service/Compute/RouterStatus.php | 51 - .../Service/Compute/RouterStatusBgpPeerStatus.php | 113 - .../Service/Compute/RouterStatusResponse.php | 40 - .../Service/Compute/RoutersPreviewResponse.php | 31 - .../Google/Service/Compute/RoutersScopedList.php | 42 - .../Service/Compute/RoutersScopedListWarning.php | 50 - .../Compute/RoutersScopedListWarningData.php | 39 - .../src/Google/Service/Compute/SSLHealthCheck.php | 66 - .../src/Google/Service/Compute/Scheduling.php | 48 - .../Google/Service/Compute/SerialPortOutput.php | 66 - .../src/Google/Service/Compute/ServiceAccount.php | 40 - .../src/Google/Service/Compute/Snapshot.php | 159 - .../src/Google/Service/Compute/SnapshotList.php | 68 - .../src/Google/Service/Compute/SslCertificate.php | 93 - .../Google/Service/Compute/SslCertificateList.php | 68 - .../src/Google/Service/Compute/Subnetwork.php | 111 - .../Service/Compute/SubnetworkAggregatedList.php | 67 - .../src/Google/Service/Compute/SubnetworkList.php | 68 - .../SubnetworksExpandIpCidrRangeRequest.php | 30 - .../Service/Compute/SubnetworksScopedList.php | 42 - .../Compute/SubnetworksScopedListWarning.php | 50 - .../Compute/SubnetworksScopedListWarningData.php | 39 - .../src/Google/Service/Compute/TCPHealthCheck.php | 66 - .../src/Google/Service/Compute/Tags.php | 40 - .../src/Google/Service/Compute/TargetHttpProxy.php | 84 - .../Google/Service/Compute/TargetHttpProxyList.php | 68 - ...TargetHttpsProxiesSetSslCertificatesRequest.php | 31 - .../Google/Service/Compute/TargetHttpsProxy.php | 94 - .../Service/Compute/TargetHttpsProxyList.php | 68 - .../src/Google/Service/Compute/TargetInstance.php | 102 - .../Compute/TargetInstanceAggregatedList.php | 67 - .../Google/Service/Compute/TargetInstanceList.php | 68 - .../Service/Compute/TargetInstancesScopedList.php | 42 - .../Compute/TargetInstancesScopedListWarning.php | 50 - .../TargetInstancesScopedListWarningData.php | 39 - .../src/Google/Service/Compute/TargetPool.php | 130 - .../Service/Compute/TargetPoolAggregatedList.php | 67 - .../Service/Compute/TargetPoolInstanceHealth.php | 41 - .../src/Google/Service/Compute/TargetPoolList.php | 68 - .../Compute/TargetPoolsAddHealthCheckRequest.php | 32 - .../Compute/TargetPoolsAddInstanceRequest.php | 32 - .../TargetPoolsRemoveHealthCheckRequest.php | 32 - .../Compute/TargetPoolsRemoveInstanceRequest.php | 32 - .../Service/Compute/TargetPoolsScopedList.php | 42 - .../Compute/TargetPoolsScopedListWarning.php | 50 - .../Compute/TargetPoolsScopedListWarningData.php | 39 - .../src/Google/Service/Compute/TargetReference.php | 30 - .../TargetSslProxiesSetBackendServiceRequest.php | 30 - .../TargetSslProxiesSetProxyHeaderRequest.php | 30 - .../TargetSslProxiesSetSslCertificatesRequest.php | 31 - .../src/Google/Service/Compute/TargetSslProxy.php | 103 - .../Google/Service/Compute/TargetSslProxyList.php | 68 - .../Google/Service/Compute/TargetVpnGateway.php | 121 - .../Compute/TargetVpnGatewayAggregatedList.php | 67 - .../Service/Compute/TargetVpnGatewayList.php | 68 - .../Compute/TargetVpnGatewaysScopedList.php | 42 - .../Compute/TargetVpnGatewaysScopedListWarning.php | 50 - .../TargetVpnGatewaysScopedListWarningData.php | 39 - .../src/Google/Service/Compute/TestFailure.php | 57 - .../src/Google/Service/Compute/UrlMap.php | 124 - .../src/Google/Service/Compute/UrlMapList.php | 68 - .../src/Google/Service/Compute/UrlMapReference.php | 30 - .../src/Google/Service/Compute/UrlMapTest.php | 57 - .../Service/Compute/UrlMapValidationResult.php | 59 - .../Service/Compute/UrlMapsValidateRequest.php | 31 - .../Service/Compute/UrlMapsValidateResponse.php | 31 - .../Google/Service/Compute/UsageExportLocation.php | 39 - .../src/Google/Service/Compute/VpnTunnel.php | 175 - .../Service/Compute/VpnTunnelAggregatedList.php | 67 - .../src/Google/Service/Compute/VpnTunnelList.php | 68 - .../Service/Compute/VpnTunnelsScopedList.php | 42 - .../Compute/VpnTunnelsScopedListWarning.php | 50 - .../Compute/VpnTunnelsScopedListWarningData.php | 39 - .../src/Google/Service/Compute/Zone.php | 103 - .../src/Google/Service/Compute/ZoneList.php | 68 - .../src/Google/Service/ConsumerSurveys.php | 210 - .../Google/Service/ConsumerSurveys/FieldMask.php | 41 - .../Service/ConsumerSurveys/MobileAppPanel.php | 76 - .../MobileAppPanelsListResponse.php | 61 - .../Google/Service/ConsumerSurveys/PageInfo.php | 48 - .../ConsumerSurveys/Resource/Mobileapppanels.php | 74 - .../Service/ConsumerSurveys/Resource/Results.php | 43 - .../Service/ConsumerSurveys/Resource/Surveys.php | 125 - .../Service/ConsumerSurveys/ResultsGetRequest.php | 31 - .../Google/Service/ConsumerSurveys/ResultsMask.php | 41 - .../src/Google/Service/ConsumerSurveys/Survey.php | 125 - .../Service/ConsumerSurveys/SurveyAudience.php | 85 - .../Google/Service/ConsumerSurveys/SurveyCost.php | 57 - .../Service/ConsumerSurveys/SurveyQuestion.php | 185 - .../ConsumerSurveys/SurveyQuestionImage.php | 48 - .../Service/ConsumerSurveys/SurveyRejection.php | 39 - .../Service/ConsumerSurveys/SurveyResults.php | 39 - .../ConsumerSurveys/SurveysDeleteResponse.php | 30 - .../ConsumerSurveys/SurveysListResponse.php | 61 - .../ConsumerSurveys/SurveysStartRequest.php | 30 - .../ConsumerSurveys/SurveysStartResponse.php | 40 - .../ConsumerSurveys/SurveysStopResponse.php | 40 - .../Service/ConsumerSurveys/TokenPagination.php | 39 - .../src/Google/Service/Container.php | 397 -- .../src/Google/Service/Container/AddonsConfig.php | 41 - .../Service/Container/AutoUpgradeOptions.php | 39 - .../Service/Container/CancelOperationRequest.php | 20 - .../src/Google/Service/Container/Cluster.php | 278 - .../src/Google/Service/Container/ClusterUpdate.php | 96 - .../Google/Service/Container/ContainerEmpty.php | 20 - .../Service/Container/CreateClusterRequest.php | 31 - .../Service/Container/CreateNodePoolRequest.php | 31 - .../Service/Container/HorizontalPodAutoscaling.php | 30 - .../Google/Service/Container/HttpLoadBalancing.php | 30 - .../Service/Container/ListClustersResponse.php | 41 - .../Service/Container/ListNodePoolsResponse.php | 32 - .../Service/Container/ListOperationsResponse.php | 41 - .../src/Google/Service/Container/MasterAuth.php | 66 - .../src/Google/Service/Container/NodeConfig.php | 112 - .../Google/Service/Container/NodeManagement.php | 40 - .../src/Google/Service/Container/NodePool.php | 115 - .../Service/Container/NodePoolAutoscaling.php | 48 - .../src/Google/Service/Container/Operation.php | 93 - .../Google/Service/Container/Resource/Projects.php | 28 - .../Service/Container/Resource/ProjectsZones.php | 45 - .../Container/Resource/ProjectsZonesClusters.php | 126 - .../Resource/ProjectsZonesClustersNodePools.php | 139 - .../Container/Resource/ProjectsZonesOperations.php | 81 - .../Container/RollbackNodePoolUpgradeRequest.php | 20 - .../src/Google/Service/Container/ServerConfig.php | 67 - .../Container/SetNodePoolManagementRequest.php | 31 - .../Service/Container/UpdateClusterRequest.php | 31 - .../src/Google/Service/Coordinate.php | 467 -- .../src/Google/Service/Coordinate/CustomField.php | 48 - .../Google/Service/Coordinate/CustomFieldDef.php | 86 - .../Coordinate/CustomFieldDefListResponse.php | 41 - .../src/Google/Service/Coordinate/CustomFields.php | 41 - .../src/Google/Service/Coordinate/EnumItemDef.php | 48 - .../src/Google/Service/Coordinate/Job.php | 60 - .../src/Google/Service/Coordinate/JobChange.php | 49 - .../Google/Service/Coordinate/JobListResponse.php | 50 - .../src/Google/Service/Coordinate/JobState.php | 105 - .../src/Google/Service/Coordinate/Location.php | 58 - .../Service/Coordinate/LocationListResponse.php | 60 - .../Google/Service/Coordinate/LocationRecord.php | 66 - .../Service/Coordinate/Resource/CustomFieldDef.php | 42 - .../Google/Service/Coordinate/Resource/Jobs.php | 159 - .../Service/Coordinate/Resource/Location.php | 47 - .../Service/Coordinate/Resource/Schedule.php | 85 - .../Google/Service/Coordinate/Resource/Team.php | 47 - .../Google/Service/Coordinate/Resource/Worker.php | 41 - .../src/Google/Service/Coordinate/Schedule.php | 66 - .../src/Google/Service/Coordinate/Team.php | 48 - .../Google/Service/Coordinate/TeamListResponse.php | 41 - .../Google/Service/Coordinate/TokenPagination.php | 48 - .../src/Google/Service/Coordinate/Worker.php | 39 - .../Service/Coordinate/WorkerListResponse.php | 41 - .../src/Google/Service/Customsearch.php | 195 - .../src/Google/Service/Customsearch/Context.php | 41 - .../Google/Service/Customsearch/ContextFacets.php | 51 - .../src/Google/Service/Customsearch/Promotion.php | 78 - .../Service/Customsearch/PromotionBodyLines.php | 57 - .../Google/Service/Customsearch/PromotionImage.php | 48 - .../src/Google/Service/Customsearch/Query.php | 354 -- .../Google/Service/Customsearch/Resource/Cse.php | 94 - .../src/Google/Service/Customsearch/Result.php | 159 - .../Google/Service/Customsearch/ResultImage.php | 84 - .../Google/Service/Customsearch/ResultLabels.php | 51 - .../src/Google/Service/Customsearch/Search.php | 101 - .../Customsearch/SearchSearchInformation.php | 57 - .../Google/Service/Customsearch/SearchSpelling.php | 39 - .../src/Google/Service/Customsearch/SearchUrl.php | 39 - .../src/Google/Service/DataTransfer.php | 147 - .../Google/Service/DataTransfer/Application.php | 68 - .../DataTransfer/ApplicationDataTransfer.php | 50 - .../DataTransfer/ApplicationTransferParam.php | 40 - .../DataTransfer/ApplicationsListResponse.php | 59 - .../Google/Service/DataTransfer/DataTransfer.php | 95 - .../DataTransfer/DataTransfersListResponse.php | 59 - .../Service/DataTransfer/Resource/Applications.php | 60 - .../Service/DataTransfer/Resource/Transfers.php | 76 - .../src/Google/Service/Dataflow.php | 628 --- .../Service/Dataflow/ApproximateProgress.php | 49 - .../Dataflow/ApproximateReportedProgress.php | 60 - .../Service/Dataflow/ApproximateSplitRequest.php | 40 - .../Service/Dataflow/AutoscalingSettings.php | 39 - .../src/Google/Service/Dataflow/CPUTime.php | 48 - .../Google/Service/Dataflow/ComponentSource.php | 48 - .../Google/Service/Dataflow/ComponentTransform.php | 48 - .../Service/Dataflow/ComputationTopology.php | 89 - .../src/Google/Service/Dataflow/ConcatPosition.php | 40 - .../Google/Service/Dataflow/CounterMetadata.php | 57 - .../Service/Dataflow/CounterStructuredName.php | 93 - .../Dataflow/CounterStructuredNameAndMetadata.php | 41 - .../src/Google/Service/Dataflow/CounterUpdate.php | 156 - .../Dataflow/CreateJobFromTemplateRequest.php | 58 - .../Service/Dataflow/CustomSourceLocation.php | 30 - .../Google/Service/Dataflow/DataDiskAssignment.php | 40 - .../src/Google/Service/Dataflow/DerivedSource.php | 40 - .../src/Google/Service/Dataflow/Disk.php | 48 - .../src/Google/Service/Dataflow/DisplayData.php | 129 - .../Google/Service/Dataflow/DistributionUpdate.php | 70 - .../Google/Service/Dataflow/DynamicSourceSplit.php | 41 - .../src/Google/Service/Dataflow/Environment.php | 113 - .../Service/Dataflow/ExecutionStageSummary.php | 89 - .../src/Google/Service/Dataflow/FailedLocation.php | 30 - .../Google/Service/Dataflow/FlattenInstruction.php | 32 - .../Google/Service/Dataflow/FloatingPointList.php | 31 - .../Google/Service/Dataflow/FloatingPointMean.php | 40 - .../Service/Dataflow/GetDebugConfigRequest.php | 39 - .../Service/Dataflow/GetDebugConfigResponse.php | 30 - .../Service/Dataflow/GetTemplateResponse.php | 41 - .../Google/Service/Dataflow/InstructionInput.php | 39 - .../Google/Service/Dataflow/InstructionOutput.php | 75 - .../src/Google/Service/Dataflow/IntegerList.php | 32 - .../src/Google/Service/Dataflow/IntegerMean.php | 41 - .../src/Google/Service/Dataflow/Job.php | 197 - .../Google/Service/Dataflow/JobExecutionInfo.php | 31 - .../Service/Dataflow/JobExecutionStageInfo.php | 31 - .../src/Google/Service/Dataflow/JobMessage.php | 57 - .../src/Google/Service/Dataflow/JobMetrics.php | 41 - .../Dataflow/KeyRangeDataDiskAssignment.php | 48 - .../Google/Service/Dataflow/KeyRangeLocation.php | 66 - .../Service/Dataflow/LaunchTemplateParameters.php | 49 - .../Service/Dataflow/LaunchTemplateResponse.php | 41 - .../Service/Dataflow/LeaseWorkItemRequest.php | 76 - .../Service/Dataflow/LeaseWorkItemResponse.php | 32 - .../Service/Dataflow/ListJobMessagesResponse.php | 41 - .../Google/Service/Dataflow/ListJobsResponse.php | 51 - .../src/Google/Service/Dataflow/MapTask.php | 50 - .../src/Google/Service/Dataflow/MetricShortId.php | 39 - .../Service/Dataflow/MetricStructuredName.php | 48 - .../src/Google/Service/Dataflow/MetricUpdate.php | 103 - .../Google/Service/Dataflow/MountedDataDisk.php | 30 - .../Google/Service/Dataflow/MultiOutputInfo.php | 30 - .../src/Google/Service/Dataflow/NameAndKind.php | 39 - .../src/Google/Service/Dataflow/Package.php | 39 - .../Google/Service/Dataflow/ParDoInstruction.php | 70 - .../Service/Dataflow/ParallelInstruction.php | 109 - .../Google/Service/Dataflow/ParameterMetadata.php | 67 - .../Dataflow/PartialGroupByKeyInstruction.php | 78 - .../Service/Dataflow/PipelineDescription.php | 52 - .../src/Google/Service/Dataflow/Position.php | 76 - .../src/Google/Service/Dataflow/PubsubLocation.php | 84 - .../Google/Service/Dataflow/ReadInstruction.php | 31 - .../Dataflow/ReportWorkItemStatusRequest.php | 59 - .../Dataflow/ReportWorkItemStatusResponse.php | 32 - .../Service/Dataflow/ReportedParallelism.php | 39 - .../Google/Service/Dataflow/Resource/Projects.php | 42 - .../Service/Dataflow/Resource/ProjectsJobs.php | 127 - .../Dataflow/Resource/ProjectsJobsDebug.php | 59 - .../Dataflow/Resource/ProjectsJobsMessages.php | 58 - .../Dataflow/Resource/ProjectsJobsWorkItems.php | 59 - .../Dataflow/Resource/ProjectsLocations.php | 28 - .../Dataflow/Resource/ProjectsLocationsJobs.php | 126 - .../Resource/ProjectsLocationsJobsMessages.php | 58 - .../Resource/ProjectsLocationsJobsWorkItems.php | 61 - .../Dataflow/Resource/ProjectsTemplates.php | 84 - .../Service/Dataflow/ResourceUtilizationReport.php | 32 - .../Dataflow/ResourceUtilizationReportResponse.php | 20 - .../Google/Service/Dataflow/RuntimeEnvironment.php | 66 - .../Service/Dataflow/SendDebugCaptureRequest.php | 48 - .../Service/Dataflow/SendDebugCaptureResponse.php | 20 - .../Service/Dataflow/SendWorkerMessagesRequest.php | 32 - .../Dataflow/SendWorkerMessagesResponse.php | 32 - .../src/Google/Service/Dataflow/SeqMapTask.php | 78 - .../Service/Dataflow/SeqMapTaskOutputInfo.php | 40 - .../src/Google/Service/Dataflow/ShellTask.php | 39 - .../src/Google/Service/Dataflow/SideInputInfo.php | 50 - .../src/Google/Service/Dataflow/Sink.php | 39 - .../src/Google/Service/Dataflow/Source.php | 68 - .../src/Google/Service/Dataflow/SourceFork.php | 61 - .../Service/Dataflow/SourceGetMetadataRequest.php | 31 - .../Service/Dataflow/SourceGetMetadataResponse.php | 31 - .../src/Google/Service/Dataflow/SourceMetadata.php | 48 - .../Service/Dataflow/SourceOperationRequest.php | 41 - .../Service/Dataflow/SourceOperationResponse.php | 41 - .../Google/Service/Dataflow/SourceSplitOptions.php | 39 - .../Google/Service/Dataflow/SourceSplitRequest.php | 41 - .../Service/Dataflow/SourceSplitResponse.php | 51 - .../Google/Service/Dataflow/SourceSplitShard.php | 40 - .../src/Google/Service/Dataflow/SplitInt64.php | 39 - .../src/Google/Service/Dataflow/StageSource.php | 57 - .../Google/Service/Dataflow/StateFamilyConfig.php | 39 - .../src/Google/Service/Dataflow/Status.php | 49 - .../src/Google/Service/Dataflow/Step.php | 48 - .../src/Google/Service/Dataflow/StreamLocation.php | 61 - .../Dataflow/StreamingComputationConfig.php | 59 - .../Dataflow/StreamingComputationRanges.php | 41 - .../Service/Dataflow/StreamingComputationTask.php | 51 - .../Service/Dataflow/StreamingConfigTask.php | 41 - .../Google/Service/Dataflow/StreamingSetupTask.php | 58 - .../Dataflow/StreamingSideInputLocation.php | 39 - .../Service/Dataflow/StreamingStageLocation.php | 30 - .../src/Google/Service/Dataflow/StringList.php | 31 - .../Google/Service/Dataflow/TaskRunnerSettings.php | 194 - .../Google/Service/Dataflow/TemplateMetadata.php | 59 - .../src/Google/Service/Dataflow/TopologyConfig.php | 69 - .../Google/Service/Dataflow/TransformSummary.php | 77 - .../src/Google/Service/Dataflow/WorkItem.php | 165 - .../Service/Dataflow/WorkItemServiceState.php | 98 - .../src/Google/Service/Dataflow/WorkItemStatus.php | 148 - .../Google/Service/Dataflow/WorkerHealthReport.php | 58 - .../Dataflow/WorkerHealthReportResponse.php | 30 - .../src/Google/Service/Dataflow/WorkerMessage.php | 69 - .../Google/Service/Dataflow/WorkerMessageCode.php | 39 - .../Service/Dataflow/WorkerMessageResponse.php | 41 - .../src/Google/Service/Dataflow/WorkerPool.php | 215 - .../src/Google/Service/Dataflow/WorkerSettings.php | 75 - .../Google/Service/Dataflow/WriteInstruction.php | 41 - .../src/Google/Service/Dataproc.php | 397 -- .../Google/Service/Dataproc/AcceleratorConfig.php | 39 - .../Google/Service/Dataproc/CancelJobRequest.php | 20 - .../src/Google/Service/Dataproc/Cluster.php | 98 - .../src/Google/Service/Dataproc/ClusterConfig.php | 91 - .../src/Google/Service/Dataproc/ClusterMetrics.php | 39 - .../Service/Dataproc/ClusterOperationMetadata.php | 96 - .../Service/Dataproc/ClusterOperationStatus.php | 57 - .../src/Google/Service/Dataproc/ClusterStatus.php | 48 - .../src/Google/Service/Dataproc/DataprocEmpty.php | 20 - .../Dataproc/DiagnoseClusterOutputLocation.php | 30 - .../Service/Dataproc/DiagnoseClusterRequest.php | 20 - .../Service/Dataproc/DiagnoseClusterResults.php | 30 - .../src/Google/Service/Dataproc/DiskConfig.php | 39 - .../Google/Service/Dataproc/GceClusterConfig.php | 94 - .../src/Google/Service/Dataproc/HadoopJob.php | 95 - .../src/Google/Service/Dataproc/HiveJob.php | 77 - .../Service/Dataproc/InstanceGroupConfig.php | 97 - .../src/Google/Service/Dataproc/Job.php | 169 - .../src/Google/Service/Dataproc/JobPlacement.php | 39 - .../src/Google/Service/Dataproc/JobReference.php | 39 - .../src/Google/Service/Dataproc/JobScheduling.php | 30 - .../src/Google/Service/Dataproc/JobStatus.php | 48 - .../Service/Dataproc/ListClustersResponse.php | 41 - .../Google/Service/Dataproc/ListJobsResponse.php | 41 - .../Service/Dataproc/ListOperationsResponse.php | 41 - .../src/Google/Service/Dataproc/LoggingConfig.php | 30 - .../Google/Service/Dataproc/ManagedGroupConfig.php | 39 - .../Service/Dataproc/NodeInitializationAction.php | 39 - .../src/Google/Service/Dataproc/Operation.php | 67 - .../Google/Service/Dataproc/OperationMetadata.php | 141 - .../Google/Service/Dataproc/OperationStatus.php | 57 - .../src/Google/Service/Dataproc/PigJob.php | 87 - .../src/Google/Service/Dataproc/PySparkJob.php | 95 - .../src/Google/Service/Dataproc/QueryList.php | 31 - .../Google/Service/Dataproc/Resource/Projects.php | 28 - .../Service/Dataproc/Resource/ProjectsRegions.php | 28 - .../Dataproc/Resource/ProjectsRegionsClusters.php | 162 - .../Dataproc/Resource/ProjectsRegionsJobs.php | 156 - .../Resource/ProjectsRegionsOperations.php | 101 - .../src/Google/Service/Dataproc/SoftwareConfig.php | 39 - .../src/Google/Service/Dataproc/SparkJob.php | 95 - .../src/Google/Service/Dataproc/SparkSqlJob.php | 78 - .../src/Google/Service/Dataproc/Status.php | 49 - .../Google/Service/Dataproc/SubmitJobRequest.php | 31 - .../Google/Service/Dataproc/YarnApplication.php | 57 - .../src/Google/Service/Datastore.php | 127 - .../Service/Datastore/AllocateIdsRequest.php | 32 - .../Service/Datastore/AllocateIdsResponse.php | 32 - .../src/Google/Service/Datastore/ArrayValue.php | 32 - .../Service/Datastore/BeginTransactionRequest.php | 20 - .../Service/Datastore/BeginTransactionResponse.php | 30 - .../src/Google/Service/Datastore/CommitRequest.php | 50 - .../Google/Service/Datastore/CommitResponse.php | 41 - .../Google/Service/Datastore/CompositeFilter.php | 41 - .../src/Google/Service/Datastore/Entity.php | 41 - .../src/Google/Service/Datastore/EntityResult.php | 49 - .../src/Google/Service/Datastore/Filter.php | 41 - .../src/Google/Service/Datastore/GqlQuery.php | 60 - .../Google/Service/Datastore/GqlQueryParameter.php | 40 - .../src/Google/Service/Datastore/Key.php | 42 - .../Google/Service/Datastore/KindExpression.php | 30 - .../src/Google/Service/Datastore/LatLng.php | 39 - .../src/Google/Service/Datastore/LookupRequest.php | 42 - .../Google/Service/Datastore/LookupResponse.php | 52 - .../src/Google/Service/Datastore/Mutation.php | 70 - .../Google/Service/Datastore/MutationResult.php | 49 - .../src/Google/Service/Datastore/PartitionId.php | 39 - .../src/Google/Service/Datastore/PathElement.php | 48 - .../src/Google/Service/Datastore/Projection.php | 31 - .../Google/Service/Datastore/PropertyFilter.php | 50 - .../src/Google/Service/Datastore/PropertyOrder.php | 40 - .../Google/Service/Datastore/PropertyReference.php | 30 - .../src/Google/Service/Datastore/Query.php | 108 - .../Google/Service/Datastore/QueryResultBatch.php | 86 - .../src/Google/Service/Datastore/ReadOptions.php | 39 - .../Google/Service/Datastore/Resource/Projects.php | 120 - .../Google/Service/Datastore/RollbackRequest.php | 30 - .../Google/Service/Datastore/RollbackResponse.php | 20 - .../Google/Service/Datastore/RunQueryRequest.php | 61 - .../Google/Service/Datastore/RunQueryResponse.php | 41 - .../src/Google/Service/Datastore/Value.php | 142 - .../src/Google/Service/DeploymentManager.php | 488 -- .../Service/DeploymentManager/AuditConfig.php | 50 - .../Service/DeploymentManager/AuditLogConfig.php | 40 - .../Google/Service/DeploymentManager/Binding.php | 40 - .../Google/Service/DeploymentManager/Condition.php | 76 - .../Service/DeploymentManager/ConfigFile.php | 30 - .../Service/DeploymentManager/Deployment.php | 125 - .../DeploymentManager/DeploymentLabelEntry.php | 39 - .../Service/DeploymentManager/DeploymentUpdate.php | 50 - .../DeploymentUpdateLabelEntry.php | 39 - .../DeploymentmanagerResource.php | 133 - .../DeploymentmanagerResourceWarnings.php | 50 - .../DeploymentmanagerResourceWarningsData.php | 39 - .../DeploymentsCancelPreviewRequest.php | 30 - .../DeploymentManager/DeploymentsListResponse.php | 41 - .../DeploymentManager/DeploymentsStopRequest.php | 30 - .../Service/DeploymentManager/ImportFile.php | 39 - .../Google/Service/DeploymentManager/LogConfig.php | 31 - .../DeploymentManager/LogConfigCounterOptions.php | 39 - .../Google/Service/DeploymentManager/Manifest.php | 96 - .../DeploymentManager/ManifestsListResponse.php | 41 - .../Google/Service/DeploymentManager/Operation.php | 231 - .../Service/DeploymentManager/OperationError.php | 32 - .../DeploymentManager/OperationErrorErrors.php | 48 - .../DeploymentManager/OperationWarnings.php | 50 - .../DeploymentManager/OperationWarningsData.php | 39 - .../DeploymentManager/OperationsListResponse.php | 41 - .../Google/Service/DeploymentManager/Policy.php | 79 - .../DeploymentManager/Resource/Deployments.php | 279 - .../DeploymentManager/Resource/Manifests.php | 100 - .../DeploymentManager/Resource/Operations.php | 98 - .../DeploymentManager/Resource/Resources.php | 100 - .../Service/DeploymentManager/Resource/Types.php | 84 - .../DeploymentManager/ResourceAccessControl.php | 30 - .../Service/DeploymentManager/ResourceUpdate.php | 97 - .../DeploymentManager/ResourceUpdateError.php | 32 - .../ResourceUpdateErrorErrors.php | 48 - .../DeploymentManager/ResourceUpdateWarnings.php | 50 - .../ResourceUpdateWarningsData.php | 39 - .../DeploymentManager/ResourcesListResponse.php | 41 - .../src/Google/Service/DeploymentManager/Rule.php | 87 - .../DeploymentManager/TargetConfiguration.php | 42 - .../DeploymentManager/TestPermissionsRequest.php | 31 - .../DeploymentManager/TestPermissionsResponse.php | 31 - .../src/Google/Service/DeploymentManager/Type.php | 67 - .../DeploymentManager/TypesListResponse.php | 41 - .../src/Google/Service/Dfareporting.php | 4816 ----------------- .../src/Google/Service/Dfareporting/Account.php | 194 - .../Dfareporting/AccountActiveAdSummary.php | 66 - .../Service/Dfareporting/AccountPermission.php | 76 - .../Dfareporting/AccountPermissionGroup.php | 48 - .../AccountPermissionGroupsListResponse.php | 41 - .../AccountPermissionsListResponse.php | 41 - .../Service/Dfareporting/AccountUserProfile.php | 169 - .../AccountUserProfilesListResponse.php | 50 - .../Service/Dfareporting/AccountsListResponse.php | 50 - .../src/Google/Service/Dfareporting/Activities.php | 50 - .../src/Google/Service/Dfareporting/Ad.php | 393 -- .../src/Google/Service/Dfareporting/AdSlot.php | 93 - .../Service/Dfareporting/AdsListResponse.php | 50 - .../src/Google/Service/Dfareporting/Advertiser.php | 158 - .../Service/Dfareporting/AdvertiserGroup.php | 57 - .../Dfareporting/AdvertiserGroupsListResponse.php | 50 - .../Dfareporting/AdvertisersListResponse.php | 50 - .../Service/Dfareporting/AudienceSegment.php | 48 - .../Service/Dfareporting/AudienceSegmentGroup.php | 50 - .../src/Google/Service/Dfareporting/Browser.php | 75 - .../Service/Dfareporting/BrowsersListResponse.php | 41 - .../src/Google/Service/Dfareporting/Campaign.php | 276 - .../Dfareporting/CampaignCreativeAssociation.php | 39 - .../CampaignCreativeAssociationsListResponse.php | 50 - .../Service/Dfareporting/CampaignsListResponse.php | 50 - .../src/Google/Service/Dfareporting/ChangeLog.php | 147 - .../Dfareporting/ChangeLogsListResponse.php | 50 - .../Service/Dfareporting/CitiesListResponse.php | 41 - .../src/Google/Service/Dfareporting/City.php | 102 - .../src/Google/Service/Dfareporting/ClickTag.php | 48 - .../Service/Dfareporting/ClickThroughUrl.php | 57 - .../ClickThroughUrlSuffixProperties.php | 39 - .../Dfareporting/CompanionClickThroughOverride.php | 40 - .../Service/Dfareporting/CompanionSetting.php | 59 - .../Service/Dfareporting/CompatibleFields.php | 80 - .../Google/Service/Dfareporting/ConnectionType.php | 48 - .../Dfareporting/ConnectionTypesListResponse.php | 41 - .../Dfareporting/ContentCategoriesListResponse.php | 50 - .../Service/Dfareporting/ContentCategory.php | 57 - .../src/Google/Service/Dfareporting/Conversion.php | 140 - .../Service/Dfareporting/ConversionError.php | 48 - .../Service/Dfareporting/ConversionStatus.php | 51 - .../Dfareporting/ConversionsBatchInsertRequest.php | 51 - .../ConversionsBatchInsertResponse.php | 50 - .../Service/Dfareporting/CountriesListResponse.php | 41 - .../src/Google/Service/Dfareporting/Country.php | 66 - .../src/Google/Service/Dfareporting/Creative.php | 599 -- .../Google/Service/Dfareporting/CreativeAsset.php | 426 -- .../Service/Dfareporting/CreativeAssetId.php | 39 - .../Service/Dfareporting/CreativeAssetMetadata.php | 88 - .../Dfareporting/CreativeAssetSelection.php | 41 - .../Service/Dfareporting/CreativeAssignment.php | 144 - .../Service/Dfareporting/CreativeCustomEvent.php | 112 - .../Google/Service/Dfareporting/CreativeField.php | 85 - .../Dfareporting/CreativeFieldAssignment.php | 39 - .../Service/Dfareporting/CreativeFieldValue.php | 48 - .../CreativeFieldValuesListResponse.php | 50 - .../Dfareporting/CreativeFieldsListResponse.php | 50 - .../Google/Service/Dfareporting/CreativeGroup.php | 94 - .../Dfareporting/CreativeGroupAssignment.php | 39 - .../Dfareporting/CreativeGroupsListResponse.php | 50 - .../CreativeOptimizationConfiguration.php | 59 - .../Service/Dfareporting/CreativeRotation.php | 59 - .../Service/Dfareporting/CreativeSettings.php | 39 - .../Service/Dfareporting/CreativesListResponse.php | 50 - .../CrossDimensionReachReportCompatibleFields.php | 71 - .../Dfareporting/CustomFloodlightVariable.php | 48 - .../Service/Dfareporting/CustomRichMediaEvents.php | 41 - .../src/Google/Service/Dfareporting/DateRange.php | 57 - .../Service/Dfareporting/DayPartTargeting.php | 49 - .../DefaultClickThroughEventTagProperties.php | 39 - .../Service/Dfareporting/DeliverySchedule.php | 58 - .../Service/Dfareporting/DfareportingFile.php | 113 - .../Service/Dfareporting/DfareportingFileUrls.php | 39 - .../Google/Service/Dfareporting/DfpSettings.php | 70 - .../src/Google/Service/Dfareporting/Dimension.php | 39 - .../Service/Dfareporting/DimensionFilter.php | 48 - .../Google/Service/Dfareporting/DimensionValue.php | 75 - .../Service/Dfareporting/DimensionValueList.php | 59 - .../Service/Dfareporting/DimensionValueRequest.php | 68 - .../Google/Service/Dfareporting/DirectorySite.php | 151 - .../Service/Dfareporting/DirectorySiteContact.php | 111 - .../DirectorySiteContactAssignment.php | 39 - .../DirectorySiteContactsListResponse.php | 50 - .../Service/Dfareporting/DirectorySiteSettings.php | 89 - .../Dfareporting/DirectorySitesListResponse.php | 50 - .../Service/Dfareporting/DynamicTargetingKey.php | 57 - .../DynamicTargetingKeysListResponse.php | 41 - .../Google/Service/Dfareporting/EncryptionInfo.php | 57 - .../src/Google/Service/Dfareporting/EventTag.php | 186 - .../Service/Dfareporting/EventTagOverride.php | 39 - .../Service/Dfareporting/EventTagsListResponse.php | 41 - .../src/Google/Service/Dfareporting/FileList.php | 59 - .../src/Google/Service/Dfareporting/Flight.php | 57 - .../FloodlightActivitiesGenerateTagResponse.php | 39 - .../FloodlightActivitiesListResponse.php | 50 - .../Service/Dfareporting/FloodlightActivity.php | 279 - .../Dfareporting/FloodlightActivityDynamicTag.php | 48 - .../Dfareporting/FloodlightActivityGroup.php | 132 - .../FloodlightActivityGroupsListResponse.php | 50 - .../FloodlightActivityPublisherDynamicTag.php | 77 - .../Dfareporting/FloodlightConfiguration.php | 191 - .../FloodlightConfigurationsListResponse.php | 41 - .../FloodlightReportCompatibleFields.php | 61 - .../Google/Service/Dfareporting/FrequencyCap.php | 39 - .../src/Google/Service/Dfareporting/FsCommand.php | 66 - .../Google/Service/Dfareporting/GeoTargeting.php | 81 - .../Google/Service/Dfareporting/InventoryItem.php | 205 - .../Dfareporting/InventoryItemsListResponse.php | 50 - .../Dfareporting/KeyValueTargetingExpression.php | 30 - .../Google/Service/Dfareporting/LandingPage.php | 66 - .../Dfareporting/LandingPagesListResponse.php | 41 - .../src/Google/Service/Dfareporting/Language.php | 57 - .../Service/Dfareporting/LanguageTargeting.php | 32 - .../Service/Dfareporting/LanguagesListResponse.php | 41 - .../Service/Dfareporting/LastModifiedInfo.php | 30 - .../Service/Dfareporting/ListPopulationClause.php | 32 - .../Service/Dfareporting/ListPopulationRule.php | 50 - .../Service/Dfareporting/ListPopulationTerm.php | 93 - .../Dfareporting/ListTargetingExpression.php | 30 - .../Service/Dfareporting/LookbackConfiguration.php | 39 - .../src/Google/Service/Dfareporting/Metric.php | 39 - .../src/Google/Service/Dfareporting/Metro.php | 84 - .../Service/Dfareporting/MetrosListResponse.php | 41 - .../Google/Service/Dfareporting/MobileCarrier.php | 66 - .../Dfareporting/MobileCarriersListResponse.php | 41 - .../Google/Service/Dfareporting/ObjectFilter.php | 49 - .../Google/Service/Dfareporting/OffsetPosition.php | 39 - .../Service/Dfareporting/OmnitureSettings.php | 39 - .../Service/Dfareporting/OperatingSystem.php | 66 - .../Dfareporting/OperatingSystemVersion.php | 76 - .../OperatingSystemVersionsListResponse.php | 41 - .../Dfareporting/OperatingSystemsListResponse.php | 41 - .../Service/Dfareporting/OptimizationActivity.php | 49 - .../src/Google/Service/Dfareporting/Order.php | 204 - .../Google/Service/Dfareporting/OrderContact.php | 66 - .../Google/Service/Dfareporting/OrderDocument.php | 176 - .../Dfareporting/OrderDocumentsListResponse.php | 50 - .../Service/Dfareporting/OrdersListResponse.php | 50 - .../PathToConversionReportCompatibleFields.php | 71 - .../src/Google/Service/Dfareporting/Placement.php | 387 -- .../Service/Dfareporting/PlacementAssignment.php | 58 - .../Google/Service/Dfareporting/PlacementGroup.php | 265 - .../Dfareporting/PlacementGroupsListResponse.php | 50 - .../PlacementStrategiesListResponse.php | 50 - .../Service/Dfareporting/PlacementStrategy.php | 57 - .../Google/Service/Dfareporting/PlacementTag.php | 41 - .../PlacementsGenerateTagsResponse.php | 41 - .../Dfareporting/PlacementsListResponse.php | 50 - .../Google/Service/Dfareporting/PlatformType.php | 48 - .../Dfareporting/PlatformTypesListResponse.php | 41 - .../Service/Dfareporting/PopupWindowProperties.php | 104 - .../src/Google/Service/Dfareporting/PostalCode.php | 66 - .../Dfareporting/PostalCodesListResponse.php | 41 - .../src/Google/Service/Dfareporting/Pricing.php | 77 - .../Service/Dfareporting/PricingSchedule.php | 104 - .../Dfareporting/PricingSchedulePricingPeriod.php | 66 - .../src/Google/Service/Dfareporting/Project.php | 220 - .../Service/Dfareporting/ProjectsListResponse.php | 50 - .../Dfareporting/ReachReportCompatibleFields.php | 81 - .../src/Google/Service/Dfareporting/Recipient.php | 48 - .../src/Google/Service/Dfareporting/Region.php | 75 - .../Service/Dfareporting/RegionsListResponse.php | 41 - .../Service/Dfareporting/RemarketingList.php | 140 - .../Service/Dfareporting/RemarketingListShare.php | 58 - .../Dfareporting/RemarketingListsListResponse.php | 50 - .../src/Google/Service/Dfareporting/Report.php | 190 - .../Dfareporting/ReportCompatibleFields.php | 71 - .../Google/Service/Dfareporting/ReportCriteria.php | 81 - .../ReportCrossDimensionReachCriteria.php | 88 - .../Google/Service/Dfareporting/ReportDelivery.php | 59 - .../Dfareporting/ReportFloodlightCriteria.php | 91 - .../ReportFloodlightCriteriaReportProperties.php | 48 - .../src/Google/Service/Dfareporting/ReportList.php | 59 - .../ReportPathToConversionCriteria.php | 111 - ...ortPathToConversionCriteriaReportProperties.php | 102 - .../Service/Dfareporting/ReportReachCriteria.php | 99 - .../Google/Service/Dfareporting/ReportSchedule.php | 85 - .../Service/Dfareporting/ReportsConfiguration.php | 49 - .../Resource/AccountActiveAdSummaries.php | 43 - .../Resource/AccountPermissionGroups.php | 56 - .../Dfareporting/Resource/AccountPermissions.php | 56 - .../Dfareporting/Resource/AccountUserProfiles.php | 119 - .../Service/Dfareporting/Resource/Accounts.php | 101 - .../Google/Service/Dfareporting/Resource/Ads.php | 143 - .../Dfareporting/Resource/AdvertiserGroups.php | 127 - .../Service/Dfareporting/Resource/Advertisers.php | 125 - .../Service/Dfareporting/Resource/Browsers.php | 41 - .../Resource/CampaignCreativeAssociations.php | 66 - .../Service/Dfareporting/Resource/Campaigns.php | 131 - .../Service/Dfareporting/Resource/ChangeLogs.php | 81 - .../Service/Dfareporting/Resource/Cities.php | 47 - .../Dfareporting/Resource/ConnectionTypes.php | 55 - .../Dfareporting/Resource/ContentCategories.php | 127 - .../Service/Dfareporting/Resource/Conversions.php | 42 - .../Service/Dfareporting/Resource/Countries.php | 55 - .../Dfareporting/Resource/CreativeAssets.php | 44 - .../Dfareporting/Resource/CreativeFieldValues.php | 134 - .../Dfareporting/Resource/CreativeFields.php | 130 - .../Dfareporting/Resource/CreativeGroups.php | 119 - .../Service/Dfareporting/Resource/Creatives.php | 130 - .../Dfareporting/Resource/DimensionValues.php | 47 - .../Resource/DirectorySiteContacts.php | 73 - .../Dfareporting/Resource/DirectorySites.php | 96 - .../Dfareporting/Resource/DynamicTargetingKeys.php | 88 - .../Service/Dfareporting/Resource/EventTags.php | 146 - .../Google/Service/Dfareporting/Resource/Files.php | 63 - .../Dfareporting/Resource/FloodlightActivities.php | 162 - .../Resource/FloodlightActivityGroups.php | 128 - .../Resource/FloodlightConfigurations.php | 90 - .../Dfareporting/Resource/InventoryItems.php | 71 - .../Service/Dfareporting/Resource/LandingPages.php | 119 - .../Service/Dfareporting/Resource/Languages.php | 41 - .../Service/Dfareporting/Resource/Metros.php | 41 - .../Dfareporting/Resource/MobileCarriers.php | 55 - .../Resource/OperatingSystemVersions.php | 56 - .../Dfareporting/Resource/OperatingSystems.php | 56 - .../Dfareporting/Resource/OrderDocuments.php | 78 - .../Service/Dfareporting/Resource/Orders.php | 73 - .../Dfareporting/Resource/PlacementGroups.php | 148 - .../Dfareporting/Resource/PlacementStrategies.php | 128 - .../Service/Dfareporting/Resource/Placements.php | 172 - .../Dfareporting/Resource/PlatformTypes.php | 55 - .../Service/Dfareporting/Resource/PostalCodes.php | 55 - .../Service/Dfareporting/Resource/Projects.php | 71 - .../Service/Dfareporting/Resource/Regions.php | 41 - .../Resource/RemarketingListShares.php | 73 - .../Dfareporting/Resource/RemarketingLists.php | 118 - .../Service/Dfareporting/Resource/Reports.php | 137 - .../Resource/ReportsCompatibleFields.php | 44 - .../Service/Dfareporting/Resource/ReportsFiles.php | 63 - .../Google/Service/Dfareporting/Resource/Sites.php | 126 - .../Google/Service/Dfareporting/Resource/Sizes.php | 74 - .../Service/Dfareporting/Resource/Subaccounts.php | 114 - .../Resource/TargetableRemarketingLists.php | 74 - .../Dfareporting/Resource/TargetingTemplates.php | 116 - .../Service/Dfareporting/Resource/UserProfiles.php | 53 - .../Resource/UserRolePermissionGroups.php | 56 - .../Dfareporting/Resource/UserRolePermissions.php | 58 - .../Service/Dfareporting/Resource/UserRoles.php | 131 - .../Service/Dfareporting/Resource/VideoFormats.php | 55 - .../Service/Dfareporting/RichMediaExitOverride.php | 49 - .../src/Google/Service/Dfareporting/Rule.php | 48 - .../src/Google/Service/Dfareporting/Site.php | 134 - .../Google/Service/Dfareporting/SiteContact.php | 93 - .../Google/Service/Dfareporting/SiteSettings.php | 96 - .../Service/Dfareporting/SitesListResponse.php | 50 - .../src/Google/Service/Dfareporting/Size.php | 66 - .../Service/Dfareporting/SizesListResponse.php | 41 - .../Service/Dfareporting/SkippableSetting.php | 59 - .../Service/Dfareporting/SortedDimension.php | 48 - .../src/Google/Service/Dfareporting/Subaccount.php | 67 - .../Dfareporting/SubaccountsListResponse.php | 50 - .../src/Google/Service/Dfareporting/TagData.php | 66 - .../src/Google/Service/Dfareporting/TagSetting.php | 57 - .../Google/Service/Dfareporting/TagSettings.php | 39 - .../Google/Service/Dfareporting/TargetWindow.php | 39 - .../Dfareporting/TargetableRemarketingList.php | 130 - .../TargetableRemarketingListsListResponse.php | 50 - .../Service/Dfareporting/TargetingTemplate.php | 145 - .../TargetingTemplatesListResponse.php | 50 - .../Service/Dfareporting/TechnologyTargeting.php | 82 - .../Dfareporting/ThirdPartyAuthenticationToken.php | 39 - .../Service/Dfareporting/ThirdPartyTrackingUrl.php | 39 - .../Service/Dfareporting/TranscodeSetting.php | 40 - .../UserDefinedVariableConfiguration.php | 48 - .../Google/Service/Dfareporting/UserProfile.php | 93 - .../Service/Dfareporting/UserProfileList.php | 50 - .../src/Google/Service/Dfareporting/UserRole.php | 95 - .../Service/Dfareporting/UserRolePermission.php | 66 - .../Dfareporting/UserRolePermissionGroup.php | 48 - .../UserRolePermissionGroupsListResponse.php | 41 - .../UserRolePermissionsListResponse.php | 41 - .../Service/Dfareporting/UserRolesListResponse.php | 50 - .../Google/Service/Dfareporting/VideoFormat.php | 67 - .../Dfareporting/VideoFormatsListResponse.php | 41 - .../Google/Service/Dfareporting/VideoOffset.php | 39 - .../Google/Service/Dfareporting/VideoSettings.php | 60 - .../src/Google/Service/Directory.php | 1788 ------ .../src/Google/Service/Directory/Alias.php | 66 - .../src/Google/Service/Directory/Aliases.php | 49 - .../src/Google/Service/Directory/Asp.php | 84 - .../src/Google/Service/Directory/Asps.php | 50 - .../Google/Service/Directory/CalendarResource.php | 84 - .../Google/Service/Directory/CalendarResources.php | 59 - .../src/Google/Service/Directory/Channel.php | 111 - .../Google/Service/Directory/ChromeOsDevice.php | 249 - .../Service/Directory/ChromeOsDeviceAction.php | 39 - .../Directory/ChromeOsDeviceActiveTimeRanges.php | 39 - .../Directory/ChromeOsDeviceRecentUsers.php | 39 - .../Google/Service/Directory/ChromeOsDevices.php | 59 - .../src/Google/Service/Directory/Customer.php | 103 - .../Service/Directory/CustomerPostalAddress.php | 102 - .../src/Google/Service/Directory/DomainAlias.php | 75 - .../src/Google/Service/Directory/DomainAliases.php | 50 - .../src/Google/Service/Directory/Domains.php | 86 - .../src/Google/Service/Directory/Domains2.php | 50 - .../src/Google/Service/Directory/Group.php | 112 - .../src/Google/Service/Directory/Groups.php | 59 - .../src/Google/Service/Directory/Member.php | 84 - .../src/Google/Service/Directory/Members.php | 59 - .../src/Google/Service/Directory/MobileDevice.php | 383 -- .../Service/Directory/MobileDeviceAction.php | 30 - .../Service/Directory/MobileDeviceApplications.php | 67 - .../src/Google/Service/Directory/MobileDevices.php | 59 - .../src/Google/Service/Directory/Notification.php | 93 - .../src/Google/Service/Directory/Notifications.php | 68 - .../src/Google/Service/Directory/OrgUnit.php | 102 - .../src/Google/Service/Directory/OrgUnits.php | 50 - .../src/Google/Service/Directory/Privilege.php | 86 - .../src/Google/Service/Directory/Privileges.php | 50 - .../src/Google/Service/Directory/Resource/Asps.php | 71 - .../Google/Service/Directory/Resource/Channels.php | 40 - .../Service/Directory/Resource/Chromeosdevices.php | 120 - .../Service/Directory/Resource/Customers.php | 69 - .../Service/Directory/Resource/DomainAliases.php | 85 - .../Google/Service/Directory/Resource/Domains.php | 82 - .../Google/Service/Directory/Resource/Groups.php | 120 - .../Service/Directory/Resource/GroupsAliases.php | 68 - .../Google/Service/Directory/Resource/Members.php | 122 - .../Service/Directory/Resource/Mobiledevices.php | 96 - .../Service/Directory/Resource/Notifications.php | 108 - .../Google/Service/Directory/Resource/Orgunits.php | 118 - .../Service/Directory/Resource/Privileges.php | 42 - .../Service/Directory/Resource/Resources.php | 28 - .../Directory/Resource/ResourcesCalendars.php | 133 - .../Service/Directory/Resource/RoleAssignments.php | 91 - .../Google/Service/Directory/Resource/Roles.php | 115 - .../Google/Service/Directory/Resource/Schemas.php | 112 - .../Google/Service/Directory/Resource/Tokens.php | 74 - .../Google/Service/Directory/Resource/Users.php | 207 - .../Service/Directory/Resource/UsersAliases.php | 88 - .../Service/Directory/Resource/UsersPhotos.php | 82 - .../Directory/Resource/VerificationCodes.php | 69 - .../src/Google/Service/Directory/Role.php | 95 - .../Google/Service/Directory/RoleAssignment.php | 84 - .../Google/Service/Directory/RoleAssignments.php | 59 - .../Service/Directory/RoleRolePrivileges.php | 39 - .../src/Google/Service/Directory/Roles.php | 59 - .../src/Google/Service/Directory/Schema.php | 68 - .../Google/Service/Directory/SchemaFieldSpec.php | 103 - .../SchemaFieldSpecNumericIndexingSpec.php | 39 - .../src/Google/Service/Directory/Schemas.php | 50 - .../src/Google/Service/Directory/Token.php | 94 - .../src/Google/Service/Directory/Tokens.php | 50 - .../src/Google/Service/Directory/User.php | 356 -- .../src/Google/Service/Directory/UserAbout.php | 39 - .../src/Google/Service/Directory/UserAddress.php | 138 - .../src/Google/Service/Directory/UserEmail.php | 57 - .../Google/Service/Directory/UserExternalId.php | 48 - .../src/Google/Service/Directory/UserIm.php | 75 - .../src/Google/Service/Directory/UserMakeAdmin.php | 30 - .../src/Google/Service/Directory/UserName.php | 48 - .../Google/Service/Directory/UserOrganization.php | 120 - .../src/Google/Service/Directory/UserPhone.php | 57 - .../src/Google/Service/Directory/UserPhoto.php | 93 - .../src/Google/Service/Directory/UserRelation.php | 48 - .../src/Google/Service/Directory/UserUndelete.php | 30 - .../src/Google/Service/Directory/UserWebsite.php | 57 - .../src/Google/Service/Directory/Users.php | 71 - .../Google/Service/Directory/VerificationCode.php | 57 - .../Google/Service/Directory/VerificationCodes.php | 50 - .../apiclient-services/src/Google/Service/Dns.php | 274 - .../src/Google/Service/Dns/Change.php | 78 - .../src/Google/Service/Dns/ChangesListResponse.php | 50 - .../src/Google/Service/Dns/ManagedZone.php | 94 - .../Service/Dns/ManagedZonesListResponse.php | 50 - .../src/Google/Service/Dns/Project.php | 58 - .../src/Google/Service/Dns/Quota.php | 84 - .../src/Google/Service/Dns/Resource/Changes.php | 86 - .../Google/Service/Dns/Resource/ManagedZones.php | 93 - .../src/Google/Service/Dns/Resource/Projects.php | 41 - .../Service/Dns/Resource/ResourceRecordSets.php | 54 - .../src/Google/Service/Dns/ResourceRecordSet.php | 67 - .../Service/Dns/ResourceRecordSetsListResponse.php | 50 - .../src/Google/Service/DoubleClickBidManager.php | 155 - .../DownloadLineItemsRequest.php | 58 - .../DownloadLineItemsResponse.php | 30 - .../DoubleClickBidManager/DownloadRequest.php | 58 - .../DoubleClickBidManager/DownloadResponse.php | 57 - .../Service/DoubleClickBidManager/FilterPair.php | 39 - .../DoubleClickBidManager/ListQueriesResponse.php | 41 - .../DoubleClickBidManager/ListReportsResponse.php | 41 - .../Google/Service/DoubleClickBidManager/Note.php | 66 - .../NotifyProposalChangeRequest.php | 68 - .../Service/DoubleClickBidManager/Parameters.php | 68 - .../Google/Service/DoubleClickBidManager/Query.php | 96 - .../DoubleClickBidManager/QueryMetadata.php | 121 - .../DoubleClickBidManager/QuerySchedule.php | 57 - .../Service/DoubleClickBidManager/Report.php | 51 - .../DoubleClickBidManager/ReportFailure.php | 30 - .../Service/DoubleClickBidManager/ReportKey.php | 39 - .../DoubleClickBidManager/ReportMetadata.php | 58 - .../Service/DoubleClickBidManager/ReportStatus.php | 58 - .../DoubleClickBidManager/Resource/Lineitems.php | 54 - .../DoubleClickBidManager/Resource/Queries.php | 92 - .../DoubleClickBidManager/Resource/Reports.php | 41 - .../DoubleClickBidManager/Resource/Rubicon.php | 41 - .../Service/DoubleClickBidManager/Resource/Sdf.php | 41 - .../Service/DoubleClickBidManager/RowStatus.php | 76 - .../DoubleClickBidManager/RunQueryRequest.php | 57 - .../UploadLineItemsRequest.php | 48 - .../UploadLineItemsResponse.php | 31 - .../Service/DoubleClickBidManager/UploadStatus.php | 41 - .../src/Google/Service/Doubleclicksearch.php | 242 - .../Service/Doubleclicksearch/Availability.php | 75 - .../Service/Doubleclicksearch/Conversion.php | 321 -- .../Service/Doubleclicksearch/ConversionList.php | 41 - .../Service/Doubleclicksearch/CustomDimension.php | 39 - .../Service/Doubleclicksearch/CustomMetric.php | 39 - .../Google/Service/Doubleclicksearch/Report.php | 105 - .../Doubleclicksearch/ReportApiColumnSpec.php | 111 - .../Service/Doubleclicksearch/ReportFiles.php | 39 - .../Service/Doubleclicksearch/ReportRequest.php | 153 - .../Doubleclicksearch/ReportRequestFilters.php | 50 - .../Doubleclicksearch/ReportRequestOrderBy.php | 40 - .../Doubleclicksearch/ReportRequestReportScope.php | 84 - .../Doubleclicksearch/ReportRequestTimeRange.php | 57 - .../Doubleclicksearch/Resource/Conversion.php | 121 - .../Service/Doubleclicksearch/Resource/Reports.php | 80 - .../Doubleclicksearch/Resource/SavedColumns.php | 43 - .../Service/Doubleclicksearch/SavedColumn.php | 48 - .../Service/Doubleclicksearch/SavedColumnList.php | 41 - .../UpdateAvailabilityRequest.php | 32 - .../UpdateAvailabilityResponse.php | 32 - .../src/Google/Service/Drive.php | 914 ---- .../src/Google/Service/Drive/About.php | 105 - .../src/Google/Service/Drive/AboutStorageQuota.php | 57 - .../src/Google/Service/Drive/Change.php | 95 - .../src/Google/Service/Drive/ChangeList.php | 59 - .../src/Google/Service/Drive/Channel.php | 111 - .../src/Google/Service/Drive/Comment.php | 133 - .../src/Google/Service/Drive/CommentList.php | 50 - .../Service/Drive/CommentQuotedFileContent.php | 39 - .../src/Google/Service/Drive/DriveFile.php | 490 -- .../Google/Service/Drive/DriveFileCapabilities.php | 165 - .../Google/Service/Drive/DriveFileContentHints.php | 40 - .../Drive/DriveFileContentHintsThumbnail.php | 39 - .../Service/Drive/DriveFileImageMediaMetadata.php | 211 - .../Drive/DriveFileImageMediaMetadataLocation.php | 48 - .../Service/Drive/DriveFileVideoMediaMetadata.php | 48 - .../src/Google/Service/Drive/FileList.php | 59 - .../src/Google/Service/Drive/GeneratedIds.php | 49 - .../src/Google/Service/Drive/Permission.php | 122 - .../src/Google/Service/Drive/PermissionList.php | 50 - .../Drive/PermissionTeamDrivePermissionDetails.php | 57 - .../src/Google/Service/Drive/Reply.php | 103 - .../src/Google/Service/Drive/ReplyList.php | 50 - .../src/Google/Service/Drive/Resource/About.php | 41 - .../src/Google/Service/Drive/Resource/Changes.php | 121 - .../src/Google/Service/Drive/Resource/Channels.php | 40 - .../src/Google/Service/Drive/Resource/Comments.php | 109 - .../src/Google/Service/Drive/Resource/Files.php | 251 - .../Google/Service/Drive/Resource/Permissions.php | 132 - .../src/Google/Service/Drive/Resource/Replies.php | 112 - .../Google/Service/Drive/Resource/Revisions.php | 93 - .../Google/Service/Drive/Resource/Teamdrives.php | 101 - .../src/Google/Service/Drive/Revision.php | 130 - .../src/Google/Service/Drive/RevisionList.php | 50 - .../src/Google/Service/Drive/StartPageToken.php | 39 - .../src/Google/Service/Drive/TeamDrive.php | 58 - .../Google/Service/Drive/TeamDriveCapabilities.php | 138 - .../src/Google/Service/Drive/TeamDriveList.php | 50 - .../src/Google/Service/Drive/User.php | 75 - .../src/Google/Service/FirebaseDynamicLinks.php | 68 - .../Service/FirebaseDynamicLinks/AnalyticsInfo.php | 41 - .../Service/FirebaseDynamicLinks/AndroidInfo.php | 57 - .../CreateShortDynamicLinkRequest.php | 50 - .../CreateShortDynamicLinkResponse.php | 50 - .../FirebaseDynamicLinks/DynamicLinkInfo.php | 89 - .../FirebaseDynamicLinks/DynamicLinkWarning.php | 39 - .../FirebaseDynamicLinks/GooglePlayAnalytics.php | 75 - .../ITunesConnectAnalytics.php | 57 - .../Service/FirebaseDynamicLinks/IosInfo.php | 75 - .../FirebaseDynamicLinks/NavigationInfo.php | 30 - .../FirebaseDynamicLinks/Resource/ShortLinks.php | 49 - .../FirebaseDynamicLinks/SocialMetaTagInfo.php | 48 - .../Google/Service/FirebaseDynamicLinks/Suffix.php | 30 - .../src/Google/Service/FirebaseDynamicLinksAPI.php | 69 - .../FirebaseDynamicLinksAPI/AnalyticsInfo.php | 41 - .../FirebaseDynamicLinksAPI/AndroidInfo.php | 57 - .../CreateShortDynamicLinkRequest.php | 50 - .../CreateShortDynamicLinkResponse.php | 50 - .../FirebaseDynamicLinksAPI/DynamicLinkInfo.php | 88 - .../FirebaseDynamicLinksAPI/DynamicLinkWarning.php | 39 - .../GooglePlayAnalytics.php | 75 - .../ITunesConnectAnalytics.php | 57 - .../Service/FirebaseDynamicLinksAPI/IosInfo.php | 75 - .../Resource/ShortDynamicLinks.php | 49 - .../FirebaseDynamicLinksAPI/SocialMetaTagInfo.php | 48 - .../Service/FirebaseDynamicLinksAPI/Suffix.php | 30 - .../src/Google/Service/FirebaseRulesAPI.php | 212 - .../FirebaseRulesAPI/FirebaserulesEmpty.php | 20 - .../Service/FirebaseRulesAPI/FirebaserulesFile.php | 48 - .../src/Google/Service/FirebaseRulesAPI/Issue.php | 49 - .../FirebaseRulesAPI/ListReleasesResponse.php | 41 - .../FirebaseRulesAPI/ListRulesetsResponse.php | 41 - .../Google/Service/FirebaseRulesAPI/Release.php | 57 - .../Service/FirebaseRulesAPI/Resource/Projects.php | 62 - .../FirebaseRulesAPI/Resource/ProjectsReleases.php | 186 - .../FirebaseRulesAPI/Resource/ProjectsRulesets.php | 108 - .../Google/Service/FirebaseRulesAPI/Ruleset.php | 49 - .../src/Google/Service/FirebaseRulesAPI/Source.php | 32 - .../Service/FirebaseRulesAPI/SourcePosition.php | 48 - .../FirebaseRulesAPI/TestRulesetRequest.php | 31 - .../FirebaseRulesAPI/TestRulesetResponse.php | 32 - .../src/Google/Service/Fitness.php | 386 -- .../src/Google/Service/Fitness/AggregateBucket.php | 78 - .../src/Google/Service/Fitness/AggregateBy.php | 39 - .../Google/Service/Fitness/AggregateRequest.php | 99 - .../Google/Service/Fitness/AggregateResponse.php | 32 - .../src/Google/Service/Fitness/Application.php | 57 - .../Google/Service/Fitness/BucketByActivity.php | 39 - .../src/Google/Service/Fitness/BucketBySession.php | 30 - .../src/Google/Service/Fitness/BucketByTime.php | 40 - .../Google/Service/Fitness/BucketByTimePeriod.php | 48 - .../src/Google/Service/Fitness/DataPoint.php | 95 - .../src/Google/Service/Fitness/DataSource.php | 97 - .../src/Google/Service/Fitness/DataType.php | 41 - .../src/Google/Service/Fitness/DataTypeField.php | 48 - .../src/Google/Service/Fitness/Dataset.php | 68 - .../src/Google/Service/Fitness/Device.php | 66 - .../Service/Fitness/ListDataSourcesResponse.php | 32 - .../Service/Fitness/ListSessionsResponse.php | 60 - .../src/Google/Service/Fitness/MapValue.php | 30 - .../src/Google/Service/Fitness/Resource/Users.php | 28 - .../Service/Fitness/Resource/UsersDataSources.php | 143 - .../Fitness/Resource/UsersDataSourcesDatasets.php | 119 - .../Service/Fitness/Resource/UsersDataset.php | 46 - .../Service/Fitness/Resource/UsersSessions.php | 89 - .../src/Google/Service/Fitness/Session.php | 103 - .../src/Google/Service/Fitness/Value.php | 59 - .../Google/Service/Fitness/ValueMapValEntry.php | 40 - .../src/Google/Service/Freebase.php | 258 - .../Google/Service/Freebase/ReconcileCandidate.php | 67 - .../Service/Freebase/ReconcileCandidateNotable.php | 39 - .../src/Google/Service/Freebase/ReconcileGet.php | 62 - .../Google/Service/Freebase/ReconcileGetCosts.php | 39 - .../Service/Freebase/ReconcileGetWarning.php | 48 - .../src/Google/Service/Fusiontables.php | 630 --- .../src/Google/Service/Fusiontables/Bucket.php | 75 - .../src/Google/Service/Fusiontables/Column.php | 131 - .../Service/Fusiontables/ColumnBaseColumn.php | 39 - .../src/Google/Service/Fusiontables/ColumnList.php | 59 - .../src/Google/Service/Fusiontables/Geometry.php | 49 - .../src/Google/Service/Fusiontables/Import.php | 39 - .../src/Google/Service/Fusiontables/Line.php | 40 - .../src/Google/Service/Fusiontables/LineStyle.php | 68 - .../src/Google/Service/Fusiontables/Point.php | 40 - .../src/Google/Service/Fusiontables/PointStyle.php | 40 - .../src/Google/Service/Fusiontables/Polygon.php | 40 - .../Google/Service/Fusiontables/PolygonStyle.php | 96 - .../Service/Fusiontables/Resource/Column.php | 121 - .../Google/Service/Fusiontables/Resource/Query.php | 70 - .../Google/Service/Fusiontables/Resource/Style.php | 118 - .../Google/Service/Fusiontables/Resource/Table.php | 212 - .../Google/Service/Fusiontables/Resource/Task.php | 75 - .../Service/Fusiontables/Resource/Template.php | 119 - .../Google/Service/Fusiontables/Sqlresponse.php | 49 - .../Google/Service/Fusiontables/StyleFunction.php | 60 - .../Service/Fusiontables/StyleFunctionGradient.php | 50 - .../Fusiontables/StyleFunctionGradientColors.php | 39 - .../Google/Service/Fusiontables/StyleSetting.php | 87 - .../Service/Fusiontables/StyleSettingList.php | 59 - .../src/Google/Service/Fusiontables/Table.php | 140 - .../src/Google/Service/Fusiontables/TableList.php | 50 - .../src/Google/Service/Fusiontables/Task.php | 66 - .../src/Google/Service/Fusiontables/TaskList.php | 59 - .../src/Google/Service/Fusiontables/Template.php | 76 - .../Google/Service/Fusiontables/TemplateList.php | 59 - .../src/Google/Service/Games.php | 1278 ----- .../Google/Service/Games/AchievementDefinition.php | 138 - .../Games/AchievementDefinitionsListResponse.php | 50 - .../Service/Games/AchievementIncrementResponse.php | 48 - .../Service/Games/AchievementRevealResponse.php | 39 - .../Games/AchievementSetStepsAtLeastResponse.php | 48 - .../Service/Games/AchievementUnlockResponse.php | 39 - .../Games/AchievementUpdateMultipleRequest.php | 41 - .../Games/AchievementUpdateMultipleResponse.php | 41 - .../Service/Games/AchievementUpdateRequest.php | 68 - .../Service/Games/AchievementUpdateResponse.php | 75 - .../src/Google/Service/Games/AggregateStats.php | 66 - .../src/Google/Service/Games/AnonymousPlayer.php | 48 - .../src/Google/Service/Games/Application.php | 146 - .../Google/Service/Games/ApplicationCategory.php | 48 - .../Service/Games/ApplicationVerifyResponse.php | 52 - .../src/Google/Service/Games/Category.php | 48 - .../Google/Service/Games/CategoryListResponse.php | 50 - .../Service/Games/EventBatchRecordFailure.php | 49 - .../src/Google/Service/Games/EventChild.php | 39 - .../src/Google/Service/Games/EventDefinition.php | 95 - .../Service/Games/EventDefinitionListResponse.php | 50 - .../src/Google/Service/Games/EventPeriodRange.php | 48 - .../src/Google/Service/Games/EventPeriodUpdate.php | 51 - .../Google/Service/Games/EventRecordFailure.php | 48 - .../Google/Service/Games/EventRecordRequest.php | 59 - .../Google/Service/Games/EventUpdateRequest.php | 48 - .../Google/Service/Games/EventUpdateResponse.php | 61 - .../Service/Games/GamesAchievementIncrement.php | 48 - .../Games/GamesAchievementSetStepsAtLeast.php | 39 - .../src/Google/Service/Games/ImageAsset.php | 66 - .../src/Google/Service/Games/Instance.php | 105 - .../Service/Games/InstanceAndroidDetails.php | 57 - .../Google/Service/Games/InstanceIosDetails.php | 84 - .../Google/Service/Games/InstanceWebDetails.php | 48 - .../src/Google/Service/Games/Leaderboard.php | 75 - .../src/Google/Service/Games/LeaderboardEntry.php | 103 - .../Service/Games/LeaderboardListResponse.php | 50 - .../Google/Service/Games/LeaderboardScoreRank.php | 66 - .../src/Google/Service/Games/LeaderboardScores.php | 78 - .../src/Google/Service/Games/MetagameConfig.php | 50 - .../Google/Service/Games/NetworkDiagnostics.php | 84 - .../src/Google/Service/Games/ParticipantResult.php | 57 - .../Service/Games/PeerChannelDiagnostics.php | 96 - .../Service/Games/PeerSessionDiagnostics.php | 68 - .../src/Google/Service/Games/Played.php | 48 - .../src/Google/Service/Games/Player.php | 133 - .../src/Google/Service/Games/PlayerAchievement.php | 84 - .../Games/PlayerAchievementListResponse.php | 50 - .../src/Google/Service/Games/PlayerEvent.php | 66 - .../Service/Games/PlayerEventListResponse.php | 50 - .../Google/Service/Games/PlayerExperienceInfo.php | 68 - .../Service/Games/PlayerLeaderboardScore.php | 107 - .../Games/PlayerLeaderboardScoreListResponse.php | 60 - .../src/Google/Service/Games/PlayerLevel.php | 57 - .../Google/Service/Games/PlayerListResponse.php | 50 - .../src/Google/Service/Games/PlayerName.php | 39 - .../src/Google/Service/Games/PlayerScore.php | 66 - .../Service/Games/PlayerScoreListResponse.php | 41 - .../Google/Service/Games/PlayerScoreResponse.php | 77 - .../Service/Games/PlayerScoreSubmissionList.php | 41 - .../src/Google/Service/Games/ProfileSettings.php | 39 - .../src/Google/Service/Games/PushToken.php | 58 - .../src/Google/Service/Games/PushTokenId.php | 40 - .../src/Google/Service/Games/PushTokenIdIos.php | 43 - .../src/Google/Service/Games/Quest.php | 167 - .../src/Google/Service/Games/QuestContribution.php | 48 - .../src/Google/Service/Games/QuestCriterion.php | 69 - .../src/Google/Service/Games/QuestListResponse.php | 50 - .../src/Google/Service/Games/QuestMilestone.php | 68 - .../Games/Resource/AchievementDefinitions.php | 49 - .../Google/Service/Games/Resource/Achievements.php | 141 - .../Google/Service/Games/Resource/Applications.php | 82 - .../src/Google/Service/Games/Resource/Events.php | 88 - .../Google/Service/Games/Resource/Leaderboards.php | 67 - .../src/Google/Service/Games/Resource/Metagame.php | 68 - .../src/Google/Service/Games/Resource/Players.php | 69 - .../Google/Service/Games/Resource/Pushtokens.php | 58 - .../Service/Games/Resource/QuestMilestones.php | 48 - .../src/Google/Service/Games/Resource/Quests.php | 70 - .../Google/Service/Games/Resource/Revisions.php | 47 - .../src/Google/Service/Games/Resource/Rooms.php | 174 - .../src/Google/Service/Games/Resource/Scores.php | 158 - .../Google/Service/Games/Resource/Snapshots.php | 68 - .../Service/Games/Resource/TurnBasedMatches.php | 289 - .../Google/Service/Games/RevisionCheckResponse.php | 48 - .../src/Google/Service/Games/Room.php | 144 - .../Google/Service/Games/RoomAutoMatchStatus.php | 39 - .../Service/Games/RoomAutoMatchingCriteria.php | 57 - .../src/Google/Service/Games/RoomClientAddress.php | 39 - .../src/Google/Service/Games/RoomCreateRequest.php | 97 - .../src/Google/Service/Games/RoomJoinRequest.php | 60 - .../Google/Service/Games/RoomLeaveDiagnostics.php | 95 - .../src/Google/Service/Games/RoomLeaveRequest.php | 49 - .../src/Google/Service/Games/RoomList.php | 50 - .../src/Google/Service/Games/RoomModification.php | 48 - .../src/Google/Service/Games/RoomP2PStatus.php | 87 - .../src/Google/Service/Games/RoomP2PStatuses.php | 41 - .../src/Google/Service/Games/RoomParticipant.php | 115 - .../src/Google/Service/Games/RoomStatus.php | 78 - .../src/Google/Service/Games/ScoreSubmission.php | 66 - .../src/Google/Service/Games/Snapshot.php | 121 - .../src/Google/Service/Games/SnapshotImage.php | 69 - .../Google/Service/Games/SnapshotListResponse.php | 50 - .../Games/TurnBasedAutoMatchingCriteria.php | 57 - .../src/Google/Service/Games/TurnBasedMatch.php | 209 - .../Service/Games/TurnBasedMatchCreateRequest.php | 68 - .../Google/Service/Games/TurnBasedMatchData.php | 48 - .../Service/Games/TurnBasedMatchDataRequest.php | 39 - .../Google/Service/Games/TurnBasedMatchList.php | 50 - .../Service/Games/TurnBasedMatchModification.php | 48 - .../Service/Games/TurnBasedMatchParticipant.php | 77 - .../Google/Service/Games/TurnBasedMatchRematch.php | 50 - .../Google/Service/Games/TurnBasedMatchResults.php | 60 - .../Google/Service/Games/TurnBasedMatchSync.php | 59 - .../Google/Service/Games/TurnBasedMatchTurn.php | 69 - .../src/Google/Service/GamesConfiguration.php | 236 - .../AchievementConfiguration.php | 95 - .../AchievementConfigurationDetail.php | 77 - .../AchievementConfigurationListResponse.php | 50 - .../GamesNumberAffixConfiguration.php | 81 - .../GamesNumberFormatConfiguration.php | 58 - .../GamesConfiguration/ImageConfiguration.php | 57 - .../LeaderboardConfiguration.php | 95 - .../LeaderboardConfigurationDetail.php | 68 - .../LeaderboardConfigurationListResponse.php | 50 - .../Service/GamesConfiguration/LocalizedString.php | 48 - .../GamesConfiguration/LocalizedStringBundle.php | 41 - .../Resource/AchievementConfigurations.php | 121 - .../Resource/ImageConfigurations.php | 43 - .../Resource/LeaderboardConfigurations.php | 121 - .../src/Google/Service/GamesManagement.php | 335 -- .../AchievementResetAllResponse.php | 41 - .../AchievementResetMultipleForAllRequest.php | 43 - .../GamesManagement/AchievementResetResponse.php | 57 - .../EventsResetMultipleForAllRequest.php | 43 - .../GamesManagement/GamesPlayedResource.php | 39 - .../GamesPlayerExperienceInfoResource.php | 59 - .../GamesManagement/GamesPlayerLevelResource.php | 48 - .../Service/GamesManagement/HiddenPlayer.php | 49 - .../Service/GamesManagement/HiddenPlayerList.php | 50 - .../src/Google/Service/GamesManagement/Player.php | 133 - .../Google/Service/GamesManagement/PlayerName.php | 39 - .../PlayerScoreResetAllResponse.php | 41 - .../GamesManagement/PlayerScoreResetResponse.php | 49 - .../Service/GamesManagement/ProfileSettings.php | 39 - .../QuestsResetMultipleForAllRequest.php | 43 - .../GamesManagement/Resource/Achievements.php | 98 - .../GamesManagement/Resource/Applications.php | 49 - .../Service/GamesManagement/Resource/Events.php | 100 - .../Service/GamesManagement/Resource/Players.php | 62 - .../Service/GamesManagement/Resource/Quests.php | 95 - .../Service/GamesManagement/Resource/Rooms.php | 54 - .../Service/GamesManagement/Resource/Scores.php | 98 - .../GamesManagement/Resource/TurnBasedMatches.php | 54 - .../ScoresResetMultipleForAllRequest.php | 43 - .../src/Google/Service/Genomics.php | 720 --- .../src/Google/Service/Genomics/Annotation.php | 131 - .../src/Google/Service/Genomics/AnnotationSet.php | 84 - .../Genomics/BatchCreateAnnotationsRequest.php | 41 - .../Genomics/BatchCreateAnnotationsResponse.php | 32 - .../src/Google/Service/Genomics/Binding.php | 40 - .../src/Google/Service/Genomics/CallSet.php | 76 - .../Service/Genomics/CancelOperationRequest.php | 20 - .../src/Google/Service/Genomics/CigarUnit.php | 48 - .../Google/Service/Genomics/ClinicalCondition.php | 59 - .../src/Google/Service/Genomics/CodingSequence.php | 39 - .../src/Google/Service/Genomics/ComputeEngine.php | 58 - .../src/Google/Service/Genomics/CoverageBucket.php | 40 - .../src/Google/Service/Genomics/Dataset.php | 57 - .../src/Google/Service/Genomics/Entry.php | 41 - .../src/Google/Service/Genomics/Exon.php | 48 - .../src/Google/Service/Genomics/Experiment.php | 57 - .../Service/Genomics/ExportReadGroupSetRequest.php | 49 - .../Service/Genomics/ExportVariantSetRequest.php | 67 - .../src/Google/Service/Genomics/ExternalId.php | 39 - .../src/Google/Service/Genomics/GenomicsEmpty.php | 20 - .../Service/Genomics/GetIamPolicyRequest.php | 20 - .../Genomics/ImportReadGroupSetsRequest.php | 58 - .../Genomics/ImportReadGroupSetsResponse.php | 31 - .../Service/Genomics/ImportVariantsRequest.php | 67 - .../Service/Genomics/ImportVariantsResponse.php | 31 - .../Google/Service/Genomics/LinearAlignment.php | 51 - .../Google/Service/Genomics/ListBasesResponse.php | 48 - .../Genomics/ListCoverageBucketsResponse.php | 50 - .../Service/Genomics/ListDatasetsResponse.php | 41 - .../Service/Genomics/ListOperationsResponse.php | 41 - .../Service/Genomics/MergeVariantsRequest.php | 50 - .../src/Google/Service/Genomics/Operation.php | 67 - .../src/Google/Service/Genomics/OperationEvent.php | 48 - .../Google/Service/Genomics/OperationMetadata.php | 104 - .../src/Google/Service/Genomics/Policy.php | 50 - .../src/Google/Service/Genomics/Position.php | 48 - .../src/Google/Service/Genomics/Program.php | 66 - .../src/Google/Service/Genomics/Range.php | 48 - .../src/Google/Service/Genomics/Read.php | 177 - .../src/Google/Service/Genomics/ReadGroup.php | 114 - .../src/Google/Service/Genomics/ReadGroupSet.php | 86 - .../src/Google/Service/Genomics/Reference.php | 85 - .../src/Google/Service/Genomics/ReferenceBound.php | 39 - .../src/Google/Service/Genomics/ReferenceSet.php | 94 - .../Service/Genomics/Resource/Annotations.php | 149 - .../Service/Genomics/Resource/Annotationsets.php | 116 - .../Google/Service/Genomics/Resource/Callsets.php | 124 - .../Google/Service/Genomics/Resource/Datasets.php | 214 - .../Service/Genomics/Resource/Operations.php | 94 - .../Service/Genomics/Resource/Readgroupsets.php | 166 - .../Resource/ReadgroupsetsCoveragebuckets.php | 75 - .../src/Google/Service/Genomics/Resource/Reads.php | 64 - .../Service/Genomics/Resource/References.php | 70 - .../Service/Genomics/Resource/ReferencesBases.php | 60 - .../Service/Genomics/Resource/Referencesets.php | 70 - .../Google/Service/Genomics/Resource/Variants.php | 213 - .../Service/Genomics/Resource/Variantsets.php | 151 - .../Google/Service/Genomics/RuntimeMetadata.php | 31 - .../Genomics/SearchAnnotationSetsRequest.php | 76 - .../Genomics/SearchAnnotationSetsResponse.php | 41 - .../Service/Genomics/SearchAnnotationsRequest.php | 85 - .../Service/Genomics/SearchAnnotationsResponse.php | 41 - .../Service/Genomics/SearchCallSetsRequest.php | 58 - .../Service/Genomics/SearchCallSetsResponse.php | 41 - .../Genomics/SearchReadGroupSetsRequest.php | 58 - .../Genomics/SearchReadGroupSetsResponse.php | 41 - .../Google/Service/Genomics/SearchReadsRequest.php | 85 - .../Service/Genomics/SearchReadsResponse.php | 41 - .../Genomics/SearchReferenceSetsRequest.php | 67 - .../Genomics/SearchReferenceSetsResponse.php | 41 - .../Service/Genomics/SearchReferencesRequest.php | 67 - .../Service/Genomics/SearchReferencesResponse.php | 41 - .../Service/Genomics/SearchVariantSetsRequest.php | 49 - .../Service/Genomics/SearchVariantSetsResponse.php | 41 - .../Service/Genomics/SearchVariantsRequest.php | 103 - .../Service/Genomics/SearchVariantsResponse.php | 41 - .../Service/Genomics/SetIamPolicyRequest.php | 31 - .../src/Google/Service/Genomics/Status.php | 49 - .../Google/Service/Genomics/StreamReadsRequest.php | 84 - .../Service/Genomics/StreamReadsResponse.php | 32 - .../Service/Genomics/StreamVariantsRequest.php | 76 - .../Service/Genomics/StreamVariantsResponse.php | 32 - .../Service/Genomics/TestIamPermissionsRequest.php | 31 - .../Genomics/TestIamPermissionsResponse.php | 31 - .../src/Google/Service/Genomics/Transcript.php | 51 - .../Service/Genomics/UndeleteDatasetRequest.php | 20 - .../src/Google/Service/Genomics/Variant.php | 140 - .../Google/Service/Genomics/VariantAnnotation.php | 86 - .../src/Google/Service/Genomics/VariantCall.php | 76 - .../src/Google/Service/Genomics/VariantSet.php | 87 - .../Google/Service/Genomics/VariantSetMetadata.php | 84 - .../src/Google/Service/Gmail.php | 1136 ---- .../src/Google/Service/Gmail/AutoForwarding.php | 48 - .../Service/Gmail/BatchDeleteMessagesRequest.php | 31 - .../Service/Gmail/BatchModifyMessagesRequest.php | 49 - .../src/Google/Service/Gmail/Draft.php | 40 - .../src/Google/Service/Gmail/Filter.php | 50 - .../src/Google/Service/Gmail/FilterAction.php | 49 - .../src/Google/Service/Gmail/FilterCriteria.php | 102 - .../src/Google/Service/Gmail/ForwardingAddress.php | 39 - .../src/Google/Service/Gmail/History.php | 81 - .../src/Google/Service/Gmail/HistoryLabelAdded.php | 41 - .../Google/Service/Gmail/HistoryLabelRemoved.php | 41 - .../Google/Service/Gmail/HistoryMessageAdded.php | 31 - .../Google/Service/Gmail/HistoryMessageDeleted.php | 31 - .../src/Google/Service/Gmail/ImapSettings.php | 57 - .../src/Google/Service/Gmail/Label.php | 102 - .../Google/Service/Gmail/ListDraftsResponse.php | 50 - .../Google/Service/Gmail/ListFiltersResponse.php | 32 - .../Gmail/ListForwardingAddressesResponse.php | 32 - .../Google/Service/Gmail/ListHistoryResponse.php | 50 - .../Google/Service/Gmail/ListLabelsResponse.php | 32 - .../Google/Service/Gmail/ListMessagesResponse.php | 50 - .../Google/Service/Gmail/ListSendAsResponse.php | 32 - .../Google/Service/Gmail/ListSmimeInfoResponse.php | 32 - .../Google/Service/Gmail/ListThreadsResponse.php | 50 - .../src/Google/Service/Gmail/Message.php | 104 - .../src/Google/Service/Gmail/MessagePart.php | 79 - .../src/Google/Service/Gmail/MessagePartBody.php | 48 - .../src/Google/Service/Gmail/MessagePartHeader.php | 39 - .../Google/Service/Gmail/ModifyMessageRequest.php | 40 - .../Google/Service/Gmail/ModifyThreadRequest.php | 40 - .../src/Google/Service/Gmail/PopSettings.php | 39 - .../src/Google/Service/Gmail/Profile.php | 57 - .../src/Google/Service/Gmail/Resource/Users.php | 71 - .../Google/Service/Gmail/Resource/UsersDrafts.php | 130 - .../Google/Service/Gmail/Resource/UsersHistory.php | 61 - .../Google/Service/Gmail/Resource/UsersLabels.php | 120 - .../Service/Gmail/Resource/UsersMessages.php | 229 - .../Gmail/Resource/UsersMessagesAttachments.php | 44 - .../Service/Gmail/Resource/UsersSettings.php | 149 - .../Gmail/Resource/UsersSettingsFilters.php | 86 - .../Resource/UsersSettingsForwardingAddresses.php | 97 - .../Service/Gmail/Resource/UsersSettingsSendAs.php | 162 - .../Resource/UsersSettingsSendAsSmimeInfo.php | 115 - .../Google/Service/Gmail/Resource/UsersThreads.php | 135 - .../src/Google/Service/Gmail/SendAs.php | 103 - .../src/Google/Service/Gmail/SmimeInfo.php | 84 - .../src/Google/Service/Gmail/SmtpMsa.php | 66 - .../src/Google/Service/Gmail/Thread.php | 59 - .../src/Google/Service/Gmail/VacationSettings.php | 93 - .../src/Google/Service/Gmail/WatchRequest.php | 49 - .../src/Google/Service/Gmail/WatchResponse.php | 39 - .../src/Google/Service/GroupsMigration.php | 73 - .../src/Google/Service/GroupsMigration/Groups.php | 39 - .../Service/GroupsMigration/Resource/Archive.php | 41 - .../src/Google/Service/Groupssettings.php | 93 - .../src/Google/Service/Groupssettings/Groups.php | 300 -- .../Service/Groupssettings/Resource/Groups.php | 70 - .../apiclient-services/src/Google/Service/Iam.php | 248 - .../src/Google/Service/Iam/AuditData.php | 31 - .../src/Google/Service/Iam/Binding.php | 40 - .../src/Google/Service/Iam/BindingDelta.php | 48 - .../src/Google/Service/Iam/CloudAuditOptions.php | 20 - .../src/Google/Service/Iam/Condition.php | 76 - .../src/Google/Service/Iam/CounterOptions.php | 39 - .../Service/Iam/CreateServiceAccountKeyRequest.php | 39 - .../Service/Iam/CreateServiceAccountRequest.php | 40 - .../src/Google/Service/Iam/DataAccessOptions.php | 20 - .../src/Google/Service/Iam/IamEmpty.php | 20 - .../Service/Iam/ListServiceAccountKeysResponse.php | 32 - .../Service/Iam/ListServiceAccountsResponse.php | 41 - .../src/Google/Service/Iam/LogConfig.php | 51 - .../src/Google/Service/Iam/Policy.php | 50 - .../src/Google/Service/Iam/PolicyDelta.php | 32 - .../Service/Iam/QueryGrantableRolesRequest.php | 30 - .../Service/Iam/QueryGrantableRolesResponse.php | 32 - .../src/Google/Service/Iam/Resource/Projects.php | 28 - .../Iam/Resource/ProjectsServiceAccounts.php | 215 - .../Iam/Resource/ProjectsServiceAccountsKeys.php | 108 - .../src/Google/Service/Iam/Resource/Roles.php | 43 - .../src/Google/Service/Iam/Role.php | 48 - .../src/Google/Service/Iam/Rule.php | 87 - .../src/Google/Service/Iam/ServiceAccount.php | 84 - .../src/Google/Service/Iam/ServiceAccountKey.php | 84 - .../src/Google/Service/Iam/SetIamPolicyRequest.php | 31 - .../src/Google/Service/Iam/SignBlobRequest.php | 30 - .../src/Google/Service/Iam/SignBlobResponse.php | 39 - .../src/Google/Service/Iam/SignJwtRequest.php | 30 - .../src/Google/Service/Iam/SignJwtResponse.php | 39 - .../Service/Iam/TestIamPermissionsRequest.php | 31 - .../Service/Iam/TestIamPermissionsResponse.php | 31 - .../src/Google/Service/IdentityToolkit.php | 143 - .../IdentityToolkit/CreateAuthUriResponse.php | 94 - .../IdentityToolkit/DeleteAccountResponse.php | 30 - .../IdentityToolkit/DownloadAccountResponse.php | 50 - .../Service/IdentityToolkit/EmailTemplate.php | 75 - .../IdentityToolkit/GetAccountInfoResponse.php | 41 - .../GetOobConfirmationCodeResponse.php | 48 - .../IdentityToolkit/GetRecaptchaParamResponse.php | 48 - ...titytoolkitRelyingpartyCreateAuthUriRequest.php | 147 - ...ingpartyCreateAuthUriRequestCustomParameter.php | 39 - ...titytoolkitRelyingpartyDeleteAccountRequest.php | 48 - ...tytoolkitRelyingpartyDownloadAccountRequest.php | 57 - ...itytoolkitRelyingpartyGetAccountInfoRequest.php | 58 - ...toolkitRelyingpartyGetProjectConfigResponse.php | 135 - ...titytoolkitRelyingpartyResetPasswordRequest.php | 57 - ...itytoolkitRelyingpartySetAccountInfoRequest.php | 211 - ...ytoolkitRelyingpartySetProjectConfigRequest.php | 126 - ...toolkitRelyingpartySetProjectConfigResponse.php | 30 - ...entitytoolkitRelyingpartySignOutUserRequest.php | 39 - ...ntitytoolkitRelyingpartySignOutUserResponse.php | 30 - ...titytoolkitRelyingpartySignupNewUserRequest.php | 120 - ...titytoolkitRelyingpartyUploadAccountRequest.php | 113 - ...tytoolkitRelyingpartyVerifyAssertionRequest.php | 111 - ...toolkitRelyingpartyVerifyCustomTokenRequest.php | 57 - ...itytoolkitRelyingpartyVerifyPasswordRequest.php | 102 - .../Google/Service/IdentityToolkit/IdpConfig.php | 76 - .../Service/IdentityToolkit/Relyingparty.php | 93 - .../IdentityToolkit/ResetPasswordResponse.php | 57 - .../IdentityToolkit/Resource/Relyingparty.php | 252 - .../IdentityToolkit/SetAccountInfoResponse.php | 131 - .../SetAccountInfoResponseProviderUserInfo.php | 57 - .../IdentityToolkit/SignupNewUserResponse.php | 84 - .../IdentityToolkit/UploadAccountResponse.php | 41 - .../IdentityToolkit/UploadAccountResponseError.php | 39 - .../Google/Service/IdentityToolkit/UserInfo.php | 176 - .../IdentityToolkit/UserInfoProviderUserInfo.php | 84 - .../IdentityToolkit/VerifyAssertionResponse.php | 373 -- .../IdentityToolkit/VerifyCustomTokenResponse.php | 57 - .../IdentityToolkit/VerifyPasswordResponse.php | 129 - .../src/Google/Service/Kgsearch.php | 97 - .../Google/Service/Kgsearch/Resource/Entities.php | 56 - .../src/Google/Service/Kgsearch/SearchResponse.php | 53 - .../src/Google/Service/Licensing.php | 209 - .../Google/Service/Licensing/LicenseAssignment.php | 93 - .../Service/Licensing/LicenseAssignmentInsert.php | 30 - .../Service/Licensing/LicenseAssignmentList.php | 59 - .../Licensing/Resource/LicenseAssignments.php | 149 - .../src/Google/Service/Logging.php | 640 --- .../src/Google/Service/Logging/HttpRequest.php | 147 - .../src/Google/Service/Logging/LabelDescriptor.php | 48 - .../Service/Logging/ListLogEntriesRequest.php | 76 - .../Service/Logging/ListLogEntriesResponse.php | 41 - .../Service/Logging/ListLogMetricsResponse.php | 41 - .../Google/Service/Logging/ListLogsResponse.php | 40 - .../ListMonitoredResourceDescriptorsResponse.php | 41 - .../Google/Service/Logging/ListSinksResponse.php | 41 - .../src/Google/Service/Logging/LogEntry.php | 142 - .../Google/Service/Logging/LogEntryOperation.php | 57 - .../Service/Logging/LogEntrySourceLocation.php | 48 - .../src/Google/Service/Logging/LogLine.php | 58 - .../src/Google/Service/Logging/LogMetric.php | 57 - .../src/Google/Service/Logging/LogSink.php | 84 - .../src/Google/Service/Logging/LoggingEmpty.php | 20 - .../Google/Service/Logging/MonitoredResource.php | 39 - .../Logging/MonitoredResourceDescriptor.php | 68 - .../src/Google/Service/Logging/RequestLog.php | 312 -- .../Service/Logging/Resource/BillingAccounts.php | 28 - .../Logging/Resource/BillingAccountsLogs.php | 74 - .../Logging/Resource/BillingAccountsSinks.php | 155 - .../Google/Service/Logging/Resource/Entries.php | 56 - .../Google/Service/Logging/Resource/Folders.php | 28 - .../Service/Logging/Resource/FoldersLogs.php | 74 - .../Service/Logging/Resource/FoldersSinks.php | 155 - .../Resource/MonitoredResourceDescriptors.php | 49 - .../Service/Logging/Resource/Organizations.php | 28 - .../Service/Logging/Resource/OrganizationsLogs.php | 74 - .../Logging/Resource/OrganizationsSinks.php | 155 - .../Google/Service/Logging/Resource/Projects.php | 28 - .../Service/Logging/Resource/ProjectsLogs.php | 74 - .../Service/Logging/Resource/ProjectsMetrics.php | 111 - .../Service/Logging/Resource/ProjectsSinks.php | 155 - .../src/Google/Service/Logging/SourceLocation.php | 48 - .../src/Google/Service/Logging/SourceReference.php | 39 - .../src/Google/Service/Logging/Status.php | 49 - .../Service/Logging/WriteLogEntriesRequest.php | 69 - .../Service/Logging/WriteLogEntriesResponse.php | 20 - .../src/Google/Service/Manager.php | 229 - .../src/Google/Service/Manager/AccessConfig.php | 48 - .../src/Google/Service/Manager/Action.php | 40 - .../src/Google/Service/Manager/AllowedRule.php | 43 - .../Google/Service/Manager/AutoscalingModule.php | 84 - .../Service/Manager/AutoscalingModuleStatus.php | 30 - .../src/Google/Service/Manager/DeployState.php | 39 - .../src/Google/Service/Manager/Deployment.php | 88 - .../Service/Manager/DeploymentsListResponse.php | 41 - .../Google/Service/Manager/DeploymentsResource.php | 92 - .../src/Google/Service/Manager/DiskAttachment.php | 39 - .../src/Google/Service/Manager/EnvVariable.php | 39 - .../src/Google/Service/Manager/ExistingDisk.php | 40 - .../src/Google/Service/Manager/FirewallModule.php | 77 - .../Service/Manager/FirewallModuleStatus.php | 30 - .../Google/Service/Manager/HealthCheckModule.php | 93 - .../Service/Manager/HealthCheckModuleStatus.php | 30 - .../src/Google/Service/Manager/LbModule.php | 85 - .../src/Google/Service/Manager/LbModuleStatus.php | 39 - .../src/Google/Service/Manager/Metadata.php | 41 - .../src/Google/Service/Manager/MetadataItem.php | 39 - .../src/Google/Service/Manager/Module.php | 90 - .../src/Google/Service/Manager/ModuleStatus.php | 100 - .../Google/Service/Manager/NetworkInterface.php | 59 - .../src/Google/Service/Manager/NetworkModule.php | 51 - .../Google/Service/Manager/NetworkModuleStatus.php | 30 - .../src/Google/Service/Manager/NewDisk.php | 59 - .../Service/Manager/NewDiskInitializeParams.php | 48 - .../src/Google/Service/Manager/ParamOverride.php | 39 - .../Google/Service/Manager/ReplicaPoolModule.php | 69 - .../Service/Manager/ReplicaPoolModuleStatus.php | 39 - .../Google/Service/Manager/ReplicaPoolParams.php | 31 - .../Service/Manager/ReplicaPoolParamsV1Beta1.php | 154 - .../src/Google/Service/Manager/ServiceAccount.php | 40 - .../src/Google/Service/Manager/Tag.php | 40 - .../src/Google/Service/Manager/Template.php | 59 - .../Service/Manager/TemplatesListResponse.php | 41 - .../Google/Service/Manager/TemplatesResource.php | 88 - .../src/Google/Service/ManufacturerCenter.php | 96 - .../Service/ManufacturerCenter/Attributes.php | 94 - .../Google/Service/ManufacturerCenter/Issue.php | 57 - .../ManufacturerCenter/ListProductsResponse.php | 41 - .../Google/Service/ManufacturerCenter/Product.php | 116 - .../ManufacturerCenter/Resource/Accounts.php | 28 - .../Resource/AccountsProducts.php | 75 - .../src/Google/Service/Mirror.php | 379 -- .../src/Google/Service/Mirror/Account.php | 60 - .../src/Google/Service/Mirror/Attachment.php | 57 - .../Service/Mirror/AttachmentsListResponse.php | 41 - .../src/Google/Service/Mirror/AuthToken.php | 39 - .../src/Google/Service/Mirror/Command.php | 30 - .../src/Google/Service/Mirror/Contact.php | 131 - .../Google/Service/Mirror/ContactsListResponse.php | 41 - .../src/Google/Service/Mirror/Location.php | 93 - .../Service/Mirror/LocationsListResponse.php | 41 - .../src/Google/Service/Mirror/MenuItem.php | 80 - .../src/Google/Service/Mirror/MenuValue.php | 48 - .../src/Google/Service/Mirror/Notification.php | 77 - .../Google/Service/Mirror/NotificationConfig.php | 39 - .../Google/Service/Mirror/Resource/Accounts.php | 46 - .../Google/Service/Mirror/Resource/Contacts.php | 108 - .../Google/Service/Mirror/Resource/Locations.php | 54 - .../Google/Service/Mirror/Resource/Settings.php | 45 - .../Service/Mirror/Resource/Subscriptions.php | 80 - .../Google/Service/Mirror/Resource/Timeline.php | 121 - .../Mirror/Resource/TimelineAttachments.php | 84 - .../src/Google/Service/Mirror/Setting.php | 48 - .../src/Google/Service/Mirror/Subscription.php | 104 - .../Service/Mirror/SubscriptionsListResponse.php | 41 - .../src/Google/Service/Mirror/TimelineItem.php | 262 - .../Google/Service/Mirror/TimelineListResponse.php | 50 - .../src/Google/Service/Mirror/UserAction.php | 39 - .../src/Google/Service/Mirror/UserData.php | 39 - .../src/Google/Service/Monitoring.php | 396 -- .../Google/Service/Monitoring/BucketOptions.php | 51 - .../Google/Service/Monitoring/CollectdPayload.php | 96 - .../Google/Service/Monitoring/CollectdValue.php | 49 - .../Monitoring/CreateCollectdTimeSeriesRequest.php | 51 - .../Service/Monitoring/CreateTimeSeriesRequest.php | 32 - .../src/Google/Service/Monitoring/Distribution.php | 78 - .../src/Google/Service/Monitoring/Explicit.php | 31 - .../src/Google/Service/Monitoring/Exponential.php | 48 - .../src/Google/Service/Monitoring/Field.php | 113 - .../src/Google/Service/Monitoring/Group.php | 66 - .../Google/Service/Monitoring/LabelDescriptor.php | 48 - .../src/Google/Service/Monitoring/Linear.php | 48 - .../Monitoring/ListGroupMembersResponse.php | 50 - .../Service/Monitoring/ListGroupsResponse.php | 41 - .../Monitoring/ListMetricDescriptorsResponse.php | 41 - .../ListMonitoredResourceDescriptorsResponse.php | 41 - .../Service/Monitoring/ListTimeSeriesResponse.php | 41 - .../src/Google/Service/Monitoring/Metric.php | 39 - .../Google/Service/Monitoring/MetricDescriptor.php | 95 - .../Service/Monitoring/MonitoredResource.php | 39 - .../Monitoring/MonitoredResourceDescriptor.php | 68 - .../Google/Service/Monitoring/MonitoringEmpty.php | 20 - .../src/Google/Service/Monitoring/Option.php | 39 - .../src/Google/Service/Monitoring/Point.php | 41 - .../src/Google/Service/Monitoring/Range.php | 39 - .../Service/Monitoring/Resource/Projects.php | 28 - .../Resource/ProjectsCollectdTimeSeries.php | 45 - .../Service/Monitoring/Resource/ProjectsGroups.php | 130 - .../Monitoring/Resource/ProjectsGroupsMembers.php | 59 - .../Resource/ProjectsMetricDescriptors.php | 106 - .../ProjectsMonitoredResourceDescriptors.php | 72 - .../Monitoring/Resource/ProjectsTimeSeries.php | 119 - .../Google/Service/Monitoring/SourceContext.php | 30 - .../src/Google/Service/Monitoring/TimeInterval.php | 39 - .../src/Google/Service/Monitoring/TimeSeries.php | 70 - .../src/Google/Service/Monitoring/Type.php | 79 - .../src/Google/Service/Monitoring/TypedValue.php | 67 - .../src/Google/Service/Oauth2.php | 150 - .../src/Google/Service/Oauth2/Jwk.php | 32 - .../src/Google/Service/Oauth2/JwkKeys.php | 75 - .../Google/Service/Oauth2/Resource/Userinfo.php | 40 - .../Google/Service/Oauth2/Resource/UserinfoV2.php | 28 - .../Service/Oauth2/Resource/UserinfoV2Me.php | 40 - .../src/Google/Service/Oauth2/Tokeninfo.php | 110 - .../src/Google/Service/Oauth2/Userinfoplus.php | 125 - .../src/Google/Service/Pagespeedonline.php | 93 - .../Pagespeedonline/PagespeedApiFormatStringV2.php | 41 - .../PagespeedApiFormatStringV2Args.php | 72 - .../PagespeedApiFormatStringV2ArgsRects.php | 57 - ...agespeedApiFormatStringV2ArgsSecondaryRects.php | 57 - .../Pagespeedonline/PagespeedApiImageV2.php | 80 - .../PagespeedApiImageV2PageRect.php | 57 - .../Pagespeedonline/Resource/Pagespeedapi.php | 52 - .../src/Google/Service/Pagespeedonline/Result.php | 117 - .../Pagespeedonline/ResultFormattedResults.php | 40 - .../ResultFormattedResultsRuleResultsElement.php | 69 - ...FormattedResultsRuleResultsElementUrlBlocks.php | 42 - ...attedResultsRuleResultsElementUrlBlocksUrls.php | 42 - .../Service/Pagespeedonline/ResultPageStats.php | 138 - .../Pagespeedonline/ResultRuleGroupsElement.php | 30 - .../Service/Pagespeedonline/ResultVersion.php | 39 - .../src/Google/Service/Partners.php | 877 --- .../Service/Partners/AdWordsManagerAccountInfo.php | 39 - .../src/Google/Service/Partners/Analytics.php | 61 - .../Google/Service/Partners/AnalyticsDataPoint.php | 41 - .../Google/Service/Partners/AnalyticsSummary.php | 48 - .../src/Google/Service/Partners/AvailableOffer.php | 132 - .../src/Google/Service/Partners/Certification.php | 66 - .../Service/Partners/CertificationExamStatus.php | 39 - .../Service/Partners/CertificationStatus.php | 59 - .../src/Google/Service/Partners/Company.php | 220 - .../Google/Service/Partners/CompanyRelation.php | 158 - .../Google/Service/Partners/CountryOfferInfo.php | 57 - .../Google/Service/Partners/CreateLeadRequest.php | 51 - .../Google/Service/Partners/CreateLeadResponse.php | 50 - .../src/Google/Service/Partners/Date.php | 48 - .../src/Google/Service/Partners/DebugInfo.php | 48 - .../src/Google/Service/Partners/EventData.php | 40 - .../src/Google/Service/Partners/ExamStatus.php | 75 - .../src/Google/Service/Partners/ExamToken.php | 48 - .../Google/Service/Partners/GetCompanyResponse.php | 41 - .../Service/Partners/GetPartnersStatusResponse.php | 31 - .../Google/Service/Partners/HistoricalOffer.php | 129 - .../src/Google/Service/Partners/LatLng.php | 39 - .../src/Google/Service/Partners/Lead.php | 158 - .../Service/Partners/ListAnalyticsResponse.php | 61 - .../Service/Partners/ListCompaniesResponse.php | 51 - .../Google/Service/Partners/ListLeadsResponse.php | 60 - .../Service/Partners/ListOffersHistoryResponse.php | 78 - .../Google/Service/Partners/ListOffersResponse.php | 51 - .../Service/Partners/ListUserStatesResponse.php | 41 - .../Service/Partners/LocalizedCompanyInfo.php | 58 - .../src/Google/Service/Partners/Location.php | 113 - .../Google/Service/Partners/LogMessageRequest.php | 58 - .../Google/Service/Partners/LogMessageResponse.php | 31 - .../Service/Partners/LogUserEventRequest.php | 88 - .../Service/Partners/LogUserEventResponse.php | 31 - .../src/Google/Service/Partners/Money.php | 48 - .../src/Google/Service/Partners/OfferCustomer.php | 102 - .../src/Google/Service/Partners/OptIns.php | 66 - .../src/Google/Service/Partners/PartnersEmpty.php | 20 - .../src/Google/Service/Partners/PublicProfile.php | 66 - .../src/Google/Service/Partners/Rank.php | 39 - .../Google/Service/Partners/RecaptchaChallenge.php | 39 - .../Google/Service/Partners/RequestMetadata.php | 69 - .../Google/Service/Partners/Resource/Analytics.php | 70 - .../Service/Partners/Resource/ClientMessages.php | 43 - .../Google/Service/Partners/Resource/Companies.php | 150 - .../Service/Partners/Resource/CompaniesLeads.php | 42 - .../src/Google/Service/Partners/Resource/Exams.php | 59 - .../src/Google/Service/Partners/Resource/Leads.php | 66 - .../Google/Service/Partners/Resource/Offers.php | 57 - .../Service/Partners/Resource/OffersHistory.php | 66 - .../Service/Partners/Resource/UserEvents.php | 41 - .../Service/Partners/Resource/UserStates.php | 57 - .../src/Google/Service/Partners/Resource/Users.php | 157 - .../src/Google/Service/Partners/Resource/V2.php | 124 - .../Google/Service/Partners/ResponseMetadata.php | 31 - .../Service/Partners/SpecializationStatus.php | 39 - .../src/Google/Service/Partners/TrafficSource.php | 39 - .../src/Google/Service/Partners/User.php | 118 - .../src/Google/Service/Partners/UserOverrides.php | 39 - .../src/Google/Service/Partners/UserProfile.php | 150 - .../src/Google/Service/People.php | 160 - .../src/Google/Service/People/Address.php | 130 - .../src/Google/Service/People/AgeRangeType.php | 40 - .../src/Google/Service/People/Biography.php | 49 - .../src/Google/Service/People/Birthday.php | 50 - .../src/Google/Service/People/BraggingRights.php | 40 - .../Service/People/ContactGroupMembership.php | 30 - .../src/Google/Service/People/CoverPhoto.php | 49 - .../src/Google/Service/People/Date.php | 48 - .../src/Google/Service/People/DomainMembership.php | 30 - .../src/Google/Service/People/EmailAddress.php | 67 - .../src/Google/Service/People/Event.php | 59 - .../src/Google/Service/People/FieldMetadata.php | 49 - .../src/Google/Service/People/Gender.php | 49 - .../Google/Service/People/GetPeopleResponse.php | 32 - .../src/Google/Service/People/ImClient.php | 76 - .../src/Google/Service/People/Interest.php | 40 - .../Service/People/ListConnectionsResponse.php | 50 - .../src/Google/Service/People/Locale.php | 40 - .../src/Google/Service/People/Membership.php | 51 - .../src/Google/Service/People/Name.php | 148 - .../src/Google/Service/People/Nickname.php | 49 - .../src/Google/Service/People/Occupation.php | 40 - .../src/Google/Service/People/Organization.php | 150 - .../src/Google/Service/People/Person.php | 319 -- .../src/Google/Service/People/PersonMetadata.php | 68 - .../src/Google/Service/People/PersonResponse.php | 49 - .../src/Google/Service/People/PhoneNumber.php | 67 - .../src/Google/Service/People/Photo.php | 40 - .../src/Google/Service/People/ProfileMetadata.php | 30 - .../src/Google/Service/People/Relation.php | 58 - .../Google/Service/People/RelationshipInterest.php | 49 - .../Google/Service/People/RelationshipStatus.php | 49 - .../src/Google/Service/People/Residence.php | 49 - .../src/Google/Service/People/Resource/People.php | 78 - .../Service/People/Resource/PeopleConnections.php | 59 - .../src/Google/Service/People/Skill.php | 40 - .../src/Google/Service/People/Source.php | 58 - .../src/Google/Service/People/Tagline.php | 40 - .../src/Google/Service/People/Url.php | 58 - .../src/Google/Service/PlayMovies.php | 299 - .../src/Google/Service/PlayMovies/Avail.php | 319 -- .../src/Google/Service/PlayMovies/Component.php | 220 - .../Google/Service/PlayMovies/ExperienceLocale.php | 229 - .../Service/PlayMovies/ListAvailsResponse.php | 50 - .../Service/PlayMovies/ListComponentsResponse.php | 50 - .../PlayMovies/ListExperienceLocalesResponse.php | 50 - .../Service/PlayMovies/ListOrdersResponse.php | 50 - .../Service/PlayMovies/ListStoreInfosResponse.php | 50 - .../src/Google/Service/PlayMovies/Order.php | 229 - .../Service/PlayMovies/Resource/Accounts.php | 28 - .../Service/PlayMovies/Resource/AccountsAvails.php | 82 - .../PlayMovies/Resource/AccountsComponents.php | 69 - .../PlayMovies/Resource/AccountsComponentsType.php | 44 - .../Resource/AccountsExperienceLocales.php | 79 - .../Service/PlayMovies/Resource/AccountsOrders.php | 78 - .../PlayMovies/Resource/AccountsStoreInfos.php | 66 - .../Resource/AccountsStoreInfosCountry.php | 47 - .../src/Google/Service/PlayMovies/StoreInfo.php | 247 - .../src/Google/Service/Playmoviespartner.php | 339 -- .../Playmoviespartner/AccountsAvailsResource.php | 61 - .../AccountsExperienceLocalesResource.php | 79 - .../Playmoviespartner/AccountsOrdersResource.php | 73 - .../Service/Playmoviespartner/AccountsResource.php | 28 - .../AccountsStoreInfosCountryResource.php | 46 - .../AccountsStoreInfosResource.php | 62 - .../src/Google/Service/Playmoviespartner/Avail.php | 310 -- .../Service/Playmoviespartner/ExperienceLocale.php | 229 - .../Playmoviespartner/ListAvailsResponse.php | 41 - .../ListExperienceLocalesResponse.php | 41 - .../Playmoviespartner/ListOrdersResponse.php | 41 - .../Playmoviespartner/ListStoreInfosResponse.php | 41 - .../src/Google/Service/Playmoviespartner/Order.php | 229 - .../Google/Service/Playmoviespartner/StoreInfo.php | 247 - .../apiclient-services/src/Google/Service/Plus.php | 267 - .../src/Google/Service/Plus/Acl.php | 50 - .../src/Google/Service/Plus/Activity.php | 206 - .../src/Google/Service/Plus/ActivityActor.php | 88 - .../Plus/ActivityActorClientSpecificActorInfo.php | 31 - ...ctorClientSpecificActorInfoYoutubeActorInfo.php | 30 - .../src/Google/Service/Plus/ActivityActorImage.php | 30 - .../src/Google/Service/Plus/ActivityActorName.php | 39 - .../Service/Plus/ActivityActorVerification.php | 30 - .../src/Google/Service/Plus/ActivityFeed.php | 104 - .../src/Google/Service/Plus/ActivityObject.php | 117 - .../Google/Service/Plus/ActivityObjectActor.php | 78 - .../ActivityObjectActorClientSpecificActorInfo.php | 31 - ...ctorClientSpecificActorInfoYoutubeActorInfo.php | 30 - .../Service/Plus/ActivityObjectActorImage.php | 30 - .../Plus/ActivityObjectActorVerification.php | 30 - .../Service/Plus/ActivityObjectAttachments.php | 107 - .../Plus/ActivityObjectAttachmentsEmbed.php | 39 - .../Plus/ActivityObjectAttachmentsFullImage.php | 57 - .../Plus/ActivityObjectAttachmentsImage.php | 57 - .../Plus/ActivityObjectAttachmentsThumbnails.php | 49 - .../ActivityObjectAttachmentsThumbnailsImage.php | 57 - .../Service/Plus/ActivityObjectPlusoners.php | 39 - .../Google/Service/Plus/ActivityObjectReplies.php | 39 - .../Service/Plus/ActivityObjectResharers.php | 39 - .../src/Google/Service/Plus/ActivityProvider.php | 30 - .../src/Google/Service/Plus/Comment.php | 125 - .../src/Google/Service/Plus/CommentActor.php | 78 - .../Plus/CommentActorClientSpecificActorInfo.php | 31 - ...ctorClientSpecificActorInfoYoutubeActorInfo.php | 30 - .../src/Google/Service/Plus/CommentActorImage.php | 30 - .../Service/Plus/CommentActorVerification.php | 30 - .../src/Google/Service/Plus/CommentFeed.php | 95 - .../src/Google/Service/Plus/CommentInReplyTo.php | 39 - .../src/Google/Service/Plus/CommentObject.php | 48 - .../src/Google/Service/Plus/CommentPlusoners.php | 30 - .../src/Google/Service/Plus/PeopleFeed.php | 86 - .../src/Google/Service/Plus/Person.php | 300 -- .../src/Google/Service/Plus/PersonAgeRange.php | 39 - .../src/Google/Service/Plus/PersonCover.php | 50 - .../Google/Service/Plus/PersonCoverCoverInfo.php | 39 - .../Google/Service/Plus/PersonCoverCoverPhoto.php | 48 - .../src/Google/Service/Plus/PersonEmails.php | 39 - .../src/Google/Service/Plus/PersonImage.php | 39 - .../src/Google/Service/Plus/PersonName.php | 75 - .../Google/Service/Plus/PersonOrganizations.php | 102 - .../src/Google/Service/Plus/PersonPlacesLived.php | 39 - .../src/Google/Service/Plus/PersonUrls.php | 48 - .../src/Google/Service/Plus/Place.php | 68 - .../src/Google/Service/Plus/PlaceAddress.php | 30 - .../src/Google/Service/Plus/PlacePosition.php | 39 - .../Google/Service/Plus/PlusAclentryResource.php | 48 - .../Google/Service/Plus/Resource/Activities.php | 88 - .../src/Google/Service/Plus/Resource/Comments.php | 62 - .../src/Google/Service/Plus/Resource/People.php | 114 - .../src/Google/Service/PlusDomains.php | 453 -- .../src/Google/Service/PlusDomains/Acl.php | 59 - .../src/Google/Service/PlusDomains/Activity.php | 206 - .../Google/Service/PlusDomains/ActivityActor.php | 88 - .../ActivityActorClientSpecificActorInfo.php | 31 - ...ctorClientSpecificActorInfoYoutubeActorInfo.php | 30 - .../Service/PlusDomains/ActivityActorImage.php | 30 - .../Service/PlusDomains/ActivityActorName.php | 39 - .../PlusDomains/ActivityActorVerification.php | 30 - .../Google/Service/PlusDomains/ActivityFeed.php | 104 - .../Google/Service/PlusDomains/ActivityObject.php | 127 - .../Service/PlusDomains/ActivityObjectActor.php | 78 - .../ActivityObjectActorClientSpecificActorInfo.php | 31 - ...ctorClientSpecificActorInfoYoutubeActorInfo.php | 30 - .../PlusDomains/ActivityObjectActorImage.php | 30 - .../ActivityObjectActorVerification.php | 30 - .../PlusDomains/ActivityObjectAttachments.php | 117 - .../PlusDomains/ActivityObjectAttachmentsEmbed.php | 39 - .../ActivityObjectAttachmentsFullImage.php | 57 - .../PlusDomains/ActivityObjectAttachmentsImage.php | 57 - .../ActivityObjectAttachmentsPreviewThumbnails.php | 30 - .../ActivityObjectAttachmentsThumbnails.php | 49 - .../ActivityObjectAttachmentsThumbnailsImage.php | 57 - .../PlusDomains/ActivityObjectPlusoners.php | 39 - .../Service/PlusDomains/ActivityObjectReplies.php | 39 - .../PlusDomains/ActivityObjectResharers.php | 39 - .../PlusDomains/ActivityObjectStatusForViewer.php | 66 - .../Service/PlusDomains/ActivityProvider.php | 30 - .../src/Google/Service/PlusDomains/Audience.php | 67 - .../Google/Service/PlusDomains/AudiencesFeed.php | 68 - .../src/Google/Service/PlusDomains/Circle.php | 85 - .../src/Google/Service/PlusDomains/CircleFeed.php | 95 - .../Google/Service/PlusDomains/CirclePeople.php | 30 - .../src/Google/Service/PlusDomains/Comment.php | 125 - .../Google/Service/PlusDomains/CommentActor.php | 78 - .../CommentActorClientSpecificActorInfo.php | 31 - ...ctorClientSpecificActorInfoYoutubeActorInfo.php | 30 - .../Service/PlusDomains/CommentActorImage.php | 30 - .../PlusDomains/CommentActorVerification.php | 30 - .../src/Google/Service/PlusDomains/CommentFeed.php | 95 - .../Service/PlusDomains/CommentInReplyTo.php | 39 - .../Google/Service/PlusDomains/CommentObject.php | 48 - .../Service/PlusDomains/CommentPlusoners.php | 30 - .../src/Google/Service/PlusDomains/Media.php | 187 - .../src/Google/Service/PlusDomains/MediaAuthor.php | 58 - .../Service/PlusDomains/MediaAuthorImage.php | 30 - .../src/Google/Service/PlusDomains/MediaExif.php | 30 - .../src/Google/Service/PlusDomains/PeopleFeed.php | 86 - .../src/Google/Service/PlusDomains/Person.php | 281 - .../src/Google/Service/PlusDomains/PersonCover.php | 50 - .../Service/PlusDomains/PersonCoverCoverInfo.php | 39 - .../Service/PlusDomains/PersonCoverCoverPhoto.php | 48 - .../Google/Service/PlusDomains/PersonEmails.php | 39 - .../src/Google/Service/PlusDomains/PersonImage.php | 39 - .../src/Google/Service/PlusDomains/PersonName.php | 75 - .../Service/PlusDomains/PersonOrganizations.php | 102 - .../Service/PlusDomains/PersonPlacesLived.php | 39 - .../src/Google/Service/PlusDomains/PersonUrls.php | 48 - .../src/Google/Service/PlusDomains/Place.php | 68 - .../Google/Service/PlusDomains/PlaceAddress.php | 30 - .../Google/Service/PlusDomains/PlacePosition.php | 39 - .../PlusDomains/PlusDomainsAclentryResource.php | 48 - .../Service/PlusDomains/Resource/Activities.php | 83 - .../Service/PlusDomains/Resource/Audiences.php | 50 - .../Service/PlusDomains/Resource/Circles.php | 154 - .../Service/PlusDomains/Resource/Comments.php | 76 - .../Google/Service/PlusDomains/Resource/Media.php | 46 - .../Google/Service/PlusDomains/Resource/People.php | 108 - .../src/Google/Service/PlusDomains/Videostream.php | 57 - .../src/Google/Service/Prediction.php | 205 - .../src/Google/Service/Prediction/Analyze.php | 78 - .../Service/Prediction/AnalyzeDataDescription.php | 42 - .../Prediction/AnalyzeDataDescriptionFeatures.php | 60 - .../AnalyzeDataDescriptionFeaturesCategorical.php | 41 - ...yzeDataDescriptionFeaturesCategoricalValues.php | 39 - .../AnalyzeDataDescriptionFeaturesNumeric.php | 48 - .../AnalyzeDataDescriptionFeaturesText.php | 30 - .../AnalyzeDataDescriptionOutputFeature.php | 42 - .../AnalyzeDataDescriptionOutputFeatureNumeric.php | 48 - .../AnalyzeDataDescriptionOutputFeatureText.php | 39 - .../Service/Prediction/AnalyzeModelDescription.php | 49 - .../src/Google/Service/Prediction/Input.php | 31 - .../src/Google/Service/Prediction/InputInput.php | 31 - .../src/Google/Service/Prediction/Insert.php | 95 - .../src/Google/Service/Prediction/Insert2.php | 121 - .../Google/Service/Prediction/Insert2ModelInfo.php | 75 - .../Service/Prediction/InsertTrainingInstances.php | 40 - .../src/Google/Service/Prediction/Output.php | 77 - .../Service/Prediction/OutputOutputMulti.php | 39 - .../Google/Service/Prediction/PredictionList.php | 59 - .../Service/Prediction/Resource/Hostedmodels.php | 44 - .../Service/Prediction/Resource/Trainedmodels.php | 130 - .../src/Google/Service/Prediction/Update.php | 40 - .../src/Google/Service/Proximitybeacon.php | 353 -- .../Service/Proximitybeacon/AdvertisedId.php | 39 - .../Service/Proximitybeacon/AttachmentInfo.php | 39 - .../src/Google/Service/Proximitybeacon/Beacon.php | 124 - .../Service/Proximitybeacon/BeaconAttachment.php | 57 - .../Google/Service/Proximitybeacon/BeaconInfo.php | 51 - .../src/Google/Service/Proximitybeacon/Date.php | 48 - .../Proximitybeacon/DeleteAttachmentsResponse.php | 30 - .../Google/Service/Proximitybeacon/Diagnostics.php | 50 - .../Proximitybeacon/EphemeralIdRegistration.php | 75 - .../EphemeralIdRegistrationParams.php | 48 - .../GetInfoForObservedBeaconsRequest.php | 41 - .../GetInfoForObservedBeaconsResponse.php | 32 - .../Google/Service/Proximitybeacon/IndoorLevel.php | 30 - .../src/Google/Service/Proximitybeacon/LatLng.php | 39 - .../ListBeaconAttachmentsResponse.php | 32 - .../Proximitybeacon/ListBeaconsResponse.php | 50 - .../Proximitybeacon/ListDiagnosticsResponse.php | 41 - .../Proximitybeacon/ListNamespacesResponse.php | 32 - .../Google/Service/Proximitybeacon/Observation.php | 49 - .../Proximitybeacon/ProximitybeaconEmpty.php | 20 - .../Proximitybeacon/ProximitybeaconNamespace.php | 39 - .../Proximitybeacon/Resource/Beaconinfo.php | 44 - .../Service/Proximitybeacon/Resource/Beacons.php | 316 -- .../Resource/BeaconsAttachments.php | 170 - .../Resource/BeaconsDiagnostics.php | 59 - .../Proximitybeacon/Resource/Namespaces.php | 70 - .../Service/Proximitybeacon/Resource/V1beta1.php | 46 - .../src/Google/Service/Pubsub.php | 353 -- .../Google/Service/Pubsub/AcknowledgeRequest.php | 31 - .../src/Google/Service/Pubsub/Binding.php | 40 - .../Service/Pubsub/ListSubscriptionsResponse.php | 41 - .../Pubsub/ListTopicSubscriptionsResponse.php | 40 - .../Google/Service/Pubsub/ListTopicsResponse.php | 41 - .../Service/Pubsub/ModifyAckDeadlineRequest.php | 40 - .../Service/Pubsub/ModifyPushConfigRequest.php | 31 - .../src/Google/Service/Pubsub/Policy.php | 50 - .../src/Google/Service/Pubsub/PublishRequest.php | 32 - .../src/Google/Service/Pubsub/PublishResponse.php | 31 - .../src/Google/Service/Pubsub/PubsubEmpty.php | 20 - .../src/Google/Service/Pubsub/PubsubMessage.php | 57 - .../src/Google/Service/Pubsub/PullRequest.php | 39 - .../src/Google/Service/Pubsub/PullResponse.php | 32 - .../src/Google/Service/Pubsub/PushConfig.php | 39 - .../src/Google/Service/Pubsub/ReceivedMessage.php | 40 - .../Google/Service/Pubsub/Resource/Projects.php | 28 - .../Service/Pubsub/Resource/ProjectsSnapshots.php | 83 - .../Pubsub/Resource/ProjectsSubscriptions.php | 243 - .../Service/Pubsub/Resource/ProjectsTopics.php | 170 - .../Resource/ProjectsTopicsSubscriptions.php | 49 - .../Google/Service/Pubsub/SetIamPolicyRequest.php | 31 - .../src/Google/Service/Pubsub/Subscription.php | 58 - .../Service/Pubsub/TestIamPermissionsRequest.php | 31 - .../Service/Pubsub/TestIamPermissionsResponse.php | 31 - .../src/Google/Service/Pubsub/Topic.php | 30 - .../src/Google/Service/QPXExpress.php | 65 - .../src/Google/Service/QPXExpress/AircraftData.php | 48 - .../src/Google/Service/QPXExpress/AirportData.php | 57 - .../Google/Service/QPXExpress/BagDescriptor.php | 67 - .../src/Google/Service/QPXExpress/CarrierData.php | 48 - .../src/Google/Service/QPXExpress/CityData.php | 57 - .../src/Google/Service/QPXExpress/Data.php | 81 - .../src/Google/Service/QPXExpress/FareInfo.php | 84 - .../src/Google/Service/QPXExpress/FlightInfo.php | 39 - .../Service/QPXExpress/FreeBaggageAllowance.php | 77 - .../src/Google/Service/QPXExpress/LegInfo.php | 174 - .../Google/Service/QPXExpress/PassengerCounts.php | 75 - .../src/Google/Service/QPXExpress/PricingInfo.php | 143 - .../Google/Service/QPXExpress/Resource/Trips.php | 41 - .../src/Google/Service/QPXExpress/SegmentInfo.php | 123 - .../Google/Service/QPXExpress/SegmentPricing.php | 59 - .../src/Google/Service/QPXExpress/SliceInfo.php | 50 - .../src/Google/Service/QPXExpress/SliceInput.php | 122 - .../src/Google/Service/QPXExpress/TaxData.php | 48 - .../src/Google/Service/QPXExpress/TaxInfo.php | 75 - .../Google/Service/QPXExpress/TimeOfDayRange.php | 48 - .../src/Google/Service/QPXExpress/TripOption.php | 69 - .../Service/QPXExpress/TripOptionsRequest.php | 87 - .../Service/QPXExpress/TripOptionsResponse.php | 60 - .../Service/QPXExpress/TripsSearchRequest.php | 31 - .../Service/QPXExpress/TripsSearchResponse.php | 40 - .../src/Google/Service/Replicapool.php | 343 -- .../Service/Replicapool/InstanceGroupManager.php | 149 - .../Replicapool/InstanceGroupManagerList.php | 68 - ...nstanceGroupManagersAbandonInstancesRequest.php | 31 - ...InstanceGroupManagersDeleteInstancesRequest.php | 31 - ...stanceGroupManagersRecreateInstancesRequest.php | 31 - ...anceGroupManagersSetInstanceTemplateRequest.php | 30 - .../InstanceGroupManagersSetTargetPoolsRequest.php | 40 - .../src/Google/Service/Replicapool/Operation.php | 222 - .../Google/Service/Replicapool/OperationError.php | 32 - .../Service/Replicapool/OperationErrorErrors.php | 48 - .../Google/Service/Replicapool/OperationList.php | 68 - .../Service/Replicapool/OperationWarnings.php | 50 - .../Service/Replicapool/OperationWarningsData.php | 39 - .../Replicapool/ReplicaPoolAutoHealingPolicy.php | 39 - .../Replicapool/Resource/InstanceGroupManagers.php | 223 - .../Replicapool/Resource/ZoneOperations.php | 66 - .../src/Google/Service/Replicapoolupdater.php | 306 -- .../Service/Replicapoolupdater/InstanceUpdate.php | 49 - .../Replicapoolupdater/InstanceUpdateError.php | 32 - .../InstanceUpdateErrorErrors.php | 48 - .../Replicapoolupdater/InstanceUpdateList.php | 59 - .../Service/Replicapoolupdater/Operation.php | 222 - .../Service/Replicapoolupdater/OperationError.php | 32 - .../Replicapoolupdater/OperationErrorErrors.php | 48 - .../Service/Replicapoolupdater/OperationList.php | 68 - .../Replicapoolupdater/OperationWarnings.php | 50 - .../Replicapoolupdater/OperationWarningsData.php | 39 - .../Replicapoolupdater/Resource/RollingUpdates.php | 177 - .../Replicapoolupdater/Resource/ZoneOperations.php | 66 - .../Service/Replicapoolupdater/RollingUpdate.php | 167 - .../Replicapoolupdater/RollingUpdateError.php | 32 - .../RollingUpdateErrorErrors.php | 48 - .../Replicapoolupdater/RollingUpdateList.php | 59 - .../Replicapoolupdater/RollingUpdatePolicy.php | 66 - .../src/Google/Service/Reports.php | 255 - .../src/Google/Service/Reports/Activities.php | 59 - .../src/Google/Service/Reports/Activity.php | 88 - .../src/Google/Service/Reports/ActivityActor.php | 57 - .../src/Google/Service/Reports/ActivityEvents.php | 50 - .../Service/Reports/ActivityEventsParameters.php | 76 - .../src/Google/Service/Reports/ActivityId.php | 57 - .../src/Google/Service/Reports/Channel.php | 111 - .../Google/Service/Reports/Resource/Activities.php | 94 - .../Google/Service/Reports/Resource/Channels.php | 40 - .../Reports/Resource/CustomerUsageReports.php | 49 - .../Service/Reports/Resource/UserUsageReport.php | 55 - .../src/Google/Service/Reports/UsageReport.php | 69 - .../Google/Service/Reports/UsageReportEntity.php | 57 - .../Service/Reports/UsageReportParameters.php | 76 - .../src/Google/Service/Reports/UsageReports.php | 69 - .../Service/Reports/UsageReportsWarnings.php | 50 - .../Service/Reports/UsageReportsWarningsData.php | 39 - .../src/Google/Service/Reseller.php | 313 -- .../src/Google/Service/Reseller/Address.php | 111 - .../Google/Service/Reseller/ChangePlanRequest.php | 67 - .../src/Google/Service/Reseller/Customer.php | 94 - .../Google/Service/Reseller/RenewalSettings.php | 39 - .../ResellernotifyGetwatchdetailsResponse.php | 40 - .../Service/Reseller/ResellernotifyResource.php | 30 - .../Google/Service/Reseller/Resource/Customers.php | 99 - .../Service/Reseller/Resource/Resellernotify.php | 72 - .../Service/Reseller/Resource/Subscriptions.php | 265 - .../src/Google/Service/Reseller/Seats.php | 57 - .../src/Google/Service/Reseller/Subscription.php | 189 - .../Google/Service/Reseller/SubscriptionPlan.php | 49 - .../SubscriptionPlanCommitmentInterval.php | 39 - .../Service/Reseller/SubscriptionTransferInfo.php | 39 - .../Service/Reseller/SubscriptionTrialSettings.php | 39 - .../src/Google/Service/Reseller/Subscriptions.php | 50 - .../src/Google/Service/Resourceviews.php | 339 -- .../src/Google/Service/Resourceviews/Label.php | 39 - .../Resourceviews/ListResourceResponseItem.php | 39 - .../src/Google/Service/Resourceviews/Operation.php | 222 - .../Service/Resourceviews/OperationError.php | 32 - .../Service/Resourceviews/OperationErrorErrors.php | 48 - .../Google/Service/Resourceviews/OperationList.php | 68 - .../Service/Resourceviews/OperationWarnings.php | 50 - .../Resourceviews/OperationWarningsData.php | 39 - .../Resourceviews/Resource/ZoneOperations.php | 66 - .../Service/Resourceviews/Resource/ZoneViews.php | 190 - .../Google/Service/Resourceviews/ResourceView.php | 132 - .../Service/Resourceviews/ServiceEndpoint.php | 39 - .../Resourceviews/ZoneViewsAddResourcesRequest.php | 31 - .../Resourceviews/ZoneViewsGetServiceResponse.php | 41 - .../Google/Service/Resourceviews/ZoneViewsList.php | 59 - .../ZoneViewsListResourcesResponse.php | 50 - .../ZoneViewsRemoveResourcesRequest.php | 31 - .../Resourceviews/ZoneViewsSetServiceRequest.php | 50 - .../src/Google/Service/SQLAdmin.php | 811 --- .../src/Google/Service/SQLAdmin/AclEntry.php | 57 - .../Service/SQLAdmin/BackupConfiguration.php | 57 - .../src/Google/Service/SQLAdmin/BackupRun.php | 130 - .../Service/SQLAdmin/BackupRunsListResponse.php | 50 - .../Google/Service/SQLAdmin/BinLogCoordinates.php | 48 - .../src/Google/Service/SQLAdmin/CloneContext.php | 49 - .../src/Google/Service/SQLAdmin/Database.php | 93 - .../src/Google/Service/SQLAdmin/DatabaseFlags.php | 39 - .../Google/Service/SQLAdmin/DatabaseInstance.php | 244 - .../SQLAdmin/DatabaseInstanceFailoverReplica.php | 39 - .../Service/SQLAdmin/DatabasesListResponse.php | 41 - .../src/Google/Service/SQLAdmin/ExportContext.php | 78 - .../SQLAdmin/ExportContextCsvExportOptions.php | 30 - .../SQLAdmin/ExportContextSqlExportOptions.php | 40 - .../Google/Service/SQLAdmin/FailoverContext.php | 39 - .../src/Google/Service/SQLAdmin/Flag.php | 94 - .../Google/Service/SQLAdmin/FlagsListResponse.php | 41 - .../src/Google/Service/SQLAdmin/ImportContext.php | 67 - .../SQLAdmin/ImportContextCsvImportOptions.php | 40 - .../Service/SQLAdmin/InstancesCloneRequest.php | 31 - .../Service/SQLAdmin/InstancesExportRequest.php | 31 - .../Service/SQLAdmin/InstancesFailoverRequest.php | 31 - .../Service/SQLAdmin/InstancesImportRequest.php | 31 - .../Service/SQLAdmin/InstancesListResponse.php | 50 - .../SQLAdmin/InstancesRestoreBackupRequest.php | 31 - .../SQLAdmin/InstancesTruncateLogRequest.php | 31 - .../Google/Service/SQLAdmin/IpConfiguration.php | 50 - .../src/Google/Service/SQLAdmin/IpMapping.php | 48 - .../src/Google/Service/SQLAdmin/Labels.php | 39 - .../Google/Service/SQLAdmin/LocationPreference.php | 48 - .../Google/Service/SQLAdmin/MaintenanceWindow.php | 57 - .../Service/SQLAdmin/MySqlReplicaConfiguration.php | 120 - .../Service/SQLAdmin/OnPremisesConfiguration.php | 39 - .../src/Google/Service/SQLAdmin/Operation.php | 159 - .../src/Google/Service/SQLAdmin/OperationError.php | 48 - .../Google/Service/SQLAdmin/OperationErrors.php | 41 - .../Service/SQLAdmin/OperationsListResponse.php | 50 - .../Service/SQLAdmin/ReplicaConfiguration.php | 49 - .../Service/SQLAdmin/Resource/BackupRuns.php | 100 - .../Google/Service/SQLAdmin/Resource/Databases.php | 131 - .../src/Google/Service/SQLAdmin/Resource/Flags.php | 44 - .../Google/Service/SQLAdmin/Resource/Instances.php | 311 -- .../Service/SQLAdmin/Resource/Operations.php | 64 - .../Google/Service/SQLAdmin/Resource/SslCerts.php | 119 - .../src/Google/Service/SQLAdmin/Resource/Tiers.php | 42 - .../src/Google/Service/SQLAdmin/Resource/Users.php | 94 - .../Service/SQLAdmin/RestoreBackupContext.php | 48 - .../src/Google/Service/SQLAdmin/Settings.php | 208 - .../src/Google/Service/SQLAdmin/SslCert.php | 102 - .../src/Google/Service/SQLAdmin/SslCertDetail.php | 40 - .../SQLAdmin/SslCertsCreateEphemeralRequest.php | 33 - .../Service/SQLAdmin/SslCertsInsertRequest.php | 30 - .../Service/SQLAdmin/SslCertsInsertResponse.php | 60 - .../Service/SQLAdmin/SslCertsListResponse.php | 41 - .../src/Google/Service/SQLAdmin/Tier.php | 71 - .../Google/Service/SQLAdmin/TiersListResponse.php | 41 - .../Google/Service/SQLAdmin/TruncateLogContext.php | 39 - .../src/Google/Service/SQLAdmin/User.php | 84 - .../Google/Service/SQLAdmin/UsersListResponse.php | 50 - .../src/Google/Service/Safebrowsing.php | 171 - .../src/Google/Service/Safebrowsing/Checksum.php | 30 - .../src/Google/Service/Safebrowsing/ClientInfo.php | 39 - .../Google/Service/Safebrowsing/Constraints.php | 58 - .../Safebrowsing/FetchThreatListUpdatesRequest.php | 42 - .../FetchThreatListUpdatesResponse.php | 41 - .../Service/Safebrowsing/FindFullHashesRequest.php | 61 - .../Safebrowsing/FindFullHashesResponse.php | 50 - .../Safebrowsing/FindThreatMatchesRequest.php | 41 - .../Safebrowsing/FindThreatMatchesResponse.php | 32 - .../Safebrowsing/ListThreatListsResponse.php | 32 - .../Service/Safebrowsing/ListUpdateRequest.php | 67 - .../Service/Safebrowsing/ListUpdateResponse.php | 97 - .../Google/Service/Safebrowsing/MetadataEntry.php | 39 - .../src/Google/Service/Safebrowsing/RawHashes.php | 39 - .../src/Google/Service/Safebrowsing/RawIndices.php | 31 - .../Safebrowsing/Resource/EncodedFullHashes.php | 45 - .../Safebrowsing/Resource/EncodedUpdates.php | 46 - .../Service/Safebrowsing/Resource/FullHashes.php | 42 - .../Safebrowsing/Resource/ThreatListUpdates.php | 42 - .../Service/Safebrowsing/Resource/ThreatLists.php | 41 - .../Safebrowsing/Resource/ThreatMatches.php | 42 - .../Service/Safebrowsing/RiceDeltaEncoding.php | 57 - .../Google/Service/Safebrowsing/ThreatEntry.php | 48 - .../Service/Safebrowsing/ThreatEntryMetadata.php | 32 - .../Google/Service/Safebrowsing/ThreatEntrySet.php | 70 - .../src/Google/Service/Safebrowsing/ThreatInfo.php | 59 - .../Service/Safebrowsing/ThreatListDescriptor.php | 48 - .../Google/Service/Safebrowsing/ThreatMatch.php | 76 - .../src/Google/Service/Script.php | 103 - .../src/Google/Service/Script/ExecutionError.php | 50 - .../src/Google/Service/Script/ExecutionRequest.php | 58 - .../Google/Service/Script/ExecutionResponse.php | 30 - .../src/Google/Service/Script/Operation.php | 67 - .../src/Google/Service/Script/Resource/Scripts.php | 52 - .../Service/Script/ScriptStackTraceElement.php | 39 - .../src/Google/Service/Script/Status.php | 49 - .../src/Google/Service/SearchConsole.php | 65 - .../Service/SearchConsole/BlockedResource.php | 30 - .../src/Google/Service/SearchConsole/Image.php | 39 - .../Service/SearchConsole/MobileFriendlyIssue.php | 30 - .../SearchConsole/Resource/UrlTestingTools.php | 28 - .../Resource/UrlTestingToolsMobileFriendlyTest.php | 41 - .../Google/Service/SearchConsole/ResourceIssue.php | 31 - .../SearchConsole/RunMobileFriendlyTestRequest.php | 39 - .../RunMobileFriendlyTestResponse.php | 71 - .../Google/Service/SearchConsole/TestStatus.php | 39 - .../src/Google/Service/ServiceControl.php | 127 - .../ServiceControl/AllocateQuotaRequest.php | 49 - .../ServiceControl/AllocateQuotaResponse.php | 60 - .../src/Google/Service/ServiceControl/AuditLog.php | 125 - .../Service/ServiceControl/AuthenticationInfo.php | 39 - .../Service/ServiceControl/AuthorizationInfo.php | 48 - .../Google/Service/ServiceControl/CheckError.php | 39 - .../Google/Service/ServiceControl/CheckInfo.php | 31 - .../Google/Service/ServiceControl/CheckRequest.php | 58 - .../Service/ServiceControl/CheckResponse.php | 70 - .../Google/Service/ServiceControl/Distribution.php | 106 - .../ServiceControl/EndReconciliationRequest.php | 40 - .../ServiceControl/EndReconciliationResponse.php | 60 - .../Service/ServiceControl/ExplicitBuckets.php | 31 - .../Service/ServiceControl/ExponentialBuckets.php | 48 - .../Service/ServiceControl/LinearBuckets.php | 48 - .../src/Google/Service/ServiceControl/LogEntry.php | 93 - .../Google/Service/ServiceControl/MetricValue.php | 104 - .../Service/ServiceControl/MetricValueSet.php | 41 - .../src/Google/Service/ServiceControl/Money.php | 48 - .../Google/Service/ServiceControl/Operation.php | 133 - .../Google/Service/ServiceControl/QuotaError.php | 48 - .../Google/Service/ServiceControl/QuotaInfo.php | 50 - .../Service/ServiceControl/QuotaOperation.php | 77 - .../Service/ServiceControl/QuotaProperties.php | 39 - .../Service/ServiceControl/ReleaseQuotaRequest.php | 40 - .../ServiceControl/ReleaseQuotaResponse.php | 60 - .../Google/Service/ServiceControl/ReportError.php | 40 - .../Google/Service/ServiceControl/ReportInfo.php | 40 - .../Service/ServiceControl/ReportRequest.php | 41 - .../Service/ServiceControl/ReportResponse.php | 51 - .../Service/ServiceControl/RequestMetadata.php | 39 - .../Service/ServiceControl/Resource/Services.php | 191 - .../ServiceControl/StartReconciliationRequest.php | 40 - .../ServiceControl/StartReconciliationResponse.php | 60 - .../src/Google/Service/ServiceControl/Status.php | 49 - .../src/Google/Service/ServiceManagement.php | 366 -- .../Google/Service/ServiceManagement/Advice.php | 30 - .../Google/Service/ServiceManagement/Analytics.php | 32 - .../ServiceManagement/AnalyticsDestination.php | 40 - .../src/Google/Service/ServiceManagement/Api.php | 89 - .../Service/ServiceManagement/AuditConfig.php | 50 - .../Service/ServiceManagement/AuditLogConfig.php | 40 - .../Service/ServiceManagement/AuthProvider.php | 57 - .../Service/ServiceManagement/AuthRequirement.php | 39 - .../Service/ServiceManagement/Authentication.php | 42 - .../ServiceManagement/AuthenticationRule.php | 60 - .../ServiceManagement/AuthorizationConfig.php | 30 - .../Google/Service/ServiceManagement/Backend.php | 32 - .../Service/ServiceManagement/BackendRule.php | 48 - .../Google/Service/ServiceManagement/Binding.php | 40 - .../Service/ServiceManagement/ChangeReport.php | 32 - .../ServiceManagement/CloudAuditOptions.php | 20 - .../Google/Service/ServiceManagement/Condition.php | 76 - .../Service/ServiceManagement/ConfigChange.php | 68 - .../Service/ServiceManagement/ConfigFile.php | 48 - .../Service/ServiceManagement/ConfigOptions.php | 20 - .../Google/Service/ServiceManagement/ConfigRef.php | 30 - .../Service/ServiceManagement/ConfigSource.php | 41 - .../Google/Service/ServiceManagement/Context.php | 32 - .../Service/ServiceManagement/ContextRule.php | 49 - .../Google/Service/ServiceManagement/Control.php | 30 - .../Service/ServiceManagement/CounterOptions.php | 39 - .../Service/ServiceManagement/CustomError.php | 41 - .../Service/ServiceManagement/CustomErrorRule.php | 39 - .../ServiceManagement/CustomHttpPattern.php | 39 - .../ServiceManagement/DataAccessOptions.php | 20 - .../ServiceManagement/DeleteServiceStrategy.php | 20 - .../Service/ServiceManagement/Diagnostic.php | 48 - .../ServiceManagement/DisableServiceRequest.php | 30 - .../Service/ServiceManagement/Documentation.php | 69 - .../ServiceManagement/DocumentationRule.php | 48 - .../ServiceManagement/EnableServiceRequest.php | 30 - .../Google/Service/ServiceManagement/Endpoint.php | 67 - .../src/Google/Service/ServiceManagement/Enum.php | 70 - .../Google/Service/ServiceManagement/EnumValue.php | 50 - .../Service/ServiceManagement/Experimental.php | 31 - .../src/Google/Service/ServiceManagement/Field.php | 113 - .../GenerateConfigReportRequest.php | 39 - .../GenerateConfigReportResponse.php | 60 - .../ServiceManagement/GetIamPolicyRequest.php | 20 - .../src/Google/Service/ServiceManagement/Http.php | 32 - .../Google/Service/ServiceManagement/HttpRule.php | 134 - .../Service/ServiceManagement/LabelDescriptor.php | 48 - .../ServiceManagement/ListOperationsResponse.php | 41 - .../ListServiceConfigsResponse.php | 41 - .../ListServiceRolloutsResponse.php | 41 - .../ServiceManagement/ListServicesResponse.php | 41 - .../Google/Service/ServiceManagement/LogConfig.php | 51 - .../Service/ServiceManagement/LogDescriptor.php | 59 - .../Google/Service/ServiceManagement/Logging.php | 42 - .../ServiceManagement/LoggingDestination.php | 40 - .../Service/ServiceManagement/ManagedService.php | 39 - .../Service/ServiceManagement/MediaDownload.php | 39 - .../Service/ServiceManagement/MediaUpload.php | 39 - .../Google/Service/ServiceManagement/Method.php | 86 - .../Service/ServiceManagement/MetricDescriptor.php | 95 - .../src/Google/Service/ServiceManagement/Mixin.php | 39 - .../MonitoredResourceDescriptor.php | 68 - .../Service/ServiceManagement/Monitoring.php | 42 - .../ServiceManagement/MonitoringDestination.php | 40 - .../ServiceManagement/OAuthRequirements.php | 30 - .../Google/Service/ServiceManagement/Operation.php | 67 - .../ServiceManagement/OperationMetadata.php | 59 - .../Google/Service/ServiceManagement/Option.php | 39 - .../src/Google/Service/ServiceManagement/Page.php | 50 - .../Google/Service/ServiceManagement/Policy.php | 79 - .../ServiceManagement/Resource/Operations.php | 65 - .../ServiceManagement/Resource/Services.php | 265 - .../ServiceManagement/Resource/ServicesConfigs.php | 108 - .../Resource/ServicesRollouts.php | 89 - .../Google/Service/ServiceManagement/Rollout.php | 86 - .../src/Google/Service/ServiceManagement/Rule.php | 87 - .../Google/Service/ServiceManagement/Service.php | 287 - .../ServiceManagement/SetIamPolicyRequest.php | 40 - .../Service/ServiceManagement/SourceContext.php | 30 - .../Service/ServiceManagement/SourceInfo.php | 31 - .../Google/Service/ServiceManagement/Status.php | 49 - .../src/Google/Service/ServiceManagement/Step.php | 39 - .../SubmitConfigSourceRequest.php | 40 - .../SubmitConfigSourceResponse.php | 31 - .../Service/ServiceManagement/SystemParameter.php | 48 - .../ServiceManagement/SystemParameterRule.php | 41 - .../Service/ServiceManagement/SystemParameters.php | 32 - .../TestIamPermissionsRequest.php | 31 - .../TestIamPermissionsResponse.php | 31 - .../ServiceManagement/TrafficPercentStrategy.php | 30 - .../src/Google/Service/ServiceManagement/Type.php | 79 - .../ServiceManagement/UndeleteServiceResponse.php | 31 - .../src/Google/Service/ServiceManagement/Usage.php | 50 - .../Google/Service/ServiceManagement/UsageRule.php | 39 - .../Service/ServiceManagement/Visibility.php | 32 - .../Service/ServiceManagement/VisibilityRule.php | 39 - .../src/Google/Service/ServiceRegistry.php | 221 - .../Google/Service/ServiceRegistry/Endpoint.php | 112 - .../ServiceRegistry/EndpointEndpointVisibility.php | 40 - .../ServiceRegistry/EndpointsListResponse.php | 41 - .../Google/Service/ServiceRegistry/Operation.php | 231 - .../Service/ServiceRegistry/OperationError.php | 32 - .../ServiceRegistry/OperationErrorErrors.php | 48 - .../Service/ServiceRegistry/OperationWarnings.php | 50 - .../ServiceRegistry/OperationWarningsData.php | 39 - .../ServiceRegistry/OperationsListResponse.php | 41 - .../Service/ServiceRegistry/Resource/Endpoints.php | 157 - .../ServiceRegistry/Resource/Operations.php | 99 - .../src/Google/Service/ServiceUser.php | 133 - .../src/Google/Service/ServiceUser/Api.php | 89 - .../Google/Service/ServiceUser/AuthProvider.php | 57 - .../Google/Service/ServiceUser/AuthRequirement.php | 39 - .../Google/Service/ServiceUser/Authentication.php | 42 - .../Service/ServiceUser/AuthenticationRule.php | 60 - .../Service/ServiceUser/AuthorizationConfig.php | 30 - .../src/Google/Service/ServiceUser/Backend.php | 32 - .../src/Google/Service/ServiceUser/BackendRule.php | 48 - .../src/Google/Service/ServiceUser/Context.php | 32 - .../src/Google/Service/ServiceUser/ContextRule.php | 49 - .../src/Google/Service/ServiceUser/Control.php | 30 - .../src/Google/Service/ServiceUser/CustomError.php | 41 - .../Google/Service/ServiceUser/CustomErrorRule.php | 39 - .../Service/ServiceUser/CustomHttpPattern.php | 39 - .../Service/ServiceUser/DisableServiceRequest.php | 20 - .../Google/Service/ServiceUser/Documentation.php | 69 - .../Service/ServiceUser/DocumentationRule.php | 48 - .../Service/ServiceUser/EnableServiceRequest.php | 20 - .../src/Google/Service/ServiceUser/Endpoint.php | 67 - .../src/Google/Service/ServiceUser/Enum.php | 70 - .../src/Google/Service/ServiceUser/EnumValue.php | 50 - .../Google/Service/ServiceUser/Experimental.php | 31 - .../src/Google/Service/ServiceUser/Field.php | 113 - .../src/Google/Service/ServiceUser/Http.php | 32 - .../src/Google/Service/ServiceUser/HttpRule.php | 134 - .../Google/Service/ServiceUser/LabelDescriptor.php | 48 - .../ServiceUser/ListEnabledServicesResponse.php | 41 - .../Google/Service/ServiceUser/LogDescriptor.php | 59 - .../src/Google/Service/ServiceUser/Logging.php | 42 - .../Service/ServiceUser/LoggingDestination.php | 40 - .../Google/Service/ServiceUser/MediaDownload.php | 39 - .../src/Google/Service/ServiceUser/MediaUpload.php | 39 - .../src/Google/Service/ServiceUser/Method.php | 86 - .../Service/ServiceUser/MetricDescriptor.php | 95 - .../src/Google/Service/ServiceUser/Mixin.php | 39 - .../ServiceUser/MonitoredResourceDescriptor.php | 68 - .../src/Google/Service/ServiceUser/Monitoring.php | 42 - .../Service/ServiceUser/MonitoringDestination.php | 40 - .../Service/ServiceUser/OAuthRequirements.php | 30 - .../src/Google/Service/ServiceUser/Operation.php | 67 - .../Service/ServiceUser/OperationMetadata.php | 59 - .../src/Google/Service/ServiceUser/Option.php | 39 - .../src/Google/Service/ServiceUser/Page.php | 50 - .../Service/ServiceUser/PublishedService.php | 40 - .../Service/ServiceUser/Resource/Projects.php | 28 - .../ServiceUser/Resource/ProjectsServices.php | 93 - .../Service/ServiceUser/Resource/Services.php | 48 - .../Service/ServiceUser/SearchServicesResponse.php | 41 - .../src/Google/Service/ServiceUser/Service.php | 287 - .../Google/Service/ServiceUser/SourceContext.php | 30 - .../src/Google/Service/ServiceUser/SourceInfo.php | 31 - .../src/Google/Service/ServiceUser/Status.php | 49 - .../src/Google/Service/ServiceUser/Step.php | 39 - .../Google/Service/ServiceUser/SystemParameter.php | 48 - .../Service/ServiceUser/SystemParameterRule.php | 41 - .../Service/ServiceUser/SystemParameters.php | 32 - .../src/Google/Service/ServiceUser/Type.php | 79 - .../src/Google/Service/ServiceUser/Usage.php | 50 - .../src/Google/Service/ServiceUser/UsageRule.php | 39 - .../src/Google/Service/ServiceUser/Visibility.php | 32 - .../Google/Service/ServiceUser/VisibilityRule.php | 39 - .../src/Google/Service/Sheets.php | 297 - .../Google/Service/Sheets/AddBandingRequest.php | 31 - .../Google/Service/Sheets/AddBandingResponse.php | 31 - .../src/Google/Service/Sheets/AddChartRequest.php | 31 - .../src/Google/Service/Sheets/AddChartResponse.php | 31 - .../Sheets/AddConditionalFormatRuleRequest.php | 40 - .../Google/Service/Sheets/AddFilterViewRequest.php | 31 - .../Service/Sheets/AddFilterViewResponse.php | 31 - .../Google/Service/Sheets/AddNamedRangeRequest.php | 31 - .../Service/Sheets/AddNamedRangeResponse.php | 31 - .../Service/Sheets/AddProtectedRangeRequest.php | 31 - .../Service/Sheets/AddProtectedRangeResponse.php | 31 - .../src/Google/Service/Sheets/AddSheetRequest.php | 31 - .../src/Google/Service/Sheets/AddSheetResponse.php | 31 - .../Google/Service/Sheets/AppendCellsRequest.php | 50 - .../Service/Sheets/AppendDimensionRequest.php | 48 - .../Google/Service/Sheets/AppendValuesResponse.php | 49 - .../src/Google/Service/Sheets/AutoFillRequest.php | 50 - .../Service/Sheets/AutoResizeDimensionsRequest.php | 31 - .../src/Google/Service/Sheets/BandedRange.php | 60 - .../Google/Service/Sheets/BandingProperties.php | 61 - .../src/Google/Service/Sheets/BasicChartAxis.php | 49 - .../src/Google/Service/Sheets/BasicChartDomain.php | 31 - .../src/Google/Service/Sheets/BasicChartSeries.php | 49 - .../src/Google/Service/Sheets/BasicChartSpec.php | 79 - .../src/Google/Service/Sheets/BasicFilter.php | 52 - .../Service/Sheets/BatchClearValuesRequest.php | 31 - .../Service/Sheets/BatchClearValuesResponse.php | 40 - .../Service/Sheets/BatchGetValuesResponse.php | 41 - .../Sheets/BatchUpdateSpreadsheetRequest.php | 59 - .../Sheets/BatchUpdateSpreadsheetResponse.php | 51 - .../Service/Sheets/BatchUpdateValuesRequest.php | 68 - .../Service/Sheets/BatchUpdateValuesResponse.php | 77 - .../src/Google/Service/Sheets/BooleanCondition.php | 41 - .../src/Google/Service/Sheets/BooleanRule.php | 41 - .../src/Google/Service/Sheets/Border.php | 49 - .../src/Google/Service/Sheets/Borders.php | 61 - .../src/Google/Service/Sheets/CellData.php | 119 - .../src/Google/Service/Sheets/CellFormat.php | 126 - .../src/Google/Service/Sheets/ChartData.php | 31 - .../src/Google/Service/Sheets/ChartSourceRange.php | 32 - .../src/Google/Service/Sheets/ChartSpec.php | 59 - .../Service/Sheets/ClearBasicFilterRequest.php | 30 - .../Google/Service/Sheets/ClearValuesRequest.php | 20 - .../Google/Service/Sheets/ClearValuesResponse.php | 39 - .../src/Google/Service/Sheets/Color.php | 57 - .../src/Google/Service/Sheets/ConditionValue.php | 39 - .../Service/Sheets/ConditionalFormatRule.php | 52 - .../src/Google/Service/Sheets/CopyPasteRequest.php | 59 - .../CopySheetToAnotherSpreadsheetRequest.php | 30 - .../src/Google/Service/Sheets/CutPasteRequest.php | 50 - .../Google/Service/Sheets/DataValidationRule.php | 58 - .../Google/Service/Sheets/DeleteBandingRequest.php | 30 - .../Sheets/DeleteConditionalFormatRuleRequest.php | 39 - .../Sheets/DeleteConditionalFormatRuleResponse.php | 31 - .../Service/Sheets/DeleteDimensionRequest.php | 31 - .../Service/Sheets/DeleteEmbeddedObjectRequest.php | 30 - .../Service/Sheets/DeleteFilterViewRequest.php | 30 - .../Service/Sheets/DeleteNamedRangeRequest.php | 30 - .../Service/Sheets/DeleteProtectedRangeRequest.php | 30 - .../Google/Service/Sheets/DeleteRangeRequest.php | 40 - .../Google/Service/Sheets/DeleteSheetRequest.php | 30 - .../Google/Service/Sheets/DimensionProperties.php | 48 - .../src/Google/Service/Sheets/DimensionRange.php | 57 - .../Service/Sheets/DuplicateFilterViewRequest.php | 30 - .../Service/Sheets/DuplicateFilterViewResponse.php | 31 - .../Service/Sheets/DuplicateSheetRequest.php | 57 - .../Service/Sheets/DuplicateSheetResponse.php | 31 - .../src/Google/Service/Sheets/Editors.php | 49 - .../src/Google/Service/Sheets/EmbeddedChart.php | 50 - .../Service/Sheets/EmbeddedObjectPosition.php | 49 - .../src/Google/Service/Sheets/ErrorValue.php | 39 - .../src/Google/Service/Sheets/ExtendedValue.php | 67 - .../src/Google/Service/Sheets/FilterCriteria.php | 41 - .../src/Google/Service/Sheets/FilterView.php | 79 - .../Google/Service/Sheets/FindReplaceRequest.php | 103 - .../Google/Service/Sheets/FindReplaceResponse.php | 66 - .../src/Google/Service/Sheets/GradientRule.php | 51 - .../src/Google/Service/Sheets/GridCoordinate.php | 48 - .../src/Google/Service/Sheets/GridData.php | 70 - .../src/Google/Service/Sheets/GridProperties.php | 66 - .../src/Google/Service/Sheets/GridRange.php | 66 - .../Service/Sheets/InsertDimensionRequest.php | 40 - .../Google/Service/Sheets/InsertRangeRequest.php | 40 - .../Google/Service/Sheets/InterpolationPoint.php | 49 - .../Sheets/IterativeCalculationSettings.php | 39 - .../Google/Service/Sheets/MergeCellsRequest.php | 40 - .../Google/Service/Sheets/MoveDimensionRequest.php | 40 - .../src/Google/Service/Sheets/NamedRange.php | 49 - .../src/Google/Service/Sheets/NumberFormat.php | 39 - .../src/Google/Service/Sheets/OverlayPosition.php | 67 - .../src/Google/Service/Sheets/Padding.php | 57 - .../src/Google/Service/Sheets/PasteDataRequest.php | 67 - .../src/Google/Service/Sheets/PieChartSpec.php | 68 - .../Google/Service/Sheets/PivotFilterCriteria.php | 31 - .../src/Google/Service/Sheets/PivotGroup.php | 69 - .../Service/Sheets/PivotGroupSortValueBucket.php | 41 - .../Service/Sheets/PivotGroupValueMetadata.php | 40 - .../src/Google/Service/Sheets/PivotTable.php | 81 - .../src/Google/Service/Sheets/PivotValue.php | 57 - .../src/Google/Service/Sheets/ProtectedRange.php | 97 - .../Google/Service/Sheets/RepeatCellRequest.php | 50 - .../src/Google/Service/Sheets/Request.php | 511 -- .../Service/Sheets/Resource/Spreadsheets.php | 106 - .../Service/Sheets/Resource/SpreadsheetsSheets.php | 45 - .../Service/Sheets/Resource/SpreadsheetsValues.php | 203 - .../src/Google/Service/Sheets/Response.php | 141 - .../src/Google/Service/Sheets/RowData.php | 32 - .../Service/Sheets/SetBasicFilterRequest.php | 31 - .../Service/Sheets/SetDataValidationRequest.php | 41 - .../src/Google/Service/Sheets/Sheet.php | 112 - .../src/Google/Service/Sheets/SheetProperties.php | 95 - .../src/Google/Service/Sheets/SortRangeRequest.php | 42 - .../src/Google/Service/Sheets/SortSpec.php | 39 - .../Google/Service/Sheets/SourceAndDestination.php | 49 - .../src/Google/Service/Sheets/Spreadsheet.php | 70 - .../Service/Sheets/SpreadsheetProperties.php | 77 - .../src/Google/Service/Sheets/TextFormat.php | 85 - .../src/Google/Service/Sheets/TextFormatRun.php | 40 - .../src/Google/Service/Sheets/TextRotation.php | 39 - .../Google/Service/Sheets/TextToColumnsRequest.php | 49 - .../Google/Service/Sheets/UnmergeCellsRequest.php | 31 - .../Google/Service/Sheets/UpdateBandingRequest.php | 40 - .../Google/Service/Sheets/UpdateBordersRequest.php | 91 - .../Google/Service/Sheets/UpdateCellsRequest.php | 61 - .../Service/Sheets/UpdateChartSpecRequest.php | 40 - .../Sheets/UpdateConditionalFormatRuleRequest.php | 58 - .../Sheets/UpdateConditionalFormatRuleResponse.php | 59 - .../Sheets/UpdateDimensionPropertiesRequest.php | 50 - .../Sheets/UpdateEmbeddedObjectPositionRequest.php | 49 - .../UpdateEmbeddedObjectPositionResponse.php | 31 - .../Service/Sheets/UpdateFilterViewRequest.php | 40 - .../Service/Sheets/UpdateNamedRangeRequest.php | 40 - .../Service/Sheets/UpdateProtectedRangeRequest.php | 40 - .../Sheets/UpdateSheetPropertiesRequest.php | 40 - .../Sheets/UpdateSpreadsheetPropertiesRequest.php | 40 - .../Google/Service/Sheets/UpdateValuesResponse.php | 76 - .../src/Google/Service/Sheets/ValueRange.php | 49 - .../src/Google/Service/ShoppingContent.php | 1114 ---- .../src/Google/Service/ShoppingContent/Account.php | 105 - .../Service/ShoppingContent/AccountAdwordsLink.php | 39 - .../Service/ShoppingContent/AccountIdentifier.php | 39 - .../Service/ShoppingContent/AccountShipping.php | 80 - .../ShoppingContent/AccountShippingCarrierRate.php | 85 - .../ShoppingContent/AccountShippingCondition.php | 87 - .../AccountShippingLocationGroup.php | 68 - .../AccountShippingPostalCodeRange.php | 39 - .../ShoppingContent/AccountShippingRateTable.php | 50 - .../AccountShippingRateTableCell.php | 41 - .../AccountShippingShippingService.php | 86 - ...untShippingShippingServiceCalculationMethod.php | 67 - .../AccountShippingShippingServiceCostRule.php | 52 - .../Service/ShoppingContent/AccountStatus.php | 50 - .../AccountStatusDataQualityIssue.php | 113 - .../ShoppingContent/AccountStatusExampleItem.php | 66 - .../Google/Service/ShoppingContent/AccountTax.php | 50 - .../Service/ShoppingContent/AccountTaxTaxRule.php | 66 - .../Google/Service/ShoppingContent/AccountUser.php | 39 - .../ShoppingContent/AccountsAuthInfoResponse.php | 41 - .../ShoppingContent/AccountsCustomBatchRequest.php | 32 - .../AccountsCustomBatchRequestEntry.php | 67 - .../AccountsCustomBatchResponse.php | 41 - .../AccountsCustomBatchResponseEntry.php | 59 - .../ShoppingContent/AccountsListResponse.php | 50 - .../AccountshippingCustomBatchRequest.php | 32 - .../AccountshippingCustomBatchRequestEntry.php | 67 - .../AccountshippingCustomBatchResponse.php | 41 - .../AccountshippingCustomBatchResponseEntry.php | 59 - .../AccountshippingListResponse.php | 50 - .../AccountstatusesCustomBatchRequest.php | 32 - .../AccountstatusesCustomBatchRequestEntry.php | 57 - .../AccountstatusesCustomBatchResponse.php | 41 - .../AccountstatusesCustomBatchResponseEntry.php | 50 - .../AccountstatusesListResponse.php | 50 - .../AccounttaxCustomBatchRequest.php | 32 - .../AccounttaxCustomBatchRequestEntry.php | 67 - .../AccounttaxCustomBatchResponse.php | 41 - .../AccounttaxCustomBatchResponseEntry.php | 59 - .../ShoppingContent/AccounttaxListResponse.php | 50 - .../Google/Service/ShoppingContent/CarrierRate.php | 76 - .../Service/ShoppingContent/CarriersCarrier.php | 49 - .../Google/Service/ShoppingContent/Datafeed.php | 123 - .../ShoppingContent/DatafeedFetchSchedule.php | 93 - .../Service/ShoppingContent/DatafeedFormat.php | 48 - .../Service/ShoppingContent/DatafeedStatus.php | 96 - .../ShoppingContent/DatafeedStatusError.php | 59 - .../ShoppingContent/DatafeedStatusExample.php | 48 - .../DatafeedsCustomBatchRequest.php | 32 - .../DatafeedsCustomBatchRequestEntry.php | 67 - .../DatafeedsCustomBatchResponse.php | 41 - .../DatafeedsCustomBatchResponseEntry.php | 50 - .../ShoppingContent/DatafeedsListResponse.php | 50 - .../DatafeedstatusesCustomBatchRequest.php | 32 - .../DatafeedstatusesCustomBatchRequestEntry.php | 57 - .../DatafeedstatusesCustomBatchResponse.php | 41 - .../DatafeedstatusesCustomBatchResponseEntry.php | 50 - .../DatafeedstatusesListResponse.php | 50 - .../Service/ShoppingContent/DeliveryTime.php | 39 - .../src/Google/Service/ShoppingContent/Error.php | 48 - .../src/Google/Service/ShoppingContent/Errors.php | 50 - .../src/Google/Service/ShoppingContent/Headers.php | 70 - .../Google/Service/ShoppingContent/Installment.php | 40 - .../Google/Service/ShoppingContent/Inventory.php | 116 - .../InventoryCustomBatchRequest.php | 32 - .../InventoryCustomBatchRequestEntry.php | 67 - .../InventoryCustomBatchResponse.php | 41 - .../InventoryCustomBatchResponseEntry.php | 49 - .../Service/ShoppingContent/InventoryPickup.php | 39 - .../ShoppingContent/InventorySetRequest.php | 107 - .../ShoppingContent/InventorySetResponse.php | 30 - .../Service/ShoppingContent/LocationIdSet.php | 31 - .../Service/ShoppingContent/LoyaltyPoints.php | 48 - .../src/Google/Service/ShoppingContent/Order.php | 212 - .../Service/ShoppingContent/OrderAddress.php | 94 - .../Service/ShoppingContent/OrderCancellation.php | 66 - .../Service/ShoppingContent/OrderCustomer.php | 48 - .../ShoppingContent/OrderDeliveryDetails.php | 40 - .../Service/ShoppingContent/OrderLineItem.php | 155 - .../ShoppingContent/OrderLineItemProduct.php | 159 - .../OrderLineItemProductVariantAttribute.php | 39 - .../ShoppingContent/OrderLineItemReturnInfo.php | 48 - .../OrderLineItemShippingDetails.php | 49 - .../OrderLineItemShippingDetailsMethod.php | 57 - .../Service/ShoppingContent/OrderPaymentMethod.php | 76 - .../Service/ShoppingContent/OrderPromotion.php | 86 - .../ShoppingContent/OrderPromotionBenefit.php | 69 - .../Google/Service/ShoppingContent/OrderRefund.php | 67 - .../Google/Service/ShoppingContent/OrderReturn.php | 66 - .../Service/ShoppingContent/OrderShipment.php | 86 - .../OrderShipmentLineItemShipment.php | 39 - .../ShoppingContent/OrdersAcknowledgeRequest.php | 30 - .../ShoppingContent/OrdersAcknowledgeResponse.php | 39 - .../OrdersAdvanceTestOrderResponse.php | 30 - .../OrdersCancelLineItemRequest.php | 76 - .../OrdersCancelLineItemResponse.php | 39 - .../ShoppingContent/OrdersCancelRequest.php | 48 - .../ShoppingContent/OrdersCancelResponse.php | 39 - .../OrdersCreateTestOrderRequest.php | 40 - .../OrdersCreateTestOrderResponse.php | 39 - .../ShoppingContent/OrdersCustomBatchRequest.php | 32 - .../OrdersCustomBatchRequestEntry.php | 135 - .../OrdersCustomBatchRequestEntryCancel.php | 39 - ...OrdersCustomBatchRequestEntryCancelLineItem.php | 67 - .../OrdersCustomBatchRequestEntryRefund.php | 49 - ...OrdersCustomBatchRequestEntryReturnLineItem.php | 57 - .../OrdersCustomBatchRequestEntryShipLineItems.php | 59 - ...OrdersCustomBatchRequestEntryUpdateShipment.php | 57 - .../ShoppingContent/OrdersCustomBatchResponse.php | 41 - .../OrdersCustomBatchResponseEntry.php | 68 - .../OrdersGetByMerchantOrderIdResponse.php | 40 - .../OrdersGetTestOrderTemplateResponse.php | 40 - .../Service/ShoppingContent/OrdersListResponse.php | 50 - .../ShoppingContent/OrdersRefundRequest.php | 58 - .../ShoppingContent/OrdersRefundResponse.php | 39 - .../OrdersReturnLineItemRequest.php | 66 - .../OrdersReturnLineItemResponse.php | 39 - .../ShoppingContent/OrdersShipLineItemsRequest.php | 68 - .../OrdersShipLineItemsResponse.php | 39 - .../OrdersUpdateMerchantOrderIdRequest.php | 39 - .../OrdersUpdateMerchantOrderIdResponse.php | 39 - .../OrdersUpdateShipmentRequest.php | 66 - .../OrdersUpdateShipmentResponse.php | 39 - .../Service/ShoppingContent/PostalCodeGroup.php | 50 - .../Service/ShoppingContent/PostalCodeRange.php | 39 - .../src/Google/Service/ShoppingContent/Price.php | 39 - .../src/Google/Service/ShoppingContent/Product.php | 687 --- .../Service/ShoppingContent/ProductAspect.php | 48 - .../ShoppingContent/ProductCustomAttribute.php | 57 - .../Service/ShoppingContent/ProductCustomGroup.php | 41 - .../Service/ShoppingContent/ProductDestination.php | 39 - .../Service/ShoppingContent/ProductShipping.php | 85 - .../ShoppingContent/ProductShippingDimension.php | 39 - .../ShoppingContent/ProductShippingWeight.php | 39 - .../Service/ShoppingContent/ProductStatus.php | 105 - .../ProductStatusDataQualityIssue.php | 93 - .../ProductStatusDestinationStatus.php | 48 - .../Google/Service/ShoppingContent/ProductTax.php | 75 - .../ProductUnitPricingBaseMeasure.php | 39 - .../ShoppingContent/ProductUnitPricingMeasure.php | 39 - .../ShoppingContent/ProductsCustomBatchRequest.php | 32 - .../ProductsCustomBatchRequestEntry.php | 67 - .../ProductsCustomBatchResponse.php | 41 - .../ProductsCustomBatchResponseEntry.php | 59 - .../ShoppingContent/ProductsListResponse.php | 50 - .../ProductstatusesCustomBatchRequest.php | 32 - .../ProductstatusesCustomBatchRequestEntry.php | 57 - .../ProductstatusesCustomBatchResponse.php | 41 - .../ProductstatusesCustomBatchResponseEntry.php | 59 - .../ProductstatusesListResponse.php | 50 - .../Google/Service/ShoppingContent/RateGroup.php | 71 - .../Service/ShoppingContent/Resource/Accounts.php | 164 - .../ShoppingContent/Resource/Accountshipping.php | 123 - .../ShoppingContent/Resource/Accountstatuses.php | 77 - .../ShoppingContent/Resource/Accounttax.php | 123 - .../Service/ShoppingContent/Resource/Datafeeds.php | 146 - .../ShoppingContent/Resource/Datafeedstatuses.php | 76 - .../Service/ShoppingContent/Resource/Inventory.php | 69 - .../Service/ShoppingContent/Resource/Orders.php | 287 - .../Service/ShoppingContent/Resource/Products.php | 116 - .../ShoppingContent/Resource/Productstatuses.php | 79 - .../ShoppingContent/Resource/Shippingsettings.php | 138 - .../src/Google/Service/ShoppingContent/Row.php | 32 - .../src/Google/Service/ShoppingContent/Service.php | 78 - .../Service/ShoppingContent/ShippingSettings.php | 51 - .../ShippingsettingsCustomBatchRequest.php | 32 - .../ShippingsettingsCustomBatchRequestEntry.php | 67 - .../ShippingsettingsCustomBatchResponse.php | 41 - .../ShippingsettingsCustomBatchResponseEntry.php | 59 - ...hippingsettingsGetSupportedCarriersResponse.php | 41 - .../ShippingsettingsListResponse.php | 50 - .../src/Google/Service/ShoppingContent/Table.php | 61 - .../Google/Service/ShoppingContent/TestOrder.php | 109 - .../Service/ShoppingContent/TestOrderCustomer.php | 48 - .../Service/ShoppingContent/TestOrderLineItem.php | 70 - .../ShoppingContent/TestOrderLineItemProduct.php | 141 - .../ShoppingContent/TestOrderPaymentMethod.php | 66 - .../src/Google/Service/ShoppingContent/Value.php | 67 - .../src/Google/Service/ShoppingContent/Weight.php | 39 - .../src/Google/Service/SiteVerification.php | 124 - .../SiteVerification/Resource/WebResource.php | 124 - .../SiteVerificationWebResourceGettokenRequest.php | 40 - ...eVerificationWebResourceGettokenRequestSite.php | 39 - ...SiteVerificationWebResourceGettokenResponse.php | 39 - .../SiteVerificationWebResourceListResponse.php | 32 - .../SiteVerificationWebResourceResource.php | 50 - .../SiteVerificationWebResourceResourceSite.php | 39 - .../src/Google/Service/Slides.php | 128 - .../src/Google/Service/Slides/AffineTransform.php | 84 - .../src/Google/Service/Slides/AutoText.php | 49 - .../Slides/BatchUpdatePresentationRequest.php | 42 - .../Slides/BatchUpdatePresentationResponse.php | 41 - .../src/Google/Service/Slides/Bullet.php | 58 - .../src/Google/Service/Slides/ColorScheme.php | 32 - .../src/Google/Service/Slides/ColorStop.php | 49 - .../Google/Service/Slides/CreateImageRequest.php | 49 - .../Google/Service/Slides/CreateImageResponse.php | 30 - .../Google/Service/Slides/CreateLineRequest.php | 49 - .../Google/Service/Slides/CreateLineResponse.php | 30 - .../Slides/CreateParagraphBulletsRequest.php | 59 - .../Google/Service/Slides/CreateShapeRequest.php | 49 - .../Google/Service/Slides/CreateShapeResponse.php | 30 - .../Service/Slides/CreateSheetsChartRequest.php | 67 - .../Service/Slides/CreateSheetsChartResponse.php | 30 - .../Google/Service/Slides/CreateSlideRequest.php | 60 - .../Google/Service/Slides/CreateSlideResponse.php | 30 - .../Google/Service/Slides/CreateTableRequest.php | 58 - .../Google/Service/Slides/CreateTableResponse.php | 30 - .../Google/Service/Slides/CreateVideoRequest.php | 58 - .../Google/Service/Slides/CreateVideoResponse.php | 30 - .../src/Google/Service/Slides/CropProperties.php | 66 - .../Google/Service/Slides/DeleteObjectRequest.php | 30 - .../Slides/DeleteParagraphBulletsRequest.php | 50 - .../Service/Slides/DeleteTableColumnRequest.php | 40 - .../Service/Slides/DeleteTableRowRequest.php | 40 - .../Google/Service/Slides/DeleteTextRequest.php | 50 - .../src/Google/Service/Slides/Dimension.php | 39 - .../Service/Slides/DuplicateObjectRequest.php | 39 - .../Service/Slides/DuplicateObjectResponse.php | 30 - .../src/Google/Service/Slides/Group.php | 32 - .../src/Google/Service/Slides/Image.php | 40 - .../src/Google/Service/Slides/ImageProperties.php | 98 - .../Service/Slides/InsertTableColumnsRequest.php | 58 - .../Service/Slides/InsertTableRowsRequest.php | 58 - .../Google/Service/Slides/InsertTextRequest.php | 58 - .../Service/Slides/LayoutPlaceholderIdMapping.php | 49 - .../src/Google/Service/Slides/LayoutProperties.php | 48 - .../src/Google/Service/Slides/LayoutReference.php | 39 - .../src/Google/Service/Slides/Line.php | 40 - .../src/Google/Service/Slides/LineFill.php | 31 - .../src/Google/Service/Slides/LineProperties.php | 78 - .../src/Google/Service/Slides/Link.php | 57 - .../src/Google/Service/Slides/NestingLevel.php | 31 - .../src/Google/Service/Slides/NotesProperties.php | 30 - .../src/Google/Service/Slides/OpaqueColor.php | 40 - .../src/Google/Service/Slides/OptionalColor.php | 31 - .../src/Google/Service/Slides/Outline.php | 59 - .../src/Google/Service/Slides/OutlineFill.php | 31 - .../src/Google/Service/Slides/Page.php | 99 - .../Google/Service/Slides/PageBackgroundFill.php | 50 - .../src/Google/Service/Slides/PageElement.php | 148 - .../Service/Slides/PageElementProperties.php | 50 - .../src/Google/Service/Slides/PageProperties.php | 41 - .../src/Google/Service/Slides/ParagraphMarker.php | 41 - .../src/Google/Service/Slides/ParagraphStyle.php | 107 - .../src/Google/Service/Slides/Placeholder.php | 48 - .../src/Google/Service/Slides/Presentation.php | 108 - .../src/Google/Service/Slides/Range.php | 48 - .../src/Google/Service/Slides/Recolor.php | 41 - .../Service/Slides/RefreshSheetsChartRequest.php | 30 - .../Slides/ReplaceAllShapesWithImageRequest.php | 49 - .../Slides/ReplaceAllShapesWithImageResponse.php | 30 - .../ReplaceAllShapesWithSheetsChartRequest.php | 58 - .../ReplaceAllShapesWithSheetsChartResponse.php | 30 - .../Service/Slides/ReplaceAllTextRequest.php | 40 - .../Service/Slides/ReplaceAllTextResponse.php | 30 - .../src/Google/Service/Slides/Request.php | 331 -- .../Service/Slides/Resource/Presentations.php | 87 - .../Service/Slides/Resource/PresentationsPages.php | 43 - .../src/Google/Service/Slides/Response.php | 131 - .../src/Google/Service/Slides/RgbColor.php | 48 - .../src/Google/Service/Slides/Shadow.php | 96 - .../src/Google/Service/Slides/Shape.php | 60 - .../Google/Service/Slides/ShapeBackgroundFill.php | 40 - .../src/Google/Service/Slides/ShapeProperties.php | 61 - .../src/Google/Service/Slides/SheetsChart.php | 58 - .../Service/Slides/SheetsChartProperties.php | 31 - .../src/Google/Service/Slides/Size.php | 41 - .../src/Google/Service/Slides/SlideProperties.php | 49 - .../src/Google/Service/Slides/SlidesList.php | 40 - .../src/Google/Service/Slides/SolidFill.php | 40 - .../Google/Service/Slides/StretchedPictureFill.php | 40 - .../Service/Slides/SubstringMatchCriteria.php | 39 - .../src/Google/Service/Slides/Table.php | 60 - .../src/Google/Service/Slides/TableCell.php | 69 - .../Service/Slides/TableCellBackgroundFill.php | 40 - .../Google/Service/Slides/TableCellLocation.php | 39 - .../Google/Service/Slides/TableCellProperties.php | 31 - .../Service/Slides/TableColumnProperties.php | 31 - .../src/Google/Service/Slides/TableRange.php | 49 - .../src/Google/Service/Slides/TableRow.php | 42 - .../src/Google/Service/Slides/TextContent.php | 42 - .../src/Google/Service/Slides/TextElement.php | 69 - .../src/Google/Service/Slides/TextRun.php | 40 - .../src/Google/Service/Slides/TextStyle.php | 134 - .../src/Google/Service/Slides/ThemeColorPair.php | 40 - .../Slides/UpdateImagePropertiesRequest.php | 49 - .../Service/Slides/UpdateLinePropertiesRequest.php | 49 - .../Slides/UpdatePageElementTransformRequest.php | 49 - .../Service/Slides/UpdatePagePropertiesRequest.php | 49 - .../Service/Slides/UpdateParagraphStyleRequest.php | 69 - .../Slides/UpdateShapePropertiesRequest.php | 49 - .../Service/Slides/UpdateSlidesPositionRequest.php | 40 - .../Slides/UpdateTableCellPropertiesRequest.php | 59 - .../Service/Slides/UpdateTextStyleRequest.php | 69 - .../Slides/UpdateVideoPropertiesRequest.php | 49 - .../src/Google/Service/Slides/Video.php | 58 - .../src/Google/Service/Slides/VideoProperties.php | 31 - .../Google/Service/Slides/WeightedFontFamily.php | 39 - .../src/Google/Service/Slides/WordArt.php | 30 - .../src/Google/Service/Slides/WriteControl.php | 30 - .../src/Google/Service/Spanner.php | 541 -- .../src/Google/Service/Spanner/AuditConfig.php | 50 - .../src/Google/Service/Spanner/AuditLogConfig.php | 40 - .../Service/Spanner/BeginTransactionRequest.php | 31 - .../src/Google/Service/Spanner/Binding.php | 40 - .../src/Google/Service/Spanner/ChildLink.php | 48 - .../Google/Service/Spanner/CloudAuditOptions.php | 20 - .../src/Google/Service/Spanner/CommitRequest.php | 51 - .../src/Google/Service/Spanner/CommitResponse.php | 30 - .../src/Google/Service/Spanner/Condition.php | 76 - .../src/Google/Service/Spanner/CounterOptions.php | 39 - .../Service/Spanner/CreateDatabaseMetadata.php | 30 - .../Service/Spanner/CreateDatabaseRequest.php | 40 - .../Service/Spanner/CreateInstanceMetadata.php | 58 - .../Service/Spanner/CreateInstanceRequest.php | 40 - .../Google/Service/Spanner/DataAccessOptions.php | 20 - .../src/Google/Service/Spanner/Database.php | 39 - .../src/Google/Service/Spanner/Delete.php | 40 - .../Google/Service/Spanner/ExecuteSqlRequest.php | 77 - .../src/Google/Service/Spanner/Field.php | 40 - .../Service/Spanner/GetDatabaseDdlResponse.php | 31 - .../Google/Service/Spanner/GetIamPolicyRequest.php | 20 - .../src/Google/Service/Spanner/Instance.php | 75 - .../src/Google/Service/Spanner/InstanceConfig.php | 39 - .../src/Google/Service/Spanner/KeyRange.php | 58 - .../src/Google/Service/Spanner/KeySet.php | 50 - .../Service/Spanner/ListDatabasesResponse.php | 41 - .../Spanner/ListInstanceConfigsResponse.php | 41 - .../Service/Spanner/ListInstancesResponse.php | 41 - .../Service/Spanner/ListOperationsResponse.php | 41 - .../src/Google/Service/Spanner/LogConfig.php | 51 - .../src/Google/Service/Spanner/Mutation.php | 71 - .../src/Google/Service/Spanner/Operation.php | 67 - .../Google/Service/Spanner/PartialResultSet.php | 69 - .../src/Google/Service/Spanner/PlanNode.php | 87 - .../src/Google/Service/Spanner/Policy.php | 79 - .../src/Google/Service/Spanner/QueryPlan.php | 32 - .../src/Google/Service/Spanner/ReadOnly.php | 75 - .../src/Google/Service/Spanner/ReadRequest.php | 87 - .../src/Google/Service/Spanner/ReadWrite.php | 20 - .../Google/Service/Spanner/Resource/Projects.php | 28 - .../Spanner/Resource/ProjectsInstanceConfigs.php | 65 - .../Service/Spanner/Resource/ProjectsInstances.php | 253 - .../Resource/ProjectsInstancesDatabases.php | 188 - .../ProjectsInstancesDatabasesOperations.php | 102 - .../ProjectsInstancesDatabasesSessions.php | 231 - .../Resource/ProjectsInstancesOperations.php | 102 - .../src/Google/Service/Spanner/ResultSet.php | 51 - .../Google/Service/Spanner/ResultSetMetadata.php | 41 - .../src/Google/Service/Spanner/ResultSetStats.php | 40 - .../src/Google/Service/Spanner/RollbackRequest.php | 30 - .../src/Google/Service/Spanner/Rule.php | 87 - .../src/Google/Service/Spanner/Session.php | 30 - .../Google/Service/Spanner/SetIamPolicyRequest.php | 40 - .../Google/Service/Spanner/ShortRepresentation.php | 39 - .../src/Google/Service/Spanner/SpannerEmpty.php | 20 - .../src/Google/Service/Spanner/Status.php | 49 - .../src/Google/Service/Spanner/StructType.php | 32 - .../Service/Spanner/TestIamPermissionsRequest.php | 31 - .../Service/Spanner/TestIamPermissionsResponse.php | 31 - .../src/Google/Service/Spanner/Transaction.php | 39 - .../Google/Service/Spanner/TransactionOptions.php | 41 - .../Google/Service/Spanner/TransactionSelector.php | 50 - .../src/Google/Service/Spanner/Type.php | 50 - .../Service/Spanner/UpdateDatabaseDdlMetadata.php | 49 - .../Service/Spanner/UpdateDatabaseDdlRequest.php | 40 - .../Service/Spanner/UpdateInstanceMetadata.php | 58 - .../Service/Spanner/UpdateInstanceRequest.php | 40 - .../src/Google/Service/Spanner/Write.php | 49 - .../src/Google/Service/Spectrum.php | 85 - .../Service/Spectrum/AntennaCharacteristics.php | 48 - .../src/Google/Service/Spectrum/DatabaseSpec.php | 39 - .../src/Google/Service/Spectrum/DbUpdateSpec.php | 32 - .../Google/Service/Spectrum/DeviceCapabilities.php | 32 - .../Google/Service/Spectrum/DeviceDescriptor.php | 112 - .../src/Google/Service/Spectrum/DeviceOwner.php | 41 - .../src/Google/Service/Spectrum/DeviceValidity.php | 49 - .../src/Google/Service/Spectrum/EventTime.php | 39 - .../src/Google/Service/Spectrum/FrequencyRange.php | 57 - .../src/Google/Service/Spectrum/GeoLocation.php | 50 - .../Google/Service/Spectrum/GeoLocationEllipse.php | 58 - .../Google/Service/Spectrum/GeoLocationPoint.php | 39 - .../Google/Service/Spectrum/GeoLocationPolygon.php | 32 - .../Service/Spectrum/GeoSpectrumSchedule.php | 42 - .../Spectrum/PawsGetSpectrumBatchRequest.php | 109 - .../Spectrum/PawsGetSpectrumBatchResponse.php | 125 - .../Service/Spectrum/PawsGetSpectrumRequest.php | 108 - .../Service/Spectrum/PawsGetSpectrumResponse.php | 125 - .../Google/Service/Spectrum/PawsInitRequest.php | 59 - .../Google/Service/Spectrum/PawsInitResponse.php | 68 - .../Spectrum/PawsNotifySpectrumUseRequest.php | 70 - .../Spectrum/PawsNotifySpectrumUseResponse.php | 48 - .../Service/Spectrum/PawsRegisterRequest.php | 79 - .../Service/Spectrum/PawsRegisterResponse.php | 58 - .../Service/Spectrum/PawsVerifyDeviceRequest.php | 50 - .../Service/Spectrum/PawsVerifyDeviceResponse.php | 69 - .../src/Google/Service/Spectrum/Resource/Paws.php | 117 - .../src/Google/Service/Spectrum/RulesetInfo.php | 58 - .../Google/Service/Spectrum/SpectrumMessage.php | 41 - .../Google/Service/Spectrum/SpectrumSchedule.php | 42 - .../src/Google/Service/Spectrum/Vcard.php | 70 - .../src/Google/Service/Spectrum/VcardAddress.php | 75 - .../src/Google/Service/Spectrum/VcardTelephone.php | 30 - .../src/Google/Service/Spectrum/VcardTypedText.php | 30 - .../src/Google/Service/Speech.php | 133 - .../Service/Speech/AsyncRecognizeRequest.php | 41 - .../Service/Speech/CancelOperationRequest.php | 20 - .../Service/Speech/ListOperationsResponse.php | 41 - .../src/Google/Service/Speech/Operation.php | 67 - .../src/Google/Service/Speech/RecognitionAudio.php | 39 - .../Google/Service/Speech/RecognitionConfig.php | 76 - .../Google/Service/Speech/Resource/Operations.php | 102 - .../src/Google/Service/Speech/Resource/Speech.php | 59 - .../src/Google/Service/Speech/SpeechContext.php | 31 - .../src/Google/Service/Speech/SpeechEmpty.php | 20 - .../Speech/SpeechRecognitionAlternative.php | 39 - .../Service/Speech/SpeechRecognitionResult.php | 32 - .../src/Google/Service/Speech/Status.php | 49 - .../Google/Service/Speech/SyncRecognizeRequest.php | 41 - .../Service/Speech/SyncRecognizeResponse.php | 32 - .../src/Google/Service/Storage.php | 1126 ---- .../src/Google/Service/Storage/Bucket.php | 201 - .../Google/Service/Storage/BucketAccessControl.php | 121 - .../Storage/BucketAccessControlProjectTeam.php | 39 - .../Service/Storage/BucketAccessControls.php | 41 - .../src/Google/Service/Storage/BucketCors.php | 58 - .../Google/Service/Storage/BucketEncryption.php | 33 - .../src/Google/Service/Storage/BucketLifecycle.php | 32 - .../Google/Service/Storage/BucketLifecycleRule.php | 41 - .../Service/Storage/BucketLifecycleRuleAction.php | 39 - .../Storage/BucketLifecycleRuleCondition.php | 67 - .../src/Google/Service/Storage/BucketLogging.php | 39 - .../src/Google/Service/Storage/BucketOwner.php | 39 - .../Google/Service/Storage/BucketVersioning.php | 30 - .../src/Google/Service/Storage/BucketWebsite.php | 39 - .../src/Google/Service/Storage/Buckets.php | 50 - .../src/Google/Service/Storage/Channel.php | 111 - .../src/Google/Service/Storage/ComposeRequest.php | 51 - .../Storage/ComposeRequestSourceObjects.php | 49 - ...poseRequestSourceObjectsObjectPreconditions.php | 30 - .../Google/Service/Storage/ObjectAccessControl.php | 139 - .../Storage/ObjectAccessControlProjectTeam.php | 39 - .../Service/Storage/ObjectAccessControls.php | 41 - .../src/Google/Service/Storage/Objects.php | 59 - .../src/Google/Service/Storage/Policy.php | 59 - .../src/Google/Service/Storage/PolicyBindings.php | 40 - .../Storage/Resource/BucketAccessControls.php | 125 - .../Google/Service/Storage/Resource/Buckets.php | 208 - .../Google/Service/Storage/Resource/Channels.php | 40 - .../Resource/DefaultObjectAccessControls.php | 132 - .../Storage/Resource/ObjectAccessControls.php | 155 - .../Google/Service/Storage/Resource/Objects.php | 444 -- .../src/Google/Service/Storage/RewriteResponse.php | 76 - .../src/Google/Service/Storage/StorageObject.php | 268 - .../Storage/StorageObjectCustomerEncryption.php | 39 - .../Google/Service/Storage/StorageObjectOwner.php | 39 - .../Service/Storage/TestIamPermissionsResponse.php | 40 - .../src/Google/Service/Storagetransfer.php | 233 - .../Service/Storagetransfer/AwsAccessKey.php | 39 - .../Google/Service/Storagetransfer/AwsS3Data.php | 40 - .../src/Google/Service/Storagetransfer/Date.php | 48 - .../Service/Storagetransfer/ErrorLogEntry.php | 40 - .../Service/Storagetransfer/ErrorSummary.php | 50 - .../src/Google/Service/Storagetransfer/GcsData.php | 30 - .../Storagetransfer/GoogleServiceAccount.php | 30 - .../Google/Service/Storagetransfer/HttpData.php | 30 - .../Storagetransfer/ListOperationsResponse.php | 41 - .../Storagetransfer/ListTransferJobsResponse.php | 41 - .../Service/Storagetransfer/ObjectConditions.php | 58 - .../Google/Service/Storagetransfer/Operation.php | 67 - .../PauseTransferOperationRequest.php | 20 - .../Resource/GoogleServiceAccounts.php | 48 - .../Storagetransfer/Resource/TransferJobs.php | 96 - .../Resource/TransferOperations.php | 121 - .../Google/Service/Storagetransfer/Resource/V1.php | 49 - .../ResumeTransferOperationRequest.php | 20 - .../Google/Service/Storagetransfer/Schedule.php | 51 - .../src/Google/Service/Storagetransfer/Status.php | 49 - .../Storagetransfer/StoragetransferEmpty.php | 20 - .../Google/Service/Storagetransfer/TimeOfDay.php | 57 - .../Service/Storagetransfer/TransferCounters.php | 165 - .../Google/Service/Storagetransfer/TransferJob.php | 104 - .../Service/Storagetransfer/TransferOperation.php | 106 - .../Service/Storagetransfer/TransferOptions.php | 48 - .../Service/Storagetransfer/TransferSpec.php | 81 - .../Storagetransfer/UpdateTransferJobRequest.php | 49 - .../src/Google/Service/Surveys.php | 210 - .../src/Google/Service/Surveys/FieldMask.php | 41 - .../src/Google/Service/Surveys/MobileAppPanel.php | 76 - .../Surveys/MobileAppPanelsListResponse.php | 61 - .../src/Google/Service/Surveys/PageInfo.php | 48 - .../Service/Surveys/Resource/Mobileapppanels.php | 74 - .../Google/Service/Surveys/Resource/Results.php | 43 - .../Google/Service/Surveys/Resource/Surveys.php | 125 - .../Google/Service/Surveys/ResultsGetRequest.php | 31 - .../src/Google/Service/Surveys/ResultsMask.php | 41 - .../src/Google/Service/Surveys/Survey.php | 125 - .../src/Google/Service/Surveys/SurveyAudience.php | 85 - .../src/Google/Service/Surveys/SurveyCost.php | 57 - .../src/Google/Service/Surveys/SurveyQuestion.php | 185 - .../Google/Service/Surveys/SurveyQuestionImage.php | 48 - .../src/Google/Service/Surveys/SurveyRejection.php | 39 - .../src/Google/Service/Surveys/SurveyResults.php | 39 - .../Service/Surveys/SurveysDeleteResponse.php | 30 - .../Google/Service/Surveys/SurveysListResponse.php | 61 - .../Google/Service/Surveys/SurveysStartRequest.php | 30 - .../Service/Surveys/SurveysStartResponse.php | 40 - .../Google/Service/Surveys/SurveysStopResponse.php | 40 - .../src/Google/Service/Surveys/TokenPagination.php | 39 - .../src/Google/Service/TagManager.php | 1099 ---- .../src/Google/Service/TagManager/Account.php | 57 - .../Google/Service/TagManager/AccountAccess.php | 31 - .../src/Google/Service/TagManager/Condition.php | 41 - .../src/Google/Service/TagManager/Container.php | 121 - .../Google/Service/TagManager/ContainerAccess.php | 40 - .../Google/Service/TagManager/ContainerVersion.php | 155 - .../Service/TagManager/ContainerVersionHeader.php | 111 - ...CreateContainerVersionRequestVersionOptions.php | 48 - .../TagManager/CreateContainerVersionResponse.php | 40 - .../src/Google/Service/TagManager/Environment.php | 129 - .../src/Google/Service/TagManager/Folder.php | 66 - .../Google/Service/TagManager/FolderEntities.php | 52 - .../TagManager/ListAccountUsersResponse.php | 32 - .../Service/TagManager/ListAccountsResponse.php | 32 - .../TagManager/ListContainerVersionsResponse.php | 42 - .../Service/TagManager/ListContainersResponse.php | 32 - .../TagManager/ListEnvironmentsResponse.php | 32 - .../Service/TagManager/ListFoldersResponse.php | 32 - .../Google/Service/TagManager/ListTagsResponse.php | 32 - .../Service/TagManager/ListTriggersResponse.php | 32 - .../Service/TagManager/ListVariablesResponse.php | 32 - .../src/Google/Service/TagManager/Macro.php | 140 - .../src/Google/Service/TagManager/Parameter.php | 69 - .../TagManager/PublishContainerVersionResponse.php | 40 - .../Service/TagManager/Resource/Accounts.php | 70 - .../TagManager/Resource/AccountsContainers.php | 101 - .../Resource/AccountsContainersEnvironments.php | 126 - .../Resource/AccountsContainersFolders.php | 105 - .../Resource/AccountsContainersFoldersEntities.php | 44 - .../Resource/AccountsContainersMoveFolders.php | 47 - .../AccountsContainersReauthorizeEnvironments.php | 45 - .../TagManager/Resource/AccountsContainersTags.php | 105 - .../Resource/AccountsContainersTriggers.php | 106 - .../Resource/AccountsContainersVariables.php | 106 - .../Resource/AccountsContainersVersions.php | 162 - .../TagManager/Resource/AccountsPermissions.php | 101 - .../src/Google/Service/TagManager/Rule.php | 86 - .../src/Google/Service/TagManager/SetupTag.php | 39 - .../src/Google/Service/TagManager/Tag.php | 206 - .../src/Google/Service/TagManager/TeardownTag.php | 39 - .../src/Google/Service/TagManager/Trigger.php | 205 - .../src/Google/Service/TagManager/UserAccess.php | 69 - .../src/Google/Service/TagManager/Variable.php | 140 - .../src/Google/Service/Taskqueue.php | 249 - .../Service/Taskqueue/Resource/Taskqueues.php | 44 - .../Google/Service/Taskqueue/Resource/Tasks.php | 144 - .../src/Google/Service/Taskqueue/Task.php | 96 - .../src/Google/Service/Taskqueue/TaskQueue.php | 68 - .../src/Google/Service/Taskqueue/TaskQueueAcl.php | 49 - .../Google/Service/Taskqueue/TaskQueueStats.php | 57 - .../src/Google/Service/Taskqueue/Tasks.php | 41 - .../src/Google/Service/Taskqueue/Tasks2.php | 41 - .../src/Google/Service/Tasks.php | 295 - .../Google/Service/Tasks/Resource/Tasklists.php | 113 - .../src/Google/Service/Tasks/Resource/Tasks.php | 179 - .../src/Google/Service/Tasks/Task.php | 158 - .../src/Google/Service/Tasks/TaskLinks.php | 48 - .../src/Google/Service/Tasks/TaskList.php | 75 - .../src/Google/Service/Tasks/TaskLists.php | 59 - .../src/Google/Service/Tasks/Tasks.php | 59 - .../src/Google/Service/ToolResults.php | 664 --- .../src/Google/Service/ToolResults/Any.php | 39 - .../Service/ToolResults/BasicPerfSampleSeries.php | 48 - .../ToolResults/BatchCreatePerfSamplesRequest.php | 32 - .../ToolResults/BatchCreatePerfSamplesResponse.php | 32 - .../src/Google/Service/ToolResults/CPUInfo.php | 48 - .../src/Google/Service/ToolResults/Duration.php | 39 - .../src/Google/Service/ToolResults/Execution.php | 78 - .../Google/Service/ToolResults/FailureDetail.php | 66 - .../Google/Service/ToolResults/FileReference.php | 30 - .../src/Google/Service/ToolResults/History.php | 48 - .../src/Google/Service/ToolResults/Image.php | 60 - .../Service/ToolResults/InconclusiveDetail.php | 39 - .../Service/ToolResults/ListExecutionsResponse.php | 41 - .../Service/ToolResults/ListHistoriesResponse.php | 41 - .../ToolResults/ListPerfSampleSeriesResponse.php | 32 - .../ToolResults/ListPerfSamplesResponse.php | 41 - .../ToolResults/ListStepThumbnailsResponse.php | 41 - .../Service/ToolResults/ListStepsResponse.php | 41 - .../src/Google/Service/ToolResults/MemoryInfo.php | 39 - .../src/Google/Service/ToolResults/Outcome.php | 70 - .../Google/Service/ToolResults/PerfEnvironment.php | 41 - .../Service/ToolResults/PerfMetricsSummary.php | 77 - .../src/Google/Service/ToolResults/PerfSample.php | 40 - .../Service/ToolResults/PerfSampleSeries.php | 76 - .../Google/Service/ToolResults/ProjectSettings.php | 39 - .../ToolResults/PublishXunitXmlFilesRequest.php | 32 - .../Service/ToolResults/Resource/Projects.php | 86 - .../ToolResults/Resource/ProjectsHistories.php | 121 - .../Resource/ProjectsHistoriesExecutions.php | 155 - .../Resource/ProjectsHistoriesExecutionsSteps.php | 228 - ...sHistoriesExecutionsStepsPerfMetricsSummary.php | 49 - ...ctsHistoriesExecutionsStepsPerfSampleSeries.php | 96 - ...oriesExecutionsStepsPerfSampleSeriesSamples.php | 87 - .../ProjectsHistoriesExecutionsStepsThumbnails.php | 69 - .../Google/Service/ToolResults/SkippedDetail.php | 48 - .../src/Google/Service/ToolResults/StackTrace.php | 30 - .../src/Google/Service/ToolResults/Status.php | 50 - .../src/Google/Service/ToolResults/Step.php | 157 - .../ToolResults/StepDimensionValueEntry.php | 39 - .../Google/Service/ToolResults/StepLabelsEntry.php | 39 - .../Google/Service/ToolResults/SuccessDetail.php | 30 - .../Service/ToolResults/TestCaseReference.php | 48 - .../Service/ToolResults/TestExecutionStep.php | 62 - .../src/Google/Service/ToolResults/TestIssue.php | 40 - .../Service/ToolResults/TestSuiteOverview.php | 76 - .../src/Google/Service/ToolResults/TestTiming.php | 31 - .../src/Google/Service/ToolResults/Thumbnail.php | 57 - .../src/Google/Service/ToolResults/Timestamp.php | 39 - .../Google/Service/ToolResults/ToolExecution.php | 61 - .../Service/ToolResults/ToolExecutionStep.php | 31 - .../Google/Service/ToolResults/ToolExitCode.php | 30 - .../Service/ToolResults/ToolOutputReference.php | 51 - .../src/Google/Service/Tracing.php | 137 - .../src/Google/Service/Tracing/Annotation.php | 40 - .../src/Google/Service/Tracing/AttributeValue.php | 48 - .../Service/Tracing/BatchUpdateSpansRequest.php | 31 - .../src/Google/Service/Tracing/Link.php | 48 - .../Google/Service/Tracing/ListSpansResponse.php | 41 - .../Google/Service/Tracing/ListTracesResponse.php | 41 - .../src/Google/Service/Tracing/Module.php | 39 - .../src/Google/Service/Tracing/NetworkEvent.php | 57 - .../Google/Service/Tracing/Resource/Projects.php | 28 - .../Service/Tracing/Resource/ProjectsTraces.php | 116 - .../src/Google/Service/Tracing/Span.php | 126 - .../src/Google/Service/Tracing/SpanUpdates.php | 32 - .../src/Google/Service/Tracing/StackFrame.php | 85 - .../src/Google/Service/Tracing/StackTrace.php | 41 - .../src/Google/Service/Tracing/Status.php | 49 - .../src/Google/Service/Tracing/TimeEvent.php | 50 - .../src/Google/Service/Tracing/Trace.php | 30 - .../src/Google/Service/Tracing/TracingEmpty.php | 20 - .../src/Google/Service/Translate.php | 132 - .../Service/Translate/DetectionsListResponse.php | 32 - .../Service/Translate/DetectionsResourceItems.php | 48 - .../Service/Translate/LanguagesListResponse.php | 32 - .../Google/Service/Translate/LanguagesResource.php | 39 - .../Service/Translate/Resource/Detections.php | 41 - .../Service/Translate/Resource/Languages.php | 44 - .../Service/Translate/Resource/Translations.php | 48 - .../Service/Translate/TranslationsListResponse.php | 32 - .../Service/Translate/TranslationsResource.php | 39 - .../src/Google/Service/Urlshortener.php | 94 - .../Service/Urlshortener/AnalyticsSnapshot.php | 80 - .../Service/Urlshortener/AnalyticsSummary.php | 71 - .../Google/Service/Urlshortener/Resource/Url.php | 72 - .../Google/Service/Urlshortener/StringCount.php | 39 - .../src/Google/Service/Urlshortener/Url.php | 76 - .../src/Google/Service/Urlshortener/UrlHistory.php | 68 - .../src/Google/Service/Vision.php | 69 - .../Google/Service/Vision/AnnotateImageRequest.php | 52 - .../Service/Vision/AnnotateImageResponse.php | 132 - .../Service/Vision/BatchAnnotateImagesRequest.php | 32 - .../Service/Vision/BatchAnnotateImagesResponse.php | 32 - .../src/Google/Service/Vision/Block.php | 61 - .../src/Google/Service/Vision/BoundingPoly.php | 32 - .../src/Google/Service/Vision/Color.php | 57 - .../src/Google/Service/Vision/ColorInfo.php | 49 - .../src/Google/Service/Vision/CropHint.php | 49 - .../Google/Service/Vision/CropHintsAnnotation.php | 32 - .../src/Google/Service/Vision/CropHintsParams.php | 31 - .../src/Google/Service/Vision/DetectedBreak.php | 39 - .../src/Google/Service/Vision/DetectedLanguage.php | 39 - .../Service/Vision/DominantColorsAnnotation.php | 32 - .../src/Google/Service/Vision/EntityAnnotation.php | 106 - .../src/Google/Service/Vision/FaceAnnotation.php | 160 - .../src/Google/Service/Vision/Feature.php | 39 - .../src/Google/Service/Vision/Image.php | 40 - .../src/Google/Service/Vision/ImageContext.php | 51 - .../src/Google/Service/Vision/ImageProperties.php | 31 - .../src/Google/Service/Vision/ImageSource.php | 39 - .../src/Google/Service/Vision/Landmark.php | 40 - .../src/Google/Service/Vision/LatLng.php | 39 - .../src/Google/Service/Vision/LatLongRect.php | 41 - .../src/Google/Service/Vision/LocationInfo.php | 31 - .../src/Google/Service/Vision/Page.php | 60 - .../src/Google/Service/Vision/Paragraph.php | 52 - .../src/Google/Service/Vision/Position.php | 48 - .../src/Google/Service/Vision/Property.php | 48 - .../src/Google/Service/Vision/Resource/Images.php | 41 - .../Google/Service/Vision/SafeSearchAnnotation.php | 57 - .../src/Google/Service/Vision/Status.php | 49 - .../src/Google/Service/Vision/Symbol.php | 50 - .../src/Google/Service/Vision/TextAnnotation.php | 41 - .../src/Google/Service/Vision/TextProperty.php | 42 - .../src/Google/Service/Vision/Vertex.php | 39 - .../src/Google/Service/Vision/WebDetection.php | 62 - .../src/Google/Service/Vision/WebEntity.php | 48 - .../src/Google/Service/Vision/WebImage.php | 39 - .../src/Google/Service/Vision/WebPage.php | 39 - .../src/Google/Service/Vision/Word.php | 52 - .../src/Google/Service/Webfonts.php | 72 - .../Google/Service/Webfonts/Resource/Webfonts.php | 43 - .../src/Google/Service/Webfonts/Webfont.php | 94 - .../src/Google/Service/Webfonts/WebfontList.php | 41 - .../src/Google/Service/Webmasters.php | 305 -- .../src/Google/Service/Webmasters/ApiDataRow.php | 67 - .../Service/Webmasters/ApiDimensionFilter.php | 48 - .../Service/Webmasters/ApiDimensionFilterGroup.php | 41 - .../Webmasters/Resource/Searchanalytics.php | 50 - .../Service/Webmasters/Resource/Sitemaps.php | 93 - .../Google/Service/Webmasters/Resource/Sites.php | 80 - .../Webmasters/Resource/Urlcrawlerrorscounts.php | 51 - .../Webmasters/Resource/Urlcrawlerrorssamples.php | 92 - .../Webmasters/SearchAnalyticsQueryRequest.php | 95 - .../Webmasters/SearchAnalyticsQueryResponse.php | 41 - .../Service/Webmasters/SitemapsListResponse.php | 32 - .../Service/Webmasters/SitesListResponse.php | 32 - .../Service/Webmasters/UrlCrawlErrorCount.php | 39 - .../Webmasters/UrlCrawlErrorCountsPerType.php | 50 - .../UrlCrawlErrorsCountsQueryResponse.php | 32 - .../Service/Webmasters/UrlCrawlErrorsSample.php | 71 - .../UrlCrawlErrorsSamplesListResponse.php | 32 - .../Google/Service/Webmasters/UrlSampleDetails.php | 40 - .../src/Google/Service/Webmasters/WmxSite.php | 39 - .../src/Google/Service/Webmasters/WmxSitemap.php | 104 - .../Service/Webmasters/WmxSitemapContent.php | 48 - .../src/Google/Service/YouTube.php | 1944 ------- .../src/Google/Service/YouTube/AccessPolicy.php | 40 - .../src/Google/Service/YouTube/Activity.php | 68 - .../Service/YouTube/ActivityContentDetails.php | 131 - .../YouTube/ActivityContentDetailsBulletin.php | 31 - .../YouTube/ActivityContentDetailsChannelItem.php | 31 - .../YouTube/ActivityContentDetailsComment.php | 31 - .../YouTube/ActivityContentDetailsFavorite.php | 31 - .../Service/YouTube/ActivityContentDetailsLike.php | 31 - .../YouTube/ActivityContentDetailsPlaylistItem.php | 49 - .../YouTube/ActivityContentDetailsPromotedItem.php | 112 - .../ActivityContentDetailsRecommendation.php | 50 - .../YouTube/ActivityContentDetailsSocial.php | 67 - .../YouTube/ActivityContentDetailsSubscription.php | 31 - .../YouTube/ActivityContentDetailsUpload.php | 30 - .../Service/YouTube/ActivityListResponse.php | 106 - .../src/Google/Service/YouTube/ActivitySnippet.php | 94 - .../src/Google/Service/YouTube/Caption.php | 58 - .../Google/Service/YouTube/CaptionListResponse.php | 68 - .../src/Google/Service/YouTube/CaptionSnippet.php | 138 - .../src/Google/Service/YouTube/CdnSettings.php | 67 - .../src/Google/Service/YouTube/Channel.php | 158 - .../Google/Service/YouTube/ChannelAuditDetails.php | 57 - .../Service/YouTube/ChannelBannerResource.php | 48 - .../Service/YouTube/ChannelBrandingSettings.php | 62 - .../Service/YouTube/ChannelContentDetails.php | 31 - .../ChannelContentDetailsRelatedPlaylists.php | 66 - .../Service/YouTube/ChannelContentOwnerDetails.php | 39 - .../Service/YouTube/ChannelConversionPing.php | 39 - .../Service/YouTube/ChannelConversionPings.php | 32 - .../Google/Service/YouTube/ChannelListResponse.php | 106 - .../Google/Service/YouTube/ChannelLocalization.php | 39 - .../Service/YouTube/ChannelProfileDetails.php | 57 - .../src/Google/Service/YouTube/ChannelSection.php | 88 - .../YouTube/ChannelSectionContentDetails.php | 40 - .../Service/YouTube/ChannelSectionListResponse.php | 68 - .../Service/YouTube/ChannelSectionLocalization.php | 30 - .../Service/YouTube/ChannelSectionSnippet.php | 85 - .../Service/YouTube/ChannelSectionTargeting.php | 49 - .../src/Google/Service/YouTube/ChannelSettings.php | 148 - .../src/Google/Service/YouTube/ChannelSnippet.php | 95 - .../Google/Service/YouTube/ChannelStatistics.php | 66 - .../src/Google/Service/YouTube/ChannelStatus.php | 48 - .../Google/Service/YouTube/ChannelTopicDetails.php | 40 - .../src/Google/Service/YouTube/Comment.php | 58 - .../Google/Service/YouTube/CommentListResponse.php | 97 - .../src/Google/Service/YouTube/CommentSnippet.php | 156 - .../src/Google/Service/YouTube/CommentThread.php | 68 - .../Service/YouTube/CommentThreadListResponse.php | 97 - .../Service/YouTube/CommentThreadReplies.php | 32 - .../Service/YouTube/CommentThreadSnippet.php | 76 - .../src/Google/Service/YouTube/ContentRating.php | 634 --- .../src/Google/Service/YouTube/FanFundingEvent.php | 58 - .../YouTube/FanFundingEventListResponse.php | 97 - .../Service/YouTube/FanFundingEventSnippet.php | 85 - .../src/Google/Service/YouTube/GeoPoint.php | 48 - .../src/Google/Service/YouTube/GuideCategory.php | 58 - .../Service/YouTube/GuideCategoryListResponse.php | 106 - .../Service/YouTube/GuideCategorySnippet.php | 39 - .../src/Google/Service/YouTube/I18nLanguage.php | 58 - .../Service/YouTube/I18nLanguageListResponse.php | 68 - .../Google/Service/YouTube/I18nLanguageSnippet.php | 39 - .../src/Google/Service/YouTube/I18nRegion.php | 58 - .../Service/YouTube/I18nRegionListResponse.php | 68 - .../Google/Service/YouTube/I18nRegionSnippet.php | 39 - .../src/Google/Service/YouTube/ImageSettings.php | 224 - .../src/Google/Service/YouTube/IngestionInfo.php | 48 - .../src/Google/Service/YouTube/InvideoBranding.php | 68 - .../src/Google/Service/YouTube/InvideoPosition.php | 39 - .../Google/Service/YouTube/InvideoPromotion.php | 61 - .../src/Google/Service/YouTube/InvideoTiming.php | 48 - .../src/Google/Service/YouTube/LanguageTag.php | 30 - .../src/Google/Service/YouTube/LiveBroadcast.php | 98 - .../YouTube/LiveBroadcastContentDetails.php | 130 - .../Service/YouTube/LiveBroadcastListResponse.php | 106 - .../Service/YouTube/LiveBroadcastSnippet.php | 121 - .../Service/YouTube/LiveBroadcastStatistics.php | 39 - .../Google/Service/YouTube/LiveBroadcastStatus.php | 57 - .../Google/Service/YouTube/LiveBroadcastTopic.php | 49 - .../Service/YouTube/LiveBroadcastTopicDetails.php | 32 - .../Service/YouTube/LiveBroadcastTopicSnippet.php | 39 - .../src/Google/Service/YouTube/LiveChatBan.php | 58 - .../Google/Service/YouTube/LiveChatBanSnippet.php | 58 - .../YouTube/LiveChatFanFundingEventDetails.php | 57 - .../src/Google/Service/YouTube/LiveChatMessage.php | 68 - .../YouTube/LiveChatMessageAuthorDetails.php | 93 - .../YouTube/LiveChatMessageDeletedDetails.php | 30 - .../YouTube/LiveChatMessageListResponse.php | 115 - .../YouTube/LiveChatMessageRetractedDetails.php | 30 - .../Service/YouTube/LiveChatMessageSnippet.php | 175 - .../Google/Service/YouTube/LiveChatModerator.php | 58 - .../YouTube/LiveChatModeratorListResponse.php | 106 - .../Service/YouTube/LiveChatModeratorSnippet.php | 40 - .../Service/YouTube/LiveChatPollClosedDetails.php | 30 - .../Service/YouTube/LiveChatPollEditedDetails.php | 50 - .../Google/Service/YouTube/LiveChatPollItem.php | 39 - .../Service/YouTube/LiveChatPollOpenedDetails.php | 50 - .../Service/YouTube/LiveChatPollVotedDetails.php | 39 - .../Service/YouTube/LiveChatSuperChatDetails.php | 66 - .../Service/YouTube/LiveChatTextMessageDetails.php | 30 - .../YouTube/LiveChatUserBannedMessageDetails.php | 49 - .../src/Google/Service/YouTube/LiveStream.php | 88 - .../YouTube/LiveStreamConfigurationIssue.php | 57 - .../Service/YouTube/LiveStreamContentDetails.php | 39 - .../Service/YouTube/LiveStreamHealthStatus.php | 50 - .../Service/YouTube/LiveStreamListResponse.php | 106 - .../Google/Service/YouTube/LiveStreamSnippet.php | 66 - .../Google/Service/YouTube/LiveStreamStatus.php | 40 - .../Google/Service/YouTube/LocalizedProperty.php | 51 - .../src/Google/Service/YouTube/LocalizedString.php | 39 - .../Google/Service/YouTube/MonitorStreamInfo.php | 48 - .../src/Google/Service/YouTube/PageInfo.php | 39 - .../src/Google/Service/YouTube/Playlist.php | 98 - .../Service/YouTube/PlaylistContentDetails.php | 30 - .../src/Google/Service/YouTube/PlaylistItem.php | 78 - .../Service/YouTube/PlaylistItemContentDetails.php | 66 - .../Service/YouTube/PlaylistItemListResponse.php | 106 - .../Google/Service/YouTube/PlaylistItemSnippet.php | 104 - .../Google/Service/YouTube/PlaylistItemStatus.php | 30 - .../Service/YouTube/PlaylistListResponse.php | 106 - .../Service/YouTube/PlaylistLocalization.php | 39 - .../src/Google/Service/YouTube/PlaylistPlayer.php | 30 - .../src/Google/Service/YouTube/PlaylistSnippet.php | 105 - .../src/Google/Service/YouTube/PlaylistStatus.php | 30 - .../src/Google/Service/YouTube/PromotedItem.php | 59 - .../src/Google/Service/YouTube/PromotedItemId.php | 57 - .../src/Google/Service/YouTube/PropertyValue.php | 39 - .../Google/Service/YouTube/Resource/Activities.php | 109 - .../Google/Service/YouTube/Resource/Captions.php | 215 - .../Service/YouTube/Resource/ChannelBanners.php | 62 - .../Service/YouTube/Resource/ChannelSections.php | 190 - .../Google/Service/YouTube/Resource/Channels.php | 126 - .../Service/YouTube/Resource/CommentThreads.php | 121 - .../Google/Service/YouTube/Resource/Comments.php | 151 - .../Service/YouTube/Resource/FanFundingEvents.php | 60 - .../Service/YouTube/Resource/GuideCategories.php | 54 - .../Service/YouTube/Resource/I18nLanguages.php | 47 - .../Service/YouTube/Resource/I18nRegions.php | 47 - .../Service/YouTube/Resource/LiveBroadcasts.php | 438 -- .../Service/YouTube/Resource/LiveChatBans.php | 57 - .../Service/YouTube/Resource/LiveChatMessages.php | 93 - .../YouTube/Resource/LiveChatModerators.php | 81 - .../Service/YouTube/Resource/LiveStreams.php | 244 - .../Service/YouTube/Resource/PlaylistItems.php | 178 - .../Google/Service/YouTube/Resource/Playlists.php | 211 - .../src/Google/Service/YouTube/Resource/Search.php | 185 - .../Google/Service/YouTube/Resource/Sponsors.php | 51 - .../Service/YouTube/Resource/Subscriptions.php | 136 - .../Service/YouTube/Resource/SuperChatEvents.php | 59 - .../Google/Service/YouTube/Resource/Thumbnails.php | 56 - .../YouTube/Resource/VideoAbuseReportReasons.php | 47 - .../Service/YouTube/Resource/VideoCategories.php | 52 - .../src/Google/Service/YouTube/Resource/Videos.php | 315 -- .../Google/Service/YouTube/Resource/Watermarks.php | 82 - .../src/Google/Service/YouTube/ResourceId.php | 57 - .../Google/Service/YouTube/SearchListResponse.php | 115 - .../src/Google/Service/YouTube/SearchResult.php | 59 - .../Google/Service/YouTube/SearchResultSnippet.php | 85 - .../src/Google/Service/YouTube/Sponsor.php | 58 - .../Google/Service/YouTube/SponsorListResponse.php | 97 - .../src/Google/Service/YouTube/SponsorSnippet.php | 49 - .../src/Google/Service/YouTube/Subscription.php | 78 - .../Service/YouTube/SubscriptionContentDetails.php | 48 - .../Service/YouTube/SubscriptionListResponse.php | 106 - .../Google/Service/YouTube/SubscriptionSnippet.php | 86 - .../YouTube/SubscriptionSubscriberSnippet.php | 58 - .../src/Google/Service/YouTube/SuperChatEvent.php | 58 - .../Service/YouTube/SuperChatEventListResponse.php | 97 - .../Service/YouTube/SuperChatEventSnippet.php | 94 - .../src/Google/Service/YouTube/Thumbnail.php | 48 - .../Google/Service/YouTube/ThumbnailDetails.php | 71 - .../Service/YouTube/ThumbnailSetResponse.php | 68 - .../src/Google/Service/YouTube/TokenPagination.php | 20 - .../src/Google/Service/YouTube/Video.php | 198 - .../Google/Service/YouTube/VideoAbuseReport.php | 66 - .../Service/YouTube/VideoAbuseReportReason.php | 58 - .../YouTube/VideoAbuseReportReasonListResponse.php | 68 - .../YouTube/VideoAbuseReportReasonSnippet.php | 41 - .../YouTube/VideoAbuseReportSecondaryReason.php | 39 - .../src/Google/Service/YouTube/VideoAgeGating.php | 48 - .../src/Google/Service/YouTube/VideoCategory.php | 58 - .../Service/YouTube/VideoCategoryListResponse.php | 106 - .../Service/YouTube/VideoCategorySnippet.php | 48 - .../Google/Service/YouTube/VideoContentDetails.php | 114 - .../VideoContentDetailsRegionRestriction.php | 40 - .../Google/Service/YouTube/VideoFileDetails.php | 105 - .../YouTube/VideoFileDetailsAudioStream.php | 57 - .../YouTube/VideoFileDetailsVideoStream.php | 93 - .../Service/YouTube/VideoGetRatingResponse.php | 68 - .../Google/Service/YouTube/VideoListResponse.php | 106 - .../Service/YouTube/VideoLiveStreamingDetails.php | 75 - .../Google/Service/YouTube/VideoLocalization.php | 39 - .../Service/YouTube/VideoMonetizationDetails.php | 31 - .../src/Google/Service/YouTube/VideoPlayer.php | 48 - .../Service/YouTube/VideoProcessingDetails.php | 94 - .../VideoProcessingDetailsProcessingProgress.php | 48 - .../Google/Service/YouTube/VideoProjectDetails.php | 31 - .../src/Google/Service/YouTube/VideoRating.php | 39 - .../Service/YouTube/VideoRecordingDetails.php | 49 - .../src/Google/Service/YouTube/VideoSnippet.php | 132 - .../src/Google/Service/YouTube/VideoStatistics.php | 66 - .../src/Google/Service/YouTube/VideoStatus.php | 93 - .../Google/Service/YouTube/VideoSuggestions.php | 68 - .../YouTube/VideoSuggestionsTagSuggestion.php | 40 - .../Google/Service/YouTube/VideoTopicDetails.php | 49 - .../src/Google/Service/YouTube/WatchSettings.php | 48 - .../src/Google/Service/YouTubeAnalytics.php | 240 - .../Service/YouTubeAnalytics/BatchReport.php | 78 - .../YouTubeAnalytics/BatchReportDefinition.php | 66 - .../YouTubeAnalytics/BatchReportDefinitionList.php | 41 - .../Service/YouTubeAnalytics/BatchReportList.php | 41 - .../YouTubeAnalytics/BatchReportOutputs.php | 48 - .../YouTubeAnalytics/BatchReportTimeSpan.php | 39 - .../src/Google/Service/YouTubeAnalytics/Group.php | 68 - .../YouTubeAnalytics/GroupContentDetails.php | 39 - .../Google/Service/YouTubeAnalytics/GroupItem.php | 67 - .../YouTubeAnalytics/GroupItemListResponse.php | 50 - .../Service/YouTubeAnalytics/GroupItemResource.php | 39 - .../Service/YouTubeAnalytics/GroupListResponse.php | 59 - .../Service/YouTubeAnalytics/GroupSnippet.php | 39 - .../Resource/BatchReportDefinitions.php | 43 - .../YouTubeAnalytics/Resource/BatchReports.php | 45 - .../YouTubeAnalytics/Resource/GroupItems.php | 108 - .../Service/YouTubeAnalytics/Resource/Groups.php | 142 - .../Service/YouTubeAnalytics/Resource/Reports.php | 83 - .../Service/YouTubeAnalytics/ResultTable.php | 50 - .../YouTubeAnalytics/ResultTableColumnHeaders.php | 48 - .../src/Google/Service/YouTubeReporting.php | 242 - .../src/Google/Service/YouTubeReporting/Job.php | 75 - .../Service/YouTubeReporting/ListJobsResponse.php | 41 - .../YouTubeReporting/ListReportTypesResponse.php | 41 - .../YouTubeReporting/ListReportsResponse.php | 41 - .../src/Google/Service/YouTubeReporting/Media.php | 30 - .../src/Google/Service/YouTubeReporting/Report.php | 84 - .../Google/Service/YouTubeReporting/ReportType.php | 57 - .../Service/YouTubeReporting/Resource/Jobs.php | 104 - .../YouTubeReporting/Resource/JobsReports.php | 77 - .../Service/YouTubeReporting/Resource/Media.php | 43 - .../YouTubeReporting/Resource/ReportTypes.php | 54 - .../YouTubeReporting/YoutubereportingEmpty.php | 20 - .../apiclient-services/tests/ServiceTest.php | 61 - .../google/apiclient-services/tests/bootstrap.php | 3 - .../googleapi/google/apiclient/.gitattributes | 9 - .../share/googleapi/google/apiclient/LICENSE | 203 - .../share/googleapi/google/apiclient/README.md | 366 -- .../share/googleapi/google/apiclient/composer.json | 41 - .../apiclient/src/Google/AccessToken/Revoke.php | 78 - .../apiclient/src/Google/AccessToken/Verify.php | 269 - .../src/Google/AuthHandler/AuthHandlerFactory.php | 42 - .../src/Google/AuthHandler/Guzzle5AuthHandler.php | 99 - .../src/Google/AuthHandler/Guzzle6AuthHandler.php | 106 - .../google/apiclient/src/Google/Client.php | 1118 ---- .../google/apiclient/src/Google/Collection.php | 101 - .../google/apiclient/src/Google/Exception.php | 20 - .../google/apiclient/src/Google/Http/Batch.php | 249 - .../apiclient/src/Google/Http/MediaFileUpload.php | 348 -- .../google/apiclient/src/Google/Http/REST.php | 182 - .../google/apiclient/src/Google/Model.php | 307 -- .../google/apiclient/src/Google/Service.php | 56 - .../apiclient/src/Google/Service/Exception.php | 68 - .../google/apiclient/src/Google/Service/README.md | 5 - .../apiclient/src/Google/Service/Resource.php | 296 - .../google/apiclient/src/Google/Task/Exception.php | 20 - .../google/apiclient/src/Google/Task/Retryable.php | 24 - .../google/apiclient/src/Google/Task/Runner.php | 281 - .../apiclient/src/Google/Utils/UriTemplate.php | 333 -- .../google/apiclient/src/Google/autoload.php | 21 - .../share/googleapi/google/auth/.editorconfig | 18 - .../include/share/googleapi/google/auth/.gitignore | 3 - .../include/share/googleapi/google/auth/.php_cs | 54 - .../share/googleapi/google/auth/.travis.yml | 31 - .../share/googleapi/google/auth/CHANGELOG.md | 8 - .../share/googleapi/google/auth/CONTRIBUTING.md | 73 - .../include/share/googleapi/google/auth/COPYING | 202 - .../include/share/googleapi/google/auth/LICENSE | 203 - .../include/share/googleapi/google/auth/README.md | 150 - .../share/googleapi/google/auth/autoload.php | 34 - .../share/googleapi/google/auth/composer.json | 28 - .../share/googleapi/google/auth/phpunit.xml.dist | 16 - .../auth/src/ApplicationDefaultCredentials.php | 173 - .../auth/src/Cache/InvalidArgumentException.php | 24 - .../share/googleapi/google/auth/src/Cache/Item.php | 185 - .../google/auth/src/Cache/MemoryCacheItemPool.php | 155 - .../share/googleapi/google/auth/src/CacheTrait.php | 72 - .../src/Credentials/AppIdentityCredentials.php | 149 - .../google/auth/src/Credentials/GCECredentials.php | 219 - .../google/auth/src/Credentials/IAMCredentials.php | 89 - .../src/Credentials/ServiceAccountCredentials.php | 177 - .../ServiceAccountJwtAccessCredentials.php | 131 - .../src/Credentials/UserRefreshCredentials.php | 110 - .../google/auth/src/CredentialsLoader.php | 163 - .../google/auth/src/FetchAuthTokenCache.php | 108 - .../google/auth/src/FetchAuthTokenInterface.php | 55 - .../auth/src/HttpHandler/Guzzle5HttpHandler.php | 68 - .../auth/src/HttpHandler/Guzzle6HttpHandler.php | 36 - .../auth/src/HttpHandler/HttpHandlerFactory.php | 47 - .../auth/src/Middleware/AuthTokenMiddleware.php | 126 - .../src/Middleware/ScopedAccessTokenMiddleware.php | 175 - .../auth/src/Middleware/SimpleMiddleware.php | 93 - .../share/googleapi/google/auth/src/OAuth2.php | 1306 ----- .../auth/src/Subscriber/AuthTokenSubscriber.php | 118 - .../src/Subscriber/ScopedAccessTokenSubscriber.php | 177 - .../auth/src/Subscriber/SimpleSubscriber.php | 90 - .../tests/ApplicationDefaultCredentialsTest.php | 299 - .../share/googleapi/google/auth/tests/BaseTest.php | 32 - .../googleapi/google/auth/tests/Cache/ItemTest.php | 125 - .../auth/tests/Cache/MemoryCacheItemPoolTest.php | 189 - .../googleapi/google/auth/tests/CacheTraitTest.php | 151 - .../Credentials/AppIndentityCredentialsTest.php | 104 - .../auth/tests/Credentials/GCECredentialsTest.php | 124 - .../auth/tests/Credentials/IAMCredentialsTest.php | 83 - .../Credentials/ServiceAccountCredentialsTest.php | 508 -- .../Credentials/UserRefreshCredentialsTest.php | 228 - .../google/auth/tests/FetchAuthTokenCacheTest.php | 146 - .../google/auth/tests/FetchAuthTokenTest.php | 170 - .../tests/HttpHandler/Guzzle5HttpHandlerTest.php | 59 - .../tests/HttpHandler/Guzzle6HttpHandlerTest.php | 50 - .../tests/HttpHandler/HttpHandlerFactoryTest.php | 39 - .../tests/Middleware/AuthTokenMiddlewareTest.php | 336 -- .../Middleware/ScopedAccessTokenMiddlewareTest.php | 245 - .../auth/tests/Middleware/SimpleMiddlewareTest.php | 41 - .../googleapi/google/auth/tests/OAuth2Test.php | 858 --- .../tests/Subscriber/AuthTokenSubscriberTest.php | 325 -- .../Subscriber/ScopedAccessTokenSubscriberTest.php | 238 - .../auth/tests/Subscriber/SimpleSubscriberTest.php | 69 - .../googleapi/google/auth/tests/bootstrap.php | 55 - .../gcloud/application_default_credentials.json | 7 - .../google/auth/tests/fixtures/private.json | 7 - .../google/auth/tests/fixtures/private.pem | 15 - .../google/auth/tests/fixtures/public.pem | 6 - .../gcloud/application_default_credentials.json | 6 - .../google/auth/tests/fixtures2/private.json | 6 - .../google/auth/tests/mocks/AppIdentityService.php | 19 - .../share/googleapi/guzzlehttp/guzzle/CHANGELOG.md | 1264 ----- .../share/googleapi/guzzlehttp/guzzle/LICENSE | 19 - .../share/googleapi/guzzlehttp/guzzle/README.md | 89 - .../share/googleapi/guzzlehttp/guzzle/UPGRADING.md | 1203 ----- .../googleapi/guzzlehttp/guzzle/composer.json | 44 - .../googleapi/guzzlehttp/guzzle/src/Client.php | 414 -- .../guzzlehttp/guzzle/src/ClientInterface.php | 84 - .../guzzlehttp/guzzle/src/Cookie/CookieJar.php | 314 -- .../guzzle/src/Cookie/CookieJarInterface.php | 84 - .../guzzlehttp/guzzle/src/Cookie/FileCookieJar.php | 90 - .../guzzle/src/Cookie/SessionCookieJar.php | 71 - .../guzzlehttp/guzzle/src/Cookie/SetCookie.php | 404 -- .../guzzle/src/Exception/BadResponseException.php | 27 - .../guzzle/src/Exception/ClientException.php | 7 - .../guzzle/src/Exception/ConnectException.php | 37 - .../guzzle/src/Exception/GuzzleException.php | 4 - .../guzzle/src/Exception/RequestException.php | 217 - .../guzzle/src/Exception/SeekException.php | 27 - .../guzzle/src/Exception/ServerException.php | 7 - .../src/Exception/TooManyRedirectsException.php | 4 - .../guzzle/src/Exception/TransferException.php | 4 - .../guzzlehttp/guzzle/src/Handler/CurlFactory.php | 559 -- .../guzzle/src/Handler/CurlFactoryInterface.php | 27 - .../guzzlehttp/guzzle/src/Handler/CurlHandler.php | 45 - .../guzzle/src/Handler/CurlMultiHandler.php | 197 - .../guzzlehttp/guzzle/src/Handler/EasyHandle.php | 92 - .../guzzlehttp/guzzle/src/Handler/MockHandler.php | 189 - .../guzzlehttp/guzzle/src/Handler/Proxy.php | 55 - .../guzzle/src/Handler/StreamHandler.php | 533 -- .../guzzlehttp/guzzle/src/HandlerStack.php | 273 - .../guzzlehttp/guzzle/src/MessageFormatter.php | 182 - .../googleapi/guzzlehttp/guzzle/src/Middleware.php | 254 - .../share/googleapi/guzzlehttp/guzzle/src/Pool.php | 123 - .../guzzle/src/PrepareBodyMiddleware.php | 106 - .../guzzlehttp/guzzle/src/RedirectMiddleware.php | 237 - .../guzzlehttp/guzzle/src/RequestOptions.php | 255 - .../guzzlehttp/guzzle/src/RetryMiddleware.php | 112 - .../guzzlehttp/guzzle/src/TransferStats.php | 126 - .../guzzlehttp/guzzle/src/UriTemplate.php | 241 - .../googleapi/guzzlehttp/guzzle/src/functions.php | 331 -- .../guzzlehttp/guzzle/src/functions_include.php | 6 - .../googleapi/guzzlehttp/promises/CHANGELOG.md | 65 - .../share/googleapi/guzzlehttp/promises/LICENSE | 19 - .../share/googleapi/guzzlehttp/promises/Makefile | 13 - .../share/googleapi/guzzlehttp/promises/README.md | 504 -- .../googleapi/guzzlehttp/promises/composer.json | 34 - .../guzzlehttp/promises/src/AggregateException.php | 16 - .../promises/src/CancellationException.php | 9 - .../guzzlehttp/promises/src/Coroutine.php | 151 - .../guzzlehttp/promises/src/EachPromise.php | 229 - .../guzzlehttp/promises/src/FulfilledPromise.php | 82 - .../googleapi/guzzlehttp/promises/src/Promise.php | 280 - .../guzzlehttp/promises/src/PromiseInterface.php | 93 - .../guzzlehttp/promises/src/PromisorInterface.php | 15 - .../guzzlehttp/promises/src/RejectedPromise.php | 87 - .../guzzlehttp/promises/src/RejectionException.php | 47 - .../guzzlehttp/promises/src/TaskQueue.php | 66 - .../guzzlehttp/promises/src/TaskQueueInterface.php | 25 - .../guzzlehttp/promises/src/functions.php | 457 -- .../guzzlehttp/promises/src/functions_include.php | 6 - .../share/googleapi/guzzlehttp/psr7/CHANGELOG.md | 110 - .../share/googleapi/guzzlehttp/psr7/LICENSE | 19 - .../share/googleapi/guzzlehttp/psr7/README.md | 739 --- .../share/googleapi/guzzlehttp/psr7/composer.json | 39 - .../googleapi/guzzlehttp/psr7/src/AppendStream.php | 233 - .../googleapi/guzzlehttp/psr7/src/BufferStream.php | 137 - .../guzzlehttp/psr7/src/CachingStream.php | 138 - .../guzzlehttp/psr7/src/DroppingStream.php | 42 - .../googleapi/guzzlehttp/psr7/src/FnStream.php | 149 - .../guzzlehttp/psr7/src/InflateStream.php | 52 - .../guzzlehttp/psr7/src/LazyOpenStream.php | 39 - .../googleapi/guzzlehttp/psr7/src/LimitStream.php | 155 - .../googleapi/guzzlehttp/psr7/src/MessageTrait.php | 183 - .../guzzlehttp/psr7/src/MultipartStream.php | 153 - .../googleapi/guzzlehttp/psr7/src/NoSeekStream.php | 22 - .../googleapi/guzzlehttp/psr7/src/PumpStream.php | 165 - .../googleapi/guzzlehttp/psr7/src/Request.php | 142 - .../googleapi/guzzlehttp/psr7/src/Response.php | 132 - .../guzzlehttp/psr7/src/ServerRequest.php | 358 -- .../share/googleapi/guzzlehttp/psr7/src/Stream.php | 257 - .../guzzlehttp/psr7/src/StreamDecoratorTrait.php | 149 - .../guzzlehttp/psr7/src/StreamWrapper.php | 121 - .../googleapi/guzzlehttp/psr7/src/UploadedFile.php | 316 -- .../share/googleapi/guzzlehttp/psr7/src/Uri.php | 702 --- .../guzzlehttp/psr7/src/UriNormalizer.php | 216 - .../googleapi/guzzlehttp/psr7/src/UriResolver.php | 219 - .../googleapi/guzzlehttp/psr7/src/functions.php | 828 --- .../guzzlehttp/psr7/src/functions_include.php | 6 - .../share/googleapi/monolog/monolog/.php_cs | 59 - .../share/googleapi/monolog/monolog/CHANGELOG.md | 342 -- .../share/googleapi/monolog/monolog/LICENSE | 19 - .../share/googleapi/monolog/monolog/README.md | 95 - .../share/googleapi/monolog/monolog/composer.json | 66 - .../googleapi/monolog/monolog/doc/01-usage.md | 231 - .../doc/02-handlers-formatters-processors.md | 157 - .../googleapi/monolog/monolog/doc/03-utilities.md | 13 - .../googleapi/monolog/monolog/doc/04-extending.md | 76 - .../share/googleapi/monolog/monolog/doc/sockets.md | 39 - .../googleapi/monolog/monolog/phpunit.xml.dist | 19 - .../monolog/monolog/src/Monolog/ErrorHandler.php | 230 - .../src/Monolog/Formatter/ChromePHPFormatter.php | 78 - .../src/Monolog/Formatter/ElasticaFormatter.php | 89 - .../src/Monolog/Formatter/FlowdockFormatter.php | 116 - .../src/Monolog/Formatter/FluentdFormatter.php | 85 - .../src/Monolog/Formatter/FormatterInterface.php | 36 - .../src/Monolog/Formatter/GelfMessageFormatter.php | 138 - .../src/Monolog/Formatter/HtmlFormatter.php | 141 - .../src/Monolog/Formatter/JsonFormatter.php | 208 - .../src/Monolog/Formatter/LineFormatter.php | 179 - .../src/Monolog/Formatter/LogglyFormatter.php | 47 - .../src/Monolog/Formatter/LogstashFormatter.php | 166 - .../src/Monolog/Formatter/MongoDBFormatter.php | 105 - .../src/Monolog/Formatter/NormalizerFormatter.php | 297 - .../src/Monolog/Formatter/ScalarFormatter.php | 48 - .../src/Monolog/Formatter/WildfireFormatter.php | 113 - .../src/Monolog/Handler/AbstractHandler.php | 186 - .../Monolog/Handler/AbstractProcessingHandler.php | 66 - .../src/Monolog/Handler/AbstractSyslogHandler.php | 101 - .../monolog/src/Monolog/Handler/AmqpHandler.php | 148 - .../src/Monolog/Handler/BrowserConsoleHandler.php | 230 - .../monolog/src/Monolog/Handler/BufferHandler.php | 117 - .../src/Monolog/Handler/ChromePHPHandler.php | 211 - .../monolog/src/Monolog/Handler/CouchDBHandler.php | 72 - .../monolog/src/Monolog/Handler/CubeHandler.php | 151 - .../monolog/src/Monolog/Handler/Curl/Util.php | 57 - .../src/Monolog/Handler/DeduplicationHandler.php | 169 - .../src/Monolog/Handler/DoctrineCouchDBHandler.php | 45 - .../src/Monolog/Handler/DynamoDbHandler.php | 107 - .../src/Monolog/Handler/ElasticSearchHandler.php | 128 - .../src/Monolog/Handler/ErrorLogHandler.php | 82 - .../monolog/src/Monolog/Handler/FilterHandler.php | 140 - .../FingersCrossed/ActivationStrategyInterface.php | 28 - .../ChannelLevelActivationStrategy.php | 59 - .../ErrorLevelActivationStrategy.php | 34 - .../src/Monolog/Handler/FingersCrossedHandler.php | 163 - .../monolog/src/Monolog/Handler/FirePHPHandler.php | 195 - .../src/Monolog/Handler/FleepHookHandler.php | 126 - .../src/Monolog/Handler/FlowdockHandler.php | 127 - .../monolog/src/Monolog/Handler/GelfHandler.php | 73 - .../monolog/src/Monolog/Handler/GroupHandler.php | 104 - .../src/Monolog/Handler/HandlerInterface.php | 90 - .../monolog/src/Monolog/Handler/HandlerWrapper.php | 108 - .../monolog/src/Monolog/Handler/HipChatHandler.php | 350 -- .../monolog/src/Monolog/Handler/IFTTTHandler.php | 69 - .../src/Monolog/Handler/LogEntriesHandler.php | 55 - .../monolog/src/Monolog/Handler/LogglyHandler.php | 102 - .../monolog/src/Monolog/Handler/MailHandler.php | 67 - .../src/Monolog/Handler/MandrillHandler.php | 68 - .../Monolog/Handler/MissingExtensionException.php | 21 - .../monolog/src/Monolog/Handler/MongoDBHandler.php | 59 - .../src/Monolog/Handler/NativeMailerHandler.php | 185 - .../src/Monolog/Handler/NewRelicHandler.php | 202 - .../monolog/src/Monolog/Handler/NullHandler.php | 45 - .../src/Monolog/Handler/PHPConsoleHandler.php | 242 - .../monolog/src/Monolog/Handler/PsrHandler.php | 56 - .../src/Monolog/Handler/PushoverHandler.php | 185 - .../monolog/src/Monolog/Handler/RavenHandler.php | 232 - .../monolog/src/Monolog/Handler/RedisHandler.php | 97 - .../monolog/src/Monolog/Handler/RollbarHandler.php | 132 - .../src/Monolog/Handler/RotatingFileHandler.php | 178 - .../src/Monolog/Handler/SamplingHandler.php | 82 - .../src/Monolog/Handler/Slack/SlackRecord.php | 294 - .../monolog/src/Monolog/Handler/SlackHandler.php | 215 - .../src/Monolog/Handler/SlackWebhookHandler.php | 115 - .../src/Monolog/Handler/SlackbotHandler.php | 80 - .../monolog/src/Monolog/Handler/SocketHandler.php | 346 -- .../monolog/src/Monolog/Handler/StreamHandler.php | 176 - .../src/Monolog/Handler/SwiftMailerHandler.php | 99 - .../monolog/src/Monolog/Handler/SyslogHandler.php | 67 - .../src/Monolog/Handler/SyslogUdp/UdpSocket.php | 56 - .../src/Monolog/Handler/SyslogUdpHandler.php | 103 - .../monolog/src/Monolog/Handler/TestHandler.php | 154 - .../Monolog/Handler/WhatFailureGroupHandler.php | 61 - .../src/Monolog/Handler/ZendMonitorHandler.php | 95 - .../monolog/monolog/src/Monolog/Logger.php | 700 --- .../monolog/src/Monolog/Processor/GitProcessor.php | 64 - .../Monolog/Processor/IntrospectionProcessor.php | 112 - .../Monolog/Processor/MemoryPeakUsageProcessor.php | 35 - .../src/Monolog/Processor/MemoryProcessor.php | 63 - .../src/Monolog/Processor/MemoryUsageProcessor.php | 35 - .../src/Monolog/Processor/MercurialProcessor.php | 63 - .../src/Monolog/Processor/ProcessIdProcessor.php | 31 - .../Monolog/Processor/PsrLogMessageProcessor.php | 48 - .../monolog/src/Monolog/Processor/TagProcessor.php | 44 - .../monolog/src/Monolog/Processor/UidProcessor.php | 46 - .../monolog/src/Monolog/Processor/WebProcessor.php | 113 - .../monolog/monolog/src/Monolog/Registry.php | 134 - .../monolog/tests/Monolog/ErrorHandlerTest.php | 31 - .../Monolog/Formatter/ChromePHPFormatterTest.php | 158 - .../Monolog/Formatter/ElasticaFormatterTest.php | 79 - .../Monolog/Formatter/FlowdockFormatterTest.php | 55 - .../Monolog/Formatter/FluentdFormatterTest.php | 62 - .../Monolog/Formatter/GelfMessageFormatterTest.php | 258 - .../tests/Monolog/Formatter/JsonFormatterTest.php | 183 - .../tests/Monolog/Formatter/LineFormatterTest.php | 222 - .../Monolog/Formatter/LogglyFormatterTest.php | 40 - .../Monolog/Formatter/LogstashFormatterTest.php | 333 -- .../Monolog/Formatter/MongoDBFormatterTest.php | 262 - .../Monolog/Formatter/NormalizerFormatterTest.php | 423 -- .../Monolog/Formatter/ScalarFormatterTest.php | 110 - .../Monolog/Formatter/WildfireFormatterTest.php | 142 - .../tests/Monolog/Handler/AbstractHandlerTest.php | 115 - .../Handler/AbstractProcessingHandlerTest.php | 80 - .../tests/Monolog/Handler/AmqpHandlerTest.php | 136 - .../Monolog/Handler/BrowserConsoleHandlerTest.php | 130 - .../tests/Monolog/Handler/BufferHandlerTest.php | 158 - .../tests/Monolog/Handler/ChromePHPHandlerTest.php | 156 - .../tests/Monolog/Handler/CouchDBHandlerTest.php | 31 - .../Monolog/Handler/DeduplicationHandlerTest.php | 165 - .../Monolog/Handler/DoctrineCouchDBHandlerTest.php | 52 - .../tests/Monolog/Handler/DynamoDbHandlerTest.php | 82 - .../Monolog/Handler/ElasticSearchHandlerTest.php | 239 - .../tests/Monolog/Handler/ErrorLogHandlerTest.php | 66 - .../tests/Monolog/Handler/FilterHandlerTest.php | 170 - .../Monolog/Handler/FingersCrossedHandlerTest.php | 279 - .../tests/Monolog/Handler/FirePHPHandlerTest.php | 96 - .../tests/Monolog/Handler/Fixtures/.gitkeep | 0 .../tests/Monolog/Handler/FleepHookHandlerTest.php | 85 - .../tests/Monolog/Handler/FlowdockHandlerTest.php | 88 - .../Monolog/Handler/GelfHandlerLegacyTest.php | 95 - .../tests/Monolog/Handler/GelfHandlerTest.php | 117 - .../Monolog/Handler/GelfMockMessagePublisher.php | 25 - .../tests/Monolog/Handler/GroupHandlerTest.php | 112 - .../tests/Monolog/Handler/HandlerWrapperTest.php | 130 - .../tests/Monolog/Handler/HipChatHandlerTest.php | 279 - .../Monolog/Handler/LogEntriesHandlerTest.php | 84 - .../tests/Monolog/Handler/MailHandlerTest.php | 75 - .../tests/Monolog/Handler/MockRavenClient.php | 27 - .../tests/Monolog/Handler/MongoDBHandlerTest.php | 65 - .../Monolog/Handler/NativeMailerHandlerTest.php | 111 - .../tests/Monolog/Handler/NewRelicHandlerTest.php | 200 - .../tests/Monolog/Handler/NullHandlerTest.php | 33 - .../Monolog/Handler/PHPConsoleHandlerTest.php | 273 - .../tests/Monolog/Handler/PsrHandlerTest.php | 50 - .../tests/Monolog/Handler/PushoverHandlerTest.php | 141 - .../tests/Monolog/Handler/RavenHandlerTest.php | 255 - .../tests/Monolog/Handler/RedisHandlerTest.php | 127 - .../tests/Monolog/Handler/RollbarHandlerTest.php | 84 - .../Monolog/Handler/RotatingFileHandlerTest.php | 211 - .../tests/Monolog/Handler/SamplingHandlerTest.php | 33 - .../Monolog/Handler/Slack/SlackRecordTest.php | 387 -- .../tests/Monolog/Handler/SlackHandlerTest.php | 155 - .../Monolog/Handler/SlackWebhookHandlerTest.php | 107 - .../tests/Monolog/Handler/SlackbotHandlerTest.php | 47 - .../tests/Monolog/Handler/SocketHandlerTest.php | 309 -- .../tests/Monolog/Handler/StreamHandlerTest.php | 184 - .../Monolog/Handler/SwiftMailerHandlerTest.php | 113 - .../tests/Monolog/Handler/SyslogHandlerTest.php | 44 - .../tests/Monolog/Handler/SyslogUdpHandlerTest.php | 76 - .../tests/Monolog/Handler/TestHandlerTest.php | 70 - .../tests/Monolog/Handler/UdpSocketTest.php | 64 - .../Handler/WhatFailureGroupHandlerTest.php | 121 - .../Monolog/Handler/ZendMonitorHandlerTest.php | 69 - .../monolog/monolog/tests/Monolog/LoggerTest.php | 548 -- .../tests/Monolog/Processor/GitProcessorTest.php | 29 - .../Processor/IntrospectionProcessorTest.php | 123 - .../Processor/MemoryPeakUsageProcessorTest.php | 42 - .../Monolog/Processor/MemoryUsageProcessorTest.php | 42 - .../Monolog/Processor/MercurialProcessorTest.php | 41 - .../Monolog/Processor/ProcessIdProcessorTest.php | 30 - .../Processor/PsrLogMessageProcessorTest.php | 43 - .../tests/Monolog/Processor/TagProcessorTest.php | 49 - .../tests/Monolog/Processor/UidProcessorTest.php | 33 - .../tests/Monolog/Processor/WebProcessorTest.php | 113 - .../monolog/tests/Monolog/PsrLogCompatTest.php | 47 - .../monolog/monolog/tests/Monolog/RegistryTest.php | 153 - .../monolog/monolog/tests/Monolog/TestCase.php | 58 - .../share/googleapi/phpseclib/phpseclib/AUTHORS | 6 - .../share/googleapi/phpseclib/phpseclib/LICENSE | 21 - .../share/googleapi/phpseclib/phpseclib/README.md | 74 - .../googleapi/phpseclib/phpseclib/composer.json | 76 - .../googleapi/phpseclib/phpseclib/composer.lock | 1819 ------- .../phpseclib/phpseclib/phpseclib/Crypt/AES.php | 126 - .../phpseclib/phpseclib/phpseclib/Crypt/Base.php | 2553 --------- .../phpseclib/phpseclib/Crypt/Blowfish.php | 577 -- .../phpseclib/phpseclib/phpseclib/Crypt/DES.php | 1443 ----- .../phpseclib/phpseclib/phpseclib/Crypt/Hash.php | 824 --- .../phpseclib/phpseclib/phpseclib/Crypt/RC2.php | 688 --- .../phpseclib/phpseclib/phpseclib/Crypt/RC4.php | 342 -- .../phpseclib/phpseclib/phpseclib/Crypt/RSA.php | 3053 ----------- .../phpseclib/phpseclib/phpseclib/Crypt/Random.php | 270 - .../phpseclib/phpseclib/Crypt/Rijndael.php | 936 ---- .../phpseclib/phpseclib/Crypt/TripleDES.php | 460 -- .../phpseclib/phpseclib/Crypt/Twofish.php | 808 --- .../phpseclib/phpseclib/phpseclib/File/ANSI.php | 574 -- .../phpseclib/phpseclib/phpseclib/File/ASN1.php | 1323 ----- .../phpseclib/phpseclib/File/ASN1/Element.php | 47 - .../phpseclib/phpseclib/phpseclib/File/X509.php | 4823 ----------------- .../phpseclib/phpseclib/Math/BigInteger.php | 3755 ------------- .../phpseclib/phpseclib/phpseclib/Net/SCP.php | 337 -- .../phpseclib/phpseclib/phpseclib/Net/SFTP.php | 3063 ----------- .../phpseclib/phpseclib/Net/SFTP/Stream.php | 795 --- .../phpseclib/phpseclib/phpseclib/Net/SSH1.php | 1642 ------ .../phpseclib/phpseclib/phpseclib/Net/SSH2.php | 4397 --------------- .../phpseclib/phpseclib/System/SSH/Agent.php | 308 -- .../phpseclib/System/SSH/Agent/Identity.php | 158 - .../phpseclib/phpseclib/phpseclib/bootstrap.php | 16 - .../phpseclib/phpseclib/phpseclib/openssl.cnf | 6 - .../include/share/googleapi/psr/cache/CHANGELOG.md | 16 - .../include/share/googleapi/psr/cache/LICENSE.txt | 19 - .../include/share/googleapi/psr/cache/README.md | 9 - .../share/googleapi/psr/cache/composer.json | 25 - .../googleapi/psr/cache/src/CacheException.php | 10 - .../googleapi/psr/cache/src/CacheItemInterface.php | 105 - .../psr/cache/src/CacheItemPoolInterface.php | 138 - .../psr/cache/src/InvalidArgumentException.php | 13 - .../share/googleapi/psr/http-message/CHANGELOG.md | 36 - .../share/googleapi/psr/http-message/LICENSE | 19 - .../share/googleapi/psr/http-message/README.md | 13 - .../share/googleapi/psr/http-message/composer.json | 26 - .../psr/http-message/src/MessageInterface.php | 187 - .../psr/http-message/src/RequestInterface.php | 129 - .../psr/http-message/src/ResponseInterface.php | 68 - .../http-message/src/ServerRequestInterface.php | 261 - .../psr/http-message/src/StreamInterface.php | 158 - .../psr/http-message/src/UploadedFileInterface.php | 123 - .../psr/http-message/src/UriInterface.php | 323 -- .../www/include/share/googleapi/psr/log/.gitignore | 1 - .../www/include/share/googleapi/psr/log/LICENSE | 19 - .../googleapi/psr/log/Psr/Log/AbstractLogger.php | 128 - .../psr/log/Psr/Log/InvalidArgumentException.php | 7 - .../share/googleapi/psr/log/Psr/Log/LogLevel.php | 18 - .../psr/log/Psr/Log/LoggerAwareInterface.php | 18 - .../googleapi/psr/log/Psr/Log/LoggerAwareTrait.php | 26 - .../googleapi/psr/log/Psr/Log/LoggerInterface.php | 123 - .../googleapi/psr/log/Psr/Log/LoggerTrait.php | 140 - .../share/googleapi/psr/log/Psr/Log/NullLogger.php | 28 - .../psr/log/Psr/Log/Test/LoggerInterfaceTest.php | 140 - .../www/include/share/googleapi/psr/log/README.md | 45 - .../include/share/googleapi/psr/log/composer.json | 26 - mayor-orig/www/include/share/net/class.smtp.php | 1152 ---- mayor-orig/www/include/share/net/facebook.php | 70 - mayor-orig/www/include/share/net/googleapi.php | 65 - mayor-orig/www/include/share/net/phpmailer.php | 3552 ------------ mayor-orig/www/include/share/net/rest.php | 188 - mayor-orig/www/include/share/net/upload.php | 58 - mayor-orig/www/include/share/print/pdf.php | 270 - .../www/include/share/session/accountInfo.php | 39 - mayor-orig/www/include/share/session/attrs.php | 63 - mayor-orig/www/include/share/session/base.php | 173 - mayor-orig/www/include/share/session/close.php | 98 - mayor-orig/www/include/share/ssl/ssl.php | 461 -- mayor-orig/www/include/share/str/hyphen.php | 104 - mayor-orig/www/include/share/str/tex.php | 51 - 5892 files changed, 541304 deletions(-) delete mode 100644 mayor-orig/www/include/alert/base.php delete mode 100644 mayor-orig/www/include/alert/hu_HU/base.php delete mode 100644 mayor-orig/www/include/alert/hu_HU/file.php delete mode 100644 mayor-orig/www/include/alert/hu_HU/ldap.php delete mode 100644 mayor-orig/www/include/alert/hu_HU/module-auth.php delete mode 100644 mayor-orig/www/include/alert/hu_HU/module-naplo.php delete mode 100644 mayor-orig/www/include/alert/hu_HU/module-password.php delete mode 100644 mayor-orig/www/include/alert/hu_HU/module-session.php delete mode 100644 mayor-orig/www/include/backend/ads/auth/login.php delete mode 100644 mayor-orig/www/include/backend/ads/base/attrs.php delete mode 100644 mayor-orig/www/include/backend/ads/password/changePassword.php delete mode 100644 mayor-orig/www/include/backend/ads/session/accountInfo.php delete mode 100644 mayor-orig/www/include/backend/ads/session/base.php delete mode 100644 mayor-orig/www/include/backend/ads/session/createAccount.php delete mode 100644 mayor-orig/www/include/backend/ads/session/createGroup.php delete mode 100644 mayor-orig/www/include/backend/ads/session/search/searchAccount.php delete mode 100644 mayor-orig/www/include/backend/file/auth/login.php delete mode 100644 mayor-orig/www/include/backend/file/session/base.php delete mode 100644 mayor-orig/www/include/backend/ldap-ng/auth/login.php delete mode 100644 mayor-orig/www/include/backend/ldap-ng/base/attrs.php delete mode 100644 mayor-orig/www/include/backend/ldap-ng/password/changePassword.php delete mode 100644 mayor-orig/www/include/backend/ldap-ng/session/accountInfo.php delete mode 100644 mayor-orig/www/include/backend/ldap-ng/session/base.php delete mode 100644 mayor-orig/www/include/backend/ldap-ng/session/createAccount.php delete mode 100644 mayor-orig/www/include/backend/ldap-ng/session/createGroup.php delete mode 100644 mayor-orig/www/include/backend/ldap-ng/session/search/searchAccount.php delete mode 100644 mayor-orig/www/include/backend/ldap/auth/login.php delete mode 100644 mayor-orig/www/include/backend/ldap/base/attrs.php delete mode 100644 mayor-orig/www/include/backend/ldap/base/attrs.php.orig delete mode 100644 mayor-orig/www/include/backend/ldap/base/str.php delete mode 100644 mayor-orig/www/include/backend/ldap/password/changePassword.php delete mode 100644 mayor-orig/www/include/backend/ldap/session/accountInfo.php delete mode 100644 mayor-orig/www/include/backend/ldap/session/base.php delete mode 100644 mayor-orig/www/include/backend/ldap/session/createAccount.php delete mode 100644 mayor-orig/www/include/backend/ldap/session/createGroup.php delete mode 100644 mayor-orig/www/include/backend/ldap/session/search/searchAccount.php delete mode 100644 mayor-orig/www/include/backend/ldapng/auth/login.php delete mode 100644 mayor-orig/www/include/backend/ldapng/base/attrs.php delete mode 100644 mayor-orig/www/include/backend/ldapng/password/changePassword.php delete mode 100644 mayor-orig/www/include/backend/ldapng/session/accountInfo.php delete mode 100644 mayor-orig/www/include/backend/ldapng/session/base.php delete mode 100644 mayor-orig/www/include/backend/ldapng/session/createAccount.php delete mode 100644 mayor-orig/www/include/backend/ldapng/session/createGroup.php delete mode 100644 mayor-orig/www/include/backend/ldapng/session/search/searchAccount.php delete mode 100644 mayor-orig/www/include/backend/mysql/auth/login.php delete mode 100644 mayor-orig/www/include/backend/mysql/base/attrs.php delete mode 100644 mayor-orig/www/include/backend/mysql/password/changePassword.php delete mode 100644 mayor-orig/www/include/backend/mysql/session/accountInfo.php delete mode 100644 mayor-orig/www/include/backend/mysql/session/base.php delete mode 100644 mayor-orig/www/include/backend/mysql/session/createAccount.php delete mode 100644 mayor-orig/www/include/backend/mysql/session/createGroup.php delete mode 100644 mayor-orig/www/include/backend/mysql/session/search/searchAccount.php delete mode 100644 mayor-orig/www/include/base/base.php delete mode 100644 mayor-orig/www/include/base/cache.php delete mode 100644 mayor-orig/www/include/base/config.php delete mode 100644 mayor-orig/www/include/base/error.php delete mode 100644 mayor-orig/www/include/base/log.php delete mode 100644 mayor-orig/www/include/base/login.php delete mode 100644 mayor-orig/www/include/base/mysql.php delete mode 100644 mayor-orig/www/include/base/rights.php delete mode 100644 mayor-orig/www/include/base/str.php delete mode 100644 mayor-orig/www/include/base/var.php delete mode 100644 mayor-orig/www/include/menu/base.php delete mode 100644 mayor-orig/www/include/menu/parent/hu_HU/base.php delete mode 100644 mayor-orig/www/include/menu/parent/hu_HU/module-naplo.php delete mode 100644 mayor-orig/www/include/menu/parent/hu_HU/module-portal.php delete mode 100644 mayor-orig/www/include/menu/private/hu_HU/base.php delete mode 100644 mayor-orig/www/include/menu/private/hu_HU/module-naplo.php delete mode 100644 mayor-orig/www/include/menu/private/hu_HU/module-portal.php delete mode 100644 mayor-orig/www/include/menu/public/hu_HU/base.php delete mode 100644 mayor-orig/www/include/menu/public/hu_HU/module-naplo.php delete mode 100644 mayor-orig/www/include/menu/public/hu_HU/module-portal.php delete mode 100644 mayor-orig/www/include/modules/auth/base/forgotten.php delete mode 100644 mayor-orig/www/include/modules/auth/base/login.php delete mode 100644 mayor-orig/www/include/modules/auth/base/token.php delete mode 100644 mayor-orig/www/include/modules/naplo/admin/azonositok.php delete mode 100644 mayor-orig/www/include/modules/naplo/admin/checksql.php delete mode 100644 mayor-orig/www/include/modules/naplo/admin/intezmenyek.php delete mode 100644 mayor-orig/www/include/modules/naplo/admin/szemeszterek.php delete mode 100644 mayor-orig/www/include/modules/naplo/admin/szuloiAzonositok.php delete mode 100644 mayor-orig/www/include/modules/naplo/admin/tanevek.php delete mode 100644 mayor-orig/www/include/modules/naplo/admin/tankorok.php delete mode 100644 mayor-orig/www/include/modules/naplo/base/base.php delete mode 100644 mayor-orig/www/include/modules/naplo/base/log.php delete mode 100644 mayor-orig/www/include/modules/naplo/base/rights.php delete mode 100644 mayor-orig/www/include/modules/naplo/base/tool.php delete mode 100644 mayor-orig/www/include/modules/naplo/base/update.php delete mode 100644 mayor-orig/www/include/modules/naplo/base/zcheck.php delete mode 100644 mayor-orig/www/include/modules/naplo/bejegyzesek/bejegyzesTipus.php delete mode 100644 mayor-orig/www/include/modules/naplo/bejegyzesek/bejegyzesek.php delete mode 100644 mayor-orig/www/include/modules/naplo/diakValaszto.php delete mode 100644 mayor-orig/www/include/modules/naplo/ertekeles/kerdoivBetoltes.php delete mode 100644 mayor-orig/www/include/modules/naplo/ertekeles/osszesites.php delete mode 100644 mayor-orig/www/include/modules/naplo/export/bizonyitvany.php delete mode 100644 mayor-orig/www/include/modules/naplo/export/diakExport.php delete mode 100644 mayor-orig/www/include/modules/naplo/export/kirBizonyitvanyExport.php delete mode 100644 mayor-orig/www/include/modules/naplo/export/kreta.php delete mode 100644 mayor-orig/www/include/modules/naplo/export/sulix.php delete mode 100644 mayor-orig/www/include/modules/naplo/export/tanarOsztalyOraszam.php delete mode 100644 mayor-orig/www/include/modules/naplo/export/tantargyFelosztas.php delete mode 100644 mayor-orig/www/include/modules/naplo/haladasi/elmaradas.php delete mode 100644 mayor-orig/www/include/modules/naplo/haladasi/elszamolas.php delete mode 100644 mayor-orig/www/include/modules/naplo/haladasi/haladasi.php delete mode 100644 mayor-orig/www/include/modules/naplo/haladasi/helyettesites.php delete mode 100644 mayor-orig/www/include/modules/naplo/haladasi/oralatogatas.php delete mode 100644 mayor-orig/www/include/modules/naplo/haladasi/osszevonas.php delete mode 100644 mayor-orig/www/include/modules/naplo/haladasi/pluszora.php delete mode 100644 mayor-orig/www/include/modules/naplo/haladasi/specialis.php delete mode 100644 mayor-orig/www/include/modules/naplo/haladasi/stat.php delete mode 100644 mayor-orig/www/include/modules/naplo/haladasi/teremModositas.php delete mode 100644 mayor-orig/www/include/modules/naplo/hianyzas/diak.php delete mode 100644 mayor-orig/www/include/modules/naplo/hianyzas/oktstat.php delete mode 100644 mayor-orig/www/include/modules/naplo/hianyzas/ora.php delete mode 100644 mayor-orig/www/include/modules/naplo/hianyzas/osztaly.php delete mode 100644 mayor-orig/www/include/modules/naplo/hibabejelento/admin.php delete mode 100644 mayor-orig/www/include/modules/naplo/hibabejelento/hibabejelento.php delete mode 100644 mayor-orig/www/include/modules/naplo/intezmeny/diakExport.php delete mode 100644 mayor-orig/www/include/modules/naplo/intezmeny/diakFelmentes.php delete mode 100644 mayor-orig/www/include/modules/naplo/intezmeny/diakStatusz.php delete mode 100644 mayor-orig/www/include/modules/naplo/intezmeny/diakSzulo.php delete mode 100644 mayor-orig/www/include/modules/naplo/intezmeny/diakTankorJelentkezes.php delete mode 100644 mayor-orig/www/include/modules/naplo/intezmeny/kepzes.php delete mode 100644 mayor-orig/www/include/modules/naplo/intezmeny/kepzesOraterv.php delete mode 100644 mayor-orig/www/include/modules/naplo/intezmeny/munkakozosseg.php delete mode 100644 mayor-orig/www/include/modules/naplo/intezmeny/osztaly.php delete mode 100644 mayor-orig/www/include/modules/naplo/intezmeny/tanar.php delete mode 100644 mayor-orig/www/include/modules/naplo/intezmeny/tankor.php delete mode 100644 mayor-orig/www/include/modules/naplo/intezmeny/tankorSzemeszter.php delete mode 100644 mayor-orig/www/include/modules/naplo/intezmeny/tankorTanar.php delete mode 100644 mayor-orig/www/include/modules/naplo/intezmeny/tankorTanarHozzarendeles.php delete mode 100644 mayor-orig/www/include/modules/naplo/intezmeny/terem.php delete mode 100644 mayor-orig/www/include/modules/naplo/intezmeny/tovabbkepzes.php delete mode 100644 mayor-orig/www/include/modules/naplo/intezmeny/valtas.php delete mode 100644 mayor-orig/www/include/modules/naplo/koszi/esemenyAdmin.php delete mode 100644 mayor-orig/www/include/modules/naplo/koszi/koszi.php delete mode 100644 mayor-orig/www/include/modules/naplo/koszi/kosziAdmin.php delete mode 100644 mayor-orig/www/include/modules/naplo/naplo.php delete mode 100644 mayor-orig/www/include/modules/naplo/nyomtatas/beiskolazasiTerv.php delete mode 100644 mayor-orig/www/include/modules/naplo/nyomtatas/bizonyitvanyNyomtatas.php delete mode 100644 mayor-orig/www/include/modules/naplo/nyomtatas/diakAdatlap.php delete mode 100644 mayor-orig/www/include/modules/naplo/nyomtatas/diakTankorJelentkezes.php delete mode 100644 mayor-orig/www/include/modules/naplo/nyomtatas/ertesito.php delete mode 100644 mayor-orig/www/include/modules/naplo/nyomtatas/haladasinaplo.php delete mode 100644 mayor-orig/www/include/modules/naplo/nyomtatas/helyettesitesinaplo.php delete mode 100644 mayor-orig/www/include/modules/naplo/nyomtatas/nyomtatas.php delete mode 100644 mayor-orig/www/include/modules/naplo/nyomtatas/osztalyozonaplo.php delete mode 100644 mayor-orig/www/include/modules/naplo/nyomtatas/sniEvVegiJegyzokonyv.php delete mode 100644 mayor-orig/www/include/modules/naplo/nyomtatas/sniHaviJegyzokonyv.php delete mode 100644 mayor-orig/www/include/modules/naplo/nyomtatas/szovegesErtekeles.php delete mode 100644 mayor-orig/www/include/modules/naplo/nyomtatas/tankorNaplohozRendeles.php delete mode 100644 mayor-orig/www/include/modules/naplo/nyomtatas/tex.php delete mode 100644 mayor-orig/www/include/modules/naplo/nyomtatas/torzslap.php delete mode 100644 mayor-orig/www/include/modules/naplo/nyomtatas/tovabbkepzesHatarozat.php delete mode 100644 mayor-orig/www/include/modules/naplo/nyomtatas/zaradekok.php delete mode 100644 mayor-orig/www/include/modules/naplo/orarend/ascExport.php delete mode 100644 mayor-orig/www/include/modules/naplo/orarend/convert-Microsoft Excel XML.php delete mode 100644 mayor-orig/www/include/modules/naplo/orarend/convert-RoPaSoft.php delete mode 100644 mayor-orig/www/include/modules/naplo/orarend/convert-aSc Timetables Ctrl-Shift-E.php delete mode 100644 "mayor-orig/www/include/modules/naplo/orarend/convert-aSc Timetables XML (tank\303\266r n\303\251lk\303\274l).php" delete mode 100644 mayor-orig/www/include/modules/naplo/orarend/convert-aSc Timetables XML update.php delete mode 100644 mayor-orig/www/include/modules/naplo/orarend/convert-aSc Timetables XML.php delete mode 100644 mayor-orig/www/include/modules/naplo/orarend/convert-csv.php delete mode 100644 mayor-orig/www/include/modules/naplo/orarend/convert-default.php delete mode 100644 "mayor-orig/www/include/modules/naplo/orarend/convert-eKr\303\251ta import.php" delete mode 100644 mayor-orig/www/include/modules/naplo/orarend/orarendBetolto.php delete mode 100644 mayor-orig/www/include/modules/naplo/orarend/orarendEllenorzes.php delete mode 100644 mayor-orig/www/include/modules/naplo/orarend/orarendModosito.php delete mode 100644 mayor-orig/www/include/modules/naplo/orarend/orarendTankor.php delete mode 100644 mayor-orig/www/include/modules/naplo/orarend/orarendTeremModositas.php delete mode 100644 mayor-orig/www/include/modules/naplo/orarend/tanarOrarend.php delete mode 100644 mayor-orig/www/include/modules/naplo/osztalyozo/bizonyitvany.php delete mode 100644 mayor-orig/www/include/modules/naplo/osztalyozo/diak.php delete mode 100644 mayor-orig/www/include/modules/naplo/osztalyozo/dolgozat.php delete mode 100644 mayor-orig/www/include/modules/naplo/osztalyozo/stat.php delete mode 100644 mayor-orig/www/include/modules/naplo/osztalyozo/szempontRendszer.php delete mode 100644 mayor-orig/www/include/modules/naplo/osztalyozo/szovegesErtekeles.php delete mode 100644 mayor-orig/www/include/modules/naplo/osztalyozo/tankor.php delete mode 100644 mayor-orig/www/include/modules/naplo/osztalyozo/targySorrend.php delete mode 100644 mayor-orig/www/include/modules/naplo/osztalyozo/vizsga.php delete mode 100644 mayor-orig/www/include/modules/naplo/share/bejegyzes.php delete mode 100644 mayor-orig/www/include/modules/naplo/share/bejegyzesModifier.php delete mode 100644 mayor-orig/www/include/modules/naplo/share/bontas.php delete mode 100644 mayor-orig/www/include/modules/naplo/share/diak.php delete mode 100644 mayor-orig/www/include/modules/naplo/share/diakModifier.php delete mode 100644 mayor-orig/www/include/modules/naplo/share/dolgozat.php delete mode 100644 mayor-orig/www/include/modules/naplo/share/ertekeles.php delete mode 100644 mayor-orig/www/include/modules/naplo/share/esemeny.php delete mode 100644 mayor-orig/www/include/modules/naplo/share/file.php delete mode 100644 mayor-orig/www/include/modules/naplo/share/helyettesites.php delete mode 100644 mayor-orig/www/include/modules/naplo/share/helyettesitesModifier.php delete mode 100644 mayor-orig/www/include/modules/naplo/share/hetes.php delete mode 100644 mayor-orig/www/include/modules/naplo/share/hianyzas.php delete mode 100644 mayor-orig/www/include/modules/naplo/share/hianyzasModifier.php delete mode 100644 mayor-orig/www/include/modules/naplo/share/hirnok.php delete mode 100644 mayor-orig/www/include/modules/naplo/share/intezmenyek.php delete mode 100644 mayor-orig/www/include/modules/naplo/share/jegy.php delete mode 100644 mayor-orig/www/include/modules/naplo/share/jegyModifier.php delete mode 100644 mayor-orig/www/include/modules/naplo/share/jegyzet.php delete mode 100644 mayor-orig/www/include/modules/naplo/share/kepesites.php delete mode 100644 mayor-orig/www/include/modules/naplo/share/kepzes.php delete mode 100644 mayor-orig/www/include/modules/naplo/share/kerdoiv.php delete mode 100644 mayor-orig/www/include/modules/naplo/share/kerelem.php delete mode 100644 mayor-orig/www/include/modules/naplo/share/kereso.php delete mode 100644 mayor-orig/www/include/modules/naplo/share/koszi.php delete mode 100644 mayor-orig/www/include/modules/naplo/share/munkakozosseg.php delete mode 100644 mayor-orig/www/include/modules/naplo/share/mysql.php delete mode 100644 mayor-orig/www/include/modules/naplo/share/nap.php delete mode 100644 mayor-orig/www/include/modules/naplo/share/ora.php delete mode 100644 mayor-orig/www/include/modules/naplo/share/oraModifier.php delete mode 100644 mayor-orig/www/include/modules/naplo/share/orarend.php delete mode 100644 mayor-orig/www/include/modules/naplo/share/osztaly.php delete mode 100644 mayor-orig/www/include/modules/naplo/share/osztalyModifier.php delete mode 100644 mayor-orig/www/include/modules/naplo/share/osztalyzatok.php delete mode 100644 mayor-orig/www/include/modules/naplo/share/rpc.php delete mode 100644 mayor-orig/www/include/modules/naplo/share/sni.php delete mode 100644 mayor-orig/www/include/modules/naplo/share/szemeszter.php delete mode 100644 mayor-orig/www/include/modules/naplo/share/szovegesErtekeles.php delete mode 100644 mayor-orig/www/include/modules/naplo/share/szulo.php delete mode 100644 mayor-orig/www/include/modules/naplo/share/tanar.php delete mode 100644 mayor-orig/www/include/modules/naplo/share/tanarModifier.php delete mode 100644 mayor-orig/www/include/modules/naplo/share/tankor.php delete mode 100644 mayor-orig/www/include/modules/naplo/share/tankorBlokk.php delete mode 100644 mayor-orig/www/include/modules/naplo/share/tankorDiakModifier.php delete mode 100644 mayor-orig/www/include/modules/naplo/share/tankorModifier.php delete mode 100644 mayor-orig/www/include/modules/naplo/share/tanmenet.php delete mode 100644 mayor-orig/www/include/modules/naplo/share/targy.php delete mode 100644 mayor-orig/www/include/modules/naplo/share/terem.php delete mode 100644 mayor-orig/www/include/modules/naplo/share/verseny.php delete mode 100644 mayor-orig/www/include/modules/naplo/share/vizsga.php delete mode 100644 mayor-orig/www/include/modules/naplo/share/zaradek.php delete mode 100644 mayor-orig/www/include/modules/naplo/share/zaroJegyModifier.php delete mode 100644 mayor-orig/www/include/modules/naplo/sni/diakAllapot.php delete mode 100644 mayor-orig/www/include/modules/naplo/sni/fejlesztesiTerv.php delete mode 100644 mayor-orig/www/include/modules/naplo/sni/tantargyiFeljegyzesek.php delete mode 100644 mayor-orig/www/include/modules/naplo/stat/lemorzsolodas.php delete mode 100644 mayor-orig/www/include/modules/naplo/stat/tantargyFelosztas.php delete mode 100644 mayor-orig/www/include/modules/naplo/tanev/checkStatus.php delete mode 100644 mayor-orig/www/include/modules/naplo/tanev/fogadoOra.php delete mode 100644 mayor-orig/www/include/modules/naplo/tanev/munkaterv.php delete mode 100644 mayor-orig/www/include/modules/naplo/tanev/tankorBlokk.php delete mode 100644 mayor-orig/www/include/modules/naplo/tanev/tankorCsoport.php delete mode 100644 mayor-orig/www/include/modules/naplo/tanev/targyBontas.php delete mode 100644 mayor-orig/www/include/modules/naplo/tanev/targyOraszam.php delete mode 100644 mayor-orig/www/include/modules/naplo/tanev/vegzosOrarendLezaras.php delete mode 100644 mayor-orig/www/include/modules/naplo/uzeno/uzeno.php delete mode 100644 mayor-orig/www/include/modules/password/base/changePassword.php delete mode 100644 mayor-orig/www/include/modules/portal/base/rights.php delete mode 100644 mayor-orig/www/include/modules/portal/hirek/egyhir.php delete mode 100644 mayor-orig/www/include/modules/portal/kerdoiv/kerdoivAdmin.php delete mode 100644 mayor-orig/www/include/modules/portal/share/hirek.php delete mode 100644 mayor-orig/www/include/modules/portal/share/kerdoiv.php delete mode 100644 mayor-orig/www/include/modules/portal/share/nevnap.php delete mode 100644 mayor-orig/www/include/modules/session/accountInfo.php delete mode 100644 mayor-orig/www/include/modules/session/base/base.php delete mode 100644 mayor-orig/www/include/modules/session/createAccount.php delete mode 100644 mayor-orig/www/include/modules/session/createGroup.php delete mode 100644 mayor-orig/www/include/modules/session/download.php delete mode 100644 mayor-orig/www/include/modules/session/groupInfo.php delete mode 100644 mayor-orig/www/include/modules/session/search/searchAccount.php delete mode 100644 mayor-orig/www/include/modules/session/search/searchGroup.php delete mode 100644 mayor-orig/www/include/modules/session/sessionAdmin.php delete mode 100644 mayor-orig/www/include/share/auth/base.php delete mode 100644 mayor-orig/www/include/share/date/names.php delete mode 100644 mayor-orig/www/include/share/facebook/Authentication/AccessToken.php delete mode 100644 mayor-orig/www/include/share/facebook/Authentication/AccessTokenMetadata.php delete mode 100644 mayor-orig/www/include/share/facebook/Authentication/OAuth2Client.php delete mode 100644 mayor-orig/www/include/share/facebook/Exceptions/FacebookAuthenticationException.php delete mode 100644 mayor-orig/www/include/share/facebook/Exceptions/FacebookAuthorizationException.php delete mode 100644 mayor-orig/www/include/share/facebook/Exceptions/FacebookClientException.php delete mode 100644 mayor-orig/www/include/share/facebook/Exceptions/FacebookOtherException.php delete mode 100644 mayor-orig/www/include/share/facebook/Exceptions/FacebookResponseException.php delete mode 100644 mayor-orig/www/include/share/facebook/Exceptions/FacebookResumableUploadException.php delete mode 100644 mayor-orig/www/include/share/facebook/Exceptions/FacebookSDKException.php delete mode 100644 mayor-orig/www/include/share/facebook/Exceptions/FacebookServerException.php delete mode 100644 mayor-orig/www/include/share/facebook/Exceptions/FacebookThrottleException.php delete mode 100644 mayor-orig/www/include/share/facebook/Facebook.php delete mode 100644 mayor-orig/www/include/share/facebook/FacebookApp.php delete mode 100644 mayor-orig/www/include/share/facebook/FacebookBatchRequest.php delete mode 100644 mayor-orig/www/include/share/facebook/FacebookBatchResponse.php delete mode 100644 mayor-orig/www/include/share/facebook/FacebookClient.php delete mode 100644 mayor-orig/www/include/share/facebook/FacebookRequest.php delete mode 100644 mayor-orig/www/include/share/facebook/FacebookResponse.php delete mode 100644 mayor-orig/www/include/share/facebook/FileUpload/FacebookFile.php delete mode 100644 mayor-orig/www/include/share/facebook/FileUpload/FacebookResumableUploader.php delete mode 100644 mayor-orig/www/include/share/facebook/FileUpload/FacebookTransferChunk.php delete mode 100644 mayor-orig/www/include/share/facebook/FileUpload/FacebookVideo.php delete mode 100644 mayor-orig/www/include/share/facebook/FileUpload/Mimetypes.php delete mode 100644 mayor-orig/www/include/share/facebook/GraphNodes/Birthday.php delete mode 100644 mayor-orig/www/include/share/facebook/GraphNodes/Collection.php delete mode 100644 mayor-orig/www/include/share/facebook/GraphNodes/GraphAchievement.php delete mode 100644 mayor-orig/www/include/share/facebook/GraphNodes/GraphAlbum.php delete mode 100644 mayor-orig/www/include/share/facebook/GraphNodes/GraphApplication.php delete mode 100644 mayor-orig/www/include/share/facebook/GraphNodes/GraphCoverPhoto.php delete mode 100644 mayor-orig/www/include/share/facebook/GraphNodes/GraphEdge.php delete mode 100644 mayor-orig/www/include/share/facebook/GraphNodes/GraphEvent.php delete mode 100644 mayor-orig/www/include/share/facebook/GraphNodes/GraphGroup.php delete mode 100644 mayor-orig/www/include/share/facebook/GraphNodes/GraphList.php delete mode 100644 mayor-orig/www/include/share/facebook/GraphNodes/GraphLocation.php delete mode 100644 mayor-orig/www/include/share/facebook/GraphNodes/GraphNode.php delete mode 100644 mayor-orig/www/include/share/facebook/GraphNodes/GraphNodeFactory.php delete mode 100644 mayor-orig/www/include/share/facebook/GraphNodes/GraphObject.php delete mode 100644 mayor-orig/www/include/share/facebook/GraphNodes/GraphObjectFactory.php delete mode 100644 mayor-orig/www/include/share/facebook/GraphNodes/GraphPage.php delete mode 100644 mayor-orig/www/include/share/facebook/GraphNodes/GraphPicture.php delete mode 100644 mayor-orig/www/include/share/facebook/GraphNodes/GraphSessionInfo.php delete mode 100644 mayor-orig/www/include/share/facebook/GraphNodes/GraphUser.php delete mode 100644 mayor-orig/www/include/share/facebook/Helpers/FacebookCanvasHelper.php delete mode 100644 mayor-orig/www/include/share/facebook/Helpers/FacebookJavaScriptHelper.php delete mode 100644 mayor-orig/www/include/share/facebook/Helpers/FacebookPageTabHelper.php delete mode 100644 mayor-orig/www/include/share/facebook/Helpers/FacebookRedirectLoginHelper.php delete mode 100644 mayor-orig/www/include/share/facebook/Helpers/FacebookSignedRequestFromInputHelper.php delete mode 100644 mayor-orig/www/include/share/facebook/Http/GraphRawResponse.php delete mode 100644 mayor-orig/www/include/share/facebook/Http/RequestBodyInterface.php delete mode 100644 mayor-orig/www/include/share/facebook/Http/RequestBodyMultipart.php delete mode 100644 mayor-orig/www/include/share/facebook/Http/RequestBodyUrlEncoded.php delete mode 100644 mayor-orig/www/include/share/facebook/HttpClients/FacebookCurl.php delete mode 100644 mayor-orig/www/include/share/facebook/HttpClients/FacebookCurlHttpClient.php delete mode 100644 mayor-orig/www/include/share/facebook/HttpClients/FacebookGuzzleHttpClient.php delete mode 100644 mayor-orig/www/include/share/facebook/HttpClients/FacebookHttpClientInterface.php delete mode 100644 mayor-orig/www/include/share/facebook/HttpClients/FacebookStream.php delete mode 100644 mayor-orig/www/include/share/facebook/HttpClients/FacebookStreamHttpClient.php delete mode 100644 mayor-orig/www/include/share/facebook/HttpClients/HttpClientsFactory.php delete mode 100644 mayor-orig/www/include/share/facebook/HttpClients/certs/DigiCertHighAssuranceEVRootCA.pem delete mode 100644 mayor-orig/www/include/share/facebook/PersistentData/FacebookMemoryPersistentDataHandler.php delete mode 100644 mayor-orig/www/include/share/facebook/PersistentData/FacebookSessionPersistentDataHandler.php delete mode 100644 mayor-orig/www/include/share/facebook/PersistentData/PersistentDataFactory.php delete mode 100644 mayor-orig/www/include/share/facebook/PersistentData/PersistentDataInterface.php delete mode 100644 mayor-orig/www/include/share/facebook/PseudoRandomString/McryptPseudoRandomStringGenerator.php delete mode 100644 mayor-orig/www/include/share/facebook/PseudoRandomString/OpenSslPseudoRandomStringGenerator.php delete mode 100644 mayor-orig/www/include/share/facebook/PseudoRandomString/PseudoRandomStringGeneratorFactory.php delete mode 100644 mayor-orig/www/include/share/facebook/PseudoRandomString/PseudoRandomStringGeneratorInterface.php delete mode 100644 mayor-orig/www/include/share/facebook/PseudoRandomString/PseudoRandomStringGeneratorTrait.php delete mode 100644 mayor-orig/www/include/share/facebook/PseudoRandomString/RandomBytesPseudoRandomStringGenerator.php delete mode 100644 mayor-orig/www/include/share/facebook/PseudoRandomString/UrandomPseudoRandomStringGenerator.php delete mode 100644 mayor-orig/www/include/share/facebook/SignedRequest.php delete mode 100644 mayor-orig/www/include/share/facebook/Url/FacebookUrlDetectionHandler.php delete mode 100644 mayor-orig/www/include/share/facebook/Url/FacebookUrlManipulator.php delete mode 100644 mayor-orig/www/include/share/facebook/Url/UrlDetectionInterface.php delete mode 100644 mayor-orig/www/include/share/facebook/autoload.php delete mode 100644 mayor-orig/www/include/share/facebook/polyfills.php delete mode 100644 mayor-orig/www/include/share/gd/imagefilter.php delete mode 100644 mayor-orig/www/include/share/googleapi/autoload.php delete mode 100644 mayor-orig/www/include/share/googleapi/composer/ClassLoader.php delete mode 100644 mayor-orig/www/include/share/googleapi/composer/LICENSE delete mode 100644 mayor-orig/www/include/share/googleapi/composer/autoload_classmap.php delete mode 100644 mayor-orig/www/include/share/googleapi/composer/autoload_files.php delete mode 100644 mayor-orig/www/include/share/googleapi/composer/autoload_namespaces.php delete mode 100644 mayor-orig/www/include/share/googleapi/composer/autoload_psr4.php delete mode 100644 mayor-orig/www/include/share/googleapi/composer/autoload_real.php delete mode 100644 mayor-orig/www/include/share/googleapi/composer/autoload_static.php delete mode 100644 mayor-orig/www/include/share/googleapi/composer/installed.json delete mode 100644 mayor-orig/www/include/share/googleapi/firebase/php-jwt/LICENSE delete mode 100644 mayor-orig/www/include/share/googleapi/firebase/php-jwt/README.md delete mode 100644 mayor-orig/www/include/share/googleapi/firebase/php-jwt/composer.json delete mode 100644 mayor-orig/www/include/share/googleapi/firebase/php-jwt/composer.lock delete mode 100644 mayor-orig/www/include/share/googleapi/firebase/php-jwt/package.xml delete mode 100644 mayor-orig/www/include/share/googleapi/firebase/php-jwt/src/BeforeValidException.php delete mode 100644 mayor-orig/www/include/share/googleapi/firebase/php-jwt/src/ExpiredException.php delete mode 100644 mayor-orig/www/include/share/googleapi/firebase/php-jwt/src/JWT.php delete mode 100644 mayor-orig/www/include/share/googleapi/firebase/php-jwt/src/SignatureInvalidException.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/.gitignore delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/.travis.yml delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/CONTRIBUTING.md delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/LICENSE delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/README.md delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/composer.json delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/phpunit.xml delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Acceleratedmobilepageurl.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Acceleratedmobilepageurl/AmpUrl.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Acceleratedmobilepageurl/AmpUrlError.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Acceleratedmobilepageurl/BatchGetAmpUrlsRequest.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Acceleratedmobilepageurl/BatchGetAmpUrlsResponse.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Acceleratedmobilepageurl/Resource/AmpUrls.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdExchangeBuyer.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdExchangeBuyer/Account.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdExchangeBuyer/AccountBidderLocation.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdExchangeBuyer/AccountsList.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdExchangeBuyer/AddOrderDealsRequest.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdExchangeBuyer/AddOrderDealsResponse.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdExchangeBuyer/AddOrderNotesRequest.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdExchangeBuyer/AddOrderNotesResponse.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdExchangeBuyer/BillingInfo.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdExchangeBuyer/BillingInfoList.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdExchangeBuyer/Budget.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdExchangeBuyer/Buyer.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdExchangeBuyer/ContactInformation.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdExchangeBuyer/CreateOrdersRequest.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdExchangeBuyer/CreateOrdersResponse.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdExchangeBuyer/Creative.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdExchangeBuyer/CreativeCorrections.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdExchangeBuyer/CreativeCorrectionsContexts.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdExchangeBuyer/CreativeDealIds.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdExchangeBuyer/CreativeDealIdsDealStatuses.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdExchangeBuyer/CreativeFilteringReasons.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdExchangeBuyer/CreativeFilteringReasonsReasons.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdExchangeBuyer/CreativeNativeAd.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdExchangeBuyer/CreativeNativeAdAppIcon.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdExchangeBuyer/CreativeNativeAdImage.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdExchangeBuyer/CreativeNativeAdLogo.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdExchangeBuyer/CreativeServingRestrictions.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdExchangeBuyer/CreativeServingRestrictionsContexts.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdExchangeBuyer/CreativeServingRestrictionsDisapprovalReasons.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdExchangeBuyer/CreativesList.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdExchangeBuyer/DealServingMetadata.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdExchangeBuyer/DealServingMetadataDealPauseStatus.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdExchangeBuyer/DealTerms.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdExchangeBuyer/DealTermsGuaranteedFixedPriceTerms.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdExchangeBuyer/DealTermsGuaranteedFixedPriceTermsBillingInfo.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdExchangeBuyer/DealTermsNonGuaranteedAuctionTerms.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdExchangeBuyer/DealTermsNonGuaranteedFixedPriceTerms.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdExchangeBuyer/DealTermsRubiconNonGuaranteedTerms.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdExchangeBuyer/DeleteOrderDealsRequest.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdExchangeBuyer/DeleteOrderDealsResponse.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdExchangeBuyer/DeliveryControl.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdExchangeBuyer/DeliveryControlFrequencyCap.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdExchangeBuyer/Dimension.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdExchangeBuyer/DimensionDimensionValue.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdExchangeBuyer/EditAllOrderDealsRequest.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdExchangeBuyer/EditAllOrderDealsResponse.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdExchangeBuyer/GetOffersResponse.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdExchangeBuyer/GetOrderDealsResponse.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdExchangeBuyer/GetOrderNotesResponse.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdExchangeBuyer/GetOrdersResponse.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdExchangeBuyer/GetPublisherProfilesByAccountIdResponse.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdExchangeBuyer/MarketplaceDeal.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdExchangeBuyer/MarketplaceDealParty.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdExchangeBuyer/MarketplaceLabel.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdExchangeBuyer/MarketplaceNote.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdExchangeBuyer/PerformanceReport.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdExchangeBuyer/PerformanceReportList.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdExchangeBuyer/PretargetingConfig.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdExchangeBuyer/PretargetingConfigDimensions.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdExchangeBuyer/PretargetingConfigExcludedPlacements.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdExchangeBuyer/PretargetingConfigList.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdExchangeBuyer/PretargetingConfigPlacements.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdExchangeBuyer/PretargetingConfigVideoPlayerSizes.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdExchangeBuyer/Price.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdExchangeBuyer/PricePerBuyer.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdExchangeBuyer/PrivateData.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdExchangeBuyer/Product.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdExchangeBuyer/Proposal.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdExchangeBuyer/PublisherProfileApiProto.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdExchangeBuyer/PublisherProvidedForecast.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdExchangeBuyer/Resource/Accounts.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdExchangeBuyer/Resource/BillingInfo.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdExchangeBuyer/Resource/Budget.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdExchangeBuyer/Resource/Creatives.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdExchangeBuyer/Resource/Marketplacedeals.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdExchangeBuyer/Resource/Marketplacenotes.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdExchangeBuyer/Resource/Marketplaceprivateauction.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdExchangeBuyer/Resource/PerformanceReport.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdExchangeBuyer/Resource/PretargetingConfig.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdExchangeBuyer/Resource/Products.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdExchangeBuyer/Resource/Proposals.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdExchangeBuyer/Resource/Pubprofiles.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdExchangeBuyer/Seller.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdExchangeBuyer/SharedTargeting.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdExchangeBuyer/TargetingValue.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdExchangeBuyer/TargetingValueCreativeSize.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdExchangeBuyer/TargetingValueDayPartTargeting.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdExchangeBuyer/TargetingValueDayPartTargetingDayPart.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdExchangeBuyer/TargetingValueSize.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdExchangeBuyer/UpdatePrivateAuctionProposalRequest.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdExchangeBuyerII.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdExchangeBuyerII/AddDealAssociationRequest.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdExchangeBuyerII/Adexchangebuyer2Empty.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdExchangeBuyerII/AppContext.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdExchangeBuyerII/AuctionContext.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdExchangeBuyerII/Client.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdExchangeBuyerII/ClientUser.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdExchangeBuyerII/ClientUserInvitation.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdExchangeBuyerII/Correction.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdExchangeBuyerII/Creative.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdExchangeBuyerII/CreativeDealAssociation.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdExchangeBuyerII/Date.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdExchangeBuyerII/Disapproval.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdExchangeBuyerII/FilteringStats.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdExchangeBuyerII/HtmlContent.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdExchangeBuyerII/Image.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdExchangeBuyerII/ListClientUserInvitationsResponse.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdExchangeBuyerII/ListClientUsersResponse.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdExchangeBuyerII/ListClientsResponse.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdExchangeBuyerII/ListCreativesResponse.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdExchangeBuyerII/ListDealAssociationsResponse.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdExchangeBuyerII/LocationContext.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdExchangeBuyerII/NativeContent.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdExchangeBuyerII/PlatformContext.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdExchangeBuyerII/Reason.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdExchangeBuyerII/RemoveDealAssociationRequest.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdExchangeBuyerII/Resource/Accounts.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdExchangeBuyerII/Resource/AccountsClients.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdExchangeBuyerII/Resource/AccountsClientsInvitations.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdExchangeBuyerII/Resource/AccountsClientsUsers.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdExchangeBuyerII/Resource/AccountsCreatives.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdExchangeBuyerII/Resource/AccountsCreativesDealAssociations.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdExchangeBuyerII/SecurityContext.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdExchangeBuyerII/ServingContext.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdExchangeBuyerII/ServingRestriction.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdExchangeBuyerII/StopWatchingCreativeRequest.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdExchangeBuyerII/VideoContent.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdExchangeBuyerII/WatchCreativeRequest.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdExchangeSeller.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdExchangeSeller/Account.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdExchangeSeller/Accounts.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdExchangeSeller/AdClient.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdExchangeSeller/AdClients.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdExchangeSeller/Alert.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdExchangeSeller/Alerts.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdExchangeSeller/CustomChannel.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdExchangeSeller/CustomChannelTargetingInfo.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdExchangeSeller/CustomChannels.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdExchangeSeller/Metadata.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdExchangeSeller/PreferredDeal.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdExchangeSeller/PreferredDeals.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdExchangeSeller/Report.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdExchangeSeller/ReportHeaders.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdExchangeSeller/ReportingMetadataEntry.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdExchangeSeller/Resource/Accounts.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdExchangeSeller/Resource/AccountsAdclients.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdExchangeSeller/Resource/AccountsAlerts.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdExchangeSeller/Resource/AccountsCustomchannels.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdExchangeSeller/Resource/AccountsMetadata.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdExchangeSeller/Resource/AccountsMetadataDimensions.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdExchangeSeller/Resource/AccountsMetadataMetrics.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdExchangeSeller/Resource/AccountsPreferreddeals.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdExchangeSeller/Resource/AccountsReports.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdExchangeSeller/Resource/AccountsReportsSaved.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdExchangeSeller/Resource/AccountsUrlchannels.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdExchangeSeller/SavedReport.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdExchangeSeller/SavedReports.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdExchangeSeller/UrlChannel.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdExchangeSeller/UrlChannels.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdSense.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdSense/Account.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdSense/Accounts.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdSense/AdClient.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdSense/AdClients.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdSense/AdCode.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdSense/AdStyle.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdSense/AdStyleColors.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdSense/AdStyleFont.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdSense/AdUnit.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdSense/AdUnitContentAdsSettings.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdSense/AdUnitContentAdsSettingsBackupOption.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdSense/AdUnitFeedAdsSettings.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdSense/AdUnitMobileContentAdsSettings.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdSense/AdUnits.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdSense/AdsenseReportsGenerateResponse.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdSense/AdsenseReportsGenerateResponseHeaders.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdSense/Alert.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdSense/Alerts.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdSense/CustomChannel.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdSense/CustomChannelTargetingInfo.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdSense/CustomChannels.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdSense/Metadata.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdSense/Payment.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdSense/Payments.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdSense/ReportingMetadataEntry.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdSense/Resource/Accounts.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdSense/Resource/AccountsAdclients.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdSense/Resource/AccountsAdunits.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdSense/Resource/AccountsAdunitsCustomchannels.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdSense/Resource/AccountsAlerts.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdSense/Resource/AccountsCustomchannels.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdSense/Resource/AccountsCustomchannelsAdunits.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdSense/Resource/AccountsPayments.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdSense/Resource/AccountsReports.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdSense/Resource/AccountsReportsSaved.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdSense/Resource/AccountsSavedadstyles.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdSense/Resource/AccountsUrlchannels.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdSense/Resource/Adclients.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdSense/Resource/Adunits.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdSense/Resource/AdunitsCustomchannels.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdSense/Resource/Alerts.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdSense/Resource/Customchannels.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdSense/Resource/CustomchannelsAdunits.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdSense/Resource/Metadata.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdSense/Resource/MetadataDimensions.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdSense/Resource/MetadataMetrics.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdSense/Resource/Payments.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdSense/Resource/Reports.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdSense/Resource/ReportsSaved.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdSense/Resource/Savedadstyles.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdSense/Resource/Urlchannels.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdSense/SavedAdStyle.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdSense/SavedAdStyles.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdSense/SavedReport.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdSense/SavedReports.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdSense/UrlChannel.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdSense/UrlChannels.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdSenseHost.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdSenseHost/Account.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdSenseHost/Accounts.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdSenseHost/AdClient.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdSenseHost/AdClients.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdSenseHost/AdCode.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdSenseHost/AdStyle.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdSenseHost/AdStyleColors.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdSenseHost/AdStyleFont.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdSenseHost/AdUnit.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdSenseHost/AdUnitContentAdsSettings.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdSenseHost/AdUnitContentAdsSettingsBackupOption.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdSenseHost/AdUnitMobileContentAdsSettings.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdSenseHost/AdUnits.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdSenseHost/AssociationSession.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdSenseHost/CustomChannel.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdSenseHost/CustomChannels.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdSenseHost/Report.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdSenseHost/ReportHeaders.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdSenseHost/Resource/Accounts.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdSenseHost/Resource/AccountsAdclients.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdSenseHost/Resource/AccountsAdunits.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdSenseHost/Resource/AccountsReports.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdSenseHost/Resource/Adclients.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdSenseHost/Resource/Associationsessions.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdSenseHost/Resource/Customchannels.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdSenseHost/Resource/Reports.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdSenseHost/Resource/Urlchannels.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdSenseHost/UrlChannel.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdSenseHost/UrlChannels.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Analytics.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Analytics/Account.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Analytics/AccountChildLink.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Analytics/AccountPermissions.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Analytics/AccountRef.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Analytics/AccountSummaries.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Analytics/AccountSummary.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Analytics/AccountTicket.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Analytics/Accounts.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Analytics/AdWordsAccount.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Analytics/AnalyticsDataimportDeleteUploadDataRequest.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Analytics/Column.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Analytics/Columns.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Analytics/CustomDataSource.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Analytics/CustomDataSourceChildLink.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Analytics/CustomDataSourceParentLink.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Analytics/CustomDataSources.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Analytics/CustomDimension.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Analytics/CustomDimensionParentLink.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Analytics/CustomDimensions.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Analytics/CustomMetric.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Analytics/CustomMetricParentLink.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Analytics/CustomMetrics.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Analytics/EntityAdWordsLink.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Analytics/EntityAdWordsLinkEntity.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Analytics/EntityAdWordsLinks.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Analytics/EntityUserLink.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Analytics/EntityUserLinkEntity.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Analytics/EntityUserLinkPermissions.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Analytics/EntityUserLinks.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Analytics/Experiment.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Analytics/ExperimentParentLink.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Analytics/ExperimentVariations.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Analytics/Experiments.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Analytics/Filter.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Analytics/FilterAdvancedDetails.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Analytics/FilterExpression.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Analytics/FilterLowercaseDetails.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Analytics/FilterParentLink.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Analytics/FilterRef.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Analytics/FilterSearchAndReplaceDetails.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Analytics/FilterUppercaseDetails.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Analytics/Filters.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Analytics/GaData.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Analytics/GaDataColumnHeaders.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Analytics/GaDataDataTable.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Analytics/GaDataDataTableCols.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Analytics/GaDataDataTableRows.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Analytics/GaDataDataTableRowsC.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Analytics/GaDataProfileInfo.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Analytics/GaDataQuery.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Analytics/Goal.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Analytics/GoalEventDetails.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Analytics/GoalEventDetailsEventConditions.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Analytics/GoalParentLink.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Analytics/GoalUrlDestinationDetails.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Analytics/GoalUrlDestinationDetailsSteps.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Analytics/GoalVisitNumPagesDetails.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Analytics/GoalVisitTimeOnSiteDetails.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Analytics/Goals.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Analytics/IncludeConditions.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Analytics/LinkedForeignAccount.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Analytics/McfData.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Analytics/McfDataColumnHeaders.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Analytics/McfDataProfileInfo.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Analytics/McfDataQuery.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Analytics/McfDataRows.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Analytics/McfDataRowsConversionPathValue.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Analytics/Profile.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Analytics/ProfileChildLink.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Analytics/ProfileFilterLink.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Analytics/ProfileFilterLinks.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Analytics/ProfileParentLink.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Analytics/ProfilePermissions.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Analytics/ProfileRef.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Analytics/ProfileSummary.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Analytics/Profiles.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Analytics/RealtimeData.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Analytics/RealtimeDataColumnHeaders.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Analytics/RealtimeDataProfileInfo.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Analytics/RealtimeDataQuery.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Analytics/RemarketingAudience.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Analytics/RemarketingAudienceAudienceDefinition.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Analytics/RemarketingAudienceStateBasedAudienceDefinition.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Analytics/RemarketingAudienceStateBasedAudienceDefinitionExcludeConditions.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Analytics/RemarketingAudiences.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Analytics/Resource/Data.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Analytics/Resource/DataGa.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Analytics/Resource/DataMcf.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Analytics/Resource/DataRealtime.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Analytics/Resource/Management.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Analytics/Resource/ManagementAccountSummaries.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Analytics/Resource/ManagementAccountUserLinks.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Analytics/Resource/ManagementAccounts.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Analytics/Resource/ManagementCustomDataSources.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Analytics/Resource/ManagementCustomDimensions.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Analytics/Resource/ManagementCustomMetrics.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Analytics/Resource/ManagementExperiments.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Analytics/Resource/ManagementFilters.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Analytics/Resource/ManagementGoals.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Analytics/Resource/ManagementProfileFilterLinks.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Analytics/Resource/ManagementProfileUserLinks.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Analytics/Resource/ManagementProfiles.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Analytics/Resource/ManagementRemarketingAudience.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Analytics/Resource/ManagementSegments.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Analytics/Resource/ManagementUnsampledReports.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Analytics/Resource/ManagementUploads.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Analytics/Resource/ManagementWebPropertyAdWordsLinks.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Analytics/Resource/ManagementWebproperties.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Analytics/Resource/ManagementWebpropertyUserLinks.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Analytics/Resource/Metadata.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Analytics/Resource/MetadataColumns.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Analytics/Resource/Provisioning.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Analytics/Segment.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Analytics/Segments.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Analytics/UnsampledReport.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Analytics/UnsampledReportCloudStorageDownloadDetails.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Analytics/UnsampledReportDriveDownloadDetails.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Analytics/UnsampledReports.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Analytics/Upload.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Analytics/Uploads.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Analytics/UserRef.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Analytics/WebPropertyRef.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Analytics/WebPropertySummary.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Analytics/Webproperties.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Analytics/Webproperty.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Analytics/WebpropertyChildLink.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Analytics/WebpropertyParentLink.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Analytics/WebpropertyPermissions.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AnalyticsReporting.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AnalyticsReporting/Cohort.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AnalyticsReporting/CohortGroup.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AnalyticsReporting/ColumnHeader.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AnalyticsReporting/DateRange.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AnalyticsReporting/DateRangeValues.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AnalyticsReporting/Dimension.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AnalyticsReporting/DimensionFilter.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AnalyticsReporting/DimensionFilterClause.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AnalyticsReporting/DynamicSegment.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AnalyticsReporting/GetReportsRequest.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AnalyticsReporting/GetReportsResponse.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AnalyticsReporting/Metric.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AnalyticsReporting/MetricFilter.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AnalyticsReporting/MetricFilterClause.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AnalyticsReporting/MetricHeader.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AnalyticsReporting/MetricHeaderEntry.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AnalyticsReporting/OrFiltersForSegment.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AnalyticsReporting/OrderBy.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AnalyticsReporting/Pivot.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AnalyticsReporting/PivotHeader.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AnalyticsReporting/PivotHeaderEntry.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AnalyticsReporting/PivotValueRegion.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AnalyticsReporting/Report.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AnalyticsReporting/ReportData.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AnalyticsReporting/ReportRequest.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AnalyticsReporting/ReportRow.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AnalyticsReporting/Resource/Reports.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AnalyticsReporting/Segment.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AnalyticsReporting/SegmentDefinition.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AnalyticsReporting/SegmentDimensionFilter.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AnalyticsReporting/SegmentFilter.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AnalyticsReporting/SegmentFilterClause.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AnalyticsReporting/SegmentMetricFilter.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AnalyticsReporting/SegmentSequenceStep.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AnalyticsReporting/SequenceSegment.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AnalyticsReporting/SimpleSegment.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AndroidEnterprise.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AndroidEnterprise/Administrator.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AndroidEnterprise/AdministratorWebToken.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AndroidEnterprise/AdministratorWebTokenSpec.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AndroidEnterprise/AppRestrictionsSchema.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AndroidEnterprise/AppRestrictionsSchemaChangeEvent.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AndroidEnterprise/AppRestrictionsSchemaRestriction.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AndroidEnterprise/AppRestrictionsSchemaRestrictionRestrictionValue.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AndroidEnterprise/AppUpdateEvent.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AndroidEnterprise/AppVersion.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AndroidEnterprise/ApprovalUrlInfo.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AndroidEnterprise/AuthenticationToken.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AndroidEnterprise/Collection.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AndroidEnterprise/CollectionViewersListResponse.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AndroidEnterprise/CollectionsListResponse.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AndroidEnterprise/Device.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AndroidEnterprise/DeviceState.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AndroidEnterprise/DevicesListResponse.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AndroidEnterprise/Enterprise.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AndroidEnterprise/EnterpriseAccount.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AndroidEnterprise/EnterprisesListResponse.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AndroidEnterprise/EnterprisesSendTestPushNotificationResponse.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AndroidEnterprise/Entitlement.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AndroidEnterprise/EntitlementsListResponse.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AndroidEnterprise/GroupLicense.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AndroidEnterprise/GroupLicenseUsersListResponse.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AndroidEnterprise/GroupLicensesListResponse.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AndroidEnterprise/Install.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AndroidEnterprise/InstallFailureEvent.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AndroidEnterprise/InstallsListResponse.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AndroidEnterprise/LocalizedText.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AndroidEnterprise/ManagedConfiguration.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AndroidEnterprise/ManagedConfigurationsForDeviceListResponse.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AndroidEnterprise/ManagedConfigurationsForUserListResponse.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AndroidEnterprise/ManagedProperty.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AndroidEnterprise/ManagedPropertyBundle.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AndroidEnterprise/NewDeviceEvent.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AndroidEnterprise/NewPermissionsEvent.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AndroidEnterprise/Notification.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AndroidEnterprise/NotificationSet.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AndroidEnterprise/PageInfo.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AndroidEnterprise/Permission.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AndroidEnterprise/Product.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AndroidEnterprise/ProductApprovalEvent.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AndroidEnterprise/ProductAvailabilityChangeEvent.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AndroidEnterprise/ProductPermission.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AndroidEnterprise/ProductPermissions.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AndroidEnterprise/ProductSet.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AndroidEnterprise/ProductsApproveRequest.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AndroidEnterprise/ProductsGenerateApprovalUrlResponse.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AndroidEnterprise/ProductsListResponse.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AndroidEnterprise/Resource/Collections.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AndroidEnterprise/Resource/Collectionviewers.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AndroidEnterprise/Resource/Devices.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AndroidEnterprise/Resource/Enterprises.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AndroidEnterprise/Resource/Entitlements.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AndroidEnterprise/Resource/Grouplicenses.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AndroidEnterprise/Resource/Grouplicenseusers.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AndroidEnterprise/Resource/Installs.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AndroidEnterprise/Resource/Managedconfigurationsfordevice.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AndroidEnterprise/Resource/Managedconfigurationsforuser.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AndroidEnterprise/Resource/Permissions.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AndroidEnterprise/Resource/Products.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AndroidEnterprise/Resource/Serviceaccountkeys.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AndroidEnterprise/Resource/Storelayoutclusters.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AndroidEnterprise/Resource/Storelayoutpages.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AndroidEnterprise/Resource/Users.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AndroidEnterprise/ServiceAccount.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AndroidEnterprise/ServiceAccountKey.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AndroidEnterprise/ServiceAccountKeysListResponse.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AndroidEnterprise/SignupInfo.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AndroidEnterprise/StoreCluster.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AndroidEnterprise/StoreLayout.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AndroidEnterprise/StoreLayoutClustersListResponse.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AndroidEnterprise/StoreLayoutPagesListResponse.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AndroidEnterprise/StorePage.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AndroidEnterprise/TokenPagination.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AndroidEnterprise/User.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AndroidEnterprise/UserToken.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AndroidEnterprise/UsersListResponse.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AndroidPublisher.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AndroidPublisher/Apk.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AndroidPublisher/ApkBinary.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AndroidPublisher/ApkListing.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AndroidPublisher/ApkListingsListResponse.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AndroidPublisher/ApksAddExternallyHostedRequest.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AndroidPublisher/ApksAddExternallyHostedResponse.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AndroidPublisher/ApksListResponse.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AndroidPublisher/AppDetails.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AndroidPublisher/AppEdit.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AndroidPublisher/Comment.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AndroidPublisher/DeobfuscationFile.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AndroidPublisher/DeobfuscationFilesUploadResponse.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AndroidPublisher/DeveloperComment.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AndroidPublisher/DeviceMetadata.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AndroidPublisher/Entitlement.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AndroidPublisher/EntitlementsListResponse.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AndroidPublisher/ExpansionFile.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AndroidPublisher/ExpansionFilesUploadResponse.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AndroidPublisher/ExternallyHostedApk.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AndroidPublisher/ExternallyHostedApkUsesPermission.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AndroidPublisher/Image.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AndroidPublisher/ImagesDeleteAllResponse.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AndroidPublisher/ImagesListResponse.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AndroidPublisher/ImagesUploadResponse.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AndroidPublisher/InAppProduct.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AndroidPublisher/InAppProductListing.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AndroidPublisher/InappproductsBatchRequest.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AndroidPublisher/InappproductsBatchRequestEntry.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AndroidPublisher/InappproductsBatchResponse.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AndroidPublisher/InappproductsBatchResponseEntry.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AndroidPublisher/InappproductsInsertRequest.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AndroidPublisher/InappproductsInsertResponse.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AndroidPublisher/InappproductsListResponse.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AndroidPublisher/InappproductsUpdateRequest.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AndroidPublisher/InappproductsUpdateResponse.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AndroidPublisher/Listing.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AndroidPublisher/ListingsListResponse.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AndroidPublisher/MonthDay.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AndroidPublisher/PageInfo.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AndroidPublisher/Price.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AndroidPublisher/ProductPurchase.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AndroidPublisher/Prorate.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AndroidPublisher/Resource/Edits.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AndroidPublisher/Resource/EditsApklistings.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AndroidPublisher/Resource/EditsApks.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AndroidPublisher/Resource/EditsDeobfuscationfiles.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AndroidPublisher/Resource/EditsDetails.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AndroidPublisher/Resource/EditsExpansionfiles.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AndroidPublisher/Resource/EditsImages.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AndroidPublisher/Resource/EditsListings.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AndroidPublisher/Resource/EditsTesters.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AndroidPublisher/Resource/EditsTracks.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AndroidPublisher/Resource/Entitlements.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AndroidPublisher/Resource/Inappproducts.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AndroidPublisher/Resource/Purchases.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AndroidPublisher/Resource/PurchasesProducts.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AndroidPublisher/Resource/PurchasesSubscriptions.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AndroidPublisher/Resource/PurchasesVoidedpurchases.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AndroidPublisher/Resource/Reviews.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AndroidPublisher/Review.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AndroidPublisher/ReviewReplyResult.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AndroidPublisher/ReviewsListResponse.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AndroidPublisher/ReviewsReplyRequest.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AndroidPublisher/ReviewsReplyResponse.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AndroidPublisher/Season.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AndroidPublisher/SubscriptionDeferralInfo.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AndroidPublisher/SubscriptionPurchase.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AndroidPublisher/SubscriptionPurchasesDeferRequest.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AndroidPublisher/SubscriptionPurchasesDeferResponse.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AndroidPublisher/Testers.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AndroidPublisher/Timestamp.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AndroidPublisher/TokenPagination.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AndroidPublisher/Track.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AndroidPublisher/TracksListResponse.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AndroidPublisher/UserComment.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AndroidPublisher/VoidedPurchase.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AndroidPublisher/VoidedPurchasesListResponse.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AppState.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AppState/GetResponse.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AppState/ListResponse.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AppState/Resource/States.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AppState/UpdateRequest.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AppState/WriteResult.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Appengine.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Appengine/ApiConfigHandler.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Appengine/ApiEndpointHandler.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Appengine/Application.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Appengine/AutomaticScaling.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Appengine/BasicScaling.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Appengine/ContainerInfo.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Appengine/CpuUtilization.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Appengine/DebugInstanceRequest.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Appengine/Deployment.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Appengine/DiskUtilization.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Appengine/EndpointsApiService.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Appengine/ErrorHandler.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Appengine/FileInfo.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Appengine/HealthCheck.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Appengine/Instance.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Appengine/Library.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Appengine/ListInstancesResponse.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Appengine/ListLocationsResponse.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Appengine/ListOperationsResponse.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Appengine/ListServicesResponse.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Appengine/ListVersionsResponse.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Appengine/Location.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Appengine/LocationMetadata.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Appengine/ManualScaling.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Appengine/Network.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Appengine/NetworkUtilization.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Appengine/Operation.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Appengine/OperationMetadata.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Appengine/OperationMetadataExperimental.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Appengine/OperationMetadataV1.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Appengine/OperationMetadataV1Beta5.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Appengine/RepairApplicationRequest.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Appengine/RequestUtilization.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Appengine/Resource/Apps.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Appengine/Resource/AppsLocations.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Appengine/Resource/AppsOperations.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Appengine/Resource/AppsServices.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Appengine/Resource/AppsServicesVersions.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Appengine/Resource/AppsServicesVersionsInstances.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Appengine/Resource/Experimental.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Appengine/Resource/ExperimentalApps.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Appengine/Resource/ExperimentalAppsOperations.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Appengine/Resources.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Appengine/ScriptHandler.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Appengine/Service.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Appengine/SourceReference.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Appengine/StaticFilesHandler.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Appengine/Status.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Appengine/TrafficSplit.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Appengine/UrlDispatchRule.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Appengine/UrlMap.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Appengine/Version.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Appengine/Volume.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Appengine/ZipInfo.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Appsactivity.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Appsactivity/Activity.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Appsactivity/AppsactivityParent.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Appsactivity/Event.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Appsactivity/ListActivitiesResponse.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Appsactivity/Move.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Appsactivity/Permission.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Appsactivity/PermissionChange.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Appsactivity/Photo.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Appsactivity/Rename.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Appsactivity/Resource/Activities.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Appsactivity/Target.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Appsactivity/User.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Autoscaler.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Autoscaler/Autoscaler.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Autoscaler/AutoscalerListResponse.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Autoscaler/AutoscalingPolicy.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Autoscaler/AutoscalingPolicyCpuUtilization.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Autoscaler/AutoscalingPolicyCustomMetricUtilization.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Autoscaler/AutoscalingPolicyLoadBalancingUtilization.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Autoscaler/DeprecationStatus.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Autoscaler/Operation.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Autoscaler/OperationError.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Autoscaler/OperationErrorErrors.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Autoscaler/OperationList.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Autoscaler/OperationWarnings.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Autoscaler/OperationWarningsData.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Autoscaler/Resource/Autoscalers.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Autoscaler/Resource/ZoneOperations.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Autoscaler/Resource/Zones.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Autoscaler/Zone.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Autoscaler/ZoneList.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Bigquery.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Bigquery/BigtableColumn.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Bigquery/BigtableColumnFamily.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Bigquery/BigtableOptions.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Bigquery/CsvOptions.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Bigquery/Dataset.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Bigquery/DatasetAccess.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Bigquery/DatasetList.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Bigquery/DatasetListDatasets.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Bigquery/DatasetReference.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Bigquery/ErrorProto.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Bigquery/ExplainQueryStage.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Bigquery/ExplainQueryStep.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Bigquery/ExternalDataConfiguration.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Bigquery/GetQueryResultsResponse.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Bigquery/GoogleSheetsOptions.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Bigquery/Job.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Bigquery/JobCancelResponse.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Bigquery/JobConfiguration.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Bigquery/JobConfigurationExtract.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Bigquery/JobConfigurationLoad.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Bigquery/JobConfigurationQuery.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Bigquery/JobConfigurationTableCopy.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Bigquery/JobList.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Bigquery/JobListJobs.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Bigquery/JobReference.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Bigquery/JobStatistics.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Bigquery/JobStatistics2.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Bigquery/JobStatistics3.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Bigquery/JobStatistics4.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Bigquery/JobStatus.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Bigquery/ProjectList.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Bigquery/ProjectListProjects.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Bigquery/ProjectReference.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Bigquery/QueryParameter.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Bigquery/QueryParameterType.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Bigquery/QueryParameterTypeStructTypes.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Bigquery/QueryParameterValue.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Bigquery/QueryRequest.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Bigquery/QueryResponse.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Bigquery/Resource/Datasets.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Bigquery/Resource/Jobs.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Bigquery/Resource/Projects.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Bigquery/Resource/Tabledata.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Bigquery/Resource/Tables.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Bigquery/Streamingbuffer.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Bigquery/Table.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Bigquery/TableCell.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Bigquery/TableDataInsertAllRequest.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Bigquery/TableDataInsertAllRequestRows.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Bigquery/TableDataInsertAllResponse.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Bigquery/TableDataInsertAllResponseInsertErrors.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Bigquery/TableDataList.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Bigquery/TableFieldSchema.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Bigquery/TableList.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Bigquery/TableListTables.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Bigquery/TableListTablesView.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Bigquery/TableReference.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Bigquery/TableRow.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Bigquery/TableSchema.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Bigquery/TimePartitioning.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Bigquery/UserDefinedFunctionResource.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Bigquery/ViewDefinition.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Blogger.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Blogger/Blog.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Blogger/BlogList.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Blogger/BlogLocale.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Blogger/BlogPages.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Blogger/BlogPerUserInfo.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Blogger/BlogPosts.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Blogger/BlogUserInfo.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Blogger/Comment.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Blogger/CommentAuthor.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Blogger/CommentAuthorImage.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Blogger/CommentBlog.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Blogger/CommentInReplyTo.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Blogger/CommentList.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Blogger/CommentPost.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Blogger/Page.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Blogger/PageAuthor.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Blogger/PageAuthorImage.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Blogger/PageBlog.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Blogger/PageList.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Blogger/Pageviews.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Blogger/PageviewsCounts.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Blogger/Post.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Blogger/PostAuthor.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Blogger/PostAuthorImage.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Blogger/PostBlog.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Blogger/PostImages.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Blogger/PostList.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Blogger/PostLocation.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Blogger/PostPerUserInfo.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Blogger/PostReplies.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Blogger/PostUserInfo.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Blogger/PostUserInfosList.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Blogger/Resource/BlogUserInfos.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Blogger/Resource/Blogs.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Blogger/Resource/Comments.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Blogger/Resource/PageViews.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Blogger/Resource/Pages.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Blogger/Resource/PostUserInfos.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Blogger/Resource/Posts.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Blogger/Resource/Users.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Blogger/User.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Blogger/UserBlogs.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Blogger/UserLocale.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Books.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Books/Annotation.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Books/AnnotationClientVersionRanges.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Books/AnnotationCurrentVersionRanges.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Books/AnnotationLayerSummary.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Books/Annotationdata.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Books/Annotations.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Books/AnnotationsSummary.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Books/AnnotationsSummaryLayers.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Books/Annotationsdata.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Books/BooksAnnotationsRange.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Books/BooksCloudloadingResource.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Books/BooksVolumesRecommendedRateResponse.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Books/Bookshelf.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Books/Bookshelves.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Books/Category.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Books/CategoryItems.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Books/ConcurrentAccessRestriction.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Books/Dictlayerdata.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Books/DictlayerdataCommon.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Books/DictlayerdataDict.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Books/DictlayerdataDictSource.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Books/DictlayerdataDictWords.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Books/DictlayerdataDictWordsDerivatives.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Books/DictlayerdataDictWordsDerivativesSource.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Books/DictlayerdataDictWordsExamples.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Books/DictlayerdataDictWordsExamplesSource.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Books/DictlayerdataDictWordsSenses.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Books/DictlayerdataDictWordsSensesConjugations.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Books/DictlayerdataDictWordsSensesDefinitions.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Books/DictlayerdataDictWordsSensesDefinitionsExamples.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Books/DictlayerdataDictWordsSensesDefinitionsExamplesSource.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Books/DictlayerdataDictWordsSensesSource.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Books/DictlayerdataDictWordsSensesSynonyms.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Books/DictlayerdataDictWordsSensesSynonymsSource.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Books/DictlayerdataDictWordsSource.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Books/Discoveryclusters.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Books/DiscoveryclustersClusters.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Books/DiscoveryclustersClustersBannerWithContentContainer.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Books/DownloadAccessRestriction.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Books/DownloadAccesses.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Books/Geolayerdata.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Books/GeolayerdataCommon.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Books/GeolayerdataGeo.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Books/GeolayerdataGeoBoundary.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Books/GeolayerdataGeoViewport.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Books/GeolayerdataGeoViewportHi.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Books/GeolayerdataGeoViewportLo.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Books/Layersummaries.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Books/Layersummary.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Books/Metadata.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Books/MetadataItems.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Books/Notification.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Books/Offers.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Books/OffersItems.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Books/OffersItemsItems.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Books/ReadingPosition.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Books/RequestAccess.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Books/Resource/Bookshelves.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Books/Resource/BookshelvesVolumes.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Books/Resource/Cloudloading.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Books/Resource/Dictionary.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Books/Resource/Layers.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Books/Resource/LayersAnnotationData.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Books/Resource/LayersVolumeAnnotations.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Books/Resource/Myconfig.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Books/Resource/Mylibrary.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Books/Resource/MylibraryAnnotations.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Books/Resource/MylibraryBookshelves.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Books/Resource/MylibraryBookshelvesVolumes.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Books/Resource/MylibraryReadingpositions.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Books/Resource/Notification.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Books/Resource/Onboarding.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Books/Resource/Personalizedstream.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Books/Resource/Promooffer.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Books/Resource/Series.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Books/Resource/SeriesMembership.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Books/Resource/Volumes.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Books/Resource/VolumesAssociated.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Books/Resource/VolumesMybooks.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Books/Resource/VolumesRecommended.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Books/Resource/VolumesUseruploaded.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Books/Review.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Books/ReviewAuthor.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Books/ReviewSource.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Books/Series.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Books/SeriesSeries.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Books/Seriesmembership.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Books/Usersettings.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Books/UsersettingsNotesExport.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Books/UsersettingsNotification.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Books/UsersettingsNotificationMoreFromAuthors.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Books/UsersettingsNotificationMoreFromSeries.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Books/Volume.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Books/Volume2.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Books/VolumeAccessInfo.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Books/VolumeAccessInfoEpub.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Books/VolumeAccessInfoPdf.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Books/VolumeLayerInfo.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Books/VolumeLayerInfoLayers.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Books/VolumeRecommendedInfo.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Books/VolumeSaleInfo.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Books/VolumeSaleInfoListPrice.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Books/VolumeSaleInfoOffers.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Books/VolumeSaleInfoOffersListPrice.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Books/VolumeSaleInfoOffersRentalDuration.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Books/VolumeSaleInfoOffersRetailPrice.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Books/VolumeSaleInfoRetailPrice.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Books/VolumeSearchInfo.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Books/VolumeUserInfo.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Books/VolumeUserInfoCopy.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Books/VolumeUserInfoFamilySharing.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Books/VolumeUserInfoRentalPeriod.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Books/VolumeUserInfoUserUploadedVolumeInfo.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Books/VolumeVolumeInfo.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Books/VolumeVolumeInfoDimensions.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Books/VolumeVolumeInfoImageLinks.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Books/VolumeVolumeInfoIndustryIdentifiers.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Books/VolumeVolumeInfoPanelizationSummary.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Books/Volumeannotation.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Books/VolumeannotationContentRanges.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Books/Volumeannotations.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Books/Volumes.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Books/Volumeseriesinfo.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Books/VolumeseriesinfoVolumeSeries.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Books/VolumeseriesinfoVolumeSeriesIssue.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Calendar.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Calendar/Acl.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Calendar/AclRule.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Calendar/AclRuleScope.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Calendar/Calendar.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Calendar/CalendarList.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Calendar/CalendarListEntry.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Calendar/CalendarListEntryNotificationSettings.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Calendar/CalendarNotification.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Calendar/Channel.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Calendar/ColorDefinition.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Calendar/Colors.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Calendar/Error.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Calendar/Event.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Calendar/EventAttachment.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Calendar/EventAttendee.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Calendar/EventCreator.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Calendar/EventDateTime.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Calendar/EventExtendedProperties.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Calendar/EventGadget.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Calendar/EventOrganizer.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Calendar/EventReminder.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Calendar/EventReminders.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Calendar/EventSource.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Calendar/Events.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Calendar/FreeBusyCalendar.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Calendar/FreeBusyGroup.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Calendar/FreeBusyRequest.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Calendar/FreeBusyRequestItem.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Calendar/FreeBusyResponse.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Calendar/Resource/Acl.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Calendar/Resource/CalendarList.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Calendar/Resource/Calendars.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Calendar/Resource/Channels.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Calendar/Resource/Colors.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Calendar/Resource/Events.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Calendar/Resource/Freebusy.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Calendar/Resource/Settings.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Calendar/Setting.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Calendar/Settings.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Calendar/TimePeriod.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CivicInfo.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CivicInfo/AdministrationRegion.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CivicInfo/AdministrativeBody.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CivicInfo/Candidate.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CivicInfo/Channel.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CivicInfo/Contest.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CivicInfo/ContextParams.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CivicInfo/DivisionRepresentativeInfoRequest.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CivicInfo/DivisionSearchRequest.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CivicInfo/DivisionSearchResponse.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CivicInfo/DivisionSearchResult.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CivicInfo/Election.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CivicInfo/ElectionOfficial.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CivicInfo/ElectionsQueryRequest.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CivicInfo/ElectionsQueryResponse.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CivicInfo/ElectoralDistrict.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CivicInfo/GeographicDivision.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CivicInfo/Office.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CivicInfo/Official.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CivicInfo/PollingLocation.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CivicInfo/PostalAddress.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CivicInfo/RepresentativeInfoData.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CivicInfo/RepresentativeInfoRequest.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CivicInfo/RepresentativeInfoResponse.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CivicInfo/Resource/Divisions.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CivicInfo/Resource/Elections.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CivicInfo/Resource/Representatives.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CivicInfo/SimpleAddressType.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CivicInfo/Source.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CivicInfo/VoterInfoRequest.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CivicInfo/VoterInfoResponse.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CivicInfo/VoterInfoSegmentResult.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Classroom.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Classroom/Assignment.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Classroom/AssignmentSubmission.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Classroom/Attachment.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Classroom/ClassroomEmpty.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Classroom/Course.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Classroom/CourseAlias.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Classroom/CourseMaterial.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Classroom/CourseMaterialSet.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Classroom/CourseWork.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Classroom/Date.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Classroom/DriveFile.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Classroom/DriveFolder.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Classroom/Form.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Classroom/GlobalPermission.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Classroom/Guardian.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Classroom/GuardianInvitation.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Classroom/Invitation.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Classroom/Link.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Classroom/ListCourseAliasesResponse.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Classroom/ListCourseWorkResponse.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Classroom/ListCoursesResponse.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Classroom/ListGuardianInvitationsResponse.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Classroom/ListGuardiansResponse.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Classroom/ListInvitationsResponse.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Classroom/ListStudentSubmissionsResponse.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Classroom/ListStudentsResponse.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Classroom/ListTeachersResponse.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Classroom/Material.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Classroom/ModifyAttachmentsRequest.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Classroom/MultipleChoiceQuestion.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Classroom/MultipleChoiceSubmission.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Classroom/Name.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Classroom/ReclaimStudentSubmissionRequest.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Classroom/Resource/Courses.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Classroom/Resource/CoursesAliases.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Classroom/Resource/CoursesCourseWork.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Classroom/Resource/CoursesCourseWorkStudentSubmissions.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Classroom/Resource/CoursesStudents.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Classroom/Resource/CoursesTeachers.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Classroom/Resource/Invitations.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Classroom/Resource/UserProfiles.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Classroom/Resource/UserProfilesGuardianInvitations.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Classroom/Resource/UserProfilesGuardians.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Classroom/ReturnStudentSubmissionRequest.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Classroom/SharedDriveFile.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Classroom/ShortAnswerSubmission.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Classroom/Student.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Classroom/StudentSubmission.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Classroom/Teacher.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Classroom/TimeOfDay.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Classroom/TurnInStudentSubmissionRequest.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Classroom/UserProfile.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Classroom/YouTubeVideo.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudBuild.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudBuild/Build.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudBuild/BuildOperationMetadata.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudBuild/BuildOptions.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudBuild/BuildStep.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudBuild/BuildTrigger.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudBuild/BuiltImage.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudBuild/CancelBuildRequest.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudBuild/CancelOperationRequest.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudBuild/CloudbuildEmpty.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudBuild/FileHashes.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudBuild/Hash.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudBuild/ListBuildTriggersResponse.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudBuild/ListBuildsResponse.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudBuild/ListOperationsResponse.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudBuild/Operation.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudBuild/RepoSource.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudBuild/Resource/Operations.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudBuild/Resource/Projects.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudBuild/Resource/ProjectsBuilds.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudBuild/Resource/ProjectsTriggers.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudBuild/Results.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudBuild/Source.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudBuild/SourceProvenance.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudBuild/Status.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudBuild/StorageSource.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudDebugger.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudDebugger/AliasContext.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudDebugger/Breakpoint.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudDebugger/CloudRepoSourceContext.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudDebugger/CloudWorkspaceId.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudDebugger/CloudWorkspaceSourceContext.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudDebugger/ClouddebuggerEmpty.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudDebugger/Debuggee.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudDebugger/ExtendedSourceContext.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudDebugger/FormatMessage.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudDebugger/GerritSourceContext.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudDebugger/GetBreakpointResponse.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudDebugger/GitSourceContext.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudDebugger/ListActiveBreakpointsResponse.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudDebugger/ListBreakpointsResponse.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudDebugger/ListDebuggeesResponse.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudDebugger/ProjectRepoId.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudDebugger/RegisterDebuggeeRequest.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudDebugger/RegisterDebuggeeResponse.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudDebugger/RepoId.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudDebugger/Resource/Controller.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudDebugger/Resource/ControllerDebuggees.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudDebugger/Resource/ControllerDebuggeesBreakpoints.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudDebugger/Resource/Debugger.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudDebugger/Resource/DebuggerDebuggees.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudDebugger/Resource/DebuggerDebuggeesBreakpoints.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudDebugger/SetBreakpointResponse.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudDebugger/SourceContext.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudDebugger/SourceLocation.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudDebugger/StackFrame.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudDebugger/StatusMessage.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudDebugger/UpdateActiveBreakpointRequest.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudDebugger/UpdateActiveBreakpointResponse.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudDebugger/Variable.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudFunctions.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudFunctions/CallFunctionRequest.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudFunctions/CallFunctionResponse.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudFunctions/CloudFunction.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudFunctions/EventTrigger.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudFunctions/HTTPSTrigger.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudFunctions/ListFunctionsResponse.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudFunctions/ListLocationsResponse.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudFunctions/ListOperationsResponse.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudFunctions/Location.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudFunctions/Operation.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudFunctions/OperationMetadataV1Beta2.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudFunctions/Resource/Operations.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudFunctions/Resource/Projects.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudFunctions/Resource/ProjectsLocations.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudFunctions/Resource/ProjectsLocationsFunctions.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudFunctions/SourceRepository.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudFunctions/Status.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudKMS.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudKMS/AuditConfig.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudKMS/AuditLogConfig.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudKMS/Binding.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudKMS/CloudAuditOptions.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudKMS/Condition.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudKMS/CounterOptions.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudKMS/CryptoKey.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudKMS/CryptoKeyVersion.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudKMS/DataAccessOptions.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudKMS/DecryptRequest.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudKMS/DecryptResponse.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudKMS/DestroyCryptoKeyVersionRequest.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudKMS/EncryptRequest.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudKMS/EncryptResponse.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudKMS/KeyRing.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudKMS/ListCryptoKeyVersionsResponse.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudKMS/ListCryptoKeysResponse.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudKMS/ListKeyRingsResponse.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudKMS/ListLocationsResponse.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudKMS/Location.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudKMS/LogConfig.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudKMS/Policy.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudKMS/Resource/Projects.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudKMS/Resource/ProjectsLocations.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudKMS/Resource/ProjectsLocationsKeyRings.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudKMS/Resource/ProjectsLocationsKeyRingsCryptoKeys.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudKMS/Resource/ProjectsLocationsKeyRingsCryptoKeysCryptoKeyVersions.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudKMS/RestoreCryptoKeyVersionRequest.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudKMS/Rule.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudKMS/SetIamPolicyRequest.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudKMS/TestIamPermissionsRequest.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudKMS/TestIamPermissionsResponse.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudKMS/UpdateCryptoKeyPrimaryVersionRequest.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudMachineLearning.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudMachineLearning/GoogleApiHttpBody.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudMachineLearning/GoogleCloudMlV1beta1CancelJobRequest.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudMachineLearning/GoogleCloudMlV1beta1GetConfigResponse.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudMachineLearning/GoogleCloudMlV1beta1HyperparameterOutput.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudMachineLearning/GoogleCloudMlV1beta1HyperparameterOutputHyperparameterMetric.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudMachineLearning/GoogleCloudMlV1beta1HyperparameterSpec.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudMachineLearning/GoogleCloudMlV1beta1Job.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudMachineLearning/GoogleCloudMlV1beta1ListJobsResponse.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudMachineLearning/GoogleCloudMlV1beta1ListModelsResponse.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudMachineLearning/GoogleCloudMlV1beta1ListVersionsResponse.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudMachineLearning/GoogleCloudMlV1beta1Model.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudMachineLearning/GoogleCloudMlV1beta1OperationMetadata.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudMachineLearning/GoogleCloudMlV1beta1ParameterSpec.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudMachineLearning/GoogleCloudMlV1beta1PredictRequest.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudMachineLearning/GoogleCloudMlV1beta1PredictionInput.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudMachineLearning/GoogleCloudMlV1beta1PredictionOutput.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudMachineLearning/GoogleCloudMlV1beta1SetDefaultVersionRequest.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudMachineLearning/GoogleCloudMlV1beta1TrainingInput.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudMachineLearning/GoogleCloudMlV1beta1TrainingOutput.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudMachineLearning/GoogleCloudMlV1beta1Version.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudMachineLearning/GoogleLongrunningListOperationsResponse.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudMachineLearning/GoogleLongrunningOperation.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudMachineLearning/GoogleProtobufEmpty.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudMachineLearning/GoogleRpcStatus.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudMachineLearning/Resource/Projects.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudMachineLearning/Resource/ProjectsJobs.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudMachineLearning/Resource/ProjectsModels.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudMachineLearning/Resource/ProjectsModelsVersions.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudMachineLearning/Resource/ProjectsOperations.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudMachineLearningEngine.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudMachineLearningEngine/GoogleApiHttpBody.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudMachineLearningEngine/GoogleCloudMlV1CancelJobRequest.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudMachineLearningEngine/GoogleCloudMlV1GetConfigResponse.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudMachineLearningEngine/GoogleCloudMlV1HyperparameterOutput.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudMachineLearningEngine/GoogleCloudMlV1HyperparameterOutputHyperparameterMetric.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudMachineLearningEngine/GoogleCloudMlV1HyperparameterSpec.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudMachineLearningEngine/GoogleCloudMlV1Job.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudMachineLearningEngine/GoogleCloudMlV1ListJobsResponse.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudMachineLearningEngine/GoogleCloudMlV1ListModelsResponse.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudMachineLearningEngine/GoogleCloudMlV1ListVersionsResponse.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudMachineLearningEngine/GoogleCloudMlV1ManualScaling.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudMachineLearningEngine/GoogleCloudMlV1Model.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudMachineLearningEngine/GoogleCloudMlV1OperationMetadata.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudMachineLearningEngine/GoogleCloudMlV1ParameterSpec.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudMachineLearningEngine/GoogleCloudMlV1PredictRequest.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudMachineLearningEngine/GoogleCloudMlV1PredictionInput.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudMachineLearningEngine/GoogleCloudMlV1PredictionOutput.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudMachineLearningEngine/GoogleCloudMlV1SetDefaultVersionRequest.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudMachineLearningEngine/GoogleCloudMlV1TrainingInput.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudMachineLearningEngine/GoogleCloudMlV1TrainingOutput.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudMachineLearningEngine/GoogleCloudMlV1Version.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudMachineLearningEngine/GoogleCloudMlV1beta1ManualScaling.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudMachineLearningEngine/GoogleCloudMlV1beta1OperationMetadata.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudMachineLearningEngine/GoogleCloudMlV1beta1Version.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudMachineLearningEngine/GoogleLongrunningListOperationsResponse.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudMachineLearningEngine/GoogleLongrunningOperation.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudMachineLearningEngine/GoogleProtobufEmpty.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudMachineLearningEngine/GoogleRpcStatus.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudMachineLearningEngine/Resource/Projects.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudMachineLearningEngine/Resource/ProjectsJobs.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudMachineLearningEngine/Resource/ProjectsModels.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudMachineLearningEngine/Resource/ProjectsModelsVersions.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudMachineLearningEngine/Resource/ProjectsOperations.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudMonitoring.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudMonitoring/DeleteMetricDescriptorResponse.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudMonitoring/ListMetricDescriptorsRequest.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudMonitoring/ListMetricDescriptorsResponse.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudMonitoring/ListTimeseriesDescriptorsRequest.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudMonitoring/ListTimeseriesDescriptorsResponse.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudMonitoring/ListTimeseriesRequest.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudMonitoring/ListTimeseriesResponse.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudMonitoring/MetricDescriptor.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudMonitoring/MetricDescriptorLabelDescriptor.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudMonitoring/MetricDescriptorTypeDescriptor.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudMonitoring/Point.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudMonitoring/PointDistribution.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudMonitoring/PointDistributionBucket.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudMonitoring/PointDistributionOverflowBucket.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudMonitoring/PointDistributionUnderflowBucket.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudMonitoring/Resource/MetricDescriptors.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudMonitoring/Resource/Timeseries.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudMonitoring/Resource/TimeseriesDescriptors.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudMonitoring/Timeseries.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudMonitoring/TimeseriesDescriptor.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudMonitoring/TimeseriesDescriptorLabel.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudMonitoring/TimeseriesPoint.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudMonitoring/WriteTimeseriesRequest.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudMonitoring/WriteTimeseriesResponse.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudNaturalLanguage.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudNaturalLanguage/AnalyzeEntitiesRequest.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudNaturalLanguage/AnalyzeEntitiesResponse.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudNaturalLanguage/AnalyzeSentimentRequest.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudNaturalLanguage/AnalyzeSentimentResponse.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudNaturalLanguage/AnalyzeSyntaxRequest.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudNaturalLanguage/AnalyzeSyntaxResponse.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudNaturalLanguage/AnnotateTextRequest.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudNaturalLanguage/AnnotateTextResponse.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudNaturalLanguage/DependencyEdge.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudNaturalLanguage/Document.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudNaturalLanguage/Entity.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudNaturalLanguage/EntityMention.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudNaturalLanguage/Features.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudNaturalLanguage/PartOfSpeech.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudNaturalLanguage/Resource/Documents.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudNaturalLanguage/Sentence.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudNaturalLanguage/Sentiment.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudNaturalLanguage/Status.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudNaturalLanguage/TextSpan.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudNaturalLanguage/Token.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudNaturalLanguageAPI.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudNaturalLanguageAPI/AnalyzeEntitiesRequest.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudNaturalLanguageAPI/AnalyzeEntitiesResponse.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudNaturalLanguageAPI/AnalyzeSentimentRequest.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudNaturalLanguageAPI/AnalyzeSentimentResponse.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudNaturalLanguageAPI/AnnotateTextRequest.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudNaturalLanguageAPI/AnnotateTextResponse.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudNaturalLanguageAPI/DependencyEdge.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudNaturalLanguageAPI/Document.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudNaturalLanguageAPI/Entity.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudNaturalLanguageAPI/EntityMention.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudNaturalLanguageAPI/Features.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudNaturalLanguageAPI/PartOfSpeech.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudNaturalLanguageAPI/Resource/Documents.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudNaturalLanguageAPI/Sentence.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudNaturalLanguageAPI/Sentiment.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudNaturalLanguageAPI/Status.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudNaturalLanguageAPI/TextSpan.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudNaturalLanguageAPI/Token.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudResourceManager.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudResourceManager/Ancestor.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudResourceManager/AuditConfig.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudResourceManager/AuditLogConfig.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudResourceManager/Binding.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudResourceManager/CloudresourcemanagerEmpty.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudResourceManager/FolderOperation.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudResourceManager/FolderOperationError.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudResourceManager/GetAncestryRequest.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudResourceManager/GetAncestryResponse.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudResourceManager/GetIamPolicyRequest.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudResourceManager/Lien.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudResourceManager/ListLiensResponse.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudResourceManager/ListProjectsResponse.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudResourceManager/Operation.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudResourceManager/Organization.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudResourceManager/OrganizationOwner.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudResourceManager/Policy.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudResourceManager/Project.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudResourceManager/ProjectCreationStatus.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudResourceManager/Resource/Liens.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudResourceManager/Resource/Operations.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudResourceManager/Resource/Organizations.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudResourceManager/Resource/Projects.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudResourceManager/ResourceId.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudResourceManager/SearchOrganizationsRequest.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudResourceManager/SearchOrganizationsResponse.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudResourceManager/SetIamPolicyRequest.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudResourceManager/Status.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudResourceManager/TestIamPermissionsRequest.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudResourceManager/TestIamPermissionsResponse.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudResourceManager/UndeleteProjectRequest.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudRuntimeConfig.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudRuntimeConfig/CancelOperationRequest.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudRuntimeConfig/Cardinality.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudRuntimeConfig/EndCondition.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudRuntimeConfig/ListConfigsResponse.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudRuntimeConfig/ListOperationsResponse.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudRuntimeConfig/ListVariablesResponse.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudRuntimeConfig/ListWaitersResponse.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudRuntimeConfig/Operation.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudRuntimeConfig/Resource/Operations.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudRuntimeConfig/Resource/Projects.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudRuntimeConfig/Resource/ProjectsConfigs.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudRuntimeConfig/Resource/ProjectsConfigsOperations.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudRuntimeConfig/Resource/ProjectsConfigsVariables.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudRuntimeConfig/Resource/ProjectsConfigsWaiters.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudRuntimeConfig/RuntimeConfig.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudRuntimeConfig/RuntimeconfigEmpty.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudRuntimeConfig/Status.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudRuntimeConfig/Variable.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudRuntimeConfig/Waiter.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudRuntimeConfig/WatchVariableRequest.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudSourceRepositories.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudSourceRepositories/AuditConfig.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudSourceRepositories/AuditLogConfig.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudSourceRepositories/Binding.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudSourceRepositories/CloudAuditOptions.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudSourceRepositories/Condition.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudSourceRepositories/CounterOptions.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudSourceRepositories/DataAccessOptions.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudSourceRepositories/ListReposResponse.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudSourceRepositories/LogConfig.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudSourceRepositories/MirrorConfig.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudSourceRepositories/Policy.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudSourceRepositories/Repo.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudSourceRepositories/Resource/Projects.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudSourceRepositories/Resource/ProjectsRepos.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudSourceRepositories/Rule.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudSourceRepositories/SetIamPolicyRequest.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudSourceRepositories/SourcerepoEmpty.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudSourceRepositories/TestIamPermissionsRequest.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudSourceRepositories/TestIamPermissionsResponse.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudSpeechAPI.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudSpeechAPI/AsyncRecognizeRequest.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudSpeechAPI/CancelOperationRequest.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudSpeechAPI/ListOperationsResponse.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudSpeechAPI/Operation.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudSpeechAPI/RecognitionAudio.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudSpeechAPI/RecognitionConfig.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudSpeechAPI/Resource/Operations.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudSpeechAPI/Resource/Speech.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudSpeechAPI/SpeechContext.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudSpeechAPI/SpeechEmpty.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudSpeechAPI/SpeechRecognitionAlternative.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudSpeechAPI/SpeechRecognitionResult.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudSpeechAPI/Status.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudSpeechAPI/SyncRecognizeRequest.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudSpeechAPI/SyncRecognizeResponse.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudTrace.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudTrace/CloudtraceEmpty.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudTrace/ListTracesResponse.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudTrace/Resource/Projects.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudTrace/Resource/ProjectsTraces.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudTrace/Trace.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudTrace/TraceSpan.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudTrace/Traces.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudUserAccounts.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudUserAccounts/AuditConfig.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudUserAccounts/AuthorizedKeysView.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudUserAccounts/Binding.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudUserAccounts/Condition.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudUserAccounts/Group.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudUserAccounts/GroupList.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudUserAccounts/GroupsAddMemberRequest.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudUserAccounts/GroupsRemoveMemberRequest.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudUserAccounts/LinuxAccountViews.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudUserAccounts/LinuxGetAuthorizedKeysViewResponse.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudUserAccounts/LinuxGetLinuxAccountViewsResponse.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudUserAccounts/LinuxGroupView.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudUserAccounts/LinuxUserView.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudUserAccounts/LogConfig.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudUserAccounts/LogConfigCounterOptions.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudUserAccounts/Operation.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudUserAccounts/OperationError.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudUserAccounts/OperationErrorErrors.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudUserAccounts/OperationList.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudUserAccounts/OperationWarnings.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudUserAccounts/OperationWarningsData.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudUserAccounts/Policy.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudUserAccounts/PublicKey.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudUserAccounts/Resource/GlobalAccountsOperations.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudUserAccounts/Resource/Groups.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudUserAccounts/Resource/Linux.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudUserAccounts/Resource/Users.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudUserAccounts/Rule.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudUserAccounts/TestPermissionsRequest.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudUserAccounts/TestPermissionsResponse.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudUserAccounts/User.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudUserAccounts/UserList.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Cloudbilling.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Cloudbilling/BillingAccount.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Cloudbilling/ListBillingAccountsResponse.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Cloudbilling/ListProjectBillingInfoResponse.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Cloudbilling/ProjectBillingInfo.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Cloudbilling/Resource/BillingAccounts.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Cloudbilling/Resource/BillingAccountsProjects.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Cloudbilling/Resource/Projects.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Clouderrorreporting.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Clouderrorreporting/DeleteEventsResponse.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Clouderrorreporting/ErrorContext.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Clouderrorreporting/ErrorEvent.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Clouderrorreporting/ErrorGroup.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Clouderrorreporting/ErrorGroupStats.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Clouderrorreporting/HttpRequestContext.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Clouderrorreporting/ListEventsResponse.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Clouderrorreporting/ListGroupStatsResponse.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Clouderrorreporting/ReportErrorEventResponse.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Clouderrorreporting/ReportedErrorEvent.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Clouderrorreporting/Resource/Projects.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Clouderrorreporting/Resource/ProjectsEvents.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Clouderrorreporting/Resource/ProjectsGroupStats.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Clouderrorreporting/Resource/ProjectsGroups.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Clouderrorreporting/ServiceContext.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Clouderrorreporting/SourceLocation.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Clouderrorreporting/TimedCount.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Clouderrorreporting/TrackingIssue.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Cloudlatencytest.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Cloudlatencytest/AggregatedStats.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Cloudlatencytest/AggregatedStatsReply.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Cloudlatencytest/DoubleValue.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Cloudlatencytest/IntValue.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Cloudlatencytest/Stats.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Cloudlatencytest/StatsReply.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Cloudlatencytest/StatscollectionResource.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Cloudlatencytest/StringValue.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/AccessConfig.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/Address.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/AddressAggregatedList.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/AddressList.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/AddressesScopedList.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/AddressesScopedListWarning.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/AddressesScopedListWarningData.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/AttachedDisk.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/AttachedDiskInitializeParams.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/Autoscaler.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/AutoscalerAggregatedList.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/AutoscalerList.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/AutoscalersScopedList.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/AutoscalersScopedListWarning.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/AutoscalersScopedListWarningData.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/AutoscalingPolicy.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/AutoscalingPolicyCpuUtilization.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/AutoscalingPolicyCustomMetricUtilization.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/AutoscalingPolicyLoadBalancingUtilization.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/Backend.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/BackendBucket.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/BackendBucketList.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/BackendService.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/BackendServiceAggregatedList.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/BackendServiceGroupHealth.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/BackendServiceList.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/BackendServicesScopedList.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/BackendServicesScopedListWarning.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/BackendServicesScopedListWarningData.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/CacheInvalidationRule.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/ConnectionDraining.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/CustomerEncryptionKey.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/CustomerEncryptionKeyProtectedDisk.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/DeprecationStatus.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/Disk.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/DiskAggregatedList.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/DiskList.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/DiskMoveRequest.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/DiskType.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/DiskTypeAggregatedList.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/DiskTypeList.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/DiskTypesScopedList.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/DiskTypesScopedListWarning.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/DiskTypesScopedListWarningData.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/DisksResizeRequest.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/DisksScopedList.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/DisksScopedListWarning.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/DisksScopedListWarningData.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/Firewall.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/FirewallAllowed.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/FirewallList.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/ForwardingRule.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/ForwardingRuleAggregatedList.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/ForwardingRuleList.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/ForwardingRulesScopedList.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/ForwardingRulesScopedListWarning.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/ForwardingRulesScopedListWarningData.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/GuestOsFeature.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/HTTP2HealthCheck.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/HealthCheck.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/HealthCheckList.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/HealthCheckReference.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/HealthStatus.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/HostRule.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/HttpHealthCheck.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/HttpHealthCheckList.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/HttpsHealthCheck.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/HttpsHealthCheckList.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/Image.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/ImageList.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/ImageRawDisk.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/Instance.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/InstanceAggregatedList.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/InstanceGroup.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/InstanceGroupAggregatedList.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/InstanceGroupList.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/InstanceGroupManager.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/InstanceGroupManagerActionsSummary.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/InstanceGroupManagerAggregatedList.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/InstanceGroupManagerList.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/InstanceGroupManagersAbandonInstancesRequest.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/InstanceGroupManagersDeleteInstancesRequest.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/InstanceGroupManagersListManagedInstancesResponse.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/InstanceGroupManagersRecreateInstancesRequest.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/InstanceGroupManagersScopedList.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/InstanceGroupManagersScopedListWarning.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/InstanceGroupManagersScopedListWarningData.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/InstanceGroupManagersSetInstanceTemplateRequest.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/InstanceGroupManagersSetTargetPoolsRequest.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/InstanceGroupsAddInstancesRequest.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/InstanceGroupsListInstances.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/InstanceGroupsListInstancesRequest.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/InstanceGroupsRemoveInstancesRequest.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/InstanceGroupsScopedList.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/InstanceGroupsScopedListWarning.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/InstanceGroupsScopedListWarningData.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/InstanceGroupsSetNamedPortsRequest.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/InstanceList.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/InstanceMoveRequest.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/InstanceProperties.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/InstanceReference.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/InstanceTemplate.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/InstanceTemplateList.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/InstanceWithNamedPorts.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/InstancesScopedList.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/InstancesScopedListWarning.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/InstancesScopedListWarningData.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/InstancesSetMachineTypeRequest.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/InstancesSetServiceAccountRequest.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/InstancesStartWithEncryptionKeyRequest.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/License.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/MachineType.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/MachineTypeAggregatedList.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/MachineTypeList.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/MachineTypeScratchDisks.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/MachineTypesScopedList.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/MachineTypesScopedListWarning.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/MachineTypesScopedListWarningData.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/ManagedInstance.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/ManagedInstanceLastAttempt.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/ManagedInstanceLastAttemptErrors.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/ManagedInstanceLastAttemptErrorsErrors.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/Metadata.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/MetadataItems.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/NamedPort.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/Network.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/NetworkInterface.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/NetworkList.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/Operation.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/OperationAggregatedList.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/OperationError.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/OperationErrorErrors.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/OperationList.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/OperationWarnings.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/OperationWarningsData.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/OperationsScopedList.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/OperationsScopedListWarning.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/OperationsScopedListWarningData.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/PathMatcher.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/PathRule.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/Project.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/Quota.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/Region.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/RegionAutoscalerList.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/RegionInstanceGroupList.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/RegionInstanceGroupManagerList.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/RegionInstanceGroupManagersAbandonInstancesRequest.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/RegionInstanceGroupManagersDeleteInstancesRequest.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/RegionInstanceGroupManagersListInstancesResponse.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/RegionInstanceGroupManagersRecreateRequest.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/RegionInstanceGroupManagersSetTargetPoolsRequest.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/RegionInstanceGroupManagersSetTemplateRequest.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/RegionInstanceGroupsListInstances.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/RegionInstanceGroupsListInstancesRequest.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/RegionInstanceGroupsSetNamedPortsRequest.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/RegionList.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/Resource/Addresses.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/Resource/Autoscalers.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/Resource/BackendBuckets.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/Resource/BackendServices.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/Resource/DiskTypes.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/Resource/Disks.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/Resource/Firewalls.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/Resource/ForwardingRules.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/Resource/GlobalAddresses.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/Resource/GlobalForwardingRules.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/Resource/GlobalOperations.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/Resource/HealthChecks.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/Resource/HttpHealthChecks.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/Resource/HttpsHealthChecks.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/Resource/Images.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/Resource/InstanceGroupManagers.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/Resource/InstanceGroups.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/Resource/InstanceTemplates.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/Resource/Instances.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/Resource/Licenses.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/Resource/MachineTypes.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/Resource/Networks.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/Resource/Projects.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/Resource/RegionAutoscalers.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/Resource/RegionBackendServices.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/Resource/RegionInstanceGroupManagers.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/Resource/RegionInstanceGroups.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/Resource/RegionOperations.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/Resource/Regions.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/Resource/Routers.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/Resource/Routes.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/Resource/Snapshots.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/Resource/SslCertificates.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/Resource/Subnetworks.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/Resource/TargetHttpProxies.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/Resource/TargetHttpsProxies.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/Resource/TargetInstances.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/Resource/TargetPools.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/Resource/TargetSslProxies.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/Resource/TargetVpnGateways.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/Resource/UrlMaps.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/Resource/VpnTunnels.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/Resource/ZoneOperations.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/Resource/Zones.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/ResourceGroupReference.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/Route.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/RouteList.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/RouteWarnings.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/RouteWarningsData.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/Router.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/RouterAggregatedList.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/RouterBgp.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/RouterBgpPeer.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/RouterInterface.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/RouterList.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/RouterStatus.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/RouterStatusBgpPeerStatus.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/RouterStatusResponse.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/RoutersPreviewResponse.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/RoutersScopedList.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/RoutersScopedListWarning.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/RoutersScopedListWarningData.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/SSLHealthCheck.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/Scheduling.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/SerialPortOutput.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/ServiceAccount.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/Snapshot.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/SnapshotList.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/SslCertificate.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/SslCertificateList.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/Subnetwork.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/SubnetworkAggregatedList.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/SubnetworkList.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/SubnetworksExpandIpCidrRangeRequest.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/SubnetworksScopedList.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/SubnetworksScopedListWarning.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/SubnetworksScopedListWarningData.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/TCPHealthCheck.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/Tags.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/TargetHttpProxy.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/TargetHttpProxyList.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/TargetHttpsProxiesSetSslCertificatesRequest.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/TargetHttpsProxy.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/TargetHttpsProxyList.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/TargetInstance.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/TargetInstanceAggregatedList.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/TargetInstanceList.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/TargetInstancesScopedList.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/TargetInstancesScopedListWarning.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/TargetInstancesScopedListWarningData.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/TargetPool.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/TargetPoolAggregatedList.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/TargetPoolInstanceHealth.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/TargetPoolList.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/TargetPoolsAddHealthCheckRequest.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/TargetPoolsAddInstanceRequest.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/TargetPoolsRemoveHealthCheckRequest.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/TargetPoolsRemoveInstanceRequest.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/TargetPoolsScopedList.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/TargetPoolsScopedListWarning.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/TargetPoolsScopedListWarningData.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/TargetReference.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/TargetSslProxiesSetBackendServiceRequest.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/TargetSslProxiesSetProxyHeaderRequest.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/TargetSslProxiesSetSslCertificatesRequest.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/TargetSslProxy.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/TargetSslProxyList.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/TargetVpnGateway.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/TargetVpnGatewayAggregatedList.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/TargetVpnGatewayList.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/TargetVpnGatewaysScopedList.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/TargetVpnGatewaysScopedListWarning.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/TargetVpnGatewaysScopedListWarningData.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/TestFailure.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/UrlMap.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/UrlMapList.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/UrlMapReference.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/UrlMapTest.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/UrlMapValidationResult.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/UrlMapsValidateRequest.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/UrlMapsValidateResponse.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/UsageExportLocation.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/VpnTunnel.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/VpnTunnelAggregatedList.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/VpnTunnelList.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/VpnTunnelsScopedList.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/VpnTunnelsScopedListWarning.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/VpnTunnelsScopedListWarningData.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/Zone.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/ZoneList.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ConsumerSurveys.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ConsumerSurveys/FieldMask.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ConsumerSurveys/MobileAppPanel.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ConsumerSurveys/MobileAppPanelsListResponse.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ConsumerSurveys/PageInfo.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ConsumerSurveys/Resource/Mobileapppanels.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ConsumerSurveys/Resource/Results.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ConsumerSurveys/Resource/Surveys.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ConsumerSurveys/ResultsGetRequest.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ConsumerSurveys/ResultsMask.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ConsumerSurveys/Survey.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ConsumerSurveys/SurveyAudience.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ConsumerSurveys/SurveyCost.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ConsumerSurveys/SurveyQuestion.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ConsumerSurveys/SurveyQuestionImage.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ConsumerSurveys/SurveyRejection.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ConsumerSurveys/SurveyResults.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ConsumerSurveys/SurveysDeleteResponse.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ConsumerSurveys/SurveysListResponse.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ConsumerSurveys/SurveysStartRequest.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ConsumerSurveys/SurveysStartResponse.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ConsumerSurveys/SurveysStopResponse.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ConsumerSurveys/TokenPagination.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Container.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Container/AddonsConfig.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Container/AutoUpgradeOptions.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Container/CancelOperationRequest.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Container/Cluster.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Container/ClusterUpdate.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Container/ContainerEmpty.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Container/CreateClusterRequest.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Container/CreateNodePoolRequest.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Container/HorizontalPodAutoscaling.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Container/HttpLoadBalancing.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Container/ListClustersResponse.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Container/ListNodePoolsResponse.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Container/ListOperationsResponse.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Container/MasterAuth.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Container/NodeConfig.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Container/NodeManagement.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Container/NodePool.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Container/NodePoolAutoscaling.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Container/Operation.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Container/Resource/Projects.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Container/Resource/ProjectsZones.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Container/Resource/ProjectsZonesClusters.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Container/Resource/ProjectsZonesClustersNodePools.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Container/Resource/ProjectsZonesOperations.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Container/RollbackNodePoolUpgradeRequest.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Container/ServerConfig.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Container/SetNodePoolManagementRequest.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Container/UpdateClusterRequest.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Coordinate.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Coordinate/CustomField.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Coordinate/CustomFieldDef.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Coordinate/CustomFieldDefListResponse.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Coordinate/CustomFields.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Coordinate/EnumItemDef.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Coordinate/Job.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Coordinate/JobChange.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Coordinate/JobListResponse.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Coordinate/JobState.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Coordinate/Location.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Coordinate/LocationListResponse.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Coordinate/LocationRecord.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Coordinate/Resource/CustomFieldDef.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Coordinate/Resource/Jobs.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Coordinate/Resource/Location.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Coordinate/Resource/Schedule.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Coordinate/Resource/Team.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Coordinate/Resource/Worker.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Coordinate/Schedule.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Coordinate/Team.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Coordinate/TeamListResponse.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Coordinate/TokenPagination.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Coordinate/Worker.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Coordinate/WorkerListResponse.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Customsearch.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Customsearch/Context.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Customsearch/ContextFacets.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Customsearch/Promotion.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Customsearch/PromotionBodyLines.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Customsearch/PromotionImage.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Customsearch/Query.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Customsearch/Resource/Cse.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Customsearch/Result.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Customsearch/ResultImage.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Customsearch/ResultLabels.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Customsearch/Search.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Customsearch/SearchSearchInformation.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Customsearch/SearchSpelling.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Customsearch/SearchUrl.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/DataTransfer.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/DataTransfer/Application.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/DataTransfer/ApplicationDataTransfer.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/DataTransfer/ApplicationTransferParam.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/DataTransfer/ApplicationsListResponse.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/DataTransfer/DataTransfer.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/DataTransfer/DataTransfersListResponse.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/DataTransfer/Resource/Applications.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/DataTransfer/Resource/Transfers.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dataflow.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dataflow/ApproximateProgress.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dataflow/ApproximateReportedProgress.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dataflow/ApproximateSplitRequest.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dataflow/AutoscalingSettings.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dataflow/CPUTime.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dataflow/ComponentSource.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dataflow/ComponentTransform.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dataflow/ComputationTopology.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dataflow/ConcatPosition.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dataflow/CounterMetadata.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dataflow/CounterStructuredName.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dataflow/CounterStructuredNameAndMetadata.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dataflow/CounterUpdate.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dataflow/CreateJobFromTemplateRequest.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dataflow/CustomSourceLocation.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dataflow/DataDiskAssignment.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dataflow/DerivedSource.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dataflow/Disk.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dataflow/DisplayData.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dataflow/DistributionUpdate.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dataflow/DynamicSourceSplit.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dataflow/Environment.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dataflow/ExecutionStageSummary.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dataflow/FailedLocation.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dataflow/FlattenInstruction.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dataflow/FloatingPointList.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dataflow/FloatingPointMean.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dataflow/GetDebugConfigRequest.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dataflow/GetDebugConfigResponse.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dataflow/GetTemplateResponse.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dataflow/InstructionInput.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dataflow/InstructionOutput.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dataflow/IntegerList.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dataflow/IntegerMean.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dataflow/Job.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dataflow/JobExecutionInfo.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dataflow/JobExecutionStageInfo.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dataflow/JobMessage.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dataflow/JobMetrics.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dataflow/KeyRangeDataDiskAssignment.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dataflow/KeyRangeLocation.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dataflow/LaunchTemplateParameters.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dataflow/LaunchTemplateResponse.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dataflow/LeaseWorkItemRequest.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dataflow/LeaseWorkItemResponse.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dataflow/ListJobMessagesResponse.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dataflow/ListJobsResponse.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dataflow/MapTask.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dataflow/MetricShortId.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dataflow/MetricStructuredName.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dataflow/MetricUpdate.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dataflow/MountedDataDisk.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dataflow/MultiOutputInfo.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dataflow/NameAndKind.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dataflow/Package.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dataflow/ParDoInstruction.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dataflow/ParallelInstruction.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dataflow/ParameterMetadata.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dataflow/PartialGroupByKeyInstruction.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dataflow/PipelineDescription.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dataflow/Position.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dataflow/PubsubLocation.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dataflow/ReadInstruction.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dataflow/ReportWorkItemStatusRequest.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dataflow/ReportWorkItemStatusResponse.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dataflow/ReportedParallelism.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dataflow/Resource/Projects.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dataflow/Resource/ProjectsJobs.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dataflow/Resource/ProjectsJobsDebug.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dataflow/Resource/ProjectsJobsMessages.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dataflow/Resource/ProjectsJobsWorkItems.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dataflow/Resource/ProjectsLocations.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dataflow/Resource/ProjectsLocationsJobs.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dataflow/Resource/ProjectsLocationsJobsMessages.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dataflow/Resource/ProjectsLocationsJobsWorkItems.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dataflow/Resource/ProjectsTemplates.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dataflow/ResourceUtilizationReport.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dataflow/ResourceUtilizationReportResponse.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dataflow/RuntimeEnvironment.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dataflow/SendDebugCaptureRequest.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dataflow/SendDebugCaptureResponse.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dataflow/SendWorkerMessagesRequest.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dataflow/SendWorkerMessagesResponse.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dataflow/SeqMapTask.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dataflow/SeqMapTaskOutputInfo.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dataflow/ShellTask.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dataflow/SideInputInfo.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dataflow/Sink.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dataflow/Source.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dataflow/SourceFork.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dataflow/SourceGetMetadataRequest.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dataflow/SourceGetMetadataResponse.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dataflow/SourceMetadata.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dataflow/SourceOperationRequest.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dataflow/SourceOperationResponse.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dataflow/SourceSplitOptions.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dataflow/SourceSplitRequest.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dataflow/SourceSplitResponse.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dataflow/SourceSplitShard.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dataflow/SplitInt64.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dataflow/StageSource.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dataflow/StateFamilyConfig.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dataflow/Status.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dataflow/Step.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dataflow/StreamLocation.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dataflow/StreamingComputationConfig.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dataflow/StreamingComputationRanges.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dataflow/StreamingComputationTask.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dataflow/StreamingConfigTask.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dataflow/StreamingSetupTask.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dataflow/StreamingSideInputLocation.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dataflow/StreamingStageLocation.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dataflow/StringList.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dataflow/TaskRunnerSettings.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dataflow/TemplateMetadata.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dataflow/TopologyConfig.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dataflow/TransformSummary.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dataflow/WorkItem.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dataflow/WorkItemServiceState.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dataflow/WorkItemStatus.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dataflow/WorkerHealthReport.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dataflow/WorkerHealthReportResponse.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dataflow/WorkerMessage.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dataflow/WorkerMessageCode.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dataflow/WorkerMessageResponse.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dataflow/WorkerPool.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dataflow/WorkerSettings.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dataflow/WriteInstruction.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dataproc.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dataproc/AcceleratorConfig.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dataproc/CancelJobRequest.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dataproc/Cluster.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dataproc/ClusterConfig.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dataproc/ClusterMetrics.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dataproc/ClusterOperationMetadata.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dataproc/ClusterOperationStatus.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dataproc/ClusterStatus.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dataproc/DataprocEmpty.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dataproc/DiagnoseClusterOutputLocation.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dataproc/DiagnoseClusterRequest.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dataproc/DiagnoseClusterResults.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dataproc/DiskConfig.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dataproc/GceClusterConfig.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dataproc/HadoopJob.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dataproc/HiveJob.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dataproc/InstanceGroupConfig.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dataproc/Job.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dataproc/JobPlacement.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dataproc/JobReference.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dataproc/JobScheduling.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dataproc/JobStatus.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dataproc/ListClustersResponse.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dataproc/ListJobsResponse.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dataproc/ListOperationsResponse.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dataproc/LoggingConfig.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dataproc/ManagedGroupConfig.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dataproc/NodeInitializationAction.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dataproc/Operation.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dataproc/OperationMetadata.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dataproc/OperationStatus.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dataproc/PigJob.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dataproc/PySparkJob.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dataproc/QueryList.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dataproc/Resource/Projects.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dataproc/Resource/ProjectsRegions.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dataproc/Resource/ProjectsRegionsClusters.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dataproc/Resource/ProjectsRegionsJobs.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dataproc/Resource/ProjectsRegionsOperations.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dataproc/SoftwareConfig.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dataproc/SparkJob.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dataproc/SparkSqlJob.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dataproc/Status.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dataproc/SubmitJobRequest.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dataproc/YarnApplication.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Datastore.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Datastore/AllocateIdsRequest.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Datastore/AllocateIdsResponse.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Datastore/ArrayValue.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Datastore/BeginTransactionRequest.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Datastore/BeginTransactionResponse.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Datastore/CommitRequest.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Datastore/CommitResponse.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Datastore/CompositeFilter.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Datastore/Entity.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Datastore/EntityResult.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Datastore/Filter.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Datastore/GqlQuery.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Datastore/GqlQueryParameter.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Datastore/Key.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Datastore/KindExpression.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Datastore/LatLng.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Datastore/LookupRequest.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Datastore/LookupResponse.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Datastore/Mutation.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Datastore/MutationResult.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Datastore/PartitionId.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Datastore/PathElement.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Datastore/Projection.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Datastore/PropertyFilter.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Datastore/PropertyOrder.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Datastore/PropertyReference.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Datastore/Query.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Datastore/QueryResultBatch.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Datastore/ReadOptions.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Datastore/Resource/Projects.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Datastore/RollbackRequest.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Datastore/RollbackResponse.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Datastore/RunQueryRequest.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Datastore/RunQueryResponse.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Datastore/Value.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/DeploymentManager.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/DeploymentManager/AuditConfig.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/DeploymentManager/AuditLogConfig.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/DeploymentManager/Binding.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/DeploymentManager/Condition.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/DeploymentManager/ConfigFile.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/DeploymentManager/Deployment.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/DeploymentManager/DeploymentLabelEntry.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/DeploymentManager/DeploymentUpdate.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/DeploymentManager/DeploymentUpdateLabelEntry.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/DeploymentManager/DeploymentmanagerResource.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/DeploymentManager/DeploymentmanagerResourceWarnings.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/DeploymentManager/DeploymentmanagerResourceWarningsData.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/DeploymentManager/DeploymentsCancelPreviewRequest.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/DeploymentManager/DeploymentsListResponse.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/DeploymentManager/DeploymentsStopRequest.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/DeploymentManager/ImportFile.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/DeploymentManager/LogConfig.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/DeploymentManager/LogConfigCounterOptions.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/DeploymentManager/Manifest.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/DeploymentManager/ManifestsListResponse.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/DeploymentManager/Operation.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/DeploymentManager/OperationError.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/DeploymentManager/OperationErrorErrors.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/DeploymentManager/OperationWarnings.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/DeploymentManager/OperationWarningsData.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/DeploymentManager/OperationsListResponse.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/DeploymentManager/Policy.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/DeploymentManager/Resource/Deployments.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/DeploymentManager/Resource/Manifests.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/DeploymentManager/Resource/Operations.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/DeploymentManager/Resource/Resources.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/DeploymentManager/Resource/Types.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/DeploymentManager/ResourceAccessControl.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/DeploymentManager/ResourceUpdate.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/DeploymentManager/ResourceUpdateError.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/DeploymentManager/ResourceUpdateErrorErrors.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/DeploymentManager/ResourceUpdateWarnings.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/DeploymentManager/ResourceUpdateWarningsData.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/DeploymentManager/ResourcesListResponse.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/DeploymentManager/Rule.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/DeploymentManager/TargetConfiguration.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/DeploymentManager/TestPermissionsRequest.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/DeploymentManager/TestPermissionsResponse.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/DeploymentManager/Type.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/DeploymentManager/TypesListResponse.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/Account.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/AccountActiveAdSummary.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/AccountPermission.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/AccountPermissionGroup.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/AccountPermissionGroupsListResponse.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/AccountPermissionsListResponse.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/AccountUserProfile.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/AccountUserProfilesListResponse.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/AccountsListResponse.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/Activities.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/Ad.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/AdSlot.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/AdsListResponse.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/Advertiser.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/AdvertiserGroup.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/AdvertiserGroupsListResponse.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/AdvertisersListResponse.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/AudienceSegment.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/AudienceSegmentGroup.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/Browser.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/BrowsersListResponse.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/Campaign.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/CampaignCreativeAssociation.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/CampaignCreativeAssociationsListResponse.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/CampaignsListResponse.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/ChangeLog.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/ChangeLogsListResponse.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/CitiesListResponse.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/City.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/ClickTag.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/ClickThroughUrl.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/ClickThroughUrlSuffixProperties.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/CompanionClickThroughOverride.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/CompanionSetting.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/CompatibleFields.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/ConnectionType.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/ConnectionTypesListResponse.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/ContentCategoriesListResponse.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/ContentCategory.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/Conversion.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/ConversionError.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/ConversionStatus.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/ConversionsBatchInsertRequest.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/ConversionsBatchInsertResponse.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/CountriesListResponse.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/Country.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/Creative.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/CreativeAsset.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/CreativeAssetId.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/CreativeAssetMetadata.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/CreativeAssetSelection.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/CreativeAssignment.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/CreativeCustomEvent.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/CreativeField.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/CreativeFieldAssignment.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/CreativeFieldValue.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/CreativeFieldValuesListResponse.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/CreativeFieldsListResponse.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/CreativeGroup.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/CreativeGroupAssignment.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/CreativeGroupsListResponse.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/CreativeOptimizationConfiguration.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/CreativeRotation.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/CreativeSettings.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/CreativesListResponse.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/CrossDimensionReachReportCompatibleFields.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/CustomFloodlightVariable.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/CustomRichMediaEvents.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/DateRange.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/DayPartTargeting.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/DefaultClickThroughEventTagProperties.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/DeliverySchedule.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/DfareportingFile.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/DfareportingFileUrls.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/DfpSettings.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/Dimension.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/DimensionFilter.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/DimensionValue.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/DimensionValueList.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/DimensionValueRequest.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/DirectorySite.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/DirectorySiteContact.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/DirectorySiteContactAssignment.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/DirectorySiteContactsListResponse.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/DirectorySiteSettings.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/DirectorySitesListResponse.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/DynamicTargetingKey.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/DynamicTargetingKeysListResponse.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/EncryptionInfo.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/EventTag.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/EventTagOverride.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/EventTagsListResponse.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/FileList.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/Flight.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/FloodlightActivitiesGenerateTagResponse.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/FloodlightActivitiesListResponse.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/FloodlightActivity.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/FloodlightActivityDynamicTag.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/FloodlightActivityGroup.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/FloodlightActivityGroupsListResponse.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/FloodlightActivityPublisherDynamicTag.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/FloodlightConfiguration.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/FloodlightConfigurationsListResponse.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/FloodlightReportCompatibleFields.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/FrequencyCap.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/FsCommand.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/GeoTargeting.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/InventoryItem.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/InventoryItemsListResponse.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/KeyValueTargetingExpression.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/LandingPage.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/LandingPagesListResponse.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/Language.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/LanguageTargeting.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/LanguagesListResponse.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/LastModifiedInfo.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/ListPopulationClause.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/ListPopulationRule.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/ListPopulationTerm.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/ListTargetingExpression.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/LookbackConfiguration.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/Metric.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/Metro.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/MetrosListResponse.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/MobileCarrier.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/MobileCarriersListResponse.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/ObjectFilter.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/OffsetPosition.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/OmnitureSettings.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/OperatingSystem.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/OperatingSystemVersion.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/OperatingSystemVersionsListResponse.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/OperatingSystemsListResponse.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/OptimizationActivity.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/Order.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/OrderContact.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/OrderDocument.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/OrderDocumentsListResponse.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/OrdersListResponse.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/PathToConversionReportCompatibleFields.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/Placement.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/PlacementAssignment.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/PlacementGroup.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/PlacementGroupsListResponse.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/PlacementStrategiesListResponse.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/PlacementStrategy.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/PlacementTag.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/PlacementsGenerateTagsResponse.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/PlacementsListResponse.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/PlatformType.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/PlatformTypesListResponse.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/PopupWindowProperties.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/PostalCode.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/PostalCodesListResponse.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/Pricing.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/PricingSchedule.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/PricingSchedulePricingPeriod.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/Project.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/ProjectsListResponse.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/ReachReportCompatibleFields.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/Recipient.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/Region.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/RegionsListResponse.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/RemarketingList.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/RemarketingListShare.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/RemarketingListsListResponse.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/Report.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/ReportCompatibleFields.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/ReportCriteria.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/ReportCrossDimensionReachCriteria.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/ReportDelivery.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/ReportFloodlightCriteria.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/ReportFloodlightCriteriaReportProperties.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/ReportList.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/ReportPathToConversionCriteria.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/ReportPathToConversionCriteriaReportProperties.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/ReportReachCriteria.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/ReportSchedule.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/ReportsConfiguration.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/Resource/AccountActiveAdSummaries.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/Resource/AccountPermissionGroups.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/Resource/AccountPermissions.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/Resource/AccountUserProfiles.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/Resource/Accounts.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/Resource/Ads.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/Resource/AdvertiserGroups.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/Resource/Advertisers.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/Resource/Browsers.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/Resource/CampaignCreativeAssociations.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/Resource/Campaigns.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/Resource/ChangeLogs.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/Resource/Cities.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/Resource/ConnectionTypes.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/Resource/ContentCategories.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/Resource/Conversions.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/Resource/Countries.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/Resource/CreativeAssets.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/Resource/CreativeFieldValues.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/Resource/CreativeFields.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/Resource/CreativeGroups.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/Resource/Creatives.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/Resource/DimensionValues.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/Resource/DirectorySiteContacts.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/Resource/DirectorySites.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/Resource/DynamicTargetingKeys.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/Resource/EventTags.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/Resource/Files.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/Resource/FloodlightActivities.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/Resource/FloodlightActivityGroups.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/Resource/FloodlightConfigurations.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/Resource/InventoryItems.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/Resource/LandingPages.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/Resource/Languages.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/Resource/Metros.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/Resource/MobileCarriers.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/Resource/OperatingSystemVersions.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/Resource/OperatingSystems.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/Resource/OrderDocuments.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/Resource/Orders.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/Resource/PlacementGroups.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/Resource/PlacementStrategies.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/Resource/Placements.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/Resource/PlatformTypes.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/Resource/PostalCodes.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/Resource/Projects.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/Resource/Regions.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/Resource/RemarketingListShares.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/Resource/RemarketingLists.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/Resource/Reports.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/Resource/ReportsCompatibleFields.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/Resource/ReportsFiles.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/Resource/Sites.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/Resource/Sizes.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/Resource/Subaccounts.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/Resource/TargetableRemarketingLists.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/Resource/TargetingTemplates.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/Resource/UserProfiles.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/Resource/UserRolePermissionGroups.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/Resource/UserRolePermissions.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/Resource/UserRoles.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/Resource/VideoFormats.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/RichMediaExitOverride.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/Rule.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/Site.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/SiteContact.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/SiteSettings.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/SitesListResponse.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/Size.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/SizesListResponse.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/SkippableSetting.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/SortedDimension.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/Subaccount.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/SubaccountsListResponse.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/TagData.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/TagSetting.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/TagSettings.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/TargetWindow.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/TargetableRemarketingList.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/TargetableRemarketingListsListResponse.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/TargetingTemplate.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/TargetingTemplatesListResponse.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/TechnologyTargeting.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/ThirdPartyAuthenticationToken.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/ThirdPartyTrackingUrl.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/TranscodeSetting.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/UserDefinedVariableConfiguration.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/UserProfile.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/UserProfileList.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/UserRole.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/UserRolePermission.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/UserRolePermissionGroup.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/UserRolePermissionGroupsListResponse.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/UserRolePermissionsListResponse.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/UserRolesListResponse.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/VideoFormat.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/VideoFormatsListResponse.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/VideoOffset.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/VideoSettings.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Directory.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Directory/Alias.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Directory/Aliases.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Directory/Asp.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Directory/Asps.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Directory/CalendarResource.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Directory/CalendarResources.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Directory/Channel.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Directory/ChromeOsDevice.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Directory/ChromeOsDeviceAction.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Directory/ChromeOsDeviceActiveTimeRanges.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Directory/ChromeOsDeviceRecentUsers.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Directory/ChromeOsDevices.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Directory/Customer.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Directory/CustomerPostalAddress.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Directory/DomainAlias.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Directory/DomainAliases.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Directory/Domains.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Directory/Domains2.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Directory/Group.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Directory/Groups.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Directory/Member.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Directory/Members.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Directory/MobileDevice.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Directory/MobileDeviceAction.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Directory/MobileDeviceApplications.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Directory/MobileDevices.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Directory/Notification.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Directory/Notifications.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Directory/OrgUnit.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Directory/OrgUnits.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Directory/Privilege.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Directory/Privileges.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Directory/Resource/Asps.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Directory/Resource/Channels.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Directory/Resource/Chromeosdevices.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Directory/Resource/Customers.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Directory/Resource/DomainAliases.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Directory/Resource/Domains.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Directory/Resource/Groups.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Directory/Resource/GroupsAliases.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Directory/Resource/Members.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Directory/Resource/Mobiledevices.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Directory/Resource/Notifications.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Directory/Resource/Orgunits.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Directory/Resource/Privileges.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Directory/Resource/Resources.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Directory/Resource/ResourcesCalendars.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Directory/Resource/RoleAssignments.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Directory/Resource/Roles.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Directory/Resource/Schemas.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Directory/Resource/Tokens.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Directory/Resource/Users.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Directory/Resource/UsersAliases.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Directory/Resource/UsersPhotos.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Directory/Resource/VerificationCodes.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Directory/Role.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Directory/RoleAssignment.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Directory/RoleAssignments.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Directory/RoleRolePrivileges.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Directory/Roles.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Directory/Schema.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Directory/SchemaFieldSpec.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Directory/SchemaFieldSpecNumericIndexingSpec.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Directory/Schemas.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Directory/Token.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Directory/Tokens.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Directory/User.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Directory/UserAbout.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Directory/UserAddress.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Directory/UserEmail.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Directory/UserExternalId.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Directory/UserIm.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Directory/UserMakeAdmin.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Directory/UserName.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Directory/UserOrganization.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Directory/UserPhone.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Directory/UserPhoto.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Directory/UserRelation.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Directory/UserUndelete.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Directory/UserWebsite.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Directory/Users.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Directory/VerificationCode.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Directory/VerificationCodes.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dns.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dns/Change.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dns/ChangesListResponse.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dns/ManagedZone.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dns/ManagedZonesListResponse.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dns/Project.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dns/Quota.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dns/Resource/Changes.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dns/Resource/ManagedZones.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dns/Resource/Projects.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dns/Resource/ResourceRecordSets.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dns/ResourceRecordSet.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dns/ResourceRecordSetsListResponse.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/DoubleClickBidManager.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/DoubleClickBidManager/DownloadLineItemsRequest.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/DoubleClickBidManager/DownloadLineItemsResponse.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/DoubleClickBidManager/DownloadRequest.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/DoubleClickBidManager/DownloadResponse.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/DoubleClickBidManager/FilterPair.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/DoubleClickBidManager/ListQueriesResponse.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/DoubleClickBidManager/ListReportsResponse.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/DoubleClickBidManager/Note.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/DoubleClickBidManager/NotifyProposalChangeRequest.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/DoubleClickBidManager/Parameters.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/DoubleClickBidManager/Query.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/DoubleClickBidManager/QueryMetadata.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/DoubleClickBidManager/QuerySchedule.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/DoubleClickBidManager/Report.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/DoubleClickBidManager/ReportFailure.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/DoubleClickBidManager/ReportKey.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/DoubleClickBidManager/ReportMetadata.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/DoubleClickBidManager/ReportStatus.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/DoubleClickBidManager/Resource/Lineitems.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/DoubleClickBidManager/Resource/Queries.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/DoubleClickBidManager/Resource/Reports.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/DoubleClickBidManager/Resource/Rubicon.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/DoubleClickBidManager/Resource/Sdf.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/DoubleClickBidManager/RowStatus.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/DoubleClickBidManager/RunQueryRequest.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/DoubleClickBidManager/UploadLineItemsRequest.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/DoubleClickBidManager/UploadLineItemsResponse.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/DoubleClickBidManager/UploadStatus.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Doubleclicksearch.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Doubleclicksearch/Availability.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Doubleclicksearch/Conversion.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Doubleclicksearch/ConversionList.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Doubleclicksearch/CustomDimension.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Doubleclicksearch/CustomMetric.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Doubleclicksearch/Report.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Doubleclicksearch/ReportApiColumnSpec.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Doubleclicksearch/ReportFiles.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Doubleclicksearch/ReportRequest.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Doubleclicksearch/ReportRequestFilters.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Doubleclicksearch/ReportRequestOrderBy.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Doubleclicksearch/ReportRequestReportScope.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Doubleclicksearch/ReportRequestTimeRange.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Doubleclicksearch/Resource/Conversion.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Doubleclicksearch/Resource/Reports.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Doubleclicksearch/Resource/SavedColumns.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Doubleclicksearch/SavedColumn.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Doubleclicksearch/SavedColumnList.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Doubleclicksearch/UpdateAvailabilityRequest.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Doubleclicksearch/UpdateAvailabilityResponse.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Drive.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Drive/About.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Drive/AboutStorageQuota.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Drive/Change.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Drive/ChangeList.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Drive/Channel.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Drive/Comment.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Drive/CommentList.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Drive/CommentQuotedFileContent.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Drive/DriveFile.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Drive/DriveFileCapabilities.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Drive/DriveFileContentHints.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Drive/DriveFileContentHintsThumbnail.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Drive/DriveFileImageMediaMetadata.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Drive/DriveFileImageMediaMetadataLocation.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Drive/DriveFileVideoMediaMetadata.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Drive/FileList.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Drive/GeneratedIds.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Drive/Permission.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Drive/PermissionList.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Drive/PermissionTeamDrivePermissionDetails.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Drive/Reply.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Drive/ReplyList.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Drive/Resource/About.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Drive/Resource/Changes.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Drive/Resource/Channels.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Drive/Resource/Comments.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Drive/Resource/Files.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Drive/Resource/Permissions.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Drive/Resource/Replies.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Drive/Resource/Revisions.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Drive/Resource/Teamdrives.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Drive/Revision.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Drive/RevisionList.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Drive/StartPageToken.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Drive/TeamDrive.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Drive/TeamDriveCapabilities.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Drive/TeamDriveList.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Drive/User.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/FirebaseDynamicLinks.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/FirebaseDynamicLinks/AnalyticsInfo.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/FirebaseDynamicLinks/AndroidInfo.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/FirebaseDynamicLinks/CreateShortDynamicLinkRequest.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/FirebaseDynamicLinks/CreateShortDynamicLinkResponse.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/FirebaseDynamicLinks/DynamicLinkInfo.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/FirebaseDynamicLinks/DynamicLinkWarning.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/FirebaseDynamicLinks/GooglePlayAnalytics.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/FirebaseDynamicLinks/ITunesConnectAnalytics.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/FirebaseDynamicLinks/IosInfo.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/FirebaseDynamicLinks/NavigationInfo.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/FirebaseDynamicLinks/Resource/ShortLinks.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/FirebaseDynamicLinks/SocialMetaTagInfo.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/FirebaseDynamicLinks/Suffix.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/FirebaseDynamicLinksAPI.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/FirebaseDynamicLinksAPI/AnalyticsInfo.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/FirebaseDynamicLinksAPI/AndroidInfo.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/FirebaseDynamicLinksAPI/CreateShortDynamicLinkRequest.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/FirebaseDynamicLinksAPI/CreateShortDynamicLinkResponse.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/FirebaseDynamicLinksAPI/DynamicLinkInfo.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/FirebaseDynamicLinksAPI/DynamicLinkWarning.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/FirebaseDynamicLinksAPI/GooglePlayAnalytics.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/FirebaseDynamicLinksAPI/ITunesConnectAnalytics.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/FirebaseDynamicLinksAPI/IosInfo.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/FirebaseDynamicLinksAPI/Resource/ShortDynamicLinks.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/FirebaseDynamicLinksAPI/SocialMetaTagInfo.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/FirebaseDynamicLinksAPI/Suffix.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/FirebaseRulesAPI.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/FirebaseRulesAPI/FirebaserulesEmpty.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/FirebaseRulesAPI/FirebaserulesFile.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/FirebaseRulesAPI/Issue.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/FirebaseRulesAPI/ListReleasesResponse.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/FirebaseRulesAPI/ListRulesetsResponse.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/FirebaseRulesAPI/Release.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/FirebaseRulesAPI/Resource/Projects.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/FirebaseRulesAPI/Resource/ProjectsReleases.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/FirebaseRulesAPI/Resource/ProjectsRulesets.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/FirebaseRulesAPI/Ruleset.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/FirebaseRulesAPI/Source.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/FirebaseRulesAPI/SourcePosition.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/FirebaseRulesAPI/TestRulesetRequest.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/FirebaseRulesAPI/TestRulesetResponse.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Fitness.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Fitness/AggregateBucket.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Fitness/AggregateBy.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Fitness/AggregateRequest.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Fitness/AggregateResponse.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Fitness/Application.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Fitness/BucketByActivity.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Fitness/BucketBySession.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Fitness/BucketByTime.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Fitness/BucketByTimePeriod.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Fitness/DataPoint.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Fitness/DataSource.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Fitness/DataType.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Fitness/DataTypeField.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Fitness/Dataset.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Fitness/Device.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Fitness/ListDataSourcesResponse.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Fitness/ListSessionsResponse.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Fitness/MapValue.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Fitness/Resource/Users.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Fitness/Resource/UsersDataSources.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Fitness/Resource/UsersDataSourcesDatasets.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Fitness/Resource/UsersDataset.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Fitness/Resource/UsersSessions.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Fitness/Session.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Fitness/Value.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Fitness/ValueMapValEntry.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Freebase.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Freebase/ReconcileCandidate.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Freebase/ReconcileCandidateNotable.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Freebase/ReconcileGet.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Freebase/ReconcileGetCosts.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Freebase/ReconcileGetWarning.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Fusiontables.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Fusiontables/Bucket.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Fusiontables/Column.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Fusiontables/ColumnBaseColumn.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Fusiontables/ColumnList.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Fusiontables/Geometry.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Fusiontables/Import.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Fusiontables/Line.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Fusiontables/LineStyle.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Fusiontables/Point.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Fusiontables/PointStyle.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Fusiontables/Polygon.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Fusiontables/PolygonStyle.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Fusiontables/Resource/Column.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Fusiontables/Resource/Query.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Fusiontables/Resource/Style.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Fusiontables/Resource/Table.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Fusiontables/Resource/Task.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Fusiontables/Resource/Template.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Fusiontables/Sqlresponse.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Fusiontables/StyleFunction.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Fusiontables/StyleFunctionGradient.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Fusiontables/StyleFunctionGradientColors.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Fusiontables/StyleSetting.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Fusiontables/StyleSettingList.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Fusiontables/Table.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Fusiontables/TableList.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Fusiontables/Task.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Fusiontables/TaskList.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Fusiontables/Template.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Fusiontables/TemplateList.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Games.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Games/AchievementDefinition.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Games/AchievementDefinitionsListResponse.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Games/AchievementIncrementResponse.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Games/AchievementRevealResponse.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Games/AchievementSetStepsAtLeastResponse.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Games/AchievementUnlockResponse.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Games/AchievementUpdateMultipleRequest.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Games/AchievementUpdateMultipleResponse.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Games/AchievementUpdateRequest.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Games/AchievementUpdateResponse.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Games/AggregateStats.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Games/AnonymousPlayer.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Games/Application.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Games/ApplicationCategory.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Games/ApplicationVerifyResponse.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Games/Category.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Games/CategoryListResponse.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Games/EventBatchRecordFailure.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Games/EventChild.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Games/EventDefinition.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Games/EventDefinitionListResponse.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Games/EventPeriodRange.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Games/EventPeriodUpdate.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Games/EventRecordFailure.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Games/EventRecordRequest.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Games/EventUpdateRequest.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Games/EventUpdateResponse.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Games/GamesAchievementIncrement.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Games/GamesAchievementSetStepsAtLeast.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Games/ImageAsset.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Games/Instance.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Games/InstanceAndroidDetails.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Games/InstanceIosDetails.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Games/InstanceWebDetails.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Games/Leaderboard.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Games/LeaderboardEntry.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Games/LeaderboardListResponse.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Games/LeaderboardScoreRank.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Games/LeaderboardScores.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Games/MetagameConfig.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Games/NetworkDiagnostics.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Games/ParticipantResult.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Games/PeerChannelDiagnostics.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Games/PeerSessionDiagnostics.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Games/Played.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Games/Player.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Games/PlayerAchievement.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Games/PlayerAchievementListResponse.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Games/PlayerEvent.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Games/PlayerEventListResponse.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Games/PlayerExperienceInfo.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Games/PlayerLeaderboardScore.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Games/PlayerLeaderboardScoreListResponse.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Games/PlayerLevel.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Games/PlayerListResponse.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Games/PlayerName.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Games/PlayerScore.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Games/PlayerScoreListResponse.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Games/PlayerScoreResponse.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Games/PlayerScoreSubmissionList.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Games/ProfileSettings.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Games/PushToken.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Games/PushTokenId.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Games/PushTokenIdIos.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Games/Quest.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Games/QuestContribution.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Games/QuestCriterion.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Games/QuestListResponse.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Games/QuestMilestone.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Games/Resource/AchievementDefinitions.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Games/Resource/Achievements.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Games/Resource/Applications.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Games/Resource/Events.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Games/Resource/Leaderboards.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Games/Resource/Metagame.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Games/Resource/Players.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Games/Resource/Pushtokens.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Games/Resource/QuestMilestones.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Games/Resource/Quests.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Games/Resource/Revisions.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Games/Resource/Rooms.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Games/Resource/Scores.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Games/Resource/Snapshots.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Games/Resource/TurnBasedMatches.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Games/RevisionCheckResponse.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Games/Room.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Games/RoomAutoMatchStatus.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Games/RoomAutoMatchingCriteria.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Games/RoomClientAddress.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Games/RoomCreateRequest.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Games/RoomJoinRequest.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Games/RoomLeaveDiagnostics.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Games/RoomLeaveRequest.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Games/RoomList.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Games/RoomModification.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Games/RoomP2PStatus.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Games/RoomP2PStatuses.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Games/RoomParticipant.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Games/RoomStatus.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Games/ScoreSubmission.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Games/Snapshot.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Games/SnapshotImage.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Games/SnapshotListResponse.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Games/TurnBasedAutoMatchingCriteria.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Games/TurnBasedMatch.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Games/TurnBasedMatchCreateRequest.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Games/TurnBasedMatchData.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Games/TurnBasedMatchDataRequest.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Games/TurnBasedMatchList.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Games/TurnBasedMatchModification.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Games/TurnBasedMatchParticipant.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Games/TurnBasedMatchRematch.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Games/TurnBasedMatchResults.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Games/TurnBasedMatchSync.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Games/TurnBasedMatchTurn.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/GamesConfiguration.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/GamesConfiguration/AchievementConfiguration.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/GamesConfiguration/AchievementConfigurationDetail.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/GamesConfiguration/AchievementConfigurationListResponse.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/GamesConfiguration/GamesNumberAffixConfiguration.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/GamesConfiguration/GamesNumberFormatConfiguration.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/GamesConfiguration/ImageConfiguration.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/GamesConfiguration/LeaderboardConfiguration.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/GamesConfiguration/LeaderboardConfigurationDetail.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/GamesConfiguration/LeaderboardConfigurationListResponse.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/GamesConfiguration/LocalizedString.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/GamesConfiguration/LocalizedStringBundle.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/GamesConfiguration/Resource/AchievementConfigurations.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/GamesConfiguration/Resource/ImageConfigurations.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/GamesConfiguration/Resource/LeaderboardConfigurations.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/GamesManagement.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/GamesManagement/AchievementResetAllResponse.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/GamesManagement/AchievementResetMultipleForAllRequest.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/GamesManagement/AchievementResetResponse.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/GamesManagement/EventsResetMultipleForAllRequest.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/GamesManagement/GamesPlayedResource.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/GamesManagement/GamesPlayerExperienceInfoResource.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/GamesManagement/GamesPlayerLevelResource.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/GamesManagement/HiddenPlayer.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/GamesManagement/HiddenPlayerList.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/GamesManagement/Player.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/GamesManagement/PlayerName.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/GamesManagement/PlayerScoreResetAllResponse.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/GamesManagement/PlayerScoreResetResponse.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/GamesManagement/ProfileSettings.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/GamesManagement/QuestsResetMultipleForAllRequest.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/GamesManagement/Resource/Achievements.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/GamesManagement/Resource/Applications.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/GamesManagement/Resource/Events.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/GamesManagement/Resource/Players.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/GamesManagement/Resource/Quests.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/GamesManagement/Resource/Rooms.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/GamesManagement/Resource/Scores.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/GamesManagement/Resource/TurnBasedMatches.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/GamesManagement/ScoresResetMultipleForAllRequest.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Genomics.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Genomics/Annotation.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Genomics/AnnotationSet.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Genomics/BatchCreateAnnotationsRequest.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Genomics/BatchCreateAnnotationsResponse.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Genomics/Binding.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Genomics/CallSet.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Genomics/CancelOperationRequest.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Genomics/CigarUnit.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Genomics/ClinicalCondition.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Genomics/CodingSequence.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Genomics/ComputeEngine.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Genomics/CoverageBucket.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Genomics/Dataset.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Genomics/Entry.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Genomics/Exon.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Genomics/Experiment.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Genomics/ExportReadGroupSetRequest.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Genomics/ExportVariantSetRequest.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Genomics/ExternalId.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Genomics/GenomicsEmpty.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Genomics/GetIamPolicyRequest.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Genomics/ImportReadGroupSetsRequest.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Genomics/ImportReadGroupSetsResponse.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Genomics/ImportVariantsRequest.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Genomics/ImportVariantsResponse.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Genomics/LinearAlignment.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Genomics/ListBasesResponse.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Genomics/ListCoverageBucketsResponse.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Genomics/ListDatasetsResponse.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Genomics/ListOperationsResponse.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Genomics/MergeVariantsRequest.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Genomics/Operation.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Genomics/OperationEvent.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Genomics/OperationMetadata.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Genomics/Policy.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Genomics/Position.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Genomics/Program.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Genomics/Range.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Genomics/Read.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Genomics/ReadGroup.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Genomics/ReadGroupSet.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Genomics/Reference.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Genomics/ReferenceBound.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Genomics/ReferenceSet.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Genomics/Resource/Annotations.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Genomics/Resource/Annotationsets.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Genomics/Resource/Callsets.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Genomics/Resource/Datasets.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Genomics/Resource/Operations.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Genomics/Resource/Readgroupsets.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Genomics/Resource/ReadgroupsetsCoveragebuckets.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Genomics/Resource/Reads.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Genomics/Resource/References.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Genomics/Resource/ReferencesBases.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Genomics/Resource/Referencesets.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Genomics/Resource/Variants.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Genomics/Resource/Variantsets.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Genomics/RuntimeMetadata.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Genomics/SearchAnnotationSetsRequest.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Genomics/SearchAnnotationSetsResponse.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Genomics/SearchAnnotationsRequest.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Genomics/SearchAnnotationsResponse.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Genomics/SearchCallSetsRequest.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Genomics/SearchCallSetsResponse.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Genomics/SearchReadGroupSetsRequest.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Genomics/SearchReadGroupSetsResponse.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Genomics/SearchReadsRequest.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Genomics/SearchReadsResponse.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Genomics/SearchReferenceSetsRequest.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Genomics/SearchReferenceSetsResponse.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Genomics/SearchReferencesRequest.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Genomics/SearchReferencesResponse.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Genomics/SearchVariantSetsRequest.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Genomics/SearchVariantSetsResponse.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Genomics/SearchVariantsRequest.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Genomics/SearchVariantsResponse.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Genomics/SetIamPolicyRequest.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Genomics/Status.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Genomics/StreamReadsRequest.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Genomics/StreamReadsResponse.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Genomics/StreamVariantsRequest.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Genomics/StreamVariantsResponse.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Genomics/TestIamPermissionsRequest.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Genomics/TestIamPermissionsResponse.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Genomics/Transcript.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Genomics/UndeleteDatasetRequest.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Genomics/Variant.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Genomics/VariantAnnotation.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Genomics/VariantCall.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Genomics/VariantSet.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Genomics/VariantSetMetadata.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Gmail.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Gmail/AutoForwarding.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Gmail/BatchDeleteMessagesRequest.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Gmail/BatchModifyMessagesRequest.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Gmail/Draft.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Gmail/Filter.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Gmail/FilterAction.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Gmail/FilterCriteria.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Gmail/ForwardingAddress.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Gmail/History.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Gmail/HistoryLabelAdded.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Gmail/HistoryLabelRemoved.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Gmail/HistoryMessageAdded.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Gmail/HistoryMessageDeleted.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Gmail/ImapSettings.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Gmail/Label.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Gmail/ListDraftsResponse.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Gmail/ListFiltersResponse.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Gmail/ListForwardingAddressesResponse.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Gmail/ListHistoryResponse.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Gmail/ListLabelsResponse.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Gmail/ListMessagesResponse.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Gmail/ListSendAsResponse.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Gmail/ListSmimeInfoResponse.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Gmail/ListThreadsResponse.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Gmail/Message.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Gmail/MessagePart.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Gmail/MessagePartBody.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Gmail/MessagePartHeader.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Gmail/ModifyMessageRequest.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Gmail/ModifyThreadRequest.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Gmail/PopSettings.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Gmail/Profile.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Gmail/Resource/Users.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Gmail/Resource/UsersDrafts.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Gmail/Resource/UsersHistory.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Gmail/Resource/UsersLabels.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Gmail/Resource/UsersMessages.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Gmail/Resource/UsersMessagesAttachments.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Gmail/Resource/UsersSettings.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Gmail/Resource/UsersSettingsFilters.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Gmail/Resource/UsersSettingsForwardingAddresses.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Gmail/Resource/UsersSettingsSendAs.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Gmail/Resource/UsersSettingsSendAsSmimeInfo.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Gmail/Resource/UsersThreads.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Gmail/SendAs.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Gmail/SmimeInfo.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Gmail/SmtpMsa.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Gmail/Thread.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Gmail/VacationSettings.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Gmail/WatchRequest.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Gmail/WatchResponse.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/GroupsMigration.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/GroupsMigration/Groups.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/GroupsMigration/Resource/Archive.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Groupssettings.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Groupssettings/Groups.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Groupssettings/Resource/Groups.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Iam.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Iam/AuditData.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Iam/Binding.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Iam/BindingDelta.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Iam/CloudAuditOptions.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Iam/Condition.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Iam/CounterOptions.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Iam/CreateServiceAccountKeyRequest.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Iam/CreateServiceAccountRequest.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Iam/DataAccessOptions.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Iam/IamEmpty.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Iam/ListServiceAccountKeysResponse.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Iam/ListServiceAccountsResponse.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Iam/LogConfig.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Iam/Policy.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Iam/PolicyDelta.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Iam/QueryGrantableRolesRequest.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Iam/QueryGrantableRolesResponse.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Iam/Resource/Projects.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Iam/Resource/ProjectsServiceAccounts.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Iam/Resource/ProjectsServiceAccountsKeys.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Iam/Resource/Roles.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Iam/Role.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Iam/Rule.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Iam/ServiceAccount.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Iam/ServiceAccountKey.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Iam/SetIamPolicyRequest.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Iam/SignBlobRequest.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Iam/SignBlobResponse.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Iam/SignJwtRequest.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Iam/SignJwtResponse.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Iam/TestIamPermissionsRequest.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Iam/TestIamPermissionsResponse.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/IdentityToolkit.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/IdentityToolkit/CreateAuthUriResponse.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/IdentityToolkit/DeleteAccountResponse.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/IdentityToolkit/DownloadAccountResponse.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/IdentityToolkit/EmailTemplate.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/IdentityToolkit/GetAccountInfoResponse.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/IdentityToolkit/GetOobConfirmationCodeResponse.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/IdentityToolkit/GetRecaptchaParamResponse.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/IdentityToolkit/IdentitytoolkitRelyingpartyCreateAuthUriRequest.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/IdentityToolkit/IdentitytoolkitRelyingpartyCreateAuthUriRequestCustomParameter.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/IdentityToolkit/IdentitytoolkitRelyingpartyDeleteAccountRequest.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/IdentityToolkit/IdentitytoolkitRelyingpartyDownloadAccountRequest.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/IdentityToolkit/IdentitytoolkitRelyingpartyGetAccountInfoRequest.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/IdentityToolkit/IdentitytoolkitRelyingpartyGetProjectConfigResponse.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/IdentityToolkit/IdentitytoolkitRelyingpartyResetPasswordRequest.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/IdentityToolkit/IdentitytoolkitRelyingpartySetAccountInfoRequest.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/IdentityToolkit/IdentitytoolkitRelyingpartySetProjectConfigRequest.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/IdentityToolkit/IdentitytoolkitRelyingpartySetProjectConfigResponse.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/IdentityToolkit/IdentitytoolkitRelyingpartySignOutUserRequest.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/IdentityToolkit/IdentitytoolkitRelyingpartySignOutUserResponse.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/IdentityToolkit/IdentitytoolkitRelyingpartySignupNewUserRequest.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/IdentityToolkit/IdentitytoolkitRelyingpartyUploadAccountRequest.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/IdentityToolkit/IdentitytoolkitRelyingpartyVerifyAssertionRequest.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/IdentityToolkit/IdentitytoolkitRelyingpartyVerifyCustomTokenRequest.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/IdentityToolkit/IdentitytoolkitRelyingpartyVerifyPasswordRequest.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/IdentityToolkit/IdpConfig.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/IdentityToolkit/Relyingparty.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/IdentityToolkit/ResetPasswordResponse.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/IdentityToolkit/Resource/Relyingparty.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/IdentityToolkit/SetAccountInfoResponse.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/IdentityToolkit/SetAccountInfoResponseProviderUserInfo.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/IdentityToolkit/SignupNewUserResponse.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/IdentityToolkit/UploadAccountResponse.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/IdentityToolkit/UploadAccountResponseError.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/IdentityToolkit/UserInfo.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/IdentityToolkit/UserInfoProviderUserInfo.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/IdentityToolkit/VerifyAssertionResponse.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/IdentityToolkit/VerifyCustomTokenResponse.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/IdentityToolkit/VerifyPasswordResponse.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Kgsearch.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Kgsearch/Resource/Entities.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Kgsearch/SearchResponse.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Licensing.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Licensing/LicenseAssignment.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Licensing/LicenseAssignmentInsert.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Licensing/LicenseAssignmentList.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Licensing/Resource/LicenseAssignments.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Logging.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Logging/HttpRequest.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Logging/LabelDescriptor.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Logging/ListLogEntriesRequest.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Logging/ListLogEntriesResponse.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Logging/ListLogMetricsResponse.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Logging/ListLogsResponse.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Logging/ListMonitoredResourceDescriptorsResponse.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Logging/ListSinksResponse.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Logging/LogEntry.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Logging/LogEntryOperation.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Logging/LogEntrySourceLocation.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Logging/LogLine.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Logging/LogMetric.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Logging/LogSink.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Logging/LoggingEmpty.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Logging/MonitoredResource.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Logging/MonitoredResourceDescriptor.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Logging/RequestLog.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Logging/Resource/BillingAccounts.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Logging/Resource/BillingAccountsLogs.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Logging/Resource/BillingAccountsSinks.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Logging/Resource/Entries.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Logging/Resource/Folders.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Logging/Resource/FoldersLogs.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Logging/Resource/FoldersSinks.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Logging/Resource/MonitoredResourceDescriptors.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Logging/Resource/Organizations.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Logging/Resource/OrganizationsLogs.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Logging/Resource/OrganizationsSinks.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Logging/Resource/Projects.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Logging/Resource/ProjectsLogs.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Logging/Resource/ProjectsMetrics.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Logging/Resource/ProjectsSinks.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Logging/SourceLocation.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Logging/SourceReference.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Logging/Status.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Logging/WriteLogEntriesRequest.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Logging/WriteLogEntriesResponse.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Manager.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Manager/AccessConfig.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Manager/Action.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Manager/AllowedRule.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Manager/AutoscalingModule.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Manager/AutoscalingModuleStatus.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Manager/DeployState.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Manager/Deployment.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Manager/DeploymentsListResponse.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Manager/DeploymentsResource.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Manager/DiskAttachment.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Manager/EnvVariable.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Manager/ExistingDisk.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Manager/FirewallModule.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Manager/FirewallModuleStatus.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Manager/HealthCheckModule.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Manager/HealthCheckModuleStatus.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Manager/LbModule.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Manager/LbModuleStatus.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Manager/Metadata.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Manager/MetadataItem.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Manager/Module.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Manager/ModuleStatus.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Manager/NetworkInterface.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Manager/NetworkModule.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Manager/NetworkModuleStatus.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Manager/NewDisk.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Manager/NewDiskInitializeParams.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Manager/ParamOverride.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Manager/ReplicaPoolModule.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Manager/ReplicaPoolModuleStatus.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Manager/ReplicaPoolParams.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Manager/ReplicaPoolParamsV1Beta1.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Manager/ServiceAccount.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Manager/Tag.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Manager/Template.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Manager/TemplatesListResponse.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Manager/TemplatesResource.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ManufacturerCenter.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ManufacturerCenter/Attributes.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ManufacturerCenter/Issue.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ManufacturerCenter/ListProductsResponse.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ManufacturerCenter/Product.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ManufacturerCenter/Resource/Accounts.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ManufacturerCenter/Resource/AccountsProducts.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Mirror.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Mirror/Account.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Mirror/Attachment.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Mirror/AttachmentsListResponse.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Mirror/AuthToken.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Mirror/Command.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Mirror/Contact.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Mirror/ContactsListResponse.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Mirror/Location.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Mirror/LocationsListResponse.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Mirror/MenuItem.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Mirror/MenuValue.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Mirror/Notification.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Mirror/NotificationConfig.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Mirror/Resource/Accounts.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Mirror/Resource/Contacts.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Mirror/Resource/Locations.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Mirror/Resource/Settings.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Mirror/Resource/Subscriptions.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Mirror/Resource/Timeline.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Mirror/Resource/TimelineAttachments.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Mirror/Setting.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Mirror/Subscription.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Mirror/SubscriptionsListResponse.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Mirror/TimelineItem.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Mirror/TimelineListResponse.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Mirror/UserAction.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Mirror/UserData.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Monitoring.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Monitoring/BucketOptions.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Monitoring/CollectdPayload.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Monitoring/CollectdValue.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Monitoring/CreateCollectdTimeSeriesRequest.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Monitoring/CreateTimeSeriesRequest.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Monitoring/Distribution.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Monitoring/Explicit.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Monitoring/Exponential.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Monitoring/Field.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Monitoring/Group.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Monitoring/LabelDescriptor.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Monitoring/Linear.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Monitoring/ListGroupMembersResponse.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Monitoring/ListGroupsResponse.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Monitoring/ListMetricDescriptorsResponse.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Monitoring/ListMonitoredResourceDescriptorsResponse.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Monitoring/ListTimeSeriesResponse.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Monitoring/Metric.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Monitoring/MetricDescriptor.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Monitoring/MonitoredResource.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Monitoring/MonitoredResourceDescriptor.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Monitoring/MonitoringEmpty.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Monitoring/Option.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Monitoring/Point.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Monitoring/Range.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Monitoring/Resource/Projects.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Monitoring/Resource/ProjectsCollectdTimeSeries.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Monitoring/Resource/ProjectsGroups.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Monitoring/Resource/ProjectsGroupsMembers.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Monitoring/Resource/ProjectsMetricDescriptors.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Monitoring/Resource/ProjectsMonitoredResourceDescriptors.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Monitoring/Resource/ProjectsTimeSeries.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Monitoring/SourceContext.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Monitoring/TimeInterval.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Monitoring/TimeSeries.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Monitoring/Type.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Monitoring/TypedValue.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Oauth2.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Oauth2/Jwk.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Oauth2/JwkKeys.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Oauth2/Resource/Userinfo.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Oauth2/Resource/UserinfoV2.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Oauth2/Resource/UserinfoV2Me.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Oauth2/Tokeninfo.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Oauth2/Userinfoplus.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Pagespeedonline.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Pagespeedonline/PagespeedApiFormatStringV2.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Pagespeedonline/PagespeedApiFormatStringV2Args.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Pagespeedonline/PagespeedApiFormatStringV2ArgsRects.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Pagespeedonline/PagespeedApiFormatStringV2ArgsSecondaryRects.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Pagespeedonline/PagespeedApiImageV2.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Pagespeedonline/PagespeedApiImageV2PageRect.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Pagespeedonline/Resource/Pagespeedapi.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Pagespeedonline/Result.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Pagespeedonline/ResultFormattedResults.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Pagespeedonline/ResultFormattedResultsRuleResultsElement.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Pagespeedonline/ResultFormattedResultsRuleResultsElementUrlBlocks.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Pagespeedonline/ResultFormattedResultsRuleResultsElementUrlBlocksUrls.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Pagespeedonline/ResultPageStats.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Pagespeedonline/ResultRuleGroupsElement.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Pagespeedonline/ResultVersion.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Partners.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Partners/AdWordsManagerAccountInfo.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Partners/Analytics.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Partners/AnalyticsDataPoint.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Partners/AnalyticsSummary.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Partners/AvailableOffer.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Partners/Certification.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Partners/CertificationExamStatus.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Partners/CertificationStatus.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Partners/Company.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Partners/CompanyRelation.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Partners/CountryOfferInfo.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Partners/CreateLeadRequest.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Partners/CreateLeadResponse.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Partners/Date.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Partners/DebugInfo.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Partners/EventData.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Partners/ExamStatus.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Partners/ExamToken.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Partners/GetCompanyResponse.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Partners/GetPartnersStatusResponse.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Partners/HistoricalOffer.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Partners/LatLng.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Partners/Lead.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Partners/ListAnalyticsResponse.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Partners/ListCompaniesResponse.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Partners/ListLeadsResponse.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Partners/ListOffersHistoryResponse.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Partners/ListOffersResponse.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Partners/ListUserStatesResponse.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Partners/LocalizedCompanyInfo.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Partners/Location.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Partners/LogMessageRequest.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Partners/LogMessageResponse.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Partners/LogUserEventRequest.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Partners/LogUserEventResponse.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Partners/Money.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Partners/OfferCustomer.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Partners/OptIns.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Partners/PartnersEmpty.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Partners/PublicProfile.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Partners/Rank.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Partners/RecaptchaChallenge.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Partners/RequestMetadata.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Partners/Resource/Analytics.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Partners/Resource/ClientMessages.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Partners/Resource/Companies.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Partners/Resource/CompaniesLeads.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Partners/Resource/Exams.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Partners/Resource/Leads.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Partners/Resource/Offers.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Partners/Resource/OffersHistory.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Partners/Resource/UserEvents.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Partners/Resource/UserStates.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Partners/Resource/Users.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Partners/Resource/V2.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Partners/ResponseMetadata.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Partners/SpecializationStatus.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Partners/TrafficSource.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Partners/User.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Partners/UserOverrides.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Partners/UserProfile.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/People.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/People/Address.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/People/AgeRangeType.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/People/Biography.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/People/Birthday.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/People/BraggingRights.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/People/ContactGroupMembership.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/People/CoverPhoto.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/People/Date.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/People/DomainMembership.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/People/EmailAddress.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/People/Event.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/People/FieldMetadata.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/People/Gender.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/People/GetPeopleResponse.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/People/ImClient.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/People/Interest.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/People/ListConnectionsResponse.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/People/Locale.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/People/Membership.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/People/Name.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/People/Nickname.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/People/Occupation.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/People/Organization.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/People/Person.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/People/PersonMetadata.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/People/PersonResponse.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/People/PhoneNumber.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/People/Photo.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/People/ProfileMetadata.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/People/Relation.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/People/RelationshipInterest.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/People/RelationshipStatus.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/People/Residence.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/People/Resource/People.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/People/Resource/PeopleConnections.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/People/Skill.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/People/Source.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/People/Tagline.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/People/Url.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/PlayMovies.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/PlayMovies/Avail.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/PlayMovies/Component.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/PlayMovies/ExperienceLocale.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/PlayMovies/ListAvailsResponse.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/PlayMovies/ListComponentsResponse.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/PlayMovies/ListExperienceLocalesResponse.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/PlayMovies/ListOrdersResponse.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/PlayMovies/ListStoreInfosResponse.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/PlayMovies/Order.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/PlayMovies/Resource/Accounts.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/PlayMovies/Resource/AccountsAvails.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/PlayMovies/Resource/AccountsComponents.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/PlayMovies/Resource/AccountsComponentsType.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/PlayMovies/Resource/AccountsExperienceLocales.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/PlayMovies/Resource/AccountsOrders.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/PlayMovies/Resource/AccountsStoreInfos.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/PlayMovies/Resource/AccountsStoreInfosCountry.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/PlayMovies/StoreInfo.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Playmoviespartner.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Playmoviespartner/AccountsAvailsResource.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Playmoviespartner/AccountsExperienceLocalesResource.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Playmoviespartner/AccountsOrdersResource.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Playmoviespartner/AccountsResource.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Playmoviespartner/AccountsStoreInfosCountryResource.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Playmoviespartner/AccountsStoreInfosResource.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Playmoviespartner/Avail.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Playmoviespartner/ExperienceLocale.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Playmoviespartner/ListAvailsResponse.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Playmoviespartner/ListExperienceLocalesResponse.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Playmoviespartner/ListOrdersResponse.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Playmoviespartner/ListStoreInfosResponse.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Playmoviespartner/Order.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Playmoviespartner/StoreInfo.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Plus.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Plus/Acl.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Plus/Activity.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Plus/ActivityActor.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Plus/ActivityActorClientSpecificActorInfo.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Plus/ActivityActorClientSpecificActorInfoYoutubeActorInfo.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Plus/ActivityActorImage.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Plus/ActivityActorName.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Plus/ActivityActorVerification.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Plus/ActivityFeed.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Plus/ActivityObject.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Plus/ActivityObjectActor.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Plus/ActivityObjectActorClientSpecificActorInfo.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Plus/ActivityObjectActorClientSpecificActorInfoYoutubeActorInfo.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Plus/ActivityObjectActorImage.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Plus/ActivityObjectActorVerification.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Plus/ActivityObjectAttachments.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Plus/ActivityObjectAttachmentsEmbed.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Plus/ActivityObjectAttachmentsFullImage.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Plus/ActivityObjectAttachmentsImage.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Plus/ActivityObjectAttachmentsThumbnails.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Plus/ActivityObjectAttachmentsThumbnailsImage.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Plus/ActivityObjectPlusoners.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Plus/ActivityObjectReplies.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Plus/ActivityObjectResharers.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Plus/ActivityProvider.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Plus/Comment.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Plus/CommentActor.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Plus/CommentActorClientSpecificActorInfo.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Plus/CommentActorClientSpecificActorInfoYoutubeActorInfo.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Plus/CommentActorImage.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Plus/CommentActorVerification.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Plus/CommentFeed.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Plus/CommentInReplyTo.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Plus/CommentObject.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Plus/CommentPlusoners.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Plus/PeopleFeed.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Plus/Person.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Plus/PersonAgeRange.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Plus/PersonCover.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Plus/PersonCoverCoverInfo.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Plus/PersonCoverCoverPhoto.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Plus/PersonEmails.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Plus/PersonImage.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Plus/PersonName.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Plus/PersonOrganizations.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Plus/PersonPlacesLived.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Plus/PersonUrls.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Plus/Place.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Plus/PlaceAddress.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Plus/PlacePosition.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Plus/PlusAclentryResource.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Plus/Resource/Activities.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Plus/Resource/Comments.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Plus/Resource/People.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/PlusDomains.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/PlusDomains/Acl.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/PlusDomains/Activity.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/PlusDomains/ActivityActor.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/PlusDomains/ActivityActorClientSpecificActorInfo.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/PlusDomains/ActivityActorClientSpecificActorInfoYoutubeActorInfo.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/PlusDomains/ActivityActorImage.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/PlusDomains/ActivityActorName.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/PlusDomains/ActivityActorVerification.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/PlusDomains/ActivityFeed.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/PlusDomains/ActivityObject.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/PlusDomains/ActivityObjectActor.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/PlusDomains/ActivityObjectActorClientSpecificActorInfo.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/PlusDomains/ActivityObjectActorClientSpecificActorInfoYoutubeActorInfo.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/PlusDomains/ActivityObjectActorImage.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/PlusDomains/ActivityObjectActorVerification.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/PlusDomains/ActivityObjectAttachments.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/PlusDomains/ActivityObjectAttachmentsEmbed.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/PlusDomains/ActivityObjectAttachmentsFullImage.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/PlusDomains/ActivityObjectAttachmentsImage.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/PlusDomains/ActivityObjectAttachmentsPreviewThumbnails.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/PlusDomains/ActivityObjectAttachmentsThumbnails.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/PlusDomains/ActivityObjectAttachmentsThumbnailsImage.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/PlusDomains/ActivityObjectPlusoners.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/PlusDomains/ActivityObjectReplies.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/PlusDomains/ActivityObjectResharers.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/PlusDomains/ActivityObjectStatusForViewer.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/PlusDomains/ActivityProvider.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/PlusDomains/Audience.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/PlusDomains/AudiencesFeed.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/PlusDomains/Circle.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/PlusDomains/CircleFeed.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/PlusDomains/CirclePeople.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/PlusDomains/Comment.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/PlusDomains/CommentActor.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/PlusDomains/CommentActorClientSpecificActorInfo.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/PlusDomains/CommentActorClientSpecificActorInfoYoutubeActorInfo.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/PlusDomains/CommentActorImage.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/PlusDomains/CommentActorVerification.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/PlusDomains/CommentFeed.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/PlusDomains/CommentInReplyTo.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/PlusDomains/CommentObject.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/PlusDomains/CommentPlusoners.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/PlusDomains/Media.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/PlusDomains/MediaAuthor.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/PlusDomains/MediaAuthorImage.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/PlusDomains/MediaExif.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/PlusDomains/PeopleFeed.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/PlusDomains/Person.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/PlusDomains/PersonCover.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/PlusDomains/PersonCoverCoverInfo.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/PlusDomains/PersonCoverCoverPhoto.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/PlusDomains/PersonEmails.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/PlusDomains/PersonImage.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/PlusDomains/PersonName.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/PlusDomains/PersonOrganizations.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/PlusDomains/PersonPlacesLived.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/PlusDomains/PersonUrls.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/PlusDomains/Place.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/PlusDomains/PlaceAddress.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/PlusDomains/PlacePosition.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/PlusDomains/PlusDomainsAclentryResource.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/PlusDomains/Resource/Activities.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/PlusDomains/Resource/Audiences.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/PlusDomains/Resource/Circles.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/PlusDomains/Resource/Comments.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/PlusDomains/Resource/Media.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/PlusDomains/Resource/People.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/PlusDomains/Videostream.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Prediction.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Prediction/Analyze.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Prediction/AnalyzeDataDescription.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Prediction/AnalyzeDataDescriptionFeatures.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Prediction/AnalyzeDataDescriptionFeaturesCategorical.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Prediction/AnalyzeDataDescriptionFeaturesCategoricalValues.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Prediction/AnalyzeDataDescriptionFeaturesNumeric.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Prediction/AnalyzeDataDescriptionFeaturesText.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Prediction/AnalyzeDataDescriptionOutputFeature.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Prediction/AnalyzeDataDescriptionOutputFeatureNumeric.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Prediction/AnalyzeDataDescriptionOutputFeatureText.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Prediction/AnalyzeModelDescription.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Prediction/Input.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Prediction/InputInput.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Prediction/Insert.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Prediction/Insert2.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Prediction/Insert2ModelInfo.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Prediction/InsertTrainingInstances.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Prediction/Output.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Prediction/OutputOutputMulti.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Prediction/PredictionList.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Prediction/Resource/Hostedmodels.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Prediction/Resource/Trainedmodels.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Prediction/Update.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Proximitybeacon.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Proximitybeacon/AdvertisedId.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Proximitybeacon/AttachmentInfo.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Proximitybeacon/Beacon.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Proximitybeacon/BeaconAttachment.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Proximitybeacon/BeaconInfo.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Proximitybeacon/Date.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Proximitybeacon/DeleteAttachmentsResponse.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Proximitybeacon/Diagnostics.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Proximitybeacon/EphemeralIdRegistration.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Proximitybeacon/EphemeralIdRegistrationParams.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Proximitybeacon/GetInfoForObservedBeaconsRequest.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Proximitybeacon/GetInfoForObservedBeaconsResponse.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Proximitybeacon/IndoorLevel.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Proximitybeacon/LatLng.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Proximitybeacon/ListBeaconAttachmentsResponse.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Proximitybeacon/ListBeaconsResponse.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Proximitybeacon/ListDiagnosticsResponse.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Proximitybeacon/ListNamespacesResponse.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Proximitybeacon/Observation.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Proximitybeacon/ProximitybeaconEmpty.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Proximitybeacon/ProximitybeaconNamespace.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Proximitybeacon/Resource/Beaconinfo.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Proximitybeacon/Resource/Beacons.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Proximitybeacon/Resource/BeaconsAttachments.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Proximitybeacon/Resource/BeaconsDiagnostics.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Proximitybeacon/Resource/Namespaces.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Proximitybeacon/Resource/V1beta1.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Pubsub.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Pubsub/AcknowledgeRequest.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Pubsub/Binding.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Pubsub/ListSubscriptionsResponse.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Pubsub/ListTopicSubscriptionsResponse.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Pubsub/ListTopicsResponse.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Pubsub/ModifyAckDeadlineRequest.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Pubsub/ModifyPushConfigRequest.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Pubsub/Policy.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Pubsub/PublishRequest.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Pubsub/PublishResponse.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Pubsub/PubsubEmpty.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Pubsub/PubsubMessage.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Pubsub/PullRequest.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Pubsub/PullResponse.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Pubsub/PushConfig.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Pubsub/ReceivedMessage.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Pubsub/Resource/Projects.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Pubsub/Resource/ProjectsSnapshots.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Pubsub/Resource/ProjectsSubscriptions.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Pubsub/Resource/ProjectsTopics.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Pubsub/Resource/ProjectsTopicsSubscriptions.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Pubsub/SetIamPolicyRequest.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Pubsub/Subscription.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Pubsub/TestIamPermissionsRequest.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Pubsub/TestIamPermissionsResponse.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Pubsub/Topic.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/QPXExpress.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/QPXExpress/AircraftData.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/QPXExpress/AirportData.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/QPXExpress/BagDescriptor.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/QPXExpress/CarrierData.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/QPXExpress/CityData.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/QPXExpress/Data.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/QPXExpress/FareInfo.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/QPXExpress/FlightInfo.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/QPXExpress/FreeBaggageAllowance.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/QPXExpress/LegInfo.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/QPXExpress/PassengerCounts.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/QPXExpress/PricingInfo.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/QPXExpress/Resource/Trips.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/QPXExpress/SegmentInfo.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/QPXExpress/SegmentPricing.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/QPXExpress/SliceInfo.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/QPXExpress/SliceInput.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/QPXExpress/TaxData.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/QPXExpress/TaxInfo.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/QPXExpress/TimeOfDayRange.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/QPXExpress/TripOption.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/QPXExpress/TripOptionsRequest.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/QPXExpress/TripOptionsResponse.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/QPXExpress/TripsSearchRequest.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/QPXExpress/TripsSearchResponse.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Replicapool.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Replicapool/InstanceGroupManager.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Replicapool/InstanceGroupManagerList.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Replicapool/InstanceGroupManagersAbandonInstancesRequest.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Replicapool/InstanceGroupManagersDeleteInstancesRequest.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Replicapool/InstanceGroupManagersRecreateInstancesRequest.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Replicapool/InstanceGroupManagersSetInstanceTemplateRequest.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Replicapool/InstanceGroupManagersSetTargetPoolsRequest.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Replicapool/Operation.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Replicapool/OperationError.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Replicapool/OperationErrorErrors.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Replicapool/OperationList.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Replicapool/OperationWarnings.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Replicapool/OperationWarningsData.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Replicapool/ReplicaPoolAutoHealingPolicy.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Replicapool/Resource/InstanceGroupManagers.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Replicapool/Resource/ZoneOperations.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Replicapoolupdater.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Replicapoolupdater/InstanceUpdate.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Replicapoolupdater/InstanceUpdateError.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Replicapoolupdater/InstanceUpdateErrorErrors.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Replicapoolupdater/InstanceUpdateList.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Replicapoolupdater/Operation.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Replicapoolupdater/OperationError.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Replicapoolupdater/OperationErrorErrors.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Replicapoolupdater/OperationList.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Replicapoolupdater/OperationWarnings.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Replicapoolupdater/OperationWarningsData.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Replicapoolupdater/Resource/RollingUpdates.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Replicapoolupdater/Resource/ZoneOperations.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Replicapoolupdater/RollingUpdate.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Replicapoolupdater/RollingUpdateError.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Replicapoolupdater/RollingUpdateErrorErrors.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Replicapoolupdater/RollingUpdateList.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Replicapoolupdater/RollingUpdatePolicy.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Reports.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Reports/Activities.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Reports/Activity.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Reports/ActivityActor.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Reports/ActivityEvents.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Reports/ActivityEventsParameters.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Reports/ActivityId.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Reports/Channel.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Reports/Resource/Activities.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Reports/Resource/Channels.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Reports/Resource/CustomerUsageReports.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Reports/Resource/UserUsageReport.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Reports/UsageReport.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Reports/UsageReportEntity.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Reports/UsageReportParameters.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Reports/UsageReports.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Reports/UsageReportsWarnings.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Reports/UsageReportsWarningsData.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Reseller.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Reseller/Address.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Reseller/ChangePlanRequest.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Reseller/Customer.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Reseller/RenewalSettings.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Reseller/ResellernotifyGetwatchdetailsResponse.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Reseller/ResellernotifyResource.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Reseller/Resource/Customers.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Reseller/Resource/Resellernotify.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Reseller/Resource/Subscriptions.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Reseller/Seats.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Reseller/Subscription.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Reseller/SubscriptionPlan.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Reseller/SubscriptionPlanCommitmentInterval.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Reseller/SubscriptionTransferInfo.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Reseller/SubscriptionTrialSettings.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Reseller/Subscriptions.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Resourceviews.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Resourceviews/Label.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Resourceviews/ListResourceResponseItem.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Resourceviews/Operation.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Resourceviews/OperationError.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Resourceviews/OperationErrorErrors.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Resourceviews/OperationList.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Resourceviews/OperationWarnings.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Resourceviews/OperationWarningsData.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Resourceviews/Resource/ZoneOperations.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Resourceviews/Resource/ZoneViews.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Resourceviews/ResourceView.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Resourceviews/ServiceEndpoint.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Resourceviews/ZoneViewsAddResourcesRequest.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Resourceviews/ZoneViewsGetServiceResponse.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Resourceviews/ZoneViewsList.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Resourceviews/ZoneViewsListResourcesResponse.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Resourceviews/ZoneViewsRemoveResourcesRequest.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Resourceviews/ZoneViewsSetServiceRequest.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/SQLAdmin.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/SQLAdmin/AclEntry.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/SQLAdmin/BackupConfiguration.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/SQLAdmin/BackupRun.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/SQLAdmin/BackupRunsListResponse.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/SQLAdmin/BinLogCoordinates.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/SQLAdmin/CloneContext.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/SQLAdmin/Database.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/SQLAdmin/DatabaseFlags.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/SQLAdmin/DatabaseInstance.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/SQLAdmin/DatabaseInstanceFailoverReplica.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/SQLAdmin/DatabasesListResponse.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/SQLAdmin/ExportContext.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/SQLAdmin/ExportContextCsvExportOptions.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/SQLAdmin/ExportContextSqlExportOptions.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/SQLAdmin/FailoverContext.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/SQLAdmin/Flag.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/SQLAdmin/FlagsListResponse.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/SQLAdmin/ImportContext.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/SQLAdmin/ImportContextCsvImportOptions.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/SQLAdmin/InstancesCloneRequest.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/SQLAdmin/InstancesExportRequest.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/SQLAdmin/InstancesFailoverRequest.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/SQLAdmin/InstancesImportRequest.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/SQLAdmin/InstancesListResponse.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/SQLAdmin/InstancesRestoreBackupRequest.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/SQLAdmin/InstancesTruncateLogRequest.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/SQLAdmin/IpConfiguration.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/SQLAdmin/IpMapping.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/SQLAdmin/Labels.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/SQLAdmin/LocationPreference.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/SQLAdmin/MaintenanceWindow.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/SQLAdmin/MySqlReplicaConfiguration.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/SQLAdmin/OnPremisesConfiguration.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/SQLAdmin/Operation.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/SQLAdmin/OperationError.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/SQLAdmin/OperationErrors.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/SQLAdmin/OperationsListResponse.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/SQLAdmin/ReplicaConfiguration.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/SQLAdmin/Resource/BackupRuns.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/SQLAdmin/Resource/Databases.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/SQLAdmin/Resource/Flags.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/SQLAdmin/Resource/Instances.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/SQLAdmin/Resource/Operations.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/SQLAdmin/Resource/SslCerts.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/SQLAdmin/Resource/Tiers.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/SQLAdmin/Resource/Users.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/SQLAdmin/RestoreBackupContext.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/SQLAdmin/Settings.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/SQLAdmin/SslCert.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/SQLAdmin/SslCertDetail.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/SQLAdmin/SslCertsCreateEphemeralRequest.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/SQLAdmin/SslCertsInsertRequest.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/SQLAdmin/SslCertsInsertResponse.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/SQLAdmin/SslCertsListResponse.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/SQLAdmin/Tier.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/SQLAdmin/TiersListResponse.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/SQLAdmin/TruncateLogContext.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/SQLAdmin/User.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/SQLAdmin/UsersListResponse.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Safebrowsing.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Safebrowsing/Checksum.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Safebrowsing/ClientInfo.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Safebrowsing/Constraints.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Safebrowsing/FetchThreatListUpdatesRequest.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Safebrowsing/FetchThreatListUpdatesResponse.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Safebrowsing/FindFullHashesRequest.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Safebrowsing/FindFullHashesResponse.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Safebrowsing/FindThreatMatchesRequest.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Safebrowsing/FindThreatMatchesResponse.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Safebrowsing/ListThreatListsResponse.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Safebrowsing/ListUpdateRequest.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Safebrowsing/ListUpdateResponse.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Safebrowsing/MetadataEntry.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Safebrowsing/RawHashes.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Safebrowsing/RawIndices.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Safebrowsing/Resource/EncodedFullHashes.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Safebrowsing/Resource/EncodedUpdates.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Safebrowsing/Resource/FullHashes.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Safebrowsing/Resource/ThreatListUpdates.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Safebrowsing/Resource/ThreatLists.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Safebrowsing/Resource/ThreatMatches.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Safebrowsing/RiceDeltaEncoding.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Safebrowsing/ThreatEntry.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Safebrowsing/ThreatEntryMetadata.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Safebrowsing/ThreatEntrySet.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Safebrowsing/ThreatInfo.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Safebrowsing/ThreatListDescriptor.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Safebrowsing/ThreatMatch.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Script.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Script/ExecutionError.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Script/ExecutionRequest.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Script/ExecutionResponse.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Script/Operation.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Script/Resource/Scripts.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Script/ScriptStackTraceElement.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Script/Status.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/SearchConsole.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/SearchConsole/BlockedResource.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/SearchConsole/Image.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/SearchConsole/MobileFriendlyIssue.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/SearchConsole/Resource/UrlTestingTools.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/SearchConsole/Resource/UrlTestingToolsMobileFriendlyTest.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/SearchConsole/ResourceIssue.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/SearchConsole/RunMobileFriendlyTestRequest.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/SearchConsole/RunMobileFriendlyTestResponse.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/SearchConsole/TestStatus.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ServiceControl.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ServiceControl/AllocateQuotaRequest.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ServiceControl/AllocateQuotaResponse.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ServiceControl/AuditLog.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ServiceControl/AuthenticationInfo.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ServiceControl/AuthorizationInfo.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ServiceControl/CheckError.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ServiceControl/CheckInfo.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ServiceControl/CheckRequest.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ServiceControl/CheckResponse.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ServiceControl/Distribution.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ServiceControl/EndReconciliationRequest.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ServiceControl/EndReconciliationResponse.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ServiceControl/ExplicitBuckets.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ServiceControl/ExponentialBuckets.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ServiceControl/LinearBuckets.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ServiceControl/LogEntry.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ServiceControl/MetricValue.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ServiceControl/MetricValueSet.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ServiceControl/Money.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ServiceControl/Operation.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ServiceControl/QuotaError.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ServiceControl/QuotaInfo.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ServiceControl/QuotaOperation.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ServiceControl/QuotaProperties.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ServiceControl/ReleaseQuotaRequest.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ServiceControl/ReleaseQuotaResponse.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ServiceControl/ReportError.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ServiceControl/ReportInfo.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ServiceControl/ReportRequest.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ServiceControl/ReportResponse.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ServiceControl/RequestMetadata.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ServiceControl/Resource/Services.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ServiceControl/StartReconciliationRequest.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ServiceControl/StartReconciliationResponse.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ServiceControl/Status.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ServiceManagement.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ServiceManagement/Advice.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ServiceManagement/Analytics.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ServiceManagement/AnalyticsDestination.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ServiceManagement/Api.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ServiceManagement/AuditConfig.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ServiceManagement/AuditLogConfig.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ServiceManagement/AuthProvider.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ServiceManagement/AuthRequirement.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ServiceManagement/Authentication.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ServiceManagement/AuthenticationRule.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ServiceManagement/AuthorizationConfig.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ServiceManagement/Backend.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ServiceManagement/BackendRule.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ServiceManagement/Binding.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ServiceManagement/ChangeReport.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ServiceManagement/CloudAuditOptions.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ServiceManagement/Condition.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ServiceManagement/ConfigChange.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ServiceManagement/ConfigFile.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ServiceManagement/ConfigOptions.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ServiceManagement/ConfigRef.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ServiceManagement/ConfigSource.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ServiceManagement/Context.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ServiceManagement/ContextRule.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ServiceManagement/Control.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ServiceManagement/CounterOptions.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ServiceManagement/CustomError.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ServiceManagement/CustomErrorRule.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ServiceManagement/CustomHttpPattern.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ServiceManagement/DataAccessOptions.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ServiceManagement/DeleteServiceStrategy.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ServiceManagement/Diagnostic.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ServiceManagement/DisableServiceRequest.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ServiceManagement/Documentation.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ServiceManagement/DocumentationRule.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ServiceManagement/EnableServiceRequest.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ServiceManagement/Endpoint.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ServiceManagement/Enum.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ServiceManagement/EnumValue.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ServiceManagement/Experimental.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ServiceManagement/Field.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ServiceManagement/GenerateConfigReportRequest.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ServiceManagement/GenerateConfigReportResponse.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ServiceManagement/GetIamPolicyRequest.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ServiceManagement/Http.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ServiceManagement/HttpRule.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ServiceManagement/LabelDescriptor.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ServiceManagement/ListOperationsResponse.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ServiceManagement/ListServiceConfigsResponse.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ServiceManagement/ListServiceRolloutsResponse.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ServiceManagement/ListServicesResponse.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ServiceManagement/LogConfig.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ServiceManagement/LogDescriptor.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ServiceManagement/Logging.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ServiceManagement/LoggingDestination.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ServiceManagement/ManagedService.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ServiceManagement/MediaDownload.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ServiceManagement/MediaUpload.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ServiceManagement/Method.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ServiceManagement/MetricDescriptor.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ServiceManagement/Mixin.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ServiceManagement/MonitoredResourceDescriptor.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ServiceManagement/Monitoring.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ServiceManagement/MonitoringDestination.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ServiceManagement/OAuthRequirements.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ServiceManagement/Operation.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ServiceManagement/OperationMetadata.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ServiceManagement/Option.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ServiceManagement/Page.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ServiceManagement/Policy.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ServiceManagement/Resource/Operations.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ServiceManagement/Resource/Services.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ServiceManagement/Resource/ServicesConfigs.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ServiceManagement/Resource/ServicesRollouts.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ServiceManagement/Rollout.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ServiceManagement/Rule.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ServiceManagement/Service.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ServiceManagement/SetIamPolicyRequest.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ServiceManagement/SourceContext.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ServiceManagement/SourceInfo.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ServiceManagement/Status.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ServiceManagement/Step.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ServiceManagement/SubmitConfigSourceRequest.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ServiceManagement/SubmitConfigSourceResponse.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ServiceManagement/SystemParameter.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ServiceManagement/SystemParameterRule.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ServiceManagement/SystemParameters.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ServiceManagement/TestIamPermissionsRequest.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ServiceManagement/TestIamPermissionsResponse.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ServiceManagement/TrafficPercentStrategy.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ServiceManagement/Type.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ServiceManagement/UndeleteServiceResponse.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ServiceManagement/Usage.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ServiceManagement/UsageRule.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ServiceManagement/Visibility.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ServiceManagement/VisibilityRule.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ServiceRegistry.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ServiceRegistry/Endpoint.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ServiceRegistry/EndpointEndpointVisibility.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ServiceRegistry/EndpointsListResponse.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ServiceRegistry/Operation.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ServiceRegistry/OperationError.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ServiceRegistry/OperationErrorErrors.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ServiceRegistry/OperationWarnings.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ServiceRegistry/OperationWarningsData.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ServiceRegistry/OperationsListResponse.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ServiceRegistry/Resource/Endpoints.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ServiceRegistry/Resource/Operations.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ServiceUser.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ServiceUser/Api.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ServiceUser/AuthProvider.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ServiceUser/AuthRequirement.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ServiceUser/Authentication.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ServiceUser/AuthenticationRule.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ServiceUser/AuthorizationConfig.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ServiceUser/Backend.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ServiceUser/BackendRule.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ServiceUser/Context.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ServiceUser/ContextRule.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ServiceUser/Control.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ServiceUser/CustomError.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ServiceUser/CustomErrorRule.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ServiceUser/CustomHttpPattern.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ServiceUser/DisableServiceRequest.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ServiceUser/Documentation.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ServiceUser/DocumentationRule.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ServiceUser/EnableServiceRequest.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ServiceUser/Endpoint.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ServiceUser/Enum.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ServiceUser/EnumValue.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ServiceUser/Experimental.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ServiceUser/Field.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ServiceUser/Http.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ServiceUser/HttpRule.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ServiceUser/LabelDescriptor.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ServiceUser/ListEnabledServicesResponse.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ServiceUser/LogDescriptor.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ServiceUser/Logging.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ServiceUser/LoggingDestination.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ServiceUser/MediaDownload.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ServiceUser/MediaUpload.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ServiceUser/Method.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ServiceUser/MetricDescriptor.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ServiceUser/Mixin.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ServiceUser/MonitoredResourceDescriptor.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ServiceUser/Monitoring.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ServiceUser/MonitoringDestination.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ServiceUser/OAuthRequirements.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ServiceUser/Operation.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ServiceUser/OperationMetadata.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ServiceUser/Option.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ServiceUser/Page.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ServiceUser/PublishedService.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ServiceUser/Resource/Projects.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ServiceUser/Resource/ProjectsServices.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ServiceUser/Resource/Services.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ServiceUser/SearchServicesResponse.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ServiceUser/Service.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ServiceUser/SourceContext.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ServiceUser/SourceInfo.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ServiceUser/Status.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ServiceUser/Step.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ServiceUser/SystemParameter.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ServiceUser/SystemParameterRule.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ServiceUser/SystemParameters.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ServiceUser/Type.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ServiceUser/Usage.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ServiceUser/UsageRule.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ServiceUser/Visibility.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ServiceUser/VisibilityRule.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Sheets.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Sheets/AddBandingRequest.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Sheets/AddBandingResponse.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Sheets/AddChartRequest.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Sheets/AddChartResponse.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Sheets/AddConditionalFormatRuleRequest.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Sheets/AddFilterViewRequest.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Sheets/AddFilterViewResponse.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Sheets/AddNamedRangeRequest.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Sheets/AddNamedRangeResponse.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Sheets/AddProtectedRangeRequest.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Sheets/AddProtectedRangeResponse.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Sheets/AddSheetRequest.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Sheets/AddSheetResponse.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Sheets/AppendCellsRequest.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Sheets/AppendDimensionRequest.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Sheets/AppendValuesResponse.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Sheets/AutoFillRequest.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Sheets/AutoResizeDimensionsRequest.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Sheets/BandedRange.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Sheets/BandingProperties.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Sheets/BasicChartAxis.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Sheets/BasicChartDomain.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Sheets/BasicChartSeries.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Sheets/BasicChartSpec.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Sheets/BasicFilter.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Sheets/BatchClearValuesRequest.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Sheets/BatchClearValuesResponse.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Sheets/BatchGetValuesResponse.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Sheets/BatchUpdateSpreadsheetRequest.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Sheets/BatchUpdateSpreadsheetResponse.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Sheets/BatchUpdateValuesRequest.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Sheets/BatchUpdateValuesResponse.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Sheets/BooleanCondition.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Sheets/BooleanRule.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Sheets/Border.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Sheets/Borders.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Sheets/CellData.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Sheets/CellFormat.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Sheets/ChartData.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Sheets/ChartSourceRange.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Sheets/ChartSpec.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Sheets/ClearBasicFilterRequest.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Sheets/ClearValuesRequest.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Sheets/ClearValuesResponse.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Sheets/Color.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Sheets/ConditionValue.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Sheets/ConditionalFormatRule.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Sheets/CopyPasteRequest.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Sheets/CopySheetToAnotherSpreadsheetRequest.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Sheets/CutPasteRequest.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Sheets/DataValidationRule.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Sheets/DeleteBandingRequest.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Sheets/DeleteConditionalFormatRuleRequest.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Sheets/DeleteConditionalFormatRuleResponse.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Sheets/DeleteDimensionRequest.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Sheets/DeleteEmbeddedObjectRequest.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Sheets/DeleteFilterViewRequest.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Sheets/DeleteNamedRangeRequest.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Sheets/DeleteProtectedRangeRequest.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Sheets/DeleteRangeRequest.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Sheets/DeleteSheetRequest.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Sheets/DimensionProperties.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Sheets/DimensionRange.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Sheets/DuplicateFilterViewRequest.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Sheets/DuplicateFilterViewResponse.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Sheets/DuplicateSheetRequest.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Sheets/DuplicateSheetResponse.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Sheets/Editors.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Sheets/EmbeddedChart.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Sheets/EmbeddedObjectPosition.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Sheets/ErrorValue.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Sheets/ExtendedValue.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Sheets/FilterCriteria.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Sheets/FilterView.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Sheets/FindReplaceRequest.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Sheets/FindReplaceResponse.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Sheets/GradientRule.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Sheets/GridCoordinate.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Sheets/GridData.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Sheets/GridProperties.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Sheets/GridRange.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Sheets/InsertDimensionRequest.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Sheets/InsertRangeRequest.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Sheets/InterpolationPoint.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Sheets/IterativeCalculationSettings.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Sheets/MergeCellsRequest.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Sheets/MoveDimensionRequest.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Sheets/NamedRange.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Sheets/NumberFormat.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Sheets/OverlayPosition.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Sheets/Padding.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Sheets/PasteDataRequest.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Sheets/PieChartSpec.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Sheets/PivotFilterCriteria.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Sheets/PivotGroup.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Sheets/PivotGroupSortValueBucket.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Sheets/PivotGroupValueMetadata.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Sheets/PivotTable.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Sheets/PivotValue.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Sheets/ProtectedRange.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Sheets/RepeatCellRequest.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Sheets/Request.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Sheets/Resource/Spreadsheets.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Sheets/Resource/SpreadsheetsSheets.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Sheets/Resource/SpreadsheetsValues.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Sheets/Response.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Sheets/RowData.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Sheets/SetBasicFilterRequest.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Sheets/SetDataValidationRequest.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Sheets/Sheet.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Sheets/SheetProperties.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Sheets/SortRangeRequest.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Sheets/SortSpec.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Sheets/SourceAndDestination.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Sheets/Spreadsheet.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Sheets/SpreadsheetProperties.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Sheets/TextFormat.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Sheets/TextFormatRun.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Sheets/TextRotation.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Sheets/TextToColumnsRequest.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Sheets/UnmergeCellsRequest.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Sheets/UpdateBandingRequest.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Sheets/UpdateBordersRequest.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Sheets/UpdateCellsRequest.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Sheets/UpdateChartSpecRequest.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Sheets/UpdateConditionalFormatRuleRequest.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Sheets/UpdateConditionalFormatRuleResponse.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Sheets/UpdateDimensionPropertiesRequest.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Sheets/UpdateEmbeddedObjectPositionRequest.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Sheets/UpdateEmbeddedObjectPositionResponse.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Sheets/UpdateFilterViewRequest.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Sheets/UpdateNamedRangeRequest.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Sheets/UpdateProtectedRangeRequest.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Sheets/UpdateSheetPropertiesRequest.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Sheets/UpdateSpreadsheetPropertiesRequest.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Sheets/UpdateValuesResponse.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Sheets/ValueRange.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ShoppingContent.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ShoppingContent/Account.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ShoppingContent/AccountAdwordsLink.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ShoppingContent/AccountIdentifier.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ShoppingContent/AccountShipping.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ShoppingContent/AccountShippingCarrierRate.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ShoppingContent/AccountShippingCondition.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ShoppingContent/AccountShippingLocationGroup.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ShoppingContent/AccountShippingPostalCodeRange.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ShoppingContent/AccountShippingRateTable.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ShoppingContent/AccountShippingRateTableCell.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ShoppingContent/AccountShippingShippingService.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ShoppingContent/AccountShippingShippingServiceCalculationMethod.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ShoppingContent/AccountShippingShippingServiceCostRule.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ShoppingContent/AccountStatus.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ShoppingContent/AccountStatusDataQualityIssue.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ShoppingContent/AccountStatusExampleItem.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ShoppingContent/AccountTax.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ShoppingContent/AccountTaxTaxRule.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ShoppingContent/AccountUser.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ShoppingContent/AccountsAuthInfoResponse.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ShoppingContent/AccountsCustomBatchRequest.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ShoppingContent/AccountsCustomBatchRequestEntry.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ShoppingContent/AccountsCustomBatchResponse.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ShoppingContent/AccountsCustomBatchResponseEntry.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ShoppingContent/AccountsListResponse.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ShoppingContent/AccountshippingCustomBatchRequest.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ShoppingContent/AccountshippingCustomBatchRequestEntry.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ShoppingContent/AccountshippingCustomBatchResponse.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ShoppingContent/AccountshippingCustomBatchResponseEntry.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ShoppingContent/AccountshippingListResponse.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ShoppingContent/AccountstatusesCustomBatchRequest.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ShoppingContent/AccountstatusesCustomBatchRequestEntry.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ShoppingContent/AccountstatusesCustomBatchResponse.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ShoppingContent/AccountstatusesCustomBatchResponseEntry.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ShoppingContent/AccountstatusesListResponse.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ShoppingContent/AccounttaxCustomBatchRequest.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ShoppingContent/AccounttaxCustomBatchRequestEntry.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ShoppingContent/AccounttaxCustomBatchResponse.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ShoppingContent/AccounttaxCustomBatchResponseEntry.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ShoppingContent/AccounttaxListResponse.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ShoppingContent/CarrierRate.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ShoppingContent/CarriersCarrier.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ShoppingContent/Datafeed.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ShoppingContent/DatafeedFetchSchedule.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ShoppingContent/DatafeedFormat.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ShoppingContent/DatafeedStatus.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ShoppingContent/DatafeedStatusError.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ShoppingContent/DatafeedStatusExample.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ShoppingContent/DatafeedsCustomBatchRequest.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ShoppingContent/DatafeedsCustomBatchRequestEntry.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ShoppingContent/DatafeedsCustomBatchResponse.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ShoppingContent/DatafeedsCustomBatchResponseEntry.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ShoppingContent/DatafeedsListResponse.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ShoppingContent/DatafeedstatusesCustomBatchRequest.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ShoppingContent/DatafeedstatusesCustomBatchRequestEntry.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ShoppingContent/DatafeedstatusesCustomBatchResponse.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ShoppingContent/DatafeedstatusesCustomBatchResponseEntry.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ShoppingContent/DatafeedstatusesListResponse.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ShoppingContent/DeliveryTime.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ShoppingContent/Error.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ShoppingContent/Errors.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ShoppingContent/Headers.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ShoppingContent/Installment.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ShoppingContent/Inventory.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ShoppingContent/InventoryCustomBatchRequest.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ShoppingContent/InventoryCustomBatchRequestEntry.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ShoppingContent/InventoryCustomBatchResponse.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ShoppingContent/InventoryCustomBatchResponseEntry.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ShoppingContent/InventoryPickup.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ShoppingContent/InventorySetRequest.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ShoppingContent/InventorySetResponse.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ShoppingContent/LocationIdSet.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ShoppingContent/LoyaltyPoints.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ShoppingContent/Order.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ShoppingContent/OrderAddress.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ShoppingContent/OrderCancellation.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ShoppingContent/OrderCustomer.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ShoppingContent/OrderDeliveryDetails.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ShoppingContent/OrderLineItem.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ShoppingContent/OrderLineItemProduct.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ShoppingContent/OrderLineItemProductVariantAttribute.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ShoppingContent/OrderLineItemReturnInfo.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ShoppingContent/OrderLineItemShippingDetails.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ShoppingContent/OrderLineItemShippingDetailsMethod.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ShoppingContent/OrderPaymentMethod.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ShoppingContent/OrderPromotion.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ShoppingContent/OrderPromotionBenefit.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ShoppingContent/OrderRefund.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ShoppingContent/OrderReturn.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ShoppingContent/OrderShipment.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ShoppingContent/OrderShipmentLineItemShipment.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ShoppingContent/OrdersAcknowledgeRequest.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ShoppingContent/OrdersAcknowledgeResponse.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ShoppingContent/OrdersAdvanceTestOrderResponse.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ShoppingContent/OrdersCancelLineItemRequest.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ShoppingContent/OrdersCancelLineItemResponse.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ShoppingContent/OrdersCancelRequest.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ShoppingContent/OrdersCancelResponse.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ShoppingContent/OrdersCreateTestOrderRequest.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ShoppingContent/OrdersCreateTestOrderResponse.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ShoppingContent/OrdersCustomBatchRequest.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ShoppingContent/OrdersCustomBatchRequestEntry.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ShoppingContent/OrdersCustomBatchRequestEntryCancel.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ShoppingContent/OrdersCustomBatchRequestEntryCancelLineItem.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ShoppingContent/OrdersCustomBatchRequestEntryRefund.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ShoppingContent/OrdersCustomBatchRequestEntryReturnLineItem.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ShoppingContent/OrdersCustomBatchRequestEntryShipLineItems.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ShoppingContent/OrdersCustomBatchRequestEntryUpdateShipment.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ShoppingContent/OrdersCustomBatchResponse.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ShoppingContent/OrdersCustomBatchResponseEntry.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ShoppingContent/OrdersGetByMerchantOrderIdResponse.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ShoppingContent/OrdersGetTestOrderTemplateResponse.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ShoppingContent/OrdersListResponse.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ShoppingContent/OrdersRefundRequest.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ShoppingContent/OrdersRefundResponse.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ShoppingContent/OrdersReturnLineItemRequest.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ShoppingContent/OrdersReturnLineItemResponse.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ShoppingContent/OrdersShipLineItemsRequest.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ShoppingContent/OrdersShipLineItemsResponse.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ShoppingContent/OrdersUpdateMerchantOrderIdRequest.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ShoppingContent/OrdersUpdateMerchantOrderIdResponse.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ShoppingContent/OrdersUpdateShipmentRequest.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ShoppingContent/OrdersUpdateShipmentResponse.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ShoppingContent/PostalCodeGroup.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ShoppingContent/PostalCodeRange.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ShoppingContent/Price.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ShoppingContent/Product.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ShoppingContent/ProductAspect.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ShoppingContent/ProductCustomAttribute.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ShoppingContent/ProductCustomGroup.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ShoppingContent/ProductDestination.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ShoppingContent/ProductShipping.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ShoppingContent/ProductShippingDimension.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ShoppingContent/ProductShippingWeight.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ShoppingContent/ProductStatus.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ShoppingContent/ProductStatusDataQualityIssue.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ShoppingContent/ProductStatusDestinationStatus.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ShoppingContent/ProductTax.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ShoppingContent/ProductUnitPricingBaseMeasure.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ShoppingContent/ProductUnitPricingMeasure.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ShoppingContent/ProductsCustomBatchRequest.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ShoppingContent/ProductsCustomBatchRequestEntry.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ShoppingContent/ProductsCustomBatchResponse.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ShoppingContent/ProductsCustomBatchResponseEntry.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ShoppingContent/ProductsListResponse.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ShoppingContent/ProductstatusesCustomBatchRequest.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ShoppingContent/ProductstatusesCustomBatchRequestEntry.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ShoppingContent/ProductstatusesCustomBatchResponse.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ShoppingContent/ProductstatusesCustomBatchResponseEntry.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ShoppingContent/ProductstatusesListResponse.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ShoppingContent/RateGroup.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ShoppingContent/Resource/Accounts.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ShoppingContent/Resource/Accountshipping.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ShoppingContent/Resource/Accountstatuses.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ShoppingContent/Resource/Accounttax.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ShoppingContent/Resource/Datafeeds.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ShoppingContent/Resource/Datafeedstatuses.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ShoppingContent/Resource/Inventory.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ShoppingContent/Resource/Orders.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ShoppingContent/Resource/Products.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ShoppingContent/Resource/Productstatuses.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ShoppingContent/Resource/Shippingsettings.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ShoppingContent/Row.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ShoppingContent/Service.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ShoppingContent/ShippingSettings.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ShoppingContent/ShippingsettingsCustomBatchRequest.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ShoppingContent/ShippingsettingsCustomBatchRequestEntry.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ShoppingContent/ShippingsettingsCustomBatchResponse.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ShoppingContent/ShippingsettingsCustomBatchResponseEntry.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ShoppingContent/ShippingsettingsGetSupportedCarriersResponse.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ShoppingContent/ShippingsettingsListResponse.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ShoppingContent/Table.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ShoppingContent/TestOrder.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ShoppingContent/TestOrderCustomer.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ShoppingContent/TestOrderLineItem.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ShoppingContent/TestOrderLineItemProduct.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ShoppingContent/TestOrderPaymentMethod.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ShoppingContent/Value.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ShoppingContent/Weight.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/SiteVerification.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/SiteVerification/Resource/WebResource.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/SiteVerification/SiteVerificationWebResourceGettokenRequest.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/SiteVerification/SiteVerificationWebResourceGettokenRequestSite.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/SiteVerification/SiteVerificationWebResourceGettokenResponse.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/SiteVerification/SiteVerificationWebResourceListResponse.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/SiteVerification/SiteVerificationWebResourceResource.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/SiteVerification/SiteVerificationWebResourceResourceSite.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Slides.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Slides/AffineTransform.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Slides/AutoText.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Slides/BatchUpdatePresentationRequest.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Slides/BatchUpdatePresentationResponse.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Slides/Bullet.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Slides/ColorScheme.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Slides/ColorStop.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Slides/CreateImageRequest.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Slides/CreateImageResponse.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Slides/CreateLineRequest.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Slides/CreateLineResponse.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Slides/CreateParagraphBulletsRequest.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Slides/CreateShapeRequest.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Slides/CreateShapeResponse.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Slides/CreateSheetsChartRequest.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Slides/CreateSheetsChartResponse.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Slides/CreateSlideRequest.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Slides/CreateSlideResponse.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Slides/CreateTableRequest.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Slides/CreateTableResponse.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Slides/CreateVideoRequest.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Slides/CreateVideoResponse.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Slides/CropProperties.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Slides/DeleteObjectRequest.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Slides/DeleteParagraphBulletsRequest.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Slides/DeleteTableColumnRequest.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Slides/DeleteTableRowRequest.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Slides/DeleteTextRequest.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Slides/Dimension.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Slides/DuplicateObjectRequest.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Slides/DuplicateObjectResponse.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Slides/Group.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Slides/Image.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Slides/ImageProperties.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Slides/InsertTableColumnsRequest.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Slides/InsertTableRowsRequest.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Slides/InsertTextRequest.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Slides/LayoutPlaceholderIdMapping.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Slides/LayoutProperties.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Slides/LayoutReference.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Slides/Line.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Slides/LineFill.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Slides/LineProperties.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Slides/Link.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Slides/NestingLevel.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Slides/NotesProperties.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Slides/OpaqueColor.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Slides/OptionalColor.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Slides/Outline.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Slides/OutlineFill.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Slides/Page.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Slides/PageBackgroundFill.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Slides/PageElement.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Slides/PageElementProperties.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Slides/PageProperties.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Slides/ParagraphMarker.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Slides/ParagraphStyle.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Slides/Placeholder.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Slides/Presentation.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Slides/Range.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Slides/Recolor.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Slides/RefreshSheetsChartRequest.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Slides/ReplaceAllShapesWithImageRequest.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Slides/ReplaceAllShapesWithImageResponse.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Slides/ReplaceAllShapesWithSheetsChartRequest.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Slides/ReplaceAllShapesWithSheetsChartResponse.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Slides/ReplaceAllTextRequest.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Slides/ReplaceAllTextResponse.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Slides/Request.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Slides/Resource/Presentations.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Slides/Resource/PresentationsPages.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Slides/Response.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Slides/RgbColor.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Slides/Shadow.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Slides/Shape.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Slides/ShapeBackgroundFill.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Slides/ShapeProperties.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Slides/SheetsChart.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Slides/SheetsChartProperties.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Slides/Size.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Slides/SlideProperties.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Slides/SlidesList.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Slides/SolidFill.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Slides/StretchedPictureFill.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Slides/SubstringMatchCriteria.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Slides/Table.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Slides/TableCell.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Slides/TableCellBackgroundFill.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Slides/TableCellLocation.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Slides/TableCellProperties.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Slides/TableColumnProperties.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Slides/TableRange.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Slides/TableRow.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Slides/TextContent.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Slides/TextElement.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Slides/TextRun.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Slides/TextStyle.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Slides/ThemeColorPair.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Slides/UpdateImagePropertiesRequest.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Slides/UpdateLinePropertiesRequest.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Slides/UpdatePageElementTransformRequest.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Slides/UpdatePagePropertiesRequest.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Slides/UpdateParagraphStyleRequest.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Slides/UpdateShapePropertiesRequest.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Slides/UpdateSlidesPositionRequest.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Slides/UpdateTableCellPropertiesRequest.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Slides/UpdateTextStyleRequest.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Slides/UpdateVideoPropertiesRequest.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Slides/Video.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Slides/VideoProperties.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Slides/WeightedFontFamily.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Slides/WordArt.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Slides/WriteControl.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Spanner.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Spanner/AuditConfig.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Spanner/AuditLogConfig.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Spanner/BeginTransactionRequest.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Spanner/Binding.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Spanner/ChildLink.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Spanner/CloudAuditOptions.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Spanner/CommitRequest.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Spanner/CommitResponse.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Spanner/Condition.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Spanner/CounterOptions.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Spanner/CreateDatabaseMetadata.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Spanner/CreateDatabaseRequest.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Spanner/CreateInstanceMetadata.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Spanner/CreateInstanceRequest.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Spanner/DataAccessOptions.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Spanner/Database.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Spanner/Delete.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Spanner/ExecuteSqlRequest.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Spanner/Field.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Spanner/GetDatabaseDdlResponse.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Spanner/GetIamPolicyRequest.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Spanner/Instance.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Spanner/InstanceConfig.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Spanner/KeyRange.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Spanner/KeySet.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Spanner/ListDatabasesResponse.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Spanner/ListInstanceConfigsResponse.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Spanner/ListInstancesResponse.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Spanner/ListOperationsResponse.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Spanner/LogConfig.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Spanner/Mutation.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Spanner/Operation.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Spanner/PartialResultSet.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Spanner/PlanNode.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Spanner/Policy.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Spanner/QueryPlan.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Spanner/ReadOnly.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Spanner/ReadRequest.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Spanner/ReadWrite.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Spanner/Resource/Projects.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Spanner/Resource/ProjectsInstanceConfigs.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Spanner/Resource/ProjectsInstances.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Spanner/Resource/ProjectsInstancesDatabases.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Spanner/Resource/ProjectsInstancesDatabasesOperations.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Spanner/Resource/ProjectsInstancesDatabasesSessions.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Spanner/Resource/ProjectsInstancesOperations.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Spanner/ResultSet.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Spanner/ResultSetMetadata.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Spanner/ResultSetStats.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Spanner/RollbackRequest.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Spanner/Rule.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Spanner/Session.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Spanner/SetIamPolicyRequest.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Spanner/ShortRepresentation.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Spanner/SpannerEmpty.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Spanner/Status.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Spanner/StructType.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Spanner/TestIamPermissionsRequest.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Spanner/TestIamPermissionsResponse.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Spanner/Transaction.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Spanner/TransactionOptions.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Spanner/TransactionSelector.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Spanner/Type.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Spanner/UpdateDatabaseDdlMetadata.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Spanner/UpdateDatabaseDdlRequest.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Spanner/UpdateInstanceMetadata.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Spanner/UpdateInstanceRequest.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Spanner/Write.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Spectrum.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Spectrum/AntennaCharacteristics.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Spectrum/DatabaseSpec.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Spectrum/DbUpdateSpec.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Spectrum/DeviceCapabilities.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Spectrum/DeviceDescriptor.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Spectrum/DeviceOwner.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Spectrum/DeviceValidity.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Spectrum/EventTime.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Spectrum/FrequencyRange.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Spectrum/GeoLocation.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Spectrum/GeoLocationEllipse.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Spectrum/GeoLocationPoint.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Spectrum/GeoLocationPolygon.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Spectrum/GeoSpectrumSchedule.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Spectrum/PawsGetSpectrumBatchRequest.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Spectrum/PawsGetSpectrumBatchResponse.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Spectrum/PawsGetSpectrumRequest.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Spectrum/PawsGetSpectrumResponse.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Spectrum/PawsInitRequest.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Spectrum/PawsInitResponse.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Spectrum/PawsNotifySpectrumUseRequest.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Spectrum/PawsNotifySpectrumUseResponse.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Spectrum/PawsRegisterRequest.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Spectrum/PawsRegisterResponse.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Spectrum/PawsVerifyDeviceRequest.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Spectrum/PawsVerifyDeviceResponse.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Spectrum/Resource/Paws.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Spectrum/RulesetInfo.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Spectrum/SpectrumMessage.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Spectrum/SpectrumSchedule.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Spectrum/Vcard.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Spectrum/VcardAddress.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Spectrum/VcardTelephone.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Spectrum/VcardTypedText.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Speech.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Speech/AsyncRecognizeRequest.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Speech/CancelOperationRequest.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Speech/ListOperationsResponse.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Speech/Operation.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Speech/RecognitionAudio.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Speech/RecognitionConfig.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Speech/Resource/Operations.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Speech/Resource/Speech.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Speech/SpeechContext.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Speech/SpeechEmpty.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Speech/SpeechRecognitionAlternative.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Speech/SpeechRecognitionResult.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Speech/Status.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Speech/SyncRecognizeRequest.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Speech/SyncRecognizeResponse.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Storage.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Storage/Bucket.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Storage/BucketAccessControl.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Storage/BucketAccessControlProjectTeam.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Storage/BucketAccessControls.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Storage/BucketCors.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Storage/BucketEncryption.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Storage/BucketLifecycle.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Storage/BucketLifecycleRule.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Storage/BucketLifecycleRuleAction.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Storage/BucketLifecycleRuleCondition.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Storage/BucketLogging.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Storage/BucketOwner.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Storage/BucketVersioning.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Storage/BucketWebsite.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Storage/Buckets.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Storage/Channel.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Storage/ComposeRequest.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Storage/ComposeRequestSourceObjects.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Storage/ComposeRequestSourceObjectsObjectPreconditions.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Storage/ObjectAccessControl.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Storage/ObjectAccessControlProjectTeam.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Storage/ObjectAccessControls.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Storage/Objects.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Storage/Policy.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Storage/PolicyBindings.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Storage/Resource/BucketAccessControls.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Storage/Resource/Buckets.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Storage/Resource/Channels.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Storage/Resource/DefaultObjectAccessControls.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Storage/Resource/ObjectAccessControls.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Storage/Resource/Objects.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Storage/RewriteResponse.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Storage/StorageObject.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Storage/StorageObjectCustomerEncryption.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Storage/StorageObjectOwner.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Storage/TestIamPermissionsResponse.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Storagetransfer.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Storagetransfer/AwsAccessKey.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Storagetransfer/AwsS3Data.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Storagetransfer/Date.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Storagetransfer/ErrorLogEntry.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Storagetransfer/ErrorSummary.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Storagetransfer/GcsData.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Storagetransfer/GoogleServiceAccount.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Storagetransfer/HttpData.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Storagetransfer/ListOperationsResponse.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Storagetransfer/ListTransferJobsResponse.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Storagetransfer/ObjectConditions.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Storagetransfer/Operation.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Storagetransfer/PauseTransferOperationRequest.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Storagetransfer/Resource/GoogleServiceAccounts.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Storagetransfer/Resource/TransferJobs.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Storagetransfer/Resource/TransferOperations.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Storagetransfer/Resource/V1.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Storagetransfer/ResumeTransferOperationRequest.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Storagetransfer/Schedule.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Storagetransfer/Status.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Storagetransfer/StoragetransferEmpty.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Storagetransfer/TimeOfDay.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Storagetransfer/TransferCounters.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Storagetransfer/TransferJob.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Storagetransfer/TransferOperation.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Storagetransfer/TransferOptions.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Storagetransfer/TransferSpec.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Storagetransfer/UpdateTransferJobRequest.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Surveys.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Surveys/FieldMask.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Surveys/MobileAppPanel.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Surveys/MobileAppPanelsListResponse.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Surveys/PageInfo.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Surveys/Resource/Mobileapppanels.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Surveys/Resource/Results.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Surveys/Resource/Surveys.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Surveys/ResultsGetRequest.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Surveys/ResultsMask.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Surveys/Survey.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Surveys/SurveyAudience.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Surveys/SurveyCost.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Surveys/SurveyQuestion.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Surveys/SurveyQuestionImage.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Surveys/SurveyRejection.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Surveys/SurveyResults.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Surveys/SurveysDeleteResponse.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Surveys/SurveysListResponse.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Surveys/SurveysStartRequest.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Surveys/SurveysStartResponse.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Surveys/SurveysStopResponse.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Surveys/TokenPagination.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/TagManager.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/TagManager/Account.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/TagManager/AccountAccess.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/TagManager/Condition.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/TagManager/Container.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/TagManager/ContainerAccess.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/TagManager/ContainerVersion.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/TagManager/ContainerVersionHeader.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/TagManager/CreateContainerVersionRequestVersionOptions.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/TagManager/CreateContainerVersionResponse.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/TagManager/Environment.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/TagManager/Folder.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/TagManager/FolderEntities.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/TagManager/ListAccountUsersResponse.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/TagManager/ListAccountsResponse.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/TagManager/ListContainerVersionsResponse.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/TagManager/ListContainersResponse.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/TagManager/ListEnvironmentsResponse.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/TagManager/ListFoldersResponse.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/TagManager/ListTagsResponse.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/TagManager/ListTriggersResponse.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/TagManager/ListVariablesResponse.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/TagManager/Macro.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/TagManager/Parameter.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/TagManager/PublishContainerVersionResponse.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/TagManager/Resource/Accounts.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/TagManager/Resource/AccountsContainers.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/TagManager/Resource/AccountsContainersEnvironments.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/TagManager/Resource/AccountsContainersFolders.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/TagManager/Resource/AccountsContainersFoldersEntities.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/TagManager/Resource/AccountsContainersMoveFolders.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/TagManager/Resource/AccountsContainersReauthorizeEnvironments.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/TagManager/Resource/AccountsContainersTags.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/TagManager/Resource/AccountsContainersTriggers.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/TagManager/Resource/AccountsContainersVariables.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/TagManager/Resource/AccountsContainersVersions.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/TagManager/Resource/AccountsPermissions.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/TagManager/Rule.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/TagManager/SetupTag.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/TagManager/Tag.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/TagManager/TeardownTag.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/TagManager/Trigger.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/TagManager/UserAccess.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/TagManager/Variable.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Taskqueue.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Taskqueue/Resource/Taskqueues.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Taskqueue/Resource/Tasks.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Taskqueue/Task.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Taskqueue/TaskQueue.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Taskqueue/TaskQueueAcl.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Taskqueue/TaskQueueStats.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Taskqueue/Tasks.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Taskqueue/Tasks2.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Tasks.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Tasks/Resource/Tasklists.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Tasks/Resource/Tasks.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Tasks/Task.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Tasks/TaskLinks.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Tasks/TaskList.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Tasks/TaskLists.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Tasks/Tasks.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ToolResults.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ToolResults/Any.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ToolResults/BasicPerfSampleSeries.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ToolResults/BatchCreatePerfSamplesRequest.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ToolResults/BatchCreatePerfSamplesResponse.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ToolResults/CPUInfo.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ToolResults/Duration.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ToolResults/Execution.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ToolResults/FailureDetail.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ToolResults/FileReference.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ToolResults/History.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ToolResults/Image.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ToolResults/InconclusiveDetail.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ToolResults/ListExecutionsResponse.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ToolResults/ListHistoriesResponse.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ToolResults/ListPerfSampleSeriesResponse.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ToolResults/ListPerfSamplesResponse.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ToolResults/ListStepThumbnailsResponse.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ToolResults/ListStepsResponse.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ToolResults/MemoryInfo.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ToolResults/Outcome.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ToolResults/PerfEnvironment.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ToolResults/PerfMetricsSummary.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ToolResults/PerfSample.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ToolResults/PerfSampleSeries.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ToolResults/ProjectSettings.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ToolResults/PublishXunitXmlFilesRequest.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ToolResults/Resource/Projects.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ToolResults/Resource/ProjectsHistories.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ToolResults/Resource/ProjectsHistoriesExecutions.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ToolResults/Resource/ProjectsHistoriesExecutionsSteps.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ToolResults/Resource/ProjectsHistoriesExecutionsStepsPerfMetricsSummary.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ToolResults/Resource/ProjectsHistoriesExecutionsStepsPerfSampleSeries.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ToolResults/Resource/ProjectsHistoriesExecutionsStepsPerfSampleSeriesSamples.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ToolResults/Resource/ProjectsHistoriesExecutionsStepsThumbnails.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ToolResults/SkippedDetail.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ToolResults/StackTrace.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ToolResults/Status.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ToolResults/Step.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ToolResults/StepDimensionValueEntry.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ToolResults/StepLabelsEntry.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ToolResults/SuccessDetail.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ToolResults/TestCaseReference.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ToolResults/TestExecutionStep.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ToolResults/TestIssue.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ToolResults/TestSuiteOverview.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ToolResults/TestTiming.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ToolResults/Thumbnail.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ToolResults/Timestamp.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ToolResults/ToolExecution.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ToolResults/ToolExecutionStep.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ToolResults/ToolExitCode.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ToolResults/ToolOutputReference.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Tracing.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Tracing/Annotation.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Tracing/AttributeValue.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Tracing/BatchUpdateSpansRequest.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Tracing/Link.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Tracing/ListSpansResponse.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Tracing/ListTracesResponse.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Tracing/Module.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Tracing/NetworkEvent.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Tracing/Resource/Projects.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Tracing/Resource/ProjectsTraces.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Tracing/Span.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Tracing/SpanUpdates.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Tracing/StackFrame.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Tracing/StackTrace.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Tracing/Status.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Tracing/TimeEvent.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Tracing/Trace.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Tracing/TracingEmpty.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Translate.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Translate/DetectionsListResponse.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Translate/DetectionsResourceItems.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Translate/LanguagesListResponse.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Translate/LanguagesResource.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Translate/Resource/Detections.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Translate/Resource/Languages.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Translate/Resource/Translations.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Translate/TranslationsListResponse.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Translate/TranslationsResource.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Urlshortener.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Urlshortener/AnalyticsSnapshot.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Urlshortener/AnalyticsSummary.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Urlshortener/Resource/Url.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Urlshortener/StringCount.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Urlshortener/Url.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Urlshortener/UrlHistory.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Vision.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Vision/AnnotateImageRequest.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Vision/AnnotateImageResponse.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Vision/BatchAnnotateImagesRequest.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Vision/BatchAnnotateImagesResponse.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Vision/Block.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Vision/BoundingPoly.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Vision/Color.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Vision/ColorInfo.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Vision/CropHint.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Vision/CropHintsAnnotation.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Vision/CropHintsParams.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Vision/DetectedBreak.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Vision/DetectedLanguage.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Vision/DominantColorsAnnotation.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Vision/EntityAnnotation.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Vision/FaceAnnotation.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Vision/Feature.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Vision/Image.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Vision/ImageContext.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Vision/ImageProperties.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Vision/ImageSource.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Vision/Landmark.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Vision/LatLng.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Vision/LatLongRect.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Vision/LocationInfo.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Vision/Page.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Vision/Paragraph.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Vision/Position.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Vision/Property.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Vision/Resource/Images.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Vision/SafeSearchAnnotation.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Vision/Status.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Vision/Symbol.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Vision/TextAnnotation.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Vision/TextProperty.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Vision/Vertex.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Vision/WebDetection.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Vision/WebEntity.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Vision/WebImage.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Vision/WebPage.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Vision/Word.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Webfonts.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Webfonts/Resource/Webfonts.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Webfonts/Webfont.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Webfonts/WebfontList.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Webmasters.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Webmasters/ApiDataRow.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Webmasters/ApiDimensionFilter.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Webmasters/ApiDimensionFilterGroup.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Webmasters/Resource/Searchanalytics.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Webmasters/Resource/Sitemaps.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Webmasters/Resource/Sites.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Webmasters/Resource/Urlcrawlerrorscounts.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Webmasters/Resource/Urlcrawlerrorssamples.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Webmasters/SearchAnalyticsQueryRequest.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Webmasters/SearchAnalyticsQueryResponse.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Webmasters/SitemapsListResponse.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Webmasters/SitesListResponse.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Webmasters/UrlCrawlErrorCount.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Webmasters/UrlCrawlErrorCountsPerType.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Webmasters/UrlCrawlErrorsCountsQueryResponse.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Webmasters/UrlCrawlErrorsSample.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Webmasters/UrlCrawlErrorsSamplesListResponse.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Webmasters/UrlSampleDetails.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Webmasters/WmxSite.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Webmasters/WmxSitemap.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Webmasters/WmxSitemapContent.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTube.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTube/AccessPolicy.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTube/Activity.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTube/ActivityContentDetails.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTube/ActivityContentDetailsBulletin.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTube/ActivityContentDetailsChannelItem.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTube/ActivityContentDetailsComment.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTube/ActivityContentDetailsFavorite.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTube/ActivityContentDetailsLike.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTube/ActivityContentDetailsPlaylistItem.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTube/ActivityContentDetailsPromotedItem.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTube/ActivityContentDetailsRecommendation.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTube/ActivityContentDetailsSocial.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTube/ActivityContentDetailsSubscription.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTube/ActivityContentDetailsUpload.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTube/ActivityListResponse.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTube/ActivitySnippet.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTube/Caption.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTube/CaptionListResponse.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTube/CaptionSnippet.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTube/CdnSettings.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTube/Channel.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTube/ChannelAuditDetails.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTube/ChannelBannerResource.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTube/ChannelBrandingSettings.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTube/ChannelContentDetails.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTube/ChannelContentDetailsRelatedPlaylists.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTube/ChannelContentOwnerDetails.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTube/ChannelConversionPing.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTube/ChannelConversionPings.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTube/ChannelListResponse.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTube/ChannelLocalization.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTube/ChannelProfileDetails.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTube/ChannelSection.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTube/ChannelSectionContentDetails.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTube/ChannelSectionListResponse.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTube/ChannelSectionLocalization.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTube/ChannelSectionSnippet.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTube/ChannelSectionTargeting.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTube/ChannelSettings.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTube/ChannelSnippet.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTube/ChannelStatistics.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTube/ChannelStatus.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTube/ChannelTopicDetails.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTube/Comment.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTube/CommentListResponse.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTube/CommentSnippet.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTube/CommentThread.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTube/CommentThreadListResponse.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTube/CommentThreadReplies.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTube/CommentThreadSnippet.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTube/ContentRating.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTube/FanFundingEvent.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTube/FanFundingEventListResponse.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTube/FanFundingEventSnippet.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTube/GeoPoint.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTube/GuideCategory.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTube/GuideCategoryListResponse.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTube/GuideCategorySnippet.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTube/I18nLanguage.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTube/I18nLanguageListResponse.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTube/I18nLanguageSnippet.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTube/I18nRegion.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTube/I18nRegionListResponse.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTube/I18nRegionSnippet.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTube/ImageSettings.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTube/IngestionInfo.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTube/InvideoBranding.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTube/InvideoPosition.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTube/InvideoPromotion.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTube/InvideoTiming.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTube/LanguageTag.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTube/LiveBroadcast.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTube/LiveBroadcastContentDetails.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTube/LiveBroadcastListResponse.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTube/LiveBroadcastSnippet.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTube/LiveBroadcastStatistics.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTube/LiveBroadcastStatus.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTube/LiveBroadcastTopic.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTube/LiveBroadcastTopicDetails.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTube/LiveBroadcastTopicSnippet.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTube/LiveChatBan.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTube/LiveChatBanSnippet.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTube/LiveChatFanFundingEventDetails.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTube/LiveChatMessage.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTube/LiveChatMessageAuthorDetails.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTube/LiveChatMessageDeletedDetails.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTube/LiveChatMessageListResponse.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTube/LiveChatMessageRetractedDetails.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTube/LiveChatMessageSnippet.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTube/LiveChatModerator.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTube/LiveChatModeratorListResponse.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTube/LiveChatModeratorSnippet.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTube/LiveChatPollClosedDetails.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTube/LiveChatPollEditedDetails.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTube/LiveChatPollItem.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTube/LiveChatPollOpenedDetails.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTube/LiveChatPollVotedDetails.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTube/LiveChatSuperChatDetails.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTube/LiveChatTextMessageDetails.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTube/LiveChatUserBannedMessageDetails.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTube/LiveStream.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTube/LiveStreamConfigurationIssue.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTube/LiveStreamContentDetails.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTube/LiveStreamHealthStatus.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTube/LiveStreamListResponse.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTube/LiveStreamSnippet.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTube/LiveStreamStatus.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTube/LocalizedProperty.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTube/LocalizedString.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTube/MonitorStreamInfo.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTube/PageInfo.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTube/Playlist.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTube/PlaylistContentDetails.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTube/PlaylistItem.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTube/PlaylistItemContentDetails.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTube/PlaylistItemListResponse.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTube/PlaylistItemSnippet.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTube/PlaylistItemStatus.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTube/PlaylistListResponse.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTube/PlaylistLocalization.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTube/PlaylistPlayer.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTube/PlaylistSnippet.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTube/PlaylistStatus.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTube/PromotedItem.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTube/PromotedItemId.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTube/PropertyValue.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTube/Resource/Activities.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTube/Resource/Captions.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTube/Resource/ChannelBanners.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTube/Resource/ChannelSections.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTube/Resource/Channels.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTube/Resource/CommentThreads.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTube/Resource/Comments.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTube/Resource/FanFundingEvents.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTube/Resource/GuideCategories.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTube/Resource/I18nLanguages.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTube/Resource/I18nRegions.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTube/Resource/LiveBroadcasts.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTube/Resource/LiveChatBans.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTube/Resource/LiveChatMessages.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTube/Resource/LiveChatModerators.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTube/Resource/LiveStreams.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTube/Resource/PlaylistItems.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTube/Resource/Playlists.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTube/Resource/Search.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTube/Resource/Sponsors.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTube/Resource/Subscriptions.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTube/Resource/SuperChatEvents.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTube/Resource/Thumbnails.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTube/Resource/VideoAbuseReportReasons.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTube/Resource/VideoCategories.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTube/Resource/Videos.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTube/Resource/Watermarks.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTube/ResourceId.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTube/SearchListResponse.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTube/SearchResult.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTube/SearchResultSnippet.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTube/Sponsor.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTube/SponsorListResponse.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTube/SponsorSnippet.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTube/Subscription.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTube/SubscriptionContentDetails.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTube/SubscriptionListResponse.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTube/SubscriptionSnippet.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTube/SubscriptionSubscriberSnippet.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTube/SuperChatEvent.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTube/SuperChatEventListResponse.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTube/SuperChatEventSnippet.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTube/Thumbnail.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTube/ThumbnailDetails.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTube/ThumbnailSetResponse.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTube/TokenPagination.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTube/Video.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTube/VideoAbuseReport.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTube/VideoAbuseReportReason.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTube/VideoAbuseReportReasonListResponse.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTube/VideoAbuseReportReasonSnippet.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTube/VideoAbuseReportSecondaryReason.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTube/VideoAgeGating.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTube/VideoCategory.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTube/VideoCategoryListResponse.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTube/VideoCategorySnippet.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTube/VideoContentDetails.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTube/VideoContentDetailsRegionRestriction.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTube/VideoFileDetails.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTube/VideoFileDetailsAudioStream.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTube/VideoFileDetailsVideoStream.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTube/VideoGetRatingResponse.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTube/VideoListResponse.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTube/VideoLiveStreamingDetails.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTube/VideoLocalization.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTube/VideoMonetizationDetails.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTube/VideoPlayer.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTube/VideoProcessingDetails.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTube/VideoProcessingDetailsProcessingProgress.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTube/VideoProjectDetails.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTube/VideoRating.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTube/VideoRecordingDetails.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTube/VideoSnippet.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTube/VideoStatistics.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTube/VideoStatus.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTube/VideoSuggestions.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTube/VideoSuggestionsTagSuggestion.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTube/VideoTopicDetails.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTube/WatchSettings.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTubeAnalytics.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTubeAnalytics/BatchReport.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTubeAnalytics/BatchReportDefinition.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTubeAnalytics/BatchReportDefinitionList.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTubeAnalytics/BatchReportList.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTubeAnalytics/BatchReportOutputs.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTubeAnalytics/BatchReportTimeSpan.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTubeAnalytics/Group.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTubeAnalytics/GroupContentDetails.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTubeAnalytics/GroupItem.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTubeAnalytics/GroupItemListResponse.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTubeAnalytics/GroupItemResource.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTubeAnalytics/GroupListResponse.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTubeAnalytics/GroupSnippet.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTubeAnalytics/Resource/BatchReportDefinitions.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTubeAnalytics/Resource/BatchReports.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTubeAnalytics/Resource/GroupItems.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTubeAnalytics/Resource/Groups.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTubeAnalytics/Resource/Reports.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTubeAnalytics/ResultTable.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTubeAnalytics/ResultTableColumnHeaders.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTubeReporting.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTubeReporting/Job.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTubeReporting/ListJobsResponse.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTubeReporting/ListReportTypesResponse.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTubeReporting/ListReportsResponse.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTubeReporting/Media.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTubeReporting/Report.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTubeReporting/ReportType.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTubeReporting/Resource/Jobs.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTubeReporting/Resource/JobsReports.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTubeReporting/Resource/Media.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTubeReporting/Resource/ReportTypes.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTubeReporting/YoutubereportingEmpty.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/tests/ServiceTest.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient-services/tests/bootstrap.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient/.gitattributes delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient/LICENSE delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient/README.md delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient/composer.json delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient/src/Google/AccessToken/Revoke.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient/src/Google/AccessToken/Verify.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient/src/Google/AuthHandler/AuthHandlerFactory.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient/src/Google/AuthHandler/Guzzle5AuthHandler.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient/src/Google/AuthHandler/Guzzle6AuthHandler.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient/src/Google/Client.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient/src/Google/Collection.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient/src/Google/Exception.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient/src/Google/Http/Batch.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient/src/Google/Http/MediaFileUpload.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient/src/Google/Http/REST.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient/src/Google/Model.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient/src/Google/Service.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient/src/Google/Service/Exception.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient/src/Google/Service/README.md delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient/src/Google/Service/Resource.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient/src/Google/Task/Exception.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient/src/Google/Task/Retryable.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient/src/Google/Task/Runner.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient/src/Google/Utils/UriTemplate.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/apiclient/src/Google/autoload.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/auth/.editorconfig delete mode 100644 mayor-orig/www/include/share/googleapi/google/auth/.gitignore delete mode 100644 mayor-orig/www/include/share/googleapi/google/auth/.php_cs delete mode 100644 mayor-orig/www/include/share/googleapi/google/auth/.travis.yml delete mode 100644 mayor-orig/www/include/share/googleapi/google/auth/CHANGELOG.md delete mode 100644 mayor-orig/www/include/share/googleapi/google/auth/CONTRIBUTING.md delete mode 100644 mayor-orig/www/include/share/googleapi/google/auth/COPYING delete mode 100644 mayor-orig/www/include/share/googleapi/google/auth/LICENSE delete mode 100644 mayor-orig/www/include/share/googleapi/google/auth/README.md delete mode 100644 mayor-orig/www/include/share/googleapi/google/auth/autoload.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/auth/composer.json delete mode 100644 mayor-orig/www/include/share/googleapi/google/auth/phpunit.xml.dist delete mode 100644 mayor-orig/www/include/share/googleapi/google/auth/src/ApplicationDefaultCredentials.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/auth/src/Cache/InvalidArgumentException.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/auth/src/Cache/Item.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/auth/src/Cache/MemoryCacheItemPool.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/auth/src/CacheTrait.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/auth/src/Credentials/AppIdentityCredentials.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/auth/src/Credentials/GCECredentials.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/auth/src/Credentials/IAMCredentials.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/auth/src/Credentials/ServiceAccountCredentials.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/auth/src/Credentials/ServiceAccountJwtAccessCredentials.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/auth/src/Credentials/UserRefreshCredentials.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/auth/src/CredentialsLoader.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/auth/src/FetchAuthTokenCache.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/auth/src/FetchAuthTokenInterface.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/auth/src/HttpHandler/Guzzle5HttpHandler.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/auth/src/HttpHandler/Guzzle6HttpHandler.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/auth/src/HttpHandler/HttpHandlerFactory.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/auth/src/Middleware/AuthTokenMiddleware.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/auth/src/Middleware/ScopedAccessTokenMiddleware.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/auth/src/Middleware/SimpleMiddleware.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/auth/src/OAuth2.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/auth/src/Subscriber/AuthTokenSubscriber.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/auth/src/Subscriber/ScopedAccessTokenSubscriber.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/auth/src/Subscriber/SimpleSubscriber.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/auth/tests/ApplicationDefaultCredentialsTest.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/auth/tests/BaseTest.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/auth/tests/Cache/ItemTest.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/auth/tests/Cache/MemoryCacheItemPoolTest.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/auth/tests/CacheTraitTest.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/auth/tests/Credentials/AppIndentityCredentialsTest.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/auth/tests/Credentials/GCECredentialsTest.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/auth/tests/Credentials/IAMCredentialsTest.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/auth/tests/Credentials/ServiceAccountCredentialsTest.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/auth/tests/Credentials/UserRefreshCredentialsTest.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/auth/tests/FetchAuthTokenCacheTest.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/auth/tests/FetchAuthTokenTest.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/auth/tests/HttpHandler/Guzzle5HttpHandlerTest.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/auth/tests/HttpHandler/Guzzle6HttpHandlerTest.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/auth/tests/HttpHandler/HttpHandlerFactoryTest.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/auth/tests/Middleware/AuthTokenMiddlewareTest.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/auth/tests/Middleware/ScopedAccessTokenMiddlewareTest.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/auth/tests/Middleware/SimpleMiddlewareTest.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/auth/tests/OAuth2Test.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/auth/tests/Subscriber/AuthTokenSubscriberTest.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/auth/tests/Subscriber/ScopedAccessTokenSubscriberTest.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/auth/tests/Subscriber/SimpleSubscriberTest.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/auth/tests/bootstrap.php delete mode 100644 mayor-orig/www/include/share/googleapi/google/auth/tests/fixtures/.config/gcloud/application_default_credentials.json delete mode 100644 mayor-orig/www/include/share/googleapi/google/auth/tests/fixtures/private.json delete mode 100644 mayor-orig/www/include/share/googleapi/google/auth/tests/fixtures/private.pem delete mode 100644 mayor-orig/www/include/share/googleapi/google/auth/tests/fixtures/public.pem delete mode 100644 mayor-orig/www/include/share/googleapi/google/auth/tests/fixtures2/.config/gcloud/application_default_credentials.json delete mode 100644 mayor-orig/www/include/share/googleapi/google/auth/tests/fixtures2/private.json delete mode 100644 mayor-orig/www/include/share/googleapi/google/auth/tests/mocks/AppIdentityService.php delete mode 100644 mayor-orig/www/include/share/googleapi/guzzlehttp/guzzle/CHANGELOG.md delete mode 100644 mayor-orig/www/include/share/googleapi/guzzlehttp/guzzle/LICENSE delete mode 100644 mayor-orig/www/include/share/googleapi/guzzlehttp/guzzle/README.md delete mode 100644 mayor-orig/www/include/share/googleapi/guzzlehttp/guzzle/UPGRADING.md delete mode 100644 mayor-orig/www/include/share/googleapi/guzzlehttp/guzzle/composer.json delete mode 100644 mayor-orig/www/include/share/googleapi/guzzlehttp/guzzle/src/Client.php delete mode 100644 mayor-orig/www/include/share/googleapi/guzzlehttp/guzzle/src/ClientInterface.php delete mode 100644 mayor-orig/www/include/share/googleapi/guzzlehttp/guzzle/src/Cookie/CookieJar.php delete mode 100644 mayor-orig/www/include/share/googleapi/guzzlehttp/guzzle/src/Cookie/CookieJarInterface.php delete mode 100644 mayor-orig/www/include/share/googleapi/guzzlehttp/guzzle/src/Cookie/FileCookieJar.php delete mode 100644 mayor-orig/www/include/share/googleapi/guzzlehttp/guzzle/src/Cookie/SessionCookieJar.php delete mode 100644 mayor-orig/www/include/share/googleapi/guzzlehttp/guzzle/src/Cookie/SetCookie.php delete mode 100644 mayor-orig/www/include/share/googleapi/guzzlehttp/guzzle/src/Exception/BadResponseException.php delete mode 100644 mayor-orig/www/include/share/googleapi/guzzlehttp/guzzle/src/Exception/ClientException.php delete mode 100644 mayor-orig/www/include/share/googleapi/guzzlehttp/guzzle/src/Exception/ConnectException.php delete mode 100644 mayor-orig/www/include/share/googleapi/guzzlehttp/guzzle/src/Exception/GuzzleException.php delete mode 100644 mayor-orig/www/include/share/googleapi/guzzlehttp/guzzle/src/Exception/RequestException.php delete mode 100644 mayor-orig/www/include/share/googleapi/guzzlehttp/guzzle/src/Exception/SeekException.php delete mode 100644 mayor-orig/www/include/share/googleapi/guzzlehttp/guzzle/src/Exception/ServerException.php delete mode 100644 mayor-orig/www/include/share/googleapi/guzzlehttp/guzzle/src/Exception/TooManyRedirectsException.php delete mode 100644 mayor-orig/www/include/share/googleapi/guzzlehttp/guzzle/src/Exception/TransferException.php delete mode 100644 mayor-orig/www/include/share/googleapi/guzzlehttp/guzzle/src/Handler/CurlFactory.php delete mode 100644 mayor-orig/www/include/share/googleapi/guzzlehttp/guzzle/src/Handler/CurlFactoryInterface.php delete mode 100644 mayor-orig/www/include/share/googleapi/guzzlehttp/guzzle/src/Handler/CurlHandler.php delete mode 100644 mayor-orig/www/include/share/googleapi/guzzlehttp/guzzle/src/Handler/CurlMultiHandler.php delete mode 100644 mayor-orig/www/include/share/googleapi/guzzlehttp/guzzle/src/Handler/EasyHandle.php delete mode 100644 mayor-orig/www/include/share/googleapi/guzzlehttp/guzzle/src/Handler/MockHandler.php delete mode 100644 mayor-orig/www/include/share/googleapi/guzzlehttp/guzzle/src/Handler/Proxy.php delete mode 100644 mayor-orig/www/include/share/googleapi/guzzlehttp/guzzle/src/Handler/StreamHandler.php delete mode 100644 mayor-orig/www/include/share/googleapi/guzzlehttp/guzzle/src/HandlerStack.php delete mode 100644 mayor-orig/www/include/share/googleapi/guzzlehttp/guzzle/src/MessageFormatter.php delete mode 100644 mayor-orig/www/include/share/googleapi/guzzlehttp/guzzle/src/Middleware.php delete mode 100644 mayor-orig/www/include/share/googleapi/guzzlehttp/guzzle/src/Pool.php delete mode 100644 mayor-orig/www/include/share/googleapi/guzzlehttp/guzzle/src/PrepareBodyMiddleware.php delete mode 100644 mayor-orig/www/include/share/googleapi/guzzlehttp/guzzle/src/RedirectMiddleware.php delete mode 100644 mayor-orig/www/include/share/googleapi/guzzlehttp/guzzle/src/RequestOptions.php delete mode 100644 mayor-orig/www/include/share/googleapi/guzzlehttp/guzzle/src/RetryMiddleware.php delete mode 100644 mayor-orig/www/include/share/googleapi/guzzlehttp/guzzle/src/TransferStats.php delete mode 100644 mayor-orig/www/include/share/googleapi/guzzlehttp/guzzle/src/UriTemplate.php delete mode 100644 mayor-orig/www/include/share/googleapi/guzzlehttp/guzzle/src/functions.php delete mode 100644 mayor-orig/www/include/share/googleapi/guzzlehttp/guzzle/src/functions_include.php delete mode 100644 mayor-orig/www/include/share/googleapi/guzzlehttp/promises/CHANGELOG.md delete mode 100644 mayor-orig/www/include/share/googleapi/guzzlehttp/promises/LICENSE delete mode 100644 mayor-orig/www/include/share/googleapi/guzzlehttp/promises/Makefile delete mode 100644 mayor-orig/www/include/share/googleapi/guzzlehttp/promises/README.md delete mode 100644 mayor-orig/www/include/share/googleapi/guzzlehttp/promises/composer.json delete mode 100644 mayor-orig/www/include/share/googleapi/guzzlehttp/promises/src/AggregateException.php delete mode 100644 mayor-orig/www/include/share/googleapi/guzzlehttp/promises/src/CancellationException.php delete mode 100644 mayor-orig/www/include/share/googleapi/guzzlehttp/promises/src/Coroutine.php delete mode 100644 mayor-orig/www/include/share/googleapi/guzzlehttp/promises/src/EachPromise.php delete mode 100644 mayor-orig/www/include/share/googleapi/guzzlehttp/promises/src/FulfilledPromise.php delete mode 100644 mayor-orig/www/include/share/googleapi/guzzlehttp/promises/src/Promise.php delete mode 100644 mayor-orig/www/include/share/googleapi/guzzlehttp/promises/src/PromiseInterface.php delete mode 100644 mayor-orig/www/include/share/googleapi/guzzlehttp/promises/src/PromisorInterface.php delete mode 100644 mayor-orig/www/include/share/googleapi/guzzlehttp/promises/src/RejectedPromise.php delete mode 100644 mayor-orig/www/include/share/googleapi/guzzlehttp/promises/src/RejectionException.php delete mode 100644 mayor-orig/www/include/share/googleapi/guzzlehttp/promises/src/TaskQueue.php delete mode 100644 mayor-orig/www/include/share/googleapi/guzzlehttp/promises/src/TaskQueueInterface.php delete mode 100644 mayor-orig/www/include/share/googleapi/guzzlehttp/promises/src/functions.php delete mode 100644 mayor-orig/www/include/share/googleapi/guzzlehttp/promises/src/functions_include.php delete mode 100644 mayor-orig/www/include/share/googleapi/guzzlehttp/psr7/CHANGELOG.md delete mode 100644 mayor-orig/www/include/share/googleapi/guzzlehttp/psr7/LICENSE delete mode 100644 mayor-orig/www/include/share/googleapi/guzzlehttp/psr7/README.md delete mode 100644 mayor-orig/www/include/share/googleapi/guzzlehttp/psr7/composer.json delete mode 100644 mayor-orig/www/include/share/googleapi/guzzlehttp/psr7/src/AppendStream.php delete mode 100644 mayor-orig/www/include/share/googleapi/guzzlehttp/psr7/src/BufferStream.php delete mode 100644 mayor-orig/www/include/share/googleapi/guzzlehttp/psr7/src/CachingStream.php delete mode 100644 mayor-orig/www/include/share/googleapi/guzzlehttp/psr7/src/DroppingStream.php delete mode 100644 mayor-orig/www/include/share/googleapi/guzzlehttp/psr7/src/FnStream.php delete mode 100644 mayor-orig/www/include/share/googleapi/guzzlehttp/psr7/src/InflateStream.php delete mode 100644 mayor-orig/www/include/share/googleapi/guzzlehttp/psr7/src/LazyOpenStream.php delete mode 100644 mayor-orig/www/include/share/googleapi/guzzlehttp/psr7/src/LimitStream.php delete mode 100644 mayor-orig/www/include/share/googleapi/guzzlehttp/psr7/src/MessageTrait.php delete mode 100644 mayor-orig/www/include/share/googleapi/guzzlehttp/psr7/src/MultipartStream.php delete mode 100644 mayor-orig/www/include/share/googleapi/guzzlehttp/psr7/src/NoSeekStream.php delete mode 100644 mayor-orig/www/include/share/googleapi/guzzlehttp/psr7/src/PumpStream.php delete mode 100644 mayor-orig/www/include/share/googleapi/guzzlehttp/psr7/src/Request.php delete mode 100644 mayor-orig/www/include/share/googleapi/guzzlehttp/psr7/src/Response.php delete mode 100644 mayor-orig/www/include/share/googleapi/guzzlehttp/psr7/src/ServerRequest.php delete mode 100644 mayor-orig/www/include/share/googleapi/guzzlehttp/psr7/src/Stream.php delete mode 100644 mayor-orig/www/include/share/googleapi/guzzlehttp/psr7/src/StreamDecoratorTrait.php delete mode 100644 mayor-orig/www/include/share/googleapi/guzzlehttp/psr7/src/StreamWrapper.php delete mode 100644 mayor-orig/www/include/share/googleapi/guzzlehttp/psr7/src/UploadedFile.php delete mode 100644 mayor-orig/www/include/share/googleapi/guzzlehttp/psr7/src/Uri.php delete mode 100644 mayor-orig/www/include/share/googleapi/guzzlehttp/psr7/src/UriNormalizer.php delete mode 100644 mayor-orig/www/include/share/googleapi/guzzlehttp/psr7/src/UriResolver.php delete mode 100644 mayor-orig/www/include/share/googleapi/guzzlehttp/psr7/src/functions.php delete mode 100644 mayor-orig/www/include/share/googleapi/guzzlehttp/psr7/src/functions_include.php delete mode 100644 mayor-orig/www/include/share/googleapi/monolog/monolog/.php_cs delete mode 100644 mayor-orig/www/include/share/googleapi/monolog/monolog/CHANGELOG.md delete mode 100644 mayor-orig/www/include/share/googleapi/monolog/monolog/LICENSE delete mode 100644 mayor-orig/www/include/share/googleapi/monolog/monolog/README.md delete mode 100644 mayor-orig/www/include/share/googleapi/monolog/monolog/composer.json delete mode 100644 mayor-orig/www/include/share/googleapi/monolog/monolog/doc/01-usage.md delete mode 100644 mayor-orig/www/include/share/googleapi/monolog/monolog/doc/02-handlers-formatters-processors.md delete mode 100644 mayor-orig/www/include/share/googleapi/monolog/monolog/doc/03-utilities.md delete mode 100644 mayor-orig/www/include/share/googleapi/monolog/monolog/doc/04-extending.md delete mode 100644 mayor-orig/www/include/share/googleapi/monolog/monolog/doc/sockets.md delete mode 100644 mayor-orig/www/include/share/googleapi/monolog/monolog/phpunit.xml.dist delete mode 100644 mayor-orig/www/include/share/googleapi/monolog/monolog/src/Monolog/ErrorHandler.php delete mode 100644 mayor-orig/www/include/share/googleapi/monolog/monolog/src/Monolog/Formatter/ChromePHPFormatter.php delete mode 100644 mayor-orig/www/include/share/googleapi/monolog/monolog/src/Monolog/Formatter/ElasticaFormatter.php delete mode 100644 mayor-orig/www/include/share/googleapi/monolog/monolog/src/Monolog/Formatter/FlowdockFormatter.php delete mode 100644 mayor-orig/www/include/share/googleapi/monolog/monolog/src/Monolog/Formatter/FluentdFormatter.php delete mode 100644 mayor-orig/www/include/share/googleapi/monolog/monolog/src/Monolog/Formatter/FormatterInterface.php delete mode 100644 mayor-orig/www/include/share/googleapi/monolog/monolog/src/Monolog/Formatter/GelfMessageFormatter.php delete mode 100644 mayor-orig/www/include/share/googleapi/monolog/monolog/src/Monolog/Formatter/HtmlFormatter.php delete mode 100644 mayor-orig/www/include/share/googleapi/monolog/monolog/src/Monolog/Formatter/JsonFormatter.php delete mode 100644 mayor-orig/www/include/share/googleapi/monolog/monolog/src/Monolog/Formatter/LineFormatter.php delete mode 100644 mayor-orig/www/include/share/googleapi/monolog/monolog/src/Monolog/Formatter/LogglyFormatter.php delete mode 100644 mayor-orig/www/include/share/googleapi/monolog/monolog/src/Monolog/Formatter/LogstashFormatter.php delete mode 100644 mayor-orig/www/include/share/googleapi/monolog/monolog/src/Monolog/Formatter/MongoDBFormatter.php delete mode 100644 mayor-orig/www/include/share/googleapi/monolog/monolog/src/Monolog/Formatter/NormalizerFormatter.php delete mode 100644 mayor-orig/www/include/share/googleapi/monolog/monolog/src/Monolog/Formatter/ScalarFormatter.php delete mode 100644 mayor-orig/www/include/share/googleapi/monolog/monolog/src/Monolog/Formatter/WildfireFormatter.php delete mode 100644 mayor-orig/www/include/share/googleapi/monolog/monolog/src/Monolog/Handler/AbstractHandler.php delete mode 100644 mayor-orig/www/include/share/googleapi/monolog/monolog/src/Monolog/Handler/AbstractProcessingHandler.php delete mode 100644 mayor-orig/www/include/share/googleapi/monolog/monolog/src/Monolog/Handler/AbstractSyslogHandler.php delete mode 100644 mayor-orig/www/include/share/googleapi/monolog/monolog/src/Monolog/Handler/AmqpHandler.php delete mode 100644 mayor-orig/www/include/share/googleapi/monolog/monolog/src/Monolog/Handler/BrowserConsoleHandler.php delete mode 100644 mayor-orig/www/include/share/googleapi/monolog/monolog/src/Monolog/Handler/BufferHandler.php delete mode 100644 mayor-orig/www/include/share/googleapi/monolog/monolog/src/Monolog/Handler/ChromePHPHandler.php delete mode 100644 mayor-orig/www/include/share/googleapi/monolog/monolog/src/Monolog/Handler/CouchDBHandler.php delete mode 100644 mayor-orig/www/include/share/googleapi/monolog/monolog/src/Monolog/Handler/CubeHandler.php delete mode 100644 mayor-orig/www/include/share/googleapi/monolog/monolog/src/Monolog/Handler/Curl/Util.php delete mode 100644 mayor-orig/www/include/share/googleapi/monolog/monolog/src/Monolog/Handler/DeduplicationHandler.php delete mode 100644 mayor-orig/www/include/share/googleapi/monolog/monolog/src/Monolog/Handler/DoctrineCouchDBHandler.php delete mode 100644 mayor-orig/www/include/share/googleapi/monolog/monolog/src/Monolog/Handler/DynamoDbHandler.php delete mode 100644 mayor-orig/www/include/share/googleapi/monolog/monolog/src/Monolog/Handler/ElasticSearchHandler.php delete mode 100644 mayor-orig/www/include/share/googleapi/monolog/monolog/src/Monolog/Handler/ErrorLogHandler.php delete mode 100644 mayor-orig/www/include/share/googleapi/monolog/monolog/src/Monolog/Handler/FilterHandler.php delete mode 100644 mayor-orig/www/include/share/googleapi/monolog/monolog/src/Monolog/Handler/FingersCrossed/ActivationStrategyInterface.php delete mode 100644 mayor-orig/www/include/share/googleapi/monolog/monolog/src/Monolog/Handler/FingersCrossed/ChannelLevelActivationStrategy.php delete mode 100644 mayor-orig/www/include/share/googleapi/monolog/monolog/src/Monolog/Handler/FingersCrossed/ErrorLevelActivationStrategy.php delete mode 100644 mayor-orig/www/include/share/googleapi/monolog/monolog/src/Monolog/Handler/FingersCrossedHandler.php delete mode 100644 mayor-orig/www/include/share/googleapi/monolog/monolog/src/Monolog/Handler/FirePHPHandler.php delete mode 100644 mayor-orig/www/include/share/googleapi/monolog/monolog/src/Monolog/Handler/FleepHookHandler.php delete mode 100644 mayor-orig/www/include/share/googleapi/monolog/monolog/src/Monolog/Handler/FlowdockHandler.php delete mode 100644 mayor-orig/www/include/share/googleapi/monolog/monolog/src/Monolog/Handler/GelfHandler.php delete mode 100644 mayor-orig/www/include/share/googleapi/monolog/monolog/src/Monolog/Handler/GroupHandler.php delete mode 100644 mayor-orig/www/include/share/googleapi/monolog/monolog/src/Monolog/Handler/HandlerInterface.php delete mode 100644 mayor-orig/www/include/share/googleapi/monolog/monolog/src/Monolog/Handler/HandlerWrapper.php delete mode 100644 mayor-orig/www/include/share/googleapi/monolog/monolog/src/Monolog/Handler/HipChatHandler.php delete mode 100644 mayor-orig/www/include/share/googleapi/monolog/monolog/src/Monolog/Handler/IFTTTHandler.php delete mode 100644 mayor-orig/www/include/share/googleapi/monolog/monolog/src/Monolog/Handler/LogEntriesHandler.php delete mode 100644 mayor-orig/www/include/share/googleapi/monolog/monolog/src/Monolog/Handler/LogglyHandler.php delete mode 100644 mayor-orig/www/include/share/googleapi/monolog/monolog/src/Monolog/Handler/MailHandler.php delete mode 100644 mayor-orig/www/include/share/googleapi/monolog/monolog/src/Monolog/Handler/MandrillHandler.php delete mode 100644 mayor-orig/www/include/share/googleapi/monolog/monolog/src/Monolog/Handler/MissingExtensionException.php delete mode 100644 mayor-orig/www/include/share/googleapi/monolog/monolog/src/Monolog/Handler/MongoDBHandler.php delete mode 100644 mayor-orig/www/include/share/googleapi/monolog/monolog/src/Monolog/Handler/NativeMailerHandler.php delete mode 100644 mayor-orig/www/include/share/googleapi/monolog/monolog/src/Monolog/Handler/NewRelicHandler.php delete mode 100644 mayor-orig/www/include/share/googleapi/monolog/monolog/src/Monolog/Handler/NullHandler.php delete mode 100644 mayor-orig/www/include/share/googleapi/monolog/monolog/src/Monolog/Handler/PHPConsoleHandler.php delete mode 100644 mayor-orig/www/include/share/googleapi/monolog/monolog/src/Monolog/Handler/PsrHandler.php delete mode 100644 mayor-orig/www/include/share/googleapi/monolog/monolog/src/Monolog/Handler/PushoverHandler.php delete mode 100644 mayor-orig/www/include/share/googleapi/monolog/monolog/src/Monolog/Handler/RavenHandler.php delete mode 100644 mayor-orig/www/include/share/googleapi/monolog/monolog/src/Monolog/Handler/RedisHandler.php delete mode 100644 mayor-orig/www/include/share/googleapi/monolog/monolog/src/Monolog/Handler/RollbarHandler.php delete mode 100644 mayor-orig/www/include/share/googleapi/monolog/monolog/src/Monolog/Handler/RotatingFileHandler.php delete mode 100644 mayor-orig/www/include/share/googleapi/monolog/monolog/src/Monolog/Handler/SamplingHandler.php delete mode 100644 mayor-orig/www/include/share/googleapi/monolog/monolog/src/Monolog/Handler/Slack/SlackRecord.php delete mode 100644 mayor-orig/www/include/share/googleapi/monolog/monolog/src/Monolog/Handler/SlackHandler.php delete mode 100644 mayor-orig/www/include/share/googleapi/monolog/monolog/src/Monolog/Handler/SlackWebhookHandler.php delete mode 100644 mayor-orig/www/include/share/googleapi/monolog/monolog/src/Monolog/Handler/SlackbotHandler.php delete mode 100644 mayor-orig/www/include/share/googleapi/monolog/monolog/src/Monolog/Handler/SocketHandler.php delete mode 100644 mayor-orig/www/include/share/googleapi/monolog/monolog/src/Monolog/Handler/StreamHandler.php delete mode 100644 mayor-orig/www/include/share/googleapi/monolog/monolog/src/Monolog/Handler/SwiftMailerHandler.php delete mode 100644 mayor-orig/www/include/share/googleapi/monolog/monolog/src/Monolog/Handler/SyslogHandler.php delete mode 100644 mayor-orig/www/include/share/googleapi/monolog/monolog/src/Monolog/Handler/SyslogUdp/UdpSocket.php delete mode 100644 mayor-orig/www/include/share/googleapi/monolog/monolog/src/Monolog/Handler/SyslogUdpHandler.php delete mode 100644 mayor-orig/www/include/share/googleapi/monolog/monolog/src/Monolog/Handler/TestHandler.php delete mode 100644 mayor-orig/www/include/share/googleapi/monolog/monolog/src/Monolog/Handler/WhatFailureGroupHandler.php delete mode 100644 mayor-orig/www/include/share/googleapi/monolog/monolog/src/Monolog/Handler/ZendMonitorHandler.php delete mode 100644 mayor-orig/www/include/share/googleapi/monolog/monolog/src/Monolog/Logger.php delete mode 100644 mayor-orig/www/include/share/googleapi/monolog/monolog/src/Monolog/Processor/GitProcessor.php delete mode 100644 mayor-orig/www/include/share/googleapi/monolog/monolog/src/Monolog/Processor/IntrospectionProcessor.php delete mode 100644 mayor-orig/www/include/share/googleapi/monolog/monolog/src/Monolog/Processor/MemoryPeakUsageProcessor.php delete mode 100644 mayor-orig/www/include/share/googleapi/monolog/monolog/src/Monolog/Processor/MemoryProcessor.php delete mode 100644 mayor-orig/www/include/share/googleapi/monolog/monolog/src/Monolog/Processor/MemoryUsageProcessor.php delete mode 100644 mayor-orig/www/include/share/googleapi/monolog/monolog/src/Monolog/Processor/MercurialProcessor.php delete mode 100644 mayor-orig/www/include/share/googleapi/monolog/monolog/src/Monolog/Processor/ProcessIdProcessor.php delete mode 100644 mayor-orig/www/include/share/googleapi/monolog/monolog/src/Monolog/Processor/PsrLogMessageProcessor.php delete mode 100644 mayor-orig/www/include/share/googleapi/monolog/monolog/src/Monolog/Processor/TagProcessor.php delete mode 100644 mayor-orig/www/include/share/googleapi/monolog/monolog/src/Monolog/Processor/UidProcessor.php delete mode 100644 mayor-orig/www/include/share/googleapi/monolog/monolog/src/Monolog/Processor/WebProcessor.php delete mode 100644 mayor-orig/www/include/share/googleapi/monolog/monolog/src/Monolog/Registry.php delete mode 100644 mayor-orig/www/include/share/googleapi/monolog/monolog/tests/Monolog/ErrorHandlerTest.php delete mode 100644 mayor-orig/www/include/share/googleapi/monolog/monolog/tests/Monolog/Formatter/ChromePHPFormatterTest.php delete mode 100644 mayor-orig/www/include/share/googleapi/monolog/monolog/tests/Monolog/Formatter/ElasticaFormatterTest.php delete mode 100644 mayor-orig/www/include/share/googleapi/monolog/monolog/tests/Monolog/Formatter/FlowdockFormatterTest.php delete mode 100644 mayor-orig/www/include/share/googleapi/monolog/monolog/tests/Monolog/Formatter/FluentdFormatterTest.php delete mode 100644 mayor-orig/www/include/share/googleapi/monolog/monolog/tests/Monolog/Formatter/GelfMessageFormatterTest.php delete mode 100644 mayor-orig/www/include/share/googleapi/monolog/monolog/tests/Monolog/Formatter/JsonFormatterTest.php delete mode 100644 mayor-orig/www/include/share/googleapi/monolog/monolog/tests/Monolog/Formatter/LineFormatterTest.php delete mode 100644 mayor-orig/www/include/share/googleapi/monolog/monolog/tests/Monolog/Formatter/LogglyFormatterTest.php delete mode 100644 mayor-orig/www/include/share/googleapi/monolog/monolog/tests/Monolog/Formatter/LogstashFormatterTest.php delete mode 100644 mayor-orig/www/include/share/googleapi/monolog/monolog/tests/Monolog/Formatter/MongoDBFormatterTest.php delete mode 100644 mayor-orig/www/include/share/googleapi/monolog/monolog/tests/Monolog/Formatter/NormalizerFormatterTest.php delete mode 100644 mayor-orig/www/include/share/googleapi/monolog/monolog/tests/Monolog/Formatter/ScalarFormatterTest.php delete mode 100644 mayor-orig/www/include/share/googleapi/monolog/monolog/tests/Monolog/Formatter/WildfireFormatterTest.php delete mode 100644 mayor-orig/www/include/share/googleapi/monolog/monolog/tests/Monolog/Handler/AbstractHandlerTest.php delete mode 100644 mayor-orig/www/include/share/googleapi/monolog/monolog/tests/Monolog/Handler/AbstractProcessingHandlerTest.php delete mode 100644 mayor-orig/www/include/share/googleapi/monolog/monolog/tests/Monolog/Handler/AmqpHandlerTest.php delete mode 100644 mayor-orig/www/include/share/googleapi/monolog/monolog/tests/Monolog/Handler/BrowserConsoleHandlerTest.php delete mode 100644 mayor-orig/www/include/share/googleapi/monolog/monolog/tests/Monolog/Handler/BufferHandlerTest.php delete mode 100644 mayor-orig/www/include/share/googleapi/monolog/monolog/tests/Monolog/Handler/ChromePHPHandlerTest.php delete mode 100644 mayor-orig/www/include/share/googleapi/monolog/monolog/tests/Monolog/Handler/CouchDBHandlerTest.php delete mode 100644 mayor-orig/www/include/share/googleapi/monolog/monolog/tests/Monolog/Handler/DeduplicationHandlerTest.php delete mode 100644 mayor-orig/www/include/share/googleapi/monolog/monolog/tests/Monolog/Handler/DoctrineCouchDBHandlerTest.php delete mode 100644 mayor-orig/www/include/share/googleapi/monolog/monolog/tests/Monolog/Handler/DynamoDbHandlerTest.php delete mode 100644 mayor-orig/www/include/share/googleapi/monolog/monolog/tests/Monolog/Handler/ElasticSearchHandlerTest.php delete mode 100644 mayor-orig/www/include/share/googleapi/monolog/monolog/tests/Monolog/Handler/ErrorLogHandlerTest.php delete mode 100644 mayor-orig/www/include/share/googleapi/monolog/monolog/tests/Monolog/Handler/FilterHandlerTest.php delete mode 100644 mayor-orig/www/include/share/googleapi/monolog/monolog/tests/Monolog/Handler/FingersCrossedHandlerTest.php delete mode 100644 mayor-orig/www/include/share/googleapi/monolog/monolog/tests/Monolog/Handler/FirePHPHandlerTest.php delete mode 100644 mayor-orig/www/include/share/googleapi/monolog/monolog/tests/Monolog/Handler/Fixtures/.gitkeep delete mode 100644 mayor-orig/www/include/share/googleapi/monolog/monolog/tests/Monolog/Handler/FleepHookHandlerTest.php delete mode 100644 mayor-orig/www/include/share/googleapi/monolog/monolog/tests/Monolog/Handler/FlowdockHandlerTest.php delete mode 100644 mayor-orig/www/include/share/googleapi/monolog/monolog/tests/Monolog/Handler/GelfHandlerLegacyTest.php delete mode 100644 mayor-orig/www/include/share/googleapi/monolog/monolog/tests/Monolog/Handler/GelfHandlerTest.php delete mode 100644 mayor-orig/www/include/share/googleapi/monolog/monolog/tests/Monolog/Handler/GelfMockMessagePublisher.php delete mode 100644 mayor-orig/www/include/share/googleapi/monolog/monolog/tests/Monolog/Handler/GroupHandlerTest.php delete mode 100644 mayor-orig/www/include/share/googleapi/monolog/monolog/tests/Monolog/Handler/HandlerWrapperTest.php delete mode 100644 mayor-orig/www/include/share/googleapi/monolog/monolog/tests/Monolog/Handler/HipChatHandlerTest.php delete mode 100644 mayor-orig/www/include/share/googleapi/monolog/monolog/tests/Monolog/Handler/LogEntriesHandlerTest.php delete mode 100644 mayor-orig/www/include/share/googleapi/monolog/monolog/tests/Monolog/Handler/MailHandlerTest.php delete mode 100644 mayor-orig/www/include/share/googleapi/monolog/monolog/tests/Monolog/Handler/MockRavenClient.php delete mode 100644 mayor-orig/www/include/share/googleapi/monolog/monolog/tests/Monolog/Handler/MongoDBHandlerTest.php delete mode 100644 mayor-orig/www/include/share/googleapi/monolog/monolog/tests/Monolog/Handler/NativeMailerHandlerTest.php delete mode 100644 mayor-orig/www/include/share/googleapi/monolog/monolog/tests/Monolog/Handler/NewRelicHandlerTest.php delete mode 100644 mayor-orig/www/include/share/googleapi/monolog/monolog/tests/Monolog/Handler/NullHandlerTest.php delete mode 100644 mayor-orig/www/include/share/googleapi/monolog/monolog/tests/Monolog/Handler/PHPConsoleHandlerTest.php delete mode 100644 mayor-orig/www/include/share/googleapi/monolog/monolog/tests/Monolog/Handler/PsrHandlerTest.php delete mode 100644 mayor-orig/www/include/share/googleapi/monolog/monolog/tests/Monolog/Handler/PushoverHandlerTest.php delete mode 100644 mayor-orig/www/include/share/googleapi/monolog/monolog/tests/Monolog/Handler/RavenHandlerTest.php delete mode 100644 mayor-orig/www/include/share/googleapi/monolog/monolog/tests/Monolog/Handler/RedisHandlerTest.php delete mode 100644 mayor-orig/www/include/share/googleapi/monolog/monolog/tests/Monolog/Handler/RollbarHandlerTest.php delete mode 100644 mayor-orig/www/include/share/googleapi/monolog/monolog/tests/Monolog/Handler/RotatingFileHandlerTest.php delete mode 100644 mayor-orig/www/include/share/googleapi/monolog/monolog/tests/Monolog/Handler/SamplingHandlerTest.php delete mode 100644 mayor-orig/www/include/share/googleapi/monolog/monolog/tests/Monolog/Handler/Slack/SlackRecordTest.php delete mode 100644 mayor-orig/www/include/share/googleapi/monolog/monolog/tests/Monolog/Handler/SlackHandlerTest.php delete mode 100644 mayor-orig/www/include/share/googleapi/monolog/monolog/tests/Monolog/Handler/SlackWebhookHandlerTest.php delete mode 100644 mayor-orig/www/include/share/googleapi/monolog/monolog/tests/Monolog/Handler/SlackbotHandlerTest.php delete mode 100644 mayor-orig/www/include/share/googleapi/monolog/monolog/tests/Monolog/Handler/SocketHandlerTest.php delete mode 100644 mayor-orig/www/include/share/googleapi/monolog/monolog/tests/Monolog/Handler/StreamHandlerTest.php delete mode 100644 mayor-orig/www/include/share/googleapi/monolog/monolog/tests/Monolog/Handler/SwiftMailerHandlerTest.php delete mode 100644 mayor-orig/www/include/share/googleapi/monolog/monolog/tests/Monolog/Handler/SyslogHandlerTest.php delete mode 100644 mayor-orig/www/include/share/googleapi/monolog/monolog/tests/Monolog/Handler/SyslogUdpHandlerTest.php delete mode 100644 mayor-orig/www/include/share/googleapi/monolog/monolog/tests/Monolog/Handler/TestHandlerTest.php delete mode 100644 mayor-orig/www/include/share/googleapi/monolog/monolog/tests/Monolog/Handler/UdpSocketTest.php delete mode 100644 mayor-orig/www/include/share/googleapi/monolog/monolog/tests/Monolog/Handler/WhatFailureGroupHandlerTest.php delete mode 100644 mayor-orig/www/include/share/googleapi/monolog/monolog/tests/Monolog/Handler/ZendMonitorHandlerTest.php delete mode 100644 mayor-orig/www/include/share/googleapi/monolog/monolog/tests/Monolog/LoggerTest.php delete mode 100644 mayor-orig/www/include/share/googleapi/monolog/monolog/tests/Monolog/Processor/GitProcessorTest.php delete mode 100644 mayor-orig/www/include/share/googleapi/monolog/monolog/tests/Monolog/Processor/IntrospectionProcessorTest.php delete mode 100644 mayor-orig/www/include/share/googleapi/monolog/monolog/tests/Monolog/Processor/MemoryPeakUsageProcessorTest.php delete mode 100644 mayor-orig/www/include/share/googleapi/monolog/monolog/tests/Monolog/Processor/MemoryUsageProcessorTest.php delete mode 100644 mayor-orig/www/include/share/googleapi/monolog/monolog/tests/Monolog/Processor/MercurialProcessorTest.php delete mode 100644 mayor-orig/www/include/share/googleapi/monolog/monolog/tests/Monolog/Processor/ProcessIdProcessorTest.php delete mode 100644 mayor-orig/www/include/share/googleapi/monolog/monolog/tests/Monolog/Processor/PsrLogMessageProcessorTest.php delete mode 100644 mayor-orig/www/include/share/googleapi/monolog/monolog/tests/Monolog/Processor/TagProcessorTest.php delete mode 100644 mayor-orig/www/include/share/googleapi/monolog/monolog/tests/Monolog/Processor/UidProcessorTest.php delete mode 100644 mayor-orig/www/include/share/googleapi/monolog/monolog/tests/Monolog/Processor/WebProcessorTest.php delete mode 100644 mayor-orig/www/include/share/googleapi/monolog/monolog/tests/Monolog/PsrLogCompatTest.php delete mode 100644 mayor-orig/www/include/share/googleapi/monolog/monolog/tests/Monolog/RegistryTest.php delete mode 100644 mayor-orig/www/include/share/googleapi/monolog/monolog/tests/Monolog/TestCase.php delete mode 100644 mayor-orig/www/include/share/googleapi/phpseclib/phpseclib/AUTHORS delete mode 100644 mayor-orig/www/include/share/googleapi/phpseclib/phpseclib/LICENSE delete mode 100644 mayor-orig/www/include/share/googleapi/phpseclib/phpseclib/README.md delete mode 100644 mayor-orig/www/include/share/googleapi/phpseclib/phpseclib/composer.json delete mode 100644 mayor-orig/www/include/share/googleapi/phpseclib/phpseclib/composer.lock delete mode 100644 mayor-orig/www/include/share/googleapi/phpseclib/phpseclib/phpseclib/Crypt/AES.php delete mode 100644 mayor-orig/www/include/share/googleapi/phpseclib/phpseclib/phpseclib/Crypt/Base.php delete mode 100644 mayor-orig/www/include/share/googleapi/phpseclib/phpseclib/phpseclib/Crypt/Blowfish.php delete mode 100644 mayor-orig/www/include/share/googleapi/phpseclib/phpseclib/phpseclib/Crypt/DES.php delete mode 100644 mayor-orig/www/include/share/googleapi/phpseclib/phpseclib/phpseclib/Crypt/Hash.php delete mode 100644 mayor-orig/www/include/share/googleapi/phpseclib/phpseclib/phpseclib/Crypt/RC2.php delete mode 100644 mayor-orig/www/include/share/googleapi/phpseclib/phpseclib/phpseclib/Crypt/RC4.php delete mode 100644 mayor-orig/www/include/share/googleapi/phpseclib/phpseclib/phpseclib/Crypt/RSA.php delete mode 100644 mayor-orig/www/include/share/googleapi/phpseclib/phpseclib/phpseclib/Crypt/Random.php delete mode 100644 mayor-orig/www/include/share/googleapi/phpseclib/phpseclib/phpseclib/Crypt/Rijndael.php delete mode 100644 mayor-orig/www/include/share/googleapi/phpseclib/phpseclib/phpseclib/Crypt/TripleDES.php delete mode 100644 mayor-orig/www/include/share/googleapi/phpseclib/phpseclib/phpseclib/Crypt/Twofish.php delete mode 100644 mayor-orig/www/include/share/googleapi/phpseclib/phpseclib/phpseclib/File/ANSI.php delete mode 100644 mayor-orig/www/include/share/googleapi/phpseclib/phpseclib/phpseclib/File/ASN1.php delete mode 100644 mayor-orig/www/include/share/googleapi/phpseclib/phpseclib/phpseclib/File/ASN1/Element.php delete mode 100644 mayor-orig/www/include/share/googleapi/phpseclib/phpseclib/phpseclib/File/X509.php delete mode 100644 mayor-orig/www/include/share/googleapi/phpseclib/phpseclib/phpseclib/Math/BigInteger.php delete mode 100644 mayor-orig/www/include/share/googleapi/phpseclib/phpseclib/phpseclib/Net/SCP.php delete mode 100644 mayor-orig/www/include/share/googleapi/phpseclib/phpseclib/phpseclib/Net/SFTP.php delete mode 100644 mayor-orig/www/include/share/googleapi/phpseclib/phpseclib/phpseclib/Net/SFTP/Stream.php delete mode 100644 mayor-orig/www/include/share/googleapi/phpseclib/phpseclib/phpseclib/Net/SSH1.php delete mode 100644 mayor-orig/www/include/share/googleapi/phpseclib/phpseclib/phpseclib/Net/SSH2.php delete mode 100644 mayor-orig/www/include/share/googleapi/phpseclib/phpseclib/phpseclib/System/SSH/Agent.php delete mode 100644 mayor-orig/www/include/share/googleapi/phpseclib/phpseclib/phpseclib/System/SSH/Agent/Identity.php delete mode 100644 mayor-orig/www/include/share/googleapi/phpseclib/phpseclib/phpseclib/bootstrap.php delete mode 100644 mayor-orig/www/include/share/googleapi/phpseclib/phpseclib/phpseclib/openssl.cnf delete mode 100644 mayor-orig/www/include/share/googleapi/psr/cache/CHANGELOG.md delete mode 100644 mayor-orig/www/include/share/googleapi/psr/cache/LICENSE.txt delete mode 100644 mayor-orig/www/include/share/googleapi/psr/cache/README.md delete mode 100644 mayor-orig/www/include/share/googleapi/psr/cache/composer.json delete mode 100644 mayor-orig/www/include/share/googleapi/psr/cache/src/CacheException.php delete mode 100644 mayor-orig/www/include/share/googleapi/psr/cache/src/CacheItemInterface.php delete mode 100644 mayor-orig/www/include/share/googleapi/psr/cache/src/CacheItemPoolInterface.php delete mode 100644 mayor-orig/www/include/share/googleapi/psr/cache/src/InvalidArgumentException.php delete mode 100644 mayor-orig/www/include/share/googleapi/psr/http-message/CHANGELOG.md delete mode 100644 mayor-orig/www/include/share/googleapi/psr/http-message/LICENSE delete mode 100644 mayor-orig/www/include/share/googleapi/psr/http-message/README.md delete mode 100644 mayor-orig/www/include/share/googleapi/psr/http-message/composer.json delete mode 100644 mayor-orig/www/include/share/googleapi/psr/http-message/src/MessageInterface.php delete mode 100644 mayor-orig/www/include/share/googleapi/psr/http-message/src/RequestInterface.php delete mode 100644 mayor-orig/www/include/share/googleapi/psr/http-message/src/ResponseInterface.php delete mode 100644 mayor-orig/www/include/share/googleapi/psr/http-message/src/ServerRequestInterface.php delete mode 100644 mayor-orig/www/include/share/googleapi/psr/http-message/src/StreamInterface.php delete mode 100644 mayor-orig/www/include/share/googleapi/psr/http-message/src/UploadedFileInterface.php delete mode 100644 mayor-orig/www/include/share/googleapi/psr/http-message/src/UriInterface.php delete mode 100644 mayor-orig/www/include/share/googleapi/psr/log/.gitignore delete mode 100644 mayor-orig/www/include/share/googleapi/psr/log/LICENSE delete mode 100644 mayor-orig/www/include/share/googleapi/psr/log/Psr/Log/AbstractLogger.php delete mode 100644 mayor-orig/www/include/share/googleapi/psr/log/Psr/Log/InvalidArgumentException.php delete mode 100644 mayor-orig/www/include/share/googleapi/psr/log/Psr/Log/LogLevel.php delete mode 100644 mayor-orig/www/include/share/googleapi/psr/log/Psr/Log/LoggerAwareInterface.php delete mode 100644 mayor-orig/www/include/share/googleapi/psr/log/Psr/Log/LoggerAwareTrait.php delete mode 100644 mayor-orig/www/include/share/googleapi/psr/log/Psr/Log/LoggerInterface.php delete mode 100644 mayor-orig/www/include/share/googleapi/psr/log/Psr/Log/LoggerTrait.php delete mode 100644 mayor-orig/www/include/share/googleapi/psr/log/Psr/Log/NullLogger.php delete mode 100644 mayor-orig/www/include/share/googleapi/psr/log/Psr/Log/Test/LoggerInterfaceTest.php delete mode 100644 mayor-orig/www/include/share/googleapi/psr/log/README.md delete mode 100644 mayor-orig/www/include/share/googleapi/psr/log/composer.json delete mode 100644 mayor-orig/www/include/share/net/class.smtp.php delete mode 100644 mayor-orig/www/include/share/net/facebook.php delete mode 100644 mayor-orig/www/include/share/net/googleapi.php delete mode 100644 mayor-orig/www/include/share/net/phpmailer.php delete mode 100644 mayor-orig/www/include/share/net/rest.php delete mode 100644 mayor-orig/www/include/share/net/upload.php delete mode 100644 mayor-orig/www/include/share/print/pdf.php delete mode 100644 mayor-orig/www/include/share/session/accountInfo.php delete mode 100644 mayor-orig/www/include/share/session/attrs.php delete mode 100644 mayor-orig/www/include/share/session/base.php delete mode 100644 mayor-orig/www/include/share/session/close.php delete mode 100644 mayor-orig/www/include/share/ssl/ssl.php delete mode 100644 mayor-orig/www/include/share/str/hyphen.php delete mode 100644 mayor-orig/www/include/share/str/tex.php (limited to 'mayor-orig/www/include') diff --git a/mayor-orig/www/include/alert/base.php b/mayor-orig/www/include/alert/base.php deleted file mode 100644 index 3c886dcf..00000000 --- a/mayor-orig/www/include/alert/base.php +++ /dev/null @@ -1,38 +0,0 @@ -getMessage(); -} - -?> diff --git a/mayor-orig/www/include/alert/hu_HU/base.php b/mayor-orig/www/include/alert/hu_HU/base.php deleted file mode 100644 index 744f40d5..00000000 --- a/mayor-orig/www/include/alert/hu_HU/base.php +++ /dev/null @@ -1,52 +0,0 @@ - '', - 'change_success' => 'Az adatmódosítás sikeresen megtörtént!', - 'page_missing' => 'A keresett oldal nem található a szerveren.', - 'sql_failure' => 'SQL adatbázis hiba!', - 'sql_warning' => 'SQL figyelmeztetés!', - 'sql_connect_failure'=> 'SQL adatbázis csatlakozási hiba!', - 'sql_query_failure' => 'SQL lekérdezési hiba!', - 'sql_select_db_failure' => 'A %0% modul %1% SQL adatbázisának kiválasztása nem sikerült!', - 'auth_failure' => 'Azonosítatlan felhasználó! Az adott hozzáférési szinten nem hitelesítetted magad!', - 'bad_pw' => 'Hibás jelszó!', - 'account_expired' => 'A jelszó érvényessége %0% napja lejárt!', - 'account_warning' => 'A jelszó %0% nap múlva lejár!', - 'warn_account_disable' => 'A felhasználói fiók %0% nap múlva letiltásra kerül!', - 'empty_field' => 'Üres adatbeviteli mező! Egy kötelező paraméter nincs megadva!', // login - 'session_alter_needed' => 'Nem egyező hash-hossz az adatbázisban! (%0% → %1%)', - 'insufficient_access' => 'Jogosulatlan hozzáférés!', - 'wrong_data' => 'Hibás/rossz adat!', - 'wrong_page' => 'Hibás oldalhivatkozás!', - 'deadline_expired' => 'A módosítási határidő lejárt!', - 'pw_change_success' => 'A jelszóváltoztatás sikeresen megtörtént', - 'file_not_found' => 'A file nem található!', - 'success' => 'A művelet sikeresen befejeződött!', - 'not_changed' => 'Nem történt adatváltozás.', - 'unknown_type' => 'Ismeretlen tipus', - 'config_error' => 'Konfigurációs hiba', - 'not_valid_form' => 'Érvénytelen űrlapadatok! A feldolgozás megszakadt.', - 'raw' => 'Részletek:', -); - -// + auth - -$ALERT_MSG['no_account'] = 'Rossz azonosítót adtál meg!'; -$ALERT_MSG['account_disabled'] = 'A felhasználói fiók letilrásra került, ezzel az azonosítóval nem lehet belépni! További információkért fordulj a rendszergazdához!'; -$ALERT_MSG['force_pw_update'] = 'A jelszó megváltoztatása kötelező!'; -$ALERT_MSG['cookie'] = 'Lejárt a munkamenet vagy nem engedélyezett a sütik használata.'; - -?> diff --git a/mayor-orig/www/include/alert/hu_HU/file.php b/mayor-orig/www/include/alert/hu_HU/file.php deleted file mode 100644 index 2696c9f3..00000000 --- a/mayor-orig/www/include/alert/hu_HU/file.php +++ /dev/null @@ -1,9 +0,0 @@ - diff --git a/mayor-orig/www/include/alert/hu_HU/ldap.php b/mayor-orig/www/include/alert/hu_HU/ldap.php deleted file mode 100644 index 1a089128..00000000 --- a/mayor-orig/www/include/alert/hu_HU/ldap.php +++ /dev/null @@ -1,11 +0,0 @@ - diff --git a/mayor-orig/www/include/alert/hu_HU/module-auth.php b/mayor-orig/www/include/alert/hu_HU/module-auth.php deleted file mode 100644 index b7ad2333..00000000 --- a/mayor-orig/www/include/alert/hu_HU/module-auth.php +++ /dev/null @@ -1,11 +0,0 @@ -További információkért fordulj a rendszergazdához!'; -$ALERT_MSG['force_pw_update'] = 'A jelszó megváltoztatása kötelező!'; -$ALERT_MSG['cookie'] = 'Lejárt a munkamenet vagy nem engedélyezett a sütik használata.'; -$ALERT_MSG['pw_reset_disabled'] = 'Jelszóemlékeztető kérés ezen a hitelesítési szinten nem engedélyezett.'; -?> diff --git a/mayor-orig/www/include/alert/hu_HU/module-naplo.php b/mayor-orig/www/include/alert/hu_HU/module-naplo.php deleted file mode 100644 index 7bfceefc..00000000 --- a/mayor-orig/www/include/alert/hu_HU/module-naplo.php +++ /dev/null @@ -1,70 +0,0 @@ - diff --git a/mayor-orig/www/include/alert/hu_HU/module-password.php b/mayor-orig/www/include/alert/hu_HU/module-password.php deleted file mode 100644 index f56a8c85..00000000 --- a/mayor-orig/www/include/alert/hu_HU/module-password.php +++ /dev/null @@ -1,18 +0,0 @@ - diff --git a/mayor-orig/www/include/alert/hu_HU/module-session.php b/mayor-orig/www/include/alert/hu_HU/module-session.php deleted file mode 100644 index 75f0b0bc..00000000 --- a/mayor-orig/www/include/alert/hu_HU/module-session.php +++ /dev/null @@ -1,10 +0,0 @@ - diff --git a/mayor-orig/www/include/backend/ads/auth/login.php b/mayor-orig/www/include/backend/ads/auth/login.php deleted file mode 100644 index 59cbf3e5..00000000 --- a/mayor-orig/www/include/backend/ads/auth/login.php +++ /dev/null @@ -1,358 +0,0 @@ - 1 ) { - // Több ilyen uid is van - $_SESSION['alert'][] = "message:multi_uid"; - if ($closeLDAP) ldap_close($ds); - return false; - } - } - $pwdlastset = $userinfo[0]['pwdlastset'][0]; - $userAccountControl = $userinfo[0]['useraccountcontrol'][0]; - - $status = array(); - - $status['pwdLastSet'] = $pwdlastset; - $status['pwdLastSetDt'] = date('Y-m-d H:i:s',msFileTime2unixTimestamp($pwdlastset)); - $status['accountExpires'] = $userinfo[0]['accountexpires'][0]; - $status['accountNeverExpires'] = (ADS_ACCOUNTEXPIRES_NEVER==$userinfo[0]['accountexpires'][0]) || ($userinfo[0]['accountexpires'][0] == 0); - if (!$status['accountNeverExpires']) { - $status['accountExpiresDt'] = date('Y-m-d H:i:s',msFileTime2unixTimestamp($userinfo[0]['accountexpires'][0])); - $status['accountExpiresTimestamp'] = msFileTime2unixTimestamp($userinfo[0]['accountexpires'][0]); - } - $status['accountDisabled'] = (bool)($userAccountControl & ADS_UF_ACCOUNTDISABLE); - $status['noPasswordRequired'] = (bool)($userAccountControl & ADS_UF_PASSWD_NOTREQD); - $status['cannotChangePassword'] = (bool)($userAccountControl & ADS_UF_PASSWD_CANT_CHANGE); - $status['normalAccount'] = (bool)($userAccountControl & ADS_UF_NORMAL_ACCOUNT); - $status['passwordNeverExpire'] = (bool)($userAccountControl & ADS_UF_DONT_EXPIRE_PASSWD); - $status['passwordExpired'] = (bool)($userAccountControl & ADS_UF_PASSWORD_EXPIRED); // Ez mintha nem működne... - $status['mustChangePassword'] = ($pwdlastset === '0' && $status['passwordNeverExpire']); - - // A jelszó lejárati dátum az AD-ben két értékből számítható ki: - // - A felhasználó saját pwdLastSet atribútuma: ez tárolja a jelszó utolsó módosításának időpontját - // - A tartomány maxPwdAge atribútuma: milyen hosszú ideig lehet érvényes a jelszó a tartományban - // - // A Microsoft persze saját kiindulási időpontot és lépési egységet használ az idő tárolására. - // Ez a függvény konvertálja ezt az értéket Unix időbélyeggé - - // Kérdezzük le a tartomány maxPwdAge attribútumát! - $sr = ldap_read($ds, $AUTH[$toPolicy]['adsBaseDn'], 'objectclass=domain', array('maxPwdAge')); - if (!$sr) { - $_SESSION['alert'][] = "message:ldap_search_failure:getAccountStatus (ads backend)"; - if ($closeLDAP) ldap_close($ds); - return false; - } - $info = ldap_get_entries($ds, $sr); - $maxpwdage = $info[0]['maxpwdage'][0]; - - // Lásd MSDN: http://msdn.microsoft.com/en-us/library/ms974598.aspx - // - // pwdLastSet tartalmazza az 1601 (UTC) január 1 óta eltelt 100 nanoszekundumos időintervallumok számát - // 64 bit-es integer típusú értékként - // - // Ettől az időponttól a Unix időszámítás kezdetéig eltelt másodpercek száma 11644473600. - // - // maxPwdAge szintén large integer, ami a jelszóváltoztatás és a jelszó lejárat közötti 100 nanoszekundumos időintervallumok számát tárolja - - $status['maxPwdAgeInDays'] = bcdiv(bcsub(0,$maxpwdage),'36000000000')/24; - - // Ezt az étéket át kell váltanunk másodpercekre, de ez egy negatív mennyiség! - // - // Ha a maxPwdAge alsó 32 bites része 0, akkor a jelszavak nem járnak le - // - // Sajnos ezek a számok túl nagyok a PHP integer típusához, ezért kell a BCMath függvényeit használnunk - - $status['passwordsDoNotExpireInDomain'] = (bcmod($maxpwdage, 4294967296) === '0'); - - // Adjuk össze a pwdlastset és maxpwdage értékeket (pontosabban az utóbbi negatív értéket - // vonjuk ki az előbbiből), így megkapjuk a jelszó lejáratának időpontját a Microsoft féle - // egységekben. - $pwdexpire = bcsub($pwdlastset, $maxpwdage); - - // Konvertáljuk az MS féle időt unix időre - $status['expiryTimestamp'] = bcsub(bcdiv($pwdexpire, '10000000'), '11644473600'); - $status['expiryDate'] = date('Y-m-d H:i:s', bcsub(bcdiv($pwdexpire, '10000000'), '11644473600')); - - if ($closeLDAP) ldap_close($ds); - - $status['userAccount'] = $userAccount; - $status['usetAccountControl'] = $userAccountControl; - $status['shadowLastChange'] = $userinfo[0]['shadowlastchange'][0]; - $status['shadowWarning'] = $userinfo[0]['shadowwarning'][0]; - $status['shadowInactive'] = $userinfo[0]['shadowinactive'][0]; - return array_merge($status); - - - } - - function adsUserAuthentication($userAccount, $userPassword, &$accountInformation, $toPolicy) { - - global $AUTH; - - if ($toPolicy == '') { - if ($accountInformation['policy'] != '') $toPolicy = $accountInformation['policy']; -// elseif ($_REQUEST['toPolicy'] != '') $toPolicy = $_REQUEST['toPolicy']; - else $toPolicy = _POLICY; - } - - // Kapcsolódás a szerverhez - $ds = ldap_connect($AUTH[$toPolicy]['adsHostname']); - if (!$ds) { - $_SESSION['alert'][] = 'alert:ldap_connect_failure'; - return _AUTH_FAILURE; - } - - // Csatlakozás a szerverhez - $r = @ldap_bind($ds,$AUTH[$toPolicy]['adsUser'],$AUTH[$toPolicy]['adsPw']); - if (!$r) { - $_SESSION['alert'][] = 'message:ldap_bind_failure'; - return _AUTH_FAILURE; - } - - // Van-e adott azonosítójú felhasználó? - $filter="(&(sAMAccountName=$userAccount)(objectClass=".$AUTH[$toPolicy]['adsUserObjectClass']."))"; - $justthese = array("sn","cn",$AUTH[$toPolicy]['adsStudyIdAttr'],"shadowexpire","shadowwarning","shadowinactive","shadowlastchange","shadowmax","pwdlastset","accountexpires","useraccountcontrol"); - $sr = ldap_search($ds, $AUTH[$toPolicy]['adsBaseDn'], $filter, $justthese); - if (!$sr) { - $_SESSION['alert'][] = "message:ldap_search_failure"; - ldap_close($ds); - return _AUTH_FAILURE; - } - $info = ldap_get_entries($ds,$sr); - if ( $info['count'] === 0 || is_null($info)) { // http://bugs.php.net/50185 ha nincs megfelelő elem, akkor - hibásan - null-al tér vissza! (~ PHP 5.2.10) - // Nincs ilyen userAccount (uid) - $_SESSION['alert'][] = "message:no_account:$userAccount"; - ldap_close($ds); - return _AUTH_FAILURE_1; - } - - if ( $info['count'] > 1 ) { - // Több ilyen uid is van - $_SESSION['alert'][] = "message:multi_uid"; - ldap_close($ds); - return _AUTH_FAILURE_2; - } - - if ($info['count']==1) { // Van - egy - ilyen felhasználó - - $status = getAccountStatus($userAccount, $toPolicy, $info, $ds); - // Lejárt-e - // A lejárat ideje a shadowExpire és shadowLastChange+shadowMax kötül a kisebbik - // Esetünkben - if ($info[0]['pwdlastset'][0] != '') { // A pwdLastSet és shadowLastChange közül a kisebbiket használjuk - $info[0]['shadowlastchange'][0] = msFileTime2unixDays($info[0]['pwdlastset'][0]); - } - - // A globális beállítással kikényszeríthető a nagyobb warning időszak - $shadowWarning = ($status['shadowWarning']<$AUTH[$toPolicy]['shadowWarning']) ? $AUTH[$toPolicy]['shadowWarning'] : $status['shadowWarning']; - - - $disabled = ( // Ha az jelszavak lejárhatnak a domain-ben és a user jellszava is lejárhat és le is járt... - !$status['passwordNeverExpire'] - && !$status['passwordsDoNotExpireInDomain'] - && $status['expiryTimestamp'] < time() - ) || ( // vagy az account lejárhat és le is járt - !$status['accountNeverExpires'] - && $status['accountExpiresTimestamp'] diff --git a/mayor-orig/www/include/backend/ads/base/attrs.php b/mayor-orig/www/include/backend/ads/base/attrs.php deleted file mode 100644 index e01aa00c..00000000 --- a/mayor-orig/www/include/backend/ads/base/attrs.php +++ /dev/null @@ -1,160 +0,0 @@ - 'sAMAccountName', - 'userCn' => 'displayName', - 'mail' => 'mail', - 'studyId' => 'serialNumber', // Ez konfig-ban külön van állítva, az itteni érték irreleváns - 'shadowLastChange' => 'shadowLastChange', - 'shadowWarning' => 'shadowWarning', - 'shadowMin' => 'shadowMin', - 'shadowMax' => 'shadowMax', - 'shadowExpire' => 'shadowExpire', - 'shadowInactive' => 'shadowInactive', - ); - - global $groupAttrToADS; - $groupAttrToADS = array( - 'groupCn' => 'cn', - 'groupDesc' => 'description', - 'member' => 'member', - ); - - global $adsAccountAttrDef; - $adsAccountAttrDef = array( - 'dn' => array('desc' => _ADSDN, 'type' => 'text', 'rights' => 'rrr'), - 'cn' => array('desc' => _ADSCN, 'type' => 'text', 'rights' => 'rrr'), - 'sn' => array('desc' => _ADSSN, 'type' => 'text', 'rights' => 'wrr'), - 'givenname' => array('desc' => _ADSGIVENNAME, 'type' => 'text'), - 'serialnumber' => array('desc' => _ADSSERIALNUMBER, 'type' => 'int', 'rights' => 'wrr'), - 'displayname' => array('desc' => _ADSCN, 'type' => 'text', 'rights' => 'wrr'), - 'name' => array('desc' => _ADSNAME, 'type' => 'text', 'rights' => 'r--'), - 'padpwdcount' => array('desc' => _ADSBADPWDCOUNT, 'type' => 'int', 'rights' => 'wrr'), - 'badpasswordtime' => array('desc' => _ADSBADPASSWORDTIME, 'type' => 'int', 'rights' => 'r--'), - 'lastlogon' => array('desc' => _ADSLASTLOGON, 'type' => 'int', 'rights' => 'r--'), - 'pwdlastset' => array('desc' => _ADSPWDLASTSET, 'type' => 'int', 'rights' => 'r--'), - 'accountexpires' => array('desc' => _ADSACCOUNTEXPIRES, 'type' => 'int', 'rights' => 'wrr'), - 'samaccountname' => array('desc' => _ADSSAMACCOUNTNAME, 'type' => 'text', 'rights' => 'wrr'), - 'useraccountcontrol' => array('desc' => _USERACCOUNTCONTROL, 'type' => 'text', 'rights' => 'wrr'), - 'userprincipalname' => array('desc' => _ADSUSERPRINCIPALNAME, 'type' => 'text', 'rights' => 'wrr'), - 'objectcategory' => array('desc' => _ADSOBJECTCATEGORY, 'type' => 'text', 'rights' => 'r--'), - 'uid' => array('desc' => _ADSUID, 'type' => 'text', 'rights' => 'rrr'), - 'uidnumber' => array('desc' => _ADSUIDNUMBER, 'type' => 'int', 'rights' => 'w--'), - 'gidnumber' => array('desc' => _ADSGIDNUMBER, 'type' => 'int', 'rights' => 'w--'), - 'mssfu30name' => array('desc' => _ADSUID, 'type' => 'text', 'rights' => 'r--'), - 'unixhomedirectory' => array('desc' => _ADSUNIXHOMEDIRECTORY, 'type' => 'text', 'rights' => 'wrr'), - 'loginshell' => array('desc' => _ADSLOGINSHELL, 'type' => 'text', 'rights' => 'wrr'), - 'shadowlastchange' => array('desc' => _ADSSHADOWLASTCHANGE, 'type' => 'text', 'rights' => 'wrr'), - 'shadowexpire' => array('desc' => _ADSSHADOWEXPIRE, 'type' => 'text', 'rights' => 'wrr'), - 'shadowwarning' => array('desc' => _ADSSHADOWWARNING, 'type' => 'text', 'rights' => 'wrr'), - 'shadowmin' => array('desc' => _ADSSHADOWMIN, 'type' => 'text', 'rights' => 'wrr'), - 'shadowmax' => array('desc' => _ADSSHADOWMAX, 'type' => 'text', 'rights' => 'wrr'), - 'shadowinactive' => array('desc' => _ADSSHADOWINACTICE, 'type' => 'text', 'rights' => 'wrr'), -/* - 'gecos' => array('desc' => _ADSGECOS, 'type' => 'text', 'rights' => 'w--'), - 'mail' => array('desc' => _ADSMAIL, 'type' => 'text', 'rights' => 'wwr'), - 'telephonenumber' => array('desc' => _ADSTELEPHONENUMBER, 'type' => 'text', 'rights' => 'ww-'), - 'mobile' => array('desc' => _ADSMOBILE, 'type' => 'text', 'rights' => 'ww-'), - 'l' => array('desc' => _ADSL, 'type' => 'text'), - 'street' => array('desc' => _ADSSTREET, 'type' => 'text'), - 'postaladdress' => array('desc' => _ADSPOSTALADDRESS, 'type' => 'text'), - 'postalcode' => array('desc' => _ADSPOSTALCODE, 'type' => 'text'), -*/ - ); - - global $adsGroupAttrDef; - $adsGroupAttrDef = array( - 'cn' => array('desc' => _ADSCN, 'type' => 'text','rights' => 'rrr'), - 'name' => array('desc' => _ADSNAME, 'type' => 'text','rights' => 'rrr'), - 'samaccountname' => array('desc' => _ADSSAMACCOUNTNAME, 'type' => 'text','rights' => 'wrr'), - 'description' => array('desc' => _ADSDESCRIPTION, 'type' => 'text'), - 'gidnumber' => array('desc' => _ADSGIDNUMBER, 'type' => 'int','rights' => 'w--'), - 'member' => array('desc' => _ADSMEMBER, 'type' => 'select'), - 'objectcategory' => array('desc' => _ADSOBJECTCATEGORY, 'type' => 'text','rights' => 'rrr'), - - 'memberuid' => array('desc' => _ADSMEMBERUID, 'type' => 'select'), - ); - -?> diff --git a/mayor-orig/www/include/backend/ads/password/changePassword.php b/mayor-orig/www/include/backend/ads/password/changePassword.php deleted file mode 100644 index 6d686b34..00000000 --- a/mayor-orig/www/include/backend/ads/password/changePassword.php +++ /dev/null @@ -1,165 +0,0 @@ - diff --git a/mayor-orig/www/include/backend/ads/session/accountInfo.php b/mayor-orig/www/include/backend/ads/session/accountInfo.php deleted file mode 100644 index eef90fd4..00000000 --- a/mayor-orig/www/include/backend/ads/session/accountInfo.php +++ /dev/null @@ -1,416 +0,0 @@ - mayor schema konverzió - for ($i = 0; $i < $result['count']; $i++) { - // Egységes szerkezetre alakítjuk, azaz a dn is indexelt - foreach ($backendAttrDef as $attr => $def) { - // Egységes szerkezetre alakítjuk, azaz a dn is indexelt - if ($attr == 'dn') $return[$i]['dn'] = array('count' => 1, 0 => $result[$i]['dn']); - elseif (isset($result[$i][$attr])) $return[$i][$attr] = $result[$i][$attr]; - else $return[$i][$attr] = array('count' => 0); - } - } - return $return[0]; - - } - - } - -############################################################# -# adsGetUserInfo - felhasználói információk (keretrendszer) -############################################################# - - function adsGetUserInfo($userAccount, $toPolicy = _POLICY) { - - global $accountAttrToADS, $adsAttrDef; - $userDn = ADSuserAccountToDn($userAccount, $toPolicy); - - $result = getADSInfo($userDn, array_values($accountAttrToADS), $toPolicy); - if ($result === false) { - return false; - } else { - - $result[0]['dn'] = array('count' => 1, 0 => $result[0]['dn']); - // Egységes szerkezetre alakítjuk, azaz a dn is indexelt + ADS --> MaYoR schema - foreach ($accountAttrToADS as $attr => $adsAttr) { - $adsAttr = kisbetus($adsAttr); - if (isset($result[0][$adsAttr])) $return[$attr] = $result[0][$adsAttr]; - else $return[$attr] = array('count' => 0); - } - return $return; - - } - - } - -############################################################### -# adsChangeAccountInfo - felhasználói információk módosítása -############################################################### - - function adsChangeAccountInfo($userAccount, $toPolicy = _POLICY) { - - global $AUTH, $backendAttrs, $backendAttrDef; - $userDn = ADSuserAccountToDn($userAccount, $toPolicy); - - // Kapcsolódás az ADS szerverhez - $ds = @ldap_connect($AUTH[$toPolicy]['adsHostname']); - if (!$ds) { - $_SESSION['alert'][] = 'alert:ldap_connect_failure'; - return false; - } - - // Csatlakozás a szerverhez - $r = @ldap_bind($ds, BACKEND_CONNECT_DN,BACKEND_CONNECT_PASSWORD); - if (!$r) { - $_SESSION['alert'][] = 'message:ldap_bind_failure'; - ldap_close($ds); - return false; - } - - $emptyAttrs = explode(':',$_POST['emptyAttrs']); - $_alert = array(); - - // Attribútumonként módosítunk - foreach ($backendAttrs as $attr) { - - if ($backendAttrDef[$attr]['rights'] == '') $rigths = _DEFAULT_ADS_RIGHTS; - else $rights = $backendAttrDef[$attr]['rights']; - - if ($rights[_ACCESS_AS] == 'w') { - $mod_info = $add_info = $del_info = Array(); - $values = array(); - - if ($backendAttrDef[$attr]['type'] == 'image') { - $file = $_FILES[$attr]['tmp_name']; - if (file_exists($file)) { - $fd = fopen($file,'r'); - $values[0]=fread($fd,filesize($file)); - fclose($fd); - } else { - // Sose töröljük! - $emptyAttrs[] = $attr; - } - } elseif ($backendAttrDef[$attr]['type'] == 'timestamp') { - if ($_POST[$attr][0] != '' and $_POST[$attr][1] != '' and $_POST[$attr][2] != '') { - $values[0] = $_POST[$attr][0].$_POST[$attr][1].$_POST[$attr][2].'010101Z'; - } - } else { - if ($backendAttrDef[$attr]['type'] != '' ) $values[0] = $_POST[$attr]; - } - - if ($backendAttrDef[$attr]['type'] == 'select') { - if ($_POST['new-'.$attr][0] != '') $add_info[$attr] = $_POST['new-'.$attr]; - if ($_POST['del-'.$attr][0] != '') $del_info[$attr] = $_POST['del-'.$attr]; - } elseif (in_array($attr,$emptyAttrs)) { - if ($values[0] != '') $add_info[$attr] = $values; - } else { - if ($values[0] != '') { - $mod_info[$attr] = $values; - } else { - $del_info[$attr] = Array(); - } - } - - if (count($add_info)!=0) { - if (!@ldap_mod_add($ds,$userDn,$add_info)) { - $_alert[] = 'message:insufficient_access:add:'.$attr; - } - } - if (count($mod_info)!=0) { - if (!@$r = ldap_mod_replace($ds,$userDn,$mod_info)) { - $_alert[] = 'message:insufficient_access:mod:'.$attr; - } - } - if (count($del_info)!=0) { - if (!@ldap_mod_del($ds,$userDn,$del_info)) { - $_alert[] = 'message:insufficient_access:del:'.$attr; - } - } - - } else { -// $_alert[] = 'message:insufficient_access:'.$attr; - } - } // foreach - - ldap_close($ds); - if (count($_alert) == 0) $_SESSION['alert'][] = 'info:change_success'; - else for ($i = 0;$i < count($_alert);$i++) $_SESSION['alert'][] = $_alert[$i]; - - } - -########################################################### -# adsGetGroupInfo - csoport információk (backend) -########################################################### - - function adsGetGroupInfo($groupCn, $toPolicy = _POLICY, $SET = array()) { - - global $backendAttrs, $backendAttrDef; - - - if (!isset($backendAttrs)) list($backendAttrs, $backendAttrDef) = getBackendAttrs('Group', $toPolicy); - - $groupDn = ADSgroupCnToDn($groupCn, $toPolicy); - - $result = getADSInfo($groupDn, $backendAttrs, $toPolicy); - if ($result === false) { - return false; - } else { - - // Accountok lekérdezése - $info = getADSaccounts($toPolicy); - for ($i = 0; $i < $info['count']; $i++) { - $accountUid[] = array( - 'value' => $info[$i]['uid'][0], - 'txt' => $info[$i]['displayname'][0] - ); - $accountDn[] = array( - 'value' => $info[$i]['dn'], - 'txt' => $info[$i]['displayname'][0] - ); - $DN2CN[$info[$i]['dn']] = $info[$i]['displayname'][0]; - } - - // ADS schema --> mayor schema konverzió - for ($i = 0; $i < $result['count']; $i++) { - // Egységes szerkezetre alakítjuk, azaz a dn is indexelt - foreach ($backendAttrDef as $attr => $def) { - // Egységes szerkezetre alakítjuk, azaz a dn is indexelt - if ($attr == 'dn') $return[$i]['dn'] = array('count' => 1, 0 => $result[$i]['dn']); - elseif($attr == 'member') { - $_TMP = array(); - for ($j=0; $j<$result[$i][$attr]['count']; $j++) { - $_dn = $result[$i][$attr][$j]; - $_TMP[] = array( - 'type'=>'member', - 'value'=>$_dn, - 'txt'=>($DN2CN[$_dn]==''?str_replace(',',' ',$_dn):$DN2CN[$_dn]) - ); - } - $return[$i][$attr] = $_TMP; - } - - elseif (isset($result[$i][$attr])) $return[$i][$attr] = $result[$i][$attr]; - else $return[$i][$attr] = array('count' => 0); - } - - if ($SET['withNewAccounts']===true) { - $return[$i]['member']['new'] = $accountDn; - $return[$i]['memberuid']['new'] = $accountUid; - } - } - - return $return[0]; - - } - - } - -############################################################### -# adsChangeGroupInfo - csoport információk módosítása -############################################################### - - function adsChangeGroupInfo($groupCn, $toPolicy = _POLICY) { - -// !!!! A memberuid / member szinkronjára nem figyel!! - - global $AUTH, $backendAttrs, $backendAttrDef; - $groupDn = ADSgroupCnToDn($groupCn, $toPolicy); - - // Kapcsolódás az ADS szerverhez - $ds = @ldap_connect($AUTH[$toPolicy]['adsHostname']); - if (!$ds) { - $_SESSION['alert'][] = 'alert:ldap_connect_failure'; - return false; - } - - // Csatlakozás a szerverhez - $r = @ldap_bind($ds, BACKEND_CONNECT_DN,BACKEND_CONNECT_PASSWORD); - - if (!$r) { - $_SESSION['alert'][] = 'message:ldap_bind_failure'; - ldap_close($ds); - return false; - } - - $emptyAttrs = explode(':',$_POST['emptyAttrs']); - $_alert = array(); - - // Attribútumonként módosítunk - foreach ($backendAttrs as $attr) { - - if ($backendAttrDef[$attr]['rights'] == '') $rigths = _DEFAULT_ADS_RIGHTS; - else $rights = $backendAttrDef[$attr]['rights']; - - if ($rights[_ACCESS_AS] == 'w') { - - $mod_info = $add_info = $del_info = Array(); - $values = array(); - - if ($backendAttrDef[$attr]['type'] == 'image') { - $file = $_FILES[$attr]['tmp_name']; - if (file_exists($file)) { - $fd = fopen($file,'r'); - $values[0]=fread($fd,filesize($file)); - fclose($fd); - } else { - // Sose töröljük! - $emptyAttrs[] = $attr; - } - } elseif ($backendAttrDef[$attr]['type'] == 'timestamp') { - if ($_POST[$attr][0] != '' and $_POST[$attr][1] != '' and $_POST[$attr][2] != '') { - $values[0] = $_POST[$attr][0].$_POST[$attr][1].$_POST[$attr][2].'010101Z'; - } - } else { - if ($backendAttrDef[$attr]['type'] != '') - if (isset($_POST[$attr])) $values[0] = $_POST[$attr]; - else $values[0] = ''; - } - - if ($backendAttrDef[$attr]['type'] == 'select') { - if (isset($_POST['new-'.$attr][0]) && $_POST['new-'.$attr][0] != '') $add_info[$attr] = $_POST['new-'.$attr]; - if (isset($_POST['del-'.$attr][0]) && $_POST['del-'.$attr][0] != '') $del_info[$attr] = $_POST['del-'.$attr]; - } elseif (in_array($attr,$emptyAttrs)) { - if ($values[0] != '') $add_info[$attr] = $values; - } else { - if ($values[0] != '') { - $mod_info[$attr] = $values; - } else { - $del_info[$attr] = Array(); - } - - } - - if (count($add_info)!=0) { - if (!@ldap_mod_add($ds,$groupDn,$add_info)) { - $_alert[] = 'message:insufficient_access:add:'.$attr; - } - } - if (count($mod_info)!=0) { - if (!@ldap_mod_replace($ds,$groupDn,$mod_info)) { - $_alert[] = 'message:insufficient_access:mod:'.$attr; - } - } - if (count($del_info)!=0) { - if (!@ldap_mod_del($ds,$groupDn,$del_info)) { - $_alert[] = 'message:insufficient_access:del:'.$attr; - } - } - - } else { -// $_alert[] = 'message:insufficient_access:'.$attr; - } - } // foreach - - ldap_close($ds); - if (count($_alert) == 0) $_SESSION['alert'][] = 'info:change_success'; - else for ($i=0;$i diff --git a/mayor-orig/www/include/backend/ads/session/base.php b/mayor-orig/www/include/backend/ads/session/base.php deleted file mode 100644 index 3a727c3b..00000000 --- a/mayor-orig/www/include/backend/ads/session/base.php +++ /dev/null @@ -1,188 +0,0 @@ - 1 ) { - // Több ilyen uid is van - $_SESSION['alert'][] = "message:multi_uid:$userAccount"; - return false; - } - - if ($info['count']==1) { // Van - egy - ilyen felhasználó - return $info[0]['dn']; - } - - } - - -###################################################### -# A groupCn(cn)-hez tartozó dn lekérdezése -###################################################### - - function ADSgroupCnToDn($groupCn, $toPolicy = _POLICY) { - - global $AUTH; - - // Kapcsolódás a szerverhez - $ds = @ldap_connect($AUTH[$toPolicy]['adsHostname']); - if (!$ds) { - $_SESSION['alert'][] = 'alert:ldap_connect_failure'; - return false; - } - - // Csatlakozás a szerverhez - $r = @ldap_bind($ds,$AUTH[$toPolicy]['adsUser'],$AUTH[$toPolicy]['adsPw']); - if (!$r) { - $_SESSION['alert'][] = 'message:ldap_bind_failure'; - return false; - } - - // Van-e ilyen csoport? - $filter="(&(cn=$groupCn)(objectClass=".$AUTH[$toPolicy]['adsGroupObjectClass']."))"; - $justthese=array('cn'); - $sr = ldap_search($ds, $AUTH[$toPolicy]['adsBaseDn'], $filter, $justthese); - if (!$sr) { - $_SESSION['alert'][] = "message:ldap_search_failure"; - ldap_close($ds); - return false; - } - $info=ldap_get_entries($ds,$sr); - ldap_close($ds); - - if ( $info['count'] === 0 ) { - // Nincs ilyen groupCn (cn) - hibaüzenet csak akkor, ha nem kategóriáról van szó... - if (!in_array($groupCn, array_map('ekezettelen', $AUTH[$toPolicy]['categories']))) $_SESSION['alert'][] = "message:no_group:$groupCn"; - return false; - } elseif ( $info['count'] > 1 ) { - // Több ilyen cn is van - $_SESSION['alert'][] = "message:multi_gid:$groupCn"; - return false; - } - - if ($info['count']==1) { // Van - egy - ilyen csoport - return $info[0]['dn']; - } - - } - -###################################################### -# memberOf - csoport tag-e -###################################################### - - function adsMemberOf($userAccount, $group, $toPolicy = _POLICY) { - - global $AUTH; - //global $ADS2Mayor; - - $userDn = ADSuserAccountToDn($userAccount, $toPolicy); - if (in_array($group, $AUTH[$toPolicy]['categories'])) { - if (strpos($userDn, ',ou='.ekezettelen($group).',') !== false) return true; -# Ha nincs megfelelő ou-ban, akkor nézzük a csoport tagságot - így berakható időszakosan akárki pl a titkárság kategóriába... -# else return false; - } - - if (substr($group,0,3) != 'cn=') { - $groupDn = ADSgroupCnToDn(ekezettelen($group)); - if (!$groupDn) return false; // Ha nincs ilyen csoport az ADS fában - } else { - $groupDn = $group; - } - - // Kapcsolódás az ADS szerverhez - $ds = @ldap_connect($AUTH[$toPolicy]['adsHostname']); - if (!$ds) { - $_SESSION['alert'][] = 'alert:ldap_connect_failure'; - return false; - } - - // Csatlakozás a szerverhez - $r = @ldap_bind($ds,$AUTH[$toPolicy]['adsUser'],$AUTH[$toPolicy]['adsPw']); - if (!$r) { - $_SESSION['alert'][] = 'message:ldap_bind_failure'; - ldap_close($ds); - return false; - } - - $justthese = array('cn'); // valamit le kell kérdezni... - $filter = "(&(objectClass=".$AUTH[$toPolicy]['adsGroupObjectClass'].")(member=$userDn))"; - $sr = @ldap_search($ds, $groupDn, $filter, $justthese); - if (!$sr) { - $_SESSION['alert'][] = "message:ldap_search_failure:".$filter; - ldap_close($ds); - return false; - } - - $info = ldap_get_entries($ds, $sr); - ldap_close($ds); - - if ($info['count'] > 0) { - return true; - } else { - return false; - } - - } - -?> diff --git a/mayor-orig/www/include/backend/ads/session/createAccount.php b/mayor-orig/www/include/backend/ads/session/createAccount.php deleted file mode 100644 index 02809f07..00000000 --- a/mayor-orig/www/include/backend/ads/session/createAccount.php +++ /dev/null @@ -1,157 +0,0 @@ - a konténer elem - ha nincs, akkor CN=Users alá rakja - category => tanár, diák... egy kiemelt fontosságú csoport tagság - groups => egyéb csoportok - policyAttrs => policy függő attribútumok - ) - */ - function adsCreateAccount( - $userCn, $userAccount, $userPassword, $toPolicy, $SET - ) { - - global $AUTH; - - $shadowLastChange = floor(time() / (60*60*24)); - - // $toPolicy --> ads backend - ellenőrzés! - if ($AUTH[$toPolicy]['backend'] != 'ads') { - $_SESSION['alert'][] = 'page:wrong_backend:'.$AUTH[$toPolicy]['backend']; - return false; - } - - // Kapcsolódás az LDAP szerverhez - $ds = @ldap_connect($AUTH[$toPolicy]['adsHostname']); - if (!$ds) { - $_SESSION['alert'][] = 'alert:ldap_connect_failure'; - return false; - } - - // Csatlakozás a szerverhez - $r = @ldap_bind($ds, BACKEND_CONNECT_DN,BACKEND_CONNECT_PASSWORD); - if (!$r) { - $_SESSION['alert'][] = 'message:ldap_bind_failure'; - ldap_close($ds); - return false; - } - - $info = $ginfo = Array(); - - // uid ütközés ellenőrzése - $filter = "(sAMAccountName=$userAccount)"; - $justthese = array('sAMAccountName'); - $sr = ldap_search($ds, $AUTH[$toPolicy]['adsBaseDn'], $filter, $justthese); - $uinfo = ldap_get_entries($ds, $sr); - $uidCount = $uinfo['count']; - ldap_free_result($sr); - if ($uidCount > 0) { - $_SESSION['alert'][] = 'message:multi_uid:'.$userAccount; - return false; - } - - // Az következő uidNumber megállapítása - $filter = "(&(objectclass=".$AUTH[$toPolicy]['adsUserObjectClass'].")(uidNumber=*))"; - $justthese = array('uidNumber', 'msSFU30UidNumber'); - $sr = ldap_search($ds,$AUTH[$toPolicy]['adsBaseDn'], $filter, $justthese); - ldap_sort($ds, $sr, 'uidNumber'); - $uinfo = ldap_get_entries($ds, $sr); - ldap_free_result($sr); - if (isset($uinfo['count']) && $uinfo['count'] > 0) $info['uidNumber'] = array($uinfo[ $uinfo['count']-1 ]['uidnumber'][0]+1); - else $info['uidNumber'] = array(1001); - - // shadow attributumok... - // A shadowLastChange a mai nap // if (isset($AUTH[$toPolicy]['shadowlastchange']) && $AUTH[$toPolicy]['shadowlastchange'] != '') - $info['shadowLastChange'] = array($shadowLastChange); - if (isset($AUTH[$toPolicy]['shadowMin']) && $AUTH[$toPolicy]['shadowMin'] != '') $info['shadowMin'] = array($AUTH[$toPolicy]['shadowMin']); - if (isset($AUTH[$toPolicy]['shadowMax']) && $AUTH[$toPolicy]['shadowMax'] != '') $info['shadowMax'] = array($AUTH[$toPolicy]['shadowMax']); - if (isset($AUTH[$toPolicy]['shadowWarning']) && $AUTH[$toPolicy]['shadowWarning'] != '') $info['shadowWarning'] = array($AUTH[$toPolicy]['shadowWarning']); - if (isset($AUTH[$toPolicy]['shadowInactive']) && $AUTH[$toPolicy]['shadowInactive'] != '') $info['shadowInactive'] = array($AUTH[$toPolicy]['shadowInactive']); - if (isset($AUTH[$toPolicy]['shadowExpire']) && $AUTH[$toPolicy]['shadowWxpire'] != '') $info['shadowExpire'] = array($AUTH[$toPolicy]['shadowExpire']); - - // A szokásos attribútumok - $Name = explode(' ',$userCn); - $Dn = ldap_explode_dn($AUTH[$toPolicy]['adsBaseDn'], 1); unset($Dn['count']); - $info['userPrincipalName'] = array( $userAccount.'@'.implode('.', $Dn)); - $info['msSFU30Name'] = $info['sAMAccountName'] = $info['cn'] = array($userAccount); - $info['displayName'] = array($userCn); - $info['sn'] = array($Name[0]); - $info['givenName'] = array($Name[ count($Name)-1 ]); - $info['unixUserPassword'] = array('ABCD!efgh12345$67890'); - $info['unixHomeDirectory'] = array(ekezettelen("/home/$userAccount")); - $info['loginShell'] = array('/bin/bash'); - $info['objectClass'] = array($AUTH[$toPolicy]['adsUserObjectClass'], 'user'); - - $policyAccountAttrs = $SET['policyAttrs']; - if (isset($policyAccountAttrs['studyId'])) $info[ $AUTH[$toPolicy]['adsStudyIdAttr'] ] = array($policyAccountAttrs['studyId']); - foreach ($policyAccountAttrs as $attr => $value) - if ($attr != 'studyId' && isset($accountAttrToADS[$attr])) - $info[ $accountAttrToADS[$attr] ] = array($value); - - if (isset($SET['container'])) $dn = "CN=$userAccount,".$SET['container']; - else $dn = "CN=$userAccount,CN=Users,".$AUTH[$toPolicy]['adsBaseDn']; - - // user felvétel - $_r1 = @ldap_add($ds,$dn,$info); - if (!$_r1) { - $_SESSION['alert'][] = 'message:ldap_error:Add user:'.ldap_error($ds); - //echo $dn.'
'; var_dump($info); echo '
'; - return false; - } - - // Jelszó beállítás - if (!changePassword($userAccount, $userPassword, $toPolicy)) $_SESSION['alert'][] = 'message:ldap_error:changePassword failed:'.$userAccount; - - // Engedélyezés - $einfo = array('userAccountControl' => array(512)); /* Normal account = 512 */ - $_r1 = @ldap_mod_replace($ds,$dn,$einfo); - if (!$_r1) { - $_SESSION['alert'][] = 'message:ldap_error:Enable user:'.ldap_error($ds); - //echo $dn.'
'; var_dump($info); echo '
'; - return false; - } - - // Kategória csoportba és egyéb csoportokba rakás - if (isset($SET['category'])) { - if (is_array($SET['groups'])) array_unshift($SET['groups'], $SET['category']); - else $SET['groups'] = array($SET['category']); - - $ginfo['member'] = $dn; - - for ($i = 0; $i < count($SET['groups']); $i++) { - $groupDn = ADSgroupCnToDn($SET['groups'][$i], $toPolicy); - if ($groupDn !== false) { - $_r3 = @ldap_mod_add($ds, $groupDn, $ginfo); - if (!$_r3) { - $_SESSION['alert'][] = 'message:ldap_error:Add to group '.$SET['groups'][$i].':'.ldap_error($ds); - //echo $SET['groups'][$i].'
'; var_dump($ginfo); echo '
'; - } - } - } - } - - ldap_close($ds); - - if (defined('_DATADIR') - && isset($AUTH[$toPolicy]['createAccountScript']) - && file_exists(_DATADIR) - ) { - $sfp = fopen(_DATADIR.'/'.$AUTH[$toPolicy]['createAccountScript'],'a+'); - if ($sfp) { - fwrite($sfp,"\n# $userAccount létrehozása: userAccount uidNumber homeDirectory\n"); - fwrite($sfp,"createAccount.sh '$userAccount' '".$info['uidNumber'][0]."' '".$info['unixHomeDirectory'][0]."'\n"); - fclose($sfp); - } - } - $_SESSION['alert'][] = 'info:create_uid_success:'.$dn; - return true; - - } - -?> diff --git a/mayor-orig/www/include/backend/ads/session/createGroup.php b/mayor-orig/www/include/backend/ads/session/createGroup.php deleted file mode 100644 index 0a0a8c1d..00000000 --- a/mayor-orig/www/include/backend/ads/session/createGroup.php +++ /dev/null @@ -1,82 +0,0 @@ - ads backend - ellenőrzés! - if ($AUTH[$toPolicy]['backend'] != 'ads') { - $_SESSION['alert'][] = 'page:wrong_backend:'.$AUTH[$toPolicy]['backend']; - return false; - } - - // Kapcsolódás az LDAP szerverhez - $ds = @ldap_connect($AUTH[$toPolicy]['adsHostname']); - if (!$ds) { - $_SESSION['alert'][] = 'alert:ldap_connect_failure'; - return false; - } - - // Csatlakozás a szerverhez - $r = @ldap_bind($ds, BACKEND_CONNECT_DN,BACKEND_CONNECT_PASSWORD); - if (!$r) { - $_SESSION['alert'][] = 'message:ldap_bind_failure'; - ldap_close($ds); - return false; - } - - $info = $ginfo = Array(); - - // cn ütközés ellenőrzése - $filter = "(&(objectclass=".$AUTH[$toPolicy]['adsGroupObjectClass'].")(cn=$groupCn))"; - $justthese = array('cn'); - $sr = ldap_search($ds, $AUTH[$toPolicy]['adsBaseDn'], $filter, $justthese); - $ginfo = ldap_get_entries($ds, $sr); - $gCount = $ginfo['count']; - ldap_free_result($sr); - if ($gCount > 0) { - $_SESSION['alert'][] = 'message:multi_uid:'.$groupCn; - return false; - } - - // Az következő gidNumber megállapítása - $filter = "(&(objectclass=".$AUTH[$toPolicy]['adsGroupObjectClass'].")(gidNumber=*))"; - $justthese = array('gidNumber', 'msSFU30GidNumber'); - $sr = ldap_search($ds,$AUTH[$toPolicy]['adsBaseDn'], $filter, $justthese); - ldap_sort($ds, $sr, 'gidNumber'); - $ginfo = ldap_get_entries($ds, $sr); - ldap_free_result($sr); - if (isset($ginfo['count']) && $ginfo['count'] > 0) $info['gidNumber'] = array($ginfo[ $ginfo['count']-1 ]['gidnumber'][0]+1); - else $info['gidNumber'] = array(1001); - - // A szokásos attribútumok - $info['sAMAccountName'] = $info['cn'] = array($groupCn); - $info['description'] = array($groupDesc); - - // A kategória függő attribútumok - if (isset($SET['container'])) $dn = "CN=$groupCn,".$SET['container']; - else $dn = "CN=$groupCn,OU=$category,".$AUTH[$toPolicy]['adsBaseDn']; - - // objectum osztályok - $info['objectClass'] = array($AUTH[$toPolicy]['adsGroupObjectClass']); - - // csoport felvétel - $_r1 = ldap_add($ds,$dn,$info); - if (!$_r1) { - printf("ADS-Error: %s
\n", ldap_error($ds)); - var_dump($info); - } - - ldap_close($ds); - - $_SESSION['alert'][] = 'info:create_group_success:'.$dn; - return true; - - } - -?> diff --git a/mayor-orig/www/include/backend/ads/session/search/searchAccount.php b/mayor-orig/www/include/backend/ads/session/search/searchAccount.php deleted file mode 100644 index 01298382..00000000 --- a/mayor-orig/www/include/backend/ads/session/search/searchAccount.php +++ /dev/null @@ -1,277 +0,0 @@ - mayor schema konverzió - for ($i = 0; $i < $result['count']; $i++) { - // Egységes szerkezetre alakítjuk, azaz a dn is indexelt - $result[$i]['dn'] = $return[$i]['userAccount'] = array('count' => 1, 0 => $result[$i]['dn']); - for ($j = 0; $j < count($searchAttrs); $j++) { - $a = $searchAttrs[$j]; - if (isset($result[$i][ kisbetus($accountAttrToADS[$a]) ])) { - if ($accountAttrToADS[$a] != '') $return[$i][$a] = $result[$i][ kisbetus($accountAttrToADS[$a]) ]; - else $return[$i][$a] = $result[$i][$a]; - } else { - $return[$i][$a] = array('count' => 0) ; - } - } - $return[$i]['category'] = getAccountCategories($return[$i]['userAccount'][0], $toPolicy); - $return[$i]['category']['count'] = count($return[$i]['category']); - } - $return['count'] = $result['count']; - - return $return; - - } - - } - -###################################################### -# adsSearchGroup - csoport kereső függvény -###################################################### - - function adsSearchGroup($attr, $pattern, $searchAttrs = array('groupCn, groupDesc'), $toPolicy = _POLICY) { - - global $groupAttrToADS; - - // A keresendő attribútum konvertálása ADS attribútummá - if ($groupAttrToADS[ $attr ] != '') $attrADS = $groupAttrToADS[ $attr ]; - else $attrADS = $attr; - if ($attrADS == 'dn') $attrADS = 'cn'; // dn-re nem megy a keresés!! - - // A lekérendő adtibútumok konvertálása ADS attribútummá - for ($i = 0; $i < count($searchAttrs); $i++) { - if ($groupAttrToADS[ $searchAttrs[$i] ] != '') $searchAttrsADS[$i] = $groupAttrToADS[ $searchAttrs[$i] ]; - else $searchAttrsADS[$i] = $searchAttrs[$i]; - } - - $result = ADSSearch($attrADS, $pattern, $searchAttrsADS, '(objectclass=group)', $toPolicy); - if ($result === false) { - return false; - } else { - - // ADS schema --> mayor schema konverzió - for ($i = 0; $i < $result['count']; $i++) { - // Egységes szerkezetre alakítjuk, azaz a dn is indexelt - $result[$i]['dn'] = $return[$i]['groupCn'] = array('count' => 1, 0 => $result[$i]['dn']); - for ($j = 0; $j < count($searchAttrs); $j++) { - $a = $searchAttrs[$j]; - if (!isset($groupAttrToADS[$a]) || $groupAttrToADS[$a] != '') { - if (isset($result[$i][ $groupAttrToADS[$a] ])) $return[$i][$a] = $result[$i][ $groupAttrToADS[$a] ]; - else $return[$i][$a] = ''; - } else { - $return[$i][$a] = $result[$i][$a]; - } - } - } - $return['count'] = $result['count']; - - return $return; - - } - - } - -###################################################### -# adsDeleteAccount - account törlése -###################################################### - - function adsDeleteAccount($userAccount, $toPolicy = _POLICY) { - - global $AUTH; - - // $toPolicy --> ads backend - ellenőrzés - if ($AUTH[$toPolicy]['backend'] != 'ads') { - $_SESSION['alert'][] = 'page:wrong_backend:ads!='.$AUTH[$toPolicy]['backend']; - return false; - } - - $userDn = ADSuserAccountToDn($userAccount, $toPolicy); - if ($userDn === false) return false; - - // Kapcsolódás az ADS szerverhez - $ds = @ldap_connect($AUTH[$toPolicy]['adsHostname']); - if (!$ds) { - $_SESSION['alert'][] = 'alert:ldap_connect_failure'; - return false; - } - - // Csatlakozás a szerverhez - $r = @ldap_bind($ds, BACKEND_CONNECT_DN,BACKEND_CONNECT_PASSWORD); - if (!$r) { - $_SESSION['alert'][] = 'message:ldap_bind_failure'; - ldap_close($ds); - return false; - } - - // Az uidNumber, a unixHomeDirectory lekerdezése - $filter = "(&(objectclass=".$AUTH[$toPolicy]['adsUserObjectClass'].")(!(objectclass=computer)))"; - $justthese = array('uidNumber','unixHomedirectory'); - $sr = @ldap_search($ds,$userDn,$filter,$justthese); - if (!$sr) { - $_SESSION['alert'][] = "message:ldap_search_failure:".$userDn; - ldap_close($ds); - return false; - } ; - - $info = @ldap_get_entries($ds,$sr); - $uidNumber = $info[0]['uidnumber'][0]; - $homeDirectory = $info[0]['unixhomedirectory'][0]; - $uid=$userAccount; - - // user törlése - if (!@ldap_delete($ds,$userDn)) { - $_SESSION['alert'][] = 'message:ldap_delete_failure:user:'.$userAccount; - } - - ldap_close($ds); - - /* - Ha van megadva deleteAccountScript paraméter, akkor abba bejegyzi a törölt felhasználó adatait. - A meghívott deleteAccount.sh nincs definiálva, testreszabható, megkötés egyedül a paraméter - lista: userAccount, uidNumber, homeDirectory - */ - if (defined('_DATADIR') - && isset($AUTH[$toPolicy]['deleteAccountScript']) - && file_exists(_DATADIR) - ) { - $sfp = fopen(_DATADIR.'/'.$AUTH[$toPolicy]['deleteAccountScript'],'a+'); - if ($sfp) { - fwrite($sfp,"\n# $userAccount törlése: userAccount uidNumber homeDirectory\n"); - fwrite($sfp,"deleteAccount.sh '$userAccount' '$uidNumber' '$homeDirectory'\n"); - fclose($sfp); - } - } - - $_SESSION['alert'][] = 'info:delete_uid_success:'.$userDn; - return true; - - } - -###################################################### -# adsDeleteGroup - account törlése -###################################################### - - function adsDeleteGroup($groupCn, $toPolicy = _POLICY) { - - global $AUTH; - - // $toPolicy --> ads backend - ellenőrzés - if ($AUTH[$toPolicy]['backend'] != 'ads') { - $_SESSION['alert'][] = 'page:wrong_backend:ads!='.$AUTH[$toPolicy]['backend']; - return false; - } - - $groupDn = ADSgroupCnToDn($groupCn, $toPolicy); - if ($groupDn === false) return false; - - // Kapcsolódás az ADS szerverhez - $ds = @ldap_connect($AUTH[$toPolicy]['adsHostname']); - if (!$ds) { - $_SESSION['alert'][] = 'alert:ldap_connect_failure'; - return false; - } - - // Csatlakozás a szerverhez - $r = @ldap_bind($ds, BACKEND_CONNECT_DN,BACKEND_CONNECT_PASSWORD); - if (!$r) { - $_SESSION['alert'][] = 'message:ldap_bind_failure'; - ldap_close($ds); - return false; - } - - if (!@ldap_delete($ds, $groupDn)) { - $_SESSION['alert'][] = 'message:ldap_delete_failure:group:'.$groupCn; - } - - ldap_close($ds); - - $_SESSION['alert'][] = 'info:delete_group_success:'.$groupCn; - return true; - - } - - -?> diff --git a/mayor-orig/www/include/backend/file/auth/login.php b/mayor-orig/www/include/backend/file/auth/login.php deleted file mode 100644 index bc77f9f7..00000000 --- a/mayor-orig/www/include/backend/file/auth/login.php +++ /dev/null @@ -1,121 +0,0 @@ - diff --git a/mayor-orig/www/include/backend/file/session/base.php b/mayor-orig/www/include/backend/file/session/base.php deleted file mode 100644 index 4902e9c8..00000000 --- a/mayor-orig/www/include/backend/file/session/base.php +++ /dev/null @@ -1,6 +0,0 @@ - diff --git a/mayor-orig/www/include/backend/ldap-ng/auth/login.php b/mayor-orig/www/include/backend/ldap-ng/auth/login.php deleted file mode 100644 index 3eb9854e..00000000 --- a/mayor-orig/www/include/backend/ldap-ng/auth/login.php +++ /dev/null @@ -1,163 +0,0 @@ - 1 ) { - // Több ilyen uid is van - $_SESSION['alert'][] = "message:multi_uid"; - ldap_close($ds); - return _AUTH_FAILURE_2; - } - - if ($info['count']==1) { // Van - egy - ilyen felhasználó - - - $accountInformation['cn'] = $info[0][ $AUTH[$toPolicy]['ldapCnAttr'] ][0]; - $accountInformation['studyId'] = $info[0][ $AUTH[$toPolicy]['ldapStudyIdAttr'] ][0]; - - $accountInformation['dn'] = $info[0]['dn']; - $accountInformation['account'] = $userAccount; - // Lejárt-e - // A lejárat ideje a shadowExpire és shadowLastChange+shadowMax kötül a kisebbik - if ($info[0]['pwdlastset'][0] != '') { // A pwdLastSet és shadowLastChange közül a kisebbiket használjuk -// if ($info[0]['shadowlastchange'][0] != '') -// $info[0]['shadowlastchange'][0] = min(pwdLastSet2shadowLastChange($info[0]['pwdlastset'][0]), $info[0]['shadowlastchange'][0]); -// else - $info[0]['shadowlastchange'][0] = pwdLastSet2shadowLastChange($info[0]['pwdlastset'][0]); - } - if ($info[0]['accountexpires'][0] != '') { // Az accountExpires és a shadowExpire közül a kisebbiket használjuk -// if ($info[0]['shadowexpire'][0] != '') -// $info[0]['shadowexpire'][0] = min(pwdLastSet2shadowLastChange($info[0]['accountexpires'][0]), $info[0]['shadowexpire'][0]); -// else - $info[0]['shadowexpire'][0] = pwdLastSet2shadowLastChange($info[0]['accountexpires'][0]); - } - if ($info[0]['shadowexpire'][0] != '') $expireTimestamp = $info[0]['shadowexpire'][0]; - if ( - $info[0]['shadowmax'][0] != '' && - ( - !isset($expireTimestamp) || - $expireTimestamp > $info[0]['shadowlastchange'][0] + $info[0]['shadowmax'][0] - ) - ) $expireTimestamp = $info[0]['shadowlastchange'][0] + $info[0]['shadowmax'][0]; - // lejárt, ha lejárat ideje már elmúlt - $accountExpired = (isset($expireTimestamp) && ($expireTimestamp <= floor(time()/(60*60*24)))); - - // Le van-e tiltva - // Ha több mint shadowInactive napja lejárt - if ( // onDisabled: none | refuse - $AUTH[$toPolicy]['onDisabled'] == 'refuse' && - isset($expireTimestamp) && - $expireTimestamp + $info[0]['shadowinactive'][0] <= floor(time()/(60*60*24)) - ) { - // Le van tiltva - $_SESSION['alert'][] = 'message:account_disabled'; - ldap_close($ds); - return _AUTH_FAILURE_4; - } // onDisabled - - // Jelszó ellenőrzés - lehet-e csatlakozni - if (!@ldap_bind($ds, $accountInformation['dn'], $userPassword)) { - $_SESSION['alert'][] = 'message:bad_pw'; - return _AUTH_FAILURE_3; - } - - ldap_close($ds); - // Lejárt-e az azonosító - if ($AUTH[$toPolicy]['onExpired'] != 'none' && isset($expireTimestamp)) { // onExpired: none | warning | force update - // Lejárt-e - $pwLejar = $expireTimestamp - floor(time()/(60*60*24)); - if (0 < $pwLejar && $pwLejar < $info[0]['shadowwarning'][0]) { - $_SESSION['alert'][] = 'info:account_warning:'.$pwLejar; - return _AUTH_SUCCESS; - } elseif ($pwLejar <= 0) { - $_SESSION['alert'][] = 'info:account_expired:'.abs($pwLejar); - if ($AUTH[$toPolicy]['onDisabled'] == 'refuse') $_SESSION['alert'][] = 'info:warn_account_disable:'.($info[0]['shadowinactive'][0]+$pwLejar); - if ($AUTH[$toPolicy]['onExpired'] == 'warning') { - return _AUTH_SUCCESS; - } elseif ($AUTH[$toPolicy]['onExpired'] == 'force update') { - return _AUTH_EXPIRED; - } else { - return _AUTH_FAILURE; - } - } - } // onExpired - // Ha idáig eljut, akkor minden rendben. - return _AUTH_SUCCESS; - - } // count == 1 - - } - -?> diff --git a/mayor-orig/www/include/backend/ldap-ng/base/attrs.php b/mayor-orig/www/include/backend/ldap-ng/base/attrs.php deleted file mode 100644 index 2a2f327a..00000000 --- a/mayor-orig/www/include/backend/ldap-ng/base/attrs.php +++ /dev/null @@ -1,146 +0,0 @@ - 'sAMAccountName', - 'userCn' => 'displayName', - 'mail' => 'mail', - 'studyId' => 'serialNumber', // Ez konfig-ban külön van állítva, az itteni érték irreleváns - 'shadowLastChange' => 'shadowLastChange', - 'shadowWarning' => 'shadowWarning', - 'shadowMin' => 'shadowMin', - 'shadowMax' => 'shadowMax', - 'shadowExpire' => 'shadowExpire', - 'shadowInactive' => 'shadowInactive', - ); - - global $groupAttrToLDAP; - $groupAttrToLDAP = array( - 'groupCn' => 'cn', - 'groupDesc' => 'description', - 'member' => 'member', - ); - - global $ldapAccountAttrDef; - $ldapAccountAttrDef = array( - 'dn' => array('desc' => _LDAPDN, 'type' => 'text', 'rights' => 'rrr'), - 'cn' => array('desc' => _LDAPCN, 'type' => 'text', 'rights' => 'rrr'), - 'sn' => array('desc' => _LDAPSN, 'type' => 'text', 'rights' => 'wrr'), - 'givenname' => array('desc' => _LDAPGIVENNAME, 'type' => 'text'), - 'serialnumber' => array('desc' => _LDAPSERIALNUMBER, 'type' => 'int', 'rights' => 'wrr'), - 'displayname' => array('desc' => _LDAPCN, 'type' => 'text', 'rights' => 'wrr'), - 'name' => array('desc' => _LDAPNAME, 'type' => 'text', 'rights' => 'r--'), - 'padpwdcount' => array('desc' => _LDAPBADPWDCOUNT, 'type' => 'int', 'rights' => 'wrr'), - 'badpasswordtime' => array('desc' => _LDAPBADPASSWORDTIME, 'type' => 'int', 'rights' => 'r--'), - 'lastlogon' => array('desc' => _LDAPLASTLOGON, 'type' => 'int', 'rights' => 'r--'), - 'pwdlastset' => array('desc' => _LDAPPWDLASTSET, 'type' => 'int', 'rights' => 'r--'), - 'accountexpires' => array('desc' => _LDAPACCOUNTEXPIRES, 'type' => 'int', 'rights' => 'wrr'), - 'samaccountname' => array('desc' => _LDAPSAMACCOUNTNAME, 'type' => 'text', 'rights' => 'wrr'), - 'useraccountcontrol' => array('desc' => _USERACCOUNTCONTROL, 'type' => 'text', 'rights' => 'wrr'), - 'userprincipalname' => array('desc' => _LDAPUSERPRINCIPALNAME, 'type' => 'text', 'rights' => 'wrr'), - 'objectcategory' => array('desc' => _LDAPOBJECTCATEGORY, 'type' => 'text', 'rights' => 'r--'), - 'uid' => array('desc' => _LDAPUID, 'type' => 'text', 'rights' => 'rrr'), - 'uidnumber' => array('desc' => _LDAPUIDNUMBER, 'type' => 'int', 'rights' => 'w--'), - 'gidnumber' => array('desc' => _LDAPGIDNUMBER, 'type' => 'int', 'rights' => 'w--'), - 'mssfu30name' => array('desc' => _LDAPUID, 'type' => 'text', 'rights' => 'r--'), - 'unixhomedirectory' => array('desc' => _LDAPUNIXHOMEDIRECTORY, 'type' => 'text', 'rights' => 'wrr'), - 'loginshell' => array('desc' => _LDAPLOGINSHELL, 'type' => 'text', 'rights' => 'wrr'), - 'shadowlastchange' => array('desc' => _LDAPSHADOWLASTCHANGE, 'type' => 'text', 'rights' => 'wrr'), - 'shadowexpire' => array('desc' => _LDAPSHADOWEXPIRE, 'type' => 'text', 'rights' => 'wrr'), - 'shadowwarning' => array('desc' => _LDAPSHADOWWARNING, 'type' => 'text', 'rights' => 'wrr'), - 'shadowmin' => array('desc' => _LDAPSHADOWMIN, 'type' => 'text', 'rights' => 'wrr'), - 'shadowmax' => array('desc' => _LDAPSHADOWMAX, 'type' => 'text', 'rights' => 'wrr'), - 'shadowinactive' => array('desc' => _LDAPSHADOWINACTICE, 'type' => 'text', 'rights' => 'wrr'), -/* - 'gecos' => array('desc' => _LDAPGECOS, 'type' => 'text', 'rights' => 'w--'), - 'mail' => array('desc' => _LDAPMAIL, 'type' => 'text', 'rights' => 'wwr'), - 'telephonenumber' => array('desc' => _LDAPTELEPHONENUMBER, 'type' => 'text', 'rights' => 'ww-'), - 'mobile' => array('desc' => _LDAPMOBILE, 'type' => 'text', 'rights' => 'ww-'), - 'l' => array('desc' => _LDAPL, 'type' => 'text'), - 'street' => array('desc' => _LDAPSTREET, 'type' => 'text'), - 'postaladdress' => array('desc' => _LDAPPOSTALADDRESS, 'type' => 'text'), - 'postalcode' => array('desc' => _LDAPPOSTALCODE, 'type' => 'text'), -*/ - ); - - global $ldapGroupAttrDef; - $ldapGroupAttrDef = array( - 'cn' => array('desc' => _LDAPCN, 'type' => 'text','rights' => 'rrr'), - 'name' => array('desc' => _LDAPNAME, 'type' => 'text','rights' => 'rrr'), - 'samaccountname' => array('desc' => _LDAPSAMACCOUNTNAME, 'type' => 'text','rights' => 'wrr'), - 'description' => array('desc' => _LDAPDESCRIPTION, 'type' => 'text'), - 'gidnumber' => array('desc' => _LDAPGIDNUMBER, 'type' => 'int','rights' => 'w--'), - 'member' => array('desc' => _LDAPMEMBER, 'type' => 'select'), - 'objectcategory' => array('desc' => _LDAPOBJECTCATEGORY, 'type' => 'text','rights' => 'rrr'), - - 'memberuid' => array('desc' => _LDAPMEMBERUID, 'type' => 'select'), - ); - -?> diff --git a/mayor-orig/www/include/backend/ldap-ng/password/changePassword.php b/mayor-orig/www/include/backend/ldap-ng/password/changePassword.php deleted file mode 100644 index aa4cd91d..00000000 --- a/mayor-orig/www/include/backend/ldap-ng/password/changePassword.php +++ /dev/null @@ -1,161 +0,0 @@ - diff --git a/mayor-orig/www/include/backend/ldap-ng/session/accountInfo.php b/mayor-orig/www/include/backend/ldap-ng/session/accountInfo.php deleted file mode 100644 index d3733ba2..00000000 --- a/mayor-orig/www/include/backend/ldap-ng/session/accountInfo.php +++ /dev/null @@ -1,401 +0,0 @@ - mayor schema konverzió - for ($i = 0; $i < $result['count']; $i++) { - // Egységes szerkezetre alakítjuk, azaz a dn is indexelt - foreach ($backendAttrDef as $attr => $def) { - // Egységes szerkezetre alakítjuk, azaz a dn is indexelt - if ($attr == 'dn') $return[$i]['dn'] = array('count' => 1, 0 => $result[$i]['dn']); - elseif (isset($result[$i][$attr])) $return[$i][$attr] = $result[$i][$attr]; - else $return[$i][$attr] = array('count' => 0); - } - } - return $return[0]; - - } - - } - -############################################################# -# ldapGetUserInfo - felhasználói információk (keretrendszer) -############################################################# - - function ldapGetUserInfo($userAccount, $toPolicy = _POLICY) { - - global $accountAttrToLDAP, $ldapAttrDef; - $userDn = LDAPuserAccountToDn($userAccount, $toPolicy); - - $result = getLDAPInfo($userDn, array_values($accountAttrToLDAP), $toPolicy); - if ($result === false) { - return false; - } else { - - $result[0]['dn'] = array('count' => 1, 0 => $result[0]['dn']); - // Egységes szerkezetre alakítjuk, azaz a dn is indexelt + LDAP --> MaYoR schema - foreach ($accountAttrToLDAP as $attr => $ldapAttr) { - $ldapAttr = kisbetus($ldapAttr); - if (isset($result[0][$ldapAttr])) $return[$attr] = $result[0][$ldapAttr]; - else $return[$attr] = array('count' => 0); - } - return $return; - - } - - } - -############################################################### -# ldapChangeAccountInfo - felhasználói információk módosítása -############################################################### - - function ldapChangeAccountInfo($userAccount, $toPolicy = _POLICY) { - - global $AUTH, $backendAttrs, $backendAttrDef; - - $userDn = LDAPuserAccountToDn($userAccount, $toPolicy); - - // Kapcsolódás az LDAP szerverhez - $ds = @ldap_connect($AUTH[$toPolicy]['ldapHostname']); - if (!$ds) { - $_SESSION['alert'][] = 'alert:ldap_connect_failure'; - return false; - } - - // Csatlakozás a szerverhez - $r = @ldap_bind($ds, _USERDN, _USERPASSWORD); - if (!$r) { - $_SESSION['alert'][] = 'message:ldap_bind_failure'; - ldap_close($ds); - return false; - } - - $emptyAttrs = explode(':',$_POST['emptyAttrs']); - $_alert = array(); - - // Attribútumonként módosítunk - foreach ($backendAttrs as $attr) { - - if ($backendAttrDef[$attr]['rights'] == '') $rigths = _DEFAULT_LDAP_RIGHTS; - else $rights = $backendAttrDef[$attr]['rights']; - - if ($rights[_ACCESS_AS] == 'w') { - $mod_info = $add_info = $del_info = Array(); - $values = array(); - - if ($backendAttrDef[$attr]['type'] == 'image') { - $file = $_FILES[$attr]['tmp_name']; - if (file_exists($file)) { - $fd = fopen($file,'r'); - $values[0]=fread($fd,filesize($file)); - fclose($fd); - } else { - // Sose töröljük! - $emptyAttrs[] = $attr; - } - } elseif ($backendAttrDef[$attr]['type'] == 'timestamp') { - if ($_POST[$attr][0] != '' and $_POST[$attr][1] != '' and $_POST[$attr][2] != '') { - $values[0] = $_POST[$attr][0].$_POST[$attr][1].$_POST[$attr][2].'010101Z'; - } - } else { - if ($backendAttrDef[$attr]['type'] != '' ) $values[0] = $_POST[$attr]; - } - - if ($backendAttrDef[$attr]['type'] == 'select') { - if ($_POST['new-'.$attr][0] != '') $add_info[$attr] = $_POST['new-'.$attr]; - if ($_POST['del-'.$attr][0] != '') $del_info[$attr] = $_POST['del-'.$attr]; - } elseif (in_array($attr,$emptyAttrs)) { - if ($values[0] != '') $add_info[$attr] = $values; - } else { - if ($values[0] != '') { - $mod_info[$attr] = $values; - } else { - $del_info[$attr] = Array(); - } - } - - if (count($add_info)!=0) { - if (!@ldap_mod_add($ds,$userDn,$add_info)) { - $_alert[] = 'message:insufficient_access:add:'.$attr; - } - } - if (count($mod_info)!=0) { - if (!@$r = ldap_mod_replace($ds,$userDn,$mod_info)) { - $_alert[] = 'message:insufficient_access:mod:'.$attr; - } - } - if (count($del_info)!=0) { - if (!@ldap_mod_del($ds,$userDn,$del_info)) { - $_alert[] = 'message:insufficient_access:del:'.$attr; - } - } - - } else { -// $_alert[] = 'message:insufficient_access:'.$attr; - } - } // foreach - - ldap_close($ds); - if (count($_alert) == 0) $_SESSION['alert'][] = 'info:change_success'; - else for ($i = 0;$i < count($_alert);$i++) $_SESSION['alert'][] = $_alert[$i]; - - } - -########################################################### -# ldapGetGroupInfo - csoport információk (backend) -########################################################### - - function ldapGetGroupInfo($groupCn, $toPolicy = _POLICY) { - - global $backendAttrs, $backendAttrDef; - - - if (!isset($backendAttrs)) list($backendAttrs, $backendAttrDef) = getBackendAttrs('Group', $toPolicy); - - $groupDn = LDAPgroupCnToDn($groupCn, $toPolicy); - - $result = getLDAPInfo($groupDn, $backendAttrs, $toPolicy); - if ($result === false) { - return false; - } else { - - // Accountok lekérdezése - $info = getLDAPaccounts($toPolicy); - for ($i = 0; $i < $info['count']; $i++) { - $accountUid[] = array( - 'value' => $info[$i]['uid'][0], - 'txt' => $info[$i]['displayname'][0] - ); - $accountDn[] = array( - 'value' => $info[$i]['dn'], - 'txt' => $info[$i]['displayname'][0] - ); - } - - // LDAP schema --> mayor schema konverzió - for ($i = 0; $i < $result['count']; $i++) { - // Egységes szerkezetre alakítjuk, azaz a dn is indexelt - foreach ($backendAttrDef as $attr => $def) { - // Egységes szerkezetre alakítjuk, azaz a dn is indexelt - if ($attr == 'dn') $return[$i]['dn'] = array('count' => 1, 0 => $result[$i]['dn']); - elseif (isset($result[$i][$attr])) $return[$i][$attr] = $result[$i][$attr]; - else $return[$i][$attr] = array('count' => 0); - } - $return[$i]['member']['new'] = $accountDn; - $return[$i]['memberuid']['new'] = $accountUid; - } - - return $return[0]; - - } - - } - -############################################################### -# ldapChangeGroupInfo - csoport információk módosítása -############################################################### - - function ldapChangeGroupInfo($groupCn, $toPolicy = _POLICY) { - -// !!!! A memberuid / member szinkronjára nem figyel!! - - global $AUTH, $backendAttrs, $backendAttrDef; - - $groupDn = LDAPgroupCnToDn($groupCn, $toPolicy); - - // Kapcsolódás az LDAP szerverhez - $ds = @ldap_connect($AUTH[$toPolicy]['ldapHostname']); - if (!$ds) { - $_SESSION['alert'][] = 'alert:ldap_connect_failure'; - return false; - } - - // Csatlakozás a szerverhez - $r = @ldap_bind($ds, _USERDN, _USERPASSWORD); - - if (!$r) { - $_SESSION['alert'][] = 'message:ldap_bind_failure'; - ldap_close($ds); - return false; - } - - $emptyAttrs = explode(':',$_POST['emptyAttrs']); - $_alert = array(); - - // Attribútumonként módosítunk - foreach ($backendAttrs as $attr) { - - if ($backendAttrDef[$attr]['rights'] == '') $rigths = _DEFAULT_LDAP_RIGHTS; - else $rights = $backendAttrDef[$attr]['rights']; - - if ($rights[_ACCESS_AS] == 'w') { - - $mod_info = $add_info = $del_info = Array(); - $values = array(); - - if ($backendAttrDef[$attr]['type'] == 'image') { - $file = $_FILES[$attr]['tmp_name']; - if (file_exists($file)) { - $fd = fopen($file,'r'); - $values[0]=fread($fd,filesize($file)); - fclose($fd); - } else { - // Sose töröljük! - $emptyAttrs[] = $attr; - } - } elseif ($backendAttrDef[$attr]['type'] == 'timestamp') { - if ($_POST[$attr][0] != '' and $_POST[$attr][1] != '' and $_POST[$attr][2] != '') { - $values[0] = $_POST[$attr][0].$_POST[$attr][1].$_POST[$attr][2].'010101Z'; - } - } else { - if ($backendAttrDef[$attr]['type'] != '') - if (isset($_POST[$attr])) $values[0] = $_POST[$attr]; - else $values[0] = ''; - } - - if ($backendAttrDef[$attr]['type'] == 'select') { - if (isset($_POST['new-'.$attr][0]) && $_POST['new-'.$attr][0] != '') $add_info[$attr] = $_POST['new-'.$attr]; - if (isset($_POST['del-'.$attr][0]) && $_POST['del-'.$attr][0] != '') $del_info[$attr] = $_POST['del-'.$attr]; - } elseif (in_array($attr,$emptyAttrs)) { - if ($values[0] != '') $add_info[$attr] = $values; - } else { - if ($values[0] != '') { - $mod_info[$attr] = $values; - } else { - $del_info[$attr] = Array(); - } - - } - - if (count($add_info)!=0) { - if (!@ldap_mod_add($ds,$groupDn,$add_info)) { - $_alert[] = 'message:insufficient_access:add:'.$attr; - } - } - if (count($mod_info)!=0) { - if (!@ldap_mod_replace($ds,$groupDn,$mod_info)) { - $_alert[] = 'message:insufficient_access:mod:'.$attr; - } - } - if (count($del_info)!=0) { - if (!@ldap_mod_del($ds,$groupDn,$del_info)) { - $_alert[] = 'message:insufficient_access:del:'.$attr; - } - } - - } else { -// $_alert[] = 'message:insufficient_access:'.$attr; - } - } // foreach - - ldap_close($ds); - if (count($_alert) == 0) $_SESSION['alert'][] = 'info:change_success'; - else for ($i=0;$i diff --git a/mayor-orig/www/include/backend/ldap-ng/session/base.php b/mayor-orig/www/include/backend/ldap-ng/session/base.php deleted file mode 100644 index 196e431c..00000000 --- a/mayor-orig/www/include/backend/ldap-ng/session/base.php +++ /dev/null @@ -1,184 +0,0 @@ - 1 ) { - // Több ilyen uid is van - $_SESSION['alert'][] = "message:multi_uid:$userAccount"; - return false; - } - - if ($info['count']==1) { // Van - egy - ilyen felhasználó - return $info[0]['dn']; - } - - } - - -###################################################### -# A groupCn(cn)-hez tartozó dn lekérdezése -###################################################### - - function LDAPgroupCnToDn($groupCn, $toPolicy = _POLICY) { - - global $AUTH; - - // Kapcsolódás a szerverhez - $ds = @ldap_connect($AUTH[$toPolicy]['ldapHostname']); - if (!$ds) { - $_SESSION['alert'][] = 'alert:ldap_connect_failure'; - return false; - } - - // Csatlakozás a szerverhez - $r = @ldap_bind($ds,$AUTH[$toPolicy]['ldapUser'],$AUTH[$toPolicy]['ldapPw']); - if (!$r) { - $_SESSION['alert'][] = 'message:ldap_bind_failure'; - return false; - } - - // Van-e ilyen csoport? - $filter="(&(".$AUTH[$toPolicy]['ldapGroupCnAttr']."=$groupCn)(objectClass=".$AUTH[$toPolicy]['ldapGroupObjectClass']."))"; - $justthese=array($AUTH[$toPolicy]['ldapGroupCnAttr']); - $sr = ldap_search($ds, $AUTH[$toPolicy]['ldapBaseDn'], $filter, $justthese); - if (!$sr) { - $_SESSION['alert'][] = "message:ldap_search_failure"; - ldap_close($ds); - return false; - } - $info=ldap_get_entries($ds,$sr); - ldap_close($ds); - - if ( $info['count'] === 0 ) { - // Nincs ilyen groupCn (cn) - hibaüzenet csak akkor, ha nem kategóriáról van szó... - if (!in_array($groupCn, array_map('ekezettelen', $AUTH[$toPolicy]['categories']))) $_SESSION['alert'][] = "message:no_group:$groupCn"; - return false; - } elseif ( $info['count'] > 1 ) { - // Több ilyen cn is van - $_SESSION['alert'][] = "message:multi_gid:$groupCn"; - return false; - } - - if ($info['count']==1) { // Van - egy - ilyen csoport - return $info[0]['dn']; - } - - } - -###################################################### -# memberOf - csoport tag-e -###################################################### - - function ldapMemberOf($userAccount, $group, $toPolicy = _POLICY) { - - global $AUTH; - - $userDn = LDAPuserAccountToDn($userAccount, $toPolicy); - /* Kis hack: csoport-tagság helyett vizsgáljuk előbb a megfelelő szervezeti egységet... de ezt nem biztos, hogy érdemes... */ - if (in_array($group, $AUTH[$toPolicy]['categories'])) { - if (strpos($userDn, ',ou='.ekezettelen($group).',') !== false) return true; - } - - if (substr($group,0,3) != 'cn=') { - $groupDn = LDAPgroupCnToDn(ekezettelen($group)); - if (!$groupDn) return false; // Ha nincs ilyen csoport az LDAP fában - } else { - $groupDn = $group; - } - - // Kapcsolódás az LDAP szerverhez - $ds = @ldap_connect($AUTH[$toPolicy]['ldapHostname']); - if (!$ds) { - $_SESSION['alert'][] = 'alert:ldap_connect_failure'; - return false; - } - - // Csatlakozás a szerverhez - $r = @ldap_bind($ds,$AUTH[$toPolicy]['ldapUser'],$AUTH[$toPolicy]['ldapPw']); - if (!$r) { - $_SESSION['alert'][] = 'message:ldap_bind_failure'; - ldap_close($ds); - return false; - } - - $justthese = array('cn'); // valamit le kell kérdezni... - $filter = "(&(objectClass=".$AUTH[$toPolicy]['ldapGroupObjectClass'].")(member=$userDn))"; - $sr = @ldap_search($ds, $groupDn, $filter, $justthese); - if (!$sr) { - $_SESSION['alert'][] = "message:ldap_search_failure:".$filter; - ldap_close($ds); - return false; - } - - $info = ldap_get_entries($ds, $sr); - ldap_close($ds); - - if ($info['count'] > 0) { - return true; - } else { - return false; - } - - } - -?> diff --git a/mayor-orig/www/include/backend/ldap-ng/session/createAccount.php b/mayor-orig/www/include/backend/ldap-ng/session/createAccount.php deleted file mode 100644 index db62a348..00000000 --- a/mayor-orig/www/include/backend/ldap-ng/session/createAccount.php +++ /dev/null @@ -1,157 +0,0 @@ - a konténer elem - ha nincs, akkor CN=Users alá rakja - category => tanár, diák... egy kiemelt fontosságú csoport tagság - groups => egyéb csoportok - policyAttrs => policy függő attribútumok - ) - */ - function ldapCreateAccount( - $userCn, $userAccount, $userPassword, $toPolicy, $SET - ) { - - global $AUTH; - - $shadowLastChange = floor(time() / (60*60*24)); - - // $toPolicy --> ldap backend - ellenőrzés! - if ($AUTH[$toPolicy]['backend'] != 'ldap-ng') { - $_SESSION['alert'][] = 'page:wrong_backend:'.$AUTH[$toPolicy]['backend']; - return false; - } - - // Kapcsolódás az LDAP szerverhez - $ds = @ldap_connect($AUTH[$toPolicy]['ldapHostname']); - if (!$ds) { - $_SESSION['alert'][] = 'alert:ldap_connect_failure'; - return false; - } - - // Csatlakozás a szerverhez - $r = @ldap_bind($ds, _USERDN, _USERPASSWORD); - if (!$r) { - $_SESSION['alert'][] = 'message:ldap_bind_failure'; - ldap_close($ds); - return false; - } - - $info = $ginfo = Array(); - - // uid ütközés ellenőrzése - $filter = "(sAMAccountName=$userAccount)"; - $justthese = array('sAMAccountName'); - $sr = ldap_search($ds, $AUTH[$toPolicy]['ldapBaseDn'], $filter, $justthese); - $uinfo = ldap_get_entries($ds, $sr); - $uidCount = $uinfo['count']; - ldap_free_result($sr); - if ($uidCount > 0) { - $_SESSION['alert'][] = 'message:multi_uid:'.$userAccount; - return false; - } - - // Az következő uidNumber megállapítása - $filter = "(&(objectclass=".$AUTH[$toPolicy]['ldapUserObjectClass'].")(uidNumber=*))"; - $justthese = array('uidNumber', 'msSFU30UidNumber'); - $sr = ldap_search($ds,$AUTH[$toPolicy]['ldapBaseDn'], $filter, $justthese); - ldap_sort($ds, $sr, 'uidNumber'); - $uinfo = ldap_get_entries($ds, $sr); - ldap_free_result($sr); - if (isset($uinfo['count']) && $uinfo['count'] > 0) $info['uidNumber'] = array($uinfo[ $uinfo['count']-1 ]['uidnumber'][0]+1); - else $info['uidNumber'] = array(1001); - - // shadow attributumok... - // A shadowLastChange a mai nap // if (isset($AUTH[$toPolicy]['shadowlastchange']) && $AUTH[$toPolicy]['shadowlastchange'] != '') - $info['shadowLastChange'] = array($shadowLastChange); - if (isset($AUTH[$toPolicy]['shadowMin']) && $AUTH[$toPolicy]['shadowMin'] != '') $info['shadowMin'] = array($AUTH[$toPolicy]['shadowMin']); - if (isset($AUTH[$toPolicy]['shadowMax']) && $AUTH[$toPolicy]['shadowMax'] != '') $info['shadowMax'] = array($AUTH[$toPolicy]['shadowMax']); - if (isset($AUTH[$toPolicy]['shadowWarning']) && $AUTH[$toPolicy]['shadowWarning'] != '') $info['shadowWarning'] = array($AUTH[$toPolicy]['shadowWarning']); - if (isset($AUTH[$toPolicy]['shadowInactive']) && $AUTH[$toPolicy]['shadowInactive'] != '') $info['shadowInactive'] = array($AUTH[$toPolicy]['shadowInactive']); - if (isset($AUTH[$toPolicy]['shadowExpire']) && $AUTH[$toPolicy]['shadowWxpire'] != '') $info['shadowExpire'] = array($AUTH[$toPolicy]['shadowExpire']); - - // A szokásos attribútumok - $Name = explode(' ',$userCn); - $Dn = ldap_explode_dn($AUTH[$toPolicy]['ldapBaseDn'], 1); unset($Dn['count']); - $info['userPrincipalName'] = array( $userAccount.'@'.implode('.', $Dn)); - $info['msSFU30Name'] = $info['sAMAccountName'] = $info['cn'] = array($userAccount); - $info['displayName'] = array($userCn); - $info['sn'] = array($Name[0]); - $info['givenName'] = array($Name[ count($Name)-1 ]); - $info['unixUserPassword'] = array('ABCD!efgh12345$67890'); - $info['unixHomeDirectory'] = array(ekezettelen("/home/$userAccount")); - $info['loginShell'] = array('/bin/bash'); - $info['objectClass'] = array($AUTH[$toPolicy]['ldapUserObjectClass'], 'user'); - - $policyAccountAttrs = $SET['policyAttrs']; - if (isset($policyAccountAttrs['studyId'])) $info[ $AUTH[$toPolicy]['ldapStudyIdAttr'] ] = array($policyAccountAttrs['studyId']); - foreach ($policyAccountAttrs as $attr => $value) - if ($attr != 'studyId' && isset($accountAttrToLDAP[$attr])) - $info[ $accountAttrToLDAP[$attr] ] = array($value); - - if (isset($SET['container'])) $dn = "CN=$userAccount,".$SET['container']; - else $dn = "CN=$userAccount,CN=Users,".$AUTH[$toPolicy]['ldapBaseDn']; - - // user felvétel - $_r1 = @ldap_add($ds,$dn,$info); - if (!$_r1) { - $_SESSION['alert'][] = 'message:ldap_error:Add user:'.ldap_error($ds); - //echo $dn.'
'; var_dump($info); echo '
'; - return false; - } - - // Jelszó beállítás - if (!changePassword($userAccount, $userPassword, $toPolicy)) $_SESSION['alert'][] = 'message:ldap_error:changePassword failed:'.$userAccount; - - // Engedélyezés - $einfo = array('userAccountControl' => array(512)); /* Normal account = 512 */ - $_r1 = @ldap_mod_replace($ds,$dn,$einfo); - if (!$_r1) { - $_SESSION['alert'][] = 'message:ldap_error:Enable user:'.ldap_error($ds); - //echo $dn.'
'; var_dump($info); echo '
'; - return false; - } - - // Kategória csoportba és egyéb csoportokba rakás - if (isset($SET['category'])) { - if (is_array($SET['groups'])) array_unshift($SET['groups'], $SET['category']); - else $SET['groups'] = array($SET['category']); - - $ginfo['member'] = $dn; - - for ($i = 0; $i < count($SET['groups']); $i++) { - $groupDn = LDAPgroupCnToDn($SET['groups'][$i], $toPolicy); - if ($groupDn !== false) { - $_r3 = @ldap_mod_add($ds, $groupDn, $ginfo); - if (!$_r3) { - $_SESSION['alert'][] = 'message:ldap_error:Add to group '.$SET['groups'][$i].':'.ldap_error($ds); - //echo $SET['groups'][$i].'
'; var_dump($ginfo); echo '
'; - } - } - } - } - - ldap_close($ds); - - if (defined('_DATADIR') - && isset($AUTH[$toPolicy]['createAccountScript']) - && file_exists(_DATADIR) - ) { - $sfp = fopen(_DATADIR.'/'.$AUTH[$toPolicy]['createAccountScript'],'a+'); - if ($sfp) { - fwrite($sfp,"\n# $userAccount létrehozása: userAccount uidNumber homeDirectory\n"); - fwrite($sfp,"createAccount.sh '$userAccount' '".$info['uidNumber'][0]."' '".$info['unixHomeDirectory'][0]."'\n"); - fclose($sfp); - } - } - $_SESSION['alert'][] = 'info:create_uid_success:'.$dn; - return true; - - } - -?> diff --git a/mayor-orig/www/include/backend/ldap-ng/session/createGroup.php b/mayor-orig/www/include/backend/ldap-ng/session/createGroup.php deleted file mode 100644 index 59c77c92..00000000 --- a/mayor-orig/www/include/backend/ldap-ng/session/createGroup.php +++ /dev/null @@ -1,82 +0,0 @@ - ldap backend - ellenőrzés! - if ($AUTH[$toPolicy]['backend'] != 'ldap-ng') { - $_SESSION['alert'][] = 'page:wrong_backend:'.$AUTH[$toPolicy]['backend']; - return false; - } - - // Kapcsolódás az LDAP szerverhez - $ds = @ldap_connect($AUTH[$toPolicy]['ldapHostname']); - if (!$ds) { - $_SESSION['alert'][] = 'alert:ldap_connect_failure'; - return false; - } - - // Csatlakozás a szerverhez - $r = @ldap_bind($ds, _USERDN, _USERPASSWORD); - if (!$r) { - $_SESSION['alert'][] = 'message:ldap_bind_failure'; - ldap_close($ds); - return false; - } - - $info = $ginfo = Array(); - - // cn ütközés ellenőrzése - $filter = "(&(objectclass=".$AUTH[$toPolicy]['ldapGroupObjectClass'].")(cn=$groupCn))"; - $justthese = array('cn'); - $sr = ldap_search($ds, $AUTH[$toPolicy]['ldapBaseDn'], $filter, $justthese); - $ginfo = ldap_get_entries($ds, $sr); - $gCount = $ginfo['count']; - ldap_free_result($sr); - if ($gCount > 0) { - $_SESSION['alert'][] = 'message:multi_uid:'.$groupCn; - return false; - } - - // Az következő gidNumber megállapítása - $filter = "(&(objectclass=".$AUTH[$toPolicy]['ldapGroupObjectClass'].")(gidNumber=*))"; - $justthese = array('gidNumber', 'msSFU30GidNumber'); - $sr = ldap_search($ds,$AUTH[$toPolicy]['ldapBaseDn'], $filter, $justthese); - ldap_sort($ds, $sr, 'gidNumber'); - $ginfo = ldap_get_entries($ds, $sr); - ldap_free_result($sr); - if (isset($ginfo['count']) && $ginfo['count'] > 0) $info['gidNumber'] = array($ginfo[ $ginfo['count']-1 ]['gidnumber'][0]+1); - else $info['gidNumber'] = array(1001); - - // A szokásos attribútumok - $info['sAMAccountName'] = $info['cn'] = array($groupCn); - $info['description'] = array($groupDesc); - - // A kategória függő attribútumok - if (isset($SET['container'])) $dn = "CN=$groupCn,".$SET['container']; - else $dn = "CN=$groupCn,OU=$category,".$AUTH[$toPolicy]['ldapBaseDn']; - - // objectum osztályok - $info['objectClass'] = array($AUTH[$toPolicy]['ldapGroupObjectClass']); - - // csoport felvétel - $_r1 = ldap_add($ds,$dn,$info); - if (!$_r1) { - printf("LDAP-Error: %s
\n", ldap_error($ds)); - var_dump($info); - } - - ldap_close($ds); - - $_SESSION['alert'][] = 'info:create_group_success:'.$dn; - return true; - - } - -?> diff --git a/mayor-orig/www/include/backend/ldap-ng/session/search/searchAccount.php b/mayor-orig/www/include/backend/ldap-ng/session/search/searchAccount.php deleted file mode 100644 index 70be6ed5..00000000 --- a/mayor-orig/www/include/backend/ldap-ng/session/search/searchAccount.php +++ /dev/null @@ -1,271 +0,0 @@ - mayor schema konverzió - for ($i = 0; $i < $result['count']; $i++) { - // Egységes szerkezetre alakítjuk, azaz a dn is indexelt - $result[$i]['dn'] = $return[$i]['userAccount'] = array('count' => 1, 0 => $result[$i]['dn']); - for ($j = 0; $j < count($searchAttrs); $j++) { - $a = $searchAttrs[$j]; - if (isset($result[$i][ kisbetus($accountAttrToLDAP[$a]) ])) { - if ($accountAttrToLDAP[$a] != '') $return[$i][$a] = $result[$i][ kisbetus($accountAttrToLDAP[$a]) ]; - else $return[$i][$a] = $result[$i][$a]; - } else { - $return[$i][$a] = array('count' => 0) ; - } - } - $return[$i]['category'] = getAccountCategories($return[$i]['userAccount'][0], $toPolicy); - $return[$i]['category']['count'] = count($return[$i]['category']); - } - $return['count'] = $result['count']; - - return $return; - - } - - } - -###################################################### -# ldapSearchGroup - csoport kereső függvény -###################################################### - - function ldapSearchGroup($attr, $pattern, $searchAttrs = array('groupCn, groupDesc'), $toPolicy = _POLICY) { - - global $groupAttrToLDAP; - - // A keresendő attribútum konvertálása LDAP attribútummá - if ($groupAttrToLDAP[ $attr ] != '') $attrLDAP = $groupAttrToLDAP[ $attr ]; - else $attrLDAP = $attr; - if ($attrLDAP == 'dn') $attrLDAP = 'cn'; // dn-re nem megy a keresés!! - - // A lekérendő adtibútumok konvertálása LDAP attribútummá - for ($i = 0; $i < count($searchAttrs); $i++) { - if ($groupAttrToLDAP[ $searchAttrs[$i] ] != '') $searchAttrsLDAP[$i] = $groupAttrToLDAP[ $searchAttrs[$i] ]; - else $searchAttrsLDAP[$i] = $searchAttrs[$i]; - } - - $result = LDAPSearch($attrLDAP, $pattern, $searchAttrsLDAP, '(objectclass=group)', $toPolicy); - if ($result === false) { - return false; - } else { - - // LDAP schema --> mayor schema konverzió - for ($i = 0; $i < $result['count']; $i++) { - // Egységes szerkezetre alakítjuk, azaz a dn is indexelt - $result[$i]['dn'] = $return[$i]['groupCn'] = array('count' => 1, 0 => $result[$i]['dn']); - for ($j = 0; $j < count($searchAttrs); $j++) { - $a = $searchAttrs[$j]; - if (!isset($groupAttrToLDAP[$a]) || $groupAttrToLDAP[$a] != '') { - if (isset($result[$i][ $groupAttrToLDAP[$a] ])) $return[$i][$a] = $result[$i][ $groupAttrToLDAP[$a] ]; - else $return[$i][$a] = ''; - } else { - $return[$i][$a] = $result[$i][$a]; - } - } - } - $return['count'] = $result['count']; - - return $return; - - } - - } - -###################################################### -# ldapDeleteAccount - account törlése -###################################################### - - function ldapDeleteAccount($userAccount, $toPolicy = _POLICY) { - - global $AUTH; - - // $toPolicy --> ldap-ng backend - ellenőrzés - if ($AUTH[$toPolicy]['backend'] != 'ldap-ng') { - $_SESSION['alert'][] = 'page:wrong_backend:ldap-ng!='.$AUTH[$toPolicy]['backend']; - return false; - } - - $userDn = LDAPuserAccountToDn($userAccount, $toPolicy); - if ($userDn === false) return false; - - // Kapcsolódás az LDAP szerverhez - $ds = @ldap_connect($AUTH[$toPolicy]['ldapHostname']); - if (!$ds) { - $_SESSION['alert'][] = 'alert:ldap_connect_failure'; - return false; - } - - // Csatlakozás a szerverhez - $r = @ldap_bind($ds, _USERDN, _USERPASSWORD); - if (!$r) { - $_SESSION['alert'][] = 'message:ldap_bind_failure'; - ldap_close($ds); - return false; - } - - // Az uidNumber, a unixHomeDirectory lekerdezése - $filter = "(&(objectclass=".$AUTH[$toPolicy]['ldapUserObjectClass'].")(!(objectclass=computer)))"; - $justthese = array('uidNumber','unixHomedirectory'); - $sr = @ldap_search($ds,$userDn,$filter,$justthese); - if (!$sr) { - $_SESSION['alert'][] = "message:ldap_search_failure:".$userDn; - ldap_close($ds); - return false; - } ; - - $info = @ldap_get_entries($ds,$sr); - $uidNumber = $info[0]['uidnumber'][0]; - $homeDirectory = $info[0]['unixhomedirectory'][0]; - $uid=$userAccount; - - // user törlése - if (!@ldap_delete($ds,$userDn)) { - $_SESSION['alert'][] = 'message:ldap_delete_failure:user:'.$userAccount; - } - - ldap_close($ds); - - /* - Ha van megadva deleteAccountScript paraméter, akkor abba bejegyzi a törölt felhasználó adatait. - A meghívott deleteAccount.sh nincs definiálva, testreszabható, megkötés egyedül a paraméter - lista: userAccount, uidNumber, homeDirectory - */ - if (defined('_DATADIR') - && isset($AUTH[$toPolicy]['deleteAccountScript']) - && file_exists(_DATADIR) - ) { - $sfp = fopen(_DATADIR.'/'.$AUTH[$toPolicy]['deleteAccountScript'],'a+'); - if ($sfp) { - fwrite($sfp,"\n# $userAccount törlése: userAccount uidNumber homeDirectory\n"); - fwrite($sfp,"deleteAccount.sh '$userAccount' '$uidNumber' '$homeDirectory'\n"); - fclose($sfp); - } - } - - $_SESSION['alert'][] = 'info:delete_uid_success:'.$userDn; - return true; - - } - -###################################################### -# ldapDeleteGroup - account törlése -###################################################### - - function ldapDeleteGroup($groupCn, $toPolicy = _POLICY) { - - global $AUTH; - - // $toPolicy --> ldap-ng backend - ellenőrzés - if ($AUTH[$toPolicy]['backend'] != 'ldap-ng') { - $_SESSION['alert'][] = 'page:wrong_backend:ldap-ng!='.$AUTH[$toPolicy]['backend']; - return false; - } - - $groupDn = LDAPgroupCnToDn($groupCn, $toPolicy); - if ($groupDn === false) return false; - - // Kapcsolódás az LDAP szerverhez - $ds = @ldap_connect($AUTH[$toPolicy]['ldapHostname']); - if (!$ds) { - $_SESSION['alert'][] = 'alert:ldap_connect_failure'; - return false; - } - - // Csatlakozás a szerverhez - $r = @ldap_bind($ds, _USERDN, _USERPASSWORD); - if (!$r) { - $_SESSION['alert'][] = 'message:ldap_bind_failure'; - ldap_close($ds); - return false; - } - - if (!@ldap_delete($ds, $groupDn)) { - $_SESSION['alert'][] = 'message:ldap_delete_failure:group:'.$groupCn; - } - - ldap_close($ds); - - $_SESSION['alert'][] = 'info:delete_group_success:'.$groupCn; - return true; - - } - - -?> diff --git a/mayor-orig/www/include/backend/ldap/auth/login.php b/mayor-orig/www/include/backend/ldap/auth/login.php deleted file mode 100644 index 2165371d..00000000 --- a/mayor-orig/www/include/backend/ldap/auth/login.php +++ /dev/null @@ -1,144 +0,0 @@ - 1 ) { - // Több ilyen uid is van - $_SESSION['alert'][] = "message:multi_uid"; - ldap_close($ds); - return _AUTH_FAILURE_2; - } - - if ($info['count']==1) { // Van - egy - ilyen felhasználó - - $accountInformation['cn'] = $info[0]['cn'][0]; - $accountInformation['studyId'] = $info[0]['studyid'][0]; - $accountInformation['dn'] = $info[0]['dn']; - $accountInformation['account'] = $userAccount; - // Lejárt-e - // A lejárat ideje a shadowExpire és shadowLastChange+shadowMax kötül a kisebbik - if ($info[0]['shadowexpire'][0] != '') $expireTimestamp = $info[0]['shadowexpire'][0]; - if ( - $info[0]['shadowmax'][0] != '' && - ( - !isset($expireTimestamp) || - $expireTimestamp > $info[0]['shadowlastchange'][0] + $info[0]['shadowmax'][0] - ) - ) $expireTimestamp = $info[0]['shadowlastchange'][0] + $info[0]['shadowmax'][0]; - // lejárt, ha lejárat ideje már elmúlt - $accountExpired = (isset($expireTimestamp) && ($expireTimestamp <= floor(time()/(60*60*24)))); - - // Le van-e tiltva - // Ha több mint shadowInactive napja lejárt - if ( // onDisabled: none | refuse - $AUTH[$toPolicy]['onDisabled'] == 'refuse' && - isset($expireTimestamp) && - $expireTimestamp + $info[0]['shadowinactive'][0] <= floor(time()/(60*60*24)) - ) { - // Le van tiltva - $_SESSION['alert'][] = 'message:account_disabled'; - ldap_close($ds); - return _AUTH_FAILURE_4; - } // onDisabled - - // Jelszó ellenőrzés - lehet-e csatlakozni - if (!@ldap_bind($ds, $accountInformation['dn'], $userPassword)) { - $_SESSION['alert'][] = 'message:bad_pw'; - return _AUTH_FAILURE_3; - } - - ldap_close($ds); - // Lejárt-e az azonosító - if ($AUTH[$toPolicy]['onExpired'] != 'none' && isset($expireTimestamp)) { // onExpired: none | warning | force update - // Lejárt-e - $pwLejar = $expireTimestamp - floor(time()/(60*60*24)); - if (0 < $pwLejar && $pwLejar < $info[0]['shadowwarning'][0]) { - $_SESSION['alert'][] = 'info:account_warning:'.$pwLejar; - return _AUTH_SUCCESS; - } elseif ($pwLejar <= 0) { - $_SESSION['alert'][] = 'info:account_expired:'.abs($pwLejar); - if ($AUTH[$toPolicy]['onDisabled'] == 'refuse') - $_SESSION['alert'][] = 'info:warn_account_disable:'.($info[0]['shadowinactive'][0]+$pwLejar); - if ($AUTH[$toPolicy]['onExpired'] == 'warning') { - return _AUTH_SUCCESS; - } elseif ($AUTH[$toPolicy]['onExpired'] == 'force update') { - return _AUTH_EXPIRED; - } - } - } // onExpired - - // Ha idáig eljut, akkor minden rendben. - return _AUTH_SUCCESS; - - } // count == 1 - - } - -?> diff --git a/mayor-orig/www/include/backend/ldap/base/attrs.php b/mayor-orig/www/include/backend/ldap/base/attrs.php deleted file mode 100644 index bf86d0d2..00000000 --- a/mayor-orig/www/include/backend/ldap/base/attrs.php +++ /dev/null @@ -1,120 +0,0 @@ - 'uid', - 'userCn' => 'cn', - 'mail' => 'mail', - 'studyId' => 'studyId', - 'shadowLastChange' => 'shadowLastChange', - 'shadowWarning' => 'shadowWarning', - 'shadowMin' => 'shadowMin', - 'shadowMax' => 'shadowMax', - 'shadowExpire' => 'shadowExpire', - 'shadowInactive' => 'shadowInactive', - ); - - global $groupAttrToLDAP; - $groupAttrToLDAP = array( - 'groupCn' => 'cn', - 'groupDesc' => 'description', - 'member' => 'member' - ); - - global $ldapAccountAttrDef; - $ldapAccountAttrDef = array( - 'dn' => array('desc' => _LDAPDN, 'type' => 'text', 'rights' => 'rrr'), - 'uid' => array('desc' => _LDAPUID, 'type' => 'text', 'rights' => 'rrr'), - 'uidnumber' => array('desc' => _LDAPUIDNUMBER, 'type' => 'int', 'rights' => 'w--'), - 'gidnumber' => array('desc' => _LDAPGIDNUMBER, 'type' => 'int', 'rights' => 'w--'), - 'gecos' => array('desc' => _LDAPGECOS, 'type' => 'text', 'rights' => 'w--'), - 'cn' => array('desc' => _LDAPCN, 'type' => 'text', 'rights' => 'wrr'), - 'studyid' => array('desc' => _LDAPSTUDYID, 'type' => 'int', 'rights' => 'wrr'), - 'sn' => array('desc' => _LDAPSN, 'type' => 'text'), - 'givenname' => array('desc' => _LDAPGIVENNAME, 'type' => 'text'), - 'mail' => array('desc' => _LDAPMAIL, 'type' => 'text', 'rights' => 'wwr'), - 'telephonenumber' => array('desc' => _LDAPTELEPHONENUMBER, 'type' => 'text', 'rights' => 'ww-'), - 'mobile' => array('desc' => _LDAPMOBILE, 'type' => 'text', 'rights' => 'ww-'), - 'l' => array('desc' => _LDAPL, 'type' => 'text'), - 'street' => array('desc' => _LDAPSTREET, 'type' => 'text'), - 'postaladdress' => array('desc' => _LDAPPOSTALADDRESS, 'type' => 'text'), - 'postalcode' => array('desc' => _LDAPPOSTALCODE, 'type' => 'text'), - 'homedirectory' => array('desc' => _LDAPHOMEDIRECTORY, 'type' => 'text'), - 'shadowlastchange' => array('desc' => _LDAPSHADOWLASTCHANGE, 'type' => 'text'), - 'shadowexpire' => array('desc' => _LDAPSHADOWEXPIRE, 'type' => 'text'), - 'shadowwarning' => array('desc' => _LDAPSHADOWWARNING, 'type' => 'text'), - 'shadowmin' => array('desc' => _LDAPSHADOWMIN, 'type' => 'text'), - 'shadowmax' => array('desc' => _LDAPSHADOWMAX, 'type' => 'text'), - 'shadowinactive' => array('desc' => _LDAPSHADOWINACTICE, 'type' => 'text'), - ); - - global $ldapGroupAttrDef; - $ldapGroupAttrDef = array( - 'cn' => array('desc' => _LDAPCN, 'type' => 'text','rights' => 'wrr'), - 'description' => array('desc' => _LDAPDESCRIPTION, 'type' => 'text'), - 'gidnumber' => array('desc' => _LDAPGIDNUMBER, 'type' => 'int','rights' => 'w--'), - 'memberuid' => array('desc' => _LDAPMEMBERUID, 'type' => 'select'), - 'member' => array('desc' => _LDAPMEMBER, 'type' => 'select'), - ); - -?> diff --git a/mayor-orig/www/include/backend/ldap/base/attrs.php.orig b/mayor-orig/www/include/backend/ldap/base/attrs.php.orig deleted file mode 100644 index 658dfa1c..00000000 --- a/mayor-orig/www/include/backend/ldap/base/attrs.php.orig +++ /dev/null @@ -1,175 +0,0 @@ - 'uid', - 'userCn' => 'cn', - 'mail' => 'mail', - 'studyId' => 'studyId', - 'shadowLastChange' => 'shadowLastChange', - 'shadowWarning' => 'shadowWarning', - 'shadowMin' => 'shadowMin', - 'shadowMax' => 'shadowMax', - 'shadowExpire' => 'shadowExpire', - 'shadowInactive' => 'shadowInactive', - ); - - global $groupAttrToLDAP; - $groupAttrToLDAP = array( - 'groupId' => 'cn', - 'groupName' => 'description', -// 'leader' => 'leader', - 'owner' => 'owner', - 'member' => 'member' - ); - - global $ldapAccountAttrDef; - $ldapAccountAttrDef = array( - 'dn' => array('desc' => _LDAPDN, 'type' => 'text','rights' => 'rrr'), - 'uid' => array('desc' => _LDAPUID, 'type' => 'text','rights' => 'rrr'), - 'uidnumber' => array('desc' => _LDAPUIDNUMBER, 'type' => 'int','rights' => 'w--'), - 'gidnumber' => array('desc' => _LDAPGIDNUMBER, 'type' => 'int','rights' => 'w--'), - 'gecos' => array('desc' => _LDAPGECOS, 'type' => 'text','rights' => 'w--'), - 'cn' => array('desc' => _LDAPCN, 'type' => 'text','rights' => 'wrr'), - 'sn' => array('desc' => _LDAPSN, 'type' => 'text'), - 'givenname' => array('desc' => _LDAPGIVENNAME, 'type' => 'text'), - 'mail' => array('desc' => _LDAPMAIL, 'type' => 'text','rights' => 'wwr'), - 'homepage' => array('desc' => _LDAPHOMEPAGE, 'type' => 'text','rights' => 'wwr'), - 'url' => array('desc' => _LDAPURL, 'type' => 'text'), - 'telephonenumber' => array('desc' => _LDAPTELEPHONENUMBER, 'type' => 'text','rights' => 'ww-'), - 'mobile' => array('desc' => _LDAPMOBILE, 'type' => 'text','rights' => 'ww-'), - 'year' => array('desc' => _LDAPYEAR, 'type' => 'int'), - 'class' => array('desc' => _LDAPCLASS, 'type' => 'text'), - 'l' => array('desc' => _LDAPL, 'type' => 'text'), - 'street' => array('desc' => _LDAPSTREET, 'type' => 'text'), - 'postaladdress' => array('desc' => _LDAPPOSTALADDRESS, 'type' => 'text'), - 'postalcode' => array('desc' => _LDAPPOSTALCODE, 'type' => 'text'), - 'homedirectory' => array('desc' => _LDAPHOMEDIRECTORY, 'type' => 'text'), - 'roomnumber' => array('desc' => _LDAPROOMNUMBER, 'type' => 'int'), - 'registertimestamp' => array('desc' => _LDAPREGISTERTIMESTAMP, 'type' => 'timestamp'), - 'primaryschoolomcode' => array('desc' => _LDAPPRIMARYSCHOOLOMCODE, 'type' => 'text'), - 'classtimestamp' => array('desc' => _LDAPCLASSTIMESTAMP, 'type' => 'timestamp'), - 'studentcardnumber' => array('desc' => _LDAPSTUDENTCARDNUMBER, 'type' => 'text'), - 'studentcardtimestamp' => array('desc' => _LDAPSTUDENTCARDTIMESTAMP, 'type' => 'timestamp'), - 'taxid' => array('desc' => _LDAPTAXID, 'type' => 'text'), - 'birthtimestamp' => array('desc' => _LDAPBIRTHTIMESTAMP, 'type' => 'timestamp'), - 'birthlocality' => array('desc' => _LDAPBIRTHLOCALITY, 'type' => 'text'), - 'registernumber' => array('desc' => _LDAPREGISTERNUMBER, 'type' => 'text'), - 'diarynumber' => array('desc' => _LDAPDIARYNUMBER, 'type' => 'text'), - 'sex' => array('desc' => _LDAPSEX, 'type' => 'radio', 'options' => array(_FIU, _LANY)), - 'guardiancn' => array('desc' => _LDAPGUARDIANCN, 'type' => 'text'), - 'mothercn' => array('desc' => _LDAPMOTHERCN, 'type' => 'text'), - 'localitytimestamp' => array('desc' => _LDAPLOCALITYTIMESTAMP, 'type' => 'timestamp'), - 'tajnumber' => array('desc' => _LDAPTAJNUMBER, 'type' => 'text'), - 'shadowlastchange' => array('desc' => _LDAPSHADOWLASTCHANGE, 'type' => 'text'), - 'shadowexpire' => array('desc' => _LDAPSHADOWEXPIRE, 'type' => 'text'), - 'shadowwarning' => array('desc' => _LDAPSHADOWWARNING, 'type' => 'text'), - 'shadowmin' => array('desc' => _LDAPSHADOWMIN, 'type' => 'text'), - 'shadowmax' => array('desc' => _LDAPSHADOWMAX, 'type' => 'text'), - 'shadowinactive' => array('desc' => _LDAPSHADOWINACTICE, 'type' => 'text'), - ); - - global $ldapGroupAttrDef; - $ldapGroupAttrDef = array( - 'cn' => array('desc' => _LDAPCN, 'type' => 'text','rights' => 'wrr'), - 'description' => array('desc' => _LDAPDESCRIPTION, 'type' => 'text'), - 'gidnumber' => array('desc' => _LDAPGIDNUMBER, 'type' => 'int','rights' => 'w--'), - 'memberuid' => array('desc' => _LDAPMEMBERUID, 'type' => 'select'), - 'member' => array('desc' => _LDAPMEMBER, 'type' => 'select'), - 'owner' => array('desc' => _LDAPOWNER, 'type' => 'select'), -// 'studentmember' => array('desc' => _LDAPSTUDENTMEMBER, 'type' => 'text'), -// 'exemptmember' => array('desc' => _LDAPEXEMPTMEMBER, 'type' => 'text'), -// 'examermember' => array('desc' => _LDAPEXAMERMEMBER, 'type' => 'text'), -// 'leader' => array('desc' => _LDAPLEADER, 'type' => 'text'), - ); - -?> \ No newline at end of file diff --git a/mayor-orig/www/include/backend/ldap/base/str.php b/mayor-orig/www/include/backend/ldap/base/str.php deleted file mode 100644 index 2ef3ad1c..00000000 --- a/mayor-orig/www/include/backend/ldap/base/str.php +++ /dev/null @@ -1,53 +0,0 @@ - diff --git a/mayor-orig/www/include/backend/ldap/password/changePassword.php b/mayor-orig/www/include/backend/ldap/password/changePassword.php deleted file mode 100644 index 22ace5ca..00000000 --- a/mayor-orig/www/include/backend/ldap/password/changePassword.php +++ /dev/null @@ -1,102 +0,0 @@ - diff --git a/mayor-orig/www/include/backend/ldap/session/accountInfo.php b/mayor-orig/www/include/backend/ldap/session/accountInfo.php deleted file mode 100644 index 24f5234b..00000000 --- a/mayor-orig/www/include/backend/ldap/session/accountInfo.php +++ /dev/null @@ -1,401 +0,0 @@ - mayor schema konverzió - for ($i = 0; $i < $result['count']; $i++) { - // Egységes szerkezetre alakítjuk, azaz a dn is indexelt - foreach ($backendAttrDef as $attr => $def) { - // Egységes szerkezetre alakítjuk, azaz a dn is indexelt - if ($attr == 'dn') $return[$i]['dn'] = array('count' => 1, 0 => $result[$i]['dn']); - elseif (isset($result[$i][$attr])) $return[$i][$attr] = $result[$i][$attr]; - else $return[$i][$attr] = array('count' => 0); - } - } - - return $return[0]; - - } - - } - -############################################################# -# ldapGetUserInfo - felhasználói információk (keretrendszer) -############################################################# - - function ldapGetUserInfo($userAccount, $toPolicy = _POLICY) { - - global $AUTH, $accountAttrToLDAP, $ldapAttrDef; - $userDn = LDAPuserAccountToDn($userAccount, $toPolicy); - - $result = getLDAPInfo($userDn, array_values($accountAttrToLDAP), $toPolicy); - if ($result === false) { - return false; - } else { - - $result[0]['dn'] = array('count' => 1, 0 => $result[0]['dn']); - // Egységes szerkezetre alakítjuk, azaz a dn is indexelt - foreach ($accountAttrToLDAP as $attr => $ldapAttr) { - if (isset($result[0][$ldapAttr])) $return[$attr] = $result[0][$ldapAttr]; - else $return[$attr] = array('count' => 0); - } - - return $return; - - } - - } - -############################################################### -# ldapChangeAccountInfo - felhasználói információk módosítása -############################################################### - - function ldapChangeAccountInfo($userAccount, $toPolicy = _POLICY) { - - global $AUTH, $backendAttrs, $backendAttrDef; - - $userDn = LDAPuserAccountToDn($userAccount, $toPolicy); - - // Kapcsolódás az LDAP szerverhez - $ds = @ldap_connect($AUTH[$toPolicy]['ldap hostname']); - if (!$ds) { - $_SESSION['alert'][] = 'alert:ldap_connect_failure'; - return false; - } - - // Csatlakozás a szerverhez - $r = @ldap_bind($ds, _USERDN, _USERPASSWORD); - if (!$r) { - $_SESSION['alert'][] = 'message:ldap_bind_failure'; - ldap_close($ds); - return false; - } - - $emptyAttrs = explode(':',$_POST['emptyAttrs']); - - // Attribútumonként módosítunk - foreach ($backendAttrs as $attr) { - - if ($backendAttrDef[$attr]['rights'] == '') $rigths = _DEFAULT_LDAP_RIGHTS; - else $rights = $backendAttrDef[$attr]['rights']; - - if ($rights[_ACCESS_AS] == 'w') { - - $mod_info = $add_info = $del_info = Array(); - $values = array(); - - if ($backendAttrDef[$attr]['type'] == 'image') { - $file = $_FILES[$attr]['tmp_name']; - if (file_exists($file)) { - $fd = fopen($file,'r'); - $values[0]=fread($fd,filesize($file)); - fclose($fd); - } else { - // Sose töröljük! - $emptyAttrs[] = $attr; - } - } elseif ($backendAttrDef[$attr]['type'] == 'timestamp') { - if ($_POST[$attr][0] != '' and $_POST[$attr][1] != '' and $_POST[$attr][2] != '') { - $values[0] = $_POST[$attr][0].$_POST[$attr][1].$_POST[$attr][2].'010101Z'; - } - } else { - if ($backendAttrDef[$attr]['type'] != '' ) $values[0] = $_POST[$attr]; - } - - if ($backendAttrDef[$attr]['type'] == 'select') { - if ($_POST['new-'.$attr][0] != '') $add_info[$attr] = $_POST['new-'.$attr]; - if ($_POST['del-'.$attr][0] != '') $del_info[$attr] = $_POST['del-'.$attr]; - } elseif (in_array($attr,$emptyAttrs)) { - if ($values[0] != '') $add_info[$attr] = $values; - } else { - if ($values[0] != '') { - $mod_info[$attr] = $values; - } else { - $del_info[$attr] = Array(); - } - } - - $_alert = array(); - if (count($add_info)!=0) { - if (!@ldap_mod_add($ds,$userDn,$add_info)) { - $_alert[] = 'message:insufficient_access:add:'.$attr; - } - } - if (count($mod_info)!=0) { - if (!@ldap_mod_replace($ds,$userDn,$mod_info)) { - $_alert[] = 'message:insufficient_access:mod:'.$attr; - } - } - if (count($del_info)!=0) { - if (!@ldap_mod_del($ds,$userDn,$del_info)) { - $_alert[] = 'message:insufficient_access:del:'.$attr; - } - } - - } else { -// $_alert[] = 'message:insufficient_access:'.$attr; - } - } // foreach - - ldap_close($ds); - if (count($_alert) == 0) $_SESSION['alert'][] = 'info:change_success'; - else for ($i = 0;$i < count($_alert);$i++) $_SESSION['alert'][] = $_alert[$i]; - - } - -########################################################### -# ldapGetGroupInfo - csoport információk (backend) -########################################################### - - function ldapGetGroupInfo($groupCn, $toPolicy = _POLICY) { - - global $AUTH, $backendAttrs, $backendAttrDef; - - - if (!isset($backendAttrs)) list($backendAttrs, $backendAttrDef) = getBackendAttrs('Group', $toPolicy); - - $groupDn = LDAPgroupCnToDn($groupCn, $toPolicy); - - $result = getLDAPInfo($groupDn, $backendAttrs, $toPolicy); - if ($result === false) { - return false; - } else { - - // Accountok lekérdezése - $info = getLDAPaccounts($toPolicy); - for ($i = 0; $i < $info['count']; $i++) { - $accountUid[] = array( - 'value' => $info[$i]['uid'][0], - 'txt' => $info[$i]['cn'][0] - ); - $accountDn[] = array( - 'value' => $info[$i]['dn'], - 'txt' => $info[$i]['cn'][0] - ); - } - - // LDAP schema --> mayor schema konverzió - for ($i = 0; $i < $result['count']; $i++) { - // Egységes szerkezetre alakítjuk, azaz a dn is indexelt - foreach ($backendAttrDef as $attr => $def) { - // Egységes szerkezetre alakítjuk, azaz a dn is indexelt - if ($attr == 'dn') $return[$i]['dn'] = array('count' => 1, 0 => $result[$i]['dn']); - elseif (isset($result[$i][$attr])) $return[$i][$attr] = $result[$i][$attr]; - else $return[$i][$attr] = array('count' => 0); - } - $return[$i]['member']['new'] = $accountDn; - $return[$i]['memberuid']['new'] = $accountUid; - } - - return $return[0]; - - } - - } - -############################################################### -# ldapChangeGroupInfo - csoport információk módosítása -############################################################### - - function ldapChangeGroupInfo($groupCn, $toPolicy = _POLICY) { - -// !!!! A memberuid / member szinkronjára nem figyel!! - - global $AUTH, $backendAttrs, $backendAttrDef; - - $groupDn = LDAPgroupCnToDn($groupCn, $toPolicy); - - // Kapcsolódás az LDAP szerverhez - $ds = @ldap_connect($AUTH[$toPolicy]['ldap hostname']); - if (!$ds) { - $_SESSION['alert'][] = 'alert:ldap_connect_failure'; - return false; - } - - // Csatlakozás a szerverhez - $r = @ldap_bind($ds, _USERDN, _USERPASSWORD); - if (!$r) { - $_SESSION['alert'][] = 'message:ldap_bind_failure'; - ldap_close($ds); - return false; - } - - $emptyAttrs = explode(':',$_POST['emptyAttrs']); - - // Attribútumonként módosítunk - foreach ($backendAttrs as $attr) { - - if ($backendAttrDef[$attr]['rights'] == '') $rigths = _DEFAULT_LDAP_RIGHTS; - else $rights = $backendAttrDef[$attr]['rights']; - - if ($rights[_ACCESS_AS] == 'w') { - - $mod_info = $add_info = $del_info = Array(); - $values = array(); - - if ($backendAttrDef[$attr]['type'] == 'image') { - $file = $_FILES[$attr]['tmp_name']; - if (file_exists($file)) { - $fd = fopen($file,'r'); - $values[0]=fread($fd,filesize($file)); - fclose($fd); - } else { - // Sose töröljük! - $emptyAttrs[] = $attr; - } - } elseif ($backendAttrDef[$attr]['type'] == 'timestamp') { - if ($_POST[$attr][0] != '' and $_POST[$attr][1] != '' and $_POST[$attr][2] != '') { - $values[0] = $_POST[$attr][0].$_POST[$attr][1].$_POST[$attr][2].'010101Z'; - } - } else { - if ($backendAttrDef[$attr]['type'] != '') - if (isset($_POST[$attr])) $values[0] = $_POST[$attr]; - else $values[0] = ''; - } - - if ($backendAttrDef[$attr]['type'] == 'select') { - if (isset($_POST['new-'.$attr][0]) && $_POST['new-'.$attr][0] != '') $add_info[$attr] = $_POST['new-'.$attr]; - if (isset($_POST['del-'.$attr][0]) && $_POST['del-'.$attr][0] != '') $del_info[$attr] = $_POST['del-'.$attr]; - } elseif (in_array($attr,$emptyAttrs)) { - if ($values[0] != '') $add_info[$attr] = $values; - } else { - if ($values[0] != '') { - $mod_info[$attr] = $values; - } else { - $del_info[$attr] = Array(); - } - } - - $_alert = array(); - if (count($add_info)!=0) { - if (!@ldap_mod_add($ds,$groupDn,$add_info)) { - $_alert[] = 'message:insufficient_access:add:'.$attr; - } - } - if (count($mod_info)!=0) { - if (!@ldap_mod_replace($ds,$groupDn,$mod_info)) { - $_alert[] = 'message:insufficient_access:mod:'.$attr; - } - } - if (count($del_info)!=0) { - if (!@ldap_mod_del($ds,$groupDn,$del_info)) { - $_alert[] = 'message:insufficient_access:del:'.$attr; - } - } - - } else { -// $_alert[] = 'message:insufficient_access:'.$attr; - } - } // foreach - - ldap_close($ds); - if (count($_alert) == 0) $_SESSION['alert'][] = 'info:change_success'; - else for ($i=0;$i diff --git a/mayor-orig/www/include/backend/ldap/session/base.php b/mayor-orig/www/include/backend/ldap/session/base.php deleted file mode 100644 index b8529cc2..00000000 --- a/mayor-orig/www/include/backend/ldap/session/base.php +++ /dev/null @@ -1,255 +0,0 @@ - 1 ) { - // Több ilyen uid is van - $_SESSION['alert'][] = "message:multi_uid:$userAccount"; - return false; - } - - if ($info['count']==1) { // Van - egy - ilyen felhasználó - return $info[0]['dn']; - } - - } - - -###################################################### -# A groupCn(cn)-hez tartozó dn lekérdezése -###################################################### - - function LDAPgroupCnToDn($groupCn, $toPolicy = _POLICY) { - - global $AUTH; - - // Kapcsolódás a szerverhez - $ds = @ldap_connect($AUTH[$toPolicy]['ldap hostname']); - if (!$ds) { - $_SESSION['alert'][] = 'alert:ldap_connect_failure'; - return false; - } - - // Csatlakozás a szerverhez - $r = @ldap_bind($ds); - if (!$r) { - $_SESSION['alert'][] = 'message:ldap_bind_failure'; - return false; - } - - // Van-e adott azonosítójú felhasználó? - $filter="(&(cn=$groupCn)(objectClass=posixGroup))"; - $justthese=array('cn'); - $sr = ldap_search($ds, $AUTH[$toPolicy]['ldap base dn'], $filter, $justthese); - if (!$sr) { - $_SESSION['alert'][] = "message:ldap_search_failure"; - ldap_close($ds); - return false; - } - $info=ldap_get_entries($ds,$sr); - ldap_close($ds); - - if ( $info['count'] === 0 ) { - // Nincs ilyen groupCn (cn) - hibaüzenet csak akkor, ha nem kategóriáról van szó... - if (!in_array($groupCn, array_map('ekezettelen', $AUTH[$toPolicy]['categories']))) $_SESSION['alert'][] = "message:no_group:$groupCn"; - return false; - } elseif ( $info['count'] > 1 ) { - // Több ilyen cn is van - $_SESSION['alert'][] = "message:multi_gid:$groupCn"; - return false; - } - - if ($info['count']==1) { // Van - egy - ilyen csoport - return $info[0]['dn']; - } - - } - - - -###################################################### -# memberOf - csoport tag-e -###################################################### - - function ldapMemberOf($userAccount, $group, $toPolicy = _POLICY) { - - global $AUTH, $LDAP2Mayor; - - $userDn = LDAPuserAccountToDn($userAccount, $toPolicy); - if (in_array($group, $AUTH[$toPolicy]['categories'])) { - if (strpos($userDn, ',ou='.ekezettelen($group).',') !== false) return true; -# Ha nincs megfelelő ou-ban, akkor nézzük a csoport tagságot - így berakható időszakosan akárki pl a titkárság kategóriába... -# else return false; - } - - if (substr($group,0,3) != 'cn=') { - $groupDn = LDAPgroupCnToDn(ekezettelen($group)); - if (!$groupDn) return false; // Ha nincs ilyen csoport az LDAP fában - } else { - $groupDn = $group; - } - - // Kapcsolódás az LDAP szerverhez - $ds = @ldap_connect($AUTH[$toPolicy]['ldap hostname']); - if (!$ds) { - $_SESSION['alert'][] = 'alert:ldap_connect_failure'; - return false; - } - - // Csatlakozás a szerverhez - $r = @ldap_bind($ds); - if (!$r) { - $_SESSION['alert'][] = 'message:ldap_bind_failure'; - ldap_close($ds); - return false; - } - - $justthese = array('cn'); // valamit le kell kérdezni... -/* $filter = "(& (objectClass=mayorGroup) - (member=$userDn) - )"; -*/ - $filter = "(& (objectClass=posixGroup) - (memberUid=$userAccount) - )"; - $sr = @ldap_search($ds, $groupDn, $filter, $justthese); - if (!$sr) { - $_SESSION['alert'][] = "message:ldap_search_failure:".$filter; - ldap_close($ds); - return false; - } - - $info = ldap_get_entries($ds, $sr); - ldap_close($ds); - - if ($info['count'] > 0) { - return true; - } else { - return false; - } - - } - -###################################################### -# LDAPcreateContainer - tároló létrehozása -###################################################### - - function LDAPcreateContainer($containerDn, $toPolicy) { - - global $AUTH; - - $pos = strpos($containerDn, ',ou='); - $container = substr($containerDn, 3, $pos-3); - $rdn = substr($containerDn, $pos+1); - $cat = substr($containerDn, 3, strlen($containerDn)-4-strlen($AUTH[$toPolicy]['ldap base dn'])); - - error_reporting(1); - - // Kapcsolódás a szerverhez - $ds = @ldap_connect($AUTH[$toPolicy]['ldap hostname']); - if (!$ds) { - $_SESSION['alert'][] = 'alert:ldap_connect_failure'; - return false; - } - - // Csatlakozás a szerverhez - $r = @ldap_bind($ds, _USERDN, _USERPASSWORD); - if (!$r) { - $_SESSION['alert'][] = 'message:ldap_bind_failure'; - return false; - } - - // OU létrehozása - $info['ou'][0] = $container; - $info['objectclass'][0] = 'organizationalUnit'; - $info['description'][0] = $container; - - $_r1 = ldap_add($ds, $containerDn, $info); - if (!$_r1) { -// $_SESSION['alert'][] = 'message:ldap_add_failure:'.$containerDn; - return false; -// printf("LDAP-Error: %s
\n", ldap_error($ds)); -// echo '
'; var_dump($info); echo '
'; - } - - // az OU-hoz tartozó csoportok OU-ja - $info['ou'][0] = 'Groups'; - $info['objectclass'][0] = 'organizationalUnit'; - $info['description'][0] = "$container csoportjai"; - - $containerDn = "ou=Groups,$containerDn"; - $_r1 = ldap_add($ds, $containerDn, $info); - if (!$_r1) { - printf("LDAP-Error: %s
\n", ldap_error($ds)); - echo '
'; var_dump($info); echo '
'; - } - - // Az osztály csoport létrehozása - require_once('include/modules/session/createGroup.php'); - createGroup($container, "$container csoport", "$cat", $toPolicy); - - ldap_close($ds); - - } - -?> diff --git a/mayor-orig/www/include/backend/ldap/session/createAccount.php b/mayor-orig/www/include/backend/ldap/session/createAccount.php deleted file mode 100644 index 79f40530..00000000 --- a/mayor-orig/www/include/backend/ldap/session/createAccount.php +++ /dev/null @@ -1,204 +0,0 @@ - ldap backend - ellenőrzés! - if ($AUTH[$toPolicy]['backend'] != 'ldap') { - $_SESSION['alert'][] = 'page:wrong_backend:'.$AUTH[$toPolicy]['backend']; - return false; - } - - // Kapcsolódás az LDAP szerverhez - $ds = @ldap_connect($AUTH[$toPolicy]['ldap hostname']); - if (!$ds) { - $_SESSION['alert'][] = 'alert:ldap_connect_failure'; - return false; - } - - // Csatlakozás a szerverhez - $r = @ldap_bind($ds, _USERDN, _USERPASSWORD); - if (!$r) { - $_SESSION['alert'][] = 'message:ldap_bind_failure'; - ldap_close($ds); - return false; - } - - $info = $groupinfo = $oinfo = Array(); - - // uid ütközés ellenőrzése - $filter = "(uid=$userAccount)"; - $justthese = array('uid'); - $sr = ldap_search($ds, $AUTH[$toPolicy]['ldap base dn'], $filter, $justthese); - $uinfo = ldap_get_entries($ds, $sr); - $uidCount = $uinfo['count']; - ldap_free_result($sr); - if ($uidCount > 0) { - $_SESSION['alert'][] = 'message:multi_uid:'.$userAccount; - return false; - } - - // Az következő uidNumber megállapítása - $filter = '(objectClass=mayorOrganization)'; - $justthese = array('nextuid', 'freeuid'); - $sr = ldap_search($ds,$AUTH[$toPolicy]['ldap base dn'], $filter, $justthese); - $uidinfo = ldap_get_entries($ds,$sr); - ldap_free_result($sr); - if (isset($uidinfo[0]['freeuid']['count'])) $freeUidCount = $uidinfo[0]['freeuid']['count']; - else $freeUidCount = 0; - if ($freeUidCount == 0) { - $info['uidnumber'] = array($uidinfo[0]['nextuid'][0]); - $info['gidnumber'] = $info['uidnumber']; - $oinfo['nextuid'] = $info['uidnumber'][0]+1; - } else { - $info['uidnumber'] = array($uidinfo[0]['freeuid'][$freeUidCount-1]); - $info['gidnumber'] = $info['uidnumber']; - $oinfo['freeuid'] = $uidinfo[0]['freeuid'][$freeUidCount-1]; - } - - // shadow attributumok... - // A shadowLastChange a mai nap // if (isset($AUTH[$toPolicy]['shadowlastchange']) && $AUTH[$toPolicy]['shadowlastchange'] != '') - $info['shadowlastchange'] = $shadowLastChange; - if (isset($AUTH[$toPolicy]['shadowmin']) && $AUTH[$toPolicy]['shadowmin'] != '') $info['shadowmin'] = $AUTH[$toPolicy]['shadowmin']; - if (isset($AUTH[$toPolicy]['shadowmax']) && $AUTH[$toPolicy]['shadowmax'] != '') $info['shadowmax'] = $AUTH[$toPolicy]['shadowmax']; - if (isset($AUTH[$toPolicy]['shadowwarning']) && $AUTH[$toPolicy]['shadowwarning'] != '') $info['shadowwarning'] = $AUTH[$toPolicy]['shadowwarning']; - if (isset($AUTH[$toPolicy]['shadowinactive']) && $AUTH[$toPolicy]['shadowinactive'] != '') $info['shadowinactive'] = $AUTH[$toPolicy]['shadowinactive']; - if (isset($AUTH[$toPolicy]['shadowexpire']) && $AUTH[$toPolicy]['shadowexpire'] != '') $info['shadowexpire'] = $AUTH[$toPolicy]['shadowexpire']; - - // A szokásos attribútumok - $info['uid'] = array($userAccount); - $info['cn'] = array($userCn); - $info['sn'] = array('-'); - $info['userpassword'] = array('{crypt}' . crypt($userPassword)); - if (is_array($SET['policyAttrs'])) foreach ($SET['policyAttrs'] as $attr => $value) $info[kisbetus($attr)] = $value; - if (($pos = strpos($category,',')) !== false) - $info['homedirectory'] = "/home/diak/".substr($category,0,$pos)."/$userAccount"; - else - $info['homedirectory'] = "/home/$category/$userAccount"; - - // A kategória függő attribútumok - if (isset($SET['container']) && $SET['container'] != '') { - $dn = "uid=$userAccount,".$SET['container']; - $group = "cn=$userAccount,ou=Groups,".$SET['container']; - $ouDn = $SET['container']; - } else { - $dn = "uid=$userAccount,ou=".$category.','.$AUTH[$toPolicy]['ldap base dn']; - $group = "cn=$userAccount,ou=Groups,ou=".$category.','.$AUTH[$toPolicy]['ldap base dn']; - $ouDn = "ou=".$category.",".$AUTH[$toPolicy]['ldap base dn']; - } - - if ($SET['createContainer']) { // Létrehozza a tároló elemet, benne az OU=Groups tárolót, benne a megfelelő csoportot - LDAPcreateContainer($ouDn, $toPolicy); - } - // objectum osztályok - // a mayorPerson a posixAccount és shadowAccount leszármazottja, - // de kell egy structural object is - ez a person - aminek kötelező paramétere az sn! - $info['objectclass'] = array('person', 'mayorPerson'); - - // user felvétel - $info['homedirectory'] = ekezettelen($info['homedirectory']); // Nem lehet ékezetes :o( - - $_r1 = ldap_add($ds,$dn,$info); - if (!$_r1) { - printf("LDAP-Error: %s
\n", ldap_error($ds)); - echo $dn.'
'; var_dump($info); echo '
'; - return false; - } - - // user csoportja - $groupinfo['cn'] = $userAccount; - $groupinfo['gidnumber'] = $info['uidnumber']; - $groupinfo['memberuid'] = ekezettelen($userAccount); // Nem lehet ékezetes :o( - $groupinfo['description'] = 'A felhasználó saját csoportja'; - $groupinfo['objectclass'] = 'posixGroup'; - $_r2 = ldap_add($ds, $group, $groupinfo); - if (!$_r2) { - printf("LDAP-Error (userGroup): %s
\n", ldap_error($ds)); - echo $group.'
'; var_dump($groupinfo); echo '
'; - return false; - } - - // Kategória csoportba rakás vagy tanár csoportba rakás ugye... - // És nincs diák csoport! - $ginfo['memberuid'] = ekezettelen($userAccount); // Nem lehet ékezetes :o( - $ginfo['member'] = $dn; - - // Kategória csoportba és egyéb csoportokba rakás - if (isset($SET['category'])) { - if (is_array($SET['groups'])) array_unshift($SET['groups'], $category); - else $SET['groups'] = array($category); - - for ($i = 0; $i < count($SET['groups']); $i++) { - - $filter = "(&(objectClass=mayorGroup)(cn=".$SET['groups'][$i]."))"; - $justthese = array('cn'); - $sr = ldap_search($ds, $AUTH[$toPolicy]['ldap base dn'], $filter, $justthese); - if (ldap_count_entries($ds, $sr)) { - $grpInfo = ldap_get_entries($ds, $sr); - $groupDn = $grpInfo[0]['dn']; - $_r3 = ldap_mod_add($ds, $groupDn, $ginfo); - if (!$_r3) { - printf("LDAP-Error (category): %s
\n", ldap_error($ds)); - echo $groupDn.'
'; var_dump($ginfo); echo '
'; - } - } - - } - - } - - - // nextuid növelés - if ($freeUidCount == 0) { - $_r4 = ldap_mod_replace($ds,$AUTH[$toPolicy]['ldap base dn'],$oinfo); - } else { - $_r4 = ldap_mod_del($ds,$AUTH[$toPolicy]['ldap base dn'],$oinfo); - } - if (!$_r4) { - printf("LDAP-Error (freeUid): %s
\n", ldap_error($ds)); - return false; - } - - ldap_close($ds); - - if (defined('_DATADIR') - && isset($AUTH[$toPolicy]['createAccountScript']) - && file_exists(_DATADIR) - ) { - $sfp = fopen(_DATADIR.'/'.$AUTH[$toPolicy]['createAccountScript'],'a+'); - if ($sfp) { - fwrite($sfp,"\n# $userAccount l.trehoz.sa\n"); - fwrite($sfp,'/bin/mkdir -p '.$info['homedirectory']."\n"); - fwrite($sfp,'/bin/chmod 2755 '.$info['homedirectory']."\n"); - fwrite($sfp,"/bin/chown $userAccount.$userAccount ".$info['homedirectory']."\n"); - - fwrite($sfp,'/bin/mkdir '.$info['homedirectory']."/private\n"); - fwrite($sfp,"/bin/chown $userAccount.$userAccount ".$info['homedirectory']."/private\n"); - fwrite($sfp,'/bin/chmod 0770 '.$info['homedirectory']."/private\n"); - - fwrite($sfp,'/bin/mkdir '.$info['homedirectory']."/public_html\n"); - fwrite($sfp,"/bin/chown $userAccount.$userAccount ".$info['homedirectory']."/public_html\n"); - fwrite($sfp,'/bin/chmod 0755 '.$info['homedirectory']."/public_html\n"); - - fwrite($sfp,'/bin/ln -s '.$info['homedirectory']." /home\n"); -// chmod($scriptFile,0770); - fclose($sfp); - } - } - $_SESSION['alert'][] = 'info:create_uid_success:'.$dn; - return true; - - } - -?> diff --git a/mayor-orig/www/include/backend/ldap/session/createGroup.php b/mayor-orig/www/include/backend/ldap/session/createGroup.php deleted file mode 100644 index df2de812..00000000 --- a/mayor-orig/www/include/backend/ldap/session/createGroup.php +++ /dev/null @@ -1,103 +0,0 @@ - ldap backend - ellenőrzés! - if ($AUTH[$toPolicy]['backend'] != 'ldap') { - $_SESSION['alert'][] = 'page:wrong_backend:'.$AUTH[$toPolicy]['backend']; - return false; - } - - // Kapcsolódás az LDAP szerverhez - $ds = @ldap_connect($AUTH[$toPolicy]['ldap hostname']); - if (!$ds) { - $_SESSION['alert'][] = 'alert:ldap_connect_failure'; - return false; - } - - // Csatlakozás a szerverhez - $r = @ldap_bind($ds, _USERDN, _USERPASSWORD); - if (!$r) { - $_SESSION['alert'][] = 'message:ldap_bind_failure'; - ldap_close($ds); - return false; - } - - $info = $groupinfo = $oinfo = Array(); - - // cn ütközés ellenőrzése - $filter = "(&(objectclass=posixgroup)(cn=$groupCn))"; - $justthese = array('cn'); - $sr = ldap_search($ds, $AUTH[$toPolicy]['ldap base dn'], $filter, $justthese); - $ginfo = ldap_get_entries($ds, $sr); - $gCount = $ginfo['count']; - ldap_free_result($sr); - if ($gCount > 0) { - $_SESSION['alert'][] = 'message:multi_uid:'.$groupCn; - return false; - } - - // Az következő gidNumber megállapítása - $filter = '(objectClass=mayorOrganization)'; - $justthese = array('nextgid', 'freegid'); - $sr = ldap_search($ds,$AUTH[$toPolicy]['ldap base dn'], $filter, $justthese); - $ginfo = ldap_get_entries($ds,$sr); - ldap_free_result($sr); - if (isset($ginfo[0]['freegid']['count'])) $freeGidCount = $ginfo[0]['freegid']['count']; - else $freeGidCount = 0; - if ($freeGidCount == 0) { - $info['gidnumber'] = array($ginfo[0]['nextgid'][0]); - $oinfo['nextgid'] = $info['gidnumber'][0]+1; - } else { - $info['gidnumber'] = array($ginfo[0]['freegid'][$freeGidCount-1]); - $oinfo['freegid'] = $ginfo[0]['freegid'][$freeGidCount-1]; - } - - // A szokásos attribútumok - $info['cn'] = array($groupCn); - $info['description'] = array($groupDesc); - - // A kategória függő attribútumok - if (isset($SET['container'])) $dn = "cn=$groupCn,".$SET['container']; - else $dn = "cn=$groupCn,ou=Groups,ou=$category,".$AUTH[$toPolicy]['ldap base dn']; - - // objectum osztályok - $info['objectclass'] = array('posixGroup', 'mayorGroup'); - - // Policy függő attribútumok - LDAP esetén pl a member kötelező - if (is_array($SET['policyAttrs'])) foreach ($SET['policyAttrs'] as $attr => $value) $info[kisbetus($attr)] = $value; - - // csoport felvétel - $_r1 = ldap_add($ds,$dn,$info); - if (!$_r1) { - printf("LDAP-Error: %s
\n", ldap_error($ds)); - echo $dn.'
'; - var_dump($info); - echo '
'; - var_dump($SET); - } - - // nextuid növelés - if ($freeGidCount == 0) { - $_r4 = ldap_mod_replace($ds,$AUTH[$toPolicy]['ldap base dn'],$oinfo); - } else { - $_r4 = ldap_mod_del($ds,$AUTH[$toPolicy]['ldap base dn'],$oinfo); - } -// if (!$_r4) { -// printf("LDAP-Error: %s
\n", ldap_error($_r4)); -// } - - ldap_close($ds); - - $_SESSION['alert'][] = 'info:create_group_success:'.$dn; - return true; - - } - -?> diff --git a/mayor-orig/www/include/backend/ldap/session/search/searchAccount.php b/mayor-orig/www/include/backend/ldap/session/search/searchAccount.php deleted file mode 100644 index 62e19c5f..00000000 --- a/mayor-orig/www/include/backend/ldap/session/search/searchAccount.php +++ /dev/null @@ -1,311 +0,0 @@ - mayor schema konverzió - for ($i = 0; $i < $result['count']; $i++) { - // Egységes szerkezetre alakítjuk, azaz a dn is indexelt - $result[$i]['dn'] = $return[$i]['userAccount'] = array('count' => 1, 0 => $result[$i]['dn']); - for ($j = 0; $j < count($searchAttrs); $j++) { - $a = $searchAttrs[$j]; - if (isset($result[$i][ $accountAttrToLDAP[$a] ])) { - if ($accountAttrToLDAP[$a] != '') $return[$i][$a] = $result[$i][ $accountAttrToLDAP[$a] ]; - else $return[$i][$a] = $result[$i][$a]; - } else { - $return[$i][$a] = array('count' => 0) ; - } - } - $return[$i]['category'] = getAccountCategories($result[$i]['uid'][0], $toPolicy); - $return[$i]['category']['count'] = count($return[$i]['category']); - } - $return['count'] = $result['count']; - - return $return; - - } - - } - -###################################################### -# ldapSearchGroup - csoport kereső függvény -###################################################### - - function ldapSearchGroup($attr, $pattern, $searchAttrs = array('groupCn, groupDesc'), $toPolicy = _POLICY) { - - global $groupAttrToLDAP; - - // A keresendő attribútum konvertálása LDAP attribútummá - if ($groupAttrToLDAP[ $attr ] != '') $attrLDAP = $groupAttrToLDAP[ $attr ]; - else $attrLDAP = $attr; - if ($attrLDAP == 'dn') $attrLDAP = 'cn'; // dn-re nem megy a keresés!! - - // A lekérendő adtibútumok konvertálása LDAP attribútummá - for ($i = 0; $i < count($searchAttrs); $i++) { - if ($groupAttrToLDAP[ $searchAttrs[$i] ] != '') $searchAttrsLDAP[$i] = $groupAttrToLDAP[ $searchAttrs[$i] ]; - else $searchAttrsLDAP[$i] = $searchAttrs[$i]; - } - - $result = LDAPSearch($attrLDAP, $pattern, $searchAttrsLDAP, '(objectclass=posixgroup)', $toPolicy); - if ($result === false) { - return false; - } else { - - // LDAP schema --> mayor schema konverzió - for ($i = 0; $i < $result['count']; $i++) { - // Egységes szerkezetre alakítjuk, azaz a dn is indexelt - $result[$i]['dn'] = $return[$i]['groupCn'] = array('count' => 1, 0 => $result[$i]['dn']); - for ($j = 0; $j < count($searchAttrs); $j++) { - $a = $searchAttrs[$j]; - if (!isset($groupAttrToLDAP[$a]) || $groupAttrToLDAP[$a] != '') { - if (isset($result[$i][ $groupAttrToLDAP[$a] ])) $return[$i][$a] = $result[$i][ $groupAttrToLDAP[$a] ]; - else $return[$i][$a] = ''; - } else { - $return[$i][$a] = $result[$i][$a]; - } - } - } - $return['count'] = $result['count']; - - return $return; - - } - - } - -###################################################### -# ldapDeleteAccount - account törlése -###################################################### - - function ldapDeleteAccount($userAccount, $toPolicy = _POLICY) { - - global $AUTH; - - $userDn = LDAPuserAccountToDn($userAccount, $toPolicy); - - // $toPolicy --> ldap backend - ellenőrzés - if ($AUTH[$toPolicy]['backend'] != 'ldap') { - $_SESSION['alert'][] = 'page:wrong_backend:'.$AUTH[$toPolicy]['backend']; - return false; - } - - // Kapcsolódás az LDAP szerverhez - $ds = @ldap_connect($AUTH[$toPolicy]['ldap hostname']); - if (!$ds) { - $_SESSION['alert'][] = 'alert:ldap_connect_failure'; - return false; - } - - // Csatlakozás a szerverhez - $r = @ldap_bind($ds, _USERDN, _USERPASSWORD); - if (!$r) { - $_SESSION['alert'][] = 'message:ldap_bind_failure'; - ldap_close($ds); - return false; - } - - // Az uidNumber, a homeDirectory lekerdezése - $filter = "(objectclass=posixAccount)"; - $justthese = array('uidNumber','homedirectory'); - $sr = @ldap_search($ds,$userDn,$filter,$justthese); - if (!$sr) { - $_SESSION['alert'][] = "message:ldap_search_failure:".$userDn; - ldap_close($ds); - return false; - } ; - - $uidinfo = @ldap_get_entries($ds,$sr); - $uidNumber = $uidinfo[0]['uidnumber'][0]; - if (isset($uidinfo[0]['homedirectory'][0])) $homeDirectory = $uidinfo[0]['homedirectory'][0]; - else $homeDirectory = ''; - $uid=$userAccount; - - // GroupDn, freeuid - $groupDn = "cn=$uid,ou=Groups".strstr($userDn,','); - $oinfo['freeuid'] = $uidNumber; - - // user törlése - if (!@ldap_delete($ds,$userDn)) { - $_SESSION['alert'][] = 'message:ldap_delete_failure:user:'.$userAccount; - } - - // freeuid felvétele - if (!@ldap_mod_add($ds,$AUTH[$toPolicy]['ldap base dn'],$oinfo)) { - $_SESSION['alert'][] = 'message:ldap_modify_failure:freeuid:'.$oinfo['freeuid']; - } - - // csoport törlése - if (!@ldap_delete($ds,$groupDn)) { - $_SESSION['alert'][] = 'message:ldap_delete_failure:group:'.$groupDn; - } - - // törlés a csoportból - $filter = "(memberuid=$uid)"; - $justthese = array('cn','objectclass','member'); - $sr = @ldap_search($ds,$AUTH[$toPolicy]['ldap base dn'],$filter,$justthese); - if (!$sr) { - $_SESSION['alert'][] = "message:ldap_search_failure:groups:".$userAccount; - ldap_close($ds); - return false; - } ; - - $groupinfo = ldap_get_entries($ds,$sr); - - for ($i = 0; $i < $groupinfo['count']; $i++) { - $grpinfo = array('memberuid' => $uid); - if (@in_array($userDn,$groupinfo[$i]['member'])) { - $grpinfo['member']=$userDn; - } - if (!@ldap_mod_del($ds,$groupinfo[$i]['dn'],$grpinfo)) { - $_SESSION['alert'][] = 'message:ldap_delete_failure:member:'.$groupinfo[$i]['dn']; - } - } - - ldap_close($ds); - - $_SESSION['alert'][] = 'info:delete_uid_success:'.$userDn; - return true; - - } - -###################################################### -# ldapDeleteGroup - account törlése -###################################################### - - function ldapDeleteGroup($groupCn, $toPolicy = _POLICY) { - - global $AUTH; - - $groupDn = LDAPgroupCnToDn($groupCn, $toPolicy); - - // $toPolicy --> ldap backend - ellenőrzés - if ($AUTH[$toPolicy]['backend'] != 'ldap') { - $_SESSION['alert'][] = 'page:wrong_backend:'.$AUTH[$toPolicy]['backend']; - return false; - } - - // Kapcsolódás az LDAP szerverhez - $ds = @ldap_connect($AUTH[$toPolicy]['ldap hostname']); - if (!$ds) { - $_SESSION['alert'][] = 'alert:ldap_connect_failure'; - return false; - } - - // Csatlakozás a szerverhez - $r = @ldap_bind($ds, _USERDN, _USERPASSWORD); - if (!$r) { - $_SESSION['alert'][] = 'message:ldap_bind_failure'; - ldap_close($ds); - return false; - } - - // Az uidNumber, a homeDirectory lekerdezése - $filter = '(objectclass=posixGroup)'; - $justthese = array('gidNumber'); - $sr = @ldap_search($ds, $groupDn, $filter, $justthese); - if (!$sr) { - $_SESSION['alert'][] = 'message:ldap_search_failure:'.$userDn; - ldap_close($ds); - return false; - } ; - - $gidinfo = ldap_get_entries($ds, $sr); - $gidNumber = $gidinfo[0]['gidnumber'][0]; - - // freeGid - $oinfo['freegid'] = $gidNumber; - - if (!@ldap_delete($ds, $groupDn)) { - $_SESSION['alert'][] = 'message:ldap_delete_failure:group:'.$groupCn; - } - - // freeuid felvétele - if (!@ldap_mod_add($ds, $AUTH[$toPolicy]['ldap base dn'], $oinfo)) { - $_SESSION['alert'][] = 'message:ldap_modify_failure:freeGid:'.$oinfo['freegid']; - } - - ldap_close($ds); - - $_SESSION['alert'][] = 'info:delete_group_success:'.$groupCn; - return true; - - } - - - -?> diff --git a/mayor-orig/www/include/backend/ldapng/auth/login.php b/mayor-orig/www/include/backend/ldapng/auth/login.php deleted file mode 100644 index b24b4b96..00000000 --- a/mayor-orig/www/include/backend/ldapng/auth/login.php +++ /dev/null @@ -1,163 +0,0 @@ - 1 ) { - // Több ilyen uid is van - $_SESSION['alert'][] = "message:multi_uid"; - ldap_close($ds); - return _AUTH_FAILURE_2; - } - - if ($info['count']==1) { // Van - egy - ilyen felhasználó - - - $accountInformation['cn'] = $info[0][ $AUTH[$toPolicy]['ldapCnAttr'] ][0]; - $accountInformation['studyId'] = $info[0][ $AUTH[$toPolicy]['ldapStudyIdAttr'] ][0]; - - $accountInformation['dn'] = $info[0]['dn']; - $accountInformation['account'] = $userAccount; - // Lejárt-e - // A lejárat ideje a shadowExpire és shadowLastChange+shadowMax kötül a kisebbik - if ($info[0]['pwdlastset'][0] != '') { // A pwdLastSet és shadowLastChange közül a kisebbiket használjuk -// if ($info[0]['shadowlastchange'][0] != '') -// $info[0]['shadowlastchange'][0] = min(pwdLastSet2shadowLastChange($info[0]['pwdlastset'][0]), $info[0]['shadowlastchange'][0]); -// else - $info[0]['shadowlastchange'][0] = pwdLastSet2shadowLastChange($info[0]['pwdlastset'][0]); - } - if ($info[0]['accountexpires'][0] != '') { // Az accountExpires és a shadowExpire közül a kisebbiket használjuk -// if ($info[0]['shadowexpire'][0] != '') -// $info[0]['shadowexpire'][0] = min(pwdLastSet2shadowLastChange($info[0]['accountexpires'][0]), $info[0]['shadowexpire'][0]); -// else - $info[0]['shadowexpire'][0] = pwdLastSet2shadowLastChange($info[0]['accountexpires'][0]); - } - if ($info[0]['shadowexpire'][0] != '') $expireTimestamp = $info[0]['shadowexpire'][0]; - if ( - $info[0]['shadowmax'][0] != '' && - ( - !isset($expireTimestamp) || - $expireTimestamp > $info[0]['shadowlastchange'][0] + $info[0]['shadowmax'][0] - ) - ) $expireTimestamp = $info[0]['shadowlastchange'][0] + $info[0]['shadowmax'][0]; - // lejárt, ha lejárat ideje már elmúlt - $accountExpired = (isset($expireTimestamp) && ($expireTimestamp <= floor(time()/(60*60*24)))); - - // Le van-e tiltva - // Ha több mint shadowInactive napja lejárt - if ( // onDisabled: none | refuse - $AUTH[$toPolicy]['onDisabled'] == 'refuse' && - isset($expireTimestamp) && - $expireTimestamp + $info[0]['shadowinactive'][0] <= floor(time()/(60*60*24)) - ) { - // Le van tiltva - $_SESSION['alert'][] = 'message:account_disabled'; - ldap_close($ds); - return _AUTH_FAILURE_4; - } // onDisabled - - // Jelszó ellenőrzés - lehet-e csatlakozni - if (!@ldap_bind($ds, $accountInformation['dn'], $userPassword)) { - $_SESSION['alert'][] = 'message:bad_pw'; - return _AUTH_FAILURE_3; - } - - ldap_close($ds); - // Lejárt-e az azonosító - if ($AUTH[$toPolicy]['onExpired'] != 'none' && isset($expireTimestamp)) { // onExpired: none | warning | force update - // Lejárt-e - $pwLejar = $expireTimestamp - floor(time()/(60*60*24)); - if (0 < $pwLejar && $pwLejar < $info[0]['shadowwarning'][0]) { - $_SESSION['alert'][] = 'info:account_warning:'.$pwLejar; - return _AUTH_SUCCESS; - } elseif ($pwLejar <= 0) { - $_SESSION['alert'][] = 'info:account_expired:'.abs($pwLejar); - if ($AUTH[$toPolicy]['onDisabled'] == 'refuse') $_SESSION['alert'][] = 'info:warn_account_disable:'.($info[0]['shadowinactive'][0]+$pwLejar); - if ($AUTH[$toPolicy]['onExpired'] == 'warning') { - return _AUTH_SUCCESS; - } elseif ($AUTH[$toPolicy]['onExpired'] == 'force update') { - return _AUTH_EXPIRED; - } else { - return _AUTH_FAILURE; - } - } - } // onExpired - // Ha idáig eljut, akkor minden rendben. - return _AUTH_SUCCESS; - - } // count == 1 - - } - -?> diff --git a/mayor-orig/www/include/backend/ldapng/base/attrs.php b/mayor-orig/www/include/backend/ldapng/base/attrs.php deleted file mode 100644 index 2ea07778..00000000 --- a/mayor-orig/www/include/backend/ldapng/base/attrs.php +++ /dev/null @@ -1,137 +0,0 @@ - 'uid', - 'userCn' => 'displayName', - 'mail' => 'mail', - 'studyId' => 'employeeNumber', // Ez konfig-ban külön van állítva, az itteni érték irreleváns - 'shadowLastChange' => 'shadowLastChange', - 'shadowWarning' => 'shadowWarning', - 'shadowMin' => 'shadowMin', - 'shadowMax' => 'shadowMax', - 'shadowExpire' => 'shadowExpire', - 'shadowInactive' => 'shadowInactive', - ); - - global $groupAttrToLDAP; - $groupAttrToLDAP = array( - 'groupCn' => 'cn', - 'groupDesc' => 'description', - 'member' => 'member', - ); - - global $ldapngAccountAttrDef; - $ldapngAccountAttrDef = array( - 'dn' => array('desc' => _LDAPDN, 'type' => 'text', 'rights' => 'rrr'), - 'cn' => array('desc' => _LDAPCN, 'type' => 'text', 'rights' => 'rrr'), - 'sn' => array('desc' => _LDAPSN, 'type' => 'text', 'rights' => 'wrr'), - 'givenname' => array('desc' => _LDAPGIVENNAME, 'type' => 'text'), - 'employeenumber' => array('desc' => _LDAPEMPLOYEENUMBER, 'type' => 'int', 'rights' => 'wrr'), - 'displayname' => array('desc' => _LDAPCN, 'type' => 'text', 'rights' => 'wrr'), - 'name' => array('desc' => _LDAPNAME, 'type' => 'text', 'rights' => 'r--'), - 'uid' => array('desc' => _LDAPUID, 'type' => 'text', 'rights' => 'rrr'), - 'uidnumber' => array('desc' => _LDAPUIDNUMBER, 'type' => 'int', 'rights' => 'w--'), - 'gidnumber' => array('desc' => _LDAPGIDNUMBER, 'type' => 'int', 'rights' => 'w--'), - 'mssfu30name' => array('desc' => _LDAPUID, 'type' => 'text', 'rights' => 'r--'), - 'unixhomedirectory' => array('desc' => _LDAPUNIXHOMEDIRECTORY, 'type' => 'text', 'rights' => 'wrr'), - 'loginshell' => array('desc' => _LDAPLOGINSHELL, 'type' => 'text', 'rights' => 'wrr'), - 'shadowlastchange' => array('desc' => _LDAPSHADOWLASTCHANGE, 'type' => 'text', 'rights' => 'wrr'), - 'shadowexpire' => array('desc' => _LDAPSHADOWEXPIRE, 'type' => 'text', 'rights' => 'wrr'), - 'shadowwarning' => array('desc' => _LDAPSHADOWWARNING, 'type' => 'text', 'rights' => 'wrr'), - 'shadowmin' => array('desc' => _LDAPSHADOWMIN, 'type' => 'text', 'rights' => 'wrr'), - 'shadowmax' => array('desc' => _LDAPSHADOWMAX, 'type' => 'text', 'rights' => 'wrr'), - 'shadowinactive' => array('desc' => _LDAPSHADOWINACTICE, 'type' => 'text', 'rights' => 'wrr'), -/* - 'gecos' => array('desc' => _LDAPGECOS, 'type' => 'text', 'rights' => 'w--'), - 'mail' => array('desc' => _LDAPMAIL, 'type' => 'text', 'rights' => 'wwr'), - 'telephonenumber' => array('desc' => _LDAPTELEPHONENUMBER, 'type' => 'text', 'rights' => 'ww-'), - 'mobile' => array('desc' => _LDAPMOBILE, 'type' => 'text', 'rights' => 'ww-'), - 'l' => array('desc' => _LDAPL, 'type' => 'text'), - 'street' => array('desc' => _LDAPSTREET, 'type' => 'text'), - 'postaladdress' => array('desc' => _LDAPPOSTALADDRESS, 'type' => 'text'), - 'postalcode' => array('desc' => _LDAPPOSTALCODE, 'type' => 'text'), -*/ - ); - - global $ldapngGroupAttrDef; - $ldapngGroupAttrDef = array( - 'cn' => array('desc' => _LDAPCN, 'type' => 'text','rights' => 'rrr'), - 'name' => array('desc' => _LDAPNAME, 'type' => 'text','rights' => 'rrr'), - 'samaccountname' => array('desc' => _LDAPSAMACCOUNTNAME, 'type' => 'text','rights' => 'wrr'), - 'description' => array('desc' => _LDAPDESCRIPTION, 'type' => 'text'), - 'gidnumber' => array('desc' => _LDAPGIDNUMBER, 'type' => 'int','rights' => 'w--'), - 'member' => array('desc' => _LDAPMEMBER, 'type' => 'select'), - 'objectcategory' => array('desc' => _LDAPOBJECTCATEGORY, 'type' => 'text','rights' => 'rrr'), - - 'memberuid' => array('desc' => _LDAPMEMBERUID, 'type' => 'select'), - ); - -?> diff --git a/mayor-orig/www/include/backend/ldapng/password/changePassword.php b/mayor-orig/www/include/backend/ldapng/password/changePassword.php deleted file mode 100644 index 039dda5d..00000000 --- a/mayor-orig/www/include/backend/ldapng/password/changePassword.php +++ /dev/null @@ -1,160 +0,0 @@ - diff --git a/mayor-orig/www/include/backend/ldapng/session/accountInfo.php b/mayor-orig/www/include/backend/ldapng/session/accountInfo.php deleted file mode 100644 index 03761dca..00000000 --- a/mayor-orig/www/include/backend/ldapng/session/accountInfo.php +++ /dev/null @@ -1,399 +0,0 @@ - mayor schema konverzió - for ($i = 0; $i < $result['count']; $i++) { - // Egységes szerkezetre alakítjuk, azaz a dn is indexelt - foreach ($backendAttrDef as $attr => $def) { - // Egységes szerkezetre alakítjuk, azaz a dn is indexelt - if ($attr == 'dn') $return[$i]['dn'] = array('count' => 1, 0 => $result[$i]['dn']); - elseif (isset($result[$i][$attr])) $return[$i][$attr] = $result[$i][$attr]; - else $return[$i][$attr] = array('count' => 0); - } - } - return $return[0]; - - } - - } - -############################################################# -# ldapGetUserInfo - felhasználói információk (keretrendszer) -############################################################# - - function ldapngGetUserInfo($userAccount, $toPolicy = _POLICY) { - - global $accountAttrToLDAP, $ldapAttrDef; - $userDn = LDAPuserAccountToDn($userAccount, $toPolicy); - - $result = getLDAPInfo($userDn, array_values($accountAttrToLDAP), $toPolicy); - if ($result === false) { - return false; - } else { - - $result[0]['dn'] = array('count' => 1, 0 => $result[0]['dn']); - // Egységes szerkezetre alakítjuk, azaz a dn is indexelt + LDAP --> MaYoR schema - foreach ($accountAttrToLDAP as $attr => $ldapAttr) { - $ldapAttr = kisbetus($ldapAttr); - if (isset($result[0][$ldapAttr])) $return[$attr] = $result[0][$ldapAttr]; - else $return[$attr] = array('count' => 0); - } - return $return; - - } - - } - -############################################################### -# ldapChangeAccountInfo - felhasználói információk módosítása -############################################################### - - function ldapngChangeAccountInfo($userAccount, $toPolicy = _POLICY) { - - global $AUTH, $backendAttrs, $backendAttrDef; - $userDn = LDAPuserAccountToDn($userAccount, $toPolicy); - - // Kapcsolódás az LDAP szerverhez - $ds = @ldap_connect($AUTH[$toPolicy]['ldapHostname']); - if (!$ds) { - $_SESSION['alert'][] = 'alert:ldap_connect_failure'; - return false; - } - - // Csatlakozás a szerverhez - $r = @ldap_bind($ds, _USERDN, _USERPASSWORD); - if (!$r) { - $_SESSION['alert'][] = 'message:ldap_bind_failure'; - ldap_close($ds); - return false; - } - - $emptyAttrs = explode(':',$_POST['emptyAttrs']); - $_alert = array(); - - // Attribútumonként módosítunk - foreach ($backendAttrs as $attr) { - - if ($backendAttrDef[$attr]['rights'] == '') $rigths = _DEFAULT_LDAP_RIGHTS; - else $rights = $backendAttrDef[$attr]['rights']; - - if ($rights[_ACCESS_AS] == 'w') { - $mod_info = $add_info = $del_info = Array(); - $values = array(); - - if ($backendAttrDef[$attr]['type'] == 'image') { - $file = $_FILES[$attr]['tmp_name']; - if (file_exists($file)) { - $fd = fopen($file,'r'); - $values[0]=fread($fd,filesize($file)); - fclose($fd); - } else { - // Sose töröljük! - $emptyAttrs[] = $attr; - } - } elseif ($backendAttrDef[$attr]['type'] == 'timestamp') { - if ($_POST[$attr][0] != '' and $_POST[$attr][1] != '' and $_POST[$attr][2] != '') { - $values[0] = $_POST[$attr][0].$_POST[$attr][1].$_POST[$attr][2].'010101Z'; - } - } else { - if ($backendAttrDef[$attr]['type'] != '' ) $values[0] = $_POST[$attr]; - } - - if ($backendAttrDef[$attr]['type'] == 'select') { - if ($_POST['new-'.$attr][0] != '') $add_info[$attr] = $_POST['new-'.$attr]; - if ($_POST['del-'.$attr][0] != '') $del_info[$attr] = $_POST['del-'.$attr]; - } elseif (in_array($attr,$emptyAttrs)) { - if ($values[0] != '') $add_info[$attr] = $values; - } else { - if ($values[0] != '') { - $mod_info[$attr] = $values; - } else { - $del_info[$attr] = Array(); - } - } - - if (count($add_info)!=0) { - if (!@ldap_mod_add($ds,$userDn,$add_info)) { - $_alert[] = 'message:insufficient_access:add:'.$attr; - } - } - if (count($mod_info)!=0) { - if (!@$r = ldap_mod_replace($ds,$userDn,$mod_info)) { - $_alert[] = 'message:insufficient_access:mod:'.$attr; - } - } - if (count($del_info)!=0) { - if (!@ldap_mod_del($ds,$userDn,$del_info)) { - $_alert[] = 'message:insufficient_access:del:'.$attr; - } - } - - } else { -// $_alert[] = 'message:insufficient_access:'.$attr; - } - } // foreach - - ldap_close($ds); - if (count($_alert) == 0) $_SESSION['alert'][] = 'info:change_success'; - else for ($i = 0;$i < count($_alert);$i++) $_SESSION['alert'][] = $_alert[$i]; - - } - -########################################################### -# ldapGetGroupInfo - csoport információk (backend) -########################################################### - - function ldapngGetGroupInfo($groupCn, $toPolicy = _POLICY) { - - global $backendAttrs, $backendAttrDef; - - - if (!isset($backendAttrs)) list($backendAttrs, $backendAttrDef) = getBackendAttrs('Group', $toPolicy); - - $groupDn = LDAPgroupCnToDn($groupCn, $toPolicy); - - $result = getLDAPInfo($groupDn, $backendAttrs, $toPolicy); - if ($result === false) { - return false; - } else { - - // Accountok lekérdezése - $info = getLDAPaccounts($toPolicy); - for ($i = 0; $i < $info['count']; $i++) { - $accountUid[] = array( - 'value' => $info[$i]['uid'][0], - 'txt' => $info[$i]['displayname'][0] - ); - $accountDn[] = array( - 'value' => $info[$i]['dn'], - 'txt' => $info[$i]['displayname'][0] - ); - } - - // LDAP schema --> mayor schema konverzió - for ($i = 0; $i < $result['count']; $i++) { - // Egységes szerkezetre alakítjuk, azaz a dn is indexelt - foreach ($backendAttrDef as $attr => $def) { - // Egységes szerkezetre alakítjuk, azaz a dn is indexelt - if ($attr == 'dn') $return[$i]['dn'] = array('count' => 1, 0 => $result[$i]['dn']); - elseif (isset($result[$i][$attr])) $return[$i][$attr] = $result[$i][$attr]; - else $return[$i][$attr] = array('count' => 0); - } - $return[$i]['member']['new'] = $accountDn; - $return[$i]['memberuid']['new'] = $accountUid; - } - - return $return[0]; - - } - - } - -############################################################### -# ldapChangeGroupInfo - csoport információk módosítása -############################################################### - - function ldapngChangeGroupInfo($groupCn, $toPolicy = _POLICY) { - -// !!!! A memberuid / member szinkronjára nem figyel!! - - global $AUTH, $backendAttrs, $backendAttrDef; - $groupDn = LDAPgroupCnToDn($groupCn, $toPolicy); - - // Kapcsolódás az LDAP szerverhez - $ds = @ldap_connect($AUTH[$toPolicy]['ldapHostname']); - if (!$ds) { - $_SESSION['alert'][] = 'alert:ldap_connect_failure'; - return false; - } - - // Csatlakozás a szerverhez - $r = @ldap_bind($ds, _USERDN, _USERPASSWORD); - - if (!$r) { - $_SESSION['alert'][] = 'message:ldap_bind_failure'; - ldap_close($ds); - return false; - } - - $emptyAttrs = explode(':',$_POST['emptyAttrs']); - $_alert = array(); - - // Attribútumonként módosítunk - foreach ($backendAttrs as $attr) { - - if ($backendAttrDef[$attr]['rights'] == '') $rigths = _DEFAULT_LDAP_RIGHTS; - else $rights = $backendAttrDef[$attr]['rights']; - - if ($rights[_ACCESS_AS] == 'w') { - - $mod_info = $add_info = $del_info = Array(); - $values = array(); - - if ($backendAttrDef[$attr]['type'] == 'image') { - $file = $_FILES[$attr]['tmp_name']; - if (file_exists($file)) { - $fd = fopen($file,'r'); - $values[0]=fread($fd,filesize($file)); - fclose($fd); - } else { - // Sose töröljük! - $emptyAttrs[] = $attr; - } - } elseif ($backendAttrDef[$attr]['type'] == 'timestamp') { - if ($_POST[$attr][0] != '' and $_POST[$attr][1] != '' and $_POST[$attr][2] != '') { - $values[0] = $_POST[$attr][0].$_POST[$attr][1].$_POST[$attr][2].'010101Z'; - } - } else { - if ($backendAttrDef[$attr]['type'] != '') - if (isset($_POST[$attr])) $values[0] = $_POST[$attr]; - else $values[0] = ''; - } - - if ($backendAttrDef[$attr]['type'] == 'select') { - if (isset($_POST['new-'.$attr][0]) && $_POST['new-'.$attr][0] != '') $add_info[$attr] = $_POST['new-'.$attr]; - if (isset($_POST['del-'.$attr][0]) && $_POST['del-'.$attr][0] != '') $del_info[$attr] = $_POST['del-'.$attr]; - } elseif (in_array($attr,$emptyAttrs)) { - if ($values[0] != '') $add_info[$attr] = $values; - } else { - if ($values[0] != '') { - $mod_info[$attr] = $values; - } else { - $del_info[$attr] = Array(); - } - - } - - if (count($add_info)!=0) { - if (!@ldap_mod_add($ds,$groupDn,$add_info)) { - $_alert[] = 'message:insufficient_access:add:'.$attr; - } - } - if (count($mod_info)!=0) { - if (!@ldap_mod_replace($ds,$groupDn,$mod_info)) { - $_alert[] = 'message:insufficient_access:mod:'.$attr; - } - } - if (count($del_info)!=0) { - if (!@ldap_mod_del($ds,$groupDn,$del_info)) { - $_alert[] = 'message:insufficient_access:del:'.$attr; - } - } - - } else { -// $_alert[] = 'message:insufficient_access:'.$attr; - } - } // foreach - - ldap_close($ds); - if (count($_alert) == 0) $_SESSION['alert'][] = 'info:change_success'; - else for ($i=0;$i diff --git a/mayor-orig/www/include/backend/ldapng/session/base.php b/mayor-orig/www/include/backend/ldapng/session/base.php deleted file mode 100644 index a4eff43d..00000000 --- a/mayor-orig/www/include/backend/ldapng/session/base.php +++ /dev/null @@ -1,190 +0,0 @@ - 1 ) { - // Több ilyen uid is van - $_SESSION['alert'][] = "message:multi_uid:$userAccount"; - return false; - } - - if ($info['count']==1) { // Van - egy - ilyen felhasználó - return $info[0]['dn']; - } - - } - - -###################################################### -# A groupCn(cn)-hez tartozó dn lekérdezése -###################################################### - - function LDAPgroupCnToDn($groupCn, $toPolicy = _POLICY) { - - global $AUTH; - - // Nézzük, hogy van-e át"map"-elt csoport! - if (isset($AUTH[$toPolicy]['categoryMap'][ekezettelen($groupCn)])) { - return $AUTH[$toPolicy]['categoryMap'][ekezettelen($groupCn)]; - } - - // Kapcsolódás a szerverhez - $ds = @ldap_connect($AUTH[$toPolicy]['ldapHostname']); - if (!$ds) { - $_SESSION['alert'][] = 'alert:ldap_connect_failure'; - return false; - } - - // Csatlakozás a szerverhez - $r = @ldap_bind($ds,$AUTH[$toPolicy]['ldapUser'],$AUTH[$toPolicy]['ldapPw']); - if (!$r) { - $_SESSION['alert'][] = 'message:ldap_bind_failure'; - return false; - } - - // Van-e ilyen csoport? - $filter="(&(".$AUTH[$toPolicy]['ldapGroupCnAttr']."=$groupCn)(objectClass=".$AUTH[$toPolicy]['ldapGroupObjectClass']."))"; - $justthese=array($AUTH[$toPolicy]['ldapGroupCnAttr']); - $sr = ldap_search($ds, $AUTH[$toPolicy]['ldapBaseDn'], $filter, $justthese); - if (!$sr) { - $_SESSION['alert'][] = "message:ldap_search_failure"; - ldap_close($ds); - return false; - } - $info=ldap_get_entries($ds,$sr); - ldap_close($ds); - - if ( $info['count'] === 0 ) { - // Nincs ilyen groupCn (cn) - hibaüzenet csak akkor, ha nem kategóriáról van szó... - if (!in_array($groupCn, array_map('ekezettelen', $AUTH[$toPolicy]['categories']))) $_SESSION['alert'][] = "message:no_group:$groupCn"; - return false; - } elseif ( $info['count'] > 1 ) { - // Több ilyen cn is van - $_SESSION['alert'][] = "message:multi_gid:$groupCn"; - return false; - } - - if ($info['count']==1) { // Van - egy - ilyen csoport - return $info[0]['dn']; - } - - } - -###################################################### -# memberOf - csoport tag-e -###################################################### - - function ldapngMemberOf($userAccount, $group, $toPolicy = _POLICY) { - - global $AUTH; - - $userDn = LDAPuserAccountToDn($userAccount, $toPolicy); - /* Kis hack: csoport-tagság helyett vizsgáljuk előbb a megfelelő szervezeti egységet... de ezt nem biztos, hogy érdemes... */ - if (in_array($group, $AUTH[$toPolicy]['categories'])) { - if (strpos($userDn, ',ou='.ekezettelen($group).',') !== false) return true; - } - - if (substr($group,0,3) != 'cn=') { - $groupDn = LDAPgroupCnToDn(ekezettelen($group)); - if (!$groupDn) return false; // Ha nincs ilyen csoport az LDAP fában - } else { - $groupDn = $group; - } - - // Kapcsolódás az LDAP szerverhez - $ds = @ldap_connect($AUTH[$toPolicy]['ldapHostname']); - if (!$ds) { - $_SESSION['alert'][] = 'alert:ldap_connect_failure'; - return false; - } - - // Csatlakozás a szerverhez - $r = @ldap_bind($ds,$AUTH[$toPolicy]['ldapUser'],$AUTH[$toPolicy]['ldapPw']); - if (!$r) { - $_SESSION['alert'][] = 'message:ldap_bind_failure'; - ldap_close($ds); - return false; - } - - $justthese = array('cn'); // valamit le kell kérdezni... - // OpenLDAP a tagok azonosítóját tárolja el (memberUid), más rendszerek a dn-t (member) - $filter = "(&(objectClass=".$AUTH[$toPolicy]['ldapGroupObjectClass'].")(|(member=$userDn)(memberUid=$userAccount)))"; - $sr = @ldap_search($ds, $groupDn, $filter, $justthese); - if (!$sr) { - $_SESSION['alert'][] = "message:ldap_search_failure:group=$group; filter=".$filter; - ldap_close($ds); - return false; - } - - $info = ldap_get_entries($ds, $sr); - ldap_close($ds); - - if ($info['count'] > 0) { - return true; - } else { - return false; - } - - } - -?> diff --git a/mayor-orig/www/include/backend/ldapng/session/createAccount.php b/mayor-orig/www/include/backend/ldapng/session/createAccount.php deleted file mode 100644 index 96a5b557..00000000 --- a/mayor-orig/www/include/backend/ldapng/session/createAccount.php +++ /dev/null @@ -1,157 +0,0 @@ - a konténer elem - ha nincs, akkor CN=Users alá rakja - category => tanár, diák... egy kiemelt fontosságú csoport tagság - groups => egyéb csoportok - policyAttrs => policy függő attribútumok - ) - */ - function ldapngCreateAccount( - $userCn, $userAccount, $userPassword, $toPolicy, $SET - ) { - - global $AUTH; - - $shadowLastChange = floor(time() / (60*60*24)); - - // $toPolicy --> ldap backend - ellenőrzés! - if ($AUTH[$toPolicy]['backend'] != 'ldapng') { - $_SESSION['alert'][] = 'page:wrong_backend:'.$AUTH[$toPolicy]['backend']; - return false; - } - - // Kapcsolódás az LDAP szerverhez - $ds = @ldap_connect($AUTH[$toPolicy]['ldapHostname']); - if (!$ds) { - $_SESSION['alert'][] = 'alert:ldap_connect_failure'; - return false; - } - - // Csatlakozás a szerverhez - $r = @ldap_bind($ds, _USERDN, _USERPASSWORD); - if (!$r) { - $_SESSION['alert'][] = 'message:ldap_bind_failure'; - ldap_close($ds); - return false; - } - - $info = $ginfo = Array(); - - // uid ütközés ellenőrzése - $filter = "(sAMAccountName=$userAccount)"; - $justthese = array('sAMAccountName'); - $sr = ldap_search($ds, $AUTH[$toPolicy]['ldapBaseDn'], $filter, $justthese); - $uinfo = ldap_get_entries($ds, $sr); - $uidCount = $uinfo['count']; - ldap_free_result($sr); - if ($uidCount > 0) { - $_SESSION['alert'][] = 'message:multi_uid:'.$userAccount; - return false; - } - - // Az következő uidNumber megállapítása - $filter = "(&(objectclass=".$AUTH[$toPolicy]['ldapUserObjectClass'].")(uidNumber=*))"; - $justthese = array('uidNumber', 'msSFU30UidNumber'); - $sr = ldap_search($ds,$AUTH[$toPolicy]['ldapBaseDn'], $filter, $justthese); - ldap_sort($ds, $sr, 'uidNumber'); - $uinfo = ldap_get_entries($ds, $sr); - ldap_free_result($sr); - if (isset($uinfo['count']) && $uinfo['count'] > 0) $info['uidNumber'] = array($uinfo[ $uinfo['count']-1 ]['uidnumber'][0]+1); - else $info['uidNumber'] = array(1001); - - // shadow attributumok... - // A shadowLastChange a mai nap // if (isset($AUTH[$toPolicy]['shadowlastchange']) && $AUTH[$toPolicy]['shadowlastchange'] != '') - $info['shadowLastChange'] = array($shadowLastChange); - if (isset($AUTH[$toPolicy]['shadowMin']) && $AUTH[$toPolicy]['shadowMin'] != '') $info['shadowMin'] = array($AUTH[$toPolicy]['shadowMin']); - if (isset($AUTH[$toPolicy]['shadowMax']) && $AUTH[$toPolicy]['shadowMax'] != '') $info['shadowMax'] = array($AUTH[$toPolicy]['shadowMax']); - if (isset($AUTH[$toPolicy]['shadowWarning']) && $AUTH[$toPolicy]['shadowWarning'] != '') $info['shadowWarning'] = array($AUTH[$toPolicy]['shadowWarning']); - if (isset($AUTH[$toPolicy]['shadowInactive']) && $AUTH[$toPolicy]['shadowInactive'] != '') $info['shadowInactive'] = array($AUTH[$toPolicy]['shadowInactive']); - if (isset($AUTH[$toPolicy]['shadowExpire']) && $AUTH[$toPolicy]['shadowWxpire'] != '') $info['shadowExpire'] = array($AUTH[$toPolicy]['shadowExpire']); - - // A szokásos attribútumok - $Name = explode(' ',$userCn); - $Dn = ldap_explode_dn($AUTH[$toPolicy]['ldapBaseDn'], 1); unset($Dn['count']); - $info['userPrincipalName'] = array( $userAccount.'@'.implode('.', $Dn)); - $info['msSFU30Name'] = $info['sAMAccountName'] = $info['cn'] = array($userAccount); - $info['displayName'] = array($userCn); - $info['sn'] = array($Name[0]); - $info['givenName'] = array($Name[ count($Name)-1 ]); - $info['unixUserPassword'] = array('ABCD!efgh12345$67890'); - $info['unixHomeDirectory'] = array(ekezettelen("/home/$userAccount")); - $info['loginShell'] = array('/bin/bash'); - $info['objectClass'] = array($AUTH[$toPolicy]['ldapUserObjectClass'], 'user'); - - $policyAccountAttrs = $SET['policyAttrs']; - if (isset($policyAccountAttrs['studyId'])) $info[ $AUTH[$toPolicy]['ldapStudyIdAttr'] ] = array($policyAccountAttrs['studyId']); - foreach ($policyAccountAttrs as $attr => $value) - if ($attr != 'studyId' && isset($accountAttrToLDAP[$attr])) - $info[ $accountAttrToLDAP[$attr] ] = array($value); - - if (isset($SET['container'])) $dn = "CN=$userAccount,".$SET['container']; - else $dn = "CN=$userAccount,CN=Users,".$AUTH[$toPolicy]['ldapBaseDn']; - - // user felvétel - $_r1 = @ldap_add($ds,$dn,$info); - if (!$_r1) { - $_SESSION['alert'][] = 'message:ldap_error:Add user:'.ldap_error($ds); - //echo $dn.'
'; var_dump($info); echo '
'; - return false; - } - - // Jelszó beállítás - if (!changePassword($userAccount, $userPassword, $toPolicy)) $_SESSION['alert'][] = 'message:ldap_error:changePassword failed:'.$userAccount; - - // Engedélyezés - $einfo = array('userAccountControl' => array(512)); /* Normal account = 512 */ - $_r1 = @ldap_mod_replace($ds,$dn,$einfo); - if (!$_r1) { - $_SESSION['alert'][] = 'message:ldap_error:Enable user:'.ldap_error($ds); - //echo $dn.'
'; var_dump($info); echo '
'; - return false; - } - - // Kategória csoportba és egyéb csoportokba rakás - if (isset($SET['category'])) { - if (is_array($SET['groups'])) array_unshift($SET['groups'], $SET['category']); - else $SET['groups'] = array($SET['category']); - - $ginfo['member'] = $dn; - - for ($i = 0; $i < count($SET['groups']); $i++) { - $groupDn = LDAPgroupCnToDn($SET['groups'][$i], $toPolicy); - if ($groupDn !== false) { - $_r3 = @ldap_mod_add($ds, $groupDn, $ginfo); - if (!$_r3) { - $_SESSION['alert'][] = 'message:ldap_error:Add to group '.$SET['groups'][$i].':'.ldap_error($ds); - //echo $SET['groups'][$i].'
'; var_dump($ginfo); echo '
'; - } - } - } - } - - ldap_close($ds); - - if (defined('_DATADIR') - && isset($AUTH[$toPolicy]['createAccountScript']) - && file_exists(_DATADIR) - ) { - $sfp = fopen(_DATADIR.'/'.$AUTH[$toPolicy]['createAccountScript'],'a+'); - if ($sfp) { - fwrite($sfp,"\n# $userAccount létrehozása: userAccount uidNumber homeDirectory\n"); - fwrite($sfp,"createAccount.sh '$userAccount' '".$info['uidNumber'][0]."' '".$info['unixHomeDirectory'][0]."'\n"); - fclose($sfp); - } - } - $_SESSION['alert'][] = 'info:create_uid_success:'.$dn; - return true; - - } - -?> diff --git a/mayor-orig/www/include/backend/ldapng/session/createGroup.php b/mayor-orig/www/include/backend/ldapng/session/createGroup.php deleted file mode 100644 index 78def54d..00000000 --- a/mayor-orig/www/include/backend/ldapng/session/createGroup.php +++ /dev/null @@ -1,82 +0,0 @@ - ldap backend - ellenőrzés! - if ($AUTH[$toPolicy]['backend'] != 'ldapng') { - $_SESSION['alert'][] = 'page:wrong_backend:'.$AUTH[$toPolicy]['backend']; - return false; - } - - // Kapcsolódás az LDAP szerverhez - $ds = @ldap_connect($AUTH[$toPolicy]['ldapHostname']); - if (!$ds) { - $_SESSION['alert'][] = 'alert:ldap_connect_failure'; - return false; - } - - // Csatlakozás a szerverhez - $r = @ldap_bind($ds, _USERDN, _USERPASSWORD); - if (!$r) { - $_SESSION['alert'][] = 'message:ldap_bind_failure'; - ldap_close($ds); - return false; - } - - $info = $ginfo = Array(); - - // cn ütközés ellenőrzése - $filter = "(&(objectclass=".$AUTH[$toPolicy]['ldapGroupObjectClass'].")(cn=$groupCn))"; - $justthese = array('cn'); - $sr = ldap_search($ds, $AUTH[$toPolicy]['ldapBaseDn'], $filter, $justthese); - $ginfo = ldap_get_entries($ds, $sr); - $gCount = $ginfo['count']; - ldap_free_result($sr); - if ($gCount > 0) { - $_SESSION['alert'][] = 'message:multi_uid:'.$groupCn; - return false; - } - - // Az következő gidNumber megállapítása - $filter = "(&(objectclass=".$AUTH[$toPolicy]['ldapGroupObjectClass'].")(gidNumber=*))"; - $justthese = array('gidNumber', 'msSFU30GidNumber'); - $sr = ldap_search($ds,$AUTH[$toPolicy]['ldapBaseDn'], $filter, $justthese); - ldap_sort($ds, $sr, 'gidNumber'); - $ginfo = ldap_get_entries($ds, $sr); - ldap_free_result($sr); - if (isset($ginfo['count']) && $ginfo['count'] > 0) $info['gidNumber'] = array($ginfo[ $ginfo['count']-1 ]['gidnumber'][0]+1); - else $info['gidNumber'] = array(1001); - - // A szokásos attribútumok - $info['sAMAccountName'] = $info['cn'] = array($groupCn); - $info['description'] = array($groupDesc); - - // A kategória függő attribútumok - if (isset($SET['container'])) $dn = "CN=$groupCn,".$SET['container']; - else $dn = "CN=$groupCn,OU=$category,".$AUTH[$toPolicy]['ldapBaseDn']; - - // objectum osztályok - $info['objectClass'] = array($AUTH[$toPolicy]['ldapGroupObjectClass']); - - // csoport felvétel - $_r1 = ldap_add($ds,$dn,$info); - if (!$_r1) { - printf("LDAP-Error: %s
\n", ldap_error($ds)); - var_dump($info); - } - - ldap_close($ds); - - $_SESSION['alert'][] = 'info:create_group_success:'.$dn; - return true; - - } - -?> diff --git a/mayor-orig/www/include/backend/ldapng/session/search/searchAccount.php b/mayor-orig/www/include/backend/ldapng/session/search/searchAccount.php deleted file mode 100644 index 74d285e6..00000000 --- a/mayor-orig/www/include/backend/ldapng/session/search/searchAccount.php +++ /dev/null @@ -1,271 +0,0 @@ - mayor schema konverzió - for ($i = 0; $i < $result['count']; $i++) { - // Egységes szerkezetre alakítjuk, azaz a dn is indexelt - $result[$i]['dn'] = $return[$i]['userAccount'] = array('count' => 1, 0 => $result[$i]['dn']); - for ($j = 0; $j < count($searchAttrs); $j++) { - $a = $searchAttrs[$j]; - if (isset($result[$i][ kisbetus($accountAttrToLDAP[$a]) ])) { - if ($accountAttrToLDAP[$a] != '') $return[$i][$a] = $result[$i][ kisbetus($accountAttrToLDAP[$a]) ]; - else $return[$i][$a] = $result[$i][$a]; - } else { - $return[$i][$a] = array('count' => 0) ; - } - } - $return[$i]['category'] = getAccountCategories($return[$i]['userAccount'][0], $toPolicy); - $return[$i]['category']['count'] = count($return[$i]['category']); - } - $return['count'] = $result['count']; - - return $return; - - } - - } - -###################################################### -# ldapSearchGroup - csoport kereső függvény -###################################################### - - function ldapngSearchGroup($attr, $pattern, $searchAttrs = array('groupCn, groupDesc'), $toPolicy = _POLICY) { - - global $groupAttrToLDAP, $AUTH; - - // A keresendő attribútum konvertálása LDAP attribútummá - if ($groupAttrToLDAP[ $attr ] != '') $attrLDAP = $groupAttrToLDAP[ $attr ]; - else $attrLDAP = $attr; - if ($attrLDAP == 'dn') $attrLDAP = 'cn'; // dn-re nem megy a keresés!! - - // A lekérendő adtibútumok konvertálása LDAP attribútummá - for ($i = 0; $i < count($searchAttrs); $i++) { - if ($groupAttrToLDAP[ $searchAttrs[$i] ] != '') $searchAttrsLDAP[$i] = $groupAttrToLDAP[ $searchAttrs[$i] ]; - else $searchAttrsLDAP[$i] = $searchAttrs[$i]; - } - - $result = LDAPSearch($attrLDAP, $pattern, $searchAttrsLDAP, '(objectclass='.$AUTH[$toPolicy]['ldapGroupObjectClass'].')', $toPolicy); - if ($result === false) { - return false; - } else { - - // LDAP schema --> mayor schema konverzió - for ($i = 0; $i < $result['count']; $i++) { - // Egységes szerkezetre alakítjuk, azaz a dn is indexelt - $result[$i]['dn'] = $return[$i]['groupCn'] = array('count' => 1, 0 => $result[$i]['dn']); - for ($j = 0; $j < count($searchAttrs); $j++) { - $a = $searchAttrs[$j]; - if (!isset($groupAttrToLDAP[$a]) || $groupAttrToLDAP[$a] != '') { - if (isset($result[$i][ $groupAttrToLDAP[$a] ])) $return[$i][$a] = $result[$i][ $groupAttrToLDAP[$a] ]; - else $return[$i][$a] = ''; - } else { - $return[$i][$a] = $result[$i][$a]; - } - } - } - $return['count'] = $result['count']; - - return $return; - - } - - } - -###################################################### -# ldapDeleteAccount - account törlése -###################################################### - - function ldapngDeleteAccount($userAccount, $toPolicy = _POLICY) { - - global $AUTH; - - // $toPolicy --> ldapng backend - ellenőrzés - if ($AUTH[$toPolicy]['backend'] != 'ldapng') { - $_SESSION['alert'][] = 'page:wrong_backend:ldapng!='.$AUTH[$toPolicy]['backend']; - return false; - } - - $userDn = LDAPuserAccountToDn($userAccount, $toPolicy); - if ($userDn === false) return false; - - // Kapcsolódás az LDAP szerverhez - $ds = @ldap_connect($AUTH[$toPolicy]['ldapHostname']); - if (!$ds) { - $_SESSION['alert'][] = 'alert:ldap_connect_failure'; - return false; - } - - // Csatlakozás a szerverhez - $r = @ldap_bind($ds, _USERDN, _USERPASSWORD); - if (!$r) { - $_SESSION['alert'][] = 'message:ldap_bind_failure'; - ldap_close($ds); - return false; - } - - // Az uidNumber, a unixHomeDirectory lekerdezése - $filter = "(&(objectclass=".$AUTH[$toPolicy]['ldapUserObjectClass'].")(!(objectclass=computer)))"; - $justthese = array('uidNumber','unixHomedirectory'); - $sr = @ldap_search($ds,$userDn,$filter,$justthese); - if (!$sr) { - $_SESSION['alert'][] = "message:ldap_search_failure:".$userDn; - ldap_close($ds); - return false; - } ; - - $info = @ldap_get_entries($ds,$sr); - $uidNumber = $info[0]['uidnumber'][0]; - $homeDirectory = $info[0]['unixhomedirectory'][0]; - $uid=$userAccount; - - // user törlése - if (!@ldap_delete($ds,$userDn)) { - $_SESSION['alert'][] = 'message:ldap_delete_failure:user:'.$userAccount; - } - - ldap_close($ds); - - /* - Ha van megadva deleteAccountScript paraméter, akkor abba bejegyzi a törölt felhasználó adatait. - A meghívott deleteAccount.sh nincs definiálva, testreszabható, megkötés egyedül a paraméter - lista: userAccount, uidNumber, homeDirectory - */ - if (defined('_DATADIR') - && isset($AUTH[$toPolicy]['deleteAccountScript']) - && file_exists(_DATADIR) - ) { - $sfp = fopen(_DATADIR.'/'.$AUTH[$toPolicy]['deleteAccountScript'],'a+'); - if ($sfp) { - fwrite($sfp,"\n# $userAccount törlése: userAccount uidNumber homeDirectory\n"); - fwrite($sfp,"deleteAccount.sh '$userAccount' '$uidNumber' '$homeDirectory'\n"); - fclose($sfp); - } - } - - $_SESSION['alert'][] = 'info:delete_uid_success:'.$userDn; - return true; - - } - -###################################################### -# ldapDeleteGroup - account törlése -###################################################### - - function ldapngDeleteGroup($groupCn, $toPolicy = _POLICY) { - - global $AUTH; - - // $toPolicy --> ldapng backend - ellenőrzés - if ($AUTH[$toPolicy]['backend'] != 'ldapng') { - $_SESSION['alert'][] = 'page:wrong_backend:ldapng!='.$AUTH[$toPolicy]['backend']; - return false; - } - - $groupDn = LDAPgroupCnToDn($groupCn, $toPolicy); - if ($groupDn === false) return false; - - // Kapcsolódás az LDAP szerverhez - $ds = @ldap_connect($AUTH[$toPolicy]['ldapHostname']); - if (!$ds) { - $_SESSION['alert'][] = 'alert:ldap_connect_failure'; - return false; - } - - // Csatlakozás a szerverhez - $r = @ldap_bind($ds, _USERDN, _USERPASSWORD); - if (!$r) { - $_SESSION['alert'][] = 'message:ldap_bind_failure'; - ldap_close($ds); - return false; - } - - if (!@ldap_delete($ds, $groupDn)) { - $_SESSION['alert'][] = 'message:ldap_delete_failure:group:'.$groupCn; - } - - ldap_close($ds); - - $_SESSION['alert'][] = 'info:delete_group_success:'.$groupCn; - return true; - - } - - -?> diff --git a/mayor-orig/www/include/backend/mysql/auth/login.php b/mayor-orig/www/include/backend/mysql/auth/login.php deleted file mode 100644 index caa7929d..00000000 --- a/mayor-orig/www/include/backend/mysql/auth/login.php +++ /dev/null @@ -1,144 +0,0 @@ - 'userAuthentication/sql')); - if (!$lr) return _AUTH_FAILURE; - - // Van-e ilyen azonosító - $q = "SELECT COUNT(*) FROM accounts WHERE userAccount='%s' AND policy='%s'"; - $num = db_query($q, array('fv' => 'userAuthentication', 'modul' => $modul, 'result' => 'value', 'values' => array($userAccount, $toPolicy)), $lr); - if ($num == 0) { - // Nincs ilyen azonosító - $_SESSION['alert'][] = 'message:no_account:'."$userAccount:$toPolicy"; - db_close($lr); - return _AUTH_FAILURE_1; - } elseif ($num > 1) { - // Több ilyen azonosító is va - $_SESSION['alert'][] = 'message:multy_uid'; - db_close($lr); - return _AUTH_FAILURE_2; - } - - // Ha csak egy van, akkor jó-e a jelszava - $q = "SELECT userCn, studyId, shadowLastChange, shadowMin, shadowMax, shadowWarning, shadowInactive, shadowExpire - FROM accounts WHERE userAccount='%s' AND userPassword=sha('%s') AND policy='%s'"; - $ret = db_query($q, array('fv' => 'userAuthentication', 'modul' => 'login', 'result' => 'record', 'values' => array($userAccount, $userPassword, $toPolicy)), $lr); - db_close($lr); - if (!is_array($ret) || count($ret) == 0) { - // Nincs ilyen rekord => rossz a jelszó - $_SESSION['alert'][] = 'message:bad_pw'; - return _AUTH_FAILURE_3; - } else { - // Ha van, akkor csak egy ilyen sor lehet - $accountInformation['cn'] = $ret['userCn']; - $accountInformation['studyId'] = $ret['studyId']; - $shadowLastChange = $ret['shadowLastChange']; - $shadowMin = $ret['shadowMin']; - $shadowMax = $ret['shadowMax']; - $shadowWarning = $ret['shadowWarning']; - $shadowInactive = $ret['shadowInactive']; - $shadowExpire = $ret['shadowExpire']; - - // A lejárat ideje a shadowExpire és shadowLastChange+shadowMax kötül a kisebbik - if (intval($shadowExpire) != 0) $expireTimestamp = $shadowExpire; - if ( - intval($shadowMax) != 0 && - ( - !isset($expireTimestamp) || - $expireTimestamp > $shadowLastChange + $shadowMax - ) - ) $expireTimestamp = $shadowLastChange + $shadowMax; - // lejárt, ha lejárat ideje már elmúlt - $accountExpired = (isset($expireTimestamp) && ($expireTimestamp <= floor(time()/(60*60*24)))); - - // Le van-e tiltva - if ( // onDisabled: none | refuse - $AUTH[$toPolicy]['onDisabled'] == 'refuse' && - isset($expireTimestamp) && - $expireTimestamp + $shadowInactive <= floor(time()/(60*60*24)) - ) { - // Le van tiltva - $_SESSION['alert'][] = 'message:account_disabled:'.strval(floor(time()/(60*60*24))); - return _AUTH_FAILURE_4; - } // onDisabled - - // Lejárt-e az azonosító - if ($AUTH[$toPolicy]['onExpired'] != 'none' && isset($expireTimestamp)) { // onExpired: none | warning | force update - // Lejárt-e - $pwLejar = $expireTimestamp - floor(time()/(60*60*24)); - if (0 < $pwLejar && $pwLejar < $shadowWarning) { - $_SESSION['alert'][] = 'info:account_warning:'.$pwLejar; - return _AUTH_SUCCESS; - } elseif ($pwLejar <= 0) { - $_SESSION['alert'][] = 'info:account_expired:'.abs($pwLejar); - if ($AUTH[$toPolicy]['onDisabled'] == 'refuse') - $_SESSION['alert'][] = 'info:warn_account_disable:'.($shadowInactive+$pwLejar); - if ($AUTH[$toPolicy]['onExpired'] == 'warning') { - return _AUTH_SUCCESS; - } elseif ($AUTH[$toPolicy]['onExpired'] == 'force update') { - return _AUTH_EXPIRED; - } - } - } // onExpired - return _AUTH_SUCCESS; - - } -} - -?> diff --git a/mayor-orig/www/include/backend/mysql/base/attrs.php b/mayor-orig/www/include/backend/mysql/base/attrs.php deleted file mode 100644 index b945d764..00000000 --- a/mayor-orig/www/include/backend/mysql/base/attrs.php +++ /dev/null @@ -1,48 +0,0 @@ - array('desc' => _MYSQLUID, 'type' => 'text', 'rights' => 'rrr'), - 'policy' => array('desc' => _MYSQLPOLICY, 'type' => 'text', 'rights' => 'r--'), - 'useraccount' => array('desc' => _MYSQLUIDNUMBER, 'type' => 'text','rights' => 'r--'), - 'userCn' => array('desc' => _MYSQLCN, 'type' => 'text', 'rights' => 'wrr'), - 'studyId' => array('desc' => _MYSQLSTUDYID, 'type' => 'int', 'rights' => 'wrr'), - 'mail' => array('desc' => _MYSQLMAIL, 'type' => 'text', 'rights' => 'wwr'), - 'telephoneNumber' => array('desc' => _MYSQLTELEPHONENUMBER, 'type' => 'text', 'rights' => 'ww-'), -// 'userPassword' => array('desc' => _MYSQLUSERPASSWORD, 'type' => 'text', 'rights' => 'r--'), - 'shadowLastChange' => array('desc' => _MYSQLSHADOWLASTCHANGE, 'type' => 'text', 'rights' => 'wrr'), - 'shadowExpire' => array('desc' => _MYSQLSHADOWEXPIRE, 'type' => 'text', 'rights' => 'wrr'), - 'shadowWarning' => array('desc' => _MYSQLSHADOWWARNING, 'type' => 'text', 'rights' => 'wrr'), - 'shadowMin' => array('desc' => _MYSQLSHADOWMIN, 'type' => 'text', 'rights' => 'wrr'), - 'shadowMax' => array('desc' => _MYSQLSHADOWMAX, 'type' => 'text', 'rights' => 'wrr'), - 'shadowInactive' => array('desc' => _MYSQLSHADOWINACTICE, 'type' => 'text', 'rights' => 'wrr'), - ); - - global $mysqlGroupAttrDef; - $mysqlGroupAttrDef = array( - 'gid' => array('desc' => _MYSQLGID, 'type' => 'text', 'rights' => 'rrr'), - 'groupDesc' => array('desc' => _MYSQLGROUPDESC, 'type' => 'text', 'rights' => 'wrr'), - 'policy' => array('desc' => _MYSQLPOLICY, 'type' => 'int', 'rights' => 'r--'), - 'member' => array('desc' => _MYSQLMEMBER, 'type' => 'select', 'rights' => 'w--'), - ); - - -?> diff --git a/mayor-orig/www/include/backend/mysql/password/changePassword.php b/mayor-orig/www/include/backend/mysql/password/changePassword.php deleted file mode 100644 index 2875bace..00000000 --- a/mayor-orig/www/include/backend/mysql/password/changePassword.php +++ /dev/null @@ -1,75 +0,0 @@ - 'changeMyPassword')); - - if (!$lr) return false; - - // Stimmel-e az azonosító/jelszó/policy hármas - $q = "SELECT COUNT(*) FROM accounts WHERE userAccount='%s' AND userPassword=sha('%s') AND policy='%s'"; - $num = db_query($q, array('fv' => 'changeMyPassword', 'modul' => $modul, 'result' => 'value', 'values' => array($userAccount, $userPassword, $toPolicy)), $lr); - if ($num != 1) { - $_SESSION['alert'][] = 'message:bad_pw:changeMyPassword'; - db_close($lr); - return false; - } - - if (isset($AUTH[$toPolicy]['shadowExpire']) and $AUTH[$toPolicy]['shadowExpire'] != '') { - $shadowExpire = $AUTH[$toPolicy]['shadowExpire']; - } elseif (isset($AUTH[$toPolicy]['shadowMax']) and $AUTH[$toPolicy]['shadowMax'] != '') { - $shadowExpire = $shadowLastChange + intval($AUTH[$toPolicy]['shadowMax']); - } - $q = "UPDATE accounts SET userPassword=sha('%s'), shadowLastChange=%u, shadowExpire=%u - WHERE userAccount='%s' and policy='%s'"; - $v = array($newPassword, $shadowLastChange, $shadowExpire, $userAccount, $toPolicy); - $r = db_query($q, array('fv' => 'changeMyPassword', 'modul' => $modul, 'values' => $v), $lr); - db_close($lr); - if ($r) $_SESSION['alert'][] = 'info:pw_change_success'; - return $r; - -} - -############################################################################ -# Adminisztrátori jelszó változtatás -############################################################################ - -function changePassword($userAccount, $newPassword, $toPolicy = '') { - - global $AUTH; - - if ($toPolicy == '') $toPolicy = _POLICY; - $shadowLastChange = floor(time()/(60*60*24)); - if (isset($AUTH[$toPolicy]['shadowExpire']) and $AUTH[$toPolicy]['shadowExpire'] != '') { - $shadowExpire = $AUTH[$toPolicy]['shadowExpire']; - } elseif (isset($AUTH[$toPolicy]['shadowMax']) and $AUTH[$toPolicy]['shadowMax'] != '') { - $shadowExpire = $shadowLastChange + intval($AUTH[$toPolicy]['shadowMax']); - } - $shadowExpire = intval($shadowExpire); - $q = "UPDATE accounts SET userPassword=sha('%s'), shadowLastChange=%u, shadowExpire=%u - WHERE userAccount='%s' and policy='%s'"; - $v = array($newPassword, $shadowLastChange, $shadowExpire, $userAccount, $toPolicy); - $r = db_query($q, array('fv' => 'changePassword', 'modul' => "$toPolicy auth", 'values' => $v)); - if ($r) $_SESSION['alert'][] = 'info:pw_change_success'; - return $r; - -} - -?> diff --git a/mayor-orig/www/include/backend/mysql/session/accountInfo.php b/mayor-orig/www/include/backend/mysql/session/accountInfo.php deleted file mode 100644 index 113e380b..00000000 --- a/mayor-orig/www/include/backend/mysql/session/accountInfo.php +++ /dev/null @@ -1,258 +0,0 @@ - 0) { - $_THESE = '`'.implode('`,`', array_fill(0, count($SET['justThese']), '%s')).'`'; - $v = $SET['justThese']; - } else { - $_THESE = '*'; - $v = array(); - } - $q = "SELECT $_THESE FROM accounts WHERE userAccount='%s' AND policy='%s'"; - array_push($v, $userAccount, $toPolicy); - $A = db_query($q, array('fv' => 'mysqlGetAccountInfo', 'modul' => "$toPolicy auth", 'result' => 'record', 'values' => $v), $lr); - if (!is_array($A) || count($A) == 0) return false; - - $data = array(); - foreach ($A as $attr => $value) $data[$attr][] = $value; - foreach ($data as $attr => $array) $data[$attr]['count'] = count($array); - - return $data; - - } - -############################################################# -# mysqlGetUserInfo - felhasználói információk (keretrendszer) -############################################################# - - function mysqlGetUserInfo($userAccount, $toPolicy = _POLICY) { - - global $AUTH, $backendAttrs, $backendAttrDef; - - if (!isset($backendAttrs)) list($backendAttrs, $backendAttrDef) = getBackendAttrs('Account', $toPolicy); - - // Keresés - $q = "SELECT userAccount,userCn FROM accounts WHERE userAccount='%s' AND policy='%s'"; - $A = db_query($q, array('fv' => 'mysqlGetUserInfo', 'modul' => "$toPolicy auth", 'result' => 'record', 'values' => array($userAccount, $toPolicy))); - if (!is_array($A) || count($A) == 0) return false; - $ret = array(); - foreach ($A as $attr => $value) $ret[$attr][] = $value; - return $ret; - - } - -############################################################### -# mysqlChangeAccountInfo - felhasználói információk módosítása -############################################################### - - function mysqlChangeAccountInfo($userAccount, $toPolicy = _POLICY) { - - global $AUTH, $backendAttrs, $backendAttrDef; - - // Kapcsolódás az MySQL szerverhez - $modul = "$toPolicy auth"; - $lr = db_connect($modul, array('fv' => 'mysqlChangeAccountInfo')); - if (!$lr) return false; - - $emptyAttrs = explode(':',$_POST['emptyAttrs']); - - // Attribútumonként módosítunk - foreach ($backendAttrs as $attr) { - - if ($backendAttrDef[$attr]['rights'] == '') $rigths = _DEFAULT_MYSQL_RIGHTS; - else $rights = $backendAttrDef[$attr]['rights']; - - if ($rights[_ACCESS_AS] == 'w') { - - $value = ''; - - if ($backendAttrDef[$attr]['type'] == 'int') { - if ($backendAttrDef[$attr]['type'] != '' ) $value = readVariable($_POST[$attr], 'number'); - } else { - if ($backendAttrDef[$attr]['type'] != '' ) $value = readVariable($_POST[$attr], 'string'); // html túl erős: pl email címben a @ fent akad... - } - - if (in_array($attr,$emptyAttrs)) { - if ($value != '') { - $q = "UPDATE accounts SET `%s`='%s' WHERE userAccount='%s' AND policy='%s'"; - $v = array($attr, $value, $userAccount, $toPolicy); - } - } else { - if ($value != '') { - $q = "UPDATE accounts SET `%s`='%s' WHERE userAccount='%s' AND policy='%s'"; - $v = array($attr, $value, $userAccount, $toPolicy); - } else { - $q = "UPDATE accounts SET `%s`=NULL WHERE userAccount='%s' AND policy='%s'"; - $v = array($attr, $userAccount, $toPolicy); - } - } - db_query($q, array('fv' => 'mysqlChangeAccountInfo', 'modul' => $modul, 'values' => $v), $lr); - - } else { - // $_alert[] = 'message:insufficient_access:'.$attr; - } - } // foreach - - db_close($lr); - if (count($_alert) == 0) $_SESSION['alert'][] = 'info:change_success'; - else for ($i = 0; $i < count($_alert); $i++) $_SESSION['alert'][] = $_alert[$i]; - - } - -########################################################### -# mysqlGetGroupInfo - csoport információk (backend) -########################################################### - - function mysqlGetGroupInfo($groupCn, $toPolicy = _POLICY, $SET = array()) { - - global $AUTH, $backendAttrs, $backendAttrDef; - - if (!isset($backendAttrs)) list($backendAttrs, $backendAttrDef) = getBackendAttrs('Group', $toPolicy); - - // Kapcsolódás az MySQL szerverhez - $modul = "$toPolicy auth"; - $lr = db_connect($modul, array('fv' => 'mysqlGetGroupInfo')); - if (!$lr) return false; - - // Keresés - if (is_array($SET['justThese']) && count($SET['justThese']) > 0) { - $_THESE = '`'.implode('`,`', array_fill(0, count($SET['justThese']), '%s')).'`'; - $v = $SET['justThese']; - } else { - $_THESE = '*'; - $v = array(); - } - $q = "SELECT $_THESE FROM groups WHERE groupCn='%s' AND policy='%s'"; - - array_push($v, $groupCn, $toPolicy); - $A = db_query($q, array('fv' => 'mysqlGetGroupInfo', 'modul' => $modul, 'result' => 'record', 'values' => $v), $lr); - if (!is_array($A) || count($A) == 0) { db_close($lr); return false; } - // Megfelelő formátum kialakítása - foreach ($A as $attr => $value) $data[$attr][] = $value; - foreach ($data as $attr => $array) $data[$attr]['count'] = count($array); - - // tagok lekérdezése - $q = "SELECT 'member' AS type, uid AS value, userCn AS txt FROM members LEFT JOIN accounts USING (uid) WHERE gid = '%s'"; - $v = array($A['gid']); - $data2 = db_query($q, array('fv' => 'mysqlGetGroupInfo', 'modul' => $modul, 'result' => 'multiassoc', 'keyfield' => 'type', 'values' => $v), $lr); - if ($data2 === false) { db_close($lr); return false; } - $data = array_merge($data, $data2); - - // Lehetséges tagok - if ($SET['withNewAccounts']===true) { - $q = "SELECT userCn AS txt, uid AS value FROM accounts WHERE policy='%s' ORDER BY userCn"; - $data['member']['new'] = db_query($q, array( - 'fv' => 'mysqlGetGroupInfo', 'modul' => $modul, 'result' => 'indexed', 'values' => array($toPolicy) - ), $lr); - } - - db_close($lr); - return $data; - - } - - -############################################################### -# mysqlChangeGroupInfo - csoport információk módosítása -############################################################### - - function mysqlChangeGroupInfo($groupCn, $toPolicy = _POLICY) { - -// !!!! A memberuid / member szinkronjára nem figyel!! - - global $AUTH, $backendAttrs, $backendAttrDef; - - // Kapcsolódás az MySQL szerverhez - $modul = "$toPolicy auth"; - $lr = db_connect($modul, array('fv' => 'mysqlChangeGroupInfo')); - if (!$lr) return false; - - $q = "SELECT gid FROM groups WHERE groupCn='%s' AND policy='%s'"; - $v = array($groupCn, $toPolicy); - $gid = db_query($q, array('fv' => 'mysqlChangeGroupInfo', 'modul' => $modul, 'result' => 'value', 'values' => $v), $lr); - if ($gid === false) { db_close($lr); return false; } - - $emptyAttrs = explode(':', $_POST['emptyAttrs']); - - // Attribútumonként módosítunk - foreach ($backendAttrs as $attr) { - - if ($backendAttrDef[$attr]['rights'] == '') $rigths = _DEFAULT_LDAP_RIGHTS; - else $rights = $backendAttrDef[$attr]['rights']; - - if ($rights[_ACCESS_AS] == 'w') { - - $Mod = $Add = $Del = $V = $v = array(); - $values = array(); - - if ($backendAttrDef[$attr]['type'] != '') - if (isset($_POST[$attr])) $values[0] = readVariable($_POST[$attr],'html'); - else $values[0] = ''; - - if ($backendAttrDef[$attr]['type'] == 'select') { - if ($attr == 'member') { - if (isset($_POST['new-'.$attr][0]) && $_POST['new-'.$attr][0] != '') { - for ($i = 0; $i < count($_POST['new-'.$attr]); $i++) { - $V[] = "(%u, %u)"; - array_push($v, $_POST['new-'.$attr][$i], $gid); - } - $q = "INSERT INTO members (uid, gid) VALUES ".implode(',', $V); - db_query($q, array('fv' => 'mysqlChangeGroupInfo', 'modul' => $modul, 'values' => $v), $lr); - } - if (isset($_POST['del-'.$attr][0]) && $_POST['del-'.$attr][0] != '') { - $q = "DELETE FROM members WHERE gid=%u - AND uid IN (".implode(',', array_fill(0, count($_POST['del-'.$attr]), '%u')).")"; - $v = array_merge(array($gid), $_POST['del-'.$attr]); - $r = db_query($q, array('fv' => 'mysqlChangeGroupInfo', 'modul' => $modul, 'values' => $v), $lr); - } - } else { - $_SESSION['alert'][] = 'message:invalid_type:select:'.$attr; - } - } else { - if (in_array($attr, $emptyAttrs)) { - if ($values[0] != '') { - $W = "`%s`='%s'"; - $v = array($attr, $values[0]); - } - } else { - if ($values[0] != '') { - $W = "`%s`='%s'"; - $v = array($attr, $values[0]); - } else { - $W = "`%s`=NULL"; - $v = array($attr); - } - } - $q = "UPDATE groups SET $W WHERE groupCn='%s' AND policy='%s'"; - array_push($v, $groupCn, $toPolicy); - db_query($q, array('fv' => 'mysqlChangeGroupInfo', 'modul' => $modul, 'values' => $v), $lr); - } - } else { - $_alert[] = 'message:insufficient_access:'.$attr; - } - } // foreach - - db_close($lr); - return true; - - } - -?> diff --git a/mayor-orig/www/include/backend/mysql/session/base.php b/mayor-orig/www/include/backend/mysql/session/base.php deleted file mode 100644 index 35272ff8..00000000 --- a/mayor-orig/www/include/backend/mysql/session/base.php +++ /dev/null @@ -1,52 +0,0 @@ - 'mysqlMemberOf')); - if (!$lr) return _AUTH_FAILURE; - - // Az uid lekérdezése - if (!defined(('__'.$toPolicy.'_UID')) || _USERACCOUNT != $userAccount) { // egy policy-hez csak egy uid tartozik - $q = "SELECT uid FROM accounts WHERE userAccount = '%s' AND policy = '%s'"; - $v = array($userAccount, $toPolicy); - $uid = db_query($q, array('fv' => 'mysqlMemberOf', 'modul' => $modul, 'result' => 'value', 'values' => $v), $lr); - if ($uid === false) { - $_SESSION['alert'][] = 'message:no_account:'."$userAccount:$toPolicy"; - db_close($lr); return false; - } - if (!defined('__'.$toPolicy.'_UID')) define('__'.$toPolicy.'_UID',$uid); - } else { - $uid=constant('__'.$toPolicy.'_UID'); - } - - // Az gid lekérdezése - $q = "SELECT gid FROM groups WHERE groupCn = '%s' AND policy = '%s'"; - $v = array($groupCn, $toPolicy); - $gid = db_query($q, array('fv' => 'mysqlMemberOf', 'modul' => $modul, 'result' => 'value', 'values' => $v), $lr); - if ($gid === false) { - $_SESSION['alert'][] = 'message:no_group:'."$groupCn:$toPolicy"; - db_close($lr); return false; - } - - // Benne van-e a csoportban - $q = "SELECT COUNT(*) FROM members WHERE uid = %u AND gid = %u"; - $v = array($uid, $gid); - $num = db_query($q, array('fv' => 'mysqlMemberOf', 'modul' => $modul, 'result' => 'value', 'values' => $v), $lr); - db_close($lr); - return ($num > 0); - - } - -?> diff --git a/mayor-orig/www/include/backend/mysql/session/createAccount.php b/mayor-orig/www/include/backend/mysql/session/createAccount.php deleted file mode 100644 index 25ff9132..00000000 --- a/mayor-orig/www/include/backend/mysql/session/createAccount.php +++ /dev/null @@ -1,106 +0,0 @@ - a konténer elem - MySQL backend esetén nincs értelme - category => tanár, diák... egy kiemelt fontosságú csoport tagság - groups => egyéb csoportok - policyAttrs => policy függő attribútumok - createGroup => létrehozza az adott nevű csoportokat, ha nincsenek - ) - - */ - function mysqlCreateAccount( - $userCn, $userAccount, $userPassword, $toPolicy, $SET - ) { - - global $AUTH; - - $shadowlastchange = floor(time() / (60*60*24)); - $modul = "$toPolicy auth"; - $lr = db_connect($modul, array('fv' => 'mysqlCreateAccount')); - if (!$lr) return _AUTH_FAILURE; - - // ütközés ellenőrzése - $q = "SELECT COUNT(userCn) FROM accounts WHERE userAccount = '%s' AND policy = '%s'"; - $v = array($userAccount, $toPolicy); - $num = db_query($q, array('fv' => 'mysqlCreateAccount', 'modul' => $modul, 'result' => 'value', 'values' => $v), $lr); - if ($num > 0) { - db_close($lr); - $_SESSION['alert'][] = 'message:multi_uid'.":$userAccount:$toPolicy"; - return false; - } - - // A shadowLastChange a mai nap // if (isset($AUTH[$toPolicy]['shadowlastchange']) && $AUTH[$toPolicy]['shadowlastchange'] != '') $shadowlastchange = $AUTH[$toPolicy]['shadowlastchange']; - $shadowmin = readVariable($AUTH[$toPolicy]['shadowmin'], 'numeric unsigned', 'null'); // null szöveg - $shadowmax = readVariable($AUTH[$toPolicy]['shadowmax'], 'numeric unsigned', 'null'); // null szöveg - $shadowwarning = readVariable($AUTH[$toPolicy]['shadowwarning'], 'numeric unsigned', 'null'); // null szöveg - $shadowinactive = readVariable($AUTH[$toPolicy]['shadowinactive'], 'numeric unsigned', 'null'); // null szöveg - $shadowexpire = readVariable($AUTH[$toPolicy]['shadowexpire'], 'numeric unsigned', 'null'); // null szöveg - - // A $SET['policyAttrs'] feldolgozása - $attrList = array_keys($SET['policyAttrs']); - $valueList = array_values($SET['policyAttrs']); - - // user felvétele - if (count($attrList) > 0) { - $q = "INSERT INTO accounts ( - policy, userAccount, userCn, userPassword, shadowLastChange, shadowMin, shadowMax, shadowWarning, shadowInactive, shadowExpire, - `".implode('`, `', array_fill(0, count($attrList), '%s'))."` - ) VALUES ( - '%s', '%s', '%s', sha('%s'), %u, %u, %u, %u, %u, %u, '".implode("', '", array_fill(0, count($valueList), '%s'))."' - )"; - } else{ - $q = "INSERT INTO accounts ( - policy, userAccount, userCn, userPassword, shadowLastChange, shadowMin, shadowMax, shadowWarning, shadowInactive, shadowExpire - ) VALUES ('%s', '%s', '%s', sha('%s'), %u, %u, %u, %u, %u, %u)"; - } - $v = array_merge( - $attrList, - array($toPolicy, $userAccount, $userCn, $userPassword, $shadowlastchange, $shadowmin, $shadowmax, $shadowwarning, $shadowinactive, $shadowexpire), - $valueList - ); - $uid = db_query($q, array('fv' => 'mysqlCreateAccount', 'modul' => $modul, 'result' => 'insert', 'values' => $v), $lr); - if ($uid === false) { db_close($lr); return false; } - // user berakása a kategóriájának megfelelő csoportokba - - if (isset($SET['category'])) { - if (is_array($SET['groups'])) array_unshift($SET['groups'], $SET['category']); - else $SET['groups'] = array($SET['category']); - - for ($i = 0; $i < count($SET['groups']); $i++) { - $category = $SET['groups'][$i]; - $groupCn = kisbetus(ekezettelen($category)); - if ($category == '') continue; - $q = "SELECT gid FROM groups WHERE groupCn='%s'"; - $gid = db_query($q, array('fv' => 'mysqlCreateAccount', 'modul' => $modul, 'result' => 'value', 'values' => array($groupCn)), $lr); - if ($gid === false || is_null($gid)) { // --FIXME -- ez jó így BENCE radyx - if ($SET['createGroup']) { - require_once('include/modules/session/createGroup.php'); - //createGroup($groupCn, "$category csoport", $category, $toPolicy = _POLICY); - createGroup($groupCn, "$category csoport", $toPolicy = _POLICY, array('category'=>$category)); - $gid = db_query($q, array('fv' => 'mysqlCreateAccount', 'modul' => $modul, 'result' => 'value', 'values' => array($groupCn)), $lr); - } else { - $_SESSION['alert'][] = 'message:wrong_data:mysqlCreateAccount - nincsmegadva/hibás kategória:'.$category.':'.$groupCn; - db_close($lr); return false; - } - } - $q = "INSERT INTO members (uid,gid) VALUES (%u, %u)"; - $r = db_query($q, array('fv' => 'mysqlCreateAccount', 'modul' => $modul, 'values' => array($uid, $gid)), $lr); - if (!$r) { db_close($lr); return false; } - } - } - $_SESSION['alert'][] = 'info:create_account_success:'.$userAccount; - db_close($lr); - return true; - - } - -?> diff --git a/mayor-orig/www/include/backend/mysql/session/createGroup.php b/mayor-orig/www/include/backend/mysql/session/createGroup.php deleted file mode 100644 index d1bc4f7b..00000000 --- a/mayor-orig/www/include/backend/mysql/session/createGroup.php +++ /dev/null @@ -1,37 +0,0 @@ - backend - ellenőrzés! - if ($AUTH[$toPolicy]['backend'] != 'mysql') { - $_SESSION['alert'][] = 'page:wrong_backend:'.$AUTH[$toPolicy]['backend']; - return false; - } - - // Kapcsolódás az MySQL szerverhez - $modul = "$toPolicy auth"; - $lr = @db_connect($modul, array('fv' => 'mysqlCreateGroup')); - if (!$lr) return false; - - // cn ütközés ellenőrzése - $q = "SELECT COUNT(*) FROM groups WHERE policy='%s' AND groupCn='%s'"; - $v = array($toPolicy, $groupCn); - $num = db_query($q, array('fv' => 'mysqlCreateGroup', 'modul' => $modul, 'result' => 'value', 'values' => $v), $lr); - if ($num === false) { db_close($lr); return false; } - if ($num > 0) { $_SESSION['alert'][] = 'message:multi_uid:'.$groupCn; db_close($lr); return false; } - - // csoport felvétel - $q = "INSERT INTO groups (groupCn, groupDesc, policy) VALUES ('%s', '%s','%s')"; - $v = array($groupCn, $groupDesc, $toPolicy); - $gid = db_query($q, array('fv' => 'mysqlCreateGroup', 'modul' => $modul, 'result' => 'insert', 'values' => $v), $lr); - if ($gid === false) { db_close($lr); return false; } - - $_SESSION['alert'][] = 'info:create_group_success:'.$dn; - db_close($lr); - return true; - - } - -?> diff --git a/mayor-orig/www/include/backend/mysql/session/search/searchAccount.php b/mayor-orig/www/include/backend/mysql/session/search/searchAccount.php deleted file mode 100644 index fa4584b0..00000000 --- a/mayor-orig/www/include/backend/mysql/session/search/searchAccount.php +++ /dev/null @@ -1,169 +0,0 @@ - 'mysqlSearchAccount')); - if (!$lr) return false; - - // Keresés - $q = "SELECT `".implode('`,`', array_fill(0, count($searchAttrs), '%s'))."` FROM accounts WHERE `%s` LIKE '%%%s%%' AND policy='%s'"; - $v = array_merge($searchAttrs, array($attr, $pattern, $toPolicy)); - $r = db_query($q, array('fv' => 'mysqlSearchAccount', 'modul' => $modul, 'result' => 'indexed', 'values' => $v), $lr); - db_close($lr); - if ($r === false) return false; - $ret = array('count' => count($r)); - foreach ($r as $key => $A) { - $data = array(); - foreach ($A as $attr => $value) { - $data[$attr] = array($value); - $data[$attr]['count']++; - } - $data['category'] = getAccountCategories($data['userAccount'][0], $toPolicy); - $data['category']['count'] = count($data['category']); - $ret[] = $data; - } - - return $ret; - - } - -###################################################### -# MySQL group kereső függvény -###################################################### - - function mysqlSearchGroup($attr, $pattern, $searchAttrs = array('userCn'), $toPolicy = _POLICY) { - - global $AUTH; - - if ($pattern == '') { - $_SESSION['alert'][] = 'message:empty_field:mysqlSearchGroup, pattern'; - return false; - } - - // Kapcsolódás az MySQL szerverhez - $modul = "$toPolicy auth"; - $lr = db_connect($modul, array('fv' => 'mysqlSearchGroup')); - if (!$lr) return false; - // Keresés - if ($attr == 'member') { - $q = "SELECT `".implode('`,`', array_fill(0, count($searchAttrs), '%s'))."` FROM groups LEFT JOIN members - ON members.gid=groups.gid - LEFT JOIN accounts USING (uid) - WHERE gid IN - (SELECT DISTINCT gid FROM accounts LEFT JOIN members USING(uid) WHERE userAccount LIKE '%%%s%%' AND policy='%s') - AND groups.policy='%s'"; - $v = array_merge($searchAttrs, array($pattern, $toPolicy, $toPolicy)); - } else { - $q = "SELECT DISTINCT `".implode('`,`', array_fill(0, count($searchAttrs), '%s'))."` FROM groups LEFT JOIN members - ON members.gid=groups.gid - LEFT JOIN accounts USING (uid) - WHERE `%s` LIKE '%%%s%%' AND groups.policy='%s'"; - $v = array_merge($searchAttrs, array($attr, $pattern, $toPolicy)); - } - $r = db_query($q, array('fv' => 'mysqlSearchGroup', 'modul' => $modul, 'result' => 'indexed', 'values' => $v), $lr); - db_close($lr); - if ($r === false) return false; - $ret = array('count' => count($r)); - foreach ($r as $key => $A) { - $data = array(); - foreach ($A as $attr => $value) { - $data[$attr] = array($value); - } - $ret[] = $data; - } - - return $ret; - - } - -###################################################### -# mysqlDeleteAccount - account törlése -###################################################### - - function mysqlDeleteAccount($userAccount, $toPolicy = _POLICY) { - - global $AUTH; - - // $toPolicy --> mysql backend - ellenőrzés - if ($AUTH[$toPolicy]['backend'] != 'mysql') { - $_SESSION['alert'][] = 'page:wrong_backend:'.$AUTH[$toPolicy]['backend']; - return false; - } - - // Kapcsolódás az MySQL szerverhez - $modul = "$toPolicy auth"; - $lr = @db_connect($modul, array('fv' => 'mysqlDeleteAccount')); - if (!$lr) return false; - - // Az uidNumber, a homeDirectory lekerdezése - és mire használjuk, ha szabad kérdeznem??? - if ($AUTH[$toPolicy]['createHomeDir']) { - $q = "SELECT homeDirectory, uid FROM accounts WHERE policy='%s' AND userAccount='%s'"; - $v = array($toPolicy, $userAccount); - $ret = db_query($q, array('fv' => 'mysqlDeleteAccount', 'modul' => $modul, 'result' => 'record', 'values' => $v), $lr); - if ($ret === false) { db_close($lr); return false; } - - $homeDirectory = $ret['homeDirectory']; // de nem használjuk semmire... - // A user csoport törlése - $q = "DELETE FROM groups WHERE gid=%u"; - $v = array($ret['uid']); - $r = db_query($q, array('fv' => 'mysqlDeleteAccount', 'modul' => $modul, 'values' => $v), $lr); - if (!$r) { db_close($lr); return false; } - } - - // user törlése - $q = "DELETE FROM accounts WHERE policy='%s' AND userAccount='%s'"; - $v = array($toPolicy, $userAccount); - $r = db_query($q, array('fv' => 'mysqlDeleteAccount', 'modul' => $modul, 'values' => $v), $lr); - db_close($lr); - // törlés a csoportból - Ha innoDb - akkor nincs ezzel tennivaló!! - if ($r) $_SESSION['alert'][] = 'info:delete_uid_success:'.$userDn; - - return $r; - - } - -###################################################### -# mysqlDeleteGroup - group törlése -###################################################### - - function mysqlDeleteGroup($groupCn, $toPolicy = _POLICY) { - - global $AUTH; - - // $toPolicy --> mysql backend - ellenőrzés - if ($AUTH[$toPolicy]['backend'] != 'mysql') { - $_SESSION['alert'][] = 'page:wrong_backend:'.$AUTH[$toPolicy]['backend']; - return false; - } - - // csoport törlése - $q = "DELETE FROM groups WHERE policy='%s' AND groupCn='%s'"; - $v = array($toPolicy, $groupCn); - $r = db_query($q, array('fv' => 'mysqlDeleteGroup', 'modul' => "$toPolicy auth", 'values' => $v)); - - if ($r) $_SESSION['alert'][] = 'info:delete_uid_success:'.$userDn; - - // tagok törlése a csoportból - Ha innoDb - akkor nincs ezzel tennivaló!! - return $r; - - } - -?> diff --git a/mayor-orig/www/include/base/base.php b/mayor-orig/www/include/base/base.php deleted file mode 100644 index 378b31fd..00000000 --- a/mayor-orig/www/include/base/base.php +++ /dev/null @@ -1,233 +0,0 @@ -0) or (strpos(strtolower($_SERVER['HTTP_ACCEPT']),'application/vnd.wap.xhtml+xml')>0)) or ((((isset($_SERVER['HTTP_X_WAP_PROFILE']) or isset($_SERVER['HTTP_PROFILE']) or isset($_SERVER['X-OperaMini-Features']) or isset($_SERVER['UA-pixels'])))))) - $mobile_ua = strtolower(substr($_SERVER['HTTP_USER_AGENT'],0,4)); - $mobile_agents = array('acs-','alav','alca','amoi','audi','aste','avan','benq' ,'bird','blac','blaz','brew','cell','cldc','cmd-','dang','doco','eric','hipt','inno','ipaq','java' ,'jigs','kddi','keji','leno','lg-c','lg-d','lg-g','lge-','maui','maxo','midp','mits','mmef','mobi','mot-','moto','mwbp','nec-','newt','noki','opwv','palm','pana','pant','pdxg' ,'phil','play','pluc','port','prox','qtek','qwap', 'sage','sams','sany','sch-','sec-','send','seri','sgh-','shar','sie-','siem','smal','smar','sony','sph-','symb','t-mo','teli','tim-','tosh','tsm-','upg1','upsi','vk-v','voda','wap-','wapa','wapi','wapp','wapr','webc','winw','winw' ,'xda','xda-'); - if(in_array($mobile_ua,$mobile_agents)) { - return true; - } -} - -// ------------------------------------------ -// PHP session -// ------------------------------------------ - - session_start(); - -// ------------------------------------------ -// Böngésző azonosítás -// ------------------------------------------ - - if (defined('_ALLOWPDAIDENTIFICATION') && isMobile()) define('_USER_AGENT','ppc'); // inkább ketté kéne bontani [wap,ppc] tartalomra - else - if (strpos($_SERVER['HTTP_USER_AGENT'],'Opera') !== false) define('_USER_AGENT','opera'); - elseif (strpos($_SERVER['HTTP_USER_AGENT'],'Gecko') !== false) define('_USER_AGENT','gecko'); - elseif (strpos($_SERVER['HTTP_USER_AGENT'],'MSIE') !== false) define('_USER_AGENT','msie'); - else define('_USER_AGENT',''); - - if (strstr($_SERVER['HTTP_USER_AGENT'],'iPhone')!=false) define('_USER_AGENT_PLUS','iPhone'); - else define('_USER_AGENT_PLUS',''); - - if (($_SESSION['isMobile']=isMobile())===true) $_SESSION['pageLayout']=1; // patch - -// MaYoR revision konstans definiálása - - if (@file_exists(_LOGDIR.'/revision')) { - $_rf = @fopen(_LOGDIR.'/revision', "r"); - if ($_rf) $rev = @fgets($_rf, 64); - @fclose($_rf); - } else { - //rev missing... - } - define('_MAYORREV',chop($rev)); - unset($rev); - -// ------------------------------------------ -// Default értékek -// ------------------------------------------ - /* - $policy - hozzáférési mód - kötelező - $page - megjelenítendő oldal - kötelező - $sub - aloldal - opcionális - $f - file - kötelező - $lang - az oldal nyelve - kötelező - skin - az oldal témája, "bőre" - kötelező - $action - elvégzendő feladat megjelölésére - opcionális - $_SESSION['alert'] - figyelmeztető üzenet (tömb) - opcionális - */ - - if (($__key = array_search('blue', $SKINS)) !== false) unset($SKINS[$__key]); - if (($__key = array_search('pda', $SKINS)) !== false) unset($SKINS[$__key]); - if ($AUTH['public']['skin'] == 'blue') $AUTH['public']['skin'] = 'classic'; - if ($AUTH['private']['skin'] == 'blue') $AUTH['private']['skin'] = 'classic'; - if ($AUTH['parent']['skin'] == 'blue') $AUTH['parent']['skin'] = 'classic'; - // itt beolvassuk, később még egy szigorítás is van - - if (_RUNLEVEL=='cron') { - $policy = 'private'; - @$page = readVariable($_SERVER['argv'][1],'strictstring'); - @$sub = readVariable($_SERVER['argv'][2],'strictstring'); - @$f = readVariable($_SERVER['argv'][3],'strictstring'); - @$sessionID = "cron"; - } else { - @$policy = readVariable($_REQUEST['policy'],'strictstring',null,$POLICIES); - @$page = readVariable($_REQUEST['page'],'strictstring'); - @$sub = readVariable($_REQUEST['sub'],'strictstring'); - @$f = readVariable($_REQUEST['f'],'strictstring'); - @$sessionID = readVariable($_GET['sessionID'],'hexa'); - } - if ($f == '') { - if ($sub != '') $f = $sub; - elseif ($page != '') $f = $page; - } - @$lang = readVariable($_GET['lang'],'strictstring',null,$LANGUAGES); - if (_RUNLEVEL === 'cron') $skin = 'cron'; - else @$skin = readVariable($_POST['skin'],'strictstring',readVariable($_GET['skin'],'strictstring',null,$SKINS),$SKINS); - @$action = readVariable($_REQUEST['action'],'strictstring',null); - // ++ ha még mindig üres a skin, és pocketpc-ről/pda jövünk (de megengedjük a felülírást) - // if (_USER_AGENT==='ppc' && $skin=='') $skin='pda'; - // ++ - //-- - if (is_array($POLICIES) && !in_array($policy, $POLICIES)) $policy = _DEFAULT_POLICY; - - define('_POLICY', $policy); - - // Miert ne csatolnánk be az összes policy beállítsait? --> config.php - - if ($f=='' && is_array($DEFAULT_PSF[$policy])) extract($DEFAULT_PSF[$policy], EXTR_OVERWRITE); - if (!in_array($lang, $LANGUAGES)) $lang=_DEFAULT_LANG; - // ha a skin még mindig üres, akkor az ellenőrzésnél a default-ot állítjuk be... - if (!@in_array($skin, $SKINS)) $skin = (isset($AUTH[$policy]['skin'])) ? $AUTH[$policy]['skin'] : _DEFAULT_SKIN; - - if (file_exists("lang/$lang/base/base.php")) { - require("lang/$lang/base/base.php"); - } elseif (file_exists('lang/'._DEFAULT_LANG.'/base/base.php')) { - require('lang/'._DEFAULT_LANG.'/base/base.php'); - } - - // A skin-hez tartozó beállátosok.. ha vannak... - ide való? De még a *-pre elé! - if (file_exists(_CONFIGDIR."/skin-$skin/config.php")) { - require(_CONFIGDIR."/skin-$skin/config.php"); - } elseif (file_exists(_CONFIGDIR.'/skin-'._DEFAULT_SKIN.'/config.php')) { - require(_CONFIGDIR.'/skin-'._DEFAULT_SKIN.'/config.php'); - } - -// ----------------------------------------------------------------- -// page() -// ----------------------------------------------------------------- - -function page($page, $sub, $f, $lang, $skin, $policy = _DEFAULT_POLICY) { - - global $_JSON; - if (html_alert($_SESSION['alert'])) { // A figyelmeztető üzenet letilthatja az oldal további megjelenítését. - if ($sub != '') { - $load = "$sub/$f"; - } else { - $load = $f; - } - - // --TEST $API_DICTIONARY['api']['naplo']['orarend']['orarend'] = true; - if ($skin=='api') { - $_JSON['api']['version'] = '1.0'; - if (isset($API_DICTIONARY[$skin][$page][$sub][$f])===false) { // --TODO API_DICTIONARY - return false; - } - } - - if (file_exists("policy/$policy/$page/$load.php")) { - if (file_exists("lang/$lang/module-$page/base.php")) { - require_once("lang/$lang/module-$page/base.php"); - } elseif (file_exists("lang/"._DEFAULT_LANG."/module-$page/base.php")) { - require_once("lang/"._DEFAULT_LANG."/module-$page/base.php"); - } - if (file_exists("lang/$lang/module-$page/$load.php")) { - require_once("lang/$lang/module-$page/$load.php"); - } elseif (file_exists("lang/"._DEFAULT_LANG."/module-$page/$load.php")) { - require_once("lang/"._DEFAULT_LANG."/module-$page/$load.php"); - } - if (file_exists("skin/$skin/module-$page/html/base.phtml")) { - require_once("skin/$skin/module-$page/html/base.phtml"); - } elseif ($skin!=='api' && file_exists("skin/"._DEFAULT_SKIN."/module-$page/html/base.phtml")) { // api esetén nem töltjük be a default skin phtml-t - require_once("skin/"._DEFAULT_SKIN."/module-$page/html/base.phtml"); - } - if (file_exists("skin/$skin/module-$page/html/$load.phtml")) { - require_once("skin/$skin/module-$page/html/$load.phtml"); - } elseif ($skin!=='api' && file_exists("skin/"._DEFAULT_SKIN."/module-$page/html/$load.phtml")) { // api esetén nem töltjük be a default skin phtml-t - require_once("skin/"._DEFAULT_SKIN."/module-$page/html/$load.phtml"); - } - $_JSON['api']['debug'] = serialize($page.$load); - - include("policy/$policy/$page/$load.php"); - } elseif (file_exists("static/$lang/$page/$load.html")) { - include("static/$lang/$page/$load.html"); - } else { - //??? ha már kiírtuk a hibaüzeneteket, újabbat nem írhatunk ki sajnos :( html_alert(array('page:page_missing:'."[$page]:[$sub]:[$f]")); --> rights.php - } - } -} - -function href($href,$get = array('sessionID','lang','skin','policy')) { - - global $sessionID,$lang,$skin,$policy,$page,$sub,$f,$action; - global $SKINS; - if ($href!='') { - if (strpos($href,'?') === false) { - $href .= '?'; - } else { - $href.='&'; - } - for ($i=0;$i diff --git a/mayor-orig/www/include/base/cache.php b/mayor-orig/www/include/base/cache.php deleted file mode 100644 index 3c630581..00000000 --- a/mayor-orig/www/include/base/cache.php +++ /dev/null @@ -1,33 +0,0 @@ -DATA[$key])); - } - public function get($key) { - return $this->DATA[$key]; - } - public function set($key,$data, $dataType=null) { - $this->DATA[$key] = $data; - if ($dataType!='') $this->REGISTRY[$dataType][] = $key; - } - public function del($key) { - unset($this->DATA[$key]); - unset($this->REGISTRY[array_search($key,$this->REGISTRY)]); - } - public function flushdb() { - $this->DATA = array(); - $this->REGISTRY = array(); - } - public function delType($dataType) { - $c = count($this->REGISTRY[$dataType]); - for ($i=0; $i<$c; $i++ ) { - $this->del($this->REGISTRY[$dataType][$i]); - } - unset($this->REGISTRY[$dataType]); - } -} -$mayorCache = new mayorCache(); -?> \ No newline at end of file diff --git a/mayor-orig/www/include/base/config.php b/mayor-orig/www/include/base/config.php deleted file mode 100644 index 28f711cb..00000000 --- a/mayor-orig/www/include/base/config.php +++ /dev/null @@ -1,62 +0,0 @@ - $_policy) { - if (file_exists(_CONFIGDIR."/$_policy-conf.php")) { - @require(_CONFIGDIR."/$_policy-conf.php"); - if (file_exists(_BASEDIR.'/policy/'.$_policy.'/'.$DEFAULT_PSF[$_policy]['page'].'/'.$DEFAULT_PSF[$_policy]['sub'].'/'.$DEFAULT_PSF[$_policy]['f'].'.php') - === false) { - //nincs meg ez a file - $_SESSION['alert'][] = 'info:file_not_found:default page:'.$_policy.':'.implode(' ',$DEFAULT_PSF[$_policy]); - } - } else { - $DEFAULT_PSF[$_policy] = array(); - $_SESSION['alert'][] = 'page:file_not_found:'._CONFIGDIR."/$_policy-conf.php"; - } - } -} else { - $_SESSION['alert'][] = 'page:config_error:nincs POLICIES tömb vagy _CONFIGDIR konstans!'; -} - -if (!defined('__FBCONNECT_ENABLED')) define('__FBCONNECT_ENABLED',false); -if (!defined('__SHOW_FACES_TYPE')) define('__SHOW_FACES_TYPE','circle'); // circle, square, classic - -$VALID_MODULES =array('portal','naplo','auth','jatek','password','session','fenntarto'); -if(is_array($EXTRA_MODULES)) $VALID_MODULES = array_unique(array_merge($VALID_MODULES,$EXTRA_MODULES)); - - -?> diff --git a/mayor-orig/www/include/base/error.php b/mayor-orig/www/include/base/error.php deleted file mode 100644 index e790d65a..00000000 --- a/mayor-orig/www/include/base/error.php +++ /dev/null @@ -1,44 +0,0 @@ - 'Error', //1 - E_WARNING => 'Warning', //2 - E_PARSE => 'Parsing Error', //4 - E_NOTICE => 'Notice', //8 - E_CORE_ERROR => 'Core Error', //16 - E_CORE_WARNING => 'Core Warning', //32 - E_COMPILE_ERROR => 'Compile Error', //64 - E_COMPILE_WARNING => 'Compile Warning', //128 - E_USER_ERROR => 'User Error', - E_USER_WARNING => 'User Warning', - E_USER_NOTICE => 'User Notice', // 1024 - E_STRICT => 'Runtime Notice', // 2048 - E_RECOVERABLE_ERROR => 'Catchable Fatal Error', // 4096 - E_ALL => 'ALL', //binary 1111111111111 - ); - $userError = array(E_USER_ERROR, E_USER_WARNING, E_USER_NOTICE); - $trackOnly = array(E_USER_ERROR, E_ERROR, E_USER_WARNING, E_USER_NOTICE, E_WARNING); - if (defined('__TESTERRORREPORTERWARN')) $trackOnly[] = E_NOTICE; - if (in_array($errno,$userError)) { - $err = "$dt $errno ".$errtype[$errno]." $errmsg"; - } elseif (in_array($errno,$trackOnly)) { - $err = "$dt $errno ".$errtype[$errno]." $errmsg $filename $linenum"; - /* if (in_array($errno, $user_errors)) { $err .= " vartrace(" . wddx_serialize_value($vars, "Variables") . ") ";} */ - // if (defined('_LOGDIR')) error_log($err, 0, _LOGDIR.'/phperror.log'); - } - if ($err!='') $_SESSION['alert'][] = 'alert:raw:'._MAYORREV.':'._USERACCOUNT.':'.':'.$err; - return false; - } - - /* Írjuk felül a gyárit */ - $old_error_handler = set_error_handler("mayorErrorHandler"); - //restore_error_handler(); - -?> diff --git a/mayor-orig/www/include/base/log.php b/mayor-orig/www/include/base/log.php deleted file mode 100644 index 14e214a9..00000000 --- a/mayor-orig/www/include/base/log.php +++ /dev/null @@ -1,33 +0,0 @@ - 'logLogin', 'modul' => 'login', 'values' => array(_clientIp(), $userAccount, $policy, $flag))); - } - - function szamlal($policy, $page) { - $q = "INSERT INTO stat (dt, policy, page) VALUES (NOW(),'%s','%s')"; - db_query($q, array('fv' => 'szamlal', 'modul' => 'login', 'values' => array($policy, $page))); - } - - function mayorLogger($loglevel, $modul, $message, $userAccount='') { - if ($loglevel>_LOGLEVEL) { - $fp = fopen(_LOGDIR.'/'.$modul.'.log','a+'); - if ($fp!=false) { - $msg = date('Y-m-d H:i:s').' '.$userAccount.': '.$message."\n"; - fputs($fp,$msg); - fclose($fp); - } - } - } -?> diff --git a/mayor-orig/www/include/base/login.php b/mayor-orig/www/include/base/login.php deleted file mode 100644 index 4624a92a..00000000 --- a/mayor-orig/www/include/base/login.php +++ /dev/null @@ -1,139 +0,0 @@ - $userAccount, 'password' => $userPassword, 'policy' => $toPolicy, 'skin'=>$toSkin); - if ($fbAuth===true) { - if ($FBDATA['toPolicy']==$toPolicy) { - $result = _AUTH_SUCCESS; // az authentikációt a mayorFacebookAuth() csinálta - $accountInformation['cn'] = $FBDATA['fbUserCn']; - $accountInformation['mail'] = $FBDATA['fbUserEmail']; - $accountInformation['studyId'] = $FBDATA['studyId']; - } else { - $_SESSION['alert'][] = 'info:A facebook azonosító nincs még összekötve! Először lépj be a MaYoR-ba, és kezdeményezd a facebook connectet!'; - continue;; - } - } elseif ($googleapiAuth===true) { - if ($GOOGLEAPIDATA['toPolicy']==$toPolicy) { - $result = _AUTH_SUCCESS; // az authentikációt a mayorGoogleapiAuth() csinálta - $accountInformation['cn'] = $GOOGLEAPIDATA['googleUserCn']; - $accountInformation['mail'] = $GOOGLEAPIDATA['googleUserEmail']; - $accountInformation['studyId'] = $GOOGLEAPIDATA['studyId']; - } else { - $_SESSION['alert'][] = 'info:A google azonosító nincs még összekötve! Először lépj be a MaYoR-ba, és kezdeményezd!'; - continue;; - } - } elseif ($mayorapiAuth===true) { - if ($MAYORAPIDATA['toPolicy'] == $toPolicy) { - $result = _AUTH_SUCCESS; // az authentikációt a mayorApiAuth() csinálta - $accountInformation['cn'] = $MAYORAPIDATA['userCn']; - // $accountInformation['mail'] = $MAYORAPIDATA['userEmail']; - $accountInformation['studyId'] = $MAYORAPIDATA['studyId']; - } else { - continue;; - } - } else { - $result = userAuthentication($userAccount, $userPassword, $accountInformation, $toPolicy); // ??? toPolicy benne van az AccountInformation-ben!!! Ldap backend only? - } - logLogin($toPolicy, $userAccount, $result); - - define('_MAYORAUTHRESULT',$result); - if ($result === _AUTH_SUCCESS) { - $_SESSION['alert'] = array(); - $sessionID = newSession($accountInformation, $toPolicy); - if ($mayorapiAuth!==true) generateAuthToken(array('userAccount'=>$userAccount, 'policy'=>$toPolicy, 'userCn'=>$accountInformation['cn'], 'studyId'=>$accountInformation['studyId'])); // --TODO untrusted clients - if ($toSkin == '') $toSkin = $skin; - header('Location: '.location("index.php?page=$toPage&sub=$toSub&f=$toF&sessionID=$sessionID&policy=$toPolicy&lang=$lang&skin=$toSkin", array('alertOLD'))); - break; - } elseif ($result === _AUTH_EXPIRED) { - $_SESSION['alert'][] = 'message:force_pw_update'; - header('Location: '.location("index.php?policy=public&page=password&f=changeMyPassword&userAccount=".$userAccount."&toPolicy=$toPolicy&skin=$toSkin", array('alertOLD'))); - break; - } elseif ($result === _AUTH_FAILURE_1) { - // nincs ilyen user, megpróbáljuk beauthentikálni parent-tel is. - } elseif ($result >= _AUTH_FAILURE) { - // sikertelen azonosítás - a hibaüzenetet a függvény generálja - // megpróbáljuk beauthentikálni parent-tel is. - break; - } else { - // Ilyen csak hibás függvényműködés esetén lehet: - $_SESSION['alert'][] = "message:default:hibás visszatérési érték:userAuthentication:(".serialize($result).")"; - break; - } - } - } else { - $_SESSION['alert'][] = 'message:empty_field'; - } - } - -?> diff --git a/mayor-orig/www/include/base/mysql.php b/mayor-orig/www/include/base/mysql.php deleted file mode 100644 index b2e22f82..00000000 --- a/mayor-orig/www/include/base/mysql.php +++ /dev/null @@ -1,396 +0,0 @@ - $config) { - if ($config['backend'] == 'mysql') { - $MYSQL_DATA[$_policy . ' auth'] = array( - 'user' => $config['mysql user'], - 'host' => $config['mysql host'], - 'pw' => $config['mysql pw'], - 'db' => $config['mysql db'], - ); - if ($MYSQL_DATA[$_policy . ' auth']['host']=='') - if ($MYSQL_DATA['host']=='') - $MYSQL_DATA[$_policy . ' auth']['host'] = 'localhost'; - else - $MYSQL_DATA[$_policy . ' auth']['host'] = $MYSQL_DATA['host']; - } - } -//-----------------------------------------------------------------------// - - function db_selectDb($db,$lr) { - if (MYSQLI_ENABLED===true) - return mysqli_select_db($lr,$db); - else - return mysql_select_db($db,$lr); - } - - function db_connect($modul, $SET = array('priv' => null, 'force' => true, 'host'=> null, 'username' => null, 'password' => null, 'db' => null, 'fv' => null)) { - - global $MYSQL_DATA; - - $lr = false; - extract($SET); - if (!isset($force)) $force = true; - if (!isset($priv)) $priv = ''; - - //if ($MYSQL_DATA['persistent']===true) $mysql_connect = 'mysql_pconnect'; else $mysql_connect = 'mysql_connect'; - $mysql_connect = 'mysql_connect'; - /* setting host */ - if (!isset($host)) { - if ($MYSQL_DATA[$modul]['host'.$priv]=='') { - if ($MYSQL_DATA[$modul]['host']=='') { - if ($MYSQL_DATA['host']=='') { - $host = 'localhost'; - } else { - $host = $MYSQL_DATA['host']; - } - } else { - $host = $MYSQL_DATA[$modul]['host']; - } - } else { - $host = $MYSQL_DATA[$modul]['host'.$priv]; - } - } - /* --- */ - if ($priv == 'root') { - if (MYSQLI_ENABLED===true) - $lr = @mysqli_connect($host, $username, $password); // force new ??? - else - $lr = @$mysql_connect($host, $username, $password, $force); - } else { - /* --- */ - if (is_array($MYSQL_DATA[$modul])) { - if (isset($priv) && $priv != '' && isset($MYSQL_DATA[$modul]['user'.$priv])) { // Először megpróbálunk $priv szerinti privilégiummal csatlakozni - if (MYSQLI_ENABLED===true) - $lr = @mysqli_connect($host, $MYSQL_DATA[$modul]['user'.$priv], $MYSQL_DATA[$modul]['pw'.$priv], $MYSQL_DATA[$modul]['db']); - else - $lr = @$mysql_connect($host, $MYSQL_DATA[$modul]['user'.$priv], $MYSQL_DATA[$modul]['pw'.$priv], $force); - } - if ($lr === false) {// Ha nem sikerült, vagy nem volt megadva privilégium, akkor próbáljunk anélkül csatlakozni - if (MYSQLI_ENABLED===true) - $lr = @mysqli_connect($host, $MYSQL_DATA[$modul]['user'], $MYSQL_DATA[$modul]['pw'], $MYSQL_DATA[$modul]['db']); - else - $lr = @$mysql_connect($host, $MYSQL_DATA[$modul]['user'], $MYSQL_DATA[$modul]['pw'], $force); - } - } else { - $_SESSION['alert'][] = "message:sql_failure/${SET['fv']}:db_connect:modul $modul has no config"; - } - } - if ($lr) { - // mysql_set_charset('utf8', $lr); - if ($priv != 'root') $db = $MYSQL_DATA[$modul]['db']; - if ($db != '') { - $result = db_selectDb($db , $lr); - if ($result === true) { - if (MYSQLI_ENABLED===true) { - mysqli_set_charset($lr, "utf8"); - mysqli_query($lr, "SET NAMES utf8"); - mysqli_query($lr, "SET collation_connection='utf8_hungarian_ci'"); - } else { - mysql_query("SET NAMES utf8", $lr); - mysql_query("SET collation_connection='utf8_hungarian_ci'", $lr); - } - } else { - $_SESSION['alert'][] = "message:sql_select_db_failure:db_connect/${SET['fv']}:$modul:".$MYSQL_DATA[$modul]['db']; - mysql_close($lr); - return false; - } - } elseif (!isset($MYSQL_DATA[$modul]['db'])) { - $_SESSION['alert'][] = "message:sql_warning:db_connect/${SET['fv']}:modul $modul has empty database config value"; - } - } else { - if (__DEBUG || (defined('__DETAILED') && __DETAILED)) $_SESSION['alert'][] = "message:sql_connect_failure:db_connect/${SET['fv']}:modul - $modul, priv - $priv, username - $username, db - $db"; - else $_SESSION['alert'][] = "message:sql_connect_failure:db_connect/${SET['fv']}:$modul modul"; - } - return $lr; - - } - - function db_close($lr) { - if ($MYSQL_DATA['persistent']!==true) { - if (MYSQLI_ENABLED===true) - return mysqli_close($lr); - else - return mysql_close($lr); - } else - return true; // not closing; - } - -//-----------------------------------------------------------------------// - - function db_query($q, $SET, $olr = null) { - /* - $SET = array( - 'modul' => '...' - 'fv' => '...' - 'result' => 'indexed'|'assoc'|'multiassoc'|'idonly'|'value'|'record'|'keyvaluepair'|'insert'|'affected rows' - 'keyfield' => '...' (if result in (assoc,multiassoc)) - 'detailed' => true | false (default) (echo the query in error messages) - 'debug' => true | false (default) (echo the query before quering it) - 'rollback' => true | false (default) - 'values' => array(...) (if $q is an sprintf format string) - ); - */ - global $_JSON; - - if (!isset($q) || $q == '') { - $_SESSION['alert'][] = 'message:sql_query_failure:db_query/'.$SET['fv'].':query is empty'; - return false; - } - - if (!isset($SET['result'])) $SET['result'] = ''; - - // Adatbázis csatlakozás (ha szükséges) - if (isset($olr) && $olr != '') { - if (MYSQLI_ENABLED===true) - $mysql_get_server_info = mysqli_get_server_info($olr); - else - $mysql_get_server_info = @mysql_get_server_info($olr); - } - if (isset($olr) && $olr != '' && $mysql_get_server_info !== false) { - $lr = $olr; - } else { - unset($olr); - if (in_array(substr(strtolower($q),0,4), array('sele','show','expl','set ','use '))) $lr = @db_connect($SET['modul'], array('priv' => 'Read', 'fv' => $SET['fv'])); - else $lr = @db_connect($SET['modul'], array('priv' => 'Write', 'fv' => $SET['fv'])); - } - if ($lr === false) { - if ($SET['detailed'] === true || __DETAILED) $_SESSION['alert'][] = 'message:sql_connect_failure:db_query/'.$SET['fv'].':'.$SET['modul'].':'.$q; - else $_SESSION['alert'][] = 'message:sql_connect_failure:db_query/'.$SET['fv']; - return false; - } - - // Ha behelyettesítendő paraméterek vannak - if (isset($SET['values']) && is_array($SET['values']) && count($SET['values']) > 0) { - $SET['values'] = array_map('db_escape_string', $SET['values'], array_fill(0 , count($SET['values']), $lr)); - array_unshift($SET['values'], $q); - $q_pattern = $q; - $q = @call_user_func_array('sprintf', $SET['values']); - if ($q === false) { - $_SESSION['alert'][] = 'message:wrong_data:db_query:behelyettesítés:'.$SET['fv']; - return false; - } - } - if ((isset($SET['debug']) && $SET['debug']===true) || (defined('__DEBUG') && __DEBUG === true)) { - $_q = str_replace(" ",'',$q); - echo '
info:debug:'.htmlspecialchars($SET['modul'].':'.$SET['fv'].':'.date('Y-m-d H:i:s').': '." \n".$_q)."
"; - if ($_GET['skin'] == 'ajax') $_JSON['sql log'][] = $SET['modul'].':'.$SET['fv'].':'.date('Y-m-d H:i:s').': '." \n".$_q; - if ($_GET['skin'] == 'rpc') { - openlog("MaYoR", LOG_PID | LOG_PERROR, LOG_LOCAL0); - syslog(LOG_WARNING, '[RPC]MySQL: '.(json_encode($SET)).", query: $_q {$_SERVER['REMOTE_ADDR']} ({$_SERVER['HTTP_USER_AGENT']})"); - closelog(); - } - } - if ( - ($SET['detailed'] === true || __DETAILED) - && strpos($q_pattern, '%s') !== false - && (strpos($q_pattern, '`%s`') === false && strpos($q_pattern, "'%s'") === false) - ) $_SESSION['alert'][] = 'message:lehet hiba?:db_query/'.$SET['fv'].':'.$SET['modul'].':'.$q_pattern; - - if ($SET['log']===true) mayorLogger(10,'mysql',$q,_USERACCOUNT); - if (MYSQLI_ENABLED===true) - $r = mysqli_query($lr,$q); - else - $r = @mysql_query($q, $lr); - define(MYSQL_LOGGER,false); - if (MYSQL_LOGGER === true) { - $filename = '/tmp/mysql.log'; - $fp = fopen($filename, "a+"); - fputs ($fp, $q."\n"); - fclose ($fp); - } - /* WARNING HANDLER */ -// if ((isset($SET['debug']) && $SET['debug']===true) || (defined('__DEBUG') &&__DEBUG === true) || (defined('__DETAILED') && __DETAILED===true)) { - if ((isset($SET['debug']) && $SET['debug']===true) || (defined('__DEBUG') &&__DEBUG === true)) { - if (MYSQLI_ENABLED===true) - $warningCountResult = mysqli_query($lr,"SELECT @@warning_count"); - else - $warningCountResult = mysql_query("SELECT @@warning_count",$lr); - if ($warningCountResult) { - if (MYSQLI_ENABLED===true) - $warningCount = mysqli_fetch_row($lr,$warningCountResult); - else - $warningCount = mysql_fetch_row($warningCountResult); - if ($warningCount[0] > 0) { - //Have warnings - if (MYSQLI_ENABLED===true) - $warningDetailResult = mysqli_query($lr, "SHOW WARNINGS"); - else - $warningDetailResult = mysql_query("SHOW WARNINGS",$lr); - if ($warningDetailResult ) { - if (MYSQLI_ENABLED===true) - while ($warning = mysqli_fetch_assoc($lr, $warningDetailResult)) {dump($warning); mayorLogger(2,'mysql',$q.' '.$warning,_USERACCOUNT);} - else - while ($warning = mysql_fetch_assoc($warningDetailResult)) {dump($warning); mayorLogger(2,'mysql',$q.' '.$warning,_USERACCOUNT);} - } - }//Else no warnings - } - } - /* WARNING HANDLER */ - if (!$r) { - // if ($SET['detailed'] === true || __DETAILED) $_SESSION['alert'][] = 'message:sql_query_failure:'.$SET['fv'].':'.':'.$q; - if ($SET['detailed'] === true || __DETAILED) { - if (MYSQLI_ENABLED===true) { - $_SESSION['alert'][] = 'message:sql_query_failure:mysqli:'.$SET['fv'].':'.mysqli_error($lr).':'.$q; - } else { - $_SESSION['alert'][] = 'message:sql_query_failure:mysql:'.$SET['fv'].':'.mysql_error($lr).':'.$q; - } - } else { - $_SESSION['alert'][] = 'message:sql_query_failure:'.$SET['fv']; - } - if ($SET['rollback'] === true) db_rollback($lr, $SET['fv']); - if (!isset($olr)) db_close($lr); - return false; - } - - if (MYSQLI_ENABLED === true) { - - if (in_array(substr(strtolower($q),0,4), array('sele','show','expl','(sel'))) { - $RESULT = array(); - switch($SET['result']) { - case 'indexed': - while ($A = mysqli_fetch_assoc($r)) $RESULT[] = $A; - break; - case 'assoc': - while ($A = mysqli_fetch_assoc($r)) $RESULT[$A[$SET['keyfield']]] = $A; - break; - case 'multiassoc': - while ($A = mysqli_fetch_assoc($r)) $RESULT[$A[$SET['keyfield']]][] = $A; - break; - case 'idonly': - while ($A = mysqli_fetch_row($r)) $RESULT[] = $A[0]; - break; - case 'value': - if (mysqli_num_rows($r) > 0) { - $A = mysqli_fetch_row($r); $RESULT = $A[0]; - } else { $RESULT = null; } - break; - case 'record': - if (mysqli_num_rows($r) > 0) { - $A = mysqli_fetch_assoc($r); $RESULT = $A; - } else { $RESULT = null; } - break; - case 'keyvaluepair': - while ($A = mysqli_fetch_row($r)) $RESULT[$A[0]] = $A[1]; - break; - case 'keyvalues': - while ($A = mysqli_fetch_row($r)) $RESULT[$A[0]][] = $A[1]; - break; - } - } elseif ($SET['result'] == 'insert' && (substr(strtolower($q),0,6) == 'insert' || substr(strtolower($q),0,7) == 'replace')) { - $RESULT = mysqli_insert_id($lr); - mayorLogger(1,'mysql',$q,_USERACCOUNT); - } elseif ($SET['result'] == 'affected rows') { - $RESULT = mysqli_affected_rows($lr); - mayorLogger(1,'mysql',$q,_USERACCOUNT); - } else { // create, insert, de nem olyan resulttal... - $RESULT = $r; - mayorLogger(1,'mysql',$q,_USERACCOUNT); - } - } else { // OLD DRIVER - - if (in_array(substr(strtolower($q),0,4), array('sele','show','expl','(sel'))) { - $RESULT = array(); - switch($SET['result']) { - case 'indexed': - while ($A = mysql_fetch_assoc($r)) $RESULT[] = $A; - break; - case 'assoc': - while ($A = mysql_fetch_assoc($r)) $RESULT[$A[$SET['keyfield']]] = $A; - break; - case 'multiassoc': - while ($A = mysql_fetch_assoc($r)) $RESULT[$A[$SET['keyfield']]][] = $A; - break; - case 'idonly': - while ($A = mysql_fetch_row($r)) $RESULT[] = $A[0]; - break; - case 'value': - if (mysql_num_rows($r) > 0) { - $A = mysql_fetch_row($r); $RESULT = $A[0]; - } else { $RESULT = null; } - break; - case 'record': - if (mysql_num_rows($r) > 0) { - $A = mysql_fetch_assoc($r); $RESULT = $A; - } else { $RESULT = null; } - break; - case 'keyvaluepair': - while ($A = mysql_fetch_row($r)) $RESULT[$A[0]] = $A[1]; - break; - case 'keyvalues': - while ($A = mysql_fetch_row($r)) $RESULT[$A[0]][] = $A[1]; - break; - } - } elseif ($SET['result'] == 'insert' && (substr(strtolower($q),0,6) == 'insert' || substr(strtolower($q),0,7) == 'replace')) { - $RESULT = mysql_insert_id($lr); - mayorLogger(1,'mysql',$q,_USERACCOUNT); - } elseif ($SET['result'] == 'affected rows') { - $RESULT = mysql_affected_rows($lr); - mayorLogger(1,'mysql',$q,_USERACCOUNT); - } else { // create, insert, de nem olyan resulttal... - $RESULT = $r; - mayorLogger(1,'mysql',$q,_USERACCOUNT); - } - } // DRIVER - - if (!isset($olr)) db_close($lr); - return $RESULT; - - } - -//-----------------------------------------------------------------------// - - function db_start_trans($lr) { - if ($lr != '') - if (MYSQLI_ENABLED === true) - mysqli_query($lr, "START TRANSACTION"); - else - mysql_query("START TRANSACTION", $lr); - } - - function db_commit($lr) { - if ($lr != '') - if (MYSQLI_ENABLED === true) - mysqli_query($lr, "COMMIT"); - else - mysql_query("COMMIT", $lr); - } - - function db_rollback($lr, $msg = '') { - if ($lr != '') { - $_SESSION['alert'][] = 'message:rollback:'.$msg; - if (MYSQLI_ENABLED === true) - mysqli_query($lr, "ROLLBACK"); - else - mysql_query("ROLLBACK", $lr); - } - } - -//---------------------------------------------------------------------// - - function db_escape_string($str, $olr = null) { - - if (isset($olr)) $lr = $olr; - else $lr = db_connect('login'); - - if (!$lr) return false; - - if(get_magic_quotes_gpc()) { - $return = mysql_real_escape_string(stripslashes($str), $lr); - } else { - if (MYSQLI_ENABLED===true) - $return = mysqli_real_escape_string($lr, $str); - else - $return = mysql_real_escape_string($str, $lr); - } - if (!isset($olr)) db_close($lr); - - return $return; - } - -?> diff --git a/mayor-orig/www/include/base/rights.php b/mayor-orig/www/include/base/rights.php deleted file mode 100644 index dc6b7aa7..00000000 --- a/mayor-orig/www/include/base/rights.php +++ /dev/null @@ -1,397 +0,0 @@ -= 0; $i--) $ret |= ord($res[$i]); - return !$ret; - } - } -} - - -function sessionCookieEncode($sessionID,$now,$extra='') -{ - if ($extra=='') $extra = uniqid(rand(), true); - $extraHash=sessionHash('ripemd160',$extra); - $pwHash = sessionHash('ripemd160',uniqid(rand(), true)); - $value = base64_encode(strtotime($now).'g'.$extraHash.'g'.$pwHash); - return array('name'=>($sessionID), 'value'=>$value, 'store'=> $extraHash, 'pwHash'=>$pwHash); -} - -function sessionCookieDecode($sessionID) -{ - return explode('g',base64_decode($_COOKIE[($sessionID)])); -} - -function pseudoTokenGenerator() { - - if (function_exists('openssl_random_pseudo_bytes')) - $token = bin2hex(openssl_random_pseudo_bytes(32)); - else - $token = bin2hex(sessionHash()); - return $token; -} - -###################################################################### -# Azonosított user ellenőrzése a session tábla alapján -###################################################################### - -function validUser($sessionID,$policy,$skin='',$lang='') { - global $page; - if (_RUNLEVEL === 'cron') { - define('_USERPASSWORD','MaYoR-cron'); - define('_USERACCOUNT','MaYoR-cron'); - define('_USERCN','MaYoR-cron User'); - define('_STUDYID',''); - define('_LANG',$lang); - define('_SESSIONID','cron'); - return true; - } - -// if ($sessionID == '' || $MAYORAPIAUTH['valid']!==true) { - if ($sessionID == '') { - $MAYORAPIAUTH = mayorApiAuth(); // van-e hosszulejáratu session-je - if ($policy == _POLICY && $MAYORAPIAUTH['valid']!==true) { - define('_USERPASSWORD',''); - define('_USERACCOUNT',''); - define('_USERCN',''); - define('_STUDYID',''); - define('_LANG',$lang); - define('_SESSIONID',''); - } - return false; - } else { - - $lr = db_connect('login', array('fv' => 'validUser')); - - if ($lr === false) die('A keretrendeszer adatbázisa nem érhető el! (validUser)'); - // ha nem tudta beállítani a sütit, akkor az $_sc üres lesz így a dt feltétel 1970-01-01, ami nem gond. - list($_sessionDt,$_sessionCookie,$_sessionPwHash) = sessionCookieDecode($sessionID); - $query = "SELECT userAccount, userCn, studyId, aes_decrypt(userPassword, '%s'), skin, lang, activity, dt - FROM session WHERE sessionID='%s' AND policy='%s'"; // [SECURITY-002] quickfix from marton.drotos@sztaki.hu - - if (defined('_SESSION_MAX_IDLE_TIME') and _SESSION_MAX_IDLE_TIME != 0) $query .= " AND activity + INTERVAL "._SESSION_MAX_IDLE_TIME." HOUR > NOW()"; - - $query .= " AND dt='".date('Y-m-d H:i:s', (($_sessionDt=="")?null:$_sessionDt) )."'"; - $query .= " AND sessionCookie='%s'"; - - $ret = db_query($query, array('fv' => 'validUser', 'modul' => 'login', 'result' => 'indexed', 'values' => array($_sessionPwHash, $sessionID, $policy, $_sessionCookie)), $lr); - $num = count($ret); - $sessionMode = 1; - - // ha nincs találat, nézzük meg, van-e a kliensnek hosszú lejáratú tokenje, kivéve, ha ... - if ($num !== 1 && $page!='password') { - $MAYORAPIAUTH = mayorApiAuth(); - if ($MAYORAPIAUTH['valid'] === true) { - global $sessionMode; - $sessionMode = 2; - // reauth AS: - $toPolicy = $MAYORAPIAUTH['policy']; - $userAccount = $MAYORAPIAUTH['userAccount']; - $userCn = $MAYORAPIAUTH['userCn']; - $studyId = $MAYORAPIAUTH['studyId']; - $userPassword = ''; - $lang = _DEFAULT_LANG; - } else { - unsetTokenCookies(); - } - } // --token vizsgálat vége - - if ($num == 1) { - - if ($sessionMode == 1) list($userAccount, $userCn, $studyId, $userPassword, $savedSkin, $lang, $activity, $dt) = array_values($ret[0]); - global $SKINS; - if (_USER_AGENT!=='ppc' && @in_array($savedSkin,$SKINS) ) $skin=$savedSkin; - if ($policy == _POLICY) { - define('_USERACCOUNT',$userAccount); - define('_USERCN',$userCn); - define('_STUDYID',$studyId); - define('_USERPASSWORD',$userPassword); -// define('_SKIN',$skin); - define('_LANG',$lang); - define('_SESSIONID',$sessionID); - } - - // Aktivitás figyelése! // hopp, nem biztos, hogy van session! - $query = "UPDATE session SET activity = NOW() WHERE sessionID = '%s'"; - db_query($query, array('fv' => 'validUser', 'modul' => 'login', 'values' => array($sessionID)), $lr); - db_close($lr); - return true; - - } else { - - if ($policy == _POLICY) { - define('_USERPASSWORD',''); - define('_USERACCOUNT',''); - define('_USERCN',''); - define('_STUDYID',''); -// define('_SKIN',$skin); - define('_LANG',$lang); - define('_SESSIONID',''); - } - db_close($lr); - if ($num > 1) $_SESSION['alert'][] = 'message:multi_session'; - if ($_sessionDt==="") define('_NOCOOKIE',true); // beállítjuk, hogy üzenni tudjunk - - return false; - - } - - } - -} - -//=================================================================================================================================== -// ------------------------------------------ -// debug üzenetek tárolása - a $_DEBUG változóba kerül midnen -// ------------------------------------------ - if (_RUNLEVEL!=='cron') ob_start(); - -// ------------------------------------------ -// a $page, $sub és $f csak a-z betűvel kezdődhet, utána pedig csak (a-z, /_-). $page és $f nem lehet üres -// ------------------------------------------ - - if ( - (preg_match('#^([a-z]|[A-Z])([0-9]|[a-z]|[A-Z]|/|_|-)*$#', $page) == false) OR - ($sub != '' AND preg_match('#^([a-z]|[A-Z])([0-9]|[a-z]|[A-Z]|/|_|-)*$#', $sub) == false) OR - (preg_match('#^([0-9]|[a-z]|[A-Z]|_|-)*$#', $f) == false) - ) { - $_SESSION['alert'][] = 'page:wrong_page:'; - $RIGHTS_OK = false; - } else { - $RIGHTS_OK = true; - } - -// ------------------------------------------ -// Security Check: $policy szerinti ellenőrzés -// ------------------------------------------ - - // A validUser (session.php) beállítja az alapvető session konstansokat is - if ( !validUser($sessionID,$policy,$skin,$lang) ) { - if ($AUTH[$policy]['authentication'] == 'required') { - if (defined('_NOCOOKIE')) $_SESSION['alert'][] = 'message:cookie';//$extendAlert='alert[]=message:cookie&'; - $_SESSION['alert'][]='message:auth_failure:'._CONTROL_FLAG_REQUIRED; - header('Location: index.php?policy=public&page=auth&f=login&toPolicy='.$policy."&toPSF=$page:$sub:$f&sessionID=$sessionID"); - die(); - } else { - // Hibás, vagy nem létező sessionID esetének kezelése - ha nem kötelező a sessionID --> nem csinálunk semmit (lehet egy másik policy-ben valid - } - - } - if (file_exists('include/share/session/base.php')) { - // A session kezeléshez szükséges backend függő függvények pl. memberOf - require('include/share/session/base.php'); - - } - // Remote Protocol Call (MaYoR) - if ($skin=='rpc') { - define('_RPC',true); - require_once('include/share/ssl/ssl.php'); - try - { - $_RPC['senderNodeId'] = $senderNodeId = readVariable($_POST['senderNodeId'],'strictstring',0); - $RPC = new Interconnect(); - $RPC->setRequestTarget('controller'); // A remoteHost lekérdezéshez kellhet - $RPC->setRemoteHostByNodeId($_RPC['senderNodeId']); - $RPC->processRequest(); // vélhetően van request - $_RPC['request'] = $RPC->getIncomingRequest(); - } - catch (Exception $e) - { - //$func=''; - //$DATA = array('error'=>$e->getMessage()); - } - } else { define('_RPC',false); } - // Interconnect end - - define('_RIGHTS_OK',$RIGHTS_OK); - - /* XSRF2 */ - define('__SALTNAME','MS_'.sha1($page.'_'.$sub.'_'.$f)); - define('__SALTVALUE',sessionHash()); - // mtoken - if (empty($_SESSION['mayorToken'])) { - $_SESSION['mayorToken'] = pseudoTokenGenerator(); - } - if (count($_POST)>0) { - if (!empty($_POST['mayorToken'])) { - if (hash_equals($_SESSION['mayorToken'], $_POST['mayorToken'])) { - // OK, token regenerálás + visszakuldjuk az ETAG-ben - $_SESSION['mayorToken'] = pseudoTokenGenerator(); - } else { - if ($_POST['action']!='') { /* Ha nincs action formváltozó, nincs szükség hibaüzenetre, a form nem módosít, de most... */ - $_SESSION['alert'][] = 'message:not_valid_form:pnu2'; - $_JSON['result'] = false; - } - unset($_POST['action']); - unset($action); - } - } else { // klasszikus ellenőrzés, fallback - echo 'FATAL ERROR 696'; - die(); - /* - // $_JSON['result'] = false; // ITT gátolhatjuk a működést - if ($_COOKIE[__SALTNAME]=='') { // a session átállásig - ez semmitől nem véd, adott nevű sütit generálni bárki tud - $_SESSION['alert'][] = 'message:not_valid_form:no cookie'.$_SESSION[__SALTNAME]; - $_JSON['result'] = false; - unset($_POST['action']); - unset($action); - } elseif (!is_null($_COOKIE[__SALTNAME]) && ($_COOKIE[__SALTNAME] == $_POST[__SALTNAME])) { - // rendben - } else { - if ($_POST['action']!='') { // Ha nincs action formváltozó, nincs szükség hibaüzenetre, a form nem módosít - $_SESSION['alert'][] = 'message:not_valid_form'; - $_JSON['result'] = false; - } - unset($_POST['action']); - unset($action); - } - */ - } // END DEPRECATED BLOCK - } - // eredeti post kezelés + ETAG prevent cache - if (($_SERVER['HTTPS']!=='on') || (isset($_SERVER['HTTP_REFERER']) && $_SERVER['HTTP_REFERER']!='' && substr($_SERVER['HTTP_REFERER'],4,1)!=='s')) $_ssl = false; else $_ssl=true; - -//4400 if (@setcookie('xxxDEPRECATEDxxx_'.__SALTNAME,__SALTVALUE,time()+60*60*_SESSION_MAX_IDLE_TIME,'/','',$_ssl, true) == false) { -//4400 $_SESSION['alert'][] = 'message:no_cookie:unabletoset'; -//4400 } - - - /* /XSRF2 previous revision: r4138 */ - - // betöltjük az össes config-ot... (lásd még widgets) - try { - $_dirlist = scandir(_CONFIGDIR); - for ($i=0; $igetMessage(); - } - // ha betöltenénk az ÖSSZES modul include-jait, akkor be kéne mindent tölteni kb. ugyhogy ezt hagyjuk - if ($dh_all = @opendir("include/widgets/")) { - $includes = array(); - while (($_file = readdir($dh_all)) !== false) { - if (substr($_file,-4) == '.php') $includes[] = $_file; - } - closedir($dh_all); - sort($includes); - for ($i = 0; $i < count($includes); $i++) { - require_once("include/widgets/".$includes[$i]); - } - } - unset($file); - /* ---- */ - if (!in_array($page,$_loadModule)) $_loadModule[] = $page; - for ($i=0; $i10) array_shift($_SESSION['breadcrumb']); - $_SESSION['breadcrumb'][] = array('page'=>"$page",'sub'=>"$sub",'f'=>"$f"); - // --------- - if (file_exists($includeFile)) require($includeFile); - if (file_exists($skinFile)) require($skinFile); - if (file_exists($preFile)) include($preFile); - -// --------------------------------------- -// debug üzenetek tárolásának vége -// --------------------------------------- - $_DEBUG = ob_get_contents(); - ob_end_clean(); - - -?> \ No newline at end of file diff --git a/mayor-orig/www/include/base/str.php b/mayor-orig/www/include/base/str.php deleted file mode 100644 index 5c5a7c07..00000000 --- a/mayor-orig/www/include/base/str.php +++ /dev/null @@ -1,230 +0,0 @@ - Lat2 --> ékezettelen) -// ------------------------------------------------------------------- - -function ekezettelen($str) { - return strtr(mb_convert_encoding($str, 'ISO-8859-2', 'UTF-8'), '', 'aaeiooouuuAAEIOOOUUU'); -} - -/* -// --------------------------------------------------------------------------- -// -// UTF8 <--> ISO88592 váltás -// -// --------------------------------------------------------------------------- - -function UTF8_to_ISO88592($str) { - - return mb_convert_encoding($str,'ISO-8859-2','UTF-8'); - -} - -function ISO88592_to_UTF8($str) { - - return mb_convert_encoding($str,'UTF-8','ISO-8859-2'); - -} -*/ - -// --------------------------------------------------------------------------- -// -// Két string összehasonlítása a magyar ABC szerint ($a < $b => -1) -// -// --------------------------------------------------------------------------- - -function str_cmp($a,$b) { - - $ABC = Array('a'=>1, - ''=>1, - ''=>1, - 'b'=>3, - 'c'=>4, - 'd'=>5, - 'e'=>6, - ''=>7, - 'f'=>8, - 'g'=>9, - 'h'=>10, - 'i'=>11, - ''=>12, - 'j'=>13, - 'k'=>14, - 'l'=>15, - 'm'=>16, - 'n'=>17, - 'o'=>18, - ''=>18, - ''=>20, - ''=>20, - 'p'=>22, - 'q'=>23, - 'q'=>24, - 'r'=>25, - 's'=>26, - 't'=>27, - 'u'=>28, - ''=>28, - ''=>30, - ''=>30, - 'v'=>32, - 'x'=>33, - 'w'=>34, - 'y'=>35, - 'z'=>36 - ); - - $a = kisbetus(mb_convert_encoding($a,'ISO-8859-2','UTF-8')); - $b = kisbetus(mb_convert_encoding($b,'ISO-8859-2','UTF-8')); - - if ($a==$b) return 0; - - $i=0; - while( $i= 1000) { $roman .= "M"; $number = $number -1000; } - while ($number >= 900) { $roman .= "CM"; $number = $number -900; } - while ($number >= 500) { $roman .= "D"; $number = $number -500; } - while ($number >= 400) { $roman .= "CD"; $number = $number -400; } - while ($number >= 100) { $roman .= "C"; $number = $number -100; } - while ($number >= 90) { $roman .= "XC"; $number = $number -90; } - while ($number >= 50) { $roman .= "L"; $number = $number -50; } - while ($number >= 40) { $roman .= "XL"; $number = $number -40; } - while ($number >= 10) { $roman .= "X"; $number = $number -10; } - while ($number >= 9) { $roman .= "IX"; $number = $number -9; } - while ($number >= 5) { $roman .= "V"; $number = $number -5; } - while ($number >= 4) { $roman .= "IV"; $number = $number -4; } - while ($number >= 1) { $roman .= "I"; $number = $number -1; } - return $roman; - } - - function visszafele($e) {$b='';for($i=0; $i= 0; $i--) $ret |= ord($res[$i]); - return !$ret; - } - } - } - - if ( !function_exists( 'hex2bin' ) ) { - function hex2bin( $str ) { - $sbin = ""; - $len = strlen( $str ); - for ( $i = 0; $i < $len; $i += 2 ) { - $sbin .= pack( "H*", substr( $str, $i, 2 ) ); - } - return $sbin; - } - } - - function makeLinksClickable($text){ - $pattern[] = '/(\S+@\S+\.\S+)/'; - $replace[] = '$1'; - $pattern[] = '!(((f|ht)tp(s)?://)[-a-zA-Zа-яА-Я()0-9@:%_+.~#?&;//=]+)!i'; -// $replace[] = '$1 '; - $replace[] = '[LINK]'; - return preg_replace($pattern, $replace, $text); - } - function supertext($txt) { - $r = $txt; - $r = htmlspecialchars($r); - $pattern[]='/@diakId:(\d+)/'; - $pattern[]='/@tanarId:(\d+)/'; - $pattern[]='/@tankorId:(\d+)/'; - //$pattern[]='/@osztalyId:(\d+)/'; - $replacement[]=''; - $replacement[]=''; - $replacement[]='[tankör adatok]'; - //$replacement[]='[osztály adatok]'; - $r = preg_replace($pattern,$replacement,$r); - return $r; - } - - - require_once('include/share/date/names.php'); - function superdate($datetime) { - global $aHetNapjai; - $stamp = strtotime($datetime); - $date = date('Y-m-d',$stamp); - $dow = date('N',$stamp); - $Hi = date('H:i',$stamp); - if ($Hi == '00:00') $Hi = ''; - if ($stamp<=strtotime('-6 day')) { - return date('Y.m.d.', $stamp).' '.$Hi; - } elseif ($date==date('Y-m-d')) { - return 'Ma '.$Hi; - } elseif ($dow>date('N')) { - return 'Múlt hét '.kisbetus($aHetNapjai[$dow-1]).' '.$Hi; - } else { - return $aHetNapjai[$dow-1].' '.$Hi; - } - } - -?> diff --git a/mayor-orig/www/include/base/var.php b/mayor-orig/www/include/base/var.php deleted file mode 100644 index 3068fbc6..00000000 --- a/mayor-orig/www/include/base/var.php +++ /dev/null @@ -1,134 +0,0 @@ -= 0) ? intval($IN) : $default; - break; - case 'float': - $return = (isset($IN) && is_numeric($IN)) ? floatval($IN) : $default; - break; - case 'float unsigned': - $return = (isset($IN) && is_numeric($IN) && $IN >= 0) ? floatval($IN) : $default; - break; - case 'datetime': - $return = (isset($IN) && $IN != '' && strtotime($IN) !== false && strtotime($IN) > 0) ? $IN : $default; - break; - case 'date': - $return = (isset($IN) && $IN != '' && strtotime($IN) !== false && strtotime($IN) > 0) ? date('Y-m-d',strtotime($IN)) : $default; - break; - case 'enum': - case 'emptystringnull': - case 'string': - if(get_magic_quotes_gpc()) $IN = stripslashes($IN); // -- DEPRECATED (mindig false) - $return = (isset($IN) && $IN != '') ? $IN : $default; - break; - case 'notempty': - $return = (isset($IN) && $IN != '') ? true : false; - break; - case 'bool': - // Ha nincs beállítva, akkor mindenképp true lenne így: - // $return = (isset($IN) && ($IN === 'false' || !$IN)) ? false : true; - $return = (isset($IN)) ? (($IN === 'false' || !$IN)? false : true) : $default; - break; - case 'strictstring': - $return = (isset($IN)) ? preg_replace("/[^a-zA-Z0-9_\-]/i",'',$IN) : $default; - break; - case 'html': - $return = (isset($IN)) ? preg_replace("/[^a-zA-Z0-9\ \.\,?_|:;űáéúőóüöíŰÁÉÚŐÓÜÖÍ\-]/i",'',$IN) : $default; - break; - case 'hexa': - $return = preg_replace("/[^0-9a-fA-F]/i",'',$IN); - break; - case 'number': - $return = preg_replace("/[^0-9]/",'',$IN); - break; - case 'sql': - $return = db_escape_string($IN); - if ($return === false) $return = $default; - break; - case 'path': - $return = ( preg_match('#^([a-z]|[A-Z]|[0-9])([0-9]|[a-z]|[A-Z]|/|_|-)*$#', $IN ) != false ) ? $IN : $default; - break; - case 'regexp': - $return = ( preg_match( "#$allowOnly[0]#", $IN ) == 1 ) ? $IN : $default; - break; - case 'regreplace': - $return = preg_replace( '#'.$allowOnly[0].'#i', '', $IN ); - break; - case 'mail': - case 'email': - $return = filter_var($IN, FILTER_VALIDATE_EMAIL); - break; - case 'userAccount': - $return = (preg_match("#([a-z]|[A-Z]|[0-9]| |\.|,|_|[űáéúőóüöíŰÁÉÚŐÓÜÖÍäÄ]|-|@)*$#", $IN) != false) ? $IN : $default; - break; - default: - $return = $IN; - $_SESSION['alert'][] = 'message:unknown_type:'.$type.':readVariable'; - break; - } - if ($return !== $default && !in_array($type,array('regexp','regreplace')) && count($allowOnly) > 0) $return = (in_array($return, $allowOnly)) ? $return : $default; - if (isset($condition) && $return != $default) $return = (eval("return $condition;")) ? $return : $default; - } - - return $return; - } - - function in_date_interval($dt,$tolDt,$igDt) { - $accept = false; - if ($dt == date('Y-m-d', strtotime($tolDt))) // ha a kezdőnapra esik - $accept = true; - if ($dt == date('Y-m-d', strtotime($igDt))) // ha a végnapra esik - $accept = true; - return ( - $accept - || ( - (is_null($tolDt) || strtotime($tolDt)<=strtotime($dt)) - && (is_null($igDt) || strtotime($dt)<=strtotime($igDt)) - ) - ); - } - - // FIGYELEM! Csak megbízható belső kódban használjuk - function reindex($THIS, $HOW) { - // ha nincs megadva, hogy hogy, adjuk vissza az eredeti tömböt - if (!is_array($HOW) || count($HOW)==0) return $THIS; - - $RET = array(); - for ($i=0; $i'; - call_user_func_array('var_dump', $ARGS); - echo '
'; - - } - -?> diff --git a/mayor-orig/www/include/menu/base.php b/mayor-orig/www/include/menu/base.php deleted file mode 100644 index c5a7d773..00000000 --- a/mayor-orig/www/include/menu/base.php +++ /dev/null @@ -1,107 +0,0 @@ - array( // Az első szinten a modulok menüpontjai - array('txt1'[,'url1']), - [array('txt2'[,'url2']), ...] - ), - [$page2 => array( ... ), ...] - $item1 => array( // Az elsp szinten nem modulhoz tartozó tételek - array('txt1'[,'url1']), - [array('txt2'[,'url2']), ...] - ), - [$item2 => array( ... ), ...] - 'modules' => array( // 'modules'-en belul csak page-ek vannak - $page1 => array( - 'sub' => array( // 'sub'-on belül csak sub-ok vannak - $sub1 => array( - $f1 => array( - array('txt1'[,'url1']), - [array('txt2'[,'url2']), ...] - ), - [$f2 => array( - array('txt1'[,'url1']), - [array('txt2'[,'url2']), ...] - ), ...] - ), - [$sub2 => arrray( ... ), ...] - ), - [$f1 => array( - array('txt1'[,'url1']), - [array('txt2'[,'url2']), ...] - ), ...] - ), - [$page2 => array( ... ), ...] - ) - ) - -Kirajzolva: - -$M[$page1][0] | $M[$page1][1] ... | $M[$page2][0] | ... | $M[$item1][0] | $M[$item1][1] ... -$M['modules'][$page][$f1][0] | $M['modules'][$page][$f1][1] ... | $M['modules'][$page][$f2][0] | $M['modules'][$page][$f1][0] ... -$M['modules'][$page]['sub'][$sub][$f1][0] ... $M['modules'][$page]['sub'][$sub][$f2][0] - -Például: - - $MENU['modules']['login'] = array( - 'sub' => array( - - 'sub1' => array( - 'f11' => array( - array('txt' => 'Kakukk'), - array('txt' => 'Tojás', 'url'=>'http://') - ) - ), - 'sub2' => array( - 'f21' => array( - array('txt' => 'Cica'), - ) - ) - - ), - 'login' => array( - array('txt' => 'Szülői bejelentkezés','url' => '&toPolicy=parent'), - array('txt' => 'Bejelentkezés','url' => '&toPolicy=private'), - ) - ); -*/ - -?> diff --git a/mayor-orig/www/include/menu/parent/hu_HU/base.php b/mayor-orig/www/include/menu/parent/hu_HU/base.php deleted file mode 100644 index 9bb5a5db..00000000 --- a/mayor-orig/www/include/menu/parent/hu_HU/base.php +++ /dev/null @@ -1,44 +0,0 @@ - 'Kilépés', - 'url' => 'index.php?policy=public&page=session&f=logout', - 'get' => array('sessionID','skin','lang') - ) - ); - $MENU['session'] = array( - array( - 'txt' => 'Jelszóváltoztatás', - 'url' => 'index.php?page=password&sub=&f=changeMyPassword&userAccount='._USERACCOUNT.'&policy=public&toPolicy=parent', - 'get' => array('skin','lang','sessionID'), - ) - ); - } - $MENU['modules']['session'] = array( - // 'searchAccount' => array(array('txt' => 'Felhasználó keresése','url' => 'index.php?page=session&sub=search&f=searchAccount')), -// 'searchGroup' => array(array('txt' => 'Csoport keresése','url' => 'index.php?page=session&sub=search&f=searchGroup')), - 'changeMyPassword' => array(array('txt' => 'Jelszóváltoztatás','url' => 'index.php?page=password&sub=&f=changeMyPassword&userAccount='._USERACCOUNT.'&policy=public&toPolicy=parent','get' => array('skin','lang','sessionID'))), -// 'sub' => array( -// 'search' => array( -// 'searchAccount' => array(array('txt' => 'Felhasználó keresése')), -// 'searchGroup' => array(array('txt' => 'Csoport keresése')), -// ) -// ) - ); -// $MENU['home'] = array( -// array('txt' => 'Kezdőlap', 'url' => 'index.php') -// ); - - global $NAV; - if ($page=='session') { - if (is_array($MENU['modules']['session'])) foreach ($MENU['modules']['session'] as $_sub => $M) { - $NAV[2][] = array('page' => 'session', 'f' => $_sub); - } - } - $NAV[1][] = array('page'=>'session','f'=>'changeMyPassword'); - $NAV[1][] = array('page'=>'logout'); - - -?> \ No newline at end of file diff --git a/mayor-orig/www/include/menu/parent/hu_HU/module-naplo.php b/mayor-orig/www/include/menu/parent/hu_HU/module-naplo.php deleted file mode 100644 index 7ccfde13..00000000 --- a/mayor-orig/www/include/menu/parent/hu_HU/module-naplo.php +++ /dev/null @@ -1,76 +0,0 @@ - 'Hírnök', 'url' => 'index.php?page=naplo&sub=hirnok&f=hirnok', 'icon' => 'icon-bullhorn'); - $NAVI[] = array('txt' => 'Órarend', 'url' => 'index.php?page=naplo&sub=orarend&f=orarend', 'icon' => 'icon-th'); - $NAVI[] = array('txt' => 'Jegyek', 'url' => 'index.php?page=naplo&sub=osztalyozo&f=diak', 'icon' => 'icon-pencil'); - - - $MENU['naplo'] = array( - array('txt' => 'Napló'), -// array('txt' => 'Jelentkezés fogadóórára', 'url' => 'index.php?page=naplo&sub=tanev&f=fogadoOra'), - array('txt' => 'Kezdőlap (diák választás)', 'url' => 'index.php?page=naplo&sub=&f=diakValaszto') - ); - - // A menüpontok sorrendjének beállítása - ettől még nem jelenik meg semmi :) - $MENU['modules']['naplo'] = array( - 'haladasi' => array(), - 'osztalyozo' => array(), - 'hianyzas' => array(), - 'bejegyzesek' => array(), - 'tanev' => array(), - 'intezmeny' => array(), - 'admin' => array(), - ); - -if ($page=='naplo') { - - if (__DIAK) { - $MENU['modules']['naplo']['haladasi'] = array(array('txt' => 'Haladási napló', 'url' => 'index.php?page=naplo&sub=haladasi&f=haladasi')); - $MENU['modules']['naplo']['osztalyozo'] = array(array('txt' => 'Osztályozó napló', 'url' => 'index.php?page=naplo&sub=osztalyozo&f=diak')); - $MENU['modules']['naplo']['hianyzas'] = array(array('txt' => 'Hiányzások', 'url' => 'index.php?page=naplo&sub=hianyzas&f=diak')); - $MENU['modules']['naplo']['bejegyzesek'] = array(array('txt' => 'Bejegyzések', 'url' => 'index.php?page=naplo&sub=bejegyzesek&f=bejegyzesek')); - $MENU['modules']['naplo']['ertekeles'] = array(array('txt' => 'Értékelés', 'url' => 'index.php?page=naplo&sub=ertekeles&f=ertekeles')); - $MENU['modules']['naplo']['sub']['osztalyozo'] = array( - 'dolgozat' => array(array('txt' => 'Dolgozatok')), - 'bizonyitvany' => array(array('txt' => 'Bizonyítvány')), - 'stat' => array(array('txt' => 'Zárási statisztika')), - ); - $MENU['modules']['naplo']['sub']['tanev'] = array( - 'munkaterv' => array(array('txt' => 'Éves munkaterv', 'url' => 'index.php?page=naplo&sub=tanev&f=munkaterv')), - 'fogadoOra' => array(array('txt' => 'Fogadóóra', 'url' => 'index.php?page=naplo&sub=tanev&f=fogadoOra')) - ); - $MENU['modules']['naplo']['fogad'] = array(array('txt' => 'Fogadóóra', 'url' => 'index.php?page=naplo&sub=tanev&f=fogadoOra')); - $MENU['modules']['naplo']['munkaterv'] = array(array('txt' => 'Éves munkaterv', 'url' => 'index.php?page=naplo&sub=tanev&f=munkaterv')); - $MENU['modules']['naplo']['orarend'] = array(array('txt' => 'Órarend', 'url' => 'index.php?page=naplo&sub=orarend&f=orarend')); - $MENU['modules']['naplo']['intezmeny'] = array( - array('txt' => 'Diák adatlapja', 'url' => 'index.php?page=naplo&sub=intezmeny&f=diak'), - array('txt' => 'Tanévváltás', 'url' => 'index.php?page=naplo&sub=intezmeny&f=valtas') - ); - $MENU['modules']['naplo']['sub']['haladasi'] = array( - 'stat' => array(array('txt' => 'Haladási statisztika')), - ); - if (__UZENO_INSTALLED===true) - $MENU['modules']['naplo']['uzeno'] = array(array('txt' => 'Üzenő', 'url' => 'index.php?page=naplo&sub=uzeno&f=uzeno')); - $MENU['modules']['naplo']['hirnok'] = array(array('txt' => 'Hírnök', 'url' => 'index.php?page=naplo&sub=hirnok&f=hirnok')); - $MENU['modules']['naplo']['valasztas'] = array(array('txt' => 'Kezdőlap (diák választás)', 'url' => 'index.php?page=naplo&sub=&f=diakValaszto')); - - } - - // Navigáció - alapértelmezés - array_unshift($NAV[1], array('page' => 'naplo', 'sub' => 'orarend')); - array_unshift($NAV[1], array('page' => 'naplo', 'sub' => 'hianyzas')); - array_unshift($NAV[1], array('page' => 'naplo', 'sub' => 'osztalyozo')); - array_unshift($NAV[1], array('page' => 'naplo', 'sub' => 'haladasi')); - - if (is_array($MENU['modules']['naplo']['sub'][$sub])) foreach ($MENU['modules']['naplo']['sub'][$sub] as $_f => $M) { - $NAV[2][] = array('page' => 'naplo', 'sub' => $sub, 'f' => $_f); - } elseif (is_array($MENU['modules']['naplo'])) foreach ($MENU['modules']['naplo'] as $_f => $M) { - if ($_f != 'sub') $NAV[2][] = array('page' => 'naplo', 'sub' => $_f); - } -} - - -?> diff --git a/mayor-orig/www/include/menu/parent/hu_HU/module-portal.php b/mayor-orig/www/include/menu/parent/hu_HU/module-portal.php deleted file mode 100644 index 802a2d6e..00000000 --- a/mayor-orig/www/include/menu/parent/hu_HU/module-portal.php +++ /dev/null @@ -1,11 +0,0 @@ - 'naplo')); - - if (is_array($MENU['modules']['portal']['sub'][$sub])) foreach ($MENU['modules']['portal']['sub'][$sub] as $_f => $M) { - $NAV[2][] = array('page' => 'portal', 'sub' => $sub, 'f' => $_f); - } elseif (is_array($MENU['modules']['portal'])) foreach ($MENU['modules']['portal'] as $_sub => $M) { - if ($_sub != 'sub') $NAV[2][] = array('page' => 'portal', 'sub' => $_sub); - } - -?> \ No newline at end of file diff --git a/mayor-orig/www/include/menu/private/hu_HU/base.php b/mayor-orig/www/include/menu/private/hu_HU/base.php deleted file mode 100644 index c872a4ca..00000000 --- a/mayor-orig/www/include/menu/private/hu_HU/base.php +++ /dev/null @@ -1,67 +0,0 @@ - 'Kilépés', - 'url' => 'index.php?policy=public&page=session&f=logout', - 'get' => array('sessionID','skin','lang') - ) - ); - $MENU['session'] = array( - array( - 'txt' => 'Felhasználók', - 'url' => 'index.php?page=session' -// 'url' => 'index.php?page=session&sub=search&f=searchAccount' - ) - ); - } - - if (memberOf(_USERACCOUNT, $AUTH[_POLICY]['adminGroup'])) { -/* $MENU['admin'] = array( - array( - 'txt' => 'Admin', - 'url' => 'index.php?page=session&sub=admin&f=registration', - ) - ); -*/ - $MENU['modules']['session'] = array( - 'createAccount' => array(array('txt' => 'Új felhasználó')), - 'createGroup' => array(array('txt' => 'Új csoport')), - 'searchAccount' => array(array('txt' => 'Felhasználó keresése','url' => 'index.php?page=session&sub=search&f=searchAccount')), - 'searchGroup' => array(array('txt' => 'Csoport keresése','url' => 'index.php?page=session&sub=search&f=searchGroup')), - 'changeMyPassword' => array(array('txt' => 'Jelszóváltoztatás','url' => 'index.php?page=password&sub=&f=changeMyPassword&userAccount='._USERACCOUNT.'&policy=public&toPolicy=private','get' => array('skin','lang','sessionID'))), - 'sessionAdmin' => array(array('txt' => 'Munkamenetek')), - 'facebookConnect' => array(array('txt' => 'Facebook azonosítás')), - 'googleapi' => array(array('txt' => 'Google azonosítás')), - 'admin' => array(array('txt' => 'Szerver regisztráció','url'=>'index.php?page=session&sub=admin&f=registration')), - ); - $MENU['modules']['session']['sub']['admin'] = array( - 'registration' => array(array('txt' => 'Végpont regisztráció a felhőbe','url'=>'index.php?page=session&sub=admin&f=registration')), - 'knownNodes' => array(array('txt' => 'Ismert végpontok','url'=>'index.php?page=session&sub=admin&f=knownNodes')), - ); - - } else { - $MENU['modules']['session'] = array( - 'searchAccount' => array(array('txt' => 'Felhasználó keresése','url' => 'index.php?page=session&sub=search&f=searchAccount')), - 'searchGroup' => array(array('txt' => 'Csoport keresése','url' => 'index.php?page=session&sub=search&f=searchGroup')), - 'changeMyPassword' => array(array('txt' => 'Jelszóváltoztatás','url' => 'index.php?page=password&sub=&f=changeMyPassword&userAccount='._USERACCOUNT.'&policy=public&toPolicy=private','get' => array('skin','lang','sessionID'))), - 'facebookConnect' => array(array('txt' => 'Facebook belépés')), - 'googleapi' => array(array('txt' => 'Google belépés')), - ); - } - - global $NAV; - if ($page=='session') { - if (is_array($MENU['modules']['session'])) foreach ($MENU['modules']['session'] as $_sub => $M) { - $NAV['2'][] = array('page' => 'session', 'f' => $_sub); - } - } else { -/* if (memberOf(_USERACCOUNT, $AUTH[_POLICY]['adminGroup'])) { - $NAV[1][] = array('page'=>'session'); - } else { - $NAV[1][] = array('page'=>'session','f'=>'changeMyPassword'); - } -*/ - } -?> \ No newline at end of file diff --git a/mayor-orig/www/include/menu/private/hu_HU/module-naplo.php b/mayor-orig/www/include/menu/private/hu_HU/module-naplo.php deleted file mode 100644 index 73e66f5b..00000000 --- a/mayor-orig/www/include/menu/private/hu_HU/module-naplo.php +++ /dev/null @@ -1,616 +0,0 @@ - 'Napló', 'url' => 'index.php?page=naplo')); - - if (__DIAK === true) { - $NAVI[] = array('txt' => 'Hírnök', 'url' => 'index.php?page=naplo&sub=hirnok&f=hirnok', 'icon' => 'icon-bullhorn'); - $NAVI[] = array('txt' => 'Órarend', 'url' => 'index.php?page=naplo&sub=orarend&f=orarend', 'icon' => 'icon-th'); - $NAVI[] = array('txt' => 'Jegyek', 'url' => 'index.php?page=naplo&sub=osztalyozo&f=diak', 'icon' => 'icon-pencil'); - } elseif (__TANAR === true) { - $NAVI[] = array('txt' => 'Hírnök', 'url' => 'index.php?page=naplo&sub=hirnok&f=hirnok', 'icon' => 'icon-bullhorn'); - $NAVI[] = array('txt' => 'Órarend', 'url' => 'index.php?page=naplo&sub=orarend&f=orarend', 'icon' => 'icon-th'); - $NAVI[] = array('txt' => 'Osztályozó', 'url' => 'index.php?page=naplo&sub=osztalyozo&f=tankor', 'icon' => 'icon-pencil'); - } else { - $NAVI[] = array('txt' => 'Hírnök', 'url' => 'index.php?page=naplo&sub=hirnok&f=hirnok', 'icon' => 'icon-bullhorn'); - $NAVI[] = array('txt' => 'Órarend', 'url' => 'index.php?page=naplo&sub=orarend&f=orarend', 'icon' => 'icon-th'); - } - - - // A menüpontok sorrendjének beállítása - ettől még nem jelenik meg semmi :) - $MENU['modules']['naplo'] = array( - 'haladasi' => array(), - 'osztalyozo' => array(), - 'hianyzas' => array(), - 'bejegyzesek' => array(), - 'orarend' => array(), - 'tanev' => array(), - 'intezmeny' => array(), - 'stat' => array(), - 'ertekeles' => array(), - 'admin' => array(), - ); - - /* Kiegészítő beállítások egy oldalhoz */ - /* Contrib */ - // $MENU['set']['private']['naplo']['tanev']['helyettesites']['refresh'] = 60; - /* -- */ - - if (__DIAK) { - $MENU['modules']['naplo']['haladasi'] = array(array('txt' => 'Haladási napló', 'url' => 'index.php?page=naplo&sub=haladasi')); - $MENU['modules']['naplo']['osztalyozo'] = array(array('txt' => 'Osztályozó napló', 'url' => 'index.php?page=naplo&sub=osztalyozo')); - $MENU['modules']['naplo']['hianyzas'] = array(array('txt' => 'Hiányzások', 'url' => 'index.php?page=naplo&sub=hianyzas')); - $MENU['modules']['naplo']['bejegyzesek'] = array(array('txt' => 'Bejegyzések', 'url' => 'index.php?page=naplo&sub=bejegyzesek')); - $MENU['modules']['naplo']['diakTankorJelentkezes'] = array(array('txt'=> 'Tankörjelentkezés', 'url'=> 'index.php?page=naplo&sub=intezmeny&f=diakTankorJelentkezes')); - $MENU['modules']['naplo']['esemeny'] = array(array('txt' => 'Esemény jelentkezés', 'url' => 'index.php?page=naplo&sub=esemeny')); - $MENU['modules']['naplo']['diakFelmentes'] = array(array('txt' => 'Felmentés', 'url' => 'index.php?page=naplo&sub=intezmeny&f=diakFelmentes')); - $MENU['modules']['naplo']['ertekeles'] = array(array('txt' => 'Értékelés', 'url' => 'index.php?page=naplo&sub=ertekeles')); - $MENU['modules']['naplo']['hibabejelento'] = array(array('txt' => 'Kérelmek', 'url' => 'index.php?page=naplo&sub=hibabejelento&f=admin')); - $MENU['modules']['naplo']['koszi'] = array(array('txt' => 'Köszi', 'url' => 'index.php?page=naplo&sub=koszi')); - $MENU['modules']['naplo']['hirnok'] = array(array('txt' => 'Hírnök', 'url' => 'index.php?page=naplo&sub=hirnok&f=hirnok')); - - $MENU['modules']['naplo']['sub']['hirnok'] = array( - 'hirnok' =>array(array('txt' => 'Hírnök', 'icon'=>'icon-bullhorn')), - 'hirnokFeliratkozas' => array(array('txt' => 'Hírnök beállítás', 'icon'=>'icon-cog')) - ); - $MENU['modules']['naplo']['sub']['osztalyozo'] = array( - 'dolgozat' => array(array('txt' => 'Dolgozatok')), - 'szovegesErtekeles' => array(array('txt' => 'Szöveges értékelés')), - 'bizonyitvany' => array(array('txt' => 'Bizonyítvány')), - 'stat' => array(array('txt' => 'Zárási statisztika, tanulmányi statisztika')), - ); - $MENU['modules']['naplo']['orarend'] = array( - array('txt' => 'Órarend', 'url' => 'index.php?page=naplo&sub=orarend'), - array('txt' => 'Szabad termek', 'url' => 'index.php?page=naplo&sub=orarend&f=szabadTerem'), - ); - $MENU['modules']['naplo']['tanev'] = array( - array('txt' => 'Munkaterv', 'url' => 'index.php?page=naplo&sub=tanev&f=munkaterv') - ); - $MENU['modules']['naplo']['sub']['hibabejelento'] = array( - 'hibabejelento' => array(array('txt' => 'Új kérelem a hangyának')), - ); - $MENU['modules']['naplo']['intezmeny'] = array(array('txt' => 'Tanévváltás', 'url' => 'index.php?page=naplo&sub=intezmeny')); - - $MENU['modules']['naplo']['sub']['haladasi'] = array( - 'hetes' => array(array('txt' => 'Hetesek')), - 'stat' => array(array('txt' => 'Haladási statisztika')), - ); - if(__UZENO_INSTALLED===true) - $MENU['modules']['naplo']['uzeno'] = array(array('txt' => 'Üzenő', 'url' => 'index.php?page=naplo&sub=uzeno&f=uzeno')); - $MENU['modules']['naplo']['sub']['koszi'] = array( - 'koszi'=> array(array('txt' => 'Jelentkezés', 'url' => 'index.php?page=naplo&sub=koszi&f=koszi')), - 'kosziAdmin'=>array(array('txt' => 'Pont jóváhagyás', 'url' => 'index.php?page=naplo&sub=koszi&f=kosziAdmin')), - 'esemenyAdmin'=>array(array('txt' => 'Esemény adminisztráció', 'url' => 'index.php?page=naplo&sub=koszi&f=esemenyAdmin')), - ); - - } elseif (__TANAR) { - $MENU['modules']['naplo']['haladasi'] = array(array('txt' => 'Haladási napló', 'url' => 'index.php?page=naplo&sub=haladasi')); - $MENU['modules']['naplo']['osztalyozo'] = array(array('txt' => 'Osztályozó napló', 'url' => 'index.php?page=naplo&sub=osztalyozo')); - $MENU['modules']['naplo']['hianyzas'] = array(array('txt' => 'Hiányzások', 'url' => 'index.php?page=naplo&sub=hianyzas')); - $MENU['modules']['naplo']['bejegyzesek'] = array(array('txt' => 'Bejegyzések', 'url' => 'index.php?page=naplo&sub=bejegyzesek')); - $MENU['modules']['naplo']['tanmenet'] = array(array('txt' => 'Tanmenetek', 'url' => 'index.php?page=naplo&sub=tanmenet')); - $MENU['modules']['naplo']['intezmeny'][] = array('txt' => 'Intézményi adatok', 'url' => 'index.php?page=naplo&sub=intezmeny'); - $MENU['modules']['naplo']['hibabejelento'] = array(array('txt' => 'Kérelmek', 'url' => 'index.php?page=naplo&sub=hibabejelento&f=admin')); - $MENU['modules']['naplo']['ertekeles'] = array(array('txt' => 'Értékelés', 'url' => 'index.php?page=naplo&sub=ertekeles')); - $MENU['modules']['naplo']['orarend'] = array(array('txt' => 'Órarend', 'url' => 'index.php?page=naplo&sub=orarend')); - $MENU['modules']['naplo']['esemeny'] = array(array('txt' => 'Események', 'url' => 'index.php?page=naplo&sub=esemeny')); - $MENU['modules']['naplo']['nyomtatas'][] = array('txt' => 'Nyomtatás', 'url' => 'index.php?page=naplo&sub=nyomtatas'); - $MENU['modules']['naplo']['tanev'] = array( - array('txt' => 'Munkaterv', 'url' => 'index.php?page=naplo&sub=tanev&f=munkaterv'), - array('txt' => 'Fogadóóra', 'url' => 'index.php?page=naplo&sub=tanev&f=fogadoOra'), - ); - $MENU['modules']['naplo']['sub']['ertekeles'] = array( - 'osszesites' => array(array('txt' => 'Összesítés')), - ); - $MENU['modules']['naplo']['sub']['intezmeny'] = array( - 'tankorDiak' => array(array('txt' => 'Tankörnévsor', 'url' => 'index.php?page=naplo&sub=intezmeny&f=tankorDiak')), - 'diakTankor' => array(array('txt' => 'Diák tankörei', 'url'=> 'index.php?page=naplo&sub=intezmeny&f=diakTankor')), - 'diakTankorJelentkezes' => array(array('txt' => 'Diák választott tankörei', 'url'=> 'index.php?page=naplo&sub=intezmeny&f=diakTankorJelentkezes')), - 'diak' => array(array('txt' => 'Diákok', 'url' => 'index.php?page=naplo&sub=intezmeny&f=diak')), - 'diakFelmentes' => array(array('txt' => 'Felmentés', 'url' => 'index.php?page=naplo&sub=intezmeny&f=diakFelmentes')), - 'valtas'=> array(array('txt' => 'Tanévváltás', 'url' => 'index.php?page=naplo&sub=intezmeny&f=valtas')), - 'tovabbkepzes' => array(array('txt' => 'Továbbképzés')), - ); - $MENU['modules']['naplo']['sub']['orarend'] = array( - 'helyettesites' => array(array('txt'=> 'Helyettesítések')), - 'szabadTerem' => array(array('txt' => 'Szabad termek' /*, 'url' => 'index.php?page=naplo&sub=tanev&f=szabadTerem' */)), - 'tanarOrarend' => array(array('txt' => 'Speciális összesített tanári órarend (xls)')), - ); - $MENU['modules']['naplo']['sub']['tanev'] = array( - 'diakTanarai' => array(array('txt' => 'Diák tanára')), - ); - $MENU['modules']['naplo']['sub']['hibabejelento'] = array( - 'hibabejelento' => array(array('txt' => 'Új kérelem a hangyának')), - ); - $MENU['modules']['naplo']['sub']['osztalyozo'] = array( - 'tankor' => array(array('txt' => 'Tankör osztályzatai')), - 'diak' => array(array('txt' => 'Diák osztályzatai')), - 'dolgozat' => array(array('txt' => 'Dolgozatok')), - 'szovegesErtekeles' => array(array('txt' => 'Szöveges értékelés')), - 'bizonyitvany' => array(array('txt' => 'Bizonyítvány')), - 'stat' => array(array('txt' => 'Zárási statisztika, tanulmányi statisztika')), - ); - if (__OSZTALYFONOK === true) $MENU['modules']['naplo']['sub']['osztalyozo']['targySorrend'] = array(array('txt' => 'Tárgysorrend')); - $MENU['modules']['naplo']['sub']['bejegyzesek'] = array( - 'bejegyzesek' => array(array('txt' => 'Bejegyzések listája')), - 'ujBejegyzes' => array(array('txt' => 'Új bejegyzések')), - ); - $MENU['modules']['naplo']['sub']['esemeny'] = array( - 'ujEsemeny' => array(array('txt' => 'Esemény felvétel/módosítás')), - 'esemenyDiak' => array(array('txt' => 'Jelentkezők kezelése')), - ); - $MENU['modules']['naplo']['sub']['tanmenet'] = array( - 'tanmenetTankor' => array(array('txt' => 'Tanmenetek tankörhöz rendelése')), - 'tanmenetJovahagyas' => array(array('txt' => 'Tanmenet jóváhagyás')), - 'tanmenetInfo' => array(array('txt' => 'Tanmenet részletei')), - 'tanmenetModositas' => array(array('txt' => 'Tanmenet módosítása')), - 'ujTanmenet' => array(array('txt' => 'Új tanmenet létrehozása')), - ); - $MENU['modules']['naplo']['sub']['haladasi'] = array( - 'hetes' => array(array('txt' => 'Hetesek')), - 'stat' => array(array('txt' => 'Haladási statisztika')), - 'elszamolas' => array(array('txt' => 'Munkaidő')), - ); - if (MAYOR_SOCIAL === true) { - $MENU['modules']['naplo']['sub']['haladasi']['helyettesites'] = array(array('txt' => 'Helyettesítés kezelés')); - } - $MENU['modules']['naplo']['sub']['hianyzas'] = array( - 'osztaly' => array(array('txt' => 'Osztály hiányzásösszesítő')), - 'osztalyNap' => array(array('txt' => 'Osztály napi hiányzásösszesítő')), - 'diak' => array(array('txt' => 'Diák hiányzásai (naptár nézet)')), - 'diakLista' => array(array('txt' => 'Diák hiányzásai (lista)')), - 'diakIgazolatlan' => array(array('txt' => 'Diák igazolatlanjai (lista)')), - 'info' => array(array('txt' => 'Hiányzás statisztika')), - ); - $MENU['modules']['naplo']['sub']['nyomtatas'] = array( - 'osztalyozonaplo' => array(array('txt' => 'Osztályozónapló nyomtatása')), - 'torzslap' => array(array('txt'=>'Törzslap')), - 'helyettesitesinaplo' => array(array('txt' => 'Helyettesítési-napló nyomtatása')), - 'ertesito' => array(array('txt' => 'Értesítő')) - ); - if(__UZENO_INSTALLED===true) - $MENU['modules']['naplo']['uzeno'] = array(array('txt' => 'Üzenő', 'url' => 'index.php?page=naplo&sub=uzeno&f=uzeno')); - - $MENU['modules']['naplo']['hirnok'] = array(array('txt' => 'Hírnök', 'url' => 'index.php?page=naplo&sub=hirnok&f=hirnok')); - - $MENU['modules']['naplo']['koszi'] = array(array('txt' => 'Köszi', 'url' => 'index.php?page=naplo&sub=koszi&f=kosziAdmin')); - $MENU['modules']['naplo']['sub']['hirnok'] = array( - 'hirnok' =>array(array('txt' => 'Hírnök', 'icon'=>'icon-bullhorn')), - 'hirnokFeliratkozas' => array(array('txt' => 'Hírnök beállítás', 'icon'=>'icon-cog')) - ); - - - } elseif (__TITKARSAG === true) { - -/* Titkárság */ - - $MENU['modules']['naplo']['haladasi'] = array(array('txt' => 'Haladási napló', 'url' => 'index.php?page=naplo&sub=haladasi')); - $MENU['modules']['naplo']['osztalyozo'] = array(array('txt' => 'Osztályozó napló', 'url' => 'index.php?page=naplo&sub=osztalyozo')); - $MENU['modules']['naplo']['hianyzas'] = array(array('txt' => 'Hiányzások', 'url' => 'index.php?page=naplo&sub=hianyzas')); - $MENU['modules']['naplo']['orarend'] = array(array('txt' => 'Órarend', 'url' => 'index.php?page=naplo&sub=orarend')); - $MENU['modules']['naplo']['hibabejelento'] = array(array('txt' => 'Kérelmek', 'url' => 'index.php?page=naplo&sub=hibabejelento&f=admin')); - $MENU['modules']['naplo']['nyomtatas'][] = array('txt' => 'Nyomtatás', 'url' => 'index.php?page=naplo&sub=nyomtatas'); - $MENU['modules']['naplo']['export'][] = array('txt' => 'Export', 'url' => 'index.php?page=naplo&sub=export&f=diakExport'); - $MENU['modules']['naplo']['stat'][] = array('txt' => 'Létszám statisztika', 'url' => 'index.php?page=naplo&sub=export&f=letszam'); - $MENU['modules']['naplo']['tanev'] = array( - array('txt' => 'Munkaterv', 'url' => 'index.php?page=naplo&sub=tanev&f=munkaterv'), - array('txt' => 'Fogadóóra', 'url' => 'index.php?page=naplo&sub=tanev&f=fogadoOra'), - ); - $MENU['modules']['naplo']['intezmeny'] = array(array('txt' => 'Intézményi adatok', 'url' => 'index.php?page=naplo&sub=intezmeny')); - $MENU['modules']['naplo']['sub']['orarend'] = array( - 'helyettesites' => array(array('txt' => 'Helyettesítés')), - 'szabadTerem' => array(array('txt' => 'Szabad termek' )), - ); - $MENU['modules']['naplo']['sub']['tanev'] = array( - 'diakTanarai' => array(array('txt' => 'Diák tanára')), - ); - $MENU['modules']['naplo']['sub']['hibabejelento'] = array( - 'hibabejelento' => array(array('txt' => 'Új kérelem a hangyának')), - ); - $MENU['modules']['naplo']['sub']['osztalyozo'] = array( - 'tankor' => array(array('txt' => 'Tankör osztályzatai')), - 'diak' => array(array('txt' => 'Diák osztályzatai')), - 'dolgozat' => array(array('txt' => 'Dolgozatok')), - 'bizonyitvany' => array(array('txt' => 'Bizonyítvány')), - 'stat' => array(array('txt' => 'Zárási statisztika, tanulmányi statisztika')), - 'targySorrend' => array(array('txt' => 'Tárgysorrend')), - ); - $MENU['modules']['naplo']['sub']['haladasi'] = array( - 'stat' => array(array('txt' => 'Haladási statisztika')), -// 'elszamolas' => array(array('txt' => 'Elszámolás')), - ); - $MENU['modules']['naplo']['sub']['intezmeny'] = array( - 'valtas' => array(array('txt' => 'Intézményváltás')), - 'diak' => array(array('txt' => 'Diákok')), - 'zaradek' => array(array('txt' => 'Záradék')), - ); - $MENU['modules']['naplo']['sub']['export'] = array( - 'diakExport' => array(array('txt' => 'Diak adatok')), - 'tantargyFelosztas' => array(array('txt' => 'Tantárgyfelosztás export')), - ); - $MENU['modules']['naplo']['sub']['hianyzas'] = array( - 'info' => array(array('txt' => 'Hiányzás statisztika')), - 'oktstat' => array(array('txt' => 'Októberi statisztika')), - 'osztaly' => array(array('txt' => 'Osztály hiányzásösszesítő')), - ); - $MENU['modules']['naplo']['sub']['nyomtatas'] = array( - 'tankorNaplohozRendeles' => array(array('txt' => 'Tankör naplóhozrendelése')), - 'osztalyozonaplo' => array(array('txt' => 'Osztályozónapló nyomtatása')), - 'haladasinaplo' => array(array('txt' => 'Haladásinapló nyomtatása')), - 'torzslap' => array(array('txt'=>'Törzslap')), - 'zaradekok' => array(array('txt' => 'Záradékok, bejegyzések nyomtatása')), - 'diakTankorJelentkezes' => array(array('txt' => 'Tankörjelentkezés')), - 'ertesito' => array(array('txt' => 'Értesítő', 'rejtett' => true)), - 'szovegesErtekeles' => array(array('txt' => 'Szöveges értékelés', 'rejtett' => true)), - ); - - $MENU['modules']['naplo']['sub']['stat'] = array( - 'letszam' => array(array('txt'=>'Létszám statisztika')), - 'lemorzsolodas' => array(array('txt'=>'Lemorzsolódás')), - ); - - - } - if (__VEZETOSEG===true) { - -/* Vezetőség */ - - $MENU['modules']['naplo']['haladasi'] = array(array('txt' => 'Haladási napló', 'url' => 'index.php?page=naplo&sub=haladasi')); - $MENU['modules']['naplo']['osztalyozo'] = array(array('txt' => 'Osztályozó napló', 'url' => 'index.php?page=naplo&sub=osztalyozo')); - $MENU['modules']['naplo']['hianyzas'] = array(array('txt' => 'Hiányzások', 'url' => 'index.php?page=naplo&sub=hianyzas')); - $MENU['modules']['naplo']['bejegyzesek'] = array(array('txt' => 'Bejegyzések', 'url' => 'index.php?page=naplo&sub=bejegyzesek')); - $MENU['modules']['naplo']['tanmenet'] = array(array('txt' => 'Tanmenetek', 'url' => 'index.php?page=naplo&sub=tanmenet')); - $MENU['modules']['naplo']['nyomtatas'][] = array('txt' => 'Nyomtatás', 'url' => 'index.php?page=naplo&sub=nyomtatas'); - $MENU['modules']['naplo']['esemeny'] = array(array('txt' => 'Események', 'url' => 'index.php?page=naplo&sub=esemeny')); - $MENU['modules']['naplo']['tanev'][] = array('txt' => 'Tanév adatok', 'url' => 'index.php?page=naplo&sub=tanev'); - $MENU['modules']['naplo']['export'][] = array('txt' => 'Export', 'url' => 'index.php?page=naplo&sub=export&f=diakExport'); - $MENU['modules']['naplo']['ertekeles'] = array(array('txt' => 'Értékelés', 'url' => 'index.php?page=naplo&sub=ertekeles')); - $MENU['modules']['naplo']['hibabejelento'] = array(array('txt' => 'Kérelmek', 'url' => 'index.php?page=naplo&sub=hibabejelento&f=admin')); - - $MENU['modules']['naplo']['intezmeny'] = array(array('txt' => 'Intézményi adatok', 'url' => 'index.php?page=naplo&sub=intezmeny')); - - $MENU['modules']['naplo']['stat'] = array(array('txt' => 'Létszám statisztika', 'url' => 'index.php?page=naplo&sub=stat&f=letszam')); - - $MENU['modules']['naplo']['sub']['intezmeny'] = array ( - 'tankorDiak' => array(array('txt' => 'Tankörnévsor', 'url' => 'index.php?page=naplo&sub=intezmeny&f=tankorDiak')), - 'tankorTanar' => array(array('txt' => 'Tankör tanárok', 'url' => 'index.php?page=naplo&sub=intezmeny&f=tankorTanar')), - 'tankorTanarHozzarendeles' => array(array('txt' => 'Tantárgyfelosztás, tankör-tanár')), - 'diak' => array(array('txt' => 'Diákok')), - 'diakTankor' => array(array('txt' => 'Diák tankörei', 'url'=> 'index.php?page=naplo&sub=intezmeny&f=diakTankor')), - 'diakTankorJelentkezes' => array(array('txt'=> 'Tankörjelentkezés', 'url'=> 'index.php?page=naplo&sub=intezmeny&f=diakTankorJelentkezes')), - 'valtas' => array(array('txt' => 'Tanévváltás', 'url' => 'index.php?page=naplo&sub=intezmeny&f=valtas')), - 'tankorCsoport' => array(array('txt' => 'Tankörcsoportok*', 'url' => 'index.php?page=naplo&sub=tanev&f=tankorCsoport')), - 'tankorBlokk' => array(array('txt' => 'Tankörblokkok*', 'url' => 'index.php?page=naplo&sub=tanev&f=tankorBlokk')), - 'diakFelmentes' => array(array('txt' => 'Diák felmentése', 'rejtett' => true)), - 'zaradek' => array(array('txt' => 'Záradék')), - 'tankorLetszam' => array(array('txt' => 'Tankörlétszámok', 'rejtett' => true)), - 'kepesitesek' => array(array('txt' => 'Képesítések')), - 'tovabbkepzes' => array(array('txt' => 'Továbbképzés')), - ); - - - $MENU['modules']['naplo']['sub']['hibabejelento'] = array( - 'hibabejelento' => array(array('txt' => 'Új kérelem a hangyának')), - ); - $MENU['modules']['naplo']['sub']['haladasi'] = array( - 'helyettesites' => array(array('txt' => 'Helyettesítés')), - 'pluszora' => array(array('txt' => 'Plusz óra')), - 'minuszora' => array(array('txt' => 'Óra elmaradás')), - 'osszevonas' => array(array('txt' => 'Összevonás')), - 'teremModositas' => array(array('txt' => 'Haladási teremmódosító')), - 'specialis' => array(array('txt' => 'Speciális nap')), - 'elmaradas' => array(array('txt' => 'Haladási elmaradások')), - 'stat' => array(array('txt' => 'Haladási statisztika')), - 'elszamolas' => array(array('txt' => 'Elszámolás')), - 'oralatogatas' => array(array('txt' => 'Óralátogatás')), - 'hetes' => array(array('txt' => 'Hetesek')), - ); - $MENU['modules']['naplo']['sub']['osztalyozo'] = array( - 'tankor' => array(array('txt' => 'Tankör osztályzatai')), - 'diak' => array(array('txt' => 'Diák osztályzatai')), - 'szovegesErtekeles' => array(array('txt' => 'Szöveges értékelés')), - 'dolgozat' => array(array('txt' => 'Dolgozatok')), - 'vizsga' => array(array('txt' => 'Vizsga')), - 'bizonyitvany' => array(array('txt' => 'Bizonyítvány')), - 'stat' => array(array('txt' => 'Zárási statisztika, tanulmányi statisztika')), - 'targySorrend' => array(array('txt' => 'Tárgysorrend')), - ); - $MENU['modules']['naplo']['sub']['bejegyzesek'] = array( - 'bejegyzesek' => array(array('txt' => 'Bejegyzések listája')), - 'ujBejegyzes' => array(array('txt' => 'Új bejegyzések')), - ); - $MENU['modules']['naplo']['sub']['esemeny'] = array( - 'ujEsemeny' => array(array('txt' => 'Esemény felvétel/módosítás')), - 'esemenyDiak' => array(array('txt' => 'Jelentkezők kezelése')), - ); - $MENU['modules']['naplo']['sub']['tanmenet'] = array( - 'tanmenetLeadas' => array(array('txt' => 'Tanmenet leadás')), - 'tanmenetJovahagyas' => array(array('txt' => 'Tanmenet jóváhagyás')), - 'tanmenetTankor' => array(array('txt' => 'Tanmenetek tankörhöz rendelése')), - 'tanmenetInfo' => array(array('txt' => 'Tanmenet részletei')), - 'tanmenetModositas' => array(array('txt' => 'Tanmenet módosítása')), - 'ujTanmenet' => array(array('txt' => 'Új tanmenet létrehozása')), - ); - $MENU['modules']['naplo']['sub']['nyomtatas'] = array( - 'tankorNaplohozRendeles' => array(array('txt' => 'Tankör naplóhozrendelése')), - 'osztalyozonaplo' => array(array('txt' => 'Osztályozónapló nyomtatása')), - 'haladasinaplo' => array(array('txt' => 'Haladásinapló nyomtatása')), - 'torzslap' => array(array('txt'=>'Törzslap')), - 'zaradekok' => array(array('txt' => 'Záradékok, bejegyzések nyomtatása')), - 'helyettesitesinaplo' => array(array('txt' => 'Helyettesítési-napló nyomtatása')), - 'diakTankorJelentkezes' => array(array('txt' => 'Tankörjelentkezés nyomtatvány')), - 'ertesito' => array(array('txt' => 'Értesítő')) - ); - $MENU['modules']['naplo']['sub']['export'] = array( - 'bizonyitvany' => array(array('txt' => 'Bizonyítvány export')), - 'kirBizonyitvanyExport' => array(array('txt' => 'Bizonyítvány export (KIR)')), - 'diakExport' => array(array('txt' => 'Diak adatok')), - 'tantargyFelosztas' => array(array('txt' => 'Tantárgyfelosztás export')), - 'kreta' => array(array('txt' => 'KRÉTA export')), - ); - - - $MENU['modules']['naplo']['sub']['orarend'] = array( - 'orarend' => array(array('txt' => 'Órarend')), - 'helyettesites' => array(array('txt'=> 'Helyettesítések')), - 'orarendEllenorzes' => array(array('txt' => 'Órarend ellenőrzés')), - 'orarendTeremModositas' => array(array('txt' => 'Teremmódosítás')), - 'termez' => array(array('txt' => 'Órarend termező')), - 'szabadTerem' => array(array('txt' => 'Szabad termek')), - 'tanarOrarend' => array(array('txt' => 'Összesített tanári órarend')), - 'ascExport' => array(array('txt' => 'ascExport')), - ); - $MENU['modules']['naplo']['sub']['tanev'] = array( - 'munkaterv' => array(array('txt' => 'Éves munkaterv, tanév rendje')), - 'tankorCsoport' => array(array('txt' => 'Tankörcsoportok')), - 'tankorBlokk' => array(array('txt' => 'Tankörblokkok')), - 'fogadoOra' => array(array('txt' => 'Fogadóóra')), - 'targyOraszam' => array(array('txt' => 'Tárgy óraszámok')), - 'diakTanarai' => array(array('txt' => 'Diák tanára')), - 'targyBontas' => array(array('txt' => 'Tantárgyfelosztás, bontás-tankör')), - ); - $MENU['modules']['naplo']['sub']['ertekeles'] = array( - 'kerdoivBetoltes' => array(array('txt' => 'Kérdőív betöltése')), - 'osszesites' => array(array('txt' => 'Összesítés')), - ); - $MENU['modules']['naplo']['sub']['hianyzas'] = array( - 'osztaly' => array(array('txt' => 'Osztály hiányzásösszesítő')), - 'osztalyNap' => array(array('txt' => 'Osztály napi hiányzásösszesítő')), - 'diak' => array(array('txt' => 'Diák hiányzásai (naptár nézet)')), - 'diakLista' => array(array('txt' => 'Diák hiányzásai (lista)')), - 'oktstat' => array(array('txt' => 'Októberi statisztika')), - 'info' => array(array('txt' => 'Hiányzás statisztika')), - - ); - - $MENU['modules']['naplo']['sub']['stat'] = array( - 'tantargyFelosztas' => array(array('txt' => 'Tantárgyfelosztás statisztika')), - 'letszam' => array(array('txt'=>'Létszám statisztika')), - 'lemorzsolodas' => array(array('txt'=>'Lemorzsolódás')), - ); - - } - if (__NAPLOADMIN === true) { - $MENU['modules']['naplo']['haladasi'] = array(array('txt' => 'Haladási napló', 'url' => 'index.php?page=naplo&sub=haladasi')); - $MENU['modules']['naplo']['osztalyozo'] = array(array('txt' => 'Osztályozó napló', 'url' => 'index.php?page=naplo&sub=osztalyozo')); - $MENU['modules']['naplo']['hianyzas'] = array(array('txt' => 'Hiányzások', 'url' => 'index.php?page=naplo&sub=hianyzas')); - $MENU['modules']['naplo']['bejegyzesek'] = array(array('txt' => 'Bejegyzések', 'url' => 'index.php?page=naplo&sub=bejegyzesek')); - $MENU['modules']['naplo']['orarend'] = array(array('txt' => 'Órarend', 'url' => 'index.php?page=naplo&sub=orarend')); - $MENU['modules']['naplo']['tanmenet'] = array(array('txt' => 'Tanmenetek', 'url' => 'index.php?page=naplo&sub=tanmenet')); - $MENU['modules']['naplo']['esemeny'] = array(array('txt' => 'Események', 'url' => 'index.php?page=naplo&sub=esemeny')); - $MENU['modules']['naplo']['tanev'] = array( - array('txt' => 'Tanév adatok', 'url' => 'index.php?page=naplo&sub=tanev'), - array('txt' => 'Fogadóóra', 'url' => 'index.php?page=naplo&sub=tanev&f=fogadoOra'), - ); - $MENU['modules']['naplo']['nyomtatas'][] = array('txt' => 'Nyomtatás', 'url' => 'index.php?page=naplo&sub=nyomtatas', 'rejtett' => true); - $MENU['modules']['naplo']['export'][] = array('txt' => 'Export', 'url' => 'index.php?page=naplo&sub=export&f=diakExport'); - $MENU['modules']['naplo']['intezmeny'] = array(array('txt' => 'Intézményi adatok', 'url' => 'index.php?page=naplo&sub=intezmeny')); - - $MENU['modules']['naplo']['stat'] = array(array('txt' => 'Látszám statisztika', 'url' => 'index.php?page=naplo&sub=stat&f=letszam')); - $MENU['modules']['naplo']['ertekeles'] = array(array('txt' => 'Értékelés', 'url' => 'index.php?page=naplo&sub=ertekeles', 'rejtett' => true)); - $MENU['modules']['naplo']['admin'] = array(array('txt' => 'Admin', 'url' => 'index.php?page=naplo&sub=admin')); - $MENU['modules']['naplo']['koszi'] = array(array('txt' => 'Köszi', 'url' => 'index.php?page=naplo&sub=koszi&f=kosziAdmin')); - $MENU['modules']['naplo']['hibabejelento'] = array(array('txt' => 'Kérelmek', 'url' => 'index.php?page=naplo&sub=hibabejelento&f=admin', 'rejtett' => true)); - $MENU['modules']['naplo']['hirnok'] = array(array('txt' => 'Hírnök', 'url' => 'index.php?page=naplo&sub=hirnok&f=hirnok')); - if(__UZENO_INSTALLED===true) - $MENU['modules']['naplo']['uzeno'] = array(array('txt' => 'Üzenő', 'url' => 'index.php?page=naplo&sub=uzeno&f=uzeno')); - - $MENU['modules']['naplo']['sub']['stat'] = array( - 'tantargyFelosztas' => array(array('txt' => 'Tantárgyfelosztás statisztika')), - 'letszam' => array(array('txt'=>'Létszám statisztika')), - 'lemorzsolodas' => array(array('txt'=>'Lemorzsolódás')), - ); - - $MENU['modules']['naplo']['sub']['haladasi'] = array( - 'helyettesites' => array(array('txt' => 'Helyettesítés kiírás')), - 'pluszora' => array(array('txt' => 'Plusz óra')), - 'minuszora' => array(array('txt' => 'Óra elmaradás')), - 'osszevonas' => array(array('txt' => 'Összevonás', 'rejtett' => true)), - 'teremModositas' => array(array('txt' => 'Haladási teremmódosító')), - 'specialis' => array(array('txt' => 'Speciális nap', 'rejtett' => true)), - 'elmaradas' => array(array('txt' => 'Haladási elmaradások', 'rejtett' => true)), - 'stat' => array(array('txt' => 'Haladási statisztika', 'rejtett' => true)), - 'elszamolas' => array(array('txt' => 'Elszámolás', 'rejtett' => true)), - 'oralatogatas' => array(array('txt' => 'Óralátogatás', 'rejtett' => true)), - 'hetes' => array(array('txt' => 'Hetesek')), - ); - $MENU['modules']['naplo']['sub']['hibabejelento'] = array( - 'hibabejelento' => array(array('txt' => 'Új kérelem a hangyának')), - ); - $MENU['modules']['naplo']['sub']['koszi'] = array( - // ez csak diákoknak van, nem? // 'koszi' => array(array('txt' => 'Köszi')), - 'esemenyAdmin' => array(array('txt' => 'Esemény adminisztráció')), - 'kosziAdmin' => array(array('txt' => 'Pont adminisztráció')), - ); - $MENU['modules']['naplo']['sub']['hianyzas'] = array( - 'osztaly' => array(array('txt' => 'Osztály hiányzásösszesítő')), - 'osztalyNap' => array(array('txt' => 'Osztály napi hiányzásösszesítő')), - 'diak' => array(array('txt' => 'Diák hiányzásai (naptár nézet)')), - 'diakLista' => array(array('txt' => 'Diák hiányzásai (lista)')), - 'diakIgazolatlan' => array(array('txt' => 'Diák igazolatlanjai (lista)')), - 'oktstat' => array(array('txt' => 'Októberi statisztika')), - 'info' => array(array('txt' => 'Hiányzás statisztika')), - - ); - $MENU['modules']['naplo']['sub']['osztalyozo'] = array( - 'tankor' => array(array('txt' => 'Tankör osztályzatai')), - 'diak' => array(array('txt' => 'Diák osztályzatai', 'rejtett' => true)), - 'dolgozat' => array(array('txt' => 'Dolgozatok', 'rejtett' => true)), - 'vizsga' => array(array('txt' => 'Vizsga')), - 'bizonyitvany' => array(array('txt' => 'Bizonyítvány', 'rejtett' => true)), -// 'bizelomenetel' => array(array('txt' => 'Előmenetel', 'rejtett' => true)), - 'zaroJegyCheck' => array(array('txt' => 'Zárójegy évfolyam ellenőrző')), - 'stat' => array(array('txt' => 'Zárási statisztika, tanulmányi statisztika')), - 'targySorrend' => array(array('txt' => 'Tárgysorrend', 'rejtett' => true)), - 'szovegesErtekeles' => array(array('txt' => 'Szöveges értékelés', 'rejtett' => true)), - 'szempontRendszer' => array(array('txt' => 'Szempont rendszer', 'rejtett' => true)), - ); - $MENU['modules']['naplo']['sub']['bejegyzesek'] = array( - 'bejegyzesek' => array(array('txt' => 'Bejegyzések listája')), - 'ujBejegyzes' => array(array('txt' => 'Új bejegyzések')), - 'bejegyzesTipus' => array(array('txt' => 'Bejegyzés-típusok')), - ); - $MENU['modules']['naplo']['sub']['tanmenet'] = array( - 'tanmenetLeadas' => array(array('txt' => 'Tanmenet leadás')), - 'tanmenetJovahagyas' => array(array('txt' => 'Tanmenet jóváhagyás')), - 'tanmenetTankor' => array(array('txt' => 'Tanmenetek tankörhöz rendelése')), - 'tanmenetInfo' => array(array('txt' => 'Tanmenet részletei')), - 'tanmenetModositas' => array(array('txt' => 'Tanmenet módosítása')), - 'ujTanmenet' => array(array('txt' => 'Új tanmenet létrehozása')), - ); - $MENU['modules']['naplo']['sub']['esemeny'] = array( - 'ujEsemeny' => array(array('txt' => 'Esemény felvétel/módosítás')), - 'esemenyDiak' => array(array('txt' => 'Névsor kezelése')), - ); - $MENU['modules']['naplo']['sub']['orarend'] = array( - 'orarend' => array(array('txt' => 'Órarend')), - 'szabadTerem' => array(array('txt' => 'Szabad termek', 'rejtett' => true)), - 'helyettesites' => array(array('txt' => 'Helyettesítés', 'rejtett' => true)), - 'orarendTankor' => array(array('txt' => 'Órarend-tankör összerendező', 'rejtett' => true)), - 'orarendUtkozes' => array(array('txt' => 'Órarend ütközés', 'rejtett' => true)), - 'orarendBetolto' => array(array('txt' => 'Órarend betöltő', 'rejtett' => true)), - 'orarendEllenorzes' => array(array('txt' => 'Órarend ellenőrzés', 'rejtett' => true)), - 'orarendTeremModositas' => array(array('txt' => 'Teremmódosítás', 'rejtett' => true)), - 'orarendModosito' => array(array('txt' => 'Órarend módosítás', 'rejtett' => true)), - 'termez' => array(array('txt' => 'Órarend termező', 'rejtett' => true)), - 'tanarOrarend' => array(array('txt' => 'Összesített tanári órarend', 'rejtett' => true)), - 'ascExport' => array(array('txt' => 'ascExport', 'rejtett' => true)), - ); - $MENU['modules']['naplo']['sub']['tanev'] = array( - 'munkaterv' => array(array('txt' => 'Éves munkaterv, tanév rendje', 'rejtett' => true)), - 'checkStatus' => array(array('txt' => 'Ellenőr', 'rejtett' => true)), - 'tankorCsoport' => array(array('txt' => 'Tankörcsoportok')), - 'tankorBlokk' => array(array('txt' => 'Tankörblokkok')), - // 'vegzosTankorLezaras' => array(array('txt' => 'Végzős tankör kiléptetés', 'rejtett' => true)), - 'vegzosOrarendLezaras' => array(array('txt' => 'Végzős órarend lezárása', 'rejtett' => true)), - 'fogadoOra' => array(array('txt' => 'Fogadóóra', 'rejtett' => true)), - // 'intezmeny' => array(array('txt' => 'Intézményváltó', 'url' => 'index.php?page=naplo&sub=intezmeny&f=valtas')), - 'targyOraszam' => array(array('txt' => 'Tárgy óraszámok', 'rejtett' => true)), - 'diakTanarai' => array(array('txt' => 'Diák tanára', 'rejtett' => true)), - 'targyBontas' => array(array('txt' => 'Tantárgyfelosztás, bontás-tankör')), - ); - $MENU['modules']['naplo']['sub']['nyomtatas'] = array( - 'tankorNaplohozRendeles' => array(array('txt' => 'Tankör naplóhozrendelése')), - 'osztalyozonaplo' => array(array('txt' => 'Osztályozónapló nyomtatása')), - 'haladasinaplo' => array(array('txt' => 'Haladásinapló nyomtatása')), - 'torzslap' => array(array('txt'=>'Törzslap')), - 'zaradekok' => array(array('txt' => 'Záradékok, bejegyzések nyomtatása')), - 'helyettesitesinaplo' => array(array('txt' => 'Helyettesítési-napló nyomtatása')), - 'diakTankorJelentkezes' => array(array('txt' => 'Tankörjelentkezés')), - 'ertesito' => array(array('txt' => 'Értesítő', 'rejtett' => true)), - 'szovegesErtekeles' => array(array('txt' => 'Szöveges értékelés', 'rejtett' => true)), - ); - - $MENU['modules']['naplo']['sub']['export'] = array( - 'bizonyitvany' => array(array('txt' => 'Bizonyítvány export')), - 'kirBizonyitvanyExport' => array(array('txt' => 'Bizonyítvány export (KIR)')), - 'diakExport' => array(array('txt' => 'Diak adatok')), - 'tantargyFelosztas' => array(array('txt' => 'Tantárgyfelosztás export')), - 'sulix' => array(array('txt' => 'Együttműködés SuliXerverrel')), - 'kreta' => array(array('txt' => 'KRÉTA export')), - 'tanarOsztalyOraszam' => array(array('txt' => 'Tanár-Osztály óraszámok')), - ); - $MENU['modules']['naplo']['sub']['intezmeny'] = array( - 'valtas' => array(array('txt' => 'Intézményváltás', 'rejtett' => true)), - 'osztaly' => array(array('txt' => 'Osztályok')), - 'diak' => array(array('txt' => 'Diákok')), - 'diakSzulo' => array(array('txt' => 'Szülő/Nevelő', 'rejtett' => true)), - 'tanar' => array(array('txt' => 'Tanárok')), - 'kepesitesek' => array(array('txt' => 'Képesítések')), - 'tovabbkepzes' => array(array('txt' => 'Továbbképzés')), - 'munkakozosseg' => array(array('txt' => 'Munkaközösségek, tárgyak', 'rejtett' => true)), - 'tankor' => array(array('txt' => 'Tankörök')), - 'tankorTanar' => array(array('txt' => 'Tankör tanárok')), - 'tankorTanarHozzarendeles' => array(array('txt' => 'Tantárgyfelosztás, tankör-tanár')), - 'tankorDiak' => array(array('txt' => 'Tankör diákok')), - 'diakTankor' => array(array('txt' => 'Diák tankörei')), - 'diakFelmentes' => array(array('txt' => 'Diák felmentése', 'rejtett' => true)), - 'diakTankorJelentkezes' => array(array('txt' => 'Tankörjelentkezés', 'rejtett' => true)), - 'tankorSzemeszter' => array(array('txt' => 'Tankör óraterve', 'rejtett' => true)), - 'tankorLetszam' => array(array('txt' => 'Tankörlétszámok', 'rejtett' => true)), - 'kepzes' => array(array('txt' => 'Képzések', 'rejtett' => true)), - 'kepzesOraterv' => array(array('txt' => 'Képzés óraterv', 'rejtett' => true)), - 'zaradek' => array(array('txt' => 'Záradék')), - 'terem' => array(array('txt' => 'Terem')), - 'verseny' => array(array('txt' => 'Verseny')), - ); - $MENU['modules']['naplo']['sub']['ertekeles'] = array( - 'kerdoivBetoltes' => array(array('txt' => 'Kérdőív betöltése')), - 'osszesites' => array(array('txt' => 'Összesítés')), - ); - $MENU['modules']['naplo']['sub']['admin'] = array( - 'intezmenyek' => array(array('txt' => 'Intézmények')), - 'tanevek' => array(array('txt' => 'Tanévek megnyitása, lezárása')), - 'szemeszterek' => array(array('txt' => 'Szemeszterek')), - 'fillhaladasi' => array(array('txt' => 'Haladási napló feltöltése')), - 'import' => array(array('txt' => 'Import')), - 'azonositok' => array(array('txt' => 'Azonosító generálás')), - 'szuloiAzonositok' => array(array('txt' => 'Szülői azonosítók generálása')), - 'rpcPrivilege' => array(array('txt' => 'RPC jogosultságok')), - ); - $MENU['modules']['naplo']['sub']['hirnok'] = array( - 'hirnok' =>array(array('txt' => 'Hírnök', 'icon'=>'icon-bullhorn')), - 'hirnokFeliratkozas' => array(array('txt' => 'Hírnök beállítás', 'icon'=>'icon-cog')) - ); - - } - if (__UZENO_INSTALLED===true && __UZENOADMIN===true) - $MENU['modules']['naplo']['uzeno'] = array(array('txt' => 'Üzenő', 'url' => 'index.php?page=naplo&sub=uzeno&f=uzeno')); - - // SNI - if (__NAPLOADMIN || __VEZETOSEG || __TANAR) { - $MENU['modules']['naplo']['sni'] = array(array('txt' => 'Egyéni fejlesztés', 'url' => 'index.php?page=naplo&sub=sni')); - $MENU['modules']['naplo']['sub']['sni'] = array( - 'diakAllapot' => array(array('txt' => 'Belépő/kilépő állapot')), - 'fejlesztesiTerv' => array(array('txt' => 'Havi összegzés')), - 'tantargyiFeljegyzesek' => array(array('txt' => 'Tantárgyi feljegyzések')), - ); - $MENU['modules']['naplo']['sub']['nyomtatas']['sniHaviJegyzokonyv'] = array(array('txt' => 'Havi jegyzőkönyv')); - $MENU['modules']['naplo']['sub']['nyomtatas']['sniEvVegiJegyzokonyv'] = array(array('txt' => 'Év végi jegyzőkönyv')); - } - // SNI VEGE - -if ($page==='naplo') { - - // Navigáció - alapértelmezés - $NAV[1] = array( - array('page' => 'naplo', 'sub' => 'haladasi'), - array('page' => 'naplo', 'sub' => 'osztalyozo'), - array('page' => 'naplo', 'sub' => 'hianyzas'), - array('page' => 'naplo', 'sub' => 'orarend'), - ); - if (__NAPLOADMIN) { - $NAV[1][] = array('page' => 'naplo', 'sub' => 'intezmeny'); - $NAV[1][] = array('page' => 'naplo', 'sub' => 'admin'); - $NAV[1][] = array('page' => 'naplo', 'sub' => 'hibabejelento'); - } - - if (is_array($MENU['modules']['naplo']['sub'][$sub])) foreach ($MENU['modules']['naplo']['sub'][$sub] as $_f => $M) { - $NAV[2][] = array('page' => 'naplo', 'sub' => $sub, 'f' => $_f); - } elseif (is_array($MENU['modules']['naplo'])) foreach ($MENU['modules']['naplo'] as $_f => $M) { - if ($_f != 'sub') $NAV[2][] = array('page' => 'naplo', 'sub' => $_f); - } - -} -?> \ No newline at end of file diff --git a/mayor-orig/www/include/menu/private/hu_HU/module-portal.php b/mayor-orig/www/include/menu/private/hu_HU/module-portal.php deleted file mode 100644 index eeb70da8..00000000 --- a/mayor-orig/www/include/menu/private/hu_HU/module-portal.php +++ /dev/null @@ -1,43 +0,0 @@ - 'Portál', 'url' => 'index.php?page=portal&sub=hirek&f=egyhir')); - $MENU['portal'] = array(array('txt' => 'Kezdőlap', 'url' => 'index.php')); - $MENU['modules']['portal']['hirek'] = array(array('txt'=>'Hírek szerkesztése','url'=>'index.php?page=portal&sub=hirek&f=hirekAdmin')); - $MENU['modules']['portal']['sub']['hirek'] = array( - 'hirekAdmin'=>array(array('txt' => 'Hírek')), - 'egyhir'=>array(array('txt' => 'Új hír')), -// array('txt' => 'Új kérdés', 'url' => 'index.php?page=portal&sub=kerdoiv&f=kerdoivAdmin') - ); - $MENU['modules']['portal']['kerdoiv'] = array( - array('txt' => 'Új kérdés', 'url' => 'index.php?page=portal&sub=kerdoiv&f=kerdoivAdmin') - ); - - //if ($page != 'portal') - // $NAV[1][] = array('page'=>'portal', 'sub' => 'hirek'); - } else { - /* Mégse rakjuk ki a többieknek */ - // $MENU['portal'] = array(array('txt' => 'Hír beküldése', 'url' => 'index.php?page=portal&sub=hirek&f=egyhir')); - } - -// if (memberOf(_USERACCOUNT, $AUTH[_POLICY]['adminGroup'])) { -// $NAV[1][] = array('page'=>'session'); -// } else { -// $NAV[1][] = array('page'=>'session','f'=>'changeMyPassword'); -// } - - //if ($page != 'naplo') $NAV[1][] = array('page' => 'naplo'); - - - -if ($page=='portal') { - if (is_array($MENU['modules']['portal']['sub'][$sub])) foreach ($MENU['modules']['portal']['sub'][$sub] as $_f => $M) { - $NAV[2][] = array('page' => 'portal', 'sub' => $sub, 'f' => $_f); - } elseif (is_array($MENU['modules']['portal'])) foreach ($MENU['modules']['portal'] as $_sub => $M) { - if ($_sub != 'sub') $NAV[2][] = array('page' => 'portal', 'sub' => $_sub); - } -} - - - -?> diff --git a/mayor-orig/www/include/menu/public/hu_HU/base.php b/mayor-orig/www/include/menu/public/hu_HU/base.php deleted file mode 100644 index 66a36701..00000000 --- a/mayor-orig/www/include/menu/public/hu_HU/base.php +++ /dev/null @@ -1,34 +0,0 @@ -array(), - 'session'=>array(), - 'naplo'=>array(), - 'portal'=>array(), - 'felveteli'=>array(), -// 'forum'=>array(), -// 'auth'=>array(), - ); - - if (defined('_SESSIONID') and _SESSIONID != '') { - $MENU['session'] = array( - array('txt' => 'Kilépés', 'url' => 'index.php?page=session&f=logout') - ); - } - $MENU['home'] = array( - array('txt' => 'Kezdőlap', 'url' => 'index.php') - ); - - // $NAVI[] = array('txt' => 'Kezdőlap', 'url' => 'index.php', 'icon' => 'icon-home-alt'); - -// $MENU['modules']['session']['createAccount'] = array( -// array('txt' => 'Szülői regisztráció', 'url' => 'index.php?page=session&f=createAccount&toPolicy=parent'), -// array('txt' => 'Fórum regisztráció', 'url' => 'index.php?page=session&f=createAccount&toPolicy=public'), -// ); - if ($f == 'changeMyPassword') { - $MENU['back'] = array(array('txt'=>'Vissza','url'=>'index.php?policy='.$toPolicy,'get'=>array('sessionID','skin','lang'))); - $MENU['password'] = array(array('txt'=>'Jelszóváltoztatás','url'=>'index.php?page=password&sub=&f=changeMyPassword')); -// $NAV[1][] = array('page'=>'back'); - } - -?> diff --git a/mayor-orig/www/include/menu/public/hu_HU/module-naplo.php b/mayor-orig/www/include/menu/public/hu_HU/module-naplo.php deleted file mode 100644 index 090c7db2..00000000 --- a/mayor-orig/www/include/menu/public/hu_HU/module-naplo.php +++ /dev/null @@ -1,13 +0,0 @@ - 'Órarend', 'url' => 'index.php?page=naplo&sub=orarend&f=orarend')); - $MENU['modules']['naplo']['orarend'] = array( - array('txt' => 'Órarend', 'url' => 'index.php?page=naplo&sub=orarend&f=orarend'), - array('txt' => 'Helyettesítés', 'url'=>'index.php?page=naplo&sub=orarend&f=helyettesites', 'refresh'=>60), - array('txt' => 'Szabad termek', 'url' => 'index.php?page=naplo&sub=orarend&f=szabadTerem'), - ); - -?> diff --git a/mayor-orig/www/include/menu/public/hu_HU/module-portal.php b/mayor-orig/www/include/menu/public/hu_HU/module-portal.php deleted file mode 100644 index 53b4315c..00000000 --- a/mayor-orig/www/include/menu/public/hu_HU/module-portal.php +++ /dev/null @@ -1,8 +0,0 @@ - 'Portál', 'url' => 'index.php?page=portal')); - -?> diff --git a/mayor-orig/www/include/modules/auth/base/forgotten.php b/mayor-orig/www/include/modules/auth/base/forgotten.php deleted file mode 100644 index 16571855..00000000 --- a/mayor-orig/www/include/modules/auth/base/forgotten.php +++ /dev/null @@ -1,53 +0,0 @@ -=0) { - $selector = bin2hex(openssl_random_pseudo_bytes(8)); - $token = openssl_random_pseudo_bytes(32); - } elseif (version_compare(PHP_VERSION,'7.0.0')>=0) { - $selector = bin2hex(random_bytes(8)); - $token = random_bytes(32); - } else { - return false; // nem támogatjuk - } - $urlToEmail = href($URL.http_build_query(array( - 'selector' => $selector, - 'validator' => bin2hex($token) - ),'','&')); - - $expires = new DateTime('NOW'); - $expires->add(new DateInterval('PT01H')); // 1 hour - - // rate limiting és karbantartás - $lr = db_connect('login'); - db_start_trans($lr); - - $q = "DELETE FROM accountRecovery WHERE expires <= NOW() - INTERVAL 10 DAY"; - db_query($q, array('debug'=>false,'fv' => 'generatePasswordRecoveryRequest', 'modul'=>'login', 'result'=>'delete'),$lr); - - $q = "SELECT count(*) as db FROM accountRecovery WHERE policy='%s' AND userAccount='%s'"; - $v = array($accountData['policy'], $accountData['userAccount']); - $recoveryRequestDb = db_query($q, array('debug'=>false,'fv' => 'generatePasswordRecoveryRequest', 'modul'=>'login', 'result'=>'value', 'values'=>$v),$lr); - - if ($recoveryRequestDb<5) { - $q = "INSERT INTO accountRecovery (policy, userAccount, selector, token, expires) VALUES ('%s', '%s', '%s', '%s', '%s');"; - $v = array($accountData['policy'], $accountData['userAccount'], - $selector, - hash('sha256', $token), - $expires->format('Y-m-d\TH:i:s')); - $recoveryId = db_query($q, array('debug'=>false,'fv' => 'generatePasswordRecoveryRequest', 'modul'=>'login', 'result'=>'insert', 'values'=>$v),$lr); - } else { - return false; - } - db_commit($lr); - db_close($lr); - - if ($recoveryId !== false) return $urlToEmail; - else return false; - - } - -?> \ No newline at end of file diff --git a/mayor-orig/www/include/modules/auth/base/login.php b/mayor-orig/www/include/modules/auth/base/login.php deleted file mode 100644 index f9cb3a2d..00000000 --- a/mayor-orig/www/include/modules/auth/base/login.php +++ /dev/null @@ -1,37 +0,0 @@ - \ No newline at end of file diff --git a/mayor-orig/www/include/modules/auth/base/token.php b/mayor-orig/www/include/modules/auth/base/token.php deleted file mode 100644 index 72cbcffb..00000000 --- a/mayor-orig/www/include/modules/auth/base/token.php +++ /dev/null @@ -1,116 +0,0 @@ -=0) { - $selector = bin2hex(openssl_random_pseudo_bytes(8)); - $token = openssl_random_pseudo_bytes(32); - } elseif (version_compare(PHP_VERSION,'7.0.0')>=0) { - $selector = bin2hex(random_bytes(8)); - $token = random_bytes(32); - } else { - return false; // nem támogatjuk - } - - if (isset($_COOKIE['t_selector'])===true && isset($_COOKIE['t_validator'])===true) return true; // már van selector/validator elmentve - - $lr = db_connect('login'); - db_start_trans($lr); - - $q = "DELETE FROM authToken WHERE expires <= NOW() - INTERVAL 10 DAY"; - db_query($q, array('debug'=>false,'fv' => 'na', 'modul'=>'login', 'result'=>'delete'),$lr); - - $q = "INSERT INTO authToken (policy, userAccount, - userCn, studyId, - selector, token, expires, activity, ipAddress) VALUES ('%s', '%s', '%s', '%s', '%s','%s',NOW() + INTERVAL 30 DAY,NOW(),'%s')"; - $v = array($accountData['policy'], $accountData['userAccount'], - $accountData['userCn'], $accountData['studyId'], - $selector, - hash('sha256', $token), - CLIENTIPADDRESS - ); - $Id = db_query($q, array('debug'=>false,'fv' => 'na', 'modul'=>'login', 'result'=>'insert', 'values'=>$v),$lr); - db_commit($lr); - db_close($lr); - - if ($Id !== false) { - setcookie('t_selector',$selector,time()+604800*5,'/','',TRUE,TRUE); - setcookie('t_validator',bin2hex($token),time()+604800*5,'/','',TRUE,TRUE); - $_SESSION['mayorapiauth'] = true; - return true; - } else { - return false; - } - } - - function unsetTokenCookies() { // + MS_* - $selector = readVariable($_COOKIE['t_selector'], 'string', readVariable($_GET['t_selector'], 'hexa', null)); - if ($selector!='') { - $q = "DELETE FROM authToken WHERE selector='%s'"; - $values = array($selector); - db_query($q, array('debug'=>false,'fv' => 'na', 'modul'=>'login', 'result'=>'delete', 'values'=>$values),$lr); - } - setcookie('t_selector','',time() - 3600,'/','',TRUE,TRUE); - setcookie('t_validator','',time() - 3600,'/','',TRUE,TRUE); - if (is_array($_COOKIE)) { - foreach($_COOKIE as $key => $value) { - if (substr($key,0,3) == 'MS_') { - setcookie($key,'',time() - 3600,'/','',TRUE,TRUE); - } - } - } - $_SESSION['mayorapiauth'] = false; - } - - function mayorApiAuth() { - - // $MAYORAPIDATA tömb feltöltése - $selector = readVariable($_COOKIE['t_selector'], 'string', readVariable($_GET['t_selector'], 'hexa', null)); - $validator = readVariable($_COOKIE['t_validator'], 'string', readVariable($_GET['t_validator'], 'hexa', null)); - if ($selector!='' && $validator!='') { - $q = "SELECT * FROM authToken WHERE selector = '%s' AND expires >= NOW()"; - $r = db_query($q, array('fv'=>'rights/xltoken','modul'=>'login','result'=>'record','values'=>array($selector))); - } - if (is_array($r)) { - $calc = hash('sha256', hex2bin($validator)); - if (hash_equals($calc, $r['token'])) { // valid token - global $sessionMode; - $sessionMode = 2; - // reauth AS: - $toPolicy = $r['policy']; - $userAccount = $r['userAccount']; - $userCn = $r['userCn']; - $studyId = $r['studyId']; - $userPassword = ''; // ??? - $lang = _DEFAULT_LANG; - $data = $r; - $_SESSION['mayorapiauth'] = true; - $q = "UPDATE authToken SET activity=NOW(), ipAddress='%s' WHERE selector = '%s'"; - $v = array(CLIENTIPADDRESS,$selector); - db_query($q, array('fv'=>'rights/xltoken','modul'=>'login','result'=>'update','values'=>$v)); - return array('userAccount'=>$data['userAccount'],'toPolicy'=>$data['policy'],'studyId'=>$data['studyId'],'userCn'=>$data['userCn'],'valid'=>true); - } else { - unsetTokenCookies(); - } - } else { - unsetTokenCookies(); - } - return false; - } - - function getMyActivity() { - $q = "SELECT ipAddress,activity FROM authToken WHERE userAccount ='%s' AND policy='%s'"; - $v = array(_USERACCOUNT,_POLICY); - return db_query($q, array('fv'=>'rights/getMyActivity','modul'=>'login','result'=>'indexed','values'=>$v)); - } - - function revokeTokens() { - unsetTokenCookies(); - $q = "DELETE FROM authToken WHERE userAccount ='%s' AND policy='%s'"; - $v = array(_USERACCOUNT,_POLICY); - return db_query($q, array('fv'=>'rights/revokeTokens','modul'=>'login','result'=>'delete','values'=>$v)); - } - -?> diff --git a/mayor-orig/www/include/modules/naplo/admin/azonositok.php b/mayor-orig/www/include/modules/naplo/admin/azonositok.php deleted file mode 100644 index 9d85b3e5..00000000 --- a/mayor-orig/www/include/modules/naplo/admin/azonositok.php +++ /dev/null @@ -1,14 +0,0 @@ -= CURDATE() OR kiDt IS NULL) - AND (statusz != 'jogviszonya lezárva' OR jogviszonyVege < CURDATE()) ORDER BY diakNev, oId"; - return db_query($q, array('fv' => 'getOsztalyAzonositok', 'modul' => 'naplo_intezmeny', 'result' => 'indexed', 'values' => array($osztalyId)), $lr); - - } - -?> diff --git a/mayor-orig/www/include/modules/naplo/admin/checksql.php b/mayor-orig/www/include/modules/naplo/admin/checksql.php deleted file mode 100644 index cb751521..00000000 --- a/mayor-orig/www/include/modules/naplo/admin/checksql.php +++ /dev/null @@ -1,98 +0,0 @@ - intezmenyDbNev(__INTEZMENY)); - - $fp = fopen($queryFile, 'r'); - $query = fread($fp, filesize($queryFile)); - fclose($fp); - - // A tárolt eljárásoknak, függvényeknek "DELIMITER //" és "DELIMITER ; //" között kell lenniük - egy blokkban a file végén! - list($query, $delimiter) = explode('DELIMITER //', $query); - - // Tábladefiníciók - normál query-k - $QUERIES = explode(';', str_replace("\n", '', $query)); - for ($i = 0; $i < count($QUERIES); $i++) { - $q = $QUERIES[$i]; - if (trim($q) != '' and substr($q, 0, 2) != '--' and substr($q, 0, 3) != '/*!') { - if (is_array($convert)) foreach ( $convert as $mit=>$mire ) $q = str_replace($mit,$mire,$q); - } - if (substr($q,0,6) == 'CREATE') { - $_q = str_replace(' ','',$q); - $first = $second = 0; - for ($c = 0; $c$db,'result'=>'record')); - $q1 = str_replace("\n",'',str_replace(' ','',$r['Create Table'])); - $q2 = str_replace(' ','',$_q); - $q1_tmp = substr($q1,0,strrpos($q1,")")); - $q2_tmp = substr($q2,0,strrpos($q2,")")); - if ($q1_tmp!=$q2_tmp) { - $Q_ERR[]=array('inDb'=>$r['Create Table'],'inFile'=>$q); - } - } - } - } - - - -/* -Paul's Simple Diff Algorithm v 0.1 -(C) Paul Butler 2007 -May be used and distributed under the zlib/libpng license. -This code is intended for learning purposes; it was written with short -code taking priority over performance. It could be used in a practical -application, but there are a few ways it could be optimized. -Given two arrays, the function diff will return an array of the changes. -I won't describe the format of the array, but it will be obvious -if you use print_r() on the result of a diff on some test data. -htmlDiff is a wrapper for the diff command, it takes two strings and -returns the differences in HTML. The tags used are and , -which can easily be styled with CSS. -*/ - -function diff($old, $new){ -foreach($old as $oindex => $ovalue){ -$nkeys = array_keys($new, $ovalue); -foreach($nkeys as $nindex){ -$matrix[$oindex][$nindex] = isset($matrix[$oindex - 1][$nindex - 1]) ? -$matrix[$oindex - 1][$nindex - 1] + 1 : 1; -if($matrix[$oindex][$nindex] > $maxlen){ -$maxlen = $matrix[$oindex][$nindex]; -$omax = $oindex + 1 - $maxlen; -$nmax = $nindex + 1 - $maxlen; -} -} -} -if($maxlen == 0) return array(array('d'=>$old, 'i'=>$new)); -return array_merge( -diff(array_slice($old, 0, $omax), array_slice($new, 0, $nmax)), -array_slice($new, $nmax, $maxlen), -diff(array_slice($old, $omax + $maxlen), array_slice($new, $nmax + $maxlen))); -} - -function htmlDiff($old, $new){ -$diff = diff(explode(' ', $old), explode(' ', $new)); -foreach($diff as $k){ -if(is_array($k)) -$ret .= (!empty($k['d'])?"".implode(' ',$k['d'])." ":''). -(!empty($k['i'])?"".implode(' ',$k['i'])." ":''); -else $ret .= $k . ' '; -} -return $ret; -} - - - -?> diff --git a/mayor-orig/www/include/modules/naplo/admin/intezmenyek.php b/mayor-orig/www/include/modules/naplo/admin/intezmenyek.php deleted file mode 100644 index 654a4c56..00000000 --- a/mayor-orig/www/include/modules/naplo/admin/intezmenyek.php +++ /dev/null @@ -1,117 +0,0 @@ - 'updateNaploSession', 'modul' => 'naplo_base', 'values' => $v)); - } - - function intezmenyBejegyzese($OMKod, $nev, $rovidnev) { - - $lr = db_connect('naplo_base', array('fv' => 'intezmenyBejegyzese')); - - $q = "SELECT COUNT(*) FROM intezmeny WHERE alapertelmezett=1"; - $num = db_query($q, array('fv' => 'intezmenyBejegyzese', 'modul' => 'naplo_base', 'result' => 'value'), $lr); - - if ($num > 0) $alapertelmezett = 0; - else $alapertelmezett = 1; - - $q = "INSERT INTO intezmeny (OMKod, nev, rovidnev, alapertelmezett) - VALUES ('%s', '%s', '%s', %u)"; - $v = array($OMKod, $nev, $rovidnev, $alapertelmezett); - $r = db_query($q, array('fv' => 'intezmenyBejegyzese', 'modul' => 'naplo_base', 'values' => $v), $lr); - - db_close($lr); - } - - function intezmenyModositas($ADAT) { - - $q = "UPDATE intezmeny SET nev='%s', OMKod='%s', alapertelmezett=%u, fenntarto='%s' WHERE rovidNev='".__INTEZMENY."' "; - $v = array($ADAT['nev'], $ADAT['OMKod'], $ADAT['alapertelmezett'], $ADAT['fenntarto']); - return db_query($q, array('fv' => 'intezmenyModositas', 'modul' => 'naplo_base', 'values' => $v)); - - } - - function intezmenyTorles($intezmeny) { - - $q = "DELETE FROM intezmeny WHERE rovidNev='%s'"; - return db_query($q, array('fv' => 'intezmenyTorles', 'modul' => 'naplo_base', 'values' => array($intezmeny))); - - } - - function getIntezmeny($intezmeny) { - - $q = "SELECT * FROM `intezmeny` WHERE `rovidNev`='%s'"; - $ret = db_query($q, array('fv' => 'getIntezmeny', 'modul' => 'naplo_base', 'result' => 'record', 'values' => array($intezmeny))); - - $q = "SELECT * FROM `%s`.`telephely`"; - $ret['telephely'] = db_query($q, array('fv' => 'getIntezmeny', 'modul' => 'naplo_base', 'result' => 'indexed', 'values' => array(intezmenyDbNev($intezmeny)))); - - return $ret; - - } - - function telephelyModositas($ADAT) { - - $v = array( - __INTEZMENYDBNEV, - // Telephely adatai - readVariable($ADAT['telephelyNev'], 'sql', null), - readVariable($ADAT['telephelyRovidNev'], 'sql', null), - readVariable($ADAT['alapertelmezett'], 'numeric unsigned', 0, array(0,1)), - readVariable($ADAT['cimHelyseg'], 'sql', null), - readVariable($ADAT['cimIrsz'], 'numeric', 'NULL'), - readVariable($ADAT['cimKozteruletNev'], 'sql', null), - readVariable($ADAT['cimKozteruletJelleg'], 'sql', null), - readVariable($ADAT['cimHazszam'], 'sql', null), - readVariable($_POST['telefon'], 'string'), - readVariable($_POST['fax'], 'string'), - readVariable($_POST['email'], 'string'), - readVariable($_POST['honlap'], 'string'), - readVariable($_POST['telephelyId'], 'id') - ); - - $q = "UPDATE `%s`.`telephely` - SET `telephelyNev`='%s', `telephelyRovidNev`='%s', `alapertelmezett`=%u, - `cimHelyseg`='%s', `cimIrsz`=%u, `cimKozteruletNev`='%s',`cimKozteruletJelleg`='%s', `cimHazszam`='%s', - `telefon`='%s',`fax`='%s',`email`='%s',`honlap`='%s' - WHERE `telephelyId`='%s' "; - - return db_query($q, array('fv' => 'telephelyModositas', 'modul' => 'naplo_base', 'values' => $v)); - - } - - function ujTelephely($ADAT) { - - $v = array( - __INTEZMENYDBNEV, - // Telephely adatai - readVariable($ADAT['telephelyNev'], 'sql', null), - readVariable($ADAT['telephelyRovidNev'], 'sql', null), - readVariable($ADAT['alapertelmezett'], 'numeric unsigned', 0, array(0,1)), - readVariable($ADAT['cimHelyseg'], 'sql', null), - readVariable($ADAT['cimIrsz'], 'numeric', 'NULL'), - readVariable($ADAT['cimKozteruletNev'], 'sql', null), - readVariable($ADAT['cimKozteruletJelleg'], 'sql', null), - readVariable($ADAT['cimHazszam'], 'sql', null), - readVariable($_POST['telefon'], 'string'), - readVariable($_POST['fax'], 'string'), - readVariable($_POST['email'], 'string'), - readVariable($_POST['honlap'], 'string'), - ); - - $q = "INSERT INTO `%s`.`telephely` - (`telephelyNev`,`telephelyRovidNev`,`alapertelmezett`,`cimHelyseg`,`cimIrsz`,`cimKozteruletNev`,`cimKozteruletJelleg`,`cimHazszam`, - `telefon`,`fax`,`email`,`honlap`) - VALUES ('%s', '%s', %u,'%s', %u, '%s','%s', '%s','%s','%s','%s','%s')"; - - return db_query($q, array('fv' => 'ujTelephely', 'modul' => 'naplo_base', 'values' => $v)); - - } - -?> diff --git a/mayor-orig/www/include/modules/naplo/admin/szemeszterek.php b/mayor-orig/www/include/modules/naplo/admin/szemeszterek.php deleted file mode 100644 index 6e4c2149..00000000 --- a/mayor-orig/www/include/modules/naplo/admin/szemeszterek.php +++ /dev/null @@ -1,48 +0,0 @@ - 'idoszakTorles', 'modul' => 'naplo_intezmeny', 'values' => array($idoszakId))); - } - - function idoszakModositas($idoszakId, $tolDt, $igDt) { - $q = "UPDATE idoszak SET tolDt='%s', igDt='%s' WHERE idoszakId=%u"; - $v = array($tolDt, $igDt, $idoszakId); - return db_query($q, array('fv' => 'idoszakModositas', 'modul' => 'naplo_intezmeny', 'values' => $v)); - } - - function ujIdoszak($tolDt, $igDt, $tipus, $tanev = '', $szemeszter = '', $idoszakTipusok = '') { - // dátum ellenőrzés - if (strtotime($tolDt) > strtotime($igDt)) { - $_SESSION['alert'][] = 'message:wrong_data:dt:'.str_replace(':', '.', $tolDt.' - '.$igDt); - return false; - } - // típus ellenőrzés - if (!is_array($idoszakTipusok)) $idoszakTipusok = getIdoszakTipusok(); - if (!in_array($tipus, $idoszakTipusok)) { - $_SESSION['alert'][] = 'message:wrong_data:idoszak.tipus:'.$tipus; - return false; - } - // tanev/szemeszter beállítás - if ($tanev == '' || $szemeszter == '') { - $q = "SELECT tanev, szemeszter FROM szemeszter WHERE kezdesDt <= '%s' AND '%s' <= zarasDt"; - $v = array($igDt, $tolDt); - $ret = db_query($q, array('fv' => 'ujIdoszak', 'modul' => 'naplo_intezmeny', 'result' => 'indexed', 'values' => $v)); - if (is_array($ret) && count($ret) == 1) { - $tanev = $ret[0]['tanev']; - $szemeszter = $ret[0]['szemeszter']; - } else { - return false; - } - } - // idoszak felvétele - $q = "INSERT INTO idoszak (tolDt, igDt, tipus, tanev, szemeszter) VALUES ('%s', '%s', '%s', %u, %u)"; - $v = array($tolDt, $igDt, $tipus, $tanev, $szemeszter); - return db_query($q, array('fv' => 'ujIdoszak', 'modul' => 'naplo_intezmeny', 'values' => $v)); - } - - function getIdoszakTipusok() { - return getEnumField('naplo_intezmeny', 'idoszak', 'tipus'); - } - -?> diff --git a/mayor-orig/www/include/modules/naplo/admin/szuloiAzonositok.php b/mayor-orig/www/include/modules/naplo/admin/szuloiAzonositok.php deleted file mode 100644 index 585292bf..00000000 --- a/mayor-orig/www/include/modules/naplo/admin/szuloiAzonositok.php +++ /dev/null @@ -1,14 +0,0 @@ -= CURDATE() OR kiDt IS NULL) - AND (statusz != 'jogviszonya lezárva' OR jogviszonyVege < CURDATE()) ORDER BY diakNev, oId"; - return db_query($q, array('fv' => 'getOsztalyAzonositok', 'modul' => 'naplo_intezmeny', 'result' => 'indexed', 'values' => array($osztalyId))); - - } - -?> diff --git a/mayor-orig/www/include/modules/naplo/admin/tanevek.php b/mayor-orig/www/include/modules/naplo/admin/tanevek.php deleted file mode 100644 index cf2b32db..00000000 --- a/mayor-orig/www/include/modules/naplo/admin/tanevek.php +++ /dev/null @@ -1,390 +0,0 @@ - 'updateNaploSession', 'modul' => 'naplo_base', 'values' => $v)); - } - - function szemeszterBejegyzes($szemeszterObj) { - - global $mayorCache; - $mayorCache->delType('szemeszter'); - - $tanev = $szemeszterObj['tanev']; - $szemeszter = $szemeszterObj['szemeszter']; - $statusz = $szemeszterObj['statusz']; - $kDt = $szemeszterObj['kezdesDt']; - $zDt = $szemeszterObj['zarasDt']; - - if ($tanev != '' && $szemeszter != '') { - $lr = db_connect('naplo_intezmeny', array('fv' => 'szemeszterBejegyzes')); - - $q = "SELECT COUNT(*) FROM szemeszter WHERE szemeszter=%u AND tanev=%u"; - $v = array($szemeszter, $tanev); - $num = db_query($q, array('fv' => 'szemeszterBejegyzes', 'modul' => 'naplo_intezmeny', 'result' => 'value', 'values' => $v), $lr); - if ($num == 0) { - - $q = "INSERT INTO szemeszter (tanev,szemeszter, statusz, kezdesDt, zarasDt) - VALUES (%u, %u, '%s', '%s', '%s')"; - $v = array($tanev, $szemeszter, $statusz, $kDt, $zDt); - $r = db_query($q, array('fv' => 'szemeszterBejegyzes', 'modul' => 'naplo_intezmeny', 'values' => $v), $lr); - - } else { - $_SESSION['alert'][] = 'message:letezo_szemeszter:'."$tanev:$szemeszter"; - } - db_close($lr); - } - } - - function szemeszterTorles($szemeszterId) { - - global $mayorCache; - $mayorCache->delType('szemeszter'); - - $lr = db_connect('naplo_intezmeny', array('fv' => 'szemeszterTorles')); - if (!$lr) return false; - - $q = 'DELETE FROM szemeszter WHERE szemeszterId IN ('.implode(',', array_fill(0, count($szemeszterId), '%u')).')'; - $r = db_query($q, array('fv' => 'szemeszterTorles', 'modul' => 'naplo_intezmeny', 'values' => $szemeszterId), $lr); - - db_close($lr); - return $r; - - } - - - function activateTanev($tanev) { - setTanevStatus($tanev,'aktív'); - } - - function closeTanev($ADAT) { - - global $ZaradekIndex; - global $mayorCache; - $mayorCache->delType('szemeszter'); - - $tanev = $ADAT['tanev']; - - if (strtotime($ADAT['tanevAdat']['zarasDt']) >= time()) { - $_SESSION['alert'][] = "message:wrong_data:A tanév még nem ért véget!:$tanev tanév vége ".$ADAT['tanevAdat']['zarasDt']; - return false; - } - if (strtotime($ADAT['tanevAdat']['zarasDt']) >= strtotime($ADAT['dt'])) { - $_SESSION['alert'][] = "message:wrong_data:A tanév csak az utolsó tanítási nap utáni hatállyal zárható le!:$tanev tanév vége ".$ADAT['tanevAdat']['zarasDt'].': zárás dátuma '.$ADAT['dt']; - return false; - } - $Szemeszter = $ADAT['tanevAdat']['szemeszter']; - $vDiakok = getVegzoDiakok(array('tanev' => $tanev)); - // A függvénynek nincs statusz paramétere // $vDiakok = getVegzoDiakok(array('tanev' => $tanev, 'statusz' => array('jogviszonyban van','magántanuló','jogviszonya felfüggesztve'))); - //vegzoOsztalyok, vjlOsztalyok, vatOsztalyok - - if (in_array('vegzosJogviszonyLezaras', $ADAT['step'])) { - - // Azoknak a jogviszonyát kell csak lezárni, akik csak végzős osztálynak tagjai - és az osztályaik meg vannak jelölve (diak tábla) - $oDiakok = getDiakokByOsztalyId($ADAT['vjlOsztaly'], array('tanev' => $tanev, 'result' => '', 'statusz' => array('jogviszonyban van','magántanuló','jogviszonya felfüggesztve'))); - $vjlDiakIds = array(); - for ($i = 0; $i < count($oDiakok); $i++) { - $diakId = $oDiakok[$i]['diakId']; - if (!in_array($diakId, $vjlDiakIds)) { // Ha még nem választottuk ki (jöhet többször, mert lehet egy diák több osztályban) - if (in_array($diakId, $vDiakok)) { - $vjlDiakIds[] = $diakId; - // A jogviszony lezárás egyúttal: - // - tankörökből való kiléptetés - // - osztályokból való kiléptetés - $D = array( - 'diakId' => $diakId, 'jogviszonyValtasDt' => $ADAT['dt'], 'ujStatusz' => 'jogviszonya lezárva', 'tanev' => $tanev, - 'lezarasZaradekIndex' => $ZaradekIndex['jogviszony']['lezárás']['tanulmányait befejezte'] - ); - diakJogviszonyValtas($D); - } else { - $_SESSION['alert'][] = "info:wrong_data:Nem végzős:$diakId (jogviszonyát nem zárjuk le)"; - } - } - } -// if (count($vjlDiakIds) > 0) diakJogviszonyLezaras($vjlDiakIds, $ADAT['dt'], $olr = ''); - - } - - if (in_array('vegzosOsztalyokLezarasa', $ADAT['step'])) { - // A megjelölt végzős osztályokból kiléptetjük a diákokat (osztaly-Diak tábla) - $osztalyIds = array(); - for ($i = 0; $i < count($ADAT['vegzoOsztalyok']); $i++) $osztalyIds[] = $ADAT['vegzoOsztalyok'][$i]['osztalyId']; - osztalyLezaras($osztalyIds, $ADAT['dt']); - } - if (in_array('vegzosAzonositokTorlese', $ADAT['step'])) { - - require_once('include/modules/session/search/searchAccount.php'); - // Végzősök azonosítóinak törlése (mayor_private.accounts - lezárt jogviszonyúak) - - $q = "SELECT oId FROM diak WHERE statusz='jogviszonya lezárva' AND oId IS NOT NULL"; - $oIds = db_query($q, array('fv' => 'closeTanev/azonosítók lekérdezése', 'modul' => 'naplo_intezmeny', 'result' => 'idonly')); - foreach ($oIds as $index => $oId) { - $ret = searchAccount('studyId', $oId, array('userAccount'), 'private'); - if ($ret['count'] == 1) deleteAccount($ret[0]['userAccount'][0], 'private'); - else $_SESSION['alert'][] = "info:wrong_data:nincs diák account:oId=$oId"; - } - } - - if (in_array('vegzosSzuloAzonositokTorlese', $ADAT['step'])) { - - require_once('include/modules/session/search/searchAccount.php'); - // Végzősök szülői azonosítóinak törlése (mayor_parent.accounts - pontosabban: lezárt jogviszonyúak userAccount=NULL) - $q = "SELECT szulo.userAccount - FROM diak LEFT JOIN szulo ON szuloId IN (apaId,anyaId,gondviseloId) - WHERE szulo.userAccount IS NOT NULL GROUP BY szulo.userAccount - HAVING SUM(IF(diak.statusz IN ('jogviszonyban van','magántanuló','vendégtanuló','jogviszonya felfüggesztve'), 1, 0)) = 0 - AND SUM(IF(diak.statusz IN ('jogviszonya lezárva','felvételt nyert'),1,0)) > 0"; - - $userAccounts = db_query($q, array('fv' => 'closeTanev/azonosítók lekérdezése', 'modul' => 'naplo_intezmeny', 'result' => 'idonly')); - foreach ($userAccounts as $index => $userAccount) { - $ret = searchAccount('userAccount', $userAccount, array('userAccount'), 'parent'); - if ($ret['count'] == 1) - deleteAccount($ret[0]['userAccount'][0], 'parent'); - else - $_SESSION['alert'][] = "message:wrong_data:nincs szülő account:userAccount=$userAccount"; - - $q = "UPDATE szulo SET userAccount=NULL WHERE userAccount IN ('".implode("','", array_fill(0, count($userAccounts), '%s'))."')"; - - db_query($q, array('fv' => 'closeTanev', 'modul' => 'naplo_intezmeny', 'values' => $userAccounts)); - } - - } - - if (in_array('tanevLezaras', $ADAT['step'])) { - - // A tanév lezárása - setTanevStatus($tanev,'lezárt'); - - $Wnemszamit = defWnemszamit(); - // A tanévhez tartozó hiányzási adatok lekérdezése és rögzítése - $tanevDb = tanevDbNev(__INTEZMENY, $tanev); - foreach ($Szemeszter as $i => $szAdat) { - if ($szAdat['statusz'] == 'aktív') { // tervezett és lezárt szemeszter nem zárható le... - // replace - ha megnyitunk és újra lezárunk egy tanévet... - $q = "REPLACE INTO ".__INTEZMENYDBNEV.".hianyzasOsszesites - SELECT diakId, %u AS tanev, %u AS szemeszter, - COUNT(IF(tipus='hianyzas' AND statusz='igazolt',1,NULL)) AS igazolt, - COUNT(IF(tipus='hianyzas' AND statusz='igazolatlan',1,NULL)) AS igazolatlan, - SUM(IF(tipus='késés' AND statusz='igazolatlan',perc,NULL)) AS kesesPercOsszeg, - - COUNT(IF(tipus='hianyzas' AND statusz='igazolt' AND tankorTipus.jelleg='gyakorlat',1,NULL)) AS gyakorlatIgazolt, - COUNT(IF(tipus='hianyzas' AND statusz='igazolatlan' AND tankorTipus.jelleg='gyakorlat',1,NULL)) AS gyakorlatIgazolatlan, - SUM(IF(tipus='késés' AND statusz='igazolatlan' AND tankorTipus.jelleg='gyakorlat',perc,NULL)) AS gyakorlatKesesPercOsszeg, - - COUNT(IF(tipus='hianyzas' AND statusz='igazolt' AND tankorTipus.jelleg='elmélet',1,NULL)) AS elmeletIgazolt, - COUNT(IF(tipus='hianyzas' AND statusz='igazolatlan' AND tankorTipus.jelleg='elmélet',1,NULL)) AS elmeletIgazolatlan, - SUM(IF(tipus='késés' AND statusz='igazolatlan' AND tankorTipus.jelleg='elmélet',perc,NULL)) AS elmeletKesesPercOsszeg - - FROM `%s`.hianyzas ".$Wnemszamit['join']." - WHERE ( - tipus = 'hiányzás' - OR (tipus='késés' AND statusz='igazolatlan' AND perc IS NOT NULL) - ) AND dt<='%s' - ".$Wnemszamit['nemszamit']." - GROUP BY diakId"; - $v = array($tanev, $szAdat['szemeszter'], $tanevDb, $szAdat['zarasDt']); - $r = db_query($q, array('fv' => 'closeTanev/hianyzasOsszesites', 'modul' => 'naplo_intezmeny', 'values' => $v)); - // A hozott hiányzások hozzáadása - $q = "UPDATE ".__INTEZMENYDBNEV.".hianyzasOsszesites SET - igazolt = igazolt + ( - SELECT IFNULL(SUM(dbHianyzas),0) FROM `%s`.hianyzasHozott AS `hh` - WHERE hh.diakId = hianyzasOsszesites.diakId AND hh.statusz='igazolt' AND hh.dt<='%s' - ), - igazolatlan = igazolatlan + ( - SELECT IFNULL(SUM(dbHianyzas),0) FROM `%s`.hianyzasHozott AS `hh` - WHERE hh.diakId = hianyzasOsszesites.diakId AND hh.statusz='igazolatlan' AND hh.dt<='%s' - ) - WHERE tanev=%u AND szemeszter=%u"; - $v = array($tanevDb, $szAdat['zarasDt'], $tanevDb, $szAdat['zarasDt'], $tanev, $szAdat['szemeszter']); - $r = db_query($q, array('fv' => 'closeTanev/hianyzasOsszesites/hozott', 'modul' => 'naplo_intezmeny', 'values' => $v)); - } - } - } - - return true; - - } - - function setTanevStatus($tanev,$statusz) { - global $mayorCache; - $mayorCache->delType('szemeszter'); - - $q = "UPDATE szemeszter SET statusz='%s' WHERE tanev=%u"; - $v = array($statusz, $tanev); - return db_query($q, array('fv' => 'setTanevStatus', 'modul' => 'naplo_intezmeny', 'values' => $v)); - } - - - function refreshOsztalyNaplo($dbNev, $tanev) { - - global $mayorCache; - $mayorCache->flushdb(); - - $lr = db_connect('naplo_intezmeny', array('priv' => 'Write', 'fv' => 'refreshOsztalyNaplo')); - if (!$lr) return false; - - $q = "SELECT `osztalyId`,"._osztalyJel($tanev)." AS `osztalyJel`,"._evfolyam($tanev)." AS evfolyam,"._evfolyamJel($tanev)." AS evfolyamJel - FROM `osztaly` LEFT JOIN mayor_naplo.osztalyJelleg USING (osztalyJellegId) - WHERE kezdoTanev<=%u AND vegzoTanev>=%u - ORDER BY evfolyam, evfolyamJel, kezdoTanev, jel"; - - $v = array($tanev, $tanev); - $ret = db_query($q, array('fv' => 'refreshOsztalyNaplo', 'modul' => 'naplo_intezmeny', 'result' => 'indexed', 'values' => $v), $lr); - if (!is_array($ret)) return false; - foreach ($ret as $key => $sor) { - $q = "REPLACE INTO `%s`.osztalyNaplo (osztalyId,osztalyJel,evfolyam,evfolyamJel) VALUES (%u,'%s',%u,'%s')"; - $v = array($dbNev, $sor['osztalyId'], $sor['osztalyJel'], $sor['evfolyam'], $sor['evfolyamJel']); - db_query($q, array('fv' => 'refreshOsztalyNaplo', 'modul' => 'naplo_intezmeny', 'values' => $v), $lr); - } - - db_close($lr); - return true; - - - } - - function szemeszterModositasOrig($ADAT) { - - - for ($i = 0; $i < count($ADAT); $i++) { - - $kezdesDt = $ADAT[$i]['kezdesDt']; $zarasDt = $ADAT[$i]['zarasDt']; - $tanev = $ADAT[$i]['tanev']; $szemeszter = $ADAT[$i]['szemeszter']; - - $q = "SELECT zarasDt FROM szemeszter WHERE tanev=%u AND szemeszter=%u"; - $v = array($tanev, $szemeszter); - $zDt = db_query($q, array('fv' => 'szemeszterModositas', 'modul' => 'naplo_intezmeny', 'values' => $v, 'result'=>'value')); - - $q = "SELECT count(*) FROM zaroJegy WHERE hivatalosDt='%s'"; - $v = array($zDt); - $db = db_query($q, array('fv' => 'szemeszterModositas', 'modul' => 'naplo_intezmeny', 'values' => $v, 'result'=>'value')); - - if ($db==0) { - - $q = "UPDATE szemeszter SET kezdesDt='%s',zarasDt='%s' WHERE tanev=%u AND szemeszter=%u"; - $v = array($kezdesDt, $zarasDt, $tanev, $szemeszter); - db_query($q, array('fv' => 'szemeszterModositas', 'modul' => 'naplo_intezmeny', 'values' => $v)); - - } else { - $_SESSION['alert'][] = 'error:wrong_data:van már a '.$zDt.'-hez rögzített zárójegy!'; - return false; - } - } - - } - - /* - * A szemeszter dátumhatárainak módosítása több dolgot is érint. - * 1. A zárójegyek hivatalos dátuma a szemszter záró dátuma - kivéve a vizsgajegyket. - * - megoldás: módosítsuk a zárójegy dátumát - * 2. A tanév nap táblája a tanév kezdetétől a végéig tartalmaz napokat. - * - vegyük fel, illetve töröljük a hiányzó napokat (??) - * 3. Elképzelhető, hogy a már beírt órákat, és ezen keresztül hiányzásokat és jegyeket is érinti a módosítás (ora tábla) - * - Ha órák törlésével járna, akkor egyszerűbb nem megengedni a módosítást. Ha kell, akkor előre törölje az órákat külön! - */ - function szemeszterModositas($ADAT) { - - global $mayorCache; - $mayorCache->flushdb(); - - $success = true; - for ($i = 0; $i < count($ADAT); $i++) { - - unset($tolDt); unset($igDt); - $kezdesDt = $ADAT[$i]['kezdesDt']; $zarasDt = $ADAT[$i]['zarasDt']; - $tanev = $ADAT[$i]['tanev']; $szemeszter = $ADAT[$i]['szemeszter']; - $tanevDb = tanevDbNev(__INTEZMENY, $tanev); - - $lr = db_connect('naplo_intezmeny', array('fv' => 'szemeszterModositas')); - db_start_trans($lr); - - // a korábbi szemeszter zárás dátumának és státuszának lekérdezése - $q = "SELECT statusz, kezdesDt, zarasDt FROM szemeszter WHERE tanev=%u AND szemeszter=%u"; - $v = array($tanev, $szemeszter); - $ret = db_query($q, array('fv' => 'szemeszterModositas/select', 'modul' => 'naplo_intezmeny', 'values' => $v, 'result'=>'record')); - $kDt = $ret['kezdesDt']; $zDt = $ret['zarasDt']; - if ($ret['statusz'] == 'lezárt') { - // lezárt szemeszter adatait ne változtassuk - $_SESSION['alert'][] = 'message:wrong_data:lezárt szemeszter! (szemeszter='.$tanev.'/'.$szemeszter.')'; - db_rollback($lr); db_close($lr); $success = false; continue; - } - if (($szemeszter == 1 && $kezdesDt != $kDt) || ($szemeszter == 2 && $zarasDt != $zDt)) { - // tanév kezdő vagy záró dátumának módosítása - if ($ret['statusz'] == 'aktív') { - // A tanév adatbázisát is érintik a változások - if ($szemeszter == 1 && $kezdesDt > $kDt) { - // Ha az év elejéből el kellene venni napokat, akkor ellenőrizzük, hogy vannak-e órák ezekre a napokra már beírva - $q = "SELECT COUNT(*) FROM `$tanevDb`.`ora` WHERE `dt` < '%s'"; - $v = array($kezdesDt); - $db = db_query($q, array('fv' => 'szemeszterModositas/ora - kezdés', 'modul' => 'naplo_intezmeny', 'values' => $v, 'result' => 'value'), $lr); - if ($db === "0") { - // Ha nincs betöltött óra, akkor módosíthatók a nap tábla megfelelő rekordjai; munkanapok --> szorgalmi időszakon kívüli munkanap - $q = "UPDATE `$tanevDb`.`nap` SET tipus='szorgalmi időszakon kívüli munkanap', orarendiHet=0 - WHERE `dt` < '%s' AND tipus IN ('tanítási nap','speciális tanítási nap','tanítás nélküli munkanap')"; - $v = array($kezdesDt); - $db = db_query($q, array('fv' => 'szemeszterModositas/delete nap', 'modul' => 'naplo_intezmeny', 'values' => $v, 'result' => 'value'), $lr); - } else { - // Ha van, akkor hibát üzenünk és nem hajtjuk végre a módosítást - $_SESSION['alert'][] = 'message:insufficient_access:szemeszterMododitas/tanév később kezdés:A dátumváltoztatás már betöltött órákat érintene!'; - db_rollback($lr, 'szemeszterModositas/van betöltött óra!'); db_close($lr); $success = false; continue; - } - } elseif ($szemeszter == 2 && $zarasDt < $zDt) { - // Ha az év végéből kell elvenni napokat, akkor ellenőrizzük, hogy vannak-e _lekötött_ órák ezekre a napokra már beírva - $q = "SELECT COUNT(*) FROM `$tanevDb`.`ora` WHERE `dt` > '%s' AND munkaido='lekötött'"; - $v = array($zarasDt); - $db = db_query($q, array('fv' => 'szemeszterModositas/ora - zárás', 'modul' => 'naplo_intezmeny', 'values' => $v, 'result' => 'value'), $lr); - if ($db === "0") { - // Ha nincs betöltött óra, akkor módosíthatók a nap tábla megfelelő rekordjai; munkanapok --> szorgalmi időszakon kívüli munkanap - $q = "UPDATE `$tanevDb`.`nap` SET tipus='szorgalmi időszakon kívüli munkanap', orarendiHet=0 - WHERE `dt` > '%s' AND tipus IN ('tanítási nap','speciális tanítási nap','tanítás nélküli munkanap')"; - $v = array($zarasDt); - $db = db_query($q, array('fv' => 'szemeszterModositas/delete nap', 'modul' => 'naplo_intezmeny', 'values' => $v, 'result' => 'value'), $lr); - } else { - // Ha van, akkor hibát üzenünk és nem hajtjuk végre a módosítást - $_SESSION['alert'][] = 'message:insufficient_access:szemeszterMododitas/tanév rövidítés:A dátumváltoztatás már betöltött órákat érintene!'; - db_rollback($lr, 'szemeszterModositas/van betöltött óra!'); db_close($lr); $success = false; continue; - } - } elseif ($szemeszter == 1 && $kezdesDt < $kDt) { - // éves munkaterv (nap tábla) bővítése - $tolDt = $kezdesDt; $igDt = date('Y-m-d', strtotime('-1 day', strtotime($kDt))); - } elseif ($szemeszter == 2 && $zarasDt > $zDt) { - // éves munkaterv (nap tábla) bővítése - $tolDt = date('Y-m-d', strtotime('+1 day', strtotime($zDt))); $igDt = $zarasDt; - } - if (isset($tolDt) && isset($igDt)) { - $Hetek = array(1); - $r = napokHozzaadasa($tanev, $tolDt, $igDt, $ADAT[$i], $lr); - unset($tolDt); unset($igDt); - if (!$r) { db_rollback($lr, 'szemeszterModositas/nap felvétel'); db_close($lr); $success = false; continue; } - /*orarendiHetekHozzarendelese($tolDt, $igDt, $Hetek, $lr);*/ - } - } // aktív tanév - } // tanév hossza változik - // Az érintett, vizsgához nem kapcsolódó zárójegyek hivatalos dátumának módosítása - $q = "UPDATE zaroJegy LEFT JOIN vizsga USING (zaroJegyId) SET hivatalosDt='%s' WHERE hivatalosDt='%s' AND vizsgaId IS NULL"; - $v = array($zarasDt, $zDt); - $r = db_query($q, array('fv' => 'szemeszterModositas', 'modul' => 'naplo_intezmeny', 'values' => $v, 'result'=>'value')); - if ($r === false) { db_rollback($lr, 'szemeszterModositas/zarójegyek'); db_close($lr); $success = false; continue; } - // A szemeszter kezdés és zárás dátumának módosítása - $q = "UPDATE szemeszter SET kezdesDt='%s',zarasDt='%s' WHERE tanev=%u AND szemeszter=%u"; - $v = array($kezdesDt, $zarasDt, $tanev, $szemeszter); - $r = db_query($q, array('fv' => 'szemeszterModositas', 'modul' => 'naplo_intezmeny', 'values' => $v)); - if ($r === false) { db_rollback($lr, 'szemeszterModositas/dátum módosítás'); db_close($lr); $success = false; continue; } - - db_commit($lr); - db_close($lr); - - $_SESSION['alert'][] = 'info:success:tanev='.$tanev.', szemeszter='.$szemeszter; - - } - return $success; - - } - -?> \ No newline at end of file diff --git a/mayor-orig/www/include/modules/naplo/admin/tankorok.php b/mayor-orig/www/include/modules/naplo/admin/tankorok.php deleted file mode 100644 index 23887dbd..00000000 --- a/mayor-orig/www/include/modules/naplo/admin/tankorok.php +++ /dev/null @@ -1,133 +0,0 @@ - 'updateTankor')); - if (!$lr) { - fclose($fp); - return false; - } - - // Az első sor kihagyása - if ($rovatfej) $sor = fgets($fp,1024); - - // TárgyId-k átváltása - $keyNev = array_search('targyNev',$MEZO_LISTA); - if (!$keyNev && $keyNev !== 0) $keyNev = false; - if ($keyNev) { - $keyId = array_search('targyId',$MEZO_LISTA); - if (!$keyId && $keyId !== 0) { // Ha nincs targyId, akkor felvezzük a mező listába - $keyId = count($MEZO_LISTA); - $MEZO_LISTA[] = 'targyId'; - } - $MEZO_LISTA[$keyNev] = ''; // A targyNev nem játszik szerepet többet, csak a targyId - $targyak = array(); // $targyNev --> $targyId átalakítás tárolása - $attrList = array_values(array_filter($MEZO_LISTA)); // az attrList újragenerálása (targyNev helyett targyId) - if (in_array($keyNev,$KULCS_MEZOK)) { // Ha a targyNev kulcs lenne, akkor legyen helyette a tagyId a kulcs (ha már eleve benne volt a targyId, akkor most kétszer lesz benne - nem baj!) - $k = array_search($keyNev,$KULCS_MEZOK); - $KULCS_MEZOK[$k] = $keyId; - } - } - - while ($sor = fgets($fp,1024)) { - - $adatSor = explode($mezo_elvalaszto,chop($sor)); - $update = $hianyzoTargyId = false; - - // targyId megállapítása a targyNev alapján - if ( - $keyNev !== false // Ha van targyNev mező - && $adatSor[$keyNev] != '' // és nem üres - && $adatSor[$keyId] == '' // de nincs megadva targyId - - ) { - if (!isset($targyak[$adatSor[$keyNev]])) { // Ha még nem kérdeztük le a targyId-t - $q = "SELECT targyId FROM targy WHERE targyNev='%s'"; - $v = array($adatSor[$keyNev]); - $targyak[$adatSor[$keyNev]] = db_query($q, array( - 'fv' => 'updateTankor', 'modul' => 'naplo_intezmeny', 'result' => 'value', 'values' => $v - ), $lr); - if (!$targyak[$adatSor[$keyNev]]) { - $_SESSION['alert'][] = 'message:wrong_data:tárgyNév:'.$adatSor[$keyNev].':'.$num.':'.$sor; - $hianyzoTargyId = true; - } - } - $adatSor[$keyId] = $targyak[$adatSor[$keyNev]]; - } - // Innentől ha lehetett, akkor a targyNev le lett cserélve targyId-re - minden megy a sima frissítés szerint - - // keresési feltétel összerakása - $where = ''; - for ($i=0; $i 'updateTankor', 'modul' => 'naplo_intezmeny', 'result' => 'value'), $lr); - $update = ($num > 0); - } - if ($update) { - $UPDATE = array(); - for ($i = 0; $i < count($MEZO_LISTA); $i++) { - if ( - $MEZO_LISTA[$i] != '' - and $adatSor[$i] != '' - and !in_array($i,$KULCS_MEZOK) - ) { - $UPDATE[] = $MEZO_LISTA[$i]."='".$adatSor[$i]."'"; - } - } - if (count($UPDATE) > 0) { - $q = 'UPDATE tankor SET '.implode(',',$UPDATE).' WHERE '.$where; - $r = db_query($q, array('fv' => 'updateTankor', 'modul' => 'naplo_intezmeny'), $lr); - } - } elseif (!$hianyzoTargyId) { - $value = array(); - for ($i=0; $i 0) { - $q = 'INSERT INTO tankor ('.implode(",",$attrList).') VALUES '.implode(",\n",$VALUES); - $r = db_query($q, array('fv' => 'updateTankor', 'modul' => 'naplo_intezmeny'), $lr); - } - - db_close($lr); - - fclose($fp); - - } - - -?> diff --git a/mayor-orig/www/include/modules/naplo/base/base.php b/mayor-orig/www/include/modules/naplo/base/base.php deleted file mode 100644 index d3c32ad6..00000000 --- a/mayor-orig/www/include/modules/naplo/base/base.php +++ /dev/null @@ -1,298 +0,0 @@ - strtotime($tolDt)) $igDt = $dt; else $igDt = $tolDt; - elseif (!$override && strtotime($igDt) > strtotime($TA['zarasDt'])) $igDt = $TA['zarasDt']; - } else { - if ($tolDt == '' or (!$override && strtotime($tolDt) < strtotime($TA['kezdesDt']))) $tolDt = $TA['kezdesDt']; - elseif ($tolDt != '' && strtotime($TA['zarasDt']) < strtotime($tolDt)) $tolDt = $TA['zarasDt']; - if ($igDt == '' or (!$override && strtotime($igDt) > strtotime($TA['zarasDt']))) $igDt = $TA['zarasDt']; - elseif ($igDt != '' && strtotime($igDt) < strtotime($TA['kezdesDt'])) $igDt = $TA['kezdesDt']; - } - } - } - - // -------------------------------------------------- // - - function getTanitasiNapVissza($napszam, $from = 'curdate()', $olr = '') { - return getTanitasiNap(array('direction'=>'vissza','napszam'=>$napszam,'fromDt'=>$from), $olr); - } - - function getTanitasiNap($ADAT = array('direction'=>'', 'napszam'=>0, 'fromDt'=>'curdate()'), $olr = null) { - - global $_TANEV; - - if ($ADAT['fromDt']!='') $fromDt = $ADAT['fromDt']; else $fromDt = 'curdate()'; - if ($ADAT['direction']!='') $direction = $ADAT['direction']; - if ($ADAT['napszam']!='') $napszam = $ADAT['napszam']; - if ($napszam < 0 || !defined('__TANEV') || is_null(__TANEV) ||!is_array($_TANEV) || $_TANEV['kezdesDt']=='' || $_TANEV['statusz']=='tervezett') { - return false; - } - if ($direction == 'vissza') { $relacio='<'; $DESC = 'DESC'; } - else { $relacio = '>'; $DESC = 'ASC'; } - - if ($napszam==0) { // extra eset - $v = array($fromDt,1); - $from="CAST('%s' AS DATE)"; - if ($direction == 'vissza') $relacio = '<='; - else $relacio = '>='; - $limit = "1"; - } elseif ($fromDt != 'curdate()') { - $v = array($fromDt, ($napszam-1)); - $from="CAST('%s' AS DATE)"; - $limit = "%u,1"; - } else { - $v = array(($napszam-1)); - $from='curdate()'; - $limit = "%u,1"; - } - - $q = "SELECT DISTINCT(dt) FROM nap - WHERE dt $relacio $from - AND tipus LIKE '%%tanítási nap' - ORDER BY dt $DESC - LIMIT ".$limit; - $nap = db_query($q, array('fv' => 'getTanitasiNap', 'modul' => 'naplo', 'result' => 'value', 'values' => $v), $olr); - // Ha nincs elég tanítási nap, akkor iránytól függően adjuk vissza a szélső értékeket - if ($nap == '') { - if ($direction == 'vissza') $nap = date('Y-m-d',strtotime($_TANEV['kezdesDt'])); // ez ugye lehet nem tanítási nap is! - else $nap = date('Y-m-d',strtotime($_TANEV['zarasDt'])); // ez ugye lehet nem tanítási nap is! - } - - return $nap; - - } - - function getTanitasiHetHetfo($ADAT = array('direction'=>'', 'napszam'=>0, 'fromDt'=> ''), $olr = null) { - - global $_TANEV; - - if ($ADAT['fromDt']!='') $fromDt = $ADAT['fromDt']; else $fromDt = date('Y-m-d'); - if ($ADAT['direction']!='') $direction = $ADAT['direction']; - if ($ADAT['napszam']!='') $napszam = $ADAT['napszam']; - if ($napszam < 0 || !defined('__TANEV') || is_null(__TANEV) ||!is_array($_TANEV) || $_TANEV['kezdesDt']=='') { - return false; - } - if ($napszam == 0) { - // Az előző/következő napot követő/megelőző nap utáni 1 tanítási nap - if ($direction == 'vissza') { $muv = '+'; } - else { $muv = '-'; } - $v = array($napszam); - $from = "'$fromDt' $muv INTERVAL 1 DAY"; - } elseif ($fromDt != 'curdate()') { - $v = array($fromDt, ($napszam-1)); - $from="CAST('%s' AS DATE)"; - } else { - $v = array(($napszam-1)); - $from = $fromDt; - } - if ($direction == 'vissza') { $relacio='<'; $DESC = 'DESC'; } - else { $relacio = '>'; $DESC = 'ASC'; } - - $q = "SELECT DISTINCT( DATE(dt-INTERVAL (DAYOFWEEK(dt)-2) DAY) ) AS dt FROM nap - WHERE dt $relacio $from - AND tipus LIKE '%%tanítási nap' - ORDER BY dt $DESC - LIMIT %u,1"; - $nap = db_query($q, array('fv' => 'getTanitasiNap', 'modul' => 'naplo', 'result' => 'value', 'values' => $v), $olr); - - if ($nap == '') $nap = date('Y-m-d',strtotime($_TANEV['kezdesDt'])); // ez ugye lehet nem tanítási nap is! - - return $nap; - - } - - - // -------------------------------------------------- // - - function checkNaplo($dt = '') { - - global $_TANEV; - - $time = strtotime($dt); - - if ($time < strtotime($_TANEV['kezdesDt']) || $time > strtotime($_TANEV['zarasDt'])) return false; - if ($time === false // $dt == '0000-00-00' || $dt == '' || !isset($dt) - || __TANKOROK_OK !== true - || ( - !__NAPLOADMIN - && ($time < strtotime($_TANEV['kezdesDt']) || $time > strtotime($_TANEV['zarasDt'])) - ) - ) { - $_SESSION['alert'][] = 'message:wrong_data:checkNaplo:'.$dt.'('.(__TANKOROK_OK?1:2).')'; - return false; - } else { - - $napszam = date('w', strtotime($dt)); - if ($napszam == 0) $napszam = 7; - - // Muszáj újrakapcsolódnunk a lock miatt - nem adható át $olr... - $lr = db_connect('naplo', array('force' => true, 'fv' => 'checkNaplo')); - - // E helyett: Van-e olyan munkaterv, amiben van tanítási nap - sőt, lekérdezzük rögtön a hozzá tartozó órarendi hét-osztalyId párokat is! - $query = "SELECT distinct orarendiHet, osztalyId FROM nap LEFT JOIN munkatervOsztaly USING (munkatervId) WHERE dt=CAST('%s' AS DATE) - AND tipus='tanítási nap' AND osztalyId IS NOT NULL"; // ha egy munkatervhez nincs osztály rendelve, akkor se zavarjon be... - $v = array($dt); - // keyvalues = első mező a kulcs, azon belül a második mező indexelve jelenik meg - $RESULT = db_query($query, array('fv' => 'checkNaplo', 'modul' => 'naplo', 'result' => 'keyvalues', 'values' => $v), $lr); - if ($RESULT===false) { - db_close($lr); - return false; - } - if (is_array($RESULT) && count($RESULT) > 0) { - - $query = "SELECT oraId FROM ora WHERE dt=CAST('%s' AS DATE) LIMIT 1"; - $_oraId = db_query($query, array('fv' => 'checkNaplo/testIfCheck', 'modul' => 'naplo', 'result' => 'value', 'values' => $v), $lr); - if ($_oraId === false) { - db_close($lr); - return false; - } - - if ($_oraId === null) { - - // lock - $lock_q = 'LOCK TABLE ora write, orarendiOra read, orarendiOraTankor read, osztalyNaplo READ, '.__INTEZMENYDBNEV.'.osztaly READ,'.__INTEZMENYDBNEV.'.tankorOsztaly READ,'.__INTEZMENYDBNEV.'.tankorSzemeszter READ'; - db_query($lock_q, array('fv' => 'checkNaplo/lock ora', 'modul' => 'naplo'), $lr); - // recheck - $query = "SELECT oraId FROM ora WHERE dt=CAST('%s' AS DATE) LIMIT 1"; - $_oraId = db_query($query, array('fv' => 'checkNaplo/testIfCheck', 'modul' => 'naplo', 'result' => 'value', 'values' => $v), $lr); - if ($_oraId === false || $_oraId !== null) { - db_query('unlock tables', array('fv' => 'checkNaplo/lock ora', 'modul' => 'naplo'), $lr); - db_close($lr); - return false; - } - // -- - - // órarendi hetenként töltjük be... bár jelenleg egy nap csak egy órarendi hét lehet! - foreach ($RESULT as $orarendiHet => $osztalyIds) { - if (!is_array($osztalyIds) || count($osztalyIds)==0) continue; - // INSERT-be pedig csak azon tankorId-k, amik szerepelnek a tankorOsztaly táblában - $q = "SELECT DISTINCT tankorId FROM ".__INTEZMENYDBNEV.".tankorOsztaly WHERE osztalyId IN (".implode(',',$osztalyIds).")"; - $tankorIds = db_query($q, array('fv'=>'checkNaplo/tankorIds', 'modul'=>'naplo', 'result'=>'idonly')); - // Elvileg nem lehet tankor NULL - _TANKOROK_OK - // De sajnos minden lehet: - if (!is_array($tankorIds) || count($tankorIds)==0) continue; - $query = "INSERT INTO ora (dt,ora,ki,tankorId,teremId,tipus,eredet) - SELECT '%s',ora,orarendiOra.tanarId AS tanarId, orarendiOraTankor.tankorId AS tankorId, - teremId, 'normál','órarend' - FROM orarendiOra LEFT JOIN orarendiOraTankor USING (tanarId,osztalyJel,targyJel) - WHERE orarendiOraTankor.tankorId IS NOT NULL - AND tankorId IN (".implode(',', $tankorIds).") - AND het=%u - AND nap=%u - AND tolDt<='%s' AND igDt>='%s' "; // !!!! - $v = array($dt, $orarendiHet, $napszam, $dt, $dt); - $er = db_query($query, array('fv' => 'checkNaplo/finally', 'modul' => 'naplo', 'values' => $v), $lr); - } - - db_query('unlock tables', array('fv' => 'checkNaplo/unlock', 'modul' => 'naplo'), $lr); - if ($er === false) { - db_close($lr); - return false; - } - } - //} - } - db_close($lr); - return true; - } - } - - // -------------------------------------------------- // - - function checkNaploStatus($olr = '') { - - if ($olr == '') $lr = db_connect('naplo'); - else $lr = $olr; - - // A munkaterv meglétének ellenőrzése - $q = "SELECT COUNT(*) FROM nap"; - $count = db_query($q, array('fv' => 'checkNaploStatus/darab', 'modul' => 'naplo', 'result' => 'value'), $lr); - define('__MUNKATERV_OK', ($count != 0)); - - $q = "SELECT COUNT(*) FROM orarendiOra WHERE tolDt <= curdate() AND igDt >= curdate()"; - $count = db_query($q, array('fv' => 'checkNaploStatus/darab', 'modul' => 'naplo', 'result' => 'value'), $lr); - define('__ORAREND_OK', ($count != 0)); - - $q = "SELECT COUNT(DISTINCT orarendiOra.tanarId, orarendiOra.targyJel, orarendiOra.osztalyJel) - FROM orarendiOra LEFT JOIN orarendiOraTankor USING(tanarId, targyJel, osztalyJel) - WHERE tankorId IS NULL"; - $count = db_query($q, array('fv' => 'checkNaploStatus/darab', 'modul' => 'naplo', 'result' => 'value'),$lr); - if ($count != 0) { - define('__TANKOROK_OK', false); - define('__HIANYZO_TANKOROK_SZAMA', $count); - } else { - define('__TANKOROK_OK', true); - define('__HIANYZO_TANKOROK_SZAMA', 0); - } - - if ($olr == '') db_close($lr); - - } - - function checkDiakStatusz() { - - /* Konzisztencia ellenőrzés */ - - $lr = db_connect('naplo_intezmeny', array('fv' => 'checkDiakStatusz')); - db_start_trans($lr); - - // Ha státusz!='felvételt nyert' akkor kell lennie jogviszonyKezdete dátumnak - $q = "SELECT COUNT(*) AS db FROM diak WHERE statusz!='felvételt nyert' AND (jogviszonyKezdete IS NULL OR jogviszonyKezdete = '0000-00-00')"; - $db = db_query($q, array('fv' => 'checkDiakStatusz/pre#1', 'modul' => 'naplo_intezmeny', 'result' => 'value'), $lr); - if (__NAPLOADMIN && $db > 0) $_SESSION['alert'][] = 'message:wrong_data:jogviszonyKezdete hiányzik '.$db.' darab rekordban'; - - // Ha van olyan jogviszonyKezdete bejegyzés, melyhez nem tartozik diakJogviszony rekord, akkor azt pótoljuk - $q = "SELECT COUNT(*) AS db FROM diak LEFT JOIN diakJogviszony - ON diak.diakId = diakJogviszony.diakId AND diakJogviszony.statusz IN ('jogviszonyban van','vendégtanuló') AND diak.jogviszonyKezdete=diakJogviszony.dt - WHERE diakJogviszony.dt IS NULL AND jogviszonyKezdete IS NOT NULL AND jogviszonyKezdete != '0000-00-00'"; - $db = db_query($q, array('fv' => 'checkDiakStatusz/pre#1', 'modul' => 'naplo_intezmeny', 'result' => 'value'), $lr); - - $insDb = 0; - if ($db!==false && $db>0) { - $q = "INSERT INTO ".__INTEZMENYDBNEV.".diakJogviszony - SELECT diak.diakId as diakId, IF(diak.statusz='vendégtanuló','vendégtanuló','jogviszonyban van') AS statusz, jogviszonyKezdete AS dt FROM diak LEFT JOIN diakJogviszony - ON diak.diakId = diakJogviszony.diakId AND diakJogviszony.statusz IN ('jogviszonyban van','vendégtanuló') AND diak.jogviszonyKezdete=diakJogviszony.dt - WHERE diakJogviszony.dt IS NULL AND jogviszonyKezdete IS NOT NULL AND jogviszonyKezdete != '0000-00-00'"; - $insDb = db_query($q, array('fv' => 'checkDiakStatusz/#1', 'modul' => 'naplo_intezmeny', 'result' => 'affected rows'), $lr); - } - // A diakJogviszony tábla alapján állítjuk az aktuális státuszt - /* $q = "UPDATE ".__INTEZMENYDBNEV.".diak LEFT JOIN ".__INTEZMENYDBNEV.".diakJogviszony AS dj ON diak.diakId=dj.diakId - AND dj.dt=(SELECT MAX(dt) FROM ".__INTEZMENYDBNEV.".diakJogviszony WHERE dt<=CURDATE() AND diakId=dj.diakId) - SET diak.statusz = dj.statusz - WHERE diak.statusz<>'felvételt nyert' AND dj.statusz IS NOT NULL AND diak.statusz<>dj.statusz"; - */ - $q = "SELECT ".__INTEZMENYDBNEV.".diak.diakId,dj.statusz,dt - FROM ".__INTEZMENYDBNEV.".diak LEFT JOIN ".__INTEZMENYDBNEV.".diakJogviszony AS dj - ON ( - diak.diakId=dj.diakId - AND dj.dt=(SELECT MAX(dt) FROM ".__INTEZMENYDBNEV.".diakJogviszony WHERE dt<=CURDATE() AND diakId=dj.diakId) - ) WHERE diak.statusz<>'felvételt nyert' AND dj.statusz IS NOT NULL AND diak.statusz<>dj.statusz ORDER BY diakId,dt"; - $r = db_query($q, array('fv' => 'checkDiakStatusz/#2', 'modul' => 'naplo_intezmeny', 'result' => 'indexed'), $lr); - $updDb = 0; - for ($i=0; $i 'checkDiakStatusz/#2', 'modul' => 'naplo_intezmeny', 'values'=>$v, 'result' => 'affected rows'), $lr); - } - - db_commit($lr); - db_close($lr); - - return intval($insDb)+intval($updDb); - - } - -?> diff --git a/mayor-orig/www/include/modules/naplo/base/log.php b/mayor-orig/www/include/modules/naplo/base/log.php deleted file mode 100644 index e244c9a3..00000000 --- a/mayor-orig/www/include/modules/naplo/base/log.php +++ /dev/null @@ -1,40 +0,0 @@ - null, 'szoveg' => '', 'tabla' => '', 'values' => array()), $olr = null) - Logbejegyzést készít, belerakja a datetime-ot, az action-t és a _USERACCOUNT-ot, ... - checkReloadAction($actionId, $action = '', $tabla = '', $olr = '') -*/ - - function logAction($SET = array('actionId' => null, 'szoveg' => '', 'tabla' => '', 'values' => array()), $olr = null) { - - global $action; - - $ip = $_SERVER['REMOTE_ADDR']; - $v = mayor_array_join(array($ip, $SET['tabla'], $action), $SET['values'], array($SET['actionId'])); - $q = "INSERT INTO ".__TANEVDBNEV.".logBejegyzes (userAccount, dt, ip, tabla, action, szoveg, actionId) VALUES - ('"._USERACCOUNT."', now(), '%s', '%s', '%s', '".$SET['szoveg']."','%s')"; - return db_query($q, array('fv' => 'logAction', 'modul' => 'naplo', 'values' => $v), $olr); - - } - - function checkReloadAction($actionId, $action = '', $tabla = '', $olr = null) { - - - $q = "SELECT logId FROM ".__TANEVDBNEV.".logBejegyzes WHERE actionId = '%s'"; - $v = array($actionId); - if ($action != '') { $q .= " AND action='%s'"; $v[] = $action; } - if ($tabla != '') { $q .= " AND tabla='%s'"; $v[] = $tabla; } - - $r = db_query($q, array('fv' => 'checkReloadAction', 'modul' => 'naplo', 'result' => 'value', 'values' => $v), $olr); - - if ($r===false) { - $_SESSION['alert'][] = 'message:sql_query_failure:checkReloadAction:'.$q.':'.$error; - return false; - } - return ($r === null); - - } -?> diff --git a/mayor-orig/www/include/modules/naplo/base/rights.php b/mayor-orig/www/include/modules/naplo/base/rights.php deleted file mode 100644 index fd538da0..00000000 --- a/mayor-orig/www/include/modules/naplo/base/rights.php +++ /dev/null @@ -1,469 +0,0 @@ - 'getTanevAdat', 'modul' => 'naplo_intezmeny', 'result' => 'assoc', 'keyfield' => 'szemeszter', 'values' => array($tanev) - ), $olr); - - if (!is_array($ret['szemeszter'])) return false; - - // A legkorábbi kezdés és legkésőbbi zárás keresése... - $kezdesDt = '2030-01-01'; $zarasDt = '1980-01-01'; - $kezdes = strtotime($kezdesDt); $zaras = strtotime($zarasDt); - foreach ($ret['szemeszter'] as $szemeszter => $A) { - - if ($kezdes > strtotime($A['kezdesDt'])) { - $kezdesDt = $A['kezdesDt']; - $kezdes = strtotime($kezdesDt); - } - if ($zaras < strtotime($A['zarasDt'])) { - $zarasDt = $A['zarasDt']; - $zaras = strtotime($zarasDt); - } - $ret['statusz'] = $A['statusz']; - } - $ret['kezdesDt'] = $kezdesDt; $ret['zarasDt'] = $zarasDt; $ret['tanev'] = $tanev; - $q = "SELECT MAX(zarasDt) FROM szemeszter WHERE zarasDt<'%s'"; - $ret['elozoZarasDt'] = db_query($q, array('fv'=>'getTanevAdat/elozo','modul'=>'naplo_intezmeny','result'=>'value','values'=>array($ret['kezdesDt']))); - $q = "SELECT MIN(kezdesDt) FROM szemeszter WHERE kezdesDt>'%s'"; - $ret['kovetkezoKezdesDt'] = db_query($q, array('fv'=>'getTanevAdat/kovetkezo','modul'=>'naplo_intezmeny','result'=>'value','values'=>array($ret['zarasDt']))); - - return $ret; - - } - - function initIntezmeny($DATA) { - - global $MYSQL_DATA; - - $intezmeny = $DATA['intezmeny']; - $MYSQL_DATA['naplo_intezmeny'] = $MYSQL_DATA['naplo_base']; - $MYSQL_DATA['naplo_intezmeny']['db']= intezmenyDbNev($intezmeny); - - define('__INTEZMENY', $intezmeny); - define('__INTEZMENYDBNEV', intezmenyDbNev(__INTEZMENY)); - - if (isset($DATA['telephelyId'])) { - define('__TELEPHELYID',$DATA['telephelyId']); - } - - $num = checkDiakStatusz(); - if ($num != 0) $_SESSION['alert'][] = 'info:success:checkDiakStatusz:helyreállított rekordok száma='.$num; - - $q = "SELECT OMKod FROM intezmeny WHERE rovidNev='%s'"; - define('__OMKOD',db_query($q, array('fv' => 'initIntezmeny', 'modul' => 'naplo_base', 'result' => 'value','values'=>array($intezmeny)))); - - } - - function initTanev($intezmeny, $tanev) { - - global $MYSQL_DATA, $_TANEV; - - $MYSQL_DATA['naplo'] = $MYSQL_DATA['naplo_base']; - $MYSQL_DATA['naplo']['db']= tanevDbNev($intezmeny, $tanev); - - define('__TANEV', $tanev); - define('__TANEVDBNEV', tanevDbNev(__INTEZMENY, __TANEV)); - $_TANEV = getTanevAdat(); - // A kezdes- és zarasDt a szemeszter táblában DATE típusú, így az összehasonlítás korrekt - $date = date('Y-m-d'); - define('__FOLYO_TANEV',( - $_TANEV['kezdesDt'] <= $date - && $date <= $_TANEV['zarasDt'] - )); - - if (file_exists($file = _CONFIGDIR."/module-naplo/config-$intezmeny.php")) require_once($file); - initDefaults(); - - if ($_TANEV['statusz'] == 'aktív') { - checkNaploStatus(); - if (__FOLYO_TANEV === true) - if (__MUNKATERV_OK && __ORAREND_OK && __TANKOROK_OK) checkNaplo(date('Y-m-d')); - else { - if (MAYOR_SOCIAL!==true) $_SESSION['alert'][]= 'info:checkNaploFailed:Tanév:'.($_TANEV['tanev']).':Részletek '.((__MUNKATERV_OK)?'munkaterv ok':'#chknaplo1 nincs munkaterv!').':'.((__ORAREND_OK)?'órarend ok':'#chknaplo2 nincs órarend!').':'.((__TANKOROK_OK)?'órarend-tankörök ok':'#chknaplo3 órarendi óra tankör összerendezési hiány!'); - } - } - } - - function initDefaults() { - - if (!defined('_ZARAS_HATARIDO')) define('_ZARAS_HATARIDO',date('Y-m-01 00:00:00',strtotime('10 days ago'))); - // Helyttesített óra beírása (szaktanár): következő nap 8:00 - if (!defined('_HELYETTESITES_HATARIDO')) define('_HELYETTESITES_HATARIDO',date('Y-m-d',strtotime('8 hours ago'))); // Csak dárum lehet, mert az órák időpontját nem tudjuk - // Jegyek beírása, módosítása, törlése (szaktanár): zárásig (zárt időintervallum!) - if (!defined('_OSZTALYOZO_HATARIDO')) define('_OSZTALYOZO_HATARIDO',_ZARAS_HATARIDO); - - // Saját óra beírása (szaktanár) - // A mai nap+8 óra előtti tanatási nap utáni napot megelőző hétfő - // Azaz egy óra a következő hétfői tanítási nap 16:00-ig írható be. - if (!defined('_HALADASI_HATARIDO')) - define('_HALADASI_HATARIDO', - date('Y-m-d H:i:s', - strtotime('last Monday', - strtotime('next day', - strtotime( - getTanitasiNapVissza(1,date('Y-m-d H:i:s',strtotime('+8hours'))) - ) - ) - ) - ) - ); - - // A nevek rendezése a helyettesítés kiíráskor: súly szerint (súly) vagy névsorban (ABC) - if (!defined('__HELYETTESITES_RENDEZES')) define('__HELYETTESITES_RENDEZES','súly'); - // Fogadóórán egy vizit tervezett hossza - if (!defined('_VIZITHOSSZ')) define('_VIZITHOSSZ',10); - // Jegyek default súlyozása - if (!defined('__DEFAULT_SULYOZAS')) define('__DEFAULT_SULYOZAS','1:1:1:1:1'); - // Jegymódosításkor a jegy típus modosítható-e (pl: féljegy --> százalékos) - if (!defined('__JEGYTIPUS_VALTHATO')) define('__JEGYTIPUS_VALTHATO',false); - - // TANEV - // Szülői igazolások száma: félévenként legfeljebb 5 nap - define('__SZULOI_IGAZOLAS_FELEVRE',5); - define('__SZULOI_IGAZOLAS_EVRE',0); - // Szülő által igazolható órák maximális száma: félévenként legfeljebb 14 óra - define('__SZULOI_ORA_IGAZOLAS_FELEVRE',14); - define('__SZULOI_ORA_IGAZOLAS_EVRE',0); - // Osztályfőnöki igazolások száma: évi 3 nap - // Csak ha < 5 igazolatlanja van - define('__OSZTALYFONOKI_IGAZOLAS_FELEVRE',0); - define('__OSZTALYFONOKI_IGAZOLAS_EVRE',5); - define('__OSZTALYFONOKI_ORA_IGAZOLAS_FELEVRE',0); - define('__OSZTALYFONOKI_ORA_IGAZOLAS_EVRE',21); - - // Összeadjuk-e a késések perceit, hogy átváltsuk - if (!defined('_KESESI_IDOK_OSSZEADODNAK')) define('_KESESI_IDOK_OSSZEADODNAK', false); - // Hány késés felel meg egy igazolatlan órának - ha 0 vagy _KESESI_IDOK_OSSZEADODNAK, akkor nem váltjuk át - if (!defined('_HANY_KESES_IGAZOLATLAN')) define('_HANY_KESES_IGAZOLATLAN', 3); - // Hány felszerelés hiány felel meg egy igazolatlan órának - ha 0 vagy _KESESI_IDOK_OSSZEADODNAK, akkor nem váltjuk - if (!defined('_HANY_FSZ_IGAZOLATLAN')) define('_HANY_FSZ_IGAZOLATLAN', 3); - // Hány egyenruha hiány felel meg egy igazolatlan órának - ha 0, akkor nem váltjuk - if (!defined('_HANY_EH_IGAZOLATLAN')) define('_HANY_EH_IGAZOLATLAN', 0); - - // Hiányzás, késés, felszerelés hiány, egyenruha hiány beírása (szaktanár): következő nap 16:00 - if (!defined('_HIANYZAS_HATARIDO')) define('_HIANYZAS_HATARIDO',date('Y-m-d 00:00:00',strtotime('16 hours ago'))); - // Hiányzás, késés beírása osztályfőnöknek: 5 tanítási nap - if (!defined('_OFO_HIANYZAS_BEIRAS')) define('_OFO_HIANYZAS_BEIRAS',5); - if (!defined('_OFO_HIANYZAS_HATARIDO')) define('_OFO_HIANYZAS_HATARIDO',getTanitasiNapVissza(_OFO_HIANYZAS_BEIRAS,'curdate()')); - // Igazolás beírásának határideje: 5 tanítási nap - if (!defined('_IGAZOLAS_BEIRAS')) define('_IGAZOLAS_BEIRAS',6); - if (!defined('_IGAZOLAS_BEIRAS_HATARIDO')) define('_IGAZOLAS_BEIRAS_HATARIDO',getTanitasiNapVissza(_IGAZOLAS_BEIRAS,'curdate()')); - // Igazolás leadás határideje - ha nincs közben osztályfőnöki óra: 8 tanítási nap - if (!defined('_IGAZOLAS_LEADAS')) define('_IGAZOLAS_LEADAS',8); - if (!defined('_LEGKORABBI_IGAZOLHATO_HIANYZAS')) define('_LEGKORABBI_IGAZOLHATO_HIANYZAS',getTanitasiNapVissza(_IGAZOLAS_BEIRAS+_IGAZOLAS_LEADAS,'curdate()')); - - } - - //--- - - function getIdByOid($oId, $td = 'diak') { - - - if (intval($oId) == 0) { - $_SESSION['alert'][] = 'page:insufficient_access:Hiányzó oktatási azonosító!:'.$td; - return false; - } - $td = readVariable($td, 'enum', 'diak', array('tanar', 'diak')); - - $q = "SELECT ${td}Id FROM $td WHERE oId = '%s'"; - $id = db_query($q, array('fv' => 'getIdByOid', 'modul' => 'naplo_intezmeny', 'result' => 'value', 'values' => array($oId))); - - if (!$id) { - $_SESSION['alert'][] = 'message:id_not_found:(oid:'.$oId.')'; - return false; - } - - return $id; - - } - - function getSzuloIdByUserAccount($szuloCheck=true) { - $q = "SELECT szuloId FROM ".__INTEZMENYDBNEV.".szulo WHERE userAccount='"._USERACCOUNT."'"; - $szuloId = db_query($q, array('fv' => 'getSzuloIdByUserAccount', 'modul' => 'naplo_intezmeny', 'result' => 'value')); - if ($szuloCheck===true && __CHECK_SZULO_TORVENYES === true) { - $q = "SELECT count(*) FROM `".__INTEZMENYDBNEV."`.`diak` WHERE diakId='".__PARENTDIAKID."' AND - ( - (anyaId=%u AND FIND_IN_SET('anya',torvenyesKepviselo)=1) OR - (apaId=%u AND FIND_IN_SET('apa',torvenyesKepviselo)=2) OR - (gondviseloId=%u)OR - (neveloId=%u) ) - "; - $torvenyesE = db_query($q, array('fv' => 'getSzuloIdByUserAccount', 'modul' => 'naplo_intezmeny', 'result' => 'value', 'values'=>array($szuloId,$szuloId,$szuloId,$szuloId))); - if ($torvenyesE==0) { - $_SESSION['alert'][] = 'page:nem_torvenyes_kepviselo'; - } - } - return $szuloId; - } - - - function isTanar($tanarId) { - $q = "SELECT COUNT(*) AS db FROM ".__INTEZMENYDBNEV.".tanar - WHERE tanarId=%u AND beDt<=CURDATE() AND (kiDt IS NULL OR kiDt>=CURDATE())"; - $v = db_query($q, array('fv' => 'isTanar', 'modul' => 'naplo_intezmeny', 'result' => 'value', 'values' => array($tanarId))); - return ($v==1); - } - - // Én hajlanék arra is, hogy az egész $Param tömböt kivegyük... - function getOsztalyIdsByTanarId($tanarId, $Param = array('tanev' => __TANEV, 'tolDt' => '', 'igDt' => '', 'csakId'=>true)) { - - global $_TANEV; - - if (is_null($Param['tanev']) || $Param['tanev']=='') $Param['tanev']=__TANEV; - if ($Param['tanev'] != __TANEV && $Param['tanev']!='') $TA = getTanevAdat($Param['tanev']); - else $TA = $_TANEV; - - if (isset($Param['tolDt']) && $Param['tolDt']!='') $tolDt = $Param['tolDt']; else unset($tolDt); - if (isset($Param['igDt']) && $Param['igDt']!='') $igDt = $Param['igDt']; else unset($igDt); - initTolIgDt($Param['tanev'], $tolDt, $igDt); - - $q = "SELECT DISTINCT osztalyId FROM ".__INTEZMENYDBNEV.".osztalyTanar WHERE tanarId=%u AND beDt <= '%s' - AND (kiDt IS NULL OR kiDt >= '%s')"; - $v = array($tanarId, $igDt, $tolDt); - return db_query($q, array('fv' => 'getOsztalyIdsByTanarId', 'modul' => 'naplo_intezmeny', 'result' => 'idonly', 'values' => $v)); - - } - - - function naploBeallitasok() { - - global $_RPC; - - $lr = db_connect('naplo_base', array('fv' => 'naploBeallitasok')); - if ($lr == false) return false; - - // session lekérdezése - $q = "SELECT intezmeny, telephelyId, tanev, parentDiakId FROM session WHERE sessionID='"._SESSIONID."' AND policy='"._POLICY."'"; - $RESULT = db_query($q, array('fv' => 'naploBeallitasok', 'modul' => 'naplo_base', 'result' => 'record'), $lr); - - if ($vanSession = (is_array($RESULT) && (count($RESULT) > 0))) { // Létező session - egyszerű eset - - if ($RESULT['intezmeny'] != '') - initIntezmeny($RESULT); - if (defined('__INTEZMENY') && $RESULT['tanev'] != '') - initTanev($RESULT['intezmeny'], $RESULT['tanev']); - if (_POLICY == 'parent' && $RESULT['parentDiakId'] != '') - define('__PARENTDIAKID', $RESULT['parentDiakId']); - - } - // Az (alapértelmezett) intézmény lekérdezése - ha még nincs meg - if (!defined('__INTEZMENY')) { - - if (_RPC) { - /* Ha az RPC hívás tartalmazza az OMKod-ot */ - $OMKod = readVariable($_RPC['request']['OMKod'],'numeric unsigned'); - $q = "SELECT rovidNev AS intezmeny FROM intezmeny WHERE OMKod=%u"; - $RESULT = db_query($q, array('fv' => 'naploBeallitasok/settings', 'modul' => 'naplo_base', 'values'=> array($OMKod),'result' => 'record')); - if ($RESULT['intezmeny'] == '' && $page=='naplo') { // ismeretlen OMKod esetén elutasítjuk a további feldolgozást - $DATA = array('alert'=>'page:wrong_data:OMKod','OMKod'=>$OMKod,'result'=>'failure'); - global $RPC; - $RPC->setResponse($DATA); $RPC->sendResponse(); die(); - } - } else { - /* egyedi intezmeny és telephely lekérdezése a settings-ből */ - $q = "SELECT intezmeny, telephelyId FROM settings WHERE userAccount='%s' AND policy='%s'"; - $RESULT = db_query($q, array('fv' => 'naploBeallitasok/settings', 'modul' => 'naplo_base', 'values'=> array(_USERACCOUNT,_POLICY),'result' => 'record')); - - /* ellenőrizzük, hogy érvényes-e */ - if ($RESULT['intezmeny'] != '') { - $q = "SELECT rovidnev FROM intezmeny WHERE rovidnev='%s'"; - $RESULT['intezmeny'] = db_query($q, array('fv' => 'naploBeallitasok/settings intézmény', 'modul' => 'naplo_base', 'result' => 'value', 'values'=>array($RESULT['intezmeny'])), $lr); - - /* telephely ellenőrzése */ - if ($RESULT['intezmeny'] != '' && $RESULT['telephelyId'] != '') { - $q = "SELECT telephelyId FROM `%s`.`telephely` WHERE `telephelyId`='%s'"; - $RESULT['telephelyId'] = db_query($q, array( - 'fv' => 'naploBeallitasok/settings telephely', 'modul' => 'naplo_base', 'result' => 'value', - 'values' => array(intezmenyDbNev($RESULT['intezmeny']), $RESULT['telephelyId']) - ), $lr); - } else { unset($RESULT['telephelyId']); /* Ha az intézmény hibás, akkor a telephely sem lehet jó... */ } - } - } - - /* ha nem érvényes vagy nincs elmentve */ - if ($RESULT['intezmeny']=='') { - $q = "SELECT rovidnev FROM intezmeny ORDER BY alapertelmezett DESC LIMIT 1"; - $RESULT['intezmeny'] = db_query($q, array('fv' => 'naploBeallitasok/default intézmény', 'modul' => 'naplo_base', 'result' => 'value'), $lr); - } - - /* Ha a settings-ben nem kapott a telephelyId értéket, akkor lássuk, van-e alapértelmezett! */ - if ($RESULT['telephelyId'] == '') { - // Csak ha van alapértelmezett telephely, akkor kérdezzük le! - $q = "SELECT telephelyId FROM `%s`.`telephely` WHERE alapertelmezett=1 LIMIT 1"; - $RESULT['telephelyId'] = db_query($q, array( - 'fv' => 'naploBeallitasok/default telephely', 'modul' => 'naplo_base', 'result' => 'value', - 'values' => array(intezmenyDbNev($RESULT['intezmeny'])) - ), $lr); - } - - /* */ - - if ($RESULT['intezmeny']) initIntezmeny($RESULT); - } - - if (defined('__INTEZMENY') && !defined('__TANEV')) { - - $lr2 = db_connect('naplo_intezmeny', array('fv' => 'naploBeallitasok')); - if ($lr2 === false) return false; - - if (_RPC) { - // Ha az RPC hívás tartalmazza a tanévet - $tanev = readVariable($_RPC['request']['tanev'], 'numeric unsigned'); - // ellenőrzés - $q = "SELECT tanev FROM szemeszter WHERE tanev=%u ORDER BY szemeszter LIMIT 1"; - $v = array($tanev); - $ret = db_query($q, array('fv' => 'naploBeallitasok/default tanév', 'modul' => 'naplo_intezmeny', 'result' => 'record','values'=>$v)); - } - if (!is_array($ret) || count($ret) == 0) { - // A mai dátumhoz leközelebb eső kezdesDt, vagy zarasDt határozza meg, hogy melyik az aktív szemeszter - $q = "SELECT tanev, szemeszter, - IF(ABS(DATEDIFF(zarasDt,CURDATE())) 'naploBeallitasok/default tanév', 'modul' => 'naplo_intezmeny', 'result' => 'record')); - } - if (is_array($ret) && count($ret) > 0) { - $RESULT['tanev'] = $ret['tanev']; $RESULT['szemeszter'] = $ret['szemeszter']; - initTanev(__INTEZMENY, $RESULT['tanev']); - } - - } - - // session létrehozása - ha kell - $intezmeny = ''; $tanev = $telephelyId = 'NULL'; - if (defined('__INTEZMENY')) { - $intezmeny = __INTEZMENY; - if (defined('__TELEPHELYID')) $telephelyId = __TELEPHELYID; - if (!defined('__TANEV')) $_SESSION['alert'][] = 'message:nincs_tanev'; - } else { - $_SESSION['alert'][] = 'message:nincs_intezmeny'; - } - if (defined('__TANEV') && __TANEV!='') $tanev = __TANEV; - - if (defined('_SESSIONID') && _SESSIONID!='' && !$vanSession) { - $q = "REPLACE INTO session (sessionID, policy, intezmeny, telephelyId, tanev) VALUES - ('"._SESSIONID."','"._POLICY."' , '".$intezmeny."',".$telephelyId.", ".$tanev.")"; - db_query($q, array('fv' => 'naploBeallitasok/session', 'modul' => 'naplo_base'), $lr); - } - - db_close($lr); - return defined('__TANEV') && defined('__INTEZMENY'); - - } // function - - function nagykoruE($diakId) { - if (is_numeric($diakId)) { - $q = "select IF(diak.szuletesiIdo + interval 18 year < CURDATE(),1,0) FROM `diak` WHERE diakId=%u"; - return db_query($q, array('fv' => 'nagykoruE', 'modul' => 'naplo_intezmeny', 'result' => 'value', 'values' => array($diakId))); - } else { - return false; - } - } - - - -/* ====================================================================================================================================== */ - - - -// Kategóriák - if (_POLICY=='private' && memberOf(_USERACCOUNT, 'naploadmin') || _RUNLEVEL==='cron') { - $AUTH['my']['categories'][] = 'naploadmin'; - define('__NAPLOADMIN',true); - } else { - define('__NAPLOADMIN',false); - } - if (_POLICY=='private' && memberOf(_USERACCOUNT, 'vezetoseg')) { - $AUTH['my']['categories'][] = 'vezetoseg'; - define('__VEZETOSEG',true); - } else { - define('__VEZETOSEG',false); - } - - if (_POLICY=='parent') - define('__DIAK',true); - else - define('__DIAK',in_array('diák',$AUTH['my']['categories'])); - - define('__TITKARSAG',in_array('titkárság',$AUTH['my']['categories'])); - - // a TANAR tagság lejjebb dől el!!! - $TANARE = in_array('tanár',$AUTH['my']['categories']); - - - -if (__NAPLO_INSTALLED === true) { - - if (__UZENO_INSTALLED === true && _POLICY=='private') { - if (memberOf(_USERACCOUNT,'uzenoadmin')===true) define('__UZENOADMIN',true); - else define('__UZENOADMIN',false); - } else define('__UZENOADMIN',false); - - if (!naploBeallitasok()) { // Ha nincs intézmény, vagy tanév - if (__NAPLOADMIN === true) { - // naploadmin vegyen fel intézményt, tanévet - if (!defined('__INTEZMENY') and "$page:$sub:$f" != 'naplo:admin:intezmenyek') { - $href = 'index.php?page=naplo&sub=admin&f=intezmenyek'; - header('Location: '.location($href)); - } elseif ( - defined('__INTEZMENY') and !defined('__TANEV') - and "$page:$sub" != 'naplo:admin' - and "$page:$sub" != 'naplo:intezmeny' - ) { - $href = 'index.php?page=naplo&sub=admin&f=tanevek'; - header('Location: '.location($href)); - } - } elseif (!defined('__INTEZMENY') or (!defined('__TANEV') and "$page:$sub" != 'naplo:intezmeny')) { - // ures oldal, ez túl szigorú! - //$sub = ''; - //$f = 'error'; - } - } - - if (defined('__INTEZMENY')) { - if (__DIAK) { - if (_POLICY=='private') { - define('__USERDIAKID',getIdByOid(_STUDYID,'diak')); - } elseif (defined('__PARENTDIAKID')) { - define('__USERDIAKID',__PARENTDIAKID); - define('__USERSZULOID', getSzuloIdByUserAccount(("$page/$sub/$f" != 'naplo//diakValaszto'))); - } elseif ("$page/$sub/$f" != 'naplo//diakValaszto') { - header('Location: '.location('index.php?page=naplo&f=diakValaszto')); - } else { - define('__USERDIAKID',false); - } - } - // A diák milyen jogokkal és kötelezettségekkel rendelkezik - define('__NAGYKORU',(__DIAK===true && nagykoruE(__USERDIAKID))); - if ($TANARE && ($TANARE=isTanar(getIdByOid(_STUDYID,'tanar')))) { // itt már ellenőrizhetjük, hogy a keretrendszer szerint tanár, a napló szerint is tanár-e még a megfelelő intézmény időszakában - define('__USERTANARID',getIdByOid(_STUDYID,'tanar')); - if (__USERTANARID !== false) { - $_OSZTALYA = getOsztalyIdsByTanarId(__USERTANARID, array('tanev'=>__TANEV,'csakId'=>true)); - define('__OSZTALYFONOK',(is_array($_OSZTALYA) && count($_OSZTALYA) > 0)); - } - } - } - -} elseif (__NAPLOADMIN===true || memberOf(_USERACCOUNT,'useradmin')===true) { - $sub = 'admin'; - $f = 'install'; -} elseif ($page == 'naplo') { - global $sub,$f; - $sub = ''; - $f = 'error'; - $_SESSION['alert'][] = 'page:page_missing'; -} else { - // másik modult nézünk, csak becsatoljuk a base alatt lévő dolgokat..... - // jó ez vajon??? dump($page,$sub,$f); -} - - define('__TANAR',$TANARE); - -?> diff --git a/mayor-orig/www/include/modules/naplo/base/tool.php b/mayor-orig/www/include/modules/naplo/base/tool.php deleted file mode 100644 index 8fb6e9e9..00000000 --- a/mayor-orig/www/include/modules/naplo/base/tool.php +++ /dev/null @@ -1,590 +0,0 @@ - array('type'=>'id'), - 'tanarId'=> array('type'=>'id'), - 'szuloId'=> array('type'=>'id'), - 'teremId'=> array('type'=>'id'), - 'osztalyId'=> array('type'=>'id'), - 'targyId'=> array('type'=>'id'), - 'mkId'=> array('type'=>'id'), - 'tankorId'=> array('type'=>'id'), - 'telephelyId' => array('type'=>'id'), - - 'tolDt' => array('type'=>'datetime'), - 'igDt' => array('type'=>'datetime'), - 'refDt' => array('type'=>'datetime'), - 'dt' => array('type'=>'datetime'), - - 'tanev' => array('type'=>'numeric unsigned'), - 'het' => array('type'=>'numeric unsigned'), - - 'fileName' => array('type'=>'strictstring'), - 'conv' => array('type'=>'strictstring'), - 'sorrendNev' => array('type'=>'enum','allowOnly' => array('napló','anyakönyv','ellenőrző','bizonyítvány','egyedi')), - 'targySorrend' => array('type'=>'strictstring'), - 'vizsgaTipus' => array('type'=>'enum','allowOnly' => array('osztályozó vizsga','javítóvizsga','különbözetivizsga','beszámoltatóvizsga')), - - - // ellenőrizendő még: - 'ho' => array('type'=>'strictstring'), - 'ora' => array('type'=>'strictstring'), - 'tipus' => array('type'=>'strictstring'), -// 'telephely' => array('type'=>'strictstring'), - // ... - ); - - - foreach ( $TOOL as $tool => $params ) if (is_array($params)) { - - for ($i = 0; $i < count($params['post']); $i++) { - $_var = $params['post'][$i]; - //if ($TOOLVARS[$_var]=='') $_SESSION['alert'][] = '::toolvars:'.$_var; // nem üzenünk hibát - if ( $_POST[$_var]!='' && ($TOOLVARS[$_var]['type']!='') ) { // ellenőrizzük a fenti tömb szerinti változókat. - // itt típuskonverzió is történik - $_POST[$_var] = readVariable($_POST[$_var],$TOOLVARS[$_var]['type'],null,$TOOLVARS[$_var]['allowOnly']); - } - } - - if ( function_exists( $func = "get$tool" ) ) { - $func(); - } - - } - -} - - -/* AUDIT */ - -/* -getAuditInfo(); -function getAuditInfo() { - -global $page,$sub,$f; - -$_SESSION['alert'][] = '::'.$page.$sub.$f; - -$WORK = $_POST; - -for ($i -reset($WORK); -ksort($WORK); -$X = unserialize(serialize($WORK)); - -var_dump($X); - -} - */ - - -/* ------------------------- */ - - -function getSzamSelect() { - - global $TOOL; - - if (!is_array($TOOL['szamSelect']['szamok'])) { - $minValue = (isset($TOOL['szamSelect']['minValue']))?$TOOL['szamSelect']['minValue']:1; - $maxValue = (isset($TOOL['szamSelect']['maxValue']))?$TOOL['szamSelect']['maxValue']:100; - $TOOL['szamSelect']['szamok'] = range($minValue, $maxValue); - } - - if ( !isset($TOOL['szamSelect']['paramName']) || $TOOL['szamSelect']['paramName']=='' ) - $TOOL['szamSelect']['paramName'] = 'szam'; - -} - -function getIntezmenySelect() { - - global $TOOL; - - if (!is_array($TOOL['intezmenySelect']['intezmenyek'])) { - require_once('include/modules/naplo/share/intezmenyek.php'); - $TOOL['intezmenySelect']['intezmenyek'] = getIntezmenyek(); - } - if ( !isset($TOOL['intezmenySelect']['paramName']) || $TOOL['intezmenySelect']['paramName'] == '' ) - $TOOL['intezmenySelect']['paramName'] = 'intezmeny'; - -} - -function getTelephelySelect() { - - global $TOOL; - - if (!is_array($TOOL['telephelySelect']['telephelyek'])) { - require_once('include/modules/naplo/share/intezmenyek.php'); - $TOOL['telephelySelect']['telephelyek'] = getTelephelyek(); - } - if ( !isset($TOOL['telephelySelect']['paramName']) || $TOOL['telephelySelect']['paramName'] == '' ) - $TOOL['telephelySelect']['paramName'] = 'telephelyId'; - if (count($TOOL['telephelySelect']['telephelyek']) < 2) unset($TOOL['telephelySelect']); - -} - -function getTanevSelect() { - - global $TOOL; - - require_once('include/modules/naplo/share/intezmenyek.php'); - if (!is_array($TOOL['tanevSelect']['tanevek'])) $TOOL['tanevSelect']['tanevek'] = getTanevek($TOOL['tanevSelect']['tervezett']); - - if ( !isset($TOOL['tanevSelect']['paramName']) || $TOOL['tanevSelect']['paramName']=='' ) - $TOOL['tanevSelect']['paramName'] = 'tanev'; - -} - -function getSzemeszterSelect() { - - global $TOOL; - - require_once('include/modules/naplo/share/szemeszter.php'); - $TOOL['szemeszterSelect']['szemeszterek'] = getSzemeszterek($TOOL['szemeszterSelect']); - - if ( !isset($TOOL['szemeszterSelect']['paramName']) || $TOOL['szemeszterSelect']['paramName'] == '' ) - $TOOL['szemeszterSelect']['paramName'] = 'szemeszterId'; - -} - -function getTargySorrendSelect() { - - global $TOOL; - - require_once('include/modules/naplo/share/targy.php'); - if (!isset($TOOL['targySorrendSelect']['tanev'])) $TOOL['targySorrendSelect']['tanev'] = __TANEV; - $TOOL['targySorrendSelect']['sorrendNevek'] = getTargySorrendNevek($TOOL['targySorrendSelect']['tanev']); - - if ( !isset($TOOL['targySorrendSelect']['paramName']) || $TOOL['targySorrendSelect']['paramName'] == '' ) - $TOOL['targySorrendSelect']['paramName'] = 'sorrendNev'; - -} - -function getMunkakozossegSelect() { - - global $TOOL; - - if (!is_array($TOOL['munkakozossegSelect']['munkakozossegek'])) - $TOOL['munkakozossegSelect']['munkakozossegek'] = getMunkakozossegek(); - if ( !isset($TOOL['munkakozossegSelect']['paramName']) || $TOOL['munkakozossegSelect']['paramName']=='' ) - $TOOL['munkakozossegSelect']['paramName'] = 'mkId'; - -} - -function getTargySelect() { - - global $TOOL; - - if (!is_array($TOOL['targySelect']['targyak'])) - $TOOL['targySelect']['targyak'] = getTargyak(array('mkId' => $TOOL['targySelect']['mkId'])); - if ( !isset($TOOL['targySelect']['paramName']) || $TOOL['targySelect']['paramName']=='' ) - $TOOL['targySelect']['paramName'] = 'targyId'; - -} - -function getMunkatervSelect() { - - global $TOOL; - - if (!is_array($TOOL['munkatervSelect']['munkatervek'])) - $TOOL['munkatervSelect']['munkatervek'] = getMunkatervek(); - if ( !isset($TOOL['munkatervSelect']['paramName']) || $TOOL['munkatervSelect']['paramName']=='' ) - $TOOL['munkatervSelect']['paramName'] = 'munkatervId'; - -} - -function getTanarSelect() { - - global $TOOL; - - if (!is_array($TOOL['tanarSelect']['tanarok'])) { - if (!isset($TOOL['tanarSelect']['tanev']) && defined('__TANEV')) $TOOL['tanarSelect']['tanev'] = __TANEV; - if (is_array($TOOL['tanarSelect']['Param'])) $Param = $TOOL['tanarSelect']['Param']; - else $Param = array( - 'mkId' => $TOOL['tanarSelect']['mkId'], - 'tanev' => $TOOL['tanarSelect']['tanev'], - 'beDt' => $TOOL['tanarSelect']['beDt'], - 'kiDt' => $TOOL['tanarSelect']['kiDt'], - 'összes' => $TOOL['tanarSelect']['összes'], - 'override' => $TOOL['tanarSelect']['override'], - ); - $TOOL['tanarSelect']['tanarok'] = getTanarok($Param); - } - if (!isset($TOOL['tanarSelect']['paramName']) || $TOOL['tanarSelect']['paramName']=='' ) - $TOOL['tanarSelect']['paramName'] = 'tanarId'; - -} - -function getDiakSelect() { - - global $TOOL, $osztalyId; - - if (!isset($TOOL['diakSelect']['osztalyId']) && isset($osztalyId)) - $TOOL['diakSelect']['osztalyId'] = $osztalyId; - if (!is_array($TOOL['diakSelect']['diakok'])) - $TOOL['diakSelect']['diakok'] = getDiakok(array( - 'osztalyId' => $TOOL['diakSelect']['osztalyId'], - 'tanev' => $TOOL['diakSelect']['tanev'], - 'statusz' => $TOOL['diakSelect']['statusz'], - 'tolDt' => $TOOL['diakSelect']['tolDt'], - 'igDt' => $TOOL['diakSelect']['igDt'], - )); - if (!is_array($TOOL['diakSelect']['statusz'])) - $TOOL['diakSelect']['statusz'] = array('jogviszonyban van','magántanuló','vendégtanuló','jogviszonya felfüggesztve','jogviszonya lezárva','felvételt nyert'); - if ( !isset($TOOL['diakSelect']['paramName']) || $TOOL['diakSelect']['paramName']=='' ) - $TOOL['diakSelect']['paramName'] = 'diakId'; -} - -function getDiakLapozo() { - - global $TOOL, $osztalyId; - - if (!isset($TOOL['diakLapozo']['osztalyId']) && isset($osztalyId)) - $TOOL['diakLapozo']['osztalyId'] = $osztalyId; - if (!is_array($TOOL['diakLapozo']['diakok'])) - $TOOL['diakLapozo']['diakok'] = getDiakok(array( - 'osztalyId' => $TOOL['diakLapozo']['osztalyId'], - 'tanev' => $TOOL['diakLapozo']['tanev'], - 'statusz' => $TOOL['diakLapozo']['statusz'], - 'tolDt' => $TOOL['diakLapozo']['tolDt'], - 'igDt' => $TOOL['diakLapozo']['igDt'], - )); - if (!is_array($TOOL['diakLapozo']['statusz'])) - $TOOL['diakLapozo']['statusz'] = array('jogviszonyban van','magántanuló','vendégtanuló','jogviszonya felfüggesztve','jogviszonya lezárva','felvételt nyert'); - if ( !isset($TOOL['diakLapozo']['paramName']) || $TOOL['diakLapozo']['paramName']=='' ) - $TOOL['diakLapozo']['paramName'] = 'diakId'; - -} - - -function getTableSelect () { - - global $TOOL; - - $TOOL['tableSelect']['naplo'] =$TOOL['tableSelect']['naplo_intezmeny'] = array(); - if (defined('__INTEZMENY')) { - $TOOL['tableSelect']['naplo_intezmeny'] = db_query('SHOW TABLES', array('fv' => 'getTableSelect', 'modul' => 'naplo_intezmeny', 'result' => 'idonly')); - } - if (defined('__TANEV')) { - $TOOL['tableSelect']['naplo'] = - db_query('SHOW TABLES', array('fv' => 'getTableSelect', 'modul' => 'naplo', 'result' => 'idonly')); - } - if ( !isset($TOOL['tableSelect']['paramName']) || $TOOL['tableSelect']['paramName']=='' ) - $TOOL['tableSelect']['paramName'] = 'dbtable'; - -} - -function getOsztalySelect() { - - global $TOOL, $tanev; - - if (!isset($TOOL['osztalySelect']['tanev'])) { - if (isset($tanev)) $TOOL['osztalySelect']['tanev'] = $tanev; - elseif (defined('__TANEV')) $TOOL['osztalySelect']['tanev'] = __TANEV; - } - global $telephelyId; - if (!isset($TOOL['osztalySelect']['osztalyok'])) - if (isset($TOOL['osztalySelect']['tanev'])) - $TOOL['osztalySelect']['osztalyok'] = getOsztalyok($TOOL['osztalySelect']['tanev'],array('mindenOsztalyfonok'=>true, 'result'=>'indexed','telephelyId' => $telephelyId)); - else - $TOOL['osztalySelect']['osztalyok'] = array(); - - if ( !isset($TOOL['osztalySelect']['paramName']) || $TOOL['osztalySelect']['paramName']=='' ) - $TOOL['osztalySelect']['paramName'] = 'osztalyId'; - -} - -function getTanmenetSelect() { - - global $TOOL, $tanev, $tanarId, $targyId; - - if (!isset($TOOL['tanmenetSelect']['tanev'])) { - if (isset($tanev)) $TOOL['tanmenetSelect']['tanev'] = $tanev; - elseif (defined('__TANEV')) $TOOL['tanmenetSelect']['tanev'] = __TANEV; - } - - if (!isset($TOOL['tanmenetSelect']['tanmenetek'])) - if (isset($TOOL['tanmenetSelect']['tanev'])) { - if (isset($tanarId)) $TOOL['tanmenetSelect']['tanmenetek'] = getTanmenetByTanarId($tanarId, array('tanev' => $TOOL['tanmenetSelect']['tanev'])); - elseif (isset($targyId)) $TOOL['tanmenetSelect']['tanmenetek'] = getTanmenetByTargyId($targyId, array('tanev' => $TOOL['tanmenetSelect']['tanev'])); -// } else { -// $TOOL['tanmenetSelect']['tanmenetek'] = array(); - } - - if ( !isset($TOOL['tanmenetSelect']['paramName']) || $TOOL['tanmenetSelect']['paramName']=='' ) - $TOOL['tanmenetSelect']['paramName'] = 'tanmenetId'; - -} - -function getTankorSelect() { - - global $TOOL, $tanev, $mkId, $targyId, $osztalyId, $tanarId, $diakId; - - // Tanév beállítás: paraméter, globális változó, konstans - if (!isset($TOOL['tankorSelect']['tanev'])) { - if (isset($tanev)) $TOOL['tankorSelect']['tanev'] = $tanev; - elseif (defined('__TANEV')) $TOOL['tankorSelect']['tanev'] = __TANEV; - } - $tolDt=$TOOL['tankorSelect']['tolDt']; - $igDt=$TOOL['tankorSelect']['igDt']; - - // Paraméter neve - if ( !isset($TOOL['tankorSelect']['paramName']) || $TOOL['tankorSelect']['paramName']=='' ) - $TOOL['tankorSelect']['paramName'] = 'tankorId'; - - // tankörök lekérdezése - ha még nem történt meg - if (!is_array($TOOL['tankorSelect']['tankorok'])) { - if (isset($diakId) && $diakId!='') { // diák tankörei - $TOOL['tankorSelect']['tankorok'] = getTankorByDiakId($diakId, $TOOL['tankorSelect']['tanev'], array('tolDt'=>$tolDt, 'igDt'=>$igDt)); - } elseif (isset($osztalyId) && $osztalyId!='') { // osztály tankörei - $TOOL['tankorSelect']['tankorok'] = getTankorByOsztalyId($osztalyId, $TOOL['tankorSelect']['tanev'], array('tolDt'=>$tolDt, 'igDt'=>$igDt)); - } elseif (isset($tanarId) && $tanarId!='') { // tanár tankörei - $TOOL['tankorSelect']['tankorok'] = getTankorByTanarId($tanarId, $TOOL['tankorSelect']['tanev'], array('tolDt'=>$tolDt, 'igDt'=>$igDt)); - } else { // általános tankörlekérdző - $WHERE = array(); - if (isset($targyId) && $targyId != '') { // leszűkítés adott tárgyra - $WHERE[] = 'targyId='.$targyId; - } elseif (isset($mkId) && $mkId != '') { // leszűkítés adott munkaközösségre - $TARGYAK = getTargyakByMkId($mkId); - for ($i = 0; $i < count($TARGYAK); $i++) $T[] = $TARGYAK[$i]['targyId']; - if (count($T) > 0) $WHERE[] = 'targyId IN ('.implode(',', $T).')'; - } - - if (isset($TOOL['tankorSelect']['tanev'])) // szűkítés adott tanévre - $WHERE[] = 'tankorSzemeszter.tanev='.$TOOL['tankorSelect']['tanev']; - - $TOOL['tankorSelect']['tankorok'] = getTankorok($WHERE); - } - } else { - // A megadott tankörök csoportosításához - if (!is_array($TOOL['tankorSelect']['tankorIds'])) { - if (isset($diakId) && $diakId != '') { // diák tankörei - $TOOL['tankorSelect']['tankorIds'] = getTankorByDiakId($diakId, $TOOL['tankorSelect']['tanev'],array('csakId' => true, 'tolDt'=>$tolDt, 'igDt'=>$igDt )); - } elseif (isset($osztalyId) && $osztalyId != '') { // osztály tankörei - $TOOL['tankorSelect']['tankorIds'] = getTankorByOsztalyId($osztalyId, $TOOL['tankorSelect']['tanev'], array('csakId' => true, 'tolDt'=>$tolDt, 'igDt'=>$igDt)); - } elseif (isset($tanarId) && $tanarId != '') { // tanár tankörei - $TOOL['tankorSelect']['tankorIds'] = getTankorByTanarId($tanarId, $TOOL['tankorSelect']['tanev'], array('csakId' => true,'tolDt'=>$tolDt, 'igDt'=>$igDt)); - } - } - } - if ($tolDt!='' || $igDt!='') - $TOOL['tankorSelect']['tankorIdsDt'] = $tolDt.'-'.$igDt; - -} - -function getDatumSelect() { - - global $TOOL, $tanev; - - if (isset($tanev)) $TOOL['datumSelect']['tanev'] = $tanev; - elseif (defined('__TANEV')) $TOOL['datumSelect']['tanev'] = __TANEV; - - if ( - (is_array($TOOL['datumSelect']['napTipusok']) || isset($TOOL['datumSelect']['napokSzama'])) - && !is_array($TOOL['datumSelect']['napok']) - ) { - $TOOL['datumSelect']['napok'] = getNapok( - array( - 'tanev' => $TOOL['datumSelect']['tanev'], - 'tolDt' => $TOOL['datumSelect']['tolDt'], - 'igDt' => $TOOL['datumSelect']['igDt'], - 'tipus' => $TOOL['datumSelect']['napTipusok'], - 'napokSzama' => $TOOL['datumSelect']['napokSzama'], - ) - ); - } else { - - $tolDt = $TOOL['datumSelect']['tolDt']; $igDt = $TOOL['datumSelect']['igDt']; - initTolIgDt($TOOL['datumSelect']['tanev'], $tolDt, $igDt, $TOOL['datumSelect']['override']); - $TOOL['datumSelect']['tolDt'] = $tolDt; $TOOL['datumSelect']['igDt'] = $igDt; - - if (!isset($TOOL['datumSelect']['hanyNaponta']) || $TOOL['datumSelect']['hanyNaponta']=='' ) - $TOOL['datumSelect']['hanyNaponta'] = 1; - - }; - - if (!isset($TOOL['datumSelect']['paramName']) || $TOOL['datumSelect']['paramName']=='' ) - $TOOL['datumSelect']['paramName'] = 'dt'; -} - -function getDatumTolIgSelect() { - - global $TOOL, $tanev; - - if (isset($tanev)) $TOOL['datumTolIgSelect']['tanev'] = $tanev; - elseif (defined('__TANEV')) $TOOL['datumTolIgSelect']['tanev'] = __TANEV; - - if ( - (is_array($TOOL['datumTolIgSelect']['napTipusok']) || isset($TOOL['datumTolIgSelect']['napokSzama'])) - && !is_array($TOOL['datumTolIgSelect']['napok']) - ) { - $TOOL['datumTolIgSelect']['napok'] = getNapok( - array( - 'tanev' => $TOOL['datumTolIgSelect']['tanev'], - 'tolDt' => $TOOL['datumTolIgSelect']['tolDt'], - 'igDt' => $TOOL['datumTolIgSelect']['igDt'], - 'tipus' => $TOOL['datumTolIgSelect']['napTipusok'], - 'napokSzama' => $TOOL['datumTolIgSelect']['napokSzama'], - ) - ); - } else { - $tolDt = $TOOL['datumTolIgSelect']['tolDt']; $igDt = $TOOL['datumTolIgSelect']['igDt']; - initTolIgDt($TOOL['datumTolIgSelect']['tanev'], $tolDt, $igDt, $TOOL['datumTolIgSelect']['override']); - $TOOL['datumTolIgSelect']['tolDt'] = $tolDt; $TOOL['datumTolIgSelect']['igDt'] = $igDt; - - if (!isset($TOOL['datumTolIgSelect']['hanyNaponta']) || $TOOL['datumTolIgSelect']['hanyNaponta']=='' ) - $TOOL['datumTolIgSelect']['hanyNaponta'] = 1; - - }; - - if (!isset($TOOL['datumTolIgSelect']['tolParamName']) || $TOOL['datumTolIgSelect']['tolParamName']=='' ) - $TOOL['datumTolIgSelect']['tolParamName'] = 'tolDt'; - if (!isset($TOOL['datumTolIgSelect']['igParamName']) || $TOOL['datumTolIgSelect']['igParamName']=='' ) - $TOOL['datumTolIgSelect']['igParamName'] = 'igDt'; - -} - -function getOraSelect() { - - global $TOOL, $tanev; - - if (!isset($TOOL['oraSelect']['tol']) || $TOOL['oraSelect']['tol'] == '' ) - $TOOL['oraSelect']['tol'] = getMinOra(); - if (!isset($TOOL['oraSelect']['ig']) || $TOOL['oraSelect']['ig'] == '' ) - $TOOL['oraSelect']['ig'] = getMaxOra(); - - if (!isset($TOOL['oraSelect']['paramName']) || $TOOL['oraSelect']['paramName']=='' ) - $TOOL['oraSelect']['paramName'] = 'ora'; - -} - -function getTeremSelect() { - - global $TOOL; - - $telephelyId = $TOOL['teremSelect']['telephelyId']; - if (!is_array($TOOL['teremSelect']['termek'])) $TOOL['teremSelect']['termek'] = getTermek(array('telephelyId' => $telephelyId)); - if (!isset($TOOL['teremSelect']['paramName']) || $TOOL['teremSelect']['paramName']=='' ) - $TOOL['teremSelect']['paramName'] = 'teremId'; - -} - -function getKepzesSelect() { - - global $TOOL; - - $TOOL['kepzesSelect']['kepzes'] = getKepzesek(); - if (!is_array($TOOL['kepzesSelect']['kepzes']) || count($TOOL['kepzesSelect']['kepzes']) == 0) { - unset($TOOL['kepzesSelect']); - } else { - if ( !isset($TOOL['kepzesSelect']['paramName']) || $TOOL['kepzesSelect']['paramName'] == '' ) - $TOOL['kepzesSelect']['paramName'] = 'kepzesId'; - } -} - -function getKerdoivSelect() { - - global $TOOL; - - if (!is_array($TOOL['kerdoivSelect']['kerdoiv'])) $TOOL['kerdoivSelect']['kerdoiv'] = getKerdoiv(); - if ( !isset($TOOL['kerdoivSelect']['paramName']) || $TOOL['kerdoivSelect']['paramName'] == '' ) - $TOOL['kerdoivSelect']['paramName'] = 'kerdoivId'; - -} - -function getSzuloSelect() { - - global $TOOL; - - $TOOL['szuloSelect']['szulo'] = getSzulok(array('result' => 'indexed')); - if (!is_array($TOOL['szuloSelect']['szulo']) || count($TOOL['szuloSelect']['szulo']) == 0) { - unset($TOOL['szuloSelect']); - } else { - if ( !isset($TOOL['szuloSelect']['paramName']) || $TOOL['szuloSelect']['paramName'] == '' ) - $TOOL['szuloSelect']['paramName'] = 'szuloId'; - } -} - - -/* TANEV FÜGGŐK */ - -function getOrarendiHetSelect() { - - global $TOOL; - $TOOL['orarendiHetSelect']['hetek'] = getOrarendiHetek($TOOL['orarendiHetSelect']); // tolDt, igDt, tanev - if ( !isset($TOOL['orarendiHetSelect']['paramName']) || $TOOL['orarendiHetSelect']['paramName']=='' ) - $TOOL['orarendiHetSelect']['paramName'] = 'het'; - -} - -function getTanarOraLapozo() { - - global $TOOL; - global $tanarId,$tolDt,$igDt,$oraId; - $_X = $TOOL['tanarOraLapozo']['orak'] = getTanarOrak( - $tanarId,array('tolDt' => $tolDt, 'igDt' => $igDt, 'tipus' => array('normál','normál máskor','helyettesítés','felügyelet','összevonás')) - ); - for ($i = 0; $i < count($_X); $i++) { - if ($_X[$i]['oraId'] == $oraId) { - $TOOL['tanarOraLapozo']['oraAdat'] = $_X[$i]; - if (is_array($_X[($i-1)])) $TOOL['tanarOraLapozo']['elozo'] = $_X[$i-1]; - if (is_array($_X[($i+1)])) $TOOL['tanarOraLapozo']['kovetkezo'] = $_X[$i+1]; - break; - } - } - if ( !isset($TOOL['tanarOraLapozo']['paramName']) || $TOOL['tanarOraLapozo']['paramName']=='' ) - $TOOL['tanarOraLapozo']['paramName'] = 'oraId'; - -} - -function getIgazolasOsszegzo() { - - global $TOOL; - global $diakId; - global $_TANEV; - if ($diakId!='') { - $TOOL['igazolasOsszegzo']['igazolasok'] = getIgazolasSzam($diakId); - $_T = getDiakHianyzasOsszesites(array($diakId),$_TANEV); - $TOOL['igazolasOsszegzo']['hianyzasok'] = $_T[$diakId]; - $TOOL['kretaIgazolasOsszegzo'] = getKretaIgazolasOsszegzo($diakId); - } - -} - -function getZaradekSelect() { - - global $TOOL; - - if (!is_array($TOOL['zaradekSelect']['zaradekok'])) $TOOL['zaradekSelect']['zaradekok'] = getZaradekok(); - - if (!isset($TOOL['zaradekSelect']['paramName']) || $TOOL['zaradekSelect']['paramName']=='' ) - $TOOL['zaradekSelect']['paramName'] = 'zaradekIndex'; - -} - -function getKerelemStat() { - global $TOOL; - //$TOOL['kerelemStat']['stat'] = getKerelemOsszesito(); -} - -//function getTelephelySelect() { -// global $TOOL; -// if (!is_array($TOOL['telephelySelect']['telephelyek'])) { -// $TOOL['telephelySelect']['telephelyek'] = getTelephely(); -// } -// -//} - -function getVissza() { - global $TOOL; - if ($TOOL['vissza']['icon']=='') { $TOOL['vissza']['icon'] = 'arrow-left'; } // default, egyelőre csak a 'vissza' típusnál használjuk -} - -?> diff --git a/mayor-orig/www/include/modules/naplo/base/update.php b/mayor-orig/www/include/modules/naplo/base/update.php deleted file mode 100644 index 02bcf0e8..00000000 --- a/mayor-orig/www/include/modules/naplo/base/update.php +++ /dev/null @@ -1,86 +0,0 @@ - $bejegyzesTipusNev) { - if ($fokozat > 0) { - // Ki jogosult beírni - $jogosult = array('admin'); - if (in_array(mb_substr($bejegyzesTipusNev, 0, 9, 'UTF-8'), array('igazgatói', 'nevelőtes'))) $jogosult[] = 'vezetőség'; - if (mb_substr($bejegyzesTipusNev, 0, 13, 'UTF-8') == 'osztályfőnöki') $jogosult[] = 'osztályfőnök'; - if (mb_substr($bejegyzesTipusNev, 0, 10, 'UTF-8') == 'szaktanári') $jogosult[] = 'szaktanár'; - // frissítés - $q = "UPDATE `bejegyzesTipus` SET `bejegyzesTipusNev`='%s', `jogosult`='".implode(',', $jogosult)."' WHERE `tipus`='fegyelmi' AND `fokozat`='%s'"; - $v = array($bejegyzesTipusNev, $fokozat); - $r = db_query($q, array('fv' => 'update002483/fegyelmi','modul' => 'naplo_intezmeny','values' => $v, 'rollback' => true), $lr); - if (!$r) { - db_close($lr); - return false; - } - } - } - // A dicséret fokozatok neveinek beállítása - foreach ($DICSERET_FOKOZATOK as $fokozat => $bejegyzesTipusNev) { - if ($fokozat > 0) { - // Ki jogosult beírni - $jogosult = array('admin'); - if (in_array(mb_substr($bejegyzesTipusNev, 0, 9, 'UTF-8'), array('igazgatói', 'nevelőtes'))) $jogosult[] = 'vezetőség'; - if (mb_substr($bejegyzesTipusNev, 0, 13, 'UTF-8') == 'osztályfőnöki') $jogosult[] = 'osztályfőnök'; - if (mb_substr($bejegyzesTipusNev, 0, 10, 'UTF-8') == 'szaktanári') $jogosult[] = 'szaktanár'; - // frissítés - $q = "UPDATE `bejegyzesTipus` SET `bejegyzesTipusNev`='%s', `jogosult`='".implode(',', $jogosult)."' WHERE `tipus`='dicseret' AND `fokozat`='%s'"; - $v = array($bejegyzesTipusNev, $fokozat); - $r = db_query($q, array('fv' => 'update002483/dicseret','modul' => 'naplo_intezmeny','values' => $v, 'rollback' => true), $lr); - if (!$r) { - db_close($lr); - return false; - } - } - } - // Az adott számú igazolatlan hiűnyzáshoz rendelt fegyelmi fokozatok eltárolása - foreach ($HIANYZASI_FOKOZATOK as $hianyzasDb => $fokozat) { - if ($fokozat > 0) { - $q = "UPDATE `bejegyzesTipus` SET `hianyzasDb`=%u WHERE `tipus`='fegyelmi' AND `fokozat`='%s'"; - $v = array($hianyzasDb, $fokozat); - $r = db_query($q, array('fv' => 'update002483/hianyzas','modul' => 'naplo_intezmeny','values' => $v, 'rollback' => true), $lr); - if (!$r) { - db_close($lr); - return false; - } - } - } - // A felesleges fegyelmi és dicséret fokozatok törlése (20-20 fokozat volt felvéve) - $q = "DELETE FROM `bejegyzesTipus` WHERE `bejegyzesTipusNev` IS NULL"; - $r = db_query($q, array('fv' => 'update002483/delete','modul' => 'naplo_intezmeny', 'rollback' => true), $lr); - - if ($r) db_commit($lr); - db_close($lr); - - $fp = fopen($lock,'w'); - fwrite($fp, 'PHP update 002483 done.'); - fclose($fp); - } - } -*/ - - -// update002483(); - -?> diff --git a/mayor-orig/www/include/modules/naplo/base/zcheck.php b/mayor-orig/www/include/modules/naplo/base/zcheck.php deleted file mode 100644 index 38c03a11..00000000 --- a/mayor-orig/www/include/modules/naplo/base/zcheck.php +++ /dev/null @@ -1,100 +0,0 @@ -0) define('__UZENOSZEREP','szulo'); - elseif (__DIAK===true && defined('__USERDIAKID') && intval(__USERDIAKID)>0) define('__UZENOSZEREP','diak'); - elseif (__UZENOADMIN===true) define('__UZENOSZEREP','admin'); - else define('__UZENOSZEREP',''); - - if (count($KERELEM_TAG) ==0) $KERELEM_TAG = array('névsor','jogviszony','órarend, haladási','hiányzás, igazolás','jegy, zárójegy'); - -?> diff --git a/mayor-orig/www/include/modules/naplo/bejegyzesek/bejegyzesTipus.php b/mayor-orig/www/include/modules/naplo/bejegyzesek/bejegyzesTipus.php deleted file mode 100644 index cf2fd2fd..00000000 --- a/mayor-orig/www/include/modules/naplo/bejegyzesek/bejegyzesTipus.php +++ /dev/null @@ -1,87 +0,0 @@ -'getBejegyzesek','modul'=>'naplo_intezmeny','values'=>$v,'result'=>'multiassoc','keyfield'=>'tipus')); - - } - - function jogosultValtoztatas($btId, $jogosult) { - - $q = "UPDATE bejegyzesTipus SET jogosult='%s' WHERE bejegyzesTipusId=%u"; - $v = array(implode(',',$jogosult), $btId); - return db_query($q, array('fv' => 'jogosultValtoztatas', 'modul'=>'naplo_intezmeny', 'values'=>$v)); - - } - - - function bejegyzesTipusModositas($btId, $btAdat, $dt) { - $B = getBejegyzesTipusById($btId); - $lr = db_connect('naplo_intezmeny'); - db_start_trans($lr); - if ($B['tolDt'] != $dt) { - // A korábbi bejegyzesTipus lemásolása - foreach ($btAdat as $key => $value) { $B[$key] = $value; } - $q = "INSERT INTO bejegyzesTipus (tipus, fokozat, bejegyzesTipusNev, hianyzasDb, jogosult, tolDt, igDt) VALUES "; - if ($igDt == NULL) { - $q .= "('%s',%u,'%s',%u,'%s','%s',NULL)"; - $v = array($B['tipus'], $B['fokozat'], $B['bejegyzesTipusNev'], $B['hianyzasDb'], implode(',',$B['jogosult']), $dt); - } else { - $q .= "('%s',%u,'%s',%u,'%s','%s','%s')"; - $v = array($B['tipus'], $B['fokozat'], $B['bejegyzesTipusNev'], $B['hianyzasDb'], implode(',',$B['jogosult']), $dt, $B['igDt']); - } - $bejegyzesTipusId = db_query($q, array('fv'=>'bejegyzesTipusModositas/insert','modul'=>'naplo_intezmeny','values'=>$v,'result'=>'insert'),$lr); - if (!$bejegyzesTipusId) { db_rollback($lr); db_close($lr); return false; } - // A korábbi bejegyzesTipus lezárása a megelőző nap dátumával - $q = "UPDATE bejegyzesTipus SET igDt = '%s' - INTERVAL 1 DAY WHERE bejegyzesTipusId=%u"; - $v = array($dt, $btId); - $r = db_query($q, array('fv'=>'bejegyzesTipusModositas/lezar','modul'=>'naplo_intezmeny','values'=>$v),$lr); - if (!$r) { db_rollback($lr); db_close($lr); return false; } - } else { - // A meglévő bejegyzesTipus módosítása - $q = "UPDATE bejegyzesTipus SET bejegyzesTipusNev='%s', hianyzasDb=%u, jogosult='%s' WHERE bejegyzesTipusId=%u"; - $v = array($btAdat['bejegyzesTipusNev'], $btAdat['hianyzasDb'], implode(',', $btAdat['jogosult']), $btId); - $r = db_query($q, array('fv'=>'bejegyzesTipusModositas/lezar','modul'=>'naplo_intezmeny','values'=>$v),$lr); - if (!$r) { db_rollback($lr); db_close($lr); return false; } - } - db_commit($lr); - db_close($lr); - return true; - } - - function fokozatTorles($tipus, $dt) { - $q ="SELECT bejegyzesTipusId FROM bejegyzesTipus WHERE tipus='%s' AND tolDt<='%s' AND (igDt IS NULL OR '%s'<=igDt) ORDER BY fokozat DESC LIMIT 1"; - $v = array($tipus, $dt, $dt); - $id = db_query($q, array('fv'=>'fokozatTorles/id','modul'=>'naplo_intezmeny','values'=>$v,'result'=>'value')); - - $q = "UPDATE bejegyzesTipus SET igDt = '%s' - INTERVAL 1 DAY WHERE bejegyzesTipusId=%u"; - $v = array($dt, $id); - return db_query($q, array('fv'=>'fokozatTorles/update','modul'=>'naplo_intezmeny','values'=>$v)); - } - - function ujFokozat($tipus, $dt) { - $q ="SELECT max(fokozat) FROM bejegyzesTipus WHERE tipus='%s' AND tolDt<='%s' AND (igDt IS NULL OR '%s'<=igDt)"; - $v = array($tipus, $dt, $dt); - $fokozat = db_query($q, array('fv'=>'ujFokozat/fokozat','modul'=>'naplo_intezmeny','values'=>$v,'result'=>'value')); - $fokozat++; - - // van-e ilyen fokozat későbbi dátummal? - $q = "SELECT tolDt FROM bejegyzesTipus WHERE tipus='%s' AND fokozat=%u AND tolDt>'%s' ORDER BY tolDt LIMIT 1"; - $v = array($tipus, $fokozat, $dt); - $tolDt = db_query($q, array('fv'=>'ujFokozat/tolDt','modul'=>'naplo_intezmeny','values'=>$v,'result'=>'value')); - - if ($tolDt == NULL) { - $q = "INSERT INTO bejegyzesTipus (tipus, fokozat, bejegyzesTipusNev, hianyzasDb, jogosult, tolDt, igDt) VALUES ('%s', %u,'%s',NULL, 'admin','%s',NULL)"; - $v = array($tipus, $fokozat, $tipus.' fokozat', $dt); - } else { - $q = "INSERT INTO bejegyzesTipus (tipus, fokozat, bejegyzesTipusNev, hianyzasDb, jogosult, tolDt, igDt) VALUES ('%s', %u,'%s',NULL, 'admin','%s', '%s' - INTERVAL 1 DAY)"; - $v = array($tipus, $fokozat, $tipus.' fokozat', $dt, $tolDt); - } - return db_query($q, array('fv'=>'ujFokozat/insert','modul'=>'naplo_intezmeny','values'=>$v,'result'=>'insert')); - } - -?> \ No newline at end of file diff --git a/mayor-orig/www/include/modules/naplo/bejegyzesek/bejegyzesek.php b/mayor-orig/www/include/modules/naplo/bejegyzesek/bejegyzesek.php deleted file mode 100644 index 97ab45de..00000000 --- a/mayor-orig/www/include/modules/naplo/bejegyzesek/bejegyzesek.php +++ /dev/null @@ -1,74 +0,0 @@ - 'getBejegyzesLista', 'modul' => 'naplo', 'result' => 'indexed', 'values' => array($tanarId))); - for ($i = 0; $i < count($BEJEGYZESEK); $i++) - if ($BEJEGYZESEK[$i]['tanarId'] != '') $BEJEGYZESEK[$i]['tanarNev'] = getTanarNevById($BEJEGYZESEK[$i]['tanarId']); - - return $BEJEGYZESEK; - - } - // ok - function getBejegyzesLista($diakId) { - - $q = "SELECT * FROM bejegyzes LEFT JOIN `".__INTEZMENYDBNEV."`.`bejegyzesTipus` USING (bejegyzesTipusId) WHERE diakId=%u ORDER BY tipus,beirasDt"; - - $BEJEGYZESEK = db_query($q, array('fv' => 'getBejegyzesLista', 'modul' => 'naplo', 'result' => 'indexed', 'values' => array($diakId))); - for ($i = 0; $i < count($BEJEGYZESEK); $i++) - if ($BEJEGYZESEK[$i]['tanarId'] != '') $BEJEGYZESEK[$i]['tanarNev'] = getTanarNevById($BEJEGYZESEK[$i]['tanarId']); - - return $BEJEGYZESEK; - - } - // ok - function getBejegyzesekByDiakIds($diakIds, $orderBy = 'diakId,tipus,beirasDt') { - - $q = "SELECT * FROM bejegyzes LEFT JOIN `".__INTEZMENYDBNEV."`.`bejegyzesTipus` USING (bejegyzesTipusId) - WHERE diakId IN (".implode(',', array_fill(0, count($diakIds), '%u')).") ORDER BY $orderBy"; - - $BEJEGYZESEK = db_query($q, array( - 'fv' => 'getBejegyzesekByDiakIds', 'modul' => 'naplo', 'result' => 'multiassoc', 'keyfield' => 'diakId', 'values' => $diakIds - )); - foreach ($BEJEGYZESEK as $diakId => $BADAT) - for ($i = 0; $i < count($BADAT); $i++) - if ($BADAT[$i]['tanarId'] != '') - $BEJEGYZESEK[$diakId][$i]['tanarNev'] = getTanarNevById($BADAT[$diakId][$i]['tanarId']); - - return $BEJEGYZESEK; - - } - // ok - function delBejegyzes($bejegyzesId) { - - - $torolheto = false; - if (__NAPLOADMIN) { - $torolheto = true; - } elseif (__TANAR) { - $q = "SELECT tanarId FROM bejegyzes WHERE bejegyzesId=%u"; - $tanarId = db_query($q, array('fv' => 'delBejegyzes/check tanar', 'modul' => 'naplo', 'result' => 'value', 'values' => array($bejegyzesId))); - if (__USERTANARID == $tanarId) $torolheto = true; - } - if ($torolheto) { - $q = "DELETE FROM bejegyzes WHERE bejegyzesId=%u"; - db_query($q, array('fv' => 'delBejegyzes', 'modul' => 'naplo', 'values' => array($bejegyzesId))); - } else { - $_SESSION['alert'][] = 'message:insufficient_access:delBejegyzes'; - } - } - - function getBejegyzesAdatById($bejegyzesId) { - - $q = "SELECT * FROM bejegyzes LEFT JOIN `".__INTEZMENYDBNEV."`.`bejegyzesTipus` USING (bejegyzesTipusId) WHERE bejegyzesId=%u"; - return db_query($q, array('fv' => 'getBejegyzesAdatById', 'modul' => 'naplo', 'result' => 'record', 'values' => array($bejegyzesId))); - - } - -?> diff --git a/mayor-orig/www/include/modules/naplo/diakValaszto.php b/mayor-orig/www/include/modules/naplo/diakValaszto.php deleted file mode 100644 index e3a2f6b4..00000000 --- a/mayor-orig/www/include/modules/naplo/diakValaszto.php +++ /dev/null @@ -1,10 +0,0 @@ - 'updateSessionOid', 'modul' => 'naplo_base', 'values' => array($parentDiakId))); - - } - -?> diff --git a/mayor-orig/www/include/modules/naplo/ertekeles/kerdoivBetoltes.php b/mayor-orig/www/include/modules/naplo/ertekeles/kerdoivBetoltes.php deleted file mode 100644 index 811f27fe..00000000 --- a/mayor-orig/www/include/modules/naplo/ertekeles/kerdoivBetoltes.php +++ /dev/null @@ -1,81 +0,0 @@ - 'ujKerdoiv', 'modul' => 'naplo', 'result' => 'insert', 'values' => $v), $lr); - - } - - function kerdesValaszFelvetel($ADAT) { - $kerdoivId = $ADAT['kerdoivId']; - $kerdes = ''; - for ($i = 0; $i < count($ADAT['txt']); $i++) { - if (trim($ADAT['txt'][$i]) != '') { - if ($kerdes == '') { - $kerdes = chop(readVariable($ADAT['txt'][$i], 'string')); - $q = "INSERT INTO kerdoivKerdes (kerdoivId, kerdes) VALUES (%u, '%s')"; - $v = array($kerdoivId, $kerdes); - $kerdesId = db_query($q, array('fv' => 'kerdesValaszFelvetel/kerdes', 'modul' => 'naplo', 'result' => 'insert', 'values' => $v), $lr); - } else { - $mezok = explode('|', chop(readVariable($ADAT['txt'][$i],'string'))); - if (count($mezok) == 1) { - $valasz = $mezok[0]; - $pont = 0; - } else { - $valasz = $mezok[1]; - $pont = $mezok[0]; - } - $q = "INSERT INTO kerdoivValasz (kerdesId, valasz, pont) VALUES (%u, '%s', %d)"; - $v = array($kerdesId, $valasz, $pont); - db_query($q, array('fv' => 'kerdesValaszFeltoltes/valasz', 'modul' => 'naplo', 'values' => $v), $lr); - } - } else { - $kerdes = ''; - } - } - } - - function kerdoivCimzettFelvetel($kerdoivId, $cimzettId, $cimzettTipus) { - // kerdoivCimzett - $q = "INSERT INTO kerdoivCimzett (kerdoivId,cimzettId,cimzettTipus) VALUES (%u, %u, '%s')"; - $v = array($kerdoivId, $cimzettId, $cimzettTipus); - db_query($q, array('fv' => 'kerdoivCimzett - cimzett', 'modul' => 'naplo', 'values' => $v)); - // kerdoivValaszSzam - $q = "INSERT INTO kerdoivValaszSzam (valaszId,cimzettId,cimzettTipus,szavazat) - SELECT valaszId, %u, '%s', 0 FROM kerdoivValasz LEFT JOIN kerdoivKerdes USING (kerdesId) WHERE kerdoivId=%u"; - $v = array($cimzettId, $cimzettTipus, $kerdoivId); - return db_query($q, array('fv' => 'kerdoivCimzett - valaszSzam', 'modul' => 'naplo', 'values' => $v)); - - } - - function kerdoivCimzettTorles($kerdoivId, $cimzettId, $cimzettTipus) { - $return = true; - $lr = db_connect('naplo'); - db_start_trans($lr); - // kerdoivCimzett - $q = "DELETE FROM kerdoivCimzett WHERE kerdoivId=%u AND cimzettId=%u AND cimzettTipus='%s'"; - $v = array($kerdoivId, $cimzettId, $cimzettTipus); - $return = $return && db_query($q, array('fv' => 'kerdoivCimzettTorles - cimzett', 'modul' => 'naplo', 'values' => $v), $lr); - // kerdoivMegvalaszoltKerdes - $q = "DELETE FROM kerdoivMegvalaszoltKerdes WHERE cimzettId=%u AND cimzettTipus='%s' AND kerdesId IN - (SELECT kerdesId FROM kerdoivKerdes WHERE kerdoivId=%u)"; - $v = array($cimzettId, $cimzettTipus, $kerdoivId); - $return = $return && db_query($q, array('fv' => 'kerdoivCimzettTorles - cimzett', 'modul' => 'naplo', 'values' => $v), $lr); - // kerdoivValaszSzam - $q = "DELETE FROM kerdoivValaszSzam WHERE cimzettId=%u AND cimzettTipus='%s' AND valaszId IN - (SELECT valaszId FROM kerdoivValasz LEFT JOIN kerdoivKerdes USING (kerdesId) WHERE kerdoivId=%u)"; - $v = array($cimzettId, $cimzettTipus, $kerdoivId); - $return = $return && db_query($q, array('fv' => 'kerdoivCimzettTorles - valaszSzam', 'modul' => 'naplo', 'values' => $v), $lr); - - if ($return) db_commit($lr); - else db_rollback($lr); - - db_close($lr); - return $return; - - } - - -?> diff --git a/mayor-orig/www/include/modules/naplo/ertekeles/osszesites.php b/mayor-orig/www/include/modules/naplo/ertekeles/osszesites.php deleted file mode 100644 index a57dc671..00000000 --- a/mayor-orig/www/include/modules/naplo/ertekeles/osszesites.php +++ /dev/null @@ -1,57 +0,0 @@ - 'getKerdoivStat', 'db' => 'naplo')); - - // A kérdőív kérdései - $q = "SELECT * FROM kerdoivKerdes WHERE kerdoivId=$kerdoivId ORDER BY kerdesId"; - $ret['kerdes'] = _m_y_query($q, array('fv' => 'getKerdoivStat/kerdes', 'db' => 'naplo')); - - // A kérdőív válaszai - $ret['valaszIds'] = array(); - for ($i = 0; $i < count($ret['kerdes']); $i++) { - $q = "SELECT * FROM kerdoivValasz WHERE kerdesId=".$ret['kerdes'][$i]['kerdesId']." ORDER BY valaszId"; - $ret['kerdes'][$i]['valasz'] = _m_y_query($q, array('fv' => 'getKerdoivStat/valasz', 'db' => 'naplo')); - for ($j = 0; $j < count($ret['kerdes'][$i]['valasz']); $j++) $ret['valaszIds'][] = $ret['kerdes'][$i]['valasz'][$j]['valaszId']; - } - - // A kérdőív címzettjei - $q = "SELECT * FROM kerdoivCimzett WHERE kerdoivId=$kerdoivId"; - $ret['cimzett'] = _m_y_multiassoc_query($q, 'cimzettTipus', array('fv' => 'getKerdoivStat/cimzett', 'db' => 'naplo')); - // A tankör típusú címzettek tanára(i) - $ret['tanarNev'] = array(); - if (is_array($ret['cimzett']['tankor']) && count($ret['cimzett']['tankor']) > 0) { - for ($i = 0; $i < count($ret['cimzett']['tankor']); $i++) { - $tankorId = $ret['cimzett']['tankor'][$i]['cimzettId']; - $tanarIds = getTankorTanaraiByInterval( - $tankorId, array('tanev' => __TANEV, 'tolDt' => $ret['kerdes']['tolDt'], 'igDt' => $ret['kerdes']['igDt'], 'result' => 'csakId') - ); - for ($j = 0; $j < count($tanarIds); $j++) { - $ret['tanarTankorei'][$tanarIds[$j]][] = $tankorId; - if (!isset($ret['tanarNev'][ $tanarIds[$j] ])) $ret['tanarNev'][ $tanarIds[$j] ] = getTanarNevById($tanarIds[$j]); - } - } - } - - $q = "SELECT * FROM kerdoivValaszSzam WHERE valaszId IN (".implode(',', $ret['valaszIds']).") ORDER BY cimzettTipus,cimzettId,valaszId"; - $tmp = _m_y_query($q, array('fv' => 'getKerdoivStat/szavazat', 'db' => 'naplo')); - for ($i = 0; $i < count($tmp); $i++) - $ret['szavazat'][ $tmp[$i]['cimzettTipus'] ][ $tmp[$i]['cimzettId'] ][ $tmp[$i]['valaszId'] ] = $tmp[$i]['szavazat']; - - $tmp = getTankorok(array("tanev=".__TANEV)); - for ($i = 0; $i < count($tmp); $i++) { - $ret['tankorAdat'][ $tmp[$i]['tankorId'] ] = $tmp[$i]; - $ret['tankorAdat'][ $tmp[$i]['tankorId'] ]['letszam'] = getTankorLetszam($tmp[$i]['tankorId'], array('refDt' => $_TANEV['zarasDt'])); - } - return $ret; - - } -*/ - -?> diff --git a/mayor-orig/www/include/modules/naplo/export/bizonyitvany.php b/mayor-orig/www/include/modules/naplo/export/bizonyitvany.php deleted file mode 100644 index 2f7c27a1..00000000 --- a/mayor-orig/www/include/modules/naplo/export/bizonyitvany.php +++ /dev/null @@ -1,88 +0,0 @@ - $targyAdat) { - $EXPORT[0][] = 'targy'.($i+1).'_nev'; - $EXPORT[0][] = 'targy'.($i+1).'_oraszam'; - $EXPORT[0][] = 'targy'.($i+1).'_jegy'; - } - - // adatok - foreach ($ADAT['diakIds'] as $diakId) { - $ADAT['evesOraszam'][$diakId] = getTargyOraszamByDiakId($diakId, $ADAT); - $SOR = array(); - // -- diák adatok - foreach ($ADAT['diakAttrs'] as $attr) $SOR[] = $ADAT['diakAdat'][$diakId][$attr]; - if (true) { - $SOR[] = $ADAT['hianyzas'][$diakId]["igazolt"]; - $SOR[] = $ADAT['hianyzas'][$diakId]["igazolatlan"]; - $SOR[] = $ADAT['hianyzas'][$diakId]["kesesPercOsszeg"]; - $SOR[] = $ADAT['hianyzas'][$diakId]["gyakorlatIgazolt"]; - $SOR[] = $ADAT['hianyzas'][$diakId]["gyakorlatIgazolatlan"]; - $SOR[] = $ADAT['hianyzas'][$diakId]["gyakorlatKesesPercOsszeg"]; - $SOR[] = $ADAT['hianyzas'][$diakId]["elmeletIgazolt"]; - $SOR[] = $ADAT['hianyzas'][$diakId]["elmeletIgazolatlan"]; - $SOR[] = $ADAT['hianyzas'][$diakId]["elmeletKesesPercOsszeg"]; - } - // -- jegyek - foreach ($ADAT['targyak'] as $i => $targyAdat) { - $jegy = $ADAT['jegyek'][$diakId][ $targyAdat['targyId'] ][0]; - $SOR[] = $targyAdat['targyNev']; - $SOR[] = $ADAT['evesOraszam'][$diakId][ $targyAdat['targyId'] ]; - $SOR[] = $KOVETELMENY[ $jegy['jegyTipus'] ][ $jegy['jegy'] ]['hivatalos']; - } - - $EXPORT[] = $SOR; - } - - if ($ADAT['formatum'] == 'xml') return generateXLS("$file.${ADAT['formatum']}", $EXPORT, 'bizonyítvány'); - elseif ($ADAT['formatum'] == 'csv') return generateCSV("$file.${ADAT['formatum']}", $EXPORT, 'bizonyítvány'); - elseif ($ADAT['formatum'] == 'ods') return generateODS("$file.${ADAT['formatum']}", $EXPORT, 'bizonyítvány'); - else return false; - - } - - function getTargyOraszamByDiakId($diakId, $ADAT) { - - $q = "SELECT targyId,oraszam FROM tankorDiak LEFT JOIN tankorSzemeszter USING (tankorId) LEFT JOIN tankor USING (tankorId) - WHERE diakId=%u AND tanev=%u AND beDt<='%s' AND (kiDt IS NULL OR '%s'<=kiDt)"; - $v = array($diakId, $ADAT['szemeszterAdat']['tanev'], $ADAT['szemeszterAdat']['zarasDt'], $ADAT['szemeszterAdat']['zarasDt']); - $jres = db_query($q, array( - 'fv' => 'getTargyOraszamByDiakId', 'modul' => 'naplo_intezmeny', 'result' => 'multiassoc', 'keyfield' => 'targyId', 'values' => $v - )); - $szDb = $ADAT['szemeszterAdat']['tanevAdat']['maxSzemeszter']; // Feltételezzük, hogy a szemeszterek számozása 1-től indul és folyamatos - - foreach ($jres as $targyId => $tAdat) { - $oraszam = 0; - for ($i = 0; $i < count($tAdat); $i++) { - $oraszam += $tAdat[$i]['oraszam']; - } - //$ret['targyOraszam'][$targyId]['hetiOraszam'] = $oraszam / $szDb; - // itt mindenképp van osztalyId - ha nem adunk meg 'vegzos' paramétert, úgy az osztály alapján veszi... - $ret[$targyId] = $oraszam / $szDb * getTanitasiHetekSzama(array('osztalyId'=>$ADAT['osztalyId']/* ,'vegzos'=>diakVegzosE($diakId) */)); - } - return $ret; - } - -?> diff --git a/mayor-orig/www/include/modules/naplo/export/diakExport.php b/mayor-orig/www/include/modules/naplo/export/diakExport.php deleted file mode 100644 index 3114d7a9..00000000 --- a/mayor-orig/www/include/modules/naplo/export/diakExport.php +++ /dev/null @@ -1,144 +0,0 @@ - array( - 'oId','viseltCsaladinev','viseltUtonev','szuletesiIdo','szuletesiHely','nem', - 'lakhelyIrsz','lakhelyHelyseg','lakhelyKozteruletNev','lakhelyKozteruletJelleg','lakhelyHazszam','lakhelyEmelet','lakhelyAjto','telefon'), - 'egyszerű' => array('viseltCsaladinev','viseltUtonev','diakigazolvanySzam','diakNaploSorszam'), - 'osztályfőnöki' => array('diakigazolvanySzam','viseltCsaladinev','viseltUtonev','oId','diakNaploSorszam','telefon','mobil','email'), - 'taninformTanuló' => array('oId','diakigazolvanySzam','viseltNevElotag','viseltCsaladinev','viseltUtonev','szuleteskoriNevElotag', - 'szuleteskoriCsaladinev','szuleteskoriUtonev','szuletesiHely','szuletesiIdo','anyaSzuleteskoriNevElotag','anyaSzuleteskoriCsaladinev', - 'anyaSzuleteskoriUtonev','allampolgarsag','lakhelyOrszag','lakhelyHelyseg', - 'lakhelyIrsz','lakhelyKozteruletNev','lakhelyKozteruletJelleg','lakhelyHazszam','lakhelyEmelet','lakhelyAjto','tartOrszag','tartHelyseg', - 'tartIrsz','tartKozteruletNev','tartKozteruletJelleg','tartHazszam','tartEmelet','tartAjto','jogviszonyKezdete','diakNaploSorszam' - ), - ); - - function diakExport($ADAT) { - - $tanevDbNev = tanevDbNev(__INTEZMENY, $ADAT['tanev']); - $W = array(); - $q = "SELECT diak.*, osztalyId, osztalyJel, diakNaploSorszam(osztalyDiak.diakId,".$ADAT['tanev'].",osztalyDiak.osztalyId) AS diakNaploSorszam FROM diak LEFT JOIN osztalyDiak USING (diakId) - LEFT JOIN `%s`.osztalyNaplo USING (osztalyId)"; - $v = array($tanevDbNev); - if (isset($ADAT['osztalyId'])) { $W[] = "osztalyId=%u"; $v[] = $ADAT['osztalyId']; } - if (isset($ADAT['dt'])) { $W[] = "beDt<='%s' AND ('%s'<=kiDt OR kiDt IS NULL)"; array_push($v, $ADAT['dt'], $ADAT['dt']); } - - $q .= " WHERE ".implode(' AND ', $W); - - $ret = db_query($q, array('fv' => 'diakExport', 'modul' => 'naplo_intezmeny', 'result' => 'indexed', 'values' => $v)); - - if (!$ret) return false; - - $osztalyAdat = getOsztalyok($ADAT['tanev'], array('result' => 'assoc')); - - $Szulok = getSzulok(); - for ($i = 0; $i < count($ret); $i++) { - $ret[$i]['telephelyId'] = $osztalyAdat[ $ret[$i]['osztalyId'] ]['telephelyId']; - foreach (array('anya','apa','gondviselo','nevelo') as $tipus) { - $szuloId = $ret[$i][ $tipus.'Id' ]; - if (is_array($Szulok[$szuloId])) foreach ($Szulok[$szuloId] as $attr => $value) { - $ret[$i][ $tipus . ucfirst($attr) ] = $value; - } elseif ($i == 0 && is_array($Szulok[1])) foreach ($Szulok[1] as $attr => $value) { - $ret[$i][ $tipus . ucfirst($attr) ] = ''; - } - } - } - - return $ret; - - } - - function createFile($ADAT) { - if ($ADAT['formatum'] == 'xls' || $ADAT['formatum'] == 'xml') return generateXLSExport($ADAT['export'], $ADAT['mezok']); - elseif ($ADAT['formatum'] == 'pdf') return generatePDFExport($ADAT['export'], $ADAT['mezok']); - else return generateCSVExport($ADAT['export'], $ADAT['mezok']); - } - - function generateCSVExport($ret, $Mezok = array()) { - - - $fp = fopen(__DIAK_EXPORT_FILE . '.csv', 'w'); - if (!$fp) { - $_SESSION['alert'][] = 'message:file_open:'.__DIAK_EXPORT_FILE . '.csv'; - return false; - } - - fputs($fp, implode(' ',$Mezok)."\n"); - for ($i = 0; $i < count($ret); $i++) { - $A = array(); - foreach ($Mezok as $attr => $attrNev) $A[] = $ret[$i][$attr]; - $sor = implode(' ', $A)."\n"; - fputs($fp, $sor); - } - - fclose($fp); - return true; - - } - - function generateXLSExport($ret, $Mezok = array()) { - - $fp = fopen(__DIAK_EXPORT_FILE . '.xml', 'w'); - if (!$fp) return false; - - fputs($fp, ''."\r\n"); - fputs($fp, ''."\r\n"); - - fputs($fp, ' '."\r\n" - .' '."\r\n" - .' '."\r\n" - ."\r\n".' '."\r\n"); - - fputs($fp, ''."\r\n"); - fputs($fp, ''."\r\n"); - - // fejléc - fputs($fp, ''."\r\n"); - foreach ($Mezok as $index => $attr) { - fputs($fp, " ".$attr."\r\n"); - } - fputs($fp, ''."\r\n"); - - - for ($i = 0; $i < count($ret); $i++) { - fputs($fp, ''."\r\n"); - foreach ($Mezok as $attr => $attrNev) { - $value = $ret[$i][$attr]; - $time = strtotime($value); - if (is_numeric($value)) - fputs($fp, " ".$value."\r\n"); - elseif (is_numeric($time) && $value == date('Y-m-d H:i:s', $time)) - fputs($fp, " ".str_replace(' ','T',$value).'.000'."\r\n"); - elseif (is_numeric($time) && $value == date('Y-m-d', $time)) - fputs($fp, " ".$value.'T08:40:00.000'."\r\n"); - else - fputs($fp, " ".$value."\r\n"); - } - fputs($fp, ''."\r\n"); - } - - fputs($fp, '
'."\r\n"); - fputs($fp, ''."\r\n"); - fputs($fp, ''."\r\n"); - - fclose($fp); - return true; - - } - - function generatePDFExport($ret, $mezok = array()) { - - - $_SESSION['alert'][] = 'message:not implemented'; - - } - -?> diff --git a/mayor-orig/www/include/modules/naplo/export/kirBizonyitvanyExport.php b/mayor-orig/www/include/modules/naplo/export/kirBizonyitvanyExport.php deleted file mode 100644 index d5182042..00000000 --- a/mayor-orig/www/include/modules/naplo/export/kirBizonyitvanyExport.php +++ /dev/null @@ -1,24 +0,0 @@ - diff --git a/mayor-orig/www/include/modules/naplo/export/kreta.php b/mayor-orig/www/include/modules/naplo/export/kreta.php deleted file mode 100644 index 77c89539..00000000 --- a/mayor-orig/www/include/modules/naplo/export/kreta.php +++ /dev/null @@ -1,23 +0,0 @@ - \ No newline at end of file diff --git a/mayor-orig/www/include/modules/naplo/export/sulix.php b/mayor-orig/www/include/modules/naplo/export/sulix.php deleted file mode 100644 index 1658bb58..00000000 --- a/mayor-orig/www/include/modules/naplo/export/sulix.php +++ /dev/null @@ -1,129 +0,0 @@ -/dev/null"); - - unlink(TMP.'/diak.csv'); - unlink(TMP.'/tanar.csv'); - unlink(TMP.'/schoolserver'); - rmdir(TMP); - - return true; - } - - function getDiakAccounts() { - - $D = getDiakok(array('extraAttrs'=>'oId, viseltCsaladinev, viseltUtonev, szuletesiIdo')); - for ($i = 0; $i < count($D); $i++) { - $oId = $D[$i]['oId']; - if (isset($oId)) { - $U = searchAccount('studyId', $oId, array('userAccount','studyId'), 'private'); - for ($j = 0; $j < $U['count']; $j++) { - // Ha az oId nem valódi, akkor lehet egy valódi oId része. Az egyenlőséget vizsgálni kell! - if ($oId == $U[$j]['studyId'][0]) { - $O = getDiakOsztalya($D[$i]['diakId']); - $D[$i]['userAccount'] = ekezettelen($U[$j]['userAccount'][0]); - $D[$i]['osztalyJel'] = str_replace('.','',$O[0]['osztalyJel']); - $ret[] = $D[$i]; - } - } - } - } - - return $ret; - - } - - function getTanarAccounts() { - - $D = getTanarok(array('tanev'=>__TANEV,'result'=>'indexed','extraAttrs'=>'oId, viseltCsaladinev, viseltUtonev, szuletesiIdo')); - - for ($i = 0; $i < count($D); $i++) { - $oId = $D[$i]['oId']; - if (isset($oId)) { - $U = searchAccount('studyId', $oId, array('userAccount','studyId'), 'private'); - for ($j = 0; $j < $U['count']; $j++) { - // Ha az oId nem valódi, akkor lehet egy valódi oId része. Az egyenlőséget vizsgálni kell! - if ($oId == $U[$j]['studyId'][0]) { - $D[$i]['userAccount'] = ekezettelen($U[$j]['userAccount'][0]); - $Osztalya = getOsztalyByTanarId($D[$i]['tanarId'], array('csakId'=>false)); - $D[$i]['osztalyJel'] = str_replace('.','',$Osztalya[0]['osztalyJel']); - if ($D[$i]['szuletesiIdo'] == '') $D[$i]['szuletesiIdo'] = '0000-00-00'; - $ret[] = $D[$i]; - } - } - } - } - - return $ret; - - } - - function getEgyebAccounts() { - - } - - function getAlapadatok($fileName) { - - $D = getIntezmenyByRovidnev(__INTEZMENY); -//var_dump($D); - $fp = fopen(_DOWNLOADDIR.'/private/naplo/export/sulix/'.$fileName,'w'); - if (!$fp) { - $_SESSION['alert'][] = 'message:file_open_failure:'.$fileName; - return false; - } - - fputs($fp, "SCHOOLOM=\"${D['OMKod']}\"\n"); - fputs($fp, "SCHOOLNAME=\"${D['nev']}\"\n"); - fputs($fp, "SCHOOLSHORTNAME=\"${D['rovidNev']}\"\n"); - - fclose($fp); - return true; - } - - function myImplode($v) { return implode(':', $v); } // az alábbi array_map-hez - - function createCSV($csoport, $ADAT) { - - if (!is_array($ADAT[$csoport]) || count($ADAT[$csoport])==0) return false; - - $fileName = $csoport.'.csv'; - $title = ':'; - $mayor2sulix = array( - 'userAccount' => 'AZONOSITO', 'viseltCsaladinev' => 'CSALADI_NEV', 'viseltUtonev' => 'KERESZTNEV', - 'szuletesiIdo' => 'SZULETESNAP', 'osztalyJel' => 'OSZTALY', 'oId' => 'OKTATASI_AZONOSITO' // ':UTF-8 - ); - $Attrs = array(); - foreach ($ADAT[$csoport][0] as $attr => $value) { - if (isset($mayor2sulix[$attr])) { - $title .= $mayor2sulix[$attr].':'; - $Attrs[] = $attr; - } - } - $title .= 'UTF-8'; - $Table = array(); - for ($i = 0; $i < count($ADAT[$csoport]); $i++) { - $Table[$i] = array(0=>''); - for ($j = 0; $j < count($Attrs); $j++) { - $Table[$i][$j+1] = $ADAT[$csoport][$i][ $Attrs[$j] ]; - } - $Table[$i][] = ''; // $Table[$i][] = ''; - } - return $title."\n".implode("\n",array_map('myImplode', $Table)); - - } - -?> \ No newline at end of file diff --git a/mayor-orig/www/include/modules/naplo/export/tanarOsztalyOraszam.php b/mayor-orig/www/include/modules/naplo/export/tanarOsztalyOraszam.php deleted file mode 100644 index c858e674..00000000 --- a/mayor-orig/www/include/modules/naplo/export/tanarOsztalyOraszam.php +++ /dev/null @@ -1,13 +0,0 @@ - \ No newline at end of file diff --git a/mayor-orig/www/include/modules/naplo/export/tantargyFelosztas.php b/mayor-orig/www/include/modules/naplo/export/tantargyFelosztas.php deleted file mode 100644 index 7bc52c09..00000000 --- a/mayor-orig/www/include/modules/naplo/export/tantargyFelosztas.php +++ /dev/null @@ -1,72 +0,0 @@ -'getTankorOraszamok','modul'=>'naplo_intezmeny','result'=>'indexed')); - for ($i=0; $i __TANEV, 'tolDt' => '', 'igDt' => '', 'result' => 'idonly', 'datumKenyszeritessel' => false)); - $return[$i]['osztalyIds'] = getTankorOsztalyai($return[$i]['tankorId']); - } - return $return; - - } - - function exportTantargyFelosztas($file, $ADAT) { - - $T = array(); - - $T[0] = array('név','képesítés/tantárgy','tényleges óraszám','kötelező óraszám','besorolás'); -/* - $T[0] = array('név','képesítés/tantárgy','óraszám'); - foreach ($ADAT['osztalyok'] as $oAdat) { - $T[0][] = $oAdat['osztalyJel']; - } -*/ - foreach ($ADAT['osztalyok'] as $oAdat) { - $T[0][] = $oAdat['osztalyJel']; - } - - foreach ($ADAT['tanarAdat'] as $tanarId => $tAdat) { - // tanár neve, képesítései, összes óraszáma, kötelező óraszáma, besorolas - $elsoSor = count($T); - $sor = array($tAdat['tanarNev'], null, null, $tAdat['hetiKotelezoOraszam'], $tAdat['besorolas']); - if (is_array($ADAT['tanarKepesitesIds'])) { - $_kepesites = array(); - foreach ($ADAT['tanarKepesitesIds'][$tanarId] as $kepesitesId) $_kepesites[] = $ADAT['kepesitesAdat'][$kepesitesId]['kepesitesNev']; - $sor[1] = implode(', ', $_kepesites); - } - $T[] = $sor; - // tanár tárgyai és óraszámai - $sum = 0; - $utolsoTargyId = end((array_keys($ADAT['export'][$tanarId]))); - foreach ($ADAT['export'][$tanarId] as $targyId => $targyAdat) { - - $sor = array('', $ADAT['targyAdat'][$targyId]['targyNev'],0); - $resz = 0; - foreach ($ADAT['osztalyok'] as $oAdat) { - - if (($targyAdat[$oAdat['osztalyId']][1]+$targyAdat[$oAdat['osztalyId']][2])/2 != 0) - $sor[] = ($targyAdat[$oAdat['osztalyId']][1]+$targyAdat[$oAdat['osztalyId']][2])/2; - else $sor[] = null; - - $resz += ($targyAdat[$oAdat['osztalyId']][1]+$targyAdat[$oAdat['osztalyId']][2])/2; - } - $sor[2] = $resz; - $sum += $resz; - $T[] = $sor; - - } - $T[$elsoSor][2] = $sum; - } -//dump($T); - if ($ADAT['formatum'] == 'xml') return generateXLS("$file.${ADAT['formatum']}", $T, 'tantárgyFelosztás'); - elseif ($ADAT['formatum'] == 'csv') return generateCSV("$file.${ADAT['formatum']}", $T, 'tantárgyFelosztás'); - elseif ($ADAT['formatum'] == 'ods') return generateODS("$file.${ADAT['formatum']}", $T, 'tantárgyFelosztás'); - else return false; - - } - -?> \ No newline at end of file diff --git a/mayor-orig/www/include/modules/naplo/haladasi/elmaradas.php b/mayor-orig/www/include/modules/naplo/haladasi/elmaradas.php deleted file mode 100644 index e6db4268..00000000 --- a/mayor-orig/www/include/modules/naplo/haladasi/elmaradas.php +++ /dev/null @@ -1,27 +0,0 @@ -= CAST('"._HALADASI_HATARIDO."' AS DATE) - AND dt <= CAST('%s' AS DATE) GROUP BY ki"; - $ret['beirando'] = db_query($q, array( - 'fv' => 'getHaladasiElmaradas/#1', 'modul' => 'naplo', 'result' => 'assoc', 'keyfield' => 'ki', 'values' => array($elozoTanitasiNapDt) - )); - // Lezárt hiányzások száma - $q = "SELECT ki, COUNT(*) AS db FROM ".__TANEVDBNEV.".ora WHERE tipus NOT LIKE 'elmarad%' - AND (leiras = '' OR leiras IS NULL) - AND dt < CAST('"._HALADASI_HATARIDO."' AS DATE) - GROUP BY ki - ORDER BY db DESC"; - $ret['lezart'] = db_query($q, array('fv' => 'getHaladasiElmaradas/#2', 'modul' => 'naplo', 'result' => 'indexed')); - - return $ret; - } - -?> diff --git a/mayor-orig/www/include/modules/naplo/haladasi/elszamolas.php b/mayor-orig/www/include/modules/naplo/haladasi/elszamolas.php deleted file mode 100644 index 5490624a..00000000 --- a/mayor-orig/www/include/modules/naplo/haladasi/elszamolas.php +++ /dev/null @@ -1,44 +0,0 @@ - 'getElszamolas', 'modul' => 'naplo', 'result' => 'indexed', 'values' => $v)); - for ($i = 0; $i < count($ret); $i++) { - $A[ $ret[$i]['ki'] ][ $ret[$i]['tipus'] ] += intval($ret[$i]['db']); - $A['detailed'][ $ret[$i]['ki'] ][ $ret[$i]['tipus'] ][ $ret[$i]['munkaido'] ] = intval($ret[$i]['db']); - $A['detailed_ki_tipus_munkaido_eredet'][ $ret[$i]['ki'] ][ $ret[$i]['tipus'] ][ $ret[$i]['munkaido'] ][ $ret[$i]['eredet'] ] = intval($ret[$i]['db']); - } - // Tanárok heti óraszáma - $q = "SELECT tanarId, - COUNT(*)/( - SELECT COUNT(DISTINCT het) AS db FROM orarendiOra WHERE tolDt<=CURDATE() AND CURDATE()<=igDt - ) AS db - FROM orarendiOra WHERE tolDt <= CURDATE() AND CURDATE() <= igDt - GROUP BY tanarId"; - $ret = db_query($q, array('fv' => 'getElszamolas', 'modul' => 'naplo', 'result'=> 'indexed')); - for ($i = 0; $i < count($ret); $i++) $A[ $ret[$i]['tanarId'] ]['oraszam'] = $ret[$i]['db']; - - // Napok száma az adott időszak alatt - típusonként - $q = "SELECT munkatervId,tipus,COUNT(*) AS db FROM nap WHERE '%s'<=dt AND dt<='%s' GROUP BY munkatervId,tipus"; - $ret = db_query($q, array( - 'fv' => 'getElszamolas', 'modul' => 'naplo', 'result' => 'indexed', 'keyfield' => 'tipus', 'values' => mayor_array_join(array($tolDt, $igDt),$v) - )); - foreach ($ret as $tmp) { $A['napok'][ $tmp['munkatervId'] ][ $tmp['tipus'] ] = $tmp['db']; } - $A['munkaterv'] = getMunkatervek(array('result'=>'assoc', 'keyfield'=>'munkatervId')); - - return $A; - } - -?> diff --git a/mayor-orig/www/include/modules/naplo/haladasi/haladasi.php b/mayor-orig/www/include/modules/naplo/haladasi/haladasi.php deleted file mode 100644 index 391ef7c8..00000000 --- a/mayor-orig/www/include/modules/naplo/haladasi/haladasi.php +++ /dev/null @@ -1,155 +0,0 @@ - 'getOraszamByOraId')) : $olr; - - $q = "SELECT tankorId, dt, ora FROM ora WHERE oraId=%u"; - $r = db_query($q, array('fv' => 'getOraszamByOraId', 'modul' => 'naplo', 'result' => 'record', 'values' => array($oraId)), $lr); - - $tankorId = $r['tankorId']; - $dt = $r['dt']; - $ora = $r['ora']; - - if (defined('__ORASZAMOT_NOVELO_TIPUSOK')) { - $oraszamNoveloTipus = explode(',', __ORASZAMOT_NOVELO_TIPUSOK); - } else { - if (!in_array('info:missing_constant:__ORASZAMOT_NOVELO_TIPUSOK',$_SESSION['alert'])) $_SESSION['alert'][] = 'info:missing_constant:__ORASZAMOT_NOVELO_TIPUSOK'; - $oraszamNoveloTipus = array('normál', 'normál máskor', 'helyettesítés', 'összevonás'); - } - $q = "SELECT count(oraId) FROM ora - WHERE tankorId=%u - AND tipus IN ('".implode("','", array_fill(0, count($oraszamNoveloTipus), '%s'))."') - AND (dt<'%s' OR (dt='%s' AND ora<=%u))"; - $v = mayor_array_join(array($tankorId), $oraszamNoveloTipus, array($dt, $dt, $ora)); - $oraszam = db_query($q, array('fv' => 'getOraszamByOraId', 'modul' => 'naplo', 'result' => 'value', 'values' => $v), $lr); - - if ($olr == '') db_close($lr); - return $oraszam; - } - - function getHaladasi($Tankorok, $munkatervIds, $orderBy, $tanarId = '', $csakUres=false, $teremId=false) { - - $ret = array(); - - // Munkatervidk - if (!is_array($munkatervIds) || count($munkatervIds)==0) $munkatervIds = array(1); // a default - - // Az érintett tankörök id-inek listája - $tankorIds = $tankorAdat = array(); - if (is_array($Tankorok) && ($count = count($Tankorok)) > 0) { - $tankorFeltetel = 'tankorId IN (' . $Tankorok[0]['tankorId']; - $tankorIds[] = $Tankorok[0]['tankorId']; - $Tankorok[0]['tanar'] = getTankorTanaraiByInterval($Tankorok[0]['tankorId'], array('tanev' => __TANEV, 'tolDt' => _SHOW_DAYS_FROM, 'igDt' => _SHOW_DAYS_TO, 'result' => 'nevsor')); - $tankorAdat[$Tankorok[0]['tankorId']] = $Tankorok[0]; - for ($i = 1; $i < $count; $i++) { - $tankorFeltetel .= ', '.$Tankorok[$i]['tankorId']; - $tankorIds[] = $Tankorok[$i]['tankorId']; - $Tankorok[$i]['tanar'] = getTankorTanaraiByInterval($Tankorok[$i]['tankorId'], array('tanev' => __TANEV, 'tolDt' => _SHOW_DAYS_FROM, 'igDt' => _SHOW_DAYS_TO, 'result' => 'nevsor')); - $tankorAdat[$Tankorok[$i]['tankorId']] = $Tankorok[$i]; - } - $tankorFeltetel .= ')'; - } - elseif ($tanarId=='') return false; - // else return false; // Ha egy kollégának nincs rendszeres órája, tanköre, de helyettesít, akkor meg kell jelenjenek ezek az órái... (Bug #53) - - if ($teremId!==false && is_numeric($teremId)) { - $teremFeltetel = ' and teremId = '.$teremId; - } else - $teremFeltetel = ''; - - // Ha tanarId is van, akkor az általa helyettesített órák is kellenek - if ($tanarId != '') { - if (isset($tankorFeltetel)) $kiFeltetel = 'OR ki = '.$tanarId; - else $kiFeltetel = 'ki = '.$tanarId; - } - if (isset($tankorFeltetel) || isset($kiFeltetel)) $feltetel = "AND ($tankorFeltetel $kiFeltetel)"; - if (isset($csakUres) && $csakUres==true) $feltetel .= " AND (leiras='' OR leiras IS NULL) "; - - // Csatlakozás az adatbázishoz - $lr = db_connect('naplo', array('fv' => 'getHaladasi')); - $q = "SELECT oraId, dt, ora, ki, kit, tankorId, teremId, ora.leiras, tipus, eredet, csoportId, feladatTipusId, - getOraTolTime(oraId) AS tolTime, - getOraIgTime(oraId) AS igTime - FROM ora - LEFT JOIN tankorCsoport USING (tankorId) - LEFT JOIN ".__INTEZMENYDBNEV.".feladatTipus USING (feladatTipusId) - WHERE dt>='%s' AND dt<='%s' AND tipus NOT LIKE 'elmarad%%' - $feltetel $teremFeltetel - ORDER BY ".implode(',',$orderBy); - $v = array(_SHOW_DAYS_FROM, _SHOW_DAYS_TO); - $r = db_query($q, array('fv' => 'getHaladasi', 'modul' => 'naplo', 'result' => 'indexed', 'values' => $v), $lr); - - if ($r===false) { - db_close($lr); - return false; - } - foreach ($r as $i => $sor) { - // ha nincs a tankorok kozott a tankorId, akkor le kell kérdezni az adatait - if (!in_array($sor['tankorId'],$tankorIds)) { - $T = getTankorById($sor['tankorId'], __TANEV); - $tankorIds[] = $sor['tankorId']; - $tankorAdat[$sor['tankorId']] = $T[0]; - $Tankorok[$i]['tanar'] = getTankorTanaraiByInterval($sor['tankorId'], array('tanev' => __TANEV, 'tolDt' => _SHOW_DAYS_FROM, 'igDt' => _SHOW_DAYS_TO, 'result' => 'nevsor')); - } - $sor['kiCn'] = getTanarNevById($sor['ki'], $lr); - $sor['tankorNev'] = $tankorAdat[$sor['tankorId']]['tankorNev']; - $sor['tankorTipusId'] = $tankorAdat[$sor['tankorId']]['tankorTipusId']; - $sor['oraszam'] = getOraszamByOraId($sor['oraId'], $lr); - $sor['tanar'] = $tankorAdat[$sor['tankorId']]['tanar']; - // Az óracsoportokat is!!! - if (isset($sor['csoportId']) && $tanarId != '') { // Csak tanár nézet esetén lehet váltani!!! - if (!is_array($tankorAdat[$sor['tankorId']]['csoport'])) { - // Csoport adatok lekérdezése - // Ha minden oldalon le akarjuk kérdezi a csoportokat, akkor valahogy így... - // if ($sor['kit'] == '') $tanarId = $sor['ki']; - // else $tanarId = $sor['kit']; - $q = "SELECT DISTINCT tankorCsoport.tankorId AS tankorId, tankorNev - FROM tankorCsoport - LEFT JOIN ".__INTEZMENYDBNEV.".tankorSzemeszter USING (tankorId) - LEFT JOIN ".__INTEZMENYDBNEV.".tankorTanar USING (tankorId) - WHERE tanarId=%u AND csoportId=%u - AND beDt<='"._SHOW_DAYS_TO."' AND (kiDt IS NULL OR '"._SHOW_DAYS_FROM."'<=kiDt) - AND tanev=" . __TANEV; - $v = array($tanarId, $sor['csoportId']); - $r_cs = db_query($q, array('fv' => 'getHaladasi/csoport', 'modul' => 'naplo', 'result' => 'indexed', 'values' => $v), $lr); - if ($r_cs===false) { //!!!! nem jó simán a tagadás! - db_close($lr); - return false; - } - foreach ($r_cs as $key => $val) { - $tankorAdat[$sor['tankorId']]['csoport'][] = $val; - } - } - $sor['csoport'] = $tankorAdat[$sor['tankorId']]['csoport']; - } - $ret[$sor['dt']][] = $sor; - } - // Nap információk lekérdezése - $q = "SELECT dt,tipus,megjegyzes,orarendiHet FROM nap - WHERE dt>='%s' AND dt<='%s' AND munkatervId IN (".implode(',', $munkatervIds).")"; - $v = array(_SHOW_DAYS_FROM, _SHOW_DAYS_TO); - $ret['napok'] = db_query($q, array('fv' => 'getHaladasi', 'modul' => 'naplo', 'result' => 'multiassoc', 'keyfield' => 'dt', 'values' => $v), $lr); - if (!$ret['napok']) { - db_close($lr); - return false; - } - - // dolgozatok lekérdezése; - $ret['dolgozatok'] = getTankorDolgozatok($tankorIds,true,_SHOW_DAYS_FROM,_SHOW_DAYS_TO, $lr); - db_close($lr); - return $ret; - } - - function haladasiTeremModositas($oraId,$teremId,$lr) { - if (!is_numeric($oraId) || !is_numeric($teremId)) return false; - $lr = $olr=='' ? db_connect('naplo', array('fv' => 'haladasiTeremModositas')):$olr; - $q = "UPDATE ora SET teremId=%u WHERE oraId=%u"; - $v = array($teremId,$oraId); - $RESULT = db_query($q, array( 'fv' => 'haladasiTeremModositas','modul' => 'naplo', 'values' => $v), $lr); - if ($olr == '') db_close($lr); - return $RESULT; - } - -?> diff --git a/mayor-orig/www/include/modules/naplo/haladasi/helyettesites.php b/mayor-orig/www/include/modules/naplo/haladasi/helyettesites.php deleted file mode 100644 index 2fbbc4ac..00000000 --- a/mayor-orig/www/include/modules/naplo/haladasi/helyettesites.php +++ /dev/null @@ -1,945 +0,0 @@ - 'getHianyzok', 'modul' => 'naplo', 'result' => 'indexed', 'values' => array($dt)), $olr); - - foreach ($result as $key => $sor) { - // Ha a kit nem üres, akkor az az eredeti tanár, különben a ki (plusz óránál lehet) - if ($sor['kit'] != '') { - if (!in_array($sor['kit'], $hianyzok)) $hianyzok[] = $sor['kit']; - } elseif ($sor['ki'] != '' && !in_array($sor['ki'], $hianyzok)) { - $hianyzok[] = $sor['ki']; - } - } - - return $hianyzok; - - } - - - function getHianyzoOrak($dt = '', $olr = '') { - - - if($olr == '') $lr = db_connect('naplo'); - else $lr = $olr; - - // Kik érintettek az aktuális helyettesítésekben - $ORAK['helyettesites']['tanarIds'] = getHianyzok($dt, $lr); - - // Az érintettek óráinak adatai, kivéve a kötött munkaidő plusz óráit, hiszen azok nem számítanak. Nem számítanak? - if (count($ORAK['helyettesites']['tanarIds']) > 0) { - $q = "SELECT DISTINCT - oraId, dt, ora, ki, kit, tankorId, teremId, leiras, tipus, eredet, tankorNev, targyId,feladatTipusId,munkaido - FROM ora - LEFT JOIN ".__INTEZMENYDBNEV.".tankorSzemeszter USING (tankorId) - LEFT JOIN ".__INTEZMENYDBNEV.".tankor USING (tankorId) - LEFT JOIN ".__INTEZMENYDBNEV.".feladatTipus USING (feladatTipusId) - WHERE ( - ki IN (".implode(',', array_fill(0, count($ORAK['helyettesites']['tanarIds']),'%u')).") OR - kit IN (".implode(',', array_fill(0, count($ORAK['helyettesites']['tanarIds']), '%u')).") - ) - AND dt='%s' - AND (tanev=".__TANEV." OR feladatTipusId IS NOT NULL) - ORDER BY ora"; - $v = mayor_array_join($ORAK['helyettesites']['tanarIds'], $ORAK['helyettesites']['tanarIds'], array($dt)); - $result = db_query($q, array('fv' => 'getHianyzoOrak', 'modul' => 'naplo', 'result' => 'indexed', 'values' => $v), $lr); - if (!$result) { - if($olr == '') $lr = db_close($lr); - return false; - } - foreach ($result as $key => $sor) { - if ($sor['kit'] != '') { - $ORAK['helyettesites'][$sor['kit']]['orak'][] = $sor; - } - if (in_array($sor['ki'], $ORAK['helyettesites']['tanarIds'])) { - $ORAK['helyettesites'][$sor['ki']]['orak'][] = $sor; - } - } - } - - // Tanárnevek lekérése - $TANAR_NEVSOR = getTanarok(array('tanev' => __TANEV,'beDt'=>$dt,'kiDt'=>$dt), $lr); - for ($i = 0; $i < count($TANAR_NEVSOR); $i++) { - $ORAK['tanarok']['tanarIds'][] = $TANAR_NEVSOR[$i]['tanarId']; - $ORAK['tanarok'][$TANAR_NEVSOR[$i]['tanarId']] = array('tanarNev' => $TANAR_NEVSOR[$i]['tanarNev']); - } - // Az adott napon ki melyik órákban tanít, első, utolsó, db - $q = "SELECT ki, ora FROM ora - WHERE dt = '%s' AND ki != '' - ORDER BY ki, ora"; - $r = db_query($q, array('fv' => 'getHianyzoOrak', 'modul' => 'naplo', 'result' => 'indexed', 'values' => array($dt)), $lr); - foreach ($r as $key => $val) { - $ki = $val['ki']; $ora = $val['ora']; - if (!is_array($ORAK['tanarok']['foglaltak'][$ora]) // gyűjtjük, hogy kik tanítanak az adott órában - || !in_array($ki, $ORAK['tanarok']['foglaltak'][$ora]) - ) $ORAK['tanarok']['foglaltak'][$ora][] = $ki; - $ORAK['tanarok'][$ki]['orak'][$ora] = true; - $ORAK['tanarok'][$ki]['db']++; - if ( - !isset($ORAK['tanarok'][$ki]['elso ora']) or - $ORAK['tanarok'][$ki]['elso ora'] > $ora - ) $ORAK['tanarok'][$ki]['elso ora'] = $ora; - if ($ORAK['tanarok'][$ki]['utolso ora'] < $ora) $ORAK['tanarok'][$ki]['utolso ora'] = $ora; - } - - // Milyen tárgyat és mely osztályokban tanít az adott tanévben! (TANAR_NEVSOR tömbből válogassuk hozzá a tanáridket) - $q = "SELECT tanarId,targyId FROM ".__INTEZMENYDBNEV.".mkTanar - LEFT JOIN ".__INTEZMENYDBNEV.".targy USING (mkId) - WHERE mkTanar.tanarId IN (".implode(',', array_fill(0, count($ORAK['tanarok']['tanarIds']), '%u')).")"; - $r = db_query($q, array('fv' => 'getHianyzoOrak', 'modul' => 'naplo', 'result' => 'indexed', 'values' => $ORAK['tanarok']['tanarIds']), $lr); - if (count($r)>0) foreach ($r as $key => $val) { - $tanarId = $val['tanarId']; $targyId = $val['targyId']; - $ORAK['tanarok'][$tanarId]['targyak'][$targyId] = true; - } - // Egészítsük ki a képesítése szerint is! (2011, 2015) - $q = "SELECT tanarId,targyId FROM ".__INTEZMENYDBNEV.".tanarKepesites LEFT JOIN ".__INTEZMENYDBNEV.".kepesitesTargy USING (kepesitesId) ". - "WHERE tanarId IN (".implode(',', array_fill(0, count($ORAK['tanarok']['tanarIds']), '%u')).")"; - $r = db_query($q, array('fv' => 'getHianyzoOrak', 'modul' => 'naplo', 'result' => 'indexed', 'values' => $ORAK['tanarok']['tanarIds']), $lr); - if (count($r)>0) foreach ($r as $key => $val) { - $tanarId = $val['tanarId']; - $targyId = $val['targyId']; - $ORAK['tanarok'][$tanarId]['targyak'][$targyId] = true; - } - - // Az összevonó/foglalt tanárok - for ($i = 0; $i < count($ORAK['helyettesites']['tanarIds']);$i++) { - - $tanarId = $ORAK['helyettesites']['tanarIds'][$i]; - $tanarOrak = $ORAK['helyettesites'][$tanarId]['orak']; - - for ($j = 0; $j < count($tanarOrak); $j++) { - - $ora = $tanarOrak[$j]['ora']; - $Foglaltak = $ORAK['tanarok']['foglaltak'][$ora]; - // Ha a tanár szakos, akkor összevonhat. - // Itt most egyelőre annyit kérdezünk le, hogy ugyanabban az időben ki tanít - for ($f = 0; $f < count($Foglaltak); $f++) { - if ($Foglaltak[$f] != $tanarId) { - if ($ORAK['tanarok'][$Foglaltak[$f]]['targyak'][$tanarOrak[$j]['targyId']]) - $ORAK['helyettesites'][$tanarId]['orak'][$j]['osszevono'][] = $Foglaltak[$f]; - else - $ORAK['helyettesites'][$tanarId]['orak'][$j]['foglalt'][] = $Foglaltak[$f]; - } - } // Adott óra öszzevonói/foglaltjai - } // Adott tanár órái - } // A helyettesítésben érintett tanárok - $q = "SELECT ki, ora FROM ora - WHERE dt = '%s' AND ki != '' AND feladatTipusId IS NOT NULL - ORDER BY ki, ora"; - $r = db_query($q, array('fv' => 'getHianyzoOrak', 'modul' => 'naplo', 'result' => 'indexed', 'values' => array($dt)), $lr); - for ($i=0; $i'assoc')); - - if($olr=='') $lr = db_close($lr); - return $ORAK; - } - - function ujHianyzokFelvetele($ujHianyzok, $dt, $olr = '') { - - - if (count($ujHianyzok) > 0) { - - if ($olr == '') $lr = db_connect('naplo'); - else $lr = $olr; - - $where = "ki IN (".implode(',', array_fill(0, count($ujHianyzok), '%u')).")"; - $v = $ujHianyzok; - - // Ha visszamenőleg állítunk elmaradtra egy órát, akkor kezelni kell a hozzá tartozó bejegyzéseket - if (strtotime($dt) < time()) { - // Az elmaradó órák id-inek lekérdezése - $q = "SELECT oraId FROM ora - WHERE dt='%s' - AND ki IN (".implode(',', array_fill(0, count($ujHianyzok), '%u')).") - AND ( - tipus='normál' OR - tipus='helyettesítés' OR - tipus='felügyelet' OR - tipus='összevonás' - )"; - $v = mayor_array_join(array($dt), $ujHianyzok); - $oraIds = db_query($q, array('fv' => 'ujHianyzokFelvetele', 'modul' => 'naplo', 'result' => 'idonly', 'values' => $v), $lr); - - if (is_array($oraIds) && count($oraIds) > 0) { // Ha van elmaradt óra - $where_id = "oraId IN (".implode(',', array_fill(0, count($oraIds), '%u')).")"; - - // Az elmaradt órákhoz tartozó hiányztások, késések, felszerelés hiányok, egyenruha hiányok törlése! - $q = "SELECT hianyzasId FROM hianyzas WHERE oraId IN (".implode(',', array_fill(0, count($oraIds), '%u')).")"; - $hIds = db_query($q, array('fv' => 'ujHianyzokFelvetele', 'modul' => 'naplo', 'result' => 'idonly', 'values' => $oraIds), $lr); - if (count($hIds) > 0) { - logAction( - array( - 'tabla' => 'hianyzas', - 'szoveg'=> "hiányzó tanár - óraelmaradás: $where_id, hianyzasId IN (".implode(',', array_fill(0, count($hIds), '%u')).")", - 'values' => mayor_array_join($oraIds, $hIds) - ), - $lr - ); - $q = "DELETE FROM hianyzas WHERE oraId IN (".implode(',', array_fill(0, count($oraIds), '%u')).")"; - $r = db_query($q, array('fv' => 'ujHianyzokFelvetele', 'modul' => 'naplo', 'values' => $oraIds), $lr); - } - // Az elmaradt órákhoz rendelt jegyek hozzárendelésének törlése - $q = "UPDATE jegy SET oraId=NULL WHERE oraId IN (".implode(',', array_fill(0, count($oraIds), '%u')).")"; - $r = db_query($q, array('fv' => 'ujHianyzokFelvetele', 'modul' => 'naplo', 'values' => $oraIds), $lr); - } - } - - $v = mayor_array_join(array($dt), $ujHianyzok); - // Normál órái elmaradnak - $q = "UPDATE ora - SET kit=ki, ki=NULL, tipus='elmarad', modositasDt=NOW() - WHERE dt='%s' - AND tipus='normál' - AND ki IN (".implode(',', array_fill(0, count($ujHianyzok), '%u')).")"; - $r = db_query($q, array('fv' => 'ujHianyzokFelvetele', 'modul' => 'naplo', 'values' => $v), $lr); - - // Helyettesített, felügyelt, összevont órái elmaradnak - $q = "UPDATE ora SET ki=NULL,tipus='elmarad', modositasDt=NOW() - WHERE dt='%s' - AND ( - tipus='helyettesítés' OR - tipus='felügyelet' OR - tipus='összevonás' - ) - AND ki IN (".implode(',', array_fill(0, count($ujHianyzok), '%u')).")"; - $r = db_query($q, array('fv' => 'ujHianyzokFelvetele', 'modul' => 'naplo', 'values' => $v), $lr); - - // Elmaradnak-e a rögzített feladatai? ?????????????? - - if ($olr == '') db_close($lr); - } - } - - function toroltHianyzokVisszaallitasa($toroltHianyzok, $dt, $olr='') { - - - if (count($toroltHianyzok) > 0) { - - if ($olr == '') $lr = db_connect('naplo'); - else $lr = $olr; - - // Cserék visszaállítása - $q_cs = "SELECT oraId FROM ora WHERE tipus like '%%máskor' - AND ( - ki IN (".implode(',', array_fill(0, count($toroltHianyzok), '%u')).") - OR kit IN (".implode(',', array_fill(0, count($toroltHianyzok), '%u')).") - ) AND dt = '%s'"; - $v_cs = mayor_array_join($toroltHianyzok, $toroltHianyzok, array($dt)); - $r_cs = db_query($q_cs, array('fv' => 'ujHianyzokFelvetele', 'modul' => 'naplo', 'result' => 'idonly', 'values' => $v_cs), $lr); - foreach ($r_cs as $key => $vissza_id) { - csereVisszaallitas($vissza_id, $lr); - } - - // A nem hiáynzók helyettesített, összevont, elmaradt, felügyelt óráinak visszaállítása - // 2013. Itt vissza kell állítanunk munkaido-t 'lekötött'-re. Mi történik ugyanakkor, ha - // a visszaállított óra már nem fér bele... Ugye... Sajnos - $q_v = "UPDATE ora SET ki=kit, kit=NULL, tipus='normál', munkaido='lekötött', modositasDt=NOW() - WHERE tipus IN ('helyettesítés','felügyelet','összevonás','elmarad') - AND dt='%s' AND kit IN (".implode(',', array_fill(0, count($toroltHianyzok), '%u')).")"; - $v_v = mayor_array_join(array($dt), $toroltHianyzok); - $r_v = db_query($q_v, array('fv' => 'toroltHianyzokVisszaallitasa', 'modul' => 'naplo', 'values' => $v_v), $lr); - - if ($olr == '') db_close($lr); - } - } - - function csereVisszaallitas($oraId, $olr = '') { - - - if ($olr == '') $lr = db_connect('naplo'); - else $lr = $olr; - - // A csere csereId-jének lekérdezése - $q = "SELECT DISTINCT csereId - FROM csereAlapOra LEFT JOIN cserePluszOra USING (csereId) - WHERE csereAlapOra.oraId=%u OR cserePluszOra.oraId=%u"; - $v = array($oraId, $oraId); - $r = db_query($q, array('fv' => 'csereVisszaallitas', 'modul' => 'naplo', 'result' => 'idonly', 'values' => $v), $lr); - if (!$r) { - if ($olr == '') db_close($lr); - return false; - } - if (($num = count($r)) != 1) { - $_SESSION['alert'][] = 'message:wrong_data:csereVisszaallitas:Nincs csere?:'.$num; - if ($olr == '') db_close($lr); - return false; // Lehet ilyen? - } - $csereId = $r[0]; - - // A cserében résztvevő órák id-jének lekérdezése - $q = "SELECT csereAlapOra.oraId AS alap, cserePluszOra.oraId AS plusz - FROM cserePluszOra LEFT JOIN csereAlapOra USING (csereId) - WHERE csereId=%u"; - $r = db_query($q, array('fv' => 'csereVisszaallitas', 'modul' => 'naplo', 'result' => 'indexed', 'values' => array($csereId)), $lr); - if (!$r) { - if ($olr == '') db_close($lr); - return false; - } - $Alap = $Plusz = array(); - for ($i = 0; $i < count($r); $i++) { - $alap = $r[$i]['alap']; $plusz = $r[$i]['plusz']; - if (!in_array($alap, $Alap)) $Alap[] = $alap; - if (!in_array($plusz, $Plusz)) $Plusz[] = $plusz; - } - - // az eredeti órák 'elmarad máskor'-ról 'elmarad'-ra állítása - $q = "UPDATE ora SET tipus='elmarad',modositasDt=NOW() WHERE oraId IN (".implode(',', array_fill(0, count($Alap), '%u')).")"; - $r = db_query($q, array('fv' => 'csereVisszaallitas', 'modul' => 'naplo', 'values' => $Alap), $lr); - if (!$r) { - if ($olr == '') db_close($lr); - return false; - } - - // a csere-bejegyzés törlése - $q = "DELETE FROM csere WHERE csereId=%u"; - $r = db_query($q, array('fv' => 'csereVisszaallitas', 'modul' => 'naplo', 'values' => array($csereId)), $lr); - if (!$r) { - if ($olr == '') db_close($lr); - return false; - } - - // Az órákhoz rendelt hiányzások és jegyhozzárendelések törlése (csak plusz lehet érintett!) - hianyzasEsJegyHozzarendelesTorles($Plusz, $lr); - - // a plusz órák törlése - $q = "DELETE FROM ora WHERE oraId IN (".implode(',', array_fill(0, count($Plusz), '%u')).")"; - $r = db_query($q, array('fv' => 'csereVisszaallitas', 'modul' => 'naplo', 'values' => $Plusz), $lr); - if (!$r) { - if ($olr == '') db_close($lr); - return false; - } - - if ($olr == '') db_close($lr); - return true; - - } - - - function cmp($a,$b) { - if ($a['súly'] == $b['súly']) return 0; - return ($a['súly'] > $b['súly']) ? -1 : 1; - } - - - function ujOra($ORA, $olr = null) { - // alapértelmezésben munkaido='lekötött' - if ($ORA['ki'] == '') $ORA['ki'] = 'NULL'; - if ($ORA['kit'] == '') $ORA['kit'] = 'NULL'; - if ($ORA['teremId'] == '') $ORA['teremId'] = 'NULL'; - $q = "INSERT INTO ora (ki,kit,dt,ora,tankorId,teremId,leiras,tipus,eredet,modositasDt) VALUES (%s, %s, '%s', %u, %u, %s, '%s', '%s', '%s',NOW())"; - $v = array($ORA['ki'], $ORA['kit'], $ORA['dt'], $ORA['ora'], $ORA['tankorId'], $ORA['teremId'], $ORA['leiras'], $ORA['tipus'], $ORA['eredet']); - return db_query($q, array('fv' => 'ujOra', 'modul' => 'naplo', 'result' => 'insert', 'values' => $v), $olr); - } - - function oraMozgatas($oraId, $dt, $ora, $olr = '') { - - - if ($olr == '') $lr = db_connect('naplo', array('fv' => 'oraMozgatas')); - else $lr = $olr; - - $oraAdat = getOraAdatById($oraId, __TANEV, $lr); - - if ($oraAdat['tipus'] == 'elmarad máskor') { - $_SESSION['alert'][] = 'message:wrong_data:oraMozgatas:már mozgatott óra:'.$oraId; - if ($olr == '') db_close($lr); - return false; - } - - if (isset($oraAdat['kit']) && $oraAdat['kit'] != '') $tanarId = $oraAdat['kit']; - else $tanarId = $oraAdat['ki']; - $tankorId = $oraAdat['tankorId']; - $teremId = $oraAdat['teremId']; - - checkNaplo($dt); - - // A tanár nem foglalt-e az adott időpontban - if (!tanarLukasOrajaE($tanarId, $dt, $ora, $lr)) { - $_SESSION['alert'][] = 'message:haladasi_utkozes:'."mozgat/tanár ütközés/$dt:$ora"; - if ($olr == '') db_close($lr); - return false; - } - - // diák ütközés - if (!tankorTagokLukasOrajaE($tankorId, $dt, $ora)) { - $_SESSION['alert'][] = 'message:haladasi_utkozes:'."mozgat/diák ütközés/$dt:$ora"; - if ($olr == '') db_close($lr); - return false; - } - - // terem ellenőrzés - $Termek = getSzabadTermek(array('dt' => $dt, 'ora' => $ora), $lr); - for ($i = 0;($i < count($Termek) && $Termek[$i]['teremId'] != $teremId); $i++); - if ($i >= count($Termek)) { - $_SESSION['alert'][] = 'message:haladasi_utkozes:Foglalt terem:'.$teremId; - $teremUtkozes = true; - } - - // érintett hiányzások, késések, felszerelés hiányok, egyenruha hiányok, jegyHozzárendelések törlése! - if (strtotime($dt) < time()) hianyzasEsJegyHozzarendelesTorles($oraId, $lr); - - if ($oraAdat['eredet'] == 'órarend') { - - // ha órarendi óra, akkor elmarad máskor - plusz óra felvétel - if (isset($oraAdat['kit']) && $oraAdat['kit'] != '') { - // kit nem üres, ki törölhető - $q = "UPDATE ora SET tipus='elmarad máskor',ki=NULL,modositasDt=NOW() WHERE oraId=%u"; - $oraAdat['ki'] = $tanarId; - $oraAdat['kit'] = ''; - } else { - // normál óra, akkor a ki --> kit... - $q = "UPDATE ora SET tipus='elmarad máskor',kit=ki,ki=NULL,modositasDt=NOW() WHERE oraId=%u"; - } - $r = db_query($q, array('fv' => 'oraMozgatas', 'modul' => 'naplo', 'values' => array($oraAdat['oraId'])), $lr); - if (!$r) { - if ($olr == '') db_close($lr); - return false; - } - - // A felveendő plusz óra - $oraAdat['tipus']='normál máskor'; - $oraAdat['eredet']='plusz'; - $oraAdat['dt'] = $dt; - $oraAdat['ora'] = $ora; - if ($teremUtkozes) $oraAdat['teremId'] = 'NULL'; - - if ($pluszId = ujOra($oraAdat, $lr)) { - - // órarendi óra mozgatásánál a csere táblába is fel kell venni... - $error = ''; - db_start_trans($lr); - - $q = "INSERT INTO csere VALUES ('')"; - $csereId = db_query($q, array('fv' => 'oraMozgatas', 'modul' => 'naplo', 'result' => 'insert', 'rollback' => true), $lr); - if (!$csereId) { if ($olr == '') db_close($lr); return false; } - - $q = "INSERT INTO csereAlapOra (csereId, oraId) VALUES (%u, %u)"; - $r = db_query($q, array('fv' => 'oraMozgatas', 'modul' => 'naplo', 'values' => array($csereId, $oraId), 'rollback' => true), $lr); - if (!$r) { if ($olr == '') db_close($lr); return false; } - - $q = "INSERT INTO cserePluszOra (csereId, oraId) VALUES (%u, %u)"; - $r = db_query($q, array('fv' => 'oraMozgatas', 'modul' => 'naplo', 'values' => array($csereId, $pluszId), 'rollback' => true), $lr); - if (!$r) { if ($olr == '') db_close($lr); return false; } - - db_commit($lr); - - } - } else { - - // plusz óra egyszerűen módosítandó... - if ($teremUtkozes) $q = "UPDATE ora SET tipus='normál máskor',ki=%u, kit=NULL, dt='%s', ora='%u', teremId=NULL, modositasDt=NOW() WHERE oraId=%u"; - else $q = "UPDATE ora SET tipus='normál máskor',ki=%u, kit=NULL, dt='%s', ora='%u', modositasDt=NOW() WHERE oraId=%u"; - $v = array($tanarId, $dt, $ora, $oraId); - $r = db_query($q, array('fv' => 'oraMozgatas', 'modul' => 'naplo', 'values' => $v), $lr); - if (!$r) { if ($olr == '') db_close($lr); return false; } - - } // órarendi vagy plusz óra - - if ($olr == '') db_close($lr); - return true; - - } - - function getCsereOraiByOraId($oraId) { - - - $lr = db_connect('naplo', array('fv' => 'getCsereOraiByOraId')); - - $q = "SELECT DISTINCT csereId FROM csereAlapOra LEFT JOIN cserePluszOra USING (csereId) - WHERE csereAlapOra.oraId=%u OR cserePluszOra.oraId=%u"; - $v = array($oraId, $oraId); - $arrayCsereId = db_query($q , array('fv' => 'getCsereOraiByOraId', 'modul' => 'naplo', 'result' => 'idonly', 'values' => $v), $lr); - if (!is_array($arrayCsereId) || ($num = count($arrayCsereId)) != 1) { - $_SESSION['alert'][] = 'message:wrong_data:getCsereOraiByOraId:Nincs csere?:'.$num.'/'.$oraId; - db_close($lr); return false; - } - $csereId = $arrayCsereId[0]; - - $q = "SELECT DISTINCT oraId, dt, ora, ki, kit, tankorId, tipus, eredet, tankorNev - FROM csereAlapOra LEFT JOIN ora USING (oraId) - LEFT JOIN ".__INTEZMENYDBNEV.".tankorSzemeszter USING (tankorId) - WHERE csereId=%u AND tanev=".__TANEV." ORDER BY dt, ora"; - $ret['alap'] = db_query($q, array( - 'fv' => 'getCsereOraiByOraId', 'modul' => 'naplo', 'result' => 'multiassoc', 'keyfield' => 'tankorId', 'values' => array($csereId) - ), $lr); - - $q = "SELECT DISTINCT oraId, dt, ora, ki, kit, tankorId, tipus, eredet, tankorNev - FROM cserePluszOra LEFT JOIN ora USING (oraId) - LEFT JOIN ".__INTEZMENYDBNEV.".tankorSzemeszter USING (tankorId) - WHERE csereId=%u AND tanev=".__TANEV." ORDER BY dt, ora"; - $ret['plusz'] = db_query($q, array( - 'fv' => 'getCsereOraiByOraId', 'modul' => 'naplo', 'result' => 'multiassoc', 'keyfield' => 'tankorId', 'values' => array($csereId) - ), $lr); - - db_close($lr); - return $ret; - - } - - function oraCsere($oraId1, $oraId2, $olr = '') { - - - if ($olr == '') $lr = db_connect('naplo'); - else $lr = $olr; - - $csereOraAdat1 = $oraAdat1 = getOraAdatById($oraId1, __TANEV, $lr); - $csereOraAdat2 = $oraAdat2 = getOraAdatById($oraId2, __TANEV, $lr); - - if ($oraAdat1['tipus'] == 'elmarad máskor' || $oraAdat2['tipus'] == 'elmarad máskor') { - $_SESSION['alert'][] = 'message:wrong_data:oraCsere:már mozgatott óra:'.$oraId1.'/'.$oraId2; - if ($olr == '') db_close($lr); - return false; - } - - if (isset($oraAdat1['kit']) && $oraAdat1['kit'] != '') $tanarId1 = $oraAdat1['kit']; - else $tanarId1 = $oraAdat1['ki']; - - if (isset($oraAdat2['kit']) && $oraAdat2['kit'] != '') $tanarId2 = $oraAdat2['kit']; - else $tanarId2 = $oraAdat2['ki']; - - if ($tanarId1 != $tanarId2) { - // Ha nem saját magával cserél, akkor a tanár nem foglalt-e az adott időpontban - if (!tanarLukasOrajaE($tanarId1, $oraAdat2['dt'], $oraAdat2['ora'], $lr)) { - $_SESSION['alert'][] = 'message:haladasi_utkozes:'."oraCsere/tanár ütközés #1 (".$oraId1.'):'.$oraAdat2['dt'].':'.$oraAdat2['ora']; - if ($olr == '') db_close($lr); - return false; - } - if (!tanarLukasOrajaE($tanarId2, $oraAdat1['dt'], $oraAdat1['ora'], $lr)) { - $_SESSION['alert'][] = 'message:haladasi_utkozes:'."oraCsere/tanár ütközés #2 (".$oraId2.'):'.$oraAdat1['dt'].':'.$oraAdat1['ora']; - if ($olr == '') db_close($lr); - return false; - } - } - - // diák ütközés - if (!tankorTagokLukasOrajaE($oraAdat1['tankorId'], $oraAdat2['dt'], $oraAdat2['ora'], $oraAdat2['tankorId'])) { - if ($olr == '') db_close($lr); - return false; - } - if (!tankorTagokLukasOrajaE($oraAdat2['tankorId'], $oraAdat1['dt'], $oraAdat1['ora'], $oraAdat1['tankorId'])) { - if ($olr == '') db_close($lr); - return false; - } - - // terem ellenőrzés nincs: Termeket nem cserélünk!! - - // érintett hiányzások, késések, felszerelés hiányok, egyenruha hiányok, jegyHozzárendelések törlése! - if (strtotime($oraAdat1['dt']) < time()) hianyzasEsJegyHozzarendelesTorles($oraId1, $lr); - if (strtotime($oraAdat2['dt']) < time()) hianyzasEsJegyHozzarendelesTorles($oraId2, $lr); - - // 1. óra mozgatása - if ($oraAdat1['eredet'] == 'órarend') { - - $q = "UPDATE ora SET tipus='elmarad máskor', kit=%u, ki=NULL, modositasDt=NOW() WHERE oraId=%u"; - if (!db_query($q, array('fv' => 'oraCsere', 'modul' => 'naplo', 'values' => array($tanarId1, $oraAdat1['oraId'])), $lr)) { - if ($olr == '') db_close($lr); - return false; - } - - // A felveendő plusz óra - $csereOraAdat1['ki'] = $tanarId1; - $csereOraAdat1['kit'] = 'NULL'; - $csereOraAdat1['tipus']='normál máskor'; - $csereOraAdat1['eredet']='plusz'; - $csereOraAdat1['dt'] = $oraAdat2['dt']; - $csereOraAdat1['ora'] = $oraAdat2['ora']; - $csereOraAdat1['teremId'] = $oraAdat2['teremId']; - - $pluszId1 = ujOra($csereOraAdat1, $lr); - - // A csere táblába bejegyezzük a mozgatást - if ($pluszId1) { - - db_start_trans($lr); - - $q = "INSERT INTO csere VALUES ('')"; - $csereId1 = db_query($q, array('fv' => 'oraCsere', 'modul' => 'naplo', 'result' => 'insert', 'rollback' => true), $lr); - if (!$csereId1) { if ($olr == '') db_close($lr); return false; } - - $q = "INSERT INTO csereAlapOra (csereId, oraId) VALUES (%u, %u)"; - $r = db_query($q, array('fv' => 'oraCsere', 'modul' => 'naplo', 'values' => array($csereId1, $oraId1), 'rollback' => true), $lr); - if (!$r) { if ($olr == '') db_close($lr); return false; } - - $q = "INSERT INTO cserePluszOra (csereId, oraId) VALUES (%u, %u)"; - $r = db_query($q, array('fv' => 'oraCsere', 'modul' => 'naplo', 'values' => array($csereId1, $pluszId1), 'rollback' => true), $lr); - if (!$r) { if ($olr == '') db_close($lr); return false; } - - db_commit($lr); - } - - } else { - - // plusz óra egyszerűen módosítandó... - $q = "UPDATE ora SET tipus='normál máskor', ki=%u, kit=NULL, dt='%s', ora=%u, teremId=%u, modositasDt=NOW() WHERE oraId=%u"; - $r = db_query($q, array( - 'fv' => 'oraCsere', 'modul' => 'naplo', 'values' => array($tanarId1, $oraAdat2['dt'], $oraAdat2['ora'], $oraAdat2['teremId'], $oraId1) - ), $lr); - if (!$r) { if ($olr == '') db_close($lr); return false; } - - // A plusz óra beletartozik-e valamelyik cserébe (elvileg csak egybe tartozhat) - $q = "SELECT csereId FROM cserePluszOra WHERE oraId=%u"; - $csereId1 = db_query($q, array('fv' => 'oraCsere', 'modul' => 'naplo', 'result' => 'value', 'values' => array($oraId1)), $lr); - - } // 1. óra: órarendi vagy plusz óra - - // 2. óra mozgatsa - if ($oraAdat2['eredet'] == 'órarend') { - - // ha órarendi óra, akkor elmarad máskor - plusz óra felvétel - $q = "UPDATE ora SET tipus='elmarad máskor', kit=%u, ki=NULL, modositasDt=NOW() WHERE oraId=%u"; - $r = db_query($q, array('fv' => 'oraCsere', 'modul' => 'naplo', 'values' => array($tanarId2, $oraAdat2['oraId'])), $lr); - if (!r) { if ($olr == '') db_close($lr); return false; } - - // A felveendő plusz óra - $csereOraAdat2['ki'] = $tanarId2; - $csereOraAdat2['kit'] = 'NULL'; - $csereOraAdat2['tipus']='normál máskor'; - $csereOraAdat2['eredet']='plusz'; - $csereOraAdat2['dt'] = $oraAdat1['dt']; - $csereOraAdat2['ora'] = $oraAdat1['ora']; - $csereOraAdat2['teremId'] = $oraAdat1['teremId']; - - $pluszId2 = ujOra($csereOraAdat2, $lr); - // A csere táblába bejegyezzük a mozgatást - if ($pluszId2) { - - db_start_trans($lr); - - $q = "INSERT INTO csere VALUES ('')"; - $csereId2 = db_query($q, array('fv' => 'oraCsere', 'modul' => 'naplo', 'result' => 'insert', 'rollback' => true), $lr); - if (!$csereId2) { if ($olr == '') db_close($lr); return false; } - - $q = "INSERT INTO csereAlapOra (csereId, oraId) VALUES (%u, %u)"; - $r = db_query($q, array('fv' => 'oraCsere', 'modul' => 'naplo', 'values' => array($csereId2, $oraId2), 'rollback' => true), $lr); - if (!$r) { if ($olr == '') db_close($lr); return false; } - - $q = "INSERT INTO cserePluszOra (csereId, oraId) VALUES (%u, %u)"; - $r = db_query($q, array('fv' => 'oraCsere', 'modul' => 'naplo', 'values' => array($csereId2, $pluszId2), 'rollback' => true), $lr); - if (!$r) { if ($olr == '') db_close($lr); return false; } - - db_commit($lr); - } - - } else { - - // plusz óra egyszerűen módosítandó... - $q = "UPDATE ora SET tipus='normál máskor', ki=%u , kit=NULL, dt='%s', ora=%u, teremId=%u, modositasDt=NOW() WHERE oraId=%u"; - $r = db_query($q, array( - 'fv' => 'oraCsere', 'modul' => 'naplo', 'values' => array($tanarId2, $oraAdat1['dt'], $oraAdat1['ora'], $oraAdat1['teremId'], $oraId2) - ), $lr); - if (!$r) { if ($olr == '') db_close($lr); return false; } - - // A plusz óra beletartozik-e valamelyik cserébe - $q = "SELECT csereId FROM cserePluszOra WHERE oraId=%u"; - $csereId2 = db_query($q, array('fv' => 'oraCsere', 'modul' => 'naplo', 'result' => 'value', 'values' => array($oraId2)), $lr); - - } // 2. óra: órarendi vagy plusz óra - - // Egy cserévé tesszük... - - if (isset($csereId1) && isset($csereId2) && $csereId1 != $csereId2) { - - db_start_trans($lr); - - // A cserélt órák két különböző cserébe tartoznak --> egyesítjük a két cserét - $q = "UPDATE csereAlapOra SET csereId=%u WHERE csereId=%u"; - $r = db_query($q, array('fv' => 'oraCsere', 'modul' => 'naplo', 'values' => array($csereId1, $csereId2), 'rollback' => true), $lr); - if (!$r) { if ($olr == '') db_close($lr); return false; } - - $q = "UPDATE cserePluszOra SET csereId=%u WHERE csereId=%u"; - $r = db_query($q, array('fv' => 'oraCsere', 'modul' => 'naplo', 'values' => array($csereId1, $csereId2), 'rollback' => true), $lr); - if (!$r) { if ($olr == '') db_close($lr); return false; } - - $q = "DELETE FROM csere WHERE csereId=%u"; - $r = db_query($q, array('fv' => 'oraCsere', 'modul' => 'naplo', 'values' => array($csereId2), 'rollback' => true), $lr); - if (!$r) { if ($olr == '') db_close($lr); return false; } - - db_commit($lr); - - } elseif (isset($csereId1) && !isset($csereId2)) { - - // Csak az első óra van cserében --> a másodikat is (ami plusz óra) bele kell rakni - $q = "INSERT INTO cserePluszOra (csereId, oraId) VALUES (%u, %u)"; - $r = db_query($q, array('fv' => 'oraCsere', 'modul' => 'naplo', 'values' => array($csereId1, $oraId2), 'rollback' => true), $lr); - if (!$r) { if ($olr == '') db_close($lr); return false; } - - } elseif (!isset($csereId1) && isset($csereId2)) { - // Csak a második óra van cserében --> az elsőt is (ami plusz óra) bele kell rakni - $q = "INSERT INTO cserePluszOra (csereId, oraId) VALUES (%u, %u)"; - $r = db_query($q, array('fv' => 'oraCsere', 'modul' => 'naplo', 'values' => array($csereId2, $oraId1), 'rollback' => true), $lr); - if (!$r) { if ($olr == '') db_close($lr); return false; } - - } elseif (!isset($csereId1) && !isset($csereId2)) { - // Egyik sincs cserében --> Azaz két plusz óra --> nem vesszük fel őket cserének - // Ezért ez nem is csere --> a típusok nem normál máskor, hanem normál - $q = "UPDATE ora SET tipus='normál', modositasDt=NOW() WHERE oraId IN (%u, %u)"; - $r = db_query($q, array('fv' => 'oraCsere', 'modul' => 'naplo', 'values' => array($oraId1, $oraId2), 'rollback' => true), $lr); - if (!$r) { if ($olr == '') db_close($lr); return false; } - - } - - if ($olr == '') db_close($lr); - return true; - - } - - function tanarTankortTanithatE($tanarId, $tankorId, $olr = '') { - - - if ($olr != '') $lr = $olr; - else $lr = db_connect('naplo'); - - // Beletartozik-e a megadott tanár a tankör munkaközösségébe? - $q = "SELECT COUNT(tanarId) - FROM ".__INTEZMENYDBNEV.".tankor - LEFT JOIN ".__INTEZMENYDBNEV.".targy USING (targyId) - LEFT JOIN ".__INTEZMENYDBNEV.".mkTanar USING (mkId) - WHERE tankorId=%u AND tanarId=%u"; - $num = db_query($q, array( - 'fv' => 'tanarTankortTanithatE', 'modul' => 'naplo_intezmeny', 'result' => 'value', 'values' => array($tankorId, $tanarId) - )); - if ($num != 1) $_SESSION['alert'][] = 'message:wrong_data:keziBeallitas/tanarTankortTanithatE:Nem szakos:(tanarId/tankorId) - '.$tanarId.'/'.$tankorId; - - if ($olr == '') db_close($lr); - return ($num == 1); - - } - - - function keziBeallitas($oraId, $ki, $tipus, $teremId) { - - global $dt; - - $lr = db_connect('naplo', array('fv' => 'keziBeallitas')); - - $oraAdat = getOraAdatById($oraId, __TANEV, $lr); - $dt = $oraAdat['dt']; - if ($ki != $oraAdat['ki'] || $tipus != $oraAdat['tipus'] || $teremId != $oraAdat['teremId']) { - $ok = true; - // új tanár, vagy típus - ütközés ellenőrzése - if ($ki != $oraAdat['ki'] || $tipus != $oraAdat['tipus']) { - $q = "SELECT COUNT(*) FROM ora - WHERE dt='%s' AND ora=%u AND oraId!=%u AND ki=%u AND tipus NOT LIKE 'elmarad%%'"; - $_db = db_query($q, array( - 'fv' => 'keziBeallitas', 'modul' => 'naplo', 'result' => 'value', 'values' => array($oraAdat['dt'], $oraAdat['ora'], $oraId, $ki) - ), $lr); - if ($_db == 0) { - if ($tipus == 'összevonás') { - $_SESSION['alert'][] = 'message:wrong_data:keziBeallitas:Egy órát nem lehet összevonni'; - $ok = false; - } elseif ($tipus == 'helyettesítés') { - // Beletartozik-e a megadott tanár a tankör munkaközösségébe? - $ok = tanarTankortTanithatE($ki, $oraAdat['tankorId'], $lr); - } - } else { - if ($tipus != 'összevonás') { - $_SESSION['alert'][] = "message:haladasi_utkozes:keziBeallitas:Már van órája!:$ki"; - $ok = false; - } else { - // Beletartozik-e a megadott tanár a tankör munkaközösségébe? - $ok = tanarTankortTanithatE($ki, $oraAdat['tankorId'], $lr); - } - } - } - // Terem változtatás - szabad-e a terem? vagy nincs megadva - if ($teremId != $oraAdat['teremId'] && $teremId!='NULL') { - // Szabad-e a terem? - a saját maga által használt terem nem foglalt! (összevonáshoz így kell) - $Termek = getSzabadTermek(array('dt' => $OraAdat['dt'], 'ora' => $oraAdat['ora'], 'ki' => $ki), $lr); - for ($i = 0;($i < count($Termek) && $Termek[$i]['teremId'] != $teremId); $i++); - if ($i >= count($Termek)) { - $_SESSION['alert'][] = 'message:haladasi_utkozes:keziBeallitas:Foglalt terem:'.$teremId; - $ok = false; - } - } - // Módosítás - if ($ok && $tipus != 'elmarad') { - if (substr($oraAdat['tipus'], 0, 7) == 'normál') { - if ($tipus == $oraAdat['tipus'] || $ki == $oraAdat['ki']) { - // Vagy mindkettő változik, vagy egyik se - $q = "UPDATE ora SET teremId=%u, modositasDt=NOW() WHERE oraId=%u"; - $v = array($teremId, $oraId); - } else { // ki --> kit (csak helyettesítés, felügyelet, vagy összevonás lehet az új típus!! - $q = "UPDATE ora SET kit=ki, ki=%u, tipus='%s', teremId=%u, modositasDt=NOW() WHERE oraId=%u"; - $v = array($ki, $tipus, $teremId, $oraId); - } - } else { // kit nem változik - $q = "UPDATE ora SET ki=%u, tipus='%s', teremId=%u, modositasDt=NOW() WHERE oraId=%u"; - $v = array($ki, $tipus, $teremId, $oraId); - } - $r = db_query($q, array('fv' => 'keziBeallitas', 'modul' => 'naplo', 'values' => $v), $lr); - if ($r) $_SESSION['alert'][] = 'info:change_success:keziBeallitas'; - } else { - $_SESSION['alert'][] = 'info:do_nothing:keziBeallitas:Nem történt módosítás'; - } - } - - db_close($lr); - - } - - function ujHelyettes2($oraAdat, $ki, $tipus, $olr = null) { - $oraId = $oraAdat['oraId']; - $dt = $oraAdat['dt']; - if (is_null($ki) || $ki!=0) { - - // a helyettesített óra milyen munkaidőbe számolódik vajon? - // 1. összevonás = ??? (ezt nem vesszük figyelembe, ezért tökmindegy) - // 2. felügyelet = ez bizony egyértelműen a fennmaradó - // 3. helyettesítés = lekötött HA (26-on belül van az elmúlt 5 napos lekötött VAGY még a 28-on belül van, de érvényesek a feltételek 2-6-30) - // fennmaradó EGYÉBKÉNT. - - // ez már le van kérdezve, de a tranzakció miatt sajnos újra kell: - $TERHELES = getOraTerhelesStatByTanarId(array('tanarId'=>array($ki),'dt'=>$dt), $olr); - - if ($tipus=='összevonás') $_munkaido = 'lekötött'; - elseif ($tipus=='felügyelet') $_munkaido = 'fennmaradó'; - elseif ($tipus=='helyettesítés') { - if ($TERHELES[$ki]['munkaido']['lekotott']>$TERHELES[$ki]['lekotott']['heti']) { - $_lekotheto = true; - } elseif ($TERHELES[$ki]['over']['napi']<2 && $TERHELES[$ki]['over']['heti']<6) { - $_lekotheto =false; - } else { - $_lekotheto=false; - $_SESSION['alert'][] = 'info:OVERTIME'; // időközben túllépte valahogy - } - if ($_lekotheto===true) $_munkaido = 'lekötött'; else $_munkaido='fennmaradó'; - } else { - $_munkaido='lekötött'; //tipus??? - } - - if ($_munkaido=='') - $q = "UPDATE ora SET ki=%u,tipus='%s', modositasDt=NOW() WHERE oraId=%u"; - else - $q = "UPDATE ora SET ki=%u,tipus='%s',munkaido='".$_munkaido."', modositasDt=NOW() WHERE oraId=%u"; - - return db_query($q, array('fv' => 'ujHelyettes', 'modul' => 'naplo', 'values' => array($ki, $tipus, $oraId)), $olr); - } else { - $_SESSION['alert'][] = '::Nem sikerült beállítani az új helyettest!:oraId-'.$oraId.':ki-'.$ki.':tipus-'.$tipus; - return false; - } - - } - - function eredetiOraVissza($oraId, $eredet, $olr = null) { - - - if ($olr == '') $lr = db_connect('naplo', array('fv' => 'eredetiOraVissza')); - else $lr = $olr; - - if ($eredet == 'plusz') { - $q_csere = "SELECT COUNT(csereId) FROM cserePluszOra WHERE oraId=%u"; - $num = db_query($q_csere, array('fv' => 'eredetiOraVissza', 'modul' => 'naplo', 'result' => 'value', 'values' => array($oraId)), $lr); - } - if (($eredet == 'órarend') || ($num == 0)) - $q = "UPDATE ora SET ki=kit,kit=NULL,tipus='normál',munkaido='lekötött',modositasDt=NOW() WHERE oraId=%u"; - else - $q = "UPDATE ora SET ki=kit,kit=NULL,tipus='normál máskor',munkaido='lekötött',modositasDt=NOW() WHERE oraId=%u"; - $r = db_query($q, array('fv' => 'eredetiOraVissza', 'modul' => 'naplo', 'values' => array($oraId)), $lr); - - if ($olr == '') db_close($lr); - } - - function helyettesitesRogzites($T) { - - - $lr = db_connect('naplo'); - - for ($i = 0; $i < count($T); $i++) { - - if ($T[$i] == '') continue; // ha eredeti maradt, ne módosítson! - $teremUtkozes = false; - list($ki, $oraId, $tipus) = explode('/',$T[$i]); - $oraAdat = getOraAdatById($oraId); - if ($tipus == 'normál') { - if ($oraAdat['kit'] != '') $ki = $oraAdat['kit']; - else $ki = $oraAdat['ki']; - } - $regi_tipus = $oraAdat['tipus']; - - // A csere miatt elmaradt óra változásakor, illetve - // a csere miatt felvett óra visszaállításakor a cserét meg kell szüntetni - if (($regi_tipus == 'normál máskor' && $tipus == '') || ($regi_tipus == 'elmarad máskor')) { - csereVisszaallitas($oraId, $lr); - if ( - $tipus == '' // csere/mozgatás visszaállítás - || ($regi_tipus == 'elmarad máskor' && $tipus == 'elmarad') // mozgatott óra elmarad - ) continue; - } - - // Elmaradó óra esetén a hiányzások, késések, felszerelés hiányok, egyenruha hiányok, jegy hozzárendelések törlendők! - // Ezek bekerült az oraElmarad függvénybe - if ($tipus=='töröl' && $oraAdat['tipus']=='egyéb') { // az egyéb típusú óra gond nélkül törölhető, nincs hozzá semmi - oraElmarad($oraId, $lr); // használjuk ugyanazt a függvényt - } elseif (substr($tipus,0,7) == 'elmarad') { - oraElmarad($oraId, $lr); - } else { - // Ha egy órát "mégis" megtartunk, akkor ellenőrizni kell, hogy nem ütközik-e valamivel!! (esetleg felvett plusz órával, mozgatott órával) - // Tanár ellenőrzése - if (tanarLukasOrajaE($ki, $oraAdat['dt'], $oraAdat['ora'], $lr)) { - if ($tipus == 'összevonás') { - $_SESSION['alert'][] = 'message:wrong_data:helyettesitesRogzites:nincs mivel összevonni:'.$oraId; - continue; - } - } else { - if ($tipus != 'összevonás') { - $_SESSION['alert'][] = 'message:haladasi_utkozes:helyettesitesRogzites:'.$oraId; - continue; - } - } - if (substr($regi_tipus,0,7) == 'elmarad') { - // Tankör tagok ellenőrzése - if (getTankorJelenletKotelezoE($oraAdat['tankorId']) && !tankorTagokLukasOrajaE($oraAdat['tankorId'], $oraAdat['dt'], $oraAdat['ora'])) { - $_SESSION['alert'][] = 'message:wrong_data:A mégis megtartott óra ütközne!:oraId='.$oraId.', dt='.$oraAdat['dt'].', ora='.$oraAdat['ora']; - continue; - } - } - - // A helyettesítés rögzítése - if (mb_substr($tipus,0,6,'UTF-8') == 'normál') { - if (mb_substr($regi_tipus,0,6,'UTF-8') != 'normál') eredetiOraVissza($oraId, $oraAdat['eredet'], $lr); - } else { - if (mb_substr($regi_tipus,0,6,'UTF-8') == 'normál') { - // óraelmaradás itt már nem lehet! - masTartja($oraId, $ki, $tipus, $lr); - } else { - // Ebbe NEM értjük bele a helyettesítés --> elmarad váltást - // de beleértjük az elmarad --> helyettesítés váltást - //ujHelyettes($oraId, $ki, $tipus, $lr); - ujHelyettes2($oraAdat, $ki, $tipus, $lr); - } - } - - } // elmarad / nem marad el - - - // Ha összevonásról nem összevonásra állítunk, akkor kialakulhatott terem ütközés! - if ( - $oraAdat['teremId'] != '' - && substr($tipus,0,7) != 'elmarad' - && ($regi_tipus == 'összevonás' || substr($regi_tipus,0,7) == 'elmarad') - ) { - $Termek = getSzabadTermek(array('dt' => $oraAdat['dt'], 'ora' => $oraAdat['ora'], 'ki' => $ki), $lr); - for ($j = 0; ($j < count($Termek) && $Termek[$j]['teremId'] != $oraAdat['teremId']); $j++); - if ($j >= count($Termek)) { - $_SESSION['alert'][] = 'message:haladasi_utkozes:hianyzasRogzites:a terem foglalt:'.$oraAdat['teremId']; - $q = "UPDATE ".__TANEVDBNEV.".ora SET teremId=NULL WHERE oraId=%u"; - db_query($q, array('fv' => 'hianyzasRogzites', 'modul' => 'naplo', 'values' => array($oraId)), $lr); - } - } - } // for - - db_close($lr); - - } - - -?> diff --git a/mayor-orig/www/include/modules/naplo/haladasi/oralatogatas.php b/mayor-orig/www/include/modules/naplo/haladasi/oralatogatas.php deleted file mode 100644 index 4364fc36..00000000 --- a/mayor-orig/www/include/modules/naplo/haladasi/oralatogatas.php +++ /dev/null @@ -1,30 +0,0 @@ - 'oralatogatasBeiras', 'modul' => 'naplo', 'result' => 'insert', 'values' => $v)); - - if ($oralatogatasId === false) return false; - - // régi tanárhozzárendelések törlése - $q = "DELETE FROM oraLatogatasTanar WHERE oraLatogatasId=%u"; - db_query($q, array('fv' => 'oralatogatasBeiras', 'modul' => 'naplo', 'values' => array($oralatogatasId))); - - // új tanárhozzárendelések felvétele - ha van tanárhozzárendelés - if (is_array($ADAT['tanarIds']) && count($ADAT['tanarIds']) > 0) { - $q = "INSERT INTO oraLatogatasTanar (oraLatogatasId,tanarId) VALUES ".implode(',', array_fill(0, count($ADAT['tanarIds']), "($oralatogatasId, %u)")); - return db_query($q, array('fv' => 'oralatogatasBeiras', 'modul' => 'naplo', 'values' => $ADAT['tanarIds'])); - } - return true; - } - - function oralatogatasTorles($oraId) { - $q = "DELETE FROM oraLatogatas WHERE oraId=%u"; - $v = array($oraId); - return db_query($q, array('fv' => 'oralatogatasTorles', 'modul' => 'naplo', 'result' => '', 'values' => $v)); - } - -?> diff --git a/mayor-orig/www/include/modules/naplo/haladasi/osszevonas.php b/mayor-orig/www/include/modules/naplo/haladasi/osszevonas.php deleted file mode 100644 index af80ce98..00000000 --- a/mayor-orig/www/include/modules/naplo/haladasi/osszevonas.php +++ /dev/null @@ -1,38 +0,0 @@ - null, 'ora' => null)) { - - if (!is_array($DIAKIDK) || count($DIAKIDK) == 0) return false; - - $dt = readVariable($SET['dt'], 'datetime', date('Y-m-d')); - $ora = readVariable($SET['ora'], 'numeric unsigned', 1); - - $q = "SELECT DISTINCT a.tankorId, a.oraId FROM ora AS a LEFT JOIN ".__INTEZMENYDBNEV.".tankorDiak AS b - ON (a.tankorId = b.tankorId AND b.beDt<='%s' AND ('%s'<=b.kiDt OR b.kiDt IS NULL)) - WHERE b.diakId IN (".implode(',', array_fill(0, count($DIAKIDK), '%u')).") AND a.dt='%s' AND a.ora=%u - GROUP BY b.diakId HAVING COUNT(a.oraId)>0"; - $v = mayor_array_join(array($dt, $dt), $DIAKIDK, array($dt, $ora)); - return db_query($q, array('fv' => 'getOrakByDiakIdk', 'modul' => 'naplo', 'result' => 'indexed', 'values' => $v)); - - } - - function oraFelvetele($dt, $ora, $tanarId, $tankorId, $teremId = 'NULL', $tipus = 'normál', $eredet = 'plusz') { - - // ------------------------------------ - // ITT NEM ellenőrizzük a tanár terhelését! - // ------------------------------------ - - if (!isset($teremId) || $teremId == '' || intval($teremId) == 0) { - $q = "INSERT INTO ora (dt,ora,ki,tankorId,teremId,tipus,eredet) - VALUES ('%s', %u, %u, %u, NULL, '%s', '%s')"; - $v = array($dt, $ora, $tanarId, $tankorId, $tipus, $eredet); - } else { - $q = "INSERT INTO ora (dt,ora,ki,tankorId,teremId,tipus,eredet) - VALUES ('%s', %u, %u, %u, %u, '%s', '%s')"; - $v = array($dt, $ora, $tanarId, $tankorId, $teremId, $tipus, $eredet); - } - return db_query($q, array('fv' => 'oraFelvetele', 'modul' => 'naplo', 'values' => $v)); - - } - -?> diff --git a/mayor-orig/www/include/modules/naplo/haladasi/pluszora.php b/mayor-orig/www/include/modules/naplo/haladasi/pluszora.php deleted file mode 100644 index 0112181a..00000000 --- a/mayor-orig/www/include/modules/naplo/haladasi/pluszora.php +++ /dev/null @@ -1,55 +0,0 @@ - 'oraFelvetele', 'modul' => 'naplo', 'values' => $v), $lr); - - } - - function getSzabadTankorok($dt, $ora) { - - // Összes tankör - $ret = $osszesTankorIds = getTankorByTanev($tanev = __TANEV, array('result' => 'idonly')); - // Az adott időpontban foglalt tankörök - $q = "SELECT tankorId FROM ora WHERE dt='%s' AND ora=%u AND tipus IN ('normál','normál máskor','helyettesítés','felügyelet','összevonás')"; - $v = array($dt, $ora); - $tankorIds = db_query($q, array('fv' => 'getSzabadTankorok', 'modul' => 'naplo', 'result' => 'idonly', 'values' => $v)); - if (is_array($tankorIds) && count($tankorIds) > 0) { - // A tankörök tagjai - $q = "SELECT DISTINCT diakId FROM ".__INTEZMENYDBNEV.".tankorDiak - WHERE tankorId IN (".implode(',', array_fill(0, count($tankorIds), '%u')).") - AND (kiDt>='%s' OR kiDt is null) AND beDt<='%s' ORDER BY diakId"; - $v = mayor_array_join($tankorIds, array($dt, $dt)); - $diakIds = db_query($q, array('fv' => 'getSzabadTankorok', 'modul' => 'naplo', 'result' => 'idonly', 'values' => $v)); - // A foglalt diákok tankörei - $foglaltTankorIds = getTankorIdsByDiakIds($diakIds, array('tanev'=>__TANEV,'tolDt'=>$dt,'igDt'=>$dt, 'felmentettekkel'=>false)); - if (!is_array($foglaltTankorIds)) $foglaltTankorIds = $tankorIds; - $ret = array_diff($osszesTankorIds, $foglaltTankorIds); - } - - /* és vegyük hozzá a szabadon felvehető tanköröket, hm? */ - $pluszNemKotelezoTankorok = getTankorByTanev($tanev, array('result'=>'idonly','jelenlet'=>'nem kötelező' )); - $ret = mayor_array_join($ret,$pluszNemKotelezoTankorok); - if (is_array($ret) && count($ret)>0) { - $q = "SELECT DISTINCT tankor.tankorId,tankorNev - FROM ".__INTEZMENYDBNEV.".tankor LEFT JOIN ".__INTEZMENYDBNEV.".tankorSzemeszter USING (tankorId) - WHERE tanev=".__TANEV." AND tankorId IN (".implode(',', array_fill(0, count($ret), '%u')).") ORDER BY tankorNev"; - return db_query($q, array('fv' => 'getSzabadTankorok', 'modul' => 'naplo', 'result' => 'indexed', 'values' => $ret)); - } else { - return $ret; - } - - } - -?> diff --git a/mayor-orig/www/include/modules/naplo/haladasi/specialis.php b/mayor-orig/www/include/modules/naplo/haladasi/specialis.php deleted file mode 100644 index 8c78d49d..00000000 --- a/mayor-orig/www/include/modules/naplo/haladasi/specialis.php +++ /dev/null @@ -1,167 +0,0 @@ - 'napiOrakTorlese')); - - $q = "DELETE FROM ora WHERE dt='%s'"; - $r = db_query($q, array('fv' => 'napiOrakTorlese', 'modul' => 'naplo', 'values' => array($dt)), $lr); - if (!$r) { - db_close($lr); - return false; - } - - if ($tipus !== '') { - $q = "UPDATE nap SET tipus='%s' WHERE dt='%s'"; - $r = db_query($q, array('fv' => 'napiOrakTorlese', 'modul' => 'naplo', 'values' => array($tipus, $dt)), $lr); - // ?? Mi van, ha szünetről tanítási nap-ra állítjuk? Marad a 0. órarendi hét? ?? - } - db_close($lr); - return $r; - - } - - function orakBetoltese($dt, $orarendiHet) { - - - $lr = db_connect('naplo', array('fv' => 'orakBetoltese')); - - // Ellenőrizzük, hogy van-e már betöltve óra az adott napra - $q = "SELECT COUNT(oraId) FROM ora WHERE dt='%s'"; - $num = db_query($q, array('fv' => 'orakBetoltese', 'modul' => 'naplo', 'values' => array($dt), 'result'=>'value'), $lr); - if ($num === false) { - db_close($lr); - return false; - } - if ($num > 0) { - $_SESSION['alert'][] = 'message:wrong_data:orakBetoltese:van már betöltve óra az adott napon:'.$dt; - db_close($lr); - return false; - } - - // Ha az órarendi órákat töltjük be, akkor a nap csak tanítási nap típusú lehet - $q = "UPDATE nap SET tipus='tanítási nap',orarendiHet=%u WHERE dt='%s'"; - $r = db_query($q, array('fv' => 'orakBetoltese', 'modul' => 'naplo', 'values' => array($orarendiHet, $dt)), $lr); - if (!$r) { - db_close($lr); - return false; - } - - // Órák betöltése - checkNaplo($dt, $lr); - db_close($lr); - return true; - - } - - function specialisNap($dt, $celOra, $het, $nap, $ora, $olr = null) { - - if ($olr == '') $lr = db_connect('naplo', array('fv' => 'specialisNap')); - else $lr = $olr; - db_start_trans($lr); - - // A (speciális) tanítási napokhoz rendelt osztályok - $q = "SELECT osztalyId FROM nap LEFT JOIN munkatervOsztaly USING (munkatervId) WHERE dt='%s' - AND tipus IN ('tanítási nap','speciális tanítási nap') AND osztalyId IS NOT NULL"; // null akkor lehet, ha nincs hozzárendelve egyetlen osztály sem egy munkatervhez... - $v = array($dt); - $osztalyIds = db_query($q, array('fv' => 'specialisNap/osztalyIds', 'modul' => 'naplo', 'result' => 'idonly', 'values' => $v), $lr); - if (!is_array($osztalyIds) || count($osztalyIds) == 0) { - db_rollback($lr, 'specialisNap/#1'); - if ($olr == '') db_close($lr); - return false; - } - - // Érintett tankörök - $q = "SELECT DISTINCT tankorId FROM ".__INTEZMENYDBNEV.".tankorOsztaly WHERE osztalyId IN (".implode(',',$osztalyIds).")"; - $tankorIds = db_query($q, array('fv'=>'specialisNap/tankorIds', 'modul'=>'naplo', 'result'=>'idonly'), $lr); - if (!is_array($tankorIds) || count($tankorIds) == 0) { - db_rollback($lr, 'specialisNap/#2'); - if ($olr == '') db_close($lr); - return false; - } - - // Órák betöltése sávonként - $ok = true; - for ($i = 0; $i < count($celOra); $i++) { - if ($het[$i] != '' and $nap[$i] != '' and $ora[$i] != '') { - - $napszam = date('w',strtotime($nap[$i])); - if ($napszam == 0) $napszam = 7; - - $q = "INSERT INTO ora (dt,ora,ki,tankorId,teremId,tipus,eredet) - SELECT '%s', %u, orarendiOra.tanarId,orarendiOraTankor.tankorId,teremId,'normál','órarend' - FROM orarendiOra LEFT JOIN orarendiOraTankor USING (tanarId, osztalyJel, targyJel) - WHERE orarendiOraTankor.tankorId IS NOT NULL - AND tankorId IN (".implode(',', $tankorIds).") - AND het=%u - AND nap=%u - AND ora=%u - AND tolDt<='%s' - AND (igDt IS NULL OR igDt>='%s')"; - $v = array($dt, $celOra[$i], $het[$i], $nap[$i], $ora[$i], $dt, $dt); - $r = db_query($q, array('fv' => 'specialisNap', 'modul' => 'naplo', 'values' => $v), $lr); - if (!$r) $ok = false; - - } // minden adat megvan - } // end for - if (!$ok) { - db_rollback($lr, 'specialisNap/#3'); - if ($olr == '') db_close($lr); - return false; - } - - // speciális tanítási nap-ra állítjuk a tanítási napokat - $q = "UPDATE nap SET tipus='speciális tanítási nap',orarendiHet=0 WHERE dt='%s' AND tipus='tanítási nap'"; - $r = db_query($q, array('fv' => 'specialisNap', 'modul' => 'naplo', 'values' => array($dt)), $lr); - if (!$r) { - db_rollback($lr, 'specialisNap/#4'); - if ($olr == '') db_close($lr); - return false; - } - - db_commit($lr); - if ($olr == '') db_close($lr); - return true; - } - - function getSzabadOrak($dt) { - - $q = "SELECT DISTINCT ora FROM ora - WHERE dt='%s' AND tipus NOT LIKE 'elmarad%%'"; - $foglaltOrak = db_query($q, array('fv' => 'getSzabadOrak', 'modul' => 'naplo', 'result' => 'idonly', 'values' => array($dt))); - if (is_array($foglaltOrak)) { - $szabadOrak = array(); - for ($i = getMinOra(); $i <= getMaxOra(); $i++) { - if (!in_array($i, $foglaltOrak)) $szabadOrak[] = $i; - } - } - - return $szabadOrak; - - } - - function orakTorlese($dt, $Orak) { - - - $lr = db_connect('naplo', array('fv' => 'orakTorlese')); - - $q = "DELETE FROM ora WHERE dt='%s' AND ora IN (".implode(',', array_fill(0, count($Orak), '%u')).")"; - array_unshift($Orak, $dt); - $r = db_query($q, array('fv' => 'orakTorlese', 'modul' => 'naplo', 'values' => $Orak), $lr); - if (!$r) { - db_close($lr); - return false; - } - - $q = "UPDATE nap SET tipus='speciális tanítási nap', orarendiHet=0 WHERE dt='%s'"; - $r = db_query($q, array('fv' => 'orakTorlese', 'modul' => 'naplo', 'values' => array($dt)), $lr); - db_close($lr); - return $r; - } - - -?> diff --git a/mayor-orig/www/include/modules/naplo/haladasi/stat.php b/mayor-orig/www/include/modules/naplo/haladasi/stat.php deleted file mode 100644 index 45d1d9de..00000000 --- a/mayor-orig/www/include/modules/naplo/haladasi/stat.php +++ /dev/null @@ -1,103 +0,0 @@ - 'munkatervTankor', 'modul'=>'naplo', 'result'=>'keyvalues','values'=>$tankorIds)); - } - - function tankorMunkaterv($tankorIds) { - - $q = "SELECT DISTINCT tankorId, munkatervId FROM munkatervOsztaly LEFT JOIN ".__INTEZMENYDBNEV.".tankorOsztaly USING (osztalyId) - WHERE tankorId IN (".implode(',', array_fill(0, count($tankorIds), '%u')).") ORDER BY tankorId, munkatervId"; - return db_query($q, array('fv' => 'tankorMunkaterv', 'modul'=>'naplo', 'result'=>'keyvalues','values'=>$tankorIds)); - } -*/ - function getTankorStat($tankorIds, $dt = '') { - - global $_TANEV; - - if ($dt == '') $dt = date('Y-m-d'); - $szDb = count($_TANEV['szemeszter']); - $ret = array(); - - // Van-e nem végzős tanuló az adott tankörökben --> a tankör végzős-e - $ret['vegzos'] = tankorokVegzosekE($tankorIds, __TANEV, array('tagokAlapjan' => true, 'tolDt' => null, 'igDt' => null)); - - // tervezett óraszámok lekérdezése - $q = "SELECT szemeszter, tankorId, tankorNev, oraszam FROM ".__INTEZMENYDBNEV.".tankorSzemeszter - WHERE tanev=".__TANEV." AND tankorId IN (".implode(',', array_fill(0, count($tankorIds), '%u')).") - ORDER BY tankorId, szemeszter"; - $ret['tervezett'] = db_query($q, array( - 'fv' => 'getTankorStat', 'modul' => 'naplo_intezmeny', 'result' => 'multiassoc', 'keyfield' => 'tankorId', 'values' => $tankorIds - )); - foreach ($ret['tervezett'] as $tankorId => $tankorAdat) { - $ret['tanitasiHetekSzama'][$tankorId] = getTanitasiHetekSzama(array('tankorId'=>$tankorId,'vegzos'=>$ret['vegzos'][$tankorId])); - $oraszam = 0; - for ($i = 0; $i < count($tankorAdat); $i++) { - $oraszam += $tankorAdat[$i]['oraszam']; - } - $ret['tervezett'][$tankorId]['hetiOraszam'] = $oraszam / $szDb; - $ret['tervezett'][$tankorId]['evesOraszam'] = $oraszam / $szDb * $ret['tanitasiHetekSzama'][$tankorId]; - } - - // megtartott órák száma - if (defined('__ORASZAMOT_NOVELO_TIPUSOK')) { - $oraszamNoveloTipus = explode(',', __ORASZAMOT_NOVELO_TIPUSOK); - } else { - $_SESSION['alert'][] = 'info:missing_constant:__ORASZAMOT_NOVELO_TIPUSOK'; - $oraszamNoveloTipus = array('normál', 'normál máskor', 'helyettesítés', 'összevonás'); - } - $q = "SELECT tankorId, COUNT(oraId) AS oraSzam FROM ora - WHERE tankorId IN (".implode(',', array_fill(0, count($tankorIds), '%u')).") - AND tipus IN ('".implode("','", array_fill(0, count($oraszamNoveloTipus), '%s'))."') - AND dt <= '%s' GROUP BY tankorId"; - $v = mayor_array_join($tankorIds, $oraszamNoveloTipus, array($dt)); - $ret['megtartott'] = db_query($q, array( - 'fv' => 'getTankorStat', 'modul' => 'naplo', 'result' => 'assoc', 'keyfield' => 'tankorId', 'values' => $v - )); - - if (is_array($tankorIds) && count($tankorIds)>0) { - - $q = "SELECT tankorId,COUNT(DISTINCT dt, ora) AS oraSzam - FROM (nap LEFT JOIN munkatervOsztaly USING (munkatervId)) - LEFT JOIN ( - orarendiOra - LEFT JOIN orarendiOraTankor USING (tanarId,osztalyJel,targyJel) - LEFT JOIN ".__INTEZMENYDBNEV.".tankorOsztaly USING (tankorId) - ) - ON (((DAYOFWEEK(dt)+5) MOD 7)+1 = orarendiOra.nap) - AND orarendiOra.het=nap.orarendiHet - AND orarendiOra.tolDt<=dt AND orarendiOra.igDt>=dt - AND munkatervOsztaly.osztalyId = tankorOsztaly.osztalyId - WHERE tanarId IS NOT NULL - AND tankorId IN (".implode(',', array_fill(0, count($tankorIds), '%u')).") - AND dt > '%s' - GROUP BY tankorId"; - $v = mayor_array_join($tankorIds, array($dt)); - $ret['becsult'] = db_query($q, array( - 'fv' => 'getTankorStat/becsült', 'modul' => 'naplo', 'result' => 'assoc', 'keyfield' => 'tankorId', 'values' => $v - )); - - // beírt érdemjegyek száma - $q = "SELECT tankorId, COUNT(jegy) AS jegyDb FROM jegy WHERE tankorId IN (".implode(',', array_fill(0, count($tankorIds), '%u')).") - AND dt <= '%s' GROUP BY tankorId"; - $v = $tankorIds; array_push($v, $dt); - $ret['jegyekSzama'] = db_query($q, array( - 'fv' => 'getTankorStat/jegyekSzama', 'modul' => 'naplo', 'result' => 'keyvaluepair', 'values' => $v - )); - // tankörlétszámok... - array_push($v, $dt); - $q = "SELECT tankorId, COUNT(*) AS db FROM tankorDiak WHERE tankorId IN (".implode(',', array_fill(0, count($tankorIds), '%u')).") - AND beDt <= '%s' AND (kiDt IS NULL OR '%s' <= kiDt) GROUP BY tankorId"; - $ret['letszam'] = db_query($q, array( - 'fv' => 'getTankorStat/letszam', 'modul' => 'naplo_intezmeny', 'result' => 'keyvaluepair', 'values' => $v - )); - } - - return $ret; - } - -?> diff --git a/mayor-orig/www/include/modules/naplo/haladasi/teremModositas.php b/mayor-orig/www/include/modules/naplo/haladasi/teremModositas.php deleted file mode 100644 index 1f104649..00000000 --- a/mayor-orig/www/include/modules/naplo/haladasi/teremModositas.php +++ /dev/null @@ -1,30 +0,0 @@ - 'getOraIdByPattern', 'modul' => 'naplo', 'result' => 'indexed', 'values' => $v, 'debug'=>false )); - if (count($r)!==1) - return false; - else - return $r[0]['oraId']; - return false; - } - - function checkHaladasiSzabadTerem($dt,$ora,$teremId,$lr) { - $v = array($dt,$ora,$teremId); - $q = "SELECT count(*) as db FROM `ora` WHERE `dt`='%s' AND `ora`=%u AND `teremId`=%u AND tipus!='elmarad' AND tipus!='elmarad máskor'"; - return (db_query($q, array( 'fv' => 'checkHaladasiSzabadTerem', 'modul' => 'naplo', 'result'=>'value','values' => $v), $lr) === "0"); - } - - function haladasiTeremModositas($oraId,$teremId,$lr) { - if (!is_numeric($oraId) || !is_numeric($teremId)) return false; - $v = array($teremId,$oraId); - $q = "UPDATE ora SET teremId=%u WHERE oraId=%u"; - return db_query($q, array( 'fv' => 'haladasiTeremModositas', - 'modul' => 'naplo', 'values' => $v), $lr); - } - -?> diff --git a/mayor-orig/www/include/modules/naplo/hianyzas/diak.php b/mayor-orig/www/include/modules/naplo/hianyzas/diak.php deleted file mode 100644 index a98a0ef0..00000000 --- a/mayor-orig/www/include/modules/naplo/hianyzas/diak.php +++ /dev/null @@ -1,119 +0,0 @@ -'hiányzás','statusz'=>'igazolatlan', 'igazolas'=>'')) { - global $napiMinOra, $napiMaxOra; - - $q = "SELECT * FROM hianyzas WHERE diakId=%u AND dt='%s'"; - $RES = db_query($q, array('fv' => 'napiHianyzasBeiras', 'modul' => 'naplo', 'result' => 'indexed', 'values' => array($diakId, $dt))); - - $T = $diakTANKOROK = getTankorByDiakId($diakId, __TANEV, array('csakId' => true, 'tolDt' => $dt, 'igDt' => $dt, 'result'=>'csakid')); - - $tmpOrak = getOrak($T,array('tolDt'=>$dt,'igDt'=>$dt,'csakId'=>false)); - $diakORAK = $tmpOrak['orak']; - - if (!is_array($diakORAK)) { - $_SESSION['alert'][] = ':nincs_oraja:'; - return false; - } - foreach ($diakORAK[$dt] as $_ora=>$ORA) { - $_diakFmTankorIdk = getTankorDiakFelmentes($diakId, __TANEV, array('csakId' => true, 'tolDt' => $dt, 'igDt' => $dt, 'nap'=>date('w',strtotime($dt)), 'ora'=>$_ora, 'result'=>'csakid')); - foreach($ORA as $_tankorId => $_OA) { - if ( in_array($_tankorId,$_diakFmTankorIdk) === true ) { - continue; - } - $diakORAIDK[] = $_OA['oraId']; - $ORAK[$_OA['oraId']] = $_OA; - } - } - - $MODOSITANDO = $eddigORAIDK = array(); - $error = false; - for ($i=0; $i$_oraId,'id'=>$_hid,'statusz'=>$SET['statusz'],'igazolas'=>$SET['igazolas'],'tipus'=>$SET['tipus']); - } - $eddigORAIDK[] = $_oraId; - } - - if (!$error) { - $BEIRANDO = array_diff($diakORAIDK,$eddigORAIDK); -// for ($i=0; $i $_oraId) { - if (!in_array($ORAK[$_oraId]['tipus'],array('elmarad','elmarad máskor'))) - hianyzasRegisztralas( - array('oraId'=>$_oraId,'dt'=>$ORAK[$_oraId]['dt'],'ora'=>$ORAK[$_oraId]['ora']), - array(array('diakId'=>$diakId, 'id'=>'','statusz'=>$SET['statusz'],'igazolas'=>$SET['igazolas'],'tipus'=>$SET['tipus'])) - ); - } - - if (is_array($MODOSITANDO) && count($MODOSITANDO)>0) - hianyzasIgazolas($MODOSITANDO,$diakId); - - } - } - - - function oraHianyzasBeiras($dt, $ora, $diakId, $SET=array()) { - - if ($dt=='' || $ora=='') { - $_SESSION['alert'][] = 'message:empty_fields:kötelező paraméter üres (oraHianyzasBeiras:dt,ora)'; - return false; - } - $q = "SELECT * FROM hianyzas WHERE diakId=%u AND dt='%s' AND ora=%u"; - $RES = db_query($q, array('fv' => 'oraHianyzasBeiras', 'modul' => 'naplo', 'result' => 'indexed', 'values' => array($diakId, $dt, $ora))); - if ($RES!==false && count($RES)>0) { - - $_SESSION['alert'][] = 'message:wrong_data:már van bejegyzése. Eldöntési kérdés.'; - - } else { - - // Aznapi tankörei és felmentései - $diakTANKOROK = getTankorByDiakId($diakId, __TANEV, array('csakId' => true, 'tolDt' => $dt, 'igDt' => $dt, 'result'=>'csakid')); - $diakFMTANKOROK = getTankorDiakFelmentes($diakId, __TANEV, array('csakId' => true, 'tolDt' => $dt, 'igDt' => $dt, 'nap'=>date('w',strtotime($dt)),'ora'=>$ora,'result'=>'csakid')); - - $T = array_diff($diakTANKOROK,$diakFMTANKOROK); - reset($T); - sort($T); - - $q = "SELECT * FROM ora WHERE ora=%u AND dt='%s' and tankorId IN (".implode(',', array_fill(0, count($T), '%u')).")"; - $v = mayor_array_join(array($ora, $dt), $T); - $oraAdat = db_query($q, array('fv' => 'oraHianyzasBeiras', 'modul' => 'naplo', 'result' => 'indexed', 'values' => $v)); - - // EDDIG: csak akkor regisztráltuk, ha egy találatot adott az ora tábla. - // if ( ($db=count($oraAdat)) ==1 && !in_array($oraAdat[0]['tipus'],array('elmarad','elmarad máskor')) ) { - // MOST : azonban lehetséges olyan eset, hogy az adott órára többször is regisztrálandó. Mit tegyünk? - // a napi beírás beírja! Ez a függvény hibaüzen. - - if ( ($db=count($oraAdat)) >=1 ) { - for ($i=0; $i$oraAdat[$i]['oraId'],'dt'=>$oraAdat[$i]['dt'],'ora'=>$oraAdat[$i]['ora']), - array(array('diakId'=>$diakId, 'id'=>'','statusz'=>$SET['statusz'],'igazolas'=>$SET['igazolas'],'tipus'=>$SET['tipus'])) - ); - } - } - } elseif ($db==0) { - $_SESSION['alert'][] = '::nincs órája.'; - } elseif (in_array($oraAdat[0]['tipus'],array('elmarad','elmarad máskor'))) { - // ekkor nem kell csinálni semmit. Hibaüzenetet sem. - } else { - // ide nem juthatunk MÁR! - $_SESSION['alert'][] = ':%0%:%1% órája is van ebben az időpontban:'.$db; - } - } - } - -?> diff --git a/mayor-orig/www/include/modules/naplo/hianyzas/oktstat.php b/mayor-orig/www/include/modules/naplo/hianyzas/oktstat.php deleted file mode 100644 index c3cc7a24..00000000 --- a/mayor-orig/www/include/modules/naplo/hianyzas/oktstat.php +++ /dev/null @@ -1,155 +0,0 @@ - 'hianyzasOsszesites', 'modul' => 'naplo_intezmeny', 'values' => $v, 'result'=>'value'), $lr); - - if ( $overrideLezart === true || $dbAdat==0 ) { - - $Wnemszamit = defWnemszamit(); - // A tanévhez tartozó hiányzási adatok lekérdezése és rögzítése - $tanevDb = tanevDbNev(__INTEZMENY, $tanev); - $j = 0; - foreach ($TA['szemeszter'] as $i => $szAdat) { - if ($j==0) $q = "CREATE TEMPORARY TABLE ".__INTEZMENYDBNEV.".__hianyzasOsszesites "; - else $q = "INSERT INTO ".__INTEZMENYDBNEV.".__hianyzasOsszesites "; - $q .= " SELECT diakId, %u AS tanev, %u AS szemeszter, - COUNT(IF(tipus='hianyzas' AND statusz='igazolt',1,NULL)) AS igazolt, - COUNT(IF(tipus='hianyzas' AND statusz='igazolatlan',1,NULL)) AS igazolatlan, - SUM(IF(tipus='késés' AND statusz='igazolatlan',perc,NULL)) AS kesesPercOsszeg - FROM `%s`.hianyzas ".$Wnemszamit['join']." - WHERE ( - tipus = 'hiányzás' - OR (tipus='késés' AND statusz='igazolatlan' AND perc IS NOT NULL) - ) AND dt<='%s' - ".$Wnemszamit['nemszamit']." - GROUP BY diakId"; - $v = array($tanev, $szAdat['szemeszter'], $tanevDb, $szAdat['zarasDt']); - db_query($q, array('fv' => 'hianyzasOsszesites', 'modul' => 'naplo_intezmeny', 'values' => $v), $lr); - // A hozott hiányzások hozzáadása - $q = "UPDATE ".__INTEZMENYDBNEV.".__hianyzasOsszesites SET - igazolt = igazolt + ( - SELECT IFNULL(SUM(dbHianyzas),0) FROM `%s`.hianyzasHozott AS `hh` - WHERE hh.diakId = __hianyzasOsszesites.diakId AND hh.statusz='igazolt' AND hh.dt<='%s' - ), - igazolatlan = igazolatlan + ( - SELECT IFNULL(SUM(dbHianyzas),0) FROM `%s`.hianyzasHozott AS `hh` - WHERE hh.diakId = __hianyzasOsszesites.diakId AND hh.statusz='igazolatlan' AND hh.dt<='%s' - ) - WHERE tanev=%u AND szemeszter=%u"; - $v = array($tanevDb, $szAdat['zarasDt'], $tanevDb, $szAdat['zarasDt'], $tanev, $szAdat['szemeszter']); - db_query($q, array('fv' => 'hianyzasOsszesites/hozott', 'modul' => 'naplo_intezmeny', 'values' => $v), $lr); - $j++; - } - } - -// ----------------------------- - - $SQL_hianyzasOsszesites = ( ($overrideLezart === true) ? '__hianyzasOsszesites' : 'hianyzasOsszesites'); - - $q = "select IFNULL(telephelyId,0) AS telephelyId, osztalyJel as 'osztály', -count(if(igazolatlan>0,1,null)) as `van igazolatlanja`, -count(if(igazolatlan=1,1,null)) as `1 igazolatlan`, -count(if(10,1,null)) as igazolt, -count(if(249'oktstat','modul'=>'naplo_intezmeny','values'=>$v,'result'=>'indexed'), $lr); - - $q = "select IFNULL(telephelyId,0) AS telephelyId, osztalyJel as `osztály`, -count(if(igazolatlan>0,1,null)) as `van igazolatlanja`, -count(if(igazolatlan=1,1,null)) as `1 igazolatlan`, -count(if(10,1,null)) as igazolt, -count(if(249='%s' -and tanev=%u and szemeszter=%u -and beDt<='%s' and (kiDt is null or '%s'<=kiDt) -group by csop order by telephelyId,lpad(osztalyJel,4,' ') -"; - - $v = array($tanev,date('Y-m-d',strtotime('-16 years', strtotime($TA['kezdesDt']))),$tanev,count($TA['szemeszter']),$TA['zarasDt'],$TA['zarasDt']); - $r['tankoteles'] = db_query($q, array('fv'=>'oktstat','modul'=>'naplo_intezmeny','values'=>$v,'result'=>'indexed'), $lr); - - db_query('DROP TABLE IF EXISTS __hianyzasOsszesites', array('fv' => 'hianyzasOsszesites/hozott', 'modul' => 'naplo_intezmeny', 'values' => $v), $lr); - db_close($lr); - - $r['a04t17'] = getStat_a04t17($tanev); - - return $r; - } - - function getStat_a04t17($tanev) { - - $stat = 'a04t17'; - - $LJ = "LEFT JOIN osztalyDiak USING (diakId) LEFT JOIN osztaly USING (osztalyId)"; - - // az iskolába lépőnek tekintjük az 1 évfolyamosokat, vagyis azokat, akik annak az osztálynak a tagjai szept 1-jén - // amelyik kezdoEvfolyamSorszam=1, kezdoTanev=$tanev és osztalyJellegId IN (1,21,22,65) az adott tanévben - $W = " AND osztaly.kezdoTanev=$tanev AND kezdoEvfolyamSorszam=1 AND osztalyJellegId IN (1,21,22,65)"; // kezdoEvfolyam=1 volt eredetileg - - $q = "SELECT nem,count(DISTINCT diakId) AS db FROM diak $LJ WHERE szuletesiIdo+INTERVAL 6 YEAR>'$tanev-09-01' $W GROUP BY nem"; // nincs egyenlő!!! - $R[$stat.'_4'] = db_query($q, array('fv'=>'oktstat','modul'=>'naplo_intezmeny','result'=>'assoc','keyfield'=>'nem')); - $q = "SELECT nem,count(DISTINCT diakId) AS db FROM diak $LJ WHERE szuletesiIdo+INTERVAL 6 YEAR<='$tanev-08-31' and szuletesiIdo+INTERVAL 6 YEAR>='$tanev-06-01' $W GROUP BY nem"; - $R[$stat.'_3'] = db_query($q, array('fv'=>'oktstat','modul'=>'naplo_intezmeny','result'=>'assoc','keyfield'=>'nem')); - $q = "SELECT nem,count(DISTINCT diakId) AS db FROM diak $LJ WHERE szuletesiIdo+INTERVAL 6 YEAR<='$tanev-05-31' $W GROUP BY nem"; // nincs egyenlő!!! - $R[$stat.'_2'] = db_query($q, array('fv'=>'oktstat','modul'=>'naplo_intezmeny','result'=>'assoc','keyfield'=>'nem')); - - return $R; - } - -// var_dump(getStat_a04t17(2014)); - -?> diff --git a/mayor-orig/www/include/modules/naplo/hianyzas/ora.php b/mayor-orig/www/include/modules/naplo/hianyzas/ora.php deleted file mode 100644 index 56648a8c..00000000 --- a/mayor-orig/www/include/modules/naplo/hianyzas/ora.php +++ /dev/null @@ -1,8 +0,0 @@ -share hianyzasModifier - function hianyzasPercUpdate($ORAADAT,$PERCEK) -*/ - -?> diff --git a/mayor-orig/www/include/modules/naplo/hianyzas/osztaly.php b/mayor-orig/www/include/modules/naplo/hianyzas/osztaly.php deleted file mode 100644 index 07efde7d..00000000 --- a/mayor-orig/www/include/modules/naplo/hianyzas/osztaly.php +++ /dev/null @@ -1,232 +0,0 @@ - 'getHianyzok')); - $H = array(); - if ($SET['dt']!='') { - $Diakok = getDiakokByOsztaly($ADAT['osztalyId'],array('tolDt'=>$SET['dt'],'igDt'=>$SET['dt'])); - } else { - $Diakok = getDiakokByOsztaly($ADAT['osztalyId']); - } - $munkatervIds = getMunkatervByOsztalyId($ADAT['osztalyId'], array('result'=>'idonly')); - $H['névsor'] = array(); - foreach (array('jogviszonyban van','magántanuló','vendégtanuló') as $statusz) { - foreach ($Diakok[$statusz] as $diakId) { - if (!is_array($H['névsdor'][$diakId])) { - $H['névsor'][$diakId] = $Diakok[$diakId]; - // Az aktuális státusz megállapítása - $i = 0; - // A státuszbejegyzések sora időben visszafele rendezett!! - while ($i < count($Diakok[$diakId]['statusz']) && strtotime($Diakok[$diakId]['statusz'][$i]['dt']) > time()) $i++; - $H['névsor'][$diakId]['aktualisStatusz'] = $Diakok[$diakId]['statusz'][$i]['statusz']; - } - } - } - - - foreach ($H['névsor'] as $diakId => $dAdat) { - $H['diakIds'][] = $diakId; - $H[$diakId] = array(); - } - - if (count($H['névsor']) == 0) return $H; - - // A legmagasabb fegyelmi fokozat lekérdezése tanulónként - $q = "SELECT `diakId`, MAX(`referenciaDt`) AS `referenciaDt`, MAX(`fokozat`) AS `fokozat`, MAX(`bejegyzes`.`hianyzasDb`) AS `hianyzasDb` - FROM `".__TANEVDBNEV."`.`bejegyzes` LEFT JOIN `".__INTEZMENYDBNEV."`.`bejegyzesTipus` USING (`bejegyzesTipusId`) - WHERE `diakId` IN (".implode(',', array_fill(0, count($H['diakIds']), '%u')).") - AND `tipus` = 'fegyelmi' AND `bejegyzes`.`hianyzasDb` > 0 - GROUP BY `diakId`"; - $ret = db_query($q, array('fv' => 'getHianyzok/fegyelmi', 'modul' => 'naplo', 'result' => 'indexed', 'values' => $H['diakIds']), $lr); - if (!is_array($ret)) { if ($olr == '') db_close($lr); return false; } - foreach ($ret as $key => $val) { - $H[ $val['diakId'] ]['fegyelmi'] = array( - 'fokozat' => $val['fokozat'], - 'referenciaDt' => $val['referenciaDt'], - 'hianyzasDb' => $val['hianyzasDb'] - ); - } - $q = "SELECT `diakId`, MAX(`referenciaDt`) AS `referenciaDt`, MAX(`fokozat`) AS `fokozat`, MAX(`bejegyzes`.`hianyzasDb`) AS `hianyzasDb` - FROM `".__TANEVDBNEV."`.`bejegyzes` LEFT JOIN `".__INTEZMENYDBNEV."`.`bejegyzesTipus` USING (`bejegyzesTipusId`) - WHERE `diakId` IN (".implode(',', array_fill(0, count($H['diakIds']), '%u')).") - AND `tipus` = 'fegyelmi' - GROUP BY `diakId`"; - $ret = db_query($q, array('fv' => 'getHianyzok/fegyelmi', 'modul' => 'naplo', 'result' => 'indexed', 'values' => $H['diakIds']), $lr); - if (!is_array($ret)) { if ($olr == '') db_close($lr); return false; } - foreach ($ret as $key => $val) { - $H[ $val['diakId'] ]['fegyelmi']['maxFokozat'] = $val['fokozat']; - } - - $f_where = $where = $v_fw = $v_w = array(); - $v_w = array($ADAT['tolDt'], $ADAT['igDt']); - // A _LEGKORABBI_IGAZOLHATO_HIANYZAS és a legutóbbi osztályfőnöki óra függvénye - $dt = legkorabbiIgazolhatoHianyzasVeg($ADAT['osztalyId'], $lr); - foreach ($H['névsor'] as $diakId => $dAdat) { - // Az utolsó lezártnak tekinthető dátum - a beírt hiányzások függvénye! - $H[$diakId]['igDt'] = $tDt = getNemIgazolhatoDt($diakId, $munkatervIds, $dt, $lr); - // Ha megadott a felhasználó új viszonyítási pontott, akkor úgy vesszük, hogy addig a dátumig már le vannak zárva a hiányzások - legalábbis a fegyelmi szempontjából - if ($ADAT['referenciaDt'] != '' && strtotime($ADAT['referenciaDt']) > strtotime($tDt)) $tDt = $ADAT['referenciaDt']; - $where[] = "(diakId=%u AND dt<='%s')"; array_push($v_w, $diakId, $tDt); - if ($H[$diakId]['fegyelmi']['referenciaDt'] != '') { - $f_where[] = "(diakId=%u AND '%s'
0) $where = "AND '%s' <= dt AND dt <= '%s' AND (".implode(' OR ', $where).")"; - if ($f_where != '') $f_where = 'AND ('.implode(' OR ',$f_where).')'; - // Összes hiányzás lekérdezése - $q = "SELECT diakId,tipus,statusz,count(*) AS db,SUM(perc) AS ido - FROM ".__TANEVDBNEV.".hianyzas".$Wnemszamit['join']." - WHERE statusz != 'törölt' - AND diakId IN (".implode(',', array_fill(0, count($H['diakIds']), '%u')).") - AND '%s' <= dt AND dt <= '%s' - ".$Wnemszamit['nemszamit']." - GROUP BY diakId, tipus, statusz"; - $v = $H['diakIds']; $v[] = $ADAT['tolDt']; $v[] = $ADAT['igDt']; - $ret = db_query($q, array('fv' => 'getHianyzok/összes', 'modul' => 'naplo', 'result' => 'indexed', 'values' => $v), $lr); - if (!is_array($ret)) { if ($olr == '') db_close($lr); } - foreach ($ret as $key => $val) { - if ($val['tipus'] == 'késés') - $H[ $val['diakId'] ]['összes'][ $val['tipus'] ][ $val['statusz'] ] = array('db' => $val['db'], 'ido' => $val['ido']); - else - $H[ $val['diakId'] ]['összes'][ $val['tipus'] ][ $val['statusz'] ] = $val['db']; - } - - // Lezárt hiányzások lekérdezése - $q = "SELECT diakId,tipus,statusz,COUNT(*) AS db,SUM(perc) AS ido - FROM hianyzas - ".$Wnemszamit['join']." - WHERE statusz != 'törölt' - $where - ".$Wnemszamit['nemszamit']." - GROUP BY diakId, tipus, statusz"; - $ret = db_query($q, array('fv' => 'getHianyzok/lezárt', 'modul' => 'naplo', 'result' => 'indexed', 'values' => $v_w), $lr); - if (!is_array($ret)) { if ($olr == '') db_close($lr); } - foreach ($ret as $key => $val) { - if ($val['tipus'] == 'késés') - $H[ $val['diakId'] ]['lezárt'][ $val['tipus'] ][ $val['statusz'] ] = array('db' => $val['db'], 'ido' => $val['ido']); - else - $H[ $val['diakId'] ]['lezárt'][ $val['tipus'] ][ $val['statusz'] ] = $val['db']; - } - - // Lezárt, még nem szankcionált hiányzások lekérdezése - $q = "SELECT diakId, tipus, statusz, COUNT(*) AS db, SUM(perc) AS ido - FROM hianyzas - ".$Wnemszamit['join']." - WHERE statusz != 'törölt' - $f_where - ".$Wnemszamit['nemszamit']." - GROUP BY diakId, tipus, statusz"; - - $ret = db_query($q, array('fv' => 'getHianyzok/lezárt, nem szankcionált', 'modul' => 'naplo', 'result' => 'indexed', 'values' => $v_fw), $lr); - if (!is_array($ret)) { if ($olr == '') db_close($lr); } - foreach ($ret as $key => $val) { - if ($val['tipus'] == 'késés') - $H[ $val['diakId'] ]['fegyelmi'][ $val['tipus'] ][ $val['statusz'] ] = array('db' => $val['db'], 'ido' => $val['ido']); - else - $H[ $val['diakId'] ]['fegyelmi'][ $val['tipus'] ][ $val['statusz'] ] = $val['db']; - } - - // Tanulónként - foreach ($H['névsor'] as $diakId => $dAdat) { - - $_HOZOTT = getDiakHozottHianyzas($diakId); //hozott hiányzások lekérdezése az alapértelmezett tanévre - //$H[$diakId]['összes']['hozott'] = $_HOZOTT['igazolatlan']['db'] + $_HOZOTT['igazolt']['db']; - - $H[$diakId]['hozott'] = $_HOZOTT; //??? - -// $H[$diakId]['összes']['hiányzás']['igazolt'] += $_HOZOTT['igazolt']['db']; -// $H[$diakId]['összes']['hiányzás']['igazolatlan'] += $_HOZOTT['igazolatlan']['db']; - - /* Egy diák */ - $H[$diakId]['összes igazolatlan'] = $H[$diakId]['összes']['hiányzás']['igazolatlan']; - - // 20/2012 EMMI 51. § (10) - igazolt késések is átváltandók - $H[$diakId]['összes igazolt'] += - floor($H[$diakId]['összes']['késés']['igazolt']['ido'] / 45); - // Az igazolatlanok esetén azt a számítási módot használjuk, amelyik szigorúbb - // Előbb a hivatalos, 45 percenkénti átváltás szerint - $igazolatlanKesesbol = floor($H[$diakId]['összes']['késés']['igazolatlan']['ido'] / 45); - // majd a késések, felszereléshiányok darabszáma szerinti - if (intval(_HANY_KESES_IGAZOLATLAN) != 0) - $igazolatlanFegyelmi = floor($H[$diakId]['összes']['késés']['igazolatlan']['db'] / intval(_HANY_KESES_IGAZOLATLAN)); - else - $igazolatlanFegyelmi = 0; - if (intval(_HANY_FSZ_IGAZOLATLAN) != 0) - $igazolatlanFegyelmi += floor($H[$diakId]['összes']['felszerelés hiány']['igazolatlan'] / intval(_HANY_FSZ_IGAZOLATLAN)); - if (intval(_HANY_EH_IGAZOLATLAN) != 0) // egyenruha hiány - $igazolatlanFegyelmi += floor($H[$diakId]['összes']['egyenruha hiány']['igazolatlan'] / intval(_HANY_EH_IGAZOLATLAN)); - // végül a kettő közül a nagyobbikkal növeljük az összes igazolatlanok számát ??? ezt miért? - if ($igazolatlanKesesbol > $igazolatlanFegyelmi) - $H[$diakId]['összes igazolatlan'] += $igazolatlanKesesbol; - else - $H[$diakId]['összes igazolatlan'] += $igazolatlanFegyelmi; -/* - //if (_KESESI_IDOK_OSSZEADODNAK === true) { // 20/2012 EMMI - mindenképp összeadódnak a késési idők - $H[$diakId]['összes igazolatlan'] += - floor($H[$diakId]['összes']['késés']['igazolatlan']['ido'] / 45); - //} else { - if (intval(_HANY_KESES_IGAZOLATLAN) != 0) - $H[$diakId]['összes igazolatlan'] += - floor($H[$diakId]['összes']['késés']['igazolatlan']['db'] / intval(_HANY_KESES_IGAZOLATLAN)); - if (intval(_HANY_FSZ_IGAZOLATLAN) != 0) - $H[$diakId]['összes igazolatlan'] += - floor($H[$diakId]['összes']['felszerelés hiány']['igazolatlan'] / intval(_HANY_FSZ_IGAZOLATLAN)); - //} -*/ -# Itt ne adjuk ezt hozzá, mert alább a $H[$diakId]['összes igazolatlan']-okat összegezzük - abban meg már benne lesz a hozott! (Issu 59) -# $H['összes']['összes igazolatlan'] += floor($_HOZOTT['igazolatlan']['db']); -# $H['összes']['összes igazolt'] += floor($_HOZOTT['igazolt']['db']); - $H[$diakId]['összes igazolatlan'] += floor($_HOZOTT['igazolatlan']['db']); - $H[$diakId]['összes igazolt'] += floor($_HOZOTT['igazolt']['db']); - - - if (_KESESI_IDOK_OSSZEADODNAK === true) { - $H[$diakId]['összes fegyelmi igazolatlan'] += - floor(((($H[$diakId]['összes']['késés']['igazolatlan']['ido'] - - $H[$diakId]['fegyelmi']['késés']['igazolatlan']['ido']) % 45 ) - + $H[$diakId]['fegyelmi']['késés']['igazolatlan']['ido']) / 45); - } - - - /* Összes Diákra, összesítés */ - $H['összes']['hiányzás']['igazolt'] += $H[$diakId]['összes']['hiányzás']['igazolt']; - $H['összes']['hiányzás']['igazolatlan'] += $H[$diakId]['összes']['hiányzás']['igazolatlan']; - - $H['összes']['hiányzás']['igazolatlan'] += floor($_HOZOTT['igazolatlan']['db']); - $H['összes']['hiányzás']['igazolt'] += floor($_HOZOTT['igazolt']['db']); - - $H['összes']['késés']['igazolt'] += $H[$diakId]['összes']['késés']['igazolt']['db']; - $H['összes']['késés']['igazolatlan'] += $H[$diakId]['összes']['késés']['igazolatlan']['db']; - $H['összes']['felszerelés hiány']['igazolatlan'] += $H[$diakId]['összes']['felszerelés hiány']['igazolatlan']; - $H['összes']['felmentés']['igazolatlan'] += $H[$diakId]['összes']['felmentés']['igazolatlan']; - $H['összes']['egyenruha hiány']['igazolatlan'] += $H[$diakId]['összes']['egyenruha hiány']['igazolatlan']; - - $H['összes']['összes igazolatlan'] += $H[$diakId]['összes igazolatlan']; - - $H['összes']['fegyelmi']['hiányzás']['igazolatlan'] += $H[$diakId]['fegyelmi']['hiányzás']['igazolatlan']; - $H['összes']['fegyelmi']['késés']['igazolatlan'] += $H[$diakId]['fegyelmi']['késés']['igazolatlan']['db']; - $H['összes']['fegyelmi']['felszerelés hiány']['igazolatlan'] += $H[$diakId]['fegyelmi']['felszerelés hiány']['igazolatlan']; - $H['összes']['fegyelmi']['egyenruha hiány']['igazolatlan'] += $H[$diakId]['fegyelmi']['egyenruha hiány']['igazolatlan']; - - } - - db_close($lr); - - return $H; - - } - -?> diff --git a/mayor-orig/www/include/modules/naplo/hibabejelento/admin.php b/mayor-orig/www/include/modules/naplo/hibabejelento/admin.php deleted file mode 100644 index a32c1283..00000000 --- a/mayor-orig/www/include/modules/naplo/hibabejelento/admin.php +++ /dev/null @@ -1,28 +0,0 @@ - 'hibabejeletes', 'result'=>'insert','modul' => 'naplo_base', 'values' => array($ADAT['txt'],$ADAT['kategoria'],$telephelyId))); - } else { - return false; - } - - } - - function kerelemValasz($ADAT) { - if ($ADAT['txt'] != '' && $ADAT['kerelemId']>0) { - //if ($ADAT['telephelyId']=='') $telephelyId = 'NULL'; else $telephelyId = $ADAT['telephelyId']; - $q = "INSERT INTO kerelemValasz (kerelemId,userAccount,valasz) VALUES ('%u','"._USERACCOUNT."','%s')"; - return db_query($q, array('fv' => 'hibabejeletes', 'modul' => 'naplo_base', 'values' => array($ADAT['kerelemId'],$ADAT['txt']))); - } else { - return false; - } - - } - -?> diff --git a/mayor-orig/www/include/modules/naplo/hibabejelento/hibabejelento.php b/mayor-orig/www/include/modules/naplo/hibabejelento/hibabejelento.php deleted file mode 100644 index bedda878..00000000 --- a/mayor-orig/www/include/modules/naplo/hibabejelento/hibabejelento.php +++ /dev/null @@ -1,27 +0,0 @@ - 'hibabejeletes', 'result'=>'insert','modul' => 'naplo_base', 'values' => array($ADAT['txt'],$ADAT['kategoria'],$telephelyId))); - } else { - return false; - } - - } - - function kerelemValasz($ADAT) { - if ($ADAT['txt'] != '' && $ADAT['kerelemId']>0) { - //if ($ADAT['telephelyId']=='') $telephelyId = 'NULL'; else $telephelyId = $ADAT['telephelyId']; - $q = "INSERT INTO kerelemValasz (kerelemId,userAccount,valasz) VALUES ('%u','"._USERACCOUNT."','%s')"; - return db_query($q, array('fv' => 'hibabejeletes', 'modul' => 'naplo_base', 'values' => array($ADAT['kerelemId'],$ADAT['txt']))); - } else { - return false; - } - - } - -?> diff --git a/mayor-orig/www/include/modules/naplo/intezmeny/diakExport.php b/mayor-orig/www/include/modules/naplo/intezmeny/diakExport.php deleted file mode 100644 index 7752c577..00000000 --- a/mayor-orig/www/include/modules/naplo/intezmeny/diakExport.php +++ /dev/null @@ -1,137 +0,0 @@ - array('oId','viseltNevElotag','viseltCsaladinev','viseltUtonev','diakNaploSorszam'), - 'egyszerű' => array('diakigazolvanySzam','viseltNevElotag','viseltCsaladinev','viseltUtonev','diakNaploSorszam'), - 'osztályfőnöki' => array('diakigazolvanySzam','viseltNevElotag','viseltCsaladinev','viseltUtonev','oId','diakNaploSorszam'), - 'taninformTanuló' => array('oId','diakigazolvanySzam','viseltNevElotag','viseltCsaladinev','viseltUtonev','szuleteskoriNevElotag', - 'szuleteskoriCsaladinev','szuleteskoriUtonev','szuletesiHely','szuletesiIdo','anyaSzuleteskoriNevElotag','anyaSzuleteskoriCsaladinev', - 'anyaSzuleteskoriUtonev','allampolgarsag','lakhelyOrszag','lakhelyHelyseg', - 'lakhelyIrsz','lakhelyKozteruletNev','lakhelyKozteruletJelleg','lakhelyHazszam','lakhelyEmelet','lakhelyAjto','tartOrszag','tartHelyseg', - 'tartIrsz','tartKozteruletNev','tartKozteruletJelleg','tartHazszam','tartEmelet','tartAjto','jogviszonyKezdete','diakNaploSorszam' - ), - ); - - function diakExport($ADAT) { - - $tanevDbNev = tanevDbNev(__INTEZMENY, $ADAT['tanev']); - $W = array(); - $q = "SELECT diak.*, osztalyId, osztalyJel, diakNaploSorszam(osztalyDiak.diakId,".$ADAT['tanev'].",osztalyDiak.osztalyId) AS diakNaploSorszam FROM diak LEFT JOIN osztalyDiak USING (diakId) - LEFT JOIN `%s`.osztalyNaplo USING (osztalyId)"; - $v = array($tanevDbNev); - if (isset($ADAT['osztalyId'])) { $W[] = "osztalyId=%u"; $v[] = $ADAT['osztalyId']; } - if (isset($ADAT['dt'])) { $W[] = "beDt<='%s' AND ('%s'<=kiDt OR kiDt IS NULL)"; array_push($v, $ADAT['dt'], $ADAT['dt']); } - - $q .= " WHERE ".implode(' AND ', $W); - - $ret = db_query($q, array('fv' => 'diakExport', 'modul' => 'naplo_intezmeny', 'result' => 'indexed', 'values' => $v)); - - if (!$ret) return false; - - $osztalyAdat = getOsztalyok($ADAT['tanev'], array('result' => 'assoc')); - - $Szulok = getSzulok(); - for ($i = 0; $i < count($ret); $i++) { - $ret[$i]['telephelyId'] = $osztalyAdat[ $ret[$i]['osztalyId'] ]['telephelyId']; - foreach (array('anya','apa','gondviselo') as $tipus) { - $szuloId = $ret[$i][ $tipus.'Id' ]; - if (is_array($Szulok[$szuloId])) foreach ($Szulok[$szuloId] as $attr => $value) { - $ret[$i][ $tipus . ucfirst($attr) ] = $value; - } elseif ($i == 0 && is_array($Szulok[1])) foreach ($Szulok[1] as $attr => $value) { - $ret[$i][ $tipus . ucfirst($attr) ] = ''; - } - } - } - - return $ret; - - } - - function createFile($ADAT) { - if ($ADAT['formatum'] == 'xls' || $ADAT['formatum'] == 'xml') return generateXLSExport($ADAT['export'], $ADAT['mezok']); - elseif ($ADAT['formatum'] == 'pdf') return generatePDFExport($ADAT['export'], $ADAT['mezok']); - else return generateCSVExport($ADAT['export'], $ADAT['mezok']); - } - - function generateCSVExport($ret, $Mezok = array()) { - - $fp = fopen(__DIAK_EXPORT_FILE . '.csv', 'w'); - if (!$fp) return false; - - fputs($fp, implode(' ',$Mezok)."\n"); - for ($i = 0; $i < count($ret); $i++) { - $A = array(); - foreach ($Mezok as $attr => $attrNev) $A[] = $ret[$i][$attr]; - $sor = implode(' ', $A)."\n"; - fputs($fp, $sor); - } - - fclose($fp); - return true; - - } - - function generateXLSExport($ret, $Mezok = array()) { - - $fp = fopen(__DIAK_EXPORT_FILE . '.xml', 'w'); - if (!$fp) return false; - - fputs($fp, ''."\r\n"); - fputs($fp, ''."\r\n"); - - fputs($fp, ' '."\r\n" - .' '."\r\n" - .' '."\r\n" - ."\r\n".' '."\r\n"); - - fputs($fp, ''."\r\n"); - fputs($fp, ''."\r\n"); - - // fejléc - fputs($fp, ''."\r\n"); - foreach ($Mezok as $index => $attr) { - fputs($fp, " ".$attr."\r\n"); - } - fputs($fp, ''."\r\n"); - - - for ($i = 0; $i < count($ret); $i++) { - fputs($fp, ''."\r\n"); - foreach ($Mezok as $attr => $attrNev) { - $value = $ret[$i][$attr]; - $time = strtotime($value); - if (is_numeric($value)) - fputs($fp, " ".$value."\r\n"); - elseif (is_numeric($time) && $value == date('Y-m-d H:i:s', $time)) - fputs($fp, " ".str_replace(' ','T',$value).'.000'."\r\n"); - elseif (is_numeric($time) && $value == date('Y-m-d', $time)) - fputs($fp, " ".$value.'T08:40:00.000'."\r\n"); - else - fputs($fp, " ".$value."\r\n"); - } - fputs($fp, ''."\r\n"); - } - - fputs($fp, '
'."\r\n"); - fputs($fp, ''."\r\n"); - fputs($fp, ''."\r\n"); - - fclose($fp); - return true; - - } - - function generatePDFExport($ret, $mezok = array()) { - - - $_SESSION['alert'][] = 'message:not implemented'; - - } - -?> diff --git a/mayor-orig/www/include/modules/naplo/intezmeny/diakFelmentes.php b/mayor-orig/www/include/modules/naplo/intezmeny/diakFelmentes.php deleted file mode 100644 index 383281de..00000000 --- a/mayor-orig/www/include/modules/naplo/intezmeny/diakFelmentes.php +++ /dev/null @@ -1,6 +0,0 @@ - diff --git a/mayor-orig/www/include/modules/naplo/intezmeny/diakStatusz.php b/mayor-orig/www/include/modules/naplo/intezmeny/diakStatusz.php deleted file mode 100644 index 94944ba1..00000000 --- a/mayor-orig/www/include/modules/naplo/intezmeny/diakStatusz.php +++ /dev/null @@ -1,12 +0,0 @@ - 'getHibasJogviszony', 'modul' => 'naplo_intezmeny', 'result' => 'idonly')); - - return $ret; - } - -?> diff --git a/mayor-orig/www/include/modules/naplo/intezmeny/diakSzulo.php b/mayor-orig/www/include/modules/naplo/intezmeny/diakSzulo.php deleted file mode 100644 index a6f1bd2b..00000000 --- a/mayor-orig/www/include/modules/naplo/intezmeny/diakSzulo.php +++ /dev/null @@ -1,98 +0,0 @@ - $value) { - if (array_key_exists(($attr), $FIELDS) && !in_array($attr, array('szuloId'))) { - if ($value == '') { - $T[] = "`%s`=NULL"; - array_push($v, $attr); - } else { - array_push($v, $attr, $value); - $T[] = "`%s`='%s'"; - } - } - } - $q = "UPDATE szulo SET ".implode(',',$T)." WHERE szuloId=%u"; - array_push($v, $ADAT['szuloId']); - - return db_query($q, array('fv' => 'szuloAdatModositas', 'modul' => 'naplo_intezmeny', 'values' => $v)); - - } - - function szuloHozzarendeles($diakId, $tipus, $ujSzuloId) { - - - if ($tipus == 'anya' || $tipus == 'apa') { - // Nem ellenőrzés - if ($tipus == 'anya') $tiltott = 'fiú'; - else $tiltott = 'lány'; - $q = "SELECT nem FROM szulo WHERE szuloId=%u"; - $nem = db_query($q, array('fv' => 'szuloHozzarendeles', 'modul' => 'naplo_intezmeny', 'result' => 'value', 'values' => array($ujSzuloId))); - if ($nem == $tiltott) { - $_SESSION['alert'][] = 'message:tiltott_nem_'.$tiltott; - return false; - } - } - - $q = "UPDATE diak SET `%sId` = %u WHERE diakId = %u"; - $v = array($tipus, $ujSzuloId, $diakId); - $ret = db_query($q, array('fv' => 'szuloHozzarendeles', 'modul' => 'naplo_intezmeny', 'values' => $v)); - if ($ret) return $ujSzuloId; - else return false; - - } - - function szuloHozzarendelesTorlese($diakId, $tipus) { - - $q = "UPDATE diak SET `%sId` = NULL WHERE diakId = %u"; - $v = array($tipus, $diakId); - return db_query($q, array('fv' => 'szuloHozzarendelesTorles', 'modul' => 'naplo_intezmeny', 'values' => $v)); - - } - - function ujSzulo($ADAT, $FIELDS) { - - - $diakId = $ADAT['diakId']; - $tipus = $ADAT['tipus']; - - // Kötelező paraméterek ellenőrzése - if ($ADAT['csaladinev'] == '' - || $ADAT['utonev'] == '' - || !in_array($tipus, array('anya','apa','gondviselo','nevelo')) - ) { - $_SESSION['alert'][] = 'message:wrong_data:ujSzulo:csaladinev - '.$_POST['csaladinev'].', utonev - '.$_POST['utonev'].', tipus - '.$tipus; - return false; - } - - $lr = db_connect('naplo_intezmeny', array('fv' => 'ujSzulo')); - - foreach($ADAT as $attr => $value) { - if (array_key_exists(($attr), $FIELDS)) { - if ($value != '') { - $V[] = $value; - $A[] = $attr; - } - } - } - - $q = "INSERT INTO szulo (`".implode('`,`', array_fill(0, count($A), '%s'))."`) VALUES ('".implode("', '", array_fill(0, count($V), '%s'))."')"; - $v = mayor_array_join($A, $V); - $szuloId = db_query($q, array('fv' => 'ujSzulo', 'modul' => 'naplo_intezmeny', 'result' => 'insert', 'values' => $v), $lr); - if ($szuloId) { - $q = "UPDATE diak SET `%sId` = %u WHERE diakId = %u"; - $v = array($tipus, $szuloId, $diakId); - $r = db_query($q, array('fv' => 'ujSzulo', 'modul' => 'naplo_intezmeny', 'values' => $v), $lr); - db_close($lr); - if ($r) return $szuloId; - else return false; - } else { - db_close($lr); - return false; - } - - } - -?> diff --git a/mayor-orig/www/include/modules/naplo/intezmeny/diakTankorJelentkezes.php b/mayor-orig/www/include/modules/naplo/intezmeny/diakTankorJelentkezes.php deleted file mode 100644 index e7ab1aad..00000000 --- a/mayor-orig/www/include/modules/naplo/intezmeny/diakTankorJelentkezes.php +++ /dev/null @@ -1,97 +0,0 @@ - $TB) { - for ($j=0; $j0) { - $W = " AND osztalyId IN (".implode(',', array_fill(0, count($OSZTALYIDK), '%u')).")"; - $v = mayor_array_join(array($tanev, $szemeszter), $OSZTALYIDK, $OSZTALYIDK, array($tanev,$tanev,$szemeszter)); - } else { - $v = array($tanev, $szemeszter, $tanev, $tanev, $szemeszter); - } - $q = "SELECT DISTINCT tankorId, targyId, kovetelmeny, min, max, tanev, szemeszter, oraszam, tankorNev - FROM tankor LEFT JOIN tankorSzemeszter USING (tankorId) JOIN tankorOsztaly USING (tankorId) - WHERE tanev=%u and szemeszter=%u and tankor.felveheto =1".$W." - AND tankorId NOT IN ( - SELECT distinct tankorId FROM tankor LEFT JOIN tankorSzemeszter USING (tankorId) JOIN tankorOsztaly USING (tankorId) - WHERE tankor.felveheto =1".$W." AND (tanev<%u OR (tanev=%u AND szemeszter<%u)) - ) - ORDER BY tankorNev,tankor.tankorId"; - $felvehetoTankorok = db_query($q, array('fv' => 'getValaszthatoTankorok', 'modul' => 'naplo_intezmeny', 'result' => 'indexed', 'values' => $v)); - - for ($i=0; $i $DT['tolDt'], 'igDt' => $DT['igDt'], 'result' => 'nevsor')); - } - return $felvehetoTankorok; - } - - - - function getValaszthatoTankorokOrig($tanev, $szemeszter, $OSZTALYIDK) { - - if ($tanev=='') { - $tanevAdat = $_TANEV; - } else { - $tanevAdat = getTanevAdat($tanev); - } - - $tanevDbNev = tanevDbNev(__INTEZMENY, $tanev); - - $DT['tolDt'] = $tanevAdat['kezdesDt']; - $DT['igDt'] = $tanevAdat['zarasDt'] ; - - $tankorBlokkok = getTankorBlokkok($tanev); - if (is_array($tankorBlokkok) && is_array($tankorBlokkok['idk'])) - foreach ($tankorBlokkok['idk'] as $blokkId => $TB) { - for ($j=0; $j0) { - $W = " AND osztalyId IN (".implode(',', array_fill(0, count($OSZTALYIDK), '%u')).")"; - $v = mayor_array_join(array($tanev, $szemeszter), $OSZTALYIDK, $OSZTALYIDK, array($tanev)); - } else { - $v = array($tanev, $szemeszter, $tanev); - } - $q = "SELECT DISTINCT tankorId, targyId, kovetelmeny, min, max, tanev, szemeszter, oraszam, tankorNev - FROM tankor LEFT JOIN tankorSzemeszter USING (tankorId) JOIN tankorOsztaly USING (tankorId) - WHERE tanev=%u and szemeszter=%u and tankor.felveheto =1".$W." - AND tankorId NOT IN ( - SELECT distinct tankorId FROM tankor LEFT JOIN tankorSzemeszter USING (tankorId) JOIN tankorOsztaly USING (tankorId) - WHERE tankor.felveheto =1".$W." AND tanev<%u - ) - ORDER BY tankorNev,tankor.tankorId"; - $felvehetoTankorok = db_query($q, array('fv' => 'getValaszthatoTankorok', 'modul' => 'naplo_intezmeny', 'result' => 'indexed', 'values' => $v)); - - for ($i=0; $i $DT['tolDt'], 'igDt' => $DT['igDt'], 'result' => 'nevsor')); - } - return $felvehetoTankorok; - } - - -?> diff --git a/mayor-orig/www/include/modules/naplo/intezmeny/kepzes.php b/mayor-orig/www/include/modules/naplo/intezmeny/kepzes.php deleted file mode 100644 index e08e6856..00000000 --- a/mayor-orig/www/include/modules/naplo/intezmeny/kepzes.php +++ /dev/null @@ -1,64 +0,0 @@ - 'ujKepzes', 'modul' => 'naplo_intezmeny', 'result' => 'insert', 'values' => $v)); - - } - - function kepzesEles($kepzesId, $kepzesEles) { - - $q = "UPDATE kepzes SET kepzesEles=%u WHERE kepzesId =%u"; - $v = array($kepzesEles,$kepzesId); - return db_query($q, array('fv' => 'kepzesEles', 'modul' => 'naplo_intezmeny', 'result' => 'update', 'values' => $v)); - - } - - function kepzesModositas($ADAT) { - - //$ADAT eredeti paraméterezése: $kepzesId, $kepzesNev, $tanev, $osztalyJellegId, $osztalyIds, $delOsztalyIds - extract($ADAT); - - // Van-e ilyen képzés - $q = "SELECT COUNT(*) AS db FROM kepzes WHERE kepzesId = %u"; - $v = array($kepzesId); - $db = db_query($q, array('modul'=> 'naplo_intezmeny','fv'=>'kepzesModositas','values'=>$v, 'result'=>'value')); - - if ($db != 1) { - $_SESSION['alert'][] = 'message:wrong_data:hibás képzés azonosító:'.$kepzesId; - return false; - } - - if (isset($osztalyJellegId) && $osztalyJellegId>0) { - $q = "UPDATE kepzes SET kepzesNev='%s',tanev=%u,osztalyJellegId=%u WHERE kepzesId=%u"; - $v = array($kepzesNev,$tolTanev,$osztalyJellegId,$kepzesId); - } - db_query($q, array('modul'=> 'naplo_intezmeny','fv'=>'kepzesModositas','values'=>$v)); - - // TOROLNI NEM LEHET csak, ha egyetlen osztály-tag sincs hozzárendelve az adott képzéshez AZ ADOTT TANÉVBEN... - if (count($delOsztalyIds) > 0) { - foreach ($delOsztalyIds as $osztalyId) { - $q = "SELECT COUNT(*) FROM kepzesDiak LEFT JOIN osztalyDiak USING (diakId) WHERE kepzesId=%u AND osztalyId=%u - AND tolDt<='".$_TANEV['zarasDt']."' AND (igDt IS NULL OR igDt>='".$_TANEV['kezdesDt']."') - AND beDt<='".$_TANEV['zarasDt']."' AND (kiDt IS NULL OR kiDt>='".$_TANEV['kezdesDt']."')"; - $db = db_query($q, array('fv'=>'kepzesModositas/del-osztaly#1','modul'=>'naplo_intezmeny','result'=>'value','values'=>array($kepzesId, $osztalyId))); - if ($db == 0) { - $q = "DELETE FROM kepzesOsztaly WHERE kepzesId=%u AND osztalyId=%u"; - db_query($q, array('fv' => 'kepzesModositas/osztályhozzárendelés törlése', 'modul' => 'naplo_intezmeny', 'values' => array($kepzesId,$osztalyId))); - } else { - $_SESSION['alert'][] = 'message:wrong_data:Az osztály hozzárendelés nem törölhető! '.$db.' db tanuló az osztályból hozzá van rendelve ehhez a képzéshez.'; - } - } - } - if (count($osztalyIds)>0) { - $q = "REPLACE INTO kepzesOsztaly (kepzesId,osztalyId) VALUES (".implode("),(", array_fill(0, count($osztalyIds), '%u, %u')).")"; - $v = array(); - for ($i = 0; $i < count($osztalyIds); $i++) array_push($v, $kepzesId, $osztalyIds[$i]); - db_query($q, array('fv' => 'kepzesModositas/osztályhozzárendelés', 'modul' => 'naplo_intezmeny', 'values' => $v)); - } - - } - -?> diff --git a/mayor-orig/www/include/modules/naplo/intezmeny/kepzesOraterv.php b/mayor-orig/www/include/modules/naplo/intezmeny/kepzesOraterv.php deleted file mode 100644 index d689aa40..00000000 --- a/mayor-orig/www/include/modules/naplo/intezmeny/kepzesOraterv.php +++ /dev/null @@ -1,92 +0,0 @@ - $D) { - $q = "REPLACE INTO kepzesOraszam (kepzesId,evfolyamJel,kotelezoOraszam,maximalisOraszam) VALUES (%u,'%s',%f,%f)"; - $v = array($kepzesId,$evfolyamJel,$D['kotelezo'],$D['max']); - db_query($q, array('modul'=>'naplo_intezmeny','fv'=>'modifyKepzesOraterv', 'values'=>$v), $lr); - } - - //blabla if - if (is_array($ADAT['adatok'])) { - foreach ($ADAT['adatok'] as $targyTipus => $X) { - foreach ($X as $targyId => $EGYTARGY) { - // [$evfolyamJel][$szemeszter]['oraszam'|'kovetelmeny'] - if (is_array($EGYTARGY)) - foreach ($EGYTARGY as $evfolyamJel => $DS) { - if (is_array($DS)) foreach($DS as $szemeszter => $D) { - if ($D['kovetelmeny']!='' && isset($D['oraszam'])) { - if ($targyTipus!='mintatantervi') { - $q = "SELECT kepzesOratervId FROM kepzesOraterv WHERE kepzesId=%u AND evfolyamJel='%s' AND szemeszter=%u AND tipus='%s'"; - $v = array($kepzesId,$evfolyamJel,$szemeszter,$targyTipus); - $_oratervId = db_query($q, array('modul'=>'naplo_intezmeny','result'=>'value','fv'=>'modifyKepzesOraterv', 'debug'=>false, 'values'=>$v), $lr); - if ($_oratervId>0) { - $q = "UPDATE kepzesOraterv SET hetiOraszam=%f,kovetelmeny='%s' WHERE kepzesOratervId=%u"; - $v = array($D['oraszam'],$D['kovetelmeny'],$_oratervId); - } else { - $q = "INSERT INTO kepzesOraterv (kepzesId,targyId,evfolyamJel,szemeszter,hetiOraszam,kovetelmeny,tipus) - VALUES (%u,null,'%s',%u,%f,'%s','%s')"; - $v = array($kepzesId,$evfolyamJel,$szemeszter,$D['oraszam'],$D['kovetelmeny'],$targyTipus); - } - } else { - $q = "SELECT kepzesOratervId FROM kepzesOraterv WHERE kepzesId=%u AND evfolyamJel='%s' AND szemeszter=%u AND tipus='%s' AND targyId=%u"; - $v = array($kepzesId,$evfolyamJel,$szemeszter,$targyTipus,$targyId); - $_oratervId = db_query($q, array('modul'=>'naplo_intezmeny','result'=>'value','fv'=>'modifyKepzesOraterv', 'debug'=>false, 'values'=>$v), $lr); - if ($_oratervId>0) { - $q = "UPDATE kepzesOraterv SET hetiOraszam=%f,kovetelmeny='%s' WHERE kepzesOratervId=%u"; - $v = array($D['oraszam'],$D['kovetelmeny'],$_oratervId); - } else { - $q = "INSERT INTO kepzesOraterv (kepzesId,targyId,evfolyamJel,szemeszter,hetiOraszam,kovetelmeny,tipus) VALUES (%u,%u,'%s',%u,%f,'%s','%s')"; - $v = array($kepzesId,$targyId,$evfolyamJel,$szemeszter,$D['oraszam'],$D['kovetelmeny'],$targyTipus); - } - } - } else { // ha nincs megadva követelmény, akkor töröljük - if ($targyTipus!='mintatantervi') { - $q = "DELETE FROM kepzesOraterv WHERE kepzesId=%u AND evfolyamJel='%s' AND szemeszter=%u AND tipus='%s'"; - $v = array($kepzesId,$evfolyamJel,$szemeszter,$targyTipus); - } else { - $q = "DELETE FROM kepzesOraterv WHERE kepzesId=%u AND targyId=%u AND evfolyamJel='%s' AND szemeszter=%u"; - $v = array($kepzesId,$targyId,$evfolyamJel,$szemeszter); - } - } - db_query($q, array('modul'=>'naplo_intezmeny','fv'=>'modifyKepzesOraterv', 'debug'=>false, 'values'=>$v), $lr); - } /* if */ - } /* if-foreach */ - } /* foreach */ - } /* foreach */ - } /* if */ - db_close($lr); - } - - function dropKepzesOratervRekord($kepzesId,$tipus,$targyId) { - if ($tipus=='mintatantervi') { - $q = "DELETE FROM kepzesOraterv WHERE kepzesId=%u AND targyId=%u"; - $v = array($kepzesId,$targyId); - } else { - $q = "DELETE FROM kepzesOraterv WHERE kepzesId=%u AND tipus='%s'"; - $v = array($kepzesId,$tipus); - } - db_query($q, array('modul'=>'naplo_intezmeny','fv'=>'dropKepzesOratervRekord', 'debug'=>false, 'values'=>$v)); - } - - function getKepzesOraszam($kepzesId) { - $q = "SELECT * FROM kepzesOraszam WHERE kepzesId=$kepzesId ORDER BY evfolyamJel ASC"; // order error! - return db_query($q, array('modul'=>'naplo_intezmeny','fv'=>'getKepzesOraszam', 'result'=>'assoc', 'keyfield'=>'evfolyamJel')); - } - - function kepzesOratervMasolas($masolandoKepzesId, $kepzesId) { - - $q ="INSERT INTO kepzesOraterv (kepzesId, targyId, evfolyamJel, szemeszter, hetiOraszam, kovetelmeny, tipus) - SELECT %u AS kepzesId, targyId, evfolyamJel, szemeszter, hetiOraszam, kovetelmeny, tipus - FROM kepzesOraterv WHERE kepzesId=%u"; - return db_query($q, array('debug'=>false,'fv'=>'kepzesOratervMasolas','modul'=>'naplo_intezmeny','values'=>array($kepzesId, $masolandoKepzesId))); - - - } - -?> diff --git a/mayor-orig/www/include/modules/naplo/intezmeny/munkakozosseg.php b/mayor-orig/www/include/modules/naplo/intezmeny/munkakozosseg.php deleted file mode 100644 index d9c01d61..00000000 --- a/mayor-orig/www/include/modules/naplo/intezmeny/munkakozosseg.php +++ /dev/null @@ -1,288 +0,0 @@ - 'ujMunkakozosseg')); - if (!$lr) return false; - - $result = false; // sikerült-e? - - // Van-e már ilyen munkaközösség? - $q = "SELECT COUNT(mkId) FROM munkakozosseg WHERE leiras='%s'"; - $num = db_query($q, array('fv' => 'ujMunkakozosseg', 'modul' => 'naplo_intezmeny', 'result' => 'value', 'values' => array($leiras)), $lr); - - if ($num == 0) { - $v = array($leiras); - if ($mkVezId == '') { - $MKVEZID = 'NULL'; - } else { - $MKVEZID = '%u'; - $v[] = $mkVezId; - } - $q = "INSERT INTO munkakozosseg (leiras,mkVezId) VALUES ('%s',$MKVEZID)"; - $result = db_query($q, array('fv' => 'ujMunkakozosseg', 'modul' => 'naplo_intezmeny', 'result' => 'insert', 'values' => $v), $lr); - - } else { - // már van ilyen munkaközösség... - $_SESSION['alert'][] = 'massege:wrong_data:duplikált munkaközösség leírás (név)'; - } - db_close($lr); - - return $result; - - } - - function modMunkakozosseg($mkId,$leiras,$mkVezId,$MKUJTAGOK,$MKTORLENDOTAGOK) { - - - $lr = db_connect('naplo_intezmeny', array('fv' => 'modMunkakozosseg')); - - if (!$lr) return false; - if ($mkId=='') { $_SESSION['alert'][] = 'message::no mkId'; return false; } - - $result = false; // sikerült-e? - - // Van-e már ilyen munkaközösség? - $q = "SELECT COUNT(mkId) FROM munkakozosseg WHERE mkId=%u"; - $num = db_query($q, array('fv' => 'modMunkakozosseg', 'modul' => 'naplo_intezmeny', 'result' => 'insert', 'values' => array($mkId)), $lr); - - if ($num != 0) { - if ($mkVezId == '') { - $q = "UPDATE munkakozosseg SET leiras='%s',mkVezId=NULL WHERE mkId=%u"; - $v = array($leiras, $mkId); - } else { - $q = "UPDATE munkakozosseg SET leiras='%s',mkVezId=%u WHERE mkId=%u"; - $v = array($leiras, $mkVezId, $mkId); - } - $result = db_query($q, array('fv' => 'modMunkakozosseg', 'modul' => 'naplo_intezmeny', 'values' => $v), $lr); - } else { - // már van ilyen munkaközösség... - $_SESSION['alert'][] = 'massege:wrong_data:mkId='.$mkId; - } - - if ($result) { - if (is_array($MKUJTAGOK) && count($MKUJTAGOK)>0) { - //mkTanar[mkId,tanarId] - for($i=0; $i 'modMunkakozosseg', 'modul' => 'naplo_intezmeny', 'values' => array($mkId,$_tanarId)), $lr); - } - } - if (is_array($MKTORLENDOTAGOK) && count($MKTORLENDOTAGOK)>0) { - $q = "DELETE FROM mkTanar WHERE mkId=%u AND tanarId IN (".implode(',', array_fill(0, count($MKTORLENDOTAGOK), '%u')).")"; - db_query($q, array('fv' => 'modMunkakozosseg', 'modul' => 'naplo_intezmeny', 'values' => mayor_array_join(array($mkId),$MKTORLENDOTAGOK)), $lr); - } - } - - - db_close($lr); - - return $result; - - } - - - - - function ujTargy($ADAT) { - - - $leiras=$ADAT['leiras']; - $mkId=$ADAT['mkId']; - $targyJelleg=$ADAT['targyJelleg']; - $kirTargyId=$ADAT['kirTargyId']; - - if ($leiras=='') { - $_SESSION['alert'][] = 'message:UI:empty field'; - return false; - } - - if (is_numeric($kirTargyId)) { - $q = "INSERT INTO targy (targyNev,mkId,targyJelleg,kirTargyId) VALUES ('%s',%u,'%s',%u)"; - $v = array($leiras,$mkId,$targyJelleg,$kirTargyId); - } else { - $q = "INSERT INTO targy (targyNev,mkId,targyJelleg) VALUES ('%s',%u,'%s')"; - $v = array($leiras,$mkId,$targyJelleg); - } - $result = db_query($q,array('modul'=>'naplo_intezmeny', 'fv'=>'ujTargy','result'=>'insert', 'detailed'=>false, 'debug'=>false, 'values'=>$v)); - - return $result; - - } - - function targyModosit($ADAT) { - if (is_numeric($ADAT['kirTargyId'])) { - $q = "UPDATE targy SET targyJelleg='%s',zaroKovetelmeny='%s',evkoziKovetelmeny='%s',targyRovidNev='%s',kirTargyId=%u WHERE targyId=%u"; - $v = array($ADAT['targyJelleg'],$ADAT['zaroKovetelmeny'],$ADAT['evkoziKovetelmeny'],$ADAT['targyRovidNev'], $ADAT['kirTargyId'], $ADAT['targyId']); - } else { - $q = "UPDATE targy SET targyJelleg='%s',zaroKovetelmeny='%s',evkoziKovetelmeny='%s',targyRovidNev='%s' WHERE targyId=%u"; - $v = array($ADAT['targyJelleg'],$ADAT['zaroKovetelmeny'],$ADAT['evkoziKovetelmeny'],$ADAT['targyRovidNev'],$ADAT['targyId']); - } - return db_query($q,array('modul'=>'naplo_intezmeny', 'fv'=>'targyModosit', 'detailed'=>false, 'debug'=>false, 'values'=>$v)); - } - - function targyTorol($targyId,$mkId) { - - $q = "DELETE FROM targy WHERE targyId=%u AND mkId=%u"; - return db_query($q, array('fv' => 'targyTorol', 'modul' => 'naplo_intezmeny', 'values' => array($targyId, $mkId)), $lr); - - } - - - function munkakozossegTorol($mkId) { - - $q = "DELETE FROM munkakozosseg WHERE mkId=%u"; - return db_query($q, array('fv' => 'munkakozossegTorol', 'modul' => 'naplo_intezmeny', 'values' => array($mkId)), $lr); - - } - - function targyBeolvasztas($ADAT) { - /** - * Elvárt paraméterek: $ADAt['targyId'], $ADAT['befogadoTargyId'], $ADAT['tankorJeloles'] (lehet üres) - **/ - - $lr = db_connect('naplo_intezmeny'); - db_start_trans($lr); - - // A befogadó tárgy adatai - $befogadoTargy = getTargyById($ADAT['befogadoTargyId']); - $targyAdat = getTargyById($ADAT['targyId']); - // A tárgyhoz tartozó tankörök lekérdezése - $q = "SELECT tankorId FROM tankor WHERE targyId=%u"; - $tankorIds = db_query($q, array('fv'=>'targyBeolvasztas/tankorok','result'=>'idonly','values'=>array($ADAT['targyId'])), $lr); - if (is_array($tankorIds) && count($tankorIds)>0) /*foreach ($tankorIds as $tankorId)*/ { - /* tárgyhoz tartozó tankörök átnevezése */ - if (isset($ADAT['tankorJeloles'])) { - $q = "UPDATE tankorSzemeszter SET tankorNev=CONCAT(LEFT(tankorNev,LOCATE('%s',tankorNev)-1),'%s',' ','%s') - WHERE tankorId IN (".implode(',', array_fill(0,count($tankorIds),'%u')).")"; - $v = mayor_array_join(array($targyAdat['targyNev'], $befogadoTargy['targyNev'], $ADAT['tankorJeloles']), $tankorIds); - } else { - $q = "UPDATE tankorSzemeszter SET tankorNev=REPLACE(tankorNev,'%s','%s') - WHERE tankorId IN (".implode(',', array_fill(0,count($tankorIds),'%u')).")"; - $v = mayor_array_join(array($targyAdat['targyNev'], $befogadoTargy['targyNev']), $tankorIds); - } - $r = db_query($q, array('fv'=>'targyBeolvasztas/tankör-átnevezés','values'=>$v), $lr); - if (!$r) { db_rollback($lr); db_close($lr); return false; } - /* tárgyhoz tartozó tannkörök áthelyezése */ - $q = "UPDATE tankor SET targyId=%u WHERE targyId=%u"; - $r = db_query($q, array('fv'=>'targyBeolvasztas/tankör-tárgy','values'=>array($ADAT['befogadoTargyId'], $ADAT['targyId'])), $lr); - if (!$r) { db_rollback($lr); db_close($lr); return false; } - } - - /* tanév adatbázisok lekérdezése */ - $q = "SHOW DATABASES LIKE 'naplo_".__INTEZMENY."%'"; - $dbs = db_query($q, array('fv'=>'targyBeolvasztas/dbs','result'=>'idonly'), $lr); - if (!$dbs) { db_rollback($lr); db_close($lr); return false; } - if (is_array($dbs) && count($dbs) > 0) foreach ($dbs as $db) { - /* tanév adatbázis tábláinak lekérdezése */ - $q = "SHOW TABLES FROM $db"; - $tables = db_query($q, array('fv'=>'targyBeolvasztas/tables','result'=>'idonly'), $lr); - if (is_array($tables) && count($tables)>0) foreach ($tables as $table) { - if ($table == 'targySorszam') { - /* törlendő: targySorszam, */ - $q = "DELETE FROM `$db`.`targySorszam` WHERE targyId=%u"; - $r = db_query($q, array('fv'=>'targyBeolvasztas/targySorszam','values'=>array($ADAT['targyId'])), $lr); - if (!$r) { db_rollback($lr); db_close($lr); return false; } - } else { - /* Tábla tartalmaz-e targyId mezőt... */ - $q = "SHOW FIELDS FROM `$db`.`$table` LIKE 'targyId'"; - $ret = db_query($q, array('fv'=>'targyBeolvasztas/table-targyId','result'=>'idonly'), $lr); - if (is_array($ret) && count($ret)>0) { - /* ... ha igen: targyId módosítás */ - $q = "UPDATE `$db`.`$table` SET targyId=%u WHERE targyId=%u"; - $v = array($ADAT['befogadoTargyId'], $ADAT['targyId']); - $r = db_query($q, array('fv'=>'targyBeolvasztas/table','values'=>$v), $lr); - if (!$r) { db_rollback($lr); db_close($lr); return false; } - } - } - } - } - /* intézményi adattáblák lekérdezése */ - $q = "SHOW TABLES"; - $tables = db_query($q, array('fv'=>'targyBeolvasztas/i-tables','result'=>'idonly'), $lr); - if (is_array($tables) && count($tables)>0) foreach ($tables as $table) { - if ($table != 'targy') { - /* Tábla tartalmaz-e targyId mezőt... */ - $q = "SHOW FIELDS FROM `$table` LIKE 'targyId'"; - $ret = db_query($q, array('fv'=>'targyBeolvasztas/i-table-targyId','result'=>'idonly'), $lr); - if (is_array($ret) && count($ret)>0) { - /* ... ha igen: targyId módosítás */ - $q = "UPDATE IGNORE `$table` SET targyId=%u WHERE targyId=%u"; - $v = array($ADAT['befogadoTargyId'], $ADAT['targyId']); - $r = db_query($q, array('fv'=>'targyBeolvasztas/i-table','values'=>$v), $lr); - if (!$r) { db_rollback($lr); db_close($lr); return false; } - } - } // != tárgy - } - - /* targy törlése */ - $q = "DELETE FROM targy WHERE targyId=%u"; - $r = db_query($q, array('fv'=>'targyBeolvasztas/delete','values'=>array($ADAT['targyId'])), $lr); - if (!$r) { db_rollback($lr); db_close($lr); return false; } - - db_commit($lr); - db_close($lr); - return true; - - } - - function targyMkValtas($ADAT) { - /** - * Elvárt paraméterek: $ADAt['targyId'], $ADAT['befogadoMkId'] - **/ - $lr = db_connect('naplo_intezmeny'); - db_start_trans($lr); - // Az adott tárgy tanköreinek jelenlegi tanárai között van-e az új munkaközösségben nem szereplő - $q = "SELECT DISTINCT tanarId FROM tankor LEFT JOIN tankorTanar USING (tankorId) - WHERE targyId=%u AND beDt<=CURDATE() AND (kiDt IS NULL OR kiDt>=CURDATE()) - AND tanarId NOT IN (SELECT tanarId FROM mkTanar WHERE mkId=%u)"; - $tanarIds = db_query($q, array('fv'=>'targyMkValtas/tanarIds','result'=>'idonly','values'=>array($ADAT['targyId'], $ADAT['befogadoMkId'])), $lr); - if (is_array($tanarIds) && count($tanarIds)>0) { - db_rollback($lr); - db_close($lr); - $_SESSION['alert'][] = 'message:wrong_data:targyMkValtas:Van az új munkaközösségbe nem tartozó érintett tanár!:'.implode(',',$tanarIds); - return false; - } - // munkaközösség váltás - $q = "UPDATE targy SET mkId=%u WHERE targyId=%u"; - $r = db_query($q, array('fv'=>'targyMkValtas/mkId','values'=>array($ADAT['befogadoMkId'], $ADAT['targyId'])), $lr); - if (!$r) { db_rollback($lr); db_close($lr); return false; } - - db_commit($lr); - db_close($lr); - return true; - - } - - function targyAtnevezes($ADAT) { - /** - * Elvárt paraméterek: $ADAt['targyId'], $ADAT['ujTargyNev'] - **/ - - $lr = db_connect('naplo_intezmeny'); - db_start_trans($lr); - - $targyAdat = getTargyById($ADAT['targyId']); - // tankörnév módosítás - $q = "UPDATE tankorSzemeszter SET tankorNev=REPLACE(tankorNev,'%s','%s') - WHERE tankorId IN (SELECT tankorId FROM tankor WHERE targyId=%u)"; - $v = array($targyAdat['targyNev'], $ADAT['ujTargyNev'], $ADAT['targyId']); - $r = db_query($q, array('fv'=>'targyAtnevezes/tankor','values'=>$v), $lr); - if (!$r) { db_rollback($lr); db_close($lr); return false; } - // tárgy átnevezés - $q = "UPDATE targy SET targyNev='%s' WHERE targyId=%u"; - $v = array($ADAT['ujTargyNev'], $ADAT['targyId']); - $r = db_query($q, array('fv'=>'targyAtnevezes/targy','values'=>$v), $lr); - if (!$r) { db_rollback($lr); db_close($lr); return false; } - - db_commit($lr); - db_close($lr); - return true; - - } - -?> \ No newline at end of file diff --git a/mayor-orig/www/include/modules/naplo/intezmeny/osztaly.php b/mayor-orig/www/include/modules/naplo/intezmeny/osztaly.php deleted file mode 100644 index a23daa2e..00000000 --- a/mayor-orig/www/include/modules/naplo/intezmeny/osztaly.php +++ /dev/null @@ -1,474 +0,0 @@ -delType('osztaly'); - - $leiras = $ADAT['leiras']; $kTanev = $ADAT['kezdoTanev']; $vTanev = $ADAT['vegzoTanev']; - $kEvfolyamSorszam = $ADAT['kezdoEvfolyamSorszam']; $jel = $ADAT['jel']; - $telephelyId = $ADAT['telephelyId']; - // Felhasználva, hogy le vannak kérdzve a definiált tanévek - // Ellenőrizzük, hogy a megadott tanév helyes-e... - if (!in_array($kTanev,$ADAT['tanevek']) || !in_array($vTanev,$ADAT['tanevek'])) { - $_SESSION['alert'][] = 'message:wrong_data:ujOsztaly:'."$kTanev/$vTanev"; - return false; - } - - // Csatlakozás az adatbázishoz - $lr = db_connect('naplo_intezmeny', array('fv' => 'ujOsztaly')); - if (!$lr) return false; - - // Osztály felvétele - if (isset($telephelyId)) { - $q = "INSERT INTO osztaly (leiras, kezdoTanev, vegzoTanev, kezdoEvfolyamSorszam, jel, telephelyId, osztalyJellegId) - VALUES ('%s', %u, %u, %u, '%s', %u, %u)"; - $v = array($leiras, $kTanev, $vTanev, $kEvfolyamSorszam, $jel, $telephelyId, $ADAT['osztalyJellegId']); - } else { - $q = "INSERT INTO osztaly (leiras, kezdoTanev, vegzoTanev, kezdoEvfolyamSorszam, jel, osztalyJellegId) - VALUES ('%s', %u, %u, %u, '%s', %u)"; - $v = array($leiras, $kTanev, $vTanev, $kEvfolyamSorszam, $jel, $ADAT['osztalyJellegId']); - } - $osztalyId = db_query($q, array('fv' => 'ujOsztaly', 'modul' => 'naplo_intezmeny', 'result' => 'insert', 'values' => $v), $lr); - if (!$osztalyId) { db_close($lr); return false; } - - // Az aktív tanévek osztalyNaplo táblájába vegyük fel az osztályt! És ha inicializálva van a munkaterv, akkor a default-hoz rendeljük is hozzá! - // Aktív tanévek lekérdezése - $ok = updateOsztalyNev($osztalyId, $lr); - - db_close($lr); - return $osztalyId; -} - -function updateOsztalyNev($osztalyId, $lr = null) { - /* - Az aktív tanévek osztalyNaplo táblájába vegyük fel/módosítsuk az osztályt! És ha inicializálva van a munkaterv, és nincs még hozzárendelve, - akkor a default-hoz rendeljük is hozzá! - Hopp! És a tankör-nevek? - */ - - global $mayorCache; - $mayorCache->delType('osztaly'); - - // Aktív tanévek lekérdezése - $q ="SELECT DISTINCT tanev FROM szemeszter WHERE statusz = 'aktív'"; - $ret = db_query($q, array('fv' => 'updateOsztalyNev', 'modul' => 'naplo_intezmeny', 'result' => 'idonly', 'values' => array()), $lr); - if (!is_array($ret)) { return false; } - $ok = true; - foreach ($ret as $key => $te) { - $tanevDb = tanevDbNev(__INTEZMENY,$te); - $osztalyAdat = getOsztalyAdat($osztalyId, $te, $lr); - if ($te < $osztalyAdat['kezdoTanev'] || $te > $osztalyAdat['vegzoTanev']) { // ebben a tanévben nem érintett az osztály - // törlés az osztalyNaplo táblából - $q = "DELETE FROM `%s`.osztalyNaplo WHERE osztalyId=%u"; - $v = array($tanevDb, $osztalyId); - $ok = $ok && db_query($q, array('fv' => 'updateOsztalyNev/osztalyNaplo - delete', 'modul' => 'naplo_intezmeny', 'values' => $v), $lr); - // törlés a munkatervOsztaly táblából - $q = "DELETE FROM `%s`.munkatervOsztaly WHERE osztalyId=%u"; - $v = array($tanevDb, $osztalyId); - $ok = $ok && db_query($q, array('fv' => 'updateOsztalyNev/munkatervOsztaly - delete', 'modul' => 'naplo_intezmeny', 'values' => $v), $lr); - } else { // ebben a tanévben érintett az osztály - $osztalyJel = getOsztalyJel($osztalyId, $te, $osztalyAdat, $lr); - $evfolyamJel = getEvfolyamJel($osztalyId, $te, $osztalyAdat, $osztalyJellel=false, $lr); - $evfolyam = getEvfolyam($osztalyId, $te, $osztalyAdat, $lr); - // Osztálynapló felvétele - $q = "REPLACE INTO `%s`.osztalyNaplo (osztalyId, osztalyJel, evfolyam, evfolyamJel) VALUES (%u, '%s', %u, '%s')"; - $v = array($tanevDb, $osztalyId, $osztalyJel, $evfolyam, $evfolyamJel); - $ok = $ok && db_query($q, array('fv' => 'updateOsztalyNev/osztalyNaplo - replace', 'modul' => 'naplo_intezmeny', 'values' => $v), $lr); - if (!$ok) continue; - // Van-e inicializált munkaterv? - $q = "SELECT COUNT(*) FROM `%s`.munkaterv WHERE munkatervId=1"; - $v = array($tanevDb); - $db = db_query($q, array('fv' => 'updateOsztalyNev/munkaterv', 'modul' => 'naplo_intezmeny', 'values' => $v, 'result' => 'value'), $lr); - if ($db == 1) { // Ha van, akkor van-e már osztaly-munkaterv hozzárendelés - $q = "SELECT COUNT(*) FROM `%s`.munkatervOsztaly WHERE osztalyId=%u"; - $v = array($tanevDb, $osztalyId); - $db = db_query($q, array('fv' => 'updateOsztalyNev/munkatervOsztaly - select', 'modul' => 'naplo_intezmeny', 'values' => $v, 'result'=>'value'), $lr); - if ($db == 0) { // Ha nincs, akkor rendeljük az 1-es munkatervhez az osztályt - $q = "INSERT INTO `%s`.munkatervOsztaly (munkatervId, osztalyId) VALUES (1, %u)"; - $v = array($tanevDb, $osztalyId); - $ok = $ok && db_query($q, array('fv' => 'updateOsztaly/munkatervOsztaly - insert', 'modul' => 'naplo_intezmeny', 'values' => $v), $lr); - } - } - } - } // foreach... - // tankör-nevek módosítása - $q = "SELECT tankorId FROM tankorOsztaly WHERE osztalyId = %u"; - $v = array($osztalyId); - $tankorIds = db_query($q, array('fv' => 'updateOsztalyNev', 'modul' => 'naplo_intezmeny', 'result' => 'idonly', 'values' => $v), $lr); - if (is_array($tankorIds) && count($tankorIds)>0) { - for ($i=0; $i 'updateOsztaly')); - if (!$lr) { - $_SESSION['alert'][] = 'message:db_connect_failure:updateOsztaly'; - fclose($fp); - return false; - } - db_start_trans($lr); - - // Az első sor kihagyása - if ($rovatfej) $sor = fgets($fp,1024); - $TAG = $TAGV = array(); - while ($sor = fgets($fp, 1024)) { - - $adatSor = explode($mezo_elvalaszto, chop($sor)); - $beDt = $kiDt = ''; - if ($keyBeDt !== false) $beDt = $adatSor[$keyBeDt]; - if ($keyKiDt !== false) $kiDt = $adatSor[$keyKiDt]; - // keresési feltétel összerakása - $where = $wherev = array(); - for ($i = 0; $i < count($KULCS_MEZOK); $i++) { - if ($adatSor[$KULCS_MEZOK[$i]] != '') { - if ($adatSor[$KULCS_MEZOK[$i]] == '\N') { - $where[] = "`%s`=NULL"; - array_push($wherev, $MEZO_LISTA[$KULCS_MEZOK[$i]]); - } else { - $where[] = "`%s`='%s'"; - array_push($wherev, $MEZO_LISTA[$KULCS_MEZOK[$i]], $adatSor[$KULCS_MEZOK[$i]]); - } - } - } - if (count($where) > 0) { - $q = "SELECT diakId FROM diak WHERE ".implode(' AND ', $where); - $diakIds = db_query($q, array('fv' => 'updateOsztaly', 'modul' => 'naplo_intezmeny', 'result' => 'idonly', 'values' => $wherev), $lr); - $num = count($diakIds); - } else { $num = 0; } - if ($num == 1 && _SKIP_ON_DUP === true) { $_SESSION['alert'][] = 'info:_SKIP_ON_DUP:'.serialize($sor); continue; } - if ($num == 1) { // update - // tag felvételhez adatsor - $diakId = $diakIds[0]; - if (!isset($kiDt) || $kiDt=='') { - $TAG[] = "(%u, %u, '%s', NULL)"; - array_push($TAGV, $diakId, $osztalyId, $beDt); - } else { - $TAG[] = "(%u, %u, '%s', '%s')"; - array_push($TAGV, $diakId, $osztalyId, $beDt, $kiDt); - } - // diak adatok frissítése - $UPDATE = $UPDATEV = array(); - for ($i = 0; $i < count($MEZO_LISTA); $i++) { - if ( - $MEZO_LISTA[$i] != '' - and $adatSor[$i] != '' - and !in_array($i, $KULCS_MEZOK) - ) { - $UPDATE[] = "`%s`='%s'"; - array_push($UPDATEV, $MEZO_LISTA[$i], $adatSor[$i]); - } - } - if (count($UPDATE) > 0) { - $q = "UPDATE diak SET ".implode(',', $UPDATE)." WHERE ".implode(' AND ', $where); - $v = mayor_array_join($UPDATEV, $wherev); - $r = db_query($q, array('fv' => 'updateOsztaly/update', 'modul' => 'naplo_intezmeny', 'values' => $v, 'rollback' => true), $lr); - if (!$r) { - db_close($lr); - fclose($fp); - return false; - } - } - } elseif ($num == 0) { // insert - $insertValues = $insertPatterns = array(); - for ($i = 0; $i < count($MEZO_LISTA); $i++) { - if ($MEZO_LISTA[$i] != '') { - if ($adatSor[$i] == '\N') { - $insertValues[] = 'NULL'; - $insertPatterns[] = '%s'; - } else { - $insertValues[] = $adatSor[$i]; - $insertPatterns[] = "'%s'"; - } - } - } - $q = 'INSERT INTO `diak` ('.implode(',', array_fill(0, count($attrList), '%s')).') - VALUES ('.implode(',', $insertPatterns).')'; - $v = mayor_array_join($attrList, $insertValues); - /* - - - - $value = array(); - for ($i = 0; $i < count($MEZO_LISTA); $i++) { - if ($MEZO_LISTA[$i] != '') $value[] = $adatSor[$i]; - } - // beszúrás egyesével, hogy meglegyen a diakId (insert_id) - $q = "INSERT INTO diak (`".implode("`,`", array_fill(0, count($attrList), '%s'))."`) - VALUES ('".implode("','", array_fill(0, count($value), '%s'))."')"; - $v = array_merge($attrList, $value); - - */ - $diakId = db_query($q, array('fv' => 'updateOsztaly/insert', 'modul' => 'naplo_intezmeny', 'result' => 'insert', 'values' => $v, 'rollback' => true), $lr); - if (!$diakId) { - db_close($lr); - fclose($fp); - return false; - } - - if ($diakId) { - // tagok adatai - if (!isset($kiDt) || $kiDt=='') { - $TAG[] = "(%u, %u,'%s', NULL)"; - array_push($TAGV, $diakId, $osztalyId, $beDt); - } else { - $TAG[] = "(%u, %u, '%s', '%s')"; - array_push($TAGV, $diakId, $osztalyId, $beDt, $kiDt); - } - } - } else { - $_SESSION['alert'][] = 'message:wrong_data:'.$where; - } - } // while - if (count($TAG) > 0) { // tagok felvétele az osztályba - $q = "REPLACE INTO osztalyDiak (diakId,osztalyId,beDt,kiDt) VALUES ".implode(",\n",$TAG); - $r = db_query($q, array('fv' => 'updateOsztaly/osztályba', 'modul' => 'naplo_intezmeny', 'values' => $TAGV, 'rollback'=>true), $lr); - if (!$r) { - db_close($lr); - fclose($fp); - return false; - } - } - db_commit($lr); - db_close($lr); - - fclose($fp); - return true; -} - -/* áthelyezve: share/osztalyModifier.php -// osztalyId, tanarId, beDt --> kiDt -function osztalyfonokKileptetes($osztalyId, $tanarId, $beDt, $kiDt, $olr = '') { -... -} -*/ - -function osztalyfonokKinevezes($osztalyId, $tanarId, $beDt, $lr = null) { - - global $mayorCache; - $mayorCache->delType('osztaly'); - - // Ellenőrizzük, hogy az adott időszakban nincs-e már kinevezve ofőnek - $q = "SELECT COUNT(*) AS db FROM osztalyTanar WHERE osztalyId=%u AND tanarId=%u - AND (beDt<'%s' AND '%s' 'osztalyfonokKinevezes', 'modul' => 'naplo_intezmeny', 'result' => 'value', 'values' => $v), $lr); - - if ($db > 0) { - $_SESSION['alert'][] = 'message:wrong_data:már ki van nevezve:'."$beDt - $kiDt:$num"; - return false; - } - - $q = "INSERT INTO osztalyTanar (osztalyId, tanarId, beDt, kiDt) VALUES (%u, %u, '%s', NULL)"; - $v = array($osztalyId, $tanarId, $beDt); - return db_query($q, array('fv' => 'osztalyfonokKinevezes', 'modul' => 'naplo_intezmeny', 'values' => $v), $lr); - -} - -/* - TODO: az osztalyJellegId módosítása nem megengedett, vagy végig kell gondolni, - hogy mi mindent érint (osztalyJel, evfolyam, evfolyamJel - minden érintett tanév osztalyNaplo táblájában+tankör nevek+vegzoTanev...) -*/ -function osztalyLeirasTelephelyModositas($osztalyId, $leiras, $telephelyId, $osztalyJellegId, $kezdoEvfolyamSorszam, $osztalyAdat, $lr = null) { - - global $mayorCache; - $mayorCache->delType('osztaly'); - - if (isset($telephelyId) && $telephelyId != '') { - $q = "UPDATE osztaly SET leiras='%s',telephelyId=%u, kezdoEvfolyamSorszam=%u WHERE osztalyId=%u"; - $v = array($leiras, $telephelyId, $kezdoEvfolyamSorszam, $osztalyId); - } else { - $q = "UPDATE osztaly SET leiras='%s',telephelyId=NULL, kezdoEvfolyamSorszam=%u WHERE osztalyId=%u"; - $v = array($leiras, $kezdoEvfolyamSorszam, $osztalyId); - } - $ret = db_query($q, array('fv' => 'osztalyLeirasTelephelyModositas', 'modul' => 'naplo_intezmeny', 'values' => $v), $lr); - return osztalyJellegModositas($osztalyId, $osztalyJellegId, $osztalyAdat, $lr); - -} - -function osztalyJellegModositas($osztalyId, $osztalyJellegId, $osztalyAdat, $lr = null) { - - global $mayorCache; - $mayorCache->delType('osztaly'); - - // Az osztalyJelleg lekérdezése - $ojAdat = getOsztalyJellegAdat($osztalyJellegId); - $ojEvfolyamJelek = explode(',', $ojAdat['evfolyamJelek']); - // csak akkor módosítunk, ha az oszály évfolyamainak száma <= az osztály-jelleg évfolyamainak száma - if (count($ojEvfolyamJelek) < ($osztalyAdat['vegzoTanev']-$osztalyAdat['kezdoTanev']+$osztalyAdat['kezdoEvfolyamSorszam'])) { - $_SESSION[] = 'message:wrong_data:Az osztály évfolyamainak száma nem engedi meg az adott osztály-jellegre váltást'; - return false; - } - // osztalyJelleg módosítása - $q = "UPDATE osztaly SET osztalyJellegId=%u WHERE osztalyId=%u"; - $v = array($osztalyJellegId, $osztalyId); - $ret = db_query($q, array('fv' => 'osztalyJellegModositas', 'modul' => 'naplo_intezmeny', 'values' => $v), $lr); - // tanév adatbázisok frissítése (osztalyNaplo, munkatervOsztaly) - return updateOsztalyNev($osztalyId, $lr); -} - -function osztalyTorles($osztalyId) { - - global $mayorCache; - $mayorCache->delType('osztaly'); - - $q = "DELETE FROM osztaly WHERE osztalyId=%u"; - return db_query($q, array('fv' => 'osztalyTorles', 'modul' => 'naplo_intezmeny', 'values' => array($osztalyId))); - -} - -function ujTag($osztalyId, $diakId, $beDt, $kiDt) { -/* - * Az osztályba sorolás MOSTANTÓL többszakaszos, mint pl. a tankörbesorolás, azaz a diakId:osztalyId:beDt a - * kulcs a kapcsolótáblában. - */ - - // Csatlakozás az adatbázishoz - $lr = db_connect('naplo_intezmeny', array('fv' => 'ujTag')); - if (!$lr) return false; - db_start_trans($lr); - - // Van-e már beDt-t tartalmazó osztálytagsága - $q = "SELECT beDt FROM osztalyDiak WHERE osztalyId=%u AND diakId=%u AND beDt<'%s' AND (kiDt IS NULL OR kiDt >= '%s')"; - $ret = db_query($q, array('fv' => 'ujTag', 'modul' => 'naplo_intezmeny', 'result' => 'value', 'values' => array($osztalyId, $diakId, $beDt, $beDt))); - if (!is_null($ret)) $beDt = $ret; - - if ($kiDt != '') { - // Ha kiDt nem üres, akkor: van-e kiDt-t tartalmazó osztálytagsága - $q = "SELECT kiDt FROM osztalyDiak WHERE osztalyId=%u AND diakId=%u AND beDt<'%s' AND (kiDt IS NULL OR kiDt >= '%s')"; - $ret = db_query($q, array('fv' => 'ujTag', 'modul' => 'naplo_intezmeny', 'result' => 'record', 'values' => array($osztalyId, $diakId, $kiDt, $kiDt))); - if (!is_null($ret)) $kiDt = $ret['kiDt']; - } - - if ($kiDt == '') { - // Ha $kiDt üres, akkor töröljük az eddigi bejegyzéseket a lefedett tartományból és felvesszük az újat - $q = "DELETE FROM osztalyDiak WHERE osztalyId=%u AND diakId=%u AND beDt>='%s'"; - db_query($q, array('fv' => 'ujTag/töröl', 'modul' => 'naplo_intezmeny', 'values' => array($osztalyId, $diakId, $beDt))); - $q = "INSERT INTO osztalyDiak (osztalyId, diakId, beDt, kiDt) VALUES (%u, %u, '%s', NULL)"; - db_query($q, array('fv' => 'ujTag/felvesz', 'modul' => 'naplo_intezmeny', 'values' => array($osztalyId, $diakId, $beDt))); - } else { - // Ha $kiDt nem üres, akkor töröljük az eddigi bejegyzéseket a lefedett tartományból és felvesszük az újat - $q = "DELETE FROM osztalyDiak WHERE osztalyId=%u AND diakId=%u AND '%s'<=beDt AND kiDt<='%s'"; - db_query($q, array('fv' => 'ujTag/töröl', 'modul' => 'naplo_intezmeny', 'values' => array($osztalyId, $diakId, $beDt, $kiDt))); - $q = "INSERT INTO osztalyDiak (osztalyId, diakId, beDt, kiDt) VALUES (%u, %u, '%s', '%s')"; - db_query($q, array('fv' => 'ujTag/felvesz', 'modul' => 'naplo_intezmeny', 'values' => array($osztalyId, $diakId, $beDt, $kiDt))); - } - - db_commit($lr); - db_close($lr); - return $r; -} - -function diakKepzesModositas($diakIds, $kepzesMod, $dt) { - - $modKepzesIds = array_keys($kepzesMod); - - if (!is_array($diakIds) || !is_array($modKepzesIds) || count($diakIds) == 0) return false; - $lr = db_connect('naplo_intezmeny'); - db_start_trans($lr); - - // A megadott diákok adott dátum szerinti képzései - $q = "SELECT kepzesId, diakId FROM kepzesDiak WHERE diakId IN (".implode(',', array_fill(0, count($diakIds), '%u')).") AND tolDt<='%s' AND (igDt IS NULL OR '%s'<=igDt)"; - $v = mayor_array_join($diakIds, array($dt,$dt)); - $kepzesOld = db_query($q, array('fv' => 'diakKepzesModositas/dKepzes','modul'=>'naplo_intezmeny','values'=>$v,'result'=>'keyvalues'), $lr); - if (!is_array($kepzesOld)) { db_rollback($lr); db_close($lr); return false; } - - $oldKepzesIds = array_keys($kepzesOld); - $kepzesIds = array_unique(array_merge($modKepzesIds, $oldKepzesIds)); - foreach ($kepzesIds as $kepzesId) { - - if (!is_array($kepzesMod[$kepzesId])) $kepzesMod[$kepzesId] = array(); - if (!is_array($kepzesOld[$kepzesId])) $kepzesOld[$kepzesId] = array(); - - $add = array_unique(array_diff($kepzesMod[$kepzesId], $kepzesOld[$kepzesId])); - $del = array_unique(array_diff($kepzesOld[$kepzesId], $kepzesMod[$kepzesId])); - $diff = array_unique(array_merge($add, $del)); - // Aki $dt után került be a képzésbe és most kiveendő vagy felveendő, azt töröljük - if (count($diff) > 0) { - $q = "DELETE FROM kepzesDiak WHERE kepzesId=%u AND tolDt>'%s' - AND diakId IN (".implode(',',array_fill(0,count($diff),'%u')).")"; - $v = mayor_array_join(array($kepzesId, $dt), $diff); - $r = db_query($q, array('fv'=>'diakKepzesModositas/delete','modul'=>'naplo_intezmeny','values'=>$v), $lr); - if (!$r) { db_rollback($lr); db_close($lr); return false; } - } - if (count($del) > 0) { - // a tolDt=$dt esetén csak a lezárandókat kell törölni - $q = "DELETE FROM kepzesDiak WHERE kepzesId=%u AND tolDt='%s' - AND diakId IN (".implode(',',array_fill(0,count($del),'%u')).")"; - $v = mayor_array_join(array($kepzesId, $dt), $del); - $r = db_query($q, array('fv'=>'diakKepzesModositas/delete','modul'=>'naplo_intezmeny','values'=>$v), $lr); - // Aki korábban benne volt a képzésben, de most nincs, azt le kell zárni - $q = "UPDATE kepzesDiak SET igDt='%s' - INTERVAL 1 DAY WHERE kepzesId=%u AND tolDt<'%s' AND (igDt IS NULL OR '%s'<=igDt) - AND diakId IN (".implode(',',array_fill(0,count($del),'%u')).")"; - $v = mayor_array_join(array($dt, $kepzesId, $dt, $dt), $del); - $r = db_query($q, array('fv'=>'diakKepzesModositas/update','modul'=>'naplo_intezmeny','values'=>$v), $lr); - if (!$r) { db_rollback($lr); db_close($lr); return false; } - } - if (count($add) > 0) { - // Aki eddig nem volt, azt fel kell venni - $v = $INS = array(); - foreach ($add as $diakId) { - $INS[] = "(%u, %u, '%s', NULL)"; - array_push($v, $kepzesId, $diakId, $dt); - } - if (count($INS)>0) { - $q = "INSERT INTO kepzesDiak (kepzesId, diakId, tolDt, igDt) VALUES ".implode(',',$INS); - db_query($q, array('fv'=>'diakKepzesModositas/inster','modul'=>'naplo_intezmeny','values'=>$v), $lr); - if (!$r) { db_rollback($lr); db_close($lr); return false; } - } - } - } - db_commit($lr); - db_close($lr); - -} - -?> \ No newline at end of file diff --git a/mayor-orig/www/include/modules/naplo/intezmeny/tanar.php b/mayor-orig/www/include/modules/naplo/intezmeny/tanar.php deleted file mode 100644 index 68a203a8..00000000 --- a/mayor-orig/www/include/modules/naplo/intezmeny/tanar.php +++ /dev/null @@ -1,54 +0,0 @@ - $value) { - if (array_key_exists($attr, $FIELDS) && !in_array($attr, array('action','tanarId'))) { - if ($value == '') { - $T[] = "$attr=NULL"; - } else { - $v[] = $value; - $T[] = "$attr='%s'"; - } - } - } - $q = "UPDATE tanar SET ".implode(',',$T)." WHERE tanarId=%u"; - $v[] = $ADAT['tanarId']; - return db_query($q, array('fv' => 'tanarAdatModositas', 'modul' => 'naplo_intezmeny', 'values' => $v)); - - } - - function ujTanar($ADAT) { - - - $FIELDS = getTableFields('tanar'); - $A = $V = $v = array(); - // Ellenőrizzük, hogy az oktatási azonosító szerepel-e már.... - if ($ADAT['oId'] != '') { - $q = "SELECT COUNT(*) FROM tanar WHERE oId=%u"; - $db = db_query($q, array('fv' => 'ujTanar/ütközés ellenőrzés','modul' => 'naplo_intezmeny', 'values' => array($ADAT['oId']), 'result' => 'value')); - if ($db > 0) { - $_SESSION['alert'][] = 'message:wrong_data:ujTanar/ütközés ellenőrzés:ütköző oktatási azonosító ('.$ADAT['oId'].')'; - return false; - } - } - foreach($ADAT as $attr => $value) { - if (array_key_exists($attr,$FIELDS) && !in_array($attr, array('action','tanarId'))) { - if ($value == '' && !in_array($attr, array('viseltNevElotag'))) { - $V[] = "NULL"; - } else { - $V[] = "'%s'"; - $v[] = $value; - } - $A[] = "$attr"; - } - } - $q = "INSERT INTO tanar (".implode(',', $A).") VALUES (".implode(',',$V).')'; - - return db_query($q, array('fv' => 'ujTanar', 'modul' => 'naplo_intezmeny', 'result' => 'insert', 'values' => $v), $lr); - - } - -?> diff --git a/mayor-orig/www/include/modules/naplo/intezmeny/tankor.php b/mayor-orig/www/include/modules/naplo/intezmeny/tankor.php deleted file mode 100644 index 6b1a3df4..00000000 --- a/mayor-orig/www/include/modules/naplo/intezmeny/tankor.php +++ /dev/null @@ -1,202 +0,0 @@ - 'ujTankor')); - if (!$lr) return false; - - /* pre-check variables */ - //... - /* pre-check */ - if (isset($ADAT['tankorId']) && $ADAT['tankorId']!='') { - $return = $tankorId = $ADAT['tankorId']; - $_tankorCn = $ADAT['tankorCn']; - $q = "UPDATE tankor SET felveheto=%u, min=%u, max=%u, kovetelmeny='%s', tankorCn='%s' WHERE tankorId=%u"; - $v = array($ADAT['felveheto'], $ADAT['min'], $ADAT['max'], $ADAT['kovetelmeny'],$_tankorCn,$tankorId); - db_query($q, array('fv' => 'ujTankor', 'modul' => 'naplo_intezmeny', 'values' => $v)); - $tanarFelvesz = false; - } else { - $q = "INSERT INTO tankor (targyId,felveheto,min,max,kovetelmeny) VALUES (%u, '%s', %u, %u,'%s')"; - $v = array($ADAT['targyId'], $ADAT['felveheto'], $ADAT['min'], $ADAT['max'], $ADAT['kovetelmeny']); - $return = $tankorId = db_query($q, array('fv' => 'ujTankor', 'modul' => 'naplo_intezmeny', 'result' => 'insert', 'values' => $v), $lr); - $tanarFelvesz = true; - } - /* tankorTipus rev 1261++ -- 1294 */ - if (isset($ADAT['tankorTipus']) && !is_null($ADAT['tankorTipus'])) { - $q = "UPDATE tankor SET tankorTipus='%s' WHERE tankorId=%u"; - $v = array($ADAT['tankorTipus'], $tankorId); - db_query($q, array('fv' => 'ujTankor', 'modul' => 'naplo_intezmeny', 'values' => $v)); - } - /* tankorTipus rev 1294++ */ - if (isset($ADAT['tankorTipusId']) && !is_null($ADAT['tankorTipusId'])) { - $q = "UPDATE tankor SET tankorTipusId='%s' WHERE tankorId=%u"; - $v = array($ADAT['tankorTipusId'], $tankorId); - db_query($q, array('fv' => 'ujTankor', 'modul' => 'naplo_intezmeny', 'values' => $v)); - $q = "SELECT jelleg FROM tankorTipus WHERE tankorTipusId=%u"; - $v = array($ADAT['tankorTipusId']); - $tankorTipusJelleg = db_query($q, array('fv' => 'ujTankor', 'modul' => 'naplo_intezmeny', 'result'=>'value','values' => $v)); - } - - /* TankörCsoport min/max - a tankörcsoport minden tankörében átállítjuk ezeket */ - $q = "UPDATE ".__INTEZMENYDBNEV.".tankor SET min=%u, max=%u WHERE tankorId IN ( - SELECT DISTINCT tankorId FROM tankorCsoport WHERE csoportId IN ( - SELECT csoportId FROM tankorCsoport WHERE tankorId=%u - ) - )"; - $v = array($ADAT['min'], $ADAT['max'], $tankorId); - db_query($q, array('fv' => 'ujTankor/minMax', 'modul' => 'naplo', 'values' => $v)); - - //-- - $IOSZTALY = getTankorOsztalyai($tankorId, array('result' => 'id'), $lr); //TAGOK ALAPJÁN??? - for ($i = 0; $i < count($ADAT['osztalyok']); $i++) { - $q = "REPLACE INTO tankorOsztaly (tankorId, osztalyId) VALUES (%u, %u)"; - $v = array($tankorId, $ADAT['osztalyok'][$i]); - db_query($q, array('fv' => 'ujTankor', 'modul' => 'naplo_intezmeny', 'values' => $v), $lr); - } - - /* */ - $TOSZTALY = getTankorOsztalyaiByTanev($tankorId, $ADAT['tanev'], array('result' => 'id', 'tagokAlapjan' => true), $lr); - - /* FIGYELEM! EZ veszélyes művelet! */ - if (is_array($IOSZTALY) && is_array($ADAT['osztalyok'])) $DEL_OSZTALY = array_diff($IOSZTALY,$ADAT['osztalyok']); - if (($_ERR = array_intersect($DEL_OSZTALY,$TOSZTALY))) { - $_SESSION['alert'][] = 'info:tankorOsztalyNemTorolheto:'.implode('-',$_ERR); - for ($k=0; $k0) { - $q = "DELETE FROM tankorOsztaly WHERE osztalyId IN (".implode(',', array_fill(0, count($DEL_OSZTALY), '%u')).") AND tankorId=%u"; - $v = mayor_array_join($DEL_OSZTALY, array($tankorId)); - db_query($q, array('fv' => 'ujTankor/del-oszt', 'modul' => 'naplo_intezmeny', 'values' => $v), $lr); - } - - /* create name */ - // osztalyId alapján évfolyam, osztály jelek lekérdezése - // abból összeállítás - // getOsztalyAdat helyett - - $TARGYADAT = getTargyById($ADAT['targyId'],$lr); - $kdt = '3000-01-01'; - $vdt = '1970-01-01'; - if (is_array($ADAT['szemeszterek'])) - for ($j = 0; $j < count($ADAT['szemeszterek']); $j++) { - $nev = ''; - $szid = $ADAT['szemeszterek'][$j]; - $_SZ = getSzemeszterek(array('filter' => array("szemeszterId=$szid"))); - if ($_SZ[0]['kezdesDt'] < $kdt) $kdt = $_SZ[0]['kezdesDt']; - if ($_SZ[0]['zarasDt'] > $vdt) $vdt = $_SZ[0]['zarasDt']; - $_tanev = $_SZ[0]['tanev']; - $_szemeszter = $_SZ[0]['szemeszter']; - $_oraszam = $ADAT['SZ'.$szid]; - if ($tankorTipusJelleg=='osztályfüggetlen') { - $nev = "Isk."; - } else { - $OSZTALYOK = getOsztalyok($_tanev); - if ($OSZTALYOK !== false && is_array($OSZTALYOK) && is_array($ADAT['osztalyok'])) { - $nev = ''; - $TMP = array(); - for($i = 0; $i < count($OSZTALYOK); $i++) { - // Ha évenként változik az osztály jele, akkor jobb, ha nem generáljuk, hanem a lekérdezett adatokat használjuk! - // $_oj = genOsztalyJel($_tanev, $OSZTALYOK[$i]); - $_oj = $OSZTALYOK[$i]['osztalyJel']; - if ($_oj!==false && !is_null($_oj)) { - list($e,$o) = explode('.',$_oj); - if (in_array($OSZTALYOK[$i]['osztalyId'], $ADAT['osztalyok'])) $TMP[$e][]= $o; - } - } - if (count(array_keys($TMP)) == 1) { // évfolyamon belüli osztályok: - $nev = implode('||',array_keys($TMP)); - $nev .= '.'.implode('',$TMP[$nev]); - } elseif (count((array_keys($TMP)))>1) { // multi évfolyam: - $K = (array_keys($TMP)); - sort($K); - $nev = $K[0].'-'.$K[count($K)-1].'.'; - } else { // ekkorra már elballagott minden osztaly... - $nev = false; - $_SESSION['alert'][] = '::Minden osztály elballagott'; - } - } else { - $nev = false; // adott szemeszterbe nem jár osztály - $_SESSION['alert'][] = '::Az adott szemeszterbe nem jár osztály'; - } - } - if ($nev !== false) { - $nev .= ' '.$TARGYADAT['targyNev']; - $nev .= ' '; - - $q = "SELECT tankorJel FROM tankor LEFT JOIN tankorTipus USING (tankorTipusId) WHERE tankorId=%u"; - $tankorJel = db_query($q, array('fv' => 'genTankorNev', 'modul' => 'naplo_intezmeny', 'result'=>'value', 'values' => array($tankorId), 'debug'=>false), $lr); - if ($tankorJel!='') $nev .= $tankorJel.' '.$ADAT['tipus']; - else $nev .= $ADAT['tipus']; - $q = "REPLACE INTO tankorSzemeszter (tankorId,tanev,szemeszter,oraszam,tankorNev) VALUES (%u, %u, %u, %f, '%s')"; - if ($ADAT['tanev'] < __TANEV || $ADAT['tankorNevMegorzes']===true) { // a neve már ne változzon, és az óraszáma? - $q1 = "SELECT tankorNev FROM tankorSzemeszter WHERE tankorId=%u AND tanev=%u AND szemeszter=%u"; - // OVERWRITE!!!! - $orignev = db_query($q1, array('fv' => 'ujTankor', 'result'=>'value', 'modul' => 'naplo_intezmeny', 'values' => array($tankorId,$_tanev,$_szemeszter), 'debug'=>false), $lr); - if ($orignev!='' && $orignev!='Array') $nev = $orignev; // csúnya bugfix - } - $v = array($tankorId, $_tanev, $_szemeszter, $_oraszam, $nev); - if ($nev!='') db_query($q, array('fv' => 'ujTankor', 'modul' => 'naplo_intezmeny', 'values' => $v, 'debug'=>false), $lr); - // delete!!!!???? - } - - } - if ($tanarFelvesz && $ADAT['tanarId']!='') { - - $q = "INSERT INTO tankorTanar (tankorId,tanarId,beDt,kiDt) VALUES (%u, %u, '%s', '%s')"; - $v = array($tankorId, $ADAT['tanarId'], $kdt, $vdt); - $r = db_query($q, array('fv' => 'ujTankor', 'modul' => 'naplo_intezmeny', 'values' => $v), $lr); - - } - - // ======================================================= - - db_close($lr); - - return $return; - } - - function tankorTorol($tankorId) { - - $q = "DELETE FROM tankor WHERE tankorId=%u"; - return db_query($q, array('fv' => 'tankorTorol', 'modul' => 'naplo_intezmeny', 'values' => array($tankorId))); - - } - - function tankorTargyModositas($ADAT) { - /** - * Elvárt paraméterek: $ADAT['tankorId'], $ADAT['ujTargyId'], $ADAT['targyId'] // az eredeti - **/ - $lr = db_connect('naplo_intezmeny'); - if (!$lr) return false; - db_start_trans($lr); - - // A régi és új tárgynév lekérdezése - $q = "SELECT targyId, targyNev FROM targy WHERE targyId IN (%u, %u)"; - $v = array($ADAT['ujTargyId'], $ADAT['targyId']); - $ret = db_query($q, array('fv'=>'tankorTargyModositas/targyNev','values'=>$v, 'result'=>'keyvaluepair'), $lr); - // a tárgynév cserje a tankorSzemeszter táblában - $q = "UPDATE tankorSzemeszter SET tankorNev=REPLACE(tankorNev,'%s','%s') WHERE tankorId=%u"; - $v = array($ret[$ADAT['targyId']], $ret[$ADAT['ujTargyId']], $ADAT['tankorId']); - $r = db_query($q, array('fv'=>'tankorTargyModositas/updateTargyNev','values'=>$v), $lr); - if (!$r) { db_rollback($lr, 'tankorTargyModositas'); db_close($lr); return false; } - // A targyId módosítása - $q = "UPDATE tankor SET targyId=%u WHERE tankorId=%u"; - $v = array($ADAT['ujTargyId'], $ADAT['tankorId']); - $r = db_query($q, array('fv'=>'tankorTargyModositas/updateTargyId','values'=>$v), $lr); - if (!$r) { db_rollback($lr, 'tankorTargyModositas'); db_close($lr); return false; } - $nev = setTankorNev($ADAT['tankorId'], $tankorNevExtra=null, $lr); - if (!$nev) { db_rollback($lr, 'tankorTargyModositas'); db_close($lr); return false; } - - db_commit($lr); - db_close($lr); - return true; - - } - -?> diff --git a/mayor-orig/www/include/modules/naplo/intezmeny/tankorSzemeszter.php b/mayor-orig/www/include/modules/naplo/intezmeny/tankorSzemeszter.php deleted file mode 100644 index fcd411c4..00000000 --- a/mayor-orig/www/include/modules/naplo/intezmeny/tankorSzemeszter.php +++ /dev/null @@ -1,200 +0,0 @@ - [multiassoc][tankorId] - function getSzemeszterek_spec($tolTanev = '', $igTanev = '') - | `szemeszter` tábla bejegyzései - --> [indexed] - function tankorSzemeszterModositas($Modositas, $tankorSzemeszter, $tankorNevek, $Szemeszterek, $tanevZarasDt) { - | A módosító - * function _createName($ADAT,$SZ,$extra) -*/ - - function getTankorSzemeszterek($tankorIds) { - - if (count($tankorIds) > 0) { - $q = "SELECT * FROM tankorSzemeszter WHERE tankorId IN (".implode(',', array_fill(0, count($tankorIds), '%u')).")"; - return db_query($q, array( - 'fv' => 'getTankorSzemeszterek', 'modul' => 'naplo_intezmeny', 'result' => 'multiassoc', 'keyfield' => 'tankorId', 'values' => $tankorIds - )); - } else { - return array(); - } - - } - - function getSzemeszterek_spec($tolTanev = '', $igTanev = '') { - - $v = array(); - if ($tolTanev != '') { - $where = "WHERE tanev >= %u"; - $v[] = $tolTanev; - } - if ($igTanev != '') { - if ($tolTanev != '') $where .= " AND tanev <= %u"; - else $where = "WHERE tanev <= %u"; - $v[] = $igTanev; - } - - $q = "SELECT * FROM szemeszter $where ORDER BY tanev,szemeszter"; - return db_query($q, array('fv' => 'getSzemeszterek', 'modul' => 'naplo_intezmeny', 'result' => 'indexed', 'values' => $v)); - - } - - function tankorSzemeszterModositas($Modositas, $tankorSzemeszter, $tankorNevek, $Szemeszterek, $tanevZarasDt) { - - // $tankorTanarAdatok inicializásása - $Szemeszterek alapján - $tankorIds = $tankorTanarAdatok = array(); - for ($i = 0; $i < count($Szemeszterek); $i++) { - $tankorTanarAdatok[$Szemeszterek[$i]['tanev']][$Szemeszterek[$i]['szemeszter']] = array( - 'tankorIds' => array(), - 'tanev' => $Szemeszterek[$i]['tanev'], - 'statusz' => $Szemeszterek[$i]['statusz'], - 'kezdesDt' => $Szemeszterek[$i]['kezdesDt'], - 'zarasDt' => $Szemeszterek[$i]['zarasDt'] - ); - } - - $lr = db_connect('naplo_intezmeny'); - - $Values = array(); - $Values = $v = array(); - for ($i = 0; $i < count($Modositas); $i++) { - - $M = $Modositas[$i]; - if ($tankorTanarAdatok[$M['tanev']][$M['szemeszter']]['statusz'] != 'lezárt') { - - if (is_array($tankorSzemeszter[$M['tankorId']][$M['tanev']][$M['szemeszter']])) { - // update - vagy semmi - $regiOraszam = $tankorSzemeszter[$M['tankorId']][$M['tanev']][$M['szemeszter']]['oraszam']; - if (floatval($M['oraszam']) >= 0 && $regiOraszam != $M['oraszam']) { // állíthatjuk nullára - // update - most már tényleg - itt csak az óraszám változik: - $q = "UPDATE tankorSzemeszter SET oraszam=%f WHERE tankorId=%u AND tanev=%u AND szemeszter=%u"; - db_query($q, array( - 'fv' => 'tankorSzemeszterModositas', 'modul' => 'naplo_intezmeny', - 'values' => array($M['oraszam'], $M['tankorId'], $M['tanev'], $M['szemeszter']) - ,'debug'=>false - )); - } elseif ( - floatval($M['oraszam']) == 0 - && $tankorTanarAdatok[$M['tanev']][$M['szemeszter']]['statusz'] == 'tervezett' - && $regiOraszam != $M['oraszam'] - ) { // Ekkor törölhetjük... nemde? - $q = "DELETE FROM tankorSzemeszter - WHERE tankorId=%u AND tanev=%u - AND szemeszter=%u"; - db_query($q, array( - 'fv' => 'tankorSzemeszterModositas', 'modul' => 'naplo_intezmeny', - 'values' => array($M['tankorId'], $M['tanev'], $M['szemeszter']) - ,'debug'=>false - )); - } - } else { - // insert - $tankorNev = _createName($M, array($M['tanev'].'/'.$M['szemeszter']), $tankorNevek[$M['tankorId']]); - if ($tankorNev != '') { - array_push($v, $M['tankorId'], $M['tanev'], $M['szemeszter'], $M['oraszam'], $tankorNev); - $Values[] = "(%u, %u, %u, %f, '%s')"; - // A tanár felvételéhez kell a tol-ig dt (Szemeszterek) - // tankorIds - $tankorTanarAdatok[$M['tanev']][$M['szemeszter']]['tankorIds'][] = $M['tankorId']; - if (!in_array($M['tankorId'], $tankorIds)) $tankorIds[] = $M['tankorId']; - // tankorTanarIds - a tanevZarasDt pillanatában lévő tanárait kérdezzük le - - } - } // insert vagy update - } // nem lezárt szemeszter - } // for - if (count($Values) > 0) { - $q = "INSERT INTO tankorSzemeszter (tankorId, tanev, szemeszter, oraszam, tankorNev) - VALUES ".implode(',', $Values); - db_query($q, array('fv' => 'tankorSzemeszterModositas', 'modul' => 'naplo_intezmeny', 'values' => $v,'debug'=>false)); - // Az $tanev évi tanárt is rendeljük hozzá! - // kik voltak tanárok a zárás napján - $q = "SELECT DISTINCT tankorId, tanarId FROM tankorTanar - WHERE tankorId IN (".implode(',', array_fill(0, count($tankorIds), '%u')).") - AND '%s' >= beDt AND '%s' <= kiDt"; - $v = mayor_array_join($tankorIds, array($tanevZarasDt, $tanevZarasDt)); - $ret = db_query($q, array('fv' => 'tankorSzemeszterModositas', 'modul' => 'naplo_intezmeny', 'result' => 'indexed', 'values' => $v, 'debug'=>false), $lr); - for ($i = 0; $i < count($ret); $i++) $tankorTanarIds[$ret[$i]['tankorId']][] = $ret[$i]['tanarId']; - foreach ($tankorTanarAdatok as $szTanev => $tanevAdat) - foreach ($tanevAdat as $szSzemeszter => $szemeszterAdat) - if (count($szemeszterAdat['tankorIds']) > 0) { - tankorTanarFelvesz( - $szemeszterAdat['tankorIds'], $tankorTanarIds, $szemeszterAdat, - $szemeszterAdat['kezdesDt'], $szemeszterAdat['zarasDt'] - ); - } - } - - db_close($lr); - return true; - - } - - function _createName($ADAT,$SZ,$extra) { - - global $TANKOR_TIPUS; - - $tankorId = $ADAT['tankorId']; - if ($tankorId=='') return false; - $tanev = $ADAT['tanev']; - $szemeszter = $ADAT['szemeszter']; - - $targyId = getTankorTargyId($tankorId); - $TANKOROSZTALYOK = getTankorOsztalyai($tankorId, array('result' => 'id')); - - if ($targyId=='') return false; - $TARGYADAT = getTargyById($targyId); - $kdt='3000-01-01'; - $vdt='1970-01-01'; - if (is_array($SZ)) - for ($j=0; $j1) { // multi évfolyam: - $K = (array_keys($TMP)); - sort($K); - $nev = $K[0].'-'.$K[count($K)-1].'.'; - } else { // ekkorra már elballagott minden osztaly... - $nev = false; - - } - - } else { - $nev = false; // adott szemeszterbe nem jár osztály - } - - if ($nev!== false) { - $nev .= ' '.$TARGYADAT['targyNev']; - foreach($TANKOR_TIPUS as $_tt=>$_tipus) { - if (strstr($extra,$_tipus)) { - $_extra = $_tipus; - } - } - $nev .= ' '.$_extra; - } - } - return $nev; - - } - -?> diff --git a/mayor-orig/www/include/modules/naplo/intezmeny/tankorTanar.php b/mayor-orig/www/include/modules/naplo/intezmeny/tankorTanar.php deleted file mode 100644 index af6840e9..00000000 --- a/mayor-orig/www/include/modules/naplo/intezmeny/tankorTanar.php +++ /dev/null @@ -1,292 +0,0 @@ - 'tankorTanarTorol', 'modul' => 'naplo_intezmeny', 'result' => 'value', 'values' => $v)); - - if ($r == 0) { - $q = "DELETE FROM ".__INTEZMENYDBNEV.".tankorTanar WHERE tankorId=%u AND bedt='%s' AND tanarId=%u"; - $v = array($tankorId, $beDt, $tanarId); - db_query($q, array('fv' => 'tankorTanarTorol', 'modul' => 'naplo_intezmeny', 'values' => $v, 'rollback' => true)); - } else { - $_SESSION['alert'][] = 'info:lezart_tanev'; - } - } - - function tankorTanarJavit($tankorId,$tanarId,$beDt,$kiDt) { - - $q = "SELECT COUNT(*) AS db FROM szemeszter WHERE statusz='lezárt' AND - (('%s' BETWEEN szemeszter.kezdesDt AND szemeszter.zarasDt) - OR - ('%s' BETWEEN szemeszter.kezdesDt AND szemeszter.zarasDt)) - LIMIT 1"; - $v = array($beDt, $kiDt); - $r = db_query($q, array('fv' => 'tankorTanarTorol', 'modul' => 'naplo_intezmeny', 'result' => 'value', 'values' => $v)); - - if ($r == 0) { - $q = "UPDATE ".__INTEZMENYDBNEV.".tankorTanar SET kiDt='%s' WHERE tankorId=%u AND bedt='%s' AND tanarId=%u"; - $v = array($kiDt,$tankorId, $beDt, $tanarId); - db_query($q, array('fv' => 'tankorTanarTorol', 'modul' => 'naplo_intezmeny', 'values' => $v, 'rollback' => true)); - } else { - $_SESSION['alert'][] = 'info:lezart_tanev'; - } - } - - //--- - - - function tankorTanarFelvesz($tankorIds, $tankorTanarIds, $tanevAdat, $tolDt, $igDt) { - - - if (!is_array($tankorIds) || count($tankorIds) == 0) return false; - $D = array(); - - $lr = db_connect('naplo_intezmeny', array('fv' => 'tankorTanarFelvesz')); - db_start_trans($lr); - - // Az intervallumban érintett tankör-tanár tagságok lekérdezése... - $v = mayor_array_join($tankorIds, array($igDt, $tolDt)); - $q = "SELECT tanarId, tankorId, min(bedt) AS mbe ,max(kidt) AS mki - FROM ".__INTEZMENYDBNEV.".tankorTanar WHERE tankorId IN (".implode(',', array_fill(0, count($tankorIds), '%u')).") - AND bedt<='%s' AND kidt>='%s' GROUP BY tankorid,tanarid"; - $ret = db_query($q, array('fv' => 'tankorTanarFelvesz', 'modul' => 'naplo_intezmeny', 'result' => 'indexed', 'values' => $v, 'rollback' => true), $lr); - if ($ret === false) { db_close($lr); return false; } - for ($i = 0; $i < count($ret); $i++) { - if ($tolDt < $ret[$i]['mbe']) $ret[$i]['mbe'] = $tolDt; - if ($igDt > $ret[$i]['mki']) $ret[$i]['mki'] = $igDt; - $D[ $ret[$i]['tankorId'] ][ $ret[$i]['tanarId'] ] = array('mbe' => $ret[$i]['mbe'], 'mki' => $ret[$i]['mki'], 'torlendo' => true); - } - - // Az érintett intervallumba eső tankör-tanár tagságok törlése - $q = "DELETE FROM ".__INTEZMENYDBNEV.".tankorTanar WHERE tankorId IN (".implode(',', array_fill(0, count($tankorIds), '%u')).") - AND bedt<='%s' AND kidt>='%s'"; - $r = db_query($q, array('fv' => 'tankorTanarFelvesz', 'modul' => 'naplo_intezmeny', 'values' => $v, 'rollback' => true), $lr); - if ($r === false) { db_close($lr); return false; } - - // beszúrandó - for ($i = 0; $i < count($tankorIds); $i++) { - $tankorId = $tankorIds[$i]; - $tanarIds = $tankorTanarIds[$tankorId]; - for ($j = 0; $j < count($tanarIds); $j++) { - $tanarId = $tanarIds[$j]; - if ($tanarId != '') { - $D[$tankorId][$tanarId]['torlendo'] = false; - if (($beDt = $D[$tankorId][$tanarId]['mbe']) == '') $beDt = $tolDt; - if (($kiDt = $D[$tankorId][$tanarId]['mki']) == '') $kiDt = $igDt; - $q = "INSERT INTO ".__INTEZMENYDBNEV.".tankorTanar (tankorId,tanarId,beDt,kiDt) VALUES (%u, %u, '%s', '%s')"; - $v = array($tankorId, $tanarId, $beDt, $kiDt); - $r = db_query($q, array('fv' => 'tankorTanarFelvesz', 'modul' => 'naplo_intezmeny', 'values' => $v, 'rollback' => true), $lr); - if ($r === false) { db_close($lr); return false; } - } - } - } - - // törlendők felvétele - for ($i = 0; $i < count($tankorIds); $i++) { - $tankorId = $tankorIds[$i]; - if (is_array($D[$tankorId])) - foreach($D[$tankorId] as $tanarId => $T) { - if ($T['torlendo']) { - if ($T['mbe'] < $tolDt) { - $beDt = $T['mbe']; - $kiDt = date('Y-m-d', strtotime('-1 days',strtotime($tolDt))); - $q = "INSERT INTO ".__INTEZMENYDBNEV.".tankorTanar (tankorId,tanarId,beDt,kiDt) VALUES (%u, %u, '%s', '%s')"; - $v = array($tankorId, $tanarId, $beDt, $kiDt); - $r = db_query($q, array('fv' => 'tankorTanarFelvesz', 'modul' => 'naplo_intezmeny', 'values' => $v, 'rollback' => true), $lr); - if ($r === false) { db_close($lr); return false; } - } - if ($T['mki'] > $igDt) { - $kiDt = $T['mki']; - $beDt = date('Y-m-d', strtotime('+1 days',strtotime($igDt))); - $q = "INSERT INTO ".__INTEZMENYDBNEV.".tankorTanar (tankorId,tanarId,beDt,kiDt) VALUES (%u, %u, '%s','%s')"; - $v = array($tankorId, $tanarId, $beDt, $kiDt); - $r = db_query($q, array('fv' => 'tankorTanarFelvesz', 'modul' => 'naplo_intezmeny', 'values' => $v, 'rollback' => true), $lr); - if ($r === false) { db_close($lr); return false; } - } - } - } - } - - // tankörblokkok ellenőrzése - csak nem tervezett tanévben - // Érintett blokkok lekérdezése - if ($tanevAdat['statusz'] != 'tervezett') { - $blokkIds = getTankorBlokkByTankorId($tankorIds, $tanevAdat['tanev']); - if (is_array($blokkIds)) foreach ($blokkIds as $index => $blokkId) { - // A blokk tankörei - $bTankorIds = getTankorokByBlokkId($blokkId, $tanevAdat['tanev']); - - // Ellenőrizzük a tankör tanárokat - azonosak-e tankörönként - $q = "SELECT tanarId,COUNT(DISTINCT tankorId) AS c FROM ".__INTEZMENYDBNEV.".tankorTanar - WHERE tankorId IN (".implode(',', array_fill(0, count($bTankorIds), '%u')).") - AND beDt <= '%s' AND (kiDt IS NULL OR '%s' <= kiDt) - GROUP BY tanarId HAVING c>1 - ORDER BY tankorId,tanarId"; - $v = mayor_array_join($bTankorIds, array($igDt, $tolDt)); - $r = db_query($q, array('fv' => 'tankorTanarFelvesz/BlokkEllenőrzés', 'modul' => 'naplo_intezmeny', 'result' => 'indexed', 'values' => $v), $lr); - if (is_array($r) && count($r) > 0) { - db_rollback($lr, 'Ütköző tanárt találtam egy blokkban ('.$blokkId.')! Visszaállítjuk az eredeti állapotot!'); - db_close($lr); - return false; - } - } - } - /* ======================================================== - Órarend módosítása - ======================================================== */ - - - if ($tanevAdat['statusz'] == 'aktív') { - - $tanevDbNev = tanevDbNev(__INTEZMENY, $tanevAdat['tanev']); - - // ÓrarendiOraTankor bejegyzés ellenőrzés/készítés - $V = $v2 = array(); - foreach ($tankorIds as $i => $tankorId) { - if ($tankorTanarIds[$tankorId][0] != '') { // Ha akarunk egyáltalán tanárt hozzárendelni - // van-e már az igényeinknek megfelelő bejegyzés - $q = "SELECT * FROM `%s`.orarendiOraTankor WHERE tankorId=%u - AND tanarId IN (".implode(',', array_fill(0, count($tankorTanarIds[$tankorId]), '%u')).") LIMIT 1"; - $v = mayor_array_join(array($tanevDbNev, $tankorId), $tankorTanarIds[$tankorId]); - $ret = db_query($q, array('fv' => 'tankorTanarFelvesz', 'modul' => 'naplo', 'result' => 'indexed', 'values' => $v, 'rollback' => true), $lr); - if ($ret === false) { db_close($lr); return false; } - - if (count($ret) != 0) { // ha van, akkor az elsőt használjuk - $OOT[$tankorId] = $ret[0]; - } else { // ha nincs, akkor generálunk egy jót - $OOT[$tankorId] = array( - 'tanarId' => $tankorTanarIds[$tankorId][0], - 'osztalyJel' => 'NaN', - 'targyJel' => $tankorId.'-'.$tankorTanarIds[$tankorId][0], - 'tankorId' => $tankorId - ); - $V[] = "(%u, 'NaN', '%s', %u)"; - array_push($v2, $tankorTanarIds[$tankorId][0], $tankorId.'-'.$tankorTanarIds[$tankorId][0], $tankorId); - } - } - } - if (count($V) > 0) { // Az új bejegyzéseket felvesszük - $q = "INSERT INTO `%s`.orarendiOraTankor (tanarId,osztalyJel,targyJel,tankorId) VALUES ".implode(',', $V); - array_unshift($v2, $tanevDbNev); - $r = db_query($q, array('fv' => 'tankorTanarFelvesz', 'modul' => 'naplo', 'values' => $v2, 'rollback' => true), $lr); - if ($r === false) { db_close($lr); return false; } - - } - - // Az érintett órarendi bejegyzések lekérdezése beDt szerint rendezve - $q = "SELECT tolDt,igDt,het,nap,ora,tankorId,tanarId,osztalyJel,targyJel,teremId - FROM `%s`.orarendiOra LEFT JOIN `%s`.orarendiOraTankor USING (tanarId,osztalyJel,targyJel) - WHERE tolDt <= '%s' AND (igDt >= '%s' OR igDt IS NULL) - AND tankorId IN (".implode(',', array_fill(0, count($tankorIds), '%u')).") - ORDER BY tankorId,tolDt"; - $v = mayor_array_join(array($tanevDbNev, $tanevDbNev, $igDt, $tolDt), $tankorIds); - $ret = db_query($q, array( - 'fv' => 'tankorTanarFelvesz', 'modul' => 'naplo', 'result' => 'multiassoc', 'keyfield' => 'tankorId', 'values' => $v, 'rollback' => true - ), $lr); - if ($ret === false) { db_close($lr); return false; } - - foreach ($ret as $tankorId => $tankorOrarendiBejegyzesek) { - - // Ha van orarendiOra bejegyzés és nem akarunk tanárt hozzárendelni - az hiba!! - if (!is_array($OOT[$tankorId])) { - db_rollback($lr, 'Létező órarendi óra esetén a tanár nem törölhető:'.$tankorId); db_close($lr); return false; - }; - - $tanarId = $OOT[$tankorId]['tanarId']; - $osztalyJel = $OOT[$tankorId]['osztalyJel']; - $targyJel = $OOT[$tankorId]['targyJel']; - - foreach ($tankorOrarendiBejegyzesek as $i => $TOB) { - if ($TOB['teremId'] == '') { - $TOB['teremId'] = 'NULL'; - $valueStr = "(%u, %u, %u, %u, '%s', '%s', %s, '%s', '%s')"; - } else { - $valueStr = "(%u, %u, %u, %u, '%s', '%s', %u, '%s', '%s')"; - } - if ($TOB['tolDt'] < $tolDt) { // balról túlnyúlik - kettévágjuk - $q = "UPDATE `%s`.orarendiOra SET igDt='%s' - INTERVAL 1 DAY - WHERE tolDt='%s' AND tanarId=%u - AND het=%u AND nap=%u AND ora=%u"; - $v = array($tanevDbNev, $tolDt, $TOB['tolDt'], $TOB['tanarId'], $TOB['het'], $TOB['nap'], $TOB['ora']); - $r = db_query($q, array('fv' => 'tankorTanarFelvesz', 'modul' => 'naplo', 'values' => $v, 'rollback' => true), $lr); - if ($r === false) { db_close($lr); return false; } - $q = "INSERT INTO `%s`.orarendiOra (het,nap,ora,tanarId,osztalyJel,targyJel,teremId,tolDt,igDt) VALUES $valueStr"; - $v = array( - $tanevDbNev, $TOB['het'], $TOB['nap'], $TOB['ora'], $TOB['tanarId'], $TOB['osztalyJel'], - $TOB['targyJel'], $TOB['teremId'], $tolDt, $TOB['igDt'] - ); - $r = db_query($q, array('fv' => 'tankorTanarFelvesz', 'modul' => 'naplo', 'values' => $v, 'rollback' => true), $lr); - if ($r === false) { db_close($lr); return false; } - $TOB['tolDt'] = $tolDt; // Az intervallumot lefedő bejegyzések miatt - három fele fogjuk vágni - } - if ($igDt < $TOB['igDt']) { // jobbról túlnyúlik - kettévágjuk !! igDt nem lehet NULL !! - $q = "UPDATE `%s`.orarendiOra SET tolDt='%s' + INTERVAL 1 DAY - WHERE igDt='%s' AND tanarId=%u AND het=%u AND nap=%u AND ora=%u"; - $v = array($tanevDbNev, $igDt, $TOB['igDt'], $TOB['tanarId'], $TOB['het'], $TOB['nap'], $TOB['ora']); - $r = db_query($q, array('fv' => 'tankorTanarFelvesz', 'modul' => 'naplo', 'values' => $v, 'rollback' => true), $lr); - if ($r === false) { db_close($lr); return false; } - $q = "INSERT INTO `%s`.orarendiOra (het,nap,ora,tanarId,osztalyJel,targyJel,teremId,tolDt,igDt) VALUES $valueStr"; - $v = array( - $tanevDbNev, $TOB['het'], $TOB['nap'], $TOB['ora'], $TOB['tanarId'], $TOB['osztalyJel'], - $TOB['targyJel'], $TOB['teremId'], $TOB['tolDt'], $igDt - ); - $r = db_query($q, array('fv' => 'tankorTanarFelvesz', 'modul' => 'naplo', 'values' => $v, 'rollback' => true), $lr); - if ($r === false) { db_close($lr); return false; } - - } - // A közbensőkben tanárt váltunk - if ($tanarId != $TOB['tanarId']) { - $q = "UPDATE `%s`.orarendiOra LEFT JOIN `%s`.orarendiOraTankor USING (tanarId,osztalyJel,targyJel) - SET tanarId=%u, osztalyJel='%s', targyJel='%s' - WHERE '%s'<=tolDt AND igDt<='%s' AND tanarId=%u AND het=%u AND nap=%u AND ora=%u AND tankorId=%u"; - $v = array($tanevDbNev, $tanevDbNev, $tanarId, $osztalyJel, $targyJel, $tolDt, $igDt, $TOB['tanarId'], $TOB['het'], $TOB['nap'], $TOB['ora'], $tankorId); - $r = db_query($q, array('fv' => 'tankorTanarFelvesz', 'modul' => 'naplo', 'values' => $v, 'rollback' => true), $lr); - if ($r === false) { db_close($lr); return false; } - } - - } - - } // foreach - - // A módosított órarend ütközésellenőrzése - [k] munkatervenként külön. Itt most megengedjük, hogy ha több munkaterv is van, de egyszerre van órája a tanárnak... :/ -// $q = "SELECT tanarId, dt, ora, COUNT(*) AS db -// FROM `%s`.nap LEFT JOIN `%s`.orarendiOra -// ON (((DAYOFWEEK(dt)+5) MOD 7)+1 = orarendiOra.nap) -// AND orarendiOra.het=nap.orarendiHet -// AND orarendiOra.tolDt<=dt AND orarendiOra.igDt>=dt -// WHERE '%s' <= dt AND dt <= '%s' -// GROUP BY munkatervId,tanarId, dt, ora -// HAVING db > 1"; - // [bb] szerintem ez a jó: a hét-nap-óra-tanár-tolDt kulcs az orarendiOra táblában, így ha két sorban ezek megegyeznek, akkor nem kell külön számolni... - $q = "SELECT tanarId, dt, ora, COUNT(DISTINCT het, nap, ora, tanarId, tolDt) AS db - FROM `%s`.nap LEFT JOIN `%s`.orarendiOra - ON (((DAYOFWEEK(dt)+5) MOD 7)+1 = orarendiOra.nap) - AND orarendiOra.het=nap.orarendiHet - AND orarendiOra.tolDt<=dt AND orarendiOra.igDt>=dt - WHERE '%s' <= dt AND dt <= '%s' - GROUP BY tanarId, dt, ora - HAVING db > 1"; - $v = array($tanevDbNev, $tanevDbNev, $tolDt, $igDt); - $ret = db_query($q, array('fv' => 'tankorTanarFelvesz', 'modul' => 'naplo', 'result' => 'indexed', 'values' => $v, 'rollback' => true), $lr); - if ($ret === false) { db_close($lr); return false; } - - if (count($ret)) { // Van ütközés! - db_rollback($lr, 'Az összes ütközést ellenőriztem, és a megadott '.$tolDt.'-'.$igDt.' intervallumban egy (esetleg másik) tanárnak több órája van egy időben (tanarId='.$ret[0]['tanarId'].', dt='.$ret[0]['dt'].', ora='.$ret[0]['ora'].') - így visszaállítjuk az eredeti állapotot...'); - db_close($lr); - return false; - } - - } // aktív tanév - - db_commit($lr); - db_close($lr); - return true; - - } - -?> diff --git a/mayor-orig/www/include/modules/naplo/intezmeny/tankorTanarHozzarendeles.php b/mayor-orig/www/include/modules/naplo/intezmeny/tankorTanarHozzarendeles.php deleted file mode 100644 index 600ee897..00000000 --- a/mayor-orig/www/include/modules/naplo/intezmeny/tankorTanarHozzarendeles.php +++ /dev/null @@ -1,224 +0,0 @@ -='".$_TANEV['zarasDt']."') - ) as db - from tankorSzemeszter left join tankorTanar using (tankorId) - where tanev=".__TANEV." and tanarId=%u and beDt<='".$_TANEV['kezdesDt']."' - and (kiDt is NULL or kiDt>='".$_TANEV['zarasDt']."') group by tankorId - ) as tankorOraszamPerTanar"; - - return db_query($q, array('fv'=>'getTanarLekotottOraszam','modul'=>'naplo_intezmeny','result'=>'value','values'=>array($tanarId))); - - } - - function getTankorokBySzuro($Szuro) { - /* - osztaly U tanar U tanarNelkul || targy U mk U tanar U tanarNelkul || (osztaly M targy) U (osztaly M mk) U tanar U tanarNelkul - */ - global $_TANEV; - - $vanOsztaly = (is_array($Szuro['osztalyIds']) && count($Szuro['osztalyIds'])>0); - $vanMk = (is_array($Szuro['mkIds']) && count($Szuro['mkIds'])>0); - $vanTargy = (is_array($Szuro['targyIds']) && count($Szuro['targyIds'])>0); - $vanTanar = (is_array($Szuro['tanarIds']) && count($Szuro['tanarIds'])>0); - $vanTanarNelkuliek = (bool)$Szuro['tanarNelkuliTankorok']; - - $v = $q = array(); - if ($vanOsztaly && !$vanMk && !$vanTargy) { - $q[] = "SELECT tankorId, tankorNev, targyId, tankorTipusId, avg(oraszam) AS hetiOraszam - FROM tankor LEFT JOIN tankorSzemeszter USING (tankorId) - LEFT JOIN tankorOsztaly USING (tankorId) - WHERE osztalyId IN (".implode(',', array_fill(0, count($Szuro['osztalyIds']), '%u')).") - AND tanev=".__TANEV." - GROUP BY tankorId, tankorNev, targyId, tankorTipusId - ORDER BY tankorNev, tankorId"; - $v = array_merge($v, $Szuro['osztalyIds']); - } - if ($vanMk) { - if ($vanOsztaly) { - $q[] = "SELECT tankorId, tankorNev, targyId, tankorTipusId, avg(oraszam) AS hetiOraszam - FROM tankor LEFT JOIN tankorSzemeszter USING (tankorId) - LEFT JOIN targy USING (targyId) - WHERE mkId IN (".implode(',', array_fill(0, count($Szuro['mkIds']), '%u')).") - AND tanev=".__TANEV." - AND tankorId IN ( - SELECT tankorId FROM tankorOsztaly WHERE osztalyId IN (".implode(',', array_fill(0, count($Szuro['osztalyIds']), '%u')).") - ) - GROUP BY tankorId, tankorNev, targyId, tankorTipusId - ORDER BY tankorNev, tankorId"; - $v = array_merge($v, $Szuro['mkIds'], $Szuro['osztalyIds']); - } else { - $q[] = "SELECT tankorId, tankorNev, targyId, tankorTipusId, avg(oraszam) AS hetiOraszam - FROM tankor LEFT JOIN tankorSzemeszter USING (tankorId) - LEFT JOIN targy USING (targyId) - WHERE mkId IN (".implode(',', array_fill(0, count($Szuro['mkIds']), '%u')).") - AND tanev=".__TANEV." - GROUP BY tankorId, tankorNev, targyId, tankorTipusId - ORDER BY tankorNev, tankorId"; - $v = array_merge($v, $Szuro['mkIds']); - } - } - if ($vanTargy) { - if ($vanOsztaly) { - $q[] = "SELECT tankorId, tankorNev, targyId, tankorTipusId, avg(oraszam) AS hetiOraszam - FROM tankor LEFT JOIN tankorSzemeszter USING (tankorId) - WHERE targyId IN (".implode(',', array_fill(0, count($Szuro['targyIds']), '%u')).") - AND tanev=".__TANEV." - AND tankorId IN ( - SELECT tankorId FROM tankorOsztaly WHERE osztalyId IN (".implode(',', array_fill(0, count($Szuro['osztalyIds']), '%u')).") - ) - GROUP BY tankorId, tankorNev, targyId, tankorTipusId - ORDER BY tankorNev, tankorId"; - $v = array_merge($v, $Szuro['targyIds'], $Szuro['osztalyIds']); - } else { - $q[] = "SELECT tankorId, tankorNev, targyId, tankorTipusId, avg(oraszam) AS hetiOraszam - FROM tankor LEFT JOIN tankorSzemeszter USING (tankorId) - WHERE targyId IN (".implode(',', array_fill(0, count($Szuro['targyIds']), '%u')).") - AND tanev=".__TANEV." - GROUP BY tankorId, tankorNev, targyId, tankorTipusId - ORDER BY tankorNev, tankorId"; - $v = array_merge($v, $Szuro['targyIds']); - } - } - if ($vanTanar) { - - $q[] = "SELECT tankorId, tankorNev, targyId, tankorTipusId, avg(oraszam) AS hetiOraszam - FROM tankor LEFT JOIN tankorSzemeszter USING (tankorId) - LEFT JOIN tankorTanar USING (tankorId) - WHERE tanarId IN (".implode(',', array_fill(0, count($Szuro['tanarIds']), '%u')).") - AND tanev=".__TANEV." - GROUP BY tankorId, tankorNev, targyId, tankorTipusId - ORDER BY tankorNev, tankorId"; - $v = array_merge($v, $Szuro['tanarIds']); - - } - if ($vanTanarNelkuliek) { - $q[] = "SELECT tankor.tankorId AS tankorId, tankorNev, targyId, tankorTipusId, avg(oraszam) AS hetiOraszam - FROM tankor LEFT JOIN tankorSzemeszter USING (tankorId) - LEFT JOIN tankorTanar ON tankor.tankorId=tankorTanar.tankorId AND beDt<='".$_TANEV['kezdesDt']."' AND (kiDt IS NULL OR kiDt>='".$_TANEV['zarasDt']."') - WHERE tanarId IS NULL - AND tanev=".__TANEV." - GROUP BY tankorId, tankorNev, targyId, tankorTipusId - ORDER BY tankorNev, tankorId"; - - } - - if (count($q) > 0) { - $query = '('.implode(') UNION DISTINCT (', $q).')'; - $return = db_query($query, array('debug'=>false,'fv'=>'getTankorokBySzuro','modul'=>'naplo_intezmeny','result'=>'indexed','values'=>$v)); - - for ($i=0; $i __TANEV, 'result' => 'idonly')); - // A tankör lekötött óraszáma - $tmp = getTankorTervezettOraszamok((array)$return[$i]['tankorId']); - foreach (array(1, 2) as $szemeszter) { - $osz = 0; - foreach ($tmp[ $return[$i]['tankorId'] ]['bontasOraszam'][$szemeszter-1] as $oAdat) $osz += floatval($oAdat['hetiOraszam']); - $return[$i]['tervezettOraszamok'][$szemeszter] = array('btOraszam'=> $osz, 'tszOraszam' => floatval($tmp[ $return[$i]['tankorId'] ]['oraszam'][$szemeszter-1])); - }; - $return[$i]['bontasOk'] = ( - $return[$i]['tervezettOraszamok'][1]['btOraszam']==$return[$i]['tervezettOraszamok'][1]['tszOraszam'] - && $return[$i]['tervezettOraszamok'][2]['btOraszam']==$return[$i]['tervezettOraszamok'][2]['tszOraszam'] - ); - } - - return $return; - } else { return array(); } - } - - function getTanarokBySzuro($Szuro) { - - global $_TANEV; - - // Ha nincs kiválasztott tankör, akkor nincs értelme tanárokat lekérdezni - if (!is_array($Szuro['tankorTargyIds']) || count($Szuro['tankorTargyIds']) == 0) return array(); - - // Az osztály nem játszik szerepet a lehetséges tanárok szűrésében - $vanMk = (is_array($Szuro['mkIds']) && count($Szuro['mkIds'])>0); - $vanTanar = (is_array($Szuro['tanarIds']) && count($Szuro['tanarIds'])>0); - // Tárgy mindig lesz - ha más nem a tankörökből - if (is_array($Szuro['targyIds'])) $targyIds = array_merge($Szuro['targyIds'], $Szuro['tankorTargyIds']); - else $targyIds = $Szuro['tankorTargyIds']; - - $v = $q = array(); - - { - // Itt lehet tárgy és munkaközösség, valamint a megadott tanarId-k alapján szűrni - if ($vanTanar) { - $q[] = "SELECT tanarId, concat_ws(' ',viseltNevElotag,viseltCsaladinev,viseltUtonev) as tanarNev, - hetiMunkaora,hetiKotelezoOraszam, - hetiLekotottMinOraszam,hetiLekotottMaxOraszam,hetiKotottMaxOraszam - FROM tanar WHERE statusz IN ('határozatlan idejű','határozott idejű','külső óraadó') - AND beDt<'".$_TANEV['kezdesDt']."' AND (kiDt IS NULL OR kiDt<'".$_TANEV['zarasDt']."') - AND tanarId IN (".implode(',', array_fill(0, count($Szuro['tanarIds']), '%u')).")"; - $v = array_merge($v, $Szuro['tanarIds']); - } - if ($vanMk) { - $q[] = "SELECT tanarId, concat_ws(' ',viseltNevElotag,viseltCsaladinev,viseltUtonev) as tanarNev, - hetiMunkaora,hetiKotelezoOraszam, - hetiLekotottMinOraszam,hetiLekotottMaxOraszam,hetiKotottMaxOraszam - FROM tanar LEFT JOIN mkTanar USING (tanarId) - WHERE statusz IN ('határozatlan idejű','határozott idejű','külső óraadó') - AND beDt<'".$_TANEV['kezdesDt']."' AND (kiDt IS NULL OR kiDt<'".$_TANEV['zarasDt']."') - AND mkId IN (".implode(',', array_fill(0, count($Szuro['mkIds']), '%u')).")"; - $v = array_merge($v, $Szuro['mkIds']); - } - // targyIds mindig van - $q[] = "SELECT tanarId, concat_ws(' ',viseltNevElotag,viseltCsaladinev,viseltUtonev) as tanarNev, - hetiMunkaora,hetiKotelezoOraszam, - hetiLekotottMinOraszam,hetiLekotottMaxOraszam,hetiKotottMaxOraszam - FROM tanar LEFT JOIN tanarKepesites USING (tanarId) - LEFT JOIN kepesitesTargy USING (kepesitesId) - WHERE statusz IN ('határozatlan idejű','határozott idejű','külső óraadó') - AND beDt<'".$_TANEV['kezdesDt']."' AND (kiDt IS NULL OR kiDt<'".$_TANEV['zarasDt']."') - AND targyId IN (".implode(',', array_fill(0, count($targyIds), '%u')).")"; - $v = array_merge($v, $targyIds); - $q[] = "SELECT tanarId, concat_ws(' ',viseltNevElotag,viseltCsaladinev,viseltUtonev) as tanarNev, - hetiMunkaora,hetiKotelezoOraszam, - hetiLekotottMinOraszam,hetiLekotottMaxOraszam,hetiKotottMaxOraszam - FROM tanar LEFT JOIN mkTanar USING (tanarId) - LEFT JOIN targy USING (mkId) - WHERE statusz IN ('határozatlan idejű','határozott idejű','külső óraadó') - AND beDt<'".$_TANEV['kezdesDt']."' AND (kiDt IS NULL OR kiDt<'".$_TANEV['zarasDt']."') - AND targyId IN (".implode(',', array_fill(0, count($targyIds), '%u')).")"; - $v = array_merge($v, $targyIds); - - $query = '('.implode(') UNION DISTINCT (', $q).') ORDER BY tanarNev, tanarId'; - $return = db_query($query, array('fv'=>'getTanarokBySzuro #1','modul'=>'naplo_intezmeny','result'=>'indexed','values'=>$v)); - - } - // Le kell kérdezni a tárgyait és az eddigi lekötött óraszámát a tanárnak - for ($i = 0; $i < count($return); $i++) { - $return[$i]['targyIds'] = getTargyIdsByTanarId($return[$i]['tanarId']); - $return[$i]['lekotottOraszam'] = getTanarLekotottOraszam($return[$i]['tanarId']); - } - - return $return; - - } - - function getTankorStat() { - - global $_TANEV; - - $q = "select count(distinct tankorId) from tankorSzemeszter left join tankorTanar using (tankorId) - where tanev=".__TANEV." and tankorTanar.tanarId is not null - and beDt<='".$_TANEV['kezdesDt']."' AND (kiDt IS NULL OR kiDt >= '".$_TANEV['zarasDt']."')"; - $ret['kesz'] = db_query($q, array('fv'=>'getTankorStat/1','modul'=>'naplo_intezmeny','result'=>'value')); - - $q = "select count(distinct tankorId) from tankorSzemeszter where tanev=".__TANEV; - $ret['osszes'] = db_query($q, array('fv'=>'getTankorStat/1','modul'=>'naplo_intezmeny','result'=>'value')); - - return $ret; - } - -?> \ No newline at end of file diff --git a/mayor-orig/www/include/modules/naplo/intezmeny/terem.php b/mayor-orig/www/include/modules/naplo/intezmeny/terem.php deleted file mode 100644 index ee640a54..00000000 --- a/mayor-orig/www/include/modules/naplo/intezmeny/terem.php +++ /dev/null @@ -1,25 +0,0 @@ - 'teremAdatModositas', 'modul' => 'naplo_intezmeny', 'values' => $v)); - - - } - -?> diff --git a/mayor-orig/www/include/modules/naplo/intezmeny/tovabbkepzes.php b/mayor-orig/www/include/modules/naplo/intezmeny/tovabbkepzes.php deleted file mode 100644 index a7f56083..00000000 --- a/mayor-orig/www/include/modules/naplo/intezmeny/tovabbkepzes.php +++ /dev/null @@ -1,159 +0,0 @@ -false,'fv'=>'getTovabbkepzesek','modul'=>'naplo_intezmeny','result'=>'indexed')); - return reindex($r,array('tanarId','tovabbkepzesStatusz')); - } - - function getTanarTovabbkepzesFolyamat($dt="NOW()") { - $q = "select tanarId,tolDt,igDt,tanusitvanyDt,tanusitvanySzam from tovabbkepzesTanar WHERE NOW() BETWEEN tolDt AND igDt"; - $r = db_query($q, array('debug'=>false,'fv'=>'getTovabbkepzesek','modul'=>'naplo_intezmeny','result'=>'assoc','keyfield'=>'tanarId')); - return $r; - } - - function getTovabbkepzesTerv($tanev) { - $q = "SELECT * FROM tovabbkepzesTanulmanyiEgyseg WHERE tanev=%u"; - $values = array($tanev); - $r = db_query($q, array('debug'=>false,'fv'=>'getTovabbkepzesek','modul'=>'naplo_intezmeny','result'=>'indexed','values'=>$values)); - return $r; - } - - function getTanarTovabbkepzesByEv($tanev,$tanarId=null) { - if ($tanarId>0) { - $values = array($tanev,$tanev,$tanarId); - $W = ' tanarId=%u AND '; - } else { - $values = array($tanev,$tanev); - $W = ''; - } - $q = "SELECT * FROM tovabbkepzesTanar - WHERE $W tolDt<=DATE(CONCAT(%u+1,'-08-31')) AND (igDt>=DATE(CONCAT(%u,'-09-01')) OR igDt IS NULL) AND (tanusitvanySzam='' or tanusitvanySzam IS NULL)"; - $r = db_query($q, array('debug'=>false,'fv'=>'getTanarTovabbkepzesByEv','modul'=>'naplo_intezmeny','result'=>'indexed','values'=>$values)); - return $r; - } - - // TODO ? - function getTanarTeljesitettTanulmanyiEgyseg() { - $q = "SELECT * FROM tovabbkepzesTanulmanyiEgyseg LEFT JOIN tovabbkepzesTanar USING (tovabbkepzesId,tanarId) WHERE tovabbkepzesStatusz='teljesített'"; - $values = array($tanarId); - $r = db_query($q, array('debug'=>false,'fv'=>'getTanarTovabbkepzesByEv','modul'=>'naplo_intezmeny','result'=>'multiassoc','keyfield'=>'tanarId','values'=>$values)); - return $r; - } - - function getTanarTovabbkepzesek($SET = array()) { - $W = ''; - $values=array(); - if (is_array($SET) && count($SET)>0) { - foreach ($SET as $k => $v) { - $M[] = "$k='%s'"; - $values[] = $v; - } - $W = 'WHERE '.implode(' AND ',$M); - } - $q = "SELECT * FROM tovabbkepzesTanar ".$W; - $r = db_query($q, array('debug'=>false,'fv'=>'getTovabbkepzesek','modul'=>'naplo_intezmeny','result'=>'indexed','values'=>$values)); - return $r; - } - function getTovabbkepzesek() { - $q = "SELECT * FROM tovabbkepzes LEFT JOIN tovabbkepzoIntezmeny USING (tovabbkepzointezmenyId) ORDER BY tovabbkepzesNev"; - $r = db_query($q, array('fv'=>'getTovabbkepzesek','modul'=>'naplo_intezmeny','result'=>'indexed')); - return $r; - } - function getTovabbkepzoIntezmenyek() { - $q = "SELECT * FROM tovabbkepzoIntezmeny ORDER BY intezmenyRovidnev,intezmenyNev"; - $r = db_query($q, array('fv'=>'getTovabbkepzoIntezmenyek','modul'=>'naplo_intezmeny','result'=>'indexed')); - return $r; - } - function getKeretosszeg($tanev) { - $q = "SELECT keretOsszeg FROM tovabbkepzesKeret WHERE tanev=%u"; - $v = array($tanev); - $r = db_query($q, array('fv'=>'getKeretosszeg','modul'=>'naplo_intezmeny','result'=>'value','values'=>$v)); - return $r; - } - - function ujTovabbkepzoIntezmeny($ADAT) { - $q = "INSERT INTO tovabbkepzoIntezmeny (intezmenyRovidnev,intezmenyNev) VALUES ('%s','%s')"; - $v = array($ADAT['intezmenyRovidNev'],$ADAT['intezmenyNev']); - $r = db_query($q, array('debug'=>false,'fv'=>'ujTovabbkepzoIntezmeny','modul'=>'naplo_intezmeny','result'=>'insert','values'=>$v)); - return $r; - } - - - function modKeretosszeg($tanev,$keretOsszeg) { - $q = "REPLACE INTO tovabbkepzesKeret (tanev,keretOsszeg) VALUES (%u,%u)"; - $v = array($tanev,$keretOsszeg); - db_query($q, array('debug'=>false,'fv'=>'modKeretOsszeg','modul'=>'naplo_intezmeny','result'=>'insert','values'=>$v)); - } - - function ujTovabbkepzes($ADAT) { - if ($ADAT['tovabbkepzesNev']=='') return false; - $q = "INSERT INTO tovabbkepzes (tovabbkepzesNev,tovabbkepzoIntezmenyId, oraszam, kategoria, akkreditalt) VALUES ('%s',%u,%u,'%s',%u)"; - $v = array($ADAT['tovabbkepzesNev'],$ADAT['tovabbkepzoIntezmenyId'],$ADAT['oraszam'],$ADAT['kategoria'],$ADAT['akkreditalt']); - $r = db_query($q, array('debug'=>false,'fv'=>'ujTovabbkepzes','modul'=>'naplo_intezmeny','result'=>'insert','values'=>$v)); - return $r; - } - function modTovabbkepzes($ADAT) { - if ($ADAT['tovabbkepzesId']=='') return false; - $q = "UPDATE tovabbkepzes SET tovabbkepzesNev='%s',oraszam=%u,kategoria='%s' WHERE tovabbkepzesId=%u"; - $v = array($ADAT['tovabbkepzesNev'],$ADAT['oraszam'],$ADAT['kategoria'],$ADAT['tovabbkepzesId']); - $r = db_query($q, array('debug'=>false,'fv'=>'modTovabbkepzes','modul'=>'naplo_intezmeny','result'=>'update','values'=>$v)); - return $r; - } - function ujTovabbkepzesTanar($ADAT) { - if ($ADAT['tovabbkepzesId']=='') return false; - $q = "INSERT INTO tovabbkepzesTanar (tovabbkepzesId,tanarId, tolDt, igDt) VALUES (%u,%u,'%s','%s')"; - $v = array($ADAT['tovabbkepzesId'],$ADAT['tanarId'],$ADAT['tolDt'],$ADAT['igDt']); - $r = db_query($q, array('debug'=>false,'fv'=>'ujTovabbkepzesTanar','modul'=>'naplo_intezmeny','result'=>'insert','values'=>$v)); - return $r; - } - function modTovabbkepzesTanar($ADAT) { - //if ($ADAT['tovabbkepzesId']=='') return false; - $q = "UPDATE tovabbkepzesTanar SET tolDt='%s', igDt='%s', tanusitvanyDt='%s', tanusitvanySzam='%s' WHERE tovabbkepzesId=%u AND tanarId=%u"; - $v = array($ADAT['tolDt'],$ADAT['igDt'],$ADAT['tanusitvanyDt'],$ADAT['tanusitvanySzam'],$ADAT['tovabbkepzesId'],$ADAT['tanarId']); - $r = db_query($q, array('debug'=>false,'fv'=>'ujTovabbkepzesTanar','modul'=>'naplo_intezmeny','result'=>'update','values'=>$v)); - return $r; - } - function delTovabbkepzesTanar($ADAT) { - //if ($ADAT['tovabbkepzesId']=='') return false; - $q = "DELETE FROM tovabbkepzesTanar WHERE tovabbkepzesId=%u AND tanarId=%u"; - $v = array($ADAT['tovabbkepzesId'],$ADAT['tanarId']); - $r = db_query($q, array('debug'=>false,'fv'=>'delTovabbkepzesTanar','modul'=>'naplo_intezmeny','result'=>'delete','values'=>$v)); - return $r; - } - function ujTovabbkepzesTE($ADAT,$lr) { - $q = "INSERT INTO tovabbkepzesTanulmanyiEgyseg (tovabbkepzesId, tanarId, tanev, reszosszeg, tamogatas, tovabbkepzesStatusz, tavollet,helyettesitesRendje,prioritas) VALUES (%u,%u,%u,%u,%u,'%s','%s','%s','%s')"; - $v = array($ADAT['tovabbkepzesId'],$ADAT['tanarId'],$ADAT['tanev'],intval($ADAT['reszosszeg']),intval($ADAT['tamogatas']),$ADAT['tovabbkepzesStatusz'],$ADAT['tavollet'],$ADAT['helyettesitesRendje'],$ADAT['prioritas']); - $r = db_query($q, array('debug'=>false,'fv'=>'ujTovabbkepzesTanar','modul'=>'naplo_intezmeny','result'=>'insert','values'=>$v),$lr); - } - function modTovabbkepzesTE($ADAT) { - $lr = db_connect('naplo_intezmeny'); - $q = "SELECT count(*) AS db FROM tovabbkepzesTanulmanyiEgyseg WHERE tovabbkepzesId=%u AND tanarId=%u AND tanev=%u"; - $v = array($ADAT['tovabbkepzesId'],$ADAT['tanarId'],$ADAT['tanev']); - $db = db_query($q, array('debug'=>false,'fv'=>'ujTovabbkepzesTanar','modul'=>'naplo_intezmeny','result'=>'value','values'=>$v),$lr); - if ($db==0) { - ujTovabbkepzesTE($ADAT,$lr); - $q = "UPDATE tovabbkepzesTanulmanyiEgyseg SET reszosszeg=%u,tamogatas=%u,tovabbkepzesStatusz='%s',tavollet='%s',helyettesitesRendje='%s',prioritas='%s' WHERE tovabbkepzesId=%u AND tanarId=%u AND tanev=%u"; - $v = array(intval($ADAT['reszosszeg']),intval($ADAT['tamogatas']),$ADAT['tovabbkepzesStatusz'],$ADAT['tavollet'],$ADAT['helyettesitesRendje'],$ADAT['prioritas'],$ADAT['tovabbkepzesId'],$ADAT['tanarId'],$ADAT['tanev']); - $r = db_query($q, array('debug'=>false,'fv'=>'ujTovabbkepzesTanar','modul'=>'naplo_intezmeny','result'=>'value','values'=>$v),$lr); - - } else { - $q = "UPDATE tovabbkepzesTanulmanyiEgyseg SET reszosszeg=%u,tamogatas=%u,tovabbkepzesStatusz='%s',tavollet='%s',helyettesitesRendje='%s',prioritas='%s' WHERE tovabbkepzesId=%u AND tanarId=%u AND tanev=%u"; - $v = array(intval($ADAT['reszosszeg']),intval($ADAT['tamogatas']),$ADAT['tovabbkepzesStatusz'],$ADAT['tavollet'],$ADAT['helyettesitesRendje'],$ADAT['prioritas'],$ADAT['tovabbkepzesId'],$ADAT['tanarId'],$ADAT['tanev']); - $r = db_query($q, array('debug'=>false,'fv'=>'ujTovabbkepzesTanar','modul'=>'naplo_intezmeny','result'=>'value','values'=>$v),$lr); - } - db_commit($lr); - db_close($lr); - } - function delTovabbkepzesTE($ADAT) { - // echo 'EZT TÖRÖLNÉM'; - // dump($ADAT); - } - -?> \ No newline at end of file diff --git a/mayor-orig/www/include/modules/naplo/intezmeny/valtas.php b/mayor-orig/www/include/modules/naplo/intezmeny/valtas.php deleted file mode 100644 index 702766bb..00000000 --- a/mayor-orig/www/include/modules/naplo/intezmeny/valtas.php +++ /dev/null @@ -1,9 +0,0 @@ -false,'fv'=>'updateNaploSettings','modul'=>'naplo_base','values'=>array(_USERACCOUNT,_POLICY))); - $q = "INSERT INTO settings (userAccount,policy,intezmeny) VALUES ('%s','%s','%s')"; - return db_query($q, array('debug'=>false,'fv'=>'updateNaploSettings','modul'=>'naplo_base','values'=>array(_USERACCOUNT,_POLICY,$intezmeny))); - } -?> diff --git a/mayor-orig/www/include/modules/naplo/koszi/esemenyAdmin.php b/mayor-orig/www/include/modules/naplo/koszi/esemenyAdmin.php deleted file mode 100644 index 4243cf79..00000000 --- a/mayor-orig/www/include/modules/naplo/koszi/esemenyAdmin.php +++ /dev/null @@ -1,86 +0,0 @@ -'naplo_intezmeny','fv'=>'koszi_ujEsemeny','values'=>$v, 'result'=>'insert')); - - } - - function ujKosziPont($ADAT) { - - // kosziHelyezes NULL / 0 ?? - - if ($ADAT['kosziPontTipus']=='') return false; - - $q = "INSERT INTO kosziPont (kosziEsemenyId,kosziPontTipus,kosziPont,kosziHelyezes) VALUES (%u,'%s',%u,%u)"; - $v = array($ADAT['kosziEsemenyId'],$ADAT['kosziPontTipus'],$ADAT['kosziPont'],intval($ADAT['kosziHelyezes'])); - - return db_query($q, array('modul'=>'naplo_intezmeny','fv'=>'koszi_ujPont','values'=>$v, 'result'=>'insert')); - - } - - function ujKoszi($ADAT) { -/* -+----------------+-----------------------------------------+------+-----+---------+----------------+ -| kosziId | int(10) unsigned | NO | PRI | NULL | auto_increment | -| kosziEsemenyId | int(10) unsigned | NO | MUL | NULL | | -| dt | date | YES | | NULL | | -| tanev | smallint(5) unsigned | YES | | NULL | | -| felev | tinyint(3) unsigned | YES | | NULL | | -| igazolo | set('diák','tanár','osztályfőnök') | YES | | NULL | | -+----------------+-----------------------------------------+------+-----+---------+----------------+ -*/ - - $keys = array('kosziEsemenyId','dt','igazolo'); - $pattern = array("%u","'%s'","'%s'"); - $v = array($ADAT['kosziEsemenyId'],$ADAT['dt'],$ADAT['igazolo']); - - if (!is_null($ADAT['targyId'])) { $keys[] = 'targyId'; $pattern[] = "%u"; $v[]=$ADAT['targyId'];} - if (!is_null($ADAT['felev'])) { $keys[] = 'felev'; $pattern[] = "%u"; $v[]=$ADAT['felev'];} - if (!is_null($ADAT['tolDt'])) { $keys[] = 'tolDt'; $pattern[] = "'%s'"; $v[]=$ADAT['tolDt'];} - if (!is_null($ADAT['igDt'])) { $keys[] = 'igDt'; $pattern[] = "'%s'"; $v[]=$ADAT['igDt'];} - - $q = "INSERT INTO koszi (".implode(',',$keys).") VALUES (".implode(',',$pattern).")"; - return db_query($q, array('modul'=>'naplo','fv'=>'koszi_ujKoszi','values'=>$v, 'result'=>'insert')); - - } - - function delKoszi($kosziIds) { - for ($i=0; $i'naplo','fv'=>'koszi_del','values'=>$v, 'result'=>'delete')); - } - } - - function kosziIgazolo($kosziId, $IDK,$tipus) { - -/* -| kosziId | int(10) unsigned | NO | PRI | NULL | | -| diakId | int(10) unsigned | NO | PRI | NULL | | -*/ - - if ($tipus=='Diak') $t = 'diak'; else $t='tanar'; - - for ($i=0; $i'naplo','fv'=>'koszi_ujKapcsolat','values'=>$v, 'result'=>'insert')); - } - - return; - - } - -?> diff --git a/mayor-orig/www/include/modules/naplo/koszi/koszi.php b/mayor-orig/www/include/modules/naplo/koszi/koszi.php deleted file mode 100644 index 0e6e9572..00000000 --- a/mayor-orig/www/include/modules/naplo/koszi/koszi.php +++ /dev/null @@ -1,40 +0,0 @@ -'naplo','fv'=>'koszi_ujKosziDiak','values'=>$v, 'result'=>'value')); - - if ($db>0) { - $_SESSION['alert'][] = 'info:koszi_dup'; - return false; - } - - - $q = "SELECT kosziPont FROM kosziPont WHERE kosziPontId=%u"; - $v = array($ADAT['kosziPontId']); - $pont = db_query($q, array('modul'=>'naplo_intezmeny','fv'=>'koszi_ujKosziDiak','values'=>$v, 'result'=>'value')); - - - if (is_numeric($pont) && is_numeric($ADAT['kosziId']) && is_numeric($ADAT['diakId'])) { - $q = "INSERT INTO kosziDiak (kosziId,diakId,kosziPontId,pont) VALUES (%u,%u,%u,%u)"; - $v = array($ADAT['kosziId'],$ADAT['diakId'],$ADAT['kosziPontId'],$pont); - return db_query($q, array('modul'=>'naplo','fv'=>'koszi_ujKosziDiak','values'=>$v, 'result'=>'insert')); - } else { - return false; - } - - } -?> diff --git a/mayor-orig/www/include/modules/naplo/koszi/kosziAdmin.php b/mayor-orig/www/include/modules/naplo/koszi/kosziAdmin.php deleted file mode 100644 index 50ba9981..00000000 --- a/mayor-orig/www/include/modules/naplo/koszi/kosziAdmin.php +++ /dev/null @@ -1,82 +0,0 @@ -'naplo','fv'=>'koszi_jovahagyhato','values'=>$v, 'result'=>'value')); - return ($r==1); - - } - - function kosziJovahagyhatoByTanarId($kosziId,$tanarId) { - - - $q = "SELECT count(*) AS c FROM kosziIgazoloTanar WHERE kosziId=%u AND tanarId=%u"; - $v = array($kosziId,$tanarId); - $r1 = db_query($q, array('modul'=>'naplo','fv'=>'koszi_jovahagyhato','values'=>$v, 'result'=>'value')); - - $q = "SELECT count(*) AS c FROM kosziIgazoloOf WHERE kosziId=%u AND tanarId=%u"; - $v = array($kosziId,$tanarId); - $r2 = db_query($q, array('modul'=>'naplo','fv'=>'koszi_jovahagyhato','values'=>$v, 'result'=>'value')); - - /* Ez sajnos jóval bonyolultabb lett v2.0: ilyen: szinkronizáld a share/koszi.php - ben levő függvénnyel, ami HASONLÓ */ - - $q = "SELECT count(*) AS c FROM kosziDiak - LEFT JOIN kosziIgazoloTanar USING (kosziId) - LEFT JOIN kosziIgazoloOf USING (kosziId) - LEFT JOIN koszi USING (kosziId) - LEFT JOIN ".__INTEZMENYDBNEV.".kosziEsemeny USING (kosziEsemenyId) - WHERE kosziDiak.kosziId=%u AND jovahagyasDt='0000-00-00 00:00:00' AND - ( - ( - (kosziIgazoloTanar.tanarId=%u AND kosziIgazoloOf.tanarId IS NULL) Or - (kosziIgazoloTanar.tanarId IS NULL AND kosziIgazoloOf.tanarId=%u) - ) OR ( - koszi.igazolo LIKE '%%osztályfőnök%%' AND - diakId IN ( - SELECT diakId FROM ".__INTEZMENYDBNEV.".osztalyTanar - LEFT JOIN ".__INTEZMENYDBNEV.".osztalyDiak USING (osztalyId) - WHERE tanarId=%u AND osztalyTanar.beDt<=NOW() AND (osztalyTanar.kiDt IS NULL OR osztalyTanar.kiDt>=NOW()) - ) - ) OR ( - koszi.igazolo LIKE '%%tanár%%' AND - diakId IN ( - SELECT diakId FROM ".__INTEZMENYDBNEV.".tankorTanar - LEFT JOIN ".__INTEZMENYDBNEV.".tankorDiak USING (tankorId) - LEFT JOIN ".__INTEZMENYDBNEV.".tankor USING (tankorId) - WHERE tanarId=%u AND ".__INTEZMENYDBNEV.".tankor.targyId = koszi.targyId - ) - ) - ) - "; - $v = array($kosziId, $tanarId, $tanarId,$tanarId,$tanarId,$tanarId); - $r3 = db_query($q, array('debug'=>false,'modul'=>'naplo','result'=>'value', 'values'=>$v)); - return ($r1==1 || $r2==1 || $r3==1); - - } - - - function kosziElutasit($kosziId,$diakId) { - - // delete helyett update elutasítva flag állítása? - - $q = "DELETE FROM kosziDiak WHERE kosziId=%u AND diakId=%u"; - $v = array($kosziId,$diakId); - db_query($q, array('modul'=>'naplo','fv'=>'koszi_torol','values'=>$v, 'result'=>'delete')); - - } - - function kosziJovahagy($kosziId,$diakId) { - $q = "UPDATE kosziDiak SET jovahagyasDt=NOW() WHERE kosziId=%u AND diakId=%u"; - $v = array($kosziId,$diakId); - db_query($q, array('modul'=>'naplo','fv'=>'koszi_jovahagy','values'=>$v, 'result'=>'update')); - } - - -?> diff --git a/mayor-orig/www/include/modules/naplo/naplo.php b/mayor-orig/www/include/modules/naplo/naplo.php deleted file mode 100644 index e7923a72..00000000 --- a/mayor-orig/www/include/modules/naplo/naplo.php +++ /dev/null @@ -1,12 +0,0 @@ - 'getBeirasiAdatok', 'modul' => 'naplo', 'result' => 'value')); - } else return 0; - } - -?> diff --git a/mayor-orig/www/include/modules/naplo/nyomtatas/beiskolazasiTerv.php b/mayor-orig/www/include/modules/naplo/nyomtatas/beiskolazasiTerv.php deleted file mode 100644 index 1fd6402e..00000000 --- a/mayor-orig/www/include/modules/naplo/nyomtatas/beiskolazasiTerv.php +++ /dev/null @@ -1,64 +0,0 @@ -'getBeiskolazasiTerv','modul'=>'naplo_intezmeny','result'=>'indexed','values'=>array($tanev))); - - } - - function beiskolazasNyomtatvanyKeszites($ADAT) { - - global $Honapok; - - // A sablonfile meghatározása - define('__TEMPLATE_DIR', _MAYOR_DIR.'/print/module-naplo/templates'); - $tmplFile = 'beiskolazasiTerv'; - - if (file_exists(__TEMPLATE_DIR.'/'.__INTEZMENY.'/'.$tmplFile.'.tmpl')) { - $templateFile = __TEMPLATE_DIR.'/'.__INTEZMENY.'/'.$tmplFile.'.tmpl'; - } elseif (file_exists(__TEMPLATE_DIR.'/default/'.$tmplFile.'.tmpl')) { - $templateFile = __TEMPLATE_DIR.'/default/'.$tmplFile.'.tmpl'; - } else { - $_SESSION['alert'][] = 'message:file_not_found:'.__TEMPLATE_DIR.'/default/'.$tmplFile.'.tmpl'; - return false; - } - - $Intezmeny = getIntezmenyByRovidnev(__INTEZMENY); - list($ev, $ho, $nap) = explode('-', $ADAT['tanulmanyiEgyseg']['igDt']); - $DATA = array( - 'file' => $ADAT['file'], - 'base' => array('nyomtatasDt' => date('Y.m.d'), 'nyomtatasDatumStr' => date('Y. m. d.'), - 'datumEv' => $ev, 'datumHonap' => $ho, 'datumNap' => $nap, 'hoNev' => kisbetus($Honapok[$ho-1]), - 'intezmenyNev' => $Intezmeny['nev'], 'intezmenyOMKod' => $Intezmeny['OMKod'], 'intezmenyCimIrsz' => $Intezmeny['cimIrsz'], - 'intezmenyCimHelyseg' => $Intezmeny['cimHelyseg'], 'intezmenyCimKozteruletNev' => $Intezmeny['cimKozteruletNev'], - 'intezmenyCimKozteruletJelleg' => $Intezmeny['cimKozteruletJelleg'], 'intezmenyCimHazszam' => $Intezmeny['cimHazszam'], - 'intezmenyTelefon' => $Intezmeny['telefon'], 'intezmenyHonlap' => $Intezmeny['honlap'], - 'intezmenyFax' => $Intezmeny['fax'], 'intezmenyEmail' => $Intezmeny['email'], - - 'tanevJele'=>$ADAT['tanev'].'/'.($ADAT['tanev']+1), 'tanev'=>$ADAT['tanev'], - - 'tanulmanyiEgyseg' => range(0, count($ADAT['tanulmanyiEgyseg'])-1), - - ), - 'tanulmanyiEgyseg' => $ADAT['tanulmanyiEgyseg'] - - ); - for ($i = 0; $i < count($ADAT['tanulmanyiEgyseg']); $i++) { - $TE = $ADAT['tanulmanyiEgyseg'][$i]; - $DATA['tanulmanyiEgyseg'][$i]['tanarNev'] = $ADAT['tanarok'][ $TE['tanarId'] ]['tanarNev']; - $DATA['tanulmanyiEgyseg'][$i]['tolDt'] = str_replace('-','. ',$TE['tolDt']).'.'; - $DATA['tanulmanyiEgyseg'][$i]['igDt'] = str_replace('-','. ',$TE['igDt']).'.'; - //$DATA['tanulmanyiEgyseg'][$i]['tanarBesorolas'] = $ADAT['tanarok'][ $TE['tanarId'] ]['besorolas']; - } - -//dump($ADAT); -//dump($DATA); -//return false; -//die(); - return template2file($templateFile, $DATA); - } - -?> \ No newline at end of file diff --git a/mayor-orig/www/include/modules/naplo/nyomtatas/bizonyitvanyNyomtatas.php b/mayor-orig/www/include/modules/naplo/nyomtatas/bizonyitvanyNyomtatas.php deleted file mode 100644 index b4d254d2..00000000 --- a/mayor-orig/www/include/modules/naplo/nyomtatas/bizonyitvanyNyomtatas.php +++ /dev/null @@ -1,164 +0,0 @@ - diff --git a/mayor-orig/www/include/modules/naplo/nyomtatas/diakAdatlap.php b/mayor-orig/www/include/modules/naplo/nyomtatas/diakAdatlap.php deleted file mode 100644 index 46adec96..00000000 --- a/mayor-orig/www/include/modules/naplo/nyomtatas/diakAdatlap.php +++ /dev/null @@ -1,22 +0,0 @@ - diff --git a/mayor-orig/www/include/modules/naplo/nyomtatas/diakTankorJelentkezes.php b/mayor-orig/www/include/modules/naplo/nyomtatas/diakTankorJelentkezes.php deleted file mode 100644 index 7eb0807e..00000000 --- a/mayor-orig/www/include/modules/naplo/nyomtatas/diakTankorJelentkezes.php +++ /dev/null @@ -1,336 +0,0 @@ - $TB) { - for ($j = 0; $j < count($TB); $j++) { - $TID2B[$TB[$j]][] = $blokkId; - $TID2BN[$TB[$j]][] = $tankorBlokkok['blokkNevek'][$blokkId]; - } - } - $v = array(); - if (is_array($OSZTALYIDK) && count($OSZTALYIDK) > 0) { - $W = " AND osztalyId IN (".implode(',', array_fill(0, count($OSZTALYIDK), '%u')).")"; - $v = $OSZTALYIDK; - } - $q = "SELECT DISTINCT tankorId, targyId, kovetelmeny, min, max, tanev, szemeszter, oraszam, tankorNev - FROM tankor LEFT JOIN tankorSzemeszter USING (tankorId) JOIN tankorOsztaly USING (tankorId) - WHERE tanev=%u and szemeszter=%u and tankor.felveheto =1".$W." ORDER BY tankorNev,tankor.tankorId"; - array_unshift($v, $tanev, $szemeszter); - $felvehetoTankorok = db_query($q,array('debug'=>false,'fv' => 'getValasztottTankorok', 'modul' => 'naplo_intezmeny', 'result' => 'indexed', 'values' => $v)); - for ($i = 0; $i < count($felvehetoTankorok); $i++) { - $_tankorId = $felvehetoTankorok[$i]['tankorId']; - if ($_tankorId != null) { - $fTankorok[$_tankorId] = $felvehetoTankorok[$i]; - $fTankorok[$_tankorId]['blokkIdk'] = $TID2B[$_tankorId]; - $fTankorok[$_tankorId]['blokkNevek'] = $TID2BN[$_tankorId]; - //$felvehetoTankorok[$_tankorid]['letszam'] = getTankorLetszam($felvehetoTankorok[$i]['tankorId'],$DT); - $fTankorok[$_tankorId]['tanarok'] = getTankorTanaraiByInterval($_tankorId, array('tolDt' => $DT['tolDt'], 'igDt' => $DT['igDt'], 'result' => 'nevsor')); - $FT[] = $_tankorId; - } - } - - if (is_array($FT) && count($FT) > 0) { - if (is_array($OSZTALYIDK) && count($OSZTALYIDK)>0) { - $W .= " AND osztalyDiak.beDt<='".$DT['tolDt']."' AND (osztalyDiak.kiDt IS NULL OR '".$DT['tolDt']."'<=osztalyDiak.kiDt)"; - $v = mayor_array_join($FT, $OSZTALYIDK); - } else { $v = $FT; } - $q = "SELECT tankorId,diakId FROM tankorDiak LEFT JOIN diak USING (diakId) LEFT JOIN osztalyDiak USING (diakId) - WHERE tankorId IN (".implode(',', array_fill(0, count($FT), '%u')).") $W - ORDER BY CONCAT_WS(' ',viseltCsaladinev,viseltUtonev)"; - $r = db_query($q,array('debug'=>false,'fv' => 'getValasztottTankorok', 'modul' => 'naplo_intezmeny', 'result' => 'indexed', 'values' => $v)); - for ($i = 0; $i < count($r); $i++) { - $felvett[$r[$i]['diakId']][] = $r[$i]['tankorId']; - } - } - - $ADAT['felveheto'] = $fTankorok; - $ADAT['felvett'] = $felvett; - return $ADAT; - } - - function texLevelGeneralasMasodikNyelvValasztas($ADAT) { - - $return = ''; - $return .= ' -\documentclass[8pt]{article} - -\usepackage[a5paper]{geometry} % A5-os méret -\usepackage[utf8]{inputenc} % UTF-8 kódolású forrás -\usepackage{t1enc} -\usepackage[magyar]{babel} % magyar elválasztási szabályok -\frenchspacing % a magyar tipográfiai szabályoknak megfelelő szóközök írásjelek után -\usepackage{booktabs} % táblázatok magasabb szintű formázása -\usepackage{fancyhdr} % Ritkítás -\pagestyle{fancy} -\def\mayor{% -\font\mayorfnt=cmsl4% -\font\Mayorfnt=cmsl6 -{\mayorfnt\lower0.5ex\hbox{\lower-0.5ex\hbox{Ma}\kern-0.3em\lower0.25ex\hbox{\Mayorfnt Y}\kern-0.2em\hbox{o}\lower0ex\hbox{R}}}} -\renewcommand{\footnotesize}{\fontsize{6pt}{8pt}\selectfont} -%\addtolength{\skip\footins}{2mm} -\addtolength{\textheight}{16mm} -\setlength{\footskip}{26pt} -\setlength{\headsep}{24pt} -\lhead{\tiny '.$ADAT['intezmeny']['nev'].'} -\rhead{\tiny 2. nyelv jelentkezés '.$ADAT['tanev'].'} -\cfoot{\tiny \copyright\mayor\ elektronikus napló - Nyomtatva: '.date('Y.m.d.').'} -\begin{document} -'; - $Tankorok = $tankorNev = $ADAT['valasztott']['felveheto']; - if (is_array($ADAT['valasztott']['felvett'])) foreach ($ADAT['valasztott']['felvett'] as $diakId => $tankorIds) { - $diakNev = $ADAT['diakAdat'][$diakId]['diakNev']; - $diakOsztaly = $ADAT['osztalyok'][ $ADAT['diakOsztaly'][$diakId][0] ]['osztalyJel']; - - $return .= ' -\begin{center} -{\large\bfseries J E L E N T K E Z É S}\\\\ -\small - -\vspace{12pt} - -A '.$ADAT['tanev'].'. szeptemberében induló\\\\ -második idegen nyelv képzésre - -\vspace{12pt} - -{\bfseries\normalsize '.$diakNev.'}\\\\ -'.$diakOsztaly.' osztály\\\\ -\end{center} - -\vspace{10pt} - -\footnotesize -A Városmajori Gimnázium Pedagógiai Programja szerint az iskola tanulói a 9-12. évfolyamon -(kötelező módon) két különböző idegen nyelvet tanulnak. Az első idegen nyelv az adott osztálynak, -ill. a nyelvi előkészítő osztály adott csoportjának már előzetesen meghatározott, azonban a második -nyelvet mindenki – az iskola lehetőségeinek figyelembevétele mellett – szabadon választhatja meg. -Amennyiben a választott idegen nyelvet elegendő számú diák jelölte meg, úgy lehetőség van a -nyelvi csoport indítására. (A csoportok évfolyamszintű bontásban kerülnek kialakításra.) A nyelvi -csoportok várható létszáma 12-18 fő közötti lesz. A 9. évfolyamtól a 12. évfolyam végéig ez a -tantárgy is ugyanolyan kötelező lesz, mint a többi tárgy. -nem lehet hiányozni róla és jegyet kell szerezni belőle.) - -A fentiek tudomásul vételével, az internetes jelentkezési felületen a '.$ADAT['tanev'].'/'.($ADAT['tanev']+1).' tanév -9. évfolyamos diákjai számára meghirdetett képzések közül általam választott 2. idegen nyelv: - -\vspace{16pt} - -\begin{tabular}{l|l|c|l} -Tankör neve & Blokk & Óraszám & Tanár \\\\ -\toprule -%%\hline -'; - - - - for ($i = 0; $i < count($tankorIds); $i++) { - $tankorId = $tankorIds[$i]; - $tankorNev = $Tankorok[$tankorId]['tankorNev']; - $oraszam = intval($Tankorok[$tankorId]['oraszam']); - if (is_array($Tankorok[$tankorId]['tanarok']) && count($Tankorok[$tankorId]['tanarok']) > 0) - $tanarNev = $Tankorok[$tankorId]['tanarok'][0]['tanarNev']; - else $tanarNev = '{\slshape n.a.}'; - if (is_array($Tankorok[$tankorId]['blokkNevek'])) $blokkNev = implode(', ', $Tankorok[$tankorId]['blokkNevek']); - else $blokkNev = ''; - $return .= '\vbox to 1.2em {}'.$tankorNev.' & '.$blokkNev.' & '.$oraszam.' & '.$tanarNev.' \\\\ -\hline'; - -//echo $tankorId.' '.$tankorNev.' '.$oraszam.':'.$blokkNev.'
'; -//echo $diakId.' '.$diakNev.' '.$diakOsztaly.'
'; -//echo '
';
-//var_dump($ADAT); die();
-            }
-
-            $return .= '
-%%\bottomrule
-\end{tabular}
-
-\vspace{16pt}
-
-
-Amennyiben a választott nyelv az angol vagy a német, úgy a megfelelő szó aláhúzásával kérjük 
-megadni, hogy az adott nyelvet kezdő vagy haladó szintről szeretné elkezdeni tanulni:
-
-\begin{center}
-\vspace{10pt}
-
-{
-\bfseries
-\begin{tabular}{ccc}
-kezdő szintet választom&\hspace{1cm}\ &haladó szintről szeretném kezdeni\\\\
-\end{tabular}
-}
-
-\vspace{10pt}
-
-(A haladó szintet választóknak egy szintfelmérő vizsgán kell részt venniük, ami alapján a nyelvi 
-csoportbesorolást elvégezzük.)
-
-\vspace{12pt}
-
-{\slshape Az aláírt jelentkezési lap osztályfőnöknél történő leadásának határideje:} {\bfseries '.$ADAT['leadasiHatarido'].'}
-
-\vspace{20pt}
-\begin{flushleft}
-{\scriptsize Budapest, '.$ADAT['tanev'].'. április}
-\end{flushleft}
-\vspace{20pt}\slshape\scriptsize
-\begin{tabular}{ccc}
-\rule{3.5cm}{0.1pt}&\hspace{3cm}\ &\rule{3.5cm}{0.1pt}\\\\
-tanuló&&szülő/gondviselő\\\\
-\end{tabular}
-
-\end{center}
-\newpage %%%%% új oldal %%%%%';
-
-
-        }
-
-	$return .= '
-\end{document}';
-
-
-	return $return;
-    }
-
-/* ---- eredeti ---- */
-
-    function texLevelGeneralas($ADAT) {
-
-	$return = '';
-	$return .= '
-\documentclass[8pt]{article}
-
-\usepackage[a5paper]{geometry} % A5-os méret
-\usepackage[utf8]{inputenc} % UTF-8 kódolású forrás
-\usepackage{t1enc}
-\usepackage[magyar]{babel} % magyar elválasztási szabályok
-\frenchspacing % a magyar tipográfiai szabályoknak megfelelő szóközök írásjelek után
-\usepackage{booktabs} % táblázatok magasabb szintű formázása
-\usepackage{fancyhdr} % Ritkítás
-\pagestyle{fancy}
-\def\mayor{%
-\font\mayorfnt=cmsl4%
-\font\Mayorfnt=cmsl6
-{\mayorfnt\lower0.5ex\hbox{\lower-0.5ex\hbox{Ma}\kern-0.3em\lower0.25ex\hbox{\Mayorfnt Y}\kern-0.2em\hbox{o}\lower0ex\hbox{R}}}}
-\renewcommand{\footnotesize}{\fontsize{6pt}{8pt}\selectfont}
-%\addtolength{\skip\footins}{2mm}
-\addtolength{\textheight}{16mm}
-\setlength{\footskip}{26pt}
-\setlength{\headsep}{24pt}
-\lhead{\tiny '.$ADAT['intezmeny']['nev'].'}
-\rhead{\tiny Fakultációs jelentkezés '.$ADAT['tanev'].'}
-\cfoot{\tiny \copyright\mayor\ elektronikus napló - Nyomtatva: '.date('Y.m.d.').'}
-\begin{document}
-';
-        $Tankorok = $tankorNev = $ADAT['valasztott']['felveheto'];
-        if (is_array($ADAT['valasztott']['felvett'])) foreach ($ADAT['valasztott']['felvett'] as $diakId => $tankorIds) {
-            $diakNev = $ADAT['diakAdat'][$diakId]['diakNev'];
-            $diakOsztaly = $ADAT['osztalyok'][ $ADAT['diakOsztaly'][$diakId][0] ]['osztalyJel'];
-
-	    $return .= '
-\begin{center}
-{\large\bfseries J E L E N T K E Z É S}\\\\
-\small
-
-\vspace{12pt}
-
-A '.$ADAT['tanev'].'. szeptemberében induló\\\\
-közép- és emeltszintű érettségire előkészítő képzésekre
-
-\vspace{12pt}
-
-{\bfseries\normalsize '.$diakNev.'}\\\\
-'.$diakOsztaly.' osztály\\\\
-
-\vspace{12pt}
-
-A '.$ADAT['tanev'].'/'.($ADAT['tanev']+1).' tanév 11. évfolyamos diákjai számára meghirdetett képzések közül
-–~az internetes jelentkezés adatai alapján~– 
-%–~az elektronikus adminisztrációs rendszer adatai alapján~–
-az alábbi képzéseket választottam: 
-
-\vspace{16pt}
-
-\begin{tabular}{l|l|c|l}
-Tankör neve & Blokk & Óraszám & Tanár \\\\ 
-\toprule
-\hline
-';
-
-
-
-            for ($i = 0; $i < count($tankorIds); $i++) {
-                $tankorId = $tankorIds[$i];
-                $tankorNev = $Tankorok[$tankorId]['tankorNev'];
-                $oraszam = intval($Tankorok[$tankorId]['oraszam']);
-		if (is_array($Tankorok[$tankorId]['tanarok']) && count($Tankorok[$tankorId]['tanarok']) > 0) 
-		    $tanarNev = $Tankorok[$tankorId]['tanarok'][0]['tanarNev'];
-		else $tanarNev = '{\slshape n.a.}';
-                if (is_array($Tankorok[$tankorId]['blokkNevek'])) $blokkNev = implode(', ', $Tankorok[$tankorId]['blokkNevek']);
-                else $blokkNev = '';
-		$return .= '\vbox to 1.2em {}'.$tankorNev.' & '.$blokkNev.' & '.$oraszam.' & '.$tanarNev.' \\\\ 
-\hline';
-
-//echo $tankorId.' '.$tankorNev.' '.$oraszam.':'.$blokkNev.'
';
-//echo $diakId.' '.$diakNev.' '.$diakOsztaly.'
';
-//echo '
';
-//var_dump($ADAT); die();
-            }
-
-            $return .= '
-\bottomrule
-\end{tabular}
-
-\vspace{16pt}
-
-Tudomásul veszem, hogy az általam választott, két tanévre meghirdetett tantárgyak a következő tanévben számomra kötelezőek lesznek, leadásukra csak a 
-11. osztályos követelmények teljesítése után lesz lehetőségem.\footnotemark[1]
-\footnotetext[1]{Az iskola belső szabályai szerint a 12. évfolyamban is meg kell maradjon legalább heti 4 óra választott képzés, továbbá más tankör 
-utólagos felvétele létszámkeretekhez, illetve a sikeres különbözeti vizsga letételéhez köthető.}
-
-\vspace{12pt}
-
-{\slshape Az aláírt jelentkezési lap osztályfőnöknél történő leadásának határideje:} {\bfseries '.$ADAT['leadasiHatarido'].'}
-
-\vspace{20pt}
-\begin{flushleft}
-{\scriptsize Budapest, '.$ADAT['tanev'].'. június}
-\end{flushleft}
-\vspace{20pt}\slshape\scriptsize
-\begin{tabular}{ccc}
-\rule{3.5cm}{0.1pt}&\hspace{3cm}\ &\rule{3.5cm}{0.1pt}\\\\
-tanuló&&szülő/gondviselő\\\\
-\end{tabular}
-
-\end{center}
-\newpage %%%%% új oldal %%%%%';
-
-
-        }
-
-	$return .= '
-\end{document}';
-
-
-	return $return;
-    }
-
-
-
-?>
diff --git a/mayor-orig/www/include/modules/naplo/nyomtatas/ertesito.php b/mayor-orig/www/include/modules/naplo/nyomtatas/ertesito.php
deleted file mode 100644
index 5c1a5c97..00000000
--- a/mayor-orig/www/include/modules/naplo/nyomtatas/ertesito.php
+++ /dev/null
@@ -1,101 +0,0 @@
- $ADAT['file'],
-            'base' => array('nyomtatasDt' => date('Y.m.d'), 'ev' => $ev, 'honap' => $ho, 'nap' => $nap, 'hoNev' => kisbetus($Honapok[$ho-1]),
-		'tanevKezdesEv' => $ADAT['szemeszterAdat']['tanev'], 'tanevZarasEv' => ($ADAT['szemeszterAdat']['tanev']+1), 
-		'szemeszter' => $ADAT['szemeszterAdat']['szemeszter'],
-                'intezmenyNev' => $ADAT['intezmeny']['nev'], 'intezmenyCimIrsz' => $ADAT['intezmeny']['cimIrsz'],
-                'intezmenyCimHelyseg' => $ADAT['intezmeny']['cimHelyseg'], 'intezmenyCimKozteruletNev' => $ADAT['intezmeny']['cimKozteruletNev'],
-                'intezmenyCimKozteruletJelleg' => $ADAT['intezmeny']['cimKozteruletJelleg'], 'intezmenyCimHazszam' => $ADAT['intezmeny']['cimHazszam'],
-                'intezmenyTelefon' => $ADAT['intezmeny']['telefon'], 'intezmenyHonlap' => $ADAT['intezmeny']['honlap'],
-                'intezmenyFax' => $ADAT['intezmeny']['fax'], 'intezmenyEmail' => $ADAT['intezmeny']['email'],
-                'diak' => array(), 'osztaly' => $ADAT['osztaly']['osztalyJel'],
-		'magatartas' => '', 'szorgalom' => '', 
-		'igazolt' => 0, 'igazolatlan' => 0, 'kesesIgazolatlan' => 0, 'kesesPercOsszeg' => 0, 
-		'gyakIgazolt' => 0, 'gyakIgazolatlan' => 0, 'gyakKesesIgazolatlan' => 0, 'gyakKesesPercOsszeg' => 0, 
-		'elmIgazolt' => 0, 'elmIgazolatlan' => 0, 'elmKesesIgazolatlan' => 0, 'elmKesesPercOsszeg' => 0, 
-		'mJel' => '', 'megjegyzes' => '',
-            ),
-            'diak' => $ADAT['diakok'],
-        );
-	for ($i = 0; $i < count($ADAT['diakIds']); $i++) if (isset($ADAT['jegyek'][ $ADAT['diakIds'][$i] ])) $DATA['base']['diak'][] = $ADAT['diakIds'][$i];
-	for ($i = 0; $i < count ($ADAT['targyak']); $i++) {
-	    $DATA['targy'][ $ADAT['targyak'][$i]['targyId'] ] = $ADAT['targyak'][$i];
-	}
-	if (is_array($ADAT['jegyek']) && count($ADAT['jegyek']) > 0) foreach ($ADAT['jegyek'] as $diakId => $dJegyek) {
-	    if (is_array($dJegyek) && count($dJegyek) > 0) { // Ha vanak egyáltalán jegyei...
-		foreach ($DATA['targy'] as $targyId => $tAdat) { // A helyes sorrend miatt kell ezen végigmenni
-		    if (is_array($dJegyek[$targyId])) { // van az adott tárgyból jegye
-			$tJegyek = $dJegyek[$targyId];
-			// Az utolsó jegyet írjuk csak ki
-			$jegy = $tJegyek[ count($tJegyek)-1 ];
-			if (in_array($targyId, $ADAT['szorgalomIds'])) {
-			    $DATA['diak'][$diakId]['szorgalom'] = $KOVETELMENY['szorgalom'][ $jegy['jegy'] ]['hivatalos'];
-			    $DATA['diak'][$diakId]['szorgMegjJel'] = nagybetus($jegy['megjegyzes'][0]);
-			} elseif (in_array($targyId, $ADAT['magatartasIds'])) {
-			    $DATA['diak'][$diakId]['magatartas'] = $KOVETELMENY['magatartás'][ $jegy['jegy'] ]['hivatalos'];
-			    $DATA['diak'][$diakId]['magMegjJel'] = nagybetus($jegy['megjegyzes'][0]);
-			} else {
-			    $DATA['diak'][$diakId]['targy'][$targyId] = $jegy;
-			    $DATA['diak'][$diakId]['targy'][$targyId]['jTipus'] = $jegy['jegyTipus'];
-			    $DATA['diak'][$diakId]['targy'][$targyId]['mJel'] = nagybetus($jegy['megjegyzes'][0]);
-			    $DATA['diak'][$diakId]['targy'][$targyId]['hivatalos'] = $KOVETELMENY[ $jegy['jegyTipus'] ][ $jegy['jegy'] ]['hivatalos'];
-			    $DATA['diak'][$diakId]['targy'][$targyId]['rovid'] = $KOVETELMENY[ $jegy['jegyTipus'] ][ $jegy['jegy'] ]['rovid'];
-			}
-		    }
-		}
-	    }
-	}
-//	foreach ($ADAT['hianyzas'] as $diakId => $dHianyzas) { - A kimaradó diákok bajt okoznak => az összes diákon végig kell menni!
-	foreach ($ADAT['diakIds'] as $key => $diakId) {
-		$dHianyzas = $ADAT['hianyzas'][$diakId];
-
-		$DATA['diak'][$diakId]['igazolt'] = $dHianyzas['igazolt'];
-		$DATA['diak'][$diakId]['kesesPercOsszeg'] = intval($dHianyzas['kesesPercOsszeg']);
-		$DATA['diak'][$diakId]['kesesIgazolatlan'] = floor($dHianyzas['kesesPercOsszeg']/45);
-		$DATA['diak'][$diakId]['osszesIgazolatlan'] = $dHianyzas['igazolatlan']; // Tartalmazza az összes hivatalos hiányzást! A késések percösszegéből adódóakat is!!
-		$DATA['diak'][$diakId]['igazolatlan'] = $dHianyzas['igazolatlan']-$DATA['diak'][$diakId]['kesesIgazolatlan']; 
-
-		$DATA['diak'][$diakId]['gyakIgazolt'] = intval($dHianyzas['gyakorlatIgazolt']);
-		$DATA['diak'][$diakId]['gyakIgazolatlan'] = intval($dHianyzas['gyakorlatIgazolatlan']);
-		$DATA['diak'][$diakId]['gyakKesesPercOsszeg'] = intval($dHianyzas['gyakorlatKesesPercOsszeg']);
-		$DATA['diak'][$diakId]['gyakKesesIgazolatlan'] = floor($dHianyzas['gyakorlatKesesPercOsszeg']/45);
-		$DATA['diak'][$diakId]['gyakOsszesIgazolatlan'] = $DATA['diak'][$diakId]['gyakIgazolatlan']+$DATA['diak'][$diakId]['gyakKesesIgazolatlan'];
-
-		$DATA['diak'][$diakId]['elmIgazolt'] = intval($dHianyzas['elmeletIgazolt']);
-		$DATA['diak'][$diakId]['elmIgazolatlan'] = intval($dHianyzas['elmeletIgazolatlan']);
-		$DATA['diak'][$diakId]['elmKesesPercOsszeg'] = intval($dHianyzas['elmeletKesesPercOsszeg']);
-		$DATA['diak'][$diakId]['elmKesesIgazolatlan'] = floor($dHianyzas['elmeletKesesPercOsszeg']/45);
-		$DATA['diak'][$diakId]['elmOsszesIgazolatlan'] = $DATA['diak'][$diakId]['elmIgazolatlan']+$DATA['diak'][$diakId]['elmKesesIgazolatlan'];
-
-	}
-//echo '
';
-//var_dump($DATA['base']['diak'], $ADAT['jegyek']);
-//echo '
';
-//die();
-
-        return template2file($templateFile, $DATA);
-
-
-    }
-
-?>
diff --git a/mayor-orig/www/include/modules/naplo/nyomtatas/haladasinaplo.php b/mayor-orig/www/include/modules/naplo/nyomtatas/haladasinaplo.php
deleted file mode 100644
index 1577a367..00000000
--- a/mayor-orig/www/include/modules/naplo/nyomtatas/haladasinaplo.php
+++ /dev/null
@@ -1,139 +0,0 @@
- 'tankorokNaploja', 'modul' => 'naplo', 'result' => 'keyvaluepair'));
-
-    }
-
-    function getNaploTankorei($osztalyId) {
-
-	$q = "SELECT tankorId FROM tankorNaplo WHERE osztalyId=%u";
-	return db_query($q, array('fv' => 'getNaploTankorei', 'modul' => 'naplo', 'result' => 'idonly', 'values' => array($osztalyId)));
-
-    }
-
-    function getNaploOrak(&$ADAT) {
-
-
-	$q = "SELECT * FROM ora WHERE tankorId IN (".implode(',', array_fill(0, count($ADAT['naploTankor']), '%u')).") 
-		AND '%s'<=dt AND dt<='%s' ORDER BY dt,ora,tankorId";
-	$v = mayor_array_join($ADAT['naploTankor'], array($ADAT['tanevAdat']['kezdesDt'], $ADAT['tanevAdat']['zarasDt']));
-	$A = db_query($q, array('fv' => 'getNaploOrak', 'modul' => 'naplo', 'result' => 'indexed', 'values' => $v));
-	$Oraszam = $oraIds = array();
-	for ($i = 0; $i < count($A); $i++) {
-
-	    $ADAT['orak'][ $A[$i]['dt'] ][ $A[$i]['ora'] ][] = $A[$i];
-	    $oraIds[] = $A[$i]['oraId']; $oraId2dt[ $A[$i]['oraId'] ] = array('dt' => $A[$i]['dt'], 'ora' => $A[$i]['ora']);
-            if (
-		!in_array($A[$i]['tipus'], array('elmarad','elmarad máskor')) // Lehet olyan elmaradó óra, amihez van beírva tananyag...
-		&& (
-            	    !is_array($ADAT['tananyag'][ $A[$i]['dt'] ][ $A[$i]['tankorId'] ])
-            	    || !in_array($A[$i]['leiras'], $ADAT['tananyag'][ $A[$i]['dt'] ][ $A[$i]['tankorId'] ])
-		)
-            ) $ADAT['tananyag'][ $A[$i]['dt'] ][ $A[$i]['tankorId'] ][] = $A[$i]['leiras'];
-
-    	    if (defined('__ORASZAMOT_NOVELO_TIPUSOK')) {
-        	$oraszamNoveloTipus = explode(',', __ORASZAMOT_NOVELO_TIPUSOK);
-    	    } else {
-        	$_SESSION['alert'][] = 'info:missing_constant:__ORASZAMOT_NOVELO_TIPUSOK';
-        	$oraszamNoveloTipus = array('normál', 'normál máskor', 'helyettesítés', 'összevonás');
-    	    }
-	    if (in_array($A[$i]['tipus'], $oraszamNoveloTipus)) {
-		$ADAT['oraszam'][ $A[$i]['dt'] ][ $A[$i]['tankorId'] ][] = (++$Oraszam[ $A[$i]['tankorId'] ]);
-	    } else {
-		$ADAT['oraszam'][ $A[$i]['dt'] ][ $A[$i]['tankorId'] ][] = '---';
-	    }
-	    if (in_array($A[$i]['tipus'], array('helyettesítés', 'összevonás', 'felügyelet'))) {
-		$ADAT['helyettesites'][ $A[$i]['dt'] ][] = $A[$i];
-	    }
-
-	}
-	$tmp = getOralatogatasByOraIds($oraIds, $SET = array('result' => 'assoc'));;
-	if (is_array($tmp)) foreach ($tmp as $oraId => $olAdat) {
-	    $olAdat['ora'] = $oraId2dt[$oraId]['ora'];
-	    $ADAT['oralatogatas'][ $oraId2dt[$oraId]['dt'] ][] = $olAdat;
-	} 
-    }
-
-    function getNaploHianyzasok(&$ADAT) {
-
-	global $HianyzasJeloles;
-
-	$q = "SELECT * FROM hianyzas WHERE '%s'
 'getNaploHianyzas', 'modul' => 'naplo', 'result' => 'indexed', 'values' => $v));
-	for ($i = 0; $i < count($A); $i++) {
-	    $diakId = $A[$i]['diakId'];
-	    $dt = $A[$i]['dt'];
-	    $ora = $A[$i]['ora'];
-	    if (!is_array($ADAT['hianyzas'][$dt][$diakId])) {
-		$nev = $ADAT['diakAdat'][$diakId]['diakNev'];
-		if (mb_strlen($nev, 'UTF-8') > 20) {
- 		    if (mb_substr($nev,20,1) == ' ') {
-			$nev = mb_substr($nev, 0, 20, 'UTF-8');
-		    } else {
-			$nev = mb_substr($nev, 0, 20, 'UTF-8');
-			$pos = mb_strrpos($nev, ' ', 0, 'UTF-8');
-			if ($pos !== false) $nev = mb_substr($nev, 0, $pos, 'UTF-8');
-			else $nev .= '.';
-		    }
-		}
-		$ADAT['hianyzas'][$dt][$diakId] = array('ora' => array(), 'diakNev' => $nev);
-	    }
-	    $ADAT['hianyzas'][$dt][$diakId]['ora'][$ora] = $HianyzasJeloles[$A[$i]['tipus']];
-	    if ($A[$i]['tipus'] == 'hiányzás') {
-		$ADAT['hianyzas'][$dt][$diakId]['összesen']++;
-		$ADAT['hianyzas'][$dt][$diakId][ $A[$i]['statusz'] ]++;
-	    }
-	}
-
-    }
-
-    function tordel($szavak) {
-
-        $sorok = array(); // A tárgyNev sorokra bontása
-        $maxHossz = 8; // egy sorba írható karakterek maximális száma
-
-        for ($j = 0; $j < count($szavak); $j++) {
-            $szo = str_replace('--', '~-', $szavak[$j]);
-            $tagok = explode('-', $szo);
-            $sor = str_replace('~', '-', $tagok[0]);
-                for ($k = 1; $k < count($tagok); $k++) {
-                    $tag = str_replace('~', '-', $tagok[$k]);
-                    $tl = mb_strlen($tag, 'UTF-8');
-                    $sl = mb_strlen($sor,'UTF-8');
-                    $ct = count($tagok);
-                    if (
-                        (
-                            $sl+$tl < $maxHossz // általában max $maxHossz karaktert engedünk meg
-                            && !(
-                                $k == ($ct - 2) // az utolsó előtti tag
-                                && ($sl > 3) // a sor már elég hosszú
-                                && ($tl + mb_strlen($targok[$k+1], 'UTF-8')) <= $maxHossz // és befér az utolsó sorba --> akkor hagyjuk a következő sorba
-                            )
-                        )
-                        || (
-                            $sl+$tl == $maxHossz
-                            && ($k == ($ct-1) || substr($tag,-1) == '-')) // szóvégén, vagy kötőjeles szó kötőjelénél nincs újabb kötőjel
-                    ) {
-                        $sor .= $tag;
-                    } else {
-                        if ($k < $ct && substr($sor, -1) != '-') $sorok[] = $sor.'-'; // ha nem az utolsó és nincs még kötőjel (kötőjeles szavak)
-                        else $sorok[] = $sor;
-                        $sor = $tag;
-                    }
-                }
-            $sorok[] = $sor;
-        }
-	return $sorok;
-
-    }
-			    
-?>
diff --git a/mayor-orig/www/include/modules/naplo/nyomtatas/helyettesitesinaplo.php b/mayor-orig/www/include/modules/naplo/nyomtatas/helyettesitesinaplo.php
deleted file mode 100644
index 88949802..00000000
--- a/mayor-orig/www/include/modules/naplo/nyomtatas/helyettesitesinaplo.php
+++ /dev/null
@@ -1,148 +0,0 @@
- $filename,
-	    'base' => array(
-		'intezmenyNev' => $Intezmeny['nev'], 'tanev' => __TANEV, 'nyDt' => date('Y.m.d'),
-		'tolDt' => dateToString($tolDt), 'igDt' => dateToString($igDt), 'intezmenyHelyseg' => $Intezmeny['cimHelyseg'],
-		'nyDatumStr' => dateToString(date('Y-m-d'))
-	    )
-	);
-	for ($i = 0; $i < count($Helyettesitesek); $i++) {
-	    $oraAdat = $Helyettesitesek[$i];
-	    if ($oraAdat['eredet'] == 'plusz') $oraAdat['tipus'] = $oraAdat['tipus'].' '.$oraAdat['eredet'];
-	    unset($oraAdat['ki']);
-	    unset($oraAdat['kit']);
-	    $oraAdat['tankorNev'] = LaTeXSpecialChars($oraAdat['tankorNev']);
-	    $DATA['hDt'][ $oraAdat['dt'] ]['helyettesites'][ $oraAdat['oraId'] ] = $oraAdat;
-	}
-	if (is_array($DATA['hDt']) && count($DATA['hDt'])>0) {
-	    $DATA['base']['hDt'] = array_keys($DATA['hDt']);
-	    return template2file($templateFile, $DATA);
-	} else {
-	    $_SESSION['alert'][] = 'info:no_data';
-    	    return false;
-	}
-
-
-    }
-
-/*
-    function naploGeneralasOld($filename, $tolDt, $igDt) {
-
-	// Helyettesítések lekérdezése
-	$Helyettesitesek = getHelyettesitettOra($tolDt, $igDt);
-	$Intezmeny = getIntezmenyByRovidnev(__INTEZMENY);
-
-    $TeX = '\documentclass[8pt]{article}
-\usepackage[a4paper]{geometry} % A4-es méret
-\usepackage[utf8]{inputenc} % UTF-8 kódolású forrás
-\usepackage{t1enc}
-\usepackage[magyar]{babel} % magyar elválasztási szabályok
-\frenchspacing % a magyar tipográfiai szabályoknak megfelelő szóközök írásjelek után
-\usepackage{booktabs} % táblázatok magasabb szintű formázása
-\usepackage{longtable} % többoldalas táblázatok
-\setlength\LTleft{-65pt}
-\setlength\LTright{-65pt}
-\usepackage{fancyhdr} % Fejléc és lábléc kezelés
-\pagestyle{fancy}
-\def\mayor{%
-\font\mayorfnt=cmsl4%
-\font\Mayorfnt=cmsl6
-{\mayorfnt\lower0.5ex\hbox{\lower-0.5ex\hbox{Ma}\kern-0.3em\lower0.25ex\hbox{\Mayorfnt Y}\kern-0.2em\hbox{o}\lower0ex\hbox{R}}}}
-\renewcommand{\footnotesize}{\fontsize{6pt}{8pt}\selectfont}
-%\addtolength{\skip\footins}{2mm}
-%\addtolength{\textheight}{16mm}
-%\addtolength{\textwidth}{30mm}
-\setlength{\footskip}{26pt}
-\setlength{\headsep}{24pt}
-\lhead{\small '.$Intezmeny['nev'].'}
-\rhead{\small Helyettesítési-napló '.__TANEV.'}
-\lfoot{\scriptsize\copyright\mayor\ elektronikus napló - Nyomtatva: '.date('Y.m.d.').'}
-\rfoot{\scriptsize\thepage . oldal}
-\cfoot{}
-\begin{document}
-';
-
-	$TeX .= '
-\begin{center}
-{\large\bfseries H E L Y E T T E S Í T É S E K}\\\\
-
-\vspace{12pt}
-
-{\bfseries\normalsize '.dateToString($tolDt).' – '.dateToString($igDt).'}\\\\
-
-\vspace{12pt}
-
-\scriptsize
-\begin{longtable}{@{\extracolsep{\fill}}c|c|l|l|l|c}
-Dátum & Óra & Ki & Kit & Tankör & Típus \\\\
-\toprule
-\endfirsthead
-Dátum & Óra & Ki & Kit & Tankör & Típus \\\\
-\toprule
-\endhead
-\bottomrule
-\endfoot
-\bottomrule
-\endlastfoot
-\hline
-';
-
-	for ($i = 0; $i < count($Helyettesitesek); $i++) {
-	    $oraAdat = $Helyettesitesek[$i];
-	    if ($oraAdat['eredet'] == 'plusz') $oraAdat['tipus'] = $oraAdat['tipus'].' '.$oraAdat['eredet'];
-	    $TeX .= '\vbox to 1.2em {}'.$oraAdat['dt'].'&'.$oraAdat['ora'].'&'.$oraAdat['kiCn'].'&'.$oraAdat['kitCn']
-		    .'&'.$oraAdat['tankorNev'].'&'.$oraAdat['tipus'].'\\\\ ';
-	    if ($Helyettesitesek[$i+1]['dt'] != $oraAdat['dt']) $TeX .= '\midrule'."\n";
-	    //else $TeX .= '\hline';
-
-	}
-
-	$TeX .= '
-\end{longtable}
-
-\vspace{16pt}
-
-\begin{flushleft}
-{\scriptsize '.$Intezmeny['cimHelyseg'].', '.dateToString(date('Y-m-d')).'}
-\end{flushleft}
-\vspace{20pt}\slshape\scriptsize
-\begin{tabular}{ccc}
-%\rule{3.5cm}{0.1pt}
-\hspace{3.5cm}%
-&\hspace{3cm}\ &\rule{3.5cm}{0.1pt}\\\\
-%tanuló
-&&igazgató\\\\
-\end{tabular}
-
-\end{center}
-';
-
-
-	$TeX .= '
-\end{document}';
-
-	pdfLaTeX($TeX, $filename); // A longtable miatt többször kell fordítani
-	return pdfLaTeX($TeX, $filename);
-
-    }
-*/
-
-?>
diff --git a/mayor-orig/www/include/modules/naplo/nyomtatas/nyomtatas.php b/mayor-orig/www/include/modules/naplo/nyomtatas/nyomtatas.php
deleted file mode 100644
index b91c18e8..00000000
--- a/mayor-orig/www/include/modules/naplo/nyomtatas/nyomtatas.php
+++ /dev/null
@@ -1,89 +0,0 @@
-'H',
-	'késés'=>'k',
-	'felszerelés hiány'=>'f',
-	'egyenruha hiány'=>'e'
-    );
-
-    $targyCsoportTXT = array(
-	'tanóra' => '',
-	'fakultáció' => 'fakt.',
-	'előfakultáció' => 'előfakt.',
-	'szakkör' => 'szakk.'
-    );
-
-    $targyTXT = array(
-        'angol nyelv' => 'Angol% nyelv',
-        'biológia' => 'Bio-%lógia',
-        'dráma' => 'Dráma',
-        'ének-zene' => 'Ének%-zene',
-        'fizika' => 'Fizika',
-        'filozófia' => 'Filo-%zófia',
-        'földrajz' => 'Föld-%rajz',
-        'francia nyelv' => 'Francia% nyelv',
-        'idegenvezetés' => 'Idegen-%vezetés',
-        'japán nyelv' => 'Japán% nyelv',
-        'kémia' => 'Kémia',
-        'latin nyelv' => 'Latin% nyelv',
-        'magyar' => 'Magyar',
-        'magyar irodalom' => 'Magyar% irodalom',
-        'magyar nyelv' => 'Magyar% nyelv',
-        'matematika' => 'Mate-%matika',
-        'művészettörténet' => 'Művészet-%történet',
-        'német nyelv' => 'Német% nyelv',
-        'olasz nyelv' => 'Olasz% nyelv',
-        'rajz' => 'Rajz',
-        'spanyol nyelv' => 'Spanyol% nyelv',
-        'számítástechnika' => 'Számítás-%technika',
-        'szociálpszichológia' => 'Szociál-%pszich.',
-        'testnevelés' => 'Testne-%velés',
-        'történelem' => 'Törté-%nelem',
-        'zenetörténet' => 'Zene-%történet'
-    );
-
-    // Ezt az órarendnél, és az első lapon fogjuk használni :)
-    $targyTXT2 = array(
-        'angol nyelv' => 'Angol',
-        'biológia' => 'Biológia',
-        'dráma' => 'Dráma',
-        'ének-zene' => 'Ének',
-        'fizika' => 'Fizika',
-        'filozófia' => 'Filozófia',
-        'földrajz' => 'Földrajz',
-        'francia nyelv' => 'Francia',
-        'idegenvezetés' => 'Idegenvezetés',
-        'japán nyelv' => 'Japán',
-        'kémia' => 'Kémia',
-        'latin nyelv' => 'Latin',
-        'magyar' => 'Magyar',
-        'magyar irodalom' => 'Magyar irodalom',
-        'magyar nyelv' => 'Magyar nyelv',
-        'matematika' => 'Matematika',
-        'művészettörténet' => 'Művészettörténet',
-        'német nyelv' => 'Német',
-        'olasz nyelv' => 'Olasz',
-        'osztályfőnöki' => 'Osztályfőnöki',
-        'rajz' => 'Rajz',
-        'spanyol nyelv' => 'Spanyol',
-        'számítástechnika' => 'Szám. tech.',
-        'szociálpszichológia' => 'Szoc.pszich.',
-        'testnevelés' => 'Testnevelés',
-        'történelem' => 'Történelem',
-        'zenetörténet' => 'Zenetörténet'
-    );
-
-?>
diff --git a/mayor-orig/www/include/modules/naplo/nyomtatas/osztalyozonaplo.php b/mayor-orig/www/include/modules/naplo/nyomtatas/osztalyozonaplo.php
deleted file mode 100644
index bdc16662..00000000
--- a/mayor-orig/www/include/modules/naplo/nyomtatas/osztalyozonaplo.php
+++ /dev/null
@@ -1,24 +0,0 @@
- 'getDiakJegyek', 'modul' => 'naplo', 'result' => 'indexed', 'values' => $ADAT['diakIds']));
-	$RET = array();
-	for ($i = 0; $i < count($r); $i++) {
-	    /* Melyik félév is lehetett? */
-	    $_felev = (in_date_interval($r[$i]['dt'],$_TANEV['szemeszter'][1]['kezdesDt'],$_TANEV['szemeszter'][1]['zarasDt'])) ? 1:2;
-
-	    if (
-		$ADAT['diakAdat'][ $r[$i]['diakId'] ]['osztalyDiak'][0]['kiDt'] == ''
-		|| strtotime($r[$i]['dt']) <= strtotime($ADAT['diakAdat'][ $r[$i]['diakId'] ]['osztalyDiak'][0]['kiDt'])
-	    )
-		$RET[ $r[$i]['diakId'] ][ $r[$i]['targyId'] ][ $r[$i]['ho'] ][] = $r[$i];
-		$RET[ $r[$i]['diakId'] ][ 'felevenkent' ][ $r[$i]['targyId'] ][ $_felev ][] = $r[$i];
-	}
-	return $RET;
-    }
-
-?>
diff --git a/mayor-orig/www/include/modules/naplo/nyomtatas/sniEvVegiJegyzokonyv.php b/mayor-orig/www/include/modules/naplo/nyomtatas/sniEvVegiJegyzokonyv.php
deleted file mode 100644
index 3ed53ae3..00000000
--- a/mayor-orig/www/include/modules/naplo/nyomtatas/sniEvVegiJegyzokonyv.php
+++ /dev/null
@@ -1,48 +0,0 @@
- $ADAT['file'],
-            'base' => array('nyomtatasDt' => date('Y.m.d'),
-		'tanev' => "$kEv-$zEv",
-//		'ev' => $ev, 'honap' => $ho, 'nap' => $nap, 'hoNev' => kisbetus($Honapok[$ho-1]),
-                'intezmenyNev' => $ADAT['intezmeny']['nev'], 'intezmenyCimIrsz' => $ADAT['intezmeny']['cimIrsz'],
-                'intezmenyCimHelyseg' => $ADAT['intezmeny']['cimHelyseg'], 'intezmenyCimKozteruletNev' => $ADAT['intezmeny']['cimKozteruletNev'],
-                'intezmenyCimKozteruletJelleg' => $ADAT['intezmeny']['cimKozteruletJelleg'], 'intezmenyCimHazszam' => $ADAT['intezmeny']['cimHazszam'],
-                'intezmenyTelefon' => $ADAT['intezmeny']['telefon'], 'intezmenyHonlap' => $ADAT['intezmeny']['honlap'],
-                'intezmenyFax' => $ADAT['intezmeny']['fax'], 'intezmenyEmail' => $ADAT['intezmeny']['email'],
-                'diak' => $ADAT['sniDiakIds'], 'osztaly' => $ADAT['osztaly']['osztalyJel'],
-                'tanarNev' => '', 'osztalyTanar' => array_keys($ADAT['osztalyTanar']),
-            ),
-            'diak' => $ADAT['diakAdat'],
-            'felelos' => $ADAT['tanarok'],
-            'osztalyTanar' => $ADAT['osztalyTanar'],
-        );
-
-//echo '
';
-//var_dump($ADAT['diakAdat']);
-//echo '
';
-
-	return template2file($templateFile, $DATA);
-
-    }
-
-?>
diff --git a/mayor-orig/www/include/modules/naplo/nyomtatas/sniHaviJegyzokonyv.php b/mayor-orig/www/include/modules/naplo/nyomtatas/sniHaviJegyzokonyv.php
deleted file mode 100644
index f9f182d0..00000000
--- a/mayor-orig/www/include/modules/naplo/nyomtatas/sniHaviJegyzokonyv.php
+++ /dev/null
@@ -1,41 +0,0 @@
- $ADAT['file'],
-            'base' => array('nyomtatasDt' => date('Y.m.d'),
-		'ev' => $ev, 'honap' => $ho, 'nap' => $nap, 'hoNev' => kisbetus($Honapok[$ho-1]),
-                'intezmenyNev' => $ADAT['intezmeny']['nev'], 'intezmenyCimIrsz' => $ADAT['intezmeny']['cimIrsz'],
-                'intezmenyCimHelyseg' => $ADAT['intezmeny']['cimHelyseg'], 'intezmenyCimKozteruletNev' => $ADAT['intezmeny']['cimKozteruletNev'],
-                'intezmenyCimKozteruletJelleg' => $ADAT['intezmeny']['cimKozteruletJelleg'], 'intezmenyCimHazszam' => $ADAT['intezmeny']['cimHazszam'],
-                'intezmenyTelefon' => $ADAT['intezmeny']['telefon'], 'intezmenyHonlap' => $ADAT['intezmeny']['honlap'],
-                'intezmenyFax' => $ADAT['intezmeny']['fax'], 'intezmenyEmail' => $ADAT['intezmeny']['email'],
-                'diak' => $ADAT['sniDiakIds'], 'osztaly' => $ADAT['osztaly']['osztalyJel'],
-                'tanarNev' => '', 'osztalyTanar' => array_keys($ADAT['osztalyTanar']),
-            ),
-            'diak' => $ADAT['diakAdat'],
-            'felelos' => $ADAT['tanarok'],
-            'osztalyTanar' => $ADAT['osztalyTanar'],
-        );
-
-	return template2file($templateFile, $DATA);
-
-    }
-
-?>
diff --git a/mayor-orig/www/include/modules/naplo/nyomtatas/szovegesErtekeles.php b/mayor-orig/www/include/modules/naplo/nyomtatas/szovegesErtekeles.php
deleted file mode 100644
index 1b095a4e..00000000
--- a/mayor-orig/www/include/modules/naplo/nyomtatas/szovegesErtekeles.php
+++ /dev/null
@@ -1,131 +0,0 @@
- $ADAT['targySorrendNev'],'osztalyId' => $ADAT['osztalyId'])); $Targyak = array();
-	for ($i = 0; $i < count($_Targyak); $i++) {
-	    $Targyak[ $_Targyak[$i]['targyId'] ] = $_Targyak[$i];
-	    $Targyak[ $_Targyak[$i]['targyId'] ]['targyNev'] = nagybetus(mb_substr($_Targyak[$i]['targyNev'],0,1)).mb_substr($_Targyak[$i]['targyNev'],1);
-	}
-	unset($_Targyak);
-
-	list($ev,$ho,$nap) = explode('-', $ADAT['dt']);
-	list($evf,$oszt) = explode('.', $ADAT['osztalyAdat']['osztalyJel']);
-	
-	$DATA = array(
-	    'file' => $ADAT['file'],
-	    'base' => array('nyomtatasDt' => date('Y.m.d'), 'ev' => $ev, 'honap' => $ho, 'nap' => $nap, 'hoNev' => kisbetus($Honapok[$ho-1]),
-		'intezmenyNev' => $Intezmeny['nev'], 'intezmenyOMKod' => $Intezmeny['OMKod'], 'intezmenyCimIrsz' => $Intezmeny['cimIrsz'], 
-		'intezmenyCimHelyseg' => $Intezmeny['cimHelyseg'], 'intezmenyCimKozteruletNev' => $Intezmeny['cimKozteruletNev'],
-		'intezmenyCimKozteruletJelleg' => $Intezmeny['cimKozteruletJelleg'], 'intezmenyCimHazszam' => $Intezmeny['cimHazszam'],
-		'intezmenyTelefon' => $Intezmeny['telefon'], 'intezmenyHonlap' => $Intezmeny['honlap'],
-		'intezmenyFax' => $Intezmeny['fax'], 'intezmenyEmail' => $Intezmeny['email'],
-		'tanevJele' => substr($ADAT['tanevAdat']['kezdesDt'],0,4).'/'.substr($ADAT['tanevAdat']['zarasDt'],0,4),
-		'felevi' => ($ADAT['szemeszter']['szemeszter'] == 1),
-		'diak' => $ADAT['diakIds'], 'osztaly' => "$evf. ".nagybetus($oszt),
-	    ),
-	    'diak' => $ADAT['diakAdat'],
-	    'targy' => $Targyak,
-	    'szempont' => array(),
-	    'minosites' => array(),
-	);
-	unset($Intezmeny);
-
-        foreach ($ADAT['hianyzas'] as $diakId => $dHianyzas) {
-                $DATA['diak'][$diakId]['igazolt'] = $dHianyzas['igazolt'];
-                $DATA['diak'][$diakId]['igazolatlan'] = $dHianyzas['igazolatlan'];
-                $DATA['diak'][$diakId]['kesesPercOsszeg'] = intval($dHianyzas['kesesPercOsszeg']);
-                $DATA['diak'][$diakId]['kesesIgazolatlan'] = floor($dHianyzas['kesesPercOsszeg']/45);
-                $DATA['diak'][$diakId]['osszesIgazolatlan'] = $DATA['diak'][$diakId]['igazolatlan']+$DATA['diak'][$diakId]['kesesIgazolatlan'];
-                
-                $DATA['diak'][$diakId]['gyakIgazolt'] = intval($dHianyzas['gyakorlatIgazolt']);
-                $DATA['diak'][$diakId]['gyakIgazolatlan'] = intval($dHianyzas['gyakorlatIgazolatlan']);
-                $DATA['diak'][$diakId]['gyakKesesPercOsszeg'] = intval($dHianyzas['gyakorlatKesesPercOsszeg']);
-                $DATA['diak'][$diakId]['gyakKesesIgazolatlan'] = floor($dHianyzas['gyakorlatKesesPercOsszeg']/45);
-                $DATA['diak'][$diakId]['gyakOsszesIgazolatlan'] = $DATA['diak'][$diakId]['gyakIgazolatlan']+$DATA['diak'][$diakId]['gyakKesesIgazolatlan'];
-
-                $DATA['diak'][$diakId]['elmIgazolt'] = intval($dHianyzas['elmeletIgazolt']);
-                $DATA['diak'][$diakId]['elmIgazolatlan'] = intval($dHianyzas['elmeletIgazolatlan']);
-                $DATA['diak'][$diakId]['elmKesesPercOsszeg'] = intval($dHianyzas['elmeletKesesPercOsszeg']);
-                $DATA['diak'][$diakId]['elmKesesIgazolatlan'] = floor($dHianyzas['elmeletKesesPercOsszeg']/45);
-                $DATA['diak'][$diakId]['elmOsszesIgazolatlan'] = $DATA['diak'][$diakId]['elmIgazolatlan']+$DATA['diak'][$diakId]['elmKesesIgazolatlan'];
-        }
-
-
-
-	if (strtotime($ADAT['dt']) < strtotime($ADAT['tanevAdat']['szemeszter'][1]['zarasDt'])) $DATA['base']['negyedev'] = 'az első';
-	else $DATA['base']['negyedev'] = 'a harmadik';
-	foreach ($Ertekeles as $diakId => $E) {
-	    $DATA['diak'][$diakId]['targy'] = array();
-
-	    // !!! Tesztelendő !!! //
-#	    foreach ($E as $targyId => $eAdat) {
-	    foreach ($Targyak as $targyId => $tAdat) {
-		if (is_array($E[$targyId])) {
-		    $eAdat = $E[$targyId];
-		} else {
-		    continue;
-		}
-	    // !!! Tesztelendő !!! //
-		if (
-		    (
-			   (is_array($eAdat['szovegesErtekeles']['minosites'])       && count($eAdat['szovegesErtekeles']['minosites']) > 0)
-			|| (is_array($eAdat['szovegesErtekeles']['egyediMinosites']) && count($eAdat['szovegesErtekeles']['egyediMinosites']) > 0)
-		    )
-		    && $ADAT['tolDt'] <= $eAdat['szovegesErtekeles']['dt']
-		) {
-
-		    $DATA['diak'][$diakId]['targy'][$targyId] = $eAdat; // Ezt lehetne finomítani
-//if ($targyId == 2) {
-//echo '
';var_dump($ADAT['tolDt']);
-//var_dump($eAdat['szovegesErtekeles']['dt']);
-//}
-
-		    $DATA['diak'][$diakId]['targy'][$targyId]['szempont'] = $eAdat['szempontRendszer']['szempont'];
-                    $targyMinositesId = $eAdat['szovegesErtekeles']['minosites'][0]; // Ha egy tárgy egy minősítés kell (az első)
-		    foreach ($eAdat['szempontRendszer']['szempont'] as $szempontId => $szAdat) {
-			$DATA['diak'][$diakId]['targy'][$targyId]['szempont'][$szempontId]['egyediMinosites'] = 
-				$eAdat['szovegesErtekeles']['egyediMinosites'][$szempontId]['egyediMinosites'];
-			$M = $eAdat['szempontRendszer']['minosites'][$szempontId];
-			$elsoValasztottKovetkezik = true;
-                	for ($i = 0; $i < count($M); $i++) {
-			    $DATA['diak'][$diakId]['targy'][$targyId]['szempont'][$szempontId]['minosites'][ $M[$i]['minositesId'] ] 
-				= array('minosites' => $M[$i]['minosites']);
-			    if (in_array($M[$i]['minositesId'], $eAdat['szovegesErtekeles']['minosites'])) {
-				$DATA['diak'][$diakId]['targy'][$targyId]['szempont'][$szempontId]['minosites'][$M[$i]['minositesId']]['valasztott'] = true;
-				$DATA['diak'][$diakId]['targy'][$targyId]['szempont'][$szempontId]['minosites'][$M[$i]['minositesId']]['elsoValasztott'] = $elsoValasztottKovetkezik;
-				$DATA['diak'][$diakId]['targy'][$targyId]['szempont'][$szempontId]['minosites'][$M[$i]['minositesId']]['tobbedikValasztott'] = (!$elsoValasztottKovetkezik);
-				$elsoValasztottKovetkezik = false;
-                    		if ($M[$i]['minositesId'] == $targyMinositesId) {
-                        	    $DATA['diak'][$diakId]['targy'][$targyId]['targyMinosites'] = $M[$i]['minosites']; // Ha tárgyanként egy minősítés kell (az első)
-                        	}
-                    	    }
-                	}
-		    }
-		}
-	    }
-	}
-
-	return template2file($templateFile, $DATA);
-
-    }
-
-
-?>
diff --git a/mayor-orig/www/include/modules/naplo/nyomtatas/tankorNaplohozRendeles.php b/mayor-orig/www/include/modules/naplo/nyomtatas/tankorNaplohozRendeles.php
deleted file mode 100644
index 596cbcf9..00000000
--- a/mayor-orig/www/include/modules/naplo/nyomtatas/tankorNaplohozRendeles.php
+++ /dev/null
@@ -1,48 +0,0 @@
- 'tankorNaploInit/delete', 'modul' => 'naplo'));
-	}
-	// Kérdezzük le, hogy melyik osztályhoz nincs még bejegyzés
-	$q = "SELECT osztalyId FROM osztalyNaplo LEFT JOIN tankorNaplo USING (osztalyId) GROUP BY osztalyId HAVING COUNT(tankorId) = 0";
-	$osztalyIds = db_query($q, array('fv' => 'tankorNaploInit', 'modul' => 'naplo', 'result' => 'idonly'));
-	// Ezen osztályok hozzárendelése a csak hozzájuk tartozó tankörökhöz
-	if (is_array($osztalyIds) && count($osztalyIds) > 0) {
-    	    $q = "REPLACE INTO tankorNaplo (tankorId,osztalyId)
-                SELECT tankorId,osztalyId FROM ".__INTEZMENYDBNEV.".tankorOsztaly
-                WHERE osztalyId IN (".implode(',', $osztalyIds).")
-		AND tankorId IN (
-                    SELECT DISTINCT tankorId FROM ".__INTEZMENYDBNEV.".tankorSzemeszter WHERE tanev=".__TANEV."
-                ) GROUP BY tankorId HAVING COUNT(*)=1";
-    	    return db_query($q, array('fv' => 'tankorNaploInit', 'modul' => 'naplo'));
-	} else { return true; }
-
-    }
-
-    function tankorNaplohozRendeles($osztalyId, $T) {
-        $v = $V = array();
-        for ($i = 0; $i < count($T); $i++) {
-            list($tankorId, $naplo) = explode('/',$T[$i]);
-	    array_push($v, $tankorId, $naplo);
-            $V[] = "(%u, %u)";
-        }
-        if (count($V) > 0) {
-            $q = "DELETE FROM tankorNaplo WHERE osztalyId=%u";
-            db_query($q, array('fv' => 'tankorNaplohozRendeles', 'modul' => 'naplo', 'values' => array($osztalyId)));
-            $q = "REPLACE INTO tankorNaplo (tankorId,osztalyId) VALUES ".implode(',', $V);
-            db_query($q, array('fv' => 'tankorNaplohozRendeles', 'modul' => 'naplo', 'values' => $v));
-        }
-    }
-
-    function getTankorokNaploja() {
-
-	$q = "SELECT tankorId,osztalyId FROM tankorNaplo";
-        return db_query($q, array('fv' => 'tankorokNaploja', 'modul' => 'naplo', 'result' => 'keyvaluepair'));
-
-    }
-
-?>
diff --git a/mayor-orig/www/include/modules/naplo/nyomtatas/tex.php b/mayor-orig/www/include/modules/naplo/nyomtatas/tex.php
deleted file mode 100644
index ab2ca3c0..00000000
--- a/mayor-orig/www/include/modules/naplo/nyomtatas/tex.php
+++ /dev/null
@@ -1,1285 +0,0 @@
-8?nagybetus($oJel):kisbetus($oJel)));
-            $return = '\footline{\ifodd\pageno\rightfootline\else\leftfootline\fi}
-\def\rightfootline{\hbox to \hsize{\copyright\ \mayor\ elektronikus napló -- Nyomtatva: '.date('Y.m.d').'.\hfil\folio}}
-\def\leftfootline{\hbox to \hsize{\folio\hfil '.$tanev.' -- '.$osztalySTR.', of.: '.$ofo.'}}';
-
-        } else {
-
-            $return = '\footline{\ifodd\pageno\rightfootline\else\leftfootline\fi}
-\def\rightfootline{\hbox to \hsize{\copyright\ \mayor\ elektronikus napló '.$tanev.'\hfil\folio}}
-\def\leftfootline{\hbox to \hsize{\folio\hfil Nyomtatva: '.date('Y.m.d.').'}}';
-
-        }
-        return $return;
-
-}
-
-function endTeXDocument() {
-
-    return '\bye';
-
-}
-
-// ======= Haladási ====== //
-
-    $HianyzasJeloles = array(
-        'hiányzás'=>'H',
-        'késés'=>'k',
-        'felszerelés hiány'=>'f',
-	'egyenruha hiány' => 'e'
-    );
-
-    function datumString($tanitasiNapOk) {
-        global $Honapok;
-        $tolStamp = strtotime($tanitasiNapOk[0]);
-        $igStamp = strtotime($tanitasiNapOk[2]);
-        $tolString = date('Y',$tolStamp) . '. '.$Honapok[intval(date('m',$tolStamp))-1].' '.date('j',$tolStamp).'.';
-        $igString = date('Y',$igStamp) . '. '.$Honapok[intval(date('m',$igStamp))-1].' '.date('j',$igStamp).'.';
-        $datumString = $tolString.' -- '.$igString;
-
-        return kisbetus($datumString);
-    }
-
-
-    $hoRomai = array('01'=>'I',
-                        '02' => 'II',
-                        '03' => 'III',
-                        '04' => 'IV',
-                        '05' => 'V',
-                        '06' => 'VI',
-                        '07' => 'VII',
-                        '08' => 'VIII',
-                        '09' => 'IX',
-                        '10' => 'X',
-                        '11' => 'XI',
-                        '12' => 'XII');
-
-    function datumRomai($dt) {
-	global $hoRomai;
-        list($ev,$honap,$nap) = explode('-',date('Y-m-j',strtotime($dt)));
-        return strtr($honap,$hoRomai).'.'.$nap.'.';
-    }
-
-
-    function putTeXOrarendParameterek($dt, $ADAT) {
-
-        $return = '';
-        for($ora = 1; $ora <= 8; $ora++) {
-	    $oraAdat = $ADAT['orak'][$dt][$ora];
-            $return .= '{';
-	    $targyNev = array();
-	    if (is_array($oraAdat)) for ($i = 0; $i < count($oraAdat); $i++) {
-		$targyId = $ADAT['tankorTargy'][ $oraAdat[$i]['tankorId'] ];
-		if ($ADAT['targyAdat'][$targyId]['targyRovidNev'] != '') {
-		    $tNev = $ADAT['targyAdat'][$targyId]['targyRovidNev'];
-		} else {
-		    $tNev = $ADAT['targyAdat'][$targyId]['targyNev'];
-		}
-		if (!in_array($tNev, $targyNev)) $targyNev[] = $tNev;
-	    }
-	    $return .= TeXSpecialChars(implode(', ', $targyNev));
-	    $return .= '}';
-        }
-
-	return $return;
-
-    }
-
-    function putTeXHaladasiOldalbeallitas() {
-
-        /* ELválasztás: szám < pretolerance(100) --> sikeres
-                        elválasztás
-                        sikertelenség !< tolerance(200)
-        */
-	return '%% Oldalbeállítás %%
-\\pretolerance=100
-\\tolerance=10000
-\\magnification=960
-\\vsize=26cm
-\\hsize=18.5cm
-\\hoffset=-1cm%% később generáljuk
-\\voffset=-1cm
-\\normal
-'; 
-    }
-
-    function putTeXFirstFootline($ADAT) {
-        return '\\footline{Nyomtatta: '.TeXSpecialChars($ADAT['intezmenyAdat']['nev']).' (OM: '.$ADAT['intezmenyAdat']['OMKod'].')'.' -- Látta: VMG 2003. X. 10. Sz. T.\\hfill}%'."\n";
-    }
-
-    function putTeXElolap($ADAT) {
-
-        global $targyTXT;
-
-	$return = '';
-	$dbSor = 0; 
-	for ($i=0; $i < count($ADAT['tankorokNaploElejere']); $i++) 
-	    $dbSor += count($ADAT['tankorokNaploElejere'][$i]['tanarok']);
-	$maxSorPerLap = 36;
-
-
-        $return .= putTeXFirstFootline($ADAT);
-
-	$sor = 0; $i = 0; // hanyadik tankörnél tartunk
-	while ($sor < $dbSor) {
-
-	    $lapSorai = 0;
-    	    $return .= '\\vbox to \\vsize{%%%%%%%%%%%%%%%%%%%%%%%';
-
-	    if ($sor == 0) $return .='
-\\vskip60pt%
-\\centerline{\\hbox to 120pt{\\hrulefill}}%
-\\centerline{az intézmény hosszú bélyegzője}%
-';
-	    $return .='\\hbox{\\vbox to 30pt{\\vfil\\hbox{\\centerline{'.TeXSpecialChars(nagybetus($ADAT['osztalyAdat']['osztalyJel']))
-.' osztályának HALADÁSI NAPLÓJA a '.$ADAT['tanev'].'/'.substr($ADAT['tanevAdat']['zarasDt'],0,4).' tanévre}}\\vfil}}%
-\\hbox{\\centerline{Osztályfőnök: '.$ADAT['osztalyAdat']['osztalyfonokNev'].'}}%
-%% egész lapos vbox vége... %%%%%%%%%%%%%%%%%%%%%%%
-%%ez a regi volt:\\vbox to 60pt{}%
-\\vfill%
-\\centerline{%
-\\vbox{\\hsize=300pt\\baselineskip=15pt';
-
-	    while (
-		$i < count($ADAT['tankorokNaploElejere'])
-		&& ($lapSorai + count($ADAT['tankorokNaploElejere'][$i]['tanarok'])) <= $maxSorPerLap
-	    ) {
-		$targyId = $ADAT['tankorokNaploElejere'][$i]['targyId'];
-        	$targyNev = $ADAT['targyAdat'][$targyId]['targyNev'];
-
-		$_tankorId = $ADAT['tankorokNaploElejere'][$i]['tankorId'];
-		$_osztalyId = $ADAT['tankorNaploja'][$_tankorId];
-		if ($_osztalyId!==null) {
-		    $naplojaban = TeXSpecialChars($ADAT['osztalyJele'][$_osztalyId]);
-            	    $return .= '\\hbox to 300pt{'.TeXSpecialChars($targyNev);
-	    	    if ($ADAT['targyAdat'][$targyId]['db'] > 1) {
-			$return .= ' '.(++$ADAT['targyAdat'][$targyId]['kiirtDb']).'. csoport';
-		    }
-		    if ($ADAT['osztalyId'] != $_osztalyId) $return .=' ('.$naplojaban.' naplójában)';
-        	    $return .= '\\quad\\dotfill\\quad ';
-		    // Egy tanár - az első - félrevezető, pontatlan
-        	    // $return .= $ADAT['tankorokNaploElejere'][$i]['tanarok'][0]['tanarNev']; //.' tanár';
-	    	    // -----------
-		    // több tanár egy sorban, vesszővel elválasztva - esetleg nem fér ki a sorban
-        	    //$return .= implode(', ', $ADAT['tankorokNaploElejere'][$i]['tanarok']); //.' tanár';
-		    // -----------
-		    // több tanár külön-külön sorban - esetleg nem fér ki az oldalra ($maxLap?)
-        	    $return .= implode("}%\n\\hbox to 300pt{\\hfill\\quad ", $ADAT['tankorokNaploElejere'][$i]['tanarok']); //.' tanár';
-        	    $return .= '}%'."\n";
-		}
-		$sor += count($ADAT['tankorokNaploElejere'][$i]['tanarok']);
-		$lapSorai += count($ADAT['tankorokNaploElejere'][$i]['tanarok']);
-		$i++;
-    	    }
-    	    $return .= '}%
-}% eocenterline%
-\\vfill%
-}';
-
-	    if ($sor < $dbSor) $return .= putTexUresLap();
-	} // while
-
-        return $return;
-
-    }
-
-
-
-
-
-
-    function putTeXTanuloTankorMatriX($ADAT) {
-
-	define('__MAXTANKOR',30);
-
-        $return .= '\\vbox to 20pt{\\vfil\\centerline{\\nagy A tanulók tankörbeosztása\\normal}\\vfil}%'."\n";
-
-$k = 0; // Hányadik tankörtől indulunk a táblázat elején
-$pageDb = 0;
-while ($k < count($ADAT['tankorok'])) {
-
-	$return .= '\\centerline{\\vbox{%'."\n";
-
-        $return .= '\\halign{\\vrule width2pt\\strut\\kicsi\\space\\noindent#\\hfill\\vrule width2pt';
-            for($i = $k; ($i < count($ADAT['tankorok'])) && ($i-$k<__MAXTANKOR); $i++) $return.= '&\\hbox to 10pt{\\hfil\kicsi#\\hfil}\\vrule';
-        $return .= ' width2pt\\cr%'."\n";
-        $return .='\\noalign{\\hrule height2pt}%'."\n";
-
-        $return .= '\\vbox to 180pt{\\hsize=100pt\\parindent=0pt\\vfill\\centerline{Tankör mátrix}\\vfill}';
-        for($i = $k; ($i < count($ADAT['tankorok'])) && ($i-$k<__MAXTANKOR); $i++) {
-            $return .= '&';
-            $return .= '\\setbox\\rotbox=\\hbox to 180pt{'. TeXSpecialChars( $ADAT['tankorok'][$i]['tankorNev'] ) .'\\hfill}';
-            $return .= '\\rotl\\rotbox';
-        }
-        $return .= '\\cr%'."\n";
-        $return .='\\noalign{\\hrule height2pt}%'."\n";
-
-        for ($j = 0; $j < count($ADAT['nevsor']); $j++){
-            $diakNev = $ADAT['nevsor'][$j]['diakNev'];
-            $diakId = $ADAT['nevsor'][$j]['diakId'];
-            $return .= $diakNev;
-            for($i = $k; ($i < count($ADAT['tankorok'])) && ($i-$k<__MAXTANKOR); $i++) {
-                $return.= '&';
-                if (in_array($ADAT['tankorok'][$i]['tankorId'], $ADAT['diakTankor'][$diakId])) $return.= 'x';
-            }
-            $return .='\\cr%'."\n";
-            $return .='\\noalign{\\hrule}%'."\n";
-        }
-        $return .='\\noalign{\\hrule height1.6pt}%'."\n";
-        $return .= '}}}\\hoffset=-0.8cm';
-
-	$k = $i;
-$pageDb++;
-}
-if (($pageDb % 2) == 0) $return .= putTeXUresLap(); // hogy ne csússzon el a páros/páratlan...
-        return $return;
-    }
-
-    function putTeXTanuloTankorMatriXOrig($ADAT) {
-
-        $return .= '\\vbox to 20pt{\\vfil\\centerline{\\nagy A tanulók tankörbeosztása\\normal}\\vfil}%
-\\centerline{\\vbox{%'."\n";
-
-        $return .= '\\halign{\\vrule width2pt\\strut\\kicsi\\space\\noindent#\\hfill\\vrule width2pt';
-            for($i = 0; $i < count($ADAT['tankorok']); $i++) $return.= '&\\hbox to 10pt{\\hfil\kicsi#\\hfil}\\vrule';
-        $return .= ' width2pt\\cr%'."\n";
-        $return .='\\noalign{\\hrule height2pt}%'."\n";
-
-        $return .= '\\vbox to 180pt{\\hsize=100pt\\parindent=0pt\\vfill\\centerline{Tankör mátrix}\\vfill}';
-        for($i = 0; $i < count($ADAT['tankorok']); $i++) {
-            $return .= '&';
-            $return .= '\\setbox\\rotbox=\\hbox to 180pt{'. TeXSpecialChars( $ADAT['tankorok'][$i]['tankorNev'] ) .'\\hfill}';
-            $return .= '\\rotl\\rotbox';
-        }
-        $return .= '\\cr%'."\n";
-        $return .='\\noalign{\\hrule height2pt}%'."\n";
-
-        for ($j = 0; $j < count($ADAT['nevsor']); $j++){
-            $diakNev = $ADAT['nevsor'][$j]['diakNev'];
-            $diakId = $ADAT['nevsor'][$j]['diakId'];
-            $return .= $diakNev;
-            for($i = 0; $i < count($ADAT['tankorok']); $i++) {
-                $return.= '&';
-                if (in_array($ADAT['tankorok'][$i]['tankorId'], $ADAT['diakTankor'][$diakId])) $return.= 'x';
-            }
-            $return .='\\cr%'."\n";
-            $return .='\\noalign{\\hrule}%'."\n";
-        }
-        $return .='\\noalign{\\hrule height1.6pt}%'."\n";
-        $return .= '}}}\\hoffset=-0.8cm';
-
-
-        return $return;
-    }
-
-
-
-
-    function putTeXAllandoFejlec() {
-
-$return='% ======================================================================= %
-% "Órán" táblázat (8.9pt?) 25.6pt
-\\def\\oran{\\vbox{\\halign{%
-\\vbox to 30pt{\\hsize=8.9pt\\vfill\\noindent\\hfil ##\\hfil\\vfill}\\vrule%
-&\\vbox to 30pt{\\hsize=8.9pt\\vfill\\noindent\\hfil ##\\hfil\\vfill}\\vrule%
-&\\vbox to 30pt{\\hsize=8.9pt\\vfill\\noindent\\hfil ##\\hfil\\vfill}\\vrule%
-&\\vbox to 30pt{\\hsize=8.9pt\\vfill\\noindent\\hfil ##\\hfil\\vfill}\\vrule%
-&\\vbox to 30pt{\\hsize=8.9pt\\vfill\\noindent\\hfil ##\\hfil\\vfill}\\vrule%
-&\\vbox to 30pt{\\hsize=8.9pt\\vfill\\noindent\\hfil ##\\hfil\\vfill}\\vrule%
-&\\vbox to 30pt{\\hsize=8.9pt\\vfill\\noindent\\hfil ##\\hfil\\vfill}\\vrule%
-&\\vbox to 30pt{\\hsize=8.9pt\\vfill\\noindent\\hfil ##\\hfil\\vfill}\\vrule width0.8pt%
-\\cr%
-% ----------------------------------------------------------------------- %
-1&2&3&4&5&6&7&8\\cr%
-\\noalign{\\hrule}%
-\\multispan8{\\vbox to 32pt{\\hsize=74pt\\vfill\\noindent\\hfil órán\\hfil\\vfill}\\vrule width 0.8pt}\\cr%
-}}}%
-% ======================================================================= %
-% "Mulasztott" órák táblázat
-\\def\\mulasztott{%
-\\setbox\\rotbox=\\hbox to 40pt{\\vbox to 14pt{\\vfil\\noindent\\space összesen\\vfil}}%
-\\vbox {%
-\\halign{##&\\hfil##\\hfil\\cr%
-\\oran&\\hbox{\\rotl\\rotbox}\\cr%
-\\noalign{\\hrule}%
-\\multispan2{\\strut\\hfil mulasztott\\hfil}\\cr%
-}}}
-% ======================================================================= %
-\\def\\igazolas{%
-\\setbox\\rotboxA=\\hbox to 60pt{\\vbox to 14pt{\\vfil\\noindent\\space igazolt\\vfil}}%
-\\setbox\\rotboxB=\\hbox to 60pt{\\vbox to 14pt{\\vfil\\noindent\\space igazolatlan\\vfil}}%
-\\lower3pt\\vbox{%
-\\halign{##&##\\cr%
-\\multispan2{\\strut\\space\\hfil Ebből\\hfil\\space}\\cr%
-\\noalign{\\hrule}%
-\\rotl\\rotboxA\\vrule&\\rotl\\rotboxB\\cr}}}
-% ======================================================================= %
-\\def\\hianyzasFejlec{%
-\\vbox{%
-\\halign{\\kozepen{2.4cm}{2.3cm}{##}\\vrule&##\\vrule width0.8pt&##\\cr%
-\\vbox{\\centerline{A hiányzó} \\centerline{tanuló neve}}%
-&\\mulasztott&\\igazolas\\cr}}}
-'; return $return;
-
-    }
-    /* ------------------------------------------------------------------------------------- */
-
-    /* ----- Haladási napló baloldalán a napi órarend. ------------------------------------- */
-    function putTeXOrarendMacro() {
-
-$return='% ====ORERDND MAKRÓ========================================================= %
-\\def\\orarend#1#2#3#4#5#6#7#8{%
-\\lower-3pt\\vbox to 160pt{%
-\\baselineskip=10pt%
-\\hsize=82.5pt%
-\\hbox{\\vbox to 20.4pt{\\vfil\\leftskip=3pt\\noindent\\raggedright#1\\vfil}}%
-\\hrule width82.5pt%
-\\hbox{\\vbox to 20.4pt{\\vfil\\leftskip=3pt\\noindent\\raggedright#2\\vfil}}%
-\\hrule width82.5pt%
-\\hbox{\\vbox to 20.4pt{\\vfil\\leftskip=3pt\\noindent\\raggedright#3\\vfil}}%
-\\hrule width82.5pt%
-\\hbox{\\vbox to 20.4pt{\\vfil\\leftskip=3pt\\noindent\\raggedright#4\\vfil}}%
-\\hrule width82.5pt%
-\\hbox{\\vbox to 20.4pt{\\vfil\\leftskip=3pt\\noindent\\raggedright#5\\vfil}}%
-\\hrule width82.5pt%
-\\hbox{\\vbox to 20.4pt{\\vfil\\leftskip=3pt\\noindent\\raggedright#6\\vfil}}%
-\\hrule width82.5pt%
-\\hbox{\\vbox to 20.4pt{\\vfil\\leftskip=3pt\\noindent\\raggedright#7\\vfil}}%
-\\hrule width82.5pt%
-\\hbox{\\vbox to 20.4pt{\\vfil\\leftskip=3pt\\noindent\\raggedright#8\\vfil}}%
-}}%
-'; return $return;
-
-    } // end of putTeXOrarendMacro()
-    /* ------------------------------------------------------------------------------------- */
-
-    /* ------------------------------------------------------------------------------------- */
-    function putTeXHianyzasAlTablazat($napiHianyzas) {
-
-$return='% ======================================================================= %
-\\lower3pt\\vbox to 166pt{\\noindent{\\halign{%
-\\lower-2pt\\hbox to 2.4cm{\\hfil\\kicsi#\\hfill}\\vrule%
-&\\vbox to 10pt{\\hsize=8.9pt\\vfill\\noindent\\hfil #\\hfil\\vfill}\\vrule%
-&\\vbox to 10pt{\\hsize=8.9pt\\vfill\\noindent\\hfil #\\hfil\\vfill}\\vrule%
-&\\vbox to 10pt{\\hsize=8.9pt\\vfill\\noindent\\hfil #\\hfil\\vfill}\\vrule%
-&\\vbox to 10pt{\\hsize=8.9pt\\vfill\\noindent\\hfil #\\hfil\\vfill}\\vrule%
-&\\vbox to 10pt{\\hsize=8.9pt\\vfill\\noindent\\hfil #\\hfil\\vfill}\\vrule%
-&\\vbox to 10pt{\\hsize=8.9pt\\vfill\\noindent\\hfil #\\hfil\\vfill}\\vrule%
-&\\vbox to 10pt{\\hsize=8.9pt\\vfill\\noindent\\hfil #\\hfil\\vfill}\\vrule%
-&\\vbox to 10pt{\\hsize=8.9pt\\vfill\\noindent\\hfil #\\hfil\\vfill}\\vrule width0.8pt%
-&\\lower-2pt\\hbox to 14pt{\\hfil#\\hfil}\\vrule width0.8pt%
-&\\lower-2pt\\hbox to 14pt{\\hfil#\\hfil}\\vrule%
-&\\lower-2pt\\hbox to 14pt{\\hfil#\\hfil}\\cr%
-% -----------------------------------------
-';
-    $i = 0; // Kiírt hiányzók száma (max 16)
-    if (is_array($napiHianyzas)) { 
-	foreach ($napiHianyzas as $diakId => $H) {
-	    if ($i > 15) break;
-    	    if ($i != 0) $return .= '\\noalign{\\hrule}';
-    	    $return .= $H['diakNev'];
-    	    for ($j = 1; $j <= 8; $j++) $return .= '&'.$H['ora'][$j];
-    	    $return .= '&'.$H['összesen'].'&'.$H['igazolt'].'&'.$H['igazolatlan'].'\\cr';
-	    $i++; 
-	}
-    }
-    // Üres sorok
-    for ($i;$i<=15; $i++) {
-        if ($i != 0) $return .= '\\noalign{\\hrule}';
-        $return .= '&&&&&&&&&&&\\cr';
-    }
-$return .= '}}}%
-'; return $return;
-
-
-    } // end of putTeXHianyzasAlTablazat($DATA)
-    /* ------------------------------------------------------------------------------------- */
-
-    function putTargyFejlec($lap, $ADAT) {
-
-	$return = '';
-
-	if ($lap > 0) {
-
-    	    $return='%% PAGE '.($lap+1).' %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%'."\n";
-	    if ($lap == 2) 
-		$return .= '\\vbox to 20pt{\\vfil\\centerline{\\nagy'.datumString($ADAT['tanitasiNapOk']).'\\normal}\\vfil}'."\n";
-	    else
-		$return .= '\\vbox to 20pt{\\vfil\\centerline{\\nagy '.date('W',strtotime($ADAT['tanitasiNapOk'][1])).'. hét\\normal}\\vfil}'."\n";
-	    $return .= '\\halign{%
-\\vrule width2pt%
-\\hbox to 34pt{#}\\vrule width0.8pt&%
-\\hbox to 34pt{#}\\vrule width0.8pt&%
-\\hbox to 34pt{#}\\vrule width0.8pt&%
-\\hbox to 34pt{#}\\vrule width0.8pt&%
-\\hbox to 34pt{#}\\vrule width0.8pt&%
-\\hbox to 34pt{#}\\vrule width0.8pt&%
-\\hbox to 34pt{#}\\vrule width0.8pt&%
-\\hbox to 34pt{#}\\vrule width0.8pt&%
-\\hbox to 34pt{#}\\vrule width0.8pt&%
-\\hbox to 34pt{#}\\vrule width0.8pt&%
-\\hbox to 34pt{#}\\vrule width0.8pt&%
-\\hbox to 34pt{#}\\vrule width0.8pt&%
-\\hbox to 34pt{#}\\vrule width0.8pt&%
-\\hbox to 34pt{#}\\vrule width0.8pt&%
-\\hbox to 34pt{#}\\vrule width2pt\\cr%
-% -------------------------------------------------------------- %
-\\noalign{\\hrule height2pt}%
-%%+++ EZ ITT NEM JÓ ÁM MINDIG Hö... \\vbox to 75pt{}%
-';
-
-	}
-$foglalt = 0;
-for ($i = 0; $i < count($ADAT['targyFejlec'][$lap]); $i++) {
-    $targyId = $ADAT['targyFejlec'][$lap][$i]['targyId'];
-    $db = $ADAT['targyFejlec'][$lap][$i]['db'];
-    $sorsz = $ADAT['targyFejlec'][$lap][$i]['sorsz'];
-    $tAdat = $ADAT['targyAdat'][$targyId];
-
-    $tordeltTargyNev = $ADAT['targyAdat'][$targyId]['tordeltTargyNev'];
-    $targyNev = $ADAT['targyAdat'][$targyId]['targyNev'];
-
-    $foglalt += $db;
-    
-    if ($db == 1) {
-	if (count($tordeltTargyNev) < 5) $return .= '\\vbox to 72pt{}\\tetejen{34pt}{41.2pt}{\\vbox{';
-	else $return .= '\\vbox to 72pt{}\\kozepen{34pt}{72pt}{\\vbox{';
-    	for ($j = 0; $j < count($tordeltTargyNev); $j++) $return .= '\\centerline{'.TeXSpecialChars($tordeltTargyNev[$j]).'}';
-        $return .= '}}&';
-    } else {
-	$return .= '\\multispan{'.$db.'}{';
-	if ($lap != 0 && $foglalt == $db) $return .= '\\vrule width2pt\\vbox to 72pt{}';
-	//$return .= '\\ennes{'.TeXSpecialChars($targyNev).'}{'.$db.'}';
-	$return .= '\\emmes{'.TeXSpecialChars($targyNev).'}{'.$db.'}{'.$sorsz.'}';
-	if ($foglalt == $ADAT['helyek'][$lap]) $return .= '\\vrule width2pt}&';
-	else $return .= '\\vrule width0.8pt}&';
-    }
-}
-for ($i = $foglalt; $i < $ADAT['helyek'][$lap]; $i++) {
-    $return .= '\\tetejen{34pt}{41.2pt}{\\vbox{';
-    $return .= '\\centerline{}';
-    $return .= '}}&';
-}
-return substr($return,0,-1)."\\cr%\n";
-
-    }
-
-/* -------------------------------------- */
-
-    function putOraleiras($lap, $ADAT) {
-	$tol = 0;
-	for ($tLap = 0; $tLap < $lap; $tLap++) $tol += $ADAT['helyek'][$tLap];
-	$ig = $tol + $ADAT['helyek'][$lap];
-
-$return = '';
-$return .= '% ------------------------------------------------------------- %
-\\noalign{\\hrule height2pt}%
-';
-
-    for ($i = 0; $i < 3; $i++) {
-
-	$dt = $ADAT['tanitasiNapOk'][$i];
-        if (count($ADAT['orak'][$dt]) > 0) {
-            for ($j = $tol; $j < $ig; $j++) {
-		$tankorId = $ADAT['oszlopTankore'][$j];
-		if (is_array($ADAT['oraszam'][$dt][$tankorId])) {
-		    if (is_numeric($ADAT['oraszam'][$dt][$tankorId][0]))
-			$oraszam1 = $ADAT['oraszam'][$dt][$tankorId][0].'.';
-		    else $oraszam1='---';
-		    if (is_numeric($ADAT['oraszam'][$dt][$tankorId][ (count($ADAT['oraszam'][$dt][$tankorId])-1) ]))
-			$oraszam2 = $ADAT['oraszam'][$dt][$tankorId][ (count($ADAT['oraszam'][$dt][$tankorId])-1) ].'.';
-		    else $oraszam2='---';
-		} else { $oraszam1 = $oraszam2 = ''; }
-		if (is_array($ADAT['tananyag'][$dt][$tankorId])) $leiras = TeXSpecialChars(implode(' ', $ADAT['tananyag'][$dt][$tankorId]));
-		else $leiras = '';
-                // $dupla_orszam_formátum = \\vbox{\\hsize=20pt\\centerline{134.} \\centerline{135.}}
-                if ($oraszam1 == $oraszam2) {
-                    $return .= '\\tananyag{'.$leiras.'}{'.$oraszam1.'}';
-                } else {
-                    $return .= '\\tananyag{'.$leiras.'}{\\vbox{\\hsize=20pt\\centerline{'.$oraszam1.'} \\centerline{'.$oraszam2.'}}}';
-                }
-		if ($j < $ig - 1) $return .= '&';
-            }
-            $return .= '\\cr\\noalign{\\hrule height2pt}';
-        } else {
-            $return .= '\\multispan{15}{\\vrule width2pt\\vbox to 166pt{}\\hfil\\vrule width2pt}\\cr\\noalign{\\hrule height2pt}';
-        }
-    }
-
-
-    $return .= '% ------------------------------------------------------------- %
-\\multispan{15}{%
-\\vrule width2pt\\megjegyzes{Látogatások és egyéb}{észrevételek}%
-';
-	return $return;
-    }
-
-    /* ------------------------------------------------------------------------------------- */
-    function putTeXPage1($ADAT) {
-        global $aHetNapjai;
-$return='
-%%%%%%%%%%%%%%%%%%% PAGE 1 %%%%%%%%%%%%%%%%%%%%%%%
-\\vbox to 20pt{\\vfil\\centerline{\\nagy'.datumString($ADAT['tanitasiNapOk']).'\\normal}\\vfil}
-\\halign{%
-\\hbox to 22pt{\\hfil#}%
-&\\vrule width0.8pt\\hbox to 82.5pt{#}\\vrule width0.8pt%
-&#\\vrule width0.8pt&\\hbox to 34pt{#}\\vrule width0.8pt%
-&\\hbox to 34pt{#}\\vrule width0.8pt%
-&\\hbox to 34pt{#}\\vrule width0.8pt%
-&\\hbox to 34pt{#}\\vrule width0.8pt%
-&\\hbox to 34pt{#}\\vrule width0.8pt%
-&\\hbox to 34pt{#}\\vrule width2pt\\cr%
-% -------------------------------------------------------------- %
-\\noalign{\\hrule height2pt}%
-%xetex%\\vrule width2pt\\tanitasi&\\kozepen{82.5pt}{70pt}{Tant\\\'argy}&\\hianyzasFejlec&%
-\\vrule width2pt\\tanitasi&\\kozepen{82.5pt}{70pt}{Tantárgy}&\\hianyzasFejlec&%
-% -------------------------------------------------------------- %
-';
-
-
-$lap = 0;
-$return .= putTargyFejlec($lap, $ADAT);
-
-$return .= '% ------------------------------------------------------------- %
-\\noalign{\\hrule height2pt}%
-';
-
-    for ($i = 0; $i <= 2; $i++) {
-                            // ---------------------------------- Mintanap...
-	$dt = $ADAT['tanitasiNapOk'][$i];
-        if (count($ADAT['orak'][$dt]) > 0) {
-            $return .= '\\datum{'.
-            getTanitasiNapSzama($dt, $ADAT['munkatervId']).'}{'.
-            datumRomai($dt).'}{'.
-            $aHetNapjai[(date('w',strtotime($dt))-1)].'}&\\orarend'.
-            putTeXOrarendParameterek($dt, $ADAT).'&'.
-            putTeXHianyzasAlTablazat($ADAT['hianyzas'][$dt]);
-            for ($j = 0; $j < 6; $j++) {
-		$tankorId = $ADAT['oszlopTankore'][$j];
-		if (is_array($ADAT['oraszam'][$dt][$tankorId])) {
-		    if (is_numeric($ADAT['oraszam'][$dt][$tankorId][0]))
-			$oraszam1 = $ADAT['oraszam'][$dt][$tankorId][0].'.';
-		    else $oraszam1 = '---';
-		    if (is_numeric($ADAT['oraszam'][$dt][$tankorId][ (count($ADAT['oraszam'][$dt][$tankorId])-1) ]))
-			$oraszam2 = $ADAT['oraszam'][$dt][$tankorId][ (count($ADAT['oraszam'][$dt][$tankorId])-1) ].'.';
-		    else $oraszam2='---';
-		} else { $oraszam1 = $oraszam2 = ''; }
-		if (is_array($ADAT['tananyag'][$dt][$tankorId])) $leiras = TeXSpecialChars(implode(' ', $ADAT['tananyag'][$dt][$tankorId]));
-		else $leiras = '';
-                // $dupla_orszam_formátum = \\vbox{\\hsize=20pt\\centerline{134.} \\centerline{135.}}
-                if ($oraszam1 == $oraszam2) {
-                    $return .= '&\\tananyag{'.$leiras.'}{'.$oraszam1.'}';
-                } else {
-                    $return .= '&\\tananyag{'.$leiras.'}{\\vbox{\\hsize=20pt\\centerline{'.$oraszam1.'} \\centerline{'.$oraszam2.'}}}';
-                }
-            }
-            $return .= '\\cr\\noalign{\\hrule height2pt}';
-        } elseif ($ADAT['napok'][$dt][0]['tipus'] == 'speciális tanítási nap') {
-            $return .= '\\datum{'.
-	    getTanitasiNapSzama($dt, $ADAT['munkatervId']).'}{'.
-	    datumRomai($dt).'}{'.
-	    $aHetNapjai[(date('w',strtotime($dt))-1)]
-		.'}&\\multispan{8}{\\vrule width0.8pt\\vbox to 160pt{'
-		.'\\line{}\\centerline{'.$ADAT['napok'][$dt][0]['tipus'].'}\\line{}\\centerline{'.$ADAT['napok'][$dt][0]['megjegyzes'].'}'
-		.'}\\hfil\\vrule width2pt}\\cr\\noalign{\\hrule height2pt}';
-        } else {
-            $return .= '\\datum{}{'.datumRomai($ADAT['tanitasiNapOk'][$i] ).'}{'.$aHetNapjai[(date('w',strtotime($ADAT['tanitasiNapOk'][$i]))-1)]
-		.'}&\\multispan{8}{\\vrule width0.8pt\\vbox to 160pt{}\\hfil\\vrule width2pt}\\cr\\noalign{\\hrule height2pt}';
-        }
-    }
-
-                            // ---------------------------------- Mintanap VÉGE
-$return .= '% ------------------------------------------------------------- %
-\\vrule width2pt\\megjegyzes{Mulasztott órák és}{későn jövés igazolása}%
-&\\multispan8{';
-
-    for ($i = 0; $i <= 2; $i++) {
-
-	// Kell ez?
-        //$return .= '\\vrule width0.8pt\\quad\\vbox to 85pt{\\hsize=140pt\\hbox{'.  $aHetNapjai[(date('w',strtotime($ADAT['tanitasiNapOk'][$i]))-1)]  .':}';
-        //$return .= '\\vfill}\\hfil';
-
-	$dt = $ADAT['tanitasiNapOk'][$i];
-        $pluszHIANYZASOK = array();
-
-            $return .= '\\vrule width0.8pt';
-            $return .= '\\vbox to 85pt{\\baselineskip=10pt\\leftskip=3pt\\hsize=159pt';
-                $return .= '\\par{\\noindent '.$aHetNapjai[(date('w',strtotime($ADAT['tanitasiNapOk'][$i]))-1)].':}';
-
-                if (count($ADAT['hianyzas'][$dt]) > 16) {
-		    $napiHianyzas = $ADAT['hianyzas'][$dt];
-		    $h = 0;
-		    foreach ($napiHianyzas as $diakId => $H) {
-			if ($h > 15) {
-                    	    $return .= '\\par{'.$H['diakNev'];
-                        if (intval($H['összesen']) != 0) {
-                            $return .= ' '.intval($H['összesen'])
-                                .'('.intval($H['igazolt']).')';
-                            // Hiányzó hiányzásai, késései felsorolás
-                            for ($k = 1; $k <= 8; $k++) { // itt k=8 a maximális óraszám!
-                                if (isset($H['ora'][$k])) {
-                                    $pluszHIANYZASOK[ $H['ora'][$k] ] .= $k.'.';
-                                }
-                            }
-                            while (list($key,$val) = each($pluszHIANYZASOK)) {
-                                $return .= ' '.$key.':'.$val;
-                            }
-                        } else { // nem hiányzott, csak késett
-                            $return .= ' késett:';
-                            for ($k = 1; $k <= 8; $k++) { // itt k=8 a maximális óraszám!
-                                if (isset($H['ora'][$k])) {
-                                    $return .= ' '.$k.'.';
-                                }
-                            }
-                        }
-                        $return .= '}'; // ez a vége a \par{} - nak.
-			}
-			$h++;
-                    }
-                }
-            $return .= '\\vfill}';
-    }
-
-
-$return .='\\vrule width2pt%
-}\\cr% multispan
-\\noalign{\\hrule height2pt}%
-}\\hoffset=-1cm
-';
-	return $return;
-
-
-    } // end of putTeXElsoOldal()
-    /* ------------------------------------------------------------------------------------- */
-
-   /* ------------------------------------------------------------------------------------- */
-    function putTeXPage2($ADAT) {
-
-        global $aHetNapjai;
-
-	$lap = 1; 
-	$return .= putTargyFejlec($lap, $ADAT);
-	$return .= putOraleiras($lap, $ADAT);
-
-        for ($i = 0; $i < 3; $i++) {
-	    $dt = $ADAT['tanitasiNapOk'][$i];
-            $return .= '\\vrule width0.8pt';
-            $return .= '\\vbox to 85pt{\\leftskip=3pt\\hsize=120pt';
-                $return .= '\\par{\\noindent '.$aHetNapjai[(date('w',strtotime($dt))-1)].':}\\parindent=15pt';
-                for ($k = 0; $k < count($ADAT['helyettesites'][$dt]); $k++) 
-		    $return .= '\\item{'.$ADAT['helyettesites'][$dt][$k]['ora'].'.}{'
-			.$ADAT['helyettesites'][$dt][$k]['tipus'].' \\dolt '
-			.$ADAT['tanarok'][ $ADAT['helyettesites'][$dt][$k]['ki'] ]['tanarNev'].'}';
-                for ($k = 0; $k < count($ADAT['oralatogatas'][$dt]); $k++) {
-		    $return .= '\\item{'.$ADAT['oralatogatas'][$dt][$k]['ora'].'.}{'
-			.'óralátogatás \\dolt ';
-		    $tNev = array();
-		    foreach ($ADAT['oralatogatas'][$dt][$k]['tanarIds'] as $tanarId) 
-			$tNev[] = $ADAT['tanarok'][$tanarId]['tanarNev'];
-		    $return .= implode(', ', $tNev).'}';
-		}
-            $return .= '\\vfill}';
-        }
-
-        $return .= '\\vrule width0.8pt';
-        $return .= '\\vbox to 85pt{\\parindent=0pt\\leftskip=3pt\\hsize=120pt';
-        $return .= '\\par{Osztályfőnöki óra:}';
-	$oraszam1 = $oraszam2 = '';
-        for ($i = 0; $i < 3; $i++) {
-	    $dt = $ADAT['tanitasiNapOk'][$i];
-            if ($ADAT['tananyag'][$dt][ $ADAT['ofoTankorId'] ] != '') $return .= '\\par{'.
-		    TeXSpecialChars(implode('; ', array_unique($ADAT['tananyag'][$dt][ $ADAT['ofoTankorId'] ]))).'}';
-
-	    // óraszám
-	    if (is_array($ADAT['oraszam'][$dt][ $ADAT['ofoTankorId'] ])) {
-		if (is_numeric($ADAT['oraszam'][$dt][ $ADAT['ofoTankorId'] ][0]))
-		    $oraszam1 = $ADAT['oraszam'][$dt][ $ADAT['ofoTankorId'] ][0].'.'; 
-		else $oraszam1 = '---';
-		if (is_numeric($ADAT['oraszam'][$dt][ $ADAT['ofoTankorId'] ][ (count($ADAT['oraszam'][$dt][ $ADAT['ofoTankorId'] ])-1) ])) 
-		    $oraszam2 = $ADAT['oraszam'][$dt][ $ADAT['ofoTankorId'] ][ (count($ADAT['oraszam'][$dt][ $ADAT['ofoTankorId'] ])-1) ].'.';
-		else $oraszam2 = '---';
-	    }
-
-        }
-        $return .= '\\vfill';
-        $return .= '\\hbox to 138pt{\\hfill\\lower3pt\\oraszam{';
-
-        if ($oraszam1 == $oraszam2) $return .= $oraszam1;
-        else $return .= '\\vbox{\\hsize=20pt\\centerline{'.$oraszam1.'} \\centerline{'.$oraszam2.'}}';
-
-        $return .= '}}';
-        $return .= '}%end of vbox'."\n";
-        $return .= '\\vrule width2pt';
-
-	$return .= '}\\cr% multispan
-\\noalign{\\hrule height2pt}%
-}\\hoffset=-0.4cm';
-
-	return $return;
-    }
-    /* ------------------------------------------------------------------------------------- */
-
-
-   /* ------------------------------------------------------------------------------------- */
-    function putTeXPage34($ADAT) {
-
-        global $aHetNapjai;
-
-	$lap = 2;
-	$return .= putTargyFejlec($lap, $ADAT);
-	$return .= putOraleiras($lap, $ADAT);
-	for ($i = 0; $i < 3; $i++) {
-	    $dt = $ADAT['tanitasiNapOk'][$i];
-            $return .= '\\vrule width0.8pt';
-            $return .= '\\vbox to 85pt{\\leftskip=3pt\\hsize=120pt';
-                $return .= '\\par{\\noindent '.$aHetNapjai[(date('w',strtotime($dt))-1)].':}\\parindent=15pt';
-            $return .= '\\vfill}';
-        }
-
-        $return .= '\\vrule width0.8pt';
-        $return .= '\\vbox to 85pt{\\parindent=0pt\\leftskip=3pt\\hsize=120pt';
-        $return .= '\\vfill';
-        $return .= '\\hbox to 138pt{\\hfill';
-        $return .= '}';
-        $return .= '}%end of vbox'."\n";
-        $return .= '\\vrule width2pt';
-
-	$return .= '}\\cr% multispan
-\\noalign{\\hrule height2pt}%
-}\\hoffset=-1cm';
-
-	$return .= putTeXLapdobas();
-
-	$lap = 3;
-	$return .= putTargyFejlec($lap, $ADAT);
-	$return .= putOraleiras($lap, $ADAT);
-        for ($i = 0; $i < 3; $i++) {
-	    $dt = $ADAT['tanitasiNapOk'][$i];
-            $return .= '\\vrule width0.8pt';
-            $return .= '\\vbox to 85pt{\\leftskip=3pt\\hsize=120pt';
-                $return .= '\\par{\\noindent '.$aHetNapjai[(date('w',strtotime($dt))-1)].':}\\parindent=15pt';
-            $return .= '\\vfill}';
-        }
-
-        $return .= '\\vrule width0.8pt';
-        $return .= '\\vbox to 85pt{\\parindent=0pt\\leftskip=3pt\\hsize=120pt';
-        $return .= '\\vfill';
-        $return .= '\\hbox to 138pt{\\hfill';
-        $return .= '}';
-        $return .= '}%end of vbox'."\n";
-        $return .= '\\vrule width2pt';
-
-	$return .= '}\\cr% multispan
-\\noalign{\\hrule height2pt}%
-}\\hoffset=-0.4cm';
-
-
-	return $return;
-    }
-    /* ------------------------------------------------------------------------------------- */
-
-
-
-
-
-
-// ======= Osztályozó ======= //
-
-function putTeXOsztalyozoOldalbeallitas() {
-
-    return '%% Oldalbeállítás %%
-\pretolerance=10000
-\tolerance=100
-\magnification=960
-\vsize=27.7cm
-\hsize=19cm
-\voffset=-1.54cm
-\hoffset=-1.27cm';
-
-}
-
-function putTeXOsztalyozoFejlec($sorszam, $diakNev, $szuletesiHely, $szuletesiIdo) {
-
-    global $Honapok;
-
-    $ev = substr($szuletesiIdo, 0, 4);
-    $ho = kisbetus($Honapok[ intval(substr($szuletesiIdo, 5, 2))-1 ]);
-    $nap = intval(substr($szuletesiIdo, -2));
-    if ($szuletesiHely == '') $szuletesiHely = 'n.a.';
-
-    $return .= '%--Osztályozó napló egy diák fejléce--'.$sorszam.'
-\ifodd\pageno\hoffset=-0,64cm\else\hoffset=-1,64cm\fi
-\hbox to\hsize{\nagy '.$sorszam.'. '.$diakNev.'\hfil '.$szuletesiHely.", $ev. $ho $nap.".'}%
-\medskip';
-
-    return $return;
-
-}
-
-function putTeXOsztalyozoAllandoFejlec($Ho) {
-    global $hoRomai;
-    foreach ($Ho as $k=>$v) {
-	$rHo[$k] = $hoRomai[$v].'.';
-    }
-
-
-    $return .= '
-\halign{';
-
-    if (__OSZTALYOZONAPLO_JEGYEK_FELEVENTE === true) {
-	$return .= '\hbox to 194.8pt{\strut\hfil #\hfil}\vrule width1.2pt&';
-	$return .= '\hbox to 194.8pt{\strut\hfil #\hfil}\vrule width1.2pt\cr%'."\n";
-	$return .= 'I.&II.\cr%'."\n";
-	$txt = 'félévben nyert érdemjegy';
-	$return .= '\noalign{\hrule height0.8pt}%
-\multispan{2}{\vbox to 25pt{\hsize=390.8pt\vfil\hbox to 390.8pt{\hfil '.$txt.'\hfil}\vfil}\vrule width1.2pt}\cr%
-}%
-';
-    } else {
-	for($i=1; $i<=10; $i++) $return .= '\hbox to 38pt{\strut\hfil #\hfil}\vrule width1.2pt&';
-	$return = substr($return,0,-1);
-	$return .= '\cr% 10 darab'."\n";
-	// Ha a hónapokat írnánk ki?
-	$return .= implode('&', $rHo).'\cr%'."\n";
-	$txt = 'hónapban nyert érdemjegy';
-// Vagy tíz "témakört"..
-    //1.&2.&3.&4.&5.&6.&7.&8.&9.&10.\cr%
-//    $return .= '1.';
-//    for ($i = 1; $i < count($Ho); $i++) $return .= '&'.($i+1).'.';
-//    $return .= '\cr%'."\n";
-//    $txt = 'szakaszból (témakörből) nyert érdemjegy';
-    $return .= '\noalign{\hrule height0.8pt}%
-\multispan{10}{\vbox to 25pt{\hsize=390.8pt\vfil\hbox to 390.8pt{\hfil '.$txt.'\hfil}\vfil}\vrule width1.2pt}\cr%
-}%
-';
-
-    }
-
-    return $return;
-
-}
-
-function putTeXOsztalyozoJegyek($diakId, $ADAT, $start = 0) {
-/*
-    $sorszam - hány tárgy sora lett kiírva
-    $i - Hányadik tárgynál tartunk az osztály tárgyai között
-    $start - honnan indul a $i
-*/
-    global $KOVETELMENY, $_TANEV;
-
-// csúnya megoldás, de nincs jobb ötletem:
-    global $iGlobal;
-
-    $return .= '%%%% Osztalyozó jegyek %%%%'."\n";
-//    $return .= '\halign{\vrule width2pt\hbox to 85pt{\vbox to 30pt{\hsize=85pt\vfil{\ #}\vfil}\hfill}\vrule width1.2pt&'; // Tárgy oszlopa - balra igazított
-    $return .= '\halign{\vrule width2pt\hbox to 85pt{\hglue 5pt plus 0pt minus 0pt \vbox to 30pt{\hsize=80pt\vfil{#}\vfil}\hfill}\vrule width1.2pt&'; // Tárgy oszlopa - balra igazított
-
-    if (__OSZTALYOZONAPLO_JEGYEK_FELEVENTE === true) {
-	for ($i = 0; $i < 2; $i++) { // A hónapok
-    	    $return .= '\hbox to 194.8pt{\hfil\vbox to 30pt{\hsize=186.8pt{\baselineskip=9pt\vfil#\vfil}}\hfil}\vrule width1.2pt&'; // középre igazított
-	}
-    } else {
-	for ($i = 0; $i < count($ADAT['honapok']); $i++) { // A hónapok
-    	    $return .= '\hbox to 38pt{\hfil\vbox to 30pt{\hsize=30pt{\baselineskip=9pt\vfil#\vfil}}\hfil}\vrule width1.2pt&'; // középre igazított
-	}
-    }
-    $return .= '\hbox to 28pt{\vbox to 30pt{\hsize=28pt\vfil\hfil{\nagyss #}\hfil\vfil}}\vrule&%
-\hbox to 28pt{\vbox to 30pt{\hsize=28pt\vfil\hfil{\nagyss #}\hfil\vfil}}\vrule width2pt\cr%
-%%%% Formátum sor vége %%%%
-\noalign{\hrule height2pt}%
-%%%% Tárgy fejlécsora %%%%
-\omit{\vrule width2pt\hbox to 85pt{\vbox to 25pt{\hsize=85pt\vfil{\hfil Tantárgy\vfil}\vfil}\hfill}\vrule width1.2pt}&%
-%%%% Hónapok fejlécsora %%%%'."\n";
-if (__OSZTALYOZONAPLO_JEGYEK_FELEVENTE === true) $return .= '\multispan{2}{\lower3pt\vbox{'.putTeXOsztalyozoAllandoFejlec($ADAT['honapok']).'}}&%'."\n";
-else $return .= '\multispan{10}{\lower3pt\vbox{'.putTeXOsztalyozoAllandoFejlec($ADAT['honapok']).'}}&%'."\n";
-$return .= '%%%% Zárójegy fejlécsora %%%%
-\multispan2{\vbox{%
-\halign{\hbox to 28pt{\space\lower3pt\vbox to 25pt{\hsize=22pt\vfil\baselineskip=0pt #\vfil}\space}\vrule&%
-\hbox to 28pt{\space\lower3pt\vbox to 25pt{\hsize=22pt\vfil\baselineskip=0pt #\vfil}\space}%
-\cr%
-\multispan2{\strut\hfil Osztályzata\hfil}\cr%
-\noalign{\hrule height 0.8pt}%
-félév- kor&év végén\cr%
-}%
-}\vrule width2pt}\cr%
-%%%%%%%% Fejléc vége %%%%%%%%
-\noalign{\hrule height1.2pt}%
-';
-
-## =====================================================
-# Tárgynév formálása, és a 10 hónapban külön a rublikák
-    $sorszam = 0;
-    for ($i = $start; ($i < count($ADAT['targyak']) && $sorszam < 20); $i++) {
-
-	$targyId = $ADAT['targyak'][$i]['targyId'];
-	$targyNev = $ADAT['targyak'][$i]['targyNev'];
-	// A hosszabb nevek esetén az első szóköz nem nyújtható - de ezt most az elválaszott alak kiiktatja 
-	// if ($pos = strpos($targyNev, ' ')) $targyNev = substr($targyNev, 0, $pos).'\hglue 1ex plus 0pt minus 0pt '.substr($targyNev, $pos+1);
-        if (
-            (
-		//---------IDE ÍRJ
-		//is_array($ADAT['jegyek'][$diakId][$targyId])
-		in_array($targyId,$ADAT['diakTargy'][$diakId])
-		|| is_array($ADAT['zaroJegy'][1][$diakId][$targyId])
-		|| is_array($ADAT['zaroJegy'][2][$diakId][$targyId])
-	    )
-	    && ($targyId != $ADAT['targyak']['magatartasId'])
-	    && ($targyId != $ADAT['targyak']['szorgalomId'])
-            && ($targyNev != 'osztályfőnöki')
-            && ($targyNev != 'magatartás')
-            && ($targyNev != 'szorgalom')
-        ) {
-            $sorszam++;
-	    // $return .= $targyNev;
-	    $return .= $ADAT['targyak'][$i]['elvalasztott'];
-            $return .= '&';
-
-	    if (__OSZTALYOZONAPLO_JEGYEK_FELEVENTE !== true) {
-	      for ($k = 0; $k < count($ADAT['honapok']); $k++) {
-            	$ho = $ADAT['honapok'][$k];
-            	for($j = 0; $j < count($ADAT['jegyek'][$diakId][$targyId][$ho]); $j++) {
-		    $_jegy = $ADAT['jegyek'][$diakId][$targyId][$ho][$j]['jegy'];
-		    $_jegyTipus = $ADAT['jegyek'][$diakId][$targyId][$ho][$j]['jegyTipus'];
-		    $return .= TeXSpecialChars($KOVETELMENY[$_jegyTipus][$_jegy]['rovid']).' ';
-            	}
-		$return .= '&';
-    	      }
-	    } else { /* Ha félévenként! */
-              for ($felev=1; $felev<=2; $felev++) {
-		for ($j=0; $j0) $return .= ' ';
-        	    if ($zaroJegyek[$zji]['jegy'] != 0) $return .= TeXSpecialChars(
-			$KOVETELMENY[ $zaroJegyek[$zji]['jegyTipus'] ][ $zaroJegyek[$zji]['jegy'] ]['rovid']
-		    );
-        	    $return .= TeXSpecialChars(nagybetus(substr(
-			$zaroJegyek[$zji]['megjegyzes'],0,1
-		    )));
-
-		}
-	    } // ha még tagja félévkor az osztálynak
-
-            $return .= '&';
-
-	    if (
-		strtotime($ADAT['diakAdat'][$diakId]['osztalyDiak'][0]['kiDt']) == ''
-		|| strtotime($_TANEV['szemeszter'][2]['zarasDt']) <= strtotime($ADAT['diakAdat'][$diakId]['osztalyDiak'][0]['kiDt'])
-	    ) {
-		$zaroJegyek=$ADAT['zaroJegy'][2][$diakId][$targyId];
-		for ($zji=0; $zji0) $return .= ' ';
-        	    if ($zaroJegyek[$zji]['jegy'] != 0) $return .= TeXSpecialChars(
-			$KOVETELMENY[ $zaroJegyek[$zji]['jegyTipus'] ][ $zaroJegyek[$zji]['jegy'] ]['rovid']
-		    );
-        	    $return .= TeXSpecialChars(nagybetus(substr(
-			$zaroJegyek[$zji]['megjegyzes'],0,1
-		    )));
-		}
-	    } // ha még tagja év végén az osztálynak
-            $return .= '\cr%
-\noalign{\hrule height0.8pt}%
-';
-        }
-    }
-
-
-    for($j = $sorszam; $j < 20; $j++) {
-	if (__OSZTALYOZONAPLO_JEGYEK_FELEVENTE === true) $return .= '&&&&\cr';
-        else $return .= str_repeat('&', 2+count($ADAT['honapok'])).'\cr';
-// 	$return .= '0&1&2&3&4&5&6&7&8&9&10&11&12\cr';
-        $return .= '\noalign{\hrule height0.8pt}';
-    }
-
-    $return .= '}';
-
-    $iGlobal = $i;
-
-    return $return;
-}
-
-function putTeXOsztalyozoAdatok($diakId, $ADAT) {
-
-    global $KOVETELMENY;
-
-    $return .= '\halign{\vrule width2.0pt\hbox to 398.6pt{\vbox to 80pt{\hsize=398.6pt#}}\vrule width1.2pt&%
-\hbox to 135.2pt{#}\vrule width2pt\cr%
-\noalign{\hrule height1.2pt}%
-\quad\vbox{\vbox to 8pt{}%
-\settabs\+ Oktatási azonosító\quad&\quad Itt egy nagyon hosszzú név \quad&\quad Törvényes képviselő:\ &\quad adatsor3 \cr
-\+ Oktatási azonosító:&'.
-$ADAT['diakAdat'][$diakId]['oId']
-.'&Törzslapszám:&'.
-TeXSpecialChars($ADAT['diakAdat'][$diakId]['torzslapszam'])
-#.'&Törvényes képviselő:&'.
-#str_replace(',',', ',$ADAT['diakAdat'][$diakId]['torvenyesKepviselo'])
-.'\cr%
-\+ Anyja neve:&'.
-# Ha van leánykori neve, akkor azt írjuk ki, különben a viselt nevet
-(($ADAT['szulok'][ $ADAT['diakAdat'][$diakId]['anyaId'] ]['szuleteskoriCsaladinev']!='')?trim(
-    $ADAT['szulok'][ $ADAT['diakAdat'][$diakId]['anyaId'] ]['szuleteskoriCsaladinev'].' '.
-    $ADAT['szulok'][ $ADAT['diakAdat'][$diakId]['anyaId'] ]['szuleteskoriUtonev']
-):$ADAT['szulok'][ $ADAT['diakAdat'][$diakId]['anyaId'] ]['szuloNev'])
-.'&TAJ:&'.
-implode('-', str_split($ADAT['diakAdat'][$diakId]['tajSzam'],3))
-.'\cr%';
-    $return .= '
-\+ '
-.'Apa neve:&'.
-$ADAT['szulok'][ $ADAT['diakAdat'][$diakId]['apaId'] ]['szuloNev']
-.'&Telefonszám:&'.
-implode(
-    ', ',
-  array_unique( 
-    array_diff(
-	array($ADAT['szulok'][ $ADAT['diakAdat'][$diakId]['anyaId'] ]['telefon'],$ADAT['szulok'][ $ADAT['diakAdat'][$diakId]['apaId'] ]['telefon']),
-	array(null,'')
-    )
-  )
-)
-.'\cr%';
-    $return .= '
-\+ Gondviselő neve:&'.
-$ADAT['szulok'][ $ADAT['diakAdat'][$diakId]['gondviseloId'] ]['szuloNev']
-.'&Törvényes képviselő:&'.
-str_replace(',',', ',$ADAT['diakAdat'][$diakId]['torvenyesKepviselo'])
-.'\cr%';
-$return .= '
-\+ Tanuló lakcíme:&'.TeXSpecialChars($ADAT['diakAdat'][$diakId]['lakhelyIrsz'].' '
-    .$ADAT['diakAdat'][$diakId]['lakhelyHelyseg'].', '
-    .$ADAT['diakAdat'][$diakId]['lakhelyKozteruletNev'].' '
-    .$ADAT['diakAdat'][$diakId]['lakhelyKozteruletJelleg'].' '
-    .$ADAT['diakAdat'][$diakId]['lakhelyHazszam'].' '
-    .$ADAT['diakAdat'][$diakId]['lakhelyEmelet'].' '
-    .$ADAT['diakAdat'][$diakId]['lakhelyAjto'].' ')
-    .'\cr%';
-if ($ADAT['diakAdat'][$diakId]['gondozasiSzam'] != '' || $ADAT['diakAdat'][$diakId]['fogyatekossag'] != '') {
-    $return .= '
-\+ Felmentés:&'.
-str_replace(',',', ',$ADAT['diakAdat'][$diakId]['fogyatekossag']).' ('.TeXSpecialChars($ADAT['diakAdat'][$diakId]['gondozasiSzam']).')'
-.'\cr%';
-}
-
-    $return .= '
-}&%---------------------------------
-\lower3pt\vbox{%
-\halign{\hbox to 77.6pt{\vbox to 19.3pt{\hsize=77.6pt\vfil\space#\vfil}}&%
-\vrule\hbox to 28pt{\vbox to 19.3pt{\hsize=28pt\vfil{\nagyss\hfil#\hfil}\vfil}}\vrule&%
-\hbox to 28pt{\vbox to 19.3pt{\hsize=28pt\vfil{\nagyss\hfil#\hfil}\vfil}}\cr%
-\quad Magatartás&';
-$return .= $KOVETELMENY[ $ADAT['zaroJegy'][1][$diakId][ $ADAT['targyak']['magatartasId'] ][0]['jegyTipus'] 
-		][ 	 $ADAT['zaroJegy'][1][$diakId][ $ADAT['targyak']['magatartasId'] ][0]['jegy'] ]['rovid'];
-$return .= '&';
-$return .= $KOVETELMENY[ $ADAT['zaroJegy'][2][$diakId][ $ADAT['targyak']['magatartasId'] ][0]['jegyTipus'] 
-	        ][       $ADAT['zaroJegy'][2][$diakId][ $ADAT['targyak']['magatartasId'] ][0]['jegy'] ]['rovid'];
-$return .= '\cr%
-\noalign{\hrule}%
-\quad Szorgalom&';
-$return .= $KOVETELMENY[ $ADAT['zaroJegy'][1][$diakId][ $ADAT['targyak']['szorgalomId'] ][0]['jegyTipus'] 
-	        ][       $ADAT['zaroJegy'][1][$diakId][ $ADAT['targyak']['szorgalomId'] ][0]['jegy'] ]['rovid'];
-$return .= '&';
-$return .= $KOVETELMENY[ $ADAT['zaroJegy'][2][$diakId][ $ADAT['targyak']['szorgalomId'] ][0]['jegyTipus'] 
-	        ][       $ADAT['zaroJegy'][2][$diakId][ $ADAT['targyak']['szorgalomId'] ][0]['jegy'] ]['rovid'];
-$return .= '\cr%
-\noalign{\hrule height1.2pt}%
-\omit\vbox to 42.4pt{\hsize=77.6pt{%======================
-\halign{\hbox to 30.4pt{\space\vbox to 20.8pt{\hsize=28.4pt\vfil#\vfil}}\vrule&%
-\hbox to 46.4pt{\hbox to 2pt{}\vbox to 20.8pt{\hsize=40.4pt#}}\cr%
-igazolt&\vfil mulasztott\cr%
-\noalign{\hrule width 30.4pt}%
-\baselineskip9pt igazo\-latlan&órák száma\cr%
-}%
-%===========================
-}}&%~~~~~~~~~~~~~~~~
-\omit\vrule\vbox{\halign{\vbox to 20.8pt{\hsize=28pt\vfil\hfil{\nagyss #}\hfil\vfil}\cr%
-'.intval($ADAT['hianyzas'][1][$diakId]['igazolt']).'\cr%
-\noalign{\hrule}%
-'.intval($ADAT['hianyzas'][1][$diakId]['igazolatlan']+floor($ADAT['hianyzas'][1][$diakId]['kesesPercOsszeg']/45)).'\cr%
-}}\vrule%
-%~~~~~~~~~~~~~~~~~~~
-&%~~~~~~~~~~~~~~~~~~
-\omit\vbox{\halign{\vbox to 20.8pt{\hsize=28pt\vfil\hfil{\nagyss #}\hfil\vfil}\cr%
-'.intval($ADAT['hianyzas'][2][$diakId]['igazolt']).'\cr%
-\noalign{\hrule}%
-'.intval($ADAT['hianyzas'][2][$diakId]['igazolatlan']+floor($ADAT['hianyzas'][2][$diakId]['kesesPercOsszeg']/45)).'\cr%
-}}%
-%~~~~~~~~~~~~~~~~~~~
-\cr%
-}%
-}%
-%-----------------------------------
-\cr%
-\noalign{\hrule height2pt}%
-}';
-    return $return;
-
-}
-
-function putTeXTanarLista($ADAT, $lapDobasok) {
-
-    $TANAROK = $ADAT['tanarok'];
-
-    $return = '';
-    $dbTanar = count($TANAROK);
-    $maxTanarperlap = 24;
-    $maxLap = ceil($dbTanar / $maxTanarperlap);
-
-    if ($lapDobasok%2==1) $return .= putTexUresLap();
-
-    for ($lap=0; $lap<$maxLap; $lap++) {
-	if ($maxLap>1) $extStr = ' '.$maxLap.'/'.($lap+1);
-
-	$return .= '\vbox to 32pt{}\centerline{\nagy Aláíróív'.$extStr.'}%'."\n";  //\bigskip
-	$return .= '\vfill'."\n";
-	$return .= '\centerline{Ezt a haladási naplót '.$ADAT['tanitasiNapokSzama'].' tanítási nappal lezártam.}'."\n";
-	$return .= '\centerline{Ezt az osztályozó naplót '.count($ADAT['diakIds']);
-	$return .= ' beírt tanulóval lezártam.}'."\n";
-
-	$return .= '\vfill'."\n";
-	for ($i = 0 + $lap*($maxTanarperlap); $i < $dbTanar && ($maxLap==1 || ($maxLap>=2 && $i<($lap+1)*$maxTanarperlap)); $i=$i+2) {
-    	    $return .= '\line{\hfill'.
-                        '\vbox to 45pt{\hsize=150pt\vfil'.
-                                '\hbox to 150pt{\dotfill}'.
-                                '\hbox to 150pt{\hfil '.$TANAROK[$i].'\hfil}'.
-                        '}';
-    	    if ($TANAROK[$i+1] != '' && $i+1<($lap+1)*$maxTanarperlap) {
-        	$return .=  '\hbox to 80pt{}'.
-                        '\vbox to 45pt{\hsize=150pt\vfil'.
-                                '\hbox to 150pt{\dotfill}'.
-                                '\hbox to 150pt{\hfil '.$TANAROK[$i+1].'\hfil}'.
-                        '}';
-    	    }
-    	    $return .= '\hfill}';
-	}
-	$return .= '\vfill'."\n";
-
-	$return .= putTeXUresLap();
-
-    }
-
-    return $return;
-}
-
-/* Páratlan mayTanarperlap-pal nem jó!!
-
-function putTeXTanarLista($ADAT, $lapDobasok) {
-
-// Gutbrod András
-
-  $TANAROK = $ADAT['tanarok'];
-
-// teszteléshez...
-$TANAROK = array(
-    'Tanár 01', 'Tanár 02', 'Tanár 03', 'Tanár 04', 'Tanár 05', 'Tanár 06', 'Tanár 07', 'Tanár 08', 'Tanár 09', 'Tanár 10',
-    'Tanár 11', 'Tanár 12', 'Tanár 13', 'Tanár 14', 'Tanár 15', 'Tanár 16', 'Tanár 17', 'Tanár 18', 'Tanár 19', 'Tanár 20',
-    'Tanár 21', 'Tanár 22', 'Tanár 23', 'Tanár 24', 'Tanár 25', 'Tanár 26', 'Tanár 27', 'Tanár 28', 'Tanár 29', 'Tanár 30',
-    'Tanár 31', 'Tanár 32', 'Tanár 33', 'Tanár 34', 'Tanár 35', 'Tanár 36', 'Tanár 37', 'Tanár 38', 'Tanár 39', 'Tanár 40',
-    'Tanár 41', 'Tanár 42', 'Tanár 43', 'Tanár 44', 'Tanár 45', 'Tanár 46', 'Tanár 47', 'Tanár 48', 'Tanár 49', 'Tanár 50', 'Tanár 51'
-);
-
-
-    $return = '';
-    $dbTanar = count($TANAROK);
-    $maxTanarperlap = 23;
-    $maxLap = ceil($dbTanar / $maxTanarperlap);
-    $lap = 1;
-
-    if ($lapDobasok%2==1) $return .= putTexUresLap();
-
-  for ($i=0; $i<$dbTanar; $i++) {
-
-    // lap teteje?
-    if ($i % $maxTanarperlap == 0) {
-
-       if ($maxLap>1) $extStr = ' '.$maxLap.'/'.($lap);
-
-       $return .= '\vbox to 32pt{}\centerline{\nagy Aláíróív'.$extStr.'}%'."\n";
-       $return .= '\vfill'."\n";
-       $return .= '\centerline{Ezt a haladási naplót '.$ADAT['tanitasiNapokSzama'].' tanítási nappal lezártam.}'."\n";
-       $return .= '\centerline{Ezt az osztályozó naplót '.count($ADAT['diakIds']);
-       $return .= ' beírt tanulóval lezártam.}'."\n";
-       $return .= '\vfill'."\n";
-
-    }
-
-    if ($i % 2 == 0) {
-
-        $return .= '\line{\hfill'.
-                        '\vbox to 45pt{\hsize=150pt\vfil'.
-                                '\hbox to 150pt{\dotfill}'.
-                                '\hbox to 150pt{\hfil '.$TANAROK[$i].'\hfil}'.
-                        '}';
-
-        // utolsó?
-        if (($i+1) == $dbTanar) {
-           $return .= '\hfill}';
-        }
-
-    } else {
-
-        $return .=  '\hbox to 80pt{}'.
-                        '\vbox to 45pt{\hsize=150pt\vfil'.
-                                '\hbox to 150pt{\dotfill}'.
-                                '\hbox to 150pt{\hfil '.$TANAROK[$i].'\hfil}'.
-                        '}';
-        $return .= '\hfill}';
-
-    }
-
-    // lap alja?
-    if ((($i+1) % $maxTanarperlap) == 0) {
-
-       $return .= '\vfill'."\n";
-       $return .= putTeXUresLap();
-       $lap = $lap+1;
-
-    } else {
-
-       // Nem lap alja és utolsó.
-       if (($i+1) == $dbTanar) {
-
-          $return .= '\vfill'."\n";
-          $return .= putTeXUresLap();
-
-       }
-    }
-  }
-
-  return $return;
-
-}
-
-*/
-
-?>
diff --git a/mayor-orig/www/include/modules/naplo/nyomtatas/torzslap.php b/mayor-orig/www/include/modules/naplo/nyomtatas/torzslap.php
deleted file mode 100644
index 4ae32d4b..00000000
--- a/mayor-orig/www/include/modules/naplo/nyomtatas/torzslap.php
+++ /dev/null
@@ -1,199 +0,0 @@
- $ADAT['targySorrendNev'],'osztalyId' => $ADAT['osztalyId'])); $Targyak = array();
-	for ($i = 0; $i < count($_Targyak); $i++) {
-	    $Targyak[ $_Targyak[$i]['targyId'] ] = $_Targyak[$i];
-	    $Targyak[ $_Targyak[$i]['targyId'] ]['targyNev'] = nagybetus(mb_substr($_Targyak[$i]['targyNev'],0,1)).mb_substr($_Targyak[$i]['targyNev'],1);
-	}
-	unset($_Targyak);
-
-	list($ev,$ho,$nap) = explode('-', $ADAT['dt']);
-	list($evf,$oszt) = explode('.', $ADAT['osztalyAdat']['osztalyJel']);
-	
-	$DATA = array(
-	    'file' => $ADAT['file'],
-	    'base' => array('nyomtatasDt' => date('Y.m.d'), 'datumEv' => $ev, 'datumHonap' => $ho, 'datumNap' => $nap, 'hoNev' => kisbetus($Honapok[$ho-1]),
-		'intezmenyNev' => $Intezmeny['nev'], 'intezmenyOMKod' => $Intezmeny['OMKod'], 'intezmenyCimIrsz' => $Intezmeny['cimIrsz'], 
-		'intezmenyCimHelyseg' => $Intezmeny['cimHelyseg'], 'intezmenyCimKozteruletNev' => $Intezmeny['cimKozteruletNev'],
-		'intezmenyCimKozteruletJelleg' => $Intezmeny['cimKozteruletJelleg'], 'intezmenyCimHazszam' => $Intezmeny['cimHazszam'],
-		'intezmenyTelefon' => $Intezmeny['telefon'], 'intezmenyHonlap' => $Intezmeny['honlap'],
-		'intezmenyFax' => $Intezmeny['fax'], 'intezmenyEmail' => $Intezmeny['email'],
-		'tanevJele' => substr($ADAT['szemeszter']['tanevAdat']['kezdesDt'],0,4).'/'.substr($ADAT['szemeszter']['tanevAdat']['zarasDt'],2,2),
-		'felevi' => ($ADAT['szemeszter']['szemeszter'] == 1),
-		'diak' => $ADAT['diakIds'], 'osztaly' => "$evf. ".nagybetus($oszt),
-		'szovegesErtekeles' => false,
-	    ),
-	    'diak' => $ADAT['diakAdat'],
-	    'targy' => $Targyak,
-	    'szempont' => array(),
-	    'minosites' => array(),
-	);
-
-	unset($Intezmeny);
-	// Az osztályzatokhoz tartozó tárgyak (lesznek szöveges értékeléshez tartozók is....)
-	for ($i = 0; $i < count ($ADAT['targyak']); $i++) {
-            $DATA['osztalyzatTargy'][ $ADAT['targyak'][$i]['targyId'] ] = $ADAT['targyak'][$i];
-        }
-        if (is_array($ADAT['jegyek']) && count($ADAT['jegyek']) > 0) foreach ($ADAT['jegyek'] as $diakId => $dJegyek) {
-            if (is_array($dJegyek) && count($dJegyek) > 0) { // Ha vanak egyáltalán jegyei...
-                foreach ($DATA['osztalyzatTargy'] as $targyId => $tAdat) { // A helyes sorrend miatt kell ezen végigmenni
-                    if (is_array($dJegyek[$targyId])) { // van az adott tárgyból jegye
-			$targyNev = kisbetus($Targyak[$targyId]['targyNev']);
-                        $tJegyek = $dJegyek[$targyId];
-                        // Az utolsó jegyet írjuk csak ki
-                        $jegy = $tJegyek[ count($tJegyek)-1 ];
-                        if (in_array($targyId, $ADAT['szorgalomIds'])) {
-                            $DATA['diak'][$diakId]['szorgalom'] = $KOVETELMENY['szorgalom'][ $jegy['jegy'] ]['hivatalos'];
-                            $DATA['diak'][$diakId]['szorgMegjJel'] = nagybetus($jegy['megjegyzes'][0]);
-                        } elseif (in_array($targyId, $ADAT['magatartasIds'])) {
-                            $DATA['diak'][$diakId]['magatartas'] = $KOVETELMENY['magatartás'][ $jegy['jegy'] ]['hivatalos'];
-                            $DATA['diak'][$diakId]['magMegjJel'] = nagybetus($jegy['megjegyzes'][0]);
-                        } else {
-                            $DATA['diak'][$diakId]['osztalyzatTargy'][$targyId] = $jegy;
-                            $DATA['diak'][$diakId]['osztalyzatTargy'][$targyId]['jTipus'] = $jegy['jegyTipus'];
-                            $DATA['diak'][$diakId]['osztalyzatTargy'][$targyId]['mJel'] = nagybetus($jegy['megjegyzes'][0]);
-                            $DATA['diak'][$diakId]['osztalyzatTargy'][$targyId]['hivatalos'] = $KOVETELMENY[ $jegy['jegyTipus'] ][ $jegy['jegy'] ]['hivatalos'];
-			    if ($jegy['megjegyzes'] == 'dicséret') { // csak dicséreteket rakunk be - év végén nincs más
-				$DATA['diak'][$diakId]['bejegyzesek'] .= str_replace('%1%', $targyNev, $bizonyitvanyJegyzetek['dicséret'])."\n\n";
-			    }
-                            $DATA['diak'][$diakId]['osztalyzatTargy'][$targyId]['evesOraszam'] = $ADAT['targyOraszam'][$diakId][$targyId]['evesOraszam'];
-                        }
-                    }
-                }
-            }
-        }
-
-	$DATA['diak'][$diakId]['feljegyzesek'] = $DATA['diak'][$diakId]['zaroZaradek'] = $DATA['diak'][$diakId]['zaradekok'] = '';
-	if (is_array($ADAT['diakZaradekok'])) {
-	    foreach ($ADAT['diakZaradekok'] as $diakId => $dZaradekok) {
-		if (count($dZaradekok) > 0) {
-		    foreach ($dZaradekok as $idx => $zAdat) {
-			if (in_array($zAdat['zaradekIndex'], array_values($ZaradekIndex['törzslap feljegyzés']))) {
-			    $DATA['diak'][$diakId]['feljegyzesek'] .= '['.$zAdat['sorszam'].'] '.$zAdat['szoveg'].' ('.dateToString($zAdat['dt']).')';
-			} elseif (
-			    in_array($zAdat['zaradekIndex'], array_values($ZaradekIndex['konferencia']))
-			    || in_array($zAdat['zaradekIndex'], array_values($ZaradekIndex['konferencia bukás']))
-			) {
-			    $DATA['diak'][$diakId]['zaroZaradek'] .= '['.$zAdat['sorszam'].'] '.$zAdat['szoveg'].' ('.dateToString($zAdat['dt']).')'."\n\n";
-			} else {
-			    $DATA['diak'][$diakId]['zaradekok'] .= '['.$zAdat['sorszam'].'] '.$zAdat['szoveg'].' ('.dateToString($zAdat['dt']).')'."\n\n";
-			}
-		    }
-		}
-	    }
-	}
-	if (is_array($ADAT['diakBejegyzesek'])) {
-	    foreach ($ADAT['diakBejegyzesek'] as $diakId => $dBejegyzesek) {
-		if (is_null($DATA['diak'][$diakId]['bejegyzesek'])) $DATA['diak'][$diakId]['bejegyzesek'] = '';
-		if (count($dBejegyzesek)>0) {
-		    foreach ($dBejegyzesek as $idx => $bAdat) {
-			$DATA['diak'][$diakId]['bejegyzesek'] .= $bAdat['szoveg']."\n\n";
-		    }
-		}
-	    }
-	}
-	if (is_array($ADAT['diakAdat'])) {
-	    foreach ($ADAT['diakAdat'] as $diakId => $dAdat) { // alapértelmezések
-		if ($DATA['diak'][$diakId]['feljegyzesek'] == '') $DATA['diak'][$diakId]['feljegyzesek'] = '\ ';
-		foreach (array('igazolt','igazolatlan','kesesPercOsszeg','kesesIgazolatlan','osszesIgazolatlan',
-			'gyakIgazolt','gyakIgazolatlan','gyakKesesPercOsszeg','gyakKesesIgazolatlan','gyakOsszesIgazolatlan',
-			'elmIgazolt','elmIgazolatlan','elmKesesPercOsszeg','elmKesesIgazolatlan','elmOsszesIgazolatlan') as $_k) {
-		    $DATA['diak'][$diakId][$_k] = 0;
-		}
-	    }
-	}
-	if (is_array($ADAT['hianyzas'])) {
-    	    foreach ($ADAT['hianyzas'] as $diakId => $dHianyzas) {
-                $DATA['diak'][$diakId]['igazolt'] = intval($dHianyzas['igazolt']);
-                $DATA['diak'][$diakId]['igazolatlan'] = intval($dHianyzas['igazolatlan']);
-                $DATA['diak'][$diakId]['kesesPercOsszeg'] = intval($dHianyzas['kesesPercOsszeg']);
-                $DATA['diak'][$diakId]['kesesIgazolatlan'] = floor($dHianyzas['kesesPercOsszeg']/45);
-                $DATA['diak'][$diakId]['osszesIgazolatlan'] = intval($DATA['diak'][$diakId]['igazolatlan']+$DATA['diak'][$diakId]['kesesIgazolatlan']);
-
-                $DATA['diak'][$diakId]['gyakIgazolt'] = intval($dHianyzas['gyakorlatIgazolt']);
-                $DATA['diak'][$diakId]['gyakIgazolatlan'] = intval($dHianyzas['gyakorlatIgazolatlan']);
-                $DATA['diak'][$diakId]['gyakKesesPercOsszeg'] = intval($dHianyzas['gyakorlatKesesPercOsszeg']);
-                $DATA['diak'][$diakId]['gyakKesesIgazolatlan'] = floor($dHianyzas['gyakorlatKesesPercOsszeg']/45);
-                $DATA['diak'][$diakId]['gyakOsszesIgazolatlan'] = intval($DATA['diak'][$diakId]['gyakIgazolatlan']+$DATA['diak'][$diakId]['gyakKesesIgazolatlan']);
-
-                $DATA['diak'][$diakId]['elmIgazolt'] = intval($dHianyzas['elmeletIgazolt']);
-                $DATA['diak'][$diakId]['elmIgazolatlan'] = intval($dHianyzas['elmeletIgazolatlan']);
-                $DATA['diak'][$diakId]['elmKesesPercOsszeg'] = intval($dHianyzas['elmeletKesesPercOsszeg']);
-                $DATA['diak'][$diakId]['elmKesesIgazolatlan'] = floor($dHianyzas['elmeletKesesPercOsszeg']/45);
-                $DATA['diak'][$diakId]['elmOsszesIgazolatlan'] = intval($DATA['diak'][$diakId]['elmIgazolatlan']+$DATA['diak'][$diakId]['elmKesesIgazolatlan']);
-    	    }
-	}
-	// van egyáltalán tanév adat?
-	if (strtotime($ADAT['dt']) < strtotime($ADAT['tanevAdat']['szemeszter'][1]['zarasDt'])) $DATA['base']['negyedev'] = 'az első';
-	else $DATA['base']['negyedev'] = 'a harmadik';
-	foreach ($Ertekeles as $diakId => $E) {
-	    $DATA['diak'][$diakId]['targy'] = array();
-
-	    // !!! Tesztelendő !!! //
-#	    foreach ($E as $targyId => $eAdat) {
-	    foreach ($Targyak as $targyId => $tAdat) {
-		if (is_array($E[$targyId])) {
-		    $eAdat = $E[$targyId];
-		    $DATA['base']['szovegesErtekeles'] = true;
-		} else {
-		    continue;
-		}
-	    // !!! Tesztelendő !!! //
-		if (
-		    is_array($eAdat['szovegesErtekeles']['minosites']) 
-		    && count($eAdat['szovegesErtekeles']['minosites']) > 0
-		    && $ADAT['tolDt'] <= $eAdat['szovegesErtekeles']['dt']
-		) {
-
-		    $DATA['diak'][$diakId]['targy'][$targyId] = $eAdat; // Ezt lehetne finomítani
-
-		    $DATA['diak'][$diakId]['targy'][$targyId]['szempont'] = $eAdat['szempontRendszer']['szempont'];
-                    $targyMinositesId = $eAdat['szovegesErtekeles']['minosites'][0]; // Ha egy tárgy egy minősítés kell (az első)
-		    foreach ($eAdat['szempontRendszer']['szempont'] as $szempontId => $szAdat) {
-			$DATA['diak'][$diakId]['targy'][$targyId]['szempont'][$szempontId]['egyediMinosites'] = 
-				$eAdat['szovegesErtekeles']['egyediMinosites'][$szempontId]['egyediMinosites'];
-			$M = $eAdat['szempontRendszer']['minosites'][$szempontId];
-			$elsoValasztottKovetkezik = true;
-                	for ($i = 0; $i < count($M); $i++) {
-			    $DATA['diak'][$diakId]['targy'][$targyId]['szempont'][$szempontId]['minosites'][ $M[$i]['minositesId'] ] 
-				= array('minosites' => $M[$i]['minosites']);
-			    if (in_array($M[$i]['minositesId'], $eAdat['szovegesErtekeles']['minosites'])) {
-				$DATA['diak'][$diakId]['targy'][$targyId]['szempont'][$szempontId]['minosites'][$M[$i]['minositesId']]['valasztott'] = true;
-				$DATA['diak'][$diakId]['targy'][$targyId]['szempont'][$szempontId]['minosites'][$M[$i]['minositesId']]['elsoValasztott'] = $elsoValasztottKovetkezik;
-				$DATA['diak'][$diakId]['targy'][$targyId]['szempont'][$szempontId]['minosites'][$M[$i]['minositesId']]['tobbedikValasztott'] = (!$elsoValasztottKovetkezik);
-				$elsoValasztottKovetkezik = false;
-                    		if ($M[$i]['minositesId'] == $targyMinositesId) {
-                        	    $DATA['diak'][$diakId]['targy'][$targyId]['targyMinosites'] = $M[$i]['minosites']; // Ha tárgyanként egy minősítés kell (az első)
-                        	}
-                    	    }
-                	}
-		    }
-		}
-	    }
-	}
-
-	return template2file($templateFile, $DATA);
-
-    }
-
-
-?>
diff --git a/mayor-orig/www/include/modules/naplo/nyomtatas/tovabbkepzesHatarozat.php b/mayor-orig/www/include/modules/naplo/nyomtatas/tovabbkepzesHatarozat.php
deleted file mode 100644
index 024fbe94..00000000
--- a/mayor-orig/www/include/modules/naplo/nyomtatas/tovabbkepzesHatarozat.php
+++ /dev/null
@@ -1,60 +0,0 @@
-false,'fv'=>'getTanulmanyiEgyseg','modul'=>'naplo_intezmeny','result'=>'record','values'=>array($tovabbkepzesId, $tanarId, $tanev)));
-
-    }
-
-    function tovabbkepzesNyomtatvanyKeszites($ADAT) {
-
-	global $Honapok;
-
-	// A sablonfile meghatározása
-        define('__TEMPLATE_DIR', _MAYOR_DIR.'/print/module-naplo/templates');
-        $tmplFile = 'tovabbkepzesHatarozat';
-
-        if (file_exists(__TEMPLATE_DIR.'/'.__INTEZMENY.'/'.$tmplFile.'.tmpl')) {
-            $templateFile = __TEMPLATE_DIR.'/'.__INTEZMENY.'/'.$tmplFile.'.tmpl';
-        } elseif (file_exists(__TEMPLATE_DIR.'/default/'.$tmplFile.'.tmpl')) {
-            $templateFile = __TEMPLATE_DIR.'/default/'.$tmplFile.'.tmpl';
-        } else {
-            $_SESSION['alert'][] = 'message:file_not_found:'.__TEMPLATE_DIR.'/default/'.$tmplFile.'.tmpl';
-            return false;
-        }
-
-	$Intezmeny = getIntezmenyByRovidnev(__INTEZMENY);
-	list($ev, $ho, $nap) = explode('-', $ADAT['tanulmanyiEgyseg']['igDt']);
-	$DATA = array(
-            'file' => $ADAT['file'],
-            'base' => array('nyomtatasDt' => date('Y.m.d'), 'nyomtatasDatumStr' => date('Y. m. d.'), 
-		'datumEv' => $ev, 'datumHonap' => $ho, 'datumNap' => $nap, 'hoNev' => kisbetus($Honapok[$ho-1]),
-                'intezmenyNev' => $Intezmeny['nev'], 'intezmenyOMKod' => $Intezmeny['OMKod'], 'intezmenyCimIrsz' => $Intezmeny['cimIrsz'],
-                'intezmenyCimHelyseg' => $Intezmeny['cimHelyseg'], 'intezmenyCimKozteruletNev' => $Intezmeny['cimKozteruletNev'],
-                'intezmenyCimKozteruletJelleg' => $Intezmeny['cimKozteruletJelleg'], 'intezmenyCimHazszam' => $Intezmeny['cimHazszam'],
-                'intezmenyTelefon' => $Intezmeny['telefon'], 'intezmenyHonlap' => $Intezmeny['honlap'],
-                'intezmenyFax' => $Intezmeny['fax'], 'intezmenyEmail' => $Intezmeny['email'],
-
-		'tanev'=>$ADAT['tanulmanyiEgyseg']['tanev'], 'reszosszeg'=>$ADAT['tanulmanyiEgyseg']['reszosszeg'], 'tamogatas'=>$ADAT['tanulmanyiEgyseg']['tamogatas'], 
-		'tovabbkepzesStatusz'=>$ADAT['tanulmanyiEgyseg']['tovabbkepzesStatusz'], 'megjegyzes'=>$ADAT['tanulmanyiEgyseg']['megjegyzes'], 'tovabbkepzesNev'=>$ADAT['tanulmanyiEgyseg']['tovabbkepzesNev'], 
-		'oraszam'=>$ADAT['tanulmanyiEgyseg']['oraszam'], 'akkreditalt'=>$ADAT['tanulmanyiEgyseg']['akkreditalt'], 'tovIntRovidNev'=>$ADAT['tanulmanyiEgyseg']['intezmenyRovidNev'],
-		'tovIntNev'=>$ADAT['tanulmanyiEgyseg']['intezmenyNev'], 'tovIntCim'=>$ADAT['tanulmanyiEgyseg']['intezmenyCim'],
-		'tolDt'=>str_replace('-','. ',$ADAT['tanulmanyiEgyseg']['tolDt']).'.', 'igDt'=>str_replace('-','. ',$ADAT['tanulmanyiEgyseg']['igDt']).'.',
-
-		'tanarNev' => $ADAT['tanarAdat']['tanarNev'], 'szuletesiHely' => $ADAT['tanarAdat']['szuletesiHely'], 'szuletesiIdo' => $ADAT['tanarAdat']['szuletesiIdo'],
-		'hetiMunkaora' => $ADAT['tanarAdat']['hetiMunkaora'], 'statusz' => $ADAT['tanarAdat']['statusz'], 'hetiKotelezoOraszam' => $ADAT['tanarAdat']['hetiKotelezoOraszam'], 
-		'besorolas' => $ADAT['tanarAdat']['besorolas'],
-            ),
-
-	);
-
-//dump($ADAT);
-//dump($DATA);
-//die();
-	return template2file($templateFile, $DATA);
-    }
-
-?>
\ No newline at end of file
diff --git a/mayor-orig/www/include/modules/naplo/nyomtatas/zaradekok.php b/mayor-orig/www/include/modules/naplo/nyomtatas/zaradekok.php
deleted file mode 100644
index 50501765..00000000
--- a/mayor-orig/www/include/modules/naplo/nyomtatas/zaradekok.php
+++ /dev/null
@@ -1,63 +0,0 @@
- $ADAT['file'],
-            'base' => array('nyomtatasDt' => date('Y.m.d'), 
-                'intezmenyNev' => $ADAT['intezmeny']['nev'], 'intezmenyCimIrsz' => $ADAT['intezmeny']['cimIrsz'],
-                'intezmenyCimHelyseg' => $ADAT['intezmeny']['cimHelyseg'], 'intezmenyCimKozteruletNev' => $ADAT['intezmeny']['cimKozteruletNev'],
-                'intezmenyCimKozteruletJelleg' => $ADAT['intezmeny']['cimKozteruletJelleg'], 'intezmenyCimHazszam' => $ADAT['intezmeny']['cimHazszam'],
-                'intezmenyTelefon' => $ADAT['intezmeny']['telefon'], 'intezmenyHonlap' => $ADAT['intezmeny']['honlap'],
-                'intezmenyFax' => $ADAT['intezmeny']['fax'], 'intezmenyEmail' => $ADAT['intezmeny']['email'],
-                'osztalyJele' => $evf.'/'.nagybetus($oszt), 'tanevJele' => $ADAT['tanev'].'/'.$zEv,
-            ),
-        );
-
-	for ($i = 0; $i < count($ADAT['diakIds']); $i++) 
-	    $DATA['diak'][ $ADAT['diakIds'][$i] ] = array('diakNev' => $ADAT['diak'][ $ADAT['diakIds'][$i] ]['diakNev']);
-	foreach ($ADAT['zaradek'] as $diakId => $dZaradek) {
-	    for ($i = 0; $i < count($dZaradek); $i++) {
-		$DATA['diak'][$diakId]['zaradek'][ $dZaradek[$i]['zaradekId'] ] = $dZaradek[$i]['zaradekId'];
-		$DATA['zaradek'][ $dZaradek[$i]['zaradekId'] ] = $dZaradek[$i];
-	    }
-	}
-	foreach ($ADAT['bejegyzes'] as $diakId => $dBejegyzes) {
-	    for ($i = 0; $i < count($dBejegyzes); $i++) {
-		$DATA['diak'][$diakId]['bejegyzes'][ $dBejegyzes[$i]['bejegyzesId'] ] = $dBejegyzes[$i]['bejegyzesId'];
-		$DATA['bejegyzes'][ $dBejegyzes[$i]['bejegyzesId'] ] = $dBejegyzes[$i];
-		// A "bejegyzes" név már foglalt ezért át kell nevezni a bejegyzesTipusNev-et...
-		$DATA['bejegyzes'][ $dBejegyzes[$i]['bejegyzesId'] ]['szovFokozat'] = $dBejegyzes[$i]['bejegyzesTipusNev'];
-	    }
-	}
-	$DATA['base']['diak'] = array();
-	for ($i = 0; $i < count($ADAT['diakIds']); $i++) {
-	    if (
-		is_array($DATA['diak'][ $ADAT['diakIds'][$i] ]['bejegyzes']) 
-		|| is_array($DATA['diak'][ $ADAT['diakIds'][$i] ]['zaradek'])
-	    ) $DATA['base']['diak'][] = $ADAT['diakIds'][$i];
-	}
-
-        return template2file($templateFile, $DATA);
-
-
-    }
-
-?>
diff --git a/mayor-orig/www/include/modules/naplo/orarend/ascExport.php b/mayor-orig/www/include/modules/naplo/orarend/ascExport.php
deleted file mode 100644
index a1affa40..00000000
--- a/mayor-orig/www/include/modules/naplo/orarend/ascExport.php
+++ /dev/null
@@ -1,437 +0,0 @@
- $tanev));
-	$Osztalyok = getOsztalyok($tanev);
-	// Nem tudható, hogy mely termekben lesz óra - ez intézménytől függő - exportáljuk mind...
-	$Termek = getTermek(array('tipus'=>
-	    array()
-//	    array('tanterem','szaktanterem','osztályterem','labor','gépterem','tornaterem','tornaszoba','fejlesztőszoba','tanműhely','előadó','könyvtár','díszterem','egyéb') 
-	)); $teremIds = array();
-	for ($i = 0; $i < count($Termek); $i++) $teremIds[] = $Termek[$i]['teremId'];
-	$Targyak = getTargyak();
-	$Diakok = getDiakok(array('tanev' => $tanev)); $diakIds = array();
-	for ($i = 0; $i < count($Diakok); $i++) $diakIds[] = $Diakok[$i]['diakId'];
-	$diakokOsztalyai = getDiakokOsztalyai($diakIds, array('tanev' => $tanev, 'tolDt' => $ADAT['dt'], 'igDt' => $ADAT['dt']));
-	foreach ($ADAT['bontas'] as $bontasId => $bontas) {
-	    $bontasTomb = explode('+',$bontas);
-	    for ($i = 0; $i < count($bontasTomb); $i++) {
-		$Bontas[$bontasId][ $bontasTomb[$i] ]++;
-	    }
-	}
-	if (isset($ADAT['exportalandoHet'])) $Orarend = getOrarendByDt($ADAT['dt'], array($ADAT['exportalandoHet']), $ADAT['tanev']);
-	else $Orarend = array();
-	// Tárgyak bontása
-	if ($ADAT['targyBontas']) {
-	    if (defined('__ASC_BONTANDO_TARGYAK')) $bontandoTargyak = explode(',', __ASC_BONTANDO_TARGYAK);
-	}
-
-	for ($i = 0; $i < count($ADAT['tankorok']); $i++) {
-	    $tankorId = $ADAT['tankorok'][$i]['tankorId'];	    
-	    $ADAT['tankorok'][$i]['osztaly'] = getTankorOsztalyaiByTanev($tankorId, $tanev, array('tagokAlapjan' => true, 'result' => 'id'));
-	    $ADAT['tankorok'][$i]['tanar'] = getTankorTanaraiByInterval($tankorId, array('tanev' => $tanev, 'result' => 'csakId'));
-	    $tmpDiakok = getTankorDiakjaiByInterval($tankorId, $tanev);
-	    $ADAT['tankorok'][$i]['diakIds'] = $tmpDiakok['idk'];
-	    // Tárgyak bontása
-	    if ($ADAT['targyBontas']) {
-		$targyId = $ADAT['tankorok'][$i]['tankorAdat'][$tankorId][0]['targyId'];
-		if (!is_array($bontandoTargyak) || in_array($targyId, $bontandoTargyak)) {
-		    $tankorNev = $ADAT['tankorok'][$i]['tankorAdat'][$tankorId][0]['tankorNev'];
-		    $csoportJel = substr($tankorNev, strrpos($tankorNev, ' ')+1);
-		    if (!is_array($ADAT['alTargyak'][$targyId])) $ADAT['alTargyak'][$targyId] = array($csoportJel);
-		    elseif (!in_array($csoportJel, $ADAT['alTargyak'][$targyId])) $ADAT['alTargyak'][$targyId][] = $csoportJel;
-		    $ADAT['tankorok'][$i]['tankorAdat'][$tankorId][0]['targyId'] = $targyId.':'.$csoportJel;
-		}
-	    }
-
-	}
-
-
-	// Blokkok tanárai / diákjai / osztályai - és a blokk jelenlegi óráinak meghatározása
-	$ADAT['blokkOra'] = array();
-	$ADAT['tankorBlokkOra'] = array();
-	if (is_array($ADAT['tankorBlokk']['exportOraszam'])) 
-	foreach ($ADAT['tankorBlokk']['exportOraszam'] as $bId => $oraszam) if ($oraszam > 0) { // blokkonként
-
-	    $ADAT['blokkTanarok'][$bId] = $ADAT['blokkDiakok'][$bId] = $ADAT['blokkOsztalyok'][$bId] = array();
-	    for ($i = 0; $i < count($ADAT['tankorBlokk']['idk'][$bId]); $i++) { // az érintett tankörökön végigmenve
-		$tankorId = $ADAT['tankorBlokk']['idk'][$bId][$i];
-		$TA = $ADAT['tankorok'][ $ADAT['tankorIndex'][$tankorId] ];
-		// tanárok
-		for ($j = 0; $j < count($TA['tanar']); $j++) // elvileg nem lehet ütközés, hiszen blokk!!
-		    if (!in_array($TA['tanar'][$j], $ADAT['blokkTanarok'][$bId])) {
-			$ADAT['blokkTanarok'][$bId][] = $TA['tanar'][$j];
-		    } else {
-			$_SESSION['alert'][] = 'message:utkozes:blokk='.$bId.';tanarId='.$TA['tanar'][$j];
-			$return = false;
-		    }
-		for ($j = 0; $j < count($TA['diakIds']); $j++) // elvileg nem lehet ütközés, hiszen blokk!!
-		    if (!in_array($TA['diakIds'][$j], $ADAT['blokkDiakok'][$bId])) {
-			$ADAT['blokkDiakok'][$bId][] = $TA['diakIds'][$j];
-		    } else {
-			$_SESSION['alert'][] = 'message:utkozes:blokk='.$bId.';diakId='.$TA['diakIds'][$j];
-			$return = false;
-		    }
-		for ($j = 0; $j < count($TA['osztaly']); $j++) // Itt lehet ütközés
-		    if (!in_array($TA['osztaly'][$j], $ADAT['blokkOsztalyok'][$bId])) $ADAT['blokkOsztalyok'][$bId][] = $TA['osztaly'][$j];
-	    }
-
-	    // A blokk jelenlegi óráinak lekérdezése
-	    if (isset($ADAT['exportalandoHet'])) {
-		$q = "SELECT het, nap, ora 
-			FROM `%s`.orarendiOra LEFT JOIN `%s`.orarendiOraTankor USING (tanarId, osztalyJel, targyJel)
-			WHERE tolDt<='%s' AND '%s'<=igDt 
-			AND het=%u
-			AND tankorId IN (".implode(',', array_fill(0, count($ADAT['tankorBlokk']['idk'][$bId]), '%u')).")
-			GROUP BY het, nap, ora HAVING COUNT(*)=".count($ADAT['tankorBlokk']['idk'][$bId]);
-		$v = mayor_array_join(array($ADAT['tanevDb'], $ADAT['tanevDb'], $ADAT['dt'], $ADAT['dt'], $ADAT['exportalandoHet']), $ADAT['tankorBlokk']['idk'][$bId]);
-		$ret = db_query($q, array('fv' => 'blokkOrai', 'modul' => 'naplo', 'result' => 'indexed', 'values' => $v));
-		if ($oraszam > count($ret)) {
-		    $_SESSION['alert'][] = 'message:wrong_data:A beállított blokk óraszámnál kevesebb van az órarendben:'.$bId.':'.$oraszam.'/'.count($ret);
-//		    $return = false;
-		} else {
-		    $db = $i = 0; 
-		    while ($i < count($ret) && $db < $oraszam) {
-			// Ellenőrizzük, hogy az összes tankörnek szabad-e még az adott órája
-			$szabad = true;
-			for ($j = 0; $j < count($ADAT['tankorBlokk']['idk'][$bId]); $j++) {
-			    $tankorId = $ADAT['tankorBlokk']['idk'][$bId][$j];
-			    if ($ADAT['tankorBlokkOra'][$tankorId][ $ret[$i]['het'] ][ $ret[$i]['nap'] ][ $ret[$i]['ora'] ]) {
-				$szabad = false;
-				break;
-			    }
-			}
-			if ($szabad) {
-			    // Lekérdezzük az érintett termeket
-			    $q = "SELECT DISTINCT teremId FROM `%s`.orarendiOra 
-				    LEFT JOIN `%s`.orarendiOraTankor USING (tanarId, osztalyJel, targyJel)
-				    WHERE tolDt<='%s' AND '%s'<=igDt AND het=%u
-				    AND tankorId IN (".implode(',', array_fill(0, count($ADAT['tankorBlokk']['idk'][$bId]), '%u')).")
-				    AND het=%u AND nap=%u AND ora=%u";
-			    $v = mayor_array_join(
-				array($ADAT['tanevDb'], $ADAT['tanevDb'], $ADAT['dt'], $ADAT['dt'], $ADAT['exportalandoHet']), 
-				$ADAT['tankorBlokk']['idk'][$bId],
-				array($ret[$i]['het'], $ret[$i]['nap'], $ret[$i]['ora'])
-			    );
-			    $ret[$i]['teremIds'] = db_query($q, array('fv' => 'blokkTermei', 'modul' => 'naplo', 'result' => 'idonly', 'values' => $v));
-			    // Ha szabad, akkor a blokk számára lefoglaljuk
-			    $ADAT['blokkOra'][$bId][] = $ret[$i];
-
-			    // Ha szabad, akkor minden tankör számára lefoglaljuk
-			    for ($j = 0; $j < count($ADAT['tankorBlokk']['idk'][$bId]); $j++) {
-				$tankorId = $ADAT['tankorBlokk']['idk'][$bId][$j];
-				$ADAT['tankorBlokkOra'][$tankorId][ $ret[$i]['het'] ][ $ret[$i]['nap'] ][ $ret[$i]['ora'] ] = true;
-			    }
-			    $db++;
-			}
-			$i++;
-		    }
-		    if ($db < $oraszam) {
-			$_SESSION['alert'][] = 'message:wrong_data:Az órarendben csak'.$db.' órát sikerült lefoglalni ('.$oraszam.' helyett) - blokkId='.$bId;
-//			$return = false;
-		    }
-		}
-	    }
-	}
-
-	$xml = ''."\r\n";
-
-
-	// Tanárok
-	$xml .= '   '."\r\n";
-	for ($i = 0; $i < count($Tanarok); $i++) {
-	    $xml .= '      '."\r\n";
-	}
-	$xml .= '   '."\r\n";
-	// Osztályok
-	$xml .= '   '."\r\n";
-	for ($i = 0; $i < count($Osztalyok); $i++) {
-	    $xml .= '      '."\r\n";
-	}
-	$xml .= '   '."\r\n";
-	if ($ADAT['szeminariumkent']) {
-	    // Diákok
-	    $xml .= '   '."\r\n";
-	    for ($i = 0; $i < count($Diakok); $i++) {
-		$xml .= '      '."\r\n";
-	    }
-	    $xml .= '   '."\r\n";
-	    $studentidsStr = ',studentids';
-	}
-	// Tárgyak
-	$xml .= '   '."\r\n";
-	if (is_array($ADAT['tankorBlokk']['exportOraszam'])) 
-	foreach ($ADAT['tankorBlokk']['exportOraszam'] as $bId => $oraszam) { // blokkok - mint tárgyak
-	    if ($oraszam > 0) $xml .= '      '."\r\n";	    
-	}
-	for ($i = 0; $i < count($Targyak); $i++) { // igazi tárgyak
-	    $xml .= '      '."\r\n";
-	    // Tárgyak bontása
-	    if (is_array($ADAT['alTargyak'][ $Targyak[$i]['targyId'] ])) {
-		foreach ($ADAT['alTargyak'][ $Targyak[$i]['targyId'] ] as $index => $alTargyId) {
-		    $xml .= '      '."\r\n";
-		}
-	    }
-	}
-	$xml .= '   '."\r\n";
-	// Termek
-	$xml .= '   '."\r\n";
-	for ($i = 0; $i < count($Termek); $i++) {
-	    $xml .= '      '."\r\n";
-	}
-	$xml .= '   '."\r\n";
-	// Órák
-	$xml .= '   '."\r\n";
-	// blokk --> lesson
-	if (is_array($ADAT['tankorBlokk']['exportOraszam'])) foreach ($ADAT['tankorBlokk']['exportOraszam'] as $bId => $oraszam) if ($oraszam > 0) {
-	    $tankorIds = $ADAT['tankorBlokk']['idk'][$bId];
-	    $bNev = $ADAT['tankorBlokk']['blokkNevek'][$bId];
-	    $subjectid = 'b'.$bId;
-	    if (
-		!isset($ADAT['exportalandoHet']) // Csak akkor exportálunk bontott órákat, ha meglevő órarendet nem
-		&& is_array($Bontas['b-'.$bId]) && count($Bontas['b-'.$bId]) > 0
-	    ) {
-		foreach ($Bontas['b-'.$bId] as $periodsPerCard => $db) {
-		    $xml .= '      '."\r\n";    
-		}
-	    } elseif ($oraszam > ($egeszoraszam = floor($oraszam))) {
-		if ($egeszoraszam > 0) {
-		    // Ha tört szám az export óraszám, akkor két lessont gyártunk: egyet az egész óraszámhoz, egyet a törthöz...
-		    $xml .= '      '."\r\n";    
-		}
-		// tört
-		$xml .= '      '."\r\n";    
-
-	    } else {
-		$xml .= '      '."\r\n";    
-	    }
-	}
-	// tankor --> lesson
-	for ($i = 0; $i < count($ADAT['tankorok']); $i++) {
-	    $TA = $ADAT['tankorok'][$i];
-	    $tankorId = $TA['tankorId'];
-	    if (count($TA['diakIds']) >= 0) {
-		if (
-		    !isset($ADAT['exportalandoHet']) // Csak akkor exportálunk bontott órákat, ha meglevő órarendet nem
-		    && is_array($Bontas['t-'.$tankorId]) && count($Bontas['t-'.$tankorId]) > 0
-		) {
-		    foreach ($Bontas['t-'.$tankorId] as $periodsPerCard => $db) {
-			$xml .= '      '."\r\n";    
-		    }
-		} elseif ($TA['hetiOraszam'] > ($egeszoraszam = floor($TA['hetiOraszam']))) {
-		    if ($egeszoraszam > 0) {
-			// Ha tört szám az export óraszám, akkor két lessont gyártunk: egyet az egész óraszámhoz, egyet a törthöz...
-			$xml .= '      '."\r\n";
-		    }
-		    $xml .= '      '."\r\n";
-
-		} else {
-		    $xml .= '      '."\r\n";
-		}
-	    }
-	}
-	$xml .= '   '."\r\n";
-
-	if (isset($ADAT['exportalandoHet'])) {
-	    // jelenleg betöltött órák
-	    $xml .= '   '."\r\n";
-	    for ($i = 0; $i < count($Orarend); $i++) {
-		$tankorId = $Orarend[$i]['tankorId'];
-		if ($ADAT['tankorBlokkOra'][$tankorId][ $Orarend[$i]['het'] ][ $Orarend[$i]['nap'] ][ $Orarend[$i]['ora'] ]!==true) {
-		    $lessonId = 't-'.$tankorId;
-		    $TA = $ADAT['tankorok'][ $ADAT['tankorIndex'][$tankorId] ];
-		    if (is_array($TA)) // A szakkörök például nincsenek benne alap esetben...
-			$xml .= '      '."\r\n";
-		}
-	    }
-	    // A blokk órák kiírása
-	    if (is_array($ADAT['blokkOra'])) foreach ($ADAT['blokkOra'] as $bId => $Orak) {
-		$tankorIds = $ADAT['tankorBlokk']['idk'][$bId];
-		$lessonId = 'b-'.implode('_', $tankorIds);
-		for ($i = 0; $i < count($Orak); $i++) {
-		    $xml .= '      '."\r\n";
-		}
-	    }
-	    $xml .= '   '."\r\n";
-	}
-
-	$xml .= ''."\r\n";
-
-	fputs($fp, mb_convert_encoding($xml, 'ISO-8859-2', 'UTF-8'));
-	fclose($fp);
-
-	return $return;
-
-    }
-
-    function blokkOraszamRogzites($blokkAdat, $tanevDb) {
-
-	if (is_array($blokkAdat)) foreach ($blokkAdat as $bId => $bOraszam) {
-	    $q = "UPDATE `%s`.blokk SET exportOraszam = %f WHERE blokkId = %u";
-	    $v = array($tanevDb, $bOraszam, $bId);
-	    $r = db_query($q, array('fv' => 'blokkOraszamRogzites', 'modul' => 'naplo', 'values' => $v));
-	}
-
-    }
-
-    function ascBontasLekerdezes($tanevDb) {
-
-	$v = array($tanevDb);
-	// A szükséges tábla létrehozása - ha netán nem létezne
-        $q = "CREATE TABLE IF NOT EXISTS `%s`._ascOraBontas (
-	  tipus ENUM('blokk','tankör') NOT NULL DEFAULT 'tankör',
-	  id INT UNSIGNED NOT NULL,
-	  bontas VARCHAR(32),
-	  PRIMARY KEY (tipus, id)
-	) ENGINE InnoDb";
-        db_query($q, array('fv' => 'ascBontasLekerdezes/createTable', 'modul' => 'naplo', 'values' => $v));
-
-        $return = array();
-        $q = "SELECT CONCAT(LEFT(tipus,1),'-',id) AS bontasId,bontas FROM `%s`._ascOraBontas";
-        $ret = db_query($q, array('fv' => 'bontás lekérdezés', 'modul' => 'naplo', 'result' => 'assoc', 'keyfield' => 'bontasId', 'values' => $v));
-        if ($ret !== false) foreach ($ret as $bontasId => $bAdat) $return[$bontasId] = $bAdat['bontas'];
-        return $return;
-    }
-
-    function ascBontasModositas($ADAT) {
-
-
-	$tipusStr = array('t' => 'tankör', 'b' => 'blokk');
-
-        // Törlések elvégzése ($ADAT['bontas'] tömb)
-            if (is_array($_POST['torlendoBontas']) && count($_POST['torlendoBontas']) > 0) {
-                for ($i = 0; $i < count($_POST['torlendoBontas']); $i++) {
-                    $bontasId = readVariable($_POST['torlendoBontas'][$i], 'emptystringnull', null, array_keys($ADAT['bontas']));
-                    if (isset($bontasId)) unset($ADAT['bontas'][$bontasId]);
-                }
-            }
-        // Új bontás felvétele
-            $bontasId = readVariable($_POST['bontasId'], 'emptystringnull', null);
-            if (isset($bontasId)) {
-                list($tipus, $id) = explode('-', $bontasId);
-                if ($tipus == 't') $oraszam = $ADAT['tankorok'][ $ADAT['tankorIndex'][$id] ]['hetiOraszam'];
-                elseif ($tipus == 'b') $oraszam = $ADAT['tankorBlokk']['exportOraszam'][$id];
-                $oraBontas = readVariable($_POST['oraBontas'], 'emptystringnull', '1');
-                eval('$bontottOraszam='.$oraBontas.';');
-                if ($bontottOraszam > $oraszam) {
-                    $_SESSION['alert'][] = 'message:wrong_data:'."$tipus-$id - óraszám=$oraszam < $oraBontas=bontott óraszám";
-                } else {
-                    if ($bontottOraszam < $oraszam) $oraBontas .= str_repeat('+1', $oraszam-$bontottOraszam);
-                    $ADAT['bontas']["$tipus-$id"] = $oraBontas;
-                }
-            }
-
-        // A bontások kiírása
-            $q = "DELETE FROM `%s`._ascOraBontas";
-            db_query($q, array('fv' => 'ascExport/bontásokTörlése', 'modul' => 'naplo', 'values' => array($ADAT['tanevDb'])));
-            $v = array($ADAT['tanevDb']); $V = array();
-            foreach ($ADAT['bontas'] as $bontasId => $bontas) {
-                list($tipus, $id) = explode('-', $bontasId);
-                $V[] = "('%s', %u, '%s')";
-                array_push($v, $tipusStr[$tipus], $id, $bontas);
-            }
-            if (count($V) > 0) {
-                $q = "INSERT INTO `%s`._ascOraBontas (tipus, id, bontas) VALUES ".implode(',', $V);
-                db_query($q, array('fv' => 'ascExport/bontásokRögzítése', 'modul' => 'naplo', 'values' => $v));
-            }
-
-    }
-
-?>
diff --git a/mayor-orig/www/include/modules/naplo/orarend/convert-Microsoft Excel XML.php b/mayor-orig/www/include/modules/naplo/orarend/convert-Microsoft Excel XML.php
deleted file mode 100644
index bcadf3fb..00000000
--- a/mayor-orig/www/include/modules/naplo/orarend/convert-Microsoft Excel XML.php	
+++ /dev/null
@@ -1,147 +0,0 @@
- tanarId konverzióhoz lekérdezzük a tanárok adatait.
-	require_once('include/modules/naplo/share/tanar.php');
-	$Tanarok = getTanarok(array('tanev' => __TANEV, 'result' => 'assoc'));
-	foreach ($Tanarok as $tanarId => $tanarAdat) $Tanar[ $tanarAdat['tanarNev'] ] = $tanarId;
-	// A terem --> teremId konverzióhoz lekérdezzük a terem adatokat
-	require_once('include/modules/naplo/share/terem.php');
-	$Termek = getTermek();
-	for ($i = 0; $i < count($Termek); $i++) {
-	    $TeremByLeiras[ $Termek[$i]['leiras'] ] = $Termek[$i]['teremId'];
-	    $TeremById[ $Termek[$i]['teremId'] ] = $Termek[$i]['teremId'];
-	}
-
-	$dom = DOMDocument::load( $ADAT['fileName'] );
-	if (!$dom) {
-	    $_SESSION['alert'][] = 'message:file:'.$ADAT['fileName'];
-	    return false;
-	}
-
-	$worksheets = $dom->getElementsByTagName( 'Worksheet' );
-	foreach ($worksheets as $worksheet) {
-	    $TMP = array();
-	    $name = $worksheet->getAttribute( 'ss:Name' );
-	    $rows = $worksheet->getElementsByTagName( 'Row' );
-	    $r = 0;
-	    foreach ($rows as $row) {
-		    $s = 0;
-		    $cells = $row->getElementsByTagName( 'Cell' );
-		    foreach( $cells as $cell ) { 
-			// Összevont cellák esetén a cellatartalmat ismételjük
-			$span = $cell->getAttribute( 'ss:MergeAcross' );
-			for ($i = 0; $i <= $span; $i++) {
-			    $TMP[$r][$s] = $cell->nodeValue;
-    			    $s++;
-			}
-		    }
-		    $r++;
-	    }
-	    if (strstr($name, 'sszesített terem')) $TEREM = $TMP;
-	    elseif (strstr($name, 'anárok összesített')) $TANAR = $TMP;
-	}
-//	var_dump($TEREM);
-
-
-	// Az első sor a napok neveit tartalmazza
-	$Napok = $TANAR[0];
-	for ($i = 0; $i < count($Napok); $i++)
-	    if ($Napok[$i] == 'Hétfő') $Napok[$i] = 1;
-	    elseif ($Napok[$i] == 'Kedd') $Napok[$i] = 2;
-	    elseif ($Napok[$i] == 'Szerda') $Napok[$i] = 3;
-	    elseif ($Napok[$i] == 'Csütörtök') $Napok[$i] = 4;
-	    elseif ($Napok[$i] == 'Péntek') $Napok[$i] = 5;
-	    elseif ($Napok[$i] == 'Szombat') $Napok[$i] = 6;
-	    elseif ($Napok[$i] == 'Vasárnap') $Napok[$i] = 7;
-	// A második sor az adott napon belüli óraszámot adja
-	$oraszamok = $TANAR[1];
-
-	// A termeket tartalmazó munkalap feldolgozása
-	$s = 2;
-	while ($s < count($TEREM)) {
-
-	    // Két sor egy terem órarendjét tartalmazza
-	    $S1 = $TEREM[$s];
-	    $S2 = $TEREM[$s+1];
-	    $s += 2;
-	    // Az első sor első mezője a terem neve
-	    $terem = $S1[0];
-	    // A második cellátol jönnek az órák - első sor a tárgy, második az osztály
-	    for ($i = 1; $i < count($S1); $i++) {
-		if ($Napok[$i] != 0) $nap = $Napok[$i];
-		if ($S1[$i] != '') {
-
-		    $ora = $oraszamok[$i];
-		    $targy = $S1[$i];
-		    $osztaly = $S2[$i];
-		    if ($TeremByLeiras[ $terem ] != '') {
-			$TeremRend[$nap][$ora][$osztaly][$targy] = $TeremByLeiras[ $terem ];
-		    } elseif ($TeremById[ $terem ] != '') {
-			$TeremRend[$nap][$ora][$osztaly][$targy] = $TeremById[ $terem ];
-		    } else {
-			$TeremRend[$nap][$ora][$osztaly][$targy] = $terem;
-			$_SESSION['alert'][] = 'message:wrong_data:terem='.$terem;
-			$return = false;
-		    }
-
-		}
-
-	    }
-	}
-
-	// A tanár-órarendet tartalmazó munkalap feldolgozása
-	$s = 2;
-	while ($s < count($TANAR)) {
-
-	    // Két sor egy tanár órarendjét tartalmazza
-	    $S1 = $TANAR[$s];
-	    $S2 = $TANAR[$s+1];
-	    $s += 2;
-	    // Az első sor első mezője a tanár neve
-	    if ($S1[0] != '') {
-		if ($Tanar[ $S1[0] ] != '') {	
-		    $tanar = $Tanar[ $S1[0] ];
-		} else {
-		    $tanar = $S1[0];
-		    $_SESSION['alert'][] = 'message:wrong_data:tanarNev='.$tanar;
-		    $return = false;
-		}
-		// A második cellátol jönnek az órák - első sor a tárgy, második az osztály
-		for ($i = 1; $i < count($S1); $i++) {
-		    if ($Napok[$i] != 0) $nap = $Napok[$i];
-		    if ($S1[$i] != '') {
-
-			$ora = $oraszamok[$i];
-			$targy = $S1[$i];
-			$osztaly = $S2[$i];
-
-			$OrarendiOra[] = array(
-			    $ADAT['orarendiHet'],$nap,$ora,$tanar,$osztaly,$targy,$TeremRend[$nap][$ora][$osztaly][$targy],$ADAT['tolDt'],$ADAT['igDt']
-			);
-		    }
-		}
-	    }
-	}
-
-	return $return;
-
-    }
-
-?>
diff --git a/mayor-orig/www/include/modules/naplo/orarend/convert-RoPaSoft.php b/mayor-orig/www/include/modules/naplo/orarend/convert-RoPaSoft.php
deleted file mode 100644
index 39e8d457..00000000
--- a/mayor-orig/www/include/modules/naplo/orarend/convert-RoPaSoft.php
+++ /dev/null
@@ -1,80 +0,0 @@
- __TANEV, 'result' => 'assoc'));
-	foreach ($Tanarok as $tanarId => $tanarAdat) $Tanar[ $tanarAdat['tanarNev'] ] = $tanarId;
-
-	$fp = fopen($ADAT['fileName'], 'r');
-	if (!$fp) return false;
-
-	// Az első sor a napok neveit tartalmazza
-	$Napok = explode('	', chop(fgets($fp, 1024)));
-	for ($i = 0; $i < count($Napok); $i++)
-	    if ($Napok[$i] == 'Hétfő') $Napok[$i] = 1;
-	    elseif ($Napok[$i] == 'Kedd') $Napok[$i] = 2;
-	    elseif ($Napok[$i] == 'Szerda') $Napok[$i] = 3;
-	    elseif ($Napok[$i] == 'Csütörtök') $Napok[$i] = 4;
-	    elseif ($Napok[$i] == 'Péntek') $Napok[$i] = 5;
-	    elseif ($Napok[$i] == 'Szombat') $Napok[$i] = 6;
-	    elseif ($Napok[$i] == 'Vasárnap') $Napok[$i] = 7;
-	// A második sor az adott napon belöli óraszámot adja
-	$oraszamok = explode('	', chop(fgets($fp, 1024)));
-	$return = true;
-	while ($sor = fgets($fp, 1024)) {
-
-	    // Két sor egy tanár órarendjét tartalmazza
-	    $S1 = explode('	', chop($sor));
-	    $S2 = explode('	', chop(fgets($fp, 1024)));
-	    // Az első sor első mezője a tanár neve
-	    if ($Tanar[ $S1[0] ] != '') {
-		$tanar = $Tanar[ $S1[0] ];
-	    } else {
-		$_SESSION['alert'][] = 'message:wrong_data:tanarNev='.$S1[0]; // hiányzó vagy hibás tanárnév esetén nem tudjuk betölteni az órarendet
-		$return = false;
-		$tanar = $S1[0] . ' / ' . $Tanar[ $S1[0] ];
-	    }
-	    // A második cellátol jönnek az órák - első sor a tárgy, második az osztály
-	    for ($i = 1; $i < count($S1); $i++) {
-		if ($Napok[$i] != 0) $nap = $Napok[$i];
-		if ($S1[$i] != '') {
-
-		    $ora = $oraszamok[$i];
-		    $targy = $S1[$i];
-		    $osztaly = $S2[$i];
-
-		    // és hol a teremId????
-		    $OrarendiOra[] = array(
-			$ADAT['orarendiHet'],$nap,$ora,$tanar,$osztaly,$targy,$ADAT['tolDt'],$ADAT['igDt']
-		    );
-
-		}
-
-	    }
-
-	}
-
-	fclose($fp);
-	return $return;
-
-    }
-
-?>
diff --git a/mayor-orig/www/include/modules/naplo/orarend/convert-aSc Timetables Ctrl-Shift-E.php b/mayor-orig/www/include/modules/naplo/orarend/convert-aSc Timetables Ctrl-Shift-E.php
deleted file mode 100644
index 01e14858..00000000
--- a/mayor-orig/www/include/modules/naplo/orarend/convert-aSc Timetables Ctrl-Shift-E.php	
+++ /dev/null
@@ -1,112 +0,0 @@
- __TANEV, 'result' => 'assoc'));
-dump($Tanarok);
-        foreach ($Tanarok as $tanarId => $tanarAdat) $Tanar[ $tanarAdat['tanarNev'] ] = $tanarId;
-
-
-        $fp = fopen($ADAT['fileName'], 'r');
-        if (!$fp) return false;
-
-	// Az első sor üres - eldobjuk 
-	$sor = fgets($fp, 1024);
-	// A második sor mezőneveket tartalmaz - eldobjuk
-	$sor = fgets($fp, 1024);
-	$ok = true; $OrarendiOra = array();
-	// Az adatsorok feldolgozása
-	$kulcs2index = $kulcsDb = array();
-	while ($sor = fgets($fp, 1024)) {
-
-	    $rec = explode('	', chop($sor));
-
-	    $het = $ADAT['orarendiHet'];
-	    $nap = $rec[1];
-	    $ora = $rec[2];
-	    $tanarNev = explode(',', mb_convert_encoding($rec[10],'UTF-8','ISO-8859-2')); // konvetál és szétvág!
-	    $tanarIds = array();
-	    foreach ($tanarNev as $tNev) {
-		if ($tNev == 'Ernst') $tNev = 'Ernst, Mader';
-		if ($tNev == ' Mader') continue;
-		if (!isset($Tanar[$tNev])) {
-		    $_SESSION['alert'][] = 'message:wrong_data:Hiányzó azonosító (tanár név='.$tNev.')';
-		    $ok = false;
-		}
-		$tanarIds[] = $Tanar[$tNev];
-	    }
-	    $oJelek = explode(',', $rec[4]);
-	    if (count($oJelek) > 1) $osztalyJel = $oJelek[0].'...'; 	// Nem fér ki több, csak jelezzük, hogy volt még...
-	    else $osztalyJel = $oJelek[0];				// nem érdemes szétvágni, mert nem feleltethető meg...
-	    $targyJel = mb_convert_encoding($rec[6],'UTF-8','ISO-8859-2'); //.$rec[12];
-	    $teremIds = explode(',',$rec[9]); // szétvág
-	    $tolDt = $ADAT['tolDt'];
-	    $igDt = $ADAT['igDt'];
-
-	    // Többhetes órarend esetén egy tanárnak lehet több bejegyzése is ugyanarra az időpontra. Ekkor valahogy ki kell választani a megfelelőt.
-	    // Egy adott kulcs első előfordulásakor a rekordot elmentjük és indexét is rögzítjük. Többedig előfordulás esetén csak azt rögzítjük,
-	    // hogy hanyadik előfordulás volt egész addig, amíg a megadott órarendiHét számadik előfordulásig nem jutunk. Ekkor felülírjuk a korábbi rekordot.
-	    // blokkok szétbontása több rekordra
-	    // TODO: Ha egy blokk egyik tagja ütközik csak, akkor valójában az összesnek adott heti bejegyzéssé kellene változnia.
-    	    for ($i = 0; $i < count($tanarIds); $i++) {
-		
-		$tanarId = $tanarIds[$i];
-		$teremId = ($teremIds[$i]==0)?'NULL':$teremIds[$i]; // a 0 érték nem lehet teremId
-		$kulcsDb["$het-$nap-$ora-$tanarId"]++;
-		if (!isset($kulcs2index["$het-$nap-$ora-$tanarId"])) {
-            	    $OrarendiOra[] = array(
-                	$het,$nap,$ora,$tanarId,$osztalyJel,$targyJel,$teremId,$tolDt,$igDt
-            	    );
-		    $kulcs2index["$het-$nap-$ora-$tanarId"] = count($OrarendiOra)-1;
-		} else {
-		    if ($het == $kulcsDb["$het-$nap-$ora-$tanarId"]) {
-			$OrarendiOra[ $kulcs2index["$het-$nap-$ora-$tanarId"] ] = array(
-                	    $het,$nap,$ora,$tanarId,$osztalyJel,$targyJel,$teremId,$tolDt,$igDt
-            		);
-		    }
-
-		}
-	    }
-	}
-
-	fclose($fp);
-	return $ok;
-
-    }
-
-
-?>
diff --git "a/mayor-orig/www/include/modules/naplo/orarend/convert-aSc Timetables XML (tank\303\266r n\303\251lk\303\274l).php" "b/mayor-orig/www/include/modules/naplo/orarend/convert-aSc Timetables XML (tank\303\266r n\303\251lk\303\274l).php"
deleted file mode 100644
index 87d7982c..00000000
--- "a/mayor-orig/www/include/modules/naplo/orarend/convert-aSc Timetables XML (tank\303\266r n\303\251lk\303\274l).php"	
+++ /dev/null
@@ -1,188 +0,0 @@
- 0) $xmlStr = mb_convert_encoding(fread($fp, $size), 'UTF-8', 'ISO-8859-2');
-        fclose($fp);
-	// A loadXML( $xmlStr );
-	if (!$dom) {
-	    $_SESSION['alert'][] = 'message:wrong_data:Hibás XML file='.$ADAT['fileName'];
-	    return false;
-	}
-
-	// A targyJel mező hosszának lekérdezése (32)
-	$q = "SHOW FIELDS FROM `%s`.orarendiOraTankor LIKE 'targyJel'";
-	$ret = db_query($q, array('fv' => 'loadFile/targyJel típusa', 'modul' => 'naplo', 'result' => 'record', 'values' => array($ADAT['tanevDb'])));
-	$targyJelHossz = intval(substr($ret['Type'], 8, -1));
-
-	// Tanárok - MaYoR
-        $cTanar = array(); $Tanarok = getTanarok();
-        for ($i = 0; $i < count($Tanarok); $i++) $cTanar[ $Tanarok[$i]['tanarId'] ] = $Tanarok[$i];
-
-
-	// ====================== Alapadatok lekérdezése az XML-ből =========================== //
-
-	$teachers = $dom->getElementsByTagName( 'teacher' );
-	foreach ($teachers as $teacher) {
-	    $id = $teacher->getAttribute( 'id' );
-	    $ascTanar[$id]['name'] = $teacher->getAttribute( 'name' );
-	    $ascTanar[$id]['short'] = $teacher->getAttribute( 'short' );
-	    if (!is_array($cTanar[$id])) {
-		$_SESSION['alert'][] = 'message:Hibás tanár ID!:'.$id.':'.$ascTanar[$id]['name'].':'.$ascTanar[$id]['short'];
-	    }
-	}
-	$classes = $dom->getElementsByTagName( 'class' );
-	foreach ($classes as $class) {
-	    $id = $class->getAttribute( 'id' );
-	    $name = $class->getAttribute( 'name' );
-	    $ascOsztaly[$id] = $name;
-	}
-	$subjects = $dom->getElementsByTagName( 'subject' );
-	foreach ($subjects as $subject) {
-	    $id = $subject->getAttribute( 'id' );
-	    $name = $subject->getAttribute( 'name' );
-	    $short = $subject->getAttribute( 'short' );
-	    $ascTargy[$id] = array('name' => $name, 'short' => $short);
-	}
-	$classrooms = $dom->getElementsByTagName( 'classroom' );
-	foreach ($classrooms as $classroom) {
-	    $id = $classroom->getAttribute( 'id' );
-	    $name = $classroom->getAttribute( 'name' );
-	    $short = $classroom->getAttribute( 'name' );
-	    $ascTerem[$id] = array('name' => $name, 'short' => $short);
-	}
-
-	//  =============== Lesson tábla feldolgozása ======================== //
-	// két hetes órarend --> egy hét
-	$kihagyandoWeek = ($ADAT['orarendiHet'] == 1) ? '01':'10';
-	$lessons = $dom->getElementsByTagName( 'lesson' );
-	foreach ($lessons as $lesson) {
-	    $id = $lesson->getAttribute( 'id' );
-	    $weeks = $lesson->getAttribute( 'weeks' );
-	    if ($weeks === $kihagyandoWeek) $kihagyandoLesson[$id] = true;
-	}
-/*
-	//  =============== Lesson tábla feldolgozása ======================== //
-
-	$OrarendiOraTankor = array();
-	$lessons = $dom->getElementsByTagName( 'lesson' );
-	foreach ($lessons as $lesson) {
-	    $id = $lesson->getAttribute( 'id' );
-	    $name = $lesson->getAttribute( 'name' );
-	    $periodspercard = $lesson->getAttribute( 'periodspercard' );
-	    $periodsperweek = $lesson->getAttribute( 'periodsperweek' );
-	    $subjectid = $lesson->getAttribute( 'subjectid' );
-	    $classids = $lesson->getAttribute( 'classids' );
-	    $teacherids = $lesson->getAttribute( 'teacherids' );
-
-	    $ascLesson[$id] = array(
-		'lessonid' => $id,
-		'name' => $name,
-		'periodspercard' => $periodspercard,
-		'periodsperweek' => $periodsperweek,
-		'subjectid' => $subjectid,
-		'classids' => $classids,
-		'teacherids' => $teacherids,
-	    );
-
-	    list($jel, $ids) = explode('-', $id);
-	    $tankorIds = explode('_', $ids);
-	    $tanarIds = explode(',', $teacherids);
-	    $osztalyIds = explode(',', $classids);
-//	    $targyJel = $subjectid;
-	    $targyJel = substr($id, 0, $targyJelHossz);
-	    for ($i = 0; $i < count($tankorIds); $i++) { // feltételezzük, hogy a tanárok és tankörök sorrendje megfelel egymásnak!
-		$tankorId = $tankorIds[$i];
-		if (!is_array($tankorOrarendiOra[$tankorId])) $tankorOrarendiOra[$tankorId] = array();
-		$tanarId = $mayorTankor[$tankorId]['tanar'][0];
-		if (!isset($tanarId)) {
-		    $_SESSION['alert'][] = "message:wrong_data:Hiányzó tanár hozzárendelés:tankorId=$tankorId - tanarId NINCS! - teacherids=$teacherids - lessonid=$id";
-		    $return = $ADAT['force'];
-		    continue;
-		} elseif(!in_array($tanarId, $tanarIds)) {
-		    $_SESSION['alert'][] = "message:wrong_data:Hibás tanár hozzárendelés:tankorId=$tankorId - tanarId=$tanarId - teacherids=$teacherids - lessonid=$id";
-		    $return = $ADAT['force'];
-		    continue;
-		}
-		$osztalyId = $mayorTankor[$tankorId]['osztaly'][0];
-		if (!in_array($osztalyId, $osztalyIds)) {
-		    $_SESSION['alert'][] = "message:wrong_data:Hibás osztály hozzárendelés:tankorId=$tankorId - osztalyId=$osztalyId - classids=$classids";
-		    $return = $ADAT['force'];
-		    if (!$return) continue;
-		}
-		if (!in_array("$tanarId:$osztalyId:$targyJel", $tankorOrarendiOra[$tankorId])) {
-		    $tankorOrarendiOra[$tankorId][] = "$tanarId:$osztalyId:$targyJel";
-		    $OrarendiOraTankor[] = array(
-			$tanarId, $osztalyId, $targyJel, $tankorId
-		    );
-		}
-	    }
-
-	} // foreach - lesson
-*/
-	// Kártyák feldolgozása
-	$cards = $dom->getElementsByTagName( 'card' );
-	if (count($cards)==0) $_SESSION['alert'][] = '::nincsenek kártyák az adott xml file-ban';
-	foreach ($cards as $card) {
-
-	    $lessonid = $card->getAttribute( 'lessonid' );
-	    if ($kihagyandoLesson[$lessonid]) continue;
-	    $classids = explode(',', ($card->getAttribute( 'classids' )));
-	    $subjectids = explode(',', ($card->getAttribute( 'subjectids' )));
-	    $teacherids = explode(',', ($card->getAttribute( 'teacherids' )));
-	    $classroomids = explode(',', ($card->getAttribute( 'classroomids' )));
-	    $day = ($card->getAttribute( 'day' ));
-	    $period = $card->getAttribute( 'period' );
-	    $periodspercard = $card->getAttribute( 'durationperiods' );
-
-	    $weeks = $card->getAttribute( 'weeks' );
-	    if ($weeks === $kihagyandoWeek) continue;
-
-	    if ($periodspercard == 0) $periodspercard = 1;
-
-	    for ($j = 0; $j < $periodspercard; $j++) {
-		foreach ($teacherids as $i => $tanarId) {
-			if (count($subjectids) == count($teacherids)) $targyJel = $ascTargy[ $subjectids[$i] ]['short'];
-			else $targyJel = $ascTargy[ $subjectids[0] ]['short']; // Csak az első subjectid-t vesszük figyelembe
-
-			if (count($classroomids) == count($teacherids)) $teremId = readVariable($classroomids[$i],'numeric unsigned','NULL');
-			else $teremId = readVariable($classroomids[0],'numeric unsigned','NULL'); // feltételezzük, hogy a tanárok és termek sorrendje megfelel
-
-			if (count($classids) == count($teacherids)) $osztalyJel = $ascOsztaly[ $classids[$i] ];
-			else $osztalyJel = $ascOsztaly[ $classids[0] ];
-
-			$OrarendiOra[] = array(
-			    $ADAT['orarendiHet'],$day,intval($period+$j),$tanarId,$osztalyJel,$targyJel,$teremId,$ADAT['tolDt'],$ADAT['igDt']
-			);			
-		}
-	    }
-
-	}
-
-	return $return;
-
-    }
-
-
-?>
diff --git a/mayor-orig/www/include/modules/naplo/orarend/convert-aSc Timetables XML update.php b/mayor-orig/www/include/modules/naplo/orarend/convert-aSc Timetables XML update.php
deleted file mode 100644
index 07d06798..00000000
--- a/mayor-orig/www/include/modules/naplo/orarend/convert-aSc Timetables XML update.php	
+++ /dev/null
@@ -1,241 +0,0 @@
- 0) $xmlStr = mb_convert_encoding(fread($fp, $size), 'UTF-8', 'ISO-8859-2');
-        fclose($fp);
-	// A loadXML( $xmlStr );
-	if (!$dom) {
-	    $_SESSION['alert'][] = 'message:wrong_data:Hibás XML file='.$ADAT['fileName'];
-	    return false;
-	}
-
-	// Tankörök adatainak lekérdezése
-        $Tankorok = getTankorok(array("tanev=$tanev"));
-	$mayorTankor = array();
-        for ($i = 0; $i < count($Tankorok); $i++) {
-	    $tankorId = $Tankorok[$i]['tankorId'];
-            $Tankorok[$i]['osztaly'] = getTankorOsztalyaiByTanev($tankorId, $tanev, array('tagokAlapjan' => true, 'result' => 'id'));
-//            $Tankorok[$i]['tanar'] = getTankorTanaraiByInterval($tankorId, array('tanev' => $tanev, 'result' => 'csakId'));
-    	    $Tankorok[$i]['tanar'] = getTankorTanaraiByInterval(
-                $tankorId, array('tanev' => $tanev, 'tolDt' => $ADAT['tolDt'], 'igDt' => $ADAT['igDt'], 'result' => 'csakId')
-            );
-if ($tankorId == 104) {
-var_dump($Tankorok[$i]['tanar']);
-}
-	    $mayorTankor[$tankorId] = $Tankorok[$i];
-	}
-var_dump($ADAT['tolDt']);
-var_dump($ADAT['igDt']);
-	unset($Tankorok);
-
-	// A targyJel mező hosszának lekérdezése (32)
-        $q = "SHOW FIELDS FROM `%s`.orarendiOraTankor LIKE 'targyJel'";
-        $ret = db_query($q, array('fv' => 'loadFile/targyJel típusa', 'modul' => 'naplo', 'result' => 'record', 'values' => array($ADAT['tanevDb'])));
-	$targyJelHossz = intval(substr($ret['Type'], 8, -1));
-
-	// A már felvett orarendiOraTankor bejegyzések lekérdezése
-	$ret = getOrarendiOraTankor($tanev);
-	$tankorOrarendiOra = array();
-	for ($i = 0; $i < count($ret); $i++) {
-	    $kulcs = $ret[$i]['tanarId'].':'.$ret[$i]['osztalyJel'].':'.$ret[$i]['targyJel'];
-	    $tankorOrarendiOra[ $ret[$i]['tankorId'] ][] = $kulcs;
-	}
-
-
-	// ====================== Alapadatok lekérdezése az XML-ből =========================== //
-
-	$teachers = $dom->getElementsByTagName( 'teacher' );
-	foreach ($teachers as $teacher) {
-	    $id = $teacher->getAttribute( 'id' );
-	    $name = $teacher->getAttribute( 'name' );
-	    $ascTanar[$id] = $name;
-	}
-	$classes = $dom->getElementsByTagName( 'class' );
-	foreach ($classes as $class) {
-	    $id = $class->getAttribute( 'id' );
-	    $name = $class->getAttribute( 'name' );
-	    $ascOsztaly[$id] = $name;
-	}
-	$subjects = $dom->getElementsByTagName( 'subject' );
-	foreach ($subjects as $subject) {
-	    $id = $subject->getAttribute( 'id' );
-	    $name = $subject->getAttribute( 'name' );
-	    $short = $subject->getAttribute( 'short' );
-	    if (substr($id,0,1) == 'b') $ascBlokkTargy[substr($id, 1)] = $name;
-	    else $ascTargy[$id] = array('name' => $name, 'short' => $short);
-	}
-	$classrooms = $dom->getElementsByTagName( 'classroom' );
-	foreach ($classrooms as $classroom) {
-	    $id = $classroom->getAttribute( 'id' );
-	    $name = $classroom->getAttribute( 'name' );
-	    $ascTerem[$id] = $name;
-	}
-
-	//  =============== Lesson tábla feldolgozása ======================== //
-
-	$OrarendiOraTankor = array();
-	$lessons = $dom->getElementsByTagName( 'lesson' );
-	foreach ($lessons as $lesson) {
-	    $id = $lesson->getAttribute( 'id' );
-	    $name = $lesson->getAttribute( 'name' );
-	    $periodspercard = $lesson->getAttribute( 'periodspercard' );
-	    $periodsperweek = $lesson->getAttribute( 'periodsperweek' );
-	    $subjectid = $lesson->getAttribute( 'subjectid' );
-	    $classids = $lesson->getAttribute( 'classids' );
-	    $teacherids = $lesson->getAttribute( 'teacherids' );
-
-	    $ascLesson[$id] = array(
-		'lessonid' => $id,
-		'name' => $name,
-		'periodspercard' => $periodspercard,
-		'periodsperweek' => $periodsperweek,
-		'subjectid' => $subjectid,
-		'classids' => $classids,
-		'teacherids' => $teacherids,
-	    );
-
-	    list($jel, $ids) = explode('-', $id);
-	    $tankorIds = explode('_', $ids);
-	    $tanarIds = explode(',', $teacherids);
-	    $osztalyIds = explode(',', $classids);
-//	    $targyJel = $subjectid;
-	    $targyJel = substr($id, 0, $targyJelHossz);
-	    for ($i = 0; $i < count($tankorIds); $i++) { // feltételezzük, hogy a tanárok és tankörök sorrendje megfelel egymásnak!
-		$tankorId = $tankorIds[$i];
-		if (!is_array($tankorOrarendiOra[$tankorId])) $tankorOrarendiOra[$tankorId] = array();
-		$tanarId = $mayorTankor[$tankorId]['tanar'][0];
-		if (!isset($tanarId)) {
-		    $_SESSION['alert'][] = "message:wrong_data:Hiányzó tanár hozzárendelés:tankorId=$tankorId - tanarId NINCS! - teacherids=$teacherids - lessonid=$id";
-		    $return = $ADAT['force'];
-		    continue;
-		} elseif(!in_array($tanarId, $tanarIds)) {
-		    $_SESSION['alert'][] = "message:wrong_data:Hibás tanár hozzárendelés:tankorId=$tankorId - tanarId=$tanarId - teacherids=$teacherids - lessonid=$id";
-		    $return = $ADAT['force'];
-		    continue;
-		}
-		$osztalyId = $mayorTankor[$tankorId]['osztaly'][0];
-		if (!in_array($osztalyId, $osztalyIds)) {
-		    $_SESSION['alert'][] = "message:wrong_data:Hibás osztály hozzárendelés:tankorId=$tankorId - osztalyId=$osztalyId - classids=$classids";
-		    $return = $ADAT['force'];
-		    continue;
-		}
-		if (!in_array("$tanarId:$osztalyId:$targyJel", $tankorOrarendiOra[$tankorId])) {
-		    $tankorOrarendiOra[$tankorId][] = "$tanarId:$osztalyId:$targyJel";
-		    $OrarendiOraTankor[] = array(
-			$tanarId, $osztalyId, $targyJel, $tankorId
-		    );
-		}
-	    }
-
-	} // foreach - lesson
-
-	// Kártyák feldolgozása
-	$cards = $dom->getElementsByTagName( 'card' );
-	foreach ($cards as $card) {
-	    $lessonid = $card->getAttribute( 'lessonid' );
-//	    $periodspercard = $lAdat['periodspercard'];
-	    $periodspercard = $card->getAttribute( 'durationperiods' );
-	    $day = ($card->getAttribute( 'day' ));
-	    $period = $card->getAttribute( 'period' );
-	    $classroomids = explode(',', ($card->getAttribute( 'classroomids' )));
-	    $tanarIds = explode(',', $ascLesson[$lessonid]['teacherids']);
-
-	    list($jel, $ids) = explode('-', $lessonid);
-	    if (substr($jel,0,1) == 't') $tipus = 'tankor';
-	    elseif (substr($jel,0,1) == 'b') $tipus = 'blokk';
-	    else {
-		$_SESSION['alert'][] = "message:wrong_data:Hibás lesson:lessonid=$lessonid";
-		$return = $ADAT['force'];
-		if ($ADAT['force']) { // felvesszük az órarendi óra bejegyzést - még tankörhöz kell majd rendelni
-		    $osztalyIds = explode(',', $ascLesson[$lessonid]['classids']);
-		    foreach ($tanarIds as $i => $tanarId) {
-//			$targyJel = substr($lessonid, 0, $targyJelHossz);
-			$targyJel = $ascTargy[ $ascLesson[$lessonid]['subjectid'] ]['short'].'-'.$lessonid;
-			$teremId = readVariable($classroomids[$i],'numeric unsigned','NULL'); // feltételezzük, hogy a tanárok és termek sorrendje megfelel
-			if (count($osztalyIds) == count($tanarIds)) $osztalyJel = $ascOsztaly[ $osztalyIds[$i] ];
-			else $osztalyJel = $ascOsztaly[ $osztalyIds[0] ];
-			$OrarendiOra[] = array(
-			    $ADAT['orarendiHet'],$day,intval($period),$tanarId,$osztalyJel,$targyJel,$teremId,$ADAT['tolDt'],$ADAT['igDt']
-			);			
-		    }
-		}
-		continue;
-	    }
-//	    $oraszam = intval(substr($jel, 1, 1));
-	    $oraszam = $periodspercard;
-	    if ($oraszam == 0) $oraszam = 1;
-//	    if ($oraszam != $periodspercard) $_SESSION['alert'][] = "message:wrong_data:Óraszám=$oraszam - periodspercard=$periodspercard";
-	    $tankorIds = explode('_', $ids);
-//	    $targyJel = $ascLesson[$lessonid]['subjectid'];
-	    $targyJel = substr($lessonid, 0, $targyJelHossz);
-	    for ($i = 0; $i < count($tankorIds); $i++) {
-
-		$tankorId = $tankorIds[$i];
-		$tanarId = readVariable($mayorTankor[$tankorId]['tanar'][0], 'numeric unsigned', null);
-		list($index) = array_keys($tanarIds, $tanarId);
-		$osztalyId = readVariable($mayorTankor[$tankorId]['osztaly'][0], 'numeric unsigned', null);
-		$teremId = readVariable($classroomids[$index],'numeric unsigned','NULL'); // feltételezzük, hogy a tankor-ök és termek sorrendje megfelel
-		for ($j = 0; $j < $oraszam; $j++) {
-		    if (isset($tanarId) && isset($osztalyId)) {
-
-$q = "SELECT teremId FROM `%s`._orarendiOra WHERE het=%u AND nap=%u AND ora=%u AND tanarId=%u AND osztalyJel='%s' AND targyJel='%s' AND tolDt<='%s' AND '%s' <= igDt";
-$v = array($ADAT['tanevDb'], $ADAT['orarendiHet'], $day, intval($period+$j), $tanarId, $osztalyId, $targyJel, $ADAT['tolDt'], $ADAT['tolDt']);
-$ret = db_query($q, array('fv' => 'terem update', 'modul' => 'naplo', 'result' => 'value', 'values' => $v));
-if ($ret != '') {
-    $teremId = $ret;
-}
-else {
-    $teremId = 'NULL';
-}
-			$OrarendiOra[] = array(
-			    $ADAT['orarendiHet'],$day,intval($period+$j),$tanarId,$osztalyId,$targyJel,$teremId,$ADAT['tolDt'],$ADAT['igDt']
-			);
-		    }
-		}
-	    }
-
-	}
-
-	return $return;
-
-    }
-
-
-?>
diff --git a/mayor-orig/www/include/modules/naplo/orarend/convert-aSc Timetables XML.php b/mayor-orig/www/include/modules/naplo/orarend/convert-aSc Timetables XML.php
deleted file mode 100644
index e4f2fde6..00000000
--- a/mayor-orig/www/include/modules/naplo/orarend/convert-aSc Timetables XML.php	
+++ /dev/null
@@ -1,217 +0,0 @@
- 0) $xmlStr = mb_convert_encoding(fread($fp, $size), 'UTF-8', 'ISO-8859-2');
-        fclose($fp);
-	// A loadXML( $xmlStr );
-	if (!$dom) {
-	    $_SESSION['alert'][] = 'message:wrong_data:Hibás XML file='.$ADAT['fileName'];
-	    return false;
-	}
-
-	// Tankörök adatainak lekérdezése
-        $Tankorok = getTankorok(array("tanev=$tanev"));
-	$mayorTankor = array();
-        for ($i = 0; $i < count($Tankorok); $i++) {
-	    $tankorId = $Tankorok[$i]['tankorId'];
-            $Tankorok[$i]['osztaly'] = getTankorOsztalyaiByTanev($tankorId, $tanev, array('tagokAlapjan' => true, 'result' => 'id'));
-//            $Tankorok[$i]['tanar'] = getTankorTanaraiByInterval($tankorId, array('tanev' => $tanev, 'result' => 'csakId'));
-    	    $Tankorok[$i]['tanar'] = getTankorTanaraiByInterval(
-                $tankorId, array('tanev' => $tanev, 'tolDt' => $ADAT['tolDt'], 'igDt' => $ADAT['igDt'], 'result' => 'csakId')
-            );
-
-	    $mayorTankor[$tankorId] = $Tankorok[$i];
-	}
-	unset($Tankorok);
-
-	// A targyJel mező hosszának lekérdezése (32)
-        $q = "SHOW FIELDS FROM `%s`.orarendiOraTankor LIKE 'targyJel'";
-        $ret = db_query($q, array('fv' => 'loadFile/targyJel típusa', 'modul' => 'naplo', 'result' => 'record', 'values' => array($ADAT['tanevDb'])));
-        $targyJelHossz = intval(substr($ret['Type'], 8, -1));
-	// A már felvett orarendiOraTankor bejegyzések lekérdezése
-	$ret = getOrarendiOraTankor($tanev);
-	$tankorOrarendiOra = array();
-	for ($i = 0; $i < count($ret); $i++) {
-	    $kulcs = $ret[$i]['tanarId'].':'.$ret[$i]['osztalyJel'].':'.$ret[$i]['targyJel'];
-	    $tankorOrarendiOra[ $ret[$i]['tankorId'] ][] = $kulcs;
-	}
-
-
-	// ====================== Alapadatok lekérdezése az XML-ből =========================== //
-
-	$teachers = $dom->getElementsByTagName( 'teacher' );
-	foreach ($teachers as $teacher) {
-	    $id = $teacher->getAttribute( 'id' );
-	    $name = $teacher->getAttribute( 'name' );
-	    $ascTanar[$id] = $name;
-	}
-	$classes = $dom->getElementsByTagName( 'class' );
-	foreach ($classes as $class) {
-	    $id = $class->getAttribute( 'id' );
-	    $name = $class->getAttribute( 'name' );
-	    $ascOsztaly[$id] = $name;
-	}
-	$subjects = $dom->getElementsByTagName( 'subject' );
-	foreach ($subjects as $subject) {
-	    $id = $subject->getAttribute( 'id' );
-	    $name = $subject->getAttribute( 'name' );
-	    $short = $subject->getAttribute( 'short' );
-	    if (substr($id,0,1) == 'b') $ascBlokkTargy[substr($id, 1)] = $name;
-	    else $ascTargy[$id] = array('name' => $name, 'short' => $short);
-	}
-	$classrooms = $dom->getElementsByTagName( 'classroom' );
-	foreach ($classrooms as $classroom) {
-	    $id = $classroom->getAttribute( 'id' );
-	    $name = $classroom->getAttribute( 'name' );
-	    $ascTerem[$id] = $name;
-	}
-
-	//  =============== Lesson tábla feldolgozása ======================== //
-
-	$OrarendiOraTankor = array();
-	$lessons = $dom->getElementsByTagName( 'lesson' );
-	foreach ($lessons as $lesson) {
-	    $id = $lesson->getAttribute( 'id' );
-	    $name = $lesson->getAttribute( 'name' );
-	    $periodspercard = $lesson->getAttribute( 'periodspercard' );
-	    $periodsperweek = $lesson->getAttribute( 'periodsperweek' );
-	    $subjectid = $lesson->getAttribute( 'subjectid' );
-	    $classids = $lesson->getAttribute( 'classids' );
-	    $teacherids = $lesson->getAttribute( 'teacherids' );
-
-	    $ascLesson[$id] = array(
-		'lessonid' => $id,
-		'name' => $name,
-		'periodspercard' => $periodspercard,
-		'periodsperweek' => $periodsperweek,
-		'subjectid' => $subjectid,
-		'classids' => $classids,
-		'teacherids' => $teacherids,
-	    );
-
-	    list($jel, $ids) = explode('-', $id);
-	    $tankorIds = explode('_', $ids);
-	    $tanarIds = explode(',', $teacherids);
-	    $osztalyIds = explode(',', $classids);
-//	    $targyJel = $subjectid;
-	    $targyJel = substr($id, 0, $targyJelHossz);
-	    for ($i = 0; $i < count($tankorIds); $i++) { // feltételezzük, hogy a tanárok és tankörök sorrendje megfelel egymásnak!
-		$tankorId = $tankorIds[$i];
-		if (!is_array($tankorOrarendiOra[$tankorId])) $tankorOrarendiOra[$tankorId] = array();
-		$tanarId = $mayorTankor[$tankorId]['tanar'][0];
-		if (!isset($tanarId)) {
-		    $_SESSION['alert'][] = "message:wrong_data:Hiányzó tanár hozzárendelés:tankorId=$tankorId - tanarId NINCS! - teacherids=$teacherids - lessonid=$id";
-		    $return = $ADAT['force'];
-		    continue;
-		} elseif(!in_array($tanarId, $tanarIds)) {
-		    $_SESSION['alert'][] = "message:wrong_data:Hibás tanár hozzárendelés:tankorId=$tankorId - tanarId=$tanarId - teacherids=$teacherids - lessonid=$id";
-		    $return = $ADAT['force'];
-		    continue;
-		}
-		$osztalyId = $mayorTankor[$tankorId]['osztaly'][0];
-		if (!in_array($osztalyId, $osztalyIds)) {
-		    $_SESSION['alert'][] = "message:wrong_data:Hibás osztály hozzárendelés:tankorId=$tankorId - osztalyId=$osztalyId - classids=$classids";
-		    $return = $ADAT['force'];
-		    if (!$return) continue;
-		}
-		if (!in_array("$tanarId:$osztalyId:$targyJel", $tankorOrarendiOra[$tankorId])) {
-		    $tankorOrarendiOra[$tankorId][] = "$tanarId:$osztalyId:$targyJel";
-		    $OrarendiOraTankor[] = array(
-			$tanarId, $osztalyId, $targyJel, $tankorId
-		    );
-		}
-	    }
-
-	} // foreach - lesson
-
-	// Kártyák feldolgozása
-	$cards = $dom->getElementsByTagName( 'card' );
-	if (count($cards)==0) $_SESSION['alert'][] = '::nincsenek kártyák az adott xml file-ban';
-	foreach ($cards as $card) {
-	    $lessonid = $card->getAttribute( 'lessonid' );
-//	    $periodspercard = $lAdat['periodspercard'];
-	    $periodspercard = $card->getAttribute( 'durationperiods' );
-	    $day = ($card->getAttribute( 'day' ));
-	    // Ha nem az adott hétre vonatkozó bejegyzés, akkor ugorjunk...
-	    $weeks = ($card->getAttribute( 'weeks' ));
-	    if ($weeks != "" && $weeks !== "1" && substr($weeks,($ADAT['orarendiHet']-1),1) != "1") continue;
-	    $period = $card->getAttribute( 'period' );
-	    $classroomids = explode(',', ($card->getAttribute( 'classroomids' )));
-	    $tanarIds = explode(',', $ascLesson[$lessonid]['teacherids']);
-
-	    list($jel, $ids) = explode('-', $lessonid);
-	    if (substr($jel,0,1) == 't') $tipus = 'tankor';
-	    elseif (substr($jel,0,1) == 'b') $tipus = 'blokk';
-	    else {
-		$_SESSION['alert'][] = "message:wrong_data:Hibás lesson:lessonid=$lessonid";
-		$return = $ADAT['force'];
-		if ($ADAT['force']) { // felvesszük az órarendi óra bejegyzést - még tankörhöz kell majd rendelni
-		    $osztalyIds = explode(',', $ascLesson[$lessonid]['classids']);
-		    foreach ($tanarIds as $i => $tanarId) {
-//			$targyJel = substr($lessonid, 0, $targyJelHossz);
-			$targyJel = $ascTargy[ $ascLesson[$lessonid]['subjectid'] ]['short'].'-'.$lessonid;
-			$teremId = readVariable($classroomids[$i],'numeric unsigned','NULL'); // feltételezzük, hogy a tanárok és termek sorrendje megfelel
-			if (count($osztalyIds) == count($tanarIds)) $osztalyJel = $ascOsztaly[ $osztalyIds[$i] ];
-			else $osztalyJel = $ascOsztaly[ $osztalyIds[0] ];
-			$OrarendiOra[] = array(
-			    $ADAT['orarendiHet'],$day,intval($period),$tanarId,$osztalyJel,$targyJel,$teremId,$ADAT['tolDt'],$ADAT['igDt']
-			);			
-		    }
-		}
-		continue;
-	    }
-//	    $oraszam = intval(substr($jel, 1, 1));
-	    $oraszam = $periodspercard;
-	    if ($oraszam == 0) $oraszam = 1;
-//	    if ($oraszam != $periodspercard) $_SESSION['alert'][] = "message:wrong_data:Óraszám=$oraszam - periodspercard=$periodspercard";
-	    $tankorIds = explode('_', $ids);
-//	    $targyJel = $ascLesson[$lessonid]['subjectid'];
-	    $targyJel = substr($lessonid, 0, $targyJelHossz);
-	    for ($i = 0; $i < count($tankorIds); $i++) {
-
-		$tankorId = $tankorIds[$i];
-		$tanarId = readVariable($mayorTankor[$tankorId]['tanar'][0], 'numeric unsigned', null);
-		list($index) = array_keys($tanarIds, $tanarId);
-		$osztalyId = readVariable($mayorTankor[$tankorId]['osztaly'][0], 'numeric unsigned', null);
-		$teremId = readVariable($classroomids[$index],'numeric unsigned','NULL'); // feltételezzük, hogy a tankor-ök és termek sorrendje megfelel
-		for ($j = 0; $j < $oraszam; $j++) {
-		    if (isset($tanarId) && isset($osztalyId)) {
-			$OrarendiOra[] = array(
-			    $ADAT['orarendiHet'],$day,intval($period+$j),$tanarId,$osztalyId,$targyJel,$teremId,$ADAT['tolDt'],$ADAT['igDt']
-			);
-		    }  else {
-			$_SESSION['alert'][] = "message:wrong_data:Hiányzótanár vagy osztály:lessonid=$lessonid; day=$day; period=$period; tanarId=$tanarId; osztalyId=$osztalyId";
-		    }
-		}
-	    }
-
-	}
-
-	return $return;
-
-    }
-
-
-?>
diff --git a/mayor-orig/www/include/modules/naplo/orarend/convert-csv.php b/mayor-orig/www/include/modules/naplo/orarend/convert-csv.php
deleted file mode 100644
index 511e3ee4..00000000
--- a/mayor-orig/www/include/modules/naplo/orarend/convert-csv.php
+++ /dev/null
@@ -1,79 +0,0 @@
- __TANEV, 'result' => 'assoc'));
-	foreach ($Tanarok as $tanarId => $tanarAdat) $Tanar[ $tanarAdat['tanarNev'] ] = $tanarId;
-
-	$fp = fopen($ADAT['fileName'], 'r');
-	if (!$fp) return false;
-
-	// Az első sor a napok neveit tartalmazza
-	$Napok = explode('	', chop(fgets($fp, 1024)));
-	for ($i = 0; $i < count($Napok); $i++)
-	    if ($Napok[$i] == 'Hétfő') $Napok[$i] = 1;
-	    elseif ($Napok[$i] == 'Kedd') $Napok[$i] = 2;
-	    elseif ($Napok[$i] == 'Szerda') $Napok[$i] = 3;
-	    elseif ($Napok[$i] == 'Csütörtök') $Napok[$i] = 4;
-	    elseif ($Napok[$i] == 'Péntek') $Napok[$i] = 5;
-	    elseif ($Napok[$i] == 'Szombat') $Napok[$i] = 6;
-	    elseif ($Napok[$i] == 'Vasárnap') $Napok[$i] = 7;
-	// A második sor az adott napon belöli óraszámot adja
-	$oraszamok = explode('	', chop(fgets($fp, 1024)));
-	$return = true;
-	while ($sor = fgets($fp, 1024)) {
-
-	    // Két sor egy tanár órarendjét tartalmazza
-	    $S1 = explode('	', chop($sor));
-	    $S2 = explode('	', chop(fgets($fp, 1024)));
-	    // Az első sor első mezője a tanár neve
-	    if ($Tanar[ $S1[0] ] != '') {
-		$tanar = $Tanar[ $S1[0] ];
-	    } else {
-		$_SESSION['alert'][] = 'message:wrong_data:tanarNev='.$S1[0]; // hiányzó vagy hibás tanárnév esetén nem tudjuk betölteni az órarendet
-		$return = false;
-		$tanar = $S1[0] . ' / ' . $Tanar[ $S1[0] ];
-	    }
-	    // A második cellátol jönnek az órák - első sor a tárgy, második az osztály
-	    for ($i = 1; $i < count($S1); $i++) {
-		if ($Napok[$i] != 0) $nap = $Napok[$i];
-		if ($S1[$i] != '') {
-
-		    $ora = $oraszamok[$i];
-		    $targy = $S1[$i];
-		    $osztaly = $S2[$i];
-
-		    $OrarendiOra[] = array(
-			$ADAT['orarendiHet'],$nap,$ora,$tanar,$osztaly,$targy,$ADAT['tolDt'],$ADAT['igDt']
-		    );
-
-		}
-
-	    }
-
-	}
-
-	fclose($fp);
-	return $return;
-
-    }
-
-?>
diff --git a/mayor-orig/www/include/modules/naplo/orarend/convert-default.php b/mayor-orig/www/include/modules/naplo/orarend/convert-default.php
deleted file mode 100644
index a78939df..00000000
--- a/mayor-orig/www/include/modules/naplo/orarend/convert-default.php
+++ /dev/null
@@ -1,33 +0,0 @@
-
diff --git "a/mayor-orig/www/include/modules/naplo/orarend/convert-eKr\303\251ta import.php" "b/mayor-orig/www/include/modules/naplo/orarend/convert-eKr\303\251ta import.php"
deleted file mode 100644
index cac44633..00000000
--- "a/mayor-orig/www/include/modules/naplo/orarend/convert-eKr\303\251ta import.php"	
+++ /dev/null
@@ -1,128 +0,0 @@
- 1, ..., vasárnap --> 7 alakra
-	4. Óra (az adott napon belül)	- pozitív egész szám			- --> ora
-	5. Osztály			- az osztály jele vagy üres		- --> osztalyJel (első része)
-	6. Csoport			- a csoport jele a Krétában		- --> osztalyJel (második része)
-	7. Tantárgy			- a tárgy hivatalos neve		- --> targyJel
-	8. Tanár			- a tanár neve				- konvertáljuk tanarId-vé
-	9. Helyiség			- terem száma/neve			- konvertáljuk teremId-vé
-	0. -- üres --			- üres oszlop				- eldobjuk
-	1. Szabad			- üres oszlop				- eldobjuk
-    */
-
-    require_once('include/modules/naplo/share/tanar.php');
-
-    $vanErvenyesseg = false;
-
-    function terem2teremId($terem) { // -- TODO kretaNev
-	if ($terem == 'könyvtár') return 12;
-	else if ($terem == 'fonotéka') return 13;
-	else if ($terem == 'studió') return 14;
-	else if ($terem == 'tornaterem 1.') return 26;
-	else if ($terem == 'tornaterem 2.') return 27;
-	else if ($terem == 'konditerem') return 29;
-	else if ($terem == 'szuterén') return 401;
-	else if ($terem == 'klub') return 402;
-	else if ($terem == 'díszterem') return 601;
-	else return intval($terem);
-    }
-
-    function loadFile($ADAT) {
-
-        global $OrarendiOra;
-
-        $OrarendiOra = array();
-
-	$Napok = array('hétfő'=>1, 'kedd'=>2, 'szerda'=>3, 'csütörtök'=>4, 'péntek'=>5, 'szombat'=>6, 'vasárnap'=>7);
-        $Tanarok = getTanarok(array('tanev' => __TANEV, 'result' => 'assoc', 'extraAttrs' => 'kretaNev'));
-
-        foreach ($Tanarok as $tanarId => $tanarAdat) {
-	    if ($tanarAdat['tanarNev']!='') $Tanar[ $tanarAdat['tanarNev'] ] = $tanarId;
-	    if ($tanarAdat['kretaNev']!='') $Tanar[ $tanarAdat['kretaNev'] ] = $tanarId;
-	}
-	/* VMG további HACK!!! --TODO */
-	$Tanar['Pintér László (1961. 03. 14.)'] = $Tanar['Pintér László'];
-	$Tanar['Pintér László (1975. 02. 25.)'] = $Tanar['Pintér László Sp'];
-	$Tanar['Balkayné Kalló Ágnes Zsófia'] = $Tanar['Balkayné Kalló Ágnes'];
-	$Tanar['Füredi-Szabó Tünde Erzsébet'] = $Tanar['Füredi-Szabó Tünde'];
-	$Tanar['Jäger Csaba Miklós'] = $Tanar['Jäger Csaba'];
-	$Tanar['dr Bándi Irisz Réka'] = $Tanar['Dr. Bándi Írisz Réka'];
-	$Tanar['Nagyné Hodula Andrea Éva'] = $Tanar['Nagyné Hodula Andrea'];
-	$Tanar['Gondi Ferenc Lászlóné'] = $Tanar['Gondi Ferencné'];
-	$Tanar['dr Jánossyné dr Solt Anna Mária'] = $Tanar['Dr Jánossyné Dr. Solt Anna'];
-	$Tanar['Mészárosné Romhányi Margit Mária'] = $Tanar['Mészárosné Romhányi Margit'];
-	$Tanar['Jenes Béla Tibor'] = $Tanar['Jenes Béla'];
-	$Tanar['Csapody Barbara Mária'] = $Tanar['Csapody Barbara'];
-	$Tanar['dr Szabóné Karácsonyi Virág'] = $Tanar['dr. Szabóné Karácsonyi Virág'];
-	$Tanar['dr Kas Géza Imre'] = $Tanar['Dr. Kas Géza Imre'];
-	
-
-        $fp = fopen($ADAT['fileName'], 'r');
-        if (!$fp) return false;
-
-	// Az első  mezőneveket tartalmaz - eldobjuk
-	$sor = fgets($fp, 1024);
-	$ok = true; $OrarendiOra = array();
-	// Az adatsorok feldolgozása
-	$kulcs2index = $kulcsDb = array();
-	while ($sor = fgets($fp, 1024)) {
-
-	    $rec = explode('	', chop($sor));
-	    if (!$vanErvenyesseg) array_unshift($rec, "", "");
-
-	    $nap = $Napok[$rec[3]];
-	    $ora = $rec[4];
-	    if (!isset($Tanar[$rec[8]])) {
-		    $_SESSION['alert'][] = 'message:wrong_data:Hiányzó azonosító (tanár név='.$rec[8].')';
-		    $ok = false;
-	    } else {
-		$tanarId = $Tanar[$rec[8]];
-	    }
-	    $osztalyJel = $rec[5].$rec[6];
-	    $targyJel = $rec[7];
-	    $teremId = terem2teremId($rec[9]); 
-	    $tolDt = $ADAT['tolDt'];
-	    $igDt = $ADAT['igDt'];
-
-	    if ($rec[2] == 'A hét') {
-		$het = 1;
-            	$OrarendiOra[] = array( $het,$nap,$ora,$tanarId,$osztalyJel,$targyJel,$teremId,$tolDt,$igDt );
-	    } elseif ($rec[2] == 'B hét') {
-		$het = 2;
-            	$OrarendiOra[] = array( $het,$nap,$ora,$tanarId,$osztalyJel,$targyJel,$teremId,$tolDt,$igDt );
-	    } elseif ($rec[2] == 'Minden héten') {
-		$het = 1;
-            	$OrarendiOra[] = array( $het,$nap,$ora,$tanarId,$osztalyJel,$targyJel,$teremId,$tolDt,$igDt );
-		$het = 2;
-            	$OrarendiOra[] = array( $het,$nap,$ora,$tanarId,$osztalyJel,$targyJel,$teremId,$tolDt,$igDt );
-	    }
-
-
-	}
-
-	fclose($fp);
-	return $ok;
-
-    }
-
-
-?>
diff --git a/mayor-orig/www/include/modules/naplo/orarend/orarendBetolto.php b/mayor-orig/www/include/modules/naplo/orarend/orarendBetolto.php
deleted file mode 100644
index 4a870b78..00000000
--- a/mayor-orig/www/include/modules/naplo/orarend/orarendBetolto.php
+++ /dev/null
@@ -1,82 +0,0 @@
- 'orarendBetoltes'));
-            db_start_trans($lr);
-	    if ($ADAT['lezaras']) {
-                // tol-ig között töröljük az adott hét órarendi bejegyzéseit
-                $q = "DELETE FROM `%s`.orarendiOra WHERE het=%u AND '%s'<=tolDt AND igDt<='%s'";
-		$v = array($ADAT['tanevDb'], $ADAT['orarendiHet'], $ADAT['tolDt'], $ADAT['igDt']);
-                $ok = $ok && db_query($q, array('fv' => 'orarendBetoltes/közti törlés', 'modul' => 'naplo', 'values' => $v), $lr);
-                // A keresztülnyúlókat ketté kell vágni
-                $q = "INSERT INTO `%s`.orarendiOra
-                        SELECT het,nap,ora,tanarId,osztalyJel,targyJel,teremId,'%s' + INTERVAL 1 DAY AS tolDt,igDt
-                        FROM `%s`.orarendiOra WHERE het=%u AND tolDt<'%s' AND igDt>'%s'";
-		$v = array($ADAT['tanevDb'], $ADAT['igDt'], $ADAT['tanevDb'], $ADAT['orarendiHet'], $ADAT['tolDt'], $ADAT['igDt']);
-                $ok = $ok && db_query($q, array('fv' => 'orarendBetoltes/keresztülnyúló kettévágása', 'modul' => 'naplo', 'values' => $v), $lr);
-                // a "balról" benyúlóakat tolDt-ig levágjuk
-                $q = "UPDATE `%s`.orarendiOra SET igDt='%s' - INTERVAL 1 DAY WHERE tolDt<'%s' AND '%s'<=igDt";
-		$v = array($ADAT['tanevDb'], $ADAT['tolDt'], $ADAT['tolDt'], $ADAT['tolDt']);
-                $ok = $ok && db_query($q, array('fv' => 'orarendBetoltes/balról levág', 'modul' => 'naplo', 'values' => $v), $lr);
-                // a "jobbról" benyúlóakat igDt-től levágjuk
-                $q = "UPDATE `%s`.orarendiOra SET tolDt='%s' + INTERVAL 1 DAY WHERE '%s' 'orarendBetoltes/jobbról levág', 'modul' => 'naplo', 'values' => $v), $lr);
-	    }
-
-            // felvesszük az új bejegyzéseket
-            $v = $V = array();
-            for ($i = 0; $i < count($OrarendiOra); $i++) {
-                if ($OrarendiOra[$i][3] != 'NULL') {
-		    // Nem hibás, de jobb lenne a %s-t csak sztring-ekre hasznáni, a NULL-ra nem...
-		    if ($OrarendiOra[$i][6] == '') $OrarendiOra[$i][6] = 'NULL';
-		    if ($OrarendiOra[$i][6] == 'NULL')
-			$q =  "INSERT INTO `%s`.orarendiOra (het,nap,ora,tanarId,osztalyJel,targyJel,teremId,tolDt,igDt)
-                		    VALUES (%u, %u, %u, %u, '%s', '%s', %s, '%s', '%s')";
-		    else 
-			$q = "INSERT INTO `%s`.orarendiOra (het,nap,ora,tanarId,osztalyJel,targyJel,teremId,tolDt,igDt)
-                		    VALUES (%u, %u, %u, %u, '%s', '%s', %u, '%s', '%s')";
-		    $v = mayor_array_join(array($ADAT['tanevDb']), $OrarendiOra[$i]);
-        	    $ok = $ok && db_query($q, array('fv' => 'orarendBetoltes/orarendiOra beszúrás #'.$i, 'modul' => 'naplo', 'values' => $v), $lr);
-		}
-	    }
-/*
-            $v = $V = array();
-            for ($i = 0; $i < count($OrarendiOra); $i++)
-                if ($OrarendiOra[$i][3] != 'NULL') {
-		    // Nem hibás, de jobb lenne a %s-t csak sztring-ekre hasznáni, a NULL-ra nem...
-		    if ($OrarendiOra[$i][6] == 'NULL') $V[] = "(%u, %u, %u, %u, '%s', '%s', %s, '%s', '%s')";
-		    else $V[] = "(%u, %u, %u, %u, '%s', '%s', %u, '%s', '%s')";
-		    $v = array_merge($v, $OrarendiOra[$i]);
-		}
-            $q = "INSERT INTO `%s`.orarendiOra (het,nap,ora,tanarId,osztalyJel,targyJel,teremId,tolDt,igDt)
-                    VALUES ".implode(',', $V);
-	    array_unshift($v, $ADAT['tanevDb']);
-            $ok = $ok && db_query($q, array('fv' => 'orarendBetoltes/orarendiOra beszúrás', 'modul' => 'naplo', 'values' => $v), $lr);
-*/
-            // orarendiOraTankor tábla feltöltése
-            if (is_array($OrarendiOraTankor) && count($OrarendiOraTankor) > 0) {
-                $v = $V = array();
-                for ($i = 0; $i < count($OrarendiOraTankor); $i++) {
-                    $V[] = "(%u, '%s', '%s', %u)";
-		    $v = mayor_array_join($v, $OrarendiOraTankor[$i]);
-		}
-		array_unshift($v, $ADAT['tanevDb']);
-                $q = "INSERT INTO `%s`.orarendiOraTankor (tanarId, osztalyJel, targyJel, tankorId) VALUES ".implode(',', $V);
-                $ok = $ok && db_query($q, array('fv' => 'orarendBetoltes/orarendiOraTankor beszúrás', 'modul' => 'naplo', 'values' => $v), $lr);
-            }
-
-            if ($ok) {
-                db_commit($lr);
-                $_SESSION['alert'][] = 'info:success';
-            } else {
-                db_rollback($lr);
-            }
-        db_close($lr);
-	return $ok;
-    }
-
-?>
diff --git a/mayor-orig/www/include/modules/naplo/orarend/orarendEllenorzes.php b/mayor-orig/www/include/modules/naplo/orarend/orarendEllenorzes.php
deleted file mode 100644
index 43639165..00000000
--- a/mayor-orig/www/include/modules/naplo/orarend/orarendEllenorzes.php
+++ /dev/null
@@ -1,70 +0,0 @@
- 'checkOrarendiOraTankor', 'modul' => 'naplo', 'result' => 'indexed', 'values' => $v));
-
-    }
-
-    function checkTankorOraszam($ADAT) {
-
-
-	$return = array();
-
-	if (!is_array($ADAT['orarendiHetek']) || count($ADAT['orarendiHetek']) == 0) {
-	    $_SESSION['alert'][] = 'message:wrong_data:checkTankorOraszam:orarendiHetek';
-	    return $return;
-	}
-
-	$tanevDb = tanevDbNev(__INTEZMENY, $ADAT['tanev']);
-	$hetDb = count($ADAT['orarendiHetek']);
-	$q = "SELECT tankorId,COUNT(*)/$hetDb AS hetiOraszam FROM `%s`.orarendiOraTankor 
-		LEFT JOIN `%s`.orarendiOra USING (tanarId,osztalyJel,targyJel) 
-		WHERE tolDt <= '%s' AND '%s' <= igDt GROUP BY tankorId";
-	$v = array($tanevDb, $tanevDb, $ADAT['dt'], $ADAT['dt']);
-	$ret = db_query($q, array('fv' => 'checkTankorOraszam', 'modul' => 'naplo', 'result' => 'assoc', 'keyfield' => 'tankorId', 'values' => $v));
-
-	for ($i = 0; $i < count($ADAT['tankorok']); $i++) {
-
-	    $A = $ADAT['tankorok'][$i]; $tankorId = $A['tankorId'];
-	    if ($A['hetiOraszam'] != $ret[$tankorId]['hetiOraszam']) $return[] = array(
-		'tankorId' => $tankorId,
-		'tankorNev' => $A['tankorNev'],
-		'tankorHetiOraszam' => number_format(floatval($A['hetiOraszam']), 2, ',', ''),
-		'orarendHetiOraszam' => number_format(floatval($ret[$tankorId]['hetiOraszam']), 2, ',', '')
-	    );
-	}
-
-	return $return;
-
-    }
-
-    function checkHianyzoTermek($ADAT) {
-
-	$tanevDb = tanevDbNev(__INTEZMENY, $ADAT['tanev']);
-	$q = "SELECT het,nap,ora,TRIM(CONCAT_WS(' ',viseltNevElotag,viseltCsaladinev,viseltUtonev)) AS tanarNev,osztalyNaplo.osztalyJel,targyJel
-		FROM `%s`.orarendiOra LEFT JOIN ".__INTEZMENYDBNEV.".tanar USING (tanarId)
-		LEFT JOIN `%s`.osztalyNaplo ON osztalyId=orarendiOra.osztalyJel 
-		WHERE teremId IS NULL AND tolDt <= '%s' AND '%s' <= igDt
-		ORDER BY tanarNev, osztalyNaplo.osztalyJel";
-	$v = array($tanevDb, $tanevDb, $ADAT['dt'], $ADAT['dt']);
-	return db_query($q, array('fv' => 'checkHianyzoTermek', 'modul' => 'naplo', 'result' => 'indexed', 'values' => $v));
-
-    }
-
-    function checkTeremUtkozes($ADAT) {
-
-	$q = "SELECT het,nap,ora,teremId,COUNT(*) AS db FROM `%s`.orarendiOra 
-		WHERE teremId IS NOT NULL AND tolDt <= '%s' AND '%s' <= igDt
-		GROUP BY het,nap,ora,teremId HAVING db>1";
-	$v = array(tanevDbNev(__INTEZMENY, $ADAT['tanev']), $ADAT['dt'], $ADAT['dt']);
-	return db_query($q, array('fv' => 'checkTeremUtkozes', 'modul' => 'naplo', 'result' => 'indexed', 'values' => $v));
-
-    }
-
-?>
diff --git a/mayor-orig/www/include/modules/naplo/orarend/orarendModosito.php b/mayor-orig/www/include/modules/naplo/orarend/orarendModosito.php
deleted file mode 100644
index 991eb0c5..00000000
--- a/mayor-orig/www/include/modules/naplo/orarend/orarendModosito.php
+++ /dev/null
@@ -1,309 +0,0 @@
-=dt
-			HAVING nap.dt IS NULL";
-
-            return db_query($q, array('fv' => 'getHibasOrak', 'modul' => 'naplo', 'result' => 'indexed'), $lr);
-    }
-
-    function checkHaladasi($SET = array('tolDt'=>null,'igDt'=>null)) {
-	$q = "SELECT dt,count(*) as db FROM ora WHERE dt BETWEEN '%s' AND '%s' GROUP BY dt";
-	$v = array($SET['tolDt'],$SET['igDt']);
-	return db_query($q, array('fv' => 'checkHaladasi', 'modul' => 'naplo', 'result' => 'assoc','keyfield'=>'dt','values'=>$v));
-    }
-
-   function orarendiOraTankorFelvesz($ADAT) { // ez egy másolata az orarendiOraTankorAssoc() függvénynek...
-
-        $lr = db_connect('naplo');
-/*
-        foreach( array_unique($_POST['ORARENDKULCSOK']) as $_k => $_v) {
-            list($_tanarId,$_osztalyJel,$_targyJel) = explode('%',$_v);
-            $q = "DELETE FROM orarendiOraTankor WHERE tanarId=%u AND osztalyJel='%s' AND targyJel='%s'";
-            $v = array($_tanarId, $_osztalyJel, $_targyJel);
-            db_query($q, array('fv' => 'orarendiOraTankorAssoc', 'modul' => 'naplo', 'values' => $v), $lr);
-        }
-*/
-
-//        for ($i = 0; $i < count($ADAT); $i++) {
-	    $_tanarId = $ADAT['tanarId'];
-	    $_osztalyJel = $ADAT['osztalyJel'];
-	    $_targyJel = $ADAT['targyJel'];
-	    $_tankorId = $ADAT['tankorId'];
-                if (!is_null($_tanarId)) {
-                    // bugfix 152->153. Muszáj kitörölni, mert előtte már lehet hogy egy másik tankörhöz rögzítettük ugyanazt a kulcsot... ????
-                    // ez így persze egy sor felesleges query.
-                    $q = "DELETE FROM orarendiOraTankor WHERE tanarId=%u AND osztalyJel='%s' AND targyJel='%s'";
-                    $v = array($_tanarId, $_osztalyJel, $_targyJel);
-                    $db = db_query($q, array('fv' => 'orarendTankor', 'modul' => 'naplo', 'result' => 'affected rows', 'values' => $v), $lr);
-                    $q = "REPLACE INTO orarendiOraTankor (tanarId,osztalyJel,targyJel,tankorId) VALUES (%u, '%s', '%s', %u)";
-                    $v = array($_tanarId, $_osztalyJel, $_targyJel, $_tankorId);
-                    db_query($q, array('fv' => 'orarendTankor', 'modul' => 'naplo', 'values' => $v), $lr);
-                }
-//        }
-        db_close($lr);
-
-    }
-
-    function orarendiOraTorol($ADAT) {
-
-            //$q = "DELETE FROM orarendiOra WHERE tanarId=%u AND osztalyJel='%s' AND targyJel='%s' AND tolDt='%s'";
-            //$v = array($ADAT['tanarId'], $ADAT['osztalyJel'], $ADAT['targyJel'], $ADAT['tolDt']);
-            $q = "DELETE FROM orarendiOra WHERE het=%u AND nap=%u AND ora=%u AND tanarId=%u AND tolDt='%s'";
-            $v = array($ADAT['het'],$ADAT['nap'], $ADAT['ora'], $ADAT['tanarId'], $ADAT['tolDt']);
-            db_query($q, array('fv' => 'orarendiOraTorol', 'modul' => 'naplo', 'values' => $v), $lr);
-
-    }
-
-    function getFelvehetoBlokk($ADAT) {
-
-	$RET = array();
-	if (count($ADAT['tankorIds']) > 0) {
-	    $q = "SELECT DISTINCT blokkId, blokkNev FROM tankorBlokk LEFT JOIN blokk USING (blokkId) WHERE tankorId IN (".implode(',',$ADAT['tankorIds']).")";
-	    $RET = db_query($q, array('fv'=>'getFelvehetoBlokkok', 'modul' => 'naplo', 'result' => 'indexed'));
-	}
-	return $RET;
-
-    }
-
-    function teremModosit($ADAT) {
-	if ($ADAT['tolDt']=='' || $ADAT['igDt']=='') return false;
-	$ok = true;
-	$lr = db_connect('naplo');
-	db_start_trans($lr);
-
-	if (is_null($ADAT['teremId'])) {
-	    $v = array($ADAT['het'], $ADAT['nap'], $ADAT['ora'], $ADAT['tanarId'], $ADAT['tolDt'], $ADAT['igDt']);
-	    $q = "UPDATE orarendiOra SET teremId = NULL WHERE het=%u AND nap=%u AND ora=%u AND tanarId=%u AND tolDt<='%s' AND '%s'<=igDt";
-	    $r = db_query($q, array('fv'=>'teremModosit', 'modul' => 'naplo', 'values' => $v, 'rollback' => true), $lr);
-	} else {
-
-	// Ellenőrizzük hogy foglalt-e...
-	    $v = array($ADAT['het'], $ADAT['nap'], $ADAT['ora'], $ADAT['teremId'], $ADAT['tolDt'], $ADAT['igDt']);
-	    $q = "SELECT * FROM orarendiOra WHERE het=%u AND nap=%u AND ora=%u AND teremId=%u AND tolDt<='%s' AND '%s'<=igDt";
-	    $r = db_query($q, array('fv'=>'teremModosit', 'modul' => 'naplo', 'result' => 'indexed', 'values' => $v, 'rollback' => true), $lr);
-	    if (count($r)>0) {
-        	// ez a terem foglalt ... mi legyen?
-		$_SESSION['alert'][] = 'info:nem_szabadTerem:'.$ADAT['teremId'];
-		db_rollback($lr); db_close($lr);
-		return false;
-	    }
-	// Van ilyen bejegyzés???
-	    $v = array($ADAT['het'], $ADAT['nap'], $ADAT['ora'], $ADAT['tanarId'], $ADAT['igDt'], $ADAT['tolDt']);
-//	    $q = "SELECT * FROM orarendiOra WHERE het=%u AND nap=%u AND ora=%u AND tanarId=%u AND tolDt<='%s' AND '%s'<=igDt";
-	    $q = "SELECT * FROM orarendiOra WHERE het=%u AND nap=%u AND ora=%u AND tanarId=%u";
-	    $ret = db_query($q, array('fv'=>'teremModosit', 'modul' => 'naplo', 'result' => 'indexed', 'values' => $v, 'rollback' => true), $lr);
-	    if ($ret===false) { $_SESSION['alert'][] = 'info:nincs_bejegyzes:'; db_rollback($lr); db_close($lr); return false; } 
-	// - -- --- ---- -----
-	    for ($i=0; $i'teremModosit','modul'=>'naplo','values'=>$v, 'rollback'=>true), $lr);
-		    if ($r===false) $ok=false;
-		}
-	    }
-	}
-
-	if ($ok) db_commit($lr); else db_rollback($lr);
-	db_close($lr);
-
-
-    }
-
-    function pluszBlokkFelvesz($ADAT) {
-
-	$lr = db_connect('naplo');
-	db_start_trans($lr);
-
-	$TANKORIDK = getTankorokByBlokkId(array($ADAT['blokkId']));
-	for ($i=0; $i $ADAT['tolDt'], 'igDt' => $ADAT['igDt']));
-	    $A['tanarId'] = $A['tanarIdk'][0]['tanarId']; // az elsőt vegyük alapul ha több van
-	    if ($A['tanarId']>0) {
-		$ok = pluszOraFelvesz($A, $lr);
-		dump($A);
-	    }else{
-		$_SESSION['alert'][]= 'info:ennek a tankörnek nincs ('.serialize($A['tankorId']).') tanára az adott intervallumban';
-	    }
-	    if ($ok === false) break;
-	}
-
-	if ($ok) db_commit($lr); else db_rollback($lr);
-	db_close($lr);
-
-    }
-
-
-
-    function pluszOraFelvesz($ADAT, $olr='') {
-
-	if ($ADAT['tolDt']=='' || $ADAT['igDt']=='') return false;
-
-	// kell egyáltalán ellenőrizni az ütközéseket?
-	// Ha a felveendő órán nem kötelező a jelenlét, nem érdekel minket az egész!
-	$TA = getTankorAdat($ADAT['tankorId']);
-
-	$ok = true;
-	if ($olr=='') {
-	    $lr = db_connect('naplo');
-	    db_start_trans($lr);
-	} else {
-	    $lr = $olr;
-	}
-
-	// Csak akkor ellenőrizzük, ha tényleg kell - persze értelmetlen állapot is előidézhető így...
-	if ($TA[$ADAT['tankorId']][0]['jelenlet'] != 'nem kötelező') {
-	    // ütközések ellenőrzése
-	    // az adott tanárnak lett-e közben azon a helyen órája?
-
-	    // -- tanarLukasOrajae();
-
-	    // a diákok ütköznek-e? (jelenlét és felmentés vizsgálata
-	    $DIAKOK = getTankorDiakjaiByInterval($ADAT['tankorId'], __TANEV, $ADAT['tolDt'], $ADAT['igDt'], $lr);
-	    for ($i=0; $i'pluszOraFelvesz-check','modul'=>'naplo', 'result'=>'indexed', 'values'=> $v), $lr);
-		    for ($n=0; $n='%s' or tankorDiak.kiDt IS NULL))
-				LEFT JOIN ".__INTEZMENYDBNEV.".tankorDiakFelmentes ON (tankorDiakFelmentes.felmentesTipus='óralátogatás alól' AND orarendiOraTankor.tankorId = tankorDiak.tankorId AND tankorDiakFelmentes.diakId=%u AND tankorDiakFelmentes.beDt<='%s' AND (tankorDiakFelmentes.kiDt>='%s' or tankorDiakFelmentes.kiDt IS NULL))
-				LEFT JOIN ".__INTEZMENYDBNEV.".tankorTipus USING (tankorTipusId)
-				WHERE tankorTipus.jelenlet='kötelező' AND tolDt<='%s' AND igDt>='%s' AND orarendiOra.het=%u AND orarendiOra.nap=%u AND orarendiOra.ora=%u 
-				AND tankorDiak.tankorId IS NOT NULL AND tankorDiakFelmentes.tankorId IS NULL";
-			$v = array($_diakId,$dt,$dt, $_diakId, $dt, $dt,$dt,$dt,$ADAT['het'],$ADAT['nap'],$ADAT['ora']);
-			$UTKOZIK = db_query($q, array('fv'=>'pluszOraFelvesz-pre','modul'=>'naplo','result'=>'indexed', 'values'=> $v), $lr);
-			// és jelezzük a hibát!
-			// megj: ennél azért szofisztikáltabb is lehetne a hibajelentő függvény...
-			if (count($UTKOZIK)>0) {
-                    	    // sajnos ütközés van, nem vehetjük fel:
-			    $ok = false;
-			    if (is_null($_DA[$_diakId])) {
-				$_DA[$_diakId] = getDiakAdatById($_diakId,null,$lr); // csak akkor, ha le kell kérdezni
-				$db_utkozes++;
-			    }
-			    $_U = array();
-                            for ($u=0; $u'pluszOraFelvesz','modul'=>'naplo','result'=>'record', 'values'=> array($ADAT['tanarId'],$ADAT['tankorId'])), $lr);
-	    if ($record===false || $record['targyJel']=='' || $record['osztalyJel']=='') {
-		$record=array(); // reset
-		$record['targyJel'] = 'm-'.$ADAT['tankorId'];
-		$record['osztalyJel'] = 'm-'.$ADAT['tanarId'];
-		$q = "REPLACE INTO orarendiOraTankor (tanarId,osztalyJel,targyJel,tankorId) VALUES (%u,'%s','%s',%u)";
-		$r = db_query($q, array('fv'=>'pluszOraFelvesz/b','modul'=>'naplo','values'=> array($ADAT['tanarId'],$record['osztalyJel'],$record['targyJel'],$ADAT['tankorId'])), $lr);
-		if ($r===false) $ok = false;
-	    } // különben van megfelelő bejegyzésünk
-	    if ($ADAT['teremId']=='') $ADAT['teremId'] = "null";
-	    else $ADAT['teremId'] = intval($ADAT['teremId']);
-	    if ($ok===true) {
-		// Nem hibás, de jobb lenne a %s-t csak sztring-ekre használni, NULL-t valahogy másképp kezelni.
-		$q = "INSERT INTO orarendiOra (het,nap,ora,tanarId,osztalyJel,targyJel,teremId,tolDt,igDt) VALUES (%u,%u,%u,%u,'%s','%s',%s,'%s','%s')";
-		$v = array($ADAT['het'],$ADAT['nap'],$ADAT['ora'],$ADAT['tanarId'],$record['osztalyJel'],$record['targyJel'],$ADAT['teremId'],$ADAT['tolDt'],$ADAT['igDt']);
-		$r = db_query($q, array('fv'=>'pluszOraFelvesz/c','modul'=>'naplo','values'=>$v), $lr);
-		if ($r===false) $ok = false;
-	    }
-	    if ($ok===true && $ADAT['haladasiModositando']!=0) {
-		// ciklus $ADAT['tolDt'],$ADAT['igDt'] között, órarend
-		$q = "SELECT DISTINCT dt,count(ora.oraId) AS db FROM nap LEFT JOIN ora USING (dt) WHERE nap.tipus='tanítási nap' AND orarendiHet=%u AND dt>='%s' AND dt<='%s' AND (WEEKDAY(dt)+1)=%u GROUP BY dt HAVING db>0 ORDER BY dt";
-		$v = array($ADAT['het'],$ADAT['tolDt'],$ADAT['igDt'],$ADAT['nap']);
-		$NAP = db_query($q, array('fv'=>'pluszOraFelvesz/ora','modul'=>'naplo','values'=>$v,'result'=>'indexed'), $lr);
-		for ($i=0; $i$_dt,
-                            'ora'=>$ADAT['ora'],
-                            'ki'=> $ADAT['tanarId'],
-                            'tipus'=>'normál',
-			    'tankorId'=>$ADAT['tankorId'],
-                            'eredet'=>'órarend',
-                            'leiras'=>'',
-                            'feladatTipusId'=>null,
-                            'munkaido'=>'lekötött'),
-        	    $lr); // az ütközést nem kezeljük külön. Ha van, akkor is tovább mehetünk
-		}
-	    }
-	} else {
-    	    if (is_array($_RESZLET) && count($_RESZLET)>0)
-		$_SESSION['alert'][] = 'info:utkozes:'.$db_utkozes.':'.$ADAT['het'].':'.$ADAT['nap'].':'.$ADAT['ora'].':'.implode(' *** ',$_RESZLET);
-	}
-	if ($olr=='') {
-	    if ($ok) db_commit($lr); else db_rollback($lr);
-	    db_close($lr);
-	} else {
-	    return $ok;
-	}
-    }
-
-    function orarendiOraLezar($ADAT) {
-
-	$lr = db_connect('naplo', array('fv' => 'orarendiOraLezar'));
-	db_start_trans($lr);
-
-	    // Az érintett órarendi bejegyzés lekérdezése
-	    $v = array($ADAT['het'], $ADAT['nap'], $ADAT['ora'], $ADAT['tanarId'], $ADAT['dt'], $ADAT['dt'], $ADAT['kulcsTolDt']);
-	    $q = "SELECT * FROM orarendiOra WHERE het=%u AND nap=%u AND ora=%u AND tanarId=%u AND tolDt<='%s' AND '%s'<=igDt AND tolDt='%s'";
-	    $ret = db_query($q, array('fv'=>'orarendiOraLezar', 'modul' => 'naplo', 'result' => 'record', 'values' => $v, 'rollback' => true), $lr);
-	    if ($ret===false) { db_close($lr); return false; } 
-	    if (count($ret)>0 && $ret['teremId'] == '') $ret['teremId'] = 'NULL';	    
-
-	    // Az érintett bejegyzés törlése
-	    $q = "DELETE FROM orarendiOra WHERE het=%u AND nap=%u AND ora=%u AND tanarId=%u AND tolDt<='%s' AND '%s'<=igDt AND tolDt='%s'";
-	    $r = db_query($q, array('fv'=>'orarendiOraLezar', 'modul' => 'naplo', 'values' => $v, 'rollback' => true), $lr);
-	    if ($r===false) { db_close($lr); return false; }
-
-	    // A bejegyzés tolDt előtti részének visszarakása - ha van egyáltalán
-	    if (strtotime($ret['tolDt']) < strtotime($ADAT['tolDt'])) {
-		$igDt = date('Y-m-d', strtotime('-1 day', strtotime($ADAT['tolDt'])));
-		$q = "INSERT INTO orarendiOra (het,nap,ora,tanarId,osztalyJel,targyJel,teremId,tolDt,igDt) VALUES
-		(".$ret['het'].",".$ret['nap'].",".$ret['ora'].",".$ret['tanarId'].",
-		'".$ret['osztalyJel']."','".$ret['targyJel']."',".$ret['teremId'].",'".$ret['tolDt']."','".$igDt."')";
-		$r = db_query($q, array('fv'=>'orarendiOraLezar', 'modul' => 'naplo', 'rollback' => true), $lr);
-		if (!$r) { db_close($lr); return false; }
-	    }
-
-	    // A bejegyzés igDt utáni részének visszarakása - itt esetleg lehet ütközés!
-	    if (strtotime($ret['igDt']) > strtotime($ADAT['igDt'])) {
-		$tolDt = date('Y-m-d', strtotime('+1 day', strtotime($ADAT['igDt'])));
-		$q = "INSERT INTO orarendiOra (het,nap,ora,tanarId,osztalyJel,targyJel,teremId,tolDt,igDt) VALUES
-		(".$ret['het'].",".$ret['nap'].",".$ret['ora'].",".$ret['tanarId'].",
-		'".$ret['osztalyJel']."','".$ret['targyJel']."',".$ret['teremId'].",'".$tolDt."','".$ret['igDt']."')";
-		$r = db_query($q, array('fv'=>'orarendiOraLezar', 'modul' => 'naplo', 'rollback' => true), $lr);
-		if (!$r) { db_close($lr); return false; }
-	    }
-
-	db_commit($lr);
-	db_close($lr);
-	return true;
-
-    }
-
-?>
diff --git a/mayor-orig/www/include/modules/naplo/orarend/orarendTankor.php b/mayor-orig/www/include/modules/naplo/orarend/orarendTankor.php
deleted file mode 100644
index 212dbb07..00000000
--- a/mayor-orig/www/include/modules/naplo/orarend/orarendTankor.php
+++ /dev/null
@@ -1,33 +0,0 @@
- $_v) {
-            list($_tanarId,$_osztalyJel,$_targyJel) = explode('%',$_v);
-            $q = "DELETE FROM orarendiOraTankor WHERE tanarId=%u AND osztalyJel='%s' AND targyJel='%s'";
-	    $v = array($_tanarId, $_osztalyJel, $_targyJel);
-            db_query($q, array('fv' => 'orarendiOraTankorAssoc', 'modul' => 'naplo', 'values' => $v), $lr);
-        }
-
-        for ($i = 0; $i < count($_POST['ORARENDKEY']); $i++) {
-            if ($_POST['ORARENDKEY'][$i]!='') {
-                list($_tanarId,$_osztalyJel,$_targyJel,$_tankorId) = explode('%',$_POST['ORARENDKEY'][$i]);
-                if (!is_null($_tanarId)) {
-                    // bugfix 152->153. Muszáj kitörölni, mert előtte már lehet hogy egy másik tankörhöz rögzítettük ugyanazt a kulcsot... ????
-                    // ez így persze egy sor felesleges query.
-                    $q = "DELETE FROM orarendiOraTankor WHERE tanarId=%u AND osztalyJel='%s' AND targyJel='%s'";
-		    $v = array($_tanarId, $_osztalyJel, $_targyJel);
-                    $db = db_query($q, array('fv' => 'orarendTankor', 'modul' => 'naplo', 'result' => 'affected rows', 'values' => $v), $lr);
-                    $q = "REPLACE INTO orarendiOraTankor (tanarId,osztalyJel,targyJel,tankorId) VALUES (%u, '%s', '%s', %u)";
-		    $v = array($_tanarId, $_osztalyJel, $_targyJel, $_tankorId);
-                    db_query($q, array('fv' => 'orarendTankor', 'modul' => 'naplo', 'values' => $v), $lr);
-                }
-            }
-        }
-        db_close($lr);
-
-    }
-
-?>
diff --git a/mayor-orig/www/include/modules/naplo/orarend/orarendTeremModositas.php b/mayor-orig/www/include/modules/naplo/orarend/orarendTeremModositas.php
deleted file mode 100644
index 62a2de0c..00000000
--- a/mayor-orig/www/include/modules/naplo/orarend/orarendTeremModositas.php
+++ /dev/null
@@ -1,3 +0,0 @@
-
diff --git a/mayor-orig/www/include/modules/naplo/orarend/tanarOrarend.php b/mayor-orig/www/include/modules/naplo/orarend/tanarOrarend.php
deleted file mode 100644
index b008e880..00000000
--- a/mayor-orig/www/include/modules/naplo/orarend/tanarOrarend.php
+++ /dev/null
@@ -1,222 +0,0 @@
-='%s' AND het=%u ORDER BY nap,ora";
-	$v = array($felev, $dt, $dt, $orarendiHet);
-	$A = db_query($q, array('fv' => 'getTanarOrarend', 'modul' => 'naplo', 'result' => 'multiassoc', 'keyfield' => 'tanarId', 'values' => $v ));
-
-	if (is_array($A)) foreach ($A as $tanarId => $tOrak) {
-	    for ($i = 0; $i < count($tOrak); $i++) {
-		$nap = $tOrak[$i]['nap'];
-		$ora = $tOrak[$i]['ora'];
-		$ret[$tanarId][$nap][$ora] = $tOrak[$i];
-	    }
-	}
-	return $ret;
-
-    }
-
-    // Ezzel a fügvénnyel jó Excelben, de nem jó OpenOffice-ban
-    function OrarendFileGeneralasXLS($Tanarok, $Orak) {
-
-	$fp = fopen(_TANARORARENDFILE.'.xls', 'w');
-	if (!$fp) {
-	    $_SESSION['alert'][] = 'message:wrong_data:OrarendFileGeneralas:file:'._TANARORARENDFILE;
-	    return false;
-	}
-
-	$napiMinOra = getMinOra();
-	$napiMaxOra = getMaxOra();
-
-	fputs($fp, ''."\r\n");
-	fputs($fp, ''."\r\n");
-	fputs($fp, ''."\r\n");
-	fputs($fp, ''."\r\n");
-
-        for ($i = 0; $i < count($Tanarok); $i++) {
-
-            $tanarId = $Tanarok[$i]['tanarId'];
-            $tanarNev = $Tanarok[$i]['tanarNev'];
-
-            $sor = "  \r\n    $tanarNev\r\n";
-            for ($nap = 1; $nap < 6; $nap++) {
-                for ($ora = $napiMinOra; $ora <= $napiMaxOra; $ora++) {
-                    $Ora = $Orak[$tanarId][$nap][$ora];
-                    $sor .= '    '.$Ora['osztalyJel']." ".$Ora['targyJel'].''."\r\n";
-                }
-            }
-            $sor .= "    $tanarNev\r\n  \r\n";
-
-	    fputs($fp, $sor);
-        }
-
-	fputs($fp, '
'."\r\n");
-	fputs($fp, ''."\r\n");
-	fputs($fp, ''."\r\n");
-	
-	fclose($fp);
-	return true;
-
-    }
-
-
-    // Ha ezt rakom be, akkor OpenOffice-szal jó, Excellel csak akkor, ha előbb lementem
-    function OrarendFileGeneralasCSV($Tanarok, $Orak) {
-
-	$fp = fopen(_TANARORARENDFILE.'.csv', 'w');
-	if (!$fp) {
-	    $_SESSION['alert'][] = 'message:wrong_data:OrarendFileGeneralas:file:'._TANARORARENDFILE;
-	    return false;
-	}
-	$napiMaxOra = getMaxOra();
-	$napiMinOra = getMinOra();
-
-	$sor = "Tanár";
-        for ($nap = 1; $nap < 6; $nap++) {
-            for ($ora = $napiMinOra; $ora <= $napiMaxOra; $ora++) {
-		$sor .= ";$nap./$ora.";
-	    }
-	}
-	$sor .= ";Tanár\n";
-	fputs($fp, $sor);
-
-        for ($i = 0; $i < count($Tanarok); $i++) {
-
-            $tanarId = $Tanarok[$i]['tanarId'];
-            $tanarNev = $Tanarok[$i]['tanarNev'];
-
-            $sor = "$tanarNev;";
-            for ($nap = 1; $nap < 6; $nap++) {
-                for ($ora = $napiMinOra; $ora <= $napiMaxOra; $ora++) {
-                    $Ora = $Orak[$tanarId][$nap][$ora];
-                    $sor .= $Ora['tankorNev']." ".$Ora['tankorId'].';';
-//                    $sor .= $Ora['osztalyJel']." ".$Ora['targyJel'].';';
-                }
-            }
-            $sor .= "$tanarNev\n";
-
-	    fputs($fp, $sor);
-        }
-
-	fclose($fp);
-	return true;
-
-    }
-
-    // Ha ezt rakom be, akkor OpenOffice-szal jó, Excellel csak akkor, ha előbb lementem
-    function OrarendFileGeneralasTXT($Tanarok, $Orak) {
-
-	$fp = fopen(_TANARORARENDFILE.'.txt', 'w');
-	if (!$fp) {
-	    $_SESSION['alert'][] = 'message:wrong_data:OrarendFileGeneralas:file:'._TANARORARENDFILE;
-	    return false;
-	}
-	$napiMaxOra = getMaxOra();
-	$napiMinOra = getMinOra();
-
-	$sor = "Tanár";
-        for ($nap = 1; $nap < 6; $nap++) {
-            for ($ora = $napiMinOra; $ora <= $napiMaxOra; $ora++) {
-		$sor .= "	$nap./$ora.";
-	    }
-	}
-	$sor .= "	Tanár\n";
-	fputs($fp, $sor);
-
-        for ($i = 0; $i < count($Tanarok); $i++) {
-
-            $tanarId = $Tanarok[$i]['tanarId'];
-            $tanarNev = $Tanarok[$i]['tanarNev'];
-
-            $sor = "$tanarNev	";
-            for ($nap = 1; $nap < 6; $nap++) {
-                for ($ora = $napiMinOra; $ora <= $napiMaxOra; $ora++) {
-                    $Ora = $Orak[$tanarId][$nap][$ora];
-                    $sor .= $Ora['tankorNev']." ".$Ora['tankorId'].'	';
-//                    $sor .= $Ora['osztalyJel']." ".$Ora['targyJel'].'	';
-                }
-            }
-            $sor .= "$tanarNev\n";
-
-	    fputs($fp, $sor);
-        }
-
-	fclose($fp);
-	return true;
-
-    }
-
-
-    function OrarendFileGeneralasHTML($Tanarok, $Orak) {
-
-	$fp = fopen(_TANARORARENDFILE.'.html', 'w');
-	if (!$fp) {
-	    $_SESSION['alert'][] = 'message:wrong_data:OrarendFileGeneralas:file:'._TANARORARENDFILE;
-	    return false;
-	}
-	$napiMaxOra = getMaxOra();
-	$napiMinOra = getMinOra();
-
-	fputs($fp, '
-
-
-
-
-    
-    Tanár órarend
-    
-
-
-');
-
-        fputs($fp,''."\n");
-
-	$sor = "";
-        for ($nap = 1; $nap < 6; $nap++) {
-            for ($ora = $napiMinOra; $ora <= $napiMaxOra; $ora++) {
-		$sor .= "";
-	    }
-	}
-	$sor .= "\n";
-	fputs($fp, $sor);
-
-        for ($i = 0; $i < count($Tanarok); $i++) {
-
-            fputs($fp, ''."\n");
-
-            $tanarId = $Tanarok[$i]['tanarId'];
-            $tanarNev = $Tanarok[$i]['tanarNev'];
-            fputs($fp, ''."\n");
-            for ($nap = 1; $nap < 6; $nap++) {
-                for ($ora = $napiMinOra; $ora <= $napiMaxOra; $ora++) {
-                    $Ora = $Orak[$tanarId][$nap][$ora];
-                    $sor = ''."\n";
-                    fputs($fp, $sor);
-                }
-            }
-            fputs($fp, ''."\n");
-            fputs($fp, ''."\n");
-        }
-        fputs($fp, '
Tanár$nap./$ora.Tanár
'.$tanarNev.''.$Ora['tankorNev']." ".$Ora['tankorId'].' - '.$Ora['teremId'].''.$tanarNev.'
'."\n");
-
-	fclose($fp);
-	return true;
-
-    }
-
-
-?>
diff --git a/mayor-orig/www/include/modules/naplo/osztalyozo/bizonyitvany.php b/mayor-orig/www/include/modules/naplo/osztalyozo/bizonyitvany.php
deleted file mode 100644
index 1df529a4..00000000
--- a/mayor-orig/www/include/modules/naplo/osztalyozo/bizonyitvany.php
+++ /dev/null
@@ -1,134 +0,0 @@
- 'getDiakBizonyitvany', 'modul' => 'naplo_intezmeny', 'result' => 'indexed', 'values' => array($diakId)));
-	    $ret = array('tanevek' => array(), 'szemeszterek' => array(), 'tanevSzemeszterei' => array(), 'jegyek' => array());
-	    if (is_array($ret)) foreach ($r as $i => $jegy) {
-		$ret['jegyek'][$jegy['targyId']][$jegy['tanev']][$jegy['szemeszter']][] = $jegy;
-		$ret['jegyekEvfolyamonkent'][$jegy['evfolyam']][$jegy['szemeszter']][] = $jegy;
-		if (!in_array($jegy['tanev'], $ret['tanevek'])) {
-		    $ret['tanevek'][] = $jegy['tanev'];
-		    $ret['tanevSzemeszterei'][$jegy['tanev']] = array();
-		}
-		if (!in_array($jegy['szemeszter'], $ret['tanevSzemeszterei'][$jegy['tanev']])) {
-		    $ret['szemeszterek'][] = array('tanev' => $jegy['tanev'], 'szemeszter' => $jegy['szemeszter']);
-		    $ret['tanevSzemeszterei'][$jegy['tanev']][] = $jegy['szemeszter'];
-		}
-	    }
-	} else {
-	    // Adott szemeszter tárgyainak
-	    $ret['targyak'] = getTargyakByDiakIds(array($diakId), $ADAT['szemeszterAdat'], $osztalyId, $sorrendNev, array('result' => 'assoc', 'keyfield' => 'targyId'));
-	    // Adott szemeszter zárójegyeinek lekérdezése
-	    if (isset($sorrendNev) && $sorrendNev != '') {
-		$q = "SELECT *,zaroJegy.targyId FROM zaroJegy 
-			    LEFT JOIN targy USING (targyId) 
-			    LEFT JOIN ".__TANEVDBNEV.".targySorszam 
-				ON zaroJegy.targyId = targySorszam.targyId AND osztalyId=%u AND sorrendNev='%s'
-			    LEFT JOIN szemeszter ON kezdesDt=(SELECT MAX(kezdesDt) FROM szemeszter WHERE kezdesDt<=hivatalosDt)
-			WHERE diakId=%u AND tanev=%u AND szemeszter=%u ORDER BY sorszam,targyNev";
-		$v = array($osztalyId, $sorrendNev, $diakId, $tanev, $szemeszter);
-	    } else {
-		$q = "SELECT *,zaroJegy.targyId FROM zaroJegy LEFT JOIN targy USING (targyId)
-			WHERE diakId=%u AND tanev=%u AND szemeszter=%u ORDER BY targyNev";
-		$v = array($diakId, $tanev, $szemeszter);
-	    }
-	    $r = db_query($q,  array(
-		'fv' => 'getDiakBizonyitvany', 'modul' => 'naplo_intezmeny', 'result' => 'indexed', 'values' => $v
-	    ));
-
-	    if (is_array($r)) foreach ($r as $i => $jegy) {
-		$ret['jegyek'][$jegy['targyId']][] = $jegy;
-//		$ret['jegyekEvfolyamonkent'][$jegy['evfolyam']][$jegy['szemeszter']][] = $jegy;
-	    }
-
-	    $utolsoTanitasiNap = getOsztalyUtolsoTanitasiNap($osztalyId);
-	    // éves óraszámok lekérdezése - tárgyanként
-	    $q = "SELECT targyId,oraszam FROM tankorDiak LEFT JOIN tankorSzemeszter USING (tankorId) LEFT JOIN tankor USING (tankorId)
-		    WHERE diakId=%u AND tanev=%u AND beDt<='%s' AND (kiDt IS NULL OR '%s'<=kiDt)";
-	    //$v = array($diakId, $tanev, $ADAT['szemeszterAdat']['zarasDt'], $ADAT['szemeszterAdat']['zarasDt']);
-	    $v = array($diakId, $tanev, $utolsoTanitasiNap, $utolsoTanitasiNap);
-	    $jres = db_query($q, array(
-		'fv' => 'getDiakBizonyitvany/óraszám', 'modul' => 'naplo_intezmeny', 'result' => 'multiassoc', 'keyfield' => 'targyId', 'values' => $v
-	    ));
-
-	    $szDb = $ADAT['szemeszterAdat']['tanevAdat']['maxSzemeszter']; // Feltételezzük, hogy a szemeszterek számozása 1-től indul és folyamatos
-	    foreach ($jres as $targyId => $tAdat) {
-        	$oraszam = 0;
-        	for ($i = 0; $i < count($tAdat); $i++) {
-            	    $oraszam += $tAdat[$i]['oraszam'];
-        	}
-        	$ret['targyOraszam'][$targyId]['hetiOraszam'] = $oraszam / $szDb;
-		/*
-		    A TANITASI_HETEK_SZAMA a diák (egyik) osztályához rendelt munkaterv alapján van meghatározva - így
-		    csak az aktuális tanévben (__TANEV) van értelme. Ha több osztálya is van a tanulónak, akkor problémás...
-		*/
-            	if (defined('TANITASI_HETEK_SZAMA')) $ret['targyOraszam'][$targyId]['evesOraszam'] = $oraszam / $szDb * TANITASI_HETEK_SZAMA;
-	    }
-	}
-	return $ret;
-    }
-
-    function getHianyzasOsszesitesByDiakId($diakId, $szemeszterAdat = '') { // DEPRECATED. a függvény helyett a share/hianyzas.php getDiakHianyzasOsszesites() - t használd!
-
-	$ret = array();
-	if (is_array($szemeszterAdat)) {
-	    // Egy szemeszter hiányzási adatainak lekérdezése
-	    if ($szemeszterAdat['statusz'] == 'aktív') {
-		// Folyó tanév - a tanév adatbázisból kérdezünk le
-    		$Wnemszamit = defWnemszamit();
-		$q = "SELECT tankorTipus.jelleg,
-			    COUNT(IF(tipus='hianyzas' AND statusz='igazolt',1,NULL)) AS igazolt,
-    			    COUNT(IF(tipus='hianyzas' AND statusz='igazolatlan',1,NULL)) AS igazolatlan,
-    			    SUM(IF(tipus='késés' AND statusz='igazolatlan',perc,NULL)) AS kesesPercOsszeg
-			FROM `%s`.hianyzas " .
-			$Wnemszamit['join'] .
-			"WHERE (
-    			    tipus = 'hiányzás' OR (tipus='késés' AND statusz='igazolatlan' AND perc IS NOT NULL)
-			) AND dt<='%s' AND diakId=%u".
-			$Wnemszamit['nemszamit']
-			." GROUP BY tankorTipus.jelleg"
-		     ;
-		$v = array(tanevDbNev(__INTEZMENY, $szemeszterAdat['tanev']), $szemeszterAdat['zarasDt'], $diakId);
-		$ret = db_query($q, array('fv' => 'getDiakHianyzasOsszesitesByDiakId', 'modul' => 'naplo_intezmeny', 'result' => 'assoc', 'keyfield'=>'jelleg', 'values' => $v));
-		if (is_array($ret))
-		    foreach ($ret as $_key=>$_val) {		
-			$ret['igazolt'] += intval($ret[$_key]['igazolt']);
-			$ret['igazolatlan'] += intval($ret[$_key]['igazolatlan']);
-		    }
-
-		$hozottHianyzas = getDiakHozottHianyzas($diakId, array('tanev'=> $szemeszterAdat['tanev'], 'igDt'=>$szemeszterAdat['zarasDt'] ));
-		$ret['igazolt'] += intval($hozottHianyzas['igazolt']['db']);
-		$ret['igazolatlan'] += intval($hozottHianyzas['igazolatlan']['db']);
-
-	    } else {
-		// lezárt tanév - az intézmény adatbázisból kérdezünk le
-// Tudtommal az összesítésbe már csak a "beszámítandó" hiányzások kerülnek, így nem kell plusz feltétel... [bb - 2010-11-24]
-//		$q = "SELECT * FROM hianyzasOsszesites WHERE diakId=%u AND tanev=%u AND szemeszter=%u $Wnemszamit"; 
-		$q = "SELECT * FROM hianyzasOsszesites WHERE diakId=%u AND tanev=%u AND szemeszter=%u";
-		$v = array($diakId, $szemeszterAdat['tanev'], $szemeszterAdat['szemeszter']);
-		$ret = db_query($q, array('fv' => 'getDiakHianyzasOsszesitesByDiakId', 'modul' => 'naplo_intezmeny', 'result' => 'record', 'values' => $v));
-	    }
-	    
-	} else {
-	    // A diák összes hiányzási adata                        ??????????????
-	    // ???????????????????????????	    // ???????????????????????????
-	    $q = "SELECT * FROM hianyzasOsszesites WHERE diakId=%u ORDER BY tanev,szemeszter";
-	    $r = db_query($q, array('fv' => 'getDiakHianyzasOsszesitesByDiakId', 'modul' => 'naplo_intezmeny', 'result' => 'indexed', 'values' => array($diakId)));
-	    for ($i = 0; $i < count($r); $i++) $ret[$r[$i]['tanev']][$r[$i]['szemeszter']] = $r[$i];
-	}
-	return $ret;
-
-    }
-
-?>
diff --git a/mayor-orig/www/include/modules/naplo/osztalyozo/diak.php b/mayor-orig/www/include/modules/naplo/osztalyozo/diak.php
deleted file mode 100644
index be285f8b..00000000
--- a/mayor-orig/www/include/modules/naplo/osztalyozo/diak.php
+++ /dev/null
@@ -1,106 +0,0 @@
-'1:1:1:1:1:1'), $olr = '') {
-
-	global $_TANEV, $KOVETELMENY;
-
-	if ($olr == '') $lr = db_connect('naplo');
-	else $lr = $olr;
-
-	if (isset($SET['sulyozas']) && $SET['sulyozas']!='') {
-	    $suly = explode(':',':'.$SET['sulyozas']);
-	} else {
-	    if (defined('__DEFAULT_SULYOZAS')) $suly = explode(':',':'.__DEFAULT_SULYOZAS);
-	    else $suly = array(1,1,1,1,1,1);
-	}
-	$q = "SELECT DISTINCT jegyId, tankorId, tankorNev, dt, jegy, jegyTipus, tipus, oraId, dolgozatId, megjegyzes, IF (modositasDt='0000-00-00 00:00:00',dt,modositasDt) AS modositasDt
-		FROM jegy LEFT JOIN ".__INTEZMENYDBNEV.".tankorSzemeszter USING (tankorId)
-		WHERE tipus <> 0 AND tanev=".__TANEV." AND diakId=%u
-		ORDER BY dt, jegyId";
-	$v = array($diakId);
-	$jegyAdatok = db_query($q, array('fv' => 'getDiakJegyek', 'modul' => 'naplo', 'result' => 'assoc', 'keyfield' => 'jegyId', 'values' => $v), $lr);
-
-	$tankorIds = getTankorByDiakId($diakId, __TANEV, array('csakId' => true, 'tolDt' => '', 'igDt' => ''), $lr);
-
-	if (is_array($jegyAdatok))
-	    foreach ($jegyAdatok as $jegyId => $jegyAdat) {
-		if (!in_array($jegyAdat['tankorId'], $tankorIds)) $tankorIds[] = $jegyAdat['tankorId'];
-	    }
-	if (is_array($tankorIds) && count($tankorIds) > 0) {
-	    $q = "SELECT tankorId, targyId, targyNev FROM ".__INTEZMENYDBNEV.".tankor
-		LEFT JOIN ".__INTEZMENYDBNEV.".targy USING (targyId)
-		WHERE tankorId IN (".implode(',', array_fill(0, count($tankorIds), '%u')).")
-		ORDER BY targyNev";
-	    $tankorTargyak = db_query($q, array(
-		'fv' => 'getDiakJegyek', 'modul' => 'naplo', 'result' => 'assoc', 'keyfield' => 'tankorId', 'values' => $tankorIds
-	    ), $lr);
-	    if (!is_array($tankorTargyak)) $tankorTargyak = array();
-	} else { $tankorTargyak = array(); }
-	$targyJegyei = array();
-	foreach ($tankorTargyak as $tankorId => $tAdat) {
-	    $targyId = $tAdat['targyId']; $targyNev = $tAdat['targyNev'];
-	    if (!is_array($targyJegyei[$targyId])) $targyJegyei[$targyId] = array('targyNev' => $targyNev);
-	}
-	foreach ($jegyAdatok as $jegyId => $jegyAdat) {
-	    $tankorId = $jegyAdat['tankorId'];
-	    $targyId = $tankorTargyak[$tankorId]['targyId'];
-	    //$targyNev = $tankorTargyak[$tankorId]['targyNev'];
-	    list($ev,$ho,$nap) = explode('-',$jegyAdat['dt']);
-	    $targyJegyei[$targyId][$ev][$ho][] = $jegyId;
-	    if (
-		in_array($jegyAdat['jegyTipus'],array('jegy','féljegy'))
-		|| $KOVETELMENY[ $jegyAdat['jegyTipus'] ]['átlagolható'] === true
-	    ) {
-		$targyJegyei[$targyId]['osszeg'] += $jegyAdat['jegy']*$suly[$jegyAdat['tipus']];
-		$targyJegyei[$targyId]['db'] += $suly[$jegyAdat['tipus']];
-	    }
-	}
-	foreach ($targyJegyei as $targyId => $targyAdat)
-	    if ($targyJegyei[$targyId]['db'] != 0)
-		$targyJegyei[$targyId]['atlag'] = number_format($targyJegyei[$targyId]['osszeg'] / $targyJegyei[$targyId]['db'],2,',','');
-
-	// Bizonyítvány
-	// kikerült innen...
-
-	// Dolgozatok lekérdezése
-	$dolgozatAdat = getTankorDolgozatok($tankorIds, ($csakTervezett = false));
-	// Nem megírt dolgozatok lekérdezése
-	if (is_array($dolgozatAdat['dolgozatIds']) && count($dolgozatAdat['dolgozatIds']) > 0) {
-	    $q = "SELECT dolgozat.dolgozatId, bejelentesDt, dolgozatNev FROM dolgozat LEFT JOIN jegy ON dolgozat.dolgozatId=jegy.dolgozatId AND diakId=%u 
-		    WHERE dolgozat.dolgozatId IN (".implode(',', array_fill(0, count($dolgozatAdat['dolgozatIds']), '%u')).") 
-		    AND diakId IS NULL ORDER BY bejelentesDt";
-	    $v = mayor_array_join(array($diakId), $dolgozatAdat['dolgozatIds']);
-	    $nemMegirtDolgozat = db_query($q, array('fv' => 'getDiakJegyek/nem megírt dolgozat', 'modul' => 'naplo', 'result' => 'indexed', 'values' => $v));
-	} else {
-	    $nemMegirtDolgozat = array();
-	}
-	$targyHianyzoDolgozatai = array();
-	for ($i = 0; $i < count($nemMegirtDolgozat); $i++) {
-	    $dolgozatId = $nemMegirtDolgozat[$i]['dolgozatId'];
-	    $tankorId = $dolgozatAdat[$dolgozatId]['tankor'][0]['tankorId'];
-	    $targyId = $tankorTargyak[$tankorId]['targyId'];
-	    //$targyNev = $tankorTargyak[$tankorId]['targyNev'];
-	    list($ev,$ho,$nap) = explode('-',$nemMegirtDolgozat[$i]['bejelentesDt']);
-	    $targyHianyzoDolgozatai[$targyId][$ev][$ho][] = $dolgozatId;
-	}
-	/* -------------- */
-
-	if ($olr == '') db_close($lr);
-	$ret = array(
-	    'jegyek' => $jegyAdatok, 'targyak' => $targyJegyei,
-	    'dolgozat' => $dolgozatAdat, 'hianyzoDolgozatok' => $targyHianyzoDolgozatai
-	);
-
-	return $ret;
-
-    }
-
-?>
diff --git a/mayor-orig/www/include/modules/naplo/osztalyozo/dolgozat.php b/mayor-orig/www/include/modules/naplo/osztalyozo/dolgozat.php
deleted file mode 100644
index 136a1dbd..00000000
--- a/mayor-orig/www/include/modules/naplo/osztalyozo/dolgozat.php
+++ /dev/null
@@ -1,116 +0,0 @@
- 'getDolgozat'));
-	else $lr = $olr;
-
-	$v = array($dolgozatId);
-	// A dolgozat alapadatai
-	$q = "SELECT * FROM dolgozat WHERE dolgozatId=%u";
-	$Dolgozat = db_query($q, array('fv' => 'getDolgozat', 'modul' => 'naplo', 'values' => $v, 'result' => 'record'), $lr);
-	$Dolgozat['diakIds'] = array();
-
-	// A dolgozat jegyei
-	$q = "SELECT * FROM jegy WHERE dolgozatId=%u AND tipus != 0";
-	$ret = db_query($q, array('fv' => 'getDolgozat', 'modul' => 'naplo', 'keyfield' => 'tankorId', 'result' => 'multiassoc', 'values' => $v), $lr);
-	$Dolgozat['ertekelt'] = (is_array($ret) && count($ret) > 0);
-	if (is_array($ret)) foreach ($ret as $tankorId => $tankorJegyek) {
-	    for ($j = 0; $j < count($tankorJegyek); $j++) {
-		$diakId = $tankorJegyek[$j]['diakId'];
-		$tankorDiakJegyek[$tankorId][$diakId][] = $tankorJegyek[$j];
-	    }
-	}
-
-	// A dolgozat tankörei
-	$q = "SELECT DISTINCT tankorId, targyId, tankorNev
-		FROM tankorDolgozat LEFT JOIN ".__INTEZMENYDBNEV.".tankorSzemeszter USING (tankorId)
-		LEFT JOIN ".__INTEZMENYDBNEV.".tankor USING (tankorId)
-		WHERE tanev=".__TANEV." AND dolgozatId=%u";
-	$Dolgozat['tankor'] = db_query($q, array('fv' => 'getDolgozat', 'modul' => 'naplo', 'values' => $v, 'result' => 'indexed'), $lr);
-	$Dolgozat['tankorIds'] = array();
-        for ($d = 0; $d < count($Dolgozat['tankor']); $d++) $Dolgozat['tankorIds'][] = $Dolgozat['tankor'][$d]['tankorId'];
-	$Dolgozat['tanarIds'] = getTankorTanaraiByInterval($Dolgozat['tankorIds'], array('tanev' => __TANEV, 'result' => 'csakId'));
-	$Dolgozat['targyId'] = $Dolgozat['tankor'][0]['targyId'];
-	for ($i = 0; $i < count($Dolgozat['tankor']); $i++) {
-	    $tankorId = $Dolgozat['tankor'][$i]['tankorId'];
-	    $Dolgozat['tankor'][$i]['diakok'] = getTankorDiakjaiByInterval($tankorId, __TANEV);
-	    foreach ($Dolgozat['tankor'][$i]['diakok']['idk'] as $index => $diakId)
-		if (!in_array($diakId, $Dolgozat['diakIds'])) $Dolgozat['diakIds'][] = $diakId;
-	    $Dolgozat['tankor'][$i]['jegyek'] = $tankorDiakJegyek[$tankorId];
-	}
-	//$diakTankorIds = getTankorIdsByDiakIds($Dolgozat['diakIds'],array('kovetelmeny'=>array('jegy'))); // miért csak jegy???
-	$diakTankorIds = getTankorIdsByDiakIds($Dolgozat['diakIds']);
-	$Dolgozat['utkozoDolgozatok'] = getTankorDolgozatok($diakTankorIds, true, date('Y-m-d'), $_TANEV['zarasDt']);
-	if ($olr == '') db_close($lr);
-
-	return $Dolgozat;
-
-    }
-
-    function dolgozatTankorHozzarendeles($dolgozatId, $torlendoTankorIds, $ujTankorIds) {
-
-
-	$lr = db_connect('naplo');
-        if (count($torlendoTankorIds) > 0) {
-            // ellenőrizzük, hogy van-e jegy hozzá!
-            $q = "SELECT COUNT(jegyId) FROM jegy WHERE dolgozatId=%u
-                            AND tankorId IN (".implode(',', array_fill(0, count($torlendoTankorIds), '%u')).")";
-	    $v = $torlendoTankorIds; array_unshift($v, $dolgozatId);
-	    $num = db_query($q, array('fv' => 'dolgozatTankorHozzarendeles', 'modul' => 'naplo', 'result' => 'value', 'values' => $v), $lr);
-	    if ($num > 0) {
-		$_SESSION['alert'][] = 'message:wrong_data:dolgozatTankorHozzarendeles:Tankör hozzárendelés megszüntetése előtt a jegyeket törölni kell!:jegyek száma '.$num;
-		db_close($lr);
-		return false;
-	    }
-	    $q = "DELETE FROM tankorDolgozat WHERE dolgozatId=%u
-		    AND tankorId IN (".implode(',', array_fill(0, count($torlendoTankorIds), '%u')).")";
-	    db_query($q, array('fv' => 'dolgozatTankorHozzarendeles', 'modul' => 'naplo', 'values' => $v), $lr);
-        }
-        if (($count = count($ujTankorIds)) > 0) {
-            foreach ($ujTankorIds as $key => $tankorId) $Val[] = "(%".($key+1)."\$u, %".($count+1)."\$u)";
-	    array_push($ujTankorIds, $dolgozatId);
-            $q = "INSERT INTO tankorDolgozat (tankorId, dolgozatId) VALUES ".implode(',',$Val);
-	    db_query($q, array('fv' => 'dolgozatTankorHozzarendeles', 'values' => $ujTankorIds, 'modul' => 'naplo'), $lr);
-        }
-	db_close($lr);
-	return true;
-
-    }
-
-    function dolgozatJegyekTorlese($dolgozatId, $tankorId) {
-
-	// Törlendő jegyek lekérdezése - logolás céljából
-	$q = "SELECT diakId, jegy, dt FROM jegy WHERE dolgozatId=%u AND tankorId=%u";
-	$ret = db_query($q, array('fv' => 'dolgozatJegyekTorlese', 'modul' => 'naplo', 'result' => 'indexed', 'values' => array($dolgozatId, $tankorId)));
-	if (!$ret) return false;
-
-	for ($i = 0; $i < count($ret); $i++) {
-	    if (__NAPLOADMIN || (strtotime(_OSZTALYOZO_HATARIDO) <= strtotime($ret[$i]['dt']))) {
-		logAction(
-		    array(
-			'szoveg'=>'Dolgozat jegy törlése: diakId: '.$ret[$i]['diakId'].', tankorId: '.$ret[$i]['tankorId'].', jegy: '.$ret[$i]['jegy'], 
-			'table'=>'jegy'
-		    )
-		);
-	    } else {
-		$_SESSION['alert'][] = 'message:deadline_expired:'.$ret[$i]['dt'];
-	    }
-	}
-	$q = "DELETE FROM jegy WHERE dolgozatId=%u AND tankorId=%u";
-	return db_query($q, array('fv' => 'dolgozatJegyekTorlese', 'modul' => 'naplo', 'values' => array($dolgozatId, $tankorId)));
-    }
-
-    function dolgozatTorles($dolgozatId) {
-
-	$q = "DELETE FROM dolgozat WHERE dolgozatId=%u";
-        return db_query($q, array('fv' => 'dolgozatTorles', 'modul' => 'naplo', 'values' => array($dolgozatId)));
-
-    }
-
-?>
diff --git a/mayor-orig/www/include/modules/naplo/osztalyozo/stat.php b/mayor-orig/www/include/modules/naplo/osztalyozo/stat.php
deleted file mode 100644
index 26f1dbfd..00000000
--- a/mayor-orig/www/include/modules/naplo/osztalyozo/stat.php
+++ /dev/null
@@ -1,247 +0,0 @@
- SHARED! (bizonyítvány nyomtatás/értesítő)
-     * getDiakZarojegyAtlagok($diakIds, $tanev, $szemeszter)
-     * getTargyZarojegyAtlagok($diakIds, $tanev, $szemeszter)
-     * getTanarokByDiakIds($diakIds, $szemeszterAdat)			--> SHARED!
-     * getTargyakBySzemeszter($szemeszterAdat)				--> SHARED!
-     * getTargyAtlagokBySzemeszter($szemeszterAdat)
-     * getOsztalyHianyzasOsszesites($szemeszterAdat)
-     * getZarojegyStatBySzemeszter($SZA)
-
-*/
-
-    function getDiakZarojegyAtlagok($diakIds, $tanev, $szemeszter) {
-
-	if (count($diakIds)<1) return false;
-	$mIdk = getMagatartas();
-	$szIdk = getSzorgalom();
-        $q = "SELECT diakId,FLOOR(100*AVG(jegy))/100 AS atlag FROM zaroJegy LEFT JOIN targy USING (targyId)
-		LEFT JOIN szemeszter ON kezdesDt<=hivatalosDt AND hivatalosDt<=zarasDt
-		WHERE diakId IN (".implode(',', array_fill(0, count($diakIds), '%u')).") AND tanev=%u AND szemeszter=%u 
-		AND jegy != 0 AND zaroJegy.jegyTipus ='jegy' AND targy.targyId NOT IN (".implode(',',array_merge($mIdk,$szIdk)).") 
-		AND felev = %u
-		GROUP BY diakId WITH ROLLUP";
-	array_push($diakIds, $tanev, $szemeszter, $szemeszter);
-	$r = db_query($q, array('fv' => 'getDiakZarojegyAtlagok', 'modul' => 'naplo_intezmeny', 'result' => 'indexed', 'values' => $diakIds));
-	$ret = array();
-	$sum = $db = 0;
-	for ($i = 0; $i < count($r); $i++) {
-	    if ($r[$i]['diakId'] == '') {
-		$r[$i]['diakId'] = 'osztaly';
-		$ret['osztaly'] = floor(100*$r[$i]['atlag'])/100;
-	    } else {
-		//$ret[ $r[$i]['diakId'] ] = floor(100*$r[$i]['atlag'])/100; - elvileg nem lenne baj, de php hiba: pl. 4.64, 4.14, 4.35 hibásan "kerekedik"...
-		$ret[ $r[$i]['diakId'] ] = $r[$i]['atlag']; // a lekérdezésben már csonkoltunk...
-		$sum += $ret[ $r[$i]['diakId'] ];
-		$db++;
-	    }
-	}
-	$ret['osztaly'] = ($db==0) ? 0 : floor(100*$sum/$db)/100; // felülírjuk, mert a jegyek átlaga a tárgy átlagoknál már megvan
-	return $ret;
-    }
-
-    function getTargyZarojegyAtlagok($diakIds, $tanev, $szemeszter) {
-    /*
-     * Az adott szemeszterben szerzett zárójegyek átlaga, de csak szemeszter=felev megfeleltetéssel
-     */
-	if (count($diakIds)<1) return false;
-
-        $q = "SELECT targyId, floor(100*avg(jegy))/100 AS atlag FROM zaroJegy
-		LEFT JOIN szemeszter ON kezdesDt<=hivatalosDt AND hivatalosDt<=zarasDt AND felev=szemeszter	
-		WHERE diakId IN (".implode(',', array_fill(0, count($diakIds), '%u')).") AND tanev=%u AND szemeszter=%u
-		AND jegy != 0 AND jegyTipus='jegy' GROUP BY targyId WITH ROLLUP";
-	array_push($diakIds, $tanev, $szemeszter);
-	$r = db_query($q, array('fv' => 'getTargyZarojegyAtlagok', 'modul' => 'naplo_intezmeny', 'result' => 'indexed', 'values' => $diakIds));
-	$ret = array();
-	for ($i = 0; $i < count($r); $i++) {
-	    if ($r[$i]['targyId'] == '') $r[$i]['targyId'] = 'osztaly';
-	    //$ret[ $r[$i]['targyId'] ] = floor(100*$r[$i]['atlag'])/100; // sql-ben megbízhatóbb a csonkolás működése - sajnos...
-	    $ret[ $r[$i]['targyId'] ] = $r[$i]['atlag'];
-	}
-	return $ret;
-    }
-
-    function getTanarokByDiakIds($diakIds, $szemeszterAdat) {
-    //??? 2009. shared lib ?
-
-	if (count($diakIds)<1) return false;
-
-	// A tárgyak lekérdezése a szemeszterben felvett tankörök alapján (miből lehet zárójegyet kapni)
-	$q = "SELECT DISTINCT targyId, TRIM(CONCAT_WS(' ',viseltNevElotag,viseltCsaladinev,viseltUtonev)) AS tanarNev
-		FROM tankor LEFT JOIN tankorDiak USING (tankorId) LEFT JOIN tankorTanar USING (tankorId) LEFT JOIN tanar USING (tanarId)
-		WHERE diakId IN (".implode(',', array_fill(0, count($diakIds), '%u')).") 
-		    AND (tankorDiak.kiDt IS NULL OR tankorDiak.kiDt>='%s') AND tankorDiak.beDt<='%s'
-		    AND (tankorTanar.kiDt IS NULL OR tankorTanar.kiDt>='%s') AND tankorTanar.beDt<='%s'";
-	array_push($diakIds, $szemeszterAdat['kezdesDt'], $szemeszterAdat['zarasDt'], $szemeszterAdat['kezdesDt'], $szemeszterAdat['zarasDt']);
-	return db_query($q, array('debug'=>false,'fv' => 'getTanarokByDiakIds', 'modul' => 'naplo_intezmeny', 'result' => 'multiassoc', 'keyfield' => 'targyId', 'values' => $diakIds));
-
-    }
-
-    function getTargyakBySzemeszter($szemeszterAdat) {
-	// A tárgyak lekérdezése a beírt jegyek alapján (lehet hozott jegy)
-	$q = "SELECT DISTINCT targyId,targyNev,targyJelleg, zaroKovetelmeny
-		FROM targy LEFT JOIN zaroJegy USING (targyId) 
-		LEFT JOIN szemeszter ON kezdesDt<=hivatalosDt AND hivatalosDt<=zarasDt
-		WHERE tanev=%u AND szemeszter=%u ORDER BY targyNev";
-	$v = array($szemeszterAdat['tanev'], $szemeszterAdat['szemeszter']);
-	return db_query($q, array('fv' => 'getTargyakBySzemeszter', 'modul' => 'naplo_intezmeny', 'result' => 'indexed', 'values' => $v));
-    }
-
-
-    function getTargyAtlagokBySzemeszter($szemeszterAdat) {
-        $q = "SELECT targyId,osztalyId,FLOOR(100*AVG(jegy))/100 AS atlag FROM zaroJegy LEFT JOIN osztalyDiak
-		ON (zaroJegy.diakId=osztalyDiak.diakId AND beDt<='%s' AND (kiDt IS NULL OR '%s'<=kiDt))
-		LEFT JOIN szemeszter ON kezdesDt<=hivatalosDt AND hivatalosDt<=zarasDt 
-		    AND felev=szemeszter
-                WHERE tanev=%u AND szemeszter=%u AND jegy != 0 
-            	    AND jegyTipus in ('jegy','magatartas','szorgalom') 
-                GROUP BY targyId,osztalyId WITH ROLLUP";
-	$v = array($szemeszterAdat['zarasDt'], $szemeszterAdat['zarasDt'], $szemeszterAdat['tanev'], $szemeszterAdat['szemeszter']);
-        $r = db_query($q, array('fv' => 'getTargyAtlagokBySzemeszter', 'modul' => 'naplo_intezmeny', 'result' => 'indexed', 'values' => $v));
-        $ret = array();
-        for ($i = 0; $i < count($r); $i++)
-    	    if ($r[$i]['targyId'] != '') {
-        	if ($r[$i]['osztalyId'] == '') $r[$i]['osztalyId'] = 'iskola'; // tárgyanként az összes jegy átlagát írjuk ki
-        	$ret[ $r[$i]['targyId'] ][ $r[$i]['osztalyId'] ] = $r[$i]['atlag'];
-    	    } else {
-    		$ret['iskola'] = $r[$i]['atlag']; // nem használjuk - ez az összes jegyek átlaga
-    	    }
-        return $ret;
-
-    }
-
-    function getOsztalyHianyzasOsszesites($szemeszterAdat, $SET = array('telephelyId'=>null)) {
-        $ret = array();
-        if (is_array($szemeszterAdat)) {
-           // Egy szemeszter hiányzási adatainak lekérdezése
-            if ($szemeszterAdat['statusz'] == 'aktív') {
-		// Mindenféle típus kell?
-    		$Wnemszamit = defWnemszamit();            
-                // Folyó tanév - a tanév adatbázisból kérdezünk le
-/*                $q = "SELECT osztalyId,
-                            COUNT(IF(tipus='hianyzas' AND statusz='igazolt',1,NULL)) AS igazolt,
-                            COUNT(IF(tipus='hianyzas' AND statusz='igazolatlan',1,NULL)) AS igazolatlan,
-                            SUM(IF(tipus='késés' AND statusz='igazolatlan',perc,NULL)) AS kesesPercOsszeg
-                        FROM `%s`.hianyzas
-			".$Wnemszamit['join']."
-			LEFT JOIN osztalyDiak ON (hianyzas.diakId=osztalyDiak.diakId AND beDt<='%s' 
-			    AND (kiDt IS NULL OR '%s'<=kiDt))
-			WHERE (tipus = 'hiányzás' OR (tipus='késés' AND statusz='igazolatlan' AND perc IS NOT NULL))
-			    AND dt<='%s'
-			    ".$Wnemszamit['nemszamit']."
-			GROUP BY osztalyId WITH ROLLUP";
-*/
-		$tanevDbNev = tanevDbNev(__INTEZMENY, $szemeszterAdat['tanev']);
-
-		$q = "SELECT osztalyId, SUM(igazolt) AS igazolt, SUM(igazolatlan) AS igazolatlan, SUM(kesesPercOsszeg) AS kesesPercOsszeg,
-			    SUM(igazolatlanKesesbol) AS igazolatlanKesesbol, SUM(osszesIgazolatlan) AS osszesIgazolatlan FROM
-			(SELECT osztalyId,hianyzas.diakId,
-			    (COUNT(IF(tipus='hianyzas' AND statusz='igazolt',1,NULL)) + IFNULL((SELECT SUM(dbHianyzas) FROM `".$tanevDbNev."`.hianyzasHozott WHERE hianyzasHozott.diakId=hianyzas.diakId AND statusz='igazolt'),0)) AS igazolt,
-			    (COUNT(IF(tipus='hianyzas' AND statusz='igazolatlan',1,NULL)) + IFNULL((SELECT SUM(dbHianyzas) FROM `".$tanevDbNev."`.hianyzasHozott WHERE hianyzasHozott.diakId=hianyzas.diakId AND statusz='igazolatlan'),0)) AS igazolatlan,
-			    IFNULL(SUM(IF(tipus='késés' AND statusz='igazolatlan',perc,NULL)),0) AS kesesPercOsszeg,
-			    SUM(IF(tipus='késés' AND statusz='igazolatlan',perc,NULL)) DIV 45 as igazolatlanKesesbol,
-			    (
-				COUNT(IF(tipus='hianyzas' AND statusz='igazolatlan',1,NULL))+IFNULL((SUM(IF(tipus='késés' AND statusz='igazolatlan',perc,NULL)) DIV 45),0) 
-				+ IFNULL((SELECT SUM(dbHianyzas) FROM `".$tanevDbNev."`.hianyzasHozott WHERE hianyzasHozott.diakId=hianyzas.diakId AND statusz='igazolatlan'),0)
-			    )
-			    AS osszesIgazolatlan
-			 FROM `".$tanevDbNev."`.hianyzas
-			 LEFT JOIN tankorTipus USING (tankorTipusId)
-			 LEFT JOIN osztalyDiak ON (hianyzas.diakId=osztalyDiak.diakId AND beDt<='%s' AND (kiDt IS NULL OR '%s'<=kiDt))
-			 WHERE (tipus = 'hiányzás' OR (tipus='késés' AND statusz='igazolatlan' AND perc IS NOT NULL)) AND dt<='%s' AND hianyzasBeleszamit='igen'
-			 GROUP BY osztalyId,hianyzas.diakId
-		    ) AS diakHianyzas GROUP BY osztalyId WITH ROLLUP";
-//		$v = array(tanevDbNev(__INTEZMENY, $szemeszterAdat['tanev']), $szemeszterAdat['zarasDt'], $szemeszterAdat['kezdesDt'], $szemeszterAdat['zarasDt']);
-// Csak az záráskori tagokat vegyük figyelembe
-		$v = array($szemeszterAdat['zarasDt'], $szemeszterAdat['zarasDt'], $szemeszterAdat['zarasDt']);
-            } else {
-                // lezárt tanév - az intézmény adatbázisból kérdezünk le - nincs $Wnemszamit !!!
-                $q = "SELECT osztalyId, SUM(igazolt) AS igazolt, SUM(igazolatlan) AS igazolatlan, SUM(kesesPercOsszeg) AS kesesPercOsszeg, 
-			    SUM(kesesPercOsszeg DIV 45) AS igazolatlanKesebol, SUM(igazolatlan + (kesesPercOsszeg DIV 45)) AS osszesIgazolatlan
-			FROM hianyzasOsszesites 
-			LEFT JOIN osztalyDiak ON (hianyzasOsszesites.diakId=osztalyDiak.diakId AND beDt<='%s' 
-			    AND (kiDt IS NULL OR '%s'<=kiDt))
-			WHERE tanev=%u AND szemeszter=%u
-			GROUP BY osztalyId WITH ROLLUP";
-//		$v = array($szemeszterAdat['zarasDt'], $szemeszterAdat['kezdesDt'], $szemeszterAdat['tanev'], $szemeszterAdat['szemeszter']);
-// Csak az záráskori tagokat vegyük figyelembe
-		$v = array($szemeszterAdat['zarasDt'], $szemeszterAdat['zarasDt'], $szemeszterAdat['tanev'], $szemeszterAdat['szemeszter']);
-            }
-            $ret = db_query($q, array('fv' => 'getOsztalyHianyzasOsszesites', 'modul' => 'naplo_intezmeny', 'result' => 'assoc', 'keyfield' => 'osztalyId', 'values' => $v));
-        }
-        return $ret;
-    }
-
-    function getZarojegyStatBySzemeszter($SZA, $SET = array('telephelyId'=>null)) {
-
-	// Le kell kérdezni minden zárójegyet osztályonként
-	$tanev = $SZA['tanev'];
-	$telephelyId = readVariable($SET['telephelyId'],'id');
-
-	$OSZTALYOK = getOsztalyok($tanev,array('result'=>'indexed','telephelyId'=>$telephelyId));
-	for ($i=0; $i 'multiassoc', 'tanev' => $tanev, 'tolDt' => $SZA['zarasDt'], 'igDt' => $SZA['zarasDt'], 
-	    'statusz' => array('jogviszonyban van','magántanuló','jogviszonya felfüggesztve','jogviszonya lezárva'))
-	);
-	$ret['intezmeny'] = array('kituno' => 0, 'jeles' => 0, 'bukott' => 0, 'bukas' => 0, 'atlag' => 0, 'osztalyDb' => 0);
-	foreach($DIAKIDS as $osztalyId => $DIAKOK) {
-	    $diakIds = array();
-	    $dbDiaknakVanJegye = 0;
-	    for ($i=0; $iarray('diakId')));
-	    $O = array('letszam' => count($diakIds), 'kituno' => 0, 'jeles' => 0, 'bukott' => 0, 'bukas' => 0, 'atlag' => 0);
-	    foreach ($D as $diakId => $dJegyek) {
-		$lehetJeles = true; $bukas = 0; $sum = 0; $db = 0;
-		for ($i = 0; $i < count($dJegyek); $i++) {
-		    if (in_array($dJegyek[$i]['jegyTipus'], array('jegy','magatartás','szorgalom'))) { // A statisztika csak a jegy típusra értelmes!
-			if ($dJegyek[$i]['jegyTipus'] == 'jegy') {
-			    $sum += $dJegyek[$i]['jegy'];
-			    $db++;
-			    if ($dJegyek[$i]['jegy'] < _JELES_LEGGYENGEBB_JEGY) $lehetJeles = false;
-			}
-			if ($dJegyek[$i]['jegy'] == 1) {
-			    $bukas++;
-			    $ret['intezmeny']['targy'][ $dJegyek[$i]['targyId'] ]++;
-			}
-		    }
-		}
-		if ($db != 0) { // volt legalább 1 jegy típusú jegye
-		    $dbDiaknakVanJegye++;
-		    $atlag = @floor(100 * $sum / $db) / 100;
-		    $O['atlag'] += $atlag;
-		    if ($atlag >= _KITUNO_ATLAG) $O['kituno']++;
-		    elseif ($atlag >= _JELES_ATLAG && $lehetJeles) $O['jeles']++;
-		    if ($bukas > 0) {
-			$O['bukas'] += $bukas;
-			$O['bukott']++;
-		    }
-		}
-	    }
-	    //if (count($diakIds) > 0)  $O['atlag'] = $O['atlag'] / count($diakIds);
-	    if($dbDiaknakVanJegye>0)	$O['atlag'] = floor(100 * $O['atlag'] / $dbDiaknakVanJegye) / 100;
-	    $ret[$osztalyId] = $O;
-	    $ret['intezmeny']['kituno'] += $O['kituno'];
-	    $ret['intezmeny']['jeles'] += $O['jeles'];
-	    $ret['intezmeny']['bukott'] += $O['bukott'];
-	    $ret['intezmeny']['bukas'] += $O['bukas'];
-	    $ret['intezmeny']['atlag'] += $O['atlag'];
-	    if ($O['atlag'] > 0) $ret['intezmeny']['osztalyDb']++;
-	}
-	if ($ret['intezmeny']['osztalyDb'] > 0) $ret['intezmeny']['atlag'] = $ret['intezmeny']['atlag'] / $ret['intezmeny']['osztalyDb'];
-	return $ret;
-
-    }
-
-    function getDiakKonferenciaZaradekok($diakIds, $utolsoTanitasiNap) {
-
-	return getZaradekokByDiakIds($diakIds, array('tipus' => 'konferencia, konferencia bukás', 'tolDt' => $utolsoTanitasiNap, 'igDt' => $utolsoTanitasiNap));
-
-    }
-
-?>
\ No newline at end of file
diff --git a/mayor-orig/www/include/modules/naplo/osztalyozo/szempontRendszer.php b/mayor-orig/www/include/modules/naplo/osztalyozo/szempontRendszer.php
deleted file mode 100644
index e2b750f9..00000000
--- a/mayor-orig/www/include/modules/naplo/osztalyozo/szempontRendszer.php
+++ /dev/null
@@ -1,56 +0,0 @@
- 'ujSzempontRendszer', 'modul' => 'naplo_intezmeny', 'result' => 'insert', 'values' => $v));
-	if (!$szrId) return false;
-
-	// A szempontok és minősítések rögzítése
-        $Szempont = $aktSz = array();
-        for ($i = 0; $i < count($ADAT['txt']); $i++) {
-	    $txt = trim($ADAT['txt'][$i]);
-            if ($txt != '') {
-                if (!isset($aktSz['szempont'])) {
-                    $aktSz['szempont'] = $txt;
-                    $q = "INSERT INTO szrSzempont (szrId, szempont) VALUES (%u, '%s')";
-		    $v = array($szrId, $txt);
-                    $szempontId = db_query($q, array('fv' => 'ujSzempontRendszer/szempont', 'modul' => 'naplo_intezmeny', 'result' => 'insert', 'values' => $v));
-                } else {
-                    $aktSz['minosites'][] = $txt;
-                    $q = "INSERT INTO szrMinosites (szempontId, minosites) VALUES (%u,'%s')";
-		    $v = array($szempontId, $txt);
-                    db_query($q, array('fv' => 'ujSzempontRendszer/minősítés', 'modul' => 'naplo_intezmeny', 'values' => $v));
-                }
-            } else {
-                if (isset($aktSz['szempont'])) {
-                    $Szempont[] = $aktSz;
-                    $aktSz = array();
-                }
-            }
-        }
-
-	return true;
-	
-    }
-
-    function szempontRendszerTorles($ADAT) {
-
-	// cascade-olás miatt törli a hozzá tartozó értékeléseket is!
-	$q = "DELETE FROM szempontRendszer WHERE szrId=%u";
-	return db_query($q, array('fv' => 'szempontRendszerTorles', 'modul' => 'naplo_intezmeny', 'values' => array($ADAT['szrId'])));
-
-    }
-
-?>
diff --git a/mayor-orig/www/include/modules/naplo/osztalyozo/szovegesErtekeles.php b/mayor-orig/www/include/modules/naplo/osztalyozo/szovegesErtekeles.php
deleted file mode 100644
index 803056a7..00000000
--- a/mayor-orig/www/include/modules/naplo/osztalyozo/szovegesErtekeles.php
+++ /dev/null
@@ -1,67 +0,0 @@
- 'ujErtekeles', 'modul' => 'naplo', 'values' => $v));
-
-	// Szoveges értékelés felvétele
-	$q = "INSERT INTO szovegesErtekeles (diakId, szrId, targyId, dt) VALUES (%u, %u, %u, '%s')";
-	$v = array($diakId, $szrId, $targyId, $dt);
-	$szeId = db_query($q, array('fv' => 'ujErtekeles', 'modul' => 'naplo', 'result' => 'insert', 'values' => $v));
-	if (!$szeId) return false;
-
-	// Minősítések felvétele
-	if (count($minosites) > 0) { 
-	    $q = "INSERT INTO szeMinosites (szeId,minositesId) VALUES ($szeId,".implode("),($szeId,", array_fill(0, count($minosites), '%u')).")";
-	    db_query($q, array('fv' => 'ujErtekeles', 'modul' => 'naplo', 'values' => $minosites));
-	}
-	// Egyedi minősítések felvétele
-	if (count($egyediMinosites) > 0) {
-	    $v = $V = array();
-	    foreach ($egyediMinosites as $szempontId => $egyediMinosites) {
-		$V[] = "(%u, %u, '%s')";
-		array_push($v, $szeId, $szempontId, $egyediMinosites);
-	    }
-	    $q = "INSERT INTO szeEgyediMinosites (szeId,szempontId,egyediMinosites) VALUES ".implode(',', $V);
-	    db_query($q, array('fv' => 'ujErtekeles', 'modul' => 'naplo', 'values' => $v));
-	}
-
-	return true;
-    }
-
-    function ujZaroErtekeles($diakId, $szrId, $targyId, $tanev, $szemeszter, $minosites, $egyediMinosites) {
-
-	// A korábbi értékelés törlése
-	$q = "DELETE FROM szovegesErtekeles WHERE diakId=%u AND szrId=%u AND targyId=%u AND tanev=%u AND szemeszter=%u";
-	$v = array($diakId, $szrId, $targyId, $tanev, $szemeszter);
-	db_query($q, array('fv' => 'ujZaroErtekeles', 'modul' => 'naplo_intezmeny', 'values' => $v));
-
-	// Szoveges értékelés felvétele
-	$q = "INSERT INTO szovegesErtekeles (diakId, szrId, targyId, dt, tanev, szemeszter) VALUES (%u, %u, %u, CURDATE(), %u, %u)";
-	$v = array($diakId, $szrId, $targyId, $tanev, $szemeszter);
-	$szeId = db_query($q, array('fv' => 'ujZaroErtekeles', 'modul' => 'naplo_intezmeny', 'result' => 'insert', 'values' => $v));
-	if (!$szeId) return false;
-
-	// Minősítések felvétele
-	if (count($minosites) > 0) { 
-	    $q = "INSERT INTO szeMinosites (szeId,minositesId) VALUES ($szeId,".implode("),($szeId,", array_fill(0, count($minosites), '%u')).")";
-	    db_query($q, array('fv' => 'ujZaroErtekeles', 'modul' => 'naplo_intezmeny', 'values' => $minosites));
-	}
-	// Egyedi minősítések felvétele
-	if (count($egyediMinosites) > 0) {
-	    $v = $V = array();
-	    foreach ($egyediMinosites as $szempontId => $egyediMinosites) {
-		$V[] = "(%u, %u, '%s')";
-		array_push($v, $szeId, $szempontId, $egyediMinosites);
-	    }
-	    $q = "INSERT INTO szeEgyediMinosites (szeId,szempontId,egyediMinosites) VALUES ".implode(',', $V);
-	    db_query($q, array('fv' => 'ujZaroErtekeles', 'modul' => 'naplo_intezmeny', 'values' => $v));
-	}
-
-	return true;
-    }
-
-?>
diff --git a/mayor-orig/www/include/modules/naplo/osztalyozo/tankor.php b/mayor-orig/www/include/modules/naplo/osztalyozo/tankor.php
deleted file mode 100644
index 8cc06915..00000000
--- a/mayor-orig/www/include/modules/naplo/osztalyozo/tankor.php
+++ /dev/null
@@ -1,205 +0,0 @@
- array('lista' => array()), 'tankörök' => array(), 'tanárok' => array('tanarIds' => array()));
-	// A tankör adatainak lekérdezése
-	list($tankorAdat) = getTankorById($tankorId, __TANEV);
-	// Ha nincsenek diákok
-	if (!is_array($Diakok['idk']) || count($Diakok['idk']) == 0) {
-		$Tanarok = $Jegyek['tankörök'][$tankorId]['tanárok'] = getTankorTanaraiByInterval($tankorId, array('tanev' => __TANEV, 'tolDt' => $tolDt, 'igDt' => $igDt, 'result' => 'nevsor'));
-		for ($t = 0; $t < count($Tanarok); $t++) {
-		    if (!in_array($Tanarok[$t]['tanarId'], $Jegyek['tanárok']['tanarIds'])) {
-			$Jegyek['tanárok'][$Tanarok[$t]['tankorId']] = $Tanarok[$t];
-			$Jegyek['tanárok']['tanarIds'][] = $Tanarok[$t]['tanarId'];
-			$Jegyek['tanárok']['tanarNevek'][] = $Tanarok[$t]['tanarNev'];
-		    }
-		}
-		$Jegyek['tankörök'][$tankorId] = $tankorAdat;
-		return $Jegyek;
-	}
-
-
-	if ($sulyozas == '') $suly = array(0,1,1,1,1,1,1);
-	else $suly = explode(':', '0:'.$sulyozas);
-
-	
-	// A diákok tárgyhoz tartozó tankörei
-	$q = "SELECT DISTINCT tankorDiak.tankorId, tankorNev, tankor.targyId, felveheto
-		FROM ".__INTEZMENYDBNEV.".tankorDiak LEFT JOIN ".__INTEZMENYDBNEV.".tankor USING (tankorId)
-		LEFT JOIN ".__INTEZMENYDBNEV.".tankorSzemeszter USING (tankorId)
-		WHERE tankor.targyId=%u AND tanev=".__TANEV."
-		AND diakId IN ('".implode("','", array_fill(0, count($Diakok['idk']), '%u'))."')
-		AND beDt<='%s' AND (kiDt IS NULL OR kiDt>='%s')";
-	$v = mayor_array_join(array($tankorAdat['targyId']), $Diakok['idk'], array($igDt, $tolDt));
-	$Jegyek['tankörök'] = db_query($q, array('fv' => 'getJegyek (Tankör)', 'modul' => 'naplo_intezmeny', 'result' => 'assoc', 'keyfield' => 'tankorId', 'values' => $v));
-	$Jegyek['tanárok']['tanarIds'] =  $Jegyek['tanárok']['tanarNevek'] = array();
-	if (is_array($Jegyek['tankörök']))
-	foreach ($Jegyek['tankörök'] as $_tankorId => $a) {
-		$Jegyek['tankörök']['tankorId'][] = $_tankorId;
-		$Tanarok = $Jegyek['tankörök'][$_tankorId]['tanárok'] = getTankorTanaraiByInterval($_tankorId, array('tanev' => __TANEV, 'tolDt' => $tolDt, 'igDt' => $igDt, 'result' => 'nevsor'));
-		for ($t = 0; $t < count($Tanarok); $t++) {
-		    if (!in_array($Tanarok[$t]['tanarId'], $Jegyek['tanárok']['tanarIds'])) {
-			$Jegyek['tanárok'][$Tanarok[$t]['tankorId']] = $Tanarok[$t];
-			$Jegyek['tanárok']['tanarIds'][] = $Tanarok[$t]['tanarId'];
-			$Jegyek['tanárok']['tanarNevek'][] = $Tanarok[$t]['tanarNev'];
-		    }
-		}
-	}
-
-	// ---
-	if (count($Diakok['idk']) > 0 && count($Jegyek['tankörök']['tankorId']) > 0) { // Vannak diákok és a diákoknak adott tárgyhoz tankörei - olyankor lehet gond, ha a tankör csak egy korábbi időszakban volt, most már nem aktív
-	    $q = "SELECT * FROM jegy
-		WHERE tankorId IN ('".implode("','", array_fill(0, count($Jegyek['tankörök']['tankorId']), '%u'))."')
-		AND tipus <> 0
-		AND diakId IN ('".implode("','", array_fill(0, count($Diakok['idk']), '%u'))."')
-		ORDER BY jegy.dt, jegy.jegyId";
-	    $v = mayor_array_join($Jegyek['tankörök']['tankorId'], $Diakok['idk']);
-	    $ret = db_query($q, array('fv' => 'getJegyek (Tankör)', 'modul' => 'naplo', 'result' => 'indexed', 'values' => $v));
-	    reset($_TANEV['szemeszter']);
-	    $szAdat = current($_TANEV['szemeszter']); $szemeszter = $szAdat['szemeszter'];
-	    foreach ($ret as $i => $a) {
-		if (strtotime($a['dt']) > strtotime($szAdat['zarasDt'])) { $szAdat = next($_TANEV['szemeszter']); $szemeszter = $szAdat['szemeszter']; }
-		$tipus = $a['tipus'];
-		if ($tipus > 2) {
-		    if (!in_array($a['dolgozatId'], $Jegyek['dolgozatok']['lista'])) {
-			list($ev,$ho,$napEsIdo) = explode('-', $a['dt']);
-			$Jegyek['dolgozatok']['lista'][] = $a['dolgozatId'];
-			$Jegyek['dolgozatok']['dátum szerint'][$ev][$ho][] = $a['dolgozatId'];
-			$Jegyek['dolgozatok']['dátum szerint'][$szemeszter][$ev][$ho][] = $a['dolgozatId'];
-			$Jegyek['dolgozatok'][$a['dolgozatId']] = array('év' => $ev, 'hó' => $ho, 'szemeszter' => $szemeszter);
-			$Jegyek['dolgozatok'][$a['dolgozatId']]['tankorIds'] = array($a['tankorId']);
-			$dSzemeszter =  $szemeszter; // A dolozat első jegyének szemesztere
-		    } else {
-			$ev = $Jegyek['dolgozatok'][$a['dolgozatId']]['év'];
-			$ho = $Jegyek['dolgozatok'][$a['dolgozatId']]['hó'];
-			$dSzemeszter = $Jegyek['dolgozatok'][$a['dolgozatId']]['szemeszter'];
-			if (!in_array($a['tankorId'], $Jegyek['dolgozatok'][$a['dolgozatId']]['tankorIds'])) $Jegyek['dolgozatok'][$a['dolgozatId']]['tankorIds'][] = $a['tankorId'];
-		    }
-//		    $Jegyek[$a['diakId']][$ev][$ho]['dolgozat'][$a['dolgozatId']][] = $a;
-		    $Jegyek[$a['diakId']][$dSzemeszter][$ev][$ho]['dolgozat'][$a['dolgozatId']][] = $a;
-
-		    $Jegyek['dolgozatok'][$a['dolgozatId']]['jegyTipus'] = $a['jegyTipus'];
-		    $Jegyek['dolgozatok'][$a['dolgozatId']]['átlag'] = $Jegyek['dolgozatok'][$a['dolgozatId']]['átlag'] * $Jegyek['dolgozatok'][$a['dolgozatId']]['sulyösszeg'] + $a['jegy']*$suly[$tipus];
-		    $Jegyek['dolgozatok'][$a['dolgozatId']]['db']++;
-		    $Jegyek['dolgozatok'][$a['dolgozatId']]['sulyösszeg'] += $suly[$tipus];
-		    if ($Jegyek['dolgozatok'][$a['dolgozatId']]['sulyösszeg'] != 0)
-			$Jegyek['dolgozatok'][$a['dolgozatId']]['átlag'] = $Jegyek['dolgozatok'][$a['dolgozatId']]['átlag'] / $Jegyek['dolgozatok'][$a['dolgozatId']]['sulyösszeg'];
-		    else
-			$Jegyek['dolgozatok'][$a['dolgozatId']]['átlag'] = 0;
-		} else {
-		    list($ev,$ho,$nap) = explode('-',$a['dt']);
-		    $Jegyek[$a['diakId']][$ev][$ho]['jegyek'][] = $a;
-		    $Jegyek[$a['diakId']][$szemeszter][$ev][$ho]['jegyek'][] = $a;
-		}
-		if (
-		    in_array($a['jegyTipus'],array('jegy','féljegy'))
-		    || $KOVETELMENY[ $a['jegyTipus'] ]['átlagolható'] === true
-		) {
-		    $Jegyek[$a['diakId']]['átlag'] = $Jegyek[$a['diakId']]['átlag'] * $Jegyek[$a['diakId']]['sulyösszeg'] + $a['jegy']*$suly[$tipus];
-		    $Jegyek[$a['diakId']]['db']++;
-		    $Jegyek[$a['diakId']]['sulyösszeg'] += $suly[$tipus];
-	    
-		    if ($Jegyek[$a['diakId']]['sulyösszeg'] != 0) 
-			$Jegyek[$a['diakId']]['átlag'] = $Jegyek[$a['diakId']]['átlag'] / $Jegyek[$a['diakId']]['sulyösszeg'];
-		    else
-			$Jegyek[$a['diakId']]['átlag'] = 0;
-		}
-	    }
-	    // Osztályátlag
-	    $sum = $db = 0;
-	    foreach ($Jegyek as $diakId => $dAdat)
-		if (isset($dAdat['átlag'])) { $sum += $dAdat['átlag']; $db++; }
-	    if ($db > 0) $Jegyek['átlag'] = $sum / $db;
-	} // vannak diákok	
-
-	// ------------------------------------
-	// A tárgycsoporthoz tartozó zárójegyek
-	// EZ NEM IDE TARTOZIK! --> share lib
-	return $Jegyek;
-    
-    }
-
-    /*
-	Ez kerüljön át a share/jegyModifier-be 
-    */
-    function jegyBeiras($tankorId, $tipus, $oraId, $dolgozatId, $tanarId, $megjegyzes, $Beirando, $actionId, $lr) {
-
-
-            // ha kell, van megadva dolgozat, ami tényleg a tankörhöz tartozik, vagy 'uj'...
-            if ($tipus < 3 || checkTankorDolgozata($tankorId, $dolgozatId)) {
-                    // Új dolgozat felvétele - ha kell
-                    if (($tipus > 2) and ($dolgozatId == 'uj')) $dolgozatId = ujDolgozat($tanarId, $tankorId);
-                    // Jegyek beírása
-                    $v = $Values = array();
-                    for ($i = 0; $i < count($Beirando); $i++) {
-                	/* oraId, dolgozatId 'NULL' stringet is kaphat a hívó függvénytől */
-			if ($oraId == 'NULL') {
-			    if ($dolgozatId == 'NULL') $Values[] = "(%u, '%s', %f, %u, %u, NOW(), %s, %s, '%s',NOW())";
-			    else $Values[] = "(%u, '%s', %f, %u, %u, NOW(), %s, %u, '%s',NOW())";
-			} else {
-			    if ($dolgozatId == 'NULL') $Values[] = "(%u, '%s', %f, %u, %u, NOW(), %u, %s, '%s',NOW())";
-			    else $Values[] = "(%u, '%s', %f, %u, %u, NOW(), %u, %u, '%s',NOW())";
-			}
-                        array_push($v, $Beirando[$i]['diakId'], $Beirando[$i]['jegyTipus'], $Beirando[$i]['jegy'], $tipus, $tankorId, $oraId, $dolgozatId, $megjegyzes);
-                    }
-                    $q = "INSERT INTO jegy (diakId, jegyTipus, jegy, tipus, tankorId, dt, oraId, dolgozatId, megjegyzes, modositasDt)
-                                VALUES ".implode(',',$Values);
-                    $r = db_query($q, array('fv' => 'jegyBeiras', 'modul' => 'naplo', 'values' => $v), $lr);
-                    if (!$r) return false;
-                    logAction(
-			array(
-			    'actionId'=>$actionId,
-			    'szoveg'=>"Jegybeírás: $tankorId, $tipus, $oraId, $dolgozatId",
-			    'table'=>'jegy'
-			)
-		    );
-            } else {
-                    // dolgozat jegy lenne, de nincs dolgozat megadva, legalábbis nem a tankörhöz tartozó...
-                    $_SESSION['alert'][] = 'message:wrong_data:jegyBeiras:tipus '.$tipus.':dolgozatId '.$did;
-                    return false;
-            }
-
-            return true;
-
-    }
-
-
-
-
-    // -- 2009
-    /* $jegyek[index] = assoc array, melyben a módosuló jegy adatai szerepelnek
-	tankorId, targyId, actionId csak a loghoz kell!!! --> (???)
-    */
-    function jegyLezaras($jegyek, $tankorId, $targyId, $actionId) {
-
-	    zaroJegyBeiras($jegyek);
-            logAction(
-		array(
-		    'actionId'=>$actionId,
-		    'szoveg'=>"Bizonyítvány: $tankorId, $targyId", 
-		    'table'=>'bizonyitvany'
-		)
-	    );
-            return true;
-
-    }
-
-?>
diff --git a/mayor-orig/www/include/modules/naplo/osztalyozo/targySorrend.php b/mayor-orig/www/include/modules/naplo/osztalyozo/targySorrend.php
deleted file mode 100644
index c634641a..00000000
--- a/mayor-orig/www/include/modules/naplo/osztalyozo/targySorrend.php
+++ /dev/null
@@ -1,55 +0,0 @@
- 'targySorrendValtas', 'modul' => 'naplo', 'result' => 'value', 'values' => $v));
-
-	$q = "UPDATE targySorszam SET sorszam=%u-sorszam WHERE osztalyId=%u AND sorrendNev='%s' AND sorszam IN (%u, %u)";
-	if ($irany == 'fel' && $s > 0) $v = array((2*$s-1), $osztalyId, $sorrendNev, $s, ($s-1));
-	elseif ($irany == 'le') $v = array((2*$s+1), $osztalyId, $sorrendNev, $s, ($s+1));
-	else return false;
-
-	return db_query($q, array('fv' => 'targySorrendValtas', 'modul' => 'naplo', 'values' => $v));
-	
-    }
-
-    function checkTargySor($osztalyId, $sorrendNev, $Targyak) {
-
-	$q = "SELECT COUNT(sorszam) AS db FROM targySorszam WHERE osztalyId=%u AND sorrendNev='%s'";
-	$v = array($osztalyId, $sorrendNev);
-	$db = db_query($q, array('fv' => 'checkTargySor', 'modul' => 'naplo', 'result' => 'value', 'values' => $v));
-	if ($db == 0 && count($Targyak) > 0) {
-	    // feltöltjük
-	    $v = $V = array();
-	    for ($i = 0; $i < count($Targyak); $i++) {
-		$V[] = "(%u, %u, '%s', %u)";
-		array_push($v, $osztalyId, $Targyak[$i]['targyId'], $sorrendNev, $i);
-	    }
-	    $q = "INSERT INTO targySorszam (osztalyId, targyId, sorrendNev, sorszam) VALUES ".implode(',', $V);
-	    db_query($q, array('fv' => 'checkTargySor', 'modul' => 'naplo', 'values' => $v));
-	}
-
-    }
-
-    function ujTargySorrend($osztalyId, $sorrendNev, $targyIds) {
-
-	$q = "DELETE FROM targySorszam WHERE osztalyId=%u AND sorrendNev='%s'";
-	db_query($q, array('fv' => 'usTargySorrend', 'modul' => 'naplo', 'values' => array($osztalyId, $sorrendNev)));
-
-	if (count($targyIds) > 0) {
-	    $v = $V = array();
-	    for ($i = 0; $i < count($targyIds); $i++) {
-		$V[] = "(%u, %u, '%s', %u)";
-		array_push($v, $osztalyId, $targyIds[$i], $sorrendNev, $i);
-	    }
-	    $q = "INSERT INTO targySorszam (osztalyId, targyId, sorrendNev, sorszam) VALUES ".implode(',', $V);
-	    db_query($q, array('fv' => 'usTargySorrend', 'modul' => 'naplo', 'values' => $v));
-	}
-
-	return true;
-
-    }
-
-?>
diff --git a/mayor-orig/www/include/modules/naplo/osztalyozo/vizsga.php b/mayor-orig/www/include/modules/naplo/osztalyozo/vizsga.php
deleted file mode 100644
index 9849255d..00000000
--- a/mayor-orig/www/include/modules/naplo/osztalyozo/vizsga.php
+++ /dev/null
@@ -1,138 +0,0 @@
- 'naplo_intezmeny', 'fv' => 'vizsgajelentkezes', 'result' => 'insert', 'values' => $v));
-
-    }
-
-    function vizsgaIdopontRogzites($VD) {
-
-
-	foreach ($VD as $vizsgaId => $vizsgaDt) {
-	    $vizsgaAdat = getVizsgaAdatById($vizsgaId);
-	    if ($vizsgaAdat['vizsgaDt'] == '') {
-		$q = "UPDATE vizsga SET vizsgaDt='%s' WHERE vizsgaId=%u";
-		$v = array($vizsgaDt, $vizsgaId);
-		db_query($q, array('modul' => 'naplo_intezmeny', 'fv' => 'vizsgaIdopontRogzites', 'values' => $v));
-	    } else {
-		$_SESSION['alert'][] = 'message:wrong_data:már van vizsgaDt:vizsgaId='.$vizsgaId;
-	    }
-	}
-
-    }
-
-    function vizsgaHalasztas($HD) {
-
-	global $ZaradekIndex;
-
-	foreach ($HD as $vizsgaId => $halasztasDt) {
-	    $vizsgaAdat = getVizsgaAdatById($vizsgaId);
-	    if ($vizsgaAdat['vizsgaDt'] != '' && strtotime($vizsgaAdat['vizsgaDt']) < strtotime($halasztasDt) && !isset($vizsgaAdat['zaradekId'])) {
-		// vizsgahalasztás záradékai
-		$zaradekIndex = $ZaradekIndex['vizsga halasztás'][ $vizsgaAdat['tipus'] ];
-		$Z = array(
-		    'zaradekIndex' => $zaradekIndex,
-		    'diakId' => $vizsgaAdat['diakId'],
-		    'dt' => date('Y-m-d'),
-		    'csere' => array('%igDt%' => $halasztasDt)
-		);
-		$zaradekId = zaradekRogzites($Z);
-		// eredeti vizsga záradékolása
-		$q = "UPDATE vizsga SET zaradekId=%u WHERE vizsgaId=%u";
-		$v = array($zaradekId, $vizsgaId);
-		db_query($q, array('modul' => 'naplo_intezmeny', 'fv' => 'vizsgaHalasztas/záradékolás', 'values' => $v));
-		// új vizsga felvétele
-//		$q = "INSERT INTO vizsga (diakId, targyId, evfolyam, felev, tipus, jelentkezesDt, vizsgaDt) VALUES (%u, %u, %u, %u, '%s', '%s', '%s')";
-//		$v = array($vizsgaAdat['diakId'], $vizsgaAdat['targyId'], $vizsgaAdat['evfolyam'], $vizsgaAdat['felev'], $vizsgaAdat['tipus'], $vizsgaAdat['jelentkezesDt'], $halasztasDt);
-// A halasztáskor megadott dátum nem a vizsga dátuma, hanem egy határidő, amíg le kell tenni a vizsgát.
-		$q = "INSERT INTO vizsga (diakId, targyId, evfolyam, evfolyamJel, felev, tipus, jelentkezesDt) VALUES (%u, %u, %u, '%s', %u, '%s', '%s')";
-		$v = array($vizsgaAdat['diakId'], $vizsgaAdat['targyId'], $vizsgaAdat['evfolyam'], $ADAT['evfolyamJel'], $vizsgaAdat['felev'], $vizsgaAdat['tipus'], $vizsgaAdat['jelentkezesDt']);
-		db_query($q, array('modul' => 'naplo_intezmeny', 'fv' => 'vizsgajelentkezes', 'result' => 'insert', 'values' => $v));
-
-	    } else {
-		$_SESSION['alert'][] = 'message:wrong_data:még nincs vizsgaDt, vagy korábbi, mint a halasztás dátuma:vizsgaId='.$vizsgaId;
-	    }
-	}
-
-    }
-
-    function vizsgaErtekeles($jegyek) {
-
-	global $KOVETELMENY, $ZaradekIndex;
-
-	if (is_array($jegyek)) foreach ($jegyek as $vizsgaId => $jegyAdat) {
-	    $vizsgaAdat = getVizsgaAdatById($vizsgaId);
-	    // A beírandó jegy adatai szinkronban kell legyenek a vizsga adataival
-	    $jegyAdat['felev'] = $vizsgaAdat['felev'];
-	    $jegyAdat['diakId'] = $vizsgaAdat['diakId'];
-	    $jegyAdat['targyId'] = $vizsgaAdat['targyId'];
-	    $jegyAdat['evfolyamJel'] = $vizsgaAdat['evfolyamJel'];
-	    $jegyAdat['evfolyam'] = $vizsgaAdat['evfolyam'];
-
-	    $targyAdat = getTargyById($vizsgaAdat['targyId']);
-	    $bukas = (in_array($jegyAdat['jegy'], $KOVETELMENY[ $jegyAdat['jegyTipus'] ]['sikertelen']));
-	    if ($vizsgaAdat['vizsgaDt'] != '' && !isset($vizsgaAdat['zaroJegyId']) && !isset($vizsgaAdat['zaradekId'])) {
-		// vizsga értékelés záradékai
-		if ($bukas) {
-		    if ($jegyAdat['jegyTipus'] != 'jegy' 
-		    && $jegyAdat['jegyTipus'] != 'féljegy'
-		    && $vizsgaAdat['tipus'] == 'javítóvizsga') {
-			$zaradekIndex = $ZaradekIndex['vizsga'][$vizsgaAdat['tipus'].' nem teljesített'];
-		    } else {
-			$zaradekIndex = $ZaradekIndex['vizsga'][$vizsgaAdat['tipus'].' bukás'];
-		    }
-		} else { 
-		    $zaradekIndex = $ZaradekIndex['vizsga'][ $vizsgaAdat['tipus'] ]; 
-		}
-		$Z = array(
-		    'zaradekIndex' => $zaradekIndex,
-		    'diakId' => $vizsgaAdat['diakId'],
-		    'dt' => $vizsgaAdat['vizsgaDt'], // date('Y-m-d'),
-		    'csere' => array(
-			'%tantárgy%' => $targyAdat['targyNev'], 
-			'%dátum%' => str_replace('-','.',$vizsgaAdat['vizsgaDt']),
-			'%osztályzat%' => $KOVETELMENY[ $jegyAdat['jegyTipus'] ][ $jegyAdat['jegy'] ]['rovid'].' ('.$KOVETELMENY[ $jegyAdat['jegyTipus'] ][ $jegyAdat['jegy'] ]['hivatalos'].')',
-			'%évfolyam%' => $vizsgaAdat['evfolyamJel'] . (($jegyAdat['felev'] == 2) ? '.':'. ('.$jegyAdat['felev'].'. félév)') // +1 - vajon miért volt?
-		    )
-		);
-		// Ez hibás így!
-		// - lehet, hogy több tárgyból is bukott! Akkor egy sikeres javítóvizsga nem jelenti azt, hogy tovább léphet
-		if ($vizsgaAdat['tipus'] == 'javítóvizsga' && !$bukas) $Z['csere']['%évfolyam%'] = getKovetkezoEvfolyamJel($vizsgaAdat['evfolyamJel']).'.'; // következő évfolyamba léphet
-		$zaradekId = zaradekRogzites($Z);
-		// vizsga zárójegyének beírása
-		$jegyAdat['dt'] = $vizsgaAdat['vizsgaDt']; // -- ez elavult
-		$jegyAdat['hivatalosDt'] = $vizsgaAdat['vizsgaDt'];
-		if ($jegyAdat['evfolyamJel'] != '') $jegyAdat['evfolyam'] = evfolyamJel2evfolyam($jegyAdat['evfolyamJel']);
-		$zaroJegyId = zaroJegyBeiras(array($jegyAdat));
-		// eredeti vizsga záradékolása és zárójegyhez kötése
-		$q = "UPDATE vizsga SET zaradekId=%u, zaroJegyId=%u WHERE vizsgaId=%u";
-		$v = array($zaradekId, $zaroJegyId, $vizsgaId);
-		db_query($q, array('modul' => 'naplo_intezmeny', 'fv' => 'vizsgaHalasztas/záradékolás', 'values' => $v));
-	    }
-	}
-
-    }
-
-    function vizsgaTorlese($vizsgaId) {
-
-	$v = array($vizsgaId);
-	
-	// Elároljuk a vizsgához tartozó zárójegyId-t
-	$q = "SELECT zaroJegyId FROM vizsga WHERE vizsgaId=%u";
-	$zaroJegyId = db_query($q, array('modul' => 'naplo_intezmeny', 'fv' => 'vizsgaTorlese/zárójegy törlése', 'result' => 'value', 'values' => $v));
-	// Töröljük a vizsgához tartozó zárasékot - és ezzel a vizsgát is
-	$q = "DELETE FROM zaradek WHERE zaradekId=(SELECT zaradekId FROM vizsga WHERE vizsgaId=%u)";
-	db_query($q, array('modul' => 'naplo_intezmeny', 'fv' => 'vizsgaTorlese/zárójegy törlése', 'values' => $v));
-	// Töröljük az eltárolt vizsgajegyet
-	$q = "DELETE FROM zaroJegy WHERE zaroJegyId=%u";
-	db_query($q, array('modul' => 'naplo_intezmeny', 'fv' => 'vizsgaTorlese/zárójegy törlése', 'values' => array($zaroJegyId)));
-	// Ha netán még nem törlődött volna a függőségek miatt, akkor most töröljük a vizsgát
-	$q = "DELETE FROM vizsga WHERE vizsgaId=%u";
-	return db_query($q, array('modul' => 'naplo_intezmeny', 'fv' => 'vizsgaTorlese', 'values' => $v));
-    
-    }
-
-?>
diff --git a/mayor-orig/www/include/modules/naplo/share/bejegyzes.php b/mayor-orig/www/include/modules/naplo/share/bejegyzes.php
deleted file mode 100644
index 08ddfee0..00000000
--- a/mayor-orig/www/include/modules/naplo/share/bejegyzes.php
+++ /dev/null
@@ -1,65 +0,0 @@
- 'getBejegyzesTipusById','modul'=>'naplo_intezmeny','values'=>array($btId),'result'=>'record'));
-    }
-
-    function getDarabBejegyzes($ADAT) {
-
-	$q = "SELECT COUNT(*) FROM bejegyzes WHERE beirasDt>='%s' AND diakId=%u";
-	return db_query($q, array('fv' => 'getDarabBejegyzes', 'modul' => 'naplo', 'result' => 'value', 'values' => array($ADAT['tolDt'], $ADAT['diakId'])));
-
-    }
-
-    function getDiakBejegyzesekByTanev($diakId, $tanev) {
-
-	$tanevDb = tanevDbNev(__INTEZMENY, $tanev);
-
-        $q = "SELECT * FROM `%s`.bejegyzes LEFT JOIN `%s`.`bejegyzesTipus` USING (`bejegyzesTipusId`) WHERE diakId=%u ORDER BY beirasDt";
-	$v = array($tanevDb, __INTEZMENYDBNEV, $diakId);
-        $ret = db_query($q, array(
-            'fv' => 'getDiakBejegyzesekByTanev', 'modul' => 'naplo', 'result' => 'indexed', 'values' => $v
-        ));
-        for ($i = 0; $i < count($ret); $i++)
-            if ($ret[$i]['tanarId'] != '') $ret[$i]['tanarNev'] = getTanarNevById($ret[$i]['tanarId']);
-
-        return $ret;
-
-    }
-
-    function getBejegyzesTipusokByJogosult($jogosult, $SET = array('tipus' => array('fegyelmi','dicséret','üzenet'), 'hianyzas' => false, 'dt' => null)) {
-
-	if (!is_array($jogosult) || count($jogosult) == 0) return false;
-	$dt = isset($SET['dt'])?$SET['dt']:date('Y-m-d');
-
-	$W = array();
-	foreach ($jogosult as $j) $W[] = "jogosult LIKE '%%$j%%'";
-
-	if ($SET['hianyzas'] === true) $WH = "AND hianyzasDb > 0 ";
-
-	$q = "SELECT * FROM bejegyzesTipus WHERE (".implode(' OR ', $W).") ".$WH."AND tipus IN ('".implode("','", $SET['tipus'])."') 
-		AND tolDt<='%s' AND (igDt IS NULL OR '%s'<=igDt)
-		ORDER BY tipus,fokozat";
-	$v = array($dt, $dt);
-	return db_query($q, array('fv' => 'getBejegyzesTipusokByJogosult', 'modul' => 'naplo_intezmeny', 'result' => 'indexed','values' => $v));
-
-    }
-
-    function getTorzslapBejegyzesByDiakIds($diakIds, $SET = array('tanev'=>__TANEV)) {
-
-	if (!is_array($diakIds)) $diakIds = array($diakIds);
-	$tanev = readVariable($SET['tanev'], 'numeric unsigned', __TANEV);
-	if ($tanev == __TANEV) { global $_TANEV; $TA = $_TANEV; }
-	else { $TA = getTanevAdat($tanev); }
-
-	$q = "SELECT * FROM `%s`.`bejegyzes` WHERE `referenciaDt`='%s' AND `diakId` IN ('".implode("','", array_fill(0, count($diakIds), '%u'))."') ORDER BY `beirasDt`";
-	$v = $diakIds; array_unshift($v, tanevDbNev(__INTEZMENY, $tanev), $TA['zarasDt']);
-        $ret = db_query($q, array(
-            'fv' => 'getTorzslapBejegyzesByDiakIds', 'modul' => 'naplo', 'result' => 'multiassoc', 'keyfield'=>'diakId', 'values' => $v
-        ));
-
-	return $ret;
-    }
-
-?>
diff --git a/mayor-orig/www/include/modules/naplo/share/bejegyzesModifier.php b/mayor-orig/www/include/modules/naplo/share/bejegyzesModifier.php
deleted file mode 100644
index dd5bb05c..00000000
--- a/mayor-orig/www/include/modules/naplo/share/bejegyzesModifier.php
+++ /dev/null
@@ -1,40 +0,0 @@
- 'ujBejegyzes', 'modul' => 'naplo', 'result' => 'insert', 'values' => $v));
-
-    }
-
-?>
diff --git a/mayor-orig/www/include/modules/naplo/share/bontas.php b/mayor-orig/www/include/modules/naplo/share/bontas.php
deleted file mode 100644
index 1053eb84..00000000
--- a/mayor-orig/www/include/modules/naplo/share/bontas.php
+++ /dev/null
@@ -1,72 +0,0 @@
-'bontasTankor/bt','modul'=>'naplo','values'=>$v), $lr);
-	    $ok = $ok && ($r !== false);
-        }
-
-	// is_resource mysqli esetén nem jó (object)
-	if (!$olr) {
-    	    if (!$ok) db_rollback($lr, 'tankörnév hozzárendelés');
-	    db_close($lr);
-	}
-
-	return $ok;
-    }
-
-    function getBontasAdat($bontasId) {
-
-	$q = "select * from kepzesTargyBontas where bontasId=%u";
-	$ret = db_query($q, array('fv'=>'getBontasAdat/1','modul'=>'naplo','result'=>'record','values'=>array($bontasId)));
-	
-	$q = "select * from bontasTankor where bontasId=%u order by tankorId";
-	$ret['tankor-oraszam'] = db_query($q, array('fv'=>'getBontasAdat/2','modul'=>'naplo','result'=>'indexed','values'=>array($bontasId)));
-
-	$ret['hetiOraszam'] = 0;
-	if (is_array($ret['tankor-oraszam'])) foreach ($ret['tankor-oraszam'] as $index => $toAdat) $ret['hetiOraszam'] += $toAdat['hetiOraszam'];
-
-	return $ret;
-    }
-
-    function osztalyBontasKeszE($osztalyId) {
-
-	// Az osztályhoz rendelt képzések óraterveinek óraszámai
-	$q1 = "select kepzesOratervId, hetiOraszam from osztalyNaplo left join ".__INTEZMENYDBNEV.".kepzesOsztaly using (osztalyId) 
-		left join ".__INTEZMENYDBNEV.".kepzesOraterv using (kepzesId) 
-		where osztalyId=%u and osztalyNaplo.evfolyamJel=kepzesOraterv.evfolyamJel";
-	// Az osztályhoz rendelt bontások óraszámai
-	$q2 = "select kepzesOratervId, sum(hetiOraszam) as hetiOraszam from kepzesTargyBontas left join bontasTankor using (bontasId) 
-		where osztalyId=%u group by bontasId";
-	$v = array($osztalyId, $osztalyId);
-	// Az óratervet lefedik-e a bontások
-	$q12 = "select count(oraterv.kepzesOratervId) from 
-		(".$q1.") as oraterv 
-		left join (".$q2.") as bontas
-		using (kepzesOratervId, hetiOraszam) 
-		where bontas.kepzesOratervId is null";
-	// A bontások óraszámai teljesek-e
-	$q21 = "select count(bontas.kepzesOratervId) from 
-		(".$q2.") as bontas 
-		left join (".$q1.") as oraterv
-		using (kepzesOratervId, hetiOraszam) 
-		where oraterv.kepzesOratervId is null";
-
-	return (
-		db_query($q12, array('fv'=>'osztalyBontasKeszE/12','modul'=>'naplo','result'=>'value','values'=>$v)) 
-		+ db_query($q21, array('fv'=>'osztalyBontasKeszE/21','modul'=>'naplo','result'=>'value','values'=>$v))
-		== 0
-	);
-
-    }
-
-?>
\ No newline at end of file
diff --git a/mayor-orig/www/include/modules/naplo/share/diak.php b/mayor-orig/www/include/modules/naplo/share/diak.php
deleted file mode 100644
index 94623979..00000000
--- a/mayor-orig/www/include/modules/naplo/share/diak.php
+++ /dev/null
@@ -1,647 +0,0 @@
- __TANEV)) {
-
-	global $_TANEV;
-
-	// tanév adatai
-	$tanev = readVariable($SET['tanev'], 'numeric unsigned', __TANEV);
-	if ($tanev != __TANEV) $tanevAdat = getTanevAdat($tanev, $lr);
-	else $tanevAdat = $_TANEV;
-
-	// ez volt eredetileg:
-	/*$q = "SELECT diakId FROM osztalyDiak LEFT JOIN osztaly USING (osztalyId) 
-		WHERE beDt <= '%s' AND (kiDt IS NULL OR '%s' <= kiDt)
-		GROUP BY diakId HAVING MAX(vegzoTanev) = %u";*/
-	// le kell kéredezni a megadott tanévben végzős OSZTÁLYOK diákjait, kivéve azokat, akik később végzős osztályok tagjai
-	$q = "SELECT diakId FROM osztalyDiak LEFT JOIN osztaly USING (osztalyId) 
-		WHERE beDt <= '%s' AND (kiDt IS NULL OR '%s' <= kiDt)
-		AND diakId NOT IN (
-		    SELECT diakId FROM osztalyDiak LEFT JOIN osztaly USING (osztalyId) WHERE vegzoTanev>%u
-		)
-		GROUP BY diakId HAVING MAX(vegzoTanev) = %u";
-	return db_query($q, array('fv' => 'getVegzosDiakok', 'modul' => 'naplo_intezmeny', 'values' => array($tanevAdat['zarasDt'], $tanevAdat['zarasDt'],$tanev, $tanev), 'result' => 'idonly'));
-    }
-
-    function getDiakokOld($SET = array('osztalyId' => null, 'tanev' => __TANEV, 'tolDt' => null, 'igDt' => null, 'override' => false, 'statusz' => null, 'result'=>''), $olr = null) {
-
-	global $_TANEV;
-
-	if ($SET['csakId']===true ||  $SET['result'] == 'csakId') $SET['result'] = 'idonly';
-	$osztalyId = readVariable($SET['osztalyId'], 'numeric unsigned', null);
-	$tolDt = readVariable($SET['tolDt'], 'datetime', null);
-	$igDt = readVariable($SET['igDt'], 'datetime', null);
-	// Az adott tanév elejének és végének lekérdezése
-	$tanev = readVariable($SET['tanev'], 'numeric unsigned', __TANEV);
-	initTolIgDt($tanev, $tolDt, $igDt, $SET['override']);
-
-	if ($tanev != __TANEV) $tanevAdat = getTanevAdat($tanev, $lr);
-	else $tanevAdat = $_TANEV;
-
-	$KIBEDT = "beDt <= '%2\$s' AND (kiDt IS NULL OR '%3\$s' <= kiDt) AND ";
-
-	// A lekérdezendő diákok státusza
-	if (!is_array($SET['statusz']) || count($SET['statusz']) == 0)	{
-	    if ($tanevAdat['statusz'] == 'aktív') {
-		$Statusz = array('jogviszonyban van','magántanuló','vendégtanuló');
-	    } else {
-		$Statusz = array('jogviszonyban van','magántanuló','vendégtanuló','jogviszonya felfüggesztve','jogviszonya lezárva');
-		// ebben az esetben kit érdekel a diák kilépésének ideje???
-		$KIBEDT = ''; $v = array();
-	    }
-	} else {
-	    $Statusz = readVariable($SET['statusz'], 'enum', null, 
-		array('felvételt nyert','jogviszonyban van','magántanuló','vendégtanuló','jogviszonya felfüggesztve','jogviszonya lezárva')
-	    );
-	}
-
-	// Intézményi adatbázis neve
-	$intezmenyDb = intezmenyDbNev(__INTEZMENY);
-/*
-    Szerintem ez nem jó így.
-    1. a tol-igDt alapján a diakJogviszony táblát kellene néznünk - közben volt-e jogviszonyban, vagy magántanulóként.
-    2. A having végén a jogviszony miért is?
-
-*/
-	if (!isset($osztalyId)) {
-	    if ($SET['result'] == 'idonly') $mezok = 'diakId';
-	    else $mezok = "diakId, TRIM(CONCAT_WS(' ',viseltNevElotag, ViseltCsaladiNev, viseltUtoNev)) AS diakNev, 
-			statusz, MAX(osztaly.vegzoTanev) AS maxVegzoTanev";
-	    $q = "SELECT $mezok
-		    FROM %2\$s.diak 
-		    LEFT JOIN %2\$s.osztalyDiak USING (diakId)
-		    LEFT JOIN %2\$s.osztaly USING (osztalyId)
-		    WHERE diak.kezdoTanev <= %u
-		    AND statusz IN ('".implode("','", $Statusz)."')
-		    GROUP BY diakId
-		    HAVING %1\$u <= maxVegzoTanev OR maxVegzoTanev IS NULL OR statusz IN ('jogviszonyban van','magántanuló')
-		    ORDER BY viseltCsaladiNev,viseltUtonev";
-	    $v = array($tanev, $intezmenyDb);
-	} else {
-	    if ($SET['result'] == 'idonly') $mezok = 'diakId';
-	    else $mezok = "osztalyDiak.diakId, TRIM(CONCAT_WS(' ', viseltNevElotag, viseltCsaladinev, viseltUtonev)) AS diakNev, 
-			    statusz, DATE_FORMAT(beDt,'%%Y-%%m-%%d') AS beDt, DATE_FORMAT(kiDt,'%%Y-%%m-%%d') AS kiDt";
-	    $q = "SELECT $mezok
-			FROM %1\$s.osztalyDiak LEFT JOIN %1\$s.diak USING (diakId)
-			WHERE $KIBEDT 
-			    osztalyDiak.osztalyId=%4\$u
-			AND statusz IN ('".implode("','", $Statusz)."')
-			ORDER BY ViseltCsaladiNev,ViseltUtonev";
-	    $v = array($intezmenyDb, $igDt, $tolDt, $osztalyId);
-
-	}
-
-	if ($SET['result'] == 'idonly')
-	    return db_query($q, array('fv' => 'getDiakok', 'modul' => 'naplo_intezmeny', 'values' => $v, 'result' => 'idonly'), $olr);
-	elseif ($SET['result'] == 'assoc')
-	    return db_query($q, array('fv' => 'getDiakok', 'modul' => 'naplo_intezmeny', 'result' => 'assoc', 'keyfield' => 'diakId', 'values' => $v), $olr);
-	else 
-	    return db_query($q, array('fv' => 'getDiakok', 'modul' => 'naplo_intezmeny', 'result' => 'indexed', 'values' => $v), $olr);
-
-    }
-
-    function getDiakok($SET = array('osztalyId' => null, 'tanev' => __TANEV, 'tolDt' => null, 'igDt' => null, 'override' => false, 'statusz' => null, 'result'=>'', 'extraAttrs'=>''), $olr = null) {
-
-	global $_TANEV;
-
-	$result = readVariable($SET['result'], 'enum', 'indexed', array('indexed','assoc','idonly','keyvaluepair'));
-	$osztalyId = readVariable($SET['osztalyId'], 'id', null);
-	if (!is_null($osztalyId) && !is_array($osztalyId)) $osztalyId = array($osztalyId); // ha csak egy érték, legyen tömb
-	$tolDt = readVariable($SET['tolDt'], 'datetime', null);
-	$igDt = readVariable($SET['igDt'], 'datetime', null);
-	$tanev = readVariable($SET['tanev'], 'numeric unsigned', __TANEV);
-	initTolIgDt($tanev, $tolDt, $igDt, $SET['override']);
-	if ($tanev != __TANEV) $tanevAdat = getTanevAdat($tanev, $lr);
-	else $tanevAdat = $_TANEV;
-
-	$extraAttrs = ($SET['extraAttrs']!='') ? ','.$SET['extraAttrs'] : '';
-
-	// A lekérdezendő diákok státusza
-	if (!is_array($SET['statusz']) || count($SET['statusz']) == 0)	{
-	    if ($tanevAdat['statusz'] == 'aktív') {
-		$Statusz = array('jogviszonyban van','magántanuló','vendégtanuló');
-	    } else {
-		$Statusz = array('jogviszonyban van','magántanuló','vendégtanuló','jogviszonya felfüggesztve','jogviszonya lezárva');
-	    }
-	} else {
-	    $Statusz = readVariable($SET['statusz'], 'enum', null, 
-		array('felvételt nyert','jogviszonyban van','magántanuló','vendégtanuló','jogviszonya felfüggesztve','jogviszonya lezárva')
-	    );
-	}
-
-	// jogviszony szerinti lekérdezés - szóbajövő diakId-k
-	// Ez MySQL 5.1.41 alatt (Ubuntu) működött, de 5.0.32-vel (Debian Etch?) nem
-/*	$q = "SELECT diakId FROM diakJogviszony AS dj1 WHERE statusz IN ('".implode("','", $Statusz)."') AND dt <= '%s'
-		GROUP BY diakId 
-		HAVING (SELECT COUNT(*) FROM diakJogviszony AS dj2 WHERE diakId = dj1.diakId AND MAX(dj1.dt) < dt AND dt <= '%s') = 0";
-*/
-	// Ez működik 5.0.32-vel is
-        $q = "SELECT diakId FROM diakJogviszony WHERE dt <= '%s' GROUP BY diakId HAVING
-                MAX(IF(statusz IN ('".implode("','", $Statusz)."'),dt,'0000-00-00')) >
-                MAX(IF(statusz NOT IN ('".implode("','", $Statusz)."') AND dt <= '%s',dt,'0000-00-00'))";
-	$v = array($igDt, $tolDt);
-	$diakIds = db_query($q, array('fv' => 'getDiakok', 'modul' => 'naplo_intezmeny', 'values' => $v, 'result' => 'idonly'));
-	if (!is_array($diakIds)) return false; // hiba
-	if (count($diakIds) == 0) return array(); // nincs ilyen diák
-        // A felvételt nyert státuszú diák ebben a listában nem szerepel
-        if (in_array('felvételt nyert', $Statusz)) {
-            $FNY_WHERE = " OR statusz = 'felvételt nyert' ";
-        }
-	// Névsor
-	if (!isset($osztalyId)) {
-	    $q = "SELECT diakId, TRIM(CONCAT_WS(' ',viseltNevElotag, ViseltCsaladiNev, viseltUtoNev)) AS diakNev, statusz AS aktualisStatusz 
-		    $extraAttrs
-		    FROM diak 
-		    WHERE diak.kezdoTanev <= %u AND (diakId IN (".implode(",", $diakIds).") $FNY_WHERE )
-		    ORDER BY viseltCsaladiNev,viseltUtonev";
-	    $v = array($tanev, $intezmenyDb);
-	} else {
-
-	    if ($tanev!='') 	
-		$qNs = ", diakNaploSorszam(osztalyDiak.diakId,$tanev,osztalyDiak.osztalyId) AS diakNaploSorszam";
-	    else
-		$qNs = '';
-
-	    $q = "SELECT DISTINCT osztalyDiak.diakId, TRIM(CONCAT_WS(' ', viseltNevElotag, viseltCsaladinev, viseltUtonev)) AS diakNev, statusz AS aktualisStatusz
-			$qNs $extraAttrs
-			FROM osztalyDiak LEFT JOIN diak USING (diakId)
-			WHERE beDt <= '%s' AND (kiDt IS NULL OR '%s' <= kiDt) AND 
-			    osztalyDiak.osztalyId IN (". implode(',', $osztalyId) .")
-			AND (diakId IN (".implode(",", $diakIds).") $FNY_WHERE )
-			ORDER BY ViseltCsaladiNev,ViseltUtonev";
-	    $v = array($igDt, $tolDt);
-	}
-
-	return db_query($q, array('fv' => 'getDiakok', 'modul' => 'naplo_intezmeny', 'result' => $result, 'keyfield' => 'diakId', 'values' => $v), $olr);
-
-    }
-
-
-
-    function getDiakokByOsztalyId($IDs, $SET = array('tanev' => __TANEV, 'tolDt' => null, 'igDt' => null, 'result' => '', 'statusz' => array('jogviszonyban van','magántanuló'))) {
-	////////////////////////////////////////////////////////////////
-	// !!! Ez a függvény csak a diák aktuális státuszát nézi! !!! //
-	////////////////////////////////////////////////////////////////
-	if (!is_array($IDs) || count($IDs) == 0) return false;
-
-	if ($SET['result']=='assoc' || $SET['result']=='multiassoc') $SET['result'] = 'multiassoc';
-	else $SET['result'] = 'indexed';
-
-	if ($SET['tanev']!='') $tanev = $SET['tanev']; else $tanev=__TANEV;
-	// Az adott tanév elejének és végének lekérdezése
-	if ($tanev != __TANEV) $tanevAdat = getTanevAdat($tanev, $lr);
-	else { global $_TANEV; $tanevAdat = $_TANEV; }
-
-//	$tanevKezdes = $tanevAdat['kezdesDt']; $tanevZaras = $tanevAdat['zarasDt']; $time = time();
-	$tolDt = readVariable($SET['tolDt'], 'date', $tanevAdat['kezdesDt']);
-	$igDt = readVariable($SET['igDt'], 'date', $tanevAdat['zarasDt']);
-
-	if (!is_array($SET['statusz']) || count($SET['statusz']) == 0) 
-	    if ($tanevAdat['statusz'] == 'aktív') $SET['statusz'] = array('jogviszonyban van','magántanuló');
-	    else $SET['statusz'] = array('jogviszonyban van','magántanuló','jogviszonya felfüggesztve','jogviszonya lezárva');
-	// Intézményi adatbázis neve
-	$intezmenyDb = intezmenyDbNev(__INTEZMENY);
-	$RESULT = false;
-
-	$q = "SELECT osztalyDiak.diakId AS diakId, TRIM(CONCAT_WS(' ', viseltNevElotag, viseltCsaladinev, viseltUtonev)) AS diakNev, 
-			    osztalyId, DATE_FORMAT(beDt,'%%Y-%%m-%%d') AS beDt, DATE_FORMAT(kiDt,'%%Y-%%m-%%d') AS kiDt
-			FROM `%s`.osztalyDiak LEFT JOIN `%s`.diak USING (diakId) 
-			WHERE beDt <= '%s'
-			    AND (kiDt IS NULL OR kiDt >= '%s')
-			    AND osztalyDiak.osztalyId IN (".implode(',', array_fill(0, count($IDs), '%u')).")
-			    AND statusz IN ('".implode("','", $SET['statusz'])."')
-			ORDER BY ViseltCsaladiNev,ViseltUtonev";
-//	array_unshift($IDs, $intezmenyDb, $intezmenyDb, $tanevZaras, $tanevKezdes);
-	array_unshift($IDs, $intezmenyDb, $intezmenyDb, $igDt, $tolDt);
-	return db_query($q, array('result' => $SET['result'], 'fv' => 'getDiakokByOsztalyId', 'modul' => 'naplo_intezmeny', 'values' => $IDs, 'keyfield' => 'osztalyId'));
-
-
-    }
-
-    /*
-	Az előző függvény hiányosságait kiküszöbölő függvény, ami a diakJogviszony táblát is figyelembeveszi
-
-	$SET['tanev'|'tolDt'|'igDt'|'statusz'|'statuszonkent']
-
-	return[ diakId ][ 'diakId'|'diakNev' ]
-	return[ diakId ][ 'osztalyDiak' ][][ 'beDt'|'kiDt' ] -- DESC !!
-	return[ diakId ][ 'statusz' ][][ 'statusz'|'dt' ]    -- DESC !!
-	return['jogviszonyban van'|...|'jogviszonya lezárva'][]
-
-    */
-
-    /* EZ ETTŐL MÉG GLOBAL SCOPE!!!! Kéretik normális nevet adni neki!!!*/
-    function _tmp11($value) { return array('beDt' => $value['beDt'], 'kiDt' => $value['kiDt']); }
-    function _tmp22($value) { return array('statusz' => $value['statusz'], 'dt' => $value['dt']); }
-
-    function getDiakokByOsztaly($osztalyId, $SET = array()) {
-
-	global $_TANEV;
-
-	$tanev = readVariable($SET['tanev'], 'numeric unsigned', __TANEV);
-	if ($tanev != __TANEV) $_TA = getTanevAdat($tanev, $lr);
-	else $_TA = $_TANEV;
-
-	$orderBy = ($SET['orderBy']=='naploSorszam') ? " ORDER BY diakNaploSorszam(osztalyDiak.diakId,$tanev,osztalyDiak.osztalyId) " : "ORDER BY ViseltCsaladiNev, ViseltUtonev, beDt DESC";
-	$tolDt = readVariable($SET['tolDt'], 'datetime', $_TA['kezdesDt']);
-	$igDt = readVariable($SET['igDt'], 'datetime', $_TA['zarasDt']);
-	initTolIgDt($tanev, $tolDt, $igDt);
-	$statusz = readVariable($SET['statusz'], 'enum', null, array('jogviszonyban van','magántanuló','vendégtanuló','jogviszonya felfüggesztve','jogviszonya lezárva'));
-	if (!is_array($statusz) || count($statusz) == 0) $statusz = array('jogviszonyban van','magántanuló','vendégtanuló','jogviszonya felfüggesztve','jogviszonya lezárva');
-	$statuszonkent = readVariable($SET['statuszonkent'],'bool',true);
-	$felveteltNyertEkkel = readVariable($SET['felveteltNyertEkkel'],'bool',false);
-	$intezmenyDb = intezmenyDbNev(__INTEZMENY);
-
-	// Az összes diák lekérdezése (esetleg lehet majd bent többször is az osztályban!)
-	$q = "SELECT osztalyDiak.diakId AS diakId, TRIM(CONCAT_WS(' ', viseltNevElotag, viseltCsaladinev, viseltUtonev)) AS diakNev, 
-			    osztalyId, DATE_FORMAT(beDt,'%%Y-%%m-%%d') AS beDt, DATE_FORMAT(kiDt,'%%Y-%%m-%%d') AS kiDt, statusz AS aktualisStatusz
-			FROM `%s`.osztalyDiak LEFT JOIN `%s`.diak USING (diakId) 
-			WHERE beDt <= '%s' AND (kiDt IS NULL OR kiDt >= '%s')
-			    AND osztalyDiak.osztalyId=%u ".$orderBy;
-	$v = array($intezmenyDb, $intezmenyDb, $igDt, $tolDt, $osztalyId);
-	$ret1 = db_query($q, array('result' => 'multiassoc', 'keyfield' => 'diakId', 'fv' => 'getDiakokByOsztaly', 'modul' => 'naplo_intezmeny', 'values' => $v));
-
-	if (is_array($ret1) && count($ret1)>0) $diakIds = array_keys($ret1);
-	else $diakIds = array();
-
-	if ($statuszonkent) $return = array('jogviszonyban van' => array(), 'magántanuló' => array(), 'vendégtanuló' => array(), 'jogviszonya felfüggesztve' => array(), 'jogviszonya lezárva' => array(), 'felvételt nyert'=>array());
-	else $return = array();
-
-	// Ha nincs tagja az osztálynak még/már
-	if (!is_array($diakIds) || count($diakIds) == 0) return $return;
-
-	// Jogviszonyadatok lekérdezése
-	$q = "SELECT * FROM diakJogviszony WHERE diakId IN (".implode(', ', array_fill(0, count($diakIds), '%u')).") AND dt <='$igDt' ORDER BY diakId, dt DESC";
-	array_push($diakIds, $igDt);
-	$ret2 = db_query($q, array('result' => 'multiassoc', 'keyfield' => 'diakId', 'fv' => 'getDiakokByOsztaly', 'modul' => 'naplo_intezmeny', 'values' => $diakIds ));
-	/* --TODO, ellenőrizni ret1 és ret2-t! 
-        Warning: array_map() [function.array-map]: Argument #2 should be an array in /var/mayor/www/include/modules/naplo/share/diak.php on line 187
-	Warning: Cannot modify header information - headers already sent by (output started at /var/mayor/www/include/modules/naplo/share/diak.php:187) in /var/mayor/www/policy/private/naplo/nyomtatas/osztalyozonaplo-pre.php on line 124
-	*/
-	if (is_array($ret1)) {
-	    foreach ($ret1 as $diakId => $stat) {
-		$_felveteltNyert = ($stat[0]['aktualisStatusz']=='felvételt nyert')?true:false;
-		// Szűrés a státuszra
-		// Ha az utolsó státusz jó, akkor ok (order by dt desc)
-		$i = 0;
-		if ($felveteltNyertEkkel===true) // ha a paraméter listában nincs felvételt nyert felsorolva, akkor miért engedjük meg? Nem értem.
-		    $ok = in_array($ret2[$diakId][$i]['statusz'], $statusz) || $_felveteltNyert;
-		else 
-		    $ok = in_array($ret2[$diakId][$i]['statusz'], $statusz);
-		// addig megyünk visszafele, amíg
-		//     - nem $ok (még nem találtunk megfelelő státuszt)
-		//     - van még statusz bejegyzés
-		//     - az aktuális bejegyzés dátuma > tolDt (az előtte lévők nem érvényesek a megadott időszakra)
-		while (!$ok && strtotime($ret2[$diakId][$i]['dt'])>strtotime($tolDt) && $i < count($ret2[$diakId])-1) {
-		    $i++;
-		    $ok = in_array($ret2[$diakId][$i]['statusz'], $statusz);
-		}
-		if ($ok) { // Ha az adott időszakban volt a megadott státuszok valamelyikében
-		    $return[$diakId] = array('diakId' => $ret1[$diakId][0]['diakId'], 'diakNev' => $ret1[$diakId][0]['diakNev']);
-		    $return[$diakId]['osztalyDiak'] = @array_map('_tmp11', $ret1[$diakId]);
-		    if ($_felveteltNyert)
-		    	$return[$diakId]['statusz'][] = array('statusz'=>'felvételt nyert');
-		    else
-			$return[$diakId]['statusz'] = @array_map('_tmp22', $ret2[$diakId]);
-		    if ($statuszonkent) {
-			for ($i = 0; $i < count($return[$diakId]['statusz']); $i++) {
-			    if (!in_array($diakId, $return[ $return[$diakId]['statusz'][$i]['statusz'] ])) $return[ $return[$diakId]['statusz'][$i]['statusz'] ][] = $diakId;
-			    if (strtotime($tolDt) >= strtotime($return[$diakId]['statusz'][$i]['dt'])) break;
-			}
-		    }
-		}
-	    }
-	}
-	return $return;
-
-    }
-
-    function getDiakokById($IDs, $olr = '') {
-	// Visszaadjuk a statusz-t is, de dátum nélkül ez nem túl értelemes... de a diakSelect-ben kell...
-	if (!is_array($IDs) || count($IDs) == 0) return false;
-	$q = "SELECT diakId, TRIM(CONCAT_WS(' ',viseltNevElotag, ViseltCsaladiNev, viseltUtoNev)) AS diakNev, statusz, statusz as aktualisStatusz
-		  FROM ".__INTEZMENYDBNEV.".diak WHERE diakId IN (".implode(',',$IDs).") ORDER BY viseltcsaladinev,viseltutonev";
-	return db_query($q, array('keyfield' => 'diakId', 'result' => 'assoc', 'fv' => 'getDiakokById', 'modul' => 'naplo_intezmeny'));
-    }
-
-    function getDiakNevById($diakId) {
-        $q = "SELECT TRIM(CONCAT_WS(' ', viseltNevElotag, viseltCsaladiNev, viseltUtonev)) AS diakNev 
-		FROM `".__INTEZMENYDBNEV."`.`diak` WHERE diakId=%u";
-        return db_query($q, array('fv' => 'getDiakNevById', 'modul' => 'naplo_intezmeny', 'result' => 'value', 'values' => array($diakId)));
-    }
-
-    function getDiakMindenOsztaly($diakId) {
-
-	$q = "SELECT * FROM osztalyDiak WHERE diakId=%u";
-	$osztalyIds = db_query($q, array('fv'=>'getDiakMindenOsztaly', 'modul' => 'naplo_intezmeny', 'result' => 'indexed', 'values' => array($diakId)));
-    
-	return $osztalyIds;
-    }
-    function getDiakOsztalya($diakId, $SET= array('tanev'=>__TANEV,'tolDt'=>'','igDt'=>'', 'result'=>''), $olr='') {
-
-	global $_TANEV;
-	//$tolDt = $SET['tolDt']; $igDt=$SET['igDt'];
-	$osztalyId = array();
-
-	// Az adott tanév elejének és végének lekérdezése
-	if ($SET['tanev']=='') $SET['tanev'] = __TANEV;
-	$tanev = $SET['tanev'];
-	if ($tanev != __TANEV) $tanevAdat = getTanevAdat($tanev, $olr);
-	else $tanevAdat = $_TANEV;
-
-	$tolDt = $SET['tolDt']; $igDt=$SET['igDt']; $tanev = $SET['tanev'];
-	if ($tolDt==$igDt && $tolDt=='') {
-	    $tolDt = $tanevAdat['kezdesDt']; $igDt = $tanevAdat['zarasDt'];
-	} else {
-	    initTolIgDt($tanev, $tolDt, $igDt);
-	}
-
-	if ($diakId != '') {
-
-	    if ($SET['result']=='csakid' || $SET['result']=='idonly') {
-		$q = "SELECT DISTINCT osztalyId FROM osztalyDiak WHERE beDt <= '%s' AND (kiDt IS NULL OR kiDt >= '%s') AND diakId=%u ORDER BY beDt DESC";
-		$osztalyId = db_query($q, array('fv' => 'getDiakOsztalya1', 'modul' => 'naplo_intezmeny', 'result' => 'idonly', 'values' => array($igDt, $tolDt, $diakId)), $olr);
-	    } elseif ($tanevAdat['statusz'] != 'tervezett') {
-		$q = "SELECT osztalyId, osztalyJel, beDt, kiDt, diakNaploSorszam(diakId,%u,osztalyId) AS naploSorszam
-			FROM osztalyDiak LEFT JOIN ".tanevDbNev(__INTEZMENY, $tanev).".osztalyNaplo USING (osztalyId)
-			WHERE diakId=%u 
-			AND beDt <= '%s'
-			AND (kiDt IS NULL OR kiDt >= '%s')
-			ORDER BY beDt DESC";		
-		$osztalyId = db_query($q, array('fv' => 'getDiakOsztalya2', 'modul' => 'naplo_intezmeny', 'result' => 'indexed', 'values' => array($tanev,$diakId,$igDt, $tolDt)),$olr);
-	    } else {
-		$q = "SELECT DISTINCT osztalyId FROM osztalyDiak WHERE beDt <= '%s'
-			AND (kiDt IS NULL OR kiDt >= '%s') AND diakId=%u ORDER BY beDt DESC";
-		$osztalyId = db_query($q, array('fv'=>'getDiakOsztalya3', 'modul' => 'naplo_intezmeny', 'result' => 'indexed', 'values' => array($igDt, $tolDt, $diakId)),$olr); // biztos ilyen formátumot vársz???
-	    }
-	}
-
-	return $osztalyId;
-    }
-
-    function getDiakokOsztalyai($diakIds, $SET = array('tanev' => __TANEV, 'tolDt' => null, 'igDt' => null, 'result'=>null), $olr='') {
-
-	global $_TANEV;
-
-	$tolDt = $SET['tolDt']; 
-	$igDt=$SET['igDt']; 
-	if ($SET['tanev']=='') $tanev=__TANEV; else $tanev = $SET['tanev'];
-	initTolIgDt($tanev, $tolDt, $igDt);
-
-	$RESULT = array();
-	if (is_array($diakIds) && count($diakIds)>0) {
-	    if ($SET['result']==='csakId') {
-		$FIELDS = 'DISTINCT `osztalyId`';
-		$result = 'idonly';
-	    } else {
-		$FIELDS = '`diakId`, `osztalyId`';
-		$result = 'indexed';
-	    }
-		$q = "SELECT $FIELDS
-			FROM osztalyDiak LEFT JOIN diak USING (diakId) WHERE beDt <= '%s'
-			AND (kiDt IS NULL OR kiDt >= '%s')
-			AND diakId IN (". implode(',', array_fill(0, count($diakIds), '%u')) .") ";
-		array_unshift($diakIds, $igDt, $tolDt);
-		$R = db_query($q, array('fv' => 'getDiakokOsztalyai', 'result' => $result, 'modul' => 'naplo_intezmeny', 'values' => $diakIds));
-	    if ($SET['result']!=='csakId') {
-		for ($i = 0; $i < count($R); $i++) {
-		    $RESULT[$R[$i]['diakId']][] = $R[$i]['osztalyId'];
-		}
-	    } else {
-		$RESULT = $R;
-	    }
-	}
-	return $RESULT;
-    }
-    function getDiakAdatById($diakIds, $SET = array('result'=>'indexed', 'keyfield'=>''), $olr='') {
-
-	if ($olr=='') $lr = db_connect('naplo');
-	else $lr=$olr;
-
-	if (!is_array($diakIds)) { $diakIds = array($diakIds); $result = 'record'; } 
-	else { 
-	    if ($SET['result']!='') $result = $SET['result'];
-	    else $result = 'indexed'; 
-	}
-
-	//$q = "SELECT * FROM ".__INTEZMENYDBNEV.".diak WHERE diakId IN (".implode(',', array_fill(0, count($diakIds), '%u')).")";
-	$q = "SELECT diak.*, TRIM(CONCAT_WS(' ',viseltNevElotag, ViseltCsaladiNev, viseltUtoNev)) AS diakNev, TIMESTAMPDIFF(YEAR, diak.szuletesiIdo, CURDATE()) AS diakEletkor, dj.dt AS jogviszonyDt, dj.statusz AS jogviszonyStatusz 
-		FROM ".__INTEZMENYDBNEV.".diak LEFT JOIN ".__INTEZMENYDBNEV.".diakJogviszony AS dj 
-		ON diak.diakId=dj.diakId AND dj.dt=(SELECT MAX(dt) FROM ".__INTEZMENYDBNEV.".diakJogviszony WHERE dt<=CURDATE() AND diakId=dj.diakId) 
-		WHERE diak.diakId IN (".implode(',', array_fill(0, count($diakIds), '%u')).")";
-	 
-	$r = db_query($q, array('fv' => 'getDiakAdatById', 'modul' => 'naplo_intezmeny', 'result' => $result, 'keyfield'=>$SET['keyfield'],'values' => $diakIds), $lr);
-
-	if ($olr=='') db_close($lr);
-	return $r;
-    }
-
-    function getDiakBySzulDt($md) 
-    {
-	if ($md == '') $md = date('m-d');
-	$q = "SELECT diakId FROM diak WHERE szuletesiIdo like '%%-%s' AND jogviszonyVege is NULL"; // credits: Neumayer Béla 
-	$diakIds = db_query($q, array('fv' => 'getDiakBySzulDt', 'modul' => 'naplo_intezmeny', 'result' => 'idonly', 'values' => array($md)));
-	if (count($diakIds)>0) {
-		$RET['diak'] = getDiakAdatById($diakIds);
-		$RET['diakOsztaly'] = getDiakokOsztalyai($diakIds);
-	} else {
-		$RET = false;
-	}
-	return $RET;
-    }
-
-    function diakVegzosE($diakId, $SET = array('tanev' => __TANEV, 'dt' => null)) {
-
-	global $_TANEV;
-
-	// tanév adatai
-	$tanev = readVariable($SET['tanev'], 'numeric unsigned', __TANEV);
-	$dt = readVariable($SET['dt'], 'datetime', date('Y-m-d'));
-
-	$q = "SELECT MAX(vegzoTanev) FROM osztalyDiak LEFT JOIN osztaly USING (osztalyId) 
-		WHERE diakId=%u AND beDt<='%s' AND (kiDt IS NULL OR '%s'<=kiDt)";
-	$maxVegzoTanev = db_query($q, array('fv' => 'diakVegzosE', 'modul' => 'naplo_intezmeny', 'result' => 'value', 'values' => array($diakId, $dt, $dt)));
-
-	return ($tanev == $maxVegzoTanev);
-    }
-
-
-    function getDiakJogviszony($diakId) {
-
-        $v = array($diakId);
-        $q = "SELECT statusz,dt FROM diakJogviszony WHERE diakId=%u ORDER BY dt";
-        $ret = db_query($q, array('fv' => 'getDiakJogviszony', 'modul' => 'naplo_intezmeny', 'result' => 'indexed', 'values' => $v));
-
-        return $ret;
-
-    }
-
-    function getDiakJogviszonyByDt($diakId, $dt) { // dt előtt és után vagy egyenlőt adja vissza, ezért dt - nek lennie kellene...
-
-        $v = array($diakId, $dt);
-
-	$q = "SELECT statusz FROM diak WHERE diakId=%u";
-	$ret['aktualis'] = db_query($q, array('fv' => 'getDiakJogviszonyByDt', 'modul' => 'naplo_intezmeny', 'result' => 'value', 'values' => array($diakId)));
-	if ($ret['aktualis']=='felvételt nyert') { /* Ha felvételt nyert, nincs bejegyzése a diakJogviszony táblába */
-	    $ret['elotte'] = $ret['aktualis']; // ==felvételt nyert
-	} else {
-    	    $q = "SELECT statusz FROM diakJogviszony WHERE diakId=%u AND dt<'%s' ORDER BY dt DESC LIMIT 1";
-    	    $ret['elotte'] = db_query($q, array('fv' => 'getDiakJogviszonyByDt', 'modul' => 'naplo_intezmeny', 'result' => 'value', 'values' => $v));
-	}
-	/* Az utána statuszt lekérdezem, hisz lehet hogy a jövőbe már be van állítva */
-        $q = "SELECT statusz FROM diakJogviszony WHERE diakId=%u AND dt>='%s' ORDER BY dt LIMIT 1";
-        $ret['utana'] = db_query($q, array('fv' => 'getDiakJogviszonyByDt', 'modul' => 'naplo_intezmeny', 'result' => 'value', 'values' => $v));
-
-        return $ret;
-
-    }
-
-    function getDiakJogviszonyByDts($diakIds, $dts, $olr='') {
-	// lekérdezzük az adott diák/diákok megadott dátum(ok) szerinti jogviszonyait - pl Osztályozónapló
-	$ret = array();
-	if (is_array($diakIds) && is_array($dts)) {
-	    foreach ($diakIds as $diakId) {
-		foreach ($dts as $dt) {
-		    $q = "SELECT diakId, dt, statusz FROM diakJogviszony WHERE diakId=%u AND dt <= '%s' ORDER BY dt DESC LIMIT 1";
-		    $ret[$diakId][$dt] = db_query($q, array('fv' => 'getDiakJogviszonyByDts', 'modul' => 'naplo_intezmeny', 'result' => 'record', 'values' => array($diakId, $dt)), $olr);
-		}
-	    }
-	}
-	return $ret;
-    }
-
-    function getDiakAdatkezeles($diakId, $filter = null) {
-
-	if (is_numeric($diakId)) {
-
-	    $v = array($diakId);
-	    if (is_array($filter)) {
-		foreach ($filter as $kulcs => $ertek) {
-		    $W[] = " AND kulcs = '%s'";
-		    $W[] = " AND ertek = '%s'";
-		    $v[] = $kulcs;
-		    $v[] = $ertek;
-		}
-	    } else $W = '';
-
-	    $q = "SELECT * FROM diakAdatkezeles WHERE diakId = %u".implode(' ',$W);
-	    $r = db_query($q, array('fv' => 'getDiakAdatkezeles', 'modul' => 'naplo_intezmeny', 'result' => 'assoc', 'keyfield'=>'kulcs', 'values' => $v));
-
-	    return $r;
-
-	} else {
-	    return false;
-	}
-
-    }
-
-
-    function getDiakTorzslapszam($diakId, $osztalyId, $SET = array('osztalyJellel' => true, 'tanev'=>__TANEV)) {
-        /*
-         * Ha van a diak táblában törzslapszám, akkor azt adjuk vissza, ha nincs akkor a diakTorzslapszam tábla megfelelő értékét, vagy ennek hiányában false null értéket.
-         * Nem használt függvény (még)
-         */
-
-        $q = "SELECT torzslapszam FROM diak WHERE diakId=%u";
-        $v = array($diakId);
-        $r = db_query($q, array('fv'=>'getDiakTorzslapszam/diak', 'modul'=>'naplo_intezmeny','result'=>'value','values'=>$v));
-
-        if ($r && !is_null($r)) return $r;
-
-        $q = "SELECT torzslapszam FROM diakTorzslapszam WHERE diakId=%u AND osztalyId=%u";
-        $v = array($diakId, $osztalyId);
-        $r = db_query($q, array('fv'=>'getDiakTorzslapszam/osztaly', 'modul'=>'naplo_intezmeny','result'=>'value','values'=>$v));
-
-        if ($SET['osztalyJellel']) {
-            $q = "select concat('/',kezdoTanev, '-', vegzoTanev+1,'/',jel) from osztaly where osztalyId = %u";
-            $v = array($osztalyId);
-            $r .= db_query($q, array('fv'=>'getDiakTorzslapszam/osztalyJel', 'modul'=>'naplo_intezmeny','result'=>'value','values'=>$v));
-        }
-
-        return $r;
-    }
-
-
-    function getDiakokTorzslapszamaByOsztalyId($osztalyId, $SET = array('osztalyJellel' => true, 'tanev'=>__TANEV)) {
-        /*
-         * Ha van a diak táblában törzslapszám, akkor azt adjuk vissza, ha nincs akkor a diakTorzslapszam tábla megfelelő értékét, vagy ennek hiányában false null értéket.
-         * Nem használt függvény (még)
-         */
-
-        // kérdezzük le az osztály valaha volt összes tagját:
-        $q = "SELECT count(diakId) FROM osztalyDiak WHERE osztalyId=%u";
-        $v = array($osztalyId);
-        $db = db_query($q, array('fv'=>'getDiakokTorzslapszama/osztalyTagok', 'modul'=>'naplo_intezmeny','result'=>'value','values'=>$v));
-
-        // Ha nincsenek tagok
-        if ($db == 0) return false;
-
-        // OsztalyJel lekérdezése
-        if ($SET['osztalyJellel']) {
-            $q = "select concat('/',kezdoTanev, '-', vegzoTanev+1,'/',jel) from osztaly where osztalyId = %u";
-            $v = array($osztalyId);
-            $osztalyStr = db_query($q, array('fv'=>'getDiakokTorzslapszama/osztalyJel', 'modul'=>'naplo_intezmeny','result'=>'value','values'=>$v));
-        } else {
-            $osztalyStr = '';
-        }
-        // Törzslapszámok lekérdezése
-        $q = "select diakId, ifnull(diak.torzslapszam, concat(diakTorzslapszam.torzslapszam,'%s')) as torzslapszam
-                from diak left join diakTorzslapszam using(diakId)
-                where osztalyId=%u
-                and diakId in (select diakId from osztalyDiak where osztalyId=%u)
-                order by torzslapszam";
-        $v = array($osztalyStr, $osztalyId, $osztalyId);
-        $r = db_query($q, array('fv'=>'getDiakokTorzslapszama/osztaly', 'modul'=>'naplo_intezmeny','result'=>'keyvaluepair','values'=>$v));
-
-        return $r;
-    }
-
-    function getDiakNaploSorszam($diakId,$tanev,$osztalyId) {
-	$q = "SELECT diakNaploSorszam(%u,%u,%u)";
-        $v = array($diakId,$tanev,$osztalyId);
-        return db_query($q, array('fv'=>'getDiakNaploSorszam', 'modul'=>'naplo_intezmeny','result'=>'value','values'=>$v));
-    }
-
-
-    function getDiakNyelvvizsga($diakId) {
-	$q = "SELECT * FROM diakNyelvvizsga WHERE diakId=%u";
-        $v = array($diakId);
-        return db_query($q, array('fv'=>'getDiaknyelvvizsga', 'modul'=>'naplo_intezmeny','result'=>'indexed','values'=>$v));
-    }
-
-    function diakNyelvvizsgaFelvesz($ADAT) {
-	$q = "INSERT INTO diakNyelvvizsga  (diakId,targyId,vizsgaSzint,vizsgaTipus,vizsgaDt,vizsgaIntezmeny,vizsgaBizonyitvanySzam) 
-	VALUES (%u,%u,'%s', '%s', '%s', '%s', '%s')";
-        $v = array($ADAT['diakId'],$ADAT['targyId'],$ADAT['vizsgaSzint'],$ADAT['vizsgaTipus'],$ADAT['vizsgaDt'],$ADAT['vizsgaIntezmeny'],$ADAT['vizsgaBizonyitvanySzam']);
-        return db_query($q, array('fv'=>'diakNyelvvizsgaFelvesz', 'modul'=>'naplo_intezmeny','result'=>'record','values'=>$v));
-    }
-    function diakNyelvvizsgaTorol($ADAT) {
-	if (count($ADAT)>0) {
-	    $q = "DELETE FROM diakNyelvvizsga WHERE nyelvvizsgaId IN (".implode(',',$ADAT).") ";
-    	    return db_query($q, array('fv'=>'diakNyelvvizsgaTorol', 'modul'=>'naplo_intezmeny','values'=>$v));
-	}
-    }
-
-    function getNyelvvizsgak($SET) {
-	if ($SET['igDt']=='') {
-	    $SET['igDt'] = date('Y-m-d', strtotime('+365 days',strtotime($SET['tolDt'])));
-	    $q = "SELECT * FROM diakNyelvvizsga WHERE vizsgaDt>='%s' AND vizsgaDt<'%s'";
-    	    $v = array($SET['tolDt'],$SET['igDt']);
-	} elseif ($SET['igDt']!='' && $SET['tolDt']=='') {
-	    $q = "SELECT * FROM diakNyelvvizsga WHERE vizsgaDt<'%s'";
-    	    $v = array($SET['igDt']);
-	} else {
-	    $q = "SELECT * FROM diakNyelvvizsga";
-    	    $v = array();
-	}
-	
-	return $r = db_query($q, array('fv'=>'getDiaknyelvvizsga', 'modul'=>'naplo_intezmeny','result'=>'indexed','values'=>$v));
-    }
-
-?>
diff --git a/mayor-orig/www/include/modules/naplo/share/diakModifier.php b/mayor-orig/www/include/modules/naplo/share/diakModifier.php
deleted file mode 100644
index 34a4a2c5..00000000
--- a/mayor-orig/www/include/modules/naplo/share/diakModifier.php
+++ /dev/null
@@ -1,344 +0,0 @@
- lásd: base/rights: checkDiakStatusz()
-//	if (strtotime($ADAT['jogviszonyValtasDt']) > time()) { // jövőbeni statusz nem állítható be!
-//	    $_SESSION['alert'][] = 'message:wrong_data:diakJogviszonyValtas:jogviszonyValtasDt='.$ADAT['jogviszonyValtasDt'].':Jövőbeli állapotváltást nem rögzítünk!';
-//	    return false;
-//	}
-
-	// A megelőző és következő jogviszony státusz lekérdezése
-	$DJ = getDiakJogviszonyByDt($ADAT['diakId'], $ADAT['jogviszonyValtasDt']);
-	if (!isset($DJ['elotte'])) { // Kell legyen megelőző - amúgy ujDiak kellene
-	    $_SESSION['alert'][] = 'message:wrong_data:diakJogviszonyValtas:Nincs kezdeti státusz - hiba történt a diák adatainak rögzítésekor?';
-	    return false;
-	}
-
-	if ($DJ['elotte'] == 'felvételt nyert' && $ADAT['ujStatusz'] != 'jogviszonyban van') { // felvett először iratkozzon be
-	    $_SESSION['alert'][] = 'message:wrong_data:'.$ADAT['ujStatusz'].':diakJogviszonyValtas:beiratkozáskor csak "jogviszonyban van" státuszba kerülhet a diák!';
-	    return false;
-	}
-
-	if ($ADAT['ujStatusz'] == $DJ['elotte']) return true; // nincs mit tenni
-
-	if (isset($DJ['utana'])) { // a következő jogviszonyváltás már rögzítve van... nem piszkálhatunk az intervallum közbe!
-	    $_SESSION['alert'][] = 'message:wrong_data:diakJogviszonyValtas:már van rögzítve státuszváltás a megadott dátum után!:'.$DJ['utana'];
-	    return false;
-	}
-
-        $lr = db_connect('naplo_intezmeny');
-        db_start_trans($lr);
-
-	// A diák osztályai a változás napján
-	$osztalyIds = getDiakOsztalya($ADAT['diakId'], array('tanev' => $ADAT['tanev'], 'tolDt' => $ADAT['jogviszonyValtasDt'], 'igDt' => $ADAT['jogviszonyValtasDt'], 'result' => 'idonly'));
-	// A változás idején (vagy utána közvetlenül) érvényes szemeszter adatok
-	$szAdat = getSzemeszterByDt($ADAT['jogviszonyValtasDt'], 1);
-	switch ($ADAT['ujStatusz']) {
-	    case 'jogviszonyban van':
-		if ($DJ['elotte'] == 'felvételt nyert') { // beiratkozás
-
-		    // diak tábla módosítása - jogviszonyKezdete
-		    $q = "UPDATE diak SET statusz='jogviszonyban van',jogviszonyKezdete='%s',kezdoTanev=IFNULL(kezdoTanev,%u),kezdoSzemeszter=IFNULL(kezdoSzemeszter,%u) WHERE diakId=%u";
-		    $v = array($ADAT['jogviszonyValtasDt'], $szAdat['tanev'], $szAdat['szemeszter'], $ADAT['diakId']);
-		    $r = db_query($q, array('fv' => 'diakJogviszonyValtas', 'modul' => 'naplo_intezmeny', 'values' => $v), $lr);
-		    if ($r===false) { db_rollback($lr, 'diak.jogviszonyKezdete - fail');db_close($lr);return false; }
-		    
-		    // Záradékolás - felvétel/beiratkozás
-		    $In = getIntezmenyByRovidnev(__INTEZMENY);
-		    $osztalyStr = array();
-		    if ($zaradekOsztallyal = (is_array($osztalyIds) && count($osztalyIds) > 0)) {
-			foreach ($osztalyIds as $key => $osztalyId) {
-			    $osztalyAdat[$osztalyId] = getOsztalyAdat($osztalyId, $ADAT['tanev']);
-			    $osztalyStr[] = $osztalyAdat[$osztalyId]['kezdoTanev'].'-'.($osztalyAdat[$osztalyId]['vegzoTanev']+1).'/'.$osztalyAdat[$osztalyId]['jel'];
-			}
-		    }
-		    $Z = array(
-			'csere' => array(
-			    '%iskola címe%' => $In['nev'].' ('.$In['cimIrsz'].' '.$In['cimHelyseg'].', '.$In['cimKozteruletNev'].' '.$In['cimKozteruletJelleg'].' '.$In['cimHazszam'].'.)',
-			    '%osztály%' => implode(', ', $osztalyStr),
-			    '%határozat száma%' => $ADAT['hatarozat'],
-			),
-			'zaradekIndex' => ($zaradekOsztallyal?$ZaradekIndex['jogviszony megnyitás']['felvétel osztályba'] : $ZaradekIndex['jogviszony megnyitás']['felvétel'])
-		    );
-		}
-		break;
-	    case 'vendégtanuló':
-		break;
-	    case 'magántanuló':
-		    $Z = array('zaradekIndex' => $ZaradekIndex['jogviszony változás']['magántanuló']);  
-		break;
-	    case 'jogviszonya felfüggesztve':
-		    $Z = array(
-//20110610		'zaradekIndex' => $ADAT['zaradek']['felfüggesztés'],
-			'zaradekIndex' => $ZaradekIndex['jogviszony változás']['felfüggesztés'],
-			'csere' => array('%ok%' => $ADAT['felfuggesztesOk'], '%igDt%' => $ADAT['felfuggesztesIgDt'])
-		    );
-		break;
-	    case 'jogviszonya lezárva':
-/* Ezt előrébb vizsgáljuk 
-		    if (isset($DJ['utana'])) { // lezárás után nem lehet jogviszonybejegzés
-			$_SESSION['alert'][] = 'message:wrong_data:diakJogviszonyValtas:bejegyzett jogviszony változás előtt a jogviszony nem zárható le:'.$DJ['utana'];
-			db_rollback($lr);
-			db_close($lr);
-			return false;
-		    }
-*/
-
-		    // diak tábla módosítása - jogviszonyVege
-		    $q = "UPDATE diak SET jogviszonyVege='%s' WHERE diakId=%u";
-		    $v = array($ADAT['jogviszonyValtasDt'], $ADAT['diakId']);
-		    $r = db_query($q, array('fv' => 'diakJogviszonyValtas', 'modul' => 'naplo_intezmeny', 'values' => $v), $lr);
-
-		    if ($r===false) { db_rollback($lr, 'diak.jogviszonyVege - fail');db_close($lr);return false; }
-
-		    // Osztályokból kivétel (Ez a tankörökből is kiveszi, ellenőrzi a jegyeket, hiányzásokat is a tanévekben)
-		    foreach ($osztalyIds as $key => $osztalyId) {
-			$r = osztalyDiakTorol(array('osztalyId' => $osztalyId, 'diakId' => $ADAT['diakId'], 'tolDt' => $ADAT['jogviszonyValtasDt']), $lr);
-			if ($r===false) { db_rollback($lr, 'osztalyDiakTorol - fail');db_close($lr);return false; }
-		    }
-		    // Ha netán van olyan tankörtagsága, ami nem osztályhoz kötődik, akkor azt itt törölni kellene!!!! Például: vendégtanuló...
-		    // akkor lejjebb töröljük
-
-		    // záradékolás
-		    $Z = array(
-			'zaradekIndex' => $ADAT['lezarasZaradekIndex'],
-			'csere' => array('%igazolatlan órák száma%' => $ADAT['lezarasIgazolatlanOrakSzama'], '%iskola%' => $ADAT['lezarasIskola'])
-		    );
-		break;
-
-	    default:
-		$_SESSION['alert'][] = 'message:wrong_data:új statusz='.$ADAT['ujStatusz'].':diakJogviszonyValtas';
-		db_rollback($lr, 'új statusz - wrong');
-		db_close($lr);
-		return false;
-		break;
-	}
-
-	// diakJogviszony tábla - bejegyzés
-	$q = "INSERT INTO diakJogviszony (diakId, statusz, dt) VALUES (%u, '%s', '%s')";
-	$v = array($ADAT['diakId'], $ADAT['ujStatusz'], $ADAT['jogviszonyValtasDt']);
-	$r = db_query($q, array('fv' => 'diakJogviszonyValtas', 'modul' => 'naplo_intezmeny', 'values' => $v), $lr);
-	if ($r===false) { db_rollback($lr, 'diakJogviszony - fail');db_close($lr);return false; }
-
-	// Tankörökből való kiléptetés (lezárás esetén már megtörtént)
-	if ($ADAT['ujStatusz'] == 'jogviszonya felfüggesztve' || $ADAT['ujStatusz'] == 'jogviszonya lezárva') {
-	    $tankorIds = getTankorByDiakId($ADAT['diakId'], $ADAT['tanev'], array('tolDt' => $ADAT['jogviszonyValtasDt'], 'override' => 'true', 'result' => 'idonly'), $lr);
-	    if (is_array($tankorIds) && count($tankorIds) > 0)
-	    $r = tankorDiakTorol(array(
-	      'diakId' => $ADAT['diakId'], 'utkozes' => 'torles', 'tankorIds' => $tankorIds, 'MIN_CONTROL' => false, 'tolDt' => $ADAT['jogviszonyValtasDt']
-	    ), $lr);
-	    if ($r===false) { db_rollback($lr, 'tankorDiakTorol - fail');db_close($lr);return false; }
-	} elseif ($ADAT['ujStatusz'] == 'magántanuló') {
-	    $tolDt = $ADAT['jogviszonyValtasDt'];
-	    //törlés
-    		$TH = $TJ = array();                                                                                                                                                                               
-    		$HSUM = $JSUM = array();                                                                                                                                                                           
-    		// A tol-ig dátumok által érintett aktív tanévek lekérdezése                                                                                                                                       
-    		$aktivTanevek = getTanevekByDtInterval($ADAT['jogviszonyValtasDt'], date('Y-m-d'), array('aktív')); 
-        	    // Az érintett tanéveken végigmenve                                                                                                                                                            
-        	foreach ($aktivTanevek as $key => $tanev) {
-		    $TANKORIDS = getTankorByDiakId($ADAT['diakId'], $ADAT['tanev'], array('tolDt' => $tolDt, 'result' => 'idonly'), $lr);
-		    if (is_array($TANKORIDS) && count($TANKORIDS) > 0) {
-            		for ($i = 0; $i < count($TANKORIDS); $i++) {                                                                                                                                               
-                	    $H = tankorDiakHianyzasIdk($ADAT['diakId'], $TANKORIDS[$i], $tanev, $tolDt, null); // tol-ig-et a függvény initTolIgDt hívással kapja
-                	    $J = tankorDiakJegyIdk(array('diakId'=>$ADAT['diakId'], 'tankorIds'=>$TANKORIDS[$i], 'tanev'=>$tanev, 'tolDt'=>$tolDt, 'igDt'=>null));
-                	    if (is_array($H)) $HSUM = array_merge($HSUM,$H);
-                	    if (is_array($J)) $JSUM = array_merge($JSUM,$J);
-            		}
-                	// hiányzások és jegyek törlése...                                                                                                                                                     
-                	$r = hianyzasTorles($HSUM, $tanev, $lr);
-			if ($r!==false) $r = jegyTorles($JSUM, null, $tanev, $lr); // különben úgyis rollback van
-		    }
-            	}
-	    if ($r===false) { db_rollback($lr, 'hianyzasTorles/jegyTorles - fail');db_close($lr);return false; }
-	}
-	// Záradék rögzítés - ha van
-	if (isset($Z['zaradekIndex'])) {
-	    $Z['diakId'] = $ADAT['diakId'];
-	    $Z['iktatoszam'] = $ADAT['iktatoszam'];
-	    $Z['dt'] = $ADAT['jogviszonyValtasDt'];
-	    $r = zaradekRogzites($Z,$lr);
-	    if ($r===false) { db_rollback($lr, 'zaradekRogzites - fail');db_close($lr);return false; }
-	}
-	// Ha ez az utolsó jogviszony állapot, akkor a diak tábla is módosítandó!
-
-	db_commit($lr);
-	db_close($lr);
-
-	checkDiakStatusz();
-
-	return true;
-
-    }
-
-
-    function ujDiak($ADAT) {
-
-	global $ZaradekIndex;
-
-	$NOTNULL = array('viseltNevElotag','viseltCsaladinev','viseltUtonev','szuleteskoriNevElotag','szuleteskoriCsaladinev','szuleteskoriUtonev');
-
-/*
-    $ADAT mezői:
-	jogviszonyKezdete - záradékolás és diakJogviszony miatt
-	osztalyId - Osztálybalépéshez (csak ha jogviszonyKezdete a dátum
-	felvetelTipus - beiratkozásra vár(statusz:felvételt nyert)|vendégtanuló(statusz:vendégtanuló)|más(statusz:jogviszonyban van)
-	zaradek - típusonként
-	osztaly - kezdoTanev/zaroTanev/jel
-
-	hatarozat - iskolaváltás esetén
-	tabelFields - A diak tábla mezői - ez alapján engedélyezett a módosítás
-	intezmeny - Az intézmény adatai
-*/
-	if (is_array($ADAT['tableFields']))$FIELDS = $ADAT['tableFields'];
-	else $FIELDS = getTableFields('diak');
-	if ($ADAT['felvetelTipus'] == 'beiratkozásra vár') {
-	    $statusz = 'felvételt nyert'; 
-	    unset($ADAT['jogviszonyKezdete']);
-	} elseif ($ADAT['felvetelTipus'] == 'vendégtanuló') { 
-	    $statusz='vendégtanuló';
-	    unset($ADAT['osztalyId']);
-	} else 
-	    $statusz = 'jogviszonyban van';
-
-	foreach($ADAT as $attr => $value) {
-	    if (array_key_exists($attr,$FIELDS) && !in_array($attr, array('action','diakId'))) {
-		$A[] = "$attr";
-		if ($value=='' && !in_array($attr, $NOTNULL)) {
-		    $P[]='null';
-		} else {
-		    $V[] = $value;
-		    $P[] = "'%s'";
-		}
-	    }
-	}
-	$q = "INSERT INTO diak (statusz,".implode(',', $A).") VALUES ('".$statusz."',".implode(',',$P).')';
-	$diakId = db_query($q, array('fv' => 'ujDiak', 'modul'=>'naplo_intezmeny', 'result' => 'insert', 'values' => $V));
-	if ($diakId) {
-	    if ($statusz == 'jogviszonyban van' || $statusz == 'vendégtanuló') {
-		// diakJogviszony tábla
-		$q = "INSERT INTO diakJogviszony (diakId, statusz, dt) VALUES (%u, '%s', '%s')";
-		db_query($q, array('fv' => 'ujDiak/diakJogviszony', 'modul' => 'naplo_intezmeny', 'values' => array($diakId, $statusz, $ADAT['jogviszonyKezdete'])));
-	    } // Ha csak felvételt nyert, akkor nincs jogviszony információ
-	    // osztályba rakás
-	    if (isset($ADAT['osztalyId'])) {
-		$q = "INSERT INTO osztalyDiak (osztalyId, diakId, beDt) VALUES (%u, %u, '%s')";
-		db_query($q, array('fv' => 'ujDiak/osztalyDiak', 'modul' => 'naplo_intezmeny', 'values' => array($ADAT['osztalyId'], $diakId, $ADAT['jogviszonyKezdete'])));
-	    }
-	    // záradékolás
-	    if (isset($ADAT['zaradek'][ $ADAT['felvetelTipus'] ])) { // A felvételt nyert típus nem záradékolandó
-		if (is_array($ADAT['intezmeny'])) $In = $ADAT['intezmeny'];
-		else $In = getIntezmenyByRovidnev(__INTEZMENY);
-		$Z = array(
-		    'diakId' => $diakId,
-		    'dt' => $ADAT['jogviszonyKezdete'],
-		    'csere' => array(
-			'%iskola címe%' => $In['nev'].' ('.$In['cimIrsz'].' '.$In['cimHelyseg'].', '.$In['cimKozteruletNev'].' '.$In['cimKozteruletJelleg'].' '.$In['cimHazszam'].'.)',
-			'%osztály%' => $ADAT['osztaly']['kezdoTanev'].'-'.($ADAT['osztaly']['vegzoTanev']+1).'/'.$ADAT['osztaly']['jel'],
-			'%határozat száma%' => $ADAT['hatarozat'],
-		    ),
-		    'zaradekIndex' => $ADAT['zaradek'][ $ADAT['felvetelTipus'] ]
-		);
-		zaradekRogzites($Z);
-	    }
-	}
-	return $diakId;
-
-    }
-
-    function diakHozottHianyzas($ADAT) {
-
-	if ($ADAT['diakId']!='') {
-		if ($ADAT['hozottHianyzasIgazolt']!=0) {
-		    $q = "INSERT INTO `hianyzasHozott` (`diakId`,`statusz`,`dbHianyzas`,`dt`) VALUES (%u,'%s',%u,NOW())";
-		    $v = array($ADAT['diakId'],'igazolt',$ADAT['hozottHianyzasIgazolt']);
-		    $result = db_query($q, array('fv' => 'diakAdatModositas', 'modul' => 'naplo', 'values' => $v));
-		}
-		if ($ADAT['hozottHianyzasIgazolatlan']!=0) {
-		    $q = "INSERT INTO `hianyzasHozott` (`diakId`,`statusz`,`dbHianyzas`,`dt`) VALUES (%u,'%s',%u,NOW())";
-		    $v = array($ADAT['diakId'],'igazolatlan',$ADAT['hozottHianyzasIgazolatlan']);
-		    $result = db_query($q, array('fv' => 'diakAdatModositas', 'modul' => 'naplo', 'values' => $v));
-		}
-	}
-	return $result;
-    }
-    
-    function diakAdatModositas($ADAT) {
-
-	$FIELDS = getTableFields('diak');
-	$NOTNULL = array('viseltNevElotag','viseltCsaladinev','viseltUtonev','szuleteskoriNevElotag','szuleteskoriCsaladinev','szuleteskoriUtonev');
-
-	$v = array();
-	foreach($ADAT as $attr => $value) {
-	    if (array_key_exists($attr,$FIELDS) && !in_array($attr, array('action','diakId'))) {
-		if ($value=='' && !in_array($attr, $NOTNULL)) {
-		    $value='null';
-		} else {
-		    array_push($v, $value);
-		    $value = "'%s'";
-		}
-		$T[] = "$attr=$value";
-	    }
-	}
-	array_push($v, $ADAT['diakId']);
-	$q = "UPDATE diak SET ".implode(',', $T)." WHERE diakId=%u";
-	return db_query($q, array('fv' => 'diakAdatModositas', 'modul' => 'naplo_intezmeny', 'result' => 'indexed', 'values' => $v));
-
-    }
-
-    function diakJogviszonyBejegyzesTorles($ADAT) {
-
-	$q = "DELETE FROM `diakJogviszony` WHERE `diakId`=%u AND `statusz`='%s' AND `dt`='%s'";
-	$v = array($ADAT['diakId'], $ADAT['statusz'], $ADAT['dt']);
-	db_query($q, array('fv' => 'diakJogviszonyBejegyzesTorles/diakJogviszony', 'modul' => 'naplo_intezmeny', 'values' => $v));
-
-	$q = "DELETE FROM `zaradek` WHERE `diakId` = %u AND `zaradekId` = %u";
-	$v = array($ADAT['diakId'], $ADAT['zaradekId']);
-	db_query($q, array('fv' => 'diakJogviszonyBejegyzesTorles/zaradek', 'modul' => 'naplo_intezmeny', 'values' => $v));
-
-    }
-
-    function diakAdatkezelesModositas($ADAT) {
-
-	$q = "INSERT IGNORE INTO diakAdatkezeles (diakId,kulcs,ertek) VALUES (%u,'%s','%s')";
-	$v = array($ADAT['diakId'], $ADAT['kulcs'], $ADAT['ertek']);
-	return db_query($q, array('fv' => 'diakAdatkezelesModositas', 'modul' => 'naplo_intezmeny', 'values' => $v));
-	
-    }
-
-    function diakTorol($ADAT) {
-
-	$q = "DELETE FROM diak WHERE statusz='felvételt nyert' AND diakId=%u";
-	$v = array($ADAT['diakId']);
-	return db_query($q, array('fv' => 'diakTorol', 'modul' => 'naplo_intezmeny', 'values' => $v));
-
-    }
-
-?>
diff --git a/mayor-orig/www/include/modules/naplo/share/dolgozat.php b/mayor-orig/www/include/modules/naplo/share/dolgozat.php
deleted file mode 100644
index d02ad19e..00000000
--- a/mayor-orig/www/include/modules/naplo/share/dolgozat.php
+++ /dev/null
@@ -1,154 +0,0 @@
- array(...),
-	    'tervezett' => array(...),
-	    $tankorId => array(
-		'bejelentés'=> ...,
-		'tervezett' => array($dt => array(...)),
-		'megjegyzés' => ...,
-		'tankör' => array(array('id','leírás'), ...)
-	    )
-	)
-
-    function ujDolgozat($tanarId, $tankorId, $olr = '')
-
-*/
-
- // --------------------------------------------------------- //
-
-    function checkTankorDolgozata($tankorId, $dolgozatId, $olr = '') {
-
-
-	if ($dolgozatId == 'uj') {
-	    // Az új dolgozat csak ez után lesz létrehozva (jegybeírás)
-	    return true;
-        } else {
-            // ellenőrizzük, hogy a megadott dolgozatId valóban egy ehhez a tankörhöz tartozó did-e.
-	    $q = "SELECT COUNT(dolgozatId) FROM dolgozat LEFT JOIN tankorDolgozat USING (dolgozatId)
-                    WHERE dolgozat.dolgozatId = %u AND tankorId = %u";
-	    $v = array($dolgozatId, $tankorId);
-	    return (1 == db_query($q, array('fv' => 'checkTankorDolgozata', 'modul' => 'naplo', 'values' => $v, 'result' => 'value'), $olr));
-        }
-
-    }
-
- // --------------------------------------------------------- //
-
-    function getTankorDolgozatok($tankorId, $csakTervezett = false, $tolDt = null, $igDt = null, $olr = null) {
-
-	$return = array();
-
-	initTolIgDt(__TANEV, $tolDt, $igDt);
-	$tankorIds = array();
-	if (!is_array($tankorId) && $tankorId != '') $tankorIds = array($tankorId);
-	elseif (is_array($tankorId[0])) for ($i = 0; $i < count($tankorId); $i++) $tankorIds[] = $tankorId[$i]['tankorId'];
-	elseif (is_array($tankorId)) $tankorIds = $tankorId;
-	else return false;
-
-	if (count($tankorIds) > 0) {
-	    $v = $tankorIds;
-	    if ($csakTervezett) {
-		$q = "SELECT * FROM dolgozat LEFT JOIN tankorDolgozat USING (dolgozatId)
-		    WHERE tankorDolgozat.tankorId IN (".implode(',', array_fill(0, count($tankorIds), '%u')).")
-		    AND '%s' <= tervezettDt AND tervezettDt <= '%s'
-		    ORDER BY tervezettDt, bejelentesDt";
-		array_push($v, $tolDt, $igDt);
-	    } else {
-		$q = "SELECT * FROM dolgozat LEFT JOIN tankorDolgozat USING (dolgozatId)
-		    WHERE tankorDolgozat.tankorId IN (".implode(',', array_fill(0, count($tankorIds), '%u')).")
-		    ORDER BY tervezettDt, bejelentesDt";
-	    }
-	    $return = db_query($q, array('fv' => 'getTankorDolgozatok', 'modul' => 'naplo', 'result' => 'assoc', 'keyfield' => 'dolgozatId', 'values' => $v), $olr);
-	    $dolgozatIds = $tervezett = array();
-	    foreach ($return as $dolgozatId => $dolgozatAdat) {
-		$dolgozatIds[] = $dolgozatId;
-		if ($dolgozatAdat['tervezettDt'] != '') $tervezett[$dolgozatAdat['tervezettDt']][] = $dolgozatId;
-	    }
-	    $return['dolgozatIds'] = $dolgozatIds;
-	    $return['tervezett'] = $tervezett;
-	    if (count($dolgozatIds) > 0) {
-		$q = "SELECT DISTINCT dolgozatId, tankorId, tankorNev
-		    FROM tankorDolgozat LEFT JOIN ".__INTEZMENYDBNEV.".tankorSzemeszter USING (tankorId)
-		    WHERE tanev=".__TANEV."
-		    AND dolgozatId IN (".implode(',', array_fill(0, count($dolgozatIds), '%u')).")";
-		$Tankorok = db_query($q, array('fv' => 'getTankorDolgozatok', 'modul' => 'naplo', 'result' => 'multiassoc', 'keyfield' => 'dolgozatId', 'values' => $dolgozatIds), $olr);
-		foreach ($Tankorok as $dolgozatId => $dolgozatTankorei) {
-		    $return[$dolgozatId]['tankor'] = $dolgozatTankorei;
-		}
-	    }
-	}
-	return $return;
-
-    }
-
-    function getDolgozatAdat($dolgozatId, $olr = null) {
-
-	if ($dolgozatId=='') return false;
-	$lr = (!is_resource($olr)) ? db_connect('naplo') : $olr;
-	$q = "SELECT * FROM dolgozat WHERE dolgozatId = %u";
-	$v = array($dolgozatId);
-	$RET = db_query($q, array('fv' => 'getDolgozatAdat', 'modul' => 'naplo', 'result' => 'record', 'values' => $v), $lr);
-	$dt = $RET['bejelentesDt'];
-	$q = "SELECT tankorId FROM tankorDolgozat WHERE dolgozatId = %u";
-	$v = array($dolgozatId);
-	$r = db_query($q, array('fv' => 'getDolgozatAdat', 'modul' => 'naplo', 'result' => 'idonly', 'values' => $v), $lr);
-	for ($i=0; $i $tanev, 
-			    'tolDt' => $dt, 
-			    'igDt' => $dt,
-			    'result' => 'idonly',
-                            'datumKenyszeritessel' => true
-                        )
-                    );
-	    $RET['tankorok'][] = $_TA[$_tankorId];
-	}
-
-	$q = "SELECT avg(jegy) AS atlag, count(jegyId) AS db FROM jegy WHERE dolgozatId = %u";
-	$v = array($dolgozatId);
-	$RET['jegyStatisztika'] = db_query($q, array('fv' => 'getDolgozatAdat', 'modul' => 'naplo', 'result' => 'record', 'values' => $v), $lr);
-
-	if (!is_resource($olr)) db_close($lr);
-
-	return $RET;
-    }
-
-    function ujDolgozat($tanarId, $tankorId, $olr = null) {
-
-	$q = "INSERT INTO dolgozat (bejelentesDt, dolgozatNev, modositasDt) VALUES (now(),'%s',now())";
-	$v = array( 'Dolgozat '.date('Y-m-d H:i:s') );
-	$dolgozatId = db_query($q, array('fv' => 'ujDolgozat/1', 'modul' => 'naplo', 'result' => 'insert', 'values'=>$v), $olr);
-
-	$q = "INSERT INTO tankorDolgozat (dolgozatId, tankorId) VALUES (%u, %u)";
-	$v = array($dolgozatId, $tankorId);
-	db_query($q, array('fv' => 'ujDolgozat/2', 'modul' => 'naplo', 'result' => 'insert', 'values' => $v), $olr);
-	
-	return $dolgozatId;
-
-    }
-
-    function dolgozatModositas($dolgozatId, $dolgozatNev, $tervezettDt) {
-
-	if (intval($dolgozatId)==0) return false;
-	if ($tervezettDt=='') return false;
-	if ($dolgozatNev!='') {
-	    $q = "UPDATE dolgozat SET dolgozatNev='%s', tervezettDt='%s', modositasDt=now() WHERE dolgozatId=%u";
-	    $v = array($dolgozatNev, $tervezettDt, $dolgozatId);
-	} else {
-	    $q = "UPDATE dolgozat SET tervezettDt='%s', modositasDt=now() WHERE dolgozatId=%u";
-	    $v = array($tervezettDt, $dolgozatId);
-	}
-        return db_query($q, array('fv' => 'dolgozatModositas', 'modul' => 'naplo', 'values' => $v));
-
-    }
-?>
diff --git a/mayor-orig/www/include/modules/naplo/share/ertekeles.php b/mayor-orig/www/include/modules/naplo/share/ertekeles.php
deleted file mode 100644
index 6d9b3cf2..00000000
--- a/mayor-orig/www/include/modules/naplo/share/ertekeles.php
+++ /dev/null
@@ -1,60 +0,0 @@
- 0,  // semmi
-        1 => 2,  // szóbeli osztályfőnöki figyelmeztetés
-        2 => 3,  // osztályfőnöki figyelmeztetés
-        3 => 4,  // osztályfőnöki intő
-        4 => 5,  // osztályfőnöki rovó
-        5 => 6,  // igazgatói figyelmeztető (szülő értesítése)
-        6 => 0,  // semmi
-        7 => 7,  // igazgatói intő
-        8 => 0,  // semmi
-        9 => 8,  // igazgatói rovó
-        10 => 0, // igazgatói rovó
-        11 => 9  // fegyelmi eljárás
-    );
-
-?>
diff --git a/mayor-orig/www/include/modules/naplo/share/esemeny.php b/mayor-orig/www/include/modules/naplo/share/esemeny.php
deleted file mode 100644
index ab68f99b..00000000
--- a/mayor-orig/www/include/modules/naplo/share/esemeny.php
+++ /dev/null
@@ -1,216 +0,0 @@
-'ujEsemeny','modul'=>'naplo','values'=>$v,'result'=>'insert'));
-	// Ha tanár veszi fel, akkor őt rögtön rendeljük hozzá!
-	if (is_numeric($esemenyId) && __TANAR) {
-	    $q = "INSERT INTO esemenyTanar (esemenyId, tanarId) VALUES (%u,%u)";
-	    $v = array($esemenyId, __USERTANARID);
-	    db_query($q, array('fv'=>'ujEsemenyModositas/insTanar','modul'=>'naplo','values'=>$v));
-	}
-	return $esemenyId;
-    }
-
-    function getEsemenyAdat($esemenyId) {
-	$v = array($esemenyId);
-	$q = "SELECT * FROM esemeny WHERE esemenyId=%u";
-	$ret = db_query($q, array('fv'=>'getEsemenyAdat','modul'=>'naplo','values'=>$v,'result'=>'record'));
-	$q = "SELECT osztalyId FROM esemenyOsztaly WHERE esemenyId=%u";
-	$ret['osztalyIds'] = db_query($q, array('fv'=>'getEsemenyAdat/osztaly','modul'=>'naplo','values'=>$v,'result'=>'idonly'));
-	$q = "SELECT tanarId FROM esemenyTanar WHERE esemenyId=%u";
-	$ret['tanarIds'] = db_query($q, array('fv'=>'getEsemenyAdat/tanar','modul'=>'naplo','values'=>$v,'result'=>'idonly'));
-	$q = "SELECT esemenyDiak.*, TRIM(CONCAT_WS(' ', viseltNevElotag, viseltCsaladinev, viseltUtonev)) AS diakNev 
-		FROM esemenyDiak LEFT JOIN ".__INTEZMENYDBNEV.".diak USING (diakId) WHERE esemenyId=%u ORDER BY diakNev";
-	$ret['diakok'] = db_query($q, array('fv'=>'getEsemenyAdat/diak','modul'=>'naplo','values'=>$v,'result'=>'indexed'));
-	$ret['diakIds'] = array();
-	if (is_array($ret['diakok'])) foreach ($ret['diakok'] as $dAdat) $ret['diakIds'][] = $dAdat['diakId'];
-
-	return $ret;
-    }
-
-    function esemenyModositas($ADAT) {
-
-	$lr = db_connect('naplo');
-	db_start_trans($lr);
-
-	// osztály-hozzárendelések törlése
-	$q = "DELETE FROM esemenyOsztaly WHERE esemenyId=%u";
-	$v = array($ADAT['esemenyId']);
-	$ok = db_query($q, array('fv'=>'esemenyModositas/delOsztaly','modul'=>'naplo','values'=>$v), $lr);
-	// TODO: diák-hozzárendelés alapján kiegészítendő az osztalyid-k listája!
-	if (is_array($ADAT['esemenyOsztaly']) && count($ADAT['esemenyOsztaly'])>0) {
-	    // osztály-hozzárendelések felvétele
-	    $q = "INSERT INTO esemenyOsztaly (esemenyId, osztalyId) VALUES (".implode('),(', array_fill(0, count($ADAT['esemenyOsztaly']), '%u,%u')).")";
-	    $v = array();
-	    foreach ($ADAT['esemenyOsztaly'] as $osztalyId) { $v[] = $ADAT['esemenyId']; $v[] = $osztalyId; }
-	    $ok = $ok && db_query($q, array('fv'=>'esemenyModositas/insOsztaly','modul'=>'naplo','values'=>$v), $lr);
-	}
-
-	// tanár-hozzárendelések törlése
-	$q = "DELETE FROM esemenyTanar WHERE esemenyId=%u";
-	$v = array($ADAT['esemenyId']);
-	$ok = $ok && db_query($q, array('fv'=>'esemenyModositas/delTanar','modul'=>'naplo','values'=>$v), $lr);
-	if (is_array($ADAT['esemenyTanar']) && count($ADAT['esemenyTanar'])>0) {
-	    // tanár-hozzárendelések felvétele
-	    $q = "INSERT INTO esemenyTanar (esemenyId, tanarId) VALUES (".implode('),(', array_fill(0, count($ADAT['esemenyTanar']), '%u,%u')).")";
-	    $v = array();
-	    foreach ($ADAT['esemenyTanar'] as $tanarId) { $v[] = $ADAT['esemenyId']; $v[] = $tanarId; }
-	    $ok = $ok && db_query($q, array('fv'=>'esemenyModositas/insTanar','modul'=>'naplo','values'=>$v), $lr);
-	}
-
-	// esemeny alapadatainak módosítása
-	$q = "UPDATE esemeny SET esemenyRovidnev='%s', esemenyNev='%s', esemenyKategoria='%s', esemenyLeiras='%s',
-		jelentkezesTolDt='%s', jelentkezesIgDt='%s', max=%u, min=%u
-		WHERE esemenyId=%u";
-	$v = array(
-	    $ADAT['esemenyRovidnev'], $ADAT['esemenyNev'], $ADAT['esemenyKategoria'], $ADAT['esemenyLeiras'], 
-	    $ADAT['jelentkezesTolDt'], $ADAT['jelentkezesIgDt'], $ADAT['max'], $ADAT['min'],
-	    $ADAT['esemenyId'],
-	);
-	$ok = $ok && db_query($q, array('fv'=>'esemenyModositas/mod','modul'=>'naplo','values'=>$v), $lr);
-
-	if ($ok) db_commit($lr);
-	else db_rollback($lr);
-
-	db_close($lr);
-
-	return $ok;
-
-
-    }
-
-    function getEsemenyLista() {
-
-	$q = "SELECT * FROM esemeny ORDER BY esemenyRovidnev";
-	return db_query($q, array('fv'=>'getEsemenyLista','modul'=>'naplo','values'=>array(),'result'=>'indexed'));
-
-    }
-
-    function esemenyTorles($esemenyId) {
-
-	$lr = db_connect('naplo');
-	db_start_trans($lr);
-
-	// tanár-hozzárendelések törlése
-	$q = "DELETE FROM esemenyTanar WHERE esemenyId=%u";
-	$v = array($esemenyId);
-	$ok = db_query($q, array('fv'=>'esemenyTorles/delTanar','modul'=>'naplo','values'=>$v), $lr);
-
-	// diák-hozzárendelések törlése
-	$q = "DELETE FROM esemenyDiak WHERE esemenyId=%u";
-	$v = array($esemenyId);
-	$ok = $ok && db_query($q, array('fv'=>'esemenyTorles/delDiak','modul'=>'naplo','values'=>$v), $lr);
-
-	// osztály-hozzárendelések törlése
-	$q = "DELETE FROM esemenyOsztaly WHERE esemenyId=%u";
-	$v = array($esemenyId);
-	$ok = $ok && db_query($q, array('fv'=>'esemenyTorles/delOsztaly','modul'=>'naplo','values'=>$v), $lr);
-
-	// az esemeny törlése
-	$q = "DELETE FROM esemeny WHERE esemenyId=%u";
-	$v = array($esemenyId);
-	$ok = $ok && db_query($q, array('fv'=>'esemenyTorles/delEsemeny','modul'=>'naplo','values'=>$v), $lr);
-
-	if ($ok) db_commit($lr);
-	else db_rollback($lr);
-
-	db_close($lr);
-
-	return $ok;
-
-    }
-
-    function getAktualisEsemenyByOsztaly($osztalyIds) {
-
-	$q = "SELECT * FROM esemeny LEFT JOIN esemenyOsztaly USING (esemenyId) WHERE osztalyId IN (".implode(',', array_fill(0, count($osztalyIds), '%u')).")";
-	$ret = db_query($q, array('fv'=>'getAktualisEsemenyByOsztaly','modul'=>'naplo','values'=>$osztalyIds, 'result'=>'indexed'));
-
-	for ($i=0; $i'getAktualisEsemenyByOsztaly/letszam','modul'=>'naplo','values'=>array($ret[$i]['esemenyId']), 'result'=>'value'));
-	}
-
-	return $ret;
-    }
-
-    function getValasztottEsemenyek($diakId, $SET = array('esemenyIds' => null)) {
-
-	$q = "SELECT esemenyId FROM esemeny LEFT JOIN esemenyDiak USING (esemenyId) WHERE diakId=%u";
-	$v = array($diakId);
-	if (is_array($SET['esemenyIds'])) {
-	    $q .= " AND esemenyId IN (".implode(',', array_fill(0, count($SET['esemenyIds']), '%u')).")";
-	    foreach ($SET['esemenyIds'] as $eId) $v[] = $eId;
-	}
-	return db_query($q, array('fv'=>'getValasztottEsemenyek','modul'=>'naplo','values'=>$v, 'result'=>'idonly'));
-    }
-
-    function getJovahagyottEsemenyek($diakId, $SET = array('esemenyIds' => null)) {
-
-	$q = "SELECT esemenyId FROM esemeny LEFT JOIN esemenyDiak USING (esemenyId) WHERE diakId=%u AND jovahagyasDt!='0000-00-00 00:00:00'";
-	$v = array($diakId);
-	if (is_array($SET['esemenyIds'])) {
-	    $q .= " AND esemenyId IN (".implode(',', array_fill(0, count($SET['esemenyIds']), '%u')).")";
-	    foreach ($SET['esemenyIds'] as $eId) $v[] = $eId;
-	}
-	return db_query($q, array('fv'=>'getJovahagyottEsemenyek','modul'=>'naplo','values'=>$v, 'result'=>'idonly'));
-    }
-
-    function esemenyJelentkezes($diakId, $esemenyId) {
-
-	$lr = db_connect('naplo');
-	db_start_trans($lr);
-
-	// A max lekérdezése
-	$q = "SELECT max, COUNT(diakId) AS count FROM esemeny LEFT JOIN esemenyDiak USING (esemenyId) WHERE esemenyId=%u GROUP BY max";
-	$v = array($esemenyId);
-	$ret = db_query($q, array('fv'=>'esemenyJelentkezes/max,count','modul'=>'naplo','values'=>$v,'result'=>'record'), $lr);
-
-	if ($ret['count'] < $ret['max']) {
-	    $q = "INSERT INTO esemenyDiak (diakId, esemenyId, jelentkezesDt, jovahagyasDt) VALUES (%u, %u, NOW(), '0000-00-00 00:00:00')";
-	    $v = array($diakId, $esemenyId);
-	    $ok = db_query($q, array('fv'=>'esemenyJelentkezes','modul'=>'naplo','values'=>$v), $lr);
-	} else {
-	     $ok = false;
-	    $_SESSION['alert'][] = 'message:wrong_data:Maximális létszám = '.$ret['max'];
-	}
-
-	if ($ok) db_commit($lr);
-	else db_rollback($lr);
-
-	db_close($lr);
-
-	return $ok;
-    }
-
-    function esemenyLeadas($diakId, $esemenyId) {
-
-	$q = "DELETE FROM esemenyDiak WHERE diakId=%u AND esemenyId=%u";
-	$v = array($diakId, $esemenyId);
-	return db_query($q, array('fv'=>'esemenyLeadas','modul'=>'naplo','values'=>$v));
-
-
-    }
-
-    function jelentkezesJovahagyas($diakId, $esemenyId) {
-
-	$q = "UPDATE esemenyDiak SET jovahagyasDt=NOW() WHERE diakId=%u AND esemenyId=%u";
-	$v = array($diakId, $esemenyId);
-	return db_query($q, array('fv'=>'jelentkezesJovahagyas','modul'=>'naplo','values'=>$v));
-
-    }
-
-    function jelentkezesElutasitas($diakId, $esemenyId) {
-
-	$q = "UPDATE esemenyDiak SET jovahagyasDt='0000-00-00 00:00:00' WHERE diakId=%u AND esemenyId=%u";
-	$v = array($diakId, $esemenyId);
-	return db_query($q, array('fv'=>'jelentkezesElutasitas','modul'=>'naplo','values'=>$v));
-
-    }
-
-?>
\ No newline at end of file
diff --git a/mayor-orig/www/include/modules/naplo/share/file.php b/mayor-orig/www/include/modules/naplo/share/file.php
deleted file mode 100644
index 197ed498..00000000
--- a/mayor-orig/www/include/modules/naplo/share/file.php
+++ /dev/null
@@ -1,662 +0,0 @@
- _ATTR_DIAKID,
-	'oid' => _ATTR_OID,
-	'diakigazolvanyszam' => _ATTR_IGAZOLVANYSZAM,
-	'viseltnevelotag' => _ATTR_VNE,
-	'viseltcsaladinev' => _ATTR_VCSN,
-	'viseltutonev' => _ATTR_VUN,
-	'szuleteskorinevelotag' => _ATTR_SZNE,
-	'szuleteskoricsaladinev' => _ATTR_SZCSN,
-	'szuleteskoriutonev' => _ATTR_SZUN,
-	'szuletesihely' => _ATTR_SZH,
-	'szuletesiido' => _ATTR_SZI,
-	'anyanevelotag' => _ATTR_ANE,
-	'anyacsaladinev' => _ATTR_ACSN,
-	'anyautoneve' => _ATTR_AUN,
-	'kezdotanev' => _ATTR_KEZDO_TANEV,
-	'kezdoszemeszter' => _ATTR_KEZDO_SZEMESZTER,
-	'vegzotanev' => _ATTR_VEGZO_TANEV,
-	'vegzoszemeszter' => _ATTR_VEGZO_SZEMESZTER,
-	'adoazonosito' => _ATTR_ADOAZONOSITO,
-	'allampolgarsag' => _ATTR_ALLAMPOLGARSAG,
-	'anyaid' => _ATTR_ANYAID,
-	'apaid' => _ATTR_APAID,
-	'gondviseloid' => _ATTR_GONDVISELOID,
-	'neveloid' => _ATTR_NEVELOID,
-	'diaknaplosorszam' => _ATTR_DIAKNAPLOSORSZAM,
-	'elozoiskolaomkod' => _ATTR_ELOZOISKOLAOMKOD,
-	'email' => _ATTR_EMAIL,
-	'fogyatekossag' => _ATTR_FOGYATEKOSSAG,
-	'gondozasiszam' => _ATTR_GONDOZASISZAM,
-	'jogviszonykezdete' => _ATTR_JOGVISZONYKEZDETE,
-	'jogviszonyvege' => _ATTR_JOGVISZONYVEGE,
-
-	'lakhelyorszag' => _ATTR_LAKHELY_ORSZAG,
-	'lakhelyirsz' => _ATTR_LAKHELY_IRSZ,
-	'lakhelyhelyseg' => _ATTR_LAKHELY_HELYSEG,
-	'lakhelykozteruletnev' => _ATTR_LAKHELY_KOZTERULETNEV,
-	'lakhelykozteruletjelleg' => _ATTR_LAKHELY_KOZTERULETJELLEG,
-	'lakhelyhazszam' => _ATTR_LAKHELY_HAZSZAM,
-	'lakhelyemelet' => _ATTR_LAKHELY_EMELET,
-	'lakhelyajto' => _ATTR_LAKHELY_AJTO,
-
-	'tartorszag' => _ATTR_TART_ORSZAG,
-	'tartirsz' => _ATTR_TART_IRSZ,
-	'tarthelyseg' => _ATTR_TART_HELYSEG,
-	'tartkozteruletnev' => _ATTR_TART_KOZTERULETNEV,
-	'tartkozteruletjelleg' => _ATTR_TART_KOZTERULETJELLEG,
-	'tarthazszam' => _ATTR_TART_HAZSZAM,
-	'tartemelet' => _ATTR_TART_EMELET,
-	'tartajto' => _ATTR_TART_AJTO,
-
-	'tajszam' => _ATTR_TAJSZAM,
-	'osztalyjel' => _ATTR_OSZTALYJEL,
-	'penzugyistatusz' => _ATTR_PENZUGYISTATUSZ,
-	'szemelyiigazolvanyszam' => _ATTR_SZEMELYIIGAZOLVANYSZAM,
-	'szocialishelyzet' => _ATTR_SZOCIALISHELYZET,
-	'statusz' => _ATTR_STATUSZ,
-	'tartozkodasiokiratszam' => _ATTR_TARTOZKODASIOKIRATSZAM,
-	'torvenyeskepviselo' => _ATTR_TORVENYESKEPVISELO,
-	'telefon' => _ATTR_TELEFON,
-	'mobil' => _ATTR_MOBIL,
-	'nem' => _ATTR_NEM,
-	'lakohelyijellemzo' => _ATTR_LAKOHELYIJELLEMZO,
-	'megjegyzes' => _ATTR_MEGJEGYZES,
-    );
-
-    function readUpdateFile($fileName, $mezo_elvalaszto = '	') {
-
-
-	$ADATOK = array();
-	if ($fp = @fopen($fileName,'r')) {
-		// Az első 50 sor beolvasása - minta a mező-hozzárendeléshez
-		$i=0;
-		while (($sor = fgets($fp,1024)) and ($i<50)) {
-			$ADATOK[$i] = explode($mezo_elvalaszto,chop($sor));
-			$i++;
-		}
-		fclose($fp);
-	} else {
-		$_SESSION['alert'][] = 'message:file_open_error:'.$fileName;
-	}
-	
-	return $ADATOK;
-    }
-/*
- * Lekérdezi egy adatbázis (naplo_intezmeny, naplo (tanév)) egy adott táblájának mezőit.
- * Ha szükséges ezek listáját kiegészíti az extraAttrs tömbben felsorolt mezőkkel.
- * A mezőnevekhez nyelvi konstansokat rendelhetünk ($Attrs tömb és lang/.../share/file.php)
- */
-    function getTableFields($table, $db = 'naplo_intezmeny', $extraAttrs = array(), $SET = array('withType' => false)) {
-
-	global $Attrs;
-	
-	$return = $type = $name = array();
-	$q = "SHOW FIELDS FROM `%s`";
-	$r = db_query($q, array('fv' => 'getTableFields','modul' => $db, 'result' => 'indexed', 'values' => array($table)));
-	for ($i = 0; $i < count($r); $i++) {
-	    if ($SET['withType']) {
-		if (substr($r[$i]['Type'],0,7) == 'varchar') $type[ $r[$i]['Field'] ] = 'string';
-		elseif (substr($r[$i]['Type'],0,4) == 'enum') $type[ $r[$i]['Field'] ] = 'enum';
-		elseif (substr($r[$i]['Type'],0,4) == 'date') $type[ $r[$i]['Field'] ] = 'date';
-		elseif (strpos($r[$i]['Type'],'int(') !== false) $type[ $r[$i]['Field'] ] = 'int';
-		else $type[ $r[$i]['Field'] ] = 'string';
-	    }
-	    if ($Attrs[kisbetus($r[$i]['Field'])] != '') $name[$r[$i]['Field']] = $Attrs[kisbetus($r[$i]['Field'])];
-	    else $name[$r[$i]['Field']] = $r[$i]['Field'];
-	}
-	for ($i = 0; $i < count($extraAttrs); $i++) {
-		if (!isset($name[$extraAttrs[$i]])) {
-			if ($Attrs[kisbetus($extraAttrs[$i])] != '') $name[$extraAttrs[$i]] = $Attrs[kisbetus($extraAttrs[$i])];
-			else $name[$extraAttrs[$i]] = $extraAttrs[$i];
-		}
-	}
-	ksort($name);
-
-	if ($SET['withType']) return array('names' => $name, 'types' => $type);
-	return $name;
-
-    }
-
-
-    function getEnumField($modul, $table, $field) {
-
-	$table = '`'.str_replace('.','`.`',$table).'`';
-        $q = "SHOW FIELDS FROM %s LIKE '%s'";
-	$v = array($table, $field);
-        $field = db_query($q, array('fv' => 'getEnumField', 'modul' => $modul, 'result' => 'record', 'values' => $v));
-        $enum = substr($field['Type'], 6, -2);
-        $values = explode("','", $enum);
-
-        return $values;
-    }
-
-    function getSetField($modul, $table, $field) {
-
-	$table = '`'.str_replace('.','`.`',$table).'`';
-        $q = "SHOW FIELDS FROM %s LIKE '%s'";
-	$v = array($table, $field);
-        $field = db_query($q, array('fv' => 'getSetField', 'modul' => $modul, 'result' => 'record', 'values' => $v));
-        $set = substr($field['Type'], 5, -2);
-        $values = explode("','", $set);
-
-        return $values;
-    }
-
-
-    function updateTable($table, $file, $MEZO_LISTA, $KULCS_MEZOK, $mezo_elvalaszto = '	', $rovatfej = false, $db = 'naplo_intezmeny') {
-
-
-	if (!file_exists($file)) {
-		$_SESSION['alert'][] = 'message:file_not_found:updateTable:'.$file;
-		return false;
-	}
-
-	if (!is_array($MEZO_LISTA)) {
-		$_SESSION['alert'][] = 'message:wrong_data:updateTable:MEZO_LISTA';
-		return false;
-	}
-
-	if (!is_array($KULCS_MEZOK)) {
-		$_SESSION['alert'][] = 'message:wrong_data:updateTable:KULCS_MEZOK';
-		return false;
-	}
-
-	// A frissítendő attribútumok listája
-	$attrList = array_values(array_filter($MEZO_LISTA));
-
-	$fp = fopen($file,'r');
-	if (!$fp) {
-		$_SESSION['alert'][] = 'message:file_open_error:updateTable:'.$file;
-		return false;
-	}
-
-	$lr = db_connect($db, array('fv' => 'updateTable'));
-	if (!$lr) {
-		$_SESSION['alert'][] = 'message:db_connect_failure:updateTable';
-		fclose($fp);
-		return false;
-	}
-	db_start_trans($lr);
-
-	// Az első sor kihagyása
-	if ($rovatfej) $sor = fgets($fp,1024);
-	while ($sor = fgets($fp,1024)) {
-
-		$insertValues = $insertPatterns = array();
-		$adatSor = explode($mezo_elvalaszto,chop($sor));
-		$update = false;
-
-		// keresési feltétel összerakása
-		$where = $v = $vw = array();
-		for ($i = 0; $i < count($KULCS_MEZOK); $i++) {
-			if ($adatSor[$KULCS_MEZOK[$i]] != '') {
-				$where[] = "`%s`='%s'";
-				array_push($vw, $MEZO_LISTA[$KULCS_MEZOK[$i]], $adatSor[$KULCS_MEZOK[$i]]);
-			}
-		}
-		$num = 0;
-		if (count($where) != 0) {
-			$q = 'SELECT COUNT(*) FROM `%s` WHERE '.implode(' AND ', $where);
-			array_unshift($vw, $table);
-			$num = db_query($q, array('fv' => 'updateTable', 'values' => $vw, 'result' => 'value', 'modul' => $db), $lr);
-		}
-		if ($num == 1 && _SKIP_ON_DUP === true) { $_SESSION['alert'][] = 'info:_SKIP_ON_DUP:'.serialize($sor); continue; }
-		if ($num == 1) { // update
-		    $v = $vw;
-		    array_shift($v); //$table kivétele
-		    $UPDATE = array();
-		    for ($i = 0; $i < count($MEZO_LISTA); $i++) {
-			if (
-			    $MEZO_LISTA[$i] != ''
-			    and $adatSor[$i] != ''
-			    and !in_array($i,$KULCS_MEZOK)
-			) {
-			    if ($adatSor[$i] == '\N') {
-				array_unshift($UPDATE, "`%s`=NULL");
-				array_unshift($v, $MEZO_LISTA[$i]);
-			    } else {
-				array_unshift($UPDATE, "`%s`='%s'");
-				array_unshift($v, $MEZO_LISTA[$i], $adatSor[$i]);
-			    }
-			}
-		    }
-		    if (count($UPDATE) > 0) {
-			array_unshift($v, $table);
-			$q = 'UPDATE `%s` SET '.implode(',',$UPDATE).' WHERE '.implode(' AND ', $where);
-			$r = db_query($q, array('fv' => 'updateTable/update', 'values' => $v, 'modul' => $db, 'rollback' => true), $lr);
-			if (!$r) {
-			    db_close($lr);
-			    return false;
-			}
-		    }
-		} elseif ($num == 0) { // insert
-		    for ($i = 0; $i < count($MEZO_LISTA); $i++) {
-			if ($MEZO_LISTA[$i] != '') {
-			    if ($adatSor[$i] == '\N') {
-				$insertValues[] = 'NULL';
-				$insertPatterns[] = '%s';
-			    } else {
-				$insertValues[] = $adatSor[$i];
-				$insertPatterns[] = "'%s'";
-			    }
-			}
-		    }
-		    $q = 'INSERT INTO `%s` ('.implode(',', array_fill(0, count($attrList), '%s')).') 
-				    VALUES ('.implode(',', $insertPatterns).')';
-		    $v = mayor_array_join(array($table), $attrList, $insertValues);
-		    $r = db_query($q, array('fv' => 'updateTable/insert', 'modul' => $db, 'values' => $v, 'rollback' => true), $lr);
-		    if (!$r) {
-			db_close($lr);
-			return false;
-		    }
-		} else {
-		    $_SESSION['alert'][] = 'message:wrong_data:updateTable:több illeszkedő rekord is van, túl laza a kulcs feltétel ('
-				.call_user_func_array('sprintf', array_merge(array('%s tábla, '.implode(' AND ',$where)), $vw)).')';
-		    db_rollback($lr);
-		    db_close($lr);
-		    return false;
-		}
-	} // while
-	db_commit($lr);
-	db_close($lr);
-
-	fclose($fp);
-
-    }
-
-    function generatePDF($outputFile, $outputDir, $str, $booklet=false) {
-
-
-	// A szöveg file-ba írása
-	if (!$fp = fopen($outputDir.'/'.$outputFile.'-u8.tex', 'w')) {
-	    $_SESSION['alert'][] = 'message:file_open_failure:generatePDF:'.$outputDir.'/'.$outputFile.'-u8.tex';
-	    return false;
-        }
-	if (!fwrite($fp, $str)) {
-	    $_SESSION['alert'][] = 'message:file_write_failure:generatePDF:'.$outputDir.'/'.$outputFile.'-u8.tex';
-	    return false;	
-        }
-	fclose($fp);
-	if (__NYOMTATAS_XETEX===true) {
-    	    $ret = exec('cd '.$outputDir.'; cat < '.$outputFile.'.tex
-%\font\kicsi=ecrm0500
-%\font\nagy=ecbx1200
-%\font\vastag=ecsx0800
-%\font\nagyss=ecsx1200
-%\font\normal=ecss0800
-%\font\dolt=ecsi0800
-
-\font\kicsi="Linux Libertine O" at 5pt
-\font\nagy="Linux Libertine O/B" at 12pt
-\font\nagyss="Arial/B" at 12pt
-\font\normal="Linux Biolinum O" at 8pt
-\font\dolt="Linux Biolinum O/I" at 8pt
-\normal
-
-EOF
-');
-    	    $ret = exec('cd '.$outputDir.'; cat '.$outputFile.'-u8.tex >> '.$outputFile.'.tex');
-    	    $ret = exec('cd '.$outputDir.'; xetex -fmt '._MAYOR_DIR.'/print/module-naplo/xetex/mayor-xetex '.$outputFile.'.tex');
-#ex -fmt '._MAYOR_DIR.'/print/module-naplo/tex/mayor '.$outputFile.'.tex');
-	} else {
-	    // utf8 --> cork (t1)
-    	    $ret = exec('cd '.$outputDir.'; cat '.$outputFile.'-u8.tex | recode u8..T1 > '.$outputFile.'.tex');
-	    // DVI, PS, PFD generálás (a rotate miatt nem megy a pdftex közvetlenül :o(
-    	    $ret = exec('cd '.$outputDir.'; tex -fmt '._MAYOR_DIR.'/print/module-naplo/tex/mayor '.$outputFile.'.tex');
-	    if ($ret === false) { $_SESSION['alert'][] = 'message:futási_hiba:generatePDF:tex'; return false; }
-# LOG        	$ret = exec('cd '.$outputDir.'; dvips '.$outputFile.'.dvi  2>&1 | tee -a /tmp/x.log   ');
-    	    $ret = exec('HOME=/tmp && export HOME && cd '.$outputDir.'; dvips '.$outputFile.'.dvi ');
-	    if ($ret === false) { $_SESSION['alert'][] = 'message:futási_hiba:generatePDF:ps'; return false; }
-    	    $ret = exec('cd '.$outputDir.'; ps2pdf -sPAPERSIZE=a4 -dAutoRotatePages=/None '.$outputFile.'.ps');
-	    if (strpos($ret, 'error') !== false) { $_SESSION['alert'][] = 'message:futási_hiba:generatePDF:pdf'; return false; }
-
-	}
-	if ($booklet) {
-    	    $ret = exec('cd '.$outputDir.'; mv '.$outputFile.'.pdf '.$outputFile.'-A4.pdf; pdfbook --short-edge --outfile '.$outputFile.'.pdf '.$outputFile.'-A4.pdf');
-	}
-	return true;
-    }
-
-    function generateXLS($fileName, $Table, $title) {
-
-	global $policy, $page, $sub, $f;
-
-	if (dirname($fileName) == '.') $fileName = _DOWNLOADDIR."/$policy/$page/$sub/$f/$fileName";
-	$fp = fopen($fileName, 'w');
-	if (!$fp) {
-	    $_SESSION['alert'][] = 'message:file_open_failure:'.$fileName;
-	    return false;
-	}
-
-	fputs($fp, ''."\r\n");
-        fputs($fp, ''."\r\n");
-        fputs($fp, ' '."\r\n"
-                .'  '."\r\n"
-                .'  '."\r\n"
-                ."\r\n".' '."\r\n");
-
-        fputs($fp, ''."\r\n");
-        fputs($fp, ''."\r\n");
-
-	for ($i = 0; $i < count($Table); $i++) {
-	    fputs($fp, '  '."\r\n");
-	    foreach ($Table[$i] as $index => $value) {
-                if (is_numeric($value))
-                    fputs($fp, "    ".$value."\r\n");
-                elseif (strtotime($value))
-                    if (strlen($value) > 10) {
-                        fputs($fp, "    ".str_replace(' ','T',$value).'.000'."\r\n");
-                    } else {
-                        fputs($fp, "    ".$value.'T08:40:00.000'."\r\n");
-                    }
-                else
-                    fputs($fp, "    ".$value."\r\n");
-            }
-	    fputs($fp, '  '."\r\n");
-	}
-
-        fputs($fp, '
'."\r\n");
-        fputs($fp, ''."\r\n");
-        fputs($fp, ''."\r\n");
-
-        fclose($fp);
-        return true;
-
-    }
-
-    function generateCSV($fileName, $Table, $title, $mezoElvalaszto='	') {
-
-	global $policy, $page, $sub, $f;
-
-	if (dirname($fileName) == '.') $fileName = _DOWNLOADDIR."/$policy/$page/$sub/$f/$fileName";
-	$fp = fopen($fileName, 'w');
-	if (!$fp) {
-	    $_SESSION['alert'][] = 'message:file_open_failure:'.$fileName;
-	    return false;
-	}
-
-        if ($title !='') fputs($fp, $title."\n");
-        for ($i = 0; $i < count($Table); $i++) fputs($fp, implode($mezoElvalaszto, $Table[$i])."\n");
-
-        fclose($fp);
-        return true;
-
-    }
-
-    function generateODS($fileName, $Table, $title) {
-
-	global $policy, $page, $sub, $f;
-
-	if (dirname($fileName) == '.') $fileName = _DOWNLOADDIR."/$policy/$page/$sub/$f/$fileName";
-	define('TMPZIP','/tmp/'.substr(basename($fileName), 0, strpos(basename($fileName), '.')));
-	define('ODS_MIMETIPE','application/vnd.oasis.opendocument.spreadsheet');
-	define('ODS_MANIFEST','
-
- 
- 
-');
-	define('ODS_START_XMLDOCUMENT','
-');
-	define('ODS_ASTYLES','
-    
-      
-      -
-      
-      -
-      
-    
-    
-  ');
-	define('ODS_START_SPREADSHEET','');
-	define('ODS_START_TABLE','');
-	define('ODS_START_ROW','');
-	define('ODS_END_ROW','');
-	define('ODS_END_TABLE','');
-	define('ODS_END_SPREADSHEET','');
-	define('ODS_END_XMLDOCUMENT','');
-
-	$content = ODS_START_XMLDOCUMENT . ODS_ASTYLES . ODS_START_SPREADSHEET . ODS_START_TABLE;
-	for ($i = 0; $i < count($Table); $i++) {
-	    $content .= ODS_START_ROW;
-	    foreach ($Table[$i] as $index => $value) {
-                if (is_numeric($value))
-		    $content .= ''."\n";
-                elseif (strtotime($value))
-                    if (strlen($value) > 10) {
-			$content .= ''."\n";
-                    } else {
-			$content .= ''."\n";
-                    }
-                elseif ($value[0] == '=') $content .= ''."\n";
-		// formula példa: $value = 'of:=SUM([.A1:.B1])*2+[.A1]'
-		else $content .= ''.$value.''."\n";
-            }
-	    $content .= ODS_END_ROW;
-	}
-	$content .= ODS_END_TABLE . ODS_END_SPREADSHEET . ODS_END_XMLDOCUMENT;
-	
-	mkdir(TMPZIP);
-	mkdir(TMPZIP."/META-INF");
-	file_put_contents(TMPZIP."/META-INF/manifest.xml", ODS_MANIFEST);
-	file_put_contents(TMPZIP."/content.xml", $content);
-	file_put_contents(TMPZIP."/mimetype", ODS_MIMETIPE);
-	system("cd ".TMPZIP."; zip -mr ".$fileName." mimetype META-INF/* content.xml >/dev/null");
-	rmdir(TMPZIP."/META-INF");
-	rmdir(TMPZIP);
-
-	return true;
-    }
-
-/* --------------------------------------- */
-
-    function _template2array($fp, $type, &$aTeX) {
-        $vege = false;
-        $aTeX[$type] = array();
-        while (!$vege && ($sor = fgets($fp, 1024))) {
-            $sor = chop($sor);
-            if ($sor == "%}$type") {
-                $vege = true;
-            } elseif (substr($sor, 0, 2) != '%!') { // A feldolgozást végző függvény megadása
-                if (substr($sor, 0, 2) == '%}') {
-		    echo "HIBA #1 Megnyitás előtti blokk lezárás a {$type} blokkban: $sor
";
-                } else {
-                    if (substr($sor, 0, 2) == '%{') {
-                        $_type = substr($sor, 2);
-                        _template2array($fp, $_type, $aTeX);
-                        $aTeX[$type][] = '%{'.$_type.'}';
-                    } else {
-			// feltételes szövegrészek
-			$condArray = explode('%?', $sor);
-			for ($i = 1; $i < count($condArray); $i = $i + 2) {
-			    $str = $condArray[$i];
-			    $tmpArray = explode('|', $str);
-			    $j = 0; while (is_array($aTeX['conditional']["$j".$tmpArray[0]])) $j++;
-			    $newCondition = "$j".$tmpArray[0];
-			    $aTeX['conditional'][$newCondition] = array(true => $tmpArray[1], false => $tmpArray[2], 'orig' => $tmpArray[0]);
-			    $sor = str_replace($str.'%?', $newCondition, $sor);
-			}
-//                        $aTeX[$type][] = $sor;
-			// lezáró eset
-			$finalArray = explode('%>', $sor);
-			for ($i = 1; $i < count($finalArray); $i = $i + 2) {
-			    $str = $finalArray[$i];
-			    $tmpArray = explode('', $str);
-			    $j = 0; while (is_array($aTeX['finalCase']["$j".$type])) $j++;
-			    $newCondition = "$j".$type;
-			    $aTeX['finalCase'][$newCondition] = array(true => $tmpArray[0], false => $tmpArray[1]);
-			    $sor = str_replace($str.'%>', $newCondition, $sor);
-			}
-                        $aTeX[$type][] = $sor;
-                    }
-                }
-            }
-        }
-    }
-
-    function _array2text($type, $id, $mit, $mire, $aTeX, $ADAT, $flag = null) {
-        $ret = '';
-        if (is_null($id)) $A = $ADAT[$type];
-        else $A = $ADAT[$type][$id];
-
-        // A cserélendő attribútumok
-        if (is_array($A)) foreach ($A as $attr => $value) {
-            if (!is_array($value)) {
-		if (true || !is_bool($value)) { // feltételes szövegrészek külön kezelendők ??? Miért is? Az általánosabb feltételes kiíráshoz kell!
-            	    if (in_array('%$'.$attr, $mit)) { // A már szereplő mintát felülírjuk!
-			$key = array_search('%$'.$attr, $mit);
-			$mit[$key] = '%$'.$attr;
-            		$mire[$key] = $value;
-		    } else {
-			$mit[] = '%$'.$attr;
-            		$mire[] = $value;
-		    }
-		}
-            }
-        }
-
-        // aTeX feldolgozása
-        $TeX = $aTeX[$type];
-        for ($i = 0; $i < count($TeX); $i++) {
-            $sor = $TeX[$i];
-            if (substr($sor, 0, 2) == '%{') {
-                // Almodul feldolgozása
-                $_type = substr($sor, 2, -1);
-                if (is_array($A[$_type])) {
-                    if (is_null($id)) {
-                        foreach ($A[$_type] as $key => $_id) $ret .= _array2text($_type, $_id, $mit, $mire, $aTeX, $ADAT);
-                    } else {
-			$count = count($A[$_type]); $db = 0;
-                        foreach ($A[$_type] as $_id => $_data) {
-			    $db++; if ($count == $db) $_flag = 'final'; else $_flag = null;
-                            if (!is_array($ADAT[$_type][$_id]) && !is_array($_data)) {
-                                echo '
HIBA#2!!! '.$_type.':'.$_id.':'.$_data.'
';
-//                                return false;
-                            } else {
-				if (!is_array($ADAT[$_type][$_id])) $ADAT[$_type][$_id] = array();
-				elseif (!is_array($_data)) $_data = array();
-                        	$ADAT[$_type][$_id] = $ADAT[$_type][$_id] + $_data;
-                        	$ret .= _array2text($_type, $_id, $mit, $mire, $aTeX, $ADAT, $_flag);
-			    }
-                        }
-                    }
-                } elseif (__DEBUG === true)  { echo '
HIBA#3: '.$sor.'
'.$_type.':'; var_dump($A[$_type]); echo '
';}
-            } else {
-                    // Csere - lezáró eset
-		    if (strpos($sor, '%>') !== false) foreach ($aTeX['finalCase'] as $attr => $values) {
-			$sor = str_replace('%>'.$attr, $values[ $flag === 'final' ], $sor);
-		    }
-		    // Csete - feltételes kiírás
-                    if (strpos($sor, '%?') !== false) foreach ($aTeX['conditional'] as $attr => $values) {
-			// Nem csak az adott szintről veszi az értéket, hanem feljebbről is (a feljebbi a meghatározó - ez nem biztos, hogy jó...)
-			if ($key = array_search('%$'.$values['orig'], $mit)) $_val = $mire[$key];
-			else $_val = $A[$values['orig']];
-			$sor = str_replace('%?'.$attr, $values[ $_val==true ], $sor);
-			//$sor = str_replace('%?'.$attr, $values[ $A[$values['orig']]==true ], $sor);
-		    }
-		    // Kiírás
-                    $ret .= str_replace($mit, $mire, $sor)."\n";
-            }
-        }
-
-        return $ret;
-    }
-
-    function template2text($templateFile, $ADAT) {
-
-	$mit = $mire = array();
-	$aTeX = array('conditional' => array());
-
-	$fp = fopen($templateFile, 'r');
-	_template2array($fp, 'base', $aTeX);
-	fclose($fp);
-	return _array2text('base', null, $mit, $mire, $aTeX, $ADAT);
-
-    }
-
-    function template2file($templateFile, $ADAT) {
-
-	global $policy, $page, $sub, $f;
-
-	$mit = $mire = array();
-	$aTeX = array('conditional' => array());
-
-	$fp = fopen($templateFile, 'r');
-	// A feldolgozást végző függvény neve
-	$sor = fgets($fp, 1024);
-	rewind($fp);
-	if (substr($sor, 0, 2) == '%!') {
-	    list($func,$ext,$opt) = explode(' ', substr(chop($sor), 2));
-	    if (!function_exists($func)) unset($func);
-	}
-	if ($ext=='') $ext = 'txt';
-	_template2array($fp, 'base', $aTeX);
-	fclose($fp);
-	$text = _array2text('base', null, $mit, $mire, $aTeX, $ADAT);
-//die();
-	if ($text === false) return false;
-	$success = true;
-	if (isset($func)) {
-	    $success = $func($text, $ADAT['file'], $opt);
-	} else {
-	    $fp = fopen(_DOWNLOADDIR."/$policy/$page/$sub/$f/".$ADAT['file'].'.'.$ext, 'w');
-	    fputs($fp, $text);
-	    fclose($fp);
-	}
-	if ($success) return $ADAT['file'].".$ext";
-	else return false;
-
-    }
-
-
-
-?>
diff --git a/mayor-orig/www/include/modules/naplo/share/helyettesites.php b/mayor-orig/www/include/modules/naplo/share/helyettesites.php
deleted file mode 100644
index 140f6744..00000000
--- a/mayor-orig/www/include/modules/naplo/share/helyettesites.php
+++ /dev/null
@@ -1,42 +0,0 @@
-'','igDt'=>'','tankorIdk'=>'','telephelyId'=>'')) {
-
-    	//találjuk ki valahogy a telephelyet... (osztály, terem, tanár alapján???)
-	if ($SET['telephelyId']!='') {
-	    $telephelyId=$SET['telephelyId'];
-	    $WT = " AND (`terem`.`telephelyId` = $telephelyId OR terem.teremId IS NULL) ";
-	}
-
-	$igDt = $SET['igDt']; $tolDt=$SET['tolDt']; $osztalyId = $SET['osztalyId'];
-	$W = '';
-	if (is_array($SET['tankorIdk']) && count($SET['tankorIdk']) > 0) {
-	    $W = ' AND tankorId IN ('.implode(',', array_fill(0, count($SET['tankorIdk']), '%u')).')';
-	    $v = mayor_array_join(array($tolDt, $igDt), $SET['tankorIdk']);
-	} else { $v = array($tolDt, $igDt); }
-        $q = "SELECT ora.oraId,ora.dt,ora.ora,ora.ki,ora.kit,ora.tankorId,ora.teremId,ora.leiras,ora.tipus,ora.eredet, ora.feladatTipusId
-              FROM ora
-		LEFT JOIN ".__INTEZMENYDBNEV.".terem USING (teremId)
-              WHERE dt>='%s' AND dt<='%s'
-                    AND (eredet!='órarend' OR kit!='')
-		    $W
-		    $WT
-              ORDER BY dt,ora";
-//                    AND (tipus NOT LIKE '%máskor') 
-	$RESULT['indexed'] = db_query($q, array('fv' => 'getHelyettesitendoOrak', 'modul' => 'naplo', 'result' => 'indexed', 'values' => $v));
-	for ($i = 0; $i < count($RESULT['indexed']); $i++) {
-	    $TANAROK[] = $RESULT['indexed'][$i]['ki'];
-	    $TANAROK[] = $RESULT['indexed'][$i]['kit'];
-	    $TANKOROK[] = $RESULT['indexed'][$i]['tankorId'];
-	    /* ezt egyelőre nem használjuk semmire! Sima plusz óra */
-	    //if ($RESULT['indexed'][$i]['eredet'] == 'plusz') 
-	    //	$RESULT['plusz'][] = $RESULT['indexed'][$i]['oraId'];
-	}
-	if (is_array($TANKOROK))
-	    $RESULT['tanarok'] = array_unique($TANAROK);
-	$RESULT['tankorok'] = $TANKOROK;
-	return $RESULT;
-    }
-
-
-?>
diff --git a/mayor-orig/www/include/modules/naplo/share/helyettesitesModifier.php b/mayor-orig/www/include/modules/naplo/share/helyettesitesModifier.php
deleted file mode 100644
index 17f0cf53..00000000
--- a/mayor-orig/www/include/modules/naplo/share/helyettesitesModifier.php
+++ /dev/null
@@ -1,117 +0,0 @@
- 'hianyzasEsJegyHozzarendelesTorles', 'modul' => 'naplo', 'result' => 'indexed', 'values' => $oraId), $lr);
-//	$r = m_ysql_query($q, $lr) or die(m_ysql_error());
-//	if (!$r) {
-//	    $_SESSION['alert'][] = 'message:m_ysql_query_failure:hianyzasEsJegyHozzarendelesTorles:'.$q.':'.m_ysql_error($lr);
-//	    if($olr == '') $lr = db_close($lr);
-//	    return false;
-//	}
-	$hIds = array();
-	if (is_array($H) && count($H) > 0) {
-	    foreach ($H as $key => $hAdat) {
-		extract($hAdat, EXTR_PREFIX_ALL, 'tmp');
-		$hIds[] = $tmp_hianyzasId;
-		logAction(
-		    array(
-			'szoveg'=>"Helyettesítés/óraelmaradás => törölt hiányzás: hianyzasId=$tmp_hianyzasId, diakId=$tmp_diakId, dt=$tmp_dt, ora=$tmp_ora, oraId=$tmp_oraId, tipus=$tmp_tipus, statusz=$tmp_statusz, igazolas=$tmp_igazolas",
-			'table'=>'hianyzas'
-		    ), 
-		    $lr
-		);
-	    }
-	    // --TODO: hianyzasTorles() - fv-t hívjuk meg!
-	    $q = "DELETE FROM hianyzas WHERE hianyzasId IN (".implode(',', array_fill(0, count($hIds), '%u')).")";
-	    db_query($q, array('fv' => 'hianyzasEsJegyHozzarendelesTorles', 'modul' => 'naplo', 'values' => $hIds, 'result' => 'affected rows'), $lr);
-	}
-	// Az elmaradt órákhoz rendelt jegyek hozzárendelésének törlése
-	$q = "UPDATE jegy SET oraId=NULL WHERE oraId IN (".implode(',', array_fill(0, count($oraId), '%u')).")";
-	$H = db_query($q, array('fv' => 'hianyzasEsJegyHozzarendelesTorles', 'modul' => 'naplo', 'result' => 'affected rows', 'values' => $oraId), $lr);
-
-	if ($olr == '') $lr = db_close($lr);
-	return true;
-    }
-
-
-    function masTartja($oraId, $ki, $tipus, $olr = null) {
-
-	if (is_null($ki) || $ki==0) {
-	    $_SESSION['alert'][] = '::masTartja():ki értéke nulla vagy NULL!';
-//	    $q = "UPDATE ora SET kit=ki,ki=NULL,tipus='%s' WHERE oraId=%u";
-//	    $v = array($tipus, $oraId);
-//	    return db_query($q, array('fv' => 'masTartja', 'modul' => 'naplo', 'values' => $v), $olr);
-	} else {
-	    $q = "UPDATE ora SET kit=ki,ki=%u,tipus='%s',modositasDt=now() WHERE oraId=%u";
-	    $v = array($ki, $tipus, $oraId);
-	    return db_query($q, array('fv' => 'masTartja', 'modul' => 'naplo', 'values' => $v), $olr);
-	}
-    }
-
-    function oraElmarad($oraId, $olr = null, $tanev = null) {
-
-	$O = getOraAdatById($oraId);
-
-	if ($olr == '') $lr = db_connect('naplo');
-	else $lr = $olr;
-
-	if ($tanev!='') {
-	    $_tanevDb = tanevDbNev(__INTEZMENY, $tanev);
-	    db_selectDb($_tanevDb,$lr);
-	}
-	if ($O['eredet'] == 'plusz') {
-	    // benne van-e egy cserében - mert akkor nem törölhető
-	    $q = "SELECT count(*) FROM cserePluszOra WHERE oraId=%u";
-	    $O['csere'] = db_query($q, array('fv' => 'oraElmarad', 'modul' => 'naplo', 'result' => 'value', 'values' => array($oraId)),$lr);
-	}
-
-	$torol = true;
-	if (
-	    ($O['eredet'] == 'órarend' && $O['tipus'] == 'normál') // normál órarendi óra
-	    || ($O['eredet'] == 'plusz' && $O['csere'] > 0 && $O['tipus'] == 'normál') // cserélt, normállá alakult, plusz óra
-	    || ($O['eredet'] == 'plusz' && $O['tipus'] == 'normál máskor') // cserében lévő normál, plusz óra
-	) {
-	    $q = "UPDATE ora SET kit=ki,ki=NULL,tipus='elmarad',modositasDt=now() WHERE oraId=%u";
-	} elseif (
-	    ($O['eredet'] == 'órarend' && in_array($O['tipus'], array('helyettesítés','felügyelet','összevonás')))
-	    || ($O['eredet'] == 'plusz' && $O['csere'] > 0 && in_array($O['tipus'], array('helyettesítés','felügyelet','összevonás')))
-	) {
-	    $q = "UPDATE ora SET ki=NULL,tipus='elmarad',modositasDt=NOW() WHERE oraId=%u";
-	} elseif (
-	    $O['eredet'] == 'plusz' && in_array($O['tipus'], array('helyettesítés','felügyelet','összevonás','normál'))
-	    || $O['tipus'] == 'egyéb'
-	) {
-	    $q = "DELETE FROM ora WHERE oraId=%u";
-	} else { $torol = false; }
-
-	if ($torol) {
-	    HianyzasEsJegyHozzarendelesTorles($oraId, $lr, $tanev);
-	    $ret = db_query($q, array('fv' => 'oraElmarad', 'modul' => 'naplo', 'values' => array($oraId)),$lr);
-	} else {
-	    $ret = false;
-	}
-
-	if ($olr == '') $lr = db_close($lr);
-	return $ret;
-
-    }
-
-?>
diff --git a/mayor-orig/www/include/modules/naplo/share/hetes.php b/mayor-orig/www/include/modules/naplo/share/hetes.php
deleted file mode 100644
index 7bd7079e..00000000
--- a/mayor-orig/www/include/modules/naplo/share/hetes.php
+++ /dev/null
@@ -1,48 +0,0 @@
- 'getHetesek', 'modul' => 'naplo', 'result' => 'assoc', 'keyfield' => 'sorszam', 'values' => $v));
-    }
-
-    function getHetesek($osztalyId=null, $dt = null) {
-
-	if ($osztalyId=='') {
-	    if (!isset($dt)) {
-    		$q = "SELECT * FROM hetes ORDER BY dt,sorszam";
-		$v = array();
-	    } else {
-    		$q = "SELECT * FROM hetes WHERE dt<='%s' ORDER BY dt,sorszam";
-    		$v = array($dt);
-	    }
-	} else {
-	    if (!isset($dt)) {
-    		$q = "SELECT * FROM hetes WHERE osztalyId=%u ";
-    		$v = array($osztalyId);
-	    } else {
-    		$q = "SELECT * FROM hetes WHERE osztalyId=%u AND dt<'%s'";
-    		$v = array($osztalyId, $dt);
-	    }
-	}
-    	return db_query($q, array('fv' => 'getHetesek', 'modul' => 'naplo', 'result' => 'multiassoc', 'keyfield'=>'osztalyId', 'values' => $v));
-
-    }
-
-    function hetesFelvetel($ADAT) {                                                                                                                                                                        
-        for ($i = 1; $i < 3; $i++) {                                                                                                                                                                       
-            if (isset($ADAT['hetes'][$i])) 
-		$q = "REPLACE INTO hetes (osztalyId,dt,sorszam,diakId) VALUES (%u, '%s', $i, %u)";                                                                              
-            else                                                                                                                                                                                           
-                $q = "DELETE FROM hetes WHERE osztalyId=%u AND dt='%s' AND sorszam=$i";                                                                                                                    
-
-            $v = array($ADAT['osztalyId'], $ADAT['dt'], $ADAT['hetes'][$i]);                                                                                                                               
-            db_query($q, array('fv' => 'hetesFelvetel', 'modul' => 'naplo', 'values' => $v));                                                                                                              
-        }                                                                                                                                                                                                  
-    }                           
-?>
diff --git a/mayor-orig/www/include/modules/naplo/share/hianyzas.php b/mayor-orig/www/include/modules/naplo/share/hianyzas.php
deleted file mode 100644
index 4b3787fa..00000000
--- a/mayor-orig/www/include/modules/naplo/share/hianyzas.php
+++ /dev/null
@@ -1,541 +0,0 @@
- dt tömböt, akkor
-    //    diákonként lekérdezi a megadott dátumig, de legkésőbb a szemszter
-    //    zárásig lévő hiányzásokat - a tanév adatbázisból!
-    // 2. Ha aktív a tanév, de nincs $igDts, akkor egyszerre kérdezi le az
-    //    összes diákét a szemeszter zárásig
-    // 3. Ha nem aktív a tanév, akkor az intézményi adatbázisból kérdezi le
-    //    az összesített adatokat (amik záráskor jönnek létre)
-    // 4. Ha nincs megadva szemeszter, akkor az összes szemszter összesítését lekérdezi - az intézményi adatbázisból
-    //
-    ////////////////////////////////////////
-
-    function defWnemszamit() {
-	$W['nemszamit'] = ' AND hianyzasBeleszamit="igen" ';
-	$W['join'] = ' LEFT JOIN '.__INTEZMENYDBNEV.'.tankorTipus USING (tankorTipusId) ';
-	return $W;
-    }
-
-    function getDiakHianyzasOsszesites($diakIds, $szemeszterAdat, $igDts = null) {
-        $ret = array();
-	if (count($diakIds)<1) return $ret;
-
-	$Wnemszamit = defWnemszamit();
-        if (is_array($szemeszterAdat)) {
-            // Egy szemeszter hiányzási adatainak lekérdezése
-            if (
-		($szemeszterAdat['statusz'] == 'aktív' || $szemeszterAdat['statusz'] == 'lezárt')
-		&& is_array($igDts)
-	    ) {
-        	// Folyó vagy lezárt tanév - a tanév adatbázisból kérdezünk le
-		// diákonként más-más vég határidővel (pl Osztályból kilépett)
-    		foreach ($diakIds as $diakId) {
-			$igDt = readVariable(
-			    $igDts[$diakId], 'datetime', $szemeszterAdat['zarasDt'], array(), 'strtotime($return) <= '.strtotime($szemeszterAdat['zarasDt'])
-			);
-			$q = "SELECT diakId,
-                    		COUNT(IF(tipus='hianyzas' AND statusz='igazolt',1,NULL)) AS igazolt,
-                        	COUNT(IF(tipus='hianyzas' AND statusz='igazolatlan',1,NULL)) AS igazolatlan,
-                        	SUM(IF(tipus='késés' AND statusz='igazolatlan',perc,NULL)) AS kesesPercOsszeg,
-
-				COUNT(IF(tipus='hianyzas' AND statusz='igazolt' AND tankorTipus.jelleg='gyakorlat',1,NULL)) AS gyakorlatIgazolt,
-                        	COUNT(IF(tipus='hianyzas' AND statusz='igazolatlan' AND tankorTipus.jelleg='gyakorlat',1,NULL)) AS gyakorlatIgazolatlan,
-                        	SUM(IF(tipus='késés' AND statusz='igazolatlan' AND tankorTipus.jelleg='gyakorlat',perc,NULL)) AS gyakorlatKesesPercOsszeg,
-
-                        	COUNT(IF(tipus='hianyzas' AND statusz='igazolt' AND tankorTipus.jelleg='elmélet',1,NULL)) AS elmeletIgazolt,
-                        	COUNT(IF(tipus='hianyzas' AND statusz='igazolatlan' AND tankorTipus.jelleg='elmélet',1,NULL)) AS elmeletIgazolatlan,
-                        	SUM(IF(tipus='késés' AND statusz='igazolatlan' AND tankorTipus.jelleg='elmélet',perc,NULL)) AS elmeletKesesPercOsszeg
-
-                    		FROM `%s`.hianyzas ".$Wnemszamit['join']."
-				WHERE (
-                        	    tipus = 'hiányzás' OR (tipus='késés' AND statusz='igazolatlan' AND perc IS NOT NULL)
-                    		) AND dt<='%s' AND diakId=%u
-			    ".$Wnemszamit['nemszamit']."
-                        GROUP BY diakId";
-
-			$v = array(tanevDbNev(__INTEZMENY, $szemeszterAdat['tanev']), $igDt, $diakId);
-            		$ret[$diakId] = db_query($q, array(
-			    'fv' => 'getDiakHianyzasOsszesites', 'modul' => 'naplo_intezmeny', 'result' => 'record', 'values' => $v
-			));
-			//++ Hozott hiányzások a tanévben
-			$_hozott = getDiakHozottHianyzas($diakId, array('tanev'=> $szemeszterAdat['tanev'] , 'igDt'=>$igDt));
-			$ret[$diakId]['igazolatlan'] += intval($_hozott['igazolatlan']['db']);
-			$ret[$diakId]['igazolt'] += intval($_hozott['igazolt']['db']);
-		}
-	    } elseif ($szemeszterAdat['statusz'] == 'aktív') {
-		// Aktív tanévből kérdezünk le összesítést - ami még nem készült el -> tanév adatbázist használjuk 
-		    foreach ($diakIds as $diakId) {
-			$_hozott[$diakId] = getDiakHozottHianyzas($diakId, array('tanev'=> $szemeszterAdat['tanev']));
-		    }
-            	    $q = "SELECT diakId,
-
-                            COUNT(IF(tipus='felszerelés hiány',1,NULL)) AS felszerelesHianyDb,
-                            COUNT(IF(tipus='egyenruha hiány',1,NULL)) AS egyenruhaHianyDb,
-                            COUNT(IF(tipus='késés',1,NULL)) AS kesesDb,
-			    
-                            COUNT(IF(tipus='hianyzas' AND statusz='igazolt',1,NULL)) AS igazolt,
-                            COUNT(IF(tipus='hianyzas' AND statusz='igazolatlan',1,NULL)) AS igazolatlan,
-                            SUM(IF(tipus='késés' AND statusz='igazolatlan',perc,NULL)) AS kesesPercOsszeg,
-
-			    COUNT(IF(tipus='hianyzas' AND statusz='igazolt' AND tankorTipus.jelleg='gyakorlat',1,NULL)) AS gyakorlatIgazolt,
-                    	    COUNT(IF(tipus='hianyzas' AND statusz='igazolatlan' AND tankorTipus.jelleg='gyakorlat',1,NULL)) AS gyakorlatIgazolatlan,
-                    	    SUM(IF(tipus='késés' AND statusz='igazolatlan' AND tankorTipus.jelleg='gyakorlat',perc,NULL)) AS gyakorlatKesesPercOsszeg,
-
-                    	    COUNT(IF(tipus='hianyzas' AND statusz='igazolt' AND tankorTipus.jelleg='elmélet',1,NULL)) AS elmeletIgazolt,
-                    	    COUNT(IF(tipus='hianyzas' AND statusz='igazolatlan' AND tankorTipus.jelleg='elmélet',1,NULL)) AS elmeletIgazolatlan,
-                    	    SUM(IF(tipus='késés' AND statusz='igazolatlan' AND tankorTipus.jelleg='elmélet',perc,NULL)) AS elmeletKesesPercOsszeg
-
-                        FROM `%s`.hianyzas ".$Wnemszamit['join']."
-			WHERE (
-                            tipus = 'hiányzás' OR (tipus='késés' AND statusz='igazolatlan' AND perc IS NOT NULL)
-                        ) AND dt<='%s' AND diakId IN (".implode(',', array_fill(0, count($diakIds), '%u')).")
-			    ".$Wnemszamit['nemszamit']."
-                        GROUP BY diakId";
-		    array_unshift($diakIds, tanevDbNev(__INTEZMENY, $szemeszterAdat['tanev']), $szemeszterAdat['zarasDt']);
-            	    $ret = db_query($q, array(
-			'fv' => 'getDiakHianyzasOsszesites', 'modul' => 'naplo_intezmeny', 'result' => 'assoc', 'keyfield' => 'diakId', 'values' => $diakIds
-		    ));
-
-		    //++ Hozott hiányzások a tanévben
-		    foreach ($ret as $diakId => $dAdat) {
-			$ret[$diakId]['igazolatlan'] += intval($_hozott[$diakId]['igazolatlan']['db']);
-			$ret[$diakId]['igazolt'] += intval($_hozott[$diakId]['igazolt']['db']);
-		    }
-            } elseif ($szemeszterAdat['statusz'] != 'tervezett') {
-                // lezárt vagy archív tanév - az intézmény adatbázisból kérdezünk le - nincs $Wnemszamit!! se tankortipusid... :(
-                $q = "SELECT * FROM hianyzasOsszesites 
-			WHERE diakId IN (".implode(',', array_fill(0, count($diakIds), '%u')).") AND tanev=%u AND szemeszter=%u
-		     ";
-
-		array_push($diakIds, $szemeszterAdat['tanev'], $szemeszterAdat['szemeszter']);
-                $ret = db_query($q, array(
-		    'fv' => 'getDiakHianyzasOsszesites', 'modul' => 'naplo_intezmeny', 'result' => 'assoc', 'keyfield' => 'diakId', 'values' => $diakIds
-
-		));
-            } else {
-		$_SESSION['alert'][] = 'message:wrong_dara:tervezett tanév hiányzás összesítése:getDiakHianyzasOsszesites';
-	    }
-        } else {
-            // A diák összes hiányzási adata ?????????????????????????????????????????? BIZTOS KELL MÉG EZZZZ?????????????????
-	    // !!!!!!!!!!!!!!!!!
-            $q = "SELECT * FROM hianyzasOsszesites WHERE diakId IN (".implode(',', array_fill(0, count($diakIds), '%u')).") ORDER BY tanev,szemeszter";
-            $r = db_query($q, array('fv' => 'getDiakHianyzasOsszesites', 'modul' => 'naplo_intezmeny', 'result' => 'indexed', 'values' => $diakIds));
-            for ($i = 0; $i < count($r); $i++) $ret[ $r[$i]['tanev'] ][ $r[$i]['szemeszter'] ][ $r[$i]['diakId'] ] = $r[$i];
-        }
-        return $ret;
-
-    }
-
-    function getIgazolasTipusLista() {
-
-	global $lang;
-
-	if (file_exists("lang/$lang/module-naplo/share/hianyzas.php")) {
-    	    require_once("lang/$lang/module-naplo/share/hianyzas.php");
-	} elseif (file_exists('lang/'._DEFAULT_LANG.'/module-naplo/share/hianyzas.php')) {
-    	    require_once('lang/'._DEFAULT_LANG.'/module-naplo/share/hianyzas.php');
-	}
-
-	$igazolasTipusok['lista'] = getEnumField('naplo', 'hianyzas', 'igazolas');
-	foreach ($igazolasTipusok['lista'] as $index => $tipus) {
-	    $const = '_'.str_replace(' ', '_', nagybetus(ekezettelen($tipus)));
-	    if (defined($const)) $igazolasTipusok[$tipus] = constant($const);
-	    elseif ($tipus != '') {
-		$igazolasTipusok[$tipus] = $tipus;
-		$_SESSION['alert'][]= 'message:wrong_data:hiányzó nyelvi konstans:'.$tipus.':getIgazolasTipusLista';
-	    }
-	}
-	return $igazolasTipusok;
-    }
-
-    function getHianyzasByOraId($oraId, $SET = array('csakId' => false)) {
-    
-	if ($SET['csakId'] === true) {
-	    $q = "SELECT hianyzasId FROM hianyzas WHERE oraId=%u";
-	    $RES = db_query($q, array('fv' => 'getHianyzasByOraId', 'modul' => 'naplo', 'result' => 'idonly', 'values' => array($oraId)));
-	} else {
-	    $q = "SELECT * FROM hianyzas WHERE oraId=%u";
-	    $RES = db_query($q,array('fv'=>'getHianyzasByOraId', 'modul' => 'naplo', 'result' => 'indexed', 'values' => array($oraId)));
-	}
-	return $RES;
-    }
-
-    function getHianyzasByDiakIds($diakIds, $SET = array('tolDt' => null, 'igDt' => null, 'result' => 'indexed', 'keyfield' => null)) {
-
-	if (!is_array($diakIds) || count($diakIds) == 0) return false;
-
-	$result = readVariable($SET['result'], 'enum', 'indexed', array('indexed','multiassoc'));
-	if ($result == 'multiassoc') $keyfield = readVariable($SET['keyfield'], 'enum', 'tankorId', array('tankorId', 'diakId', 'ora', 'oraId'));
-	$tolDt = readVariable($SET['tolDt'], 'date');
-	$igDt = readVariable($SET['igDt'], 'date');
-	initTolIgDt(__TANEV, $tolDt, $igDt);
-
-	$q = "SELECT *,hianyzas.tipus as hTipus FROM hianyzas LEFT JOIN ora USING (oraId,dt,ora) 
-		WHERE '%s' <= dt AND dt <= '%s' AND diakId IN (".implode(',', array_fill(0, count($diakIds), '%u')).")
-		ORDER BY ora,tankorId";
-	array_unshift($diakIds, $tolDt, $igDt);
-	$ret = db_query($q, array('fv' => 'getHianyzasByDiakIds', 'modul' => 'naplo', 'result' => $result, 'keyfield' => $keyfield, 'values' => $diakIds));
-
-	return $ret;
-
-    }
-
-    function getOraIdByHianyzasId($hianyzasId, $olr = null) {
-    
-	    $q = "SELECT oraId FROM hianyzas WHERE hianyzasId=%u";
-	    return db_query($q, array('fv' => 'getOraIdByHianyzasId', 'modul' => 'naplo', 'result' => 'value', 'values' => array($hianyzasId)),$olr);
-    }
-
-    function getHianyzasByDt($DIAKIDK, $DTK, $SET = array('result' => '')) {
-	if(!is_array($DIAKIDK) || count($DIAKIDK) == 0) return false;
-	if (!is_array($DTK))
-	    if ($DTK=='') return false;
-	    else $DTK = array($DTK);
-	$v = mayor_array_join($DTK, $DIAKIDK);
-	if ($SET['csakId']!==true) {
-	    $q = "SELECT * FROM hianyzas WHERE dt IN ('".implode("','", array_fill(0, count($DTK), '%s'))."') 
-		    AND diakId IN (".implode(',',array_fill(0, count($DIAKIDK), '%u')).") ORDER BY dt,ora";
-	    $R = db_query($q,array('fv' => 'getHianyzasByDt', 'modul' => 'naplo', 'result' => 'indexed', 'values' => $v));
-	    for ($j=0; $j 'getHianyzasByDt', 'modul' => 'naplo', 'result' => 'idonly', 'values' => $v));
-	}
-	return $RES;	
-    }
-
-    function getHianyzasById($hianyzasId) {
-	if ($hianyzasId == '') return false;
-	$q = "SELECT * FROM hianyzas WHERE hianyzasId=%u";
-	return db_query($q, array('fv'=>'getHianyzasById', 'modul' => 'naplo', 'result' => 'indexed', 'values' => array($hianyzasId)));
-    }
-
-    function getDiakIgazolatlan($diakId) {
-    
-	global $_TANEV;
-    
-	$Wnemszamit = defWnemszamit();
-	$WHERE = "diakId=%u AND tipus IN ('hiányzás','késés') AND statusz='igazolatlan' AND '%s' <= dt AND dt<='%s'";
-        $q = "SELECT * FROM hianyzas ".$Wnemszamit['join']." WHERE $WHERE ".$Wnemszamit['nemszamit']." ORDER BY dt, ora";
-        $v = array($diakId, $_TANEV['kezdesDt'], $_TANEV['zarasDt']);
-	return db_query($q, array('fv' => 'getDiakIgazolatlan', 'modul' => 'naplo', 'result' => 'indexed', 'values' => $v));
-
-    }
-
-    function getIgazolasSzam($diakId, $dt = '') {
-
-	global $_TANEV;
-        // ha dt adott, azt a napot ne számoljuk bele a napi! limit-be (hisz még beírhatok több hiányzást is!)
-        $RETURN = array();
-
-	$Wnemszamit = defWnemszamit();
-	// szemeszterenként
-	foreach ($_TANEV['szemeszter'] as $szemeszter => $szAdat) {
-
-	    $WHERE = "diakId=%u AND tipus='hiányzás' AND statusz='igazolt' AND '%s' <= dt AND dt<='%s'";
-	    $v = array($diakId, $szAdat['kezdesDt'], $szAdat['zarasDt']);
-	    if ($dt!='') {
-		$WHERE2 = " AND dt!='%s' ";
-		$v[] = $dt;
-	    } else $WHERE2 = ''; // vajon az óráknál ez nem kell?
-
-	    // napok
-            $q = "SELECT COUNT(DISTINCT dt) AS darab, igazolas FROM hianyzas ".$Wnemszamit['join']."WHERE $WHERE $WHERE2".$Wnemszamit['nemszamit']." GROUP BY igazolas";
-	    $ret = db_query($q, array('fv' => 'getIgazolasSzam', 'modul' => 'naplo', 'result' => 'indexed', 'values' => $v));
-	    for ($i = 0; $i < count($ret); $i++) {
-                $RETURN['napok'][$szemeszter][ $ret[$i]['igazolas'] ] =  $ret[$i]['darab'];
-                $RETURN['napok']['osszesen'][ $ret[$i]['igazolas'] ] += $ret[$i]['darab'];
-	    }
-	    // órák
-            $q = "SELECT COUNT(*) AS darab, igazolas FROM hianyzas ".$Wnemszamit['join']." WHERE $WHERE ".$Wnemszamit['nemszamit']." GROUP BY igazolas";
-	    $ret = db_query($q, array('fv' => 'getIgazolasSzam', 'modul' => 'naplo', 'result' => 'indexed', 'values' => $v));
-	    for ($i = 0; $i < count($ret); $i++) {
-                $RETURN['orak'][$szemeszter][ $ret[$i]['igazolas'] ] =  $ret[$i]['darab'];
-                $RETURN['orak']['osszesen'][ $ret[$i]['igazolas'] ] += $ret[$i]['darab'];
-	    }
-	    $RETURN['szemeszterek'][] = $szemeszter;
-	}
-        return $RETURN;
-    }
-
-    function legkorabbiIgazolhatoHianyzasVeg($osztalyId, $olr = '') {
-
-
-	if (!isset($osztalyId) || $osztalyId == '' || count($osztalyId)==0) {
-	    $_SESSION['alert'][] = 'message:wrong_data:Nincs megadva osztály (legkorabbiIgazolhatoHianyzasVeg)';
-	    // return false;
-	    return _LEGKORABBI_IGAZOLHATO_HIANYZAS;
-	}
-
-        // _IGAZOLAS_BEIRAS_HATARIDO előtti első osztályfőnöki óra - vagy _LEGKORABBI_IGAZOLHATO_HIANYZAS
-        if ($olr == '') $lr = db_connect('naplo');
-        else $lr = $olr;
-
-	    if (!is_array($osztalyId)) $osztalyId = array($osztalyId);
-
-	    // Az osztályfőnöki tankör lekérdezése (!!! ez hibás, targyNev='osztályfőnöki' helyett a tárgy típus alapján kell! -- TODO 
-	    $q = "SELECT tankorId FROM ".__INTEZMENYDBNEV.".tankorOsztaly
-		    LEFT JOIN ".__INTEZMENYDBNEV.".tankor USING (tankorId)
-		    LEFT JOIN ".__INTEZMENYDBNEV.".targy USING (targyId) 
-		    WHERE targyNev='osztályfőnöki' AND osztalyId IN (".implode(',', array_fill(0, count($osztalyId), '%u')).")";
-	    $ofoTankorId = db_query($q, array(
-		'fv' => 'legkorabbiIgazolhatoHianyzasVeg', 'modul' => 'naplo_intezmeny', 'result' => 'idonly', 'values' => $osztalyId
-	    ), $lr);
-
-	    // Legutóbbi osztályfőnöki óra dátuma - Jó ez? Több osztály esetén az egyikét adja meg... nem? Ennek így nincs is értelme...
-	    if (is_array($ofoTankorId) && count($ofoTankorId)>0) {
-        	$q = "SELECT dt FROM ".__TANEVDBNEV.".ora WHERE tankorId IN (".implode(',', array_fill(0, count($ofoTankorId), '%u')).")
-                    AND dt<'"._IGAZOLAS_BEIRAS_HATARIDO."'
-		    AND tipus NOT LIKE 'elmarad%%'
-                    ORDER BY dt DESC LIMIT 1";
-		$ofoOraDt = db_query($q, array('fv' => 'legkorabbiIgazolhatoHianyzasVeg', 'modul' => 'naplo', 'result' => 'value', 'values' => $ofoTankorId));
-	    } else {
-		$ofoOraDt = '';
-	    }
-        if ($olr == '') db_close($lr);
-
-        if ($ofoOraDt != '' && strtotime($ofoOraDt) > strtotime(_LEGKORABBI_IGAZOLHATO_HIANYZAS)) {
-            return $ofoOraDt;
-        } else {
-	    //$_SESSION['alert'][] = 'info:wrong_data:Nem volt még osztályfőnöki óra!';
-            return _LEGKORABBI_IGAZOLHATO_HIANYZAS;
-        }
-
-    }
-
-    function getNemIgazolhatoDt($diakId, $munkatervIds, $ofoOraDt = '', $olr = '') {
-
-	global $_TANEV;
-
-        if ($olr == '') $lr = db_connect('naplo');
-        else $lr = $olr;
-
-	if (!is_array($munkatervIds) || count($munkatervIds)==0) $munkatervIds = array(1); // a default 
-
-        if ($ofoOraDt == '') {
-	    // A diák osztályai
-	    $q = "SELECT DISTINCT osztalyId FROM ".__INTEZMENYDBNEV.".osztalyDiak
-		    WHERE diakId=%u AND beDt<='%s'
-		    AND (kiDt IS NULL OR kiDt >= '%s')";
-	    $v = array($diakId, $_TANEV['zarasDt'], $_TANEV['kezdesDt']);
-	    $diakOsztalyId = db_query($q, array('fv' => 'getNemIgazolhatoDt-1', 'modul' => 'naplo_intezmeny', 'result' => 'idonly', 'values' => $v), $lr);
-	    if (is_array($diakOsztalyId)) $ofoOraDt = legkorabbiIgazolhatoHianyzasVeg($diakOsztalyId, $lr); // ugye tudjuk, hogy ez nem feltétlenül az osztályfőnöki órát jelenti!
-	} 
-
-	if ($ofoOraDt != '') {
-            // Hianyzott-e az ofő óra napján
-            $q = "SELECT COUNT(dt) FROM ".__TANEVDBNEV.".hianyzas
-                    WHERE diakId = %u
-                    AND tipus = 'hiányzás'
-                    AND dt = '%s'";
-	    $v = array($diakId, $ofoOraDt);
-	    $num = db_query($q, array('fv' => 'getNemIgazolhatoDt-2', 'modul' => 'naplo', 'result' => 'value', 'values' => $v), $lr);
-            if ($num > 0) {
-                // Ha hiányzott, mikor volt előtte utoljára iskolában
-
-                // A tanuló hiányzásainak listája
-		// LEZÁRT TANÉVNÉL EZ PROBLÉMÁS!
-                $q = "CREATE TEMPORARY TABLE ".__INTEZMENYDBNEV.".tanulo_hianyzasai
-                        SELECT DISTINCT dt FROM hianyzas
-                        WHERE diakId = %u
-                        AND tipus = 'hiányzás'";
-		$v = array($diakId);
-                $r = db_query($q, array('fv' => 'getNemIgazolhatoDt-3', 'modul' => 'naplo', 'values' => $v), $lr);
-               // első nem hiányzásos tanítási nap...
-                $q = "SELECT nap.dt
-                        FROM nap LEFT JOIN ".__INTEZMENYDBNEV.".tanulo_hianyzasai USING (dt)
-                        WHERE tanulo_hianyzasai.dt IS NULL
-                        AND nap.dt < '%s'
-                        AND nap.tipus IN ('tanítási nap','speciális tanítási nap')
-			AND munkatervId IN (".implode(',', array_fill(0, count($munkatervIds), '%u')).")
-                        ORDER BY nap.dt DESC
-                        LIMIT 1";
-		$v = mayor_array_join(array($ofoOraDt),$munkatervIds);
-                $r = db_query($q, array('fv' => 'getNemIgazolhatoDt-4', 'modul' => 'naplo', 'result' => 'indexed', 'values' => $v), $lr);
-                if (count($r) > 0) {
-                    // ha nem az első tanítási napig hiányzik...
-                    $dt = $r[0]['dt'];
-                } else {
-                    // ha az első tanítási napig hiányzik...
-                    $dt = date('Y-m-d',strtotime('last day',strtotime($_TANEV['kezdesDt'])));
-                }
-
-                // Az ideiglenes táblák a kapcsolat zárásakor törlődnek!
-                // Meglevő kapcsolat használatakor azonban törölni kell.
-                if ($olr != '') db_query("DROP TABLE ".__INTEZMENYDBNEV.".tanulo_hianyzasai", array('fv' => 'getNemIgazolhatoDt-4', 'modul' => 'naplo'), $lr);
-
-            } else {
-                // Ha nem hiányzott, akkor az ofő óra napja előtti nap a keresett dt
-                $dt = date('Y-m-d',strtotime('last days',strtotime($ofoOraDt)));
-            }
-
-        } else { // ide be sem megyünk!
-            // Ha nem volt osztályfőnöki óra - vagy inkább legkorábbi igazolható hiányzás vég - azaz nincs osztály?
-            $dt = date('Y-m-d', strtotime('last days', strtotime($_TANEV['kezdesDt'])));
-        }
-
-        if ($olr == '' ) db_close($lr);
-
-        return $dt;
-
-    }
-
-    function getDiakHianyzasStat($diakId, $SET = array('tankorIds'=>null, 'tanev'=>__TANEV)) {
-	if (is_array($SET['tankorIds'])) $tankorIds = $SET['tankorIds'];
-	else 
-	    return false;
-	    
-	$tanevDbNev = tanevDbNev(__INTEZMENY,$SET['tanev']);
-	
-	$q = "SELECT tankorId,COUNT(*) AS db FROM `%s`.hianyzas LEFT JOIN `%s`.ora USING (oraId) 
-		WHERE diakId=%u AND hianyzas.tipus='hiányzás' AND hianyzas.dt<=CURDATE() GROUP BY tankorId";
-	$v = array($tanevDbNev, $tanevDbNev, $diakId);
-	return db_query($q, array(
-	    'fv' => 'getDiakHianyzasStat', 'modul' => 'naplo_intezmeny', 'result' => 'assoc', 'keyfield' => 'tankorId', 'values' => $v
-	));
-    
-    }
-
-    function _relevance($x,$base) {
-        return ($x<20)  ? ($base-sqrt($x)/(sqrt(20)/(0+$base))) : 0; // a képlet normalizálható, de továbbfejleszés miatt ilyen formájú
-    }
-    function getDarabDiakHianyzas($dt='') {
-
-        if ($dt=='') $dt = date('Y-m-d');
-        //$q = "select count(*) AS db from (select diakId,count(*) AS db FROM hianyzas WHERE dt='%s' AND tipus LIKE 'hi_nyz_s' GROUP BY diakId HAVING db>2) AS stat";
-
-	/* Mai hiányzók száma (súlyozottan) */
-        $stamp1=strtotime($dt);
-        $stamp2=mktime(0,0,1,date('m'),date('d'),date('y'));
-        $relevance = floor( ($stamp2-$stamp1) / (3600*24) )+0;
-	$q = "select count(*) AS dbDiak, dbOra from (select diakId,count(*) AS dbOra FROM hianyzas WHERE dt='%s' AND tipus = 'hiányzás' GROUP BY diakId) AS stat GROUP BY dbOra";
-        $v = array($dt);
-        $R = db_query($q, array('fv' => 'getDarabDiakHianyzas', 'modul' => 'naplo', 'result' => 'assoc', 'keyfield'=>'dbDiak', 'values' => $v));
-	$hianyzo=0;
-        foreach ($R as $dbDiak => $D) {
-            if ($D['dbOra']==1) $hianyzo += _relevance($relevance,0.8)*$dbDiak;
-            elseif ($D['dbOra']<=2) $hianyzo +=  _relevance($relevance,0.95)*$dbDiak;
-            elseif ($D['dbOra']<=3) $hianyzo +=  _relevance($relevance,1)*$dbDiak;
-            else $hianyzo += $dbDiak;
-        }
-	$RESULT['hianyzokSulyozva'] = floor($hianyzo);
-	/* --- */
-	/* Mai hiányzók száma (súlyozottan) */
-	$q = "select count(*) AS dbDiak FROM (select diakId,count(*) AS dbOra FROM hianyzas WHERE dt='%s' AND tipus LIKE 'hiányzás' AND igazolas LIKE 'tanulmányi verseny' GROUP BY diakId) AS stat";
-        $v = array($dt);
-        $R = db_query($q, array('fv' => 'getDarabDiakHianyzas', 'modul' => 'naplo', 'result' => 'value', 'values' => $v));
-	$RESULT['hianyzokTanulmanyin'] = $R;
-	/* --- */
-	/* Az órák hány százalékán volt hiányzó */
-	if ($RESULT['hianyzokSulyozva']!=0) {
-	    $q = "select FORMAT((select count( DISTINCT oraId ) FROM hianyzas WHERE tipus LIKE 'hi_nyz_s' AND dt='%s')*100/count(*),2) AS dbHianyzas FROM ora WHERE ora.tipus NOT IN ('elmarad','elmarad máskor') AND dt='%s'";
-	    $v = array($dt,$dt);
-	    $RESULT['oranHianyzasSzazalek'] = db_query($q, array('fv' => 'getDarabDiakHianyzas', 'modul' => 'naplo', 'result' => 'value', 'values' => $v));
-	} else {
-	    $RESULT['oranHianyzasSzazalek'] = 0;
-	}
-	// ---
-
-	return $RESULT;
-    }
-
-    function getDiakHozottHianyzas($diakId=null,$SET = array('tanev'=>__TANEV, 'igDt'=>null)) { // tanév-et nem vesszük figyelembe
-	$RESULT = false;
-	if (isset($diakId) && is_numeric($diakId))
-	{
-	    $tanev = (isset($SET['tanev']) && $SET['tanev']!=__TANEV) ? $SET['tanev'] : __TANEV;
-	    $tanevDbNev = tanevDbNev(__INTEZMENY, $tanev);
-
-	    $v = array($diakId);
-	    if (isset($SET['igDt'])) {
-		$W = " AND dt<='%s'";
-		$v[] = $SET['igDt'];
-	    }
-
-	    $q = "SELECT * FROM `$tanevDbNev`.`hianyzasHozott` WHERE diakId=%u".$W." GROUP BY statusz";
-	    $R = db_query($q, array('fv'=>'getDiakHozottHianyzas','modul'=>'naplo','result'=>'indexed','values'=>$v));
-	    /* ReIndex */
-	    for ($i=0; $i0) { // igen, SQL - ben is lehetne összeadni, a továbbfejlesztés miatt van így.
-//		    $_felev = getFelevByDt($R[$i]['dt']);
-//		    $RESULT[$_felev][$R[$i]['statusz']] += $R[$i]['dbHianyzas'];
-//		    if ($_felev==1) $RESULT[($_felev+1)][$R[$i]['statusz']] += $R[$i]['dbHianyzas']; //+1 ? inkább a szemeszter vég dátuma előttieket kéne összeadni azt csókolom...
-		    $RESULT[$R[$i]['statusz']]['db'] += $R[$i]['dbHianyzas'];
-		}
-	    }
-	    
-	}
-	return $RESULT;
-    }
-
-    function getDiakKretaHianyzas($diakId, $SET = array('preprocess'=>'stat','tanev'=>__TANEV, 'igDt'=>null, 'tolDt'=>null)) {
-	$RESULT = false;
-	if (isset($diakId) && is_numeric($diakId))
-	{
-	    $tanev = (isset($SET['tanev']) && $SET['tanev']!=__TANEV) ? $SET['tanev'] : __TANEV;
-	    $tanevDbNev = tanevDbNev(__INTEZMENY, $tanev);
-
-	    $v = array($diakId);
-	    $W = '';
-	    if (isset($SET['tolDt'])) {
-		$W .= " AND dt>='%s'";
-		$v[] = $SET['tolDt'];
-	    }
-	    if (isset($SET['igDt'])) {
-		$W .= " AND dt<='%s'";
-		$v[] = $SET['igDt'];
-	    }
-
-	    $q = "SELECT * FROM `$tanevDbNev`.`hianyzasKreta` WHERE diakId=%u".$W."";
-	    $R = db_query($q, array('debug'=>false,'fv'=>'getDiakKretaHianyzas','modul'=>'naplo','result'=>'indexed','values'=>$v));
-	    /* ReIndex */
-	    if ($SET['preprocess'] == 'stat') {	
-		for ($i=0; $i0) { // igen, SQL - ben is lehetne összeadni, a továbbfejlesztés miatt van így.
-		    $_igazoltStr = $R[$i]['kretaStatusz'] == 'igen' ? 'igazolt':'igazolatlan';
-		    $RESULT[$R[$i]['tipus']][$_igazoltStr]['db']++;
-		    if ($R[$i]['tipus']=='késés') $RESULT[$R[$i]['tipus']][$_igazoltStr]['perc']+=$R[$i]['perc'];
-		//}
-		}
-	    } elseif ($SET['preprocess']=='naptar') {
-		for ($i=0; $i'szülői',
-		'Orvosi igazolás'=>'orvosi',
-		'Egyéb'=>'egyéb',
-		'Iskolai engedély'=>'igazgatói',
-		'Iskolaérdekű távollét'=>'igazgatói',
-		'Kikérő' => 'igazgatói',
-		'Pályaválasztási célú igazolás'=>'pályaválasztás',
-		'Szolgáltatói igazolás' => 'hatósági',
-		'Hivatalos távollét' => 'egyéb',
-		'Táppénz' => 'egyéb');
-	return $KRETA2MAYOR[$key]!='' ? $KRETA2MAYOR[$key] : 'egyéb';
-    }
-
-    function getKretaIgazolasOsszegzo($diakId) { // -- TODO
-	$q = "SELECT tipus, kretaIgazolas, count(distinct dt) AS db, count(*) AS dbBejegyzes FROM hianyzasKreta WHERE diakId=%u AND kretaStatusz='igen' GROUP BY tipus,kretaIgazolas ORDER BY tipus, kretaIgazolas";
-	$v = array($diakId);
-	$R = db_query($q, array('fv'=>'getKretaIgazolasOsszegzo','modul'=>'naplo','result'=>'indexed','values'=>$v));
-	return reindex($R,array(kretaIgazolas,tipus));
-    }
-
-?>
diff --git a/mayor-orig/www/include/modules/naplo/share/hianyzasModifier.php b/mayor-orig/www/include/modules/naplo/share/hianyzasModifier.php
deleted file mode 100644
index 2414ce07..00000000
--- a/mayor-orig/www/include/modules/naplo/share/hianyzasModifier.php
+++ /dev/null
@@ -1,363 +0,0 @@
-0) {
-            $lr = db_connect('naplo', array('fv' => 'hianyzasPercUpdate'));
-                foreach($PERCEK as $_hid=>$_perc) {
-		    if (__TANAR===true || __NAPLOADMIN===true) { // ennél szűkebb feltételek is szabhatók!
-            		$v = array($_perc, $_hid);
-			/* csak az módosítsa, akinek ... */
-			$W = '';
-			if (__HIANYZASTOROLHETO!==true) {
-			    if (__NAPLOADMIN===false && is_numeric(__USERTANARID)) {
-				$W = " AND rogzitoTanarId = %u ";
-				$v = mayor_array_join($v,array(__USERTANARID));
-			    }
-	    		}
-                	$q = "UPDATE hianyzas SET perc=%u, modositasDt=NOW() WHERE hianyzasId=%u ".$W;
-                	db_query($q, array('fv' => 'hianyzasIgazolas', 'modul' => 'naplo', 'values' => $v), $lr);
-            	    } else {
-            		$_SESSION['alert'][] = 'info:not_allowed';
-            	    }
-                }
-            db_close($lr);
-        }
-    }                                                                                                                                          
-
-    function hianyzasTorles($TORLENDOIDK, $tanev = __TANEV, $olr='') {
-
-	if (!isset($tanev)) 
-	    if (defined('__TANEV')) $tanev = __TANEV;
-	    else return false;
-
-	$lr = ($olr!='') ? $olr : db_connect('naplo_intezmeny');
-
-	$tanevDb = tanevDbNev(__INTEZMENY, $tanev);
-
-	if (!is_array($TORLENDOIDK) && $TORLENDOIDK!='')
-	    $TORLENDOIDK[] = $TORLENDOIDK;
-	    
-        if (is_array($TORLENDOIDK) && count($TORLENDOIDK)>0) {
-
-	    $v = mayor_array_join(array($tanevDb), $TORLENDOIDK);
-
-	    /* Itt ellenőrizhetjük hogy csak azt töröljük amit tényleg kell */
-	    $W = '';
-	    if (__HIANYZASTOROLHETO!==true) {
-		// __VEZETOSEG_TOROLHET_HIANYZAST, ha például tankörnévsort módosít...
-		if (__NAPLOADMIN===false && __VEZETOSEG_TOROLHET_HIANYZAST!==true && is_numeric(__USERTANARID)) {
-		    $W = " AND rogzitoTanarId = %u ";
-		    $v = mayor_array_join($v,array(__USERTANARID));
-		}
-	    }
-
-	    $q = "SELECT * FROM `%s`.hianyzas WHERE hianyzasId IN (".implode(',', array_fill(0, count($TORLENDOIDK), '%u')).")". $W;
-	    $r = db_query($q, array('fv' => 'hianyzasTorles', 'modul' => 'naplo', 'result' => 'indexed', 'values' => $v));
-
-	    for ($i = 0; $i < count($r); $i++) 
-		logAction(
-		    array(
-			'szoveg'=>'del:'.implode(',',$r[$i]),
-			'table'=>'hianyzas'
-		    )
-		);
-
-            $q = "DELETE FROM `%s`.hianyzas WHERE hianyzasId IN (".implode(',', array_fill(0, count($TORLENDOIDK),'%u')).")". $W;
-            $r = db_query($q, array('fv' => 'hianyzasTorles', 'modul' => 'naplo', 'values' => $v), $lr);
-
-        } else { $r = true; /* Nincs mit törölni */ }
-
-	if ($olr=='') db_close($lr);
-	return $r;
-    }
-
-    function hianyzasRegisztralas($ORAADAT,$BEIR) {
-
-        $REPL = $INS = array();
-        $oraId = $ORAADAT['oraId'];
-        $dt = $ORAADAT['dt'];
-        $ora = $ORAADAT['ora'];
-//	$rogzitoTanarStr = (__NAPLOADMIN===false && is_numeric(__USERTANARID)) ? __USERTANARID : 'null'; // null string az sql-nek!
-// Miért ne rögzítsük a naplóadmin esetén a tanárId-t, ha van neki? Ahogy a Vezetőség esetén is rögzítjük...
-	$rogzitoTanarStr = (is_numeric(__USERTANARID)) ? __USERTANARID : 'null'; // null string az sql-nek!
-
-        for($i=0; $i'hianyzasRegisztralas', 'modul'=>'naplo', 'result'=>'record', 'values' => array($oraId)), $lr);
-		    $tankorId = $_ORAADAT['tankorId'];
-		    $rogzitesIdoben = ((strtotime($_ORAADAT['dt']) >= strtotime(_HIANYZAS_HATARIDO)) ? 1:0); //--FIXME
-		    // ezzel nem veszünk részt a tranzakcióban - intézményi db
-		    //$q = "SELECT `tankorTipusId` FROM `tankor` WHERE `tankorId` = %u";
-		    //$tankorTipusId = db_query($q, array('fv'=>'hianyzasRegisztralas', 'modul'=>'naplo_intezmeny', 'result'=>'value', 'values' => array($tankorId)));
-		    $q = "SELECT `tankorTipusId`,`tankorTipus`.`jelleg` FROM `tankor` LEFT JOIN `tankorTipus` USING (`tankorTipusId`) WHERE `tankorId` = %u";
-		    $TANKORADAT = db_query($q, array('fv'=>'hianyzasRegisztralas', 'modul'=>'naplo_intezmeny', 'result'=>'record', 'values' => array($tankorId)));
-		    $tankorTipusId=$TANKORADAT['tankorTipusId'];
-		    $tankorJelleg=$TANKORADAT['jelleg'];
-		    if ($tankorJelleg!='gyakorlat' && $diakJogviszony[$diakId][$dt]['statusz'] == 'magántanuló') {
-			$_SESSION['alert'][] = 'info:diakJogviszony:'.$diakId.':'.$diakJogviszony[$diakId][$dt]['statusz'].':'.$dt;
-			continue;
-		    }
-		    //
-                    if ($INS[$i]['statusz']=='igazolatlan') $INS[$i]['igazolas']='';
-                    
-                    // Plusz ellenőrzés: ha hiányzást vagy késést írnánk be, a párjuk meglétekor ezt elutasítjuk
-                    // Ilyen eset akkor állhat elő, ha pl nem az írta be a hiányzást, aki módosítani próbálja késésre (ekkor ugyanis nem törlődnek előtte a megfelelő bejegyzések)
-                    if (in_array($INS[$i]['tipus'],array('hiányzás','késés'))) {
-                	$q = "SELECT count(hianyzasId) AS db FROM hianyzas WHERE diakId=%u AND oraId=%u AND tipus IN ('hiányzás','késés')";
-                	$v = array($INS[$i]['diakId'], $oraId, $INS[$i]['tipus']);
-			$db = db_query($q, array('fv' => 'hianyzasRegisztralas/check', 'modul' => 'naplo', 'result' => 'value', 'values' => $v), $lr);
-                    }
-                    if ($db==0) {
-                	$q = "INSERT INTO hianyzas (diakId,oraid,dt,ora,perc,tipus,statusz,igazolas,tankorTipusId,rogzitoTanarId,rogzitesIdoben,modositasDt)
-                	    VALUES (%u, %u, '%s', %u, %u, '%s', '%s', '%s', %u, %s, %u, NOW())";
-			$v = array($INS[$i]['diakId'], $oraId, $dt , $ora, $INS[$i]['perc'], $INS[$i]['tipus'], $INS[$i]['statusz'], $INS[$i]['igazolas'], $tankorTipusId, $rogzitoTanarStr, $rogzitesIdoben);
-                	$ins = db_query($q, array('fv' => 'hianyzasRegisztralas', 'modul' => 'naplo', 'result' => 'insert', 'values' => $v), $lr);
-			logAction(
-			    array(
-				'szoveg'=>'ins:'.$ins.':'.$INS[$i]['diakId'].",$oraId,$dt,$ora,".$INS[$i]['perc'].",".$INS[$i]['tipus'].",".$INS[$i]['statusz'].",".$INS[$i]['igazolas'],
-				'table'=>'hianyzas'
-			    ),
-			    $lr
-			);
-		    } else {
-			$_SESSION['alert'][] = 'info:wrong_data:Ez a mulasztás nem módosítható';
-		    }
-                } else {
-		    // a hibaüzenetet a keletkezésének helyén generáljuk (simple függvényben)
-                }
-            } else {
-                if ($diakId=='') $_SESSION['alert'][] = '::(hianyzasRegisztralas), nincs diak azonosito!';
-                if ($oraId=='') $_SESSION['alert'][] = '::(hianyzasRegisztralas), nincs ora azonosito!';
-            }
-        }
-        db_close($lr);
-
-    }
-
-
-   function hianyzasIgazolas($IGAZOLANDOK,$diakId='') {
-
-/*
-	if ($diakId=='') {
-	    $_SESSION['alert'][] = '::Ismeretlen diák azonosító!('.$diakId.')';
-	    return false;
-	} 
-*/
-
-        if (count($IGAZOLANDOK)>0) {
-            $lr = db_connect('naplo');
-                for ($i=0; $i 'hianyzasIgazolas', 'modul' => 'naplo', 'values' => $v),$lr);
-			    logAction(
-				array(
-				    'szoveg'=>'update:'.$_I['id'].':'.$_I['statusz'].','.$_I['igazolas'], 
-				    'table'=>'hianyzas'
-				), 
-				$lr
-			    );
-			} else {
-			    //$_SESSION['alert'][] = '::Ez a típus elfogyott ('.$_I['igazolas'].')'.$oraId.'.'.$diakId.$_I['statusz'];
-			}
-		    } else {
-			if ($diakId=='') $_SESSION['alert'][] = '::(hianyzasIgazolas), nincs diak azonosito!';
-			if ($oraId=='') $_SESSION['alert'][] = '::(hianyzasIgazolas), nincs ora azonosito!';
-		    }
-                }
-            db_close($lr);
-        }
-
-    }
-
-
-    function getHianyzasJogosultsagSimple($oraId,$diakId,$igazolasTipus,$igazolasStatusz,$jogTipus, $olr='') { //$igTipus == SQL"igazolas"
-
-	global $_TANEV;
-
-	$lr = ($olr=='') ? db_connect('naplo') : $olr;
-
-	$ORA = getOraAdatById($oraId, __TANEV, $lr); // a fv kapott tanev paramétert. default: __TANEV
-	$JOG = getHianyzasJogosultsag(array($ORA), array('idk'=>array($diakId)));
-	$oraElmaradt = in_array($ORA['tipus'],array('elmarad','elmarad máskor'));
-
-	if ($lr=='') db_close($lr);
-	//$_SESSION['alert'][] = '::DEBUG:'.in_array($igazolasTipus, $JOG[$diakId]['igazolas']['tipusok']);
-	//if ($JOG[$diakId]['orak'][$ORA['ora']]['beirhato'|'fbeirhato'|'igazolhato']
-	if ($JOG[$diakId]['orak'][$ORA['ora']][$jogTipus]===false)
-	    $_SESSION['alert'][] = '::Nem '.$jogTipus;
-	elseif ($igazolasStatusz != 'igazolatlan' && !@in_array($igazolasTipus, $JOG[$diakId]['igazolas']['tipusok'])) 
-	    $_SESSION['alert'][] = 'info:tipus_elfogyott:'.$igazolasTipus;
-	elseif ($_TANEV['statusz']!='aktív')
-	    $_SESSION['alert'][] = 'info:nem_aktív_tanev';
-	elseif ( !isset($JOG[$diakId]['orak'][$ORA['ora']][$jogTipus]) ) 
-	    $_SESSION['alert'][] = 'info::debug##4';
-
-	return ($_TANEV['statusz']=='aktív' && $JOG[$diakId]['orak'][$ORA['ora']][$jogTipus] && $oraElmaradt===false &&
-		    ($igazolasStatusz == 'igazolatlan'  ||  
-		     @in_array($igazolasTipus, $JOG[$diakId]['igazolas']['tipusok'])));
-    }
-
-    function getHianyzasJogosultsag($ORAK, $NEVSOR) {
-	global $_OSZTALYA,$_TANEV;
-	$DIAKIDK = $NEVSOR['idk'];
-	$DIAKOSZTALYAI = getDiakokOsztalyai($DIAKIDK);
-
-	    for ($i=0;$ifalse, 'beirhato' => false, 'igazolhato' => false);
-		
-		    if ($_TANEV['statusz']=='aktív') {
-			$marElkezdodott = (strtotime($ORAADAT['dt'].' '.$ORAADAT['tolTime']) < strtotime(date('Y-m-d H:i:s')));
-	    		if ($ORAADAT['ki'] == __USERTANARID) {
-			    if ( !in_array($ORAADAT['tipus'], array('elmarad' , 'elmarad máskor')) && $marElkezdodott) {
-				if ( strtotime($ORAADAT['dt']) >= strtotime(_HIANYZAS_HATARIDO) )
-				    $jog['beirhato'] = true;
-				if ( strtotime($ORAADAT['dt']) >= strtotime(_LEGKORABBAN_IGAZOLHATO_HIANYZAS) )
-				    $jog['fbeirhato'] = true;
-			    }
-			} 
-
-	    		if ( 
-			    is_array($DIAKOSZTALYAI[$diakId]) && 
-			    is_array($_OSZTALYA) &&
-			    ($diakOfoje = (is_array($_OSZTALYA) && count(array_intersect($DIAKOSZTALYAI[$diakId],$_OSZTALYA)) > 0))
-			) {
-			    if ( !in_array($ORAADAT['tipus'], array('elmarad' , 'elmarad máskor')) ) {
-				if ( strtotime($ORAADAT['dt']) >= strtotime(_OFO_HIANYZAS_HATARIDO) )
-				    $jog['beirhato'] = true;
-				if ( strtotime($ORAADAT['dt']) > $nemTimeStamp )
-				    $jog['igazolhato'] = true;
-			    }
-			}
-
-			if (__NAPLOADMIN || __VEZETOSEG) {
-			    if ( strtotime($ORAADAT['dt']) >= strtotime(_ZARAS_HATARIDO) )
-				$jog = array('fbeirhato'=>true, 'beirhato' => true, 'igazolhato' => true);
-			}
-
-		    }
-		    $JOGOSULTSAG[$diakId]['orak'][$ora] = $jog;
-		} // end of diakidk
-	    } // end of orak
-
-	/* */
-	$felev = getFelevByDt($ORAK[0]['dt']);
-	if ($felev=='') return false;
-
-	for ($i=0;$i intval($_IGAZOLAS['napok']['osszesen']['szülői'])) and
-			(__SZULOI_IGAZOLAS_FELEVRE == 0 or __SZULOI_IGAZOLAS_FELEVRE > intval($_IGAZOLAS['napok'][$felev]['szülői'])) and
-			(__SZULOI_ORA_IGAZOLAS_EVRE ==0 or __SZULOI_ORA_IGAZOLAS_EVRE > intval($_IGAZOLAS['orak']['osszesen']['szülői'])) and
-			(__SZULOI_ORA_IGAZOLAS_FELEVRE ==0 or __SZULOI_ORA_IGAZOLAS_FELEVRE > intval($_IGAZOLAS['orak'][$felev]['szülői']))
-		    ) {
-			$IG[] = 'szülői';
-		    }
-		    $IG[] = 'verseny';
-		    $IG[] = 'vizsga';
-		    if (
-			(__NAPLOADMIN || $diakOfoje) && // !__VEZETOSEG && - ez nem jó, ha vezetőségi tag ofő is egyben
-			(__OSZTALYFONOKI_IGAZOLAS_EVRE == 0 or __OSZTALYFONOKI_IGAZOLAS_EVRE > intval($_IGAZOLAS['napok']['osszesen']['osztályfőnöki'])) and
-			(__OSZTALYFONOKI_IGAZOLAS_FELEVRE == 0 or __OSZTALYFONOKI_IGAZOLAS_FELEVRE > intval($_IGAZOLAS ['napok'][$felev]['osztályfőnöki'])) and
-			(__OSZTALYFONOKI_ORA_IGAZOLAS_EVRE ==0 or __OSZTALYFONOKI_ORA_IGAZOLAS_EVRE > intval($_IGAZOLAS ['orak']['osszesen']['osztályfőnöki'])) and
-			(__OSZTALYFONOKI_ORA_IGAZOLAS_FELEVRE ==0 or __OSZTALYFONOKI_ORA_IGAZOLAS_FELEVRE > intval($_IGAZOLAS ['orak'][$felev]['osztályfőnöki']))
-		    ) {
-			$IG[] = 'osztályfőnöki';
-		    }
-		}
-		if (__VEZETOSEG || __NAPLOADMIN) {
-		    $IG[] = 'igazgatói';
-		}
-		$IG[] = 'hatósági';
-		$IG[] = 'pályaválasztás';
-		$JOGOSULTSAG[$diakId]['igazolas']['tipusok'] = $IG;
-		$JOGOSULTSAG[$diakId]['igazolas']['szamok'] = $_IGAZOLAS;
-	    }
-	}
-
-	return $JOGOSULTSAG;
-    }
-
-    function hianyzasTankorTipusValtas($tankorId,$tankorTipusId,$SET = array('tanev'=>null)) {
-
-	if (!isset($SET['tanev'])) return false;
-	$TANEV = getTanevAdat($SET['tanev']);
-	if ($TANEV['statusz']!='aktív') return false;
-
-	$tanevDbNev = tanevDbNev(__INTEZMENY, $SET['tanev']);
-
-	$q = "SELECT count(*) AS db FROM `%s`.hianyzas LEFT JOIN `%s`.ora USING(oraId) WHERE tankorTipusId!=%u AND tankorId=%u";
-	$v = array($tanevDbNev,$tanevDbNev,$tankorTipusId,$tankorId);
-	$affected = db_query($q, array('debug'=>false,'modul'=>'naplo','values'=>$v,'result'=>'value'));
-
-	$q = "UPDATE `%s`.hianyzas LEFT JOIN `%s`.ora USING(oraId) SET tankorTipusId=%u WHERE tankorId=%u";
-	$v = array($tanevDbNev,$tanevDbNev,$tankorTipusId,$tankorId);
-	db_query($q, array('debug'=>false,'modul'=>'naplo','values'=>$v));
-
-	return $affected; // sajnos af affected rows DEPRECATED lett
-
-    }
-
-?>
diff --git a/mayor-orig/www/include/modules/naplo/share/hirnok.php b/mayor-orig/www/include/modules/naplo/share/hirnok.php
deleted file mode 100644
index 0607670f..00000000
--- a/mayor-orig/www/include/modules/naplo/share/hirnok.php
+++ /dev/null
@@ -1,357 +0,0 @@
-$SET['diakId']);
-	if (isset($SET['tanarId']) && !is_array($SET['tanarId'])) $SET['tanarId'] = array(0=>$SET['tanarId']);
-	// if (strtotime($SET['tolDt'])>strtotime(date('Y-m-d'))) $SET['tolDt'] = date('Y-m-d H:i:s');
-	if (isset($SET['diakId']) && is_array($SET['diakId'])) {
-	    for ($i=0;$i$_tolDt,'diakId'=>$_diakId);
-		$RESULT[] = array(
-		    'hirnokFolyamAdatok' => array(
-			'id'=>$_diakId,
-			'tipus'=>'diak',
-			'cn'=>getDiakNevById($_diakId),
-			'adat'=>getDiakAdatById($_diakId)
-		    ),
-		    'hirnokFolyamUzenetek' => getHirnokFolyam($SUBSET)
-		);
-	    }
-	}
-	if (isset($SET['tanarId']) && is_array($SET['tanarId'])) {
-	    for ($i=0;$i$_tolDt,'tanarId'=>$_tanarId);
-		$RESULT[] = array(
-		    'hirnokFolyamAdatok' => array(
-			'id'=>$_tanarId,
-			'tipus'=>'tanar',
-			'cn'=>getTanarNevById($_tanarId),
-			'adat'=>getTanarAdatById($_tanarId)
-		    ),
-		    'hirnokFolyamUzenetek' => getHirnokFolyam($SUBSET)
-		);
-	    }
-	}
-	return $RESULT;
-    }
-
-
-    function getHirnokFolyam($SET = array()) {
-
-	global $_TANEV;
-	$R = array();
-
-	$TARGYADAT = array();
-	$DIAKADAT = array();
-	$TANARADAT = array();
-	$TANKORADAT = array();
-	$ORAADAT = array();
-
-	if (__NAPLOADMIN===true) {
-	    if ($SET['diakId']>0) $diakId=$SET['diakId'];
-	    elseif ($SET['tanarId']>0) $tanarId=$SET['tanarId'];
-	    elseif (__TANAR ===true) $tanarId = __USERTANARID;
-	} else {
-	    if (__DIAK===true) { // diák nézet
-		$diakId = __USERDIAKID;
-	    } elseif (__TANAR ===true) { // tanár nézet
-		$tanarId = __USERTANARID;
-	    }
-	}
-
-        // tankörök lekérdezése
-        if (isset($diakId)) $TANKOROK = getTankorByDiakId($diakId, __TANEV);
-        // elseif (isset($osztalyId)) $Tankorok = getTankorByOsztalyId($osztalyId, __TANEV);
-        elseif (isset($tanarId)) $TANKOROK = getTankorByTanarId($tanarId, __TANEV);
-
-        $tankorIds = array();
-        for ($i = 0; $i < count($TANKOROK); $i++) $tankorIds[] = $TANKOROK[$i]['tankorId'];
-	// DOLGOZATOK (leginkább a jövőben???)
-        if (is_array($tankorIds)) {
-            $_dolgozatok = getTankorDolgozatok($tankorIds, TRUE, $SET['tolDt'], $_TANEV['zarasDt']); // ennek a tömbnek a szerkezete elég fura...
-	    for ($i=0; $istrtotime($SET['tolDt'])) {
-		    $R[ strtotime($r['modositasDt']) ][] = array('hirnokTipus' => 'dolgozat',
-			'dolgozatAdat' => $r
-		    );
-		} else {
-		    // dump( 'nem aktuális a változtatás, már láttuk' );
-		}
-	    }
-        }
-
-	if (__DIAK===true || (__NAPLOADMIN===true && $diakId>0)) {
-	    if (_OSZTALYZATOK_ELREJTESE !== true || time() > strtotime($_TANEV['szemeszter'][2]['zarasDt'])) { // --TODO
-		// új zárójegyek, osztályzatok (diák esetén)
-		$q = "SELECT * from zaroJegy WHERE diakId=%u AND modositasDt>='%s'";
-		$v = array($diakId,$SET['tolDt']);
-		$r = db_query($q, array('fv'=>'getHirnokFolyam/zaroJegy','modul'=>'naplo_intezmeny','result'=>'indexed','values'=>$v));
-		for ($i=0; $i'zaroJegy',
-		    'zaroJegyAdat'=>$r[$i],
-		    'diakAdat' => $DIAKADAT[$r[$i]['diakId']],
-		    'targyAdat' => $TARGYADAT[$r[$i]['targyId']]
-		);
-		}
-	    } // -- elrejtésmarhaság
-	    // új jegyek (diák esetén)
-	    $q = "SELECT * from jegy WHERE diakId=%u AND modositasDt>='%s'";
-	    $v = array($diakId,$SET['tolDt']);
-	    $r = db_query($q, array('fv'=>'getHirnokFolyam/jegy','modul'=>'naplo','result'=>'indexed','values'=>$v));
-	    if (is_array($r))
-	    for ($i=0; $i'jegy',
-		'jegyAdat'=>$r[$i],
-		'diakAdat' => $DIAKADAT[$r[$i]['diakId']],
-		'tankorAdat' => $TANKORADAT[$r[$i]['tankorId']][$r[$i]['tankorId']], // 0-1 ELSŐ-MÁSODIK FÉLÉV ADATAI
-		'targyAdat' => $TARGYADAT[$_targyId],
-		'oraAdat' => $ORAADAT[$r[$i]['oraId']],
-		'dolgozatAdat' => $DOLGOZATADAT[$r[$i]['dolgozatId']],
-	    );
-	    }
-
-	    // bejegyzés
-	    $q = "SELECT * from bejegyzes LEFT JOIN ".__INTEZMENYDBNEV.".bejegyzesTipus USING (bejegyzesTipusId) 
-		WHERE diakId=%u AND beirasDt>='%s'";
-	    $v = array($diakId,$SET['tolDt']);
-	    $r = db_query($q, array('fv'=>'getHirnokFolyam/bejegyzes','modul'=>'naplo','result'=>'indexed','values'=>$v));
-	    for ($i=0; $i'bejegyzes',
-		'bejegyzesAdat'=>$r[$i],
-		'diakAdat' => $DIAKADAT[$r[$i]['diakId']],
-		'tanarAdat' => $TANARADAT[$r[$i]['tanarId']][0],
-	    );
-	    }
-
-	    // hiányzás
-	    $q = "SELECT * from hianyzas WHERE diakId=%u AND modositasDt>='%s'";
-	    $v = array($diakId,$SET['tolDt']);
-	    $r = db_query($q, array('fv'=>'getHirnokFolyam/hianyzas','modul'=>'naplo','result'=>'indexed','values'=>$v));
-	    for ($i=0; $i'hianyzas',
-		'hianyzasAdat'=>$r[$i],
-		'diakAdat' => $DIAKADAT[$r[$i]['diakId']],
-		'oraAdat' => $ORAADAT[$r[$i]['oraId']],
-	    );
-	    }
-
-	} // ha diák
-	if (__TANAR === true || (__NAPLOADMIN===true && $tanarId>0)) {
-    	    if (defined('__USERTANARID') && is_numeric(__USERTANARID)) {
-        	$q = "SELECT COUNT(*) FROM ora WHERE ki=".__USERTANARID." AND dt <= CURDATE() AND (leiras IS NULL OR leiras='')";
-        	$r = db_query($q, array('fv' => 'getBeirasiAdatok', 'modul' => 'naplo', 'result' => 'value'));
-		$R[mktime()][] = array(
-		    'hirnokTipus'=>'haladasiBeiratlan',
-		    'db'=>$r
-		);
-		$q = "select * from idoszak where NOW() BETWEEN tolDt AND igDt ORDER BY tolDt";
-        	$r = db_query($q, array('fv' => 'getIdoszakAktiv', 'modul' => 'naplo_intezmeny', 'result' => 'indexed'));
-		for ($i=0; $i'idoszak',
-		    'idoszakAdat'=>$r[$i]
-		    );
-		}
-	    }
-	    if (count($tankorIds)>0) {
-		// haladási óra - helyettesítőknek!
-		$q = "SELECT *,getNev(ki,'tanar') AS kiCn,getNev(kit,'tanar') AS kitCn, getNev(tankorId,'tankor') AS tankorCn from ora WHERE tankorId NOT IN  (".implode(',',$tankorIds).") AND ki=%u AND modositasDt>='%s'";
-		$v = array($tanarId,$SET['tolDt']);
-		$r = db_query($q, array('fv'=>'getHirnokFolyam/haladasi','modul'=>'naplo','result'=>'indexed','values'=>$v));
-		for ($i=0; $i'haladasiOra',
-			'oraAdat'=>$r[$i],
-		    );
-		}
-	    }
-	}
-	// timestamp szerint asszociatív
-	// $R[strtotime($SET['tolDt'])][] = array('cim' => 'ELSŐ', 'txt'=>$SET['tolDt']);
-
-	// haladási óra
-	if (count($tankorIds)>0) {
-	    $q = "SELECT *,getNev(ki,'tanar') AS kiCn,getNev(kit,'tanar') AS kitCn, getNev(tankorId,'tankor') AS tankorCn from ora WHERE tankorId IN  (".implode(',',$tankorIds).") AND modositasDt>='%s'";
-	    $v = array($SET['tolDt']);
-	    $r = db_query($q, array('fv'=>'getHirnokFolyam/haladasi2','modul'=>'naplo','result'=>'indexed','values'=>$v));
-	    for ($i=0; $i'haladasiOra',
-		'oraAdat'=>$r[$i],
-	    );
-	    }
-	}
-	// Üzenő
-//	 /* 20170418
-	initSzerep();
-	$_SET['tanev'] = __TANEV;
-//	$_SET['limits'] = array('limit'=>10, 'mutato'=>1, 'pointer'=>1);
-// --TODO NOTE-- EZ KELL!!!!!!
-	$_SET['filter'][] = 'dt>="'.$SET['tolDt'].'"';
-	$_SET['ignoreAdmin'] = true;
-	$r = getUzenoUzenetek($_SET);
-
-	for ($i=0; $i'uzeno',
-		'uzenoAdat' => $r[$i],
-		'feladoNev' => $feladoNev,
-		'cimzettNev' => $cimzettNev,
-	    ); 
-	}
-//	 20170418 */
-
-	reset($R);
-	krsort($R);
-
-	return $R;
-    }
-
-
-        function getHirnokFeliratkozasok($mind=false) {
-
-	    if ($mind===true) { // hirek feliratkozáshoz!
-		if (__NAPLOADMIN === true) {
-        	    $q = "SELECT * FROM hirnokFeliratkozas ORDER BY email";
-        	    $values = array();
-		} else {
-        	    $q = "SELECT * FROM hirnokFeliratkozas WHERE userAccount='%s' AND policy='%s'";
-        	    $values = array(_USERACCOUNT,_POLICY);
-		}
-	    } else {
-        	$q = "SELECT naploTipus,naploId FROM hirnokFeliratkozas WHERE userAccount='%s' AND policy='%s'";
-        	$values = array(_USERACCOUNT,_POLICY);
-	    }
-            $r = db_query($q, array('modul'=>'naplo_intezmeny','result'=>'indexed','values'=>$values));
-
-	    if ($mind===true) { // hirnokFeliratkozashoz
-		return $r;
-	    } else { // egyébként
-        	for ($i=0; $i'addHirnokFeliratkozas/get', 'modul'=>'naplo_intezmeny', 'values'=>$v, 'result'=>'value'));
-
-	    if ($utolsoEmailDt=='0000-00-00 00:00:00') {
-		$q = "INSERT INTO hirnokFeliratkozas (naploId, naploTipus, userAccount, policy, email, feliratkozasDt, utolsoEmailDt, megtekintesDt) 
-		    VALUES (%u,'%s','%s','%s','%s',NOW(),null,null)";
-		$v = array(intval($ADAT['naploId']), $ADAT['naploTipus'], _USERACCOUNT, _POLICY, $ADAT['email']);
-	    } else {
-		$q = "INSERT INTO hirnokFeliratkozas (naploId, naploTipus, userAccount, policy, email, feliratkozasDt, utolsoEmailDt, megtekintesDt) 
-		    VALUES (%u,'%s','%s','%s','%s',NOW(),'%s',null)";
-		$v = array(intval($ADAT['naploId']), $ADAT['naploTipus'], _USERACCOUNT, _POLICY, $ADAT['email'], $utolsoEmailDt);
-	    }
-	    return db_query($q, array('debug'=>true,'fv'=>'addHirnokFeliratkozas/set', 'modul'=>'naplo_intezmeny', 'values'=>$v, 'result'=>'insert'));
-
-	}
-
-
-	function delHirnokFeliratkozas($ADAT) {
-
-	    // if (!is_array($ADAT['hirnokFeliratkozas'])) $X = array($ADAT['hirnokFeliratkozas']);
-	    $q = "DELETE FROM hirnokFeliratkozas WHERE hirnokFeliratkozasId = %u";
-	    $v = array(intval($ADAT['hirnokFeliratkozasId']));
-	    return db_query($q, array('debug'=>true,'fv'=>'delHirnokFeliratkozas', 'modul'=>'naplo_intezmeny', 'values'=>$v, 'result'=>'delete'));
-	
-	}
-
-?>
\ No newline at end of file
diff --git a/mayor-orig/www/include/modules/naplo/share/intezmenyek.php b/mayor-orig/www/include/modules/naplo/share/intezmenyek.php
deleted file mode 100644
index 9a99a696..00000000
--- a/mayor-orig/www/include/modules/naplo/share/intezmenyek.php
+++ /dev/null
@@ -1,134 +0,0 @@
- 'getIntezmenyek', 'modul' => 'naplo_base', 'result' => 'indexed'));
-        
-    }
-
-    function getTelephelyek($SET = array('result' => 'indexed')) {
-
-	$result = readVariable($SET['result'], 'enum', 'indexed', array('indexed','assoc'));
-	$keyfield = 'telephelyId';
-        $q = "SELECT * FROM telephely";
-	return db_query($q, array('fv' => 'getTelephelyek', 'modul' => 'naplo_intezmeny', 'result' => $result, 'keyfield' => $keyfield));
-
-    }
-
-    function getIntezmenyByRovidnev($rovidnev) {
-
-	$q = "SELECT * FROM intezmeny LEFT JOIN `intezmeny_%s`.`telephely` ON telephely.alapertelmezett=1 WHERE intezmeny.rovidnev='%s'";
-	return db_query($q, array('fv' => 'getIntezmenyByRovidnev', 'modul' => 'naplo_base', 'result' => 'record', 'values' => array($rovidnev, $rovidnev)));
-
-    }
-
-    function getTanevek($tervezett = false) {
-    	
-        $q = "SELECT DISTINCT tanev FROM szemeszter";
-        if (!$tervezett) $q .= " WHERE statusz != 'tervezett'";
-	return db_query($q, array('fv' => 'getTanevek', 'modul' => 'naplo_intezmeny', 'result' => 'idonly'));
-        
-    }
-
-    
-    function updateSessionIntezmeny($intezmeny) {
-
-
-    	$lr = db_connect('naplo_base', array('fv' => 'updateSessionIntezmeny'));
-    	if (!$lr) return false;
-
-    	if ($intezmeny != '') {
-
-    		$intDb = intezmenyDbNev($intezmeny);
-
-		// telephelyId lekérdezése
-		$q = "SELECT `telephelyId` FROM `%s`.telephely WHERE alapertelmezett=1 LIMIT 1";
-		$telephelyId = db_query($q, array('fv' => 'updateSessionIntezmeny/telephely', 'modul' => 'naplo_base', 'values' => array($intDb), 'result' => 'value'), $lr);
-		if ($telephelyId != '') $telephelyIdPattern = '%u';
-		else $telephelyIdPattern = 'NULL';
-    		$q = "SELECT tanev,
-				IF(ABS(DATEDIFF(zarasDt,CURDATE())) 'updateSessionIntezmeny/tanev', 'modul' => 'naplo_base', 'values' => array($intDb), 'result' => 'indexed'), $lr);
-		
-    		if ($r===false) { // Ha például nem létező intézményre váltanánk...
-    			$_SESSION['alert'][] = 'message:wrong_data:no_database?:'.$intDb;
-    			db_close($lr);
-    			return false;
-    		} elseif (count($r) > 0) {
-    			$tanev = $r[0]['tanev'];
-    			$q = "UPDATE session SET intezmeny='%s', tanev=%u, telephelyId=$telephelyIdPattern
-                		WHERE sessionID='"._SESSIONID."' ";
-			$v = array($intezmeny, $tanev, $telephelyId);
-    		} else {
-    			$q = "UPDATE session SET intezmeny='%s', tanev=NULL, telephelyId=$telephelyIdPattern
-                		WHERE sessionID='"._SESSIONID."' ";
-			$v = array($intezmeny, $telephelyId);
-    		}
-
-    	} else {
-    		// Intézmény törlése
-    		$q = "UPDATE session SET intezmeny=NULL, tanev=NULL, telephelyId=NULL WHERE sessionID='%s' ";
-		$v = array(_SESSIONID);
-    	}
-    	$r = db_query($q, array('fv' => 'updateSessionIntezmeny/update', 'modul' => 'naplo_base', 'values' => $v), $lr);
-
-    	db_close($lr);
-
-    	return true;
-
-    }
-
-    function updateSessionTanev($tanev) {
-
-
-    	if (is_numeric($tanev)) {
-
-    	    $intDb = intezmenyDbNev(__INTEZMENY);
-
-    	    $q = "SELECT COUNT(tanev) FROM $intDb.szemeszter WHERE statusz!='tervezett' AND tanev=$tanev";
-    	    $num = db_query($q, array('fv' => 'updateSessionTanev', 'modul' => 'naplo_base', 'values' => array($intDb, $tanev), 'result' => 'value'));
-    	    if ($num > 0) {
-    		$q = "UPDATE session SET tanev=%u WHERE sessionID='"._SESSIONID."' ";
-    	    } else {
-    		$_SESSION['alert'][] = 'message:nincs_ilyen_tanev:'.$tanev;
-		return false;
-    	    }
-
-    	} else {
-    		// Tanév törlése
-    		$q = "UPDATE session SET tanev=NULL WHERE sessionID='"._SESSIONID."' ";
-    	}
-
-    	return db_query($q, array('fv' => 'updateSessionTanev', 'modul' => 'naplo_base', 'values' => array($tanev)));
-
-    }
-
-    function updateSessionTelephelyId($telephelyId) {
-
-
-    	if (is_numeric($telephelyId)) {
-
-    	    $q = "SELECT COUNT(`telephelyId`) FROM `telephely` WHERE `telephelyId`=%u";
-	    $v = array($telephelyId);
-    	    $num = db_query($q, array('fv' => 'updateSessionTelephely', 'modul' => 'naplo_intezmeny', 'values' => array($telephelyId), 'result' => 'value'));
-    	    if ($num == 1) {
-    		$q = "UPDATE `session` SET `telephelyId`=%u WHERE `sessionID`='"._SESSIONID."' ";
-    	    } else {
-    		$_SESSION['alert'][] = 'message:nincs_ilyen_telephelyId:'.$telephelyId;
-		return false;
-    	    }
-
-    	} else {
-    		// telephelyId törlése
-    		$q = "UPDATE `session` SET `telephelyId`=NULL WHERE `sessionID`='"._SESSIONID."' ";
-    	}
-
-    	return db_query($q, array('fv' => 'updateSessionTelephely', 'modul' => 'naplo_base', 'values' => array($telephelyId)));
-
-    }
-
-?>
diff --git a/mayor-orig/www/include/modules/naplo/share/jegy.php b/mayor-orig/www/include/modules/naplo/share/jegy.php
deleted file mode 100644
index 3898bc2a..00000000
--- a/mayor-orig/www/include/modules/naplo/share/jegy.php
+++ /dev/null
@@ -1,73 +0,0 @@
- 'getJegyInfo'));
-	else $lr = $olr;
-
-	$q = "SELECT jegyId, jegy.diakId AS diakId, tankorId, dt, jegy, jegyTipus, tipus, jegy.megjegyzes, oraId, dolgozatId,
-			TRIM(CONCAT_WS(' ',viseltNevElotag,viseltCsaladiNev,viseltUtonev)) AS diakNev, modositasDt
-		    FROM `%s`.jegy LEFT JOIN ".__INTEZMENYDBNEV.".diak USING(diakId)
-		    WHERE jegyId=%u";
-	$jegy = db_query($q, array('fv' => 'getJegyInfo', 'modul' => 'naplo', 'result' => 'record', 'values' => array($tanevDb, $jegyId)), $lr);
-	if (!is_array($jegy)) {
-	    $_SESSION['alert'][] = 'message:wrong_data:getJegyek:jegyId='.$jegyId;
-	    if ($olr == '') db_close($lr);
-	    return false;
-	}
-
-	$jegy['tanár'] = getTankorTanaraiByInterval($jegy['tankorId'], array('tanev' => $tanev, 'result' => 'nevsor'), $lr);
-	$tanarSzam = count($jegy['tanár']); $jegy['tanár']['idk'] = array();
-	for ($i = 0; $i < $tanarSzam; $i++) {
-	    if (!in_array($jegy['tanár'][$i]['tanarId'], $jegy['tanár']['idk']))
-		$jegy['tanár']['idk'][] = $jegy['tanár'][$i]['tanarId'];
-	}
-	$jegy['tankör'] = getTankorById($jegy['tankorId'], $tanev, $lr);
-
-	if ($jegy['oraId'] != '') $jegy['oraAdat'] = getOraAdatById($jegy['oraId'], $tanev, $lr);
-
-	if ($jegy['tipus'] > 2 && $jegy['dolgozatId'] != '') {
-	
-	    // A dolgozat adatainak lekérdezése
-	    $q = "SELECT bejelentesDt, tervezettDt, dolgozatNev FROM `%s`.dolgozat WHERE dolgozatId=%u";
-	    $jegy['dolgozat'] = db_query($q, array('fv' => 'getJegyInfo', 'modul' => 'naplo', 'result' => 'record', 'values' => array($tanevDb, $jegy['dolgozatId'])), $lr);
-	    if (!is_array($jegy['dolgozat']) || count($jegy['dolgozat']) == 0) {
-		$_SESSION['alert'][] = 'message:wrong_data:jegyId='.$jegyId.':dolgozatId='.$jegy['dolgozatId'];
-		if ($olr == '') db_close($lr);
-		return false;
-	    }
-	
-	}
-	
-	if ($olr == '')  db_close($lr);
-    	return $jegy;
-    }
-
-
-    /* 
-	A függvényt arra használjuk, hogy van-e eltérés a tárgy átlag és az osztalyzat között
-    */
-    function getDiakJegyAtlagok($DIAKIDS,$ADAT=array('evfolyam'=>''),$lr='') {
-	// tanev adatbázis
-	//$q = "SELECT targyId,AVG(jegy) as jegyAtlag FROM jegy LEFT JOIN ".__INTEZMENYDBNEV.".tankor USING (tankorId) WHERE diakId=%u GROUP BY targyId";
-	//$r = db_query($q, array('modul'=>'naplo','values'=>array($diakId), 'result'=>'assoc','keyfield'=>'targyId'));
-	$q = "SELECT diakId,targyId,AVG(jegy) as jegyAtlag FROM jegy LEFT JOIN ".__INTEZMENYDBNEV.".tankor USING (tankorId) WHERE diakId IN 
-	    (".implode(',', array_fill(0, count($DIAKIDS), '%u')).") GROUP BY diakId,targyId";
-	$r = db_query($q, array('modul'=>'naplo', 'result'=>'indexed', 'values'=>$DIAKIDS));
-	$arraymap = array('diakId','targyId');
-	return reindex($r, $arraymap);
-    }
-
-?>
diff --git a/mayor-orig/www/include/modules/naplo/share/jegyModifier.php b/mayor-orig/www/include/modules/naplo/share/jegyModifier.php
deleted file mode 100644
index e86a76b0..00000000
--- a/mayor-orig/www/include/modules/naplo/share/jegyModifier.php
+++ /dev/null
@@ -1,68 +0,0 @@
-0) {
-		// Naplózás
-		for ($i = 0; $i < count($jegyInfo); $i++) {
-		    $jegyAdat = $jegyInfo[$i];
-		    $param = $jegyAdat['jegyId'].', '.$jegyAdat['diakId'].', '.$jegyAdat['tankorId'].', '.$jegyAdat['dt'].', '.$jegyAdat['jegy'].', '.$jegyAdat['tipus'].', '.$jegyAdat['oraId'].', '.$jegyAdat['dolgozatId'];
-    		    logAction(
-			array(
-			    'szoveg'=>'Jegy törlés: '.$param, 
-			    'table'=>'jegy'
-			), 
-			$lr
-		    );
-    		}
-		// Jegyek törlése
-    		$q = "DELETE FROM `%s`.jegy WHERE jegyId IN (".implode(',', array_fill(0, count($jegyId), '%u')).")";
-		array_unshift($jegyId, $tanevDb);
-    		$r = db_query($q, array('fv' => 'jegyTorles', 'modul' => 'naplo', 'values' => $jegyId), $lr);
-	    } else {
-		// Miért false? Nincs törlendő jegy - akkor sikeres a törlés // return false;
-		$r = true;
-	    }
-	
-	if ($olr=='') db_close($lr);
-	return $r;
-
-    }
-
-    function jegyModositas($jegyId, $jegy, $jegyTipus, $tipus, $oraId, $dolgozatId, $megjegyzes) {
-
-	$v = array($jegy, $jegyTipus, $tipus);
-	if (!is_null($oraId)) $v[] = $oraId;
-	if (!is_null($dolgozatId)) $v[] = $dolgozatId;
-	array_push($v, $megjegyzes, $jegyId);
-        $q = "UPDATE `jegy` SET modositasDt=NOW(), jegy=%f, jegyTipus='%s', tipus=%u, oraId=".((is_null($oraId))?'NULL':'%u').", dolgozatId=".((is_null($dolgozatId))?'NULL':'%u').", megjegyzes='%s' WHERE jegyId=%u";
-
-        return db_query($q, array('fv' => 'jegyModositas', 'modul' => 'naplo', 'values' => $v), $lr);
-
-    }
-
-?>
diff --git a/mayor-orig/www/include/modules/naplo/share/jegyzet.php b/mayor-orig/www/include/modules/naplo/share/jegyzet.php
deleted file mode 100644
index b5a0da64..00000000
--- a/mayor-orig/www/include/modules/naplo/share/jegyzet.php
+++ /dev/null
@@ -1,216 +0,0 @@
-0) {
-            $userId = __USERDIAKID;
-            $userTipus='diak';
-    } elseif (__DIAK===true && _SZULODIAKID>0) {
-            $userId = __SZULODIAKID;
-            $userTipus='szulo';
-    } elseif (__TANAR === true) {
-            $userId = __USERTANARID;
-            $userTipus='tanar';
-    } else {
-            $userId = 0;
-            $userTipus='';
-    }
-    define('__JEGYZETSZEREPTIPUS',$userTipus);
-    define('__JEGYZETSZEREPID',$userId);
-
-    //
-    function getJegyzet($SET = array('tolDt'=>'','igDt'=>'','dt'=>'')) {
-
-	// csak a saját jegyzeteim lehet lekérdezni
-	if (__DIAK===true && __USERDIAKID>0) {
-	    $userId = __USERDIAKID;
-	    $userTipus='diak';
-	} elseif (__DIAK===true && _SZULODIAKID>0) {
-	    $userId = __SZULODIAKID;
-	    $userTipus='szulo';
-	} elseif (__TANAR === true) {
-	    $userId = __USERTANARID;
-	    $userTipus='tanar';
-	} elseif (__NAPLOADMIN === true) { // ha nem tanár de naplóadmin (speciális eset :) )
-	    $userId = 0;
-	    $userTipus='admin';
-	} else {
-	    return false;
-	}
-
-	$tolDt = readVariable($SET['tolDt'], 'date');
-        $igDt = readVariable($SET['igDt'], 'date');
-        initTolIgDt(__TANEV, $tolDt, $igDt);
-	// jogosultság szerint 0: privát, 1: speciális, 2: publikus (csak tanár állíthat be?)
-	if (__NAPLOADMIN===true && $userId===0 && $userTipus==='admin') { // speciális esetben minden zárt és publikust láthatjuk (kivéve a privátot)
-	    $q = "SELECT *,getNev(userId,userTipus) AS nev FROM jegyzet WHERE publikus IN (0,1,2) AND dt >= '%s' AND dt<= '%s' ORDER BY dt";
-	    $v = array($tolDt,$igDt);
-	} else {
-	    $q = "(SELECT *,getNev(userId,userTipus) AS nev FROM jegyzet WHERE (userId=%u AND userTipus='%s') AND dt >= '%s' AND dt<= '%s' ORDER BY dt)";
-	    if (count($SET['osztalyIdk'])>0) $q .= " UNION (SELECT jegyzet.*,getNev(userId,userTipus) AS nev FROM jegyzet LEFT JOIN jegyzetOsztaly USING (jegyzetId) WHERE osztalyId IN (". implode(',',$SET['osztalyIdk']) .") AND publikus=1 ORDER BY dt)";
-	    if (count($SET['tankorIdk'])>0) $q .= " UNION (SELECT jegyzet.*,getNev(userId,userTipus) AS nev FROM jegyzet LEFT JOIN jegyzetTankor USING (jegyzetId) WHERE tankorId IN (". implode(',',$SET['tankorIdk']) .") AND publikus=1 ORDER BY dt)";
-	    $q .= " UNION (SELECT *,getNev(userId,userTipus) AS nev FROM jegyzet WHERE publikus=2 AND dt >= '%s' AND dt<= '%s' ORDER BY dt)";
-	    $v = array($userId,$userTipus,$tolDt,$igDt,$tolDt,$igDt);
-	}
-        $R = db_query($q, array('fv' => 'getJegyzet0', 'modul' => 'naplo', 'values' => $v, 'result'=>'indexed'), $lr);
-
-	return $R;
-    }
-
-    //
-    function getJegyzetAdat($jegyzetId) {
-
-	global $_OSZTALYA;
-
-	if (__DIAK===true && __USERDIAKID>0) {
-	    $userId = __USERDIAKID;
-	    $userTipus='diak';
-	} elseif (__DIAK===true && _SZULODIAKID>0) {
-	    $userId = __SZULODIAKID;
-	    $userTipus='szulo';
-	} elseif (__TANAR === true) {
-	    $userId = __USERTANARID;
-	    $userTipus='tanar';
-	} elseif (__NAPLOADMIN === true) { // ha nem tanár de naplóadmin (speciális eset :) )
-	    $userId = 0;
-	    $userTipus='admin';
-	} else {
-	    return false;
-	}
-
-
-	// jogosultság ellenőr
-        if (_POLICY!='public') {
-            if (__JEGYZETSZEREPTIPUS == 'diak') {
-                $JA['tankorok'] = getTankorByDiakId(__JEGYZETSZEREPID);
-                $JA['osztalyok'] = getDiakOsztalya(__JEGYZETSZEREPID,array('tanev'=>$tanev,'tolDt'=>$dt,'igDt'=>$dt));
-            } elseif (__JEGYZETSZEREPTIPUS == 'tanar') {
-                $JA['tankorok'] = getTankorByTanarId(__JEGYZETSZEREPID);
-                //if (is_array($_OSZTALYA) && count($_OSZTALYA)>0) $JA['osztalyok'] = getOsztalyok(null,array('osztalyIds'=>$_OSZTALYA));
-                $JA['munkakozossegek'] = getMunkakozossegByTanarId(__JEGYZETSZEREPID, array('idonly'=>false));
-            }
-            for ($i=0; $i0) $q .= " UNION (SELECT jegyzet.*,getNev(userId,userTipus) AS nev FROM jegyzet LEFT JOIN jegyzetOsztaly USING (jegyzetId) WHERE osztalyId IN (". implode(',',$JA['osztalyIdk']) .") AND publikus=1  AND jegyzetId=%u ORDER BY dt)";
-	    if (count($JA['tankorIdk'])>0) $q .= " UNION (SELECT jegyzet.*,getNev(userId,userTipus) AS nev FROM jegyzet LEFT JOIN jegyzetTankor USING (jegyzetId) WHERE tankorId IN (". implode(',',$JA['tankorIdk']) .") AND publikus=1  AND jegyzetId=%u  ORDER BY dt)";
-	    $q .= " UNION (SELECT *,getNev(userId,userTipus) AS nev FROM jegyzet WHERE publikus=2 AND jegyzetId=%u ORDER BY dt)";
-	    $v = array($userId,$userTipus,$jegyzetId,$jegyzetId,$jegyzetId,$jegyzetId);
-	}
-        $R = db_query($q, array('fv' => 'getJegyzet', 'modul' => 'naplo', 'values' => $v, 'result'=>'record'), $lr); // jegyzetId, tehát egy record
-
-	for($i=0;$i 'getJegyzet1', 'modul' => 'naplo', 'values' => $v, 'result'=>'idonly'), $lr);
-	}
-	for($i=0;$i 'getJegyzet2', 'modul' => 'naplo', 'values' => $v, 'result'=>'idonly'), $lr);
-	}
-	for($i=0;$i 'getJegyzet3', 'modul' => 'naplo', 'values' => $v, 'result'=>'idonly'), $lr);
-	}
-	return $R;
-    }
-
-    function setJegyzetAdat($ADAT) {
-
-	if (__DIAK===true && __USERDIAKID>0) {
-	    $userId = __USERDIAKID;
-	    $userTipus='diak';
-	    $allowedPublikus = array(0,1);
-	} elseif (__DIAK===true && _SZULODIAKID>0) {
-	    $userId = __SZULODIAKID;
-	    $userTipus='szulo';
-	    $allowedPublikus = array(0,1);
-	} elseif (__TANAR === true) {
-	    $userId = __USERTANARID;
-	    $userTipus='tanar';
-	    $allowedPublikus = array(0,1,2);
-	} else {
-	    return false;
-	}
-
-	if ($ADAT['jegyzetId']<=0) { // insert
-	    $q = "INSERT INTO jegyzet (jegyzetId) VALUES ('')";
-	    $jegyzetId = db_query($q, array('fv' => 'setJegyzetAdat', 'modul' => 'naplo', 'values' => $v, 'result'=>'insert'));
-	    $q = "UPDATE jegyzet SET userId=%u,userTipus='%s' WHERE jegyzetId=%u";
-	    $v = array($userId,$userTipus,$jegyzetId);
-	    db_query($q, array('fv' => 'setJegyzetAdat', 'modul' => 'naplo', 'values' => $v, 'result'=>'insert'));
-	} else {
-	    $jegyzetId = $ADAT['jegyzetId'];
-	}
-
-	$dt = readVariable($ADAT['dt'],'date');
-	$dt = getTanitasiNapVissza(0,$dt);
-	$publikus = readVariable($ADAT['publikus'],'id',0,$allowedPublikus);
-
-	$q = "UPDATE jegyzet SET jegyzetLeiras='%s',publikus=%u,dt='%s' WHERE userId=%u AND userTipus='%s' AND jegyzetId=%u";
-	$v = array(readVariable($ADAT['jegyzetLeiras'],'string'),$publikus,$dt,$userId,$userTipus,$jegyzetId);
-	db_query($q, array('fv' => 'getJegyzet', 'modul' => 'naplo', 'values' => $v, 'result'=>'record'));
-
-	$q = "DELETE FROM jegyzetTankor WHERE jegyzetId=%u";
-	$v = array($jegyzetId);
-	db_query($q, array('fv' => 'getJegyzet', 'modul' => 'naplo', 'values' => $v, 'result'=>'indexed'), $lr);
-
-	for ($i=0; $i 'setJegyzetAdat', 'modul' => 'naplo', 'values' => $v, 'result'=>'insert'));
-	}
-
-	$q = "DELETE FROM jegyzetOsztaly WHERE jegyzetId=%u";
-	$v = array($jegyzetId);
-	db_query($q, array('fv' => 'getJegyzet', 'modul' => 'naplo', 'values' => $v, 'result'=>'indexed'), $lr);
-
-	for ($i=0; $i 'setJegyzetAdat', 'modul' => 'naplo', 'values' => $v, 'result'=>'insert'));
-	}
-	$q = "DELETE FROM jegyzetMunkakozosseg WHERE jegyzetId=%u";
-	$v = array($jegyzetId);
-	db_query($q, array('fv' => 'getJegyzet4', 'modul' => 'naplo', 'values' => $v, 'result'=>'indexed'), $lr);
-	for ($i=0; $i 'setJegyzetAdat', 'modul' => 'naplo', 'values' => $v, 'result'=>'insert'));
-	}
-	return $jegyzetId;
-
-    }
-
-    function delJegyzet($jegyzetId) {
-	if (__DIAK===true && __USERDIAKID>0) {
-	    $userId = __USERDIAKID;
-	    $userTipus='diak';
-	} elseif (__DIAK===true && _SZULODIAKID>0) {
-	    $userId = __SZULODIAKID;
-	    $userTipus='szulo';
-	} elseif (__TANAR === true) {
-	    $userId = __USERTANARID;
-	    $userTipus='tanar';
-	} else {
-	    return false;
-	}
-
-	$q = "DELETE FROM jegyzet WHERE userId=%u AND userTipus='%s' AND jegyzetId=%u";
-	$v = array($userId,$userTipus,$jegyzetId);
-	db_query($q, array('fv' => 'jegyzetel', 'modul' => 'naplo', 'values' => $v, 'result'=>''));
-	return;
-    }
-
-?>
diff --git a/mayor-orig/www/include/modules/naplo/share/kepesites.php b/mayor-orig/www/include/modules/naplo/share/kepesites.php
deleted file mode 100644
index 4315e64b..00000000
--- a/mayor-orig/www/include/modules/naplo/share/kepesites.php
+++ /dev/null
@@ -1,103 +0,0 @@
-'getKepesitesek','modul'=>'naplo_intezmeny','result'=>$result,'keyfield'=>'kepesitesId'));
-
-    }
-
-    function getTanarKepesites($tanarId) {
-
-	$q = "SELECT * FROM tanarKepesites LEFT JOIN kepesites USING (kepesitesId) WHERE tanarId=%u";
-	return db_query($q, array('fv'=>'getTanarKepesites','modul'=>'naplo_intezmeny','result'=>'indexed','values'=>array($tanarId)));
-
-    }
-
-    function getTanarKepesitesIds($tanarIds) {
-
-	$q = "SELECT tanarId, kepesitesId FROM tanarKepesites";
-	if (is_array($tanarIds)) {
-	    $q .= " WHERE tanarId IN (".implode(',', array_fill(0, count($tanarIds), '%u')).")";
-	    $v = $tanarIds;
-	}
-	$r = db_query($q, array('fv'=>'getTanarKepesitesIds','modul'=>'naplo_intezmeny','result'=>'indexed','values'=>$v));
-
-	if (is_array($r)) {
-	    for ($i=0; $i'getKepesitesTargy','modul'=>'naplo_intezmeny','result'=>'indexed','values'=>array($kepesitesId)));
-
-    }
-
-    function getKepesitesTanar($kepesitesId) {
-
-	$q = "SELECT *, CONCAT_WS(' ',viseltNevElotag, viseltCsaladinev, viseltUtonev) AS tanarNev FROM tanarKepesites LEFT JOIN tanar USING (tanarId) 
-		WHERE kepesitesId=%u ORDER BY tanarNev, tanarId";
-	return db_query($q, array('fv'=>'getKepesitesTanar','modul'=>'naplo_intezmeny','result'=>'indexed','values'=>array($kepesitesId)));
-
-    }
-
-    /* --- set --- */
-
-    function tanarKepesitesHozzarendeles($tanarId, $kepesitesId) {
-
-	$q = "INSERT INTO tanarKepesites (tanarId, kepesitesId) VALUES (%u,%u)";
-	$v = array($tanarId, $kepesitesId);
-	return db_query($q, array('fv'=>'tanarKepesitesHozzarendeles','modul'=>'naplo_intezmeny','values'=>$v));
-
-    }
-
-    function kepesitesTargyHozzarendeles($kepesitesId, $targyId) {
-
-	$q = "INSERT INTO kepesitesTargy (kepesitesId, targyId) VALUES (%u,%u)";
-	$v = array($kepesitesId, $targyId);
-	return db_query($q, array('fv'=>'kepesitesTargyHozzarendeles','modul'=>'naplo_intezmeny','values'=>$v));
-
-    }
-
-    function kepesitesTargyTorles($kepesitesId, $targyId) {
-
-	$q = "DELETE FROM kepesitesTargy WHERE kepesitesId=%u AND targyId=%u";
-	$v = array($kepesitesId, $targyId);
-	return db_query($q, array('fv'=>'kepesitesTargyTorles','modul'=>'naplo_intezmeny','values'=>$v));
-
-    }
-
-    function tanarKepesitesTorles($tanarId, $kepesitesId) {
-
-	$q = "DELETE FROM tanarKepesites WHERE tanarId=%u AND kepesitesId=%u";
-	$v = array($tanarId, $kepesitesId);
-	return db_query($q, array('fv'=>'tanarKepesitesTorles','modul'=>'naplo_intezmeny','values'=>$v));
-
-    }
-
-    function ujKepesites($vegzettseg, $fokozat, $specializacio, $kepesitesNev) {
-	$q = "INSERT INTO kepesites (vegzettseg, fokozat, specializacio, kepesitesNev) VALUES ('%s','%s','%s','%s')";
-	$v = array($vegzettseg, $fokozat, $specializacio, $kepesitesNev);
-	return db_query($q, array('fv'=>'ujKepesites','modul'=>'naplo_intezmeny','result'=>'insert','values'=>$v));
-
-    }
-
-    function kepesitesModositas($kepesitesId, $vegzettseg, $fokozat, $specializacio, $kepesitesNev) {
-
-	$q = "UPDATE kepesites SET vegzettseg='%s',fokozat='%s',specializacio='%s',kepesitesNev='%s' WHERE kepesitesId=%u";
-	$v = array($vegzettseg, $fokozat, $specializacio, $kepesitesNev, $kepesitesId);
-	return db_query($q, array('debug'=>false,'fv'=>'kepesitesModositas','modul'=>'naplo_intezmeny','values'=>$v));
-
-    }
-
-?>
\ No newline at end of file
diff --git a/mayor-orig/www/include/modules/naplo/share/kepzes.php b/mayor-orig/www/include/modules/naplo/share/kepzes.php
deleted file mode 100644
index 84553ffb..00000000
--- a/mayor-orig/www/include/modules/naplo/share/kepzes.php
+++ /dev/null
@@ -1,173 +0,0 @@
- 'getKepzesek', 'modul' => 'naplo_intezmeny', 'result' => 'indexed'));
-
-    }
-
-    function getKepzesAdatById($kepzesId) {
-
-	$q = "SELECT * FROM kepzes WHERE kepzesId=%u";
-	$ret = db_query($q, array('fv' => 'getKepzesAdatById', 'modul' => 'naplo_intezmeny', 'result' => 'record', 'values' => array($kepzesId)));
-	if (!$ret || !is_array($ret) || count($ret) == 0) return false;
-
-	if ($ret['osztalyJellegId']!='') {
-	    $EVFOLYAMJELEK=getEvfolyamJelek(array('result'=>'idonly'));
-	    $ret['osztalyJelleg']=getOsztalyJellegAdat($ret['osztalyJellegId']);
-	    $ret['osztalyEvfolyamJelek'] = explode(',',$ret['osztalyJelleg']['evfolyamJelek']);
-	}
-
-	$q = "SELECT osztalyId FROM kepzesOsztaly WHERE kepzesId=%u";
-	$ret['osztalyIds'] = db_query($q, array('fv' => 'getKepzesAdatById/Osztályok', 'modul' => 'naplo_intezmeny', 'result' => 'idonly', 'values' => array($kepzesId)));
-	return $ret;
-
-    }
-
-    function getKepzesByOsztalyJelleg($osztalyJellegId) {
-
-	$q = "select * from kepzes where osztalyJellegId=%u order by kepzesNev";
-	return db_query($q, array('fv'=>'getKepzesByOsztalyJelleg','modul'=>'naplo_intezmeny','result'=>'indexed','values'=>array($osztalyJellegId)));
-
-    }
-
-    function getKepzesByOsztalyId($osztalyId, $SET = array('result' => 'indexed', 'arraymap' => null)) {
-
-	$result = readVariable($SET['result'], 'enum', 'indexed', array('indexed','multiassoc'));
-	if (!is_array($osztalyId)) $osztalyId = array($osztalyId);
-
-	$q = "SELECT * FROM kepzesOsztaly LEFT JOIN kepzes USING (kepzesId) WHERE osztalyId IN (".implode(',', array_fill(0, count($osztalyId), '%u')).")";
-	$ret = db_query($q, array(
-	    'fv' => 'getKepzesByOsztalyId', 'modul' => 'naplo_intezmeny', 'values' => $osztalyId, 'result' => $result, 'keyfield' => 'osztalyId'
-	));
-
-	if (is_array($SET['arraymap'])) return reindex($ret, $SET['arraymap']);
-	else return $ret;
-
-    }
-
-    /* NEW */
-    function getOsztalyLehetsegesKepzesei($osztalyId, $SET=array()) {
-	return getKepzesByOsztaly($osztalyId,$SET);
-    }
-
-    /* NEW */
-    function getOsztalyKepzesei($osztalyId,$SET=array()) {
-	$DIAKIDK = getDiakokByOsztalyIds($osztalyId);
-    }
-
-    function getKepzesByDiakId($diakId, $SET = array('result' => 'assoc', 'dt' => null, 'arraymap' => null)) {
-    /**
-     * Ha nincs dátum megadva, akkor az összes, amúgy az adott dátumkor érvényes képzéseket adja vissza a függvény!
-    **/
-
-	if (!is_array($diakId))
-	    if ($diakId != '') $diakId = array($diakId);
-	    else $diakId = array();
-	if (count($diakId) == 0) return false;
-	if ($SET['result'] == 'csakid') $SET['result'] = 'idonly'; // az egységesítés nevében
-
-	if (isset($SET['dt']) and $SET['dt'] != '') {
-	    $WHERE_DT = " AND tolDt<='%s' AND (igDt IS NULL OR '%s'<=igDt)";
-	    $v = mayor_array_join($diakId, array($SET['dt'], $SET['dt']));
-	} else {
-	    $WHERE_DT = "";
-	    $v = $diakId;
-	}
-	if ($SET['result'] == 'idonly') {
-	    $q = "SELECT DISTINCT kepzesId FROM kepzesDiak LEFT JOIN kepzes USING (kepzesId) 
-		    WHERE diakId IN (".implode(',', array_fill(0, count($diakId), '%u')).")".$WHERE_DT;
-	    $ret = db_query($q, array('fv' => 'getKepzesByDiakId', 'modul' => 'naplo_intezmeny', 'result' => 'idonly', 'values' => $v));
-	} else {
-	    $q = "SELECT * FROM kepzesDiak LEFT JOIN kepzes USING (kepzesId) 
-		    WHERE diakId IN (".implode(',', array_fill(0, count($diakId), '%u')).")".$WHERE_DT;
-	    if ($SET['arraymap'] && count($SET['arraymap'])>0) { // ha arraymap van, nem figyelünk a resultra
-		$r = db_query($q, array('fv' => 'getKepzesByDiakId', 'modul' => 'naplo_intezmeny', 'result' => 'indexed', 'values' => $v));
-		$ret = reindex($r,$SET['arraymap']);
-	    } elseif ($SET['result'] == 'assoc' || $SET['result'] == 'multiassoc') {
-		$ret = db_query($q, array(
-		    'fv' => 'getKepzesByDiakId', 'modul' => 'naplo_intezmeny', 'result' => 'multiassoc', 'keyfield' => 'diakId', 'values' => $v
-		));
-	    } else {
-		$ret = db_query($q, array('fv' => 'getKepzesByDiakId', 'modul' => 'naplo_intezmeny', 'result' => 'indexed', 'values' => $v));
-	    }
-	}
-	if (!$ret || !is_array($ret)) return false; //ez miért jó?
-	return $ret;
-
-    }
-
-//    function getKepzesTargyByDiakId() --> targyId,targyNev
-
-
-    function getTargyAdatFromKepzesOraterv($kepzesId, $SET = array('tipus'=>null, 'targyId'=>null, 'evfolyamJel'=>null, 'szemeszter'=>null, 'arraymap'=>null)) {
-	/*
-	    Ha van megadva típus és az nem 'mintatantervi', akkor azt (is) figyelembe veszi, DE az adatszerkezetbe nem kerül bele a tipus!
-	*/
-	if ($kepzesId=='') return false;
-	if (!is_array($SET['arraymap'])) $SET['arraymap'] = array('targyId','evfolyamJel','szemeszter');
-	$W = ''; $v = array($kepzesId);
-	if (isset($SET['tipus']) && $SET['tipus'] != 'mintatantervi') { $W .= " AND tipus='%s'"; $v[] = $tipus = $SET['tipus']; }
-	else if (isset($SET['targyId'])) { $W .= " AND targyId=%u"; $v[] = $targyId = $SET['targyId']; }
-	if (isset($SET['evfolyamJel'])) { $W .= " AND evfolyamJel='%s'"; $v[] = $evfolyamJel = $SET['evfolyamJel']; }
-	if (isset($SET['szemeszter'])) { $W .= " AND szemeszter=%u"; $v[] = $szemeszter = $SET['szemeszter']; }
-
-        $q = "SELECT * FROM kepzesOraterv WHERE kepzesId=%u".$W." ORDER BY tipus, targyId, "._SQL_EVFOLYAMJEL_SORREND.", szemeszter";
-        $r = db_query($q,  array('modul'=>'naplo_intezmeny','fv'=>'getTargyAdatFromKepzesOraterv', 'result'=>'indexed', 'values'=> $v));
-	$RE = reindex($r,$SET['arraymap']);
-        return $RE;
-    }
-
-
-    function getKepzesOraterv($kepzesId, $SET = array('arraymap'=>null, 'evfolyamJel' => null)) {
-	if ($kepzesId=='') return false;
-	if (!is_array($SET['arraymap'])) $SET['arraymap'] = array('tipus','targyId','evfolyamJel','szemeszter');
-	
-	if (isset($SET['evfolyamJel'])) {
-	    $q = "SELECT * FROM kepzesOraterv WHERE kepzesId=%u AND evfolyamJel='%s'";
-	    $v = array($kepzesId, $SET['evfolyamJel']);
-	} else {
-	    $q = "SELECT * FROM kepzesOraterv WHERE kepzesId=%u";
-	    $v = array($kepzesId);
-	}
-        $r = db_query($q,  array('modul'=>'naplo_intezmeny','fv'=>'getKepzesOraterv', 'result'=>'indexed','values'=>$v));
-
-	$RE = reindex($r, $SET['arraymap']);
-        return $RE;
-    }
-
-//    function getKepzesTargyByDiakId() --> targyId,targyNev
-
-    function getOraszamByKepzes($kepzesId, $SET = array('arraymap'=>null, 'evfolyamJel'=>'', 'szemeszter'=>0)) { // --TODO check evfolyam -> evfolyamJel
-	if ($kepzesId=='') return false;
-	//if (!is_array($SET['arraymap']) || count($SET['arraymap'])==1) $SET['arraymap'] = array();
-
-        $q = "SELECT tipus,sum(hetiOraszam) AS sum FROM kepzesOraterv WHERE kepzesId=%u AND evfolyamJel='%s' AND szemeszter=%u GROUP BY tipus";
-	$v = array($kepzesId,$SET['evfolyamJel'],$SET['szemeszter']);
-        $r = db_query($q,  array('modul'=>'naplo_intezmeny','fv'=>'getOraszamByKepzes', 'result'=>'assoc','keyfield'=>'tipus', 'values'=>$v));
-        return $r;
-    }
-
-    function setOsztalyKepzesei($osztalyId, $kepzesIds) {
-	if (is_array($kepzesIds) && count($kepzesIds)>0) {
-	    $q = "INSERT INTO kepzesOsztaly VALUES ".implode(',', array_fill(0, count($kepzesIds), '(%u,%u)'));
-	    foreach ($kepzesIds as $kepzesId) { 
-		$v[] = $kepzesId; 
-		$v[] = $osztalyId; 
-	    }
-    	    $r = db_query($q,  array('modul'=>'naplo_intezmeny','fv'=>'setOsztalyKepzesei', 'result'=>'insert', 'values'=>$v));
-	    return $r;
-	}
-    }
-
-    function getKepzesOratervAdatByBontasId($bontasId) {
-
-	$q = "select * from kepzesOraterv left join ".__TANEVDBNEV.".kepzesTargyBontas using (kepzesOratervId) where bontasId=%u";
-	return db_query($q, array('fv'=>'getKepzesOratervAdatByBontasId','modul'=>'naplo_intezmeny','result'=>'record','values'=>array($bontasId)));
-
-    }
-?>
diff --git a/mayor-orig/www/include/modules/naplo/share/kerdoiv.php b/mayor-orig/www/include/modules/naplo/share/kerdoiv.php
deleted file mode 100644
index b4d26b70..00000000
--- a/mayor-orig/www/include/modules/naplo/share/kerdoiv.php
+++ /dev/null
@@ -1,127 +0,0 @@
- $cimzettIds) {
-            if (is_array($cimzettIds) && count($cimzettIds) > 0) {
-                $cimzettFeltetel[] = "(cimzettTipus='%s' AND cimzettId IN (0,".implode(',', array_fill(0, count($cimzettIds), '%u'))."))";
-		$v = mayor_array_join($v, array($cimzettTipus), $cimzettIds);
-	    }
-        }
-
-        $q = "SELECT DISTINCT kerdoivId,cim,tolDt,igDt FROM kerdoiv LEFT JOIN kerdoivCimzett USING (kerdoivId)
-                WHERE tolDt<=NOW() AND NOW()<=igDt";
-        if (count($cimzettFeltetel) > 0) $q .= " AND (".implode(" OR ", $cimzettFeltetel).")";
-        return db_query($q, array('fv' => 'getKerdoiv','modul' => 'naplo', 'result' => 'indexed', 'values' => $v));
-    }
-
-    function getOsszesKerdoiv($tanev = __TANEV) {
-
-	$tanevDb = tanevDbNev(__INTEZMENY, $tanev);
-        $q = "SELECT DISTINCT kerdoivId,cim,tolDt,igDt FROM %s.kerdoiv LEFT JOIN `%s`.kerdoivCimzett USING (kerdoivId)";
-        return db_query($q, array('fv' => 'getKerdoiv','modul' => 'naplo', 'result' => 'indexed', 'values' => array($tanevDb,$tanevDb)));
-
-    }
-
-    function getKerdoivAdat($kerdoivId) {
-
-	$v = array($kerdoivId);
-        $q = "SELECT * FROM kerdoiv WHERE kerdoivId=%u";
-        $ret = db_query($q, array('fv' => 'getKerdoivAdat', 'modul' => 'naplo', 'result' => 'record', 'values' => $v));
-
-        $q = "SELECT * FROM kerdoivKerdes WHERE kerdoivId=%u ORDER BY kerdesId";
-        $ret['kerdes'] = db_query($q, array('fv' => 'getKerdoivAdat/kerdes', 'modul' => 'naplo', 'result' => 'indexed', 'values' => $v));
-
-        for ($i = 0; $i < count($ret['kerdes']); $i++) {
-            $q = "SELECT * FROM kerdoivValasz WHERE kerdesId=%u ORDER BY pont, valaszId";
-            $ret['kerdes'][$i]['valasz'] = db_query($q, array('fv' => 'getKerdoivAdat/valasz', 'modul' => 'naplo', 'result' => 'indexed', 'values' => array($ret['kerdes'][$i]['kerdesId'])));
-        }
-
-        $q = "SELECT * FROM kerdoivCimzett WHERE kerdoivId=%u";
-        $tmp = db_query($q, array('fv' => 'getKerdoivAdat/cimzett', 'modul' => 'naplo', 'result' => 'multiassoc', 'keyfield' => 'cimzettTipus', 'values' => $v));
-        if (is_array($tmp))
-            foreach ($tmp as $cimzettTipus => $ctAdat) {
-                $ret['cimzettTipusok'][] = $cimzettTipus;
-                for ($i = 0; $i < count($ctAdat); $i++)
-                    $ret['cimzett'][$cimzettTipus][] = $ctAdat[$i]['cimzettId'];
-            }
-        /* endif */
-
-        return $ret;
-
-    }
-
-    function getMegvalaszoltKerdes($kerdoivId, $feladoId, $feladoTipus, $cimzettId, $cimzettTipus) {
-
-        $q = "SELECT kerdesId FROM kerdoivMegvalaszoltKerdes
-                WHERE feladoId=%u AND feladoTipus='%s' AND cimzettId=%u AND cimzettTipus='%s'
-                ORDER BY kerdesId";
-	$v = array($feladoId, $feladoTipus, $cimzettId, $cimzettTipus);
-        return db_query($q, array('fv' => 'getMegvalaszoltKerdes', 'modul' => 'naplo', 'result' => 'idonly', 'values' => $v));
-
-    }
-
-    function getKerdoivStat($kerdoivId, $tanev = __TANEV) {
-
-        global $_TANEV;
-
-	if ($tanev == __TANEV) $TA = $_TANEV;
-	else $TA = getTanevAdat($tanev);
-
-	$tanevDb = tanevDbNev(__INTEZMENY, $tanev);
-
-        // Kérdőív címe, határidői
-        $q = "SELECT * FROM `%s`.kerdoiv WHERE kerdoivId=%u";
-        $ret = db_query($q, array('fv' => 'getKerdoivStat', 'modul' => 'naplo', 'result' => 'record', 'values' => array($tanevDb, $kerdoivId)));
-        // A kérdőív kérdései
-        $q = "SELECT kerdesId,trim(trailing '\c' from kerdes) AS kerdes FROM `%s`.kerdoivKerdes WHERE kerdoivId=%u ORDER BY kerdesId";
-        $ret['kerdes'] = db_query($q, array('fv' => 'getKerdoivStat/kerdes', 'modul' => 'naplo', 'result' => 'assoc', 'keyfield' => 'kerdesId', 'values' => array($tanevDb, $kerdoivId)));
-
-        // A kérdőív válaszai
-        $ret['valaszIds'] = array();
-        foreach ($ret['kerdes'] as $kerdesId => $kAdat) {
-            $q = "SELECT valaszId,valasz FROM `%s`.kerdoivValasz WHERE kerdesId=%u ORDER BY valaszId";
-            $ret['kerdes'][$kerdesId]['valasz'] = db_query($q, array('fv' => 'getKerdoivStat/valasz', 'modul' => 'naplo', 'result' => 'keyvaluepair', 'values' => array($tanevDb, $kerdesId)));
-            foreach ($ret['kerdes'][$kerdesId]['valasz'] as $valaszId => $valasz) $ret['valaszIds'][] = $valaszId;
-        }
-
-        // A kérdőív címzettjei
-        $q = "SELECT cimzettTipus,cimzettId FROM `%s`.kerdoivCimzett WHERE kerdoivId=%u";
-        $ret['cimzett']  = db_query($q, array('fv' => 'getKerdoivStat/cimzett', 'modul' => 'naplo', 'result' => 'multiassoc', 'keyfield' => 'cimzettTipus', 'values' => array($tanevDb, $kerdoivId)));
-        // A tankör típusú címzettek tanára(i)
-        $ret['tanarNev'] = array();
-	foreach (array('tankor','tankorSzulo') as $key => $cimzettTipus) {
-    	    if (is_array($ret['cimzett'][$cimzettTipus]) && count($ret['cimzett'][$cimzettTipus]) > 0) {
-        	for ($i = 0; $i < count($ret['cimzett'][$cimzettTipus]); $i++) {
-            	    $tankorId = $ret['cimzett'][$cimzettTipus][$i]['cimzettId'];
-            	    $tanarIds = getTankorTanaraiByInterval(
-                	$tankorId, array('tanev' => $tanev, 'tolDt' => $ret['kerdes']['tolDt'], 'igDt' => $ret['kerdes']['igDt'], 'result' => 'csakId')
-            	    );
-            	    for ($j = 0; $j < count($tanarIds); $j++) {
-			if (!is_array($ret['tanarTankorei'][ $tanarIds[$j] ]) || !in_array($tankorId, $ret['tanarTankorei'][ $tanarIds[$j] ])) 
-			    $ret['tanarTankorei'][ $tanarIds[$j] ][] = $tankorId;
-                	if (!isset($ret['tanarNev'][ $tanarIds[$j] ])) $ret['tanarNev'][ $tanarIds[$j] ] = getTanarNevById($tanarIds[$j]);
-            	    }
-		}
-            }
-        }
-
-        $q = "SELECT * FROM `%s`.kerdoivValaszSzam WHERE valaszId IN (".implode(',', $ret['valaszIds']).") ORDER BY cimzettTipus,cimzettId,valaszId";
-        $tmp = db_query($q, array('fv' => 'getKerdoivStat/szavazat', 'modul' => 'naplo', 'result' => 'indexed', 'values' => array($tanevDb)));
-        for ($i = 0; $i < count($tmp); $i++)
-            $ret['szavazat'][ $tmp[$i]['cimzettTipus'] ][ $tmp[$i]['cimzettId'] ][ $tmp[$i]['valaszId'] ] = $tmp[$i]['szavazat'];
-
-        $tmp = getTankorok(array("tanev=".$tanev));
-        for ($i = 0; $i < count($tmp); $i++) {
-            $ret['tankorAdat'][ $tmp[$i]['tankorId'] ] = $tmp[$i];
-            $ret['tankorAdat'][ $tmp[$i]['tankorId'] ]['letszam'] = getTankorLetszam($tmp[$i]['tankorId'], array('refDt' => $TA['zarasDt']));
-        }
-        return $ret;
-
-    }
-
-
-
-?>
diff --git a/mayor-orig/www/include/modules/naplo/share/kerelem.php b/mayor-orig/www/include/modules/naplo/share/kerelem.php
deleted file mode 100644
index 5a985ad5..00000000
--- a/mayor-orig/www/include/modules/naplo/share/kerelem.php
+++ /dev/null
@@ -1,136 +0,0 @@
-'naplo_base','result'=>'indexed'));
-	for($i=0; $i0)
-	    $RET['avgTime'] = number_format(array_sum($SECS) / (24*3600*count($SECS)),2);
-	else
-	    $RET['avgTime'] = '-';
-	return $RET;
-    }     
-
-    function getKerelem($kerelemId) {
-	$q = "SELECT * FROM kerelem WHERE kerelemId=%u";
-	$RESULT = db_query($q, array('fv' => 'getKerelmek', 'modul' => 'naplo_base', 'result' => 'indexed', 'values'=>array($kerelemId)));
-	return $RESULT;
-    }
-    function getKerelemValaszok($kerelemId) {
-	$q = "SELECT * FROM kerelemValasz WHERE kerelemId=%u ORDER BY valaszDt";
-	$RESULT = db_query($q, array('fv' => 'getKerelmek', 'modul' => 'naplo_base', 'result' => 'indexed', 'values'=>array($kerelemId)));
-	return $RESULT;
-    }
-
-    function getValasz($valaszId) {
-	$q = "SELECT * FROM kerelemValasz WHERE valaszId=%u";
-	$RESULT = db_query($q, array('fv' => 'getKerelemValasz', 'modul' => 'naplo_base', 'result' => 'indexed', 'values'=>array($valaszId)));
-	return $RESULT;
-    }
-
-    function getKerelmek($telephelyId='', $kerelemId='', $lezarasMaxDt='') {
-	if (isset($lezarasMaxDt) && $lezarasMaxDt!='') {
-	    $W_lezaras = '(lezarasDt IS NULL OR lezarasDt>"'.$lezarasMaxDt.' 23:59:59")';
-	} else {
-	    $W_lezaras = 'lezarasDt IS NULL';
-	}
-	if (isset($telephelyId) && $telephelyId!='') {
-	    $W = ' AND (telephelyId=%u OR telephelyId IS NULL)';
-	    $v[] = $telephelyId;
-	} elseif (isset($kerelemId) && $kerelemId!='') {
-	    $W = ' AND kerelemId=%u';
-	    $v[] = $kerelemId;
-	} else { 
-	    $W='';
-	}
-	$q = "SELECT kerelem.*, IF (valaszDt IS NOT NULL,max(valaszDt),rogzitesDt) AS mx FROM kerelem LEFT JOIN kerelemValasz USING (kerelemId) WHERE $W_lezaras $W GROUP BY kerelemId ORDER BY mx DESC";
-
-	$RESULT['kerelmek'] = db_query($q, array('debug'=>false,'fv' => 'getKerelmek', 'modul' => 'naplo_base', 'result' => 'indexed', 'values'=>$v));
-	$_kerelemIdk = array();
-	for ($i=0; $i0) $_kerelemIdk[] = $RESULT['kerelmek'][$i]['kerelemId'];
-	}
-	if (is_array($_kerelemIdk) && count($_kerelemIdk)>0) {
-	    $q = 'SELECT * FROM kerelemValasz WHERE kerelemId IN ('.implode(',',$_kerelemIdk).') ORDER BY valaszDt';
-	    $RESULT['valaszok'] = db_query($q, array('fv' => 'getKerelmek', 'modul' => 'naplo_base', 'keyfield'=>'kerelemId','result' => 'multiassoc'));
-	}
-	return $RESULT;
-    }
-
-    function getSajatKerelmek($telephelyId='') {
-	$W = (isset($telephelyId) && $telephelyId!='') ? ' AND (telephelyId=%u OR telephelyId IS NULL)' : '';
-	$q = "SELECT * FROM kerelem WHERE userAccount='"._USERACCOUNT."' AND (lezarasDt IS NULL OR (lezarasDt > (curdate() - interval 1 day))) $W ORDER BY rogzitesDt DESC";
-	$RESULT['kerelmek'] = db_query($q, array('fv' => 'getSajatKerelmek', 'modul' => 'naplo_base', 'result' => 'indexed', 'values'=>array($telephelyId)));
-	for ($i=0; $i0) {
-	    $q = 'SELECT * FROM kerelemValasz WHERE kerelemId IN ('.implode(',',$_kerelemIdk).') ORDER BY valaszDt';
-	    $RESULT['valaszok'] = db_query($q, array('fv' => 'getKerelmek', 'modul' => 'naplo_base', 'keyfield'=>'kerelemId','result' => 'multiassoc'));
-	}
-
-	return $RESULT;
-    }
-
-    function hibaAdminRogzites($Adat) {
-        $kerelemId = $Adat['kerelemId'];
-        $valasz = $Adat['valasz'];
-        $kategoria = $Adat['kategoria'];
-	$userAccount = $Adat['jovahagyasAccount'];
-	$telephelyId = ($Adat['kerelemTelephelyId']!='') ? $Adat['kerelemTelephelyId'] : 'NULL';
-	$modosithat = false; // egyelőre nem használjuk :)
-	// jogosultság ellenőrzés
-	if (__VEZETOSEG===true || __NAPLOADMIN===true) {
-	    $modosithat = true;    
-	} else {
-	    $q = "SELECT kerelemId FROM kerelem WHERE userAccount ='%s' AND kerelemId=%u";
-	    $v = array(_USERACCOUNT,$kerelemId);
-	    $checkKerelemId = db_query($q, array('fv' => 'hangya', 'result'=>'value', 'modul' => 'naplo_base', 'values' => $v));
-	    if ($checkKerelemId!=$kerelemId) return false;
-	    else $modosithat = true;
-	}
-	if ($valasz!='') {
-	    $q = "INSERT INTO kerelemValasz (valasz,kerelemId,userAccount) VALUES ('%s',%u,'"._USERACCOUNT."')";
-	    $v = array($valasz,$kerelemId);
-	    db_query($q, array('fv' => 'hangya', 'modul' => 'naplo_base', 'values' => $v));
-	}
-	$q = "UPDATE kerelem SET kategoria='%s',telephelyId='%s' WHERE kerelemId=%u";
-	$v = array($kategoria,$telephelyId,$kerelemId);
-        db_query($q, array('fv' => 'hibaAdminRogzites', 'modul' => 'naplo_base', 'values' => $v));
-
-	if (__VEZETOSEG===true || __NAPLOADMIN===true) {
-          if (isset($Adat['jovahagy'])) {
-            $q = "UPDATE kerelem SET jovahagyasAccount='%s',jovahagyasDt=NOW() WHERE kerelemId=%u";
-	    $v = array($userAccount, $kerelemId);
-	    $extraTxt = '[státusz módosítás: Jóváhagyva]';
-          } elseif ($Adat['nemHagyJova']) {
-	    //$q = "SELECT jovahagyasDt FROM kerelem WHERE kerelemId=%u";
-	    //$jdt = db_query($q, array('fv' => 'hibaAdminRogzites', 'modul' => 'naplo_base', 'result' => 'value', 'values' => array($kerelemId)));
-            $q = "UPDATE kerelem SET jovahagyasDt=NULL WHERE kerelemId=%u";
-	    $v = array($kerelemId);
-	    $extraTxt = '[státusz módosítás: Nincs jóváhagyva]';
-          } elseif (isset($Adat['lezar'])) {
-            $q = "UPDATE kerelem SET lezarasDt=NOW() WHERE kerelemId=%u";
-	    $v = array($kerelemId);
-	    $extraTxt = '[státusz módosítás: Lezárva]';
-          } else {
-            //$q = "UPDATE kerelem SET valasz='%s' WHERE kerelemId=%u";
-	    //$v = array($valasz, $kerelemId);
-          }
-          $R = db_query($q, array('fv' => 'hibaAdminRogzites', 'modul' => 'naplo_base', 'values' => $v));
-	  if ($extraTxt!='') {
-	    $q = "INSERT INTO kerelemValasz (valasz,kerelemId,userAccount) VALUES ('%s',%u,'"._USERACCOUNT."')";
-	    $v = array($extraTxt,$kerelemId);
-	    db_query($q, array('fv' => 'hangya', 'modul' => 'naplo_base', 'values' => $v));
-	  }
-	}
-	return $R;
-    }
-
-?>
diff --git a/mayor-orig/www/include/modules/naplo/share/kereso.php b/mayor-orig/www/include/modules/naplo/share/kereso.php
deleted file mode 100644
index b2bf2cf6..00000000
--- a/mayor-orig/www/include/modules/naplo/share/kereso.php
+++ /dev/null
@@ -1,56 +0,0 @@
-=NOW() OR osztalyDiak.kiDt IS NULL))
-	      LEFT JOIN " . __TANEVDBNEV . ".osztalyNaplo USING (osztalyId) 
-	     HAVING (diakNev LIKE '%s' OR oId LIKE '%s') ORDER BY diakNev LIMIT 100";
-        $r = db_query($q, array('modul'=>'naplo_intezmeny','result'=>'indexed','values'=>array('%'.$pattern.'%','%'.$pattern.'%')));
-        return $r;
-    }
-    function getTanarokByPattern($pattern) {
-        if ($pattern=='') return false;
-        $q = "SELECT tanarId, TRIM(CONCAT_WS(' ',viseltNevElotag, ViseltCsaladiNev, viseltUtoNev)) AS tanarNev FROM `tanar` WHERE (kiDt IS NULL OR kiDt >=NOW()) HAVING tanarNev LIKE '%s' ORDER BY tanarNev LIMIT 100";
-        $r = db_query($q, array('modul'=>'naplo_intezmeny','result'=>'indexed','values'=>array('%'.$pattern.'%')));
-        return $r;
-    }
-    function getTankorokByPattern($pattern) {
-        if ($pattern=='') return false;
-        $q = "SELECT tankorId, tankorNev AS tankorNev FROM `tankor`HAVING tankorNev LIKE '%s' ORDER BY tankorNev LIMIT 100";
-        $r = db_query($q, array('modul'=>'naplo_intezmeny','result'=>'indexed','values'=>array('%'.$pattern.'%')));
-        return $r;
-    }
-    function getSzulokByPattern($pattern, $SET=array('diakokkal'=>false)) {
-        if ($pattern=='') return false;
-	if ($SET['diakokkal']!==true) {
-		$p= "TRIM(CONCAT_WS(' ',nevElotag, csaladinev, utonev)) ";
-    		$q = "SELECT szuloId, $p AS szuloNev FROM `szulo` HAVING szuloNev LIKE '%s' ORDER BY szuloNev LIMIT 100";
-    		$r = db_query($q, array('modul'=>'naplo_intezmeny','result'=>'indexed','values'=>array('%'.$pattern.'%')));
-
-	} else {
-
-		if (defined('__UZENO_SZULO_CSAK_ACCOUNTTAL') && __UZENO_SZULO_CSAK_ACCOUNTTAL === true)
-		    $W = " AND userAccount!='' ";
-		else 
-		    $W = '';
-
-		$sr = getDiakokByPattern($pattern);
-		for ($i=0; $i0) {
-		    $q1 = "SELECT szuloId, $p AS szuloNev FROM `szulo`$subquery WHERE diakId IN (".implode(',',$DIAKIDS).")  $W  LIMIT 100";
-		    $q = "$q1 UNION ($q2)";
-		} else $q = "($q2)";
-		$r = db_query("$q ORDER BY szuloNev", array('modul'=>'naplo_intezmeny','result'=>'indexed','values'=>array('%'.$pattern.'%')));
-
-	}
-        return $r;
-    }
-
-?>
diff --git a/mayor-orig/www/include/modules/naplo/share/koszi.php b/mayor-orig/www/include/modules/naplo/share/koszi.php
deleted file mode 100644
index 3ce3ba83..00000000
--- a/mayor-orig/www/include/modules/naplo/share/koszi.php
+++ /dev/null
@@ -1,141 +0,0 @@
-'naplo_intezmeny','result'=>'indexed'));
-
-	return $r;
-
-    }
-
-
-    function getKosziPont($kosziEsemenyId) {
-
-	if (!is_numeric($kosziEsemenyId)) return false;
-
-	$q = "SELECT * FROM kosziPont WHERE kosziEsemenyId = %u";
-	$v = array($kosziEsemenyId);
-	$r = db_query($q, array('modul'=>'naplo_intezmeny','result'=>'indexed', 'values'=>$v));
-
-	return $r;
-
-    }
-
-
-    /* TANEV */
-
-    function getKoszi($kosziEsemenyId) {
-
-	if (!is_numeric($kosziEsemenyId)) return false;
-
-	$q = "SELECT * FROM koszi WHERE kosziEsemenyId = %u ORDER BY dt,tanev,felev";
-	$v = array($kosziEsemenyId);
-	$r = db_query($q, array('modul'=>'naplo','result'=>'indexed', 'values'=>$v));
-
-	return $r;
-	
-    }
-
-    function getKosziLista() {
-
-	$q = "SELECT * FROM koszi LEFT JOIN ".__INTEZMENYDBNEV.".kosziEsemeny USING (kosziEsemenyId) 
-		WHERE tolDt IS NULL OR (tolDt<=NOW() AND (igDt is NULL OR igDt>=NOW()))
-		ORDER BY dt,tanev,felev";
-	$r = db_query($q, array('modul'=>'naplo','result'=>'indexed'));
-
-	return $r;
-	
-    }
-
-
-    function getKosziEsemenyIdByKosziId($kosziId) {
-
-	$q = "SELECT kosziEsemenyId FROM koszi WHERE kosziId = %u";
-	$v = array($kosziId);
-	$r = db_query($q, array('modul'=>'naplo','result'=>'value', 'values'=>$v));
-
-	return $r;
-    }
-
-
-    function getKosziDiakIgazolandoLista($tipus='',$SET = array('tanarId'=>null, 'diakId'=>null)) {
-
-	if (__KOSZIADMIN ===true) {
-	    $q = "SELECT *, IF (jovahagyasDt!='0000-00-00',1,0) AS jovahagyva FROM kosziDiak
-		LEFT JOIN kosziIgazoloTanar USING (kosziId)
-		LEFT JOIN kosziIgazoloOf USING (kosziId)
-		LEFT JOIN koszi USING (kosziId) 
-		LEFT JOIN ".__INTEZMENYDBNEV.".kosziEsemeny USING (kosziEsemenyId)
-		";
-//	    $v = array($SET['diakId']);
-	    $ret = db_query($q, array('modul'=>'naplo','result'=>'indexed'));
-	} elseif (is_numeric($SET['diakId'])) { // ide jön még a dök csoport!
-	    $q = "SELECT *, IF (jovahagyasDt!='0000-00-00',1,0) AS jovahagyva FROM kosziDiak
-		LEFT JOIN kosziIgazoloDiak USING (kosziId)
-		LEFT JOIN koszi USING (kosziId) 
-		LEFT JOIN ".__INTEZMENYDBNEV.".kosziEsemeny USING (kosziEsemenyId)
-		WHERE jovahagyasDt='0000-00-00 00:00:00' AND kosziIgazoloDiak.diakId=%u
-		ORDER BY rogzitesDt";
-	    $v = array($SET['diakId']);
-	    $ret = db_query($q, array('modul'=>'naplo','result'=>'indexed', 'values'=>$v));
-	} elseif (is_numeric($SET['tanarId'])) {
-	    $q = "SELECT *, IF (jovahagyasDt!='0000-00-00',1,0) AS jovahagyva FROM kosziDiak
-		LEFT JOIN kosziIgazoloTanar USING (kosziId)
-		LEFT JOIN kosziIgazoloOf USING (kosziId)
-		LEFT JOIN koszi USING (kosziId) 
-		LEFT JOIN ".__INTEZMENYDBNEV.".kosziEsemeny USING (kosziEsemenyId)
-		WHERE jovahagyasDt='0000-00-00 00:00:00' AND 
-		(
-		  (
-		    (kosziIgazoloTanar.tanarId=%u AND kosziIgazoloOf.tanarId IS NULL) Or
-		    (kosziIgazoloTanar.tanarId IS NULL AND kosziIgazoloOf.tanarId=%u)
-		  ) OR (
-		    koszi.igazolo LIKE '%%osztályfőnök%%' AND
-		    diakId IN (
-			SELECT diakId FROM ".__INTEZMENYDBNEV.".osztalyTanar
-			LEFT JOIN ".__INTEZMENYDBNEV.".osztalyDiak USING (osztalyId)
-			WHERE tanarId=%u AND osztalyTanar.beDt<=NOW() AND (osztalyTanar.kiDt IS NULL OR osztalyTanar.kiDt>=NOW())
-		    )
-		  ) OR (
-		    koszi.igazolo LIKE  '%%tanár%%' AND
-		    diakId IN (
-			SELECT diakId FROM ".__INTEZMENYDBNEV.".tankorTanar
-			LEFT JOIN ".__INTEZMENYDBNEV.".tankorDiak USING (tankorId)
-			LEFT JOIN ".__INTEZMENYDBNEV.".tankor USING (tankorId)
-			WHERE tanarId=%u AND ".__INTEZMENYDBNEV.".tankor.targyId = koszi.targyId
-		    )
-		  )
-		)    
-		ORDER BY rogzitesDt";
-
-	    $v = array($SET['tanarId'],$SET['tanarId'],$SET['tanarId'],$SET['tanarId']);
-	    $ret = db_query($q, array('modul'=>'naplo','result'=>'indexed', 'values'=>$v));
-
-	} else {
-	    $ret = false;
-	}
-	return $ret;
-    }
-
-
-    /* DIAK */
-
-    function getKosziDiakLista($diakId) {
-
-	if ($diakId=='') return false;
-
-	$q = "SELECT *, IF (jovahagyasDt!='0000-00-00',1,0) AS jovahagyva FROM kosziDiak LEFT JOIN koszi USING (kosziId)
-		LEFT JOIN ".__INTEZMENYDBNEV.".kosziEsemeny USING (kosziEsemenyId)
-		WHERE diakId = %u ORDER BY rogzitesDt,jovahagyasDt";
-	$v = array($diakId);
-	$r = db_query($q, array('modul'=>'naplo','result'=>'indexed', 'values'=>$v));
-
-	return $r;
-    }
-
-
-
-?>
diff --git a/mayor-orig/www/include/modules/naplo/share/munkakozosseg.php b/mayor-orig/www/include/modules/naplo/share/munkakozosseg.php
deleted file mode 100644
index 9a46f074..00000000
--- a/mayor-orig/www/include/modules/naplo/share/munkakozosseg.php
+++ /dev/null
@@ -1,84 +0,0 @@
- 'getMunkakozossegByTargyId', 'modul' => 'naplo_intezmeny', 'result' => 'value', 'values'=>array($targyId)));
-	return getMunkakozossegById($mkId);    
-    }
-
-    function getMunkakozossegById($id) {
-	return getMunkakozossegek(array("mkId=$id"),array('result' => 'record'));    
-    }
-
-    function getMunkakozossegek($FILTER=array(),$SET=array('result' => 'indexed')) {
-
-
-	if ($SET['result'] == '') $SET['result'] = 'indexed';
-        $RESULT = array();
-
-	/* Általános filterező */
-	$QW = '';
-	if (is_array($FILTER) && count($FILTER)>0) {
-	    $QW = " WHERE ".implode(' AND ',$FILTER);
-	}
-	if ($SET['idonly']===true || $SET['csakId']===true) $fields = "mkId";
-	else $fields="mkId,mkId AS munkakozossegId,leiras,leiras as mkNev,leiras as munkakozossegNev, mkVezId,TRIM((CONCAT_WS(' ',viseltNevElotag,viseltCsaladiNev,viseltUtonev))) AS mkVezNev";
-        $q = "SELECT $fields FROM munkakozosseg LEFT JOIN tanar ON mkVezId=tanarId".$QW.' ORDER BY leiras';
-	$RESULT = db_query($q, array('modul' => 'naplo_intezmeny', 'fv' => 'getMunkakozossegek', 'result' => $SET['result']));
-
-        return $RESULT;
-
-    }
-
-    function getMunkakozossegByTanarId($tanarId, $SET = array('result' => 'idonly')) {
-
-	if ($SET['csakId']===true) $SET['result'] = 'idonly'; // Az egységesíítés nevében :o)
-	if ($SET['result'] == 'idonly') {
-	    $q = "SELECT mkId AS munkakozossegId FROM mkTanar WHERE tanarId=%u";
-	    return db_query($q, array('fv' => 'getMunkakozossegByTanarId','modul' => 'naplo_intezmeny', 'result' => 'idonly', 'values' => array($tanarId)));
-	} else {
-    	    $q = "SELECT mkId,mkId AS munkakozossegId,leiras, leiras AS mkNev, leiras AS munkakozossegNev,mkVezId
-		  FROM munkakozosseg LEFT JOIN mkTanar USING (mkId) WHERE tanarId=%u ORDER BY leiras";
-	    return db_query($q, array('fv' => 'getMunkakozossegByTanarId', 'modul' => 'naplo_intezmeny', 'result' => 'indexed', 'values' => array($tanarId)));
-	}
-	
-    }
-
-    function getVezetettMunkakozossegByTanarId($tanarId, $SET = array('result' => 'idonly'), $olr='') {
-
-	$lr = ($olr!='') ? $olr : db_connect('naplo_intezmeny');
-	if ($SET['csakId']===true) $SET['result'] = 'idonly'; // Az egységesíítés nevében :o)
-	if ($SET['result'] == 'idonly') {
-	    //$q = "SELECT mkId AS munkakozossegId FROM munkakozosseg WHERE mkVezId=%u";
-	    $q = "SELECT DISTINCT mkId AS munkakozossegId FROM munkakozosseg LEFT JOIN mkVezeto USING (mkId) WHERE mkVezId=%u OR tanarId=%u";
-	    $R = db_query($q, array('fv' => 'getVezetettMunkakozossegByTanarId','modul' => 'naplo_intezmeny', 'result' => 'idonly', 'values' => array($tanarId, $tanarId)), $lr);
-	} else {
-    	    //$q = "SELECT mkId,mkId AS munkakozossegId,leiras, leiras AS mkNev, leiras AS munkakozossegNev,mkVezId
-	    //	  FROM munkakozosseg WHERE mkVezId=%u ORDER BY leiras";
-    	    $q = "SELECT DISTINCT mkId,mkId AS munkakozossegId,leiras, leiras AS mkNev, leiras AS munkakozossegNev,mkVezId
-		  FROM munkakozosseg LEFT JOIN mkVezeto USING (mkId) WHERE mkVezId=%u OR tanarId=%u ORDER BY leiras";
-	    $R = db_query($q, array('fv' => 'getVezetettMunkakozossegByTanarId', 'modul' => 'naplo_intezmeny', 'result' => 'indexed', 'values' => array($tanarId,$tanarId)),$lr);
-	}
-	if ($olr=='') db_close($lr);
-	return $R;
-    }
-
-    function getMunkakozossegNevById($munkakozossegId) {
-
-        $q = "SELECT leiras AS munkakozossegNev FROM `munkakozosseg` WHERE mkId=%u";
-        return db_query($q, array('fv' => 'getmunkakozossegNevById', 'modul' => 'naplo_intezmeny', 'result' => 'value', 'values' => array($munkakozossegId)));
-
-    }
-
-    function getMunkakozossegTanaraMatrix() {
-	$q = "SELECT * FROM mkTanar";
-	$r = db_query($q,array('fv' => '', 'modul' => 'naplo_intezmeny', 'result' => 'indexed'));
-	for ($i=0; $i
\ No newline at end of file
diff --git a/mayor-orig/www/include/modules/naplo/share/mysql.php b/mayor-orig/www/include/modules/naplo/share/mysql.php
deleted file mode 100644
index 30ccbab0..00000000
--- a/mayor-orig/www/include/modules/naplo/share/mysql.php
+++ /dev/null
@@ -1,184 +0,0 @@
- 'root', 'host'=> $host, 'force' => true, 'username' => $rootUser, 'password' => $rootPassword, 'db' => 'mayor_naplo', 'fv' => 'createDatabase'));
-	    if (!$lr) return false;
-
-	    // Kliens karakterkódolása
-	    db_query("SET CHARACTER SET utf8", array('fv'=>'createDatabase#1'), $lr);
-
-	    // Az adatbázis létrehozása
-	    $q = "CREATE DATABASE `%s` CHARACTER SET utf8 COLLATE utf8_hungarian_ci";
-    	    $r = db_query($q, array('fv'=>'createDatabase#2', 'values' => array($dbName)), $lr);
-	    if ($r !== true) { // pl. ha már létezik...
-		db_close($lr);
-		return false;
-	    }
-
-	    /* Minden hoston létrehozzuk a usereket! Write/Read - et egyaránt! Még akkor is, ha csak a masterről olvasunk, slave-re írunk */
-    	    $password =  $MYSQL_DATA['naplo_base']['pwWrite'];
-    	    $user = $MYSQL_DATA['naplo_base']['userWrite'];
-    	    $userHost = ($host=='localhost' || $host=='127.0.0.1') ? 'localhost' : _WEBSERVER_ADDR;
-	    $q = "GRANT ALL ON `%s`.* TO '%s'@'%s' IDENTIFIED BY '%s'";
-    	    $r = db_query($q, array('fv' => 'createDatabase#3', 'values' => array($dbName, $user, $userHost, $password)), $lr);
-	    if ($r !== true) $ok = false;
-
-    	    $password =  $MYSQL_DATA['naplo_base']['pwRead'];
-    	    $user = $MYSQL_DATA['naplo_base']['userRead'];
-    	    $userHost = ($host=='localhost' || $host=='127.0.0.1') ? 'localhost' : _WEBSERVER_ADDR;
-	    $q = "GRANT SELECT,EXECUTE ON `%s`.* TO '%s'@'%s' IDENTIFIED BY '%s'";
-    	    $r = db_query($q, array('fv' => 'createDatabase#4', 'values' => array($dbName, $user, $userHost, $password)), $lr);
-	    if ($r !== true) $ok = false;
-
-	    if (db_query("USE `%s`", array('fv' => 'createDatabase#use', 'values' => array($dbName)), $lr) && $ok) {
-
-    		$fp = fopen($queryFile, 'r');
-    		$query = fread($fp, filesize($queryFile));
-    		fclose($fp);
-
-		// A tárolt eljárásoknak, függvényeknek "DELIMITER //" és "DELIMITER ; //" között kell lenniük - egy blokkban a file végén!
-		list($query, $delimiter) = explode('DELIMITER //', $query);
-	    
-		// Tábladefiníciók - normál query-k
-    		$QUERIES = explode(';', str_replace("\n", '', $query));
-    		for ($i = 0; $i < count($QUERIES); $i++) {
-        	    $q = $QUERIES[$i];
-        	    if (trim($q) != '' and substr($q, 0, 2) != '--' and substr($q, 0, 3) != '/*!') {
-	    		if (is_array($convert))
-	    		foreach ( $convert as $mit=>$mire ) $q = str_replace($mit,$mire,$q);
-			$r = db_query($q, array('fv'=>'createDatabase#6-'.$i), $lr);
-			if ($r !== true) { $ok = false; break; }
-		    } elseif ($q != '') {
-			$_SESSION['alert'][] = ':query_error:'.$q;
-		    }
-    		}
-
-    		if ($ok !== false) {
-    		    list($delimiter, $end) = explode('DELIMITER ; //',$delimiter);
-		    $procQueries = explode('//', $delimiter);
-		    for ($i = 0; $i < count($procQueries); $i++) {
-			$q = trim($procQueries[$i]); // ebben vannak most ;-ők és sortörések...
-			if ($q[strlen($q)-1] == ';') $q = substr($q, 0, -1); // A végén nem lehet ; !!
-			if ($q != '') {
-	    		    if (is_array($convert))
-	    		    foreach ( $convert as $mit=>$mire ) $q = str_replace($mit,$mire,$q);
-			    $r = db_query($q, array('fv'=>'createDatabase#7-'.$i), $lr);
-			    if ($r !== true) { $ok = false; break; }
-			}
-		    }
-		} // if ok    
-	    } else {
-		$ok = false;
-	    }
-
-	    if ($ok === false) {
-		$_SESSION['alert'][] = 'message:sql_db_dropped:'.$dbName;
-		db_query("DROP DATABASE `%s`", array('fv' => 'createDatabase#7', 'values' => array($dbName)), $lr);
-	    }
-	} // HOSTS ciklusa
-
-        db_close($lr);
-	return $ok;
-
-    }
-
-    function revokeWriteAccessFromDb($dbName, $rootUser = 'root', $rootPassword = '') {
-
-	global $MYSQL_DATA;
-
-	// Kötelező paraméterek ellenőrzése
-        if ($dbName == '' or $rootUser == '' or $rootPassword == '') {
-	    $_SESSION['alert'][] = 'message:empty_field:revokeWriteAccessFromDb';
-	    return false;
-	}
-
-	/* Minden MySQL hostról elvesszük a jogot */
-	/* Ki kell találni, hány SQL szerverünk van! */
-	$HOSTS = _setHosts();
-
-	for ($h=0; $h 'root', 'force' => true, 'host'=>$host, 'username' => $rootUser, 'password' => $rootPassword, 'db' => 'mayor_naplo', 'fv' => 'revokeWriteAccessFromDb'));
-	    if (!$lr) return false;
-
-	    // jogok elvétele a write usertől
-	    $user = $MYSQL_DATA['naplo_base']['userWrite'];
-    	    $userHost = ($host=='localhost' || $host=='127.0.0.1') ? 'localhost' : _WEBSERVER_ADDR;
-	    $q = "REVOKE ALTER,CREATE,DROP,INSERT,UPDATE,DELETE ON `%s`.* FROM '%s'@'%s'";
-    	    $r = db_query($q, array('fv' => 'revokeWriteAccessFromDb', 'values' => array($dbName, $user, $userHost)), $lr);
-    	    db_close($lr);
-    	}
-	return $r;
-
-    }
-
-    function grantWriteAccessToDb($dbName, $rootUser = 'root', $rootPassword = '') {
-
-	global $MYSQL_DATA;
-
-	// Kötelező paraméterek ellenőrzése
-        if ($dbName == '' or $rootUser == '' or $rootPassword == '') {
-	    $_SESSION['alert'][] = 'message:empty_field:grantWriteAccessToDb';
-	    return false;
-	}
-
-	/* Ki kell találni, hány SQL szerverünk van! */
-	$HOSTS = _setHosts();
-
-	for ($h=0; $h 'root', 'force' => true, 'host'=>$host, 'username' => $rootUser, 'password' => $rootPassword, 'db' => 'mayor_naplo', 'fv' => 'grantWriteAccessToDb'));
-	    if (!$lr) return false;
-
-	    // Írási jog...
-    	    $user = $MYSQL_DATA['naplo_base']['userWrite'];
-    	    $userHost = ($host=='localhost' || $host=='127.0.0.1') ? 'localhost' : _WEBSERVER_ADDR;
-	    $q = "GRANT ALL ON `%s`.* TO '%s'@'%s'";
-    	    $r = db_query($q, array('fv' => 'grantWriteAccessToDb', 'values' => array($dbName, $user, $userHost)), $lr);
-
-    	    db_close($lr);
-    	}
-	return $r;
-
-    }
-
-    function _setHosts() {
-	global $MYSQL_DATA;
-	$HOSTS = array();
-	foreach ( array('hostWrite','hostRead','host') as $_host ) {
-	    if ($MYSQL_DATA['naplo_base'][$_host]!='' && !in_array($MYSQL_DATA['naplo_base'][$_host],$HOSTS)) {
-		$HOSTS[] = $MYSQL_DATA['naplo_base'][$_host];
-	    }
-	}
-	if (count($HOSTS)==0) 
-	    if ($MYSQL_DATA['host']=='') 
-		$HOSTS[] = 'localhost';
-	    else 
-		$HOSTS[] = $MYSQL_DATA['host'];
-	return $HOSTS;    
-    }
-
-?>
diff --git a/mayor-orig/www/include/modules/naplo/share/nap.php b/mayor-orig/www/include/modules/naplo/share/nap.php
deleted file mode 100644
index e66457f9..00000000
--- a/mayor-orig/www/include/modules/naplo/share/nap.php
+++ /dev/null
@@ -1,332 +0,0 @@
- 'Szent István király ünnepe',
-            '10-23' => '56-os forradalom ünnepe',
-            '11-01' => 'Mindenszentek',
-            '12-25' => 'Karácsony első napja',
-            '12-26' => 'Karácsony második napja',
-            '01-01' => 'Újév',
-            '03-15' => '48-as forradalom és szabadságharc ünnepe',
-	    '05-01' => 'Munka Ünnepe'
-    );
-
-    function getNapTipusok() {
-
-        return getEnumField('naplo', 'nap', 'tipus');
-
-    }
-
-    function getNapokSzama($SET = array('osztalyId' => null, 'munkatervId' => 1)) {
-
-	if (isset($SET['osztalyId'])) {
-	    $vegzosOsztalyJellegIds = getVegzosOsztalyJellegIds();
-	    $oAdat = getOsztalyAdat($SET['osztalyId']);
-	    if (
-		in_array($oAdat['osztalyJellegId'], $vegzosOsztalyJellegIds) 		// érettségiző osztály
-		&& $oAdat['vegzoTanev'] == __TANEV					// most végez
-	    ) {
-    		$q = "SELECT tipus, COUNT(*) AS db FROM nap 
-			LEFT JOIN munkatervOsztaly USING (munkatervId) 
-			LEFT JOIN munkaterv USING (munkatervId)
-			WHERE osztalyId=%u AND dt <= vegzosZarasDt
-			GROUP BY tipus";
-	    } else {
-    		$q = "SELECT tipus, COUNT(*) AS db FROM nap LEFT JOIN munkatervOsztaly USING (munkatervId) WHERE osztalyId=%u GROUP BY tipus";
-	    }
-	    $v = array($SET['osztalyId']);
-	} else {
-	    if (!isset($SET['munkatervId'])) $SET['munkatervId'] = 1;
-    	    $q = "SELECT tipus, COUNT(*) AS db FROM nap WHERE munkatervId=%u GROUP BY tipus";
-	    $v = array($SET['munkatervId']);
-	}
-        return db_query($q, array('fv' => 'getNapokSzama', 'modul' => 'naplo', 'result' => 'keyvaluepair', 'values' => $v));
-    }
-
-    function _genNapok($tolDt,$igDt) {
-        $q = "SELECT TO_DAYS('%s') - TO_DAYS('%s') AS diff";
-        $nod = db_query($q, array('fv' => '_genNapok', 'modul' => 'naplo_base', 'result' => 'value', 'values' => array($igDt, $tolDt)));
-        $_stamp = strtotime($tolDt);
-        for ($i = 0; $i <= $nod; $i++) {
-            $__stamp = mktime(0, 0, 0, date('m', $_stamp), date('d', $_stamp)+$i , date('y', $_stamp));
-            $NAPOK[$i] = date('Y-m-d', $__stamp);
-        }
-        return $NAPOK;
-    }
-
-    // Az ora.php függvényeinek része ide tartozik!
-    /*
-	A függvény minden olyan nap esetén emeli a tanítási napok számát 1-gyel, melyen a megadott munkatervek legalább 
-	egyikén tanítási nap van. Értelmes ez így? (amúgy mit jelentene a tanár haladási naplójában a tanítási nap szám?)
-    */
-    function getTanitasiNapAdat($DT, $SET = array('munkatervIds' => array())) { // refer to nyomtatas/haladasinaplo.php
-	if (is_array($DT) && count($DT)>0) {
-	    if (!is_array($SET['munkatervIds']) || count($SET['munkatervIds']) == 0) $SET['munkatervIds'] = array(1);
-	    $lr = db_connect('naplo');
-	    $q = "SET @napszam=(SELECT COUNT(DISTINCT dt) FROM nap 
-			WHERE tipus IN ('tanítási nap','speciális tanítási nap') AND dt<'".$DT[0]."'
-			AND munkatervId IN (".implode(',', array_fill(0, count($SET['munkatervIds']), '%u'))."))";
-	    db_query($q, array('fv' => 'getTanitasiNapAdat', 'modul' => 'naplo', 'values' => $SET['munkatervIds']), $lr);
-	    $q = "SELECT dt,@napszam:=@napszam+1 AS napszam FROM nap WHERE tipus IN ('tanítási nap','speciális tanítási nap') 
-		    AND dt IN ('".implode("','",$DT)."')
-		    AND munkatervId IN (".implode(',', array_fill(0, count($SET['munkatervIds']), '%u')).") GROUP BY dt";
-	    $v = array($dt);
-	    $v = $SET['munkatervIds'];
-    	    $ret=db_query($q, array('fv' => 'share/nap/getTanitasiNapAdat', 'modul' => 'naplo', 'result' => 'assoc', 'keyfield'=>'dt', 'values' => $v),$lr);
-	    db_close($lr);
-	    return $ret;
-	} else {
-	    return false;
-	}
-    }
-
-    function getTanitasiNapSzama($dt, $munkatervId) {
-        $q = "SELECT COUNT(*) FROM nap WHERE tipus IN ('tanítási nap','speciális tanítási nap') AND dt<='%s' AND munkatervId=%u";
-        return db_query($q, array('fv' => 'getTanitasiNapSzama', 'modul' => 'naplo', 'result' => 'value', 'values' => array($dt, $munkatervId)));
-    }
-
-    /*
-	Az órarendi hetek hozzárendelése mindig az összes munkatervet érintő változtatás!
-    */
-    function orarendiHetekHozzarendelese($tolDt = '', $igDt = '', $Hetek = array(1), $olr = '') {
-
-        global $_TANEV;
-            
-        if ($tolDt == '') $tolDt = $_TANEV['kezdesDt'];
-        if ($igDt == '') $igDt = $_TANEV['zarasDt'];
-
-        if ($olr == '') $lr = db_connect('naplo', array('fv' => 'orarendiHetekHozzarendelese'));
-        else $lr = $olr;
-
-	// Az összes munkatervre elvégzi a hozzárendelést...
-    	$q = "SELECT dt,tipus,munkatervId FROM nap WHERE dt>='%s' AND dt<='%s' AND tipus='tanítási nap' ORDER BY dt";
-    	$v = array($tolDt, $igDt, $munkatervId);
-        $r = db_query($q, array('fv' => 'orarendiHetekHozzarendelese', 'modul' => 'naplo', 'result' => 'indexed', 'values' => $v), $lr);
-        if (!$r) { if ($olr == '') db_close($lr); return false; }
-    
-        $i = array(); $het = $Hetek[0]; $dow = array();
-        foreach ($r as $key => $val) {
-            $dt = $val['dt'];
-            $tipus = $val['tipus'];
-            $munkatervId = $val['munkatervId'];
-            $elozo_dow[$munkatervId] = $dow[$munkatervId];
-            // DOW lehetne munkatervenként is!
-            $dow[$munkatervId] = date('w',strtotime($dt)); if ($dow[$munkatervId] == 0) $dow[$munkatervId] = 7; // Vasárnap a hét utolsó napja - nálunk
-            // csak a $dow-okat nézzük, ha tehát egy keddi nap után a következő heti csütörtök jön, akkor nem vált hetet!
-            if ($elozo_dow[$munkatervId] >= $dow[$munkatervId]) {
-                $i[$munkatervId] = ($i[$munkatervId]+1) % count($Hetek);
-                $het = $Hetek[$i[$munkatervId]];
-            }
-            if ($het=='') $het=1; //szkúzi...
-            if ($tipus = 'tanítási nap' && is_numeric($het)) {
-                $q = "UPDATE nap SET orarendiHet=%u WHERE dt='%s' AND tipus='tanítási nap' AND munkatervId=%u";
-                $v = array($het, $dt, $munkatervId);
-            } else {
-                $q = "UPDATE nap SET orarendiHet=0 WHERE dt='%s' AND tipus='tanítási nap' AND munkatervId=%u";
-                $v = array($dt, $munkatervId);
-            }
-            $r2 = db_query($q, array('fv' => 'orarendiHetekHozzarendelese', 'modul' => 'naplo', 'values' => $v), $lr);
-            if (!$r2) { if ($olr == '') db_close($lr); return false; }
-        }
-
-        if ($olr == '') db_close($lr);
-
-    }
-
-    /**
-     * Törli, majd felveszi a megadott dátumok közötti napokat - minden munkatervhez!
-    **/
-    function napokHozzaadasa($tanev, $tolDt, $igDt, $tanevAdat, $lr = null) {
-
-	global $UNNEPNAPOK;
-
-	$tanevDb = tanevDbNev(__INTEZMENY, $tanev);
-	$r = array();
-	$q = "DELETE FROM `$tanevDb`.`nap` WHERE '%s'<=dt AND dt<='%s'";
-	$v = array($tolDt, $igDt);
-        $r[] = db_query($q, array('fv' => 'napokHozzáadása/delete', 'modul' => 'naplo', 'values' => $v), $lr);
-        for ($stamp = strtotime($tolDt.' 08:00:00'); $stamp <= strtotime($igDt.' 08:00:00');$stamp = $stamp + 24*60*60 ) {
-                $dt = date('Y-m-d', $stamp);
-                $ho_nap = date('m-d', $stamp);
-		$ho = date('m', $stamp);
-                $dow = date('w', $stamp);
-                if ($UNNEPNAPOK[$ho_nap] != '') { // Fix dátumú, állami ünnepnapok
-                        $tipus = 'tanítási szünet';
-                        $megjegyzes = $UNNEPNAPOK[$ho_nap];
-                        $orarendiHet = 0;
-                } elseif ($dow == '0' or $dow == '6') { // Hétvégék
-                        $tipus = 'tanítási szünet';
-                        $megjegyzes = '';
-                        $orarendiHet = 0;
-		} elseif ($ho == 7) { //  Július hónap - nyári szünet
-                        $tipus = 'tanítási szünet';
-                        $megjegyzes = 'Nyári szünet';
-                        $orarendiHet = 0;
-                } elseif (strtotime($tanevAdat['zarasDt']) 'napokHozzáadása/insert', 'modul' => 'naplo', 'values' => $v), $lr);
-        
-        }
-	return !in_array(false, $r);
-
-    }
-
-    function getMunkatervek($SET = array('result' => 'indexed')) {
-	if ($SET['result']==='idonly') {
-	    $q = "SELECT munkatervId FROM munkaterv";
-	} else {
-            $q = "SELECT * FROM munkaterv";
-	}
-    	$R = db_query($q, array('fv' => 'getMunkatervek', 'modul' => 'naplo', 'result' => $SET['result'], 'keyfield' => 'munkatervId'));
-	return $R;
-    }
-
-    function getMunkatervByOsztalyId($osztalyId, $SET = array('result' => 'value')) {
-
-	if (!is_array($osztalyId)) $osztalyId = array($osztalyId);
-	if (count($osztalyId) == 0) return false;
-	$q = "SELECT DISTINCT munkatervId FROM munkaterv LEFT JOIN munkatervOsztaly USING (munkatervId) WHERE osztalyId IN (".implode(',',array_fill(0, count($osztalyId), '%u')).")";
-	$v = $osztalyId;
-	return db_query($q, array('fv' => 'getMunkatervByOsztalyId', 'modul' => 'naplo', 'values'=>$v, 'result' => $SET['result']));
-
-    }
-    function getMunkatervByDiakId($diakId, $SET = array('tolDt'=>null, 'igDt'=>null)) {
-
-	if (!is_array($diakId)) $diakId = array($diakId);
-	if (count($diakId) == 0) return false;
-	$q = "SELECT DISTINCT munkatervId FROM munkaterv LEFT JOIN munkatervOsztaly USING (munkatervId) LEFT JOIN `".__INTEZMENYDBNEV."`.osztalyDiak USING (osztalyId) WHERE diakId IN (".implode(',',array_fill(0, count($diakId), '%u')).")";
-	$v = $diakId;
-	return db_query($q, array('fv' => 'getMunkatervByOsztalyId', 'modul' => 'naplo', 'values'=>$v, 'result' => 'value'));
-
-    }
-
-    /**
-     * A függvény az orarendiOra tábla alapján keresi meg a tanár tanköreit, nem a tankorTanar alapján!!!!
-     *
-    **/
-    function getMunkatervByTanarId($tanarId, $SET = array('result' => 'indexed', 'tanev'=>__TANEV, 'tolDt'=>null, 'igDt'=>null)) {
-
-	$tanev = isset($SET['tanev'])?$SET['tanev']:__TANEV;
-	$tolDt = $SET['tolDt']; $igDt = $SET['igDt'];
-        initTolIgDt($tanev, $tolDt, $igDt);
-	if (!is_array($tanarId)) $tanarId = array($tanarId);
-	// lekérdezzük a tankorTanar tábla alapján a tanárhoz tartozó tanköröket, majd ezek osztályaihoz tartozó munkaterveket
-	$q = "SELECT DISTINCT osztalyId FROM tankorTanar LEFT JOIN tankorOsztaly USING (tankorId) 
-		WHERE tanarId IN (".implode(',', array_fill(0, count($tanarId), '%u')).") AND beDt<='%s' AND (kiDt IS NULL OR '%s'<=kiDt)";
-	$v = mayor_array_join($tanarId, array($igDt, $tolDt));
-	$osztalyId = db_query($q, array('fv'=>'getMunkatervByTanarId', 'modul'=>'naplo_intezmeny', 'result'=>'idonly', 'values'=>$v));
-
-	return getMunkatervByOsztalyId($osztalyId, $SET);
-    }
-
-    /*
-	A függvény munkatervId, osztalyId vagy tankorId (az egyik megadása kötelező!) alapján adja meg az összes, vagy a végzős tanítási hetek számát.
-	Ha nincs megadva, hogy az osztály vagy tankör végzős-e, akkor lekérdezzük, hogy érettségiző osztály-e az osztályjelleg alapján.
-    */
-    function getTanitasiHetekSzama($SET = array('munkatervId'=>null, 'osztalyId'=>null, 'vegzos'=>false)) {
-
-	if ($SET['munkatervId'] != '') {
-	    if ($SET['vegzos']) {
-		$q = "SELECT CEIL(COUNT(*)/%u) AS tanitasiHet FROM nap
-			WHERE tipus IN ('tanítási nap','speciális tanítási nap') AND munkatervId=%u
-			AND dt<=(SELECT vegzosZarasDt FROM munkaterv WHERE munkatervId=nap.munkatervId)";
-	    } else {
-		$q = "SELECT CEIL(COUNT(*)/%u) AS tanitasiHet FROM nap 
-			WHERE tipus IN ('tanítási nap','speciális tanítási nap') AND munkatervId=%u";
-	    }
-	    $v = array(__TANITASINAP_HETENTE, $SET['munkatervId']);
-	} elseif ($SET['osztalyId'] != '') {
-	    if (!isset($SET['vegzos'])) {
-		$VO = getVegzosOsztalyok(array('tanev'=>__TANEV,'result'=>'idonly','vizsgazo'=>true));
-		$SET['vegzos'] = (is_array($VO)&&in_array($SET['osztalyId'],$VO));
-	    }
-	    if ($SET['vegzos']) {
-		$q = "SELECT CEIL(COUNT(*)/%u) AS tanitasiHet FROM nap LEFT JOIN munkatervOsztaly USING (munkatervId) 
-			WHERE tipus IN ('tanítási nap','speciális tanítási nap') 
-			AND osztalyId=%u
-			AND dt<=(SELECT vegzosZarasDt FROM munkaterv WHERE munkatervId=nap.munkatervId)";
-	    } else {
-		$q = "SELECT CEIL(COUNT(*)/%u) AS tanitasiHet FROM nap LEFT JOIN munkatervOsztaly USING (munkatervId) 
-			WHERE tipus IN ('tanítási nap','speciális tanítási nap') 
-			AND osztalyId=%u";
-	    }
-	    $v = array(__TANITASINAP_HETENTE, $SET['osztalyId']);
-	} elseif ($SET['tankorId'] != '') {
-	    if (!isset($SET['vegzos'])) {
-		$SET['vegzos'] = tankorVegzosE($tankorId, __TANEV, array('tagokAlapjan' => true, 'tolDt' => null, 'igDt' => null));
-	    }
-	    if ($SET['vegzos']) {
-		$q = "SELECT CEIL(COUNT(DISTINCT dt)/%u) AS tanitasiHet FROM nap LEFT JOIN munkatervOsztaly USING (munkatervId) 
-			    WHERE tipus IN ('tanítási nap','speciális tanítási nap') 
-			    AND osztalyId IN (SELECT osztalyId FROM ".__INTEZMENYDBNEV.".tankorOsztaly WHERE tankorId=%u)
-			    AND dt<=(SELECT vegzosZarasDt FROM munkaterv WHERE munkatervId=nap.munkatervId)";
-	    } else {
-		$q = "SELECT CEIL(COUNT(DISTINCT dt)/%u) AS tanitasiHet FROM nap LEFT JOIN munkatervOsztaly USING (munkatervId) 
-			    WHERE tipus IN ('tanítási nap','speciális tanítási nap') 
-			    AND osztalyId IN (SELECT osztalyId FROM ".__INTEZMENYDBNEV.".tankorOsztaly WHERE tankorId=%u)";
-	    }
-	    $v = array(__TANITASINAP_HETENTE, $SET['tankorId']);
-	} else {
-	    $_SESSION['alert'][] = 'message:empty_field:getTanitasiHetekSzama';
-	    return false;
-	}
-
-	if (__TANITASI_HETEK_OVERRIDE === true) {
-	    if ($SET['vegzos']) {
-		if (defined('___VEGZOS_TANITASI_HETEK_SZAMA')) return ___VEGZOS_TANITASI_HETEK_SZAMA;
-	    } else {
-		if (defined('___TANITASI_HETEK_SZAMA')) return ___TANITASI_HETEK_SZAMA;
-	    }
-	}
-	return db_query($q, array('debug'=>false,'fv'=>'getTanitasiHetekSzama','modul'=>'naplo','result'=>'value','values'=>$v));
-    }
-
-    function getOsztalyUtolsoTanitasiNap($osztalyId, $tanev=__TANEV) {
-
-	global $_TANEV;
-
-	if ($tanev == __TANEV) $TA = $_TANEV;
-	else $TA = getTanevAdat($tanev);
-	$tanevDb = tanevDbNev(__INTEZMENY,$tanev);
-
-	// idén érettségiző vagy szakmai vizsgát tevő osztály-e
-	$q = "SELECT COUNT(*) FROM osztaly LEFT JOIN mayor_naplo.osztalyJelleg USING (osztalyJellegId) 
-		WHERE vegzesKovetelmenye IN ('érettségi vizsga','szakmai vizsga') AND vegzoTanev=%u AND osztalyId=%u";
-	$v = array($tanev, $osztalyId);
-	$vizsgazoE = (db_query($q, array('fv'=>'getOsztalyUtolsoTanitasiNap','modul'=>'naplo_intezmeny','result'=>'value','values'=>$v)) == 1);
-
-	if ($vizsgazoE) {
-	    $q = "SELECT vegzosZarasDt FROM `".$tanevDb."`.munkaterv LEFT JOIN `".$tanevDb."`.munkatervOsztaly USING (munkatervId) WHERE osztalyId=%u";
-	    return db_query($q, array('debug'=>false,'fv'=>'getOsztalyUtolsoTanitasiNap/dt','modul'=>'naplo','result'=>'value','values'=>array($osztalyId)));
-	} else {
-	    return $TA['zarasDt'];
-	}
-
-    }
-
-?>
\ No newline at end of file
diff --git a/mayor-orig/www/include/modules/naplo/share/ora.php b/mayor-orig/www/include/modules/naplo/share/ora.php
deleted file mode 100644
index cdadeb00..00000000
--- a/mayor-orig/www/include/modules/naplo/share/ora.php
+++ /dev/null
@@ -1,625 +0,0 @@
- 'getOraAdatById', 'modul' => 'naplo_intezmeny', 'result' => 'record', 'values' => $v), $olr);
-
-        } else {
-            // nincs id
-            return false;
-        }
-    }
-
-    function getOraAdatByTankor($tankorId, $olr = '') {
-
-        if ($tankorId != '') {
-
-                $q = "SELECT DISTINCT oraId,
-                                 dt,
-                                 ora,
-                                 ki,
-                                 kit,
-                                 ora.tankorId AS tankorId,
-                                 teremId,
-                                 ora.leiras AS leiras,
-                                 ora.tipus AS tipus,
-                                 eredet,
-                                 TRIM(CONCAT_WS(' ', t1.viseltNevElotag, t1.viseltCsaladiNev, t1.viseltUtonev)) AS kiCn,
-                                 TRIM(CONCAT_WS(' ', t2.viseltNevElotag, t2.viseltCsaladiNev, t2.viseltUtonev)) AS kitCn,
-                                 tankorNev,
-				 feladatTipusId,
-				 munkaido
-                            FROM ".__TANEVDBNEV.".ora
-                            LEFT JOIN ".__INTEZMENYDBNEV.".tankorSzemeszter USING (tankorId)
-                            LEFT JOIN ".__INTEZMENYDBNEV.".tanar AS t1 ON ki=t1.tanarId
-                            LEFT JOIN ".__INTEZMENYDBNEV.".tanar AS t2 ON kit=t2.tanarId
-                    	    LEFT JOIN ".__INTEZMENYDBNEV.".feladatTipus USING (feladatTipusId)
-                            WHERE tankorId=%u AND tipus NOT LIKE 'elmarad%%' AND (tanev=".__TANEV." OR feladatTipusId IS NOT NULL)
-			    ORDER BY dt DESC,ora DESC,tankorId";
-		return db_query($q, array('fv' => 'getOraAdatByTankor', 'modul' => 'naplo', 'result' => 'indexed', 'values' => array($tankorId)), $olr);
-
-        } else {
-            // nincs id
-            return false;
-        }
-    }
-
-    function getHelyettesitettOra($tolDt, $igDt) {
-
-                $q = "SELECT DISTINCT oraId,
-                                 dt,
-                                 ora,
-                                 ki,
-                                 kit,
-                                 ora.tankorId AS tankorId,
-                                 teremId,
-                                 ora.leiras AS leiras,
-                                 ora.tipus AS tipus,
-                                 eredet,
-                                 TRIM(CONCAT_WS(' ', t1.viseltNevElotag, t1.viseltCsaladiNev, t1.viseltUtonev)) AS kiCn,
-                                 TRIM(CONCAT_WS(' ', t2.viseltNevElotag, t2.viseltCsaladiNev, t2.viseltUtonev)) AS kitCn,
-                                 tankorNev,
-				 munkaido
-                            FROM ".__TANEVDBNEV.".ora
-                            LEFT JOIN ".__INTEZMENYDBNEV.".tankorSzemeszter USING (tankorId)
-                            LEFT JOIN ".__INTEZMENYDBNEV.".tanar AS t1 ON ki=t1.tanarId
-                            LEFT JOIN ".__INTEZMENYDBNEV.".tanar AS t2 ON kit=t2.tanarId
-                            WHERE (
-				tipus IN ('helyettesítés','felügyelet','összevonás','elmarad','elmarad máskor','normál máskor')
-				or eredet='plusz'
-			    )
-			    AND tanev=".__TANEV." AND '%s' <= dt AND dt <= '%s'
-			    ORDER BY dt, ora, ki";
-		return db_query($q, array('fv' => 'getHelyettesítettOrar', 'modul' => 'naplo', 'result' => 'indexed', 'values' => array($tolDt, $igDt)), $olr);
-
-    }
-
-
-/*
- * Adott nap adott órájában mely termek szabadok - esetleg megadva, hogy kinek a számára: ilyenkor
- * az ő általa használt termek is benne maradnak a listában...
- */
-    function getSzabadTermek($PARAM = array(), $olr = '') {
-
-        if (isset($PARAM['dt']) && $PARAM['dt'] != '') $dt = $PARAM['dt'];
-        else $dt = date('Y-m-d');
-        if (isset($PARAM['ora']) && $PARAM['ora'] !== '') $ora = $PARAM['ora'];
-        else $ora = 1;
-        if (isset($PARAM['ki']) && $PARAM['ki'] != '')
-            $q = "SELECT ".__INTEZMENYDBNEV.".terem.teremId AS teremId,
-                        ".__INTEZMENYDBNEV.".terem.leiras AS leiras,
-                        ".__INTEZMENYDBNEV.".terem.ferohely AS ferohely,
-                        ".__INTEZMENYDBNEV.".terem.tipus AS tipus
-                    FROM ".__INTEZMENYDBNEV.".terem LEFT JOIN ora
-                    ON ora.teremId=".__INTEZMENYDBNEV.".terem.teremId
-                        AND dt='%s'
-                        AND ora=%u
-                        AND ora.tipus NOT LIKE 'elmarad%%'
-                        AND ki != %u
-                    WHERE ora.eredet IS NULL ORDER BY teremId";
-        else
-            $q = "SELECT ".__INTEZMENYDBNEV.".terem.teremId AS teremId,
-                        ".__INTEZMENYDBNEV.".terem.leiras AS leiras,
-                        ".__INTEZMENYDBNEV.".terem.ferohely AS ferohely,
-                        ".__INTEZMENYDBNEV.".terem.tipus AS tipus
-                    FROM ".__INTEZMENYDBNEV.".terem LEFT JOIN ora
-                    ON ora.teremId=".__INTEZMENYDBNEV.".terem.teremId
-                        AND dt='%s'
-                        AND ora=%u
-                        AND ora.tipus NOT LIKE 'elmarad%%'
-                    WHERE ora.eredet IS NULL ORDER BY teremId";
-	$v = array($dt, $ora, $PARAM['ki']);
-        return db_query($q, array('fv' => 'getSzabadTermek', 'modul' => 'naplo', 'result' => 'indexed', 'values' => $v), $olr);
-    }
-
-
-    function getTanarNapiOrak($tanarId, $dt='', $olr = null) {
-	if ($dt=='') $dt = date('Y-m-d');
-	// --TODO kitalálhatnánk, hogy az adott dátum melyik szemeszterben van!
-	$q = "SELECT DISTINCT oraId, ora, ki, kit, ora.tankorId, ora.tipus AS tipus, eredet, feladatTipusId,  munkaido, tankorNev, teremId, terem.leiras AS teremLeiras, oralatogatasId, megjegyzes, ora.leiras
-		FROM ora LEFT JOIN ".__INTEZMENYDBNEV.".tankorSzemeszter ON (ora.tankorId=tankorSzemeszter.tankorId AND tanev=%u)
-		LEFT JOIN ".__INTEZMENYDBNEV.".terem USING (teremId)
-		LEFT JOIN oraLatogatas USING (oraId)
-		WHERE ki=%u AND dt='%s' ORDER BY ora";
-	$v = array(__TANEV,$tanarId, $dt);
-	return db_query($q, array('debug'=>false,'fv' => 'getTanarNapiOrak', 'modul' => 'naplo', 'result' => 'multiassoc', 'keyfield' => 'ora', 'values' => $v), $olr);
-    }
-
-    function getOsztalyNapiOrak($osztalyId, $dt, $olr = null) {
-
-	$q = "SELECT DISTINCT oraId, ora, ki, kit, ora.tankorId, ora.tipus AS tipus, eredet, feladatTipusId,  munkaido, tankorNev, teremId, terem.leiras AS teremLeiras, oralatogatasId, megjegyzes, ora.leiras
-		FROM ora
-		    LEFT JOIN ".__INTEZMENYDBNEV.".tankorSzemeszter USING (tankorId)
-		    LEFT JOIN ".__INTEZMENYDBNEV.".tankorOsztaly USING (tankorId)
-		    LEFT JOIN ".__INTEZMENYDBNEV.".terem USING (teremId)
-		    LEFT JOIN oraLatogatas USING (oraId)
-		WHERE tanev=".__TANEV." AND osztalyId=%u AND dt='%s' 
-		AND ora.tipus IN ('normál','normál máskor','helyettesítés','felügyelet','összevonás') ORDER BY ora";
-	$v = array($osztalyId, $dt);
-	return db_query($q, array('fv' => 'getOsztalyNapiOrak', 'modul' => 'naplo', 'result' => 'multiassoc', 'keyfield' => 'ora', 'values' => $v), $olr);
-    }
-
-
-    function tanarLukasOrajaE($tanarId, $dt, $ora, $olr = null) {
-
-	$q = "SELECT COUNT(oraId) FROM ora WHERE dt='%s' AND ora=%u AND ki=%u AND tipus NOT LIKE 'elmarad%%'";
-	$v = array($dt, $ora, $tanarId);
-	$num = db_query($q, array('fv' => 'tanarLukasOrajaE', 'modul' => 'naplo', 'result' => 'value', 'values' => $v), $olr);
-	return ($num == 0);
-
-    }
-
-    function tankorTagokLukasOrajaE($tankorId, $dt, $ora, $csereTankorId = '') {
-
-	$nap = date('w', strtotime($dt)); if ($nap == 0) $nap=7;
-	$Diakok = getTankorDiakjaiByInterval($tankorId, __TANEV, $dt, $dt);
-	if (count($Diakok['idk']) == 0) {
-	    // Nincsenek tagjai a tankörnek - év elején bizony előfordul...
-	    return true;
-	}
-	$lukasOra = true;
-	for ($i=0; $itrue,'tolDt' => $dt, 'igDt' => $dt, 'nap'=> $nap, 'ora'=>$ora));
-	    // a diák összes tanköre
-	    $_TANKOROK = getTankorIdsByDiakIds(array($_diakId), array('tanev'=>__TANEV,'tolDt'=>$dt,'igDt'=>$dt));
-	    // A diák adott időpontban kötelező tankörei
-	    if (is_array($_FMTANKOROK)) $tankorIds = array_diff($_TANKOROK, $_FMTANKOROK);
-	    else $tankorIds = $_TANKOROK;
-
-	    if (is_array($tankorIds) && count($tankorIds)>0) {
-		$q = "SELECT COUNT(oraId) AS db FROM ora 
-		    LEFT JOIN ".__INTEZMENYDBNEV.".tankor USING (tankorId)
-		    LEFT JOIN ".__INTEZMENYDBNEV.".tankorTipus USING (tankorTipusId)
-		    WHERE tankorTipus.jelenlet='kötelező' 
-		    AND ora.dt='%s' AND ora.ora=%u AND ora.tipus NOT LIKE 'elmarad%%' AND ora.tankorId IN (".implode(',', array_fill(0, count($tankorIds), '%u')).")";
-
-		$v = mayor_array_join(array($dt, $ora), $tankorIds);
-		if ($csereTankorId != '') {
-		    $q .= " AND tankorId != %u";
-		    array_push($v, $csereTankorId);
-		}
-		$db = db_query($q, array('fv' => 'tankorTagokLukasOrajaE/diakId='.$_diakId, 'modul' => 'naplo', 'result' => 'value', 'values' => $v));
-		if ($db > 0) { // ha van ütközés, akkor próbáljunk informatívak lenni
-		    $q = "SELECT DISTINCT tankorId FROM ora WHERE dt='%s' AND ora=%u AND tipus NOT LIKE 'elmarad%%' 
-			    AND tankorId IN (".implode(',', array_fill(0, count($tankorIds), '%u')).")";
-		    if ($csereTankorId != '') $q .= " AND tankorId != %u";
-		    $r = db_query($q, array('fv' => 'tankorTagokLukasOrajaE', 'modul' => 'naplo', 'result' => 'idonly', 'values' => $v) );
-		    if (is_array($r) && count($r)>0) {
-			$_diakAdat = getDiakAdatById($_diakId);
-			$_SESSION['alert'][] = 'message:foglalt_diak:'.$_diakAdat['diakNev'].' ('.$_diakId.'):tankörök '.implode(',',$r).':időpont '.$dt.' '.$ora.'. óra';
-		    }
-		}
-	    } else {
-		$db = 0;
-	    }
-
-	    $lukasOra = $lukasOra && ($db == 0);
-
-	}
-
-	return $lukasOra;
-
-    }
-
-
-    function getNapok($Param = array('tanev' => __TANEV, 'tolDt' => '', 'igDt' => '', 'napokSzama' => '', 'tipus' => '', 'munkatervId' => null), $olr = null) {
-
-	if (isset($Param['tanev']) && $Param['tanev'] != '') $tanev = $Param['tanev'];
-	if (isset($Param['tolDt']) && $Param['tolDt'] != '') $tolDt = $Param['tolDt'];
-	if (isset($Param['igDt']) && $Param['igDt'] != '') $igDt = $Param['igDt'];
-	if (isset($Param['napokSzama']) && $Param['napokSzama'] != '') $napokSzama = $Param['napokSzama'];
-
-	initTolIgDt($tanev, $tolDt, $igDt);
-	$v = array($tolDt, $igDt);
-
-	if (is_array($Param['tipus']) && count($Param['tipus']) > 0) {
-	    $tipusFeltetel = " AND tipus IN ('" . implode("','", array_fill(0, count($Param['tipus']), '%s')) . "') ";
-	    $v = mayor_array_join($v, $Param['tipus']);
-	} else $tipusFeltetel = '';
-	if (isset($Param['munkatervId'])) {
-	    $mtFeltetel = " AND munkatervId=%u ";
-	    array_push($v, $Param['munkatervId']);
-	} else $mtFeltetel = '';
-	$orderBy = 'ORDER BY dt';
-	if (isset($napokSzama)) {
-	    if (isset($igDt)) $orderBy = 'ORDER BY dt DESC';
-	    $limit = "LIMIT %u";
-	    array_push($v, $napokSzama);
-	}
-
-	$q = "SELECT DISTINCT dt FROM nap
-		WHERE '%s' <= dt AND dt <= '%s' $tipusFeltetel $mtFeltetel $orderBy $limit";
-	return db_query($q, array('fv' => 'getNapok', 'modul' => 'naplo', 'result' => 'idonly', 'values' => $v), $olr);
-
-    }
-
-    function getNapAdat($dt, $olr = '') {
-
-	$q = "SELECT * FROM nap WHERE dt='%s' ORDER BY munkatervId";
-	$ret = db_query($q, array('fv' => 'getNapAdat', 'modul' => 'naplo', 'result' => 'indexed', 'values' => array($dt)), $olr);
-	return $ret;
-
-    }
-
-/* Nem használt függvény - most már munkaterv függő
-    function getNapTipus($dt, $munkatervId = 1) {
-
-        $q = "SELECT tipus FROM nap WHERE dt='%s' AND munkatervId=%u";
-        return db_query($q, array('fv' => 'getNapTipus', 'modul' => 'naplo', 'result' => 'value', 'values' => array($dt, $munkatervId)));
-
-    }
-*/ 
-    function getTanevNapjai($munkatervId = 1, $olr = null) {
-
-	$q = "SELECT * FROM nap WHERE munkatervId=%u ORDER BY dt";
-	return db_query($q, array('fv' => 'getTanevNapjai', 'modul' => 'naplo', 'result' => 'indexed', 'values' => array($munkatervId)), $olr);
-
-    }
-
-    function getHonapNapjai($ho, $munkatervId = 1, $olr = null) {
-    /*
-	$munkatervId lehet tömb is! (pl. egy tanuló több osztályba is tartozik)
-
-	Ekkor a függvény lekérdezi az adott munkatervId-khez tartozó napokat, rendezi őket, hogy minden nap elöl legyenek
-	a tanítási, speciális tanítási, majd a tanítás nélküli munkanapok, végül a tanítási szünetek, majd ezekből az elsőt
-	- tehát a "legszigorúbbat" - adja csak vissza az adott napra.
-    */
-
-	if (is_array($munkatervId) && count($munkatervId)==0) $munkatervId=1;
-	if (is_array($munkatervId)) {
-	    $q = "SELECT * FROM nap WHERE month(dt)=%u AND munkatervId in (".implode(",", array_fill(0, count($munkatervId), '%u')).") 
-		    ORDER BY dt,
-		    CASE tipus WHEN 'tanítási nap' THEN 1 WHEN 'speciális tanítási nap' THEN 2 WHEN 'tanítás nélküli munkanap' THEN 3 ELSE 4 END";
-
-	    $r = db_query($q, array('fv' => 'getHonapNapjai', 'modul' => 'naplo', 'result' => 'indexed', 'values' => mayor_array_join(array($ho), $munkatervId)), $olr);
-	    $elozoDt = ''; $ret = array();
-	    // Az adott napi munkatervek közül csak egyet adjunk vissza - a legszigorúbbat
-	    for ($i = 0; $i < count($r); $i++) {
-		if ($elozoDt <> $r[$i]['dt']) $ret[] = $r[$i];
-		$elozoDt = $r[$i]['dt'];
-	    }
-	} else {
-	    $q = "SELECT * FROM nap WHERE month(dt)=%u AND munkatervId=%u ORDER BY dt";
-	    $ret = db_query($q, array('fv' => 'getHonapNapjai', 'modul' => 'naplo', 'result' => 'indexed', 'values' => array($ho, $munkatervId)), $olr);
-	}
-	return $ret;
-
-    }
-
-// -- korábbi haladasi.php-ből...
-
-    function getTanarOrak($tanarId, $SET = array('tolDt'=>'', 'igDt'=>'', 'ora'=> '', 'result' => 'indexed', 'tipus' => null)) {
-    
-	if ($SET['csakId'] === true || $SET['result'] == 'csakId') $SET['result'] = 'idonly';
-
-	$tolDt = readVariable($SET['tolDt'], 'datetime', date('Y-m-d'));
-	$igDt  = readVariable($SET['igDt'],  'datetime', $tolDt);
-
-	if ($SET['ora']!='') { // akkor egyetlen óraid adatai a kérdés!
-	    $WHERE = ' AND ora=%u';
-	    $v = array($SET['ora']);
-	} else {
-	    $WHERE = '';
-	    $v = array();
-	}
-	
-	if (is_array($SET['tipus']) && count($SET['tipus']) > 0) {
-	    $WHERE .= " AND tipus IN ('".implode("','", array_fill(0, count($SET['tipus']), '%s'))."')";
-	    $v = mayor_array_join($v, $SET['tipus']);
-	}
-	
-	if ($SET['result'] === 'idonly') {
-	    $q = "SELECT oraId FROM ora WHERE dt>='%s' and dt<='%s' AND ki=%u $WHERE ORDER BY dt,ora";
-	    array_unshift($v, $tolDt, $igDt, $tanarId);
-	    $RESULT = db_query($q, array('modul' => 'naplo', 'fv' => 'getTanarOrak', 'result' => 'idonly', 'values' => $v));			 
-	} else {
-	    $q = "SELECT * FROM ora WHERE dt>='%s' and dt<='%s' AND (ki=%u OR kit=%u) $WHERE ORDER BY dt,ora";
-	    array_unshift($v, $tolDt, $igDt, $tanarId, $tanarId);
-	    if ($SET['result']=='assoc') 
-		$RESULT = db_query($q, array('modul' => 'naplo', 'fv' => 'getTanarOrak', 'keyfield' => 'ora', 'result' => 'assoc', 'values' => $v));
-	    else 
-		$RESULT = db_query($q, array('modul' => 'naplo', 'fv' => 'getTanarOrak', 'result' => 'indexed', 'values' => $v));
-	    if ($SET['result']=='likeOrarend') {
-
-		for ($i = 0; $i < count($RESULT); $i++) {
-
-		    $_put = $RESULT[$i];
-		    $_put['oo'] = false;
-		    $RE['orak'][$RESULT[$i]['dt']][$RESULT[$i]['ora']][$RESULT[$i]['tankorId']] = $_put;
-		    if (!@in_array($RESULT[$i]['tankorId'], $RE['tankorok'])) $RE['tankorok'][] = $RESULT[$i]['tankorId'];
-
-		}
-		$RESULT = $RE;
-	    }
-	}
-	return $RESULT;
-    }
-
-    function getOrak($TANKORIDK, $SET=array('tolDt'=>'','igDt'=>'', 'result'=>'likeOrarend', 'elmaradokNelkul'=>false)) {
-
-	/* FIGYELEM! A függvény feltételezi, hogy az átadott tankoridkben az adott intervallumon helyes adatok szerepelnek!
-	    -- problémát okozhat, ha hosszú intervallumot adunk meg!!! -- lásd FS#100 */
-	if (!is_array($TANKORIDK) || count($TANKORIDK)==0) return false;
-	$tolDt = readVariable($SET['tolDt'], 'datetime', date('Y-m-d'));
-	$igDt  = readVariable($SET['igDt'],  'datetime', $tolDt);
-
-	$RE = false; $v = $TANKORIDK;
-	array_unshift($v, $tolDt, $igDt);
-	if ($SET['result']=='csakId' || $SET['csakId']===true) {
-	    $q = "SELECT oraId FROM ora WHERE dt>='%s' and dt<='%s' AND tankorId IN (".implode(',', array_fill(0, count($TANKORIDK), '%u')).")";
-	    $RE = db_query($q, array('modul' => 'naplo', 'fv' => 'getOrak', 'result' => 'idonly', 'values' => $v));
-	} elseif ($SET['result']=='forXml') {
-	    $q = "SELECT *,getOraTolTime(ora.oraId) AS tolTime,getOraIgTime(ora.oraId) AS igTime FROM ora WHERE dt>='%s' and dt<='%s' AND tankorId IN (".implode(',', array_fill(0, count($TANKORIDK), '%u')).")";
-	    $RE = db_query($q, array('modul' => 'naplo', 'fv' => 'getOrak', 'result' => 'indexed', 'values' => $v));
-	} else {
-	    if ($SET['elmaradokNelkul'])
-		$q = "SELECT *,getOraTolTime(ora.oraId) AS tolTime,getOraIgTime(ora.oraId) AS igTime FROM ora WHERE dt>='%s' and dt<='%s' AND tankorId IN (".implode(',', array_fill(0, count($TANKORIDK), '%u')).") 
-			AND tipus NOT IN ('elmarad','elmarad máskor')";
-	    else 
-		$q = "SELECT *,getOraTolTime(ora.oraId) AS tolTime,getOraIgTime(ora.oraId) AS igTime FROM ora WHERE dt>='%s' and dt<='%s' AND tankorId IN (".implode(',', array_fill(0, count($TANKORIDK), '%u')).")";
-	    $R = db_query($q, array('modul' => 'naplo', 'fv' => 'getOrak', 'result' => 'indexed', 'values' => $v));
-	    $RE['tankorok']=array();
-	    for ($i = 0; $i < count($R); $i++) {
-		$_put = $R[$i];
-		$_put['oo'] = false;
-		$RE['orak'][$R[$i]['dt']][$R[$i]['ora']][$R[$i]['tankorId']] = $_put;
-		if (!in_array($R[$i]['tankorId'],$RE['tankorok'])) $RE['tankorok'][] = intval($R[$i]['tankorId']);
-	    }
-	}
-	return $RE;
-    }
-
-    /* EZT A FÜGGVÉNYT ÁT KELL NÉZNI, csak másolva, javaslat: összevonás az előzővel */
-    function getOrakByTeremId($teremId, $SET=array('tolDt'=>'','igDt'=>'', 'result'=>'likeOrarend', 'elmaradokNelkul'=>false)) {
-
-	/* FIGYELEM! A függvény feltételezi, hogy az átadott tankoridkben az adott intervallumon helyes adatok szerepelnek!
-	    -- problémát okozhat, ha hosszú intervallumot adunk meg!!! -- lásd FS#100 */
-	if ($teremId=='') return false;
-	$tolDt = readVariable($SET['tolDt'], 'datetime', date('Y-m-d'));
-	$igDt  = readVariable($SET['igDt'],  'datetime', $tolDt);
-	$v = array($tolDt,$igDt,$teremId);
-
-	if ($SET['result']=='csakId' || $SET['csakId']===true) {
-	    $q = "SELECT oraId FROM ora WHERE dt>='%s' and dt<='%s' AND teremId=%u";
-	    $RE = db_query($q, array('modul' => 'naplo', 'fv' => 'getOrak', 'result' => 'idonly', 'values' => $v));
-	} elseif ($SET['result']=='forXml') {
-	    $q = "SELECT * FROM ora WHERE dt>='%s' and dt<='%s' AND teremId=%u";
-	    $RE = db_query($q, array('modul' => 'naplo', 'fv' => 'getOrak', 'result' => 'indexed', 'values' => $v));
-	} else {
-	    if ($SET['elmaradokNelkul'])
-		$q = "SELECT * FROM ora WHERE dt>='%s' and dt<='%s' AND teremId=%u
-			AND tipus NOT IN ('elmarad','elmarad máskor')";
-	    else 
-		$q = "SELECT * FROM ora WHERE dt>='%s' and dt<='%s' AND teremId=%u";
-	    $R = db_query($q, array('modul' => 'naplo', 'fv' => 'getOrak', 'result' => 'indexed', 'values' => $v));
-	    for ($i = 0; $i < count($R); $i++) {
-		$_put = $R[$i];
-		$_put['oo'] = false;
-		$RE['orak'][$R[$i]['dt']][$R[$i]['ora']][$R[$i]['tankorId']] = $_put;
-		if (!@in_array($R[$i]['tankorId'],$RE['tankorok'])) $RE['tankorok'][] = $R[$i]['tankorId'];
-	    }
-	}
-	return $RE;
-    }
-    /* --- --- --- */
-
-    function getOralatogatasByOraIds($oraIds, $SET = array('result' => 'assoc')) {
-
-	if (!is_array($oraIds) || count($oraIds) == 0) return array();
-
-	$q = "SELECT * FROM oraLatogatas WHERE oraId IN (".implode(',', array_fill(0, count($oraIds), '%u')).") ORDER BY oraId";
-	$v = $oraIds;
-	$ret = db_query($q, array('modul' => 'naplo', 'fv' => 'getOraLatogatasByOraIds', 'result' => $SET['result'], 'keyfield' => 'oraId', 'values' => $v));
-	if ($SET['result'] == 'assoc') {
-	    if (is_array($ret)) foreach ($ret as $oraId => $olAdat) {
-		$ret[$oraId]['tanarIds'] = getOraLatogatoByLatogatasId($olAdat['oraLatogatasId']);
-	    }
-	} elseif ($SET['result'] == 'indexed') {
-	    if (is_array($ret)) foreach ($ret as $i => $olAdat) {
-		$ret[$i]['tanarIds'] = getOraLatogatoByLatogatasId($olAdat['oraLatogatasId']);
-	    }
-	}
-	return $ret;
-
-    }
-
-    function getOraLatogatoByLatogatasId($latogatasId) {
-	$q = "SELECT tanarId FROM oraLatogatasTanar WHERE oraLatogatasId=%u";
-	return db_query($q, array('modul' => 'naplo', 'fv' => 'getOraLatogatoByLatogatasId', 'result' => 'idonly', 'values' => array($latogatasId)));
-    }
-
-    function getFeladatTipus() {
-	$q = "SELECT * FROM feladatTipus";
-	return db_query($q, array('modul' => 'naplo_intezmeny', 'fv' => 'getFeladatTipus', 'result' => 'assoc', 'keyfield'=>'feladatTipusId'));
-    }
-
-    function getOraTerhelesByTanarId($SET = array()) { // -- DEPRECATED
-	$q = "SELECT feladatTipusId,count(*) AS db FROM ora WHERE ki=%u AND dt>='%s' AND dt<='%s' AND feladatTipusId IS NOT NULL GROUP BY feladatTipusId";
-	$v = array($SET['tanarId'],$SET['tolDt'],$SET['igDt']);
-	return db_query($q, array('modul' => 'naplo', 'fv' => 'getOraTerheles', 'result' => 'assoc', 'keyfield'=>'feladatTipusId','values'=>$v));
-    }
-
-    function getOraTerhelesStatByTanarId($SET = array(), $olr='') {
-	/* ha a tanítási hetet úgy értelmezzük, hogy az a hét, amin az adott DT van, de nem így teszünk!
-	  ehelyett az elmúlt 5 tanítási napot vizsgáljuk (egyéb értelmes szempontként)
-	*/
-
-	if (isset($SET['tanarId']) && !is_array($SET['tanarId']) && is_numeric($SET['tanarId'])) $SET['tanarId'] = array($SET['tanarId']);
-
-	$dt=($SET['dt']=='')?date('Y-m-d'):$SET['dt'];
-	/* azt is biztosítani kell, hogy a megadott dt tanítási nap legyen */
-	$dt = (getTanitasiNapVissza(0,$dt));
-
-	if ($SET['tolDt']!='' && $SET['igDt']!='') { // akkor nem prediktálható az eredmény... mit is kéne számolnunk? ezt nem engedjük
-	    $_SESSION['alert'][] = '::';
-	} else {
-	    $tolDt = getTanitasiNapVissza(4,$dt);
-	    $igDt = $dt;
-	}
-	initTolIgDt(__TANEV, $tolDt, $igDt);
-	$v_default = array($tolDt, $igDt);
-	if (is_array($SET['tanarId']) && count($SET['tanarId']) > 0) {
-	    $w = " AND ki IN (" . implode(",", array_fill(0, count($SET['tanarId']), '%u')) . ") GROUP BY ki";
-	    $w1 = " WHERE tanarId IN (" . implode(",", array_fill(0, count($SET['tanarId']), '%u')) . ")";
-	    $v = $SET['tanarId'];
-	} else {
-	    $w = " GROUP BY ki";
-	    $w1 = '';
-	}
-	$lr = ($olr=='') ? db_connect('naplo'):$olr;
-
-	/* tanár kötelező óraszámának beállítása -- lehetne máshol is*/
-	$q = "SELECT tanarId, hetiLekotottMinOraszam,hetiLekotottMaxOraszam,hetiKotottMaxOraszam,hetiMunkaora FROM ".__INTEZMENYDBNEV.".tanar".$w1;
-	$R = db_query($q,array('modul'=>'naplo','result'=>'indexed','values'=>$v),$lr);
-	for ($i=0;$i0) ? intval($R[$i]['hetiMunkaora']):40;
-	    $RES[$R[$i]['tanarId']]['munkaido']['kotott'] = ($R[$i]['hetiKotottMaxOraszam']>0) ? intval($R[$i]['hetiKotottMaxOraszam']) :
-		(($R[$i]['hetiMunkaora']>0) ? intval($R[$i]['hetiMunkaora']*0.8):32);
-	    $RES[$R[$i]['tanarId']]['munkaido']['lekotott'] = ($R[$i]['hetiLekotottMaxOraszam']>0) ? intval($R[$i]['hetiLekotottMaxOraszam']) :
-		(($R[$i]['hetiMunkaora']>0) ? intval($R[$i]['hetiMunkaora']*0.65):26);
-	}
-	/* ---- */
-
-	// összes típus
-	$TYPE = array(
-	    'ossz'=> " (tipus NOT IN ('elmarad','elmarad máskor'))",
-	    'kotottEloirt'=> " (tipus IN ('helyettesítés','normál','normál máskor') OR (tipus='egyéb' AND eredet='órarend'))",
-	    'kotott'=> " (tipus IN ('helyettesítés','normál','normál máskor') OR (tipus='egyéb'))",
-	    'lekotott'=>" (tipus IN ('helyettesítés','normál','normál máskor'))",
-	    'over'=> " tipus = 'helyettesítés' AND munkaido='fennmaradó'"
-	);
-	foreach($TYPE as $munkaidoTipus => $TIPUSOK)
-	{
-	    $q = "SELECT ki AS tanarId,count(*) AS db FROM ora WHERE $TIPUSOK AND dt>='%s' AND dt<='%s'".$w;
-	    $v = mayor_array_join($v_default,$SET['tanarId']);
-	    $R= db_query($q, array('fv'=>'getOraTerhelesStatByTanarid','values'=>$v,'result'=>'indexed'),$lr);
-	    for ($i=0;$i'getOraTerhelesStatByTanarid','values'=>$v,'result'=>'indexed'),$lr);
-	    for ($i=0;$i'getOraTerhelesStatByTanarid','values'=>$v,'result'=>'indexed'),$lr);
-//	    for ($i=0;$i'getOraTerhelesStatByTanarid','values'=>$v,'debug'=>false,'result'=>'indexed'),$lr);
-	for ($i=0;$i'naplo','fv'=>'getOraStatByTankorId','values'=>$v,'result'=>'indexed'),$lr);
-	$R['éves'] = reindex($r,array('eredet','tipus'));
-
-	$q = "SELECT tipus,eredet,count(*) AS db FROM ora WHERE
-	    dt >= '%s' - INTERVAL DAYOFWEEK('%s')+6 DAY
-	    AND dt < '%s' - INTERVAL DAYOFWEEK('%s')-1 DAY
-	    AND tankorId =%u GROUP BY tipus,eredet";
-	$v = array($dt,$dt,$dt,$dt,$tankorId);
-	$r= db_query($q, array('debug'=>false,'modul'=>'naplo','fv'=>'getOraStatByTankorId','values'=>$v,'result'=>'indexed'),$lr);
-	$R['heti'] = reindex($r,array('eredet','tipus'));
-
-	return $R;
-
-    }
-
-    function oraMostVane($oraId) {
-	$most = false;
-	if ($oraId!='') {
-	    $q = "select DISTINCT 
-		IF(tolTimefalse,'fv'=>'oraMostVane','modul'=>'naplo','values'=>$v,'result'=>'indexed'));
-	    if (count($R)>1) { // többféle eredményt kaptunk
-		$most = false;	
-	    }
-	    $most = ($R[0]['mostVan']) ? true : false;
-	}
-	return $most;
-    }
-
-    function getOrakMost() {
-	$q = "select oraId,IF(tolTimefalse,'fv'=>'oraMostVane','modul'=>'naplo','values'=>$v,'result'=>'idonly'));
-	return $R;
-    }
-
-    function getDiakOra($diakId,$dt,$ora,$olr_intezmeny = '',$olr_naplo) { // jelenlét mezőt nem vesszük figyelembe!!!
-
-	// diakId->tankor->ora
-
-	$TANKOR = getTankorByDiakId($diakId, __TANEV, array('csakId' => true, 'tolDt' => $dt, 'igDt' => $dt, 'override' => false, 'result'=>'indexed'),$olr_intezmeny); // jelenlét!!!
-	// --TODO!!! minden jelenlét számít, még az is ami nem kötelező :(
-	if (count($TANKOR)>0 ) {
-	    $q = "SELECT *,getNev(tankorId,'tankor') AS tankorNev FROM ora WHERE dt='%s' AND ora=%u AND tankorId IN (".implode(',',$TANKOR).")";
-	    $v = array($dt,$ora);
-	    $R = db_query($q,array('debug'=>false,'fv'=>'getDiakOra','modul'=>'naplo','values'=>$v,'result'=>'indexed'),$olr_naplo);
-	    if (count($R)==1) return $R[0];
-	}
-	return false;
-    }
-
-?>
diff --git a/mayor-orig/www/include/modules/naplo/share/oraModifier.php b/mayor-orig/www/include/modules/naplo/share/oraModifier.php
deleted file mode 100644
index 9165ac7c..00000000
--- a/mayor-orig/www/include/modules/naplo/share/oraModifier.php
+++ /dev/null
@@ -1,148 +0,0 @@
- 'oraBeirhato')):$olr;
-	$q = "SELECT * FROM ora WHERE oraId = %u";
-	$values = array('oraId'=>$oraId);
-	$oraAdat = db_query($q, array('fv'=>'oraBeirhato','modul'=>'naplo','result'=>'record','values'=>$values),$lr);
-        if ($olr == '') db_close($lr);
-        return modosithatoOra($oraAdat);
-    }
-
-    function modosithatoOra($haladasiOraAdat) { // lásd még: oraBeirhato($oraId)
-
-        global $_TANEV;
-        if (!defined('_HALADASI_HATARIDO')) $_SESSION['alert'][] = 'info::modosithatoOra.not defined._HALADASI_HATARIDO';
-	// if (!defined('__USERTANARID')) return false;
-        /* feladat típusokra vonatkozó beállítások */
-        $Feladat = is_numeric($haladasiOraAdat['feladatTipusId']) && $haladasiOraAdat['tipus']=='egyéb'; // 22-26 óra feletti kötött munkaidőbe tartó feladat
-        $tanarFeladat = $Feladat && defined('__USERTANARID') && __USERTANARID==$haladasiOraAdat['ki']; // ... amit az épp bejelentkezett tanár tart
-        $sajatTanarFeladat  = $tanarFeladat && $haladasiOraAdat['eredet']=='plusz'; // ... és ő is vett fel
-        $eloirtTanarFeladat = $tanarFeladat && $haladasiOraAdat['eredet']=='órarend'; // ... illetve, amit számára a vezetőség előírt (nem törölhető)
-        $time = strtotime($haladasiOraAdat['dt']);
-        $ki = $haladasiOraAdat['ki'];
-        $normalOra = (in_array($haladasiOraAdat['tipus'],array('normál','normál máskor')));
-        for ($i = 0;
-            (
-                ($i < ($count = count($haladasiOraAdat['tanar'])))
-                && ($haladasiOraAdat['tanar'][$i]['tanarId'] != __USERTANARID)
-            );
-            $i++
-        );
-        $tanara = ($i < $count) || $haladasiOraAdat['ki']==__USERTANARID; // nem mindig van 'tanar' adat! Az nem része az ora rekordnak
-
-	return ($_TANEV['szemeszter'][1]['statusz'] == 'aktív') // Csak aktív szemeszterbe írhatunk
-                && (
-                    ((__VEZETOSEG || __NAPLOADMIN) && $Feladat && $haladasiOraAdat['eredet']=='órarend')
-                    || $time <= time()
-                )       // A jövőbeli órák nem írhatók be, kivéve, ha az előírt tanári feladat (pl versenyfelügyelet)!
-                && (
-                    // Az admin bármikor módosíthat - de csak vezetői utasításra teszi!
-                    __NAPLOADMIN
-                    // Az igazgató naplózárásig pótolhat, javíthat - utána elvileg nyomtatható a napló!
-                    || (__VEZETOSEG and strtotime(_ZARAS_HATARIDO) <= $time)
-                    || (
-                        __TANAR
-                        && (
-                            // a számára felvett óra nem módosítható
-                            !$eloirtTanarFeladat
-                            && (
-                                // tanár a saját tanköreinek óráit a _HALADASI_HATARIDO-ig módosíthatja
-                                ($normalOra && $tanara && (strtotime(_HALADASI_HATARIDO) <= $time))
-                                // tanár az általa helyettesített/felügyelt/összevont órát _visszamenőleg_ a _HELYETTESITES_HATARIDO-ig módosíthatja
-                                || (!$normalOra && (__USERTANARID == $ki) && (strtotime(_HELYETTESITES_HATARIDO) <= $time) && $Feladat===false)
-                                // a kötött munkaidőben végzett feladatok _HALADASI_HATARIDŐIG módosíthatók
-                                || ($tanarFeladat && (strtotime(_HALADASI_HATARIDO) <= $time))
-                            )
-                        )
-                    )
-                );
-
-    }
-
-    function ujOraFelvesz($ADAT,$olr='') { // --TODO: a függvény figyelhetné a tagok óraütközését!
-        $lr = $olr=='' ? db_connect('naplo', array('fv' => 'ujOraFelvesz')):$olr;
-        $q = "SELECT count(*) FROM ora WHERE dt='%s' AND ora=%u AND ki=%u";
-        $values = array($ADAT['dt'],$ADAT['ora'],$ADAT['ki']);
-        $c = db_query($q, array('fv'=>'ujOraFelvesz/1','modul'=>'naplo','result'=>'value','values'=>$values),$lr);
-        if ($c==0) { // csak ha még nincs adott nap adott órájára rögzítve "feladata"
-	    if ($ADAT['feladatTipusId']==0) $ADAT['feladatTipusId']='NULL';
-	    if ($ADAT['tankorId']==0) $ADAT['tankorId']='NULL';
-            $q = "INSERT INTO `ora` (`dt`,`ora`,`ki`,`tipus`,`eredet`,`feladatTipusId`,`munkaido`,`leiras`,`tankorId`) VALUES ('%s',%u,%u,'%s','%s',%s,'%s','%s',%s)";
-            $values = array($ADAT['dt'],$ADAT['ora'],$ADAT['ki'],$ADAT['tipus'],$ADAT['eredet'],$ADAT['feladatTipusId'],$ADAT['munkaido'],$ADAT['leiras'],$ADAT['tankorId']);
-            $RESULT = db_query($q, array('fv'=>'ujOraFelvesz','modul'=>'naplo','result'=>'insert','values'=>$values),$lr);
-        }
-        if ($olr == '') db_close($lr);
-        return $RESULT;
-    }
-
-    function updateHaladasiNaploOra($oraId, $leiras, $csoportAdat = '', $ki = '', $olr = '') {
-
-        $RESULT = true;
-
-        $lr = $olr=='' ? db_connect('naplo', array('fv' => 'updateHaladasiNaploOra')):$olr;
-        // A módosítás előtti állapot lekérdezése
-        $oraAdat = getOraAdatById($oraId, __TANEV, $lr);
-        $dt = $oraAdat['dt'];
-        // Melyik tankör lesz a módosítás után
-        if ($csoportAdat != '') list($csoportId, $tankorId) = explode(':', $csoportAdat);
-        else $tankorId = $oraAdat['tankorId'];
-
-        // force to be numeric (CHECK)
-        $csoportId = intval($csoportId);
-        $tankorId = intval($tankorId);
-
-        $oraAdat['tanar'] =  getTankorTanaraiByInterval($tankorId, array('tanev' => __TANEV, 'tolDt' => $dt, 'igDt' => $dt, 'result' => 'nevsor'), $lr);
-        // Melyik ki id lesz módosítás után
-        if ($ki != '') $tanarId = $ki; else $tanarId = $oraAdat['ki'];
-        if (modosithatoOra($oraAdat)) {
-
-            // Tananyag beírása
-            $q = "UPDATE ora SET leiras='%s'";
-            $v = array($leiras);
-            if ($ki != '') { // Ha több tanára van a tankörnek, akkor az átváltható
-                $i = 0;
-                while ($i < ($db = count($oraAdat['tanar'])) && $ki != $oraAdat['tanar'][$i]['tanarId']) $i++;
-                if ($i < $db) {
-                    $q .= ",ki=%u";
-                    $v[] = $ki;
-                }
-            }
-            //!!! A csoportok tankörei válthatóak - ha ugyanaz a tanár tartja
-            if ($csoportAdat != '' && $oraAdat['tankorId'] != $tankorId) {
-                $q2 = "SELECT COUNT(tankorId) FROM tankorCsoport LEFT JOIN ".__INTEZMENYDBNEV.".tankorTanar USING (tankorId)
-                    WHERE csoportId = %u AND tanarId = %u
-                    AND tankorId IN (%u,%u)
-                    AND (kiDt IS NULL OR kiDt>='%s') AND beDt<='%s'";
-                $v2 = array($csoportId, $tanarId, $tankorId, $oraAdat['tankorId'], $dt, $dt);
-                $num = db_query($q2, array('fv' => 'updateHaladasiNaploOra', 'modul' => 'naplo', 'result' => 'value', 'values' => $v2), $lr);
-                if (!$num) {
-                    $_SESSION['alert'][] = 'message:wrong_data:updateHaladasiNaploOra:'.$num.':'.$csoportId;
-                    $RESULT = false;
-                } elseif ($num == 2) {
-                    $q .= ",tankorId=%u";
-                    $v[] = $tankorId;
-                } else {
-                    $_SESSION['alert'][] = 'message:wrong_data:updateHaladasiNaploOra:'.$num.':'.$csoportId;
-                    $RESULT = false;
-                }
-            }
-            if ($RESULT!==false) {
-                $q .= " WHERE oraId=%u";
-                $v[] = $oraId;
-                $RESULT = db_query($q, array('fv' => 'updateHaladasiNaploOra', 'modul' => 'naplo', 'values' => $v), $lr);
-                //$_SESSION['alert'][] = $q;
-            }
-        } else {
-//          $RESULT = false; // igaziból nincs hiba, hisz nem csináltunk semmit
-            $_SESSION['alert'][] = 'message:wrong_data:nem modosithato ora!!!';
-        }
-        if ($olr == '') db_close($lr);
-
-        return $RESULT;
-
-    }
-
-?>
\ No newline at end of file
diff --git a/mayor-orig/www/include/modules/naplo/share/orarend.php b/mayor-orig/www/include/modules/naplo/share/orarend.php
deleted file mode 100644
index 5ae3a43a..00000000
--- a/mayor-orig/www/include/modules/naplo/share/orarend.php
+++ /dev/null
@@ -1,422 +0,0 @@
-'','igDt'=>'')) {
-	// tankörök lekérdezése
-        $tolDt = $SET['tolDt']; $igDt = $SET['igDt'];
-	initTolIgDt(__TANEV, $tolDt, $igDt);
-	$NAPOK = _genNapok($tolDt,$igDt); 
-	// dátumfüggő FS#100
-	for ($i=0; $itrue,'tolDt'=>$_dt, 'igDt'=>$_dt));
-	}
-	return getOrarend($TANKORIDK, array('tolDt'=>$tolDt, 'igDt'=>$igDt));
-    }
-    
-    // ++
-    function getOrarendByTanarId($tanarId, $SET=array('tolDt'=>'','igDt'=>'', 'telephely'=>null, 'orarendiOraTankor'=>false)) {
-        $tolDt = $SET['tolDt']; $igDt = $SET['igDt'];
-	initTolIgDt(__TANEV, $tolDt, $igDt);
-	$NAPOK = _genNapok($tolDt,$igDt); 
-	// dátumfüggő FS#100
-	for ($i=0; $itrue,'tolDt'=>$_dt, 'igDt'=>$_dt));
-	}
-	/* Figyelem! Az első talált munkatervet vesszük itt figyelembe!!! */
-	$munkatervIds = getMunkatervByTanarId($tanarId, array('result' => 'idonly', 'tanev'=>__TANEV, 'tolDt'=>$tolDt, 'igDt'=>$igDt));
-	$RESULT = getOrarend($TANKORIDK, array('tolDt'=>$tolDt, 'igDt'=>$igDt, 'telephely'=>$SET['telephely'], 'munkatervId'=>$munkatervIds));
-	/* --------------------------------------------*/
-	if ($SET['orarendiOraTankor']===true 
-	    && is_null($SET['telephely'])
-	) {
-	    /* és kérdezzük le nem tankörId-kkel is... */
-	    // Ez a rész csak az orarendiOra Tankörös részhez kell... Ene ... tényleg kell? :) //
-	    // Kelljen. Ha a getOrarend nem tud dűlőre jutni, még mindig látszik valami... [k]
-	    /* A tanítási hét kitalálása */
-	    // erre valójában nincs szükség */
-/*
-	    $het = getOrarendiHetByDt($tolDt, array('alert'=>false)); 		// Ez NULL-t ad vissza, ha nincs bejegyzés!!!
-	    if (is_null($het)) {// nincs a nap táblában ilyen bejegyzés, de megkereshetjük a következő tanítási napot. 
-				// (ez persze ahhoz vezet, hogy ha 7 napnál nagyobb a különbség, akár hetek is ugorhatnak
-		//$kovTanNap = getTanitasiNap('elore',1,"$tolDt 08:00:00");
-		$het = getOrarendiHetByDt($kovTanNap);
-	    }
-*/	    /* -- */
-
-	    /* !! Így egy nap többször is szerepelhet !! Ugye ez nem baj?? */
-	    $munkatervId = $munkatervIds; //hack myself
-	    if (!is_array($munkatervId) || count($munkatervId) == 0) {
-		return false;
-	    }
-	    $q = "SELECT dt,orarendiHet,DAYOFWEEK(dt)-1 AS nap,csengetesiRendTipus FROM nap WHERE dt>='%s' AND dt<='%s' 
-		    AND munkatervId IN (".implode(',', array_fill(0, count($munkatervId), '%u')).")";
-	    $v = mayor_array_join(array($tolDt, $igDt), $munkatervId);
-	    $RES = db_query($q, array('fv' => 'getOrarendByTanarId', 'modul' => 'naplo', 'result' => 'indexed', 'values' => $v));
-	    for($i=0; $i 'getOrarendByTanarId', 'modul' => 'naplo', 'result' => 'indexed', 'values' => $v));
-	    for($i=0; $i$RES[$i]['tankorId'], 
-				'tolDt'=>$RES[$i]['tolDt'],
-				'tanarId'=>$RES[$i]['tanarId'],
-				'targyJel'=>$RES[$i]['targyJel'],
-				'osztalyJel'=>$RES[$i]['osztalyJel'],
-				'teremId'=>$RES[$i]['teremId']);
-	    }
-
-	}
-	/* --------------------------------------- */	
-	return $RESULT;
-    }
-	
-    // ++
-    function getOrarendByDiakId($diakId, $SET = array('tolDt'=>'','igDt'=>'','osztalyId'=>'')) {
-        $tolDt = $SET['tolDt']; $igDt = $SET['igDt'];
-	initTolIgDt($tanev, $tolDt, $igDt);
-	$NAPOK = _genNapok($tolDt,$igDt); 
-	// dátumfüggő FS#100
-	for ($i=0; $itrue,'tolDt'=>$_dt,'igDt'=>$_dt));
-	}
-	if ($SET['osztalyId']!='') {
-	    $munkatervId = getMunkatervByOsztalyId($SET['osztalyId']);	
-	} else {
-	    $munkatervId = getMunkatervByDiakId($diakId, array('tolDt'=>$tolDt,'igDt'=>$igDt));
-	}
-	$RESULT = getOrarend($TANKORIDK, array('tolDt'=>$tolDt,'igDt'=>$igDt,'NAPOK'=>$NAPOK, 'munkatervId'=>$munkatervId));
-	return $RESULT;
-    }
-
-    // ++
-    function getOrarendByOsztalyId($osztalyId, $SET=array('tolDt'=>'','igDt'=>'')) {
-        $tolDt = $SET['tolDt']; $igDt = $SET['igDt'];
-	initTolIgDt(__TANEV, $tolDt, $igDt);
-	$NAPOK = _genNapok($tolDt,$igDt); 
-	// dátumfüggő FS#100
-	for ($i=0; $itrue,'tolDt'=>$_dt,'igDt'=>$_dt));
-	}
-	//
-	$munkatervId = getMunkatervByOsztalyId($osztalyId);
-	$RESULT = getOrarend($TANKORIDK, array('tolDt'=>$tolDt,'igDt'=>$igDt,'NAPOK'=>$NAPOK, 'munkatervId'=>$munkatervId));
-	return $RESULT;
-    }
-
-    // ++
-    function getOrarendByTankorId($tankorId, $SET=array('tolDt'=>'','igDt'=>'')) {
-        $tolDt = $SET['tolDt']; $igDt = $SET['igDt'];
-	initTolIgDt(__TANEV, $tolDt, $igDt);
-	$NAPOK = _genNapok($tolDt,$igDt); 
-	// dátumfüggő FS#100
-	for ($i=0; $i$tolDt,'igDt'=>$igDt));
-	return $RESULT;
-    }
-
-    // ++
-    function getOrarendByMkId($mkId, $SET=array('tolDt'=>'','igDt'=>'','telephely'=>null)) {
-        $tolDt = $SET['tolDt']; $igDt = $SET['igDt'];
-	initTolIgDt(__TANEV, $tolDt, $igDt);
-	$NAPOK = _genNapok($tolDt,$igDt); 
-	// dátumfüggő FS#100
-	for ($i=0; $itrue,'tolDt'=>$_dt,'igDt'=>$_dt));
-	}
-	$munkatervIds = getMunkatervek(array('result'=>'idonly'));
-	$RESULT = getOrarend($TANKORIDK, array('tolDt'=>$tolDt,'igDt'=>$igDt,'telephely'=>$SET['telephely'],'munkatervId'=>$munkatervIds));
-	return $RESULT;
-    }
-
-    function getOrarend($TANKOROK, $SET=array('tolDt'=>'','igDt'=>'', 'telephely'=>null, 'NAPOK' => null, 'munkatervId'=>null)) {
-
-	//a tankörök tömb szerkezete megváltozik rev1300
-	if (!is_array($TANKOROK) || count($TANKOROK)==0) return false;
-        $tolDt = $SET['tolDt']; $igDt = $SET['igDt'];
-	initTolIgDt(__TANEV, $tolDt, $igDt); // valljuk meg, ez kicsit tág intervallum lehet...
-	if (isset($SET['NAPOK']) && is_array($SET['NAPOK'])) {
-	    $NAPOK = $SET['NAPOK'];
-	} else {
-	    $NAPOK = _genNapok($tolDt,$igDt);
-	}
-
-	$tanevDb = tanevDbNev(__INTEZMENY, __TANEV);
-
-	if ($SET['telephely']!='' && is_string($SET['telephely'])) {
-	    $W_TELEPHELY1 = " LEFT JOIN terem USING (teremId)";
-	    $W_TELEPHELY2 = " WHERE telephely='".$SET['telephely']."'  ";
-	}
-	$RESULT['assocFormat']['$nap$']['$ora$']['orak']['$index$']=true;
-	$RESULT['tankorokFormat']['$index$'] = true;
-	$_TMPTANKORIDK = array();
-	$RESULT['telephelyIdk'] = array();
-	for ($nI=0; $nI'assoc','munkatervId'=>$SET['munkatervId']));
-	    $het = $RESULT['napok'][$nap]['het'];
-	    if (in_array($RESULT['napok'][$nap]['tipus'],array('tanítási nap','speciális tanítási nap')) && $het!=0) { // ha van egyáltalán beállított tanítás...
-		$_dt = $NAPOK[$nI];
-		$TIME = "igDt>='%s' AND tolDt<='%s' AND nap=%u"; // ez miírt van külön? [bb]
-		$_TK  = $TANKOROK[$_dt];
-		if (is_array($_TK) && count($_TK)>0) {
-		    $q = "SELECT orarendiOra.*,orarendiOraTankor.*,tankorTipus.jelleg,terem.telephelyId FROM $tanevDb.orarendiOra 
-			    ".$W_TELEPHELY1."
-			    LEFT JOIN $tanevDb.orarendiOraTankor USING (tanarId,osztalyJel,targyJel) 
-			    ".$W_TELEPHELY2."
-			    LEFT JOIN tankor USING (tankorId) LEFT JOIN tankorTipus USING (tankorTipusId)
-			    LEFT JOIN terem USING (teremId)
-			    HAVING $TIME AND het=%u AND tankorId IN (".implode(',', array_fill(0, count($_TK), '%u')).")
-			    AND tankorId IN (
-				SELECT tankorId FROM $tanevDb.nap 
-				LEFT JOIN $tanevDb.munkatervOsztaly USING (munkatervId)
-				LEFT JOIN tankorOsztaly USING (osztalyId)
-				WHERE tipus IN ('tanítási nap') AND dt='".$_dt."'
-			    )			    
-
-		    "; // nagy lekérdezés
-		    array_unshift($_TK, $_dt, $_dt, $nap, $het);
-		    $RES = db_query($q, array('fv' => 'getOrarend', 'modul' => 'naplo_intezmeny', 'values' => $_TK, 'result' => 'indexed'), $olr);
-		    /* asszoc tömböt szeretnénk, és kigyűjtük az érintett tanköröket */
-		    for($i = 0; $i < count($RES); $i++) {
-			if (!in_array($RES[$i]['telephelyId'],$RESULT['telephelyIdk']) && $RES[$i]['telephelyId']>0) $RESULT['telephelyIdk'][] = $RES[$i]['telephelyId'];
-			$RESULT['assoc'][$RES[$i]['nap']][$RES[$i]['ora']]['orak'][] = array('igDt'=>$RES[$i]['igDt'],'tolDt'=>$RES[$i]['tolDt'], 'het'=>$RES[$i]['het'],'tankorId'=>$RES[$i]['tankorId'], 'tanarId'=>$RES[$i]['tanarId'],'targyJel'=>$RES[$i]['targyJel'],'osztalyJel'=>$RES[$i]['osztalyJel'],'teremId'=>$RES[$i]['teremId'],'jelleg'=>$RES[$i]['jelleg'],'oo'=>true);
-			$_TMPTANKORIDK[$RES[$i]['tankorId']] = true; 
-		    }
-		    $RESULT['db'] += count($RES);
-		}
-	    }
-	}
-	if (is_array($_TMPTANKORIDK)) foreach ($_TMPTANKORIDK as $_tankorId => $_tmp) {
-	    $RESULT['tankorok'][] = $_tankorId;
-	}
-	// adjuk tovább az esetlegesen lekérdezett tankörlistát... (ez csak Id-k gyűjteménye)
-	$RESULT['mindenTankorByDt'] = $TANKOROK;
-	return $RESULT;
-	
-    }
-
-    function getOrarendByTeremId($teremId, $het = '', $SET=array('tolDt'=>'','igDt'=>'', 'telephely'=>null)) {
-
-	$diff = 5;
-
-        $tolDt = $SET['tolDt']; $igDt = $SET['igDt'];
-	initTolIgDt(__TANEV, $tolDt, $igDt); // valljuk meg, ez kicsit tág intervallum lehet...
-	if (isset($SET['NAPOK']) && is_array($SET['NAPOK'])) {
-	    $NAPOK = $SET['NAPOK'];
-	} else {
-	    $NAPOK = _genNapok($tolDt,$igDt);
-	}
-
-	if ($telephely!='') { 
-	    $W_TELEP = " AND telephely='%s'";
-	    $v = array($telephely);
-	} else {
-	    $W_TELEP = '';
-	    $v = array();
-	}
-
-//	for ($nap=1; $nap<=count($NAPOK); $nap++) {
-	for ($nI=0; $nI'assoc'));
-	    $het = $RESULT['napok'][$nap]['het'];
-	    if ($het!=0) { // ha van egyáltalán beállított tanítás...
-		$_dt = $NAPOK[$nI];
-		$TIME = "igDt>='%s' AND tolDt<='%s' AND nap=%u"; // miért van ez külön? [bb]
-		$q = "SELECT * FROM orarendiOra LEFT JOIN ".__INTEZMENYDBNEV.".terem USING (teremId) LEFT JOIN orarendiOraTankor USING (tanarId,osztalyJel,targyJel) HAVING $TIME 
-			AND het=%u AND teremId=%u".$W_TELEP;
-		array_unshift($v, $_dt, $_dt, $nap, $het, $teremId);
-		$RES = db_query($q, array('fv' => 'getOrarend', 'modul' => 'naplo', 'values' => $v, 'result' => 'indexed'), $olr);
-		/* és egészítsük ki bonyolultabb asszoc tömbbé */
-		for($i = 0; $i < count($RES); $i++) {
-		    if (!in_array($RES[$i]['telephelyId'],$RESULT['telephelyIdk']) && $RES[$i]['telephelyId']>0) $RESULT['telephelyIdk'][] = $RES[$i]['telephelyId'];
-		    $RESULT['assoc'][$RES[$i]['nap']][$RES[$i]['ora']]['orak'][] = array('het'=>$RES[$i]['het'],'tankorId'=>$RES[$i]['tankorId'], 'tanarId'=>$RES[$i]['tanarId'],'targyJel'=>$RES[$i]['targyJel'],'osztalyJel'=>$RES[$i]['osztalyJel'],'teremId'=>$RES[$i]['teremId']);
-		    if (!is_null($RES[$i]['tankorId'])) $RESULT['tankorok'][] = $RES[$i]['tankorId'];
-		}
-	    }
-	}
-	return $RESULT;
-
-    }
-
-
-
-    // Az adott dátum napján érvényes órarend lekérdezése
-    function getOrarendByDt($dt, $orarendiHet = array(1), $tanev = __TANEV) {
-	$tanevDb = tanevDbNev(__INTEZMENY, $tanev);
-	$q = "SELECT * FROM `%s`.orarendiOra LEFT JOIN `%s`.orarendiOraTankor USING (tanarId,osztalyJel,targyJel) 
-		WHERE het IN (".implode(',', array_fill(0, count($orarendiHet), '%u')).") AND tolDt<='%s' AND '%s' <= igDt
-		ORDER BY het,nap,ora,tanarId";
-	array_unshift($orarendiHet, $tanevDb, $tanevDb);
-	array_push($orarendiHet, $dt, $dt);
-	return db_query($q, array('fv' => 'getOrarendByDt', 'modul' => 'naplo', 'result' => 'indexed', 'values' => $orarendiHet));
-    }
-
-    function getOrarendiHetek($SET = array('tolDt' => '', 'igDt' => '', 'tanev' => __TANEV, 'csakOrarendbol' => false, 'felsoHatar' => 20)) {
-
-        $tolDt = readVariable($SET['tolDt'], 'datetime', null); 
-	$igDt  = readVariable($SET['igDt'],  'datetime', null); 
-	$csakOrarendbol = readVariable($SET['csakOrarendbol'], 'bool', false);
-	$tanev = readVariable($SET['tanev'], 'numeric unsigned', __TANEV);
-	$felsoHatar = readVariable($SET['felsoHatar'], 'numeric unsigned', 20);
-
-	initTolIgDt($tanev, $tolDt, $igDt);
-	$tanevDb = tanevDbNev(__INTEZMENY, $tanev);
-
-	$q = "SELECT DISTINCT het FROM `%s`.orarendiOra WHERE igDt>='%s' AND tolDt<='%s' AND het<%u ORDER BY het";
-        $ret = db_query($q, array('fv' => 'getOrarendiHetek', 'modul' => 'naplo', 'result' => 'idonly', 'values' => array($tanevDb, $tolDt, $igDt, $felsoHatar)));
-        if (!$csakOrarendbol) {
-            // nincs még egyetlen órarendi bejegyzés sem - vagyük a munkatervből (kell a tolDt-igDt megszorítás?)
-            $q = "SELECT DISTINCT orarendiHet FROM `%s`.nap WHERE orarendiHet != 0 AND orarendiHet<%u AND '%s'<=dt AND dt<='%s' ORDER BY orarendiHet";
-	    $ret = @array_values(@array_unique(@array_merge($ret,db_query($q, array('fv' => 'getOrarendiHetek', 'modul' => 'naplo', 'result' => 'idonly', 'values' => array($tanevDb,$felsoHatar,$tolDt,$igDt))))));
-        }
-
-        return $ret;
-    }
-
-    function getLastOrarend($SET = array('tanev' => __TANEV)) {
-	$v = array(tanevDbNev(__INTEZMENY, $SET['tanev']));
-	return db_query("SELECT max(het) FROM `%s`.orarendiOra", array('fv' => 'getLastOrarend', 'modul' => 'naplo_intezmeny', 'values' => $v, 'result' => 'value'));
-    }
-
-    function getMinOra($SET = array('tanev' => __TANEV)) {
-	$v = array(tanevDbNev(__INTEZMENY, $SET['tanev']));
-	return db_query("SELECT MIN(ora) FROM `%s`.orarendiOra", array('fv' => 'getMinOra', 'modul' => 'naplo_intezmeny', 'values' => $v, 'result' => 'value'));
-    }
-    function getMaxOra($SET = array('tanev' => __TANEV)) {
-	$v = array(tanevDbNev(__INTEZMENY, $SET['tanev']));
-	$ret = db_query("SELECT MAX(ora) FROM `%s`.orarendiOra", array('fv' => 'getMaxOra', 'modul' => 'naplo_intezmeny', 'values' => $v, 'result' => 'value'));
-	if (defined('__MAXORA_MINIMUMA') && __MAXORA_MINIMUMA>$ret) $ret = __MAXORA_MINIMUMA;
-	return $ret;
-    }
-    function getMaxNap($SET = array('tanev' => __TANEV, 'tolDt'=>null, 'igDt'=>null, 'haladasi'=>false)) {
-	if ($SET['tanev']=='') $SET['tanev'] = __TANEV;
-	$tanevDbNev = tanevDbNev(__INTEZMENY, $SET['tanev']);
-	$v = array($tanevDbNev);
-	$maxNap = db_query("SELECT max(nap) FROM `%s`.orarendiOra", array('fv' => 'getMaxNap', 'modul' => 'naplo_intezmeny', 'values' => $v, 'result' => 'value'));
-        $halMaxNap=0;
-	if ($SET['haladasi']===true) {
-	    $v = array($tanevDbNev,$SET['tolDt'],$SET['igDt']);
-	    $q = "select max(dayofweek(dt)-1) AS halMaxNap from `%s`.ora where dt>='%s' and dt<='%s'" ;
-	    $halMaxNap = 
-		db_query($q,
-		array('fv' => 'getMaxNap2', 'modul' => 'naplo', 'result' => 'value','values'=>$v));
-	}
-	return  (($halMaxNap>$maxNap)?$halMaxNap:$maxNap);
-    }
-
-    function getOrarendiHetByDt($dt, $SET = array('result' => '', 'alert'=>false, 'munkatervId'=>null)) {
-
-	/* ezt javíthatnánk!!! */
-	if ( (!is_array($SET['munkatervId']) && $SET['munkatervId'] != '') || (is_array($SET['munkatervId']) && count($SET['munkatervId'])>0)  ) {
-	    if (is_array($SET['munkatervId']))
-		$W = ' AND orarendiHet!=0 AND munkatervId IN ('.implode(',',$SET['munkatervId']).')';
-	    else	
-		$W = ' AND orarendiHet!=0 AND munkatervId = '.intval($SET['munkatervId']);
-	} else $W = '';
-
-	if ($dt == '') { 
-	    $return = getLastOrarend();
-	} else {
-	    if ($SET['result']=='assoc')
-		$return = db_query(
-		    "SELECT orarendiHet AS het,dt,tipus,megjegyzes,csengetesiRendTipus FROM nap WHERE dt='%s' ". $W,
-		    array('fv' => 'getOrarendiHetByDt', 'modul' => 'naplo', 'values' => array($dt), 'result' => 'record')
-		);
-	    else
-		$return = db_query(
-		    "SELECT orarendiHet FROM nap WHERE dt='%s' ".$W,
-		    array('fv' => 'getOrarendiHetByDt', 'modul' => 'naplo', 'values' => array($dt), 'result' => 'value')
-		);
-	}
-	if ($SET['alert']===true && is_null($return)) {
-	    $_SESSION['alert'][] = 'info:nincs_nap_bejegyzes:'.$dt;
-	}
-	return $return;
-    }
-
-    function getOrarendiOraTankor($tanev = __TANEV) {
-
-	$tanevDb = tanevDbNev(__INTEZMENY, $tanev);
-	$q = "SELECT * FROM `%s`.orarendiOraTankor";
-	return db_query($q, array('fv' => 'getOrarendiOraTankor', 'modul' => 'naplo_intezmeny', 'result' => 'indexed', 'values' => array($tanevDb)));
-
-    }
-
-    function getOrarendiOraAdat($SET = array('tanev' => __TANEV, 'dt' => null, 'tanarId' => null, 'het' => null, 'nap' => null, 'ora' => null)) {
-
-	$tanev = readVariable($SET['tanev'], 'numeric unsigned', (defined('__TANEV')?__TANEV:null));
-	$dt = readVariable($SET['dt'], 'datetime', null);
-	initTolIgDt($tanev, $dt, $dt);
-
-	// Ha van dátum, de nincs hét, nap óra, akkor azt a dátum alapján kellene beállítani)
-
-	if (isset($SET['tanarId']) && isset($SET['het']) && isset($SET['nap']) && isset($SET['ora']) && isset($dt) && isset($SET['tanev'])) {
-
-	    $tanevDb = tanevDbNev(__INTEZMENY, $SET['tanev']);
-	    $q = "SELECT * FROM `%s`.orarendiOra LEFT JOIN `%s`.orarendiOraTankor USING (tanarId,osztalyJel,targyJel)
-		    WHERE tolDt <= '%s' AND '%s' <= igDt AND tanarId=%u AND het=%u
-		    AND nap=%u AND ora=%u";
-	    $v = array($tanevDb, $tanevDb, $dt, $dt, $SET['tanarId'], $SET['het'], $SET['nap'], $SET['ora']);
-	    return db_query($q, array('fv' => 'getOrarendiOraAdat', 'modul' => 'naplo_intezmeny', 'result' => 'record', 'values' => $v));
-
-	} else {
-	    $_SESSION['alert'][] = 'message:empty_field:tanarId,het,nap,ora,tanev,dt';
-	    return false;
-	}
-
-    }
-
-    function getTankorHetiOraszam($tankorId, $SET = array('tanev' => __TANEV, 'dt' => null, 'het' => 1)) {
-
-	global $_TANEV;
-
-	$tanev =  readVariable($SET['tanev'], 'numeric unsigned', __TANEV);
-	if ($tanev == __TANEV) $TA = $_TANEV;
-	else $TA = getTanevAdat($tanev);
-	$dt = readVariable($SET['dt'], 'datetime', $TA['zarasDt']);
-	$het = readVariable($SET['het'], 'numeric unsigned', 1);
-	$tanevDb = tanevDbNev(__INTEZMENY, $tanev);
-	
-	$q = "SELECT COUNT(*) FROM `%s`.orarendiOra LEFT JOIN `%s`.orarendiOraTankor USING (tanarId,osztalyJel,targyJel)
-		WHERE tolDt<='%s' AND '%s'<=igDt AND tankorId=%u AND het=%u";
-	$v = array($tanevDb, $tanevDb, $dt, $dt, $tankorId, $het);
-	return db_query($q, array('fv' => 'getTankorHetiOraszam', 'modul' => 'naplo_intezmeny', 'result' => 'value', 'values' => $v));
-
-    }
-    function getCsengetesiRend() { // 'csengetesiRendTipus','telephelyId','nap','ora'
-	$SET['arraymap'] = array('csengetesiRendTipus','telephelyId','nap','ora');
-	$q = "SELECT * FROM csengetesiRend";
-	$result = db_query($q, array('fv'=>'getCsengetesiRend','modul'=>'naplo_intezmeny','result'=>'indexed'));
-	return reindex($result,$SET['arraymap']);
-    }
-
-?>
diff --git a/mayor-orig/www/include/modules/naplo/share/osztaly.php b/mayor-orig/www/include/modules/naplo/share/osztaly.php
deleted file mode 100644
index 86301c28..00000000
--- a/mayor-orig/www/include/modules/naplo/share/osztaly.php
+++ /dev/null
@@ -1,735 +0,0 @@
-=$tanev AND osztaly.kezdoTanev<=$tanev),
-		CONVERT(REPLACE(SUBSTRING(SUBSTRING_INDEX(evfolyamJelek, ',', ".$evfSorsz."),LENGTH(SUBSTRING_INDEX(evfolyamJelek, ',', ".$evfSorsz."-1))+1),',',''),UNSIGNED),
-		NULL
-	    )";
-}
-
-function _evfolyamJel($tanev = __TANEV) {
-    $tanev = intval($tanev);
-    $evfSorsz = $tanev.'-kezdoTanev+kezdoEvfolyamSorszam';
-    return "if (
-		(osztaly.vegzoTanev>=$tanev AND osztaly.kezdoTanev<=$tanev),
-		REPLACE(SUBSTRING(SUBSTRING_INDEX(evfolyamJelek, ',', ".$evfSorsz."),LENGTH(SUBSTRING_INDEX(evfolyamJelek, ',', ".$evfSorsz."-1))+1),',',''),
-		NULL
-	    )";
-}
-
-function _osztalyJel($tanev = __TANEV) {
-    $tanev = intval($tanev);
-    $evfSorsz = $tanev.'-kezdoTanev+kezdoEvfolyamSorszam';
-    return "if (
-		(osztaly.osztalyJellegId IS NOT NULL AND osztaly.vegzoTanev>=$tanev AND osztaly.kezdoTanev<=$tanev),
-		CONCAT(REPLACE(SUBSTRING(SUBSTRING_INDEX(evfolyamJelek, ',', ".$evfSorsz."),LENGTH(SUBSTRING_INDEX(evfolyamJelek, ',', ".$evfSorsz."-1))+1),',',''),'.',osztaly.jel),
-		CONCAT(osztaly.kezdoTanev,'/',osztaly.vegzoTanev,'.',osztaly.jel)
-	    )";
-}
-
-function getEvfolyam($osztalyId, $tanev, $osztalyAdat = null, $olr = null) {
-    return null;
-}
-
-function getEvfolyamJel($osztalyId, $tanev=__TANEV, $osztalyAdat = null, $_osztalyJellel = false, $olr=null) {
-
-    if (is_array($osztalyAdat)) {
-	$ret = $osztalyAdat;
-    } else {
-	// is_resource mysqli esetén nem jó (object)
-	if ($olr) $lr = $olr;
-	else $lr = db_connect('naplo_intezmeny');
-	$ret = getOsztalyAdat($osztalyId, $tanev, $lr);
-	// is_resource mysqli esetén nem jó (object)
-	if (!$olr) db_close($lr);
-    }
-    if ($ret['kezdoTanev']<=$tanev && $tanev<=$ret['vegzoTanev']) {
-	$evfSorsz = $tanev-$ret['kezdoTanev']+$ret['kezdoEvfolyamSorszam']; // ez 1 bázisú sorszám!!
-	$evfolyamJel = $ret['evfolyamJelek'][$evfSorsz-1];
-    } else {
-	if ($_osztalyJellel === true) $evfolyamJel = $ret['kezdoTanev'].'/'.$ret['vegzoTanev'];
-	else $evfolyamJel = false;
-    }
-
-    if ($_osztalyJellel === true) return $evfolyamJel.'.'.$ret['jel'];
-    else return $evfolyamJel;
-}
-/*
- * A kompatibilitás miatt az evfolyamJel-ből evfolyam-ot generálunk
- */
-function evfolyamJel2Evfolyam($evfolyamJel) {
-    switch ($evfolyamJel) {
-	case '1':
-	    return 1; break;
-	case '2':
-	    return 2; break;
-	case '3':
-	    return 3; break;
-	case '4':
-	    return 4; break;
-	case '5':
-	    return 5; break;
-	case '6':
-	    return 6; break;
-	case '7':
-	    return 7; break;
-	case '8':
-	case 'H2':
-	case 'H/II/1':
-	case 'H/II/2':
-	case '1/8':
-	    return 8; break;
-	case '9':
-	case '9N':
-	case '9/N':
-	case '9Ny':
-	case '9/Ny':
-	case '9Kny':
-	case '9/Kny':
-	case '9AJTP':
-	case '9/AJTP':
-	case '9AJKP':
-	case '9/AJKP':
-	case 'H1':
-	case 'H/I':
-	case '2/9':
-	case '1/9':
-	    return 9; break;
-	case '10':
-	case '3/10':
-	case '2/10':
-	    return 10; break;
-	case '11':
-	case '11/Ny':
-	case '3/11':
-	case '1/11':
-	    return 11; break;
-	case '12':
-	case '2/12':
-	    return 12; break;
-	case '13':
-	case '1/13':
-	case '5/13':
-	case 'Szé/12/1':
-	    return 13; break;
-	case '14':
-	case '2/14':
-	case 'Szé/12/2':
-	    return 14; break;
-	case '15':
-	    return 15; break;
-	default:
-	    return null;
-    }
-}
-
-function getOsztalyJel($osztalyId, $tanev, $osztalyAdat = null, $olr=null) {
-    return getEvfolyamJel($osztalyId, $tanev, $osztalyAdat, $_osztalyJellel=true, $olr);
-}
-
-global $_EVFOLYAMJEL_BETUVEL;
-$_EVFOLYAMJEL_BETUVEL = array(
-    '1' => 'első',
-    '2' => 'második',
-    '3' => 'harmadik',
-    '4' => 'negyedik',
-    '5' => 'ötödik',
-    '6' => 'hatodik',
-    '7' => 'hetedik',
-    '8' => 'nyolcadik',
-    'H1' => 'Híd I. program',
-    'H/I' => 'Híd I. program',
-    'H2/1' => 'Híd II. program 1. évfolyam',
-    'H/II/1' => 'Híd II. program 1. évfolyam',
-    'H2/2' => 'Híd II. program 2. évfolyam',
-    'H/II/2' => 'Híd II. program 2. évfolyam',
-    '9N' => 'nemzetiségi előkészítő',
-    '9/N' => 'nemzetiségi előkészítő',
-    '9Ny' => 'nyelvi előkészítő',
-    '9/Ny' => 'nyelvi előkészítő',
-    '9Kny' => 'két tanítási nyelvű előkészítő',
-    '9/Kny' => 'két tanítási nyelvű előkészítő',
-    '9AJTP' => 'Arany János Tehetséggondozó Program',
-    '9/AJTP' => 'Arany János Tehetséggondozó Program',
-    '9AJKP' => 'Arany János Kollégiumi Program',
-    '9/AJKP' => 'Arany János Kollégiumi Program',
-    '9' => 'kilencedik',
-    '10' => 'tizedik',
-    '11/Ny' => 'nyelvi előkészítő',
-    '11' => 'tizenegyedik',
-    '12' => 'tizenkettedik',
-    '13' => 'tizenharmadik',
-    '14' => 'tizennegyedik',
-    '15' => 'tizenötödik',
-    '1/8' => '1/8 szakképző évfolyam',
-    '2/9' => '2/9 szakképző évfolyam',
-    '3/10' => '3/10 szakképző évfolyam',
-    '1/9' => '1/9 szakképző évfolyam',
-    '2/10' => '2/10 szakképző évfolyam',
-    '3/11' => '3/11 szakképző évfolyam',
-    '1/11' => '1/11 szakképző évfolyam',
-    '2/12' => '1/12 szakképző évfolyam',
-    '1/13' => '1/13 szakképző évfolyam',
-    '2/14' => '2/14 szakképző évfolyam',
-    '5/13' => '5/13 szakképző évfolyam',
-    'Szé/12/1' => 'érettségire felkészítő 1. évfolyam',
-    'Szé/12/2' => 'érettségire felkészítő 2. évfolyam',
-);
-/*
-    KNT. 6. melléklete: engedélyezett, egyházi, 6-8 évf. gimnázium, 
-    NKT. 27. § (5) - tehetséggondozás+felzárkóztatás - 2 óra/hét/osztály
-    NKT. 27. § (6) - 1-4 évf. felzárkóztatás: 2 óra/hét/fő
-    NKT. 27. § (7) - SNI magántanul 10 óra/hét/fő
- */
-global $_EVFOLYAM_ADAT;
-$_EVFOLYAM_ADAT = array(
-    // tanulóÓraszám => array(testnevelés nélkül, testnevelés)
-    // osztályIdőkeret => array(engedélyezett, hittan, 6-8 gimn, nemzetiségi    // tehetséggondozás+felzárkóztatás + 2 óra/hét/osztály
-    // létszám => array(min, max, átlag)
-    '1' => array('tanulóÓraszám' => array(20,5), 'osztályIdőkeret' => array(52,1,0,2), 'létszám' => array(14,27,23)),
-    '2' => array('tanulóÓraszám' => array(20,5), 'osztályIdőkeret' => array(52,1,0,2), 'létszám' => array(14,27,23)),
-    '3' => array('tanulóÓraszám' => array(20,5), 'osztályIdőkeret' => array(52,1,0,2), 'létszám' => array(14,27,23)),
-    '4' => array('tanulóÓraszám' => array(22,5), 'osztályIdőkeret' => array(55,1,0,2), 'létszám' => array(14,27,23)),
-    '5' => array('tanulóÓraszám' => array(23,5), 'osztályIdőkeret' => array(51,1,2,2), 'létszám' => array(14,27,23)),
-    '6' => array('tanulóÓraszám' => array(23,5), 'osztályIdőkeret' => array(51,1,2,2), 'létszám' => array(14,27,23)),
-    '7' => array('tanulóÓraszám' => array(26,5), 'osztályIdőkeret' => array(56,1,2,2), 'létszám' => array(14,27,23)),
-    '8' => array('tanulóÓraszám' => array(26,5), 'osztályIdőkeret' => array(56,1,2,2), 'létszám' => array(14,27,23)),
-    'H1' 	=> array('tanulóÓraszám' => array(25,5), 'osztályIdőkeret' => array(56,2,0,3), 'létszám' => array(8,10,9)),
-    'H/I' 	=> array('tanulóÓraszám' => array(25,5), 'osztályIdőkeret' => array(56,2,0,3), 'létszám' => array(8,10,9)),
-    'H2/1' 	=> array('tanulóÓraszám' => array(25,5), 'osztályIdőkeret' => array(56,2,0,3), 'létszám' => array(8,10,9)),
-    'H/II/1' 	=> array('tanulóÓraszám' => array(25,5), 'osztályIdőkeret' => array(56,2,0,3), 'létszám' => array(8,10,9)),
-    'H2/2' 	=> array('tanulóÓraszám' => array(25,5), 'osztályIdőkeret' => array(56,2,0,3), 'létszám' => array(8,10,9)),
-    'H/II/2' 	=> array('tanulóÓraszám' => array(25,5), 'osztályIdőkeret' => array(56,2,0,3), 'létszám' => array(8,10,9)),
-    '9N'     => array('tanulóÓraszám' => array(25,5), 'osztályIdőkeret' => array(56,2,0,3), 'létszám' => array(26,34,28)), // Nincs a mellékletben
-    '9/N'    => array('tanulóÓraszám' => array(25,5), 'osztályIdőkeret' => array(56,2,0,3), 'létszám' => array(26,34,28)),//??
-    '9Ny'    => array('tanulóÓraszám' => array(25,5), 'osztályIdőkeret' => array(56,2,0,3), 'létszám' => array(26,34,28)),
-    '9/Ny'   => array('tanulóÓraszám' => array(25,5), 'osztályIdőkeret' => array(56,2,0,3), 'létszám' => array(26,34,28)),
-    '9Kny'   => array('tanulóÓraszám' => array(25,5), 'osztályIdőkeret' => array(56,2,0,3), 'létszám' => array(26,34,28)), //??
-    '9/Kny'  => array('tanulóÓraszám' => array(25,5), 'osztályIdőkeret' => array(56,2,0,3), 'létszám' => array(26,34,28)), //??
-    '9AJTP'  => array('tanulóÓraszám' => array(25,5), 'osztályIdőkeret' => array(56,2,0,3), 'létszám' => array(26,34,28)), //??
-    '9/AJTP' => array('tanulóÓraszám' => array(25,5), 'osztályIdőkeret' => array(56,2,0,3), 'létszám' => array(26,34,28)), //??
-    '9AJKP'  => array('tanulóÓraszám' => array(25,5), 'osztályIdőkeret' => array(56,2,0,3), 'létszám' => array(26,34,28)), //??
-    '9/AJKP' => array('tanulóÓraszám' => array(25,5), 'osztályIdőkeret' => array(56,2,0,3), 'létszám' => array(26,34,28)),//??
-    '9'  => array('tanulóÓraszám' => array(30,5), 'osztályIdőkeret' => array(57,2,2,3), 'létszám' => array(26,34,28)),
-    '10' => array('tanulóÓraszám' => array(31,5), 'osztályIdőkeret' => array(57,2,2,3), 'létszám' => array(26,34,28)),
-    '11/Ny'   => array('tanulóÓraszám' => array(25,5), 'osztályIdőkeret' => array(56,2,0,3), 'létszám' => array(26,34,28)),
-    '11' => array('tanulóÓraszám' => array(30,5), 'osztályIdőkeret' => array(58,2,2,3), 'létszám' => array(26,34,28)),
-    '12' => array('tanulóÓraszám' => array(30,5), 'osztályIdőkeret' => array(58,2,2,3), 'létszám' => array(26,34,28)),
-    '13' => array('tanulóÓraszám' => array(30,5), 'osztályIdőkeret' => array(58,2,2,3), 'létszám' => array(26,34,28)), //??
-    '14' => array('tanulóÓraszám' => array(30,5), 'osztályIdőkeret' => array(58,2,2,3), 'létszám' => array(26,34,28)), //??
-    '15' => array('tanulóÓraszám' => array(30,5), 'osztályIdőkeret' => array(58,2,2,3), 'létszám' => array(26,34,28)), //??
-    '1/8'  => array('tanulóÓraszám' => array(), 'osztályIdőkeret' => array(), 'létszám' => array(16,28,24)), //??
-    '2/9'  => array('tanulóÓraszám' => array(), 'osztályIdőkeret' => array(), 'létszám' => array(16,28,24)), //??
-    '3/10' => array('tanulóÓraszám' => array(), 'osztályIdőkeret' => array(), 'létszám' => array(16,28,24)), //??
-    '1/9'  => array('tanulóÓraszám' => array(), 'osztályIdőkeret' => array(), 'létszám' => array(16,28,24)), //??
-    '2/10' => array('tanulóÓraszám' => array(), 'osztályIdőkeret' => array(), 'létszám' => array(16,28,24)), //??
-    '3/11' => array('tanulóÓraszám' => array(), 'osztályIdőkeret' => array(), 'létszám' => array(16,28,24)), //??
-    '1/11' => array('tanulóÓraszám' => array(), 'osztályIdőkeret' => array(), 'létszám' => array(16,28,24)), //??
-    '2/12' => array('tanulóÓraszám' => array(), 'osztályIdőkeret' => array(), 'létszám' => array(16,28,24)), //??
-    '1/13' => array('tanulóÓraszám' => array(), 'osztályIdőkeret' => array(), 'létszám' => array(16,28,24)), //??
-    '2/14' => array('tanulóÓraszám' => array(), 'osztályIdőkeret' => array(), 'létszám' => array(16,28,24)), //??
-    '5/13' => array('tanulóÓraszám' => array(), 'osztályIdőkeret' => array(), 'létszám' => array(16,28,24)), //??
-    'Szé/12/1' => array('tanulóÓraszám' => array(), 'osztályIdőkeret' => array(), 'létszám' => array(26,34,28)),
-    'Szé/12/2' => array('tanulóÓraszám' => array(), 'osztályIdőkeret' => array(), 'létszám' => array(26,34,28)),
-);
-
-// használja a kepzes.php!!
-define('_SQL_EVFOLYAMJEL_SORREND', "FIELD(evfolyamJel,'1','2','3','4','5','6','7','8',".
-"'9N','9/N','9Ny','9/Ny','9Kny','9/Kny','9AJTP','9/AJTP','9AJKP','9/AJKP','9','10','11/Ny','11','12','13','14','15',"
-."'H1','H/I','H2','H/II/1','H/II/2',"
-."'1/8','2/9','3/10','1/9','2/10','3/11',"
-."'1/11','2/12','1/13','2/14','3/15','4/16','5/13','Szé/12/1','Szé/12/2')");
-
-function getEvfolyamJelek($SET = array('result'=>'indexed')) {
-    $J = array(
-'1','2','3','4','5','6','7','8',
-'9N','9/N','9Ny','9/Ny','9Kny','9/Kny','9AJTP','9/AJTP','9AJKP','9/AJKP','9','10','11/Ny','11','12','13','14','15',
-'H1','H/I','H2','H/II/1','H/II/2',
-'1/8','2/9','3/10','1/9','2/10','3/11',
-'1/11','2/12','1/13','2/14','3/15','4/16','5/13','Szé/12/1','Szé/12/2'
-);
-    if ($SET['result'] == 'idonly') return $J;
-    $ret = array();
-    foreach ($J as $evfolyamJel) $ret[] = array('evfolyamJel'=>$evfolyamJel);
-    return $ret;
-}
-
-function getKovetkezoEvfolyamJel($evfolyamJel) {
-
-    $q = "select distinct substring_index(substring_index(evfolyamJelek,'%s,',-1),',',1) 
-	    from osztalyJelleg where evfolyamJelek like '%s' ',%%' or evfolyamJelek like '%%,' '%s' ',%%'"; // stringek egymásutánja MySQL szerint egymásután fűzést jelöl...
-    $ret = db_query($q, array('fv'=>'getKovetkezoEvfolyamJel','modul'=>'naplo_base','result'=>'value','values'=>array($evfolyamJel, $evfolyamJel, $evfolyamJel)));
-    if ($ret == '') {
-	$_SESSION['alert'][] = 'info:getKovetkezoEvfolyamJel hiba:'.$evfolyamJel;
-	return false;
-    } else {
-	return $ret;
-    }
-/*
-    if (in_array($evfolyamJel, array('1','2','3','4','5','6','7','8','9','10','11','12','13','14'))) return $evfolyamJel+1;
-    else if (in_array($evfolyamJel, array('11/Ny'))) return 11;
-    else if (in_array($evfolyamJel, array('9N','9Ny','9Kny','9AJTP','9AJKP','H2'))) return 9;
-    else if (in_array($evfolyamJel, array('9/N','9/Ny','9/Kny','9/AJTP','9/AJKP'))) return 9;
-    else if (in_array($evfolyamJel, array('7N','7Ny'))) return 7;
-    else if (in_array($evfolyamJel, array('7/N','7/Ny'))) return 7;
-    else if (in_array($evfolyamJel, array('4N','4Ny'))) return 4;
-    else if (in_array($evfolyamJel, array('4/N','4/Ny'))) return 4;
-    else if ($evfolyamJel == 'H1' || $evfolyamJel == 'H/I') return 10;
-    else if ($evfolyamJel == 'H/II/1') return 'H/II/2';
-    else if ($evfolyamJel == 'Szé/12/1') return 'Szé/12/2';
-    else if (in_array($evfolyamJel, array('1/8','2/9','1/9','2/10','1/11','2/12','1/13'))) {
-	list($e, $m) = explode('/',$evfolyamJel);
-	$e++; $m++; return $e.'/'.$m;
-    }
-    else {
-	$_SESSION['alert'][] = 'info:getKovetkezoEvfolyamJel hiba:'.$evfolyamJel;
-	return false;
-    }
-*/
-}
-
-/*
- * getEvfolyamAdatByDiakId
- *
- * return [ array('evfolyam', 'evfolyamJel') | false | array('evfolyam'=>array(), 'evfolyamJel'=>array())
- */
-function getEvfolyamAdatByDiakId($diakId, $dt, $tanev, $csakHaEgyertelmu = true) {
-
-	$OSZTALYOK = getDiakOsztalya($diakId,array('tanev'=>$tanev,'tolDt'=>$dt,'igDt'=>$dt));
-	$ret = array('evfolyam'=>array(), 'evfolyamJel'=>array());
-	foreach ($OSZTALYOK as $oAdat) {
-	    $osztalyId = $oAdat['osztalyId'];
-            $OA = getOsztalyAdat($osztalyId, $tanev);
-	    $evfolyam = getEvfolyam($osztalyId, $tanev, $OA);
-	    $evfolyamJel = getEvfolyamJel($osztalyId, $tanev, $OA);
-	    if (!in_array($evfolyam, $ret['evfolyam'])) $ret['evfolyam'][] = $evfolyam;
-	    if ($evfolyamJel != '' && !in_array($evfolyamJel, $ret['evfolyamJel'])) $ret['evfolyamJel'][] = $evfolyamJel;
-	}
-	if ($csakHaEgyertelmu===true) {
-    	    if (count($ret['evfolyamJel'])===1 && count($ret['evfolyam']===1)) {
-        	return array('evfolyam'=>$ret['evfolyam'][0], 'evfolyamJel'=>$ret['evfolyamJel'][0]);
-    	    } else {
-        	$_SESSION['alert'][] = '::nem tudom kitalálni az évfolyamot (db osztály: '.count($OSZTALYOK).", diakId: $diakId, tanev: $tanev)";
-        	return false;
-    	    }
-	} else {
-	    return $ret;
-	}
-
-}
-
-//!!ITT!!
-function getOsztalyIdByEvfolyamJel($evfolyamJel, $tanev = __TANEV) {
-
-    if (is_array($evfolyamJel) && count($evfolyamJel) > 0) {
-	$q = "SELECT osztalyId FROM osztaly LEFT JOIN mayor_naplo.osztalyJelleg USING (osztalyJellegId) 
-		    WHERE "._evfolyamJel($tanev)." IN (".implode(',', array_fill(0, count($evfolyamJel), "'%s'")).") 
-		    ORDER BY osztalyId";
-	return db_query($q, array('fv' => 'getOsztalyIdByEvfolyamJe', 'modul' => 'naplo_intezmeny', 'result' => 'idonly', 'values' => $evfolyamJel));
-    } else {
-	return array();
-    }
-}
-
-function getOsztalyIdByTankorIds($tankorIds, $SET = array('result' => 'indexed')) {
-    $q = "SELECT tankorId,osztalyId FROM tankorOsztaly WHERE tankorId IN (".implode(',', array_fill(0, count($tankorIds), '%u')).")";
-    return db_query($q, array('fv' => 'tankorokOsztalyi', 'modul' => 'naplo_intezmeny', 'result' => $SET['result'], 'values' => $tankorIds));
-}
-
-// Elavult, már nem használt függvény
-// function checkOsztalyInTanev($tanev, $osztalyId='') {
-// 
-// 	$tanevDb = tanevDbNev(__INTEZMENY, $tanev);
-// 	$lr = db_connect('naplo_intezmeny', array('fv' => 'checkOsztalyInTanev'));
-// 	if (!$lr) return false;
-// 	//$tlr = db_connect('naplo');
-// 	
-// 	// Ellenőrizzük, hogy van-e az adott tanévben jele...
-// 	$OSZTALYOK = getOsztalyok($tanev);
-// 	for ($i = 0; $i < count($OSZTALYOK); $i++) {
-// 	    if ($OSZTALYOK[$i]['osztalyJel'] == '' && ($tanev-$OSZTALYOK[$i]['kezdoTanev']) >= 0) {
-// //		$v = array($tanevDb, $OSZTALYOK[$i]['osztalyId'], genOsztalyJel($tanev,$OSZTALYOK[$i]));
-// 		$v = array($tanevDb, $OSZTALYOK[$i]['osztalyId'], $OSZTALYOK[$i]['osztalyJel'], $OSZTALYOK[$i]['evfolyam'], $OSZTALYOK[$i]['evfolyamJel']);
-// 		$q = "REPLACE INTO `%s`.osztalyNaplo (osztalyId,osztalyJel,evfolyam,evfolyamJel) VALUES (%u,'%s',%u,'%s')";
-// 		db_query($q, array('fv' => 'checkOsztalyInTanev', 'modul' => 'naplo_intezmeny', 'values' => $v), $lr);
-// 	    }
-// 	}
-// 	db_close($lr);
-// 
-// }
-
-function getOsztalyok($tanev = '', $SET = array('result' => 'indexed', 'minden'=>false, 'telephelyId' => null, 'osztalyIds'=>null), $olr=null) {
-	global $_TANEV,$mayorCache;
-
-	if (!is_array($SET)) $SET = array('result' => 'indexed', 'minden'=>false, 'telephelyId' => null);
-
-	if (!isset($SET['result'])) $SET['result'] = 'indexed';
-	if (!isset($SET['minden'])) $SET['minden'] = false;
-	if (!isset($SET['telephelyId'])) $SET['telephelyId'] = null;
-
-
-	$key = __FUNCTION__.':'.md5($tanev.serialize($SET));
-        if ($mayorCache->exists($key)) return $mayorCache->get($key);
-
-	$W = array();
-	if (is_array($SET['osztalyIds']) && count($SET['osztalyIds'])>0) {
-	    $W[] = ' osztalyId IN ('.implode(',',$SET['osztalyIds']).') ';
-	}
-
-	if ($tanev == '' && defined('__TANEV')) $tanev = __TANEV;
-	$telephelyId = readVariable($SET['telephelyId'], 'id');
-
-	// is_resource mysqli esetén nem jó (object)
-	if ($olr) $lr = $olr;
-	else $lr = db_connect('naplo_intezmeny');
-
-	// A tanév státuszának lekérdezése
-	// REQUEST -- ezt a szemeszter fv könyvtár csinálja inkább
-	if ($tanev == __TANEV) {
-		$statusz = $_TANEV['statusz'];
-	} else {
-		$q ="SELECT statusz FROM szemeszter WHERE tanev='$tanev' LIMIT 1";
-		$statusz = db_query($q, array('fv' => 'getOsztalyok', 'modul' => 'naplo_intezmeny', 'result' => 'value'), $lr);
-	}
-	// Az osztályok adatainak lekérdezése
-	if ($SET['minden']!==true) {
-	    if (isset($telephelyId)) {
-		$W[] = "kezdoTanev <= %u AND vegzoTanev >= %u AND (telephelyId = %u OR telephelyId IS NULL)";
-		$v = array($tanev, $tanev, $telephelyId);
-	    } else {
-		$W[] = "kezdoTanev <= %u AND vegzoTanev >= %u";
-		$v = array($tanev, $tanev);
-	    }
-	} else { $v = array(); }
-	if (count($W)>0) $WHERE = "WHERE ".implode(' AND ',$W);
-	if ($statusz == 'tervezett') {
-		// Nincs még tanév adatbázis --> csak az osztly tábla használható;
-		$q = "SELECT `osztalyId`, `leiras`, `kezdoTanev`, `vegzoTanev`, `jel`, `kezdoEvfolyamSorszam`,"._osztalyJel($tanev)." AS `osztalyJel`, 
-				"._evfolyam($tanev)." AS evfolyam, "._evfolyamJel($tanev)." AS evfolyamJel, `telephelyId`,`osztalyJellegId`
-				FROM `osztaly` LEFT JOIN mayor_naplo.osztalyJelleg USING (osztalyJellegId) $WHERE";
-	} elseif ($SET['minden']===true) {
-		$q = "SELECT `osztalyId`, `leiras`, `kezdoTanev`, `vegzoTanev`, `jel`, `kezdoEvfolyamSorszam`,
-				IF (ISNULL(osztalyJel),"._osztalyJel($tanev).",osztalyJel) AS `osztalyJel`, 
-				"._evfolyam($tanev)." AS evfolyam, "._evfolyamJel($tanev)." AS evfolyamJel, `telephelyId`,`osztalyJellegId`
-				FROM `osztaly` LEFT JOIN mayor_naplo.osztalyJelleg USING (osztalyJellegId) 
-				LEFT JOIN `".tanevDbNev(__INTEZMENY, $tanev)."`.`osztalyNaplo` USING (`osztalyId`)
-				$WHERE";
-	} else {
-		// Van tanév adatbázis --> lekérdezhető az osztály jelölése is.
-		$q = "SELECT `osztaly`.`osztalyId` AS `osztalyId`, `leiras`, `kezdoTanev`, `vegzoTanev`, `jel`, `kezdoEvfolyamSorszam`, `osztalyJel`, 
-				`evfolyam`, `evfolyamJel`, `telephelyId`,`osztalyJellegId`
-				FROM `osztaly` LEFT JOIN `".tanevDbNev(__INTEZMENY, $tanev)."`.`osztalyNaplo` USING (`osztalyId`) $WHERE";
-	}
-	$q .= ' ORDER BY '._SQL_EVFOLYAMJEL_SORREND.', osztalyJel, kezdoTanev';
-//	$q .= "ORDER BY evfolyamJel, kezdoTanev, jel";
-//	$q .= "ORDER BY LPAD(SUBSTRING_INDEX(`osztalyJel`,'.',1),4,'0'),LPAD(SUBSTRING_INDEX(`osztalyJel`,'.',-1),4,'0'),`kezdoTanev`,`jel`";
-
-	$return = array();
-	if ($SET['result']==='assoc') { // ha assoc, a keyfield automatikusan az osztalyId legyen!!!
-	    $r1 = db_query($q, array('fv' => 'getOsztalyok', 'modul'=>'naplo_intezmeny', 'result'=>'indexed', 'values' => $v), $lr );
-	    for ($i=0; $i 'getOsztalyok', 'modul'=>'naplo_intezmeny', 'result'=>'indexed', 'values' => $v), $lr );
-	    for ($i=0; $iset($key,$return,'osztaly');
-	return $return;
-	
-}
-
-/*
-    erettsegizo - csak azok az osztályok jelennek meg, melyek a megadott tanévben végeznek és osztályJellegük szerint érettségizők
-    vizsgazo - csak azok az osztályok jelennek meg, melyek a megadott tanévben végeznek és osztályJellegük szerint érettségizők vagy szakmai vizsgát tevők
-*/
-function getVegzosOsztalyok($SET = array('tanev' => __TANEV, 'result' => 'assoc', 'erettsegizo' => false, 'vizsgazo' => false)) {
-
-    global $_TANEV;
-
-    $tanev = readVariable($SET['tanev'], 'numeric unsigned', __TANEV);
-    if ($tanev == __TANEV) $TA = $_TANEV;
-    else $TA = getTanevAdat($tanev);
-
-    if ($SET['erettsegizo'] === true) {
-	$WHERE_ERETTSEGIZO = " AND vegzesKovetelmenye='érettségi vizsga' ";
-	$JOIN_ERETTSEGIZO = " LEFT JOIN mayor_naplo.osztalyJelleg USING (osztalyJellegId) ";
-    } else if ($SET['vizsgazo'] === true) {
-	$WHERE_ERETTSEGIZO = " AND vegzesKovetelmenye IN ('érettségi vizsga','szakmai vizsga') ";
-	$JOIN_ERETTSEGIZO = " LEFT JOIN mayor_naplo.osztalyJelleg USING (osztalyJellegId) ";
-    } else {
-	$WHERE_ERETTSEGIZO = "";
-    }
-
-    if ($SET['result'] == 'id' || $SET['result'] == 'idonly') {
-	// Csak az osztalyId kell
-	$q = "SELECT osztalyId FROM osztaly".$JOIN_ERETTSEGIZO." WHERE osztaly.vegzoTanev = %u".$WHERE_ERETTSEGIZO."";
-	$return = db_query($q, array('fv' => 'getVegzosOsztalyok', 'modul' => 'naplo_intezmeny', 'result' => 'idonly', 'values' => array($tanev)));
-    } else {
-	if ($TA['statusz'] == 'tervezett') {
-	    // Nincs még tanév adatbázis --> csak az osztly tábla használható;
-	    $q = "SELECT osztalyId,leiras,kezdoTanev,vegzoTanev,jel,kezdoEvfolyamSorszam,"._osztalyJel($tanev)." AS osztalyJel
-		FROM osztaly".$JOIN_ERETTSEGIZO."
-		WHERE vegzoTanev = %u".$WHERE_ERETTSEGIZO."
-		ORDER BY LPAD(SUBSTRING_INDEX(osztalyJel,'.',1),4,'0'),LPAD(SUBSTRING_INDEX(osztalyJel,'.',-1),4,'0'),kezdoTanev,jel";
-	    $v = array($tanev);
-	} else {
-	    // Van tanév adatbázis --> lekérdezhető az osztály jelölése is.
-	    $q = "SELECT osztaly.osztalyId AS osztalyId,leiras,kezdoTanev,vegzoTanev,jel,kezdoEvfolyamSorszam,osztalyJel
-		FROM osztaly LEFT JOIN `%s`.osztalyNaplo USING (osztalyId)".$JOIN_ERETTSEGIZO."
-		WHERE vegzoTanev = %u".$WHERE_ERETTSEGIZO."
-		ORDER BY LPAD(SUBSTRING_INDEX(osztalyJel,'.',1),4,'0'),LPAD(SUBSTRING_INDEX(osztalyJel,'.',-1),4,'0'),kezdoTanev,jel";
-	    $v = array(tanevDbNev(__INTEZMENY, $tanev), $tanev);
-	}
-	$return = db_query($q, array('fv' => 'getVegzosOsztalyok', 'modul' => 'naplo_intezmeny', 'result' => 'indexed', 'values' => $v));
-	if (is_array($return)) for ($i = 0; $i < count($return); $i++) {
-	    $return[$i]['osztalyfonok'] = getOsztalyfonok($return[$i]['osztalyId'], $tanev);
-	}
-    }
-
-    return $return;
-}
-
-function getOsztalyfonok($osztalyId, $tanev=__TANEV, $olr = null) {
-
-	global $_TANEV;
-	
-	// Az adott tanév elejének és végének lekérdezése
-	if ($tanev != __TANEV) $tanevAdat = getTanevAdat($tanev, $olr);
-	else $tanevAdat = $_TANEV;
-	
-	initTolIgDt($tanev, $kDt, $zDt);
-        
-	$q = "SELECT osztalyTanar.tanarId,
-		TRIM(CONCAT(viseltNevElotag,' ',viseltCsaladiNev,' ',viseltUtonev)) As tanarNev, osztalyTanar.beDt, osztalyTanar.kiDt
-			FROM osztalyTanar LEFT JOIN tanar USING (tanarId)
-			WHERE osztalyId = %u
-			AND osztalyTanar.beDt <= '%s'
-			AND (osztalyTanar.kiDt IS NULL OR osztalyTanar.kiDt > '%s')
-	    		ORDER BY osztalyTanar.beDt DESC LIMIT 1";
-	$v = array($osztalyId, $zDt, $kDt);
-	return db_query($q, array('fv' => 'getOsztalyfonok', 'modul' => 'naplo_intezmeny', 'result' => 'record', 'values' => $v), $olr);
-
-}
-
-function getOsztalyfonokok($osztalyId, $tanev = null, $olr = null) {
-
-    global $_TANEV;
-	
-    $ret = false;
-    if (is_null($tanev)) {
-
-	$q = "SELECT osztalyTanar.tanarId AS tanarId,
-		    TRIM(CONCAT(viseltNevElotag,' ',viseltCsaladiNev,' ',viseltUtonev)) AS tanarNev,
-		    osztalyTanar.beDt AS beDt,
-		    osztalyTanar.kiDt AS kiDt
-		FROM osztalyTanar LEFT JOIN tanar USING (tanarId)
-		WHERE osztalyId = %u
-		ORDER BY osztalyTanar.beDt";
-	$ret = db_query($q, array('fv' => 'getOsztalyfonokok','modul' => 'naplo_intezmeny', 'result' => 'indexed', 'values' => array($osztalyId)), $olr);
-
-    } else {
-
-	// Az adott tanév elejének és végének lekérdezése
-	if ($tanev != __TANEV) $tanevAdat = getTanevAdat($tanev, $olr);
-	else $tanevAdat = $_TANEV;
-	
-	$kDt = $tanevAdat['kezdesDt']; $zDt = $tanevAdat['zarasDt']; 
-
-	$q = "SELECT osztalyTanar.tanarId AS tanarId,
-		    TRIM(CONCAT(viseltNevElotag,' ',viseltCsaladiNev,' ',viseltUtonev)) AS tanarNev,
-		    osztalyTanar.beDt AS beDt,
-		    osztalyTanar.kiDt AS kiDt
-		FROM osztalyTanar LEFT JOIN tanar USING (tanarId)
-		WHERE osztalyId = %u
-		AND osztalyTanar.beDt < '%s'
-		AND (osztalyTanar.kiDt IS NULL OR osztalyTanar.kiDt > '%s')
-		ORDER BY osztalyTanar.beDt";
-
-	$ret = db_query($q, array('fv' => 'getOsztalyfonokok', 'modul' => 'naplo_intezmeny', 'result' => 'indexed', 'values' => array($osztalyId, $zDt, $kDt)));
-	if (is_array($ret)) for ($i = 0; $i < count($ret); $i++) {
-	    if ($ret[$i]['kiDt'] == '' || strtotime($ret[$i]['kiDt']) > time()) {
-		$ret[$i]['aktiv'] = true;
-	    }
-	}
-
-   }
-
-    return $ret;
-
-}
-
-function getOsztalyAdat($osztalyId, $tanev = __TANEV, $olr = '') {
-	
-    if ($osztalyId=='') return false;
-
-    global $_TANEV;
-
-    // Csatlakozás az adatbázishoz
-    if ($olr == '') $lr = db_connect('naplo_intezmeny', array('fv' => 'getOsztalyAdat'));
-    else $lr = $olr;
-    if (!$lr) return false;
-
-	// Osztály adatainak lekérdezése
-	if ($tanev == __TANEV) {
-	    $tanevDb = __TANEVDBNEV; $TA = $_TANEV;
-	} else {
-	    $tanevDb = tanevDbNev(__INTEZMENY, $tanev);
-	    $TA = getTanevAdat($tanev, $lr);
-	}
-	if ($TA['statusz'] == 'aktív')
-	    $q = "SELECT osztaly.osztalyId AS osztalyId,leiras,kezdoTanev,vegzoTanev,jel,kezdoEvfolyamSorszam,osztalyJel,evfolyamJel,telephelyId,osztalyJellegId,kirOsztalyJellegId,elokeszitoEvfolyam,evfolyamJelek
-		FROM osztaly LEFT JOIN mayor_naplo.osztalyJelleg USING (osztalyJellegId) 
-		LEFT JOIN %1\$s.osztalyNaplo USING (osztalyId) WHERE osztalyId=%2\$u";
-	else
-	    $q = "SELECT osztaly.osztalyId AS osztalyId,leiras,kezdoTanev,vegzoTanev,jel,kezdoEvfolyamSorszam,"._osztalyJel($tanev)." AS osztalyJel,"._evfolyamJel($tanev)." AS evfolyamJel,telephelyId,osztalyJellegId,kirOsztalyJellegId,elokeszitoEvfolyam,evfolyamJelek
-		FROM osztaly LEFT JOIN mayor_naplo.osztalyJelleg USING (osztalyJellegId) WHERE osztalyId=%2\$u";
-	$v = array($tanevDb, $osztalyId);
-	$osztalyAdat = db_query($q, array('fv' => 'getOsztalyAdat', 'modul' => 'naplo_intezmeny', 'result' => 'record', 'values' => $v), $lr);
-	$osztalyAdat['evfolyamJelek'] = explode(',',$osztalyAdat['evfolyamJelek']);
-	$osztalyAdat['osztalyfonok'] = getOsztalyfonok($osztalyId, $tanev, $lr);
-	$osztalyAdat['osztalyfonokok'] = getOsztalyfonokok($osztalyId, $tanev, $lr);
-	$osztalyAdat['osztalyfonokNev']	= _genOfNev($osztalyAdat['osztalyfonokok']);
-	$osztalyAdat['kepzes'] = getKepzesByOsztalyId($osztalyId); // ? lr
-    if ($olr == '') db_close($lr);
-	
-    return $osztalyAdat;
-
-}
-
-function _genOfNev($_OF) {
-    $_of= array();
-    for ($j=0; $j__TANEV)) {
-    $OA = getOsztalyAdat($osztalyId, $SET['tanev']);
-    return $OA['osztalyJel'].' '.$OA['leiras'];
-}
-
-function getOsztalyTankorei($osztalyId, $tanev=__TANEV) {
-
-    $lr = db_connect('naplo_intezmeny');
-
-	$q = "SELECT tankorId FROM tankorOsztaly WHERE osztalyId=%u";
-	$T = db_query($q, array('fv' => 'getOsztalyTankorei', 'modul' => 'naplo_intezmeny', 'result' => 'idonly', 'values' => array($osztalyId)), $lr);
-
-	$q = "SELECT DISTINCT tankorId, tankorNev
-		FROM tankor LEFT JOIN tankorSzemeszter USING (tankorId)
-		WHERE tanev=%u AND tankorId IN (".implode(',', array_fill(0, count($T), '%u')).") ORDER BY tankorNev";
-	array_unshift($T, $tanev);
-	$return = db_query($q, array('fv' => 'getOsztalyTankorei', 'modul' => 'naplo_intezmeny', 'result' => 'indexed', 'values' => $T), $lr);
-
-    db_close($lr);
-
-    return $return;
-
-}
-
-function getOsztalyJellegAdat($osztalyJellegId) {
-    $q = "SELECT * FROM osztalyJelleg WHERE osztalyJellegId=%u";
-    return db_query($q, array('fv'=>'getKirOsztalyJellegek','values'=>array($osztalyJellegId),'modul'=>'naplo_base','result'=>'record'));
-}
-
-function getKirOsztalyJellegek() {
-    $q = "SELECT * FROM kirOsztalyJelleg";
-    return db_query($q, array('fv'=>'getKirOsztalyJellegek','modul'=>'naplo_base','result'=>'indexed'));
-}
-
-function getOsztalyJellegek($SET = array('result' => 'indexed')) {
-    $q = "SELECT * FROM osztalyJelleg";
-    return db_query($q, array('fv'=>'getOsztalyJellegek','modul'=>'naplo_base','result'=>$SET['result'], 'keyfield' => 'osztalyJellegId'));
-}
-
-function getVegzosOsztalyJellegIds() {
-    $q = "SELECT osztalyJellegId FROM osztalyJelleg WHERE vegzesKovetelmenye IN ('érettségi vizsga','szakmai vizsga')";
-    return db_query($q, array('fv'=>'getVegzosOsztalyJellegIds','modul'=>'naplo_base','result'=>'idonly'));
-}
-
-function getOsztalyEvfolyamSzamElteres($osztalyId) {
-    $q = "SELECT CONVERT(vegzoTanev-kezdoTanev,SIGNED) - CONVERT((LENGTH(`evfolyamJelek`)-LENGTH(REPLACE(`evfolyamJelek`, ',', ''))),SIGNED) AS evfolyamSzamElteres FROM osztaly LEFT JOIN mayor_naplo.osztalyJelleg USING (osztalyJellegId) WHERE osztalyId=%u";
-    $v = array($osztalyId);
-    $r = db_query($q, array('fv'=>'checkOsztalyEvfolyamSzam','modul'=>'naplo_intezmeny','result'=>'value','values'=>$v));
-    return $r;
-}
-
-function getOsztalyHetiIdokeret($osztalyId, $osztalyAdat = null, $SET = array('egyhaziE' => null)) {
-
-    global $_EVFOLYAM_ADAT;
-
-    require_once('include/modules/naplo/share/intezmenyek.php');
-
-    if (!is_array($osztalyAdat)) $osztalyAdat = getOsztalyAdat($osztalyId);
-    if (is_null($SET['egyhaziE'])) {
-	$intezmenyAdat = getIntezmenyByRovidnev(__INTEZMENY);
-	$SET['egyhaziE'] = ($intezmenyAdat['fenntarto']=='egyházi');
-    }
-
-    $iAdat = $_EVFOLYAM_ADAT[$osztalyAdat['evfolyamJel']]['osztályIdőkeret'];
-
-    $idokeret['engedélyezett'] = $idokeret['összes'] = $iAdat[0]; // engedélyezett
-    $idokeret['összes'] += $idokeret['tehetséggondozás-felzárkóztatás'] = 2; // tehettség gondozás, felzárkóztatás
-    if ($SET['egyhaziE']) $idokeret['összes'] += $idokeret['egyházi'] = $iAdat[1];
-    if (in_array($osztalyAdat['osztalyJellegId'], array(51,52,53,61,62,63))) $idokeret['összes'] += $idokeret['gimnázium'] = $iAdat[2];
-    if ($nemzetisegi) $idokeret['összes'] += $idokeret['nemzetiségi'] = $iAdat[3];
-
-    return $idokeret;
-
-}
-
-function getOsztalyByTanarId($tanarId, $Param = array('tanev' => __TANEV, 'tolDt' => '', 'igDt' => '', 'csakId'=>true)) {
-
-    global $_TANEV;
-    if (is_null($Param['tanev']) || $Param['tanev']=='') $Param['tanev']=__TANEV;
-    if ($Param['tanev'] != __TANEV && $Param['tanev']!='') $TA = getTanevAdat($Param['tanev']);
-    else $TA = $_TANEV;
-
-    if (isset($Param['tolDt']) && $Param['tolDt']!='') $tolDt = $Param['tolDt']; else unset($tolDt);
-    if (isset($Param['igDt'])  && $Param['igDt']!='')  $igDt = $Param['igDt']; else unset($igDt);
-    initTolIgDt($Param['tanev'], $tolDt, $igDt);
-
-    if ($Param['csakId']===true) {
-	$q = "SELECT DISTINCT osztalyId FROM ".__INTEZMENYDBNEV.".osztalyTanar WHERE tanarId=%u AND beDt <= '%s'
-    	    AND (kiDt IS NULL OR kiDt >= '%s')";
-	$v = array($tanarId, $igDt, $tolDt);
-	return db_query($q, array('fv' => 'getOsztalyByTanarId', 'modul' => 'naplo_intezmeny', 'result' => 'idonly', 'values' => $v));
-    } else {
-	    $q = "SELECT DISTINCT osztalyId, "._osztalyJel($TA['tanev'])." AS osztalyJel
-		FROM ".__INTEZMENYDBNEV.".osztalyTanar LEFT JOIN osztaly USING (osztalyId)
-		LEFT JOIN mayor_naplo.osztalyJelleg USING (osztalyJellegId)
-		WHERE tanarId=%u AND beDt <= '%s'
-		AND (kiDt IS NULL OR kiDt >= '%s')";
-	    $v = array($tanarId, $igDt, $tolDt);
-	    return db_query($q, array('fv' => 'getOsztalyByTanarId', 'modul' => 'naplo_intezmeny', 'result' => 'indexed', 'values' => $v));
-    }
-}
-
-
-?>
\ No newline at end of file
diff --git a/mayor-orig/www/include/modules/naplo/share/osztalyModifier.php b/mayor-orig/www/include/modules/naplo/share/osztalyModifier.php
deleted file mode 100644
index fe04fdcc..00000000
--- a/mayor-orig/www/include/modules/naplo/share/osztalyModifier.php
+++ /dev/null
@@ -1,313 +0,0 @@
- kiDt
-function osztalyfonokKileptetes($osztalyId, $tanarId, $beDt, $kiDt, $olr = null) {
-	global $mayorCache;
-	$mayorCache->delType('osztaly');
-	
-	if (strtotime($beDt) > strtotime($kiDt)) {
-		$_SESSION['alert'][] = 'message:wrong_data:'.$beDt.' - '.$kiDt;
-		return false; 
-	}
-	
-	$q = "UPDATE ".__INTEZMENYDBNEV.".osztalyTanar SET kiDt='%s' WHERE osztalyId=%u AND tanarId=%u AND beDt='%s'";
-	$v = array($kiDt, $osztalyId, $tanarId, $beDt);
-	return db_query($q, array('fv' => 'osztalyfonokKileptetes', 'modul' => 'naplo_intezmeny', 'values' => $v), $olr);
-
-}
-
-
-
-// MÁR NINCS HASZNÁLATBAN!!!!!!!!!!!!
-function osztalyNevsorModositas($osztalyId, $diakIds, $beDt, $kiDt, $olr='') {
-
-//    1. A kiDt utáni tankörtagságokat törli, ha a tankör nincs a diák másik kiDt-kori, vagy utána lévő osztályához is rendelve (tankoOsztaly)
-//    2. A beDt előtti tankörtagságokat érintetlenül hagyjuk (a tankorOsztaly változhat...)
-//    3. Az osztalyDiak-ban (osztalyId,diakId) kulcs - csak egy bejegyzés van, ezt bővítjük, szűkítjük...
-//    4. Sikertelen tankör kiléptetés esetén visszagörgetünk (pl. ha van jegye, hiányzása egy tankörben)
-
-
-	$_SESSION['alert'][] = 'info:!!!:osztalyNevsorModositas()';
-	
-	if (is_array($diakIds) && count($diakIds) > 0) {
-
-	    if ($olr!='')  { 
-		$lr=$olr; 
-	    } else {
-		$lr = db_connect('naplo_intezmeny');
-		db_start_trans($lr);
-	    }
-
-	    $diakTankorKileptetesOK = array(); // a diakTorol függvény talált-e ütközést vagy hibát, akkor bebillenti ezt a flag-et, false-ra!
-
-	    if ($kiDt != '') {
-	      /* Konzisztencia megőrzése: tankorből kiléptetés, ahol: tankorOsztaly --> tankorId-k be benne van */
-	      for($i = 0; $i < count($diakIds); $i++) {
-
-		$diakId = $diakIds[$i];
-
-		// A diáknak mely tankörei érintettek (amikben a kiDt-kor, vagy utána benne van, de más (kiDt-kori, vagy későbbi) osztályához nem tartozik:
-		$q = "SELECT tankorId FROM tankorDiak WHERE diakId=%u AND (kiDt IS NULL or '%s'<=kiDt) AND tankorId NOT IN 
-			(SELECT DISTINCT tankorId FROM osztalyDiak LEFT JOIN tankorOsztaly USING(osztalyId) 
-			    WHERE diakId=%u AND (kiDt is NULL or '%s'<=kiDt) AND osztalyId <> %u)";
-		$v = array($diakId, $kiDt, $diakId, $kiDt, $osztalyId);
-		$tankorIds = db_query($q, array('fv' => 'osztalyNevsorModositas', 'modul' => 'naplo_intezmeny', 'result' => 'idonly', 'values' => $v), $lr);
-
-    		// Tankörökből kivétel - $kiDt utáni naptól
-		$diakTankorKileptetesOK[$diakId] = true;
-		for ($j = 0; $j < count($tankorIds); $j++) {
-            	    $_D = array('tankorId' => $tankorIds[$j], 'diakId' => $diakId, 'utkozes'=>'torles', 'tolDt' => date('Y-m-d', strtotime('+1 days', strtotime($kiDt))));
-		    $ret = tankorDiakTorol($_D, $lr);
-		    if ($ret === false) {
-			$_SESSION['alert'][] = 'message:wrong_data:osztalyNevsorModositas - tankorDiakTorol FAILED - diakId='.$diakId.' - tankorId='.$tankorIds[$j];
-            		$diakTankorKileptetesOK[$diakId] = false;
-		    }
-		}
-		// Visszajelzés
-		if (count($tankorIds) > 0 && $diakTankorKileptetesOK[$diakId] === true)
-		    $_SESSION['alert'][] = 'info:diak_tankorokben_lezarva:'.$diakId.':'.implode(',',$tankorIds).':'.$kiDt;
-		// Megjegyzés: a beDt előtti tankörtagságokat nem állítjuk be... mert a tankorOsztaly összerendelés változhat...
-	      }
-	
-	    }
-
-	    if (!in_array(false, array_values($diakTankorKileptetesOK))) {
-	    
-		// (osztalyId, diakId) kulcs, csak egy bejegyzés van...
-		if ($beDt == '') { 
-		    $q = "UPDATE osztalyDiak SET kiDt='%s' WHERE osztalyId=%u AND diakId IN (".implode(',', array_fill(0, count($diakIds), '%u')).")";
-		    array_unshift($diakIds, $kiDt, $osztalyId);
-		} elseif ($kiDt != '') { 
-		    $q = "UPDATE osztalyDiak SET beDt='%s', kiDt='%s' WHERE osztalyId=%u AND diakId IN (".implode(',', array_fill(0, count($diakIds), '%u')).")";
-		    array_unshift($diakIds, $beDt, $kiDt, $osztalyId);
-		} else { 
-		    $q = "UPDATE osztalyDiak SET beDt='%s', kiDt=NULL WHERE osztalyId=%u AND diakId IN (".implode(',', array_fill(0, count($diakIds), '%u')).")";
-		    array_unshift($diakIds, $beDt, $osztalyId);
-		}
-		$ret = db_query($q, array('fv' => 'osztalyNevsorModositas', 'modul' => 'naplo_intezmeny', 'values' => $diakIds, 'rollback' => true), $lr);
-		db_commit($lr);
-
-	    } else {
-		db_rollback($lr);
-		$ret = false;
-	    }
-    	    if ($olr!='') {
-
-	    } else {
-		db_close($lr);
-	    }
-
-	    return $ret;
-
-	} else { return false; } // nincs diakId
-
-}
-
-
-function osztalyLezaras($osztalyIds, $dt) {
-
-	global $mayorCache;
-	$mayorCache->delType('osztaly');
-
-	$dt = readVariable($dt, 'datetime', null);
-	if (!isset($dt)) return false;
-
-	if (!is_array($osztalyIds) && $osztalyIds != '') $osztalyIds = array($osztalyIds);
-	if (count($osztalyIds) == 0) return false;
-
-	// lekérdezzük az érintett osztályok végző tanévének legnagyobb zárás dátumát.
-	$q = "SELECT MAX(zarasDt) FROM osztaly LEFT JOIN szemeszter ON vegzoTanev = tanev 
-		WHERE osztalyId IN (".implode(',', array_fill(0, count($osztalyIds), '%u')).")";
-	$zarasDt = db_query($q, array('fv' => 'osztalyLezaras/ellenőrzés', 'modul' => 'naplo_intezmeny', 'result' => 'value', 'values' => $osztalyIds));
-
-	// Csak zarasDt utáni dátummal zárunk le osztályt!
-	if (strtotime($dt) < strtotime($zarasDt)) return false;
-
-	// Tagok kiléptetése
-	$q = "UPDATE osztalyDiak SET kiDt='%s' WHERE osztalyId IN (".implode(',', array_fill(0, count($osztalyIds), '%u')).") 
-		AND (kiDt IS NULL OR '%s' < kiDt)";
-	$v = mayor_array_join(array($dt), $osztalyIds, array($dt));
-	db_query($q, array('fv' => 'osztalyLezaras/tagok kiléptetése', 'modul' => 'naplo_intezmeny', 'values' => $v));
-
-	// Osztályfőnöki megbizatás lezárása
-	// - Az érintett tanárok lekérdezése
-	$q = "SELECT DISTINCT tanarId FROM osztalyTanar WHERE osztalyId IN (".implode(',', array_fill(0, count($osztalyIds), '%u')).") 
-		AND (kiDt IS NULL OR '%s' < kiDt)";	
-	$v = mayor_array_join($osztalyIds, array($dt));
-	$tanarIds = db_query($q, array('fv' => 'osztalyLezaras/tanárok kiléptetése', 'modul' => 'naplo_intezmeny', 'result' => 'idonly', 'values' => $v));
-	if (is_array($tanarIds) && count($tanarIds) > 0) {
-	    // - Az osztályfőnöki megbizatás lezárása
-	    $q = "UPDATE osztalyTanar SET kiDt='%s' WHERE osztalyId IN (".implode(',', array_fill(0, count($osztalyIds), '%u')).") 
-		    AND (kiDt IS NULL OR '%s' < kiDt)";
-	    $v = mayor_array_join(array($dt), $osztalyIds, array($dt));	
-	    db_query($q, array('fv' => 'osztalyLezaras/tanárok kiléptetése', 'modul' => 'naplo_intezmeny', 'values' => $v));
-
-	    // Az osztályfőnöki munkaközösség frissítése
-	    $q = "SELECT mkId FROM munkakozosseg WHERE leiras='osztályfőnöki'";
-	    $mkId = db_query($q, array('fv' => 'osztalyLezaras/tanárok kiléptetése', 'modul' => 'naplo_intezmeny', 'result' => 'value'));
-	    if ($mkId) { // Van egyáltalán osztályfőnöki munkaközösség
-		$q = "SELECT mkTanar.tanarId 
-			FROM mkTanar LEFT JOIN osztalyTanar ON mkTanar.tanarId=osztalyTanar.tanarId 
-			AND osztalyId NOT IN (".implode(',', array_fill(0, count($osztalyIds), '%u')).") 
-			WHERE mkId=%u AND mkTanar.tanarId IN (".implode(',', array_fill(0, count($tanarIds), '%u')).") 
-			GROUP BY mkTanar.tanarId HAVING COUNT(osztalyId)=0";
-		$v = mayor_array_join($osztalyIds, array($mkId), $tanarIds);
-		$ofoTanarIds = db_query($q, array(
-		    'fv' => 'osztalyLezaras/tanárok kiléptetése', 'modul' => 'naplo_intezmeny', 'result' => 'idonly', 'values' => $v
-		));
-		if (is_array($ofoTanarIds) && count($ofoTanarIds) > 0) {
-		    $q = "DELETE FROM mkTanar WHERE mkId=%u AND tanarId IN (".implode(',', array_fill(0, count($ofoTanarIds), '%u')).")";
-		    $v = mayor_array_join(array($mkId), $ofoTanarIds);
-		    db_query($q, array(
-			'fv' => 'osztalyLezaras/tanárok kiléptetése az osztályfőnöki munkaközösségből', 'modul' => 'naplo_intezmeny', 'values' => $v
-		    ));
-		}
-	    }
-	}
-	return true;
-
-}
-
-function osztalyDiakTorol($SET = array('osztalyId' => null, 'diakId' => null, 'tolDt' => null, 'igDt' => null, 'zaradekkal' => true), $olr='') {
-/*
-    1. Ha az intervallum belelóg valamelyik lezárt tanévbe, akkor afüggvény nem végzi el az osztályból va kiléptetést.
-    2. A $tolDt-$igDt közötti tankörtagságokat törli, ha a tankör nincs a diák másik tolDt-kori, vagy utána lévő osztályához is rendelve (tankoOsztaly)
-    3. Ha a tankörökből nem sikerül törölni, akkor visszagörgetés történik
-    4. A $tolDt-$igDt intervallumban törli a diák osztálytagságát ($igDt hiányában végig)
-    5. Záradékolás még nincs.
-*/
-
-	$diakId = readVariable($SET['diakId'], 'id');
-	$osztalyId = readVariable($SET['osztalyId'], 'id');
-	$tolDt = readVariable($SET['tolDt'], 'date');
-	$igDt = readVariable($SET['igDt'], 'date');
-	$zaradekkal = readVariable($SET['zaradekkal'], 'bool', false);
-
-        // Csatlakozás az adatbázishoz
-	if ($olr=='') {
-    	    $lr = db_connect('naplo_intezmeny', array('fv' => 'ujTag'));
-    	    if (!$lr) return false;
-    	    db_start_trans($lr);
-	} else {
-    	    $lr = $olr;
-	}
-	
-	// Ellenőrizzük, hogy $tolDt-$igDt nem érint-e lezárt szorgalmi időszakot
-	if (isset($igDt)) {
-	    $q = "SELECT DISTINCT tanev FROM szemeszter WHERE statusz IN ('lezárt','archivált') AND '%s'<=zarasDt AND kezdesDt<='%s'";
-	    $v = array($tolDt, $igDt);
-	} else {
-	    $q = "SELECT DISTINCT tanev FROM szemeszter WHERE statusz IN ('lezárt','archivált') AND '%s'<=zarasDt";
-	    $v = array($tolDt);
-	}
-	$ret = db_query($q, array('fv' => 'osztalyDiakTorol', 'modul' => 'naplo_intezmeny', 'result' => 'idonly', 'values' => $v), $lr);
-	if (is_array($ret) && count($ret) > 0) {
-	    $_SESSION['alert'][] = 'message:wrong_data:Lezárt tanév - '.implode(', ', $ret);
-	    if ($olr=='') {
-		db_rollback($lr);
-		db_close($lr);
-	    }
-	    return false;
-	}
-
-	// ----- Tankörök ------
-	// A diáknak mely tankörei érintettek (amikben a kiDt-kor, vagy utána benne van, de más (kiDt-kori, vagy későbbi) osztályához nem tartozik:
-	$q = "SELECT tankorId FROM tankorDiak WHERE diakId=%u AND (kiDt IS NULL or '%s'<=kiDt) AND tankorId NOT IN 
-			(SELECT DISTINCT tankorId FROM osztalyDiak LEFT JOIN tankorOsztaly USING(osztalyId) 
-			    WHERE diakId=%u AND (kiDt is NULL or '%s'<=kiDt) AND osztalyId <> %u)";
-	$v = array($diakId, $tolDt, $diakId, $tolDt, $osztalyId);
-	$tankorIds = db_query($q, array('fv' => 'osztalyDiakTorol', 'modul' => 'naplo_intezmeny', 'result' => 'idonly', 'values' => $v), $lr);
-
-    	// Tankörökből kivétel - $tolDt-től
-	$diakTankorKileptetesOK = true;
-	for ($j = 0; $j < count($tankorIds); $j++) {
-        	$_D = array('tankorId' => $tankorIds[$j], 'diakId' => $diakId, 'utkozes'=>'torles', 'tolDt' => $tolDt, 'igDt' => $igDt);
-		$ret = tankorDiakTorol($_D, $lr);
-		if ($ret === false) {
-		    $_SESSION['alert'][] = 'message:wrong_data:osztalyDiakTorol - tankorDiakTorol FAILED - diakId='.$diakId.' - tankorId='.$tankorIds[$j];
-            	    $diakTankorKileptetesOK = false;
-		    $R[] = false;
-		}
-	}
-	// Visszajelzés
-	if (count($tankorIds) > 0 && $diakTankorKileptetesOK[$diakId] === true) {
-		$_SESSION['alert'][] = 'info:diak_tankorokben_lezarva:'.$diakId.':'.implode(',',$tankorIds).':'.$tolDt.' - '.$igDt;
-		// Megjegyzés: a beDt előtti tankörtagságokat nem állítjuk be... mert a tankorOsztaly összerendelés változhat...
-	}
-
-	// ------- Tankörök vége------------
-
-        // Van-e már $tolDt-t tartalmazó osztálytagsága
-        $q = "SELECT beDt,kiDt FROM osztalyDiak WHERE osztalyId=%u AND diakId=%u AND beDt<'%s' AND (kiDt IS NULL OR kiDt >= '%s')";
-        $ret = db_query($q, array('fv' => 'osztalyDiakTorol/bal', 'modul' => 'naplo_intezmeny', 'result' => 'record', 'values' => array($osztalyId, $diakId, $tolDt, $tolDt)), $lr);
-        if (!is_null($ret)) {
-	    // Ha van, akkor azt levégjuk $tolDt előtt 1 nappal
-	    $q = "UPDATE osztalyDiak SET kiDt='%s' - INTERVAL 1 DAY WHERE osztalyId=%u AND diakId=%u AND beDt='%s'";
-    	    $R[] = db_query($q, array('fv' => 'osztalyDiakTorol/bal levágás', 'modul' => 'naplo_intezmeny', 'values' => array($tolDt, $osztalyId, $diakId, $ret['beDt'])), $lr);
-	    // Ha átnyuló tagság, akkor felvesszük a jobboldali szakaszt igDt után 1 nappal
-	    if (!is_null($igDt)) {
-	      if (is_null($ret['kiDt'])) { // kiDt NULL 
-		$q = "INSERT INTO osztalyDiak (osztalyId, diakId, beDt, kiDt) VALUES (%u, %u, '%s' + INTERVAL 1 DAY, NULL)";
-		$R[] = db_query($q, array('fv' => 'osztalyDiakTorol/jobb beszúrás', 'modul' => 'naplo_intezmeny', 'values' => array($osztalyId, $diakId, $igDt)), $lr);
-	      } elseif (strtotime($igDt) < strtotime($ret['kiDt'])) { // kiDt rögzített és túllóg igDt-n
-		$q = "INSERT INTO osztalyDiak (osztalyId, diakId, beDt, kiDt) VALUES (%u, %u, '%s' + INTERVAL 1 DAY, '%s')";
-		$R[] = db_query($q, array('fv' => 'osztalyDiakTorol/jobb beszúrás', 'modul' => 'naplo_intezmeny', 'values' => array($osztalyId, $diakId, $igDt, $ret['kiDt'])), $lr);
-	      }
-	    }
-	}
-	// Van-e $igDt-t tartalmazó osztály tagsága
-        if ($igDt != '') {
-    	    $q = "SELECT beDt FROM osztalyDiak WHERE osztalyId=%u AND diakId=%u AND beDt<'%s' AND (kiDt IS NULL OR kiDt >= '%s')";
-    	    $ret = db_query($q, array('fv' => 'osztalyDiakTorol/jobb', 'modul' => 'naplo_intezmeny', 'result' => 'record', 'values' => array($osztalyId, $diakId, $igDt, $igDt)), $lr);
-    	    if (!is_null($ret)) {
-		// Ha van, akkor azt levégjuk $igDt után 1 nappal
-		$q = "UPDATE osztalyDiak SET beDt='%s' + INTERVAL 1 DAY WHERE osztalyId=%u AND diakId=%u AND beDt='%s'";
-    		$R[] = db_query($q, array('fv' => 'osztalyDiakTorol/jobb levágás', 'modul' => 'naplo_intezmeny', 'values' => array($igDt, $osztalyId, $diakId, $ret['beDt'])), $lr);
-	    }
-    	    // A köztes tagságokat töröljük
-    	    $q = "DELETE FROM osztalyDiak WHERE osztalyId=%u AND diakId=%u AND '%s'<=beDt AND kiDt <= '%s'";
-    	    $R[] = db_query($q, array('fv' => 'osztalyDiakTorol', 'modul' => 'naplo_intezmeny', 'result' => 'record', 'values' => array($osztalyId, $diakId, $tolDt, $igDt)), $lr);
-	} else {
-    	    // A $tolDt utáni tagságokat töröljük
-    	    $q = "DELETE FROM osztalyDiak WHERE osztalyId=%u AND diakId=%u AND '%s'<=beDt";
-    	    $R[] = db_query($q, array('fv' => 'osztalyDiakTorol', 'modul' => 'naplo_intezmeny', 'result' => 'record', 'values' => array($osztalyId, $diakId, $tolDt)), $lr);
-	}
-
-        if ($olr=='') {
-	    if (in_array(false,$R)) {
-		db_rollback($lr);
-	    } else {
-		db_commit($lr);
-	    }
-    	    db_close($lr);
-	}
-	if (in_array(false,$R)) return false; else return true;
-}
-
-function osztalyTorzslapszamGeneralas($osztalyId) {
-
-    $q = "SELECT kezdoTanev, vegzoTanev FROM osztaly WHERE osztalyId=%u";
-    $oAdat = db_query($q, array('fv'=>'osztalyTorzslapszamGeneralas','modul'=>'naplo_intezmeny','result'=>'record','values'=>array($osztalyId)));
-    $range = range(intval($oAdat['kezdoTanev']), intval($oAdat['vegzoTanev']));
-
-    // A replace nem törli ki a hibás/felesleges bejegyzéseket...
-    $q = "DELETE FROM diakTorzslapszam WHERE osztalyId=%u";
-    db_query($q, array('fv'=>'osztalyTorzslapszamGeneralas/del','modul'=>'naplo_intezmeny','values'=>array($osztalyId)));
-
-    // Egyszerű insert-tel valamiért nem megy... ??
-    $q = "REPLACE INTO diakTorzslapszam
-	    SELECT %1\$u as osztalyId, diakId, @rank := @rank+1 AS torzslapszam FROM (
-		SELECT DISTINCT diakId";
-		foreach ($range as $ev) {
-		    $q .= ",ifnull(diakNaploSorszam(diakId, $ev, %1\$u),99) as ns".$ev;
-		}
-		$q .= " FROM osztalyDiak WHERE osztalyId=%1\$u ORDER BY ns".implode(', ns', $range)."
-	    ) t1, (SELECT @rank := 0) t2
-	    WHERE ns".implode('<>99 OR ns', $range)."<>99";
-
-    $return = db_query($q, array('debug'=>false,'fv'=>'osztalyTorzslapszamGeneralas/replace','modul'=>'naplo_intezmeny','result'=>'indexed','values'=>array($osztalyId)));
-
-    return $return;
-}
-
-?>
\ No newline at end of file
diff --git a/mayor-orig/www/include/modules/naplo/share/osztalyzatok.php b/mayor-orig/www/include/modules/naplo/share/osztalyzatok.php
deleted file mode 100644
index 321aaf4a..00000000
--- a/mayor-orig/www/include/modules/naplo/share/osztalyzatok.php
+++ /dev/null
@@ -1,342 +0,0 @@
- array('1.0','2.0','3.0','4.0','5.0'),
-	'sikertelen' => array('1.0'),
-	'átlagolható' => true,
-	'1.0' => array('rovid' => '1',   'hivatalos' => 'ELEGTELEN'),
-	'2.0' => array('rovid' => '2',   'hivatalos' => 'ELEGSEGES', 'megjegyzes' => 'figyelmeztető'),
-	'3.0' => array('rovid' => '3',   'hivatalos' => 'KOZEPES'),
-	'4.0' => array('rovid' => '4',   'hivatalos' => 'JO',),
-	'5.0' => array('rovid' => '5',   'hivatalos' => 'JELES', 'megjegyzes' => 'dicséret'),
-    );
-}
-// 2011. évi CXC. törvény 54. § (2) b)
-if (!isset($KOVETELMENY['magatartás']) || !is_array($KOVETELMENY['magatartás'])) {
-    $KOVETELMENY['magatartás']=array(
-	'értékek' => array('2.0','3.0','4.0','5.0'),
-	'sikertelen' => array(),
-	'átlagolható' => true,
-	'2.0' => array('rovid' => '2', 'hivatalos' => 'ROSSZ'),
-	'3.0' => array('rovid' => '3', 'hivatalos' => 'VALTOZO'),
-	'4.0' => array('rovid' => '4', 'hivatalos' => 'JO'),
-	'5.0' => array('rovid' => '5', 'hivatalos' => 'PELDAS'),
-    );
-}
-// 2011. évi CXC. törvény 54. § (2) c)
-if (!isset($KOVETELMENY['szorgalom']) || !is_array($KOVETELMENY['szorgalom'])) {
-    $KOVETELMENY['szorgalom']=array(
-	'értékek' => array('2.0','3.0','4.0','5.0'),
-	'sikertelen' => array(),
-	'átlagolható' => true,
-	'2.0' => array('rovid' => '2', 'hivatalos' => 'HANYAG'),
-	'3.0' => array('rovid' => '3', 'hivatalos' => 'VALTOZO'),
-	'4.0' => array('rovid' => '4', 'hivatalos' => 'JO'),
-	'5.0' => array('rovid' => '5', 'hivatalos' => 'PELDAS'),
-    );
-}
-// 2011. évi CXC. törvény 54. § (3)
-if (!isset($KOVETELMENY['négyszintű (szöveges minősítés)']) || !is_array($KOVETELMENY['négyszintű (szöveges minősítés)'])) {
-    $KOVETELMENY['négyszintű (szöveges minősítés)']= array(
-        'értékek' => array('1.0','2.0','3.0','4.0'),
-	'sikertelen' => array('1.0'),
-	'átlagolható' => false,
-        '1.0' => array('rovid' => 'FSZ',  'hivatalos' => 'FELZARKOZTATASRA_SZORUL'),
-        '2.0' => array('rovid' => 'MFT',    'hivatalos' => 'MEGFELELOEN_TELJESITETT'),
-        '3.0' => array('rovid' => 'JT',   'hivatalos' => 'JOL_TELJESITETT'),
-        '4.0' => array('rovid' => 'KT',   'hivatalos' => 'KIVALOAN_TELJESITETT'),
-    );
-}
-// 2011. évi CXC. törvény
-// 6. § (4) Az érettségi bizonyítvány kiadásának feltétele ötven óra közösségi szolgálat elvégzésének igazolása. A felnőttoktatás keretében szervezett érettségi vizsga esetében közösségi szolgálat végzésének igazolása nélkül is meg lehet kezdeni az érettségi vizsgát. A sajátos nevelési igényű tanulók esetében a szakértői bizottság ez irányú javaslata alapján a közösségi szolgálat mellőzhető.
-// 15. közösségi szolgálat: szociális, környezetvédelmi, a tanuló helyi közösségének javát szolgáló, szervezett keretek között folytatott, anyagi érdektől független, egyéni vagy csoportos tevékenység és annak pedagógiai feldolgozása,
-if (!isset($KOVETELMENY['teljesített óra']) || !is_array($KOVETELMENY['teljesített óra'])) {
-
-    $KOVETELMENY['teljesített óra']['sikertelen']= array(); // nem kötelező!
-    $KOVETELMENY['teljesített óra']['átlagolható']= false;
-    $KOVETELMENY['teljesített óra']['összeadható']= true;
-    for ($i=1; $i<=100; $i++) {
-	$_ertek = ($i%2 == 0) ? floor($i/2).'.0':floor($i/2).'.5';
-	$_mutat = ($i%2 == 0) ? floor($i/2):floor($i/2).',5';
-	$KOVETELMENY['teljesített óra']['értékek'][] = $_ertek;
-	$KOVETELMENY['teljesített óra'][$_ertek] = array('rovid'=>$_mutat.'ó', 'hivatalos'=>$_mutat.' óra');
-    }
-
-}
-// 2011. évi CXC. törvény 54. § (4)
-/*
-    A második évfolyam végén és a magasabb évfolyamokon félévkor és év végén a tanuló értékelésére - jóváhagyott
-    kerettanterv vagy az oktatásért felelős miniszter engedélyével - az iskola pedagógiai programja a (2) bekezdésben
-    meghatározottaktól eltérő jelölés, szöveges értékelés alkalmazását is előírhatja.
-*/
-if (!isset($KOVETELMENY['féljegy']) || !is_array($KOVETELMENY['féljegy'])) {
-    $KOVETELMENY['féljegy']= array(
-	'értékek' => array('1.0','1.5','2.0','2.5','3.0','3.5','4.0','4.5','5.0'),
-	'sikertelen' => array('1.0'),
-	'átlagolható' => true,
-	'1.0' => array('rovid' => '1', 'hivatalos' => 'ELEGTELEN'),
-	'1.5' => array('rovid' => '1/2', 'hivatalos' => '1/2'),
-	'2.0' => array('rovid' => '2',   'hivatalos' => 'ELEGSEGES', 'megjegyzes' => 'figyelmeztető'),
-	'2.5' => array('rovid' => '2/3', 'hivatalos' => '2/3'),
-	'3.0' => array('rovid' => '3',   'hivatalos' => 'KOZEPES'),
-	'3.5' => array('rovid' => '3/4', 'hivatalos' => '3/4'),
-	'4.0' => array('rovid' => '4',   'hivatalos' => 'JO',),
-	'4.5' => array('rovid' => '4/5', 'hivatalos' => '4/5'),
-	'5.0' => array('rovid' => '5',   'hivatalos' => 'JELES', 'megjegyzes' => 'dicséret'),
-    );
-}
-if (!isset($KOVETELMENY['százalékos']) || !is_array($KOVETELMENY['százalékos'])) {
-    for ($i=0; $i<=100; $i++) {
-	$_ertek = $i.'.0';
-	if ($i<20) $KOVETELMENY['százalékos']['sikertelen'][] = $_ertek;
-	$KOVETELMENY['százalékos']['értékek'][] = $_ertek;
-	$KOVETELMENY['százalékos'][$_ertek] = array('rovid'=>$i.'%', 'hivatalos'=>$i.'%');
-    }
-}
-if (!isset($KOVETELMENY['aláírás']) || !is_array($KOVETELMENY['aláírás'])) {
-    $KOVETELMENY['aláírás']=array(
-	'értékek' => array('1.0','2.0'),
-	'sikertelen' => array('1.0'),
-	'átlagolható' => false,
-	'1.0' => array('rovid' => '-', 'hivatalos' => 'MEGTAGADVA'),
-	'2.0' => array('rovid' => 'AI', 'hivatalos' => 'ALAIRVA'),
-    );
-}
-if (!isset($KOVETELMENY['háromszintű']) || !is_array($KOVETELMENY['háromszintű'])) {
-    $KOVETELMENY['háromszintű']=array(
-	'értékek' => array('1.0','2.0','3.0'),
-	'sikertelen' => array('1.0'),
-	'átlagolható' => false,
-	'1.0' => array('rovid' => 'NFM', 'hivatalos' => 'NEMFELELTMEG'),
-	'2.0' => array('rovid' => 'MF', 'hivatalos' => 'MEGFELELT'),
-	'3.0' => array('rovid' => 'KMF', 'hivatalos' => 'KIVALOANMEGFELELT'),
-    );
-}
-if (!isset($KOVETELMENY['nem értékelhető']) || !is_array($KOVETELMENY['nem értékelhető'])) {
-    $KOVETELMENY['nem értékelhető']=array(
-	'értékek' => array('1.0','2.0','3.0'),
-	'sikertelen' => array('2.0','3.0'),
-	'átlagolható' => false,
-	'1.0' => array('rovid' => 'Fm.', 'hivatalos' => 'FELMENTETT'),
-	'2.0' => array('rovid' => 'N.O.', 'hivatalos' => 'NEM_OSZTALYOZHATO'),
-	'3.0' => array('rovid' => 'N.J.M.', 'hivatalos' => 'NEM_JELENT_MEG')
-    );
-}
-
-
-    if (is_array($KOVETELMENY)) {
-	foreach ($KOVETELMENY as $k1 => $T) {
-	    foreach ($T as $key => $val) {
-		if (defined('_'.$val['hivatalos'])) $KOVETELMENY[$k1][$key]['hivatalos'] = constant('_'.$val['hivatalos']);
-		if (defined('_'.$val['rovid'])) $KOVETELMENY[$k1][$key]['rovid'] = constant('_'.$val['rovid']);
-	    }
-	    if (!isset($KOVETELMENY[$k1]['átlagolható'])) $KOVETELMENY[$k1]['átlagolható'] = true;
-	    if (!isset($KOVETELMENY[$k1]['összeadható'])) $KOVETELMENY[$k1]['összeadható'] = false;
-	}
-    }
-    $jegyTipusok = array(
-	_TOROLT, _KIS_JEGY, _NORMAL_JEGY, _DOLGOZAT, _TEMAZARO, _VIZSGAJEGY
-    );
-
-    $bizonyitvanyJegyzetek = array(
-        'dicséret' => _JEGYZET_DICSERET,
-        'figyelmeztető' => _JEGYZET_FIGYELMEZTETO,
-	'nyelvvizsga' => _JEGYZET_NYELVVIZSGA
-    );
-
-    $bizonyitvanyMegjegyzesek = array(
-	'figyelmeztető' => _FIGYELMEZTETO,
-	'nyelvvizsga' => _NYELVVIZSGA,
-	'dicséret' => _DICSERET,
-	'2.0' => array('figyelmeztető'),
-	'5.0' => array('dicséret','nyelvvizsga')
-    );
-
-    // A kitűnő megállapításához csak az átlagot vesszük figyelembe
-    if (!defined('_KITUNO_ATLAG')) define('_KITUNO_ATLAG', 5.0);
-    // jelesrendű, aki a megadott átlag fölött van és nincs a megadott jegynél gyengébb eredménye egyik tárgyból sem
-    if (!defined('_JELES_ATLAG')) define('_JELES_ATLAG', 4.75);
-    if (!defined('_JELES_LEGGYENGEBB_JEGY')) define('_JELES_LEGGYENGEBB_JEGY', 3);
-
-
-    /////////////////////////////////////////////////////////////////////
-
-    // Visszatérési értékek
-    // ----------------------------
-
-    //	TOMB[ diakId ] [ targyId ] [ index 0..(n-1) ] VAGY $SET['arraymap'] szerinti
-
-    // !! Ez szigorúan a $szAdat['kezdesDt'] és $szAdat['zarasDt'] között szerzett osztályzatokat adja vissza!
-
-    /////////////////////////////////////////////////////////////////////
-/*
-// Törlendő!!
-    function getDiakZarojegyekByEvfolyam($diakIds, $evfolyam='', $szAdat='', $SET = array('arraymap'=>null)) { // csak evfolyam, evfolyamJelet nem kezel!
-	if (count($diakIds)<1) return false;
-	elseif (!is_array($diakIds)) $diakIds = array($diakIds);
-	if (!is_array($SET['arraymap'])) $SET['arraymap'] = array('diakId','targyId');
-	$values = $diakIds;
-	if (is_array($szAdat) && $szAdat['szemeszter']!='') {
-	    $qSZ =  " AND evfolyam=%u AND '%s' <= hivatalosDt AND hivatalosDt <= '%s' AND felev=%u"; // eredetileg felev>=%u (???)
-	    $values[] = $evfolyam;
-	    $values[] = $szAdat['kezdesDt'];
-	    $values[] = $szAdat['zarasDt'];
-	    $values[] = $szAdat['szemeszter'];
-	} elseif ($evfolyam!='') {
-	    $qSZ = " AND evfolyam=%u ";
-	    $values[] = $evfolyam;
-	}
-        $q = "SELECT * FROM zaroJegy WHERE diakId IN (".implode(',', array_fill(0, count($diakIds), '%u')).") $qSZ ORDER BY felev, hivatalosDt";
-        $r = db_query($q, array('fv' => 'getDiakZarojegyekbyEvfolyam', 'modul' => 'naplo_intezmeny', 'result' => 'indexed', 'values' => $values));
-	$ret = reindex($r,$SET['arraymap']);
-        return $ret;
-    }
-*/
-    // Az előző függvény évfolyamJel-es változata + a félévkor záruló tárgyak jegyei
-    function getDiakZarojegyekByEvfolyamJel($diakIds, $evfolyamJel='', $szAdat='', $SET = array('arraymap'=>null)) {
-	if (count($diakIds)<1) return false;
-	elseif (!is_array($diakIds)) $diakIds = array($diakIds);
-	if (!is_array($SET['arraymap'])) $SET['arraymap'] = array('diakId','targyId');
-	$values = $diakIds;
-	$evfolyam = evfolyamJel2Evfolyam($evfolyamJel);
-	if (is_array($szAdat) && $szAdat['szemeszter']!='') {
-	    $qSZ =  " AND (evfolyamJel='%s' OR (evfolyamJel IS NULL AND evfolyam=%u)) AND '%s' <= hivatalosDt AND hivatalosDt <= '%s' AND felev=%u";
-	    $values[] = $evfolyamJel;
-	    $values[] = $evfolyam;
-	    $values[] = $szAdat['kezdesDt'];
-	    $values[] = $szAdat['zarasDt'];
-	    $values[] = $szAdat['szemeszter'];
-	} elseif ($evfolyamJel!='') {
-	    $qSZ = " AND (evfolyamJel='%s' OR (evfolyamJel IS NULL AND evfolyam=%u)) ";
-	    $values[] = $evfolyamJel;
-	    $values[] = $evfolyam;
-	}
-        $q = "SELECT * FROM zaroJegy WHERE diakId IN (".implode(',', array_fill(0, count($diakIds), '%u')).") 
-		    $qSZ ORDER BY felev, hivatalosDt";
-        $r = db_query($q, array('fv' => 'getDiakZarojegyekbyEvfolyamJel', 'modul' => 'naplo_intezmeny', 'result' => 'indexed', 'values' => $values));
-	$arraymap = $SET['arraymap'];
-
-	// A félévkor lezáruló tárgyak félévi zárójegyei:
-	if ($SET['felevivel'] == true && (!is_array($szAdat) || $szAdat['szemeszter'] == 2)) {
-	    $SET['arraymap'] = 'indexed';
-	    $r2 = getDiakFeleviZarojegyekByEvfolyamJel($diakIds, $evfolyamJel, $szAdat, $SET);
-	    for ($i=0; $inull)) {
-	if (count($diakIds)<1) return false;
-	elseif (!is_array($diakIds)) $diakIds = array($diakIds);
-	$values = $diakIds;
-	// A képzésenként a félévkor lezáruló tárgyak lekérdezése az adott évfolyamon
-	$q = "SELECT zaroJegy.* FROM zaroJegy LEFT JOIN kepzesDiak USING (diakId) 
-		WHERE diakId IN (".implode(',', array_fill(0, count($diakIds), '%u')).")
-		AND felev=1";
-	if ($evfolyamJel != '') { $q .= " AND evfolyamJel='%s'"; $values[] = $evfolyamJel; }
-	$q .= " AND CONCAT_WS('-',kepzesId,targyId,evfolyamJel) IN (
-		    SELECT CONCAT_WS('-',kepzesId, targyId, evfolyamJel) FROM kepzesOraterv GROUP BY kepzesId, targyId, evfolyamJel HAVING MAX(szemeszter)=1
-		) 
-		ORDER BY felev, hivatalosDt";
-        $r = db_query($q, array('fv' => 'getDiakFeleviZarojegyekbyEvfolyamJel', 'modul' => 'naplo_intezmeny', 'result' => 'indexed', 'values' => $values));
-	if ($SET['arraymap'] == 'indexed') $ret = $r;
-	else {
-	    if (!is_array($SET['arraymap'])) $SET['arraymap'] = array('diakId','targyId');
-	    $ret = reindex($r,$SET['arraymap']);
-	}
-        return $ret;
-    }
-
-
-    function getDiakZarojegyek($diakIds, $tanev='', $szemeszter='', $SET = array('arraymap'=>null)) {
-	if (count($diakIds)<1) return false;
-	elseif (!is_array($diakIds)) $diakIds = array($diakIds);
-	if (!is_array($SET['arraymap'])) $SET['arraymap'] = array('diakId','targyId');
-	$values = $diakIds;
-	if ($szemeszter!='') {
-	    $qSZ =  " AND tanev=%u AND szemeszter=%u";
-	    $values[] = $tanev;
-	    $values[] = $szemeszter;
-	} elseif ($tanev!='') {
-	    $qSZ = " AND tanev=%u ";
-	    $values[] = $tanev;
-	}
-        $q = "SELECT * FROM zaroJegy
-		    LEFT JOIN szemeszter ON kezdesDt<=hivatalosDt AND hivatalosDt<=zarasDt
-		    WHERE diakId IN (".implode(',', array_fill(0, count($diakIds), '%u')).") ".$qSZ;
-        $r = db_query($q, array('fv' => 'getDiakZarojegyek', 'modul' => 'naplo_intezmeny', 'result' => 'indexed', 'values' => $values));
-	$ret = reindex($r,$SET['arraymap']);
-        return $ret;
-    }
-
-    function getDiakokZarojegyeiByTargyId($DIAKIDS, $targyId, $SET = array('tanev'=>__TANEV, 'arraymap'=>null)) {
-
-	global $_TANEV;
-	// default
-	$BIZ = array();
-	if ($SET['tanev']=='') $tanev = __TANEV; else $tanev = $SET['tanev'];
-	if (!is_array($SET['arraymap'])) $SET['arraymap'] = array('diakId','evfolyamJel','szemeszter');
-
-	// walk
-	if (count($DIAKIDS) > 0) {
-            $q = "SELECT *, IF(evfolyamJel IS NULL,evfolyam,evfolyamJel) AS evfolyamStr FROM ".__INTEZMENYDBNEV.".zaroJegy
-		    LEFT JOIN szemeszter ON kezdesDt <= hivatalosDt AND hivatalosDt <= zarasDt
-                    WHERE targyId=%u
-                    AND tanev=%u
-                    AND diakId IN (".implode(",", $DIAKIDS).")";
-            array_unshift($DIAKIDS, $targyId, $tanev);
-            $ret = db_query($q, array('fv' => 'getDiakokZarojegyeiByTargyId', 'modul' => 'naplo_intezmeny', 'result' => 'indexed', 'values' => $DIAKIDS));
-	    $BIZ = reindex($ret,$SET['arraymap']);
-	}
-	return $BIZ;
-    }
-
-    function getDiakokVizsgajegyeiByTargyId($DIAKIDS, $targyId, $SET = array('arraymap'=>null)) {
-	// default
-	$BIZ = array();
-	if (!is_array($SET['arraymap'])) $SET['arraymap'] = array('zaroJegyId');
-
-	// walk
-	if (count($DIAKIDS) > 0) {
-            $q = "SELECT *, IF(evfolyamJel IS NULL,evfolyam,evfolyamJel) AS evfolyamStr FROM vizsga
-                    WHERE vizsga.targyId=%u
-                    AND vizsga.diakId IN (".implode(",", $DIAKIDS).")";
-            array_unshift($DIAKIDS, $targyId);
-            $ret = db_query($q, array('fv' => 'getDiakokVizsgajegyeiByTargyId', 'modul' => 'naplo_intezmeny', 'result' => 'indexed', 'values' => $DIAKIDS));
-	    $BIZ = reindex($ret,$SET['arraymap']);
-	}
-	return $BIZ;
-    }
-
-    function getZaroJegyAdat($zaroJegyId) {
-	$q = "SELECT * FROM zaroJegy WHERE zaroJegyId=%u";
-	$v = array($zaroJegyId);
-	return $r = db_query($q, array('fv' => 'getZaroJegyId', 'modul' => 'naplo_intezmeny', 'result' => 'record', 'values' => $v));
-    }
-    function getJegyAdat($jegyId) {
-	$q = "SELECT * FROM jegy 
-	    LEFT JOIN ".__INTEZMENYDBNEV.".tankor USING (tankorId) 
-	    LEFT JOIN ".__INTEZMENYDBNEV.".tankorTipus USING (tankorTipusId) 
-	    LEFT JOIN dolgozat USING (dolgozatId) 
-	    WHERE jegyId=%u";
-	$v = array($jegyId);
-	return $r = db_query($q, array('fv' => 'getJegyId', 'modul' => 'naplo', 'result' => 'record', 'values' => $v));
-    }
-
-?>
diff --git a/mayor-orig/www/include/modules/naplo/share/rpc.php b/mayor-orig/www/include/modules/naplo/share/rpc.php
deleted file mode 100644
index 23e543fc..00000000
--- a/mayor-orig/www/include/modules/naplo/share/rpc.php
+++ /dev/null
@@ -1,29 +0,0 @@
-'getRPCPrivileges','modul'=>'naplo_base','result'=>'indexed'));
-
-    }
-    function getRPCPrivilegeByNUO($nodeId, $userAccount, $OMKod) {
-
-	$q = "SELECT priv FROM rpcJogosultsag WHERE nodeId=%u AND userAccount='%s' AND OMKod=%u";
-	$v = array($nodeId, $userAccount, $OMKod);
-	return db_query($q, array('fv'=>'getRPCPrivileges','modul'=>'naplo_base','result'=>'value','values'=>$v));
-
-    }
-    function addNodeToRPCPrivs($DATA) {
-
-	$q = "INSERT INTO rpcJogosultsag (nodeId, userAccount, OMKod) VALUES (%u, '%s', %u)";
-	$v = array($DATA['nodeId'], $DATA['userAccount'], $DATA['OMKod']);
-	return db_query($q, array('debug'=>false,'fv'=>'addNodeToRPCPrivs','modul'=>'naplo_base','values'=>$v));
-
-    }
-    function setPrivileges($DATA) {
-	$q = "UPDATE rpcJogosultsag SET priv='%s' WHERE nodeId=%u AND userAccount='%s' AND OMKod=%u";
-	$v = array(implode(',',$DATA['priv']),$DATA['nodeId'],$DATA['userAccount'],$DATA['OMKod']);
-	return db_query($q, array('debug'=>false,'fv'=>'setPrivileges','modul'=>'naplo_base','values'=>$v));
-    }
-
-?>
\ No newline at end of file
diff --git a/mayor-orig/www/include/modules/naplo/share/sni.php b/mayor-orig/www/include/modules/naplo/share/sni.php
deleted file mode 100644
index 61f20bb2..00000000
--- a/mayor-orig/www/include/modules/naplo/share/sni.php
+++ /dev/null
@@ -1,54 +0,0 @@
- 'getDiakAdat','modul' => 'naplo','values' => $v, 'result' => 'record'));
-
-    }
-
-    function getHaviOsszegzes($diakId, $dt) {
-
-        $q = "SELECT * FROM sniHaviOsszegzes WHERE diakId=%u AND MONTH(dt)=MONTH('%s')";
-        $v = array($diakId, $dt);
-        $ret = db_query($q, array('fv' => 'getHaviOsszegzes', 'modul' => 'naplo', 'values' => $v, 'result' => 'record'));
-
-	$q = "SELECT tanarId FROM sniHaviOsszegzesFelelos WHERE haviOsszegzesId = %u";
-	$ret['felelos'] = db_query($q, array('fv' => 'getHaviOsszegzes', 'modul' => 'naplo', 'values' => array($ret['haviOsszegzesId']), 'result' => 'idonly'));
-
-	return $ret;
-
-    }
-
-    function sniHaviOsszegzesRogzites($Param) {
-
-	$Felelos = $Param['felelos']; unset($Param['felelos']);
-        // Korábbi bejegyzés törlése
-        $q = "SELECT haviOsszegzesId FROM sniHaviOsszegzes WHERE diakId = %u AND dt = '%s'";
-        $v = array($Param['diakId'], $Param['dt']);
-        $Param['haviOsszegzesId'] = db_query($q, array('fv' => 'sniHaviOsszesitesRogzites', 'modul' => 'naplo', 'values' => $v, 'result' => 'value'));
-        // Paraméterek feldolgozása
-        $pattern = $v = array();
-        foreach ($Param as $attr => $value) {
-        	if (in_array($attr, array('diakId','haviOsszegzesId','valtozas')))
-            	    if ($value == '') { $pattern[] = '%s'; $value = 'NULL'; }
-            	    else $pattern[] = "%u";
-        	else
-        	    $pattern[] = "'%s'";
-        	$v[] = $value;
-        }
-        // új bejegyzés beszúrása
-        $q = "REPLACE INTO `sniHaviOsszegzes` (`".implode('`,`',array_keys($Param))."`) VALUES (".implode(',', $pattern).")";
-        $id = db_query($q, array('fv' => 'sniHaviOsszegzesRogzites', 'modul' => 'naplo', 'values' => $v, 'result' => 'insert'));
-	// felelosok törlése
-	$q = "DELETE FROM `sniHaviOsszegzesFelelos` WHERE haviOsszegzesId = %u";
-	$ret = db_query($q, array('fv' => 'sniHaviOsszegzesRogzites', 'modul' => 'naplo', 'values' => array($id)));
-	// új felelősök felvétele
-	if (is_array($Felelos) && count($Felelos) > 0) {
-	    $q = "INSERT INTO `sniHaviOsszegzesFelelos` (`haviOsszegzesId`,`tanarId`) VALUES ".implode(',', array_fill(0, count($Felelos), "($id, %u)"));
-	    $ret = db_query($q, array('fv' => 'sniHaviOsszegzesRogzites', 'modul' => 'naplo', 'values' => $Felelos));
-	}
-	return $ret;
-    }
-?>
diff --git a/mayor-orig/www/include/modules/naplo/share/szemeszter.php b/mayor-orig/www/include/modules/naplo/share/szemeszter.php
deleted file mode 100644
index dae760ee..00000000
--- a/mayor-orig/www/include/modules/naplo/share/szemeszter.php
+++ /dev/null
@@ -1,176 +0,0 @@
- array('aktív', 'lezárt', 'tervezett'), 'filter' => array())) {
-	global $mayorCache;
-        if (!isset($SET)) $SET = array('statusz' => array('aktív','lezárt','tervezett'));
-
-	$key = __FUNCTION__.':'.md5(serialize($SET));
-	if ($mayorCache->exists($key)) return $mayorCache->get($key);
-
-        $q = "SELECT * FROM szemeszter ";
-	if (is_array($SET['statusz']) && count($SET['statusz']) != 0) {
-	    $q .="WHERE statusz IN ('".implode("','", array_fill(0, count($SET['statusz']), '%s'))."')";
-	    $v = $SET['statusz'];
-	    $kapocs = "AND ";
-	} else { 
-	    $kapocs = "WHERE "; $v = array(); 
-	}
-	if (is_array($SET['filter']) && count($SET['filter']) != 0) {
-	    $q .= $kapocs . implode(' AND ',$SET['filter']);
-	}
-	$q .= ' ORDER BY tanev,szemeszter';
-        $r = db_query($q, array('fv' => 'getSzemeszterek', 'modul' => 'naplo_intezmeny', 'result' => 'indexed', 'values' => $v));
-	$mayorCache->set($key,$r,'szemeszter');
-	return $r;
-    }
-
-    function getSzemeszterByDt($dt, $tipus = 0) {
-	/*
-	     0 - a szemeszter tartalmazza a dátumot
-	     1 - a dátum napján, vagy utána végződő első szemeszter
-	    -1 - a dátum napján vagy előtte kezdődő első szemeszter 
-	*/
-	if ($tipus < 0) $q = "SELECT * FROM szemeszter WHERE szemeszter.kezdesDt <= '%s' ORDER BY kezdesDt DESC LIMIT 1";
-	elseif ($tipus > 0) $q = "SELECT * FROM szemeszter WHERE szemeszter.zarasDt >= '%s' ORDER BY zarasDt LIMIT 1";
-        else $q = "SELECT * FROM szemeszter WHERE szemeszter.kezdesDt <= '%s' AND szemeszter.zarasDt >= '%s'";
-	$v = array($dt, $dt);
-	return db_query($q, array('modul' => 'naplo_intezmeny', 'fv' => 'getSzemeszterByDt', 'result' => 'record', 'values' => $v, 'debug' => false));
-    }
-
-    function getSzemeszterIdByDt($dt) {
-        $q = "SELECT szemeszterId FROM szemeszter WHERE szemeszter.kezdesDt<='%s' AND szemeszter.zarasDt>='%s'";
-	return db_query($q, array('fv' => 'getSzemeszterIdByDt', 'modul' => 'naplo_intezmeny', 'result' => 'value', 'values' => array($dt, $dt)));		       
-    }
-
-    function getKovetkezoSzemeszterId($tanev,$szemeszter,$aktiv=null) {
-	if ($aktiv!='') $W = ' AND statusz="aktív" ';
-	$q = "SELECT szemeszterId FROM szemeszter WHERE CONCAT(szemeszter.tanev,szemeszter)>'%s' $W ORDER BY tanev,szemeszter LIMIT 1";
-	return db_query($q, array(
-	    'fv' => 'getKovetkezoSzemeszterId', 'modul' => 'naplo_intezmeny', 'result' => 'value', 'values' => array($tanev.$szemeszter)
-	));
-    }
-
-    function getFelevByDt($dt) {
-        $q = "SELECT szemeszter AS felev FROM szemeszter WHERE szemeszter.kezdesDt<='%s' AND szemeszter.zarasDt>='%s'";
-	$v = array($dt,$dt);
-	return db_query($q, array('fv' => 'getFelevByDt', 'modul' => 'naplo_intezmeny', 'result' => 'value', 'values' => $v));
-    }
-
-    function getTanevekByDt($dt) {
-        $q = "SELECT DISTINCT tanev FROM szemeszter WHERE szemeszter.kezdesDt<='%s' and szemeszter.zarasDt>='%s'";
-	$v = array($dt, $dt);
-	return db_query($q, array('fv' => 'getTanevByDt', 'modul' => 'naplo_intezmeny', 'result' => 'indexed', 'values' => $v));
-    }
-
-    function getTanevekByDtInterval($dt1, $dt2 = '', $statusz = array('aktív','lezárt','tervezett')) {
-	/*
-	    A dátumot lefedő tanévek közül azok, amik státusza megfelelő
-	*/
-	$dt2 = readVariable($dt2, 'datetime', $dt1);
-	$q = "SELECT DISTINCT tanev FROM szemeszter WHERE statusz in ('".implode("','", array_fill(0, count($statusz), '%s'))."') GROUP BY tanev 
-		HAVING '$dt1'<=MAX(szemeszter.zarasDt) AND MIN(szemeszter.kezdesDt)<='$dt2'";
-	array_push($statusz, $dt1, $dt2);
-	return db_query($q, array('modul' => 'naplo_intezmeny', 'fv' => 'getTanevByDtInterval', 'result' => 'idonly', 'values' => $statusz));
-    }
-
-    function getTanevekByStatusz($statusz = array('aktív','lezárt','tervezett')) {
-	$q = "SELECT DISTINCT tanev FROM szemeszter WHERE statusz in ('".implode("','", array_fill(0, count($statusz), '%s'))."') GROUP BY tanev";
-	return db_query($q, array('modul' => 'naplo_intezmeny', 'fv' => 'getTanevByDtInterval', 'result' => 'idonly', 'values'=>$statusz));
-    }
-
-    function getTanevSzemeszterek($tanev) {
-        $q = "SELECT * FROM szemeszter WHERE tanev=%u";
-	return db_query($q, array('fv' => 'getTanevSzemeszterek', 'modul' => 'naplo_intezmeny', 'result' => 'indexed', 'values' => array($tanev)));
-    }
-
-    function getSzemeszterAdatById($szemeszterId) {
-        $q = "SELECT * FROM szemeszter WHERE szemeszterId = %u";
-	$ret = db_query($q, array('fv' => 'getSzemeszterAdatById', 'modul' => 'naplo_intezmeny', 'result' => 'record', 'values' => array($szemeszterId)));
-	if (!is_array($ret)) return false;
-
-        $ret['idoszak'] = getIdoszakByTanev(array('tanev' => $ret['tanev'], 'szemeszter' => $ret['szemeszter']));
-        $q = "SELECT tanev,MAX(szemeszter) AS maxSzemeszter, MIN(kezdesDt) AS kezdesDt, MAX(zarasDt) AS zarasDt FROM szemeszter
-                WHERE tanev=%u GROUP BY tanev";
-        $ret['tanevAdat'] = db_query($q, array(
-	    'fv' => 'getSzemeszterAdatById', 'modul' => 'naplo_intezmeny', 'result' => 'record', 'values' => array($ret['tanev'])
-	));
-        return $ret;
-    }
-
-    function getSzemeszterIdBySzemeszter($tanev, $szemeszter) {
-
-	$q = "SELECT szemeszterId FROM szemeszter WHERE tanev=%u AND szemeszter=%u";
-	$v = array($tanev, $szemeszter);
-	return db_query($q, array('fv' => 'getSzemeszterIdBySzemeszter', 'modul' => 'naplo_intezmeny', 'result' => 'value', 'values' => $v));
-
-    }
-/* (Még) nem használt függvény
-
-    function getSzemeszterAdatBySzemeszter($tanev, $szemeszter) {
-
-	$szemeszterId = getSzemeszterIdBySzemeszter($tanev, $szemeszter);
-	if ($szemeszterId === false) return false;
-	return getSzemeszterAdatById($szemeszterId);
-
-    }
-
-*/
-    function getIdoszakByTanev($SET = array('tanev' => __TANEV, 'szemeszter' => '', 'tipus' => array(), 'tolDt' => '', 'igDt' => '', 'return' => '', 'arraymap'=>null)) {
-
-	if ($SET['tanev']=='') $SET['tanev'] = __TANEV;
-
-        if ($SET['szemeszter'] != '') {
-	    $q = "SELECT * FROM idoszak WHERE tanev=%u AND szemeszter=%u";
-	    $v = array($SET['tanev'], $SET['szemeszter']);
-        } else {
-	    $q = "SELECT * FROM idoszak WHERE tanev=%u";
-	    $v = array($SET['tanev']);
-	}
-        if (is_array($SET['tipus']) && count($SET['tipus']) > 0) {
-	    $q .= " AND tipus IN ('".implode("','", array_fill(0, count($SET['tipus']), '%s'))."')";
-	    $v = mayor_array_join($v, $SET['tipus']);
-	}
-        if ($SET['tolDt'] != '') {
-	    $q .= " AND igDt >= '%s'";
-	    $v[] = $SET['tolDt'];
-	}
-        if ($SET['igDt'] != '') {
-	    $q .= " AND tolDt <= '%s'";
-	    $v[] = $SET['igDt'];
-	}
-
-        $q .= " ORDER BY szemeszter,tolDt,igDt";
-        $ret = db_query($q, array('fv' => 'getIdoszakByTanev', 'modul' => 'naplo_intezmeny', 'result' => 'indexed', 'values' => $v));
-
-        if ($SET['return'] == 'assoc') {
-            $tmp = array();
-            for ($i = 0; $i < count($ret); $i++) {
-                $tmp[ $ret[$i]['szemeszter'] ][ $ret[$i]['tipus'] ][] = $ret[$i];
-            }
-            $ret = $tmp;
-        }
-
-	if (is_array($SET['arraymap'])) {
-	    $ret = reindex($ret,$SET['arraymap']);
-	}
-
-        return $ret;
-
-    }
-
-
-    function getTanevAdatBySzemeszterId( $szemeszterId ) {
-	if ($szemeszterId=='') return false;
-	$q = "SELECT * FROM szemeszter WHERE szemeszterId=%u";
-	$v = array($szemeszterId);
-	$R['szemeszter'] = db_query($q, array(
-	    'fv' => 'getTanevAdatBySzemeszterId', 'modul'=>'naplo_intezmeny', 'result' => 'assoc', 'keyfield' => 'szemeszter', 'values' => $v
-	));
-	// legyen az első az alapértelmezett
-	$R['statusz'] = $R['szemeszter'][1]['statusz'];
-	$R['tanev'] = $R['szemeszter'][1]['tanev'];
-	// a két dárum innen hiányzik!
-	return $R;
-    }
-
-?>
diff --git a/mayor-orig/www/include/modules/naplo/share/szovegesErtekeles.php b/mayor-orig/www/include/modules/naplo/share/szovegesErtekeles.php
deleted file mode 100644
index 1026979b..00000000
--- a/mayor-orig/www/include/modules/naplo/share/szovegesErtekeles.php
+++ /dev/null
@@ -1,206 +0,0 @@
- 'getSzempontRendszer', 'modul' => 'naplo_intezmeny', 'result' => 'record', 'values' => $v));
-	if (!is_array($ret) || count($ret) == 0) return false;
-
-	$szrId = $ret['szrId'];
-	// szempontok lekérdezése
-	$q = "SELECT * FROM szrSzempont WHERE szrId=%u ORDER BY szempontId";
-	$ret['szempont'] = db_query($q, array(
-	    'fv' => 'getSzempontRendszer/szempont', 'modul' => 'naplo_intezmeny', 'result' => 'assoc', 'keyfield' => 'szempontId', 'values' => array($szrId)
-	));
-	// minősítések lekérdezése
-	$ret['minosites'] = array();
-	if (is_array($ret['szempont']) && count($ret['szempont']) > 0) {
-	    $ret['szempontIds'] = array_keys($ret['szempont']);
-	    $v = array_keys($ret['szempont']);
-	    $q = "SELECT * FROM szrMinosites WHERE szempontId IN (".implode(',', array_fill(0, count($v), '%u')).") ORDER BY szempontId,minositesId";
-	    $ret['minosites'] = db_query($q, array(
-		'fv' => 'getSzempontRendszer/minősítés', 'modul' => 'naplo_intezmeny', 'result' => 'multiassoc', 'keyfield' => 'szempontId', 'values' => $v
-	    ));
-	    if (is_array($ret['minosites'])) {
-		$ret['minositesIds'] = array();
-		foreach ($ret['minosites'] as $szId => $szM)
-		    for ($i = 0; $i < count($szM); $i++) $ret['minositesIds'][] = $szM[$i]['minositesId'];
-	    }
-	}
-	return $ret;
-    }
-
-    function getDiakSzovegesTargyZaroErtekeles($diakId, $szrId, $targyId, $tanev, $szemeszter) {
-/*
-	$q = "SELECT MAX(dt) FROM szovegesErtekeles WHERE szrId=%u AND diakId=%u AND targyId=%u AND dt<='%s'";
-	$v = array($szrId, $diakId, $targyId, $igDt);
-	$dt = db_query($q, array('fv' => 'getDiakUtolsoSzovegesTargyErtekeles/maxDt', 'modul' => 'naplo', 'result' => 'value', 'values' => $v));
-	if (!isset($dt)) return false;
-	$ret['dt'] = $dt;
-*/
-	// szeId lekérdezése
-	$q = "SELECT * FROM szovegesErtekeles WHERE szrId=%u AND diakId=%u AND targyId=%u AND tanev=%u AND szemeszter=%u";
-	$v = array($szrId, $diakId, $targyId, $tanev, $szemeszter);
-	$ret = db_query($q, array(
-	    'fv' => 'getDiakSzovegesTargyZaroErtekeles/szeId', 'modul' => 'naplo_intezmeny', 'result' => 'record', 'values' => $v
-	));
-	$szeId = $ret['szeId'];
-	// minősítések lekérdezése
-	$q = "SELECT minositesId FROM szeMinosites WHERE szeId=%u";
-	$v = array($szeId);
-	$ret['minosites'] = db_query($q, array(
-	    'fv' => 'getDiakSzovegesTargyZaroErtekeles/minosites', 'modul' => 'naplo_intezmeny', 'result' => 'idonly', 'values' => $v
-	));
-	// Egyedi minősítések lekérdezése
-	$q = "SELECT szempontId, egyediMinosites FROM szeEgyediMinosites WHERE szeId=%u";
-	$ret['egyediMinosites'] = db_query($q, array(
-	    'fv' => 'getDiakSzovegesTargyZaroErtekeles', 'modul' => 'naplo_intezmeny', 
-	    'result' => 'assoc', 'keyfield' => 'szempontId', 'values' => $v
-	));
-
-	return $ret;
-
-    }
-
-    function getDiakUtolsoSzovegesTargyErtekeles($diakId, $szrId, $targyId, $igDt) {
-
-	$q = "SELECT MAX(dt) FROM szovegesErtekeles WHERE szrId=%u AND diakId=%u AND targyId=%u AND dt<='%s'";
-	$v = array($szrId, $diakId, $targyId, $igDt);
-	$dt = db_query($q, array('fv' => 'getDiakUtolsoSzovegesTargyErtekeles/maxDt', 'modul' => 'naplo', 'result' => 'value', 'values' => $v));
-	if (!isset($dt)) return false;
-	$ret['dt'] = $dt;
-
-	// szeId lekérdezése
-	$q = "SELECT * FROM szovegesErtekeles WHERE szrId=%u AND diakId=%u AND targyId=%u AND dt='%s'";
-	$v = array($szrId, $diakId, $targyId, $dt);
-	$ret = db_query($q, array(
-	    'fv' => 'getDiakUtolsoSzovegesTargyErtekeles/szeId', 'modul' => 'naplo', 'result' => 'record', 'values' => $v
-	));
-	$szeId = $ret['szeId'];
-	// minősítések lekérdezése
-	$q = "SELECT minositesId FROM szeMinosites WHERE szeId=%u";
-	$v = array($szeId);
-	$ret['minosites'] = db_query($q, array(
-	    'fv' => 'getDiakUtolsoSzovegesTargyErtekeles/minosites', 'modul' => 'naplo', 'result' => 'idonly', 'values' => $v
-	));
-	// Egyedi minősítések lekérdezése
-	$q = "SELECT szempontId, egyediMinosites FROM szeEgyediMinosites WHERE szeId=%u";
-	$ret['egyediMinosites'] = db_query($q, array(
-	    'fv' => 'getDiakUtolsoSzovegesTargyErtekeles/egyediMinosites', 'modul' => 'naplo', 
-	    'result' => 'assoc', 'keyfield' => 'szempontId', 'values' => $v
-	));
-
-	return $ret;
-    }
-
-    function getDiakOsszesSzovegesErtekeles($ADAT) {
-
-        $q = "SELECT * FROM szovegesErtekeles WHERE diakId=%u AND dt<='%s' ORDER BY dt";
-	$v = array($ADAT['diakId'], $ADAT['dt']);
-        $ret = db_query($q, array('fv' => 'getDiakOsszesSzovegesErtekeles', 'modul' => 'naplo', 'result' => 'assoc', 'keyfield' => 'targyId', 'values' => $v));
-
-        foreach ($ret as $targyId => $tAdat) {
-            $tAdat['feltetel'] = 'id';
-            $ret[$targyId]['szempontRendszer'] = getSzempontRendszer($tAdat);
-            $ret[$targyId]['szovegesErtekeles'] = getDiakUtolsoSzovegesTargyErtekeles($ADAT['diakId'], $tAdat['szrId'], $targyId, $ADAT['dt']);
-            $ret[$targyId]['diakTargyak'] = $ADAT['diakTargyak'];
-        }
-
-        return $ret;
-    }
-
-    function getDiakOsszesSzovegesZaroErtekeles($ADAT) {
-
-        $q = "SELECT * FROM szovegesErtekeles WHERE diakId=%u AND tanev=%u AND szemeszter=%u ORDER BY dt";
-	$v = array($ADAT['diakId'], $ADAT['tanev'], $ADAT['szemeszter']);
-        $ret = db_query($q, array('fv' => 'getDiakOsszesSzovegesZaroErtekeles', 'modul' => 'naplo_intezmeny', 'result' => 'assoc', 'keyfield' => 'targyId', 'values' => $v));
-
-        foreach ($ret as $targyId => $tAdat) {
-            $tAdat['feltetel'] = 'id';
-            $ret[$targyId]['szempontRendszer'] = getSzempontRendszer($tAdat);
-            $ret[$targyId]['szovegesErtekeles'] = getDiakSzovegesTargyZaroErtekeles($ADAT['diakId'], $tAdat['szrId'], $targyId, $ADAT['tanev'], $ADAT['szemeszter']);
-            $ret[$targyId]['diakTargyak'] = $ADAT['diakTargyak'];
-        }
-
-        return $ret;
-    }
-
-    function getOsztalySzovegesErtekeles($ADAT) {
-	// Ha van $ADAT['szemeszterId'] akkor záró értékelést ad vissza, különben évközit
-	$A = array(
-	    'dt' => $ADAT['dt'], 'diakTargyak' => $ADAT['diakTargyak'], 
-	    'tanev' => $ADAT['szemeszter']['tanev'], 'szemeszter' => $ADAT['szemeszter']['szemeszter']
-	);
-	$ret = array();
-	if (isset($ADAT['szemeszterId'])) foreach ($ADAT['diakIds'] as $index => $diakId) {
-	    $A['diakId'] = $diakId;
-	    $ret[$diakId] = getDiakOsszesSzovegesZaroErtekeles($A);
-	} else foreach ($ADAT['diakIds'] as $index => $diakId) {
-	    $A['diakId'] = $diakId;
-	    $ret[$diakId] = getDiakOsszesSzovegesErtekeles($A);
-
-	}
-
-	return $ret;
-
-    }
-
-    function getEvfolyamJelSzempontRendszerek($ADAT) {
-	// Legalább tanev, szemeszter, evfolyamJel kell megadva legyen, lehet még targy, targyTipus, kepzesId
-	// Visszaadja az összes épp aktuális, a feltételeknek megfelelő szempontrendszert
-	$q = "SELECT szr1.*, targyNev, kepzesNev, kepzes.tanev as kepzesTanev 
-		FROM szempontRendszer AS szr1 LEFT JOIN targy USING (targyId) LEFT JOIN kepzes USING (kepzesId) 
-		WHERE evfolyamJel='%s' AND CONCAT(szr1.tanev,'/',szr1.szemeszter) = (
-		    SELECT CONCAT(szr2.tanev,'/',szr2.szemeszter) FROM szempontRendszer AS szr2
-		    WHERE szr2.evfolyamJel='%s' 
-		    AND (szr2.targyId=szr1.targyId OR (szr1.targyId IS NULL AND szr2.targyId IS NULL)) 
-		    AND (szr2.targyTipus=szr1.targyTipus OR (szr1.targyTipus IS NULL AND szr2.targyTipus IS NULL))
-		    AND (szr2.kepzesId=szr1.kepzesId OR (szr1.kepzesId IS NULL AND szr2.kepzesId IS NULL))
-		    AND ((szr2.tanev=%u AND szr2.szemeszter<=%u) OR szr2.tanev<%u)
-		    ORDER BY szr2.tanev DESC, szr2.szemeszter DESC LIMIT 1
-		)";
-	$v = array($ADAT['evfolyamJel'], $ADAT['evfolyamJel'], $ADAT['szemeszter']['tanev'], $ADAT['szemeszter']['szemeszter'], $ADAT['szemeszter']['tanev'] );
-	if (isset($ADAT['targyId'])) { 
-	    $q .= " AND targyId=".intval($ADAT['targyId']);
-	    $v[] = $ADAT['targyId'];
-	}
-	if (isset($ADAT['targyTipus'])) {
-	    $q .= " AND targyTipus='".$ADAT['targyTipus']."'";
-	    $v[] = $ADAT['targyTipus'];
-	}
-	if (isset($ADAT['kepzesId'])) {
-	    $q .=  " AND kepzesId=".intval($ADAT['kepzesId']);
-	    $v[] = $ADAT['kepzesId'];
-	}
-
-	$ret = db_query($q, array('fv' => 'getEvfolyamJelSzempontRendszerek', 'modul' => 'naplo_intezmeny', 'result' => 'indexed', 'values' => $v));
-	return $ret;
-    }
-
-?>
diff --git a/mayor-orig/www/include/modules/naplo/share/szulo.php b/mayor-orig/www/include/modules/naplo/share/szulo.php
deleted file mode 100644
index aa15797b..00000000
--- a/mayor-orig/www/include/modules/naplo/share/szulo.php
+++ /dev/null
@@ -1,76 +0,0 @@
-'getSzuloAdat','modul'=>'naplo_intezmeny','result'=>'record','values'=>array($szuloId)));
-
-    }
-
-    function getSzulok($SET = array('csakId'=>false,'result'=>'','szuloIds'=>array())) {
-
-	if (is_array($SET['szuloIds']) && count($SET['szuloIds']) > 0 && count($SET['szuloIds']) < 50 ) $W_SZULO = ' WHERE szuloId IN ('.implode(',',$SET['szuloIds']).')';
-	if ($SET['csakId'] === true || $SET['result'] == 'csakId') $SET['result'] = 'idonly';
-	if ($SET['result'] == 'idonly') {
-	    $q = "SELECT szuloId
-		FROM ".__INTEZMENYDBNEV.".szulo $W_SZULO
-		ORDER BY CONCAT_WS(' ',csaladinev,utonev)";	    
-	    $ret = db_query($q, array('fv' => 'getSzulok', 'modul' => 'naplo_intezmeny', 'result' => 'idonly'));
-	} elseif ($SET['result']=='standard') {
-	    $q = "SELECT *,TRIM(CONCAT_WS(' ',nevElotag,csaladinev,utonev)) AS szuloNev 
-		FROM ".__INTEZMENYDBNEV.".szulo $W_SZULO
-		ORDER BY CONCAT_WS(' ',csaladinev,utonev)";	    
-	    $ret = db_query($q, array('fv' => 'getSzulok', 'modul' => 'naplo_intezmeny', 'result' => 'indexed'));
-	} elseif ($SET['result']=='indexed') {
-	    $q = "SELECT szuloId,TRIM(CONCAT_WS(' ',nevElotag,csaladinev,utonev)) AS szuloNev, statusz
-		FROM ".__INTEZMENYDBNEV.".szulo $W_SZULO
-		ORDER BY CONCAT_WS(' ',csaladinev,utonev)";	    
-	    $ret = db_query($q, array('fv' => 'getSzulok', 'modul' => 'naplo_intezmeny', 'result' => 'indexed'));
-	} else {
-	    $q = "SELECT *,TRIM(CONCAT_WS(' ',nevElotag,csaladinev,utonev)) AS szuloNev 
-		FROM ".__INTEZMENYDBNEV.".szulo $W_SZULO
-		ORDER BY CONCAT_WS(' ',csaladinev,utonev)";
-	    $ret = db_query($q, array('fv' => 'getSzulok', 'modul' => 'naplo_intezmeny', 'keyfield' => 'szuloId', 'result' => 'assoc'));
-	    foreach ($ret as $szuloId => $adat) $ret['szuloIds'][] = $szuloId;
-	}
-	return $ret;
-
-    }
-
-    function getSzuloDiakjai() {
-        $q = "SELECT diak.diakId AS diakId,".
-                    "TRIM(CONCAT_WS(' ',viseltNevElotag,viseltCsaladiNev,viseltUtonev)) AS diakNev ".
-                 "FROM szulo LEFT JOIN diak ON (szuloId IN (anyaId,apaId,gondviseloId,neveloId)) ".
-                 "WHERE szulo.userAccount='"._USERACCOUNT."'";
-        return db_query($q, array('fv' => 'getSzuloDiakjai', 'modul' => 'naplo_intezmeny', 'result' => 'indexed'));
-    }
-
-    function getSzulokDiakjai($szuloIds) {
-        $q = "SELECT szuloId, diak.diakId AS diakId,".
-                    "TRIM(CONCAT_WS(' ',viseltNevElotag,viseltCsaladiNev,viseltUtonev)) AS diakNev ".
-                 "FROM szulo LEFT JOIN diak ON (szuloId IN (anyaId,apaId,gondviseloId,neveloId)) ".
-                 "WHERE szuloId IN (".implode(',', array_fill(0, count($szuloIds), '%u')).")";
-        return db_query(
-	    $q, array('fv' => 'getSzulokDiakjai','modul' => 'naplo_intezmeny', 'result' => 'multiassoc', 'keyfield' => 'szuloId', 'values' => $szuloIds)
-	);
-    }
-
-    function getDiakSzulei($diakId) {
-        $q = "SELECT anyaId,apaId,gondviseloId,neveloId ".
-                 "FROM diak ".
-                 "WHERE diakId=%u";
-        return db_query($q,array('fv' => 'getDiakSzulei', 'modul' => 'naplo_intezmeny', 'result' => 'indexed', 'values' => array($diakId)));
-    }
-
-
-    function getSzuloNevById($szuloId, $szuleteskori=false) {
-	if ($szuleteskori) {
-    	    $q = "SELECT IF(szuleteskoriCsaladinev='',TRIM(CONCAT_WS(' ', nevElotag, csaladiNev, utonev)),TRIM(CONCAT_WS(' ', szuleteskoriNevElotag, szuleteskoriCsaladinev, szuleteskoriUtonev))) AS szuloNev FROM szulo WHERE szuloId=%u";
-	} else {
-    	    $q = "SELECT TRIM(CONCAT_WS(' ', nevElotag, csaladiNev, utonev)) AS szuloNev FROM szulo WHERE szuloId=%u";
-	}
-        return db_query($q, array('fv' => 'getszuloNevById', 'modul' => 'naplo_intezmeny', 'result' => 'value', 'values' => array($szuloId)));
-    }
-
-    
-?>
diff --git a/mayor-orig/www/include/modules/naplo/share/tanar.php b/mayor-orig/www/include/modules/naplo/share/tanar.php
deleted file mode 100644
index 5e23e4ec..00000000
--- a/mayor-orig/www/include/modules/naplo/share/tanar.php
+++ /dev/null
@@ -1,194 +0,0 @@
- _TANAR_OID,
-	'viseltNevElotag' => _TANAR_VNE,
-	'viseltCsaladiNev' => _TANAR_VCSN,
-	'viseltUtonev' => _TANAR_VUN,
-	'szuletesiHely' => _TANAR_SZH,
-	'szuletesiIdo' => _TANAR_SZI,
-    );
-
-    function getTanarok($SET = array('targyId'=> null,'mkId' => null, 'tanev' => __TANEV, 'beDt' => null, 'kiDt' => null, 'összes'=> false, 'override' => false, 'telephelyId'=>null, 'result' => 'indexed', 'extraAttrs' => null), $olr = '') {
-
-	$result = readVariable($SET['result'], 'enum', 'indexed', array('indexed', 'assoc'));
-	$beDt = $SET['beDt']; $kiDt = $SET['kiDt'];
-	initTolIgDt($SET['tanev'], $beDt, $kiDt, $SET['override']);
-
-	$where = $v = array();
-	if ($SET['összes']!==true && in_date_interval(date('Y-m-d H:m:s'),$beDt,$kiDt)==true) { // ha nincs benne a mai nap a vizsgált intervallumban, akkor értelmetlen (lehet) ez a feltétel
-	    $where[] = "statusz IN ('határozatlan idejű','határozott idejű','külső óraadó')";
-	}
-	if ($beDt != '') {
-	    $where[] = "((kiDt IS NULL) OR '%s' <= kiDt)";
-	    array_push($v, $beDt);
-	}
-	if ($kiDt != '') { 
-	    $where[] = "'%s' >= beDt";
-	    array_push($v, $kiDt);
-	}
-	if ($SET['extraAttrs'] != '') $extraAttrs = ', '.$SET['extraAttrs'];
-
-/*
-	if ($SET['telephelyId'] != '') { 
-	    $where[] = " (telephelyId = %u OR telephelyId IS NULL) ";
-	    array_push($v, $SET['telephelyId']);
-	}
-	// 2015-08-06 - aktualisStatusz kiiktatása - statusz mező megjelenése miatt...
-	IF( beDt <= CURDATE() AND (kiDt IS NULL OR CURDATE()<=kiDt),'jogviszonyban van','nincs jogviszonyban') as aktualisStatusz, 
-*/
-	if ($SET['targyId'] != '') {
-	    if (count($where) > 0) $W = 'AND ' . implode(' AND ',$where);
-	    
-	    $q1 = "SELECT tanar.tanarId AS tanarId, TRIM(CONCAT_WS(' ',viseltNevElotag, ViseltCsaladiNev, viseltUtoNev)) AS tanarNev, statusz, 
-		    hetiKotelezoOraszam,hetiLekotottMinOraszam,hetiLekotottMaxOraszam,hetiKotottMaxOraszam,hetiMunkaora
-			$extraAttrs
-		FROM ".__INTEZMENYDBNEV.".targy LEFT JOIN ".__INTEZMENYDBNEV.".mkTanar USING (mkId) LEFT JOIN ".__INTEZMENYDBNEV.".tanar USING (tanarId)
-		WHERE targyId=%u AND tanarId IS NOT NULL ".$W;
-	    $q2 = "SELECT tanar.tanarId AS tanarId, TRIM(CONCAT_WS(' ',viseltNevElotag, ViseltCsaladiNev, viseltUtoNev)) AS tanarNev, statusz,
-		    hetiKotelezoOraszam,hetiLekotottMinOraszam,hetiLekotottMaxOraszam,hetiKotottMaxOraszam,hetiMunkaora
-			$extraAttrs
-		FROM ".__INTEZMENYDBNEV.".kepesitesTargy LEFT JOIN ".__INTEZMENYDBNEV.".tanarKepesites USING (kepesitesId) LEFT JOIN ".__INTEZMENYDBNEV.".tanar USING (tanarId)
-		WHERE targyId=%u AND tanarId IS NOT NULL ".$W;
-	    array_unshift($v, $SET['targyId']);
-	    $tmp=$v; foreach ($tmp as $tmpV) $v[]=$tmpV;
-	    $q = "(".$q1.") UNION DISTINCT (".$q2.") ORDER BY tanarNev,tanarId";
-	} elseif ($SET['mkId'] == '') {
-	    if (count($where) > 0) $W = 'WHERE ' . implode(' AND ',$where);
-	    $q = "SELECT tanarId, TRIM(CONCAT_WS(' ',viseltNevElotag, ViseltCsaladiNev, viseltUtoNev)) AS tanarNev, statusz,
-		    hetiKotelezoOraszam,hetiLekotottMinOraszam,hetiLekotottMaxOraszam,hetiKotottMaxOraszam,hetiMunkaora
-			$extraAttrs
-		FROM ".__INTEZMENYDBNEV.".tanar $W ORDER BY CONCAT_WS(' ', ViseltCsaladiNev, viseltUtoNev)";
-	} else {
-	    if (count($where) > 0) $W = 'AND ' . implode(' AND ',$where);
-	    $q = "SELECT tanar.tanarId AS tanarId, TRIM(CONCAT_WS(' ',viseltNevElotag, ViseltCsaladiNev, viseltUtoNev)) AS tanarNev, statusz,
-		    hetiKotelezoOraszam,hetiLekotottMinOraszam,hetiLekotottMaxOraszam,hetiKotottMaxOraszam,hetiMunkaora
-			$extraAttrs
-		FROM ".__INTEZMENYDBNEV.".tanar LEFT JOIN ".__INTEZMENYDBNEV.".mkTanar USING (tanarId)
-		WHERE mkId=%u $W ORDER BY CONCAT_WS(' ', ViseltCsaladiNev, viseltUtoNev)";
-	    array_unshift($v, $SET['mkId']);
-	}
-	return db_query($q, array('fv' => 'getTanarok', 'modul' => 'naplo_intezmeny', 'result' => $result, 'keyfield' => 'tanarId', 'values' => $v));
-
-    }
-
-    function getTanarNevById($tanarId, $olr = null) {
-
-	$q = "SELECT TRIM(CONCAT_WS(' ', viseltNevElotag, viseltCsaladiNev, viseltUtonev)) AS tanarNev
-		FROM ".__INTEZMENYDBNEV.".tanar WHERE tanarId=%u";
-	return db_query($q, array('fv' => 'getTanarNevById', 'modul' => 'naplo_intezmeny', 'result' => 'value', 'values' => array($tanarId)), $olr);
-
-    }
-
-    function getTanarMunkakozosseg($tanarId) {
-	$q = "SELECT mkId FROM mkTanar WHERE tanarId=%u";
-	return db_query($q, array('fv' => 'getTanarMunkakozosseg', 'modul' => 'naplo_intezmeny', 'result' => 'idonly', 'values' => array($tanarId)));
-    }
-
-    function getSzabadTanarok($dt, $ora, $olr = '') {
-
-	$q = "SELECT tanar.tanarId AS tanarId, TRIM(CONCAT_WS(' ',viseltNevElotag, ViseltCsaladiNev, viseltUtoNev)) AS tanarNev
-		FROM ".__INTEZMENYDBNEV.".tanar LEFT JOIN ora ON tanarId=ki AND dt='%1\$s' and ora=%2\$u
-		WHERE ki IS NULL AND beDt<='%1\$s' and (kiDt IS NULL OR kiDt>='%1\$s')
-		ORDER BY CONCAT_WS(' ', ViseltCsaladiNev, viseltUtoNev)";
-	$v = array($dt, $ora);
-	return db_query($q, array('fv' => 'getSzabadTanarok', 'modul' => 'naplo', 'result' => 'indexed', 'values' => $v), $olr);
-    }
-
-    function getFoglaltTanarok($dt, $ora, $olr = '') {
-
-	$q = "SELECT DISTINCT tanar.tanarId AS tanarId, TRIM(CONCAT_WS(' ',viseltNevElotag, ViseltCsaladiNev, viseltUtoNev)) AS tanarNev
-		FROM ".__INTEZMENYDBNEV.".tanar LEFT JOIN ora ON tanarId=ki AND dt='%1\$s' and ora=%2\$u
-		WHERE ki IS NOT NULL AND beDt<='%1\$s' and (kiDt IS NULL OR kiDt>='%1\$s')
-		ORDER BY CONCAT_WS(' ', ViseltCsaladiNev, viseltUtoNev)";
-	$v = array($dt, $ora);
-	return db_query($q, array('fv' => 'getFoglaltTanarok', 'modul' => 'naplo', 'result' => 'indexed', 'values' => $v), $olr);
-    }
-
-    function getTanarAdatById($tanarIds, $olr = '') {
-
-        if (!is_array($tanarIds)) $tanarIds = array($tanarIds);
-        $q = "SELECT *,TRIM(CONCAT_WS(' ',viseltNevElotag, ViseltCsaladiNev, viseltUtoNev)) AS tanarNev FROM ".__INTEZMENYDBNEV.".tanar WHERE tanarId IN (".implode(',', array_fill(0, count($tanarIds), '%u')).")";
-	$R = db_query($q, array('fv' => 'getTanarAdatById', 'modul' => 'naplo_intezmeny', 'result' => 'indexed', 'values' => $tanarIds));
-//	for ($i=0; $i 'getTanarOraszam', 'modul' => 'naplo_intezmeny', 'result' => 'value', 'values' => $v), $olr);
-    }
-/*
-    NOT IMPLEMENTED
-
-    function getTanarTelephely($tanarId) {
-
-	$q = "SELECT * FROM tanarTelephely WHERE tanarId=%u";
-	$v = array($tanarId);
-	$r = db_query($q, array('fv' => 'getTanarOraszam', 'modul' => 'naplo_intezmeny', 'result' => 'indexed', 'values' => $v), $olr);
-	for ($i=0; $i 'getTanarOraszam', 'modul' => 'naplo_intezmeny', 'result' => 'indexed', 'values' => $v), $olr);
-	for ($i=0; $i
diff --git a/mayor-orig/www/include/modules/naplo/share/tanarModifier.php b/mayor-orig/www/include/modules/naplo/share/tanarModifier.php
deleted file mode 100644
index 05174959..00000000
--- a/mayor-orig/www/include/modules/naplo/share/tanarModifier.php
+++ /dev/null
@@ -1,14 +0,0 @@
- $v) {
-		$kv[] = "$k='%s'";
-	    }
-	    $q = "UPDATE tanar SET ".implode($kv,',')." WHERE tanarId=%u";
-	}
-	$v = array_merge(array_values($SET),array($tanarId));
-	return db_query($q, array('fv' => 'updateTanarAdat', 'modul' => 'naplo_intezmeny', 'result' => 'update', 'values' => $v), $olr);
-    }
-
-?>
diff --git a/mayor-orig/www/include/modules/naplo/share/tankor.php b/mayor-orig/www/include/modules/naplo/share/tankor.php
deleted file mode 100644
index 705ab82f..00000000
--- a/mayor-orig/www/include/modules/naplo/share/tankor.php
+++ /dev/null
@@ -1,1180 +0,0 @@
- 'checkTankorInTanev', 'modul' => 'naplo_intezmeny', 'result' => 'indexed', 'values' => array($tanev, $tankorId)), $olr
-	);
-	return (count($r) != 0);
-    }
-
-    function getTankorAdat($tankorId, $tanev = __TANEV, $olr = null) {
-	$q = "SELECT * FROM tankor 
-			LEFT JOIN tankorSzemeszter USING (tankorId)
-			LEFT JOIN tankorTipus USING (tankorTipusId)
-		WHERE tankor.tankorId=%u AND tanev=%u";
-	return db_query($q, 
-	    array('fv' => 'getTankorAdat', 'modul' => 'naplo_intezmeny', 'result' => 'multiassoc', 'keyfield' => 'tankorId', 'values' => array($tankorId, $tanev)), $olr
-	);
-    }
-
-    function getTankorAdatByIds($tankorIds, $SET = array('tanev' => __TANEV, 'dt' => '')) {
-
-	if (!is_array($tankorIds)) return false;
-	if (in_array('',$tankorIds)==true) {
-	    // ez előállhat akkor is, ha valamiért az órarendben NULL tankorId van (speckó óra!)
-	    // $_SESSION['alert'][] = 'message:invalid_array_value_exception:(getTankorAdatByIds:tankorIds:contains empty string)';
-	    // clean array
-	    $tankorIds = array_filter(array_unique($tankorIds),'_isempty');
-	}
-	$tanev = $SET['tanev'];
-	// Ha valid a tanev... ??? Aktív???
-	if ($SET['dt']!='') {
-	    $dt = $SET['dt'];
-	    $SZ = getSzemeszterByDt($dt);
-	    if (is_array($SZ) && $SZ['tanev'] != '') {
-		$tanev = $SZ['tanev'];
-		$felev = $SZ['szemeszter'];
-	    } else { // a referencia dátum kívül esik a tanéven, legyen a default
-		$tanev = __TANEV;
-		$felev = 1;
-	    }
-	    $q = "SELECT * FROM tankor 
-			LEFT JOIN tankorSzemeszter ON (tankor.tankorId=tankorSzemeszter.tankorId)
-		WHERE tankor.tankorId IN (".implode(',', array_fill(0, count($tankorIds), '%u')).") AND tanev=%u AND szemeszter=%u";
-
-	    array_push($tankorIds, $tanev, $felev);
-	    return db_query($q, array(
-		'fv' => 'getTankorAdatByIds', 'modul' => 'naplo_intezmeny', 'result' => 'assoc', 'keyfield' => 'tankorId', 'values' => $tankorIds
-	    ));
-	} elseif ($tanev!='') {
-	    $q = "SELECT * FROM tankor 
-			LEFT JOIN tankorSzemeszter ON (tankor.tankorId=tankorSzemeszter.tankorId)
-		WHERE tankor.tankorId IN (".implode(',', array_fill(0, count($tankorIds), '%u')).") AND tanev=%u";
-	    array_push($tankorIds, $tanev);
-	    return db_query($q, array(
-		'fv' => 'getTankorAdatByIds', 'modul' => 'naplo_intezmeny', 'result' => 'multiassoc', 'keyfield' => 'tankorId', 'values' => $tankorIds
-	    ));
-	}
-	return false;
-    }
-
-    function getTankorTargyId($tankorId) {
-	$q = "SELECT targyId FROM tankor WHERE tankor.tankorId=%u";
-	return db_query($q, array('fv' => 'getTankorTargyId', 'modul' => 'naplo_intezmeny', 'result' => 'value', 'values' => array($tankorId)));
-    }
-
-    function getTankorMkId($tankorId) {
-	$q = "SELECT mkId FROM tankor LEFT JOIN targy USING (targyId) WHERE tankor.tankorId=%u";
-	return db_query($q, array('fv' => 'getTankorMkId', 'modul' => 'naplo_intezmeny', 'result' => 'value', 'values' => array($tankorId)));		
-    }
-
-    function getTankorByMkId($mkId, $tanev, $SET = array('csakId' => false,'filter' => array()) ) {
-
-	global $_TANEV, $__tankorOrder;
-
-	if ($tanev == __TANEV) $TA = $_TANEV; else $TA = getTanevAdat($tanev);
-	$szsz = count($TA['szemeszter']);
-
-	if (count($SET['filter']) > 0) $W = ' AND '.implode(' AND ',$SET['filter']); else $W = '';
-
-	if ($SET['csakId'] !== true) {
-    	    $q = "SELECT tankor.tankorId AS tankorId, tankorNev, tankorTipusId, targy.targyId AS targyId, kovetelmeny, jelenlet, felveheto,
-			 tanev, szemeszter, SUM(oraszam)/%u AS oraszam
-		    FROM tankor LEFT JOIN targy USING (targyId)
-		    		LEFT JOIN tankorSzemeszter ON (tankor.tankorId=tankorSzemeszter.tankorId)
-				LEFT JOIN tankorTipus USING (tankorTipusId)
-		    WHERE tanev=%u AND mkId=%u $W
-		    GROUP BY tankorId
-		    ORDER BY $__tankorOrder";
-	    $v = array($szsz, $tanev, $mkId);
-	    if ($SET['result'] == 'multiassoc') {
-		$RESULT = db_query($q, array(
-		    'fv' => 'getTankorByMkId', 'modul' => 'naplo_intezmeny', 'result' => 'multiassoc', 'keyfield' => 'tankorId', 'values' => $v
-		));
-	    } else {
-		$RESULT = db_query($q, array(
-		    'fv' => 'getTankorByMkId', 'modul' => 'naplo_intezmeny', 'result' => 'indexed', 'values' => $v
-		));
-		$tolDt = isset($SET['tolDt']) ? $SET['tolDt'] : $TA['kezdesDt'];
-		$igDt = isset($SET['igDt']) ? $SET['igDt'] : $TA['zarasDt'];
-		for($i = 0; $i < count($RESULT); $i++) {
-		    $RESULT[$i]['tanarok'] = getTankorTanaraiByInterval(
-			$RESULT[$i]['tankorId'], 
-			array('tanev' => $tanev, 'tolDt' => $tolDt, 'igDt' => $igDt, 'result' => 'nevsor',
-			    'datumKenyszeritessel' => $SET['datumKenyszeritessel']
-			)
-		    );
-		}
-	    }
-	} else {
-    	    $q = "SELECT tankor.tankorId AS tankorId
-		     FROM tankor LEFT JOIN targy USING (targyId)
-		    		 LEFT JOIN tankorSzemeszter ON (tankor.tankorId=tankorSzemeszter.tankorId)
-				 WHERE tanev=%u AND mkId=%u $W
-				 GROUP BY tankorId
-		     ORDER BY $__tankorOrder";
-	    $v = array($tanev, $mkId);
-	    $RESULT = db_query($q, array('fv' => 'getTankorByMkId', 'modul' => 'naplo_intezmeny', 'result' => 'idonly', 'values' => $v));	
-	}
-	return $RESULT;
-    }
-
-    /*
-        A megadott osztályokhoz - és csak azokhoz - rendelt tankörök listája
-    */
-    function getTankorByOsztalyIds($osztalyIds, $tanev = __TANEV) { // csak Id-kkel tér vissza
-
-            $q = "SELECT DISTINCT tankorId FROM tankorOsztaly LEFT JOIN tankorSzemeszter USING (tankorId)
-                    WHERE osztalyId IN (".implode(',', array_fill(0, count($osztalyIds), '%u')).") AND tanev=%u
-                    AND tankorId NOT IN (
-                        SELECT DISTINCT tankorId FROM tankorOsztaly LEFT JOIN tankorSzemeszter USING (tankorId)
-                        WHERE osztalyId NOT IN (".implode(',', array_fill(0, count($osztalyIds), '%u')).") AND tanev=%u
-                    )";
-	    $v = mayor_array_join($osztalyIds, array($tanev), $osztalyIds, array($tanev));
-            return db_query($q, array('fv' => 'getTankorByOsztalyIds', 'modul' => 'naplo_intezmeny', 'result' => 'idonly', 'values' => $v));
-    }
-
-    function getTankorByTeremId($teremId, $tanev = __TANEV) { // KIVÉTEL speciális függvény, teremben levő órák tankörei - tesztelés alatt
-
-            $q = "SELECT tankor.* FROM ora LEFT JOIN ".__INTEZMENYDBNEV.".tankor USING (tankorId) WHERE teremId = %u GROUP BY tankorId";
-	    $v = array($teremId);
-            return db_query($q, array('fv' => 'getTankorByTeremId', 'debug'=>false,'modul' => 'naplo', 'result' => 'indexed', 'values' => $v));
-    }
-
-
-    function getTankorByOsztalyId($osztalyId, $tanev = __TANEV, $SET = array('csakId' => false, 'tanarral' => false, 'result' => '')) {
-
-	global $__tankorOrder;
-
-	$v = array($osztalyId, $tanev);
-	if ($SET['csakId'] == true || $SET['result'] == 'idonly') {
-
-// Felesleges a tankor tábla a lekérdezésben - nem?
-//	    $q = "SELECT DISTINCT tankor.tankorId
-//		FROM tankor LEFT JOIN tankorSzemeszter USING (tankorId)
-//		LEFT JOIN tankorOsztaly USING (tankorId)
-//		WHERE osztalyId=%u AND tanev=%u
-//		ORDER BY LPAD(substring_index(substring_index(tankorNev,'-',1),'.',1),2,'0'),tankorNev,tanev,szemeszter";
-	    $q = "SELECT DISTINCT tankorId
-		FROM tankorOsztaly LEFT JOIN tankorSzemeszter USING (tankorId)
-		WHERE osztalyId=%u AND tanev=%u
-		ORDER BY ".$__tankorOrder.",tanev,szemeszter";
-	    $RESULT = db_query($q, array('fv' => 'getTankorByOsztalyId', 'modul' => 'naplo_intezmeny', 'result' => 'idonly', 'values' => $v));	    
-
-	} else {
-
-	    $q = "SELECT DISTINCT tankor.tankorId,tankorNev,tankorTipusId,targyId,kovetelmeny,jelenlet,felveheto
-		FROM tankor 
-		    LEFT JOIN tankorTipus USING (tankorTipusId)
-		    LEFT JOIN tankorSzemeszter USING (tankorId)
-		    LEFT JOIN tankorOsztaly USING (tankorId)
-		WHERE osztalyId=%u AND tanev=%u
-		ORDER BY ".$__tankorOrder.",tanev,szemeszter";
-	    if (!isset($SET['result']) || $SET['result']=='') {
-		$RESULT = db_query($q, array('fv' => 'getTankorByOsztalyId', 'modul' => 'naplo_intezmeny', 'result' => 'indexed', 'values' => $v));
-		if ($SET['tanarral'] === true) {
-		    global $_TANEV;
-		    if ($tanev != __TANEV) $TA = getTanevAdat($tanev); else $TA = $_TANEV;
-		    for($i = 0; $i < count($RESULT); $i++)
-			$RESULT[$i]['tanarok'] = getTankorTanaraiByInterval($RESULT[$i]['tankorId'], array('tanev' => $tanev, 'tolDt' => $TA['kezdesDt'], 'igDt' => $TA['zarasDt'], 'result' => 'nevsor'));
-		}
-	    } else {
-		$RESULT = db_query($q, array(
-		    'fv' => 'getTankorByOsztalyId', 'modul' => 'naplo_intezmeny', 'result' => 'multiassoc', 'keyfield' => 'tankorId', 'values' => $v
-		));
-	    }
-	}
-	return $RESULT;
-    }
-
-    function getTankorByTargyId($targyId, $tanev, $SET = array('idonly' => true, 'lista' => false), $olr = '') {
-
-	global $_TANEV,$__tankorOrder;
-
-	if ($tanev != __TANEV) $TA = getTanevAdat($tanev);
-	else $TA = $_TANEV;
-	$szsz = count($TA['szemeszter']);
-	if ($SET['idonly']) {
-    	    $q = "SELECT tankor.tankorId AS tankorId
-		    FROM ".__INTEZMENYDBNEV.".tankor
-		    LEFT JOIN ".__INTEZMENYDBNEV.".tankorSzemeszter ON (tankor.tankorId=tankorSzemeszter.tankorId)
-				 WHERE tanev=%u AND targyId=%u
-				 GROUP BY tankorId";
-	    $RESULT = db_query($q,array('fv' => 'getTankorByTargyId', 'modul' => 'naplo_intezmeny', 'result' => 'idonly', 'values' => array($tanev, $targyId)));
-	} elseif ($SET['lista']) {
-    	    $q = "SELECT DISTINCT tankor.tankorId AS tankorId,tankorNev,tankorTipusId,kovetelmeny,jelenlet,felveheto
-			FROM ".__INTEZMENYDBNEV.".tankor 
-			LEFT JOIN ".__INTEZMENYDBNEV.".tankorTipus USING (tankorTipusId)
-			LEFT JOIN ".__INTEZMENYDBNEV.".tankorSzemeszter ON (tankor.tankorId=tankorSzemeszter.tankorId)
-			WHERE tanev=%u AND targyId=%u
-		        ORDER BY ".$__tankorOrder;	
-	    $RESULT = db_query($q, array('fv' => 'getTankorByTargyId', 'modul' => 'naplo_intezmeny', 'result' => 'indexed', 'values' => array($tanev, $targyId)));
-	} else {
-    	    $q = "SELECT tankor.tankorId AS tankorId,tankorNev,tankorTipusId,kovetelmeny,jelenlet,felveheto,tanev,szemeszter,sum(oraszam)/%u AS oraszam
-			FROM ".__INTEZMENYDBNEV.".tankor 
-			LEFT JOIN ".__INTEZMENYDBNEV.".tankorTipus USING (tankorTipusId)
-			LEFT JOIN ".__INTEZMENYDBNEV.".tankorSzemeszter ON (tankor.tankorId=tankorSzemeszter.tankorId)
-				 WHERE tanev=%u AND targyId=%u
-				 GROUP BY tankorId
-		     ORDER BY ".$__tankorOrder;
-	    $RESULT = db_query($q, array('fv' => 'getTankorByTargyId', 'modul' => 'naplo_intezmeny', 'result' => 'indexed', 'values' => array($szsz, $tanev, $targyId)));
-	}
-	return $RESULT;
-    }
-
-    function getTankorByTanarId($tanarId, $tanev = __TANEV, $SET = array('csakId' => false, 'tolDt' => '', 'igDt' => '', 'result' => '', 'tanarral' => false), $olr = '') {
-
-	global $__tankorOrder;
-
-	if ($tanev=='') $tanev=__TANEV;
-
-	if ($tanarId=='') {
-	    $_SESSION['alert'][] = '::getTankorByTanarId fv hívás a kötelező $tanarId paraméter nélkül!';
-	    return false;
-	}
-
-	$tolDt = $SET['tolDt']; $igDt = $SET['igDt'];
-	initTolIgDt($tanev, $tolDt, $igDt);
-/* DÁTUMOKKK!!!!! */
-	$v = array($tanev, $tanarId, $tolDt, $igDt);
-	if ($SET['csakId']===true) {
-    	    $q = "SELECT tankor.tankorId AS tankorId
-		     FROM tankor LEFT JOIN tankorSzemeszter ON (tankor.tankorId=tankorSzemeszter.tankorId)
-		    		 LEFT JOIN tankorTanar ON (tankor.tankorId=tankorTanar.tankorId)
-		    WHERE tanev=%u AND tanarId=%u
-		    AND ('%s' <= kiDt OR kiDt IS NULL)
-		    AND '%s' >= beDt
-		    GROUP BY tankorId";
-	    $RESULT = db_query($q, array('fv' => 'getTankorByTanarId', 'modul' => 'naplo_intezmeny', 'result' => 'idonly', 'values' => $v), $olr);
-	} else {
-    	    $q = "SELECT tankor.tankorId AS tankorId,tankorNev,tankorTipusId,kovetelmeny,jelenlet,felveheto,tanev,szemeszter
-		     FROM ".__INTEZMENYDBNEV.".tankor
-				LEFT JOIN ".__INTEZMENYDBNEV.".tankorSzemeszter ON (tankor.tankorId=tankorSzemeszter.tankorId)
-		    		LEFT JOIN ".__INTEZMENYDBNEV.".tankorTanar ON (tankor.tankorId=tankorTanar.tankorId)
-				LEFT JOIN ".__INTEZMENYDBNEV.".tankorTipus USING (tankorTipusId)
-		    WHERE tanev=%u AND tanarId=%u 
-		    	AND ('%s' <= kiDt OR kiDt IS NULL)
-			AND '%s' >= beDt
-		    GROUP BY tankorId
-		    ORDER BY ".$__tankorOrder.",tanev,szemeszter";	    
-		// a kompatibilitás jegyében...
-		if ($SET['result']=='multiassoc') {
-		    $RESULT = db_query($q, array(
-			'result' => 'multiassoc', 'values' => $v, 'keyfield' => 'tankorId', 'modul' => 'naplo_intezmeny', 'fv' => 'getTankorByTanarId'
-		    ));
-		} else {
-		    $RESULT = db_query($q, array(
-			'result' => 'indexed', 'values' => $v, 'modul' => 'naplo_intezmeny', 'fv' => 'getTankorByTanarId'
-		    ), $olr);
-		    if ($SET['tanarral'] === true) {
-			global $_TANEV;
-			if ($tanev != __TANEV) $TA = getTanevAdat($tanev); else $TA = $_TANEV;
-			for($i = 0; $i < count($RESULT); $i++)
-			    $RESULT[$i]['tanarok'] = getTankorTanaraiByInterval($RESULT[$i]['tankorId'], array('tanev' => $tanev, 'tolDt' => $TA['kezdesDt'], 'igDt' => $TA['zarasDt'], 'result' => 'nevsor'));
-		    }
-		    
-		}
-	}
-	return $RESULT;
-    }
-
-    function getTankorDiakFelmentes($diakId, $tanev = __TANEV, $SET = array('csakId' => false, 'tolDt' => '', 'igDt' => '', 'override' => false, 'result'=>'indexed', 'felmentesTipus'=>array('óralátogatás alól'), 'nap'=>null, 'ora'=>null) , $olr = '') {
-	$tolDt = $SET['tolDt'];	$igDt = $SET['igDt'];
-	initTolIgDt($tanev, $tolDt, $igDt);
-
-	if ($SET['csakId'] === true || $SET['result'] == 'csakId') $SET['result'] = 'idonly';
-	elseif ($SET['result'] == '') $SET['result'] = 'indexed';
-	if (isset($SET['felmentesTipus'])) {
-    	    if (!is_array($SET['felmentesTipus'])) {
-    		$W = ' AND felmentesTipus = "'.$SET['felmentesTipus'].'" ';
-	    } else {
-		$W = ' AND felmentesTipus IN ("'.implode('","',$SET['felmentesTipus']).'") ';
-	    }
-	} else { // alapértelmezés
-    	    $W = ' AND felmentesTipus = "óralátogatás alól" ';
-	}
-
-	if (is_numeric($SET['nap'])) $W .= " AND (nap=".$SET['nap']." OR nap is null) ";
-	if (is_numeric($SET['ora'])) $W .= " AND (ora=".$SET['ora']." OR ora is null) ";
-
-	if ($SET['result'] == 'idonly') {
-	    $q = "SELECT DISTINCT tankorId
-		FROM ".__INTEZMENYDBNEV.".tankorDiakFelmentes LEFT JOIN ".__INTEZMENYDBNEV.".tankorSzemeszter USING (tankorId)
-		WHERE diakId=%u AND tanev=%u
-		AND ('%s' <= kiDt OR kiDt IS NULL)
-		AND '%s' >= beDt".$W
-	    ;
-	    $v = array($diakId, $tanev, $tolDt, $igDt,$tolDt, $igDt);
-
-	} else {
-	    $q = "SELECT *
-		FROM ".__INTEZMENYDBNEV.".tankorDiakFelmentes
-		WHERE diakId=%u 
-		AND ('%s' <= kiDt OR kiDt IS NULL)
-		AND '%s' >= beDt".$W.""
-	    ;
-	    $v = array($diakId, $tolDt, $igDt,$tolDt, $igDt);
-
-	}
-	$RESULT = db_query($q, array('keyfield' => 'tankorId', 'modul' => 'naplo_intezmeny', 'fv' => 'getTankorDiakFelmentes', 'values' => $v, 'result' => $SET['result']));
-	return $RESULT;
-    }
-
-    function getFelmentes($SET = array('tanev'=>__TANEV, 'osztalyId'=>false,'csakId' => false, 'tolDt' => '', 'igDt' => '', 'override' => false, 'result'=>'indexed', 'felmentesTipus'=>array('óralátogatás alól'), 'nap'=>null, 'ora'=>null) , $olr = '') {
-	$tanev = ($SET['tanev']!='')?$SET['tanev']:__TANEV;
-	$tolDt = $SET['tolDt'];	$igDt = $SET['igDt'];
-	initTolIgDt($tanev, $tolDt, $igDt);
-
-	if ($SET['csakId'] === true || $SET['result'] == 'csakId') $SET['result'] = 'idonly';
-	elseif ($SET['result'] == '') $SET['result'] = 'indexed';
-	if (isset($SET['felmentesTipus'])) {
-    	    if (!is_array($SET['felmentesTipus'])) {
-    		$W = ' AND felmentesTipus = "'.$SET['felmentesTipus'].'" ';
-	    } else {
-		$W = ' AND felmentesTipus IN ("'.implode('","',$SET['felmentesTipus']).'") ';
-	    }
-	} else { // alapértelmezés
-    	    $W = ' AND felmentesTipus = "óralátogatás alól" ';
-	}
-
-	if (is_numeric($SET['nap'])) $W .= " AND (nap=".$SET['nap']." OR nap is null) ";
-	if (is_numeric($SET['ora'])) $W .= " AND (ora=".$SET['ora']." OR ora is null) ";
-	if (is_numeric($SET['osztalyId'])) $W .= " AND osztalyId=".$SET['osztalyId']." ";
-
-	if ($SET['result'] == 'idonly') {
-	    $q = "SELECT DISTINCT tankorId
-		FROM ".__INTEZMENYDBNEV.".tankorDiakFelmentes LEFT JOIN ".__INTEZMENYDBNEV.".tankorSzemeszter USING (tankorId)
-		WHERE tanev=%u
-		AND ('%s' <= kiDt OR kiDt IS NULL)
-		AND '%s' >= beDt".$W
-	    ;
-	    $v = array($tanev, $tolDt, $igDt,$tolDt, $igDt);
-
-	} else {
-	    $q = "SELECT a.*
-		FROM ".__INTEZMENYDBNEV.".tankorDiakFelmentes AS a
-		LEFT JOIN ".__INTEZMENYDBNEV.".osztalyDiak ON (osztalyDiak.diakId=a.diakId)
-		WHERE ('%s' <= a.kiDt OR a.kiDt IS NULL)
-		AND '%s' >= a.beDt".$W." ORDER BY a.diakId,a.beDt"
-	    ;
-	    $v = array($tolDt, $igDt, $tolDt, $igDt);
-
-	}
-	$RESULT = db_query($q, array('debug'=>false,'keyfield' => 'tankorId', 'modul' => 'naplo_intezmeny', 'fv' => 'getTankorDiakFelmentes', 'values' => $v, 'result' => $SET['result']));
-	return $RESULT;
-    }
-
-    function getTankorByDiakId($diakId, $tanev = __TANEV, $SET = array('csakId' => false, 'tolDt' => '', 'igDt' => '', 'override' => false, 'result'=>'indexed') , $olr = '') {
-
-	global $__tankorOrder;
-
-	if (isset($SET['jelenlet']) && $SET['jelenlet']!='') {
-	    //$W = " AND tankorDiak.jelenlet='%s'";
-	    $_SESSION['alert'][] = 'info:ERR400:getTankorByDiakId() nem hívható "jelenlet" paraméterrel!:'.$SET['jelenlet'];
-	} else {
-	    //$W = '';
-	}
-
-	$tolDt = $SET['tolDt'];	$igDt = $SET['igDt'];
-	initTolIgDt($tanev, $tolDt, $igDt);
-
-	if ($SET['csakId'] === true || $SET['result'] == 'csakId') $SET['result'] = 'idonly';
-	elseif ($SET['result'] == '') $SET['result'] = 'indexed';
-
-	if ($SET['result'] == 'idonly') {
-//	    $q = "SELECT DISTINCT tankor.tankorId,tankorNev,targyId,tankor.kovetelmeny,tankor.jelenlet,felveheto
-//		FROM ".__INTEZMENYDBNEV.".tankor LEFT JOIN ".__INTEZMENYDBNEV.".tankorSzemeszter USING (tankorId)
-//		LEFT JOIN ".__INTEZMENYDBNEV.".tankorDiak USING (tankorId)
-//		WHERE diakId=$diakId AND tanev=$tanev
-//		AND ('$tolDt' <= kiDt OR kiDt IS NULL)
-//		AND '$igDt' >= beDt
-//		ORDER BY LPAD(substring_index(substring_index(tankorNev,'-',1),'.',1),2,'0'),tankorNev,tanev,szemeszter";
-	    $q = "SELECT DISTINCT tankorId
-		FROM ".__INTEZMENYDBNEV.".tankorDiak LEFT JOIN ".__INTEZMENYDBNEV.".tankorSzemeszter USING (tankorId)
-		WHERE diakId=%u AND tanev=%u
-		AND ('%s' <= kiDt OR kiDt IS NULL)
-		AND '%s' >= beDt";
-//	    $RESULT = _m_y_id_query($q, array('db' => 'naplo_intezmeny', 'fv' => 'getTankorByDiakId', 'result' => 'idonly'), $olr);
-	} else {
-	    $q = "SELECT DISTINCT tankor.tankorId,tankorNev,tankorTipusId,targyId,tankor.kovetelmeny,tankorTipus.jelenlet AS jelenlet, felveheto
-		FROM ".__INTEZMENYDBNEV.".tankor 
-		    LEFT JOIN ".__INTEZMENYDBNEV.".tankorTipus USING (tankorTipusId)
-		    LEFT JOIN ".__INTEZMENYDBNEV.".tankorSzemeszter USING (tankorId)
-		    LEFT JOIN ".__INTEZMENYDBNEV.".tankorDiak USING (tankorId)
-		WHERE diakId=%u AND tanev=%u
-		AND ('%s' <= kiDt OR kiDt IS NULL)
-		AND '%s' >= beDt $W
-		ORDER BY ".$__tankorOrder.",tanev,szemeszter";
-//		if ($SET['result']=='multiassoc')
-//		    $RESULT = _m_y_multiassoc_query($q,'tankorId', array('keyfield'=>'tankorId','db'=>'naplo_intezmeny','fv'=>'getTankorByDiakId'));
-//		else
-//		    $RESULT = _m_y_query($q, array('db'=>'naplo_intezmeny', 'fv'=>'getTankorByDiakId'), $olr);
-	}
-	$v = array($diakId, $tanev, $tolDt, $igDt, $SET['jelenlet']);
-	$RESULT = db_query($q, array('keyfield' => 'tankorId', 'modul' => 'naplo_intezmeny', 'fv' => 'getTankorByDiakId', 'values' => $v, 'result' => $SET['result']));
-	return $RESULT;
-    }
-
-    function getTankorIdsByDiakIds($diakIds, $SET = array(
-		'tanev' => __TANEV, 
-		'tolDt'=>'',
-		'igDt'=>'',
-		'felmentettekkel'=>true
-//		'jelenlet'=>array('kötelező','nem kötelező')
-//		'kovetelmeny'=>array('aláírás','vizsga','jegy')
-	    )
-    ) {
-
-	global $__tankorOrder;
-
-        if (isset($SET['jelenlet'])) {
-	    $_SESSION['alert'][] = 'info:!!!:getTankorIdsByDiakIds(), jelenlét parameter is obsolete';
-        }
-
-	if (!is_array($diakIds)) return false;
-	elseif (count($diakIds) == 0) return array();
-	$tanev = readVariable($SET['tanev'],'numeric unsigned',__TANEV);
-	$tolDt = $SET['tolDt'];
-	$igDt  = $SET['igDt'];
-	initTolIgDt($tanev, $tolDt, $igDt);
-
-//	if (!is_array($SET['jelenlet'])) $SET['jelenlet'] = array('kötelező','nem kötelező');
-//	if (!is_array($SET['kovetelmeny'])) $SET['kovetelmeny'] = array('aláírás','vizsga','jegy');
-
-	// ----------------------
-	$q = "SELECT DISTINCT tankorDiak.tankorId
-		FROM ".__INTEZMENYDBNEV.".tankorDiak
-		LEFT JOIN ".__INTEZMENYDBNEV.".tankorSzemeszter USING (tankorId)
-		WHERE diakId IN (".implode(',', array_fill(0, count($diakIds), '%u')).") AND tanev=%u
-		AND ('%s' <= kiDt OR kiDt IS NULL)
-		AND '%s' >= beDt
-		ORDER BY ".$__tankorOrder.",tanev,szemeszter";
-//		AND kovetelmeny IN ('".implode("','", array_fill(0, count($SET['kovetelmeny']), '%s'))."')
-//		AND jelenlet IN ('".implode("','", array_fill(0, count($SET['jelenlet']), '%s'))."')
-
-//	$v = array_merge($diakIds, array($tanev, $tolDt, $igDt), $SET['jelenlet'], $SET['kovetelmeny']);
-	$v = mayor_array_join($diakIds, array($tanev, $tolDt, $igDt));
-	$TANKOROK = db_query($q, array('fv' => 'getTankorIdsByDiakIds', 'modul' => 'naplo_intezmeny', 'result' => 'idonly', 'values' => $v), $olr);
-
-	if (!is_array($SET['felmentettekkel'])) $SET['felmentettekkel'] = true;
-	/* Ha felmentett, akkor kivegyük-e az adott tanköridket?! */
-	if ($SET['felmentettekkel'] === false) {
-	    $q = "SELECT DISTINCT tankorDiak.tankorId
-		    FROM ".__INTEZMENYDBNEV.".tankorDiakFelmentes
-		    WHERE diakId IN (".implode(',', array_fill(0, count($diakIds), '%u')).") AND tanev=%u
-		    AND ('%s' <= kiDt OR kiDt IS NULL)
-		    AND '%s' >= beDt";
-	    $v = mayor_array_join($diakIds, array($tanev, $tolDt, $igDt));
-            $FM = db_query($q, array('fv' => 'getTankorIdsByDiakIdsFM', 'modul' => 'naplo_intezmeny', 'result' => 'idonly', 'values' => $v), $olr);
-	}
-	if (is_array($TANKOROK)) {
-	    if (is_array($FM) && count($FM)>0) {
-		$RESULT = array_diff($TANKOROK,$FM);
-    		reset($RESULT);                                                                                                                                                       
-	        sort($RESULT);             
-	    } else {
-		$RESULT = $TANKOROK;
-	    }
-	}
-	return $RESULT;
-    }
-
-    function getTankorById($tankorId, $tanev = __TANEV, $olr = '') {
-	if ($tankorId=='') return false;
-	if ($tanev == '') return getTankorok(array("tankor.tankorId=$tankorId"), '', $olr);
-	else return getTankorok(array("tankor.tankorId=$tankorId", "tanev=$tanev"), '', $olr);
-    }
-
-    function getTankorByTanev($tanev = __TANEV, $SET = array('result' => 'indexed', 'jelenlet'=>''), $olr = '') {
-	global $__tankorOrder;
-
-	if ($SET['jelenlet']!='') {
-	    $W['join'] = ' LEFT JOIN '.__INTEZMENYDBNEV.'.tankorTipus USING (tankorTipusId) ';
-	    $W['where']= ' AND tankorTipus.jelenlet IN ("'.$SET['jelenlet'].'")';
-	}
-	if ($SET['result'] == 'idonly') {
-	    $q = "SELECT DISTINCT tankorId 
-		FROM ".__INTEZMENYDBNEV.".tankor 
-		LEFT JOIN ".__INTEZMENYDBNEV.".tankorSzemeszter USING (tankorId) 
-		".$W['join']."
-		WHERE tanev=%u ".$W['where']." ORDER BY $__tankorOrder";
-	    $ret = db_query($q, array('fv' => 'getTankorByTanev', 'modul' => 'naplo_intezmeny', 'result' => 'idonly', 'values' => array($tanev)), $olr);
-	} else {
-	    $q = "SELECT DISTINCT tankorId,tankorNev,targyId
-		FROM ".__INTEZMENYDBNEV.".tankor 
-		LEFT JOIN ".__INTEZMENYDBNEV.".tankorSzemeszter USING (tankorId) 
-		".$W['join']."
-		WHERE tanev=%u ".$W['where']." ORDER BY $__tankorOrder";
-	    $ret = db_query($q, array('fv' => 'getTankorByTanev', 'modul' => 'naplo_intezmeny', 'result' => 'indexed', 'values' => array($tanev)), $olr);
-	}
-	return $ret;
-    }
-
-    function getTankorByBontasIds($bontasIds) {
-    /*
-     * Az aktuális tanévben kérdezi le a bontások által megadott osztályhoz és tárgyhoz rendelhető tankörök tankorId-it...
-     */
-	if (!is_array($bontasIds) || count($bontasIds)==0) return array();
-	$q = "select distinct tankorId from ".__TANEVDBNEV.".kepzesTargyBontas 
-		left join (tankor left join tankorOsztaly using (tankorId)) using (targyId,osztalyId) 
-		left join tankorSzemeszter using(tankorId) 
-		where tanev=".__TANEV." and bontasId in (".implode(',', array_fill(0, count($bontasIds), '%u')).")";
-	return db_query($q, array('fv'=>'getTankorByBontasIds','modul'=>'naplo_intezmeny','result'=>'idonly','values'=>$bontasIds));
-    }
-
-    // FIGYELEM! NEM MINDIG OPTIMÁLIS EREDMÉNY
-    function getTankorok(
-	$FILTER = array(), 
-	$ORDER = '',
-	$olr = ''
-    ) {
-	global $__tankorOrder;
-	/* Általános filterező */
-	$QW = '';
-	if (is_array($FILTER) && count($FILTER)>0) {
-	    $QW = " WHERE ".implode(' AND ',$FILTER);
-	}
-	if ($ORDER == '') $ORDER = $__tankorOrder.",tanev,szemeszter";
-
-	// --TODO: továbbgondolásra szorul
-	// jelenlet = tankorJelenlet
-        $q = "SELECT DISTINCT tankor.tankorId,tankorTipusId,tankorNev,targyId,kovetelmeny,jelenlet,felveheto,tanev,zaroKovetelmeny
-		     FROM ".__INTEZMENYDBNEV.".tankor 
-			LEFT JOIN ".__INTEZMENYDBNEV.".tankorTipus USING (tankorTipusId)
-			LEFT JOIN ".__INTEZMENYDBNEV.".tankorSzemeszter USING (tankorId) 
-			LEFT JOIN ".__INTEZMENYDBNEV.".targy USING (targyId)
-		    $QW 
-		    ORDER BY $ORDER";
-        return db_query($q, array('fv' => 'getTankorok', 'modul' => 'naplo_intezmeny', 'result' => 'indexed'), $olr);
-
-    }
-
-    function getTankorSzemeszterei($tankorId,$SET=array(),$olr='') {
-	if ($tankorId=='') return false;
-
-	$q = "SELECT * FROM tankorSzemeszter LEFT JOIN szemeszter using (tanev,szemeszter) WHERE tankorId=%u order by tanev,szemeszter";
-	$ret = db_query($q, array('fv' => 'getTankorSzemeszterei', 'modul' => 'naplo_intezmeny', 'result' => 'indexed', 'values' => array($tankorId)), $olr);
-
-	if (is_array($SET['arraymap'])) return reindex($ret, $SET['arraymap']);
-	else return $ret;
-    }
-
-    function getTankorOsztalyai($tankorId, $SET = array('result' => 'id'), $olr='') { // lásd még getTankorOsztalyaiByTanev
-	if ($tankorId=='') return false;
-
-	    $q = "SELECT DISTINCT osztalyId FROM tankorOsztaly WHERE tankorId=%u";
-	    if ($SET['result'] == 'id') {
-		return db_query($q, array('fv' => 'getTankorOsztalyai', 'modul' => 'naplo_intezmeny', 'result' => 'idonly', 'values' => array($tankorId)), $olr);
-	    } else {
-		return db_query($q, array('fv' => 'getTankorOsztalyai', 'modul' => 'naplo_intezmeny', 'result' => 'indexed', 'values' => array($tankorId)), $olr);
-	    }
-    }
-
-    function getTankorOsztalyaiByTanev($tankorId, $tanev = __TANEV, $SET = array('result' => 'id', 'tagokAlapjan' => false, 'tolDt' => '', 'igDt' => ''), $olr = null) {
-
-	if ($tankorId=='' || $tanev=='') return false;
-
-	if ($SET['tagokAlapjan']) { // Ha a tényleges tagok alapján keressük a tankör osztályait...
-	    $tolDt = readVariable($SET['tolDt'], 'datetime', null);
-	    $igDt = readVariable($SET['igDt'], 'datetime', null);
-	    initTolIgDt($tanev, $tolDt, $igDt);
-	    /*
-		- a diák tagja a tankörnek az adott idő intervellumban
-		- a diák tagja az osztálynak az adott idő intervellumban
-		- az osztály hozzá van rendelve a tankörhöz (lehet egy diák több osztálynak is tagja - ez bezavarhat)
-	    */
-	    $q = "SELECT osztalyId FROM tankorDiak LEFT JOIN osztalyDiak USING (diakId) 
-		    WHERE tankorId=%u
-		    AND tankorDiak.beDt <= '%s' AND (tankorDiak.kiDt IS NULL OR tankorDiak.kiDt >= '%s')
-		    AND osztalyDiak.beDt <= '%s' AND (osztalyDiak.kiDt IS NULL OR osztalyDiak.kiDt >= '%s')
-		    AND osztalyId IN (SELECT DISTINCT osztalyId FROM tankorOsztaly WHERE tankorId=%u)
-		    GROUP BY osztalyId ORDER BY COUNT(osztalyId) DESC"; // A legtöbb tagú osztály kerüljön előre
-	    $v = array($tankorId, $igDt, $tolDt, $igDt, $tolDt, $tankorId);
-	    if ($SET['result'] == 'id') 
-		$return = db_query($q, array('fv' => 'getTankorOsztalyaiByTanev', 'modul' => 'naplo_intezmeny', 'result' => 'idonly', 'values' => $v),$olr);
-	    else 
-		$return = db_query($q, array('fv' => 'getTankorOsztalyaiByTanev', 'modul' => 'naplo_intezmeny', 'result' => 'indexed', 'values' => $v), $olr);
-	    if (is_array($return) && count($return) > 0) return $return;
-	    else $_SESSION['alert'][] = 'info:fallback:ennek a tankörnek egy tagja sincs, tagok alapján nem tudom lekérdezni az érintett osztályokat:'.$tankorId;
-	}
-	// Ha nincs a tankörnek egy tagja sem, vagy nem tagok alapján keresünk...
-	$q = "SELECT tankorOsztaly.osztalyId AS osztalyId FROM tankorOsztaly 
-		LEFT JOIN osztaly USING (osztalyId) 
-		WHERE tankorId=%u AND kezdoTanev<=%u AND vegzoTanev>=%u";
-	$v = array($tankorId, $tanev, $tanev);
-	if ($SET['result'] == 'id') 
-	    return db_query($q, array('fv' => 'getTankorOsztalyaiByTanev', 'modul' => 'naplo_intezmeny', 'result' => 'idonly', 'values' => $v), $olr);
-	else 
-	    return db_query($q, array('fv' => 'getTankorOsztalyaiByTanev', 'modul' => 'naplo_intezmeny', 'result' => 'indexed', 'values' => $v), $olr);
-    }
-
-    function getTankorOsztalyaiByBontas($tankorId) {
-
-	$q = "select distinct osztalyId from bontasTankor left join kepzesTargyBontas using (bontasId)  where tankorId=%u";
-	return db_query($q, array('fv'=>'getTankorOsztalyaiByBontas','modul'=>'naplo','result'=>'idonly','values'=>array($tankorId)));
-
-    }
-
-    function getTankorTanarai($tankorId, $olr = '') {
-	if ($tankorId == '') return false;
-	$q = "SELECT tanarId, TRIM(CONCAT_WS(' ',viseltNevElotag, viseltCsaladiNev, viseltUtonev)) as tanarNev, min(tankorTanar.beDt) AS minBeDt, max(tankorTanar.kiDt) AS maxKiDt
-		FROM ".__INTEZMENYDBNEV.".tankorTanar LEFT JOIN ".__INTEZMENYDBNEV.".tanar USING (tanarId)
-		WHERE tankorId=%u GROUP BY tanarId ORDER BY tankorTanar.beDt,tankorTanar.kiDt";
-	return db_query($q, array('fv' => 'getTankorTanarai', 'modul' => 'naplo_intezmeny', 'result' => 'indexed', 'values' => array($tankorId)), $olr);
-    }
-
-    function getTankorTanarBejegyzesek($tankorId, $olr = '') {
-	if ($tankorId == '') return false;
-	$q = "SELECT tanarId, TRIM(CONCAT_WS(' ',viseltNevElotag, viseltCsaladiNev, viseltUtonev)) as tanarNev, tankorTanar.beDt, tankorTanar.kiDt
-		FROM ".__INTEZMENYDBNEV.".tankorTanar LEFT JOIN ".__INTEZMENYDBNEV.".tanar USING (tanarId)
-		WHERE tankorId=%u ORDER BY tankorTanar.beDt,tankorTanar.kiDt";
-	return db_query($q, array('fv' => 'getTankorTanarBejegyzesek', 'modul' => 'naplo_intezmeny', 'result' => 'indexed', 'values' => array($tankorId)), $olr);
-    }
-
-    function getTankorTanaraiByInterval($tankorId, $Param = array('tanev' => __TANEV, 'tolDt' => '', 'igDt' => '', 'result' => 'nevsor', 'datumKenyszeritessel' => false), $olr = '') {
-
-	$tolDt = $Param['tolDt'];
-	$igDt = $Param['igDt'];
-	if (!$Param['datumKenyszeritessel']) initTolIgDt($Param['tanev'], $tolDt, $igDt);
-
-	if (!is_array($tankorId)) $tankorId = array($tankorId);
-	if (implode(',', $tankorId) == '') {
-	    return false;
-	}
-
-	if ($Param['result'] == 'csakId' or $Param['result'] == 'idonly') {
-	    $q = "SELECT DISTINCT tanarId FROM ".__INTEZMENYDBNEV.".tankorTanar
-		    WHERE tankorId IN (".implode(',', array_fill(0, count($tankorId), '%u')).")
-		    AND (tankorTanar.kiDt IS NULL OR tankorTanar.kiDt>='%s')
-		    AND tankorTanar.beDt<='%s'";
-	    array_push($tankorId, $tolDt, $igDt);
-	    return db_query($q, array(
-		'fv' => 'getTankorTanaraiByInterval', 'modul' => 'naplo_intezmeny', 'result' => 'idonly', 'values' => $tankorId
-	    ), $olr);
-	} else {
-	    $q = "SELECT DISTINCT tankorId, tanarId, TRIM(CONCAT_WS(' ',viseltNevElotag, viseltCsaladiNev, viseltUtonev)) as tanarNev
-		FROM ".__INTEZMENYDBNEV.".tankorTanar LEFT JOIN ".__INTEZMENYDBNEV.".tanar USING (tanarId)
-		WHERE tankorId IN (".implode(',',$tankorId).")
-		AND (tankorTanar.kiDt IS NULL OR tankorTanar.kiDt>='$tolDt')
-		AND tankorTanar.beDt<='$igDt' ORDER BY tankorTanar.beDt, tankorTanar.kiDt, tanarNev";
-	    array_push($tankorId, $tolDt, $igDt);
-	    if ($Param['result'] == 'assoc') 
-		return db_query($q, array(
-		    'fv' => 'getTankorTanaraiByInterval', 'modul' => 'naplo_intezmeny', 'result' => 'multiassoc', 'keyfield' => 'tankorId', 'values' => $tankorIds
-		), $olr);
-	    else return db_query($q, array(
-		    'fv' => 'getTankorTanaraiByInterval', 'modul' => 'naplo_intezmeny', 'result' => 'indexed', 'values' => $tankorIds
-		), $olr);
-	}
-    }
-
-    function getTankorDiakjai($tankorId, $olr = '') {
-	if ($tankorId=='' || (is_array($tankorId) && count($tankorId) == 0)) return false;
-	if (is_array($tankorId)) {
-	    $tankorIds = array_filter(array_unique($tankorId),'_isempty');
-	    $W = "tankorId IN (".implode(',', array_fill(0, count($tankorIds), '%u')).")";
-	    $v = $tankorIds;
-	} else {
-	    $W = "tankorId=%u";
-	    $v = array($tankorId);
-	}
-	$q = "SELECT DISTINCT diakId FROM ".__INTEZMENYDBNEV.".tankorDiak WHERE ".$W;
-	$RETURN['idk'] = db_query($q, array(
-	    'fv' => 'getTankorDiakjai/1', 'modul' => 'naplo_intezmeny', 'result' => 'idonly', 'values' => $v
-	), $olr);
-	// jelenlet = diakJelenlet
-	$q = "SELECT diakId,DATE_FORMAT(kiDt,'%%Y-%%m-%%d') AS kiDt, DATE_FORMAT(beDt,'%%Y-%%m-%%d') AS beDt,jelenlet,jelenlet as diakJelenlet,kovetelmeny,jovahagyva
-		FROM ".__INTEZMENYDBNEV.".tankorDiak WHERE tankorId=%u ORDER BY bedt";
-	$RETURN['adatok'] = db_query($q, array(
-	    'fv' => 'getTankorDiakjai/2', 'modul' => 'naplo_intezmeny', 'result' => 'multiassoc', 'keyfield' => 'diakId', 'values' => array($tankorId)
-	), $olr);
-	$RETURN['nevek'] = getDiakokById($RETURN['idk'],$olr);
-	return $RETURN;
-    }
-
-    function getTankorDiakjaiByInterval($tankorId, $tanev = __TANEV, $tolDt = '', $igDt = '', $olr = '') {
-
-	initTolIgDt($tanev, $tolDt, $igDt);
-	if ($tankorId == '' || (is_array($tankorId) && count($tankorId) == 0)) return false;
-	if (is_array($tankorId)) {
-	    $tankorIds = array_filter(array_unique($tankorId),'_isempty');
-	    $W = "tankorId IN (".implode(',', array_fill(0, count($tankorIds), '%u')).")";
-	    $v = $tankorIds;
-	    array_push($v, $tolDt,$igDt);
-	} else {
-	    $W = "tankorId=%u";
-	    $v = array($tankorId,$tolDt,$igDt);
-	}
-	$q = "SELECT DISTINCT diakId FROM ".__INTEZMENYDBNEV.".tankorDiak 
-		WHERE $W AND (kiDt>='%s' OR kiDt is null) AND beDt<='%s' ORDER BY diakId";
-	$RETURN['idk'] = db_query($q, array('fv' => 'getTankorDiakjaiByInterval', 'modul' => 'naplo_intezmeny', 'result' => 'idonly', 'values' => $v), $olr);
-	/* jelenlet, követelmeny, jóváhagyva mezők MÁR nincsenek */
-	$q = "SELECT diakId,DATE_FORMAT(kiDt,'%%Y-%%m-%%d') AS kiDt, DATE_FORMAT(beDt,'%%Y-%%m-%%d') AS beDt 
-		FROM ".__INTEZMENYDBNEV.".tankorDiak WHERE $W AND (kiDt>='%s' OR kiDt is null) AND beDt<='%s' ORDER BY bedt";
-	$RETURN['adatok'] = db_query($q, array(
-	    'fv' => 'getTankorDiakjaiByInterval', 'modul' => 'naplo_intezmeny', 'result' => 'multiassoc', 'keyfield' => 'diakId', 'values' => $v
-	), $olr);
-	$RETURN['nevek'] = getDiakokById($RETURN['idk'], $olr);
-	return $RETURN;
-
-    }
-
-
-    function tankorTagjaE($diakId, $tankorId, $tanev = __TANEV, $tolDt = '', $igDt = '') {
-
-
-	initTolIgDt($tanev, $tolDt, $igDt);
-
-	$q = "SELECT COUNT(tankorId) FROM tankorDiak
-		WHERE tankorId=%u AND diakId=%u
-		AND ('%s' <= kiDt OR kiDt IS NULL)
-		AND '%s' >= beDt";
-	$v = array($tankorId, $diakId, $tolDt, $igDt);
-	$num = db_query($q, array('fv' => 'tankorTagjaE', 'modul' => 'naplo_intezmeny', 'result' => 'value', 'values' => $v));
-	return ($num > 0);
-
-    }
-
-    function tankorVegzosE($tankorId, $tanev = __TANEV, $SET = array('tagokAlapjan' => true, 'tolDt' => null, 'igDt' => null)) {
-	/*
-	    Egy tankört akkor tekintünk végzősnek, ha csak végzős diákok a tagjai. De lehet, hogy egy diák több osztálynak is tagja.
-	    Ha az egyik esetleg nem végzős, akkor a diákok osztályai közt lesz nem végzős.
-
-	    Tehát a tankörhöz rendelt osztályokon belül nézzük a tagok osztályait, mert elvileg ez a halmaz csak bővebb lehet a tankör 
-	    tagok osztályainak halmazánál.
-	*/
-
-	if ($tankorId == '' || $tanev == '') return false;
-
-	// Először lekérdezzük a tankörhöz rendelt nem végzős osztályok számát
-	$q = "SELECT COUNT(osztalyId) FROM tankorOsztaly LEFT JOIN osztaly USING (osztalyId)
-		    WHERE tankorId=%u AND vegzoTanev != %u";
-	$return = (db_query($q, array('fv' => 'tankorVegzosE', 'modul' => 'naplo_intezmeny', 'result' => 'value', 'values' => array($tankorId, $tanev))) == 0);
-	// Ha a tankörhöz csak végzős osztályok vannak rendelve, vagy a tényleges tagok vizsgálatára nincs szükség, akkor visszatérünk
-	if ($return || !$SET['tagokAlapjan']) return $return;
-
-	// Lekérdezzük a tankör tagok osztályait (ez figyel a tankörhöz rendelt osztályokra való szűkítésre)
-	$vegzosOsztalyok = getVegzosOsztalyok(array('tanev' => $tanev, 'result' => 'id'));
-	$tankorOsztalyai = getTankorOsztalyaiByTanev(
-	    $tankorId, $tanev = $tanev, 
-	    array('result' => 'id', 'tagokAlapjan' => true, 'tolDt' => $SET['tolDt'], 'igDt' => $SET['igDt'])
-	);
-	// vizsgáljuk, hogy van-e benne nem végzős
-	for ($i = 0; $i < count($tankorOsztalyai); $i++) {
-	    if (!in_array($tankorOsztalyai[$i], $vegzosOsztalyok)) return false;
-	}
-	return true;
-
-    }
-
-    function tankorokVegzosekE($tankorIds, $tanev = __TANEV, $SET = array('tagokAlapjan' => true, 'tolDt' => null, 'igDt' => null)) {
-
-	if (!is_array($tankorIds) || count($tankorIds) == 0 || $tanev == '') return false;
-
-	// Először lekérdezzük a tankörökhöz rendelt nem végzős osztályok számát
-	$q = "SELECT tankorId, COUNT(osztaly.osztalyId) AS db FROM tankorOsztaly 
-		    LEFT JOIN osztaly ON tankorOsztaly.osztalyId = osztaly.osztalyId AND vegzoTanev != %u
-		    WHERE tankorId IN (".implode(',', $tankorIds).")
-		    GROUP BY tankorId";
-	array_unshift($tankorIds, $tanev);
-	$ret = db_query($q, array(
-	    'fv' => 'tankorokVegzosekE', 'modul' => 'naplo_intezmeny', 'result' => 'assoc', 'keyfield' => 'tankorId', 'values' => $tankorIds
-	));
-	// Ha a tényleges tagok vizsgálatára is szükség van
-	if ($SET['tagokAlapjan']) {
-	    // Lekérdezzük a tankör tagok osztályait (ez figyel a tankörhöz rendelt osztályokra való szűkítésre)
-	    $vegzosOsztalyok = getVegzosOsztalyok(array('tanev' => $tanev, 'result' => 'id'));
-	    foreach ($ret as $tankorId => $tAdat) {
-		$db = $tAdat['db'];
-		$return[$tankorId] = true;
-		if ($db != 0) { // Ha csak végzős osztálya van, akkor nem kell tovább nézni, különben...
-		    $tankorOsztalyai = getTankorOsztalyaiByTanev(
-			$tankorId, $tanev = $tanev, 
-			array('result' => 'id', 'tagokAlapjan' => true, 'tolDt' => $SET['tolDt'], 'igDt' => $SET['igDt'])
-		    );
-		    // vizsgáljuk, hogy van-e benne nem végzős
-		    for ($i = 0; $i < count($tankorOsztalyai); $i++) {
-			if (!in_array($tankorOsztalyai[$i], $vegzosOsztalyok)) $return[$tankorId] = false;
-			break;
-		    }
-		}
-	    }
-	} else {
-	    foreach ($ret as $tankorId => $tAdat) {
-		$return[$tankorId] = ($tAdat['db'] == 0);
-	    }
-	}
-	return $return;
-
-    }
-
-
-    function tankorDiakKonzisztensE($diakId,$tankorId,$tanev,$tolDt,$igDt) 
-    {
-	/* 
-	    Jelenlét analízis:
-        	tankorDiak.jelenlet = diakJelenlet
-	*/
-
-	if ($diakId=='' || $tankorId=='') return false;
-	initTolIgDt($tanev, $tolDt, $igDt);
-	$tanevDb = tanevDbNev(__INTEZMENY,$tanev);
-
-	// 1. adott intervallumban tagsága
-	    $DTW1 = $DTW2 = array();
-	    $q = "SELECT beDt, kiDt, kovetelmeny, jelenlet as diakJelenlet FROM tankorDiak WHERE diakId=%u AND tankorId=%u 
-		    AND (jelenlet='nem kötelező' OR kovetelmeny!='jegy')AND (kiDt>'%s' OR kiDt IS NULL) AND beDt<'%s' ";
-	    $v = array($diakId, $tankorId, $tolDt, $igDt);
-	    $r = db_query($q, array('fv' => 'tankorDiakKozisztensE', 'modul' => 'naplo_intezmeny', 'result' => 'indexed', 'values' => $v));
-	    for ($i=0; $i0) {
-		// 2. hiányzásai
-		$q = "SELECT count(hianyzasId) FROM %1\$s.hianyzas LEFT JOIN ora USING (oraId) WHERE diakId=%2\$u 
-			AND ora.tankorId=%3\$u AND (".implode(' OR ',$DTW1).")";
-		$v = array($tanevDb, $diakId, $tankorId);
-		$dbHianyzas = db_query($q,array('fv' => 'tankorDiakKonzisztensE', 'modul' => 'naplo', 'result' => 'value', 'values' => $v));
-		if ($dbHianyzas>0) $_SESSION['alert'][] = 'info:hibas_hianyzasok:'.$dbHianyzas;
-
-	    }
-	    if (count($DTW2)>0) {
-		// 3. jegyei
-		$q = "SELECT count(jegyId) FROM %1\$s.jegy WHERE diakId=%2\$u AND tankorId=%3\$u AND (".implode(' OR ',$DTW2).")";
-		$v = array($tanevDb, $diakId, $tankorId);
-		$dbJegy = db_query($q,array('fv' => 'tankorDiakKonzisztensE', 'modul' => 'naplo', 'result' => 'value', 'values' => $v));
-		if ($dbJegy>0) $_SESSION['alert'][] = 'info:hibas_jegyek:'.$dbJegy;
-	    }
-
-	    return ($dbHianyzas==0 && $dbJegy==0);
-
-    }
-
-
-    // itt a nap/ora-t is figyelni kellene, ha az pl a felmentésénél adott
-    function tankorDiakHianyzasIdk($diakId, $tankorIds, $tanev, $tolDt, $igDt, $nap=null, $ora=null) 
-    {
-	$SET = array('diakId'=>$diakId, 'tankorIds'=>$tankorIds, 'tanev'=>$tanev, 'tolDt'=>$tolDt, 'igDt'=>$igDt, 'nap'=>$nap, 'ora'=>$ora);
-	return tankorDiakHianyzasIdk2($SET);
-    }
-
-    function tankorDiakHianyzasIdk2($SET = array('diakId', 'tankorIds', 'tanev', 'tolDt', 'igDt', 'nap'=>null, 'ora'=>null), $olr='') 
-    {
-
-	$diakId = $SET['diakId'];
-	$tanev = $SET['tanev'];
-	$tolDt = $SET['tolDt'];
-	$igDt = $SET['igDt'];
-	$nap = $SET['nap'];
-	$ora = $SET['ora'];
-	$tankorIds = $SET['tankorIds'];
-
-	if (!is_array($tankorIds)) if ($tankorIds == '') return false;
-	else $tankorIds = array($tankorIds);
-	if ($diakId=='' || count($tankorIds) == 0) return false;
-
-	// is_resource mysqli esetén nem jó (object)
-	if (!$olr) $lr = db_connect('naplo_intezmeny'); else $lr = $olr;
-
-	initTolIgDt($tanev, $tolDt, $igDt);
-	$tanevDb = tanevDbNev(__INTEZMENY,$tanev);
-
-	$v = mayor_array_join(array($tanevDb, $tanevDb, $diakId), $tankorIds, array($tanevDb, $tolDt, $igDt));
-
-	if (isset($nap) && is_numeric($nap)) {
-	    $W1 = ' AND (DAYOFWEEK(`%s`.hianyzas.dt) -1) = %u ';
-	    $v = mayor_array_join($v,array($tanevDb,$nap));
-	}
-	if (isset($ora) && is_numeric($ora)) {
-	    $W2 = ' AND `%s`.hianyzas.ora = %u ';
-	    $v = mayor_array_join($v,array($tanevDb,$ora));
-	}
-
-	// 2. hiányzásai
-	    $q = "SELECT hianyzasId FROM `%s`.hianyzas LEFT JOIN `%s`.ora USING (oraId) 
-			WHERE diakId=%u AND ora.tankorId IN (".implode(',', array_fill(0, count($tankorIds), '%u')).") 
-			AND `%s`.hianyzas.dt BETWEEN '%s' AND '%s'".$W1.$W2;
-	    $H = db_query($q, array('debug'=>false,'fv' => 'tankorDiakHianyzasIdk', 'modul' => 'naplo', 'result' => 'idonly', 'values' => $v), $lr);
-	    // if (count($H) > 0) $_SESSION['alert'][] = 'info:hibas_hianyzasok:db='.count($H);
-
-	// is_resource mysqli esetén nem jó (object)
-	if (!$olr) db_close($lr);
-	return $H;
-    }
-
-    //function tankorDiakJegyIdk($diakId, $tankorIds, $tanev, $tolDt, $igDt) 
-    function tankorDiakJegyIdk($SET = array('diakId', 'tankorIds', 'tanev', 'tolDt', 'igDt'), $olr = '')
-    {
-
-	$diakId = $SET['diakId'];
-	$tanev = $SET['tanev'];
-	$tolDt = $SET['tolDt'];
-	$igDt = $SET['igDt'];
-	$nap = $SET['nap'];
-	$ora = $SET['ora'];
-	$tankorIds = $SET['tankorIds'];
-
-	if (!is_array($tankorIds)) if ($tankorIds == '') return false;
-	else $tankorIds = array($tankorIds);
-
-	if ($diakId=='' || count($tankorIds) == 0) return false;
-
-	// is_resource mysqli esetén nem jó (object)
-	if (!$olr) $lr = db_connect('naplo_intezmeny'); else $lr = $olr;
-	initTolIgDt($tanev, $tolDt, $igDt);
-	$tanevDb = tanevDbNev(__INTEZMENY,$tanev);
-
-	    // 3. jegyei
-	    $q = "SELECT jegyId FROM `%s`.jegy 
-			WHERE diakId=%u AND tankorId IN (".implode(',', array_fill(0, count($tankorIds), '%u')).") AND jegy.dt BETWEEN '%s' AND '%s'";
-	    $v = mayor_array_join(array($tanevDb, $diakId), $tankorIds, array($tolDt, $igDt));
-	    $J = db_query($q, array('fv' => 'tankorDiakJegyIdk', 'modul' => 'naplo', 'result' => 'idonly', 'values' => $v));
-	    //if (count($J) > 0) $_SESSION['alert'][] = 'info:hibas_jegyek:db='.count($J);
-
-	// is_resource mysqli esetén nem jó (object)
-	if (!$olr) db_close($lr);
-	return $J;
-
-    }
-
-    function getTankorCsoport($tanev, $olr='') {
-
-	// is_resource mysqli esetén nem jó (object)
-	if (!$olr) $lr = db_connect('naplo_intezmeny'); else $lr = $olr;
-
-        // A tankör csoportjának lekérdezése
-        $q = "SELECT * FROM ".__TANEVDBNEV.".csoport ORDER BY csoportNev,csoportId ";
-        $ret = db_query($q, array(
-	    'fv' => 'getTankorCsoport', 'modul' => 'naplo_intezmeny', 'result' => 'indexed'
-	), $lr);
-	if (is_array($ret) && count($ret) == 0) $ret = array($tankorId);
-
-	// is_resource mysqli esetén nem jó (object)
-	if (!$olr) db_close($lr);
-
-	return $ret;
-
-    }    
-    
-    function getTankorCsoportTankoreiByTankorId($tankorId, $olr='') {
-
-	// is_resource mysqli esetén nem jó (object)
-	if (!$olr) $lr = db_connect('naplo_intezmeny'); else $lr = $olr;
-
-        // A tankör csoportjának lekérdezése
-        $q = "SELECT tankorId FROM ".__TANEVDBNEV.".tankorCsoport
-		WHERE csoportId=(SELECT csoportId FROM ".__TANEVDBNEV.".tankorCsoport
-            			    WHERE tankorId=%u)";
-        $ret = db_query($q, array(
-	    'fv' => 'getTankorCsoportTankoreiByTankorId', 'modul' => 'naplo_intezmeny', 'result' => 'idonly', 'values' => array($tankorId)
-	), $lr);
-	if (is_array($ret) && count($ret) == 0) $ret = array($tankorId);
-
-	// is_resource mysqli esetén nem jó (object)
-	if (!$olr) db_close($lr);
-
-	return $ret;
-
-    }    
-
-    function getTankorLetszam($tankorId,$ADAT=array('refDt'=>'', 'tolDt'=>'', 'igDt'=>''),$olr='') {
-
-	if ($olr!='') $lr = $olr; else $lr = db_connect('naplo_intezmeny');
-
-	if ($ADAT['refDt']!='') $tolDt=$igDt = $ADAT['refDt'];
-	else {
-    	    $tolDt = $ADAT['tolDt'];
-    	    $igDt  = $ADAT['igDt'];
-	}
-        $q = "SELECT count(*) AS v FROM tankorDiak WHERE tankorId=%u AND beDt<='%s' AND (kiDt is null OR kiDt>='%s')";
-	$v = array($tankorId, $igDt, $tolDt);
-        $r = db_query($q, array('fv' => 'getTankorLetszam(share)', 'modul' => 'naplo_intezmeny', 'result' => 'value', 'values' => $v),$lr);
-
-	if ($olr=='') db_close($lr);
-	return $r;
-
-    }
-
-    function getTankorLetszamOsztalyonkent($tankorId,$ADAT=array('tanev'=>'','refDt'=>'', 'tolDt'=>'', 'igDt'=>''),$olr='') {
-
-	if ($olr!='') $lr = $olr; else $lr = db_connect('naplo_intezmeny');
-
-	if ($ADAT['refDt']!='') $tolDt=$igDt = $ADAT['refDt'];
-	else {
-    	    $tolDt = $ADAT['tolDt'];
-    	    $igDt  = $ADAT['igDt'];
-	}
-	$tanev = ($ADAT['tanev']=='') ? __TANEV : $ADAT['tanev'];
-        $q = "SELECT diakId FROM tankorDiak WHERE tankorId=%u AND tankorDiak.beDt<='%s' AND (tankorDiak.kiDt is null OR tankorDiak.kiDt>='%s') ORDER BY diakId";
-	$v = array($tankorId, $igDt, $tolDt);
-	$r = db_query($q, array('fv' => 'getTankorLetszamOsztalyonkent(share)', 'modul' => 'naplo_intezmeny', 'result' => 'indexed', 'values' => $v),$lr);
-
-	for ($i=0; $i$tanev,'tolDt'=>$tolDt,'igDt'=>$igDt),$lr);
-	    $RE[$o[0]['osztalyJel']] ++;
-	}
-	if (is_array($RE)) ksort($RE);
-	if ($olr=='') db_close($lr);
-        return $RE ;
-
-    }
-
-    function getTankorOraszamByTanev($tanev, $tankorIds = array()) {
-
-	global $_TANEV;
-
-	if ($tanev == __TANEV) $TA = $_TANEV;
-	else $TA = getTanevAdat($tanev);
-
-	$szemeszterSzam = count($TA['szemeszter']);
-	if ($szemeszterSzam == 0) {
-	    return false;
-	}
-
-	if (is_array($tankorIds) && count($tankorIds) > 0) {
-	    $TANKOR_WHERE = ' tankorId IN ('.implode(',', array_fill(0, count($tankorIds), '%u')).') AND ';
-	    $v = $tankorIds;
-	} else {
-	    $TANKOR_WHERE = '';
-	    $v = array();
-	}
-	$return = array();
-	$q = "SELECT tankorId, SUM(oraszam)/%u AS oraszam FROM tankorSzemeszter WHERE $TANKOR_WHERE tanev=%u GROUP BY tankorId";
-	array_unshift($v, $szemeszterSzam); $v[] = $tanev;
-	$ret = db_query($q, array(
-	    'fv' => 'getTankorOraszamByTanev', 'modul' => 'naplo_intezmeny', 'result' => 'assoc', 'keyfield' => 'tankorId', 'values' => $v
-	));
-	if (is_array($ret)) foreach ($ret as $tankorId => $tAdat) $return[$tankorId] = $tAdat['oraszam'];
-
-	return $return;
-
-    }
-
-    function tankorTanarRendbenE($tanev, $dt) {
-
-
-	$q = "SELECT DISTINCT tankorSzemeszter.tankorId AS tankorId, tankorNev 
-		FROM tankorSzemeszter LEFT JOIN tankorTanar 
-		ON tankorSzemeszter.tankorId=tankorTanar.tankorId AND kiDt>='%s' AND beDt<='%s' 
-		WHERE tanev=%u AND beDt IS NULL";
-	$v = array($dt, $dt, $tanev);
-	$ret = db_query($q, array('fv' => 'tankorTanarRendbenE', 'modul' => 'naplo_intezmeny', 'result' => 'indexed', 'values' => $v));
-	if (count($ret) > 0) {
-	    $T = array();
-	    for ($i = 0; $i < count($ret); $i++) {
-		$T[] = $ret[$i]['tankorNev'].' ('.$ret[$i]['tankorId'].')';
-	    }
-	    $_SESSION['alert'][] = 'message:wrong_data:Hiányzó tanár hozzárendelés:'.implode(', ', $T);
-	    return false;
-	} else { return true; }
-
-    }
-
-    function getTankorTipusok($SET = array('óratervi'=>null, 'tanórán kívüli'=>null)) {
-
-	$q = "SELECT * FROM tankorTipus";
-	if ($SET['óratervi'] == true) $q .= " WHERE oratervi='óratervi'";
-	elseif ($SET['tanórán kívüli'] == true) $q .= " WHERE oratervi='tanórán kívüli'";
-	$r = db_query($q, array('fv' => 'getTankorTipusok', 'modul' => 'naplo_intezmeny', 'result' => 'assoc', 'keyfield'=>'tankorTipusId'));
-        return $r;
-	//return getEnumField('naplo_intezmeny', 'tankor', 'tankorTipus');
-
-    }
-
-    function getTankorNevById($tankorId, $SET = array('tanev'=>__TANEV)) {
-
-        $q = "SELECT DISTINCT tankorNev FROM tankor 
-		LEFT JOIN tankorSzemeszter ON (tankor.tankorId=tankorSzemeszter.tankorId AND tankorSzemeszter.tanev=%u) 
-		WHERE tankor.tankorId=%u";
-
-        return db_query($q, array('fv' => 'gettankorNevById', 'modul' => 'naplo_intezmeny', 'result' => 'value', 'values' => array($SET['tanev'],$tankorId)));
-    }
-
-    function getTankorTervezettOraszamok($tankorIds) {
-	// A tankör adott tanévre tervezett óraszámai
-	$q = "select tankorId, szemeszter, oraszam from tankorSzemeszter 
-		where tanev=".__TANEV." and tankorId in (".implode(',', array_fill(0, count($tankorIds), '%u')).")
-		order by tankorId, szemeszter";
-	$ret = db_query($q, array('fv'=>'getTankorTervezettOraszamok/tsz','modul'=>'naplo_intezmeny','result'=>'indexed','values'=>$tankorIds));
-	$return = array();
-	foreach ($ret as $adat) {
-	    $return[ $adat['tankorId'] ]['bontasOraszam'][0] = $return[ $adat['tankorId'] ]['bontasOraszam'][1] = array();
-	    if ($adat['szemeszter'] == 2 && !isset($return[ $adat['tankorId'] ]['oraszam'][0])) $return[ $adat['tankorId'] ]['oraszam'][0] = 0;
-	    $return[ $adat['tankorId'] ]['oraszam'][ $adat['szemeszter']-1 ] = $adat['oraszam'];
-	}
-	// a bontásokkal tárgytípusonként lekötött óraszám - elvileg típusonként azonos hetiOraszam szerepelhet csak, ezét a max() ezek egyikét adja vissza
-	$q = "select tankorId, tipus, szemeszter, max(bontasTankor.hetiOraszam) as hetiOraszam 
-		from bontasTankor left join kepzesTargyBontas using (bontasId) 
-		left join ".__INTEZMENYDBNEV.".kepzesOraterv using (kepzesOratervId) 
-		where tankorId in (".implode(',', array_fill(0, count($tankorIds), '%u')).") 
-		group by tankorId, tipus, szemeszter;";
-	$ret = db_query($q, array('fv'=>'getTankorTervezettOraszamok/bt','modul'=>'naplo','result'=>'indexed','values'=>$tankorIds));
-	foreach ($ret as $adat) {
-	    $return[ $adat['tankorId'] ]['bontasOraszam'][ $adat['szemeszter']-1 ][] = array('tipus'=>$adat['tipus'],'hetiOraszam'=>$adat['hetiOraszam']);
-	}
-	return $return;
-    }
-
-    function getOratervenKivuliTankorIds() {
-
-        global $_TANEV;
-
-	$tankorTipusok = getTankorTipusok(array('óratervi'=>true));
-	$oraterviTipusIds = array_keys($tankorTipusok);
-	// óratervi tankörök lekérdezése
-	$qOratervi = "SELECT tankorId FROM ".__INTEZMENYDBNEV.".tankor WHERE tankorTipusId IN (".implode(',', array_fill(0, count($oraterviTipusIds), '%u')).")";
-	$v = $oraterviTipusIds;	
-	// a bontásokkal tárgytípusonként lekötött óraszám - elvileg típusonként azonos hetiOraszam szerepelhet csak, ezét a max() ezek egyikét adja vissza
-	$subQ = "select tankorId, tipus, szemeszter, max(bontasTankor.hetiOraszam) as hetiOraszam 
-		from bontasTankor left join kepzesTargyBontas using (bontasId) 
-		left join ".__INTEZMENYDBNEV.".kepzesOraterv using (kepzesOratervId) 
-		group by tankorId, tipus, szemeszter";
-	// bontés óraszámok összesítése
-	$tblQ = "select tankorId, szemeszter, sum(hetiOraszam) as bontasOraszam from (".$subQ.") as subQuery group by tankorId, szemeszter";
-	// bontás óraszámok és tankör óraszámok összevetése
-	$q = "select tankorId, tankorNev, sum(oraszam-bontasOraszam) as diff from ".__INTEZMENYDBNEV.".tankorSzemeszter 
-		left join (".$tblQ.") as tankorBontasOraszam using (tankorId, szemeszter) 
-		where tanev=".__TANEV." and (tankorBontasOraszam.tankorId is null or bontasOraszam<>oraszam) 
-		and tankorId in (".$qOratervi.")
-		group by tankorId";
-		// , tankorNev --  sql_mode=only_full_group_by miatt került be a tankorNev...
-        $return = db_query($q, array('debug'=>false,'fv'=>'getOratervenKivuliTankorIds','modul'=>'naplo','result'=>'indexed','values'=>$v));
-
-	return $return;
-
-    }
-
-    function getTankorJelenletKotelezoE($tankorId) {
-	$q = "SELECT jelenlet FROM tankor LEFT JOIN tankorTipus USING (tankorTipusId) WHERE tankorId=%u";
-	$v = array($tankorId);
-	$r = db_query($q, array('fv' => 'getTankorJelenletKotelezoE', 'modul' => 'naplo_intezmeny', 'result' => 'value', 'values' => $v));
-	return ($r == 'kötelező');
-    }
-
-?>
diff --git a/mayor-orig/www/include/modules/naplo/share/tankorBlokk.php b/mayor-orig/www/include/modules/naplo/share/tankorBlokk.php
deleted file mode 100644
index 04742e76..00000000
--- a/mayor-orig/www/include/modules/naplo/share/tankorBlokk.php
+++ /dev/null
@@ -1,83 +0,0 @@
- 'getTankorBlokkByTankorId', 'modul' => 'naplo_intezmeny', 'result' => 'idonly', 'values' => $blokkIds));
-
-    }
-
-    function getTankorBlokkByTankorId($tankorIds, $tanev = __TANEV, $SET= array('blokkNevekkel'=>FALSE)) {
-
-	$tanevDb = tanevDbNev(__INTEZMENY, $tanev);
-	if (!is_array($tankorIds)) $tankorIds = array($tankorIds);
-
-	if ($SET['blokkNevekkel']===true) {
-	    $q = "SELECT blokkId,blokkNev FROM `%s`.tankorBlokk LEFT JOIN `%s`.blokk USING (blokkId) WHERE tankorId IN (".implode(',', array_fill(0, count($tankorIds), '%u')).") GROUP BY blokkId";
-	    array_unshift($tankorIds, $tanevDb, $tanevDb);
-	    return db_query($q, array('fv' => 'getTankorBlokkByTankorId', 'modul' => 'naplo_intezmeny', 'result' => 'indexed', 'values' => $tankorIds));
-	} else {
-	    $q = "SELECT DISTINCT blokkId FROM `%s`.tankorBlokk WHERE tankorId IN (".implode(',', array_fill(0, count($tankorIds), '%u')).")";
-	    array_unshift($tankorIds, $tanevDb);
-	    return db_query($q, array('fv' => 'getTankorBlokkByTankorId', 'modul' => 'naplo_intezmeny', 'result' => 'idonly', 'values' => $tankorIds));
-	}
-    }
-
-
-     function getTankorBlokkok($tanev = __TANEV) {
-
-	$RET = array();
-
-	$v = array(tanevDbNev(__INTEZMENY, $tanev)); /* Lehet hogy még nincs megnyitva a tanév, nincs is ilyen adatbázis... */
-	/* Létezik az adatbázis? */
-	$q = "SELECT count(*) AS db FROM Information_schema.tables WHERE table_schema = '".$v[0]."'";
-	$r = db_query($q, array('modul'=>'naplo', 'result'=>'value'), $lr);
-	if ($r==0) return false;
-	/* --- */
-
-	$TA = getTanevAdat($tanev);
-	// if ($TA['statusz']!='aktív') return false; // Ez miért kellene? Lekérdezni lehessen lezárt tanév blokkjait is...
-
-	$lr = db_connect('naplo_intezmeny');
-
-	$q = "SELECT * FROM `%s`.blokk ORDER BY blokkNev";
-	$r = db_query($q, array('fv' => 'getTankorBlokkok', 'modul' => 'naplo_intezmeny', 'result' => 'indexed', 'values' => $v), $lr);
-
-	$BID2ORASZAM = $BID2NEV = array();
-	for ($i = 0; $i < count($r); $i++) {
-	    $_bId = $r[$i]['blokkId'];
-	    $BID2NEV[$_bId] = $r[$i]['blokkNev'];
-	    $BID2ORASZAM[$_bId] = $r[$i]['exportOraszam'];
-	}
-	$q = "SELECT * FROM `%s`.tankorBlokk";
-	$r = db_query($q, array('fv' => 'getTankorBlokkok', 'modul' => 'naplo_intezmeny', 'result' => 'indexed', 'values' => $v ), $lr);
-	if ($r !== false)  {
-	    for ($i = 0; $i < count($r); $i++) {
-		$RET['idk'][$r[$i]['blokkId']][] = $r[$i]['tankorId'];
-	    }
-	    $RET['blokkNevek'] = $BID2NEV;
-	    $RET['exportOraszam'] = $BID2ORASZAM;
-	}
-	if (is_array($RET['blokkNevek']))
-	foreach ($RET['blokkNevek'] as $bId => $bNev) {
-	    if (is_array($RET['idk'][$bId])) { // Ha netán olyan blokk, aminek nincs tanköre...
-		$q = "SELECT MIN(oraszam) FROM tankorSzemeszter WHERE tanev = %u AND tankorId IN (".implode(',', array_fill(0, count($RET['idk'][$bId]), '%u')).")";
-		$v = mayor_array_join(array($tanev), $RET['idk'][$bId]);
-		$RET['maxOraszam'][$bId] = db_query($q, array(
-		    'fv' => 'getTankorBlokkok', 'modul' => 'naplo_intezmeny', 'result' => 'value', 'values' => $v
-		), $lr);
-	    }
-	}
-
-	db_close($lr);
-	return $RET;
-
-    }
-
-?>
diff --git a/mayor-orig/www/include/modules/naplo/share/tankorDiakModifier.php b/mayor-orig/www/include/modules/naplo/share/tankorDiakModifier.php
deleted file mode 100644
index 7f699aea..00000000
--- a/mayor-orig/www/include/modules/naplo/share/tankorDiakModifier.php
+++ /dev/null
@@ -1,518 +0,0 @@
- $tolDt));
-
-	// Blokkba való tartozás
-	$Tanevek = getTanevekByDtInterval($tolDt,$igDt);
-	for ($i=0; $i$BTID) {
-    		    // Ellenőrzés megadott időintervallumban vizsgálva:
-		    // Tagja-e a diák az adott intervallumban a blokk tanköreinek?
-		    if ( in_array($tankorId,$BTID) ) {
-    			$q = "SELECT tankorId FROM ".__INTEZMENYDBNEV.".tankorDiak
-            		    WHERE tankorId IN (".implode(',', array_fill(0, count($BTID), '%u')).")
-			    AND diakId=%u
-            		    AND beDt <= '%s' AND (kiDt IS NULL OR kiDt >= '%s')";
-			$v = mayor_array_join($BTID, array($diakId, $tolDt, $tolDt));
-			$UTKOZO_TANKORIDS = db_query($q, array('fv' => 'tankorDiakFelvesz', 'modul' => 'naplo_intezmeny', 'result' => 'idonly', 'values' => $v));
-    			if (count($UTKOZO_TANKORIDS)>0) {
-			    $q = "SELECT  tankorId  FROM tankorDiakFelmentes WHERE tankorId IN (".implode(',',$UTKOZO_TANKORIDS).")  AND diakId=%u AND felmentesTipus='óralátogatás alól' AND nap is null AND ora is null AND
-				beDt<='%s' AND (kiDt IS NULL or kiDt >='%s')";
-			    $values = array($diakId, $tolDt, $tolDt);
-			    $FELMENTETTTANKORIDS = db_query($q, array('fv' => 'tankorDiakFelvesz', 'modul' => 'naplo_intezmeny', 'result' => 'indexed', 'values' => $values));
-			    for ($j=0; $j1,'refDt'=>$ADAT['tolDt'])) == 'tankor_max_reached')
-	{
-	    $_SESSION['alert'][] = 'info:tankor_max_reached';
-	    return false;
-	}
-	//--
-
-	// Main()
-	{
-	    tankorDiakTorol( array('tankorIds'=>$TankorIds, 'diakId'=> $diakId, 'tolDt'=> $tolDt,'igDt'=> $igDt, 'utkozes'=>'nemEllenoriz', 'MIN_CONTROL'=>false) );	
-
-	    $v = array();
-	    for ($i = 0; $i < count($TankorIds); $i++) {
-		$_tankorId = $TankorIds[$i];		
-		//$_kovetelmeny = $TankorAdat[$_tankorId]['kovetelmeny']; // vagy nem ez. diák statusatol is függ...
-		//$_jelenlet = $TankorAdat[$_tankorId]['jelenlet']; // MIÉRT EZ???????????????????????????????????????????????????
-		//$_jelenlet = "kötelező";
-		//array_push($v, $_tankorId, $diakId, $tolDt, $igDt, $_jelenlet, $_kovetelmeny, $jovahagyva);
-		//$V[] = "(%u, %u, '%s', NULLIF('%s',''), '%s', '%s', %u)";
-		array_push($v, $_tankorId, $diakId, $tolDt, $igDt);
-		$V[] = "(%u, %u, '%s', NULLIF('%s',''))";
-	    }
-	    $q = "INSERT INTO tankorDiak (tankorId,diakId,beDt,kiDt) VALUES ". implode(',',$V);
-	    db_query($q, array('fv' => 'tankorDiakFelvesz', 'modul' => 'naplo_intezmeny', 'values' => $v) );
-    	}
-
-    }
-
-    function diakTankorMagantanulo($diakId, $tolDt, $igDt = NULL, $utkozes = 'ellenorzes', $tanev = __TANEV) {
-
-	die('FATAL ERROR in tankorDiakModifier.php -- diakTankorMagantanulo() -- OOOpps!');
-
-    }
-
-    function tankorDiakModify($ADAT) {
-    /*
-	$ADAT = array(
-	    tankorId - a módosítandó tankor
-	    tolDt, igDt - A módosítás hatálya
-	    diaktorol - torlendő diákok id-i
-	    diakok - Az érintett diákok id-i
-	    {OBSOLETE}DJ* - egy adott diák 'jelenlét' attribútuma (* a diakId)
-	    {OBSOLETE}DK* - egy adott diák 'követelmény' attribútuma (* a diakId)
-	    {OBSOLETE}DOK[diakId] - egy adott diák 'jovahagyva' attribútuma - ha nincs megadva akkor $ADAT['jovahagyva'] érvényes
-	    {OBSOLETE}jovahagyva - a diákok 'jovahagyva' attribútumának alapértelmezése
-	    utkozes - ha igaz akkor 'torles', ha hamis akkor 'ellenorzes'
-	)
-    */
-
-	$tankorId = $ADAT['tankorId'];
-	$alapIgDt = $ADAT['igDt'];
-	$tolDt = $ADAT['tolDt'];
-	$jovahagyva = ($ADAT['jovahagyva']=='') ? 0:1;
-
-	if ($alapIgDt!='' && strtotime($tolDt)>strtotime($alapIgDt)) {
-	    $_SESSION['alert'][] = 'info::hibasdatum';
-	    return false;
-	}
-	// Kik lettek törlésre jelölve - ez az "erősebb"
-	for($i = 0; $i < count($ADAT['diaktorol']); $i++) $TORLENDOK[$ADAT['diaktorol'][$i]] = true;
-	// diákonként végezzük a módosításokat
-	for($i = 0; $i < count($ADAT['diakok']); $i++) {
-
-	    $diakId = $ADAT['diakok'][$i];
-	    //{OBSOLETE}$jelenlet = $ADAT['DJ'.$diakId];
-	    //{OBSOLETE}$kovetelmeny = $ADAT['DK'.$diakId]; // ezt már nem használjuk
-	    //{OBSOLETE$jovahagyva = ($ADAT['DOK'.$diakId]!='') ? $ADAT['DOK'.$diakId]:$jovahagyva;
-	    $igDt = $alapIgDt;
-
-	    $utkozes = ((bool)$ADAT['utkozes']) ? 'torles':'ellenorzes';
-
-	    if ($TORLENDOK[$diakId]) {
-		//tankorDiakTorol( array('tankorId' => $tankorId, 'diakId' => $diakId, 'tolDt' => $tolDt, 'igDt' => $igDt, 'jovahagyva'=>$jovahagyva, 'utkozes' => $utkozes ));
-		tankorDiakTorol( array('tankorId' => $tankorId, 'diakId' => $diakId, 'tolDt' => $tolDt, 'igDt' => $igDt, 'utkozes' => $utkozes ));
-	    } else {
-		// A tankörcsoportok miatt módosítani csak az aktuális intervallumon belül - tehát az első szakadásig - lehet!
-		$q = "SELECT beDt, kiDt, kiDt + INTERVAL 1 DAY AS kovDt FROM tankorDiak WHERE diakId=%u AND tankorId=%u 
-			AND ('%s'<=kiDt OR kiDt IS NULL)";
-		$v = array($diakId, $tankorId, $tolDt);
-		if ($igDt != '') {
-		    $q .= " AND beDt<='%s' ORDER BY beDt,kiDt";
-		    array_push($v, $igDt);
-		}
-		$ret = db_query($q,  array('fv' => 'tankorDiakModify', 'modul' => 'naplo_intezmeny', 'result' => 'indexed', 'values' => $v));
-		for ($j = 0; (($j < count($ret)-1) && ($ret[$j]['kovDt'] == $ret[$j+1]['beDt'])); $j++);
-		if (
-		    $ret[$j]['kiDt'] != ''
-		    && ($igDt == '' || strtotime($ret[$j]['kiDt']) < strtotime($igDt))
-		) $igDt = $ret[$j]['kiDt'];
-
-		// lekérdezzük, hogy módosul-e a jelenlét/követelményoralatogatasAlol, erdemjegyet paraméter
-		/* ERRE NINCS SZÜKSÉG!
-		$q = "SELECT COUNT(*) FROM tankorDiak WHERE diakId=%u AND tankorId=%u AND (kiDt>='%s' OR kiDt IS NULL) AND (oralatogatasAlol!='%s' OR erdemjegyet!='%s')";
-		$v = array($diakId, $tankorId, $tolDt, $oralatogatasAlol, $erdemjegyet);
-		if ($igDt != '') {
-		    $q .= " AND beDt<='$igDt'";
-		    array_push($v, $igDt);
-		}
-		$db = db_query($q, array('fv' => 'tankorDiakModify', 'modul' => 'naplo_intezmeny', 'result' => 'value', 'values' => $v));
-
-		if ($db > 0) {
-		    if (// nem töröljük a tankörcsoport összes tanköréből, csak az adott tankörből!!
-			tankorDiakTorol( 
-			    array(
-				'tankorId' => $tankorId, 'diakId' => $diakId, 'tolDt' => $tolDt, 'igDt' => $igDt,
-				'tankorIds' => array($tankorId), 'utkozes' => $utkozes
-			    )
-			)
-		    ) {
-		    	$q = "INSERT INTO tankorDiak (diakId,tankorId,beDt,kiDt,erdemjegyet,oralatogatasAlol) 
-				VALUES (%u, %u, '%s', NULLIF('%s', ''), '%s', '%s')";
-			$v = array($diakId, $tankorId, $tolDt, $igDt, $erdemjegyet, $oralatogatasAlol);
-
-		    	db_query($q, array('fv' => 'tankorDiakModify', 'modul' => 'naplo_intezmeny', 'values' => $v));
-		    }
-		} // $db>0
-		*/
-	    }
-	}
-    }
-
-
-    function tankorDiakTorol($ADAT, $olr = '') {
-
-	/*
-	    [TOL-IG] töröl zárt szigorú
-	    Paraméterek:
-		diakId
-		utkozes - torles, ellenorzes, nemEllenoriz
-		tankorId
-		tankorIds
-		MIN_CONTROL - true/false
-		tolDt, igDt
-	*/
-
-
-	// esetleges külső tranzakciókhoz!
-	$lr = ($olr != '') ? $olr : db_connect('naplo_intezmeny');
-	// A törlendő időszakra beírt hiányzás, vagy jegy okozhat ütközést. Ekkor vagy automatikusan töröljük a hibás bejegyzéseket, 
-	// vagy hibajelzést adunk, vagy nem foglalkozunk az esetleges ütközésekkel
-	// (ez státuszmódosításkor lehet, mikor a törlés után rögtön vissza is írjuk a tagságot)
-	if (!in_array($ADAT['utkozes'], array('torles','ellenorzes','nemEllenoriz'))) $ADAT['utkozes'] = 'ellenorzes';
-
-	// Valódi törlésnél a tankörcsoport összes tagjából törölni kell, de pl. a tagság típusának módosításakor csak az érintett tankörből töröljük
-	// illetve, ha már valamiért lekérdeztük az érintett tanköröket, akkor át lehessen adni.
-	if (is_array($ADAT['tankorIds']) && count($ADAT['tankorIds']) > 0) $TANKORIDS = $ADAT['tankorIds'];
-	elseif (isset($ADAT['tankorId']) && $ADAT['tankorId'] != '') $TANKORIDS = getTankorCsoportTankoreiByTankorId($ADAT['tankorId'], $lr);
-        else {                                                                                                                                               
-            $_SESSION['alert'][] = 'message:wrong_data:tankorDiakTorol:nincs tankör megadva:'.$ADAT['diakId'];                                                           
-            return false;                                                                                                                                    
-        }                                                                                                                                                    
-
-	// Ellenőrizzük a minimum és maximum létszámokat, ha kell
-	// Figyelem!  pl. Előtárgyjelentkezési időszakban pl tilos vizsgálni...
-	if ($ADAT['MIN_CONTROL']===true) {
-	//for ($i=0; $i(-1),'refDt'=>$ADAT['tolDt'])) == 'tankor_min_reached') {
-		$_SESSION['alert'][] = 'info:tankor_min_reached';
-		if ($olr == '') db_close($lr);
-		return false;
-	    }
-	//}
-	}
-	// --
-	$TH = $TJ = array();
-	$HSUM = $JSUM = array();
-	// A tol-ig dátumok által érintett aktív tanévek lekérdezése
-	$aktivTanevek = getTanevekByDtInterval($ADAT['tolDt'], $ADAT['igDt'], array('aktív')); // hiányzó link resource
-	if ($ADAT['utkozes'] != 'nemEllenoriz') {
-	    // Az érintett tanéveken végigmenve
-	    foreach ($aktivTanevek as $key => $tanev) {
-    		for ($i = 0; $i < count($TANKORIDS); $i++) {
-		    $_SET = array('diakId'=>$ADAT['diakId'], 'tankorIds'=>$TANKORIDS[$i], 'tanev'=>$tanev, 'tolDt'=>$ADAT['tolDt'], 'igDt'=>$ADAT['igDt']);
-		    $H = tankorDiakHianyzasIdk2($_SET, $lr);
-		    $J = tankorDiakJegyIdk($_SET, $lr);
-		    if (count($H)>0) $TH[] = $TANKORIDS[$i];
-		    if (count($J)>0) $TJ[] = $TANKORIDS[$i];
-		    if (is_array($H)) $HSUM = array_merge($HSUM,$H); // $H lehet false is
-		    if (is_array($J)) $JSUM = array_merge($JSUM,$J); // $J lehet false is
-		}
-		if (count($TH) > 0) $_SESSION['alert'][] = 'info:hibas_hianyzasok:'.count($HSUM).':tanev='.$tanev.':tankorIdk='.implode(',',$TH);
-		if (count($TJ) > 0) $_SESSION['alert'][] = 'info:hibas_jegyek:'.count($JSUM).':tanev='.$tanev.':tankorIdk='.implode(',',$TJ);
-
-		// Modosítás:
-		if ($ADAT['utkozes']=='torles') {
-		    // hiányzások és jegyek törlése...
-		    hianyzasTorles($HSUM, $tanev, $lr);
-			jegyTorles($JSUM, null, $tanev, $lr);
-		    $TH = $TJ = array();
-		    $HSUM = $JSUM = array();
-		}
-	    }
-	}
-
-	if (  ((count($TH) == 0 && count($TJ) == 0)) || $ADAT['utkozes'] == 'torles' || $ADAT['utkozes'] == 'nemEllenoriz') {
-
-		logAction(
-		    array(
-			'szoveg'=>'diakKilep: '.$ADAT['diakId'].', '.$ADAT['tolDt'].', '.$ADAT['igDt'].', '.implode(',',$TANKORIDS),
-			'table'=>'tankorDiak'
-		    )
-		);
-
-		// A tol-ig közé esőket töröljük
-		$q = "DELETE FROM tankorDiak WHERE diakId=%u AND tankorId IN (".implode(',', array_fill(0, count($TANKORIDS), '%u')).") AND '%s'<=beDt";
-		$v = mayor_array_join(array($ADAT['diakId']), $TANKORIDS, array($ADAT['tolDt']));
-		if ($ADAT['igDt']!='') {
-		    $q.= " AND kiDt<='%s'";
-		    array_push($v, $ADAT['igDt']);
-		}
-		$delResult = db_query($q, array('fv' => 'tankorDiakTorol', 'modul' => 'naplo_intezmeny', 'values' => $v), $lr );
-
-		if ($ADAT['igDt'] != '') {
-		    // a tol-ig intervallumot tartalmazókat ketté kell vágni, ezért a jobb oldali darabot felvesszük
-		    $q = "INSERT INTO tankorDiak (tankorId,diakId,beDt,kiDt)
-			    SELECT tankorId,diakId,'%s' + INTERVAL 1 DAY AS beDt,kiDt FROM tankorDiak
-			    WHERE diakId=%u AND tankorId IN (".implode(',', array_fill(0, count($TANKORIDS), '%u')).")
-			    AND beDt<'%s' AND (kiDt IS NULL OR '%s'< kiDt)";
-		    $v = mayor_array_join(array($ADAT['igDt'], $ADAT['diakId']), $TANKORIDS, array($ADAT['tolDt'], $ADAT['igDt']));
-		    $insResult = db_query($q, array('fv' => 'tankorDiakTorol', 'modul' => 'naplo_intezmeny', 'values' => $v), $lr );
-		}
-
-		// A balról benyúló intervallumokat levágjuk (az "átnyúlókat" is! Így kapjuk a baloldali darabot)
-		$q = "UPDATE tankorDiak SET kiDt = '%s' - INTERVAL 1 DAY WHERE diakId=%u 
-			AND tankorId IN (".implode(',', array_fill(0, count($TANKORIDS), '%u')).") 
-			AND beDt<'%s' AND (kiDt IS NULL OR '%s'<=kiDt)";
-		$v = mayor_array_join(array($ADAT['tolDt'], $ADAT['diakId']), $TANKORIDS, array($ADAT['tolDt'], $ADAT['tolDt']));
-		$upResult1 = db_query($q, array('fv' => 'tankorDiakTorol', 'modul' => 'naplo_intezmeny', 'values' => $v), $lr);
-
-		if ($ADAT['igDt']!='') {
-		    // A jobbról benyúló intervallumokat levágjuk ("átnyúló" darab már nincs!)
-		    $q = "UPDATE tankorDiak SET beDt = '%s' + INTERVAL 1 DAY WHERE diakId=%u 
-			    AND tankorId IN (".implode(',', array_fill(0, count($TANKORIDS), '%u')).") 
-			    AND beDt<='%s' AND (kiDt IS NULL OR '%s'< kiDt) ";
-		    $v = mayor_array_join(array($ADAT['igDt'], $ADAT['diakId']), $TANKORIDS, array($ADAT['igDt'], $ADAT['igDt']));
-    		    $upResult2 = db_query($q, array('fv' => 'tankorDiakTorol', 'modul' => 'naplo_intezmeny', 'values' => $v), $lr );
-		}
-
-		if ($delResult===false || $upResult1 === false || $upResult2 === false || $insResult===false) {
-		    if ($olr == '') db_close($lr);
-            	    return false;
-		}
-
-	    if ($olr == '') db_close($lr);
-	    return true;
-
-	} else {
-
-	    if ($olr == '') db_close($lr);
-	    return false;
-	}
-
-    }
-
-
-
-
-    function _checkTankorMinMax($tankorId,$ADAT=array('diff'=>1,'refDt'=>'')) {
-
-	$letszam = getTankorLetszam($tankorId, array('refDt'=>$ADAT['refDt']));
-	$TankorAdat = getTankorAdatByIds(array($tankorId), array('dt' => $ADAT['refDt']));
-	if ($ADAT['diff']>0) {
-	    if (
-		$TankorAdat[$tankorId]['max']!=0 && /* Ez a feltétel problémás. A tankörjelentkezés UI-n ugyanis nem engedjük meg a 
-							0-0-s tankörökbe bejelentkezést. Ezzel elérhető hogy az időközben 0-0ra állított
-							limitű tankörbe bejelentkezhessenek. Holott ez unlimited-et jelent?
-						    */
-		($letszam+$ADAT['diff'])>$TankorAdat[$tankorId]['max']) {
-	        $r = 'tankor_max_reached';
-	    }
-	} elseif ($ADAT['diff']<0) {
-	    if ($TankorAdat[$tankorId]['min']!=0 && ($letszam+$ADAT['diff'])<$TankorAdat[$tankorId]['min']) {
-	        $r = 'tankor_min_reached';
-	    }
-	} else {
-	    $r = 'notChecked';
-	}
-	return ($r=='') ? false : $r;
-    }
-
-
-    /* Adott zárt intervallumra felvesz egy bizonyos típusú felmentést */
-    function tankorDiakFelmentesFelvesz($ADAT, $olr = '') {
-
-	/* [TOL-IG] töröl zárt szigorú */
-	$lr = ($olr != '') ? $olr : db_connect('naplo_intezmeny');
-	if ($olr=='') db_start_strans($lr);
-
-	$tankorId = $ADAT['tankorId'];
-	$diakId = $ADAT['diakId'];
-	$tolDt = $ADAT['tolDt'];
-	$igDt = $ADAT['igDt'];
-	$nap = $ADAT['nap'];
-	$ora = $ADAT['ora'];
-	$iktatoszam = $ADAT['iktatoszam'];
-	$felmentesTipus= $ADAT['felmentesTipus'];
-
-	if (!in_array($ADAT['utkozes'], array('torles','ellenorzes','nemEllenoriz'))) $ADAT['utkozes'] = 'ellenorzes';
-	// --
-	$TH = $TJ = array();
-	$HSUM = $JSUM = array();
-	// A tol-ig dátumok által érintett aktív tanévek lekérdezése
-	$aktivTanevek = getTanevekByDtInterval($ADAT['tolDt'], $ADAT['igDt'], array('aktív'));
-	if ($ADAT['utkozes'] != 'nemEllenoriz') {
-	    // Az érintett tanéveken végigmenve
-	    foreach ($aktivTanevek as $key => $tanev) {
-
-		if ($felmentesTipus=='óralátogatás alól') {
-		    $H = tankorDiakHianyzasIdk($ADAT['diakId'], $tankorId, $tanev, $ADAT['tolDt'], $ADAT['igDt'], $nap, $ora);
-		} elseif ($felmentesTipus=='értékelés alól') {
-		    $J = tankorDiakJegyIdk(array('diakId'=>$ADAT['diakId'], 'tankorIds'=>$tankorId, 'tanev'=>$tanev, 'tolDt'=>$ADAT['tolDt'], 'igDt'=>$ADAT['igDt']));		
-		}
-		
-		    if (count($H)>0) $TH[] = $tankorId;
-		    if (count($J)>0) $TJ[] = $tankorId;
-		    if (is_array($H)) $HSUM = array_merge($HSUM,$H); // $H lehet false is
-		    if (is_array($J)) $JSUM = array_merge($JSUM,$J); // $J lehet false is
-
-		if (count($TH) > 0) $_SESSION['alert'][] = 'info:hibas_hianyzasok:'.count($HSUM).':tanev='.$tanev.':tankorIdk='.implode(',',$TH);
-		if (count($TJ) > 0) $_SESSION['alert'][] = 'info:hibas_jegyek:'.count($JSUM).':tanev='.$tanev.':tankorIdk='.implode(',',$TJ);
-
-		// Modosítás:
-		if ($ADAT['utkozes']=='torles') {
-		    // hiányzások és jegyek törlése...
-		    hianyzasTorles($HSUM, $tanev, $lr);
-			jegyTorles($JSUM, null, $tanev, $lr);
-		    $TH = $TJ = array();
-		    $HSUM = $JSUM = array();
-		}
-	    }
-	}
-
-	if (  ((count($TH) == 0 && count($TJ) == 0)) || $ADAT['utkozes'] == 'torles' || $ADAT['utkozes'] == 'nemEllenoriz') {
-
-		logAction(
-		    array(
-			'szoveg'=>'diakFelmentes: '.$ADAT['diakId'].', '.$ADAT['felmentesTipus'].', '.$ADAT['tolDt'].', '.$ADAT['igDt'].', '.$tankorId,
-			'tabla'=>'tankorDiakFelmentes'
-		    )
-		);
-		// A tol-ig közé esőket töröljük
-		$q = "DELETE FROM tankorDiakFelmentes WHERE diakId=%u AND tankorId=%u AND '%s'<=beDt AND felmentesTipus='%s'";
-		$v = array($diakId, $tankorId,$tolDt,$felmentesTipus);
-		if ($ADAT['igDt']!='') {
-		    $q.= " AND kiDt<='%s'";
-		    array_push($v, $ADAT['igDt']);
-		}	
-		if ($ADAT['ora']!=='') {
-		    $q .= " AND ora=%u ";
-		    array_push($v, $ADAT['ora']);
-		}
-		if ($ADAT['nap']!='') {
-		    $q .= " AND nap=%u ";
-		    array_push($v, $ADAT['nap']);
-		}
-		$delResult = db_query($q, array('fv' => 'tankorDiakFelmentesFelvesz', 'modul' => 'naplo_intezmeny', 'values' => $v), $lr );
-
-		if ($ADAT['igDt'] != '') {
-		    // a tol-ig intervallumot tartalmazókat ketté kell vágni, ezért a jobb oldali darabot felvesszük
-		    $q = "INSERT INTO tankorDiakFelmentes (tankorId,diakId,beDt,kiDt,felmentesTipus,nap,ora,iktatoszam)
-			    SELECT tankorId,diakId,'%s' + INTERVAL 1 DAY AS beDt,kiDt,felmentesTipus,nap,ora,iktatoszam FROM tankorDiakFelmentes
-			    WHERE diakId=%u AND tankorId=%u
-			    AND beDt<'%s' AND (kiDt IS NULL OR '%s'< kiDt) AND felmentesTipus='%s'";
-//		    $v = array_merge(array($ADAT['igDt'], $ADAT['diakId']), $TANKORIDS, array($ADAT['tolDt'], $ADAT['igDt']));
-		    $v = array($igDt, $diakId, $tankorId, $tolDt, $igDt, $felmentesTipus);
-		    $insResult = db_query($q, array('fv' => 'tankorDiakFelmentesFelvesz', 'modul' => 'naplo_intezmeny', 'values' => $v), $lr );
-		}
-
-		// A balról benyúló intervallumokat levágjuk (az "átnyúlókat" is! Így kapjuk a baloldali darabot)
-		$q = "UPDATE tankorDiakFelmentes SET kiDt = '%s' - INTERVAL 1 DAY WHERE diakId=%u 
-			AND tankorId=%u
-			AND beDt<'%s' AND (kiDt IS NULL OR '%s'<=kiDt) AND felmentesTipus='%s'";
-		$v = array($tolDt,$diakId,$tankorId,$tolDt,$tolDt, $felmentesTipus);
-		if ($ADAT['ora']!=='') {$q .= " AND ora=%u ";array_push($v, $ADAT['ora']);}
-		$upResult1 = db_query($q, array('fv' => 'tankorDiakFelmentesFelvesz', 'modul' => 'naplo_intezmeny', 'values' => $v), $lr);
-
-		if ($ADAT['igDt']!='') {
-		    // A jobbról benyúló intervallumokat levágjuk ("átnyúló" darab már nincs!)
-		    $q = "UPDATE tankorDiakFelmentes SET beDt = '%s' + INTERVAL 1 DAY WHERE diakId=%u 
-			    AND tankorId=%u
-			    AND beDt<='%s' AND (kiDt IS NULL OR '%s'< kiDt) AND felmentesTipus='%s'";
-		    $v = array($igDt,$diakId,$tankorId,$igDt,$igDt, $felmentesTipus);
-		    if ($ADAT['ora']!=='') {$q .= " AND ora=%u ";array_push($v, $ADAT['ora']);}
-    		    $upResult2 = db_query($q, array('fv' => 'tankorDiakFelmentesFelvesz', 'modul' => 'naplo_intezmeny', 'values' => $v), $lr );
-		}
-
-		if ($nap=='' && ($ora==='' || is_null($ora))) {
-		    $q = "INSERT INTO tankorDiakFelmentes (tankorId,diakId,beDt,kiDt,felmentesTipus,iktatoszam) VALUES (%u,%u,'%s','%s','%s','%s')";
-		    $v = array($tankorId,$diakId,$tolDt,$igDt,$felmentesTipus,$iktatoszam);
-		} elseif ($nap=='' && $ora!=='') {
-		    $q = "INSERT INTO tankorDiakFelmentes (tankorId,diakId,beDt,kiDt,felmentesTipus,ora,iktatoszam) VALUES (%u,%u,'%s','%s','%s',%u,'%s')";
-		    $v = array($tankorId,$diakId,$tolDt,$igDt,$felmentesTipus,$ora,$iktatoszam);
-		} elseif ($nap!='' && ($ora==='' || is_null($ora))) {
-		    $q = "INSERT INTO tankorDiakFelmentes (tankorId,diakId,beDt,kiDt,felmentesTipus,nap,iktatoszam) VALUES (%u,%u,'%s','%s','%s',%u,'%s')";
-		    $v = array($tankorId,$diakId,$tolDt,$igDt,$felmentesTipus,$nap,$iktatoszam);
-		} else {
-		    $q = "INSERT INTO tankorDiakFelmentes (tankorId,diakId,beDt,kiDt,felmentesTipus,nap,ora,iktatoszam) VALUES (%u,%u,'%s','%s','%s',%u,%u,'%s')";
-		    $v = array($tankorId,$diakId,$tolDt,$igDt,$felmentesTipus,$nap,$ora,$iktatoszam);		
-		}
-		$result = db_query($q, array('fv' => 'tankorDiakFelmentesFelvesz', 'modul' => 'naplo_intezmeny', 'values' => $v),$lr );
-
-		if ($delResult===false || $upResult1 === false || $upResult2 === false || $insResult===false || $result === false) {
-		    if ($olr == '') {
-			db_rollback($lr);
-			db_close($lr);
-		    }
-            	    return false;
-		}
-
-	    if ($olr == '') {
-		db_commit($lr);
-		db_close($lr);
-	    }
-	    return true;
-
-	} else {
-
-	    if ($olr == '') {
-		db_rollback($lr);
-		db_close($lr);
-	    }
-	    return false;
-	}
-
-    }
-
-
-    function tankorDiakFelmentesLezar($ADAT, $olr = '') {
-
-
-	if (!is_numeric($ADAT['tankorDiakFelmentesId'])) return false;
-
-	$lr = ($olr != '') ? $olr : db_connect('naplo_intezmeny');
-	if ($olr=='') db_start_strans($lr);
-
-	    $q = "UPDATE tankorDiakFelmentes SET kiDt=('%s' - INTERVAL 1 DAY) WHERE tankorDiakFelmentesId=%u AND (kiDt>='%s' OR kiDt IS NULL)";
-	    $v = array($ADAT['kiDt'],$ADAT['tankorDiakFelmentesId'],$ADAT['kiDt']); // ha nem nagyobb, akkor nem bővítjük!
-	    $result = db_query($q, array('fv' => 'tankorDiakFelmentesLezar', 'modul' => 'naplo_intezmeny', 'values' => $v), $lr);
-
-
-	if ($result === false) {
-		if ($olr == '') {
-			db_rollback($lr);
-			db_close($lr);
-		}
-            	return false;
-
-	} else {
-	    if ($olr == '') {
-		db_commit($lr);
-		db_close($lr);
-	    }
-	    return true;	
-	}
-
-    }
-
-?>
diff --git a/mayor-orig/www/include/modules/naplo/share/tankorModifier.php b/mayor-orig/www/include/modules/naplo/share/tankorModifier.php
deleted file mode 100644
index a344ab7b..00000000
--- a/mayor-orig/www/include/modules/naplo/share/tankorModifier.php
+++ /dev/null
@@ -1,498 +0,0 @@
- 'ujTankor'));
-        else $lr = $olr;
-	$O = getTankorOsztalyaiByTanev($tankorId, __TANEV, array('tagokAlapjan'=>true,'result'=>'id'),$lr);
-	if (count($O)>0) {
-	    $q = "DELETE FROM tankorOsztaly WHERE tankorId=%u AND osztalyId NOT IN (".implode(',',$O).")";
-	    db_query($q, array('fv' => 'setTankorNevByDiakok', 'modul' => 'naplo_intezmeny', 'result'=>'delete','values' => array($tankorId)),$lr);
-	}
-	setTankorNev($tankorId,$tankorNevExtra,$olr);
-	if (!$olr) db_close($lr);
-
-    }
-    // 2012.09. Az adott tanévtől! átnevezi a tankört!
-    function setTankorNev($tankorId, $tankorNevExtra = null, $olr = null) { // a függvényt a tankor.php / ujTankor() függvényéből örököltük. "Majdnem" ugyanaz
-
-	require_once('include/modules/naplo/share/targy.php');
-	require_once('include/modules/naplo/share/osztaly.php');
-	require_once('include/modules/naplo/share/szemeszter.php');
-
-        if (!$olr) $lr = db_connect('naplo_intezmeny', array('fv' => 'ujTankor'));
-        else $lr = $olr;
-
-	if (!$lr) return false;
-
-	// adatgyűjtés tankorId alapján
-	$q = "SELECT targyId FROM tankor WHERE tankorId=%u";
-	$targyId = db_query($q, array('fv' => 'genTankorNev', 'modul' => 'naplo_intezmeny', 'result'=>'value', 'values' => array($tankorId), 'debug'=>false), $lr);
-	$TARGYADAT = getTargyById($targyId,$lr);
-
-	$q = "SELECT osztalyId FROM tankorOsztaly WHERE tankorId=%u";
-	$ADAT['osztalyok'] = db_query($q, array('fv' => 'genTankorNev', 'modul' => 'naplo_intezmeny', 'result'=>'idonly', 'values' => array($tankorId), 'debug'=>false), $lr);
-
-	if (is_null($tankorNevExtra)) {
-	    $q = "SELECT IF(tankorJel IS NOT NULL AND INSTR(tankorNev,tankorJel)!=0,  trim(substring(trim(substring_index(tankorNev,targyNev,-1)),length(tankorJel)+1)), trim(substring_index(tankorNev,targyNev,-1)))  AS tankorNevExtra FROM tankorSzemeszter LEFT JOIN tankor USING (tankorId) LEFT JOIN targy USING (targyId) LEFT JOIN tankorTipus USING (tankorTipusId) WHERE tankorId=%u AND tanev=%u ORDER BY tanev,szemeszter DESC LIMIT 1";
-	    $tankorNevExtra = db_query($q, array('fv' => 'genTankorNev', 'modul' => 'naplo_intezmeny', 'result'=>'value', 'values' => array($tankorId,__TANEV), 'debug'=>false), $lr);
-	}
-
-	$q = "SELECT tankorJel FROM tankor LEFT JOIN tankorTipus USING (tankorTipusId) WHERE tankorId=%u";
-	$tankorJel = db_query($q, array('fv' => 'genTankorNev', 'modul' => 'naplo_intezmeny', 'result'=>'value', 'values' => array($tankorId), 'debug'=>false), $lr);
-
-	$q = "SELECT DISTINCT szemeszterId FROM tankorSzemeszter LEFT JOIN szemeszter USING (tanev,szemeszter)  WHERE tankorId=%u";
-	$ADAT['szemeszterek'] = db_query($q, array('fv' => 'genTankorNev', 'modul' => 'naplo_intezmeny', 'result'=>'idonly', 'values' => array($tankorId), 'debug'=>false), $lr);
-
-	$q = "SELECT jelleg FROM tankor LEFT JOIN tankorTipus USING (tankorTipusId) WHERE tankorId=%u";
-        $tankorTipusJelleg = db_query($q, array('fv' => 'ujTankor', 'modul' => 'naplo_intezmeny', 'result'=>'value','values' => array($tankorId)),$lr);
-
-	// --
-	$kdt = '3000-01-01';
-	$vdt = '1970-01-01';
-
-	if (is_array($ADAT['szemeszterek'])) 
-	for ($j = 0; $j < count($ADAT['szemeszterek']); $j++) {
-	    $nev = '';
-	    $szemeszterId = $ADAT['szemeszterek'][$j];
-	    $_SZ = getSzemeszterek(array('filter' => array("szemeszterId=$szemeszterId")));
-	    if ($_SZ[0]['kezdesDt'] < $kdt) $kdt = $_SZ[0]['kezdesDt'];
-	    if ($_SZ[0]['zarasDt'] > $vdt) $vdt = $_SZ[0]['zarasDt'];
-	    $_tanev = $_SZ[0]['tanev'];
-	    $_szemeszter = $_SZ[0]['szemeszter'];
-//	    $_oraszam = $ADAT['SZ'.$szemeszterId];
-	    if ($tankorTipusJelleg=='osztályfüggetlen') {
-                $nev = "Isk.";
-	    } else {
-	      $OSZTALYOK = getOsztalyok($_tanev,null,$lr);
-	      if ($OSZTALYOK !== false && is_array($OSZTALYOK) && is_array($ADAT['osztalyok'])) {	
-		$nev = '';
-		$TMP = array();
-		for($i = 0; $i < count($OSZTALYOK); $i++) {
-                    // Ha évenként változik az osztály jele, akkor jobb, ha nem generáljuk, hanem a lekérdezett adatokat használjuk!
-                    // $_oj = genOsztalyJel($_tanev, $OSZTALYOK[$i]);
-		    $_oj = $OSZTALYOK[$i]['osztalyJel'];
-		    if ($_oj!==false && !is_null($_oj)) {
-			list($e,$o) = explode('.',$_oj);
-			if (in_array($OSZTALYOK[$i]['osztalyId'], $ADAT['osztalyok'])) 
-			    $TMP[$e][]= $o;
-		    }
-		}
-		if (count(array_keys($TMP)) == 1) { // évfolyamon belüli osztályok:
-		    $nev = implode('||',array_keys($TMP));
-		    $nev .= '.'.implode('',$TMP[$nev]);
-		} elseif (count((array_keys($TMP)))>1) { // multi évfolyam:
-		    $K = (array_keys($TMP));
-		    sort($K);
-		    $nev = $K[0].'-'.$K[count($K)-1].'.';
-		} else { // ekkorra már elballagott minden osztaly...
-		    $nev = false;
-		    $_SESSION['alert'][] = 'info:nem módosítható ebben a tanévben ez a tankör:'.$tankorId.' '.$_tanev;
-		}
-	      } else {
-		$nev = false; // adott szemeszterbe nem jár osztály
-		$_SESSION['alert'][] = 'info::Az adott szemeszterbe nem jár osztály:tankorId('.$tankorId.')';
-	      }
-	    }
-	    if ($nev !== false) {
-		$nev .= ' '.$TARGYADAT['targyNev'].' ';
-		if ($tankorJel!='') $nev .= $tankorJel.' '.$tankorNevExtra;
-		else $nev .= $tankorNevExtra;
-		if ($_tanev >= __TANEV) {
-		    $q = "UPDATE tankorSzemeszter SET tankorNev = '%s' WHERE tankorId=%u AND tanev=%u AND szemeszter=%u";
-		    $v = array($nev,$tankorId,$_tanev,$_szemeszter);
-		    if ($nev!='') db_query($q, array('fv' => 'setTankorNev', 'modul' => 'naplo_intezmeny', 'values' => $v, 'debug'=>false), $lr);
-		} else { 
-		    // a neve már ne változzon, és az óraszáma?
-/*		    $q1 = "SELECT tankorNev FROM tankorSzemeszter WHERE tankorId=%u AND tanev=%u AND szemeszter=%u";
-		    $orignev = db_query($q1, array('fv' => 'ujTankor', 'modul' => 'naplo_intezmeny', 'values' => array($tankorId,$_tanev,$_szemeszter), 'debug'=>false), $lr);
-		    if ($orignev!='') $nev = $orignev;
-*/
-		}
-	    }
-	    	    
-	}
-	if (!$olr) db_close($lr);
-	return $nev;
-
-    }
-
-    function tankorTanarModosit($tankorId, $tanarId, $SET = array('tanev'=>'','tanevAdat'=>'', 'tolDt'=>'', 'igDt'=>'')) {
-	global $_TANEV;
-	$tanev = ($SET['tanev']!='') ? $SET['tanev'] : _TANEV;
-	$tanevAdat = (is_array($SET['tanevAdat'])) ? $SET['tanevAdat'] : (($SET['tanev']=='') ? $_TANEV : getTanevAdat($tanev));
-	$tolDt = ($SET['tolDt']!='') ? $SET['tolDt'] : $tanevAdat['kezdesDt'];
-	$igDt  = ($SET['igDt']!='')  ? $SET['igDt']  : $tanevAdat['zarasDt'];
-	if (strtotime($tolDt)>strtotime($igDt)) $_SESSION['alert'][] = 'error:wrong_data:hibás intervallum ('.$tanev.', '.$tolDt.'-'.$igDt.')';
-
-	if (!is_numeric($tankorId)) return false;
-	$tankorIds = array($tankorId); // kompatibilitási okokból
-	$tankorTanarIds[$tankorId] = array($tanarId); // kompatibilitási okokból
-	$D = array();
-
-	$lr = db_connect('naplo_intezmeny', array('fv' => 'tankorTanarModosit'));
-	db_start_trans($lr);
-
-	// Az intervallumban érintett tankör-tanár tagságok lekérdezése...
-	$v = array($tankorId, $igDt, $tolDt, $tanarId); // +tanarId, a többi tanár nem érdekes
-	$q = "SELECT tanarId, tankorId, min(bedt) AS mbe ,max(kidt) AS mki
-		FROM ".__INTEZMENYDBNEV.".tankorTanar WHERE tankorId = %u
-	        AND bedt<='%s' AND kidt>='%s' AND tanarId=%u GROUP BY tankorId,tanarId";
-	$ret = db_query($q, array('fv' => 'tankorTanarModosit', 'modul' => 'naplo_intezmeny', 'result' => 'indexed', 'values' => $v, 'rollback' => true), $lr);
-	if ($ret === false) { db_close($lr); return false; }
-	for ($i = 0; $i < count($ret); $i++) {
-	    if ($tolDt < $ret[$i]['mbe']) $ret[$i]['mbe'] = $tolDt;
-	    if ($igDt > $ret[$i]['mki']) $ret[$i]['mki'] = $igDt;
-	    $D[ $ret[$i]['tankorId'] ][ $ret[$i]['tanarId'] ] = array('mbe' => $ret[$i]['mbe'], 'mki' => $ret[$i]['mki'], 'torlendo' => true);
-	}
-
-	// Az érintett intervallumba eső tankör-tanár tagságok törlése
-	//$q = "DELETE FROM ".__INTEZMENYDBNEV.".tankorTanar WHERE tankorId = %u AND bedt<='%s' AND kidt>='%s'";
-	$q = "DELETE FROM ".__INTEZMENYDBNEV.".tankorTanar WHERE tankorId = %u AND bedt<='%s' AND kidt>='%s' AND tanarId=%u";
-	$r = db_query($q, array('fv' => 'tankorTanarFelvesz', 'modul' => 'naplo_intezmeny', 'values' => $v, 'rollback' => true), $lr);
-	if ($r === false) { db_close($lr); return false; }
-
-	// beszúrandó
-//	for ($i = 0; $i < count($tankorIds); $i++) {
-//	    $tankorId = $tankorIds[$i];
-//	    $tanarIds = $tankorTanarIds[$tankorId];
-//	    for ($j = 0; $j < count($tanarIds); $j++) {
-//		$tanarId = $tanarIds[$j];
-		if ($tanarId != '') {
-		    $D[$tankorId][$tanarId]['torlendo'] = false;
-		    if (($beDt = $D[$tankorId][$tanarId]['mbe']) == '') $beDt = $tolDt;
-		    if (($kiDt = $D[$tankorId][$tanarId]['mki']) == '') $kiDt = $igDt;
-		    $q = "INSERT INTO ".__INTEZMENYDBNEV.".tankorTanar (tankorId,tanarId,beDt,kiDt) VALUES (%u, %u, '%s', '%s')";
-		    $v = array($tankorId, $tanarId, $beDt, $kiDt);
-		    $r = db_query($q, array('fv' => 'tankorTanarFelvesz', 'modul' => 'naplo_intezmeny', 'values' => $v, 'rollback' => true), $lr);
-		    if ($r === false) { db_close($lr); return false; }
-		}
-//	    }
-//	}
-
-	// törlendők felvétele
-//	for ($i = 0; $i < count($tankorIds); $i++) {
-//	    $tankorId = $tankorIds[$i];
-	    if (is_array($D[$tankorId]))
-	    foreach($D[$tankorId] as $tanarId => $T) {
-		if ($T['torlendo']) {
-		    if ($T['mbe'] < $tolDt) {
-			$beDt = $T['mbe'];
-			$kiDt = date('Y-m-d', strtotime('-1 days',strtotime($tolDt)));
-			$q = "INSERT INTO ".__INTEZMENYDBNEV.".tankorTanar (tankorId,tanarId,beDt,kiDt) VALUES (%u, %u, '%s', '%s')";
-			$v = array($tankorId, $tanarId, $beDt, $kiDt);
-			$r = db_query($q, array('fv' => 'tankorTanarFelvesz', 'modul' => 'naplo_intezmeny', 'values' => $v, 'rollback' => true), $lr);
-			if ($r === false) { db_close($lr); return false; }
-		    }
-		    if ($T['mki'] > $igDt) {
-			$kiDt = $T['mki'];
-			$beDt = date('Y-m-d', strtotime('+1 days',strtotime($igDt)));
-			$q = "INSERT INTO ".__INTEZMENYDBNEV.".tankorTanar (tankorId,tanarId,beDt,kiDt) VALUES (%u, %u, '%s','%s')";
-			$v = array($tankorId, $tanarId, $beDt, $kiDt);
-			$r = db_query($q, array('fv' => 'tankorTanarFelvesz', 'modul' => 'naplo_intezmeny', 'values' => $v, 'rollback' => true), $lr);
-			if ($r === false) { db_close($lr); return false; }
-		    }
-		}
-	    }
-//	}
-
-	// tankörblokkok ellenőrzése - csak nem tervezett tanévben
-	// Érintett blokkok lekérdezése
-	if ($tanevAdat['statusz'] != 'tervezett') {
-	    $blokkIds = getTankorBlokkByTankorId($tankorIds, $tanevAdat['tanev']);
-	    if (is_array($blokkIds)) foreach ($blokkIds as $index => $blokkId) {
-		// A blokk tankörei
-		$bTankorIds = getTankorokByBlokkId($blokkId, $tanevAdat['tanev']);
-
-		// Ellenőrizzük a tankör tanárokat - azonosak-e tankörönként
-    		$q = "SELECT tanarId,COUNT(DISTINCT tankorId) AS c FROM ".__INTEZMENYDBNEV.".tankorTanar
-            	    WHERE tankorId IN (".implode(',', array_fill(0, count($bTankorIds), '%u')).")
-            	    AND beDt <= '%s' AND (kiDt IS NULL OR '%s' <= kiDt)
-            	    GROUP BY tanarId HAVING c>1
-            	    ORDER BY tankorId,tanarId";
-		$v = mayor_array_join($bTankorIds, array($igDt, $tolDt));
-		$r = db_query($q, array('fv' => 'tankorTanarFelvesz/BlokkEllenőrzés', 'modul' => 'naplo_intezmeny', 'result' => 'indexed', 'values' => $v), $lr);
-    		if (is_array($r) && count($r) > 0) {
-		    db_rollback($lr, 'Ütköző tanárt találtam egy blokkban ('.$blokkId.')! Visszaállítjuk az eredeti állapotot!');
-        	    db_close($lr);
-        	    return false;
-    		}
-	    }
-	}
-	/* ========================================================
-	    Órarend módosítása
-	======================================================== */
-
-
-	if ($tanevAdat['statusz'] == 'aktív') {
-
-	    $tanevDbNev = tanevDbNev(__INTEZMENY, $tanevAdat['tanev']);
-
-	    // ÓrarendiOraTankor bejegyzés ellenőrzés/készítés
-	    $V = $v2 = array();
-	    foreach ($tankorIds as $i => $tankorId) {
-		if ($tankorTanarIds[$tankorId][0] != '') { // Ha akarunk egyáltalán tanárt hozzárendelni
-		    // van-e már az igényeinknek megfelelő bejegyzés
-		    $q = "SELECT * FROM `%s`.orarendiOraTankor WHERE tankorId=%u 
-			    AND tanarId IN (".implode(',', array_fill(0, count($tankorTanarIds[$tankorId]), '%u')).") LIMIT 1";
-		    $v = mayor_array_join(array($tanevDbNev, $tankorId), $tankorTanarIds[$tankorId]);
-		    $ret = db_query($q, array('fv' => 'tankorTanarFelvesz', 'modul' => 'naplo', 'result' => 'indexed', 'values' => $v, 'rollback' => true), $lr);
-		    if ($ret === false) { db_close($lr); return false; }
-
-		    if (count($ret) != 0) { // ha van, akkor az elsőt használjuk
-			$OOT[$tankorId] = $ret[0];
-		    } else { // ha nincs, akkor generálunk egy jót
-			$OOT[$tankorId] = array(
-			    'tanarId' => $tankorTanarIds[$tankorId][0], 
-			    'osztalyJel' => 'NaN', 
-			    'targyJel' => $tankorId.'-'.$tankorTanarIds[$tankorId][0],
-			    'tankorId' => $tankorId
-			);
-			$V[] = "(%u, 'NaN', '%s', %u)";
-			array_push($v2, $tankorTanarIds[$tankorId][0], $tankorId.'-'.$tankorTanarIds[$tankorId][0], $tankorId);
-		    }
-		}
-	    }
-	    if (count($V) > 0) { // Az új bejegyzéseket felvesszük
-		$q = "INSERT INTO `%s`.orarendiOraTankor (tanarId,osztalyJel,targyJel,tankorId) VALUES ".implode(',', $V);
-		array_unshift($v2, $tanevDbNev);
-		$r = db_query($q, array('fv' => 'tankorTanarFelvesz', 'modul' => 'naplo', 'values' => $v2, 'rollback' => true), $lr);
-		if ($r === false) { db_close($lr); return false; }
-
-	    }
-
-	    // Az érintett órarendi bejegyzések lekérdezése beDt szerint rendezve
-	    $q = "SELECT tolDt,igDt,het,nap,ora,tankorId,tanarId,osztalyJel,targyJel,teremId
-		    FROM `%s`.orarendiOra LEFT JOIN `%s`.orarendiOraTankor USING (tanarId,osztalyJel,targyJel)
-		    WHERE tolDt <= '%s' AND (igDt >= '%s' OR igDt IS NULL)
-		    AND tankorId IN (".implode(',', array_fill(0, count($tankorIds), '%u')).")
-		    ORDER BY tankorId,tolDt";
-	    $v = mayor_array_join(array($tanevDbNev, $tanevDbNev, $igDt, $tolDt), $tankorIds);
-	    $ret = db_query($q, array(
-		'fv' => 'tankorTanarFelvesz', 'modul' => 'naplo', 'result' => 'multiassoc', 'keyfield' => 'tankorId', 'values' => $v, 'rollback' => true
-	    ), $lr);
-	    if ($ret === false) { db_close($lr); return false; }
-
-	    foreach ($ret as $tankorId => $tankorOrarendiBejegyzesek) {
-
-		// Ha van orarendiOra bejegyzés és nem akarunk tanárt hozzárendelni - az hiba!!
-		if (!is_array($OOT[$tankorId])) {
-		    db_rollback($lr, 'Létező órarendi óra esetén a tanár nem törölhető:'.$tankorId); db_close($lr); return false; 
-		};
-
-		$tanarId = $OOT[$tankorId]['tanarId'];
-		$osztalyJel = $OOT[$tankorId]['osztalyJel'];
-		$targyJel = $OOT[$tankorId]['targyJel'];
-
-		foreach ($tankorOrarendiBejegyzesek as $i => $TOB) {
-		    if ($TOB['teremId'] == '') {
-			$TOB['teremId'] = 'NULL';
-			$valueStr = "(%u, %u, %u, %u, '%s', '%s', %s, '%s', '%s')";
-		    } else {
-			$valueStr = "(%u, %u, %u, %u, '%s', '%s', %u, '%s', '%s')";
-		    }
-		    if ($TOB['tolDt'] < $tolDt) { // balról túlnyúlik - kettévágjuk
-			$q = "UPDATE `%s`.orarendiOra SET igDt='%s' - INTERVAL 1 DAY 
-				WHERE tolDt='%s' AND tanarId=%u 
-				AND het=%u AND nap=%u AND ora=%u"; 
-			$v = array($tanevDbNev, $tolDt, $TOB['tolDt'], $TOB['tanarId'], $TOB['het'], $TOB['nap'], $TOB['ora']);
-			$r = db_query($q, array('fv' => 'tankorTanarFelvesz', 'modul' => 'naplo', 'values' => $v, 'rollback' => true), $lr);
-			if ($r === false) { db_close($lr); return false; }
-			$q = "INSERT INTO `%s`.orarendiOra (het,nap,ora,tanarId,osztalyJel,targyJel,teremId,tolDt,igDt) VALUES $valueStr";
-			$v = array(
-			    $tanevDbNev, $TOB['het'], $TOB['nap'], $TOB['ora'], $TOB['tanarId'], $TOB['osztalyJel'],
-			    $TOB['targyJel'], $TOB['teremId'], $tolDt, $TOB['igDt']
-			);
-			$r = db_query($q, array('fv' => 'tankorTanarFelvesz', 'modul' => 'naplo', 'values' => $v, 'rollback' => true), $lr);
-			if ($r === false) { db_close($lr); return false; }
-			$TOB['tolDt'] = $tolDt; // Az intervallumot lefedő bejegyzések miatt - három fele fogjuk vágni
-		    }
-		    if ($igDt < $TOB['igDt']) { // jobbról túlnyúlik - kettévágjuk !! igDt nem lehet NULL !!
-			$q = "UPDATE `%s`.orarendiOra SET tolDt='%s' + INTERVAL 1 DAY 
-				WHERE igDt='%s' AND tanarId=%u AND het=%u AND nap=%u AND ora=%u"; 
-			$v = array($tanevDbNev, $igDt, $TOB['igDt'], $TOB['tanarId'], $TOB['het'], $TOB['nap'], $TOB['ora']);
-			$r = db_query($q, array('fv' => 'tankorTanarFelvesz', 'modul' => 'naplo', 'values' => $v, 'rollback' => true), $lr);
-			if ($r === false) { db_close($lr); return false; }
-			$q = "INSERT INTO `%s`.orarendiOra (het,nap,ora,tanarId,osztalyJel,targyJel,teremId,tolDt,igDt) VALUES $valueStr";
-			$v = array(
-			    $tanevDbNev, $TOB['het'], $TOB['nap'], $TOB['ora'], $TOB['tanarId'], $TOB['osztalyJel'], 
-			    $TOB['targyJel'], $TOB['teremId'], $TOB['tolDt'], $igDt
-			);
-			$r = db_query($q, array('fv' => 'tankorTanarFelvesz', 'modul' => 'naplo', 'values' => $v, 'rollback' => true), $lr);
-			if ($r === false) { db_close($lr); return false; }
-
-		    }
-		    // A közbensőkben tanárt váltunk
-            	    if ($tanarId != $TOB['tanarId']) {
-                	$q = "UPDATE `%s`.orarendiOra LEFT JOIN `%s`.orarendiOraTankor USING (tanarId,osztalyJel,targyJel)
-                                SET tanarId=%u, osztalyJel='%s', targyJel='%s'
-                                WHERE '%s'<=tolDt AND igDt<='%s' AND tanarId=%u AND het=%u AND nap=%u AND ora=%u AND tankorId=%u";
-			$v = array($tanevDbNev, $tanevDbNev, $tanarId, $osztalyJel, $targyJel, $tolDt, $igDt, $TOB['tanarId'], $TOB['het'], $TOB['nap'], $TOB['ora'], $tankorId);
-                	$r = db_query($q, array('fv' => 'tankorTanarFelvesz', 'modul' => 'naplo', 'values' => $v, 'rollback' => true), $lr);
-                	if ($r === false) { db_close($lr); return false; }
-            	    }
-
-		}
-
-	    } // foreach
-
-	    // A módosított órarend ütközésellenőrzése  -  [k] munkatervenként külön. Itt most megengedjük, hogy ha több munkaterv is van, de egyszerre van órája a tanárnak... :/
-//	    $q = "SELECT tanarId, dt, ora, COUNT(*) AS db
-//            		FROM `%s`.nap LEFT JOIN `%s`.orarendiOra
-//                	    ON (((DAYOFWEEK(dt)+5) MOD 7)+1 = orarendiOra.nap)
-//                	    AND orarendiOra.het=nap.orarendiHet
-//                	    AND orarendiOra.tolDt<=dt AND orarendiOra.igDt>=dt
-//			WHERE '%s' <= dt AND dt <= '%s'
-//			GROUP BY munkatervId,tanarId, dt, ora
-//			HAVING db > 1";
-	    // [bb] szerintem ez a jó: a hét-nap-óra-tanár-tolDt kulcs az orarendiOra táblában, így ha két sorban ezek megegyeznek, akkor nem kell külön számolni...
-	    $q = "SELECT tanarId, dt, ora, COUNT(DISTINCT het, nap, ora, tanarId, tolDt) AS db
-            		FROM `%s`.nap LEFT JOIN `%s`.orarendiOra
-                	    ON (((DAYOFWEEK(dt)+5) MOD 7)+1 = orarendiOra.nap)
-                	    AND orarendiOra.het=nap.orarendiHet
-                	    AND orarendiOra.tolDt<=dt AND orarendiOra.igDt>=dt
-			WHERE '%s' <= dt AND dt <= '%s'
-			GROUP BY tanarId, dt, ora
-			HAVING db > 1";
-	    $v = array($tanevDbNev, $tanevDbNev, $tolDt, $igDt);
-	    $ret = db_query($q, array('fv' => 'tankorTanarFelvesz', 'modul' => 'naplo', 'result' => 'indexed', 'values' => $v, 'rollback' => true), $lr);
-	    if ($ret === false) { db_close($lr); return false; }
-
-	    if (count($ret)) { // Van ütközés!
-		db_rollback($lr, 'Az összes ütközést ellenőriztem, és a megadott '.$tolDt.'-'.$igDt.' intervallumban egy (esetleg másik) tanárnak több órája van egy időben - így visszaállítjuk az eredeti állapotot...');
-		db_close($lr);
-		return false;
-	    }
-
-	} // aktív tanév
-
-	db_commit($lr);
-	db_close($lr);
-	return true;
-
-    }
-
-    function tankorTanarTorol($tankorId, $tanarId, $SET = array('tanev'=>'','tanevAdat'=>'', 'tolDt'=>'', 'igDt'=>'')) { // csak ebből a tankörből csak ezt a tanárt, csak ebben az intervallumban
-	global $_TANEV;
-	$tanev = ($SET['tanev']!='') ? $SET['tanev'] : _TANEV;
-	$tanevAdat = (is_array($SET['tanevAdat'])) ? $SET['tanevAdat'] : (($SET['tanev']=='') ? $_TANEV : getTanevAdat($tanev));
-	$A = $tolDt = ($SET['tolDt']!='') ? $SET['tolDt'] : $tanevAdat['kezdesDt'];
-	$B = $igDt  = ($SET['igDt']!='')  ? $SET['igDt']  : $tanevAdat['zarasDt'];
-	if (strtotime($tolDt)>strtotime($igDt)) $_SESSION['alert'][] = 'error:wrong_data:hibás intervallum ('.$tanev.', '.$tolDt.'-'.$igDt.')';
-	if (!is_numeric($tankorId)) return false;
-
-	// [$A-$B] zárt intervallumban megszűnik a tankör tanárának lenni, de mást nem módosítunk
-	$q = "DELETE FROM tankorTanar WHERE tankorId=%u AND tanarId=%u AND beDt>='%s' AND beDt<='%s' AND kiDt<='%s'";
-	$v = array($tankorId,$tanarId,$A,$B,$B);
-	db_query($q, array('debug'=>false,'fv'=>'tankorTanarTorol/delete','modul'=>'naplo_intezmeny','values'=>$v));
-
-	$q = "UPDATE tankorTanar SET kiDt='%s' - INTERVAL 1 DAY WHERE tankorId=%u AND tanarId=%u AND beDt<='%s' AND kiDt>='%s'";
-	$v = array($A,$tankorId,$tanarId,$A,$A);
-	db_query($q, array('debug'=>false,'fv'=>'tankorTanarTorol/delete','modul'=>'naplo_intezmeny','values'=>$v));
-
-	$q = "UPDATE tankorTanar SET beDt='%s' + INTERVAL 1 DAY WHERE tankorId=%u AND tanarId=%u AND beDt<='%s' AND kiDt>='%s'";
-	$v = array($B,$tankorId,$tanarId,$B,$B);
-	db_query($q, array('debug'=>false,'fv'=>'tankorTanarTorol/delete','modul'=>'naplo_intezmeny','values'=>$v));
-
-	return true;
-    }
-
-    function tankorOsztalyHozzarendeles($tankorId, $osztalyIds) {
-        // Tankör-osztály hozzárendelés módosítása - az aktuális tanév figyelembevételével (diákok, bontások)
-	// !! A tankör nevét nem módosítja !!
-        $jelenlegiOsztalyIds = getTankorOsztalyai($tankorId);
-	$db = count($_SESSION['alert']);
-        $diakOsztalyIds = getTankorOsztalyaiByTanev($tankorId, __TANEV, $SET = array('result' => 'id', 'tagokAlapjan' => true, 'tolDt' => '', 'igDt' => ''));
-	if ($db < count($_SESSION['alert'])) $diakOsztalyIds = array(); // Ha nincs tagja az osztálynak, akkor - hibaüzenet mellett - visszaadja a függvény az összes hozzárendelt osztályt...
-        $bontasOsztalyIds = getTankorOsztalyaiByBontas($tankorId);
-        // diak  vs. új
-        $tmp = array_diff($diakOsztalyIds, $osztalyIds);
-        if (count($tmp) > 0) $_SESSION['alert'] = 'info:wrong_data:diák:A következő osztályokhoz a tankör hozzá van rendelve diákokon keresztül, ezért bővül az osztályok köre:'.implode(',',$tmp);
-        // bontas  vs. új
-        $tmp = array_diff($bontasOsztalyIds, $osztalyIds);
-        if (count($tmp) > 0) $_SESSION['alert'] = 'info:wrong_data:bontás:A következő osztályokhoz a tankör hozzá van rendelve bontásokon keresztül, ezért bővül az osztályok köre:'.implode(',',$tmp);
-        // A helyes osztály lista
-        $ujOsztalyIds = array_unique(array_merge($osztalyIds, $bontasOsztalyIds, $diakOsztalyIds));
-        // Baj lehet még, ha üres az ujOsztalyIds tömb
-        if (count($ujOsztalyIds)==0) return false;
-        $lr = db_connect('naplo_intezmeny');
-        db_start_trans($lr);
-            $ok = true;
-            // törlendők
-            $tmp = array_diff($jelenlegiOsztalyIds, $ujOsztalyIds);
-            if (is_array($tmp) && count($tmp)>0) {
-                $q = "DELETE FROM tankorOsztaly WHERE osztalyId IN (".implode(',', array_fill(0, count($tmp), '%u')).") AND tankorId=%u";
-                $tmp[] = $tankorId;
-                $ok = $ok && db_query($q, array('fv'=>'tankorOsztalyHozzarendeles/delete','modul'=>'naplo_intezmeny','values'=>$tmp));
-            }
-            // felveendők
-            $tmp = array_diff($ujOsztalyIds, $jelenlegiOsztalyIds);
-            if (is_array($tmp) && count($tmp)>0) foreach($tmp as $index=>$osztalyId) {
-                $q = "INSERT INTO tankorOsztaly (tankorId,osztalyId) VALUES (%u,%u)";
-                $ok = $ok && db_query($q, array('fv'=>'tankorOsztalyHozzarendeles/insert','modul'=>'naplo_intezmeny','values'=>array($tankorId,$osztalyId)));
-            }
-        if ($ok) db_commit($lr); else db_rollback($lr);
-        db_close($lr);
-        return $ok;
-    }
-
-    function tankorSzemeszterHozzarendeles($tankorId, $tankorSzemeszter) {
-	// !! A tankör nevét nem módosítja !! (új hozzárendelés esete...)
-
-	// A tankör-szemeszter hozzárendelés módosítása.
-	$jelenlegiTsz = $delDisTsz = $ujTsz = array();
-	foreach ($tankorSzemeszter as $index => $tszAdat) $ujTsz[$tszAdat['tanev'].'/'.$tszAdat['szemeszter']] = $tszAdat;
-	// Jelenlegi hozzárendelések
-	$tmp = getTankorSzemeszterei($tankorId);
-	$lr = db_connect('naplo_intezmeny');
-	db_start_trans($lr); $ok = true;
-	foreach ($tmp as $index => $tszAdat) {
-
-	    $tsz = $tszAdat['tanev'].'/'.$tszAdat['szemeszter'];
-	    $jelenlegiTsz[$tsz] = $tszAdat;
-
-	    if (!is_array($ujTsz[$tsz])) {
-	    // Törölni csak tervezett szemeszterből engedünk...
-		if ($tszAdat['statusz'] == 'tervezett') {
-		    $q = "DELETE FROM tankorSzemeszter WHERE tankorId=%u AND tanev=%u AND szemeszter=%u";
-		    $v = array($tankorId, $tszAdat['tanev'], $tszAdat['szemeszter']);
-		    $ok = $ok && db_query($q, array('fv'=>'tankorSzemeszterHozzarendeles/del','modul'=>'naplo_intezmeny','values'=>$v), $lr);
-		} else {
-		    $delDisTsz[] = $tsz;
-		}
-	    } else if ($ujTsz[$tsz]['oraszam'] != $tszAdat['oraszam']) {
-	    // módosítunk, ha eltér az új óraszám a régitől
-		if ($tszAdat['tanev'] == __TANEV) { // A jelenlegi tanévben a bontás óraszámot ellenőrizzük.
-		    $TO = getTankorTervezettOraszamok(array($tankorId));
-		    $sumBontasOraszam = 0;
-		    foreach ($TO[$tankorId]['bontasOraszam'][$tszAdat['szemeszter']] as $idx => $oAdat) $sumBontasOraszam += $oAdat['hetiOraszam'];
-		    if ($sumBontasOraszam <= $ujTsz[$tsz]['oraszam']) { $ok = true; }
-		    else { $ok = false; $_SESSION['alert'][] = 'message:wrong_data:A bontásokban lekötött összóraszámnál kisebb óraszám nem állítható be.'; }
-		} else { $ok = true; } // egyéb évkben hagyjuk módosítani
-		if ($ok) {
-		    $q = "UPDATE tankorSzemeszter SET oraszam = %f WHERE tankorId=%u AND tanev=%u AND szemeszter=%u";
-		    $v = array($ujTsz[$tsz]['oraszam'], $tankorId, $tszAdat['tanev'], $tszAdat['szemeszter']);
-		    $ok = $ok && db_query($q, array('fv'=>'tankorSzemeszterHozzarendeles/update','modul'=>'naplo_intezmeny','values'=>$v), $lr);
-		}
-	    }
-	}
-	// új hozzárendeléseket korlátozás nélkül fel lehet venni... a tankör neve generált név...
-	foreach ($ujTsz as $tsz => $tszAdat) {
-	    if (!is_array($jelenlegiTsz[$tsz])) {
-		$q = "INSERT INTO tankorSzemeszter (tankorId, tanev, szemeszter, oraszam, tankorNev) VALUES (%u, %u, %u, %f, '%s')";
-		$v = array($tankorId, $tszAdat['tanev'], $tszAdat['szemeszter'], $tszAdat['oraszam'], 'tankor-'.$tankorId);
-		$ok = $ok && db_query($q, array('fv'=>'tankorSzemeszterHozzarendeles/ins','modul'=>'naplo_intezmeny','values'=>$v), $lr);
-	    }
-	}
-	if (count($delDisTsz) > 0) {
-	    $_SESSION['alert'][] = 'info:wrong_data:Nem tervezett tanév esetén nem szüntethető meg a tankör hozzárendelés! ('.implode(', ', $delDisTsz).')';
-	}
-	if ($ok) db_commit($lr);
-	else db_rollback($lr);
-
-	db_close($lr);
-	return $ok;
-    }
-
-?>
diff --git a/mayor-orig/www/include/modules/naplo/share/tanmenet.php b/mayor-orig/www/include/modules/naplo/share/tanmenet.php
deleted file mode 100644
index fe26de8f..00000000
--- a/mayor-orig/www/include/modules/naplo/share/tanmenet.php
+++ /dev/null
@@ -1,208 +0,0 @@
- false)) {
-	if (!is_numeric($tanmenetId)) return false;
-	$v = array($tanmenetId);
-	if ($force !== true) {
-	    // Ellenőrizzük, hogy nincs-e tankörhöz rendelve az adott tanmenet
-	    $q = "SELECT tankorId FROM tanmenetTankor WHERE tanmenetId=%u";
-	    $tankorIds = db_query($q, array('fv' => 'tanmenetTorol/ellenőrzés', 'modul' => 'naplo_intezmeny', 'result'=>'idonly', 'values' => $v));
-	    if (is_array($tankorIds) && count($tankorIds) > 0) {
-		$_SESSION['alert'][] = 'message:wrong_data:tankörhöz rendelt tanmenet nem törölhető:tankorIds='.implode(', ', $tankorIds);
-		return false;
-	    }
-	}
-	$q = "DELETE FROM tanmenet WHERE tanmenetId=%u";
-	return db_query($q, array('fv' => 'tanmenetTorol/törlés', 'modul' => 'naplo_intezmeny', 'values' => $v));
-    }
-
-    function ujTanmenet($ADAT) {
-
-	$q = "INSERT INTO tanmenet (targyId, evfolyamJel, tanmenetNev, oraszam, tanarId, dt) VALUES (%u, '%s', '%s', %u, %u, CURDATE())";
-	$v = array($ADAT['targyId'], $ADAT['evfolyamJel'], $ADAT['tanmenetNev'], $ADAT['oraszam'], $ADAT['tanarId']);
-	return db_query($q, array('fv' => 'ujTanmenet', 'modul' => 'naplo_intezmeny', 'result' => 'insert', 'values' => $v));
-
-    }
-
-    function tanmenetTemakorModositas($ADAT) {
-
-	$lr = db_connect('naplo_intezmeny', array('fv' => 'tanmenetTemakorModositas/connect'));
-	db_start_trans($lr);
-
-	// Eddigi témakörök törlése
-	$q = "DELETE FROM tanmenetTemakor WHERE tanmenetId=%u";
-	$v = array($ADAT['tanmenetId']);
-	$r = db_query($q, array('fv' => 'tanmenetTemakorModositas/delete', 'modul' => 'naplo_intezmeny', 'values' => $v, 'rollback' => true), $lr);
-	if ($r) {
-
-	    // Új témakörök felvétele
-	    $v = $VALUE = array();
-	    for ($i = 0; $i < count($ADAT['temakor']['oraszam']); $i++) {
-		if ($ADAT['temakor']['temakorMegnevezes'][$i] != '' && $ADAT['temakor']['oraszam'][$i] != 0) {
-		    $v[] = $ADAT['tanmenetId']; $v[] = $i; $v[] = $ADAT['temakor']['temakorMegnevezes'][$i];
-		    $v[] = $ADAT['temakor']['oraszam'][$i];
-		    $VALUE[] = "(%u, %u, '%s', %u)";
-		}
-	    }
-	    if (count($VALUE) > 0) { // Ha van egyáltalán beírandó adat
-		$q = "INSERT INTO tanmenetTemakor (tanmenetId, sorszam, temakorMegnevezes, oraszam) VALUES ".implode(',', $VALUE);
-		$r = db_query($q, array('fv' => 'tanmenetTemakorModositas/insert', 'modul' => 'naplo_intezmeny', 'values' => $v, 'rollback' => true), $lr);
-	    }
-	    if ($r) db_commit($lr);
-	}
-
-	db_close($lr);
-	return $r;
-
-    }
-
-    function tankorTanmenetHozzarendeles($ADAT) {
-	$lr = db_connect('naplo_intezmeny', array('fv' => 'tankorTanemenetHozzárendeles/connect'));
-	db_start_trans($lr);
-
-	$q = "DELETE FROM tanmenetTankor WHERE tankorId=%u AND tanev=%u";
-	$v = array($ADAT['tankorId'], $ADAT['tanev']);
-	$r = db_query($q, array('fv' => 'tankorTanmenetHozzarendeles/delete', 'modul' => 'naplo_intezmeny', 'values' => $v, 'rollback' => true), $lr);
-	if ($r) {
-	    if ($ADAT['tanmenetId']!=0) {
-		$q = "INSERT INTO tanmenetTankor (tankorId, tanev, tanmenetId) VALUES (%u, %u, %u)";
-		$v = array($ADAT['tankorId'], $ADAT['tanev'], $ADAT['tanmenetId']);
-		$r = db_query($q, array('fv' => 'tankorTanmenetHozzarendeles/insert', 'modul' => 'naplo_intezmeny', 'values' => $v, 'rollback' => true), $lr);
-		if ($r) db_commit($lr);
-	    } else {
-		if ($r) db_commit($lr);
-	    }
-	}	
-	db_close($lr);
-	return $r;
-
-    }
-
-    function tanmenetDuplikalas($eTanmenetId, $tanarId) {
-
-	$q = "INSERT INTO tanmenet (targyId, evfolyamJel, tanmenetNev, oraszam, tanarId, dt, statusz)
-		SELECT targyId, evfolyamJel, tanmenetNev, oraszam, %u AS tanarId, CURDATE() AS dt, 'új' AS statusz FROM tanmenet WHERE tanmenetId=%u";
-	$v = array($tanarId, $eTanmenetId);
-	$tanmenetId = db_query($q, array('fv' => 'tanmenetDuplikalas/tanmenet', 'modul' => 'naplo_intezmeny', 'result' => 'insert', 'values' => $v));
-	$q = "INSERT INTO tanmenetTemakor (tanmenetId, sorszam, oraszam, temakorMegnevezes)
-		SELECT %u AS tanmenetId, sorszam, oraszam, temakorMegnevezes FROM tanmenetTemakor WHERE tanmenetId=%u";
-	$v = array($tanmenetId, $eTanmenetId);
-	db_query($q, array('fv' => 'tanmenetDuplikalas/tanmenetTemakor', 'modul' => 'naplo_intezmeny', 'values' => $v));
-
-	return $tanmenetId;
-
-    }
-
-    function tanmenetAdatModositas($ADAT) {
-
-
-	// Ha státusz != 'új' || 'elavult', akkor az óraszámnak legalább stimmelnie kellene!
-	if ($ADAT['ujStatusz'] != 'új' && $ADAT['ujStatusz'] != 'elavult') {
-	    $q = "select tanmenet.oraszam as tervezett, sum(tanmenetTemakor.oraszam) as osszes 
-		    from tanmenet left join tanmenetTemakor using(tanmenetId) where tanmenetId=%u GROUP BY tanmenetId";
-	    $ret = db_query($q, array('fv' => 'tanmenetAdatModositas', 'modul'=> 'naplo_intezmeny', 'values' => array($ADAT['tanmenetId']), 'result' => 'record'));
-	    if ($ADAT['oraszam'] != $ret['osszes']) {
-		// A tanmenet státuszát 'új'-ra állítjuk
-		$q = "UPDATE tanmenet SET statusz='új' WHERE tanmenetId=%u";
-		db_query($q, array('fv' => 'tanmenetAdatModositas', 'modul' => 'naplo_intezmeny', 'values' => array($ADAT['tanmenetId'])));
-		
-		$_SESSION['alert'][] = 'message:wrong_data:A tervezett óraszám ('.$ADAT['oraszam'].') nem egyenlő az összóraszámmal ('.$ret['osszes'].')';
-		return false;
-	    }
-	}
-	$q = "UPDATE tanmenet SET tanmenetNev='%s', oraszam=%u, evfolyamJel='%s', statusz='%s' WHERE tanmenetId=%u";
-	$v = array($ADAT['tanmenetNev'], $ADAT['oraszam'], $ADAT['evfolyamJel'], $ADAT['ujStatusz'], $ADAT['tanmenetId']);
-	return db_query($q, array('fv' => 'tanmenetAdatModositas', 'modul' => 'naplo_intezmeny', 'values' => $v));
-
-    }
-
-    function getTanmenetek($SET = array('result' => 'assoc')) {
-
-	$result = readVariable($SET['result'], 'enum', 'assoc', array('indexed','assoc'));
-
-	$q = "SELECT * FROM tanmenet ORDER BY targyId, dt DESC";
-	return db_query($q, array('fv' => 'getTanmenetek', 'modul' => 'naplo_intezmeny', 'result' => $result, 'keyfield' => 'tanmenetId'));
-
-    }
-
-    function getTanmenetAdat($tanmenetId, $SET = array('tanev' => __TANEV)) {
-
-	if ($SET['tanev']=='') $SET['tanev'] = __TANEV;
-	$v = array($tanmenetId,$SET['tanev']);
-
-
-	$q = "SELECT * FROM tanmenet WHERE tanmenetId=%u";
-	$ret = db_query($q, array('fv' => 'getTanmenetAdat', 'modul' => 'naplo_intezmeny', 'result' => 'record', 'values' => $v));
-
-	$q = "SELECT * FROM tanmenetTemakor WHERE tanmenetId=%u ORDER BY sorszam";
-	$ret['temakor'] = db_query($q, array('fv' => 'getTanmenetAdat/témakör', 'modul' => 'naplo_intezmeny', 'result' => 'indexed', 'values' => $v));
-
-	$q = "SELECT * FROM tanmenetTankor WHERE tanmenetId=%u AND tanev=%u";
-	$ret['tankor'] = db_query($q, array('fv' => 'getTanmenetAdat/tankör', 'modul' => 'naplo_intezmeny', 'result' => 'indexed', 'values' => $v));
-	if (is_array($ret['tankor'])) for ($i = 0; $i < count($ret['tankor']); $i++) {
-	    $ret['tankor'][$i]['tankorNev'] = getTankorNevById($ret['tankor'][$i]['tankorId'], array('tanev' => $SET['tanev']));
-	}
-
-	$q = "SELECT * FROM tanmenetTankor WHERE tanmenetId=%u AND tanev!=%u";
-	$ret['tankorNemAktualis'] = db_query($q, array('fv' => 'getTanmenetAdat/tankör/2', 'modul' => 'naplo_intezmeny', 'result' => 'indexed', 'values' => $v));
-	if (is_array($ret['tankorNemAktualis'])) for ($i = 0; $i < count($ret['tankorNemAktualis']); $i++) {
-	    $ret['tankorNemAktualis'][$i]['tankorNev'] = $ret['tankorNemAktualis'][$i]['tanev'].'-'.getTankorNevById($ret['tankorNemAktualis'][$i]['tankorId'], array('tanev' => $ret['tankorNemAktualis'][$i]['tanev']));
-	}
-	
-	$targyAdat = getTargyById($ret['targyId']);
-	$ret['targyNev'] = $targyAdat['targyNev'];
-	$ret['tanarNev'] = getTanarNevById($ret['tanarId']);
-
-	return $ret;
-    }
-
-    function getTanmenetByTankorIds($tankorIds, $SET = array('tanev' => __TANEV, 'jovahagyva' => false)) {
-
-	$tanev = readVariable($SET['tanev'], 'numeric unsigned', __TANEV);
-
-	$W = array();
-	if ($SET['jovahagyva']===true) $W[] = " AND statusz='publikus'";
-
-	$q = "SELECT tankorId, tanmenetId FROM tanmenetTankor LEFT JOIN tanmenet USING (tanmenetId) WHERE tankorId IN (".implode(',', array_fill(0, count($tankorIds), '%u')).") AND tanev=%u".implode($W,' ');
-	$tankorIds[] = $tanev;
-	return db_query($q, array('fv' => 'getTanmenetByTankorIds', 'modul' => 'naplo_intezmeny', 'result' => 'keyvaluepair', 'values' => $tankorIds));
-
-    }
-
-    function getTanmenetByTargyId($targyId, $SET = array('result' => 'indexed')) {
-
-	$result = readVariable($SET['result'], 'enum', 'indexed', array('indexed', 'assoc'));
-	$targyAdat = getTargyById($targyId);
-
-	$q = "SELECT * FROM tanmenet WHERE targyId=%u ORDER BY evfolyamJel,dt DESC";
-	$v = array($targyId);
-	$ret = db_query($q, array('fv' => 'getTanmenetByTargyId', 'modul' => 'naplo_intezmeny', 'result' => $result, 'keyfield' => 'tanmenetId', 'values' => $v));
-
-	if (is_array($ret)) foreach ($ret as $key => $tAdat) {
-	    $ret[$key]['tanarNev'] = getTanarNevById($tAdat['tanarId']);
-	    $ret[$key]['targyNev'] = $targyAdat['targyNev'];
-	}
-
-	return $ret;
-    }
-
-    function getTanmenetByTanarId($tanarId, $SET = array('result' => 'indexed')) {
-
-	$result = readVariable($SET['result'], 'enum', 'indexed', array('indexed', 'assoc'));
-
-	$q = "SELECT * FROM tanmenet WHERE tanarId=%u ORDER BY targyId,evfolyamJel,dt DESC";
-	$v = array($tanarId);
-	$ret = db_query($q, array('fv' => 'getTanmenetByTanarId', 'modul' => 'naplo_intezmeny', 'result' => $result, 'keyfield' => 'tanmenetId', 'values' => $v));
-
-	if (is_array($ret)) foreach ($ret as $key => $tAdat) {
-	    $targyAdat = getTargyById($tAdat['targyId']);
-	    $ret[$key]['targyNev'] = $targyAdat['targyNev'];
-	    $ret[$key]['tanarNev'] = getTanarNevById($tAdat['tanarId']);
-	}
-
-	return $ret;
-    }
-
-?>
diff --git a/mayor-orig/www/include/modules/naplo/share/targy.php b/mayor-orig/www/include/modules/naplo/share/targy.php
deleted file mode 100644
index 2831e4cc..00000000
--- a/mayor-orig/www/include/modules/naplo/share/targy.php
+++ /dev/null
@@ -1,432 +0,0 @@
- 'indexed')) {
-
-	$q = "SELECT * FROM targy WHERE mkId=%u";
-	$v = array($mkId);
-	$result = readVariable($SET['result'], 'enum', 'indexed', array('indexed', 'idonly', 'assoc'));
-	return db_query($q, array('fv' => 'getTargyakByMkId', 'modul' => 'naplo_intezmeny', 'result' => $result, 'values' => $v));    
-    
-    }
-
-    // Miért van három szinte azonos függvény?
-    function getTargyById($targyId) {
-
-	$q = "SELECT * FROM targy WHERE targyId=%u";
-	$v = array($targyId);
-	return db_query($q, array('fv' => 'getTargyById', 'modul' => 'naplo_intezmeny', 'result'=> 'record', 'values'=>$v));
-
-    }
-
-    function getTargyAdatByIds($targyIds=null) { //2009 // esetleg ByIds nélkül kifejezőbb lenne a név...
-	if (is_array($targyIds) && count($targyIds) > 0) {
-	    $q = "SELECT * FROM targy WHERE targyId IN (".implode(',', array_fill(0, count($targyIds), '%u')).") ORDER BY targyNev";
-	    $v = $targyIds;
-	} else {
-	    $q = "SELECT * FROM targy ORDER BY targyNev";
-	    $v = array();
-	}
-	$R = db_query($q, array('fv' => 'getTargyAdatByIds', 'modul' => 'naplo_intezmeny', 'result' => 'assoc', 'keyfield' => 'targyId','values'=>$v));
-	return $R;
-    }
-
-    function getTargyak($SET = array('mkId' => null, 'targySorrendNev' => null, 'tanev' => __TANEV, 'osztalyId' => null, 'arraymap' => null) ) {
-
-	if (isset($SET['tanev']) && $SET['tanev'] != __TANEV) $tanevDb = tanevDbNev(__INTEZMENY, $SET['tanev']);
-        else $tanevDb = __TANEVDBNEV;
-	$targySorrendNev = readVariable($SET['targySorrendNev'], 'enum', null, getTargySorrendNevek());
-
-	if (isset($SET['mkId'])) {
-	    $W = 'WHERE mkId = %u '; $v = array($SET['mkId']);
-	} else {
-	    $W = ''; $v = array();
-	}
-	if ($targySorrendNev != '' && $SET['osztalyId'] != '') {
-	    $q = "SELECT targy.* FROM targy LEFT JOIN $tanevDb.targySorszam 
-		    ON targy.targyId = targySorszam.targyId AND osztalyId=%u AND sorrendNev='%s'
-		    $W ORDER BY IF(sorszam IS NULL,100,sorszam), targyNev";
-	    array_unshift($v, $SET['osztalyId'], $targySorrendNev);
-	} else {
-    	    $q = "SELECT * FROM targy $W ORDER BY targyNev";
-	}
-	$r = db_query($q, array('modul' => 'naplo_intezmeny', 'result' => 'indexed', 'fv' => 'getTargyak', 'values' => $v));
-
-	if (is_array($SET['arraymap'])) {
-	    $RE = reindex($r,$SET['arraymap']);
-	} else {
-	    $RE = $r;
-	}
-
-	return $RE;
-    }
-
-    function getTargySorrendNevek($tanev = __TANEV) {
-	require_once('include/modules/naplo/share/file.php');
-	return getEnumField('naplo_base', tanevDbNev(__INTEZMENY, $tanev).'.targySorszam', 'sorrendNev');
-    }
-
-    function getTanevTargySorByOsztalyId($osztalyId, $tanev = __TANEV, $sorrendNev = 'bizonyítvány') {
-
-        global $_TANEV;
-
-        if ($tanev != __TANEV) $Tanev = getTanevAdat($tanev);
-        else $Tanev = $_TANEV;
-
-	// Az összes diákra szükség van aktív tanévben is - év végén a végzősök már nincsenek jogviszonyban...
-	$Statusz = array('jogviszonyban van','magántanuló','jogviszonya felfüggesztve','jogviszonya lezárva');
-	$diakIds = array();
-        $Diak = getDiakok(array('osztalyId' => $osztalyId, 'tanev' => $tanev, 'statusz' => $Statusz));
-        for ($i = 0; $i < count($Diak); $i++) $diakIds[] = $Diak[$i]['diakId'];
-
-
-	if (count($diakIds) > 0) {
-
-	    // a második paraméter $Tanev, de kompatibilis a $szemeszteradattal)
-	    $targyak = getTargyakByDiakIds($diakIds,$Tanev,$osztalyId,$sorrendNev, array('csakOratervi'=>false,'filter'=>''));
-	    return $targyak;
-	}
-	else
-	{
-	    return false;
-	}
-
-    }
-/*
-    Egy osztályhoz rendelt tankörök tárgyai - lehet, hogy valójában nincs is olyan diák, aki tanulja ezt a tárgyat. 
-    Magatartás/szorgalom nincs benne... Miért is ne lenne benne? Én nem látom, hogy ki lenne szűrve...
-    nyomtatas/haladasinaplo-ban használt függvény!
-*/
-    function getTargyakByOsztalyId($osztalyId, $tanev = __TANEV, $SET = array('targySorrendNev' => 'napló', 'result' => 'indexed')) {
-	if ($tanev != __TANEV) $tanevDbNev = tanevDbNev(__INTEZMENY, $tanev);
-	else $tanevDbNev = __TANEVDBNEV;
-	$q = "SELECT DISTINCT targy.targyId AS targyId, targyNev, targyRovidNev FROM targy
-		LEFT JOIN tankor USING (targyId) 
-		LEFT JOIN tankorOsztaly USING (tankorId) 
-		LEFT JOIN ".$tanevDbNev.".targySorszam 
-		    ON tankorOsztaly.osztalyId=targySorszam.osztalyId AND targy.targyId=targySorszam.targyId AND sorrendNev = '%s'
-		LEFT JOIN tankorSzemeszter USING (tankorId)
-		WHERE tanev=%u AND tankorOsztaly.osztalyId=%u ORDER BY IFNULL(sorszam,1000),targyNev";
-	return db_query($q, array('fv' => 'getTargyByOsztalyId', 'modul' => 'naplo_intezmeny', 'result' => $SET['result'], 'values' => array($SET['targySorrendNev'],$tanev,$osztalyId)));
-    }
-
-    function getTargyakByDiakId($diakId, 
-		$SET = array('tanev' => __TANEV, 'dt' => null, 'tolDt' => null, 'igDt' => null, 'result' => 'indexed','csakOratervi'=>false, 'osztalyId' => null, 'filter' => null, 'targySorrendNev' => null)) {
-    /*
-	A függvény először lekérdezi a diák osztályait az adott időintervallumban. Ha van megadva osztalyId paraméter, akkor csak
-	azt veszi a továbbiakban figyelembe! Majd a diák és az egyes osztályok képzéseit is lekérdezzük (az intervallum végi dátummal!).
-	
-	Ha van megadva osztalyId, akkor csak az oda sorolható tárgyakat kérdezzük le, illetve a más osztályhoz nem sorolható, de évfolyamban megfelelőket
-	(ld. szűrés)
-
-	Ezek után a tárgyakat három forrásból veszi:
-	1. A diák adott időintervallumbeli tankör tagságaiból vett tárgyakat osztályokhoz rendeli, vagy az egyéb kategóriába teszi
-	2. Az adott időintervallumba eső zárójegyek tárgyait a korábbi tankörök alapján rendeli osztályokhoz, a maradék, de évfolyamban
-	   a diák valamely osztályának megfelelő tárgyat az egyéb kategóriába sorolja. Azok a zárójegy tárgyak tehát sose kerülnek be,
-	   amik évfolyamban nem felelnek meg...
-	3. A diák esetleges képzései egyben osztályhoz is rendelik az onnan származó tárgyakat.
-
-	A keletkező adatszerkezet:
-	    array(
-		osztaly => array($osztalyId1 => array( .... tárgyId-k ....), $osztalyId2 => array( ... ), ...),
-		egyeb => array( ... tárgyId-k ...),
-		targyAdat => array(
-		    $targyId1 => array(targyNev => ..., evkoziKovetelmeny => ..., zaroKovetelmeny => ..., jegyTipus => ..., evfolyam => ..., evfolyamJel =>) // nem mindegyik van mindig!!
-		)
-	    )
-
-	Ha nincs megadva 'result' paraméter akkor a teljes tömböt adja vissza a fv.
-
-	Ha van megadva 'result', akkor figyelembe vesszi a 'filter' paramétert is - eddig egy értéket vesz figyelembe: kovetelmeny
-	Ezután a függvény $result-nak megfelelően átalakítva adja vissza a szelektált tárgyak listáját (idonly, assoc, indexed)
-
-    */
-	// ERŐS TANÉVFÜGGŐSÉG!
-	$tanev = readVariable($SET['tanev'], 'numeric unsigned', __TANEV);
-
-	// A tárgysorrend tanév függő
-	if ($tanev != __TANEV) $tanevDb = tanevDbNev(__INTEZMENY, $tanev);
-	else $tanevDb = __TANEVDBNEV;
-
-	$dt = readVariable($SET['dt'], 'datetime', null);
-	$tolDt = readVAriable($SET['tolDt'], 'date', $dt);
-	$igDt = readVAriable($SET['igDt'], 'date', $dt);
-	initTolIgDt($tanev, $tolDt, $igDt);
-	if (is_null($dt)) $dt = $igDt;
-	$result = readVariable($SET['result'], 'enum', 'indexed', array('indexed','assoc','keyvaluepair','idonly'));
-//!!!!
-	$targySorrendNev = readVariable($SET['targySorrendNev'], 'sql', null, array('napló','anyakönyv','ellenőrző','bizonyítvány','egyedi'));
-	$return = array('egyeb' => array(), 'osztaly' => array(), 'targyAdat' => array());
-
-	if ($SET['csakOratervi']===true) {
-	    $LEFTJOIN = " LEFT JOIN tankorTipus USING (tankorTipusId) ";
-	    $W = " AND tankorTipus.oratervi='óratervi' ";
-	}
-
-	// A diák osztályai, képzései - a tárgyak csoportosításához!
-	$diakOsztalyIds = getDiakOsztalya($diakId, array('tanev' => $tanev, 'tolDt' => $tolDt, 'igDt' => $igDt, 'result' => 'idonly'));
-	if (isset($SET['osztalyId'])) {
-	    if (!in_array($SET['osztalyId'], $diakOsztalyIds)) {
-		// Nem biztos, hogy hiba. Pl. zárási stat-ban, ha első félévben osztályt vált, akkor második félévben ebbe az ágba kerül a lekérdezés...
-		if (__NAPLOADMIN) $_SESSION['alert'][] = 'info:wrong_data:getTargyakByDiakId:A diák ('.$diakId.') nem tagja az osztalynak ('.$SET['osztalyId'].')';
-		return false;
-	    } else {
-		$diakOsztalyIds = array($SET['osztalyId']);
-	    }
-	}
-	$diakEvfolyamJel = array();
-	if (count($diakOsztalyIds)==0) {
-	    // --TODO, ilyenkor mi van?
-	    // Pl. ha év közben elmegy a tanuló az iskolából...
-	    // Mindenesetre ne jelenjen meg mindig mindenkinek ez az üzenet, mert idegesítő... elég az adminnak
-	    if (__NAPLOADMIN) $_SESSION['alert'][] = 'info:not_implemented:nincs_osztaly,getTargyakByDiakId:diakId='.$diakId;
-	} else {
-	    $osztalyKepzes = getKepzesByOsztalyId($diakOsztalyIds, array('result' => 'indexed', 'arraymap' => array('osztalyId','kepzesId')));
-	    foreach ($diakOsztalyIds as $osztalyId) {
-		$return['osztaly'][$osztalyId] = array();
-		$osztalyAdat[$osztalyId] = array(
-		    'targy' => getTargyakByOsztalyId($osztalyId, $tanev, array('result' => 'idonly')),
-		    'evfolyam'=>getEvfolyam($osztalyId,$tanev),
-		    'evfolyamJel'=>getEvfolyamJel($osztalyId,$tanev)
-		);
-		if (is_array($osztalyKepzes[$osztalyId])) foreach ($osztalyKepzes[$osztalyId] as $kepzesId => $kAdat) {
-		    if (isset($kepzesOsztaly[$kepzesId])) { 
-			// Ha azonos évfolyamon vannak a képzéshez rendelt osztályok, akkor nem okoz gondot a több osztály a képzésből jövő tárgyak lekérdezésénél - ezért nem üzenünk hibát
-			if ($osztalyAdat[$osztalyId]['evfolyamJel'] != $osztalyAdat[ $kepzesOsztaly[$kepzesId] ]['evfolyamJel']) { 
-			    $_SESSION['alert'][] = 'message:wrong_data:getTargyakByDiakId:egy képzés több különböző évfolyamú osztályhoz tartozik';
-			}
-			// TODO , evfolyamJel re való áttérés a képzéseknél - ellenőrzés, tesztelés...
-			if ($osztalyAdat[$osztalyId]['evfolyamJel'] != $osztalyAdat[ $kepzesOsztaly[$kepzesId] ]['evfolyamJel']) { 
-			    $_SESSION['alert'][] = 'message:wrong_data:getTargyakByDiakId:egy képzés több különböző évfolyamú osztályhoz tartozik.:osztalyAdat('.$osztalyAdat[$osztalyId]['evfolyamJel'].' vs. '.$osztalyAdat[ $kepzesOsztaly[$kepzesId] ]['evfolyamJel'].')';
-			}
-		    } else {
-			$kepzesOsztaly[$kepzesId] = $osztalyId;
-		    }
-		}
-		if (!in_array($osztalyAdat[$osztalyId]['evfolyamJel'], $diakEvfolyamJel)) $diakEvfolyamJel[] = $osztalyAdat[$osztalyId]['evfolyamJel'];
-	    }
-	}
-
-	if (count($diakEvfolyamJel)==0) {
-	    // --TODO, ilyenkor mi van?	
-	    // Pl. ha év közben elmegy a tanuló az iskolából...
-	    // Legalább ne mindenkinek, csak az adminnak jelenjen meg a hibaüzenet...
-	    if (__NAPLOADMIN) $_SESSION['alert'][] = 'info:not_implemented:nincs_evfolyam,getTargyakByDiakId';
-	}
-	
-	// Tárgyak lekérdezése a diák aktuális tankör-tagságai alapján
-	$q = "SELECT DISTINCT targyId,targyNev, zaroKovetelmeny, tankor.kovetelmeny AS evkoziKovetelmeny
-		FROM targy
-		LEFT JOIN tankor USING (targyId) 
-		LEFT JOIN tankorSzemeszter USING (tankorId)
-		$LEFTJOIN
-		LEFT JOIN tankorDiak USING (tankorId)
-		WHERE diakId=%u AND tanev=%u AND beDt <= '%s' AND ('%s' <= kiDt OR kiDt IS NULL)
-		$W
-		ORDER BY targyNev, tankor.kovetelmeny DESC"; // Ha több tankör van egy tárgyhoz különböző követelményekkel, akkor ne a "nincs" legyen az utolsó!
-	$v = array($diakId, $tanev, $igDt, $tolDt);
-
-	$return['targyAdat'] = db_query($q, array('fv' => 'getTargyByDiakId', 'modul' => 'naplo_intezmeny', 'keyfield' => 'targyId', 'result' => 'assoc', 'values' => $v));
-
-	foreach ($return['targyAdat'] as $targyId => $tAdat) {
-	    $osztalybaSorolva = false;
-	    foreach ($diakOsztalyIds as $osztalyId) {
-		if (in_array($targyId, $osztalyAdat[$osztalyId]['targy'])) {
-		    $return['osztaly'][$osztalyId][] = $targyId;
-		    $osztalybaSorolva = true;
-		}
-	    }
-	    if (!$osztalybaSorolva) $return['egyeb'][] = $targyId;
-	}
-
-	// Tárgyak lekérdezése a beírt zárójegyek, osztályzatok alapján
-	if (count($diakEvfolyamJel)>0) {
-	    // Ez lenne az új javaslat: az adott tolDt-igDt közötti VAGY adott évfolyamokra illeszkedő zárójegyek legyenek lekérdezve - ez így bővebb... (evfolyam-->evfolyamJel tesztelendő)
-	    $q = "SELECT targyId, targyNev, evfolyam, evfolyamJel, jegyTipus FROM zaroJegy LEFT JOIN targy USING (targyId)                                                     
-		WHERE diakId=%u AND (('%s' <= hivatalosDt AND hivatalosDt <= '%s') OR evfolyamJel IN (".implode(',', array_fill(0, count($diakEvfolyamJel), '%u'))."))";
-	    // Ez az eredeti tolDt-igDt közötti ÉS adott évfolyamokra illeszkedő jegyek... (evfolyam-->evfolyamJel tesztelendő)
-	    $q = "SELECT targyId, targyNev, evfolyam, evfolyamJel, jegyTipus FROM zaroJegy LEFT JOIN targy USING (targyId)
-		WHERE diakId=%u AND '%s' <= hivatalosDt AND hivatalosDt <= '%s' AND evfolyamJel IN (".implode(',', array_fill(0, count($diakEvfolyamJel), '%u')).")";
-	    $v = $diakEvfolyamJel;
-	    array_unshift($v, $diakId, $tolDt, $igDt);
-	    $retZJ = db_query($q, array('fv' => 'getTargyByDiakId/zárójegyek', 'modul' => 'naplo_intezmeny', 'keyfield' => 'targyId', 'result' => 'assoc', 'values' => $v));
-	    foreach ($retZJ as $targyId => $tAdat) {
-		$osztalybaSorolva = false;
-		if (isset($return['targyAdat'][$targyId])) $return['targyAdat'][$targyId]['jegyTipus'] = $tAdat['jegyTipus'];
-		else $return['targyAdat'][$targyId] = $tAdat;
-		foreach ($diakOsztalyIds as $osztalyId) {
-		    if (in_array($targyId, $osztalyAdat[$osztalyId]['targy'])) {
-			if (!in_array($targyId, $return['osztaly'][$osztalyId])) $return['osztaly'][$osztalyId][] = $targyId;
-			$osztalybaSorolva = true;
-		    }
-		}
-		if (!$osztalybaSorolva && !in_array($targyId, $return['egyeb'])) $return['egyeb'][] = $targyId;
-	    }
-	}
-
-	// Tárgyak lekérdezése képzés alapján
-	// - van-e a diáknak képzése?
-	$kepzesIds = getKepzesByDiakId($diakId, array('dt'=>$dt, 'result' => 'idonly'));
-	if (is_array($kepzesIds) && count($kepzesIds) > 0) {
-	    foreach ($kepzesIds as $kepzesId) {
-		$osztalyId = $kepzesOsztaly[$kepzesId];
-		$evfolyamJel = $osztalyAdat[$osztalyId]['evfolyamJel'];
-		$retK = getKepzesOraterv($kepzesId, array('arraymap' => array('evfolyamJel', 'targyId')));
-		if (is_array($retK[$evfolyamJel])) foreach ($retK[$evfolyamJel] as $targyId => $tAdat) {
-		    if ($targyId != '') {
-			if (!in_array($targyId, $return['osztaly'][$osztalyId])) $return['osztaly'][$osztalyId][] = $targyId; //Ne üzenjünk hibát? Ezek szerint egy képzésben előírt tárgy nem szerepelt a tankörök között...
-			if (is_array($return['targyAdat'][$targyId])) $return['targyAdat'][$targyId]['zaroKovetelmeny'] = $tAdat[ (count($tAdat)-1) ]['kovetelmeny']; // A képzés követelménye felülírja a tárgyét...
-			else $return['targyAdat'][$targyId] = array_merge(getTargyById($targyId), array('evfolyamJel' => $evfolyamJel, 'zaroKovetelmeny' => $tAdat[ (count($tAdat)-1) ]['kovetelmeny'])); // Ha még nem szerepelt a tárgy, akkor vegyük fel az adatait...
-		    }
-		}
-	    }
-	}
-	// Kellene még szűrni - követelmény, vagy jelenlét szerint, és le kellene kezelni a $result paramétert... (rev. 2251))
-	if ($SET['result'] == '') return $return; // Ha nincs visszatérési forma megadva, akkor adjuk vissza az egész tömböt!
-	
-	if ($targySorrendNev != '' && is_array($return['targyAdat']) && count($return['targyAdat'])>0) {
-	    // Rendezés... a $diakOsztalyIds[0] alapján!
-	    $q = "SELECT targy.targyId FROM targy LEFT JOIN ".$tanevDb.".targySorszam
-		    ON targy.targyId = targySorszam.targyId AND osztalyId=%u AND sorrendNev='%s'
-		    WHERE targy.targyId IN (".implode(',', array_fill(0, count(array_keys($return['targyAdat'])), '%u')).") ORDER BY sorszam, targyNev";
-	    $v = array_keys($return['targyAdat']);
-	    array_unshift($v, $diakOsztalyIds[0], $targySorrendNev);
-	    $sorrend = db_query($q, array('fv' => 'getTargyakByDiakId/targySorrend', 'modul' => 'naplo_intezmeny', 'result' => 'idonly', 'values' => $v));	
-	} else {
-	    $sorrend = array_keys($return['targyAdat']);
-	}
-
-	// Szűrés
-	$ret = array();
-	if (isset($SET['osztalyId'])) $osztalyId = $SET['osztalyId']; // Ha van szűrés az osztályra...
-	foreach ($sorrend as $targyId) {
-	    $tAdat = $return['targyAdat'][$targyId];
-
-	    if ( // szűrés az osztályra
-		!isset($SET['osztalyId']) // nincs osztályra szűrés...
-		|| (is_array($return['osztaly'][$osztalyId]) && in_array($targyId, $return['osztaly'][$osztalyId])) // vagy a szűrendő osztályhoz kapcsolódó tárgy
-		|| (in_array($targyId, $return['egyeb']) && isset($tAdat['evfolyamJel']) && in_array($tAdat['evfolyamJel'], $diakEvfolyamJel)) // vagy nem kapcsolható más osztályhoz, évfolyama viszont megfelel a szűrendő évfolyamnak
-	    ) {
-		if (
-		    $SET['filter'] != 'kovetelmeny' || // ha nincs követelmény szerinti szűrés...
-		    ( // Szűrés a követelményre
-			(isset($tAdat['evkoziKovetelmeny']) && $tAdat['evkoziKovetelmeny'] != 'nincs') // vagy van/lehet évközi értékelése ...
-			|| (isset($tAdat['zaroKovetelmeny']) && $tAdat['zaroKovetelmeny'] != 'nincs' && $tAdat['zaroKovetelmeny'] != '')  // vagy év végi osztályzata...
-			|| (isset($tAdat['jegyTipus']))						       // vagy van már beírva osztályzata
-		    )
-		) { // Megfelelő adatforma kialakítása
-		    if ($SET['result'] == 'idonly') $ret[] = $targyId;
-		    elseif ($SET['result'] == 'indexed') $ret[] = $tAdat;
-		    elseif ($SET['result'] == 'assoc') $ret[$targyId] = $tAdat;
-		}
-	    }
-	}
-	
-	return $ret;
-
-    }
-
-    function getTargyakByDiakIds($diakIds, $szemeszterAdat, $osztalyId, $sorrendNev, $SET = array('result' => 'indexed', 'keyfield' => null,'csakOratervi'=>true,'filter'=>'kovetelmeny')) {
-    /*
-	A függvény lekérdezi az összes diák tárgyait a share/targy/getTargyakByDiakId függvénnyel,
-	majd ezen id-k alapján kérdezi le a rendezett tárgy listát - névvel és egyéb adatokkal indexelt tömbként.
-    */
-
-	if ( !isset($SET['csakOratervi']) ) $SET['csakOratervi'] = true;
-	if ( !isset($SET['filter']) ) $SET['filter'] = 'kovetelmeny';
-	if ( !isset($SET['result']) ) $SET['result'] = 'indexed';
-
-	if ($szemeszterAdat['tanev'] == __TANEV) $tanevDb = __TANEVDBNEV;
-	else $tanevDb = tanevDbNev(__INTEZMENY, $szemeszterAdat['tanev']);
-
-	$targyIds = $tmp = array();
-	foreach ($diakIds as $key => $diakId) {
-	    $ret = getTargyakByDiakId($diakId, array('osztalyId' => $osztalyId, 'result' => 'idonly', 'csakOratervi' => $SET['csakOratervi'], 'filter' => $SET['filter'],
-		    'tanev' => $szemeszterAdat['tanev'], 'tolDt' => $szemeszterAdat['kezdesDt'], 'igDt' => $szemeszterAdat['zarasDt']));
-	    if (is_array($ret)) {
-		$targyIds = array_unique(array_merge($tmp, $ret));
-		$tmp = $targyIds;
-	    }
-	}
-	if (is_array($targyIds) && count($targyIds)>0) {
-	    $q = "SELECT kirTargyId,targy.targyId AS targyId, IF(targyRovidNev='' OR targyRovidNev IS NULL,targyNev,targyRovidNev) as targyRovidNev, targyNev, sorszam, targy.zaroKovetelmeny 
-		FROM targy LEFT JOIN ".$tanevDb.".targySorszam
-		ON targy.targyId = targySorszam.targyId AND osztalyId=%u AND sorrendNev='%s'
-		WHERE targy.targyId IN (".implode(',', array_fill(0, count($targyIds), '%u')).")
-		ORDER BY sorszam,targyNev";
-		$v = mayor_array_join(array($osztalyId, $sorrendNev,), $targyIds);
-		return db_query($q, array('fv' => 'getTargyakByDiakIds', 'modul' => 'naplo_intezmeny', 'result' => $SET['result'], 'keyfield' => $SET['keyfield'], 'values' => $v));	
-	} else {
-	    return false;
-	}
-    }
-
-    function getTargyIdsByTanarId($tanarId) {
-
-	$q1 = "SELECT targyId FROM kepesitesTargy LEFT JOIN tanarKepesites USING (kepesitesId) WHERE tanarId=%u";
-	$q2 = "SELECT targyId FROM targy LEFT JOIN mkTanar USING (mkId) WHERE tanarId=%u";
-	$q = "($q1) UNION DISTINCT ($q2)";
-
-	return db_query($q, array('fv'=>'getTargyIdsByTanarId','modul'=>'naplo_intezmeny','result'=>'idonly','values'=>array($tanarId, $tanarId)));
-
-    }
-
-    function getMagatartas($SET = array('csakId' => true, 'result' => 'idonly')) { // Nekem szimpatikusabb a result paraméter... [bb] :)
-	if ($SET['csakId']===true || $SET['result'] == 'idonly') { $w='targyId'; $r='idonly'; } 
-	elseif ($SET['result'] == 'value') { $w ='targyId'; $r='value'; }
-	else {$w='*';$r='indexed'; }
-	$q = "SELECT $w FROM targy WHERE targyJelleg='magatartás'";
-	$ret=db_query($q, array('fv' => 'getMagatartas', 'modul' => 'naplo_intezmeny', 'result' => $r));
-	if (count($ret)==0) $_SESSION['alert'][]='message:nincs_targy:magatartás';
-	return $ret;
-    }
-    function getSzorgalom($SET = array('csakId' => true, 'result' => 'idonly')) {
-	if ($SET['csakId']===true || $SET['result'] == 'idonly') { $w='targyId'; $r='idonly'; } 
-	elseif ($SET['result'] == 'value') { $w ='targyId'; $r='value'; }
-	else {$w='*';$r='indexed'; }
-	$q = "SELECT $w FROM targy WHERE targyJelleg='szorgalom'";
-	$ret=db_query($q, array('fv' => 'getSzorgalom', 'modul' => 'naplo_intezmeny', 'result' => $r));
-	if (count($ret)==0) $_SESSION['alert'][]='message:nincs_targy:szorgalom';
-	return $ret;
-    }
-    function getOsztalyfonoki($SET = array('csakId' => true, 'result' => 'idonly')) {
-	if ($SET['csakId']===true || 'result' == 'idonly') { $w='targyId'; $r='idonly'; } 
-	elseif ($SET['result'] == 'value') { $w ='targyId'; $r='value'; }
-	else {$w='*';$r='indexed'; }
-	// még nincs "osztályfőnöki" tárgy jelleg - de kéne, nem?
-	$q = "SELECT $w FROM targy WHERE targyJelleg='osztályfőnöki' or targyNev = 'osztályfőnöki'";
-	$ret=db_query($q, array('fv' => 'getSzorgalom', 'modul' => 'naplo_intezmeny', 'result' => $r));
-	if (count($ret)==0) $_SESSION['alert'][]='message:nincs_targy:szorgalom';
-	return $ret;
-    }
-
-
-    function getKirTargyak() {                                                                                                                                                                         
-	$q = "SELECT * FROM kirTargy";
-	return db_query($q, array('fv'=>'getKirTargyak','modul'=>'naplo_base','result'=>'indexed'));
-    }
-
-    function getTargyTargy($SET=array()) {
-	
-	$q = "SELECT * FROM targyTargy";
-	$r = db_query($q, array('fv'=>'getTargyTargy','modul'=>'naplo_intezmeny','result'=>'indexed'));
-	//$R = reindex($r,array('foTargyId'));
-	for ($i=0; $i'getTargyNev','modul'=>'naplo_intezmeny','result'=>'value','values'=>$v));
-    }
-
-    function getTargyByJelleg($targyJelleg) {
-	$q = "SELECT targyNev,targyId FROM targy WHERE targyJelleg='%s'";
-	$v = array($targyJelleg);
-	return $r = db_query($q, array('fv'=>'getTargyByJelleg','modul'=>'naplo_intezmeny','result'=>'indexed','values'=>$v));
-    }
-
-?>
diff --git a/mayor-orig/www/include/modules/naplo/share/terem.php b/mayor-orig/www/include/modules/naplo/share/terem.php
deleted file mode 100644
index 0c00c89a..00000000
--- a/mayor-orig/www/include/modules/naplo/share/terem.php
+++ /dev/null
@@ -1,151 +0,0 @@
- 'getTeremAdatById', 'modul' => 'naplo_intezmeny', 'values' => array($teremId), 'result' => 'record'));
-
-    }
-
-    function getTermek($SET = array('result' => 'indexed', 'tipus' => array(), 'telephelyId' => null), $olr = null) {
-	$result = readVariable($SET['result'], 'enum', 'indexed', array('indexed', 'idonly', 'assoc'));
-	$v = array();
-
-	if (is_array($SET['tipus']) && count($SET['tipus'])>0) {
-	    $W[] = " tipus IN ('".implode("','", array_fill(0, count($SET['tipus']), '%s'))."')";
-	    $v = $SET['tipus'];
-	} else {
-	    $W[] = " tipus != 'megszűnt' ";
-	}
-	if ($SET['telephelyId']!='') {
-	    $W[] = " (telephelyId=%u OR telephelyId IS NULL) "; // vagy set vagy null
-	    $v[] = $SET['telephelyId'];
-	}
-
-	if (count($W) > 0) $WHERE = ' WHERE '.implode(' AND ', $W);
-
-	if ($result == 'idonly') {
-	    $q = "SELECT teremId FROM ".__INTEZMENYDBNEV.".terem".$WHERE." ORDER BY teremId";
-	} else {
-	    $q = "SELECT * FROM ".__INTEZMENYDBNEV.".terem".$WHERE." ORDER BY teremId";
-	}
-	$R = db_query($q, array('fv' => 'getTerem', 'modul' => 'naplo_intezmeny', 'result' => $result, 'values' => $v, 'keyfield' => 'teremId'), $olr);
-	return $R; 
-    }    
-
-    function getSzabadTermekByDt($dt, $teremIds = array(), $forras = 'orarendiOra', $olr = '') {
-
-	if (!is_array($teremIds) || count($teremIds) == 0) $teremIds = getTermek(array('result' => 'idonly', 'tipus'=>array('tanterem','labor')), $olr);
-	$szabadTermek = $foglaltTermek = array();
-	if ($forras == 'ora') 
-	    $q = "SELECT DISTINCT ora,teremId FROM ".__TANEVDBNEV.".ora
-		WHERE dt='%s' ORDER BY ora,teremId";
-	else
-	    $q = "SELECT DISTINCT ora,teremId FROM ".__TANEVDBNEV.".nap LEFT JOIN ".__TANEVDBNEV.".orarendiOra
-                    ON (((DAYOFWEEK(dt)+5) MOD 7)+1 = orarendiOra.nap)
-                    AND orarendiOra.het=nap.orarendiHet
-                    AND orarendiOra.tolDt<=dt AND orarendiOra.igDt>=dt 
-		WHERE dt='%s' ORDER BY ora,teremId";
-	$ret = db_query($q, array('fv' => 'getSzabadTermekByDt', 'modul' => 'naplo_intezmeny', 'result' => 'indexed', 'values' => array($dt)), $olr);
-	for ($i = 0; $i < count($ret); $i++) $foglaltTermek[$ret[$i]['ora']][] = $ret[$i]['teremId'];
-	foreach ($foglaltTermek as $ora => $fTermek) {
-	    $szT = array_diff($teremIds, $fTermek);
-	    // reindex
-	    foreach($szT as $_key => $_value) 
-		$szabadTermek[$ora][] = intval($_value);
-	}
-	return $szabadTermek;
-
-    }
-
-    function getSzabadTermekByDtInterval($tolDt, $igDt, $teremIds, $forras = 'orarendiOra') {
-
-	if (!is_array($teremIds)) $teremIds = getTermek(array('result' => 'idonly', 'tipus'=>array('tanterem','szaktanterem','osztályterem','labor','gépterem','tornaterem','előadó')));
-
-	for ($dt = $tolDt; strtotime($dt) <= strtotime($igDt); $dt = date('Y-m-d', strtotime('+1 days', strtotime($dt)))) {
-		$szabadTermek[$dt] = getSzabadTermekByDt($dt, $teremIds, $forras);
-	}
-
-	return $szabadTermek;
-    }
-
-    function getFoglaltTeremekByOrarendiOra($SET = array('tanev' => __TANEV, 'dt' => null, 'het' => null, 'nap' => null, 'ora' => null)) {
-
-
-        $dt = readVariable($SET['dt'], 'datetime', null);
-        initTolIgDt($SET['tanev'], $dt, $dt);
-
-        // Ha van dátum, de nincs hét, nap óra, akkor azt a dátum alapján kellene beállítani)
-        if (isset($SET['het']) && isset($SET['nap']) && isset($SET['ora']) && isset($dt) && isset($SET['tanev'])) {
-
-            $tanevDb = tanevDbNev(__INTEZMENY, $SET['tanev']);
-	    $q = "SELECT * FROM `%s`.orarendiOra LEFT JOIN `%s`.orarendiOraTankor USING (tanarId,osztalyJel,targyJel)
-                    WHERE tolDt <= '%s' AND '%s' <= igDt 
-		    AND het=%u AND nap=%u AND ora=%u
-		    AND teremId IS NOT NULL
-		    ORDER BY teremId";
-	    $v = array($tanevDb, $tanevDb, $dt, $dt, $SET['het'], $SET['nap'], $SET['ora']);
-            return db_query($q, array('fv' => 'getFoglaltTermekByOrarendiOra', 'modul' => 'naplo_intezmeny', 'keyfield' => 'teremId', 'result' => 'assoc', 'values' => $v));
-
-        } else {
-            $_SESSION['alert'][] = 'message:empty_field:het,nap,ora,tanev,dt';
-            return false;
-        }
-
-
-    }
-
-    function getTeremPreferencia($SET = array('telephelyId' => null,'teremPreferenciaId'=>null)) {
-
-	if ($SET['teremPreferenciaId']!='') {
-	    $W = 'WHERE teremPreferenciaId=%u';
-	    $v = array($SET['teremPreferenciaId']);
-	} else {
-	    $W='';
-	    $v = array();
-	}
-	$q = "SELECT * FROM teremPreferencia $W ORDER BY teremPreferenciaId";
-        return db_query($q, array('fv' => 'getFoglaltTermekByOrarendiOra', 'modul' => 'naplo_intezmeny', 'result' => 'indexed', 'values' => $v));
-
-    }
-
-    // teremModifier
-
-    function teremModositas($ADAT) {
-
-	if (MAYOR_SOCIAL === true) $ADAT['tanev'] = __TANEV;
-
-        $dt = readVariable($ADAT['dt'], 'datetime', null);
-        initTolIgDt($ADAT['tanev'], $dt, $dt);
-        $tanevDb = tanevDbNev(__INTEZMENY, $ADAT['tanev']);
-
-        $return = false;
-
-        if (is_array($ADAT['foglaltTermek'][ $ADAT['teremId'] ])) {
-            $return = $ADAT['foglaltTermek'][ $ADAT['teremId'] ]['tanarId'];
-            // A foglalt terem felszabadítása
-            $q = "UPDATE `%s`.orarendiOra SET teremId=NULL WHERE tolDt<='%s' AND ('%s'<=igDt OR igDt IS NULL) AND het=%u AND nap=%u AND ora=%u AND teremId=%u";
-            $v = array($tanevDb, $dt, $dt, $ADAT['het'], $ADAT['nap'], $ADAT['ora'], $ADAT['teremId']);
-            db_query($q, array('fv' => 'teremModositas/foglalt terem felszabadítása', 'modul' => 'naplo', 'values' => $v));
-        }
-        // teremhozzárendelés módosítása
-	if ($ADAT['teremId']>0) {
-    	    $q = "UPDATE `%s`.orarendiOra SET teremId=%u WHERE tolDt <= '%s' AND ('%s' <= igDt OR igDt IS NULL) AND het=%u AND nap=%u AND ora=%u AND tanarId=%u";
-    	    $v = array($tanevDb, $ADAT['teremId'], $dt, $dt, $ADAT['het'], $ADAT['nap'], $ADAT['ora'], $ADAT['tanarId']);
-	} else {
-    	    $q = "UPDATE `%s`.orarendiOra SET teremId=NULL WHERE tolDt <= '%s' AND ('%s' <= igDt OR igDt IS NULL) AND het=%u AND nap=%u AND ora=%u AND tanarId=%u AND teremId IS NOT NULL";
-    	    $v = array($tanevDb, $dt, $dt, $ADAT['het'], $ADAT['nap'], $ADAT['ora'], $ADAT['tanarId']);
-	}
-        db_query($q, array('debug'=>false,'fv' => 'teremModositas/foglalt terem felszabadítása', 'modul' => 'naplo', 'values' => $v));
-
-	if (MAYOR_SOCIAL === true && $ADAT['oraId']>0) {
-	    $q = "UPDATE ora SET teremId = NULL WHERE ora=%u AND oraId=%u";
-    	    $v = array($ADAT['ora'], $ADAT['oraId']);
-    	    db_query($q, array('fv' => 'teremModositas/foglalt terem felszabadítása', 'modul' => 'naplo', 'values' => $v));
-	}
-
-        return $return;
-
-    }
-
-?>
diff --git a/mayor-orig/www/include/modules/naplo/share/verseny.php b/mayor-orig/www/include/modules/naplo/share/verseny.php
deleted file mode 100644
index 29700181..00000000
--- a/mayor-orig/www/include/modules/naplo/share/verseny.php
+++ /dev/null
@@ -1,20 +0,0 @@
-'naplo_intezmeny'));
-
-    }
-
-    function ujVerseny($ADAT) {
-
-
-	$q = "INSERT INTO verseny (targyId,versenyNev) VALUES (%u,'%s')";
-	$v = array($ADAT['targyId'],$ADAT['versenyNev']);
-
-	
-
-    }
-
-?>
diff --git a/mayor-orig/www/include/modules/naplo/share/vizsga.php b/mayor-orig/www/include/modules/naplo/share/vizsga.php
deleted file mode 100644
index 1154d9b4..00000000
--- a/mayor-orig/www/include/modules/naplo/share/vizsga.php
+++ /dev/null
@@ -1,41 +0,0 @@
- 'naplo_intezmeny', 'fv' => 'getVizsgak', 'result' => 'indexed', 'values' => $v)
-        );
-
-	return $ret;
-
-    }
-
-    function getVizsgaAdatById($vizsgaId) {
-
-	$q = "SELECT *, vizsga.evfolyam AS evfolyam, vizsga.evfolyamJel AS evfolyamJel FROM vizsga 
-		LEFT JOIN zaradek USING (zaradekId,diakId) 
-		LEFT JOIN zaroJegy USING (zaroJegyId,diakId,targyId,felev) 
-		WHERE vizsgaId=%u";
-	$v = array($vizsgaId);
-	return db_query($q, array(
-            'modul' => 'naplo_intezmeny', 'fv' => 'getVizsgaAdatById', 'result' => 'record', 'values' => $v)
-        );
-
-    }
-
-?>
diff --git a/mayor-orig/www/include/modules/naplo/share/zaradek.php b/mayor-orig/www/include/modules/naplo/share/zaradek.php
deleted file mode 100644
index edc432b4..00000000
--- a/mayor-orig/www/include/modules/naplo/share/zaradek.php
+++ /dev/null
@@ -1,543 +0,0 @@
- mire...)
-	 *	zaradekId - a lecserélendő záradék (optional)
-	 *	diakId, dt, zaradekIndex (require)
-	**/
-
-	global $Zaradek;
-
-	$lr = ($olr=='') ? db_connect('naplo_intezmeny') : $olr;
-	if (!is_array($ADAT['csere'])) $ADAT['csere'] = array();
-
-	if (isset($ADAT['zaradekId'])) {
-	    $q = "UPDATE zaradek SET diakId=%u,dt='%s',sorszam='%s',dokumentum='%s',szoveg='%s',zaradekIndex=%u WHERE zaradekId=%u";
-	    $v = array(
-		$ADAT['diakId'], $ADAT['dt'], $Zaradek[$ADAT['zaradekIndex']]['sorszam'], 
-		str_replace(', ', ',', $Zaradek[$ADAT['zaradekIndex']]['dokumentum']),
-		str_replace(array_keys($ADAT['csere']), array_values($ADAT['csere']), $Zaradek[$ADAT['zaradekIndex']]['szoveg']),
-		$ADAT['zaradekIndex'], $ADAT['zaradekId']
-	    );
-	    $ret = db_query($q, array('modul' => 'naplo_intezmeny', 'fv' => 'zaradekRogzites', 'values' => $v), $lr);
-	} else {
-	    $q = "INSERT INTO zaradek (diakId, dt, sorszam, dokumentum, szoveg, zaradekIndex,iktatoszam) VALUES
-		    (%u, '%s', '%s', '%s', '%s', %u,'%s')";
-	    $v = array(
-		$ADAT['diakId'], $ADAT['dt'], $Zaradek[$ADAT['zaradekIndex']]['sorszam'], 
-		str_replace(', ', ',', $Zaradek[$ADAT['zaradekIndex']]['dokumentum']),
-		str_replace(array_keys($ADAT['csere']), array_values($ADAT['csere']), $Zaradek[$ADAT['zaradekIndex']]['szoveg']),
-		$ADAT['zaradekIndex'], $ADAT['iktatoszam']
-	    );
-	    $ret = db_query($q, array('modul' => 'naplo_intezmeny', 'fv' => 'zaradekRogzites', 'result' => 'insert', 'values' => $v), $lr);
-	}
-
-	if ($olr=='') db_close($lr);
-	return $ret;
-    }
-
-    function getZaradekok() {
-	global $Zaradek;
-	return $Zaradek;
-    }
-
-    function getDiakZaradekok($diakId, $SET = array('tolDt' => null, 'igDt' => null, 'dokumentum' => null, 'tipus' => null, 'result' => 'indexed', 'keyfield' => null)) {
-
-	global $Zaradek, $ZaradekIndex;
-
-	$dokumentum = readVariable($SET['dokumentum'], 'enum', null, array('beírási napló','osztálynapló','törzslap','bizonyítvány'));
-	$tolDt = readVariable($SET['tolDt'], 'datetime', '1940-01-01');
-	$igDt = readVariable($SET['igDt'], 'datetime', '2050-01-01');
-	$tipus = readVariable($SET['tipus'], 'enum', null, array_keys($ZaradekIndex));
-	if ($SET['result']=='') $SET['result'] = 'indexed';	
-	
-	$q = "SELECT zaradekId,diakId,dt,sorszam,dokumentum,IF(iktatoszam!='',CONCAT(szoveg,' (',iktatoszam,')'),szoveg) AS szoveg,zaradekIndex,iktatoszam FROM zaradek WHERE diakId=%u AND '%s' <= dt AND dt <= '%s'";
-	$v = array($diakId, $tolDt, $igDt);
-	if (isset($dokumentum)) {
-	    $q .= " AND dokumentum LIKE '%%%s%%'";
-	    $v[] = $dokumentum;
-	}
-	if (isset($tipus)) {
-	    $q .= " AND zaradekIndex IN (".implode(',',array_values($ZaradekIndex[$tipus])).")";
-	}
-	$q .= " ORDER BY dt,zaradekId,sorszam";
-	return db_query($q, array(
-	    'modul' => 'naplo_intezmeny', 'fv' => 'getDiakZaradekok', 'result' => $SET['result'], 'keyfield' => $SET['keyfield'], 'values' => $v)
-	);
-
-    }
-
-    function getZaradekokByDiakIds($diakIds, $SET = array('tolDt' => null, 'igDt' => null, 'dokumentum' => null, 'tipus' => null, 'result' => 'indexed', 'keyfield' => null)) {
-
-	global $Zaradek, $ZaradekIndex;
-
-	if (!is_array($diakIds) || count($diakIds) < 1) return false;
-
-	$dokumentum = readVariable($SET['dokumentum'], 'enum', null, array('beírási napló','osztálynapló','törzslap','bizonyítvány'));
-	$tolDt = readVariable($SET['tolDt'], 'datetime', '1940-01-01');
-	$igDt = readVariable($SET['igDt'], 'datetime', '2050-01-01');
-	$tipus = readVariable($SET['tipus'], 'enum', null, array_keys($ZaradekIndex));
-	if ($SET['result']=='') { $SET['result'] = 'assoc'; $SET['keyfield'] = 'diakId'; }
-	
-	$q = "SELECT * FROM zaradek WHERE diakId IN (".implode(',', array_fill(0, count($diakIds), '%u')).") AND '%s' <= dt AND dt <= '%s'";
-	$v = $diakIds;
-	$v[] = $tolDt; $v[] = $igDt;
-	if (isset($dokumentum)) {
-	    $q .= " AND dokumentum LIKE '%%%s%%'";
-	    $v[] = $dokumentum;
-	}
-	if (isset($tipus)) {
-	    $q .= " AND zaradekIndex IN (".implode(',',array_values($ZaradekIndex[$tipus])).")";
-	}
-	$q .= " ORDER BY dt,sorszam,zaradekId";
-	return db_query($q, array(
-	    'modul' => 'naplo_intezmeny', 'fv' => 'getDiakZaradekok', 'result' => $SET['result'], 'keyfield' => $SET['keyfield'], 'values' => $v)
-	);
-
-    }
-
-    function getZaradekokByIndexes($zaradekIndexes) {
-
-	global $Zaradek;
-
-	$ret = array();
-	if (is_array($zaradekIndexes)) foreach ($zaradekIndexes as $key => $zaradekIndex) {
-	    $ret[$zaradekIndex] = $Zaradek[$zaradekIndex];
-	}
-	return $ret;
-
-    }
-
-    function getZaradekokByTipus($tipus) {
-    /**
-     *  A tipus paraméter vesszővel elválasztva több típust is tartalmazhat.
-    **/
-	global $ZaradekIndex;
-
-	foreach (explode(',', $tipus) as $idx => $_tipus) {
-	    foreach ($ZaradekIndex[trim($_tipus)] as $key => $zIndex) $zaradekIndexes[] = $zIndex;
-	}
-	return getZaradekokByIndexes($zaradekIndexes);
-
-    }
-
-    function zaradekTorles($zaradekId) {
-	$q = "DELETE FROM zaradek WHERE zaradekId=%u";
-	return db_query($q, array('fv'=>'zaradekTorles','modul'=>'naplo_intezmeny','values'=>array($zaradekId)));
-    }
-
-if (__TANEV < 2013) {
-
-$Zaradek = array(
-1 => array('sorszam' => '1.', 'szoveg' => 'Felvéve a(z) %iskola címe% iskolába.', 'dokumentum' => 'beírási napló, osztálynapló, törzslap, bizonyítvány'),
-2 => array('sorszam' => '1.', 'szoveg' => 'Átvéve a(z) %iskola címe% iskolába.', 'dokumentum' => 'beírási napló, osztálynapló, törzslap, bizonyítvány'),
-3 => array('sorszam' => '1.', 'szoveg' => 'A(z) %határozat száma% számú határozattal áthelyezve a(z) %iskola címe% iskolába.', 'dokumentum' => 'beírási napló, osztálynapló, törzslap, bizonyítvány'),
-4 => array('sorszam' => '1/A', 'szoveg' => 'Az első évfolyam követelményeit nem teljesítette, munkája előkészítőnek minősül, tanulmányait az első évfolyamon folytathatja.', 'dokumentum' => 'beírási napló, osztálynapló, törzslap, bizonyítvány'),
-5 => array('sorszam' => '2.', 'szoveg' => 'A %fordítás száma% számú fordítással hitelesített bizonyítvány alapján tanulmányait a(z) %évfolyam betűvel% évfolyamon folytatja.', 'dokumentum' => 'beírási napló, törzslap'),
-6 => array('sorszam' => '3.', 'szoveg' => 'Felvette a(z) %iskola címe% iskola.', 'dokumentum' => 'beírási napló, törzslap, osztálynapló'),
-7 => array('sorszam' => '4.', 'szoveg' => 'Tanulmányait évfolyamismétléssel kezdheti meg, illetve osztályozó vizsga letételével folytathatja.', 'dokumentum' => 'beírási napló, törzslap, osztálynapló'),
-8 => array('sorszam' => '4/A', 'szoveg' => '%Tantárgy% tantárgyból tanulmányait egyéni továbbhaladás szerint végzi.', 'dokumentum' => 'osztálynapló, törzslap, bizonyítvány'),
-9 => array('sorszam' => '4/B', 'szoveg' => 'Mentesítve %tantárgy% tantárgyból az értékelés és a minősítés alól.', 'dokumentum' => 'osztálynapló, törzslap, bizonyítvány'),
-10 => array('sorszam' => '4/C', 'szoveg' => '%Tantárgy% tantárgy %évfolyamok% évfolyamainak követelményeit egy tanévben teljesítette a következők szerint: %jegyek%', 'dokumentum' => 'osztálynapló, törzslap, bizonyítvány'),
-11 => array('sorszam' => '5.', 'szoveg' => 'Egyes tantárgyak tanórai látogatása alól az %tanév jele% tanévben felmentve %felmentés oka% miatt.', 'dokumentum' => 'osztálynapló, törzslap, bizonyítvány)'),
-12 => array('sorszam' => '5.', 'szoveg' => 'Egyes tantárgyak tanórai látogatása alól az %tanév jele% tanévben felmentve %felmentés oka% miatt. Osztályozó vizsgát köteles tenni', 'dokumentum' => 'osztálynapló, törzslap, bizonyítvány'),
-13 => array('sorszam' => '6.', 'szoveg' => 'Tanulmányait a szülő kérésére (szakértői vélemény alapján) magántanulóként folytatja.', 'dokumentum' => 'osztálynapló, törzslap'),
-14 => array('sorszam' => '7.', 'szoveg' => 'Mentesítve a(z) %tantárgyak neve% tantárgy tanulása alól.', 'dokumentum' => 'osztálynapló, törzslap, bizonyítvány'),
-15 => array('sorszam' => '8.', 'szoveg' => 'Tanulmányi idejének megrövidítése miatt a(z) %évfolyam% évfolyam tantárgyból osztályozó vizsgát köteles tenni.', 'dokumentum' => 'osztálynapló, törzslap'),
-16 => array('sorszam' => '9.', 'szoveg' => 'A(z) évfolyamra megállapított tantervi követelményeket a tanulmányi idő megrövidítésével teljesítette.', 'dokumentum' => 'osztálynapló, törzslap, bizonyítvány'),
-17 => array('sorszam' => '10.', 'szoveg' => 'A(z) %tantárgy% tantárgy %ezen óráinak% óráinak látogatása alól felmentve %tólDt%-tól %igDt%-ig.', 'dokumentum' => 'osztálynapló'),
-18 => array('sorszam' => '10.', 'szoveg' => 'A(z) %tantárgy% tantárgy %ezen óráinak% óráinak látogatása alól felmentve %tólDt%-tól %igDt%-ig. Osztályozó vizsgát köteles tenni.', 'dokumentum' => 'osztálynapló'),
-19 => array('sorszam' => '11.', 'szoveg' => 'Mulasztása miatt nem osztályozható, a nevelőtestület határozata értelmében osztályozó vizsgát tehet.', 'dokumentum' => 'osztálynapló, törzslap'),
-20 => array('sorszam' => '12.', 'szoveg' => 'A nevelőtestület határozata: a(z) %évfolyam betűvel% évfolyamba léphet.', 'dokumentum' => 'osztálynapló, törzslap, bizonyítvány'),
-21 => array('sorszam' => '12.', 'szoveg' => 'A nevelőtestület határozata: iskolai tanulmányait befejezte, tanulmányait %évfolyam% évfolyamon folytathatja.', 'dokumentum' => 'osztálynapló, törzslap, bizonyítvány'),
-22 => array('sorszam' => '13.', 'szoveg' => 'A tanuló az %évfolyam% évfolyam követelményeit egy tanítási évnél hosszabb ideig, %hónap szám% hónap alatt teljesítette.', 'dokumentum' => 'osztálynapló, törzslap'),
-23 => array('sorszam' => '14.', 'szoveg' => 'A(z) %tantárgy% tantárgyból javítóvizsgát tehet.', 'dokumentum' => 'osztálynapló, törzslap, bizonyítvány'),
-24 => array('sorszam' => '14.', 'szoveg' => 'A javítóvizsgán %tantárgy% tantárgyból %osztályzat% osztályzatot kapott, %évfolyam% évfolyamba léphet.', 'dokumentum' => 'törzslap, bizonyítvány'),
-25 => array('sorszam' => '15.', 'szoveg' => 'A(z) %évfolyam% évfolyam követelményeit nem teljesítette, az évfolyamot megismételheti.', 'dokumentum' => 'osztálynapló, törzslap, bizonyítvány'),
-26 => array('sorszam' => '15/A', 'szoveg' => 'Az %évfolyam% évfolyamot az 1993. évi LXXIX. törvény 72. §-ának (4) bekezdésében foglaltak alapján megismételte.', 'dokumentum' => 'osztálynapló, törzslap, bizonyítvány'),
-27 => array('sorszam' => '16.', 'szoveg' => 'A javítóvizsgán %tantárgy% tantárgyból elégtelen osztályzatot kapott. Évfolyamot ismételni köteles.', 'dokumentum' => 'törzslap, bizonyítvány'),
-28 => array('sorszam' => '17.', 'szoveg' => 'A(z) %tantárgy% tantárgyból %dátum%-án osztályozó vizsgát tett.', 'dokumentum' => 'osztálynapló, törzslap'),
-29 => array('sorszam' => '18.', 'szoveg' => 'Osztályozó vizsgát tett.', 'dokumentum' => 'törzslap, bizonyítvány'),
-30 => array('sorszam' => '19.', 'szoveg' => 'A(z) %tantárgy% tantárgy alól %felmentés oka% okból felmentve.', 'dokumentum' => 'törzslap, bizonyítvány'),
-31 => array('sorszam' => '20.', 'szoveg' => 'A(z) %tanóra% tanóra alól %felmentés oka% okból felmentve.', 'dokumentum' => 'törzslap, bizonyítvány'),
-32 => array('sorszam' => '21.', 'szoveg' => 'Az osztályozóvizsga letételére %igDt%-ig halasztást kapott.', 'dokumentum' => 'törzslap, bizonyítvány'),
-33 => array('sorszam' => '21.', 'szoveg' => 'Az beszámoltatóvizsga letételére %igDt%-ig halasztást kapott.', 'dokumentum' => 'törzslap, bizonyítvány'),
-34 => array('sorszam' => '21.', 'szoveg' => 'Az különbözetivizsga letételére %igDt%-ig halasztást kapott.', 'dokumentum' => 'törzslap, bizonyítvány'),
-35 => array('sorszam' => '21.', 'szoveg' => 'Az javítóvizsga letételére %igDt%-ig halasztást kapott.', 'dokumentum' => 'törzslap, bizonyítvány'),
-36 => array('sorszam' => '22.', 'szoveg' => 'Az osztályozó vizsgát engedéllyel a(z) %iskola% iskolában független vizsgabizottság előtt tette le.', 'dokumentum' => 'törzslap, bizonyítvány'),
-37 => array('sorszam' => '22.', 'szoveg' => 'Az javítóvizsgát engedéllyel a(z) %iskola% iskolában független vizsgabizottság előtt tette le.', 'dokumentum' => 'törzslap, bizonyítvány'),
-38 => array('sorszam' => '23.', 'szoveg' => 'A(z) %szakképesítés% szakképesítés évfolyamán folytatja tanulmányait.', 'dokumentum' => 'törzslap, bizonyítvány, osztálynapló'),
-39 => array('sorszam' => '24.', 'szoveg' => 'Tanulmányait %ok% okból megszakította, a tanulói jogviszonya %igDt%-ig szünetel.', 'dokumentum' => 'beírási napló, törzslap'),
-40 => array('sorszam' => '25.', 'szoveg' => 'A tanuló jogviszonya kimaradással megszűnt, a létszámból törölve.', 'dokumentum' => 'beírási napló, törzslap, bizonyítvány, osztálynapló'),
-41 => array('sorszam' => '25.', 'szoveg' => 'A tanuló jogviszonya %igazolatlan órák száma% óra igazolatlan mulasztás miatt megszűnt, a létszámból törölve.', 'dokumentum' => 'beírási napló, törzslap, bizonyítvány, osztálynapló'),
-42 => array('sorszam' => '25.', 'szoveg' => 'A tanuló jogviszonya egészségügyi alkalmasság miatt megszűnt, a létszámból törölve.', 'dokumentum' => 'beírási napló, törzslap, bizonyítvány, osztálynapló'),
-43 => array('sorszam' => '25.', 'szoveg' => 'A tanuló jogviszonya térítési díj fizetési hátralék miatt megszűnt, a létszámból törölve.', 'dokumentum' => 'beírási napló, törzslap, bizonyítvány, osztálynapló'),
-44 => array('sorszam' => '25.', 'szoveg' => 'A tanuló jogviszonya tandíj fizetési hátralék miatt megszűnt, a létszámból törölve.', 'dokumentum' => 'beírási napló, törzslap, bizonyítvány, osztálynapló'),
-45 => array('sorszam' => '25.', 'szoveg' => 'A tanuló jogviszonya %iskola% iskolába való átvétel miatt megszűnt, a létszámból törölve.', 'dokumentum' => 'beírási napló, törzslap, bizonyítvány, osztálynapló'),
-46 => array('sorszam' => '26.', 'szoveg' => '%Fegyelmező intézkedés% fegyelmező intézkedésben részesült.', 'dokumentum' => 'osztálynapló'),
-47 => array('sorszam' => '27.', 'szoveg' => '%Fegyelmi büntetés% fegyelmi büntetésben részesült. A büntetés végrehajtása %igDt%-ig felfüggesztve.', 'dokumentum' => ''),
-48 => array('sorszam' => '28.', 'szoveg' => 'Tanköteles tanuló igazolatlan mulasztása esetén a tanuló %igazolatlan órák száma% óra igazolatlan mulasztása miatt a szülőt felszólítottam.', 'dokumentum' => 'osztálynapló'),
-49 => array('sorszam' => '28.', 'szoveg' => 'Tanköteles tanuló igazolatlan mulasztása esetén a tanuló ismételt %igazolatlan órák száma% óra igazolatlan mulasztása miatt a szülő ellen szabálysértési eljárást kezdeményeztem.', 'dokumentum' => 'beírási napló, törzslap, osztálynapló'),
-50 => array('sorszam' => '29.', 'szoveg' => 'Tankötelezettség megszűnt.', 'dokumentum' => 'beírási napló'),
-51 => array('sorszam' => '30.', 'szoveg' => 'A %szó% szót %helyesbítés%-ra/re helyesbítettem.', 'dokumentum' => 'törzslap, bizonyítvány'),
-52 => array('sorszam' => '30.', 'szoveg' => 'A %szavak% szavakat %helyesbítés%-ra/re helyesbítettem.', 'dokumentum' => 'törzslap, bizonyítvány'),
-53 => array('sorszam' => '30.', 'szoveg' => 'A %osztályzat% osztályzatot %helyesbítés%-ra/re helyesbítettem.', 'dokumentum' => 'törzslap, bizonyítvány'),
-54 => array('sorszam' => '30.', 'szoveg' => 'A %osztályzatok% osztályzatokat %helyesbítés%-ra/re helyesbítettem.', 'dokumentum' => 'törzslap, bizonyítvány'),
-55 => array('sorszam' => '31.', 'szoveg' => 'A bizonyítvány %lap% lapját téves bejegyzés miatt érvénytelenítettem.', 'dokumentum' => 'bizonyítvány'),
-56 => array('sorszam' => '32.', 'szoveg' => 'Ezt a póttörzslapot a(z) %ok% következtében elvesztett (megsemmisült) eredeti helyett %adatforrás% adatai (adatok) alapján állítottam ki.', 'dokumentum' => 'Pót. törzslap'),
-57 => array('sorszam' => '33.', 'szoveg' => 'Ezt a bizonyítványmásodlatot az elveszett (megsemmisült) eredeti helyett %adatforrás% adatai (adatok) alapján állítottam ki.', 'dokumentum' => 'Pót. törzslap'),
-58 => array('sorszam' => '33/A', 'szoveg' => 'A bizonyítványt %kérelmező% kérelmére a %bizonyítványszám% számú bizonyítvány alapján, téves bejegyzés miatt állítottam ki.', 'dokumentum' => 'törzslap, bizonyítvány'),
-59 => array('sorszam' => '34.', 'szoveg' => 'Pótbizonyítvány. Igazolom, hogy név %Név%, anyja neve %Anyja neve% a(z) %iskola% iskola %szak% szak (szakmai, speciális osztály, két tanítási nyelvű osztály, tagozat) %évfolyam% évfolyamát a(z) %tanév jele% tanévben eredményesen elvégezte.', 'dokumentum' => 'Pót. bizonyítvány'),
-60 => array('sorszam' => '35.', 'szoveg' => 'Az iskola a tanulmányi eredmények bejegyzéséhez, a kiemelkedő tanulmányi eredmények elismeréséhez, a felvételi vizsga eredményeinek bejegyzéséhez %vizsga% vizsga eredményének befejezéséhez vagy egyéb, a záradékok között nem szereplő, a tanulóval kapcsolatos közlés dokumentálásához a záradékokat megfelelően alkalmazhatja, illetve megfelelően záradékot alakíthat ki.', 'dokumentum' => ''),
-61 => array('sorszam' => '36.', 'szoveg' => 'Érettségi vizsgát tehet.', 'dokumentum' => 'törzslap, bizonyítvány'),
-62 => array('sorszam' => '37.', 'szoveg' => 'Gyakorlati képzésről mulasztását %tólDt%-tól %igDt%-ig pótolhatja.', 'dokumentum' => 'törzslap, bizonyítvány, osztálynapló'),
-63 => array('sorszam' => '38.', 'szoveg' => 'Beírtam a %iskola% iskola első osztályába.', 'dokumentum' => ''),
-64 => array('sorszam' => '39.', 'szoveg' => 'Ezt a haladási naplót %tanítási napok száma% tanítási nappal lezártam.', 'dokumentum' => 'osztálynapló'),
-65 => array('sorszam' => '39.', 'szoveg' => 'Ezt a haladási naplót %tanítási órák száma% tanítási órával lezártam.', 'dokumentum' => 'osztálynapló'),
-66 => array('sorszam' => '40.', 'szoveg' => 'Ezt az osztályozó naplót %tanulók száma% azaz %tanulók száma betűvel% osztályozott tanulóval lezártam.', 'dokumentum' => 'osztálynapló'),
-
-67 => array('sorszam' => '1/B', 'szoveg' => 'Felvéve a(z) %iskola címe% %osztály% osztályába.', 'dokumentum' => 'beírási napló, osztálynapló, törzslap, bizonyítvány'),
-68 => array('sorszam' => '17/A', 'szoveg' => 'A(z) %tantárgy% tantárgyból %dátum%-án beszámoltatóvizsgát tett.', 'dokumentum' => 'osztálynapló, törzslap'),
-69 => array('sorszam' => '17/B', 'szoveg' => 'A(z) %tantárgy% tantárgyból %dátum%-án különbözetivizsgát tett.', 'dokumentum' => 'osztálynapló, törzslap'),
-70 => array('sorszam' => '12/A', 'szoveg' => 'A nevelőtestület határozata: iskolai tanulmányait befejezte.', 'dokumentum' => 'osztálynapló, törzslap, bizonyítvány'),
-71 => array('sorszam' => '35/D', 'szoveg' => 'A %iktatószám% alapján tanulmányait a %osztály% osztályban folytatja.', 'dokumentum' => 'beírási napló, törzslap'),
-72 => array('sorszam' => '16/A', 'szoveg' => 'Az osztályozó vizsgán a %tantárgy% tantárgy követelményeit nem teljesítette - %osztályzat%.', 'dokumentum' => 'törzslap, bizonyítvány'),
-73 => array('sorszam' => '16/B', 'szoveg' => 'A beszámoltatóvizsgán a %tantárgy% tantárgy követelményeit nem teljesítette - %osztályzat%.', 'dokumentum' => 'törzslap, bizonyítvány'),
-74 => array('sorszam' => '16/C', 'szoveg' => 'A különbözetivizsgán a %tantárgy% tantárgy követelményeit nem teljesítette - %osztályzat%.', 'dokumentum' => 'törzslap, bizonyítvány'),
-75 => array('sorszam' => '16/D', 'szoveg' => 'A javítóvizsgán a %tantárgy% tantárgy követelményeit nem teljesítette - %osztályzat%. Évfolyamot ismételni köteles.', 'dokumentum' => 'törzslap, bizonyítvány'),
-
-100 => array('sorszam' => '35/A', 'szoveg' => '%Egyedi osztálynapló záradék%', 'dokumentum' => 'osztálynapló'),
-101 => array('sorszam' => '35/B', 'szoveg' => '%Egyedi törzslap záradék%', 'dokumentum' => 'törzslap'),
-102 => array('sorszam' => '35/C', 'szoveg' => '%Egyedi bizonyítvány záradék%', 'dokumentum' => 'bizonyítvány'),
-103 => array('sorszam' => '35/F', 'szoveg' => 'A(z) %zaradekId% nyilvántartási számú záradékban rögzített felmentést %dt% napon hatályon kívül helyeztem. ', 'dokumentum' => 'osztálynapló, törzslap, bizonyítvány'),
-104 => array('sorszam' => '4/C', 'szoveg' => '%miatt% miatt mentesítve a(z) %mi% értékelés(e) és a minősítés(e) alól.', 'dokumentum' => 'osztálynapló, törzslap, bizonyítvány'),
-105 => array('sorszam' => '35/E', 'szoveg' => 'A(z) %tankorDiakFelmentesId% nyilvántartási számú felmentést %dt% napon hatályon kívül helyeztem. ', 'dokumentum' => 'osztálynapló, törzslap, bizonyítvány'),
-106 => array('sorszam' => '17/C', 'szoveg' => 'A(z) %tantárgy% tantárgyból a(z) %évfolyam% évfolyam anyagából %dátum% napon %osztályzat% eredménnyel osztályozó vizsgát tett.', 'dokumentum' => 'osztálynapló, törzslap'),
-
-107 => array('sorszam' => '25/A', 'szoveg' => 'A tanuló jogviszonya haláleset miatt megszűnt, a létszámból törölve.', 'dokumentum' => 'beírási napló, törzslap, bizonyítvány, osztálynapló'),
-
-);
-
-$ZaradekIndex = array(
-    'konferencia' => array(
-	// továbbléphet
-	'következő évfolyamba léphet' => 20, // %évfolyam betűvel%
-	'tanulmányait befejezte' => 70,
-	// vizsgázhat
-	'mulasztás miatt osztályozóvizsga' => 19,
-	'javítóvizsgát tehet' => 23, // %tantárgy%
-	// évfolyamot ismételhet
-	'előkészítőt végzett' => 4,
-	'követelményeket nem teljesítette, évfolyamot ismételhet' => 25, // %évfolyam%
-    ),
-    'jogviszony' => array(
-	'megnyitás' => array(
-	    'felvétel' => 1,
-	    'felvétel osztályba' => 67,
-	    'átvétel' => 2, 
-	    'áthelyezés' => 3
-	),
-	'változás' => array(
-	    'magántanuló' => 13, 
-	    'felfüggesztés' => 39
-	),
-	'lezárás' => array(
-	    'kimaradás' => 40,
-	    'igazolatlan órák' => 41,
-	    'egészségügyi alkalmasság' => 42,
-	    'térítési díj hátralék' => 43,
-	    'tandíj hátralék' => 44,
-	    'átvétel' => 45,
-	    'haláleset' => 107,
-	    'tanulmányait folytathatja' => 21,
-	    'tanulmányait befejezte' => 70
-	)
-    ),
-    'vizsga halasztás' => array(
-	'osztályozó vizsga' => 32,
-	'beszámoltatóvizsga' => 33,
-	'különbözetivizsga' => 34,
-	'javítóvizsga' => 35,
-    ),
-    'vizsga' => array(
-	'osztályozó vizsga' => 106, // 28 volt
-	'osztályozó vizsga bukás' => 72,
-	'beszámoltatóvizsga' => 68,
-	'beszámoltatóvizsga bukás' => 73,
-	'különbözetivizsga' => 69,
-	'különbözetivizsga bukás' => 74,
-	'javítóvizsga' => 24,
-	'javítóvizsga bukás' => 27,
-	'javítóvizsga nem teljesített' => 75,
-    ),
-    'felmentés' => array(
-	'értékelés alól' =>9,
-	'értékelés és minősítés alól' => 104,
-	'óra látogatása alól' => 17,
-	'óra látogatása alól osztályozóvizsgával' => 18,
-	'tárgy tanulása alól' => 14,
-	'törlés' => 105
-    ),
-    'törzslap feljegyzés' => array(
-	'egyedi törzslap záradék' => 101
-    )
-
-);
-
-} else { // 20/2012 EMMI rendelet
-
-$Zaradek = array(
-1 => array('sorszam' => '1.', 'szoveg' => 'Felvéve a(z) %iskola címe% iskolába.', 
-	    'dokumentum' => 'beírási napló, osztálynapló, törzslap, bizonyítvány'),
-2 => array('sorszam' => '1.', 'szoveg' => 'Átvéve a(z) %iskola címe% iskolába.', 
-	    'dokumentum' => 'beírási napló, osztálynapló, törzslap, bizonyítvány'),
-3 => array('sorszam' => '1.', 'szoveg' => 'A(z) %határozat száma% számú határozattal áthelyezve a(z) %iskola címe% iskolába.', 
-	    'dokumentum' => 'beírási napló, osztálynapló, törzslap, bizonyítvány'),
-4 => array('sorszam' => '1/A', 'szoveg' => 'Az első évfolyam követelményeit nem teljesítette, munkája előkészítőnek minősül, tanulmányait az első évfolyamon folytathatja.', 
-	    'dokumentum' => 'beírási napló, osztálynapló, törzslap, bizonyítvány'),
-5 => array('sorszam' => '2.', 'szoveg' => 'A %fordítás száma% számú fordítással hitelesített bizonyítvány alapján tanulmányait a(z) %évfolyam betűvel% évfolyamon folytatja.', 
-	    'dokumentum' => 'beírási napló, törzslap'),
-6 => array('sorszam' => '3.', 'szoveg' => 'Felvette a(z) %iskola címe% iskola.', 
-	    'dokumentum' => 'beírási napló, törzslap, osztálynapló'),
-7 => array('sorszam' => '4.', 'szoveg' => 'Tanulmányait évfolyamismétléssel kezdheti meg, vagy osztályozó vizsga letételével folytathatja.', 
-	    'dokumentum' => 'beírási napló, törzslap, osztálynapló'),
-8 => array('sorszam' => '5.', 'szoveg' => '%Tantárgy% tantárgyból tanulmányait egyéni továbbhaladás szerint végzi.', 
-	    'dokumentum' => 'osztálynapló, törzslap, bizonyítvány'),
-9 => array('sorszam' => '6.', 'szoveg' => 'Mentesítve %tantárgy% tantárgyból az értékelés és a minősítés alól.', 
-	    'dokumentum' => 'osztálynapló, törzslap, bizonyítvány'),
-10 => array('sorszam' => '7.', 'szoveg' => '%Tantárgy% tantárgy %évfolyamok% évfolyamainak követelményeit egy tanévben teljesítette a következők szerint: %jegyek%', 
-	    'dokumentum' => 'osztálynapló, törzslap, bizonyítvány'),
-11 => array('sorszam' => '8.', 'szoveg' => 'Egyes tantárgyak tanórai látogatása alól az %tanév jele% tanévben felmentve %felmentés oka% miatt.', 
-	    'dokumentum' => 'osztálynapló, törzslap, bizonyítvány)'),
-12 => array('sorszam' => '8.', 'szoveg' => 'Egyes tantárgyak tanórai látogatása alól az %tanév jele% tanévben felmentve %felmentés oka% miatt. Osztályozó vizsgát köteles tenni', 
-	    'dokumentum' => 'osztálynapló, törzslap, bizonyítvány'),
-13 => array('sorszam' => '9.', 'szoveg' => 'Tanulmányait a szülő kérésére (szakértői vélemény alapján) magántanulóként folytatja.', 
-	    'dokumentum' => 'osztálynapló, törzslap'),
-14 => array('sorszam' => '10.', 'szoveg' => 'Mentesítve a(z) %tantárgyak neve% tantárgy tanulása alól.', 
-	    'dokumentum' => 'osztálynapló, törzslap, bizonyítvány'),
-15 => array('sorszam' => '11.', 'szoveg' => 'Tanulmányi idejének megrövidítése miatt a(z) %évfolyam% évfolyam tantárgyaiból osztályozó vizsgát köteles tenni.', 
-	    'dokumentum' => 'osztálynapló, törzslap'),
-16 => array('sorszam' => '12.', 'szoveg' => 'A(z) %évfolyam% évfolyamra megállapított tantervi követelményeket a tanulmányi idő megrövidítésével teljesítette.', 
-	    'dokumentum' => 'osztálynapló, törzslap, bizonyítvány'), // %evfolyam% paraméter nincs a rendeletben
-17 => array('sorszam' => '13.', 'szoveg' => 'A(z) %tantárgy% tantárgy %ezen óráinak% óráinak látogatása alól felmentve %tólDt%-tól %igDt%-ig.', 
-	    'dokumentum' => 'osztálynapló'), // %ezen óráinak% paraméter nincs a rendeletben
-18 => array('sorszam' => '13.', 'szoveg' => 'A(z) %tantárgy% tantárgy %ezen óráinak% óráinak látogatása alól felmentve %tólDt%-tól %igDt%-ig. Osztályozó vizsgát köteles tenni.', 
-	    'dokumentum' => 'osztálynapló'), // %ezen óráinak% paraméter nincs a rendeletben
-19 => array('sorszam' => '14.', 'szoveg' => 'Mulasztása miatt nem osztályozható, a nevelőtestület határozata értelmében osztályozó vizsgát tehet.', 
-	    'dokumentum' => 'osztálynapló, törzslap'),
-20 => array('sorszam' => '15.', 'szoveg' => 'A nevelőtestület határozata: a(z) %évfolyam betűvel% évfolyamba léphet.', 
-	    'dokumentum' => 'osztálynapló, törzslap, bizonyítvány'),
-21 => array('sorszam' => '15.', 'szoveg' => 'A nevelőtestület határozata: iskolai tanulmányait befejezte, tanulmányait %évfolyam% évfolyamon folytathatja.', 
-	    'dokumentum' => 'osztálynapló, törzslap, bizonyítvány'), // csak "iskolai tanulmányait befejezte - nincs?
-22 => array('sorszam' => '16.', 'szoveg' => 'A tanuló az %évfolyam% évfolyam követelményeit egy tanítási évnél hosszabb ideig, %hónap szám% hónap alatt teljesítette.', 
-	    'dokumentum' => 'osztálynapló, törzslap'),
-23 => array('sorszam' => '17.', 'szoveg' => 'A(z) %tantárgy% tantárgyból javítóvizsgát tehet.', 
-	    'dokumentum' => 'osztálynapló, törzslap, bizonyítvány'),
-24 => array('sorszam' => '17.', 'szoveg' => 'A javítóvizsgán %tantárgy% tantárgyból %osztályzat% osztályzatot kapott, %évfolyam% évfolyamba léphet.', 
-	    'dokumentum' => 'törzslap, bizonyítvány'),
-25 => array('sorszam' => '18.', 'szoveg' => 'A(z) %évfolyam% évfolyam követelményeit nem teljesítette, az évfolyamot meg kell ismételnie.', 
-	    'dokumentum' => 'osztálynapló, törzslap, bizonyítvány'),
-26 => array('sorszam' => '', 'szoveg' => '', 'dokumentum' => 'osztálynapló, törzslap, bizonyítvány'),
-27 => array('sorszam' => '19', 'szoveg' => 'A javítóvizsgán %tantárgy% tantárgyból elégtelen osztályzatot kapott. Évfolyamot ismételni köteles.', 
-	    'dokumentum' => 'törzslap, bizonyítvány'),
-28 => array('sorszam' => '20.', 'szoveg' => 'A(z) %tantárgy% tantárgyból %dátum%-án osztályozó vizsgát tett.', 
-	    'dokumentum' => 'osztálynapló, törzslap'),
-29 => array('sorszam' => '21.', 'szoveg' => 'Osztályozó vizsgát tett.', 
-	    'dokumentum' => 'törzslap, bizonyítvány'),
-30 => array('sorszam' => '22.', 'szoveg' => 'A(z) %tantárgy% tantárgy alól %felmentés oka% okból felmentve.', 
-	    'dokumentum' => 'törzslap, bizonyítvány'),
-31 => array('sorszam' => '23.', 'szoveg' => 'A(z) %tanóra% tanóra alól %felmentés oka% okból felmentve.', 
-	    'dokumentum' => 'törzslap, bizonyítvány'),
-32 => array('sorszam' => '24.', 'szoveg' => 'Az osztályozóvizsga letételére %igDt%-ig halasztást kapott.', 
-	    'dokumentum' => 'törzslap, bizonyítvány'),
-33 => array('sorszam' => '24.', 'szoveg' => 'Az beszámoltatóvizsga letételére %igDt%-ig halasztást kapott.', 
-	    'dokumentum' => 'törzslap, bizonyítvány'),
-34 => array('sorszam' => '24.', 'szoveg' => 'Az különbözetivizsga letételére %igDt%-ig halasztást kapott.', 
-	    'dokumentum' => 'törzslap, bizonyítvány'),
-35 => array('sorszam' => '24.', 'szoveg' => 'Az javítóvizsga letételére %igDt%-ig halasztást kapott.', 
-	    'dokumentum' => 'törzslap, bizonyítvány'),
-36 => array('sorszam' => '25.', 'szoveg' => 'Az osztályozó vizsgát engedéllyel a(z) %iskola% iskolában független vizsgabizottság előtt tette le.', 
-	    'dokumentum' => 'törzslap, bizonyítvány'),
-37 => array('sorszam' => '25.', 'szoveg' => 'Az javítóvizsgát engedéllyel a(z) %iskola% iskolában független vizsgabizottság előtt tette le.', 
-	    'dokumentum' => 'törzslap, bizonyítvány'),
-38 => array('sorszam' => '26.', 'szoveg' => 'A(z) %szakképesítés% szakképesítés évfolyamán folytatja tanulmányait.', 
-	    'dokumentum' => 'törzslap, bizonyítvány, osztálynapló'),
-39 => array('sorszam' => '27.', 'szoveg' => 'Tanulmányait %ok% okból megszakította, a tanulói jogviszonya %igDt%-ig szünetel.', 
-	    'dokumentum' => 'beírási napló, törzslap'),
-40 => array('sorszam' => '28.', 'szoveg' => 'A tanuló jogviszonya kimaradással megszűnt, a létszámból törölve.', 
-	    'dokumentum' => 'beírási napló, törzslap, bizonyítvány, osztálynapló'),
-41 => array('sorszam' => '28.', 'szoveg' => 'A tanuló jogviszonya %igazolatlan órák száma% óra igazolatlan mulasztás miatt megszűnt, a létszámból törölve.', 
-	    'dokumentum' => 'beírási napló, törzslap, bizonyítvány, osztálynapló'),
-42 => array('sorszam' => '28.', 'szoveg' => 'A tanuló jogviszonya egészségügyi alkalmasság miatt megszűnt, a létszámból törölve.', 
-	    'dokumentum' => 'beírási napló, törzslap, bizonyítvány, osztálynapló'),
-43 => array('sorszam' => '28.', 'szoveg' => 'A tanuló jogviszonya térítési díj fizetési hátralék miatt megszűnt, a létszámból törölve.', 
-	    'dokumentum' => 'beírási napló, törzslap, bizonyítvány, osztálynapló'),
-44 => array('sorszam' => '28.', 'szoveg' => 'A tanuló jogviszonya tandíj fizetési hátralék miatt megszűnt, a létszámból törölve.', 
-	    'dokumentum' => 'beírási napló, törzslap, bizonyítvány, osztálynapló'),
-45 => array('sorszam' => '28.', 'szoveg' => 'A tanuló jogviszonya %iskola% iskolába való átvétel miatt megszűnt, a létszámból törölve.', 
-	    'dokumentum' => 'beírási napló, törzslap, bizonyítvány, osztálynapló'),
-46 => array('sorszam' => '29.', 'szoveg' => '%Fegyelmező intézkedés% fegyelmező intézkedésben részesült.', 
-	    'dokumentum' => 'osztálynapló'),
-47 => array('sorszam' => '30.', 'szoveg' => '%Fegyelmi büntetés% fegyelmi büntetésben részesült. A büntetés végrehajtása %igDt%-ig felfüggesztve.', 
-	    'dokumentum' => 'törzslap'),
-48 => array('sorszam' => '31.', 'szoveg' => 'A tanuló %igazolatlan órák száma% óra igazolatlan mulasztása miatt a szülőt felszólítottam.', 
-	    'dokumentum' => 'osztálynapló'), // A "Tanköteles tanuló igazolatlan mulasztása esetén" szöveget magyarázatnak tekintettem
-49 => array('sorszam' => '31.', 'szoveg' => 'A tanuló ismételt %igazolatlan órák száma% óra igazolatlan mulasztása miatt a szülő ellen szabálysértési eljárást kezdeményeztem.', 
-	    'dokumentum' => 'beírási napló, törzslap, osztálynapló'), // A "Tanköteles tanuló igazolatlan mulasztása esetén" szöveget magyarázatnak tekintettem
-50 => array('sorszam' => '32.', 'szoveg' => 'Tankötelezettség megszűnt.', 'dokumentum' => 'beírási napló'),
-51 => array('sorszam' => '33.', 'szoveg' => 'A %szó% szót %helyesbítés%-ra/re helyesbítettem.', 
-	    'dokumentum' => 'törzslap, bizonyítvány'),
-52 => array('sorszam' => '33.', 'szoveg' => 'A %szavak% szavakat %helyesbítés%-ra/re helyesbítettem.', 
-	    'dokumentum' => 'törzslap, bizonyítvány'),
-53 => array('sorszam' => '33.', 'szoveg' => 'A %osztályzat% osztályzatot %helyesbítés%-ra/re helyesbítettem.', 
-	    'dokumentum' => 'törzslap, bizonyítvány'),
-54 => array('sorszam' => '33.', 'szoveg' => 'A %osztályzatok% osztályzatokat %helyesbítés%-ra/re helyesbítettem.', 
-	    'dokumentum' => 'törzslap, bizonyítvány'),
-55 => array('sorszam' => '34.', 'szoveg' => 'A bizonyítvány %lap% lapját téves bejegyzés miatt érvénytelenítettem.', 
-	    'dokumentum' => 'bizonyítvány'),
-56 => array('sorszam' => '35.', 'szoveg' => 'Ezt a póttörzslapot a(z) %ok% következtében elvesztett (megsemmisült) eredeti helyett %adatforrás% adatai (adatok) alapján állítottam ki.', 
-	    'dokumentum' => 'Pót. törzslap'),
-57 => array('sorszam' => '36.', 'szoveg' => 'Ezt a bizonyítványmásodlatot az elveszett (megsemmisült) eredeti helyett %adatforrás% adatai (adatok) alapján állítottam ki.', 
-	    'dokumentum' => 'Pót. törzslap'),
-58 => array('sorszam' => '37.', 'szoveg' => 'A bizonyítványt %kérelmező% kérelmére a %bizonyítványszám% számú bizonyítvány alapján, téves bejegyzés miatt állítottam ki.', 
-	    'dokumentum' => 'törzslap, bizonyítvány'),
-59 => array('sorszam' => '38.', 'szoveg' => 'Pótbizonyítvány. Igazolom, hogy név %Név%, anyja neve %Anyja neve% a(z) %iskola% iskola %szak% szak (szakmai, speciális osztály, két tanítási nyelvű osztály, tagozat) %évfolyam% évfolyamát a(z) %tanév jele% tanévben eredményesen elvégezte.', 
-	    'dokumentum' => 'Pót. bizonyítvány'),
-60 => array('sorszam' => '39.', 'szoveg' => 'Az iskola a tanulmányi eredmények bejegyzéséhez, a kiemelkedő tanulmányi eredmények elismeréséhez, a felvételi vizsga eredményeinek bejegyzéséhez %vizsga% vizsga eredményének befejezéséhez vagy egyéb, a záradékok között nem szereplő, a tanulóval kapcsolatos közlés dokumentálásához a záradékokat megfelelően alkalmazhatja, illetve megfelelően záradékot alakíthat ki.', 
-	    'dokumentum' => ''),
-61 => array('sorszam' => '40.', 'szoveg' => 'Érettségi vizsgát tehet.', 
-	    'dokumentum' => 'törzslap, bizonyítvány'),
-62 => array('sorszam' => '41.', 'szoveg' => 'Gyakorlati képzésről mulasztását %tólDt%-tól %igDt%-ig pótolhatja.', 
-	    'dokumentum' => 'törzslap, bizonyítvány, osztálynapló'),
-63 => array('sorszam' => '42.', 'szoveg' => 'Beírtam a %iskola% iskola első osztályába.', 
-	    'dokumentum' => ''),
-64 => array('sorszam' => '43.', 'szoveg' => 'Ezt a naplót %tanítási napok száma% tanítási nappal lezártam.', 
-	    'dokumentum' => 'osztálynapló'),
-65 => array('sorszam' => '43.', 'szoveg' => 'Ezt a naplót %tanítási órák száma% tanítási órával lezártam.', 
-	    'dokumentum' => 'osztálynapló'),
-66 => array('sorszam' => '44.', 'szoveg' => 'Ezt az osztályozó naplót %tanulók száma% azaz %tanulók száma betűvel% osztályozott tanulóval lezártam.', 
-	    'dokumentum' => 'osztálynapló'),
-67 => array('sorszam' => '45.', 'szoveg' => 'Ezt az osztályozó naplót %tanulók száma% azaz %tanulók száma betűvel% osztályozott tanulóval lezártam.', 
-	    'dokumentum' => 'osztálynapló'),
-68 => array('sorszam' => '46.', 'szoveg' => 'Igazolom, hogy a tanuló a %tanév jele% tanévig %elvégzett órák száma% óra közösségi szolgálatot teljesített.', 
-	    'dokumentum' => 'bizonyítvány'),
-69 => array('sorszam' => '47.', 'szoveg' => 'A tanuló teljesítette az érettségi bizonyítvány kiadásához szükséges közösségi szolgálatot', 
-	    'dokumentum' => 'törzslap'),
-70 => array('sorszam' => '48.', 'szoveg' => '%nemzetiség megnevezése% kiegészítő nemzetiségi tanulmányait a nyolcadik/tizenkettedik évfolyamon befejezte', 
-	    'dokumentum' => 'törzslap, bizonyítvány'),
-
-
-
-
-100 => array('sorszam' => '1/A', 'szoveg' => 'Felvéve a(z) %iskola címe% %osztály% osztályába.', 
-	    'dokumentum' => 'beírási napló, osztálynapló, törzslap, bizonyítvány'),
-101 => array('sorszam' => '6/B', 'szoveg' => '%miatt% miatt mentesítve a(z) %mi% értékelés(e) és a minősítés(e) alól.', 
-	    'dokumentum' => 'osztálynapló, törzslap, bizonyítvány'),
-102 => array('sorszam' => '15/A', 'szoveg' => 'A nevelőtestület határozata: iskolai tanulmányait befejezte.', 
-	    'dokumentum' => 'osztálynapló, törzslap, bizonyítvány'),
-103 => array('sorszam' => '19/A', 'szoveg' => 'Az osztályozó vizsgán a %tantárgy% tantárgy követelményeit nem teljesítette - %osztályzat%.', 
-	    'dokumentum' => 'törzslap, bizonyítvány'),
-104 => array('sorszam' => '19/B', 'szoveg' => 'A beszámoltatóvizsgán a %tantárgy% tantárgy követelményeit nem teljesítette - %osztályzat%.', 
-	    'dokumentum' => 'törzslap, bizonyítvány'),
-105 => array('sorszam' => '19/C', 'szoveg' => 'A különbözetivizsgán a %tantárgy% tantárgy követelményeit nem teljesítette - %osztályzat%.', 
-	    'dokumentum' => 'törzslap, bizonyítvány'),
-106 => array('sorszam' => '19/D', 'szoveg' => 'A javítóvizsgán a %tantárgy% tantárgy követelményeit nem teljesítette - %osztályzat%. Évfolyamot ismételni köteles.', 
-	'dokumentum' => 'törzslap, bizonyítvány'), // Ez nem kell, mert az eredeti 19-es épp erről az esetről szól - nem?
-107 => array('sorszam' => '20/A', 'szoveg' => 'A(z) %tantárgy% tantárgyból %dátum%-án beszámoltatóvizsgát tett.', 
-	    'dokumentum' => 'osztálynapló, törzslap'),
-108 => array('sorszam' => '20/B', 'szoveg' => 'A(z) %tantárgy% tantárgyból %dátum%-án különbözetivizsgát tett.', 
-	    'dokumentum' => 'osztálynapló, törzslap'),
-109 => array('sorszam' => '20/C', 'szoveg' => 'A(z) %tantárgy% tantárgyból a(z) %évfolyam% évfolyam anyagából %dátum% napon %osztályzat% eredménnyel osztályozó vizsgát tett.', 
-	    'dokumentum' => 'osztálynapló, törzslap'),
-110 => array('sorszam' => '28/A', 'szoveg' => 'A tanuló jogviszonya haláleset miatt megszűnt, a létszámból törölve.', 
-	    'dokumentum' => 'beírási napló, törzslap, bizonyítvány, osztálynapló'),
-111 => array('sorszam' => '39/A', 'szoveg' => '%Egyedi osztálynapló záradék%', 
-	    'dokumentum' => 'osztálynapló'),
-112 => array('sorszam' => '39/B', 'szoveg' => '%Egyedi törzslap záradék%', 
-	    'dokumentum' => 'törzslap'),
-113 => array('sorszam' => '39/C', 'szoveg' => '%Egyedi bizonyítvány záradék%', 
-	    'dokumentum' => 'bizonyítvány'),
-114 => array('sorszam' => '39/D', 'szoveg' => 'A %iktatószám% alapján tanulmányait a %osztály% osztályban folytatja.', 
-	    'dokumentum' => 'beírási napló, törzslap'),
-115 => array('sorszam' => '39/E', 'szoveg' => 'A(z) %tankorDiakFelmentesId% nyilvántartási számú felmentést %dt% napon hatályon kívül helyeztem. ', 
-	    'dokumentum' => 'osztálynapló, törzslap, bizonyítvány'),
-116 => array('sorszam' => '39/F', 'szoveg' => 'A(z) %zaradekId% nyilvántartási számú záradékban rögzített felmentést %dt% napon hatályon kívül helyeztem. ', 
-	    'dokumentum' => 'osztálynapló, törzslap, bizonyítvány'),
-117 => array('sorszam' => '18/A', 'szoveg' => 'A(z) %évfolyam% évfolyam követelményeit nem teljesítette, az évfolyamot megismételheti.', // nem tanköteles diák esetén 
-	    'dokumentum' => 'osztálynapló, törzslap, bizonyítvány'),
-
-);
-
-$ZaradekIndex = array(
-    'konferencia' => array(
-	// továbbléphet
-	'következő évfolyamba léphet' => 20, // %évfolyam betűvel%
-	'tanulmányait befejezte, következő évfolyamon folytathatja' => 21, // %évfolyam%
-	'tanulmányait befejezte' => 102,
-	'szakképző évfolyamba léphet' => 38, // %szakképesítés%
-	// mulasztás - de vizsgázat
-	'mulasztás miatt osztályozóvizsga' => 19,
-    ),
-    'konferencia bukás' => array(
-	'javítóvizsgát tehet' => 23, // %tantárgy%
-	'előkészítőt végzett' => 4, // csak első évfolyamon!!
-	'követelményeket nem teljesítette, évfolyamot ismétel' => 25, // %évfolyam% - tanköteles eset
-	'követelményeket nem teljesítette, évfolyamot ismételhet' => 117, // %évfolyam% - nem tanköteles eset
-    ),
-    'jogviszony megnyitás' => array(
-	'felvétel' => 1,
-	'felvétel osztályba' => 100, // %iskola címe%, %osztály%
-	'átvétel' => 2, // %iskola címe%
-	'áthelyezés' => 3, // %határozat száma%, %iskola címe%
-    ),
-    'jogviszony változás' => array(
-	'magántanuló' => 13, 
-	'felfüggesztés' => 39 // %ok%, %igDt%
-    ),
-    'jogviszony lezárás' => array(
-	'kimaradás' => 40,
-	'igazolatlan órák' => 41, // %igazolatlan órák száma%
-	'egészségügyi alkalmasság' => 42,
-	'térítési díj hátralék' => 43,
-	'tandíj hátralék' => 44,
-	'átvétel' => 45, // %iskola%
-	'haláleset' => 110,
-	'tanulmányait folytathatja' => 21, // %évfolyam%
-	'tanulmányait befejezte' => 102,
-    ),
-    'vizsga halasztás' => array(
-	'osztályozó vizsga' => 32, // %igDt%
-	'beszámoltatóvizsga' => 33, // %igDt%
-	'különbözetivizsga' => 34, // %igDt%
-	'javítóvizsga' => 35, // %igDt%
-    ),
-    'vizsga' => array(
-	'osztályozó vizsga' => 109, // %tantárgy%, %évfolyam%, %dátum%, %osztályzat%
-	'osztályozó vizsga bukás' => 103, // %tantárgy%, %osztályzat%
-	'beszámoltatóvizsga' => 107, // %tantárgy%
-	'beszámoltatóvizsga bukás' => 104, // %tantárgy%, %osztályzat%
-	'különbözetivizsga' => 108, // %tantárgy%
-	'különbözetivizsga bukás' => 105, // %tantárgy%, %osztályzat%
-	'javítóvizsga' => 24, // %tárgy%, %osztályzat%, %évfolyam%
-	'javítóvizsga bukás' => 27, // %tantárgy%
-	'javítóvizsga nem teljesített' => 25, // %évfolyam% (az évfolyam követelményeit)
-    ),
-    'felmentés' => array(
-	'értékelés alól' => 9, // %tantárgy%
-	'értékelés és minősítés alól' => 101, // %miatt%, %mi%
-	'óra látogatása alól' => 17, // %tantárgy%, %ezen óráinka%, %tólDt%, %igDt%
-	'óra látogatása alól osztályozóvizsgával' => 18, // %tantárgy%, %ezen óráinka%, %tólDt%, %igDt%
-	'tárgy tanulása alól' => 14, // %tantárgyak neve%
-	'törlés' => 115, // %tankorDiakFelmentesId%
-    ),
-    'törzslap feljegyzés' => array(
-	'egyedi törzslap záradék' => 112
-    )
-
-);
-
-} // __TANEV > 2012
-
-?>
\ No newline at end of file
diff --git a/mayor-orig/www/include/modules/naplo/share/zaroJegyModifier.php b/mayor-orig/www/include/modules/naplo/share/zaroJegyModifier.php
deleted file mode 100644
index 48c5cfe9..00000000
--- a/mayor-orig/www/include/modules/naplo/share/zaroJegyModifier.php
+++ /dev/null
@@ -1,156 +0,0 @@
- 'naplo_intezmeny','values' => $v, 'fv' => 'zaroJegyBeiras', 'result' => 'insert'), $lr);
-	    }
-        }
-
-	if ($olr=='') db_close($lr); //+++ MISSING hibakezelés, tranzakciókezelés???
-
-	if (is_array($results) && count($results) == 1) return $results[0]; // vizsga oldal használja lastInsertId miatt
-	else return false;
-
-    }
-
-    // Tanev/Szemeszter zárónapjával meghatározva
-    function generateDiakEvfolyamJel($diakId,$tanev,$szemeszter) { return _generateEvfolyamJel($diakId,$tanev,$szemeszter); }
-
-    function _generateEvfolyamJel($diakId,$tanev,$szemeszter) { // returns INTEGER || FALSE --> STRING || FALSE
-	
-	/*
-	    milyen evfolyamos?
-	    diakId-->(tanev/szemeszter.zaroDt)osztaly-->evfolyamJel
-
-	    + kiegészítés: diák osztályai és tankör osztályainak metszete 1 osztály kell hogy legyen.
-	    - getTankorOsztalyai($tankorId, $SET = array('result' => 'id'), $olr='');
-	    - ezt sajnos nem tudujk itt meghívni!
-	*/
-	// getSzemeszterAdat
-	$q = "SELECT zarasDt FROM szemeszter WHERE tanev=%u AND szemeszter=%u";
-	$v = array($tanev,$szemeszter);
-	$zarasDt = db_query($q, array('fv'=>'inner_generateEvfolyam','modul'=>'naplo_intezmeny','result'=>'value', 'values'=>$v));
-	// melyik osztályba járt?
-	$OSZTALYOK = getDiakOsztalya($diakId,array('tanev'=>$tanev,'tolDt'=>$zarasDt,'igDt'=>$zarasDt));
-	if (count($OSZTALYOK)===1) { // ha több osztályba is jár, de azok évfolyamjele azonos, akkor nem kellene hibával kilépni...
-	    $_osztalyId = $OSZTALYOK[0]['osztalyId'];
-	    $OA = getOsztalyAdat($_osztalyId);	    
-	    return $OA['evfolyamJel'];
-	} else {
-	    $_SESSION['alert'][] = '::nem tudom kitalálni az évfolyamot (db osztály: '.count($OSZTALYOK).", diakId: $diakId, tanev: $tanev, szemeszter: $szemeszter)";
-	    return false;
-	}
-
-    }
-
-    function _generateTanevSzemeszter($dt) {
-
-
-	$q = "SELECT tanev,szemeszter FROM szemeszter WHERE kezdesDt < '%s' ORDER BY tanev DESC, szemeszter DESC LIMIT 1";
-	$v = array($dt);
-	return db_query($q, array('fv' => '_generateTanevSzemeszter', 'modul' => 'naplo_intezmeny', 'result' => 'record', 'values' => $v));
-
-    }
-?>
diff --git a/mayor-orig/www/include/modules/naplo/sni/diakAllapot.php b/mayor-orig/www/include/modules/naplo/sni/diakAllapot.php
deleted file mode 100644
index 6236e3e4..00000000
--- a/mayor-orig/www/include/modules/naplo/sni/diakAllapot.php
+++ /dev/null
@@ -1,91 +0,0 @@
- 'getDiakAllapot','modul' => 'naplo','values' => $v, 'result' => 'assoc', 'keyfield' => 'szemeszter'));
-	// Gyengeségek és erősségek riorizált listája
-	$q = "SELECT * FROM sniDiakGyengesegErosseg WHERE diakId=%u ORDER BY prioritas";
-	$ret2 = db_query($q, array('fv' => 'getDiakAllapot/gyengeségek, erősségek','modul' => 'naplo','values' => $v, 'result' => 'multiassoc', 'keyfield' => 'szemeszter'));
-	foreach ($ret2  as $szemeszter => $gyeAdat) {
-	    foreach ($gyeAdat as $key => $value) {
-		$ret[ $value['szemeszter'] ][ $value['gyengesegErosseg'] ][] = array(
-		    'leiras' => $value['leiras'],
-		    'prioritas' => $value['prioritas']
-		);
-	    }
-	}
-
-	return $ret;
-
-
-    }
-
-    function sniDiakAllapotRogzites($Parameters) {
-
-	$lr = db_connect('naplo', array('fv' => 'sniDiakAllapotRogzites'));
-	db_start_trans($lr);
-
-	$Param = $Parameters['diakAllapot'];
-	$diakId = $Param['diakId']; $szemeszter = $Param['szemeszter'];
-	// Korábbi bejegyzés törlése
-	$val = array($Param['diakId'], $Param['szemeszter']);
-	$q = "DELETE FROM `sniDiakAllapot` WHERE `diakId` = %u AND `szemeszter` = %u";
-	db_query($q, array('fv' => 'sniDiakAllapotRogzites', 'modul' => 'naplo', 'values' => $val), $lr);
-	$q = "DELETE FROM `sniDiakGyengesegErosseg` WHERE `diakId` = %u AND `szemeszter` = %u";
-	db_query($q, array('fv' => 'sniDiakAllapotRogzites', 'modul' => 'naplo', 'values' => $val), $lr);
-	// Paraméterek feldolgozása
-	$pattern = $v = array();
-	foreach ($Param as $attr => $value) {
-	    if (in_array($attr, array('gyengesegLeiras','gyengesegPrioritas','erossegLeiras','erossegPrioritas'))) continue;
-	    if (in_array($attr, array('diakId','szemeszter','vizsgalatTanarId','priorizalas')))
-		if ($value == '') { $pattern[] = '%s'; $value = 'NULL'; }
-		else $pattern[] = "%u";
-	    else
-		if ($attr == 'vizsgalatDt' && $value == '') { $pattern[] = '%s'; $value = 'NULL'; }
-		else $pattern[] = "'%s'";
-	    $v[] = $value;
-	}
-	// új bejegyzés beszúrása
-	$q = "INSERT INTO `sniDiakAllapot` (`".implode('`,`',array_keys($Param))."`) VALUES (".implode(',', $pattern).")";
-	$ret = db_query($q, array('fv' => 'sniDiakAllapotRogzites', 'modul' => 'naplo', 'values' => $v), $lr);
-	if (!$ret) { 
-	    db_rollback($lr, 'Az SNI adatok módosítása nem sikerült. Visszaállítjuk az eredeti állapotot...'); 
-	    db_close($lr); return false;
-	}
-	// Gyengeségek/Erősségek rögzítése
-	$Param = $Parameters['gyengesegekErossegek'];
-	$v = array();
-	foreach (array('gyengeseg','erosseg') as $key => $gye) {
-	    if (is_array($Param[$gye.'Leiras'])) {
-		foreach ($Param[$gye.'Leiras'] as $index => $leiras)  if ($leiras != '') { // Lehessen törölni így...
-		    array_push($v, $diakId, $szemeszter, ($key+1), $leiras, $Param[$gye.'Prioritas'][$index]);
-		}
-	    }
-	}
-	if (count($v) != 0) {
-	    $q = "INSERT INTO `sniDiakGyengesegErosseg` VALUES ".implode(',', array_fill(0, (count($v)/5), "(%u,%u,%u,'%s',%u)"));
-	    $ret = db_query($q, array('fv' => 'sniDiakAllapotRogzites/Gyengeségek-erősségek', 'modul' => 'naplo', 'values' => $v), $lr);
-	    var_dump($Param);
-	}
-
-	db_commit($lr);
-	db_close($lr);
-	return true;
-
-    }
-
-    function sniDiakAdatRogzites($Param) {
-
-	// diak.fogytekossag módosítása
-	$q = "UPDATE diak SET `fogyatekossag`='%s' WHERE diakId=%u";
-	db_query($q, array('fv' => 'sniDiakAdatRogzites', 'modul' => 'naplo_intezmeny', 'values' => array(implode(',', $Param['fogyatekossag']), $Param['diakId'])));
-	unset($Param['fogyatekossag']);
-	// sniDiakAdat modosítás
-	$q = "REPLACE INTO `sniDiakAdat` (`diakId`, `kulsoInfo`, `mentorTanarId`) VALUES (%u, '%s', %u)";
-	return db_query($q, array('fv' => 'sniDiakAdatRogzites', 'modul' => 'naplo', 'values' => $Param));
-
-    }
-
-?>
diff --git a/mayor-orig/www/include/modules/naplo/sni/fejlesztesiTerv.php b/mayor-orig/www/include/modules/naplo/sni/fejlesztesiTerv.php
deleted file mode 100644
index 8485f20e..00000000
--- a/mayor-orig/www/include/modules/naplo/sni/fejlesztesiTerv.php
+++ /dev/null
@@ -1,45 +0,0 @@
- 'getHaviOsszegzes', 'modul' => 'naplo', 'values' => $v, 'result' => 'record'));
-
-	$q = "SELECT tanarId FROM sniHaviOsszegzesFelelos WHERE haviOsszegzesId = %u";
-	$ret['felelos'] = db_query($q, array('fv' => 'getHaviOsszegzes', 'modul' => 'naplo', 'values' => array($ret['haviOsszegzesId']), 'result' => 'idonly'));
-
-	return $ret;
-
-    }
-
-    function sniHaviOsszegzesRogzites($Param) {
-
-	$Felelos = $Param['felelos']; unset($Param['felelos']);
-        // Korábbi bejegyzés törlése
-        $q = "SELECT haviOsszegzesId FROM sniHaviOsszegzes WHERE diakId = %u AND dt = '%s'";
-        $v = array($Param['diakId'], $Param['dt']);
-        $Param['haviOsszegzesId'] = db_query($q, array('fv' => 'sniHaviOsszesitesRogzites', 'modul' => 'naplo', 'values' => $v, 'result' => 'value'));
-        // Paraméterek feldolgozása
-        $pattern = $v = array();
-        foreach ($Param as $attr => $value) {
-        	if (in_array($attr, array('diakId','haviOsszegzesId','valtozas')))
-            	    if ($value == '') { $pattern[] = '%s'; $value = 'NULL'; }
-            	    else $pattern[] = "%u";
-        	else
-        	    $pattern[] = "'%s'";
-        	$v[] = $value;
-        }
-        // új bejegyzés beszúrása
-        $q = "REPLACE INTO `sniHaviOsszegzes` (`".implode('`,`',array_keys($Param))."`) VALUES (".implode(',', $pattern).")";
-        $id = db_query($q, array('fv' => 'sniHaviOsszegzesRogzites', 'modul' => 'naplo', 'values' => $v, 'result' => 'insert'));
-	// felelosok törlése
-	$q = "DELETE FROM `sniHaviOsszegzesFelelos` WHERE haviOsszegzesId = %u";
-	db_query($q, array('fv' => 'sniHaviOsszegzesRogzites', 'modul' => 'naplo', 'values' => array($id)));
-	// új felelősök felvétele
-	$q = "INSERT INTO `sniHaviOsszegzesFelelos` (`haviOsszegzesId`,`tanarId`) VALUES ".implode(',', array_fill(0, count($Felelos), "($id, %u)"));
-	return db_query($q, array('fv' => 'sniHaviOsszegzesRogzites', 'modul' => 'naplo', 'values' => $Felelos));
-    }
-*/
-?>
diff --git a/mayor-orig/www/include/modules/naplo/sni/tantargyiFeljegyzesek.php b/mayor-orig/www/include/modules/naplo/sni/tantargyiFeljegyzesek.php
deleted file mode 100644
index c11be93b..00000000
--- a/mayor-orig/www/include/modules/naplo/sni/tantargyiFeljegyzesek.php
+++ /dev/null
@@ -1,26 +0,0 @@
- 'getDiakFeljegyzesByTankorId', 'modul' => 'naplo', 'values' => $v, 'result' => 'keyvaluepair'));
-
-    }
-
-    function getDiakFeljegyzesByDt($ADAT) {
-
-        $q = "SELECT tankorId, megjegyzes FROM sniTantargyiFeljegyzes WHERE diakId = %u AND dt = '%s'";
-        $v = array($ADAT['diakId'], $ADAT['dt']);
-        return db_query($q, array('fv' => 'getDiakFeljegyzesByDt', 'modul' => 'naplo', 'values' => $v, 'result' => 'keyvaluepair'));
-
-    }
-
-    function tantargyiFeljegyzesRogzites($Param) {
-
-	$q = "REPLACE INTO sniTantargyiFeljegyzes (diakId, tankorId, dt, megjegyzes) VALUES (%u, %u, '%s', '%s')";
-	return db_query($q, array('fv' => 'tantargyiFeljegyzesRogzites', 'modul' => 'naplo', 'values' => $Param));
-
-    }
-
-?>
diff --git a/mayor-orig/www/include/modules/naplo/stat/lemorzsolodas.php b/mayor-orig/www/include/modules/naplo/stat/lemorzsolodas.php
deleted file mode 100644
index bb1700f6..00000000
--- a/mayor-orig/www/include/modules/naplo/stat/lemorzsolodas.php
+++ /dev/null
@@ -1,223 +0,0 @@
-=1,1 romlás
-	// !! csak a jegy típusokra értelmezhető az átlagolás
-	
-	    //elozo
-	    $q = "SELECT diakId,avg(jegy) AS avg FROM zaroJegy WHERE hivatalosDt = '%s' AND jegyTipus IN ('jegy') GROUP BY diakId";
-	    $v = array($elozoDt);
-	    $r = db_query($q, array('modul'=>'naplo_intezmeny','result'=>'indexed','keyfield'=>'diakId','values'=>$v));	
-	    for ($i=0; $i'naplo_intezmeny','result'=>'indexed','values'=>$v));	
-	    for ($i=0; $i=1.1) {
-		    $_diakId = $r[$i]['diakId'];
-		    if (!is_array($DIAKADAT[$_diakId])) {
-			$DIAKADAT[$_diakId] = getDiakAdatById($_diakId);
-			$DIAKADAT[$_diakId]['diakOsztalya'] = getDiakOsztalya($_diakId, array('tanev'=>__TANEV,'tolDt'=>$dt,'igDt'=>$dt), $intezmeny_lr);
-		    }
-		    $R['ronto'][] = array(
-			'diakId' => $r[$i]['diakId'],
-			'avg' => $r[$i]['avg'],
-			'elozoAvg' => $A[$r[$i]['diakId']],
-			'diakNev' => $DIAKADAT[$_diakId]['diakNev'],
-			'diakOsztalya' => ($DIAKADAT[$_diakId]['diakOsztalya'][0]['osztalyJel'])
-
-		    );
-		}
-	    }
-	
-	// -- a félév végén (év végén) a tanulmányi átlaga< 3,0
-	    //kivalasztott
-	    $q = "SELECT diakId,avg(jegy) AS atlag FROM zaroJegy WHERE hivatalosDt = '%s' AND jegyTipus IN ('jegy') GROUP BY diakId HAVING atlag<3";
-	    $v = array($dt);
-	    $r = db_query($q, array('modul'=>'naplo_intezmeny','result'=>'indexed','values'=>$v));	
-	    for ($i=0; $i__TANEV,'tolDt'=>$dt,'igDt'=>$dt), $intezmeny_lr);
-		}
-		$R['rosszTanulo'][] = array(
-			'diakId' => $r[$i]['diakId'],
-			'atlag' => $r[$i]['atlag'],
-			'diakNev' => $DIAKADAT[$_diakId]['diakNev'],
-			'diakOsztalya' => ($DIAKADAT[$_diakId]['diakOsztalya'][0]['osztalyJel'])
-
-		);
-	    }
-
-	// -- a félév végén (év végén) a tanulmányi átlaga< 2,5
-	    //kivalasztott
-	    $q = "SELECT diakId,avg(jegy) AS atlag FROM zaroJegy WHERE hivatalosDt = '%s' AND jegyTipus IN ('jegy') GROUP BY diakId HAVING atlag<2.5";
-	    $v = array($dt);
-	    $r = db_query($q, array('modul'=>'naplo_intezmeny','result'=>'indexed','values'=>$v));	
-	    for ($i=0; $i__TANEV,'tolDt'=>$dt,'igDt'=>$dt), $intezmeny_lr);
-		}
-		$R['nagyonRosszTanulo'][] = array(
-			'diakId' => $r[$i]['diakId'],
-			'atlag' => $r[$i]['atlag'],
-			'diakNev' => $DIAKADAT[$_diakId]['diakNev'],
-			'diakOsztalya' => ($DIAKADAT[$_diakId]['diakOsztalya'][0]['osztalyJel'])
-
-		);
-	    }
-
-	// -- egy-vagy több tárgyból bukik (ez lényegében most is benne van már)
-	    $q = "SELECT diakId,count(*) as dbBukas FROM zaroJegy WHERE hivatalosDt = '%s' AND jegyTipus IN ('jegy') AND jegy='1.0' GROUP BY diakId";
-	    $v = array($dt);
-	    $r = db_query($q, array('modul'=>'naplo_intezmeny','result'=>'indexed','values'=>$v));	
-	    for ($i=0; $i__TANEV,'tolDt'=>$dt,'igDt'=>$dt), $intezmeny_lr);
-		}
-		$R['bukott'][] = array(
-			'diakId' => $r[$i]['diakId'],
-			'dbBukas' => $r[$i]['dbBukas'],
-			'diakNev' => $DIAKADAT[$_diakId]['diakNev'],
-			'diakOsztalya' => ($DIAKADAT[$_diakId]['diakOsztalya'][0]['osztalyJel'])
-		);
-	    }
-
-	// -- magatartása rossz
-	    $q = "SELECT diakId FROM zaroJegy WHERE hivatalosDt = '%s' AND jegyTipus IN ('magatartás') AND jegy='2.0' GROUP BY diakId";
-	    $v = array($dt);
-	    $r = db_query($q, array('modul'=>'naplo_intezmeny','result'=>'indexed','values'=>$v));	
-	    for ($i=0; $i__TANEV,'tolDt'=>$dt,'igDt'=>$dt), $intezmeny_lr);
-		}
-		$R['rosszMagatartasu'][] = array(
-			'hivatalosDt' => $dt,
-			'diakId' => $r[$i]['diakId'],
-			'diakNev' => $DIAKADAT[$_diakId]['diakNev'],
-			'diakOsztalya' => ($DIAKADAT[$_diakId]['diakOsztalya'][0]['osztalyJel'])
-		);
-	    }
-	// -- szorgalma hanyag
-	    $q = "SELECT diakId FROM zaroJegy WHERE hivatalosDt = '%s' AND jegyTipus IN ('szorgalom') AND jegy='2.0' GROUP BY diakId";
-	    $v = array($dt);
-	    $r = db_query($q, array('modul'=>'naplo_intezmeny','result'=>'indexed','values'=>$v));	
-	    for ($i=0; $i__TANEV,'tolDt'=>$dt,'igDt'=>$dt), $intezmeny_lr);
-		}
-		$R['hanyagSzorgalmu'][] = array(
-			'diakId' => $r[$i]['diakId'],
-			'diakNev' => $DIAKADAT[$_diakId]['diakNev'],
-			'diakOsztalya' => ($DIAKADAT[$_diakId]['diakOsztalya'][0]['osztalyJel'])
-		);
-	    }
-	// -- 50 órát elérő igazolatlan hiányzás
-	    // --TODO TANÉV!!!
-	    $q = "SELECT diakId,count(*) as dbHianyzas FROM hianyzas 
-		    LEFT JOIN " .__INTEZMENYDBNEV. ".diak USING (diakId)
-		  WHERE dt<= '%s' AND tipus='hiányzás' AND igazolas='' AND diak.statusz='jogviszonyban van' GROUP BY diakId HAVING dbHianyzas>=50";
-	    $v = array($dt);
-	    $r = db_query($q, array('modul'=>'naplo','result'=>'indexed','values'=>$v));	
-	    for ($i=0; $i__TANEV,'tolDt'=>$dt,'igDt'=>$dt), $intezmeny_lr);
-		}
-		$_jogviszonya = getDiakJogviszonyByDts(array($_diakId),array($dt));
-		if ($_jogviszonya[$_diakId][$dt]['statusz']=='jogviszonyban van') {
-		    $R['igazolatlanHianyzo_50'][] = array(
-			'diakId' => $r[$i]['diakId'],
-			'dbHianyzas' => $r[$i]['dbHianyzas'],
-			'diakNev' => $DIAKADAT[$_diakId]['diakNev'],
-			'diakJogviszony' => $_jogviszonya[$_diakId][$dt]['statusz'],
-			'diakOsztalya' => ($DIAKADAT[$_diakId]['diakOsztalya'][0]['osztalyJel'])
-		    );
-		}
-	    }
-	
-	// -- 100 órát elérő igazolt hiányzás
-	    // --TODO TANÉV!!!
-	    $q = "SELECT diakId,count(*) as dbHianyzas FROM hianyzas 
-		    WHERE dt<= '%s' AND tipus='hiányzás' AND igazolas!=''
-		    GROUP BY diakId HAVING dbHianyzas>=100";
-	    $v = array($dt);
-	    $r = db_query($q, array('modul'=>'naplo','result'=>'indexed','values'=>$v));	
-	    for ($i=0; $i__TANEV,'tolDt'=>$dt,'igDt'=>$dt), $intezmeny_lr);
-		}
-		$_jogviszonya = getDiakJogviszonyByDts(array($_diakId),array($dt));
-		if ($_jogviszonya[$_diakId][$dt]['statusz']=='jogviszonyban van') {
-		    $R['igazoltanHianyzo_100'][] = array(
-			'diakId' => $r[$i]['diakId'],
-			'dbHianyzas' => $r[$i]['dbHianyzas'],
-			'diakNev' => $DIAKADAT[$_diakId]['diakNev'],
-			'diakJogviszony' => $_jogviszonya[$_diakId][$dt]['statusz'],
-			'diakOsztalya' => ($DIAKADAT[$_diakId]['diakOsztalya'][0]['osztalyJel'])
-		    );
-		}
-	    }
-	// -- magántanulóvá vált
-	    $q = "SELECT diakId FROM diakJogviszony WHERE dt BETWEEN '%s' AND '%s' AND statusz='magántanuló'";
-	    $v = array($elozoDt,$dt);
-	    $r = db_query($q, array('modul'=>'naplo_intezmeny','result'=>'indexed','values'=>$v));	
-	    for ($i=0; $i__TANEV,'tolDt'=>$dt,'igDt'=>$dt), $intezmeny_lr);
-		}
-		$_jogviszonya = getDiakJogviszonyByDts(array($_diakId),array($dt));
-		if ($_jogviszonya[$_diakId][$dt]['statusz']=='magántanuló') { // még mindig
-		    $R['magantanuloLett'][] = array(
-			'diakId' => $r[$i]['diakId'],
-			'diakNev' => $DIAKADAT[$_diakId]['diakNev'],
-			'diakOsztalya' => ($DIAKADAT[$_diakId]['diakOsztalya'][0]['osztalyJel'])
-		    );
-		}
-	    }
-	
-	// -- magántanulóvá minősítése folyamatban - ezt nem tudjuk
-	// -- oltalmazott / menekült / menedékes - ezt nem tudjuk
-	//  -- veszélyeztetetté vált - ez mi?
-	//  -- egyéb nehezen értelmezhető feltételek... - ez mi?
-
-	db_close($intezmeny_lr);
-
-	return $R;
-
-    }
-
-
-?>
\ No newline at end of file
diff --git a/mayor-orig/www/include/modules/naplo/stat/tantargyFelosztas.php b/mayor-orig/www/include/modules/naplo/stat/tantargyFelosztas.php
deleted file mode 100644
index a78cb70b..00000000
--- a/mayor-orig/www/include/modules/naplo/stat/tantargyFelosztas.php
+++ /dev/null
@@ -1,236 +0,0 @@
-'getDiakLetszamByStatusz','modul'=>'naplo_intezmeny','result'=>'keyvaluepair'));
-	$q = "select statusz, count(*) as letszam from diak where nem='fiú' group by statusz";
-	$ret['fiú'] = db_query($q, array('fv'=>'getDiakLetszamByStatusz/fiú','modul'=>'naplo_intezmeny','result'=>'keyvaluepair'));
-	$q = "select statusz, count(*) as letszam from diak where nem='lány' group by statusz";
-	$ret['lány'] = db_query($q, array('fv'=>'getDiakLetszamByStatusz/lány','modul'=>'naplo_intezmeny','result'=>'keyvaluepair'));
-
-	return $ret;
-
-    }
-
-    function getDiakLetszamByOsztalyId($osztalyIds) {
-	if (is_array($osztalyIds) && count($osztalyIds)>0) {
-	    $q = "select osztalyId, count(*) as letszam from diak left join osztalyDiak using (diakId) 
-		where statusz in ('jogviszonyban van','magántanuló') and osztalyId in (".implode(',', array_fill(0, count($osztalyIds), '%u')).") group by osztalyId";
-	    $ret = db_query($q, array('fv'=>'getDiakLetszamByStatusz','modul'=>'naplo_intezmeny','result'=>'keyvaluepair','values'=>$osztalyIds));
-	    $q = "select osztalyId, count(*) as letszam from diak left join osztalyDiak using (diakId) 
-		where statusz in ('jogviszonyban van','magántanuló') and osztalyId in (".implode(',', array_fill(0, count($osztalyIds), '%u')).") and nem='fiú' group by osztalyId";
-	    $ret['fiú'] = db_query($q, array('fv'=>'getDiakLetszamByStatusz/fiú','modul'=>'naplo_intezmeny','result'=>'keyvaluepair','values'=>$osztalyIds));
-	    $q = "select osztalyId, count(*) as letszam from diak left join osztalyDiak using (diakId) 
-		where statusz in ('jogviszonyban van','magántanuló') and osztalyId in (".implode(',', array_fill(0, count($osztalyIds), '%u')).") and nem='lány' group by osztalyId";
-	    $ret['lány'] = db_query($q, array('fv'=>'getDiakLetszamByStatusz/lány','modul'=>'naplo_intezmeny','result'=>'keyvaluepair','values'=>$osztalyIds));
-
-	    return $ret;
-
-	} else {
-	    return false;
-	}
-    }
-
-    function getTanarLetszamByBesorolas() {
-	$q = "select besorolas, count(*) as letszam from tanar where statusz<>'jogviszonya lezárva' and statusz<>'külső óraadó' group by besorolas";
-	return db_query($q, array('fv'=>'getTanarLetszamByBesorolas','modul'=>'naplo_intezmeny','result'=>'keyvaluepair'));
-    }
-
-    function getTanarLetszamByStatusz() {
-	$q = "select statusz, count(*) as letszam from tanar group by statusz";
-	return db_query($q, array('fv'=>'getTanarLetszamByBesorolas','modul'=>'naplo_intezmeny','result'=>'keyvaluepair'));
-    }
-
-    function getTankorOraszamOsszesites($tankorTipusIds) {
-
-	$q = "select sum(oraszam/2) from tankorSzemeszter where tanev=".__TANEV;
-	$ret['összes'] = db_query($q, array('fv'=>'getTankorOraszamOsszesites','modul'=>'naplo_intezmeny','result'=>'value'));
-	$q = "select sum(oraszam/2) from tankorSzemeszter left join tankor using (tankorId) 
-	    where tankorTipusId in (".implode(',', array_fill(0, count($tankorTipusIds['óratervi']), '%u')).") and tanev=".__TANEV;
-	$ret['óratervi'] = db_query($q, array('fv'=>'getTankorOraszamOsszesites/óratervi','modul'=>'naplo_intezmeny','result'=>'value','values'=>$tankorTipusIds['óratervi']));
-	$q = "select sum(oraszam/2) from tankorSzemeszter left join tankor using (tankorId) 
-	    where tankorTipusId in (".implode(',', array_fill(0, count($tankorTipusIds['tanórán kívüli']), '%u')).") and tanev=".__TANEV;
-	$ret['tanórán kívüli'] = db_query($q, array('fv'=>'getTankorOraszamOsszesites/tanórán kívüli','modul'=>'naplo_intezmeny','result'=>'value','values'=>$tankorTipusIds['tanórán kívüli']));
-
-	return $ret;
-    }
-
-    function getTargyOraszamok($tankorTipusIds) {
-
-	$q = "select targyId, sum(oraszam/2) from tankorSzemeszter left join tankor using (tankorId) 
-	    where tanev=".__TANEV." group by targyId";
-	$ret['összes'] = db_query($q, array('fv'=>'getTargyOraszamok','modul'=>'naplo_intezmeny','result'=>'keyvaluepair'));
-	$q = "select targyId, sum(oraszam/2) from tankorSzemeszter left join tankor using (tankorId) 
-	    where tankorTipusId in (".implode(',', array_fill(0, count($tankorTipusIds['óratervi']), '%u')).") and tanev=".__TANEV." group by targyId";
-	$ret['óratervi'] = db_query($q, array('fv'=>'getTargyOraszamok/óratervi','modul'=>'naplo_intezmeny','result'=>'keyvaluepair','values'=>$tankorTipusIds['óratervi']));
-	$q = "select targyId, sum(oraszam/2) from tankorSzemeszter left join tankor using (tankorId) 
-	    where tankorTipusId in (".implode(',', array_fill(0, count($tankorTipusIds['tanórán kívüli']), '%u')).") and tanev=".__TANEV." group by targyId";
-	$ret['tanórán kívüli'] = db_query($q, array('fv'=>'getTargyOraszamok/tanórán kívüli','modul'=>'naplo_intezmeny','result'=>'keyvaluepair','values'=>$tankorTipusIds['tanórán kívüli']));
-
-	return $ret;
-    }
-
-    function getOsztalyOraszamok($osztalyIds, $tankorTipusIds) {
-
-	$q = "select osztalyId, sum(oraszam/2) from tankorSzemeszter left join tankorOsztaly using (tankorId) 
-	    where osztalyId in (".implode(',', array_fill(0, count($osztalyIds), '%u')).") 
-	    and tanev=".__TANEV." group by osztalyId";
-	$ret['összes'] = db_query($q, array('fv'=>'getOsztalyOraszamok','modul'=>'naplo_intezmeny','result'=>'keyvaluepair','values'=>$osztalyIds));
-	$q = "select osztalyId, sum(oraszam/2) from tankorSzemeszter left join tankor using (tankorId) left join tankorOsztaly using (tankorId)
-	    where tankorTipusId in (".implode(',', array_fill(0, count($tankorTipusIds['óratervi']), '%u')).") 
-	    and osztalyId in (".implode(',', array_fill(0, count($osztalyIds), '%u')).") 
-	    and tanev=".__TANEV." group by osztalyId";
-	$v = array_merge($tankorTipusIds['óratervi'], $osztalyIds);
-	$ret['óratervi'] = db_query($q, array('fv'=>'getOsztalyOraszamok/óratervi','modul'=>'naplo_intezmeny','result'=>'keyvaluepair','values'=>$v));
-	$q = "select osztalyId, sum(oraszam/2) from tankorSzemeszter left join tankor using (tankorId) left join tankorOsztaly using (tankorId)
-	    where tankorTipusId in (".implode(',', array_fill(0, count($tankorTipusIds['tanórán kívüli']), '%u')).") 
-	    and osztalyId in (".implode(',', array_fill(0, count($osztalyIds), '%u')).") 
-	    and tanev=".__TANEV." group by osztalyId";
-	$v = array_merge($tankorTipusIds['tanórán kívüli'], $osztalyIds);
-	$ret['tanórán kívüli'] = db_query($q, array('fv'=>'getOsztalyOraszamok/tanórán kívüli','modul'=>'naplo_intezmeny','result'=>'keyvaluepair','values'=>$v));
-
-	return $ret;
-    }
-
-    function getTankorLetszamStat() {
-	global $_TANEV;
-	$r = getTankorByTanev(__TANEV);
-	foreach ($r as $idx => $tAdat) {
-	    $return[ $tAdat['targyId'] ]['tankorIds'][] = $tAdat['tankorId'];
-	    $letszam = getTankorLetszam($tAdat['tankorId'], array('refDt'=>$_TANEV['kezdesDt']));
-	    $return[ $tAdat['targyId'] ]['sum'] += $letszam;
-	    $return[ $tAdat['targyId'] ]['db']++;
-	    if ($return[ $tAdat['targyId'] ]['max'] < $letszam) $return[ $tAdat['targyId'] ]['max'] = $letszam;
-	    if (!isset($return[ $tAdat['targyId'] ]['min']) || $return[ $tAdat['targyId'] ]['min'] > $letszam) $return[ $tAdat['targyId'] ]['min'] = $letszam;
-	}
-	return $return;
-    }
-
-
-function getTantargyfelosztasStat() {
-
-    // __TANEV és __INTEZMENY függés!!
-
-    global $ADAT;
-
-    // ---- ---- ---- ----
-    $ADAT['evfolyamJelek'] = getEvfolyamJelek(array('result'=>'idonly'));
-    $ADAT['tankorTipusok'] = getTankorTipusok();
-    foreach ($ADAT['tankorTipusok'] as $tankorTipusId => $tAdat) $ADAT['tankorTipusIds'][$tAdat['oratervi']][] = $tankorTipusId;
-    // Ha módosul, akkor javítani kell a fenntarto/naplo/tantargyfelosztas alatt is!!
-    $ADAT['finanszírozott pedagógus létszám'] = array(
-        'általános iskola'                              => 11.8, // 11.8 tanuló / 1 pedagógus
-        'gimnázium'                                     => 12.5, // 12.5 tanuló / 1 pedagógus
-        'szakiskola, Híd programok'                     => 12,   // ...
-        'szakközépiskola, nem szakkképző évfolyam'      => 12.4,
-        'szakközépiskola, szakkképző évfolyam'          => 13.7
-    ); // -- TODO szakgimnázium???
-
-
-
-    $IA['intezmenyAdat'] = getIntezmenyByRovidnev(__INTEZMENY);
-    $IA['osztalyAdat'] = getOsztalyok(__TANEV, array('result' => 'assoc', 'minden'=>false, 'telephelyId' => null));
-    foreach ($IA['osztalyAdat'] as $idx => $oAdat) $IA['osztalyIds'][] = $oAdat['osztalyId'];
-    $IA['targyAdat'] = getTargyAdatByIds();
-
-    $IA['diakLetszam']['statusz'] = getDiakLetszamByStatusz();
-    $IA['diakLetszam']['osztaly'] = getDiakLetszamByOsztalyId($IA['osztalyIds']);
-    foreach ($IA['diakLetszam']['osztaly'] as $osztalyId => $letszam)
-        if (is_numeric($osztalyId)) $IA['diakLetszam']['evfolyamJel'][ $IA['osztalyAdat'][$osztalyId]['evfolyamJel'] ]['összes'] += intval($letszam);
-    foreach ($IA['diakLetszam']['osztaly']['fiú'] as $osztalyId => $letszam)
-        if (is_numeric($osztalyId)) $IA['diakLetszam']['evfolyamJel'][ $IA['osztalyAdat'][$osztalyId]['evfolyamJel'] ]['fiú'] += intval($letszam);
-    foreach ($IA['diakLetszam']['osztaly']['lány'] as $osztalyId => $letszam)
-        if (is_numeric($osztalyId)) $IA['diakLetszam']['evfolyamJel'][ $IA['osztalyAdat'][$osztalyId]['evfolyamJel'] ]['lány'] += intval($letszam);
-    $IA['tanarLetszam']['besorolas'] = getTanarLetszamByBesorolas();
-    $IA['tanarLetszam']['statusz'] = getTanarLetszamByStatusz();
-    $IA['oraszamok'] = getTankorOraszamOsszesites($ADAT['tankorTipusIds']);
-    $IA['targyOraszamok'] = getTargyOraszamok($ADAT['tankorTipusIds']);
-    $IA['osztalyOraszamok'] = getOsztalyOraszamok($IA['osztalyIds'], $ADAT['tankorTipusIds']);
-    foreach ($IA['osztalyOraszamok']['összes'] as $osztalyId => $oraszam) {
-        $IA['evfolyamOraszamok']['összes'][ $IA['osztalyAdat'][$osztalyId]['evfolyamJel'] ] += intval($oraszam);
-        $IA['evfolyamOraszamok']['óratervi'][ $IA['osztalyAdat'][$osztalyId]['evfolyamJel'] ] += intval($IA['osztalyOraszamok']['óratervi'][$osztalyId]);
-        $IA['evfolyamOraszamok']['tanórán kívüli'][ $IA['osztalyAdat'][$osztalyId]['evfolyamJel'] ] += intval($IA['osztalyOraszamok']['tanórán kívüli'][$osztalyId]);
-    }
-    $egyhaziE = ($IA['intezmenyAdat']['fenntarto']=='egyházi');
-    foreach ($IA['osztalyAdat'] as $osztalyId => $osztalyAdat) {
-        $IA['osztalyIdokeret'][$osztalyId] = getOsztalyHetiIdokeret($osztalyId, $osztalyAdat, array('egyhaziE'=>$egyhaziE));
-        $IA['osztalyIdokeret']['összesen']['összes'] += $IA['osztalyIdokeret'][$osztalyId]['összes'];
-        $IA['osztalyIdokeret']['összesen']['engedélyezett'] += $IA['osztalyIdokeret'][$osztalyId]['engedélyezett'];
-        $IA['osztalyIdokeret']['összesen']['tehetséggondozás-felzárkóztatás'] += $IA['osztalyIdokeret'][$osztalyId]['tehetséggondozás-felzárkóztatás'];
-        $IA['osztalyIdokeret']['összesen']['egyházi'] += $IA['osztalyIdokeret'][$osztalyId]['egyházi'];
-        $IA['osztalyIdokeret']['összesen']['gimnázium'] += $IA['osztalyIdokeret'][$osztalyId]['gimnázium'];
-        $IA['osztalyIdokeret']['összesen']['nemzetiségi'] += $IA['osztalyIdokeret'][$osztalyId]['nemzetiségi'];
-        if (in_array($osztalyAdat['osztalyJellegId'], array(21,22)) && in_array($osztalyAdat['evfolyamJel'], array('1','2','3','4'))) {
-            $IA['osztalyIdokeret']['alsó']['összes'] += $IA['osztalyIdokeret'][$osztalyId]['összes'];
-            $IA['osztalyIdokeret']['alsó']['engedélyezett'] += $IA['osztalyIdokeret'][$osztalyId]['engedélyezett'];
-            $IA['osztalyIdokeret']['alsó']['tehetséggondozás-felzárkóztatás'] += $IA['osztalyIdokeret'][$osztalyId]['tehetséggondozás-felzárkóztatás'];
-            $IA['osztalyIdokeret']['alsó']['egyházi'] += $IA['osztalyIdokeret'][$osztalyId]['egyházi'];
-            $IA['osztalyIdokeret']['alsó']['gimnázium'] += $IA['osztalyIdokeret'][$osztalyId]['gimnázium'];
-            $IA['osztalyIdokeret']['alsó']['nemzetiségi'] += $IA['osztalyIdokeret'][$osztalyId]['nemzetiségi'];
-        }
-        if (in_array($osztalyAdat['osztalyJellegId'], array(21,23)) && in_array($osztalyAdat['evfolyamJel'], array('5','6','7','8'))) {
-            $IA['osztalyIdokeret']['felső']['összes'] += $IA['osztalyIdokeret'][$osztalyId]['összes'];
-            $IA['osztalyIdokeret']['felső']['engedélyezett'] += $IA['osztalyIdokeret'][$osztalyId]['engedélyezett'];
-            $IA['osztalyIdokeret']['felső']['tehetséggondozás-felzárkóztatás'] += $IA['osztalyIdokeret'][$osztalyId]['tehetséggondozás-felzárkóztatás'];
-            $IA['osztalyIdokeret']['felső']['egyházi'] += $IA['osztalyIdokeret'][$osztalyId]['egyházi'];
-            $IA['osztalyIdokeret']['felső']['gimnázium'] += $IA['osztalyIdokeret'][$osztalyId]['gimnázium'];
-            $IA['osztalyIdokeret']['felső']['nemzetiségi'] += $IA['osztalyIdokeret'][$osztalyId]['nemzetiségi'];
-        }
-        if (in_array($osztalyAdat['osztalyJellegId'], array(21,22,23)) && in_array($osztalyAdat['evfolyamJel'], array('1','2','3','4','5','6','7','8'))) {
-            $IA['osztalyIdokeret']['általános']['összes'] += $IA['osztalyIdokeret'][$osztalyId]['összes'];
-            $IA['osztalyIdokeret']['általános']['engedélyezett'] += $IA['osztalyIdokeret'][$osztalyId]['engedélyezett'];
-            $IA['osztalyIdokeret']['általános']['tehetséggondozás-felzárkóztatás'] += $IA['osztalyIdokeret'][$osztalyId]['tehetséggondozás-felzárkóztatás'];
-            $IA['osztalyIdokeret']['általános']['egyházi'] += $IA['osztalyIdokeret'][$osztalyId]['egyházi'];
-            $IA['osztalyIdokeret']['általános']['gimnázium'] += $IA['osztalyIdokeret'][$osztalyId]['gimnázium'];
-            $IA['osztalyIdokeret']['általános']['nemzetiségi'] += $IA['osztalyIdokeret'][$osztalyId]['nemzetiségi'];
-        }
-        if (in_array($osztalyAdat['osztalyJellegId'], array(51,52,53,61,62,63)) && in_array($osztalyAdat['evfolyamJel'], array('1','2','3','4','5','6','7','8'))) {
-            $IA['osztalyIdokeret']['gimnázium18']['összes'] += $IA['osztalyIdokeret'][$osztalyId]['összes'];
-            $IA['osztalyIdokeret']['gimnázium18']['engedélyezett'] += $IA['osztalyIdokeret'][$osztalyId]['engedélyezett'];
-            $IA['osztalyIdokeret']['gimnázium18']['tehetséggondozás-felzárkóztatás'] += $IA['osztalyIdokeret'][$osztalyId]['tehetséggondozás-felzárkóztatás'];
-            $IA['osztalyIdokeret']['gimnázium18']['egyházi'] += $IA['osztalyIdokeret'][$osztalyId]['egyházi'];
-            $IA['osztalyIdokeret']['gimnázium18']['gimnázium'] += $IA['osztalyIdokeret'][$osztalyId]['gimnázium'];
-            $IA['osztalyIdokeret']['gimnázium18']['nemzetiségi'] += $IA['osztalyIdokeret'][$osztalyId]['nemzetiségi'];
-        }
-        if (in_array($osztalyAdat['osztalyJellegId'], array(31,32,33,34,35,36,51,52,53,61,62,63)) && in_array($osztalyAdat['evfolyamJel'], array('9','10','11','12'))) {
-            $IA['osztalyIdokeret']['gimnázium92']['összes'] += $IA['osztalyIdokeret'][$osztalyId]['összes'];
-            $IA['osztalyIdokeret']['gimnázium92']['engedélyezett'] += $IA['osztalyIdokeret'][$osztalyId]['engedélyezett'];
-            $IA['osztalyIdokeret']['gimnázium92']['tehetséggondozás-felzárkóztatás'] += $IA['osztalyIdokeret'][$osztalyId]['tehetséggondozás-felzárkóztatás'];
-            $IA['osztalyIdokeret']['gimnázium92']['egyházi'] += $IA['osztalyIdokeret'][$osztalyId]['egyházi'];
-            $IA['osztalyIdokeret']['gimnázium92']['gimnázium'] += $IA['osztalyIdokeret'][$osztalyId]['gimnázium'];
-            $IA['osztalyIdokeret']['gimnázium92']['nemzetiségi'] += $IA['osztalyIdokeret'][$osztalyId]['nemzetiségi'];
-        }
-        if (in_array($osztalyAdat['osztalyJellegId'], array(31,32,33,34,35,36,51,52,53,61,62,63))) {
-            $IA['osztalyIdokeret']['gimnázium']['összes'] += $IA['osztalyIdokeret'][$osztalyId]['összes'];
-            $IA['osztalyIdokeret']['gimnázium']['engedélyezett'] += $IA['osztalyIdokeret'][$osztalyId]['engedélyezett'];
-            $IA['osztalyIdokeret']['gimnázium']['tehetséggondozás-felzárkóztatás'] += $IA['osztalyIdokeret'][$osztalyId]['tehetséggondozás-felzárkóztatás'];
-            $IA['osztalyIdokeret']['gimnázium']['egyházi'] += $IA['osztalyIdokeret'][$osztalyId]['egyházi'];
-            $IA['osztalyIdokeret']['gimnázium']['gimnázium'] += $IA['osztalyIdokeret'][$osztalyId]['gimnázium'];
-            $IA['osztalyIdokeret']['gimnázium']['nemzetiségi'] += $IA['osztalyIdokeret'][$osztalyId]['nemzetiségi'];
-        }
-        // Finanszírozott pedagógus létszámhoz diáklészámok osztály-típusonként
-        if (in_array($osztalyAdat['osztalyJellegId'], array(21,22,23))) { // általános iskola
-            $IA['diakLetszam']['általános iskola'] += $IA['diakLetszam']['osztaly'][$osztalyId];
-        } else if (in_array($osztalyAdat['osztalyJellegId'], array(31,32,33,34,35,36,51,52,53,61,62,63,65))) { // gimnázium
-            $IA['diakLetszam']['gimnázium'] += $IA['diakLetszam']['osztaly'][$osztalyId];
-        } else if (in_array($osztalyAdat['osztalyJellegId'], array(82,83,84,85,91,92,93))) { // szakiskola, Híd programok
-            $IA['diakLetszam']['szakiskola, Híd programok'] += $IA['diakLetszam']['osztaly'][$osztalyId];
-        } else if (in_array($osztalyAdat['osztalyJellegId'], array(71,72,73,74,75,76,77,78,79))) { // szakközépiskola, nem szakképző évfolyam
-            $IA['diakLetszam']['szakközépiskola, nem szakkképző évfolyam'] += $IA['diakLetszam']['osztaly'][$osztalyId];
-        } else if (in_array($osztalyAdat['osztalyJellegId'], array())) { // szakközépiskola, szakképző évfolyam
-            $IA['diakLetszam']['szakközépiskola, szakképző évfolyam'] += $IA['diakLetszam']['osztaly'][$osztalyId];
-        }
-    } // osztályok
-    $IA['tankorLetszamStat'] = getTankorLetszamStat();
-    // ---- ---- ---- ----
-
-    return $IA;
-
-}
-
-
-?>
\ No newline at end of file
diff --git a/mayor-orig/www/include/modules/naplo/tanev/checkStatus.php b/mayor-orig/www/include/modules/naplo/tanev/checkStatus.php
deleted file mode 100644
index a2d97afb..00000000
--- a/mayor-orig/www/include/modules/naplo/tanev/checkStatus.php
+++ /dev/null
@@ -1,33 +0,0 @@
- 'checkStatus/1', 'modul' => 'naplo', 'result' => 'value'), $lr);
-                                                                                                                                                                                 
-        $q = "SELECT COUNT(*) AS db FROM orarendiOra WHERE tolDt <= curdate() AND igDt >= curdate()";                                                                                  
-        $R['orakSzama'] = db_query($q, array('fv' => 'checkStatus/2', 'modul' => 'naplo', 'result' => 'value'), $lr);                                                            
-                                                                                                                                                                                 
-        $q = "SELECT DISTINCT orarendiOra.tanarId, orarendiOra.targyJel, orarendiOra.osztalyJel
-                FROM orarendiOra LEFT JOIN orarendiOraTankor USING(tanarId, targyJel, osztalyJel)                                                                                
-                WHERE tankorId IS NULL";                                                                                                                                         
-
-        $R['hianyzoTankor'] = db_query($q, array('fv' => 'checkStatus/3', 'modul' => 'naplo', 'result' => 'indexed'),$lr);
-
-        $q = "SELECT DISTINCT orarendiOra.tanarId, orarendiOra.targyJel, orarendiOra.osztalyJel
-                FROM orarendiOraTankor LEFT JOIN orarendiOra USING(tanarId, targyJel, osztalyJel)                                                                                
-                WHERE tanarId IS NULL";                                                                                                                                         
-
-        $R['hianyzoOra'] = db_query($q, array('fv' => 'checkStatus/3', 'modul' => 'naplo', 'result' => 'indexed'),$lr);
-
-	$R['vizsgaltDt'] = date('Y-m-d');
-                                                                                                                                                                                 
-        if ($olr == '') db_close($lr);                                                                                                                                           
-        
-	return $R;
-                                                                                                                                                                      
-    }
-?>
diff --git a/mayor-orig/www/include/modules/naplo/tanev/fogadoOra.php b/mayor-orig/www/include/modules/naplo/tanev/fogadoOra.php
deleted file mode 100644
index 4aaf4016..00000000
--- a/mayor-orig/www/include/modules/naplo/tanev/fogadoOra.php
+++ /dev/null
@@ -1,142 +0,0 @@
-NOW() ORDER BY tol";
-	$dts = db_query($q, array('fv' => 'getKovetkezoFogadoDt', 'modul' => 'naplo', 'result' => 'indexed'));
-	$ret = array('dates' => array(), 'tol' => array(), 'ig' => array());
-	if (is_array($dts)) for ($i = 0; $i < count($dts); $i++) {
-	    $dt = substr($dts[$i]['tol'],0,10);
-	    if (!in_array($dt, $ret['dates'])) $ret['dates'][] = $dt;
-	    $ret['tol'][] = $dts[$i]['tol'];
-	    $ret['ig'][] = $dts[$i]['ig'];
-	}
-	return $ret;
-    }
-
-    function getTanarFogadoOra($tanarId) {
-	$v = array($tanarId);
-	$q = "SELECT * FROM ".__TANEVDBNEV.".fogadoOra WHERE tanarId=%u AND ig>=NOW()";
-	$ret['adatok'] = db_query($q, array('fv' => 'getTanarFogadoOra', 'modul' => 'naplo', 'result' => 'record', 'values' => $v));
-	if (!is_array($ret['adatok']) || count($ret['adatok']) == 0) $ret['adatok'] = array('tanarId' => $tanarId);
-
-	$q = "SELECT * FROM ".__TANEVDBNEV.".fogadoOraJelentkezes WHERE tanarId=%u AND tol>=CURDATE()";
-	$ret['jelentkezesek'] = db_query($q, array('fv' => 'getTanarFogadoOra', 'modul' => 'naplo', 'result' => 'assoc', 'keyfield' => 'tol', 'values' => $v));
-
-	return $ret;
-    }
-
-    function getFogadoOsszes() {
-	// Hogy ABC szerint legyen inkább...
-	$q = "SELECT fogadoOra.* FROM ".__TANEVDBNEV.".fogadoOra LEFT JOIN ".__INTEZMENYDBNEV.".tanar USING (tanarId) WHERE ig>=NOW() 
-	    ORDER BY CONCAT_WS(' ',viseltCsaladinev,viseltUtonev),tol,ig,teremId";
-	$ret = db_query($q, array('fv' => 'getFogadoOsszes', 'modul' => 'naplo', 'result' => 'indexed'));
-	return $ret;
-    }
-
-    function kovetkezoFogadoOraInit($tol, $ig) {
-	// Egyszerre mindig csak egy következő fogadó óra lehet - törlés
-	$q = "DELETE FROM fogadoOra WHERE tol>=NOW() OR tol>='$tol'";
-	$r = db_query($q, array('fv' => 'kovetkezoFogadoFelvetele', 'modul' => 'naplo'));
-	// A szülői jelentkezések is törlődnek ekkor
-	$q = "DELETE FROM fogadoOraJelentkezes WHERE tol>=NOW() OR tol>='$tol'";
-	$r = db_query($q, array('fv' => 'kovetkezoFogadoFelvetele', 'modul' => 'naplo'));
-	// minden tanárra beállítjuk a megadott tol-ig értéket
-	$q = "INSERT INTO fogadoOra (tanarId,tol,ig)
-		SELECT tanarId, '%s','%s' FROM ".__INTEZMENYDBNEV.".tanar
-		WHERE beDt<='%s' and (kiDt is null or kiDt >= '%s');";
-	$r = db_query($q, array('fv' => 'kovetkezoFogadoFelvetele', 'modul' => 'naplo', 'values' => array($tol, $ig, $ig, $tol)));
-    }
-
-    function tanarFogadoOra($tanarId, $tol, $ig, $teremId) {
-	if ($teremId == '') $teremId = 'NULL';
-	// Ha van bejegyzett fogadóóra, akkor töröljük
-	$q = "DELETE FROM fogadoOra WHERE ig>NOW() AND tanarId=%u";
-	db_query($q, array('fv' => 'tanarFogadoOra', 'modul' => 'naplo', 'values' => array($tanarId)));
-	// Új fogadóóra felvétele
-	if (isset($teremId) && $teremId > 0) {
-	    $q = "INSERT INTO fogadoOra VALUES (%u, '%s', '%s',  %u)";
-	} else {
-	    $q = "INSERT INTO fogadoOra VALUES (%u, '%s', '%s',  NULL)";
-	}
-	$v = array($tanarId, $tol, $ig, $teremId);
-	db_query($q, array('fv' => 'tanarFogadoOra', 'modul' => 'naplo', 'values' => $v));
-
-	// A szülői jelentkezések is törlődnek ekkor
-	$q = "DELETE FROM fogadoOraJelentkezes WHERE tanarId=%u AND (tol<'%s' OR tol>='%s')";
-	$v = array($tanarId, $tol, $ig);
-	return db_query($q, array('fv' => 'tanarFogadoOra', 'modul' => 'naplo', 'values' => $v));
-	
-    }
-
-    function getSzuloJelentkezes($szuloId) {
-	$q = "SELECT * FROM ".__TANEVDBNEV.".fogadoOraJelentkezes WHERE szuloId=%u AND tol>=NOW() ORDER BY tol";
-	return db_query($q, array('fv' => 'getSzuloJelentkezes', 'modul' => 'naplo', 'result' => 'assoc', 'keyfield' => 'tanarId', 'values' => array($szuloId)));
-    }
-
-    function fogadoOraJelentkezes($szuloId, $M) {
-
-	$lr = db_connect('naplo');
-
-	for ($i = 0; $i < count($M); $i++) {
-	    $tanarId = $M[$i]['tanarId'];
-	    $datetime = $M[$i]['datetime'];
-	    if (isset($datetime)) {
-		// Egy már felvett jelentkezésről van-e szó
-		$q = "SELECT COUNT(*) FROM ".__TANEVDBNEV.".fogadoOraJelentkezes WHERE tol='%s' AND tanarId=%u AND szuloId=%u";
-		$v = array($datetime, $tanarId, $szuloId);
-		$db = db_query($q, array('fv' => 'fogadoOraJelentkezes', 'modul' => 'naplo', 'result' => 'value', 'values' => $v), $lr);
-		if ($db > 0) continue;
-
-		// Van-e már a szülőnek, vagy a tanárnak bejegyzése az adott időpontra
-		$q = "SELECT * FROM ".__TANEVDBNEV.".fogadoOraJelentkezes WHERE tol='%s' AND (tanarId=%u OR szuloId=%u) LIMIT 1";
-		$v = array($datetime, $tanarId, $szuloId);
-		$r = db_query($q, array('fv' => 'fogadoOraJelentkezes', 'modul' => 'naplo', 'result' => 'indexed', 'values' => $v), $lr);
-		if (!is_array($r) || count($r) == 1) {
-		    //$_SESSION['alert'][] = 'message:wrong_data:fogadoOraJelentkezes:foglalt:'."$szuloId/$tanarId/$datetime";
-                    $_SESSION['alert'][] = 'message:fogadoora_foglalt:'.str_replace(':','.',$datetime).':foglalt:'."$szuloId/$tanarId/$datetime";
-		    continue;
-		}
-		// Van-e a tanárnak az adtott időpontban fogadóórája
-		$q = "SELECT * FROM fogadoOra WHERE tanarId=%u AND tol<='%s' AND '%s' 'fogadoOraJelentkezes', 'modul' => 'naplo', 'result' => 'indexed', 'values' => $v), $lr);
-		if (!is_array($r) || count($r) == 0) {
-		    //$_SESSION['alert'][] = 'message:wrong_data:fogadoOraJelentkezes:nincs fogadóórája:'."szuloId/$tanarId/$datetime";
-                    $_SESSION['alert'][] = 'message:fogadoora_nincs:'.$datetime.":szuloId/$tanarId/$datetime";
-		    continue;
-		}
-	    }
-
-	    db_start_trans($lr);
-	    // Töröljük a korrábbi jelentkezést és felvesszük az újat
-	    $q = "DELETE FROM fogadoOraJelentkezes WHERE szuloId=%u AND tanarId=%u AND tol>=NOW()";
-	    $v = array($szuloId, $tanarId);
-	    $r = db_query($q, array('rollback' => true, 'fv' => 'fogadoOraJelentkezes', 'modul' => 'naplo', 'values' => $v), $lr);
-	    // Ha csak törlés volt, akkor tovább
-	    if (!isset($datetime)) { db_commit($lr); continue; }
-
-	    // Felvesszük az új jelentkezést
-	    $q = "INSERT INTO fogadoOraJelentkezes (szuloId, tanarId, tol) VALUES (%u, %u, '%s')";
-	    $v = array($szuloId, $tanarId, $datetime);
-	    $r = db_query($q, array('rollback' => true, 'fv' => 'fogadoOraJelentkezes', 'modul' => 'naplo', 'values' => $v), $lr);	    
-	    db_commit($lr);
-	}
-
-	db_close($lr);
-
-    }
-	
-
-    function getFogadoOraLista() {
-
-	$q = "SELECT * FROM ".__TANEVDBNEV.".fogadoOra LEFT JOIN ".__INTEZMENYDBNEV.".terem USING (teremId) WHERE ig>=NOW()";
-	$ret['adatok'] = db_query($q, array('fv' => 'getFogadoOraLista', 'modul' => 'naplo', 'result' => 'assoc', 'keyfield' => 'tanarId'));
-
-	$q = "SELECT * FROM ".__TANEVDBNEV.".fogadoOraJelentkezes WHERE tol>=CURDATE() ORDER BY tanarId,tol";
-	$ret['jelentkezesek'] = db_query($q, array('fv' => 'getFogadoOraLista', 'modul' => 'naplo', 'result' => 'multiassoc', 'keyfield' => 'tanarId'));
-
-	return $ret;
-
-    }
-
-?>
diff --git a/mayor-orig/www/include/modules/naplo/tanev/munkaterv.php b/mayor-orig/www/include/modules/naplo/tanev/munkaterv.php
deleted file mode 100644
index a27528a0..00000000
--- a/mayor-orig/www/include/modules/naplo/tanev/munkaterv.php
+++ /dev/null
@@ -1,152 +0,0 @@
-'initNapok','table'=>'nap'));
-
-	$Hetek = $ADAT['Hetek'];
-        $lr = db_connect('naplo', array('fv' => 'initNapok'));
-
-	db_start_trans($lr);
-
-        $q = "DELETE FROM munkaterv";
-        $r[] = db_query($q, array('fv' => 'initNapok', 'modul' => 'naplo'), $lr);
-
-	/* Munkaterv */
-	    $q = "INSERT INTO munkaterv (munkatervId,munkatervNev,tanitasiNap,tanitasNelkuliMunkanap,vegzosZarasDt) VALUES (1,'alapértelmezett',%u,%u,'%s')";
-	    $v = array($ADAT['tanitasiNap'], $ADAT['tanitasNelkuliMunkanap'], $ADAT['vegzosZarasDt']);
-            $r[] = db_query($q, array('fv' => 'initNapok1', 'modul' => 'naplo', 'values' => $v), $lr);
-
-	    $q = "INSERT INTO munkatervOsztaly (munkatervId,osztalyId) SELECT 1 AS `munkatervId`,`osztalyId` FROM `".__INTEZMENYDBNEV."`.`osztaly` WHERE vegzoTanev>=%u AND kezdoTanev<=%u";
-	    $v = array(__TANEV,__TANEV);
-            $r[] = db_query($q, array('fv' => 'initNapok2', 'modul' => 'naplo', 'values' => $v), $lr);
-	/* --- */
-
-	$kovetkezoTanevAdat = getTanevAdat(__TANEV+1); 
-	if (strtotime($kovetkezoTanevAdat['kezdesDt']) > strtotime($kovetkezoTanevAdat['zarasDt']))
-	{
-	    $_SESSION['alert'][] = 'alert:Hiba, a következő ('.(__TANEV+1).') tanév előbb végződik, mint kezdődik! Van következő tanév? (admin/tanévek megnyitása menüpont)';
-	    $r[] = false;
-	}
-
-	$tanevVege = date('Y-m-d',strtotime('-1 days',strtotime($kovetkezoTanevAdat['kezdesDt'])));
-	$r[] = napokHozzaadasa(__TANEV, $_TANEV['kezdesDt'], $tanevVege, $_TANEV, $lr);
-
-	orarendiHetekHozzarendelese($_TANEV['kezdesDt'], $_TANEV['zarasDt'], $Hetek, $lr);
-
-	if (in_array(false,$r)) {
-	    db_rollback($lr);
-    	    db_close($lr);
-	    return false;
-	} else {
-	    db_commit($lr);
-    	    db_close($lr);
-    	    $_SESSION['alert'][] = 'info:success';
-	    return true;
-	}
-
-    }
-
-    function ujMunkaterv($ADAT) {
-
-	$q = "INSERT INTO munkaterv (munkatervNev,tanitasiNap,tanitasNelkuliMunkanap,vegzosZarasDt) VALUES 
-		('%s',%u,%u,'%s')";
-	$v = array($ADAT['munkatervNev'], $ADAT['tanitasiNap'], $ADAT['tanitasNelkuliMunkanap'], $ADAT['vegzosZarasDt']);
-        $munkatervId = db_query($q, array('fv' => 'ujMunkaterv/munkaterv', 'modul' => 'naplo', 'values' => $v, 'result' => 'insert'), $lr);
-
-	if (!$munkatervId) { return false; }
-
-	$q = "INSERT INTO nap SELECT dt, tipus, megjegyzes, orarendiHet, %u AS munkatervId, csengetesiRendTipus FROM nap WHERE munkatervId=%u";
-	$v = array($munkatervId, $ADAT['munkatervId']);
-	$r = db_query($q, array('fv' => 'ujMunkaterv/nap', 'modul' => 'naplo', 'values' => $v), $lr);
-
-	if (!$r) { return false; }
-
-	return $munkatervId;
-
-    }
-
-    function munkatervModositas($Dt, $Tipus, $Megjegyzes, $OrarendiHet, $Hetek, $munkatervId = 1, $csengetesiRendTipus) {
-
-	global $_TANEV;
-
-	logAction(
-	    array(
-		'szoveg'=>'munkaterv módosítás',
-		'table'=>'nap'
-	    )
-	);
-	$lr = db_connect('naplo', array('fv' => 'munkatervModositas'));
-	db_start_trans($lr);
-        for ($i = 0; $i < count($Dt); $i++) {	    
-	    $dt = $Dt[$i];
-	    $time = strtotime($dt);
-	    $tipus = $Tipus[$i];
-	    $megjegyzes = $Megjegyzes[$i]; 
-	    $_csengetesiRendTipus = $csengetesiRendTipus[$i]; 
-	    if ($tipus == 'tanítási nap') {
-		$orarendiHet = $OrarendiHet[$i];
-		if ($orarendiHet == 0) { // most állítjuk be tanítási napnak, és nem rendelkeztek az órarendi hétről...
-		    // kérdezzük le, hogy van-e másik munkatervben már megadott órarendi hét erre a napra
-		    $q = "SELECT orarendiHet FROM nap WHERE dt='%s' AND orarendiHet<>0";
-		    $v = array($dt);
-		    $orarendiHet = db_query($q, array('fv' => 'munkatervModositas/hianyzoOrarendiHet','modul'=>'naplo', 'values'=>$v, 'result'=>'value'), $lr);
-		    if ($orarendiHet === false) { db_rollback($lr); db_close($lr); return false; }
-		    if (is_null($orarendiHet)) { // nincs beállítva órarendi hét --> legyen a $Hetek első eleme...
-			$orarendiHet = $Hetek[0];
-		    }
-		}
-	    } else {
-		// Ha nem tanítási nap, akkor nincs értelme órarendi hetet beállítani --> 0
-		$orarendiHet = 0;
-	    }
-	    if (
-		($time >= strtotime($_TANEV['kezdesDt']) && $time <= strtotime($_TANEV['zarasDt']))
-		&& ($tipus != 'tanítási nap' || count($Hetek) == 0 || in_array($orarendiHet, $Hetek))
-	    ) {
-		$q = "UPDATE nap SET csengetesiRendTipus='%s',tipus='%s', megjegyzes='%s' WHERE dt='%s' AND munkatervId=%u";
-		$v = array($_csengetesiRendTipus, $tipus, $megjegyzes, $dt, $munkatervId);
-		$r = db_query($q, array('fv' => 'munkatervModositas/típus, megjegyzés', 'modul' => 'naplo', 'values' => $v), $lr);
-		if (!$r) { db_rollback($lr); db_close($lr); return(false); }
-		// Az órarendi hét módosítás mindig az összes munkatervet érinti!!
-		if ($orarendiHet != 0) {
-		    $q = "UPDATE nap SET orarendiHet=%u WHERE dt='%s' AND tipus='tanítási nap'";
-		    $v = array($orarendiHet, $dt);
-		} else  {
-		    $q = "UPDATE nap SET orarendiHet=%u WHERE dt='%s' AND munkatervId=%u";
-		    $v = array($orarendiHet, $dt, $munkatervId);
-		}
-		$r = db_query($q, array('fv' => 'munkatervModositas/órarendiHét', 'modul' => 'naplo', 'values' => $v), $lr);
-		if (!$r) { db_rollback($lr); db_close($lr); return(false); }
-	    } else {
-		$_SESSION['alert'][] = 'message:wrong_data:munkatervModositas:'.$dt.':'.$tipus.'/'.$orarendiHet;
-	    }
-        }
-	db_commit($lr);
-	db_close($lr);
-	return true;
-
-    }
-
-    function munkatervOsztaly($ADAT) {
-
-	$r = array();
-	for ($i = 0; $i < count($ADAT['osztalyIds']); $i++) {
-
-	    $osztalyId = $ADAT['osztalyIds'][$i];
-	    $munkatervId = $ADAT['ujMunkatervIds'][$i];
-	    $q = "UPDATE munkatervOsztaly SET munkatervId='%u' WHERE osztalyId=%u";
-	    $v = array($munkatervId, $osztalyId);
-	    $r[] = db_query($q, array('fv' => 'munkatervOsztaly', 'modul' => 'naplo', 'values' => $v));
-
-	}
-	return !in_array(false, $r);
-
-    }
-
-?>
diff --git a/mayor-orig/www/include/modules/naplo/tanev/tankorBlokk.php b/mayor-orig/www/include/modules/naplo/tanev/tankorBlokk.php
deleted file mode 100644
index 6b15bdeb..00000000
--- a/mayor-orig/www/include/modules/naplo/tanev/tankorBlokk.php
+++ /dev/null
@@ -1,277 +0,0 @@
- 0) {
-	    $WHERE[] = 'tankorId IN ('.implode(',', array_fill(0, count($tankorIds), '%u')).')';
-	    $v = $tankorIds;
-	}
-	if (isset($blokkId) && intval($blokkId) > 0) {
-	    $WHERE[] = "blokkId != %u";
-	    $v[] = intval($blokkId);
-	}
-	if (count($WHERE) > 0) $whereStr = "WHERE ".implode(' AND ', $WHERE);
-
-	$return = array();
-	// tankörök export óraszáma (az aktuális blokk kivételével)
-	$q = "SELECT tankorId, SUM(exportOraszam) AS exportOraszam FROM `%s`.tankorBlokk
-		    LEFT JOIN `%s`.blokk USING (blokkId) 
-		    $whereStr GROUP BY tankorId";
-	array_unshift($v, $tanevDbNev, $tanevDbNev);
-	return db_query($q, array('fv' => 'getTankorExportOraszamByTanev', 'modul' => 'naplo', 'result' => 'keyvaluepair', 'keyfield' => 'tankorId', 'values' => $v), $lr);
-
-    }
-
-    function ujTankorBlokk($blokkNev, $exportOraszam, $tankorIds, $tanev='') {
-
-	global $_TANEV;
-
-	if (!is_array($tankorIds) || count($tankorIds)==0 || $blokkNev=='') {
-	    $_SESSION['alert'][] = '::egy kötelező paraméter hiányzik!';
-	    return false;
-	}
-
-	if ($tanev=='') {
-	    $tanev = __TANEV;
-	    $tanevAdat = $_TANEV;
-	} else {
-	    $tanevAdat = getTanevAdat($tanev);
-	}
-
-	$tanevDbNev = tanevDbNev(__INTEZMENY, $tanev);
-
-	if (strtotime($tanevAdat['zarasDt']) < time()) {
-	    $_SESSION['alert'][] = 'message:Elmúlt tanévre ne hozzunk létre tankörblokkot!';
-	    return false;
-	}
-	if (time() < strtotime($tanevAdat['kezdesDt']))	{
-	    $kezdesDt = $tanevAdat['kezdesDt'];
-	    $kezdesDtPattern = "'%s'";
-	} else {
-	    $kezdesDt = 'CURDATE()';
-	    $kezdesDtPattern = '%s';
-	}
-	$zarasDt  = $tanevAdat['zarasDt'];
-
-	/* Vizsgáljuk meg, hogy létrehozható-e a tankorBlokk 
-	    kizáró feltétel, ha egy diák beletartozik több csoportba HAVING count>2
-	*/
-
-	$lr = db_connect('naplo', array('fv' => 'ujTankorBlokk'));
-
-	// Ellenőrzés - tankör - diákok
-	$q = "SELECT diakId,COUNT(DISTINCT tankorId) AS c FROM ".__INTEZMENYDBNEV.".tankorDiak 
-		WHERE tankorId IN (".implode(',', array_fill(0, count($tankorIds), '%u')).")
-		AND beDt <= '%s' AND (kiDt IS NULL OR kiDt >= $kezdesDtPattern)
-		GROUP BY diakId HAVING c>1
-		ORDER BY tankorId,diakId";
-//		AND jelenlet='kötelező'
-	/* Ez a függvény nem veszi figyelembe a felmentéseket! */
-
-	$_SESSION['alert'][] = 'info:!!!:ujTankorBlokk() felmentések';
-
-	$v = mayor_array_join($tankorIds, array($zarasDt, $kezdesDt));
-	$ret=db_query($q, array('fv' => 'ujTankorBlokk', 'modul' => 'naplo_intezmeny', 'result' => 'indexed', 'values' => $v));
-	if (count( $ret ) > 0) {
-	    $_SESSION['alert'][] = 'message:wrong_data:ujTankorBlokk:Sikertelen. '.count($ret).' db ütköző diákot találtam!: diakId='.$ret[0]['diakId'].'...';
-	    db_close($lr);
-	    return false;
-	}
-
-	// Ellenőrzés - tankör - tanárok
-	$q = "SELECT tanarId,COUNT(DISTINCT tankorId) AS c FROM ".__INTEZMENYDBNEV.".tankorTanar 
-		WHERE tankorId IN (".implode(',', array_fill(0, count($tankorIds), '%u')).")
-		AND beDt <= '%s' AND (kiDt IS NULL OR kiDt >= $kezdesDtPattern)
-		GROUP BY tanarId HAVING c>1
-		ORDER BY tankorId,tanarId";
-	$v = mayor_array_join($tankorIds, array($zarasDt, $kezdesDt));
-	$ret = db_query($q, array('fv' => 'ujTankorBlokk', 'modul' => 'naplo_intezmeny', 'result' => 'indexed', 'values' => $v));
-	if (count( $ret ) > 0) {
-	    $_SESSION['alert'][] = 'message:wrong_data:ujTankorBlokk:Sikertelen. '.count($ret).' db ütköző tanárt találtam!:tanarId='.$ret[0]['tanarId'].'...';
-	    db_close($lr);
-	    return false;
-	}
-
-	// Ellenőrzés - óraszám
-	// tankörök export óraszáma (az aktuális blokk kivételével)
-	$tankorExportOraszam = getTankorExportOraszamByTanev($tanev, $tankorIds);
-	// tankörök óraszáma
-	$tankorOraszam = getTankorOraszamByTanev($tanev, $tankorIds);
-	foreach ($tankorIds as $index => $tankorId) {
-	    if ($tankorOraszam[$tankorId] - $tankorExportOraszam[$tankorId] < $exportOraszam)
-		$exportOraszam = $tankorOraszam[$tankorId] - $tankorExportOraszam[$tankorId];
-	}
-	if ($exportOraszam < 0) $exportOraszam = 0;	
-	db_start_trans($lr);
-
-	// Új felvétele
-	$q = "INSERT INTO `%s`.`blokk` (`blokkNev`, `exportOraszam`) VALUES ('%s', %f)";
-	$v = array($tanevDbNev, $blokkNev, $exportOraszam);
-
-	$blokkId = db_query($q, array('fv' => 'ujTankorBlokk', 'modul' => 'naplo_intezmeny', 'result' => 'insert', 'values' => $v, 'rollback' => true), $lr);
-	if ($blokkId === false) { db_close($lr); return false; }
-
-	// Tankörök hozzárendelése
-	$Val = array(); $v = array($tanevDbNev);
-	for ($i = 0; $i < count($tankorIds); $i++) {
-	    $Val[] = "(%u, %u)";
-	    array_push($v, $blokkId, $tankorIds[$i]);
-	}
-	$q = "INSERT INTO `%s`.tankorBlokk (blokkId,tankorId) VALUES ".implode(',', $Val);
-	$r = db_query($q, array('fv' => 'ujTankorBlokk', 'modul' => 'naplo_intezmeny', 'values' => $v, 'rollback' => true), $lr);
-	if (!$r) { db_close($lr); return false; }
-
-	db_commit($lr);
-	db_close($lr);
-	return true;
-
-    }
-
-    function tankorBlokkModositas($ADAT) {
-
-
-	if (!is_array($ADAT['tankorIds']) || count($ADAT['tankorIds'])==0 || $ADAT['blokkNev']=='') {
-	    $_SESSION['alert'][] = '::egy kötelező paraméter hiányzik!(tbmod)';
-	    return false;
-	}
-
-	if ($ADAT['tanev']=='') {
-	    $tanev = __TANEV;
-	    $tanevAdat = $_TANEV;
-	} else {
-	    $tanev = $ADAT['tanev'];
-	    $tanevAdat = getTanevAdat($tanev);
-	}
-	
-	$tanevDbNev = tanevDbNev(__INTEZMENY, $tanev);
-
-	if (strtotime($tanevAdat['zarasDt']) < time()) {
-	    $_SESSION['alert'][] = 'message:Elmúlt tanévre ne hozzunk létre tankörblokkot!';
-	    return false;
-	}
-	$blokkId = $ADAT['blokkId'];
-	$tankorIds = $ADAT['tankorIds'];
-
-	$zarasDt  = $tanevAdat['zarasDt'];
-	if (time() < strtotime($tanevAdat['kezdesDt']))	{
-	    $kezdesDt = $tanevAdat['kezdesDt'];
-	    $kezdesDtPattern = "'%s'";
-	} else {
-	    $kezdesDt = 'CURDATE()';
-	    $kezdesDtPattern = "%s";
-	}
-
-	$lr = db_connect('naplo');
-
-	// Ellenőrizzük a tankör tagokat - azonosak-e tankörönként
-	$q = "SELECT diakId,COUNT(DISTINCT tankorId) AS c FROM ".__INTEZMENYDBNEV.".tankorDiak 
-		WHERE tankorId IN (".implode(',', array_fill(0, count($ADAT['tankorIds']), '%u')).")
-		AND beDt <= '%s' AND (kiDt IS NULL OR kiDt >= $kezdesDtPattern)
-		GROUP BY diakId HAVING c>1
-		ORDER BY tankorId,diakId";
-
-	$v = mayor_array_join($ADAT['tankorIds'], array($zarasDt, $kezdesDt));
-	$ret = db_query($q, array('fv' => 'tankorBlokkModositas', 'modul' => 'naplo_intezmeny', 'result' => 'indexed', 'values' => $v), $lr);
-	if (count( $ret ) > 0) {
-	    $_SESSION['alert'][] = 'message:wrong_data:tankorBlokkModositas:Sikertelen. '.count($ret).' db ütköző diákot találtam!:diakId='.$ret[0]['diakId'].'...';
-	    db_close($lr);
-	    return false;
-	}
-
-	// Ellenőrizzük a tankör tanárokat - azonosak-e tankörönként
-	$q = "SELECT tanarId,COUNT(DISTINCT tankorId) AS c FROM ".__INTEZMENYDBNEV.".tankorTanar 
-		WHERE tankorId IN (".implode(',', array_fill(0, count($ADAT['tankorIds']), '%u')).")
-		AND beDt <= '%s' AND (kiDt IS NULL OR kiDt >= $kezdesDtPattern)
-		GROUP BY tanarId HAVING c>1
-		ORDER BY tankorId,tanarId";
-	$v = mayor_array_join($ADAT['tankorIds'], array($zarasDt, $kezdesDt));
-	$ret = db_query($q, array('fv' => 'tankorBlokkModositas', 'modul' => 'naplo_intezmeny', 'result' => 'indexed', 'values' => $v), $lr);
-	if (count( $ret )>0) {
-	    $_SESSION['alert'][] = 'message:wrong_data:tankorBlokkModositas:Sikertelen. '.count($ret).' db ütköző tanárt találtam!:blokkId='.$blokkId.':tanarId='.$ret[0]['tanarId'].'...';
-	    db_close($lr);
-	    return false;
-	}
-
-	// tankörök export óraszáma (az aktuális blokk kivételével)
-	$tankorExportOraszam = getTankorExportOraszamByTanev($tanev, $ADAT['tankorIds'], $blokkId);
-	// tankörök óraszáma
-	$tankorOraszam = getTankorOraszamByTanev($tanev, $ADAT['tankorIds']);
-	foreach ($ADAT['tankorIds'] as $index => $tankorId) {
-	    if ($tankorOraszam[$tankorId] - $tankorExportOraszam[$tankorId] < $ADAT['exportOraszam']) {
-		$_SESSION['alert'][] = 'message:wrong_data:tankorId='.$tankorId.', óraszám='.$tankorOraszam[$tankorId].', export óraszám='.
-		    intval($tankorExportOraszam[$tankorId]).', blokk óraszám='.$ADAT['exportOraszam'];
-		return false;
-	    }
-	}
-
-	// Csoportnév és export óraszám módosítása
-	$q = "UPDATE `%s`.blokk SET blokkNev='%s',exportOraszam=%f WHERE blokkId=%u";
-	$v = array($tanevDbNev, $ADAT['blokkNev'], $ADAT['exportOraszam'], $ADAT['blokkId']);
-	db_query($q, array('fv' => 'tankorBlokkModositas', 'modul' => 'naplo', 'values' => $v), $lr);
-
-	// SAFE:
-	db_start_trans($lr);
-
-	    // Törlés
-	    $q = "DELETE FROM `%s`.tankorBlokk WHERE blokkId=%u";
-	    $v = array($tanevDbNev, $blokkId);
-	    $r = db_query($q, array('fv' => 'tankorBlokkModositas/Delete', 'modul' => 'naplo_intezmeny', 'values' => $v, 'rollback' => true), $lr);
-	    if ($r === false) { db_close($lr); return false; }
-	    // Itt nem jó a commit, hisz még félben van a dolog - nem? // else db_commit($lr);
-
-	    // Tankörök hozzárendelése
-	    $v = array($tanevDbNev); $Val = array();
-	    for ($i = 0; $i < count($tankorIds); $i++) {
-		$Val[] = "(%u, %u)";
-		array_push($v, $blokkId, $tankorIds[$i]);
-	    }
-	    if (count($Val) > 0) {
-		$q = "INSERT INTO `%s`.tankorBlokk (blokkId,tankorId) VALUES ".implode(',', $Val);
-		$r = db_query($q, array('fv' => 'tankorBlokkModositas/Insert', 'modul' => 'naplo_intezmeny', 'values' => $v, 'rollback' => true), $lr);
-	    }
-
-	    if ($r===false) { db_close($lr); return false; }
-
-	db_commit($lr);
-
-	db_close($lr);
-	return true;
-
-    }
-
-    function tankorBlokkTorles($ADAT) {
-
-	if ($ADAT['blokkId']=='') {
-	    $_SESSION['alert'][] = '::egy kötelező paraméter hiányzik!';
-	    return false;
-	}
-
-	if ($ADAT['tanev']=='') {
-	    $tanev = __TANEV;
-	    $tanevAdat = $_TANEV;
-	} else {
-	    $tanev = $ADAT['tanev'];
-	    $tanevAdat = getTanevAdat($tanev);
-	}
-	
-	$tanevDbNev = tanevDbNev(__INTEZMENY, $tanev);
-
-	$blokkId=intval($ADAT['blokkId']);
-
-	$q = "DELETE FROM `%s`.blokk WHERE blokkId=%u";
-	$v = array($tanevDbNev, $blokkId);
-	$r = db_query($q, array('fv' => 'TankorBlokk|Delete', 'modul' => 'naplo_intezmeny', 'values' => $v, 'rollback'=>true), $lr);
-
-	return true;
-
-    }
-
-?>
diff --git a/mayor-orig/www/include/modules/naplo/tanev/tankorCsoport.php b/mayor-orig/www/include/modules/naplo/tanev/tankorCsoport.php
deleted file mode 100644
index 984726db..00000000
--- a/mayor-orig/www/include/modules/naplo/tanev/tankorCsoport.php
+++ /dev/null
@@ -1,164 +0,0 @@
- 'tankorCsoport', 'modul' => 'naplo', 'result' => 'multiassoc', 'keyfield' => 'csoportId', 'values' => $tankorIds
-	    ));
-
-    }
-
-    function ujTankorCsoport($csoportNev, $tankorIds) {
-
-	global $_TANEV;
-	$dt = (time() <= strtotime($_TANEV['kezdesDt'])) ? "'".$_TANEV['kezdesDt']."'" : 'CURDATE()';
-
-	$lr = db_connect('naplo', array('fv' => 'ujTankorCsoport'));
-
-	// Ellenőrizzük, hogy a megadott tankörök még nem foglaltak
-	$q = "SELECT tankorId FROM ".__TANEVDBNEV.".tankorCsoport
-		WHERE tankorId IN (".implode(',', array_fill(0, count($tankorIds), '%u')).") LIMIT 1";
-	$ret = db_query($q, array('fv' => 'ujTankorCsoport', 'modul' => 'naplo', 'result' => 'indexed', 'values' => $tankorIds), $lr);
-	if (count($ret) > 0) {
-	    $_SESSION['alert'][] = 'message:utkozes:ujTankorCsoport:tankör ütközés';
-	    db_close($lr);
-	    return false;
-	}
-	
-	// Ellenőrizzük a tankör tagokat - azonosak-e tankörönként
-	$q = "SELECT DISTINCT tankorId,diakId FROM ".__INTEZMENYDBNEV.".tankorDiak 
-		WHERE tankorId IN (".implode(',', array_fill(0, count($tankorIds), '%u')).")
-		AND beDt <= '%s' AND (kiDt IS NULL OR kiDt >= '%s')
-		ORDER BY tankorId,diakId";
-	$v = mayor_array_join($tankorIds, array($dt, $dt));
-	$ret = db_query($q, array('fv' => 'ujTankorCsoport', 'modul' => 'naplo', 'result' => 'indexed', 'values' => $v), $lr);
-	$tDiakok = array();
-	foreach ($tankorIds as $tankorId) $tDiakok[$tankorId] = array(); // különben az üres tankör nem jelennemeg az ellenőrzéskor!
-	for ($i = 0; $i < count($ret); $i++) {
-	    $tDiakok[$ret[$i]['tankorId']][] = $ret[$i]['diakId'];
-	}
-	foreach ($tDiakok as $tankorId => $diakIds) {
-	    if (is_array($elsoDiakIds)) {
-		if ($elsoDiakIds != $diakIds) {
-		    $_SESSION['alert'][] = 'message:wrong_data:ujTankorCsoport:tankör tagok nem azonosak:(tankorId='.$tankorId.')';
-		    db_close($lr);
-		    return false;
-		}
-	    } else {
-		$elsoDiakIds = $diakIds;
-	    }
-	}
-
-	// Új csoport felvétele
-	$q = "INSERT INTO ".__TANEVDBNEV.".csoport (csoportNev) VALUES ('%s')";
-	$csoportId = db_query($q, array('fv' => 'ujTankorCsoport', 'modul' => 'naplo', 'result' => 'insert', 'values' => array($csoportNev)), $lr);
-	if ($csoportId === false) { db_close($lr); return false; }
-
-	// Tankörök hozzárendelése
-	$v = $Val = array();
-	for ($i = 0; $i < count($tankorIds); $i++) {
-	    $Val[] = "(%u, %u)";
-	    array_push($v, $csoportId, $tankorIds[$i]);
-	}
-	$q = "INSERT INTO ".__TANEVDBNEV.".tankorCsoport (csoportId,tankorId) VALUES ".implode(',', $Val);
-	db_query($q, array('fv' => 'ujTankorCsoport', 'modul' => 'naplo', 'values' => $v), $lr);
-
-	_setMinMax($csoportId,$lr);
-
-	db_close($lr);
-	return true;
-
-    }
-
-    function tankorCsoportModositas($csoportId, $csoportNev, $tankorIds) {
-
-	global $_TANEV;
-	$dt = (time() <= strtotime($_TANEV['kezdesDt'])) ? "'".$_TANEV['kezdesDt']."'" : 'CURDATE()';
-
-	if (count($tankorIds) == 0) {
-	    $_SESSION['alert'][] = 'message:wrong_data:tankorCsoportModositas/#0:nincs tankör';
-	    return false;
-	}
-
-	$lr = db_connect('naplo');
-
-	// Ellenőrizzük, hogy a megadott tankörök még nem foglaltak
-	$q = "SELECT tankorId FROM ".__TANEVDBNEV.".tankorCsoport
-		WHERE tankorId IN (".implode(',', array_fill(0, count($tankorIds), '%u')).") AND csoportId != %u LIMIT 1";
-	$v = mayor_array_join($tankorIds, array($csoportId));
-	$ret = db_query($q, array('fv' => 'tankorCsoportModositas/#1', 'modul' => 'naplo', 'result' => 'indexed', 'values' => $v), $lr);
-	if (count($ret) > 0) {
-	    $_SESSION['alert'][] = 'message:utkozes:tankorCsoportModositas/#2:tankör ütközés';
-	    db_close($lr);
-	    return false;
-	}
-
-	// Ellenőrizzük a tankör tagokat - azonosak-e tankörönként
-	$q = "SELECT tankorId,diakId FROM ".__INTEZMENYDBNEV.".tankorDiak 
-		WHERE tankorId IN (".implode(',', array_fill(0, count($tankorIds), '%u')).")
-		AND beDt <= '%s' AND (kiDt IS NULL OR kiDt >= '%s' )
-		ORDER BY tankorId,diakId";
-	$v = mayor_array_join($tankorIds, array($dt, $dt));
-	$ret = db_query($q, array('fv' => 'tankorCsoportModositas/#3', 'modul' => 'naplo_intezmeny', 'result' => 'indexed', 'values' => $v), $lr);
-	$tDiakok = array();
-	for ($i = 0; $i < count($ret); $i++) $tDiakok[$ret[$i]['tankorId']][] = $ret[$i]['diakId'];
-	foreach ($tankorIds as $index => $tankorId) {
-	    $diakIds = $tDiakok[$tankorId];
-	    if (is_array($elsoDiakIds)) {
-		if ($elsoDiakIds != $diakIds) {
-		    $_SESSION['alert'][] = 'message:wrong_data:tankorCsoportModositas/#4:tankör tagok nem azonosak:(tankorId='.$tankorId.')';
-		    db_close($lr);
-		    return false;
-		}
-	    } else {
-		$elsoDiakIds = $diakIds;
-	    }
-	}
-
-	// Csoportnév módosítása
-	$q = "UPDATE ".__TANEVDBNEV.".csoport SET csoportNev = '%s' WHERE csoportId = %u";
-	$v = array($csoportNev, $csoportId);
-	db_query($q, array('fv' => 'tankorCsoportModositas', 'modul' => 'naplo', 'values' => $v));
-	// Régi csoporthozzárendelések törlése
-	$q = "DELETE FROM ".__TANEVDBNEV.".tankorCsoport WHERE csoportId = %u";
-	$v = array($csoportId);
-	db_query($q, array('fv' => 'tankorCsoportModositas', 'modul' => 'naplo', 'values' => $v));
-	// Tankörök hozzárendelése
-	$v = $Val = array();
-	for ($i = 0; $i < count($tankorIds); $i++) {
-	    $Val[] = "(%u, %u)";
-	    array_push($v, $csoportId, $tankorIds[$i]);
-	}
-	$q = "INSERT INTO ".__TANEVDBNEV.".tankorCsoport (csoportId,tankorId) VALUES ".implode(',', $Val);
-	db_query($q, array('fv' => 'tankorCsoportModositas/#5', 'modul' => 'naplo', 'values' => $v));
-
-	_setMinMax($csoportId,$lr);
-
-	db_close($lr);
-	return true;
-
-    }
-
-    function tankorCsoportTorles($csoportId, $tanev = __TANEV) {
-	$tanevDb = tanevDbNev(__INTEZMENY, $tanev);
-	$q = "DELETE FROM `%s`.csoport WHERE csoportId=%u";
-	$v = array($tanevDb, $csoportId);
-	db_query($q, array('fv' => 'tankorCsoportTorles', 'modul' => 'naplo', 'values' => $v));
-    }
-
-    function _setMinMax($csoportId,$lr) {
-
-	// Tankörcsoport minimum, maximum beállítás - legbővebb halmaz
-	$v = array($csoportId);
-	$q = ("SET @min= (SELECT MIN(min) FROM ".__INTEZMENYDBNEV.".tankor WHERE tankorId IN (SELECT DISTINCT tankorId FROM tankorCsoport WHERE csoportId=%u))");
-	db_query($q, array('fv' => 'ujTankorCsoport', 'modul' => 'naplo', 'values' => $v), $lr);
-	$q = ("SET @max= (SELECT MAX(max) FROM ".__INTEZMENYDBNEV.".tankor WHERE tankorId IN (SELECT DISTINCT tankorId FROM tankorCsoport WHERE csoportId=%u))");
-	db_query($q, array('fv' => 'ujTankorCsoport', 'modul' => 'naplo', 'values' => $v), $lr);
-	$q = "UPDATE ".__INTEZMENYDBNEV.".tankor SET min=@min, max=@max WHERE tankorId IN (SELECT DISTINCT tankorId FROM tankorCsoport WHERE csoportId=%u)";
-	db_query($q, array('fv' => 'ujTankorCsoport', 'modul' => 'naplo', 'values' => $v), $lr);
-
-    }
-
-?>
diff --git a/mayor-orig/www/include/modules/naplo/tanev/targyBontas.php b/mayor-orig/www/include/modules/naplo/tanev/targyBontas.php
deleted file mode 100644
index 5b31bdec..00000000
--- a/mayor-orig/www/include/modules/naplo/tanev/targyBontas.php
+++ /dev/null
@@ -1,240 +0,0 @@
-'checkTargyBontas','modul'=>'naplo','result'=>'value'));
-	return ($darab>0?TRUE:FALSE);
-    }
-
-    function getKepzesTargyBontasByOsztalyIds($osztalyIds) {
-
-	if (!is_array($osztalyIds) || count($osztalyIds)==0) return false;
-
-	// tankör- és óraszám adatok
-	$q = "SELECT bontasId, tankorId, hetiOraszam 
-		FROM kepzesTargyBontas LEFT JOIN bontasTankor USING (bontasId)
-		WHERE osztalyId IN (".implode(',', array_fill(0, count($osztalyIds), '%u')).") AND tankorId IS NOT NULL
-		ORDER BY bontasId";
-	$r = db_query($q, array('fv'=>'getKepzesTargyBontasByOsztalyIds/2','modul'=>'naplo','result'=>'indexed','values'=>$osztalyIds));
-	foreach ($r as $a) $TO[$a['bontasId']][] = array('tankorId'=>$a['tankorId'], 'hetiOraszam'=>$a['hetiOraszam']);
-
-	// kepzesTargyBontas adatok
-	$q = "SELECT kepzesTargyBontas.*,sum(hetiOraszam) as hetiOraszam 
-		FROM kepzesTargyBontas LEFT JOIN bontasTankor USING (bontasId)
-		WHERE osztalyId IN (".implode(',', array_fill(0, count($osztalyIds), '%u')).") 
-		GROUP BY bontasId ORDER BY bontasId";
-	$r = db_query($q, array('fv'=>'getKepzesTargyBontasByOsztalyIds','modul'=>'naplo','result'=>'indexed','values'=>$osztalyIds));
-	if (!is_array($r)) return $r;
-	$return = array();
-	foreach ($r as $a) $return[$a['osztalyId']][$a['kepzesOratervId']][] = array(
-	    'bontasId' => $a['bontasId'], 
-	    'targyId' => $a['targyId'], 
-	    'hetiOraszam' => $a['hetiOraszam'], 
-	    'tankor-oraszam'=>$TO[ $a['bontasId'] ]
-	);
-
-	return $return;
-
-    }
-
-    function kepzesOratervSorrend($evfolyamJel, $osztalyIds, $kepzesIds) {
-		// ez volt  // group_concat(kepzesTargyBontas.targyId order by kepzesTargyBontas.targyId separator '-') as btStr 
-	
-	$q = "select 
-		kepzesOratervId, tipus, targyNev, kepzesOraterv.targyId as targyId, kepzesOraterv.hetiOraszam as hetiOraszam, osztalyId, kepzesId, szemeszter,
-		group_concat(concat_ws('-',kepzesTargyBontas.targyId,tankorId,bontasTankor.hetiOraszam) order by kepzesTargyBontas.targyId,tankorId separator '_') as btStr
-		from kepzesOraterv
-		left join targy using (targyId) 
-		left join kepzesOsztaly using (kepzesId) 
-		left join ".__TANEVDBNEV.".kepzesTargyBontas using (kepzesOratervId, osztalyId)
-		left join ".__TANEVDBNEV.".bontasTankor using (bontasId) 
-		where evfolyamJel='%s' and osztalyId in (".implode(',', array_fill(0, count($osztalyIds), '%u')).") 
-		and kepzesId in (".implode(',', array_fill(0, count($kepzesIds), '%u')).") 
-		group by kepzesOratervId, tipus, kepzesOraterv.targyId, kepzesOraterv.hetiOraszam, osztalyId, kepzesId, szemeszter
-		order by tipus, targyNev, kepzesOraterv.targyId, kepzesOraterv.hetiOraszam, btStr, osztalyId, szemeszter";
-	$v = mayor_array_join(array($evfolyamJel), $osztalyIds, $kepzesIds);
-	$ret = db_query($q, array('fv'=>'kepzesOratervSorrend','modul'=>'naplo_intezmeny','result'=>'indexed','values'=>$v));
-	return reindex($ret, array('tipus','targyId','hetiOraszam','btStr'));
-    }
-
-    function addBontas($osztalyId, $kepzesOratervId, $targyId=null, $olr=null) {
-
-	// is_resource mysqli esetén nem jó (object)
-	if (!$olr) $lr = db_connect('naplo_intezmeny', array('fv'=>'addBontas'));
-	else $lr = $olr;
-
-	if ($targyId == '') {
-	    $q = "SELECT targyId FROM kepzesOraterv WHERE kepzesOratervId=%u";
-	    $targyId = db_query($q, array('fv'=>'addBontas','modul'=>'naplo_intezmeny','result'=>'value','values'=>array($kepzesOratervId)), $lr);
-	}
-	if ($targyId == '') return false;
-
-	$q = "INSERT INTO ".__TANEVDBNEV.".kepzesTargyBontas (osztalyId, kepzesOratervId, targyId) VALUES (%u, %u, %u)";
-	$bontasId = db_query($q, array('fv'=>'addBontas/insert','modul'=>'naplo','result'=>'insert','values'=>array($osztalyId,$kepzesOratervId,$targyId)), $lr);
-
-	// is_resource mysqli esetán nem jó (object)
-	if (!$olr) db_close();
-
-	return array(
-	    'targyId' => $targyId,
-	    'osztalyId' => $osztalyId,
-	    'kepzesOratervId' => $kepzesOratervId,
-	    'bontasId' => $bontasId
-	);
-
-    }
-
-    function delBontas($bontasIds) {
-	if (!is_array($bontasIds) || count($bontasIds) == 0) return false;
-	$q = "DELETE FROM kepzesTargyBontas WHERE bontasId IN (".implode(',', array_fill(0, count($bontasIds), '%u')).")";
-	$r = db_query($q, array('fv'=>'delBontas','modul'=>'naplo','values'=>$bontasIds));
-	if ($r) return $bontasIds;
-	else return $r;
-    }
-
-    function initFromLastYear() {
-	// Csak akkor lehet init, ha még nincs bent egyetlen bontás sem az adott kepzes-osztály párokhoz
-	$q = "select count(*) from kepzesTargyBontas";
-	$db = db_query($q, array('fv'=>'kepzesTargyBontasInit/0','modul'=>'naplo','result'=>'value','values'=>$v));
-	if ($db > 0) return true;
-
-	$lr = db_connect('naplo_intezmeny', array('fv'=>'initFromLastYear'));
-	// is_resource mysqli esetén nem jó (object)
-	if (!$lr) return false;
-
-	$elozoTanevDb = tanevDbNev(__INTEZMENY,__TANEV-1);
-	// ha nincs előző tanév, akkor kész az init
-	$q = "SELECT COUNT(SCHEMA_NAME) FROM INFORMATION_SCHEMA.SCHEMATA WHERE SCHEMA_NAME = '%s'";
-	$v = array($elozoTanevDb);
-	$db = db_query($q, array('fv'=>'kepzesTargyBontasInit/0.5','modul'=>'naplo','result'=>'value','values'=>$v));
-	if ($db == 0) return true;
-
-	set_time_limit(300);
-
-	// Az előző év bontásai alapján
-	/*
-	    Lekérdezzük az előző év bontásainak adatait, melyek az adott kepzes-osztály párhoz tartoztak.
-	    bontasId szerint rendezünk, hogy egy bontást csak egyszer vegyünk fel.
-	*/
-	$q = "select kepzesOratervId,osztalyId,kepzesOraterv.targyId as koTargyId,kepzesTargyBontas.targyId as bontasTargyId,
-		    tankorId,bontasTankor.hetiOraszam as bontasOraszam, bontasId,
-		    kepzesId,evfolyamJel,szemeszter,kepzesOraterv.hetiOraszam as koOraszam,tipus 
-		from ".$elozoTanevDb.".kepzesTargyBontas 
-		left join ".$elozoTanevDb.".bontasTankor using (bontasId) 
-		left join kepzesOraterv using (kepzesOratervId)
-		order by bontasId";
-	$r1 = db_query($q, array('fv'=>'kepzesTargyBontasInit/1','modul'=>'naplo_intezmeny','result'=>'indexed'), $lr);
-
-	$elozoTavalyiBontasId = '';
-	foreach ($r1 as $r1Adat) {
-	    // Ha van a tavalyinak megfelelő képzés-óraterv bejegyzés, akkor hozzunk létre neki bontást
-	    if ($r1Adat['tipus'] == 'mintatantervi') {
-		    $q = "select kepzesOraterv.*,oraszam from kepzesOraterv 
-			left join tankorSzemeszter on tankorSzemeszter.szemeszter=kepzesOraterv.szemeszter and tanev=".__TANEV." and tankorId=%u 
-			where kepzesId=%u and kepzesOraterv.szemeszter=%u
-			and tipus='%s' and kepzesOraterv.targyId=%u 
-			and kepzesOraterv.evfolyamJel='".getKovetkezoEvfolyamJel($r1Adat['evfolyamJel'])."' 
-			";
-		    $v = array($r1Adat['tankorId'], $r1Adat['kepzesId'], $r1Adat['szemeszter'], $r1Adat['tipus'], $r1Adat['koTargyId']);
-	    } else {
-		    $q = "select * from kepzesOraterv 
-			left join tankorSzemeszter on tankorSzemeszter.szemeszter=kepzesOraterv.szemeszter and tanev=".__TANEV." and tankorId=%u 
-			where kepzesId=%u and kepzesOraterv.szemeszter=%u
-			and tipus='%s' and kepzesOraterv.targyId is null
-			and kepzesOraterv.evfolyamJel='".getKovetkezoEvfolyamJel($r1Adat['evfolyamJel'])."' 
-			";
-		    $v = array($r1Adat['tankorId'], $r1Adat['kepzesId'], $r1Adat['szemeszter'], $r1Adat['tipus'], );
-	    }
-	    $r2 = db_query($q, array('fv'=>'kepzesTargyBontasInit/2','modul'=>'naplo_intezmeny','result'=>'record','values'=>$v), $lr);
-	    /*
-		- Lehet az eredmény üres, ha nincs a képzés óratervben idén folytatása a tárgynak/típusnak
-	    */
-	    if (!is_array($r2)) continue; 
-	    /*
-		- Amúgy csak egy rekord lehet... - ekkor a bontást létrehozhatjuk, ha az előző rekord nem ugyanehhez a bontáshoz tartozott...
-		    (a hozzárendelt tankört csak akkor vesszük figyelembe, ha egy van belőle...)
-	    */
-	    if ($elozoTavalyiBontasId != $r1Adat['bontasId']) {
-		$r3 = addBontas($r1Adat['osztalyId'], $r2['kepzesOratervId'], $r1Adat['bontasTargyId'], $lr);
-		$bontasId = $r3['bontasId'];
-		$elozoTavalyiBontasId = $r1Adat['bontasId'];
-	    }
-
-	    if (($r1Adat['tankorId'] != '') && ($r1Adat['bontasOraszam'] == $r1Adat['koOraszam']) && ($r2['hetiOraszam'] == $r2['oraszam'])) {
-		/*
-		    Ha a tavalyi tankör idei évhez is hozzá van rendelve...
-			és tavaly megegyezett a tankör óraszáma a bontás óraszámával...
-			a tankör idei óraszáma is megegyezik a bontás/képzés-oraterv óraszámával, 
-		    akkor a tankör is hozzárendelhető		    
-		*/
-		$r4 = bontasTankor(array($bontasId), $r1Adat['tankorId'], $r2['hetiOraszam'], $lr);
-		if (!$r4) {} // hibakezelés??
-	    }
-	}
-	db_close($lr);
-	return true;
-    }
-
-    function kepzesTargyBontasInit($osztalyIds, $kepzesIds) {
-
-	// A megadott osztaly megadott képzéseinek aktuális évfolyamának tantárgyhoz tartozó kepzesOraterv bejegyzéseihez felveszünk egy-egy bontást - ha még nincs
-	$q = "insert into ".__TANEVDBNEV.".kepzesTargyBontas (osztalyId, kepzesOratervId, targyId) 
-		select osztalyId, kepzesOratervId, kepzesOraterv.targyId as targyId 
-		from kepzesOraterv left join kepzesOsztaly using(kepzesId) 
-		left join ".__TANEVDBNEV.".osztalyNaplo using (osztalyId)
-		left join ".__TANEVDBNEV.".kepzesTargyBontas using (osztalyId, kepzesOratervId) 
-		where osztalyId in (".implode(',', array_fill(0, count($osztalyIds), '%u')).") 
-		and kepzesId in (".implode(',', array_fill(0, count($kepzesIds), '%u')).") 
-		and kepzesOraterv.evfolyamJel=osztalyNaplo.evfolyamJel
-		and bontasId is null and kepzesOraterv.targyId is not null";
-	$v = mayor_array_join($osztalyIds, $kepzesIds);
-	return db_query($q, array('fv'=>'kepzesTargyBontasInit','modul'=>'naplo_intezmeny','result'=>'affected rows','values'=>$v));
-
-    }
-
-    function bontasTankor($bontasIds, $tankorId, $hetiOraszam, $olr = null) {
-
-	if (!is_array($bontasIds) || count($bontasIds) == 0 || $tankorId == '' || $hetiOraszam <= 0) {
-	    $_SESSION['alert'][] = 'message:empty_field:bontasTankor';
-	    return false;
-	}
-	// is_resource mysqli esetén nem jó (object)
-	if (!$olr) $lr = db_connect('naplo_intezmeny', array('fv'=>'bontasTankor'));
-	else $lr = $olr;
-
-    	db_start_trans($lr);
-	$ok=true;
-	/* 
-		Óraszám ellenőrzés - kellene itt is? 
-		    - tankör óraszáma: tankorBontás óraszám <= tankorSzemeszer óraszám
-		    - bontás óraszáma: bontás-óraszám <= kepzesOraterv óraszám
-		    - tipus szerint a tankörnek csak egyféle óraszáma lehet
-	*/
-
-	// Tankor-osztály hozzárendelés
-	$q = "insert into ".__INTEZMENYDBNEV.".tankorOsztaly (tankorId, osztalyId)
-		select distinct %u as tankorId, kepzesTargyBontas.osztalyId as osztalyId from ".__TANEVDBNEV.".kepzesTargyBontas 
-		left join ".__INTEZMENYDBNEV.".tankorOsztaly on kepzesTargyBontas.osztalyId=tankorOsztaly.osztalyId and tankorId=%u 
-		where bontasId in (".implode(',', array_fill(0, count($bontasIds), '%u')).") and tankorId is null";
-	$v = $bontasIds; array_unshift($v, $tankorId, $tankorId);
-	$r = db_query($q, array('fv'=>'bontasTankor/1','modul'=>'naplo','result'=>'affected rows','values'=>$v), $lr);
-	if ($r === false) { db_rollback($lr, 'tankör-osztály hozzárendelés'); if ($olr) db_close($lr); return false; } // is_resource mysqli esetén nem jó (object)
-	// bontasTankor rögzítése
-	foreach ($bontasIds as $bontasId) {
-	    $q = "insert into ".__TANEVDBNEV.".bontasTankor (bontasId, tankorId, hetiOraszam) values (%u, %u, %f)";
-	    $v = array($bontasId, $tankorId, $hetiOraszam);
-	    $r = db_query($q, array('fv'=>'bontasTankor/bt','modul'=>'naplo','values'=>$v), $lr);
-	    if ($r === false) { db_rollback($lr, 'tankörnév hozzárendelés'); if (!$olr) db_close($lr); return false; } // is_resource mysqli esetén nem jó (object)
-	}
-	db_commit($lr);
-
-	$r1 = setTankorNev($tankorId, $tankorNevExtra=null, $lr);
-	// is_resource mysqli esetén nem jó (object)
-	if (!$olr) db_close($lr);
-
-	return $r1; 
-    }
-
-
-?>
\ No newline at end of file
diff --git a/mayor-orig/www/include/modules/naplo/tanev/targyOraszam.php b/mayor-orig/www/include/modules/naplo/tanev/targyOraszam.php
deleted file mode 100644
index d17958d0..00000000
--- a/mayor-orig/www/include/modules/naplo/tanev/targyOraszam.php
+++ /dev/null
@@ -1,28 +0,0 @@
- 'getTargyOraszam', 'modul' => 'naplo_intezmeny', 'result' => 'assoc', 'keyfield' => 'targyNev', 'values' => $v));
-
-	foreach($R as $_tankorId => $D) {
-	    $R[$_tankorId]['tankorTanar'] = getTankorTanarai($tankorId);
-	}
-
-	return $R;
-
-    }
-
-    function getTargyOraszamEvfolyamonkent($tanev=__TANEV) {
-
-	$q = "SELECT SUM(oraszam)/(SELECT MAX(szemeszter) FROM szemeszter WHERE tanev=%u) AS db, targyNev FROM tankorSzemeszter 
-		LEFT JOIN tankor USING (tankorId) LEFT JOIN targy USING (targyId) WHERE tanev=%u GROUP BY targyid ORDER BY targyNev";
-	$v = array($tanev, $tanev);
-	return db_query($q, array('fv' => 'getTargyOraszamEvfolyamonkent', 'modul' => 'naplo_intezmeny', 'result' => 'assoc', 'keyfield' => 'targyNev', 'values' => $v));
-
-    }
-
-?>
diff --git a/mayor-orig/www/include/modules/naplo/tanev/vegzosOrarendLezaras.php b/mayor-orig/www/include/modules/naplo/tanev/vegzosOrarendLezaras.php
deleted file mode 100644
index b7f9acd0..00000000
--- a/mayor-orig/www/include/modules/naplo/tanev/vegzosOrarendLezaras.php
+++ /dev/null
@@ -1,33 +0,0 @@
-= '%s' AND (tanarId,osztalyJel,targyJel) IN (
-		    SELECT tanarId,osztalyJel,targyJel FROM orarendiOraTankor WHERE tankorId IN (".implode(',', array_fill(0, count($ADAT['vegzosTankor']), '%u')).")
-		)";
-	$v = mayor_array_join(array($ADAT['dt']), $ADAT['vegzosTankor']);
-	db_query($q, array('fv' => 'vegzosOrarendLezarads', 'modul' => 'naplo', 'values' => $v));
-
-	// A lezárás dátuma után végződő bejegyzáések igDt-inek beállítása
-	$q = "UPDATE orarendiOra LEFT JOIN orarendiOraTankor USING (tanarId,osztalyJel,targyJel) SET igDt=('%s' - INTERVAL 1 DAY)
-		WHERE tankorId IN (".implode(',', array_fill(0, count($ADAT['vegzosTankor']),'%u')).") AND igDt > '%s'";
-	$v = mayor_array_join(array($ADAT['dt']), $ADAT['vegzosTankor'], array($ADAT['dt']));
-	db_query($q, array('fv' => 'vegzosOrarendLezarads', 'modul' => 'naplo', 'values' => $v));
-
-    }
-
-    function vegzosHaladasiNaploLezaras($ADAT) {
-
-	$q = "DELETE FROM ora WHERE dt >= '%s' AND tankorId IN (".implode(',', array_fill(0, count($ADAT['vegzosTankor']), '%u')).")";
-	$v = mayor_array_join(array($ADAT['dt']), $ADAT['vegzosTankor']);
-	db_query($q, array('fv' => 'vegzosHaladasiNaploLezarads', 'modul' => 'naplo', 'values' => $v));
-
-    }
-
-?>
diff --git a/mayor-orig/www/include/modules/naplo/uzeno/uzeno.php b/mayor-orig/www/include/modules/naplo/uzeno/uzeno.php
deleted file mode 100644
index 71df3eae..00000000
--- a/mayor-orig/www/include/modules/naplo/uzeno/uzeno.php
+++ /dev/null
@@ -1,236 +0,0 @@
-0) define('__SZEREP','szulo');
-	elseif (__DIAK===true && defined('__USERDIAKID') && intval(__USERDIAKID)>0) define('__SZEREP','diak');
-	elseif (__UZENOADMIN===true) define('__SZEREP','admin');
-	else define(__SZEREP,'');
-*/
-    }
-
-    function getUzenoSzerep() {
-
-	if (__TANAR===true) $szerep = 'tanar';
-	elseif (__DIAK===true && defined('__PARENTDIAKID') && intval(__PARENTDIAKID)>0) $szerep = 'szulo';
-	elseif (__DIAK===true && defined('__USERDIAKID') && intval(__USERDIAKID)>0) $szerep = 'diak';
-	elseif (__UZENOADMIN===true) $szerep = 'admin';
-	else $szerep='';
-
-	return $szerep;
-
-    }
-
-    function uzenhet($kinek) {
-        global $UZENODENY;
-	if (is_null($UZENODENY[__SZEREP])) return true;
-        return (!in_array($kinek,$UZENODENY[__SZEREP]));
-    }
-
-    function getUzenoUzenetek($SET=array('tanev'=>__TANEV,'count'=>false,'filter'=>array(),'ignoreAdmin'=>false,'filterFlag'=>array(),'limits'=>array(),'order'=>'DESC')) {
-
-	$__SZEREP = __SZEREP; // cronból is szeretnénk használni
-
-	if (__SZEREP=='') return array();
-
-
-	$feladoId = setUzenoFeladoId();
-	$TIPUSOK = initUzenoTipusok(array('csakId'=>true,'result'=>'idonly','tanev'=>$SET['tanev'],'forRead'=>true));
-	$TIPUSOK[$__SZEREP][] = setUzenoFeladoId();
-
-	if (__UZENOADMIN===true && $SET['ignoreAdmin']===true) return array(); // skip useradmin (pl hirnok)
-
-	if (is_array($SET['filter']) && count($SET['filter'])>0) {
-	    for ($i=0; $i0) {
-	    for ($i=0; $i0) $WX = implode(' AND ',$X).' AND'; else $WX = '';
-	if (is_array($Y) && count($Y)>0) $HAVING = 'HAVING '.implode(' AND ',$Y); else $HAVING = '';
-
-	$JOINTABLE = "LEFT JOIN `$dbName`.`uzenoFlagek` ON (uzeno.mId=uzenoFlagek.mId AND Id=$feladoId AND Tipus='".$__SZEREP."')";
-
-	if (__UZENOADMIN!==true) {
-	    foreach ($TIPUSOK as $tipus=>$DATA) {
-		if (is_array($DATA) && count($DATA)>0) {
-		    $W[] = ' (cimzettTipus="'.$tipus.'" AND cimzettId IN ('.  implode(',',$DATA)   .')) ';
-		    $W[] = ' (cimzettTipus="'.$tipus.'" AND cimzettTipus=feladoTipus AND cimzettId=0) ';
-
-		}
-	    }
-	    $q  = "SELECT uzeno.*,uzenoFlagek.flag AS flag FROM $dbName.uzeno $JOINTABLE WHERE ".$WX." ((feladoId=$feladoId and feladoTipus='".$__SZEREP."') OR (".implode(' OR ',$W).")) $HAVING ORDER BY uzeno.mId ".$O.$L;
-	    $qc = "SELECT count(*) AS db FROM $dbName.uzeno WHERE ".$WX." ((feladoId=$feladoId and feladoTipus='".$__SZEREP."') OR (".implode(' OR ',$W)."))";
-	} else {
-	    // NOTE - nem minden id-nek az adatai lesznek lekérdezve később!!!
-	    $WX = ($WX=='')?'':'WHERE '.$WX.' 1=1';
-//	    $q = "SELECT uzeno.*,uzenoFlagek.flag AS flag FROM `$dbName`.uzeno $JOINTABLE ".$WX." $HAVING ORDER BY uzeno.mId DESC".$L;
-	    $q = "SELECT uzeno.* FROM `$dbName`.uzeno ".$WX." ORDER BY uzeno.mId DESC".$L;
-	    $qc= "SELECT count(*) AS db FROM $dbName.uzeno ".$WX;  
-	}
-	if ($SET['count']!==true)
-	    $result = db_query($q, array('fv' => 'getUzenoUzenetek/1', 'modul' => 'naplo_intezmeny', 'result' => 'indexed'));
-	else 
-	    $result = db_query($qc, array('fv' => 'getUzenoUzenetek/2', 'modul' => 'naplo_intezmeny', 'result' => 'value')); 
-	return $result ;
-
-    }
-
-    // getUzenoUzenetek-->
-    // pre-ből
-    function initUzenoTipusok($SET=array('csakId'=>true,'tanev'=>__TANEV,'forRead'=>false)) {
-	global $UZENODENY;
-
-	$TIPUSOK = array();
-	$feladoId = setUzenoFeladoId();
-	switch (__SZEREP) {
-	    case 'tanar': /* nem tiltható */
-		$TIPUSOK['tankorSzulo'] = $TIPUSOK['tankor'] = getTankorByTanarId($feladoId, $SET['tanev'], array('csakId' => $SET['csakId']));
-		$TIPUSOK['munkakozosseg'] = getMunkakozossegByTanarId($feladoId, array('csakId'=>$SET['csakId']));
-		if (__OSZTALYFONOK) {
-		    $TIPUSOK['osztalySzulo'] = $TIPUSOK['osztaly'] = getOsztalyByTanarId($feladoId, array('tanev'=>$SET['tanev'],'csakId' => $SET['csakId']));
-		}
-		$TIPUSOK['osztalyTanar'] = getTanarOsztaly($feladoId,$SET);
-		break;
-	    case 'szulo': /* tiltható */
-		//if (uzenhet('tanar')) $TIPUSOK['tanar'] = extendUzenoTipusok(array('csakId'=>false,'tanev'=>$SET['tanev']));
-		if (uzenhet('tankorSzulo')  || $SET['forRead']===true)  $TIPUSOK['tankorSzulo']  = getTankorByDiakId( __USERDIAKID , $SET['tanev'], array('csakId' => $SET['csakId']));
-		if (uzenhet('osztalySzulo') || $SET['forRead']===true) $TIPUSOK['osztalySzulo'] = getDiakOsztalya(  __USERDIAKID , array('tanev'=>$SET['tanev'], 'result'=>(($SET['csakId'])?'csakid':''), 'csakId' => $SET['csakId']));
-		break;
-	    case 'diak':  /* tiltható */
-		//if (uzenhet('tanar')) $TIPUSOK['tanar'] = extendUzenoTipusok(array('csakId'=>false,'tanev'=>$SET['tanev']));
-		if (uzenhet('tankor')  || $SET['forRead']===true)  $TIPUSOK['tankor'] = getTankorByDiakId($feladoId, $SET['tanev'], array('csakId' => $SET['csakId']));
-		if (uzenhet('osztaly') || $SET['forRead']===true)  $TIPUSOK['osztaly'] = getDiakOsztalya($feladoId, array('tanev'=>$SET['tanev'], 'result'=>(($SET['csakId'])?'csakid':''), 'csakId' => $SET['csakId']));
-		break;
-	    case 'admin': /* nem tiltható */
-		$TIPUSOK['osztalySzulo'] = $TIPUSOK['osztaly'] = $TIPUSOK['osztalyTanar'] = getOsztalyok($SET['tanev']);
-		$TIPUSOK['munkakozosseg'] = getMunkakozossegek(array(), array('csakId'=>$SET['csakId']));
-		$TIPUSOK['tankorSzulo']  = $TIPUSOK['tankor'] = getTankorByTanev($SET['tanev']);
-		break;
-	    default:
-		break;
-	}
-	return $TIPUSOK;
-    }
-
-
-    function extendUzenoTipusok($SET=array('csakId'=>true,'tanev'=>__TANEV,'old'=>false)) { /* Ha szülő/diák, kérdezzük le a gyermek tanköreinek tanárait */
-
-	    $R = array();
-	    $TANKOROK = getTankorByDiakId( __USERDIAKID , $SET['tanev'], array('csakId' => true));
-	    for ($i=0; $i0) {
-		ksort($T);reset($T);
-		foreach($T as $nev => $id) $R[] = array('tanarNev'=>$nev, 'tanarId'=>$id);
-	    }
-	    return $R;
-    }
-
-    function setUzenoFeladoId($nooverride=true) {
-	if ($nooverride===true && __UZENOADMIN===true && __ASWHO=='asAdmin') $kiId = 0;
-	elseif (__SZEREP=='tanar') $kiId = __USERTANARID;
-	elseif (__SZEREP=='szulo')  //$kiId = __USERSZULOID; // NOTE ilyen konstans még nincs...
-				    $kiId = getSzuloIdByUserAccount();
-	elseif (__SZEREP=='diak') $kiId = __USERDIAKID;
-	elseif (__SZEREP=='admin') $kiId = 0; // de a csak admin nem üzenhet!
-	else return false;
-	return $kiId;
-    }
-
-    function postUzenet($ADAT) {
-	$feladoId = setUzenoFeladoId();
-	$feladoTipus = __SZEREP;
-
-	$cimzettId = $ADAT['cimzettId'];
-	$cimzettTipus = $ADAT['cimzettTipus'];
-	$txt = ($ADAT['txt']);
-	$dbName = 'naplo_'.__INTEZMENY.'_'.$ADAT['tanev'];
-
-	$q = "INSERT INTO `%s`.uzeno (dt,txt,feladoId,feladoTipus,cimzettId,cimzettTipus) VALUES (NOW(), '%s', %u, '%s', %u, '%s')";
-	$v = array($dbName, $txt, $feladoId, $feladoTipus, $cimzettId, $cimzettTipus);
-	return db_query($q,array('fv' => 'uzeno/postUzenet', 'modul' => 'naplo_intezmeny', 'values' => $v));
-    }
-
-    // v3.1
-    function delUzenet($mId,$tanev=__TANEV) {
-	if (!is_numeric($mId) || __UZENOADMIN!==true) return false;
-	if (defined('__INTEZMENY')) {
-	    $dbName = 'naplo_'.__INTEZMENY.'_'.$tanev;
-	    $q = "DELETE FROM `%s`.`uzeno` WHERE `mId`=%d";
-	    $params = array('debug'=>false,'values'=>array($dbName,intval($mId)),'modul'=>'naplo','fv'=>'deluzenet','detailed'=>__UZENOADMIN);
-	    return db_query($q,$params);
-	} else
-	    return false;
-    }
-
-/*
-    A flagUzenet() függvény az adott mId-t egy user szempontjából 
-    (az üzenő terminológia szerint feladoId+feladoTipus ~szerep)
-    flageli meg.
-
-    Jelentései: LSB - olvasott (1=true, 0=X)
-*/
-
-    // v3.1
-    function flagUzenet($ADAT) {
-
-	$mId = $ADAT['mId'];
-	$feladoId = setUzenoFeladoId();
-	$feladoTipus = __SZEREP;
-	$flag = $ADAT['flag'];
-	$tanev = ($ADAT['tanev']=='') ? __TANEV : $ADAT['tanev'];
-	if (defined('__INTEZMENY')) {
-	    $dbName = 'naplo_'.__INTEZMENY.'_'.$tanev;
-	    $q = "REPLACE INTO `%s`.`uzenoFlagek`(`mId`,`Id`,`Tipus`,`flag`) VALUES (%d,%d,'%s',%d)";
-	    $params = array(
-		'values'=>array($dbName,intval($mId),$feladoId,$feladoTipus,$flag),
-		'modul'=>'naplo','fv'=>'flaguzenet',
-		'detailed'=>__UZENOADMIN);
-	    return db_query($q,$params);
-	} else
-	    return false;
-
-    }
-
-    function getUzenetFlagek($mIds, $tanev=__TANEV) {
-	if (defined('__INTEZMENY') && is_array($mIds)) {
-	    $dbName = 'naplo_'.__INTEZMENY.'_'.$tanev;
-	    $q = "SELECT * FROM `uzenoFlagek` WHERE mId IN (".implode(',',$mIds).")";
-	    $params = array('result'=>'assoc','keyfield'=>'mId','debug'=>false,'modul'=>'naplo','fv'=>'getUzenoFlagek','detailed'=>__UZENOADMIN);
-	    return db_query($q,$params);
-	} else
-	    return false;	
-    }
-
-?>
diff --git a/mayor-orig/www/include/modules/password/base/changePassword.php b/mayor-orig/www/include/modules/password/base/changePassword.php
deleted file mode 100644
index b2233303..00000000
--- a/mayor-orig/www/include/modules/password/base/changePassword.php
+++ /dev/null
@@ -1,13 +0,0 @@
- 'updateSessionPassword', 'modul' => 'login', 'values' => $v));
-//    }
-
-?>
diff --git a/mayor-orig/www/include/modules/portal/base/rights.php b/mayor-orig/www/include/modules/portal/base/rights.php
deleted file mode 100644
index c1a5c039..00000000
--- a/mayor-orig/www/include/modules/portal/base/rights.php
+++ /dev/null
@@ -1,10 +0,0 @@
-
diff --git a/mayor-orig/www/include/modules/portal/hirek/egyhir.php b/mayor-orig/www/include/modules/portal/hirek/egyhir.php
deleted file mode 100644
index c93a81bd..00000000
--- a/mayor-orig/www/include/modules/portal/hirek/egyhir.php
+++ /dev/null
@@ -1,47 +0,0 @@
-0) $cid = $DATA['cid'];
-	$csoport = $DATA['csoport'];
-	if ($hirId!='' && __HIREKADMIN == false ) {
-	    $q = "SELECT owner FROM hirek WHERE owner='%s'";
-	    $v = array($owner);
-	    $_owner = db_query($q,array('modul'=>'portal','result'=>'value','values'=>$v));
-	    $isOwner = ($_owner===$owner);
-	} else $isOwner = false;
-	if ($hirId=='') {
-	    $keys = array('`pic`','`owner`','`cim`','`txt`','`kdt`','`vdt`','`flag`','`class`','`lang`','`csoport`');
-	    $pattern = array("'%s'","'%s'","'%s'","'%s'","'%s'","'%s'","%u","%u","'%s'","'%s'");
-	    $v = array($pic,$owner,$cim,$txt,$kdt,$vdt,$flag,$class,$lang,$csoport);
-	    if (isset($cid)) {
-		$keys[] = 'cid';
-		$pattern[] = '%u';
-		$v[] = $cid;
-	    }
-	    $q = "insert INTO `hirek` (".implode(',',$keys).") VALUES (".implode(',',$pattern).")";
-	} elseif (isset($hirId) && (__HIREKADMIN || $isOwner)) {
-	    if (isset($cid)) {
-		$q = "update `hirek` SET pic='%s', cim='%s', txt='%s',kdt='%s',vdt='%s',flag=%u,class=%u,lang='%s',csoport='%s',cid=%u WHERE id=%u";
-		$v = array($pic,$cim,$txt,$kdt,$vdt,$flag,$class,$lang,$csoport, $cid, $hirId);
-	    } else {
-		$q = "update `hirek` SET pic='%s', cim='%s', txt='%s',kdt='%s',vdt='%s',flag=%u,class=%u,lang='%s',csoport='%s' WHERE id=%u";
-		$v = array($pic,$cim,$txt,$kdt,$vdt,$flag,$class,$lang,$csoport, $hirId);
-	    }
-	} else $q = '';
-	if ($q!='') $r = db_query($q,array('modul'=>'portal','result'=>'insert','values'=>$v));
-	return $r;
-    }
-
-?>
diff --git a/mayor-orig/www/include/modules/portal/kerdoiv/kerdoivAdmin.php b/mayor-orig/www/include/modules/portal/kerdoiv/kerdoivAdmin.php
deleted file mode 100644
index 237b6dc6..00000000
--- a/mayor-orig/www/include/modules/portal/kerdoiv/kerdoivAdmin.php
+++ /dev/null
@@ -1,32 +0,0 @@
- 0) {
-	    // A kérdés felvétele
-	    $q = "INSERT INTO kerdesek (vszam,kerdes) VALUES (%u,'%s')";
-	    $kszam = db_query($q, array('fv' => 'addKerdoiv', 'modul' => 'portal', 'result' => 'insert', 'values' => array(count($valaszok), $kerdes)));
-	    // A válaszok rögzítése
-	    for ($i = 0; $i < count($valaszok); $i++) if ($valaszok[$i] != '') { $v[] = $kszam; $v[] = $valaszok[$i]; }
-	    $q = "INSERT INTO valaszok (kszam,valasz) VALUES ".implode(',', $Pattern);
-	    return db_query($q, array('fv' => 'addKerdoiv', 'modul' => 'portal', 'values' => $v));
-	} else {
-	    return false;
-	}
-    }
-
-    function delKerdoivKerdes($kerdesek) {
-	$q = "DELETE FROM kerdesek WHERE sorszam IN (".implode(',',array_fill(0, count($kerdesek), '%u')).")";
-	$v = $kerdesek;
-	db_query($q, array('fv' => 'delKeroivKerdes', 'modul' => 'portal', 'values'=>$v));
-	$q = "DELETE FROM valaszok WHERE kszam IN (".implode(',',array_fill(0, count($kerdesek), '%u')).")";
-	db_query($q, array('fv' => 'delKeroivKerdes', 'modul' => 'portal', 'values'=>$v));
-    }
-
-?>
diff --git a/mayor-orig/www/include/modules/portal/share/hirek.php b/mayor-orig/www/include/modules/portal/share/hirek.php
deleted file mode 100644
index 5aa3bdc9..00000000
--- a/mayor-orig/www/include/modules/portal/share/hirek.php
+++ /dev/null
@@ -1,51 +0,0 @@
-'portal','result'=>'value','values'=>array($hirId)));
-	return ($r === _USERACCOUNT);
-    }
-
-    function getKategoriak() {
-	$q = "SELECT * FROM kategoriak ORDER BY leiras";
-	$r = db_query($q,array('modul'=>'portal','result'=>'indexed'));
-	return $r;
-    }
-
-    function getHirek($SET = array('all'=>true,'tolDt'=>'', 'igDt'=>'', 'id' => '', 'flag'=>array(), 'class'=>array(), 'cid'=>array(), 'limit'=>'', 'lang'=>'hu_HU') ) {
-
-	$tolDt = $SET['tolDt']; $igDt = $SET['igDt'];
-	if ($tolDt!='') $W[] = "kdt<='$tolDt'";
-	if ($igDt!='')  $W[] = "vdt>='$igDt'";
-	if (count($SET['flag'])>0) $W[] = "flag IN (".implode(',',$SET['flag']).")";
-	if (count($SET['class'])>0) $W[] = "class IN (".implode(',',$SET['class']).")";
-	if (count($SET['cid'])>0) $W[] = "cid IN (".implode(',',$SET['cid']).")";
-	if ($SET['lang']!='')  $W[] = "lang='".$SET['lang']."'";
-
-	if ($SET['limit']!='') $L = ' LIMIT '.$SET['limit'];
-	if ($SET['id']!='') $W[] = 'id='.$SET['id'];
-
-	if ($SET['id']=='') {
-	    if (is_array($SET['csoport'])) {
-		for ($i=0; $i0) $WOR = ' OR '.implode(' OR ',$GW);
-	    } else {
-		$WOR = '';
-	    }
-	    $W[] = '(csoport="" '.$WOR.')';
-	}
-	if (is_array($W) && count($W)>0) {
-	    $WHERE = "WHERE ".implode(' AND ',$W);
-	} else $WHERE = '';
-
-	//hack
-	if ($SET['all']===true) $WHERE='';
-	$q = "SELECT * FROM hirek $WHERE ORDER BY kdt DESC,vdt DESC".$L;
-	$HIREK['szovegek'] = db_query($q, array('modul'=>'portal','result'=>'indexed'));
-	return $HIREK;
-    }
-
-?>
diff --git a/mayor-orig/www/include/modules/portal/share/kerdoiv.php b/mayor-orig/www/include/modules/portal/share/kerdoiv.php
deleted file mode 100644
index 36a7e8b1..00000000
--- a/mayor-orig/www/include/modules/portal/share/kerdoiv.php
+++ /dev/null
@@ -1,45 +0,0 @@
- 'getKerdoiv', 'modul' => 'portal', 'values'=>$v,'result' => 'record'));
-
-	$q = "select * from valaszok where kszam=(select max(sorszam) from kerdesek WHERE policy='%s')";
-	$R['valaszok'] = db_query($q, array('fv' => 'getKerdoiv', 'modul' => 'portal', 'result' => 'indexed', 'values'=>$v, 'keyfiled' => 'kszam'));
-	return $R;
-
-    }
-
-    function szavazotte($kerdoivId) {
-	if (defined('_USERACCOUNT') && defined('_POLICY') && _USERACCOUNT!='' && _POLICY != '') {
-	    $q = "SELECT count(*) AS db FROM kerdoivSzavazott WHERE kerdoivId=%u AND policy='%s' AND userAccount='%s'";
-	    $v = array($kerdoivId, _POLICY, _USERACCOUNT);
-	    return (db_query($q, array('fv' => 'szavaz', 'modul' => 'portal', 'result'=>'value','values' => $v))>0);
-	} else {
-	    if (isset($_SESSION['kerdoivSzavazott']))
-		return true;
-	    else
-		return false;
-	} 
-    }
-
-    function szavaz($id, $db = 1, $kerdoivId) {
-	if (defined('_USERACCOUNT') && defined('_POLICY')) {
-	    $q = "INSERT INTO kerdoivSzavazott (kerdoivId,policy,userAccount) VALUES (%u,'%s','%s')";
-	    $v = array($kerdoivId, _POLICY, _USERACCOUNT);
-	    db_query($q, array('fv' => 'szavaz', 'modul' => 'portal', 'values' => $v));
-	}
-	$q = "UPDATE valaszok SET pontszam=pontszam + (%u) WHERE sorszam=%u";
-	$v = array($db, $id);
-	return db_query($q, array('fv' => 'szavaz', 'modul' => 'portal', 'values' => $v));
-    }
-
-    function getRegiKerdesek() {
-	$q = "SELECT * FROM kerdesek ORDER BY sorszam DESC LIMIT 10";
-	return db_query($q, array('modul'=>'portal','result'=>'indexed'));
-    }
-
-
-?>
\ No newline at end of file
diff --git a/mayor-orig/www/include/modules/portal/share/nevnap.php b/mayor-orig/www/include/modules/portal/share/nevnap.php
deleted file mode 100644
index 7a9ae971..00000000
--- a/mayor-orig/www/include/modules/portal/share/nevnap.php
+++ /dev/null
@@ -1,8 +0,0 @@
-'portal','values'=>$v,'result'=>'value'));
-    }
-
-?>
diff --git a/mayor-orig/www/include/modules/session/accountInfo.php b/mayor-orig/www/include/modules/session/accountInfo.php
deleted file mode 100644
index b14a8edb..00000000
--- a/mayor-orig/www/include/modules/session/accountInfo.php
+++ /dev/null
@@ -1,94 +0,0 @@
- function getAccountInfo($userAccount, $toPolicy = '') {
-    share --> function getUserInfo($userAccount, $toPolicy = '') {
-    function changeAccountInfo($userAccount, $toPolicy = '') {
-*/
-
-    require('include/share/session/accountInfo.php');
-
-###########################################################
-# changeAccountInfo - felhasználói információk módosítása
-###########################################################
-
-    function changeAccountInfo($userAccount, $toPolicy = _POLICY) {
-
-        global $AUTH;
-
-        require_once('include/backend/'.$AUTH[$toPolicy]['backend'].'/session/accountInfo.php');
-        $func = $AUTH[$toPolicy]['backend'].'ChangeAccountInfo';
-        return $func($userAccount, $toPolicy);
-
-
-    }
-
-    function getUserSettings($userAccount,$toPolicy = _POLICY) {
-
-	$q = "SELECT * FROM settings WHERE userAccount='%s' AND policy='%s'";
-	$res = db_query($q, array('modul'=>'login','values'=>array($userAccount,$toPolicy), 'result'=>'record'));
-	return $res;
-
-    }
-
-    function setUserSettings($userAccount,$toPolicy,$ADAT) {
-
-	if (!isset($ADAT['skin']) || $ADAT['skin']=='') {
-	    $q = "UPDATE settings SET skin=NULL WHERE userAccount='%s' AND policy='%s'";
-	    $res = db_query($q, array('modul'=>'login','values'=>array($userAccount,$toPolicy)));
-	} else {
-	    $q = "UPDATE settings SET skin='%s' WHERE userAccount='%s' AND policy='%s'";
-	    $res = db_query($q, array('modul'=>'login','values'=>array($ADAT['skin'],$userAccount,$toPolicy)));
-	}
-	return $res;
-
-    }
-
-    function setEduroamRecord($ADAT) {
-
-	//	ALTER TABLE eduroam ADD UNIQUE  INDEX (userAccount,policy);
-	//	ALTER TABLE eduroam ADD UNIQUE  INDEX (eduroamUID);
-	// https://wiki.niif.hu/index.php?title=Sulinet_felhaszn%C3%A1l%C3%B3k_t%C3%B6meges_felvitele
-
-	    $q = "UPDATE eduroam SET eduroamPASSWORD='%s', modositasDt = NOW() WHERE userAccount='%s' AND policy='%s'";
-	    $res = db_query($q, array('modul'=>'login','values'=>array($ADAT['eduroamPASSWORD'],$userAccount,$toPolicy)));
-
-    }
-
-    function createEduroamSettings($ADAT) {
-
-	    $q = "INSERT INTO eduroam (userAccount,policy,eduroamUID,eduroamPASSWORD,eduroamAFFILIATION,eduroamDOMAIN)
-	    VALUES ('%s','%s','%s','%s','%s','%s')";
-	    $values = array(
-		$ADAT['userAccount'],
-		$ADAT['policy'],
-		$ADAT['eduroamUID'],
-		$ADAT['eduroamPASSWORD'],
-		$ADAT['eduroamAFFILIATION'],
-		$ADAT['eduroamDOMAIN'],
-	    );
-	    $res = db_query($q, array('modul'=>'login','values'=>$values));
-	    return $res;
-    }
-
-    function getEduroamSettings($userAccount,$toPolicy,$ADAT) {
-
-	$res = false;
-	if (_ACCESS_AS == _ADMIN_ACCESS) {
-	    $userAccoungt = ($userAccount);
-	    $toPolicy = ($toPolicy);
-	} else {
-	    $userAccount = (_USERACCOUNT);
-	    $toPolicy = (_POLICY);
-	}
-
-	if ($toPolicy == 'private') {
-	    $q = "SELECT * FROM eduroam WHERE userAccount='%s' AND policy='%s'";
-	    $res = db_query($q, array('modul'=>'login','values'=>array($userAccount,$toPolicy), 'result'=>'record'));
-	}
-	return $res;
-
-    }
-
-?>
diff --git a/mayor-orig/www/include/modules/session/base/base.php b/mayor-orig/www/include/modules/session/base/base.php
deleted file mode 100644
index efc39324..00000000
--- a/mayor-orig/www/include/modules/session/base/base.php
+++ /dev/null
@@ -1,19 +0,0 @@
-
diff --git a/mayor-orig/www/include/modules/session/createAccount.php b/mayor-orig/www/include/modules/session/createAccount.php
deleted file mode 100644
index 6222ed76..00000000
--- a/mayor-orig/www/include/modules/session/createAccount.php
+++ /dev/null
@@ -1,19 +0,0 @@
- null, 'container' => null, 'groups' => '', 'policyAttrs' => array())) {
-
-        global $AUTH;
-
-        require_once('include/backend/'.$AUTH[$toPolicy]['backend'].'/session/createAccount.php');
-        $func = $AUTH[$toPolicy]['backend'].'CreateAccount';
-        $r = $func($userCn, $userAccount, $userPassword, $toPolicy, $SET);
-	$_SESSION['lastCreatedAccount'] = $userAccount;
-
-	return $r;
-
-    }
-
-?>
diff --git a/mayor-orig/www/include/modules/session/createGroup.php b/mayor-orig/www/include/modules/session/createGroup.php
deleted file mode 100644
index 69b2bb45..00000000
--- a/mayor-orig/www/include/modules/session/createGroup.php
+++ /dev/null
@@ -1,16 +0,0 @@
- null, 'container' => null, 'policyAttrs' => array())) {
-
-        global $AUTH;
-
-        require_once('include/backend/'.$AUTH[$toPolicy]['backend'].'/session/createGroup.php');
-        $func = $AUTH[$toPolicy]['backend'].'CreateGroup';
-        return $func($groupCn, $groupDesc, $toPolicy, $SET);
-
-    }
-
-?>
diff --git a/mayor-orig/www/include/modules/session/download.php b/mayor-orig/www/include/modules/session/download.php
deleted file mode 100644
index 47d3bdb7..00000000
--- a/mayor-orig/www/include/modules/session/download.php
+++ /dev/null
@@ -1,108 +0,0 @@
- 'application/zip',
-      'tgz' => 'application/tar',
-
-      // documents
-      'pdf' => 'application/pdf',
-      'doc' => 'application/msword',
-      'xls' => 'application/vnd.ms-excel',
-      'ppt' => 'application/vnd.ms-powerpoint',
-      'csv' => 'application/vnd.ms-excel',
-      'ods' => 'application/vnd.oasis.opendocument.spreadsheet',
-
-      // executables
-      'exe' => 'application/octet-stream',
-
-      // text
-      'xml' => 'text/xml',
-
-      // images
-      'gif' => 'image/gif',
-      'png' => 'image/png',
-      'jpg' => 'image/jpeg',
-      'jpeg' => 'image/jpeg',
-
-      // audio
-      'mp3' => 'audio/mpeg',
-      'wav' => 'audio/x-wav',
-
-      // video
-      'mpeg' => 'video/mpeg',
-      'mpg' => 'video/mpeg',
-      'mpe' => 'video/mpeg',
-      'mov' => 'video/quicktime',
-      'avi' => 'video/x-msvideo'
-    );
-
-    $allowedMimeTypes = array(
-	'application/zip',
-	'application/tar',
-	'application/pdf',
-	'application/msword',
-	'application/vnd.ms-excel',
-	'application/vnd.ms-powerpoint',
-	'application/octet-stream',
-	'text/xml',
-	'image/gif',
-	'image/png',
-	'image/jpeg',
-	'audio/mpeg',
-	'audio/x-wav',
-	'video/mpeg',
-	'video/quicktime',
-	'video/x-msvideo',
-	'application/vnd.oasis.opendocument.spreadsheet'
-    );
-
-    function passFile($ADAT) {
-	if (in_array($ADAT['ext'],array('jpg','jpeg','png'))) passFile_image($ADAT);
-	else passFile_other($ADAT);
-	die();
-    }
-
-    function passFile_image($ADAT) {
-	ob_clean();
-	ignore_user_abort(true);
-	set_time_limit(0);
-	// Getting headers sent by the client.
-	$headers = apache_request_headers();
-	$fn = $ADAT['path'] ;
-	// Checking if the client is validating his cache and if it is current.
-	if (isset($headers['If-Modified-Since']) && (strtotime($headers['If-Modified-Since']) == filemtime($fn))) {
-    	    // Client's cache IS current, so we just respond '304 Not Modified'.
-    	    header('Last-Modified: '.gmdate('D, d M Y H:i:s', filemtime($fn)).' GMT', true, 304);
-            header('Expires: '.gmdate('D, d M Y H:i:s', strtotime('+10 day')).' GMT', true);
-            header("Cache-Control: max-age=604800, public", true);
-            header("Pragma: public", true);
-	} else {
-	    header("Pragma: public", true);
-	    header("Cache-Control: max-age=604800, public", true);
-    	    header('Last-Modified: '.gmdate('D, d M Y H:i:s', filemtime($fn)).' GMT', true, 200);
-    	    header('Expires: '.gmdate('D, d M Y H:i:s', strtotime('+10 day')).' GMT', true);
-	    header("Content-Length: " . $ADAT['size'], true);
-	    header('Content-type: '.$ADAT['mime'], true);
-    	    echo file_get_contents($fn);
-	}
-    }
-
-    function passFile_other($ADAT) {
-	ob_clean();
-	header('Content-type: '.$ADAT['mime']);
-	header("Pragma: public");
-	header("Expires: 0");
-	header("Cache-Control: must-revalidate, post-check=0, pre-check=0");
-	header("Cache-Control: public");
-	header("Content-Description: File Transfer");
-	header("Content-Type: ".$ADAT['mime']);
-        if (!isset($ADAT['pure'])) // akkor force download as
-	    header('Content-Disposition: attachment; filename="'.$ADAT['file'].'"');
-	header("Content-Transfer-Encoding: binary");
-	header("Content-Length: " . $ADAT['size']);
-	echo file_get_contents($ADAT['path']);
-    }
-
-?>
diff --git a/mayor-orig/www/include/modules/session/groupInfo.php b/mayor-orig/www/include/modules/session/groupInfo.php
deleted file mode 100644
index fd46afee..00000000
--- a/mayor-orig/www/include/modules/session/groupInfo.php
+++ /dev/null
@@ -1,38 +0,0 @@
- true)) {
-
-        global $AUTH;
-
-        require_once('include/backend/'.$AUTH[$toPolicy]['backend'].'/session/accountInfo.php');
-        $func = $AUTH[$toPolicy]['backend'].'GetGroupInfo';
-        return $func($groupCn, $toPolicy, $SET);
-
-
-    }
-
-###########################################################
-# changeGroupInfo - csoport információk módosítása
-###########################################################
-
-    function changeGroupInfo($groupCn, $toPolicy = _POLICY) {
-
-        global $AUTH;
-
-        require_once('include/backend/'.$AUTH[$toPolicy]['backend'].'/session/accountInfo.php');
-        $func = $AUTH[$toPolicy]['backend'].'ChangeGroupInfo';
-        return $func($groupCn, $toPolicy);
-
-
-    }
-?>
diff --git a/mayor-orig/www/include/modules/session/search/searchAccount.php b/mayor-orig/www/include/modules/session/search/searchAccount.php
deleted file mode 100644
index 796a7423..00000000
--- a/mayor-orig/www/include/modules/session/search/searchAccount.php
+++ /dev/null
@@ -1,37 +0,0 @@
-
diff --git a/mayor-orig/www/include/modules/session/search/searchGroup.php b/mayor-orig/www/include/modules/session/search/searchGroup.php
deleted file mode 100644
index f44f9aa2..00000000
--- a/mayor-orig/www/include/modules/session/search/searchGroup.php
+++ /dev/null
@@ -1,34 +0,0 @@
-
diff --git a/mayor-orig/www/include/modules/session/sessionAdmin.php b/mayor-orig/www/include/modules/session/sessionAdmin.php
deleted file mode 100644
index ff3e99b8..00000000
--- a/mayor-orig/www/include/modules/session/sessionAdmin.php
+++ /dev/null
@@ -1,24 +0,0 @@
- NOW()";
-	if (intval(_SESSION_MAX_IDLE_TIME) != 0) $W[] = "activity + INTERVAL ".intval(_SESSION_MAX_IDLE_TIME)." HOUR > NOW()";
-	$q = "SELECT userAccount,dt,policy,sessionID,userCn,studyId,skin,lang,activity,sessionCookie,ip FROM session LEFT JOIN loginLog USING (policy,userAccount,dt)";
-	if (count($W) > 0) $q .= " WHERE ".implode(' AND ', $W);
-	$q .= " ORDER BY activity DESC";
-
-	$ret = db_query($q, array('fv' => 'getSessions', 'modul' => 'login', 'result' => 'indexed'));
-	return $ret;    
-    }
-    
-    function deleteSession($sessionID, $policy) {
-    
-	$q = "DELETE FROM session WHERE sessionID='%s' AND policy='%s'";
-	$v = array($sessionID, $policy);
-	return db_query($q, array('fv' => 'deleteSession','modul' => 'login', 'values' => $v));
-    
-    }
-
-?>
diff --git a/mayor-orig/www/include/share/auth/base.php b/mayor-orig/www/include/share/auth/base.php
deleted file mode 100644
index 8ff27f5e..00000000
--- a/mayor-orig/www/include/share/auth/base.php
+++ /dev/null
@@ -1,118 +0,0 @@
- 'newSession'));
-
-        if (!$lr) {
-            $_SESSION['alert'][] =  'message:sql_failure:session';
-            return false;
-        }
-
-        $userAccount = db_escape_string($accountInformation['account'], $lr);
-        // nem tárolunk jelszót! // 
-        // $userPassword = 'nem tárolunk jelszót!'; // mégis tároljuk - session/search (backend: ads)
-	$userPassword = db_escape_string($accountInformation['password'], $lr);
-        $userCn = db_escape_string($accountInformation['cn'], $lr);
-        $studyId = db_escape_string($accountInformation['studyId'], $lr);
-
-        (bool)$toRegister = true; // be kell jegyezni (lásd alább)
-        if ($sessionID == '') {
-            // A sessionID generálása
-            $sessionID = sessionHash();
-        } else {
-            // A meglevő sessionID használata - csak akkor hagyjuk ha az adott policy-hez még nincs ilyen,
-            // de másik policy-hez van
-            $query = "SELECT policy FROM session WHERE sessionID='%s'";
-	    $ret = db_query($query, array('fv' => 'newSession', 'modul' => 'login', 'result' => 'idonly', 'values' => array($sessionID)), $lr);
-            if (is_array($ret) && count($ret) > 0) {
-		reset($ret);
-		while ((list($key, $_policy) = each($ret)) && $toRegister) {
-                //while ((list($_policy) = m_ysql_fetch_row($r)) && $toRegister) {
-                    if ($_policy == $policy) $toRegister = false;
-                    // mégsem kell bejegyezni, már van; és ez az. $sessionID=$sessionID
-                    // else be kell jegyezni, de ezt a $sessionID-t, nem generálunk
-                }
-            } else {
-                $sessionID = sessionHash();
-            }
-        }
-        // fetch predefined lang+skin
-        {
-            $query = "SELECT skin,lang,lastlogin FROM settings WHERE userAccount='%s' AND policy='%s'";
-	    $ret = db_query($query, array('fv' => 'newSession', 'modul' => 'login', 'result' => 'record', 'values' => array($userAccount, $policy)), $lr);
-            if (is_array($ret) && count($ret) > 0) {
-		extract($ret);
-		$_SESSION['lastLogin'] = $ret['lastlogin'];
-		if (!in_array($skin,$SKINS))
-		    $skin = (in_array($AUTH[$policy]['skin'],$SKINS)) ? $AUTH[$policy]['skin'] : _DEFAULT_SKIN;
-                $q = "UPDATE settings SET lastlogin=now() WHERE userAccount='%s' AND policy='%s'";
-		$v = array($userAccount, $policy);
-            } else {
-		/* Policy szerinti default skin*/
-		$_SESSION['lastLogin'] = '2002-04-19';
-		$skin = (in_array($AUTH[$policy]['skin'],$SKINS)) ? $AUTH[$policy]['skin'] : _DEFAULT_SKIN;
-                $lang = _DEFAULT_LANG;
-                $q = "INSERT INTO settings (userAccount,policy,skin,lang,lastlogin) VALUES ('%s', '%s', '%s', '%s', now())";
-		$v = array($userAccount, $policy, '', $lang);
-            }
-            db_query($q, array('fv' => 'newSession', 'modul' => 'login', 'values' => $v), $lr);
-        }
-        // Ellenőrizzük, hogy hány karaktér fér bele az adatbázisba(!); ha eltérő, mint a generált, csonkoljuk.
-        $_q = "SHOW COLUMNS FROM session WHERE Field='sessionID'";
-        $_a = db_query($_q, array('fv' => 'newSession', 'modul' => 'login', 'result' => 'record'), $lr);
-        $_mezohossz = intval(substr($_a['Type'],strpos($_a['Type'],'(')+1,2));
-        if ($_mezohossz==0) $_SESSION['alert'][] = 'message:session_alter_needed:'.$_mezohossz;
-        if (strlen($sessionID)!=$_mezohossz) {
-    	    $_SESSION['alert'][] = 'message:session_alter_needed:'.$_mezohossz.':'.strlen($sessionID);
-    	    $sessionID = substr($sessionID,0,$_mezohossz);
-        }
-        // Felvétel az adatbázisba
-        if ($toRegister===false) {
-	    $query = "DELETE FROM session WHERE sessionId='%s' and policy='%s'";
-	    db_query($query, array('fv' => 'newSession', 'modul' => 'login', 'values' => array($sessionID, $policy)), $lr);
-	} 
-	$now = date('Y-m-d H:i:s');
-	$_SC = sessionCookieEncode($sessionID, $now); // TODO
-	$_studyId = ($studyId=='') ? 'NULL' : $studyId;
-	if ($studyId=='') {
-    	    $query="INSERT INTO session
-		(sessionID, userPassword, userAccount, userCn, studyId, dt, policy, skin, lang, activity, sessionCookie)
-		VALUES ('%s', aes_encrypt('%s', '%s'), '%s', '%s', NULL, '%s', '%s', '%s', %u, NOW(), '%s')"; // [SECURITY 002]
-	    $v = array($sessionID, $userPassword, $_SC['pwHash'], $userAccount, $userCn, $now, $policy, $skin, $lang, $_SC['store']);
-	} else {
-    	    $query="INSERT INTO session
-		(sessionID, userPassword, userAccount, userCn, studyId, dt, policy, skin, lang, activity, sessionCookie)
-		VALUES ('%s', aes_encrypt('%s', '%s'), '%s', '%s', '%s', '%s', '%s', '%s', %u, NOW(), '%s')"; // [SECURITY 002]
-	    $v = array($sessionID, $userPassword, $_SC['pwHash'],$userAccount, $userCn, $_studyId, $now, $policy, $skin, $lang, $_SC['store']);
-	}
-        db_query($query, array('fv' => 'newSession', 'modul' => 'login', 'values' => $v), $lr);
-        db_close($lr);
-
-	// Megjegyzés: a sessionID elhashelése nem jelent semmiféle védelmet, így tökéletesen megfelelő a gyenge hash is, de now alkalmazása hibás
-	setcookie($_SC['name'],$_SC['value'],time()+60*60*_SESSION_MAX_TIME,'/','',_SECURECOOKIE);
-
-        return $sessionID;
-    }
-
-?>
diff --git a/mayor-orig/www/include/share/date/names.php b/mayor-orig/www/include/share/date/names.php
deleted file mode 100644
index 4b39c79b..00000000
--- a/mayor-orig/www/include/share/date/names.php
+++ /dev/null
@@ -1,32 +0,0 @@
-
diff --git a/mayor-orig/www/include/share/facebook/Authentication/AccessToken.php b/mayor-orig/www/include/share/facebook/Authentication/AccessToken.php
deleted file mode 100644
index 5d700733..00000000
--- a/mayor-orig/www/include/share/facebook/Authentication/AccessToken.php
+++ /dev/null
@@ -1,160 +0,0 @@
-value = $accessToken;
-        if ($expiresAt) {
-            $this->setExpiresAtFromTimeStamp($expiresAt);
-        }
-    }
-
-    /**
-     * Generate an app secret proof to sign a request to Graph.
-     *
-     * @param string $appSecret The app secret.
-     *
-     * @return string
-     */
-    public function getAppSecretProof($appSecret)
-    {
-        return hash_hmac('sha256', $this->value, $appSecret);
-    }
-
-    /**
-     * Getter for expiresAt.
-     *
-     * @return \DateTime|null
-     */
-    public function getExpiresAt()
-    {
-        return $this->expiresAt;
-    }
-
-    /**
-     * Determines whether or not this is an app access token.
-     *
-     * @return bool
-     */
-    public function isAppAccessToken()
-    {
-        return strpos($this->value, '|') !== false;
-    }
-
-    /**
-     * Determines whether or not this is a long-lived token.
-     *
-     * @return bool
-     */
-    public function isLongLived()
-    {
-        if ($this->expiresAt) {
-            return $this->expiresAt->getTimestamp() > time() + (60 * 60 * 2);
-        }
-
-        if ($this->isAppAccessToken()) {
-            return true;
-        }
-
-        return false;
-    }
-
-    /**
-     * Checks the expiration of the access token.
-     *
-     * @return boolean|null
-     */
-    public function isExpired()
-    {
-        if ($this->getExpiresAt() instanceof \DateTime) {
-            return $this->getExpiresAt()->getTimestamp() < time();
-        }
-
-        if ($this->isAppAccessToken()) {
-            return false;
-        }
-
-        return null;
-    }
-
-    /**
-     * Returns the access token as a string.
-     *
-     * @return string
-     */
-    public function getValue()
-    {
-        return $this->value;
-    }
-
-    /**
-     * Returns the access token as a string.
-     *
-     * @return string
-     */
-    public function __toString()
-    {
-        return $this->getValue();
-    }
-
-    /**
-     * Setter for expires_at.
-     *
-     * @param int $timeStamp
-     */
-    protected function setExpiresAtFromTimeStamp($timeStamp)
-    {
-        $dt = new \DateTime();
-        $dt->setTimestamp($timeStamp);
-        $this->expiresAt = $dt;
-    }
-}
diff --git a/mayor-orig/www/include/share/facebook/Authentication/AccessTokenMetadata.php b/mayor-orig/www/include/share/facebook/Authentication/AccessTokenMetadata.php
deleted file mode 100644
index 165433cb..00000000
--- a/mayor-orig/www/include/share/facebook/Authentication/AccessTokenMetadata.php
+++ /dev/null
@@ -1,390 +0,0 @@
-metadata = $metadata['data'];
-
-        $this->castTimestampsToDateTime();
-    }
-
-    /**
-     * Returns a value from the metadata.
-     *
-     * @param string $field   The property to retrieve.
-     * @param mixed  $default The default to return if the property doesn't exist.
-     *
-     * @return mixed
-     */
-    public function getField($field, $default = null)
-    {
-        if (isset($this->metadata[$field])) {
-            return $this->metadata[$field];
-        }
-
-        return $default;
-    }
-
-    /**
-     * Returns a value from the metadata.
-     *
-     * @param string $field   The property to retrieve.
-     * @param mixed  $default The default to return if the property doesn't exist.
-     *
-     * @return mixed
-     *
-     * @deprecated 5.0.0 getProperty() has been renamed to getField()
-     * @todo v6: Remove this method
-     */
-    public function getProperty($field, $default = null)
-    {
-        return $this->getField($field, $default);
-    }
-
-    /**
-     * Returns a value from a child property in the metadata.
-     *
-     * @param string $parentField The parent property.
-     * @param string $field       The property to retrieve.
-     * @param mixed  $default     The default to return if the property doesn't exist.
-     *
-     * @return mixed
-     */
-    public function getChildProperty($parentField, $field, $default = null)
-    {
-        if (!isset($this->metadata[$parentField])) {
-            return $default;
-        }
-
-        if (!isset($this->metadata[$parentField][$field])) {
-            return $default;
-        }
-
-        return $this->metadata[$parentField][$field];
-    }
-
-    /**
-     * Returns a value from the error metadata.
-     *
-     * @param string $field   The property to retrieve.
-     * @param mixed  $default The default to return if the property doesn't exist.
-     *
-     * @return mixed
-     */
-    public function getErrorProperty($field, $default = null)
-    {
-        return $this->getChildProperty('error', $field, $default);
-    }
-
-    /**
-     * Returns a value from the "metadata" metadata. *Brain explodes*
-     *
-     * @param string $field   The property to retrieve.
-     * @param mixed  $default The default to return if the property doesn't exist.
-     *
-     * @return mixed
-     */
-    public function getMetadataProperty($field, $default = null)
-    {
-        return $this->getChildProperty('metadata', $field, $default);
-    }
-
-    /**
-     * The ID of the application this access token is for.
-     *
-     * @return string|null
-     */
-    public function getAppId()
-    {
-        return $this->getField('app_id');
-    }
-
-    /**
-     * Name of the application this access token is for.
-     *
-     * @return string|null
-     */
-    public function getApplication()
-    {
-        return $this->getField('application');
-    }
-
-    /**
-     * Any error that a request to the graph api
-     * would return due to the access token.
-     *
-     * @return bool|null
-     */
-    public function isError()
-    {
-        return $this->getField('error') !== null;
-    }
-
-    /**
-     * The error code for the error.
-     *
-     * @return int|null
-     */
-    public function getErrorCode()
-    {
-        return $this->getErrorProperty('code');
-    }
-
-    /**
-     * The error message for the error.
-     *
-     * @return string|null
-     */
-    public function getErrorMessage()
-    {
-        return $this->getErrorProperty('message');
-    }
-
-    /**
-     * The error subcode for the error.
-     *
-     * @return int|null
-     */
-    public function getErrorSubcode()
-    {
-        return $this->getErrorProperty('subcode');
-    }
-
-    /**
-     * DateTime when this access token expires.
-     *
-     * @return \DateTime|null
-     */
-    public function getExpiresAt()
-    {
-        return $this->getField('expires_at');
-    }
-
-    /**
-     * Whether the access token is still valid or not.
-     *
-     * @return boolean|null
-     */
-    public function getIsValid()
-    {
-        return $this->getField('is_valid');
-    }
-
-    /**
-     * DateTime when this access token was issued.
-     *
-     * Note that the issued_at field is not returned
-     * for short-lived access tokens.
-     *
-     * @see https://developers.facebook.com/docs/facebook-login/access-tokens#debug
-     *
-     * @return \DateTime|null
-     */
-    public function getIssuedAt()
-    {
-        return $this->getField('issued_at');
-    }
-
-    /**
-     * General metadata associated with the access token.
-     * Can contain data like 'sso', 'auth_type', 'auth_nonce'.
-     *
-     * @return array|null
-     */
-    public function getMetadata()
-    {
-        return $this->getField('metadata');
-    }
-
-    /**
-     * The 'sso' child property from the 'metadata' parent property.
-     *
-     * @return string|null
-     */
-    public function getSso()
-    {
-        return $this->getMetadataProperty('sso');
-    }
-
-    /**
-     * The 'auth_type' child property from the 'metadata' parent property.
-     *
-     * @return string|null
-     */
-    public function getAuthType()
-    {
-        return $this->getMetadataProperty('auth_type');
-    }
-
-    /**
-     * The 'auth_nonce' child property from the 'metadata' parent property.
-     *
-     * @return string|null
-     */
-    public function getAuthNonce()
-    {
-        return $this->getMetadataProperty('auth_nonce');
-    }
-
-    /**
-     * For impersonated access tokens, the ID of
-     * the page this token contains.
-     *
-     * @return string|null
-     */
-    public function getProfileId()
-    {
-        return $this->getField('profile_id');
-    }
-
-    /**
-     * List of permissions that the user has granted for
-     * the app in this access token.
-     *
-     * @return array
-     */
-    public function getScopes()
-    {
-        return $this->getField('scopes');
-    }
-
-    /**
-     * The ID of the user this access token is for.
-     *
-     * @return string|null
-     */
-    public function getUserId()
-    {
-        return $this->getField('user_id');
-    }
-
-    /**
-     * Ensures the app ID from the access token
-     * metadata is what we expect.
-     *
-     * @param string $appId
-     *
-     * @throws FacebookSDKException
-     */
-    public function validateAppId($appId)
-    {
-        if ($this->getAppId() !== $appId) {
-            throw new FacebookSDKException('Access token metadata contains unexpected app ID.', 401);
-        }
-    }
-
-    /**
-     * Ensures the user ID from the access token
-     * metadata is what we expect.
-     *
-     * @param string $userId
-     *
-     * @throws FacebookSDKException
-     */
-    public function validateUserId($userId)
-    {
-        if ($this->getUserId() !== $userId) {
-            throw new FacebookSDKException('Access token metadata contains unexpected user ID.', 401);
-        }
-    }
-
-    /**
-     * Ensures the access token has not expired yet.
-     *
-     * @throws FacebookSDKException
-     */
-    public function validateExpiration()
-    {
-        if (!$this->getExpiresAt() instanceof \DateTime) {
-            return;
-        }
-
-        if ($this->getExpiresAt()->getTimestamp() < time()) {
-            throw new FacebookSDKException('Inspection of access token metadata shows that the access token has expired.', 401);
-        }
-    }
-
-    /**
-     * Converts a unix timestamp into a DateTime entity.
-     *
-     * @param int $timestamp
-     *
-     * @return \DateTime
-     */
-    private function convertTimestampToDateTime($timestamp)
-    {
-        $dt = new \DateTime();
-        $dt->setTimestamp($timestamp);
-
-        return $dt;
-    }
-
-    /**
-     * Casts the unix timestamps as DateTime entities.
-     */
-    private function castTimestampsToDateTime()
-    {
-        foreach (static::$dateProperties as $key) {
-            if (isset($this->metadata[$key]) && $this->metadata[$key] !== 0) {
-                $this->metadata[$key] = $this->convertTimestampToDateTime($this->metadata[$key]);
-            }
-        }
-    }
-}
diff --git a/mayor-orig/www/include/share/facebook/Authentication/OAuth2Client.php b/mayor-orig/www/include/share/facebook/Authentication/OAuth2Client.php
deleted file mode 100644
index 94df9b7b..00000000
--- a/mayor-orig/www/include/share/facebook/Authentication/OAuth2Client.php
+++ /dev/null
@@ -1,292 +0,0 @@
-app = $app;
-        $this->client = $client;
-        $this->graphVersion = $graphVersion ?: Facebook::DEFAULT_GRAPH_VERSION;
-    }
-
-    /**
-     * Returns the last FacebookRequest that was sent.
-     * Useful for debugging and testing.
-     *
-     * @return FacebookRequest|null
-     */
-    public function getLastRequest()
-    {
-        return $this->lastRequest;
-    }
-
-    /**
-     * Get the metadata associated with the access token.
-     *
-     * @param AccessToken|string $accessToken The access token to debug.
-     *
-     * @return AccessTokenMetadata
-     */
-    public function debugToken($accessToken)
-    {
-        $accessToken = $accessToken instanceof AccessToken ? $accessToken->getValue() : $accessToken;
-        $params = ['input_token' => $accessToken];
-
-        $this->lastRequest = new FacebookRequest(
-            $this->app,
-            $this->app->getAccessToken(),
-            'GET',
-            '/debug_token',
-            $params,
-            null,
-            $this->graphVersion
-        );
-        $response = $this->client->sendRequest($this->lastRequest);
-        $metadata = $response->getDecodedBody();
-
-        return new AccessTokenMetadata($metadata);
-    }
-
-    /**
-     * Generates an authorization URL to begin the process of authenticating a user.
-     *
-     * @param string $redirectUrl The callback URL to redirect to.
-     * @param string $state       The CSPRNG-generated CSRF value.
-     * @param array  $scope       An array of permissions to request.
-     * @param array  $params      An array of parameters to generate URL.
-     * @param string $separator   The separator to use in http_build_query().
-     *
-     * @return string
-     */
-    public function getAuthorizationUrl($redirectUrl, $state, array $scope = [], array $params = [], $separator = '&')
-    {
-        $params += [
-            'client_id' => $this->app->getId(),
-            'state' => $state,
-            'response_type' => 'code',
-            'sdk' => 'php-sdk-' . Facebook::VERSION,
-            'redirect_uri' => $redirectUrl,
-            'scope' => implode(',', $scope)
-        ];
-
-        return static::BASE_AUTHORIZATION_URL . '/' . $this->graphVersion . '/dialog/oauth?' . http_build_query($params, null, $separator);
-    }
-
-    /**
-     * Get a valid access token from a code.
-     *
-     * @param string $code
-     * @param string $redirectUri
-     *
-     * @return AccessToken
-     *
-     * @throws FacebookSDKException
-     */
-    public function getAccessTokenFromCode($code, $redirectUri = '')
-    {
-        $params = [
-            'code' => $code,
-            'redirect_uri' => $redirectUri,
-        ];
-
-        return $this->requestAnAccessToken($params);
-    }
-
-    /**
-     * Exchanges a short-lived access token with a long-lived access token.
-     *
-     * @param AccessToken|string $accessToken
-     *
-     * @return AccessToken
-     *
-     * @throws FacebookSDKException
-     */
-    public function getLongLivedAccessToken($accessToken)
-    {
-        $accessToken = $accessToken instanceof AccessToken ? $accessToken->getValue() : $accessToken;
-        $params = [
-            'grant_type' => 'fb_exchange_token',
-            'fb_exchange_token' => $accessToken,
-        ];
-
-        return $this->requestAnAccessToken($params);
-    }
-
-    /**
-     * Get a valid code from an access token.
-     *
-     * @param AccessToken|string $accessToken
-     * @param string             $redirectUri
-     *
-     * @return AccessToken
-     *
-     * @throws FacebookSDKException
-     */
-    public function getCodeFromLongLivedAccessToken($accessToken, $redirectUri = '')
-    {
-        $params = [
-            'redirect_uri' => $redirectUri,
-        ];
-
-        $response = $this->sendRequestWithClientParams('/oauth/client_code', $params, $accessToken);
-        $data = $response->getDecodedBody();
-
-        if (!isset($data['code'])) {
-            throw new FacebookSDKException('Code was not returned from Graph.', 401);
-        }
-
-        return $data['code'];
-    }
-
-    /**
-     * Send a request to the OAuth endpoint.
-     *
-     * @param array $params
-     *
-     * @return AccessToken
-     *
-     * @throws FacebookSDKException
-     */
-    protected function requestAnAccessToken(array $params)
-    {
-        $response = $this->sendRequestWithClientParams('/oauth/access_token', $params);
-        $data = $response->getDecodedBody();
-
-        if (!isset($data['access_token'])) {
-            throw new FacebookSDKException('Access token was not returned from Graph.', 401);
-        }
-
-        // Graph returns two different key names for expiration time
-        // on the same endpoint. Doh! :/
-        $expiresAt = 0;
-        if (isset($data['expires'])) {
-            // For exchanging a short lived token with a long lived token.
-            // The expiration time in seconds will be returned as "expires".
-            $expiresAt = time() + $data['expires'];
-        } elseif (isset($data['expires_in'])) {
-            // For exchanging a code for a short lived access token.
-            // The expiration time in seconds will be returned as "expires_in".
-            // See: https://developers.facebook.com/docs/facebook-login/access-tokens#long-via-code
-            $expiresAt = time() + $data['expires_in'];
-        }
-
-        return new AccessToken($data['access_token'], $expiresAt);
-    }
-
-    /**
-     * Send a request to Graph with an app access token.
-     *
-     * @param string                  $endpoint
-     * @param array                   $params
-     * @param AccessToken|string|null $accessToken
-     *
-     * @return FacebookResponse
-     *
-     * @throws FacebookResponseException
-     */
-    protected function sendRequestWithClientParams($endpoint, array $params, $accessToken = null)
-    {
-        $params += $this->getClientParams();
-
-        $accessToken = $accessToken ?: $this->app->getAccessToken();
-
-        $this->lastRequest = new FacebookRequest(
-            $this->app,
-            $accessToken,
-            'GET',
-            $endpoint,
-            $params,
-            null,
-            $this->graphVersion
-        );
-
-        return $this->client->sendRequest($this->lastRequest);
-    }
-
-    /**
-     * Returns the client_* params for OAuth requests.
-     *
-     * @return array
-     */
-    protected function getClientParams()
-    {
-        return [
-            'client_id' => $this->app->getId(),
-            'client_secret' => $this->app->getSecret(),
-        ];
-    }
-}
diff --git a/mayor-orig/www/include/share/facebook/Exceptions/FacebookAuthenticationException.php b/mayor-orig/www/include/share/facebook/Exceptions/FacebookAuthenticationException.php
deleted file mode 100644
index c5e45fa3..00000000
--- a/mayor-orig/www/include/share/facebook/Exceptions/FacebookAuthenticationException.php
+++ /dev/null
@@ -1,33 +0,0 @@
-response = $response;
-        $this->responseData = $response->getDecodedBody();
-
-        $errorMessage = $this->get('message', 'Unknown error from Graph.');
-        $errorCode = $this->get('code', -1);
-
-        parent::__construct($errorMessage, $errorCode, $previousException);
-    }
-
-    /**
-     * A factory for creating the appropriate exception based on the response from Graph.
-     *
-     * @param FacebookResponse $response The response that threw the exception.
-     *
-     * @return FacebookResponseException
-     */
-    public static function create(FacebookResponse $response)
-    {
-        $data = $response->getDecodedBody();
-
-        if (!isset($data['error']['code']) && isset($data['code'])) {
-            $data = ['error' => $data];
-        }
-
-        $code = isset($data['error']['code']) ? $data['error']['code'] : null;
-        $message = isset($data['error']['message']) ? $data['error']['message'] : 'Unknown error from Graph.';
-
-        if (isset($data['error']['error_subcode'])) {
-            switch ($data['error']['error_subcode']) {
-                // Other authentication issues
-                case 458:
-                case 459:
-                case 460:
-                case 463:
-                case 464:
-                case 467:
-                    return new static($response, new FacebookAuthenticationException($message, $code));
-                // Video upload resumable error
-                case 1363030:
-                case 1363019:
-                case 1363037:
-                case 1363033:
-                case 1363021:
-                case 1363041:
-                    return new static($response, new FacebookResumableUploadException($message, $code));
-            }
-        }
-
-        switch ($code) {
-            // Login status or token expired, revoked, or invalid
-            case 100:
-            case 102:
-            case 190:
-                return new static($response, new FacebookAuthenticationException($message, $code));
-
-            // Server issue, possible downtime
-            case 1:
-            case 2:
-                return new static($response, new FacebookServerException($message, $code));
-
-            // API Throttling
-            case 4:
-            case 17:
-            case 32:
-            case 341:
-            case 613:
-                return new static($response, new FacebookThrottleException($message, $code));
-
-            // Duplicate Post
-            case 506:
-                return new static($response, new FacebookClientException($message, $code));
-        }
-
-        // Missing Permissions
-        if ($code == 10 || ($code >= 200 && $code <= 299)) {
-            return new static($response, new FacebookAuthorizationException($message, $code));
-        }
-
-        // OAuth authentication error
-        if (isset($data['error']['type']) && $data['error']['type'] === 'OAuthException') {
-            return new static($response, new FacebookAuthenticationException($message, $code));
-        }
-
-        // All others
-        return new static($response, new FacebookOtherException($message, $code));
-    }
-
-    /**
-     * Checks isset and returns that or a default value.
-     *
-     * @param string $key
-     * @param mixed  $default
-     *
-     * @return mixed
-     */
-    private function get($key, $default = null)
-    {
-        if (isset($this->responseData['error'][$key])) {
-            return $this->responseData['error'][$key];
-        }
-
-        return $default;
-    }
-
-    /**
-     * Returns the HTTP status code
-     *
-     * @return int
-     */
-    public function getHttpStatusCode()
-    {
-        return $this->response->getHttpStatusCode();
-    }
-
-    /**
-     * Returns the sub-error code
-     *
-     * @return int
-     */
-    public function getSubErrorCode()
-    {
-        return $this->get('error_subcode', -1);
-    }
-
-    /**
-     * Returns the error type
-     *
-     * @return string
-     */
-    public function getErrorType()
-    {
-        return $this->get('type', '');
-    }
-
-    /**
-     * Returns the raw response used to create the exception.
-     *
-     * @return string
-     */
-    public function getRawResponse()
-    {
-        return $this->response->getBody();
-    }
-
-    /**
-     * Returns the decoded response used to create the exception.
-     *
-     * @return array
-     */
-    public function getResponseData()
-    {
-        return $this->responseData;
-    }
-
-    /**
-     * Returns the response entity used to create the exception.
-     *
-     * @return FacebookResponse
-     */
-    public function getResponse()
-    {
-        return $this->response;
-    }
-}
diff --git a/mayor-orig/www/include/share/facebook/Exceptions/FacebookResumableUploadException.php b/mayor-orig/www/include/share/facebook/Exceptions/FacebookResumableUploadException.php
deleted file mode 100644
index 6f470662..00000000
--- a/mayor-orig/www/include/share/facebook/Exceptions/FacebookResumableUploadException.php
+++ /dev/null
@@ -1,33 +0,0 @@
- getenv(static::APP_ID_ENV_NAME),
-            'app_secret' => getenv(static::APP_SECRET_ENV_NAME),
-            'default_graph_version' => static::DEFAULT_GRAPH_VERSION,
-            'enable_beta_mode' => false,
-            'http_client_handler' => null,
-            'persistent_data_handler' => null,
-            'pseudo_random_string_generator' => null,
-            'url_detection_handler' => null,
-        ], $config);
-
-        if (!$config['app_id']) {
-            throw new FacebookSDKException('Required "app_id" key not supplied in config and could not find fallback environment variable "' . static::APP_ID_ENV_NAME . '"');
-        }
-        if (!$config['app_secret']) {
-            throw new FacebookSDKException('Required "app_secret" key not supplied in config and could not find fallback environment variable "' . static::APP_SECRET_ENV_NAME . '"');
-        }
-
-        $this->app = new FacebookApp($config['app_id'], $config['app_secret']);
-        $this->client = new FacebookClient(
-            HttpClientsFactory::createHttpClient($config['http_client_handler']),
-            $config['enable_beta_mode']
-        );
-        $this->pseudoRandomStringGenerator = PseudoRandomStringGeneratorFactory::createPseudoRandomStringGenerator(
-            $config['pseudo_random_string_generator']
-        );
-        $this->setUrlDetectionHandler($config['url_detection_handler'] ?: new FacebookUrlDetectionHandler());
-        $this->persistentDataHandler = PersistentDataFactory::createPersistentDataHandler(
-            $config['persistent_data_handler']
-        );
-
-        if (isset($config['default_access_token'])) {
-            $this->setDefaultAccessToken($config['default_access_token']);
-        }
-
-        // @todo v6: Throw an InvalidArgumentException if "default_graph_version" is not set
-        $this->defaultGraphVersion = $config['default_graph_version'];
-    }
-
-    /**
-     * Returns the FacebookApp entity.
-     *
-     * @return FacebookApp
-     */
-    public function getApp()
-    {
-        return $this->app;
-    }
-
-    /**
-     * Returns the FacebookClient service.
-     *
-     * @return FacebookClient
-     */
-    public function getClient()
-    {
-        return $this->client;
-    }
-
-    /**
-     * Returns the OAuth 2.0 client service.
-     *
-     * @return OAuth2Client
-     */
-    public function getOAuth2Client()
-    {
-        if (!$this->oAuth2Client instanceof OAuth2Client) {
-            $app = $this->getApp();
-            $client = $this->getClient();
-            $this->oAuth2Client = new OAuth2Client($app, $client, $this->defaultGraphVersion);
-        }
-
-        return $this->oAuth2Client;
-    }
-
-    /**
-     * Returns the last response returned from Graph.
-     *
-     * @return FacebookResponse|FacebookBatchResponse|null
-     */
-    public function getLastResponse()
-    {
-        return $this->lastResponse;
-    }
-
-    /**
-     * Returns the URL detection handler.
-     *
-     * @return UrlDetectionInterface
-     */
-    public function getUrlDetectionHandler()
-    {
-        return $this->urlDetectionHandler;
-    }
-
-    /**
-     * Changes the URL detection handler.
-     *
-     * @param UrlDetectionInterface $urlDetectionHandler
-     */
-    private function setUrlDetectionHandler(UrlDetectionInterface $urlDetectionHandler)
-    {
-        $this->urlDetectionHandler = $urlDetectionHandler;
-    }
-
-    /**
-     * Returns the default AccessToken entity.
-     *
-     * @return AccessToken|null
-     */
-    public function getDefaultAccessToken()
-    {
-        return $this->defaultAccessToken;
-    }
-
-    /**
-     * Sets the default access token to use with requests.
-     *
-     * @param AccessToken|string $accessToken The access token to save.
-     *
-     * @throws \InvalidArgumentException
-     */
-    public function setDefaultAccessToken($accessToken)
-    {
-        if (is_string($accessToken)) {
-            $this->defaultAccessToken = new AccessToken($accessToken);
-
-            return;
-        }
-
-        if ($accessToken instanceof AccessToken) {
-            $this->defaultAccessToken = $accessToken;
-
-            return;
-        }
-
-        throw new \InvalidArgumentException('The default access token must be of type "string" or Facebook\AccessToken');
-    }
-
-    /**
-     * Returns the default Graph version.
-     *
-     * @return string
-     */
-    public function getDefaultGraphVersion()
-    {
-        return $this->defaultGraphVersion;
-    }
-
-    /**
-     * Returns the redirect login helper.
-     *
-     * @return FacebookRedirectLoginHelper
-     */
-    public function getRedirectLoginHelper()
-    {
-        return new FacebookRedirectLoginHelper(
-            $this->getOAuth2Client(),
-            $this->persistentDataHandler,
-            $this->urlDetectionHandler,
-            $this->pseudoRandomStringGenerator
-        );
-    }
-
-    /**
-     * Returns the JavaScript helper.
-     *
-     * @return FacebookJavaScriptHelper
-     */
-    public function getJavaScriptHelper()
-    {
-        return new FacebookJavaScriptHelper($this->app, $this->client, $this->defaultGraphVersion);
-    }
-
-    /**
-     * Returns the canvas helper.
-     *
-     * @return FacebookCanvasHelper
-     */
-    public function getCanvasHelper()
-    {
-        return new FacebookCanvasHelper($this->app, $this->client, $this->defaultGraphVersion);
-    }
-
-    /**
-     * Returns the page tab helper.
-     *
-     * @return FacebookPageTabHelper
-     */
-    public function getPageTabHelper()
-    {
-        return new FacebookPageTabHelper($this->app, $this->client, $this->defaultGraphVersion);
-    }
-
-    /**
-     * Sends a GET request to Graph and returns the result.
-     *
-     * @param string                  $endpoint
-     * @param AccessToken|string|null $accessToken
-     * @param string|null             $eTag
-     * @param string|null             $graphVersion
-     *
-     * @return FacebookResponse
-     *
-     * @throws FacebookSDKException
-     */
-    public function get($endpoint, $accessToken = null, $eTag = null, $graphVersion = null)
-    {
-        return $this->sendRequest(
-            'GET',
-            $endpoint,
-            $params = [],
-            $accessToken,
-            $eTag,
-            $graphVersion
-        );
-    }
-
-    /**
-     * Sends a POST request to Graph and returns the result.
-     *
-     * @param string                  $endpoint
-     * @param array                   $params
-     * @param AccessToken|string|null $accessToken
-     * @param string|null             $eTag
-     * @param string|null             $graphVersion
-     *
-     * @return FacebookResponse
-     *
-     * @throws FacebookSDKException
-     */
-    public function post($endpoint, array $params = [], $accessToken = null, $eTag = null, $graphVersion = null)
-    {
-        return $this->sendRequest(
-            'POST',
-            $endpoint,
-            $params,
-            $accessToken,
-            $eTag,
-            $graphVersion
-        );
-    }
-
-    /**
-     * Sends a DELETE request to Graph and returns the result.
-     *
-     * @param string                  $endpoint
-     * @param array                   $params
-     * @param AccessToken|string|null $accessToken
-     * @param string|null             $eTag
-     * @param string|null             $graphVersion
-     *
-     * @return FacebookResponse
-     *
-     * @throws FacebookSDKException
-     */
-    public function delete($endpoint, array $params = [], $accessToken = null, $eTag = null, $graphVersion = null)
-    {
-        return $this->sendRequest(
-            'DELETE',
-            $endpoint,
-            $params,
-            $accessToken,
-            $eTag,
-            $graphVersion
-        );
-    }
-
-    /**
-     * Sends a request to Graph for the next page of results.
-     *
-     * @param GraphEdge $graphEdge The GraphEdge to paginate over.
-     *
-     * @return GraphEdge|null
-     *
-     * @throws FacebookSDKException
-     */
-    public function next(GraphEdge $graphEdge)
-    {
-        return $this->getPaginationResults($graphEdge, 'next');
-    }
-
-    /**
-     * Sends a request to Graph for the previous page of results.
-     *
-     * @param GraphEdge $graphEdge The GraphEdge to paginate over.
-     *
-     * @return GraphEdge|null
-     *
-     * @throws FacebookSDKException
-     */
-    public function previous(GraphEdge $graphEdge)
-    {
-        return $this->getPaginationResults($graphEdge, 'previous');
-    }
-
-    /**
-     * Sends a request to Graph for the next page of results.
-     *
-     * @param GraphEdge $graphEdge The GraphEdge to paginate over.
-     * @param string    $direction The direction of the pagination: next|previous.
-     *
-     * @return GraphEdge|null
-     *
-     * @throws FacebookSDKException
-     */
-    public function getPaginationResults(GraphEdge $graphEdge, $direction)
-    {
-        $paginationRequest = $graphEdge->getPaginationRequest($direction);
-        if (!$paginationRequest) {
-            return null;
-        }
-
-        $this->lastResponse = $this->client->sendRequest($paginationRequest);
-
-        // Keep the same GraphNode subclass
-        $subClassName = $graphEdge->getSubClassName();
-        $graphEdge = $this->lastResponse->getGraphEdge($subClassName, false);
-
-        return count($graphEdge) > 0 ? $graphEdge : null;
-    }
-
-    /**
-     * Sends a request to Graph and returns the result.
-     *
-     * @param string                  $method
-     * @param string                  $endpoint
-     * @param array                   $params
-     * @param AccessToken|string|null $accessToken
-     * @param string|null             $eTag
-     * @param string|null             $graphVersion
-     *
-     * @return FacebookResponse
-     *
-     * @throws FacebookSDKException
-     */
-    public function sendRequest($method, $endpoint, array $params = [], $accessToken = null, $eTag = null, $graphVersion = null)
-    {
-        $accessToken = $accessToken ?: $this->defaultAccessToken;
-        $graphVersion = $graphVersion ?: $this->defaultGraphVersion;
-        $request = $this->request($method, $endpoint, $params, $accessToken, $eTag, $graphVersion);
-
-        return $this->lastResponse = $this->client->sendRequest($request);
-    }
-
-    /**
-     * Sends a batched request to Graph and returns the result.
-     *
-     * @param array                   $requests
-     * @param AccessToken|string|null $accessToken
-     * @param string|null             $graphVersion
-     *
-     * @return FacebookBatchResponse
-     *
-     * @throws FacebookSDKException
-     */
-    public function sendBatchRequest(array $requests, $accessToken = null, $graphVersion = null)
-    {
-        $accessToken = $accessToken ?: $this->defaultAccessToken;
-        $graphVersion = $graphVersion ?: $this->defaultGraphVersion;
-        $batchRequest = new FacebookBatchRequest(
-            $this->app,
-            $requests,
-            $accessToken,
-            $graphVersion
-        );
-
-        return $this->lastResponse = $this->client->sendBatchRequest($batchRequest);
-    }
-
-    /**
-     * Instantiates an empty FacebookBatchRequest entity.
-     *
-     * @param  AccessToken|string|null $accessToken  The top-level access token. Requests with no access token
-     *                                               will fallback to this.
-     * @param  string|null             $graphVersion The Graph API version to use.
-     * @return FacebookBatchRequest
-     */
-    public function newBatchRequest($accessToken = null, $graphVersion = null)
-    {
-        $accessToken = $accessToken ?: $this->defaultAccessToken;
-        $graphVersion = $graphVersion ?: $this->defaultGraphVersion;
-
-        return new FacebookBatchRequest(
-            $this->app,
-            [],
-            $accessToken,
-            $graphVersion
-        );
-    }
-
-    /**
-     * Instantiates a new FacebookRequest entity.
-     *
-     * @param string                  $method
-     * @param string                  $endpoint
-     * @param array                   $params
-     * @param AccessToken|string|null $accessToken
-     * @param string|null             $eTag
-     * @param string|null             $graphVersion
-     *
-     * @return FacebookRequest
-     *
-     * @throws FacebookSDKException
-     */
-    public function request($method, $endpoint, array $params = [], $accessToken = null, $eTag = null, $graphVersion = null)
-    {
-        $accessToken = $accessToken ?: $this->defaultAccessToken;
-        $graphVersion = $graphVersion ?: $this->defaultGraphVersion;
-
-        return new FacebookRequest(
-            $this->app,
-            $accessToken,
-            $method,
-            $endpoint,
-            $params,
-            $eTag,
-            $graphVersion
-        );
-    }
-
-    /**
-     * Factory to create FacebookFile's.
-     *
-     * @param string $pathToFile
-     *
-     * @return FacebookFile
-     *
-     * @throws FacebookSDKException
-     */
-    public function fileToUpload($pathToFile)
-    {
-        return new FacebookFile($pathToFile);
-    }
-
-    /**
-     * Factory to create FacebookVideo's.
-     *
-     * @param string $pathToFile
-     *
-     * @return FacebookVideo
-     *
-     * @throws FacebookSDKException
-     */
-    public function videoToUpload($pathToFile)
-    {
-        return new FacebookVideo($pathToFile);
-    }
-
-    /**
-     * Upload a video in chunks.
-     *
-     * @param int $target The id of the target node before the /videos edge.
-     * @param string $pathToFile The full path to the file.
-     * @param array $metadata The metadata associated with the video file.
-     * @param string|null $accessToken The access token.
-     * @param int $maxTransferTries The max times to retry a failed upload chunk.
-     * @param string|null $graphVersion The Graph API version to use.
-     *
-     * @return array
-     *
-     * @throws FacebookSDKException
-     */
-    public function uploadVideo($target, $pathToFile, $metadata = [], $accessToken = null, $maxTransferTries = 5, $graphVersion = null)
-    {
-        $accessToken = $accessToken ?: $this->defaultAccessToken;
-        $graphVersion = $graphVersion ?: $this->defaultGraphVersion;
-
-        $uploader = new FacebookResumableUploader($this->app, $this->client, $accessToken, $graphVersion);
-        $endpoint = '/'.$target.'/videos';
-        $file = $this->videoToUpload($pathToFile);
-        $chunk = $uploader->start($endpoint, $file);
-
-        do {
-            $chunk = $this->maxTriesTransfer($uploader, $endpoint, $chunk, $maxTransferTries);
-        } while (!$chunk->isLastChunk());
-
-        return [
-          'video_id' => $chunk->getVideoId(),
-          'success' => $uploader->finish($endpoint, $chunk->getUploadSessionId(), $metadata),
-        ];
-    }
-
-    /**
-     * Attempts to upload a chunk of a file in $retryCountdown tries.
-     *
-     * @param FacebookResumableUploader $uploader
-     * @param string $endpoint
-     * @param FacebookTransferChunk $chunk
-     * @param int $retryCountdown
-     *
-     * @return FacebookTransferChunk
-     *
-     * @throws FacebookSDKException
-     */
-    private function maxTriesTransfer(FacebookResumableUploader $uploader, $endpoint, FacebookTransferChunk $chunk, $retryCountdown)
-    {
-        $newChunk = $uploader->transfer($endpoint, $chunk, $retryCountdown < 1);
-
-        if ($newChunk !== $chunk) {
-            return $newChunk;
-        }
-
-        $retryCountdown--;
-
-        // If transfer() returned the same chunk entity, the transfer failed but is resumable.
-        return $this->maxTriesTransfer($uploader, $endpoint, $chunk, $retryCountdown);
-    }
-}
diff --git a/mayor-orig/www/include/share/facebook/FacebookApp.php b/mayor-orig/www/include/share/facebook/FacebookApp.php
deleted file mode 100644
index 804c9bb5..00000000
--- a/mayor-orig/www/include/share/facebook/FacebookApp.php
+++ /dev/null
@@ -1,110 +0,0 @@
-id = (string) $id;
-        $this->secret = $secret;
-    }
-
-    /**
-     * Returns the app ID.
-     *
-     * @return string
-     */
-    public function getId()
-    {
-        return $this->id;
-    }
-
-    /**
-     * Returns the app secret.
-     *
-     * @return string
-     */
-    public function getSecret()
-    {
-        return $this->secret;
-    }
-
-    /**
-     * Returns an app access token.
-     *
-     * @return AccessToken
-     */
-    public function getAccessToken()
-    {
-        return new AccessToken($this->id . '|' . $this->secret);
-    }
-
-    /**
-     * Serializes the FacebookApp entity as a string.
-     *
-     * @return string
-     */
-    public function serialize()
-    {
-        return implode('|', [$this->id, $this->secret]);
-    }
-
-    /**
-     * Unserializes a string as a FacebookApp entity.
-     *
-     * @param string $serialized
-     */
-    public function unserialize($serialized)
-    {
-        list($id, $secret) = explode('|', $serialized);
-
-        $this->__construct($id, $secret);
-    }
-}
diff --git a/mayor-orig/www/include/share/facebook/FacebookBatchRequest.php b/mayor-orig/www/include/share/facebook/FacebookBatchRequest.php
deleted file mode 100644
index 9297e77d..00000000
--- a/mayor-orig/www/include/share/facebook/FacebookBatchRequest.php
+++ /dev/null
@@ -1,322 +0,0 @@
-add($requests);
-    }
-
-    /**
-     * Adds a new request to the array.
-     *
-     * @param FacebookRequest|array $request
-     * @param string|null|array     $options Array of batch request options e.g. 'name', 'omit_response_on_success'.
-     *                                       If a string is given, it is the value of the 'name' option.
-     *
-     * @return FacebookBatchRequest
-     *
-     * @throws \InvalidArgumentException
-     */
-    public function add($request, $options = null)
-    {
-        if (is_array($request)) {
-            foreach ($request as $key => $req) {
-                $this->add($req, $key);
-            }
-
-            return $this;
-        }
-
-        if (!$request instanceof FacebookRequest) {
-            throw new \InvalidArgumentException('Argument for add() must be of type array or FacebookRequest.');
-        }
-
-        if (null === $options) {
-            $options = [];
-        } elseif (!is_array($options)) {
-            $options = ['name' => $options];
-        }
-
-        $this->addFallbackDefaults($request);
-
-        // File uploads
-        $attachedFiles = $this->extractFileAttachments($request);
-
-        $name = isset($options['name']) ? $options['name'] : null;
-
-        unset($options['name']);
-
-        $requestToAdd = [
-            'name' => $name,
-            'request' => $request,
-            'options' => $options,
-            'attached_files' => $attachedFiles,
-        ];
-
-        $this->requests[] = $requestToAdd;
-
-        return $this;
-    }
-
-    /**
-     * Ensures that the FacebookApp and access token fall back when missing.
-     *
-     * @param FacebookRequest $request
-     *
-     * @throws FacebookSDKException
-     */
-    public function addFallbackDefaults(FacebookRequest $request)
-    {
-        if (!$request->getApp()) {
-            $app = $this->getApp();
-            if (!$app) {
-                throw new FacebookSDKException('Missing FacebookApp on FacebookRequest and no fallback detected on FacebookBatchRequest.');
-            }
-            $request->setApp($app);
-        }
-
-        if (!$request->getAccessToken()) {
-            $accessToken = $this->getAccessToken();
-            if (!$accessToken) {
-                throw new FacebookSDKException('Missing access token on FacebookRequest and no fallback detected on FacebookBatchRequest.');
-            }
-            $request->setAccessToken($accessToken);
-        }
-    }
-
-    /**
-     * Extracts the files from a request.
-     *
-     * @param FacebookRequest $request
-     *
-     * @return string|null
-     *
-     * @throws FacebookSDKException
-     */
-    public function extractFileAttachments(FacebookRequest $request)
-    {
-        if (!$request->containsFileUploads()) {
-            return null;
-        }
-
-        $files = $request->getFiles();
-        $fileNames = [];
-        foreach ($files as $file) {
-            $fileName = uniqid();
-            $this->addFile($fileName, $file);
-            $fileNames[] = $fileName;
-        }
-
-        $request->resetFiles();
-
-        // @TODO Does Graph support multiple uploads on one endpoint?
-        return implode(',', $fileNames);
-    }
-
-    /**
-     * Return the FacebookRequest entities.
-     *
-     * @return array
-     */
-    public function getRequests()
-    {
-        return $this->requests;
-    }
-
-    /**
-     * Prepares the requests to be sent as a batch request.
-     */
-    public function prepareRequestsForBatch()
-    {
-        $this->validateBatchRequestCount();
-
-        $params = [
-            'batch' => $this->convertRequestsToJson(),
-            'include_headers' => true,
-        ];
-        $this->setParams($params);
-    }
-
-    /**
-     * Converts the requests into a JSON(P) string.
-     *
-     * @return string
-     */
-    public function convertRequestsToJson()
-    {
-        $requests = [];
-        foreach ($this->requests as $request) {
-            $options = [];
-
-            if (null !== $request['name']) {
-                $options['name'] = $request['name'];
-            }
-
-            $options += $request['options'];
-
-            $requests[] = $this->requestEntityToBatchArray($request['request'], $options, $request['attached_files']);
-        }
-
-        return json_encode($requests);
-    }
-
-    /**
-     * Validate the request count before sending them as a batch.
-     *
-     * @throws FacebookSDKException
-     */
-    public function validateBatchRequestCount()
-    {
-        $batchCount = count($this->requests);
-        if ($batchCount === 0) {
-            throw new FacebookSDKException('There are no batch requests to send.');
-        } elseif ($batchCount > 50) {
-            // Per: https://developers.facebook.com/docs/graph-api/making-multiple-requests#limits
-            throw new FacebookSDKException('You cannot send more than 50 batch requests at a time.');
-        }
-    }
-
-    /**
-     * Converts a Request entity into an array that is batch-friendly.
-     *
-     * @param FacebookRequest   $request       The request entity to convert.
-     * @param string|null|array $options       Array of batch request options e.g. 'name', 'omit_response_on_success'.
-     *                                         If a string is given, it is the value of the 'name' option.
-     * @param string|null       $attachedFiles Names of files associated with the request.
-     *
-     * @return array
-     */
-    public function requestEntityToBatchArray(FacebookRequest $request, $options = null, $attachedFiles = null)
-    {
-
-        if (null === $options) {
-            $options = [];
-        } elseif (!is_array($options)) {
-            $options = ['name' => $options];
-        }
-
-        $compiledHeaders = [];
-        $headers = $request->getHeaders();
-        foreach ($headers as $name => $value) {
-            $compiledHeaders[] = $name . ': ' . $value;
-        }
-
-        $batch = [
-            'headers' => $compiledHeaders,
-            'method' => $request->getMethod(),
-            'relative_url' => $request->getUrl(),
-        ];
-
-        // Since file uploads are moved to the root request of a batch request,
-        // the child requests will always be URL-encoded.
-        $body = $request->getUrlEncodedBody()->getBody();
-        if ($body) {
-            $batch['body'] = $body;
-        }
-
-        $batch += $options;
-
-        if (null !== $attachedFiles) {
-            $batch['attached_files'] = $attachedFiles;
-        }
-
-        return $batch;
-    }
-
-    /**
-     * Get an iterator for the items.
-     *
-     * @return ArrayIterator
-     */
-    public function getIterator()
-    {
-        return new ArrayIterator($this->requests);
-    }
-
-    /**
-     * @inheritdoc
-     */
-    public function offsetSet($offset, $value)
-    {
-        $this->add($value, $offset);
-    }
-
-    /**
-     * @inheritdoc
-     */
-    public function offsetExists($offset)
-    {
-        return isset($this->requests[$offset]);
-    }
-
-    /**
-     * @inheritdoc
-     */
-    public function offsetUnset($offset)
-    {
-        unset($this->requests[$offset]);
-    }
-
-    /**
-     * @inheritdoc
-     */
-    public function offsetGet($offset)
-    {
-        return isset($this->requests[$offset]) ? $this->requests[$offset] : null;
-    }
-}
diff --git a/mayor-orig/www/include/share/facebook/FacebookBatchResponse.php b/mayor-orig/www/include/share/facebook/FacebookBatchResponse.php
deleted file mode 100644
index 8e1464c9..00000000
--- a/mayor-orig/www/include/share/facebook/FacebookBatchResponse.php
+++ /dev/null
@@ -1,174 +0,0 @@
-batchRequest = $batchRequest;
-
-        $request = $response->getRequest();
-        $body = $response->getBody();
-        $httpStatusCode = $response->getHttpStatusCode();
-        $headers = $response->getHeaders();
-        parent::__construct($request, $body, $httpStatusCode, $headers);
-
-        $responses = $response->getDecodedBody();
-        $this->setResponses($responses);
-    }
-
-    /**
-     * Returns an array of FacebookResponse entities.
-     *
-     * @return array
-     */
-    public function getResponses()
-    {
-        return $this->responses;
-    }
-
-    /**
-     * The main batch response will be an array of requests so
-     * we need to iterate over all the responses.
-     *
-     * @param array $responses
-     */
-    public function setResponses(array $responses)
-    {
-        $this->responses = [];
-
-        foreach ($responses as $key => $graphResponse) {
-            $this->addResponse($key, $graphResponse);
-        }
-    }
-
-    /**
-     * Add a response to the list.
-     *
-     * @param int        $key
-     * @param array|null $response
-     */
-    public function addResponse($key, $response)
-    {
-        $originalRequestName = isset($this->batchRequest[$key]['name']) ? $this->batchRequest[$key]['name'] : $key;
-        $originalRequest = isset($this->batchRequest[$key]['request']) ? $this->batchRequest[$key]['request'] : null;
-
-        $httpResponseBody = isset($response['body']) ? $response['body'] : null;
-        $httpResponseCode = isset($response['code']) ? $response['code'] : null;
-        // @TODO With PHP 5.5 support, this becomes array_column($response['headers'], 'value', 'name')
-        $httpResponseHeaders = isset($response['headers']) ? $this->normalizeBatchHeaders($response['headers']) : [];
-
-        $this->responses[$originalRequestName] = new FacebookResponse(
-            $originalRequest,
-            $httpResponseBody,
-            $httpResponseCode,
-            $httpResponseHeaders
-        );
-    }
-
-    /**
-     * @inheritdoc
-     */
-    public function getIterator()
-    {
-        return new ArrayIterator($this->responses);
-    }
-
-    /**
-     * @inheritdoc
-     */
-    public function offsetSet($offset, $value)
-    {
-        $this->addResponse($offset, $value);
-    }
-
-    /**
-     * @inheritdoc
-     */
-    public function offsetExists($offset)
-    {
-        return isset($this->responses[$offset]);
-    }
-
-    /**
-     * @inheritdoc
-     */
-    public function offsetUnset($offset)
-    {
-        unset($this->responses[$offset]);
-    }
-
-    /**
-     * @inheritdoc
-     */
-    public function offsetGet($offset)
-    {
-        return isset($this->responses[$offset]) ? $this->responses[$offset] : null;
-    }
-
-    /**
-     * Converts the batch header array into a standard format.
-     * @TODO replace with array_column() when PHP 5.5 is supported.
-     *
-     * @param array $batchHeaders
-     *
-     * @return array
-     */
-    private function normalizeBatchHeaders(array $batchHeaders)
-    {
-        $headers = [];
-
-        foreach ($batchHeaders as $header) {
-            $headers[$header['name']] = $header['value'];
-        }
-
-        return $headers;
-    }
-}
diff --git a/mayor-orig/www/include/share/facebook/FacebookClient.php b/mayor-orig/www/include/share/facebook/FacebookClient.php
deleted file mode 100644
index dbf75923..00000000
--- a/mayor-orig/www/include/share/facebook/FacebookClient.php
+++ /dev/null
@@ -1,250 +0,0 @@
-httpClientHandler = $httpClientHandler ?: $this->detectHttpClientHandler();
-        $this->enableBetaMode = $enableBeta;
-    }
-
-    /**
-     * Sets the HTTP client handler.
-     *
-     * @param FacebookHttpClientInterface $httpClientHandler
-     */
-    public function setHttpClientHandler(FacebookHttpClientInterface $httpClientHandler)
-    {
-        $this->httpClientHandler = $httpClientHandler;
-    }
-
-    /**
-     * Returns the HTTP client handler.
-     *
-     * @return FacebookHttpClientInterface
-     */
-    public function getHttpClientHandler()
-    {
-        return $this->httpClientHandler;
-    }
-
-    /**
-     * Detects which HTTP client handler to use.
-     *
-     * @return FacebookHttpClientInterface
-     */
-    public function detectHttpClientHandler()
-    {
-        return extension_loaded('curl') ? new FacebookCurlHttpClient() : new FacebookStreamHttpClient();
-    }
-
-    /**
-     * Toggle beta mode.
-     *
-     * @param boolean $betaMode
-     */
-    public function enableBetaMode($betaMode = true)
-    {
-        $this->enableBetaMode = $betaMode;
-    }
-
-    /**
-     * Returns the base Graph URL.
-     *
-     * @param boolean $postToVideoUrl Post to the video API if videos are being uploaded.
-     *
-     * @return string
-     */
-    public function getBaseGraphUrl($postToVideoUrl = false)
-    {
-        if ($postToVideoUrl) {
-            return $this->enableBetaMode ? static::BASE_GRAPH_VIDEO_URL_BETA : static::BASE_GRAPH_VIDEO_URL;
-        }
-
-        return $this->enableBetaMode ? static::BASE_GRAPH_URL_BETA : static::BASE_GRAPH_URL;
-    }
-
-    /**
-     * Prepares the request for sending to the client handler.
-     *
-     * @param FacebookRequest $request
-     *
-     * @return array
-     */
-    public function prepareRequestMessage(FacebookRequest $request)
-    {
-        $postToVideoUrl = $request->containsVideoUploads();
-        $url = $this->getBaseGraphUrl($postToVideoUrl) . $request->getUrl();
-
-        // If we're sending files they should be sent as multipart/form-data
-        if ($request->containsFileUploads()) {
-            $requestBody = $request->getMultipartBody();
-            $request->setHeaders([
-                'Content-Type' => 'multipart/form-data; boundary=' . $requestBody->getBoundary(),
-            ]);
-        } else {
-            $requestBody = $request->getUrlEncodedBody();
-            $request->setHeaders([
-                'Content-Type' => 'application/x-www-form-urlencoded',
-            ]);
-        }
-
-        return [
-            $url,
-            $request->getMethod(),
-            $request->getHeaders(),
-            $requestBody->getBody(),
-        ];
-    }
-
-    /**
-     * Makes the request to Graph and returns the result.
-     *
-     * @param FacebookRequest $request
-     *
-     * @return FacebookResponse
-     *
-     * @throws FacebookSDKException
-     */
-    public function sendRequest(FacebookRequest $request)
-    {
-        if (get_class($request) === 'Facebook\FacebookRequest') {
-            $request->validateAccessToken();
-        }
-
-        list($url, $method, $headers, $body) = $this->prepareRequestMessage($request);
-
-        // Since file uploads can take a while, we need to give more time for uploads
-        $timeOut = static::DEFAULT_REQUEST_TIMEOUT;
-        if ($request->containsFileUploads()) {
-            $timeOut = static::DEFAULT_FILE_UPLOAD_REQUEST_TIMEOUT;
-        } elseif ($request->containsVideoUploads()) {
-            $timeOut = static::DEFAULT_VIDEO_UPLOAD_REQUEST_TIMEOUT;
-        }
-
-        // Should throw `FacebookSDKException` exception on HTTP client error.
-        // Don't catch to allow it to bubble up.
-        $rawResponse = $this->httpClientHandler->send($url, $method, $body, $headers, $timeOut);
-
-        static::$requestCount++;
-
-        $returnResponse = new FacebookResponse(
-            $request,
-            $rawResponse->getBody(),
-            $rawResponse->getHttpResponseCode(),
-            $rawResponse->getHeaders()
-        );
-
-        if ($returnResponse->isError()) {
-            throw $returnResponse->getThrownException();
-        }
-
-        return $returnResponse;
-    }
-
-    /**
-     * Makes a batched request to Graph and returns the result.
-     *
-     * @param FacebookBatchRequest $request
-     *
-     * @return FacebookBatchResponse
-     *
-     * @throws FacebookSDKException
-     */
-    public function sendBatchRequest(FacebookBatchRequest $request)
-    {
-        $request->prepareRequestsForBatch();
-        $facebookResponse = $this->sendRequest($request);
-
-        return new FacebookBatchResponse($request, $facebookResponse);
-    }
-}
diff --git a/mayor-orig/www/include/share/facebook/FacebookRequest.php b/mayor-orig/www/include/share/facebook/FacebookRequest.php
deleted file mode 100644
index 2b100899..00000000
--- a/mayor-orig/www/include/share/facebook/FacebookRequest.php
+++ /dev/null
@@ -1,534 +0,0 @@
-setApp($app);
-        $this->setAccessToken($accessToken);
-        $this->setMethod($method);
-        $this->setEndpoint($endpoint);
-        $this->setParams($params);
-        $this->setETag($eTag);
-        $this->graphVersion = $graphVersion ?: Facebook::DEFAULT_GRAPH_VERSION;
-    }
-
-    /**
-     * Set the access token for this request.
-     *
-     * @param AccessToken|string|null
-     *
-     * @return FacebookRequest
-     */
-    public function setAccessToken($accessToken)
-    {
-        $this->accessToken = $accessToken;
-        if ($accessToken instanceof AccessToken) {
-            $this->accessToken = $accessToken->getValue();
-        }
-
-        return $this;
-    }
-
-    /**
-     * Sets the access token with one harvested from a URL or POST params.
-     *
-     * @param string $accessToken The access token.
-     *
-     * @return FacebookRequest
-     *
-     * @throws FacebookSDKException
-     */
-    public function setAccessTokenFromParams($accessToken)
-    {
-        $existingAccessToken = $this->getAccessToken();
-        if (!$existingAccessToken) {
-            $this->setAccessToken($accessToken);
-        } elseif ($accessToken !== $existingAccessToken) {
-            throw new FacebookSDKException('Access token mismatch. The access token provided in the FacebookRequest and the one provided in the URL or POST params do not match.');
-        }
-
-        return $this;
-    }
-
-    /**
-     * Return the access token for this request.
-     *
-     * @return string|null
-     */
-    public function getAccessToken()
-    {
-        return $this->accessToken;
-    }
-
-    /**
-     * Return the access token for this request as an AccessToken entity.
-     *
-     * @return AccessToken|null
-     */
-    public function getAccessTokenEntity()
-    {
-        return $this->accessToken ? new AccessToken($this->accessToken) : null;
-    }
-
-    /**
-     * Set the FacebookApp entity used for this request.
-     *
-     * @param FacebookApp|null $app
-     */
-    public function setApp(FacebookApp $app = null)
-    {
-        $this->app = $app;
-    }
-
-    /**
-     * Return the FacebookApp entity used for this request.
-     *
-     * @return FacebookApp
-     */
-    public function getApp()
-    {
-        return $this->app;
-    }
-
-    /**
-     * Generate an app secret proof to sign this request.
-     *
-     * @return string|null
-     */
-    public function getAppSecretProof()
-    {
-        if (!$accessTokenEntity = $this->getAccessTokenEntity()) {
-            return null;
-        }
-
-        return $accessTokenEntity->getAppSecretProof($this->app->getSecret());
-    }
-
-    /**
-     * Validate that an access token exists for this request.
-     *
-     * @throws FacebookSDKException
-     */
-    public function validateAccessToken()
-    {
-        $accessToken = $this->getAccessToken();
-        if (!$accessToken) {
-            throw new FacebookSDKException('You must provide an access token.');
-        }
-    }
-
-    /**
-     * Set the HTTP method for this request.
-     *
-     * @param string
-     */
-    public function setMethod($method)
-    {
-        $this->method = strtoupper($method);
-    }
-
-    /**
-     * Return the HTTP method for this request.
-     *
-     * @return string
-     */
-    public function getMethod()
-    {
-        return $this->method;
-    }
-
-    /**
-     * Validate that the HTTP method is set.
-     *
-     * @throws FacebookSDKException
-     */
-    public function validateMethod()
-    {
-        if (!$this->method) {
-            throw new FacebookSDKException('HTTP method not specified.');
-        }
-
-        if (!in_array($this->method, ['GET', 'POST', 'DELETE'])) {
-            throw new FacebookSDKException('Invalid HTTP method specified.');
-        }
-    }
-
-    /**
-     * Set the endpoint for this request.
-     *
-     * @param string
-     *
-     * @return FacebookRequest
-     *
-     * @throws FacebookSDKException
-     */
-    public function setEndpoint($endpoint)
-    {
-        // Harvest the access token from the endpoint to keep things in sync
-        $params = FacebookUrlManipulator::getParamsAsArray($endpoint);
-        if (isset($params['access_token'])) {
-            $this->setAccessTokenFromParams($params['access_token']);
-        }
-
-        // Clean the token & app secret proof from the endpoint.
-        $filterParams = ['access_token', 'appsecret_proof'];
-        $this->endpoint = FacebookUrlManipulator::removeParamsFromUrl($endpoint, $filterParams);
-
-        return $this;
-    }
-
-    /**
-     * Return the endpoint for this request.
-     *
-     * @return string
-     */
-    public function getEndpoint()
-    {
-        // For batch requests, this will be empty
-        return $this->endpoint;
-    }
-
-    /**
-     * Generate and return the headers for this request.
-     *
-     * @return array
-     */
-    public function getHeaders()
-    {
-        $headers = static::getDefaultHeaders();
-
-        if ($this->eTag) {
-            $headers['If-None-Match'] = $this->eTag;
-        }
-
-        return array_merge($this->headers, $headers);
-    }
-
-    /**
-     * Set the headers for this request.
-     *
-     * @param array $headers
-     */
-    public function setHeaders(array $headers)
-    {
-        $this->headers = array_merge($this->headers, $headers);
-    }
-
-    /**
-     * Sets the eTag value.
-     *
-     * @param string $eTag
-     */
-    public function setETag($eTag)
-    {
-        $this->eTag = $eTag;
-    }
-
-    /**
-     * Set the params for this request.
-     *
-     * @param array $params
-     *
-     * @return FacebookRequest
-     *
-     * @throws FacebookSDKException
-     */
-    public function setParams(array $params = [])
-    {
-        if (isset($params['access_token'])) {
-            $this->setAccessTokenFromParams($params['access_token']);
-        }
-
-        // Don't let these buggers slip in.
-        unset($params['access_token'], $params['appsecret_proof']);
-
-        // @TODO Refactor code above with this
-        //$params = $this->sanitizeAuthenticationParams($params);
-        $params = $this->sanitizeFileParams($params);
-        $this->dangerouslySetParams($params);
-
-        return $this;
-    }
-
-    /**
-     * Set the params for this request without filtering them first.
-     *
-     * @param array $params
-     *
-     * @return FacebookRequest
-     */
-    public function dangerouslySetParams(array $params = [])
-    {
-        $this->params = array_merge($this->params, $params);
-
-        return $this;
-    }
-
-    /**
-     * Iterate over the params and pull out the file uploads.
-     *
-     * @param array $params
-     *
-     * @return array
-     */
-    public function sanitizeFileParams(array $params)
-    {
-        foreach ($params as $key => $value) {
-            if ($value instanceof FacebookFile) {
-                $this->addFile($key, $value);
-                unset($params[$key]);
-            }
-        }
-
-        return $params;
-    }
-
-    /**
-     * Add a file to be uploaded.
-     *
-     * @param string       $key
-     * @param FacebookFile $file
-     */
-    public function addFile($key, FacebookFile $file)
-    {
-        $this->files[$key] = $file;
-    }
-
-    /**
-     * Removes all the files from the upload queue.
-     */
-    public function resetFiles()
-    {
-        $this->files = [];
-    }
-
-    /**
-     * Get the list of files to be uploaded.
-     *
-     * @return array
-     */
-    public function getFiles()
-    {
-        return $this->files;
-    }
-
-    /**
-     * Let's us know if there is a file upload with this request.
-     *
-     * @return boolean
-     */
-    public function containsFileUploads()
-    {
-        return !empty($this->files);
-    }
-
-    /**
-     * Let's us know if there is a video upload with this request.
-     *
-     * @return boolean
-     */
-    public function containsVideoUploads()
-    {
-        foreach ($this->files as $file) {
-            if ($file instanceof FacebookVideo) {
-                return true;
-            }
-        }
-
-        return false;
-    }
-
-    /**
-     * Returns the body of the request as multipart/form-data.
-     *
-     * @return RequestBodyMultipart
-     */
-    public function getMultipartBody()
-    {
-        $params = $this->getPostParams();
-
-        return new RequestBodyMultipart($params, $this->files);
-    }
-
-    /**
-     * Returns the body of the request as URL-encoded.
-     *
-     * @return RequestBodyUrlEncoded
-     */
-    public function getUrlEncodedBody()
-    {
-        $params = $this->getPostParams();
-
-        return new RequestBodyUrlEncoded($params);
-    }
-
-    /**
-     * Generate and return the params for this request.
-     *
-     * @return array
-     */
-    public function getParams()
-    {
-        $params = $this->params;
-
-        $accessToken = $this->getAccessToken();
-        if ($accessToken) {
-            $params['access_token'] = $accessToken;
-            $params['appsecret_proof'] = $this->getAppSecretProof();
-        }
-
-        return $params;
-    }
-
-    /**
-     * Only return params on POST requests.
-     *
-     * @return array
-     */
-    public function getPostParams()
-    {
-        if ($this->getMethod() === 'POST') {
-            return $this->getParams();
-        }
-
-        return [];
-    }
-
-    /**
-     * The graph version used for this request.
-     *
-     * @return string
-     */
-    public function getGraphVersion()
-    {
-        return $this->graphVersion;
-    }
-
-    /**
-     * Generate and return the URL for this request.
-     *
-     * @return string
-     */
-    public function getUrl()
-    {
-        $this->validateMethod();
-
-        $graphVersion = FacebookUrlManipulator::forceSlashPrefix($this->graphVersion);
-        $endpoint = FacebookUrlManipulator::forceSlashPrefix($this->getEndpoint());
-
-        $url = $graphVersion . $endpoint;
-
-        if ($this->getMethod() !== 'POST') {
-            $params = $this->getParams();
-            $url = FacebookUrlManipulator::appendParamsToUrl($url, $params);
-        }
-
-        return $url;
-    }
-
-    /**
-     * Return the default headers that every request should use.
-     *
-     * @return array
-     */
-    public static function getDefaultHeaders()
-    {
-        return [
-            'User-Agent' => 'fb-php-' . Facebook::VERSION,
-            'Accept-Encoding' => '*',
-        ];
-    }
-}
diff --git a/mayor-orig/www/include/share/facebook/FacebookResponse.php b/mayor-orig/www/include/share/facebook/FacebookResponse.php
deleted file mode 100644
index 251ca2f7..00000000
--- a/mayor-orig/www/include/share/facebook/FacebookResponse.php
+++ /dev/null
@@ -1,410 +0,0 @@
-request = $request;
-        $this->body = $body;
-        $this->httpStatusCode = $httpStatusCode;
-        $this->headers = $headers;
-
-        $this->decodeBody();
-    }
-
-    /**
-     * Return the original request that returned this response.
-     *
-     * @return FacebookRequest
-     */
-    public function getRequest()
-    {
-        return $this->request;
-    }
-
-    /**
-     * Return the FacebookApp entity used for this response.
-     *
-     * @return FacebookApp
-     */
-    public function getApp()
-    {
-        return $this->request->getApp();
-    }
-
-    /**
-     * Return the access token that was used for this response.
-     *
-     * @return string|null
-     */
-    public function getAccessToken()
-    {
-        return $this->request->getAccessToken();
-    }
-
-    /**
-     * Return the HTTP status code for this response.
-     *
-     * @return int
-     */
-    public function getHttpStatusCode()
-    {
-        return $this->httpStatusCode;
-    }
-
-    /**
-     * Return the HTTP headers for this response.
-     *
-     * @return array
-     */
-    public function getHeaders()
-    {
-        return $this->headers;
-    }
-
-    /**
-     * Return the raw body response.
-     *
-     * @return string
-     */
-    public function getBody()
-    {
-        return $this->body;
-    }
-
-    /**
-     * Return the decoded body response.
-     *
-     * @return array
-     */
-    public function getDecodedBody()
-    {
-        return $this->decodedBody;
-    }
-
-    /**
-     * Get the app secret proof that was used for this response.
-     *
-     * @return string|null
-     */
-    public function getAppSecretProof()
-    {
-        return $this->request->getAppSecretProof();
-    }
-
-    /**
-     * Get the ETag associated with the response.
-     *
-     * @return string|null
-     */
-    public function getETag()
-    {
-        return isset($this->headers['ETag']) ? $this->headers['ETag'] : null;
-    }
-
-    /**
-     * Get the version of Graph that returned this response.
-     *
-     * @return string|null
-     */
-    public function getGraphVersion()
-    {
-        return isset($this->headers['Facebook-API-Version']) ? $this->headers['Facebook-API-Version'] : null;
-    }
-
-    /**
-     * Returns true if Graph returned an error message.
-     *
-     * @return boolean
-     */
-    public function isError()
-    {
-        return isset($this->decodedBody['error']);
-    }
-
-    /**
-     * Throws the exception.
-     *
-     * @throws FacebookSDKException
-     */
-    public function throwException()
-    {
-        throw $this->thrownException;
-    }
-
-    /**
-     * Instantiates an exception to be thrown later.
-     */
-    public function makeException()
-    {
-        $this->thrownException = FacebookResponseException::create($this);
-    }
-
-    /**
-     * Returns the exception that was thrown for this request.
-     *
-     * @return FacebookResponseException|null
-     */
-    public function getThrownException()
-    {
-        return $this->thrownException;
-    }
-
-    /**
-     * Convert the raw response into an array if possible.
-     *
-     * Graph will return 2 types of responses:
-     * - JSON(P)
-     *    Most responses from Graph are JSON(P)
-     * - application/x-www-form-urlencoded key/value pairs
-     *    Happens on the `/oauth/access_token` endpoint when exchanging
-     *    a short-lived access token for a long-lived access token
-     * - And sometimes nothing :/ but that'd be a bug.
-     */
-    public function decodeBody()
-    {
-        $this->decodedBody = json_decode($this->body, true);
-
-        if ($this->decodedBody === null) {
-            $this->decodedBody = [];
-            parse_str($this->body, $this->decodedBody);
-        } elseif (is_bool($this->decodedBody)) {
-            // Backwards compatibility for Graph < 2.1.
-            // Mimics 2.1 responses.
-            // @TODO Remove this after Graph 2.0 is no longer supported
-            $this->decodedBody = ['success' => $this->decodedBody];
-        } elseif (is_numeric($this->decodedBody)) {
-            $this->decodedBody = ['id' => $this->decodedBody];
-        }
-
-        if (!is_array($this->decodedBody)) {
-            $this->decodedBody = [];
-        }
-
-        if ($this->isError()) {
-            $this->makeException();
-        }
-    }
-
-    /**
-     * Instantiate a new GraphObject from response.
-     *
-     * @param string|null $subclassName The GraphNode subclass to cast to.
-     *
-     * @return \Facebook\GraphNodes\GraphObject
-     *
-     * @throws FacebookSDKException
-     *
-     * @deprecated 5.0.0 getGraphObject() has been renamed to getGraphNode()
-     * @todo v6: Remove this method
-     */
-    public function getGraphObject($subclassName = null)
-    {
-        return $this->getGraphNode($subclassName);
-    }
-
-    /**
-     * Instantiate a new GraphNode from response.
-     *
-     * @param string|null $subclassName The GraphNode subclass to cast to.
-     *
-     * @return \Facebook\GraphNodes\GraphNode
-     *
-     * @throws FacebookSDKException
-     */
-    public function getGraphNode($subclassName = null)
-    {
-        $factory = new GraphNodeFactory($this);
-
-        return $factory->makeGraphNode($subclassName);
-    }
-
-    /**
-     * Convenience method for creating a GraphAlbum collection.
-     *
-     * @return \Facebook\GraphNodes\GraphAlbum
-     *
-     * @throws FacebookSDKException
-     */
-    public function getGraphAlbum()
-    {
-        $factory = new GraphNodeFactory($this);
-
-        return $factory->makeGraphAlbum();
-    }
-
-    /**
-     * Convenience method for creating a GraphPage collection.
-     *
-     * @return \Facebook\GraphNodes\GraphPage
-     *
-     * @throws FacebookSDKException
-     */
-    public function getGraphPage()
-    {
-        $factory = new GraphNodeFactory($this);
-
-        return $factory->makeGraphPage();
-    }
-
-    /**
-     * Convenience method for creating a GraphSessionInfo collection.
-     *
-     * @return \Facebook\GraphNodes\GraphSessionInfo
-     *
-     * @throws FacebookSDKException
-     */
-    public function getGraphSessionInfo()
-    {
-        $factory = new GraphNodeFactory($this);
-
-        return $factory->makeGraphSessionInfo();
-    }
-
-    /**
-     * Convenience method for creating a GraphUser collection.
-     *
-     * @return \Facebook\GraphNodes\GraphUser
-     *
-     * @throws FacebookSDKException
-     */
-    public function getGraphUser()
-    {
-        $factory = new GraphNodeFactory($this);
-
-        return $factory->makeGraphUser();
-    }
-
-    /**
-     * Convenience method for creating a GraphEvent collection.
-     *
-     * @return \Facebook\GraphNodes\GraphEvent
-     *
-     * @throws FacebookSDKException
-     */
-    public function getGraphEvent()
-    {
-        $factory = new GraphNodeFactory($this);
-
-        return $factory->makeGraphEvent();
-    }
-
-    /**
-     * Convenience method for creating a GraphGroup collection.
-     *
-     * @return \Facebook\GraphNodes\GraphGroup
-     *
-     * @throws FacebookSDKException
-     */
-    public function getGraphGroup()
-    {
-        $factory = new GraphNodeFactory($this);
-
-        return $factory->makeGraphGroup();
-    }
-
-    /**
-     * Instantiate a new GraphList from response.
-     *
-     * @param string|null $subclassName The GraphNode subclass to cast list items to.
-     * @param boolean     $auto_prefix  Toggle to auto-prefix the subclass name.
-     *
-     * @return \Facebook\GraphNodes\GraphList
-     *
-     * @throws FacebookSDKException
-     *
-     * @deprecated 5.0.0 getGraphList() has been renamed to getGraphEdge()
-     * @todo v6: Remove this method
-     */
-    public function getGraphList($subclassName = null, $auto_prefix = true)
-    {
-        return $this->getGraphEdge($subclassName, $auto_prefix);
-    }
-
-    /**
-     * Instantiate a new GraphEdge from response.
-     *
-     * @param string|null $subclassName The GraphNode subclass to cast list items to.
-     * @param boolean     $auto_prefix  Toggle to auto-prefix the subclass name.
-     *
-     * @return \Facebook\GraphNodes\GraphEdge
-     *
-     * @throws FacebookSDKException
-     */
-    public function getGraphEdge($subclassName = null, $auto_prefix = true)
-    {
-        $factory = new GraphNodeFactory($this);
-
-        return $factory->makeGraphEdge($subclassName, $auto_prefix);
-    }
-}
diff --git a/mayor-orig/www/include/share/facebook/FileUpload/FacebookFile.php b/mayor-orig/www/include/share/facebook/FileUpload/FacebookFile.php
deleted file mode 100644
index 3c1536d4..00000000
--- a/mayor-orig/www/include/share/facebook/FileUpload/FacebookFile.php
+++ /dev/null
@@ -1,169 +0,0 @@
-path = $filePath;
-        $this->maxLength = $maxLength;
-        $this->offset = $offset;
-        $this->open();
-    }
-
-    /**
-     * Closes the stream when destructed.
-     */
-    public function __destruct()
-    {
-        $this->close();
-    }
-
-    /**
-     * Opens a stream for the file.
-     *
-     * @throws FacebookSDKException
-     */
-    public function open()
-    {
-        if (!$this->isRemoteFile($this->path) && !is_readable($this->path)) {
-            throw new FacebookSDKException('Failed to create FacebookFile entity. Unable to read resource: ' . $this->path . '.');
-        }
-
-        $this->stream = fopen($this->path, 'r');
-
-        if (!$this->stream) {
-            throw new FacebookSDKException('Failed to create FacebookFile entity. Unable to open resource: ' . $this->path . '.');
-        }
-    }
-
-    /**
-     * Stops the file stream.
-     */
-    public function close()
-    {
-        if (is_resource($this->stream)) {
-            fclose($this->stream);
-        }
-    }
-
-    /**
-     * Return the contents of the file.
-     *
-     * @return string
-     */
-    public function getContents()
-    {
-        return stream_get_contents($this->stream, $this->maxLength, $this->offset);
-    }
-
-    /**
-     * Return the name of the file.
-     *
-     * @return string
-     */
-    public function getFileName()
-    {
-        return basename($this->path);
-    }
-
-    /**
-     * Return the path of the file.
-     *
-     * @return string
-     */
-    public function getFilePath()
-    {
-        return $this->path;
-    }
-
-    /**
-     * Return the size of the file.
-     *
-     * @return int
-     */
-    public function getSize()
-    {
-        return filesize($this->path);
-    }
-
-    /**
-     * Return the mimetype of the file.
-     *
-     * @return string
-     */
-    public function getMimetype()
-    {
-        return Mimetypes::getInstance()->fromFilename($this->path) ?: 'text/plain';
-    }
-
-    /**
-     * Returns true if the path to the file is remote.
-     *
-     * @param string $pathToFile
-     *
-     * @return boolean
-     */
-    protected function isRemoteFile($pathToFile)
-    {
-        return preg_match('/^(https?|ftp):\/\/.*/', $pathToFile) === 1;
-    }
-}
diff --git a/mayor-orig/www/include/share/facebook/FileUpload/FacebookResumableUploader.php b/mayor-orig/www/include/share/facebook/FileUpload/FacebookResumableUploader.php
deleted file mode 100644
index 92a22f14..00000000
--- a/mayor-orig/www/include/share/facebook/FileUpload/FacebookResumableUploader.php
+++ /dev/null
@@ -1,167 +0,0 @@
-app = $app;
-        $this->client = $client;
-        $this->accessToken = $accessToken;
-        $this->graphVersion = $graphVersion;
-    }
-
-    /**
-     * Upload by chunks - start phase
-     *
-     * @param string $endpoint
-     * @param FacebookFile $file
-     *
-     * @return FacebookTransferChunk
-     *
-     * @throws FacebookSDKException
-     */
-    public function start($endpoint, FacebookFile $file)
-    {
-        $params = [
-            'upload_phase' => 'start',
-            'file_size' => $file->getSize(),
-        ];
-        $response = $this->sendUploadRequest($endpoint, $params);
-
-        return new FacebookTransferChunk($file, $response['upload_session_id'], $response['video_id'], $response['start_offset'], $response['end_offset']);
-    }
-
-    /**
-     * Upload by chunks - transfer phase
-     *
-     * @param string $endpoint
-     * @param FacebookTransferChunk $chunk
-     * @param boolean $allowToThrow
-     *
-     * @return FacebookTransferChunk
-     *
-     * @throws FacebookResponseException
-     */
-    public function transfer($endpoint, FacebookTransferChunk $chunk, $allowToThrow = false)
-    {
-        $params = [
-            'upload_phase' => 'transfer',
-            'upload_session_id' => $chunk->getUploadSessionId(),
-            'start_offset' => $chunk->getStartOffset(),
-            'video_file_chunk' => $chunk->getPartialFile(),
-        ];
-
-        try {
-            $response = $this->sendUploadRequest($endpoint, $params);
-        } catch (FacebookResponseException $e) {
-            $preException = $e->getPrevious();
-            if ($allowToThrow || !$preException instanceof FacebookResumableUploadException) {
-                throw $e;
-            }
-
-            // Return the same chunk entity so it can be retried.
-            return $chunk;
-        }
-
-        return new FacebookTransferChunk($chunk->getFile(), $chunk->getUploadSessionId(), $chunk->getVideoId(), $response['start_offset'], $response['end_offset']);
-    }
-
-    /**
-     * Upload by chunks - finish phase
-     *
-     * @param string $endpoint
-     * @param string $uploadSessionId
-     * @param array $metadata The metadata associated with the file.
-     *
-     * @return boolean
-     *
-     * @throws FacebookSDKException
-     */
-    public function finish($endpoint, $uploadSessionId, $metadata = [])
-    {
-        $params = array_merge($metadata, [
-            'upload_phase' => 'finish',
-            'upload_session_id' => $uploadSessionId,
-        ]);
-        $response = $this->sendUploadRequest($endpoint, $params);
-
-        return $response['success'];
-    }
-
-    /**
-     * Helper to make a FacebookRequest and send it.
-     *
-     * @param string $endpoint The endpoint to POST to.
-     * @param array $params The params to send with the request.
-     *
-     * @return array
-     */
-    private function sendUploadRequest($endpoint, $params = [])
-    {
-        $request = new FacebookRequest($this->app, $this->accessToken, 'POST', $endpoint, $params, null, $this->graphVersion);
-
-        return $this->client->sendRequest($request)->getDecodedBody();
-    }
-}
diff --git a/mayor-orig/www/include/share/facebook/FileUpload/FacebookTransferChunk.php b/mayor-orig/www/include/share/facebook/FileUpload/FacebookTransferChunk.php
deleted file mode 100644
index a909e875..00000000
--- a/mayor-orig/www/include/share/facebook/FileUpload/FacebookTransferChunk.php
+++ /dev/null
@@ -1,133 +0,0 @@
-file = $file;
-        $this->uploadSessionId = $uploadSessionId;
-        $this->videoId = $videoId;
-        $this->startOffset = $startOffset;
-        $this->endOffset = $endOffset;
-    }
-
-    /**
-     * Return the file entity.
-     *
-     * @return FacebookFile
-     */
-    public function getFile()
-    {
-        return $this->file;
-    }
-
-    /**
-     * Return a FacebookFile entity with partial content.
-     *
-     * @return FacebookFile
-     */
-    public function getPartialFile()
-    {
-        $maxLength = $this->endOffset - $this->startOffset;
-
-        return new FacebookFile($this->file->getFilePath(), $maxLength, $this->startOffset);
-    }
-
-    /**
-     * Return upload session Id
-     *
-     * @return int
-     */
-    public function getUploadSessionId()
-    {
-        return $this->uploadSessionId;
-    }
-
-    /**
-     * Check whether is the last chunk
-     *
-     * @return bool
-     */
-    public function isLastChunk()
-    {
-        return $this->startOffset === $this->endOffset;
-    }
-
-    /**
-     * @return int
-     */
-    public function getStartOffset()
-    {
-        return $this->startOffset;
-    }
-
-    /**
-     * Get uploaded video Id
-     *
-     * @return int
-     */
-    public function getVideoId()
-    {
-        return $this->videoId;
-    }
-}
diff --git a/mayor-orig/www/include/share/facebook/FileUpload/FacebookVideo.php b/mayor-orig/www/include/share/facebook/FileUpload/FacebookVideo.php
deleted file mode 100644
index ee6dd538..00000000
--- a/mayor-orig/www/include/share/facebook/FileUpload/FacebookVideo.php
+++ /dev/null
@@ -1,33 +0,0 @@
- 'text/vnd.in3d.3dml',
-        '3g2' => 'video/3gpp2',
-        '3gp' => 'video/3gpp',
-        '7z' => 'application/x-7z-compressed',
-        'aab' => 'application/x-authorware-bin',
-        'aac' => 'audio/x-aac',
-        'aam' => 'application/x-authorware-map',
-        'aas' => 'application/x-authorware-seg',
-        'abw' => 'application/x-abiword',
-        'ac' => 'application/pkix-attr-cert',
-        'acc' => 'application/vnd.americandynamics.acc',
-        'ace' => 'application/x-ace-compressed',
-        'acu' => 'application/vnd.acucobol',
-        'acutc' => 'application/vnd.acucorp',
-        'adp' => 'audio/adpcm',
-        'aep' => 'application/vnd.audiograph',
-        'afm' => 'application/x-font-type1',
-        'afp' => 'application/vnd.ibm.modcap',
-        'ahead' => 'application/vnd.ahead.space',
-        'ai' => 'application/postscript',
-        'aif' => 'audio/x-aiff',
-        'aifc' => 'audio/x-aiff',
-        'aiff' => 'audio/x-aiff',
-        'air' => 'application/vnd.adobe.air-application-installer-package+zip',
-        'ait' => 'application/vnd.dvb.ait',
-        'ami' => 'application/vnd.amiga.ami',
-        'apk' => 'application/vnd.android.package-archive',
-        'application' => 'application/x-ms-application',
-        'apr' => 'application/vnd.lotus-approach',
-        'asa' => 'text/plain',
-        'asax' => 'application/octet-stream',
-        'asc' => 'application/pgp-signature',
-        'ascx' => 'text/plain',
-        'asf' => 'video/x-ms-asf',
-        'ashx' => 'text/plain',
-        'asm' => 'text/x-asm',
-        'asmx' => 'text/plain',
-        'aso' => 'application/vnd.accpac.simply.aso',
-        'asp' => 'text/plain',
-        'aspx' => 'text/plain',
-        'asx' => 'video/x-ms-asf',
-        'atc' => 'application/vnd.acucorp',
-        'atom' => 'application/atom+xml',
-        'atomcat' => 'application/atomcat+xml',
-        'atomsvc' => 'application/atomsvc+xml',
-        'atx' => 'application/vnd.antix.game-component',
-        'au' => 'audio/basic',
-        'avi' => 'video/x-msvideo',
-        'aw' => 'application/applixware',
-        'axd' => 'text/plain',
-        'azf' => 'application/vnd.airzip.filesecure.azf',
-        'azs' => 'application/vnd.airzip.filesecure.azs',
-        'azw' => 'application/vnd.amazon.ebook',
-        'bat' => 'application/x-msdownload',
-        'bcpio' => 'application/x-bcpio',
-        'bdf' => 'application/x-font-bdf',
-        'bdm' => 'application/vnd.syncml.dm+wbxml',
-        'bed' => 'application/vnd.realvnc.bed',
-        'bh2' => 'application/vnd.fujitsu.oasysprs',
-        'bin' => 'application/octet-stream',
-        'bmi' => 'application/vnd.bmi',
-        'bmp' => 'image/bmp',
-        'book' => 'application/vnd.framemaker',
-        'box' => 'application/vnd.previewsystems.box',
-        'boz' => 'application/x-bzip2',
-        'bpk' => 'application/octet-stream',
-        'btif' => 'image/prs.btif',
-        'bz' => 'application/x-bzip',
-        'bz2' => 'application/x-bzip2',
-        'c' => 'text/x-c',
-        'c11amc' => 'application/vnd.cluetrust.cartomobile-config',
-        'c11amz' => 'application/vnd.cluetrust.cartomobile-config-pkg',
-        'c4d' => 'application/vnd.clonk.c4group',
-        'c4f' => 'application/vnd.clonk.c4group',
-        'c4g' => 'application/vnd.clonk.c4group',
-        'c4p' => 'application/vnd.clonk.c4group',
-        'c4u' => 'application/vnd.clonk.c4group',
-        'cab' => 'application/vnd.ms-cab-compressed',
-        'car' => 'application/vnd.curl.car',
-        'cat' => 'application/vnd.ms-pki.seccat',
-        'cc' => 'text/x-c',
-        'cct' => 'application/x-director',
-        'ccxml' => 'application/ccxml+xml',
-        'cdbcmsg' => 'application/vnd.contact.cmsg',
-        'cdf' => 'application/x-netcdf',
-        'cdkey' => 'application/vnd.mediastation.cdkey',
-        'cdmia' => 'application/cdmi-capability',
-        'cdmic' => 'application/cdmi-container',
-        'cdmid' => 'application/cdmi-domain',
-        'cdmio' => 'application/cdmi-object',
-        'cdmiq' => 'application/cdmi-queue',
-        'cdx' => 'chemical/x-cdx',
-        'cdxml' => 'application/vnd.chemdraw+xml',
-        'cdy' => 'application/vnd.cinderella',
-        'cer' => 'application/pkix-cert',
-        'cfc' => 'application/x-coldfusion',
-        'cfm' => 'application/x-coldfusion',
-        'cgm' => 'image/cgm',
-        'chat' => 'application/x-chat',
-        'chm' => 'application/vnd.ms-htmlhelp',
-        'chrt' => 'application/vnd.kde.kchart',
-        'cif' => 'chemical/x-cif',
-        'cii' => 'application/vnd.anser-web-certificate-issue-initiation',
-        'cil' => 'application/vnd.ms-artgalry',
-        'cla' => 'application/vnd.claymore',
-        'class' => 'application/java-vm',
-        'clkk' => 'application/vnd.crick.clicker.keyboard',
-        'clkp' => 'application/vnd.crick.clicker.palette',
-        'clkt' => 'application/vnd.crick.clicker.template',
-        'clkw' => 'application/vnd.crick.clicker.wordbank',
-        'clkx' => 'application/vnd.crick.clicker',
-        'clp' => 'application/x-msclip',
-        'cmc' => 'application/vnd.cosmocaller',
-        'cmdf' => 'chemical/x-cmdf',
-        'cml' => 'chemical/x-cml',
-        'cmp' => 'application/vnd.yellowriver-custom-menu',
-        'cmx' => 'image/x-cmx',
-        'cod' => 'application/vnd.rim.cod',
-        'com' => 'application/x-msdownload',
-        'conf' => 'text/plain',
-        'cpio' => 'application/x-cpio',
-        'cpp' => 'text/x-c',
-        'cpt' => 'application/mac-compactpro',
-        'crd' => 'application/x-mscardfile',
-        'crl' => 'application/pkix-crl',
-        'crt' => 'application/x-x509-ca-cert',
-        'cryptonote' => 'application/vnd.rig.cryptonote',
-        'cs' => 'text/plain',
-        'csh' => 'application/x-csh',
-        'csml' => 'chemical/x-csml',
-        'csp' => 'application/vnd.commonspace',
-        'css' => 'text/css',
-        'cst' => 'application/x-director',
-        'csv' => 'text/csv',
-        'cu' => 'application/cu-seeme',
-        'curl' => 'text/vnd.curl',
-        'cww' => 'application/prs.cww',
-        'cxt' => 'application/x-director',
-        'cxx' => 'text/x-c',
-        'dae' => 'model/vnd.collada+xml',
-        'daf' => 'application/vnd.mobius.daf',
-        'dataless' => 'application/vnd.fdsn.seed',
-        'davmount' => 'application/davmount+xml',
-        'dcr' => 'application/x-director',
-        'dcurl' => 'text/vnd.curl.dcurl',
-        'dd2' => 'application/vnd.oma.dd2+xml',
-        'ddd' => 'application/vnd.fujixerox.ddd',
-        'deb' => 'application/x-debian-package',
-        'def' => 'text/plain',
-        'deploy' => 'application/octet-stream',
-        'der' => 'application/x-x509-ca-cert',
-        'dfac' => 'application/vnd.dreamfactory',
-        'dic' => 'text/x-c',
-        'dir' => 'application/x-director',
-        'dis' => 'application/vnd.mobius.dis',
-        'dist' => 'application/octet-stream',
-        'distz' => 'application/octet-stream',
-        'djv' => 'image/vnd.djvu',
-        'djvu' => 'image/vnd.djvu',
-        'dll' => 'application/x-msdownload',
-        'dmg' => 'application/octet-stream',
-        'dms' => 'application/octet-stream',
-        'dna' => 'application/vnd.dna',
-        'doc' => 'application/msword',
-        'docm' => 'application/vnd.ms-word.document.macroenabled.12',
-        'docx' => 'application/vnd.openxmlformats-officedocument.wordprocessingml.document',
-        'dot' => 'application/msword',
-        'dotm' => 'application/vnd.ms-word.template.macroenabled.12',
-        'dotx' => 'application/vnd.openxmlformats-officedocument.wordprocessingml.template',
-        'dp' => 'application/vnd.osgi.dp',
-        'dpg' => 'application/vnd.dpgraph',
-        'dra' => 'audio/vnd.dra',
-        'dsc' => 'text/prs.lines.tag',
-        'dssc' => 'application/dssc+der',
-        'dtb' => 'application/x-dtbook+xml',
-        'dtd' => 'application/xml-dtd',
-        'dts' => 'audio/vnd.dts',
-        'dtshd' => 'audio/vnd.dts.hd',
-        'dump' => 'application/octet-stream',
-        'dvi' => 'application/x-dvi',
-        'dwf' => 'model/vnd.dwf',
-        'dwg' => 'image/vnd.dwg',
-        'dxf' => 'image/vnd.dxf',
-        'dxp' => 'application/vnd.spotfire.dxp',
-        'dxr' => 'application/x-director',
-        'ecelp4800' => 'audio/vnd.nuera.ecelp4800',
-        'ecelp7470' => 'audio/vnd.nuera.ecelp7470',
-        'ecelp9600' => 'audio/vnd.nuera.ecelp9600',
-        'ecma' => 'application/ecmascript',
-        'edm' => 'application/vnd.novadigm.edm',
-        'edx' => 'application/vnd.novadigm.edx',
-        'efif' => 'application/vnd.picsel',
-        'ei6' => 'application/vnd.pg.osasli',
-        'elc' => 'application/octet-stream',
-        'eml' => 'message/rfc822',
-        'emma' => 'application/emma+xml',
-        'eol' => 'audio/vnd.digital-winds',
-        'eot' => 'application/vnd.ms-fontobject',
-        'eps' => 'application/postscript',
-        'epub' => 'application/epub+zip',
-        'es3' => 'application/vnd.eszigno3+xml',
-        'esf' => 'application/vnd.epson.esf',
-        'et3' => 'application/vnd.eszigno3+xml',
-        'etx' => 'text/x-setext',
-        'exe' => 'application/x-msdownload',
-        'exi' => 'application/exi',
-        'ext' => 'application/vnd.novadigm.ext',
-        'ez' => 'application/andrew-inset',
-        'ez2' => 'application/vnd.ezpix-album',
-        'ez3' => 'application/vnd.ezpix-package',
-        'f' => 'text/x-fortran',
-        'f4v' => 'video/x-f4v',
-        'f77' => 'text/x-fortran',
-        'f90' => 'text/x-fortran',
-        'fbs' => 'image/vnd.fastbidsheet',
-        'fcs' => 'application/vnd.isac.fcs',
-        'fdf' => 'application/vnd.fdf',
-        'fe_launch' => 'application/vnd.denovo.fcselayout-link',
-        'fg5' => 'application/vnd.fujitsu.oasysgp',
-        'fgd' => 'application/x-director',
-        'fh' => 'image/x-freehand',
-        'fh4' => 'image/x-freehand',
-        'fh5' => 'image/x-freehand',
-        'fh7' => 'image/x-freehand',
-        'fhc' => 'image/x-freehand',
-        'fig' => 'application/x-xfig',
-        'fli' => 'video/x-fli',
-        'flo' => 'application/vnd.micrografx.flo',
-        'flv' => 'video/x-flv',
-        'flw' => 'application/vnd.kde.kivio',
-        'flx' => 'text/vnd.fmi.flexstor',
-        'fly' => 'text/vnd.fly',
-        'fm' => 'application/vnd.framemaker',
-        'fnc' => 'application/vnd.frogans.fnc',
-        'for' => 'text/x-fortran',
-        'fpx' => 'image/vnd.fpx',
-        'frame' => 'application/vnd.framemaker',
-        'fsc' => 'application/vnd.fsc.weblaunch',
-        'fst' => 'image/vnd.fst',
-        'ftc' => 'application/vnd.fluxtime.clip',
-        'fti' => 'application/vnd.anser-web-funds-transfer-initiation',
-        'fvt' => 'video/vnd.fvt',
-        'fxp' => 'application/vnd.adobe.fxp',
-        'fxpl' => 'application/vnd.adobe.fxp',
-        'fzs' => 'application/vnd.fuzzysheet',
-        'g2w' => 'application/vnd.geoplan',
-        'g3' => 'image/g3fax',
-        'g3w' => 'application/vnd.geospace',
-        'gac' => 'application/vnd.groove-account',
-        'gdl' => 'model/vnd.gdl',
-        'geo' => 'application/vnd.dynageo',
-        'gex' => 'application/vnd.geometry-explorer',
-        'ggb' => 'application/vnd.geogebra.file',
-        'ggt' => 'application/vnd.geogebra.tool',
-        'ghf' => 'application/vnd.groove-help',
-        'gif' => 'image/gif',
-        'gim' => 'application/vnd.groove-identity-message',
-        'gmx' => 'application/vnd.gmx',
-        'gnumeric' => 'application/x-gnumeric',
-        'gph' => 'application/vnd.flographit',
-        'gqf' => 'application/vnd.grafeq',
-        'gqs' => 'application/vnd.grafeq',
-        'gram' => 'application/srgs',
-        'gre' => 'application/vnd.geometry-explorer',
-        'grv' => 'application/vnd.groove-injector',
-        'grxml' => 'application/srgs+xml',
-        'gsf' => 'application/x-font-ghostscript',
-        'gtar' => 'application/x-gtar',
-        'gtm' => 'application/vnd.groove-tool-message',
-        'gtw' => 'model/vnd.gtw',
-        'gv' => 'text/vnd.graphviz',
-        'gxt' => 'application/vnd.geonext',
-        'h' => 'text/x-c',
-        'h261' => 'video/h261',
-        'h263' => 'video/h263',
-        'h264' => 'video/h264',
-        'hal' => 'application/vnd.hal+xml',
-        'hbci' => 'application/vnd.hbci',
-        'hdf' => 'application/x-hdf',
-        'hh' => 'text/x-c',
-        'hlp' => 'application/winhlp',
-        'hpgl' => 'application/vnd.hp-hpgl',
-        'hpid' => 'application/vnd.hp-hpid',
-        'hps' => 'application/vnd.hp-hps',
-        'hqx' => 'application/mac-binhex40',
-        'hta' => 'application/octet-stream',
-        'htc' => 'text/html',
-        'htke' => 'application/vnd.kenameaapp',
-        'htm' => 'text/html',
-        'html' => 'text/html',
-        'hvd' => 'application/vnd.yamaha.hv-dic',
-        'hvp' => 'application/vnd.yamaha.hv-voice',
-        'hvs' => 'application/vnd.yamaha.hv-script',
-        'i2g' => 'application/vnd.intergeo',
-        'icc' => 'application/vnd.iccprofile',
-        'ice' => 'x-conference/x-cooltalk',
-        'icm' => 'application/vnd.iccprofile',
-        'ico' => 'image/x-icon',
-        'ics' => 'text/calendar',
-        'ief' => 'image/ief',
-        'ifb' => 'text/calendar',
-        'ifm' => 'application/vnd.shana.informed.formdata',
-        'iges' => 'model/iges',
-        'igl' => 'application/vnd.igloader',
-        'igm' => 'application/vnd.insors.igm',
-        'igs' => 'model/iges',
-        'igx' => 'application/vnd.micrografx.igx',
-        'iif' => 'application/vnd.shana.informed.interchange',
-        'imp' => 'application/vnd.accpac.simply.imp',
-        'ims' => 'application/vnd.ms-ims',
-        'in' => 'text/plain',
-        'ini' => 'text/plain',
-        'ipfix' => 'application/ipfix',
-        'ipk' => 'application/vnd.shana.informed.package',
-        'irm' => 'application/vnd.ibm.rights-management',
-        'irp' => 'application/vnd.irepository.package+xml',
-        'iso' => 'application/octet-stream',
-        'itp' => 'application/vnd.shana.informed.formtemplate',
-        'ivp' => 'application/vnd.immervision-ivp',
-        'ivu' => 'application/vnd.immervision-ivu',
-        'jad' => 'text/vnd.sun.j2me.app-descriptor',
-        'jam' => 'application/vnd.jam',
-        'jar' => 'application/java-archive',
-        'java' => 'text/x-java-source',
-        'jisp' => 'application/vnd.jisp',
-        'jlt' => 'application/vnd.hp-jlyt',
-        'jnlp' => 'application/x-java-jnlp-file',
-        'joda' => 'application/vnd.joost.joda-archive',
-        'jpe' => 'image/jpeg',
-        'jpeg' => 'image/jpeg',
-        'jpg' => 'image/jpeg',
-        'jpgm' => 'video/jpm',
-        'jpgv' => 'video/jpeg',
-        'jpm' => 'video/jpm',
-        'js' => 'text/javascript',
-        'json' => 'application/json',
-        'kar' => 'audio/midi',
-        'karbon' => 'application/vnd.kde.karbon',
-        'kfo' => 'application/vnd.kde.kformula',
-        'kia' => 'application/vnd.kidspiration',
-        'kml' => 'application/vnd.google-earth.kml+xml',
-        'kmz' => 'application/vnd.google-earth.kmz',
-        'kne' => 'application/vnd.kinar',
-        'knp' => 'application/vnd.kinar',
-        'kon' => 'application/vnd.kde.kontour',
-        'kpr' => 'application/vnd.kde.kpresenter',
-        'kpt' => 'application/vnd.kde.kpresenter',
-        'ksp' => 'application/vnd.kde.kspread',
-        'ktr' => 'application/vnd.kahootz',
-        'ktx' => 'image/ktx',
-        'ktz' => 'application/vnd.kahootz',
-        'kwd' => 'application/vnd.kde.kword',
-        'kwt' => 'application/vnd.kde.kword',
-        'lasxml' => 'application/vnd.las.las+xml',
-        'latex' => 'application/x-latex',
-        'lbd' => 'application/vnd.llamagraphics.life-balance.desktop',
-        'lbe' => 'application/vnd.llamagraphics.life-balance.exchange+xml',
-        'les' => 'application/vnd.hhe.lesson-player',
-        'lha' => 'application/octet-stream',
-        'link66' => 'application/vnd.route66.link66+xml',
-        'list' => 'text/plain',
-        'list3820' => 'application/vnd.ibm.modcap',
-        'listafp' => 'application/vnd.ibm.modcap',
-        'log' => 'text/plain',
-        'lostxml' => 'application/lost+xml',
-        'lrf' => 'application/octet-stream',
-        'lrm' => 'application/vnd.ms-lrm',
-        'ltf' => 'application/vnd.frogans.ltf',
-        'lvp' => 'audio/vnd.lucent.voice',
-        'lwp' => 'application/vnd.lotus-wordpro',
-        'lzh' => 'application/octet-stream',
-        'm13' => 'application/x-msmediaview',
-        'm14' => 'application/x-msmediaview',
-        'm1v' => 'video/mpeg',
-        'm21' => 'application/mp21',
-        'm2a' => 'audio/mpeg',
-        'm2v' => 'video/mpeg',
-        'm3a' => 'audio/mpeg',
-        'm3u' => 'audio/x-mpegurl',
-        'm3u8' => 'application/vnd.apple.mpegurl',
-        'm4a' => 'audio/mp4',
-        'm4u' => 'video/vnd.mpegurl',
-        'm4v' => 'video/mp4',
-        'ma' => 'application/mathematica',
-        'mads' => 'application/mads+xml',
-        'mag' => 'application/vnd.ecowin.chart',
-        'maker' => 'application/vnd.framemaker',
-        'man' => 'text/troff',
-        'mathml' => 'application/mathml+xml',
-        'mb' => 'application/mathematica',
-        'mbk' => 'application/vnd.mobius.mbk',
-        'mbox' => 'application/mbox',
-        'mc1' => 'application/vnd.medcalcdata',
-        'mcd' => 'application/vnd.mcd',
-        'mcurl' => 'text/vnd.curl.mcurl',
-        'mdb' => 'application/x-msaccess',
-        'mdi' => 'image/vnd.ms-modi',
-        'me' => 'text/troff',
-        'mesh' => 'model/mesh',
-        'meta4' => 'application/metalink4+xml',
-        'mets' => 'application/mets+xml',
-        'mfm' => 'application/vnd.mfmp',
-        'mgp' => 'application/vnd.osgeo.mapguide.package',
-        'mgz' => 'application/vnd.proteus.magazine',
-        'mid' => 'audio/midi',
-        'midi' => 'audio/midi',
-        'mif' => 'application/vnd.mif',
-        'mime' => 'message/rfc822',
-        'mj2' => 'video/mj2',
-        'mjp2' => 'video/mj2',
-        'mlp' => 'application/vnd.dolby.mlp',
-        'mmd' => 'application/vnd.chipnuts.karaoke-mmd',
-        'mmf' => 'application/vnd.smaf',
-        'mmr' => 'image/vnd.fujixerox.edmics-mmr',
-        'mny' => 'application/x-msmoney',
-        'mobi' => 'application/x-mobipocket-ebook',
-        'mods' => 'application/mods+xml',
-        'mov' => 'video/quicktime',
-        'movie' => 'video/x-sgi-movie',
-        'mp2' => 'audio/mpeg',
-        'mp21' => 'application/mp21',
-        'mp2a' => 'audio/mpeg',
-        'mp3' => 'audio/mpeg',
-        'mp4' => 'video/mp4',
-        'mp4a' => 'audio/mp4',
-        'mp4s' => 'application/mp4',
-        'mp4v' => 'video/mp4',
-        'mpc' => 'application/vnd.mophun.certificate',
-        'mpe' => 'video/mpeg',
-        'mpeg' => 'video/mpeg',
-        'mpg' => 'video/mpeg',
-        'mpg4' => 'video/mp4',
-        'mpga' => 'audio/mpeg',
-        'mpkg' => 'application/vnd.apple.installer+xml',
-        'mpm' => 'application/vnd.blueice.multipass',
-        'mpn' => 'application/vnd.mophun.application',
-        'mpp' => 'application/vnd.ms-project',
-        'mpt' => 'application/vnd.ms-project',
-        'mpy' => 'application/vnd.ibm.minipay',
-        'mqy' => 'application/vnd.mobius.mqy',
-        'mrc' => 'application/marc',
-        'mrcx' => 'application/marcxml+xml',
-        'ms' => 'text/troff',
-        'mscml' => 'application/mediaservercontrol+xml',
-        'mseed' => 'application/vnd.fdsn.mseed',
-        'mseq' => 'application/vnd.mseq',
-        'msf' => 'application/vnd.epson.msf',
-        'msh' => 'model/mesh',
-        'msi' => 'application/x-msdownload',
-        'msl' => 'application/vnd.mobius.msl',
-        'msty' => 'application/vnd.muvee.style',
-        'mts' => 'model/vnd.mts',
-        'mus' => 'application/vnd.musician',
-        'musicxml' => 'application/vnd.recordare.musicxml+xml',
-        'mvb' => 'application/x-msmediaview',
-        'mwf' => 'application/vnd.mfer',
-        'mxf' => 'application/mxf',
-        'mxl' => 'application/vnd.recordare.musicxml',
-        'mxml' => 'application/xv+xml',
-        'mxs' => 'application/vnd.triscape.mxs',
-        'mxu' => 'video/vnd.mpegurl',
-        'n-gage' => 'application/vnd.nokia.n-gage.symbian.install',
-        'n3' => 'text/n3',
-        'nb' => 'application/mathematica',
-        'nbp' => 'application/vnd.wolfram.player',
-        'nc' => 'application/x-netcdf',
-        'ncx' => 'application/x-dtbncx+xml',
-        'ngdat' => 'application/vnd.nokia.n-gage.data',
-        'nlu' => 'application/vnd.neurolanguage.nlu',
-        'nml' => 'application/vnd.enliven',
-        'nnd' => 'application/vnd.noblenet-directory',
-        'nns' => 'application/vnd.noblenet-sealer',
-        'nnw' => 'application/vnd.noblenet-web',
-        'npx' => 'image/vnd.net-fpx',
-        'nsf' => 'application/vnd.lotus-notes',
-        'oa2' => 'application/vnd.fujitsu.oasys2',
-        'oa3' => 'application/vnd.fujitsu.oasys3',
-        'oas' => 'application/vnd.fujitsu.oasys',
-        'obd' => 'application/x-msbinder',
-        'oda' => 'application/oda',
-        'odb' => 'application/vnd.oasis.opendocument.database',
-        'odc' => 'application/vnd.oasis.opendocument.chart',
-        'odf' => 'application/vnd.oasis.opendocument.formula',
-        'odft' => 'application/vnd.oasis.opendocument.formula-template',
-        'odg' => 'application/vnd.oasis.opendocument.graphics',
-        'odi' => 'application/vnd.oasis.opendocument.image',
-        'odm' => 'application/vnd.oasis.opendocument.text-master',
-        'odp' => 'application/vnd.oasis.opendocument.presentation',
-        'ods' => 'application/vnd.oasis.opendocument.spreadsheet',
-        'odt' => 'application/vnd.oasis.opendocument.text',
-        'oga' => 'audio/ogg',
-        'ogg' => 'audio/ogg',
-        'ogv' => 'video/ogg',
-        'ogx' => 'application/ogg',
-        'onepkg' => 'application/onenote',
-        'onetmp' => 'application/onenote',
-        'onetoc' => 'application/onenote',
-        'onetoc2' => 'application/onenote',
-        'opf' => 'application/oebps-package+xml',
-        'oprc' => 'application/vnd.palm',
-        'org' => 'application/vnd.lotus-organizer',
-        'osf' => 'application/vnd.yamaha.openscoreformat',
-        'osfpvg' => 'application/vnd.yamaha.openscoreformat.osfpvg+xml',
-        'otc' => 'application/vnd.oasis.opendocument.chart-template',
-        'otf' => 'application/x-font-otf',
-        'otg' => 'application/vnd.oasis.opendocument.graphics-template',
-        'oth' => 'application/vnd.oasis.opendocument.text-web',
-        'oti' => 'application/vnd.oasis.opendocument.image-template',
-        'otp' => 'application/vnd.oasis.opendocument.presentation-template',
-        'ots' => 'application/vnd.oasis.opendocument.spreadsheet-template',
-        'ott' => 'application/vnd.oasis.opendocument.text-template',
-        'oxt' => 'application/vnd.openofficeorg.extension',
-        'p' => 'text/x-pascal',
-        'p10' => 'application/pkcs10',
-        'p12' => 'application/x-pkcs12',
-        'p7b' => 'application/x-pkcs7-certificates',
-        'p7c' => 'application/pkcs7-mime',
-        'p7m' => 'application/pkcs7-mime',
-        'p7r' => 'application/x-pkcs7-certreqresp',
-        'p7s' => 'application/pkcs7-signature',
-        'p8' => 'application/pkcs8',
-        'pas' => 'text/x-pascal',
-        'paw' => 'application/vnd.pawaafile',
-        'pbd' => 'application/vnd.powerbuilder6',
-        'pbm' => 'image/x-portable-bitmap',
-        'pcf' => 'application/x-font-pcf',
-        'pcl' => 'application/vnd.hp-pcl',
-        'pclxl' => 'application/vnd.hp-pclxl',
-        'pct' => 'image/x-pict',
-        'pcurl' => 'application/vnd.curl.pcurl',
-        'pcx' => 'image/x-pcx',
-        'pdb' => 'application/vnd.palm',
-        'pdf' => 'application/pdf',
-        'pfa' => 'application/x-font-type1',
-        'pfb' => 'application/x-font-type1',
-        'pfm' => 'application/x-font-type1',
-        'pfr' => 'application/font-tdpfr',
-        'pfx' => 'application/x-pkcs12',
-        'pgm' => 'image/x-portable-graymap',
-        'pgn' => 'application/x-chess-pgn',
-        'pgp' => 'application/pgp-encrypted',
-        'php' => 'text/x-php',
-        'phps' => 'application/x-httpd-phps',
-        'pic' => 'image/x-pict',
-        'pkg' => 'application/octet-stream',
-        'pki' => 'application/pkixcmp',
-        'pkipath' => 'application/pkix-pkipath',
-        'plb' => 'application/vnd.3gpp.pic-bw-large',
-        'plc' => 'application/vnd.mobius.plc',
-        'plf' => 'application/vnd.pocketlearn',
-        'pls' => 'application/pls+xml',
-        'pml' => 'application/vnd.ctc-posml',
-        'png' => 'image/png',
-        'pnm' => 'image/x-portable-anymap',
-        'portpkg' => 'application/vnd.macports.portpkg',
-        'pot' => 'application/vnd.ms-powerpoint',
-        'potm' => 'application/vnd.ms-powerpoint.template.macroenabled.12',
-        'potx' => 'application/vnd.openxmlformats-officedocument.presentationml.template',
-        'ppam' => 'application/vnd.ms-powerpoint.addin.macroenabled.12',
-        'ppd' => 'application/vnd.cups-ppd',
-        'ppm' => 'image/x-portable-pixmap',
-        'pps' => 'application/vnd.ms-powerpoint',
-        'ppsm' => 'application/vnd.ms-powerpoint.slideshow.macroenabled.12',
-        'ppsx' => 'application/vnd.openxmlformats-officedocument.presentationml.slideshow',
-        'ppt' => 'application/vnd.ms-powerpoint',
-        'pptm' => 'application/vnd.ms-powerpoint.presentation.macroenabled.12',
-        'pptx' => 'application/vnd.openxmlformats-officedocument.presentationml.presentation',
-        'pqa' => 'application/vnd.palm',
-        'prc' => 'application/x-mobipocket-ebook',
-        'pre' => 'application/vnd.lotus-freelance',
-        'prf' => 'application/pics-rules',
-        'ps' => 'application/postscript',
-        'psb' => 'application/vnd.3gpp.pic-bw-small',
-        'psd' => 'image/vnd.adobe.photoshop',
-        'psf' => 'application/x-font-linux-psf',
-        'pskcxml' => 'application/pskc+xml',
-        'ptid' => 'application/vnd.pvi.ptid1',
-        'pub' => 'application/x-mspublisher',
-        'pvb' => 'application/vnd.3gpp.pic-bw-var',
-        'pwn' => 'application/vnd.3m.post-it-notes',
-        'pya' => 'audio/vnd.ms-playready.media.pya',
-        'pyv' => 'video/vnd.ms-playready.media.pyv',
-        'qam' => 'application/vnd.epson.quickanime',
-        'qbo' => 'application/vnd.intu.qbo',
-        'qfx' => 'application/vnd.intu.qfx',
-        'qps' => 'application/vnd.publishare-delta-tree',
-        'qt' => 'video/quicktime',
-        'qwd' => 'application/vnd.quark.quarkxpress',
-        'qwt' => 'application/vnd.quark.quarkxpress',
-        'qxb' => 'application/vnd.quark.quarkxpress',
-        'qxd' => 'application/vnd.quark.quarkxpress',
-        'qxl' => 'application/vnd.quark.quarkxpress',
-        'qxt' => 'application/vnd.quark.quarkxpress',
-        'ra' => 'audio/x-pn-realaudio',
-        'ram' => 'audio/x-pn-realaudio',
-        'rar' => 'application/x-rar-compressed',
-        'ras' => 'image/x-cmu-raster',
-        'rb' => 'text/plain',
-        'rcprofile' => 'application/vnd.ipunplugged.rcprofile',
-        'rdf' => 'application/rdf+xml',
-        'rdz' => 'application/vnd.data-vision.rdz',
-        'rep' => 'application/vnd.businessobjects',
-        'res' => 'application/x-dtbresource+xml',
-        'resx' => 'text/xml',
-        'rgb' => 'image/x-rgb',
-        'rif' => 'application/reginfo+xml',
-        'rip' => 'audio/vnd.rip',
-        'rl' => 'application/resource-lists+xml',
-        'rlc' => 'image/vnd.fujixerox.edmics-rlc',
-        'rld' => 'application/resource-lists-diff+xml',
-        'rm' => 'application/vnd.rn-realmedia',
-        'rmi' => 'audio/midi',
-        'rmp' => 'audio/x-pn-realaudio-plugin',
-        'rms' => 'application/vnd.jcp.javame.midlet-rms',
-        'rnc' => 'application/relax-ng-compact-syntax',
-        'roff' => 'text/troff',
-        'rp9' => 'application/vnd.cloanto.rp9',
-        'rpss' => 'application/vnd.nokia.radio-presets',
-        'rpst' => 'application/vnd.nokia.radio-preset',
-        'rq' => 'application/sparql-query',
-        'rs' => 'application/rls-services+xml',
-        'rsd' => 'application/rsd+xml',
-        'rss' => 'application/rss+xml',
-        'rtf' => 'application/rtf',
-        'rtx' => 'text/richtext',
-        's' => 'text/x-asm',
-        'saf' => 'application/vnd.yamaha.smaf-audio',
-        'sbml' => 'application/sbml+xml',
-        'sc' => 'application/vnd.ibm.secure-container',
-        'scd' => 'application/x-msschedule',
-        'scm' => 'application/vnd.lotus-screencam',
-        'scq' => 'application/scvp-cv-request',
-        'scs' => 'application/scvp-cv-response',
-        'scurl' => 'text/vnd.curl.scurl',
-        'sda' => 'application/vnd.stardivision.draw',
-        'sdc' => 'application/vnd.stardivision.calc',
-        'sdd' => 'application/vnd.stardivision.impress',
-        'sdkd' => 'application/vnd.solent.sdkm+xml',
-        'sdkm' => 'application/vnd.solent.sdkm+xml',
-        'sdp' => 'application/sdp',
-        'sdw' => 'application/vnd.stardivision.writer',
-        'see' => 'application/vnd.seemail',
-        'seed' => 'application/vnd.fdsn.seed',
-        'sema' => 'application/vnd.sema',
-        'semd' => 'application/vnd.semd',
-        'semf' => 'application/vnd.semf',
-        'ser' => 'application/java-serialized-object',
-        'setpay' => 'application/set-payment-initiation',
-        'setreg' => 'application/set-registration-initiation',
-        'sfd-hdstx' => 'application/vnd.hydrostatix.sof-data',
-        'sfs' => 'application/vnd.spotfire.sfs',
-        'sgl' => 'application/vnd.stardivision.writer-global',
-        'sgm' => 'text/sgml',
-        'sgml' => 'text/sgml',
-        'sh' => 'application/x-sh',
-        'shar' => 'application/x-shar',
-        'shf' => 'application/shf+xml',
-        'sig' => 'application/pgp-signature',
-        'silo' => 'model/mesh',
-        'sis' => 'application/vnd.symbian.install',
-        'sisx' => 'application/vnd.symbian.install',
-        'sit' => 'application/x-stuffit',
-        'sitx' => 'application/x-stuffitx',
-        'skd' => 'application/vnd.koan',
-        'skm' => 'application/vnd.koan',
-        'skp' => 'application/vnd.koan',
-        'skt' => 'application/vnd.koan',
-        'sldm' => 'application/vnd.ms-powerpoint.slide.macroenabled.12',
-        'sldx' => 'application/vnd.openxmlformats-officedocument.presentationml.slide',
-        'slt' => 'application/vnd.epson.salt',
-        'sm' => 'application/vnd.stepmania.stepchart',
-        'smf' => 'application/vnd.stardivision.math',
-        'smi' => 'application/smil+xml',
-        'smil' => 'application/smil+xml',
-        'snd' => 'audio/basic',
-        'snf' => 'application/x-font-snf',
-        'so' => 'application/octet-stream',
-        'spc' => 'application/x-pkcs7-certificates',
-        'spf' => 'application/vnd.yamaha.smaf-phrase',
-        'spl' => 'application/x-futuresplash',
-        'spot' => 'text/vnd.in3d.spot',
-        'spp' => 'application/scvp-vp-response',
-        'spq' => 'application/scvp-vp-request',
-        'spx' => 'audio/ogg',
-        'src' => 'application/x-wais-source',
-        'srt' => 'application/octet-stream',
-        'sru' => 'application/sru+xml',
-        'srx' => 'application/sparql-results+xml',
-        'sse' => 'application/vnd.kodak-descriptor',
-        'ssf' => 'application/vnd.epson.ssf',
-        'ssml' => 'application/ssml+xml',
-        'st' => 'application/vnd.sailingtracker.track',
-        'stc' => 'application/vnd.sun.xml.calc.template',
-        'std' => 'application/vnd.sun.xml.draw.template',
-        'stf' => 'application/vnd.wt.stf',
-        'sti' => 'application/vnd.sun.xml.impress.template',
-        'stk' => 'application/hyperstudio',
-        'stl' => 'application/vnd.ms-pki.stl',
-        'str' => 'application/vnd.pg.format',
-        'stw' => 'application/vnd.sun.xml.writer.template',
-        'sub' => 'image/vnd.dvb.subtitle',
-        'sus' => 'application/vnd.sus-calendar',
-        'susp' => 'application/vnd.sus-calendar',
-        'sv4cpio' => 'application/x-sv4cpio',
-        'sv4crc' => 'application/x-sv4crc',
-        'svc' => 'application/vnd.dvb.service',
-        'svd' => 'application/vnd.svd',
-        'svg' => 'image/svg+xml',
-        'svgz' => 'image/svg+xml',
-        'swa' => 'application/x-director',
-        'swf' => 'application/x-shockwave-flash',
-        'swi' => 'application/vnd.aristanetworks.swi',
-        'sxc' => 'application/vnd.sun.xml.calc',
-        'sxd' => 'application/vnd.sun.xml.draw',
-        'sxg' => 'application/vnd.sun.xml.writer.global',
-        'sxi' => 'application/vnd.sun.xml.impress',
-        'sxm' => 'application/vnd.sun.xml.math',
-        'sxw' => 'application/vnd.sun.xml.writer',
-        't' => 'text/troff',
-        'tao' => 'application/vnd.tao.intent-module-archive',
-        'tar' => 'application/x-tar',
-        'tcap' => 'application/vnd.3gpp2.tcap',
-        'tcl' => 'application/x-tcl',
-        'teacher' => 'application/vnd.smart.teacher',
-        'tei' => 'application/tei+xml',
-        'teicorpus' => 'application/tei+xml',
-        'tex' => 'application/x-tex',
-        'texi' => 'application/x-texinfo',
-        'texinfo' => 'application/x-texinfo',
-        'text' => 'text/plain',
-        'tfi' => 'application/thraud+xml',
-        'tfm' => 'application/x-tex-tfm',
-        'thmx' => 'application/vnd.ms-officetheme',
-        'tif' => 'image/tiff',
-        'tiff' => 'image/tiff',
-        'tmo' => 'application/vnd.tmobile-livetv',
-        'torrent' => 'application/x-bittorrent',
-        'tpl' => 'application/vnd.groove-tool-template',
-        'tpt' => 'application/vnd.trid.tpt',
-        'tr' => 'text/troff',
-        'tra' => 'application/vnd.trueapp',
-        'trm' => 'application/x-msterminal',
-        'tsd' => 'application/timestamped-data',
-        'tsv' => 'text/tab-separated-values',
-        'ttc' => 'application/x-font-ttf',
-        'ttf' => 'application/x-font-ttf',
-        'ttl' => 'text/turtle',
-        'twd' => 'application/vnd.simtech-mindmapper',
-        'twds' => 'application/vnd.simtech-mindmapper',
-        'txd' => 'application/vnd.genomatix.tuxedo',
-        'txf' => 'application/vnd.mobius.txf',
-        'txt' => 'text/plain',
-        'u32' => 'application/x-authorware-bin',
-        'udeb' => 'application/x-debian-package',
-        'ufd' => 'application/vnd.ufdl',
-        'ufdl' => 'application/vnd.ufdl',
-        'umj' => 'application/vnd.umajin',
-        'unityweb' => 'application/vnd.unity',
-        'uoml' => 'application/vnd.uoml+xml',
-        'uri' => 'text/uri-list',
-        'uris' => 'text/uri-list',
-        'urls' => 'text/uri-list',
-        'ustar' => 'application/x-ustar',
-        'utz' => 'application/vnd.uiq.theme',
-        'uu' => 'text/x-uuencode',
-        'uva' => 'audio/vnd.dece.audio',
-        'uvd' => 'application/vnd.dece.data',
-        'uvf' => 'application/vnd.dece.data',
-        'uvg' => 'image/vnd.dece.graphic',
-        'uvh' => 'video/vnd.dece.hd',
-        'uvi' => 'image/vnd.dece.graphic',
-        'uvm' => 'video/vnd.dece.mobile',
-        'uvp' => 'video/vnd.dece.pd',
-        'uvs' => 'video/vnd.dece.sd',
-        'uvt' => 'application/vnd.dece.ttml+xml',
-        'uvu' => 'video/vnd.uvvu.mp4',
-        'uvv' => 'video/vnd.dece.video',
-        'uvva' => 'audio/vnd.dece.audio',
-        'uvvd' => 'application/vnd.dece.data',
-        'uvvf' => 'application/vnd.dece.data',
-        'uvvg' => 'image/vnd.dece.graphic',
-        'uvvh' => 'video/vnd.dece.hd',
-        'uvvi' => 'image/vnd.dece.graphic',
-        'uvvm' => 'video/vnd.dece.mobile',
-        'uvvp' => 'video/vnd.dece.pd',
-        'uvvs' => 'video/vnd.dece.sd',
-        'uvvt' => 'application/vnd.dece.ttml+xml',
-        'uvvu' => 'video/vnd.uvvu.mp4',
-        'uvvv' => 'video/vnd.dece.video',
-        'uvvx' => 'application/vnd.dece.unspecified',
-        'uvx' => 'application/vnd.dece.unspecified',
-        'vcd' => 'application/x-cdlink',
-        'vcf' => 'text/x-vcard',
-        'vcg' => 'application/vnd.groove-vcard',
-        'vcs' => 'text/x-vcalendar',
-        'vcx' => 'application/vnd.vcx',
-        'vis' => 'application/vnd.visionary',
-        'viv' => 'video/vnd.vivo',
-        'vor' => 'application/vnd.stardivision.writer',
-        'vox' => 'application/x-authorware-bin',
-        'vrml' => 'model/vrml',
-        'vsd' => 'application/vnd.visio',
-        'vsf' => 'application/vnd.vsf',
-        'vss' => 'application/vnd.visio',
-        'vst' => 'application/vnd.visio',
-        'vsw' => 'application/vnd.visio',
-        'vtu' => 'model/vnd.vtu',
-        'vxml' => 'application/voicexml+xml',
-        'w3d' => 'application/x-director',
-        'wad' => 'application/x-doom',
-        'wav' => 'audio/x-wav',
-        'wax' => 'audio/x-ms-wax',
-        'wbmp' => 'image/vnd.wap.wbmp',
-        'wbs' => 'application/vnd.criticaltools.wbs+xml',
-        'wbxml' => 'application/vnd.wap.wbxml',
-        'wcm' => 'application/vnd.ms-works',
-        'wdb' => 'application/vnd.ms-works',
-        'weba' => 'audio/webm',
-        'webm' => 'video/webm',
-        'webp' => 'image/webp',
-        'wg' => 'application/vnd.pmi.widget',
-        'wgt' => 'application/widget',
-        'wks' => 'application/vnd.ms-works',
-        'wm' => 'video/x-ms-wm',
-        'wma' => 'audio/x-ms-wma',
-        'wmd' => 'application/x-ms-wmd',
-        'wmf' => 'application/x-msmetafile',
-        'wml' => 'text/vnd.wap.wml',
-        'wmlc' => 'application/vnd.wap.wmlc',
-        'wmls' => 'text/vnd.wap.wmlscript',
-        'wmlsc' => 'application/vnd.wap.wmlscriptc',
-        'wmv' => 'video/x-ms-wmv',
-        'wmx' => 'video/x-ms-wmx',
-        'wmz' => 'application/x-ms-wmz',
-        'woff' => 'application/x-font-woff',
-        'wpd' => 'application/vnd.wordperfect',
-        'wpl' => 'application/vnd.ms-wpl',
-        'wps' => 'application/vnd.ms-works',
-        'wqd' => 'application/vnd.wqd',
-        'wri' => 'application/x-mswrite',
-        'wrl' => 'model/vrml',
-        'wsdl' => 'application/wsdl+xml',
-        'wspolicy' => 'application/wspolicy+xml',
-        'wtb' => 'application/vnd.webturbo',
-        'wvx' => 'video/x-ms-wvx',
-        'x32' => 'application/x-authorware-bin',
-        'x3d' => 'application/vnd.hzn-3d-crossword',
-        'xap' => 'application/x-silverlight-app',
-        'xar' => 'application/vnd.xara',
-        'xbap' => 'application/x-ms-xbap',
-        'xbd' => 'application/vnd.fujixerox.docuworks.binder',
-        'xbm' => 'image/x-xbitmap',
-        'xdf' => 'application/xcap-diff+xml',
-        'xdm' => 'application/vnd.syncml.dm+xml',
-        'xdp' => 'application/vnd.adobe.xdp+xml',
-        'xdssc' => 'application/dssc+xml',
-        'xdw' => 'application/vnd.fujixerox.docuworks',
-        'xenc' => 'application/xenc+xml',
-        'xer' => 'application/patch-ops-error+xml',
-        'xfdf' => 'application/vnd.adobe.xfdf',
-        'xfdl' => 'application/vnd.xfdl',
-        'xht' => 'application/xhtml+xml',
-        'xhtml' => 'application/xhtml+xml',
-        'xhvml' => 'application/xv+xml',
-        'xif' => 'image/vnd.xiff',
-        'xla' => 'application/vnd.ms-excel',
-        'xlam' => 'application/vnd.ms-excel.addin.macroenabled.12',
-        'xlc' => 'application/vnd.ms-excel',
-        'xlm' => 'application/vnd.ms-excel',
-        'xls' => 'application/vnd.ms-excel',
-        'xlsb' => 'application/vnd.ms-excel.sheet.binary.macroenabled.12',
-        'xlsm' => 'application/vnd.ms-excel.sheet.macroenabled.12',
-        'xlsx' => 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet',
-        'xlt' => 'application/vnd.ms-excel',
-        'xltm' => 'application/vnd.ms-excel.template.macroenabled.12',
-        'xltx' => 'application/vnd.openxmlformats-officedocument.spreadsheetml.template',
-        'xlw' => 'application/vnd.ms-excel',
-        'xml' => 'application/xml',
-        'xo' => 'application/vnd.olpc-sugar',
-        'xop' => 'application/xop+xml',
-        'xpi' => 'application/x-xpinstall',
-        'xpm' => 'image/x-xpixmap',
-        'xpr' => 'application/vnd.is-xpr',
-        'xps' => 'application/vnd.ms-xpsdocument',
-        'xpw' => 'application/vnd.intercon.formnet',
-        'xpx' => 'application/vnd.intercon.formnet',
-        'xsl' => 'application/xml',
-        'xslt' => 'application/xslt+xml',
-        'xsm' => 'application/vnd.syncml+xml',
-        'xspf' => 'application/xspf+xml',
-        'xul' => 'application/vnd.mozilla.xul+xml',
-        'xvm' => 'application/xv+xml',
-        'xvml' => 'application/xv+xml',
-        'xwd' => 'image/x-xwindowdump',
-        'xyz' => 'chemical/x-xyz',
-        'yaml' => 'text/yaml',
-        'yang' => 'application/yang',
-        'yin' => 'application/yin+xml',
-        'yml' => 'text/yaml',
-        'zaz' => 'application/vnd.zzazz.deck+xml',
-        'zip' => 'application/zip',
-        'zir' => 'application/vnd.zul',
-        'zirz' => 'application/vnd.zul',
-        'zmm' => 'application/vnd.handheld-entertainment+xml'
-    ];
-
-    /**
-     * Get a singleton instance of the class
-     *
-     * @return self
-     * @codeCoverageIgnore
-     */
-    public static function getInstance()
-    {
-        if (!self::$instance) {
-            self::$instance = new self();
-        }
-
-        return self::$instance;
-    }
-
-    /**
-     * Get a mimetype value from a file extension
-     *
-     * @param string $extension File extension
-     *
-     * @return string|null
-     */
-    public function fromExtension($extension)
-    {
-        $extension = strtolower($extension);
-
-        return isset($this->mimetypes[$extension]) ? $this->mimetypes[$extension] : null;
-    }
-
-    /**
-     * Get a mimetype from a filename
-     *
-     * @param string $filename Filename to generate a mimetype from
-     *
-     * @return string|null
-     */
-    public function fromFilename($filename)
-    {
-        return $this->fromExtension(pathinfo($filename, PATHINFO_EXTENSION));
-    }
-}
diff --git a/mayor-orig/www/include/share/facebook/GraphNodes/Birthday.php b/mayor-orig/www/include/share/facebook/GraphNodes/Birthday.php
deleted file mode 100644
index 4338b65e..00000000
--- a/mayor-orig/www/include/share/facebook/GraphNodes/Birthday.php
+++ /dev/null
@@ -1,85 +0,0 @@
-hasYear = count($parts) === 3 || count($parts) === 1;
-        $this->hasDate = count($parts) === 3 || count($parts) === 2;
-
-        parent::__construct($date);
-    }
-
-    /**
-     * Returns whether date object contains birth day and month
-     *
-     * @return bool
-     */
-    public function hasDate()
-    {
-        return $this->hasDate;
-    }
-
-    /**
-     * Returns whether date object contains birth year
-     *
-     * @return bool
-     */
-    public function hasYear()
-    {
-        return $this->hasYear;
-    }
-}
diff --git a/mayor-orig/www/include/share/facebook/GraphNodes/Collection.php b/mayor-orig/www/include/share/facebook/GraphNodes/Collection.php
deleted file mode 100644
index 424b7cf3..00000000
--- a/mayor-orig/www/include/share/facebook/GraphNodes/Collection.php
+++ /dev/null
@@ -1,242 +0,0 @@
-items = $items;
-    }
-
-    /**
-     * Gets the value of a field from the Graph node.
-     *
-     * @param string $name    The field to retrieve.
-     * @param mixed  $default The default to return if the field doesn't exist.
-     *
-     * @return mixed
-     */
-    public function getField($name, $default = null)
-    {
-        if (isset($this->items[$name])) {
-            return $this->items[$name];
-        }
-
-        return $default;
-    }
-
-    /**
-     * Gets the value of the named property for this graph object.
-     *
-     * @param string $name    The property to retrieve.
-     * @param mixed  $default The default to return if the property doesn't exist.
-     *
-     * @return mixed
-     *
-     * @deprecated 5.0.0 getProperty() has been renamed to getField()
-     * @todo v6: Remove this method
-     */
-    public function getProperty($name, $default = null)
-    {
-        return $this->getField($name, $default);
-    }
-
-    /**
-     * Returns a list of all fields set on the object.
-     *
-     * @return array
-     */
-    public function getFieldNames()
-    {
-        return array_keys($this->items);
-    }
-
-    /**
-     * Returns a list of all properties set on the object.
-     *
-     * @return array
-     *
-     * @deprecated 5.0.0 getPropertyNames() has been renamed to getFieldNames()
-     * @todo v6: Remove this method
-     */
-    public function getPropertyNames()
-    {
-        return $this->getFieldNames();
-    }
-
-    /**
-     * Get all of the items in the collection.
-     *
-     * @return array
-     */
-    public function all()
-    {
-        return $this->items;
-    }
-
-    /**
-     * Get the collection of items as a plain array.
-     *
-     * @return array
-     */
-    public function asArray()
-    {
-        return array_map(function ($value) {
-            return $value instanceof Collection ? $value->asArray() : $value;
-        }, $this->items);
-    }
-
-    /**
-     * Run a map over each of the items.
-     *
-     * @param \Closure $callback
-     *
-     * @return static
-     */
-    public function map(\Closure $callback)
-    {
-        return new static(array_map($callback, $this->items, array_keys($this->items)));
-    }
-
-    /**
-     * Get the collection of items as JSON.
-     *
-     * @param int $options
-     *
-     * @return string
-     */
-    public function asJson($options = 0)
-    {
-        return json_encode($this->asArray(), $options);
-    }
-
-    /**
-     * Count the number of items in the collection.
-     *
-     * @return int
-     */
-    public function count()
-    {
-        return count($this->items);
-    }
-
-    /**
-     * Get an iterator for the items.
-     *
-     * @return ArrayIterator
-     */
-    public function getIterator()
-    {
-        return new ArrayIterator($this->items);
-    }
-
-    /**
-     * Determine if an item exists at an offset.
-     *
-     * @param mixed $key
-     *
-     * @return bool
-     */
-    public function offsetExists($key)
-    {
-        return array_key_exists($key, $this->items);
-    }
-
-    /**
-     * Get an item at a given offset.
-     *
-     * @param mixed $key
-     *
-     * @return mixed
-     */
-    public function offsetGet($key)
-    {
-        return $this->items[$key];
-    }
-
-    /**
-     * Set the item at a given offset.
-     *
-     * @param mixed $key
-     * @param mixed $value
-     *
-     * @return void
-     */
-    public function offsetSet($key, $value)
-    {
-        if (is_null($key)) {
-            $this->items[] = $value;
-        } else {
-            $this->items[$key] = $value;
-        }
-    }
-
-    /**
-     * Unset the item at a given offset.
-     *
-     * @param string $key
-     *
-     * @return void
-     */
-    public function offsetUnset($key)
-    {
-        unset($this->items[$key]);
-    }
-
-    /**
-     * Convert the collection to its string representation.
-     *
-     * @return string
-     */
-    public function __toString()
-    {
-        return $this->asJson();
-    }
-}
diff --git a/mayor-orig/www/include/share/facebook/GraphNodes/GraphAchievement.php b/mayor-orig/www/include/share/facebook/GraphNodes/GraphAchievement.php
deleted file mode 100644
index 31508ee4..00000000
--- a/mayor-orig/www/include/share/facebook/GraphNodes/GraphAchievement.php
+++ /dev/null
@@ -1,112 +0,0 @@
- '\Facebook\GraphNodes\GraphUser',
-        'application' => '\Facebook\GraphNodes\GraphApplication',
-    ];
-
-    /**
-     * Returns the ID for the achievement.
-     *
-     * @return string|null
-     */
-    public function getId()
-    {
-        return $this->getField('id');
-    }
-
-    /**
-     * Returns the user who achieved this.
-     *
-     * @return GraphUser|null
-     */
-    public function getFrom()
-    {
-        return $this->getField('from');
-    }
-
-    /**
-     * Returns the time at which this was achieved.
-     *
-     * @return \DateTime|null
-     */
-    public function getPublishTime()
-    {
-        return $this->getField('publish_time');
-    }
-
-    /**
-     * Returns the app in which the user achieved this.
-     *
-     * @return GraphApplication|null
-     */
-    public function getApplication()
-    {
-        return $this->getField('application');
-    }
-
-    /**
-     * Returns information about the achievement type this instance is connected with.
-     *
-     * @return array|null
-     */
-    public function getData()
-    {
-        return $this->getField('data');
-    }
-
-    /**
-     * Returns the type of achievement.
-     *
-     * @see https://developers.facebook.com/docs/graph-api/reference/achievement
-     *
-     * @return string
-     */
-    public function getType()
-    {
-        return 'game.achievement';
-    }
-
-    /**
-     * Indicates whether gaining the achievement published a feed story for the user.
-     *
-     * @return boolean|null
-     */
-    public function isNoFeedStory()
-    {
-        return $this->getField('no_feed_story');
-    }
-}
diff --git a/mayor-orig/www/include/share/facebook/GraphNodes/GraphAlbum.php b/mayor-orig/www/include/share/facebook/GraphNodes/GraphAlbum.php
deleted file mode 100644
index 52f19b51..00000000
--- a/mayor-orig/www/include/share/facebook/GraphNodes/GraphAlbum.php
+++ /dev/null
@@ -1,183 +0,0 @@
- '\Facebook\GraphNodes\GraphUser',
-        'place' => '\Facebook\GraphNodes\GraphPage',
-    ];
-
-    /**
-     * Returns the ID for the album.
-     *
-     * @return string|null
-     */
-    public function getId()
-    {
-        return $this->getField('id');
-    }
-
-    /**
-     * Returns whether the viewer can upload photos to this album.
-     *
-     * @return boolean|null
-     */
-    public function getCanUpload()
-    {
-        return $this->getField('can_upload');
-    }
-
-    /**
-     * Returns the number of photos in this album.
-     *
-     * @return int|null
-     */
-    public function getCount()
-    {
-        return $this->getField('count');
-    }
-
-    /**
-     * Returns the ID of the album's cover photo.
-     *
-     * @return string|null
-     */
-    public function getCoverPhoto()
-    {
-        return $this->getField('cover_photo');
-    }
-
-    /**
-     * Returns the time the album was initially created.
-     *
-     * @return \DateTime|null
-     */
-    public function getCreatedTime()
-    {
-        return $this->getField('created_time');
-    }
-
-    /**
-     * Returns the time the album was updated.
-     *
-     * @return \DateTime|null
-     */
-    public function getUpdatedTime()
-    {
-        return $this->getField('updated_time');
-    }
-
-    /**
-     * Returns the description of the album.
-     *
-     * @return string|null
-     */
-    public function getDescription()
-    {
-        return $this->getField('description');
-    }
-
-    /**
-     * Returns profile that created the album.
-     *
-     * @return GraphUser|null
-     */
-    public function getFrom()
-    {
-        return $this->getField('from');
-    }
-
-    /**
-     * Returns profile that created the album.
-     *
-     * @return GraphPage|null
-     */
-    public function getPlace()
-    {
-        return $this->getField('place');
-    }
-
-    /**
-     * Returns a link to this album on Facebook.
-     *
-     * @return string|null
-     */
-    public function getLink()
-    {
-        return $this->getField('link');
-    }
-
-    /**
-     * Returns the textual location of the album.
-     *
-     * @return string|null
-     */
-    public function getLocation()
-    {
-        return $this->getField('location');
-    }
-
-    /**
-     * Returns the title of the album.
-     *
-     * @return string|null
-     */
-    public function getName()
-    {
-        return $this->getField('name');
-    }
-
-    /**
-     * Returns the privacy settings for the album.
-     *
-     * @return string|null
-     */
-    public function getPrivacy()
-    {
-        return $this->getField('privacy');
-    }
-
-    /**
-     * Returns the type of the album.
-     *
-     * enum{ profile, mobile, wall, normal, album }
-     *
-     * @return string|null
-     */
-    public function getType()
-    {
-        return $this->getField('type');
-    }
-}
diff --git a/mayor-orig/www/include/share/facebook/GraphNodes/GraphApplication.php b/mayor-orig/www/include/share/facebook/GraphNodes/GraphApplication.php
deleted file mode 100644
index aa07c825..00000000
--- a/mayor-orig/www/include/share/facebook/GraphNodes/GraphApplication.php
+++ /dev/null
@@ -1,43 +0,0 @@
-getField('id');
-    }
-}
diff --git a/mayor-orig/www/include/share/facebook/GraphNodes/GraphCoverPhoto.php b/mayor-orig/www/include/share/facebook/GraphNodes/GraphCoverPhoto.php
deleted file mode 100644
index 824275bb..00000000
--- a/mayor-orig/www/include/share/facebook/GraphNodes/GraphCoverPhoto.php
+++ /dev/null
@@ -1,72 +0,0 @@
-getField('id');
-    }
-    
-    /**
-     * Returns the source of cover if it exists
-     *
-     * @return string|null
-     */
-    public function getSource()
-    {
-        return $this->getField('source');
-    }
-
-    /**
-     * Returns the offset_x of cover if it exists
-     *
-     * @return int|null
-     */
-    public function getOffsetX()
-    {
-        return $this->getField('offset_x');
-    }
-
-    /**
-     * Returns the offset_y of cover if it exists
-     *
-     * @return int|null
-     */
-    public function getOffsetY()
-    {
-        return $this->getField('offset_y');
-    }
-}
diff --git a/mayor-orig/www/include/share/facebook/GraphNodes/GraphEdge.php b/mayor-orig/www/include/share/facebook/GraphNodes/GraphEdge.php
deleted file mode 100644
index f6f4970c..00000000
--- a/mayor-orig/www/include/share/facebook/GraphNodes/GraphEdge.php
+++ /dev/null
@@ -1,252 +0,0 @@
-request = $request;
-        $this->metaData = $metaData;
-        $this->parentEdgeEndpoint = $parentEdgeEndpoint;
-        $this->subclassName = $subclassName;
-
-        parent::__construct($data);
-    }
-
-    /**
-     * Gets the parent Graph edge endpoint that generated the list.
-     *
-     * @return string|null
-     */
-    public function getParentGraphEdge()
-    {
-        return $this->parentEdgeEndpoint;
-    }
-
-    /**
-     * Gets the subclass name that the child GraphNode's are cast as.
-     *
-     * @return string|null
-     */
-    public function getSubClassName()
-    {
-        return $this->subclassName;
-    }
-
-    /**
-     * Returns the raw meta data associated with this GraphEdge.
-     *
-     * @return array
-     */
-    public function getMetaData()
-    {
-        return $this->metaData;
-    }
-
-    /**
-     * Returns the next cursor if it exists.
-     *
-     * @return string|null
-     */
-    public function getNextCursor()
-    {
-        return $this->getCursor('after');
-    }
-
-    /**
-     * Returns the previous cursor if it exists.
-     *
-     * @return string|null
-     */
-    public function getPreviousCursor()
-    {
-        return $this->getCursor('before');
-    }
-
-    /**
-     * Returns the cursor for a specific direction if it exists.
-     *
-     * @param string $direction The direction of the page: after|before
-     *
-     * @return string|null
-     */
-    public function getCursor($direction)
-    {
-        if (isset($this->metaData['paging']['cursors'][$direction])) {
-            return $this->metaData['paging']['cursors'][$direction];
-        }
-
-        return null;
-    }
-
-    /**
-     * Generates a pagination URL based on a cursor.
-     *
-     * @param string $direction The direction of the page: next|previous
-     *
-     * @return string|null
-     *
-     * @throws FacebookSDKException
-     */
-    public function getPaginationUrl($direction)
-    {
-        $this->validateForPagination();
-
-        // Do we have a paging URL?
-        if (!isset($this->metaData['paging'][$direction])) {
-            return null;
-        }
-
-        $pageUrl = $this->metaData['paging'][$direction];
-
-        return FacebookUrlManipulator::baseGraphUrlEndpoint($pageUrl);
-    }
-
-    /**
-     * Validates whether or not we can paginate on this request.
-     *
-     * @throws FacebookSDKException
-     */
-    public function validateForPagination()
-    {
-        if ($this->request->getMethod() !== 'GET') {
-            throw new FacebookSDKException('You can only paginate on a GET request.', 720);
-        }
-    }
-
-    /**
-     * Gets the request object needed to make a next|previous page request.
-     *
-     * @param string $direction The direction of the page: next|previous
-     *
-     * @return FacebookRequest|null
-     *
-     * @throws FacebookSDKException
-     */
-    public function getPaginationRequest($direction)
-    {
-        $pageUrl = $this->getPaginationUrl($direction);
-        if (!$pageUrl) {
-            return null;
-        }
-
-        $newRequest = clone $this->request;
-        $newRequest->setEndpoint($pageUrl);
-
-        return $newRequest;
-    }
-
-    /**
-     * Gets the request object needed to make a "next" page request.
-     *
-     * @return FacebookRequest|null
-     *
-     * @throws FacebookSDKException
-     */
-    public function getNextPageRequest()
-    {
-        return $this->getPaginationRequest('next');
-    }
-
-    /**
-     * Gets the request object needed to make a "previous" page request.
-     *
-     * @return FacebookRequest|null
-     *
-     * @throws FacebookSDKException
-     */
-    public function getPreviousPageRequest()
-    {
-        return $this->getPaginationRequest('previous');
-    }
-
-    /**
-     * The total number of results according to Graph if it exists.
-     *
-     * This will be returned if the summary=true modifier is present in the request.
-     *
-     * @return int|null
-     */
-    public function getTotalCount()
-    {
-        if (isset($this->metaData['summary']['total_count'])) {
-            return $this->metaData['summary']['total_count'];
-        }
-
-        return null;
-    }
-
-    /**
-     * @inheritDoc
-     */
-    public function map(\Closure $callback)
-    {
-        return new static(
-            $this->request,
-            array_map($callback, $this->items, array_keys($this->items)),
-            $this->metaData,
-            $this->parentEdgeEndpoint,
-            $this->subclassName
-        );
-    }
-}
diff --git a/mayor-orig/www/include/share/facebook/GraphNodes/GraphEvent.php b/mayor-orig/www/include/share/facebook/GraphNodes/GraphEvent.php
deleted file mode 100644
index a470d89f..00000000
--- a/mayor-orig/www/include/share/facebook/GraphNodes/GraphEvent.php
+++ /dev/null
@@ -1,242 +0,0 @@
- '\Facebook\GraphNodes\GraphCoverPhoto',
-        'place' => '\Facebook\GraphNodes\GraphPage',
-        'picture' => '\Facebook\GraphNodes\GraphPicture',
-        'parent_group' => '\Facebook\GraphNodes\GraphGroup',
-    ];
-
-    /**
-     * Returns the `id` (The event ID) as string if present.
-     *
-     * @return string|null
-     */
-    public function getId()
-    {
-        return $this->getField('id');
-    }
-
-    /**
-     * Returns the `cover` (Cover picture) as GraphCoverPhoto if present.
-     *
-     * @return GraphCoverPhoto|null
-     */
-    public function getCover()
-    {
-        return $this->getField('cover');
-    }
-
-    /**
-     * Returns the `description` (Long-form description) as string if present.
-     *
-     * @return string|null
-     */
-    public function getDescription()
-    {
-        return $this->getField('description');
-    }
-
-    /**
-     * Returns the `end_time` (End time, if one has been set) as DateTime if present.
-     *
-     * @return \DateTime|null
-     */
-    public function getEndTime()
-    {
-        return $this->getField('end_time');
-    }
-
-    /**
-     * Returns the `is_date_only` (Whether the event only has a date specified, but no time) as bool if present.
-     *
-     * @return bool|null
-     */
-    public function getIsDateOnly()
-    {
-        return $this->getField('is_date_only');
-    }
-
-    /**
-     * Returns the `name` (Event name) as string if present.
-     *
-     * @return string|null
-     */
-    public function getName()
-    {
-        return $this->getField('name');
-    }
-
-    /**
-     * Returns the `owner` (The profile that created the event) as GraphNode if present.
-     *
-     * @return GraphNode|null
-     */
-    public function getOwner()
-    {
-        return $this->getField('owner');
-    }
-
-    /**
-     * Returns the `parent_group` (The group the event belongs to) as GraphGroup if present.
-     *
-     * @return GraphGroup|null
-     */
-    public function getParentGroup()
-    {
-        return $this->getField('parent_group');
-    }
-
-    /**
-     * Returns the `place` (Event Place information) as GraphPage if present.
-     *
-     * @return GraphPage|null
-     */
-    public function getPlace()
-    {
-        return $this->getField('place');
-    }
-
-    /**
-     * Returns the `privacy` (Who can see the event) as string if present.
-     *
-     * @return string|null
-     */
-    public function getPrivacy()
-    {
-        return $this->getField('privacy');
-    }
-
-    /**
-     * Returns the `start_time` (Start time) as DateTime if present.
-     *
-     * @return \DateTime|null
-     */
-    public function getStartTime()
-    {
-        return $this->getField('start_time');
-    }
-
-    /**
-     * Returns the `ticket_uri` (The link users can visit to buy a ticket to this event) as string if present.
-     *
-     * @return string|null
-     */
-    public function getTicketUri()
-    {
-        return $this->getField('ticket_uri');
-    }
-
-    /**
-     * Returns the `timezone` (Timezone) as string if present.
-     *
-     * @return string|null
-     */
-    public function getTimezone()
-    {
-        return $this->getField('timezone');
-    }
-
-    /**
-     * Returns the `updated_time` (Last update time) as DateTime if present.
-     *
-     * @return \DateTime|null
-     */
-    public function getUpdatedTime()
-    {
-        return $this->getField('updated_time');
-    }
-
-    /**
-     * Returns the `picture` (Event picture) as GraphPicture if present.
-     *
-     * @return GraphPicture|null
-     */
-    public function getPicture()
-    {
-        return $this->getField('picture');
-    }
-
-    /**
-     * Returns the `attending_count` (Number of people attending the event) as int if present.
-     *
-     * @return int|null
-     */
-    public function getAttendingCount()
-    {
-        return $this->getField('attending_count');
-    }
-
-    /**
-     * Returns the `declined_count` (Number of people who declined the event) as int if present.
-     *
-     * @return int|null
-     */
-    public function getDeclinedCount()
-    {
-        return $this->getField('declined_count');
-    }
-
-    /**
-     * Returns the `maybe_count` (Number of people who maybe going to the event) as int if present.
-     *
-     * @return int|null
-     */
-    public function getMaybeCount()
-    {
-        return $this->getField('maybe_count');
-    }
-
-    /**
-     * Returns the `noreply_count` (Number of people who did not reply to the event) as int if present.
-     *
-     * @return int|null
-     */
-    public function getNoreplyCount()
-    {
-        return $this->getField('noreply_count');
-    }
-
-    /**
-     * Returns the `invited_count` (Number of people invited to the event) as int if present.
-     *
-     * @return int|null
-     */
-    public function getInvitedCount()
-    {
-        return $this->getField('invited_count');
-    }
-}
diff --git a/mayor-orig/www/include/share/facebook/GraphNodes/GraphGroup.php b/mayor-orig/www/include/share/facebook/GraphNodes/GraphGroup.php
deleted file mode 100644
index 6217bd4d..00000000
--- a/mayor-orig/www/include/share/facebook/GraphNodes/GraphGroup.php
+++ /dev/null
@@ -1,170 +0,0 @@
- '\Facebook\GraphNodes\GraphCoverPhoto',
-        'venue' => '\Facebook\GraphNodes\GraphLocation',
-    ];
-
-    /**
-     * Returns the `id` (The Group ID) as string if present.
-     *
-     * @return string|null
-     */
-    public function getId()
-    {
-        return $this->getField('id');
-    }
-
-    /**
-     * Returns the `cover` (The cover photo of the Group) as GraphCoverPhoto if present.
-     *
-     * @return GraphCoverPhoto|null
-     */
-    public function getCover()
-    {
-        return $this->getField('cover');
-    }
-
-    /**
-     * Returns the `description` (A brief description of the Group) as string if present.
-     *
-     * @return string|null
-     */
-    public function getDescription()
-    {
-        return $this->getField('description');
-    }
-
-    /**
-     * Returns the `email` (The email address to upload content to the Group. Only current members of the Group can use this) as string if present.
-     *
-     * @return string|null
-     */
-    public function getEmail()
-    {
-        return $this->getField('email');
-    }
-
-    /**
-     * Returns the `icon` (The URL for the Group's icon) as string if present.
-     *
-     * @return string|null
-     */
-    public function getIcon()
-    {
-        return $this->getField('icon');
-    }
-
-    /**
-     * Returns the `link` (The Group's website) as string if present.
-     *
-     * @return string|null
-     */
-    public function getLink()
-    {
-        return $this->getField('link');
-    }
-
-    /**
-     * Returns the `name` (The name of the Group) as string if present.
-     *
-     * @return string|null
-     */
-    public function getName()
-    {
-        return $this->getField('name');
-    }
-
-    /**
-     * Returns the `member_request_count` (Number of people asking to join the group.) as int if present.
-     *
-     * @return int|null
-     */
-    public function getMemberRequestCount()
-    {
-        return $this->getField('member_request_count');
-    }
-
-    /**
-     * Returns the `owner` (The profile that created this Group) as GraphNode if present.
-     *
-     * @return GraphNode|null
-     */
-    public function getOwner()
-    {
-        return $this->getField('owner');
-    }
-
-    /**
-     * Returns the `parent` (The parent Group of this Group, if it exists) as GraphNode if present.
-     *
-     * @return GraphNode|null
-     */
-    public function getParent()
-    {
-        return $this->getField('parent');
-    }
-
-    /**
-     * Returns the `privacy` (The privacy setting of the Group) as string if present.
-     *
-     * @return string|null
-     */
-    public function getPrivacy()
-    {
-        return $this->getField('privacy');
-    }
-
-    /**
-     * Returns the `updated_time` (The last time the Group was updated (this includes changes in the Group's properties and changes in posts and comments if user can see them)) as \DateTime if present.
-     *
-     * @return \DateTime|null
-     */
-    public function getUpdatedTime()
-    {
-        return $this->getField('updated_time');
-    }
-
-    /**
-     * Returns the `venue` (The location for the Group) as GraphLocation if present.
-     *
-     * @return GraphLocation|null
-     */
-    public function getVenue()
-    {
-        return $this->getField('venue');
-    }
-}
diff --git a/mayor-orig/www/include/share/facebook/GraphNodes/GraphList.php b/mayor-orig/www/include/share/facebook/GraphNodes/GraphList.php
deleted file mode 100644
index 3dfbd497..00000000
--- a/mayor-orig/www/include/share/facebook/GraphNodes/GraphList.php
+++ /dev/null
@@ -1,36 +0,0 @@
-getField('street');
-    }
-
-    /**
-     * Returns the city component of the location
-     *
-     * @return string|null
-     */
-    public function getCity()
-    {
-        return $this->getField('city');
-    }
-
-    /**
-     * Returns the state component of the location
-     *
-     * @return string|null
-     */
-    public function getState()
-    {
-        return $this->getField('state');
-    }
-
-    /**
-     * Returns the country component of the location
-     *
-     * @return string|null
-     */
-    public function getCountry()
-    {
-        return $this->getField('country');
-    }
-
-    /**
-     * Returns the zipcode component of the location
-     *
-     * @return string|null
-     */
-    public function getZip()
-    {
-        return $this->getField('zip');
-    }
-
-    /**
-     * Returns the latitude component of the location
-     *
-     * @return float|null
-     */
-    public function getLatitude()
-    {
-        return $this->getField('latitude');
-    }
-
-    /**
-     * Returns the street component of the location
-     *
-     * @return float|null
-     */
-    public function getLongitude()
-    {
-        return $this->getField('longitude');
-    }
-}
diff --git a/mayor-orig/www/include/share/facebook/GraphNodes/GraphNode.php b/mayor-orig/www/include/share/facebook/GraphNodes/GraphNode.php
deleted file mode 100644
index a81c47b7..00000000
--- a/mayor-orig/www/include/share/facebook/GraphNodes/GraphNode.php
+++ /dev/null
@@ -1,198 +0,0 @@
-castItems($data));
-    }
-
-    /**
-     * Iterates over an array and detects the types each node
-     * should be cast to and returns all the items as an array.
-     *
-     * @TODO Add auto-casting to AccessToken entities.
-     *
-     * @param array $data The array to iterate over.
-     *
-     * @return array
-     */
-    public function castItems(array $data)
-    {
-        $items = [];
-
-        foreach ($data as $k => $v) {
-            if ($this->shouldCastAsDateTime($k)
-                && (is_numeric($v)
-                    || $this->isIso8601DateString($v))
-            ) {
-                $items[$k] = $this->castToDateTime($v);
-            } elseif ($k === 'birthday') {
-                $items[$k] = $this->castToBirthday($v);
-            } else {
-                $items[$k] = $v;
-            }
-        }
-
-        return $items;
-    }
-
-    /**
-     * Uncasts any auto-casted datatypes.
-     * Basically the reverse of castItems().
-     *
-     * @return array
-     */
-    public function uncastItems()
-    {
-        $items = $this->asArray();
-
-        return array_map(function ($v) {
-            if ($v instanceof \DateTime) {
-                return $v->format(\DateTime::ISO8601);
-            }
-
-            return $v;
-        }, $items);
-    }
-
-    /**
-     * Get the collection of items as JSON.
-     *
-     * @param int $options
-     *
-     * @return string
-     */
-    public function asJson($options = 0)
-    {
-        return json_encode($this->uncastItems(), $options);
-    }
-
-    /**
-     * Detects an ISO 8601 formatted string.
-     *
-     * @param string $string
-     *
-     * @return boolean
-     *
-     * @see https://developers.facebook.com/docs/graph-api/using-graph-api/#readmodifiers
-     * @see http://www.cl.cam.ac.uk/~mgk25/iso-time.html
-     * @see http://en.wikipedia.org/wiki/ISO_8601
-     */
-    public function isIso8601DateString($string)
-    {
-        // This insane regex was yoinked from here:
-        // http://www.pelagodesign.com/blog/2009/05/20/iso-8601-date-validation-that-doesnt-suck/
-        // ...and I'm all like:
-        // http://thecodinglove.com/post/95378251969/when-code-works-and-i-dont-know-why
-        $crazyInsaneRegexThatSomehowDetectsIso8601 = '/^([\+-]?\d{4}(?!\d{2}\b))'
-            . '((-?)((0[1-9]|1[0-2])(\3([12]\d|0[1-9]|3[01]))?'
-            . '|W([0-4]\d|5[0-2])(-?[1-7])?|(00[1-9]|0[1-9]\d'
-            . '|[12]\d{2}|3([0-5]\d|6[1-6])))([T\s]((([01]\d|2[0-3])'
-            . '((:?)[0-5]\d)?|24\:?00)([\.,]\d+(?!:))?)?(\17[0-5]\d'
-            . '([\.,]\d+)?)?([zZ]|([\+-])([01]\d|2[0-3]):?([0-5]\d)?)?)?)?$/';
-
-        return preg_match($crazyInsaneRegexThatSomehowDetectsIso8601, $string) === 1;
-    }
-
-    /**
-     * Determines if a value from Graph should be cast to DateTime.
-     *
-     * @param string $key
-     *
-     * @return boolean
-     */
-    public function shouldCastAsDateTime($key)
-    {
-        return in_array($key, [
-            'created_time',
-            'updated_time',
-            'start_time',
-            'end_time',
-            'backdated_time',
-            'issued_at',
-            'expires_at',
-            'publish_time',
-            'joined'
-        ], true);
-    }
-
-    /**
-     * Casts a date value from Graph to DateTime.
-     *
-     * @param int|string $value
-     *
-     * @return \DateTime
-     */
-    public function castToDateTime($value)
-    {
-        if (is_int($value)) {
-            $dt = new \DateTime();
-            $dt->setTimestamp($value);
-        } else {
-            $dt = new \DateTime($value);
-        }
-
-        return $dt;
-    }
-
-    /**
-     * Casts a birthday value from Graph to Birthday
-     *
-     * @param string $value
-     *
-     * @return Birthday
-     */
-    public function castToBirthday($value)
-    {
-        return new Birthday($value);
-    }
-
-    /**
-     * Getter for $graphObjectMap.
-     *
-     * @return array
-     */
-    public static function getObjectMap()
-    {
-        return static::$graphObjectMap;
-    }
-}
diff --git a/mayor-orig/www/include/share/facebook/GraphNodes/GraphNodeFactory.php b/mayor-orig/www/include/share/facebook/GraphNodes/GraphNodeFactory.php
deleted file mode 100644
index 6a370919..00000000
--- a/mayor-orig/www/include/share/facebook/GraphNodes/GraphNodeFactory.php
+++ /dev/null
@@ -1,392 +0,0 @@
-response = $response;
-        $this->decodedBody = $response->getDecodedBody();
-    }
-
-    /**
-     * Tries to convert a FacebookResponse entity into a GraphNode.
-     *
-     * @param string|null $subclassName The GraphNode sub class to cast to.
-     *
-     * @return GraphNode
-     *
-     * @throws FacebookSDKException
-     */
-    public function makeGraphNode($subclassName = null)
-    {
-        $this->validateResponseAsArray();
-        $this->validateResponseCastableAsGraphNode();
-
-        return $this->castAsGraphNodeOrGraphEdge($this->decodedBody, $subclassName);
-    }
-
-    /**
-     * Convenience method for creating a GraphAchievement collection.
-     *
-     * @return GraphAchievement
-     *
-     * @throws FacebookSDKException
-     */
-    public function makeGraphAchievement()
-    {
-        return $this->makeGraphNode(static::BASE_GRAPH_OBJECT_PREFIX . 'GraphAchievement');
-    }
-
-    /**
-     * Convenience method for creating a GraphAlbum collection.
-     *
-     * @return GraphAlbum
-     *
-     * @throws FacebookSDKException
-     */
-    public function makeGraphAlbum()
-    {
-        return $this->makeGraphNode(static::BASE_GRAPH_OBJECT_PREFIX . 'GraphAlbum');
-    }
-
-    /**
-     * Convenience method for creating a GraphPage collection.
-     *
-     * @return GraphPage
-     *
-     * @throws FacebookSDKException
-     */
-    public function makeGraphPage()
-    {
-        return $this->makeGraphNode(static::BASE_GRAPH_OBJECT_PREFIX . 'GraphPage');
-    }
-
-    /**
-     * Convenience method for creating a GraphSessionInfo collection.
-     *
-     * @return GraphSessionInfo
-     *
-     * @throws FacebookSDKException
-     */
-    public function makeGraphSessionInfo()
-    {
-        return $this->makeGraphNode(static::BASE_GRAPH_OBJECT_PREFIX . 'GraphSessionInfo');
-    }
-
-    /**
-     * Convenience method for creating a GraphUser collection.
-     *
-     * @return GraphUser
-     *
-     * @throws FacebookSDKException
-     */
-    public function makeGraphUser()
-    {
-        return $this->makeGraphNode(static::BASE_GRAPH_OBJECT_PREFIX . 'GraphUser');
-    }
-
-    /**
-     * Convenience method for creating a GraphEvent collection.
-     *
-     * @return GraphEvent
-     *
-     * @throws FacebookSDKException
-     */
-    public function makeGraphEvent()
-    {
-        return $this->makeGraphNode(static::BASE_GRAPH_OBJECT_PREFIX . 'GraphEvent');
-    }
-
-    /**
-     * Convenience method for creating a GraphGroup collection.
-     *
-     * @return GraphGroup
-     *
-     * @throws FacebookSDKException
-     */
-    public function makeGraphGroup()
-    {
-        return $this->makeGraphNode(static::BASE_GRAPH_OBJECT_PREFIX . 'GraphGroup');
-    }
-
-    /**
-     * Tries to convert a FacebookResponse entity into a GraphEdge.
-     *
-     * @param string|null $subclassName The GraphNode sub class to cast the list items to.
-     * @param boolean     $auto_prefix  Toggle to auto-prefix the subclass name.
-     *
-     * @return GraphEdge
-     *
-     * @throws FacebookSDKException
-     */
-    public function makeGraphEdge($subclassName = null, $auto_prefix = true)
-    {
-        $this->validateResponseAsArray();
-        $this->validateResponseCastableAsGraphEdge();
-
-        if ($subclassName && $auto_prefix) {
-            $subclassName = static::BASE_GRAPH_OBJECT_PREFIX . $subclassName;
-        }
-
-        return $this->castAsGraphNodeOrGraphEdge($this->decodedBody, $subclassName);
-    }
-
-    /**
-     * Validates the decoded body.
-     *
-     * @throws FacebookSDKException
-     */
-    public function validateResponseAsArray()
-    {
-        if (!is_array($this->decodedBody)) {
-            throw new FacebookSDKException('Unable to get response from Graph as array.', 620);
-        }
-    }
-
-    /**
-     * Validates that the return data can be cast as a GraphNode.
-     *
-     * @throws FacebookSDKException
-     */
-    public function validateResponseCastableAsGraphNode()
-    {
-        if (isset($this->decodedBody['data']) && static::isCastableAsGraphEdge($this->decodedBody['data'])) {
-            throw new FacebookSDKException(
-                'Unable to convert response from Graph to a GraphNode because the response looks like a GraphEdge. Try using GraphNodeFactory::makeGraphEdge() instead.',
-                620
-            );
-        }
-    }
-
-    /**
-     * Validates that the return data can be cast as a GraphEdge.
-     *
-     * @throws FacebookSDKException
-     */
-    public function validateResponseCastableAsGraphEdge()
-    {
-        if (!(isset($this->decodedBody['data']) && static::isCastableAsGraphEdge($this->decodedBody['data']))) {
-            throw new FacebookSDKException(
-                'Unable to convert response from Graph to a GraphEdge because the response does not look like a GraphEdge. Try using GraphNodeFactory::makeGraphNode() instead.',
-                620
-            );
-        }
-    }
-
-    /**
-     * Safely instantiates a GraphNode of $subclassName.
-     *
-     * @param array       $data         The array of data to iterate over.
-     * @param string|null $subclassName The subclass to cast this collection to.
-     *
-     * @return GraphNode
-     *
-     * @throws FacebookSDKException
-     */
-    public function safelyMakeGraphNode(array $data, $subclassName = null)
-    {
-        $subclassName = $subclassName ?: static::BASE_GRAPH_NODE_CLASS;
-        static::validateSubclass($subclassName);
-
-        // Remember the parent node ID
-        $parentNodeId = isset($data['id']) ? $data['id'] : null;
-
-        $items = [];
-
-        foreach ($data as $k => $v) {
-            // Array means could be recurable
-            if (is_array($v)) {
-                // Detect any smart-casting from the $graphObjectMap array.
-                // This is always empty on the GraphNode collection, but subclasses can define
-                // their own array of smart-casting types.
-                $graphObjectMap = $subclassName::getObjectMap();
-                $objectSubClass = isset($graphObjectMap[$k])
-                    ? $graphObjectMap[$k]
-                    : null;
-
-                // Could be a GraphEdge or GraphNode
-                $items[$k] = $this->castAsGraphNodeOrGraphEdge($v, $objectSubClass, $k, $parentNodeId);
-            } else {
-                $items[$k] = $v;
-            }
-        }
-
-        return new $subclassName($items);
-    }
-
-    /**
-     * Takes an array of values and determines how to cast each node.
-     *
-     * @param array       $data         The array of data to iterate over.
-     * @param string|null $subclassName The subclass to cast this collection to.
-     * @param string|null $parentKey    The key of this data (Graph edge).
-     * @param string|null $parentNodeId The parent Graph node ID.
-     *
-     * @return GraphNode|GraphEdge
-     *
-     * @throws FacebookSDKException
-     */
-    public function castAsGraphNodeOrGraphEdge(array $data, $subclassName = null, $parentKey = null, $parentNodeId = null)
-    {
-        if (isset($data['data'])) {
-            // Create GraphEdge
-            if (static::isCastableAsGraphEdge($data['data'])) {
-                return $this->safelyMakeGraphEdge($data, $subclassName, $parentKey, $parentNodeId);
-            }
-            // Sometimes Graph is a weirdo and returns a GraphNode under the "data" key
-            $data = $data['data'];
-        }
-
-        // Create GraphNode
-        return $this->safelyMakeGraphNode($data, $subclassName);
-    }
-
-    /**
-     * Return an array of GraphNode's.
-     *
-     * @param array       $data         The array of data to iterate over.
-     * @param string|null $subclassName The GraphNode subclass to cast each item in the list to.
-     * @param string|null $parentKey    The key of this data (Graph edge).
-     * @param string|null $parentNodeId The parent Graph node ID.
-     *
-     * @return GraphEdge
-     *
-     * @throws FacebookSDKException
-     */
-    public function safelyMakeGraphEdge(array $data, $subclassName = null, $parentKey = null, $parentNodeId = null)
-    {
-        if (!isset($data['data'])) {
-            throw new FacebookSDKException('Cannot cast data to GraphEdge. Expected a "data" key.', 620);
-        }
-
-        $dataList = [];
-        foreach ($data['data'] as $graphNode) {
-            $dataList[] = $this->safelyMakeGraphNode($graphNode, $subclassName);
-        }
-
-        $metaData = $this->getMetaData($data);
-
-        // We'll need to make an edge endpoint for this in case it's a GraphEdge (for cursor pagination)
-        $parentGraphEdgeEndpoint = $parentNodeId && $parentKey ? '/' . $parentNodeId . '/' . $parentKey : null;
-        $className = static::BASE_GRAPH_EDGE_CLASS;
-
-        return new $className($this->response->getRequest(), $dataList, $metaData, $parentGraphEdgeEndpoint, $subclassName);
-    }
-
-    /**
-     * Get the meta data from a list in a Graph response.
-     *
-     * @param array $data The Graph response.
-     *
-     * @return array
-     */
-    public function getMetaData(array $data)
-    {
-        unset($data['data']);
-
-        return $data;
-    }
-
-    /**
-     * Determines whether or not the data should be cast as a GraphEdge.
-     *
-     * @param array $data
-     *
-     * @return boolean
-     */
-    public static function isCastableAsGraphEdge(array $data)
-    {
-        if ($data === []) {
-            return true;
-        }
-
-        // Checks for a sequential numeric array which would be a GraphEdge
-        return array_keys($data) === range(0, count($data) - 1);
-    }
-
-    /**
-     * Ensures that the subclass in question is valid.
-     *
-     * @param string $subclassName The GraphNode subclass to validate.
-     *
-     * @throws FacebookSDKException
-     */
-    public static function validateSubclass($subclassName)
-    {
-        if ($subclassName == static::BASE_GRAPH_NODE_CLASS || is_subclass_of($subclassName, static::BASE_GRAPH_NODE_CLASS)) {
-            return;
-        }
-
-        throw new FacebookSDKException('The given subclass "' . $subclassName . '" is not valid. Cannot cast to an object that is not a GraphNode subclass.', 620);
-    }
-}
diff --git a/mayor-orig/www/include/share/facebook/GraphNodes/GraphObject.php b/mayor-orig/www/include/share/facebook/GraphNodes/GraphObject.php
deleted file mode 100644
index 0633c405..00000000
--- a/mayor-orig/www/include/share/facebook/GraphNodes/GraphObject.php
+++ /dev/null
@@ -1,36 +0,0 @@
-makeGraphNode($subclassName);
-    }
-
-    /**
-     * Convenience method for creating a GraphEvent collection.
-     *
-     * @return GraphEvent
-     *
-     * @throws FacebookSDKException
-     */
-    public function makeGraphEvent()
-    {
-        return $this->makeGraphNode(static::BASE_GRAPH_OBJECT_PREFIX . 'GraphEvent');
-    }
-
-    /**
-     * Tries to convert a FacebookResponse entity into a GraphEdge.
-     *
-     * @param string|null $subclassName The GraphNode sub class to cast the list items to.
-     * @param boolean     $auto_prefix  Toggle to auto-prefix the subclass name.
-     *
-     * @return GraphEdge
-     *
-     * @deprecated 5.0.0 GraphObjectFactory has been renamed to GraphNodeFactory
-     */
-    public function makeGraphList($subclassName = null, $auto_prefix = true)
-    {
-        return $this->makeGraphEdge($subclassName, $auto_prefix);
-    }
-}
diff --git a/mayor-orig/www/include/share/facebook/GraphNodes/GraphPage.php b/mayor-orig/www/include/share/facebook/GraphNodes/GraphPage.php
deleted file mode 100644
index 503b96b5..00000000
--- a/mayor-orig/www/include/share/facebook/GraphNodes/GraphPage.php
+++ /dev/null
@@ -1,157 +0,0 @@
- '\Facebook\GraphNodes\GraphPage',
-        'global_brand_parent_page' => '\Facebook\GraphNodes\GraphPage',
-        'location' => '\Facebook\GraphNodes\GraphLocation',
-        'cover' => '\Facebook\GraphNodes\GraphCoverPhoto',
-        'picture' => '\Facebook\GraphNodes\GraphPicture',
-    ];
-
-    /**
-     * Returns the ID for the user's page as a string if present.
-     *
-     * @return string|null
-     */
-    public function getId()
-    {
-        return $this->getField('id');
-    }
-
-    /**
-     * Returns the Category for the user's page as a string if present.
-     *
-     * @return string|null
-     */
-    public function getCategory()
-    {
-        return $this->getField('category');
-    }
-
-    /**
-     * Returns the Name of the user's page as a string if present.
-     *
-     * @return string|null
-     */
-    public function getName()
-    {
-        return $this->getField('name');
-    }
-
-    /**
-     * Returns the best available Page on Facebook.
-     *
-     * @return GraphPage|null
-     */
-    public function getBestPage()
-    {
-        return $this->getField('best_page');
-    }
-
-    /**
-     * Returns the brand's global (parent) Page.
-     *
-     * @return GraphPage|null
-     */
-    public function getGlobalBrandParentPage()
-    {
-        return $this->getField('global_brand_parent_page');
-    }
-
-    /**
-     * Returns the location of this place.
-     *
-     * @return GraphLocation|null
-     */
-    public function getLocation()
-    {
-        return $this->getField('location');
-    }
-
-    /**
-     * Returns CoverPhoto of the Page.
-     *
-     * @return GraphCoverPhoto|null
-     */
-    public function getCover()
-    {
-        return $this->getField('cover');
-    }
-
-    /**
-     * Returns Picture of the Page.
-     *
-     * @return GraphPicture|null
-     */
-    public function getPicture()
-    {
-        return $this->getField('picture');
-    }
-
-    /**
-     * Returns the page access token for the admin user.
-     *
-     * Only available in the `/me/accounts` context.
-     *
-     * @return string|null
-     */
-    public function getAccessToken()
-    {
-        return $this->getField('access_token');
-    }
-
-    /**
-     * Returns the roles of the page admin user.
-     *
-     * Only available in the `/me/accounts` context.
-     *
-     * @return array|null
-     */
-    public function getPerms()
-    {
-        return $this->getField('perms');
-    }
-
-    /**
-     * Returns the `fan_count` (Number of people who likes to page) as int if present.
-     *
-     * @return int|null
-     */
-    public function getFanCount()
-    {
-        return $this->getField('fan_count');
-    }
-}
diff --git a/mayor-orig/www/include/share/facebook/GraphNodes/GraphPicture.php b/mayor-orig/www/include/share/facebook/GraphNodes/GraphPicture.php
deleted file mode 100644
index 10274ec5..00000000
--- a/mayor-orig/www/include/share/facebook/GraphNodes/GraphPicture.php
+++ /dev/null
@@ -1,72 +0,0 @@
-getField('is_silhouette');
-    }
-
-    /**
-     * Returns the url of user picture if it exists
-     *
-     * @return string|null
-     */
-    public function getUrl()
-    {
-        return $this->getField('url');
-    }
-
-    /**
-     * Returns the width of user picture if it exists
-     *
-     * @return int|null
-     */
-    public function getWidth()
-    {
-        return $this->getField('width');
-    }
-
-    /**
-     * Returns the height of user picture if it exists
-     *
-     * @return int|null
-     */
-    public function getHeight()
-    {
-        return $this->getField('height');
-    }
-}
diff --git a/mayor-orig/www/include/share/facebook/GraphNodes/GraphSessionInfo.php b/mayor-orig/www/include/share/facebook/GraphNodes/GraphSessionInfo.php
deleted file mode 100644
index df8dd358..00000000
--- a/mayor-orig/www/include/share/facebook/GraphNodes/GraphSessionInfo.php
+++ /dev/null
@@ -1,102 +0,0 @@
-getField('app_id');
-    }
-
-    /**
-     * Returns the application name the token was issued for.
-     *
-     * @return string|null
-     */
-    public function getApplication()
-    {
-        return $this->getField('application');
-    }
-
-    /**
-     * Returns the date & time that the token expires.
-     *
-     * @return \DateTime|null
-     */
-    public function getExpiresAt()
-    {
-        return $this->getField('expires_at');
-    }
-
-    /**
-     * Returns whether the token is valid.
-     *
-     * @return boolean
-     */
-    public function getIsValid()
-    {
-        return $this->getField('is_valid');
-    }
-
-    /**
-     * Returns the date & time the token was issued at.
-     *
-     * @return \DateTime|null
-     */
-    public function getIssuedAt()
-    {
-        return $this->getField('issued_at');
-    }
-
-    /**
-     * Returns the scope permissions associated with the token.
-     *
-     * @return array
-     */
-    public function getScopes()
-    {
-        return $this->getField('scopes');
-    }
-
-    /**
-     * Returns the login id of the user associated with the token.
-     *
-     * @return string|null
-     */
-    public function getUserId()
-    {
-        return $this->getField('user_id');
-    }
-}
diff --git a/mayor-orig/www/include/share/facebook/GraphNodes/GraphUser.php b/mayor-orig/www/include/share/facebook/GraphNodes/GraphUser.php
deleted file mode 100644
index 6e1ed8f5..00000000
--- a/mayor-orig/www/include/share/facebook/GraphNodes/GraphUser.php
+++ /dev/null
@@ -1,172 +0,0 @@
- '\Facebook\GraphNodes\GraphPage',
-        'location' => '\Facebook\GraphNodes\GraphPage',
-        'significant_other' => '\Facebook\GraphNodes\GraphUser',
-        'picture' => '\Facebook\GraphNodes\GraphPicture',
-    ];
-
-    /**
-     * Returns the ID for the user as a string if present.
-     *
-     * @return string|null
-     */
-    public function getId()
-    {
-        return $this->getField('id');
-    }
-
-    /**
-     * Returns the name for the user as a string if present.
-     *
-     * @return string|null
-     */
-    public function getName()
-    {
-        return $this->getField('name');
-    }
-
-    /**
-     * Returns the first name for the user as a string if present.
-     *
-     * @return string|null
-     */
-    public function getFirstName()
-    {
-        return $this->getField('first_name');
-    }
-
-    /**
-     * Returns the middle name for the user as a string if present.
-     *
-     * @return string|null
-     */
-    public function getMiddleName()
-    {
-        return $this->getField('middle_name');
-    }
-
-    /**
-     * Returns the last name for the user as a string if present.
-     *
-     * @return string|null
-     */
-    public function getLastName()
-    {
-        return $this->getField('last_name');
-    }
-
-    /**
-     * Returns the email for the user as a string if present.
-     *
-     * @return string|null
-     */
-    public function getEmail()
-    {
-        return $this->getField('email');
-    }
-
-    /**
-     * Returns the gender for the user as a string if present.
-     *
-     * @return string|null
-     */
-    public function getGender()
-    {
-        return $this->getField('gender');
-    }
-
-    /**
-     * Returns the Facebook URL for the user as a string if available.
-     *
-     * @return string|null
-     */
-    public function getLink()
-    {
-        return $this->getField('link');
-    }
-
-    /**
-     * Returns the users birthday, if available.
-     *
-     * @return Birthday|null
-     */
-    public function getBirthday()
-    {
-        return $this->getField('birthday');
-    }
-
-    /**
-     * Returns the current location of the user as a GraphPage.
-     *
-     * @return GraphPage|null
-     */
-    public function getLocation()
-    {
-        return $this->getField('location');
-    }
-
-    /**
-     * Returns the current location of the user as a GraphPage.
-     *
-     * @return GraphPage|null
-     */
-    public function getHometown()
-    {
-        return $this->getField('hometown');
-    }
-
-    /**
-     * Returns the current location of the user as a GraphUser.
-     *
-     * @return GraphUser|null
-     */
-    public function getSignificantOther()
-    {
-        return $this->getField('significant_other');
-    }
-
-    /**
-     * Returns the picture of the user as a GraphPicture
-     *
-     * @return GraphPicture|null
-     */
-    public function getPicture()
-    {
-        return $this->getField('picture');
-    }
-}
diff --git a/mayor-orig/www/include/share/facebook/Helpers/FacebookCanvasHelper.php b/mayor-orig/www/include/share/facebook/Helpers/FacebookCanvasHelper.php
deleted file mode 100644
index 7f3466ff..00000000
--- a/mayor-orig/www/include/share/facebook/Helpers/FacebookCanvasHelper.php
+++ /dev/null
@@ -1,52 +0,0 @@
-signedRequest ? $this->signedRequest->get('app_data') : null;
-    }
-
-    /**
-     * Get raw signed request from POST.
-     *
-     * @return string|null
-     */
-    public function getRawSignedRequest()
-    {
-        return $this->getRawSignedRequestFromPost() ?: null;
-    }
-}
diff --git a/mayor-orig/www/include/share/facebook/Helpers/FacebookJavaScriptHelper.php b/mayor-orig/www/include/share/facebook/Helpers/FacebookJavaScriptHelper.php
deleted file mode 100644
index 01a76b8b..00000000
--- a/mayor-orig/www/include/share/facebook/Helpers/FacebookJavaScriptHelper.php
+++ /dev/null
@@ -1,42 +0,0 @@
-getRawSignedRequestFromCookie();
-    }
-}
diff --git a/mayor-orig/www/include/share/facebook/Helpers/FacebookPageTabHelper.php b/mayor-orig/www/include/share/facebook/Helpers/FacebookPageTabHelper.php
deleted file mode 100644
index da2c356c..00000000
--- a/mayor-orig/www/include/share/facebook/Helpers/FacebookPageTabHelper.php
+++ /dev/null
@@ -1,95 +0,0 @@
-signedRequest) {
-            return;
-        }
-
-        $this->pageData = $this->signedRequest->get('page');
-    }
-
-    /**
-     * Returns a value from the page data.
-     *
-     * @param string     $key
-     * @param mixed|null $default
-     *
-     * @return mixed|null
-     */
-    public function getPageData($key, $default = null)
-    {
-        if (isset($this->pageData[$key])) {
-            return $this->pageData[$key];
-        }
-
-        return $default;
-    }
-
-    /**
-     * Returns true if the user is an admin.
-     *
-     * @return boolean
-     */
-    public function isAdmin()
-    {
-        return $this->getPageData('admin') === true;
-    }
-
-    /**
-     * Returns the page id if available.
-     *
-     * @return string|null
-     */
-    public function getPageId()
-    {
-        return $this->getPageData('id');
-    }
-}
diff --git a/mayor-orig/www/include/share/facebook/Helpers/FacebookRedirectLoginHelper.php b/mayor-orig/www/include/share/facebook/Helpers/FacebookRedirectLoginHelper.php
deleted file mode 100644
index 3240ba81..00000000
--- a/mayor-orig/www/include/share/facebook/Helpers/FacebookRedirectLoginHelper.php
+++ /dev/null
@@ -1,333 +0,0 @@
-oAuth2Client = $oAuth2Client;
-        $this->persistentDataHandler = $persistentDataHandler ?: new FacebookSessionPersistentDataHandler();
-        $this->urlDetectionHandler = $urlHandler ?: new FacebookUrlDetectionHandler();
-        $this->pseudoRandomStringGenerator = PseudoRandomStringGeneratorFactory::createPseudoRandomStringGenerator($prsg);
-    }
-
-    /**
-     * Returns the persistent data handler.
-     *
-     * @return PersistentDataInterface
-     */
-    public function getPersistentDataHandler()
-    {
-        return $this->persistentDataHandler;
-    }
-
-    /**
-     * Returns the URL detection handler.
-     *
-     * @return UrlDetectionInterface
-     */
-    public function getUrlDetectionHandler()
-    {
-        return $this->urlDetectionHandler;
-    }
-
-    /**
-     * Returns the cryptographically secure pseudo-random string generator.
-     *
-     * @return PseudoRandomStringGeneratorInterface
-     */
-    public function getPseudoRandomStringGenerator()
-    {
-        return $this->pseudoRandomStringGenerator;
-    }
-
-    /**
-     * Stores CSRF state and returns a URL to which the user should be sent to in order to continue the login process with Facebook.
-     *
-     * @param string $redirectUrl The URL Facebook should redirect users to after login.
-     * @param array  $scope       List of permissions to request during login.
-     * @param array  $params      An array of parameters to generate URL.
-     * @param string $separator   The separator to use in http_build_query().
-     *
-     * @return string
-     */
-    private function makeUrl($redirectUrl, array $scope, array $params = [], $separator = '&')
-    {
-        $state = $this->persistentDataHandler->get('state') ?: $this->pseudoRandomStringGenerator->getPseudoRandomString(static::CSRF_LENGTH);
-        $this->persistentDataHandler->set('state', $state);
-
-        return $this->oAuth2Client->getAuthorizationUrl($redirectUrl, $state, $scope, $params, $separator);
-    }
-
-    /**
-     * Returns the URL to send the user in order to login to Facebook.
-     *
-     * @param string $redirectUrl The URL Facebook should redirect users to after login.
-     * @param array  $scope       List of permissions to request during login.
-     * @param string $separator   The separator to use in http_build_query().
-     *
-     * @return string
-     */
-    public function getLoginUrl($redirectUrl, array $scope = [], $separator = '&')
-    {
-        return $this->makeUrl($redirectUrl, $scope, [], $separator);
-    }
-
-    /**
-     * Returns the URL to send the user in order to log out of Facebook.
-     *
-     * @param AccessToken|string $accessToken The access token that will be logged out.
-     * @param string             $next        The url Facebook should redirect the user to after a successful logout.
-     * @param string             $separator   The separator to use in http_build_query().
-     *
-     * @return string
-     *
-     * @throws FacebookSDKException
-     */
-    public function getLogoutUrl($accessToken, $next, $separator = '&')
-    {
-        if (!$accessToken instanceof AccessToken) {
-            $accessToken = new AccessToken($accessToken);
-        }
-
-        if ($accessToken->isAppAccessToken()) {
-            throw new FacebookSDKException('Cannot generate a logout URL with an app access token.', 722);
-        }
-
-        $params = [
-            'next' => $next,
-            'access_token' => $accessToken->getValue(),
-        ];
-
-        return 'https://www.facebook.com/logout.php?' . http_build_query($params, null, $separator);
-    }
-
-    /**
-     * Returns the URL to send the user in order to login to Facebook with permission(s) to be re-asked.
-     *
-     * @param string $redirectUrl The URL Facebook should redirect users to after login.
-     * @param array  $scope       List of permissions to request during login.
-     * @param string $separator   The separator to use in http_build_query().
-     *
-     * @return string
-     */
-    public function getReRequestUrl($redirectUrl, array $scope = [], $separator = '&')
-    {
-        $params = ['auth_type' => 'rerequest'];
-
-        return $this->makeUrl($redirectUrl, $scope, $params, $separator);
-    }
-
-    /**
-     * Returns the URL to send the user in order to login to Facebook with user to be re-authenticated.
-     *
-     * @param string $redirectUrl The URL Facebook should redirect users to after login.
-     * @param array  $scope       List of permissions to request during login.
-     * @param string $separator   The separator to use in http_build_query().
-     *
-     * @return string
-     */
-    public function getReAuthenticationUrl($redirectUrl, array $scope = [], $separator = '&')
-    {
-        $params = ['auth_type' => 'reauthenticate'];
-
-        return $this->makeUrl($redirectUrl, $scope, $params, $separator);
-    }
-
-    /**
-     * Takes a valid code from a login redirect, and returns an AccessToken entity.
-     *
-     * @param string|null $redirectUrl The redirect URL.
-     *
-     * @return AccessToken|null
-     *
-     * @throws FacebookSDKException
-     */
-    public function getAccessToken($redirectUrl = null)
-    {
-        if (!$code = $this->getCode()) {
-            return null;
-        }
-
-        $this->validateCsrf();
-        $this->resetCsrf();
-
-        $redirectUrl = $redirectUrl ?: $this->urlDetectionHandler->getCurrentUrl();
-        // At minimum we need to remove the 'state' and 'code' params
-        $redirectUrl = FacebookUrlManipulator::removeParamsFromUrl($redirectUrl, ['code', 'state']);
-
-        return $this->oAuth2Client->getAccessTokenFromCode($code, $redirectUrl);
-    }
-
-    /**
-     * Validate the request against a cross-site request forgery.
-     *
-     * @throws FacebookSDKException
-     */
-    protected function validateCsrf()
-    {
-        $state = $this->getState();
-        if (!$state) {
-            throw new FacebookSDKException('Cross-site request forgery validation failed. Required GET param "state" missing.');
-        }
-        $savedState = $this->persistentDataHandler->get('state');
-        if (!$savedState) {
-            throw new FacebookSDKException('Cross-site request forgery validation failed. Required param "state" missing from persistent data.');
-        }
-
-        if (\hash_equals($savedState, $state)) {
-            return;
-        }
-
-        throw new FacebookSDKException('Cross-site request forgery validation failed. The "state" param from the URL and session do not match.');
-    }
-
-    /**
-     * Resets the CSRF so that it doesn't get reused.
-     */
-    private function resetCsrf()
-    {
-        $this->persistentDataHandler->set('state', null);
-    }
-
-    /**
-     * Return the code.
-     *
-     * @return string|null
-     */
-    protected function getCode()
-    {
-        return $this->getInput('code');
-    }
-
-    /**
-     * Return the state.
-     *
-     * @return string|null
-     */
-    protected function getState()
-    {
-        return $this->getInput('state');
-    }
-
-    /**
-     * Return the error code.
-     *
-     * @return string|null
-     */
-    public function getErrorCode()
-    {
-        return $this->getInput('error_code');
-    }
-
-    /**
-     * Returns the error.
-     *
-     * @return string|null
-     */
-    public function getError()
-    {
-        return $this->getInput('error');
-    }
-
-    /**
-     * Returns the error reason.
-     *
-     * @return string|null
-     */
-    public function getErrorReason()
-    {
-        return $this->getInput('error_reason');
-    }
-
-    /**
-     * Returns the error description.
-     *
-     * @return string|null
-     */
-    public function getErrorDescription()
-    {
-        return $this->getInput('error_description');
-    }
-
-    /**
-     * Returns a value from a GET param.
-     *
-     * @param string $key
-     *
-     * @return string|null
-     */
-    private function getInput($key)
-    {
-        return isset($_GET[$key]) ? $_GET[$key] : null;
-    }
-}
diff --git a/mayor-orig/www/include/share/facebook/Helpers/FacebookSignedRequestFromInputHelper.php b/mayor-orig/www/include/share/facebook/Helpers/FacebookSignedRequestFromInputHelper.php
deleted file mode 100644
index 4044da10..00000000
--- a/mayor-orig/www/include/share/facebook/Helpers/FacebookSignedRequestFromInputHelper.php
+++ /dev/null
@@ -1,166 +0,0 @@
-app = $app;
-        $graphVersion = $graphVersion ?: Facebook::DEFAULT_GRAPH_VERSION;
-        $this->oAuth2Client = new OAuth2Client($this->app, $client, $graphVersion);
-
-        $this->instantiateSignedRequest();
-    }
-
-    /**
-     * Instantiates a new SignedRequest entity.
-     *
-     * @param string|null
-     */
-    public function instantiateSignedRequest($rawSignedRequest = null)
-    {
-        $rawSignedRequest = $rawSignedRequest ?: $this->getRawSignedRequest();
-
-        if (!$rawSignedRequest) {
-            return;
-        }
-
-        $this->signedRequest = new SignedRequest($this->app, $rawSignedRequest);
-    }
-
-    /**
-     * Returns an AccessToken entity from the signed request.
-     *
-     * @return AccessToken|null
-     *
-     * @throws \Facebook\Exceptions\FacebookSDKException
-     */
-    public function getAccessToken()
-    {
-        if ($this->signedRequest && $this->signedRequest->hasOAuthData()) {
-            $code = $this->signedRequest->get('code');
-            $accessToken = $this->signedRequest->get('oauth_token');
-
-            if ($code && !$accessToken) {
-                return $this->oAuth2Client->getAccessTokenFromCode($code);
-            }
-
-            $expiresAt = $this->signedRequest->get('expires', 0);
-
-            return new AccessToken($accessToken, $expiresAt);
-        }
-
-        return null;
-    }
-
-    /**
-     * Returns the SignedRequest entity.
-     *
-     * @return SignedRequest|null
-     */
-    public function getSignedRequest()
-    {
-        return $this->signedRequest;
-    }
-
-    /**
-     * Returns the user_id if available.
-     *
-     * @return string|null
-     */
-    public function getUserId()
-    {
-        return $this->signedRequest ? $this->signedRequest->getUserId() : null;
-    }
-
-    /**
-     * Get raw signed request from input.
-     *
-     * @return string|null
-     */
-    abstract public function getRawSignedRequest();
-
-    /**
-     * Get raw signed request from POST input.
-     *
-     * @return string|null
-     */
-    public function getRawSignedRequestFromPost()
-    {
-        if (isset($_POST['signed_request'])) {
-            return $_POST['signed_request'];
-        }
-
-        return null;
-    }
-
-    /**
-     * Get raw signed request from cookie set from the Javascript SDK.
-     *
-     * @return string|null
-     */
-    public function getRawSignedRequestFromCookie()
-    {
-        if (isset($_COOKIE['fbsr_' . $this->app->getId()])) {
-            return $_COOKIE['fbsr_' . $this->app->getId()];
-        }
-
-        return null;
-    }
-}
diff --git a/mayor-orig/www/include/share/facebook/Http/GraphRawResponse.php b/mayor-orig/www/include/share/facebook/Http/GraphRawResponse.php
deleted file mode 100644
index d1a7241c..00000000
--- a/mayor-orig/www/include/share/facebook/Http/GraphRawResponse.php
+++ /dev/null
@@ -1,137 +0,0 @@
-httpResponseCode = (int)$httpStatusCode;
-        }
-
-        if (is_array($headers)) {
-            $this->headers = $headers;
-        } else {
-            $this->setHeadersFromString($headers);
-        }
-
-        $this->body = $body;
-    }
-
-    /**
-     * Return the response headers.
-     *
-     * @return array
-     */
-    public function getHeaders()
-    {
-        return $this->headers;
-    }
-
-    /**
-     * Return the body of the response.
-     *
-     * @return string
-     */
-    public function getBody()
-    {
-        return $this->body;
-    }
-
-    /**
-     * Return the HTTP response code.
-     *
-     * @return int
-     */
-    public function getHttpResponseCode()
-    {
-        return $this->httpResponseCode;
-    }
-
-    /**
-     * Sets the HTTP response code from a raw header.
-     *
-     * @param string $rawResponseHeader
-     */
-    public function setHttpResponseCodeFromHeader($rawResponseHeader)
-    {
-        preg_match('|HTTP/\d\.\d\s+(\d+)\s+.*|', $rawResponseHeader, $match);
-        $this->httpResponseCode = (int)$match[1];
-    }
-
-    /**
-     * Parse the raw headers and set as an array.
-     *
-     * @param string $rawHeaders The raw headers from the response.
-     */
-    protected function setHeadersFromString($rawHeaders)
-    {
-        // Normalize line breaks
-        $rawHeaders = str_replace("\r\n", "\n", $rawHeaders);
-
-        // There will be multiple headers if a 301 was followed
-        // or a proxy was followed, etc
-        $headerCollection = explode("\n\n", trim($rawHeaders));
-        // We just want the last response (at the end)
-        $rawHeader = array_pop($headerCollection);
-
-        $headerComponents = explode("\n", $rawHeader);
-        foreach ($headerComponents as $line) {
-            if (strpos($line, ': ') === false) {
-                $this->setHttpResponseCodeFromHeader($line);
-            } else {
-                list($key, $value) = explode(': ', $line, 2);
-                $this->headers[$key] = $value;
-            }
-        }
-    }
-}
diff --git a/mayor-orig/www/include/share/facebook/Http/RequestBodyInterface.php b/mayor-orig/www/include/share/facebook/Http/RequestBodyInterface.php
deleted file mode 100644
index 1c03f4fd..00000000
--- a/mayor-orig/www/include/share/facebook/Http/RequestBodyInterface.php
+++ /dev/null
@@ -1,39 +0,0 @@
-params = $params;
-        $this->files = $files;
-        $this->boundary = $boundary ?: uniqid();
-    }
-
-    /**
-     * @inheritdoc
-     */
-    public function getBody()
-    {
-        $body = '';
-
-        // Compile normal params
-        $params = $this->getNestedParams($this->params);
-        foreach ($params as $k => $v) {
-            $body .= $this->getParamString($k, $v);
-        }
-
-        // Compile files
-        foreach ($this->files as $k => $v) {
-            $body .= $this->getFileString($k, $v);
-        }
-
-        // Peace out
-        $body .= "--{$this->boundary}--\r\n";
-
-        return $body;
-    }
-
-    /**
-     * Get the boundary
-     *
-     * @return string
-     */
-    public function getBoundary()
-    {
-        return $this->boundary;
-    }
-
-    /**
-     * Get the string needed to transfer a file.
-     *
-     * @param string       $name
-     * @param FacebookFile $file
-     *
-     * @return string
-     */
-    private function getFileString($name, FacebookFile $file)
-    {
-        return sprintf(
-            "--%s\r\nContent-Disposition: form-data; name=\"%s\"; filename=\"%s\"%s\r\n\r\n%s\r\n",
-            $this->boundary,
-            $name,
-            $file->getFileName(),
-            $this->getFileHeaders($file),
-            $file->getContents()
-        );
-    }
-
-    /**
-     * Get the string needed to transfer a POST field.
-     *
-     * @param string $name
-     * @param string $value
-     *
-     * @return string
-     */
-    private function getParamString($name, $value)
-    {
-        return sprintf(
-            "--%s\r\nContent-Disposition: form-data; name=\"%s\"\r\n\r\n%s\r\n",
-            $this->boundary,
-            $name,
-            $value
-        );
-    }
-
-    /**
-     * Returns the params as an array of nested params.
-     *
-     * @param array $params
-     *
-     * @return array
-     */
-    private function getNestedParams(array $params)
-    {
-        $query = http_build_query($params, null, '&');
-        $params = explode('&', $query);
-        $result = [];
-
-        foreach ($params as $param) {
-            list($key, $value) = explode('=', $param, 2);
-            $result[urldecode($key)] = urldecode($value);
-        }
-
-        return $result;
-    }
-
-    /**
-     * Get the headers needed before transferring the content of a POST file.
-     *
-     * @param FacebookFile $file
-     *
-     * @return string
-     */
-    protected function getFileHeaders(FacebookFile $file)
-    {
-        return "\r\nContent-Type: {$file->getMimetype()}";
-    }
-}
diff --git a/mayor-orig/www/include/share/facebook/Http/RequestBodyUrlEncoded.php b/mayor-orig/www/include/share/facebook/Http/RequestBodyUrlEncoded.php
deleted file mode 100644
index c1e35f43..00000000
--- a/mayor-orig/www/include/share/facebook/Http/RequestBodyUrlEncoded.php
+++ /dev/null
@@ -1,55 +0,0 @@
-params = $params;
-    }
-
-    /**
-     * @inheritdoc
-     */
-    public function getBody()
-    {
-        return http_build_query($this->params, null, '&');
-    }
-}
diff --git a/mayor-orig/www/include/share/facebook/HttpClients/FacebookCurl.php b/mayor-orig/www/include/share/facebook/HttpClients/FacebookCurl.php
deleted file mode 100644
index 28e4ba59..00000000
--- a/mayor-orig/www/include/share/facebook/HttpClients/FacebookCurl.php
+++ /dev/null
@@ -1,129 +0,0 @@
-curl = curl_init();
-    }
-
-    /**
-     * Set a curl option
-     *
-     * @param $key
-     * @param $value
-     */
-    public function setopt($key, $value)
-    {
-        curl_setopt($this->curl, $key, $value);
-    }
-
-    /**
-     * Set an array of options to a curl resource
-     *
-     * @param array $options
-     */
-    public function setoptArray(array $options)
-    {
-        curl_setopt_array($this->curl, $options);
-    }
-
-    /**
-     * Send a curl request
-     *
-     * @return mixed
-     */
-    public function exec()
-    {
-        return curl_exec($this->curl);
-    }
-
-    /**
-     * Return the curl error number
-     *
-     * @return int
-     */
-    public function errno()
-    {
-        return curl_errno($this->curl);
-    }
-
-    /**
-     * Return the curl error message
-     *
-     * @return string
-     */
-    public function error()
-    {
-        return curl_error($this->curl);
-    }
-
-    /**
-     * Get info from a curl reference
-     *
-     * @param $type
-     *
-     * @return mixed
-     */
-    public function getinfo($type)
-    {
-        return curl_getinfo($this->curl, $type);
-    }
-
-    /**
-     * Get the currently installed curl version
-     *
-     * @return array
-     */
-    public function version()
-    {
-        return curl_version();
-    }
-
-    /**
-     * Close the resource connection to curl
-     */
-    public function close()
-    {
-        curl_close($this->curl);
-    }
-}
diff --git a/mayor-orig/www/include/share/facebook/HttpClients/FacebookCurlHttpClient.php b/mayor-orig/www/include/share/facebook/HttpClients/FacebookCurlHttpClient.php
deleted file mode 100644
index 9516cc83..00000000
--- a/mayor-orig/www/include/share/facebook/HttpClients/FacebookCurlHttpClient.php
+++ /dev/null
@@ -1,163 +0,0 @@
-facebookCurl = $facebookCurl ?: new FacebookCurl();
-    }
-
-    /**
-     * @inheritdoc
-     */
-    public function send($url, $method, $body, array $headers, $timeOut)
-    {
-        $this->openConnection($url, $method, $body, $headers, $timeOut);
-        $this->sendRequest();
-
-        if ($curlErrorCode = $this->facebookCurl->errno()) {
-            throw new FacebookSDKException($this->facebookCurl->error(), $curlErrorCode);
-        }
-
-        // Separate the raw headers from the raw body
-        list($rawHeaders, $rawBody) = $this->extractResponseHeadersAndBody();
-
-        $this->closeConnection();
-
-        return new GraphRawResponse($rawHeaders, $rawBody);
-    }
-
-    /**
-     * Opens a new curl connection.
-     *
-     * @param string $url     The endpoint to send the request to.
-     * @param string $method  The request method.
-     * @param string $body    The body of the request.
-     * @param array  $headers The request headers.
-     * @param int    $timeOut The timeout in seconds for the request.
-     */
-    public function openConnection($url, $method, $body, array $headers, $timeOut)
-    {
-        $options = [
-            CURLOPT_CUSTOMREQUEST => $method,
-            CURLOPT_HTTPHEADER => $this->compileRequestHeaders($headers),
-            CURLOPT_URL => $url,
-            CURLOPT_CONNECTTIMEOUT => 10,
-            CURLOPT_TIMEOUT => $timeOut,
-            CURLOPT_RETURNTRANSFER => true, // Return response as string
-            CURLOPT_HEADER => true, // Enable header processing
-            CURLOPT_SSL_VERIFYHOST => 2,
-            CURLOPT_SSL_VERIFYPEER => true,
-            CURLOPT_CAINFO => __DIR__ . '/certs/DigiCertHighAssuranceEVRootCA.pem',
-        ];
-
-        if ($method !== "GET") {
-            $options[CURLOPT_POSTFIELDS] = $body;
-        }
-
-        $this->facebookCurl->init();
-        $this->facebookCurl->setoptArray($options);
-    }
-
-    /**
-     * Closes an existing curl connection
-     */
-    public function closeConnection()
-    {
-        $this->facebookCurl->close();
-    }
-
-    /**
-     * Send the request and get the raw response from curl
-     */
-    public function sendRequest()
-    {
-        $this->rawResponse = $this->facebookCurl->exec();
-    }
-
-    /**
-     * Compiles the request headers into a curl-friendly format.
-     *
-     * @param array $headers The request headers.
-     *
-     * @return array
-     */
-    public function compileRequestHeaders(array $headers)
-    {
-        $return = [];
-
-        foreach ($headers as $key => $value) {
-            $return[] = $key . ': ' . $value;
-        }
-
-        return $return;
-    }
-
-    /**
-     * Extracts the headers and the body into a two-part array
-     *
-     * @return array
-     */
-    public function extractResponseHeadersAndBody()
-    {
-        $parts = explode("\r\n\r\n", $this->rawResponse);
-        $rawBody = array_pop($parts);
-        $rawHeaders = implode("\r\n\r\n", $parts);
-
-        return [trim($rawHeaders), trim($rawBody)];
-    }
-}
diff --git a/mayor-orig/www/include/share/facebook/HttpClients/FacebookGuzzleHttpClient.php b/mayor-orig/www/include/share/facebook/HttpClients/FacebookGuzzleHttpClient.php
deleted file mode 100644
index 8feb7cb6..00000000
--- a/mayor-orig/www/include/share/facebook/HttpClients/FacebookGuzzleHttpClient.php
+++ /dev/null
@@ -1,97 +0,0 @@
-guzzleClient = $guzzleClient ?: new Client();
-    }
-
-    /**
-     * @inheritdoc
-     */
-    public function send($url, $method, $body, array $headers, $timeOut)
-    {
-        $options = [
-            'headers' => $headers,
-            'body' => $body,
-            'timeout' => $timeOut,
-            'connect_timeout' => 10,
-            'verify' => __DIR__ . '/certs/DigiCertHighAssuranceEVRootCA.pem',
-        ];
-        $request = $this->guzzleClient->createRequest($method, $url, $options);
-
-        try {
-            $rawResponse = $this->guzzleClient->send($request);
-        } catch (RequestException $e) {
-            $rawResponse = $e->getResponse();
-
-            if ($e->getPrevious() instanceof RingException || !$rawResponse instanceof ResponseInterface) {
-                throw new FacebookSDKException($e->getMessage(), $e->getCode());
-            }
-        }
-
-        $rawHeaders = $this->getHeadersAsString($rawResponse);
-        $rawBody = $rawResponse->getBody();
-        $httpStatusCode = $rawResponse->getStatusCode();
-
-        return new GraphRawResponse($rawHeaders, $rawBody, $httpStatusCode);
-    }
-
-    /**
-     * Returns the Guzzle array of headers as a string.
-     *
-     * @param ResponseInterface $response The Guzzle response.
-     *
-     * @return string
-     */
-    public function getHeadersAsString(ResponseInterface $response)
-    {
-        $headers = $response->getHeaders();
-        $rawHeaders = [];
-        foreach ($headers as $name => $values) {
-            $rawHeaders[] = $name . ": " . implode(", ", $values);
-        }
-
-        return implode("\r\n", $rawHeaders);
-    }
-}
diff --git a/mayor-orig/www/include/share/facebook/HttpClients/FacebookHttpClientInterface.php b/mayor-orig/www/include/share/facebook/HttpClients/FacebookHttpClientInterface.php
deleted file mode 100644
index 1fbf953d..00000000
--- a/mayor-orig/www/include/share/facebook/HttpClients/FacebookHttpClientInterface.php
+++ /dev/null
@@ -1,47 +0,0 @@
-stream = stream_context_create($options);
-    }
-
-    /**
-     * The response headers from the stream wrapper
-     *
-     * @return array
-     */
-    public function getResponseHeaders()
-    {
-        return $this->responseHeaders;
-    }
-
-    /**
-     * Send a stream wrapped request
-     *
-     * @param string $url
-     *
-     * @return mixed
-     */
-    public function fileGetContents($url)
-    {
-        $rawResponse = file_get_contents($url, false, $this->stream);
-        $this->responseHeaders = $http_response_header ?: [];
-
-        return $rawResponse;
-    }
-}
diff --git a/mayor-orig/www/include/share/facebook/HttpClients/FacebookStreamHttpClient.php b/mayor-orig/www/include/share/facebook/HttpClients/FacebookStreamHttpClient.php
deleted file mode 100644
index 1cdfd539..00000000
--- a/mayor-orig/www/include/share/facebook/HttpClients/FacebookStreamHttpClient.php
+++ /dev/null
@@ -1,94 +0,0 @@
-facebookStream = $facebookStream ?: new FacebookStream();
-    }
-
-    /**
-     * @inheritdoc
-     */
-    public function send($url, $method, $body, array $headers, $timeOut)
-    {
-        $options = [
-            'http' => [
-                'method' => $method,
-                'header' => $this->compileHeader($headers),
-                'content' => $body,
-                'timeout' => $timeOut,
-                'ignore_errors' => true
-            ],
-            'ssl' => [
-                'verify_peer' => true,
-                'verify_peer_name' => true,
-                'allow_self_signed' => true, // All root certificates are self-signed
-                'cafile' => __DIR__ . '/certs/DigiCertHighAssuranceEVRootCA.pem',
-            ],
-        ];
-
-        $this->facebookStream->streamContextCreate($options);
-        $rawBody = $this->facebookStream->fileGetContents($url);
-        $rawHeaders = $this->facebookStream->getResponseHeaders();
-
-        if ($rawBody === false || empty($rawHeaders)) {
-            throw new FacebookSDKException('Stream returned an empty response', 660);
-        }
-
-        $rawHeaders = implode("\r\n", $rawHeaders);
-
-        return new GraphRawResponse($rawHeaders, $rawBody);
-    }
-
-    /**
-     * Formats the headers for use in the stream wrapper.
-     *
-     * @param array $headers The request headers.
-     *
-     * @return string
-     */
-    public function compileHeader(array $headers)
-    {
-        $header = [];
-        foreach ($headers as $k => $v) {
-            $header[] = $k . ': ' . $v;
-        }
-
-        return implode("\r\n", $header);
-    }
-}
diff --git a/mayor-orig/www/include/share/facebook/HttpClients/HttpClientsFactory.php b/mayor-orig/www/include/share/facebook/HttpClients/HttpClientsFactory.php
deleted file mode 100644
index d9f2a8d3..00000000
--- a/mayor-orig/www/include/share/facebook/HttpClients/HttpClientsFactory.php
+++ /dev/null
@@ -1,99 +0,0 @@
-sessionData[$key]) ? $this->sessionData[$key] : null;
-    }
-
-    /**
-     * @inheritdoc
-     */
-    public function set($key, $value)
-    {
-        $this->sessionData[$key] = $value;
-    }
-}
diff --git a/mayor-orig/www/include/share/facebook/PersistentData/FacebookSessionPersistentDataHandler.php b/mayor-orig/www/include/share/facebook/PersistentData/FacebookSessionPersistentDataHandler.php
deleted file mode 100644
index 9123e3dc..00000000
--- a/mayor-orig/www/include/share/facebook/PersistentData/FacebookSessionPersistentDataHandler.php
+++ /dev/null
@@ -1,76 +0,0 @@
-sessionPrefix . $key])) {
-            return $_SESSION[$this->sessionPrefix . $key];
-        }
-
-        return null;
-    }
-
-    /**
-     * @inheritdoc
-     */
-    public function set($key, $value)
-    {
-        $_SESSION[$this->sessionPrefix . $key] = $value;
-    }
-}
diff --git a/mayor-orig/www/include/share/facebook/PersistentData/PersistentDataFactory.php b/mayor-orig/www/include/share/facebook/PersistentData/PersistentDataFactory.php
deleted file mode 100644
index 18fb8fd5..00000000
--- a/mayor-orig/www/include/share/facebook/PersistentData/PersistentDataFactory.php
+++ /dev/null
@@ -1,65 +0,0 @@
-validateLength($length);
-
-        $binaryString = mcrypt_create_iv($length, MCRYPT_DEV_URANDOM);
-
-        if ($binaryString === false) {
-            throw new FacebookSDKException(
-                static::ERROR_MESSAGE .
-                'mcrypt_create_iv() returned an error.'
-            );
-        }
-
-        return $this->binToHex($binaryString, $length);
-    }
-}
diff --git a/mayor-orig/www/include/share/facebook/PseudoRandomString/OpenSslPseudoRandomStringGenerator.php b/mayor-orig/www/include/share/facebook/PseudoRandomString/OpenSslPseudoRandomStringGenerator.php
deleted file mode 100644
index 4b4276dc..00000000
--- a/mayor-orig/www/include/share/facebook/PseudoRandomString/OpenSslPseudoRandomStringGenerator.php
+++ /dev/null
@@ -1,67 +0,0 @@
-validateLength($length);
-
-        $wasCryptographicallyStrong = false;
-        $binaryString = openssl_random_pseudo_bytes($length, $wasCryptographicallyStrong);
-
-        if ($binaryString === false) {
-            throw new FacebookSDKException(static::ERROR_MESSAGE . 'openssl_random_pseudo_bytes() returned an unknown error.');
-        }
-
-        if ($wasCryptographicallyStrong !== true) {
-            throw new FacebookSDKException(static::ERROR_MESSAGE . 'openssl_random_pseudo_bytes() returned a pseudo-random string but it was not cryptographically secure and cannot be used.');
-        }
-
-        return $this->binToHex($binaryString, $length);
-    }
-}
diff --git a/mayor-orig/www/include/share/facebook/PseudoRandomString/PseudoRandomStringGeneratorFactory.php b/mayor-orig/www/include/share/facebook/PseudoRandomString/PseudoRandomStringGeneratorFactory.php
deleted file mode 100644
index 412f4813..00000000
--- a/mayor-orig/www/include/share/facebook/PseudoRandomString/PseudoRandomStringGeneratorFactory.php
+++ /dev/null
@@ -1,101 +0,0 @@
-validateLength($length);
-
-        return $this->binToHex(random_bytes($length), $length);
-    }
-}
diff --git a/mayor-orig/www/include/share/facebook/PseudoRandomString/UrandomPseudoRandomStringGenerator.php b/mayor-orig/www/include/share/facebook/PseudoRandomString/UrandomPseudoRandomStringGenerator.php
deleted file mode 100644
index 5ab434e6..00000000
--- a/mayor-orig/www/include/share/facebook/PseudoRandomString/UrandomPseudoRandomStringGenerator.php
+++ /dev/null
@@ -1,89 +0,0 @@
-validateLength($length);
-
-        $stream = fopen('/dev/urandom', 'rb');
-        if (!is_resource($stream)) {
-            throw new FacebookSDKException(
-                static::ERROR_MESSAGE .
-                'Unable to open stream to /dev/urandom.'
-            );
-        }
-
-        if (!defined('HHVM_VERSION')) {
-            stream_set_read_buffer($stream, 0);
-        }
-
-        $binaryString = fread($stream, $length);
-        fclose($stream);
-
-        if (!$binaryString) {
-            throw new FacebookSDKException(
-                static::ERROR_MESSAGE .
-                'Stream to /dev/urandom returned no data.'
-            );
-        }
-
-        return $this->binToHex($binaryString, $length);
-    }
-}
diff --git a/mayor-orig/www/include/share/facebook/SignedRequest.php b/mayor-orig/www/include/share/facebook/SignedRequest.php
deleted file mode 100644
index 6a175a0a..00000000
--- a/mayor-orig/www/include/share/facebook/SignedRequest.php
+++ /dev/null
@@ -1,326 +0,0 @@
-app = $facebookApp;
-
-        if (!$rawSignedRequest) {
-            return;
-        }
-
-        $this->rawSignedRequest = $rawSignedRequest;
-
-        $this->parse();
-    }
-
-    /**
-     * Returns the raw signed request data.
-     *
-     * @return string|null
-     */
-    public function getRawSignedRequest()
-    {
-        return $this->rawSignedRequest;
-    }
-
-    /**
-     * Returns the parsed signed request data.
-     *
-     * @return array|null
-     */
-    public function getPayload()
-    {
-        return $this->payload;
-    }
-
-    /**
-     * Returns a property from the signed request data if available.
-     *
-     * @param string     $key
-     * @param mixed|null $default
-     *
-     * @return mixed|null
-     */
-    public function get($key, $default = null)
-    {
-        if (isset($this->payload[$key])) {
-            return $this->payload[$key];
-        }
-
-        return $default;
-    }
-
-    /**
-     * Returns user_id from signed request data if available.
-     *
-     * @return string|null
-     */
-    public function getUserId()
-    {
-        return $this->get('user_id');
-    }
-
-    /**
-     * Checks for OAuth data in the payload.
-     *
-     * @return boolean
-     */
-    public function hasOAuthData()
-    {
-        return $this->get('oauth_token') || $this->get('code');
-    }
-
-    /**
-     * Creates a signed request from an array of data.
-     *
-     * @param array $payload
-     *
-     * @return string
-     */
-    public function make(array $payload)
-    {
-        $payload['algorithm'] = isset($payload['algorithm']) ? $payload['algorithm'] : 'HMAC-SHA256';
-        $payload['issued_at'] = isset($payload['issued_at']) ? $payload['issued_at'] : time();
-        $encodedPayload = $this->base64UrlEncode(json_encode($payload));
-
-        $hashedSig = $this->hashSignature($encodedPayload);
-        $encodedSig = $this->base64UrlEncode($hashedSig);
-
-        return $encodedSig . '.' . $encodedPayload;
-    }
-
-    /**
-     * Validates and decodes a signed request and saves
-     * the payload to an array.
-     */
-    protected function parse()
-    {
-        list($encodedSig, $encodedPayload) = $this->split();
-
-        // Signature validation
-        $sig = $this->decodeSignature($encodedSig);
-        $hashedSig = $this->hashSignature($encodedPayload);
-        $this->validateSignature($hashedSig, $sig);
-
-        $this->payload = $this->decodePayload($encodedPayload);
-
-        // Payload validation
-        $this->validateAlgorithm();
-    }
-
-    /**
-     * Splits a raw signed request into signature and payload.
-     *
-     * @return array
-     *
-     * @throws FacebookSDKException
-     */
-    protected function split()
-    {
-        if (strpos($this->rawSignedRequest, '.') === false) {
-            throw new FacebookSDKException('Malformed signed request.', 606);
-        }
-
-        return explode('.', $this->rawSignedRequest, 2);
-    }
-
-    /**
-     * Decodes the raw signature from a signed request.
-     *
-     * @param string $encodedSig
-     *
-     * @return string
-     *
-     * @throws FacebookSDKException
-     */
-    protected function decodeSignature($encodedSig)
-    {
-        $sig = $this->base64UrlDecode($encodedSig);
-
-        if (!$sig) {
-            throw new FacebookSDKException('Signed request has malformed encoded signature data.', 607);
-        }
-
-        return $sig;
-    }
-
-    /**
-     * Decodes the raw payload from a signed request.
-     *
-     * @param string $encodedPayload
-     *
-     * @return array
-     *
-     * @throws FacebookSDKException
-     */
-    protected function decodePayload($encodedPayload)
-    {
-        $payload = $this->base64UrlDecode($encodedPayload);
-
-        if ($payload) {
-            $payload = json_decode($payload, true);
-        }
-
-        if (!is_array($payload)) {
-            throw new FacebookSDKException('Signed request has malformed encoded payload data.', 607);
-        }
-
-        return $payload;
-    }
-
-    /**
-     * Validates the algorithm used in a signed request.
-     *
-     * @throws FacebookSDKException
-     */
-    protected function validateAlgorithm()
-    {
-        if ($this->get('algorithm') !== 'HMAC-SHA256') {
-            throw new FacebookSDKException('Signed request is using the wrong algorithm.', 605);
-        }
-    }
-
-    /**
-     * Hashes the signature used in a signed request.
-     *
-     * @param string $encodedData
-     *
-     * @return string
-     *
-     * @throws FacebookSDKException
-     */
-    protected function hashSignature($encodedData)
-    {
-        $hashedSig = hash_hmac(
-            'sha256',
-            $encodedData,
-            $this->app->getSecret(),
-            $raw_output = true
-        );
-
-        if (!$hashedSig) {
-            throw new FacebookSDKException('Unable to hash signature from encoded payload data.', 602);
-        }
-
-        return $hashedSig;
-    }
-
-    /**
-     * Validates the signature used in a signed request.
-     *
-     * @param string $hashedSig
-     * @param string $sig
-     *
-     * @throws FacebookSDKException
-     */
-    protected function validateSignature($hashedSig, $sig)
-    {
-        if (\hash_equals($hashedSig, $sig)) {
-            return;
-        }
-
-        throw new FacebookSDKException('Signed request has an invalid signature.', 602);
-    }
-
-    /**
-     * Base64 decoding which replaces characters:
-     *   + instead of -
-     *   / instead of _
-     *
-     * @link http://en.wikipedia.org/wiki/Base64#URL_applications
-     *
-     * @param string $input base64 url encoded input
-     *
-     * @return string decoded string
-     */
-    public function base64UrlDecode($input)
-    {
-        $urlDecodedBase64 = strtr($input, '-_', '+/');
-        $this->validateBase64($urlDecodedBase64);
-
-        return base64_decode($urlDecodedBase64);
-    }
-
-    /**
-     * Base64 encoding which replaces characters:
-     *   + instead of -
-     *   / instead of _
-     *
-     * @link http://en.wikipedia.org/wiki/Base64#URL_applications
-     *
-     * @param string $input string to encode
-     *
-     * @return string base64 url encoded input
-     */
-    public function base64UrlEncode($input)
-    {
-        return strtr(base64_encode($input), '+/', '-_');
-    }
-
-    /**
-     * Validates a base64 string.
-     *
-     * @param string $input base64 value to validate
-     *
-     * @throws FacebookSDKException
-     */
-    protected function validateBase64($input)
-    {
-        if (!preg_match('/^[a-zA-Z0-9\/\r\n+]*={0,2}$/', $input)) {
-            throw new FacebookSDKException('Signed request contains malformed base64 encoding.', 608);
-        }
-    }
-}
diff --git a/mayor-orig/www/include/share/facebook/Url/FacebookUrlDetectionHandler.php b/mayor-orig/www/include/share/facebook/Url/FacebookUrlDetectionHandler.php
deleted file mode 100644
index 1d134ddc..00000000
--- a/mayor-orig/www/include/share/facebook/Url/FacebookUrlDetectionHandler.php
+++ /dev/null
@@ -1,182 +0,0 @@
-getHttpScheme() . '://' . $this->getHostName() . $this->getServerVar('REQUEST_URI');
-    }
-
-    /**
-     * Get the currently active URL scheme.
-     *
-     * @return string
-     */
-    protected function getHttpScheme()
-    {
-        return $this->isBehindSsl() ? 'https' : 'http';
-    }
-
-    /**
-     * Tries to detect if the server is running behind an SSL.
-     *
-     * @return boolean
-     */
-    protected function isBehindSsl()
-    {
-        // Check for proxy first
-        $protocol = $this->getHeader('X_FORWARDED_PROTO');
-        if ($protocol) {
-            return $this->protocolWithActiveSsl($protocol);
-        }
-
-        $protocol = $this->getServerVar('HTTPS');
-        if ($protocol) {
-            return $this->protocolWithActiveSsl($protocol);
-        }
-
-        return (string)$this->getServerVar('SERVER_PORT') === '443';
-    }
-
-    /**
-     * Detects an active SSL protocol value.
-     *
-     * @param string $protocol
-     *
-     * @return boolean
-     */
-    protected function protocolWithActiveSsl($protocol)
-    {
-        $protocol = strtolower((string)$protocol);
-
-        return in_array($protocol, ['on', '1', 'https', 'ssl'], true);
-    }
-
-    /**
-     * Tries to detect the host name of the server.
-     *
-     * Some elements adapted from
-     *
-     * @see https://github.com/symfony/HttpFoundation/blob/master/Request.php
-     *
-     * @return string
-     */
-    protected function getHostName()
-    {
-        // Check for proxy first
-        $header = $this->getHeader('X_FORWARDED_HOST');
-        if ($header && $this->isValidForwardedHost($header)) {
-            $elements = explode(',', $header);
-            $host = $elements[count($elements) - 1];
-        } elseif (!$host = $this->getHeader('HOST')) {
-            if (!$host = $this->getServerVar('SERVER_NAME')) {
-                $host = $this->getServerVar('SERVER_ADDR');
-            }
-        }
-
-        // trim and remove port number from host
-        // host is lowercase as per RFC 952/2181
-        $host = strtolower(preg_replace('/:\d+$/', '', trim($host)));
-
-        // Port number
-        $scheme = $this->getHttpScheme();
-        $port = $this->getCurrentPort();
-        $appendPort = ':' . $port;
-
-        // Don't append port number if a normal port.
-        if (($scheme == 'http' && $port == '80') || ($scheme == 'https' && $port == '443')) {
-            $appendPort = '';
-        }
-
-        return $host . $appendPort;
-    }
-
-    protected function getCurrentPort()
-    {
-        // Check for proxy first
-        $port = $this->getHeader('X_FORWARDED_PORT');
-        if ($port) {
-            return (string)$port;
-        }
-
-        $protocol = (string)$this->getHeader('X_FORWARDED_PROTO');
-        if ($protocol === 'https') {
-            return '443';
-        }
-
-        return (string)$this->getServerVar('SERVER_PORT');
-    }
-
-    /**
-     * Returns the a value from the $_SERVER super global.
-     *
-     * @param string $key
-     *
-     * @return string
-     */
-    protected function getServerVar($key)
-    {
-        return isset($_SERVER[$key]) ? $_SERVER[$key] : '';
-    }
-
-    /**
-     * Gets a value from the HTTP request headers.
-     *
-     * @param string $key
-     *
-     * @return string
-     */
-    protected function getHeader($key)
-    {
-        return $this->getServerVar('HTTP_' . $key);
-    }
-
-    /**
-     * Checks if the value in X_FORWARDED_HOST is a valid hostname
-     * Could prevent unintended redirections
-     *
-     * @param string $header
-     *
-     * @return boolean
-     */
-    protected function isValidForwardedHost($header)
-    {
-        $elements = explode(',', $header);
-        $host = $elements[count($elements) - 1];
-        
-        return preg_match("/^([a-z\d](-*[a-z\d])*)(\.([a-z\d](-*[a-z\d])*))*$/i", $host) //valid chars check
-            && 0 < strlen($host) && strlen($host) < 254 //overall length check
-            && preg_match("/^[^\.]{1,63}(\.[^\.]{1,63})*$/", $host); //length of each label
-    }
-}
diff --git a/mayor-orig/www/include/share/facebook/Url/FacebookUrlManipulator.php b/mayor-orig/www/include/share/facebook/Url/FacebookUrlManipulator.php
deleted file mode 100644
index daeab9c5..00000000
--- a/mayor-orig/www/include/share/facebook/Url/FacebookUrlManipulator.php
+++ /dev/null
@@ -1,167 +0,0 @@
- 0) {
-                $query = '?' . http_build_query($params, null, '&');
-            }
-        }
-
-        $scheme = isset($parts['scheme']) ? $parts['scheme'] . '://' : '';
-        $host = isset($parts['host']) ? $parts['host'] : '';
-        $port = isset($parts['port']) ? ':' . $parts['port'] : '';
-        $path = isset($parts['path']) ? $parts['path'] : '';
-        $fragment = isset($parts['fragment']) ? '#' . $parts['fragment'] : '';
-
-        return $scheme . $host . $port . $path . $query . $fragment;
-    }
-
-    /**
-     * Gracefully appends params to the URL.
-     *
-     * @param string $url       The URL that will receive the params.
-     * @param array  $newParams The params to append to the URL.
-     *
-     * @return string
-     */
-    public static function appendParamsToUrl($url, array $newParams = [])
-    {
-        if (empty($newParams)) {
-            return $url;
-        }
-
-        if (strpos($url, '?') === false) {
-            return $url . '?' . http_build_query($newParams, null, '&');
-        }
-
-        list($path, $query) = explode('?', $url, 2);
-        $existingParams = [];
-        parse_str($query, $existingParams);
-
-        // Favor params from the original URL over $newParams
-        $newParams = array_merge($newParams, $existingParams);
-
-        // Sort for a predicable order
-        ksort($newParams);
-
-        return $path . '?' . http_build_query($newParams, null, '&');
-    }
-
-    /**
-     * Returns the params from a URL in the form of an array.
-     *
-     * @param string $url The URL to parse the params from.
-     *
-     * @return array
-     */
-    public static function getParamsAsArray($url)
-    {
-        $query = parse_url($url, PHP_URL_QUERY);
-        if (!$query) {
-            return [];
-        }
-        $params = [];
-        parse_str($query, $params);
-
-        return $params;
-    }
-
-    /**
-     * Adds the params of the first URL to the second URL.
-     *
-     * Any params that already exist in the second URL will go untouched.
-     *
-     * @param string $urlToStealFrom The URL harvest the params from.
-     * @param string $urlToAddTo     The URL that will receive the new params.
-     *
-     * @return string The $urlToAddTo with any new params from $urlToStealFrom.
-     */
-    public static function mergeUrlParams($urlToStealFrom, $urlToAddTo)
-    {
-        $newParams = static::getParamsAsArray($urlToStealFrom);
-        // Nothing new to add, return as-is
-        if (!$newParams) {
-            return $urlToAddTo;
-        }
-
-        return static::appendParamsToUrl($urlToAddTo, $newParams);
-    }
-
-    /**
-     * Check for a "/" prefix and prepend it if not exists.
-     *
-     * @param string|null $string
-     *
-     * @return string|null
-     */
-    public static function forceSlashPrefix($string)
-    {
-        if (!$string) {
-            return $string;
-        }
-
-        return strpos($string, '/') === 0 ? $string : '/' . $string;
-    }
-
-    /**
-     * Trims off the hostname and Graph version from a URL.
-     *
-     * @param string $urlToTrim The URL the needs the surgery.
-     *
-     * @return string The $urlToTrim with the hostname and Graph version removed.
-     */
-    public static function baseGraphUrlEndpoint($urlToTrim)
-    {
-        return '/' . preg_replace('/^https:\/\/.+\.facebook\.com(\/v.+?)?\//', '', $urlToTrim);
-    }
-}
diff --git a/mayor-orig/www/include/share/facebook/Url/UrlDetectionInterface.php b/mayor-orig/www/include/share/facebook/Url/UrlDetectionInterface.php
deleted file mode 100644
index dca38a0c..00000000
--- a/mayor-orig/www/include/share/facebook/Url/UrlDetectionInterface.php
+++ /dev/null
@@ -1,39 +0,0 @@
-> 16) & 0xFF);
-                   $g = 255 - (($rgb >> 8) & 0xFF);
-                   $b = 255 - ($rgb & 0xFF);
-                   $a = $rgb >> 24;
-                   $new_pxl = imagecolorallocatealpha($source, $r, $g, $b, $a);
-                   if ($new_pxl == false){
-                       $new_pxl = imagecolorclosestalpha($source, $r, $g, $b, $a);
-                   }
-                   imagesetpixel($source,$x,$y,$new_pxl);
-                   ++$x;
-               }
-               ++$y;
-           }
-           return true;
-       break;
-       case 1:
-           $y = 0;
-           while($y<$max_y) {
-               $x = 0;
-               while($x<$max_x){
-                   $rgb = imagecolorat($source,$x,$y);
-                   $a = $rgb >> 24;
-                   $r = ((($rgb >> 16) & 0xFF)*0.299)+((($rgb >> 8) & 0xFF)*0.587)+(($rgb & 0xFF)*0.114);
-                   $new_pxl = imagecolorallocatealpha($source, $r, $r, $r, $a);
-                   if ($new_pxl == false){
-                       $new_pxl = imagecolorclosestalpha($source, $r, $r, $r, $a);
-                   }
-                   imagesetpixel($source,$x,$y,$new_pxl);
-                   ++$x;
-               }
-               ++$y;
-           }
-           return true;
-       break;
-       case 2:
-           $y = 0;
-           while($y<$max_y) {
-               $x = 0;
-               while($x<$max_x){
-                   $rgb = imagecolorat($source,$x,$y);
-                   $r = (($rgb >> 16) & 0xFF) + $arg1;
-                   $g = (($rgb >> 8) & 0xFF) + $arg1;
-                   $b = ($rgb & 0xFF) + $arg1;
-                   $a = $rgb >> 24;
-                     $r = ($r > 255)? 255 : (($r < 0)? 0:$r);
-                   $g = ($g > 255)? 255 : (($g < 0)? 0:$g);
-                   $b = ($b > 255)? 255 : (($b < 0)? 0:$b);
-                   $new_pxl = imagecolorallocatealpha($source, $r, $g, $b, $a);
-                   if ($new_pxl == false){
-                       $new_pxl = imagecolorclosestalpha($source, $r, $g, $b, $a);
-                   }
-                   imagesetpixel($source,$x,$y,$new_pxl);
-                   ++$x;
-               }
-               ++$y;
-           }
-           return true;
-       break;
-       case 3:
-           $contrast = pow((100-$arg1)/100,2);
-           $y = 0;
-           while($y<$max_y) {
-               $x = 0;
-               while($x<$max_x){
-                   $rgb = imagecolorat($source,$x,$y);
-                   $a = $rgb >> 24;
-                   $r = (((((($rgb >> 16) & 0xFF)/255)-0.5)*$contrast)+0.5)*255;
-                   $g = (((((($rgb >> 8) & 0xFF)/255)-0.5)*$contrast)+0.5)*255;
-                   $b = ((((($rgb & 0xFF)/255)-0.5)*$contrast)+0.5)*255;
-                   $r = ($r > 255)? 255 : (($r < 0)? 0:$r);
-                   $g = ($g > 255)? 255 : (($g < 0)? 0:$g);
-                   $b = ($b > 255)? 255 : (($b < 0)? 0:$b);
-                   $new_pxl = imagecolorallocatealpha($source, $r, $g, $b, $a);
-                   if ($new_pxl == false){
-                       $new_pxl = imagecolorclosestalpha($source, $r, $g, $b, $a);
-                   }
-                   imagesetpixel($source,$x,$y,$new_pxl);
-                   ++$x;
-               }
-               ++$y;
-           }
-           return true;
-       break;
-       case 4:
-           $x = 0;
-           while($x<$max_x){
-               $y = 0;
-               while($y<$max_y){
-                   $rgb = imagecolorat($source, $x, $y);
-                   $r = (($rgb >> 16) & 0xFF) + $arg1;
-                   $g = (($rgb >> 8) & 0xFF) + $arg2;
-                   $b = ($rgb & 0xFF) + $arg3;
-                   $a = $rgb >> 24;
-                   $r = ($r > 255)? 255 : (($r < 0)? 0:$r);
-                   $g = ($g > 255)? 255 : (($g < 0)? 0:$g);
-                   $b = ($b > 255)? 255 : (($b < 0)? 0:$b);
-                   $new_pxl = imagecolorallocatealpha($source, $r, $g, $b, $a);
-                   if ($new_pxl == false){
-                       $new_pxl = imagecolorclosestalpha($source, $r, $g, $b, $a);
-                   }
-                   imagesetpixel($source,$x,$y,$new_pxl);
-                   ++$y;
-                   }
-               ++$x;
-           }
-           return true;
-       break;
-       case 5:
-           return imageconvolution($source, array(array(-1,0,-1), array(0,4,0), array(-1,0,-1)), 1, 127);
-       break;
-       case 6:
-           return imageconvolution($source, array(array(1.5, 0, 0), array(0, 0, 0), array(0, 0, -1.5)), 1, 127);
-       break;
-       case 7:
-           return imageconvolution($source, array(array(1, 2, 1), array(2, 4, 2), array(1, 2, 1)), 16, 0);
-       break;
-       case 8:
-   for($y = 0; $y<$max_y; $y++) {
-       for ($x = 0; $x<$max_x; $x++) {
-             $flt_r_sum = $flt_g_sum = $flt_b_sum = 0;
-           $cpxl = imagecolorat($source, $x, $y);
-           for ($j=0; $j<3; $j++) {
-               for ($i=0; $i<3; $i++) {
-                   if (($j == 1) && ($i == 1)) {
-                       $flt_r[1][1] = $flt_g[1][1] = $flt_b[1][1] = 0.5;
-                   } else {
-                       $pxl = imagecolorat($source, $x-(3>>1)+$i, $y-(3>>1)+$j);
- 
-                       $new_a = $pxl >> 24;
-                       //$r = (($pxl >> 16) & 0xFF);
-                       //$g = (($pxl >> 8) & 0xFF);
-                       //$b = ($pxl & 0xFF);
-                       $new_r = abs((($cpxl >> 16) & 0xFF) - (($pxl >> 16) & 0xFF));
-                       if ($new_r != 0) {
-                           $flt_r[$j][$i] = 1/$new_r;
-                       } else {
-                           $flt_r[$j][$i] = 1;
-                       }
- 
-                       $new_g = abs((($cpxl >> 8) & 0xFF) - (($pxl >> 8) & 0xFF));
-                       if ($new_g != 0) {
-                           $flt_g[$j][$i] = 1/$new_g;
-                       } else {
-                           $flt_g[$j][$i] = 1;
-                       }
- 
-                       $new_b = abs(($cpxl & 0xFF) - ($pxl & 0xFF));
-                       if ($new_b != 0) {
-                           $flt_b[$j][$i] = 1/$new_b;
-                       } else {
-                           $flt_b[$j][$i] = 1;
-                       }
-                   }
- 
-                   $flt_r_sum += $flt_r[$j][$i];
-                   $flt_g_sum += $flt_g[$j][$i];
-                   $flt_b_sum += $flt_b[$j][$i];
-               }
-           }
- 
-           for ($j=0; $j<3; $j++) {
-               for ($i=0; $i<3; $i++) {
-                   if ($flt_r_sum != 0) {
-                       $flt_r[$j][$i] /= $flt_r_sum;
-                   }
-                   if ($flt_g_sum != 0) {
-                       $flt_g[$j][$i] /= $flt_g_sum;
-                   }
-                   if ($flt_b_sum != 0) {
-                       $flt_b[$j][$i] /= $flt_b_sum;
-                   }
-               }
-           }
- 
-           $new_r = $new_g = $new_b = 0;
- 
-           for ($j=0; $j<3; $j++) {
-               for ($i=0; $i<3; $i++) {
-                   $pxl = imagecolorat($source, $x-(3>>1)+$i, $y-(3>>1)+$j);
-                   $new_r += (($pxl >> 16) & 0xFF) * $flt_r[$j][$i];
-                   $new_g += (($pxl >> 8) & 0xFF) * $flt_g[$j][$i];
-                   $new_b += ($pxl & 0xFF) * $flt_b[$j][$i];
-               }
-           }
- 
-           $new_r = ($new_r > 255)? 255 : (($new_r < 0)? 0:$new_r);
-           $new_g = ($new_g > 255)? 255 : (($new_g < 0)? 0:$new_g);
-           $new_b = ($new_b > 255)? 255 : (($new_b < 0)? 0:$new_b);
-           $new_pxl = ImageColorAllocateAlpha($source, (int)$new_r, (int)$new_g, (int)$new_b, $new_a);
-           if ($new_pxl == false) {
-               $new_pxl = ImageColorClosestAlpha($source, (int)$new_r, (int)$new_g, (int)$new_b, $new_a);
-           }
-           imagesetpixel($source,$x,$y,$new_pxl);
-       }
-   }
-   return true;
-       break;
-       case 9:
-           return imageconvolution($source, array(array(-1,-1,-1),array(-1,9,-1),array(-1,-1,-1)), 1, 0);
-       break;
-       case 10:
-           return imageconvolution($source, array(array(1,1,1),array(1,$arg1,1),array(1,1,1)), $arg1+8, 0);
-       break;
-   }
-}
-}
-?>
diff --git a/mayor-orig/www/include/share/googleapi/autoload.php b/mayor-orig/www/include/share/googleapi/autoload.php
deleted file mode 100644
index f51c20c0..00000000
--- a/mayor-orig/www/include/share/googleapi/autoload.php
+++ /dev/null
@@ -1,7 +0,0 @@
-
- *     Jordi Boggiano 
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Composer\Autoload;
-
-/**
- * ClassLoader implements a PSR-0, PSR-4 and classmap class loader.
- *
- *     $loader = new \Composer\Autoload\ClassLoader();
- *
- *     // register classes with namespaces
- *     $loader->add('Symfony\Component', __DIR__.'/component');
- *     $loader->add('Symfony',           __DIR__.'/framework');
- *
- *     // activate the autoloader
- *     $loader->register();
- *
- *     // to enable searching the include path (eg. for PEAR packages)
- *     $loader->setUseIncludePath(true);
- *
- * In this example, if you try to use a class in the Symfony\Component
- * namespace or one of its children (Symfony\Component\Console for instance),
- * the autoloader will first look for the class under the component/
- * directory, and it will then fallback to the framework/ directory if not
- * found before giving up.
- *
- * This class is loosely based on the Symfony UniversalClassLoader.
- *
- * @author Fabien Potencier 
- * @author Jordi Boggiano 
- * @see    http://www.php-fig.org/psr/psr-0/
- * @see    http://www.php-fig.org/psr/psr-4/
- */
-class ClassLoader
-{
-    // PSR-4
-    private $prefixLengthsPsr4 = array();
-    private $prefixDirsPsr4 = array();
-    private $fallbackDirsPsr4 = array();
-
-    // PSR-0
-    private $prefixesPsr0 = array();
-    private $fallbackDirsPsr0 = array();
-
-    private $useIncludePath = false;
-    private $classMap = array();
-    private $classMapAuthoritative = false;
-    private $missingClasses = array();
-    private $apcuPrefix;
-
-    public function getPrefixes()
-    {
-        if (!empty($this->prefixesPsr0)) {
-            return call_user_func_array('array_merge', $this->prefixesPsr0);
-        }
-
-        return array();
-    }
-
-    public function getPrefixesPsr4()
-    {
-        return $this->prefixDirsPsr4;
-    }
-
-    public function getFallbackDirs()
-    {
-        return $this->fallbackDirsPsr0;
-    }
-
-    public function getFallbackDirsPsr4()
-    {
-        return $this->fallbackDirsPsr4;
-    }
-
-    public function getClassMap()
-    {
-        return $this->classMap;
-    }
-
-    /**
-     * @param array $classMap Class to filename map
-     */
-    public function addClassMap(array $classMap)
-    {
-        if ($this->classMap) {
-            $this->classMap = array_merge($this->classMap, $classMap);
-        } else {
-            $this->classMap = $classMap;
-        }
-    }
-
-    /**
-     * Registers a set of PSR-0 directories for a given prefix, either
-     * appending or prepending to the ones previously set for this prefix.
-     *
-     * @param string       $prefix  The prefix
-     * @param array|string $paths   The PSR-0 root directories
-     * @param bool         $prepend Whether to prepend the directories
-     */
-    public function add($prefix, $paths, $prepend = false)
-    {
-        if (!$prefix) {
-            if ($prepend) {
-                $this->fallbackDirsPsr0 = array_merge(
-                    (array) $paths,
-                    $this->fallbackDirsPsr0
-                );
-            } else {
-                $this->fallbackDirsPsr0 = array_merge(
-                    $this->fallbackDirsPsr0,
-                    (array) $paths
-                );
-            }
-
-            return;
-        }
-
-        $first = $prefix[0];
-        if (!isset($this->prefixesPsr0[$first][$prefix])) {
-            $this->prefixesPsr0[$first][$prefix] = (array) $paths;
-
-            return;
-        }
-        if ($prepend) {
-            $this->prefixesPsr0[$first][$prefix] = array_merge(
-                (array) $paths,
-                $this->prefixesPsr0[$first][$prefix]
-            );
-        } else {
-            $this->prefixesPsr0[$first][$prefix] = array_merge(
-                $this->prefixesPsr0[$first][$prefix],
-                (array) $paths
-            );
-        }
-    }
-
-    /**
-     * Registers a set of PSR-4 directories for a given namespace, either
-     * appending or prepending to the ones previously set for this namespace.
-     *
-     * @param string       $prefix  The prefix/namespace, with trailing '\\'
-     * @param array|string $paths   The PSR-4 base directories
-     * @param bool         $prepend Whether to prepend the directories
-     *
-     * @throws \InvalidArgumentException
-     */
-    public function addPsr4($prefix, $paths, $prepend = false)
-    {
-        if (!$prefix) {
-            // Register directories for the root namespace.
-            if ($prepend) {
-                $this->fallbackDirsPsr4 = array_merge(
-                    (array) $paths,
-                    $this->fallbackDirsPsr4
-                );
-            } else {
-                $this->fallbackDirsPsr4 = array_merge(
-                    $this->fallbackDirsPsr4,
-                    (array) $paths
-                );
-            }
-        } elseif (!isset($this->prefixDirsPsr4[$prefix])) {
-            // Register directories for a new namespace.
-            $length = strlen($prefix);
-            if ('\\' !== $prefix[$length - 1]) {
-                throw new \InvalidArgumentException("A non-empty PSR-4 prefix must end with a namespace separator.");
-            }
-            $this->prefixLengthsPsr4[$prefix[0]][$prefix] = $length;
-            $this->prefixDirsPsr4[$prefix] = (array) $paths;
-        } elseif ($prepend) {
-            // Prepend directories for an already registered namespace.
-            $this->prefixDirsPsr4[$prefix] = array_merge(
-                (array) $paths,
-                $this->prefixDirsPsr4[$prefix]
-            );
-        } else {
-            // Append directories for an already registered namespace.
-            $this->prefixDirsPsr4[$prefix] = array_merge(
-                $this->prefixDirsPsr4[$prefix],
-                (array) $paths
-            );
-        }
-    }
-
-    /**
-     * Registers a set of PSR-0 directories for a given prefix,
-     * replacing any others previously set for this prefix.
-     *
-     * @param string       $prefix The prefix
-     * @param array|string $paths  The PSR-0 base directories
-     */
-    public function set($prefix, $paths)
-    {
-        if (!$prefix) {
-            $this->fallbackDirsPsr0 = (array) $paths;
-        } else {
-            $this->prefixesPsr0[$prefix[0]][$prefix] = (array) $paths;
-        }
-    }
-
-    /**
-     * Registers a set of PSR-4 directories for a given namespace,
-     * replacing any others previously set for this namespace.
-     *
-     * @param string       $prefix The prefix/namespace, with trailing '\\'
-     * @param array|string $paths  The PSR-4 base directories
-     *
-     * @throws \InvalidArgumentException
-     */
-    public function setPsr4($prefix, $paths)
-    {
-        if (!$prefix) {
-            $this->fallbackDirsPsr4 = (array) $paths;
-        } else {
-            $length = strlen($prefix);
-            if ('\\' !== $prefix[$length - 1]) {
-                throw new \InvalidArgumentException("A non-empty PSR-4 prefix must end with a namespace separator.");
-            }
-            $this->prefixLengthsPsr4[$prefix[0]][$prefix] = $length;
-            $this->prefixDirsPsr4[$prefix] = (array) $paths;
-        }
-    }
-
-    /**
-     * Turns on searching the include path for class files.
-     *
-     * @param bool $useIncludePath
-     */
-    public function setUseIncludePath($useIncludePath)
-    {
-        $this->useIncludePath = $useIncludePath;
-    }
-
-    /**
-     * Can be used to check if the autoloader uses the include path to check
-     * for classes.
-     *
-     * @return bool
-     */
-    public function getUseIncludePath()
-    {
-        return $this->useIncludePath;
-    }
-
-    /**
-     * Turns off searching the prefix and fallback directories for classes
-     * that have not been registered with the class map.
-     *
-     * @param bool $classMapAuthoritative
-     */
-    public function setClassMapAuthoritative($classMapAuthoritative)
-    {
-        $this->classMapAuthoritative = $classMapAuthoritative;
-    }
-
-    /**
-     * Should class lookup fail if not found in the current class map?
-     *
-     * @return bool
-     */
-    public function isClassMapAuthoritative()
-    {
-        return $this->classMapAuthoritative;
-    }
-
-    /**
-     * APCu prefix to use to cache found/not-found classes, if the extension is enabled.
-     *
-     * @param string|null $apcuPrefix
-     */
-    public function setApcuPrefix($apcuPrefix)
-    {
-        $this->apcuPrefix = function_exists('apcu_fetch') && ini_get('apc.enabled') ? $apcuPrefix : null;
-    }
-
-    /**
-     * The APCu prefix in use, or null if APCu caching is not enabled.
-     *
-     * @return string|null
-     */
-    public function getApcuPrefix()
-    {
-        return $this->apcuPrefix;
-    }
-
-    /**
-     * Registers this instance as an autoloader.
-     *
-     * @param bool $prepend Whether to prepend the autoloader or not
-     */
-    public function register($prepend = false)
-    {
-        spl_autoload_register(array($this, 'loadClass'), true, $prepend);
-    }
-
-    /**
-     * Unregisters this instance as an autoloader.
-     */
-    public function unregister()
-    {
-        spl_autoload_unregister(array($this, 'loadClass'));
-    }
-
-    /**
-     * Loads the given class or interface.
-     *
-     * @param  string    $class The name of the class
-     * @return bool|null True if loaded, null otherwise
-     */
-    public function loadClass($class)
-    {
-        if ($file = $this->findFile($class)) {
-            includeFile($file);
-
-            return true;
-        }
-    }
-
-    /**
-     * Finds the path to the file where the class is defined.
-     *
-     * @param string $class The name of the class
-     *
-     * @return string|false The path if found, false otherwise
-     */
-    public function findFile($class)
-    {
-        // class map lookup
-        if (isset($this->classMap[$class])) {
-            return $this->classMap[$class];
-        }
-        if ($this->classMapAuthoritative || isset($this->missingClasses[$class])) {
-            return false;
-        }
-        if (null !== $this->apcuPrefix) {
-            $file = apcu_fetch($this->apcuPrefix.$class, $hit);
-            if ($hit) {
-                return $file;
-            }
-        }
-
-        $file = $this->findFileWithExtension($class, '.php');
-
-        // Search for Hack files if we are running on HHVM
-        if (false === $file && defined('HHVM_VERSION')) {
-            $file = $this->findFileWithExtension($class, '.hh');
-        }
-
-        if (null !== $this->apcuPrefix) {
-            apcu_add($this->apcuPrefix.$class, $file);
-        }
-
-        if (false === $file) {
-            // Remember that this class does not exist.
-            $this->missingClasses[$class] = true;
-        }
-
-        return $file;
-    }
-
-    private function findFileWithExtension($class, $ext)
-    {
-        // PSR-4 lookup
-        $logicalPathPsr4 = strtr($class, '\\', DIRECTORY_SEPARATOR) . $ext;
-
-        $first = $class[0];
-        if (isset($this->prefixLengthsPsr4[$first])) {
-            $subPath = $class;
-            while (false !== $lastPos = strrpos($subPath, '\\')) {
-                $subPath = substr($subPath, 0, $lastPos);
-                $search = $subPath.'\\';
-                if (isset($this->prefixDirsPsr4[$search])) {
-                    foreach ($this->prefixDirsPsr4[$search] as $dir) {
-                        $length = $this->prefixLengthsPsr4[$first][$search];
-                        if (file_exists($file = $dir . DIRECTORY_SEPARATOR . substr($logicalPathPsr4, $length))) {
-                            return $file;
-                        }
-                    }
-                }
-            }
-        }
-
-        // PSR-4 fallback dirs
-        foreach ($this->fallbackDirsPsr4 as $dir) {
-            if (file_exists($file = $dir . DIRECTORY_SEPARATOR . $logicalPathPsr4)) {
-                return $file;
-            }
-        }
-
-        // PSR-0 lookup
-        if (false !== $pos = strrpos($class, '\\')) {
-            // namespaced class name
-            $logicalPathPsr0 = substr($logicalPathPsr4, 0, $pos + 1)
-                . strtr(substr($logicalPathPsr4, $pos + 1), '_', DIRECTORY_SEPARATOR);
-        } else {
-            // PEAR-like class name
-            $logicalPathPsr0 = strtr($class, '_', DIRECTORY_SEPARATOR) . $ext;
-        }
-
-        if (isset($this->prefixesPsr0[$first])) {
-            foreach ($this->prefixesPsr0[$first] as $prefix => $dirs) {
-                if (0 === strpos($class, $prefix)) {
-                    foreach ($dirs as $dir) {
-                        if (file_exists($file = $dir . DIRECTORY_SEPARATOR . $logicalPathPsr0)) {
-                            return $file;
-                        }
-                    }
-                }
-            }
-        }
-
-        // PSR-0 fallback dirs
-        foreach ($this->fallbackDirsPsr0 as $dir) {
-            if (file_exists($file = $dir . DIRECTORY_SEPARATOR . $logicalPathPsr0)) {
-                return $file;
-            }
-        }
-
-        // PSR-0 include paths.
-        if ($this->useIncludePath && $file = stream_resolve_include_path($logicalPathPsr0)) {
-            return $file;
-        }
-
-        return false;
-    }
-}
-
-/**
- * Scope isolated include.
- *
- * Prevents access to $this/self from included files.
- */
-function includeFile($file)
-{
-    include $file;
-}
diff --git a/mayor-orig/www/include/share/googleapi/composer/LICENSE b/mayor-orig/www/include/share/googleapi/composer/LICENSE
deleted file mode 100644
index f27399a0..00000000
--- a/mayor-orig/www/include/share/googleapi/composer/LICENSE
+++ /dev/null
@@ -1,21 +0,0 @@
-
-Copyright (c) Nils Adermann, Jordi Boggiano
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is furnished
-to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-THE SOFTWARE.
-
diff --git a/mayor-orig/www/include/share/googleapi/composer/autoload_classmap.php b/mayor-orig/www/include/share/googleapi/composer/autoload_classmap.php
deleted file mode 100644
index c153b061..00000000
--- a/mayor-orig/www/include/share/googleapi/composer/autoload_classmap.php
+++ /dev/null
@@ -1,35 +0,0 @@
- $vendorDir . '/google/auth/src/ApplicationDefaultCredentials.php',
-    'Google\\Auth\\CacheTrait' => $vendorDir . '/google/auth/src/CacheTrait.php',
-    'Google\\Auth\\Cache\\InvalidArgumentException' => $vendorDir . '/google/auth/src/Cache/InvalidArgumentException.php',
-    'Google\\Auth\\Cache\\Item' => $vendorDir . '/google/auth/src/Cache/Item.php',
-    'Google\\Auth\\Cache\\MemoryCacheItemPool' => $vendorDir . '/google/auth/src/Cache/MemoryCacheItemPool.php',
-    'Google\\Auth\\CredentialsLoader' => $vendorDir . '/google/auth/src/CredentialsLoader.php',
-    'Google\\Auth\\Credentials\\AppIdentityCredentials' => $vendorDir . '/google/auth/src/Credentials/AppIdentityCredentials.php',
-    'Google\\Auth\\Credentials\\GCECredentials' => $vendorDir . '/google/auth/src/Credentials/GCECredentials.php',
-    'Google\\Auth\\Credentials\\IAMCredentials' => $vendorDir . '/google/auth/src/Credentials/IAMCredentials.php',
-    'Google\\Auth\\Credentials\\ServiceAccountCredentials' => $vendorDir . '/google/auth/src/Credentials/ServiceAccountCredentials.php',
-    'Google\\Auth\\Credentials\\ServiceAccountJwtAccessCredentials' => $vendorDir . '/google/auth/src/Credentials/ServiceAccountJwtAccessCredentials.php',
-    'Google\\Auth\\Credentials\\UserRefreshCredentials' => $vendorDir . '/google/auth/src/Credentials/UserRefreshCredentials.php',
-    'Google\\Auth\\FetchAuthTokenCache' => $vendorDir . '/google/auth/src/FetchAuthTokenCache.php',
-    'Google\\Auth\\FetchAuthTokenInterface' => $vendorDir . '/google/auth/src/FetchAuthTokenInterface.php',
-    'Google\\Auth\\HttpHandler\\Guzzle5HttpHandler' => $vendorDir . '/google/auth/src/HttpHandler/Guzzle5HttpHandler.php',
-    'Google\\Auth\\HttpHandler\\Guzzle6HttpHandler' => $vendorDir . '/google/auth/src/HttpHandler/Guzzle6HttpHandler.php',
-    'Google\\Auth\\HttpHandler\\HttpHandlerFactory' => $vendorDir . '/google/auth/src/HttpHandler/HttpHandlerFactory.php',
-    'Google\\Auth\\Middleware\\AuthTokenMiddleware' => $vendorDir . '/google/auth/src/Middleware/AuthTokenMiddleware.php',
-    'Google\\Auth\\Middleware\\ScopedAccessTokenMiddleware' => $vendorDir . '/google/auth/src/Middleware/ScopedAccessTokenMiddleware.php',
-    'Google\\Auth\\Middleware\\SimpleMiddleware' => $vendorDir . '/google/auth/src/Middleware/SimpleMiddleware.php',
-    'Google\\Auth\\OAuth2' => $vendorDir . '/google/auth/src/OAuth2.php',
-    'Google\\Auth\\Subscriber\\AuthTokenSubscriber' => $vendorDir . '/google/auth/src/Subscriber/AuthTokenSubscriber.php',
-    'Google\\Auth\\Subscriber\\ScopedAccessTokenSubscriber' => $vendorDir . '/google/auth/src/Subscriber/ScopedAccessTokenSubscriber.php',
-    'Google\\Auth\\Subscriber\\SimpleSubscriber' => $vendorDir . '/google/auth/src/Subscriber/SimpleSubscriber.php',
-    'Google_Service_Exception' => $vendorDir . '/google/apiclient/src/Google/Service/Exception.php',
-    'Google_Service_Resource' => $vendorDir . '/google/apiclient/src/Google/Service/Resource.php',
-);
diff --git a/mayor-orig/www/include/share/googleapi/composer/autoload_files.php b/mayor-orig/www/include/share/googleapi/composer/autoload_files.php
deleted file mode 100644
index 56bb586c..00000000
--- a/mayor-orig/www/include/share/googleapi/composer/autoload_files.php
+++ /dev/null
@@ -1,13 +0,0 @@
- $vendorDir . '/guzzlehttp/psr7/src/functions_include.php',
-    'c964ee0ededf28c96ebd9db5099ef910' => $vendorDir . '/guzzlehttp/promises/src/functions_include.php',
-    '37a3dc5111fe8f707ab4c132ef1dbc62' => $vendorDir . '/guzzlehttp/guzzle/src/functions_include.php',
-    'decc78cc4436b1292c6c0d151b19445c' => $vendorDir . '/phpseclib/phpseclib/phpseclib/bootstrap.php',
-);
diff --git a/mayor-orig/www/include/share/googleapi/composer/autoload_namespaces.php b/mayor-orig/www/include/share/googleapi/composer/autoload_namespaces.php
deleted file mode 100644
index aed9f84e..00000000
--- a/mayor-orig/www/include/share/googleapi/composer/autoload_namespaces.php
+++ /dev/null
@@ -1,11 +0,0 @@
- array($vendorDir . '/google/apiclient-services/src'),
-    'Google_' => array($vendorDir . '/google/apiclient/src'),
-);
diff --git a/mayor-orig/www/include/share/googleapi/composer/autoload_psr4.php b/mayor-orig/www/include/share/googleapi/composer/autoload_psr4.php
deleted file mode 100644
index 36bd6b5a..00000000
--- a/mayor-orig/www/include/share/googleapi/composer/autoload_psr4.php
+++ /dev/null
@@ -1,19 +0,0 @@
- array($vendorDir . '/phpseclib/phpseclib/phpseclib'),
-    'Psr\\Log\\' => array($vendorDir . '/psr/log/Psr/Log'),
-    'Psr\\Http\\Message\\' => array($vendorDir . '/psr/http-message/src'),
-    'Psr\\Cache\\' => array($vendorDir . '/psr/cache/src'),
-    'Monolog\\' => array($vendorDir . '/monolog/monolog/src/Monolog'),
-    'GuzzleHttp\\Psr7\\' => array($vendorDir . '/guzzlehttp/psr7/src'),
-    'GuzzleHttp\\Promise\\' => array($vendorDir . '/guzzlehttp/promises/src'),
-    'GuzzleHttp\\' => array($vendorDir . '/guzzlehttp/guzzle/src'),
-    'Google\\Auth\\' => array($vendorDir . '/google/auth/src'),
-    'Firebase\\JWT\\' => array($vendorDir . '/firebase/php-jwt/src'),
-);
diff --git a/mayor-orig/www/include/share/googleapi/composer/autoload_real.php b/mayor-orig/www/include/share/googleapi/composer/autoload_real.php
deleted file mode 100644
index 84415c51..00000000
--- a/mayor-orig/www/include/share/googleapi/composer/autoload_real.php
+++ /dev/null
@@ -1,70 +0,0 @@
-= 50600 && !defined('HHVM_VERSION') && (!function_exists('zend_loader_file_encoded') || !zend_loader_file_encoded());
-        if ($useStaticLoader) {
-            require_once __DIR__ . '/autoload_static.php';
-
-            call_user_func(\Composer\Autoload\ComposerStaticInit93fe46837b05a1a7f3fe21c3c3d374b7::getInitializer($loader));
-        } else {
-            $map = require __DIR__ . '/autoload_namespaces.php';
-            foreach ($map as $namespace => $path) {
-                $loader->set($namespace, $path);
-            }
-
-            $map = require __DIR__ . '/autoload_psr4.php';
-            foreach ($map as $namespace => $path) {
-                $loader->setPsr4($namespace, $path);
-            }
-
-            $classMap = require __DIR__ . '/autoload_classmap.php';
-            if ($classMap) {
-                $loader->addClassMap($classMap);
-            }
-        }
-
-        $loader->register(true);
-
-        if ($useStaticLoader) {
-            $includeFiles = Composer\Autoload\ComposerStaticInit93fe46837b05a1a7f3fe21c3c3d374b7::$files;
-        } else {
-            $includeFiles = require __DIR__ . '/autoload_files.php';
-        }
-        foreach ($includeFiles as $fileIdentifier => $file) {
-            composerRequire93fe46837b05a1a7f3fe21c3c3d374b7($fileIdentifier, $file);
-        }
-
-        return $loader;
-    }
-}
-
-function composerRequire93fe46837b05a1a7f3fe21c3c3d374b7($fileIdentifier, $file)
-{
-    if (empty($GLOBALS['__composer_autoload_files'][$fileIdentifier])) {
-        require $file;
-
-        $GLOBALS['__composer_autoload_files'][$fileIdentifier] = true;
-    }
-}
diff --git a/mayor-orig/www/include/share/googleapi/composer/autoload_static.php b/mayor-orig/www/include/share/googleapi/composer/autoload_static.php
deleted file mode 100644
index 9893763c..00000000
--- a/mayor-orig/www/include/share/googleapi/composer/autoload_static.php
+++ /dev/null
@@ -1,140 +0,0 @@
- __DIR__ . '/..' . '/guzzlehttp/psr7/src/functions_include.php',
-        'c964ee0ededf28c96ebd9db5099ef910' => __DIR__ . '/..' . '/guzzlehttp/promises/src/functions_include.php',
-        '37a3dc5111fe8f707ab4c132ef1dbc62' => __DIR__ . '/..' . '/guzzlehttp/guzzle/src/functions_include.php',
-        'decc78cc4436b1292c6c0d151b19445c' => __DIR__ . '/..' . '/phpseclib/phpseclib/phpseclib/bootstrap.php',
-    );
-
-    public static $prefixLengthsPsr4 = array (
-        'p' => 
-        array (
-            'phpseclib\\' => 10,
-        ),
-        'P' => 
-        array (
-            'Psr\\Log\\' => 8,
-            'Psr\\Http\\Message\\' => 17,
-            'Psr\\Cache\\' => 10,
-        ),
-        'M' => 
-        array (
-            'Monolog\\' => 8,
-        ),
-        'G' => 
-        array (
-            'GuzzleHttp\\Psr7\\' => 16,
-            'GuzzleHttp\\Promise\\' => 19,
-            'GuzzleHttp\\' => 11,
-            'Google\\Auth\\' => 12,
-        ),
-        'F' => 
-        array (
-            'Firebase\\JWT\\' => 13,
-        ),
-    );
-
-    public static $prefixDirsPsr4 = array (
-        'phpseclib\\' => 
-        array (
-            0 => __DIR__ . '/..' . '/phpseclib/phpseclib/phpseclib',
-        ),
-        'Psr\\Log\\' => 
-        array (
-            0 => __DIR__ . '/..' . '/psr/log/Psr/Log',
-        ),
-        'Psr\\Http\\Message\\' => 
-        array (
-            0 => __DIR__ . '/..' . '/psr/http-message/src',
-        ),
-        'Psr\\Cache\\' => 
-        array (
-            0 => __DIR__ . '/..' . '/psr/cache/src',
-        ),
-        'Monolog\\' => 
-        array (
-            0 => __DIR__ . '/..' . '/monolog/monolog/src/Monolog',
-        ),
-        'GuzzleHttp\\Psr7\\' => 
-        array (
-            0 => __DIR__ . '/..' . '/guzzlehttp/psr7/src',
-        ),
-        'GuzzleHttp\\Promise\\' => 
-        array (
-            0 => __DIR__ . '/..' . '/guzzlehttp/promises/src',
-        ),
-        'GuzzleHttp\\' => 
-        array (
-            0 => __DIR__ . '/..' . '/guzzlehttp/guzzle/src',
-        ),
-        'Google\\Auth\\' => 
-        array (
-            0 => __DIR__ . '/..' . '/google/auth/src',
-        ),
-        'Firebase\\JWT\\' => 
-        array (
-            0 => __DIR__ . '/..' . '/firebase/php-jwt/src',
-        ),
-    );
-
-    public static $prefixesPsr0 = array (
-        'G' => 
-        array (
-            'Google_Service_' => 
-            array (
-                0 => __DIR__ . '/..' . '/google/apiclient-services/src',
-            ),
-            'Google_' => 
-            array (
-                0 => __DIR__ . '/..' . '/google/apiclient/src',
-            ),
-        ),
-    );
-
-    public static $classMap = array (
-        'Google\\Auth\\ApplicationDefaultCredentials' => __DIR__ . '/..' . '/google/auth/src/ApplicationDefaultCredentials.php',
-        'Google\\Auth\\CacheTrait' => __DIR__ . '/..' . '/google/auth/src/CacheTrait.php',
-        'Google\\Auth\\Cache\\InvalidArgumentException' => __DIR__ . '/..' . '/google/auth/src/Cache/InvalidArgumentException.php',
-        'Google\\Auth\\Cache\\Item' => __DIR__ . '/..' . '/google/auth/src/Cache/Item.php',
-        'Google\\Auth\\Cache\\MemoryCacheItemPool' => __DIR__ . '/..' . '/google/auth/src/Cache/MemoryCacheItemPool.php',
-        'Google\\Auth\\CredentialsLoader' => __DIR__ . '/..' . '/google/auth/src/CredentialsLoader.php',
-        'Google\\Auth\\Credentials\\AppIdentityCredentials' => __DIR__ . '/..' . '/google/auth/src/Credentials/AppIdentityCredentials.php',
-        'Google\\Auth\\Credentials\\GCECredentials' => __DIR__ . '/..' . '/google/auth/src/Credentials/GCECredentials.php',
-        'Google\\Auth\\Credentials\\IAMCredentials' => __DIR__ . '/..' . '/google/auth/src/Credentials/IAMCredentials.php',
-        'Google\\Auth\\Credentials\\ServiceAccountCredentials' => __DIR__ . '/..' . '/google/auth/src/Credentials/ServiceAccountCredentials.php',
-        'Google\\Auth\\Credentials\\ServiceAccountJwtAccessCredentials' => __DIR__ . '/..' . '/google/auth/src/Credentials/ServiceAccountJwtAccessCredentials.php',
-        'Google\\Auth\\Credentials\\UserRefreshCredentials' => __DIR__ . '/..' . '/google/auth/src/Credentials/UserRefreshCredentials.php',
-        'Google\\Auth\\FetchAuthTokenCache' => __DIR__ . '/..' . '/google/auth/src/FetchAuthTokenCache.php',
-        'Google\\Auth\\FetchAuthTokenInterface' => __DIR__ . '/..' . '/google/auth/src/FetchAuthTokenInterface.php',
-        'Google\\Auth\\HttpHandler\\Guzzle5HttpHandler' => __DIR__ . '/..' . '/google/auth/src/HttpHandler/Guzzle5HttpHandler.php',
-        'Google\\Auth\\HttpHandler\\Guzzle6HttpHandler' => __DIR__ . '/..' . '/google/auth/src/HttpHandler/Guzzle6HttpHandler.php',
-        'Google\\Auth\\HttpHandler\\HttpHandlerFactory' => __DIR__ . '/..' . '/google/auth/src/HttpHandler/HttpHandlerFactory.php',
-        'Google\\Auth\\Middleware\\AuthTokenMiddleware' => __DIR__ . '/..' . '/google/auth/src/Middleware/AuthTokenMiddleware.php',
-        'Google\\Auth\\Middleware\\ScopedAccessTokenMiddleware' => __DIR__ . '/..' . '/google/auth/src/Middleware/ScopedAccessTokenMiddleware.php',
-        'Google\\Auth\\Middleware\\SimpleMiddleware' => __DIR__ . '/..' . '/google/auth/src/Middleware/SimpleMiddleware.php',
-        'Google\\Auth\\OAuth2' => __DIR__ . '/..' . '/google/auth/src/OAuth2.php',
-        'Google\\Auth\\Subscriber\\AuthTokenSubscriber' => __DIR__ . '/..' . '/google/auth/src/Subscriber/AuthTokenSubscriber.php',
-        'Google\\Auth\\Subscriber\\ScopedAccessTokenSubscriber' => __DIR__ . '/..' . '/google/auth/src/Subscriber/ScopedAccessTokenSubscriber.php',
-        'Google\\Auth\\Subscriber\\SimpleSubscriber' => __DIR__ . '/..' . '/google/auth/src/Subscriber/SimpleSubscriber.php',
-        'Google_Service_Exception' => __DIR__ . '/..' . '/google/apiclient/src/Google/Service/Exception.php',
-        'Google_Service_Resource' => __DIR__ . '/..' . '/google/apiclient/src/Google/Service/Resource.php',
-    );
-
-    public static function getInitializer(ClassLoader $loader)
-    {
-        return \Closure::bind(function () use ($loader) {
-            $loader->prefixLengthsPsr4 = ComposerStaticInit93fe46837b05a1a7f3fe21c3c3d374b7::$prefixLengthsPsr4;
-            $loader->prefixDirsPsr4 = ComposerStaticInit93fe46837b05a1a7f3fe21c3c3d374b7::$prefixDirsPsr4;
-            $loader->prefixesPsr0 = ComposerStaticInit93fe46837b05a1a7f3fe21c3c3d374b7::$prefixesPsr0;
-            $loader->classMap = ComposerStaticInit93fe46837b05a1a7f3fe21c3c3d374b7::$classMap;
-
-        }, null, ClassLoader::class);
-    }
-}
diff --git a/mayor-orig/www/include/share/googleapi/composer/installed.json b/mayor-orig/www/include/share/googleapi/composer/installed.json
deleted file mode 100644
index 274eeed6..00000000
--- a/mayor-orig/www/include/share/googleapi/composer/installed.json
+++ /dev/null
@@ -1,707 +0,0 @@
-[
-    {
-        "name": "psr/http-message",
-        "version": "1.0.1",
-        "version_normalized": "1.0.1.0",
-        "source": {
-            "type": "git",
-            "url": "https://github.com/php-fig/http-message.git",
-            "reference": "f6561bf28d520154e4b0ec72be95418abe6d9363"
-        },
-        "dist": {
-            "type": "zip",
-            "url": "https://api.github.com/repos/php-fig/http-message/zipball/f6561bf28d520154e4b0ec72be95418abe6d9363",
-            "reference": "f6561bf28d520154e4b0ec72be95418abe6d9363",
-            "shasum": ""
-        },
-        "require": {
-            "php": ">=5.3.0"
-        },
-        "time": "2016-08-06T14:39:51+00:00",
-        "type": "library",
-        "extra": {
-            "branch-alias": {
-                "dev-master": "1.0.x-dev"
-            }
-        },
-        "installation-source": "dist",
-        "autoload": {
-            "psr-4": {
-                "Psr\\Http\\Message\\": "src/"
-            }
-        },
-        "notification-url": "https://packagist.org/downloads/",
-        "license": [
-            "MIT"
-        ],
-        "authors": [
-            {
-                "name": "PHP-FIG",
-                "homepage": "http://www.php-fig.org/"
-            }
-        ],
-        "description": "Common interface for HTTP messages",
-        "homepage": "https://github.com/php-fig/http-message",
-        "keywords": [
-            "http",
-            "http-message",
-            "psr",
-            "psr-7",
-            "request",
-            "response"
-        ]
-    },
-    {
-        "name": "guzzlehttp/psr7",
-        "version": "1.4.2",
-        "version_normalized": "1.4.2.0",
-        "source": {
-            "type": "git",
-            "url": "https://github.com/guzzle/psr7.git",
-            "reference": "f5b8a8512e2b58b0071a7280e39f14f72e05d87c"
-        },
-        "dist": {
-            "type": "zip",
-            "url": "https://api.github.com/repos/guzzle/psr7/zipball/f5b8a8512e2b58b0071a7280e39f14f72e05d87c",
-            "reference": "f5b8a8512e2b58b0071a7280e39f14f72e05d87c",
-            "shasum": ""
-        },
-        "require": {
-            "php": ">=5.4.0",
-            "psr/http-message": "~1.0"
-        },
-        "provide": {
-            "psr/http-message-implementation": "1.0"
-        },
-        "require-dev": {
-            "phpunit/phpunit": "~4.0"
-        },
-        "time": "2017-03-20T17:10:46+00:00",
-        "type": "library",
-        "extra": {
-            "branch-alias": {
-                "dev-master": "1.4-dev"
-            }
-        },
-        "installation-source": "dist",
-        "autoload": {
-            "psr-4": {
-                "GuzzleHttp\\Psr7\\": "src/"
-            },
-            "files": [
-                "src/functions_include.php"
-            ]
-        },
-        "notification-url": "https://packagist.org/downloads/",
-        "license": [
-            "MIT"
-        ],
-        "authors": [
-            {
-                "name": "Michael Dowling",
-                "email": "mtdowling@gmail.com",
-                "homepage": "https://github.com/mtdowling"
-            },
-            {
-                "name": "Tobias Schultze",
-                "homepage": "https://github.com/Tobion"
-            }
-        ],
-        "description": "PSR-7 message implementation that also provides common utility methods",
-        "keywords": [
-            "http",
-            "message",
-            "request",
-            "response",
-            "stream",
-            "uri",
-            "url"
-        ]
-    },
-    {
-        "name": "guzzlehttp/promises",
-        "version": "v1.3.1",
-        "version_normalized": "1.3.1.0",
-        "source": {
-            "type": "git",
-            "url": "https://github.com/guzzle/promises.git",
-            "reference": "a59da6cf61d80060647ff4d3eb2c03a2bc694646"
-        },
-        "dist": {
-            "type": "zip",
-            "url": "https://api.github.com/repos/guzzle/promises/zipball/a59da6cf61d80060647ff4d3eb2c03a2bc694646",
-            "reference": "a59da6cf61d80060647ff4d3eb2c03a2bc694646",
-            "shasum": ""
-        },
-        "require": {
-            "php": ">=5.5.0"
-        },
-        "require-dev": {
-            "phpunit/phpunit": "^4.0"
-        },
-        "time": "2016-12-20T10:07:11+00:00",
-        "type": "library",
-        "extra": {
-            "branch-alias": {
-                "dev-master": "1.4-dev"
-            }
-        },
-        "installation-source": "dist",
-        "autoload": {
-            "psr-4": {
-                "GuzzleHttp\\Promise\\": "src/"
-            },
-            "files": [
-                "src/functions_include.php"
-            ]
-        },
-        "notification-url": "https://packagist.org/downloads/",
-        "license": [
-            "MIT"
-        ],
-        "authors": [
-            {
-                "name": "Michael Dowling",
-                "email": "mtdowling@gmail.com",
-                "homepage": "https://github.com/mtdowling"
-            }
-        ],
-        "description": "Guzzle promises library",
-        "keywords": [
-            "promise"
-        ]
-    },
-    {
-        "name": "guzzlehttp/guzzle",
-        "version": "6.3.0",
-        "version_normalized": "6.3.0.0",
-        "source": {
-            "type": "git",
-            "url": "https://github.com/guzzle/guzzle.git",
-            "reference": "f4db5a78a5ea468d4831de7f0bf9d9415e348699"
-        },
-        "dist": {
-            "type": "zip",
-            "url": "https://api.github.com/repos/guzzle/guzzle/zipball/f4db5a78a5ea468d4831de7f0bf9d9415e348699",
-            "reference": "f4db5a78a5ea468d4831de7f0bf9d9415e348699",
-            "shasum": ""
-        },
-        "require": {
-            "guzzlehttp/promises": "^1.0",
-            "guzzlehttp/psr7": "^1.4",
-            "php": ">=5.5"
-        },
-        "require-dev": {
-            "ext-curl": "*",
-            "phpunit/phpunit": "^4.0 || ^5.0",
-            "psr/log": "^1.0"
-        },
-        "suggest": {
-            "psr/log": "Required for using the Log middleware"
-        },
-        "time": "2017-06-22T18:50:49+00:00",
-        "type": "library",
-        "extra": {
-            "branch-alias": {
-                "dev-master": "6.2-dev"
-            }
-        },
-        "installation-source": "dist",
-        "autoload": {
-            "files": [
-                "src/functions_include.php"
-            ],
-            "psr-4": {
-                "GuzzleHttp\\": "src/"
-            }
-        },
-        "notification-url": "https://packagist.org/downloads/",
-        "license": [
-            "MIT"
-        ],
-        "authors": [
-            {
-                "name": "Michael Dowling",
-                "email": "mtdowling@gmail.com",
-                "homepage": "https://github.com/mtdowling"
-            }
-        ],
-        "description": "Guzzle is a PHP HTTP client library",
-        "homepage": "http://guzzlephp.org/",
-        "keywords": [
-            "client",
-            "curl",
-            "framework",
-            "http",
-            "http client",
-            "rest",
-            "web service"
-        ]
-    },
-    {
-        "name": "phpseclib/phpseclib",
-        "version": "2.0.6",
-        "version_normalized": "2.0.6.0",
-        "source": {
-            "type": "git",
-            "url": "https://github.com/phpseclib/phpseclib.git",
-            "reference": "34a7699e6f31b1ef4035ee36444407cecf9f56aa"
-        },
-        "dist": {
-            "type": "zip",
-            "url": "https://api.github.com/repos/phpseclib/phpseclib/zipball/34a7699e6f31b1ef4035ee36444407cecf9f56aa",
-            "reference": "34a7699e6f31b1ef4035ee36444407cecf9f56aa",
-            "shasum": ""
-        },
-        "require": {
-            "php": ">=5.3.3"
-        },
-        "require-dev": {
-            "phing/phing": "~2.7",
-            "phpunit/phpunit": "~4.0",
-            "sami/sami": "~2.0",
-            "squizlabs/php_codesniffer": "~2.0"
-        },
-        "suggest": {
-            "ext-gmp": "Install the GMP (GNU Multiple Precision) extension in order to speed up arbitrary precision integer arithmetic operations.",
-            "ext-libsodium": "SSH2/SFTP can make use of some algorithms provided by the libsodium-php extension.",
-            "ext-mcrypt": "Install the Mcrypt extension in order to speed up a few other cryptographic operations.",
-            "ext-openssl": "Install the OpenSSL extension in order to speed up a wide variety of cryptographic operations."
-        },
-        "time": "2017-06-05T06:31:10+00:00",
-        "type": "library",
-        "installation-source": "dist",
-        "autoload": {
-            "files": [
-                "phpseclib/bootstrap.php"
-            ],
-            "psr-4": {
-                "phpseclib\\": "phpseclib/"
-            }
-        },
-        "notification-url": "https://packagist.org/downloads/",
-        "license": [
-            "MIT"
-        ],
-        "authors": [
-            {
-                "name": "Jim Wigginton",
-                "email": "terrafrost@php.net",
-                "role": "Lead Developer"
-            },
-            {
-                "name": "Patrick Monnerat",
-                "email": "pm@datasphere.ch",
-                "role": "Developer"
-            },
-            {
-                "name": "Andreas Fischer",
-                "email": "bantu@phpbb.com",
-                "role": "Developer"
-            },
-            {
-                "name": "Hans-Jürgen Petrich",
-                "email": "petrich@tronic-media.com",
-                "role": "Developer"
-            },
-            {
-                "name": "Graham Campbell",
-                "email": "graham@alt-three.com",
-                "role": "Developer"
-            }
-        ],
-        "description": "PHP Secure Communications Library - Pure-PHP implementations of RSA, AES, SSH2, SFTP, X.509 etc.",
-        "homepage": "http://phpseclib.sourceforge.net",
-        "keywords": [
-            "BigInteger",
-            "aes",
-            "asn.1",
-            "asn1",
-            "blowfish",
-            "crypto",
-            "cryptography",
-            "encryption",
-            "rsa",
-            "security",
-            "sftp",
-            "signature",
-            "signing",
-            "ssh",
-            "twofish",
-            "x.509",
-            "x509"
-        ]
-    },
-    {
-        "name": "psr/log",
-        "version": "1.0.2",
-        "version_normalized": "1.0.2.0",
-        "source": {
-            "type": "git",
-            "url": "https://github.com/php-fig/log.git",
-            "reference": "4ebe3a8bf773a19edfe0a84b6585ba3d401b724d"
-        },
-        "dist": {
-            "type": "zip",
-            "url": "https://api.github.com/repos/php-fig/log/zipball/4ebe3a8bf773a19edfe0a84b6585ba3d401b724d",
-            "reference": "4ebe3a8bf773a19edfe0a84b6585ba3d401b724d",
-            "shasum": ""
-        },
-        "require": {
-            "php": ">=5.3.0"
-        },
-        "time": "2016-10-10T12:19:37+00:00",
-        "type": "library",
-        "extra": {
-            "branch-alias": {
-                "dev-master": "1.0.x-dev"
-            }
-        },
-        "installation-source": "dist",
-        "autoload": {
-            "psr-4": {
-                "Psr\\Log\\": "Psr/Log/"
-            }
-        },
-        "notification-url": "https://packagist.org/downloads/",
-        "license": [
-            "MIT"
-        ],
-        "authors": [
-            {
-                "name": "PHP-FIG",
-                "homepage": "http://www.php-fig.org/"
-            }
-        ],
-        "description": "Common interface for logging libraries",
-        "homepage": "https://github.com/php-fig/log",
-        "keywords": [
-            "log",
-            "psr",
-            "psr-3"
-        ]
-    },
-    {
-        "name": "monolog/monolog",
-        "version": "1.23.0",
-        "version_normalized": "1.23.0.0",
-        "source": {
-            "type": "git",
-            "url": "https://github.com/Seldaek/monolog.git",
-            "reference": "fd8c787753b3a2ad11bc60c063cff1358a32a3b4"
-        },
-        "dist": {
-            "type": "zip",
-            "url": "https://api.github.com/repos/Seldaek/monolog/zipball/fd8c787753b3a2ad11bc60c063cff1358a32a3b4",
-            "reference": "fd8c787753b3a2ad11bc60c063cff1358a32a3b4",
-            "shasum": ""
-        },
-        "require": {
-            "php": ">=5.3.0",
-            "psr/log": "~1.0"
-        },
-        "provide": {
-            "psr/log-implementation": "1.0.0"
-        },
-        "require-dev": {
-            "aws/aws-sdk-php": "^2.4.9 || ^3.0",
-            "doctrine/couchdb": "~1.0@dev",
-            "graylog2/gelf-php": "~1.0",
-            "jakub-onderka/php-parallel-lint": "0.9",
-            "php-amqplib/php-amqplib": "~2.4",
-            "php-console/php-console": "^3.1.3",
-            "phpunit/phpunit": "~4.5",
-            "phpunit/phpunit-mock-objects": "2.3.0",
-            "ruflin/elastica": ">=0.90 <3.0",
-            "sentry/sentry": "^0.13",
-            "swiftmailer/swiftmailer": "^5.3|^6.0"
-        },
-        "suggest": {
-            "aws/aws-sdk-php": "Allow sending log messages to AWS services like DynamoDB",
-            "doctrine/couchdb": "Allow sending log messages to a CouchDB server",
-            "ext-amqp": "Allow sending log messages to an AMQP server (1.0+ required)",
-            "ext-mongo": "Allow sending log messages to a MongoDB server",
-            "graylog2/gelf-php": "Allow sending log messages to a GrayLog2 server",
-            "mongodb/mongodb": "Allow sending log messages to a MongoDB server via PHP Driver",
-            "php-amqplib/php-amqplib": "Allow sending log messages to an AMQP server using php-amqplib",
-            "php-console/php-console": "Allow sending log messages to Google Chrome",
-            "rollbar/rollbar": "Allow sending log messages to Rollbar",
-            "ruflin/elastica": "Allow sending log messages to an Elastic Search server",
-            "sentry/sentry": "Allow sending log messages to a Sentry server"
-        },
-        "time": "2017-06-19T01:22:40+00:00",
-        "type": "library",
-        "extra": {
-            "branch-alias": {
-                "dev-master": "2.0.x-dev"
-            }
-        },
-        "installation-source": "dist",
-        "autoload": {
-            "psr-4": {
-                "Monolog\\": "src/Monolog"
-            }
-        },
-        "notification-url": "https://packagist.org/downloads/",
-        "license": [
-            "MIT"
-        ],
-        "authors": [
-            {
-                "name": "Jordi Boggiano",
-                "email": "j.boggiano@seld.be",
-                "homepage": "http://seld.be"
-            }
-        ],
-        "description": "Sends your logs to files, sockets, inboxes, databases and various web services",
-        "homepage": "http://github.com/Seldaek/monolog",
-        "keywords": [
-            "log",
-            "logging",
-            "psr-3"
-        ]
-    },
-    {
-        "name": "firebase/php-jwt",
-        "version": "v4.0.0",
-        "version_normalized": "4.0.0.0",
-        "source": {
-            "type": "git",
-            "url": "https://github.com/firebase/php-jwt.git",
-            "reference": "dccf163dc8ed7ed6a00afc06c51ee5186a428d35"
-        },
-        "dist": {
-            "type": "zip",
-            "url": "https://api.github.com/repos/firebase/php-jwt/zipball/dccf163dc8ed7ed6a00afc06c51ee5186a428d35",
-            "reference": "dccf163dc8ed7ed6a00afc06c51ee5186a428d35",
-            "shasum": ""
-        },
-        "require": {
-            "php": ">=5.3.0"
-        },
-        "time": "2016-07-18T04:51:16+00:00",
-        "type": "library",
-        "installation-source": "dist",
-        "autoload": {
-            "psr-4": {
-                "Firebase\\JWT\\": "src"
-            }
-        },
-        "notification-url": "https://packagist.org/downloads/",
-        "license": [
-            "BSD-3-Clause"
-        ],
-        "authors": [
-            {
-                "name": "Neuman Vong",
-                "email": "neuman+pear@twilio.com",
-                "role": "Developer"
-            },
-            {
-                "name": "Anant Narayanan",
-                "email": "anant@php.net",
-                "role": "Developer"
-            }
-        ],
-        "description": "A simple library to encode and decode JSON Web Tokens (JWT) in PHP. Should conform to the current spec.",
-        "homepage": "https://github.com/firebase/php-jwt"
-    },
-    {
-        "name": "google/apiclient-services",
-        "version": "v0.11",
-        "version_normalized": "0.11.0.0",
-        "source": {
-            "type": "git",
-            "url": "https://github.com/google/google-api-php-client-services.git",
-            "reference": "48c554aee06f2fd5700d7bdfa4fa6b82d184eb52"
-        },
-        "dist": {
-            "type": "zip",
-            "url": "https://api.github.com/repos/google/google-api-php-client-services/zipball/48c554aee06f2fd5700d7bdfa4fa6b82d184eb52",
-            "reference": "48c554aee06f2fd5700d7bdfa4fa6b82d184eb52",
-            "shasum": ""
-        },
-        "require": {
-            "php": ">=5.4"
-        },
-        "require-dev": {
-            "phpunit/phpunit": "~4.8"
-        },
-        "time": "2017-03-13T17:40:44+00:00",
-        "type": "library",
-        "installation-source": "dist",
-        "autoload": {
-            "psr-0": {
-                "Google_Service_": "src"
-            }
-        },
-        "notification-url": "https://packagist.org/downloads/",
-        "license": [
-            "Apache-2.0"
-        ],
-        "description": "Client library for Google APIs",
-        "homepage": "http://developers.google.com/api-client-library/php",
-        "keywords": [
-            "google"
-        ]
-    },
-    {
-        "name": "psr/cache",
-        "version": "1.0.1",
-        "version_normalized": "1.0.1.0",
-        "source": {
-            "type": "git",
-            "url": "https://github.com/php-fig/cache.git",
-            "reference": "d11b50ad223250cf17b86e38383413f5a6764bf8"
-        },
-        "dist": {
-            "type": "zip",
-            "url": "https://api.github.com/repos/php-fig/cache/zipball/d11b50ad223250cf17b86e38383413f5a6764bf8",
-            "reference": "d11b50ad223250cf17b86e38383413f5a6764bf8",
-            "shasum": ""
-        },
-        "require": {
-            "php": ">=5.3.0"
-        },
-        "time": "2016-08-06T20:24:11+00:00",
-        "type": "library",
-        "extra": {
-            "branch-alias": {
-                "dev-master": "1.0.x-dev"
-            }
-        },
-        "installation-source": "dist",
-        "autoload": {
-            "psr-4": {
-                "Psr\\Cache\\": "src/"
-            }
-        },
-        "notification-url": "https://packagist.org/downloads/",
-        "license": [
-            "MIT"
-        ],
-        "authors": [
-            {
-                "name": "PHP-FIG",
-                "homepage": "http://www.php-fig.org/"
-            }
-        ],
-        "description": "Common interface for caching libraries",
-        "keywords": [
-            "cache",
-            "psr",
-            "psr-6"
-        ]
-    },
-    {
-        "name": "google/auth",
-        "version": "v0.11.1",
-        "version_normalized": "0.11.1.0",
-        "source": {
-            "type": "git",
-            "url": "https://github.com/google/google-auth-library-php.git",
-            "reference": "a240674b08a09949fd5597f7590b3ed83663a12d"
-        },
-        "dist": {
-            "type": "zip",
-            "url": "https://api.github.com/repos/google/google-auth-library-php/zipball/a240674b08a09949fd5597f7590b3ed83663a12d",
-            "reference": "a240674b08a09949fd5597f7590b3ed83663a12d",
-            "shasum": ""
-        },
-        "require": {
-            "firebase/php-jwt": "~2.0|~3.0|~4.0",
-            "guzzlehttp/guzzle": "~5.3|~6.0",
-            "guzzlehttp/psr7": "~1.2",
-            "php": ">=5.4",
-            "psr/cache": "^1.0",
-            "psr/http-message": "^1.0"
-        },
-        "require-dev": {
-            "friendsofphp/php-cs-fixer": "^1.11",
-            "phpunit/phpunit": "3.7.*"
-        },
-        "time": "2016-11-02T14:59:14+00:00",
-        "type": "library",
-        "installation-source": "dist",
-        "autoload": {
-            "classmap": [
-                "src/"
-            ],
-            "psr-4": {
-                "Google\\Auth\\": "src"
-            }
-        },
-        "notification-url": "https://packagist.org/downloads/",
-        "license": [
-            "Apache-2.0"
-        ],
-        "description": "Google Auth Library for PHP",
-        "homepage": "http://github.com/google/google-auth-library-php",
-        "keywords": [
-            "Authentication",
-            "google",
-            "oauth2"
-        ]
-    },
-    {
-        "name": "google/apiclient",
-        "version": "v2.1.3",
-        "version_normalized": "2.1.3.0",
-        "source": {
-            "type": "git",
-            "url": "https://github.com/google/google-api-php-client.git",
-            "reference": "43996f09df274158fd04fce98e8a82effe5f3717"
-        },
-        "dist": {
-            "type": "zip",
-            "url": "https://api.github.com/repos/google/google-api-php-client/zipball/43996f09df274158fd04fce98e8a82effe5f3717",
-            "reference": "43996f09df274158fd04fce98e8a82effe5f3717",
-            "shasum": ""
-        },
-        "require": {
-            "firebase/php-jwt": "~2.0|~3.0|~4.0",
-            "google/apiclient-services": "^0.11",
-            "google/auth": "^0.11",
-            "guzzlehttp/guzzle": "~5.2|~6.0",
-            "guzzlehttp/psr7": "^1.2",
-            "monolog/monolog": "^1.17",
-            "php": ">=5.4",
-            "phpseclib/phpseclib": "~0.3.10|~2.0"
-        },
-        "require-dev": {
-            "cache/filesystem-adapter": "^0.3.2",
-            "phpunit/phpunit": "~4",
-            "squizlabs/php_codesniffer": "~2.3",
-            "symfony/css-selector": "~2.1",
-            "symfony/dom-crawler": "~2.1"
-        },
-        "suggest": {
-            "cache/filesystem-adapter": "For caching certs and tokens (using Google_Client::setCache)"
-        },
-        "time": "2017-03-22T18:32:04+00:00",
-        "type": "library",
-        "extra": {
-            "branch-alias": {
-                "dev-master": "2.x-dev"
-            }
-        },
-        "installation-source": "dist",
-        "autoload": {
-            "psr-0": {
-                "Google_": "src/"
-            },
-            "classmap": [
-                "src/Google/Service/"
-            ]
-        },
-        "notification-url": "https://packagist.org/downloads/",
-        "license": [
-            "Apache-2.0"
-        ],
-        "description": "Client library for Google APIs",
-        "homepage": "http://developers.google.com/api-client-library/php",
-        "keywords": [
-            "google"
-        ]
-    }
-]
diff --git a/mayor-orig/www/include/share/googleapi/firebase/php-jwt/LICENSE b/mayor-orig/www/include/share/googleapi/firebase/php-jwt/LICENSE
deleted file mode 100644
index cb0c49b3..00000000
--- a/mayor-orig/www/include/share/googleapi/firebase/php-jwt/LICENSE
+++ /dev/null
@@ -1,30 +0,0 @@
-Copyright (c) 2011, Neuman Vong
-
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are met:
-
-    * Redistributions of source code must retain the above copyright
-      notice, this list of conditions and the following disclaimer.
-
-    * Redistributions in binary form must reproduce the above
-      copyright notice, this list of conditions and the following
-      disclaimer in the documentation and/or other materials provided
-      with the distribution.
-
-    * Neither the name of Neuman Vong nor the names of other
-      contributors may be used to endorse or promote products derived
-      from this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
diff --git a/mayor-orig/www/include/share/googleapi/firebase/php-jwt/README.md b/mayor-orig/www/include/share/googleapi/firebase/php-jwt/README.md
deleted file mode 100644
index d4589b1c..00000000
--- a/mayor-orig/www/include/share/googleapi/firebase/php-jwt/README.md
+++ /dev/null
@@ -1,119 +0,0 @@
-[![Build Status](https://travis-ci.org/firebase/php-jwt.png?branch=master)](https://travis-ci.org/firebase/php-jwt)
-[![Latest Stable Version](https://poser.pugx.org/firebase/php-jwt/v/stable)](https://packagist.org/packages/firebase/php-jwt)
-[![Total Downloads](https://poser.pugx.org/firebase/php-jwt/downloads)](https://packagist.org/packages/firebase/php-jwt)
-[![License](https://poser.pugx.org/firebase/php-jwt/license)](https://packagist.org/packages/firebase/php-jwt)
-
-PHP-JWT
-=======
-A simple library to encode and decode JSON Web Tokens (JWT) in PHP, conforming to [RFC 7519](https://tools.ietf.org/html/rfc7519).
-
-Installation
-------------
-
-Use composer to manage your dependencies and download PHP-JWT:
-
-```bash
-composer require firebase/php-jwt
-```
-
-Example
--------
-```php
- "http://example.org",
-    "aud" => "http://example.com",
-    "iat" => 1356999524,
-    "nbf" => 1357000000
-);
-
-/**
- * IMPORTANT:
- * You must specify supported algorithms for your application. See
- * https://tools.ietf.org/html/draft-ietf-jose-json-web-algorithms-40
- * for a list of spec-compliant algorithms.
- */
-$jwt = JWT::encode($token, $key);
-$decoded = JWT::decode($jwt, $key, array('HS256'));
-
-print_r($decoded);
-
-/*
- NOTE: This will now be an object instead of an associative array. To get
- an associative array, you will need to cast it as such:
-*/
-
-$decoded_array = (array) $decoded;
-
-/**
- * You can add a leeway to account for when there is a clock skew times between
- * the signing and verifying servers. It is recommended that this leeway should
- * not be bigger than a few minutes.
- *
- * Source: http://self-issued.info/docs/draft-ietf-oauth-json-web-token.html#nbfDef
- */
-JWT::$leeway = 60; // $leeway in seconds
-$decoded = JWT::decode($jwt, $key, array('HS256'));
-
-?>
-```
-
-Changelog
----------
-
-#### 4.0.0 / 2016-07-17
-- Add support for late static binding. See [#88](https://github.com/firebase/php-jwt/pull/88) for details. Thanks to [@chappy84](https://github.com/chappy84)!
-- Use static `$timestamp` instead of `time()` to improve unit testing. See [#93](https://github.com/firebase/php-jwt/pull/93) for details. Thanks to [@josephmcdermott](https://github.com/josephmcdermott)!
-- Fixes to exceptions classes. See [#81](https://github.com/firebase/php-jwt/pull/81) for details. Thanks to [@Maks3w](https://github.com/Maks3w)!
-- Fixes to PHPDoc. See [#76](https://github.com/firebase/php-jwt/pull/76) for details. Thanks to [@akeeman](https://github.com/akeeman)!
-
-#### 3.0.0 / 2015-07-22
-- Minimum PHP version updated from `5.2.0` to `5.3.0`.
-- Add `\Firebase\JWT` namespace. See
-[#59](https://github.com/firebase/php-jwt/pull/59) for details. Thanks to
-[@Dashron](https://github.com/Dashron)!
-- Require a non-empty key to decode and verify a JWT. See
-[#60](https://github.com/firebase/php-jwt/pull/60) for details. Thanks to
-[@sjones608](https://github.com/sjones608)!
-- Cleaner documentation blocks in the code. See
-[#62](https://github.com/firebase/php-jwt/pull/62) for details. Thanks to
-[@johanderuijter](https://github.com/johanderuijter)!
-
-#### 2.2.0 / 2015-06-22
-- Add support for adding custom, optional JWT headers to `JWT::encode()`. See
-[#53](https://github.com/firebase/php-jwt/pull/53/files) for details. Thanks to
-[@mcocaro](https://github.com/mcocaro)!
-
-#### 2.1.0 / 2015-05-20
-- Add support for adding a leeway to `JWT:decode()` that accounts for clock skew
-between signing and verifying entities. Thanks to [@lcabral](https://github.com/lcabral)!
-- Add support for passing an object implementing the `ArrayAccess` interface for
-`$keys` argument in `JWT::decode()`. Thanks to [@aztech-dev](https://github.com/aztech-dev)!
-
-#### 2.0.0 / 2015-04-01
-- **Note**: It is strongly recommended that you update to > v2.0.0 to address
-  known security vulnerabilities in prior versions when both symmetric and
-  asymmetric keys are used together.
-- Update signature for `JWT::decode(...)` to require an array of supported
-  algorithms to use when verifying token signatures.
-
-
-Tests
------
-Run the tests using phpunit:
-
-```bash
-$ pear install PHPUnit
-$ phpunit --configuration phpunit.xml.dist
-PHPUnit 3.7.10 by Sebastian Bergmann.
-.....
-Time: 0 seconds, Memory: 2.50Mb
-OK (5 tests, 5 assertions)
-```
-
-License
--------
-[3-Clause BSD](http://opensource.org/licenses/BSD-3-Clause).
diff --git a/mayor-orig/www/include/share/googleapi/firebase/php-jwt/composer.json b/mayor-orig/www/include/share/googleapi/firebase/php-jwt/composer.json
deleted file mode 100644
index 1a5e93b5..00000000
--- a/mayor-orig/www/include/share/googleapi/firebase/php-jwt/composer.json
+++ /dev/null
@@ -1,27 +0,0 @@
-{
-    "name": "firebase/php-jwt",
-    "description": "A simple library to encode and decode JSON Web Tokens (JWT) in PHP. Should conform to the current spec.",
-    "homepage": "https://github.com/firebase/php-jwt",
-    "authors": [
-        {
-            "name": "Neuman Vong",
-            "email": "neuman+pear@twilio.com",
-            "role": "Developer"
-        },
-        {
-            "name": "Anant Narayanan",
-            "email": "anant@php.net",
-            "role": "Developer"
-        }
-    ],
-    "license": "BSD-3-Clause",
-    "require": {
-        "php": ">=5.3.0"
-    },
-    "autoload": {
-        "psr-4": {
-            "Firebase\\JWT\\": "src"
-        }
-    },
-    "minimum-stability": "dev"
-}
diff --git a/mayor-orig/www/include/share/googleapi/firebase/php-jwt/composer.lock b/mayor-orig/www/include/share/googleapi/firebase/php-jwt/composer.lock
deleted file mode 100644
index 5518ae41..00000000
--- a/mayor-orig/www/include/share/googleapi/firebase/php-jwt/composer.lock
+++ /dev/null
@@ -1,19 +0,0 @@
-{
-    "_readme": [
-        "This file locks the dependencies of your project to a known state",
-        "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file",
-        "This file is @generated automatically"
-    ],
-    "hash": "60a5df5d283a7ae9000173248eba8909",
-    "packages": [],
-    "packages-dev": [],
-    "aliases": [],
-    "minimum-stability": "dev",
-    "stability-flags": [],
-    "prefer-stable": false,
-    "prefer-lowest": false,
-    "platform": {
-        "php": ">=5.2.0"
-    },
-    "platform-dev": []
-}
diff --git a/mayor-orig/www/include/share/googleapi/firebase/php-jwt/package.xml b/mayor-orig/www/include/share/googleapi/firebase/php-jwt/package.xml
deleted file mode 100644
index a95b056f..00000000
--- a/mayor-orig/www/include/share/googleapi/firebase/php-jwt/package.xml
+++ /dev/null
@@ -1,77 +0,0 @@
-
-
- JWT
- pear.php.net
- A JWT encoder/decoder.
- A JWT encoder/decoder library for PHP.
- 
-  Neuman Vong
-  lcfrs
-  neuman+pear@twilio.com
-  yes
- 
- 
-  Firebase Operations
-  firebase
-  operations@firebase.com
-  yes
- 
- 2015-07-22
- 
-  3.0.0
-  3.0.0
- 
- 
-  beta
-  beta
- 
- BSD 3-Clause License
- 
-Initial release with basic support for JWT encoding, decoding and signature verification.
- 
- 
-  
-   
-    
-   
-   
-  
- 
- 
-  
-   
-    5.1
-   
-   
-    1.7.0
-   
-   
-    json
-   
-   
-    hash
-   
-  
- 
- 
- 
-  
-   
-    0.1.0
-    0.1.0
-   
-   
-    beta
-    beta
-   
-   2015-04-01
-   BSD 3-Clause License
-   
-Initial release with basic support for JWT encoding, decoding and signature verification.
-   
-  
- 
-
diff --git a/mayor-orig/www/include/share/googleapi/firebase/php-jwt/src/BeforeValidException.php b/mayor-orig/www/include/share/googleapi/firebase/php-jwt/src/BeforeValidException.php
deleted file mode 100644
index a6ee2f7c..00000000
--- a/mayor-orig/www/include/share/googleapi/firebase/php-jwt/src/BeforeValidException.php
+++ /dev/null
@@ -1,7 +0,0 @@
-
- * @author   Anant Narayanan 
- * @license  http://opensource.org/licenses/BSD-3-Clause 3-clause BSD
- * @link     https://github.com/firebase/php-jwt
- */
-class JWT
-{
-
-    /**
-     * When checking nbf, iat or expiration times,
-     * we want to provide some extra leeway time to
-     * account for clock skew.
-     */
-    public static $leeway = 0;
-
-    /**
-     * Allow the current timestamp to be specified.
-     * Useful for fixing a value within unit testing.
-     *
-     * Will default to PHP time() value if null.
-     */
-    public static $timestamp = null;
-
-    public static $supported_algs = array(
-        'HS256' => array('hash_hmac', 'SHA256'),
-        'HS512' => array('hash_hmac', 'SHA512'),
-        'HS384' => array('hash_hmac', 'SHA384'),
-        'RS256' => array('openssl', 'SHA256'),
-    );
-
-    /**
-     * Decodes a JWT string into a PHP object.
-     *
-     * @param string        $jwt            The JWT
-     * @param string|array  $key            The key, or map of keys.
-     *                                      If the algorithm used is asymmetric, this is the public key
-     * @param array         $allowed_algs   List of supported verification algorithms
-     *                                      Supported algorithms are 'HS256', 'HS384', 'HS512' and 'RS256'
-     *
-     * @return object The JWT's payload as a PHP object
-     *
-     * @throws UnexpectedValueException     Provided JWT was invalid
-     * @throws SignatureInvalidException    Provided JWT was invalid because the signature verification failed
-     * @throws BeforeValidException         Provided JWT is trying to be used before it's eligible as defined by 'nbf'
-     * @throws BeforeValidException         Provided JWT is trying to be used before it's been created as defined by 'iat'
-     * @throws ExpiredException             Provided JWT has since expired, as defined by the 'exp' claim
-     *
-     * @uses jsonDecode
-     * @uses urlsafeB64Decode
-     */
-    public static function decode($jwt, $key, $allowed_algs = array())
-    {
-        $timestamp = is_null(static::$timestamp) ? time() : static::$timestamp;
-
-        if (empty($key)) {
-            throw new InvalidArgumentException('Key may not be empty');
-        }
-        if (!is_array($allowed_algs)) {
-            throw new InvalidArgumentException('Algorithm not allowed');
-        }
-        $tks = explode('.', $jwt);
-        if (count($tks) != 3) {
-            throw new UnexpectedValueException('Wrong number of segments');
-        }
-        list($headb64, $bodyb64, $cryptob64) = $tks;
-        if (null === ($header = static::jsonDecode(static::urlsafeB64Decode($headb64)))) {
-            throw new UnexpectedValueException('Invalid header encoding');
-        }
-        if (null === $payload = static::jsonDecode(static::urlsafeB64Decode($bodyb64))) {
-            throw new UnexpectedValueException('Invalid claims encoding');
-        }
-        $sig = static::urlsafeB64Decode($cryptob64);
-        
-        if (empty($header->alg)) {
-            throw new UnexpectedValueException('Empty algorithm');
-        }
-        if (empty(static::$supported_algs[$header->alg])) {
-            throw new UnexpectedValueException('Algorithm not supported');
-        }
-        if (!in_array($header->alg, $allowed_algs)) {
-            throw new UnexpectedValueException('Algorithm not allowed');
-        }
-        if (is_array($key) || $key instanceof \ArrayAccess) {
-            if (isset($header->kid)) {
-                $key = $key[$header->kid];
-            } else {
-                throw new UnexpectedValueException('"kid" empty, unable to lookup correct key');
-            }
-        }
-
-        // Check the signature
-        if (!static::verify("$headb64.$bodyb64", $sig, $key, $header->alg)) {
-            throw new SignatureInvalidException('Signature verification failed');
-        }
-
-        // Check if the nbf if it is defined. This is the time that the
-        // token can actually be used. If it's not yet that time, abort.
-        if (isset($payload->nbf) && $payload->nbf > ($timestamp + static::$leeway)) {
-            throw new BeforeValidException(
-                'Cannot handle token prior to ' . date(DateTime::ISO8601, $payload->nbf)
-            );
-        }
-
-        // Check that this token has been created before 'now'. This prevents
-        // using tokens that have been created for later use (and haven't
-        // correctly used the nbf claim).
-        if (isset($payload->iat) && $payload->iat > ($timestamp + static::$leeway)) {
-            throw new BeforeValidException(
-                'Cannot handle token prior to ' . date(DateTime::ISO8601, $payload->iat)
-            );
-        }
-
-        // Check if this token has expired.
-        if (isset($payload->exp) && ($timestamp - static::$leeway) >= $payload->exp) {
-            throw new ExpiredException('Expired token');
-        }
-
-        return $payload;
-    }
-
-    /**
-     * Converts and signs a PHP object or array into a JWT string.
-     *
-     * @param object|array  $payload    PHP object or array
-     * @param string        $key        The secret key.
-     *                                  If the algorithm used is asymmetric, this is the private key
-     * @param string        $alg        The signing algorithm.
-     *                                  Supported algorithms are 'HS256', 'HS384', 'HS512' and 'RS256'
-     * @param mixed         $keyId
-     * @param array         $head       An array with header elements to attach
-     *
-     * @return string A signed JWT
-     *
-     * @uses jsonEncode
-     * @uses urlsafeB64Encode
-     */
-    public static function encode($payload, $key, $alg = 'HS256', $keyId = null, $head = null)
-    {
-        $header = array('typ' => 'JWT', 'alg' => $alg);
-        if ($keyId !== null) {
-            $header['kid'] = $keyId;
-        }
-        if ( isset($head) && is_array($head) ) {
-            $header = array_merge($head, $header);
-        }
-        $segments = array();
-        $segments[] = static::urlsafeB64Encode(static::jsonEncode($header));
-        $segments[] = static::urlsafeB64Encode(static::jsonEncode($payload));
-        $signing_input = implode('.', $segments);
-
-        $signature = static::sign($signing_input, $key, $alg);
-        $segments[] = static::urlsafeB64Encode($signature);
-
-        return implode('.', $segments);
-    }
-
-    /**
-     * Sign a string with a given key and algorithm.
-     *
-     * @param string            $msg    The message to sign
-     * @param string|resource   $key    The secret key
-     * @param string            $alg    The signing algorithm.
-     *                                  Supported algorithms are 'HS256', 'HS384', 'HS512' and 'RS256'
-     *
-     * @return string An encrypted message
-     *
-     * @throws DomainException Unsupported algorithm was specified
-     */
-    public static function sign($msg, $key, $alg = 'HS256')
-    {
-        if (empty(static::$supported_algs[$alg])) {
-            throw new DomainException('Algorithm not supported');
-        }
-        list($function, $algorithm) = static::$supported_algs[$alg];
-        switch($function) {
-            case 'hash_hmac':
-                return hash_hmac($algorithm, $msg, $key, true);
-            case 'openssl':
-                $signature = '';
-                $success = openssl_sign($msg, $signature, $key, $algorithm);
-                if (!$success) {
-                    throw new DomainException("OpenSSL unable to sign data");
-                } else {
-                    return $signature;
-                }
-        }
-    }
-
-    /**
-     * Verify a signature with the message, key and method. Not all methods
-     * are symmetric, so we must have a separate verify and sign method.
-     *
-     * @param string            $msg        The original message (header and body)
-     * @param string            $signature  The original signature
-     * @param string|resource   $key        For HS*, a string key works. for RS*, must be a resource of an openssl public key
-     * @param string            $alg        The algorithm
-     *
-     * @return bool
-     *
-     * @throws DomainException Invalid Algorithm or OpenSSL failure
-     */
-    private static function verify($msg, $signature, $key, $alg)
-    {
-        if (empty(static::$supported_algs[$alg])) {
-            throw new DomainException('Algorithm not supported');
-        }
-
-        list($function, $algorithm) = static::$supported_algs[$alg];
-        switch($function) {
-            case 'openssl':
-                $success = openssl_verify($msg, $signature, $key, $algorithm);
-                if (!$success) {
-                    throw new DomainException("OpenSSL unable to verify data: " . openssl_error_string());
-                } else {
-                    return $signature;
-                }
-            case 'hash_hmac':
-            default:
-                $hash = hash_hmac($algorithm, $msg, $key, true);
-                if (function_exists('hash_equals')) {
-                    return hash_equals($signature, $hash);
-                }
-                $len = min(static::safeStrlen($signature), static::safeStrlen($hash));
-
-                $status = 0;
-                for ($i = 0; $i < $len; $i++) {
-                    $status |= (ord($signature[$i]) ^ ord($hash[$i]));
-                }
-                $status |= (static::safeStrlen($signature) ^ static::safeStrlen($hash));
-
-                return ($status === 0);
-        }
-    }
-
-    /**
-     * Decode a JSON string into a PHP object.
-     *
-     * @param string $input JSON string
-     *
-     * @return object Object representation of JSON string
-     *
-     * @throws DomainException Provided string was invalid JSON
-     */
-    public static function jsonDecode($input)
-    {
-        if (version_compare(PHP_VERSION, '5.4.0', '>=') && !(defined('JSON_C_VERSION') && PHP_INT_SIZE > 4)) {
-            /** In PHP >=5.4.0, json_decode() accepts an options parameter, that allows you
-             * to specify that large ints (like Steam Transaction IDs) should be treated as
-             * strings, rather than the PHP default behaviour of converting them to floats.
-             */
-            $obj = json_decode($input, false, 512, JSON_BIGINT_AS_STRING);
-        } else {
-            /** Not all servers will support that, however, so for older versions we must
-             * manually detect large ints in the JSON string and quote them (thus converting
-             *them to strings) before decoding, hence the preg_replace() call.
-             */
-            $max_int_length = strlen((string) PHP_INT_MAX) - 1;
-            $json_without_bigints = preg_replace('/:\s*(-?\d{'.$max_int_length.',})/', ': "$1"', $input);
-            $obj = json_decode($json_without_bigints);
-        }
-
-        if (function_exists('json_last_error') && $errno = json_last_error()) {
-            static::handleJsonError($errno);
-        } elseif ($obj === null && $input !== 'null') {
-            throw new DomainException('Null result with non-null input');
-        }
-        return $obj;
-    }
-
-    /**
-     * Encode a PHP object into a JSON string.
-     *
-     * @param object|array $input A PHP object or array
-     *
-     * @return string JSON representation of the PHP object or array
-     *
-     * @throws DomainException Provided object could not be encoded to valid JSON
-     */
-    public static function jsonEncode($input)
-    {
-        $json = json_encode($input);
-        if (function_exists('json_last_error') && $errno = json_last_error()) {
-            static::handleJsonError($errno);
-        } elseif ($json === 'null' && $input !== null) {
-            throw new DomainException('Null result with non-null input');
-        }
-        return $json;
-    }
-
-    /**
-     * Decode a string with URL-safe Base64.
-     *
-     * @param string $input A Base64 encoded string
-     *
-     * @return string A decoded string
-     */
-    public static function urlsafeB64Decode($input)
-    {
-        $remainder = strlen($input) % 4;
-        if ($remainder) {
-            $padlen = 4 - $remainder;
-            $input .= str_repeat('=', $padlen);
-        }
-        return base64_decode(strtr($input, '-_', '+/'));
-    }
-
-    /**
-     * Encode a string with URL-safe Base64.
-     *
-     * @param string $input The string you want encoded
-     *
-     * @return string The base64 encode of what you passed in
-     */
-    public static function urlsafeB64Encode($input)
-    {
-        return str_replace('=', '', strtr(base64_encode($input), '+/', '-_'));
-    }
-
-    /**
-     * Helper method to create a JSON error.
-     *
-     * @param int $errno An error number from json_last_error()
-     *
-     * @return void
-     */
-    private static function handleJsonError($errno)
-    {
-        $messages = array(
-            JSON_ERROR_DEPTH => 'Maximum stack depth exceeded',
-            JSON_ERROR_CTRL_CHAR => 'Unexpected control character found',
-            JSON_ERROR_SYNTAX => 'Syntax error, malformed JSON'
-        );
-        throw new DomainException(
-            isset($messages[$errno])
-            ? $messages[$errno]
-            : 'Unknown JSON error: ' . $errno
-        );
-    }
-
-    /**
-     * Get the number of bytes in cryptographic strings.
-     *
-     * @param string
-     *
-     * @return int
-     */
-    private static function safeStrlen($str)
-    {
-        if (function_exists('mb_strlen')) {
-            return mb_strlen($str, '8bit');
-        }
-        return strlen($str);
-    }
-}
diff --git a/mayor-orig/www/include/share/googleapi/firebase/php-jwt/src/SignatureInvalidException.php b/mayor-orig/www/include/share/googleapi/firebase/php-jwt/src/SignatureInvalidException.php
deleted file mode 100644
index 27332b21..00000000
--- a/mayor-orig/www/include/share/googleapi/firebase/php-jwt/src/SignatureInvalidException.php
+++ /dev/null
@@ -1,7 +0,0 @@
-=5.4"
-    },
-    "require-dev": {
-        "phpunit/phpunit": "~4.8"
-    },
-    "autoload": {
-        "psr-0": {
-            "Google_Service_": "src"
-        }
-    }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/phpunit.xml b/mayor-orig/www/include/share/googleapi/google/apiclient-services/phpunit.xml
deleted file mode 100644
index 95069eed..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/phpunit.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-
-
-    
-        
-            tests
-        
-    
-
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Acceleratedmobilepageurl.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Acceleratedmobilepageurl.php
deleted file mode 100644
index 00a09651..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Acceleratedmobilepageurl.php
+++ /dev/null
@@ -1,67 +0,0 @@
-
- * This API contains a single method, batchGet. Call this method to retrieve the
- * AMP URL (and equivalent AMP Cache URL) for given public URL(s).

- *
- * 

- * For more information about this service, see the API
- * Documentation
- * 

- *
- * @author Google, Inc.
- */
-class Google_Service_Acceleratedmobilepageurl extends Google_Service
-{
-
-
-  public $ampUrls;
-  
-  /**
-   * Constructs the internal representation of the Acceleratedmobilepageurl
-   * service.
-   *
-   * @param Google_Client $client
-   */
-  public function __construct(Google_Client $client)
-  {
-    parent::__construct($client);
-    $this->rootUrl = 'https://acceleratedmobilepageurl.googleapis.com/';
-    $this->servicePath = '';
-    $this->version = 'v1';
-    $this->serviceName = 'acceleratedmobilepageurl';
-
-    $this->ampUrls = new Google_Service_Acceleratedmobilepageurl_Resource_AmpUrls(
-        $this,
-        $this->serviceName,
-        'ampUrls',
-        array(
-          'methods' => array(
-            'batchGet' => array(
-              'path' => 'v1/ampUrls:batchGet',
-              'httpMethod' => 'POST',
-              'parameters' => array(),
-            ),
-          )
-        )
-    );
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Acceleratedmobilepageurl/AmpUrl.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Acceleratedmobilepageurl/AmpUrl.php
deleted file mode 100644
index 9edc1587..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Acceleratedmobilepageurl/AmpUrl.php
+++ /dev/null
@@ -1,48 +0,0 @@
-ampUrl = $ampUrl;
-  }
-  public function getAmpUrl()
-  {
-    return $this->ampUrl;
-  }
-  public function setCdnAmpUrl($cdnAmpUrl)
-  {
-    $this->cdnAmpUrl = $cdnAmpUrl;
-  }
-  public function getCdnAmpUrl()
-  {
-    return $this->cdnAmpUrl;
-  }
-  public function setOriginalUrl($originalUrl)
-  {
-    $this->originalUrl = $originalUrl;
-  }
-  public function getOriginalUrl()
-  {
-    return $this->originalUrl;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Acceleratedmobilepageurl/AmpUrlError.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Acceleratedmobilepageurl/AmpUrlError.php
deleted file mode 100644
index 450988d7..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Acceleratedmobilepageurl/AmpUrlError.php
+++ /dev/null
@@ -1,48 +0,0 @@
-errorCode = $errorCode;
-  }
-  public function getErrorCode()
-  {
-    return $this->errorCode;
-  }
-  public function setErrorMessage($errorMessage)
-  {
-    $this->errorMessage = $errorMessage;
-  }
-  public function getErrorMessage()
-  {
-    return $this->errorMessage;
-  }
-  public function setOriginalUrl($originalUrl)
-  {
-    $this->originalUrl = $originalUrl;
-  }
-  public function getOriginalUrl()
-  {
-    return $this->originalUrl;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Acceleratedmobilepageurl/BatchGetAmpUrlsRequest.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Acceleratedmobilepageurl/BatchGetAmpUrlsRequest.php
deleted file mode 100644
index c2b4d204..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Acceleratedmobilepageurl/BatchGetAmpUrlsRequest.php
+++ /dev/null
@@ -1,40 +0,0 @@
-lookupStrategy = $lookupStrategy;
-  }
-  public function getLookupStrategy()
-  {
-    return $this->lookupStrategy;
-  }
-  public function setUrls($urls)
-  {
-    $this->urls = $urls;
-  }
-  public function getUrls()
-  {
-    return $this->urls;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Acceleratedmobilepageurl/BatchGetAmpUrlsResponse.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Acceleratedmobilepageurl/BatchGetAmpUrlsResponse.php
deleted file mode 100644
index 62196ade..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Acceleratedmobilepageurl/BatchGetAmpUrlsResponse.php
+++ /dev/null
@@ -1,42 +0,0 @@
-ampUrls = $ampUrls;
-  }
-  public function getAmpUrls()
-  {
-    return $this->ampUrls;
-  }
-  public function setUrlErrors($urlErrors)
-  {
-    $this->urlErrors = $urlErrors;
-  }
-  public function getUrlErrors()
-  {
-    return $this->urlErrors;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Acceleratedmobilepageurl/Resource/AmpUrls.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Acceleratedmobilepageurl/Resource/AmpUrls.php
deleted file mode 100644
index 9082e17c..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Acceleratedmobilepageurl/Resource/AmpUrls.php
+++ /dev/null
@@ -1,42 +0,0 @@
-
- *   $acceleratedmobilepageurlService = new Google_Service_Acceleratedmobilepageurl(...);
- *   $ampUrls = $acceleratedmobilepageurlService->ampUrls;
- *  
- */
-class Google_Service_Acceleratedmobilepageurl_Resource_AmpUrls extends Google_Service_Resource
-{
-  /**
-   * Returns AMP URL(s) and equivalent [AMP Cache URL(s)](/amp/cache/overview#amp-
-   * cache-url-format). (ampUrls.batchGet)
-   *
-   * @param Google_Service_Acceleratedmobilepageurl_BatchGetAmpUrlsRequest $postBody
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Acceleratedmobilepageurl_BatchGetAmpUrlsResponse
-   */
-  public function batchGet(Google_Service_Acceleratedmobilepageurl_BatchGetAmpUrlsRequest $postBody, $optParams = array())
-  {
-    $params = array('postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('batchGet', array($params), "Google_Service_Acceleratedmobilepageurl_BatchGetAmpUrlsResponse");
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdExchangeBuyer.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdExchangeBuyer.php
deleted file mode 100644
index 0d49c832..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdExchangeBuyer.php
+++ /dev/null
@@ -1,679 +0,0 @@
-
- * Accesses your bidding-account information, submits creatives for validation,
- * finds available direct deals, and retrieves performance reports.

- *
- * 

- * For more information about this service, see the API
- * Documentation
- * 

- *
- * @author Google, Inc.
- */
-class Google_Service_AdExchangeBuyer extends Google_Service
-{
-  /** Manage your Ad Exchange buyer account configuration. */
-  const ADEXCHANGE_BUYER =
-      "https://www.googleapis.com/auth/adexchange.buyer";
-
-  public $accounts;
-  public $billingInfo;
-  public $budget;
-  public $creatives;
-  public $marketplacedeals;
-  public $marketplacenotes;
-  public $marketplaceprivateauction;
-  public $performanceReport;
-  public $pretargetingConfig;
-  public $products;
-  public $proposals;
-  public $pubprofiles;
-  
-  /**
-   * Constructs the internal representation of the AdExchangeBuyer service.
-   *
-   * @param Google_Client $client
-   */
-  public function __construct(Google_Client $client)
-  {
-    parent::__construct($client);
-    $this->rootUrl = 'https://www.googleapis.com/';
-    $this->servicePath = 'adexchangebuyer/v1.4/';
-    $this->version = 'v1.4';
-    $this->serviceName = 'adexchangebuyer';
-
-    $this->accounts = new Google_Service_AdExchangeBuyer_Resource_Accounts(
-        $this,
-        $this->serviceName,
-        'accounts',
-        array(
-          'methods' => array(
-            'get' => array(
-              'path' => 'accounts/{id}',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'id' => array(
-                  'location' => 'path',
-                  'type' => 'integer',
-                  'required' => true,
-                ),
-              ),
-            ),'list' => array(
-              'path' => 'accounts',
-              'httpMethod' => 'GET',
-              'parameters' => array(),
-            ),'patch' => array(
-              'path' => 'accounts/{id}',
-              'httpMethod' => 'PATCH',
-              'parameters' => array(
-                'id' => array(
-                  'location' => 'path',
-                  'type' => 'integer',
-                  'required' => true,
-                ),
-                'confirmUnsafeAccountChange' => array(
-                  'location' => 'query',
-                  'type' => 'boolean',
-                ),
-              ),
-            ),'update' => array(
-              'path' => 'accounts/{id}',
-              'httpMethod' => 'PUT',
-              'parameters' => array(
-                'id' => array(
-                  'location' => 'path',
-                  'type' => 'integer',
-                  'required' => true,
-                ),
-                'confirmUnsafeAccountChange' => array(
-                  'location' => 'query',
-                  'type' => 'boolean',
-                ),
-              ),
-            ),
-          )
-        )
-    );
-    $this->billingInfo = new Google_Service_AdExchangeBuyer_Resource_BillingInfo(
-        $this,
-        $this->serviceName,
-        'billingInfo',
-        array(
-          'methods' => array(
-            'get' => array(
-              'path' => 'billinginfo/{accountId}',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'accountId' => array(
-                  'location' => 'path',
-                  'type' => 'integer',
-                  'required' => true,
-                ),
-              ),
-            ),'list' => array(
-              'path' => 'billinginfo',
-              'httpMethod' => 'GET',
-              'parameters' => array(),
-            ),
-          )
-        )
-    );
-    $this->budget = new Google_Service_AdExchangeBuyer_Resource_Budget(
-        $this,
-        $this->serviceName,
-        'budget',
-        array(
-          'methods' => array(
-            'get' => array(
-              'path' => 'billinginfo/{accountId}/{billingId}',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'accountId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'billingId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'patch' => array(
-              'path' => 'billinginfo/{accountId}/{billingId}',
-              'httpMethod' => 'PATCH',
-              'parameters' => array(
-                'accountId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'billingId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'update' => array(
-              'path' => 'billinginfo/{accountId}/{billingId}',
-              'httpMethod' => 'PUT',
-              'parameters' => array(
-                'accountId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'billingId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),
-          )
-        )
-    );
-    $this->creatives = new Google_Service_AdExchangeBuyer_Resource_Creatives(
-        $this,
-        $this->serviceName,
-        'creatives',
-        array(
-          'methods' => array(
-            'addDeal' => array(
-              'path' => 'creatives/{accountId}/{buyerCreativeId}/addDeal/{dealId}',
-              'httpMethod' => 'POST',
-              'parameters' => array(
-                'accountId' => array(
-                  'location' => 'path',
-                  'type' => 'integer',
-                  'required' => true,
-                ),
-                'buyerCreativeId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'dealId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'get' => array(
-              'path' => 'creatives/{accountId}/{buyerCreativeId}',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'accountId' => array(
-                  'location' => 'path',
-                  'type' => 'integer',
-                  'required' => true,
-                ),
-                'buyerCreativeId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'insert' => array(
-              'path' => 'creatives',
-              'httpMethod' => 'POST',
-              'parameters' => array(),
-            ),'list' => array(
-              'path' => 'creatives',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'accountId' => array(
-                  'location' => 'query',
-                  'type' => 'integer',
-                  'repeated' => true,
-                ),
-                'buyerCreativeId' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                  'repeated' => true,
-                ),
-                'dealsStatusFilter' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'maxResults' => array(
-                  'location' => 'query',
-                  'type' => 'integer',
-                ),
-                'openAuctionStatusFilter' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'pageToken' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-              ),
-            ),'listDeals' => array(
-              'path' => 'creatives/{accountId}/{buyerCreativeId}/listDeals',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'accountId' => array(
-                  'location' => 'path',
-                  'type' => 'integer',
-                  'required' => true,
-                ),
-                'buyerCreativeId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'removeDeal' => array(
-              'path' => 'creatives/{accountId}/{buyerCreativeId}/removeDeal/{dealId}',
-              'httpMethod' => 'POST',
-              'parameters' => array(
-                'accountId' => array(
-                  'location' => 'path',
-                  'type' => 'integer',
-                  'required' => true,
-                ),
-                'buyerCreativeId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'dealId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),
-          )
-        )
-    );
-    $this->marketplacedeals = new Google_Service_AdExchangeBuyer_Resource_Marketplacedeals(
-        $this,
-        $this->serviceName,
-        'marketplacedeals',
-        array(
-          'methods' => array(
-            'delete' => array(
-              'path' => 'proposals/{proposalId}/deals/delete',
-              'httpMethod' => 'POST',
-              'parameters' => array(
-                'proposalId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'insert' => array(
-              'path' => 'proposals/{proposalId}/deals/insert',
-              'httpMethod' => 'POST',
-              'parameters' => array(
-                'proposalId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'list' => array(
-              'path' => 'proposals/{proposalId}/deals',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'proposalId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'pqlQuery' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-              ),
-            ),'update' => array(
-              'path' => 'proposals/{proposalId}/deals/update',
-              'httpMethod' => 'POST',
-              'parameters' => array(
-                'proposalId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),
-          )
-        )
-    );
-    $this->marketplacenotes = new Google_Service_AdExchangeBuyer_Resource_Marketplacenotes(
-        $this,
-        $this->serviceName,
-        'marketplacenotes',
-        array(
-          'methods' => array(
-            'insert' => array(
-              'path' => 'proposals/{proposalId}/notes/insert',
-              'httpMethod' => 'POST',
-              'parameters' => array(
-                'proposalId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'list' => array(
-              'path' => 'proposals/{proposalId}/notes',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'proposalId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'pqlQuery' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-              ),
-            ),
-          )
-        )
-    );
-    $this->marketplaceprivateauction = new Google_Service_AdExchangeBuyer_Resource_Marketplaceprivateauction(
-        $this,
-        $this->serviceName,
-        'marketplaceprivateauction',
-        array(
-          'methods' => array(
-            'updateproposal' => array(
-              'path' => 'privateauction/{privateAuctionId}/updateproposal',
-              'httpMethod' => 'POST',
-              'parameters' => array(
-                'privateAuctionId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),
-          )
-        )
-    );
-    $this->performanceReport = new Google_Service_AdExchangeBuyer_Resource_PerformanceReport(
-        $this,
-        $this->serviceName,
-        'performanceReport',
-        array(
-          'methods' => array(
-            'list' => array(
-              'path' => 'performancereport',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'accountId' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'endDateTime' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'startDateTime' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'maxResults' => array(
-                  'location' => 'query',
-                  'type' => 'integer',
-                ),
-                'pageToken' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-              ),
-            ),
-          )
-        )
-    );
-    $this->pretargetingConfig = new Google_Service_AdExchangeBuyer_Resource_PretargetingConfig(
-        $this,
-        $this->serviceName,
-        'pretargetingConfig',
-        array(
-          'methods' => array(
-            'delete' => array(
-              'path' => 'pretargetingconfigs/{accountId}/{configId}',
-              'httpMethod' => 'DELETE',
-              'parameters' => array(
-                'accountId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'configId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'get' => array(
-              'path' => 'pretargetingconfigs/{accountId}/{configId}',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'accountId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'configId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'insert' => array(
-              'path' => 'pretargetingconfigs/{accountId}',
-              'httpMethod' => 'POST',
-              'parameters' => array(
-                'accountId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'list' => array(
-              'path' => 'pretargetingconfigs/{accountId}',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'accountId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'patch' => array(
-              'path' => 'pretargetingconfigs/{accountId}/{configId}',
-              'httpMethod' => 'PATCH',
-              'parameters' => array(
-                'accountId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'configId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'update' => array(
-              'path' => 'pretargetingconfigs/{accountId}/{configId}',
-              'httpMethod' => 'PUT',
-              'parameters' => array(
-                'accountId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'configId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),
-          )
-        )
-    );
-    $this->products = new Google_Service_AdExchangeBuyer_Resource_Products(
-        $this,
-        $this->serviceName,
-        'products',
-        array(
-          'methods' => array(
-            'get' => array(
-              'path' => 'products/{productId}',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'productId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'search' => array(
-              'path' => 'products/search',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'pqlQuery' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-              ),
-            ),
-          )
-        )
-    );
-    $this->proposals = new Google_Service_AdExchangeBuyer_Resource_Proposals(
-        $this,
-        $this->serviceName,
-        'proposals',
-        array(
-          'methods' => array(
-            'get' => array(
-              'path' => 'proposals/{proposalId}',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'proposalId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'insert' => array(
-              'path' => 'proposals/insert',
-              'httpMethod' => 'POST',
-              'parameters' => array(),
-            ),'patch' => array(
-              'path' => 'proposals/{proposalId}/{revisionNumber}/{updateAction}',
-              'httpMethod' => 'PATCH',
-              'parameters' => array(
-                'proposalId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'revisionNumber' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'updateAction' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'search' => array(
-              'path' => 'proposals/search',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'pqlQuery' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-              ),
-            ),'setupcomplete' => array(
-              'path' => 'proposals/{proposalId}/setupcomplete',
-              'httpMethod' => 'POST',
-              'parameters' => array(
-                'proposalId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'update' => array(
-              'path' => 'proposals/{proposalId}/{revisionNumber}/{updateAction}',
-              'httpMethod' => 'PUT',
-              'parameters' => array(
-                'proposalId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'revisionNumber' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'updateAction' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),
-          )
-        )
-    );
-    $this->pubprofiles = new Google_Service_AdExchangeBuyer_Resource_Pubprofiles(
-        $this,
-        $this->serviceName,
-        'pubprofiles',
-        array(
-          'methods' => array(
-            'list' => array(
-              'path' => 'publisher/{accountId}/profiles',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'accountId' => array(
-                  'location' => 'path',
-                  'type' => 'integer',
-                  'required' => true,
-                ),
-              ),
-            ),
-          )
-        )
-    );
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdExchangeBuyer/Account.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdExchangeBuyer/Account.php
deleted file mode 100644
index 85b0aea5..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdExchangeBuyer/Account.php
+++ /dev/null
@@ -1,95 +0,0 @@
-bidderLocation = $bidderLocation;
-  }
-  public function getBidderLocation()
-  {
-    return $this->bidderLocation;
-  }
-  public function setCookieMatchingNid($cookieMatchingNid)
-  {
-    $this->cookieMatchingNid = $cookieMatchingNid;
-  }
-  public function getCookieMatchingNid()
-  {
-    return $this->cookieMatchingNid;
-  }
-  public function setCookieMatchingUrl($cookieMatchingUrl)
-  {
-    $this->cookieMatchingUrl = $cookieMatchingUrl;
-  }
-  public function getCookieMatchingUrl()
-  {
-    return $this->cookieMatchingUrl;
-  }
-  public function setId($id)
-  {
-    $this->id = $id;
-  }
-  public function getId()
-  {
-    return $this->id;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setMaximumActiveCreatives($maximumActiveCreatives)
-  {
-    $this->maximumActiveCreatives = $maximumActiveCreatives;
-  }
-  public function getMaximumActiveCreatives()
-  {
-    return $this->maximumActiveCreatives;
-  }
-  public function setMaximumTotalQps($maximumTotalQps)
-  {
-    $this->maximumTotalQps = $maximumTotalQps;
-  }
-  public function getMaximumTotalQps()
-  {
-    return $this->maximumTotalQps;
-  }
-  public function setNumberActiveCreatives($numberActiveCreatives)
-  {
-    $this->numberActiveCreatives = $numberActiveCreatives;
-  }
-  public function getNumberActiveCreatives()
-  {
-    return $this->numberActiveCreatives;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdExchangeBuyer/AccountBidderLocation.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdExchangeBuyer/AccountBidderLocation.php
deleted file mode 100644
index 3b1d6ebd..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdExchangeBuyer/AccountBidderLocation.php
+++ /dev/null
@@ -1,57 +0,0 @@
-bidProtocol = $bidProtocol;
-  }
-  public function getBidProtocol()
-  {
-    return $this->bidProtocol;
-  }
-  public function setMaximumQps($maximumQps)
-  {
-    $this->maximumQps = $maximumQps;
-  }
-  public function getMaximumQps()
-  {
-    return $this->maximumQps;
-  }
-  public function setRegion($region)
-  {
-    $this->region = $region;
-  }
-  public function getRegion()
-  {
-    return $this->region;
-  }
-  public function setUrl($url)
-  {
-    $this->url = $url;
-  }
-  public function getUrl()
-  {
-    return $this->url;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdExchangeBuyer/AccountsList.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdExchangeBuyer/AccountsList.php
deleted file mode 100644
index 96635b14..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdExchangeBuyer/AccountsList.php
+++ /dev/null
@@ -1,41 +0,0 @@
-items = $items;
-  }
-  public function getItems()
-  {
-    return $this->items;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdExchangeBuyer/AddOrderDealsRequest.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdExchangeBuyer/AddOrderDealsRequest.php
deleted file mode 100644
index 9d39b447..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdExchangeBuyer/AddOrderDealsRequest.php
+++ /dev/null
@@ -1,50 +0,0 @@
-deals = $deals;
-  }
-  public function getDeals()
-  {
-    return $this->deals;
-  }
-  public function setProposalRevisionNumber($proposalRevisionNumber)
-  {
-    $this->proposalRevisionNumber = $proposalRevisionNumber;
-  }
-  public function getProposalRevisionNumber()
-  {
-    return $this->proposalRevisionNumber;
-  }
-  public function setUpdateAction($updateAction)
-  {
-    $this->updateAction = $updateAction;
-  }
-  public function getUpdateAction()
-  {
-    return $this->updateAction;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdExchangeBuyer/AddOrderDealsResponse.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdExchangeBuyer/AddOrderDealsResponse.php
deleted file mode 100644
index 6e2e56ae..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdExchangeBuyer/AddOrderDealsResponse.php
+++ /dev/null
@@ -1,41 +0,0 @@
-deals = $deals;
-  }
-  public function getDeals()
-  {
-    return $this->deals;
-  }
-  public function setProposalRevisionNumber($proposalRevisionNumber)
-  {
-    $this->proposalRevisionNumber = $proposalRevisionNumber;
-  }
-  public function getProposalRevisionNumber()
-  {
-    return $this->proposalRevisionNumber;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdExchangeBuyer/AddOrderNotesRequest.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdExchangeBuyer/AddOrderNotesRequest.php
deleted file mode 100644
index 1f05dcbf..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdExchangeBuyer/AddOrderNotesRequest.php
+++ /dev/null
@@ -1,32 +0,0 @@
-notes = $notes;
-  }
-  public function getNotes()
-  {
-    return $this->notes;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdExchangeBuyer/AddOrderNotesResponse.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdExchangeBuyer/AddOrderNotesResponse.php
deleted file mode 100644
index d33cd505..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdExchangeBuyer/AddOrderNotesResponse.php
+++ /dev/null
@@ -1,32 +0,0 @@
-notes = $notes;
-  }
-  public function getNotes()
-  {
-    return $this->notes;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdExchangeBuyer/BillingInfo.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdExchangeBuyer/BillingInfo.php
deleted file mode 100644
index 5265205d..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdExchangeBuyer/BillingInfo.php
+++ /dev/null
@@ -1,58 +0,0 @@
-accountId = $accountId;
-  }
-  public function getAccountId()
-  {
-    return $this->accountId;
-  }
-  public function setAccountName($accountName)
-  {
-    $this->accountName = $accountName;
-  }
-  public function getAccountName()
-  {
-    return $this->accountName;
-  }
-  public function setBillingId($billingId)
-  {
-    $this->billingId = $billingId;
-  }
-  public function getBillingId()
-  {
-    return $this->billingId;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdExchangeBuyer/BillingInfoList.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdExchangeBuyer/BillingInfoList.php
deleted file mode 100644
index 0ebd96e5..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdExchangeBuyer/BillingInfoList.php
+++ /dev/null
@@ -1,41 +0,0 @@
-items = $items;
-  }
-  public function getItems()
-  {
-    return $this->items;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdExchangeBuyer/Budget.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdExchangeBuyer/Budget.php
deleted file mode 100644
index 339e36e5..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdExchangeBuyer/Budget.php
+++ /dev/null
@@ -1,75 +0,0 @@
-accountId = $accountId;
-  }
-  public function getAccountId()
-  {
-    return $this->accountId;
-  }
-  public function setBillingId($billingId)
-  {
-    $this->billingId = $billingId;
-  }
-  public function getBillingId()
-  {
-    return $this->billingId;
-  }
-  public function setBudgetAmount($budgetAmount)
-  {
-    $this->budgetAmount = $budgetAmount;
-  }
-  public function getBudgetAmount()
-  {
-    return $this->budgetAmount;
-  }
-  public function setCurrencyCode($currencyCode)
-  {
-    $this->currencyCode = $currencyCode;
-  }
-  public function getCurrencyCode()
-  {
-    return $this->currencyCode;
-  }
-  public function setId($id)
-  {
-    $this->id = $id;
-  }
-  public function getId()
-  {
-    return $this->id;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdExchangeBuyer/Buyer.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdExchangeBuyer/Buyer.php
deleted file mode 100644
index f5b79f56..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdExchangeBuyer/Buyer.php
+++ /dev/null
@@ -1,30 +0,0 @@
-accountId = $accountId;
-  }
-  public function getAccountId()
-  {
-    return $this->accountId;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdExchangeBuyer/ContactInformation.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdExchangeBuyer/ContactInformation.php
deleted file mode 100644
index 55de2d18..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdExchangeBuyer/ContactInformation.php
+++ /dev/null
@@ -1,39 +0,0 @@
-email = $email;
-  }
-  public function getEmail()
-  {
-    return $this->email;
-  }
-  public function setName($name)
-  {
-    $this->name = $name;
-  }
-  public function getName()
-  {
-    return $this->name;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdExchangeBuyer/CreateOrdersRequest.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdExchangeBuyer/CreateOrdersRequest.php
deleted file mode 100644
index e8203657..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdExchangeBuyer/CreateOrdersRequest.php
+++ /dev/null
@@ -1,41 +0,0 @@
-proposals = $proposals;
-  }
-  public function getProposals()
-  {
-    return $this->proposals;
-  }
-  public function setWebPropertyCode($webPropertyCode)
-  {
-    $this->webPropertyCode = $webPropertyCode;
-  }
-  public function getWebPropertyCode()
-  {
-    return $this->webPropertyCode;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdExchangeBuyer/CreateOrdersResponse.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdExchangeBuyer/CreateOrdersResponse.php
deleted file mode 100644
index a617afbc..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdExchangeBuyer/CreateOrdersResponse.php
+++ /dev/null
@@ -1,32 +0,0 @@
-proposals = $proposals;
-  }
-  public function getProposals()
-  {
-    return $this->proposals;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdExchangeBuyer/Creative.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdExchangeBuyer/Creative.php
deleted file mode 100644
index 376cd3f9..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdExchangeBuyer/Creative.php
+++ /dev/null
@@ -1,281 +0,0 @@
- "HTMLSnippet",
-  );
-  public $hTMLSnippet;
-  public $accountId;
-  public $adChoicesDestinationUrl;
-  public $advertiserId;
-  public $advertiserName;
-  public $agencyId;
-  public $apiUploadTimestamp;
-  public $attribute;
-  public $buyerCreativeId;
-  public $clickThroughUrl;
-  protected $correctionsType = 'Google_Service_AdExchangeBuyer_CreativeCorrections';
-  protected $correctionsDataType = 'array';
-  public $dealsStatus;
-  public $detectedDomains;
-  protected $filteringReasonsType = 'Google_Service_AdExchangeBuyer_CreativeFilteringReasons';
-  protected $filteringReasonsDataType = '';
-  public $height;
-  public $impressionTrackingUrl;
-  public $kind;
-  public $languages;
-  protected $nativeAdType = 'Google_Service_AdExchangeBuyer_CreativeNativeAd';
-  protected $nativeAdDataType = '';
-  public $openAuctionStatus;
-  public $productCategories;
-  public $restrictedCategories;
-  public $sensitiveCategories;
-  protected $servingRestrictionsType = 'Google_Service_AdExchangeBuyer_CreativeServingRestrictions';
-  protected $servingRestrictionsDataType = 'array';
-  public $vendorType;
-  public $version;
-  public $videoURL;
-  public $width;
-
-  public function setHTMLSnippet($hTMLSnippet)
-  {
-    $this->hTMLSnippet = $hTMLSnippet;
-  }
-  public function getHTMLSnippet()
-  {
-    return $this->hTMLSnippet;
-  }
-  public function setAccountId($accountId)
-  {
-    $this->accountId = $accountId;
-  }
-  public function getAccountId()
-  {
-    return $this->accountId;
-  }
-  public function setAdChoicesDestinationUrl($adChoicesDestinationUrl)
-  {
-    $this->adChoicesDestinationUrl = $adChoicesDestinationUrl;
-  }
-  public function getAdChoicesDestinationUrl()
-  {
-    return $this->adChoicesDestinationUrl;
-  }
-  public function setAdvertiserId($advertiserId)
-  {
-    $this->advertiserId = $advertiserId;
-  }
-  public function getAdvertiserId()
-  {
-    return $this->advertiserId;
-  }
-  public function setAdvertiserName($advertiserName)
-  {
-    $this->advertiserName = $advertiserName;
-  }
-  public function getAdvertiserName()
-  {
-    return $this->advertiserName;
-  }
-  public function setAgencyId($agencyId)
-  {
-    $this->agencyId = $agencyId;
-  }
-  public function getAgencyId()
-  {
-    return $this->agencyId;
-  }
-  public function setApiUploadTimestamp($apiUploadTimestamp)
-  {
-    $this->apiUploadTimestamp = $apiUploadTimestamp;
-  }
-  public function getApiUploadTimestamp()
-  {
-    return $this->apiUploadTimestamp;
-  }
-  public function setAttribute($attribute)
-  {
-    $this->attribute = $attribute;
-  }
-  public function getAttribute()
-  {
-    return $this->attribute;
-  }
-  public function setBuyerCreativeId($buyerCreativeId)
-  {
-    $this->buyerCreativeId = $buyerCreativeId;
-  }
-  public function getBuyerCreativeId()
-  {
-    return $this->buyerCreativeId;
-  }
-  public function setClickThroughUrl($clickThroughUrl)
-  {
-    $this->clickThroughUrl = $clickThroughUrl;
-  }
-  public function getClickThroughUrl()
-  {
-    return $this->clickThroughUrl;
-  }
-  public function setCorrections($corrections)
-  {
-    $this->corrections = $corrections;
-  }
-  public function getCorrections()
-  {
-    return $this->corrections;
-  }
-  public function setDealsStatus($dealsStatus)
-  {
-    $this->dealsStatus = $dealsStatus;
-  }
-  public function getDealsStatus()
-  {
-    return $this->dealsStatus;
-  }
-  public function setDetectedDomains($detectedDomains)
-  {
-    $this->detectedDomains = $detectedDomains;
-  }
-  public function getDetectedDomains()
-  {
-    return $this->detectedDomains;
-  }
-  public function setFilteringReasons(Google_Service_AdExchangeBuyer_CreativeFilteringReasons $filteringReasons)
-  {
-    $this->filteringReasons = $filteringReasons;
-  }
-  public function getFilteringReasons()
-  {
-    return $this->filteringReasons;
-  }
-  public function setHeight($height)
-  {
-    $this->height = $height;
-  }
-  public function getHeight()
-  {
-    return $this->height;
-  }
-  public function setImpressionTrackingUrl($impressionTrackingUrl)
-  {
-    $this->impressionTrackingUrl = $impressionTrackingUrl;
-  }
-  public function getImpressionTrackingUrl()
-  {
-    return $this->impressionTrackingUrl;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setLanguages($languages)
-  {
-    $this->languages = $languages;
-  }
-  public function getLanguages()
-  {
-    return $this->languages;
-  }
-  public function setNativeAd(Google_Service_AdExchangeBuyer_CreativeNativeAd $nativeAd)
-  {
-    $this->nativeAd = $nativeAd;
-  }
-  public function getNativeAd()
-  {
-    return $this->nativeAd;
-  }
-  public function setOpenAuctionStatus($openAuctionStatus)
-  {
-    $this->openAuctionStatus = $openAuctionStatus;
-  }
-  public function getOpenAuctionStatus()
-  {
-    return $this->openAuctionStatus;
-  }
-  public function setProductCategories($productCategories)
-  {
-    $this->productCategories = $productCategories;
-  }
-  public function getProductCategories()
-  {
-    return $this->productCategories;
-  }
-  public function setRestrictedCategories($restrictedCategories)
-  {
-    $this->restrictedCategories = $restrictedCategories;
-  }
-  public function getRestrictedCategories()
-  {
-    return $this->restrictedCategories;
-  }
-  public function setSensitiveCategories($sensitiveCategories)
-  {
-    $this->sensitiveCategories = $sensitiveCategories;
-  }
-  public function getSensitiveCategories()
-  {
-    return $this->sensitiveCategories;
-  }
-  public function setServingRestrictions($servingRestrictions)
-  {
-    $this->servingRestrictions = $servingRestrictions;
-  }
-  public function getServingRestrictions()
-  {
-    return $this->servingRestrictions;
-  }
-  public function setVendorType($vendorType)
-  {
-    $this->vendorType = $vendorType;
-  }
-  public function getVendorType()
-  {
-    return $this->vendorType;
-  }
-  public function setVersion($version)
-  {
-    $this->version = $version;
-  }
-  public function getVersion()
-  {
-    return $this->version;
-  }
-  public function setVideoURL($videoURL)
-  {
-    $this->videoURL = $videoURL;
-  }
-  public function getVideoURL()
-  {
-    return $this->videoURL;
-  }
-  public function setWidth($width)
-  {
-    $this->width = $width;
-  }
-  public function getWidth()
-  {
-    return $this->width;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdExchangeBuyer/CreativeCorrections.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdExchangeBuyer/CreativeCorrections.php
deleted file mode 100644
index 0ac14a05..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdExchangeBuyer/CreativeCorrections.php
+++ /dev/null
@@ -1,50 +0,0 @@
-contexts = $contexts;
-  }
-  public function getContexts()
-  {
-    return $this->contexts;
-  }
-  public function setDetails($details)
-  {
-    $this->details = $details;
-  }
-  public function getDetails()
-  {
-    return $this->details;
-  }
-  public function setReason($reason)
-  {
-    $this->reason = $reason;
-  }
-  public function getReason()
-  {
-    return $this->reason;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdExchangeBuyer/CreativeCorrectionsContexts.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdExchangeBuyer/CreativeCorrectionsContexts.php
deleted file mode 100644
index 3fc726cd..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdExchangeBuyer/CreativeCorrectionsContexts.php
+++ /dev/null
@@ -1,58 +0,0 @@
-auctionType = $auctionType;
-  }
-  public function getAuctionType()
-  {
-    return $this->auctionType;
-  }
-  public function setContextType($contextType)
-  {
-    $this->contextType = $contextType;
-  }
-  public function getContextType()
-  {
-    return $this->contextType;
-  }
-  public function setGeoCriteriaId($geoCriteriaId)
-  {
-    $this->geoCriteriaId = $geoCriteriaId;
-  }
-  public function getGeoCriteriaId()
-  {
-    return $this->geoCriteriaId;
-  }
-  public function setPlatform($platform)
-  {
-    $this->platform = $platform;
-  }
-  public function getPlatform()
-  {
-    return $this->platform;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdExchangeBuyer/CreativeDealIds.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdExchangeBuyer/CreativeDealIds.php
deleted file mode 100644
index 59136bf6..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdExchangeBuyer/CreativeDealIds.php
+++ /dev/null
@@ -1,41 +0,0 @@
-dealStatuses = $dealStatuses;
-  }
-  public function getDealStatuses()
-  {
-    return $this->dealStatuses;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdExchangeBuyer/CreativeDealIdsDealStatuses.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdExchangeBuyer/CreativeDealIdsDealStatuses.php
deleted file mode 100644
index 62759046..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdExchangeBuyer/CreativeDealIdsDealStatuses.php
+++ /dev/null
@@ -1,48 +0,0 @@
-arcStatus = $arcStatus;
-  }
-  public function getArcStatus()
-  {
-    return $this->arcStatus;
-  }
-  public function setDealId($dealId)
-  {
-    $this->dealId = $dealId;
-  }
-  public function getDealId()
-  {
-    return $this->dealId;
-  }
-  public function setWebPropertyId($webPropertyId)
-  {
-    $this->webPropertyId = $webPropertyId;
-  }
-  public function getWebPropertyId()
-  {
-    return $this->webPropertyId;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdExchangeBuyer/CreativeFilteringReasons.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdExchangeBuyer/CreativeFilteringReasons.php
deleted file mode 100644
index 6f7b281d..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdExchangeBuyer/CreativeFilteringReasons.php
+++ /dev/null
@@ -1,41 +0,0 @@
-date = $date;
-  }
-  public function getDate()
-  {
-    return $this->date;
-  }
-  public function setReasons($reasons)
-  {
-    $this->reasons = $reasons;
-  }
-  public function getReasons()
-  {
-    return $this->reasons;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdExchangeBuyer/CreativeFilteringReasonsReasons.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdExchangeBuyer/CreativeFilteringReasonsReasons.php
deleted file mode 100644
index d40dfba6..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdExchangeBuyer/CreativeFilteringReasonsReasons.php
+++ /dev/null
@@ -1,39 +0,0 @@
-filteringCount = $filteringCount;
-  }
-  public function getFilteringCount()
-  {
-    return $this->filteringCount;
-  }
-  public function setFilteringStatus($filteringStatus)
-  {
-    $this->filteringStatus = $filteringStatus;
-  }
-  public function getFilteringStatus()
-  {
-    return $this->filteringStatus;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdExchangeBuyer/CreativeNativeAd.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdExchangeBuyer/CreativeNativeAd.php
deleted file mode 100644
index a4053823..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdExchangeBuyer/CreativeNativeAd.php
+++ /dev/null
@@ -1,151 +0,0 @@
-advertiser = $advertiser;
-  }
-  public function getAdvertiser()
-  {
-    return $this->advertiser;
-  }
-  public function setAppIcon(Google_Service_AdExchangeBuyer_CreativeNativeAdAppIcon $appIcon)
-  {
-    $this->appIcon = $appIcon;
-  }
-  public function getAppIcon()
-  {
-    return $this->appIcon;
-  }
-  public function setBody($body)
-  {
-    $this->body = $body;
-  }
-  public function getBody()
-  {
-    return $this->body;
-  }
-  public function setCallToAction($callToAction)
-  {
-    $this->callToAction = $callToAction;
-  }
-  public function getCallToAction()
-  {
-    return $this->callToAction;
-  }
-  public function setClickLinkUrl($clickLinkUrl)
-  {
-    $this->clickLinkUrl = $clickLinkUrl;
-  }
-  public function getClickLinkUrl()
-  {
-    return $this->clickLinkUrl;
-  }
-  public function setClickTrackingUrl($clickTrackingUrl)
-  {
-    $this->clickTrackingUrl = $clickTrackingUrl;
-  }
-  public function getClickTrackingUrl()
-  {
-    return $this->clickTrackingUrl;
-  }
-  public function setHeadline($headline)
-  {
-    $this->headline = $headline;
-  }
-  public function getHeadline()
-  {
-    return $this->headline;
-  }
-  public function setImage(Google_Service_AdExchangeBuyer_CreativeNativeAdImage $image)
-  {
-    $this->image = $image;
-  }
-  public function getImage()
-  {
-    return $this->image;
-  }
-  public function setImpressionTrackingUrl($impressionTrackingUrl)
-  {
-    $this->impressionTrackingUrl = $impressionTrackingUrl;
-  }
-  public function getImpressionTrackingUrl()
-  {
-    return $this->impressionTrackingUrl;
-  }
-  public function setLogo(Google_Service_AdExchangeBuyer_CreativeNativeAdLogo $logo)
-  {
-    $this->logo = $logo;
-  }
-  public function getLogo()
-  {
-    return $this->logo;
-  }
-  public function setPrice($price)
-  {
-    $this->price = $price;
-  }
-  public function getPrice()
-  {
-    return $this->price;
-  }
-  public function setStarRating($starRating)
-  {
-    $this->starRating = $starRating;
-  }
-  public function getStarRating()
-  {
-    return $this->starRating;
-  }
-  public function setStore($store)
-  {
-    $this->store = $store;
-  }
-  public function getStore()
-  {
-    return $this->store;
-  }
-  public function setVideoURL($videoURL)
-  {
-    $this->videoURL = $videoURL;
-  }
-  public function getVideoURL()
-  {
-    return $this->videoURL;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdExchangeBuyer/CreativeNativeAdAppIcon.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdExchangeBuyer/CreativeNativeAdAppIcon.php
deleted file mode 100644
index 54192165..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdExchangeBuyer/CreativeNativeAdAppIcon.php
+++ /dev/null
@@ -1,48 +0,0 @@
-height = $height;
-  }
-  public function getHeight()
-  {
-    return $this->height;
-  }
-  public function setUrl($url)
-  {
-    $this->url = $url;
-  }
-  public function getUrl()
-  {
-    return $this->url;
-  }
-  public function setWidth($width)
-  {
-    $this->width = $width;
-  }
-  public function getWidth()
-  {
-    return $this->width;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdExchangeBuyer/CreativeNativeAdImage.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdExchangeBuyer/CreativeNativeAdImage.php
deleted file mode 100644
index c5db1c2a..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdExchangeBuyer/CreativeNativeAdImage.php
+++ /dev/null
@@ -1,48 +0,0 @@
-height = $height;
-  }
-  public function getHeight()
-  {
-    return $this->height;
-  }
-  public function setUrl($url)
-  {
-    $this->url = $url;
-  }
-  public function getUrl()
-  {
-    return $this->url;
-  }
-  public function setWidth($width)
-  {
-    $this->width = $width;
-  }
-  public function getWidth()
-  {
-    return $this->width;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdExchangeBuyer/CreativeNativeAdLogo.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdExchangeBuyer/CreativeNativeAdLogo.php
deleted file mode 100644
index 658230c9..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdExchangeBuyer/CreativeNativeAdLogo.php
+++ /dev/null
@@ -1,48 +0,0 @@
-height = $height;
-  }
-  public function getHeight()
-  {
-    return $this->height;
-  }
-  public function setUrl($url)
-  {
-    $this->url = $url;
-  }
-  public function getUrl()
-  {
-    return $this->url;
-  }
-  public function setWidth($width)
-  {
-    $this->width = $width;
-  }
-  public function getWidth()
-  {
-    return $this->width;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdExchangeBuyer/CreativeServingRestrictions.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdExchangeBuyer/CreativeServingRestrictions.php
deleted file mode 100644
index 0c508036..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdExchangeBuyer/CreativeServingRestrictions.php
+++ /dev/null
@@ -1,51 +0,0 @@
-contexts = $contexts;
-  }
-  public function getContexts()
-  {
-    return $this->contexts;
-  }
-  public function setDisapprovalReasons($disapprovalReasons)
-  {
-    $this->disapprovalReasons = $disapprovalReasons;
-  }
-  public function getDisapprovalReasons()
-  {
-    return $this->disapprovalReasons;
-  }
-  public function setReason($reason)
-  {
-    $this->reason = $reason;
-  }
-  public function getReason()
-  {
-    return $this->reason;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdExchangeBuyer/CreativeServingRestrictionsContexts.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdExchangeBuyer/CreativeServingRestrictionsContexts.php
deleted file mode 100644
index c236e5a4..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdExchangeBuyer/CreativeServingRestrictionsContexts.php
+++ /dev/null
@@ -1,58 +0,0 @@
-auctionType = $auctionType;
-  }
-  public function getAuctionType()
-  {
-    return $this->auctionType;
-  }
-  public function setContextType($contextType)
-  {
-    $this->contextType = $contextType;
-  }
-  public function getContextType()
-  {
-    return $this->contextType;
-  }
-  public function setGeoCriteriaId($geoCriteriaId)
-  {
-    $this->geoCriteriaId = $geoCriteriaId;
-  }
-  public function getGeoCriteriaId()
-  {
-    return $this->geoCriteriaId;
-  }
-  public function setPlatform($platform)
-  {
-    $this->platform = $platform;
-  }
-  public function getPlatform()
-  {
-    return $this->platform;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdExchangeBuyer/CreativeServingRestrictionsDisapprovalReasons.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdExchangeBuyer/CreativeServingRestrictionsDisapprovalReasons.php
deleted file mode 100644
index f10255f1..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdExchangeBuyer/CreativeServingRestrictionsDisapprovalReasons.php
+++ /dev/null
@@ -1,40 +0,0 @@
-details = $details;
-  }
-  public function getDetails()
-  {
-    return $this->details;
-  }
-  public function setReason($reason)
-  {
-    $this->reason = $reason;
-  }
-  public function getReason()
-  {
-    return $this->reason;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdExchangeBuyer/CreativesList.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdExchangeBuyer/CreativesList.php
deleted file mode 100644
index 65200632..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdExchangeBuyer/CreativesList.php
+++ /dev/null
@@ -1,50 +0,0 @@
-items = $items;
-  }
-  public function getItems()
-  {
-    return $this->items;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setNextPageToken($nextPageToken)
-  {
-    $this->nextPageToken = $nextPageToken;
-  }
-  public function getNextPageToken()
-  {
-    return $this->nextPageToken;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdExchangeBuyer/DealServingMetadata.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdExchangeBuyer/DealServingMetadata.php
deleted file mode 100644
index fac51dfc..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdExchangeBuyer/DealServingMetadata.php
+++ /dev/null
@@ -1,40 +0,0 @@
-alcoholAdsAllowed = $alcoholAdsAllowed;
-  }
-  public function getAlcoholAdsAllowed()
-  {
-    return $this->alcoholAdsAllowed;
-  }
-  public function setDealPauseStatus(Google_Service_AdExchangeBuyer_DealServingMetadataDealPauseStatus $dealPauseStatus)
-  {
-    $this->dealPauseStatus = $dealPauseStatus;
-  }
-  public function getDealPauseStatus()
-  {
-    return $this->dealPauseStatus;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdExchangeBuyer/DealServingMetadataDealPauseStatus.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdExchangeBuyer/DealServingMetadataDealPauseStatus.php
deleted file mode 100644
index 17da50be..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdExchangeBuyer/DealServingMetadataDealPauseStatus.php
+++ /dev/null
@@ -1,66 +0,0 @@
-buyerPauseReason = $buyerPauseReason;
-  }
-  public function getBuyerPauseReason()
-  {
-    return $this->buyerPauseReason;
-  }
-  public function setFirstPausedBy($firstPausedBy)
-  {
-    $this->firstPausedBy = $firstPausedBy;
-  }
-  public function getFirstPausedBy()
-  {
-    return $this->firstPausedBy;
-  }
-  public function setHasBuyerPaused($hasBuyerPaused)
-  {
-    $this->hasBuyerPaused = $hasBuyerPaused;
-  }
-  public function getHasBuyerPaused()
-  {
-    return $this->hasBuyerPaused;
-  }
-  public function setHasSellerPaused($hasSellerPaused)
-  {
-    $this->hasSellerPaused = $hasSellerPaused;
-  }
-  public function getHasSellerPaused()
-  {
-    return $this->hasSellerPaused;
-  }
-  public function setSellerPauseReason($sellerPauseReason)
-  {
-    $this->sellerPauseReason = $sellerPauseReason;
-  }
-  public function getSellerPauseReason()
-  {
-    return $this->sellerPauseReason;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdExchangeBuyer/DealTerms.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdExchangeBuyer/DealTerms.php
deleted file mode 100644
index 2fd7039a..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdExchangeBuyer/DealTerms.php
+++ /dev/null
@@ -1,116 +0,0 @@
-brandingType = $brandingType;
-  }
-  public function getBrandingType()
-  {
-    return $this->brandingType;
-  }
-  public function setCrossListedExternalDealIdType($crossListedExternalDealIdType)
-  {
-    $this->crossListedExternalDealIdType = $crossListedExternalDealIdType;
-  }
-  public function getCrossListedExternalDealIdType()
-  {
-    return $this->crossListedExternalDealIdType;
-  }
-  public function setDescription($description)
-  {
-    $this->description = $description;
-  }
-  public function getDescription()
-  {
-    return $this->description;
-  }
-  public function setEstimatedGrossSpend(Google_Service_AdExchangeBuyer_Price $estimatedGrossSpend)
-  {
-    $this->estimatedGrossSpend = $estimatedGrossSpend;
-  }
-  public function getEstimatedGrossSpend()
-  {
-    return $this->estimatedGrossSpend;
-  }
-  public function setEstimatedImpressionsPerDay($estimatedImpressionsPerDay)
-  {
-    $this->estimatedImpressionsPerDay = $estimatedImpressionsPerDay;
-  }
-  public function getEstimatedImpressionsPerDay()
-  {
-    return $this->estimatedImpressionsPerDay;
-  }
-  public function setGuaranteedFixedPriceTerms(Google_Service_AdExchangeBuyer_DealTermsGuaranteedFixedPriceTerms $guaranteedFixedPriceTerms)
-  {
-    $this->guaranteedFixedPriceTerms = $guaranteedFixedPriceTerms;
-  }
-  public function getGuaranteedFixedPriceTerms()
-  {
-    return $this->guaranteedFixedPriceTerms;
-  }
-  public function setNonGuaranteedAuctionTerms(Google_Service_AdExchangeBuyer_DealTermsNonGuaranteedAuctionTerms $nonGuaranteedAuctionTerms)
-  {
-    $this->nonGuaranteedAuctionTerms = $nonGuaranteedAuctionTerms;
-  }
-  public function getNonGuaranteedAuctionTerms()
-  {
-    return $this->nonGuaranteedAuctionTerms;
-  }
-  public function setNonGuaranteedFixedPriceTerms(Google_Service_AdExchangeBuyer_DealTermsNonGuaranteedFixedPriceTerms $nonGuaranteedFixedPriceTerms)
-  {
-    $this->nonGuaranteedFixedPriceTerms = $nonGuaranteedFixedPriceTerms;
-  }
-  public function getNonGuaranteedFixedPriceTerms()
-  {
-    return $this->nonGuaranteedFixedPriceTerms;
-  }
-  public function setRubiconNonGuaranteedTerms(Google_Service_AdExchangeBuyer_DealTermsRubiconNonGuaranteedTerms $rubiconNonGuaranteedTerms)
-  {
-    $this->rubiconNonGuaranteedTerms = $rubiconNonGuaranteedTerms;
-  }
-  public function getRubiconNonGuaranteedTerms()
-  {
-    return $this->rubiconNonGuaranteedTerms;
-  }
-  public function setSellerTimeZone($sellerTimeZone)
-  {
-    $this->sellerTimeZone = $sellerTimeZone;
-  }
-  public function getSellerTimeZone()
-  {
-    return $this->sellerTimeZone;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdExchangeBuyer/DealTermsGuaranteedFixedPriceTerms.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdExchangeBuyer/DealTermsGuaranteedFixedPriceTerms.php
deleted file mode 100644
index 44d1c474..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdExchangeBuyer/DealTermsGuaranteedFixedPriceTerms.php
+++ /dev/null
@@ -1,69 +0,0 @@
-billingInfo = $billingInfo;
-  }
-  public function getBillingInfo()
-  {
-    return $this->billingInfo;
-  }
-  public function setFixedPrices($fixedPrices)
-  {
-    $this->fixedPrices = $fixedPrices;
-  }
-  public function getFixedPrices()
-  {
-    return $this->fixedPrices;
-  }
-  public function setGuaranteedImpressions($guaranteedImpressions)
-  {
-    $this->guaranteedImpressions = $guaranteedImpressions;
-  }
-  public function getGuaranteedImpressions()
-  {
-    return $this->guaranteedImpressions;
-  }
-  public function setGuaranteedLooks($guaranteedLooks)
-  {
-    $this->guaranteedLooks = $guaranteedLooks;
-  }
-  public function getGuaranteedLooks()
-  {
-    return $this->guaranteedLooks;
-  }
-  public function setMinimumDailyLooks($minimumDailyLooks)
-  {
-    $this->minimumDailyLooks = $minimumDailyLooks;
-  }
-  public function getMinimumDailyLooks()
-  {
-    return $this->minimumDailyLooks;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdExchangeBuyer/DealTermsGuaranteedFixedPriceTermsBillingInfo.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdExchangeBuyer/DealTermsGuaranteedFixedPriceTermsBillingInfo.php
deleted file mode 100644
index 800389e2..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdExchangeBuyer/DealTermsGuaranteedFixedPriceTermsBillingInfo.php
+++ /dev/null
@@ -1,58 +0,0 @@
-currencyConversionTimeMs = $currencyConversionTimeMs;
-  }
-  public function getCurrencyConversionTimeMs()
-  {
-    return $this->currencyConversionTimeMs;
-  }
-  public function setDfpLineItemId($dfpLineItemId)
-  {
-    $this->dfpLineItemId = $dfpLineItemId;
-  }
-  public function getDfpLineItemId()
-  {
-    return $this->dfpLineItemId;
-  }
-  public function setOriginalContractedQuantity($originalContractedQuantity)
-  {
-    $this->originalContractedQuantity = $originalContractedQuantity;
-  }
-  public function getOriginalContractedQuantity()
-  {
-    return $this->originalContractedQuantity;
-  }
-  public function setPrice(Google_Service_AdExchangeBuyer_Price $price)
-  {
-    $this->price = $price;
-  }
-  public function getPrice()
-  {
-    return $this->price;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdExchangeBuyer/DealTermsNonGuaranteedAuctionTerms.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdExchangeBuyer/DealTermsNonGuaranteedAuctionTerms.php
deleted file mode 100644
index c1d3b9c6..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdExchangeBuyer/DealTermsNonGuaranteedAuctionTerms.php
+++ /dev/null
@@ -1,41 +0,0 @@
-autoOptimizePrivateAuction = $autoOptimizePrivateAuction;
-  }
-  public function getAutoOptimizePrivateAuction()
-  {
-    return $this->autoOptimizePrivateAuction;
-  }
-  public function setReservePricePerBuyers($reservePricePerBuyers)
-  {
-    $this->reservePricePerBuyers = $reservePricePerBuyers;
-  }
-  public function getReservePricePerBuyers()
-  {
-    return $this->reservePricePerBuyers;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdExchangeBuyer/DealTermsNonGuaranteedFixedPriceTerms.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdExchangeBuyer/DealTermsNonGuaranteedFixedPriceTerms.php
deleted file mode 100644
index 2cc74947..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdExchangeBuyer/DealTermsNonGuaranteedFixedPriceTerms.php
+++ /dev/null
@@ -1,32 +0,0 @@
-fixedPrices = $fixedPrices;
-  }
-  public function getFixedPrices()
-  {
-    return $this->fixedPrices;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdExchangeBuyer/DealTermsRubiconNonGuaranteedTerms.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdExchangeBuyer/DealTermsRubiconNonGuaranteedTerms.php
deleted file mode 100644
index 4f71b442..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdExchangeBuyer/DealTermsRubiconNonGuaranteedTerms.php
+++ /dev/null
@@ -1,41 +0,0 @@
-priorityPrice = $priorityPrice;
-  }
-  public function getPriorityPrice()
-  {
-    return $this->priorityPrice;
-  }
-  public function setStandardPrice(Google_Service_AdExchangeBuyer_Price $standardPrice)
-  {
-    $this->standardPrice = $standardPrice;
-  }
-  public function getStandardPrice()
-  {
-    return $this->standardPrice;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdExchangeBuyer/DeleteOrderDealsRequest.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdExchangeBuyer/DeleteOrderDealsRequest.php
deleted file mode 100644
index 0ad62aaa..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdExchangeBuyer/DeleteOrderDealsRequest.php
+++ /dev/null
@@ -1,49 +0,0 @@
-dealIds = $dealIds;
-  }
-  public function getDealIds()
-  {
-    return $this->dealIds;
-  }
-  public function setProposalRevisionNumber($proposalRevisionNumber)
-  {
-    $this->proposalRevisionNumber = $proposalRevisionNumber;
-  }
-  public function getProposalRevisionNumber()
-  {
-    return $this->proposalRevisionNumber;
-  }
-  public function setUpdateAction($updateAction)
-  {
-    $this->updateAction = $updateAction;
-  }
-  public function getUpdateAction()
-  {
-    return $this->updateAction;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdExchangeBuyer/DeleteOrderDealsResponse.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdExchangeBuyer/DeleteOrderDealsResponse.php
deleted file mode 100644
index 004de993..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdExchangeBuyer/DeleteOrderDealsResponse.php
+++ /dev/null
@@ -1,41 +0,0 @@
-deals = $deals;
-  }
-  public function getDeals()
-  {
-    return $this->deals;
-  }
-  public function setProposalRevisionNumber($proposalRevisionNumber)
-  {
-    $this->proposalRevisionNumber = $proposalRevisionNumber;
-  }
-  public function getProposalRevisionNumber()
-  {
-    return $this->proposalRevisionNumber;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdExchangeBuyer/DeliveryControl.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdExchangeBuyer/DeliveryControl.php
deleted file mode 100644
index 0dc9e33b..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdExchangeBuyer/DeliveryControl.php
+++ /dev/null
@@ -1,50 +0,0 @@
-creativeBlockingLevel = $creativeBlockingLevel;
-  }
-  public function getCreativeBlockingLevel()
-  {
-    return $this->creativeBlockingLevel;
-  }
-  public function setDeliveryRateType($deliveryRateType)
-  {
-    $this->deliveryRateType = $deliveryRateType;
-  }
-  public function getDeliveryRateType()
-  {
-    return $this->deliveryRateType;
-  }
-  public function setFrequencyCaps($frequencyCaps)
-  {
-    $this->frequencyCaps = $frequencyCaps;
-  }
-  public function getFrequencyCaps()
-  {
-    return $this->frequencyCaps;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdExchangeBuyer/DeliveryControlFrequencyCap.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdExchangeBuyer/DeliveryControlFrequencyCap.php
deleted file mode 100644
index 5f07de48..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdExchangeBuyer/DeliveryControlFrequencyCap.php
+++ /dev/null
@@ -1,48 +0,0 @@
-maxImpressions = $maxImpressions;
-  }
-  public function getMaxImpressions()
-  {
-    return $this->maxImpressions;
-  }
-  public function setNumTimeUnits($numTimeUnits)
-  {
-    $this->numTimeUnits = $numTimeUnits;
-  }
-  public function getNumTimeUnits()
-  {
-    return $this->numTimeUnits;
-  }
-  public function setTimeUnitType($timeUnitType)
-  {
-    $this->timeUnitType = $timeUnitType;
-  }
-  public function getTimeUnitType()
-  {
-    return $this->timeUnitType;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdExchangeBuyer/Dimension.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdExchangeBuyer/Dimension.php
deleted file mode 100644
index a3ebe40b..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdExchangeBuyer/Dimension.php
+++ /dev/null
@@ -1,41 +0,0 @@
-dimensionType = $dimensionType;
-  }
-  public function getDimensionType()
-  {
-    return $this->dimensionType;
-  }
-  public function setDimensionValues($dimensionValues)
-  {
-    $this->dimensionValues = $dimensionValues;
-  }
-  public function getDimensionValues()
-  {
-    return $this->dimensionValues;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdExchangeBuyer/DimensionDimensionValue.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdExchangeBuyer/DimensionDimensionValue.php
deleted file mode 100644
index b2d4a9a7..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdExchangeBuyer/DimensionDimensionValue.php
+++ /dev/null
@@ -1,48 +0,0 @@
-id = $id;
-  }
-  public function getId()
-  {
-    return $this->id;
-  }
-  public function setName($name)
-  {
-    $this->name = $name;
-  }
-  public function getName()
-  {
-    return $this->name;
-  }
-  public function setPercentage($percentage)
-  {
-    $this->percentage = $percentage;
-  }
-  public function getPercentage()
-  {
-    return $this->percentage;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdExchangeBuyer/EditAllOrderDealsRequest.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdExchangeBuyer/EditAllOrderDealsRequest.php
deleted file mode 100644
index f4584ad4..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdExchangeBuyer/EditAllOrderDealsRequest.php
+++ /dev/null
@@ -1,60 +0,0 @@
-deals = $deals;
-  }
-  public function getDeals()
-  {
-    return $this->deals;
-  }
-  public function setProposal(Google_Service_AdExchangeBuyer_Proposal $proposal)
-  {
-    $this->proposal = $proposal;
-  }
-  public function getProposal()
-  {
-    return $this->proposal;
-  }
-  public function setProposalRevisionNumber($proposalRevisionNumber)
-  {
-    $this->proposalRevisionNumber = $proposalRevisionNumber;
-  }
-  public function getProposalRevisionNumber()
-  {
-    return $this->proposalRevisionNumber;
-  }
-  public function setUpdateAction($updateAction)
-  {
-    $this->updateAction = $updateAction;
-  }
-  public function getUpdateAction()
-  {
-    return $this->updateAction;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdExchangeBuyer/EditAllOrderDealsResponse.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdExchangeBuyer/EditAllOrderDealsResponse.php
deleted file mode 100644
index 2a480ea5..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdExchangeBuyer/EditAllOrderDealsResponse.php
+++ /dev/null
@@ -1,41 +0,0 @@
-deals = $deals;
-  }
-  public function getDeals()
-  {
-    return $this->deals;
-  }
-  public function setOrderRevisionNumber($orderRevisionNumber)
-  {
-    $this->orderRevisionNumber = $orderRevisionNumber;
-  }
-  public function getOrderRevisionNumber()
-  {
-    return $this->orderRevisionNumber;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdExchangeBuyer/GetOffersResponse.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdExchangeBuyer/GetOffersResponse.php
deleted file mode 100644
index d7dd858b..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdExchangeBuyer/GetOffersResponse.php
+++ /dev/null
@@ -1,32 +0,0 @@
-products = $products;
-  }
-  public function getProducts()
-  {
-    return $this->products;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdExchangeBuyer/GetOrderDealsResponse.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdExchangeBuyer/GetOrderDealsResponse.php
deleted file mode 100644
index 7c1eee41..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdExchangeBuyer/GetOrderDealsResponse.php
+++ /dev/null
@@ -1,32 +0,0 @@
-deals = $deals;
-  }
-  public function getDeals()
-  {
-    return $this->deals;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdExchangeBuyer/GetOrderNotesResponse.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdExchangeBuyer/GetOrderNotesResponse.php
deleted file mode 100644
index a35f8ce8..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdExchangeBuyer/GetOrderNotesResponse.php
+++ /dev/null
@@ -1,32 +0,0 @@
-notes = $notes;
-  }
-  public function getNotes()
-  {
-    return $this->notes;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdExchangeBuyer/GetOrdersResponse.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdExchangeBuyer/GetOrdersResponse.php
deleted file mode 100644
index e6061634..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdExchangeBuyer/GetOrdersResponse.php
+++ /dev/null
@@ -1,32 +0,0 @@
-proposals = $proposals;
-  }
-  public function getProposals()
-  {
-    return $this->proposals;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdExchangeBuyer/GetPublisherProfilesByAccountIdResponse.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdExchangeBuyer/GetPublisherProfilesByAccountIdResponse.php
deleted file mode 100644
index bafbb851..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdExchangeBuyer/GetPublisherProfilesByAccountIdResponse.php
+++ /dev/null
@@ -1,32 +0,0 @@
-profiles = $profiles;
-  }
-  public function getProfiles()
-  {
-    return $this->profiles;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdExchangeBuyer/MarketplaceDeal.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdExchangeBuyer/MarketplaceDeal.php
deleted file mode 100644
index 9a03a16d..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdExchangeBuyer/MarketplaceDeal.php
+++ /dev/null
@@ -1,244 +0,0 @@
-buyerPrivateData = $buyerPrivateData;
-  }
-  public function getBuyerPrivateData()
-  {
-    return $this->buyerPrivateData;
-  }
-  public function setCreationTimeMs($creationTimeMs)
-  {
-    $this->creationTimeMs = $creationTimeMs;
-  }
-  public function getCreationTimeMs()
-  {
-    return $this->creationTimeMs;
-  }
-  public function setCreativePreApprovalPolicy($creativePreApprovalPolicy)
-  {
-    $this->creativePreApprovalPolicy = $creativePreApprovalPolicy;
-  }
-  public function getCreativePreApprovalPolicy()
-  {
-    return $this->creativePreApprovalPolicy;
-  }
-  public function setCreativeSafeFrameCompatibility($creativeSafeFrameCompatibility)
-  {
-    $this->creativeSafeFrameCompatibility = $creativeSafeFrameCompatibility;
-  }
-  public function getCreativeSafeFrameCompatibility()
-  {
-    return $this->creativeSafeFrameCompatibility;
-  }
-  public function setDealId($dealId)
-  {
-    $this->dealId = $dealId;
-  }
-  public function getDealId()
-  {
-    return $this->dealId;
-  }
-  public function setDealServingMetadata(Google_Service_AdExchangeBuyer_DealServingMetadata $dealServingMetadata)
-  {
-    $this->dealServingMetadata = $dealServingMetadata;
-  }
-  public function getDealServingMetadata()
-  {
-    return $this->dealServingMetadata;
-  }
-  public function setDeliveryControl(Google_Service_AdExchangeBuyer_DeliveryControl $deliveryControl)
-  {
-    $this->deliveryControl = $deliveryControl;
-  }
-  public function getDeliveryControl()
-  {
-    return $this->deliveryControl;
-  }
-  public function setExternalDealId($externalDealId)
-  {
-    $this->externalDealId = $externalDealId;
-  }
-  public function getExternalDealId()
-  {
-    return $this->externalDealId;
-  }
-  public function setFlightEndTimeMs($flightEndTimeMs)
-  {
-    $this->flightEndTimeMs = $flightEndTimeMs;
-  }
-  public function getFlightEndTimeMs()
-  {
-    return $this->flightEndTimeMs;
-  }
-  public function setFlightStartTimeMs($flightStartTimeMs)
-  {
-    $this->flightStartTimeMs = $flightStartTimeMs;
-  }
-  public function getFlightStartTimeMs()
-  {
-    return $this->flightStartTimeMs;
-  }
-  public function setInventoryDescription($inventoryDescription)
-  {
-    $this->inventoryDescription = $inventoryDescription;
-  }
-  public function getInventoryDescription()
-  {
-    return $this->inventoryDescription;
-  }
-  public function setIsRfpTemplate($isRfpTemplate)
-  {
-    $this->isRfpTemplate = $isRfpTemplate;
-  }
-  public function getIsRfpTemplate()
-  {
-    return $this->isRfpTemplate;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setLastUpdateTimeMs($lastUpdateTimeMs)
-  {
-    $this->lastUpdateTimeMs = $lastUpdateTimeMs;
-  }
-  public function getLastUpdateTimeMs()
-  {
-    return $this->lastUpdateTimeMs;
-  }
-  public function setName($name)
-  {
-    $this->name = $name;
-  }
-  public function getName()
-  {
-    return $this->name;
-  }
-  public function setProductId($productId)
-  {
-    $this->productId = $productId;
-  }
-  public function getProductId()
-  {
-    return $this->productId;
-  }
-  public function setProductRevisionNumber($productRevisionNumber)
-  {
-    $this->productRevisionNumber = $productRevisionNumber;
-  }
-  public function getProductRevisionNumber()
-  {
-    return $this->productRevisionNumber;
-  }
-  public function setProgrammaticCreativeSource($programmaticCreativeSource)
-  {
-    $this->programmaticCreativeSource = $programmaticCreativeSource;
-  }
-  public function getProgrammaticCreativeSource()
-  {
-    return $this->programmaticCreativeSource;
-  }
-  public function setProposalId($proposalId)
-  {
-    $this->proposalId = $proposalId;
-  }
-  public function getProposalId()
-  {
-    return $this->proposalId;
-  }
-  public function setSellerContacts($sellerContacts)
-  {
-    $this->sellerContacts = $sellerContacts;
-  }
-  public function getSellerContacts()
-  {
-    return $this->sellerContacts;
-  }
-  public function setSharedTargetings($sharedTargetings)
-  {
-    $this->sharedTargetings = $sharedTargetings;
-  }
-  public function getSharedTargetings()
-  {
-    return $this->sharedTargetings;
-  }
-  public function setSyndicationProduct($syndicationProduct)
-  {
-    $this->syndicationProduct = $syndicationProduct;
-  }
-  public function getSyndicationProduct()
-  {
-    return $this->syndicationProduct;
-  }
-  public function setTerms(Google_Service_AdExchangeBuyer_DealTerms $terms)
-  {
-    $this->terms = $terms;
-  }
-  public function getTerms()
-  {
-    return $this->terms;
-  }
-  public function setWebPropertyCode($webPropertyCode)
-  {
-    $this->webPropertyCode = $webPropertyCode;
-  }
-  public function getWebPropertyCode()
-  {
-    return $this->webPropertyCode;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdExchangeBuyer/MarketplaceDealParty.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdExchangeBuyer/MarketplaceDealParty.php
deleted file mode 100644
index ff1b47bc..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdExchangeBuyer/MarketplaceDealParty.php
+++ /dev/null
@@ -1,41 +0,0 @@
-buyer = $buyer;
-  }
-  public function getBuyer()
-  {
-    return $this->buyer;
-  }
-  public function setSeller(Google_Service_AdExchangeBuyer_Seller $seller)
-  {
-    $this->seller = $seller;
-  }
-  public function getSeller()
-  {
-    return $this->seller;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdExchangeBuyer/MarketplaceLabel.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdExchangeBuyer/MarketplaceLabel.php
deleted file mode 100644
index 33253901..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdExchangeBuyer/MarketplaceLabel.php
+++ /dev/null
@@ -1,58 +0,0 @@
-accountId = $accountId;
-  }
-  public function getAccountId()
-  {
-    return $this->accountId;
-  }
-  public function setCreateTimeMs($createTimeMs)
-  {
-    $this->createTimeMs = $createTimeMs;
-  }
-  public function getCreateTimeMs()
-  {
-    return $this->createTimeMs;
-  }
-  public function setDeprecatedMarketplaceDealParty(Google_Service_AdExchangeBuyer_MarketplaceDealParty $deprecatedMarketplaceDealParty)
-  {
-    $this->deprecatedMarketplaceDealParty = $deprecatedMarketplaceDealParty;
-  }
-  public function getDeprecatedMarketplaceDealParty()
-  {
-    return $this->deprecatedMarketplaceDealParty;
-  }
-  public function setLabel($label)
-  {
-    $this->label = $label;
-  }
-  public function getLabel()
-  {
-    return $this->label;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdExchangeBuyer/MarketplaceNote.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdExchangeBuyer/MarketplaceNote.php
deleted file mode 100644
index 70597782..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdExchangeBuyer/MarketplaceNote.php
+++ /dev/null
@@ -1,93 +0,0 @@
-creatorRole = $creatorRole;
-  }
-  public function getCreatorRole()
-  {
-    return $this->creatorRole;
-  }
-  public function setDealId($dealId)
-  {
-    $this->dealId = $dealId;
-  }
-  public function getDealId()
-  {
-    return $this->dealId;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setNote($note)
-  {
-    $this->note = $note;
-  }
-  public function getNote()
-  {
-    return $this->note;
-  }
-  public function setNoteId($noteId)
-  {
-    $this->noteId = $noteId;
-  }
-  public function getNoteId()
-  {
-    return $this->noteId;
-  }
-  public function setProposalId($proposalId)
-  {
-    $this->proposalId = $proposalId;
-  }
-  public function getProposalId()
-  {
-    return $this->proposalId;
-  }
-  public function setProposalRevisionNumber($proposalRevisionNumber)
-  {
-    $this->proposalRevisionNumber = $proposalRevisionNumber;
-  }
-  public function getProposalRevisionNumber()
-  {
-    return $this->proposalRevisionNumber;
-  }
-  public function setTimestampMs($timestampMs)
-  {
-    $this->timestampMs = $timestampMs;
-  }
-  public function getTimestampMs()
-  {
-    return $this->timestampMs;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdExchangeBuyer/PerformanceReport.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdExchangeBuyer/PerformanceReport.php
deleted file mode 100644
index 3d0b766c..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdExchangeBuyer/PerformanceReport.php
+++ /dev/null
@@ -1,220 +0,0 @@
-bidRate = $bidRate;
-  }
-  public function getBidRate()
-  {
-    return $this->bidRate;
-  }
-  public function setBidRequestRate($bidRequestRate)
-  {
-    $this->bidRequestRate = $bidRequestRate;
-  }
-  public function getBidRequestRate()
-  {
-    return $this->bidRequestRate;
-  }
-  public function setCalloutStatusRate($calloutStatusRate)
-  {
-    $this->calloutStatusRate = $calloutStatusRate;
-  }
-  public function getCalloutStatusRate()
-  {
-    return $this->calloutStatusRate;
-  }
-  public function setCookieMatcherStatusRate($cookieMatcherStatusRate)
-  {
-    $this->cookieMatcherStatusRate = $cookieMatcherStatusRate;
-  }
-  public function getCookieMatcherStatusRate()
-  {
-    return $this->cookieMatcherStatusRate;
-  }
-  public function setCreativeStatusRate($creativeStatusRate)
-  {
-    $this->creativeStatusRate = $creativeStatusRate;
-  }
-  public function getCreativeStatusRate()
-  {
-    return $this->creativeStatusRate;
-  }
-  public function setFilteredBidRate($filteredBidRate)
-  {
-    $this->filteredBidRate = $filteredBidRate;
-  }
-  public function getFilteredBidRate()
-  {
-    return $this->filteredBidRate;
-  }
-  public function setHostedMatchStatusRate($hostedMatchStatusRate)
-  {
-    $this->hostedMatchStatusRate = $hostedMatchStatusRate;
-  }
-  public function getHostedMatchStatusRate()
-  {
-    return $this->hostedMatchStatusRate;
-  }
-  public function setInventoryMatchRate($inventoryMatchRate)
-  {
-    $this->inventoryMatchRate = $inventoryMatchRate;
-  }
-  public function getInventoryMatchRate()
-  {
-    return $this->inventoryMatchRate;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setLatency50thPercentile($latency50thPercentile)
-  {
-    $this->latency50thPercentile = $latency50thPercentile;
-  }
-  public function getLatency50thPercentile()
-  {
-    return $this->latency50thPercentile;
-  }
-  public function setLatency85thPercentile($latency85thPercentile)
-  {
-    $this->latency85thPercentile = $latency85thPercentile;
-  }
-  public function getLatency85thPercentile()
-  {
-    return $this->latency85thPercentile;
-  }
-  public function setLatency95thPercentile($latency95thPercentile)
-  {
-    $this->latency95thPercentile = $latency95thPercentile;
-  }
-  public function getLatency95thPercentile()
-  {
-    return $this->latency95thPercentile;
-  }
-  public function setNoQuotaInRegion($noQuotaInRegion)
-  {
-    $this->noQuotaInRegion = $noQuotaInRegion;
-  }
-  public function getNoQuotaInRegion()
-  {
-    return $this->noQuotaInRegion;
-  }
-  public function setOutOfQuota($outOfQuota)
-  {
-    $this->outOfQuota = $outOfQuota;
-  }
-  public function getOutOfQuota()
-  {
-    return $this->outOfQuota;
-  }
-  public function setPixelMatchRequests($pixelMatchRequests)
-  {
-    $this->pixelMatchRequests = $pixelMatchRequests;
-  }
-  public function getPixelMatchRequests()
-  {
-    return $this->pixelMatchRequests;
-  }
-  public function setPixelMatchResponses($pixelMatchResponses)
-  {
-    $this->pixelMatchResponses = $pixelMatchResponses;
-  }
-  public function getPixelMatchResponses()
-  {
-    return $this->pixelMatchResponses;
-  }
-  public function setQuotaConfiguredLimit($quotaConfiguredLimit)
-  {
-    $this->quotaConfiguredLimit = $quotaConfiguredLimit;
-  }
-  public function getQuotaConfiguredLimit()
-  {
-    return $this->quotaConfiguredLimit;
-  }
-  public function setQuotaThrottledLimit($quotaThrottledLimit)
-  {
-    $this->quotaThrottledLimit = $quotaThrottledLimit;
-  }
-  public function getQuotaThrottledLimit()
-  {
-    return $this->quotaThrottledLimit;
-  }
-  public function setRegion($region)
-  {
-    $this->region = $region;
-  }
-  public function getRegion()
-  {
-    return $this->region;
-  }
-  public function setSuccessfulRequestRate($successfulRequestRate)
-  {
-    $this->successfulRequestRate = $successfulRequestRate;
-  }
-  public function getSuccessfulRequestRate()
-  {
-    return $this->successfulRequestRate;
-  }
-  public function setTimestamp($timestamp)
-  {
-    $this->timestamp = $timestamp;
-  }
-  public function getTimestamp()
-  {
-    return $this->timestamp;
-  }
-  public function setUnsuccessfulRequestRate($unsuccessfulRequestRate)
-  {
-    $this->unsuccessfulRequestRate = $unsuccessfulRequestRate;
-  }
-  public function getUnsuccessfulRequestRate()
-  {
-    return $this->unsuccessfulRequestRate;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdExchangeBuyer/PerformanceReportList.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdExchangeBuyer/PerformanceReportList.php
deleted file mode 100644
index 0ec2be9c..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdExchangeBuyer/PerformanceReportList.php
+++ /dev/null
@@ -1,41 +0,0 @@
-kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setPerformanceReport($performanceReport)
-  {
-    $this->performanceReport = $performanceReport;
-  }
-  public function getPerformanceReport()
-  {
-    return $this->performanceReport;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdExchangeBuyer/PretargetingConfig.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdExchangeBuyer/PretargetingConfig.php
deleted file mode 100644
index f24a9df1..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdExchangeBuyer/PretargetingConfig.php
+++ /dev/null
@@ -1,260 +0,0 @@
-billingId = $billingId;
-  }
-  public function getBillingId()
-  {
-    return $this->billingId;
-  }
-  public function setConfigId($configId)
-  {
-    $this->configId = $configId;
-  }
-  public function getConfigId()
-  {
-    return $this->configId;
-  }
-  public function setConfigName($configName)
-  {
-    $this->configName = $configName;
-  }
-  public function getConfigName()
-  {
-    return $this->configName;
-  }
-  public function setCreativeType($creativeType)
-  {
-    $this->creativeType = $creativeType;
-  }
-  public function getCreativeType()
-  {
-    return $this->creativeType;
-  }
-  public function setDimensions($dimensions)
-  {
-    $this->dimensions = $dimensions;
-  }
-  public function getDimensions()
-  {
-    return $this->dimensions;
-  }
-  public function setExcludedContentLabels($excludedContentLabels)
-  {
-    $this->excludedContentLabels = $excludedContentLabels;
-  }
-  public function getExcludedContentLabels()
-  {
-    return $this->excludedContentLabels;
-  }
-  public function setExcludedGeoCriteriaIds($excludedGeoCriteriaIds)
-  {
-    $this->excludedGeoCriteriaIds = $excludedGeoCriteriaIds;
-  }
-  public function getExcludedGeoCriteriaIds()
-  {
-    return $this->excludedGeoCriteriaIds;
-  }
-  public function setExcludedPlacements($excludedPlacements)
-  {
-    $this->excludedPlacements = $excludedPlacements;
-  }
-  public function getExcludedPlacements()
-  {
-    return $this->excludedPlacements;
-  }
-  public function setExcludedUserLists($excludedUserLists)
-  {
-    $this->excludedUserLists = $excludedUserLists;
-  }
-  public function getExcludedUserLists()
-  {
-    return $this->excludedUserLists;
-  }
-  public function setExcludedVerticals($excludedVerticals)
-  {
-    $this->excludedVerticals = $excludedVerticals;
-  }
-  public function getExcludedVerticals()
-  {
-    return $this->excludedVerticals;
-  }
-  public function setGeoCriteriaIds($geoCriteriaIds)
-  {
-    $this->geoCriteriaIds = $geoCriteriaIds;
-  }
-  public function getGeoCriteriaIds()
-  {
-    return $this->geoCriteriaIds;
-  }
-  public function setIsActive($isActive)
-  {
-    $this->isActive = $isActive;
-  }
-  public function getIsActive()
-  {
-    return $this->isActive;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setLanguages($languages)
-  {
-    $this->languages = $languages;
-  }
-  public function getLanguages()
-  {
-    return $this->languages;
-  }
-  public function setMinimumViewabilityDecile($minimumViewabilityDecile)
-  {
-    $this->minimumViewabilityDecile = $minimumViewabilityDecile;
-  }
-  public function getMinimumViewabilityDecile()
-  {
-    return $this->minimumViewabilityDecile;
-  }
-  public function setMobileCarriers($mobileCarriers)
-  {
-    $this->mobileCarriers = $mobileCarriers;
-  }
-  public function getMobileCarriers()
-  {
-    return $this->mobileCarriers;
-  }
-  public function setMobileDevices($mobileDevices)
-  {
-    $this->mobileDevices = $mobileDevices;
-  }
-  public function getMobileDevices()
-  {
-    return $this->mobileDevices;
-  }
-  public function setMobileOperatingSystemVersions($mobileOperatingSystemVersions)
-  {
-    $this->mobileOperatingSystemVersions = $mobileOperatingSystemVersions;
-  }
-  public function getMobileOperatingSystemVersions()
-  {
-    return $this->mobileOperatingSystemVersions;
-  }
-  public function setPlacements($placements)
-  {
-    $this->placements = $placements;
-  }
-  public function getPlacements()
-  {
-    return $this->placements;
-  }
-  public function setPlatforms($platforms)
-  {
-    $this->platforms = $platforms;
-  }
-  public function getPlatforms()
-  {
-    return $this->platforms;
-  }
-  public function setSupportedCreativeAttributes($supportedCreativeAttributes)
-  {
-    $this->supportedCreativeAttributes = $supportedCreativeAttributes;
-  }
-  public function getSupportedCreativeAttributes()
-  {
-    return $this->supportedCreativeAttributes;
-  }
-  public function setUserIdentifierDataRequired($userIdentifierDataRequired)
-  {
-    $this->userIdentifierDataRequired = $userIdentifierDataRequired;
-  }
-  public function getUserIdentifierDataRequired()
-  {
-    return $this->userIdentifierDataRequired;
-  }
-  public function setUserLists($userLists)
-  {
-    $this->userLists = $userLists;
-  }
-  public function getUserLists()
-  {
-    return $this->userLists;
-  }
-  public function setVendorTypes($vendorTypes)
-  {
-    $this->vendorTypes = $vendorTypes;
-  }
-  public function getVendorTypes()
-  {
-    return $this->vendorTypes;
-  }
-  public function setVerticals($verticals)
-  {
-    $this->verticals = $verticals;
-  }
-  public function getVerticals()
-  {
-    return $this->verticals;
-  }
-  public function setVideoPlayerSizes($videoPlayerSizes)
-  {
-    $this->videoPlayerSizes = $videoPlayerSizes;
-  }
-  public function getVideoPlayerSizes()
-  {
-    return $this->videoPlayerSizes;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdExchangeBuyer/PretargetingConfigDimensions.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdExchangeBuyer/PretargetingConfigDimensions.php
deleted file mode 100644
index 0515ea6c..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdExchangeBuyer/PretargetingConfigDimensions.php
+++ /dev/null
@@ -1,39 +0,0 @@
-height = $height;
-  }
-  public function getHeight()
-  {
-    return $this->height;
-  }
-  public function setWidth($width)
-  {
-    $this->width = $width;
-  }
-  public function getWidth()
-  {
-    return $this->width;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdExchangeBuyer/PretargetingConfigExcludedPlacements.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdExchangeBuyer/PretargetingConfigExcludedPlacements.php
deleted file mode 100644
index 6ef80a65..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdExchangeBuyer/PretargetingConfigExcludedPlacements.php
+++ /dev/null
@@ -1,39 +0,0 @@
-token = $token;
-  }
-  public function getToken()
-  {
-    return $this->token;
-  }
-  public function setType($type)
-  {
-    $this->type = $type;
-  }
-  public function getType()
-  {
-    return $this->type;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdExchangeBuyer/PretargetingConfigList.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdExchangeBuyer/PretargetingConfigList.php
deleted file mode 100644
index aaeda88b..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdExchangeBuyer/PretargetingConfigList.php
+++ /dev/null
@@ -1,41 +0,0 @@
-items = $items;
-  }
-  public function getItems()
-  {
-    return $this->items;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdExchangeBuyer/PretargetingConfigPlacements.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdExchangeBuyer/PretargetingConfigPlacements.php
deleted file mode 100644
index f6394606..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdExchangeBuyer/PretargetingConfigPlacements.php
+++ /dev/null
@@ -1,39 +0,0 @@
-token = $token;
-  }
-  public function getToken()
-  {
-    return $this->token;
-  }
-  public function setType($type)
-  {
-    $this->type = $type;
-  }
-  public function getType()
-  {
-    return $this->type;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdExchangeBuyer/PretargetingConfigVideoPlayerSizes.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdExchangeBuyer/PretargetingConfigVideoPlayerSizes.php
deleted file mode 100644
index f1b50101..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdExchangeBuyer/PretargetingConfigVideoPlayerSizes.php
+++ /dev/null
@@ -1,48 +0,0 @@
-aspectRatio = $aspectRatio;
-  }
-  public function getAspectRatio()
-  {
-    return $this->aspectRatio;
-  }
-  public function setMinHeight($minHeight)
-  {
-    $this->minHeight = $minHeight;
-  }
-  public function getMinHeight()
-  {
-    return $this->minHeight;
-  }
-  public function setMinWidth($minWidth)
-  {
-    $this->minWidth = $minWidth;
-  }
-  public function getMinWidth()
-  {
-    return $this->minWidth;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdExchangeBuyer/Price.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdExchangeBuyer/Price.php
deleted file mode 100644
index 876ecceb..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdExchangeBuyer/Price.php
+++ /dev/null
@@ -1,57 +0,0 @@
-amountMicros = $amountMicros;
-  }
-  public function getAmountMicros()
-  {
-    return $this->amountMicros;
-  }
-  public function setCurrencyCode($currencyCode)
-  {
-    $this->currencyCode = $currencyCode;
-  }
-  public function getCurrencyCode()
-  {
-    return $this->currencyCode;
-  }
-  public function setExpectedCpmMicros($expectedCpmMicros)
-  {
-    $this->expectedCpmMicros = $expectedCpmMicros;
-  }
-  public function getExpectedCpmMicros()
-  {
-    return $this->expectedCpmMicros;
-  }
-  public function setPricingType($pricingType)
-  {
-    $this->pricingType = $pricingType;
-  }
-  public function getPricingType()
-  {
-    return $this->pricingType;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdExchangeBuyer/PricePerBuyer.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdExchangeBuyer/PricePerBuyer.php
deleted file mode 100644
index 59018c9e..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdExchangeBuyer/PricePerBuyer.php
+++ /dev/null
@@ -1,50 +0,0 @@
-auctionTier = $auctionTier;
-  }
-  public function getAuctionTier()
-  {
-    return $this->auctionTier;
-  }
-  public function setBuyer(Google_Service_AdExchangeBuyer_Buyer $buyer)
-  {
-    $this->buyer = $buyer;
-  }
-  public function getBuyer()
-  {
-    return $this->buyer;
-  }
-  public function setPrice(Google_Service_AdExchangeBuyer_Price $price)
-  {
-    $this->price = $price;
-  }
-  public function getPrice()
-  {
-    return $this->price;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdExchangeBuyer/PrivateData.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdExchangeBuyer/PrivateData.php
deleted file mode 100644
index c2b42db9..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdExchangeBuyer/PrivateData.php
+++ /dev/null
@@ -1,39 +0,0 @@
-referenceId = $referenceId;
-  }
-  public function getReferenceId()
-  {
-    return $this->referenceId;
-  }
-  public function setReferencePayload($referencePayload)
-  {
-    $this->referencePayload = $referencePayload;
-  }
-  public function getReferencePayload()
-  {
-    return $this->referencePayload;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdExchangeBuyer/Product.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdExchangeBuyer/Product.php
deleted file mode 100644
index 7b5c0a59..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdExchangeBuyer/Product.php
+++ /dev/null
@@ -1,245 +0,0 @@
-creationTimeMs = $creationTimeMs;
-  }
-  public function getCreationTimeMs()
-  {
-    return $this->creationTimeMs;
-  }
-  public function setCreatorContacts($creatorContacts)
-  {
-    $this->creatorContacts = $creatorContacts;
-  }
-  public function getCreatorContacts()
-  {
-    return $this->creatorContacts;
-  }
-  public function setDeliveryControl(Google_Service_AdExchangeBuyer_DeliveryControl $deliveryControl)
-  {
-    $this->deliveryControl = $deliveryControl;
-  }
-  public function getDeliveryControl()
-  {
-    return $this->deliveryControl;
-  }
-  public function setFlightEndTimeMs($flightEndTimeMs)
-  {
-    $this->flightEndTimeMs = $flightEndTimeMs;
-  }
-  public function getFlightEndTimeMs()
-  {
-    return $this->flightEndTimeMs;
-  }
-  public function setFlightStartTimeMs($flightStartTimeMs)
-  {
-    $this->flightStartTimeMs = $flightStartTimeMs;
-  }
-  public function getFlightStartTimeMs()
-  {
-    return $this->flightStartTimeMs;
-  }
-  public function setHasCreatorSignedOff($hasCreatorSignedOff)
-  {
-    $this->hasCreatorSignedOff = $hasCreatorSignedOff;
-  }
-  public function getHasCreatorSignedOff()
-  {
-    return $this->hasCreatorSignedOff;
-  }
-  public function setInventorySource($inventorySource)
-  {
-    $this->inventorySource = $inventorySource;
-  }
-  public function getInventorySource()
-  {
-    return $this->inventorySource;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setLabels($labels)
-  {
-    $this->labels = $labels;
-  }
-  public function getLabels()
-  {
-    return $this->labels;
-  }
-  public function setLastUpdateTimeMs($lastUpdateTimeMs)
-  {
-    $this->lastUpdateTimeMs = $lastUpdateTimeMs;
-  }
-  public function getLastUpdateTimeMs()
-  {
-    return $this->lastUpdateTimeMs;
-  }
-  public function setLegacyOfferId($legacyOfferId)
-  {
-    $this->legacyOfferId = $legacyOfferId;
-  }
-  public function getLegacyOfferId()
-  {
-    return $this->legacyOfferId;
-  }
-  public function setMarketplacePublisherProfileId($marketplacePublisherProfileId)
-  {
-    $this->marketplacePublisherProfileId = $marketplacePublisherProfileId;
-  }
-  public function getMarketplacePublisherProfileId()
-  {
-    return $this->marketplacePublisherProfileId;
-  }
-  public function setName($name)
-  {
-    $this->name = $name;
-  }
-  public function getName()
-  {
-    return $this->name;
-  }
-  public function setPrivateAuctionId($privateAuctionId)
-  {
-    $this->privateAuctionId = $privateAuctionId;
-  }
-  public function getPrivateAuctionId()
-  {
-    return $this->privateAuctionId;
-  }
-  public function setProductId($productId)
-  {
-    $this->productId = $productId;
-  }
-  public function getProductId()
-  {
-    return $this->productId;
-  }
-  public function setPublisherProfileId($publisherProfileId)
-  {
-    $this->publisherProfileId = $publisherProfileId;
-  }
-  public function getPublisherProfileId()
-  {
-    return $this->publisherProfileId;
-  }
-  public function setPublisherProvidedForecast(Google_Service_AdExchangeBuyer_PublisherProvidedForecast $publisherProvidedForecast)
-  {
-    $this->publisherProvidedForecast = $publisherProvidedForecast;
-  }
-  public function getPublisherProvidedForecast()
-  {
-    return $this->publisherProvidedForecast;
-  }
-  public function setRevisionNumber($revisionNumber)
-  {
-    $this->revisionNumber = $revisionNumber;
-  }
-  public function getRevisionNumber()
-  {
-    return $this->revisionNumber;
-  }
-  public function setSeller(Google_Service_AdExchangeBuyer_Seller $seller)
-  {
-    $this->seller = $seller;
-  }
-  public function getSeller()
-  {
-    return $this->seller;
-  }
-  public function setSharedTargetings($sharedTargetings)
-  {
-    $this->sharedTargetings = $sharedTargetings;
-  }
-  public function getSharedTargetings()
-  {
-    return $this->sharedTargetings;
-  }
-  public function setState($state)
-  {
-    $this->state = $state;
-  }
-  public function getState()
-  {
-    return $this->state;
-  }
-  public function setSyndicationProduct($syndicationProduct)
-  {
-    $this->syndicationProduct = $syndicationProduct;
-  }
-  public function getSyndicationProduct()
-  {
-    return $this->syndicationProduct;
-  }
-  public function setTerms(Google_Service_AdExchangeBuyer_DealTerms $terms)
-  {
-    $this->terms = $terms;
-  }
-  public function getTerms()
-  {
-    return $this->terms;
-  }
-  public function setWebPropertyCode($webPropertyCode)
-  {
-    $this->webPropertyCode = $webPropertyCode;
-  }
-  public function getWebPropertyCode()
-  {
-    return $this->webPropertyCode;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdExchangeBuyer/Proposal.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdExchangeBuyer/Proposal.php
deleted file mode 100644
index e6192855..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdExchangeBuyer/Proposal.php
+++ /dev/null
@@ -1,236 +0,0 @@
-billedBuyer = $billedBuyer;
-  }
-  public function getBilledBuyer()
-  {
-    return $this->billedBuyer;
-  }
-  public function setBuyer(Google_Service_AdExchangeBuyer_Buyer $buyer)
-  {
-    $this->buyer = $buyer;
-  }
-  public function getBuyer()
-  {
-    return $this->buyer;
-  }
-  public function setBuyerContacts($buyerContacts)
-  {
-    $this->buyerContacts = $buyerContacts;
-  }
-  public function getBuyerContacts()
-  {
-    return $this->buyerContacts;
-  }
-  public function setBuyerPrivateData(Google_Service_AdExchangeBuyer_PrivateData $buyerPrivateData)
-  {
-    $this->buyerPrivateData = $buyerPrivateData;
-  }
-  public function getBuyerPrivateData()
-  {
-    return $this->buyerPrivateData;
-  }
-  public function setDbmAdvertiserIds($dbmAdvertiserIds)
-  {
-    $this->dbmAdvertiserIds = $dbmAdvertiserIds;
-  }
-  public function getDbmAdvertiserIds()
-  {
-    return $this->dbmAdvertiserIds;
-  }
-  public function setHasBuyerSignedOff($hasBuyerSignedOff)
-  {
-    $this->hasBuyerSignedOff = $hasBuyerSignedOff;
-  }
-  public function getHasBuyerSignedOff()
-  {
-    return $this->hasBuyerSignedOff;
-  }
-  public function setHasSellerSignedOff($hasSellerSignedOff)
-  {
-    $this->hasSellerSignedOff = $hasSellerSignedOff;
-  }
-  public function getHasSellerSignedOff()
-  {
-    return $this->hasSellerSignedOff;
-  }
-  public function setInventorySource($inventorySource)
-  {
-    $this->inventorySource = $inventorySource;
-  }
-  public function getInventorySource()
-  {
-    return $this->inventorySource;
-  }
-  public function setIsRenegotiating($isRenegotiating)
-  {
-    $this->isRenegotiating = $isRenegotiating;
-  }
-  public function getIsRenegotiating()
-  {
-    return $this->isRenegotiating;
-  }
-  public function setIsSetupComplete($isSetupComplete)
-  {
-    $this->isSetupComplete = $isSetupComplete;
-  }
-  public function getIsSetupComplete()
-  {
-    return $this->isSetupComplete;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setLabels($labels)
-  {
-    $this->labels = $labels;
-  }
-  public function getLabels()
-  {
-    return $this->labels;
-  }
-  public function setLastUpdaterOrCommentorRole($lastUpdaterOrCommentorRole)
-  {
-    $this->lastUpdaterOrCommentorRole = $lastUpdaterOrCommentorRole;
-  }
-  public function getLastUpdaterOrCommentorRole()
-  {
-    return $this->lastUpdaterOrCommentorRole;
-  }
-  public function setName($name)
-  {
-    $this->name = $name;
-  }
-  public function getName()
-  {
-    return $this->name;
-  }
-  public function setNegotiationId($negotiationId)
-  {
-    $this->negotiationId = $negotiationId;
-  }
-  public function getNegotiationId()
-  {
-    return $this->negotiationId;
-  }
-  public function setOriginatorRole($originatorRole)
-  {
-    $this->originatorRole = $originatorRole;
-  }
-  public function getOriginatorRole()
-  {
-    return $this->originatorRole;
-  }
-  public function setPrivateAuctionId($privateAuctionId)
-  {
-    $this->privateAuctionId = $privateAuctionId;
-  }
-  public function getPrivateAuctionId()
-  {
-    return $this->privateAuctionId;
-  }
-  public function setProposalId($proposalId)
-  {
-    $this->proposalId = $proposalId;
-  }
-  public function getProposalId()
-  {
-    return $this->proposalId;
-  }
-  public function setProposalState($proposalState)
-  {
-    $this->proposalState = $proposalState;
-  }
-  public function getProposalState()
-  {
-    return $this->proposalState;
-  }
-  public function setRevisionNumber($revisionNumber)
-  {
-    $this->revisionNumber = $revisionNumber;
-  }
-  public function getRevisionNumber()
-  {
-    return $this->revisionNumber;
-  }
-  public function setRevisionTimeMs($revisionTimeMs)
-  {
-    $this->revisionTimeMs = $revisionTimeMs;
-  }
-  public function getRevisionTimeMs()
-  {
-    return $this->revisionTimeMs;
-  }
-  public function setSeller(Google_Service_AdExchangeBuyer_Seller $seller)
-  {
-    $this->seller = $seller;
-  }
-  public function getSeller()
-  {
-    return $this->seller;
-  }
-  public function setSellerContacts($sellerContacts)
-  {
-    $this->sellerContacts = $sellerContacts;
-  }
-  public function getSellerContacts()
-  {
-    return $this->sellerContacts;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdExchangeBuyer/PublisherProfileApiProto.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdExchangeBuyer/PublisherProfileApiProto.php
deleted file mode 100644
index b05485e0..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdExchangeBuyer/PublisherProfileApiProto.php
+++ /dev/null
@@ -1,231 +0,0 @@
-accountId = $accountId;
-  }
-  public function getAccountId()
-  {
-    return $this->accountId;
-  }
-  public function setAudience($audience)
-  {
-    $this->audience = $audience;
-  }
-  public function getAudience()
-  {
-    return $this->audience;
-  }
-  public function setBuyerPitchStatement($buyerPitchStatement)
-  {
-    $this->buyerPitchStatement = $buyerPitchStatement;
-  }
-  public function getBuyerPitchStatement()
-  {
-    return $this->buyerPitchStatement;
-  }
-  public function setDirectContact($directContact)
-  {
-    $this->directContact = $directContact;
-  }
-  public function getDirectContact()
-  {
-    return $this->directContact;
-  }
-  public function setExchange($exchange)
-  {
-    $this->exchange = $exchange;
-  }
-  public function getExchange()
-  {
-    return $this->exchange;
-  }
-  public function setGooglePlusLink($googlePlusLink)
-  {
-    $this->googlePlusLink = $googlePlusLink;
-  }
-  public function getGooglePlusLink()
-  {
-    return $this->googlePlusLink;
-  }
-  public function setIsParent($isParent)
-  {
-    $this->isParent = $isParent;
-  }
-  public function getIsParent()
-  {
-    return $this->isParent;
-  }
-  public function setIsPublished($isPublished)
-  {
-    $this->isPublished = $isPublished;
-  }
-  public function getIsPublished()
-  {
-    return $this->isPublished;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setLogoUrl($logoUrl)
-  {
-    $this->logoUrl = $logoUrl;
-  }
-  public function getLogoUrl()
-  {
-    return $this->logoUrl;
-  }
-  public function setMediaKitLink($mediaKitLink)
-  {
-    $this->mediaKitLink = $mediaKitLink;
-  }
-  public function getMediaKitLink()
-  {
-    return $this->mediaKitLink;
-  }
-  public function setName($name)
-  {
-    $this->name = $name;
-  }
-  public function getName()
-  {
-    return $this->name;
-  }
-  public function setOverview($overview)
-  {
-    $this->overview = $overview;
-  }
-  public function getOverview()
-  {
-    return $this->overview;
-  }
-  public function setProfileId($profileId)
-  {
-    $this->profileId = $profileId;
-  }
-  public function getProfileId()
-  {
-    return $this->profileId;
-  }
-  public function setProgrammaticContact($programmaticContact)
-  {
-    $this->programmaticContact = $programmaticContact;
-  }
-  public function getProgrammaticContact()
-  {
-    return $this->programmaticContact;
-  }
-  public function setPublisherDomains($publisherDomains)
-  {
-    $this->publisherDomains = $publisherDomains;
-  }
-  public function getPublisherDomains()
-  {
-    return $this->publisherDomains;
-  }
-  public function setPublisherProfileId($publisherProfileId)
-  {
-    $this->publisherProfileId = $publisherProfileId;
-  }
-  public function getPublisherProfileId()
-  {
-    return $this->publisherProfileId;
-  }
-  public function setPublisherProvidedForecast(Google_Service_AdExchangeBuyer_PublisherProvidedForecast $publisherProvidedForecast)
-  {
-    $this->publisherProvidedForecast = $publisherProvidedForecast;
-  }
-  public function getPublisherProvidedForecast()
-  {
-    return $this->publisherProvidedForecast;
-  }
-  public function setRateCardInfoLink($rateCardInfoLink)
-  {
-    $this->rateCardInfoLink = $rateCardInfoLink;
-  }
-  public function getRateCardInfoLink()
-  {
-    return $this->rateCardInfoLink;
-  }
-  public function setSamplePageLink($samplePageLink)
-  {
-    $this->samplePageLink = $samplePageLink;
-  }
-  public function getSamplePageLink()
-  {
-    return $this->samplePageLink;
-  }
-  public function setSeller(Google_Service_AdExchangeBuyer_Seller $seller)
-  {
-    $this->seller = $seller;
-  }
-  public function getSeller()
-  {
-    return $this->seller;
-  }
-  public function setState($state)
-  {
-    $this->state = $state;
-  }
-  public function getState()
-  {
-    return $this->state;
-  }
-  public function setTopHeadlines($topHeadlines)
-  {
-    $this->topHeadlines = $topHeadlines;
-  }
-  public function getTopHeadlines()
-  {
-    return $this->topHeadlines;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdExchangeBuyer/PublisherProvidedForecast.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdExchangeBuyer/PublisherProvidedForecast.php
deleted file mode 100644
index d97208bf..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdExchangeBuyer/PublisherProvidedForecast.php
+++ /dev/null
@@ -1,50 +0,0 @@
-dimensions = $dimensions;
-  }
-  public function getDimensions()
-  {
-    return $this->dimensions;
-  }
-  public function setWeeklyImpressions($weeklyImpressions)
-  {
-    $this->weeklyImpressions = $weeklyImpressions;
-  }
-  public function getWeeklyImpressions()
-  {
-    return $this->weeklyImpressions;
-  }
-  public function setWeeklyUniques($weeklyUniques)
-  {
-    $this->weeklyUniques = $weeklyUniques;
-  }
-  public function getWeeklyUniques()
-  {
-    return $this->weeklyUniques;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdExchangeBuyer/Resource/Accounts.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdExchangeBuyer/Resource/Accounts.php
deleted file mode 100644
index 1d53f571..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdExchangeBuyer/Resource/Accounts.php
+++ /dev/null
@@ -1,88 +0,0 @@
-
- *   $adexchangebuyerService = new Google_Service_AdExchangeBuyer(...);
- *   $accounts = $adexchangebuyerService->accounts;
- *  
- */
-class Google_Service_AdExchangeBuyer_Resource_Accounts extends Google_Service_Resource
-{
-  /**
-   * Gets one account by ID. (accounts.get)
-   *
-   * @param int $id The account id
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_AdExchangeBuyer_Account
-   */
-  public function get($id, $optParams = array())
-  {
-    $params = array('id' => $id);
-    $params = array_merge($params, $optParams);
-    return $this->call('get', array($params), "Google_Service_AdExchangeBuyer_Account");
-  }
-  /**
-   * Retrieves the authenticated user's list of accounts. (accounts.listAccounts)
-   *
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_AdExchangeBuyer_AccountsList
-   */
-  public function listAccounts($optParams = array())
-  {
-    $params = array();
-    $params = array_merge($params, $optParams);
-    return $this->call('list', array($params), "Google_Service_AdExchangeBuyer_AccountsList");
-  }
-  /**
-   * Updates an existing account. This method supports patch semantics.
-   * (accounts.patch)
-   *
-   * @param int $id The account id
-   * @param Google_Service_AdExchangeBuyer_Account $postBody
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param bool confirmUnsafeAccountChange Confirmation for erasing bidder
-   * and cookie matching urls.
-   * @return Google_Service_AdExchangeBuyer_Account
-   */
-  public function patch($id, Google_Service_AdExchangeBuyer_Account $postBody, $optParams = array())
-  {
-    $params = array('id' => $id, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('patch', array($params), "Google_Service_AdExchangeBuyer_Account");
-  }
-  /**
-   * Updates an existing account. (accounts.update)
-   *
-   * @param int $id The account id
-   * @param Google_Service_AdExchangeBuyer_Account $postBody
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param bool confirmUnsafeAccountChange Confirmation for erasing bidder
-   * and cookie matching urls.
-   * @return Google_Service_AdExchangeBuyer_Account
-   */
-  public function update($id, Google_Service_AdExchangeBuyer_Account $postBody, $optParams = array())
-  {
-    $params = array('id' => $id, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('update', array($params), "Google_Service_AdExchangeBuyer_Account");
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdExchangeBuyer/Resource/BillingInfo.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdExchangeBuyer/Resource/BillingInfo.php
deleted file mode 100644
index a531125e..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdExchangeBuyer/Resource/BillingInfo.php
+++ /dev/null
@@ -1,55 +0,0 @@
-
- *   $adexchangebuyerService = new Google_Service_AdExchangeBuyer(...);
- *   $billingInfo = $adexchangebuyerService->billingInfo;
- *  
- */
-class Google_Service_AdExchangeBuyer_Resource_BillingInfo extends Google_Service_Resource
-{
-  /**
-   * Returns the billing information for one account specified by account ID.
-   * (billingInfo.get)
-   *
-   * @param int $accountId The account id.
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_AdExchangeBuyer_BillingInfo
-   */
-  public function get($accountId, $optParams = array())
-  {
-    $params = array('accountId' => $accountId);
-    $params = array_merge($params, $optParams);
-    return $this->call('get', array($params), "Google_Service_AdExchangeBuyer_BillingInfo");
-  }
-  /**
-   * Retrieves a list of billing information for all accounts of the authenticated
-   * user. (billingInfo.listBillingInfo)
-   *
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_AdExchangeBuyer_BillingInfoList
-   */
-  public function listBillingInfo($optParams = array())
-  {
-    $params = array();
-    $params = array_merge($params, $optParams);
-    return $this->call('list', array($params), "Google_Service_AdExchangeBuyer_BillingInfoList");
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdExchangeBuyer/Resource/Budget.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdExchangeBuyer/Resource/Budget.php
deleted file mode 100644
index 26efc8e0..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdExchangeBuyer/Resource/Budget.php
+++ /dev/null
@@ -1,81 +0,0 @@
-
- *   $adexchangebuyerService = new Google_Service_AdExchangeBuyer(...);
- *   $budget = $adexchangebuyerService->budget;
- *  
- */
-class Google_Service_AdExchangeBuyer_Resource_Budget extends Google_Service_Resource
-{
-  /**
-   * Returns the budget information for the adgroup specified by the accountId and
-   * billingId. (budget.get)
-   *
-   * @param string $accountId The account id to get the budget information for.
-   * @param string $billingId The billing id to get the budget information for.
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_AdExchangeBuyer_Budget
-   */
-  public function get($accountId, $billingId, $optParams = array())
-  {
-    $params = array('accountId' => $accountId, 'billingId' => $billingId);
-    $params = array_merge($params, $optParams);
-    return $this->call('get', array($params), "Google_Service_AdExchangeBuyer_Budget");
-  }
-  /**
-   * Updates the budget amount for the budget of the adgroup specified by the
-   * accountId and billingId, with the budget amount in the request. This method
-   * supports patch semantics. (budget.patch)
-   *
-   * @param string $accountId The account id associated with the budget being
-   * updated.
-   * @param string $billingId The billing id associated with the budget being
-   * updated.
-   * @param Google_Service_AdExchangeBuyer_Budget $postBody
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_AdExchangeBuyer_Budget
-   */
-  public function patch($accountId, $billingId, Google_Service_AdExchangeBuyer_Budget $postBody, $optParams = array())
-  {
-    $params = array('accountId' => $accountId, 'billingId' => $billingId, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('patch', array($params), "Google_Service_AdExchangeBuyer_Budget");
-  }
-  /**
-   * Updates the budget amount for the budget of the adgroup specified by the
-   * accountId and billingId, with the budget amount in the request.
-   * (budget.update)
-   *
-   * @param string $accountId The account id associated with the budget being
-   * updated.
-   * @param string $billingId The billing id associated with the budget being
-   * updated.
-   * @param Google_Service_AdExchangeBuyer_Budget $postBody
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_AdExchangeBuyer_Budget
-   */
-  public function update($accountId, $billingId, Google_Service_AdExchangeBuyer_Budget $postBody, $optParams = array())
-  {
-    $params = array('accountId' => $accountId, 'billingId' => $billingId, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('update', array($params), "Google_Service_AdExchangeBuyer_Budget");
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdExchangeBuyer/Resource/Creatives.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdExchangeBuyer/Resource/Creatives.php
deleted file mode 100644
index fa6c0c40..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdExchangeBuyer/Resource/Creatives.php
+++ /dev/null
@@ -1,127 +0,0 @@
-
- *   $adexchangebuyerService = new Google_Service_AdExchangeBuyer(...);
- *   $creatives = $adexchangebuyerService->creatives;
- *  
- */
-class Google_Service_AdExchangeBuyer_Resource_Creatives extends Google_Service_Resource
-{
-  /**
-   * Add a deal id association for the creative. (creatives.addDeal)
-   *
-   * @param int $accountId The id for the account that will serve this creative.
-   * @param string $buyerCreativeId The buyer-specific id for this creative.
-   * @param string $dealId The id of the deal id to associate with this creative.
-   * @param array $optParams Optional parameters.
-   */
-  public function addDeal($accountId, $buyerCreativeId, $dealId, $optParams = array())
-  {
-    $params = array('accountId' => $accountId, 'buyerCreativeId' => $buyerCreativeId, 'dealId' => $dealId);
-    $params = array_merge($params, $optParams);
-    return $this->call('addDeal', array($params));
-  }
-  /**
-   * Gets the status for a single creative. A creative will be available 30-40
-   * minutes after submission. (creatives.get)
-   *
-   * @param int $accountId The id for the account that will serve this creative.
-   * @param string $buyerCreativeId The buyer-specific id for this creative.
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_AdExchangeBuyer_Creative
-   */
-  public function get($accountId, $buyerCreativeId, $optParams = array())
-  {
-    $params = array('accountId' => $accountId, 'buyerCreativeId' => $buyerCreativeId);
-    $params = array_merge($params, $optParams);
-    return $this->call('get', array($params), "Google_Service_AdExchangeBuyer_Creative");
-  }
-  /**
-   * Submit a new creative. (creatives.insert)
-   *
-   * @param Google_Service_AdExchangeBuyer_Creative $postBody
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_AdExchangeBuyer_Creative
-   */
-  public function insert(Google_Service_AdExchangeBuyer_Creative $postBody, $optParams = array())
-  {
-    $params = array('postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('insert', array($params), "Google_Service_AdExchangeBuyer_Creative");
-  }
-  /**
-   * Retrieves a list of the authenticated user's active creatives. A creative
-   * will be available 30-40 minutes after submission. (creatives.listCreatives)
-   *
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param int accountId When specified, only creatives for the given account
-   * ids are returned.
-   * @opt_param string buyerCreativeId When specified, only creatives for the
-   * given buyer creative ids are returned.
-   * @opt_param string dealsStatusFilter When specified, only creatives having the
-   * given deals status are returned.
-   * @opt_param string maxResults Maximum number of entries returned on one result
-   * page. If not set, the default is 100. Optional.
-   * @opt_param string openAuctionStatusFilter When specified, only creatives
-   * having the given open auction status are returned.
-   * @opt_param string pageToken A continuation token, used to page through ad
-   * clients. To retrieve the next page, set this parameter to the value of
-   * "nextPageToken" from the previous response. Optional.
-   * @return Google_Service_AdExchangeBuyer_CreativesList
-   */
-  public function listCreatives($optParams = array())
-  {
-    $params = array();
-    $params = array_merge($params, $optParams);
-    return $this->call('list', array($params), "Google_Service_AdExchangeBuyer_CreativesList");
-  }
-  /**
-   * Lists the external deal ids associated with the creative.
-   * (creatives.listDeals)
-   *
-   * @param int $accountId The id for the account that will serve this creative.
-   * @param string $buyerCreativeId The buyer-specific id for this creative.
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_AdExchangeBuyer_CreativeDealIds
-   */
-  public function listDeals($accountId, $buyerCreativeId, $optParams = array())
-  {
-    $params = array('accountId' => $accountId, 'buyerCreativeId' => $buyerCreativeId);
-    $params = array_merge($params, $optParams);
-    return $this->call('listDeals', array($params), "Google_Service_AdExchangeBuyer_CreativeDealIds");
-  }
-  /**
-   * Remove a deal id associated with the creative. (creatives.removeDeal)
-   *
-   * @param int $accountId The id for the account that will serve this creative.
-   * @param string $buyerCreativeId The buyer-specific id for this creative.
-   * @param string $dealId The id of the deal id to disassociate with this
-   * creative.
-   * @param array $optParams Optional parameters.
-   */
-  public function removeDeal($accountId, $buyerCreativeId, $dealId, $optParams = array())
-  {
-    $params = array('accountId' => $accountId, 'buyerCreativeId' => $buyerCreativeId, 'dealId' => $dealId);
-    $params = array_merge($params, $optParams);
-    return $this->call('removeDeal', array($params));
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdExchangeBuyer/Resource/Marketplacedeals.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdExchangeBuyer/Resource/Marketplacedeals.php
deleted file mode 100644
index 6dff34b7..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdExchangeBuyer/Resource/Marketplacedeals.php
+++ /dev/null
@@ -1,88 +0,0 @@
-
- *   $adexchangebuyerService = new Google_Service_AdExchangeBuyer(...);
- *   $marketplacedeals = $adexchangebuyerService->marketplacedeals;
- *  
- */
-class Google_Service_AdExchangeBuyer_Resource_Marketplacedeals extends Google_Service_Resource
-{
-  /**
-   * Delete the specified deals from the proposal (marketplacedeals.delete)
-   *
-   * @param string $proposalId The proposalId to delete deals from.
-   * @param Google_Service_AdExchangeBuyer_DeleteOrderDealsRequest $postBody
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_AdExchangeBuyer_DeleteOrderDealsResponse
-   */
-  public function delete($proposalId, Google_Service_AdExchangeBuyer_DeleteOrderDealsRequest $postBody, $optParams = array())
-  {
-    $params = array('proposalId' => $proposalId, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('delete', array($params), "Google_Service_AdExchangeBuyer_DeleteOrderDealsResponse");
-  }
-  /**
-   * Add new deals for the specified proposal (marketplacedeals.insert)
-   *
-   * @param string $proposalId proposalId for which deals need to be added.
-   * @param Google_Service_AdExchangeBuyer_AddOrderDealsRequest $postBody
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_AdExchangeBuyer_AddOrderDealsResponse
-   */
-  public function insert($proposalId, Google_Service_AdExchangeBuyer_AddOrderDealsRequest $postBody, $optParams = array())
-  {
-    $params = array('proposalId' => $proposalId, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('insert', array($params), "Google_Service_AdExchangeBuyer_AddOrderDealsResponse");
-  }
-  /**
-   * List all the deals for a given proposal
-   * (marketplacedeals.listMarketplacedeals)
-   *
-   * @param string $proposalId The proposalId to get deals for. To search across
-   * all proposals specify order_id = '-' as part of the URL.
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param string pqlQuery Query string to retrieve specific deals.
-   * @return Google_Service_AdExchangeBuyer_GetOrderDealsResponse
-   */
-  public function listMarketplacedeals($proposalId, $optParams = array())
-  {
-    $params = array('proposalId' => $proposalId);
-    $params = array_merge($params, $optParams);
-    return $this->call('list', array($params), "Google_Service_AdExchangeBuyer_GetOrderDealsResponse");
-  }
-  /**
-   * Replaces all the deals in the proposal with the passed in deals
-   * (marketplacedeals.update)
-   *
-   * @param string $proposalId The proposalId to edit deals on.
-   * @param Google_Service_AdExchangeBuyer_EditAllOrderDealsRequest $postBody
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_AdExchangeBuyer_EditAllOrderDealsResponse
-   */
-  public function update($proposalId, Google_Service_AdExchangeBuyer_EditAllOrderDealsRequest $postBody, $optParams = array())
-  {
-    $params = array('proposalId' => $proposalId, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('update', array($params), "Google_Service_AdExchangeBuyer_EditAllOrderDealsResponse");
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdExchangeBuyer/Resource/Marketplacenotes.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdExchangeBuyer/Resource/Marketplacenotes.php
deleted file mode 100644
index dfd9ca8f..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdExchangeBuyer/Resource/Marketplacenotes.php
+++ /dev/null
@@ -1,61 +0,0 @@
-
- *   $adexchangebuyerService = new Google_Service_AdExchangeBuyer(...);
- *   $marketplacenotes = $adexchangebuyerService->marketplacenotes;
- *  
- */
-class Google_Service_AdExchangeBuyer_Resource_Marketplacenotes extends Google_Service_Resource
-{
-  /**
-   * Add notes to the proposal (marketplacenotes.insert)
-   *
-   * @param string $proposalId The proposalId to add notes for.
-   * @param Google_Service_AdExchangeBuyer_AddOrderNotesRequest $postBody
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_AdExchangeBuyer_AddOrderNotesResponse
-   */
-  public function insert($proposalId, Google_Service_AdExchangeBuyer_AddOrderNotesRequest $postBody, $optParams = array())
-  {
-    $params = array('proposalId' => $proposalId, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('insert', array($params), "Google_Service_AdExchangeBuyer_AddOrderNotesResponse");
-  }
-  /**
-   * Get all the notes associated with a proposal
-   * (marketplacenotes.listMarketplacenotes)
-   *
-   * @param string $proposalId The proposalId to get notes for. To search across
-   * all proposals specify order_id = '-' as part of the URL.
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param string pqlQuery Query string to retrieve specific notes. To search
-   * the text contents of notes, please use syntax like "WHERE note.note = "foo"
-   * or "WHERE note.note LIKE "%bar%"
-   * @return Google_Service_AdExchangeBuyer_GetOrderNotesResponse
-   */
-  public function listMarketplacenotes($proposalId, $optParams = array())
-  {
-    $params = array('proposalId' => $proposalId);
-    $params = array_merge($params, $optParams);
-    return $this->call('list', array($params), "Google_Service_AdExchangeBuyer_GetOrderNotesResponse");
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdExchangeBuyer/Resource/Marketplaceprivateauction.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdExchangeBuyer/Resource/Marketplaceprivateauction.php
deleted file mode 100644
index bc7dbc96..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdExchangeBuyer/Resource/Marketplaceprivateauction.php
+++ /dev/null
@@ -1,42 +0,0 @@
-
- *   $adexchangebuyerService = new Google_Service_AdExchangeBuyer(...);
- *   $marketplaceprivateauction = $adexchangebuyerService->marketplaceprivateauction;
- *  
- */
-class Google_Service_AdExchangeBuyer_Resource_Marketplaceprivateauction extends Google_Service_Resource
-{
-  /**
-   * Update a given private auction proposal
-   * (marketplaceprivateauction.updateproposal)
-   *
-   * @param string $privateAuctionId The private auction id to be updated.
-   * @param Google_Service_AdExchangeBuyer_UpdatePrivateAuctionProposalRequest $postBody
-   * @param array $optParams Optional parameters.
-   */
-  public function updateproposal($privateAuctionId, Google_Service_AdExchangeBuyer_UpdatePrivateAuctionProposalRequest $postBody, $optParams = array())
-  {
-    $params = array('privateAuctionId' => $privateAuctionId, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('updateproposal', array($params));
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdExchangeBuyer/Resource/PerformanceReport.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdExchangeBuyer/Resource/PerformanceReport.php
deleted file mode 100644
index 4198794d..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdExchangeBuyer/Resource/PerformanceReport.php
+++ /dev/null
@@ -1,52 +0,0 @@
-
- *   $adexchangebuyerService = new Google_Service_AdExchangeBuyer(...);
- *   $performanceReport = $adexchangebuyerService->performanceReport;
- *  
- */
-class Google_Service_AdExchangeBuyer_Resource_PerformanceReport extends Google_Service_Resource
-{
-  /**
-   * Retrieves the authenticated user's list of performance metrics.
-   * (performanceReport.listPerformanceReport)
-   *
-   * @param string $accountId The account id to get the reports.
-   * @param string $endDateTime The end time of the report in ISO 8601 timestamp
-   * format using UTC.
-   * @param string $startDateTime The start time of the report in ISO 8601
-   * timestamp format using UTC.
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param string maxResults Maximum number of entries returned on one result
-   * page. If not set, the default is 100. Optional.
-   * @opt_param string pageToken A continuation token, used to page through
-   * performance reports. To retrieve the next page, set this parameter to the
-   * value of "nextPageToken" from the previous response. Optional.
-   * @return Google_Service_AdExchangeBuyer_PerformanceReportList
-   */
-  public function listPerformanceReport($accountId, $endDateTime, $startDateTime, $optParams = array())
-  {
-    $params = array('accountId' => $accountId, 'endDateTime' => $endDateTime, 'startDateTime' => $startDateTime);
-    $params = array_merge($params, $optParams);
-    return $this->call('list', array($params), "Google_Service_AdExchangeBuyer_PerformanceReportList");
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdExchangeBuyer/Resource/PretargetingConfig.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdExchangeBuyer/Resource/PretargetingConfig.php
deleted file mode 100644
index 9d525076..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdExchangeBuyer/Resource/PretargetingConfig.php
+++ /dev/null
@@ -1,118 +0,0 @@
-
- *   $adexchangebuyerService = new Google_Service_AdExchangeBuyer(...);
- *   $pretargetingConfig = $adexchangebuyerService->pretargetingConfig;
- *  
- */
-class Google_Service_AdExchangeBuyer_Resource_PretargetingConfig extends Google_Service_Resource
-{
-  /**
-   * Deletes an existing pretargeting config. (pretargetingConfig.delete)
-   *
-   * @param string $accountId The account id to delete the pretargeting config
-   * for.
-   * @param string $configId The specific id of the configuration to delete.
-   * @param array $optParams Optional parameters.
-   */
-  public function delete($accountId, $configId, $optParams = array())
-  {
-    $params = array('accountId' => $accountId, 'configId' => $configId);
-    $params = array_merge($params, $optParams);
-    return $this->call('delete', array($params));
-  }
-  /**
-   * Gets a specific pretargeting configuration (pretargetingConfig.get)
-   *
-   * @param string $accountId The account id to get the pretargeting config for.
-   * @param string $configId The specific id of the configuration to retrieve.
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_AdExchangeBuyer_PretargetingConfig
-   */
-  public function get($accountId, $configId, $optParams = array())
-  {
-    $params = array('accountId' => $accountId, 'configId' => $configId);
-    $params = array_merge($params, $optParams);
-    return $this->call('get', array($params), "Google_Service_AdExchangeBuyer_PretargetingConfig");
-  }
-  /**
-   * Inserts a new pretargeting configuration. (pretargetingConfig.insert)
-   *
-   * @param string $accountId The account id to insert the pretargeting config
-   * for.
-   * @param Google_Service_AdExchangeBuyer_PretargetingConfig $postBody
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_AdExchangeBuyer_PretargetingConfig
-   */
-  public function insert($accountId, Google_Service_AdExchangeBuyer_PretargetingConfig $postBody, $optParams = array())
-  {
-    $params = array('accountId' => $accountId, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('insert', array($params), "Google_Service_AdExchangeBuyer_PretargetingConfig");
-  }
-  /**
-   * Retrieves a list of the authenticated user's pretargeting configurations.
-   * (pretargetingConfig.listPretargetingConfig)
-   *
-   * @param string $accountId The account id to get the pretargeting configs for.
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_AdExchangeBuyer_PretargetingConfigList
-   */
-  public function listPretargetingConfig($accountId, $optParams = array())
-  {
-    $params = array('accountId' => $accountId);
-    $params = array_merge($params, $optParams);
-    return $this->call('list', array($params), "Google_Service_AdExchangeBuyer_PretargetingConfigList");
-  }
-  /**
-   * Updates an existing pretargeting config. This method supports patch
-   * semantics. (pretargetingConfig.patch)
-   *
-   * @param string $accountId The account id to update the pretargeting config
-   * for.
-   * @param string $configId The specific id of the configuration to update.
-   * @param Google_Service_AdExchangeBuyer_PretargetingConfig $postBody
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_AdExchangeBuyer_PretargetingConfig
-   */
-  public function patch($accountId, $configId, Google_Service_AdExchangeBuyer_PretargetingConfig $postBody, $optParams = array())
-  {
-    $params = array('accountId' => $accountId, 'configId' => $configId, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('patch', array($params), "Google_Service_AdExchangeBuyer_PretargetingConfig");
-  }
-  /**
-   * Updates an existing pretargeting config. (pretargetingConfig.update)
-   *
-   * @param string $accountId The account id to update the pretargeting config
-   * for.
-   * @param string $configId The specific id of the configuration to update.
-   * @param Google_Service_AdExchangeBuyer_PretargetingConfig $postBody
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_AdExchangeBuyer_PretargetingConfig
-   */
-  public function update($accountId, $configId, Google_Service_AdExchangeBuyer_PretargetingConfig $postBody, $optParams = array())
-  {
-    $params = array('accountId' => $accountId, 'configId' => $configId, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('update', array($params), "Google_Service_AdExchangeBuyer_PretargetingConfig");
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdExchangeBuyer/Resource/Products.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdExchangeBuyer/Resource/Products.php
deleted file mode 100644
index cbbf161b..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdExchangeBuyer/Resource/Products.php
+++ /dev/null
@@ -1,55 +0,0 @@
-
- *   $adexchangebuyerService = new Google_Service_AdExchangeBuyer(...);
- *   $products = $adexchangebuyerService->products;
- *  
- */
-class Google_Service_AdExchangeBuyer_Resource_Products extends Google_Service_Resource
-{
-  /**
-   * Gets the requested product by id. (products.get)
-   *
-   * @param string $productId The id for the product to get the head revision for.
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_AdExchangeBuyer_Product
-   */
-  public function get($productId, $optParams = array())
-  {
-    $params = array('productId' => $productId);
-    $params = array_merge($params, $optParams);
-    return $this->call('get', array($params), "Google_Service_AdExchangeBuyer_Product");
-  }
-  /**
-   * Gets the requested product. (products.search)
-   *
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param string pqlQuery The pql query used to query for products.
-   * @return Google_Service_AdExchangeBuyer_GetOffersResponse
-   */
-  public function search($optParams = array())
-  {
-    $params = array();
-    $params = array_merge($params, $optParams);
-    return $this->call('search', array($params), "Google_Service_AdExchangeBuyer_GetOffersResponse");
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdExchangeBuyer/Resource/Proposals.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdExchangeBuyer/Resource/Proposals.php
deleted file mode 100644
index 63c4a03e..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdExchangeBuyer/Resource/Proposals.php
+++ /dev/null
@@ -1,122 +0,0 @@
-
- *   $adexchangebuyerService = new Google_Service_AdExchangeBuyer(...);
- *   $proposals = $adexchangebuyerService->proposals;
- *  
- */
-class Google_Service_AdExchangeBuyer_Resource_Proposals extends Google_Service_Resource
-{
-  /**
-   * Get a proposal given its id (proposals.get)
-   *
-   * @param string $proposalId Id of the proposal to retrieve.
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_AdExchangeBuyer_Proposal
-   */
-  public function get($proposalId, $optParams = array())
-  {
-    $params = array('proposalId' => $proposalId);
-    $params = array_merge($params, $optParams);
-    return $this->call('get', array($params), "Google_Service_AdExchangeBuyer_Proposal");
-  }
-  /**
-   * Create the given list of proposals (proposals.insert)
-   *
-   * @param Google_Service_AdExchangeBuyer_CreateOrdersRequest $postBody
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_AdExchangeBuyer_CreateOrdersResponse
-   */
-  public function insert(Google_Service_AdExchangeBuyer_CreateOrdersRequest $postBody, $optParams = array())
-  {
-    $params = array('postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('insert', array($params), "Google_Service_AdExchangeBuyer_CreateOrdersResponse");
-  }
-  /**
-   * Update the given proposal. This method supports patch semantics.
-   * (proposals.patch)
-   *
-   * @param string $proposalId The proposal id to update.
-   * @param string $revisionNumber The last known revision number to update. If
-   * the head revision in the marketplace database has since changed, an error
-   * will be thrown. The caller should then fetch the latest proposal at head
-   * revision and retry the update at that revision.
-   * @param string $updateAction The proposed action to take on the proposal. This
-   * field is required and it must be set when updating a proposal.
-   * @param Google_Service_AdExchangeBuyer_Proposal $postBody
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_AdExchangeBuyer_Proposal
-   */
-  public function patch($proposalId, $revisionNumber, $updateAction, Google_Service_AdExchangeBuyer_Proposal $postBody, $optParams = array())
-  {
-    $params = array('proposalId' => $proposalId, 'revisionNumber' => $revisionNumber, 'updateAction' => $updateAction, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('patch', array($params), "Google_Service_AdExchangeBuyer_Proposal");
-  }
-  /**
-   * Search for proposals using pql query (proposals.search)
-   *
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param string pqlQuery Query string to retrieve specific proposals.
-   * @return Google_Service_AdExchangeBuyer_GetOrdersResponse
-   */
-  public function search($optParams = array())
-  {
-    $params = array();
-    $params = array_merge($params, $optParams);
-    return $this->call('search', array($params), "Google_Service_AdExchangeBuyer_GetOrdersResponse");
-  }
-  /**
-   * Update the given proposal to indicate that setup has been completed.
-   * (proposals.setupcomplete)
-   *
-   * @param string $proposalId The proposal id for which the setup is complete
-   * @param array $optParams Optional parameters.
-   */
-  public function setupcomplete($proposalId, $optParams = array())
-  {
-    $params = array('proposalId' => $proposalId);
-    $params = array_merge($params, $optParams);
-    return $this->call('setupcomplete', array($params));
-  }
-  /**
-   * Update the given proposal (proposals.update)
-   *
-   * @param string $proposalId The proposal id to update.
-   * @param string $revisionNumber The last known revision number to update. If
-   * the head revision in the marketplace database has since changed, an error
-   * will be thrown. The caller should then fetch the latest proposal at head
-   * revision and retry the update at that revision.
-   * @param string $updateAction The proposed action to take on the proposal. This
-   * field is required and it must be set when updating a proposal.
-   * @param Google_Service_AdExchangeBuyer_Proposal $postBody
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_AdExchangeBuyer_Proposal
-   */
-  public function update($proposalId, $revisionNumber, $updateAction, Google_Service_AdExchangeBuyer_Proposal $postBody, $optParams = array())
-  {
-    $params = array('proposalId' => $proposalId, 'revisionNumber' => $revisionNumber, 'updateAction' => $updateAction, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('update', array($params), "Google_Service_AdExchangeBuyer_Proposal");
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdExchangeBuyer/Resource/Pubprofiles.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdExchangeBuyer/Resource/Pubprofiles.php
deleted file mode 100644
index b3fa00bf..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdExchangeBuyer/Resource/Pubprofiles.php
+++ /dev/null
@@ -1,42 +0,0 @@
-
- *   $adexchangebuyerService = new Google_Service_AdExchangeBuyer(...);
- *   $pubprofiles = $adexchangebuyerService->pubprofiles;
- *  
- */
-class Google_Service_AdExchangeBuyer_Resource_Pubprofiles extends Google_Service_Resource
-{
-  /**
-   * Gets the requested publisher profile(s) by publisher accountId.
-   * (pubprofiles.listPubprofiles)
-   *
-   * @param int $accountId The accountId of the publisher to get profiles for.
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_AdExchangeBuyer_GetPublisherProfilesByAccountIdResponse
-   */
-  public function listPubprofiles($accountId, $optParams = array())
-  {
-    $params = array('accountId' => $accountId);
-    $params = array_merge($params, $optParams);
-    return $this->call('list', array($params), "Google_Service_AdExchangeBuyer_GetPublisherProfilesByAccountIdResponse");
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdExchangeBuyer/Seller.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdExchangeBuyer/Seller.php
deleted file mode 100644
index 82ea611b..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdExchangeBuyer/Seller.php
+++ /dev/null
@@ -1,39 +0,0 @@
-accountId = $accountId;
-  }
-  public function getAccountId()
-  {
-    return $this->accountId;
-  }
-  public function setSubAccountId($subAccountId)
-  {
-    $this->subAccountId = $subAccountId;
-  }
-  public function getSubAccountId()
-  {
-    return $this->subAccountId;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdExchangeBuyer/SharedTargeting.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdExchangeBuyer/SharedTargeting.php
deleted file mode 100644
index 281ec37f..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdExchangeBuyer/SharedTargeting.php
+++ /dev/null
@@ -1,51 +0,0 @@
-exclusions = $exclusions;
-  }
-  public function getExclusions()
-  {
-    return $this->exclusions;
-  }
-  public function setInclusions($inclusions)
-  {
-    $this->inclusions = $inclusions;
-  }
-  public function getInclusions()
-  {
-    return $this->inclusions;
-  }
-  public function setKey($key)
-  {
-    $this->key = $key;
-  }
-  public function getKey()
-  {
-    return $this->key;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdExchangeBuyer/TargetingValue.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdExchangeBuyer/TargetingValue.php
deleted file mode 100644
index a167819b..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdExchangeBuyer/TargetingValue.php
+++ /dev/null
@@ -1,59 +0,0 @@
-creativeSizeValue = $creativeSizeValue;
-  }
-  public function getCreativeSizeValue()
-  {
-    return $this->creativeSizeValue;
-  }
-  public function setDayPartTargetingValue(Google_Service_AdExchangeBuyer_TargetingValueDayPartTargeting $dayPartTargetingValue)
-  {
-    $this->dayPartTargetingValue = $dayPartTargetingValue;
-  }
-  public function getDayPartTargetingValue()
-  {
-    return $this->dayPartTargetingValue;
-  }
-  public function setLongValue($longValue)
-  {
-    $this->longValue = $longValue;
-  }
-  public function getLongValue()
-  {
-    return $this->longValue;
-  }
-  public function setStringValue($stringValue)
-  {
-    $this->stringValue = $stringValue;
-  }
-  public function getStringValue()
-  {
-    return $this->stringValue;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdExchangeBuyer/TargetingValueCreativeSize.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdExchangeBuyer/TargetingValueCreativeSize.php
deleted file mode 100644
index 7302f658..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdExchangeBuyer/TargetingValueCreativeSize.php
+++ /dev/null
@@ -1,60 +0,0 @@
-companionSizes = $companionSizes;
-  }
-  public function getCompanionSizes()
-  {
-    return $this->companionSizes;
-  }
-  public function setCreativeSizeType($creativeSizeType)
-  {
-    $this->creativeSizeType = $creativeSizeType;
-  }
-  public function getCreativeSizeType()
-  {
-    return $this->creativeSizeType;
-  }
-  public function setSize(Google_Service_AdExchangeBuyer_TargetingValueSize $size)
-  {
-    $this->size = $size;
-  }
-  public function getSize()
-  {
-    return $this->size;
-  }
-  public function setSkippableAdType($skippableAdType)
-  {
-    $this->skippableAdType = $skippableAdType;
-  }
-  public function getSkippableAdType()
-  {
-    return $this->skippableAdType;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdExchangeBuyer/TargetingValueDayPartTargeting.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdExchangeBuyer/TargetingValueDayPartTargeting.php
deleted file mode 100644
index da57301a..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdExchangeBuyer/TargetingValueDayPartTargeting.php
+++ /dev/null
@@ -1,41 +0,0 @@
-dayParts = $dayParts;
-  }
-  public function getDayParts()
-  {
-    return $this->dayParts;
-  }
-  public function setTimeZoneType($timeZoneType)
-  {
-    $this->timeZoneType = $timeZoneType;
-  }
-  public function getTimeZoneType()
-  {
-    return $this->timeZoneType;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdExchangeBuyer/TargetingValueDayPartTargetingDayPart.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdExchangeBuyer/TargetingValueDayPartTargetingDayPart.php
deleted file mode 100644
index f656ae74..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdExchangeBuyer/TargetingValueDayPartTargetingDayPart.php
+++ /dev/null
@@ -1,66 +0,0 @@
-dayOfWeek = $dayOfWeek;
-  }
-  public function getDayOfWeek()
-  {
-    return $this->dayOfWeek;
-  }
-  public function setEndHour($endHour)
-  {
-    $this->endHour = $endHour;
-  }
-  public function getEndHour()
-  {
-    return $this->endHour;
-  }
-  public function setEndMinute($endMinute)
-  {
-    $this->endMinute = $endMinute;
-  }
-  public function getEndMinute()
-  {
-    return $this->endMinute;
-  }
-  public function setStartHour($startHour)
-  {
-    $this->startHour = $startHour;
-  }
-  public function getStartHour()
-  {
-    return $this->startHour;
-  }
-  public function setStartMinute($startMinute)
-  {
-    $this->startMinute = $startMinute;
-  }
-  public function getStartMinute()
-  {
-    return $this->startMinute;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdExchangeBuyer/TargetingValueSize.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdExchangeBuyer/TargetingValueSize.php
deleted file mode 100644
index 116c5b5f..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdExchangeBuyer/TargetingValueSize.php
+++ /dev/null
@@ -1,39 +0,0 @@
-height = $height;
-  }
-  public function getHeight()
-  {
-    return $this->height;
-  }
-  public function setWidth($width)
-  {
-    $this->width = $width;
-  }
-  public function getWidth()
-  {
-    return $this->width;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdExchangeBuyer/UpdatePrivateAuctionProposalRequest.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdExchangeBuyer/UpdatePrivateAuctionProposalRequest.php
deleted file mode 100644
index 8ec36d3d..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdExchangeBuyer/UpdatePrivateAuctionProposalRequest.php
+++ /dev/null
@@ -1,58 +0,0 @@
-externalDealId = $externalDealId;
-  }
-  public function getExternalDealId()
-  {
-    return $this->externalDealId;
-  }
-  public function setNote(Google_Service_AdExchangeBuyer_MarketplaceNote $note)
-  {
-    $this->note = $note;
-  }
-  public function getNote()
-  {
-    return $this->note;
-  }
-  public function setProposalRevisionNumber($proposalRevisionNumber)
-  {
-    $this->proposalRevisionNumber = $proposalRevisionNumber;
-  }
-  public function getProposalRevisionNumber()
-  {
-    return $this->proposalRevisionNumber;
-  }
-  public function setUpdateAction($updateAction)
-  {
-    $this->updateAction = $updateAction;
-  }
-  public function getUpdateAction()
-  {
-    return $this->updateAction;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdExchangeBuyerII.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdExchangeBuyerII.php
deleted file mode 100644
index 99ce5a6f..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdExchangeBuyerII.php
+++ /dev/null
@@ -1,441 +0,0 @@
-
- * Accesses the latest features for managing Ad Exchange accounts, Real-Time
- * Bidding configurations and auction metrics, and Marketplace programmatic
- * deals.

- *
- * 

- * For more information about this service, see the API
- * Documentation
- * 

- *
- * @author Google, Inc.
- */
-class Google_Service_AdExchangeBuyerII extends Google_Service
-{
-  /** Manage your Ad Exchange buyer account configuration. */
-  const ADEXCHANGE_BUYER =
-      "https://www.googleapis.com/auth/adexchange.buyer";
-
-  public $accounts_clients;
-  public $accounts_clients_invitations;
-  public $accounts_clients_users;
-  public $accounts_creatives;
-  public $accounts_creatives_dealAssociations;
-  
-  /**
-   * Constructs the internal representation of the AdExchangeBuyerII service.
-   *
-   * @param Google_Client $client
-   */
-  public function __construct(Google_Client $client)
-  {
-    parent::__construct($client);
-    $this->rootUrl = 'https://adexchangebuyer.googleapis.com/';
-    $this->servicePath = '';
-    $this->version = 'v2beta1';
-    $this->serviceName = 'adexchangebuyer2';
-
-    $this->accounts_clients = new Google_Service_AdExchangeBuyerII_Resource_AccountsClients(
-        $this,
-        $this->serviceName,
-        'clients',
-        array(
-          'methods' => array(
-            'create' => array(
-              'path' => 'v2beta1/accounts/{accountId}/clients',
-              'httpMethod' => 'POST',
-              'parameters' => array(
-                'accountId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'get' => array(
-              'path' => 'v2beta1/accounts/{accountId}/clients/{clientAccountId}',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'accountId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'clientAccountId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'list' => array(
-              'path' => 'v2beta1/accounts/{accountId}/clients',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'accountId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'pageToken' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'pageSize' => array(
-                  'location' => 'query',
-                  'type' => 'integer',
-                ),
-              ),
-            ),'update' => array(
-              'path' => 'v2beta1/accounts/{accountId}/clients/{clientAccountId}',
-              'httpMethod' => 'PUT',
-              'parameters' => array(
-                'accountId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'clientAccountId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),
-          )
-        )
-    );
-    $this->accounts_clients_invitations = new Google_Service_AdExchangeBuyerII_Resource_AccountsClientsInvitations(
-        $this,
-        $this->serviceName,
-        'invitations',
-        array(
-          'methods' => array(
-            'create' => array(
-              'path' => 'v2beta1/accounts/{accountId}/clients/{clientAccountId}/invitations',
-              'httpMethod' => 'POST',
-              'parameters' => array(
-                'accountId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'clientAccountId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'get' => array(
-              'path' => 'v2beta1/accounts/{accountId}/clients/{clientAccountId}/invitations/{invitationId}',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'accountId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'clientAccountId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'invitationId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'list' => array(
-              'path' => 'v2beta1/accounts/{accountId}/clients/{clientAccountId}/invitations',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'accountId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'clientAccountId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'pageToken' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'pageSize' => array(
-                  'location' => 'query',
-                  'type' => 'integer',
-                ),
-              ),
-            ),
-          )
-        )
-    );
-    $this->accounts_clients_users = new Google_Service_AdExchangeBuyerII_Resource_AccountsClientsUsers(
-        $this,
-        $this->serviceName,
-        'users',
-        array(
-          'methods' => array(
-            'get' => array(
-              'path' => 'v2beta1/accounts/{accountId}/clients/{clientAccountId}/users/{userId}',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'accountId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'clientAccountId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'userId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'list' => array(
-              'path' => 'v2beta1/accounts/{accountId}/clients/{clientAccountId}/users',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'accountId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'clientAccountId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'pageToken' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'pageSize' => array(
-                  'location' => 'query',
-                  'type' => 'integer',
-                ),
-              ),
-            ),'update' => array(
-              'path' => 'v2beta1/accounts/{accountId}/clients/{clientAccountId}/users/{userId}',
-              'httpMethod' => 'PUT',
-              'parameters' => array(
-                'accountId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'clientAccountId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'userId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),
-          )
-        )
-    );
-    $this->accounts_creatives = new Google_Service_AdExchangeBuyerII_Resource_AccountsCreatives(
-        $this,
-        $this->serviceName,
-        'creatives',
-        array(
-          'methods' => array(
-            'create' => array(
-              'path' => 'v2beta1/accounts/{accountId}/creatives',
-              'httpMethod' => 'POST',
-              'parameters' => array(
-                'accountId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'duplicateIdMode' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-              ),
-            ),'get' => array(
-              'path' => 'v2beta1/accounts/{accountId}/creatives/{creativeId}',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'accountId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'creativeId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'list' => array(
-              'path' => 'v2beta1/accounts/{accountId}/creatives',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'accountId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'pageToken' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'pageSize' => array(
-                  'location' => 'query',
-                  'type' => 'integer',
-                ),
-                'query' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-              ),
-            ),'stopWatching' => array(
-              'path' => 'v2beta1/accounts/{accountId}/creatives/{creativeId}:stopWatching',
-              'httpMethod' => 'POST',
-              'parameters' => array(
-                'accountId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'creativeId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'update' => array(
-              'path' => 'v2beta1/accounts/{accountId}/creatives/{creativeId}',
-              'httpMethod' => 'PUT',
-              'parameters' => array(
-                'accountId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'creativeId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'watch' => array(
-              'path' => 'v2beta1/accounts/{accountId}/creatives/{creativeId}:watch',
-              'httpMethod' => 'POST',
-              'parameters' => array(
-                'accountId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'creativeId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),
-          )
-        )
-    );
-    $this->accounts_creatives_dealAssociations = new Google_Service_AdExchangeBuyerII_Resource_AccountsCreativesDealAssociations(
-        $this,
-        $this->serviceName,
-        'dealAssociations',
-        array(
-          'methods' => array(
-            'add' => array(
-              'path' => 'v2beta1/accounts/{accountId}/creatives/{creativeId}/dealAssociations:add',
-              'httpMethod' => 'POST',
-              'parameters' => array(
-                'accountId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'creativeId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'list' => array(
-              'path' => 'v2beta1/accounts/{accountId}/creatives/{creativeId}/dealAssociations',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'accountId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'creativeId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'pageToken' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'pageSize' => array(
-                  'location' => 'query',
-                  'type' => 'integer',
-                ),
-                'query' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-              ),
-            ),'remove' => array(
-              'path' => 'v2beta1/accounts/{accountId}/creatives/{creativeId}/dealAssociations:remove',
-              'httpMethod' => 'POST',
-              'parameters' => array(
-                'accountId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'creativeId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),
-          )
-        )
-    );
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdExchangeBuyerII/AddDealAssociationRequest.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdExchangeBuyerII/AddDealAssociationRequest.php
deleted file mode 100644
index 032c0279..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdExchangeBuyerII/AddDealAssociationRequest.php
+++ /dev/null
@@ -1,31 +0,0 @@
-association = $association;
-  }
-  public function getAssociation()
-  {
-    return $this->association;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdExchangeBuyerII/Adexchangebuyer2Empty.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdExchangeBuyerII/Adexchangebuyer2Empty.php
deleted file mode 100644
index 360f021f..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdExchangeBuyerII/Adexchangebuyer2Empty.php
+++ /dev/null
@@ -1,20 +0,0 @@
-appTypes = $appTypes;
-  }
-  public function getAppTypes()
-  {
-    return $this->appTypes;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdExchangeBuyerII/AuctionContext.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdExchangeBuyerII/AuctionContext.php
deleted file mode 100644
index b3144e80..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdExchangeBuyerII/AuctionContext.php
+++ /dev/null
@@ -1,31 +0,0 @@
-auctionTypes = $auctionTypes;
-  }
-  public function getAuctionTypes()
-  {
-    return $this->auctionTypes;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdExchangeBuyerII/Client.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdExchangeBuyerII/Client.php
deleted file mode 100644
index 8a0d1242..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdExchangeBuyerII/Client.php
+++ /dev/null
@@ -1,93 +0,0 @@
-clientAccountId = $clientAccountId;
-  }
-  public function getClientAccountId()
-  {
-    return $this->clientAccountId;
-  }
-  public function setClientName($clientName)
-  {
-    $this->clientName = $clientName;
-  }
-  public function getClientName()
-  {
-    return $this->clientName;
-  }
-  public function setEntityId($entityId)
-  {
-    $this->entityId = $entityId;
-  }
-  public function getEntityId()
-  {
-    return $this->entityId;
-  }
-  public function setEntityName($entityName)
-  {
-    $this->entityName = $entityName;
-  }
-  public function getEntityName()
-  {
-    return $this->entityName;
-  }
-  public function setEntityType($entityType)
-  {
-    $this->entityType = $entityType;
-  }
-  public function getEntityType()
-  {
-    return $this->entityType;
-  }
-  public function setRole($role)
-  {
-    $this->role = $role;
-  }
-  public function getRole()
-  {
-    return $this->role;
-  }
-  public function setStatus($status)
-  {
-    $this->status = $status;
-  }
-  public function getStatus()
-  {
-    return $this->status;
-  }
-  public function setVisibleToSeller($visibleToSeller)
-  {
-    $this->visibleToSeller = $visibleToSeller;
-  }
-  public function getVisibleToSeller()
-  {
-    return $this->visibleToSeller;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdExchangeBuyerII/ClientUser.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdExchangeBuyerII/ClientUser.php
deleted file mode 100644
index da71813e..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdExchangeBuyerII/ClientUser.php
+++ /dev/null
@@ -1,57 +0,0 @@
-clientAccountId = $clientAccountId;
-  }
-  public function getClientAccountId()
-  {
-    return $this->clientAccountId;
-  }
-  public function setEmail($email)
-  {
-    $this->email = $email;
-  }
-  public function getEmail()
-  {
-    return $this->email;
-  }
-  public function setStatus($status)
-  {
-    $this->status = $status;
-  }
-  public function getStatus()
-  {
-    return $this->status;
-  }
-  public function setUserId($userId)
-  {
-    $this->userId = $userId;
-  }
-  public function getUserId()
-  {
-    return $this->userId;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdExchangeBuyerII/ClientUserInvitation.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdExchangeBuyerII/ClientUserInvitation.php
deleted file mode 100644
index fe3d0cc8..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdExchangeBuyerII/ClientUserInvitation.php
+++ /dev/null
@@ -1,48 +0,0 @@
-clientAccountId = $clientAccountId;
-  }
-  public function getClientAccountId()
-  {
-    return $this->clientAccountId;
-  }
-  public function setEmail($email)
-  {
-    $this->email = $email;
-  }
-  public function getEmail()
-  {
-    return $this->email;
-  }
-  public function setInvitationId($invitationId)
-  {
-    $this->invitationId = $invitationId;
-  }
-  public function getInvitationId()
-  {
-    return $this->invitationId;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdExchangeBuyerII/Correction.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdExchangeBuyerII/Correction.php
deleted file mode 100644
index 3e1f2eea..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdExchangeBuyerII/Correction.php
+++ /dev/null
@@ -1,50 +0,0 @@
-contexts = $contexts;
-  }
-  public function getContexts()
-  {
-    return $this->contexts;
-  }
-  public function setDetails($details)
-  {
-    $this->details = $details;
-  }
-  public function getDetails()
-  {
-    return $this->details;
-  }
-  public function setType($type)
-  {
-    $this->type = $type;
-  }
-  public function getType()
-  {
-    return $this->type;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdExchangeBuyerII/Creative.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdExchangeBuyerII/Creative.php
deleted file mode 100644
index 54930e4a..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdExchangeBuyerII/Creative.php
+++ /dev/null
@@ -1,253 +0,0 @@
-accountId = $accountId;
-  }
-  public function getAccountId()
-  {
-    return $this->accountId;
-  }
-  public function setAdChoicesDestinationUrl($adChoicesDestinationUrl)
-  {
-    $this->adChoicesDestinationUrl = $adChoicesDestinationUrl;
-  }
-  public function getAdChoicesDestinationUrl()
-  {
-    return $this->adChoicesDestinationUrl;
-  }
-  public function setAdvertiserName($advertiserName)
-  {
-    $this->advertiserName = $advertiserName;
-  }
-  public function getAdvertiserName()
-  {
-    return $this->advertiserName;
-  }
-  public function setAgencyId($agencyId)
-  {
-    $this->agencyId = $agencyId;
-  }
-  public function getAgencyId()
-  {
-    return $this->agencyId;
-  }
-  public function setApiUpdateTime($apiUpdateTime)
-  {
-    $this->apiUpdateTime = $apiUpdateTime;
-  }
-  public function getApiUpdateTime()
-  {
-    return $this->apiUpdateTime;
-  }
-  public function setAttributes($attributes)
-  {
-    $this->attributes = $attributes;
-  }
-  public function getAttributes()
-  {
-    return $this->attributes;
-  }
-  public function setClickThroughUrls($clickThroughUrls)
-  {
-    $this->clickThroughUrls = $clickThroughUrls;
-  }
-  public function getClickThroughUrls()
-  {
-    return $this->clickThroughUrls;
-  }
-  public function setCorrections($corrections)
-  {
-    $this->corrections = $corrections;
-  }
-  public function getCorrections()
-  {
-    return $this->corrections;
-  }
-  public function setCreativeId($creativeId)
-  {
-    $this->creativeId = $creativeId;
-  }
-  public function getCreativeId()
-  {
-    return $this->creativeId;
-  }
-  public function setDealsStatus($dealsStatus)
-  {
-    $this->dealsStatus = $dealsStatus;
-  }
-  public function getDealsStatus()
-  {
-    return $this->dealsStatus;
-  }
-  public function setDetectedAdvertiserIds($detectedAdvertiserIds)
-  {
-    $this->detectedAdvertiserIds = $detectedAdvertiserIds;
-  }
-  public function getDetectedAdvertiserIds()
-  {
-    return $this->detectedAdvertiserIds;
-  }
-  public function setDetectedDomains($detectedDomains)
-  {
-    $this->detectedDomains = $detectedDomains;
-  }
-  public function getDetectedDomains()
-  {
-    return $this->detectedDomains;
-  }
-  public function setDetectedLanguages($detectedLanguages)
-  {
-    $this->detectedLanguages = $detectedLanguages;
-  }
-  public function getDetectedLanguages()
-  {
-    return $this->detectedLanguages;
-  }
-  public function setDetectedProductCategories($detectedProductCategories)
-  {
-    $this->detectedProductCategories = $detectedProductCategories;
-  }
-  public function getDetectedProductCategories()
-  {
-    return $this->detectedProductCategories;
-  }
-  public function setDetectedSensitiveCategories($detectedSensitiveCategories)
-  {
-    $this->detectedSensitiveCategories = $detectedSensitiveCategories;
-  }
-  public function getDetectedSensitiveCategories()
-  {
-    return $this->detectedSensitiveCategories;
-  }
-  public function setFilteringStats(Google_Service_AdExchangeBuyerII_FilteringStats $filteringStats)
-  {
-    $this->filteringStats = $filteringStats;
-  }
-  public function getFilteringStats()
-  {
-    return $this->filteringStats;
-  }
-  public function setHtml(Google_Service_AdExchangeBuyerII_HtmlContent $html)
-  {
-    $this->html = $html;
-  }
-  public function getHtml()
-  {
-    return $this->html;
-  }
-  public function setImpressionTrackingUrls($impressionTrackingUrls)
-  {
-    $this->impressionTrackingUrls = $impressionTrackingUrls;
-  }
-  public function getImpressionTrackingUrls()
-  {
-    return $this->impressionTrackingUrls;
-  }
-  public function setNative(Google_Service_AdExchangeBuyerII_NativeContent $native)
-  {
-    $this->native = $native;
-  }
-  public function getNative()
-  {
-    return $this->native;
-  }
-  public function setOpenAuctionStatus($openAuctionStatus)
-  {
-    $this->openAuctionStatus = $openAuctionStatus;
-  }
-  public function getOpenAuctionStatus()
-  {
-    return $this->openAuctionStatus;
-  }
-  public function setRestrictedCategories($restrictedCategories)
-  {
-    $this->restrictedCategories = $restrictedCategories;
-  }
-  public function getRestrictedCategories()
-  {
-    return $this->restrictedCategories;
-  }
-  public function setServingRestrictions($servingRestrictions)
-  {
-    $this->servingRestrictions = $servingRestrictions;
-  }
-  public function getServingRestrictions()
-  {
-    return $this->servingRestrictions;
-  }
-  public function setVendorIds($vendorIds)
-  {
-    $this->vendorIds = $vendorIds;
-  }
-  public function getVendorIds()
-  {
-    return $this->vendorIds;
-  }
-  public function setVersion($version)
-  {
-    $this->version = $version;
-  }
-  public function getVersion()
-  {
-    return $this->version;
-  }
-  public function setVideo(Google_Service_AdExchangeBuyerII_VideoContent $video)
-  {
-    $this->video = $video;
-  }
-  public function getVideo()
-  {
-    return $this->video;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdExchangeBuyerII/CreativeDealAssociation.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdExchangeBuyerII/CreativeDealAssociation.php
deleted file mode 100644
index 4ce53aa7..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdExchangeBuyerII/CreativeDealAssociation.php
+++ /dev/null
@@ -1,48 +0,0 @@
-accountId = $accountId;
-  }
-  public function getAccountId()
-  {
-    return $this->accountId;
-  }
-  public function setCreativeId($creativeId)
-  {
-    $this->creativeId = $creativeId;
-  }
-  public function getCreativeId()
-  {
-    return $this->creativeId;
-  }
-  public function setDealsId($dealsId)
-  {
-    $this->dealsId = $dealsId;
-  }
-  public function getDealsId()
-  {
-    return $this->dealsId;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdExchangeBuyerII/Date.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdExchangeBuyerII/Date.php
deleted file mode 100644
index 0d65a08d..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdExchangeBuyerII/Date.php
+++ /dev/null
@@ -1,48 +0,0 @@
-day = $day;
-  }
-  public function getDay()
-  {
-    return $this->day;
-  }
-  public function setMonth($month)
-  {
-    $this->month = $month;
-  }
-  public function getMonth()
-  {
-    return $this->month;
-  }
-  public function setYear($year)
-  {
-    $this->year = $year;
-  }
-  public function getYear()
-  {
-    return $this->year;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdExchangeBuyerII/Disapproval.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdExchangeBuyerII/Disapproval.php
deleted file mode 100644
index 6a6824a9..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdExchangeBuyerII/Disapproval.php
+++ /dev/null
@@ -1,40 +0,0 @@
-details = $details;
-  }
-  public function getDetails()
-  {
-    return $this->details;
-  }
-  public function setReason($reason)
-  {
-    $this->reason = $reason;
-  }
-  public function getReason()
-  {
-    return $this->reason;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdExchangeBuyerII/FilteringStats.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdExchangeBuyerII/FilteringStats.php
deleted file mode 100644
index ecc5a875..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdExchangeBuyerII/FilteringStats.php
+++ /dev/null
@@ -1,42 +0,0 @@
-date = $date;
-  }
-  public function getDate()
-  {
-    return $this->date;
-  }
-  public function setReasons($reasons)
-  {
-    $this->reasons = $reasons;
-  }
-  public function getReasons()
-  {
-    return $this->reasons;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdExchangeBuyerII/HtmlContent.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdExchangeBuyerII/HtmlContent.php
deleted file mode 100644
index 5e474ed5..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdExchangeBuyerII/HtmlContent.php
+++ /dev/null
@@ -1,48 +0,0 @@
-height = $height;
-  }
-  public function getHeight()
-  {
-    return $this->height;
-  }
-  public function setSnippet($snippet)
-  {
-    $this->snippet = $snippet;
-  }
-  public function getSnippet()
-  {
-    return $this->snippet;
-  }
-  public function setWidth($width)
-  {
-    $this->width = $width;
-  }
-  public function getWidth()
-  {
-    return $this->width;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdExchangeBuyerII/Image.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdExchangeBuyerII/Image.php
deleted file mode 100644
index 4abc4434..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdExchangeBuyerII/Image.php
+++ /dev/null
@@ -1,48 +0,0 @@
-height = $height;
-  }
-  public function getHeight()
-  {
-    return $this->height;
-  }
-  public function setUrl($url)
-  {
-    $this->url = $url;
-  }
-  public function getUrl()
-  {
-    return $this->url;
-  }
-  public function setWidth($width)
-  {
-    $this->width = $width;
-  }
-  public function getWidth()
-  {
-    return $this->width;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdExchangeBuyerII/ListClientUserInvitationsResponse.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdExchangeBuyerII/ListClientUserInvitationsResponse.php
deleted file mode 100644
index b33d7d05..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdExchangeBuyerII/ListClientUserInvitationsResponse.php
+++ /dev/null
@@ -1,41 +0,0 @@
-invitations = $invitations;
-  }
-  public function getInvitations()
-  {
-    return $this->invitations;
-  }
-  public function setNextPageToken($nextPageToken)
-  {
-    $this->nextPageToken = $nextPageToken;
-  }
-  public function getNextPageToken()
-  {
-    return $this->nextPageToken;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdExchangeBuyerII/ListClientUsersResponse.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdExchangeBuyerII/ListClientUsersResponse.php
deleted file mode 100644
index 8458df7b..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdExchangeBuyerII/ListClientUsersResponse.php
+++ /dev/null
@@ -1,41 +0,0 @@
-nextPageToken = $nextPageToken;
-  }
-  public function getNextPageToken()
-  {
-    return $this->nextPageToken;
-  }
-  public function setUsers($users)
-  {
-    $this->users = $users;
-  }
-  public function getUsers()
-  {
-    return $this->users;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdExchangeBuyerII/ListClientsResponse.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdExchangeBuyerII/ListClientsResponse.php
deleted file mode 100644
index 03fe35a8..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdExchangeBuyerII/ListClientsResponse.php
+++ /dev/null
@@ -1,41 +0,0 @@
-clients = $clients;
-  }
-  public function getClients()
-  {
-    return $this->clients;
-  }
-  public function setNextPageToken($nextPageToken)
-  {
-    $this->nextPageToken = $nextPageToken;
-  }
-  public function getNextPageToken()
-  {
-    return $this->nextPageToken;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdExchangeBuyerII/ListCreativesResponse.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdExchangeBuyerII/ListCreativesResponse.php
deleted file mode 100644
index 10df66aa..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdExchangeBuyerII/ListCreativesResponse.php
+++ /dev/null
@@ -1,41 +0,0 @@
-creatives = $creatives;
-  }
-  public function getCreatives()
-  {
-    return $this->creatives;
-  }
-  public function setNextPageToken($nextPageToken)
-  {
-    $this->nextPageToken = $nextPageToken;
-  }
-  public function getNextPageToken()
-  {
-    return $this->nextPageToken;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdExchangeBuyerII/ListDealAssociationsResponse.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdExchangeBuyerII/ListDealAssociationsResponse.php
deleted file mode 100644
index 9014532b..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdExchangeBuyerII/ListDealAssociationsResponse.php
+++ /dev/null
@@ -1,41 +0,0 @@
-associations = $associations;
-  }
-  public function getAssociations()
-  {
-    return $this->associations;
-  }
-  public function setNextPageToken($nextPageToken)
-  {
-    $this->nextPageToken = $nextPageToken;
-  }
-  public function getNextPageToken()
-  {
-    return $this->nextPageToken;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdExchangeBuyerII/LocationContext.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdExchangeBuyerII/LocationContext.php
deleted file mode 100644
index 38b65c92..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdExchangeBuyerII/LocationContext.php
+++ /dev/null
@@ -1,31 +0,0 @@
-geoCriteriaIds = $geoCriteriaIds;
-  }
-  public function getGeoCriteriaIds()
-  {
-    return $this->geoCriteriaIds;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdExchangeBuyerII/NativeContent.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdExchangeBuyerII/NativeContent.php
deleted file mode 100644
index c5d7b6fd..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdExchangeBuyerII/NativeContent.php
+++ /dev/null
@@ -1,141 +0,0 @@
-advertiserName = $advertiserName;
-  }
-  public function getAdvertiserName()
-  {
-    return $this->advertiserName;
-  }
-  public function setAppIcon(Google_Service_AdExchangeBuyerII_Image $appIcon)
-  {
-    $this->appIcon = $appIcon;
-  }
-  public function getAppIcon()
-  {
-    return $this->appIcon;
-  }
-  public function setBody($body)
-  {
-    $this->body = $body;
-  }
-  public function getBody()
-  {
-    return $this->body;
-  }
-  public function setCallToAction($callToAction)
-  {
-    $this->callToAction = $callToAction;
-  }
-  public function getCallToAction()
-  {
-    return $this->callToAction;
-  }
-  public function setClickLinkUrl($clickLinkUrl)
-  {
-    $this->clickLinkUrl = $clickLinkUrl;
-  }
-  public function getClickLinkUrl()
-  {
-    return $this->clickLinkUrl;
-  }
-  public function setClickTrackingUrl($clickTrackingUrl)
-  {
-    $this->clickTrackingUrl = $clickTrackingUrl;
-  }
-  public function getClickTrackingUrl()
-  {
-    return $this->clickTrackingUrl;
-  }
-  public function setHeadline($headline)
-  {
-    $this->headline = $headline;
-  }
-  public function getHeadline()
-  {
-    return $this->headline;
-  }
-  public function setImage(Google_Service_AdExchangeBuyerII_Image $image)
-  {
-    $this->image = $image;
-  }
-  public function getImage()
-  {
-    return $this->image;
-  }
-  public function setLogo(Google_Service_AdExchangeBuyerII_Image $logo)
-  {
-    $this->logo = $logo;
-  }
-  public function getLogo()
-  {
-    return $this->logo;
-  }
-  public function setPriceDisplayText($priceDisplayText)
-  {
-    $this->priceDisplayText = $priceDisplayText;
-  }
-  public function getPriceDisplayText()
-  {
-    return $this->priceDisplayText;
-  }
-  public function setStarRating($starRating)
-  {
-    $this->starRating = $starRating;
-  }
-  public function getStarRating()
-  {
-    return $this->starRating;
-  }
-  public function setStoreUrl($storeUrl)
-  {
-    $this->storeUrl = $storeUrl;
-  }
-  public function getStoreUrl()
-  {
-    return $this->storeUrl;
-  }
-  public function setVideoUrl($videoUrl)
-  {
-    $this->videoUrl = $videoUrl;
-  }
-  public function getVideoUrl()
-  {
-    return $this->videoUrl;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdExchangeBuyerII/PlatformContext.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdExchangeBuyerII/PlatformContext.php
deleted file mode 100644
index 07fd0680..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdExchangeBuyerII/PlatformContext.php
+++ /dev/null
@@ -1,31 +0,0 @@
-platforms = $platforms;
-  }
-  public function getPlatforms()
-  {
-    return $this->platforms;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdExchangeBuyerII/Reason.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdExchangeBuyerII/Reason.php
deleted file mode 100644
index 5b536f3a..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdExchangeBuyerII/Reason.php
+++ /dev/null
@@ -1,39 +0,0 @@
-count = $count;
-  }
-  public function getCount()
-  {
-    return $this->count;
-  }
-  public function setStatus($status)
-  {
-    $this->status = $status;
-  }
-  public function getStatus()
-  {
-    return $this->status;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdExchangeBuyerII/RemoveDealAssociationRequest.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdExchangeBuyerII/RemoveDealAssociationRequest.php
deleted file mode 100644
index a0997af7..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdExchangeBuyerII/RemoveDealAssociationRequest.php
+++ /dev/null
@@ -1,31 +0,0 @@
-association = $association;
-  }
-  public function getAssociation()
-  {
-    return $this->association;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdExchangeBuyerII/Resource/Accounts.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdExchangeBuyerII/Resource/Accounts.php
deleted file mode 100644
index b4753fb6..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdExchangeBuyerII/Resource/Accounts.php
+++ /dev/null
@@ -1,28 +0,0 @@
-
- *   $adexchangebuyer2Service = new Google_Service_AdExchangeBuyerII(...);
- *   $accounts = $adexchangebuyer2Service->accounts;
- *  
- */
-class Google_Service_AdExchangeBuyerII_Resource_Accounts extends Google_Service_Resource
-{
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdExchangeBuyerII/Resource/AccountsClients.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdExchangeBuyerII/Resource/AccountsClients.php
deleted file mode 100644
index 6006cac9..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdExchangeBuyerII/Resource/AccountsClients.php
+++ /dev/null
@@ -1,101 +0,0 @@
-
- *   $adexchangebuyer2Service = new Google_Service_AdExchangeBuyerII(...);
- *   $clients = $adexchangebuyer2Service->clients;
- *  
- */
-class Google_Service_AdExchangeBuyerII_Resource_AccountsClients extends Google_Service_Resource
-{
-  /**
-   * Creates a new client buyer. (clients.create)
-   *
-   * @param string $accountId Unique numerical account ID for the buyer of which
-   * the client buyer is a customer; the sponsor buyer to create a client for.
-   * (required)
-   * @param Google_Service_AdExchangeBuyerII_Client $postBody
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_AdExchangeBuyerII_Client
-   */
-  public function create($accountId, Google_Service_AdExchangeBuyerII_Client $postBody, $optParams = array())
-  {
-    $params = array('accountId' => $accountId, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('create', array($params), "Google_Service_AdExchangeBuyerII_Client");
-  }
-  /**
-   * Gets a client buyer with a given client account ID. (clients.get)
-   *
-   * @param string $accountId Numerical account ID of the client's sponsor buyer.
-   * (required)
-   * @param string $clientAccountId Numerical account ID of the client buyer to
-   * retrieve. (required)
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_AdExchangeBuyerII_Client
-   */
-  public function get($accountId, $clientAccountId, $optParams = array())
-  {
-    $params = array('accountId' => $accountId, 'clientAccountId' => $clientAccountId);
-    $params = array_merge($params, $optParams);
-    return $this->call('get', array($params), "Google_Service_AdExchangeBuyerII_Client");
-  }
-  /**
-   * Lists all the clients for the current sponsor buyer.
-   * (clients.listAccountsClients)
-   *
-   * @param string $accountId Unique numerical account ID of the sponsor buyer to
-   * list the clients for.
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param string pageToken A token identifying a page of results the server
-   * should return. Typically, this is the value of
-   * ListClientsResponse.nextPageToken returned from the previous call to the
-   * accounts.clients.list method.
-   * @opt_param int pageSize Requested page size. The server may return fewer
-   * clients than requested. If unspecified, the server will pick an appropriate
-   * default.
-   * @return Google_Service_AdExchangeBuyerII_ListClientsResponse
-   */
-  public function listAccountsClients($accountId, $optParams = array())
-  {
-    $params = array('accountId' => $accountId);
-    $params = array_merge($params, $optParams);
-    return $this->call('list', array($params), "Google_Service_AdExchangeBuyerII_ListClientsResponse");
-  }
-  /**
-   * Updates an existing client buyer. (clients.update)
-   *
-   * @param string $accountId Unique numerical account ID for the buyer of which
-   * the client buyer is a customer; the sponsor buyer to update a client for.
-   * (required)
-   * @param string $clientAccountId Unique numerical account ID of the client to
-   * update. (required)
-   * @param Google_Service_AdExchangeBuyerII_Client $postBody
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_AdExchangeBuyerII_Client
-   */
-  public function update($accountId, $clientAccountId, Google_Service_AdExchangeBuyerII_Client $postBody, $optParams = array())
-  {
-    $params = array('accountId' => $accountId, 'clientAccountId' => $clientAccountId, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('update', array($params), "Google_Service_AdExchangeBuyerII_Client");
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdExchangeBuyerII/Resource/AccountsClientsInvitations.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdExchangeBuyerII/Resource/AccountsClientsInvitations.php
deleted file mode 100644
index 5a8569c9..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdExchangeBuyerII/Resource/AccountsClientsInvitations.php
+++ /dev/null
@@ -1,90 +0,0 @@
-
- *   $adexchangebuyer2Service = new Google_Service_AdExchangeBuyerII(...);
- *   $invitations = $adexchangebuyer2Service->invitations;
- *  
- */
-class Google_Service_AdExchangeBuyerII_Resource_AccountsClientsInvitations extends Google_Service_Resource
-{
-  /**
-   * Creates and sends out an email invitation to access an Ad Exchange client
-   * buyer account. (invitations.create)
-   *
-   * @param string $accountId Numerical account ID of the client's sponsor buyer.
-   * (required)
-   * @param string $clientAccountId Numerical account ID of the client buyer that
-   * the user should be associated with. (required)
-   * @param Google_Service_AdExchangeBuyerII_ClientUserInvitation $postBody
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_AdExchangeBuyerII_ClientUserInvitation
-   */
-  public function create($accountId, $clientAccountId, Google_Service_AdExchangeBuyerII_ClientUserInvitation $postBody, $optParams = array())
-  {
-    $params = array('accountId' => $accountId, 'clientAccountId' => $clientAccountId, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('create', array($params), "Google_Service_AdExchangeBuyerII_ClientUserInvitation");
-  }
-  /**
-   * Retrieves an existing client user invitation. (invitations.get)
-   *
-   * @param string $accountId Numerical account ID of the client's sponsor buyer.
-   * (required)
-   * @param string $clientAccountId Numerical account ID of the client buyer that
-   * the user invitation to be retrieved is associated with. (required)
-   * @param string $invitationId Numerical identifier of the user invitation to
-   * retrieve. (required)
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_AdExchangeBuyerII_ClientUserInvitation
-   */
-  public function get($accountId, $clientAccountId, $invitationId, $optParams = array())
-  {
-    $params = array('accountId' => $accountId, 'clientAccountId' => $clientAccountId, 'invitationId' => $invitationId);
-    $params = array_merge($params, $optParams);
-    return $this->call('get', array($params), "Google_Service_AdExchangeBuyerII_ClientUserInvitation");
-  }
-  /**
-   * Lists all the client users invitations for a client with a given account ID.
-   * (invitations.listAccountsClientsInvitations)
-   *
-   * @param string $accountId Numerical account ID of the client's sponsor buyer.
-   * (required)
-   * @param string $clientAccountId Numerical account ID of the client buyer to
-   * list invitations for. (required) You must either specify a string
-   * representation of a numerical account identifier or the `-` character to list
-   * all the invitations for all the clients of a given sponsor buyer.
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param string pageToken A token identifying a page of results the server
-   * should return. Typically, this is the value of
-   * ListClientUserInvitationsResponse.nextPageToken returned from the previous
-   * call to the clients.invitations.list method.
-   * @opt_param int pageSize Requested page size. Server may return fewer clients
-   * than requested. If unspecified, server will pick an appropriate default.
-   * @return Google_Service_AdExchangeBuyerII_ListClientUserInvitationsResponse
-   */
-  public function listAccountsClientsInvitations($accountId, $clientAccountId, $optParams = array())
-  {
-    $params = array('accountId' => $accountId, 'clientAccountId' => $clientAccountId);
-    $params = array_merge($params, $optParams);
-    return $this->call('list', array($params), "Google_Service_AdExchangeBuyerII_ListClientUserInvitationsResponse");
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdExchangeBuyerII/Resource/AccountsClientsUsers.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdExchangeBuyerII/Resource/AccountsClientsUsers.php
deleted file mode 100644
index a543d238..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdExchangeBuyerII/Resource/AccountsClientsUsers.php
+++ /dev/null
@@ -1,93 +0,0 @@
-
- *   $adexchangebuyer2Service = new Google_Service_AdExchangeBuyerII(...);
- *   $users = $adexchangebuyer2Service->users;
- *  
- */
-class Google_Service_AdExchangeBuyerII_Resource_AccountsClientsUsers extends Google_Service_Resource
-{
-  /**
-   * Retrieves an existing client user. (users.get)
-   *
-   * @param string $accountId Numerical account ID of the client's sponsor buyer.
-   * (required)
-   * @param string $clientAccountId Numerical account ID of the client buyer that
-   * the user to be retrieved is associated with. (required)
-   * @param string $userId Numerical identifier of the user to retrieve.
-   * (required)
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_AdExchangeBuyerII_ClientUser
-   */
-  public function get($accountId, $clientAccountId, $userId, $optParams = array())
-  {
-    $params = array('accountId' => $accountId, 'clientAccountId' => $clientAccountId, 'userId' => $userId);
-    $params = array_merge($params, $optParams);
-    return $this->call('get', array($params), "Google_Service_AdExchangeBuyerII_ClientUser");
-  }
-  /**
-   * Lists all the known client users for a specified sponsor buyer account ID.
-   * (users.listAccountsClientsUsers)
-   *
-   * @param string $accountId Numerical account ID of the sponsor buyer of the
-   * client to list users for. (required)
-   * @param string $clientAccountId The account ID of the client buyer to list
-   * users for. (required) You must specify either a string representation of a
-   * numerical account identifier or the `-` character to list all the client
-   * users for all the clients of a given sponsor buyer.
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param string pageToken A token identifying a page of results the server
-   * should return. Typically, this is the value of
-   * ListClientUsersResponse.nextPageToken returned from the previous call to the
-   * accounts.clients.users.list method.
-   * @opt_param int pageSize Requested page size. The server may return fewer
-   * clients than requested. If unspecified, the server will pick an appropriate
-   * default.
-   * @return Google_Service_AdExchangeBuyerII_ListClientUsersResponse
-   */
-  public function listAccountsClientsUsers($accountId, $clientAccountId, $optParams = array())
-  {
-    $params = array('accountId' => $accountId, 'clientAccountId' => $clientAccountId);
-    $params = array_merge($params, $optParams);
-    return $this->call('list', array($params), "Google_Service_AdExchangeBuyerII_ListClientUsersResponse");
-  }
-  /**
-   * Updates an existing client user. Only the user status can be changed on
-   * update. (users.update)
-   *
-   * @param string $accountId Numerical account ID of the client's sponsor buyer.
-   * (required)
-   * @param string $clientAccountId Numerical account ID of the client buyer that
-   * the user to be retrieved is associated with. (required)
-   * @param string $userId Numerical identifier of the user to retrieve.
-   * (required)
-   * @param Google_Service_AdExchangeBuyerII_ClientUser $postBody
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_AdExchangeBuyerII_ClientUser
-   */
-  public function update($accountId, $clientAccountId, $userId, Google_Service_AdExchangeBuyerII_ClientUser $postBody, $optParams = array())
-  {
-    $params = array('accountId' => $accountId, 'clientAccountId' => $clientAccountId, 'userId' => $userId, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('update', array($params), "Google_Service_AdExchangeBuyerII_ClientUser");
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdExchangeBuyerII/Resource/AccountsCreatives.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdExchangeBuyerII/Resource/AccountsCreatives.php
deleted file mode 100644
index f4dc48c3..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdExchangeBuyerII/Resource/AccountsCreatives.php
+++ /dev/null
@@ -1,151 +0,0 @@
-
- *   $adexchangebuyer2Service = new Google_Service_AdExchangeBuyerII(...);
- *   $creatives = $adexchangebuyer2Service->creatives;
- *  
- */
-class Google_Service_AdExchangeBuyerII_Resource_AccountsCreatives extends Google_Service_Resource
-{
-  /**
-   * Creates a creative. (creatives.create)
-   *
-   * @param string $accountId The account that this creative belongs to. Can be
-   * used to filter the response of the creatives.list method.
-   * @param Google_Service_AdExchangeBuyerII_Creative $postBody
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param string duplicateIdMode Indicates if multiple creatives can share
-   * an ID or not. Default is NO_DUPLICATES (one ID per creative).
-   * @return Google_Service_AdExchangeBuyerII_Creative
-   */
-  public function create($accountId, Google_Service_AdExchangeBuyerII_Creative $postBody, $optParams = array())
-  {
-    $params = array('accountId' => $accountId, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('create', array($params), "Google_Service_AdExchangeBuyerII_Creative");
-  }
-  /**
-   * Gets a creative. (creatives.get)
-   *
-   * @param string $accountId The account the creative belongs to.
-   * @param string $creativeId The ID of the creative to retrieve.
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_AdExchangeBuyerII_Creative
-   */
-  public function get($accountId, $creativeId, $optParams = array())
-  {
-    $params = array('accountId' => $accountId, 'creativeId' => $creativeId);
-    $params = array_merge($params, $optParams);
-    return $this->call('get', array($params), "Google_Service_AdExchangeBuyerII_Creative");
-  }
-  /**
-   * Lists creatives. (creatives.listAccountsCreatives)
-   *
-   * @param string $accountId The account to list the creatives from. Specify "-"
-   * to list all creatives the current user has access to.
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param string pageToken A token identifying a page of results the server
-   * should return. Typically, this is the value of
-   * ListCreativesResponse.next_page_token returned from the previous call to
-   * 'ListCreatives' method.
-   * @opt_param int pageSize Requested page size. The server may return fewer
-   * creatives than requested (due to timeout constraint) even if more are
-   * available via another call. If unspecified, server will pick an appropriate
-   * default. Acceptable values are 1 to 1000, inclusive.
-   * @opt_param string query An optional query string to filter creatives. If no
-   * filter is specified, all active creatives will be returned. Supported queries
-   * are:
-   *
-   * accountId=account_id_string creativeId=creative_id_string dealsStatus:
-   * {approved, conditionally_approved, disapproved,
-   * not_checked} openAuctionStatus: {approved, conditionally_approved,
-   * disapproved,                           not_checked} attribute: {a numeric
-   * attribute from the list of attributes} disapprovalReason: {a reason from
-   * DisapprovalReason
-   *
-   * Example: 'accountId=12345 AND (dealsStatus:disapproved AND
-   * disapprovalReason:unacceptable_content) OR attribute:47'
-   * @return Google_Service_AdExchangeBuyerII_ListCreativesResponse
-   */
-  public function listAccountsCreatives($accountId, $optParams = array())
-  {
-    $params = array('accountId' => $accountId);
-    $params = array_merge($params, $optParams);
-    return $this->call('list', array($params), "Google_Service_AdExchangeBuyerII_ListCreativesResponse");
-  }
-  /**
-   * Stops watching a creative. Will stop push notifications being sent to the
-   * topics when the creative changes status. (creatives.stopWatching)
-   *
-   * @param string $accountId The account of the creative to stop notifications
-   * for.
-   * @param string $creativeId The creative ID of the creative to stop
-   * notifications for. Specify "-" to specify stopping account level
-   * notifications.
-   * @param Google_Service_AdExchangeBuyerII_StopWatchingCreativeRequest $postBody
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_AdExchangeBuyerII_Adexchangebuyer2Empty
-   */
-  public function stopWatching($accountId, $creativeId, Google_Service_AdExchangeBuyerII_StopWatchingCreativeRequest $postBody, $optParams = array())
-  {
-    $params = array('accountId' => $accountId, 'creativeId' => $creativeId, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('stopWatching', array($params), "Google_Service_AdExchangeBuyerII_Adexchangebuyer2Empty");
-  }
-  /**
-   * Updates a creative. (creatives.update)
-   *
-   * @param string $accountId The account that this creative belongs to. Can be
-   * used to filter the response of the creatives.list method.
-   * @param string $creativeId The buyer-defined creative ID of this creative. Can
-   * be used to filter the response of the creatives.list method.
-   * @param Google_Service_AdExchangeBuyerII_Creative $postBody
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_AdExchangeBuyerII_Creative
-   */
-  public function update($accountId, $creativeId, Google_Service_AdExchangeBuyerII_Creative $postBody, $optParams = array())
-  {
-    $params = array('accountId' => $accountId, 'creativeId' => $creativeId, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('update', array($params), "Google_Service_AdExchangeBuyerII_Creative");
-  }
-  /**
-   * Watches a creative. Will result in push notifications being sent to the topic
-   * when the creative changes status. (creatives.watch)
-   *
-   * @param string $accountId The account of the creative to watch.
-   * @param string $creativeId The creative ID to watch for status changes.
-   * Specify "-" to watch all creatives under the above account. If both creative-
-   * level and account-level notifications are sent, only a single notification
-   * will be sent to the creative-level notification topic.
-   * @param Google_Service_AdExchangeBuyerII_WatchCreativeRequest $postBody
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_AdExchangeBuyerII_Adexchangebuyer2Empty
-   */
-  public function watch($accountId, $creativeId, Google_Service_AdExchangeBuyerII_WatchCreativeRequest $postBody, $optParams = array())
-  {
-    $params = array('accountId' => $accountId, 'creativeId' => $creativeId, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('watch', array($params), "Google_Service_AdExchangeBuyerII_Adexchangebuyer2Empty");
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdExchangeBuyerII/Resource/AccountsCreativesDealAssociations.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdExchangeBuyerII/Resource/AccountsCreativesDealAssociations.php
deleted file mode 100644
index 22ee0540..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdExchangeBuyerII/Resource/AccountsCreativesDealAssociations.php
+++ /dev/null
@@ -1,94 +0,0 @@
-
- *   $adexchangebuyer2Service = new Google_Service_AdExchangeBuyerII(...);
- *   $dealAssociations = $adexchangebuyer2Service->dealAssociations;
- *  
- */
-class Google_Service_AdExchangeBuyerII_Resource_AccountsCreativesDealAssociations extends Google_Service_Resource
-{
-  /**
-   * Associate an existing deal with a creative. (dealAssociations.add)
-   *
-   * @param string $accountId The account the creative belongs to.
-   * @param string $creativeId The ID of the creative associated with the deal.
-   * @param Google_Service_AdExchangeBuyerII_AddDealAssociationRequest $postBody
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_AdExchangeBuyerII_Adexchangebuyer2Empty
-   */
-  public function add($accountId, $creativeId, Google_Service_AdExchangeBuyerII_AddDealAssociationRequest $postBody, $optParams = array())
-  {
-    $params = array('accountId' => $accountId, 'creativeId' => $creativeId, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('add', array($params), "Google_Service_AdExchangeBuyerII_Adexchangebuyer2Empty");
-  }
-  /**
-   * List all creative-deal associations.
-   * (dealAssociations.listAccountsCreativesDealAssociations)
-   *
-   * @param string $accountId The account to list the associations from. Specify
-   * "-" to list all creatives the current user has access to.
-   * @param string $creativeId The creative ID to list the associations from.
-   * Specify "-" to list all creatives under the above account.
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param string pageToken A token identifying a page of results the server
-   * should return. Typically, this is the value of
-   * ListDealAssociationsResponse.next_page_token returned from the previous call
-   * to 'ListDealAssociations' method.
-   * @opt_param int pageSize Requested page size. Server may return fewer
-   * associations than requested. If unspecified, server will pick an appropriate
-   * default.
-   * @opt_param string query An optional query string to filter deal associations.
-   * If no filter is specified, all associations will be returned. Supported
-   * queries are:
-   *
-   * accountId=account_id_string creativeId=creative_id_string
-   * dealsId=deals_id_string dealsStatus:{approved, conditionally_approved,
-   * disapproved,                   not_checked} openAuctionStatus:{approved,
-   * conditionally_approved, disapproved,                          not_checked}
-   *
-   * Example: 'dealsId=12345 AND dealsStatus:disapproved'
-   * @return Google_Service_AdExchangeBuyerII_ListDealAssociationsResponse
-   */
-  public function listAccountsCreativesDealAssociations($accountId, $creativeId, $optParams = array())
-  {
-    $params = array('accountId' => $accountId, 'creativeId' => $creativeId);
-    $params = array_merge($params, $optParams);
-    return $this->call('list', array($params), "Google_Service_AdExchangeBuyerII_ListDealAssociationsResponse");
-  }
-  /**
-   * Remove the association between a deal and a creative.
-   * (dealAssociations.remove)
-   *
-   * @param string $accountId The account the creative belongs to.
-   * @param string $creativeId The ID of the creative associated with the deal.
-   * @param Google_Service_AdExchangeBuyerII_RemoveDealAssociationRequest $postBody
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_AdExchangeBuyerII_Adexchangebuyer2Empty
-   */
-  public function remove($accountId, $creativeId, Google_Service_AdExchangeBuyerII_RemoveDealAssociationRequest $postBody, $optParams = array())
-  {
-    $params = array('accountId' => $accountId, 'creativeId' => $creativeId, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('remove', array($params), "Google_Service_AdExchangeBuyerII_Adexchangebuyer2Empty");
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdExchangeBuyerII/SecurityContext.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdExchangeBuyerII/SecurityContext.php
deleted file mode 100644
index c82d1917..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdExchangeBuyerII/SecurityContext.php
+++ /dev/null
@@ -1,31 +0,0 @@
-securities = $securities;
-  }
-  public function getSecurities()
-  {
-    return $this->securities;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdExchangeBuyerII/ServingContext.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdExchangeBuyerII/ServingContext.php
deleted file mode 100644
index 784fe232..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdExchangeBuyerII/ServingContext.php
+++ /dev/null
@@ -1,80 +0,0 @@
-all = $all;
-  }
-  public function getAll()
-  {
-    return $this->all;
-  }
-  public function setAppType(Google_Service_AdExchangeBuyerII_AppContext $appType)
-  {
-    $this->appType = $appType;
-  }
-  public function getAppType()
-  {
-    return $this->appType;
-  }
-  public function setAuctionType(Google_Service_AdExchangeBuyerII_AuctionContext $auctionType)
-  {
-    $this->auctionType = $auctionType;
-  }
-  public function getAuctionType()
-  {
-    return $this->auctionType;
-  }
-  public function setLocation(Google_Service_AdExchangeBuyerII_LocationContext $location)
-  {
-    $this->location = $location;
-  }
-  public function getLocation()
-  {
-    return $this->location;
-  }
-  public function setPlatform(Google_Service_AdExchangeBuyerII_PlatformContext $platform)
-  {
-    $this->platform = $platform;
-  }
-  public function getPlatform()
-  {
-    return $this->platform;
-  }
-  public function setSecurityType(Google_Service_AdExchangeBuyerII_SecurityContext $securityType)
-  {
-    $this->securityType = $securityType;
-  }
-  public function getSecurityType()
-  {
-    return $this->securityType;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdExchangeBuyerII/ServingRestriction.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdExchangeBuyerII/ServingRestriction.php
deleted file mode 100644
index 07684683..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdExchangeBuyerII/ServingRestriction.php
+++ /dev/null
@@ -1,51 +0,0 @@
-contexts = $contexts;
-  }
-  public function getContexts()
-  {
-    return $this->contexts;
-  }
-  public function setDisapprovalReasons($disapprovalReasons)
-  {
-    $this->disapprovalReasons = $disapprovalReasons;
-  }
-  public function getDisapprovalReasons()
-  {
-    return $this->disapprovalReasons;
-  }
-  public function setStatus($status)
-  {
-    $this->status = $status;
-  }
-  public function getStatus()
-  {
-    return $this->status;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdExchangeBuyerII/StopWatchingCreativeRequest.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdExchangeBuyerII/StopWatchingCreativeRequest.php
deleted file mode 100644
index 5b0c31ba..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdExchangeBuyerII/StopWatchingCreativeRequest.php
+++ /dev/null
@@ -1,20 +0,0 @@
-videoUrl = $videoUrl;
-  }
-  public function getVideoUrl()
-  {
-    return $this->videoUrl;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdExchangeBuyerII/WatchCreativeRequest.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdExchangeBuyerII/WatchCreativeRequest.php
deleted file mode 100644
index f92ea705..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdExchangeBuyerII/WatchCreativeRequest.php
+++ /dev/null
@@ -1,30 +0,0 @@
-topic = $topic;
-  }
-  public function getTopic()
-  {
-    return $this->topic;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdExchangeSeller.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdExchangeSeller.php
deleted file mode 100644
index 278069cb..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdExchangeSeller.php
+++ /dev/null
@@ -1,428 +0,0 @@
-
- * Accesses the inventory of Ad Exchange seller users and generates reports.

- *
- * 

- * For more information about this service, see the API
- * Documentation
- * 

- *
- * @author Google, Inc.
- */
-class Google_Service_AdExchangeSeller extends Google_Service
-{
-  /** View and manage your Ad Exchange data. */
-  const ADEXCHANGE_SELLER =
-      "https://www.googleapis.com/auth/adexchange.seller";
-  /** View your Ad Exchange data. */
-  const ADEXCHANGE_SELLER_READONLY =
-      "https://www.googleapis.com/auth/adexchange.seller.readonly";
-
-  public $accounts;
-  public $accounts_adclients;
-  public $accounts_alerts;
-  public $accounts_customchannels;
-  public $accounts_metadata_dimensions;
-  public $accounts_metadata_metrics;
-  public $accounts_preferreddeals;
-  public $accounts_reports;
-  public $accounts_reports_saved;
-  public $accounts_urlchannels;
-  
-  /**
-   * Constructs the internal representation of the AdExchangeSeller service.
-   *
-   * @param Google_Client $client
-   */
-  public function __construct(Google_Client $client)
-  {
-    parent::__construct($client);
-    $this->rootUrl = 'https://www.googleapis.com/';
-    $this->servicePath = 'adexchangeseller/v2.0/';
-    $this->version = 'v2.0';
-    $this->serviceName = 'adexchangeseller';
-
-    $this->accounts = new Google_Service_AdExchangeSeller_Resource_Accounts(
-        $this,
-        $this->serviceName,
-        'accounts',
-        array(
-          'methods' => array(
-            'get' => array(
-              'path' => 'accounts/{accountId}',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'accountId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'list' => array(
-              'path' => 'accounts',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'maxResults' => array(
-                  'location' => 'query',
-                  'type' => 'integer',
-                ),
-                'pageToken' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-              ),
-            ),
-          )
-        )
-    );
-    $this->accounts_adclients = new Google_Service_AdExchangeSeller_Resource_AccountsAdclients(
-        $this,
-        $this->serviceName,
-        'adclients',
-        array(
-          'methods' => array(
-            'list' => array(
-              'path' => 'accounts/{accountId}/adclients',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'accountId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'maxResults' => array(
-                  'location' => 'query',
-                  'type' => 'integer',
-                ),
-                'pageToken' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-              ),
-            ),
-          )
-        )
-    );
-    $this->accounts_alerts = new Google_Service_AdExchangeSeller_Resource_AccountsAlerts(
-        $this,
-        $this->serviceName,
-        'alerts',
-        array(
-          'methods' => array(
-            'list' => array(
-              'path' => 'accounts/{accountId}/alerts',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'accountId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'locale' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-              ),
-            ),
-          )
-        )
-    );
-    $this->accounts_customchannels = new Google_Service_AdExchangeSeller_Resource_AccountsCustomchannels(
-        $this,
-        $this->serviceName,
-        'customchannels',
-        array(
-          'methods' => array(
-            'get' => array(
-              'path' => 'accounts/{accountId}/adclients/{adClientId}/customchannels/{customChannelId}',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'accountId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'adClientId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'customChannelId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'list' => array(
-              'path' => 'accounts/{accountId}/adclients/{adClientId}/customchannels',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'accountId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'adClientId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'maxResults' => array(
-                  'location' => 'query',
-                  'type' => 'integer',
-                ),
-                'pageToken' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-              ),
-            ),
-          )
-        )
-    );
-    $this->accounts_metadata_dimensions = new Google_Service_AdExchangeSeller_Resource_AccountsMetadataDimensions(
-        $this,
-        $this->serviceName,
-        'dimensions',
-        array(
-          'methods' => array(
-            'list' => array(
-              'path' => 'accounts/{accountId}/metadata/dimensions',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'accountId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),
-          )
-        )
-    );
-    $this->accounts_metadata_metrics = new Google_Service_AdExchangeSeller_Resource_AccountsMetadataMetrics(
-        $this,
-        $this->serviceName,
-        'metrics',
-        array(
-          'methods' => array(
-            'list' => array(
-              'path' => 'accounts/{accountId}/metadata/metrics',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'accountId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),
-          )
-        )
-    );
-    $this->accounts_preferreddeals = new Google_Service_AdExchangeSeller_Resource_AccountsPreferreddeals(
-        $this,
-        $this->serviceName,
-        'preferreddeals',
-        array(
-          'methods' => array(
-            'get' => array(
-              'path' => 'accounts/{accountId}/preferreddeals/{dealId}',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'accountId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'dealId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'list' => array(
-              'path' => 'accounts/{accountId}/preferreddeals',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'accountId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),
-          )
-        )
-    );
-    $this->accounts_reports = new Google_Service_AdExchangeSeller_Resource_AccountsReports(
-        $this,
-        $this->serviceName,
-        'reports',
-        array(
-          'methods' => array(
-            'generate' => array(
-              'path' => 'accounts/{accountId}/reports',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'accountId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'startDate' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'endDate' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'dimension' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                  'repeated' => true,
-                ),
-                'filter' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                  'repeated' => true,
-                ),
-                'locale' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'maxResults' => array(
-                  'location' => 'query',
-                  'type' => 'integer',
-                ),
-                'metric' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                  'repeated' => true,
-                ),
-                'sort' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                  'repeated' => true,
-                ),
-                'startIndex' => array(
-                  'location' => 'query',
-                  'type' => 'integer',
-                ),
-              ),
-            ),
-          )
-        )
-    );
-    $this->accounts_reports_saved = new Google_Service_AdExchangeSeller_Resource_AccountsReportsSaved(
-        $this,
-        $this->serviceName,
-        'saved',
-        array(
-          'methods' => array(
-            'generate' => array(
-              'path' => 'accounts/{accountId}/reports/{savedReportId}',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'accountId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'savedReportId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'locale' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'maxResults' => array(
-                  'location' => 'query',
-                  'type' => 'integer',
-                ),
-                'startIndex' => array(
-                  'location' => 'query',
-                  'type' => 'integer',
-                ),
-              ),
-            ),'list' => array(
-              'path' => 'accounts/{accountId}/reports/saved',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'accountId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'maxResults' => array(
-                  'location' => 'query',
-                  'type' => 'integer',
-                ),
-                'pageToken' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-              ),
-            ),
-          )
-        )
-    );
-    $this->accounts_urlchannels = new Google_Service_AdExchangeSeller_Resource_AccountsUrlchannels(
-        $this,
-        $this->serviceName,
-        'urlchannels',
-        array(
-          'methods' => array(
-            'list' => array(
-              'path' => 'accounts/{accountId}/adclients/{adClientId}/urlchannels',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'accountId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'adClientId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'maxResults' => array(
-                  'location' => 'query',
-                  'type' => 'integer',
-                ),
-                'pageToken' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-              ),
-            ),
-          )
-        )
-    );
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdExchangeSeller/Account.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdExchangeSeller/Account.php
deleted file mode 100644
index c5380f0c..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdExchangeSeller/Account.php
+++ /dev/null
@@ -1,48 +0,0 @@
-id = $id;
-  }
-  public function getId()
-  {
-    return $this->id;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setName($name)
-  {
-    $this->name = $name;
-  }
-  public function getName()
-  {
-    return $this->name;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdExchangeSeller/Accounts.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdExchangeSeller/Accounts.php
deleted file mode 100644
index 678e0c89..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdExchangeSeller/Accounts.php
+++ /dev/null
@@ -1,59 +0,0 @@
-etag = $etag;
-  }
-  public function getEtag()
-  {
-    return $this->etag;
-  }
-  public function setItems($items)
-  {
-    $this->items = $items;
-  }
-  public function getItems()
-  {
-    return $this->items;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setNextPageToken($nextPageToken)
-  {
-    $this->nextPageToken = $nextPageToken;
-  }
-  public function getNextPageToken()
-  {
-    return $this->nextPageToken;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdExchangeSeller/AdClient.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdExchangeSeller/AdClient.php
deleted file mode 100644
index 97bc8934..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdExchangeSeller/AdClient.php
+++ /dev/null
@@ -1,66 +0,0 @@
-arcOptIn = $arcOptIn;
-  }
-  public function getArcOptIn()
-  {
-    return $this->arcOptIn;
-  }
-  public function setId($id)
-  {
-    $this->id = $id;
-  }
-  public function getId()
-  {
-    return $this->id;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setProductCode($productCode)
-  {
-    $this->productCode = $productCode;
-  }
-  public function getProductCode()
-  {
-    return $this->productCode;
-  }
-  public function setSupportsReporting($supportsReporting)
-  {
-    $this->supportsReporting = $supportsReporting;
-  }
-  public function getSupportsReporting()
-  {
-    return $this->supportsReporting;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdExchangeSeller/AdClients.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdExchangeSeller/AdClients.php
deleted file mode 100644
index 0577fb07..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdExchangeSeller/AdClients.php
+++ /dev/null
@@ -1,59 +0,0 @@
-etag = $etag;
-  }
-  public function getEtag()
-  {
-    return $this->etag;
-  }
-  public function setItems($items)
-  {
-    $this->items = $items;
-  }
-  public function getItems()
-  {
-    return $this->items;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setNextPageToken($nextPageToken)
-  {
-    $this->nextPageToken = $nextPageToken;
-  }
-  public function getNextPageToken()
-  {
-    return $this->nextPageToken;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdExchangeSeller/Alert.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdExchangeSeller/Alert.php
deleted file mode 100644
index 798496c2..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdExchangeSeller/Alert.php
+++ /dev/null
@@ -1,66 +0,0 @@
-id = $id;
-  }
-  public function getId()
-  {
-    return $this->id;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setMessage($message)
-  {
-    $this->message = $message;
-  }
-  public function getMessage()
-  {
-    return $this->message;
-  }
-  public function setSeverity($severity)
-  {
-    $this->severity = $severity;
-  }
-  public function getSeverity()
-  {
-    return $this->severity;
-  }
-  public function setType($type)
-  {
-    $this->type = $type;
-  }
-  public function getType()
-  {
-    return $this->type;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdExchangeSeller/Alerts.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdExchangeSeller/Alerts.php
deleted file mode 100644
index 902f261f..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdExchangeSeller/Alerts.php
+++ /dev/null
@@ -1,41 +0,0 @@
-items = $items;
-  }
-  public function getItems()
-  {
-    return $this->items;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdExchangeSeller/CustomChannel.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdExchangeSeller/CustomChannel.php
deleted file mode 100644
index 016dbc9f..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdExchangeSeller/CustomChannel.php
+++ /dev/null
@@ -1,67 +0,0 @@
-code = $code;
-  }
-  public function getCode()
-  {
-    return $this->code;
-  }
-  public function setId($id)
-  {
-    $this->id = $id;
-  }
-  public function getId()
-  {
-    return $this->id;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setName($name)
-  {
-    $this->name = $name;
-  }
-  public function getName()
-  {
-    return $this->name;
-  }
-  public function setTargetingInfo(Google_Service_AdExchangeSeller_CustomChannelTargetingInfo $targetingInfo)
-  {
-    $this->targetingInfo = $targetingInfo;
-  }
-  public function getTargetingInfo()
-  {
-    return $this->targetingInfo;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdExchangeSeller/CustomChannelTargetingInfo.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdExchangeSeller/CustomChannelTargetingInfo.php
deleted file mode 100644
index a0f43d70..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdExchangeSeller/CustomChannelTargetingInfo.php
+++ /dev/null
@@ -1,57 +0,0 @@
-adsAppearOn = $adsAppearOn;
-  }
-  public function getAdsAppearOn()
-  {
-    return $this->adsAppearOn;
-  }
-  public function setDescription($description)
-  {
-    $this->description = $description;
-  }
-  public function getDescription()
-  {
-    return $this->description;
-  }
-  public function setLocation($location)
-  {
-    $this->location = $location;
-  }
-  public function getLocation()
-  {
-    return $this->location;
-  }
-  public function setSiteLanguage($siteLanguage)
-  {
-    $this->siteLanguage = $siteLanguage;
-  }
-  public function getSiteLanguage()
-  {
-    return $this->siteLanguage;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdExchangeSeller/CustomChannels.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdExchangeSeller/CustomChannels.php
deleted file mode 100644
index 53a0aa08..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdExchangeSeller/CustomChannels.php
+++ /dev/null
@@ -1,59 +0,0 @@
-etag = $etag;
-  }
-  public function getEtag()
-  {
-    return $this->etag;
-  }
-  public function setItems($items)
-  {
-    $this->items = $items;
-  }
-  public function getItems()
-  {
-    return $this->items;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setNextPageToken($nextPageToken)
-  {
-    $this->nextPageToken = $nextPageToken;
-  }
-  public function getNextPageToken()
-  {
-    return $this->nextPageToken;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdExchangeSeller/Metadata.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdExchangeSeller/Metadata.php
deleted file mode 100644
index 87f064a3..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdExchangeSeller/Metadata.php
+++ /dev/null
@@ -1,41 +0,0 @@
-items = $items;
-  }
-  public function getItems()
-  {
-    return $this->items;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdExchangeSeller/PreferredDeal.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdExchangeSeller/PreferredDeal.php
deleted file mode 100644
index bdbf73fd..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdExchangeSeller/PreferredDeal.php
+++ /dev/null
@@ -1,93 +0,0 @@
-advertiserName = $advertiserName;
-  }
-  public function getAdvertiserName()
-  {
-    return $this->advertiserName;
-  }
-  public function setBuyerNetworkName($buyerNetworkName)
-  {
-    $this->buyerNetworkName = $buyerNetworkName;
-  }
-  public function getBuyerNetworkName()
-  {
-    return $this->buyerNetworkName;
-  }
-  public function setCurrencyCode($currencyCode)
-  {
-    $this->currencyCode = $currencyCode;
-  }
-  public function getCurrencyCode()
-  {
-    return $this->currencyCode;
-  }
-  public function setEndTime($endTime)
-  {
-    $this->endTime = $endTime;
-  }
-  public function getEndTime()
-  {
-    return $this->endTime;
-  }
-  public function setFixedCpm($fixedCpm)
-  {
-    $this->fixedCpm = $fixedCpm;
-  }
-  public function getFixedCpm()
-  {
-    return $this->fixedCpm;
-  }
-  public function setId($id)
-  {
-    $this->id = $id;
-  }
-  public function getId()
-  {
-    return $this->id;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setStartTime($startTime)
-  {
-    $this->startTime = $startTime;
-  }
-  public function getStartTime()
-  {
-    return $this->startTime;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdExchangeSeller/PreferredDeals.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdExchangeSeller/PreferredDeals.php
deleted file mode 100644
index b50fbf63..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdExchangeSeller/PreferredDeals.php
+++ /dev/null
@@ -1,41 +0,0 @@
-items = $items;
-  }
-  public function getItems()
-  {
-    return $this->items;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdExchangeSeller/Report.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdExchangeSeller/Report.php
deleted file mode 100644
index 9ee73d77..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdExchangeSeller/Report.php
+++ /dev/null
@@ -1,86 +0,0 @@
-averages = $averages;
-  }
-  public function getAverages()
-  {
-    return $this->averages;
-  }
-  public function setHeaders($headers)
-  {
-    $this->headers = $headers;
-  }
-  public function getHeaders()
-  {
-    return $this->headers;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setRows($rows)
-  {
-    $this->rows = $rows;
-  }
-  public function getRows()
-  {
-    return $this->rows;
-  }
-  public function setTotalMatchedRows($totalMatchedRows)
-  {
-    $this->totalMatchedRows = $totalMatchedRows;
-  }
-  public function getTotalMatchedRows()
-  {
-    return $this->totalMatchedRows;
-  }
-  public function setTotals($totals)
-  {
-    $this->totals = $totals;
-  }
-  public function getTotals()
-  {
-    return $this->totals;
-  }
-  public function setWarnings($warnings)
-  {
-    $this->warnings = $warnings;
-  }
-  public function getWarnings()
-  {
-    return $this->warnings;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdExchangeSeller/ReportHeaders.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdExchangeSeller/ReportHeaders.php
deleted file mode 100644
index 0321c042..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdExchangeSeller/ReportHeaders.php
+++ /dev/null
@@ -1,48 +0,0 @@
-currency = $currency;
-  }
-  public function getCurrency()
-  {
-    return $this->currency;
-  }
-  public function setName($name)
-  {
-    $this->name = $name;
-  }
-  public function getName()
-  {
-    return $this->name;
-  }
-  public function setType($type)
-  {
-    $this->type = $type;
-  }
-  public function getType()
-  {
-    return $this->type;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdExchangeSeller/ReportingMetadataEntry.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdExchangeSeller/ReportingMetadataEntry.php
deleted file mode 100644
index c8b90c46..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdExchangeSeller/ReportingMetadataEntry.php
+++ /dev/null
@@ -1,85 +0,0 @@
-compatibleDimensions = $compatibleDimensions;
-  }
-  public function getCompatibleDimensions()
-  {
-    return $this->compatibleDimensions;
-  }
-  public function setCompatibleMetrics($compatibleMetrics)
-  {
-    $this->compatibleMetrics = $compatibleMetrics;
-  }
-  public function getCompatibleMetrics()
-  {
-    return $this->compatibleMetrics;
-  }
-  public function setId($id)
-  {
-    $this->id = $id;
-  }
-  public function getId()
-  {
-    return $this->id;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setRequiredDimensions($requiredDimensions)
-  {
-    $this->requiredDimensions = $requiredDimensions;
-  }
-  public function getRequiredDimensions()
-  {
-    return $this->requiredDimensions;
-  }
-  public function setRequiredMetrics($requiredMetrics)
-  {
-    $this->requiredMetrics = $requiredMetrics;
-  }
-  public function getRequiredMetrics()
-  {
-    return $this->requiredMetrics;
-  }
-  public function setSupportedProducts($supportedProducts)
-  {
-    $this->supportedProducts = $supportedProducts;
-  }
-  public function getSupportedProducts()
-  {
-    return $this->supportedProducts;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdExchangeSeller/Resource/Accounts.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdExchangeSeller/Resource/Accounts.php
deleted file mode 100644
index a107fbae..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdExchangeSeller/Resource/Accounts.php
+++ /dev/null
@@ -1,61 +0,0 @@
-
- *   $adexchangesellerService = new Google_Service_AdExchangeSeller(...);
- *   $accounts = $adexchangesellerService->accounts;
- *  
- */
-class Google_Service_AdExchangeSeller_Resource_Accounts extends Google_Service_Resource
-{
-  /**
-   * Get information about the selected Ad Exchange account. (accounts.get)
-   *
-   * @param string $accountId Account to get information about. Tip: 'myaccount'
-   * is a valid ID.
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_AdExchangeSeller_Account
-   */
-  public function get($accountId, $optParams = array())
-  {
-    $params = array('accountId' => $accountId);
-    $params = array_merge($params, $optParams);
-    return $this->call('get', array($params), "Google_Service_AdExchangeSeller_Account");
-  }
-  /**
-   * List all accounts available to this Ad Exchange account.
-   * (accounts.listAccounts)
-   *
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param int maxResults The maximum number of accounts to include in the
-   * response, used for paging.
-   * @opt_param string pageToken A continuation token, used to page through
-   * accounts. To retrieve the next page, set this parameter to the value of
-   * "nextPageToken" from the previous response.
-   * @return Google_Service_AdExchangeSeller_Accounts
-   */
-  public function listAccounts($optParams = array())
-  {
-    $params = array();
-    $params = array_merge($params, $optParams);
-    return $this->call('list', array($params), "Google_Service_AdExchangeSeller_Accounts");
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdExchangeSeller/Resource/AccountsAdclients.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdExchangeSeller/Resource/AccountsAdclients.php
deleted file mode 100644
index af4a9489..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdExchangeSeller/Resource/AccountsAdclients.php
+++ /dev/null
@@ -1,48 +0,0 @@
-
- *   $adexchangesellerService = new Google_Service_AdExchangeSeller(...);
- *   $adclients = $adexchangesellerService->adclients;
- *  
- */
-class Google_Service_AdExchangeSeller_Resource_AccountsAdclients extends Google_Service_Resource
-{
-  /**
-   * List all ad clients in this Ad Exchange account.
-   * (adclients.listAccountsAdclients)
-   *
-   * @param string $accountId Account to which the ad client belongs.
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param string maxResults The maximum number of ad clients to include in
-   * the response, used for paging.
-   * @opt_param string pageToken A continuation token, used to page through ad
-   * clients. To retrieve the next page, set this parameter to the value of
-   * "nextPageToken" from the previous response.
-   * @return Google_Service_AdExchangeSeller_AdClients
-   */
-  public function listAccountsAdclients($accountId, $optParams = array())
-  {
-    $params = array('accountId' => $accountId);
-    $params = array_merge($params, $optParams);
-    return $this->call('list', array($params), "Google_Service_AdExchangeSeller_AdClients");
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdExchangeSeller/Resource/AccountsAlerts.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdExchangeSeller/Resource/AccountsAlerts.php
deleted file mode 100644
index 66ab285e..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdExchangeSeller/Resource/AccountsAlerts.php
+++ /dev/null
@@ -1,45 +0,0 @@
-
- *   $adexchangesellerService = new Google_Service_AdExchangeSeller(...);
- *   $alerts = $adexchangesellerService->alerts;
- *  
- */
-class Google_Service_AdExchangeSeller_Resource_AccountsAlerts extends Google_Service_Resource
-{
-  /**
-   * List the alerts for this Ad Exchange account. (alerts.listAccountsAlerts)
-   *
-   * @param string $accountId Account owning the alerts.
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param string locale The locale to use for translating alert messages.
-   * The account locale will be used if this is not supplied. The AdSense default
-   * (English) will be used if the supplied locale is invalid or unsupported.
-   * @return Google_Service_AdExchangeSeller_Alerts
-   */
-  public function listAccountsAlerts($accountId, $optParams = array())
-  {
-    $params = array('accountId' => $accountId);
-    $params = array_merge($params, $optParams);
-    return $this->call('list', array($params), "Google_Service_AdExchangeSeller_Alerts");
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdExchangeSeller/Resource/AccountsCustomchannels.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdExchangeSeller/Resource/AccountsCustomchannels.php
deleted file mode 100644
index 8b23fc2e..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdExchangeSeller/Resource/AccountsCustomchannels.php
+++ /dev/null
@@ -1,65 +0,0 @@
-
- *   $adexchangesellerService = new Google_Service_AdExchangeSeller(...);
- *   $customchannels = $adexchangesellerService->customchannels;
- *  
- */
-class Google_Service_AdExchangeSeller_Resource_AccountsCustomchannels extends Google_Service_Resource
-{
-  /**
-   * Get the specified custom channel from the specified ad client.
-   * (customchannels.get)
-   *
-   * @param string $accountId Account to which the ad client belongs.
-   * @param string $adClientId Ad client which contains the custom channel.
-   * @param string $customChannelId Custom channel to retrieve.
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_AdExchangeSeller_CustomChannel
-   */
-  public function get($accountId, $adClientId, $customChannelId, $optParams = array())
-  {
-    $params = array('accountId' => $accountId, 'adClientId' => $adClientId, 'customChannelId' => $customChannelId);
-    $params = array_merge($params, $optParams);
-    return $this->call('get', array($params), "Google_Service_AdExchangeSeller_CustomChannel");
-  }
-  /**
-   * List all custom channels in the specified ad client for this Ad Exchange
-   * account. (customchannels.listAccountsCustomchannels)
-   *
-   * @param string $accountId Account to which the ad client belongs.
-   * @param string $adClientId Ad client for which to list custom channels.
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param string maxResults The maximum number of custom channels to include
-   * in the response, used for paging.
-   * @opt_param string pageToken A continuation token, used to page through custom
-   * channels. To retrieve the next page, set this parameter to the value of
-   * "nextPageToken" from the previous response.
-   * @return Google_Service_AdExchangeSeller_CustomChannels
-   */
-  public function listAccountsCustomchannels($accountId, $adClientId, $optParams = array())
-  {
-    $params = array('accountId' => $accountId, 'adClientId' => $adClientId);
-    $params = array_merge($params, $optParams);
-    return $this->call('list', array($params), "Google_Service_AdExchangeSeller_CustomChannels");
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdExchangeSeller/Resource/AccountsMetadata.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdExchangeSeller/Resource/AccountsMetadata.php
deleted file mode 100644
index 55e090a3..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdExchangeSeller/Resource/AccountsMetadata.php
+++ /dev/null
@@ -1,28 +0,0 @@
-
- *   $adexchangesellerService = new Google_Service_AdExchangeSeller(...);
- *   $metadata = $adexchangesellerService->metadata;
- *  
- */
-class Google_Service_AdExchangeSeller_Resource_AccountsMetadata extends Google_Service_Resource
-{
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdExchangeSeller/Resource/AccountsMetadataDimensions.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdExchangeSeller/Resource/AccountsMetadataDimensions.php
deleted file mode 100644
index 197fc8dd..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdExchangeSeller/Resource/AccountsMetadataDimensions.php
+++ /dev/null
@@ -1,42 +0,0 @@
-
- *   $adexchangesellerService = new Google_Service_AdExchangeSeller(...);
- *   $dimensions = $adexchangesellerService->dimensions;
- *  
- */
-class Google_Service_AdExchangeSeller_Resource_AccountsMetadataDimensions extends Google_Service_Resource
-{
-  /**
-   * List the metadata for the dimensions available to this AdExchange account.
-   * (dimensions.listAccountsMetadataDimensions)
-   *
-   * @param string $accountId Account with visibility to the dimensions.
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_AdExchangeSeller_Metadata
-   */
-  public function listAccountsMetadataDimensions($accountId, $optParams = array())
-  {
-    $params = array('accountId' => $accountId);
-    $params = array_merge($params, $optParams);
-    return $this->call('list', array($params), "Google_Service_AdExchangeSeller_Metadata");
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdExchangeSeller/Resource/AccountsMetadataMetrics.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdExchangeSeller/Resource/AccountsMetadataMetrics.php
deleted file mode 100644
index 90aa3968..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdExchangeSeller/Resource/AccountsMetadataMetrics.php
+++ /dev/null
@@ -1,42 +0,0 @@
-
- *   $adexchangesellerService = new Google_Service_AdExchangeSeller(...);
- *   $metrics = $adexchangesellerService->metrics;
- *  
- */
-class Google_Service_AdExchangeSeller_Resource_AccountsMetadataMetrics extends Google_Service_Resource
-{
-  /**
-   * List the metadata for the metrics available to this AdExchange account.
-   * (metrics.listAccountsMetadataMetrics)
-   *
-   * @param string $accountId Account with visibility to the metrics.
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_AdExchangeSeller_Metadata
-   */
-  public function listAccountsMetadataMetrics($accountId, $optParams = array())
-  {
-    $params = array('accountId' => $accountId);
-    $params = array_merge($params, $optParams);
-    return $this->call('list', array($params), "Google_Service_AdExchangeSeller_Metadata");
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdExchangeSeller/Resource/AccountsPreferreddeals.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdExchangeSeller/Resource/AccountsPreferreddeals.php
deleted file mode 100644
index 91daee92..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdExchangeSeller/Resource/AccountsPreferreddeals.php
+++ /dev/null
@@ -1,57 +0,0 @@
-
- *   $adexchangesellerService = new Google_Service_AdExchangeSeller(...);
- *   $preferreddeals = $adexchangesellerService->preferreddeals;
- *  
- */
-class Google_Service_AdExchangeSeller_Resource_AccountsPreferreddeals extends Google_Service_Resource
-{
-  /**
-   * Get information about the selected Ad Exchange Preferred Deal.
-   * (preferreddeals.get)
-   *
-   * @param string $accountId Account owning the deal.
-   * @param string $dealId Preferred deal to get information about.
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_AdExchangeSeller_PreferredDeal
-   */
-  public function get($accountId, $dealId, $optParams = array())
-  {
-    $params = array('accountId' => $accountId, 'dealId' => $dealId);
-    $params = array_merge($params, $optParams);
-    return $this->call('get', array($params), "Google_Service_AdExchangeSeller_PreferredDeal");
-  }
-  /**
-   * List the preferred deals for this Ad Exchange account.
-   * (preferreddeals.listAccountsPreferreddeals)
-   *
-   * @param string $accountId Account owning the deals.
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_AdExchangeSeller_PreferredDeals
-   */
-  public function listAccountsPreferreddeals($accountId, $optParams = array())
-  {
-    $params = array('accountId' => $accountId);
-    $params = array_merge($params, $optParams);
-    return $this->call('list', array($params), "Google_Service_AdExchangeSeller_PreferredDeals");
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdExchangeSeller/Resource/AccountsReports.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdExchangeSeller/Resource/AccountsReports.php
deleted file mode 100644
index 33c70e59..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdExchangeSeller/Resource/AccountsReports.php
+++ /dev/null
@@ -1,59 +0,0 @@
-
- *   $adexchangesellerService = new Google_Service_AdExchangeSeller(...);
- *   $reports = $adexchangesellerService->reports;
- *  
- */
-class Google_Service_AdExchangeSeller_Resource_AccountsReports extends Google_Service_Resource
-{
-  /**
-   * Generate an Ad Exchange report based on the report request sent in the query
-   * parameters. Returns the result as JSON; to retrieve output in CSV format
-   * specify "alt=csv" as a query parameter. (reports.generate)
-   *
-   * @param string $accountId Account which owns the generated report.
-   * @param string $startDate Start of the date range to report on in "YYYY-MM-DD"
-   * format, inclusive.
-   * @param string $endDate End of the date range to report on in "YYYY-MM-DD"
-   * format, inclusive.
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param string dimension Dimensions to base the report on.
-   * @opt_param string filter Filters to be run on the report.
-   * @opt_param string locale Optional locale to use for translating report output
-   * to a local language. Defaults to "en_US" if not specified.
-   * @opt_param string maxResults The maximum number of rows of report data to
-   * return.
-   * @opt_param string metric Numeric columns to include in the report.
-   * @opt_param string sort The name of a dimension or metric to sort the
-   * resulting report on, optionally prefixed with "+" to sort ascending or "-" to
-   * sort descending. If no prefix is specified, the column is sorted ascending.
-   * @opt_param string startIndex Index of the first row of report data to return.
-   * @return Google_Service_AdExchangeSeller_Report
-   */
-  public function generate($accountId, $startDate, $endDate, $optParams = array())
-  {
-    $params = array('accountId' => $accountId, 'startDate' => $startDate, 'endDate' => $endDate);
-    $params = array_merge($params, $optParams);
-    return $this->call('generate', array($params), "Google_Service_AdExchangeSeller_Report");
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdExchangeSeller/Resource/AccountsReportsSaved.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdExchangeSeller/Resource/AccountsReportsSaved.php
deleted file mode 100644
index 8a0441c7..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdExchangeSeller/Resource/AccountsReportsSaved.php
+++ /dev/null
@@ -1,69 +0,0 @@
-
- *   $adexchangesellerService = new Google_Service_AdExchangeSeller(...);
- *   $saved = $adexchangesellerService->saved;
- *  
- */
-class Google_Service_AdExchangeSeller_Resource_AccountsReportsSaved extends Google_Service_Resource
-{
-  /**
-   * Generate an Ad Exchange report based on the saved report ID sent in the query
-   * parameters. (saved.generate)
-   *
-   * @param string $accountId Account owning the saved report.
-   * @param string $savedReportId The saved report to retrieve.
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param string locale Optional locale to use for translating report output
-   * to a local language. Defaults to "en_US" if not specified.
-   * @opt_param int maxResults The maximum number of rows of report data to
-   * return.
-   * @opt_param int startIndex Index of the first row of report data to return.
-   * @return Google_Service_AdExchangeSeller_Report
-   */
-  public function generate($accountId, $savedReportId, $optParams = array())
-  {
-    $params = array('accountId' => $accountId, 'savedReportId' => $savedReportId);
-    $params = array_merge($params, $optParams);
-    return $this->call('generate', array($params), "Google_Service_AdExchangeSeller_Report");
-  }
-  /**
-   * List all saved reports in this Ad Exchange account.
-   * (saved.listAccountsReportsSaved)
-   *
-   * @param string $accountId Account owning the saved reports.
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param int maxResults The maximum number of saved reports to include in
-   * the response, used for paging.
-   * @opt_param string pageToken A continuation token, used to page through saved
-   * reports. To retrieve the next page, set this parameter to the value of
-   * "nextPageToken" from the previous response.
-   * @return Google_Service_AdExchangeSeller_SavedReports
-   */
-  public function listAccountsReportsSaved($accountId, $optParams = array())
-  {
-    $params = array('accountId' => $accountId);
-    $params = array_merge($params, $optParams);
-    return $this->call('list', array($params), "Google_Service_AdExchangeSeller_SavedReports");
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdExchangeSeller/Resource/AccountsUrlchannels.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdExchangeSeller/Resource/AccountsUrlchannels.php
deleted file mode 100644
index 13a9106a..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdExchangeSeller/Resource/AccountsUrlchannels.php
+++ /dev/null
@@ -1,49 +0,0 @@
-
- *   $adexchangesellerService = new Google_Service_AdExchangeSeller(...);
- *   $urlchannels = $adexchangesellerService->urlchannels;
- *  
- */
-class Google_Service_AdExchangeSeller_Resource_AccountsUrlchannels extends Google_Service_Resource
-{
-  /**
-   * List all URL channels in the specified ad client for this Ad Exchange
-   * account. (urlchannels.listAccountsUrlchannels)
-   *
-   * @param string $accountId Account to which the ad client belongs.
-   * @param string $adClientId Ad client for which to list URL channels.
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param string maxResults The maximum number of URL channels to include in
-   * the response, used for paging.
-   * @opt_param string pageToken A continuation token, used to page through URL
-   * channels. To retrieve the next page, set this parameter to the value of
-   * "nextPageToken" from the previous response.
-   * @return Google_Service_AdExchangeSeller_UrlChannels
-   */
-  public function listAccountsUrlchannels($accountId, $adClientId, $optParams = array())
-  {
-    $params = array('accountId' => $accountId, 'adClientId' => $adClientId);
-    $params = array_merge($params, $optParams);
-    return $this->call('list', array($params), "Google_Service_AdExchangeSeller_UrlChannels");
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdExchangeSeller/SavedReport.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdExchangeSeller/SavedReport.php
deleted file mode 100644
index 8dfa6cb4..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdExchangeSeller/SavedReport.php
+++ /dev/null
@@ -1,48 +0,0 @@
-id = $id;
-  }
-  public function getId()
-  {
-    return $this->id;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setName($name)
-  {
-    $this->name = $name;
-  }
-  public function getName()
-  {
-    return $this->name;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdExchangeSeller/SavedReports.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdExchangeSeller/SavedReports.php
deleted file mode 100644
index c20cabc3..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdExchangeSeller/SavedReports.php
+++ /dev/null
@@ -1,59 +0,0 @@
-etag = $etag;
-  }
-  public function getEtag()
-  {
-    return $this->etag;
-  }
-  public function setItems($items)
-  {
-    $this->items = $items;
-  }
-  public function getItems()
-  {
-    return $this->items;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setNextPageToken($nextPageToken)
-  {
-    $this->nextPageToken = $nextPageToken;
-  }
-  public function getNextPageToken()
-  {
-    return $this->nextPageToken;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdExchangeSeller/UrlChannel.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdExchangeSeller/UrlChannel.php
deleted file mode 100644
index 645b6fca..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdExchangeSeller/UrlChannel.php
+++ /dev/null
@@ -1,48 +0,0 @@
-id = $id;
-  }
-  public function getId()
-  {
-    return $this->id;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setUrlPattern($urlPattern)
-  {
-    $this->urlPattern = $urlPattern;
-  }
-  public function getUrlPattern()
-  {
-    return $this->urlPattern;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdExchangeSeller/UrlChannels.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdExchangeSeller/UrlChannels.php
deleted file mode 100644
index 7b1b39a8..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdExchangeSeller/UrlChannels.php
+++ /dev/null
@@ -1,59 +0,0 @@
-etag = $etag;
-  }
-  public function getEtag()
-  {
-    return $this->etag;
-  }
-  public function setItems($items)
-  {
-    $this->items = $items;
-  }
-  public function getItems()
-  {
-    return $this->items;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setNextPageToken($nextPageToken)
-  {
-    $this->nextPageToken = $nextPageToken;
-  }
-  public function getNextPageToken()
-  {
-    return $this->nextPageToken;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdSense.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdSense.php
deleted file mode 100644
index 8463904c..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdSense.php
+++ /dev/null
@@ -1,1060 +0,0 @@
-
- * Accesses AdSense publishers' inventory and generates performance reports.

- *
- * 

- * For more information about this service, see the API
- * Documentation
- * 

- *
- * @author Google, Inc.
- */
-class Google_Service_AdSense extends Google_Service
-{
-  /** View and manage your AdSense data. */
-  const ADSENSE =
-      "https://www.googleapis.com/auth/adsense";
-  /** View your AdSense data. */
-  const ADSENSE_READONLY =
-      "https://www.googleapis.com/auth/adsense.readonly";
-
-  public $accounts;
-  public $accounts_adclients;
-  public $accounts_adunits;
-  public $accounts_adunits_customchannels;
-  public $accounts_alerts;
-  public $accounts_customchannels;
-  public $accounts_customchannels_adunits;
-  public $accounts_payments;
-  public $accounts_reports;
-  public $accounts_reports_saved;
-  public $accounts_savedadstyles;
-  public $accounts_urlchannels;
-  public $adclients;
-  public $adunits;
-  public $adunits_customchannels;
-  public $alerts;
-  public $customchannels;
-  public $customchannels_adunits;
-  public $metadata_dimensions;
-  public $metadata_metrics;
-  public $payments;
-  public $reports;
-  public $reports_saved;
-  public $savedadstyles;
-  public $urlchannels;
-  
-  /**
-   * Constructs the internal representation of the AdSense service.
-   *
-   * @param Google_Client $client
-   */
-  public function __construct(Google_Client $client)
-  {
-    parent::__construct($client);
-    $this->rootUrl = 'https://www.googleapis.com/';
-    $this->servicePath = 'adsense/v1.4/';
-    $this->version = 'v1.4';
-    $this->serviceName = 'adsense';
-
-    $this->accounts = new Google_Service_AdSense_Resource_Accounts(
-        $this,
-        $this->serviceName,
-        'accounts',
-        array(
-          'methods' => array(
-            'get' => array(
-              'path' => 'accounts/{accountId}',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'accountId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'tree' => array(
-                  'location' => 'query',
-                  'type' => 'boolean',
-                ),
-              ),
-            ),'list' => array(
-              'path' => 'accounts',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'maxResults' => array(
-                  'location' => 'query',
-                  'type' => 'integer',
-                ),
-                'pageToken' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-              ),
-            ),
-          )
-        )
-    );
-    $this->accounts_adclients = new Google_Service_AdSense_Resource_AccountsAdclients(
-        $this,
-        $this->serviceName,
-        'adclients',
-        array(
-          'methods' => array(
-            'list' => array(
-              'path' => 'accounts/{accountId}/adclients',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'accountId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'maxResults' => array(
-                  'location' => 'query',
-                  'type' => 'integer',
-                ),
-                'pageToken' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-              ),
-            ),
-          )
-        )
-    );
-    $this->accounts_adunits = new Google_Service_AdSense_Resource_AccountsAdunits(
-        $this,
-        $this->serviceName,
-        'adunits',
-        array(
-          'methods' => array(
-            'get' => array(
-              'path' => 'accounts/{accountId}/adclients/{adClientId}/adunits/{adUnitId}',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'accountId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'adClientId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'adUnitId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'getAdCode' => array(
-              'path' => 'accounts/{accountId}/adclients/{adClientId}/adunits/{adUnitId}/adcode',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'accountId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'adClientId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'adUnitId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'list' => array(
-              'path' => 'accounts/{accountId}/adclients/{adClientId}/adunits',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'accountId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'adClientId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'includeInactive' => array(
-                  'location' => 'query',
-                  'type' => 'boolean',
-                ),
-                'maxResults' => array(
-                  'location' => 'query',
-                  'type' => 'integer',
-                ),
-                'pageToken' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-              ),
-            ),
-          )
-        )
-    );
-    $this->accounts_adunits_customchannels = new Google_Service_AdSense_Resource_AccountsAdunitsCustomchannels(
-        $this,
-        $this->serviceName,
-        'customchannels',
-        array(
-          'methods' => array(
-            'list' => array(
-              'path' => 'accounts/{accountId}/adclients/{adClientId}/adunits/{adUnitId}/customchannels',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'accountId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'adClientId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'adUnitId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'maxResults' => array(
-                  'location' => 'query',
-                  'type' => 'integer',
-                ),
-                'pageToken' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-              ),
-            ),
-          )
-        )
-    );
-    $this->accounts_alerts = new Google_Service_AdSense_Resource_AccountsAlerts(
-        $this,
-        $this->serviceName,
-        'alerts',
-        array(
-          'methods' => array(
-            'delete' => array(
-              'path' => 'accounts/{accountId}/alerts/{alertId}',
-              'httpMethod' => 'DELETE',
-              'parameters' => array(
-                'accountId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'alertId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'list' => array(
-              'path' => 'accounts/{accountId}/alerts',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'accountId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'locale' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-              ),
-            ),
-          )
-        )
-    );
-    $this->accounts_customchannels = new Google_Service_AdSense_Resource_AccountsCustomchannels(
-        $this,
-        $this->serviceName,
-        'customchannels',
-        array(
-          'methods' => array(
-            'get' => array(
-              'path' => 'accounts/{accountId}/adclients/{adClientId}/customchannels/{customChannelId}',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'accountId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'adClientId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'customChannelId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'list' => array(
-              'path' => 'accounts/{accountId}/adclients/{adClientId}/customchannels',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'accountId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'adClientId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'maxResults' => array(
-                  'location' => 'query',
-                  'type' => 'integer',
-                ),
-                'pageToken' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-              ),
-            ),
-          )
-        )
-    );
-    $this->accounts_customchannels_adunits = new Google_Service_AdSense_Resource_AccountsCustomchannelsAdunits(
-        $this,
-        $this->serviceName,
-        'adunits',
-        array(
-          'methods' => array(
-            'list' => array(
-              'path' => 'accounts/{accountId}/adclients/{adClientId}/customchannels/{customChannelId}/adunits',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'accountId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'adClientId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'customChannelId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'includeInactive' => array(
-                  'location' => 'query',
-                  'type' => 'boolean',
-                ),
-                'maxResults' => array(
-                  'location' => 'query',
-                  'type' => 'integer',
-                ),
-                'pageToken' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-              ),
-            ),
-          )
-        )
-    );
-    $this->accounts_payments = new Google_Service_AdSense_Resource_AccountsPayments(
-        $this,
-        $this->serviceName,
-        'payments',
-        array(
-          'methods' => array(
-            'list' => array(
-              'path' => 'accounts/{accountId}/payments',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'accountId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),
-          )
-        )
-    );
-    $this->accounts_reports = new Google_Service_AdSense_Resource_AccountsReports(
-        $this,
-        $this->serviceName,
-        'reports',
-        array(
-          'methods' => array(
-            'generate' => array(
-              'path' => 'accounts/{accountId}/reports',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'accountId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'startDate' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'endDate' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'currency' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'dimension' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                  'repeated' => true,
-                ),
-                'filter' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                  'repeated' => true,
-                ),
-                'locale' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'maxResults' => array(
-                  'location' => 'query',
-                  'type' => 'integer',
-                ),
-                'metric' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                  'repeated' => true,
-                ),
-                'sort' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                  'repeated' => true,
-                ),
-                'startIndex' => array(
-                  'location' => 'query',
-                  'type' => 'integer',
-                ),
-                'useTimezoneReporting' => array(
-                  'location' => 'query',
-                  'type' => 'boolean',
-                ),
-              ),
-            ),
-          )
-        )
-    );
-    $this->accounts_reports_saved = new Google_Service_AdSense_Resource_AccountsReportsSaved(
-        $this,
-        $this->serviceName,
-        'saved',
-        array(
-          'methods' => array(
-            'generate' => array(
-              'path' => 'accounts/{accountId}/reports/{savedReportId}',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'accountId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'savedReportId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'locale' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'maxResults' => array(
-                  'location' => 'query',
-                  'type' => 'integer',
-                ),
-                'startIndex' => array(
-                  'location' => 'query',
-                  'type' => 'integer',
-                ),
-              ),
-            ),'list' => array(
-              'path' => 'accounts/{accountId}/reports/saved',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'accountId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'maxResults' => array(
-                  'location' => 'query',
-                  'type' => 'integer',
-                ),
-                'pageToken' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-              ),
-            ),
-          )
-        )
-    );
-    $this->accounts_savedadstyles = new Google_Service_AdSense_Resource_AccountsSavedadstyles(
-        $this,
-        $this->serviceName,
-        'savedadstyles',
-        array(
-          'methods' => array(
-            'get' => array(
-              'path' => 'accounts/{accountId}/savedadstyles/{savedAdStyleId}',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'accountId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'savedAdStyleId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'list' => array(
-              'path' => 'accounts/{accountId}/savedadstyles',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'accountId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'maxResults' => array(
-                  'location' => 'query',
-                  'type' => 'integer',
-                ),
-                'pageToken' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-              ),
-            ),
-          )
-        )
-    );
-    $this->accounts_urlchannels = new Google_Service_AdSense_Resource_AccountsUrlchannels(
-        $this,
-        $this->serviceName,
-        'urlchannels',
-        array(
-          'methods' => array(
-            'list' => array(
-              'path' => 'accounts/{accountId}/adclients/{adClientId}/urlchannels',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'accountId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'adClientId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'maxResults' => array(
-                  'location' => 'query',
-                  'type' => 'integer',
-                ),
-                'pageToken' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-              ),
-            ),
-          )
-        )
-    );
-    $this->adclients = new Google_Service_AdSense_Resource_Adclients(
-        $this,
-        $this->serviceName,
-        'adclients',
-        array(
-          'methods' => array(
-            'list' => array(
-              'path' => 'adclients',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'maxResults' => array(
-                  'location' => 'query',
-                  'type' => 'integer',
-                ),
-                'pageToken' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-              ),
-            ),
-          )
-        )
-    );
-    $this->adunits = new Google_Service_AdSense_Resource_Adunits(
-        $this,
-        $this->serviceName,
-        'adunits',
-        array(
-          'methods' => array(
-            'get' => array(
-              'path' => 'adclients/{adClientId}/adunits/{adUnitId}',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'adClientId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'adUnitId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'getAdCode' => array(
-              'path' => 'adclients/{adClientId}/adunits/{adUnitId}/adcode',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'adClientId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'adUnitId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'list' => array(
-              'path' => 'adclients/{adClientId}/adunits',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'adClientId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'includeInactive' => array(
-                  'location' => 'query',
-                  'type' => 'boolean',
-                ),
-                'maxResults' => array(
-                  'location' => 'query',
-                  'type' => 'integer',
-                ),
-                'pageToken' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-              ),
-            ),
-          )
-        )
-    );
-    $this->adunits_customchannels = new Google_Service_AdSense_Resource_AdunitsCustomchannels(
-        $this,
-        $this->serviceName,
-        'customchannels',
-        array(
-          'methods' => array(
-            'list' => array(
-              'path' => 'adclients/{adClientId}/adunits/{adUnitId}/customchannels',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'adClientId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'adUnitId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'maxResults' => array(
-                  'location' => 'query',
-                  'type' => 'integer',
-                ),
-                'pageToken' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-              ),
-            ),
-          )
-        )
-    );
-    $this->alerts = new Google_Service_AdSense_Resource_Alerts(
-        $this,
-        $this->serviceName,
-        'alerts',
-        array(
-          'methods' => array(
-            'delete' => array(
-              'path' => 'alerts/{alertId}',
-              'httpMethod' => 'DELETE',
-              'parameters' => array(
-                'alertId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'list' => array(
-              'path' => 'alerts',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'locale' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-              ),
-            ),
-          )
-        )
-    );
-    $this->customchannels = new Google_Service_AdSense_Resource_Customchannels(
-        $this,
-        $this->serviceName,
-        'customchannels',
-        array(
-          'methods' => array(
-            'get' => array(
-              'path' => 'adclients/{adClientId}/customchannels/{customChannelId}',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'adClientId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'customChannelId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'list' => array(
-              'path' => 'adclients/{adClientId}/customchannels',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'adClientId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'maxResults' => array(
-                  'location' => 'query',
-                  'type' => 'integer',
-                ),
-                'pageToken' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-              ),
-            ),
-          )
-        )
-    );
-    $this->customchannels_adunits = new Google_Service_AdSense_Resource_CustomchannelsAdunits(
-        $this,
-        $this->serviceName,
-        'adunits',
-        array(
-          'methods' => array(
-            'list' => array(
-              'path' => 'adclients/{adClientId}/customchannels/{customChannelId}/adunits',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'adClientId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'customChannelId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'includeInactive' => array(
-                  'location' => 'query',
-                  'type' => 'boolean',
-                ),
-                'maxResults' => array(
-                  'location' => 'query',
-                  'type' => 'integer',
-                ),
-                'pageToken' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-              ),
-            ),
-          )
-        )
-    );
-    $this->metadata_dimensions = new Google_Service_AdSense_Resource_MetadataDimensions(
-        $this,
-        $this->serviceName,
-        'dimensions',
-        array(
-          'methods' => array(
-            'list' => array(
-              'path' => 'metadata/dimensions',
-              'httpMethod' => 'GET',
-              'parameters' => array(),
-            ),
-          )
-        )
-    );
-    $this->metadata_metrics = new Google_Service_AdSense_Resource_MetadataMetrics(
-        $this,
-        $this->serviceName,
-        'metrics',
-        array(
-          'methods' => array(
-            'list' => array(
-              'path' => 'metadata/metrics',
-              'httpMethod' => 'GET',
-              'parameters' => array(),
-            ),
-          )
-        )
-    );
-    $this->payments = new Google_Service_AdSense_Resource_Payments(
-        $this,
-        $this->serviceName,
-        'payments',
-        array(
-          'methods' => array(
-            'list' => array(
-              'path' => 'payments',
-              'httpMethod' => 'GET',
-              'parameters' => array(),
-            ),
-          )
-        )
-    );
-    $this->reports = new Google_Service_AdSense_Resource_Reports(
-        $this,
-        $this->serviceName,
-        'reports',
-        array(
-          'methods' => array(
-            'generate' => array(
-              'path' => 'reports',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'startDate' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'endDate' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'accountId' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                  'repeated' => true,
-                ),
-                'currency' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'dimension' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                  'repeated' => true,
-                ),
-                'filter' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                  'repeated' => true,
-                ),
-                'locale' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'maxResults' => array(
-                  'location' => 'query',
-                  'type' => 'integer',
-                ),
-                'metric' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                  'repeated' => true,
-                ),
-                'sort' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                  'repeated' => true,
-                ),
-                'startIndex' => array(
-                  'location' => 'query',
-                  'type' => 'integer',
-                ),
-                'useTimezoneReporting' => array(
-                  'location' => 'query',
-                  'type' => 'boolean',
-                ),
-              ),
-            ),
-          )
-        )
-    );
-    $this->reports_saved = new Google_Service_AdSense_Resource_ReportsSaved(
-        $this,
-        $this->serviceName,
-        'saved',
-        array(
-          'methods' => array(
-            'generate' => array(
-              'path' => 'reports/{savedReportId}',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'savedReportId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'locale' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'maxResults' => array(
-                  'location' => 'query',
-                  'type' => 'integer',
-                ),
-                'startIndex' => array(
-                  'location' => 'query',
-                  'type' => 'integer',
-                ),
-              ),
-            ),'list' => array(
-              'path' => 'reports/saved',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'maxResults' => array(
-                  'location' => 'query',
-                  'type' => 'integer',
-                ),
-                'pageToken' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-              ),
-            ),
-          )
-        )
-    );
-    $this->savedadstyles = new Google_Service_AdSense_Resource_Savedadstyles(
-        $this,
-        $this->serviceName,
-        'savedadstyles',
-        array(
-          'methods' => array(
-            'get' => array(
-              'path' => 'savedadstyles/{savedAdStyleId}',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'savedAdStyleId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'list' => array(
-              'path' => 'savedadstyles',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'maxResults' => array(
-                  'location' => 'query',
-                  'type' => 'integer',
-                ),
-                'pageToken' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-              ),
-            ),
-          )
-        )
-    );
-    $this->urlchannels = new Google_Service_AdSense_Resource_Urlchannels(
-        $this,
-        $this->serviceName,
-        'urlchannels',
-        array(
-          'methods' => array(
-            'list' => array(
-              'path' => 'adclients/{adClientId}/urlchannels',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'adClientId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'maxResults' => array(
-                  'location' => 'query',
-                  'type' => 'integer',
-                ),
-                'pageToken' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-              ),
-            ),
-          )
-        )
-    );
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdSense/Account.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdSense/Account.php
deleted file mode 100644
index a627aa78..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdSense/Account.php
+++ /dev/null
@@ -1,89 +0,0 @@
- "creation_time",
-  );
-  public $creationTime;
-  public $id;
-  public $kind;
-  public $name;
-  public $premium;
-  protected $subAccountsType = 'Google_Service_AdSense_Account';
-  protected $subAccountsDataType = 'array';
-  public $timezone;
-
-  public function setCreationTime($creationTime)
-  {
-    $this->creationTime = $creationTime;
-  }
-  public function getCreationTime()
-  {
-    return $this->creationTime;
-  }
-  public function setId($id)
-  {
-    $this->id = $id;
-  }
-  public function getId()
-  {
-    return $this->id;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setName($name)
-  {
-    $this->name = $name;
-  }
-  public function getName()
-  {
-    return $this->name;
-  }
-  public function setPremium($premium)
-  {
-    $this->premium = $premium;
-  }
-  public function getPremium()
-  {
-    return $this->premium;
-  }
-  public function setSubAccounts($subAccounts)
-  {
-    $this->subAccounts = $subAccounts;
-  }
-  public function getSubAccounts()
-  {
-    return $this->subAccounts;
-  }
-  public function setTimezone($timezone)
-  {
-    $this->timezone = $timezone;
-  }
-  public function getTimezone()
-  {
-    return $this->timezone;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdSense/Accounts.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdSense/Accounts.php
deleted file mode 100644
index b7a3d6b8..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdSense/Accounts.php
+++ /dev/null
@@ -1,59 +0,0 @@
-etag = $etag;
-  }
-  public function getEtag()
-  {
-    return $this->etag;
-  }
-  public function setItems($items)
-  {
-    $this->items = $items;
-  }
-  public function getItems()
-  {
-    return $this->items;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setNextPageToken($nextPageToken)
-  {
-    $this->nextPageToken = $nextPageToken;
-  }
-  public function getNextPageToken()
-  {
-    return $this->nextPageToken;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdSense/AdClient.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdSense/AdClient.php
deleted file mode 100644
index c34218f3..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdSense/AdClient.php
+++ /dev/null
@@ -1,66 +0,0 @@
-arcOptIn = $arcOptIn;
-  }
-  public function getArcOptIn()
-  {
-    return $this->arcOptIn;
-  }
-  public function setId($id)
-  {
-    $this->id = $id;
-  }
-  public function getId()
-  {
-    return $this->id;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setProductCode($productCode)
-  {
-    $this->productCode = $productCode;
-  }
-  public function getProductCode()
-  {
-    return $this->productCode;
-  }
-  public function setSupportsReporting($supportsReporting)
-  {
-    $this->supportsReporting = $supportsReporting;
-  }
-  public function getSupportsReporting()
-  {
-    return $this->supportsReporting;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdSense/AdClients.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdSense/AdClients.php
deleted file mode 100644
index 4347876e..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdSense/AdClients.php
+++ /dev/null
@@ -1,59 +0,0 @@
-etag = $etag;
-  }
-  public function getEtag()
-  {
-    return $this->etag;
-  }
-  public function setItems($items)
-  {
-    $this->items = $items;
-  }
-  public function getItems()
-  {
-    return $this->items;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setNextPageToken($nextPageToken)
-  {
-    $this->nextPageToken = $nextPageToken;
-  }
-  public function getNextPageToken()
-  {
-    return $this->nextPageToken;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdSense/AdCode.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdSense/AdCode.php
deleted file mode 100644
index 2efb9d6b..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdSense/AdCode.php
+++ /dev/null
@@ -1,39 +0,0 @@
-adCode = $adCode;
-  }
-  public function getAdCode()
-  {
-    return $this->adCode;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdSense/AdStyle.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdSense/AdStyle.php
deleted file mode 100644
index 491c2a46..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdSense/AdStyle.php
+++ /dev/null
@@ -1,59 +0,0 @@
-colors = $colors;
-  }
-  public function getColors()
-  {
-    return $this->colors;
-  }
-  public function setCorners($corners)
-  {
-    $this->corners = $corners;
-  }
-  public function getCorners()
-  {
-    return $this->corners;
-  }
-  public function setFont(Google_Service_AdSense_AdStyleFont $font)
-  {
-    $this->font = $font;
-  }
-  public function getFont()
-  {
-    return $this->font;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdSense/AdStyleColors.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdSense/AdStyleColors.php
deleted file mode 100644
index a844ccf9..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdSense/AdStyleColors.php
+++ /dev/null
@@ -1,66 +0,0 @@
-background = $background;
-  }
-  public function getBackground()
-  {
-    return $this->background;
-  }
-  public function setBorder($border)
-  {
-    $this->border = $border;
-  }
-  public function getBorder()
-  {
-    return $this->border;
-  }
-  public function setText($text)
-  {
-    $this->text = $text;
-  }
-  public function getText()
-  {
-    return $this->text;
-  }
-  public function setTitle($title)
-  {
-    $this->title = $title;
-  }
-  public function getTitle()
-  {
-    return $this->title;
-  }
-  public function setUrl($url)
-  {
-    $this->url = $url;
-  }
-  public function getUrl()
-  {
-    return $this->url;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdSense/AdStyleFont.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdSense/AdStyleFont.php
deleted file mode 100644
index 9dfc83f1..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdSense/AdStyleFont.php
+++ /dev/null
@@ -1,39 +0,0 @@
-family = $family;
-  }
-  public function getFamily()
-  {
-    return $this->family;
-  }
-  public function setSize($size)
-  {
-    $this->size = $size;
-  }
-  public function getSize()
-  {
-    return $this->size;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdSense/AdUnit.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdSense/AdUnit.php
deleted file mode 100644
index 53466f58..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdSense/AdUnit.php
+++ /dev/null
@@ -1,115 +0,0 @@
-code = $code;
-  }
-  public function getCode()
-  {
-    return $this->code;
-  }
-  public function setContentAdsSettings(Google_Service_AdSense_AdUnitContentAdsSettings $contentAdsSettings)
-  {
-    $this->contentAdsSettings = $contentAdsSettings;
-  }
-  public function getContentAdsSettings()
-  {
-    return $this->contentAdsSettings;
-  }
-  public function setCustomStyle(Google_Service_AdSense_AdStyle $customStyle)
-  {
-    $this->customStyle = $customStyle;
-  }
-  public function getCustomStyle()
-  {
-    return $this->customStyle;
-  }
-  public function setFeedAdsSettings(Google_Service_AdSense_AdUnitFeedAdsSettings $feedAdsSettings)
-  {
-    $this->feedAdsSettings = $feedAdsSettings;
-  }
-  public function getFeedAdsSettings()
-  {
-    return $this->feedAdsSettings;
-  }
-  public function setId($id)
-  {
-    $this->id = $id;
-  }
-  public function getId()
-  {
-    return $this->id;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setMobileContentAdsSettings(Google_Service_AdSense_AdUnitMobileContentAdsSettings $mobileContentAdsSettings)
-  {
-    $this->mobileContentAdsSettings = $mobileContentAdsSettings;
-  }
-  public function getMobileContentAdsSettings()
-  {
-    return $this->mobileContentAdsSettings;
-  }
-  public function setName($name)
-  {
-    $this->name = $name;
-  }
-  public function getName()
-  {
-    return $this->name;
-  }
-  public function setSavedStyleId($savedStyleId)
-  {
-    $this->savedStyleId = $savedStyleId;
-  }
-  public function getSavedStyleId()
-  {
-    return $this->savedStyleId;
-  }
-  public function setStatus($status)
-  {
-    $this->status = $status;
-  }
-  public function getStatus()
-  {
-    return $this->status;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdSense/AdUnitContentAdsSettings.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdSense/AdUnitContentAdsSettings.php
deleted file mode 100644
index ecbd2198..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdSense/AdUnitContentAdsSettings.php
+++ /dev/null
@@ -1,49 +0,0 @@
-backupOption = $backupOption;
-  }
-  public function getBackupOption()
-  {
-    return $this->backupOption;
-  }
-  public function setSize($size)
-  {
-    $this->size = $size;
-  }
-  public function getSize()
-  {
-    return $this->size;
-  }
-  public function setType($type)
-  {
-    $this->type = $type;
-  }
-  public function getType()
-  {
-    return $this->type;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdSense/AdUnitContentAdsSettingsBackupOption.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdSense/AdUnitContentAdsSettingsBackupOption.php
deleted file mode 100644
index 8c3824b4..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdSense/AdUnitContentAdsSettingsBackupOption.php
+++ /dev/null
@@ -1,48 +0,0 @@
-color = $color;
-  }
-  public function getColor()
-  {
-    return $this->color;
-  }
-  public function setType($type)
-  {
-    $this->type = $type;
-  }
-  public function getType()
-  {
-    return $this->type;
-  }
-  public function setUrl($url)
-  {
-    $this->url = $url;
-  }
-  public function getUrl()
-  {
-    return $this->url;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdSense/AdUnitFeedAdsSettings.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdSense/AdUnitFeedAdsSettings.php
deleted file mode 100644
index 8c5f5a41..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdSense/AdUnitFeedAdsSettings.php
+++ /dev/null
@@ -1,57 +0,0 @@
-adPosition = $adPosition;
-  }
-  public function getAdPosition()
-  {
-    return $this->adPosition;
-  }
-  public function setFrequency($frequency)
-  {
-    $this->frequency = $frequency;
-  }
-  public function getFrequency()
-  {
-    return $this->frequency;
-  }
-  public function setMinimumWordCount($minimumWordCount)
-  {
-    $this->minimumWordCount = $minimumWordCount;
-  }
-  public function getMinimumWordCount()
-  {
-    return $this->minimumWordCount;
-  }
-  public function setType($type)
-  {
-    $this->type = $type;
-  }
-  public function getType()
-  {
-    return $this->type;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdSense/AdUnitMobileContentAdsSettings.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdSense/AdUnitMobileContentAdsSettings.php
deleted file mode 100644
index 892d83a8..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdSense/AdUnitMobileContentAdsSettings.php
+++ /dev/null
@@ -1,57 +0,0 @@
-markupLanguage = $markupLanguage;
-  }
-  public function getMarkupLanguage()
-  {
-    return $this->markupLanguage;
-  }
-  public function setScriptingLanguage($scriptingLanguage)
-  {
-    $this->scriptingLanguage = $scriptingLanguage;
-  }
-  public function getScriptingLanguage()
-  {
-    return $this->scriptingLanguage;
-  }
-  public function setSize($size)
-  {
-    $this->size = $size;
-  }
-  public function getSize()
-  {
-    return $this->size;
-  }
-  public function setType($type)
-  {
-    $this->type = $type;
-  }
-  public function getType()
-  {
-    return $this->type;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdSense/AdUnits.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdSense/AdUnits.php
deleted file mode 100644
index ab16767c..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdSense/AdUnits.php
+++ /dev/null
@@ -1,59 +0,0 @@
-etag = $etag;
-  }
-  public function getEtag()
-  {
-    return $this->etag;
-  }
-  public function setItems($items)
-  {
-    $this->items = $items;
-  }
-  public function getItems()
-  {
-    return $this->items;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setNextPageToken($nextPageToken)
-  {
-    $this->nextPageToken = $nextPageToken;
-  }
-  public function getNextPageToken()
-  {
-    return $this->nextPageToken;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdSense/AdsenseReportsGenerateResponse.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdSense/AdsenseReportsGenerateResponse.php
deleted file mode 100644
index 61d16a5f..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdSense/AdsenseReportsGenerateResponse.php
+++ /dev/null
@@ -1,104 +0,0 @@
-averages = $averages;
-  }
-  public function getAverages()
-  {
-    return $this->averages;
-  }
-  public function setEndDate($endDate)
-  {
-    $this->endDate = $endDate;
-  }
-  public function getEndDate()
-  {
-    return $this->endDate;
-  }
-  public function setHeaders($headers)
-  {
-    $this->headers = $headers;
-  }
-  public function getHeaders()
-  {
-    return $this->headers;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setRows($rows)
-  {
-    $this->rows = $rows;
-  }
-  public function getRows()
-  {
-    return $this->rows;
-  }
-  public function setStartDate($startDate)
-  {
-    $this->startDate = $startDate;
-  }
-  public function getStartDate()
-  {
-    return $this->startDate;
-  }
-  public function setTotalMatchedRows($totalMatchedRows)
-  {
-    $this->totalMatchedRows = $totalMatchedRows;
-  }
-  public function getTotalMatchedRows()
-  {
-    return $this->totalMatchedRows;
-  }
-  public function setTotals($totals)
-  {
-    $this->totals = $totals;
-  }
-  public function getTotals()
-  {
-    return $this->totals;
-  }
-  public function setWarnings($warnings)
-  {
-    $this->warnings = $warnings;
-  }
-  public function getWarnings()
-  {
-    return $this->warnings;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdSense/AdsenseReportsGenerateResponseHeaders.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdSense/AdsenseReportsGenerateResponseHeaders.php
deleted file mode 100644
index 4fc41d2e..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdSense/AdsenseReportsGenerateResponseHeaders.php
+++ /dev/null
@@ -1,48 +0,0 @@
-currency = $currency;
-  }
-  public function getCurrency()
-  {
-    return $this->currency;
-  }
-  public function setName($name)
-  {
-    $this->name = $name;
-  }
-  public function getName()
-  {
-    return $this->name;
-  }
-  public function setType($type)
-  {
-    $this->type = $type;
-  }
-  public function getType()
-  {
-    return $this->type;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdSense/Alert.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdSense/Alert.php
deleted file mode 100644
index 14a4748d..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdSense/Alert.php
+++ /dev/null
@@ -1,75 +0,0 @@
-id = $id;
-  }
-  public function getId()
-  {
-    return $this->id;
-  }
-  public function setIsDismissible($isDismissible)
-  {
-    $this->isDismissible = $isDismissible;
-  }
-  public function getIsDismissible()
-  {
-    return $this->isDismissible;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setMessage($message)
-  {
-    $this->message = $message;
-  }
-  public function getMessage()
-  {
-    return $this->message;
-  }
-  public function setSeverity($severity)
-  {
-    $this->severity = $severity;
-  }
-  public function getSeverity()
-  {
-    return $this->severity;
-  }
-  public function setType($type)
-  {
-    $this->type = $type;
-  }
-  public function getType()
-  {
-    return $this->type;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdSense/Alerts.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdSense/Alerts.php
deleted file mode 100644
index 04f38a45..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdSense/Alerts.php
+++ /dev/null
@@ -1,41 +0,0 @@
-items = $items;
-  }
-  public function getItems()
-  {
-    return $this->items;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdSense/CustomChannel.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdSense/CustomChannel.php
deleted file mode 100644
index 2d3c7ec3..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdSense/CustomChannel.php
+++ /dev/null
@@ -1,67 +0,0 @@
-code = $code;
-  }
-  public function getCode()
-  {
-    return $this->code;
-  }
-  public function setId($id)
-  {
-    $this->id = $id;
-  }
-  public function getId()
-  {
-    return $this->id;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setName($name)
-  {
-    $this->name = $name;
-  }
-  public function getName()
-  {
-    return $this->name;
-  }
-  public function setTargetingInfo(Google_Service_AdSense_CustomChannelTargetingInfo $targetingInfo)
-  {
-    $this->targetingInfo = $targetingInfo;
-  }
-  public function getTargetingInfo()
-  {
-    return $this->targetingInfo;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdSense/CustomChannelTargetingInfo.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdSense/CustomChannelTargetingInfo.php
deleted file mode 100644
index d37a7c0c..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdSense/CustomChannelTargetingInfo.php
+++ /dev/null
@@ -1,57 +0,0 @@
-adsAppearOn = $adsAppearOn;
-  }
-  public function getAdsAppearOn()
-  {
-    return $this->adsAppearOn;
-  }
-  public function setDescription($description)
-  {
-    $this->description = $description;
-  }
-  public function getDescription()
-  {
-    return $this->description;
-  }
-  public function setLocation($location)
-  {
-    $this->location = $location;
-  }
-  public function getLocation()
-  {
-    return $this->location;
-  }
-  public function setSiteLanguage($siteLanguage)
-  {
-    $this->siteLanguage = $siteLanguage;
-  }
-  public function getSiteLanguage()
-  {
-    return $this->siteLanguage;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdSense/CustomChannels.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdSense/CustomChannels.php
deleted file mode 100644
index 3897f99b..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdSense/CustomChannels.php
+++ /dev/null
@@ -1,59 +0,0 @@
-etag = $etag;
-  }
-  public function getEtag()
-  {
-    return $this->etag;
-  }
-  public function setItems($items)
-  {
-    $this->items = $items;
-  }
-  public function getItems()
-  {
-    return $this->items;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setNextPageToken($nextPageToken)
-  {
-    $this->nextPageToken = $nextPageToken;
-  }
-  public function getNextPageToken()
-  {
-    return $this->nextPageToken;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdSense/Metadata.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdSense/Metadata.php
deleted file mode 100644
index 3234c015..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdSense/Metadata.php
+++ /dev/null
@@ -1,41 +0,0 @@
-items = $items;
-  }
-  public function getItems()
-  {
-    return $this->items;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdSense/Payment.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdSense/Payment.php
deleted file mode 100644
index 577ab302..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdSense/Payment.php
+++ /dev/null
@@ -1,66 +0,0 @@
-id = $id;
-  }
-  public function getId()
-  {
-    return $this->id;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setPaymentAmount($paymentAmount)
-  {
-    $this->paymentAmount = $paymentAmount;
-  }
-  public function getPaymentAmount()
-  {
-    return $this->paymentAmount;
-  }
-  public function setPaymentAmountCurrencyCode($paymentAmountCurrencyCode)
-  {
-    $this->paymentAmountCurrencyCode = $paymentAmountCurrencyCode;
-  }
-  public function getPaymentAmountCurrencyCode()
-  {
-    return $this->paymentAmountCurrencyCode;
-  }
-  public function setPaymentDate($paymentDate)
-  {
-    $this->paymentDate = $paymentDate;
-  }
-  public function getPaymentDate()
-  {
-    return $this->paymentDate;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdSense/Payments.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdSense/Payments.php
deleted file mode 100644
index 2aad94f1..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdSense/Payments.php
+++ /dev/null
@@ -1,41 +0,0 @@
-items = $items;
-  }
-  public function getItems()
-  {
-    return $this->items;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdSense/ReportingMetadataEntry.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdSense/ReportingMetadataEntry.php
deleted file mode 100644
index 8919b1a7..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdSense/ReportingMetadataEntry.php
+++ /dev/null
@@ -1,85 +0,0 @@
-compatibleDimensions = $compatibleDimensions;
-  }
-  public function getCompatibleDimensions()
-  {
-    return $this->compatibleDimensions;
-  }
-  public function setCompatibleMetrics($compatibleMetrics)
-  {
-    $this->compatibleMetrics = $compatibleMetrics;
-  }
-  public function getCompatibleMetrics()
-  {
-    return $this->compatibleMetrics;
-  }
-  public function setId($id)
-  {
-    $this->id = $id;
-  }
-  public function getId()
-  {
-    return $this->id;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setRequiredDimensions($requiredDimensions)
-  {
-    $this->requiredDimensions = $requiredDimensions;
-  }
-  public function getRequiredDimensions()
-  {
-    return $this->requiredDimensions;
-  }
-  public function setRequiredMetrics($requiredMetrics)
-  {
-    $this->requiredMetrics = $requiredMetrics;
-  }
-  public function getRequiredMetrics()
-  {
-    return $this->requiredMetrics;
-  }
-  public function setSupportedProducts($supportedProducts)
-  {
-    $this->supportedProducts = $supportedProducts;
-  }
-  public function getSupportedProducts()
-  {
-    return $this->supportedProducts;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdSense/Resource/Accounts.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdSense/Resource/Accounts.php
deleted file mode 100644
index dd310359..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdSense/Resource/Accounts.php
+++ /dev/null
@@ -1,61 +0,0 @@
-
- *   $adsenseService = new Google_Service_AdSense(...);
- *   $accounts = $adsenseService->accounts;
- *  
- */
-class Google_Service_AdSense_Resource_Accounts extends Google_Service_Resource
-{
-  /**
-   * Get information about the selected AdSense account. (accounts.get)
-   *
-   * @param string $accountId Account to get information about.
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param bool tree Whether the tree of sub accounts should be returned.
-   * @return Google_Service_AdSense_Account
-   */
-  public function get($accountId, $optParams = array())
-  {
-    $params = array('accountId' => $accountId);
-    $params = array_merge($params, $optParams);
-    return $this->call('get', array($params), "Google_Service_AdSense_Account");
-  }
-  /**
-   * List all accounts available to this AdSense account. (accounts.listAccounts)
-   *
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param int maxResults The maximum number of accounts to include in the
-   * response, used for paging.
-   * @opt_param string pageToken A continuation token, used to page through
-   * accounts. To retrieve the next page, set this parameter to the value of
-   * "nextPageToken" from the previous response.
-   * @return Google_Service_AdSense_Accounts
-   */
-  public function listAccounts($optParams = array())
-  {
-    $params = array();
-    $params = array_merge($params, $optParams);
-    return $this->call('list', array($params), "Google_Service_AdSense_Accounts");
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdSense/Resource/AccountsAdclients.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdSense/Resource/AccountsAdclients.php
deleted file mode 100644
index 0d204e62..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdSense/Resource/AccountsAdclients.php
+++ /dev/null
@@ -1,48 +0,0 @@
-
- *   $adsenseService = new Google_Service_AdSense(...);
- *   $adclients = $adsenseService->adclients;
- *  
- */
-class Google_Service_AdSense_Resource_AccountsAdclients extends Google_Service_Resource
-{
-  /**
-   * List all ad clients in the specified account.
-   * (adclients.listAccountsAdclients)
-   *
-   * @param string $accountId Account for which to list ad clients.
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param int maxResults The maximum number of ad clients to include in the
-   * response, used for paging.
-   * @opt_param string pageToken A continuation token, used to page through ad
-   * clients. To retrieve the next page, set this parameter to the value of
-   * "nextPageToken" from the previous response.
-   * @return Google_Service_AdSense_AdClients
-   */
-  public function listAccountsAdclients($accountId, $optParams = array())
-  {
-    $params = array('accountId' => $accountId);
-    $params = array_merge($params, $optParams);
-    return $this->call('list', array($params), "Google_Service_AdSense_AdClients");
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdSense/Resource/AccountsAdunits.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdSense/Resource/AccountsAdunits.php
deleted file mode 100644
index 5e51d4bb..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdSense/Resource/AccountsAdunits.php
+++ /dev/null
@@ -1,82 +0,0 @@
-
- *   $adsenseService = new Google_Service_AdSense(...);
- *   $adunits = $adsenseService->adunits;
- *  
- */
-class Google_Service_AdSense_Resource_AccountsAdunits extends Google_Service_Resource
-{
-  /**
-   * Gets the specified ad unit in the specified ad client for the specified
-   * account. (adunits.get)
-   *
-   * @param string $accountId Account to which the ad client belongs.
-   * @param string $adClientId Ad client for which to get the ad unit.
-   * @param string $adUnitId Ad unit to retrieve.
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_AdSense_AdUnit
-   */
-  public function get($accountId, $adClientId, $adUnitId, $optParams = array())
-  {
-    $params = array('accountId' => $accountId, 'adClientId' => $adClientId, 'adUnitId' => $adUnitId);
-    $params = array_merge($params, $optParams);
-    return $this->call('get', array($params), "Google_Service_AdSense_AdUnit");
-  }
-  /**
-   * Get ad code for the specified ad unit. (adunits.getAdCode)
-   *
-   * @param string $accountId Account which contains the ad client.
-   * @param string $adClientId Ad client with contains the ad unit.
-   * @param string $adUnitId Ad unit to get the code for.
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_AdSense_AdCode
-   */
-  public function getAdCode($accountId, $adClientId, $adUnitId, $optParams = array())
-  {
-    $params = array('accountId' => $accountId, 'adClientId' => $adClientId, 'adUnitId' => $adUnitId);
-    $params = array_merge($params, $optParams);
-    return $this->call('getAdCode', array($params), "Google_Service_AdSense_AdCode");
-  }
-  /**
-   * List all ad units in the specified ad client for the specified account.
-   * (adunits.listAccountsAdunits)
-   *
-   * @param string $accountId Account to which the ad client belongs.
-   * @param string $adClientId Ad client for which to list ad units.
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param bool includeInactive Whether to include inactive ad units.
-   * Default: true.
-   * @opt_param int maxResults The maximum number of ad units to include in the
-   * response, used for paging.
-   * @opt_param string pageToken A continuation token, used to page through ad
-   * units. To retrieve the next page, set this parameter to the value of
-   * "nextPageToken" from the previous response.
-   * @return Google_Service_AdSense_AdUnits
-   */
-  public function listAccountsAdunits($accountId, $adClientId, $optParams = array())
-  {
-    $params = array('accountId' => $accountId, 'adClientId' => $adClientId);
-    $params = array_merge($params, $optParams);
-    return $this->call('list', array($params), "Google_Service_AdSense_AdUnits");
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdSense/Resource/AccountsAdunitsCustomchannels.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdSense/Resource/AccountsAdunitsCustomchannels.php
deleted file mode 100644
index 8d3dc90a..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdSense/Resource/AccountsAdunitsCustomchannels.php
+++ /dev/null
@@ -1,50 +0,0 @@
-
- *   $adsenseService = new Google_Service_AdSense(...);
- *   $customchannels = $adsenseService->customchannels;
- *  
- */
-class Google_Service_AdSense_Resource_AccountsAdunitsCustomchannels extends Google_Service_Resource
-{
-  /**
-   * List all custom channels which the specified ad unit belongs to.
-   * (customchannels.listAccountsAdunitsCustomchannels)
-   *
-   * @param string $accountId Account to which the ad client belongs.
-   * @param string $adClientId Ad client which contains the ad unit.
-   * @param string $adUnitId Ad unit for which to list custom channels.
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param int maxResults The maximum number of custom channels to include in
-   * the response, used for paging.
-   * @opt_param string pageToken A continuation token, used to page through custom
-   * channels. To retrieve the next page, set this parameter to the value of
-   * "nextPageToken" from the previous response.
-   * @return Google_Service_AdSense_CustomChannels
-   */
-  public function listAccountsAdunitsCustomchannels($accountId, $adClientId, $adUnitId, $optParams = array())
-  {
-    $params = array('accountId' => $accountId, 'adClientId' => $adClientId, 'adUnitId' => $adUnitId);
-    $params = array_merge($params, $optParams);
-    return $this->call('list', array($params), "Google_Service_AdSense_CustomChannels");
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdSense/Resource/AccountsAlerts.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdSense/Resource/AccountsAlerts.php
deleted file mode 100644
index da9daf6f..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdSense/Resource/AccountsAlerts.php
+++ /dev/null
@@ -1,60 +0,0 @@
-
- *   $adsenseService = new Google_Service_AdSense(...);
- *   $alerts = $adsenseService->alerts;
- *  
- */
-class Google_Service_AdSense_Resource_AccountsAlerts extends Google_Service_Resource
-{
-  /**
-   * Dismiss (delete) the specified alert from the specified publisher AdSense
-   * account. (alerts.delete)
-   *
-   * @param string $accountId Account which contains the ad unit.
-   * @param string $alertId Alert to delete.
-   * @param array $optParams Optional parameters.
-   */
-  public function delete($accountId, $alertId, $optParams = array())
-  {
-    $params = array('accountId' => $accountId, 'alertId' => $alertId);
-    $params = array_merge($params, $optParams);
-    return $this->call('delete', array($params));
-  }
-  /**
-   * List the alerts for the specified AdSense account.
-   * (alerts.listAccountsAlerts)
-   *
-   * @param string $accountId Account for which to retrieve the alerts.
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param string locale The locale to use for translating alert messages.
-   * The account locale will be used if this is not supplied. The AdSense default
-   * (English) will be used if the supplied locale is invalid or unsupported.
-   * @return Google_Service_AdSense_Alerts
-   */
-  public function listAccountsAlerts($accountId, $optParams = array())
-  {
-    $params = array('accountId' => $accountId);
-    $params = array_merge($params, $optParams);
-    return $this->call('list', array($params), "Google_Service_AdSense_Alerts");
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdSense/Resource/AccountsCustomchannels.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdSense/Resource/AccountsCustomchannels.php
deleted file mode 100644
index 1dd90824..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdSense/Resource/AccountsCustomchannels.php
+++ /dev/null
@@ -1,65 +0,0 @@
-
- *   $adsenseService = new Google_Service_AdSense(...);
- *   $customchannels = $adsenseService->customchannels;
- *  
- */
-class Google_Service_AdSense_Resource_AccountsCustomchannels extends Google_Service_Resource
-{
-  /**
-   * Get the specified custom channel from the specified ad client for the
-   * specified account. (customchannels.get)
-   *
-   * @param string $accountId Account to which the ad client belongs.
-   * @param string $adClientId Ad client which contains the custom channel.
-   * @param string $customChannelId Custom channel to retrieve.
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_AdSense_CustomChannel
-   */
-  public function get($accountId, $adClientId, $customChannelId, $optParams = array())
-  {
-    $params = array('accountId' => $accountId, 'adClientId' => $adClientId, 'customChannelId' => $customChannelId);
-    $params = array_merge($params, $optParams);
-    return $this->call('get', array($params), "Google_Service_AdSense_CustomChannel");
-  }
-  /**
-   * List all custom channels in the specified ad client for the specified
-   * account. (customchannels.listAccountsCustomchannels)
-   *
-   * @param string $accountId Account to which the ad client belongs.
-   * @param string $adClientId Ad client for which to list custom channels.
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param int maxResults The maximum number of custom channels to include in
-   * the response, used for paging.
-   * @opt_param string pageToken A continuation token, used to page through custom
-   * channels. To retrieve the next page, set this parameter to the value of
-   * "nextPageToken" from the previous response.
-   * @return Google_Service_AdSense_CustomChannels
-   */
-  public function listAccountsCustomchannels($accountId, $adClientId, $optParams = array())
-  {
-    $params = array('accountId' => $accountId, 'adClientId' => $adClientId);
-    $params = array_merge($params, $optParams);
-    return $this->call('list', array($params), "Google_Service_AdSense_CustomChannels");
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdSense/Resource/AccountsCustomchannelsAdunits.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdSense/Resource/AccountsCustomchannelsAdunits.php
deleted file mode 100644
index 846bee58..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdSense/Resource/AccountsCustomchannelsAdunits.php
+++ /dev/null
@@ -1,52 +0,0 @@
-
- *   $adsenseService = new Google_Service_AdSense(...);
- *   $adunits = $adsenseService->adunits;
- *  
- */
-class Google_Service_AdSense_Resource_AccountsCustomchannelsAdunits extends Google_Service_Resource
-{
-  /**
-   * List all ad units in the specified custom channel.
-   * (adunits.listAccountsCustomchannelsAdunits)
-   *
-   * @param string $accountId Account to which the ad client belongs.
-   * @param string $adClientId Ad client which contains the custom channel.
-   * @param string $customChannelId Custom channel for which to list ad units.
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param bool includeInactive Whether to include inactive ad units.
-   * Default: true.
-   * @opt_param int maxResults The maximum number of ad units to include in the
-   * response, used for paging.
-   * @opt_param string pageToken A continuation token, used to page through ad
-   * units. To retrieve the next page, set this parameter to the value of
-   * "nextPageToken" from the previous response.
-   * @return Google_Service_AdSense_AdUnits
-   */
-  public function listAccountsCustomchannelsAdunits($accountId, $adClientId, $customChannelId, $optParams = array())
-  {
-    $params = array('accountId' => $accountId, 'adClientId' => $adClientId, 'customChannelId' => $customChannelId);
-    $params = array_merge($params, $optParams);
-    return $this->call('list', array($params), "Google_Service_AdSense_AdUnits");
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdSense/Resource/AccountsPayments.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdSense/Resource/AccountsPayments.php
deleted file mode 100644
index 56e18873..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdSense/Resource/AccountsPayments.php
+++ /dev/null
@@ -1,42 +0,0 @@
-
- *   $adsenseService = new Google_Service_AdSense(...);
- *   $payments = $adsenseService->payments;
- *  
- */
-class Google_Service_AdSense_Resource_AccountsPayments extends Google_Service_Resource
-{
-  /**
-   * List the payments for the specified AdSense account.
-   * (payments.listAccountsPayments)
-   *
-   * @param string $accountId Account for which to retrieve the payments.
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_AdSense_Payments
-   */
-  public function listAccountsPayments($accountId, $optParams = array())
-  {
-    $params = array('accountId' => $accountId);
-    $params = array_merge($params, $optParams);
-    return $this->call('list', array($params), "Google_Service_AdSense_Payments");
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdSense/Resource/AccountsReports.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdSense/Resource/AccountsReports.php
deleted file mode 100644
index 22f0709c..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdSense/Resource/AccountsReports.php
+++ /dev/null
@@ -1,64 +0,0 @@
-
- *   $adsenseService = new Google_Service_AdSense(...);
- *   $reports = $adsenseService->reports;
- *  
- */
-class Google_Service_AdSense_Resource_AccountsReports extends Google_Service_Resource
-{
-  /**
-   * Generate an AdSense report based on the report request sent in the query
-   * parameters. Returns the result as JSON; to retrieve output in CSV format
-   * specify "alt=csv" as a query parameter. (reports.generate)
-   *
-   * @param string $accountId Account upon which to report.
-   * @param string $startDate Start of the date range to report on in "YYYY-MM-DD"
-   * format, inclusive.
-   * @param string $endDate End of the date range to report on in "YYYY-MM-DD"
-   * format, inclusive.
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param string currency Optional currency to use when reporting on
-   * monetary metrics. Defaults to the account's currency if not set.
-   * @opt_param string dimension Dimensions to base the report on.
-   * @opt_param string filter Filters to be run on the report.
-   * @opt_param string locale Optional locale to use for translating report output
-   * to a local language. Defaults to "en_US" if not specified.
-   * @opt_param int maxResults The maximum number of rows of report data to
-   * return.
-   * @opt_param string metric Numeric columns to include in the report.
-   * @opt_param string sort The name of a dimension or metric to sort the
-   * resulting report on, optionally prefixed with "+" to sort ascending or "-" to
-   * sort descending. If no prefix is specified, the column is sorted ascending.
-   * @opt_param int startIndex Index of the first row of report data to return.
-   * @opt_param bool useTimezoneReporting Whether the report should be generated
-   * in the AdSense account's local timezone. If false default PST/PDT timezone
-   * will be used.
-   * @return Google_Service_AdSense_AdsenseReportsGenerateResponse
-   */
-  public function generate($accountId, $startDate, $endDate, $optParams = array())
-  {
-    $params = array('accountId' => $accountId, 'startDate' => $startDate, 'endDate' => $endDate);
-    $params = array_merge($params, $optParams);
-    return $this->call('generate', array($params), "Google_Service_AdSense_AdsenseReportsGenerateResponse");
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdSense/Resource/AccountsReportsSaved.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdSense/Resource/AccountsReportsSaved.php
deleted file mode 100644
index 1dca5377..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdSense/Resource/AccountsReportsSaved.php
+++ /dev/null
@@ -1,69 +0,0 @@
-
- *   $adsenseService = new Google_Service_AdSense(...);
- *   $saved = $adsenseService->saved;
- *  
- */
-class Google_Service_AdSense_Resource_AccountsReportsSaved extends Google_Service_Resource
-{
-  /**
-   * Generate an AdSense report based on the saved report ID sent in the query
-   * parameters. (saved.generate)
-   *
-   * @param string $accountId Account to which the saved reports belong.
-   * @param string $savedReportId The saved report to retrieve.
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param string locale Optional locale to use for translating report output
-   * to a local language. Defaults to "en_US" if not specified.
-   * @opt_param int maxResults The maximum number of rows of report data to
-   * return.
-   * @opt_param int startIndex Index of the first row of report data to return.
-   * @return Google_Service_AdSense_AdsenseReportsGenerateResponse
-   */
-  public function generate($accountId, $savedReportId, $optParams = array())
-  {
-    $params = array('accountId' => $accountId, 'savedReportId' => $savedReportId);
-    $params = array_merge($params, $optParams);
-    return $this->call('generate', array($params), "Google_Service_AdSense_AdsenseReportsGenerateResponse");
-  }
-  /**
-   * List all saved reports in the specified AdSense account.
-   * (saved.listAccountsReportsSaved)
-   *
-   * @param string $accountId Account to which the saved reports belong.
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param int maxResults The maximum number of saved reports to include in
-   * the response, used for paging.
-   * @opt_param string pageToken A continuation token, used to page through saved
-   * reports. To retrieve the next page, set this parameter to the value of
-   * "nextPageToken" from the previous response.
-   * @return Google_Service_AdSense_SavedReports
-   */
-  public function listAccountsReportsSaved($accountId, $optParams = array())
-  {
-    $params = array('accountId' => $accountId);
-    $params = array_merge($params, $optParams);
-    return $this->call('list', array($params), "Google_Service_AdSense_SavedReports");
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdSense/Resource/AccountsSavedadstyles.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdSense/Resource/AccountsSavedadstyles.php
deleted file mode 100644
index a33cc2d6..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdSense/Resource/AccountsSavedadstyles.php
+++ /dev/null
@@ -1,62 +0,0 @@
-
- *   $adsenseService = new Google_Service_AdSense(...);
- *   $savedadstyles = $adsenseService->savedadstyles;
- *  
- */
-class Google_Service_AdSense_Resource_AccountsSavedadstyles extends Google_Service_Resource
-{
-  /**
-   * List a specific saved ad style for the specified account. (savedadstyles.get)
-   *
-   * @param string $accountId Account for which to get the saved ad style.
-   * @param string $savedAdStyleId Saved ad style to retrieve.
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_AdSense_SavedAdStyle
-   */
-  public function get($accountId, $savedAdStyleId, $optParams = array())
-  {
-    $params = array('accountId' => $accountId, 'savedAdStyleId' => $savedAdStyleId);
-    $params = array_merge($params, $optParams);
-    return $this->call('get', array($params), "Google_Service_AdSense_SavedAdStyle");
-  }
-  /**
-   * List all saved ad styles in the specified account.
-   * (savedadstyles.listAccountsSavedadstyles)
-   *
-   * @param string $accountId Account for which to list saved ad styles.
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param int maxResults The maximum number of saved ad styles to include in
-   * the response, used for paging.
-   * @opt_param string pageToken A continuation token, used to page through saved
-   * ad styles. To retrieve the next page, set this parameter to the value of
-   * "nextPageToken" from the previous response.
-   * @return Google_Service_AdSense_SavedAdStyles
-   */
-  public function listAccountsSavedadstyles($accountId, $optParams = array())
-  {
-    $params = array('accountId' => $accountId);
-    $params = array_merge($params, $optParams);
-    return $this->call('list', array($params), "Google_Service_AdSense_SavedAdStyles");
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdSense/Resource/AccountsUrlchannels.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdSense/Resource/AccountsUrlchannels.php
deleted file mode 100644
index 82b9cf19..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdSense/Resource/AccountsUrlchannels.php
+++ /dev/null
@@ -1,49 +0,0 @@
-
- *   $adsenseService = new Google_Service_AdSense(...);
- *   $urlchannels = $adsenseService->urlchannels;
- *  
- */
-class Google_Service_AdSense_Resource_AccountsUrlchannels extends Google_Service_Resource
-{
-  /**
-   * List all URL channels in the specified ad client for the specified account.
-   * (urlchannels.listAccountsUrlchannels)
-   *
-   * @param string $accountId Account to which the ad client belongs.
-   * @param string $adClientId Ad client for which to list URL channels.
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param int maxResults The maximum number of URL channels to include in
-   * the response, used for paging.
-   * @opt_param string pageToken A continuation token, used to page through URL
-   * channels. To retrieve the next page, set this parameter to the value of
-   * "nextPageToken" from the previous response.
-   * @return Google_Service_AdSense_UrlChannels
-   */
-  public function listAccountsUrlchannels($accountId, $adClientId, $optParams = array())
-  {
-    $params = array('accountId' => $accountId, 'adClientId' => $adClientId);
-    $params = array_merge($params, $optParams);
-    return $this->call('list', array($params), "Google_Service_AdSense_UrlChannels");
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdSense/Resource/Adclients.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdSense/Resource/Adclients.php
deleted file mode 100644
index 3d22182a..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdSense/Resource/Adclients.php
+++ /dev/null
@@ -1,46 +0,0 @@
-
- *   $adsenseService = new Google_Service_AdSense(...);
- *   $adclients = $adsenseService->adclients;
- *  
- */
-class Google_Service_AdSense_Resource_Adclients extends Google_Service_Resource
-{
-  /**
-   * List all ad clients in this AdSense account. (adclients.listAdclients)
-   *
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param int maxResults The maximum number of ad clients to include in the
-   * response, used for paging.
-   * @opt_param string pageToken A continuation token, used to page through ad
-   * clients. To retrieve the next page, set this parameter to the value of
-   * "nextPageToken" from the previous response.
-   * @return Google_Service_AdSense_AdClients
-   */
-  public function listAdclients($optParams = array())
-  {
-    $params = array();
-    $params = array_merge($params, $optParams);
-    return $this->call('list', array($params), "Google_Service_AdSense_AdClients");
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdSense/Resource/Adunits.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdSense/Resource/Adunits.php
deleted file mode 100644
index 38f7b060..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdSense/Resource/Adunits.php
+++ /dev/null
@@ -1,78 +0,0 @@
-
- *   $adsenseService = new Google_Service_AdSense(...);
- *   $adunits = $adsenseService->adunits;
- *  
- */
-class Google_Service_AdSense_Resource_Adunits extends Google_Service_Resource
-{
-  /**
-   * Gets the specified ad unit in the specified ad client. (adunits.get)
-   *
-   * @param string $adClientId Ad client for which to get the ad unit.
-   * @param string $adUnitId Ad unit to retrieve.
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_AdSense_AdUnit
-   */
-  public function get($adClientId, $adUnitId, $optParams = array())
-  {
-    $params = array('adClientId' => $adClientId, 'adUnitId' => $adUnitId);
-    $params = array_merge($params, $optParams);
-    return $this->call('get', array($params), "Google_Service_AdSense_AdUnit");
-  }
-  /**
-   * Get ad code for the specified ad unit. (adunits.getAdCode)
-   *
-   * @param string $adClientId Ad client with contains the ad unit.
-   * @param string $adUnitId Ad unit to get the code for.
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_AdSense_AdCode
-   */
-  public function getAdCode($adClientId, $adUnitId, $optParams = array())
-  {
-    $params = array('adClientId' => $adClientId, 'adUnitId' => $adUnitId);
-    $params = array_merge($params, $optParams);
-    return $this->call('getAdCode', array($params), "Google_Service_AdSense_AdCode");
-  }
-  /**
-   * List all ad units in the specified ad client for this AdSense account.
-   * (adunits.listAdunits)
-   *
-   * @param string $adClientId Ad client for which to list ad units.
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param bool includeInactive Whether to include inactive ad units.
-   * Default: true.
-   * @opt_param int maxResults The maximum number of ad units to include in the
-   * response, used for paging.
-   * @opt_param string pageToken A continuation token, used to page through ad
-   * units. To retrieve the next page, set this parameter to the value of
-   * "nextPageToken" from the previous response.
-   * @return Google_Service_AdSense_AdUnits
-   */
-  public function listAdunits($adClientId, $optParams = array())
-  {
-    $params = array('adClientId' => $adClientId);
-    $params = array_merge($params, $optParams);
-    return $this->call('list', array($params), "Google_Service_AdSense_AdUnits");
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdSense/Resource/AdunitsCustomchannels.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdSense/Resource/AdunitsCustomchannels.php
deleted file mode 100644
index 8c32cfe0..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdSense/Resource/AdunitsCustomchannels.php
+++ /dev/null
@@ -1,49 +0,0 @@
-
- *   $adsenseService = new Google_Service_AdSense(...);
- *   $customchannels = $adsenseService->customchannels;
- *  
- */
-class Google_Service_AdSense_Resource_AdunitsCustomchannels extends Google_Service_Resource
-{
-  /**
-   * List all custom channels which the specified ad unit belongs to.
-   * (customchannels.listAdunitsCustomchannels)
-   *
-   * @param string $adClientId Ad client which contains the ad unit.
-   * @param string $adUnitId Ad unit for which to list custom channels.
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param int maxResults The maximum number of custom channels to include in
-   * the response, used for paging.
-   * @opt_param string pageToken A continuation token, used to page through custom
-   * channels. To retrieve the next page, set this parameter to the value of
-   * "nextPageToken" from the previous response.
-   * @return Google_Service_AdSense_CustomChannels
-   */
-  public function listAdunitsCustomchannels($adClientId, $adUnitId, $optParams = array())
-  {
-    $params = array('adClientId' => $adClientId, 'adUnitId' => $adUnitId);
-    $params = array_merge($params, $optParams);
-    return $this->call('list', array($params), "Google_Service_AdSense_CustomChannels");
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdSense/Resource/Alerts.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdSense/Resource/Alerts.php
deleted file mode 100644
index 5c2c5934..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdSense/Resource/Alerts.php
+++ /dev/null
@@ -1,57 +0,0 @@
-
- *   $adsenseService = new Google_Service_AdSense(...);
- *   $alerts = $adsenseService->alerts;
- *  
- */
-class Google_Service_AdSense_Resource_Alerts extends Google_Service_Resource
-{
-  /**
-   * Dismiss (delete) the specified alert from the publisher's AdSense account.
-   * (alerts.delete)
-   *
-   * @param string $alertId Alert to delete.
-   * @param array $optParams Optional parameters.
-   */
-  public function delete($alertId, $optParams = array())
-  {
-    $params = array('alertId' => $alertId);
-    $params = array_merge($params, $optParams);
-    return $this->call('delete', array($params));
-  }
-  /**
-   * List the alerts for this AdSense account. (alerts.listAlerts)
-   *
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param string locale The locale to use for translating alert messages.
-   * The account locale will be used if this is not supplied. The AdSense default
-   * (English) will be used if the supplied locale is invalid or unsupported.
-   * @return Google_Service_AdSense_Alerts
-   */
-  public function listAlerts($optParams = array())
-  {
-    $params = array();
-    $params = array_merge($params, $optParams);
-    return $this->call('list', array($params), "Google_Service_AdSense_Alerts");
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdSense/Resource/Customchannels.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdSense/Resource/Customchannels.php
deleted file mode 100644
index 0c0cda9a..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdSense/Resource/Customchannels.php
+++ /dev/null
@@ -1,63 +0,0 @@
-
- *   $adsenseService = new Google_Service_AdSense(...);
- *   $customchannels = $adsenseService->customchannels;
- *  
- */
-class Google_Service_AdSense_Resource_Customchannels extends Google_Service_Resource
-{
-  /**
-   * Get the specified custom channel from the specified ad client.
-   * (customchannels.get)
-   *
-   * @param string $adClientId Ad client which contains the custom channel.
-   * @param string $customChannelId Custom channel to retrieve.
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_AdSense_CustomChannel
-   */
-  public function get($adClientId, $customChannelId, $optParams = array())
-  {
-    $params = array('adClientId' => $adClientId, 'customChannelId' => $customChannelId);
-    $params = array_merge($params, $optParams);
-    return $this->call('get', array($params), "Google_Service_AdSense_CustomChannel");
-  }
-  /**
-   * List all custom channels in the specified ad client for this AdSense account.
-   * (customchannels.listCustomchannels)
-   *
-   * @param string $adClientId Ad client for which to list custom channels.
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param int maxResults The maximum number of custom channels to include in
-   * the response, used for paging.
-   * @opt_param string pageToken A continuation token, used to page through custom
-   * channels. To retrieve the next page, set this parameter to the value of
-   * "nextPageToken" from the previous response.
-   * @return Google_Service_AdSense_CustomChannels
-   */
-  public function listCustomchannels($adClientId, $optParams = array())
-  {
-    $params = array('adClientId' => $adClientId);
-    $params = array_merge($params, $optParams);
-    return $this->call('list', array($params), "Google_Service_AdSense_CustomChannels");
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdSense/Resource/CustomchannelsAdunits.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdSense/Resource/CustomchannelsAdunits.php
deleted file mode 100644
index 0fe22624..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdSense/Resource/CustomchannelsAdunits.php
+++ /dev/null
@@ -1,51 +0,0 @@
-
- *   $adsenseService = new Google_Service_AdSense(...);
- *   $adunits = $adsenseService->adunits;
- *  
- */
-class Google_Service_AdSense_Resource_CustomchannelsAdunits extends Google_Service_Resource
-{
-  /**
-   * List all ad units in the specified custom channel.
-   * (adunits.listCustomchannelsAdunits)
-   *
-   * @param string $adClientId Ad client which contains the custom channel.
-   * @param string $customChannelId Custom channel for which to list ad units.
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param bool includeInactive Whether to include inactive ad units.
-   * Default: true.
-   * @opt_param int maxResults The maximum number of ad units to include in the
-   * response, used for paging.
-   * @opt_param string pageToken A continuation token, used to page through ad
-   * units. To retrieve the next page, set this parameter to the value of
-   * "nextPageToken" from the previous response.
-   * @return Google_Service_AdSense_AdUnits
-   */
-  public function listCustomchannelsAdunits($adClientId, $customChannelId, $optParams = array())
-  {
-    $params = array('adClientId' => $adClientId, 'customChannelId' => $customChannelId);
-    $params = array_merge($params, $optParams);
-    return $this->call('list', array($params), "Google_Service_AdSense_AdUnits");
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdSense/Resource/Metadata.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdSense/Resource/Metadata.php
deleted file mode 100644
index 9bbfef60..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdSense/Resource/Metadata.php
+++ /dev/null
@@ -1,28 +0,0 @@
-
- *   $adsenseService = new Google_Service_AdSense(...);
- *   $metadata = $adsenseService->metadata;
- *  
- */
-class Google_Service_AdSense_Resource_Metadata extends Google_Service_Resource
-{
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdSense/Resource/MetadataDimensions.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdSense/Resource/MetadataDimensions.php
deleted file mode 100644
index 1e72c608..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdSense/Resource/MetadataDimensions.php
+++ /dev/null
@@ -1,41 +0,0 @@
-
- *   $adsenseService = new Google_Service_AdSense(...);
- *   $dimensions = $adsenseService->dimensions;
- *  
- */
-class Google_Service_AdSense_Resource_MetadataDimensions extends Google_Service_Resource
-{
-  /**
-   * List the metadata for the dimensions available to this AdSense account.
-   * (dimensions.listMetadataDimensions)
-   *
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_AdSense_Metadata
-   */
-  public function listMetadataDimensions($optParams = array())
-  {
-    $params = array();
-    $params = array_merge($params, $optParams);
-    return $this->call('list', array($params), "Google_Service_AdSense_Metadata");
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdSense/Resource/MetadataMetrics.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdSense/Resource/MetadataMetrics.php
deleted file mode 100644
index c8cc4205..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdSense/Resource/MetadataMetrics.php
+++ /dev/null
@@ -1,41 +0,0 @@
-
- *   $adsenseService = new Google_Service_AdSense(...);
- *   $metrics = $adsenseService->metrics;
- *  
- */
-class Google_Service_AdSense_Resource_MetadataMetrics extends Google_Service_Resource
-{
-  /**
-   * List the metadata for the metrics available to this AdSense account.
-   * (metrics.listMetadataMetrics)
-   *
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_AdSense_Metadata
-   */
-  public function listMetadataMetrics($optParams = array())
-  {
-    $params = array();
-    $params = array_merge($params, $optParams);
-    return $this->call('list', array($params), "Google_Service_AdSense_Metadata");
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdSense/Resource/Payments.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdSense/Resource/Payments.php
deleted file mode 100644
index 0818c239..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdSense/Resource/Payments.php
+++ /dev/null
@@ -1,40 +0,0 @@
-
- *   $adsenseService = new Google_Service_AdSense(...);
- *   $payments = $adsenseService->payments;
- *  
- */
-class Google_Service_AdSense_Resource_Payments extends Google_Service_Resource
-{
-  /**
-   * List the payments for this AdSense account. (payments.listPayments)
-   *
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_AdSense_Payments
-   */
-  public function listPayments($optParams = array())
-  {
-    $params = array();
-    $params = array_merge($params, $optParams);
-    return $this->call('list', array($params), "Google_Service_AdSense_Payments");
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdSense/Resource/Reports.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdSense/Resource/Reports.php
deleted file mode 100644
index 499d980a..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdSense/Resource/Reports.php
+++ /dev/null
@@ -1,64 +0,0 @@
-
- *   $adsenseService = new Google_Service_AdSense(...);
- *   $reports = $adsenseService->reports;
- *  
- */
-class Google_Service_AdSense_Resource_Reports extends Google_Service_Resource
-{
-  /**
-   * Generate an AdSense report based on the report request sent in the query
-   * parameters. Returns the result as JSON; to retrieve output in CSV format
-   * specify "alt=csv" as a query parameter. (reports.generate)
-   *
-   * @param string $startDate Start of the date range to report on in "YYYY-MM-DD"
-   * format, inclusive.
-   * @param string $endDate End of the date range to report on in "YYYY-MM-DD"
-   * format, inclusive.
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param string accountId Accounts upon which to report.
-   * @opt_param string currency Optional currency to use when reporting on
-   * monetary metrics. Defaults to the account's currency if not set.
-   * @opt_param string dimension Dimensions to base the report on.
-   * @opt_param string filter Filters to be run on the report.
-   * @opt_param string locale Optional locale to use for translating report output
-   * to a local language. Defaults to "en_US" if not specified.
-   * @opt_param int maxResults The maximum number of rows of report data to
-   * return.
-   * @opt_param string metric Numeric columns to include in the report.
-   * @opt_param string sort The name of a dimension or metric to sort the
-   * resulting report on, optionally prefixed with "+" to sort ascending or "-" to
-   * sort descending. If no prefix is specified, the column is sorted ascending.
-   * @opt_param int startIndex Index of the first row of report data to return.
-   * @opt_param bool useTimezoneReporting Whether the report should be generated
-   * in the AdSense account's local timezone. If false default PST/PDT timezone
-   * will be used.
-   * @return Google_Service_AdSense_AdsenseReportsGenerateResponse
-   */
-  public function generate($startDate, $endDate, $optParams = array())
-  {
-    $params = array('startDate' => $startDate, 'endDate' => $endDate);
-    $params = array_merge($params, $optParams);
-    return $this->call('generate', array($params), "Google_Service_AdSense_AdsenseReportsGenerateResponse");
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdSense/Resource/ReportsSaved.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdSense/Resource/ReportsSaved.php
deleted file mode 100644
index e65cfda0..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdSense/Resource/ReportsSaved.php
+++ /dev/null
@@ -1,66 +0,0 @@
-
- *   $adsenseService = new Google_Service_AdSense(...);
- *   $saved = $adsenseService->saved;
- *  
- */
-class Google_Service_AdSense_Resource_ReportsSaved extends Google_Service_Resource
-{
-  /**
-   * Generate an AdSense report based on the saved report ID sent in the query
-   * parameters. (saved.generate)
-   *
-   * @param string $savedReportId The saved report to retrieve.
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param string locale Optional locale to use for translating report output
-   * to a local language. Defaults to "en_US" if not specified.
-   * @opt_param int maxResults The maximum number of rows of report data to
-   * return.
-   * @opt_param int startIndex Index of the first row of report data to return.
-   * @return Google_Service_AdSense_AdsenseReportsGenerateResponse
-   */
-  public function generate($savedReportId, $optParams = array())
-  {
-    $params = array('savedReportId' => $savedReportId);
-    $params = array_merge($params, $optParams);
-    return $this->call('generate', array($params), "Google_Service_AdSense_AdsenseReportsGenerateResponse");
-  }
-  /**
-   * List all saved reports in this AdSense account. (saved.listReportsSaved)
-   *
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param int maxResults The maximum number of saved reports to include in
-   * the response, used for paging.
-   * @opt_param string pageToken A continuation token, used to page through saved
-   * reports. To retrieve the next page, set this parameter to the value of
-   * "nextPageToken" from the previous response.
-   * @return Google_Service_AdSense_SavedReports
-   */
-  public function listReportsSaved($optParams = array())
-  {
-    $params = array();
-    $params = array_merge($params, $optParams);
-    return $this->call('list', array($params), "Google_Service_AdSense_SavedReports");
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdSense/Resource/Savedadstyles.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdSense/Resource/Savedadstyles.php
deleted file mode 100644
index 3a89624c..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdSense/Resource/Savedadstyles.php
+++ /dev/null
@@ -1,60 +0,0 @@
-
- *   $adsenseService = new Google_Service_AdSense(...);
- *   $savedadstyles = $adsenseService->savedadstyles;
- *  
- */
-class Google_Service_AdSense_Resource_Savedadstyles extends Google_Service_Resource
-{
-  /**
-   * Get a specific saved ad style from the user's account. (savedadstyles.get)
-   *
-   * @param string $savedAdStyleId Saved ad style to retrieve.
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_AdSense_SavedAdStyle
-   */
-  public function get($savedAdStyleId, $optParams = array())
-  {
-    $params = array('savedAdStyleId' => $savedAdStyleId);
-    $params = array_merge($params, $optParams);
-    return $this->call('get', array($params), "Google_Service_AdSense_SavedAdStyle");
-  }
-  /**
-   * List all saved ad styles in the user's account.
-   * (savedadstyles.listSavedadstyles)
-   *
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param int maxResults The maximum number of saved ad styles to include in
-   * the response, used for paging.
-   * @opt_param string pageToken A continuation token, used to page through saved
-   * ad styles. To retrieve the next page, set this parameter to the value of
-   * "nextPageToken" from the previous response.
-   * @return Google_Service_AdSense_SavedAdStyles
-   */
-  public function listSavedadstyles($optParams = array())
-  {
-    $params = array();
-    $params = array_merge($params, $optParams);
-    return $this->call('list', array($params), "Google_Service_AdSense_SavedAdStyles");
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdSense/Resource/Urlchannels.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdSense/Resource/Urlchannels.php
deleted file mode 100644
index b937f2c8..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdSense/Resource/Urlchannels.php
+++ /dev/null
@@ -1,48 +0,0 @@
-
- *   $adsenseService = new Google_Service_AdSense(...);
- *   $urlchannels = $adsenseService->urlchannels;
- *  
- */
-class Google_Service_AdSense_Resource_Urlchannels extends Google_Service_Resource
-{
-  /**
-   * List all URL channels in the specified ad client for this AdSense account.
-   * (urlchannels.listUrlchannels)
-   *
-   * @param string $adClientId Ad client for which to list URL channels.
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param int maxResults The maximum number of URL channels to include in
-   * the response, used for paging.
-   * @opt_param string pageToken A continuation token, used to page through URL
-   * channels. To retrieve the next page, set this parameter to the value of
-   * "nextPageToken" from the previous response.
-   * @return Google_Service_AdSense_UrlChannels
-   */
-  public function listUrlchannels($adClientId, $optParams = array())
-  {
-    $params = array('adClientId' => $adClientId);
-    $params = array_merge($params, $optParams);
-    return $this->call('list', array($params), "Google_Service_AdSense_UrlChannels");
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdSense/SavedAdStyle.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdSense/SavedAdStyle.php
deleted file mode 100644
index f568bd1f..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdSense/SavedAdStyle.php
+++ /dev/null
@@ -1,58 +0,0 @@
-adStyle = $adStyle;
-  }
-  public function getAdStyle()
-  {
-    return $this->adStyle;
-  }
-  public function setId($id)
-  {
-    $this->id = $id;
-  }
-  public function getId()
-  {
-    return $this->id;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setName($name)
-  {
-    $this->name = $name;
-  }
-  public function getName()
-  {
-    return $this->name;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdSense/SavedAdStyles.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdSense/SavedAdStyles.php
deleted file mode 100644
index 478945cf..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdSense/SavedAdStyles.php
+++ /dev/null
@@ -1,59 +0,0 @@
-etag = $etag;
-  }
-  public function getEtag()
-  {
-    return $this->etag;
-  }
-  public function setItems($items)
-  {
-    $this->items = $items;
-  }
-  public function getItems()
-  {
-    return $this->items;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setNextPageToken($nextPageToken)
-  {
-    $this->nextPageToken = $nextPageToken;
-  }
-  public function getNextPageToken()
-  {
-    return $this->nextPageToken;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdSense/SavedReport.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdSense/SavedReport.php
deleted file mode 100644
index 8baebb35..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdSense/SavedReport.php
+++ /dev/null
@@ -1,48 +0,0 @@
-id = $id;
-  }
-  public function getId()
-  {
-    return $this->id;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setName($name)
-  {
-    $this->name = $name;
-  }
-  public function getName()
-  {
-    return $this->name;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdSense/SavedReports.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdSense/SavedReports.php
deleted file mode 100644
index 2d85c0be..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdSense/SavedReports.php
+++ /dev/null
@@ -1,59 +0,0 @@
-etag = $etag;
-  }
-  public function getEtag()
-  {
-    return $this->etag;
-  }
-  public function setItems($items)
-  {
-    $this->items = $items;
-  }
-  public function getItems()
-  {
-    return $this->items;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setNextPageToken($nextPageToken)
-  {
-    $this->nextPageToken = $nextPageToken;
-  }
-  public function getNextPageToken()
-  {
-    return $this->nextPageToken;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdSense/UrlChannel.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdSense/UrlChannel.php
deleted file mode 100644
index a372506f..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdSense/UrlChannel.php
+++ /dev/null
@@ -1,48 +0,0 @@
-id = $id;
-  }
-  public function getId()
-  {
-    return $this->id;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setUrlPattern($urlPattern)
-  {
-    $this->urlPattern = $urlPattern;
-  }
-  public function getUrlPattern()
-  {
-    return $this->urlPattern;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdSense/UrlChannels.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdSense/UrlChannels.php
deleted file mode 100644
index d5a3a6de..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdSense/UrlChannels.php
+++ /dev/null
@@ -1,59 +0,0 @@
-etag = $etag;
-  }
-  public function getEtag()
-  {
-    return $this->etag;
-  }
-  public function setItems($items)
-  {
-    $this->items = $items;
-  }
-  public function getItems()
-  {
-    return $this->items;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setNextPageToken($nextPageToken)
-  {
-    $this->nextPageToken = $nextPageToken;
-  }
-  public function getNextPageToken()
-  {
-    return $this->nextPageToken;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdSenseHost.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdSenseHost.php
deleted file mode 100644
index 166525a7..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdSenseHost.php
+++ /dev/null
@@ -1,630 +0,0 @@
-
- * Generates performance reports, generates ad codes, and provides publisher
- * management capabilities for AdSense Hosts.

- *
- * 

- * For more information about this service, see the API
- * Documentation
- * 

- *
- * @author Google, Inc.
- */
-class Google_Service_AdSenseHost extends Google_Service
-{
-  /** View and manage your AdSense host data and associated accounts. */
-  const ADSENSEHOST =
-      "https://www.googleapis.com/auth/adsensehost";
-
-  public $accounts;
-  public $accounts_adclients;
-  public $accounts_adunits;
-  public $accounts_reports;
-  public $adclients;
-  public $associationsessions;
-  public $customchannels;
-  public $reports;
-  public $urlchannels;
-  
-  /**
-   * Constructs the internal representation of the AdSenseHost service.
-   *
-   * @param Google_Client $client
-   */
-  public function __construct(Google_Client $client)
-  {
-    parent::__construct($client);
-    $this->rootUrl = 'https://www.googleapis.com/';
-    $this->servicePath = 'adsensehost/v4.1/';
-    $this->version = 'v4.1';
-    $this->serviceName = 'adsensehost';
-
-    $this->accounts = new Google_Service_AdSenseHost_Resource_Accounts(
-        $this,
-        $this->serviceName,
-        'accounts',
-        array(
-          'methods' => array(
-            'get' => array(
-              'path' => 'accounts/{accountId}',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'accountId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'list' => array(
-              'path' => 'accounts',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'filterAdClientId' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                  'repeated' => true,
-                  'required' => true,
-                ),
-              ),
-            ),
-          )
-        )
-    );
-    $this->accounts_adclients = new Google_Service_AdSenseHost_Resource_AccountsAdclients(
-        $this,
-        $this->serviceName,
-        'adclients',
-        array(
-          'methods' => array(
-            'get' => array(
-              'path' => 'accounts/{accountId}/adclients/{adClientId}',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'accountId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'adClientId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'list' => array(
-              'path' => 'accounts/{accountId}/adclients',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'accountId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'maxResults' => array(
-                  'location' => 'query',
-                  'type' => 'integer',
-                ),
-                'pageToken' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-              ),
-            ),
-          )
-        )
-    );
-    $this->accounts_adunits = new Google_Service_AdSenseHost_Resource_AccountsAdunits(
-        $this,
-        $this->serviceName,
-        'adunits',
-        array(
-          'methods' => array(
-            'delete' => array(
-              'path' => 'accounts/{accountId}/adclients/{adClientId}/adunits/{adUnitId}',
-              'httpMethod' => 'DELETE',
-              'parameters' => array(
-                'accountId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'adClientId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'adUnitId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'get' => array(
-              'path' => 'accounts/{accountId}/adclients/{adClientId}/adunits/{adUnitId}',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'accountId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'adClientId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'adUnitId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'getAdCode' => array(
-              'path' => 'accounts/{accountId}/adclients/{adClientId}/adunits/{adUnitId}/adcode',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'accountId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'adClientId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'adUnitId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'hostCustomChannelId' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                  'repeated' => true,
-                ),
-              ),
-            ),'insert' => array(
-              'path' => 'accounts/{accountId}/adclients/{adClientId}/adunits',
-              'httpMethod' => 'POST',
-              'parameters' => array(
-                'accountId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'adClientId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'list' => array(
-              'path' => 'accounts/{accountId}/adclients/{adClientId}/adunits',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'accountId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'adClientId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'includeInactive' => array(
-                  'location' => 'query',
-                  'type' => 'boolean',
-                ),
-                'maxResults' => array(
-                  'location' => 'query',
-                  'type' => 'integer',
-                ),
-                'pageToken' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-              ),
-            ),'patch' => array(
-              'path' => 'accounts/{accountId}/adclients/{adClientId}/adunits',
-              'httpMethod' => 'PATCH',
-              'parameters' => array(
-                'accountId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'adClientId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'adUnitId' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'update' => array(
-              'path' => 'accounts/{accountId}/adclients/{adClientId}/adunits',
-              'httpMethod' => 'PUT',
-              'parameters' => array(
-                'accountId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'adClientId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),
-          )
-        )
-    );
-    $this->accounts_reports = new Google_Service_AdSenseHost_Resource_AccountsReports(
-        $this,
-        $this->serviceName,
-        'reports',
-        array(
-          'methods' => array(
-            'generate' => array(
-              'path' => 'accounts/{accountId}/reports',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'accountId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'startDate' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'endDate' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'dimension' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                  'repeated' => true,
-                ),
-                'filter' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                  'repeated' => true,
-                ),
-                'locale' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'maxResults' => array(
-                  'location' => 'query',
-                  'type' => 'integer',
-                ),
-                'metric' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                  'repeated' => true,
-                ),
-                'sort' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                  'repeated' => true,
-                ),
-                'startIndex' => array(
-                  'location' => 'query',
-                  'type' => 'integer',
-                ),
-              ),
-            ),
-          )
-        )
-    );
-    $this->adclients = new Google_Service_AdSenseHost_Resource_Adclients(
-        $this,
-        $this->serviceName,
-        'adclients',
-        array(
-          'methods' => array(
-            'get' => array(
-              'path' => 'adclients/{adClientId}',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'adClientId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'list' => array(
-              'path' => 'adclients',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'maxResults' => array(
-                  'location' => 'query',
-                  'type' => 'integer',
-                ),
-                'pageToken' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-              ),
-            ),
-          )
-        )
-    );
-    $this->associationsessions = new Google_Service_AdSenseHost_Resource_Associationsessions(
-        $this,
-        $this->serviceName,
-        'associationsessions',
-        array(
-          'methods' => array(
-            'start' => array(
-              'path' => 'associationsessions/start',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'productCode' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                  'repeated' => true,
-                  'required' => true,
-                ),
-                'websiteUrl' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'userLocale' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'websiteLocale' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-              ),
-            ),'verify' => array(
-              'path' => 'associationsessions/verify',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'token' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),
-          )
-        )
-    );
-    $this->customchannels = new Google_Service_AdSenseHost_Resource_Customchannels(
-        $this,
-        $this->serviceName,
-        'customchannels',
-        array(
-          'methods' => array(
-            'delete' => array(
-              'path' => 'adclients/{adClientId}/customchannels/{customChannelId}',
-              'httpMethod' => 'DELETE',
-              'parameters' => array(
-                'adClientId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'customChannelId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'get' => array(
-              'path' => 'adclients/{adClientId}/customchannels/{customChannelId}',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'adClientId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'customChannelId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'insert' => array(
-              'path' => 'adclients/{adClientId}/customchannels',
-              'httpMethod' => 'POST',
-              'parameters' => array(
-                'adClientId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'list' => array(
-              'path' => 'adclients/{adClientId}/customchannels',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'adClientId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'maxResults' => array(
-                  'location' => 'query',
-                  'type' => 'integer',
-                ),
-                'pageToken' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-              ),
-            ),'patch' => array(
-              'path' => 'adclients/{adClientId}/customchannels',
-              'httpMethod' => 'PATCH',
-              'parameters' => array(
-                'adClientId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'customChannelId' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'update' => array(
-              'path' => 'adclients/{adClientId}/customchannels',
-              'httpMethod' => 'PUT',
-              'parameters' => array(
-                'adClientId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),
-          )
-        )
-    );
-    $this->reports = new Google_Service_AdSenseHost_Resource_Reports(
-        $this,
-        $this->serviceName,
-        'reports',
-        array(
-          'methods' => array(
-            'generate' => array(
-              'path' => 'reports',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'startDate' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'endDate' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'dimension' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                  'repeated' => true,
-                ),
-                'filter' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                  'repeated' => true,
-                ),
-                'locale' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'maxResults' => array(
-                  'location' => 'query',
-                  'type' => 'integer',
-                ),
-                'metric' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                  'repeated' => true,
-                ),
-                'sort' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                  'repeated' => true,
-                ),
-                'startIndex' => array(
-                  'location' => 'query',
-                  'type' => 'integer',
-                ),
-              ),
-            ),
-          )
-        )
-    );
-    $this->urlchannels = new Google_Service_AdSenseHost_Resource_Urlchannels(
-        $this,
-        $this->serviceName,
-        'urlchannels',
-        array(
-          'methods' => array(
-            'delete' => array(
-              'path' => 'adclients/{adClientId}/urlchannels/{urlChannelId}',
-              'httpMethod' => 'DELETE',
-              'parameters' => array(
-                'adClientId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'urlChannelId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'insert' => array(
-              'path' => 'adclients/{adClientId}/urlchannels',
-              'httpMethod' => 'POST',
-              'parameters' => array(
-                'adClientId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'list' => array(
-              'path' => 'adclients/{adClientId}/urlchannels',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'adClientId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'maxResults' => array(
-                  'location' => 'query',
-                  'type' => 'integer',
-                ),
-                'pageToken' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-              ),
-            ),
-          )
-        )
-    );
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdSenseHost/Account.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdSenseHost/Account.php
deleted file mode 100644
index 1c35144e..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdSenseHost/Account.php
+++ /dev/null
@@ -1,57 +0,0 @@
-id = $id;
-  }
-  public function getId()
-  {
-    return $this->id;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setName($name)
-  {
-    $this->name = $name;
-  }
-  public function getName()
-  {
-    return $this->name;
-  }
-  public function setStatus($status)
-  {
-    $this->status = $status;
-  }
-  public function getStatus()
-  {
-    return $this->status;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdSenseHost/Accounts.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdSenseHost/Accounts.php
deleted file mode 100644
index 371aef17..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdSenseHost/Accounts.php
+++ /dev/null
@@ -1,50 +0,0 @@
-etag = $etag;
-  }
-  public function getEtag()
-  {
-    return $this->etag;
-  }
-  public function setItems($items)
-  {
-    $this->items = $items;
-  }
-  public function getItems()
-  {
-    return $this->items;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdSenseHost/AdClient.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdSenseHost/AdClient.php
deleted file mode 100644
index c8a1d5d9..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdSenseHost/AdClient.php
+++ /dev/null
@@ -1,66 +0,0 @@
-arcOptIn = $arcOptIn;
-  }
-  public function getArcOptIn()
-  {
-    return $this->arcOptIn;
-  }
-  public function setId($id)
-  {
-    $this->id = $id;
-  }
-  public function getId()
-  {
-    return $this->id;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setProductCode($productCode)
-  {
-    $this->productCode = $productCode;
-  }
-  public function getProductCode()
-  {
-    return $this->productCode;
-  }
-  public function setSupportsReporting($supportsReporting)
-  {
-    $this->supportsReporting = $supportsReporting;
-  }
-  public function getSupportsReporting()
-  {
-    return $this->supportsReporting;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdSenseHost/AdClients.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdSenseHost/AdClients.php
deleted file mode 100644
index 6a80b166..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdSenseHost/AdClients.php
+++ /dev/null
@@ -1,59 +0,0 @@
-etag = $etag;
-  }
-  public function getEtag()
-  {
-    return $this->etag;
-  }
-  public function setItems($items)
-  {
-    $this->items = $items;
-  }
-  public function getItems()
-  {
-    return $this->items;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setNextPageToken($nextPageToken)
-  {
-    $this->nextPageToken = $nextPageToken;
-  }
-  public function getNextPageToken()
-  {
-    return $this->nextPageToken;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdSenseHost/AdCode.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdSenseHost/AdCode.php
deleted file mode 100644
index 939dcb1d..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdSenseHost/AdCode.php
+++ /dev/null
@@ -1,39 +0,0 @@
-adCode = $adCode;
-  }
-  public function getAdCode()
-  {
-    return $this->adCode;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdSenseHost/AdStyle.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdSenseHost/AdStyle.php
deleted file mode 100644
index f5bddbaf..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdSenseHost/AdStyle.php
+++ /dev/null
@@ -1,59 +0,0 @@
-colors = $colors;
-  }
-  public function getColors()
-  {
-    return $this->colors;
-  }
-  public function setCorners($corners)
-  {
-    $this->corners = $corners;
-  }
-  public function getCorners()
-  {
-    return $this->corners;
-  }
-  public function setFont(Google_Service_AdSenseHost_AdStyleFont $font)
-  {
-    $this->font = $font;
-  }
-  public function getFont()
-  {
-    return $this->font;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdSenseHost/AdStyleColors.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdSenseHost/AdStyleColors.php
deleted file mode 100644
index dbe20cfb..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdSenseHost/AdStyleColors.php
+++ /dev/null
@@ -1,66 +0,0 @@
-background = $background;
-  }
-  public function getBackground()
-  {
-    return $this->background;
-  }
-  public function setBorder($border)
-  {
-    $this->border = $border;
-  }
-  public function getBorder()
-  {
-    return $this->border;
-  }
-  public function setText($text)
-  {
-    $this->text = $text;
-  }
-  public function getText()
-  {
-    return $this->text;
-  }
-  public function setTitle($title)
-  {
-    $this->title = $title;
-  }
-  public function getTitle()
-  {
-    return $this->title;
-  }
-  public function setUrl($url)
-  {
-    $this->url = $url;
-  }
-  public function getUrl()
-  {
-    return $this->url;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdSenseHost/AdStyleFont.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdSenseHost/AdStyleFont.php
deleted file mode 100644
index 0d935b8f..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdSenseHost/AdStyleFont.php
+++ /dev/null
@@ -1,39 +0,0 @@
-family = $family;
-  }
-  public function getFamily()
-  {
-    return $this->family;
-  }
-  public function setSize($size)
-  {
-    $this->size = $size;
-  }
-  public function getSize()
-  {
-    return $this->size;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdSenseHost/AdUnit.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdSenseHost/AdUnit.php
deleted file mode 100644
index fee1e201..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdSenseHost/AdUnit.php
+++ /dev/null
@@ -1,96 +0,0 @@
-code = $code;
-  }
-  public function getCode()
-  {
-    return $this->code;
-  }
-  public function setContentAdsSettings(Google_Service_AdSenseHost_AdUnitContentAdsSettings $contentAdsSettings)
-  {
-    $this->contentAdsSettings = $contentAdsSettings;
-  }
-  public function getContentAdsSettings()
-  {
-    return $this->contentAdsSettings;
-  }
-  public function setCustomStyle(Google_Service_AdSenseHost_AdStyle $customStyle)
-  {
-    $this->customStyle = $customStyle;
-  }
-  public function getCustomStyle()
-  {
-    return $this->customStyle;
-  }
-  public function setId($id)
-  {
-    $this->id = $id;
-  }
-  public function getId()
-  {
-    return $this->id;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setMobileContentAdsSettings(Google_Service_AdSenseHost_AdUnitMobileContentAdsSettings $mobileContentAdsSettings)
-  {
-    $this->mobileContentAdsSettings = $mobileContentAdsSettings;
-  }
-  public function getMobileContentAdsSettings()
-  {
-    return $this->mobileContentAdsSettings;
-  }
-  public function setName($name)
-  {
-    $this->name = $name;
-  }
-  public function getName()
-  {
-    return $this->name;
-  }
-  public function setStatus($status)
-  {
-    $this->status = $status;
-  }
-  public function getStatus()
-  {
-    return $this->status;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdSenseHost/AdUnitContentAdsSettings.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdSenseHost/AdUnitContentAdsSettings.php
deleted file mode 100644
index 4bd5d533..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdSenseHost/AdUnitContentAdsSettings.php
+++ /dev/null
@@ -1,49 +0,0 @@
-backupOption = $backupOption;
-  }
-  public function getBackupOption()
-  {
-    return $this->backupOption;
-  }
-  public function setSize($size)
-  {
-    $this->size = $size;
-  }
-  public function getSize()
-  {
-    return $this->size;
-  }
-  public function setType($type)
-  {
-    $this->type = $type;
-  }
-  public function getType()
-  {
-    return $this->type;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdSenseHost/AdUnitContentAdsSettingsBackupOption.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdSenseHost/AdUnitContentAdsSettingsBackupOption.php
deleted file mode 100644
index c4ca660c..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdSenseHost/AdUnitContentAdsSettingsBackupOption.php
+++ /dev/null
@@ -1,48 +0,0 @@
-color = $color;
-  }
-  public function getColor()
-  {
-    return $this->color;
-  }
-  public function setType($type)
-  {
-    $this->type = $type;
-  }
-  public function getType()
-  {
-    return $this->type;
-  }
-  public function setUrl($url)
-  {
-    $this->url = $url;
-  }
-  public function getUrl()
-  {
-    return $this->url;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdSenseHost/AdUnitMobileContentAdsSettings.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdSenseHost/AdUnitMobileContentAdsSettings.php
deleted file mode 100644
index c50cdad2..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdSenseHost/AdUnitMobileContentAdsSettings.php
+++ /dev/null
@@ -1,57 +0,0 @@
-markupLanguage = $markupLanguage;
-  }
-  public function getMarkupLanguage()
-  {
-    return $this->markupLanguage;
-  }
-  public function setScriptingLanguage($scriptingLanguage)
-  {
-    $this->scriptingLanguage = $scriptingLanguage;
-  }
-  public function getScriptingLanguage()
-  {
-    return $this->scriptingLanguage;
-  }
-  public function setSize($size)
-  {
-    $this->size = $size;
-  }
-  public function getSize()
-  {
-    return $this->size;
-  }
-  public function setType($type)
-  {
-    $this->type = $type;
-  }
-  public function getType()
-  {
-    return $this->type;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdSenseHost/AdUnits.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdSenseHost/AdUnits.php
deleted file mode 100644
index b528b0cc..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdSenseHost/AdUnits.php
+++ /dev/null
@@ -1,59 +0,0 @@
-etag = $etag;
-  }
-  public function getEtag()
-  {
-    return $this->etag;
-  }
-  public function setItems($items)
-  {
-    $this->items = $items;
-  }
-  public function getItems()
-  {
-    return $this->items;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setNextPageToken($nextPageToken)
-  {
-    $this->nextPageToken = $nextPageToken;
-  }
-  public function getNextPageToken()
-  {
-    return $this->nextPageToken;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdSenseHost/AssociationSession.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdSenseHost/AssociationSession.php
deleted file mode 100644
index 4d346008..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdSenseHost/AssociationSession.php
+++ /dev/null
@@ -1,103 +0,0 @@
-accountId = $accountId;
-  }
-  public function getAccountId()
-  {
-    return $this->accountId;
-  }
-  public function setId($id)
-  {
-    $this->id = $id;
-  }
-  public function getId()
-  {
-    return $this->id;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setProductCodes($productCodes)
-  {
-    $this->productCodes = $productCodes;
-  }
-  public function getProductCodes()
-  {
-    return $this->productCodes;
-  }
-  public function setRedirectUrl($redirectUrl)
-  {
-    $this->redirectUrl = $redirectUrl;
-  }
-  public function getRedirectUrl()
-  {
-    return $this->redirectUrl;
-  }
-  public function setStatus($status)
-  {
-    $this->status = $status;
-  }
-  public function getStatus()
-  {
-    return $this->status;
-  }
-  public function setUserLocale($userLocale)
-  {
-    $this->userLocale = $userLocale;
-  }
-  public function getUserLocale()
-  {
-    return $this->userLocale;
-  }
-  public function setWebsiteLocale($websiteLocale)
-  {
-    $this->websiteLocale = $websiteLocale;
-  }
-  public function getWebsiteLocale()
-  {
-    return $this->websiteLocale;
-  }
-  public function setWebsiteUrl($websiteUrl)
-  {
-    $this->websiteUrl = $websiteUrl;
-  }
-  public function getWebsiteUrl()
-  {
-    return $this->websiteUrl;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdSenseHost/CustomChannel.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdSenseHost/CustomChannel.php
deleted file mode 100644
index 94f73abd..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdSenseHost/CustomChannel.php
+++ /dev/null
@@ -1,57 +0,0 @@
-code = $code;
-  }
-  public function getCode()
-  {
-    return $this->code;
-  }
-  public function setId($id)
-  {
-    $this->id = $id;
-  }
-  public function getId()
-  {
-    return $this->id;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setName($name)
-  {
-    $this->name = $name;
-  }
-  public function getName()
-  {
-    return $this->name;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdSenseHost/CustomChannels.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdSenseHost/CustomChannels.php
deleted file mode 100644
index 455be5ae..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdSenseHost/CustomChannels.php
+++ /dev/null
@@ -1,59 +0,0 @@
-etag = $etag;
-  }
-  public function getEtag()
-  {
-    return $this->etag;
-  }
-  public function setItems($items)
-  {
-    $this->items = $items;
-  }
-  public function getItems()
-  {
-    return $this->items;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setNextPageToken($nextPageToken)
-  {
-    $this->nextPageToken = $nextPageToken;
-  }
-  public function getNextPageToken()
-  {
-    return $this->nextPageToken;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdSenseHost/Report.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdSenseHost/Report.php
deleted file mode 100644
index 94220fec..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdSenseHost/Report.php
+++ /dev/null
@@ -1,86 +0,0 @@
-averages = $averages;
-  }
-  public function getAverages()
-  {
-    return $this->averages;
-  }
-  public function setHeaders($headers)
-  {
-    $this->headers = $headers;
-  }
-  public function getHeaders()
-  {
-    return $this->headers;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setRows($rows)
-  {
-    $this->rows = $rows;
-  }
-  public function getRows()
-  {
-    return $this->rows;
-  }
-  public function setTotalMatchedRows($totalMatchedRows)
-  {
-    $this->totalMatchedRows = $totalMatchedRows;
-  }
-  public function getTotalMatchedRows()
-  {
-    return $this->totalMatchedRows;
-  }
-  public function setTotals($totals)
-  {
-    $this->totals = $totals;
-  }
-  public function getTotals()
-  {
-    return $this->totals;
-  }
-  public function setWarnings($warnings)
-  {
-    $this->warnings = $warnings;
-  }
-  public function getWarnings()
-  {
-    return $this->warnings;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdSenseHost/ReportHeaders.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdSenseHost/ReportHeaders.php
deleted file mode 100644
index 418e03fd..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdSenseHost/ReportHeaders.php
+++ /dev/null
@@ -1,48 +0,0 @@
-currency = $currency;
-  }
-  public function getCurrency()
-  {
-    return $this->currency;
-  }
-  public function setName($name)
-  {
-    $this->name = $name;
-  }
-  public function getName()
-  {
-    return $this->name;
-  }
-  public function setType($type)
-  {
-    $this->type = $type;
-  }
-  public function getType()
-  {
-    return $this->type;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdSenseHost/Resource/Accounts.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdSenseHost/Resource/Accounts.php
deleted file mode 100644
index 6256267b..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdSenseHost/Resource/Accounts.php
+++ /dev/null
@@ -1,55 +0,0 @@
-
- *   $adsensehostService = new Google_Service_AdSenseHost(...);
- *   $accounts = $adsensehostService->accounts;
- *  
- */
-class Google_Service_AdSenseHost_Resource_Accounts extends Google_Service_Resource
-{
-  /**
-   * Get information about the selected associated AdSense account. (accounts.get)
-   *
-   * @param string $accountId Account to get information about.
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_AdSenseHost_Account
-   */
-  public function get($accountId, $optParams = array())
-  {
-    $params = array('accountId' => $accountId);
-    $params = array_merge($params, $optParams);
-    return $this->call('get', array($params), "Google_Service_AdSenseHost_Account");
-  }
-  /**
-   * List hosted accounts associated with this AdSense account by ad client id.
-   * (accounts.listAccounts)
-   *
-   * @param string|array $filterAdClientId Ad clients to list accounts for.
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_AdSenseHost_Accounts
-   */
-  public function listAccounts($filterAdClientId, $optParams = array())
-  {
-    $params = array('filterAdClientId' => $filterAdClientId);
-    $params = array_merge($params, $optParams);
-    return $this->call('list', array($params), "Google_Service_AdSenseHost_Accounts");
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdSenseHost/Resource/AccountsAdclients.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdSenseHost/Resource/AccountsAdclients.php
deleted file mode 100644
index 5eab0111..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdSenseHost/Resource/AccountsAdclients.php
+++ /dev/null
@@ -1,63 +0,0 @@
-
- *   $adsensehostService = new Google_Service_AdSenseHost(...);
- *   $adclients = $adsensehostService->adclients;
- *  
- */
-class Google_Service_AdSenseHost_Resource_AccountsAdclients extends Google_Service_Resource
-{
-  /**
-   * Get information about one of the ad clients in the specified publisher's
-   * AdSense account. (adclients.get)
-   *
-   * @param string $accountId Account which contains the ad client.
-   * @param string $adClientId Ad client to get.
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_AdSenseHost_AdClient
-   */
-  public function get($accountId, $adClientId, $optParams = array())
-  {
-    $params = array('accountId' => $accountId, 'adClientId' => $adClientId);
-    $params = array_merge($params, $optParams);
-    return $this->call('get', array($params), "Google_Service_AdSenseHost_AdClient");
-  }
-  /**
-   * List all hosted ad clients in the specified hosted account.
-   * (adclients.listAccountsAdclients)
-   *
-   * @param string $accountId Account for which to list ad clients.
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param string maxResults The maximum number of ad clients to include in
-   * the response, used for paging.
-   * @opt_param string pageToken A continuation token, used to page through ad
-   * clients. To retrieve the next page, set this parameter to the value of
-   * "nextPageToken" from the previous response.
-   * @return Google_Service_AdSenseHost_AdClients
-   */
-  public function listAccountsAdclients($accountId, $optParams = array())
-  {
-    $params = array('accountId' => $accountId);
-    $params = array_merge($params, $optParams);
-    return $this->call('list', array($params), "Google_Service_AdSenseHost_AdClients");
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdSenseHost/Resource/AccountsAdunits.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdSenseHost/Resource/AccountsAdunits.php
deleted file mode 100644
index b05f2bcd..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdSenseHost/Resource/AccountsAdunits.php
+++ /dev/null
@@ -1,150 +0,0 @@
-
- *   $adsensehostService = new Google_Service_AdSenseHost(...);
- *   $adunits = $adsensehostService->adunits;
- *  
- */
-class Google_Service_AdSenseHost_Resource_AccountsAdunits extends Google_Service_Resource
-{
-  /**
-   * Delete the specified ad unit from the specified publisher AdSense account.
-   * (adunits.delete)
-   *
-   * @param string $accountId Account which contains the ad unit.
-   * @param string $adClientId Ad client for which to get ad unit.
-   * @param string $adUnitId Ad unit to delete.
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_AdSenseHost_AdUnit
-   */
-  public function delete($accountId, $adClientId, $adUnitId, $optParams = array())
-  {
-    $params = array('accountId' => $accountId, 'adClientId' => $adClientId, 'adUnitId' => $adUnitId);
-    $params = array_merge($params, $optParams);
-    return $this->call('delete', array($params), "Google_Service_AdSenseHost_AdUnit");
-  }
-  /**
-   * Get the specified host ad unit in this AdSense account. (adunits.get)
-   *
-   * @param string $accountId Account which contains the ad unit.
-   * @param string $adClientId Ad client for which to get ad unit.
-   * @param string $adUnitId Ad unit to get.
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_AdSenseHost_AdUnit
-   */
-  public function get($accountId, $adClientId, $adUnitId, $optParams = array())
-  {
-    $params = array('accountId' => $accountId, 'adClientId' => $adClientId, 'adUnitId' => $adUnitId);
-    $params = array_merge($params, $optParams);
-    return $this->call('get', array($params), "Google_Service_AdSenseHost_AdUnit");
-  }
-  /**
-   * Get ad code for the specified ad unit, attaching the specified host custom
-   * channels. (adunits.getAdCode)
-   *
-   * @param string $accountId Account which contains the ad client.
-   * @param string $adClientId Ad client with contains the ad unit.
-   * @param string $adUnitId Ad unit to get the code for.
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param string hostCustomChannelId Host custom channel to attach to the ad
-   * code.
-   * @return Google_Service_AdSenseHost_AdCode
-   */
-  public function getAdCode($accountId, $adClientId, $adUnitId, $optParams = array())
-  {
-    $params = array('accountId' => $accountId, 'adClientId' => $adClientId, 'adUnitId' => $adUnitId);
-    $params = array_merge($params, $optParams);
-    return $this->call('getAdCode', array($params), "Google_Service_AdSenseHost_AdCode");
-  }
-  /**
-   * Insert the supplied ad unit into the specified publisher AdSense account.
-   * (adunits.insert)
-   *
-   * @param string $accountId Account which will contain the ad unit.
-   * @param string $adClientId Ad client into which to insert the ad unit.
-   * @param Google_Service_AdSenseHost_AdUnit $postBody
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_AdSenseHost_AdUnit
-   */
-  public function insert($accountId, $adClientId, Google_Service_AdSenseHost_AdUnit $postBody, $optParams = array())
-  {
-    $params = array('accountId' => $accountId, 'adClientId' => $adClientId, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('insert', array($params), "Google_Service_AdSenseHost_AdUnit");
-  }
-  /**
-   * List all ad units in the specified publisher's AdSense account.
-   * (adunits.listAccountsAdunits)
-   *
-   * @param string $accountId Account which contains the ad client.
-   * @param string $adClientId Ad client for which to list ad units.
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param bool includeInactive Whether to include inactive ad units.
-   * Default: true.
-   * @opt_param string maxResults The maximum number of ad units to include in the
-   * response, used for paging.
-   * @opt_param string pageToken A continuation token, used to page through ad
-   * units. To retrieve the next page, set this parameter to the value of
-   * "nextPageToken" from the previous response.
-   * @return Google_Service_AdSenseHost_AdUnits
-   */
-  public function listAccountsAdunits($accountId, $adClientId, $optParams = array())
-  {
-    $params = array('accountId' => $accountId, 'adClientId' => $adClientId);
-    $params = array_merge($params, $optParams);
-    return $this->call('list', array($params), "Google_Service_AdSenseHost_AdUnits");
-  }
-  /**
-   * Update the supplied ad unit in the specified publisher AdSense account. This
-   * method supports patch semantics. (adunits.patch)
-   *
-   * @param string $accountId Account which contains the ad client.
-   * @param string $adClientId Ad client which contains the ad unit.
-   * @param string $adUnitId Ad unit to get.
-   * @param Google_Service_AdSenseHost_AdUnit $postBody
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_AdSenseHost_AdUnit
-   */
-  public function patch($accountId, $adClientId, $adUnitId, Google_Service_AdSenseHost_AdUnit $postBody, $optParams = array())
-  {
-    $params = array('accountId' => $accountId, 'adClientId' => $adClientId, 'adUnitId' => $adUnitId, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('patch', array($params), "Google_Service_AdSenseHost_AdUnit");
-  }
-  /**
-   * Update the supplied ad unit in the specified publisher AdSense account.
-   * (adunits.update)
-   *
-   * @param string $accountId Account which contains the ad client.
-   * @param string $adClientId Ad client which contains the ad unit.
-   * @param Google_Service_AdSenseHost_AdUnit $postBody
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_AdSenseHost_AdUnit
-   */
-  public function update($accountId, $adClientId, Google_Service_AdSenseHost_AdUnit $postBody, $optParams = array())
-  {
-    $params = array('accountId' => $accountId, 'adClientId' => $adClientId, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('update', array($params), "Google_Service_AdSenseHost_AdUnit");
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdSenseHost/Resource/AccountsReports.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdSenseHost/Resource/AccountsReports.php
deleted file mode 100644
index 0aa2ea79..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdSenseHost/Resource/AccountsReports.php
+++ /dev/null
@@ -1,59 +0,0 @@
-
- *   $adsensehostService = new Google_Service_AdSenseHost(...);
- *   $reports = $adsensehostService->reports;
- *  
- */
-class Google_Service_AdSenseHost_Resource_AccountsReports extends Google_Service_Resource
-{
-  /**
-   * Generate an AdSense report based on the report request sent in the query
-   * parameters. Returns the result as JSON; to retrieve output in CSV format
-   * specify "alt=csv" as a query parameter. (reports.generate)
-   *
-   * @param string $accountId Hosted account upon which to report.
-   * @param string $startDate Start of the date range to report on in "YYYY-MM-DD"
-   * format, inclusive.
-   * @param string $endDate End of the date range to report on in "YYYY-MM-DD"
-   * format, inclusive.
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param string dimension Dimensions to base the report on.
-   * @opt_param string filter Filters to be run on the report.
-   * @opt_param string locale Optional locale to use for translating report output
-   * to a local language. Defaults to "en_US" if not specified.
-   * @opt_param string maxResults The maximum number of rows of report data to
-   * return.
-   * @opt_param string metric Numeric columns to include in the report.
-   * @opt_param string sort The name of a dimension or metric to sort the
-   * resulting report on, optionally prefixed with "+" to sort ascending or "-" to
-   * sort descending. If no prefix is specified, the column is sorted ascending.
-   * @opt_param string startIndex Index of the first row of report data to return.
-   * @return Google_Service_AdSenseHost_Report
-   */
-  public function generate($accountId, $startDate, $endDate, $optParams = array())
-  {
-    $params = array('accountId' => $accountId, 'startDate' => $startDate, 'endDate' => $endDate);
-    $params = array_merge($params, $optParams);
-    return $this->call('generate', array($params), "Google_Service_AdSenseHost_Report");
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdSenseHost/Resource/Adclients.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdSenseHost/Resource/Adclients.php
deleted file mode 100644
index 006abdfb..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdSenseHost/Resource/Adclients.php
+++ /dev/null
@@ -1,60 +0,0 @@
-
- *   $adsensehostService = new Google_Service_AdSenseHost(...);
- *   $adclients = $adsensehostService->adclients;
- *  
- */
-class Google_Service_AdSenseHost_Resource_Adclients extends Google_Service_Resource
-{
-  /**
-   * Get information about one of the ad clients in the Host AdSense account.
-   * (adclients.get)
-   *
-   * @param string $adClientId Ad client to get.
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_AdSenseHost_AdClient
-   */
-  public function get($adClientId, $optParams = array())
-  {
-    $params = array('adClientId' => $adClientId);
-    $params = array_merge($params, $optParams);
-    return $this->call('get', array($params), "Google_Service_AdSenseHost_AdClient");
-  }
-  /**
-   * List all host ad clients in this AdSense account. (adclients.listAdclients)
-   *
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param string maxResults The maximum number of ad clients to include in
-   * the response, used for paging.
-   * @opt_param string pageToken A continuation token, used to page through ad
-   * clients. To retrieve the next page, set this parameter to the value of
-   * "nextPageToken" from the previous response.
-   * @return Google_Service_AdSenseHost_AdClients
-   */
-  public function listAdclients($optParams = array())
-  {
-    $params = array();
-    $params = array_merge($params, $optParams);
-    return $this->call('list', array($params), "Google_Service_AdSenseHost_AdClients");
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdSenseHost/Resource/Associationsessions.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdSenseHost/Resource/Associationsessions.php
deleted file mode 100644
index 67a900aa..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdSenseHost/Resource/Associationsessions.php
+++ /dev/null
@@ -1,60 +0,0 @@
-
- *   $adsensehostService = new Google_Service_AdSenseHost(...);
- *   $associationsessions = $adsensehostService->associationsessions;
- *  
- */
-class Google_Service_AdSenseHost_Resource_Associationsessions extends Google_Service_Resource
-{
-  /**
-   * Create an association session for initiating an association with an AdSense
-   * user. (associationsessions.start)
-   *
-   * @param string|array $productCode Products to associate with the user.
-   * @param string $websiteUrl The URL of the user's hosted website.
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param string userLocale The preferred locale of the user.
-   * @opt_param string websiteLocale The locale of the user's hosted website.
-   * @return Google_Service_AdSenseHost_AssociationSession
-   */
-  public function start($productCode, $websiteUrl, $optParams = array())
-  {
-    $params = array('productCode' => $productCode, 'websiteUrl' => $websiteUrl);
-    $params = array_merge($params, $optParams);
-    return $this->call('start', array($params), "Google_Service_AdSenseHost_AssociationSession");
-  }
-  /**
-   * Verify an association session after the association callback returns from
-   * AdSense signup. (associationsessions.verify)
-   *
-   * @param string $token The token returned to the association callback URL.
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_AdSenseHost_AssociationSession
-   */
-  public function verify($token, $optParams = array())
-  {
-    $params = array('token' => $token);
-    $params = array_merge($params, $optParams);
-    return $this->call('verify', array($params), "Google_Service_AdSenseHost_AssociationSession");
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdSenseHost/Resource/Customchannels.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdSenseHost/Resource/Customchannels.php
deleted file mode 100644
index 75736e6a..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdSenseHost/Resource/Customchannels.php
+++ /dev/null
@@ -1,125 +0,0 @@
-
- *   $adsensehostService = new Google_Service_AdSenseHost(...);
- *   $customchannels = $adsensehostService->customchannels;
- *  
- */
-class Google_Service_AdSenseHost_Resource_Customchannels extends Google_Service_Resource
-{
-  /**
-   * Delete a specific custom channel from the host AdSense account.
-   * (customchannels.delete)
-   *
-   * @param string $adClientId Ad client from which to delete the custom channel.
-   * @param string $customChannelId Custom channel to delete.
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_AdSenseHost_CustomChannel
-   */
-  public function delete($adClientId, $customChannelId, $optParams = array())
-  {
-    $params = array('adClientId' => $adClientId, 'customChannelId' => $customChannelId);
-    $params = array_merge($params, $optParams);
-    return $this->call('delete', array($params), "Google_Service_AdSenseHost_CustomChannel");
-  }
-  /**
-   * Get a specific custom channel from the host AdSense account.
-   * (customchannels.get)
-   *
-   * @param string $adClientId Ad client from which to get the custom channel.
-   * @param string $customChannelId Custom channel to get.
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_AdSenseHost_CustomChannel
-   */
-  public function get($adClientId, $customChannelId, $optParams = array())
-  {
-    $params = array('adClientId' => $adClientId, 'customChannelId' => $customChannelId);
-    $params = array_merge($params, $optParams);
-    return $this->call('get', array($params), "Google_Service_AdSenseHost_CustomChannel");
-  }
-  /**
-   * Add a new custom channel to the host AdSense account. (customchannels.insert)
-   *
-   * @param string $adClientId Ad client to which the new custom channel will be
-   * added.
-   * @param Google_Service_AdSenseHost_CustomChannel $postBody
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_AdSenseHost_CustomChannel
-   */
-  public function insert($adClientId, Google_Service_AdSenseHost_CustomChannel $postBody, $optParams = array())
-  {
-    $params = array('adClientId' => $adClientId, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('insert', array($params), "Google_Service_AdSenseHost_CustomChannel");
-  }
-  /**
-   * List all host custom channels in this AdSense account.
-   * (customchannels.listCustomchannels)
-   *
-   * @param string $adClientId Ad client for which to list custom channels.
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param string maxResults The maximum number of custom channels to include
-   * in the response, used for paging.
-   * @opt_param string pageToken A continuation token, used to page through custom
-   * channels. To retrieve the next page, set this parameter to the value of
-   * "nextPageToken" from the previous response.
-   * @return Google_Service_AdSenseHost_CustomChannels
-   */
-  public function listCustomchannels($adClientId, $optParams = array())
-  {
-    $params = array('adClientId' => $adClientId);
-    $params = array_merge($params, $optParams);
-    return $this->call('list', array($params), "Google_Service_AdSenseHost_CustomChannels");
-  }
-  /**
-   * Update a custom channel in the host AdSense account. This method supports
-   * patch semantics. (customchannels.patch)
-   *
-   * @param string $adClientId Ad client in which the custom channel will be
-   * updated.
-   * @param string $customChannelId Custom channel to get.
-   * @param Google_Service_AdSenseHost_CustomChannel $postBody
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_AdSenseHost_CustomChannel
-   */
-  public function patch($adClientId, $customChannelId, Google_Service_AdSenseHost_CustomChannel $postBody, $optParams = array())
-  {
-    $params = array('adClientId' => $adClientId, 'customChannelId' => $customChannelId, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('patch', array($params), "Google_Service_AdSenseHost_CustomChannel");
-  }
-  /**
-   * Update a custom channel in the host AdSense account. (customchannels.update)
-   *
-   * @param string $adClientId Ad client in which the custom channel will be
-   * updated.
-   * @param Google_Service_AdSenseHost_CustomChannel $postBody
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_AdSenseHost_CustomChannel
-   */
-  public function update($adClientId, Google_Service_AdSenseHost_CustomChannel $postBody, $optParams = array())
-  {
-    $params = array('adClientId' => $adClientId, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('update', array($params), "Google_Service_AdSenseHost_CustomChannel");
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdSenseHost/Resource/Reports.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdSenseHost/Resource/Reports.php
deleted file mode 100644
index fa5522c8..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdSenseHost/Resource/Reports.php
+++ /dev/null
@@ -1,58 +0,0 @@
-
- *   $adsensehostService = new Google_Service_AdSenseHost(...);
- *   $reports = $adsensehostService->reports;
- *  
- */
-class Google_Service_AdSenseHost_Resource_Reports extends Google_Service_Resource
-{
-  /**
-   * Generate an AdSense report based on the report request sent in the query
-   * parameters. Returns the result as JSON; to retrieve output in CSV format
-   * specify "alt=csv" as a query parameter. (reports.generate)
-   *
-   * @param string $startDate Start of the date range to report on in "YYYY-MM-DD"
-   * format, inclusive.
-   * @param string $endDate End of the date range to report on in "YYYY-MM-DD"
-   * format, inclusive.
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param string dimension Dimensions to base the report on.
-   * @opt_param string filter Filters to be run on the report.
-   * @opt_param string locale Optional locale to use for translating report output
-   * to a local language. Defaults to "en_US" if not specified.
-   * @opt_param string maxResults The maximum number of rows of report data to
-   * return.
-   * @opt_param string metric Numeric columns to include in the report.
-   * @opt_param string sort The name of a dimension or metric to sort the
-   * resulting report on, optionally prefixed with "+" to sort ascending or "-" to
-   * sort descending. If no prefix is specified, the column is sorted ascending.
-   * @opt_param string startIndex Index of the first row of report data to return.
-   * @return Google_Service_AdSenseHost_Report
-   */
-  public function generate($startDate, $endDate, $optParams = array())
-  {
-    $params = array('startDate' => $startDate, 'endDate' => $endDate);
-    $params = array_merge($params, $optParams);
-    return $this->call('generate', array($params), "Google_Service_AdSenseHost_Report");
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdSenseHost/Resource/Urlchannels.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdSenseHost/Resource/Urlchannels.php
deleted file mode 100644
index 6a7cbcf4..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdSenseHost/Resource/Urlchannels.php
+++ /dev/null
@@ -1,77 +0,0 @@
-
- *   $adsensehostService = new Google_Service_AdSenseHost(...);
- *   $urlchannels = $adsensehostService->urlchannels;
- *  
- */
-class Google_Service_AdSenseHost_Resource_Urlchannels extends Google_Service_Resource
-{
-  /**
-   * Delete a URL channel from the host AdSense account. (urlchannels.delete)
-   *
-   * @param string $adClientId Ad client from which to delete the URL channel.
-   * @param string $urlChannelId URL channel to delete.
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_AdSenseHost_UrlChannel
-   */
-  public function delete($adClientId, $urlChannelId, $optParams = array())
-  {
-    $params = array('adClientId' => $adClientId, 'urlChannelId' => $urlChannelId);
-    $params = array_merge($params, $optParams);
-    return $this->call('delete', array($params), "Google_Service_AdSenseHost_UrlChannel");
-  }
-  /**
-   * Add a new URL channel to the host AdSense account. (urlchannels.insert)
-   *
-   * @param string $adClientId Ad client to which the new URL channel will be
-   * added.
-   * @param Google_Service_AdSenseHost_UrlChannel $postBody
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_AdSenseHost_UrlChannel
-   */
-  public function insert($adClientId, Google_Service_AdSenseHost_UrlChannel $postBody, $optParams = array())
-  {
-    $params = array('adClientId' => $adClientId, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('insert', array($params), "Google_Service_AdSenseHost_UrlChannel");
-  }
-  /**
-   * List all host URL channels in the host AdSense account.
-   * (urlchannels.listUrlchannels)
-   *
-   * @param string $adClientId Ad client for which to list URL channels.
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param string maxResults The maximum number of URL channels to include in
-   * the response, used for paging.
-   * @opt_param string pageToken A continuation token, used to page through URL
-   * channels. To retrieve the next page, set this parameter to the value of
-   * "nextPageToken" from the previous response.
-   * @return Google_Service_AdSenseHost_UrlChannels
-   */
-  public function listUrlchannels($adClientId, $optParams = array())
-  {
-    $params = array('adClientId' => $adClientId);
-    $params = array_merge($params, $optParams);
-    return $this->call('list', array($params), "Google_Service_AdSenseHost_UrlChannels");
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdSenseHost/UrlChannel.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdSenseHost/UrlChannel.php
deleted file mode 100644
index f58f23cd..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdSenseHost/UrlChannel.php
+++ /dev/null
@@ -1,48 +0,0 @@
-id = $id;
-  }
-  public function getId()
-  {
-    return $this->id;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setUrlPattern($urlPattern)
-  {
-    $this->urlPattern = $urlPattern;
-  }
-  public function getUrlPattern()
-  {
-    return $this->urlPattern;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdSenseHost/UrlChannels.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdSenseHost/UrlChannels.php
deleted file mode 100644
index cc7338dc..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AdSenseHost/UrlChannels.php
+++ /dev/null
@@ -1,59 +0,0 @@
-etag = $etag;
-  }
-  public function getEtag()
-  {
-    return $this->etag;
-  }
-  public function setItems($items)
-  {
-    $this->items = $items;
-  }
-  public function getItems()
-  {
-    return $this->items;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setNextPageToken($nextPageToken)
-  {
-    $this->nextPageToken = $nextPageToken;
-  }
-  public function getNextPageToken()
-  {
-    return $this->nextPageToken;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Analytics.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Analytics.php
deleted file mode 100644
index 50a3b231..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Analytics.php
+++ /dev/null
@@ -1,2103 +0,0 @@
-
- * Views and manages your Google Analytics data.

- *
- * 

- * For more information about this service, see the API
- * Documentation
- * 

- *
- * @author Google, Inc.
- */
-class Google_Service_Analytics extends Google_Service
-{
-  /** View and manage your Google Analytics data. */
-  const ANALYTICS =
-      "https://www.googleapis.com/auth/analytics";
-  /** Edit Google Analytics management entities. */
-  const ANALYTICS_EDIT =
-      "https://www.googleapis.com/auth/analytics.edit";
-  /** Manage Google Analytics Account users by email address. */
-  const ANALYTICS_MANAGE_USERS =
-      "https://www.googleapis.com/auth/analytics.manage.users";
-  /** View Google Analytics user permissions. */
-  const ANALYTICS_MANAGE_USERS_READONLY =
-      "https://www.googleapis.com/auth/analytics.manage.users.readonly";
-  /** Create a new Google Analytics account along with its default property and view. */
-  const ANALYTICS_PROVISION =
-      "https://www.googleapis.com/auth/analytics.provision";
-  /** View your Google Analytics data. */
-  const ANALYTICS_READONLY =
-      "https://www.googleapis.com/auth/analytics.readonly";
-
-  public $data_ga;
-  public $data_mcf;
-  public $data_realtime;
-  public $management_accountSummaries;
-  public $management_accountUserLinks;
-  public $management_accounts;
-  public $management_customDataSources;
-  public $management_customDimensions;
-  public $management_customMetrics;
-  public $management_experiments;
-  public $management_filters;
-  public $management_goals;
-  public $management_profileFilterLinks;
-  public $management_profileUserLinks;
-  public $management_profiles;
-  public $management_remarketingAudience;
-  public $management_segments;
-  public $management_unsampledReports;
-  public $management_uploads;
-  public $management_webPropertyAdWordsLinks;
-  public $management_webproperties;
-  public $management_webpropertyUserLinks;
-  public $metadata_columns;
-  public $provisioning;
-  
-  /**
-   * Constructs the internal representation of the Analytics service.
-   *
-   * @param Google_Client $client
-   */
-  public function __construct(Google_Client $client)
-  {
-    parent::__construct($client);
-    $this->rootUrl = 'https://www.googleapis.com/';
-    $this->servicePath = 'analytics/v3/';
-    $this->version = 'v3';
-    $this->serviceName = 'analytics';
-
-    $this->data_ga = new Google_Service_Analytics_Resource_DataGa(
-        $this,
-        $this->serviceName,
-        'ga',
-        array(
-          'methods' => array(
-            'get' => array(
-              'path' => 'data/ga',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'ids' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'start-date' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'end-date' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'metrics' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'dimensions' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'filters' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'include-empty-rows' => array(
-                  'location' => 'query',
-                  'type' => 'boolean',
-                ),
-                'max-results' => array(
-                  'location' => 'query',
-                  'type' => 'integer',
-                ),
-                'output' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'samplingLevel' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'segment' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'sort' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'start-index' => array(
-                  'location' => 'query',
-                  'type' => 'integer',
-                ),
-              ),
-            ),
-          )
-        )
-    );
-    $this->data_mcf = new Google_Service_Analytics_Resource_DataMcf(
-        $this,
-        $this->serviceName,
-        'mcf',
-        array(
-          'methods' => array(
-            'get' => array(
-              'path' => 'data/mcf',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'ids' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'start-date' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'end-date' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'metrics' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'dimensions' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'filters' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'max-results' => array(
-                  'location' => 'query',
-                  'type' => 'integer',
-                ),
-                'samplingLevel' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'sort' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'start-index' => array(
-                  'location' => 'query',
-                  'type' => 'integer',
-                ),
-              ),
-            ),
-          )
-        )
-    );
-    $this->data_realtime = new Google_Service_Analytics_Resource_DataRealtime(
-        $this,
-        $this->serviceName,
-        'realtime',
-        array(
-          'methods' => array(
-            'get' => array(
-              'path' => 'data/realtime',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'ids' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'metrics' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'dimensions' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'filters' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'max-results' => array(
-                  'location' => 'query',
-                  'type' => 'integer',
-                ),
-                'sort' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-              ),
-            ),
-          )
-        )
-    );
-    $this->management_accountSummaries = new Google_Service_Analytics_Resource_ManagementAccountSummaries(
-        $this,
-        $this->serviceName,
-        'accountSummaries',
-        array(
-          'methods' => array(
-            'list' => array(
-              'path' => 'management/accountSummaries',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'max-results' => array(
-                  'location' => 'query',
-                  'type' => 'integer',
-                ),
-                'start-index' => array(
-                  'location' => 'query',
-                  'type' => 'integer',
-                ),
-              ),
-            ),
-          )
-        )
-    );
-    $this->management_accountUserLinks = new Google_Service_Analytics_Resource_ManagementAccountUserLinks(
-        $this,
-        $this->serviceName,
-        'accountUserLinks',
-        array(
-          'methods' => array(
-            'delete' => array(
-              'path' => 'management/accounts/{accountId}/entityUserLinks/{linkId}',
-              'httpMethod' => 'DELETE',
-              'parameters' => array(
-                'accountId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'linkId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'insert' => array(
-              'path' => 'management/accounts/{accountId}/entityUserLinks',
-              'httpMethod' => 'POST',
-              'parameters' => array(
-                'accountId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'list' => array(
-              'path' => 'management/accounts/{accountId}/entityUserLinks',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'accountId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'max-results' => array(
-                  'location' => 'query',
-                  'type' => 'integer',
-                ),
-                'start-index' => array(
-                  'location' => 'query',
-                  'type' => 'integer',
-                ),
-              ),
-            ),'update' => array(
-              'path' => 'management/accounts/{accountId}/entityUserLinks/{linkId}',
-              'httpMethod' => 'PUT',
-              'parameters' => array(
-                'accountId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'linkId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),
-          )
-        )
-    );
-    $this->management_accounts = new Google_Service_Analytics_Resource_ManagementAccounts(
-        $this,
-        $this->serviceName,
-        'accounts',
-        array(
-          'methods' => array(
-            'list' => array(
-              'path' => 'management/accounts',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'max-results' => array(
-                  'location' => 'query',
-                  'type' => 'integer',
-                ),
-                'start-index' => array(
-                  'location' => 'query',
-                  'type' => 'integer',
-                ),
-              ),
-            ),
-          )
-        )
-    );
-    $this->management_customDataSources = new Google_Service_Analytics_Resource_ManagementCustomDataSources(
-        $this,
-        $this->serviceName,
-        'customDataSources',
-        array(
-          'methods' => array(
-            'list' => array(
-              'path' => 'management/accounts/{accountId}/webproperties/{webPropertyId}/customDataSources',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'accountId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'webPropertyId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'max-results' => array(
-                  'location' => 'query',
-                  'type' => 'integer',
-                ),
-                'start-index' => array(
-                  'location' => 'query',
-                  'type' => 'integer',
-                ),
-              ),
-            ),
-          )
-        )
-    );
-    $this->management_customDimensions = new Google_Service_Analytics_Resource_ManagementCustomDimensions(
-        $this,
-        $this->serviceName,
-        'customDimensions',
-        array(
-          'methods' => array(
-            'get' => array(
-              'path' => 'management/accounts/{accountId}/webproperties/{webPropertyId}/customDimensions/{customDimensionId}',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'accountId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'webPropertyId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'customDimensionId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'insert' => array(
-              'path' => 'management/accounts/{accountId}/webproperties/{webPropertyId}/customDimensions',
-              'httpMethod' => 'POST',
-              'parameters' => array(
-                'accountId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'webPropertyId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'list' => array(
-              'path' => 'management/accounts/{accountId}/webproperties/{webPropertyId}/customDimensions',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'accountId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'webPropertyId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'max-results' => array(
-                  'location' => 'query',
-                  'type' => 'integer',
-                ),
-                'start-index' => array(
-                  'location' => 'query',
-                  'type' => 'integer',
-                ),
-              ),
-            ),'patch' => array(
-              'path' => 'management/accounts/{accountId}/webproperties/{webPropertyId}/customDimensions/{customDimensionId}',
-              'httpMethod' => 'PATCH',
-              'parameters' => array(
-                'accountId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'webPropertyId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'customDimensionId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'ignoreCustomDataSourceLinks' => array(
-                  'location' => 'query',
-                  'type' => 'boolean',
-                ),
-              ),
-            ),'update' => array(
-              'path' => 'management/accounts/{accountId}/webproperties/{webPropertyId}/customDimensions/{customDimensionId}',
-              'httpMethod' => 'PUT',
-              'parameters' => array(
-                'accountId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'webPropertyId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'customDimensionId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'ignoreCustomDataSourceLinks' => array(
-                  'location' => 'query',
-                  'type' => 'boolean',
-                ),
-              ),
-            ),
-          )
-        )
-    );
-    $this->management_customMetrics = new Google_Service_Analytics_Resource_ManagementCustomMetrics(
-        $this,
-        $this->serviceName,
-        'customMetrics',
-        array(
-          'methods' => array(
-            'get' => array(
-              'path' => 'management/accounts/{accountId}/webproperties/{webPropertyId}/customMetrics/{customMetricId}',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'accountId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'webPropertyId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'customMetricId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'insert' => array(
-              'path' => 'management/accounts/{accountId}/webproperties/{webPropertyId}/customMetrics',
-              'httpMethod' => 'POST',
-              'parameters' => array(
-                'accountId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'webPropertyId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'list' => array(
-              'path' => 'management/accounts/{accountId}/webproperties/{webPropertyId}/customMetrics',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'accountId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'webPropertyId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'max-results' => array(
-                  'location' => 'query',
-                  'type' => 'integer',
-                ),
-                'start-index' => array(
-                  'location' => 'query',
-                  'type' => 'integer',
-                ),
-              ),
-            ),'patch' => array(
-              'path' => 'management/accounts/{accountId}/webproperties/{webPropertyId}/customMetrics/{customMetricId}',
-              'httpMethod' => 'PATCH',
-              'parameters' => array(
-                'accountId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'webPropertyId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'customMetricId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'ignoreCustomDataSourceLinks' => array(
-                  'location' => 'query',
-                  'type' => 'boolean',
-                ),
-              ),
-            ),'update' => array(
-              'path' => 'management/accounts/{accountId}/webproperties/{webPropertyId}/customMetrics/{customMetricId}',
-              'httpMethod' => 'PUT',
-              'parameters' => array(
-                'accountId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'webPropertyId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'customMetricId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'ignoreCustomDataSourceLinks' => array(
-                  'location' => 'query',
-                  'type' => 'boolean',
-                ),
-              ),
-            ),
-          )
-        )
-    );
-    $this->management_experiments = new Google_Service_Analytics_Resource_ManagementExperiments(
-        $this,
-        $this->serviceName,
-        'experiments',
-        array(
-          'methods' => array(
-            'delete' => array(
-              'path' => 'management/accounts/{accountId}/webproperties/{webPropertyId}/profiles/{profileId}/experiments/{experimentId}',
-              'httpMethod' => 'DELETE',
-              'parameters' => array(
-                'accountId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'webPropertyId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'profileId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'experimentId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'get' => array(
-              'path' => 'management/accounts/{accountId}/webproperties/{webPropertyId}/profiles/{profileId}/experiments/{experimentId}',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'accountId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'webPropertyId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'profileId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'experimentId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'insert' => array(
-              'path' => 'management/accounts/{accountId}/webproperties/{webPropertyId}/profiles/{profileId}/experiments',
-              'httpMethod' => 'POST',
-              'parameters' => array(
-                'accountId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'webPropertyId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'profileId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'list' => array(
-              'path' => 'management/accounts/{accountId}/webproperties/{webPropertyId}/profiles/{profileId}/experiments',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'accountId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'webPropertyId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'profileId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'max-results' => array(
-                  'location' => 'query',
-                  'type' => 'integer',
-                ),
-                'start-index' => array(
-                  'location' => 'query',
-                  'type' => 'integer',
-                ),
-              ),
-            ),'patch' => array(
-              'path' => 'management/accounts/{accountId}/webproperties/{webPropertyId}/profiles/{profileId}/experiments/{experimentId}',
-              'httpMethod' => 'PATCH',
-              'parameters' => array(
-                'accountId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'webPropertyId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'profileId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'experimentId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'update' => array(
-              'path' => 'management/accounts/{accountId}/webproperties/{webPropertyId}/profiles/{profileId}/experiments/{experimentId}',
-              'httpMethod' => 'PUT',
-              'parameters' => array(
-                'accountId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'webPropertyId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'profileId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'experimentId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),
-          )
-        )
-    );
-    $this->management_filters = new Google_Service_Analytics_Resource_ManagementFilters(
-        $this,
-        $this->serviceName,
-        'filters',
-        array(
-          'methods' => array(
-            'delete' => array(
-              'path' => 'management/accounts/{accountId}/filters/{filterId}',
-              'httpMethod' => 'DELETE',
-              'parameters' => array(
-                'accountId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'filterId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'get' => array(
-              'path' => 'management/accounts/{accountId}/filters/{filterId}',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'accountId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'filterId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'insert' => array(
-              'path' => 'management/accounts/{accountId}/filters',
-              'httpMethod' => 'POST',
-              'parameters' => array(
-                'accountId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'list' => array(
-              'path' => 'management/accounts/{accountId}/filters',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'accountId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'max-results' => array(
-                  'location' => 'query',
-                  'type' => 'integer',
-                ),
-                'start-index' => array(
-                  'location' => 'query',
-                  'type' => 'integer',
-                ),
-              ),
-            ),'patch' => array(
-              'path' => 'management/accounts/{accountId}/filters/{filterId}',
-              'httpMethod' => 'PATCH',
-              'parameters' => array(
-                'accountId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'filterId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'update' => array(
-              'path' => 'management/accounts/{accountId}/filters/{filterId}',
-              'httpMethod' => 'PUT',
-              'parameters' => array(
-                'accountId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'filterId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),
-          )
-        )
-    );
-    $this->management_goals = new Google_Service_Analytics_Resource_ManagementGoals(
-        $this,
-        $this->serviceName,
-        'goals',
-        array(
-          'methods' => array(
-            'get' => array(
-              'path' => 'management/accounts/{accountId}/webproperties/{webPropertyId}/profiles/{profileId}/goals/{goalId}',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'accountId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'webPropertyId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'profileId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'goalId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'insert' => array(
-              'path' => 'management/accounts/{accountId}/webproperties/{webPropertyId}/profiles/{profileId}/goals',
-              'httpMethod' => 'POST',
-              'parameters' => array(
-                'accountId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'webPropertyId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'profileId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'list' => array(
-              'path' => 'management/accounts/{accountId}/webproperties/{webPropertyId}/profiles/{profileId}/goals',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'accountId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'webPropertyId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'profileId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'max-results' => array(
-                  'location' => 'query',
-                  'type' => 'integer',
-                ),
-                'start-index' => array(
-                  'location' => 'query',
-                  'type' => 'integer',
-                ),
-              ),
-            ),'patch' => array(
-              'path' => 'management/accounts/{accountId}/webproperties/{webPropertyId}/profiles/{profileId}/goals/{goalId}',
-              'httpMethod' => 'PATCH',
-              'parameters' => array(
-                'accountId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'webPropertyId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'profileId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'goalId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'update' => array(
-              'path' => 'management/accounts/{accountId}/webproperties/{webPropertyId}/profiles/{profileId}/goals/{goalId}',
-              'httpMethod' => 'PUT',
-              'parameters' => array(
-                'accountId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'webPropertyId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'profileId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'goalId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),
-          )
-        )
-    );
-    $this->management_profileFilterLinks = new Google_Service_Analytics_Resource_ManagementProfileFilterLinks(
-        $this,
-        $this->serviceName,
-        'profileFilterLinks',
-        array(
-          'methods' => array(
-            'delete' => array(
-              'path' => 'management/accounts/{accountId}/webproperties/{webPropertyId}/profiles/{profileId}/profileFilterLinks/{linkId}',
-              'httpMethod' => 'DELETE',
-              'parameters' => array(
-                'accountId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'webPropertyId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'profileId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'linkId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'get' => array(
-              'path' => 'management/accounts/{accountId}/webproperties/{webPropertyId}/profiles/{profileId}/profileFilterLinks/{linkId}',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'accountId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'webPropertyId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'profileId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'linkId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'insert' => array(
-              'path' => 'management/accounts/{accountId}/webproperties/{webPropertyId}/profiles/{profileId}/profileFilterLinks',
-              'httpMethod' => 'POST',
-              'parameters' => array(
-                'accountId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'webPropertyId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'profileId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'list' => array(
-              'path' => 'management/accounts/{accountId}/webproperties/{webPropertyId}/profiles/{profileId}/profileFilterLinks',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'accountId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'webPropertyId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'profileId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'max-results' => array(
-                  'location' => 'query',
-                  'type' => 'integer',
-                ),
-                'start-index' => array(
-                  'location' => 'query',
-                  'type' => 'integer',
-                ),
-              ),
-            ),'patch' => array(
-              'path' => 'management/accounts/{accountId}/webproperties/{webPropertyId}/profiles/{profileId}/profileFilterLinks/{linkId}',
-              'httpMethod' => 'PATCH',
-              'parameters' => array(
-                'accountId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'webPropertyId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'profileId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'linkId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'update' => array(
-              'path' => 'management/accounts/{accountId}/webproperties/{webPropertyId}/profiles/{profileId}/profileFilterLinks/{linkId}',
-              'httpMethod' => 'PUT',
-              'parameters' => array(
-                'accountId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'webPropertyId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'profileId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'linkId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),
-          )
-        )
-    );
-    $this->management_profileUserLinks = new Google_Service_Analytics_Resource_ManagementProfileUserLinks(
-        $this,
-        $this->serviceName,
-        'profileUserLinks',
-        array(
-          'methods' => array(
-            'delete' => array(
-              'path' => 'management/accounts/{accountId}/webproperties/{webPropertyId}/profiles/{profileId}/entityUserLinks/{linkId}',
-              'httpMethod' => 'DELETE',
-              'parameters' => array(
-                'accountId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'webPropertyId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'profileId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'linkId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'insert' => array(
-              'path' => 'management/accounts/{accountId}/webproperties/{webPropertyId}/profiles/{profileId}/entityUserLinks',
-              'httpMethod' => 'POST',
-              'parameters' => array(
-                'accountId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'webPropertyId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'profileId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'list' => array(
-              'path' => 'management/accounts/{accountId}/webproperties/{webPropertyId}/profiles/{profileId}/entityUserLinks',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'accountId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'webPropertyId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'profileId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'max-results' => array(
-                  'location' => 'query',
-                  'type' => 'integer',
-                ),
-                'start-index' => array(
-                  'location' => 'query',
-                  'type' => 'integer',
-                ),
-              ),
-            ),'update' => array(
-              'path' => 'management/accounts/{accountId}/webproperties/{webPropertyId}/profiles/{profileId}/entityUserLinks/{linkId}',
-              'httpMethod' => 'PUT',
-              'parameters' => array(
-                'accountId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'webPropertyId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'profileId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'linkId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),
-          )
-        )
-    );
-    $this->management_profiles = new Google_Service_Analytics_Resource_ManagementProfiles(
-        $this,
-        $this->serviceName,
-        'profiles',
-        array(
-          'methods' => array(
-            'delete' => array(
-              'path' => 'management/accounts/{accountId}/webproperties/{webPropertyId}/profiles/{profileId}',
-              'httpMethod' => 'DELETE',
-              'parameters' => array(
-                'accountId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'webPropertyId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'profileId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'get' => array(
-              'path' => 'management/accounts/{accountId}/webproperties/{webPropertyId}/profiles/{profileId}',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'accountId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'webPropertyId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'profileId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'insert' => array(
-              'path' => 'management/accounts/{accountId}/webproperties/{webPropertyId}/profiles',
-              'httpMethod' => 'POST',
-              'parameters' => array(
-                'accountId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'webPropertyId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'list' => array(
-              'path' => 'management/accounts/{accountId}/webproperties/{webPropertyId}/profiles',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'accountId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'webPropertyId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'max-results' => array(
-                  'location' => 'query',
-                  'type' => 'integer',
-                ),
-                'start-index' => array(
-                  'location' => 'query',
-                  'type' => 'integer',
-                ),
-              ),
-            ),'patch' => array(
-              'path' => 'management/accounts/{accountId}/webproperties/{webPropertyId}/profiles/{profileId}',
-              'httpMethod' => 'PATCH',
-              'parameters' => array(
-                'accountId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'webPropertyId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'profileId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'update' => array(
-              'path' => 'management/accounts/{accountId}/webproperties/{webPropertyId}/profiles/{profileId}',
-              'httpMethod' => 'PUT',
-              'parameters' => array(
-                'accountId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'webPropertyId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'profileId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),
-          )
-        )
-    );
-    $this->management_remarketingAudience = new Google_Service_Analytics_Resource_ManagementRemarketingAudience(
-        $this,
-        $this->serviceName,
-        'remarketingAudience',
-        array(
-          'methods' => array(
-            'get' => array(
-              'path' => 'management/accounts/{accountId}/webproperties/{webPropertyId}/remarketingAudiences/{remarketingAudienceId}',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'accountId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'webPropertyId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'remarketingAudienceId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'insert' => array(
-              'path' => 'management/accounts/{accountId}/webproperties/{webPropertyId}/remarketingAudiences',
-              'httpMethod' => 'POST',
-              'parameters' => array(
-                'accountId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'webPropertyId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'list' => array(
-              'path' => 'management/accounts/{accountId}/webproperties/{webPropertyId}/remarketingAudiences',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'accountId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'webPropertyId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'max-results' => array(
-                  'location' => 'query',
-                  'type' => 'integer',
-                ),
-                'start-index' => array(
-                  'location' => 'query',
-                  'type' => 'integer',
-                ),
-                'type' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-              ),
-            ),'patch' => array(
-              'path' => 'management/accounts/{accountId}/webproperties/{webPropertyId}/remarketingAudiences/{remarketingAudienceId}',
-              'httpMethod' => 'PATCH',
-              'parameters' => array(
-                'accountId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'webPropertyId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'remarketingAudienceId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'update' => array(
-              'path' => 'management/accounts/{accountId}/webproperties/{webPropertyId}/remarketingAudiences/{remarketingAudienceId}',
-              'httpMethod' => 'PUT',
-              'parameters' => array(
-                'accountId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'webPropertyId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'remarketingAudienceId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),
-          )
-        )
-    );
-    $this->management_segments = new Google_Service_Analytics_Resource_ManagementSegments(
-        $this,
-        $this->serviceName,
-        'segments',
-        array(
-          'methods' => array(
-            'list' => array(
-              'path' => 'management/segments',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'max-results' => array(
-                  'location' => 'query',
-                  'type' => 'integer',
-                ),
-                'start-index' => array(
-                  'location' => 'query',
-                  'type' => 'integer',
-                ),
-              ),
-            ),
-          )
-        )
-    );
-    $this->management_unsampledReports = new Google_Service_Analytics_Resource_ManagementUnsampledReports(
-        $this,
-        $this->serviceName,
-        'unsampledReports',
-        array(
-          'methods' => array(
-            'delete' => array(
-              'path' => 'management/accounts/{accountId}/webproperties/{webPropertyId}/profiles/{profileId}/unsampledReports/{unsampledReportId}',
-              'httpMethod' => 'DELETE',
-              'parameters' => array(
-                'accountId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'webPropertyId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'profileId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'unsampledReportId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'get' => array(
-              'path' => 'management/accounts/{accountId}/webproperties/{webPropertyId}/profiles/{profileId}/unsampledReports/{unsampledReportId}',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'accountId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'webPropertyId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'profileId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'unsampledReportId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'insert' => array(
-              'path' => 'management/accounts/{accountId}/webproperties/{webPropertyId}/profiles/{profileId}/unsampledReports',
-              'httpMethod' => 'POST',
-              'parameters' => array(
-                'accountId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'webPropertyId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'profileId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'list' => array(
-              'path' => 'management/accounts/{accountId}/webproperties/{webPropertyId}/profiles/{profileId}/unsampledReports',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'accountId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'webPropertyId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'profileId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'max-results' => array(
-                  'location' => 'query',
-                  'type' => 'integer',
-                ),
-                'start-index' => array(
-                  'location' => 'query',
-                  'type' => 'integer',
-                ),
-              ),
-            ),
-          )
-        )
-    );
-    $this->management_uploads = new Google_Service_Analytics_Resource_ManagementUploads(
-        $this,
-        $this->serviceName,
-        'uploads',
-        array(
-          'methods' => array(
-            'deleteUploadData' => array(
-              'path' => 'management/accounts/{accountId}/webproperties/{webPropertyId}/customDataSources/{customDataSourceId}/deleteUploadData',
-              'httpMethod' => 'POST',
-              'parameters' => array(
-                'accountId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'webPropertyId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'customDataSourceId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'get' => array(
-              'path' => 'management/accounts/{accountId}/webproperties/{webPropertyId}/customDataSources/{customDataSourceId}/uploads/{uploadId}',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'accountId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'webPropertyId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'customDataSourceId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'uploadId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'list' => array(
-              'path' => 'management/accounts/{accountId}/webproperties/{webPropertyId}/customDataSources/{customDataSourceId}/uploads',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'accountId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'webPropertyId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'customDataSourceId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'max-results' => array(
-                  'location' => 'query',
-                  'type' => 'integer',
-                ),
-                'start-index' => array(
-                  'location' => 'query',
-                  'type' => 'integer',
-                ),
-              ),
-            ),'uploadData' => array(
-              'path' => 'management/accounts/{accountId}/webproperties/{webPropertyId}/customDataSources/{customDataSourceId}/uploads',
-              'httpMethod' => 'POST',
-              'parameters' => array(
-                'accountId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'webPropertyId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'customDataSourceId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),
-          )
-        )
-    );
-    $this->management_webPropertyAdWordsLinks = new Google_Service_Analytics_Resource_ManagementWebPropertyAdWordsLinks(
-        $this,
-        $this->serviceName,
-        'webPropertyAdWordsLinks',
-        array(
-          'methods' => array(
-            'delete' => array(
-              'path' => 'management/accounts/{accountId}/webproperties/{webPropertyId}/entityAdWordsLinks/{webPropertyAdWordsLinkId}',
-              'httpMethod' => 'DELETE',
-              'parameters' => array(
-                'accountId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'webPropertyId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'webPropertyAdWordsLinkId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'get' => array(
-              'path' => 'management/accounts/{accountId}/webproperties/{webPropertyId}/entityAdWordsLinks/{webPropertyAdWordsLinkId}',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'accountId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'webPropertyId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'webPropertyAdWordsLinkId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'insert' => array(
-              'path' => 'management/accounts/{accountId}/webproperties/{webPropertyId}/entityAdWordsLinks',
-              'httpMethod' => 'POST',
-              'parameters' => array(
-                'accountId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'webPropertyId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'list' => array(
-              'path' => 'management/accounts/{accountId}/webproperties/{webPropertyId}/entityAdWordsLinks',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'accountId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'webPropertyId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'max-results' => array(
-                  'location' => 'query',
-                  'type' => 'integer',
-                ),
-                'start-index' => array(
-                  'location' => 'query',
-                  'type' => 'integer',
-                ),
-              ),
-            ),'patch' => array(
-              'path' => 'management/accounts/{accountId}/webproperties/{webPropertyId}/entityAdWordsLinks/{webPropertyAdWordsLinkId}',
-              'httpMethod' => 'PATCH',
-              'parameters' => array(
-                'accountId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'webPropertyId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'webPropertyAdWordsLinkId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'update' => array(
-              'path' => 'management/accounts/{accountId}/webproperties/{webPropertyId}/entityAdWordsLinks/{webPropertyAdWordsLinkId}',
-              'httpMethod' => 'PUT',
-              'parameters' => array(
-                'accountId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'webPropertyId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'webPropertyAdWordsLinkId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),
-          )
-        )
-    );
-    $this->management_webproperties = new Google_Service_Analytics_Resource_ManagementWebproperties(
-        $this,
-        $this->serviceName,
-        'webproperties',
-        array(
-          'methods' => array(
-            'get' => array(
-              'path' => 'management/accounts/{accountId}/webproperties/{webPropertyId}',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'accountId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'webPropertyId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'insert' => array(
-              'path' => 'management/accounts/{accountId}/webproperties',
-              'httpMethod' => 'POST',
-              'parameters' => array(
-                'accountId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'list' => array(
-              'path' => 'management/accounts/{accountId}/webproperties',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'accountId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'max-results' => array(
-                  'location' => 'query',
-                  'type' => 'integer',
-                ),
-                'start-index' => array(
-                  'location' => 'query',
-                  'type' => 'integer',
-                ),
-              ),
-            ),'patch' => array(
-              'path' => 'management/accounts/{accountId}/webproperties/{webPropertyId}',
-              'httpMethod' => 'PATCH',
-              'parameters' => array(
-                'accountId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'webPropertyId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'update' => array(
-              'path' => 'management/accounts/{accountId}/webproperties/{webPropertyId}',
-              'httpMethod' => 'PUT',
-              'parameters' => array(
-                'accountId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'webPropertyId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),
-          )
-        )
-    );
-    $this->management_webpropertyUserLinks = new Google_Service_Analytics_Resource_ManagementWebpropertyUserLinks(
-        $this,
-        $this->serviceName,
-        'webpropertyUserLinks',
-        array(
-          'methods' => array(
-            'delete' => array(
-              'path' => 'management/accounts/{accountId}/webproperties/{webPropertyId}/entityUserLinks/{linkId}',
-              'httpMethod' => 'DELETE',
-              'parameters' => array(
-                'accountId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'webPropertyId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'linkId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'insert' => array(
-              'path' => 'management/accounts/{accountId}/webproperties/{webPropertyId}/entityUserLinks',
-              'httpMethod' => 'POST',
-              'parameters' => array(
-                'accountId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'webPropertyId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'list' => array(
-              'path' => 'management/accounts/{accountId}/webproperties/{webPropertyId}/entityUserLinks',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'accountId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'webPropertyId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'max-results' => array(
-                  'location' => 'query',
-                  'type' => 'integer',
-                ),
-                'start-index' => array(
-                  'location' => 'query',
-                  'type' => 'integer',
-                ),
-              ),
-            ),'update' => array(
-              'path' => 'management/accounts/{accountId}/webproperties/{webPropertyId}/entityUserLinks/{linkId}',
-              'httpMethod' => 'PUT',
-              'parameters' => array(
-                'accountId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'webPropertyId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'linkId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),
-          )
-        )
-    );
-    $this->metadata_columns = new Google_Service_Analytics_Resource_MetadataColumns(
-        $this,
-        $this->serviceName,
-        'columns',
-        array(
-          'methods' => array(
-            'list' => array(
-              'path' => 'metadata/{reportType}/columns',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'reportType' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),
-          )
-        )
-    );
-    $this->provisioning = new Google_Service_Analytics_Resource_Provisioning(
-        $this,
-        $this->serviceName,
-        'provisioning',
-        array(
-          'methods' => array(
-            'createAccountTicket' => array(
-              'path' => 'provisioning/createAccountTicket',
-              'httpMethod' => 'POST',
-              'parameters' => array(),
-            ),
-          )
-        )
-    );
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Analytics/Account.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Analytics/Account.php
deleted file mode 100644
index a6e19b91..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Analytics/Account.php
+++ /dev/null
@@ -1,104 +0,0 @@
-childLink = $childLink;
-  }
-  public function getChildLink()
-  {
-    return $this->childLink;
-  }
-  public function setCreated($created)
-  {
-    $this->created = $created;
-  }
-  public function getCreated()
-  {
-    return $this->created;
-  }
-  public function setId($id)
-  {
-    $this->id = $id;
-  }
-  public function getId()
-  {
-    return $this->id;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setName($name)
-  {
-    $this->name = $name;
-  }
-  public function getName()
-  {
-    return $this->name;
-  }
-  public function setPermissions(Google_Service_Analytics_AccountPermissions $permissions)
-  {
-    $this->permissions = $permissions;
-  }
-  public function getPermissions()
-  {
-    return $this->permissions;
-  }
-  public function setSelfLink($selfLink)
-  {
-    $this->selfLink = $selfLink;
-  }
-  public function getSelfLink()
-  {
-    return $this->selfLink;
-  }
-  public function setStarred($starred)
-  {
-    $this->starred = $starred;
-  }
-  public function getStarred()
-  {
-    return $this->starred;
-  }
-  public function setUpdated($updated)
-  {
-    $this->updated = $updated;
-  }
-  public function getUpdated()
-  {
-    return $this->updated;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Analytics/AccountChildLink.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Analytics/AccountChildLink.php
deleted file mode 100644
index 06eba70b..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Analytics/AccountChildLink.php
+++ /dev/null
@@ -1,39 +0,0 @@
-href = $href;
-  }
-  public function getHref()
-  {
-    return $this->href;
-  }
-  public function setType($type)
-  {
-    $this->type = $type;
-  }
-  public function getType()
-  {
-    return $this->type;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Analytics/AccountPermissions.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Analytics/AccountPermissions.php
deleted file mode 100644
index f2f34830..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Analytics/AccountPermissions.php
+++ /dev/null
@@ -1,31 +0,0 @@
-effective = $effective;
-  }
-  public function getEffective()
-  {
-    return $this->effective;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Analytics/AccountRef.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Analytics/AccountRef.php
deleted file mode 100644
index b43e14e1..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Analytics/AccountRef.php
+++ /dev/null
@@ -1,57 +0,0 @@
-href = $href;
-  }
-  public function getHref()
-  {
-    return $this->href;
-  }
-  public function setId($id)
-  {
-    $this->id = $id;
-  }
-  public function getId()
-  {
-    return $this->id;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setName($name)
-  {
-    $this->name = $name;
-  }
-  public function getName()
-  {
-    return $this->name;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Analytics/AccountSummaries.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Analytics/AccountSummaries.php
deleted file mode 100644
index 0db22975..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Analytics/AccountSummaries.php
+++ /dev/null
@@ -1,95 +0,0 @@
-items = $items;
-  }
-  public function getItems()
-  {
-    return $this->items;
-  }
-  public function setItemsPerPage($itemsPerPage)
-  {
-    $this->itemsPerPage = $itemsPerPage;
-  }
-  public function getItemsPerPage()
-  {
-    return $this->itemsPerPage;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setNextLink($nextLink)
-  {
-    $this->nextLink = $nextLink;
-  }
-  public function getNextLink()
-  {
-    return $this->nextLink;
-  }
-  public function setPreviousLink($previousLink)
-  {
-    $this->previousLink = $previousLink;
-  }
-  public function getPreviousLink()
-  {
-    return $this->previousLink;
-  }
-  public function setStartIndex($startIndex)
-  {
-    $this->startIndex = $startIndex;
-  }
-  public function getStartIndex()
-  {
-    return $this->startIndex;
-  }
-  public function setTotalResults($totalResults)
-  {
-    $this->totalResults = $totalResults;
-  }
-  public function getTotalResults()
-  {
-    return $this->totalResults;
-  }
-  public function setUsername($username)
-  {
-    $this->username = $username;
-  }
-  public function getUsername()
-  {
-    return $this->username;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Analytics/AccountSummary.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Analytics/AccountSummary.php
deleted file mode 100644
index bf938539..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Analytics/AccountSummary.php
+++ /dev/null
@@ -1,68 +0,0 @@
-id = $id;
-  }
-  public function getId()
-  {
-    return $this->id;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setName($name)
-  {
-    $this->name = $name;
-  }
-  public function getName()
-  {
-    return $this->name;
-  }
-  public function setStarred($starred)
-  {
-    $this->starred = $starred;
-  }
-  public function getStarred()
-  {
-    return $this->starred;
-  }
-  public function setWebProperties($webProperties)
-  {
-    $this->webProperties = $webProperties;
-  }
-  public function getWebProperties()
-  {
-    return $this->webProperties;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Analytics/AccountTicket.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Analytics/AccountTicket.php
deleted file mode 100644
index 97bf502f..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Analytics/AccountTicket.php
+++ /dev/null
@@ -1,78 +0,0 @@
-account = $account;
-  }
-  public function getAccount()
-  {
-    return $this->account;
-  }
-  public function setId($id)
-  {
-    $this->id = $id;
-  }
-  public function getId()
-  {
-    return $this->id;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setProfile(Google_Service_Analytics_Profile $profile)
-  {
-    $this->profile = $profile;
-  }
-  public function getProfile()
-  {
-    return $this->profile;
-  }
-  public function setRedirectUri($redirectUri)
-  {
-    $this->redirectUri = $redirectUri;
-  }
-  public function getRedirectUri()
-  {
-    return $this->redirectUri;
-  }
-  public function setWebproperty(Google_Service_Analytics_Webproperty $webproperty)
-  {
-    $this->webproperty = $webproperty;
-  }
-  public function getWebproperty()
-  {
-    return $this->webproperty;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Analytics/Accounts.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Analytics/Accounts.php
deleted file mode 100644
index 1bf59275..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Analytics/Accounts.php
+++ /dev/null
@@ -1,95 +0,0 @@
-items = $items;
-  }
-  public function getItems()
-  {
-    return $this->items;
-  }
-  public function setItemsPerPage($itemsPerPage)
-  {
-    $this->itemsPerPage = $itemsPerPage;
-  }
-  public function getItemsPerPage()
-  {
-    return $this->itemsPerPage;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setNextLink($nextLink)
-  {
-    $this->nextLink = $nextLink;
-  }
-  public function getNextLink()
-  {
-    return $this->nextLink;
-  }
-  public function setPreviousLink($previousLink)
-  {
-    $this->previousLink = $previousLink;
-  }
-  public function getPreviousLink()
-  {
-    return $this->previousLink;
-  }
-  public function setStartIndex($startIndex)
-  {
-    $this->startIndex = $startIndex;
-  }
-  public function getStartIndex()
-  {
-    return $this->startIndex;
-  }
-  public function setTotalResults($totalResults)
-  {
-    $this->totalResults = $totalResults;
-  }
-  public function getTotalResults()
-  {
-    return $this->totalResults;
-  }
-  public function setUsername($username)
-  {
-    $this->username = $username;
-  }
-  public function getUsername()
-  {
-    return $this->username;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Analytics/AdWordsAccount.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Analytics/AdWordsAccount.php
deleted file mode 100644
index e22d7b6c..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Analytics/AdWordsAccount.php
+++ /dev/null
@@ -1,48 +0,0 @@
-autoTaggingEnabled = $autoTaggingEnabled;
-  }
-  public function getAutoTaggingEnabled()
-  {
-    return $this->autoTaggingEnabled;
-  }
-  public function setCustomerId($customerId)
-  {
-    $this->customerId = $customerId;
-  }
-  public function getCustomerId()
-  {
-    return $this->customerId;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Analytics/AnalyticsDataimportDeleteUploadDataRequest.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Analytics/AnalyticsDataimportDeleteUploadDataRequest.php
deleted file mode 100644
index 2bc12a96..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Analytics/AnalyticsDataimportDeleteUploadDataRequest.php
+++ /dev/null
@@ -1,31 +0,0 @@
-customDataImportUids = $customDataImportUids;
-  }
-  public function getCustomDataImportUids()
-  {
-    return $this->customDataImportUids;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Analytics/Column.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Analytics/Column.php
deleted file mode 100644
index a620de65..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Analytics/Column.php
+++ /dev/null
@@ -1,48 +0,0 @@
-attributes = $attributes;
-  }
-  public function getAttributes()
-  {
-    return $this->attributes;
-  }
-  public function setId($id)
-  {
-    $this->id = $id;
-  }
-  public function getId()
-  {
-    return $this->id;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Analytics/Columns.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Analytics/Columns.php
deleted file mode 100644
index 1dda1cad..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Analytics/Columns.php
+++ /dev/null
@@ -1,68 +0,0 @@
-attributeNames = $attributeNames;
-  }
-  public function getAttributeNames()
-  {
-    return $this->attributeNames;
-  }
-  public function setEtag($etag)
-  {
-    $this->etag = $etag;
-  }
-  public function getEtag()
-  {
-    return $this->etag;
-  }
-  public function setItems($items)
-  {
-    $this->items = $items;
-  }
-  public function getItems()
-  {
-    return $this->items;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setTotalResults($totalResults)
-  {
-    $this->totalResults = $totalResults;
-  }
-  public function getTotalResults()
-  {
-    return $this->totalResults;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Analytics/CustomDataSource.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Analytics/CustomDataSource.php
deleted file mode 100644
index cf04ad16..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Analytics/CustomDataSource.php
+++ /dev/null
@@ -1,159 +0,0 @@
-accountId = $accountId;
-  }
-  public function getAccountId()
-  {
-    return $this->accountId;
-  }
-  public function setChildLink(Google_Service_Analytics_CustomDataSourceChildLink $childLink)
-  {
-    $this->childLink = $childLink;
-  }
-  public function getChildLink()
-  {
-    return $this->childLink;
-  }
-  public function setCreated($created)
-  {
-    $this->created = $created;
-  }
-  public function getCreated()
-  {
-    return $this->created;
-  }
-  public function setDescription($description)
-  {
-    $this->description = $description;
-  }
-  public function getDescription()
-  {
-    return $this->description;
-  }
-  public function setId($id)
-  {
-    $this->id = $id;
-  }
-  public function getId()
-  {
-    return $this->id;
-  }
-  public function setImportBehavior($importBehavior)
-  {
-    $this->importBehavior = $importBehavior;
-  }
-  public function getImportBehavior()
-  {
-    return $this->importBehavior;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setName($name)
-  {
-    $this->name = $name;
-  }
-  public function getName()
-  {
-    return $this->name;
-  }
-  public function setParentLink(Google_Service_Analytics_CustomDataSourceParentLink $parentLink)
-  {
-    $this->parentLink = $parentLink;
-  }
-  public function getParentLink()
-  {
-    return $this->parentLink;
-  }
-  public function setProfilesLinked($profilesLinked)
-  {
-    $this->profilesLinked = $profilesLinked;
-  }
-  public function getProfilesLinked()
-  {
-    return $this->profilesLinked;
-  }
-  public function setSelfLink($selfLink)
-  {
-    $this->selfLink = $selfLink;
-  }
-  public function getSelfLink()
-  {
-    return $this->selfLink;
-  }
-  public function setType($type)
-  {
-    $this->type = $type;
-  }
-  public function getType()
-  {
-    return $this->type;
-  }
-  public function setUpdated($updated)
-  {
-    $this->updated = $updated;
-  }
-  public function getUpdated()
-  {
-    return $this->updated;
-  }
-  public function setUploadType($uploadType)
-  {
-    $this->uploadType = $uploadType;
-  }
-  public function getUploadType()
-  {
-    return $this->uploadType;
-  }
-  public function setWebPropertyId($webPropertyId)
-  {
-    $this->webPropertyId = $webPropertyId;
-  }
-  public function getWebPropertyId()
-  {
-    return $this->webPropertyId;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Analytics/CustomDataSourceChildLink.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Analytics/CustomDataSourceChildLink.php
deleted file mode 100644
index 3de24017..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Analytics/CustomDataSourceChildLink.php
+++ /dev/null
@@ -1,39 +0,0 @@
-href = $href;
-  }
-  public function getHref()
-  {
-    return $this->href;
-  }
-  public function setType($type)
-  {
-    $this->type = $type;
-  }
-  public function getType()
-  {
-    return $this->type;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Analytics/CustomDataSourceParentLink.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Analytics/CustomDataSourceParentLink.php
deleted file mode 100644
index 812076df..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Analytics/CustomDataSourceParentLink.php
+++ /dev/null
@@ -1,39 +0,0 @@
-href = $href;
-  }
-  public function getHref()
-  {
-    return $this->href;
-  }
-  public function setType($type)
-  {
-    $this->type = $type;
-  }
-  public function getType()
-  {
-    return $this->type;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Analytics/CustomDataSources.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Analytics/CustomDataSources.php
deleted file mode 100644
index b767ee8e..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Analytics/CustomDataSources.php
+++ /dev/null
@@ -1,95 +0,0 @@
-items = $items;
-  }
-  public function getItems()
-  {
-    return $this->items;
-  }
-  public function setItemsPerPage($itemsPerPage)
-  {
-    $this->itemsPerPage = $itemsPerPage;
-  }
-  public function getItemsPerPage()
-  {
-    return $this->itemsPerPage;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setNextLink($nextLink)
-  {
-    $this->nextLink = $nextLink;
-  }
-  public function getNextLink()
-  {
-    return $this->nextLink;
-  }
-  public function setPreviousLink($previousLink)
-  {
-    $this->previousLink = $previousLink;
-  }
-  public function getPreviousLink()
-  {
-    return $this->previousLink;
-  }
-  public function setStartIndex($startIndex)
-  {
-    $this->startIndex = $startIndex;
-  }
-  public function getStartIndex()
-  {
-    return $this->startIndex;
-  }
-  public function setTotalResults($totalResults)
-  {
-    $this->totalResults = $totalResults;
-  }
-  public function getTotalResults()
-  {
-    return $this->totalResults;
-  }
-  public function setUsername($username)
-  {
-    $this->username = $username;
-  }
-  public function getUsername()
-  {
-    return $this->username;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Analytics/CustomDimension.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Analytics/CustomDimension.php
deleted file mode 100644
index f95183f7..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Analytics/CustomDimension.php
+++ /dev/null
@@ -1,130 +0,0 @@
-accountId = $accountId;
-  }
-  public function getAccountId()
-  {
-    return $this->accountId;
-  }
-  public function setActive($active)
-  {
-    $this->active = $active;
-  }
-  public function getActive()
-  {
-    return $this->active;
-  }
-  public function setCreated($created)
-  {
-    $this->created = $created;
-  }
-  public function getCreated()
-  {
-    return $this->created;
-  }
-  public function setId($id)
-  {
-    $this->id = $id;
-  }
-  public function getId()
-  {
-    return $this->id;
-  }
-  public function setIndex($index)
-  {
-    $this->index = $index;
-  }
-  public function getIndex()
-  {
-    return $this->index;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setName($name)
-  {
-    $this->name = $name;
-  }
-  public function getName()
-  {
-    return $this->name;
-  }
-  public function setParentLink(Google_Service_Analytics_CustomDimensionParentLink $parentLink)
-  {
-    $this->parentLink = $parentLink;
-  }
-  public function getParentLink()
-  {
-    return $this->parentLink;
-  }
-  public function setScope($scope)
-  {
-    $this->scope = $scope;
-  }
-  public function getScope()
-  {
-    return $this->scope;
-  }
-  public function setSelfLink($selfLink)
-  {
-    $this->selfLink = $selfLink;
-  }
-  public function getSelfLink()
-  {
-    return $this->selfLink;
-  }
-  public function setUpdated($updated)
-  {
-    $this->updated = $updated;
-  }
-  public function getUpdated()
-  {
-    return $this->updated;
-  }
-  public function setWebPropertyId($webPropertyId)
-  {
-    $this->webPropertyId = $webPropertyId;
-  }
-  public function getWebPropertyId()
-  {
-    return $this->webPropertyId;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Analytics/CustomDimensionParentLink.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Analytics/CustomDimensionParentLink.php
deleted file mode 100644
index d64a579f..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Analytics/CustomDimensionParentLink.php
+++ /dev/null
@@ -1,39 +0,0 @@
-href = $href;
-  }
-  public function getHref()
-  {
-    return $this->href;
-  }
-  public function setType($type)
-  {
-    $this->type = $type;
-  }
-  public function getType()
-  {
-    return $this->type;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Analytics/CustomDimensions.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Analytics/CustomDimensions.php
deleted file mode 100644
index 548831d9..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Analytics/CustomDimensions.php
+++ /dev/null
@@ -1,95 +0,0 @@
-items = $items;
-  }
-  public function getItems()
-  {
-    return $this->items;
-  }
-  public function setItemsPerPage($itemsPerPage)
-  {
-    $this->itemsPerPage = $itemsPerPage;
-  }
-  public function getItemsPerPage()
-  {
-    return $this->itemsPerPage;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setNextLink($nextLink)
-  {
-    $this->nextLink = $nextLink;
-  }
-  public function getNextLink()
-  {
-    return $this->nextLink;
-  }
-  public function setPreviousLink($previousLink)
-  {
-    $this->previousLink = $previousLink;
-  }
-  public function getPreviousLink()
-  {
-    return $this->previousLink;
-  }
-  public function setStartIndex($startIndex)
-  {
-    $this->startIndex = $startIndex;
-  }
-  public function getStartIndex()
-  {
-    return $this->startIndex;
-  }
-  public function setTotalResults($totalResults)
-  {
-    $this->totalResults = $totalResults;
-  }
-  public function getTotalResults()
-  {
-    return $this->totalResults;
-  }
-  public function setUsername($username)
-  {
-    $this->username = $username;
-  }
-  public function getUsername()
-  {
-    return $this->username;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Analytics/CustomMetric.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Analytics/CustomMetric.php
deleted file mode 100644
index 9e11209b..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Analytics/CustomMetric.php
+++ /dev/null
@@ -1,161 +0,0 @@
- "max_value",
-        "minValue" => "min_value",
-  );
-  public $accountId;
-  public $active;
-  public $created;
-  public $id;
-  public $index;
-  public $kind;
-  public $maxValue;
-  public $minValue;
-  public $name;
-  protected $parentLinkType = 'Google_Service_Analytics_CustomMetricParentLink';
-  protected $parentLinkDataType = '';
-  public $scope;
-  public $selfLink;
-  public $type;
-  public $updated;
-  public $webPropertyId;
-
-  public function setAccountId($accountId)
-  {
-    $this->accountId = $accountId;
-  }
-  public function getAccountId()
-  {
-    return $this->accountId;
-  }
-  public function setActive($active)
-  {
-    $this->active = $active;
-  }
-  public function getActive()
-  {
-    return $this->active;
-  }
-  public function setCreated($created)
-  {
-    $this->created = $created;
-  }
-  public function getCreated()
-  {
-    return $this->created;
-  }
-  public function setId($id)
-  {
-    $this->id = $id;
-  }
-  public function getId()
-  {
-    return $this->id;
-  }
-  public function setIndex($index)
-  {
-    $this->index = $index;
-  }
-  public function getIndex()
-  {
-    return $this->index;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setMaxValue($maxValue)
-  {
-    $this->maxValue = $maxValue;
-  }
-  public function getMaxValue()
-  {
-    return $this->maxValue;
-  }
-  public function setMinValue($minValue)
-  {
-    $this->minValue = $minValue;
-  }
-  public function getMinValue()
-  {
-    return $this->minValue;
-  }
-  public function setName($name)
-  {
-    $this->name = $name;
-  }
-  public function getName()
-  {
-    return $this->name;
-  }
-  public function setParentLink(Google_Service_Analytics_CustomMetricParentLink $parentLink)
-  {
-    $this->parentLink = $parentLink;
-  }
-  public function getParentLink()
-  {
-    return $this->parentLink;
-  }
-  public function setScope($scope)
-  {
-    $this->scope = $scope;
-  }
-  public function getScope()
-  {
-    return $this->scope;
-  }
-  public function setSelfLink($selfLink)
-  {
-    $this->selfLink = $selfLink;
-  }
-  public function getSelfLink()
-  {
-    return $this->selfLink;
-  }
-  public function setType($type)
-  {
-    $this->type = $type;
-  }
-  public function getType()
-  {
-    return $this->type;
-  }
-  public function setUpdated($updated)
-  {
-    $this->updated = $updated;
-  }
-  public function getUpdated()
-  {
-    return $this->updated;
-  }
-  public function setWebPropertyId($webPropertyId)
-  {
-    $this->webPropertyId = $webPropertyId;
-  }
-  public function getWebPropertyId()
-  {
-    return $this->webPropertyId;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Analytics/CustomMetricParentLink.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Analytics/CustomMetricParentLink.php
deleted file mode 100644
index 14f4ea6a..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Analytics/CustomMetricParentLink.php
+++ /dev/null
@@ -1,39 +0,0 @@
-href = $href;
-  }
-  public function getHref()
-  {
-    return $this->href;
-  }
-  public function setType($type)
-  {
-    $this->type = $type;
-  }
-  public function getType()
-  {
-    return $this->type;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Analytics/CustomMetrics.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Analytics/CustomMetrics.php
deleted file mode 100644
index c9758870..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Analytics/CustomMetrics.php
+++ /dev/null
@@ -1,95 +0,0 @@
-items = $items;
-  }
-  public function getItems()
-  {
-    return $this->items;
-  }
-  public function setItemsPerPage($itemsPerPage)
-  {
-    $this->itemsPerPage = $itemsPerPage;
-  }
-  public function getItemsPerPage()
-  {
-    return $this->itemsPerPage;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setNextLink($nextLink)
-  {
-    $this->nextLink = $nextLink;
-  }
-  public function getNextLink()
-  {
-    return $this->nextLink;
-  }
-  public function setPreviousLink($previousLink)
-  {
-    $this->previousLink = $previousLink;
-  }
-  public function getPreviousLink()
-  {
-    return $this->previousLink;
-  }
-  public function setStartIndex($startIndex)
-  {
-    $this->startIndex = $startIndex;
-  }
-  public function getStartIndex()
-  {
-    return $this->startIndex;
-  }
-  public function setTotalResults($totalResults)
-  {
-    $this->totalResults = $totalResults;
-  }
-  public function getTotalResults()
-  {
-    return $this->totalResults;
-  }
-  public function setUsername($username)
-  {
-    $this->username = $username;
-  }
-  public function getUsername()
-  {
-    return $this->username;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Analytics/EntityAdWordsLink.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Analytics/EntityAdWordsLink.php
deleted file mode 100644
index aae8010f..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Analytics/EntityAdWordsLink.php
+++ /dev/null
@@ -1,87 +0,0 @@
-adWordsAccounts = $adWordsAccounts;
-  }
-  public function getAdWordsAccounts()
-  {
-    return $this->adWordsAccounts;
-  }
-  public function setEntity(Google_Service_Analytics_EntityAdWordsLinkEntity $entity)
-  {
-    $this->entity = $entity;
-  }
-  public function getEntity()
-  {
-    return $this->entity;
-  }
-  public function setId($id)
-  {
-    $this->id = $id;
-  }
-  public function getId()
-  {
-    return $this->id;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setName($name)
-  {
-    $this->name = $name;
-  }
-  public function getName()
-  {
-    return $this->name;
-  }
-  public function setProfileIds($profileIds)
-  {
-    $this->profileIds = $profileIds;
-  }
-  public function getProfileIds()
-  {
-    return $this->profileIds;
-  }
-  public function setSelfLink($selfLink)
-  {
-    $this->selfLink = $selfLink;
-  }
-  public function getSelfLink()
-  {
-    return $this->selfLink;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Analytics/EntityAdWordsLinkEntity.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Analytics/EntityAdWordsLinkEntity.php
deleted file mode 100644
index e73e2dac..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Analytics/EntityAdWordsLinkEntity.php
+++ /dev/null
@@ -1,31 +0,0 @@
-webPropertyRef = $webPropertyRef;
-  }
-  public function getWebPropertyRef()
-  {
-    return $this->webPropertyRef;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Analytics/EntityAdWordsLinks.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Analytics/EntityAdWordsLinks.php
deleted file mode 100644
index 8f93d27a..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Analytics/EntityAdWordsLinks.php
+++ /dev/null
@@ -1,86 +0,0 @@
-items = $items;
-  }
-  public function getItems()
-  {
-    return $this->items;
-  }
-  public function setItemsPerPage($itemsPerPage)
-  {
-    $this->itemsPerPage = $itemsPerPage;
-  }
-  public function getItemsPerPage()
-  {
-    return $this->itemsPerPage;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setNextLink($nextLink)
-  {
-    $this->nextLink = $nextLink;
-  }
-  public function getNextLink()
-  {
-    return $this->nextLink;
-  }
-  public function setPreviousLink($previousLink)
-  {
-    $this->previousLink = $previousLink;
-  }
-  public function getPreviousLink()
-  {
-    return $this->previousLink;
-  }
-  public function setStartIndex($startIndex)
-  {
-    $this->startIndex = $startIndex;
-  }
-  public function getStartIndex()
-  {
-    return $this->startIndex;
-  }
-  public function setTotalResults($totalResults)
-  {
-    $this->totalResults = $totalResults;
-  }
-  public function getTotalResults()
-  {
-    return $this->totalResults;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Analytics/EntityUserLink.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Analytics/EntityUserLink.php
deleted file mode 100644
index 6edfa12f..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Analytics/EntityUserLink.php
+++ /dev/null
@@ -1,78 +0,0 @@
-entity = $entity;
-  }
-  public function getEntity()
-  {
-    return $this->entity;
-  }
-  public function setId($id)
-  {
-    $this->id = $id;
-  }
-  public function getId()
-  {
-    return $this->id;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setPermissions(Google_Service_Analytics_EntityUserLinkPermissions $permissions)
-  {
-    $this->permissions = $permissions;
-  }
-  public function getPermissions()
-  {
-    return $this->permissions;
-  }
-  public function setSelfLink($selfLink)
-  {
-    $this->selfLink = $selfLink;
-  }
-  public function getSelfLink()
-  {
-    return $this->selfLink;
-  }
-  public function setUserRef(Google_Service_Analytics_UserRef $userRef)
-  {
-    $this->userRef = $userRef;
-  }
-  public function getUserRef()
-  {
-    return $this->userRef;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Analytics/EntityUserLinkEntity.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Analytics/EntityUserLinkEntity.php
deleted file mode 100644
index acae39c9..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Analytics/EntityUserLinkEntity.php
+++ /dev/null
@@ -1,51 +0,0 @@
-accountRef = $accountRef;
-  }
-  public function getAccountRef()
-  {
-    return $this->accountRef;
-  }
-  public function setProfileRef(Google_Service_Analytics_ProfileRef $profileRef)
-  {
-    $this->profileRef = $profileRef;
-  }
-  public function getProfileRef()
-  {
-    return $this->profileRef;
-  }
-  public function setWebPropertyRef(Google_Service_Analytics_WebPropertyRef $webPropertyRef)
-  {
-    $this->webPropertyRef = $webPropertyRef;
-  }
-  public function getWebPropertyRef()
-  {
-    return $this->webPropertyRef;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Analytics/EntityUserLinkPermissions.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Analytics/EntityUserLinkPermissions.php
deleted file mode 100644
index 3222e94a..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Analytics/EntityUserLinkPermissions.php
+++ /dev/null
@@ -1,40 +0,0 @@
-effective = $effective;
-  }
-  public function getEffective()
-  {
-    return $this->effective;
-  }
-  public function setLocal($local)
-  {
-    $this->local = $local;
-  }
-  public function getLocal()
-  {
-    return $this->local;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Analytics/EntityUserLinks.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Analytics/EntityUserLinks.php
deleted file mode 100644
index 81cbefde..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Analytics/EntityUserLinks.php
+++ /dev/null
@@ -1,86 +0,0 @@
-items = $items;
-  }
-  public function getItems()
-  {
-    return $this->items;
-  }
-  public function setItemsPerPage($itemsPerPage)
-  {
-    $this->itemsPerPage = $itemsPerPage;
-  }
-  public function getItemsPerPage()
-  {
-    return $this->itemsPerPage;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setNextLink($nextLink)
-  {
-    $this->nextLink = $nextLink;
-  }
-  public function getNextLink()
-  {
-    return $this->nextLink;
-  }
-  public function setPreviousLink($previousLink)
-  {
-    $this->previousLink = $previousLink;
-  }
-  public function getPreviousLink()
-  {
-    return $this->previousLink;
-  }
-  public function setStartIndex($startIndex)
-  {
-    $this->startIndex = $startIndex;
-  }
-  public function getStartIndex()
-  {
-    return $this->startIndex;
-  }
-  public function setTotalResults($totalResults)
-  {
-    $this->totalResults = $totalResults;
-  }
-  public function getTotalResults()
-  {
-    return $this->totalResults;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Analytics/Experiment.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Analytics/Experiment.php
deleted file mode 100644
index ef28448e..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Analytics/Experiment.php
+++ /dev/null
@@ -1,276 +0,0 @@
-accountId = $accountId;
-  }
-  public function getAccountId()
-  {
-    return $this->accountId;
-  }
-  public function setCreated($created)
-  {
-    $this->created = $created;
-  }
-  public function getCreated()
-  {
-    return $this->created;
-  }
-  public function setDescription($description)
-  {
-    $this->description = $description;
-  }
-  public function getDescription()
-  {
-    return $this->description;
-  }
-  public function setEditableInGaUi($editableInGaUi)
-  {
-    $this->editableInGaUi = $editableInGaUi;
-  }
-  public function getEditableInGaUi()
-  {
-    return $this->editableInGaUi;
-  }
-  public function setEndTime($endTime)
-  {
-    $this->endTime = $endTime;
-  }
-  public function getEndTime()
-  {
-    return $this->endTime;
-  }
-  public function setEqualWeighting($equalWeighting)
-  {
-    $this->equalWeighting = $equalWeighting;
-  }
-  public function getEqualWeighting()
-  {
-    return $this->equalWeighting;
-  }
-  public function setId($id)
-  {
-    $this->id = $id;
-  }
-  public function getId()
-  {
-    return $this->id;
-  }
-  public function setInternalWebPropertyId($internalWebPropertyId)
-  {
-    $this->internalWebPropertyId = $internalWebPropertyId;
-  }
-  public function getInternalWebPropertyId()
-  {
-    return $this->internalWebPropertyId;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setMinimumExperimentLengthInDays($minimumExperimentLengthInDays)
-  {
-    $this->minimumExperimentLengthInDays = $minimumExperimentLengthInDays;
-  }
-  public function getMinimumExperimentLengthInDays()
-  {
-    return $this->minimumExperimentLengthInDays;
-  }
-  public function setName($name)
-  {
-    $this->name = $name;
-  }
-  public function getName()
-  {
-    return $this->name;
-  }
-  public function setObjectiveMetric($objectiveMetric)
-  {
-    $this->objectiveMetric = $objectiveMetric;
-  }
-  public function getObjectiveMetric()
-  {
-    return $this->objectiveMetric;
-  }
-  public function setOptimizationType($optimizationType)
-  {
-    $this->optimizationType = $optimizationType;
-  }
-  public function getOptimizationType()
-  {
-    return $this->optimizationType;
-  }
-  public function setParentLink(Google_Service_Analytics_ExperimentParentLink $parentLink)
-  {
-    $this->parentLink = $parentLink;
-  }
-  public function getParentLink()
-  {
-    return $this->parentLink;
-  }
-  public function setProfileId($profileId)
-  {
-    $this->profileId = $profileId;
-  }
-  public function getProfileId()
-  {
-    return $this->profileId;
-  }
-  public function setReasonExperimentEnded($reasonExperimentEnded)
-  {
-    $this->reasonExperimentEnded = $reasonExperimentEnded;
-  }
-  public function getReasonExperimentEnded()
-  {
-    return $this->reasonExperimentEnded;
-  }
-  public function setRewriteVariationUrlsAsOriginal($rewriteVariationUrlsAsOriginal)
-  {
-    $this->rewriteVariationUrlsAsOriginal = $rewriteVariationUrlsAsOriginal;
-  }
-  public function getRewriteVariationUrlsAsOriginal()
-  {
-    return $this->rewriteVariationUrlsAsOriginal;
-  }
-  public function setSelfLink($selfLink)
-  {
-    $this->selfLink = $selfLink;
-  }
-  public function getSelfLink()
-  {
-    return $this->selfLink;
-  }
-  public function setServingFramework($servingFramework)
-  {
-    $this->servingFramework = $servingFramework;
-  }
-  public function getServingFramework()
-  {
-    return $this->servingFramework;
-  }
-  public function setSnippet($snippet)
-  {
-    $this->snippet = $snippet;
-  }
-  public function getSnippet()
-  {
-    return $this->snippet;
-  }
-  public function setStartTime($startTime)
-  {
-    $this->startTime = $startTime;
-  }
-  public function getStartTime()
-  {
-    return $this->startTime;
-  }
-  public function setStatus($status)
-  {
-    $this->status = $status;
-  }
-  public function getStatus()
-  {
-    return $this->status;
-  }
-  public function setTrafficCoverage($trafficCoverage)
-  {
-    $this->trafficCoverage = $trafficCoverage;
-  }
-  public function getTrafficCoverage()
-  {
-    return $this->trafficCoverage;
-  }
-  public function setUpdated($updated)
-  {
-    $this->updated = $updated;
-  }
-  public function getUpdated()
-  {
-    return $this->updated;
-  }
-  public function setVariations($variations)
-  {
-    $this->variations = $variations;
-  }
-  public function getVariations()
-  {
-    return $this->variations;
-  }
-  public function setWebPropertyId($webPropertyId)
-  {
-    $this->webPropertyId = $webPropertyId;
-  }
-  public function getWebPropertyId()
-  {
-    return $this->webPropertyId;
-  }
-  public function setWinnerConfidenceLevel($winnerConfidenceLevel)
-  {
-    $this->winnerConfidenceLevel = $winnerConfidenceLevel;
-  }
-  public function getWinnerConfidenceLevel()
-  {
-    return $this->winnerConfidenceLevel;
-  }
-  public function setWinnerFound($winnerFound)
-  {
-    $this->winnerFound = $winnerFound;
-  }
-  public function getWinnerFound()
-  {
-    return $this->winnerFound;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Analytics/ExperimentParentLink.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Analytics/ExperimentParentLink.php
deleted file mode 100644
index bffe8ef6..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Analytics/ExperimentParentLink.php
+++ /dev/null
@@ -1,39 +0,0 @@
-href = $href;
-  }
-  public function getHref()
-  {
-    return $this->href;
-  }
-  public function setType($type)
-  {
-    $this->type = $type;
-  }
-  public function getType()
-  {
-    return $this->type;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Analytics/ExperimentVariations.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Analytics/ExperimentVariations.php
deleted file mode 100644
index a5d8128a..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Analytics/ExperimentVariations.php
+++ /dev/null
@@ -1,66 +0,0 @@
-name = $name;
-  }
-  public function getName()
-  {
-    return $this->name;
-  }
-  public function setStatus($status)
-  {
-    $this->status = $status;
-  }
-  public function getStatus()
-  {
-    return $this->status;
-  }
-  public function setUrl($url)
-  {
-    $this->url = $url;
-  }
-  public function getUrl()
-  {
-    return $this->url;
-  }
-  public function setWeight($weight)
-  {
-    $this->weight = $weight;
-  }
-  public function getWeight()
-  {
-    return $this->weight;
-  }
-  public function setWon($won)
-  {
-    $this->won = $won;
-  }
-  public function getWon()
-  {
-    return $this->won;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Analytics/Experiments.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Analytics/Experiments.php
deleted file mode 100644
index 27936f61..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Analytics/Experiments.php
+++ /dev/null
@@ -1,95 +0,0 @@
-items = $items;
-  }
-  public function getItems()
-  {
-    return $this->items;
-  }
-  public function setItemsPerPage($itemsPerPage)
-  {
-    $this->itemsPerPage = $itemsPerPage;
-  }
-  public function getItemsPerPage()
-  {
-    return $this->itemsPerPage;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setNextLink($nextLink)
-  {
-    $this->nextLink = $nextLink;
-  }
-  public function getNextLink()
-  {
-    return $this->nextLink;
-  }
-  public function setPreviousLink($previousLink)
-  {
-    $this->previousLink = $previousLink;
-  }
-  public function getPreviousLink()
-  {
-    return $this->previousLink;
-  }
-  public function setStartIndex($startIndex)
-  {
-    $this->startIndex = $startIndex;
-  }
-  public function getStartIndex()
-  {
-    return $this->startIndex;
-  }
-  public function setTotalResults($totalResults)
-  {
-    $this->totalResults = $totalResults;
-  }
-  public function getTotalResults()
-  {
-    return $this->totalResults;
-  }
-  public function setUsername($username)
-  {
-    $this->username = $username;
-  }
-  public function getUsername()
-  {
-    return $this->username;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Analytics/Filter.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Analytics/Filter.php
deleted file mode 100644
index 3a43445d..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Analytics/Filter.php
+++ /dev/null
@@ -1,163 +0,0 @@
-accountId = $accountId;
-  }
-  public function getAccountId()
-  {
-    return $this->accountId;
-  }
-  public function setAdvancedDetails(Google_Service_Analytics_FilterAdvancedDetails $advancedDetails)
-  {
-    $this->advancedDetails = $advancedDetails;
-  }
-  public function getAdvancedDetails()
-  {
-    return $this->advancedDetails;
-  }
-  public function setCreated($created)
-  {
-    $this->created = $created;
-  }
-  public function getCreated()
-  {
-    return $this->created;
-  }
-  public function setExcludeDetails(Google_Service_Analytics_FilterExpression $excludeDetails)
-  {
-    $this->excludeDetails = $excludeDetails;
-  }
-  public function getExcludeDetails()
-  {
-    return $this->excludeDetails;
-  }
-  public function setId($id)
-  {
-    $this->id = $id;
-  }
-  public function getId()
-  {
-    return $this->id;
-  }
-  public function setIncludeDetails(Google_Service_Analytics_FilterExpression $includeDetails)
-  {
-    $this->includeDetails = $includeDetails;
-  }
-  public function getIncludeDetails()
-  {
-    return $this->includeDetails;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setLowercaseDetails(Google_Service_Analytics_FilterLowercaseDetails $lowercaseDetails)
-  {
-    $this->lowercaseDetails = $lowercaseDetails;
-  }
-  public function getLowercaseDetails()
-  {
-    return $this->lowercaseDetails;
-  }
-  public function setName($name)
-  {
-    $this->name = $name;
-  }
-  public function getName()
-  {
-    return $this->name;
-  }
-  public function setParentLink(Google_Service_Analytics_FilterParentLink $parentLink)
-  {
-    $this->parentLink = $parentLink;
-  }
-  public function getParentLink()
-  {
-    return $this->parentLink;
-  }
-  public function setSearchAndReplaceDetails(Google_Service_Analytics_FilterSearchAndReplaceDetails $searchAndReplaceDetails)
-  {
-    $this->searchAndReplaceDetails = $searchAndReplaceDetails;
-  }
-  public function getSearchAndReplaceDetails()
-  {
-    return $this->searchAndReplaceDetails;
-  }
-  public function setSelfLink($selfLink)
-  {
-    $this->selfLink = $selfLink;
-  }
-  public function getSelfLink()
-  {
-    return $this->selfLink;
-  }
-  public function setType($type)
-  {
-    $this->type = $type;
-  }
-  public function getType()
-  {
-    return $this->type;
-  }
-  public function setUpdated($updated)
-  {
-    $this->updated = $updated;
-  }
-  public function getUpdated()
-  {
-    return $this->updated;
-  }
-  public function setUppercaseDetails(Google_Service_Analytics_FilterUppercaseDetails $uppercaseDetails)
-  {
-    $this->uppercaseDetails = $uppercaseDetails;
-  }
-  public function getUppercaseDetails()
-  {
-    return $this->uppercaseDetails;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Analytics/FilterAdvancedDetails.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Analytics/FilterAdvancedDetails.php
deleted file mode 100644
index a7ef11f0..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Analytics/FilterAdvancedDetails.php
+++ /dev/null
@@ -1,138 +0,0 @@
-caseSensitive = $caseSensitive;
-  }
-  public function getCaseSensitive()
-  {
-    return $this->caseSensitive;
-  }
-  public function setExtractA($extractA)
-  {
-    $this->extractA = $extractA;
-  }
-  public function getExtractA()
-  {
-    return $this->extractA;
-  }
-  public function setExtractB($extractB)
-  {
-    $this->extractB = $extractB;
-  }
-  public function getExtractB()
-  {
-    return $this->extractB;
-  }
-  public function setFieldA($fieldA)
-  {
-    $this->fieldA = $fieldA;
-  }
-  public function getFieldA()
-  {
-    return $this->fieldA;
-  }
-  public function setFieldAIndex($fieldAIndex)
-  {
-    $this->fieldAIndex = $fieldAIndex;
-  }
-  public function getFieldAIndex()
-  {
-    return $this->fieldAIndex;
-  }
-  public function setFieldARequired($fieldARequired)
-  {
-    $this->fieldARequired = $fieldARequired;
-  }
-  public function getFieldARequired()
-  {
-    return $this->fieldARequired;
-  }
-  public function setFieldB($fieldB)
-  {
-    $this->fieldB = $fieldB;
-  }
-  public function getFieldB()
-  {
-    return $this->fieldB;
-  }
-  public function setFieldBIndex($fieldBIndex)
-  {
-    $this->fieldBIndex = $fieldBIndex;
-  }
-  public function getFieldBIndex()
-  {
-    return $this->fieldBIndex;
-  }
-  public function setFieldBRequired($fieldBRequired)
-  {
-    $this->fieldBRequired = $fieldBRequired;
-  }
-  public function getFieldBRequired()
-  {
-    return $this->fieldBRequired;
-  }
-  public function setOutputConstructor($outputConstructor)
-  {
-    $this->outputConstructor = $outputConstructor;
-  }
-  public function getOutputConstructor()
-  {
-    return $this->outputConstructor;
-  }
-  public function setOutputToField($outputToField)
-  {
-    $this->outputToField = $outputToField;
-  }
-  public function getOutputToField()
-  {
-    return $this->outputToField;
-  }
-  public function setOutputToFieldIndex($outputToFieldIndex)
-  {
-    $this->outputToFieldIndex = $outputToFieldIndex;
-  }
-  public function getOutputToFieldIndex()
-  {
-    return $this->outputToFieldIndex;
-  }
-  public function setOverrideOutputField($overrideOutputField)
-  {
-    $this->overrideOutputField = $overrideOutputField;
-  }
-  public function getOverrideOutputField()
-  {
-    return $this->overrideOutputField;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Analytics/FilterExpression.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Analytics/FilterExpression.php
deleted file mode 100644
index 2270c654..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Analytics/FilterExpression.php
+++ /dev/null
@@ -1,75 +0,0 @@
-caseSensitive = $caseSensitive;
-  }
-  public function getCaseSensitive()
-  {
-    return $this->caseSensitive;
-  }
-  public function setExpressionValue($expressionValue)
-  {
-    $this->expressionValue = $expressionValue;
-  }
-  public function getExpressionValue()
-  {
-    return $this->expressionValue;
-  }
-  public function setField($field)
-  {
-    $this->field = $field;
-  }
-  public function getField()
-  {
-    return $this->field;
-  }
-  public function setFieldIndex($fieldIndex)
-  {
-    $this->fieldIndex = $fieldIndex;
-  }
-  public function getFieldIndex()
-  {
-    return $this->fieldIndex;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setMatchType($matchType)
-  {
-    $this->matchType = $matchType;
-  }
-  public function getMatchType()
-  {
-    return $this->matchType;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Analytics/FilterLowercaseDetails.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Analytics/FilterLowercaseDetails.php
deleted file mode 100644
index 0e929524..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Analytics/FilterLowercaseDetails.php
+++ /dev/null
@@ -1,39 +0,0 @@
-field = $field;
-  }
-  public function getField()
-  {
-    return $this->field;
-  }
-  public function setFieldIndex($fieldIndex)
-  {
-    $this->fieldIndex = $fieldIndex;
-  }
-  public function getFieldIndex()
-  {
-    return $this->fieldIndex;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Analytics/FilterParentLink.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Analytics/FilterParentLink.php
deleted file mode 100644
index 14663d3e..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Analytics/FilterParentLink.php
+++ /dev/null
@@ -1,39 +0,0 @@
-href = $href;
-  }
-  public function getHref()
-  {
-    return $this->href;
-  }
-  public function setType($type)
-  {
-    $this->type = $type;
-  }
-  public function getType()
-  {
-    return $this->type;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Analytics/FilterRef.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Analytics/FilterRef.php
deleted file mode 100644
index 1a594e67..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Analytics/FilterRef.php
+++ /dev/null
@@ -1,66 +0,0 @@
-accountId = $accountId;
-  }
-  public function getAccountId()
-  {
-    return $this->accountId;
-  }
-  public function setHref($href)
-  {
-    $this->href = $href;
-  }
-  public function getHref()
-  {
-    return $this->href;
-  }
-  public function setId($id)
-  {
-    $this->id = $id;
-  }
-  public function getId()
-  {
-    return $this->id;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setName($name)
-  {
-    $this->name = $name;
-  }
-  public function getName()
-  {
-    return $this->name;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Analytics/FilterSearchAndReplaceDetails.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Analytics/FilterSearchAndReplaceDetails.php
deleted file mode 100644
index f74cfdab..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Analytics/FilterSearchAndReplaceDetails.php
+++ /dev/null
@@ -1,66 +0,0 @@
-caseSensitive = $caseSensitive;
-  }
-  public function getCaseSensitive()
-  {
-    return $this->caseSensitive;
-  }
-  public function setField($field)
-  {
-    $this->field = $field;
-  }
-  public function getField()
-  {
-    return $this->field;
-  }
-  public function setFieldIndex($fieldIndex)
-  {
-    $this->fieldIndex = $fieldIndex;
-  }
-  public function getFieldIndex()
-  {
-    return $this->fieldIndex;
-  }
-  public function setReplaceString($replaceString)
-  {
-    $this->replaceString = $replaceString;
-  }
-  public function getReplaceString()
-  {
-    return $this->replaceString;
-  }
-  public function setSearchString($searchString)
-  {
-    $this->searchString = $searchString;
-  }
-  public function getSearchString()
-  {
-    return $this->searchString;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Analytics/FilterUppercaseDetails.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Analytics/FilterUppercaseDetails.php
deleted file mode 100644
index 41d6c3a0..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Analytics/FilterUppercaseDetails.php
+++ /dev/null
@@ -1,39 +0,0 @@
-field = $field;
-  }
-  public function getField()
-  {
-    return $this->field;
-  }
-  public function setFieldIndex($fieldIndex)
-  {
-    $this->fieldIndex = $fieldIndex;
-  }
-  public function getFieldIndex()
-  {
-    return $this->fieldIndex;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Analytics/Filters.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Analytics/Filters.php
deleted file mode 100644
index 4058b930..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Analytics/Filters.php
+++ /dev/null
@@ -1,95 +0,0 @@
-items = $items;
-  }
-  public function getItems()
-  {
-    return $this->items;
-  }
-  public function setItemsPerPage($itemsPerPage)
-  {
-    $this->itemsPerPage = $itemsPerPage;
-  }
-  public function getItemsPerPage()
-  {
-    return $this->itemsPerPage;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setNextLink($nextLink)
-  {
-    $this->nextLink = $nextLink;
-  }
-  public function getNextLink()
-  {
-    return $this->nextLink;
-  }
-  public function setPreviousLink($previousLink)
-  {
-    $this->previousLink = $previousLink;
-  }
-  public function getPreviousLink()
-  {
-    return $this->previousLink;
-  }
-  public function setStartIndex($startIndex)
-  {
-    $this->startIndex = $startIndex;
-  }
-  public function getStartIndex()
-  {
-    return $this->startIndex;
-  }
-  public function setTotalResults($totalResults)
-  {
-    $this->totalResults = $totalResults;
-  }
-  public function getTotalResults()
-  {
-    return $this->totalResults;
-  }
-  public function setUsername($username)
-  {
-    $this->username = $username;
-  }
-  public function getUsername()
-  {
-    return $this->username;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Analytics/GaData.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Analytics/GaData.php
deleted file mode 100644
index 5b8a9fe2..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Analytics/GaData.php
+++ /dev/null
@@ -1,179 +0,0 @@
-columnHeaders = $columnHeaders;
-  }
-  public function getColumnHeaders()
-  {
-    return $this->columnHeaders;
-  }
-  public function setContainsSampledData($containsSampledData)
-  {
-    $this->containsSampledData = $containsSampledData;
-  }
-  public function getContainsSampledData()
-  {
-    return $this->containsSampledData;
-  }
-  public function setDataLastRefreshed($dataLastRefreshed)
-  {
-    $this->dataLastRefreshed = $dataLastRefreshed;
-  }
-  public function getDataLastRefreshed()
-  {
-    return $this->dataLastRefreshed;
-  }
-  public function setDataTable(Google_Service_Analytics_GaDataDataTable $dataTable)
-  {
-    $this->dataTable = $dataTable;
-  }
-  public function getDataTable()
-  {
-    return $this->dataTable;
-  }
-  public function setId($id)
-  {
-    $this->id = $id;
-  }
-  public function getId()
-  {
-    return $this->id;
-  }
-  public function setItemsPerPage($itemsPerPage)
-  {
-    $this->itemsPerPage = $itemsPerPage;
-  }
-  public function getItemsPerPage()
-  {
-    return $this->itemsPerPage;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setNextLink($nextLink)
-  {
-    $this->nextLink = $nextLink;
-  }
-  public function getNextLink()
-  {
-    return $this->nextLink;
-  }
-  public function setPreviousLink($previousLink)
-  {
-    $this->previousLink = $previousLink;
-  }
-  public function getPreviousLink()
-  {
-    return $this->previousLink;
-  }
-  public function setProfileInfo(Google_Service_Analytics_GaDataProfileInfo $profileInfo)
-  {
-    $this->profileInfo = $profileInfo;
-  }
-  public function getProfileInfo()
-  {
-    return $this->profileInfo;
-  }
-  public function setQuery(Google_Service_Analytics_GaDataQuery $query)
-  {
-    $this->query = $query;
-  }
-  public function getQuery()
-  {
-    return $this->query;
-  }
-  public function setRows($rows)
-  {
-    $this->rows = $rows;
-  }
-  public function getRows()
-  {
-    return $this->rows;
-  }
-  public function setSampleSize($sampleSize)
-  {
-    $this->sampleSize = $sampleSize;
-  }
-  public function getSampleSize()
-  {
-    return $this->sampleSize;
-  }
-  public function setSampleSpace($sampleSpace)
-  {
-    $this->sampleSpace = $sampleSpace;
-  }
-  public function getSampleSpace()
-  {
-    return $this->sampleSpace;
-  }
-  public function setSelfLink($selfLink)
-  {
-    $this->selfLink = $selfLink;
-  }
-  public function getSelfLink()
-  {
-    return $this->selfLink;
-  }
-  public function setTotalResults($totalResults)
-  {
-    $this->totalResults = $totalResults;
-  }
-  public function getTotalResults()
-  {
-    return $this->totalResults;
-  }
-  public function setTotalsForAllResults($totalsForAllResults)
-  {
-    $this->totalsForAllResults = $totalsForAllResults;
-  }
-  public function getTotalsForAllResults()
-  {
-    return $this->totalsForAllResults;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Analytics/GaDataColumnHeaders.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Analytics/GaDataColumnHeaders.php
deleted file mode 100644
index 4f05a9df..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Analytics/GaDataColumnHeaders.php
+++ /dev/null
@@ -1,48 +0,0 @@
-columnType = $columnType;
-  }
-  public function getColumnType()
-  {
-    return $this->columnType;
-  }
-  public function setDataType($dataType)
-  {
-    $this->dataType = $dataType;
-  }
-  public function getDataType()
-  {
-    return $this->dataType;
-  }
-  public function setName($name)
-  {
-    $this->name = $name;
-  }
-  public function getName()
-  {
-    return $this->name;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Analytics/GaDataDataTable.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Analytics/GaDataDataTable.php
deleted file mode 100644
index 8e9b5349..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Analytics/GaDataDataTable.php
+++ /dev/null
@@ -1,42 +0,0 @@
-cols = $cols;
-  }
-  public function getCols()
-  {
-    return $this->cols;
-  }
-  public function setRows($rows)
-  {
-    $this->rows = $rows;
-  }
-  public function getRows()
-  {
-    return $this->rows;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Analytics/GaDataDataTableCols.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Analytics/GaDataDataTableCols.php
deleted file mode 100644
index 1c2fdc72..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Analytics/GaDataDataTableCols.php
+++ /dev/null
@@ -1,48 +0,0 @@
-id = $id;
-  }
-  public function getId()
-  {
-    return $this->id;
-  }
-  public function setLabel($label)
-  {
-    $this->label = $label;
-  }
-  public function getLabel()
-  {
-    return $this->label;
-  }
-  public function setType($type)
-  {
-    $this->type = $type;
-  }
-  public function getType()
-  {
-    return $this->type;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Analytics/GaDataDataTableRows.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Analytics/GaDataDataTableRows.php
deleted file mode 100644
index 409a66c0..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Analytics/GaDataDataTableRows.php
+++ /dev/null
@@ -1,32 +0,0 @@
-c = $c;
-  }
-  public function getC()
-  {
-    return $this->c;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Analytics/GaDataDataTableRowsC.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Analytics/GaDataDataTableRowsC.php
deleted file mode 100644
index b81f3cc7..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Analytics/GaDataDataTableRowsC.php
+++ /dev/null
@@ -1,30 +0,0 @@
-v = $v;
-  }
-  public function getV()
-  {
-    return $this->v;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Analytics/GaDataProfileInfo.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Analytics/GaDataProfileInfo.php
deleted file mode 100644
index ca5a9126..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Analytics/GaDataProfileInfo.php
+++ /dev/null
@@ -1,75 +0,0 @@
-accountId = $accountId;
-  }
-  public function getAccountId()
-  {
-    return $this->accountId;
-  }
-  public function setInternalWebPropertyId($internalWebPropertyId)
-  {
-    $this->internalWebPropertyId = $internalWebPropertyId;
-  }
-  public function getInternalWebPropertyId()
-  {
-    return $this->internalWebPropertyId;
-  }
-  public function setProfileId($profileId)
-  {
-    $this->profileId = $profileId;
-  }
-  public function getProfileId()
-  {
-    return $this->profileId;
-  }
-  public function setProfileName($profileName)
-  {
-    $this->profileName = $profileName;
-  }
-  public function getProfileName()
-  {
-    return $this->profileName;
-  }
-  public function setTableId($tableId)
-  {
-    $this->tableId = $tableId;
-  }
-  public function getTableId()
-  {
-    return $this->tableId;
-  }
-  public function setWebPropertyId($webPropertyId)
-  {
-    $this->webPropertyId = $webPropertyId;
-  }
-  public function getWebPropertyId()
-  {
-    return $this->webPropertyId;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Analytics/GaDataQuery.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Analytics/GaDataQuery.php
deleted file mode 100644
index 811f2929..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Analytics/GaDataQuery.php
+++ /dev/null
@@ -1,127 +0,0 @@
- "end-date",
-        "maxResults" => "max-results",
-        "startDate" => "start-date",
-        "startIndex" => "start-index",
-  );
-  public $dimensions;
-  public $endDate;
-  public $filters;
-  public $ids;
-  public $maxResults;
-  public $metrics;
-  public $samplingLevel;
-  public $segment;
-  public $sort;
-  public $startDate;
-  public $startIndex;
-
-  public function setDimensions($dimensions)
-  {
-    $this->dimensions = $dimensions;
-  }
-  public function getDimensions()
-  {
-    return $this->dimensions;
-  }
-  public function setEndDate($endDate)
-  {
-    $this->endDate = $endDate;
-  }
-  public function getEndDate()
-  {
-    return $this->endDate;
-  }
-  public function setFilters($filters)
-  {
-    $this->filters = $filters;
-  }
-  public function getFilters()
-  {
-    return $this->filters;
-  }
-  public function setIds($ids)
-  {
-    $this->ids = $ids;
-  }
-  public function getIds()
-  {
-    return $this->ids;
-  }
-  public function setMaxResults($maxResults)
-  {
-    $this->maxResults = $maxResults;
-  }
-  public function getMaxResults()
-  {
-    return $this->maxResults;
-  }
-  public function setMetrics($metrics)
-  {
-    $this->metrics = $metrics;
-  }
-  public function getMetrics()
-  {
-    return $this->metrics;
-  }
-  public function setSamplingLevel($samplingLevel)
-  {
-    $this->samplingLevel = $samplingLevel;
-  }
-  public function getSamplingLevel()
-  {
-    return $this->samplingLevel;
-  }
-  public function setSegment($segment)
-  {
-    $this->segment = $segment;
-  }
-  public function getSegment()
-  {
-    return $this->segment;
-  }
-  public function setSort($sort)
-  {
-    $this->sort = $sort;
-  }
-  public function getSort()
-  {
-    return $this->sort;
-  }
-  public function setStartDate($startDate)
-  {
-    $this->startDate = $startDate;
-  }
-  public function getStartDate()
-  {
-    return $this->startDate;
-  }
-  public function setStartIndex($startIndex)
-  {
-    $this->startIndex = $startIndex;
-  }
-  public function getStartIndex()
-  {
-    return $this->startIndex;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Analytics/Goal.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Analytics/Goal.php
deleted file mode 100644
index 767420ab..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Analytics/Goal.php
+++ /dev/null
@@ -1,188 +0,0 @@
-accountId = $accountId;
-  }
-  public function getAccountId()
-  {
-    return $this->accountId;
-  }
-  public function setActive($active)
-  {
-    $this->active = $active;
-  }
-  public function getActive()
-  {
-    return $this->active;
-  }
-  public function setCreated($created)
-  {
-    $this->created = $created;
-  }
-  public function getCreated()
-  {
-    return $this->created;
-  }
-  public function setEventDetails(Google_Service_Analytics_GoalEventDetails $eventDetails)
-  {
-    $this->eventDetails = $eventDetails;
-  }
-  public function getEventDetails()
-  {
-    return $this->eventDetails;
-  }
-  public function setId($id)
-  {
-    $this->id = $id;
-  }
-  public function getId()
-  {
-    return $this->id;
-  }
-  public function setInternalWebPropertyId($internalWebPropertyId)
-  {
-    $this->internalWebPropertyId = $internalWebPropertyId;
-  }
-  public function getInternalWebPropertyId()
-  {
-    return $this->internalWebPropertyId;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setName($name)
-  {
-    $this->name = $name;
-  }
-  public function getName()
-  {
-    return $this->name;
-  }
-  public function setParentLink(Google_Service_Analytics_GoalParentLink $parentLink)
-  {
-    $this->parentLink = $parentLink;
-  }
-  public function getParentLink()
-  {
-    return $this->parentLink;
-  }
-  public function setProfileId($profileId)
-  {
-    $this->profileId = $profileId;
-  }
-  public function getProfileId()
-  {
-    return $this->profileId;
-  }
-  public function setSelfLink($selfLink)
-  {
-    $this->selfLink = $selfLink;
-  }
-  public function getSelfLink()
-  {
-    return $this->selfLink;
-  }
-  public function setType($type)
-  {
-    $this->type = $type;
-  }
-  public function getType()
-  {
-    return $this->type;
-  }
-  public function setUpdated($updated)
-  {
-    $this->updated = $updated;
-  }
-  public function getUpdated()
-  {
-    return $this->updated;
-  }
-  public function setUrlDestinationDetails(Google_Service_Analytics_GoalUrlDestinationDetails $urlDestinationDetails)
-  {
-    $this->urlDestinationDetails = $urlDestinationDetails;
-  }
-  public function getUrlDestinationDetails()
-  {
-    return $this->urlDestinationDetails;
-  }
-  public function setValue($value)
-  {
-    $this->value = $value;
-  }
-  public function getValue()
-  {
-    return $this->value;
-  }
-  public function setVisitNumPagesDetails(Google_Service_Analytics_GoalVisitNumPagesDetails $visitNumPagesDetails)
-  {
-    $this->visitNumPagesDetails = $visitNumPagesDetails;
-  }
-  public function getVisitNumPagesDetails()
-  {
-    return $this->visitNumPagesDetails;
-  }
-  public function setVisitTimeOnSiteDetails(Google_Service_Analytics_GoalVisitTimeOnSiteDetails $visitTimeOnSiteDetails)
-  {
-    $this->visitTimeOnSiteDetails = $visitTimeOnSiteDetails;
-  }
-  public function getVisitTimeOnSiteDetails()
-  {
-    return $this->visitTimeOnSiteDetails;
-  }
-  public function setWebPropertyId($webPropertyId)
-  {
-    $this->webPropertyId = $webPropertyId;
-  }
-  public function getWebPropertyId()
-  {
-    return $this->webPropertyId;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Analytics/GoalEventDetails.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Analytics/GoalEventDetails.php
deleted file mode 100644
index 0cd903db..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Analytics/GoalEventDetails.php
+++ /dev/null
@@ -1,41 +0,0 @@
-eventConditions = $eventConditions;
-  }
-  public function getEventConditions()
-  {
-    return $this->eventConditions;
-  }
-  public function setUseEventValue($useEventValue)
-  {
-    $this->useEventValue = $useEventValue;
-  }
-  public function getUseEventValue()
-  {
-    return $this->useEventValue;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Analytics/GoalEventDetailsEventConditions.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Analytics/GoalEventDetailsEventConditions.php
deleted file mode 100644
index 6b401eea..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Analytics/GoalEventDetailsEventConditions.php
+++ /dev/null
@@ -1,66 +0,0 @@
-comparisonType = $comparisonType;
-  }
-  public function getComparisonType()
-  {
-    return $this->comparisonType;
-  }
-  public function setComparisonValue($comparisonValue)
-  {
-    $this->comparisonValue = $comparisonValue;
-  }
-  public function getComparisonValue()
-  {
-    return $this->comparisonValue;
-  }
-  public function setExpression($expression)
-  {
-    $this->expression = $expression;
-  }
-  public function getExpression()
-  {
-    return $this->expression;
-  }
-  public function setMatchType($matchType)
-  {
-    $this->matchType = $matchType;
-  }
-  public function getMatchType()
-  {
-    return $this->matchType;
-  }
-  public function setType($type)
-  {
-    $this->type = $type;
-  }
-  public function getType()
-  {
-    return $this->type;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Analytics/GoalParentLink.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Analytics/GoalParentLink.php
deleted file mode 100644
index 54d7d542..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Analytics/GoalParentLink.php
+++ /dev/null
@@ -1,39 +0,0 @@
-href = $href;
-  }
-  public function getHref()
-  {
-    return $this->href;
-  }
-  public function setType($type)
-  {
-    $this->type = $type;
-  }
-  public function getType()
-  {
-    return $this->type;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Analytics/GoalUrlDestinationDetails.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Analytics/GoalUrlDestinationDetails.php
deleted file mode 100644
index 52520879..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Analytics/GoalUrlDestinationDetails.php
+++ /dev/null
@@ -1,68 +0,0 @@
-caseSensitive = $caseSensitive;
-  }
-  public function getCaseSensitive()
-  {
-    return $this->caseSensitive;
-  }
-  public function setFirstStepRequired($firstStepRequired)
-  {
-    $this->firstStepRequired = $firstStepRequired;
-  }
-  public function getFirstStepRequired()
-  {
-    return $this->firstStepRequired;
-  }
-  public function setMatchType($matchType)
-  {
-    $this->matchType = $matchType;
-  }
-  public function getMatchType()
-  {
-    return $this->matchType;
-  }
-  public function setSteps($steps)
-  {
-    $this->steps = $steps;
-  }
-  public function getSteps()
-  {
-    return $this->steps;
-  }
-  public function setUrl($url)
-  {
-    $this->url = $url;
-  }
-  public function getUrl()
-  {
-    return $this->url;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Analytics/GoalUrlDestinationDetailsSteps.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Analytics/GoalUrlDestinationDetailsSteps.php
deleted file mode 100644
index 812ae53e..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Analytics/GoalUrlDestinationDetailsSteps.php
+++ /dev/null
@@ -1,48 +0,0 @@
-name = $name;
-  }
-  public function getName()
-  {
-    return $this->name;
-  }
-  public function setNumber($number)
-  {
-    $this->number = $number;
-  }
-  public function getNumber()
-  {
-    return $this->number;
-  }
-  public function setUrl($url)
-  {
-    $this->url = $url;
-  }
-  public function getUrl()
-  {
-    return $this->url;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Analytics/GoalVisitNumPagesDetails.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Analytics/GoalVisitNumPagesDetails.php
deleted file mode 100644
index fc92b56a..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Analytics/GoalVisitNumPagesDetails.php
+++ /dev/null
@@ -1,39 +0,0 @@
-comparisonType = $comparisonType;
-  }
-  public function getComparisonType()
-  {
-    return $this->comparisonType;
-  }
-  public function setComparisonValue($comparisonValue)
-  {
-    $this->comparisonValue = $comparisonValue;
-  }
-  public function getComparisonValue()
-  {
-    return $this->comparisonValue;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Analytics/GoalVisitTimeOnSiteDetails.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Analytics/GoalVisitTimeOnSiteDetails.php
deleted file mode 100644
index 0f28a0a1..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Analytics/GoalVisitTimeOnSiteDetails.php
+++ /dev/null
@@ -1,39 +0,0 @@
-comparisonType = $comparisonType;
-  }
-  public function getComparisonType()
-  {
-    return $this->comparisonType;
-  }
-  public function setComparisonValue($comparisonValue)
-  {
-    $this->comparisonValue = $comparisonValue;
-  }
-  public function getComparisonValue()
-  {
-    return $this->comparisonValue;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Analytics/Goals.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Analytics/Goals.php
deleted file mode 100644
index 402eb350..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Analytics/Goals.php
+++ /dev/null
@@ -1,95 +0,0 @@
-items = $items;
-  }
-  public function getItems()
-  {
-    return $this->items;
-  }
-  public function setItemsPerPage($itemsPerPage)
-  {
-    $this->itemsPerPage = $itemsPerPage;
-  }
-  public function getItemsPerPage()
-  {
-    return $this->itemsPerPage;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setNextLink($nextLink)
-  {
-    $this->nextLink = $nextLink;
-  }
-  public function getNextLink()
-  {
-    return $this->nextLink;
-  }
-  public function setPreviousLink($previousLink)
-  {
-    $this->previousLink = $previousLink;
-  }
-  public function getPreviousLink()
-  {
-    return $this->previousLink;
-  }
-  public function setStartIndex($startIndex)
-  {
-    $this->startIndex = $startIndex;
-  }
-  public function getStartIndex()
-  {
-    return $this->startIndex;
-  }
-  public function setTotalResults($totalResults)
-  {
-    $this->totalResults = $totalResults;
-  }
-  public function getTotalResults()
-  {
-    return $this->totalResults;
-  }
-  public function setUsername($username)
-  {
-    $this->username = $username;
-  }
-  public function getUsername()
-  {
-    return $this->username;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Analytics/IncludeConditions.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Analytics/IncludeConditions.php
deleted file mode 100644
index 11b89c7b..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Analytics/IncludeConditions.php
+++ /dev/null
@@ -1,66 +0,0 @@
-daysToLookBack = $daysToLookBack;
-  }
-  public function getDaysToLookBack()
-  {
-    return $this->daysToLookBack;
-  }
-  public function setIsSmartList($isSmartList)
-  {
-    $this->isSmartList = $isSmartList;
-  }
-  public function getIsSmartList()
-  {
-    return $this->isSmartList;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setMembershipDurationDays($membershipDurationDays)
-  {
-    $this->membershipDurationDays = $membershipDurationDays;
-  }
-  public function getMembershipDurationDays()
-  {
-    return $this->membershipDurationDays;
-  }
-  public function setSegment($segment)
-  {
-    $this->segment = $segment;
-  }
-  public function getSegment()
-  {
-    return $this->segment;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Analytics/LinkedForeignAccount.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Analytics/LinkedForeignAccount.php
deleted file mode 100644
index 4863f8a9..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Analytics/LinkedForeignAccount.php
+++ /dev/null
@@ -1,111 +0,0 @@
-accountId = $accountId;
-  }
-  public function getAccountId()
-  {
-    return $this->accountId;
-  }
-  public function setEligibleForSearch($eligibleForSearch)
-  {
-    $this->eligibleForSearch = $eligibleForSearch;
-  }
-  public function getEligibleForSearch()
-  {
-    return $this->eligibleForSearch;
-  }
-  public function setId($id)
-  {
-    $this->id = $id;
-  }
-  public function getId()
-  {
-    return $this->id;
-  }
-  public function setInternalWebPropertyId($internalWebPropertyId)
-  {
-    $this->internalWebPropertyId = $internalWebPropertyId;
-  }
-  public function getInternalWebPropertyId()
-  {
-    return $this->internalWebPropertyId;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setLinkedAccountId($linkedAccountId)
-  {
-    $this->linkedAccountId = $linkedAccountId;
-  }
-  public function getLinkedAccountId()
-  {
-    return $this->linkedAccountId;
-  }
-  public function setRemarketingAudienceId($remarketingAudienceId)
-  {
-    $this->remarketingAudienceId = $remarketingAudienceId;
-  }
-  public function getRemarketingAudienceId()
-  {
-    return $this->remarketingAudienceId;
-  }
-  public function setStatus($status)
-  {
-    $this->status = $status;
-  }
-  public function getStatus()
-  {
-    return $this->status;
-  }
-  public function setType($type)
-  {
-    $this->type = $type;
-  }
-  public function getType()
-  {
-    return $this->type;
-  }
-  public function setWebPropertyId($webPropertyId)
-  {
-    $this->webPropertyId = $webPropertyId;
-  }
-  public function getWebPropertyId()
-  {
-    return $this->webPropertyId;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Analytics/McfData.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Analytics/McfData.php
deleted file mode 100644
index 91bf9d9d..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Analytics/McfData.php
+++ /dev/null
@@ -1,161 +0,0 @@
-columnHeaders = $columnHeaders;
-  }
-  public function getColumnHeaders()
-  {
-    return $this->columnHeaders;
-  }
-  public function setContainsSampledData($containsSampledData)
-  {
-    $this->containsSampledData = $containsSampledData;
-  }
-  public function getContainsSampledData()
-  {
-    return $this->containsSampledData;
-  }
-  public function setId($id)
-  {
-    $this->id = $id;
-  }
-  public function getId()
-  {
-    return $this->id;
-  }
-  public function setItemsPerPage($itemsPerPage)
-  {
-    $this->itemsPerPage = $itemsPerPage;
-  }
-  public function getItemsPerPage()
-  {
-    return $this->itemsPerPage;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setNextLink($nextLink)
-  {
-    $this->nextLink = $nextLink;
-  }
-  public function getNextLink()
-  {
-    return $this->nextLink;
-  }
-  public function setPreviousLink($previousLink)
-  {
-    $this->previousLink = $previousLink;
-  }
-  public function getPreviousLink()
-  {
-    return $this->previousLink;
-  }
-  public function setProfileInfo(Google_Service_Analytics_McfDataProfileInfo $profileInfo)
-  {
-    $this->profileInfo = $profileInfo;
-  }
-  public function getProfileInfo()
-  {
-    return $this->profileInfo;
-  }
-  public function setQuery(Google_Service_Analytics_McfDataQuery $query)
-  {
-    $this->query = $query;
-  }
-  public function getQuery()
-  {
-    return $this->query;
-  }
-  public function setRows($rows)
-  {
-    $this->rows = $rows;
-  }
-  public function getRows()
-  {
-    return $this->rows;
-  }
-  public function setSampleSize($sampleSize)
-  {
-    $this->sampleSize = $sampleSize;
-  }
-  public function getSampleSize()
-  {
-    return $this->sampleSize;
-  }
-  public function setSampleSpace($sampleSpace)
-  {
-    $this->sampleSpace = $sampleSpace;
-  }
-  public function getSampleSpace()
-  {
-    return $this->sampleSpace;
-  }
-  public function setSelfLink($selfLink)
-  {
-    $this->selfLink = $selfLink;
-  }
-  public function getSelfLink()
-  {
-    return $this->selfLink;
-  }
-  public function setTotalResults($totalResults)
-  {
-    $this->totalResults = $totalResults;
-  }
-  public function getTotalResults()
-  {
-    return $this->totalResults;
-  }
-  public function setTotalsForAllResults($totalsForAllResults)
-  {
-    $this->totalsForAllResults = $totalsForAllResults;
-  }
-  public function getTotalsForAllResults()
-  {
-    return $this->totalsForAllResults;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Analytics/McfDataColumnHeaders.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Analytics/McfDataColumnHeaders.php
deleted file mode 100644
index 30ef1ddb..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Analytics/McfDataColumnHeaders.php
+++ /dev/null
@@ -1,48 +0,0 @@
-columnType = $columnType;
-  }
-  public function getColumnType()
-  {
-    return $this->columnType;
-  }
-  public function setDataType($dataType)
-  {
-    $this->dataType = $dataType;
-  }
-  public function getDataType()
-  {
-    return $this->dataType;
-  }
-  public function setName($name)
-  {
-    $this->name = $name;
-  }
-  public function getName()
-  {
-    return $this->name;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Analytics/McfDataProfileInfo.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Analytics/McfDataProfileInfo.php
deleted file mode 100644
index 0dc090c7..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Analytics/McfDataProfileInfo.php
+++ /dev/null
@@ -1,75 +0,0 @@
-accountId = $accountId;
-  }
-  public function getAccountId()
-  {
-    return $this->accountId;
-  }
-  public function setInternalWebPropertyId($internalWebPropertyId)
-  {
-    $this->internalWebPropertyId = $internalWebPropertyId;
-  }
-  public function getInternalWebPropertyId()
-  {
-    return $this->internalWebPropertyId;
-  }
-  public function setProfileId($profileId)
-  {
-    $this->profileId = $profileId;
-  }
-  public function getProfileId()
-  {
-    return $this->profileId;
-  }
-  public function setProfileName($profileName)
-  {
-    $this->profileName = $profileName;
-  }
-  public function getProfileName()
-  {
-    return $this->profileName;
-  }
-  public function setTableId($tableId)
-  {
-    $this->tableId = $tableId;
-  }
-  public function getTableId()
-  {
-    return $this->tableId;
-  }
-  public function setWebPropertyId($webPropertyId)
-  {
-    $this->webPropertyId = $webPropertyId;
-  }
-  public function getWebPropertyId()
-  {
-    return $this->webPropertyId;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Analytics/McfDataQuery.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Analytics/McfDataQuery.php
deleted file mode 100644
index 2756e2fd..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Analytics/McfDataQuery.php
+++ /dev/null
@@ -1,127 +0,0 @@
- "end-date",
-        "maxResults" => "max-results",
-        "startDate" => "start-date",
-        "startIndex" => "start-index",
-  );
-  public $dimensions;
-  public $endDate;
-  public $filters;
-  public $ids;
-  public $maxResults;
-  public $metrics;
-  public $samplingLevel;
-  public $segment;
-  public $sort;
-  public $startDate;
-  public $startIndex;
-
-  public function setDimensions($dimensions)
-  {
-    $this->dimensions = $dimensions;
-  }
-  public function getDimensions()
-  {
-    return $this->dimensions;
-  }
-  public function setEndDate($endDate)
-  {
-    $this->endDate = $endDate;
-  }
-  public function getEndDate()
-  {
-    return $this->endDate;
-  }
-  public function setFilters($filters)
-  {
-    $this->filters = $filters;
-  }
-  public function getFilters()
-  {
-    return $this->filters;
-  }
-  public function setIds($ids)
-  {
-    $this->ids = $ids;
-  }
-  public function getIds()
-  {
-    return $this->ids;
-  }
-  public function setMaxResults($maxResults)
-  {
-    $this->maxResults = $maxResults;
-  }
-  public function getMaxResults()
-  {
-    return $this->maxResults;
-  }
-  public function setMetrics($metrics)
-  {
-    $this->metrics = $metrics;
-  }
-  public function getMetrics()
-  {
-    return $this->metrics;
-  }
-  public function setSamplingLevel($samplingLevel)
-  {
-    $this->samplingLevel = $samplingLevel;
-  }
-  public function getSamplingLevel()
-  {
-    return $this->samplingLevel;
-  }
-  public function setSegment($segment)
-  {
-    $this->segment = $segment;
-  }
-  public function getSegment()
-  {
-    return $this->segment;
-  }
-  public function setSort($sort)
-  {
-    $this->sort = $sort;
-  }
-  public function getSort()
-  {
-    return $this->sort;
-  }
-  public function setStartDate($startDate)
-  {
-    $this->startDate = $startDate;
-  }
-  public function getStartDate()
-  {
-    return $this->startDate;
-  }
-  public function setStartIndex($startIndex)
-  {
-    $this->startIndex = $startIndex;
-  }
-  public function getStartIndex()
-  {
-    return $this->startIndex;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Analytics/McfDataRows.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Analytics/McfDataRows.php
deleted file mode 100644
index 08bbb95f..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Analytics/McfDataRows.php
+++ /dev/null
@@ -1,41 +0,0 @@
-conversionPathValue = $conversionPathValue;
-  }
-  public function getConversionPathValue()
-  {
-    return $this->conversionPathValue;
-  }
-  public function setPrimitiveValue($primitiveValue)
-  {
-    $this->primitiveValue = $primitiveValue;
-  }
-  public function getPrimitiveValue()
-  {
-    return $this->primitiveValue;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Analytics/McfDataRowsConversionPathValue.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Analytics/McfDataRowsConversionPathValue.php
deleted file mode 100644
index 69b2ecb4..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Analytics/McfDataRowsConversionPathValue.php
+++ /dev/null
@@ -1,39 +0,0 @@
-interactionType = $interactionType;
-  }
-  public function getInteractionType()
-  {
-    return $this->interactionType;
-  }
-  public function setNodeValue($nodeValue)
-  {
-    $this->nodeValue = $nodeValue;
-  }
-  public function getNodeValue()
-  {
-    return $this->nodeValue;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Analytics/Profile.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Analytics/Profile.php
deleted file mode 100644
index f92d97b0..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Analytics/Profile.php
+++ /dev/null
@@ -1,258 +0,0 @@
-accountId = $accountId;
-  }
-  public function getAccountId()
-  {
-    return $this->accountId;
-  }
-  public function setBotFilteringEnabled($botFilteringEnabled)
-  {
-    $this->botFilteringEnabled = $botFilteringEnabled;
-  }
-  public function getBotFilteringEnabled()
-  {
-    return $this->botFilteringEnabled;
-  }
-  public function setChildLink(Google_Service_Analytics_ProfileChildLink $childLink)
-  {
-    $this->childLink = $childLink;
-  }
-  public function getChildLink()
-  {
-    return $this->childLink;
-  }
-  public function setCreated($created)
-  {
-    $this->created = $created;
-  }
-  public function getCreated()
-  {
-    return $this->created;
-  }
-  public function setCurrency($currency)
-  {
-    $this->currency = $currency;
-  }
-  public function getCurrency()
-  {
-    return $this->currency;
-  }
-  public function setDefaultPage($defaultPage)
-  {
-    $this->defaultPage = $defaultPage;
-  }
-  public function getDefaultPage()
-  {
-    return $this->defaultPage;
-  }
-  public function setECommerceTracking($eCommerceTracking)
-  {
-    $this->eCommerceTracking = $eCommerceTracking;
-  }
-  public function getECommerceTracking()
-  {
-    return $this->eCommerceTracking;
-  }
-  public function setEnhancedECommerceTracking($enhancedECommerceTracking)
-  {
-    $this->enhancedECommerceTracking = $enhancedECommerceTracking;
-  }
-  public function getEnhancedECommerceTracking()
-  {
-    return $this->enhancedECommerceTracking;
-  }
-  public function setExcludeQueryParameters($excludeQueryParameters)
-  {
-    $this->excludeQueryParameters = $excludeQueryParameters;
-  }
-  public function getExcludeQueryParameters()
-  {
-    return $this->excludeQueryParameters;
-  }
-  public function setId($id)
-  {
-    $this->id = $id;
-  }
-  public function getId()
-  {
-    return $this->id;
-  }
-  public function setInternalWebPropertyId($internalWebPropertyId)
-  {
-    $this->internalWebPropertyId = $internalWebPropertyId;
-  }
-  public function getInternalWebPropertyId()
-  {
-    return $this->internalWebPropertyId;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setName($name)
-  {
-    $this->name = $name;
-  }
-  public function getName()
-  {
-    return $this->name;
-  }
-  public function setParentLink(Google_Service_Analytics_ProfileParentLink $parentLink)
-  {
-    $this->parentLink = $parentLink;
-  }
-  public function getParentLink()
-  {
-    return $this->parentLink;
-  }
-  public function setPermissions(Google_Service_Analytics_ProfilePermissions $permissions)
-  {
-    $this->permissions = $permissions;
-  }
-  public function getPermissions()
-  {
-    return $this->permissions;
-  }
-  public function setSelfLink($selfLink)
-  {
-    $this->selfLink = $selfLink;
-  }
-  public function getSelfLink()
-  {
-    return $this->selfLink;
-  }
-  public function setSiteSearchCategoryParameters($siteSearchCategoryParameters)
-  {
-    $this->siteSearchCategoryParameters = $siteSearchCategoryParameters;
-  }
-  public function getSiteSearchCategoryParameters()
-  {
-    return $this->siteSearchCategoryParameters;
-  }
-  public function setSiteSearchQueryParameters($siteSearchQueryParameters)
-  {
-    $this->siteSearchQueryParameters = $siteSearchQueryParameters;
-  }
-  public function getSiteSearchQueryParameters()
-  {
-    return $this->siteSearchQueryParameters;
-  }
-  public function setStarred($starred)
-  {
-    $this->starred = $starred;
-  }
-  public function getStarred()
-  {
-    return $this->starred;
-  }
-  public function setStripSiteSearchCategoryParameters($stripSiteSearchCategoryParameters)
-  {
-    $this->stripSiteSearchCategoryParameters = $stripSiteSearchCategoryParameters;
-  }
-  public function getStripSiteSearchCategoryParameters()
-  {
-    return $this->stripSiteSearchCategoryParameters;
-  }
-  public function setStripSiteSearchQueryParameters($stripSiteSearchQueryParameters)
-  {
-    $this->stripSiteSearchQueryParameters = $stripSiteSearchQueryParameters;
-  }
-  public function getStripSiteSearchQueryParameters()
-  {
-    return $this->stripSiteSearchQueryParameters;
-  }
-  public function setTimezone($timezone)
-  {
-    $this->timezone = $timezone;
-  }
-  public function getTimezone()
-  {
-    return $this->timezone;
-  }
-  public function setType($type)
-  {
-    $this->type = $type;
-  }
-  public function getType()
-  {
-    return $this->type;
-  }
-  public function setUpdated($updated)
-  {
-    $this->updated = $updated;
-  }
-  public function getUpdated()
-  {
-    return $this->updated;
-  }
-  public function setWebPropertyId($webPropertyId)
-  {
-    $this->webPropertyId = $webPropertyId;
-  }
-  public function getWebPropertyId()
-  {
-    return $this->webPropertyId;
-  }
-  public function setWebsiteUrl($websiteUrl)
-  {
-    $this->websiteUrl = $websiteUrl;
-  }
-  public function getWebsiteUrl()
-  {
-    return $this->websiteUrl;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Analytics/ProfileChildLink.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Analytics/ProfileChildLink.php
deleted file mode 100644
index bb18f139..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Analytics/ProfileChildLink.php
+++ /dev/null
@@ -1,39 +0,0 @@
-href = $href;
-  }
-  public function getHref()
-  {
-    return $this->href;
-  }
-  public function setType($type)
-  {
-    $this->type = $type;
-  }
-  public function getType()
-  {
-    return $this->type;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Analytics/ProfileFilterLink.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Analytics/ProfileFilterLink.php
deleted file mode 100644
index 38417464..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Analytics/ProfileFilterLink.php
+++ /dev/null
@@ -1,77 +0,0 @@
-filterRef = $filterRef;
-  }
-  public function getFilterRef()
-  {
-    return $this->filterRef;
-  }
-  public function setId($id)
-  {
-    $this->id = $id;
-  }
-  public function getId()
-  {
-    return $this->id;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setProfileRef(Google_Service_Analytics_ProfileRef $profileRef)
-  {
-    $this->profileRef = $profileRef;
-  }
-  public function getProfileRef()
-  {
-    return $this->profileRef;
-  }
-  public function setRank($rank)
-  {
-    $this->rank = $rank;
-  }
-  public function getRank()
-  {
-    return $this->rank;
-  }
-  public function setSelfLink($selfLink)
-  {
-    $this->selfLink = $selfLink;
-  }
-  public function getSelfLink()
-  {
-    return $this->selfLink;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Analytics/ProfileFilterLinks.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Analytics/ProfileFilterLinks.php
deleted file mode 100644
index 6ba55aa8..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Analytics/ProfileFilterLinks.php
+++ /dev/null
@@ -1,95 +0,0 @@
-items = $items;
-  }
-  public function getItems()
-  {
-    return $this->items;
-  }
-  public function setItemsPerPage($itemsPerPage)
-  {
-    $this->itemsPerPage = $itemsPerPage;
-  }
-  public function getItemsPerPage()
-  {
-    return $this->itemsPerPage;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setNextLink($nextLink)
-  {
-    $this->nextLink = $nextLink;
-  }
-  public function getNextLink()
-  {
-    return $this->nextLink;
-  }
-  public function setPreviousLink($previousLink)
-  {
-    $this->previousLink = $previousLink;
-  }
-  public function getPreviousLink()
-  {
-    return $this->previousLink;
-  }
-  public function setStartIndex($startIndex)
-  {
-    $this->startIndex = $startIndex;
-  }
-  public function getStartIndex()
-  {
-    return $this->startIndex;
-  }
-  public function setTotalResults($totalResults)
-  {
-    $this->totalResults = $totalResults;
-  }
-  public function getTotalResults()
-  {
-    return $this->totalResults;
-  }
-  public function setUsername($username)
-  {
-    $this->username = $username;
-  }
-  public function getUsername()
-  {
-    return $this->username;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Analytics/ProfileParentLink.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Analytics/ProfileParentLink.php
deleted file mode 100644
index cedcf497..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Analytics/ProfileParentLink.php
+++ /dev/null
@@ -1,39 +0,0 @@
-href = $href;
-  }
-  public function getHref()
-  {
-    return $this->href;
-  }
-  public function setType($type)
-  {
-    $this->type = $type;
-  }
-  public function getType()
-  {
-    return $this->type;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Analytics/ProfilePermissions.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Analytics/ProfilePermissions.php
deleted file mode 100644
index fbbea20a..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Analytics/ProfilePermissions.php
+++ /dev/null
@@ -1,31 +0,0 @@
-effective = $effective;
-  }
-  public function getEffective()
-  {
-    return $this->effective;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Analytics/ProfileRef.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Analytics/ProfileRef.php
deleted file mode 100644
index a32f66d8..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Analytics/ProfileRef.php
+++ /dev/null
@@ -1,84 +0,0 @@
-accountId = $accountId;
-  }
-  public function getAccountId()
-  {
-    return $this->accountId;
-  }
-  public function setHref($href)
-  {
-    $this->href = $href;
-  }
-  public function getHref()
-  {
-    return $this->href;
-  }
-  public function setId($id)
-  {
-    $this->id = $id;
-  }
-  public function getId()
-  {
-    return $this->id;
-  }
-  public function setInternalWebPropertyId($internalWebPropertyId)
-  {
-    $this->internalWebPropertyId = $internalWebPropertyId;
-  }
-  public function getInternalWebPropertyId()
-  {
-    return $this->internalWebPropertyId;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setName($name)
-  {
-    $this->name = $name;
-  }
-  public function getName()
-  {
-    return $this->name;
-  }
-  public function setWebPropertyId($webPropertyId)
-  {
-    $this->webPropertyId = $webPropertyId;
-  }
-  public function getWebPropertyId()
-  {
-    return $this->webPropertyId;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Analytics/ProfileSummary.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Analytics/ProfileSummary.php
deleted file mode 100644
index abec3351..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Analytics/ProfileSummary.php
+++ /dev/null
@@ -1,66 +0,0 @@
-id = $id;
-  }
-  public function getId()
-  {
-    return $this->id;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setName($name)
-  {
-    $this->name = $name;
-  }
-  public function getName()
-  {
-    return $this->name;
-  }
-  public function setStarred($starred)
-  {
-    $this->starred = $starred;
-  }
-  public function getStarred()
-  {
-    return $this->starred;
-  }
-  public function setType($type)
-  {
-    $this->type = $type;
-  }
-  public function getType()
-  {
-    return $this->type;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Analytics/Profiles.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Analytics/Profiles.php
deleted file mode 100644
index 704d5907..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Analytics/Profiles.php
+++ /dev/null
@@ -1,95 +0,0 @@
-items = $items;
-  }
-  public function getItems()
-  {
-    return $this->items;
-  }
-  public function setItemsPerPage($itemsPerPage)
-  {
-    $this->itemsPerPage = $itemsPerPage;
-  }
-  public function getItemsPerPage()
-  {
-    return $this->itemsPerPage;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setNextLink($nextLink)
-  {
-    $this->nextLink = $nextLink;
-  }
-  public function getNextLink()
-  {
-    return $this->nextLink;
-  }
-  public function setPreviousLink($previousLink)
-  {
-    $this->previousLink = $previousLink;
-  }
-  public function getPreviousLink()
-  {
-    return $this->previousLink;
-  }
-  public function setStartIndex($startIndex)
-  {
-    $this->startIndex = $startIndex;
-  }
-  public function getStartIndex()
-  {
-    return $this->startIndex;
-  }
-  public function setTotalResults($totalResults)
-  {
-    $this->totalResults = $totalResults;
-  }
-  public function getTotalResults()
-  {
-    return $this->totalResults;
-  }
-  public function setUsername($username)
-  {
-    $this->username = $username;
-  }
-  public function getUsername()
-  {
-    return $this->username;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Analytics/RealtimeData.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Analytics/RealtimeData.php
deleted file mode 100644
index 865a95e8..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Analytics/RealtimeData.php
+++ /dev/null
@@ -1,106 +0,0 @@
-columnHeaders = $columnHeaders;
-  }
-  public function getColumnHeaders()
-  {
-    return $this->columnHeaders;
-  }
-  public function setId($id)
-  {
-    $this->id = $id;
-  }
-  public function getId()
-  {
-    return $this->id;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setProfileInfo(Google_Service_Analytics_RealtimeDataProfileInfo $profileInfo)
-  {
-    $this->profileInfo = $profileInfo;
-  }
-  public function getProfileInfo()
-  {
-    return $this->profileInfo;
-  }
-  public function setQuery(Google_Service_Analytics_RealtimeDataQuery $query)
-  {
-    $this->query = $query;
-  }
-  public function getQuery()
-  {
-    return $this->query;
-  }
-  public function setRows($rows)
-  {
-    $this->rows = $rows;
-  }
-  public function getRows()
-  {
-    return $this->rows;
-  }
-  public function setSelfLink($selfLink)
-  {
-    $this->selfLink = $selfLink;
-  }
-  public function getSelfLink()
-  {
-    return $this->selfLink;
-  }
-  public function setTotalResults($totalResults)
-  {
-    $this->totalResults = $totalResults;
-  }
-  public function getTotalResults()
-  {
-    return $this->totalResults;
-  }
-  public function setTotalsForAllResults($totalsForAllResults)
-  {
-    $this->totalsForAllResults = $totalsForAllResults;
-  }
-  public function getTotalsForAllResults()
-  {
-    return $this->totalsForAllResults;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Analytics/RealtimeDataColumnHeaders.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Analytics/RealtimeDataColumnHeaders.php
deleted file mode 100644
index 661fdf66..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Analytics/RealtimeDataColumnHeaders.php
+++ /dev/null
@@ -1,48 +0,0 @@
-columnType = $columnType;
-  }
-  public function getColumnType()
-  {
-    return $this->columnType;
-  }
-  public function setDataType($dataType)
-  {
-    $this->dataType = $dataType;
-  }
-  public function getDataType()
-  {
-    return $this->dataType;
-  }
-  public function setName($name)
-  {
-    $this->name = $name;
-  }
-  public function getName()
-  {
-    return $this->name;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Analytics/RealtimeDataProfileInfo.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Analytics/RealtimeDataProfileInfo.php
deleted file mode 100644
index 2bca3e7d..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Analytics/RealtimeDataProfileInfo.php
+++ /dev/null
@@ -1,75 +0,0 @@
-accountId = $accountId;
-  }
-  public function getAccountId()
-  {
-    return $this->accountId;
-  }
-  public function setInternalWebPropertyId($internalWebPropertyId)
-  {
-    $this->internalWebPropertyId = $internalWebPropertyId;
-  }
-  public function getInternalWebPropertyId()
-  {
-    return $this->internalWebPropertyId;
-  }
-  public function setProfileId($profileId)
-  {
-    $this->profileId = $profileId;
-  }
-  public function getProfileId()
-  {
-    return $this->profileId;
-  }
-  public function setProfileName($profileName)
-  {
-    $this->profileName = $profileName;
-  }
-  public function getProfileName()
-  {
-    return $this->profileName;
-  }
-  public function setTableId($tableId)
-  {
-    $this->tableId = $tableId;
-  }
-  public function getTableId()
-  {
-    return $this->tableId;
-  }
-  public function setWebPropertyId($webPropertyId)
-  {
-    $this->webPropertyId = $webPropertyId;
-  }
-  public function getWebPropertyId()
-  {
-    return $this->webPropertyId;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Analytics/RealtimeDataQuery.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Analytics/RealtimeDataQuery.php
deleted file mode 100644
index b91009a6..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Analytics/RealtimeDataQuery.php
+++ /dev/null
@@ -1,79 +0,0 @@
- "max-results",
-  );
-  public $dimensions;
-  public $filters;
-  public $ids;
-  public $maxResults;
-  public $metrics;
-  public $sort;
-
-  public function setDimensions($dimensions)
-  {
-    $this->dimensions = $dimensions;
-  }
-  public function getDimensions()
-  {
-    return $this->dimensions;
-  }
-  public function setFilters($filters)
-  {
-    $this->filters = $filters;
-  }
-  public function getFilters()
-  {
-    return $this->filters;
-  }
-  public function setIds($ids)
-  {
-    $this->ids = $ids;
-  }
-  public function getIds()
-  {
-    return $this->ids;
-  }
-  public function setMaxResults($maxResults)
-  {
-    $this->maxResults = $maxResults;
-  }
-  public function getMaxResults()
-  {
-    return $this->maxResults;
-  }
-  public function setMetrics($metrics)
-  {
-    $this->metrics = $metrics;
-  }
-  public function getMetrics()
-  {
-    return $this->metrics;
-  }
-  public function setSort($sort)
-  {
-    $this->sort = $sort;
-  }
-  public function getSort()
-  {
-    return $this->sort;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Analytics/RemarketingAudience.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Analytics/RemarketingAudience.php
deleted file mode 100644
index b960417f..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Analytics/RemarketingAudience.php
+++ /dev/null
@@ -1,151 +0,0 @@
-accountId = $accountId;
-  }
-  public function getAccountId()
-  {
-    return $this->accountId;
-  }
-  public function setAudienceDefinition(Google_Service_Analytics_RemarketingAudienceAudienceDefinition $audienceDefinition)
-  {
-    $this->audienceDefinition = $audienceDefinition;
-  }
-  public function getAudienceDefinition()
-  {
-    return $this->audienceDefinition;
-  }
-  public function setAudienceType($audienceType)
-  {
-    $this->audienceType = $audienceType;
-  }
-  public function getAudienceType()
-  {
-    return $this->audienceType;
-  }
-  public function setCreated($created)
-  {
-    $this->created = $created;
-  }
-  public function getCreated()
-  {
-    return $this->created;
-  }
-  public function setDescription($description)
-  {
-    $this->description = $description;
-  }
-  public function getDescription()
-  {
-    return $this->description;
-  }
-  public function setId($id)
-  {
-    $this->id = $id;
-  }
-  public function getId()
-  {
-    return $this->id;
-  }
-  public function setInternalWebPropertyId($internalWebPropertyId)
-  {
-    $this->internalWebPropertyId = $internalWebPropertyId;
-  }
-  public function getInternalWebPropertyId()
-  {
-    return $this->internalWebPropertyId;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setLinkedAdAccounts($linkedAdAccounts)
-  {
-    $this->linkedAdAccounts = $linkedAdAccounts;
-  }
-  public function getLinkedAdAccounts()
-  {
-    return $this->linkedAdAccounts;
-  }
-  public function setLinkedViews($linkedViews)
-  {
-    $this->linkedViews = $linkedViews;
-  }
-  public function getLinkedViews()
-  {
-    return $this->linkedViews;
-  }
-  public function setName($name)
-  {
-    $this->name = $name;
-  }
-  public function getName()
-  {
-    return $this->name;
-  }
-  public function setStateBasedAudienceDefinition(Google_Service_Analytics_RemarketingAudienceStateBasedAudienceDefinition $stateBasedAudienceDefinition)
-  {
-    $this->stateBasedAudienceDefinition = $stateBasedAudienceDefinition;
-  }
-  public function getStateBasedAudienceDefinition()
-  {
-    return $this->stateBasedAudienceDefinition;
-  }
-  public function setUpdated($updated)
-  {
-    $this->updated = $updated;
-  }
-  public function getUpdated()
-  {
-    return $this->updated;
-  }
-  public function setWebPropertyId($webPropertyId)
-  {
-    $this->webPropertyId = $webPropertyId;
-  }
-  public function getWebPropertyId()
-  {
-    return $this->webPropertyId;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Analytics/RemarketingAudienceAudienceDefinition.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Analytics/RemarketingAudienceAudienceDefinition.php
deleted file mode 100644
index 0069e8c6..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Analytics/RemarketingAudienceAudienceDefinition.php
+++ /dev/null
@@ -1,31 +0,0 @@
-includeConditions = $includeConditions;
-  }
-  public function getIncludeConditions()
-  {
-    return $this->includeConditions;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Analytics/RemarketingAudienceStateBasedAudienceDefinition.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Analytics/RemarketingAudienceStateBasedAudienceDefinition.php
deleted file mode 100644
index 3417d286..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Analytics/RemarketingAudienceStateBasedAudienceDefinition.php
+++ /dev/null
@@ -1,41 +0,0 @@
-excludeConditions = $excludeConditions;
-  }
-  public function getExcludeConditions()
-  {
-    return $this->excludeConditions;
-  }
-  public function setIncludeConditions(Google_Service_Analytics_IncludeConditions $includeConditions)
-  {
-    $this->includeConditions = $includeConditions;
-  }
-  public function getIncludeConditions()
-  {
-    return $this->includeConditions;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Analytics/RemarketingAudienceStateBasedAudienceDefinitionExcludeConditions.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Analytics/RemarketingAudienceStateBasedAudienceDefinitionExcludeConditions.php
deleted file mode 100644
index f12f3f0d..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Analytics/RemarketingAudienceStateBasedAudienceDefinitionExcludeConditions.php
+++ /dev/null
@@ -1,39 +0,0 @@
-exclusionDuration = $exclusionDuration;
-  }
-  public function getExclusionDuration()
-  {
-    return $this->exclusionDuration;
-  }
-  public function setSegment($segment)
-  {
-    $this->segment = $segment;
-  }
-  public function getSegment()
-  {
-    return $this->segment;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Analytics/RemarketingAudiences.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Analytics/RemarketingAudiences.php
deleted file mode 100644
index cfabe4da..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Analytics/RemarketingAudiences.php
+++ /dev/null
@@ -1,95 +0,0 @@
-items = $items;
-  }
-  public function getItems()
-  {
-    return $this->items;
-  }
-  public function setItemsPerPage($itemsPerPage)
-  {
-    $this->itemsPerPage = $itemsPerPage;
-  }
-  public function getItemsPerPage()
-  {
-    return $this->itemsPerPage;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setNextLink($nextLink)
-  {
-    $this->nextLink = $nextLink;
-  }
-  public function getNextLink()
-  {
-    return $this->nextLink;
-  }
-  public function setPreviousLink($previousLink)
-  {
-    $this->previousLink = $previousLink;
-  }
-  public function getPreviousLink()
-  {
-    return $this->previousLink;
-  }
-  public function setStartIndex($startIndex)
-  {
-    $this->startIndex = $startIndex;
-  }
-  public function getStartIndex()
-  {
-    return $this->startIndex;
-  }
-  public function setTotalResults($totalResults)
-  {
-    $this->totalResults = $totalResults;
-  }
-  public function getTotalResults()
-  {
-    return $this->totalResults;
-  }
-  public function setUsername($username)
-  {
-    $this->username = $username;
-  }
-  public function getUsername()
-  {
-    return $this->username;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Analytics/Resource/Data.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Analytics/Resource/Data.php
deleted file mode 100644
index f2552067..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Analytics/Resource/Data.php
+++ /dev/null
@@ -1,28 +0,0 @@
-
- *   $analyticsService = new Google_Service_Analytics(...);
- *   $data = $analyticsService->data;
- *  
- */
-class Google_Service_Analytics_Resource_Data extends Google_Service_Resource
-{
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Analytics/Resource/DataGa.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Analytics/Resource/DataGa.php
deleted file mode 100644
index 269f6960..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Analytics/Resource/DataGa.php
+++ /dev/null
@@ -1,67 +0,0 @@
-
- *   $analyticsService = new Google_Service_Analytics(...);
- *   $ga = $analyticsService->ga;
- *  
- */
-class Google_Service_Analytics_Resource_DataGa extends Google_Service_Resource
-{
-  /**
-   * Returns Analytics data for a view (profile). (ga.get)
-   *
-   * @param string $ids Unique table ID for retrieving Analytics data. Table ID is
-   * of the form ga:XXXX, where XXXX is the Analytics view (profile) ID.
-   * @param string $startDate Start date for fetching Analytics data. Requests can
-   * specify a start date formatted as YYYY-MM-DD, or as a relative date (e.g.,
-   * today, yesterday, or 7daysAgo). The default value is 7daysAgo.
-   * @param string $endDate End date for fetching Analytics data. Request can
-   * should specify an end date formatted as YYYY-MM-DD, or as a relative date
-   * (e.g., today, yesterday, or 7daysAgo). The default value is yesterday.
-   * @param string $metrics A comma-separated list of Analytics metrics. E.g.,
-   * 'ga:sessions,ga:pageviews'. At least one metric must be specified.
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param string dimensions A comma-separated list of Analytics dimensions.
-   * E.g., 'ga:browser,ga:city'.
-   * @opt_param string filters A comma-separated list of dimension or metric
-   * filters to be applied to Analytics data.
-   * @opt_param bool include-empty-rows The response will include empty rows if
-   * this parameter is set to true, the default is true
-   * @opt_param int max-results The maximum number of entries to include in this
-   * feed.
-   * @opt_param string output The selected format for the response. Default format
-   * is JSON.
-   * @opt_param string samplingLevel The desired sampling level.
-   * @opt_param string segment An Analytics segment to be applied to data.
-   * @opt_param string sort A comma-separated list of dimensions or metrics that
-   * determine the sort order for Analytics data.
-   * @opt_param int start-index An index of the first entity to retrieve. Use this
-   * parameter as a pagination mechanism along with the max-results parameter.
-   * @return Google_Service_Analytics_GaData
-   */
-  public function get($ids, $startDate, $endDate, $metrics, $optParams = array())
-  {
-    $params = array('ids' => $ids, 'start-date' => $startDate, 'end-date' => $endDate, 'metrics' => $metrics);
-    $params = array_merge($params, $optParams);
-    return $this->call('get', array($params), "Google_Service_Analytics_GaData");
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Analytics/Resource/DataMcf.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Analytics/Resource/DataMcf.php
deleted file mode 100644
index 6a5e1685..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Analytics/Resource/DataMcf.php
+++ /dev/null
@@ -1,63 +0,0 @@
-
- *   $analyticsService = new Google_Service_Analytics(...);
- *   $mcf = $analyticsService->mcf;
- *  
- */
-class Google_Service_Analytics_Resource_DataMcf extends Google_Service_Resource
-{
-  /**
-   * Returns Analytics Multi-Channel Funnels data for a view (profile). (mcf.get)
-   *
-   * @param string $ids Unique table ID for retrieving Analytics data. Table ID is
-   * of the form ga:XXXX, where XXXX is the Analytics view (profile) ID.
-   * @param string $startDate Start date for fetching Analytics data. Requests can
-   * specify a start date formatted as YYYY-MM-DD, or as a relative date (e.g.,
-   * today, yesterday, or 7daysAgo). The default value is 7daysAgo.
-   * @param string $endDate End date for fetching Analytics data. Requests can
-   * specify a start date formatted as YYYY-MM-DD, or as a relative date (e.g.,
-   * today, yesterday, or 7daysAgo). The default value is 7daysAgo.
-   * @param string $metrics A comma-separated list of Multi-Channel Funnels
-   * metrics. E.g., 'mcf:totalConversions,mcf:totalConversionValue'. At least one
-   * metric must be specified.
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param string dimensions A comma-separated list of Multi-Channel Funnels
-   * dimensions. E.g., 'mcf:source,mcf:medium'.
-   * @opt_param string filters A comma-separated list of dimension or metric
-   * filters to be applied to the Analytics data.
-   * @opt_param int max-results The maximum number of entries to include in this
-   * feed.
-   * @opt_param string samplingLevel The desired sampling level.
-   * @opt_param string sort A comma-separated list of dimensions or metrics that
-   * determine the sort order for the Analytics data.
-   * @opt_param int start-index An index of the first entity to retrieve. Use this
-   * parameter as a pagination mechanism along with the max-results parameter.
-   * @return Google_Service_Analytics_McfData
-   */
-  public function get($ids, $startDate, $endDate, $metrics, $optParams = array())
-  {
-    $params = array('ids' => $ids, 'start-date' => $startDate, 'end-date' => $endDate, 'metrics' => $metrics);
-    $params = array_merge($params, $optParams);
-    return $this->call('get', array($params), "Google_Service_Analytics_McfData");
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Analytics/Resource/DataRealtime.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Analytics/Resource/DataRealtime.php
deleted file mode 100644
index 4ea551d8..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Analytics/Resource/DataRealtime.php
+++ /dev/null
@@ -1,53 +0,0 @@
-
- *   $analyticsService = new Google_Service_Analytics(...);
- *   $realtime = $analyticsService->realtime;
- *  
- */
-class Google_Service_Analytics_Resource_DataRealtime extends Google_Service_Resource
-{
-  /**
-   * Returns real time data for a view (profile). (realtime.get)
-   *
-   * @param string $ids Unique table ID for retrieving real time data. Table ID is
-   * of the form ga:XXXX, where XXXX is the Analytics view (profile) ID.
-   * @param string $metrics A comma-separated list of real time metrics. E.g.,
-   * 'rt:activeUsers'. At least one metric must be specified.
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param string dimensions A comma-separated list of real time dimensions.
-   * E.g., 'rt:medium,rt:city'.
-   * @opt_param string filters A comma-separated list of dimension or metric
-   * filters to be applied to real time data.
-   * @opt_param int max-results The maximum number of entries to include in this
-   * feed.
-   * @opt_param string sort A comma-separated list of dimensions or metrics that
-   * determine the sort order for real time data.
-   * @return Google_Service_Analytics_RealtimeData
-   */
-  public function get($ids, $metrics, $optParams = array())
-  {
-    $params = array('ids' => $ids, 'metrics' => $metrics);
-    $params = array_merge($params, $optParams);
-    return $this->call('get', array($params), "Google_Service_Analytics_RealtimeData");
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Analytics/Resource/Management.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Analytics/Resource/Management.php
deleted file mode 100644
index 66c2905d..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Analytics/Resource/Management.php
+++ /dev/null
@@ -1,28 +0,0 @@
-
- *   $analyticsService = new Google_Service_Analytics(...);
- *   $management = $analyticsService->management;
- *  
- */
-class Google_Service_Analytics_Resource_Management extends Google_Service_Resource
-{
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Analytics/Resource/ManagementAccountSummaries.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Analytics/Resource/ManagementAccountSummaries.php
deleted file mode 100644
index cfb29396..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Analytics/Resource/ManagementAccountSummaries.php
+++ /dev/null
@@ -1,47 +0,0 @@
-
- *   $analyticsService = new Google_Service_Analytics(...);
- *   $accountSummaries = $analyticsService->accountSummaries;
- *  
- */
-class Google_Service_Analytics_Resource_ManagementAccountSummaries extends Google_Service_Resource
-{
-  /**
-   * Lists account summaries (lightweight tree comprised of
-   * accounts/properties/profiles) to which the user has access.
-   * (accountSummaries.listManagementAccountSummaries)
-   *
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param int max-results The maximum number of account summaries to include
-   * in this response, where the largest acceptable value is 1000.
-   * @opt_param int start-index An index of the first entity to retrieve. Use this
-   * parameter as a pagination mechanism along with the max-results parameter.
-   * @return Google_Service_Analytics_AccountSummaries
-   */
-  public function listManagementAccountSummaries($optParams = array())
-  {
-    $params = array();
-    $params = array_merge($params, $optParams);
-    return $this->call('list', array($params), "Google_Service_Analytics_AccountSummaries");
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Analytics/Resource/ManagementAccountUserLinks.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Analytics/Resource/ManagementAccountUserLinks.php
deleted file mode 100644
index 12baeda4..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Analytics/Resource/ManagementAccountUserLinks.php
+++ /dev/null
@@ -1,91 +0,0 @@
-
- *   $analyticsService = new Google_Service_Analytics(...);
- *   $accountUserLinks = $analyticsService->accountUserLinks;
- *  
- */
-class Google_Service_Analytics_Resource_ManagementAccountUserLinks extends Google_Service_Resource
-{
-  /**
-   * Removes a user from the given account. (accountUserLinks.delete)
-   *
-   * @param string $accountId Account ID to delete the user link for.
-   * @param string $linkId Link ID to delete the user link for.
-   * @param array $optParams Optional parameters.
-   */
-  public function delete($accountId, $linkId, $optParams = array())
-  {
-    $params = array('accountId' => $accountId, 'linkId' => $linkId);
-    $params = array_merge($params, $optParams);
-    return $this->call('delete', array($params));
-  }
-  /**
-   * Adds a new user to the given account. (accountUserLinks.insert)
-   *
-   * @param string $accountId Account ID to create the user link for.
-   * @param Google_Service_Analytics_EntityUserLink $postBody
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Analytics_EntityUserLink
-   */
-  public function insert($accountId, Google_Service_Analytics_EntityUserLink $postBody, $optParams = array())
-  {
-    $params = array('accountId' => $accountId, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('insert', array($params), "Google_Service_Analytics_EntityUserLink");
-  }
-  /**
-   * Lists account-user links for a given account.
-   * (accountUserLinks.listManagementAccountUserLinks)
-   *
-   * @param string $accountId Account ID to retrieve the user links for.
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param int max-results The maximum number of account-user links to
-   * include in this response.
-   * @opt_param int start-index An index of the first account-user link to
-   * retrieve. Use this parameter as a pagination mechanism along with the max-
-   * results parameter.
-   * @return Google_Service_Analytics_EntityUserLinks
-   */
-  public function listManagementAccountUserLinks($accountId, $optParams = array())
-  {
-    $params = array('accountId' => $accountId);
-    $params = array_merge($params, $optParams);
-    return $this->call('list', array($params), "Google_Service_Analytics_EntityUserLinks");
-  }
-  /**
-   * Updates permissions for an existing user on the given account.
-   * (accountUserLinks.update)
-   *
-   * @param string $accountId Account ID to update the account-user link for.
-   * @param string $linkId Link ID to update the account-user link for.
-   * @param Google_Service_Analytics_EntityUserLink $postBody
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Analytics_EntityUserLink
-   */
-  public function update($accountId, $linkId, Google_Service_Analytics_EntityUserLink $postBody, $optParams = array())
-  {
-    $params = array('accountId' => $accountId, 'linkId' => $linkId, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('update', array($params), "Google_Service_Analytics_EntityUserLink");
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Analytics/Resource/ManagementAccounts.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Analytics/Resource/ManagementAccounts.php
deleted file mode 100644
index 9a6a1daa..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Analytics/Resource/ManagementAccounts.php
+++ /dev/null
@@ -1,47 +0,0 @@
-
- *   $analyticsService = new Google_Service_Analytics(...);
- *   $accounts = $analyticsService->accounts;
- *  
- */
-class Google_Service_Analytics_Resource_ManagementAccounts extends Google_Service_Resource
-{
-  /**
-   * Lists all accounts to which the user has access.
-   * (accounts.listManagementAccounts)
-   *
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param int max-results The maximum number of accounts to include in this
-   * response.
-   * @opt_param int start-index An index of the first account to retrieve. Use
-   * this parameter as a pagination mechanism along with the max-results
-   * parameter.
-   * @return Google_Service_Analytics_Accounts
-   */
-  public function listManagementAccounts($optParams = array())
-  {
-    $params = array();
-    $params = array_merge($params, $optParams);
-    return $this->call('list', array($params), "Google_Service_Analytics_Accounts");
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Analytics/Resource/ManagementCustomDataSources.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Analytics/Resource/ManagementCustomDataSources.php
deleted file mode 100644
index d45ba9ed..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Analytics/Resource/ManagementCustomDataSources.php
+++ /dev/null
@@ -1,50 +0,0 @@
-
- *   $analyticsService = new Google_Service_Analytics(...);
- *   $customDataSources = $analyticsService->customDataSources;
- *  
- */
-class Google_Service_Analytics_Resource_ManagementCustomDataSources extends Google_Service_Resource
-{
-  /**
-   * List custom data sources to which the user has access.
-   * (customDataSources.listManagementCustomDataSources)
-   *
-   * @param string $accountId Account Id for the custom data sources to retrieve.
-   * @param string $webPropertyId Web property Id for the custom data sources to
-   * retrieve.
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param int max-results The maximum number of custom data sources to
-   * include in this response.
-   * @opt_param int start-index A 1-based index of the first custom data source to
-   * retrieve. Use this parameter as a pagination mechanism along with the max-
-   * results parameter.
-   * @return Google_Service_Analytics_CustomDataSources
-   */
-  public function listManagementCustomDataSources($accountId, $webPropertyId, $optParams = array())
-  {
-    $params = array('accountId' => $accountId, 'webPropertyId' => $webPropertyId);
-    $params = array_merge($params, $optParams);
-    return $this->call('list', array($params), "Google_Service_Analytics_CustomDataSources");
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Analytics/Resource/ManagementCustomDimensions.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Analytics/Resource/ManagementCustomDimensions.php
deleted file mode 100644
index bb430adb..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Analytics/Resource/ManagementCustomDimensions.php
+++ /dev/null
@@ -1,126 +0,0 @@
-
- *   $analyticsService = new Google_Service_Analytics(...);
- *   $customDimensions = $analyticsService->customDimensions;
- *  
- */
-class Google_Service_Analytics_Resource_ManagementCustomDimensions extends Google_Service_Resource
-{
-  /**
-   * Get a custom dimension to which the user has access. (customDimensions.get)
-   *
-   * @param string $accountId Account ID for the custom dimension to retrieve.
-   * @param string $webPropertyId Web property ID for the custom dimension to
-   * retrieve.
-   * @param string $customDimensionId The ID of the custom dimension to retrieve.
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Analytics_CustomDimension
-   */
-  public function get($accountId, $webPropertyId, $customDimensionId, $optParams = array())
-  {
-    $params = array('accountId' => $accountId, 'webPropertyId' => $webPropertyId, 'customDimensionId' => $customDimensionId);
-    $params = array_merge($params, $optParams);
-    return $this->call('get', array($params), "Google_Service_Analytics_CustomDimension");
-  }
-  /**
-   * Create a new custom dimension. (customDimensions.insert)
-   *
-   * @param string $accountId Account ID for the custom dimension to create.
-   * @param string $webPropertyId Web property ID for the custom dimension to
-   * create.
-   * @param Google_Service_Analytics_CustomDimension $postBody
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Analytics_CustomDimension
-   */
-  public function insert($accountId, $webPropertyId, Google_Service_Analytics_CustomDimension $postBody, $optParams = array())
-  {
-    $params = array('accountId' => $accountId, 'webPropertyId' => $webPropertyId, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('insert', array($params), "Google_Service_Analytics_CustomDimension");
-  }
-  /**
-   * Lists custom dimensions to which the user has access.
-   * (customDimensions.listManagementCustomDimensions)
-   *
-   * @param string $accountId Account ID for the custom dimensions to retrieve.
-   * @param string $webPropertyId Web property ID for the custom dimensions to
-   * retrieve.
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param int max-results The maximum number of custom dimensions to include
-   * in this response.
-   * @opt_param int start-index An index of the first entity to retrieve. Use this
-   * parameter as a pagination mechanism along with the max-results parameter.
-   * @return Google_Service_Analytics_CustomDimensions
-   */
-  public function listManagementCustomDimensions($accountId, $webPropertyId, $optParams = array())
-  {
-    $params = array('accountId' => $accountId, 'webPropertyId' => $webPropertyId);
-    $params = array_merge($params, $optParams);
-    return $this->call('list', array($params), "Google_Service_Analytics_CustomDimensions");
-  }
-  /**
-   * Updates an existing custom dimension. This method supports patch semantics.
-   * (customDimensions.patch)
-   *
-   * @param string $accountId Account ID for the custom dimension to update.
-   * @param string $webPropertyId Web property ID for the custom dimension to
-   * update.
-   * @param string $customDimensionId Custom dimension ID for the custom dimension
-   * to update.
-   * @param Google_Service_Analytics_CustomDimension $postBody
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param bool ignoreCustomDataSourceLinks Force the update and ignore any
-   * warnings related to the custom dimension being linked to a custom data source
-   * / data set.
-   * @return Google_Service_Analytics_CustomDimension
-   */
-  public function patch($accountId, $webPropertyId, $customDimensionId, Google_Service_Analytics_CustomDimension $postBody, $optParams = array())
-  {
-    $params = array('accountId' => $accountId, 'webPropertyId' => $webPropertyId, 'customDimensionId' => $customDimensionId, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('patch', array($params), "Google_Service_Analytics_CustomDimension");
-  }
-  /**
-   * Updates an existing custom dimension. (customDimensions.update)
-   *
-   * @param string $accountId Account ID for the custom dimension to update.
-   * @param string $webPropertyId Web property ID for the custom dimension to
-   * update.
-   * @param string $customDimensionId Custom dimension ID for the custom dimension
-   * to update.
-   * @param Google_Service_Analytics_CustomDimension $postBody
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param bool ignoreCustomDataSourceLinks Force the update and ignore any
-   * warnings related to the custom dimension being linked to a custom data source
-   * / data set.
-   * @return Google_Service_Analytics_CustomDimension
-   */
-  public function update($accountId, $webPropertyId, $customDimensionId, Google_Service_Analytics_CustomDimension $postBody, $optParams = array())
-  {
-    $params = array('accountId' => $accountId, 'webPropertyId' => $webPropertyId, 'customDimensionId' => $customDimensionId, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('update', array($params), "Google_Service_Analytics_CustomDimension");
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Analytics/Resource/ManagementCustomMetrics.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Analytics/Resource/ManagementCustomMetrics.php
deleted file mode 100644
index 3186f63c..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Analytics/Resource/ManagementCustomMetrics.php
+++ /dev/null
@@ -1,124 +0,0 @@
-
- *   $analyticsService = new Google_Service_Analytics(...);
- *   $customMetrics = $analyticsService->customMetrics;
- *  
- */
-class Google_Service_Analytics_Resource_ManagementCustomMetrics extends Google_Service_Resource
-{
-  /**
-   * Get a custom metric to which the user has access. (customMetrics.get)
-   *
-   * @param string $accountId Account ID for the custom metric to retrieve.
-   * @param string $webPropertyId Web property ID for the custom metric to
-   * retrieve.
-   * @param string $customMetricId The ID of the custom metric to retrieve.
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Analytics_CustomMetric
-   */
-  public function get($accountId, $webPropertyId, $customMetricId, $optParams = array())
-  {
-    $params = array('accountId' => $accountId, 'webPropertyId' => $webPropertyId, 'customMetricId' => $customMetricId);
-    $params = array_merge($params, $optParams);
-    return $this->call('get', array($params), "Google_Service_Analytics_CustomMetric");
-  }
-  /**
-   * Create a new custom metric. (customMetrics.insert)
-   *
-   * @param string $accountId Account ID for the custom metric to create.
-   * @param string $webPropertyId Web property ID for the custom dimension to
-   * create.
-   * @param Google_Service_Analytics_CustomMetric $postBody
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Analytics_CustomMetric
-   */
-  public function insert($accountId, $webPropertyId, Google_Service_Analytics_CustomMetric $postBody, $optParams = array())
-  {
-    $params = array('accountId' => $accountId, 'webPropertyId' => $webPropertyId, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('insert', array($params), "Google_Service_Analytics_CustomMetric");
-  }
-  /**
-   * Lists custom metrics to which the user has access.
-   * (customMetrics.listManagementCustomMetrics)
-   *
-   * @param string $accountId Account ID for the custom metrics to retrieve.
-   * @param string $webPropertyId Web property ID for the custom metrics to
-   * retrieve.
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param int max-results The maximum number of custom metrics to include in
-   * this response.
-   * @opt_param int start-index An index of the first entity to retrieve. Use this
-   * parameter as a pagination mechanism along with the max-results parameter.
-   * @return Google_Service_Analytics_CustomMetrics
-   */
-  public function listManagementCustomMetrics($accountId, $webPropertyId, $optParams = array())
-  {
-    $params = array('accountId' => $accountId, 'webPropertyId' => $webPropertyId);
-    $params = array_merge($params, $optParams);
-    return $this->call('list', array($params), "Google_Service_Analytics_CustomMetrics");
-  }
-  /**
-   * Updates an existing custom metric. This method supports patch semantics.
-   * (customMetrics.patch)
-   *
-   * @param string $accountId Account ID for the custom metric to update.
-   * @param string $webPropertyId Web property ID for the custom metric to update.
-   * @param string $customMetricId Custom metric ID for the custom metric to
-   * update.
-   * @param Google_Service_Analytics_CustomMetric $postBody
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param bool ignoreCustomDataSourceLinks Force the update and ignore any
-   * warnings related to the custom metric being linked to a custom data source /
-   * data set.
-   * @return Google_Service_Analytics_CustomMetric
-   */
-  public function patch($accountId, $webPropertyId, $customMetricId, Google_Service_Analytics_CustomMetric $postBody, $optParams = array())
-  {
-    $params = array('accountId' => $accountId, 'webPropertyId' => $webPropertyId, 'customMetricId' => $customMetricId, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('patch', array($params), "Google_Service_Analytics_CustomMetric");
-  }
-  /**
-   * Updates an existing custom metric. (customMetrics.update)
-   *
-   * @param string $accountId Account ID for the custom metric to update.
-   * @param string $webPropertyId Web property ID for the custom metric to update.
-   * @param string $customMetricId Custom metric ID for the custom metric to
-   * update.
-   * @param Google_Service_Analytics_CustomMetric $postBody
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param bool ignoreCustomDataSourceLinks Force the update and ignore any
-   * warnings related to the custom metric being linked to a custom data source /
-   * data set.
-   * @return Google_Service_Analytics_CustomMetric
-   */
-  public function update($accountId, $webPropertyId, $customMetricId, Google_Service_Analytics_CustomMetric $postBody, $optParams = array())
-  {
-    $params = array('accountId' => $accountId, 'webPropertyId' => $webPropertyId, 'customMetricId' => $customMetricId, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('update', array($params), "Google_Service_Analytics_CustomMetric");
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Analytics/Resource/ManagementExperiments.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Analytics/Resource/ManagementExperiments.php
deleted file mode 100644
index 24053c7f..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Analytics/Resource/ManagementExperiments.php
+++ /dev/null
@@ -1,132 +0,0 @@
-
- *   $analyticsService = new Google_Service_Analytics(...);
- *   $experiments = $analyticsService->experiments;
- *  
- */
-class Google_Service_Analytics_Resource_ManagementExperiments extends Google_Service_Resource
-{
-  /**
-   * Delete an experiment. (experiments.delete)
-   *
-   * @param string $accountId Account ID to which the experiment belongs
-   * @param string $webPropertyId Web property ID to which the experiment belongs
-   * @param string $profileId View (Profile) ID to which the experiment belongs
-   * @param string $experimentId ID of the experiment to delete
-   * @param array $optParams Optional parameters.
-   */
-  public function delete($accountId, $webPropertyId, $profileId, $experimentId, $optParams = array())
-  {
-    $params = array('accountId' => $accountId, 'webPropertyId' => $webPropertyId, 'profileId' => $profileId, 'experimentId' => $experimentId);
-    $params = array_merge($params, $optParams);
-    return $this->call('delete', array($params));
-  }
-  /**
-   * Returns an experiment to which the user has access. (experiments.get)
-   *
-   * @param string $accountId Account ID to retrieve the experiment for.
-   * @param string $webPropertyId Web property ID to retrieve the experiment for.
-   * @param string $profileId View (Profile) ID to retrieve the experiment for.
-   * @param string $experimentId Experiment ID to retrieve the experiment for.
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Analytics_Experiment
-   */
-  public function get($accountId, $webPropertyId, $profileId, $experimentId, $optParams = array())
-  {
-    $params = array('accountId' => $accountId, 'webPropertyId' => $webPropertyId, 'profileId' => $profileId, 'experimentId' => $experimentId);
-    $params = array_merge($params, $optParams);
-    return $this->call('get', array($params), "Google_Service_Analytics_Experiment");
-  }
-  /**
-   * Create a new experiment. (experiments.insert)
-   *
-   * @param string $accountId Account ID to create the experiment for.
-   * @param string $webPropertyId Web property ID to create the experiment for.
-   * @param string $profileId View (Profile) ID to create the experiment for.
-   * @param Google_Service_Analytics_Experiment $postBody
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Analytics_Experiment
-   */
-  public function insert($accountId, $webPropertyId, $profileId, Google_Service_Analytics_Experiment $postBody, $optParams = array())
-  {
-    $params = array('accountId' => $accountId, 'webPropertyId' => $webPropertyId, 'profileId' => $profileId, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('insert', array($params), "Google_Service_Analytics_Experiment");
-  }
-  /**
-   * Lists experiments to which the user has access.
-   * (experiments.listManagementExperiments)
-   *
-   * @param string $accountId Account ID to retrieve experiments for.
-   * @param string $webPropertyId Web property ID to retrieve experiments for.
-   * @param string $profileId View (Profile) ID to retrieve experiments for.
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param int max-results The maximum number of experiments to include in
-   * this response.
-   * @opt_param int start-index An index of the first experiment to retrieve. Use
-   * this parameter as a pagination mechanism along with the max-results
-   * parameter.
-   * @return Google_Service_Analytics_Experiments
-   */
-  public function listManagementExperiments($accountId, $webPropertyId, $profileId, $optParams = array())
-  {
-    $params = array('accountId' => $accountId, 'webPropertyId' => $webPropertyId, 'profileId' => $profileId);
-    $params = array_merge($params, $optParams);
-    return $this->call('list', array($params), "Google_Service_Analytics_Experiments");
-  }
-  /**
-   * Update an existing experiment. This method supports patch semantics.
-   * (experiments.patch)
-   *
-   * @param string $accountId Account ID of the experiment to update.
-   * @param string $webPropertyId Web property ID of the experiment to update.
-   * @param string $profileId View (Profile) ID of the experiment to update.
-   * @param string $experimentId Experiment ID of the experiment to update.
-   * @param Google_Service_Analytics_Experiment $postBody
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Analytics_Experiment
-   */
-  public function patch($accountId, $webPropertyId, $profileId, $experimentId, Google_Service_Analytics_Experiment $postBody, $optParams = array())
-  {
-    $params = array('accountId' => $accountId, 'webPropertyId' => $webPropertyId, 'profileId' => $profileId, 'experimentId' => $experimentId, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('patch', array($params), "Google_Service_Analytics_Experiment");
-  }
-  /**
-   * Update an existing experiment. (experiments.update)
-   *
-   * @param string $accountId Account ID of the experiment to update.
-   * @param string $webPropertyId Web property ID of the experiment to update.
-   * @param string $profileId View (Profile) ID of the experiment to update.
-   * @param string $experimentId Experiment ID of the experiment to update.
-   * @param Google_Service_Analytics_Experiment $postBody
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Analytics_Experiment
-   */
-  public function update($accountId, $webPropertyId, $profileId, $experimentId, Google_Service_Analytics_Experiment $postBody, $optParams = array())
-  {
-    $params = array('accountId' => $accountId, 'webPropertyId' => $webPropertyId, 'profileId' => $profileId, 'experimentId' => $experimentId, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('update', array($params), "Google_Service_Analytics_Experiment");
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Analytics/Resource/ManagementFilters.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Analytics/Resource/ManagementFilters.php
deleted file mode 100644
index cc0355bb..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Analytics/Resource/ManagementFilters.php
+++ /dev/null
@@ -1,119 +0,0 @@
-
- *   $analyticsService = new Google_Service_Analytics(...);
- *   $filters = $analyticsService->filters;
- *  
- */
-class Google_Service_Analytics_Resource_ManagementFilters extends Google_Service_Resource
-{
-  /**
-   * Delete a filter. (filters.delete)
-   *
-   * @param string $accountId Account ID to delete the filter for.
-   * @param string $filterId ID of the filter to be deleted.
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Analytics_Filter
-   */
-  public function delete($accountId, $filterId, $optParams = array())
-  {
-    $params = array('accountId' => $accountId, 'filterId' => $filterId);
-    $params = array_merge($params, $optParams);
-    return $this->call('delete', array($params), "Google_Service_Analytics_Filter");
-  }
-  /**
-   * Returns a filters to which the user has access. (filters.get)
-   *
-   * @param string $accountId Account ID to retrieve filters for.
-   * @param string $filterId Filter ID to retrieve filters for.
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Analytics_Filter
-   */
-  public function get($accountId, $filterId, $optParams = array())
-  {
-    $params = array('accountId' => $accountId, 'filterId' => $filterId);
-    $params = array_merge($params, $optParams);
-    return $this->call('get', array($params), "Google_Service_Analytics_Filter");
-  }
-  /**
-   * Create a new filter. (filters.insert)
-   *
-   * @param string $accountId Account ID to create filter for.
-   * @param Google_Service_Analytics_Filter $postBody
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Analytics_Filter
-   */
-  public function insert($accountId, Google_Service_Analytics_Filter $postBody, $optParams = array())
-  {
-    $params = array('accountId' => $accountId, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('insert', array($params), "Google_Service_Analytics_Filter");
-  }
-  /**
-   * Lists all filters for an account (filters.listManagementFilters)
-   *
-   * @param string $accountId Account ID to retrieve filters for.
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param int max-results The maximum number of filters to include in this
-   * response.
-   * @opt_param int start-index An index of the first entity to retrieve. Use this
-   * parameter as a pagination mechanism along with the max-results parameter.
-   * @return Google_Service_Analytics_Filters
-   */
-  public function listManagementFilters($accountId, $optParams = array())
-  {
-    $params = array('accountId' => $accountId);
-    $params = array_merge($params, $optParams);
-    return $this->call('list', array($params), "Google_Service_Analytics_Filters");
-  }
-  /**
-   * Updates an existing filter. This method supports patch semantics.
-   * (filters.patch)
-   *
-   * @param string $accountId Account ID to which the filter belongs.
-   * @param string $filterId ID of the filter to be updated.
-   * @param Google_Service_Analytics_Filter $postBody
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Analytics_Filter
-   */
-  public function patch($accountId, $filterId, Google_Service_Analytics_Filter $postBody, $optParams = array())
-  {
-    $params = array('accountId' => $accountId, 'filterId' => $filterId, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('patch', array($params), "Google_Service_Analytics_Filter");
-  }
-  /**
-   * Updates an existing filter. (filters.update)
-   *
-   * @param string $accountId Account ID to which the filter belongs.
-   * @param string $filterId ID of the filter to be updated.
-   * @param Google_Service_Analytics_Filter $postBody
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Analytics_Filter
-   */
-  public function update($accountId, $filterId, Google_Service_Analytics_Filter $postBody, $optParams = array())
-  {
-    $params = array('accountId' => $accountId, 'filterId' => $filterId, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('update', array($params), "Google_Service_Analytics_Filter");
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Analytics/Resource/ManagementGoals.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Analytics/Resource/ManagementGoals.php
deleted file mode 100644
index 0943b5c2..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Analytics/Resource/ManagementGoals.php
+++ /dev/null
@@ -1,120 +0,0 @@
-
- *   $analyticsService = new Google_Service_Analytics(...);
- *   $goals = $analyticsService->goals;
- *  
- */
-class Google_Service_Analytics_Resource_ManagementGoals extends Google_Service_Resource
-{
-  /**
-   * Gets a goal to which the user has access. (goals.get)
-   *
-   * @param string $accountId Account ID to retrieve the goal for.
-   * @param string $webPropertyId Web property ID to retrieve the goal for.
-   * @param string $profileId View (Profile) ID to retrieve the goal for.
-   * @param string $goalId Goal ID to retrieve the goal for.
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Analytics_Goal
-   */
-  public function get($accountId, $webPropertyId, $profileId, $goalId, $optParams = array())
-  {
-    $params = array('accountId' => $accountId, 'webPropertyId' => $webPropertyId, 'profileId' => $profileId, 'goalId' => $goalId);
-    $params = array_merge($params, $optParams);
-    return $this->call('get', array($params), "Google_Service_Analytics_Goal");
-  }
-  /**
-   * Create a new goal. (goals.insert)
-   *
-   * @param string $accountId Account ID to create the goal for.
-   * @param string $webPropertyId Web property ID to create the goal for.
-   * @param string $profileId View (Profile) ID to create the goal for.
-   * @param Google_Service_Analytics_Goal $postBody
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Analytics_Goal
-   */
-  public function insert($accountId, $webPropertyId, $profileId, Google_Service_Analytics_Goal $postBody, $optParams = array())
-  {
-    $params = array('accountId' => $accountId, 'webPropertyId' => $webPropertyId, 'profileId' => $profileId, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('insert', array($params), "Google_Service_Analytics_Goal");
-  }
-  /**
-   * Lists goals to which the user has access. (goals.listManagementGoals)
-   *
-   * @param string $accountId Account ID to retrieve goals for. Can either be a
-   * specific account ID or '~all', which refers to all the accounts that user has
-   * access to.
-   * @param string $webPropertyId Web property ID to retrieve goals for. Can
-   * either be a specific web property ID or '~all', which refers to all the web
-   * properties that user has access to.
-   * @param string $profileId View (Profile) ID to retrieve goals for. Can either
-   * be a specific view (profile) ID or '~all', which refers to all the views
-   * (profiles) that user has access to.
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param int max-results The maximum number of goals to include in this
-   * response.
-   * @opt_param int start-index An index of the first goal to retrieve. Use this
-   * parameter as a pagination mechanism along with the max-results parameter.
-   * @return Google_Service_Analytics_Goals
-   */
-  public function listManagementGoals($accountId, $webPropertyId, $profileId, $optParams = array())
-  {
-    $params = array('accountId' => $accountId, 'webPropertyId' => $webPropertyId, 'profileId' => $profileId);
-    $params = array_merge($params, $optParams);
-    return $this->call('list', array($params), "Google_Service_Analytics_Goals");
-  }
-  /**
-   * Updates an existing goal. This method supports patch semantics. (goals.patch)
-   *
-   * @param string $accountId Account ID to update the goal.
-   * @param string $webPropertyId Web property ID to update the goal.
-   * @param string $profileId View (Profile) ID to update the goal.
-   * @param string $goalId Index of the goal to be updated.
-   * @param Google_Service_Analytics_Goal $postBody
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Analytics_Goal
-   */
-  public function patch($accountId, $webPropertyId, $profileId, $goalId, Google_Service_Analytics_Goal $postBody, $optParams = array())
-  {
-    $params = array('accountId' => $accountId, 'webPropertyId' => $webPropertyId, 'profileId' => $profileId, 'goalId' => $goalId, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('patch', array($params), "Google_Service_Analytics_Goal");
-  }
-  /**
-   * Updates an existing goal. (goals.update)
-   *
-   * @param string $accountId Account ID to update the goal.
-   * @param string $webPropertyId Web property ID to update the goal.
-   * @param string $profileId View (Profile) ID to update the goal.
-   * @param string $goalId Index of the goal to be updated.
-   * @param Google_Service_Analytics_Goal $postBody
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Analytics_Goal
-   */
-  public function update($accountId, $webPropertyId, $profileId, $goalId, Google_Service_Analytics_Goal $postBody, $optParams = array())
-  {
-    $params = array('accountId' => $accountId, 'webPropertyId' => $webPropertyId, 'profileId' => $profileId, 'goalId' => $goalId, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('update', array($params), "Google_Service_Analytics_Goal");
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Analytics/Resource/ManagementProfileFilterLinks.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Analytics/Resource/ManagementProfileFilterLinks.php
deleted file mode 100644
index acb6f7e9..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Analytics/Resource/ManagementProfileFilterLinks.php
+++ /dev/null
@@ -1,140 +0,0 @@
-
- *   $analyticsService = new Google_Service_Analytics(...);
- *   $profileFilterLinks = $analyticsService->profileFilterLinks;
- *  
- */
-class Google_Service_Analytics_Resource_ManagementProfileFilterLinks extends Google_Service_Resource
-{
-  /**
-   * Delete a profile filter link. (profileFilterLinks.delete)
-   *
-   * @param string $accountId Account ID to which the profile filter link belongs.
-   * @param string $webPropertyId Web property Id to which the profile filter link
-   * belongs.
-   * @param string $profileId Profile ID to which the filter link belongs.
-   * @param string $linkId ID of the profile filter link to delete.
-   * @param array $optParams Optional parameters.
-   */
-  public function delete($accountId, $webPropertyId, $profileId, $linkId, $optParams = array())
-  {
-    $params = array('accountId' => $accountId, 'webPropertyId' => $webPropertyId, 'profileId' => $profileId, 'linkId' => $linkId);
-    $params = array_merge($params, $optParams);
-    return $this->call('delete', array($params));
-  }
-  /**
-   * Returns a single profile filter link. (profileFilterLinks.get)
-   *
-   * @param string $accountId Account ID to retrieve profile filter link for.
-   * @param string $webPropertyId Web property Id to retrieve profile filter link
-   * for.
-   * @param string $profileId Profile ID to retrieve filter link for.
-   * @param string $linkId ID of the profile filter link.
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Analytics_ProfileFilterLink
-   */
-  public function get($accountId, $webPropertyId, $profileId, $linkId, $optParams = array())
-  {
-    $params = array('accountId' => $accountId, 'webPropertyId' => $webPropertyId, 'profileId' => $profileId, 'linkId' => $linkId);
-    $params = array_merge($params, $optParams);
-    return $this->call('get', array($params), "Google_Service_Analytics_ProfileFilterLink");
-  }
-  /**
-   * Create a new profile filter link. (profileFilterLinks.insert)
-   *
-   * @param string $accountId Account ID to create profile filter link for.
-   * @param string $webPropertyId Web property Id to create profile filter link
-   * for.
-   * @param string $profileId Profile ID to create filter link for.
-   * @param Google_Service_Analytics_ProfileFilterLink $postBody
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Analytics_ProfileFilterLink
-   */
-  public function insert($accountId, $webPropertyId, $profileId, Google_Service_Analytics_ProfileFilterLink $postBody, $optParams = array())
-  {
-    $params = array('accountId' => $accountId, 'webPropertyId' => $webPropertyId, 'profileId' => $profileId, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('insert', array($params), "Google_Service_Analytics_ProfileFilterLink");
-  }
-  /**
-   * Lists all profile filter links for a profile.
-   * (profileFilterLinks.listManagementProfileFilterLinks)
-   *
-   * @param string $accountId Account ID to retrieve profile filter links for.
-   * @param string $webPropertyId Web property Id for profile filter links for.
-   * Can either be a specific web property ID or '~all', which refers to all the
-   * web properties that user has access to.
-   * @param string $profileId Profile ID to retrieve filter links for. Can either
-   * be a specific profile ID or '~all', which refers to all the profiles that
-   * user has access to.
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param int max-results The maximum number of profile filter links to
-   * include in this response.
-   * @opt_param int start-index An index of the first entity to retrieve. Use this
-   * parameter as a pagination mechanism along with the max-results parameter.
-   * @return Google_Service_Analytics_ProfileFilterLinks
-   */
-  public function listManagementProfileFilterLinks($accountId, $webPropertyId, $profileId, $optParams = array())
-  {
-    $params = array('accountId' => $accountId, 'webPropertyId' => $webPropertyId, 'profileId' => $profileId);
-    $params = array_merge($params, $optParams);
-    return $this->call('list', array($params), "Google_Service_Analytics_ProfileFilterLinks");
-  }
-  /**
-   * Update an existing profile filter link. This method supports patch semantics.
-   * (profileFilterLinks.patch)
-   *
-   * @param string $accountId Account ID to which profile filter link belongs.
-   * @param string $webPropertyId Web property Id to which profile filter link
-   * belongs
-   * @param string $profileId Profile ID to which filter link belongs
-   * @param string $linkId ID of the profile filter link to be updated.
-   * @param Google_Service_Analytics_ProfileFilterLink $postBody
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Analytics_ProfileFilterLink
-   */
-  public function patch($accountId, $webPropertyId, $profileId, $linkId, Google_Service_Analytics_ProfileFilterLink $postBody, $optParams = array())
-  {
-    $params = array('accountId' => $accountId, 'webPropertyId' => $webPropertyId, 'profileId' => $profileId, 'linkId' => $linkId, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('patch', array($params), "Google_Service_Analytics_ProfileFilterLink");
-  }
-  /**
-   * Update an existing profile filter link. (profileFilterLinks.update)
-   *
-   * @param string $accountId Account ID to which profile filter link belongs.
-   * @param string $webPropertyId Web property Id to which profile filter link
-   * belongs
-   * @param string $profileId Profile ID to which filter link belongs
-   * @param string $linkId ID of the profile filter link to be updated.
-   * @param Google_Service_Analytics_ProfileFilterLink $postBody
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Analytics_ProfileFilterLink
-   */
-  public function update($accountId, $webPropertyId, $profileId, $linkId, Google_Service_Analytics_ProfileFilterLink $postBody, $optParams = array())
-  {
-    $params = array('accountId' => $accountId, 'webPropertyId' => $webPropertyId, 'profileId' => $profileId, 'linkId' => $linkId, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('update', array($params), "Google_Service_Analytics_ProfileFilterLink");
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Analytics/Resource/ManagementProfileUserLinks.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Analytics/Resource/ManagementProfileUserLinks.php
deleted file mode 100644
index 97d6a097..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Analytics/Resource/ManagementProfileUserLinks.php
+++ /dev/null
@@ -1,104 +0,0 @@
-
- *   $analyticsService = new Google_Service_Analytics(...);
- *   $profileUserLinks = $analyticsService->profileUserLinks;
- *  
- */
-class Google_Service_Analytics_Resource_ManagementProfileUserLinks extends Google_Service_Resource
-{
-  /**
-   * Removes a user from the given view (profile). (profileUserLinks.delete)
-   *
-   * @param string $accountId Account ID to delete the user link for.
-   * @param string $webPropertyId Web Property ID to delete the user link for.
-   * @param string $profileId View (Profile) ID to delete the user link for.
-   * @param string $linkId Link ID to delete the user link for.
-   * @param array $optParams Optional parameters.
-   */
-  public function delete($accountId, $webPropertyId, $profileId, $linkId, $optParams = array())
-  {
-    $params = array('accountId' => $accountId, 'webPropertyId' => $webPropertyId, 'profileId' => $profileId, 'linkId' => $linkId);
-    $params = array_merge($params, $optParams);
-    return $this->call('delete', array($params));
-  }
-  /**
-   * Adds a new user to the given view (profile). (profileUserLinks.insert)
-   *
-   * @param string $accountId Account ID to create the user link for.
-   * @param string $webPropertyId Web Property ID to create the user link for.
-   * @param string $profileId View (Profile) ID to create the user link for.
-   * @param Google_Service_Analytics_EntityUserLink $postBody
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Analytics_EntityUserLink
-   */
-  public function insert($accountId, $webPropertyId, $profileId, Google_Service_Analytics_EntityUserLink $postBody, $optParams = array())
-  {
-    $params = array('accountId' => $accountId, 'webPropertyId' => $webPropertyId, 'profileId' => $profileId, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('insert', array($params), "Google_Service_Analytics_EntityUserLink");
-  }
-  /**
-   * Lists profile-user links for a given view (profile).
-   * (profileUserLinks.listManagementProfileUserLinks)
-   *
-   * @param string $accountId Account ID which the given view (profile) belongs
-   * to.
-   * @param string $webPropertyId Web Property ID which the given view (profile)
-   * belongs to. Can either be a specific web property ID or '~all', which refers
-   * to all the web properties that user has access to.
-   * @param string $profileId View (Profile) ID to retrieve the profile-user links
-   * for. Can either be a specific profile ID or '~all', which refers to all the
-   * profiles that user has access to.
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param int max-results The maximum number of profile-user links to
-   * include in this response.
-   * @opt_param int start-index An index of the first profile-user link to
-   * retrieve. Use this parameter as a pagination mechanism along with the max-
-   * results parameter.
-   * @return Google_Service_Analytics_EntityUserLinks
-   */
-  public function listManagementProfileUserLinks($accountId, $webPropertyId, $profileId, $optParams = array())
-  {
-    $params = array('accountId' => $accountId, 'webPropertyId' => $webPropertyId, 'profileId' => $profileId);
-    $params = array_merge($params, $optParams);
-    return $this->call('list', array($params), "Google_Service_Analytics_EntityUserLinks");
-  }
-  /**
-   * Updates permissions for an existing user on the given view (profile).
-   * (profileUserLinks.update)
-   *
-   * @param string $accountId Account ID to update the user link for.
-   * @param string $webPropertyId Web Property ID to update the user link for.
-   * @param string $profileId View (Profile ID) to update the user link for.
-   * @param string $linkId Link ID to update the user link for.
-   * @param Google_Service_Analytics_EntityUserLink $postBody
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Analytics_EntityUserLink
-   */
-  public function update($accountId, $webPropertyId, $profileId, $linkId, Google_Service_Analytics_EntityUserLink $postBody, $optParams = array())
-  {
-    $params = array('accountId' => $accountId, 'webPropertyId' => $webPropertyId, 'profileId' => $profileId, 'linkId' => $linkId, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('update', array($params), "Google_Service_Analytics_EntityUserLink");
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Analytics/Resource/ManagementProfiles.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Analytics/Resource/ManagementProfiles.php
deleted file mode 100644
index a72f0bcd..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Analytics/Resource/ManagementProfiles.php
+++ /dev/null
@@ -1,135 +0,0 @@
-
- *   $analyticsService = new Google_Service_Analytics(...);
- *   $profiles = $analyticsService->profiles;
- *  
- */
-class Google_Service_Analytics_Resource_ManagementProfiles extends Google_Service_Resource
-{
-  /**
-   * Deletes a view (profile). (profiles.delete)
-   *
-   * @param string $accountId Account ID to delete the view (profile) for.
-   * @param string $webPropertyId Web property ID to delete the view (profile)
-   * for.
-   * @param string $profileId ID of the view (profile) to be deleted.
-   * @param array $optParams Optional parameters.
-   */
-  public function delete($accountId, $webPropertyId, $profileId, $optParams = array())
-  {
-    $params = array('accountId' => $accountId, 'webPropertyId' => $webPropertyId, 'profileId' => $profileId);
-    $params = array_merge($params, $optParams);
-    return $this->call('delete', array($params));
-  }
-  /**
-   * Gets a view (profile) to which the user has access. (profiles.get)
-   *
-   * @param string $accountId Account ID to retrieve the view (profile) for.
-   * @param string $webPropertyId Web property ID to retrieve the view (profile)
-   * for.
-   * @param string $profileId View (Profile) ID to retrieve the view (profile)
-   * for.
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Analytics_Profile
-   */
-  public function get($accountId, $webPropertyId, $profileId, $optParams = array())
-  {
-    $params = array('accountId' => $accountId, 'webPropertyId' => $webPropertyId, 'profileId' => $profileId);
-    $params = array_merge($params, $optParams);
-    return $this->call('get', array($params), "Google_Service_Analytics_Profile");
-  }
-  /**
-   * Create a new view (profile). (profiles.insert)
-   *
-   * @param string $accountId Account ID to create the view (profile) for.
-   * @param string $webPropertyId Web property ID to create the view (profile)
-   * for.
-   * @param Google_Service_Analytics_Profile $postBody
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Analytics_Profile
-   */
-  public function insert($accountId, $webPropertyId, Google_Service_Analytics_Profile $postBody, $optParams = array())
-  {
-    $params = array('accountId' => $accountId, 'webPropertyId' => $webPropertyId, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('insert', array($params), "Google_Service_Analytics_Profile");
-  }
-  /**
-   * Lists views (profiles) to which the user has access.
-   * (profiles.listManagementProfiles)
-   *
-   * @param string $accountId Account ID for the view (profiles) to retrieve. Can
-   * either be a specific account ID or '~all', which refers to all the accounts
-   * to which the user has access.
-   * @param string $webPropertyId Web property ID for the views (profiles) to
-   * retrieve. Can either be a specific web property ID or '~all', which refers to
-   * all the web properties to which the user has access.
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param int max-results The maximum number of views (profiles) to include
-   * in this response.
-   * @opt_param int start-index An index of the first entity to retrieve. Use this
-   * parameter as a pagination mechanism along with the max-results parameter.
-   * @return Google_Service_Analytics_Profiles
-   */
-  public function listManagementProfiles($accountId, $webPropertyId, $optParams = array())
-  {
-    $params = array('accountId' => $accountId, 'webPropertyId' => $webPropertyId);
-    $params = array_merge($params, $optParams);
-    return $this->call('list', array($params), "Google_Service_Analytics_Profiles");
-  }
-  /**
-   * Updates an existing view (profile). This method supports patch semantics.
-   * (profiles.patch)
-   *
-   * @param string $accountId Account ID to which the view (profile) belongs
-   * @param string $webPropertyId Web property ID to which the view (profile)
-   * belongs
-   * @param string $profileId ID of the view (profile) to be updated.
-   * @param Google_Service_Analytics_Profile $postBody
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Analytics_Profile
-   */
-  public function patch($accountId, $webPropertyId, $profileId, Google_Service_Analytics_Profile $postBody, $optParams = array())
-  {
-    $params = array('accountId' => $accountId, 'webPropertyId' => $webPropertyId, 'profileId' => $profileId, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('patch', array($params), "Google_Service_Analytics_Profile");
-  }
-  /**
-   * Updates an existing view (profile). (profiles.update)
-   *
-   * @param string $accountId Account ID to which the view (profile) belongs
-   * @param string $webPropertyId Web property ID to which the view (profile)
-   * belongs
-   * @param string $profileId ID of the view (profile) to be updated.
-   * @param Google_Service_Analytics_Profile $postBody
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Analytics_Profile
-   */
-  public function update($accountId, $webPropertyId, $profileId, Google_Service_Analytics_Profile $postBody, $optParams = array())
-  {
-    $params = array('accountId' => $accountId, 'webPropertyId' => $webPropertyId, 'profileId' => $profileId, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('update', array($params), "Google_Service_Analytics_Profile");
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Analytics/Resource/ManagementRemarketingAudience.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Analytics/Resource/ManagementRemarketingAudience.php
deleted file mode 100644
index ad23bb92..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Analytics/Resource/ManagementRemarketingAudience.php
+++ /dev/null
@@ -1,126 +0,0 @@
-
- *   $analyticsService = new Google_Service_Analytics(...);
- *   $remarketingAudience = $analyticsService->remarketingAudience;
- *  
- */
-class Google_Service_Analytics_Resource_ManagementRemarketingAudience extends Google_Service_Resource
-{
-  /**
-   * Gets a remarketing audience to which the user has access.
-   * (remarketingAudience.get)
-   *
-   * @param string $accountId The account ID of the remarketing audience to
-   * retrieve.
-   * @param string $webPropertyId The web property ID of the remarketing audience
-   * to retrieve.
-   * @param string $remarketingAudienceId The ID of the remarketing audience to
-   * retrieve.
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Analytics_RemarketingAudience
-   */
-  public function get($accountId, $webPropertyId, $remarketingAudienceId, $optParams = array())
-  {
-    $params = array('accountId' => $accountId, 'webPropertyId' => $webPropertyId, 'remarketingAudienceId' => $remarketingAudienceId);
-    $params = array_merge($params, $optParams);
-    return $this->call('get', array($params), "Google_Service_Analytics_RemarketingAudience");
-  }
-  /**
-   * Creates a new remarketing audience. (remarketingAudience.insert)
-   *
-   * @param string $accountId The account ID for which to create the remarketing
-   * audience.
-   * @param string $webPropertyId Web property ID for which to create the
-   * remarketing audience.
-   * @param Google_Service_Analytics_RemarketingAudience $postBody
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Analytics_RemarketingAudience
-   */
-  public function insert($accountId, $webPropertyId, Google_Service_Analytics_RemarketingAudience $postBody, $optParams = array())
-  {
-    $params = array('accountId' => $accountId, 'webPropertyId' => $webPropertyId, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('insert', array($params), "Google_Service_Analytics_RemarketingAudience");
-  }
-  /**
-   * Lists remarketing audiences to which the user has access.
-   * (remarketingAudience.listManagementRemarketingAudience)
-   *
-   * @param string $accountId The account ID of the remarketing audiences to
-   * retrieve.
-   * @param string $webPropertyId The web property ID of the remarketing audiences
-   * to retrieve.
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param int max-results The maximum number of remarketing audiences to
-   * include in this response.
-   * @opt_param int start-index An index of the first entity to retrieve. Use this
-   * parameter as a pagination mechanism along with the max-results parameter.
-   * @opt_param string type
-   * @return Google_Service_Analytics_RemarketingAudiences
-   */
-  public function listManagementRemarketingAudience($accountId, $webPropertyId, $optParams = array())
-  {
-    $params = array('accountId' => $accountId, 'webPropertyId' => $webPropertyId);
-    $params = array_merge($params, $optParams);
-    return $this->call('list', array($params), "Google_Service_Analytics_RemarketingAudiences");
-  }
-  /**
-   * Updates an existing remarketing audience. This method supports patch
-   * semantics. (remarketingAudience.patch)
-   *
-   * @param string $accountId The account ID of the remarketing audience to
-   * update.
-   * @param string $webPropertyId The web property ID of the remarketing audience
-   * to update.
-   * @param string $remarketingAudienceId The ID of the remarketing audience to
-   * update.
-   * @param Google_Service_Analytics_RemarketingAudience $postBody
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Analytics_RemarketingAudience
-   */
-  public function patch($accountId, $webPropertyId, $remarketingAudienceId, Google_Service_Analytics_RemarketingAudience $postBody, $optParams = array())
-  {
-    $params = array('accountId' => $accountId, 'webPropertyId' => $webPropertyId, 'remarketingAudienceId' => $remarketingAudienceId, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('patch', array($params), "Google_Service_Analytics_RemarketingAudience");
-  }
-  /**
-   * Updates an existing remarketing audience. (remarketingAudience.update)
-   *
-   * @param string $accountId The account ID of the remarketing audience to
-   * update.
-   * @param string $webPropertyId The web property ID of the remarketing audience
-   * to update.
-   * @param string $remarketingAudienceId The ID of the remarketing audience to
-   * update.
-   * @param Google_Service_Analytics_RemarketingAudience $postBody
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Analytics_RemarketingAudience
-   */
-  public function update($accountId, $webPropertyId, $remarketingAudienceId, Google_Service_Analytics_RemarketingAudience $postBody, $optParams = array())
-  {
-    $params = array('accountId' => $accountId, 'webPropertyId' => $webPropertyId, 'remarketingAudienceId' => $remarketingAudienceId, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('update', array($params), "Google_Service_Analytics_RemarketingAudience");
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Analytics/Resource/ManagementSegments.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Analytics/Resource/ManagementSegments.php
deleted file mode 100644
index b3925a82..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Analytics/Resource/ManagementSegments.php
+++ /dev/null
@@ -1,47 +0,0 @@
-
- *   $analyticsService = new Google_Service_Analytics(...);
- *   $segments = $analyticsService->segments;
- *  
- */
-class Google_Service_Analytics_Resource_ManagementSegments extends Google_Service_Resource
-{
-  /**
-   * Lists segments to which the user has access.
-   * (segments.listManagementSegments)
-   *
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param int max-results The maximum number of segments to include in this
-   * response.
-   * @opt_param int start-index An index of the first segment to retrieve. Use
-   * this parameter as a pagination mechanism along with the max-results
-   * parameter.
-   * @return Google_Service_Analytics_Segments
-   */
-  public function listManagementSegments($optParams = array())
-  {
-    $params = array();
-    $params = array_merge($params, $optParams);
-    return $this->call('list', array($params), "Google_Service_Analytics_Segments");
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Analytics/Resource/ManagementUnsampledReports.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Analytics/Resource/ManagementUnsampledReports.php
deleted file mode 100644
index ce2bd67a..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Analytics/Resource/ManagementUnsampledReports.php
+++ /dev/null
@@ -1,105 +0,0 @@
-
- *   $analyticsService = new Google_Service_Analytics(...);
- *   $unsampledReports = $analyticsService->unsampledReports;
- *  
- */
-class Google_Service_Analytics_Resource_ManagementUnsampledReports extends Google_Service_Resource
-{
-  /**
-   * Deletes an unsampled report. (unsampledReports.delete)
-   *
-   * @param string $accountId Account ID to delete the unsampled report for.
-   * @param string $webPropertyId Web property ID to delete the unsampled reports
-   * for.
-   * @param string $profileId View (Profile) ID to delete the unsampled report
-   * for.
-   * @param string $unsampledReportId ID of the unsampled report to be deleted.
-   * @param array $optParams Optional parameters.
-   */
-  public function delete($accountId, $webPropertyId, $profileId, $unsampledReportId, $optParams = array())
-  {
-    $params = array('accountId' => $accountId, 'webPropertyId' => $webPropertyId, 'profileId' => $profileId, 'unsampledReportId' => $unsampledReportId);
-    $params = array_merge($params, $optParams);
-    return $this->call('delete', array($params));
-  }
-  /**
-   * Returns a single unsampled report. (unsampledReports.get)
-   *
-   * @param string $accountId Account ID to retrieve unsampled report for.
-   * @param string $webPropertyId Web property ID to retrieve unsampled reports
-   * for.
-   * @param string $profileId View (Profile) ID to retrieve unsampled report for.
-   * @param string $unsampledReportId ID of the unsampled report to retrieve.
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Analytics_UnsampledReport
-   */
-  public function get($accountId, $webPropertyId, $profileId, $unsampledReportId, $optParams = array())
-  {
-    $params = array('accountId' => $accountId, 'webPropertyId' => $webPropertyId, 'profileId' => $profileId, 'unsampledReportId' => $unsampledReportId);
-    $params = array_merge($params, $optParams);
-    return $this->call('get', array($params), "Google_Service_Analytics_UnsampledReport");
-  }
-  /**
-   * Create a new unsampled report. (unsampledReports.insert)
-   *
-   * @param string $accountId Account ID to create the unsampled report for.
-   * @param string $webPropertyId Web property ID to create the unsampled report
-   * for.
-   * @param string $profileId View (Profile) ID to create the unsampled report
-   * for.
-   * @param Google_Service_Analytics_UnsampledReport $postBody
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Analytics_UnsampledReport
-   */
-  public function insert($accountId, $webPropertyId, $profileId, Google_Service_Analytics_UnsampledReport $postBody, $optParams = array())
-  {
-    $params = array('accountId' => $accountId, 'webPropertyId' => $webPropertyId, 'profileId' => $profileId, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('insert', array($params), "Google_Service_Analytics_UnsampledReport");
-  }
-  /**
-   * Lists unsampled reports to which the user has access.
-   * (unsampledReports.listManagementUnsampledReports)
-   *
-   * @param string $accountId Account ID to retrieve unsampled reports for. Must
-   * be a specific account ID, ~all is not supported.
-   * @param string $webPropertyId Web property ID to retrieve unsampled reports
-   * for. Must be a specific web property ID, ~all is not supported.
-   * @param string $profileId View (Profile) ID to retrieve unsampled reports for.
-   * Must be a specific view (profile) ID, ~all is not supported.
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param int max-results The maximum number of unsampled reports to include
-   * in this response.
-   * @opt_param int start-index An index of the first unsampled report to
-   * retrieve. Use this parameter as a pagination mechanism along with the max-
-   * results parameter.
-   * @return Google_Service_Analytics_UnsampledReports
-   */
-  public function listManagementUnsampledReports($accountId, $webPropertyId, $profileId, $optParams = array())
-  {
-    $params = array('accountId' => $accountId, 'webPropertyId' => $webPropertyId, 'profileId' => $profileId);
-    $params = array_merge($params, $optParams);
-    return $this->call('list', array($params), "Google_Service_Analytics_UnsampledReports");
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Analytics/Resource/ManagementUploads.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Analytics/Resource/ManagementUploads.php
deleted file mode 100644
index b6b77011..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Analytics/Resource/ManagementUploads.php
+++ /dev/null
@@ -1,100 +0,0 @@
-
- *   $analyticsService = new Google_Service_Analytics(...);
- *   $uploads = $analyticsService->uploads;
- *  
- */
-class Google_Service_Analytics_Resource_ManagementUploads extends Google_Service_Resource
-{
-  /**
-   * Delete data associated with a previous upload. (uploads.deleteUploadData)
-   *
-   * @param string $accountId Account Id for the uploads to be deleted.
-   * @param string $webPropertyId Web property Id for the uploads to be deleted.
-   * @param string $customDataSourceId Custom data source Id for the uploads to be
-   * deleted.
-   * @param Google_Service_Analytics_AnalyticsDataimportDeleteUploadDataRequest $postBody
-   * @param array $optParams Optional parameters.
-   */
-  public function deleteUploadData($accountId, $webPropertyId, $customDataSourceId, Google_Service_Analytics_AnalyticsDataimportDeleteUploadDataRequest $postBody, $optParams = array())
-  {
-    $params = array('accountId' => $accountId, 'webPropertyId' => $webPropertyId, 'customDataSourceId' => $customDataSourceId, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('deleteUploadData', array($params));
-  }
-  /**
-   * List uploads to which the user has access. (uploads.get)
-   *
-   * @param string $accountId Account Id for the upload to retrieve.
-   * @param string $webPropertyId Web property Id for the upload to retrieve.
-   * @param string $customDataSourceId Custom data source Id for upload to
-   * retrieve.
-   * @param string $uploadId Upload Id to retrieve.
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Analytics_Upload
-   */
-  public function get($accountId, $webPropertyId, $customDataSourceId, $uploadId, $optParams = array())
-  {
-    $params = array('accountId' => $accountId, 'webPropertyId' => $webPropertyId, 'customDataSourceId' => $customDataSourceId, 'uploadId' => $uploadId);
-    $params = array_merge($params, $optParams);
-    return $this->call('get', array($params), "Google_Service_Analytics_Upload");
-  }
-  /**
-   * List uploads to which the user has access. (uploads.listManagementUploads)
-   *
-   * @param string $accountId Account Id for the uploads to retrieve.
-   * @param string $webPropertyId Web property Id for the uploads to retrieve.
-   * @param string $customDataSourceId Custom data source Id for uploads to
-   * retrieve.
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param int max-results The maximum number of uploads to include in this
-   * response.
-   * @opt_param int start-index A 1-based index of the first upload to retrieve.
-   * Use this parameter as a pagination mechanism along with the max-results
-   * parameter.
-   * @return Google_Service_Analytics_Uploads
-   */
-  public function listManagementUploads($accountId, $webPropertyId, $customDataSourceId, $optParams = array())
-  {
-    $params = array('accountId' => $accountId, 'webPropertyId' => $webPropertyId, 'customDataSourceId' => $customDataSourceId);
-    $params = array_merge($params, $optParams);
-    return $this->call('list', array($params), "Google_Service_Analytics_Uploads");
-  }
-  /**
-   * Upload data for a custom data source. (uploads.uploadData)
-   *
-   * @param string $accountId Account Id associated with the upload.
-   * @param string $webPropertyId Web property UA-string associated with the
-   * upload.
-   * @param string $customDataSourceId Custom data source Id to which the data
-   * being uploaded belongs.
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Analytics_Upload
-   */
-  public function uploadData($accountId, $webPropertyId, $customDataSourceId, $optParams = array())
-  {
-    $params = array('accountId' => $accountId, 'webPropertyId' => $webPropertyId, 'customDataSourceId' => $customDataSourceId);
-    $params = array_merge($params, $optParams);
-    return $this->call('uploadData', array($params), "Google_Service_Analytics_Upload");
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Analytics/Resource/ManagementWebPropertyAdWordsLinks.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Analytics/Resource/ManagementWebPropertyAdWordsLinks.php
deleted file mode 100644
index 12ce084c..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Analytics/Resource/ManagementWebPropertyAdWordsLinks.php
+++ /dev/null
@@ -1,138 +0,0 @@
-
- *   $analyticsService = new Google_Service_Analytics(...);
- *   $webPropertyAdWordsLinks = $analyticsService->webPropertyAdWordsLinks;
- *  
- */
-class Google_Service_Analytics_Resource_ManagementWebPropertyAdWordsLinks extends Google_Service_Resource
-{
-  /**
-   * Deletes a web property-AdWords link. (webPropertyAdWordsLinks.delete)
-   *
-   * @param string $accountId ID of the account which the given web property
-   * belongs to.
-   * @param string $webPropertyId Web property ID to delete the AdWords link for.
-   * @param string $webPropertyAdWordsLinkId Web property AdWords link ID.
-   * @param array $optParams Optional parameters.
-   */
-  public function delete($accountId, $webPropertyId, $webPropertyAdWordsLinkId, $optParams = array())
-  {
-    $params = array('accountId' => $accountId, 'webPropertyId' => $webPropertyId, 'webPropertyAdWordsLinkId' => $webPropertyAdWordsLinkId);
-    $params = array_merge($params, $optParams);
-    return $this->call('delete', array($params));
-  }
-  /**
-   * Returns a web property-AdWords link to which the user has access.
-   * (webPropertyAdWordsLinks.get)
-   *
-   * @param string $accountId ID of the account which the given web property
-   * belongs to.
-   * @param string $webPropertyId Web property ID to retrieve the AdWords link
-   * for.
-   * @param string $webPropertyAdWordsLinkId Web property-AdWords link ID.
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Analytics_EntityAdWordsLink
-   */
-  public function get($accountId, $webPropertyId, $webPropertyAdWordsLinkId, $optParams = array())
-  {
-    $params = array('accountId' => $accountId, 'webPropertyId' => $webPropertyId, 'webPropertyAdWordsLinkId' => $webPropertyAdWordsLinkId);
-    $params = array_merge($params, $optParams);
-    return $this->call('get', array($params), "Google_Service_Analytics_EntityAdWordsLink");
-  }
-  /**
-   * Creates a webProperty-AdWords link. (webPropertyAdWordsLinks.insert)
-   *
-   * @param string $accountId ID of the Google Analytics account to create the
-   * link for.
-   * @param string $webPropertyId Web property ID to create the link for.
-   * @param Google_Service_Analytics_EntityAdWordsLink $postBody
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Analytics_EntityAdWordsLink
-   */
-  public function insert($accountId, $webPropertyId, Google_Service_Analytics_EntityAdWordsLink $postBody, $optParams = array())
-  {
-    $params = array('accountId' => $accountId, 'webPropertyId' => $webPropertyId, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('insert', array($params), "Google_Service_Analytics_EntityAdWordsLink");
-  }
-  /**
-   * Lists webProperty-AdWords links for a given web property.
-   * (webPropertyAdWordsLinks.listManagementWebPropertyAdWordsLinks)
-   *
-   * @param string $accountId ID of the account which the given web property
-   * belongs to.
-   * @param string $webPropertyId Web property ID to retrieve the AdWords links
-   * for.
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param int max-results The maximum number of webProperty-AdWords links to
-   * include in this response.
-   * @opt_param int start-index An index of the first webProperty-AdWords link to
-   * retrieve. Use this parameter as a pagination mechanism along with the max-
-   * results parameter.
-   * @return Google_Service_Analytics_EntityAdWordsLinks
-   */
-  public function listManagementWebPropertyAdWordsLinks($accountId, $webPropertyId, $optParams = array())
-  {
-    $params = array('accountId' => $accountId, 'webPropertyId' => $webPropertyId);
-    $params = array_merge($params, $optParams);
-    return $this->call('list', array($params), "Google_Service_Analytics_EntityAdWordsLinks");
-  }
-  /**
-   * Updates an existing webProperty-AdWords link. This method supports patch
-   * semantics. (webPropertyAdWordsLinks.patch)
-   *
-   * @param string $accountId ID of the account which the given web property
-   * belongs to.
-   * @param string $webPropertyId Web property ID to retrieve the AdWords link
-   * for.
-   * @param string $webPropertyAdWordsLinkId Web property-AdWords link ID.
-   * @param Google_Service_Analytics_EntityAdWordsLink $postBody
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Analytics_EntityAdWordsLink
-   */
-  public function patch($accountId, $webPropertyId, $webPropertyAdWordsLinkId, Google_Service_Analytics_EntityAdWordsLink $postBody, $optParams = array())
-  {
-    $params = array('accountId' => $accountId, 'webPropertyId' => $webPropertyId, 'webPropertyAdWordsLinkId' => $webPropertyAdWordsLinkId, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('patch', array($params), "Google_Service_Analytics_EntityAdWordsLink");
-  }
-  /**
-   * Updates an existing webProperty-AdWords link.
-   * (webPropertyAdWordsLinks.update)
-   *
-   * @param string $accountId ID of the account which the given web property
-   * belongs to.
-   * @param string $webPropertyId Web property ID to retrieve the AdWords link
-   * for.
-   * @param string $webPropertyAdWordsLinkId Web property-AdWords link ID.
-   * @param Google_Service_Analytics_EntityAdWordsLink $postBody
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Analytics_EntityAdWordsLink
-   */
-  public function update($accountId, $webPropertyId, $webPropertyAdWordsLinkId, Google_Service_Analytics_EntityAdWordsLink $postBody, $optParams = array())
-  {
-    $params = array('accountId' => $accountId, 'webPropertyId' => $webPropertyId, 'webPropertyAdWordsLinkId' => $webPropertyAdWordsLinkId, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('update', array($params), "Google_Service_Analytics_EntityAdWordsLink");
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Analytics/Resource/ManagementWebproperties.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Analytics/Resource/ManagementWebproperties.php
deleted file mode 100644
index 272b0e66..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Analytics/Resource/ManagementWebproperties.php
+++ /dev/null
@@ -1,110 +0,0 @@
-
- *   $analyticsService = new Google_Service_Analytics(...);
- *   $webproperties = $analyticsService->webproperties;
- *  
- */
-class Google_Service_Analytics_Resource_ManagementWebproperties extends Google_Service_Resource
-{
-  /**
-   * Gets a web property to which the user has access. (webproperties.get)
-   *
-   * @param string $accountId Account ID to retrieve the web property for.
-   * @param string $webPropertyId ID to retrieve the web property for.
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Analytics_Webproperty
-   */
-  public function get($accountId, $webPropertyId, $optParams = array())
-  {
-    $params = array('accountId' => $accountId, 'webPropertyId' => $webPropertyId);
-    $params = array_merge($params, $optParams);
-    return $this->call('get', array($params), "Google_Service_Analytics_Webproperty");
-  }
-  /**
-   * Create a new property if the account has fewer than 20 properties. Web
-   * properties are visible in the Google Analytics interface only if they have at
-   * least one profile. (webproperties.insert)
-   *
-   * @param string $accountId Account ID to create the web property for.
-   * @param Google_Service_Analytics_Webproperty $postBody
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Analytics_Webproperty
-   */
-  public function insert($accountId, Google_Service_Analytics_Webproperty $postBody, $optParams = array())
-  {
-    $params = array('accountId' => $accountId, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('insert', array($params), "Google_Service_Analytics_Webproperty");
-  }
-  /**
-   * Lists web properties to which the user has access.
-   * (webproperties.listManagementWebproperties)
-   *
-   * @param string $accountId Account ID to retrieve web properties for. Can
-   * either be a specific account ID or '~all', which refers to all the accounts
-   * that user has access to.
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param int max-results The maximum number of web properties to include in
-   * this response.
-   * @opt_param int start-index An index of the first entity to retrieve. Use this
-   * parameter as a pagination mechanism along with the max-results parameter.
-   * @return Google_Service_Analytics_Webproperties
-   */
-  public function listManagementWebproperties($accountId, $optParams = array())
-  {
-    $params = array('accountId' => $accountId);
-    $params = array_merge($params, $optParams);
-    return $this->call('list', array($params), "Google_Service_Analytics_Webproperties");
-  }
-  /**
-   * Updates an existing web property. This method supports patch semantics.
-   * (webproperties.patch)
-   *
-   * @param string $accountId Account ID to which the web property belongs
-   * @param string $webPropertyId Web property ID
-   * @param Google_Service_Analytics_Webproperty $postBody
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Analytics_Webproperty
-   */
-  public function patch($accountId, $webPropertyId, Google_Service_Analytics_Webproperty $postBody, $optParams = array())
-  {
-    $params = array('accountId' => $accountId, 'webPropertyId' => $webPropertyId, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('patch', array($params), "Google_Service_Analytics_Webproperty");
-  }
-  /**
-   * Updates an existing web property. (webproperties.update)
-   *
-   * @param string $accountId Account ID to which the web property belongs
-   * @param string $webPropertyId Web property ID
-   * @param Google_Service_Analytics_Webproperty $postBody
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Analytics_Webproperty
-   */
-  public function update($accountId, $webPropertyId, Google_Service_Analytics_Webproperty $postBody, $optParams = array())
-  {
-    $params = array('accountId' => $accountId, 'webPropertyId' => $webPropertyId, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('update', array($params), "Google_Service_Analytics_Webproperty");
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Analytics/Resource/ManagementWebpropertyUserLinks.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Analytics/Resource/ManagementWebpropertyUserLinks.php
deleted file mode 100644
index a0f42a88..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Analytics/Resource/ManagementWebpropertyUserLinks.php
+++ /dev/null
@@ -1,98 +0,0 @@
-
- *   $analyticsService = new Google_Service_Analytics(...);
- *   $webpropertyUserLinks = $analyticsService->webpropertyUserLinks;
- *  
- */
-class Google_Service_Analytics_Resource_ManagementWebpropertyUserLinks extends Google_Service_Resource
-{
-  /**
-   * Removes a user from the given web property. (webpropertyUserLinks.delete)
-   *
-   * @param string $accountId Account ID to delete the user link for.
-   * @param string $webPropertyId Web Property ID to delete the user link for.
-   * @param string $linkId Link ID to delete the user link for.
-   * @param array $optParams Optional parameters.
-   */
-  public function delete($accountId, $webPropertyId, $linkId, $optParams = array())
-  {
-    $params = array('accountId' => $accountId, 'webPropertyId' => $webPropertyId, 'linkId' => $linkId);
-    $params = array_merge($params, $optParams);
-    return $this->call('delete', array($params));
-  }
-  /**
-   * Adds a new user to the given web property. (webpropertyUserLinks.insert)
-   *
-   * @param string $accountId Account ID to create the user link for.
-   * @param string $webPropertyId Web Property ID to create the user link for.
-   * @param Google_Service_Analytics_EntityUserLink $postBody
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Analytics_EntityUserLink
-   */
-  public function insert($accountId, $webPropertyId, Google_Service_Analytics_EntityUserLink $postBody, $optParams = array())
-  {
-    $params = array('accountId' => $accountId, 'webPropertyId' => $webPropertyId, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('insert', array($params), "Google_Service_Analytics_EntityUserLink");
-  }
-  /**
-   * Lists webProperty-user links for a given web property.
-   * (webpropertyUserLinks.listManagementWebpropertyUserLinks)
-   *
-   * @param string $accountId Account ID which the given web property belongs to.
-   * @param string $webPropertyId Web Property ID for the webProperty-user links
-   * to retrieve. Can either be a specific web property ID or '~all', which refers
-   * to all the web properties that user has access to.
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param int max-results The maximum number of webProperty-user Links to
-   * include in this response.
-   * @opt_param int start-index An index of the first webProperty-user link to
-   * retrieve. Use this parameter as a pagination mechanism along with the max-
-   * results parameter.
-   * @return Google_Service_Analytics_EntityUserLinks
-   */
-  public function listManagementWebpropertyUserLinks($accountId, $webPropertyId, $optParams = array())
-  {
-    $params = array('accountId' => $accountId, 'webPropertyId' => $webPropertyId);
-    $params = array_merge($params, $optParams);
-    return $this->call('list', array($params), "Google_Service_Analytics_EntityUserLinks");
-  }
-  /**
-   * Updates permissions for an existing user on the given web property.
-   * (webpropertyUserLinks.update)
-   *
-   * @param string $accountId Account ID to update the account-user link for.
-   * @param string $webPropertyId Web property ID to update the account-user link
-   * for.
-   * @param string $linkId Link ID to update the account-user link for.
-   * @param Google_Service_Analytics_EntityUserLink $postBody
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Analytics_EntityUserLink
-   */
-  public function update($accountId, $webPropertyId, $linkId, Google_Service_Analytics_EntityUserLink $postBody, $optParams = array())
-  {
-    $params = array('accountId' => $accountId, 'webPropertyId' => $webPropertyId, 'linkId' => $linkId, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('update', array($params), "Google_Service_Analytics_EntityUserLink");
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Analytics/Resource/Metadata.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Analytics/Resource/Metadata.php
deleted file mode 100644
index 81421fe5..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Analytics/Resource/Metadata.php
+++ /dev/null
@@ -1,28 +0,0 @@
-
- *   $analyticsService = new Google_Service_Analytics(...);
- *   $metadata = $analyticsService->metadata;
- *  
- */
-class Google_Service_Analytics_Resource_Metadata extends Google_Service_Resource
-{
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Analytics/Resource/MetadataColumns.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Analytics/Resource/MetadataColumns.php
deleted file mode 100644
index 3574a0d6..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Analytics/Resource/MetadataColumns.php
+++ /dev/null
@@ -1,42 +0,0 @@
-
- *   $analyticsService = new Google_Service_Analytics(...);
- *   $columns = $analyticsService->columns;
- *  
- */
-class Google_Service_Analytics_Resource_MetadataColumns extends Google_Service_Resource
-{
-  /**
-   * Lists all columns for a report type (columns.listMetadataColumns)
-   *
-   * @param string $reportType Report type. Allowed Values: 'ga'. Where 'ga'
-   * corresponds to the Core Reporting API
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Analytics_Columns
-   */
-  public function listMetadataColumns($reportType, $optParams = array())
-  {
-    $params = array('reportType' => $reportType);
-    $params = array_merge($params, $optParams);
-    return $this->call('list', array($params), "Google_Service_Analytics_Columns");
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Analytics/Resource/Provisioning.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Analytics/Resource/Provisioning.php
deleted file mode 100644
index b3829ff8..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Analytics/Resource/Provisioning.php
+++ /dev/null
@@ -1,41 +0,0 @@
-
- *   $analyticsService = new Google_Service_Analytics(...);
- *   $provisioning = $analyticsService->provisioning;
- *  
- */
-class Google_Service_Analytics_Resource_Provisioning extends Google_Service_Resource
-{
-  /**
-   * Creates an account ticket. (provisioning.createAccountTicket)
-   *
-   * @param Google_Service_Analytics_AccountTicket $postBody
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Analytics_AccountTicket
-   */
-  public function createAccountTicket(Google_Service_Analytics_AccountTicket $postBody, $optParams = array())
-  {
-    $params = array('postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('createAccountTicket', array($params), "Google_Service_Analytics_AccountTicket");
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Analytics/Segment.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Analytics/Segment.php
deleted file mode 100644
index 0e3caa2a..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Analytics/Segment.php
+++ /dev/null
@@ -1,102 +0,0 @@
-created = $created;
-  }
-  public function getCreated()
-  {
-    return $this->created;
-  }
-  public function setDefinition($definition)
-  {
-    $this->definition = $definition;
-  }
-  public function getDefinition()
-  {
-    return $this->definition;
-  }
-  public function setId($id)
-  {
-    $this->id = $id;
-  }
-  public function getId()
-  {
-    return $this->id;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setName($name)
-  {
-    $this->name = $name;
-  }
-  public function getName()
-  {
-    return $this->name;
-  }
-  public function setSegmentId($segmentId)
-  {
-    $this->segmentId = $segmentId;
-  }
-  public function getSegmentId()
-  {
-    return $this->segmentId;
-  }
-  public function setSelfLink($selfLink)
-  {
-    $this->selfLink = $selfLink;
-  }
-  public function getSelfLink()
-  {
-    return $this->selfLink;
-  }
-  public function setType($type)
-  {
-    $this->type = $type;
-  }
-  public function getType()
-  {
-    return $this->type;
-  }
-  public function setUpdated($updated)
-  {
-    $this->updated = $updated;
-  }
-  public function getUpdated()
-  {
-    return $this->updated;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Analytics/Segments.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Analytics/Segments.php
deleted file mode 100644
index ec874e65..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Analytics/Segments.php
+++ /dev/null
@@ -1,95 +0,0 @@
-items = $items;
-  }
-  public function getItems()
-  {
-    return $this->items;
-  }
-  public function setItemsPerPage($itemsPerPage)
-  {
-    $this->itemsPerPage = $itemsPerPage;
-  }
-  public function getItemsPerPage()
-  {
-    return $this->itemsPerPage;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setNextLink($nextLink)
-  {
-    $this->nextLink = $nextLink;
-  }
-  public function getNextLink()
-  {
-    return $this->nextLink;
-  }
-  public function setPreviousLink($previousLink)
-  {
-    $this->previousLink = $previousLink;
-  }
-  public function getPreviousLink()
-  {
-    return $this->previousLink;
-  }
-  public function setStartIndex($startIndex)
-  {
-    $this->startIndex = $startIndex;
-  }
-  public function getStartIndex()
-  {
-    return $this->startIndex;
-  }
-  public function setTotalResults($totalResults)
-  {
-    $this->totalResults = $totalResults;
-  }
-  public function getTotalResults()
-  {
-    return $this->totalResults;
-  }
-  public function setUsername($username)
-  {
-    $this->username = $username;
-  }
-  public function getUsername()
-  {
-    return $this->username;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Analytics/UnsampledReport.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Analytics/UnsampledReport.php
deleted file mode 100644
index a87bfe10..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Analytics/UnsampledReport.php
+++ /dev/null
@@ -1,198 +0,0 @@
- "end-date",
-        "startDate" => "start-date",
-  );
-  public $accountId;
-  protected $cloudStorageDownloadDetailsType = 'Google_Service_Analytics_UnsampledReportCloudStorageDownloadDetails';
-  protected $cloudStorageDownloadDetailsDataType = '';
-  public $created;
-  public $dimensions;
-  public $downloadType;
-  protected $driveDownloadDetailsType = 'Google_Service_Analytics_UnsampledReportDriveDownloadDetails';
-  protected $driveDownloadDetailsDataType = '';
-  public $endDate;
-  public $filters;
-  public $id;
-  public $kind;
-  public $metrics;
-  public $profileId;
-  public $segment;
-  public $selfLink;
-  public $startDate;
-  public $status;
-  public $title;
-  public $updated;
-  public $webPropertyId;
-
-  public function setAccountId($accountId)
-  {
-    $this->accountId = $accountId;
-  }
-  public function getAccountId()
-  {
-    return $this->accountId;
-  }
-  public function setCloudStorageDownloadDetails(Google_Service_Analytics_UnsampledReportCloudStorageDownloadDetails $cloudStorageDownloadDetails)
-  {
-    $this->cloudStorageDownloadDetails = $cloudStorageDownloadDetails;
-  }
-  public function getCloudStorageDownloadDetails()
-  {
-    return $this->cloudStorageDownloadDetails;
-  }
-  public function setCreated($created)
-  {
-    $this->created = $created;
-  }
-  public function getCreated()
-  {
-    return $this->created;
-  }
-  public function setDimensions($dimensions)
-  {
-    $this->dimensions = $dimensions;
-  }
-  public function getDimensions()
-  {
-    return $this->dimensions;
-  }
-  public function setDownloadType($downloadType)
-  {
-    $this->downloadType = $downloadType;
-  }
-  public function getDownloadType()
-  {
-    return $this->downloadType;
-  }
-  public function setDriveDownloadDetails(Google_Service_Analytics_UnsampledReportDriveDownloadDetails $driveDownloadDetails)
-  {
-    $this->driveDownloadDetails = $driveDownloadDetails;
-  }
-  public function getDriveDownloadDetails()
-  {
-    return $this->driveDownloadDetails;
-  }
-  public function setEndDate($endDate)
-  {
-    $this->endDate = $endDate;
-  }
-  public function getEndDate()
-  {
-    return $this->endDate;
-  }
-  public function setFilters($filters)
-  {
-    $this->filters = $filters;
-  }
-  public function getFilters()
-  {
-    return $this->filters;
-  }
-  public function setId($id)
-  {
-    $this->id = $id;
-  }
-  public function getId()
-  {
-    return $this->id;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setMetrics($metrics)
-  {
-    $this->metrics = $metrics;
-  }
-  public function getMetrics()
-  {
-    return $this->metrics;
-  }
-  public function setProfileId($profileId)
-  {
-    $this->profileId = $profileId;
-  }
-  public function getProfileId()
-  {
-    return $this->profileId;
-  }
-  public function setSegment($segment)
-  {
-    $this->segment = $segment;
-  }
-  public function getSegment()
-  {
-    return $this->segment;
-  }
-  public function setSelfLink($selfLink)
-  {
-    $this->selfLink = $selfLink;
-  }
-  public function getSelfLink()
-  {
-    return $this->selfLink;
-  }
-  public function setStartDate($startDate)
-  {
-    $this->startDate = $startDate;
-  }
-  public function getStartDate()
-  {
-    return $this->startDate;
-  }
-  public function setStatus($status)
-  {
-    $this->status = $status;
-  }
-  public function getStatus()
-  {
-    return $this->status;
-  }
-  public function setTitle($title)
-  {
-    $this->title = $title;
-  }
-  public function getTitle()
-  {
-    return $this->title;
-  }
-  public function setUpdated($updated)
-  {
-    $this->updated = $updated;
-  }
-  public function getUpdated()
-  {
-    return $this->updated;
-  }
-  public function setWebPropertyId($webPropertyId)
-  {
-    $this->webPropertyId = $webPropertyId;
-  }
-  public function getWebPropertyId()
-  {
-    return $this->webPropertyId;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Analytics/UnsampledReportCloudStorageDownloadDetails.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Analytics/UnsampledReportCloudStorageDownloadDetails.php
deleted file mode 100644
index 48a7533f..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Analytics/UnsampledReportCloudStorageDownloadDetails.php
+++ /dev/null
@@ -1,39 +0,0 @@
-bucketId = $bucketId;
-  }
-  public function getBucketId()
-  {
-    return $this->bucketId;
-  }
-  public function setObjectId($objectId)
-  {
-    $this->objectId = $objectId;
-  }
-  public function getObjectId()
-  {
-    return $this->objectId;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Analytics/UnsampledReportDriveDownloadDetails.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Analytics/UnsampledReportDriveDownloadDetails.php
deleted file mode 100644
index 805cec88..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Analytics/UnsampledReportDriveDownloadDetails.php
+++ /dev/null
@@ -1,30 +0,0 @@
-documentId = $documentId;
-  }
-  public function getDocumentId()
-  {
-    return $this->documentId;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Analytics/UnsampledReports.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Analytics/UnsampledReports.php
deleted file mode 100644
index dda579e5..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Analytics/UnsampledReports.php
+++ /dev/null
@@ -1,95 +0,0 @@
-items = $items;
-  }
-  public function getItems()
-  {
-    return $this->items;
-  }
-  public function setItemsPerPage($itemsPerPage)
-  {
-    $this->itemsPerPage = $itemsPerPage;
-  }
-  public function getItemsPerPage()
-  {
-    return $this->itemsPerPage;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setNextLink($nextLink)
-  {
-    $this->nextLink = $nextLink;
-  }
-  public function getNextLink()
-  {
-    return $this->nextLink;
-  }
-  public function setPreviousLink($previousLink)
-  {
-    $this->previousLink = $previousLink;
-  }
-  public function getPreviousLink()
-  {
-    return $this->previousLink;
-  }
-  public function setStartIndex($startIndex)
-  {
-    $this->startIndex = $startIndex;
-  }
-  public function getStartIndex()
-  {
-    return $this->startIndex;
-  }
-  public function setTotalResults($totalResults)
-  {
-    $this->totalResults = $totalResults;
-  }
-  public function getTotalResults()
-  {
-    return $this->totalResults;
-  }
-  public function setUsername($username)
-  {
-    $this->username = $username;
-  }
-  public function getUsername()
-  {
-    return $this->username;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Analytics/Upload.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Analytics/Upload.php
deleted file mode 100644
index 0da4f5b7..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Analytics/Upload.php
+++ /dev/null
@@ -1,76 +0,0 @@
-accountId = $accountId;
-  }
-  public function getAccountId()
-  {
-    return $this->accountId;
-  }
-  public function setCustomDataSourceId($customDataSourceId)
-  {
-    $this->customDataSourceId = $customDataSourceId;
-  }
-  public function getCustomDataSourceId()
-  {
-    return $this->customDataSourceId;
-  }
-  public function setErrors($errors)
-  {
-    $this->errors = $errors;
-  }
-  public function getErrors()
-  {
-    return $this->errors;
-  }
-  public function setId($id)
-  {
-    $this->id = $id;
-  }
-  public function getId()
-  {
-    return $this->id;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setStatus($status)
-  {
-    $this->status = $status;
-  }
-  public function getStatus()
-  {
-    return $this->status;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Analytics/Uploads.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Analytics/Uploads.php
deleted file mode 100644
index 4324bad9..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Analytics/Uploads.php
+++ /dev/null
@@ -1,86 +0,0 @@
-items = $items;
-  }
-  public function getItems()
-  {
-    return $this->items;
-  }
-  public function setItemsPerPage($itemsPerPage)
-  {
-    $this->itemsPerPage = $itemsPerPage;
-  }
-  public function getItemsPerPage()
-  {
-    return $this->itemsPerPage;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setNextLink($nextLink)
-  {
-    $this->nextLink = $nextLink;
-  }
-  public function getNextLink()
-  {
-    return $this->nextLink;
-  }
-  public function setPreviousLink($previousLink)
-  {
-    $this->previousLink = $previousLink;
-  }
-  public function getPreviousLink()
-  {
-    return $this->previousLink;
-  }
-  public function setStartIndex($startIndex)
-  {
-    $this->startIndex = $startIndex;
-  }
-  public function getStartIndex()
-  {
-    return $this->startIndex;
-  }
-  public function setTotalResults($totalResults)
-  {
-    $this->totalResults = $totalResults;
-  }
-  public function getTotalResults()
-  {
-    return $this->totalResults;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Analytics/UserRef.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Analytics/UserRef.php
deleted file mode 100644
index 649bd1d3..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Analytics/UserRef.php
+++ /dev/null
@@ -1,48 +0,0 @@
-email = $email;
-  }
-  public function getEmail()
-  {
-    return $this->email;
-  }
-  public function setId($id)
-  {
-    $this->id = $id;
-  }
-  public function getId()
-  {
-    return $this->id;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Analytics/WebPropertyRef.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Analytics/WebPropertyRef.php
deleted file mode 100644
index 2c9ce1d7..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Analytics/WebPropertyRef.php
+++ /dev/null
@@ -1,75 +0,0 @@
-accountId = $accountId;
-  }
-  public function getAccountId()
-  {
-    return $this->accountId;
-  }
-  public function setHref($href)
-  {
-    $this->href = $href;
-  }
-  public function getHref()
-  {
-    return $this->href;
-  }
-  public function setId($id)
-  {
-    $this->id = $id;
-  }
-  public function getId()
-  {
-    return $this->id;
-  }
-  public function setInternalWebPropertyId($internalWebPropertyId)
-  {
-    $this->internalWebPropertyId = $internalWebPropertyId;
-  }
-  public function getInternalWebPropertyId()
-  {
-    return $this->internalWebPropertyId;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setName($name)
-  {
-    $this->name = $name;
-  }
-  public function getName()
-  {
-    return $this->name;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Analytics/WebPropertySummary.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Analytics/WebPropertySummary.php
deleted file mode 100644
index 63ae34bf..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Analytics/WebPropertySummary.php
+++ /dev/null
@@ -1,95 +0,0 @@
-id = $id;
-  }
-  public function getId()
-  {
-    return $this->id;
-  }
-  public function setInternalWebPropertyId($internalWebPropertyId)
-  {
-    $this->internalWebPropertyId = $internalWebPropertyId;
-  }
-  public function getInternalWebPropertyId()
-  {
-    return $this->internalWebPropertyId;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setLevel($level)
-  {
-    $this->level = $level;
-  }
-  public function getLevel()
-  {
-    return $this->level;
-  }
-  public function setName($name)
-  {
-    $this->name = $name;
-  }
-  public function getName()
-  {
-    return $this->name;
-  }
-  public function setProfiles($profiles)
-  {
-    $this->profiles = $profiles;
-  }
-  public function getProfiles()
-  {
-    return $this->profiles;
-  }
-  public function setStarred($starred)
-  {
-    $this->starred = $starred;
-  }
-  public function getStarred()
-  {
-    return $this->starred;
-  }
-  public function setWebsiteUrl($websiteUrl)
-  {
-    $this->websiteUrl = $websiteUrl;
-  }
-  public function getWebsiteUrl()
-  {
-    return $this->websiteUrl;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Analytics/Webproperties.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Analytics/Webproperties.php
deleted file mode 100644
index fcdecd39..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Analytics/Webproperties.php
+++ /dev/null
@@ -1,95 +0,0 @@
-items = $items;
-  }
-  public function getItems()
-  {
-    return $this->items;
-  }
-  public function setItemsPerPage($itemsPerPage)
-  {
-    $this->itemsPerPage = $itemsPerPage;
-  }
-  public function getItemsPerPage()
-  {
-    return $this->itemsPerPage;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setNextLink($nextLink)
-  {
-    $this->nextLink = $nextLink;
-  }
-  public function getNextLink()
-  {
-    return $this->nextLink;
-  }
-  public function setPreviousLink($previousLink)
-  {
-    $this->previousLink = $previousLink;
-  }
-  public function getPreviousLink()
-  {
-    return $this->previousLink;
-  }
-  public function setStartIndex($startIndex)
-  {
-    $this->startIndex = $startIndex;
-  }
-  public function getStartIndex()
-  {
-    return $this->startIndex;
-  }
-  public function setTotalResults($totalResults)
-  {
-    $this->totalResults = $totalResults;
-  }
-  public function getTotalResults()
-  {
-    return $this->totalResults;
-  }
-  public function setUsername($username)
-  {
-    $this->username = $username;
-  }
-  public function getUsername()
-  {
-    return $this->username;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Analytics/Webproperty.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Analytics/Webproperty.php
deleted file mode 100644
index 5d2e3629..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Analytics/Webproperty.php
+++ /dev/null
@@ -1,177 +0,0 @@
-accountId = $accountId;
-  }
-  public function getAccountId()
-  {
-    return $this->accountId;
-  }
-  public function setChildLink(Google_Service_Analytics_WebpropertyChildLink $childLink)
-  {
-    $this->childLink = $childLink;
-  }
-  public function getChildLink()
-  {
-    return $this->childLink;
-  }
-  public function setCreated($created)
-  {
-    $this->created = $created;
-  }
-  public function getCreated()
-  {
-    return $this->created;
-  }
-  public function setDefaultProfileId($defaultProfileId)
-  {
-    $this->defaultProfileId = $defaultProfileId;
-  }
-  public function getDefaultProfileId()
-  {
-    return $this->defaultProfileId;
-  }
-  public function setId($id)
-  {
-    $this->id = $id;
-  }
-  public function getId()
-  {
-    return $this->id;
-  }
-  public function setIndustryVertical($industryVertical)
-  {
-    $this->industryVertical = $industryVertical;
-  }
-  public function getIndustryVertical()
-  {
-    return $this->industryVertical;
-  }
-  public function setInternalWebPropertyId($internalWebPropertyId)
-  {
-    $this->internalWebPropertyId = $internalWebPropertyId;
-  }
-  public function getInternalWebPropertyId()
-  {
-    return $this->internalWebPropertyId;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setLevel($level)
-  {
-    $this->level = $level;
-  }
-  public function getLevel()
-  {
-    return $this->level;
-  }
-  public function setName($name)
-  {
-    $this->name = $name;
-  }
-  public function getName()
-  {
-    return $this->name;
-  }
-  public function setParentLink(Google_Service_Analytics_WebpropertyParentLink $parentLink)
-  {
-    $this->parentLink = $parentLink;
-  }
-  public function getParentLink()
-  {
-    return $this->parentLink;
-  }
-  public function setPermissions(Google_Service_Analytics_WebpropertyPermissions $permissions)
-  {
-    $this->permissions = $permissions;
-  }
-  public function getPermissions()
-  {
-    return $this->permissions;
-  }
-  public function setProfileCount($profileCount)
-  {
-    $this->profileCount = $profileCount;
-  }
-  public function getProfileCount()
-  {
-    return $this->profileCount;
-  }
-  public function setSelfLink($selfLink)
-  {
-    $this->selfLink = $selfLink;
-  }
-  public function getSelfLink()
-  {
-    return $this->selfLink;
-  }
-  public function setStarred($starred)
-  {
-    $this->starred = $starred;
-  }
-  public function getStarred()
-  {
-    return $this->starred;
-  }
-  public function setUpdated($updated)
-  {
-    $this->updated = $updated;
-  }
-  public function getUpdated()
-  {
-    return $this->updated;
-  }
-  public function setWebsiteUrl($websiteUrl)
-  {
-    $this->websiteUrl = $websiteUrl;
-  }
-  public function getWebsiteUrl()
-  {
-    return $this->websiteUrl;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Analytics/WebpropertyChildLink.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Analytics/WebpropertyChildLink.php
deleted file mode 100644
index f61b2cf0..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Analytics/WebpropertyChildLink.php
+++ /dev/null
@@ -1,39 +0,0 @@
-href = $href;
-  }
-  public function getHref()
-  {
-    return $this->href;
-  }
-  public function setType($type)
-  {
-    $this->type = $type;
-  }
-  public function getType()
-  {
-    return $this->type;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Analytics/WebpropertyParentLink.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Analytics/WebpropertyParentLink.php
deleted file mode 100644
index 2df9c8c7..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Analytics/WebpropertyParentLink.php
+++ /dev/null
@@ -1,39 +0,0 @@
-href = $href;
-  }
-  public function getHref()
-  {
-    return $this->href;
-  }
-  public function setType($type)
-  {
-    $this->type = $type;
-  }
-  public function getType()
-  {
-    return $this->type;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Analytics/WebpropertyPermissions.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Analytics/WebpropertyPermissions.php
deleted file mode 100644
index 5305e8b1..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Analytics/WebpropertyPermissions.php
+++ /dev/null
@@ -1,31 +0,0 @@
-effective = $effective;
-  }
-  public function getEffective()
-  {
-    return $this->effective;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AnalyticsReporting.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AnalyticsReporting.php
deleted file mode 100644
index 789a2b2c..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AnalyticsReporting.php
+++ /dev/null
@@ -1,70 +0,0 @@
-
- * Accesses Analytics report data.

- *
- * 

- * For more information about this service, see the API
- * Documentation
- * 

- *
- * @author Google, Inc.
- */
-class Google_Service_AnalyticsReporting extends Google_Service
-{
-  /** View and manage your Google Analytics data. */
-  const ANALYTICS =
-      "https://www.googleapis.com/auth/analytics";
-  /** View your Google Analytics data. */
-  const ANALYTICS_READONLY =
-      "https://www.googleapis.com/auth/analytics.readonly";
-
-  public $reports;
-  
-  /**
-   * Constructs the internal representation of the AnalyticsReporting service.
-   *
-   * @param Google_Client $client
-   */
-  public function __construct(Google_Client $client)
-  {
-    parent::__construct($client);
-    $this->rootUrl = 'https://analyticsreporting.googleapis.com/';
-    $this->servicePath = '';
-    $this->version = 'v4';
-    $this->serviceName = 'analyticsreporting';
-
-    $this->reports = new Google_Service_AnalyticsReporting_Resource_Reports(
-        $this,
-        $this->serviceName,
-        'reports',
-        array(
-          'methods' => array(
-            'batchGet' => array(
-              'path' => 'v4/reports:batchGet',
-              'httpMethod' => 'POST',
-              'parameters' => array(),
-            ),
-          )
-        )
-    );
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AnalyticsReporting/Cohort.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AnalyticsReporting/Cohort.php
deleted file mode 100644
index 9ad3b8f0..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AnalyticsReporting/Cohort.php
+++ /dev/null
@@ -1,49 +0,0 @@
-dateRange = $dateRange;
-  }
-  public function getDateRange()
-  {
-    return $this->dateRange;
-  }
-  public function setName($name)
-  {
-    $this->name = $name;
-  }
-  public function getName()
-  {
-    return $this->name;
-  }
-  public function setType($type)
-  {
-    $this->type = $type;
-  }
-  public function getType()
-  {
-    return $this->type;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AnalyticsReporting/CohortGroup.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AnalyticsReporting/CohortGroup.php
deleted file mode 100644
index a173e839..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AnalyticsReporting/CohortGroup.php
+++ /dev/null
@@ -1,41 +0,0 @@
-cohorts = $cohorts;
-  }
-  public function getCohorts()
-  {
-    return $this->cohorts;
-  }
-  public function setLifetimeValue($lifetimeValue)
-  {
-    $this->lifetimeValue = $lifetimeValue;
-  }
-  public function getLifetimeValue()
-  {
-    return $this->lifetimeValue;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AnalyticsReporting/ColumnHeader.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AnalyticsReporting/ColumnHeader.php
deleted file mode 100644
index 0f6ee458..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AnalyticsReporting/ColumnHeader.php
+++ /dev/null
@@ -1,41 +0,0 @@
-dimensions = $dimensions;
-  }
-  public function getDimensions()
-  {
-    return $this->dimensions;
-  }
-  public function setMetricHeader(Google_Service_AnalyticsReporting_MetricHeader $metricHeader)
-  {
-    $this->metricHeader = $metricHeader;
-  }
-  public function getMetricHeader()
-  {
-    return $this->metricHeader;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AnalyticsReporting/DateRange.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AnalyticsReporting/DateRange.php
deleted file mode 100644
index 9b9152b9..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AnalyticsReporting/DateRange.php
+++ /dev/null
@@ -1,39 +0,0 @@
-endDate = $endDate;
-  }
-  public function getEndDate()
-  {
-    return $this->endDate;
-  }
-  public function setStartDate($startDate)
-  {
-    $this->startDate = $startDate;
-  }
-  public function getStartDate()
-  {
-    return $this->startDate;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AnalyticsReporting/DateRangeValues.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AnalyticsReporting/DateRangeValues.php
deleted file mode 100644
index 82d52bc1..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AnalyticsReporting/DateRangeValues.php
+++ /dev/null
@@ -1,41 +0,0 @@
-pivotValueRegions = $pivotValueRegions;
-  }
-  public function getPivotValueRegions()
-  {
-    return $this->pivotValueRegions;
-  }
-  public function setValues($values)
-  {
-    $this->values = $values;
-  }
-  public function getValues()
-  {
-    return $this->values;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AnalyticsReporting/Dimension.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AnalyticsReporting/Dimension.php
deleted file mode 100644
index 8ed06791..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AnalyticsReporting/Dimension.php
+++ /dev/null
@@ -1,40 +0,0 @@
-histogramBuckets = $histogramBuckets;
-  }
-  public function getHistogramBuckets()
-  {
-    return $this->histogramBuckets;
-  }
-  public function setName($name)
-  {
-    $this->name = $name;
-  }
-  public function getName()
-  {
-    return $this->name;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AnalyticsReporting/DimensionFilter.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AnalyticsReporting/DimensionFilter.php
deleted file mode 100644
index eb512f11..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AnalyticsReporting/DimensionFilter.php
+++ /dev/null
@@ -1,67 +0,0 @@
-caseSensitive = $caseSensitive;
-  }
-  public function getCaseSensitive()
-  {
-    return $this->caseSensitive;
-  }
-  public function setDimensionName($dimensionName)
-  {
-    $this->dimensionName = $dimensionName;
-  }
-  public function getDimensionName()
-  {
-    return $this->dimensionName;
-  }
-  public function setExpressions($expressions)
-  {
-    $this->expressions = $expressions;
-  }
-  public function getExpressions()
-  {
-    return $this->expressions;
-  }
-  public function setNot($not)
-  {
-    $this->not = $not;
-  }
-  public function getNot()
-  {
-    return $this->not;
-  }
-  public function setOperator($operator)
-  {
-    $this->operator = $operator;
-  }
-  public function getOperator()
-  {
-    return $this->operator;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AnalyticsReporting/DimensionFilterClause.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AnalyticsReporting/DimensionFilterClause.php
deleted file mode 100644
index 317f0ee8..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AnalyticsReporting/DimensionFilterClause.php
+++ /dev/null
@@ -1,41 +0,0 @@
-filters = $filters;
-  }
-  public function getFilters()
-  {
-    return $this->filters;
-  }
-  public function setOperator($operator)
-  {
-    $this->operator = $operator;
-  }
-  public function getOperator()
-  {
-    return $this->operator;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AnalyticsReporting/DynamicSegment.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AnalyticsReporting/DynamicSegment.php
deleted file mode 100644
index 7d41be7d..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AnalyticsReporting/DynamicSegment.php
+++ /dev/null
@@ -1,50 +0,0 @@
-name = $name;
-  }
-  public function getName()
-  {
-    return $this->name;
-  }
-  public function setSessionSegment(Google_Service_AnalyticsReporting_SegmentDefinition $sessionSegment)
-  {
-    $this->sessionSegment = $sessionSegment;
-  }
-  public function getSessionSegment()
-  {
-    return $this->sessionSegment;
-  }
-  public function setUserSegment(Google_Service_AnalyticsReporting_SegmentDefinition $userSegment)
-  {
-    $this->userSegment = $userSegment;
-  }
-  public function getUserSegment()
-  {
-    return $this->userSegment;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AnalyticsReporting/GetReportsRequest.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AnalyticsReporting/GetReportsRequest.php
deleted file mode 100644
index e1a0e9bb..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AnalyticsReporting/GetReportsRequest.php
+++ /dev/null
@@ -1,32 +0,0 @@
-reportRequests = $reportRequests;
-  }
-  public function getReportRequests()
-  {
-    return $this->reportRequests;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AnalyticsReporting/GetReportsResponse.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AnalyticsReporting/GetReportsResponse.php
deleted file mode 100644
index 15ff4976..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AnalyticsReporting/GetReportsResponse.php
+++ /dev/null
@@ -1,32 +0,0 @@
-reports = $reports;
-  }
-  public function getReports()
-  {
-    return $this->reports;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AnalyticsReporting/Metric.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AnalyticsReporting/Metric.php
deleted file mode 100644
index 6dc69e98..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AnalyticsReporting/Metric.php
+++ /dev/null
@@ -1,48 +0,0 @@
-alias = $alias;
-  }
-  public function getAlias()
-  {
-    return $this->alias;
-  }
-  public function setExpression($expression)
-  {
-    $this->expression = $expression;
-  }
-  public function getExpression()
-  {
-    return $this->expression;
-  }
-  public function setFormattingType($formattingType)
-  {
-    $this->formattingType = $formattingType;
-  }
-  public function getFormattingType()
-  {
-    return $this->formattingType;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AnalyticsReporting/MetricFilter.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AnalyticsReporting/MetricFilter.php
deleted file mode 100644
index 713c50c0..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AnalyticsReporting/MetricFilter.php
+++ /dev/null
@@ -1,57 +0,0 @@
-comparisonValue = $comparisonValue;
-  }
-  public function getComparisonValue()
-  {
-    return $this->comparisonValue;
-  }
-  public function setMetricName($metricName)
-  {
-    $this->metricName = $metricName;
-  }
-  public function getMetricName()
-  {
-    return $this->metricName;
-  }
-  public function setNot($not)
-  {
-    $this->not = $not;
-  }
-  public function getNot()
-  {
-    return $this->not;
-  }
-  public function setOperator($operator)
-  {
-    $this->operator = $operator;
-  }
-  public function getOperator()
-  {
-    return $this->operator;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AnalyticsReporting/MetricFilterClause.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AnalyticsReporting/MetricFilterClause.php
deleted file mode 100644
index ebdbad5b..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AnalyticsReporting/MetricFilterClause.php
+++ /dev/null
@@ -1,41 +0,0 @@
-filters = $filters;
-  }
-  public function getFilters()
-  {
-    return $this->filters;
-  }
-  public function setOperator($operator)
-  {
-    $this->operator = $operator;
-  }
-  public function getOperator()
-  {
-    return $this->operator;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AnalyticsReporting/MetricHeader.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AnalyticsReporting/MetricHeader.php
deleted file mode 100644
index 04a84b96..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AnalyticsReporting/MetricHeader.php
+++ /dev/null
@@ -1,42 +0,0 @@
-metricHeaderEntries = $metricHeaderEntries;
-  }
-  public function getMetricHeaderEntries()
-  {
-    return $this->metricHeaderEntries;
-  }
-  public function setPivotHeaders($pivotHeaders)
-  {
-    $this->pivotHeaders = $pivotHeaders;
-  }
-  public function getPivotHeaders()
-  {
-    return $this->pivotHeaders;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AnalyticsReporting/MetricHeaderEntry.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AnalyticsReporting/MetricHeaderEntry.php
deleted file mode 100644
index 62ddbcef..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AnalyticsReporting/MetricHeaderEntry.php
+++ /dev/null
@@ -1,39 +0,0 @@
-name = $name;
-  }
-  public function getName()
-  {
-    return $this->name;
-  }
-  public function setType($type)
-  {
-    $this->type = $type;
-  }
-  public function getType()
-  {
-    return $this->type;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AnalyticsReporting/OrFiltersForSegment.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AnalyticsReporting/OrFiltersForSegment.php
deleted file mode 100644
index a4bc7a61..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AnalyticsReporting/OrFiltersForSegment.php
+++ /dev/null
@@ -1,32 +0,0 @@
-segmentFilterClauses = $segmentFilterClauses;
-  }
-  public function getSegmentFilterClauses()
-  {
-    return $this->segmentFilterClauses;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AnalyticsReporting/OrderBy.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AnalyticsReporting/OrderBy.php
deleted file mode 100644
index 0793be24..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AnalyticsReporting/OrderBy.php
+++ /dev/null
@@ -1,48 +0,0 @@
-fieldName = $fieldName;
-  }
-  public function getFieldName()
-  {
-    return $this->fieldName;
-  }
-  public function setOrderType($orderType)
-  {
-    $this->orderType = $orderType;
-  }
-  public function getOrderType()
-  {
-    return $this->orderType;
-  }
-  public function setSortOrder($sortOrder)
-  {
-    $this->sortOrder = $sortOrder;
-  }
-  public function getSortOrder()
-  {
-    return $this->sortOrder;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AnalyticsReporting/Pivot.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AnalyticsReporting/Pivot.php
deleted file mode 100644
index cb412463..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AnalyticsReporting/Pivot.php
+++ /dev/null
@@ -1,70 +0,0 @@
-dimensionFilterClauses = $dimensionFilterClauses;
-  }
-  public function getDimensionFilterClauses()
-  {
-    return $this->dimensionFilterClauses;
-  }
-  public function setDimensions($dimensions)
-  {
-    $this->dimensions = $dimensions;
-  }
-  public function getDimensions()
-  {
-    return $this->dimensions;
-  }
-  public function setMaxGroupCount($maxGroupCount)
-  {
-    $this->maxGroupCount = $maxGroupCount;
-  }
-  public function getMaxGroupCount()
-  {
-    return $this->maxGroupCount;
-  }
-  public function setMetrics($metrics)
-  {
-    $this->metrics = $metrics;
-  }
-  public function getMetrics()
-  {
-    return $this->metrics;
-  }
-  public function setStartGroup($startGroup)
-  {
-    $this->startGroup = $startGroup;
-  }
-  public function getStartGroup()
-  {
-    return $this->startGroup;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AnalyticsReporting/PivotHeader.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AnalyticsReporting/PivotHeader.php
deleted file mode 100644
index 4f3b1c01..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AnalyticsReporting/PivotHeader.php
+++ /dev/null
@@ -1,41 +0,0 @@
-pivotHeaderEntries = $pivotHeaderEntries;
-  }
-  public function getPivotHeaderEntries()
-  {
-    return $this->pivotHeaderEntries;
-  }
-  public function setTotalPivotGroupsCount($totalPivotGroupsCount)
-  {
-    $this->totalPivotGroupsCount = $totalPivotGroupsCount;
-  }
-  public function getTotalPivotGroupsCount()
-  {
-    return $this->totalPivotGroupsCount;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AnalyticsReporting/PivotHeaderEntry.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AnalyticsReporting/PivotHeaderEntry.php
deleted file mode 100644
index 2b74aefd..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AnalyticsReporting/PivotHeaderEntry.php
+++ /dev/null
@@ -1,50 +0,0 @@
-dimensionNames = $dimensionNames;
-  }
-  public function getDimensionNames()
-  {
-    return $this->dimensionNames;
-  }
-  public function setDimensionValues($dimensionValues)
-  {
-    $this->dimensionValues = $dimensionValues;
-  }
-  public function getDimensionValues()
-  {
-    return $this->dimensionValues;
-  }
-  public function setMetric(Google_Service_AnalyticsReporting_MetricHeaderEntry $metric)
-  {
-    $this->metric = $metric;
-  }
-  public function getMetric()
-  {
-    return $this->metric;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AnalyticsReporting/PivotValueRegion.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AnalyticsReporting/PivotValueRegion.php
deleted file mode 100644
index 2cc4253f..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AnalyticsReporting/PivotValueRegion.php
+++ /dev/null
@@ -1,31 +0,0 @@
-values = $values;
-  }
-  public function getValues()
-  {
-    return $this->values;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AnalyticsReporting/Report.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AnalyticsReporting/Report.php
deleted file mode 100644
index 4aca26b4..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AnalyticsReporting/Report.php
+++ /dev/null
@@ -1,50 +0,0 @@
-columnHeader = $columnHeader;
-  }
-  public function getColumnHeader()
-  {
-    return $this->columnHeader;
-  }
-  public function setData(Google_Service_AnalyticsReporting_ReportData $data)
-  {
-    $this->data = $data;
-  }
-  public function getData()
-  {
-    return $this->data;
-  }
-  public function setNextPageToken($nextPageToken)
-  {
-    $this->nextPageToken = $nextPageToken;
-  }
-  public function getNextPageToken()
-  {
-    return $this->nextPageToken;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AnalyticsReporting/ReportData.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AnalyticsReporting/ReportData.php
deleted file mode 100644
index 81f3db2b..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AnalyticsReporting/ReportData.php
+++ /dev/null
@@ -1,107 +0,0 @@
-dataLastRefreshed = $dataLastRefreshed;
-  }
-  public function getDataLastRefreshed()
-  {
-    return $this->dataLastRefreshed;
-  }
-  public function setIsDataGolden($isDataGolden)
-  {
-    $this->isDataGolden = $isDataGolden;
-  }
-  public function getIsDataGolden()
-  {
-    return $this->isDataGolden;
-  }
-  public function setMaximums($maximums)
-  {
-    $this->maximums = $maximums;
-  }
-  public function getMaximums()
-  {
-    return $this->maximums;
-  }
-  public function setMinimums($minimums)
-  {
-    $this->minimums = $minimums;
-  }
-  public function getMinimums()
-  {
-    return $this->minimums;
-  }
-  public function setRowCount($rowCount)
-  {
-    $this->rowCount = $rowCount;
-  }
-  public function getRowCount()
-  {
-    return $this->rowCount;
-  }
-  public function setRows($rows)
-  {
-    $this->rows = $rows;
-  }
-  public function getRows()
-  {
-    return $this->rows;
-  }
-  public function setSamplesReadCounts($samplesReadCounts)
-  {
-    $this->samplesReadCounts = $samplesReadCounts;
-  }
-  public function getSamplesReadCounts()
-  {
-    return $this->samplesReadCounts;
-  }
-  public function setSamplingSpaceSizes($samplingSpaceSizes)
-  {
-    $this->samplingSpaceSizes = $samplingSpaceSizes;
-  }
-  public function getSamplingSpaceSizes()
-  {
-    return $this->samplingSpaceSizes;
-  }
-  public function setTotals($totals)
-  {
-    $this->totals = $totals;
-  }
-  public function getTotals()
-  {
-    return $this->totals;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AnalyticsReporting/ReportRequest.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AnalyticsReporting/ReportRequest.php
deleted file mode 100644
index a5b7dcdf..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AnalyticsReporting/ReportRequest.php
+++ /dev/null
@@ -1,184 +0,0 @@
-cohortGroup = $cohortGroup;
-  }
-  public function getCohortGroup()
-  {
-    return $this->cohortGroup;
-  }
-  public function setDateRanges($dateRanges)
-  {
-    $this->dateRanges = $dateRanges;
-  }
-  public function getDateRanges()
-  {
-    return $this->dateRanges;
-  }
-  public function setDimensionFilterClauses($dimensionFilterClauses)
-  {
-    $this->dimensionFilterClauses = $dimensionFilterClauses;
-  }
-  public function getDimensionFilterClauses()
-  {
-    return $this->dimensionFilterClauses;
-  }
-  public function setDimensions($dimensions)
-  {
-    $this->dimensions = $dimensions;
-  }
-  public function getDimensions()
-  {
-    return $this->dimensions;
-  }
-  public function setFiltersExpression($filtersExpression)
-  {
-    $this->filtersExpression = $filtersExpression;
-  }
-  public function getFiltersExpression()
-  {
-    return $this->filtersExpression;
-  }
-  public function setHideTotals($hideTotals)
-  {
-    $this->hideTotals = $hideTotals;
-  }
-  public function getHideTotals()
-  {
-    return $this->hideTotals;
-  }
-  public function setHideValueRanges($hideValueRanges)
-  {
-    $this->hideValueRanges = $hideValueRanges;
-  }
-  public function getHideValueRanges()
-  {
-    return $this->hideValueRanges;
-  }
-  public function setIncludeEmptyRows($includeEmptyRows)
-  {
-    $this->includeEmptyRows = $includeEmptyRows;
-  }
-  public function getIncludeEmptyRows()
-  {
-    return $this->includeEmptyRows;
-  }
-  public function setMetricFilterClauses($metricFilterClauses)
-  {
-    $this->metricFilterClauses = $metricFilterClauses;
-  }
-  public function getMetricFilterClauses()
-  {
-    return $this->metricFilterClauses;
-  }
-  public function setMetrics($metrics)
-  {
-    $this->metrics = $metrics;
-  }
-  public function getMetrics()
-  {
-    return $this->metrics;
-  }
-  public function setOrderBys($orderBys)
-  {
-    $this->orderBys = $orderBys;
-  }
-  public function getOrderBys()
-  {
-    return $this->orderBys;
-  }
-  public function setPageSize($pageSize)
-  {
-    $this->pageSize = $pageSize;
-  }
-  public function getPageSize()
-  {
-    return $this->pageSize;
-  }
-  public function setPageToken($pageToken)
-  {
-    $this->pageToken = $pageToken;
-  }
-  public function getPageToken()
-  {
-    return $this->pageToken;
-  }
-  public function setPivots($pivots)
-  {
-    $this->pivots = $pivots;
-  }
-  public function getPivots()
-  {
-    return $this->pivots;
-  }
-  public function setSamplingLevel($samplingLevel)
-  {
-    $this->samplingLevel = $samplingLevel;
-  }
-  public function getSamplingLevel()
-  {
-    return $this->samplingLevel;
-  }
-  public function setSegments($segments)
-  {
-    $this->segments = $segments;
-  }
-  public function getSegments()
-  {
-    return $this->segments;
-  }
-  public function setViewId($viewId)
-  {
-    $this->viewId = $viewId;
-  }
-  public function getViewId()
-  {
-    return $this->viewId;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AnalyticsReporting/ReportRow.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AnalyticsReporting/ReportRow.php
deleted file mode 100644
index ee7224fd..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AnalyticsReporting/ReportRow.php
+++ /dev/null
@@ -1,41 +0,0 @@
-dimensions = $dimensions;
-  }
-  public function getDimensions()
-  {
-    return $this->dimensions;
-  }
-  public function setMetrics($metrics)
-  {
-    $this->metrics = $metrics;
-  }
-  public function getMetrics()
-  {
-    return $this->metrics;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AnalyticsReporting/Resource/Reports.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AnalyticsReporting/Resource/Reports.php
deleted file mode 100644
index 0fd6f6e3..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AnalyticsReporting/Resource/Reports.php
+++ /dev/null
@@ -1,41 +0,0 @@
-
- *   $analyticsreportingService = new Google_Service_AnalyticsReporting(...);
- *   $reports = $analyticsreportingService->reports;
- *  
- */
-class Google_Service_AnalyticsReporting_Resource_Reports extends Google_Service_Resource
-{
-  /**
-   * Returns the Analytics data. (reports.batchGet)
-   *
-   * @param Google_Service_AnalyticsReporting_GetReportsRequest $postBody
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_AnalyticsReporting_GetReportsResponse
-   */
-  public function batchGet(Google_Service_AnalyticsReporting_GetReportsRequest $postBody, $optParams = array())
-  {
-    $params = array('postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('batchGet', array($params), "Google_Service_AnalyticsReporting_GetReportsResponse");
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AnalyticsReporting/Segment.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AnalyticsReporting/Segment.php
deleted file mode 100644
index 5c4eda89..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AnalyticsReporting/Segment.php
+++ /dev/null
@@ -1,40 +0,0 @@
-dynamicSegment = $dynamicSegment;
-  }
-  public function getDynamicSegment()
-  {
-    return $this->dynamicSegment;
-  }
-  public function setSegmentId($segmentId)
-  {
-    $this->segmentId = $segmentId;
-  }
-  public function getSegmentId()
-  {
-    return $this->segmentId;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AnalyticsReporting/SegmentDefinition.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AnalyticsReporting/SegmentDefinition.php
deleted file mode 100644
index fcd3d5b8..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AnalyticsReporting/SegmentDefinition.php
+++ /dev/null
@@ -1,32 +0,0 @@
-segmentFilters = $segmentFilters;
-  }
-  public function getSegmentFilters()
-  {
-    return $this->segmentFilters;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AnalyticsReporting/SegmentDimensionFilter.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AnalyticsReporting/SegmentDimensionFilter.php
deleted file mode 100644
index d6424e15..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AnalyticsReporting/SegmentDimensionFilter.php
+++ /dev/null
@@ -1,76 +0,0 @@
-caseSensitive = $caseSensitive;
-  }
-  public function getCaseSensitive()
-  {
-    return $this->caseSensitive;
-  }
-  public function setDimensionName($dimensionName)
-  {
-    $this->dimensionName = $dimensionName;
-  }
-  public function getDimensionName()
-  {
-    return $this->dimensionName;
-  }
-  public function setExpressions($expressions)
-  {
-    $this->expressions = $expressions;
-  }
-  public function getExpressions()
-  {
-    return $this->expressions;
-  }
-  public function setMaxComparisonValue($maxComparisonValue)
-  {
-    $this->maxComparisonValue = $maxComparisonValue;
-  }
-  public function getMaxComparisonValue()
-  {
-    return $this->maxComparisonValue;
-  }
-  public function setMinComparisonValue($minComparisonValue)
-  {
-    $this->minComparisonValue = $minComparisonValue;
-  }
-  public function getMinComparisonValue()
-  {
-    return $this->minComparisonValue;
-  }
-  public function setOperator($operator)
-  {
-    $this->operator = $operator;
-  }
-  public function getOperator()
-  {
-    return $this->operator;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AnalyticsReporting/SegmentFilter.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AnalyticsReporting/SegmentFilter.php
deleted file mode 100644
index 9206784c..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AnalyticsReporting/SegmentFilter.php
+++ /dev/null
@@ -1,50 +0,0 @@
-not = $not;
-  }
-  public function getNot()
-  {
-    return $this->not;
-  }
-  public function setSequenceSegment(Google_Service_AnalyticsReporting_SequenceSegment $sequenceSegment)
-  {
-    $this->sequenceSegment = $sequenceSegment;
-  }
-  public function getSequenceSegment()
-  {
-    return $this->sequenceSegment;
-  }
-  public function setSimpleSegment(Google_Service_AnalyticsReporting_SimpleSegment $simpleSegment)
-  {
-    $this->simpleSegment = $simpleSegment;
-  }
-  public function getSimpleSegment()
-  {
-    return $this->simpleSegment;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AnalyticsReporting/SegmentFilterClause.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AnalyticsReporting/SegmentFilterClause.php
deleted file mode 100644
index 709a1017..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AnalyticsReporting/SegmentFilterClause.php
+++ /dev/null
@@ -1,50 +0,0 @@
-dimensionFilter = $dimensionFilter;
-  }
-  public function getDimensionFilter()
-  {
-    return $this->dimensionFilter;
-  }
-  public function setMetricFilter(Google_Service_AnalyticsReporting_SegmentMetricFilter $metricFilter)
-  {
-    $this->metricFilter = $metricFilter;
-  }
-  public function getMetricFilter()
-  {
-    return $this->metricFilter;
-  }
-  public function setNot($not)
-  {
-    $this->not = $not;
-  }
-  public function getNot()
-  {
-    return $this->not;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AnalyticsReporting/SegmentMetricFilter.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AnalyticsReporting/SegmentMetricFilter.php
deleted file mode 100644
index f0d91897..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AnalyticsReporting/SegmentMetricFilter.php
+++ /dev/null
@@ -1,66 +0,0 @@
-comparisonValue = $comparisonValue;
-  }
-  public function getComparisonValue()
-  {
-    return $this->comparisonValue;
-  }
-  public function setMaxComparisonValue($maxComparisonValue)
-  {
-    $this->maxComparisonValue = $maxComparisonValue;
-  }
-  public function getMaxComparisonValue()
-  {
-    return $this->maxComparisonValue;
-  }
-  public function setMetricName($metricName)
-  {
-    $this->metricName = $metricName;
-  }
-  public function getMetricName()
-  {
-    return $this->metricName;
-  }
-  public function setOperator($operator)
-  {
-    $this->operator = $operator;
-  }
-  public function getOperator()
-  {
-    return $this->operator;
-  }
-  public function setScope($scope)
-  {
-    $this->scope = $scope;
-  }
-  public function getScope()
-  {
-    return $this->scope;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AnalyticsReporting/SegmentSequenceStep.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AnalyticsReporting/SegmentSequenceStep.php
deleted file mode 100644
index adeb2a84..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AnalyticsReporting/SegmentSequenceStep.php
+++ /dev/null
@@ -1,41 +0,0 @@
-matchType = $matchType;
-  }
-  public function getMatchType()
-  {
-    return $this->matchType;
-  }
-  public function setOrFiltersForSegment($orFiltersForSegment)
-  {
-    $this->orFiltersForSegment = $orFiltersForSegment;
-  }
-  public function getOrFiltersForSegment()
-  {
-    return $this->orFiltersForSegment;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AnalyticsReporting/SequenceSegment.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AnalyticsReporting/SequenceSegment.php
deleted file mode 100644
index 5ebc30f7..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AnalyticsReporting/SequenceSegment.php
+++ /dev/null
@@ -1,41 +0,0 @@
-firstStepShouldMatchFirstHit = $firstStepShouldMatchFirstHit;
-  }
-  public function getFirstStepShouldMatchFirstHit()
-  {
-    return $this->firstStepShouldMatchFirstHit;
-  }
-  public function setSegmentSequenceSteps($segmentSequenceSteps)
-  {
-    $this->segmentSequenceSteps = $segmentSequenceSteps;
-  }
-  public function getSegmentSequenceSteps()
-  {
-    return $this->segmentSequenceSteps;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AnalyticsReporting/SimpleSegment.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AnalyticsReporting/SimpleSegment.php
deleted file mode 100644
index af8f4562..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AnalyticsReporting/SimpleSegment.php
+++ /dev/null
@@ -1,32 +0,0 @@
-orFiltersForSegment = $orFiltersForSegment;
-  }
-  public function getOrFiltersForSegment()
-  {
-    return $this->orFiltersForSegment;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AndroidEnterprise.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AndroidEnterprise.php
deleted file mode 100644
index 791f403c..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AndroidEnterprise.php
+++ /dev/null
@@ -1,1454 +0,0 @@
-
- * Manages the deployment of apps to Android for Work users.

- *
- * 

- * For more information about this service, see the API
- * Documentation
- * 

- *
- * @author Google, Inc.
- */
-class Google_Service_AndroidEnterprise extends Google_Service
-{
-  /** Manage corporate Android devices. */
-  const ANDROIDENTERPRISE =
-      "https://www.googleapis.com/auth/androidenterprise";
-
-  public $devices;
-  public $enterprises;
-  public $entitlements;
-  public $grouplicenses;
-  public $grouplicenseusers;
-  public $installs;
-  public $managedconfigurationsfordevice;
-  public $managedconfigurationsforuser;
-  public $permissions;
-  public $products;
-  public $serviceaccountkeys;
-  public $storelayoutclusters;
-  public $storelayoutpages;
-  public $users;
-  
-  /**
-   * Constructs the internal representation of the AndroidEnterprise service.
-   *
-   * @param Google_Client $client
-   */
-  public function __construct(Google_Client $client)
-  {
-    parent::__construct($client);
-    $this->rootUrl = 'https://www.googleapis.com/';
-    $this->servicePath = 'androidenterprise/v1/';
-    $this->version = 'v1';
-    $this->serviceName = 'androidenterprise';
-
-    $this->devices = new Google_Service_AndroidEnterprise_Resource_Devices(
-        $this,
-        $this->serviceName,
-        'devices',
-        array(
-          'methods' => array(
-            'get' => array(
-              'path' => 'enterprises/{enterpriseId}/users/{userId}/devices/{deviceId}',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'enterpriseId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'userId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'deviceId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'getState' => array(
-              'path' => 'enterprises/{enterpriseId}/users/{userId}/devices/{deviceId}/state',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'enterpriseId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'userId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'deviceId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'list' => array(
-              'path' => 'enterprises/{enterpriseId}/users/{userId}/devices',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'enterpriseId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'userId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'setState' => array(
-              'path' => 'enterprises/{enterpriseId}/users/{userId}/devices/{deviceId}/state',
-              'httpMethod' => 'PUT',
-              'parameters' => array(
-                'enterpriseId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'userId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'deviceId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),
-          )
-        )
-    );
-    $this->enterprises = new Google_Service_AndroidEnterprise_Resource_Enterprises(
-        $this,
-        $this->serviceName,
-        'enterprises',
-        array(
-          'methods' => array(
-            'acknowledgeNotificationSet' => array(
-              'path' => 'enterprises/acknowledgeNotificationSet',
-              'httpMethod' => 'POST',
-              'parameters' => array(
-                'notificationSetId' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-              ),
-            ),'completeSignup' => array(
-              'path' => 'enterprises/completeSignup',
-              'httpMethod' => 'POST',
-              'parameters' => array(
-                'completionToken' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'enterpriseToken' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-              ),
-            ),'createWebToken' => array(
-              'path' => 'enterprises/{enterpriseId}/createWebToken',
-              'httpMethod' => 'POST',
-              'parameters' => array(
-                'enterpriseId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'delete' => array(
-              'path' => 'enterprises/{enterpriseId}',
-              'httpMethod' => 'DELETE',
-              'parameters' => array(
-                'enterpriseId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'enroll' => array(
-              'path' => 'enterprises/enroll',
-              'httpMethod' => 'POST',
-              'parameters' => array(
-                'token' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'generateSignupUrl' => array(
-              'path' => 'enterprises/signupUrl',
-              'httpMethod' => 'POST',
-              'parameters' => array(
-                'callbackUrl' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-              ),
-            ),'get' => array(
-              'path' => 'enterprises/{enterpriseId}',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'enterpriseId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'getServiceAccount' => array(
-              'path' => 'enterprises/{enterpriseId}/serviceAccount',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'enterpriseId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'keyType' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-              ),
-            ),'getStoreLayout' => array(
-              'path' => 'enterprises/{enterpriseId}/storeLayout',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'enterpriseId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'insert' => array(
-              'path' => 'enterprises',
-              'httpMethod' => 'POST',
-              'parameters' => array(
-                'token' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'list' => array(
-              'path' => 'enterprises',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'domain' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'pullNotificationSet' => array(
-              'path' => 'enterprises/pullNotificationSet',
-              'httpMethod' => 'POST',
-              'parameters' => array(
-                'requestMode' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-              ),
-            ),'sendTestPushNotification' => array(
-              'path' => 'enterprises/{enterpriseId}/sendTestPushNotification',
-              'httpMethod' => 'POST',
-              'parameters' => array(
-                'enterpriseId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'setAccount' => array(
-              'path' => 'enterprises/{enterpriseId}/account',
-              'httpMethod' => 'PUT',
-              'parameters' => array(
-                'enterpriseId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'setStoreLayout' => array(
-              'path' => 'enterprises/{enterpriseId}/storeLayout',
-              'httpMethod' => 'PUT',
-              'parameters' => array(
-                'enterpriseId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'unenroll' => array(
-              'path' => 'enterprises/{enterpriseId}/unenroll',
-              'httpMethod' => 'POST',
-              'parameters' => array(
-                'enterpriseId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),
-          )
-        )
-    );
-    $this->entitlements = new Google_Service_AndroidEnterprise_Resource_Entitlements(
-        $this,
-        $this->serviceName,
-        'entitlements',
-        array(
-          'methods' => array(
-            'delete' => array(
-              'path' => 'enterprises/{enterpriseId}/users/{userId}/entitlements/{entitlementId}',
-              'httpMethod' => 'DELETE',
-              'parameters' => array(
-                'enterpriseId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'userId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'entitlementId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'get' => array(
-              'path' => 'enterprises/{enterpriseId}/users/{userId}/entitlements/{entitlementId}',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'enterpriseId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'userId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'entitlementId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'list' => array(
-              'path' => 'enterprises/{enterpriseId}/users/{userId}/entitlements',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'enterpriseId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'userId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'patch' => array(
-              'path' => 'enterprises/{enterpriseId}/users/{userId}/entitlements/{entitlementId}',
-              'httpMethod' => 'PATCH',
-              'parameters' => array(
-                'enterpriseId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'userId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'entitlementId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'install' => array(
-                  'location' => 'query',
-                  'type' => 'boolean',
-                ),
-              ),
-            ),'update' => array(
-              'path' => 'enterprises/{enterpriseId}/users/{userId}/entitlements/{entitlementId}',
-              'httpMethod' => 'PUT',
-              'parameters' => array(
-                'enterpriseId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'userId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'entitlementId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'install' => array(
-                  'location' => 'query',
-                  'type' => 'boolean',
-                ),
-              ),
-            ),
-          )
-        )
-    );
-    $this->grouplicenses = new Google_Service_AndroidEnterprise_Resource_Grouplicenses(
-        $this,
-        $this->serviceName,
-        'grouplicenses',
-        array(
-          'methods' => array(
-            'get' => array(
-              'path' => 'enterprises/{enterpriseId}/groupLicenses/{groupLicenseId}',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'enterpriseId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'groupLicenseId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'list' => array(
-              'path' => 'enterprises/{enterpriseId}/groupLicenses',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'enterpriseId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),
-          )
-        )
-    );
-    $this->grouplicenseusers = new Google_Service_AndroidEnterprise_Resource_Grouplicenseusers(
-        $this,
-        $this->serviceName,
-        'grouplicenseusers',
-        array(
-          'methods' => array(
-            'list' => array(
-              'path' => 'enterprises/{enterpriseId}/groupLicenses/{groupLicenseId}/users',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'enterpriseId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'groupLicenseId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),
-          )
-        )
-    );
-    $this->installs = new Google_Service_AndroidEnterprise_Resource_Installs(
-        $this,
-        $this->serviceName,
-        'installs',
-        array(
-          'methods' => array(
-            'delete' => array(
-              'path' => 'enterprises/{enterpriseId}/users/{userId}/devices/{deviceId}/installs/{installId}',
-              'httpMethod' => 'DELETE',
-              'parameters' => array(
-                'enterpriseId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'userId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'deviceId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'installId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'get' => array(
-              'path' => 'enterprises/{enterpriseId}/users/{userId}/devices/{deviceId}/installs/{installId}',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'enterpriseId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'userId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'deviceId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'installId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'list' => array(
-              'path' => 'enterprises/{enterpriseId}/users/{userId}/devices/{deviceId}/installs',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'enterpriseId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'userId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'deviceId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'patch' => array(
-              'path' => 'enterprises/{enterpriseId}/users/{userId}/devices/{deviceId}/installs/{installId}',
-              'httpMethod' => 'PATCH',
-              'parameters' => array(
-                'enterpriseId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'userId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'deviceId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'installId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'update' => array(
-              'path' => 'enterprises/{enterpriseId}/users/{userId}/devices/{deviceId}/installs/{installId}',
-              'httpMethod' => 'PUT',
-              'parameters' => array(
-                'enterpriseId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'userId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'deviceId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'installId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),
-          )
-        )
-    );
-    $this->managedconfigurationsfordevice = new Google_Service_AndroidEnterprise_Resource_Managedconfigurationsfordevice(
-        $this,
-        $this->serviceName,
-        'managedconfigurationsfordevice',
-        array(
-          'methods' => array(
-            'delete' => array(
-              'path' => 'enterprises/{enterpriseId}/users/{userId}/devices/{deviceId}/managedConfigurationsForDevice/{managedConfigurationForDeviceId}',
-              'httpMethod' => 'DELETE',
-              'parameters' => array(
-                'enterpriseId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'userId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'deviceId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'managedConfigurationForDeviceId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'get' => array(
-              'path' => 'enterprises/{enterpriseId}/users/{userId}/devices/{deviceId}/managedConfigurationsForDevice/{managedConfigurationForDeviceId}',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'enterpriseId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'userId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'deviceId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'managedConfigurationForDeviceId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'list' => array(
-              'path' => 'enterprises/{enterpriseId}/users/{userId}/devices/{deviceId}/managedConfigurationsForDevice',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'enterpriseId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'userId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'deviceId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'patch' => array(
-              'path' => 'enterprises/{enterpriseId}/users/{userId}/devices/{deviceId}/managedConfigurationsForDevice/{managedConfigurationForDeviceId}',
-              'httpMethod' => 'PATCH',
-              'parameters' => array(
-                'enterpriseId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'userId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'deviceId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'managedConfigurationForDeviceId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'update' => array(
-              'path' => 'enterprises/{enterpriseId}/users/{userId}/devices/{deviceId}/managedConfigurationsForDevice/{managedConfigurationForDeviceId}',
-              'httpMethod' => 'PUT',
-              'parameters' => array(
-                'enterpriseId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'userId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'deviceId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'managedConfigurationForDeviceId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),
-          )
-        )
-    );
-    $this->managedconfigurationsforuser = new Google_Service_AndroidEnterprise_Resource_Managedconfigurationsforuser(
-        $this,
-        $this->serviceName,
-        'managedconfigurationsforuser',
-        array(
-          'methods' => array(
-            'delete' => array(
-              'path' => 'enterprises/{enterpriseId}/users/{userId}/managedConfigurationsForUser/{managedConfigurationForUserId}',
-              'httpMethod' => 'DELETE',
-              'parameters' => array(
-                'enterpriseId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'userId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'managedConfigurationForUserId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'get' => array(
-              'path' => 'enterprises/{enterpriseId}/users/{userId}/managedConfigurationsForUser/{managedConfigurationForUserId}',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'enterpriseId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'userId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'managedConfigurationForUserId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'list' => array(
-              'path' => 'enterprises/{enterpriseId}/users/{userId}/managedConfigurationsForUser',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'enterpriseId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'userId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'patch' => array(
-              'path' => 'enterprises/{enterpriseId}/users/{userId}/managedConfigurationsForUser/{managedConfigurationForUserId}',
-              'httpMethod' => 'PATCH',
-              'parameters' => array(
-                'enterpriseId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'userId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'managedConfigurationForUserId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'update' => array(
-              'path' => 'enterprises/{enterpriseId}/users/{userId}/managedConfigurationsForUser/{managedConfigurationForUserId}',
-              'httpMethod' => 'PUT',
-              'parameters' => array(
-                'enterpriseId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'userId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'managedConfigurationForUserId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),
-          )
-        )
-    );
-    $this->permissions = new Google_Service_AndroidEnterprise_Resource_Permissions(
-        $this,
-        $this->serviceName,
-        'permissions',
-        array(
-          'methods' => array(
-            'get' => array(
-              'path' => 'permissions/{permissionId}',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'permissionId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'language' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-              ),
-            ),
-          )
-        )
-    );
-    $this->products = new Google_Service_AndroidEnterprise_Resource_Products(
-        $this,
-        $this->serviceName,
-        'products',
-        array(
-          'methods' => array(
-            'approve' => array(
-              'path' => 'enterprises/{enterpriseId}/products/{productId}/approve',
-              'httpMethod' => 'POST',
-              'parameters' => array(
-                'enterpriseId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'productId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'generateApprovalUrl' => array(
-              'path' => 'enterprises/{enterpriseId}/products/{productId}/generateApprovalUrl',
-              'httpMethod' => 'POST',
-              'parameters' => array(
-                'enterpriseId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'productId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'languageCode' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-              ),
-            ),'get' => array(
-              'path' => 'enterprises/{enterpriseId}/products/{productId}',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'enterpriseId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'productId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'language' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-              ),
-            ),'getAppRestrictionsSchema' => array(
-              'path' => 'enterprises/{enterpriseId}/products/{productId}/appRestrictionsSchema',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'enterpriseId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'productId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'language' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-              ),
-            ),'getPermissions' => array(
-              'path' => 'enterprises/{enterpriseId}/products/{productId}/permissions',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'enterpriseId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'productId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'list' => array(
-              'path' => 'enterprises/{enterpriseId}/products',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'enterpriseId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'approved' => array(
-                  'location' => 'query',
-                  'type' => 'boolean',
-                ),
-                'language' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'maxResults' => array(
-                  'location' => 'query',
-                  'type' => 'integer',
-                ),
-                'query' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'token' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-              ),
-            ),'unapprove' => array(
-              'path' => 'enterprises/{enterpriseId}/products/{productId}/unapprove',
-              'httpMethod' => 'POST',
-              'parameters' => array(
-                'enterpriseId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'productId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),
-          )
-        )
-    );
-    $this->serviceaccountkeys = new Google_Service_AndroidEnterprise_Resource_Serviceaccountkeys(
-        $this,
-        $this->serviceName,
-        'serviceaccountkeys',
-        array(
-          'methods' => array(
-            'delete' => array(
-              'path' => 'enterprises/{enterpriseId}/serviceAccountKeys/{keyId}',
-              'httpMethod' => 'DELETE',
-              'parameters' => array(
-                'enterpriseId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'keyId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'insert' => array(
-              'path' => 'enterprises/{enterpriseId}/serviceAccountKeys',
-              'httpMethod' => 'POST',
-              'parameters' => array(
-                'enterpriseId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'list' => array(
-              'path' => 'enterprises/{enterpriseId}/serviceAccountKeys',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'enterpriseId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),
-          )
-        )
-    );
-    $this->storelayoutclusters = new Google_Service_AndroidEnterprise_Resource_Storelayoutclusters(
-        $this,
-        $this->serviceName,
-        'storelayoutclusters',
-        array(
-          'methods' => array(
-            'delete' => array(
-              'path' => 'enterprises/{enterpriseId}/storeLayout/pages/{pageId}/clusters/{clusterId}',
-              'httpMethod' => 'DELETE',
-              'parameters' => array(
-                'enterpriseId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'pageId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'clusterId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'get' => array(
-              'path' => 'enterprises/{enterpriseId}/storeLayout/pages/{pageId}/clusters/{clusterId}',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'enterpriseId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'pageId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'clusterId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'insert' => array(
-              'path' => 'enterprises/{enterpriseId}/storeLayout/pages/{pageId}/clusters',
-              'httpMethod' => 'POST',
-              'parameters' => array(
-                'enterpriseId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'pageId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'list' => array(
-              'path' => 'enterprises/{enterpriseId}/storeLayout/pages/{pageId}/clusters',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'enterpriseId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'pageId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'patch' => array(
-              'path' => 'enterprises/{enterpriseId}/storeLayout/pages/{pageId}/clusters/{clusterId}',
-              'httpMethod' => 'PATCH',
-              'parameters' => array(
-                'enterpriseId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'pageId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'clusterId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'update' => array(
-              'path' => 'enterprises/{enterpriseId}/storeLayout/pages/{pageId}/clusters/{clusterId}',
-              'httpMethod' => 'PUT',
-              'parameters' => array(
-                'enterpriseId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'pageId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'clusterId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),
-          )
-        )
-    );
-    $this->storelayoutpages = new Google_Service_AndroidEnterprise_Resource_Storelayoutpages(
-        $this,
-        $this->serviceName,
-        'storelayoutpages',
-        array(
-          'methods' => array(
-            'delete' => array(
-              'path' => 'enterprises/{enterpriseId}/storeLayout/pages/{pageId}',
-              'httpMethod' => 'DELETE',
-              'parameters' => array(
-                'enterpriseId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'pageId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'get' => array(
-              'path' => 'enterprises/{enterpriseId}/storeLayout/pages/{pageId}',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'enterpriseId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'pageId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'insert' => array(
-              'path' => 'enterprises/{enterpriseId}/storeLayout/pages',
-              'httpMethod' => 'POST',
-              'parameters' => array(
-                'enterpriseId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'list' => array(
-              'path' => 'enterprises/{enterpriseId}/storeLayout/pages',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'enterpriseId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'patch' => array(
-              'path' => 'enterprises/{enterpriseId}/storeLayout/pages/{pageId}',
-              'httpMethod' => 'PATCH',
-              'parameters' => array(
-                'enterpriseId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'pageId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'update' => array(
-              'path' => 'enterprises/{enterpriseId}/storeLayout/pages/{pageId}',
-              'httpMethod' => 'PUT',
-              'parameters' => array(
-                'enterpriseId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'pageId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),
-          )
-        )
-    );
-    $this->users = new Google_Service_AndroidEnterprise_Resource_Users(
-        $this,
-        $this->serviceName,
-        'users',
-        array(
-          'methods' => array(
-            'delete' => array(
-              'path' => 'enterprises/{enterpriseId}/users/{userId}',
-              'httpMethod' => 'DELETE',
-              'parameters' => array(
-                'enterpriseId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'userId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'generateAuthenticationToken' => array(
-              'path' => 'enterprises/{enterpriseId}/users/{userId}/authenticationToken',
-              'httpMethod' => 'POST',
-              'parameters' => array(
-                'enterpriseId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'userId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'generateToken' => array(
-              'path' => 'enterprises/{enterpriseId}/users/{userId}/token',
-              'httpMethod' => 'POST',
-              'parameters' => array(
-                'enterpriseId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'userId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'get' => array(
-              'path' => 'enterprises/{enterpriseId}/users/{userId}',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'enterpriseId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'userId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'getAvailableProductSet' => array(
-              'path' => 'enterprises/{enterpriseId}/users/{userId}/availableProductSet',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'enterpriseId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'userId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'insert' => array(
-              'path' => 'enterprises/{enterpriseId}/users',
-              'httpMethod' => 'POST',
-              'parameters' => array(
-                'enterpriseId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'list' => array(
-              'path' => 'enterprises/{enterpriseId}/users',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'enterpriseId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'email' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'patch' => array(
-              'path' => 'enterprises/{enterpriseId}/users/{userId}',
-              'httpMethod' => 'PATCH',
-              'parameters' => array(
-                'enterpriseId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'userId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'revokeToken' => array(
-              'path' => 'enterprises/{enterpriseId}/users/{userId}/token',
-              'httpMethod' => 'DELETE',
-              'parameters' => array(
-                'enterpriseId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'userId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'setAvailableProductSet' => array(
-              'path' => 'enterprises/{enterpriseId}/users/{userId}/availableProductSet',
-              'httpMethod' => 'PUT',
-              'parameters' => array(
-                'enterpriseId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'userId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'update' => array(
-              'path' => 'enterprises/{enterpriseId}/users/{userId}',
-              'httpMethod' => 'PUT',
-              'parameters' => array(
-                'enterpriseId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'userId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),
-          )
-        )
-    );
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AndroidEnterprise/Administrator.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AndroidEnterprise/Administrator.php
deleted file mode 100644
index 8e29748f..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AndroidEnterprise/Administrator.php
+++ /dev/null
@@ -1,30 +0,0 @@
-email = $email;
-  }
-  public function getEmail()
-  {
-    return $this->email;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AndroidEnterprise/AdministratorWebToken.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AndroidEnterprise/AdministratorWebToken.php
deleted file mode 100644
index 19fdfb42..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AndroidEnterprise/AdministratorWebToken.php
+++ /dev/null
@@ -1,39 +0,0 @@
-kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setToken($token)
-  {
-    $this->token = $token;
-  }
-  public function getToken()
-  {
-    return $this->token;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AndroidEnterprise/AdministratorWebTokenSpec.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AndroidEnterprise/AdministratorWebTokenSpec.php
deleted file mode 100644
index c2269b19..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AndroidEnterprise/AdministratorWebTokenSpec.php
+++ /dev/null
@@ -1,49 +0,0 @@
-kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setParent($parent)
-  {
-    $this->parent = $parent;
-  }
-  public function getParent()
-  {
-    return $this->parent;
-  }
-  public function setPermission($permission)
-  {
-    $this->permission = $permission;
-  }
-  public function getPermission()
-  {
-    return $this->permission;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AndroidEnterprise/AppRestrictionsSchema.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AndroidEnterprise/AppRestrictionsSchema.php
deleted file mode 100644
index fc64b129..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AndroidEnterprise/AppRestrictionsSchema.php
+++ /dev/null
@@ -1,41 +0,0 @@
-kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setRestrictions($restrictions)
-  {
-    $this->restrictions = $restrictions;
-  }
-  public function getRestrictions()
-  {
-    return $this->restrictions;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AndroidEnterprise/AppRestrictionsSchemaChangeEvent.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AndroidEnterprise/AppRestrictionsSchemaChangeEvent.php
deleted file mode 100644
index 795a180f..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AndroidEnterprise/AppRestrictionsSchemaChangeEvent.php
+++ /dev/null
@@ -1,30 +0,0 @@
-productId = $productId;
-  }
-  public function getProductId()
-  {
-    return $this->productId;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AndroidEnterprise/AppRestrictionsSchemaRestriction.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AndroidEnterprise/AppRestrictionsSchemaRestriction.php
deleted file mode 100644
index f1701ce9..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AndroidEnterprise/AppRestrictionsSchemaRestriction.php
+++ /dev/null
@@ -1,96 +0,0 @@
-defaultValue = $defaultValue;
-  }
-  public function getDefaultValue()
-  {
-    return $this->defaultValue;
-  }
-  public function setDescription($description)
-  {
-    $this->description = $description;
-  }
-  public function getDescription()
-  {
-    return $this->description;
-  }
-  public function setEntry($entry)
-  {
-    $this->entry = $entry;
-  }
-  public function getEntry()
-  {
-    return $this->entry;
-  }
-  public function setEntryValue($entryValue)
-  {
-    $this->entryValue = $entryValue;
-  }
-  public function getEntryValue()
-  {
-    return $this->entryValue;
-  }
-  public function setKey($key)
-  {
-    $this->key = $key;
-  }
-  public function getKey()
-  {
-    return $this->key;
-  }
-  public function setNestedRestriction($nestedRestriction)
-  {
-    $this->nestedRestriction = $nestedRestriction;
-  }
-  public function getNestedRestriction()
-  {
-    return $this->nestedRestriction;
-  }
-  public function setRestrictionType($restrictionType)
-  {
-    $this->restrictionType = $restrictionType;
-  }
-  public function getRestrictionType()
-  {
-    return $this->restrictionType;
-  }
-  public function setTitle($title)
-  {
-    $this->title = $title;
-  }
-  public function getTitle()
-  {
-    return $this->title;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AndroidEnterprise/AppRestrictionsSchemaRestrictionRestrictionValue.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AndroidEnterprise/AppRestrictionsSchemaRestrictionRestrictionValue.php
deleted file mode 100644
index 8a7219f5..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AndroidEnterprise/AppRestrictionsSchemaRestrictionRestrictionValue.php
+++ /dev/null
@@ -1,67 +0,0 @@
-type = $type;
-  }
-  public function getType()
-  {
-    return $this->type;
-  }
-  public function setValueBool($valueBool)
-  {
-    $this->valueBool = $valueBool;
-  }
-  public function getValueBool()
-  {
-    return $this->valueBool;
-  }
-  public function setValueInteger($valueInteger)
-  {
-    $this->valueInteger = $valueInteger;
-  }
-  public function getValueInteger()
-  {
-    return $this->valueInteger;
-  }
-  public function setValueMultiselect($valueMultiselect)
-  {
-    $this->valueMultiselect = $valueMultiselect;
-  }
-  public function getValueMultiselect()
-  {
-    return $this->valueMultiselect;
-  }
-  public function setValueString($valueString)
-  {
-    $this->valueString = $valueString;
-  }
-  public function getValueString()
-  {
-    return $this->valueString;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AndroidEnterprise/AppUpdateEvent.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AndroidEnterprise/AppUpdateEvent.php
deleted file mode 100644
index 0c32f9d0..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AndroidEnterprise/AppUpdateEvent.php
+++ /dev/null
@@ -1,30 +0,0 @@
-productId = $productId;
-  }
-  public function getProductId()
-  {
-    return $this->productId;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AndroidEnterprise/AppVersion.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AndroidEnterprise/AppVersion.php
deleted file mode 100644
index 7d588b9f..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AndroidEnterprise/AppVersion.php
+++ /dev/null
@@ -1,39 +0,0 @@
-versionCode = $versionCode;
-  }
-  public function getVersionCode()
-  {
-    return $this->versionCode;
-  }
-  public function setVersionString($versionString)
-  {
-    $this->versionString = $versionString;
-  }
-  public function getVersionString()
-  {
-    return $this->versionString;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AndroidEnterprise/ApprovalUrlInfo.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AndroidEnterprise/ApprovalUrlInfo.php
deleted file mode 100644
index 21a32e4f..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AndroidEnterprise/ApprovalUrlInfo.php
+++ /dev/null
@@ -1,39 +0,0 @@
-approvalUrl = $approvalUrl;
-  }
-  public function getApprovalUrl()
-  {
-    return $this->approvalUrl;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AndroidEnterprise/AuthenticationToken.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AndroidEnterprise/AuthenticationToken.php
deleted file mode 100644
index 02d94a76..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AndroidEnterprise/AuthenticationToken.php
+++ /dev/null
@@ -1,39 +0,0 @@
-kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setToken($token)
-  {
-    $this->token = $token;
-  }
-  public function getToken()
-  {
-    return $this->token;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AndroidEnterprise/Collection.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AndroidEnterprise/Collection.php
deleted file mode 100644
index 12639e44..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AndroidEnterprise/Collection.php
+++ /dev/null
@@ -1,67 +0,0 @@
-collectionId = $collectionId;
-  }
-  public function getCollectionId()
-  {
-    return $this->collectionId;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setName($name)
-  {
-    $this->name = $name;
-  }
-  public function getName()
-  {
-    return $this->name;
-  }
-  public function setProductId($productId)
-  {
-    $this->productId = $productId;
-  }
-  public function getProductId()
-  {
-    return $this->productId;
-  }
-  public function setVisibility($visibility)
-  {
-    $this->visibility = $visibility;
-  }
-  public function getVisibility()
-  {
-    return $this->visibility;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AndroidEnterprise/CollectionViewersListResponse.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AndroidEnterprise/CollectionViewersListResponse.php
deleted file mode 100644
index 7ebeee4e..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AndroidEnterprise/CollectionViewersListResponse.php
+++ /dev/null
@@ -1,41 +0,0 @@
-kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setUser($user)
-  {
-    $this->user = $user;
-  }
-  public function getUser()
-  {
-    return $this->user;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AndroidEnterprise/CollectionsListResponse.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AndroidEnterprise/CollectionsListResponse.php
deleted file mode 100644
index 5fb82d31..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AndroidEnterprise/CollectionsListResponse.php
+++ /dev/null
@@ -1,41 +0,0 @@
-collection = $collection;
-  }
-  public function getCollection()
-  {
-    return $this->collection;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AndroidEnterprise/Device.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AndroidEnterprise/Device.php
deleted file mode 100644
index 2d9b5e9f..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AndroidEnterprise/Device.php
+++ /dev/null
@@ -1,48 +0,0 @@
-androidId = $androidId;
-  }
-  public function getAndroidId()
-  {
-    return $this->androidId;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setManagementType($managementType)
-  {
-    $this->managementType = $managementType;
-  }
-  public function getManagementType()
-  {
-    return $this->managementType;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AndroidEnterprise/DeviceState.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AndroidEnterprise/DeviceState.php
deleted file mode 100644
index c186deb6..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AndroidEnterprise/DeviceState.php
+++ /dev/null
@@ -1,39 +0,0 @@
-accountState = $accountState;
-  }
-  public function getAccountState()
-  {
-    return $this->accountState;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AndroidEnterprise/DevicesListResponse.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AndroidEnterprise/DevicesListResponse.php
deleted file mode 100644
index 1f5db7b7..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AndroidEnterprise/DevicesListResponse.php
+++ /dev/null
@@ -1,41 +0,0 @@
-device = $device;
-  }
-  public function getDevice()
-  {
-    return $this->device;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AndroidEnterprise/Enterprise.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AndroidEnterprise/Enterprise.php
deleted file mode 100644
index cd315106..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AndroidEnterprise/Enterprise.php
+++ /dev/null
@@ -1,68 +0,0 @@
-administrator = $administrator;
-  }
-  public function getAdministrator()
-  {
-    return $this->administrator;
-  }
-  public function setId($id)
-  {
-    $this->id = $id;
-  }
-  public function getId()
-  {
-    return $this->id;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setName($name)
-  {
-    $this->name = $name;
-  }
-  public function getName()
-  {
-    return $this->name;
-  }
-  public function setPrimaryDomain($primaryDomain)
-  {
-    $this->primaryDomain = $primaryDomain;
-  }
-  public function getPrimaryDomain()
-  {
-    return $this->primaryDomain;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AndroidEnterprise/EnterpriseAccount.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AndroidEnterprise/EnterpriseAccount.php
deleted file mode 100644
index 5057cff7..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AndroidEnterprise/EnterpriseAccount.php
+++ /dev/null
@@ -1,39 +0,0 @@
-accountEmail = $accountEmail;
-  }
-  public function getAccountEmail()
-  {
-    return $this->accountEmail;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AndroidEnterprise/EnterprisesListResponse.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AndroidEnterprise/EnterprisesListResponse.php
deleted file mode 100644
index 025a4c2f..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AndroidEnterprise/EnterprisesListResponse.php
+++ /dev/null
@@ -1,41 +0,0 @@
-enterprise = $enterprise;
-  }
-  public function getEnterprise()
-  {
-    return $this->enterprise;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AndroidEnterprise/EnterprisesSendTestPushNotificationResponse.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AndroidEnterprise/EnterprisesSendTestPushNotificationResponse.php
deleted file mode 100644
index ae1cb870..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AndroidEnterprise/EnterprisesSendTestPushNotificationResponse.php
+++ /dev/null
@@ -1,39 +0,0 @@
-messageId = $messageId;
-  }
-  public function getMessageId()
-  {
-    return $this->messageId;
-  }
-  public function setTopicName($topicName)
-  {
-    $this->topicName = $topicName;
-  }
-  public function getTopicName()
-  {
-    return $this->topicName;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AndroidEnterprise/Entitlement.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AndroidEnterprise/Entitlement.php
deleted file mode 100644
index 098537cf..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AndroidEnterprise/Entitlement.php
+++ /dev/null
@@ -1,48 +0,0 @@
-kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setProductId($productId)
-  {
-    $this->productId = $productId;
-  }
-  public function getProductId()
-  {
-    return $this->productId;
-  }
-  public function setReason($reason)
-  {
-    $this->reason = $reason;
-  }
-  public function getReason()
-  {
-    return $this->reason;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AndroidEnterprise/EntitlementsListResponse.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AndroidEnterprise/EntitlementsListResponse.php
deleted file mode 100644
index bab3d685..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AndroidEnterprise/EntitlementsListResponse.php
+++ /dev/null
@@ -1,41 +0,0 @@
-entitlement = $entitlement;
-  }
-  public function getEntitlement()
-  {
-    return $this->entitlement;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AndroidEnterprise/GroupLicense.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AndroidEnterprise/GroupLicense.php
deleted file mode 100644
index ebce1eed..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AndroidEnterprise/GroupLicense.php
+++ /dev/null
@@ -1,75 +0,0 @@
-acquisitionKind = $acquisitionKind;
-  }
-  public function getAcquisitionKind()
-  {
-    return $this->acquisitionKind;
-  }
-  public function setApproval($approval)
-  {
-    $this->approval = $approval;
-  }
-  public function getApproval()
-  {
-    return $this->approval;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setNumProvisioned($numProvisioned)
-  {
-    $this->numProvisioned = $numProvisioned;
-  }
-  public function getNumProvisioned()
-  {
-    return $this->numProvisioned;
-  }
-  public function setNumPurchased($numPurchased)
-  {
-    $this->numPurchased = $numPurchased;
-  }
-  public function getNumPurchased()
-  {
-    return $this->numPurchased;
-  }
-  public function setProductId($productId)
-  {
-    $this->productId = $productId;
-  }
-  public function getProductId()
-  {
-    return $this->productId;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AndroidEnterprise/GroupLicenseUsersListResponse.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AndroidEnterprise/GroupLicenseUsersListResponse.php
deleted file mode 100644
index b0c506a2..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AndroidEnterprise/GroupLicenseUsersListResponse.php
+++ /dev/null
@@ -1,41 +0,0 @@
-kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setUser($user)
-  {
-    $this->user = $user;
-  }
-  public function getUser()
-  {
-    return $this->user;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AndroidEnterprise/GroupLicensesListResponse.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AndroidEnterprise/GroupLicensesListResponse.php
deleted file mode 100644
index a8a4f087..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AndroidEnterprise/GroupLicensesListResponse.php
+++ /dev/null
@@ -1,41 +0,0 @@
-groupLicense = $groupLicense;
-  }
-  public function getGroupLicense()
-  {
-    return $this->groupLicense;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AndroidEnterprise/Install.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AndroidEnterprise/Install.php
deleted file mode 100644
index de9fef90..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AndroidEnterprise/Install.php
+++ /dev/null
@@ -1,57 +0,0 @@
-installState = $installState;
-  }
-  public function getInstallState()
-  {
-    return $this->installState;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setProductId($productId)
-  {
-    $this->productId = $productId;
-  }
-  public function getProductId()
-  {
-    return $this->productId;
-  }
-  public function setVersionCode($versionCode)
-  {
-    $this->versionCode = $versionCode;
-  }
-  public function getVersionCode()
-  {
-    return $this->versionCode;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AndroidEnterprise/InstallFailureEvent.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AndroidEnterprise/InstallFailureEvent.php
deleted file mode 100644
index cb7e9bbd..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AndroidEnterprise/InstallFailureEvent.php
+++ /dev/null
@@ -1,66 +0,0 @@
-deviceId = $deviceId;
-  }
-  public function getDeviceId()
-  {
-    return $this->deviceId;
-  }
-  public function setFailureDetails($failureDetails)
-  {
-    $this->failureDetails = $failureDetails;
-  }
-  public function getFailureDetails()
-  {
-    return $this->failureDetails;
-  }
-  public function setFailureReason($failureReason)
-  {
-    $this->failureReason = $failureReason;
-  }
-  public function getFailureReason()
-  {
-    return $this->failureReason;
-  }
-  public function setProductId($productId)
-  {
-    $this->productId = $productId;
-  }
-  public function getProductId()
-  {
-    return $this->productId;
-  }
-  public function setUserId($userId)
-  {
-    $this->userId = $userId;
-  }
-  public function getUserId()
-  {
-    return $this->userId;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AndroidEnterprise/InstallsListResponse.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AndroidEnterprise/InstallsListResponse.php
deleted file mode 100644
index f437011e..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AndroidEnterprise/InstallsListResponse.php
+++ /dev/null
@@ -1,41 +0,0 @@
-install = $install;
-  }
-  public function getInstall()
-  {
-    return $this->install;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AndroidEnterprise/LocalizedText.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AndroidEnterprise/LocalizedText.php
deleted file mode 100644
index a974b0ff..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AndroidEnterprise/LocalizedText.php
+++ /dev/null
@@ -1,39 +0,0 @@
-locale = $locale;
-  }
-  public function getLocale()
-  {
-    return $this->locale;
-  }
-  public function setText($text)
-  {
-    $this->text = $text;
-  }
-  public function getText()
-  {
-    return $this->text;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AndroidEnterprise/ManagedConfiguration.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AndroidEnterprise/ManagedConfiguration.php
deleted file mode 100644
index b2a66d70..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AndroidEnterprise/ManagedConfiguration.php
+++ /dev/null
@@ -1,50 +0,0 @@
-kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setManagedProperty($managedProperty)
-  {
-    $this->managedProperty = $managedProperty;
-  }
-  public function getManagedProperty()
-  {
-    return $this->managedProperty;
-  }
-  public function setProductId($productId)
-  {
-    $this->productId = $productId;
-  }
-  public function getProductId()
-  {
-    return $this->productId;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AndroidEnterprise/ManagedConfigurationsForDeviceListResponse.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AndroidEnterprise/ManagedConfigurationsForDeviceListResponse.php
deleted file mode 100644
index b14134f6..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AndroidEnterprise/ManagedConfigurationsForDeviceListResponse.php
+++ /dev/null
@@ -1,41 +0,0 @@
-kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setManagedConfigurationForDevice($managedConfigurationForDevice)
-  {
-    $this->managedConfigurationForDevice = $managedConfigurationForDevice;
-  }
-  public function getManagedConfigurationForDevice()
-  {
-    return $this->managedConfigurationForDevice;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AndroidEnterprise/ManagedConfigurationsForUserListResponse.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AndroidEnterprise/ManagedConfigurationsForUserListResponse.php
deleted file mode 100644
index ce18d4ff..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AndroidEnterprise/ManagedConfigurationsForUserListResponse.php
+++ /dev/null
@@ -1,41 +0,0 @@
-kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setManagedConfigurationForUser($managedConfigurationForUser)
-  {
-    $this->managedConfigurationForUser = $managedConfigurationForUser;
-  }
-  public function getManagedConfigurationForUser()
-  {
-    return $this->managedConfigurationForUser;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AndroidEnterprise/ManagedProperty.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AndroidEnterprise/ManagedProperty.php
deleted file mode 100644
index 8fe61415..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AndroidEnterprise/ManagedProperty.php
+++ /dev/null
@@ -1,87 +0,0 @@
-key = $key;
-  }
-  public function getKey()
-  {
-    return $this->key;
-  }
-  public function setValueBool($valueBool)
-  {
-    $this->valueBool = $valueBool;
-  }
-  public function getValueBool()
-  {
-    return $this->valueBool;
-  }
-  public function setValueBundle(Google_Service_AndroidEnterprise_ManagedPropertyBundle $valueBundle)
-  {
-    $this->valueBundle = $valueBundle;
-  }
-  public function getValueBundle()
-  {
-    return $this->valueBundle;
-  }
-  public function setValueBundleArray($valueBundleArray)
-  {
-    $this->valueBundleArray = $valueBundleArray;
-  }
-  public function getValueBundleArray()
-  {
-    return $this->valueBundleArray;
-  }
-  public function setValueInteger($valueInteger)
-  {
-    $this->valueInteger = $valueInteger;
-  }
-  public function getValueInteger()
-  {
-    return $this->valueInteger;
-  }
-  public function setValueString($valueString)
-  {
-    $this->valueString = $valueString;
-  }
-  public function getValueString()
-  {
-    return $this->valueString;
-  }
-  public function setValueStringArray($valueStringArray)
-  {
-    $this->valueStringArray = $valueStringArray;
-  }
-  public function getValueStringArray()
-  {
-    return $this->valueStringArray;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AndroidEnterprise/ManagedPropertyBundle.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AndroidEnterprise/ManagedPropertyBundle.php
deleted file mode 100644
index 057ba250..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AndroidEnterprise/ManagedPropertyBundle.php
+++ /dev/null
@@ -1,32 +0,0 @@
-managedProperty = $managedProperty;
-  }
-  public function getManagedProperty()
-  {
-    return $this->managedProperty;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AndroidEnterprise/NewDeviceEvent.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AndroidEnterprise/NewDeviceEvent.php
deleted file mode 100644
index 999e7692..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AndroidEnterprise/NewDeviceEvent.php
+++ /dev/null
@@ -1,48 +0,0 @@
-deviceId = $deviceId;
-  }
-  public function getDeviceId()
-  {
-    return $this->deviceId;
-  }
-  public function setManagementType($managementType)
-  {
-    $this->managementType = $managementType;
-  }
-  public function getManagementType()
-  {
-    return $this->managementType;
-  }
-  public function setUserId($userId)
-  {
-    $this->userId = $userId;
-  }
-  public function getUserId()
-  {
-    return $this->userId;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AndroidEnterprise/NewPermissionsEvent.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AndroidEnterprise/NewPermissionsEvent.php
deleted file mode 100644
index ae464bfa..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AndroidEnterprise/NewPermissionsEvent.php
+++ /dev/null
@@ -1,49 +0,0 @@
-approvedPermissions = $approvedPermissions;
-  }
-  public function getApprovedPermissions()
-  {
-    return $this->approvedPermissions;
-  }
-  public function setProductId($productId)
-  {
-    $this->productId = $productId;
-  }
-  public function getProductId()
-  {
-    return $this->productId;
-  }
-  public function setRequestedPermissions($requestedPermissions)
-  {
-    $this->requestedPermissions = $requestedPermissions;
-  }
-  public function getRequestedPermissions()
-  {
-    return $this->requestedPermissions;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AndroidEnterprise/Notification.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AndroidEnterprise/Notification.php
deleted file mode 100644
index 35f3afe4..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AndroidEnterprise/Notification.php
+++ /dev/null
@@ -1,109 +0,0 @@
-appRestrictionsSchemaChangeEvent = $appRestrictionsSchemaChangeEvent;
-  }
-  public function getAppRestrictionsSchemaChangeEvent()
-  {
-    return $this->appRestrictionsSchemaChangeEvent;
-  }
-  public function setAppUpdateEvent(Google_Service_AndroidEnterprise_AppUpdateEvent $appUpdateEvent)
-  {
-    $this->appUpdateEvent = $appUpdateEvent;
-  }
-  public function getAppUpdateEvent()
-  {
-    return $this->appUpdateEvent;
-  }
-  public function setEnterpriseId($enterpriseId)
-  {
-    $this->enterpriseId = $enterpriseId;
-  }
-  public function getEnterpriseId()
-  {
-    return $this->enterpriseId;
-  }
-  public function setInstallFailureEvent(Google_Service_AndroidEnterprise_InstallFailureEvent $installFailureEvent)
-  {
-    $this->installFailureEvent = $installFailureEvent;
-  }
-  public function getInstallFailureEvent()
-  {
-    return $this->installFailureEvent;
-  }
-  public function setNewDeviceEvent(Google_Service_AndroidEnterprise_NewDeviceEvent $newDeviceEvent)
-  {
-    $this->newDeviceEvent = $newDeviceEvent;
-  }
-  public function getNewDeviceEvent()
-  {
-    return $this->newDeviceEvent;
-  }
-  public function setNewPermissionsEvent(Google_Service_AndroidEnterprise_NewPermissionsEvent $newPermissionsEvent)
-  {
-    $this->newPermissionsEvent = $newPermissionsEvent;
-  }
-  public function getNewPermissionsEvent()
-  {
-    return $this->newPermissionsEvent;
-  }
-  public function setProductApprovalEvent(Google_Service_AndroidEnterprise_ProductApprovalEvent $productApprovalEvent)
-  {
-    $this->productApprovalEvent = $productApprovalEvent;
-  }
-  public function getProductApprovalEvent()
-  {
-    return $this->productApprovalEvent;
-  }
-  public function setProductAvailabilityChangeEvent(Google_Service_AndroidEnterprise_ProductAvailabilityChangeEvent $productAvailabilityChangeEvent)
-  {
-    $this->productAvailabilityChangeEvent = $productAvailabilityChangeEvent;
-  }
-  public function getProductAvailabilityChangeEvent()
-  {
-    return $this->productAvailabilityChangeEvent;
-  }
-  public function setTimestampMillis($timestampMillis)
-  {
-    $this->timestampMillis = $timestampMillis;
-  }
-  public function getTimestampMillis()
-  {
-    return $this->timestampMillis;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AndroidEnterprise/NotificationSet.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AndroidEnterprise/NotificationSet.php
deleted file mode 100644
index 04ab0ac1..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AndroidEnterprise/NotificationSet.php
+++ /dev/null
@@ -1,50 +0,0 @@
-kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setNotification($notification)
-  {
-    $this->notification = $notification;
-  }
-  public function getNotification()
-  {
-    return $this->notification;
-  }
-  public function setNotificationSetId($notificationSetId)
-  {
-    $this->notificationSetId = $notificationSetId;
-  }
-  public function getNotificationSetId()
-  {
-    return $this->notificationSetId;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AndroidEnterprise/PageInfo.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AndroidEnterprise/PageInfo.php
deleted file mode 100644
index b28d2adc..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AndroidEnterprise/PageInfo.php
+++ /dev/null
@@ -1,48 +0,0 @@
-resultPerPage = $resultPerPage;
-  }
-  public function getResultPerPage()
-  {
-    return $this->resultPerPage;
-  }
-  public function setStartIndex($startIndex)
-  {
-    $this->startIndex = $startIndex;
-  }
-  public function getStartIndex()
-  {
-    return $this->startIndex;
-  }
-  public function setTotalResults($totalResults)
-  {
-    $this->totalResults = $totalResults;
-  }
-  public function getTotalResults()
-  {
-    return $this->totalResults;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AndroidEnterprise/Permission.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AndroidEnterprise/Permission.php
deleted file mode 100644
index 1798c5bc..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AndroidEnterprise/Permission.php
+++ /dev/null
@@ -1,57 +0,0 @@
-description = $description;
-  }
-  public function getDescription()
-  {
-    return $this->description;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setName($name)
-  {
-    $this->name = $name;
-  }
-  public function getName()
-  {
-    return $this->name;
-  }
-  public function setPermissionId($permissionId)
-  {
-    $this->permissionId = $permissionId;
-  }
-  public function getPermissionId()
-  {
-    return $this->permissionId;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AndroidEnterprise/Product.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AndroidEnterprise/Product.php
deleted file mode 100644
index f54d4ac1..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AndroidEnterprise/Product.php
+++ /dev/null
@@ -1,131 +0,0 @@
-appVersion = $appVersion;
-  }
-  public function getAppVersion()
-  {
-    return $this->appVersion;
-  }
-  public function setAuthorName($authorName)
-  {
-    $this->authorName = $authorName;
-  }
-  public function getAuthorName()
-  {
-    return $this->authorName;
-  }
-  public function setDetailsUrl($detailsUrl)
-  {
-    $this->detailsUrl = $detailsUrl;
-  }
-  public function getDetailsUrl()
-  {
-    return $this->detailsUrl;
-  }
-  public function setDistributionChannel($distributionChannel)
-  {
-    $this->distributionChannel = $distributionChannel;
-  }
-  public function getDistributionChannel()
-  {
-    return $this->distributionChannel;
-  }
-  public function setIconUrl($iconUrl)
-  {
-    $this->iconUrl = $iconUrl;
-  }
-  public function getIconUrl()
-  {
-    return $this->iconUrl;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setProductId($productId)
-  {
-    $this->productId = $productId;
-  }
-  public function getProductId()
-  {
-    return $this->productId;
-  }
-  public function setProductPricing($productPricing)
-  {
-    $this->productPricing = $productPricing;
-  }
-  public function getProductPricing()
-  {
-    return $this->productPricing;
-  }
-  public function setRequiresContainerApp($requiresContainerApp)
-  {
-    $this->requiresContainerApp = $requiresContainerApp;
-  }
-  public function getRequiresContainerApp()
-  {
-    return $this->requiresContainerApp;
-  }
-  public function setSmallIconUrl($smallIconUrl)
-  {
-    $this->smallIconUrl = $smallIconUrl;
-  }
-  public function getSmallIconUrl()
-  {
-    return $this->smallIconUrl;
-  }
-  public function setTitle($title)
-  {
-    $this->title = $title;
-  }
-  public function getTitle()
-  {
-    return $this->title;
-  }
-  public function setWorkDetailsUrl($workDetailsUrl)
-  {
-    $this->workDetailsUrl = $workDetailsUrl;
-  }
-  public function getWorkDetailsUrl()
-  {
-    return $this->workDetailsUrl;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AndroidEnterprise/ProductApprovalEvent.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AndroidEnterprise/ProductApprovalEvent.php
deleted file mode 100644
index 63b1ae2b..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AndroidEnterprise/ProductApprovalEvent.php
+++ /dev/null
@@ -1,39 +0,0 @@
-approved = $approved;
-  }
-  public function getApproved()
-  {
-    return $this->approved;
-  }
-  public function setProductId($productId)
-  {
-    $this->productId = $productId;
-  }
-  public function getProductId()
-  {
-    return $this->productId;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AndroidEnterprise/ProductAvailabilityChangeEvent.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AndroidEnterprise/ProductAvailabilityChangeEvent.php
deleted file mode 100644
index eacab5c2..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AndroidEnterprise/ProductAvailabilityChangeEvent.php
+++ /dev/null
@@ -1,39 +0,0 @@
-availabilityStatus = $availabilityStatus;
-  }
-  public function getAvailabilityStatus()
-  {
-    return $this->availabilityStatus;
-  }
-  public function setProductId($productId)
-  {
-    $this->productId = $productId;
-  }
-  public function getProductId()
-  {
-    return $this->productId;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AndroidEnterprise/ProductPermission.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AndroidEnterprise/ProductPermission.php
deleted file mode 100644
index d41192c0..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AndroidEnterprise/ProductPermission.php
+++ /dev/null
@@ -1,39 +0,0 @@
-permissionId = $permissionId;
-  }
-  public function getPermissionId()
-  {
-    return $this->permissionId;
-  }
-  public function setState($state)
-  {
-    $this->state = $state;
-  }
-  public function getState()
-  {
-    return $this->state;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AndroidEnterprise/ProductPermissions.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AndroidEnterprise/ProductPermissions.php
deleted file mode 100644
index 8ded09b4..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AndroidEnterprise/ProductPermissions.php
+++ /dev/null
@@ -1,50 +0,0 @@
-kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setPermission($permission)
-  {
-    $this->permission = $permission;
-  }
-  public function getPermission()
-  {
-    return $this->permission;
-  }
-  public function setProductId($productId)
-  {
-    $this->productId = $productId;
-  }
-  public function getProductId()
-  {
-    return $this->productId;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AndroidEnterprise/ProductSet.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AndroidEnterprise/ProductSet.php
deleted file mode 100644
index 04d39a8f..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AndroidEnterprise/ProductSet.php
+++ /dev/null
@@ -1,49 +0,0 @@
-kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setProductId($productId)
-  {
-    $this->productId = $productId;
-  }
-  public function getProductId()
-  {
-    return $this->productId;
-  }
-  public function setProductSetBehavior($productSetBehavior)
-  {
-    $this->productSetBehavior = $productSetBehavior;
-  }
-  public function getProductSetBehavior()
-  {
-    return $this->productSetBehavior;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AndroidEnterprise/ProductsApproveRequest.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AndroidEnterprise/ProductsApproveRequest.php
deleted file mode 100644
index 5e940e7f..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AndroidEnterprise/ProductsApproveRequest.php
+++ /dev/null
@@ -1,31 +0,0 @@
-approvalUrlInfo = $approvalUrlInfo;
-  }
-  public function getApprovalUrlInfo()
-  {
-    return $this->approvalUrlInfo;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AndroidEnterprise/ProductsGenerateApprovalUrlResponse.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AndroidEnterprise/ProductsGenerateApprovalUrlResponse.php
deleted file mode 100644
index 8ebd8f82..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AndroidEnterprise/ProductsGenerateApprovalUrlResponse.php
+++ /dev/null
@@ -1,30 +0,0 @@
-url = $url;
-  }
-  public function getUrl()
-  {
-    return $this->url;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AndroidEnterprise/ProductsListResponse.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AndroidEnterprise/ProductsListResponse.php
deleted file mode 100644
index 716bd227..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AndroidEnterprise/ProductsListResponse.php
+++ /dev/null
@@ -1,61 +0,0 @@
-kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setPageInfo(Google_Service_AndroidEnterprise_PageInfo $pageInfo)
-  {
-    $this->pageInfo = $pageInfo;
-  }
-  public function getPageInfo()
-  {
-    return $this->pageInfo;
-  }
-  public function setProduct($product)
-  {
-    $this->product = $product;
-  }
-  public function getProduct()
-  {
-    return $this->product;
-  }
-  public function setTokenPagination(Google_Service_AndroidEnterprise_TokenPagination $tokenPagination)
-  {
-    $this->tokenPagination = $tokenPagination;
-  }
-  public function getTokenPagination()
-  {
-    return $this->tokenPagination;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AndroidEnterprise/Resource/Collections.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AndroidEnterprise/Resource/Collections.php
deleted file mode 100644
index 1ffd3fab..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AndroidEnterprise/Resource/Collections.php
+++ /dev/null
@@ -1,114 +0,0 @@
-
- *   $androidenterpriseService = new Google_Service_AndroidEnterprise(...);
- *   $collections = $androidenterpriseService->collections;
- *  
- */
-class Google_Service_AndroidEnterprise_Resource_Collections extends Google_Service_Resource
-{
-  /**
-   * Deletes a collection. (collections.delete)
-   *
-   * @param string $enterpriseId The ID of the enterprise.
-   * @param string $collectionId The ID of the collection.
-   * @param array $optParams Optional parameters.
-   */
-  public function delete($enterpriseId, $collectionId, $optParams = array())
-  {
-    $params = array('enterpriseId' => $enterpriseId, 'collectionId' => $collectionId);
-    $params = array_merge($params, $optParams);
-    return $this->call('delete', array($params));
-  }
-  /**
-   * Retrieves the details of a collection. (collections.get)
-   *
-   * @param string $enterpriseId The ID of the enterprise.
-   * @param string $collectionId The ID of the collection.
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_AndroidEnterprise_Collection
-   */
-  public function get($enterpriseId, $collectionId, $optParams = array())
-  {
-    $params = array('enterpriseId' => $enterpriseId, 'collectionId' => $collectionId);
-    $params = array_merge($params, $optParams);
-    return $this->call('get', array($params), "Google_Service_AndroidEnterprise_Collection");
-  }
-  /**
-   * Creates a new collection. (collections.insert)
-   *
-   * @param string $enterpriseId The ID of the enterprise.
-   * @param Google_Service_AndroidEnterprise_Collection $postBody
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_AndroidEnterprise_Collection
-   */
-  public function insert($enterpriseId, Google_Service_AndroidEnterprise_Collection $postBody, $optParams = array())
-  {
-    $params = array('enterpriseId' => $enterpriseId, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('insert', array($params), "Google_Service_AndroidEnterprise_Collection");
-  }
-  /**
-   * Retrieves the IDs of all the collections for an enterprise.
-   * (collections.listCollections)
-   *
-   * @param string $enterpriseId The ID of the enterprise.
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_AndroidEnterprise_CollectionsListResponse
-   */
-  public function listCollections($enterpriseId, $optParams = array())
-  {
-    $params = array('enterpriseId' => $enterpriseId);
-    $params = array_merge($params, $optParams);
-    return $this->call('list', array($params), "Google_Service_AndroidEnterprise_CollectionsListResponse");
-  }
-  /**
-   * Updates a collection. This method supports patch semantics.
-   * (collections.patch)
-   *
-   * @param string $enterpriseId The ID of the enterprise.
-   * @param string $collectionId The ID of the collection.
-   * @param Google_Service_AndroidEnterprise_Collection $postBody
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_AndroidEnterprise_Collection
-   */
-  public function patch($enterpriseId, $collectionId, Google_Service_AndroidEnterprise_Collection $postBody, $optParams = array())
-  {
-    $params = array('enterpriseId' => $enterpriseId, 'collectionId' => $collectionId, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('patch', array($params), "Google_Service_AndroidEnterprise_Collection");
-  }
-  /**
-   * Updates a collection. (collections.update)
-   *
-   * @param string $enterpriseId The ID of the enterprise.
-   * @param string $collectionId The ID of the collection.
-   * @param Google_Service_AndroidEnterprise_Collection $postBody
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_AndroidEnterprise_Collection
-   */
-  public function update($enterpriseId, $collectionId, Google_Service_AndroidEnterprise_Collection $postBody, $optParams = array())
-  {
-    $params = array('enterpriseId' => $enterpriseId, 'collectionId' => $collectionId, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('update', array($params), "Google_Service_AndroidEnterprise_Collection");
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AndroidEnterprise/Resource/Collectionviewers.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AndroidEnterprise/Resource/Collectionviewers.php
deleted file mode 100644
index acf1aa3f..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AndroidEnterprise/Resource/Collectionviewers.php
+++ /dev/null
@@ -1,115 +0,0 @@
-
- *   $androidenterpriseService = new Google_Service_AndroidEnterprise(...);
- *   $collectionviewers = $androidenterpriseService->collectionviewers;
- *  
- */
-class Google_Service_AndroidEnterprise_Resource_Collectionviewers extends Google_Service_Resource
-{
-  /**
-   * Removes the user from the list of those specifically allowed to see the
-   * collection. If the collection's visibility is set to viewersOnly then only
-   * such users will see the collection. (collectionviewers.delete)
-   *
-   * @param string $enterpriseId The ID of the enterprise.
-   * @param string $collectionId The ID of the collection.
-   * @param string $userId The ID of the user.
-   * @param array $optParams Optional parameters.
-   */
-  public function delete($enterpriseId, $collectionId, $userId, $optParams = array())
-  {
-    $params = array('enterpriseId' => $enterpriseId, 'collectionId' => $collectionId, 'userId' => $userId);
-    $params = array_merge($params, $optParams);
-    return $this->call('delete', array($params));
-  }
-  /**
-   * Retrieves the ID of the user if they have been specifically allowed to see
-   * the collection. If the collection's visibility is set to viewersOnly then
-   * only these users will see the collection. (collectionviewers.get)
-   *
-   * @param string $enterpriseId The ID of the enterprise.
-   * @param string $collectionId The ID of the collection.
-   * @param string $userId The ID of the user.
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_AndroidEnterprise_User
-   */
-  public function get($enterpriseId, $collectionId, $userId, $optParams = array())
-  {
-    $params = array('enterpriseId' => $enterpriseId, 'collectionId' => $collectionId, 'userId' => $userId);
-    $params = array_merge($params, $optParams);
-    return $this->call('get', array($params), "Google_Service_AndroidEnterprise_User");
-  }
-  /**
-   * Retrieves the IDs of the users who have been specifically allowed to see the
-   * collection. If the collection's visibility is set to viewersOnly then only
-   * these users will see the collection.
-   * (collectionviewers.listCollectionviewers)
-   *
-   * @param string $enterpriseId The ID of the enterprise.
-   * @param string $collectionId The ID of the collection.
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_AndroidEnterprise_CollectionViewersListResponse
-   */
-  public function listCollectionviewers($enterpriseId, $collectionId, $optParams = array())
-  {
-    $params = array('enterpriseId' => $enterpriseId, 'collectionId' => $collectionId);
-    $params = array_merge($params, $optParams);
-    return $this->call('list', array($params), "Google_Service_AndroidEnterprise_CollectionViewersListResponse");
-  }
-  /**
-   * Adds the user to the list of those specifically allowed to see the
-   * collection. If the collection's visibility is set to viewersOnly then only
-   * such users will see the collection. This method supports patch semantics.
-   * (collectionviewers.patch)
-   *
-   * @param string $enterpriseId The ID of the enterprise.
-   * @param string $collectionId The ID of the collection.
-   * @param string $userId The ID of the user.
-   * @param Google_Service_AndroidEnterprise_User $postBody
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_AndroidEnterprise_User
-   */
-  public function patch($enterpriseId, $collectionId, $userId, Google_Service_AndroidEnterprise_User $postBody, $optParams = array())
-  {
-    $params = array('enterpriseId' => $enterpriseId, 'collectionId' => $collectionId, 'userId' => $userId, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('patch', array($params), "Google_Service_AndroidEnterprise_User");
-  }
-  /**
-   * Adds the user to the list of those specifically allowed to see the
-   * collection. If the collection's visibility is set to viewersOnly then only
-   * such users will see the collection. (collectionviewers.update)
-   *
-   * @param string $enterpriseId The ID of the enterprise.
-   * @param string $collectionId The ID of the collection.
-   * @param string $userId The ID of the user.
-   * @param Google_Service_AndroidEnterprise_User $postBody
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_AndroidEnterprise_User
-   */
-  public function update($enterpriseId, $collectionId, $userId, Google_Service_AndroidEnterprise_User $postBody, $optParams = array())
-  {
-    $params = array('enterpriseId' => $enterpriseId, 'collectionId' => $collectionId, 'userId' => $userId, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('update', array($params), "Google_Service_AndroidEnterprise_User");
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AndroidEnterprise/Resource/Devices.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AndroidEnterprise/Resource/Devices.php
deleted file mode 100644
index c265c0ae..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AndroidEnterprise/Resource/Devices.php
+++ /dev/null
@@ -1,96 +0,0 @@
-
- *   $androidenterpriseService = new Google_Service_AndroidEnterprise(...);
- *   $devices = $androidenterpriseService->devices;
- *  
- */
-class Google_Service_AndroidEnterprise_Resource_Devices extends Google_Service_Resource
-{
-  /**
-   * Retrieves the details of a device. (devices.get)
-   *
-   * @param string $enterpriseId The ID of the enterprise.
-   * @param string $userId The ID of the user.
-   * @param string $deviceId The ID of the device.
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_AndroidEnterprise_Device
-   */
-  public function get($enterpriseId, $userId, $deviceId, $optParams = array())
-  {
-    $params = array('enterpriseId' => $enterpriseId, 'userId' => $userId, 'deviceId' => $deviceId);
-    $params = array_merge($params, $optParams);
-    return $this->call('get', array($params), "Google_Service_AndroidEnterprise_Device");
-  }
-  /**
-   * Retrieves whether a device's access to Google services is enabled or
-   * disabled. The device state takes effect only if enforcing EMM policies on
-   * Android devices is enabled in the Google Admin Console. Otherwise, the device
-   * state is ignored and all devices are allowed access to Google services. This
-   * is only supported for Google-managed users. (devices.getState)
-   *
-   * @param string $enterpriseId The ID of the enterprise.
-   * @param string $userId The ID of the user.
-   * @param string $deviceId The ID of the device.
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_AndroidEnterprise_DeviceState
-   */
-  public function getState($enterpriseId, $userId, $deviceId, $optParams = array())
-  {
-    $params = array('enterpriseId' => $enterpriseId, 'userId' => $userId, 'deviceId' => $deviceId);
-    $params = array_merge($params, $optParams);
-    return $this->call('getState', array($params), "Google_Service_AndroidEnterprise_DeviceState");
-  }
-  /**
-   * Retrieves the IDs of all of a user's devices. (devices.listDevices)
-   *
-   * @param string $enterpriseId The ID of the enterprise.
-   * @param string $userId The ID of the user.
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_AndroidEnterprise_DevicesListResponse
-   */
-  public function listDevices($enterpriseId, $userId, $optParams = array())
-  {
-    $params = array('enterpriseId' => $enterpriseId, 'userId' => $userId);
-    $params = array_merge($params, $optParams);
-    return $this->call('list', array($params), "Google_Service_AndroidEnterprise_DevicesListResponse");
-  }
-  /**
-   * Sets whether a device's access to Google services is enabled or disabled. The
-   * device state takes effect only if enforcing EMM policies on Android devices
-   * is enabled in the Google Admin Console. Otherwise, the device state is
-   * ignored and all devices are allowed access to Google services. This is only
-   * supported for Google-managed users. (devices.setState)
-   *
-   * @param string $enterpriseId The ID of the enterprise.
-   * @param string $userId The ID of the user.
-   * @param string $deviceId The ID of the device.
-   * @param Google_Service_AndroidEnterprise_DeviceState $postBody
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_AndroidEnterprise_DeviceState
-   */
-  public function setState($enterpriseId, $userId, $deviceId, Google_Service_AndroidEnterprise_DeviceState $postBody, $optParams = array())
-  {
-    $params = array('enterpriseId' => $enterpriseId, 'userId' => $userId, 'deviceId' => $deviceId, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('setState', array($params), "Google_Service_AndroidEnterprise_DeviceState");
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AndroidEnterprise/Resource/Enterprises.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AndroidEnterprise/Resource/Enterprises.php
deleted file mode 100644
index 5328eaf3..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AndroidEnterprise/Resource/Enterprises.php
+++ /dev/null
@@ -1,317 +0,0 @@
-
- *   $androidenterpriseService = new Google_Service_AndroidEnterprise(...);
- *   $enterprises = $androidenterpriseService->enterprises;
- *  
- */
-class Google_Service_AndroidEnterprise_Resource_Enterprises extends Google_Service_Resource
-{
-  /**
-   * Acknowledges notifications that were received from
-   * Enterprises.PullNotificationSet to prevent subsequent calls from returning
-   * the same notifications. (enterprises.acknowledgeNotificationSet)
-   *
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param string notificationSetId The notification set ID as returned by
-   * Enterprises.PullNotificationSet. This must be provided.
-   */
-  public function acknowledgeNotificationSet($optParams = array())
-  {
-    $params = array();
-    $params = array_merge($params, $optParams);
-    return $this->call('acknowledgeNotificationSet', array($params));
-  }
-  /**
-   * Completes the signup flow, by specifying the Completion token and Enterprise
-   * token. This request must not be called multiple times for a given Enterprise
-   * Token. (enterprises.completeSignup)
-   *
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param string completionToken The Completion token initially returned by
-   * GenerateSignupUrl.
-   * @opt_param string enterpriseToken The Enterprise token appended to the
-   * Callback URL.
-   * @return Google_Service_AndroidEnterprise_Enterprise
-   */
-  public function completeSignup($optParams = array())
-  {
-    $params = array();
-    $params = array_merge($params, $optParams);
-    return $this->call('completeSignup', array($params), "Google_Service_AndroidEnterprise_Enterprise");
-  }
-  /**
-   * Returns a unique token to access an embeddable UI. To generate a web UI, pass
-   * the generated token into the managed Google Play javascript API. Each token
-   * may only be used to start one UI session. See the javascript API
-   * documentation for further information. (enterprises.createWebToken)
-   *
-   * @param string $enterpriseId The ID of the enterprise.
-   * @param Google_Service_AndroidEnterprise_AdministratorWebTokenSpec $postBody
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_AndroidEnterprise_AdministratorWebToken
-   */
-  public function createWebToken($enterpriseId, Google_Service_AndroidEnterprise_AdministratorWebTokenSpec $postBody, $optParams = array())
-  {
-    $params = array('enterpriseId' => $enterpriseId, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('createWebToken', array($params), "Google_Service_AndroidEnterprise_AdministratorWebToken");
-  }
-  /**
-   * Deletes the binding between the EMM and enterprise. This is now deprecated.
-   * Use this method only to unenroll customers that were previously enrolled with
-   * the insert call, then enroll them again with the enroll call.
-   * (enterprises.delete)
-   *
-   * @param string $enterpriseId The ID of the enterprise.
-   * @param array $optParams Optional parameters.
-   */
-  public function delete($enterpriseId, $optParams = array())
-  {
-    $params = array('enterpriseId' => $enterpriseId);
-    $params = array_merge($params, $optParams);
-    return $this->call('delete', array($params));
-  }
-  /**
-   * Enrolls an enterprise with the calling EMM. (enterprises.enroll)
-   *
-   * @param string $token The token provided by the enterprise to register the
-   * EMM.
-   * @param Google_Service_AndroidEnterprise_Enterprise $postBody
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_AndroidEnterprise_Enterprise
-   */
-  public function enroll($token, Google_Service_AndroidEnterprise_Enterprise $postBody, $optParams = array())
-  {
-    $params = array('token' => $token, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('enroll', array($params), "Google_Service_AndroidEnterprise_Enterprise");
-  }
-  /**
-   * Generates a sign-up URL. (enterprises.generateSignupUrl)
-   *
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param string callbackUrl The callback URL to which the Admin will be
-   * redirected after successfully creating an enterprise. Before redirecting
-   * there the system will add a single query parameter to this URL named
-   * "enterpriseToken" which will contain an opaque token to be used for the
-   * CompleteSignup request. Beware that this means that the URL will be parsed,
-   * the parameter added and then a new URL formatted, i.e. there may be some
-   * minor formatting changes and, more importantly, the URL must be well-formed
-   * so that it can be parsed.
-   * @return Google_Service_AndroidEnterprise_SignupInfo
-   */
-  public function generateSignupUrl($optParams = array())
-  {
-    $params = array();
-    $params = array_merge($params, $optParams);
-    return $this->call('generateSignupUrl', array($params), "Google_Service_AndroidEnterprise_SignupInfo");
-  }
-  /**
-   * Retrieves the name and domain of an enterprise. (enterprises.get)
-   *
-   * @param string $enterpriseId The ID of the enterprise.
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_AndroidEnterprise_Enterprise
-   */
-  public function get($enterpriseId, $optParams = array())
-  {
-    $params = array('enterpriseId' => $enterpriseId);
-    $params = array_merge($params, $optParams);
-    return $this->call('get', array($params), "Google_Service_AndroidEnterprise_Enterprise");
-  }
-  /**
-   * Returns a service account and credentials. The service account can be bound
-   * to the enterprise by calling setAccount. The service account is unique to
-   * this enterprise and EMM, and will be deleted if the enterprise is unbound.
-   * The credentials contain private key data and are not stored server-side.
-   *
-   * This method can only be called after calling Enterprises.Enroll or
-   * Enterprises.CompleteSignup, and before Enterprises.SetAccount; at other times
-   * it will return an error.
-   *
-   * Subsequent calls after the first will generate a new, unique set of
-   * credentials, and invalidate the previously generated credentials.
-   *
-   * Once the service account is bound to the enterprise, it can be managed using
-   * the serviceAccountKeys resource. (enterprises.getServiceAccount)
-   *
-   * @param string $enterpriseId The ID of the enterprise.
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param string keyType The type of credential to return with the service
-   * account. Required.
-   * @return Google_Service_AndroidEnterprise_ServiceAccount
-   */
-  public function getServiceAccount($enterpriseId, $optParams = array())
-  {
-    $params = array('enterpriseId' => $enterpriseId);
-    $params = array_merge($params, $optParams);
-    return $this->call('getServiceAccount', array($params), "Google_Service_AndroidEnterprise_ServiceAccount");
-  }
-  /**
-   * Returns the store layout for the enterprise. If the store layout has not been
-   * set, or if the store layout has no homepageId set, returns a NOT_FOUND error.
-   * (enterprises.getStoreLayout)
-   *
-   * @param string $enterpriseId The ID of the enterprise.
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_AndroidEnterprise_StoreLayout
-   */
-  public function getStoreLayout($enterpriseId, $optParams = array())
-  {
-    $params = array('enterpriseId' => $enterpriseId);
-    $params = array_merge($params, $optParams);
-    return $this->call('getStoreLayout', array($params), "Google_Service_AndroidEnterprise_StoreLayout");
-  }
-  /**
-   * Establishes the binding between the EMM and an enterprise. This is now
-   * deprecated; use enroll instead. (enterprises.insert)
-   *
-   * @param string $token The token provided by the enterprise to register the
-   * EMM.
-   * @param Google_Service_AndroidEnterprise_Enterprise $postBody
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_AndroidEnterprise_Enterprise
-   */
-  public function insert($token, Google_Service_AndroidEnterprise_Enterprise $postBody, $optParams = array())
-  {
-    $params = array('token' => $token, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('insert', array($params), "Google_Service_AndroidEnterprise_Enterprise");
-  }
-  /**
-   * Looks up an enterprise by domain name. This is only supported for enterprises
-   * created via the Google-initiated creation flow. Lookup of the id is not
-   * needed for enterprises created via the EMM-initiated flow since the EMM
-   * learns the enterprise ID in the callback specified in the
-   * Enterprises.generateSignupUrl call. (enterprises.listEnterprises)
-   *
-   * @param string $domain The exact primary domain name of the enterprise to look
-   * up.
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_AndroidEnterprise_EnterprisesListResponse
-   */
-  public function listEnterprises($domain, $optParams = array())
-  {
-    $params = array('domain' => $domain);
-    $params = array_merge($params, $optParams);
-    return $this->call('list', array($params), "Google_Service_AndroidEnterprise_EnterprisesListResponse");
-  }
-  /**
-   * Pulls and returns a notification set for the enterprises associated with the
-   * service account authenticated for the request. The notification set may be
-   * empty if no notification are pending. A notification set returned needs to be
-   * acknowledged within 20 seconds by calling
-   * Enterprises.AcknowledgeNotificationSet, unless the notification set is empty.
-   * Notifications that are not acknowledged within the 20 seconds will eventually
-   * be included again in the response to another PullNotificationSet request, and
-   * those that are never acknowledged will ultimately be deleted according to the
-   * Google Cloud Platform Pub/Sub system policy. Multiple requests might be
-   * performed concurrently to retrieve notifications, in which case the pending
-   * notifications (if any) will be split among each caller, if any are pending.
-   * If no notifications are present, an empty notification list is returned.
-   * Subsequent requests may return more notifications once they become available.
-   * (enterprises.pullNotificationSet)
-   *
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param string requestMode The request mode for pulling notifications.
-   * Specifying waitForNotifications will cause the request to block and wait
-   * until one or more notifications are present, or return an empty notification
-   * list if no notifications are present after some time. Speciying
-   * returnImmediately will cause the request to immediately return the pending
-   * notifications, or an empty list if no notifications are present. If omitted,
-   * defaults to waitForNotifications.
-   * @return Google_Service_AndroidEnterprise_NotificationSet
-   */
-  public function pullNotificationSet($optParams = array())
-  {
-    $params = array();
-    $params = array_merge($params, $optParams);
-    return $this->call('pullNotificationSet', array($params), "Google_Service_AndroidEnterprise_NotificationSet");
-  }
-  /**
-   * Sends a test push notification to validate the EMM integration with the
-   * Google Cloud Pub/Sub service for this enterprise.
-   * (enterprises.sendTestPushNotification)
-   *
-   * @param string $enterpriseId The ID of the enterprise.
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_AndroidEnterprise_EnterprisesSendTestPushNotificationResponse
-   */
-  public function sendTestPushNotification($enterpriseId, $optParams = array())
-  {
-    $params = array('enterpriseId' => $enterpriseId);
-    $params = array_merge($params, $optParams);
-    return $this->call('sendTestPushNotification', array($params), "Google_Service_AndroidEnterprise_EnterprisesSendTestPushNotificationResponse");
-  }
-  /**
-   * Sets the account that will be used to authenticate to the API as the
-   * enterprise. (enterprises.setAccount)
-   *
-   * @param string $enterpriseId The ID of the enterprise.
-   * @param Google_Service_AndroidEnterprise_EnterpriseAccount $postBody
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_AndroidEnterprise_EnterpriseAccount
-   */
-  public function setAccount($enterpriseId, Google_Service_AndroidEnterprise_EnterpriseAccount $postBody, $optParams = array())
-  {
-    $params = array('enterpriseId' => $enterpriseId, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('setAccount', array($params), "Google_Service_AndroidEnterprise_EnterpriseAccount");
-  }
-  /**
-   * Sets the store layout for the enterprise. By default, storeLayoutType is set
-   * to "basic" and the basic store layout is enabled. The basic layout only
-   * contains apps approved by the admin, and that have been added to the
-   * available product set for a user (using the  setAvailableProductSet call).
-   * Apps on the page are sorted in order of their product ID value. If you create
-   * a custom store layout (by setting storeLayoutType = "custom"), the basic
-   * store layout is disabled. (enterprises.setStoreLayout)
-   *
-   * @param string $enterpriseId The ID of the enterprise.
-   * @param Google_Service_AndroidEnterprise_StoreLayout $postBody
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_AndroidEnterprise_StoreLayout
-   */
-  public function setStoreLayout($enterpriseId, Google_Service_AndroidEnterprise_StoreLayout $postBody, $optParams = array())
-  {
-    $params = array('enterpriseId' => $enterpriseId, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('setStoreLayout', array($params), "Google_Service_AndroidEnterprise_StoreLayout");
-  }
-  /**
-   * Unenrolls an enterprise from the calling EMM. (enterprises.unenroll)
-   *
-   * @param string $enterpriseId The ID of the enterprise.
-   * @param array $optParams Optional parameters.
-   */
-  public function unenroll($enterpriseId, $optParams = array())
-  {
-    $params = array('enterpriseId' => $enterpriseId);
-    $params = array_merge($params, $optParams);
-    return $this->call('unenroll', array($params));
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AndroidEnterprise/Resource/Entitlements.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AndroidEnterprise/Resource/Entitlements.php
deleted file mode 100644
index 4d31c8c1..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AndroidEnterprise/Resource/Entitlements.php
+++ /dev/null
@@ -1,119 +0,0 @@
-
- *   $androidenterpriseService = new Google_Service_AndroidEnterprise(...);
- *   $entitlements = $androidenterpriseService->entitlements;
- *  
- */
-class Google_Service_AndroidEnterprise_Resource_Entitlements extends Google_Service_Resource
-{
-  /**
-   * Removes an entitlement to an app for a user. (entitlements.delete)
-   *
-   * @param string $enterpriseId The ID of the enterprise.
-   * @param string $userId The ID of the user.
-   * @param string $entitlementId The ID of the entitlement (a product ID), e.g.
-   * "app:com.google.android.gm".
-   * @param array $optParams Optional parameters.
-   */
-  public function delete($enterpriseId, $userId, $entitlementId, $optParams = array())
-  {
-    $params = array('enterpriseId' => $enterpriseId, 'userId' => $userId, 'entitlementId' => $entitlementId);
-    $params = array_merge($params, $optParams);
-    return $this->call('delete', array($params));
-  }
-  /**
-   * Retrieves details of an entitlement. (entitlements.get)
-   *
-   * @param string $enterpriseId The ID of the enterprise.
-   * @param string $userId The ID of the user.
-   * @param string $entitlementId The ID of the entitlement (a product ID), e.g.
-   * "app:com.google.android.gm".
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_AndroidEnterprise_Entitlement
-   */
-  public function get($enterpriseId, $userId, $entitlementId, $optParams = array())
-  {
-    $params = array('enterpriseId' => $enterpriseId, 'userId' => $userId, 'entitlementId' => $entitlementId);
-    $params = array_merge($params, $optParams);
-    return $this->call('get', array($params), "Google_Service_AndroidEnterprise_Entitlement");
-  }
-  /**
-   * Lists all entitlements for the specified user. Only the ID is set.
-   * (entitlements.listEntitlements)
-   *
-   * @param string $enterpriseId The ID of the enterprise.
-   * @param string $userId The ID of the user.
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_AndroidEnterprise_EntitlementsListResponse
-   */
-  public function listEntitlements($enterpriseId, $userId, $optParams = array())
-  {
-    $params = array('enterpriseId' => $enterpriseId, 'userId' => $userId);
-    $params = array_merge($params, $optParams);
-    return $this->call('list', array($params), "Google_Service_AndroidEnterprise_EntitlementsListResponse");
-  }
-  /**
-   * Adds or updates an entitlement to an app for a user. This method supports
-   * patch semantics. (entitlements.patch)
-   *
-   * @param string $enterpriseId The ID of the enterprise.
-   * @param string $userId The ID of the user.
-   * @param string $entitlementId The ID of the entitlement (a product ID), e.g.
-   * "app:com.google.android.gm".
-   * @param Google_Service_AndroidEnterprise_Entitlement $postBody
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param bool install Set to true to also install the product on all the
-   * user's devices where possible. Failure to install on one or more devices will
-   * not prevent this operation from returning successfully, as long as the
-   * entitlement was successfully assigned to the user.
-   * @return Google_Service_AndroidEnterprise_Entitlement
-   */
-  public function patch($enterpriseId, $userId, $entitlementId, Google_Service_AndroidEnterprise_Entitlement $postBody, $optParams = array())
-  {
-    $params = array('enterpriseId' => $enterpriseId, 'userId' => $userId, 'entitlementId' => $entitlementId, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('patch', array($params), "Google_Service_AndroidEnterprise_Entitlement");
-  }
-  /**
-   * Adds or updates an entitlement to an app for a user. (entitlements.update)
-   *
-   * @param string $enterpriseId The ID of the enterprise.
-   * @param string $userId The ID of the user.
-   * @param string $entitlementId The ID of the entitlement (a product ID), e.g.
-   * "app:com.google.android.gm".
-   * @param Google_Service_AndroidEnterprise_Entitlement $postBody
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param bool install Set to true to also install the product on all the
-   * user's devices where possible. Failure to install on one or more devices will
-   * not prevent this operation from returning successfully, as long as the
-   * entitlement was successfully assigned to the user.
-   * @return Google_Service_AndroidEnterprise_Entitlement
-   */
-  public function update($enterpriseId, $userId, $entitlementId, Google_Service_AndroidEnterprise_Entitlement $postBody, $optParams = array())
-  {
-    $params = array('enterpriseId' => $enterpriseId, 'userId' => $userId, 'entitlementId' => $entitlementId, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('update', array($params), "Google_Service_AndroidEnterprise_Entitlement");
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AndroidEnterprise/Resource/Grouplicenses.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AndroidEnterprise/Resource/Grouplicenses.php
deleted file mode 100644
index cb8dcaad..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AndroidEnterprise/Resource/Grouplicenses.php
+++ /dev/null
@@ -1,58 +0,0 @@
-
- *   $androidenterpriseService = new Google_Service_AndroidEnterprise(...);
- *   $grouplicenses = $androidenterpriseService->grouplicenses;
- *  
- */
-class Google_Service_AndroidEnterprise_Resource_Grouplicenses extends Google_Service_Resource
-{
-  /**
-   * Retrieves details of an enterprise's group license for a product.
-   * (grouplicenses.get)
-   *
-   * @param string $enterpriseId The ID of the enterprise.
-   * @param string $groupLicenseId The ID of the product the group license is for,
-   * e.g. "app:com.google.android.gm".
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_AndroidEnterprise_GroupLicense
-   */
-  public function get($enterpriseId, $groupLicenseId, $optParams = array())
-  {
-    $params = array('enterpriseId' => $enterpriseId, 'groupLicenseId' => $groupLicenseId);
-    $params = array_merge($params, $optParams);
-    return $this->call('get', array($params), "Google_Service_AndroidEnterprise_GroupLicense");
-  }
-  /**
-   * Retrieves IDs of all products for which the enterprise has a group license.
-   * (grouplicenses.listGrouplicenses)
-   *
-   * @param string $enterpriseId The ID of the enterprise.
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_AndroidEnterprise_GroupLicensesListResponse
-   */
-  public function listGrouplicenses($enterpriseId, $optParams = array())
-  {
-    $params = array('enterpriseId' => $enterpriseId);
-    $params = array_merge($params, $optParams);
-    return $this->call('list', array($params), "Google_Service_AndroidEnterprise_GroupLicensesListResponse");
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AndroidEnterprise/Resource/Grouplicenseusers.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AndroidEnterprise/Resource/Grouplicenseusers.php
deleted file mode 100644
index fd178ee5..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AndroidEnterprise/Resource/Grouplicenseusers.php
+++ /dev/null
@@ -1,44 +0,0 @@
-
- *   $androidenterpriseService = new Google_Service_AndroidEnterprise(...);
- *   $grouplicenseusers = $androidenterpriseService->grouplicenseusers;
- *  
- */
-class Google_Service_AndroidEnterprise_Resource_Grouplicenseusers extends Google_Service_Resource
-{
-  /**
-   * Retrieves the IDs of the users who have been granted entitlements under the
-   * license. (grouplicenseusers.listGrouplicenseusers)
-   *
-   * @param string $enterpriseId The ID of the enterprise.
-   * @param string $groupLicenseId The ID of the product the group license is for,
-   * e.g. "app:com.google.android.gm".
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_AndroidEnterprise_GroupLicenseUsersListResponse
-   */
-  public function listGrouplicenseusers($enterpriseId, $groupLicenseId, $optParams = array())
-  {
-    $params = array('enterpriseId' => $enterpriseId, 'groupLicenseId' => $groupLicenseId);
-    $params = array_merge($params, $optParams);
-    return $this->call('list', array($params), "Google_Service_AndroidEnterprise_GroupLicenseUsersListResponse");
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AndroidEnterprise/Resource/Installs.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AndroidEnterprise/Resource/Installs.php
deleted file mode 100644
index 49d77a28..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AndroidEnterprise/Resource/Installs.php
+++ /dev/null
@@ -1,119 +0,0 @@
-
- *   $androidenterpriseService = new Google_Service_AndroidEnterprise(...);
- *   $installs = $androidenterpriseService->installs;
- *  
- */
-class Google_Service_AndroidEnterprise_Resource_Installs extends Google_Service_Resource
-{
-  /**
-   * Requests to remove an app from a device. A call to get or list will still
-   * show the app as installed on the device until it is actually removed.
-   * (installs.delete)
-   *
-   * @param string $enterpriseId The ID of the enterprise.
-   * @param string $userId The ID of the user.
-   * @param string $deviceId The Android ID of the device.
-   * @param string $installId The ID of the product represented by the install,
-   * e.g. "app:com.google.android.gm".
-   * @param array $optParams Optional parameters.
-   */
-  public function delete($enterpriseId, $userId, $deviceId, $installId, $optParams = array())
-  {
-    $params = array('enterpriseId' => $enterpriseId, 'userId' => $userId, 'deviceId' => $deviceId, 'installId' => $installId);
-    $params = array_merge($params, $optParams);
-    return $this->call('delete', array($params));
-  }
-  /**
-   * Retrieves details of an installation of an app on a device. (installs.get)
-   *
-   * @param string $enterpriseId The ID of the enterprise.
-   * @param string $userId The ID of the user.
-   * @param string $deviceId The Android ID of the device.
-   * @param string $installId The ID of the product represented by the install,
-   * e.g. "app:com.google.android.gm".
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_AndroidEnterprise_Install
-   */
-  public function get($enterpriseId, $userId, $deviceId, $installId, $optParams = array())
-  {
-    $params = array('enterpriseId' => $enterpriseId, 'userId' => $userId, 'deviceId' => $deviceId, 'installId' => $installId);
-    $params = array_merge($params, $optParams);
-    return $this->call('get', array($params), "Google_Service_AndroidEnterprise_Install");
-  }
-  /**
-   * Retrieves the details of all apps installed on the specified device.
-   * (installs.listInstalls)
-   *
-   * @param string $enterpriseId The ID of the enterprise.
-   * @param string $userId The ID of the user.
-   * @param string $deviceId The Android ID of the device.
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_AndroidEnterprise_InstallsListResponse
-   */
-  public function listInstalls($enterpriseId, $userId, $deviceId, $optParams = array())
-  {
-    $params = array('enterpriseId' => $enterpriseId, 'userId' => $userId, 'deviceId' => $deviceId);
-    $params = array_merge($params, $optParams);
-    return $this->call('list', array($params), "Google_Service_AndroidEnterprise_InstallsListResponse");
-  }
-  /**
-   * Requests to install the latest version of an app to a device. If the app is
-   * already installed, then it is updated to the latest version if necessary.
-   * This method supports patch semantics. (installs.patch)
-   *
-   * @param string $enterpriseId The ID of the enterprise.
-   * @param string $userId The ID of the user.
-   * @param string $deviceId The Android ID of the device.
-   * @param string $installId The ID of the product represented by the install,
-   * e.g. "app:com.google.android.gm".
-   * @param Google_Service_AndroidEnterprise_Install $postBody
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_AndroidEnterprise_Install
-   */
-  public function patch($enterpriseId, $userId, $deviceId, $installId, Google_Service_AndroidEnterprise_Install $postBody, $optParams = array())
-  {
-    $params = array('enterpriseId' => $enterpriseId, 'userId' => $userId, 'deviceId' => $deviceId, 'installId' => $installId, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('patch', array($params), "Google_Service_AndroidEnterprise_Install");
-  }
-  /**
-   * Requests to install the latest version of an app to a device. If the app is
-   * already installed, then it is updated to the latest version if necessary.
-   * (installs.update)
-   *
-   * @param string $enterpriseId The ID of the enterprise.
-   * @param string $userId The ID of the user.
-   * @param string $deviceId The Android ID of the device.
-   * @param string $installId The ID of the product represented by the install,
-   * e.g. "app:com.google.android.gm".
-   * @param Google_Service_AndroidEnterprise_Install $postBody
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_AndroidEnterprise_Install
-   */
-  public function update($enterpriseId, $userId, $deviceId, $installId, Google_Service_AndroidEnterprise_Install $postBody, $optParams = array())
-  {
-    $params = array('enterpriseId' => $enterpriseId, 'userId' => $userId, 'deviceId' => $deviceId, 'installId' => $installId, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('update', array($params), "Google_Service_AndroidEnterprise_Install");
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AndroidEnterprise/Resource/Managedconfigurationsfordevice.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AndroidEnterprise/Resource/Managedconfigurationsfordevice.php
deleted file mode 100644
index b5cd9bf2..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AndroidEnterprise/Resource/Managedconfigurationsfordevice.php
+++ /dev/null
@@ -1,119 +0,0 @@
-
- *   $androidenterpriseService = new Google_Service_AndroidEnterprise(...);
- *   $managedconfigurationsfordevice = $androidenterpriseService->managedconfigurationsfordevice;
- *  
- */
-class Google_Service_AndroidEnterprise_Resource_Managedconfigurationsfordevice extends Google_Service_Resource
-{
-  /**
-   * Removes a per-device managed configuration for an app for the specified
-   * device. (managedconfigurationsfordevice.delete)
-   *
-   * @param string $enterpriseId The ID of the enterprise.
-   * @param string $userId The ID of the user.
-   * @param string $deviceId The Android ID of the device.
-   * @param string $managedConfigurationForDeviceId The ID of the managed
-   * configuration (a product ID), e.g. "app:com.google.android.gm".
-   * @param array $optParams Optional parameters.
-   */
-  public function delete($enterpriseId, $userId, $deviceId, $managedConfigurationForDeviceId, $optParams = array())
-  {
-    $params = array('enterpriseId' => $enterpriseId, 'userId' => $userId, 'deviceId' => $deviceId, 'managedConfigurationForDeviceId' => $managedConfigurationForDeviceId);
-    $params = array_merge($params, $optParams);
-    return $this->call('delete', array($params));
-  }
-  /**
-   * Retrieves details of a per-device managed configuration.
-   * (managedconfigurationsfordevice.get)
-   *
-   * @param string $enterpriseId The ID of the enterprise.
-   * @param string $userId The ID of the user.
-   * @param string $deviceId The Android ID of the device.
-   * @param string $managedConfigurationForDeviceId The ID of the managed
-   * configuration (a product ID), e.g. "app:com.google.android.gm".
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_AndroidEnterprise_ManagedConfiguration
-   */
-  public function get($enterpriseId, $userId, $deviceId, $managedConfigurationForDeviceId, $optParams = array())
-  {
-    $params = array('enterpriseId' => $enterpriseId, 'userId' => $userId, 'deviceId' => $deviceId, 'managedConfigurationForDeviceId' => $managedConfigurationForDeviceId);
-    $params = array_merge($params, $optParams);
-    return $this->call('get', array($params), "Google_Service_AndroidEnterprise_ManagedConfiguration");
-  }
-  /**
-   * Lists all the per-device managed configurations for the specified device.
-   * Only the ID is set.
-   * (managedconfigurationsfordevice.listManagedconfigurationsfordevice)
-   *
-   * @param string $enterpriseId The ID of the enterprise.
-   * @param string $userId The ID of the user.
-   * @param string $deviceId The Android ID of the device.
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_AndroidEnterprise_ManagedConfigurationsForDeviceListResponse
-   */
-  public function listManagedconfigurationsfordevice($enterpriseId, $userId, $deviceId, $optParams = array())
-  {
-    $params = array('enterpriseId' => $enterpriseId, 'userId' => $userId, 'deviceId' => $deviceId);
-    $params = array_merge($params, $optParams);
-    return $this->call('list', array($params), "Google_Service_AndroidEnterprise_ManagedConfigurationsForDeviceListResponse");
-  }
-  /**
-   * Adds or updates a per-device managed configuration for an app for the
-   * specified device. This method supports patch semantics.
-   * (managedconfigurationsfordevice.patch)
-   *
-   * @param string $enterpriseId The ID of the enterprise.
-   * @param string $userId The ID of the user.
-   * @param string $deviceId The Android ID of the device.
-   * @param string $managedConfigurationForDeviceId The ID of the managed
-   * configuration (a product ID), e.g. "app:com.google.android.gm".
-   * @param Google_Service_AndroidEnterprise_ManagedConfiguration $postBody
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_AndroidEnterprise_ManagedConfiguration
-   */
-  public function patch($enterpriseId, $userId, $deviceId, $managedConfigurationForDeviceId, Google_Service_AndroidEnterprise_ManagedConfiguration $postBody, $optParams = array())
-  {
-    $params = array('enterpriseId' => $enterpriseId, 'userId' => $userId, 'deviceId' => $deviceId, 'managedConfigurationForDeviceId' => $managedConfigurationForDeviceId, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('patch', array($params), "Google_Service_AndroidEnterprise_ManagedConfiguration");
-  }
-  /**
-   * Adds or updates a per-device managed configuration for an app for the
-   * specified device. (managedconfigurationsfordevice.update)
-   *
-   * @param string $enterpriseId The ID of the enterprise.
-   * @param string $userId The ID of the user.
-   * @param string $deviceId The Android ID of the device.
-   * @param string $managedConfigurationForDeviceId The ID of the managed
-   * configuration (a product ID), e.g. "app:com.google.android.gm".
-   * @param Google_Service_AndroidEnterprise_ManagedConfiguration $postBody
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_AndroidEnterprise_ManagedConfiguration
-   */
-  public function update($enterpriseId, $userId, $deviceId, $managedConfigurationForDeviceId, Google_Service_AndroidEnterprise_ManagedConfiguration $postBody, $optParams = array())
-  {
-    $params = array('enterpriseId' => $enterpriseId, 'userId' => $userId, 'deviceId' => $deviceId, 'managedConfigurationForDeviceId' => $managedConfigurationForDeviceId, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('update', array($params), "Google_Service_AndroidEnterprise_ManagedConfiguration");
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AndroidEnterprise/Resource/Managedconfigurationsforuser.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AndroidEnterprise/Resource/Managedconfigurationsforuser.php
deleted file mode 100644
index ade7f399..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AndroidEnterprise/Resource/Managedconfigurationsforuser.php
+++ /dev/null
@@ -1,114 +0,0 @@
-
- *   $androidenterpriseService = new Google_Service_AndroidEnterprise(...);
- *   $managedconfigurationsforuser = $androidenterpriseService->managedconfigurationsforuser;
- *  
- */
-class Google_Service_AndroidEnterprise_Resource_Managedconfigurationsforuser extends Google_Service_Resource
-{
-  /**
-   * Removes a per-user managed configuration for an app for the specified user.
-   * (managedconfigurationsforuser.delete)
-   *
-   * @param string $enterpriseId The ID of the enterprise.
-   * @param string $userId The ID of the user.
-   * @param string $managedConfigurationForUserId The ID of the managed
-   * configuration (a product ID), e.g. "app:com.google.android.gm".
-   * @param array $optParams Optional parameters.
-   */
-  public function delete($enterpriseId, $userId, $managedConfigurationForUserId, $optParams = array())
-  {
-    $params = array('enterpriseId' => $enterpriseId, 'userId' => $userId, 'managedConfigurationForUserId' => $managedConfigurationForUserId);
-    $params = array_merge($params, $optParams);
-    return $this->call('delete', array($params));
-  }
-  /**
-   * Retrieves details of a per-user managed configuration for an app for the
-   * specified user. (managedconfigurationsforuser.get)
-   *
-   * @param string $enterpriseId The ID of the enterprise.
-   * @param string $userId The ID of the user.
-   * @param string $managedConfigurationForUserId The ID of the managed
-   * configuration (a product ID), e.g. "app:com.google.android.gm".
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_AndroidEnterprise_ManagedConfiguration
-   */
-  public function get($enterpriseId, $userId, $managedConfigurationForUserId, $optParams = array())
-  {
-    $params = array('enterpriseId' => $enterpriseId, 'userId' => $userId, 'managedConfigurationForUserId' => $managedConfigurationForUserId);
-    $params = array_merge($params, $optParams);
-    return $this->call('get', array($params), "Google_Service_AndroidEnterprise_ManagedConfiguration");
-  }
-  /**
-   * Lists all the per-user managed configurations for the specified user. Only
-   * the ID is set.
-   * (managedconfigurationsforuser.listManagedconfigurationsforuser)
-   *
-   * @param string $enterpriseId The ID of the enterprise.
-   * @param string $userId The ID of the user.
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_AndroidEnterprise_ManagedConfigurationsForUserListResponse
-   */
-  public function listManagedconfigurationsforuser($enterpriseId, $userId, $optParams = array())
-  {
-    $params = array('enterpriseId' => $enterpriseId, 'userId' => $userId);
-    $params = array_merge($params, $optParams);
-    return $this->call('list', array($params), "Google_Service_AndroidEnterprise_ManagedConfigurationsForUserListResponse");
-  }
-  /**
-   * Adds or updates a per-user managed configuration for an app for the specified
-   * user. This method supports patch semantics.
-   * (managedconfigurationsforuser.patch)
-   *
-   * @param string $enterpriseId The ID of the enterprise.
-   * @param string $userId The ID of the user.
-   * @param string $managedConfigurationForUserId The ID of the managed
-   * configuration (a product ID), e.g. "app:com.google.android.gm".
-   * @param Google_Service_AndroidEnterprise_ManagedConfiguration $postBody
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_AndroidEnterprise_ManagedConfiguration
-   */
-  public function patch($enterpriseId, $userId, $managedConfigurationForUserId, Google_Service_AndroidEnterprise_ManagedConfiguration $postBody, $optParams = array())
-  {
-    $params = array('enterpriseId' => $enterpriseId, 'userId' => $userId, 'managedConfigurationForUserId' => $managedConfigurationForUserId, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('patch', array($params), "Google_Service_AndroidEnterprise_ManagedConfiguration");
-  }
-  /**
-   * Adds or updates a per-user managed configuration for an app for the specified
-   * user. (managedconfigurationsforuser.update)
-   *
-   * @param string $enterpriseId The ID of the enterprise.
-   * @param string $userId The ID of the user.
-   * @param string $managedConfigurationForUserId The ID of the managed
-   * configuration (a product ID), e.g. "app:com.google.android.gm".
-   * @param Google_Service_AndroidEnterprise_ManagedConfiguration $postBody
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_AndroidEnterprise_ManagedConfiguration
-   */
-  public function update($enterpriseId, $userId, $managedConfigurationForUserId, Google_Service_AndroidEnterprise_ManagedConfiguration $postBody, $optParams = array())
-  {
-    $params = array('enterpriseId' => $enterpriseId, 'userId' => $userId, 'managedConfigurationForUserId' => $managedConfigurationForUserId, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('update', array($params), "Google_Service_AndroidEnterprise_ManagedConfiguration");
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AndroidEnterprise/Resource/Permissions.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AndroidEnterprise/Resource/Permissions.php
deleted file mode 100644
index ad1a0b90..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AndroidEnterprise/Resource/Permissions.php
+++ /dev/null
@@ -1,45 +0,0 @@
-
- *   $androidenterpriseService = new Google_Service_AndroidEnterprise(...);
- *   $permissions = $androidenterpriseService->permissions;
- *  
- */
-class Google_Service_AndroidEnterprise_Resource_Permissions extends Google_Service_Resource
-{
-  /**
-   * Retrieves details of an Android app permission for display to an enterprise
-   * admin. (permissions.get)
-   *
-   * @param string $permissionId The ID of the permission.
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param string language The BCP47 tag for the user's preferred language
-   * (e.g. "en-US", "de")
-   * @return Google_Service_AndroidEnterprise_Permission
-   */
-  public function get($permissionId, $optParams = array())
-  {
-    $params = array('permissionId' => $permissionId);
-    $params = array_merge($params, $optParams);
-    return $this->call('get', array($params), "Google_Service_AndroidEnterprise_Permission");
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AndroidEnterprise/Resource/Products.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AndroidEnterprise/Resource/Products.php
deleted file mode 100644
index c7abdc44..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AndroidEnterprise/Resource/Products.php
+++ /dev/null
@@ -1,175 +0,0 @@
-
- *   $androidenterpriseService = new Google_Service_AndroidEnterprise(...);
- *   $products = $androidenterpriseService->products;
- *  
- */
-class Google_Service_AndroidEnterprise_Resource_Products extends Google_Service_Resource
-{
-  /**
-   * Approves the specified product and the relevant app permissions, if any. The
-   * maximum number of products that you can approve per enterprise customer is
-   * 1,000.
-   *
-   * To learn how to use managed Google Play to design and create a store layout
-   * to display approved products to your users, see Store Layout Design.
-   * (products.approve)
-   *
-   * @param string $enterpriseId The ID of the enterprise.
-   * @param string $productId The ID of the product.
-   * @param Google_Service_AndroidEnterprise_ProductsApproveRequest $postBody
-   * @param array $optParams Optional parameters.
-   */
-  public function approve($enterpriseId, $productId, Google_Service_AndroidEnterprise_ProductsApproveRequest $postBody, $optParams = array())
-  {
-    $params = array('enterpriseId' => $enterpriseId, 'productId' => $productId, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('approve', array($params));
-  }
-  /**
-   * Generates a URL that can be rendered in an iframe to display the permissions
-   * (if any) of a product. An enterprise admin must view these permissions and
-   * accept them on behalf of their organization in order to approve that product.
-   *
-   * Admins should accept the displayed permissions by interacting with a separate
-   * UI element in the EMM console, which in turn should trigger the use of this
-   * URL as the approvalUrlInfo.approvalUrl property in a Products.approve call to
-   * approve the product. This URL can only be used to display permissions for up
-   * to 1 day. (products.generateApprovalUrl)
-   *
-   * @param string $enterpriseId The ID of the enterprise.
-   * @param string $productId The ID of the product.
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param string languageCode The BCP 47 language code used for permission
-   * names and descriptions in the returned iframe, for instance "en-US".
-   * @return Google_Service_AndroidEnterprise_ProductsGenerateApprovalUrlResponse
-   */
-  public function generateApprovalUrl($enterpriseId, $productId, $optParams = array())
-  {
-    $params = array('enterpriseId' => $enterpriseId, 'productId' => $productId);
-    $params = array_merge($params, $optParams);
-    return $this->call('generateApprovalUrl', array($params), "Google_Service_AndroidEnterprise_ProductsGenerateApprovalUrlResponse");
-  }
-  /**
-   * Retrieves details of a product for display to an enterprise admin.
-   * (products.get)
-   *
-   * @param string $enterpriseId The ID of the enterprise.
-   * @param string $productId The ID of the product, e.g.
-   * "app:com.google.android.gm".
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param string language The BCP47 tag for the user's preferred language
-   * (e.g. "en-US", "de").
-   * @return Google_Service_AndroidEnterprise_Product
-   */
-  public function get($enterpriseId, $productId, $optParams = array())
-  {
-    $params = array('enterpriseId' => $enterpriseId, 'productId' => $productId);
-    $params = array_merge($params, $optParams);
-    return $this->call('get', array($params), "Google_Service_AndroidEnterprise_Product");
-  }
-  /**
-   * Retrieves the schema that defines the configurable properties for this
-   * product. All products have a schema, but this schema may be empty if no
-   * managed configurations have been defined. This schema can be used to populate
-   * a UI that allows an admin to configure the product. To apply a managed
-   * configuration based on the schema obtained using this API, see Managed
-   * Configurations through Play. (products.getAppRestrictionsSchema)
-   *
-   * @param string $enterpriseId The ID of the enterprise.
-   * @param string $productId The ID of the product.
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param string language The BCP47 tag for the user's preferred language
-   * (e.g. "en-US", "de").
-   * @return Google_Service_AndroidEnterprise_AppRestrictionsSchema
-   */
-  public function getAppRestrictionsSchema($enterpriseId, $productId, $optParams = array())
-  {
-    $params = array('enterpriseId' => $enterpriseId, 'productId' => $productId);
-    $params = array_merge($params, $optParams);
-    return $this->call('getAppRestrictionsSchema', array($params), "Google_Service_AndroidEnterprise_AppRestrictionsSchema");
-  }
-  /**
-   * Retrieves the Android app permissions required by this app.
-   * (products.getPermissions)
-   *
-   * @param string $enterpriseId The ID of the enterprise.
-   * @param string $productId The ID of the product.
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_AndroidEnterprise_ProductPermissions
-   */
-  public function getPermissions($enterpriseId, $productId, $optParams = array())
-  {
-    $params = array('enterpriseId' => $enterpriseId, 'productId' => $productId);
-    $params = array_merge($params, $optParams);
-    return $this->call('getPermissions', array($params), "Google_Service_AndroidEnterprise_ProductPermissions");
-  }
-  /**
-   * Finds approved products that match a query, or all approved products if there
-   * is no query. (products.listProducts)
-   *
-   * @param string $enterpriseId The ID of the enterprise.
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param bool approved Specifies whether to search among all products
-   * (false) or among only products that have been approved (true). Only "true" is
-   * supported, and should be specified.
-   * @opt_param string language The BCP47 tag for the user's preferred language
-   * (e.g. "en-US", "de"). Results are returned in the language best matching the
-   * preferred language.
-   * @opt_param string maxResults Specifies the maximum number of products that
-   * can be returned per request. If not specified, uses a default value of 100,
-   * which is also the maximum retrievable within a single response.
-   * @opt_param string query The search query as typed in the Google Play store
-   * search box. If omitted, all approved apps will be returned (using the
-   * pagination parameters), including apps that are not available in the store
-   * (e.g. unpublished apps).
-   * @opt_param string token A pagination token is contained in a request''s
-   * response when there are more products. The token can be used in a subsequent
-   * request to obtain more products, and so forth. This parameter cannot be used
-   * in the initial request.
-   * @return Google_Service_AndroidEnterprise_ProductsListResponse
-   */
-  public function listProducts($enterpriseId, $optParams = array())
-  {
-    $params = array('enterpriseId' => $enterpriseId);
-    $params = array_merge($params, $optParams);
-    return $this->call('list', array($params), "Google_Service_AndroidEnterprise_ProductsListResponse");
-  }
-  /**
-   * Unapproves the specified product (and the relevant app permissions, if any)
-   * (products.unapprove)
-   *
-   * @param string $enterpriseId The ID of the enterprise.
-   * @param string $productId The ID of the product.
-   * @param array $optParams Optional parameters.
-   */
-  public function unapprove($enterpriseId, $productId, $optParams = array())
-  {
-    $params = array('enterpriseId' => $enterpriseId, 'productId' => $productId);
-    $params = array_merge($params, $optParams);
-    return $this->call('unapprove', array($params));
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AndroidEnterprise/Resource/Serviceaccountkeys.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AndroidEnterprise/Resource/Serviceaccountkeys.php
deleted file mode 100644
index 7421754e..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AndroidEnterprise/Resource/Serviceaccountkeys.php
+++ /dev/null
@@ -1,82 +0,0 @@
-
- *   $androidenterpriseService = new Google_Service_AndroidEnterprise(...);
- *   $serviceaccountkeys = $androidenterpriseService->serviceaccountkeys;
- *  
- */
-class Google_Service_AndroidEnterprise_Resource_Serviceaccountkeys extends Google_Service_Resource
-{
-  /**
-   * Removes and invalidates the specified credentials for the service account
-   * associated with this enterprise. The calling service account must have been
-   * retrieved by calling Enterprises.GetServiceAccount and must have been set as
-   * the enterprise service account by calling Enterprises.SetAccount.
-   * (serviceaccountkeys.delete)
-   *
-   * @param string $enterpriseId The ID of the enterprise.
-   * @param string $keyId The ID of the key.
-   * @param array $optParams Optional parameters.
-   */
-  public function delete($enterpriseId, $keyId, $optParams = array())
-  {
-    $params = array('enterpriseId' => $enterpriseId, 'keyId' => $keyId);
-    $params = array_merge($params, $optParams);
-    return $this->call('delete', array($params));
-  }
-  /**
-   * Generates new credentials for the service account associated with this
-   * enterprise. The calling service account must have been retrieved by calling
-   * Enterprises.GetServiceAccount and must have been set as the enterprise
-   * service account by calling Enterprises.SetAccount.
-   *
-   * Only the type of the key should be populated in the resource to be inserted.
-   * (serviceaccountkeys.insert)
-   *
-   * @param string $enterpriseId The ID of the enterprise.
-   * @param Google_Service_AndroidEnterprise_ServiceAccountKey $postBody
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_AndroidEnterprise_ServiceAccountKey
-   */
-  public function insert($enterpriseId, Google_Service_AndroidEnterprise_ServiceAccountKey $postBody, $optParams = array())
-  {
-    $params = array('enterpriseId' => $enterpriseId, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('insert', array($params), "Google_Service_AndroidEnterprise_ServiceAccountKey");
-  }
-  /**
-   * Lists all active credentials for the service account associated with this
-   * enterprise. Only the ID and key type are returned. The calling service
-   * account must have been retrieved by calling Enterprises.GetServiceAccount and
-   * must have been set as the enterprise service account by calling
-   * Enterprises.SetAccount. (serviceaccountkeys.listServiceaccountkeys)
-   *
-   * @param string $enterpriseId The ID of the enterprise.
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_AndroidEnterprise_ServiceAccountKeysListResponse
-   */
-  public function listServiceaccountkeys($enterpriseId, $optParams = array())
-  {
-    $params = array('enterpriseId' => $enterpriseId);
-    $params = array_merge($params, $optParams);
-    return $this->call('list', array($params), "Google_Service_AndroidEnterprise_ServiceAccountKeysListResponse");
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AndroidEnterprise/Resource/Storelayoutclusters.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AndroidEnterprise/Resource/Storelayoutclusters.php
deleted file mode 100644
index c15da4e4..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AndroidEnterprise/Resource/Storelayoutclusters.php
+++ /dev/null
@@ -1,120 +0,0 @@
-
- *   $androidenterpriseService = new Google_Service_AndroidEnterprise(...);
- *   $storelayoutclusters = $androidenterpriseService->storelayoutclusters;
- *  
- */
-class Google_Service_AndroidEnterprise_Resource_Storelayoutclusters extends Google_Service_Resource
-{
-  /**
-   * Deletes a cluster. (storelayoutclusters.delete)
-   *
-   * @param string $enterpriseId The ID of the enterprise.
-   * @param string $pageId The ID of the page.
-   * @param string $clusterId The ID of the cluster.
-   * @param array $optParams Optional parameters.
-   */
-  public function delete($enterpriseId, $pageId, $clusterId, $optParams = array())
-  {
-    $params = array('enterpriseId' => $enterpriseId, 'pageId' => $pageId, 'clusterId' => $clusterId);
-    $params = array_merge($params, $optParams);
-    return $this->call('delete', array($params));
-  }
-  /**
-   * Retrieves details of a cluster. (storelayoutclusters.get)
-   *
-   * @param string $enterpriseId The ID of the enterprise.
-   * @param string $pageId The ID of the page.
-   * @param string $clusterId The ID of the cluster.
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_AndroidEnterprise_StoreCluster
-   */
-  public function get($enterpriseId, $pageId, $clusterId, $optParams = array())
-  {
-    $params = array('enterpriseId' => $enterpriseId, 'pageId' => $pageId, 'clusterId' => $clusterId);
-    $params = array_merge($params, $optParams);
-    return $this->call('get', array($params), "Google_Service_AndroidEnterprise_StoreCluster");
-  }
-  /**
-   * Inserts a new cluster in a page. (storelayoutclusters.insert)
-   *
-   * @param string $enterpriseId The ID of the enterprise.
-   * @param string $pageId The ID of the page.
-   * @param Google_Service_AndroidEnterprise_StoreCluster $postBody
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_AndroidEnterprise_StoreCluster
-   */
-  public function insert($enterpriseId, $pageId, Google_Service_AndroidEnterprise_StoreCluster $postBody, $optParams = array())
-  {
-    $params = array('enterpriseId' => $enterpriseId, 'pageId' => $pageId, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('insert', array($params), "Google_Service_AndroidEnterprise_StoreCluster");
-  }
-  /**
-   * Retrieves the details of all clusters on the specified page.
-   * (storelayoutclusters.listStorelayoutclusters)
-   *
-   * @param string $enterpriseId The ID of the enterprise.
-   * @param string $pageId The ID of the page.
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_AndroidEnterprise_StoreLayoutClustersListResponse
-   */
-  public function listStorelayoutclusters($enterpriseId, $pageId, $optParams = array())
-  {
-    $params = array('enterpriseId' => $enterpriseId, 'pageId' => $pageId);
-    $params = array_merge($params, $optParams);
-    return $this->call('list', array($params), "Google_Service_AndroidEnterprise_StoreLayoutClustersListResponse");
-  }
-  /**
-   * Updates a cluster. This method supports patch semantics.
-   * (storelayoutclusters.patch)
-   *
-   * @param string $enterpriseId The ID of the enterprise.
-   * @param string $pageId The ID of the page.
-   * @param string $clusterId The ID of the cluster.
-   * @param Google_Service_AndroidEnterprise_StoreCluster $postBody
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_AndroidEnterprise_StoreCluster
-   */
-  public function patch($enterpriseId, $pageId, $clusterId, Google_Service_AndroidEnterprise_StoreCluster $postBody, $optParams = array())
-  {
-    $params = array('enterpriseId' => $enterpriseId, 'pageId' => $pageId, 'clusterId' => $clusterId, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('patch', array($params), "Google_Service_AndroidEnterprise_StoreCluster");
-  }
-  /**
-   * Updates a cluster. (storelayoutclusters.update)
-   *
-   * @param string $enterpriseId The ID of the enterprise.
-   * @param string $pageId The ID of the page.
-   * @param string $clusterId The ID of the cluster.
-   * @param Google_Service_AndroidEnterprise_StoreCluster $postBody
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_AndroidEnterprise_StoreCluster
-   */
-  public function update($enterpriseId, $pageId, $clusterId, Google_Service_AndroidEnterprise_StoreCluster $postBody, $optParams = array())
-  {
-    $params = array('enterpriseId' => $enterpriseId, 'pageId' => $pageId, 'clusterId' => $clusterId, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('update', array($params), "Google_Service_AndroidEnterprise_StoreCluster");
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AndroidEnterprise/Resource/Storelayoutpages.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AndroidEnterprise/Resource/Storelayoutpages.php
deleted file mode 100644
index f06c2fa6..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AndroidEnterprise/Resource/Storelayoutpages.php
+++ /dev/null
@@ -1,114 +0,0 @@
-
- *   $androidenterpriseService = new Google_Service_AndroidEnterprise(...);
- *   $storelayoutpages = $androidenterpriseService->storelayoutpages;
- *  
- */
-class Google_Service_AndroidEnterprise_Resource_Storelayoutpages extends Google_Service_Resource
-{
-  /**
-   * Deletes a store page. (storelayoutpages.delete)
-   *
-   * @param string $enterpriseId The ID of the enterprise.
-   * @param string $pageId The ID of the page.
-   * @param array $optParams Optional parameters.
-   */
-  public function delete($enterpriseId, $pageId, $optParams = array())
-  {
-    $params = array('enterpriseId' => $enterpriseId, 'pageId' => $pageId);
-    $params = array_merge($params, $optParams);
-    return $this->call('delete', array($params));
-  }
-  /**
-   * Retrieves details of a store page. (storelayoutpages.get)
-   *
-   * @param string $enterpriseId The ID of the enterprise.
-   * @param string $pageId The ID of the page.
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_AndroidEnterprise_StorePage
-   */
-  public function get($enterpriseId, $pageId, $optParams = array())
-  {
-    $params = array('enterpriseId' => $enterpriseId, 'pageId' => $pageId);
-    $params = array_merge($params, $optParams);
-    return $this->call('get', array($params), "Google_Service_AndroidEnterprise_StorePage");
-  }
-  /**
-   * Inserts a new store page. (storelayoutpages.insert)
-   *
-   * @param string $enterpriseId The ID of the enterprise.
-   * @param Google_Service_AndroidEnterprise_StorePage $postBody
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_AndroidEnterprise_StorePage
-   */
-  public function insert($enterpriseId, Google_Service_AndroidEnterprise_StorePage $postBody, $optParams = array())
-  {
-    $params = array('enterpriseId' => $enterpriseId, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('insert', array($params), "Google_Service_AndroidEnterprise_StorePage");
-  }
-  /**
-   * Retrieves the details of all pages in the store.
-   * (storelayoutpages.listStorelayoutpages)
-   *
-   * @param string $enterpriseId The ID of the enterprise.
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_AndroidEnterprise_StoreLayoutPagesListResponse
-   */
-  public function listStorelayoutpages($enterpriseId, $optParams = array())
-  {
-    $params = array('enterpriseId' => $enterpriseId);
-    $params = array_merge($params, $optParams);
-    return $this->call('list', array($params), "Google_Service_AndroidEnterprise_StoreLayoutPagesListResponse");
-  }
-  /**
-   * Updates the content of a store page. This method supports patch semantics.
-   * (storelayoutpages.patch)
-   *
-   * @param string $enterpriseId The ID of the enterprise.
-   * @param string $pageId The ID of the page.
-   * @param Google_Service_AndroidEnterprise_StorePage $postBody
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_AndroidEnterprise_StorePage
-   */
-  public function patch($enterpriseId, $pageId, Google_Service_AndroidEnterprise_StorePage $postBody, $optParams = array())
-  {
-    $params = array('enterpriseId' => $enterpriseId, 'pageId' => $pageId, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('patch', array($params), "Google_Service_AndroidEnterprise_StorePage");
-  }
-  /**
-   * Updates the content of a store page. (storelayoutpages.update)
-   *
-   * @param string $enterpriseId The ID of the enterprise.
-   * @param string $pageId The ID of the page.
-   * @param Google_Service_AndroidEnterprise_StorePage $postBody
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_AndroidEnterprise_StorePage
-   */
-  public function update($enterpriseId, $pageId, Google_Service_AndroidEnterprise_StorePage $postBody, $optParams = array())
-  {
-    $params = array('enterpriseId' => $enterpriseId, 'pageId' => $pageId, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('update', array($params), "Google_Service_AndroidEnterprise_StorePage");
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AndroidEnterprise/Resource/Users.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AndroidEnterprise/Resource/Users.php
deleted file mode 100644
index dd070c4c..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AndroidEnterprise/Resource/Users.php
+++ /dev/null
@@ -1,215 +0,0 @@
-
- *   $androidenterpriseService = new Google_Service_AndroidEnterprise(...);
- *   $users = $androidenterpriseService->users;
- *  
- */
-class Google_Service_AndroidEnterprise_Resource_Users extends Google_Service_Resource
-{
-  /**
-   * Deleted an EMM-managed user. (users.delete)
-   *
-   * @param string $enterpriseId The ID of the enterprise.
-   * @param string $userId The ID of the user.
-   * @param array $optParams Optional parameters.
-   */
-  public function delete($enterpriseId, $userId, $optParams = array())
-  {
-    $params = array('enterpriseId' => $enterpriseId, 'userId' => $userId);
-    $params = array_merge($params, $optParams);
-    return $this->call('delete', array($params));
-  }
-  /**
-   * Generates an authentication token which the device policy client can use to
-   * provision the given EMM-managed user account on a device. The generated token
-   * is single-use and expires after a few minutes.
-   *
-   * This call only works with EMM-managed accounts.
-   * (users.generateAuthenticationToken)
-   *
-   * @param string $enterpriseId The ID of the enterprise.
-   * @param string $userId The ID of the user.
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_AndroidEnterprise_AuthenticationToken
-   */
-  public function generateAuthenticationToken($enterpriseId, $userId, $optParams = array())
-  {
-    $params = array('enterpriseId' => $enterpriseId, 'userId' => $userId);
-    $params = array_merge($params, $optParams);
-    return $this->call('generateAuthenticationToken', array($params), "Google_Service_AndroidEnterprise_AuthenticationToken");
-  }
-  /**
-   * Generates a token (activation code) to allow this user to configure their
-   * managed account in the Android Setup Wizard. Revokes any previously generated
-   * token.
-   *
-   * This call only works with Google managed accounts. (users.generateToken)
-   *
-   * @param string $enterpriseId The ID of the enterprise.
-   * @param string $userId The ID of the user.
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_AndroidEnterprise_UserToken
-   */
-  public function generateToken($enterpriseId, $userId, $optParams = array())
-  {
-    $params = array('enterpriseId' => $enterpriseId, 'userId' => $userId);
-    $params = array_merge($params, $optParams);
-    return $this->call('generateToken', array($params), "Google_Service_AndroidEnterprise_UserToken");
-  }
-  /**
-   * Retrieves a user's details. (users.get)
-   *
-   * @param string $enterpriseId The ID of the enterprise.
-   * @param string $userId The ID of the user.
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_AndroidEnterprise_User
-   */
-  public function get($enterpriseId, $userId, $optParams = array())
-  {
-    $params = array('enterpriseId' => $enterpriseId, 'userId' => $userId);
-    $params = array_merge($params, $optParams);
-    return $this->call('get', array($params), "Google_Service_AndroidEnterprise_User");
-  }
-  /**
-   * Retrieves the set of products a user is entitled to access.
-   * (users.getAvailableProductSet)
-   *
-   * @param string $enterpriseId The ID of the enterprise.
-   * @param string $userId The ID of the user.
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_AndroidEnterprise_ProductSet
-   */
-  public function getAvailableProductSet($enterpriseId, $userId, $optParams = array())
-  {
-    $params = array('enterpriseId' => $enterpriseId, 'userId' => $userId);
-    $params = array_merge($params, $optParams);
-    return $this->call('getAvailableProductSet', array($params), "Google_Service_AndroidEnterprise_ProductSet");
-  }
-  /**
-   * Creates a new EMM-managed user.
-   *
-   * The Users resource passed in the body of the request should include an
-   * accountIdentifier and an accountType. If a corresponding user already exists
-   * with the same account identifier, the user will be updated with the resource.
-   * In this case only the displayName field can be changed. (users.insert)
-   *
-   * @param string $enterpriseId The ID of the enterprise.
-   * @param Google_Service_AndroidEnterprise_User $postBody
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_AndroidEnterprise_User
-   */
-  public function insert($enterpriseId, Google_Service_AndroidEnterprise_User $postBody, $optParams = array())
-  {
-    $params = array('enterpriseId' => $enterpriseId, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('insert', array($params), "Google_Service_AndroidEnterprise_User");
-  }
-  /**
-   * Looks up a user by primary email address. This is only supported for Google-
-   * managed users. Lookup of the id is not needed for EMM-managed users because
-   * the id is already returned in the result of the Users.insert call.
-   * (users.listUsers)
-   *
-   * @param string $enterpriseId The ID of the enterprise.
-   * @param string $email The exact primary email address of the user to look up.
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_AndroidEnterprise_UsersListResponse
-   */
-  public function listUsers($enterpriseId, $email, $optParams = array())
-  {
-    $params = array('enterpriseId' => $enterpriseId, 'email' => $email);
-    $params = array_merge($params, $optParams);
-    return $this->call('list', array($params), "Google_Service_AndroidEnterprise_UsersListResponse");
-  }
-  /**
-   * Updates the details of an EMM-managed user.
-   *
-   * Can be used with EMM-managed users only (not Google managed users). Pass the
-   * new details in the Users resource in the request body. Only the displayName
-   * field can be changed. Other fields must either be unset or have the currently
-   * active value. This method supports patch semantics. (users.patch)
-   *
-   * @param string $enterpriseId The ID of the enterprise.
-   * @param string $userId The ID of the user.
-   * @param Google_Service_AndroidEnterprise_User $postBody
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_AndroidEnterprise_User
-   */
-  public function patch($enterpriseId, $userId, Google_Service_AndroidEnterprise_User $postBody, $optParams = array())
-  {
-    $params = array('enterpriseId' => $enterpriseId, 'userId' => $userId, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('patch', array($params), "Google_Service_AndroidEnterprise_User");
-  }
-  /**
-   * Revokes a previously generated token (activation code) for the user.
-   * (users.revokeToken)
-   *
-   * @param string $enterpriseId The ID of the enterprise.
-   * @param string $userId The ID of the user.
-   * @param array $optParams Optional parameters.
-   */
-  public function revokeToken($enterpriseId, $userId, $optParams = array())
-  {
-    $params = array('enterpriseId' => $enterpriseId, 'userId' => $userId);
-    $params = array_merge($params, $optParams);
-    return $this->call('revokeToken', array($params));
-  }
-  /**
-   * Modifies the set of products that a user is entitled to access (referred to
-   * as whitelisted products). Only products that are approved or products that
-   * were previously approved (products with revoked approval) can be whitelisted.
-   * (users.setAvailableProductSet)
-   *
-   * @param string $enterpriseId The ID of the enterprise.
-   * @param string $userId The ID of the user.
-   * @param Google_Service_AndroidEnterprise_ProductSet $postBody
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_AndroidEnterprise_ProductSet
-   */
-  public function setAvailableProductSet($enterpriseId, $userId, Google_Service_AndroidEnterprise_ProductSet $postBody, $optParams = array())
-  {
-    $params = array('enterpriseId' => $enterpriseId, 'userId' => $userId, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('setAvailableProductSet', array($params), "Google_Service_AndroidEnterprise_ProductSet");
-  }
-  /**
-   * Updates the details of an EMM-managed user.
-   *
-   * Can be used with EMM-managed users only (not Google managed users). Pass the
-   * new details in the Users resource in the request body. Only the displayName
-   * field can be changed. Other fields must either be unset or have the currently
-   * active value. (users.update)
-   *
-   * @param string $enterpriseId The ID of the enterprise.
-   * @param string $userId The ID of the user.
-   * @param Google_Service_AndroidEnterprise_User $postBody
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_AndroidEnterprise_User
-   */
-  public function update($enterpriseId, $userId, Google_Service_AndroidEnterprise_User $postBody, $optParams = array())
-  {
-    $params = array('enterpriseId' => $enterpriseId, 'userId' => $userId, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('update', array($params), "Google_Service_AndroidEnterprise_User");
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AndroidEnterprise/ServiceAccount.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AndroidEnterprise/ServiceAccount.php
deleted file mode 100644
index e1746570..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AndroidEnterprise/ServiceAccount.php
+++ /dev/null
@@ -1,49 +0,0 @@
-key = $key;
-  }
-  public function getKey()
-  {
-    return $this->key;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setName($name)
-  {
-    $this->name = $name;
-  }
-  public function getName()
-  {
-    return $this->name;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AndroidEnterprise/ServiceAccountKey.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AndroidEnterprise/ServiceAccountKey.php
deleted file mode 100644
index 41b182df..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AndroidEnterprise/ServiceAccountKey.php
+++ /dev/null
@@ -1,66 +0,0 @@
-data = $data;
-  }
-  public function getData()
-  {
-    return $this->data;
-  }
-  public function setId($id)
-  {
-    $this->id = $id;
-  }
-  public function getId()
-  {
-    return $this->id;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setPublicData($publicData)
-  {
-    $this->publicData = $publicData;
-  }
-  public function getPublicData()
-  {
-    return $this->publicData;
-  }
-  public function setType($type)
-  {
-    $this->type = $type;
-  }
-  public function getType()
-  {
-    return $this->type;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AndroidEnterprise/ServiceAccountKeysListResponse.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AndroidEnterprise/ServiceAccountKeysListResponse.php
deleted file mode 100644
index 5e336a24..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AndroidEnterprise/ServiceAccountKeysListResponse.php
+++ /dev/null
@@ -1,32 +0,0 @@
-serviceAccountKey = $serviceAccountKey;
-  }
-  public function getServiceAccountKey()
-  {
-    return $this->serviceAccountKey;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AndroidEnterprise/SignupInfo.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AndroidEnterprise/SignupInfo.php
deleted file mode 100644
index 20dc18e0..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AndroidEnterprise/SignupInfo.php
+++ /dev/null
@@ -1,48 +0,0 @@
-completionToken = $completionToken;
-  }
-  public function getCompletionToken()
-  {
-    return $this->completionToken;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setUrl($url)
-  {
-    $this->url = $url;
-  }
-  public function getUrl()
-  {
-    return $this->url;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AndroidEnterprise/StoreCluster.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AndroidEnterprise/StoreCluster.php
deleted file mode 100644
index bfca3515..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AndroidEnterprise/StoreCluster.php
+++ /dev/null
@@ -1,68 +0,0 @@
-id = $id;
-  }
-  public function getId()
-  {
-    return $this->id;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setName($name)
-  {
-    $this->name = $name;
-  }
-  public function getName()
-  {
-    return $this->name;
-  }
-  public function setOrderInPage($orderInPage)
-  {
-    $this->orderInPage = $orderInPage;
-  }
-  public function getOrderInPage()
-  {
-    return $this->orderInPage;
-  }
-  public function setProductId($productId)
-  {
-    $this->productId = $productId;
-  }
-  public function getProductId()
-  {
-    return $this->productId;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AndroidEnterprise/StoreLayout.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AndroidEnterprise/StoreLayout.php
deleted file mode 100644
index faf25c1a..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AndroidEnterprise/StoreLayout.php
+++ /dev/null
@@ -1,48 +0,0 @@
-homepageId = $homepageId;
-  }
-  public function getHomepageId()
-  {
-    return $this->homepageId;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setStoreLayoutType($storeLayoutType)
-  {
-    $this->storeLayoutType = $storeLayoutType;
-  }
-  public function getStoreLayoutType()
-  {
-    return $this->storeLayoutType;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AndroidEnterprise/StoreLayoutClustersListResponse.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AndroidEnterprise/StoreLayoutClustersListResponse.php
deleted file mode 100644
index 553f3ab0..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AndroidEnterprise/StoreLayoutClustersListResponse.php
+++ /dev/null
@@ -1,41 +0,0 @@
-cluster = $cluster;
-  }
-  public function getCluster()
-  {
-    return $this->cluster;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AndroidEnterprise/StoreLayoutPagesListResponse.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AndroidEnterprise/StoreLayoutPagesListResponse.php
deleted file mode 100644
index c47c3374..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AndroidEnterprise/StoreLayoutPagesListResponse.php
+++ /dev/null
@@ -1,41 +0,0 @@
-kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setPage($page)
-  {
-    $this->page = $page;
-  }
-  public function getPage()
-  {
-    return $this->page;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AndroidEnterprise/StorePage.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AndroidEnterprise/StorePage.php
deleted file mode 100644
index bee78374..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AndroidEnterprise/StorePage.php
+++ /dev/null
@@ -1,59 +0,0 @@
-id = $id;
-  }
-  public function getId()
-  {
-    return $this->id;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setLink($link)
-  {
-    $this->link = $link;
-  }
-  public function getLink()
-  {
-    return $this->link;
-  }
-  public function setName($name)
-  {
-    $this->name = $name;
-  }
-  public function getName()
-  {
-    return $this->name;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AndroidEnterprise/TokenPagination.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AndroidEnterprise/TokenPagination.php
deleted file mode 100644
index 69fc8175..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AndroidEnterprise/TokenPagination.php
+++ /dev/null
@@ -1,39 +0,0 @@
-nextPageToken = $nextPageToken;
-  }
-  public function getNextPageToken()
-  {
-    return $this->nextPageToken;
-  }
-  public function setPreviousPageToken($previousPageToken)
-  {
-    $this->previousPageToken = $previousPageToken;
-  }
-  public function getPreviousPageToken()
-  {
-    return $this->previousPageToken;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AndroidEnterprise/User.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AndroidEnterprise/User.php
deleted file mode 100644
index 60ed8dbf..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AndroidEnterprise/User.php
+++ /dev/null
@@ -1,84 +0,0 @@
-accountIdentifier = $accountIdentifier;
-  }
-  public function getAccountIdentifier()
-  {
-    return $this->accountIdentifier;
-  }
-  public function setAccountType($accountType)
-  {
-    $this->accountType = $accountType;
-  }
-  public function getAccountType()
-  {
-    return $this->accountType;
-  }
-  public function setDisplayName($displayName)
-  {
-    $this->displayName = $displayName;
-  }
-  public function getDisplayName()
-  {
-    return $this->displayName;
-  }
-  public function setId($id)
-  {
-    $this->id = $id;
-  }
-  public function getId()
-  {
-    return $this->id;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setManagementType($managementType)
-  {
-    $this->managementType = $managementType;
-  }
-  public function getManagementType()
-  {
-    return $this->managementType;
-  }
-  public function setPrimaryEmail($primaryEmail)
-  {
-    $this->primaryEmail = $primaryEmail;
-  }
-  public function getPrimaryEmail()
-  {
-    return $this->primaryEmail;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AndroidEnterprise/UserToken.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AndroidEnterprise/UserToken.php
deleted file mode 100644
index fd511dc7..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AndroidEnterprise/UserToken.php
+++ /dev/null
@@ -1,48 +0,0 @@
-kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setToken($token)
-  {
-    $this->token = $token;
-  }
-  public function getToken()
-  {
-    return $this->token;
-  }
-  public function setUserId($userId)
-  {
-    $this->userId = $userId;
-  }
-  public function getUserId()
-  {
-    return $this->userId;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AndroidEnterprise/UsersListResponse.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AndroidEnterprise/UsersListResponse.php
deleted file mode 100644
index b680ded9..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AndroidEnterprise/UsersListResponse.php
+++ /dev/null
@@ -1,41 +0,0 @@
-kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setUser($user)
-  {
-    $this->user = $user;
-  }
-  public function getUser()
-  {
-    return $this->user;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AndroidPublisher.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AndroidPublisher.php
deleted file mode 100644
index 8aba4482..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AndroidPublisher.php
+++ /dev/null
@@ -1,1347 +0,0 @@
-
- * Lets Android application developers access their Google Play accounts.

- *
- * 

- * For more information about this service, see the API
- * Documentation
- * 

- *
- * @author Google, Inc.
- */
-class Google_Service_AndroidPublisher extends Google_Service
-{
-  /** View and manage your Google Play Developer account. */
-  const ANDROIDPUBLISHER =
-      "https://www.googleapis.com/auth/androidpublisher";
-
-  public $edits;
-  public $edits_apklistings;
-  public $edits_apks;
-  public $edits_deobfuscationfiles;
-  public $edits_details;
-  public $edits_expansionfiles;
-  public $edits_images;
-  public $edits_listings;
-  public $edits_testers;
-  public $edits_tracks;
-  public $entitlements;
-  public $inappproducts;
-  public $purchases_products;
-  public $purchases_subscriptions;
-  public $purchases_voidedpurchases;
-  public $reviews;
-  
-  /**
-   * Constructs the internal representation of the AndroidPublisher service.
-   *
-   * @param Google_Client $client
-   */
-  public function __construct(Google_Client $client)
-  {
-    parent::__construct($client);
-    $this->rootUrl = 'https://www.googleapis.com/';
-    $this->servicePath = 'androidpublisher/v2/applications/';
-    $this->version = 'v2';
-    $this->serviceName = 'androidpublisher';
-
-    $this->edits = new Google_Service_AndroidPublisher_Resource_Edits(
-        $this,
-        $this->serviceName,
-        'edits',
-        array(
-          'methods' => array(
-            'commit' => array(
-              'path' => '{packageName}/edits/{editId}:commit',
-              'httpMethod' => 'POST',
-              'parameters' => array(
-                'packageName' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'editId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'delete' => array(
-              'path' => '{packageName}/edits/{editId}',
-              'httpMethod' => 'DELETE',
-              'parameters' => array(
-                'packageName' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'editId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'get' => array(
-              'path' => '{packageName}/edits/{editId}',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'packageName' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'editId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'insert' => array(
-              'path' => '{packageName}/edits',
-              'httpMethod' => 'POST',
-              'parameters' => array(
-                'packageName' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'validate' => array(
-              'path' => '{packageName}/edits/{editId}:validate',
-              'httpMethod' => 'POST',
-              'parameters' => array(
-                'packageName' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'editId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),
-          )
-        )
-    );
-    $this->edits_apklistings = new Google_Service_AndroidPublisher_Resource_EditsApklistings(
-        $this,
-        $this->serviceName,
-        'apklistings',
-        array(
-          'methods' => array(
-            'delete' => array(
-              'path' => '{packageName}/edits/{editId}/apks/{apkVersionCode}/listings/{language}',
-              'httpMethod' => 'DELETE',
-              'parameters' => array(
-                'packageName' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'editId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'apkVersionCode' => array(
-                  'location' => 'path',
-                  'type' => 'integer',
-                  'required' => true,
-                ),
-                'language' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'deleteall' => array(
-              'path' => '{packageName}/edits/{editId}/apks/{apkVersionCode}/listings',
-              'httpMethod' => 'DELETE',
-              'parameters' => array(
-                'packageName' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'editId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'apkVersionCode' => array(
-                  'location' => 'path',
-                  'type' => 'integer',
-                  'required' => true,
-                ),
-              ),
-            ),'get' => array(
-              'path' => '{packageName}/edits/{editId}/apks/{apkVersionCode}/listings/{language}',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'packageName' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'editId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'apkVersionCode' => array(
-                  'location' => 'path',
-                  'type' => 'integer',
-                  'required' => true,
-                ),
-                'language' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'list' => array(
-              'path' => '{packageName}/edits/{editId}/apks/{apkVersionCode}/listings',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'packageName' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'editId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'apkVersionCode' => array(
-                  'location' => 'path',
-                  'type' => 'integer',
-                  'required' => true,
-                ),
-              ),
-            ),'patch' => array(
-              'path' => '{packageName}/edits/{editId}/apks/{apkVersionCode}/listings/{language}',
-              'httpMethod' => 'PATCH',
-              'parameters' => array(
-                'packageName' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'editId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'apkVersionCode' => array(
-                  'location' => 'path',
-                  'type' => 'integer',
-                  'required' => true,
-                ),
-                'language' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'update' => array(
-              'path' => '{packageName}/edits/{editId}/apks/{apkVersionCode}/listings/{language}',
-              'httpMethod' => 'PUT',
-              'parameters' => array(
-                'packageName' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'editId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'apkVersionCode' => array(
-                  'location' => 'path',
-                  'type' => 'integer',
-                  'required' => true,
-                ),
-                'language' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),
-          )
-        )
-    );
-    $this->edits_apks = new Google_Service_AndroidPublisher_Resource_EditsApks(
-        $this,
-        $this->serviceName,
-        'apks',
-        array(
-          'methods' => array(
-            'addexternallyhosted' => array(
-              'path' => '{packageName}/edits/{editId}/apks/externallyHosted',
-              'httpMethod' => 'POST',
-              'parameters' => array(
-                'packageName' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'editId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'list' => array(
-              'path' => '{packageName}/edits/{editId}/apks',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'packageName' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'editId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'upload' => array(
-              'path' => '{packageName}/edits/{editId}/apks',
-              'httpMethod' => 'POST',
-              'parameters' => array(
-                'packageName' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'editId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),
-          )
-        )
-    );
-    $this->edits_deobfuscationfiles = new Google_Service_AndroidPublisher_Resource_EditsDeobfuscationfiles(
-        $this,
-        $this->serviceName,
-        'deobfuscationfiles',
-        array(
-          'methods' => array(
-            'upload' => array(
-              'path' => '{packageName}/edits/{editId}/apks/{apkVersionCode}/deobfuscationFiles/{deobfuscationFileType}',
-              'httpMethod' => 'POST',
-              'parameters' => array(
-                'packageName' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'editId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'apkVersionCode' => array(
-                  'location' => 'path',
-                  'type' => 'integer',
-                  'required' => true,
-                ),
-                'deobfuscationFileType' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),
-          )
-        )
-    );
-    $this->edits_details = new Google_Service_AndroidPublisher_Resource_EditsDetails(
-        $this,
-        $this->serviceName,
-        'details',
-        array(
-          'methods' => array(
-            'get' => array(
-              'path' => '{packageName}/edits/{editId}/details',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'packageName' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'editId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'patch' => array(
-              'path' => '{packageName}/edits/{editId}/details',
-              'httpMethod' => 'PATCH',
-              'parameters' => array(
-                'packageName' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'editId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'update' => array(
-              'path' => '{packageName}/edits/{editId}/details',
-              'httpMethod' => 'PUT',
-              'parameters' => array(
-                'packageName' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'editId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),
-          )
-        )
-    );
-    $this->edits_expansionfiles = new Google_Service_AndroidPublisher_Resource_EditsExpansionfiles(
-        $this,
-        $this->serviceName,
-        'expansionfiles',
-        array(
-          'methods' => array(
-            'get' => array(
-              'path' => '{packageName}/edits/{editId}/apks/{apkVersionCode}/expansionFiles/{expansionFileType}',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'packageName' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'editId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'apkVersionCode' => array(
-                  'location' => 'path',
-                  'type' => 'integer',
-                  'required' => true,
-                ),
-                'expansionFileType' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'patch' => array(
-              'path' => '{packageName}/edits/{editId}/apks/{apkVersionCode}/expansionFiles/{expansionFileType}',
-              'httpMethod' => 'PATCH',
-              'parameters' => array(
-                'packageName' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'editId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'apkVersionCode' => array(
-                  'location' => 'path',
-                  'type' => 'integer',
-                  'required' => true,
-                ),
-                'expansionFileType' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'update' => array(
-              'path' => '{packageName}/edits/{editId}/apks/{apkVersionCode}/expansionFiles/{expansionFileType}',
-              'httpMethod' => 'PUT',
-              'parameters' => array(
-                'packageName' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'editId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'apkVersionCode' => array(
-                  'location' => 'path',
-                  'type' => 'integer',
-                  'required' => true,
-                ),
-                'expansionFileType' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'upload' => array(
-              'path' => '{packageName}/edits/{editId}/apks/{apkVersionCode}/expansionFiles/{expansionFileType}',
-              'httpMethod' => 'POST',
-              'parameters' => array(
-                'packageName' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'editId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'apkVersionCode' => array(
-                  'location' => 'path',
-                  'type' => 'integer',
-                  'required' => true,
-                ),
-                'expansionFileType' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),
-          )
-        )
-    );
-    $this->edits_images = new Google_Service_AndroidPublisher_Resource_EditsImages(
-        $this,
-        $this->serviceName,
-        'images',
-        array(
-          'methods' => array(
-            'delete' => array(
-              'path' => '{packageName}/edits/{editId}/listings/{language}/{imageType}/{imageId}',
-              'httpMethod' => 'DELETE',
-              'parameters' => array(
-                'packageName' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'editId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'language' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'imageType' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'imageId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'deleteall' => array(
-              'path' => '{packageName}/edits/{editId}/listings/{language}/{imageType}',
-              'httpMethod' => 'DELETE',
-              'parameters' => array(
-                'packageName' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'editId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'language' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'imageType' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'list' => array(
-              'path' => '{packageName}/edits/{editId}/listings/{language}/{imageType}',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'packageName' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'editId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'language' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'imageType' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'upload' => array(
-              'path' => '{packageName}/edits/{editId}/listings/{language}/{imageType}',
-              'httpMethod' => 'POST',
-              'parameters' => array(
-                'packageName' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'editId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'language' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'imageType' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),
-          )
-        )
-    );
-    $this->edits_listings = new Google_Service_AndroidPublisher_Resource_EditsListings(
-        $this,
-        $this->serviceName,
-        'listings',
-        array(
-          'methods' => array(
-            'delete' => array(
-              'path' => '{packageName}/edits/{editId}/listings/{language}',
-              'httpMethod' => 'DELETE',
-              'parameters' => array(
-                'packageName' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'editId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'language' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'deleteall' => array(
-              'path' => '{packageName}/edits/{editId}/listings',
-              'httpMethod' => 'DELETE',
-              'parameters' => array(
-                'packageName' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'editId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'get' => array(
-              'path' => '{packageName}/edits/{editId}/listings/{language}',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'packageName' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'editId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'language' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'list' => array(
-              'path' => '{packageName}/edits/{editId}/listings',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'packageName' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'editId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'patch' => array(
-              'path' => '{packageName}/edits/{editId}/listings/{language}',
-              'httpMethod' => 'PATCH',
-              'parameters' => array(
-                'packageName' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'editId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'language' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'update' => array(
-              'path' => '{packageName}/edits/{editId}/listings/{language}',
-              'httpMethod' => 'PUT',
-              'parameters' => array(
-                'packageName' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'editId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'language' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),
-          )
-        )
-    );
-    $this->edits_testers = new Google_Service_AndroidPublisher_Resource_EditsTesters(
-        $this,
-        $this->serviceName,
-        'testers',
-        array(
-          'methods' => array(
-            'get' => array(
-              'path' => '{packageName}/edits/{editId}/testers/{track}',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'packageName' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'editId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'track' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'patch' => array(
-              'path' => '{packageName}/edits/{editId}/testers/{track}',
-              'httpMethod' => 'PATCH',
-              'parameters' => array(
-                'packageName' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'editId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'track' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'update' => array(
-              'path' => '{packageName}/edits/{editId}/testers/{track}',
-              'httpMethod' => 'PUT',
-              'parameters' => array(
-                'packageName' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'editId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'track' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),
-          )
-        )
-    );
-    $this->edits_tracks = new Google_Service_AndroidPublisher_Resource_EditsTracks(
-        $this,
-        $this->serviceName,
-        'tracks',
-        array(
-          'methods' => array(
-            'get' => array(
-              'path' => '{packageName}/edits/{editId}/tracks/{track}',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'packageName' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'editId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'track' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'list' => array(
-              'path' => '{packageName}/edits/{editId}/tracks',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'packageName' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'editId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'patch' => array(
-              'path' => '{packageName}/edits/{editId}/tracks/{track}',
-              'httpMethod' => 'PATCH',
-              'parameters' => array(
-                'packageName' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'editId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'track' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'update' => array(
-              'path' => '{packageName}/edits/{editId}/tracks/{track}',
-              'httpMethod' => 'PUT',
-              'parameters' => array(
-                'packageName' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'editId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'track' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),
-          )
-        )
-    );
-    $this->entitlements = new Google_Service_AndroidPublisher_Resource_Entitlements(
-        $this,
-        $this->serviceName,
-        'entitlements',
-        array(
-          'methods' => array(
-            'list' => array(
-              'path' => '{packageName}/entitlements',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'packageName' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'maxResults' => array(
-                  'location' => 'query',
-                  'type' => 'integer',
-                ),
-                'productId' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'startIndex' => array(
-                  'location' => 'query',
-                  'type' => 'integer',
-                ),
-                'token' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-              ),
-            ),
-          )
-        )
-    );
-    $this->inappproducts = new Google_Service_AndroidPublisher_Resource_Inappproducts(
-        $this,
-        $this->serviceName,
-        'inappproducts',
-        array(
-          'methods' => array(
-            'batch' => array(
-              'path' => 'inappproducts/batch',
-              'httpMethod' => 'POST',
-              'parameters' => array(),
-            ),'delete' => array(
-              'path' => '{packageName}/inappproducts/{sku}',
-              'httpMethod' => 'DELETE',
-              'parameters' => array(
-                'packageName' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'sku' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'get' => array(
-              'path' => '{packageName}/inappproducts/{sku}',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'packageName' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'sku' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'insert' => array(
-              'path' => '{packageName}/inappproducts',
-              'httpMethod' => 'POST',
-              'parameters' => array(
-                'packageName' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'autoConvertMissingPrices' => array(
-                  'location' => 'query',
-                  'type' => 'boolean',
-                ),
-              ),
-            ),'list' => array(
-              'path' => '{packageName}/inappproducts',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'packageName' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'maxResults' => array(
-                  'location' => 'query',
-                  'type' => 'integer',
-                ),
-                'startIndex' => array(
-                  'location' => 'query',
-                  'type' => 'integer',
-                ),
-                'token' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-              ),
-            ),'patch' => array(
-              'path' => '{packageName}/inappproducts/{sku}',
-              'httpMethod' => 'PATCH',
-              'parameters' => array(
-                'packageName' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'sku' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'autoConvertMissingPrices' => array(
-                  'location' => 'query',
-                  'type' => 'boolean',
-                ),
-              ),
-            ),'update' => array(
-              'path' => '{packageName}/inappproducts/{sku}',
-              'httpMethod' => 'PUT',
-              'parameters' => array(
-                'packageName' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'sku' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'autoConvertMissingPrices' => array(
-                  'location' => 'query',
-                  'type' => 'boolean',
-                ),
-              ),
-            ),
-          )
-        )
-    );
-    $this->purchases_products = new Google_Service_AndroidPublisher_Resource_PurchasesProducts(
-        $this,
-        $this->serviceName,
-        'products',
-        array(
-          'methods' => array(
-            'get' => array(
-              'path' => '{packageName}/purchases/products/{productId}/tokens/{token}',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'packageName' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'productId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'token' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),
-          )
-        )
-    );
-    $this->purchases_subscriptions = new Google_Service_AndroidPublisher_Resource_PurchasesSubscriptions(
-        $this,
-        $this->serviceName,
-        'subscriptions',
-        array(
-          'methods' => array(
-            'cancel' => array(
-              'path' => '{packageName}/purchases/subscriptions/{subscriptionId}/tokens/{token}:cancel',
-              'httpMethod' => 'POST',
-              'parameters' => array(
-                'packageName' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'subscriptionId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'token' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'defer' => array(
-              'path' => '{packageName}/purchases/subscriptions/{subscriptionId}/tokens/{token}:defer',
-              'httpMethod' => 'POST',
-              'parameters' => array(
-                'packageName' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'subscriptionId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'token' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'get' => array(
-              'path' => '{packageName}/purchases/subscriptions/{subscriptionId}/tokens/{token}',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'packageName' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'subscriptionId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'token' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'refund' => array(
-              'path' => '{packageName}/purchases/subscriptions/{subscriptionId}/tokens/{token}:refund',
-              'httpMethod' => 'POST',
-              'parameters' => array(
-                'packageName' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'subscriptionId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'token' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'revoke' => array(
-              'path' => '{packageName}/purchases/subscriptions/{subscriptionId}/tokens/{token}:revoke',
-              'httpMethod' => 'POST',
-              'parameters' => array(
-                'packageName' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'subscriptionId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'token' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),
-          )
-        )
-    );
-    $this->purchases_voidedpurchases = new Google_Service_AndroidPublisher_Resource_PurchasesVoidedpurchases(
-        $this,
-        $this->serviceName,
-        'voidedpurchases',
-        array(
-          'methods' => array(
-            'list' => array(
-              'path' => '{packageName}/purchases/voidedpurchases',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'packageName' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'endTime' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'maxResults' => array(
-                  'location' => 'query',
-                  'type' => 'integer',
-                ),
-                'startIndex' => array(
-                  'location' => 'query',
-                  'type' => 'integer',
-                ),
-                'startTime' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'token' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-              ),
-            ),
-          )
-        )
-    );
-    $this->reviews = new Google_Service_AndroidPublisher_Resource_Reviews(
-        $this,
-        $this->serviceName,
-        'reviews',
-        array(
-          'methods' => array(
-            'get' => array(
-              'path' => '{packageName}/reviews/{reviewId}',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'packageName' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'reviewId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'translationLanguage' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-              ),
-            ),'list' => array(
-              'path' => '{packageName}/reviews',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'packageName' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'maxResults' => array(
-                  'location' => 'query',
-                  'type' => 'integer',
-                ),
-                'startIndex' => array(
-                  'location' => 'query',
-                  'type' => 'integer',
-                ),
-                'token' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'translationLanguage' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-              ),
-            ),'reply' => array(
-              'path' => '{packageName}/reviews/{reviewId}:reply',
-              'httpMethod' => 'POST',
-              'parameters' => array(
-                'packageName' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'reviewId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),
-          )
-        )
-    );
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AndroidPublisher/Apk.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AndroidPublisher/Apk.php
deleted file mode 100644
index 25b7a54b..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AndroidPublisher/Apk.php
+++ /dev/null
@@ -1,40 +0,0 @@
-binary = $binary;
-  }
-  public function getBinary()
-  {
-    return $this->binary;
-  }
-  public function setVersionCode($versionCode)
-  {
-    $this->versionCode = $versionCode;
-  }
-  public function getVersionCode()
-  {
-    return $this->versionCode;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AndroidPublisher/ApkBinary.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AndroidPublisher/ApkBinary.php
deleted file mode 100644
index 713000e0..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AndroidPublisher/ApkBinary.php
+++ /dev/null
@@ -1,30 +0,0 @@
-sha1 = $sha1;
-  }
-  public function getSha1()
-  {
-    return $this->sha1;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AndroidPublisher/ApkListing.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AndroidPublisher/ApkListing.php
deleted file mode 100644
index ee624744..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AndroidPublisher/ApkListing.php
+++ /dev/null
@@ -1,39 +0,0 @@
-language = $language;
-  }
-  public function getLanguage()
-  {
-    return $this->language;
-  }
-  public function setRecentChanges($recentChanges)
-  {
-    $this->recentChanges = $recentChanges;
-  }
-  public function getRecentChanges()
-  {
-    return $this->recentChanges;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AndroidPublisher/ApkListingsListResponse.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AndroidPublisher/ApkListingsListResponse.php
deleted file mode 100644
index d9adb37a..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AndroidPublisher/ApkListingsListResponse.php
+++ /dev/null
@@ -1,41 +0,0 @@
-kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setListings($listings)
-  {
-    $this->listings = $listings;
-  }
-  public function getListings()
-  {
-    return $this->listings;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AndroidPublisher/ApksAddExternallyHostedRequest.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AndroidPublisher/ApksAddExternallyHostedRequest.php
deleted file mode 100644
index d7ca9cd4..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AndroidPublisher/ApksAddExternallyHostedRequest.php
+++ /dev/null
@@ -1,31 +0,0 @@
-externallyHostedApk = $externallyHostedApk;
-  }
-  public function getExternallyHostedApk()
-  {
-    return $this->externallyHostedApk;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AndroidPublisher/ApksAddExternallyHostedResponse.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AndroidPublisher/ApksAddExternallyHostedResponse.php
deleted file mode 100644
index 2829511e..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AndroidPublisher/ApksAddExternallyHostedResponse.php
+++ /dev/null
@@ -1,31 +0,0 @@
-externallyHostedApk = $externallyHostedApk;
-  }
-  public function getExternallyHostedApk()
-  {
-    return $this->externallyHostedApk;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AndroidPublisher/ApksListResponse.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AndroidPublisher/ApksListResponse.php
deleted file mode 100644
index 040a7459..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AndroidPublisher/ApksListResponse.php
+++ /dev/null
@@ -1,41 +0,0 @@
-apks = $apks;
-  }
-  public function getApks()
-  {
-    return $this->apks;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AndroidPublisher/AppDetails.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AndroidPublisher/AppDetails.php
deleted file mode 100644
index 6fe56b02..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AndroidPublisher/AppDetails.php
+++ /dev/null
@@ -1,57 +0,0 @@
-contactEmail = $contactEmail;
-  }
-  public function getContactEmail()
-  {
-    return $this->contactEmail;
-  }
-  public function setContactPhone($contactPhone)
-  {
-    $this->contactPhone = $contactPhone;
-  }
-  public function getContactPhone()
-  {
-    return $this->contactPhone;
-  }
-  public function setContactWebsite($contactWebsite)
-  {
-    $this->contactWebsite = $contactWebsite;
-  }
-  public function getContactWebsite()
-  {
-    return $this->contactWebsite;
-  }
-  public function setDefaultLanguage($defaultLanguage)
-  {
-    $this->defaultLanguage = $defaultLanguage;
-  }
-  public function getDefaultLanguage()
-  {
-    return $this->defaultLanguage;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AndroidPublisher/AppEdit.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AndroidPublisher/AppEdit.php
deleted file mode 100644
index 4175f551..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AndroidPublisher/AppEdit.php
+++ /dev/null
@@ -1,39 +0,0 @@
-expiryTimeSeconds = $expiryTimeSeconds;
-  }
-  public function getExpiryTimeSeconds()
-  {
-    return $this->expiryTimeSeconds;
-  }
-  public function setId($id)
-  {
-    $this->id = $id;
-  }
-  public function getId()
-  {
-    return $this->id;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AndroidPublisher/Comment.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AndroidPublisher/Comment.php
deleted file mode 100644
index dab712f1..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AndroidPublisher/Comment.php
+++ /dev/null
@@ -1,41 +0,0 @@
-developerComment = $developerComment;
-  }
-  public function getDeveloperComment()
-  {
-    return $this->developerComment;
-  }
-  public function setUserComment(Google_Service_AndroidPublisher_UserComment $userComment)
-  {
-    $this->userComment = $userComment;
-  }
-  public function getUserComment()
-  {
-    return $this->userComment;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AndroidPublisher/DeobfuscationFile.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AndroidPublisher/DeobfuscationFile.php
deleted file mode 100644
index 9c3389b4..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AndroidPublisher/DeobfuscationFile.php
+++ /dev/null
@@ -1,30 +0,0 @@
-symbolType = $symbolType;
-  }
-  public function getSymbolType()
-  {
-    return $this->symbolType;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AndroidPublisher/DeobfuscationFilesUploadResponse.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AndroidPublisher/DeobfuscationFilesUploadResponse.php
deleted file mode 100644
index 598ce394..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AndroidPublisher/DeobfuscationFilesUploadResponse.php
+++ /dev/null
@@ -1,31 +0,0 @@
-deobfuscationFile = $deobfuscationFile;
-  }
-  public function getDeobfuscationFile()
-  {
-    return $this->deobfuscationFile;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AndroidPublisher/DeveloperComment.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AndroidPublisher/DeveloperComment.php
deleted file mode 100644
index 5686bf9e..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AndroidPublisher/DeveloperComment.php
+++ /dev/null
@@ -1,40 +0,0 @@
-lastModified = $lastModified;
-  }
-  public function getLastModified()
-  {
-    return $this->lastModified;
-  }
-  public function setText($text)
-  {
-    $this->text = $text;
-  }
-  public function getText()
-  {
-    return $this->text;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AndroidPublisher/DeviceMetadata.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AndroidPublisher/DeviceMetadata.php
deleted file mode 100644
index ebd0036f..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AndroidPublisher/DeviceMetadata.php
+++ /dev/null
@@ -1,120 +0,0 @@
-cpuMake = $cpuMake;
-  }
-  public function getCpuMake()
-  {
-    return $this->cpuMake;
-  }
-  public function setCpuModel($cpuModel)
-  {
-    $this->cpuModel = $cpuModel;
-  }
-  public function getCpuModel()
-  {
-    return $this->cpuModel;
-  }
-  public function setDeviceClass($deviceClass)
-  {
-    $this->deviceClass = $deviceClass;
-  }
-  public function getDeviceClass()
-  {
-    return $this->deviceClass;
-  }
-  public function setGlEsVersion($glEsVersion)
-  {
-    $this->glEsVersion = $glEsVersion;
-  }
-  public function getGlEsVersion()
-  {
-    return $this->glEsVersion;
-  }
-  public function setManufacturer($manufacturer)
-  {
-    $this->manufacturer = $manufacturer;
-  }
-  public function getManufacturer()
-  {
-    return $this->manufacturer;
-  }
-  public function setNativePlatform($nativePlatform)
-  {
-    $this->nativePlatform = $nativePlatform;
-  }
-  public function getNativePlatform()
-  {
-    return $this->nativePlatform;
-  }
-  public function setProductName($productName)
-  {
-    $this->productName = $productName;
-  }
-  public function getProductName()
-  {
-    return $this->productName;
-  }
-  public function setRamMb($ramMb)
-  {
-    $this->ramMb = $ramMb;
-  }
-  public function getRamMb()
-  {
-    return $this->ramMb;
-  }
-  public function setScreenDensityDpi($screenDensityDpi)
-  {
-    $this->screenDensityDpi = $screenDensityDpi;
-  }
-  public function getScreenDensityDpi()
-  {
-    return $this->screenDensityDpi;
-  }
-  public function setScreenHeightPx($screenHeightPx)
-  {
-    $this->screenHeightPx = $screenHeightPx;
-  }
-  public function getScreenHeightPx()
-  {
-    return $this->screenHeightPx;
-  }
-  public function setScreenWidthPx($screenWidthPx)
-  {
-    $this->screenWidthPx = $screenWidthPx;
-  }
-  public function getScreenWidthPx()
-  {
-    return $this->screenWidthPx;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AndroidPublisher/Entitlement.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AndroidPublisher/Entitlement.php
deleted file mode 100644
index 79a76811..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AndroidPublisher/Entitlement.php
+++ /dev/null
@@ -1,57 +0,0 @@
-kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setProductId($productId)
-  {
-    $this->productId = $productId;
-  }
-  public function getProductId()
-  {
-    return $this->productId;
-  }
-  public function setProductType($productType)
-  {
-    $this->productType = $productType;
-  }
-  public function getProductType()
-  {
-    return $this->productType;
-  }
-  public function setToken($token)
-  {
-    $this->token = $token;
-  }
-  public function getToken()
-  {
-    return $this->token;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AndroidPublisher/EntitlementsListResponse.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AndroidPublisher/EntitlementsListResponse.php
deleted file mode 100644
index c6ba8213..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AndroidPublisher/EntitlementsListResponse.php
+++ /dev/null
@@ -1,52 +0,0 @@
-pageInfo = $pageInfo;
-  }
-  public function getPageInfo()
-  {
-    return $this->pageInfo;
-  }
-  public function setResources($resources)
-  {
-    $this->resources = $resources;
-  }
-  public function getResources()
-  {
-    return $this->resources;
-  }
-  public function setTokenPagination(Google_Service_AndroidPublisher_TokenPagination $tokenPagination)
-  {
-    $this->tokenPagination = $tokenPagination;
-  }
-  public function getTokenPagination()
-  {
-    return $this->tokenPagination;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AndroidPublisher/ExpansionFile.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AndroidPublisher/ExpansionFile.php
deleted file mode 100644
index 32635979..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AndroidPublisher/ExpansionFile.php
+++ /dev/null
@@ -1,39 +0,0 @@
-fileSize = $fileSize;
-  }
-  public function getFileSize()
-  {
-    return $this->fileSize;
-  }
-  public function setReferencesVersion($referencesVersion)
-  {
-    $this->referencesVersion = $referencesVersion;
-  }
-  public function getReferencesVersion()
-  {
-    return $this->referencesVersion;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AndroidPublisher/ExpansionFilesUploadResponse.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AndroidPublisher/ExpansionFilesUploadResponse.php
deleted file mode 100644
index b53010d4..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AndroidPublisher/ExpansionFilesUploadResponse.php
+++ /dev/null
@@ -1,31 +0,0 @@
-expansionFile = $expansionFile;
-  }
-  public function getExpansionFile()
-  {
-    return $this->expansionFile;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AndroidPublisher/ExternallyHostedApk.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AndroidPublisher/ExternallyHostedApk.php
deleted file mode 100644
index 1f4bc1c6..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AndroidPublisher/ExternallyHostedApk.php
+++ /dev/null
@@ -1,158 +0,0 @@
-applicationLabel = $applicationLabel;
-  }
-  public function getApplicationLabel()
-  {
-    return $this->applicationLabel;
-  }
-  public function setCertificateBase64s($certificateBase64s)
-  {
-    $this->certificateBase64s = $certificateBase64s;
-  }
-  public function getCertificateBase64s()
-  {
-    return $this->certificateBase64s;
-  }
-  public function setExternallyHostedUrl($externallyHostedUrl)
-  {
-    $this->externallyHostedUrl = $externallyHostedUrl;
-  }
-  public function getExternallyHostedUrl()
-  {
-    return $this->externallyHostedUrl;
-  }
-  public function setFileSha1Base64($fileSha1Base64)
-  {
-    $this->fileSha1Base64 = $fileSha1Base64;
-  }
-  public function getFileSha1Base64()
-  {
-    return $this->fileSha1Base64;
-  }
-  public function setFileSha256Base64($fileSha256Base64)
-  {
-    $this->fileSha256Base64 = $fileSha256Base64;
-  }
-  public function getFileSha256Base64()
-  {
-    return $this->fileSha256Base64;
-  }
-  public function setFileSize($fileSize)
-  {
-    $this->fileSize = $fileSize;
-  }
-  public function getFileSize()
-  {
-    return $this->fileSize;
-  }
-  public function setIconBase64($iconBase64)
-  {
-    $this->iconBase64 = $iconBase64;
-  }
-  public function getIconBase64()
-  {
-    return $this->iconBase64;
-  }
-  public function setMaximumSdk($maximumSdk)
-  {
-    $this->maximumSdk = $maximumSdk;
-  }
-  public function getMaximumSdk()
-  {
-    return $this->maximumSdk;
-  }
-  public function setMinimumSdk($minimumSdk)
-  {
-    $this->minimumSdk = $minimumSdk;
-  }
-  public function getMinimumSdk()
-  {
-    return $this->minimumSdk;
-  }
-  public function setNativeCodes($nativeCodes)
-  {
-    $this->nativeCodes = $nativeCodes;
-  }
-  public function getNativeCodes()
-  {
-    return $this->nativeCodes;
-  }
-  public function setPackageName($packageName)
-  {
-    $this->packageName = $packageName;
-  }
-  public function getPackageName()
-  {
-    return $this->packageName;
-  }
-  public function setUsesFeatures($usesFeatures)
-  {
-    $this->usesFeatures = $usesFeatures;
-  }
-  public function getUsesFeatures()
-  {
-    return $this->usesFeatures;
-  }
-  public function setUsesPermissions($usesPermissions)
-  {
-    $this->usesPermissions = $usesPermissions;
-  }
-  public function getUsesPermissions()
-  {
-    return $this->usesPermissions;
-  }
-  public function setVersionCode($versionCode)
-  {
-    $this->versionCode = $versionCode;
-  }
-  public function getVersionCode()
-  {
-    return $this->versionCode;
-  }
-  public function setVersionName($versionName)
-  {
-    $this->versionName = $versionName;
-  }
-  public function getVersionName()
-  {
-    return $this->versionName;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AndroidPublisher/ExternallyHostedApkUsesPermission.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AndroidPublisher/ExternallyHostedApkUsesPermission.php
deleted file mode 100644
index 27fd1b00..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AndroidPublisher/ExternallyHostedApkUsesPermission.php
+++ /dev/null
@@ -1,39 +0,0 @@
-maxSdkVersion = $maxSdkVersion;
-  }
-  public function getMaxSdkVersion()
-  {
-    return $this->maxSdkVersion;
-  }
-  public function setName($name)
-  {
-    $this->name = $name;
-  }
-  public function getName()
-  {
-    return $this->name;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AndroidPublisher/Image.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AndroidPublisher/Image.php
deleted file mode 100644
index 269ceb7c..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AndroidPublisher/Image.php
+++ /dev/null
@@ -1,48 +0,0 @@
-id = $id;
-  }
-  public function getId()
-  {
-    return $this->id;
-  }
-  public function setSha1($sha1)
-  {
-    $this->sha1 = $sha1;
-  }
-  public function getSha1()
-  {
-    return $this->sha1;
-  }
-  public function setUrl($url)
-  {
-    $this->url = $url;
-  }
-  public function getUrl()
-  {
-    return $this->url;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AndroidPublisher/ImagesDeleteAllResponse.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AndroidPublisher/ImagesDeleteAllResponse.php
deleted file mode 100644
index 7d2fcf3f..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AndroidPublisher/ImagesDeleteAllResponse.php
+++ /dev/null
@@ -1,32 +0,0 @@
-deleted = $deleted;
-  }
-  public function getDeleted()
-  {
-    return $this->deleted;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AndroidPublisher/ImagesListResponse.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AndroidPublisher/ImagesListResponse.php
deleted file mode 100644
index 740f9a04..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AndroidPublisher/ImagesListResponse.php
+++ /dev/null
@@ -1,32 +0,0 @@
-images = $images;
-  }
-  public function getImages()
-  {
-    return $this->images;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AndroidPublisher/ImagesUploadResponse.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AndroidPublisher/ImagesUploadResponse.php
deleted file mode 100644
index 1e8514b0..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AndroidPublisher/ImagesUploadResponse.php
+++ /dev/null
@@ -1,31 +0,0 @@
-image = $image;
-  }
-  public function getImage()
-  {
-    return $this->image;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AndroidPublisher/InAppProduct.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AndroidPublisher/InAppProduct.php
deleted file mode 100644
index c4c503b4..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AndroidPublisher/InAppProduct.php
+++ /dev/null
@@ -1,124 +0,0 @@
-defaultLanguage = $defaultLanguage;
-  }
-  public function getDefaultLanguage()
-  {
-    return $this->defaultLanguage;
-  }
-  public function setDefaultPrice(Google_Service_AndroidPublisher_Price $defaultPrice)
-  {
-    $this->defaultPrice = $defaultPrice;
-  }
-  public function getDefaultPrice()
-  {
-    return $this->defaultPrice;
-  }
-  public function setListings($listings)
-  {
-    $this->listings = $listings;
-  }
-  public function getListings()
-  {
-    return $this->listings;
-  }
-  public function setPackageName($packageName)
-  {
-    $this->packageName = $packageName;
-  }
-  public function getPackageName()
-  {
-    return $this->packageName;
-  }
-  public function setPrices($prices)
-  {
-    $this->prices = $prices;
-  }
-  public function getPrices()
-  {
-    return $this->prices;
-  }
-  public function setPurchaseType($purchaseType)
-  {
-    $this->purchaseType = $purchaseType;
-  }
-  public function getPurchaseType()
-  {
-    return $this->purchaseType;
-  }
-  public function setSeason(Google_Service_AndroidPublisher_Season $season)
-  {
-    $this->season = $season;
-  }
-  public function getSeason()
-  {
-    return $this->season;
-  }
-  public function setSku($sku)
-  {
-    $this->sku = $sku;
-  }
-  public function getSku()
-  {
-    return $this->sku;
-  }
-  public function setStatus($status)
-  {
-    $this->status = $status;
-  }
-  public function getStatus()
-  {
-    return $this->status;
-  }
-  public function setSubscriptionPeriod($subscriptionPeriod)
-  {
-    $this->subscriptionPeriod = $subscriptionPeriod;
-  }
-  public function getSubscriptionPeriod()
-  {
-    return $this->subscriptionPeriod;
-  }
-  public function setTrialPeriod($trialPeriod)
-  {
-    $this->trialPeriod = $trialPeriod;
-  }
-  public function getTrialPeriod()
-  {
-    return $this->trialPeriod;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AndroidPublisher/InAppProductListing.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AndroidPublisher/InAppProductListing.php
deleted file mode 100644
index 1c3388b3..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AndroidPublisher/InAppProductListing.php
+++ /dev/null
@@ -1,39 +0,0 @@
-description = $description;
-  }
-  public function getDescription()
-  {
-    return $this->description;
-  }
-  public function setTitle($title)
-  {
-    $this->title = $title;
-  }
-  public function getTitle()
-  {
-    return $this->title;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AndroidPublisher/InappproductsBatchRequest.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AndroidPublisher/InappproductsBatchRequest.php
deleted file mode 100644
index 6ab8fa5c..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AndroidPublisher/InappproductsBatchRequest.php
+++ /dev/null
@@ -1,32 +0,0 @@
-entrys = $entrys;
-  }
-  public function getEntrys()
-  {
-    return $this->entrys;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AndroidPublisher/InappproductsBatchRequestEntry.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AndroidPublisher/InappproductsBatchRequestEntry.php
deleted file mode 100644
index 8677b014..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AndroidPublisher/InappproductsBatchRequestEntry.php
+++ /dev/null
@@ -1,59 +0,0 @@
-batchId = $batchId;
-  }
-  public function getBatchId()
-  {
-    return $this->batchId;
-  }
-  public function setInappproductsinsertrequest(Google_Service_AndroidPublisher_InappproductsInsertRequest $inappproductsinsertrequest)
-  {
-    $this->inappproductsinsertrequest = $inappproductsinsertrequest;
-  }
-  public function getInappproductsinsertrequest()
-  {
-    return $this->inappproductsinsertrequest;
-  }
-  public function setInappproductsupdaterequest(Google_Service_AndroidPublisher_InappproductsUpdateRequest $inappproductsupdaterequest)
-  {
-    $this->inappproductsupdaterequest = $inappproductsupdaterequest;
-  }
-  public function getInappproductsupdaterequest()
-  {
-    return $this->inappproductsupdaterequest;
-  }
-  public function setMethodName($methodName)
-  {
-    $this->methodName = $methodName;
-  }
-  public function getMethodName()
-  {
-    return $this->methodName;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AndroidPublisher/InappproductsBatchResponse.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AndroidPublisher/InappproductsBatchResponse.php
deleted file mode 100644
index 324864ba..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AndroidPublisher/InappproductsBatchResponse.php
+++ /dev/null
@@ -1,41 +0,0 @@
-entrys = $entrys;
-  }
-  public function getEntrys()
-  {
-    return $this->entrys;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AndroidPublisher/InappproductsBatchResponseEntry.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AndroidPublisher/InappproductsBatchResponseEntry.php
deleted file mode 100644
index ed82acc5..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AndroidPublisher/InappproductsBatchResponseEntry.php
+++ /dev/null
@@ -1,50 +0,0 @@
-batchId = $batchId;
-  }
-  public function getBatchId()
-  {
-    return $this->batchId;
-  }
-  public function setInappproductsinsertresponse(Google_Service_AndroidPublisher_InappproductsInsertResponse $inappproductsinsertresponse)
-  {
-    $this->inappproductsinsertresponse = $inappproductsinsertresponse;
-  }
-  public function getInappproductsinsertresponse()
-  {
-    return $this->inappproductsinsertresponse;
-  }
-  public function setInappproductsupdateresponse(Google_Service_AndroidPublisher_InappproductsUpdateResponse $inappproductsupdateresponse)
-  {
-    $this->inappproductsupdateresponse = $inappproductsupdateresponse;
-  }
-  public function getInappproductsupdateresponse()
-  {
-    return $this->inappproductsupdateresponse;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AndroidPublisher/InappproductsInsertRequest.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AndroidPublisher/InappproductsInsertRequest.php
deleted file mode 100644
index ed15881c..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AndroidPublisher/InappproductsInsertRequest.php
+++ /dev/null
@@ -1,31 +0,0 @@
-inappproduct = $inappproduct;
-  }
-  public function getInappproduct()
-  {
-    return $this->inappproduct;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AndroidPublisher/InappproductsInsertResponse.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AndroidPublisher/InappproductsInsertResponse.php
deleted file mode 100644
index 079e375c..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AndroidPublisher/InappproductsInsertResponse.php
+++ /dev/null
@@ -1,31 +0,0 @@
-inappproduct = $inappproduct;
-  }
-  public function getInappproduct()
-  {
-    return $this->inappproduct;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AndroidPublisher/InappproductsListResponse.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AndroidPublisher/InappproductsListResponse.php
deleted file mode 100644
index a6ee8471..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AndroidPublisher/InappproductsListResponse.php
+++ /dev/null
@@ -1,61 +0,0 @@
-inappproduct = $inappproduct;
-  }
-  public function getInappproduct()
-  {
-    return $this->inappproduct;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setPageInfo(Google_Service_AndroidPublisher_PageInfo $pageInfo)
-  {
-    $this->pageInfo = $pageInfo;
-  }
-  public function getPageInfo()
-  {
-    return $this->pageInfo;
-  }
-  public function setTokenPagination(Google_Service_AndroidPublisher_TokenPagination $tokenPagination)
-  {
-    $this->tokenPagination = $tokenPagination;
-  }
-  public function getTokenPagination()
-  {
-    return $this->tokenPagination;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AndroidPublisher/InappproductsUpdateRequest.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AndroidPublisher/InappproductsUpdateRequest.php
deleted file mode 100644
index 35647417..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AndroidPublisher/InappproductsUpdateRequest.php
+++ /dev/null
@@ -1,31 +0,0 @@
-inappproduct = $inappproduct;
-  }
-  public function getInappproduct()
-  {
-    return $this->inappproduct;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AndroidPublisher/InappproductsUpdateResponse.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AndroidPublisher/InappproductsUpdateResponse.php
deleted file mode 100644
index 6966db8b..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AndroidPublisher/InappproductsUpdateResponse.php
+++ /dev/null
@@ -1,31 +0,0 @@
-inappproduct = $inappproduct;
-  }
-  public function getInappproduct()
-  {
-    return $this->inappproduct;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AndroidPublisher/Listing.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AndroidPublisher/Listing.php
deleted file mode 100644
index 97677c40..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AndroidPublisher/Listing.php
+++ /dev/null
@@ -1,66 +0,0 @@
-fullDescription = $fullDescription;
-  }
-  public function getFullDescription()
-  {
-    return $this->fullDescription;
-  }
-  public function setLanguage($language)
-  {
-    $this->language = $language;
-  }
-  public function getLanguage()
-  {
-    return $this->language;
-  }
-  public function setShortDescription($shortDescription)
-  {
-    $this->shortDescription = $shortDescription;
-  }
-  public function getShortDescription()
-  {
-    return $this->shortDescription;
-  }
-  public function setTitle($title)
-  {
-    $this->title = $title;
-  }
-  public function getTitle()
-  {
-    return $this->title;
-  }
-  public function setVideo($video)
-  {
-    $this->video = $video;
-  }
-  public function getVideo()
-  {
-    return $this->video;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AndroidPublisher/ListingsListResponse.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AndroidPublisher/ListingsListResponse.php
deleted file mode 100644
index 5f864bbe..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AndroidPublisher/ListingsListResponse.php
+++ /dev/null
@@ -1,41 +0,0 @@
-kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setListings($listings)
-  {
-    $this->listings = $listings;
-  }
-  public function getListings()
-  {
-    return $this->listings;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AndroidPublisher/MonthDay.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AndroidPublisher/MonthDay.php
deleted file mode 100644
index cb2e1ec9..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AndroidPublisher/MonthDay.php
+++ /dev/null
@@ -1,39 +0,0 @@
-day = $day;
-  }
-  public function getDay()
-  {
-    return $this->day;
-  }
-  public function setMonth($month)
-  {
-    $this->month = $month;
-  }
-  public function getMonth()
-  {
-    return $this->month;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AndroidPublisher/PageInfo.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AndroidPublisher/PageInfo.php
deleted file mode 100644
index 18ba5507..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AndroidPublisher/PageInfo.php
+++ /dev/null
@@ -1,48 +0,0 @@
-resultPerPage = $resultPerPage;
-  }
-  public function getResultPerPage()
-  {
-    return $this->resultPerPage;
-  }
-  public function setStartIndex($startIndex)
-  {
-    $this->startIndex = $startIndex;
-  }
-  public function getStartIndex()
-  {
-    return $this->startIndex;
-  }
-  public function setTotalResults($totalResults)
-  {
-    $this->totalResults = $totalResults;
-  }
-  public function getTotalResults()
-  {
-    return $this->totalResults;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AndroidPublisher/Price.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AndroidPublisher/Price.php
deleted file mode 100644
index 211e5744..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AndroidPublisher/Price.php
+++ /dev/null
@@ -1,39 +0,0 @@
-currency = $currency;
-  }
-  public function getCurrency()
-  {
-    return $this->currency;
-  }
-  public function setPriceMicros($priceMicros)
-  {
-    $this->priceMicros = $priceMicros;
-  }
-  public function getPriceMicros()
-  {
-    return $this->priceMicros;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AndroidPublisher/ProductPurchase.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AndroidPublisher/ProductPurchase.php
deleted file mode 100644
index f4cc2aae..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AndroidPublisher/ProductPurchase.php
+++ /dev/null
@@ -1,66 +0,0 @@
-consumptionState = $consumptionState;
-  }
-  public function getConsumptionState()
-  {
-    return $this->consumptionState;
-  }
-  public function setDeveloperPayload($developerPayload)
-  {
-    $this->developerPayload = $developerPayload;
-  }
-  public function getDeveloperPayload()
-  {
-    return $this->developerPayload;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setPurchaseState($purchaseState)
-  {
-    $this->purchaseState = $purchaseState;
-  }
-  public function getPurchaseState()
-  {
-    return $this->purchaseState;
-  }
-  public function setPurchaseTimeMillis($purchaseTimeMillis)
-  {
-    $this->purchaseTimeMillis = $purchaseTimeMillis;
-  }
-  public function getPurchaseTimeMillis()
-  {
-    return $this->purchaseTimeMillis;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AndroidPublisher/Prorate.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AndroidPublisher/Prorate.php
deleted file mode 100644
index 099f6a0d..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AndroidPublisher/Prorate.php
+++ /dev/null
@@ -1,41 +0,0 @@
-defaultPrice = $defaultPrice;
-  }
-  public function getDefaultPrice()
-  {
-    return $this->defaultPrice;
-  }
-  public function setStart(Google_Service_AndroidPublisher_MonthDay $start)
-  {
-    $this->start = $start;
-  }
-  public function getStart()
-  {
-    return $this->start;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AndroidPublisher/Resource/Edits.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AndroidPublisher/Resource/Edits.php
deleted file mode 100644
index 717e239c..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AndroidPublisher/Resource/Edits.php
+++ /dev/null
@@ -1,107 +0,0 @@
-
- *   $androidpublisherService = new Google_Service_AndroidPublisher(...);
- *   $edits = $androidpublisherService->edits;
- *  
- */
-class Google_Service_AndroidPublisher_Resource_Edits extends Google_Service_Resource
-{
-  /**
-   * Commits/applies the changes made in this edit back to the app. (edits.commit)
-   *
-   * @param string $packageName Unique identifier for the Android app that is
-   * being updated; for example, "com.spiffygame".
-   * @param string $editId Unique identifier for this edit.
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_AndroidPublisher_AppEdit
-   */
-  public function commit($packageName, $editId, $optParams = array())
-  {
-    $params = array('packageName' => $packageName, 'editId' => $editId);
-    $params = array_merge($params, $optParams);
-    return $this->call('commit', array($params), "Google_Service_AndroidPublisher_AppEdit");
-  }
-  /**
-   * Deletes an edit for an app. Creating a new edit will automatically delete any
-   * of your previous edits so this method need only be called if you want to
-   * preemptively abandon an edit. (edits.delete)
-   *
-   * @param string $packageName Unique identifier for the Android app that is
-   * being updated; for example, "com.spiffygame".
-   * @param string $editId Unique identifier for this edit.
-   * @param array $optParams Optional parameters.
-   */
-  public function delete($packageName, $editId, $optParams = array())
-  {
-    $params = array('packageName' => $packageName, 'editId' => $editId);
-    $params = array_merge($params, $optParams);
-    return $this->call('delete', array($params));
-  }
-  /**
-   * Returns information about the edit specified. Calls will fail if the edit is
-   * no long active (e.g. has been deleted, superseded or expired). (edits.get)
-   *
-   * @param string $packageName Unique identifier for the Android app that is
-   * being updated; for example, "com.spiffygame".
-   * @param string $editId Unique identifier for this edit.
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_AndroidPublisher_AppEdit
-   */
-  public function get($packageName, $editId, $optParams = array())
-  {
-    $params = array('packageName' => $packageName, 'editId' => $editId);
-    $params = array_merge($params, $optParams);
-    return $this->call('get', array($params), "Google_Service_AndroidPublisher_AppEdit");
-  }
-  /**
-   * Creates a new edit for an app, populated with the app's current state.
-   * (edits.insert)
-   *
-   * @param string $packageName Unique identifier for the Android app that is
-   * being updated; for example, "com.spiffygame".
-   * @param Google_Service_AndroidPublisher_AppEdit $postBody
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_AndroidPublisher_AppEdit
-   */
-  public function insert($packageName, Google_Service_AndroidPublisher_AppEdit $postBody, $optParams = array())
-  {
-    $params = array('packageName' => $packageName, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('insert', array($params), "Google_Service_AndroidPublisher_AppEdit");
-  }
-  /**
-   * Checks that the edit can be successfully committed. The edit's changes are
-   * not applied to the live app. (edits.validate)
-   *
-   * @param string $packageName Unique identifier for the Android app that is
-   * being updated; for example, "com.spiffygame".
-   * @param string $editId Unique identifier for this edit.
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_AndroidPublisher_AppEdit
-   */
-  public function validate($packageName, $editId, $optParams = array())
-  {
-    $params = array('packageName' => $packageName, 'editId' => $editId);
-    $params = array_merge($params, $optParams);
-    return $this->call('validate', array($params), "Google_Service_AndroidPublisher_AppEdit");
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AndroidPublisher/Resource/EditsApklistings.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AndroidPublisher/Resource/EditsApklistings.php
deleted file mode 100644
index ede1af67..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AndroidPublisher/Resource/EditsApklistings.php
+++ /dev/null
@@ -1,148 +0,0 @@
-
- *   $androidpublisherService = new Google_Service_AndroidPublisher(...);
- *   $apklistings = $androidpublisherService->apklistings;
- *  
- */
-class Google_Service_AndroidPublisher_Resource_EditsApklistings extends Google_Service_Resource
-{
-  /**
-   * Deletes the APK-specific localized listing for a specified APK and language
-   * code. (apklistings.delete)
-   *
-   * @param string $packageName Unique identifier for the Android app that is
-   * being updated; for example, "com.spiffygame".
-   * @param string $editId Unique identifier for this edit.
-   * @param int $apkVersionCode The APK version code whose APK-specific listings
-   * should be read or modified.
-   * @param string $language The language code (a BCP-47 language tag) of the APK-
-   * specific localized listing to read or modify. For example, to select Austrian
-   * German, pass "de-AT".
-   * @param array $optParams Optional parameters.
-   */
-  public function delete($packageName, $editId, $apkVersionCode, $language, $optParams = array())
-  {
-    $params = array('packageName' => $packageName, 'editId' => $editId, 'apkVersionCode' => $apkVersionCode, 'language' => $language);
-    $params = array_merge($params, $optParams);
-    return $this->call('delete', array($params));
-  }
-  /**
-   * Deletes all the APK-specific localized listings for a specified APK.
-   * (apklistings.deleteall)
-   *
-   * @param string $packageName Unique identifier for the Android app that is
-   * being updated; for example, "com.spiffygame".
-   * @param string $editId Unique identifier for this edit.
-   * @param int $apkVersionCode The APK version code whose APK-specific listings
-   * should be read or modified.
-   * @param array $optParams Optional parameters.
-   */
-  public function deleteall($packageName, $editId, $apkVersionCode, $optParams = array())
-  {
-    $params = array('packageName' => $packageName, 'editId' => $editId, 'apkVersionCode' => $apkVersionCode);
-    $params = array_merge($params, $optParams);
-    return $this->call('deleteall', array($params));
-  }
-  /**
-   * Fetches the APK-specific localized listing for a specified APK and language
-   * code. (apklistings.get)
-   *
-   * @param string $packageName Unique identifier for the Android app that is
-   * being updated; for example, "com.spiffygame".
-   * @param string $editId Unique identifier for this edit.
-   * @param int $apkVersionCode The APK version code whose APK-specific listings
-   * should be read or modified.
-   * @param string $language The language code (a BCP-47 language tag) of the APK-
-   * specific localized listing to read or modify. For example, to select Austrian
-   * German, pass "de-AT".
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_AndroidPublisher_ApkListing
-   */
-  public function get($packageName, $editId, $apkVersionCode, $language, $optParams = array())
-  {
-    $params = array('packageName' => $packageName, 'editId' => $editId, 'apkVersionCode' => $apkVersionCode, 'language' => $language);
-    $params = array_merge($params, $optParams);
-    return $this->call('get', array($params), "Google_Service_AndroidPublisher_ApkListing");
-  }
-  /**
-   * Lists all the APK-specific localized listings for a specified APK.
-   * (apklistings.listEditsApklistings)
-   *
-   * @param string $packageName Unique identifier for the Android app that is
-   * being updated; for example, "com.spiffygame".
-   * @param string $editId Unique identifier for this edit.
-   * @param int $apkVersionCode The APK version code whose APK-specific listings
-   * should be read or modified.
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_AndroidPublisher_ApkListingsListResponse
-   */
-  public function listEditsApklistings($packageName, $editId, $apkVersionCode, $optParams = array())
-  {
-    $params = array('packageName' => $packageName, 'editId' => $editId, 'apkVersionCode' => $apkVersionCode);
-    $params = array_merge($params, $optParams);
-    return $this->call('list', array($params), "Google_Service_AndroidPublisher_ApkListingsListResponse");
-  }
-  /**
-   * Updates or creates the APK-specific localized listing for a specified APK and
-   * language code. This method supports patch semantics. (apklistings.patch)
-   *
-   * @param string $packageName Unique identifier for the Android app that is
-   * being updated; for example, "com.spiffygame".
-   * @param string $editId Unique identifier for this edit.
-   * @param int $apkVersionCode The APK version code whose APK-specific listings
-   * should be read or modified.
-   * @param string $language The language code (a BCP-47 language tag) of the APK-
-   * specific localized listing to read or modify. For example, to select Austrian
-   * German, pass "de-AT".
-   * @param Google_Service_AndroidPublisher_ApkListing $postBody
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_AndroidPublisher_ApkListing
-   */
-  public function patch($packageName, $editId, $apkVersionCode, $language, Google_Service_AndroidPublisher_ApkListing $postBody, $optParams = array())
-  {
-    $params = array('packageName' => $packageName, 'editId' => $editId, 'apkVersionCode' => $apkVersionCode, 'language' => $language, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('patch', array($params), "Google_Service_AndroidPublisher_ApkListing");
-  }
-  /**
-   * Updates or creates the APK-specific localized listing for a specified APK and
-   * language code. (apklistings.update)
-   *
-   * @param string $packageName Unique identifier for the Android app that is
-   * being updated; for example, "com.spiffygame".
-   * @param string $editId Unique identifier for this edit.
-   * @param int $apkVersionCode The APK version code whose APK-specific listings
-   * should be read or modified.
-   * @param string $language The language code (a BCP-47 language tag) of the APK-
-   * specific localized listing to read or modify. For example, to select Austrian
-   * German, pass "de-AT".
-   * @param Google_Service_AndroidPublisher_ApkListing $postBody
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_AndroidPublisher_ApkListing
-   */
-  public function update($packageName, $editId, $apkVersionCode, $language, Google_Service_AndroidPublisher_ApkListing $postBody, $optParams = array())
-  {
-    $params = array('packageName' => $packageName, 'editId' => $editId, 'apkVersionCode' => $apkVersionCode, 'language' => $language, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('update', array($params), "Google_Service_AndroidPublisher_ApkListing");
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AndroidPublisher/Resource/EditsApks.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AndroidPublisher/Resource/EditsApks.php
deleted file mode 100644
index a26caa6b..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AndroidPublisher/Resource/EditsApks.php
+++ /dev/null
@@ -1,77 +0,0 @@
-
- *   $androidpublisherService = new Google_Service_AndroidPublisher(...);
- *   $apks = $androidpublisherService->apks;
- *  
- */
-class Google_Service_AndroidPublisher_Resource_EditsApks extends Google_Service_Resource
-{
-  /**
-   * Creates a new APK without uploading the APK itself to Google Play, instead
-   * hosting the APK at a specified URL. This function is only available to
-   * enterprises using Google Play for Work whose application is configured to
-   * restrict distribution to the enterprise domain. (apks.addexternallyhosted)
-   *
-   * @param string $packageName Unique identifier for the Android app that is
-   * being updated; for example, "com.spiffygame".
-   * @param string $editId Unique identifier for this edit.
-   * @param Google_Service_AndroidPublisher_ApksAddExternallyHostedRequest $postBody
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_AndroidPublisher_ApksAddExternallyHostedResponse
-   */
-  public function addexternallyhosted($packageName, $editId, Google_Service_AndroidPublisher_ApksAddExternallyHostedRequest $postBody, $optParams = array())
-  {
-    $params = array('packageName' => $packageName, 'editId' => $editId, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('addexternallyhosted', array($params), "Google_Service_AndroidPublisher_ApksAddExternallyHostedResponse");
-  }
-  /**
-   * (apks.listEditsApks)
-   *
-   * @param string $packageName Unique identifier for the Android app that is
-   * being updated; for example, "com.spiffygame".
-   * @param string $editId Unique identifier for this edit.
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_AndroidPublisher_ApksListResponse
-   */
-  public function listEditsApks($packageName, $editId, $optParams = array())
-  {
-    $params = array('packageName' => $packageName, 'editId' => $editId);
-    $params = array_merge($params, $optParams);
-    return $this->call('list', array($params), "Google_Service_AndroidPublisher_ApksListResponse");
-  }
-  /**
-   * (apks.upload)
-   *
-   * @param string $packageName Unique identifier for the Android app that is
-   * being updated; for example, "com.spiffygame".
-   * @param string $editId Unique identifier for this edit.
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_AndroidPublisher_Apk
-   */
-  public function upload($packageName, $editId, $optParams = array())
-  {
-    $params = array('packageName' => $packageName, 'editId' => $editId);
-    $params = array_merge($params, $optParams);
-    return $this->call('upload', array($params), "Google_Service_AndroidPublisher_Apk");
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AndroidPublisher/Resource/EditsDeobfuscationfiles.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AndroidPublisher/Resource/EditsDeobfuscationfiles.php
deleted file mode 100644
index b8b46996..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AndroidPublisher/Resource/EditsDeobfuscationfiles.php
+++ /dev/null
@@ -1,47 +0,0 @@
-
- *   $androidpublisherService = new Google_Service_AndroidPublisher(...);
- *   $deobfuscationfiles = $androidpublisherService->deobfuscationfiles;
- *  
- */
-class Google_Service_AndroidPublisher_Resource_EditsDeobfuscationfiles extends Google_Service_Resource
-{
-  /**
-   * Uploads the deobfuscation file of the specified APK. If a deobfuscation file
-   * already exists, it will be replaced. (deobfuscationfiles.upload)
-   *
-   * @param string $packageName Unique identifier of the Android app for which the
-   * deobfuscatiuon files are being uploaded; for example, "com.spiffygame".
-   * @param string $editId Unique identifier for this edit.
-   * @param int $apkVersionCode The version code of the APK whose deobfuscation
-   * file is being uploaded.
-   * @param string $deobfuscationFileType
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_AndroidPublisher_DeobfuscationFilesUploadResponse
-   */
-  public function upload($packageName, $editId, $apkVersionCode, $deobfuscationFileType, $optParams = array())
-  {
-    $params = array('packageName' => $packageName, 'editId' => $editId, 'apkVersionCode' => $apkVersionCode, 'deobfuscationFileType' => $deobfuscationFileType);
-    $params = array_merge($params, $optParams);
-    return $this->call('upload', array($params), "Google_Service_AndroidPublisher_DeobfuscationFilesUploadResponse");
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AndroidPublisher/Resource/EditsDetails.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AndroidPublisher/Resource/EditsDetails.php
deleted file mode 100644
index 2c0e2385..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AndroidPublisher/Resource/EditsDetails.php
+++ /dev/null
@@ -1,77 +0,0 @@
-
- *   $androidpublisherService = new Google_Service_AndroidPublisher(...);
- *   $details = $androidpublisherService->details;
- *  
- */
-class Google_Service_AndroidPublisher_Resource_EditsDetails extends Google_Service_Resource
-{
-  /**
-   * Fetches app details for this edit. This includes the default language and
-   * developer support contact information. (details.get)
-   *
-   * @param string $packageName Unique identifier for the Android app that is
-   * being updated; for example, "com.spiffygame".
-   * @param string $editId Unique identifier for this edit.
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_AndroidPublisher_AppDetails
-   */
-  public function get($packageName, $editId, $optParams = array())
-  {
-    $params = array('packageName' => $packageName, 'editId' => $editId);
-    $params = array_merge($params, $optParams);
-    return $this->call('get', array($params), "Google_Service_AndroidPublisher_AppDetails");
-  }
-  /**
-   * Updates app details for this edit. This method supports patch semantics.
-   * (details.patch)
-   *
-   * @param string $packageName Unique identifier for the Android app that is
-   * being updated; for example, "com.spiffygame".
-   * @param string $editId Unique identifier for this edit.
-   * @param Google_Service_AndroidPublisher_AppDetails $postBody
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_AndroidPublisher_AppDetails
-   */
-  public function patch($packageName, $editId, Google_Service_AndroidPublisher_AppDetails $postBody, $optParams = array())
-  {
-    $params = array('packageName' => $packageName, 'editId' => $editId, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('patch', array($params), "Google_Service_AndroidPublisher_AppDetails");
-  }
-  /**
-   * Updates app details for this edit. (details.update)
-   *
-   * @param string $packageName Unique identifier for the Android app that is
-   * being updated; for example, "com.spiffygame".
-   * @param string $editId Unique identifier for this edit.
-   * @param Google_Service_AndroidPublisher_AppDetails $postBody
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_AndroidPublisher_AppDetails
-   */
-  public function update($packageName, $editId, Google_Service_AndroidPublisher_AppDetails $postBody, $optParams = array())
-  {
-    $params = array('packageName' => $packageName, 'editId' => $editId, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('update', array($params), "Google_Service_AndroidPublisher_AppDetails");
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AndroidPublisher/Resource/EditsExpansionfiles.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AndroidPublisher/Resource/EditsExpansionfiles.php
deleted file mode 100644
index 62e23a01..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AndroidPublisher/Resource/EditsExpansionfiles.php
+++ /dev/null
@@ -1,108 +0,0 @@
-
- *   $androidpublisherService = new Google_Service_AndroidPublisher(...);
- *   $expansionfiles = $androidpublisherService->expansionfiles;
- *  
- */
-class Google_Service_AndroidPublisher_Resource_EditsExpansionfiles extends Google_Service_Resource
-{
-  /**
-   * Fetches the Expansion File configuration for the APK specified.
-   * (expansionfiles.get)
-   *
-   * @param string $packageName Unique identifier for the Android app that is
-   * being updated; for example, "com.spiffygame".
-   * @param string $editId Unique identifier for this edit.
-   * @param int $apkVersionCode The version code of the APK whose Expansion File
-   * configuration is being read or modified.
-   * @param string $expansionFileType
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_AndroidPublisher_ExpansionFile
-   */
-  public function get($packageName, $editId, $apkVersionCode, $expansionFileType, $optParams = array())
-  {
-    $params = array('packageName' => $packageName, 'editId' => $editId, 'apkVersionCode' => $apkVersionCode, 'expansionFileType' => $expansionFileType);
-    $params = array_merge($params, $optParams);
-    return $this->call('get', array($params), "Google_Service_AndroidPublisher_ExpansionFile");
-  }
-  /**
-   * Updates the APK's Expansion File configuration to reference another APK's
-   * Expansion Files. To add a new Expansion File use the Upload method. This
-   * method supports patch semantics. (expansionfiles.patch)
-   *
-   * @param string $packageName Unique identifier for the Android app that is
-   * being updated; for example, "com.spiffygame".
-   * @param string $editId Unique identifier for this edit.
-   * @param int $apkVersionCode The version code of the APK whose Expansion File
-   * configuration is being read or modified.
-   * @param string $expansionFileType
-   * @param Google_Service_AndroidPublisher_ExpansionFile $postBody
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_AndroidPublisher_ExpansionFile
-   */
-  public function patch($packageName, $editId, $apkVersionCode, $expansionFileType, Google_Service_AndroidPublisher_ExpansionFile $postBody, $optParams = array())
-  {
-    $params = array('packageName' => $packageName, 'editId' => $editId, 'apkVersionCode' => $apkVersionCode, 'expansionFileType' => $expansionFileType, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('patch', array($params), "Google_Service_AndroidPublisher_ExpansionFile");
-  }
-  /**
-   * Updates the APK's Expansion File configuration to reference another APK's
-   * Expansion Files. To add a new Expansion File use the Upload method.
-   * (expansionfiles.update)
-   *
-   * @param string $packageName Unique identifier for the Android app that is
-   * being updated; for example, "com.spiffygame".
-   * @param string $editId Unique identifier for this edit.
-   * @param int $apkVersionCode The version code of the APK whose Expansion File
-   * configuration is being read or modified.
-   * @param string $expansionFileType
-   * @param Google_Service_AndroidPublisher_ExpansionFile $postBody
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_AndroidPublisher_ExpansionFile
-   */
-  public function update($packageName, $editId, $apkVersionCode, $expansionFileType, Google_Service_AndroidPublisher_ExpansionFile $postBody, $optParams = array())
-  {
-    $params = array('packageName' => $packageName, 'editId' => $editId, 'apkVersionCode' => $apkVersionCode, 'expansionFileType' => $expansionFileType, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('update', array($params), "Google_Service_AndroidPublisher_ExpansionFile");
-  }
-  /**
-   * Uploads and attaches a new Expansion File to the APK specified.
-   * (expansionfiles.upload)
-   *
-   * @param string $packageName Unique identifier for the Android app that is
-   * being updated; for example, "com.spiffygame".
-   * @param string $editId Unique identifier for this edit.
-   * @param int $apkVersionCode The version code of the APK whose Expansion File
-   * configuration is being read or modified.
-   * @param string $expansionFileType
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_AndroidPublisher_ExpansionFilesUploadResponse
-   */
-  public function upload($packageName, $editId, $apkVersionCode, $expansionFileType, $optParams = array())
-  {
-    $params = array('packageName' => $packageName, 'editId' => $editId, 'apkVersionCode' => $apkVersionCode, 'expansionFileType' => $expansionFileType);
-    $params = array_merge($params, $optParams);
-    return $this->call('upload', array($params), "Google_Service_AndroidPublisher_ExpansionFilesUploadResponse");
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AndroidPublisher/Resource/EditsImages.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AndroidPublisher/Resource/EditsImages.php
deleted file mode 100644
index 769e6984..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AndroidPublisher/Resource/EditsImages.php
+++ /dev/null
@@ -1,108 +0,0 @@
-
- *   $androidpublisherService = new Google_Service_AndroidPublisher(...);
- *   $images = $androidpublisherService->images;
- *  
- */
-class Google_Service_AndroidPublisher_Resource_EditsImages extends Google_Service_Resource
-{
-  /**
-   * Deletes the image (specified by id) from the edit. (images.delete)
-   *
-   * @param string $packageName Unique identifier for the Android app that is
-   * being updated; for example, "com.spiffygame".
-   * @param string $editId Unique identifier for this edit.
-   * @param string $language The language code (a BCP-47 language tag) of the
-   * localized listing whose images are to read or modified. For example, to
-   * select Austrian German, pass "de-AT".
-   * @param string $imageType
-   * @param string $imageId Unique identifier an image within the set of images
-   * attached to this edit.
-   * @param array $optParams Optional parameters.
-   */
-  public function delete($packageName, $editId, $language, $imageType, $imageId, $optParams = array())
-  {
-    $params = array('packageName' => $packageName, 'editId' => $editId, 'language' => $language, 'imageType' => $imageType, 'imageId' => $imageId);
-    $params = array_merge($params, $optParams);
-    return $this->call('delete', array($params));
-  }
-  /**
-   * Deletes all images for the specified language and image type.
-   * (images.deleteall)
-   *
-   * @param string $packageName Unique identifier for the Android app that is
-   * being updated; for example, "com.spiffygame".
-   * @param string $editId Unique identifier for this edit.
-   * @param string $language The language code (a BCP-47 language tag) of the
-   * localized listing whose images are to read or modified. For example, to
-   * select Austrian German, pass "de-AT".
-   * @param string $imageType
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_AndroidPublisher_ImagesDeleteAllResponse
-   */
-  public function deleteall($packageName, $editId, $language, $imageType, $optParams = array())
-  {
-    $params = array('packageName' => $packageName, 'editId' => $editId, 'language' => $language, 'imageType' => $imageType);
-    $params = array_merge($params, $optParams);
-    return $this->call('deleteall', array($params), "Google_Service_AndroidPublisher_ImagesDeleteAllResponse");
-  }
-  /**
-   * Lists all images for the specified language and image type.
-   * (images.listEditsImages)
-   *
-   * @param string $packageName Unique identifier for the Android app that is
-   * being updated; for example, "com.spiffygame".
-   * @param string $editId Unique identifier for this edit.
-   * @param string $language The language code (a BCP-47 language tag) of the
-   * localized listing whose images are to read or modified. For example, to
-   * select Austrian German, pass "de-AT".
-   * @param string $imageType
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_AndroidPublisher_ImagesListResponse
-   */
-  public function listEditsImages($packageName, $editId, $language, $imageType, $optParams = array())
-  {
-    $params = array('packageName' => $packageName, 'editId' => $editId, 'language' => $language, 'imageType' => $imageType);
-    $params = array_merge($params, $optParams);
-    return $this->call('list', array($params), "Google_Service_AndroidPublisher_ImagesListResponse");
-  }
-  /**
-   * Uploads a new image and adds it to the list of images for the specified
-   * language and image type. (images.upload)
-   *
-   * @param string $packageName Unique identifier for the Android app that is
-   * being updated; for example, "com.spiffygame".
-   * @param string $editId Unique identifier for this edit.
-   * @param string $language The language code (a BCP-47 language tag) of the
-   * localized listing whose images are to read or modified. For example, to
-   * select Austrian German, pass "de-AT".
-   * @param string $imageType
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_AndroidPublisher_ImagesUploadResponse
-   */
-  public function upload($packageName, $editId, $language, $imageType, $optParams = array())
-  {
-    $params = array('packageName' => $packageName, 'editId' => $editId, 'language' => $language, 'imageType' => $imageType);
-    $params = array_merge($params, $optParams);
-    return $this->call('upload', array($params), "Google_Service_AndroidPublisher_ImagesUploadResponse");
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AndroidPublisher/Resource/EditsListings.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AndroidPublisher/Resource/EditsListings.php
deleted file mode 100644
index 4cda2f67..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AndroidPublisher/Resource/EditsListings.php
+++ /dev/null
@@ -1,132 +0,0 @@
-
- *   $androidpublisherService = new Google_Service_AndroidPublisher(...);
- *   $listings = $androidpublisherService->listings;
- *  
- */
-class Google_Service_AndroidPublisher_Resource_EditsListings extends Google_Service_Resource
-{
-  /**
-   * Deletes the specified localized store listing from an edit. (listings.delete)
-   *
-   * @param string $packageName Unique identifier for the Android app that is
-   * being updated; for example, "com.spiffygame".
-   * @param string $editId Unique identifier for this edit.
-   * @param string $language The language code (a BCP-47 language tag) of the
-   * localized listing to read or modify. For example, to select Austrian German,
-   * pass "de-AT".
-   * @param array $optParams Optional parameters.
-   */
-  public function delete($packageName, $editId, $language, $optParams = array())
-  {
-    $params = array('packageName' => $packageName, 'editId' => $editId, 'language' => $language);
-    $params = array_merge($params, $optParams);
-    return $this->call('delete', array($params));
-  }
-  /**
-   * Deletes all localized listings from an edit. (listings.deleteall)
-   *
-   * @param string $packageName Unique identifier for the Android app that is
-   * being updated; for example, "com.spiffygame".
-   * @param string $editId Unique identifier for this edit.
-   * @param array $optParams Optional parameters.
-   */
-  public function deleteall($packageName, $editId, $optParams = array())
-  {
-    $params = array('packageName' => $packageName, 'editId' => $editId);
-    $params = array_merge($params, $optParams);
-    return $this->call('deleteall', array($params));
-  }
-  /**
-   * Fetches information about a localized store listing. (listings.get)
-   *
-   * @param string $packageName Unique identifier for the Android app that is
-   * being updated; for example, "com.spiffygame".
-   * @param string $editId Unique identifier for this edit.
-   * @param string $language The language code (a BCP-47 language tag) of the
-   * localized listing to read or modify. For example, to select Austrian German,
-   * pass "de-AT".
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_AndroidPublisher_Listing
-   */
-  public function get($packageName, $editId, $language, $optParams = array())
-  {
-    $params = array('packageName' => $packageName, 'editId' => $editId, 'language' => $language);
-    $params = array_merge($params, $optParams);
-    return $this->call('get', array($params), "Google_Service_AndroidPublisher_Listing");
-  }
-  /**
-   * Returns all of the localized store listings attached to this edit.
-   * (listings.listEditsListings)
-   *
-   * @param string $packageName Unique identifier for the Android app that is
-   * being updated; for example, "com.spiffygame".
-   * @param string $editId Unique identifier for this edit.
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_AndroidPublisher_ListingsListResponse
-   */
-  public function listEditsListings($packageName, $editId, $optParams = array())
-  {
-    $params = array('packageName' => $packageName, 'editId' => $editId);
-    $params = array_merge($params, $optParams);
-    return $this->call('list', array($params), "Google_Service_AndroidPublisher_ListingsListResponse");
-  }
-  /**
-   * Creates or updates a localized store listing. This method supports patch
-   * semantics. (listings.patch)
-   *
-   * @param string $packageName Unique identifier for the Android app that is
-   * being updated; for example, "com.spiffygame".
-   * @param string $editId Unique identifier for this edit.
-   * @param string $language The language code (a BCP-47 language tag) of the
-   * localized listing to read or modify. For example, to select Austrian German,
-   * pass "de-AT".
-   * @param Google_Service_AndroidPublisher_Listing $postBody
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_AndroidPublisher_Listing
-   */
-  public function patch($packageName, $editId, $language, Google_Service_AndroidPublisher_Listing $postBody, $optParams = array())
-  {
-    $params = array('packageName' => $packageName, 'editId' => $editId, 'language' => $language, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('patch', array($params), "Google_Service_AndroidPublisher_Listing");
-  }
-  /**
-   * Creates or updates a localized store listing. (listings.update)
-   *
-   * @param string $packageName Unique identifier for the Android app that is
-   * being updated; for example, "com.spiffygame".
-   * @param string $editId Unique identifier for this edit.
-   * @param string $language The language code (a BCP-47 language tag) of the
-   * localized listing to read or modify. For example, to select Austrian German,
-   * pass "de-AT".
-   * @param Google_Service_AndroidPublisher_Listing $postBody
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_AndroidPublisher_Listing
-   */
-  public function update($packageName, $editId, $language, Google_Service_AndroidPublisher_Listing $postBody, $optParams = array())
-  {
-    $params = array('packageName' => $packageName, 'editId' => $editId, 'language' => $language, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('update', array($params), "Google_Service_AndroidPublisher_Listing");
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AndroidPublisher/Resource/EditsTesters.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AndroidPublisher/Resource/EditsTesters.php
deleted file mode 100644
index 66a3a1a0..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AndroidPublisher/Resource/EditsTesters.php
+++ /dev/null
@@ -1,78 +0,0 @@
-
- *   $androidpublisherService = new Google_Service_AndroidPublisher(...);
- *   $testers = $androidpublisherService->testers;
- *  
- */
-class Google_Service_AndroidPublisher_Resource_EditsTesters extends Google_Service_Resource
-{
-  /**
-   * (testers.get)
-   *
-   * @param string $packageName Unique identifier for the Android app that is
-   * being updated; for example, "com.spiffygame".
-   * @param string $editId Unique identifier for this edit.
-   * @param string $track
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_AndroidPublisher_Testers
-   */
-  public function get($packageName, $editId, $track, $optParams = array())
-  {
-    $params = array('packageName' => $packageName, 'editId' => $editId, 'track' => $track);
-    $params = array_merge($params, $optParams);
-    return $this->call('get', array($params), "Google_Service_AndroidPublisher_Testers");
-  }
-  /**
-   * (testers.patch)
-   *
-   * @param string $packageName Unique identifier for the Android app that is
-   * being updated; for example, "com.spiffygame".
-   * @param string $editId Unique identifier for this edit.
-   * @param string $track
-   * @param Google_Service_AndroidPublisher_Testers $postBody
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_AndroidPublisher_Testers
-   */
-  public function patch($packageName, $editId, $track, Google_Service_AndroidPublisher_Testers $postBody, $optParams = array())
-  {
-    $params = array('packageName' => $packageName, 'editId' => $editId, 'track' => $track, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('patch', array($params), "Google_Service_AndroidPublisher_Testers");
-  }
-  /**
-   * (testers.update)
-   *
-   * @param string $packageName Unique identifier for the Android app that is
-   * being updated; for example, "com.spiffygame".
-   * @param string $editId Unique identifier for this edit.
-   * @param string $track
-   * @param Google_Service_AndroidPublisher_Testers $postBody
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_AndroidPublisher_Testers
-   */
-  public function update($packageName, $editId, $track, Google_Service_AndroidPublisher_Testers $postBody, $optParams = array())
-  {
-    $params = array('packageName' => $packageName, 'editId' => $editId, 'track' => $track, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('update', array($params), "Google_Service_AndroidPublisher_Testers");
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AndroidPublisher/Resource/EditsTracks.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AndroidPublisher/Resource/EditsTracks.php
deleted file mode 100644
index be15dfea..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AndroidPublisher/Resource/EditsTracks.php
+++ /dev/null
@@ -1,99 +0,0 @@
-
- *   $androidpublisherService = new Google_Service_AndroidPublisher(...);
- *   $tracks = $androidpublisherService->tracks;
- *  
- */
-class Google_Service_AndroidPublisher_Resource_EditsTracks extends Google_Service_Resource
-{
-  /**
-   * Fetches the track configuration for the specified track type. Includes the
-   * APK version codes that are in this track. (tracks.get)
-   *
-   * @param string $packageName Unique identifier for the Android app that is
-   * being updated; for example, "com.spiffygame".
-   * @param string $editId Unique identifier for this edit.
-   * @param string $track The track type to read or modify.
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_AndroidPublisher_Track
-   */
-  public function get($packageName, $editId, $track, $optParams = array())
-  {
-    $params = array('packageName' => $packageName, 'editId' => $editId, 'track' => $track);
-    $params = array_merge($params, $optParams);
-    return $this->call('get', array($params), "Google_Service_AndroidPublisher_Track");
-  }
-  /**
-   * Lists all the track configurations for this edit. (tracks.listEditsTracks)
-   *
-   * @param string $packageName Unique identifier for the Android app that is
-   * being updated; for example, "com.spiffygame".
-   * @param string $editId Unique identifier for this edit.
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_AndroidPublisher_TracksListResponse
-   */
-  public function listEditsTracks($packageName, $editId, $optParams = array())
-  {
-    $params = array('packageName' => $packageName, 'editId' => $editId);
-    $params = array_merge($params, $optParams);
-    return $this->call('list', array($params), "Google_Service_AndroidPublisher_TracksListResponse");
-  }
-  /**
-   * Updates the track configuration for the specified track type. When halted,
-   * the rollout track cannot be updated without adding new APKs, and adding new
-   * APKs will cause it to resume. This method supports patch semantics.
-   * (tracks.patch)
-   *
-   * @param string $packageName Unique identifier for the Android app that is
-   * being updated; for example, "com.spiffygame".
-   * @param string $editId Unique identifier for this edit.
-   * @param string $track The track type to read or modify.
-   * @param Google_Service_AndroidPublisher_Track $postBody
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_AndroidPublisher_Track
-   */
-  public function patch($packageName, $editId, $track, Google_Service_AndroidPublisher_Track $postBody, $optParams = array())
-  {
-    $params = array('packageName' => $packageName, 'editId' => $editId, 'track' => $track, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('patch', array($params), "Google_Service_AndroidPublisher_Track");
-  }
-  /**
-   * Updates the track configuration for the specified track type. When halted,
-   * the rollout track cannot be updated without adding new APKs, and adding new
-   * APKs will cause it to resume. (tracks.update)
-   *
-   * @param string $packageName Unique identifier for the Android app that is
-   * being updated; for example, "com.spiffygame".
-   * @param string $editId Unique identifier for this edit.
-   * @param string $track The track type to read or modify.
-   * @param Google_Service_AndroidPublisher_Track $postBody
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_AndroidPublisher_Track
-   */
-  public function update($packageName, $editId, $track, Google_Service_AndroidPublisher_Track $postBody, $optParams = array())
-  {
-    $params = array('packageName' => $packageName, 'editId' => $editId, 'track' => $track, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('update', array($params), "Google_Service_AndroidPublisher_Track");
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AndroidPublisher/Resource/Entitlements.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AndroidPublisher/Resource/Entitlements.php
deleted file mode 100644
index 690e7c39..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AndroidPublisher/Resource/Entitlements.php
+++ /dev/null
@@ -1,49 +0,0 @@
-
- *   $androidpublisherService = new Google_Service_AndroidPublisher(...);
- *   $entitlements = $androidpublisherService->entitlements;
- *  
- */
-class Google_Service_AndroidPublisher_Resource_Entitlements extends Google_Service_Resource
-{
-  /**
-   * Lists the user's current inapp item or subscription entitlements
-   * (entitlements.listEntitlements)
-   *
-   * @param string $packageName The package name of the application the inapp
-   * product was sold in (for example, 'com.some.thing').
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param string maxResults
-   * @opt_param string productId The product id of the inapp product (for example,
-   * 'sku1'). This can be used to restrict the result set.
-   * @opt_param string startIndex
-   * @opt_param string token
-   * @return Google_Service_AndroidPublisher_EntitlementsListResponse
-   */
-  public function listEntitlements($packageName, $optParams = array())
-  {
-    $params = array('packageName' => $packageName);
-    $params = array_merge($params, $optParams);
-    return $this->call('list', array($params), "Google_Service_AndroidPublisher_EntitlementsListResponse");
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AndroidPublisher/Resource/Inappproducts.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AndroidPublisher/Resource/Inappproducts.php
deleted file mode 100644
index ec0c356e..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AndroidPublisher/Resource/Inappproducts.php
+++ /dev/null
@@ -1,151 +0,0 @@
-
- *   $androidpublisherService = new Google_Service_AndroidPublisher(...);
- *   $inappproducts = $androidpublisherService->inappproducts;
- *  
- */
-class Google_Service_AndroidPublisher_Resource_Inappproducts extends Google_Service_Resource
-{
-  /**
-   * (inappproducts.batch)
-   *
-   * @param Google_Service_AndroidPublisher_InappproductsBatchRequest $postBody
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_AndroidPublisher_InappproductsBatchResponse
-   */
-  public function batch(Google_Service_AndroidPublisher_InappproductsBatchRequest $postBody, $optParams = array())
-  {
-    $params = array('postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('batch', array($params), "Google_Service_AndroidPublisher_InappproductsBatchResponse");
-  }
-  /**
-   * Delete an in-app product for an app. (inappproducts.delete)
-   *
-   * @param string $packageName Unique identifier for the Android app with the in-
-   * app product; for example, "com.spiffygame".
-   * @param string $sku Unique identifier for the in-app product.
-   * @param array $optParams Optional parameters.
-   */
-  public function delete($packageName, $sku, $optParams = array())
-  {
-    $params = array('packageName' => $packageName, 'sku' => $sku);
-    $params = array_merge($params, $optParams);
-    return $this->call('delete', array($params));
-  }
-  /**
-   * Returns information about the in-app product specified. (inappproducts.get)
-   *
-   * @param string $packageName
-   * @param string $sku Unique identifier for the in-app product.
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_AndroidPublisher_InAppProduct
-   */
-  public function get($packageName, $sku, $optParams = array())
-  {
-    $params = array('packageName' => $packageName, 'sku' => $sku);
-    $params = array_merge($params, $optParams);
-    return $this->call('get', array($params), "Google_Service_AndroidPublisher_InAppProduct");
-  }
-  /**
-   * Creates a new in-app product for an app. (inappproducts.insert)
-   *
-   * @param string $packageName Unique identifier for the Android app; for
-   * example, "com.spiffygame".
-   * @param Google_Service_AndroidPublisher_InAppProduct $postBody
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param bool autoConvertMissingPrices If true the prices for all regions
-   * targeted by the parent app that don't have a price specified for this in-app
-   * product will be auto converted to the target currency based on the default
-   * price. Defaults to false.
-   * @return Google_Service_AndroidPublisher_InAppProduct
-   */
-  public function insert($packageName, Google_Service_AndroidPublisher_InAppProduct $postBody, $optParams = array())
-  {
-    $params = array('packageName' => $packageName, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('insert', array($params), "Google_Service_AndroidPublisher_InAppProduct");
-  }
-  /**
-   * List all the in-app products for an Android app, both subscriptions and
-   * managed in-app products.. (inappproducts.listInappproducts)
-   *
-   * @param string $packageName Unique identifier for the Android app with in-app
-   * products; for example, "com.spiffygame".
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param string maxResults
-   * @opt_param string startIndex
-   * @opt_param string token
-   * @return Google_Service_AndroidPublisher_InappproductsListResponse
-   */
-  public function listInappproducts($packageName, $optParams = array())
-  {
-    $params = array('packageName' => $packageName);
-    $params = array_merge($params, $optParams);
-    return $this->call('list', array($params), "Google_Service_AndroidPublisher_InappproductsListResponse");
-  }
-  /**
-   * Updates the details of an in-app product. This method supports patch
-   * semantics. (inappproducts.patch)
-   *
-   * @param string $packageName Unique identifier for the Android app with the in-
-   * app product; for example, "com.spiffygame".
-   * @param string $sku Unique identifier for the in-app product.
-   * @param Google_Service_AndroidPublisher_InAppProduct $postBody
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param bool autoConvertMissingPrices If true the prices for all regions
-   * targeted by the parent app that don't have a price specified for this in-app
-   * product will be auto converted to the target currency based on the default
-   * price. Defaults to false.
-   * @return Google_Service_AndroidPublisher_InAppProduct
-   */
-  public function patch($packageName, $sku, Google_Service_AndroidPublisher_InAppProduct $postBody, $optParams = array())
-  {
-    $params = array('packageName' => $packageName, 'sku' => $sku, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('patch', array($params), "Google_Service_AndroidPublisher_InAppProduct");
-  }
-  /**
-   * Updates the details of an in-app product. (inappproducts.update)
-   *
-   * @param string $packageName Unique identifier for the Android app with the in-
-   * app product; for example, "com.spiffygame".
-   * @param string $sku Unique identifier for the in-app product.
-   * @param Google_Service_AndroidPublisher_InAppProduct $postBody
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param bool autoConvertMissingPrices If true the prices for all regions
-   * targeted by the parent app that don't have a price specified for this in-app
-   * product will be auto converted to the target currency based on the default
-   * price. Defaults to false.
-   * @return Google_Service_AndroidPublisher_InAppProduct
-   */
-  public function update($packageName, $sku, Google_Service_AndroidPublisher_InAppProduct $postBody, $optParams = array())
-  {
-    $params = array('packageName' => $packageName, 'sku' => $sku, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('update', array($params), "Google_Service_AndroidPublisher_InAppProduct");
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AndroidPublisher/Resource/Purchases.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AndroidPublisher/Resource/Purchases.php
deleted file mode 100644
index 65eee4b8..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AndroidPublisher/Resource/Purchases.php
+++ /dev/null
@@ -1,28 +0,0 @@
-
- *   $androidpublisherService = new Google_Service_AndroidPublisher(...);
- *   $purchases = $androidpublisherService->purchases;
- *  
- */
-class Google_Service_AndroidPublisher_Resource_Purchases extends Google_Service_Resource
-{
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AndroidPublisher/Resource/PurchasesProducts.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AndroidPublisher/Resource/PurchasesProducts.php
deleted file mode 100644
index 6dd82da9..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AndroidPublisher/Resource/PurchasesProducts.php
+++ /dev/null
@@ -1,46 +0,0 @@
-
- *   $androidpublisherService = new Google_Service_AndroidPublisher(...);
- *   $products = $androidpublisherService->products;
- *  
- */
-class Google_Service_AndroidPublisher_Resource_PurchasesProducts extends Google_Service_Resource
-{
-  /**
-   * Checks the purchase and consumption status of an inapp item. (products.get)
-   *
-   * @param string $packageName The package name of the application the inapp
-   * product was sold in (for example, 'com.some.thing').
-   * @param string $productId The inapp product SKU (for example,
-   * 'com.some.thing.inapp1').
-   * @param string $token The token provided to the user's device when the inapp
-   * product was purchased.
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_AndroidPublisher_ProductPurchase
-   */
-  public function get($packageName, $productId, $token, $optParams = array())
-  {
-    $params = array('packageName' => $packageName, 'productId' => $productId, 'token' => $token);
-    $params = array_merge($params, $optParams);
-    return $this->call('get', array($params), "Google_Service_AndroidPublisher_ProductPurchase");
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AndroidPublisher/Resource/PurchasesSubscriptions.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AndroidPublisher/Resource/PurchasesSubscriptions.php
deleted file mode 100644
index e128594a..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AndroidPublisher/Resource/PurchasesSubscriptions.php
+++ /dev/null
@@ -1,123 +0,0 @@
-
- *   $androidpublisherService = new Google_Service_AndroidPublisher(...);
- *   $subscriptions = $androidpublisherService->subscriptions;
- *  
- */
-class Google_Service_AndroidPublisher_Resource_PurchasesSubscriptions extends Google_Service_Resource
-{
-  /**
-   * Cancels a user's subscription purchase. The subscription remains valid until
-   * its expiration time. (subscriptions.cancel)
-   *
-   * @param string $packageName The package name of the application for which this
-   * subscription was purchased (for example, 'com.some.thing').
-   * @param string $subscriptionId The purchased subscription ID (for example,
-   * 'monthly001').
-   * @param string $token The token provided to the user's device when the
-   * subscription was purchased.
-   * @param array $optParams Optional parameters.
-   */
-  public function cancel($packageName, $subscriptionId, $token, $optParams = array())
-  {
-    $params = array('packageName' => $packageName, 'subscriptionId' => $subscriptionId, 'token' => $token);
-    $params = array_merge($params, $optParams);
-    return $this->call('cancel', array($params));
-  }
-  /**
-   * Defers a user's subscription purchase until a specified future expiration
-   * time. (subscriptions.defer)
-   *
-   * @param string $packageName The package name of the application for which this
-   * subscription was purchased (for example, 'com.some.thing').
-   * @param string $subscriptionId The purchased subscription ID (for example,
-   * 'monthly001').
-   * @param string $token The token provided to the user's device when the
-   * subscription was purchased.
-   * @param Google_Service_AndroidPublisher_SubscriptionPurchasesDeferRequest $postBody
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_AndroidPublisher_SubscriptionPurchasesDeferResponse
-   */
-  public function defer($packageName, $subscriptionId, $token, Google_Service_AndroidPublisher_SubscriptionPurchasesDeferRequest $postBody, $optParams = array())
-  {
-    $params = array('packageName' => $packageName, 'subscriptionId' => $subscriptionId, 'token' => $token, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('defer', array($params), "Google_Service_AndroidPublisher_SubscriptionPurchasesDeferResponse");
-  }
-  /**
-   * Checks whether a user's subscription purchase is valid and returns its expiry
-   * time. (subscriptions.get)
-   *
-   * @param string $packageName The package name of the application for which this
-   * subscription was purchased (for example, 'com.some.thing').
-   * @param string $subscriptionId The purchased subscription ID (for example,
-   * 'monthly001').
-   * @param string $token The token provided to the user's device when the
-   * subscription was purchased.
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_AndroidPublisher_SubscriptionPurchase
-   */
-  public function get($packageName, $subscriptionId, $token, $optParams = array())
-  {
-    $params = array('packageName' => $packageName, 'subscriptionId' => $subscriptionId, 'token' => $token);
-    $params = array_merge($params, $optParams);
-    return $this->call('get', array($params), "Google_Service_AndroidPublisher_SubscriptionPurchase");
-  }
-  /**
-   * Refunds a user's subscription purchase, but the subscription remains valid
-   * until its expiration time and it will continue to recur.
-   * (subscriptions.refund)
-   *
-   * @param string $packageName The package name of the application for which this
-   * subscription was purchased (for example, 'com.some.thing').
-   * @param string $subscriptionId The purchased subscription ID (for example,
-   * 'monthly001').
-   * @param string $token The token provided to the user's device when the
-   * subscription was purchased.
-   * @param array $optParams Optional parameters.
-   */
-  public function refund($packageName, $subscriptionId, $token, $optParams = array())
-  {
-    $params = array('packageName' => $packageName, 'subscriptionId' => $subscriptionId, 'token' => $token);
-    $params = array_merge($params, $optParams);
-    return $this->call('refund', array($params));
-  }
-  /**
-   * Refunds and immediately revokes a user's subscription purchase. Access to the
-   * subscription will be terminated immediately and it will stop recurring.
-   * (subscriptions.revoke)
-   *
-   * @param string $packageName The package name of the application for which this
-   * subscription was purchased (for example, 'com.some.thing').
-   * @param string $subscriptionId The purchased subscription ID (for example,
-   * 'monthly001').
-   * @param string $token The token provided to the user's device when the
-   * subscription was purchased.
-   * @param array $optParams Optional parameters.
-   */
-  public function revoke($packageName, $subscriptionId, $token, $optParams = array())
-  {
-    $params = array('packageName' => $packageName, 'subscriptionId' => $subscriptionId, 'token' => $token);
-    $params = array_merge($params, $optParams);
-    return $this->call('revoke', array($params));
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AndroidPublisher/Resource/PurchasesVoidedpurchases.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AndroidPublisher/Resource/PurchasesVoidedpurchases.php
deleted file mode 100644
index ea1f4271..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AndroidPublisher/Resource/PurchasesVoidedpurchases.php
+++ /dev/null
@@ -1,55 +0,0 @@
-
- *   $androidpublisherService = new Google_Service_AndroidPublisher(...);
- *   $voidedpurchases = $androidpublisherService->voidedpurchases;
- *  
- */
-class Google_Service_AndroidPublisher_Resource_PurchasesVoidedpurchases extends Google_Service_Resource
-{
-  /**
-   * Lists the purchases that were cancelled, refunded or charged-back.
-   * (voidedpurchases.listPurchasesVoidedpurchases)
-   *
-   * @param string $packageName The package name of the application for which
-   * voided purchases need to be returned (for example, 'com.some.thing').
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param string endTime The time, in milliseconds since the Epoch, of the
-   * newest voided in-app product purchase that you want to see in the response.
-   * The value of this parameter cannot be greater than the current time and is
-   * ignored if a pagination token is set. Default value is current time.
-   * @opt_param string maxResults
-   * @opt_param string startIndex
-   * @opt_param string startTime The time, in milliseconds since the Epoch, of the
-   * oldest voided in-app product purchase that you want to see in the response.
-   * The value of this parameter cannot be older than 30 days and is ignored if a
-   * pagination token is set. Default value is current time minus 30 days.
-   * @opt_param string token
-   * @return Google_Service_AndroidPublisher_VoidedPurchasesListResponse
-   */
-  public function listPurchasesVoidedpurchases($packageName, $optParams = array())
-  {
-    $params = array('packageName' => $packageName);
-    $params = array_merge($params, $optParams);
-    return $this->call('list', array($params), "Google_Service_AndroidPublisher_VoidedPurchasesListResponse");
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AndroidPublisher/Resource/Reviews.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AndroidPublisher/Resource/Reviews.php
deleted file mode 100644
index c1fa3c6a..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AndroidPublisher/Resource/Reviews.php
+++ /dev/null
@@ -1,81 +0,0 @@
-
- *   $androidpublisherService = new Google_Service_AndroidPublisher(...);
- *   $reviews = $androidpublisherService->reviews;
- *  
- */
-class Google_Service_AndroidPublisher_Resource_Reviews extends Google_Service_Resource
-{
-  /**
-   * Returns a single review. (reviews.get)
-   *
-   * @param string $packageName Unique identifier for the Android app for which we
-   * want reviews; for example, "com.spiffygame".
-   * @param string $reviewId
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param string translationLanguage
-   * @return Google_Service_AndroidPublisher_Review
-   */
-  public function get($packageName, $reviewId, $optParams = array())
-  {
-    $params = array('packageName' => $packageName, 'reviewId' => $reviewId);
-    $params = array_merge($params, $optParams);
-    return $this->call('get', array($params), "Google_Service_AndroidPublisher_Review");
-  }
-  /**
-   * Returns a list of reviews. Only reviews from last week will be returned.
-   * (reviews.listReviews)
-   *
-   * @param string $packageName Unique identifier for the Android app for which we
-   * want reviews; for example, "com.spiffygame".
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param string maxResults
-   * @opt_param string startIndex
-   * @opt_param string token
-   * @opt_param string translationLanguage
-   * @return Google_Service_AndroidPublisher_ReviewsListResponse
-   */
-  public function listReviews($packageName, $optParams = array())
-  {
-    $params = array('packageName' => $packageName);
-    $params = array_merge($params, $optParams);
-    return $this->call('list', array($params), "Google_Service_AndroidPublisher_ReviewsListResponse");
-  }
-  /**
-   * Reply to a single review, or update an existing reply. (reviews.reply)
-   *
-   * @param string $packageName Unique identifier for the Android app for which we
-   * want reviews; for example, "com.spiffygame".
-   * @param string $reviewId
-   * @param Google_Service_AndroidPublisher_ReviewsReplyRequest $postBody
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_AndroidPublisher_ReviewsReplyResponse
-   */
-  public function reply($packageName, $reviewId, Google_Service_AndroidPublisher_ReviewsReplyRequest $postBody, $optParams = array())
-  {
-    $params = array('packageName' => $packageName, 'reviewId' => $reviewId, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('reply', array($params), "Google_Service_AndroidPublisher_ReviewsReplyResponse");
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AndroidPublisher/Review.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AndroidPublisher/Review.php
deleted file mode 100644
index c7daff3d..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AndroidPublisher/Review.php
+++ /dev/null
@@ -1,50 +0,0 @@
-authorName = $authorName;
-  }
-  public function getAuthorName()
-  {
-    return $this->authorName;
-  }
-  public function setComments($comments)
-  {
-    $this->comments = $comments;
-  }
-  public function getComments()
-  {
-    return $this->comments;
-  }
-  public function setReviewId($reviewId)
-  {
-    $this->reviewId = $reviewId;
-  }
-  public function getReviewId()
-  {
-    return $this->reviewId;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AndroidPublisher/ReviewReplyResult.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AndroidPublisher/ReviewReplyResult.php
deleted file mode 100644
index 5cb8c3aa..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AndroidPublisher/ReviewReplyResult.php
+++ /dev/null
@@ -1,40 +0,0 @@
-lastEdited = $lastEdited;
-  }
-  public function getLastEdited()
-  {
-    return $this->lastEdited;
-  }
-  public function setReplyText($replyText)
-  {
-    $this->replyText = $replyText;
-  }
-  public function getReplyText()
-  {
-    return $this->replyText;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AndroidPublisher/ReviewsListResponse.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AndroidPublisher/ReviewsListResponse.php
deleted file mode 100644
index 04a61eeb..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AndroidPublisher/ReviewsListResponse.php
+++ /dev/null
@@ -1,52 +0,0 @@
-pageInfo = $pageInfo;
-  }
-  public function getPageInfo()
-  {
-    return $this->pageInfo;
-  }
-  public function setReviews($reviews)
-  {
-    $this->reviews = $reviews;
-  }
-  public function getReviews()
-  {
-    return $this->reviews;
-  }
-  public function setTokenPagination(Google_Service_AndroidPublisher_TokenPagination $tokenPagination)
-  {
-    $this->tokenPagination = $tokenPagination;
-  }
-  public function getTokenPagination()
-  {
-    return $this->tokenPagination;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AndroidPublisher/ReviewsReplyRequest.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AndroidPublisher/ReviewsReplyRequest.php
deleted file mode 100644
index 11f528fe..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AndroidPublisher/ReviewsReplyRequest.php
+++ /dev/null
@@ -1,30 +0,0 @@
-replyText = $replyText;
-  }
-  public function getReplyText()
-  {
-    return $this->replyText;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AndroidPublisher/ReviewsReplyResponse.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AndroidPublisher/ReviewsReplyResponse.php
deleted file mode 100644
index 62351a8c..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AndroidPublisher/ReviewsReplyResponse.php
+++ /dev/null
@@ -1,31 +0,0 @@
-result = $result;
-  }
-  public function getResult()
-  {
-    return $this->result;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AndroidPublisher/Season.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AndroidPublisher/Season.php
deleted file mode 100644
index db476a3a..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AndroidPublisher/Season.php
+++ /dev/null
@@ -1,52 +0,0 @@
-end = $end;
-  }
-  public function getEnd()
-  {
-    return $this->end;
-  }
-  public function setProrations($prorations)
-  {
-    $this->prorations = $prorations;
-  }
-  public function getProrations()
-  {
-    return $this->prorations;
-  }
-  public function setStart(Google_Service_AndroidPublisher_MonthDay $start)
-  {
-    $this->start = $start;
-  }
-  public function getStart()
-  {
-    return $this->start;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AndroidPublisher/SubscriptionDeferralInfo.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AndroidPublisher/SubscriptionDeferralInfo.php
deleted file mode 100644
index 134df222..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AndroidPublisher/SubscriptionDeferralInfo.php
+++ /dev/null
@@ -1,39 +0,0 @@
-desiredExpiryTimeMillis = $desiredExpiryTimeMillis;
-  }
-  public function getDesiredExpiryTimeMillis()
-  {
-    return $this->desiredExpiryTimeMillis;
-  }
-  public function setExpectedExpiryTimeMillis($expectedExpiryTimeMillis)
-  {
-    $this->expectedExpiryTimeMillis = $expectedExpiryTimeMillis;
-  }
-  public function getExpectedExpiryTimeMillis()
-  {
-    return $this->expectedExpiryTimeMillis;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AndroidPublisher/SubscriptionPurchase.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AndroidPublisher/SubscriptionPurchase.php
deleted file mode 100644
index 81dc85e2..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AndroidPublisher/SubscriptionPurchase.php
+++ /dev/null
@@ -1,120 +0,0 @@
-autoRenewing = $autoRenewing;
-  }
-  public function getAutoRenewing()
-  {
-    return $this->autoRenewing;
-  }
-  public function setCancelReason($cancelReason)
-  {
-    $this->cancelReason = $cancelReason;
-  }
-  public function getCancelReason()
-  {
-    return $this->cancelReason;
-  }
-  public function setCountryCode($countryCode)
-  {
-    $this->countryCode = $countryCode;
-  }
-  public function getCountryCode()
-  {
-    return $this->countryCode;
-  }
-  public function setDeveloperPayload($developerPayload)
-  {
-    $this->developerPayload = $developerPayload;
-  }
-  public function getDeveloperPayload()
-  {
-    return $this->developerPayload;
-  }
-  public function setExpiryTimeMillis($expiryTimeMillis)
-  {
-    $this->expiryTimeMillis = $expiryTimeMillis;
-  }
-  public function getExpiryTimeMillis()
-  {
-    return $this->expiryTimeMillis;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setPaymentState($paymentState)
-  {
-    $this->paymentState = $paymentState;
-  }
-  public function getPaymentState()
-  {
-    return $this->paymentState;
-  }
-  public function setPriceAmountMicros($priceAmountMicros)
-  {
-    $this->priceAmountMicros = $priceAmountMicros;
-  }
-  public function getPriceAmountMicros()
-  {
-    return $this->priceAmountMicros;
-  }
-  public function setPriceCurrencyCode($priceCurrencyCode)
-  {
-    $this->priceCurrencyCode = $priceCurrencyCode;
-  }
-  public function getPriceCurrencyCode()
-  {
-    return $this->priceCurrencyCode;
-  }
-  public function setStartTimeMillis($startTimeMillis)
-  {
-    $this->startTimeMillis = $startTimeMillis;
-  }
-  public function getStartTimeMillis()
-  {
-    return $this->startTimeMillis;
-  }
-  public function setUserCancellationTimeMillis($userCancellationTimeMillis)
-  {
-    $this->userCancellationTimeMillis = $userCancellationTimeMillis;
-  }
-  public function getUserCancellationTimeMillis()
-  {
-    return $this->userCancellationTimeMillis;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AndroidPublisher/SubscriptionPurchasesDeferRequest.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AndroidPublisher/SubscriptionPurchasesDeferRequest.php
deleted file mode 100644
index 3f873760..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AndroidPublisher/SubscriptionPurchasesDeferRequest.php
+++ /dev/null
@@ -1,31 +0,0 @@
-deferralInfo = $deferralInfo;
-  }
-  public function getDeferralInfo()
-  {
-    return $this->deferralInfo;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AndroidPublisher/SubscriptionPurchasesDeferResponse.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AndroidPublisher/SubscriptionPurchasesDeferResponse.php
deleted file mode 100644
index afdeda31..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AndroidPublisher/SubscriptionPurchasesDeferResponse.php
+++ /dev/null
@@ -1,30 +0,0 @@
-newExpiryTimeMillis = $newExpiryTimeMillis;
-  }
-  public function getNewExpiryTimeMillis()
-  {
-    return $this->newExpiryTimeMillis;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AndroidPublisher/Testers.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AndroidPublisher/Testers.php
deleted file mode 100644
index 0d9dd02a..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AndroidPublisher/Testers.php
+++ /dev/null
@@ -1,40 +0,0 @@
-googleGroups = $googleGroups;
-  }
-  public function getGoogleGroups()
-  {
-    return $this->googleGroups;
-  }
-  public function setGooglePlusCommunities($googlePlusCommunities)
-  {
-    $this->googlePlusCommunities = $googlePlusCommunities;
-  }
-  public function getGooglePlusCommunities()
-  {
-    return $this->googlePlusCommunities;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AndroidPublisher/Timestamp.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AndroidPublisher/Timestamp.php
deleted file mode 100644
index e98946e6..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AndroidPublisher/Timestamp.php
+++ /dev/null
@@ -1,39 +0,0 @@
-nanos = $nanos;
-  }
-  public function getNanos()
-  {
-    return $this->nanos;
-  }
-  public function setSeconds($seconds)
-  {
-    $this->seconds = $seconds;
-  }
-  public function getSeconds()
-  {
-    return $this->seconds;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AndroidPublisher/TokenPagination.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AndroidPublisher/TokenPagination.php
deleted file mode 100644
index 9c216acf..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AndroidPublisher/TokenPagination.php
+++ /dev/null
@@ -1,39 +0,0 @@
-nextPageToken = $nextPageToken;
-  }
-  public function getNextPageToken()
-  {
-    return $this->nextPageToken;
-  }
-  public function setPreviousPageToken($previousPageToken)
-  {
-    $this->previousPageToken = $previousPageToken;
-  }
-  public function getPreviousPageToken()
-  {
-    return $this->previousPageToken;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AndroidPublisher/Track.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AndroidPublisher/Track.php
deleted file mode 100644
index 26e8c25e..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AndroidPublisher/Track.php
+++ /dev/null
@@ -1,49 +0,0 @@
-track = $track;
-  }
-  public function getTrack()
-  {
-    return $this->track;
-  }
-  public function setUserFraction($userFraction)
-  {
-    $this->userFraction = $userFraction;
-  }
-  public function getUserFraction()
-  {
-    return $this->userFraction;
-  }
-  public function setVersionCodes($versionCodes)
-  {
-    $this->versionCodes = $versionCodes;
-  }
-  public function getVersionCodes()
-  {
-    return $this->versionCodes;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AndroidPublisher/TracksListResponse.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AndroidPublisher/TracksListResponse.php
deleted file mode 100644
index cfa7d152..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AndroidPublisher/TracksListResponse.php
+++ /dev/null
@@ -1,41 +0,0 @@
-kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setTracks($tracks)
-  {
-    $this->tracks = $tracks;
-  }
-  public function getTracks()
-  {
-    return $this->tracks;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AndroidPublisher/UserComment.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AndroidPublisher/UserComment.php
deleted file mode 100644
index 6a8d4370..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AndroidPublisher/UserComment.php
+++ /dev/null
@@ -1,131 +0,0 @@
-androidOsVersion = $androidOsVersion;
-  }
-  public function getAndroidOsVersion()
-  {
-    return $this->androidOsVersion;
-  }
-  public function setAppVersionCode($appVersionCode)
-  {
-    $this->appVersionCode = $appVersionCode;
-  }
-  public function getAppVersionCode()
-  {
-    return $this->appVersionCode;
-  }
-  public function setAppVersionName($appVersionName)
-  {
-    $this->appVersionName = $appVersionName;
-  }
-  public function getAppVersionName()
-  {
-    return $this->appVersionName;
-  }
-  public function setDevice($device)
-  {
-    $this->device = $device;
-  }
-  public function getDevice()
-  {
-    return $this->device;
-  }
-  public function setDeviceMetadata(Google_Service_AndroidPublisher_DeviceMetadata $deviceMetadata)
-  {
-    $this->deviceMetadata = $deviceMetadata;
-  }
-  public function getDeviceMetadata()
-  {
-    return $this->deviceMetadata;
-  }
-  public function setLastModified(Google_Service_AndroidPublisher_Timestamp $lastModified)
-  {
-    $this->lastModified = $lastModified;
-  }
-  public function getLastModified()
-  {
-    return $this->lastModified;
-  }
-  public function setOriginalText($originalText)
-  {
-    $this->originalText = $originalText;
-  }
-  public function getOriginalText()
-  {
-    return $this->originalText;
-  }
-  public function setReviewerLanguage($reviewerLanguage)
-  {
-    $this->reviewerLanguage = $reviewerLanguage;
-  }
-  public function getReviewerLanguage()
-  {
-    return $this->reviewerLanguage;
-  }
-  public function setStarRating($starRating)
-  {
-    $this->starRating = $starRating;
-  }
-  public function getStarRating()
-  {
-    return $this->starRating;
-  }
-  public function setText($text)
-  {
-    $this->text = $text;
-  }
-  public function getText()
-  {
-    return $this->text;
-  }
-  public function setThumbsDownCount($thumbsDownCount)
-  {
-    $this->thumbsDownCount = $thumbsDownCount;
-  }
-  public function getThumbsDownCount()
-  {
-    return $this->thumbsDownCount;
-  }
-  public function setThumbsUpCount($thumbsUpCount)
-  {
-    $this->thumbsUpCount = $thumbsUpCount;
-  }
-  public function getThumbsUpCount()
-  {
-    return $this->thumbsUpCount;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AndroidPublisher/VoidedPurchase.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AndroidPublisher/VoidedPurchase.php
deleted file mode 100644
index 208f641a..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AndroidPublisher/VoidedPurchase.php
+++ /dev/null
@@ -1,57 +0,0 @@
-kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setPurchaseTimeMillis($purchaseTimeMillis)
-  {
-    $this->purchaseTimeMillis = $purchaseTimeMillis;
-  }
-  public function getPurchaseTimeMillis()
-  {
-    return $this->purchaseTimeMillis;
-  }
-  public function setPurchaseToken($purchaseToken)
-  {
-    $this->purchaseToken = $purchaseToken;
-  }
-  public function getPurchaseToken()
-  {
-    return $this->purchaseToken;
-  }
-  public function setVoidedTimeMillis($voidedTimeMillis)
-  {
-    $this->voidedTimeMillis = $voidedTimeMillis;
-  }
-  public function getVoidedTimeMillis()
-  {
-    return $this->voidedTimeMillis;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AndroidPublisher/VoidedPurchasesListResponse.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AndroidPublisher/VoidedPurchasesListResponse.php
deleted file mode 100644
index 4cc0970f..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AndroidPublisher/VoidedPurchasesListResponse.php
+++ /dev/null
@@ -1,52 +0,0 @@
-pageInfo = $pageInfo;
-  }
-  public function getPageInfo()
-  {
-    return $this->pageInfo;
-  }
-  public function setTokenPagination(Google_Service_AndroidPublisher_TokenPagination $tokenPagination)
-  {
-    $this->tokenPagination = $tokenPagination;
-  }
-  public function getTokenPagination()
-  {
-    return $this->tokenPagination;
-  }
-  public function setVoidedPurchases($voidedPurchases)
-  {
-    $this->voidedPurchases = $voidedPurchases;
-  }
-  public function getVoidedPurchases()
-  {
-    return $this->voidedPurchases;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AppState.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AppState.php
deleted file mode 100644
index fc2f9435..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AppState.php
+++ /dev/null
@@ -1,120 +0,0 @@
-
- * The Google App State API.

- *
- * 

- * For more information about this service, see the API
- * Documentation
- * 

- *
- * @author Google, Inc.
- */
-class Google_Service_AppState extends Google_Service
-{
-  /** View and manage your data for this application. */
-  const APPSTATE =
-      "https://www.googleapis.com/auth/appstate";
-
-  public $states;
-  
-  /**
-   * Constructs the internal representation of the AppState service.
-   *
-   * @param Google_Client $client
-   */
-  public function __construct(Google_Client $client)
-  {
-    parent::__construct($client);
-    $this->rootUrl = 'https://www.googleapis.com/';
-    $this->servicePath = 'appstate/v1/';
-    $this->version = 'v1';
-    $this->serviceName = 'appstate';
-
-    $this->states = new Google_Service_AppState_Resource_States(
-        $this,
-        $this->serviceName,
-        'states',
-        array(
-          'methods' => array(
-            'clear' => array(
-              'path' => 'states/{stateKey}/clear',
-              'httpMethod' => 'POST',
-              'parameters' => array(
-                'stateKey' => array(
-                  'location' => 'path',
-                  'type' => 'integer',
-                  'required' => true,
-                ),
-                'currentDataVersion' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-              ),
-            ),'delete' => array(
-              'path' => 'states/{stateKey}',
-              'httpMethod' => 'DELETE',
-              'parameters' => array(
-                'stateKey' => array(
-                  'location' => 'path',
-                  'type' => 'integer',
-                  'required' => true,
-                ),
-              ),
-            ),'get' => array(
-              'path' => 'states/{stateKey}',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'stateKey' => array(
-                  'location' => 'path',
-                  'type' => 'integer',
-                  'required' => true,
-                ),
-              ),
-            ),'list' => array(
-              'path' => 'states',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'includeData' => array(
-                  'location' => 'query',
-                  'type' => 'boolean',
-                ),
-              ),
-            ),'update' => array(
-              'path' => 'states/{stateKey}',
-              'httpMethod' => 'PUT',
-              'parameters' => array(
-                'stateKey' => array(
-                  'location' => 'path',
-                  'type' => 'integer',
-                  'required' => true,
-                ),
-                'currentStateVersion' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-              ),
-            ),
-          )
-        )
-    );
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AppState/GetResponse.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AppState/GetResponse.php
deleted file mode 100644
index bb4a8336..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AppState/GetResponse.php
+++ /dev/null
@@ -1,57 +0,0 @@
-currentStateVersion = $currentStateVersion;
-  }
-  public function getCurrentStateVersion()
-  {
-    return $this->currentStateVersion;
-  }
-  public function setData($data)
-  {
-    $this->data = $data;
-  }
-  public function getData()
-  {
-    return $this->data;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setStateKey($stateKey)
-  {
-    $this->stateKey = $stateKey;
-  }
-  public function getStateKey()
-  {
-    return $this->stateKey;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AppState/ListResponse.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AppState/ListResponse.php
deleted file mode 100644
index cc17c880..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AppState/ListResponse.php
+++ /dev/null
@@ -1,50 +0,0 @@
-items = $items;
-  }
-  public function getItems()
-  {
-    return $this->items;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setMaximumKeyCount($maximumKeyCount)
-  {
-    $this->maximumKeyCount = $maximumKeyCount;
-  }
-  public function getMaximumKeyCount()
-  {
-    return $this->maximumKeyCount;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AppState/Resource/States.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AppState/Resource/States.php
deleted file mode 100644
index b652c2cf..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AppState/Resource/States.php
+++ /dev/null
@@ -1,113 +0,0 @@
-
- *   $appstateService = new Google_Service_AppState(...);
- *   $states = $appstateService->states;
- *  
- */
-class Google_Service_AppState_Resource_States extends Google_Service_Resource
-{
-  /**
-   * Clears (sets to empty) the data for the passed key if and only if the passed
-   * version matches the currently stored version. This method results in a
-   * conflict error on version mismatch. (states.clear)
-   *
-   * @param int $stateKey The key for the data to be retrieved.
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param string currentDataVersion The version of the data to be cleared.
-   * Version strings are returned by the server.
-   * @return Google_Service_AppState_WriteResult
-   */
-  public function clear($stateKey, $optParams = array())
-  {
-    $params = array('stateKey' => $stateKey);
-    $params = array_merge($params, $optParams);
-    return $this->call('clear', array($params), "Google_Service_AppState_WriteResult");
-  }
-  /**
-   * Deletes a key and the data associated with it. The key is removed and no
-   * longer counts against the key quota. Note that since this method is not safe
-   * in the face of concurrent modifications, it should only be used for
-   * development and testing purposes. Invoking this method in shipping code can
-   * result in data loss and data corruption. (states.delete)
-   *
-   * @param int $stateKey The key for the data to be retrieved.
-   * @param array $optParams Optional parameters.
-   */
-  public function delete($stateKey, $optParams = array())
-  {
-    $params = array('stateKey' => $stateKey);
-    $params = array_merge($params, $optParams);
-    return $this->call('delete', array($params));
-  }
-  /**
-   * Retrieves the data corresponding to the passed key. If the key does not exist
-   * on the server, an HTTP 404 will be returned. (states.get)
-   *
-   * @param int $stateKey The key for the data to be retrieved.
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_AppState_GetResponse
-   */
-  public function get($stateKey, $optParams = array())
-  {
-    $params = array('stateKey' => $stateKey);
-    $params = array_merge($params, $optParams);
-    return $this->call('get', array($params), "Google_Service_AppState_GetResponse");
-  }
-  /**
-   * Lists all the states keys, and optionally the state data. (states.listStates)
-   *
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param bool includeData Whether to include the full data in addition to
-   * the version number
-   * @return Google_Service_AppState_ListResponse
-   */
-  public function listStates($optParams = array())
-  {
-    $params = array();
-    $params = array_merge($params, $optParams);
-    return $this->call('list', array($params), "Google_Service_AppState_ListResponse");
-  }
-  /**
-   * Update the data associated with the input key if and only if the passed
-   * version matches the currently stored version. This method is safe in the face
-   * of concurrent writes. Maximum per-key size is 128KB. (states.update)
-   *
-   * @param int $stateKey The key for the data to be retrieved.
-   * @param Google_Service_AppState_UpdateRequest $postBody
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param string currentStateVersion The version of the app state your
-   * application is attempting to update. If this does not match the current
-   * version, this method will return a conflict error. If there is no data stored
-   * on the server for this key, the update will succeed irrespective of the value
-   * of this parameter.
-   * @return Google_Service_AppState_WriteResult
-   */
-  public function update($stateKey, Google_Service_AppState_UpdateRequest $postBody, $optParams = array())
-  {
-    $params = array('stateKey' => $stateKey, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('update', array($params), "Google_Service_AppState_WriteResult");
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AppState/UpdateRequest.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AppState/UpdateRequest.php
deleted file mode 100644
index 719c6a59..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AppState/UpdateRequest.php
+++ /dev/null
@@ -1,39 +0,0 @@
-data = $data;
-  }
-  public function getData()
-  {
-    return $this->data;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AppState/WriteResult.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AppState/WriteResult.php
deleted file mode 100644
index 3b742cbd..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/AppState/WriteResult.php
+++ /dev/null
@@ -1,48 +0,0 @@
-currentStateVersion = $currentStateVersion;
-  }
-  public function getCurrentStateVersion()
-  {
-    return $this->currentStateVersion;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setStateKey($stateKey)
-  {
-    $this->stateKey = $stateKey;
-  }
-  public function getStateKey()
-  {
-    return $this->stateKey;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Appengine.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Appengine.php
deleted file mode 100644
index 4a692250..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Appengine.php
+++ /dev/null
@@ -1,520 +0,0 @@
-
- * Provisions and manages App Engine applications.

- *
- * 

- * For more information about this service, see the API
- * Documentation
- * 

- *
- * @author Google, Inc.
- */
-class Google_Service_Appengine extends Google_Service
-{
-  /** View and manage your applications deployed on Google App Engine. */
-  const APPENGINE_ADMIN =
-      "https://www.googleapis.com/auth/appengine.admin";
-  /** View and manage your data across Google Cloud Platform services. */
-  const CLOUD_PLATFORM =
-      "https://www.googleapis.com/auth/cloud-platform";
-  /** View your data across Google Cloud Platform services. */
-  const CLOUD_PLATFORM_READ_ONLY =
-      "https://www.googleapis.com/auth/cloud-platform.read-only";
-
-  public $apps;
-  public $apps_locations;
-  public $apps_operations;
-  public $apps_services;
-  public $apps_services_versions;
-  public $apps_services_versions_instances;
-  
-  /**
-   * Constructs the internal representation of the Appengine service.
-   *
-   * @param Google_Client $client
-   */
-  public function __construct(Google_Client $client)
-  {
-    parent::__construct($client);
-    $this->rootUrl = 'https://appengine.googleapis.com/';
-    $this->servicePath = '';
-    $this->version = 'v1';
-    $this->serviceName = 'appengine';
-
-    $this->apps = new Google_Service_Appengine_Resource_Apps(
-        $this,
-        $this->serviceName,
-        'apps',
-        array(
-          'methods' => array(
-            'create' => array(
-              'path' => 'v1/apps',
-              'httpMethod' => 'POST',
-              'parameters' => array(),
-            ),'get' => array(
-              'path' => 'v1/apps/{appsId}',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'appsId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'patch' => array(
-              'path' => 'v1/apps/{appsId}',
-              'httpMethod' => 'PATCH',
-              'parameters' => array(
-                'appsId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'updateMask' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-              ),
-            ),'repair' => array(
-              'path' => 'v1/apps/{appsId}:repair',
-              'httpMethod' => 'POST',
-              'parameters' => array(
-                'appsId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),
-          )
-        )
-    );
-    $this->apps_locations = new Google_Service_Appengine_Resource_AppsLocations(
-        $this,
-        $this->serviceName,
-        'locations',
-        array(
-          'methods' => array(
-            'get' => array(
-              'path' => 'v1/apps/{appsId}/locations/{locationsId}',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'appsId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'locationsId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'list' => array(
-              'path' => 'v1/apps/{appsId}/locations',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'appsId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'filter' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'pageSize' => array(
-                  'location' => 'query',
-                  'type' => 'integer',
-                ),
-                'pageToken' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-              ),
-            ),
-          )
-        )
-    );
-    $this->apps_operations = new Google_Service_Appengine_Resource_AppsOperations(
-        $this,
-        $this->serviceName,
-        'operations',
-        array(
-          'methods' => array(
-            'get' => array(
-              'path' => 'v1/apps/{appsId}/operations/{operationsId}',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'appsId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'operationsId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'list' => array(
-              'path' => 'v1/apps/{appsId}/operations',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'appsId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'filter' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'pageSize' => array(
-                  'location' => 'query',
-                  'type' => 'integer',
-                ),
-                'pageToken' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-              ),
-            ),
-          )
-        )
-    );
-    $this->apps_services = new Google_Service_Appengine_Resource_AppsServices(
-        $this,
-        $this->serviceName,
-        'services',
-        array(
-          'methods' => array(
-            'delete' => array(
-              'path' => 'v1/apps/{appsId}/services/{servicesId}',
-              'httpMethod' => 'DELETE',
-              'parameters' => array(
-                'appsId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'servicesId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'get' => array(
-              'path' => 'v1/apps/{appsId}/services/{servicesId}',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'appsId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'servicesId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'list' => array(
-              'path' => 'v1/apps/{appsId}/services',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'appsId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'pageSize' => array(
-                  'location' => 'query',
-                  'type' => 'integer',
-                ),
-                'pageToken' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-              ),
-            ),'patch' => array(
-              'path' => 'v1/apps/{appsId}/services/{servicesId}',
-              'httpMethod' => 'PATCH',
-              'parameters' => array(
-                'appsId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'servicesId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'updateMask' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'migrateTraffic' => array(
-                  'location' => 'query',
-                  'type' => 'boolean',
-                ),
-              ),
-            ),
-          )
-        )
-    );
-    $this->apps_services_versions = new Google_Service_Appengine_Resource_AppsServicesVersions(
-        $this,
-        $this->serviceName,
-        'versions',
-        array(
-          'methods' => array(
-            'create' => array(
-              'path' => 'v1/apps/{appsId}/services/{servicesId}/versions',
-              'httpMethod' => 'POST',
-              'parameters' => array(
-                'appsId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'servicesId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'delete' => array(
-              'path' => 'v1/apps/{appsId}/services/{servicesId}/versions/{versionsId}',
-              'httpMethod' => 'DELETE',
-              'parameters' => array(
-                'appsId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'servicesId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'versionsId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'get' => array(
-              'path' => 'v1/apps/{appsId}/services/{servicesId}/versions/{versionsId}',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'appsId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'servicesId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'versionsId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'view' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-              ),
-            ),'list' => array(
-              'path' => 'v1/apps/{appsId}/services/{servicesId}/versions',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'appsId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'servicesId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'view' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'pageSize' => array(
-                  'location' => 'query',
-                  'type' => 'integer',
-                ),
-                'pageToken' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-              ),
-            ),'patch' => array(
-              'path' => 'v1/apps/{appsId}/services/{servicesId}/versions/{versionsId}',
-              'httpMethod' => 'PATCH',
-              'parameters' => array(
-                'appsId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'servicesId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'versionsId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'updateMask' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-              ),
-            ),
-          )
-        )
-    );
-    $this->apps_services_versions_instances = new Google_Service_Appengine_Resource_AppsServicesVersionsInstances(
-        $this,
-        $this->serviceName,
-        'instances',
-        array(
-          'methods' => array(
-            'debug' => array(
-              'path' => 'v1/apps/{appsId}/services/{servicesId}/versions/{versionsId}/instances/{instancesId}:debug',
-              'httpMethod' => 'POST',
-              'parameters' => array(
-                'appsId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'servicesId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'versionsId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'instancesId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'delete' => array(
-              'path' => 'v1/apps/{appsId}/services/{servicesId}/versions/{versionsId}/instances/{instancesId}',
-              'httpMethod' => 'DELETE',
-              'parameters' => array(
-                'appsId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'servicesId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'versionsId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'instancesId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'get' => array(
-              'path' => 'v1/apps/{appsId}/services/{servicesId}/versions/{versionsId}/instances/{instancesId}',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'appsId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'servicesId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'versionsId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'instancesId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'list' => array(
-              'path' => 'v1/apps/{appsId}/services/{servicesId}/versions/{versionsId}/instances',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'appsId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'servicesId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'versionsId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'pageSize' => array(
-                  'location' => 'query',
-                  'type' => 'integer',
-                ),
-                'pageToken' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-              ),
-            ),
-          )
-        )
-    );
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Appengine/ApiConfigHandler.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Appengine/ApiConfigHandler.php
deleted file mode 100644
index 2464a8b8..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Appengine/ApiConfigHandler.php
+++ /dev/null
@@ -1,66 +0,0 @@
-authFailAction = $authFailAction;
-  }
-  public function getAuthFailAction()
-  {
-    return $this->authFailAction;
-  }
-  public function setLogin($login)
-  {
-    $this->login = $login;
-  }
-  public function getLogin()
-  {
-    return $this->login;
-  }
-  public function setScript($script)
-  {
-    $this->script = $script;
-  }
-  public function getScript()
-  {
-    return $this->script;
-  }
-  public function setSecurityLevel($securityLevel)
-  {
-    $this->securityLevel = $securityLevel;
-  }
-  public function getSecurityLevel()
-  {
-    return $this->securityLevel;
-  }
-  public function setUrl($url)
-  {
-    $this->url = $url;
-  }
-  public function getUrl()
-  {
-    return $this->url;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Appengine/ApiEndpointHandler.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Appengine/ApiEndpointHandler.php
deleted file mode 100644
index 6b5d1381..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Appengine/ApiEndpointHandler.php
+++ /dev/null
@@ -1,30 +0,0 @@
-scriptPath = $scriptPath;
-  }
-  public function getScriptPath()
-  {
-    return $this->scriptPath;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Appengine/Application.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Appengine/Application.php
deleted file mode 100644
index a1c8fc28..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Appengine/Application.php
+++ /dev/null
@@ -1,104 +0,0 @@
-authDomain = $authDomain;
-  }
-  public function getAuthDomain()
-  {
-    return $this->authDomain;
-  }
-  public function setCodeBucket($codeBucket)
-  {
-    $this->codeBucket = $codeBucket;
-  }
-  public function getCodeBucket()
-  {
-    return $this->codeBucket;
-  }
-  public function setDefaultBucket($defaultBucket)
-  {
-    $this->defaultBucket = $defaultBucket;
-  }
-  public function getDefaultBucket()
-  {
-    return $this->defaultBucket;
-  }
-  public function setDefaultCookieExpiration($defaultCookieExpiration)
-  {
-    $this->defaultCookieExpiration = $defaultCookieExpiration;
-  }
-  public function getDefaultCookieExpiration()
-  {
-    return $this->defaultCookieExpiration;
-  }
-  public function setDefaultHostname($defaultHostname)
-  {
-    $this->defaultHostname = $defaultHostname;
-  }
-  public function getDefaultHostname()
-  {
-    return $this->defaultHostname;
-  }
-  public function setDispatchRules($dispatchRules)
-  {
-    $this->dispatchRules = $dispatchRules;
-  }
-  public function getDispatchRules()
-  {
-    return $this->dispatchRules;
-  }
-  public function setId($id)
-  {
-    $this->id = $id;
-  }
-  public function getId()
-  {
-    return $this->id;
-  }
-  public function setLocationId($locationId)
-  {
-    $this->locationId = $locationId;
-  }
-  public function getLocationId()
-  {
-    return $this->locationId;
-  }
-  public function setName($name)
-  {
-    $this->name = $name;
-  }
-  public function getName()
-  {
-    return $this->name;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Appengine/AutomaticScaling.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Appengine/AutomaticScaling.php
deleted file mode 100644
index 3801742d..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Appengine/AutomaticScaling.php
+++ /dev/null
@@ -1,133 +0,0 @@
-coolDownPeriod = $coolDownPeriod;
-  }
-  public function getCoolDownPeriod()
-  {
-    return $this->coolDownPeriod;
-  }
-  public function setCpuUtilization(Google_Service_Appengine_CpuUtilization $cpuUtilization)
-  {
-    $this->cpuUtilization = $cpuUtilization;
-  }
-  public function getCpuUtilization()
-  {
-    return $this->cpuUtilization;
-  }
-  public function setDiskUtilization(Google_Service_Appengine_DiskUtilization $diskUtilization)
-  {
-    $this->diskUtilization = $diskUtilization;
-  }
-  public function getDiskUtilization()
-  {
-    return $this->diskUtilization;
-  }
-  public function setMaxConcurrentRequests($maxConcurrentRequests)
-  {
-    $this->maxConcurrentRequests = $maxConcurrentRequests;
-  }
-  public function getMaxConcurrentRequests()
-  {
-    return $this->maxConcurrentRequests;
-  }
-  public function setMaxIdleInstances($maxIdleInstances)
-  {
-    $this->maxIdleInstances = $maxIdleInstances;
-  }
-  public function getMaxIdleInstances()
-  {
-    return $this->maxIdleInstances;
-  }
-  public function setMaxPendingLatency($maxPendingLatency)
-  {
-    $this->maxPendingLatency = $maxPendingLatency;
-  }
-  public function getMaxPendingLatency()
-  {
-    return $this->maxPendingLatency;
-  }
-  public function setMaxTotalInstances($maxTotalInstances)
-  {
-    $this->maxTotalInstances = $maxTotalInstances;
-  }
-  public function getMaxTotalInstances()
-  {
-    return $this->maxTotalInstances;
-  }
-  public function setMinIdleInstances($minIdleInstances)
-  {
-    $this->minIdleInstances = $minIdleInstances;
-  }
-  public function getMinIdleInstances()
-  {
-    return $this->minIdleInstances;
-  }
-  public function setMinPendingLatency($minPendingLatency)
-  {
-    $this->minPendingLatency = $minPendingLatency;
-  }
-  public function getMinPendingLatency()
-  {
-    return $this->minPendingLatency;
-  }
-  public function setMinTotalInstances($minTotalInstances)
-  {
-    $this->minTotalInstances = $minTotalInstances;
-  }
-  public function getMinTotalInstances()
-  {
-    return $this->minTotalInstances;
-  }
-  public function setNetworkUtilization(Google_Service_Appengine_NetworkUtilization $networkUtilization)
-  {
-    $this->networkUtilization = $networkUtilization;
-  }
-  public function getNetworkUtilization()
-  {
-    return $this->networkUtilization;
-  }
-  public function setRequestUtilization(Google_Service_Appengine_RequestUtilization $requestUtilization)
-  {
-    $this->requestUtilization = $requestUtilization;
-  }
-  public function getRequestUtilization()
-  {
-    return $this->requestUtilization;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Appengine/BasicScaling.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Appengine/BasicScaling.php
deleted file mode 100644
index 98bad2e8..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Appengine/BasicScaling.php
+++ /dev/null
@@ -1,39 +0,0 @@
-idleTimeout = $idleTimeout;
-  }
-  public function getIdleTimeout()
-  {
-    return $this->idleTimeout;
-  }
-  public function setMaxInstances($maxInstances)
-  {
-    $this->maxInstances = $maxInstances;
-  }
-  public function getMaxInstances()
-  {
-    return $this->maxInstances;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Appengine/ContainerInfo.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Appengine/ContainerInfo.php
deleted file mode 100644
index 86bb890c..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Appengine/ContainerInfo.php
+++ /dev/null
@@ -1,30 +0,0 @@
-image = $image;
-  }
-  public function getImage()
-  {
-    return $this->image;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Appengine/CpuUtilization.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Appengine/CpuUtilization.php
deleted file mode 100644
index c8e25137..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Appengine/CpuUtilization.php
+++ /dev/null
@@ -1,39 +0,0 @@
-aggregationWindowLength = $aggregationWindowLength;
-  }
-  public function getAggregationWindowLength()
-  {
-    return $this->aggregationWindowLength;
-  }
-  public function setTargetUtilization($targetUtilization)
-  {
-    $this->targetUtilization = $targetUtilization;
-  }
-  public function getTargetUtilization()
-  {
-    return $this->targetUtilization;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Appengine/DebugInstanceRequest.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Appengine/DebugInstanceRequest.php
deleted file mode 100644
index 569bf83a..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Appengine/DebugInstanceRequest.php
+++ /dev/null
@@ -1,30 +0,0 @@
-sshKey = $sshKey;
-  }
-  public function getSshKey()
-  {
-    return $this->sshKey;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Appengine/Deployment.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Appengine/Deployment.php
deleted file mode 100644
index 7f727f16..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Appengine/Deployment.php
+++ /dev/null
@@ -1,51 +0,0 @@
-container = $container;
-  }
-  public function getContainer()
-  {
-    return $this->container;
-  }
-  public function setFiles($files)
-  {
-    $this->files = $files;
-  }
-  public function getFiles()
-  {
-    return $this->files;
-  }
-  public function setZip(Google_Service_Appengine_ZipInfo $zip)
-  {
-    $this->zip = $zip;
-  }
-  public function getZip()
-  {
-    return $this->zip;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Appengine/DiskUtilization.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Appengine/DiskUtilization.php
deleted file mode 100644
index fcb82677..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Appengine/DiskUtilization.php
+++ /dev/null
@@ -1,57 +0,0 @@
-targetReadBytesPerSecond = $targetReadBytesPerSecond;
-  }
-  public function getTargetReadBytesPerSecond()
-  {
-    return $this->targetReadBytesPerSecond;
-  }
-  public function setTargetReadOpsPerSecond($targetReadOpsPerSecond)
-  {
-    $this->targetReadOpsPerSecond = $targetReadOpsPerSecond;
-  }
-  public function getTargetReadOpsPerSecond()
-  {
-    return $this->targetReadOpsPerSecond;
-  }
-  public function setTargetWriteBytesPerSecond($targetWriteBytesPerSecond)
-  {
-    $this->targetWriteBytesPerSecond = $targetWriteBytesPerSecond;
-  }
-  public function getTargetWriteBytesPerSecond()
-  {
-    return $this->targetWriteBytesPerSecond;
-  }
-  public function setTargetWriteOpsPerSecond($targetWriteOpsPerSecond)
-  {
-    $this->targetWriteOpsPerSecond = $targetWriteOpsPerSecond;
-  }
-  public function getTargetWriteOpsPerSecond()
-  {
-    return $this->targetWriteOpsPerSecond;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Appengine/EndpointsApiService.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Appengine/EndpointsApiService.php
deleted file mode 100644
index c14bd3cb..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Appengine/EndpointsApiService.php
+++ /dev/null
@@ -1,39 +0,0 @@
-configId = $configId;
-  }
-  public function getConfigId()
-  {
-    return $this->configId;
-  }
-  public function setName($name)
-  {
-    $this->name = $name;
-  }
-  public function getName()
-  {
-    return $this->name;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Appengine/ErrorHandler.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Appengine/ErrorHandler.php
deleted file mode 100644
index 64e1987f..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Appengine/ErrorHandler.php
+++ /dev/null
@@ -1,48 +0,0 @@
-errorCode = $errorCode;
-  }
-  public function getErrorCode()
-  {
-    return $this->errorCode;
-  }
-  public function setMimeType($mimeType)
-  {
-    $this->mimeType = $mimeType;
-  }
-  public function getMimeType()
-  {
-    return $this->mimeType;
-  }
-  public function setStaticFile($staticFile)
-  {
-    $this->staticFile = $staticFile;
-  }
-  public function getStaticFile()
-  {
-    return $this->staticFile;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Appengine/FileInfo.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Appengine/FileInfo.php
deleted file mode 100644
index 680afb50..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Appengine/FileInfo.php
+++ /dev/null
@@ -1,48 +0,0 @@
-mimeType = $mimeType;
-  }
-  public function getMimeType()
-  {
-    return $this->mimeType;
-  }
-  public function setSha1Sum($sha1Sum)
-  {
-    $this->sha1Sum = $sha1Sum;
-  }
-  public function getSha1Sum()
-  {
-    return $this->sha1Sum;
-  }
-  public function setSourceUrl($sourceUrl)
-  {
-    $this->sourceUrl = $sourceUrl;
-  }
-  public function getSourceUrl()
-  {
-    return $this->sourceUrl;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Appengine/HealthCheck.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Appengine/HealthCheck.php
deleted file mode 100644
index dc87fbaa..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Appengine/HealthCheck.php
+++ /dev/null
@@ -1,84 +0,0 @@
-checkInterval = $checkInterval;
-  }
-  public function getCheckInterval()
-  {
-    return $this->checkInterval;
-  }
-  public function setDisableHealthCheck($disableHealthCheck)
-  {
-    $this->disableHealthCheck = $disableHealthCheck;
-  }
-  public function getDisableHealthCheck()
-  {
-    return $this->disableHealthCheck;
-  }
-  public function setHealthyThreshold($healthyThreshold)
-  {
-    $this->healthyThreshold = $healthyThreshold;
-  }
-  public function getHealthyThreshold()
-  {
-    return $this->healthyThreshold;
-  }
-  public function setHost($host)
-  {
-    $this->host = $host;
-  }
-  public function getHost()
-  {
-    return $this->host;
-  }
-  public function setRestartThreshold($restartThreshold)
-  {
-    $this->restartThreshold = $restartThreshold;
-  }
-  public function getRestartThreshold()
-  {
-    return $this->restartThreshold;
-  }
-  public function setTimeout($timeout)
-  {
-    $this->timeout = $timeout;
-  }
-  public function getTimeout()
-  {
-    return $this->timeout;
-  }
-  public function setUnhealthyThreshold($unhealthyThreshold)
-  {
-    $this->unhealthyThreshold = $unhealthyThreshold;
-  }
-  public function getUnhealthyThreshold()
-  {
-    return $this->unhealthyThreshold;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Appengine/Instance.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Appengine/Instance.php
deleted file mode 100644
index 001d85fa..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Appengine/Instance.php
+++ /dev/null
@@ -1,165 +0,0 @@
-appEngineRelease = $appEngineRelease;
-  }
-  public function getAppEngineRelease()
-  {
-    return $this->appEngineRelease;
-  }
-  public function setAvailability($availability)
-  {
-    $this->availability = $availability;
-  }
-  public function getAvailability()
-  {
-    return $this->availability;
-  }
-  public function setAverageLatency($averageLatency)
-  {
-    $this->averageLatency = $averageLatency;
-  }
-  public function getAverageLatency()
-  {
-    return $this->averageLatency;
-  }
-  public function setErrors($errors)
-  {
-    $this->errors = $errors;
-  }
-  public function getErrors()
-  {
-    return $this->errors;
-  }
-  public function setId($id)
-  {
-    $this->id = $id;
-  }
-  public function getId()
-  {
-    return $this->id;
-  }
-  public function setMemoryUsage($memoryUsage)
-  {
-    $this->memoryUsage = $memoryUsage;
-  }
-  public function getMemoryUsage()
-  {
-    return $this->memoryUsage;
-  }
-  public function setName($name)
-  {
-    $this->name = $name;
-  }
-  public function getName()
-  {
-    return $this->name;
-  }
-  public function setQps($qps)
-  {
-    $this->qps = $qps;
-  }
-  public function getQps()
-  {
-    return $this->qps;
-  }
-  public function setRequests($requests)
-  {
-    $this->requests = $requests;
-  }
-  public function getRequests()
-  {
-    return $this->requests;
-  }
-  public function setStartTime($startTime)
-  {
-    $this->startTime = $startTime;
-  }
-  public function getStartTime()
-  {
-    return $this->startTime;
-  }
-  public function setVmDebugEnabled($vmDebugEnabled)
-  {
-    $this->vmDebugEnabled = $vmDebugEnabled;
-  }
-  public function getVmDebugEnabled()
-  {
-    return $this->vmDebugEnabled;
-  }
-  public function setVmId($vmId)
-  {
-    $this->vmId = $vmId;
-  }
-  public function getVmId()
-  {
-    return $this->vmId;
-  }
-  public function setVmIp($vmIp)
-  {
-    $this->vmIp = $vmIp;
-  }
-  public function getVmIp()
-  {
-    return $this->vmIp;
-  }
-  public function setVmName($vmName)
-  {
-    $this->vmName = $vmName;
-  }
-  public function getVmName()
-  {
-    return $this->vmName;
-  }
-  public function setVmStatus($vmStatus)
-  {
-    $this->vmStatus = $vmStatus;
-  }
-  public function getVmStatus()
-  {
-    return $this->vmStatus;
-  }
-  public function setVmZoneName($vmZoneName)
-  {
-    $this->vmZoneName = $vmZoneName;
-  }
-  public function getVmZoneName()
-  {
-    return $this->vmZoneName;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Appengine/Library.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Appengine/Library.php
deleted file mode 100644
index c4fb3462..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Appengine/Library.php
+++ /dev/null
@@ -1,39 +0,0 @@
-name = $name;
-  }
-  public function getName()
-  {
-    return $this->name;
-  }
-  public function setVersion($version)
-  {
-    $this->version = $version;
-  }
-  public function getVersion()
-  {
-    return $this->version;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Appengine/ListInstancesResponse.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Appengine/ListInstancesResponse.php
deleted file mode 100644
index 37e6212f..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Appengine/ListInstancesResponse.php
+++ /dev/null
@@ -1,41 +0,0 @@
-instances = $instances;
-  }
-  public function getInstances()
-  {
-    return $this->instances;
-  }
-  public function setNextPageToken($nextPageToken)
-  {
-    $this->nextPageToken = $nextPageToken;
-  }
-  public function getNextPageToken()
-  {
-    return $this->nextPageToken;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Appengine/ListLocationsResponse.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Appengine/ListLocationsResponse.php
deleted file mode 100644
index ecb6bc83..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Appengine/ListLocationsResponse.php
+++ /dev/null
@@ -1,41 +0,0 @@
-locations = $locations;
-  }
-  public function getLocations()
-  {
-    return $this->locations;
-  }
-  public function setNextPageToken($nextPageToken)
-  {
-    $this->nextPageToken = $nextPageToken;
-  }
-  public function getNextPageToken()
-  {
-    return $this->nextPageToken;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Appengine/ListOperationsResponse.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Appengine/ListOperationsResponse.php
deleted file mode 100644
index a3b2e215..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Appengine/ListOperationsResponse.php
+++ /dev/null
@@ -1,41 +0,0 @@
-nextPageToken = $nextPageToken;
-  }
-  public function getNextPageToken()
-  {
-    return $this->nextPageToken;
-  }
-  public function setOperations($operations)
-  {
-    $this->operations = $operations;
-  }
-  public function getOperations()
-  {
-    return $this->operations;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Appengine/ListServicesResponse.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Appengine/ListServicesResponse.php
deleted file mode 100644
index 5d53085e..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Appengine/ListServicesResponse.php
+++ /dev/null
@@ -1,41 +0,0 @@
-nextPageToken = $nextPageToken;
-  }
-  public function getNextPageToken()
-  {
-    return $this->nextPageToken;
-  }
-  public function setServices($services)
-  {
-    $this->services = $services;
-  }
-  public function getServices()
-  {
-    return $this->services;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Appengine/ListVersionsResponse.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Appengine/ListVersionsResponse.php
deleted file mode 100644
index ed8085a6..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Appengine/ListVersionsResponse.php
+++ /dev/null
@@ -1,41 +0,0 @@
-nextPageToken = $nextPageToken;
-  }
-  public function getNextPageToken()
-  {
-    return $this->nextPageToken;
-  }
-  public function setVersions($versions)
-  {
-    $this->versions = $versions;
-  }
-  public function getVersions()
-  {
-    return $this->versions;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Appengine/Location.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Appengine/Location.php
deleted file mode 100644
index f931f221..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Appengine/Location.php
+++ /dev/null
@@ -1,57 +0,0 @@
-labels = $labels;
-  }
-  public function getLabels()
-  {
-    return $this->labels;
-  }
-  public function setLocationId($locationId)
-  {
-    $this->locationId = $locationId;
-  }
-  public function getLocationId()
-  {
-    return $this->locationId;
-  }
-  public function setMetadata($metadata)
-  {
-    $this->metadata = $metadata;
-  }
-  public function getMetadata()
-  {
-    return $this->metadata;
-  }
-  public function setName($name)
-  {
-    $this->name = $name;
-  }
-  public function getName()
-  {
-    return $this->name;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Appengine/LocationMetadata.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Appengine/LocationMetadata.php
deleted file mode 100644
index a2e5476b..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Appengine/LocationMetadata.php
+++ /dev/null
@@ -1,39 +0,0 @@
-flexibleEnvironmentAvailable = $flexibleEnvironmentAvailable;
-  }
-  public function getFlexibleEnvironmentAvailable()
-  {
-    return $this->flexibleEnvironmentAvailable;
-  }
-  public function setStandardEnvironmentAvailable($standardEnvironmentAvailable)
-  {
-    $this->standardEnvironmentAvailable = $standardEnvironmentAvailable;
-  }
-  public function getStandardEnvironmentAvailable()
-  {
-    return $this->standardEnvironmentAvailable;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Appengine/ManualScaling.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Appengine/ManualScaling.php
deleted file mode 100644
index dd6547d2..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Appengine/ManualScaling.php
+++ /dev/null
@@ -1,30 +0,0 @@
-instances = $instances;
-  }
-  public function getInstances()
-  {
-    return $this->instances;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Appengine/Network.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Appengine/Network.php
deleted file mode 100644
index 90c9438e..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Appengine/Network.php
+++ /dev/null
@@ -1,58 +0,0 @@
-forwardedPorts = $forwardedPorts;
-  }
-  public function getForwardedPorts()
-  {
-    return $this->forwardedPorts;
-  }
-  public function setInstanceTag($instanceTag)
-  {
-    $this->instanceTag = $instanceTag;
-  }
-  public function getInstanceTag()
-  {
-    return $this->instanceTag;
-  }
-  public function setName($name)
-  {
-    $this->name = $name;
-  }
-  public function getName()
-  {
-    return $this->name;
-  }
-  public function setSubnetworkName($subnetworkName)
-  {
-    $this->subnetworkName = $subnetworkName;
-  }
-  public function getSubnetworkName()
-  {
-    return $this->subnetworkName;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Appengine/NetworkUtilization.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Appengine/NetworkUtilization.php
deleted file mode 100644
index 922285e6..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Appengine/NetworkUtilization.php
+++ /dev/null
@@ -1,57 +0,0 @@
-targetReceivedBytesPerSecond = $targetReceivedBytesPerSecond;
-  }
-  public function getTargetReceivedBytesPerSecond()
-  {
-    return $this->targetReceivedBytesPerSecond;
-  }
-  public function setTargetReceivedPacketsPerSecond($targetReceivedPacketsPerSecond)
-  {
-    $this->targetReceivedPacketsPerSecond = $targetReceivedPacketsPerSecond;
-  }
-  public function getTargetReceivedPacketsPerSecond()
-  {
-    return $this->targetReceivedPacketsPerSecond;
-  }
-  public function setTargetSentBytesPerSecond($targetSentBytesPerSecond)
-  {
-    $this->targetSentBytesPerSecond = $targetSentBytesPerSecond;
-  }
-  public function getTargetSentBytesPerSecond()
-  {
-    return $this->targetSentBytesPerSecond;
-  }
-  public function setTargetSentPacketsPerSecond($targetSentPacketsPerSecond)
-  {
-    $this->targetSentPacketsPerSecond = $targetSentPacketsPerSecond;
-  }
-  public function getTargetSentPacketsPerSecond()
-  {
-    return $this->targetSentPacketsPerSecond;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Appengine/Operation.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Appengine/Operation.php
deleted file mode 100644
index 6a5bd5e7..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Appengine/Operation.php
+++ /dev/null
@@ -1,67 +0,0 @@
-done = $done;
-  }
-  public function getDone()
-  {
-    return $this->done;
-  }
-  public function setError(Google_Service_Appengine_Status $error)
-  {
-    $this->error = $error;
-  }
-  public function getError()
-  {
-    return $this->error;
-  }
-  public function setMetadata($metadata)
-  {
-    $this->metadata = $metadata;
-  }
-  public function getMetadata()
-  {
-    return $this->metadata;
-  }
-  public function setName($name)
-  {
-    $this->name = $name;
-  }
-  public function getName()
-  {
-    return $this->name;
-  }
-  public function setResponse($response)
-  {
-    $this->response = $response;
-  }
-  public function getResponse()
-  {
-    return $this->response;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Appengine/OperationMetadata.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Appengine/OperationMetadata.php
deleted file mode 100644
index b55c4600..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Appengine/OperationMetadata.php
+++ /dev/null
@@ -1,75 +0,0 @@
-endTime = $endTime;
-  }
-  public function getEndTime()
-  {
-    return $this->endTime;
-  }
-  public function setInsertTime($insertTime)
-  {
-    $this->insertTime = $insertTime;
-  }
-  public function getInsertTime()
-  {
-    return $this->insertTime;
-  }
-  public function setMethod($method)
-  {
-    $this->method = $method;
-  }
-  public function getMethod()
-  {
-    return $this->method;
-  }
-  public function setOperationType($operationType)
-  {
-    $this->operationType = $operationType;
-  }
-  public function getOperationType()
-  {
-    return $this->operationType;
-  }
-  public function setTarget($target)
-  {
-    $this->target = $target;
-  }
-  public function getTarget()
-  {
-    return $this->target;
-  }
-  public function setUser($user)
-  {
-    $this->user = $user;
-  }
-  public function getUser()
-  {
-    return $this->user;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Appengine/OperationMetadataExperimental.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Appengine/OperationMetadataExperimental.php
deleted file mode 100644
index 9d680e4d..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Appengine/OperationMetadataExperimental.php
+++ /dev/null
@@ -1,66 +0,0 @@
-endTime = $endTime;
-  }
-  public function getEndTime()
-  {
-    return $this->endTime;
-  }
-  public function setInsertTime($insertTime)
-  {
-    $this->insertTime = $insertTime;
-  }
-  public function getInsertTime()
-  {
-    return $this->insertTime;
-  }
-  public function setMethod($method)
-  {
-    $this->method = $method;
-  }
-  public function getMethod()
-  {
-    return $this->method;
-  }
-  public function setTarget($target)
-  {
-    $this->target = $target;
-  }
-  public function getTarget()
-  {
-    return $this->target;
-  }
-  public function setUser($user)
-  {
-    $this->user = $user;
-  }
-  public function getUser()
-  {
-    return $this->user;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Appengine/OperationMetadataV1.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Appengine/OperationMetadataV1.php
deleted file mode 100644
index 5a256376..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Appengine/OperationMetadataV1.php
+++ /dev/null
@@ -1,85 +0,0 @@
-endTime = $endTime;
-  }
-  public function getEndTime()
-  {
-    return $this->endTime;
-  }
-  public function setEphemeralMessage($ephemeralMessage)
-  {
-    $this->ephemeralMessage = $ephemeralMessage;
-  }
-  public function getEphemeralMessage()
-  {
-    return $this->ephemeralMessage;
-  }
-  public function setInsertTime($insertTime)
-  {
-    $this->insertTime = $insertTime;
-  }
-  public function getInsertTime()
-  {
-    return $this->insertTime;
-  }
-  public function setMethod($method)
-  {
-    $this->method = $method;
-  }
-  public function getMethod()
-  {
-    return $this->method;
-  }
-  public function setTarget($target)
-  {
-    $this->target = $target;
-  }
-  public function getTarget()
-  {
-    return $this->target;
-  }
-  public function setUser($user)
-  {
-    $this->user = $user;
-  }
-  public function getUser()
-  {
-    return $this->user;
-  }
-  public function setWarning($warning)
-  {
-    $this->warning = $warning;
-  }
-  public function getWarning()
-  {
-    return $this->warning;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Appengine/OperationMetadataV1Beta5.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Appengine/OperationMetadataV1Beta5.php
deleted file mode 100644
index de110bf9..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Appengine/OperationMetadataV1Beta5.php
+++ /dev/null
@@ -1,66 +0,0 @@
-endTime = $endTime;
-  }
-  public function getEndTime()
-  {
-    return $this->endTime;
-  }
-  public function setInsertTime($insertTime)
-  {
-    $this->insertTime = $insertTime;
-  }
-  public function getInsertTime()
-  {
-    return $this->insertTime;
-  }
-  public function setMethod($method)
-  {
-    $this->method = $method;
-  }
-  public function getMethod()
-  {
-    return $this->method;
-  }
-  public function setTarget($target)
-  {
-    $this->target = $target;
-  }
-  public function getTarget()
-  {
-    return $this->target;
-  }
-  public function setUser($user)
-  {
-    $this->user = $user;
-  }
-  public function getUser()
-  {
-    return $this->user;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Appengine/RepairApplicationRequest.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Appengine/RepairApplicationRequest.php
deleted file mode 100644
index 4ce8ad39..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Appengine/RepairApplicationRequest.php
+++ /dev/null
@@ -1,20 +0,0 @@
-targetConcurrentRequests = $targetConcurrentRequests;
-  }
-  public function getTargetConcurrentRequests()
-  {
-    return $this->targetConcurrentRequests;
-  }
-  public function setTargetRequestCountPerSecond($targetRequestCountPerSecond)
-  {
-    $this->targetRequestCountPerSecond = $targetRequestCountPerSecond;
-  }
-  public function getTargetRequestCountPerSecond()
-  {
-    return $this->targetRequestCountPerSecond;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Appengine/Resource/Apps.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Appengine/Resource/Apps.php
deleted file mode 100644
index 9e379e1b..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Appengine/Resource/Apps.php
+++ /dev/null
@@ -1,101 +0,0 @@
-
- *   $appengineService = new Google_Service_Appengine(...);
- *   $apps = $appengineService->apps;
- *  
- */
-class Google_Service_Appengine_Resource_Apps extends Google_Service_Resource
-{
-  /**
-   * Creates an App Engine application for a Google Cloud Platform project. This
-   * requires a project that excludes an App Engine application. For details about
-   * creating a project without an application, see the Google Cloud Resource
-   * Manager create project topic (https://cloud.google.com/resource-manager/docs
-   * /creating-project). (apps.create)
-   *
-   * @param Google_Service_Appengine_Application $postBody
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Appengine_Operation
-   */
-  public function create(Google_Service_Appengine_Application $postBody, $optParams = array())
-  {
-    $params = array('postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('create', array($params), "Google_Service_Appengine_Operation");
-  }
-  /**
-   * Gets information about an application. (apps.get)
-   *
-   * @param string $appsId Part of `name`. Name of the Application resource to
-   * get. Example: apps/myapp.
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Appengine_Application
-   */
-  public function get($appsId, $optParams = array())
-  {
-    $params = array('appsId' => $appsId);
-    $params = array_merge($params, $optParams);
-    return $this->call('get', array($params), "Google_Service_Appengine_Application");
-  }
-  /**
-   * Updates the specified Application resource. You can update the following
-   * fields: auth_domain (https://cloud.google.com/appengine/docs/admin-
-   * api/reference/rest/v1/apps#Application.FIELDS.auth_domain)
-   * default_cookie_expiration (https://cloud.google.com/appengine/docs/admin-
-   * api/reference/rest/v1/apps#Application.FIELDS.default_cookie_expiration)
-   * (apps.patch)
-   *
-   * @param string $appsId Part of `name`. Name of the Application resource to
-   * update. Example: apps/myapp.
-   * @param Google_Service_Appengine_Application $postBody
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param string updateMask Standard field mask for the set of fields to be
-   * updated.
-   * @return Google_Service_Appengine_Operation
-   */
-  public function patch($appsId, Google_Service_Appengine_Application $postBody, $optParams = array())
-  {
-    $params = array('appsId' => $appsId, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('patch', array($params), "Google_Service_Appengine_Operation");
-  }
-  /**
-   * Recreates the required App Engine features for the specified App Engine
-   * application, for example a Cloud Storage bucket or App Engine service
-   * account. Use this method if you receive an error message about a missing
-   * feature, for example, Error retrieving the App Engine service account.
-   * (apps.repair)
-   *
-   * @param string $appsId Part of `name`. Name of the application to repair.
-   * Example: apps/myapp
-   * @param Google_Service_Appengine_RepairApplicationRequest $postBody
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Appengine_Operation
-   */
-  public function repair($appsId, Google_Service_Appengine_RepairApplicationRequest $postBody, $optParams = array())
-  {
-    $params = array('appsId' => $appsId, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('repair', array($params), "Google_Service_Appengine_Operation");
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Appengine/Resource/AppsLocations.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Appengine/Resource/AppsLocations.php
deleted file mode 100644
index d9d27b8e..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Appengine/Resource/AppsLocations.php
+++ /dev/null
@@ -1,61 +0,0 @@
-
- *   $appengineService = new Google_Service_Appengine(...);
- *   $locations = $appengineService->locations;
- *  
- */
-class Google_Service_Appengine_Resource_AppsLocations extends Google_Service_Resource
-{
-  /**
-   * Get information about a location. (locations.get)
-   *
-   * @param string $appsId Part of `name`. Resource name for the location.
-   * @param string $locationsId Part of `name`. See documentation of `appsId`.
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Appengine_Location
-   */
-  public function get($appsId, $locationsId, $optParams = array())
-  {
-    $params = array('appsId' => $appsId, 'locationsId' => $locationsId);
-    $params = array_merge($params, $optParams);
-    return $this->call('get', array($params), "Google_Service_Appengine_Location");
-  }
-  /**
-   * Lists information about the supported locations for this service.
-   * (locations.listAppsLocations)
-   *
-   * @param string $appsId Part of `name`. The resource that owns the locations
-   * collection, if applicable.
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param string filter The standard list filter.
-   * @opt_param int pageSize The standard list page size.
-   * @opt_param string pageToken The standard list page token.
-   * @return Google_Service_Appengine_ListLocationsResponse
-   */
-  public function listAppsLocations($appsId, $optParams = array())
-  {
-    $params = array('appsId' => $appsId);
-    $params = array_merge($params, $optParams);
-    return $this->call('list', array($params), "Google_Service_Appengine_ListLocationsResponse");
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Appengine/Resource/AppsOperations.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Appengine/Resource/AppsOperations.php
deleted file mode 100644
index 5b0c6333..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Appengine/Resource/AppsOperations.php
+++ /dev/null
@@ -1,65 +0,0 @@
-
- *   $appengineService = new Google_Service_Appengine(...);
- *   $operations = $appengineService->operations;
- *  
- */
-class Google_Service_Appengine_Resource_AppsOperations extends Google_Service_Resource
-{
-  /**
-   * Gets the latest state of a long-running operation. Clients can use this
-   * method to poll the operation result at intervals as recommended by the API
-   * service. (operations.get)
-   *
-   * @param string $appsId Part of `name`. The name of the operation resource.
-   * @param string $operationsId Part of `name`. See documentation of `appsId`.
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Appengine_Operation
-   */
-  public function get($appsId, $operationsId, $optParams = array())
-  {
-    $params = array('appsId' => $appsId, 'operationsId' => $operationsId);
-    $params = array_merge($params, $optParams);
-    return $this->call('get', array($params), "Google_Service_Appengine_Operation");
-  }
-  /**
-   * Lists operations that match the specified filter in the request. If the
-   * server doesn't support this method, it returns UNIMPLEMENTED.NOTE: the name
-   * binding below allows API services to override the binding to use different
-   * resource name schemes, such as users/operations.
-   * (operations.listAppsOperations)
-   *
-   * @param string $appsId Part of `name`. The name of the operation collection.
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param string filter The standard list filter.
-   * @opt_param int pageSize The standard list page size.
-   * @opt_param string pageToken The standard list page token.
-   * @return Google_Service_Appengine_ListOperationsResponse
-   */
-  public function listAppsOperations($appsId, $optParams = array())
-  {
-    $params = array('appsId' => $appsId);
-    $params = array_merge($params, $optParams);
-    return $this->call('list', array($params), "Google_Service_Appengine_ListOperationsResponse");
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Appengine/Resource/AppsServices.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Appengine/Resource/AppsServices.php
deleted file mode 100644
index 77095a8a..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Appengine/Resource/AppsServices.php
+++ /dev/null
@@ -1,109 +0,0 @@
-
- *   $appengineService = new Google_Service_Appengine(...);
- *   $services = $appengineService->services;
- *  
- */
-class Google_Service_Appengine_Resource_AppsServices extends Google_Service_Resource
-{
-  /**
-   * Deletes the specified service and all enclosed versions. (services.delete)
-   *
-   * @param string $appsId Part of `name`. Name of the resource requested.
-   * Example: apps/myapp/services/default.
-   * @param string $servicesId Part of `name`. See documentation of `appsId`.
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Appengine_Operation
-   */
-  public function delete($appsId, $servicesId, $optParams = array())
-  {
-    $params = array('appsId' => $appsId, 'servicesId' => $servicesId);
-    $params = array_merge($params, $optParams);
-    return $this->call('delete', array($params), "Google_Service_Appengine_Operation");
-  }
-  /**
-   * Gets the current configuration of the specified service. (services.get)
-   *
-   * @param string $appsId Part of `name`. Name of the resource requested.
-   * Example: apps/myapp/services/default.
-   * @param string $servicesId Part of `name`. See documentation of `appsId`.
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Appengine_Service
-   */
-  public function get($appsId, $servicesId, $optParams = array())
-  {
-    $params = array('appsId' => $appsId, 'servicesId' => $servicesId);
-    $params = array_merge($params, $optParams);
-    return $this->call('get', array($params), "Google_Service_Appengine_Service");
-  }
-  /**
-   * Lists all the services in the application. (services.listAppsServices)
-   *
-   * @param string $appsId Part of `parent`. Name of the parent Application
-   * resource. Example: apps/myapp.
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param int pageSize Maximum results to return per page.
-   * @opt_param string pageToken Continuation token for fetching the next page of
-   * results.
-   * @return Google_Service_Appengine_ListServicesResponse
-   */
-  public function listAppsServices($appsId, $optParams = array())
-  {
-    $params = array('appsId' => $appsId);
-    $params = array_merge($params, $optParams);
-    return $this->call('list', array($params), "Google_Service_Appengine_ListServicesResponse");
-  }
-  /**
-   * Updates the configuration of the specified service. (services.patch)
-   *
-   * @param string $appsId Part of `name`. Name of the resource to update.
-   * Example: apps/myapp/services/default.
-   * @param string $servicesId Part of `name`. See documentation of `appsId`.
-   * @param Google_Service_Appengine_Service $postBody
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param string updateMask Standard field mask for the set of fields to be
-   * updated.
-   * @opt_param bool migrateTraffic Set to true to gradually shift traffic from
-   * one version to another single version. By default, traffic is shifted
-   * immediately. For gradual traffic migration, the target version must be
-   * located within instances that are configured for both warmup requests
-   * (https://cloud.google.com/appengine/docs/admin-
-   * api/reference/rest/v1/apps.services.versions#inboundservicetype) and
-   * automatic scaling (https://cloud.google.com/appengine/docs/admin-
-   * api/reference/rest/v1/apps.services.versions#automaticscaling). You must
-   * specify the shardBy (https://cloud.google.com/appengine/docs/admin-
-   * api/reference/rest/v1/apps.services#shardby) field in the Service resource.
-   * Gradual traffic migration is not supported in the App Engine flexible
-   * environment. For examples, see Migrating and Splitting Traffic
-   * (https://cloud.google.com/appengine/docs/admin-api/migrating-splitting-
-   * traffic).
-   * @return Google_Service_Appengine_Operation
-   */
-  public function patch($appsId, $servicesId, Google_Service_Appengine_Service $postBody, $optParams = array())
-  {
-    $params = array('appsId' => $appsId, 'servicesId' => $servicesId, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('patch', array($params), "Google_Service_Appengine_Operation");
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Appengine/Resource/AppsServicesVersions.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Appengine/Resource/AppsServicesVersions.php
deleted file mode 100644
index 3c1eb114..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Appengine/Resource/AppsServicesVersions.php
+++ /dev/null
@@ -1,138 +0,0 @@
-
- *   $appengineService = new Google_Service_Appengine(...);
- *   $versions = $appengineService->versions;
- *  
- */
-class Google_Service_Appengine_Resource_AppsServicesVersions extends Google_Service_Resource
-{
-  /**
-   * Deploys code and resource files to a new version. (versions.create)
-   *
-   * @param string $appsId Part of `parent`. Name of the parent resource to create
-   * this version under. Example: apps/myapp/services/default.
-   * @param string $servicesId Part of `parent`. See documentation of `appsId`.
-   * @param Google_Service_Appengine_Version $postBody
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Appengine_Operation
-   */
-  public function create($appsId, $servicesId, Google_Service_Appengine_Version $postBody, $optParams = array())
-  {
-    $params = array('appsId' => $appsId, 'servicesId' => $servicesId, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('create', array($params), "Google_Service_Appengine_Operation");
-  }
-  /**
-   * Deletes an existing Version resource. (versions.delete)
-   *
-   * @param string $appsId Part of `name`. Name of the resource requested.
-   * Example: apps/myapp/services/default/versions/v1.
-   * @param string $servicesId Part of `name`. See documentation of `appsId`.
-   * @param string $versionsId Part of `name`. See documentation of `appsId`.
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Appengine_Operation
-   */
-  public function delete($appsId, $servicesId, $versionsId, $optParams = array())
-  {
-    $params = array('appsId' => $appsId, 'servicesId' => $servicesId, 'versionsId' => $versionsId);
-    $params = array_merge($params, $optParams);
-    return $this->call('delete', array($params), "Google_Service_Appengine_Operation");
-  }
-  /**
-   * Gets the specified Version resource. By default, only a BASIC_VIEW will be
-   * returned. Specify the FULL_VIEW parameter to get the full resource.
-   * (versions.get)
-   *
-   * @param string $appsId Part of `name`. Name of the resource requested.
-   * Example: apps/myapp/services/default/versions/v1.
-   * @param string $servicesId Part of `name`. See documentation of `appsId`.
-   * @param string $versionsId Part of `name`. See documentation of `appsId`.
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param string view Controls the set of fields returned in the Get
-   * response.
-   * @return Google_Service_Appengine_Version
-   */
-  public function get($appsId, $servicesId, $versionsId, $optParams = array())
-  {
-    $params = array('appsId' => $appsId, 'servicesId' => $servicesId, 'versionsId' => $versionsId);
-    $params = array_merge($params, $optParams);
-    return $this->call('get', array($params), "Google_Service_Appengine_Version");
-  }
-  /**
-   * Lists the versions of a service. (versions.listAppsServicesVersions)
-   *
-   * @param string $appsId Part of `parent`. Name of the parent Service resource.
-   * Example: apps/myapp/services/default.
-   * @param string $servicesId Part of `parent`. See documentation of `appsId`.
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param string view Controls the set of fields returned in the List
-   * response.
-   * @opt_param int pageSize Maximum results to return per page.
-   * @opt_param string pageToken Continuation token for fetching the next page of
-   * results.
-   * @return Google_Service_Appengine_ListVersionsResponse
-   */
-  public function listAppsServicesVersions($appsId, $servicesId, $optParams = array())
-  {
-    $params = array('appsId' => $appsId, 'servicesId' => $servicesId);
-    $params = array_merge($params, $optParams);
-    return $this->call('list', array($params), "Google_Service_Appengine_ListVersionsResponse");
-  }
-  /**
-   * Updates the specified Version resource. You can specify the following fields
-   * depending on the App Engine environment and type of scaling that the version
-   * resource uses: serving_status (https://cloud.google.com/appengine/docs/admin-
-   * api/reference/rest/v1/apps.services.versions#Version.FIELDS.serving_status):
-   * For Version resources that use basic scaling, manual scaling, or run in the
-   * App Engine flexible environment. instance_class
-   * (https://cloud.google.com/appengine/docs/admin-
-   * api/reference/rest/v1/apps.services.versions#Version.FIELDS.instance_class):
-   * For Version resources that run in the App Engine standard environment.
-   * automatic_scaling.min_idle_instances (https://cloud.google.com/appengine/docs
-   * /admin-api/reference/rest/v1/apps.services.versions#Version.FIELDS.automatic_
-   * scaling): For Version resources that use automatic scaling and run in the App
-   * Engine standard environment. automatic_scaling.max_idle_instances
-   * (https://cloud.google.com/appengine/docs/admin-api/reference/rest/v1/apps.ser
-   * vices.versions#Version.FIELDS.automatic_scaling): For Version resources that
-   * use automatic scaling and run in the App Engine standard environment.
-   * (versions.patch)
-   *
-   * @param string $appsId Part of `name`. Name of the resource to update.
-   * Example: apps/myapp/services/default/versions/1.
-   * @param string $servicesId Part of `name`. See documentation of `appsId`.
-   * @param string $versionsId Part of `name`. See documentation of `appsId`.
-   * @param Google_Service_Appengine_Version $postBody
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param string updateMask Standard field mask for the set of fields to be
-   * updated.
-   * @return Google_Service_Appengine_Operation
-   */
-  public function patch($appsId, $servicesId, $versionsId, Google_Service_Appengine_Version $postBody, $optParams = array())
-  {
-    $params = array('appsId' => $appsId, 'servicesId' => $servicesId, 'versionsId' => $versionsId, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('patch', array($params), "Google_Service_Appengine_Operation");
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Appengine/Resource/AppsServicesVersionsInstances.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Appengine/Resource/AppsServicesVersionsInstances.php
deleted file mode 100644
index a1e8c24f..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Appengine/Resource/AppsServicesVersionsInstances.php
+++ /dev/null
@@ -1,106 +0,0 @@
-
- *   $appengineService = new Google_Service_Appengine(...);
- *   $instances = $appengineService->instances;
- *  
- */
-class Google_Service_Appengine_Resource_AppsServicesVersionsInstances extends Google_Service_Resource
-{
-  /**
-   * Enables debugging on a VM instance. This allows you to use the SSH command to
-   * connect to the virtual machine where the instance lives. While in "debug
-   * mode", the instance continues to serve live traffic. You should delete the
-   * instance when you are done debugging and then allow the system to take over
-   * and determine if another instance should be started.Only applicable for
-   * instances in App Engine flexible environment. (instances.debug)
-   *
-   * @param string $appsId Part of `name`. Name of the resource requested.
-   * Example: apps/myapp/services/default/versions/v1/instances/instance-1.
-   * @param string $servicesId Part of `name`. See documentation of `appsId`.
-   * @param string $versionsId Part of `name`. See documentation of `appsId`.
-   * @param string $instancesId Part of `name`. See documentation of `appsId`.
-   * @param Google_Service_Appengine_DebugInstanceRequest $postBody
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Appengine_Operation
-   */
-  public function debug($appsId, $servicesId, $versionsId, $instancesId, Google_Service_Appengine_DebugInstanceRequest $postBody, $optParams = array())
-  {
-    $params = array('appsId' => $appsId, 'servicesId' => $servicesId, 'versionsId' => $versionsId, 'instancesId' => $instancesId, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('debug', array($params), "Google_Service_Appengine_Operation");
-  }
-  /**
-   * Stops a running instance. (instances.delete)
-   *
-   * @param string $appsId Part of `name`. Name of the resource requested.
-   * Example: apps/myapp/services/default/versions/v1/instances/instance-1.
-   * @param string $servicesId Part of `name`. See documentation of `appsId`.
-   * @param string $versionsId Part of `name`. See documentation of `appsId`.
-   * @param string $instancesId Part of `name`. See documentation of `appsId`.
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Appengine_Operation
-   */
-  public function delete($appsId, $servicesId, $versionsId, $instancesId, $optParams = array())
-  {
-    $params = array('appsId' => $appsId, 'servicesId' => $servicesId, 'versionsId' => $versionsId, 'instancesId' => $instancesId);
-    $params = array_merge($params, $optParams);
-    return $this->call('delete', array($params), "Google_Service_Appengine_Operation");
-  }
-  /**
-   * Gets instance information. (instances.get)
-   *
-   * @param string $appsId Part of `name`. Name of the resource requested.
-   * Example: apps/myapp/services/default/versions/v1/instances/instance-1.
-   * @param string $servicesId Part of `name`. See documentation of `appsId`.
-   * @param string $versionsId Part of `name`. See documentation of `appsId`.
-   * @param string $instancesId Part of `name`. See documentation of `appsId`.
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Appengine_Instance
-   */
-  public function get($appsId, $servicesId, $versionsId, $instancesId, $optParams = array())
-  {
-    $params = array('appsId' => $appsId, 'servicesId' => $servicesId, 'versionsId' => $versionsId, 'instancesId' => $instancesId);
-    $params = array_merge($params, $optParams);
-    return $this->call('get', array($params), "Google_Service_Appengine_Instance");
-  }
-  /**
-   * Lists the instances of a version.
-   * (instances.listAppsServicesVersionsInstances)
-   *
-   * @param string $appsId Part of `parent`. Name of the parent Version resource.
-   * Example: apps/myapp/services/default/versions/v1.
-   * @param string $servicesId Part of `parent`. See documentation of `appsId`.
-   * @param string $versionsId Part of `parent`. See documentation of `appsId`.
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param int pageSize Maximum results to return per page.
-   * @opt_param string pageToken Continuation token for fetching the next page of
-   * results.
-   * @return Google_Service_Appengine_ListInstancesResponse
-   */
-  public function listAppsServicesVersionsInstances($appsId, $servicesId, $versionsId, $optParams = array())
-  {
-    $params = array('appsId' => $appsId, 'servicesId' => $servicesId, 'versionsId' => $versionsId);
-    $params = array_merge($params, $optParams);
-    return $this->call('list', array($params), "Google_Service_Appengine_ListInstancesResponse");
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Appengine/Resource/Experimental.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Appengine/Resource/Experimental.php
deleted file mode 100644
index 4ac8bd4d..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Appengine/Resource/Experimental.php
+++ /dev/null
@@ -1,28 +0,0 @@
-
- *   $appengineService = new Google_Service_Appengine(...);
- *   $experimental = $appengineService->experimental;
- *  
- */
-class Google_Service_Appengine_Resource_Experimental extends Google_Service_Resource
-{
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Appengine/Resource/ExperimentalApps.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Appengine/Resource/ExperimentalApps.php
deleted file mode 100644
index 99fc1a4a..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Appengine/Resource/ExperimentalApps.php
+++ /dev/null
@@ -1,28 +0,0 @@
-
- *   $appengineService = new Google_Service_Appengine(...);
- *   $apps = $appengineService->apps;
- *  
- */
-class Google_Service_Appengine_Resource_ExperimentalApps extends Google_Service_Resource
-{
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Appengine/Resource/ExperimentalAppsOperations.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Appengine/Resource/ExperimentalAppsOperations.php
deleted file mode 100644
index 802c1dab..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Appengine/Resource/ExperimentalAppsOperations.php
+++ /dev/null
@@ -1,65 +0,0 @@
-
- *   $appengineService = new Google_Service_Appengine(...);
- *   $operations = $appengineService->operations;
- *  
- */
-class Google_Service_Appengine_Resource_ExperimentalAppsOperations extends Google_Service_Resource
-{
-  /**
-   * Gets the latest state of a long-running operation. Clients can use this
-   * method to poll the operation result at intervals as recommended by the API
-   * service. (operations.get)
-   *
-   * @param string $appsId Part of `name`. The name of the operation resource.
-   * @param string $operationsId Part of `name`. See documentation of `appsId`.
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Appengine_Operation
-   */
-  public function get($appsId, $operationsId, $optParams = array())
-  {
-    $params = array('appsId' => $appsId, 'operationsId' => $operationsId);
-    $params = array_merge($params, $optParams);
-    return $this->call('get', array($params), "Google_Service_Appengine_Operation");
-  }
-  /**
-   * Lists operations that match the specified filter in the request. If the
-   * server doesn't support this method, it returns `UNIMPLEMENTED`. NOTE: the
-   * `name` binding below allows API services to override the binding to use
-   * different resource name schemes, such as `users/operations`.
-   * (operations.listExperimentalAppsOperations)
-   *
-   * @param string $appsId Part of `name`. The name of the operation collection.
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param string filter The standard list filter.
-   * @opt_param int pageSize The standard list page size.
-   * @opt_param string pageToken The standard list page token.
-   * @return Google_Service_Appengine_ListOperationsResponse
-   */
-  public function listExperimentalAppsOperations($appsId, $optParams = array())
-  {
-    $params = array('appsId' => $appsId);
-    $params = array_merge($params, $optParams);
-    return $this->call('list', array($params), "Google_Service_Appengine_ListOperationsResponse");
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Appengine/Resources.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Appengine/Resources.php
deleted file mode 100644
index 39819350..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Appengine/Resources.php
+++ /dev/null
@@ -1,59 +0,0 @@
-cpu = $cpu;
-  }
-  public function getCpu()
-  {
-    return $this->cpu;
-  }
-  public function setDiskGb($diskGb)
-  {
-    $this->diskGb = $diskGb;
-  }
-  public function getDiskGb()
-  {
-    return $this->diskGb;
-  }
-  public function setMemoryGb($memoryGb)
-  {
-    $this->memoryGb = $memoryGb;
-  }
-  public function getMemoryGb()
-  {
-    return $this->memoryGb;
-  }
-  public function setVolumes($volumes)
-  {
-    $this->volumes = $volumes;
-  }
-  public function getVolumes()
-  {
-    return $this->volumes;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Appengine/ScriptHandler.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Appengine/ScriptHandler.php
deleted file mode 100644
index cf7902d5..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Appengine/ScriptHandler.php
+++ /dev/null
@@ -1,30 +0,0 @@
-scriptPath = $scriptPath;
-  }
-  public function getScriptPath()
-  {
-    return $this->scriptPath;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Appengine/Service.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Appengine/Service.php
deleted file mode 100644
index e6321b33..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Appengine/Service.php
+++ /dev/null
@@ -1,49 +0,0 @@
-id = $id;
-  }
-  public function getId()
-  {
-    return $this->id;
-  }
-  public function setName($name)
-  {
-    $this->name = $name;
-  }
-  public function getName()
-  {
-    return $this->name;
-  }
-  public function setSplit(Google_Service_Appengine_TrafficSplit $split)
-  {
-    $this->split = $split;
-  }
-  public function getSplit()
-  {
-    return $this->split;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Appengine/SourceReference.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Appengine/SourceReference.php
deleted file mode 100644
index fadc6039..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Appengine/SourceReference.php
+++ /dev/null
@@ -1,39 +0,0 @@
-repository = $repository;
-  }
-  public function getRepository()
-  {
-    return $this->repository;
-  }
-  public function setRevisionId($revisionId)
-  {
-    $this->revisionId = $revisionId;
-  }
-  public function getRevisionId()
-  {
-    return $this->revisionId;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Appengine/StaticFilesHandler.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Appengine/StaticFilesHandler.php
deleted file mode 100644
index 5a51584b..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Appengine/StaticFilesHandler.php
+++ /dev/null
@@ -1,84 +0,0 @@
-applicationReadable = $applicationReadable;
-  }
-  public function getApplicationReadable()
-  {
-    return $this->applicationReadable;
-  }
-  public function setExpiration($expiration)
-  {
-    $this->expiration = $expiration;
-  }
-  public function getExpiration()
-  {
-    return $this->expiration;
-  }
-  public function setHttpHeaders($httpHeaders)
-  {
-    $this->httpHeaders = $httpHeaders;
-  }
-  public function getHttpHeaders()
-  {
-    return $this->httpHeaders;
-  }
-  public function setMimeType($mimeType)
-  {
-    $this->mimeType = $mimeType;
-  }
-  public function getMimeType()
-  {
-    return $this->mimeType;
-  }
-  public function setPath($path)
-  {
-    $this->path = $path;
-  }
-  public function getPath()
-  {
-    return $this->path;
-  }
-  public function setRequireMatchingFile($requireMatchingFile)
-  {
-    $this->requireMatchingFile = $requireMatchingFile;
-  }
-  public function getRequireMatchingFile()
-  {
-    return $this->requireMatchingFile;
-  }
-  public function setUploadPathRegex($uploadPathRegex)
-  {
-    $this->uploadPathRegex = $uploadPathRegex;
-  }
-  public function getUploadPathRegex()
-  {
-    return $this->uploadPathRegex;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Appengine/Status.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Appengine/Status.php
deleted file mode 100644
index d80b5b19..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Appengine/Status.php
+++ /dev/null
@@ -1,49 +0,0 @@
-code = $code;
-  }
-  public function getCode()
-  {
-    return $this->code;
-  }
-  public function setDetails($details)
-  {
-    $this->details = $details;
-  }
-  public function getDetails()
-  {
-    return $this->details;
-  }
-  public function setMessage($message)
-  {
-    $this->message = $message;
-  }
-  public function getMessage()
-  {
-    return $this->message;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Appengine/TrafficSplit.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Appengine/TrafficSplit.php
deleted file mode 100644
index 055d4d3f..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Appengine/TrafficSplit.php
+++ /dev/null
@@ -1,39 +0,0 @@
-allocations = $allocations;
-  }
-  public function getAllocations()
-  {
-    return $this->allocations;
-  }
-  public function setShardBy($shardBy)
-  {
-    $this->shardBy = $shardBy;
-  }
-  public function getShardBy()
-  {
-    return $this->shardBy;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Appengine/UrlDispatchRule.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Appengine/UrlDispatchRule.php
deleted file mode 100644
index dd889ecc..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Appengine/UrlDispatchRule.php
+++ /dev/null
@@ -1,48 +0,0 @@
-domain = $domain;
-  }
-  public function getDomain()
-  {
-    return $this->domain;
-  }
-  public function setPath($path)
-  {
-    $this->path = $path;
-  }
-  public function getPath()
-  {
-    return $this->path;
-  }
-  public function setService($service)
-  {
-    $this->service = $service;
-  }
-  public function getService()
-  {
-    return $this->service;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Appengine/UrlMap.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Appengine/UrlMap.php
deleted file mode 100644
index 01ddd838..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Appengine/UrlMap.php
+++ /dev/null
@@ -1,96 +0,0 @@
-apiEndpoint = $apiEndpoint;
-  }
-  public function getApiEndpoint()
-  {
-    return $this->apiEndpoint;
-  }
-  public function setAuthFailAction($authFailAction)
-  {
-    $this->authFailAction = $authFailAction;
-  }
-  public function getAuthFailAction()
-  {
-    return $this->authFailAction;
-  }
-  public function setLogin($login)
-  {
-    $this->login = $login;
-  }
-  public function getLogin()
-  {
-    return $this->login;
-  }
-  public function setRedirectHttpResponseCode($redirectHttpResponseCode)
-  {
-    $this->redirectHttpResponseCode = $redirectHttpResponseCode;
-  }
-  public function getRedirectHttpResponseCode()
-  {
-    return $this->redirectHttpResponseCode;
-  }
-  public function setScript(Google_Service_Appengine_ScriptHandler $script)
-  {
-    $this->script = $script;
-  }
-  public function getScript()
-  {
-    return $this->script;
-  }
-  public function setSecurityLevel($securityLevel)
-  {
-    $this->securityLevel = $securityLevel;
-  }
-  public function getSecurityLevel()
-  {
-    return $this->securityLevel;
-  }
-  public function setStaticFiles(Google_Service_Appengine_StaticFilesHandler $staticFiles)
-  {
-    $this->staticFiles = $staticFiles;
-  }
-  public function getStaticFiles()
-  {
-    return $this->staticFiles;
-  }
-  public function setUrlRegex($urlRegex)
-  {
-    $this->urlRegex = $urlRegex;
-  }
-  public function getUrlRegex()
-  {
-    return $this->urlRegex;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Appengine/Version.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Appengine/Version.php
deleted file mode 100644
index 32d603ad..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Appengine/Version.php
+++ /dev/null
@@ -1,295 +0,0 @@
-apiConfig = $apiConfig;
-  }
-  public function getApiConfig()
-  {
-    return $this->apiConfig;
-  }
-  public function setAutomaticScaling(Google_Service_Appengine_AutomaticScaling $automaticScaling)
-  {
-    $this->automaticScaling = $automaticScaling;
-  }
-  public function getAutomaticScaling()
-  {
-    return $this->automaticScaling;
-  }
-  public function setBasicScaling(Google_Service_Appengine_BasicScaling $basicScaling)
-  {
-    $this->basicScaling = $basicScaling;
-  }
-  public function getBasicScaling()
-  {
-    return $this->basicScaling;
-  }
-  public function setBetaSettings($betaSettings)
-  {
-    $this->betaSettings = $betaSettings;
-  }
-  public function getBetaSettings()
-  {
-    return $this->betaSettings;
-  }
-  public function setCreateTime($createTime)
-  {
-    $this->createTime = $createTime;
-  }
-  public function getCreateTime()
-  {
-    return $this->createTime;
-  }
-  public function setCreatedBy($createdBy)
-  {
-    $this->createdBy = $createdBy;
-  }
-  public function getCreatedBy()
-  {
-    return $this->createdBy;
-  }
-  public function setDefaultExpiration($defaultExpiration)
-  {
-    $this->defaultExpiration = $defaultExpiration;
-  }
-  public function getDefaultExpiration()
-  {
-    return $this->defaultExpiration;
-  }
-  public function setDeployment(Google_Service_Appengine_Deployment $deployment)
-  {
-    $this->deployment = $deployment;
-  }
-  public function getDeployment()
-  {
-    return $this->deployment;
-  }
-  public function setDiskUsageBytes($diskUsageBytes)
-  {
-    $this->diskUsageBytes = $diskUsageBytes;
-  }
-  public function getDiskUsageBytes()
-  {
-    return $this->diskUsageBytes;
-  }
-  public function setEndpointsApiService(Google_Service_Appengine_EndpointsApiService $endpointsApiService)
-  {
-    $this->endpointsApiService = $endpointsApiService;
-  }
-  public function getEndpointsApiService()
-  {
-    return $this->endpointsApiService;
-  }
-  public function setEnv($env)
-  {
-    $this->env = $env;
-  }
-  public function getEnv()
-  {
-    return $this->env;
-  }
-  public function setEnvVariables($envVariables)
-  {
-    $this->envVariables = $envVariables;
-  }
-  public function getEnvVariables()
-  {
-    return $this->envVariables;
-  }
-  public function setErrorHandlers($errorHandlers)
-  {
-    $this->errorHandlers = $errorHandlers;
-  }
-  public function getErrorHandlers()
-  {
-    return $this->errorHandlers;
-  }
-  public function setHandlers($handlers)
-  {
-    $this->handlers = $handlers;
-  }
-  public function getHandlers()
-  {
-    return $this->handlers;
-  }
-  public function setHealthCheck(Google_Service_Appengine_HealthCheck $healthCheck)
-  {
-    $this->healthCheck = $healthCheck;
-  }
-  public function getHealthCheck()
-  {
-    return $this->healthCheck;
-  }
-  public function setId($id)
-  {
-    $this->id = $id;
-  }
-  public function getId()
-  {
-    return $this->id;
-  }
-  public function setInboundServices($inboundServices)
-  {
-    $this->inboundServices = $inboundServices;
-  }
-  public function getInboundServices()
-  {
-    return $this->inboundServices;
-  }
-  public function setInstanceClass($instanceClass)
-  {
-    $this->instanceClass = $instanceClass;
-  }
-  public function getInstanceClass()
-  {
-    return $this->instanceClass;
-  }
-  public function setLibraries($libraries)
-  {
-    $this->libraries = $libraries;
-  }
-  public function getLibraries()
-  {
-    return $this->libraries;
-  }
-  public function setManualScaling(Google_Service_Appengine_ManualScaling $manualScaling)
-  {
-    $this->manualScaling = $manualScaling;
-  }
-  public function getManualScaling()
-  {
-    return $this->manualScaling;
-  }
-  public function setName($name)
-  {
-    $this->name = $name;
-  }
-  public function getName()
-  {
-    return $this->name;
-  }
-  public function setNetwork(Google_Service_Appengine_Network $network)
-  {
-    $this->network = $network;
-  }
-  public function getNetwork()
-  {
-    return $this->network;
-  }
-  public function setNobuildFilesRegex($nobuildFilesRegex)
-  {
-    $this->nobuildFilesRegex = $nobuildFilesRegex;
-  }
-  public function getNobuildFilesRegex()
-  {
-    return $this->nobuildFilesRegex;
-  }
-  public function setResources(Google_Service_Appengine_Resources $resources)
-  {
-    $this->resources = $resources;
-  }
-  public function getResources()
-  {
-    return $this->resources;
-  }
-  public function setRuntime($runtime)
-  {
-    $this->runtime = $runtime;
-  }
-  public function getRuntime()
-  {
-    return $this->runtime;
-  }
-  public function setServingStatus($servingStatus)
-  {
-    $this->servingStatus = $servingStatus;
-  }
-  public function getServingStatus()
-  {
-    return $this->servingStatus;
-  }
-  public function setThreadsafe($threadsafe)
-  {
-    $this->threadsafe = $threadsafe;
-  }
-  public function getThreadsafe()
-  {
-    return $this->threadsafe;
-  }
-  public function setVersionUrl($versionUrl)
-  {
-    $this->versionUrl = $versionUrl;
-  }
-  public function getVersionUrl()
-  {
-    return $this->versionUrl;
-  }
-  public function setVm($vm)
-  {
-    $this->vm = $vm;
-  }
-  public function getVm()
-  {
-    return $this->vm;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Appengine/Volume.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Appengine/Volume.php
deleted file mode 100644
index bc491dd7..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Appengine/Volume.php
+++ /dev/null
@@ -1,48 +0,0 @@
-name = $name;
-  }
-  public function getName()
-  {
-    return $this->name;
-  }
-  public function setSizeGb($sizeGb)
-  {
-    $this->sizeGb = $sizeGb;
-  }
-  public function getSizeGb()
-  {
-    return $this->sizeGb;
-  }
-  public function setVolumeType($volumeType)
-  {
-    $this->volumeType = $volumeType;
-  }
-  public function getVolumeType()
-  {
-    return $this->volumeType;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Appengine/ZipInfo.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Appengine/ZipInfo.php
deleted file mode 100644
index f2c6cc31..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Appengine/ZipInfo.php
+++ /dev/null
@@ -1,39 +0,0 @@
-filesCount = $filesCount;
-  }
-  public function getFilesCount()
-  {
-    return $this->filesCount;
-  }
-  public function setSourceUrl($sourceUrl)
-  {
-    $this->sourceUrl = $sourceUrl;
-  }
-  public function getSourceUrl()
-  {
-    return $this->sourceUrl;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Appsactivity.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Appsactivity.php
deleted file mode 100644
index 95cb3065..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Appsactivity.php
+++ /dev/null
@@ -1,108 +0,0 @@
-
- * Provides a historical view of activity.

- *
- * 

- * For more information about this service, see the API
- * Documentation
- * 

- *
- * @author Google, Inc.
- */
-class Google_Service_Appsactivity extends Google_Service
-{
-  /** View the activity history of your Google apps. */
-  const ACTIVITY =
-      "https://www.googleapis.com/auth/activity";
-  /** View and manage the files in your Google Drive. */
-  const DRIVE =
-      "https://www.googleapis.com/auth/drive";
-  /** View and manage metadata of files in your Google Drive. */
-  const DRIVE_METADATA =
-      "https://www.googleapis.com/auth/drive.metadata";
-  /** View metadata for files in your Google Drive. */
-  const DRIVE_METADATA_READONLY =
-      "https://www.googleapis.com/auth/drive.metadata.readonly";
-  /** View the files in your Google Drive. */
-  const DRIVE_READONLY =
-      "https://www.googleapis.com/auth/drive.readonly";
-
-  public $activities;
-  
-  /**
-   * Constructs the internal representation of the Appsactivity service.
-   *
-   * @param Google_Client $client
-   */
-  public function __construct(Google_Client $client)
-  {
-    parent::__construct($client);
-    $this->rootUrl = 'https://www.googleapis.com/';
-    $this->servicePath = 'appsactivity/v1/';
-    $this->version = 'v1';
-    $this->serviceName = 'appsactivity';
-
-    $this->activities = new Google_Service_Appsactivity_Resource_Activities(
-        $this,
-        $this->serviceName,
-        'activities',
-        array(
-          'methods' => array(
-            'list' => array(
-              'path' => 'activities',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'drive.ancestorId' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'drive.fileId' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'groupingStrategy' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'pageSize' => array(
-                  'location' => 'query',
-                  'type' => 'integer',
-                ),
-                'pageToken' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'source' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'userId' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-              ),
-            ),
-          )
-        )
-    );
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Appsactivity/Activity.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Appsactivity/Activity.php
deleted file mode 100644
index 0e854bde..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Appsactivity/Activity.php
+++ /dev/null
@@ -1,42 +0,0 @@
-combinedEvent = $combinedEvent;
-  }
-  public function getCombinedEvent()
-  {
-    return $this->combinedEvent;
-  }
-  public function setSingleEvents($singleEvents)
-  {
-    $this->singleEvents = $singleEvents;
-  }
-  public function getSingleEvents()
-  {
-    return $this->singleEvents;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Appsactivity/AppsactivityParent.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Appsactivity/AppsactivityParent.php
deleted file mode 100644
index 25564618..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Appsactivity/AppsactivityParent.php
+++ /dev/null
@@ -1,48 +0,0 @@
-id = $id;
-  }
-  public function getId()
-  {
-    return $this->id;
-  }
-  public function setIsRoot($isRoot)
-  {
-    $this->isRoot = $isRoot;
-  }
-  public function getIsRoot()
-  {
-    return $this->isRoot;
-  }
-  public function setTitle($title)
-  {
-    $this->title = $title;
-  }
-  public function getTitle()
-  {
-    return $this->title;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Appsactivity/Event.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Appsactivity/Event.php
deleted file mode 100644
index 26a99881..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Appsactivity/Event.php
+++ /dev/null
@@ -1,108 +0,0 @@
-additionalEventTypes = $additionalEventTypes;
-  }
-  public function getAdditionalEventTypes()
-  {
-    return $this->additionalEventTypes;
-  }
-  public function setEventTimeMillis($eventTimeMillis)
-  {
-    $this->eventTimeMillis = $eventTimeMillis;
-  }
-  public function getEventTimeMillis()
-  {
-    return $this->eventTimeMillis;
-  }
-  public function setFromUserDeletion($fromUserDeletion)
-  {
-    $this->fromUserDeletion = $fromUserDeletion;
-  }
-  public function getFromUserDeletion()
-  {
-    return $this->fromUserDeletion;
-  }
-  public function setMove(Google_Service_Appsactivity_Move $move)
-  {
-    $this->move = $move;
-  }
-  public function getMove()
-  {
-    return $this->move;
-  }
-  public function setPermissionChanges($permissionChanges)
-  {
-    $this->permissionChanges = $permissionChanges;
-  }
-  public function getPermissionChanges()
-  {
-    return $this->permissionChanges;
-  }
-  public function setPrimaryEventType($primaryEventType)
-  {
-    $this->primaryEventType = $primaryEventType;
-  }
-  public function getPrimaryEventType()
-  {
-    return $this->primaryEventType;
-  }
-  public function setRename(Google_Service_Appsactivity_Rename $rename)
-  {
-    $this->rename = $rename;
-  }
-  public function getRename()
-  {
-    return $this->rename;
-  }
-  public function setTarget(Google_Service_Appsactivity_Target $target)
-  {
-    $this->target = $target;
-  }
-  public function getTarget()
-  {
-    return $this->target;
-  }
-  public function setUser(Google_Service_Appsactivity_User $user)
-  {
-    $this->user = $user;
-  }
-  public function getUser()
-  {
-    return $this->user;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Appsactivity/ListActivitiesResponse.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Appsactivity/ListActivitiesResponse.php
deleted file mode 100644
index 2a82e889..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Appsactivity/ListActivitiesResponse.php
+++ /dev/null
@@ -1,41 +0,0 @@
-activities = $activities;
-  }
-  public function getActivities()
-  {
-    return $this->activities;
-  }
-  public function setNextPageToken($nextPageToken)
-  {
-    $this->nextPageToken = $nextPageToken;
-  }
-  public function getNextPageToken()
-  {
-    return $this->nextPageToken;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Appsactivity/Move.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Appsactivity/Move.php
deleted file mode 100644
index 48c08dd0..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Appsactivity/Move.php
+++ /dev/null
@@ -1,42 +0,0 @@
-addedParents = $addedParents;
-  }
-  public function getAddedParents()
-  {
-    return $this->addedParents;
-  }
-  public function setRemovedParents($removedParents)
-  {
-    $this->removedParents = $removedParents;
-  }
-  public function getRemovedParents()
-  {
-    return $this->removedParents;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Appsactivity/Permission.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Appsactivity/Permission.php
deleted file mode 100644
index 6fec4049..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Appsactivity/Permission.php
+++ /dev/null
@@ -1,76 +0,0 @@
-name = $name;
-  }
-  public function getName()
-  {
-    return $this->name;
-  }
-  public function setPermissionId($permissionId)
-  {
-    $this->permissionId = $permissionId;
-  }
-  public function getPermissionId()
-  {
-    return $this->permissionId;
-  }
-  public function setRole($role)
-  {
-    $this->role = $role;
-  }
-  public function getRole()
-  {
-    return $this->role;
-  }
-  public function setType($type)
-  {
-    $this->type = $type;
-  }
-  public function getType()
-  {
-    return $this->type;
-  }
-  public function setUser(Google_Service_Appsactivity_User $user)
-  {
-    $this->user = $user;
-  }
-  public function getUser()
-  {
-    return $this->user;
-  }
-  public function setWithLink($withLink)
-  {
-    $this->withLink = $withLink;
-  }
-  public function getWithLink()
-  {
-    return $this->withLink;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Appsactivity/PermissionChange.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Appsactivity/PermissionChange.php
deleted file mode 100644
index f070e9eb..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Appsactivity/PermissionChange.php
+++ /dev/null
@@ -1,42 +0,0 @@
-addedPermissions = $addedPermissions;
-  }
-  public function getAddedPermissions()
-  {
-    return $this->addedPermissions;
-  }
-  public function setRemovedPermissions($removedPermissions)
-  {
-    $this->removedPermissions = $removedPermissions;
-  }
-  public function getRemovedPermissions()
-  {
-    return $this->removedPermissions;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Appsactivity/Photo.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Appsactivity/Photo.php
deleted file mode 100644
index 6bb27174..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Appsactivity/Photo.php
+++ /dev/null
@@ -1,30 +0,0 @@
-url = $url;
-  }
-  public function getUrl()
-  {
-    return $this->url;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Appsactivity/Rename.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Appsactivity/Rename.php
deleted file mode 100644
index 1e714abc..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Appsactivity/Rename.php
+++ /dev/null
@@ -1,39 +0,0 @@
-newTitle = $newTitle;
-  }
-  public function getNewTitle()
-  {
-    return $this->newTitle;
-  }
-  public function setOldTitle($oldTitle)
-  {
-    $this->oldTitle = $oldTitle;
-  }
-  public function getOldTitle()
-  {
-    return $this->oldTitle;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Appsactivity/Resource/Activities.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Appsactivity/Resource/Activities.php
deleted file mode 100644
index d5589f66..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Appsactivity/Resource/Activities.php
+++ /dev/null
@@ -1,59 +0,0 @@
-
- *   $appsactivityService = new Google_Service_Appsactivity(...);
- *   $activities = $appsactivityService->activities;
- *  
- */
-class Google_Service_Appsactivity_Resource_Activities extends Google_Service_Resource
-{
-  /**
-   * Returns a list of activities visible to the current logged in user. Visible
-   * activities are determined by the visiblity settings of the object that was
-   * acted on, e.g. Drive files a user can see. An activity is a record of past
-   * events. Multiple events may be merged if they are similar. A request is
-   * scoped to activities from a given Google service using the source parameter.
-   * (activities.listActivities)
-   *
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param string drive.ancestorId Identifies the Drive folder containing the
-   * items for which to return activities.
-   * @opt_param string drive.fileId Identifies the Drive item to return activities
-   * for.
-   * @opt_param string groupingStrategy Indicates the strategy to use when
-   * grouping singleEvents items in the associated combinedEvent object.
-   * @opt_param int pageSize The maximum number of events to return on a page. The
-   * response includes a continuation token if there are more events.
-   * @opt_param string pageToken A token to retrieve a specific page of results.
-   * @opt_param string source The Google service from which to return activities.
-   * Possible values of source are: - drive.google.com
-   * @opt_param string userId Indicates the user to return activity for. Use the
-   * special value me to indicate the currently authenticated user.
-   * @return Google_Service_Appsactivity_ListActivitiesResponse
-   */
-  public function listActivities($optParams = array())
-  {
-    $params = array();
-    $params = array_merge($params, $optParams);
-    return $this->call('list', array($params), "Google_Service_Appsactivity_ListActivitiesResponse");
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Appsactivity/Target.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Appsactivity/Target.php
deleted file mode 100644
index a4d3107a..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Appsactivity/Target.php
+++ /dev/null
@@ -1,48 +0,0 @@
-id = $id;
-  }
-  public function getId()
-  {
-    return $this->id;
-  }
-  public function setMimeType($mimeType)
-  {
-    $this->mimeType = $mimeType;
-  }
-  public function getMimeType()
-  {
-    return $this->mimeType;
-  }
-  public function setName($name)
-  {
-    $this->name = $name;
-  }
-  public function getName()
-  {
-    return $this->name;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Appsactivity/User.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Appsactivity/User.php
deleted file mode 100644
index e0d2de4b..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Appsactivity/User.php
+++ /dev/null
@@ -1,67 +0,0 @@
-isDeleted = $isDeleted;
-  }
-  public function getIsDeleted()
-  {
-    return $this->isDeleted;
-  }
-  public function setIsMe($isMe)
-  {
-    $this->isMe = $isMe;
-  }
-  public function getIsMe()
-  {
-    return $this->isMe;
-  }
-  public function setName($name)
-  {
-    $this->name = $name;
-  }
-  public function getName()
-  {
-    return $this->name;
-  }
-  public function setPermissionId($permissionId)
-  {
-    $this->permissionId = $permissionId;
-  }
-  public function getPermissionId()
-  {
-    return $this->permissionId;
-  }
-  public function setPhoto(Google_Service_Appsactivity_Photo $photo)
-  {
-    $this->photo = $photo;
-  }
-  public function getPhoto()
-  {
-    return $this->photo;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Autoscaler.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Autoscaler.php
deleted file mode 100644
index 619cb66e..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Autoscaler.php
+++ /dev/null
@@ -1,299 +0,0 @@
-
- * The Google Compute Engine Autoscaler API provides autoscaling for groups of
- * Cloud VMs.

- *
- * 

- * For more information about this service, see the API
- * Documentation
- * 

- *
- * @author Google, Inc.
- */
-class Google_Service_Autoscaler extends Google_Service
-{
-  /** View and manage your Google Compute Engine resources. */
-  const COMPUTE =
-      "https://www.googleapis.com/auth/compute";
-  /** View your Google Compute Engine resources. */
-  const COMPUTE_READONLY =
-      "https://www.googleapis.com/auth/compute.readonly";
-
-  public $autoscalers;
-  public $zoneOperations;
-  public $zones;
-  
-  /**
-   * Constructs the internal representation of the Autoscaler service.
-   *
-   * @param Google_Client $client
-   */
-  public function __construct(Google_Client $client)
-  {
-    parent::__construct($client);
-    $this->rootUrl = 'https://www.googleapis.com/';
-    $this->servicePath = 'autoscaler/v1beta2/';
-    $this->version = 'v1beta2';
-    $this->serviceName = 'autoscaler';
-
-    $this->autoscalers = new Google_Service_Autoscaler_Resource_Autoscalers(
-        $this,
-        $this->serviceName,
-        'autoscalers',
-        array(
-          'methods' => array(
-            'delete' => array(
-              'path' => 'projects/{project}/zones/{zone}/autoscalers/{autoscaler}',
-              'httpMethod' => 'DELETE',
-              'parameters' => array(
-                'project' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'zone' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'autoscaler' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'get' => array(
-              'path' => 'projects/{project}/zones/{zone}/autoscalers/{autoscaler}',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'project' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'zone' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'autoscaler' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'insert' => array(
-              'path' => 'projects/{project}/zones/{zone}/autoscalers',
-              'httpMethod' => 'POST',
-              'parameters' => array(
-                'project' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'zone' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'list' => array(
-              'path' => 'projects/{project}/zones/{zone}/autoscalers',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'project' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'zone' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'filter' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'maxResults' => array(
-                  'location' => 'query',
-                  'type' => 'integer',
-                ),
-                'pageToken' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-              ),
-            ),'patch' => array(
-              'path' => 'projects/{project}/zones/{zone}/autoscalers/{autoscaler}',
-              'httpMethod' => 'PATCH',
-              'parameters' => array(
-                'project' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'zone' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'autoscaler' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'update' => array(
-              'path' => 'projects/{project}/zones/{zone}/autoscalers/{autoscaler}',
-              'httpMethod' => 'PUT',
-              'parameters' => array(
-                'project' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'zone' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'autoscaler' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),
-          )
-        )
-    );
-    $this->zoneOperations = new Google_Service_Autoscaler_Resource_ZoneOperations(
-        $this,
-        $this->serviceName,
-        'zoneOperations',
-        array(
-          'methods' => array(
-            'delete' => array(
-              'path' => '{project}/zones/{zone}/operations/{operation}',
-              'httpMethod' => 'DELETE',
-              'parameters' => array(
-                'project' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'zone' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'operation' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'get' => array(
-              'path' => '{project}/zones/{zone}/operations/{operation}',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'project' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'zone' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'operation' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'list' => array(
-              'path' => '{project}/zones/{zone}/operations',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'project' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'zone' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'filter' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'maxResults' => array(
-                  'location' => 'query',
-                  'type' => 'integer',
-                ),
-                'pageToken' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-              ),
-            ),
-          )
-        )
-    );
-    $this->zones = new Google_Service_Autoscaler_Resource_Zones(
-        $this,
-        $this->serviceName,
-        'zones',
-        array(
-          'methods' => array(
-            'list' => array(
-              'path' => 'zones',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'filter' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'maxResults' => array(
-                  'location' => 'query',
-                  'type' => 'integer',
-                ),
-                'pageToken' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'project' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-              ),
-            ),
-          )
-        )
-    );
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Autoscaler/Autoscaler.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Autoscaler/Autoscaler.php
deleted file mode 100644
index be348120..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Autoscaler/Autoscaler.php
+++ /dev/null
@@ -1,94 +0,0 @@
-autoscalingPolicy = $autoscalingPolicy;
-  }
-  public function getAutoscalingPolicy()
-  {
-    return $this->autoscalingPolicy;
-  }
-  public function setCreationTimestamp($creationTimestamp)
-  {
-    $this->creationTimestamp = $creationTimestamp;
-  }
-  public function getCreationTimestamp()
-  {
-    return $this->creationTimestamp;
-  }
-  public function setDescription($description)
-  {
-    $this->description = $description;
-  }
-  public function getDescription()
-  {
-    return $this->description;
-  }
-  public function setId($id)
-  {
-    $this->id = $id;
-  }
-  public function getId()
-  {
-    return $this->id;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setName($name)
-  {
-    $this->name = $name;
-  }
-  public function getName()
-  {
-    return $this->name;
-  }
-  public function setSelfLink($selfLink)
-  {
-    $this->selfLink = $selfLink;
-  }
-  public function getSelfLink()
-  {
-    return $this->selfLink;
-  }
-  public function setTarget($target)
-  {
-    $this->target = $target;
-  }
-  public function getTarget()
-  {
-    return $this->target;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Autoscaler/AutoscalerListResponse.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Autoscaler/AutoscalerListResponse.php
deleted file mode 100644
index b677647c..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Autoscaler/AutoscalerListResponse.php
+++ /dev/null
@@ -1,50 +0,0 @@
-items = $items;
-  }
-  public function getItems()
-  {
-    return $this->items;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setNextPageToken($nextPageToken)
-  {
-    $this->nextPageToken = $nextPageToken;
-  }
-  public function getNextPageToken()
-  {
-    return $this->nextPageToken;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Autoscaler/AutoscalingPolicy.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Autoscaler/AutoscalingPolicy.php
deleted file mode 100644
index c76b696f..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Autoscaler/AutoscalingPolicy.php
+++ /dev/null
@@ -1,79 +0,0 @@
-coolDownPeriodSec = $coolDownPeriodSec;
-  }
-  public function getCoolDownPeriodSec()
-  {
-    return $this->coolDownPeriodSec;
-  }
-  public function setCpuUtilization(Google_Service_Autoscaler_AutoscalingPolicyCpuUtilization $cpuUtilization)
-  {
-    $this->cpuUtilization = $cpuUtilization;
-  }
-  public function getCpuUtilization()
-  {
-    return $this->cpuUtilization;
-  }
-  public function setCustomMetricUtilizations($customMetricUtilizations)
-  {
-    $this->customMetricUtilizations = $customMetricUtilizations;
-  }
-  public function getCustomMetricUtilizations()
-  {
-    return $this->customMetricUtilizations;
-  }
-  public function setLoadBalancingUtilization(Google_Service_Autoscaler_AutoscalingPolicyLoadBalancingUtilization $loadBalancingUtilization)
-  {
-    $this->loadBalancingUtilization = $loadBalancingUtilization;
-  }
-  public function getLoadBalancingUtilization()
-  {
-    return $this->loadBalancingUtilization;
-  }
-  public function setMaxNumReplicas($maxNumReplicas)
-  {
-    $this->maxNumReplicas = $maxNumReplicas;
-  }
-  public function getMaxNumReplicas()
-  {
-    return $this->maxNumReplicas;
-  }
-  public function setMinNumReplicas($minNumReplicas)
-  {
-    $this->minNumReplicas = $minNumReplicas;
-  }
-  public function getMinNumReplicas()
-  {
-    return $this->minNumReplicas;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Autoscaler/AutoscalingPolicyCpuUtilization.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Autoscaler/AutoscalingPolicyCpuUtilization.php
deleted file mode 100644
index ef1600a6..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Autoscaler/AutoscalingPolicyCpuUtilization.php
+++ /dev/null
@@ -1,30 +0,0 @@
-utilizationTarget = $utilizationTarget;
-  }
-  public function getUtilizationTarget()
-  {
-    return $this->utilizationTarget;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Autoscaler/AutoscalingPolicyCustomMetricUtilization.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Autoscaler/AutoscalingPolicyCustomMetricUtilization.php
deleted file mode 100644
index 32603dd6..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Autoscaler/AutoscalingPolicyCustomMetricUtilization.php
+++ /dev/null
@@ -1,48 +0,0 @@
-metric = $metric;
-  }
-  public function getMetric()
-  {
-    return $this->metric;
-  }
-  public function setUtilizationTarget($utilizationTarget)
-  {
-    $this->utilizationTarget = $utilizationTarget;
-  }
-  public function getUtilizationTarget()
-  {
-    return $this->utilizationTarget;
-  }
-  public function setUtilizationTargetType($utilizationTargetType)
-  {
-    $this->utilizationTargetType = $utilizationTargetType;
-  }
-  public function getUtilizationTargetType()
-  {
-    return $this->utilizationTargetType;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Autoscaler/AutoscalingPolicyLoadBalancingUtilization.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Autoscaler/AutoscalingPolicyLoadBalancingUtilization.php
deleted file mode 100644
index c608a0fd..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Autoscaler/AutoscalingPolicyLoadBalancingUtilization.php
+++ /dev/null
@@ -1,30 +0,0 @@
-utilizationTarget = $utilizationTarget;
-  }
-  public function getUtilizationTarget()
-  {
-    return $this->utilizationTarget;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Autoscaler/DeprecationStatus.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Autoscaler/DeprecationStatus.php
deleted file mode 100644
index 38c0db66..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Autoscaler/DeprecationStatus.php
+++ /dev/null
@@ -1,66 +0,0 @@
-deleted = $deleted;
-  }
-  public function getDeleted()
-  {
-    return $this->deleted;
-  }
-  public function setDeprecated($deprecated)
-  {
-    $this->deprecated = $deprecated;
-  }
-  public function getDeprecated()
-  {
-    return $this->deprecated;
-  }
-  public function setObsolete($obsolete)
-  {
-    $this->obsolete = $obsolete;
-  }
-  public function getObsolete()
-  {
-    return $this->obsolete;
-  }
-  public function setReplacement($replacement)
-  {
-    $this->replacement = $replacement;
-  }
-  public function getReplacement()
-  {
-    return $this->replacement;
-  }
-  public function setState($state)
-  {
-    $this->state = $state;
-  }
-  public function getState()
-  {
-    return $this->state;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Autoscaler/Operation.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Autoscaler/Operation.php
deleted file mode 100644
index af096dab..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Autoscaler/Operation.php
+++ /dev/null
@@ -1,231 +0,0 @@
-clientOperationId = $clientOperationId;
-  }
-  public function getClientOperationId()
-  {
-    return $this->clientOperationId;
-  }
-  public function setCreationTimestamp($creationTimestamp)
-  {
-    $this->creationTimestamp = $creationTimestamp;
-  }
-  public function getCreationTimestamp()
-  {
-    return $this->creationTimestamp;
-  }
-  public function setDescription($description)
-  {
-    $this->description = $description;
-  }
-  public function getDescription()
-  {
-    return $this->description;
-  }
-  public function setEndTime($endTime)
-  {
-    $this->endTime = $endTime;
-  }
-  public function getEndTime()
-  {
-    return $this->endTime;
-  }
-  public function setError(Google_Service_Autoscaler_OperationError $error)
-  {
-    $this->error = $error;
-  }
-  public function getError()
-  {
-    return $this->error;
-  }
-  public function setHttpErrorMessage($httpErrorMessage)
-  {
-    $this->httpErrorMessage = $httpErrorMessage;
-  }
-  public function getHttpErrorMessage()
-  {
-    return $this->httpErrorMessage;
-  }
-  public function setHttpErrorStatusCode($httpErrorStatusCode)
-  {
-    $this->httpErrorStatusCode = $httpErrorStatusCode;
-  }
-  public function getHttpErrorStatusCode()
-  {
-    return $this->httpErrorStatusCode;
-  }
-  public function setId($id)
-  {
-    $this->id = $id;
-  }
-  public function getId()
-  {
-    return $this->id;
-  }
-  public function setInsertTime($insertTime)
-  {
-    $this->insertTime = $insertTime;
-  }
-  public function getInsertTime()
-  {
-    return $this->insertTime;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setName($name)
-  {
-    $this->name = $name;
-  }
-  public function getName()
-  {
-    return $this->name;
-  }
-  public function setOperationType($operationType)
-  {
-    $this->operationType = $operationType;
-  }
-  public function getOperationType()
-  {
-    return $this->operationType;
-  }
-  public function setProgress($progress)
-  {
-    $this->progress = $progress;
-  }
-  public function getProgress()
-  {
-    return $this->progress;
-  }
-  public function setRegion($region)
-  {
-    $this->region = $region;
-  }
-  public function getRegion()
-  {
-    return $this->region;
-  }
-  public function setSelfLink($selfLink)
-  {
-    $this->selfLink = $selfLink;
-  }
-  public function getSelfLink()
-  {
-    return $this->selfLink;
-  }
-  public function setStartTime($startTime)
-  {
-    $this->startTime = $startTime;
-  }
-  public function getStartTime()
-  {
-    return $this->startTime;
-  }
-  public function setStatus($status)
-  {
-    $this->status = $status;
-  }
-  public function getStatus()
-  {
-    return $this->status;
-  }
-  public function setStatusMessage($statusMessage)
-  {
-    $this->statusMessage = $statusMessage;
-  }
-  public function getStatusMessage()
-  {
-    return $this->statusMessage;
-  }
-  public function setTargetId($targetId)
-  {
-    $this->targetId = $targetId;
-  }
-  public function getTargetId()
-  {
-    return $this->targetId;
-  }
-  public function setTargetLink($targetLink)
-  {
-    $this->targetLink = $targetLink;
-  }
-  public function getTargetLink()
-  {
-    return $this->targetLink;
-  }
-  public function setUser($user)
-  {
-    $this->user = $user;
-  }
-  public function getUser()
-  {
-    return $this->user;
-  }
-  public function setWarnings($warnings)
-  {
-    $this->warnings = $warnings;
-  }
-  public function getWarnings()
-  {
-    return $this->warnings;
-  }
-  public function setZone($zone)
-  {
-    $this->zone = $zone;
-  }
-  public function getZone()
-  {
-    return $this->zone;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Autoscaler/OperationError.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Autoscaler/OperationError.php
deleted file mode 100644
index c9a5f2e3..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Autoscaler/OperationError.php
+++ /dev/null
@@ -1,32 +0,0 @@
-errors = $errors;
-  }
-  public function getErrors()
-  {
-    return $this->errors;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Autoscaler/OperationErrorErrors.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Autoscaler/OperationErrorErrors.php
deleted file mode 100644
index c40d2332..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Autoscaler/OperationErrorErrors.php
+++ /dev/null
@@ -1,48 +0,0 @@
-code = $code;
-  }
-  public function getCode()
-  {
-    return $this->code;
-  }
-  public function setLocation($location)
-  {
-    $this->location = $location;
-  }
-  public function getLocation()
-  {
-    return $this->location;
-  }
-  public function setMessage($message)
-  {
-    $this->message = $message;
-  }
-  public function getMessage()
-  {
-    return $this->message;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Autoscaler/OperationList.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Autoscaler/OperationList.php
deleted file mode 100644
index 516a9086..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Autoscaler/OperationList.php
+++ /dev/null
@@ -1,68 +0,0 @@
-id = $id;
-  }
-  public function getId()
-  {
-    return $this->id;
-  }
-  public function setItems($items)
-  {
-    $this->items = $items;
-  }
-  public function getItems()
-  {
-    return $this->items;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setNextPageToken($nextPageToken)
-  {
-    $this->nextPageToken = $nextPageToken;
-  }
-  public function getNextPageToken()
-  {
-    return $this->nextPageToken;
-  }
-  public function setSelfLink($selfLink)
-  {
-    $this->selfLink = $selfLink;
-  }
-  public function getSelfLink()
-  {
-    return $this->selfLink;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Autoscaler/OperationWarnings.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Autoscaler/OperationWarnings.php
deleted file mode 100644
index 76118225..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Autoscaler/OperationWarnings.php
+++ /dev/null
@@ -1,50 +0,0 @@
-code = $code;
-  }
-  public function getCode()
-  {
-    return $this->code;
-  }
-  public function setData($data)
-  {
-    $this->data = $data;
-  }
-  public function getData()
-  {
-    return $this->data;
-  }
-  public function setMessage($message)
-  {
-    $this->message = $message;
-  }
-  public function getMessage()
-  {
-    return $this->message;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Autoscaler/OperationWarningsData.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Autoscaler/OperationWarningsData.php
deleted file mode 100644
index 1dffa0bb..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Autoscaler/OperationWarningsData.php
+++ /dev/null
@@ -1,39 +0,0 @@
-key = $key;
-  }
-  public function getKey()
-  {
-    return $this->key;
-  }
-  public function setValue($value)
-  {
-    $this->value = $value;
-  }
-  public function getValue()
-  {
-    return $this->value;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Autoscaler/Resource/Autoscalers.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Autoscaler/Resource/Autoscalers.php
deleted file mode 100644
index 55d7a712..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Autoscaler/Resource/Autoscalers.php
+++ /dev/null
@@ -1,124 +0,0 @@
-
- *   $autoscalerService = new Google_Service_Autoscaler(...);
- *   $autoscalers = $autoscalerService->autoscalers;
- *  
- */
-class Google_Service_Autoscaler_Resource_Autoscalers extends Google_Service_Resource
-{
-  /**
-   * Deletes the specified Autoscaler resource. (autoscalers.delete)
-   *
-   * @param string $project Project ID of Autoscaler resource.
-   * @param string $zone Zone name of Autoscaler resource.
-   * @param string $autoscaler Name of the Autoscaler resource.
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Autoscaler_Operation
-   */
-  public function delete($project, $zone, $autoscaler, $optParams = array())
-  {
-    $params = array('project' => $project, 'zone' => $zone, 'autoscaler' => $autoscaler);
-    $params = array_merge($params, $optParams);
-    return $this->call('delete', array($params), "Google_Service_Autoscaler_Operation");
-  }
-  /**
-   * Gets the specified Autoscaler resource. (autoscalers.get)
-   *
-   * @param string $project Project ID of Autoscaler resource.
-   * @param string $zone Zone name of Autoscaler resource.
-   * @param string $autoscaler Name of the Autoscaler resource.
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Autoscaler_Autoscaler
-   */
-  public function get($project, $zone, $autoscaler, $optParams = array())
-  {
-    $params = array('project' => $project, 'zone' => $zone, 'autoscaler' => $autoscaler);
-    $params = array_merge($params, $optParams);
-    return $this->call('get', array($params), "Google_Service_Autoscaler_Autoscaler");
-  }
-  /**
-   * Adds new Autoscaler resource. (autoscalers.insert)
-   *
-   * @param string $project Project ID of Autoscaler resource.
-   * @param string $zone Zone name of Autoscaler resource.
-   * @param Google_Service_Autoscaler_Autoscaler $postBody
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Autoscaler_Operation
-   */
-  public function insert($project, $zone, Google_Service_Autoscaler_Autoscaler $postBody, $optParams = array())
-  {
-    $params = array('project' => $project, 'zone' => $zone, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('insert', array($params), "Google_Service_Autoscaler_Operation");
-  }
-  /**
-   * Lists all Autoscaler resources in this zone. (autoscalers.listAutoscalers)
-   *
-   * @param string $project Project ID of Autoscaler resource.
-   * @param string $zone Zone name of Autoscaler resource.
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param string filter
-   * @opt_param string maxResults
-   * @opt_param string pageToken
-   * @return Google_Service_Autoscaler_AutoscalerListResponse
-   */
-  public function listAutoscalers($project, $zone, $optParams = array())
-  {
-    $params = array('project' => $project, 'zone' => $zone);
-    $params = array_merge($params, $optParams);
-    return $this->call('list', array($params), "Google_Service_Autoscaler_AutoscalerListResponse");
-  }
-  /**
-   * Update the entire content of the Autoscaler resource. This method supports
-   * patch semantics. (autoscalers.patch)
-   *
-   * @param string $project Project ID of Autoscaler resource.
-   * @param string $zone Zone name of Autoscaler resource.
-   * @param string $autoscaler Name of the Autoscaler resource.
-   * @param Google_Service_Autoscaler_Autoscaler $postBody
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Autoscaler_Operation
-   */
-  public function patch($project, $zone, $autoscaler, Google_Service_Autoscaler_Autoscaler $postBody, $optParams = array())
-  {
-    $params = array('project' => $project, 'zone' => $zone, 'autoscaler' => $autoscaler, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('patch', array($params), "Google_Service_Autoscaler_Operation");
-  }
-  /**
-   * Update the entire content of the Autoscaler resource. (autoscalers.update)
-   *
-   * @param string $project Project ID of Autoscaler resource.
-   * @param string $zone Zone name of Autoscaler resource.
-   * @param string $autoscaler Name of the Autoscaler resource.
-   * @param Google_Service_Autoscaler_Autoscaler $postBody
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Autoscaler_Operation
-   */
-  public function update($project, $zone, $autoscaler, Google_Service_Autoscaler_Autoscaler $postBody, $optParams = array())
-  {
-    $params = array('project' => $project, 'zone' => $zone, 'autoscaler' => $autoscaler, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('update', array($params), "Google_Service_Autoscaler_Operation");
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Autoscaler/Resource/ZoneOperations.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Autoscaler/Resource/ZoneOperations.php
deleted file mode 100644
index 0452efe5..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Autoscaler/Resource/ZoneOperations.php
+++ /dev/null
@@ -1,78 +0,0 @@
-
- *   $autoscalerService = new Google_Service_Autoscaler(...);
- *   $zoneOperations = $autoscalerService->zoneOperations;
- *  
- */
-class Google_Service_Autoscaler_Resource_ZoneOperations extends Google_Service_Resource
-{
-  /**
-   * Deletes the specified zone-specific operation resource.
-   * (zoneOperations.delete)
-   *
-   * @param string $project
-   * @param string $zone
-   * @param string $operation
-   * @param array $optParams Optional parameters.
-   */
-  public function delete($project, $zone, $operation, $optParams = array())
-  {
-    $params = array('project' => $project, 'zone' => $zone, 'operation' => $operation);
-    $params = array_merge($params, $optParams);
-    return $this->call('delete', array($params));
-  }
-  /**
-   * Retrieves the specified zone-specific operation resource.
-   * (zoneOperations.get)
-   *
-   * @param string $project
-   * @param string $zone
-   * @param string $operation
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Autoscaler_Operation
-   */
-  public function get($project, $zone, $operation, $optParams = array())
-  {
-    $params = array('project' => $project, 'zone' => $zone, 'operation' => $operation);
-    $params = array_merge($params, $optParams);
-    return $this->call('get', array($params), "Google_Service_Autoscaler_Operation");
-  }
-  /**
-   * Retrieves the list of operation resources contained within the specified
-   * zone. (zoneOperations.listZoneOperations)
-   *
-   * @param string $project
-   * @param string $zone
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param string filter
-   * @opt_param string maxResults
-   * @opt_param string pageToken
-   * @return Google_Service_Autoscaler_OperationList
-   */
-  public function listZoneOperations($project, $zone, $optParams = array())
-  {
-    $params = array('project' => $project, 'zone' => $zone);
-    $params = array_merge($params, $optParams);
-    return $this->call('list', array($params), "Google_Service_Autoscaler_OperationList");
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Autoscaler/Resource/Zones.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Autoscaler/Resource/Zones.php
deleted file mode 100644
index 33c0c832..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Autoscaler/Resource/Zones.php
+++ /dev/null
@@ -1,45 +0,0 @@
-
- *   $autoscalerService = new Google_Service_Autoscaler(...);
- *   $zones = $autoscalerService->zones;
- *  
- */
-class Google_Service_Autoscaler_Resource_Zones extends Google_Service_Resource
-{
-  /**
-   * (zones.listZones)
-   *
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param string filter
-   * @opt_param string maxResults
-   * @opt_param string pageToken
-   * @opt_param string project
-   * @return Google_Service_Autoscaler_ZoneList
-   */
-  public function listZones($optParams = array())
-  {
-    $params = array();
-    $params = array_merge($params, $optParams);
-    return $this->call('list', array($params), "Google_Service_Autoscaler_ZoneList");
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Autoscaler/Zone.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Autoscaler/Zone.php
deleted file mode 100644
index 2c4fa2b7..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Autoscaler/Zone.php
+++ /dev/null
@@ -1,103 +0,0 @@
-creationTimestamp = $creationTimestamp;
-  }
-  public function getCreationTimestamp()
-  {
-    return $this->creationTimestamp;
-  }
-  public function setDeprecated(Google_Service_Autoscaler_DeprecationStatus $deprecated)
-  {
-    $this->deprecated = $deprecated;
-  }
-  public function getDeprecated()
-  {
-    return $this->deprecated;
-  }
-  public function setDescription($description)
-  {
-    $this->description = $description;
-  }
-  public function getDescription()
-  {
-    return $this->description;
-  }
-  public function setId($id)
-  {
-    $this->id = $id;
-  }
-  public function getId()
-  {
-    return $this->id;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setName($name)
-  {
-    $this->name = $name;
-  }
-  public function getName()
-  {
-    return $this->name;
-  }
-  public function setRegion($region)
-  {
-    $this->region = $region;
-  }
-  public function getRegion()
-  {
-    return $this->region;
-  }
-  public function setSelfLink($selfLink)
-  {
-    $this->selfLink = $selfLink;
-  }
-  public function getSelfLink()
-  {
-    return $this->selfLink;
-  }
-  public function setStatus($status)
-  {
-    $this->status = $status;
-  }
-  public function getStatus()
-  {
-    return $this->status;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Autoscaler/ZoneList.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Autoscaler/ZoneList.php
deleted file mode 100644
index abf42b22..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Autoscaler/ZoneList.php
+++ /dev/null
@@ -1,68 +0,0 @@
-id = $id;
-  }
-  public function getId()
-  {
-    return $this->id;
-  }
-  public function setItems($items)
-  {
-    $this->items = $items;
-  }
-  public function getItems()
-  {
-    return $this->items;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setNextPageToken($nextPageToken)
-  {
-    $this->nextPageToken = $nextPageToken;
-  }
-  public function getNextPageToken()
-  {
-    return $this->nextPageToken;
-  }
-  public function setSelfLink($selfLink)
-  {
-    $this->selfLink = $selfLink;
-  }
-  public function getSelfLink()
-  {
-    return $this->selfLink;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Bigquery.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Bigquery.php
deleted file mode 100644
index 9216e022..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Bigquery.php
+++ /dev/null
@@ -1,520 +0,0 @@
-
- * A data platform for customers to create, manage, share and query data.

- *
- * 

- * For more information about this service, see the API
- * Documentation
- * 

- *
- * @author Google, Inc.
- */
-class Google_Service_Bigquery extends Google_Service
-{
-  /** View and manage your data in Google BigQuery. */
-  const BIGQUERY =
-      "https://www.googleapis.com/auth/bigquery";
-  /** Insert data into Google BigQuery. */
-  const BIGQUERY_INSERTDATA =
-      "https://www.googleapis.com/auth/bigquery.insertdata";
-  /** View and manage your data across Google Cloud Platform services. */
-  const CLOUD_PLATFORM =
-      "https://www.googleapis.com/auth/cloud-platform";
-  /** View your data across Google Cloud Platform services. */
-  const CLOUD_PLATFORM_READ_ONLY =
-      "https://www.googleapis.com/auth/cloud-platform.read-only";
-  /** Manage your data and permissions in Google Cloud Storage. */
-  const DEVSTORAGE_FULL_CONTROL =
-      "https://www.googleapis.com/auth/devstorage.full_control";
-  /** View your data in Google Cloud Storage. */
-  const DEVSTORAGE_READ_ONLY =
-      "https://www.googleapis.com/auth/devstorage.read_only";
-  /** Manage your data in Google Cloud Storage. */
-  const DEVSTORAGE_READ_WRITE =
-      "https://www.googleapis.com/auth/devstorage.read_write";
-
-  public $datasets;
-  public $jobs;
-  public $projects;
-  public $tabledata;
-  public $tables;
-  
-  /**
-   * Constructs the internal representation of the Bigquery service.
-   *
-   * @param Google_Client $client
-   */
-  public function __construct(Google_Client $client)
-  {
-    parent::__construct($client);
-    $this->rootUrl = 'https://www.googleapis.com/';
-    $this->servicePath = 'bigquery/v2/';
-    $this->version = 'v2';
-    $this->serviceName = 'bigquery';
-
-    $this->datasets = new Google_Service_Bigquery_Resource_Datasets(
-        $this,
-        $this->serviceName,
-        'datasets',
-        array(
-          'methods' => array(
-            'delete' => array(
-              'path' => 'projects/{projectId}/datasets/{datasetId}',
-              'httpMethod' => 'DELETE',
-              'parameters' => array(
-                'projectId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'datasetId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'deleteContents' => array(
-                  'location' => 'query',
-                  'type' => 'boolean',
-                ),
-              ),
-            ),'get' => array(
-              'path' => 'projects/{projectId}/datasets/{datasetId}',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'projectId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'datasetId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'insert' => array(
-              'path' => 'projects/{projectId}/datasets',
-              'httpMethod' => 'POST',
-              'parameters' => array(
-                'projectId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'list' => array(
-              'path' => 'projects/{projectId}/datasets',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'projectId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'all' => array(
-                  'location' => 'query',
-                  'type' => 'boolean',
-                ),
-                'filter' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'maxResults' => array(
-                  'location' => 'query',
-                  'type' => 'integer',
-                ),
-                'pageToken' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-              ),
-            ),'patch' => array(
-              'path' => 'projects/{projectId}/datasets/{datasetId}',
-              'httpMethod' => 'PATCH',
-              'parameters' => array(
-                'projectId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'datasetId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'update' => array(
-              'path' => 'projects/{projectId}/datasets/{datasetId}',
-              'httpMethod' => 'PUT',
-              'parameters' => array(
-                'projectId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'datasetId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),
-          )
-        )
-    );
-    $this->jobs = new Google_Service_Bigquery_Resource_Jobs(
-        $this,
-        $this->serviceName,
-        'jobs',
-        array(
-          'methods' => array(
-            'cancel' => array(
-              'path' => 'projects/{projectId}/jobs/{jobId}/cancel',
-              'httpMethod' => 'POST',
-              'parameters' => array(
-                'projectId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'jobId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'get' => array(
-              'path' => 'projects/{projectId}/jobs/{jobId}',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'projectId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'jobId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'getQueryResults' => array(
-              'path' => 'projects/{projectId}/queries/{jobId}',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'projectId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'jobId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'maxResults' => array(
-                  'location' => 'query',
-                  'type' => 'integer',
-                ),
-                'pageToken' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'startIndex' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'timeoutMs' => array(
-                  'location' => 'query',
-                  'type' => 'integer',
-                ),
-              ),
-            ),'insert' => array(
-              'path' => 'projects/{projectId}/jobs',
-              'httpMethod' => 'POST',
-              'parameters' => array(
-                'projectId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'list' => array(
-              'path' => 'projects/{projectId}/jobs',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'projectId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'allUsers' => array(
-                  'location' => 'query',
-                  'type' => 'boolean',
-                ),
-                'maxResults' => array(
-                  'location' => 'query',
-                  'type' => 'integer',
-                ),
-                'pageToken' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'projection' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'stateFilter' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                  'repeated' => true,
-                ),
-              ),
-            ),'query' => array(
-              'path' => 'projects/{projectId}/queries',
-              'httpMethod' => 'POST',
-              'parameters' => array(
-                'projectId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),
-          )
-        )
-    );
-    $this->projects = new Google_Service_Bigquery_Resource_Projects(
-        $this,
-        $this->serviceName,
-        'projects',
-        array(
-          'methods' => array(
-            'list' => array(
-              'path' => 'projects',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'maxResults' => array(
-                  'location' => 'query',
-                  'type' => 'integer',
-                ),
-                'pageToken' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-              ),
-            ),
-          )
-        )
-    );
-    $this->tabledata = new Google_Service_Bigquery_Resource_Tabledata(
-        $this,
-        $this->serviceName,
-        'tabledata',
-        array(
-          'methods' => array(
-            'insertAll' => array(
-              'path' => 'projects/{projectId}/datasets/{datasetId}/tables/{tableId}/insertAll',
-              'httpMethod' => 'POST',
-              'parameters' => array(
-                'projectId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'datasetId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'tableId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'list' => array(
-              'path' => 'projects/{projectId}/datasets/{datasetId}/tables/{tableId}/data',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'projectId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'datasetId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'tableId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'maxResults' => array(
-                  'location' => 'query',
-                  'type' => 'integer',
-                ),
-                'pageToken' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'startIndex' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-              ),
-            ),
-          )
-        )
-    );
-    $this->tables = new Google_Service_Bigquery_Resource_Tables(
-        $this,
-        $this->serviceName,
-        'tables',
-        array(
-          'methods' => array(
-            'delete' => array(
-              'path' => 'projects/{projectId}/datasets/{datasetId}/tables/{tableId}',
-              'httpMethod' => 'DELETE',
-              'parameters' => array(
-                'projectId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'datasetId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'tableId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'get' => array(
-              'path' => 'projects/{projectId}/datasets/{datasetId}/tables/{tableId}',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'projectId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'datasetId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'tableId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'insert' => array(
-              'path' => 'projects/{projectId}/datasets/{datasetId}/tables',
-              'httpMethod' => 'POST',
-              'parameters' => array(
-                'projectId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'datasetId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'list' => array(
-              'path' => 'projects/{projectId}/datasets/{datasetId}/tables',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'projectId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'datasetId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'maxResults' => array(
-                  'location' => 'query',
-                  'type' => 'integer',
-                ),
-                'pageToken' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-              ),
-            ),'patch' => array(
-              'path' => 'projects/{projectId}/datasets/{datasetId}/tables/{tableId}',
-              'httpMethod' => 'PATCH',
-              'parameters' => array(
-                'projectId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'datasetId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'tableId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'update' => array(
-              'path' => 'projects/{projectId}/datasets/{datasetId}/tables/{tableId}',
-              'httpMethod' => 'PUT',
-              'parameters' => array(
-                'projectId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'datasetId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'tableId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),
-          )
-        )
-    );
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Bigquery/BigtableColumn.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Bigquery/BigtableColumn.php
deleted file mode 100644
index ba688934..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Bigquery/BigtableColumn.php
+++ /dev/null
@@ -1,75 +0,0 @@
-encoding = $encoding;
-  }
-  public function getEncoding()
-  {
-    return $this->encoding;
-  }
-  public function setFieldName($fieldName)
-  {
-    $this->fieldName = $fieldName;
-  }
-  public function getFieldName()
-  {
-    return $this->fieldName;
-  }
-  public function setOnlyReadLatest($onlyReadLatest)
-  {
-    $this->onlyReadLatest = $onlyReadLatest;
-  }
-  public function getOnlyReadLatest()
-  {
-    return $this->onlyReadLatest;
-  }
-  public function setQualifierEncoded($qualifierEncoded)
-  {
-    $this->qualifierEncoded = $qualifierEncoded;
-  }
-  public function getQualifierEncoded()
-  {
-    return $this->qualifierEncoded;
-  }
-  public function setQualifierString($qualifierString)
-  {
-    $this->qualifierString = $qualifierString;
-  }
-  public function getQualifierString()
-  {
-    return $this->qualifierString;
-  }
-  public function setType($type)
-  {
-    $this->type = $type;
-  }
-  public function getType()
-  {
-    return $this->type;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Bigquery/BigtableColumnFamily.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Bigquery/BigtableColumnFamily.php
deleted file mode 100644
index 70b502a4..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Bigquery/BigtableColumnFamily.php
+++ /dev/null
@@ -1,68 +0,0 @@
-columns = $columns;
-  }
-  public function getColumns()
-  {
-    return $this->columns;
-  }
-  public function setEncoding($encoding)
-  {
-    $this->encoding = $encoding;
-  }
-  public function getEncoding()
-  {
-    return $this->encoding;
-  }
-  public function setFamilyId($familyId)
-  {
-    $this->familyId = $familyId;
-  }
-  public function getFamilyId()
-  {
-    return $this->familyId;
-  }
-  public function setOnlyReadLatest($onlyReadLatest)
-  {
-    $this->onlyReadLatest = $onlyReadLatest;
-  }
-  public function getOnlyReadLatest()
-  {
-    return $this->onlyReadLatest;
-  }
-  public function setType($type)
-  {
-    $this->type = $type;
-  }
-  public function getType()
-  {
-    return $this->type;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Bigquery/BigtableOptions.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Bigquery/BigtableOptions.php
deleted file mode 100644
index 51b78b98..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Bigquery/BigtableOptions.php
+++ /dev/null
@@ -1,50 +0,0 @@
-columnFamilies = $columnFamilies;
-  }
-  public function getColumnFamilies()
-  {
-    return $this->columnFamilies;
-  }
-  public function setIgnoreUnspecifiedColumnFamilies($ignoreUnspecifiedColumnFamilies)
-  {
-    $this->ignoreUnspecifiedColumnFamilies = $ignoreUnspecifiedColumnFamilies;
-  }
-  public function getIgnoreUnspecifiedColumnFamilies()
-  {
-    return $this->ignoreUnspecifiedColumnFamilies;
-  }
-  public function setReadRowkeyAsString($readRowkeyAsString)
-  {
-    $this->readRowkeyAsString = $readRowkeyAsString;
-  }
-  public function getReadRowkeyAsString()
-  {
-    return $this->readRowkeyAsString;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Bigquery/CsvOptions.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Bigquery/CsvOptions.php
deleted file mode 100644
index de25be0b..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Bigquery/CsvOptions.php
+++ /dev/null
@@ -1,75 +0,0 @@
-allowJaggedRows = $allowJaggedRows;
-  }
-  public function getAllowJaggedRows()
-  {
-    return $this->allowJaggedRows;
-  }
-  public function setAllowQuotedNewlines($allowQuotedNewlines)
-  {
-    $this->allowQuotedNewlines = $allowQuotedNewlines;
-  }
-  public function getAllowQuotedNewlines()
-  {
-    return $this->allowQuotedNewlines;
-  }
-  public function setEncoding($encoding)
-  {
-    $this->encoding = $encoding;
-  }
-  public function getEncoding()
-  {
-    return $this->encoding;
-  }
-  public function setFieldDelimiter($fieldDelimiter)
-  {
-    $this->fieldDelimiter = $fieldDelimiter;
-  }
-  public function getFieldDelimiter()
-  {
-    return $this->fieldDelimiter;
-  }
-  public function setQuote($quote)
-  {
-    $this->quote = $quote;
-  }
-  public function getQuote()
-  {
-    return $this->quote;
-  }
-  public function setSkipLeadingRows($skipLeadingRows)
-  {
-    $this->skipLeadingRows = $skipLeadingRows;
-  }
-  public function getSkipLeadingRows()
-  {
-    return $this->skipLeadingRows;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Bigquery/Dataset.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Bigquery/Dataset.php
deleted file mode 100644
index 5591fb53..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Bigquery/Dataset.php
+++ /dev/null
@@ -1,141 +0,0 @@
-access = $access;
-  }
-  public function getAccess()
-  {
-    return $this->access;
-  }
-  public function setCreationTime($creationTime)
-  {
-    $this->creationTime = $creationTime;
-  }
-  public function getCreationTime()
-  {
-    return $this->creationTime;
-  }
-  public function setDatasetReference(Google_Service_Bigquery_DatasetReference $datasetReference)
-  {
-    $this->datasetReference = $datasetReference;
-  }
-  public function getDatasetReference()
-  {
-    return $this->datasetReference;
-  }
-  public function setDefaultTableExpirationMs($defaultTableExpirationMs)
-  {
-    $this->defaultTableExpirationMs = $defaultTableExpirationMs;
-  }
-  public function getDefaultTableExpirationMs()
-  {
-    return $this->defaultTableExpirationMs;
-  }
-  public function setDescription($description)
-  {
-    $this->description = $description;
-  }
-  public function getDescription()
-  {
-    return $this->description;
-  }
-  public function setEtag($etag)
-  {
-    $this->etag = $etag;
-  }
-  public function getEtag()
-  {
-    return $this->etag;
-  }
-  public function setFriendlyName($friendlyName)
-  {
-    $this->friendlyName = $friendlyName;
-  }
-  public function getFriendlyName()
-  {
-    return $this->friendlyName;
-  }
-  public function setId($id)
-  {
-    $this->id = $id;
-  }
-  public function getId()
-  {
-    return $this->id;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setLabels($labels)
-  {
-    $this->labels = $labels;
-  }
-  public function getLabels()
-  {
-    return $this->labels;
-  }
-  public function setLastModifiedTime($lastModifiedTime)
-  {
-    $this->lastModifiedTime = $lastModifiedTime;
-  }
-  public function getLastModifiedTime()
-  {
-    return $this->lastModifiedTime;
-  }
-  public function setLocation($location)
-  {
-    $this->location = $location;
-  }
-  public function getLocation()
-  {
-    return $this->location;
-  }
-  public function setSelfLink($selfLink)
-  {
-    $this->selfLink = $selfLink;
-  }
-  public function getSelfLink()
-  {
-    return $this->selfLink;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Bigquery/DatasetAccess.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Bigquery/DatasetAccess.php
deleted file mode 100644
index 65677dfb..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Bigquery/DatasetAccess.php
+++ /dev/null
@@ -1,76 +0,0 @@
-domain = $domain;
-  }
-  public function getDomain()
-  {
-    return $this->domain;
-  }
-  public function setGroupByEmail($groupByEmail)
-  {
-    $this->groupByEmail = $groupByEmail;
-  }
-  public function getGroupByEmail()
-  {
-    return $this->groupByEmail;
-  }
-  public function setRole($role)
-  {
-    $this->role = $role;
-  }
-  public function getRole()
-  {
-    return $this->role;
-  }
-  public function setSpecialGroup($specialGroup)
-  {
-    $this->specialGroup = $specialGroup;
-  }
-  public function getSpecialGroup()
-  {
-    return $this->specialGroup;
-  }
-  public function setUserByEmail($userByEmail)
-  {
-    $this->userByEmail = $userByEmail;
-  }
-  public function getUserByEmail()
-  {
-    return $this->userByEmail;
-  }
-  public function setView(Google_Service_Bigquery_TableReference $view)
-  {
-    $this->view = $view;
-  }
-  public function getView()
-  {
-    return $this->view;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Bigquery/DatasetList.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Bigquery/DatasetList.php
deleted file mode 100644
index 207ba0b7..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Bigquery/DatasetList.php
+++ /dev/null
@@ -1,59 +0,0 @@
-datasets = $datasets;
-  }
-  public function getDatasets()
-  {
-    return $this->datasets;
-  }
-  public function setEtag($etag)
-  {
-    $this->etag = $etag;
-  }
-  public function getEtag()
-  {
-    return $this->etag;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setNextPageToken($nextPageToken)
-  {
-    $this->nextPageToken = $nextPageToken;
-  }
-  public function getNextPageToken()
-  {
-    return $this->nextPageToken;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Bigquery/DatasetListDatasets.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Bigquery/DatasetListDatasets.php
deleted file mode 100644
index 382c85d6..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Bigquery/DatasetListDatasets.php
+++ /dev/null
@@ -1,67 +0,0 @@
-datasetReference = $datasetReference;
-  }
-  public function getDatasetReference()
-  {
-    return $this->datasetReference;
-  }
-  public function setFriendlyName($friendlyName)
-  {
-    $this->friendlyName = $friendlyName;
-  }
-  public function getFriendlyName()
-  {
-    return $this->friendlyName;
-  }
-  public function setId($id)
-  {
-    $this->id = $id;
-  }
-  public function getId()
-  {
-    return $this->id;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setLabels($labels)
-  {
-    $this->labels = $labels;
-  }
-  public function getLabels()
-  {
-    return $this->labels;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Bigquery/DatasetReference.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Bigquery/DatasetReference.php
deleted file mode 100644
index e2c7d9c2..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Bigquery/DatasetReference.php
+++ /dev/null
@@ -1,39 +0,0 @@
-datasetId = $datasetId;
-  }
-  public function getDatasetId()
-  {
-    return $this->datasetId;
-  }
-  public function setProjectId($projectId)
-  {
-    $this->projectId = $projectId;
-  }
-  public function getProjectId()
-  {
-    return $this->projectId;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Bigquery/ErrorProto.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Bigquery/ErrorProto.php
deleted file mode 100644
index 1981d89b..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Bigquery/ErrorProto.php
+++ /dev/null
@@ -1,57 +0,0 @@
-debugInfo = $debugInfo;
-  }
-  public function getDebugInfo()
-  {
-    return $this->debugInfo;
-  }
-  public function setLocation($location)
-  {
-    $this->location = $location;
-  }
-  public function getLocation()
-  {
-    return $this->location;
-  }
-  public function setMessage($message)
-  {
-    $this->message = $message;
-  }
-  public function getMessage()
-  {
-    return $this->message;
-  }
-  public function setReason($reason)
-  {
-    $this->reason = $reason;
-  }
-  public function getReason()
-  {
-    return $this->reason;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Bigquery/ExplainQueryStage.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Bigquery/ExplainQueryStage.php
deleted file mode 100644
index 148eae03..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Bigquery/ExplainQueryStage.php
+++ /dev/null
@@ -1,149 +0,0 @@
-computeRatioAvg = $computeRatioAvg;
-  }
-  public function getComputeRatioAvg()
-  {
-    return $this->computeRatioAvg;
-  }
-  public function setComputeRatioMax($computeRatioMax)
-  {
-    $this->computeRatioMax = $computeRatioMax;
-  }
-  public function getComputeRatioMax()
-  {
-    return $this->computeRatioMax;
-  }
-  public function setId($id)
-  {
-    $this->id = $id;
-  }
-  public function getId()
-  {
-    return $this->id;
-  }
-  public function setName($name)
-  {
-    $this->name = $name;
-  }
-  public function getName()
-  {
-    return $this->name;
-  }
-  public function setReadRatioAvg($readRatioAvg)
-  {
-    $this->readRatioAvg = $readRatioAvg;
-  }
-  public function getReadRatioAvg()
-  {
-    return $this->readRatioAvg;
-  }
-  public function setReadRatioMax($readRatioMax)
-  {
-    $this->readRatioMax = $readRatioMax;
-  }
-  public function getReadRatioMax()
-  {
-    return $this->readRatioMax;
-  }
-  public function setRecordsRead($recordsRead)
-  {
-    $this->recordsRead = $recordsRead;
-  }
-  public function getRecordsRead()
-  {
-    return $this->recordsRead;
-  }
-  public function setRecordsWritten($recordsWritten)
-  {
-    $this->recordsWritten = $recordsWritten;
-  }
-  public function getRecordsWritten()
-  {
-    return $this->recordsWritten;
-  }
-  public function setStatus($status)
-  {
-    $this->status = $status;
-  }
-  public function getStatus()
-  {
-    return $this->status;
-  }
-  public function setSteps($steps)
-  {
-    $this->steps = $steps;
-  }
-  public function getSteps()
-  {
-    return $this->steps;
-  }
-  public function setWaitRatioAvg($waitRatioAvg)
-  {
-    $this->waitRatioAvg = $waitRatioAvg;
-  }
-  public function getWaitRatioAvg()
-  {
-    return $this->waitRatioAvg;
-  }
-  public function setWaitRatioMax($waitRatioMax)
-  {
-    $this->waitRatioMax = $waitRatioMax;
-  }
-  public function getWaitRatioMax()
-  {
-    return $this->waitRatioMax;
-  }
-  public function setWriteRatioAvg($writeRatioAvg)
-  {
-    $this->writeRatioAvg = $writeRatioAvg;
-  }
-  public function getWriteRatioAvg()
-  {
-    return $this->writeRatioAvg;
-  }
-  public function setWriteRatioMax($writeRatioMax)
-  {
-    $this->writeRatioMax = $writeRatioMax;
-  }
-  public function getWriteRatioMax()
-  {
-    return $this->writeRatioMax;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Bigquery/ExplainQueryStep.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Bigquery/ExplainQueryStep.php
deleted file mode 100644
index 160025b1..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Bigquery/ExplainQueryStep.php
+++ /dev/null
@@ -1,40 +0,0 @@
-kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setSubsteps($substeps)
-  {
-    $this->substeps = $substeps;
-  }
-  public function getSubsteps()
-  {
-    return $this->substeps;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Bigquery/ExternalDataConfiguration.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Bigquery/ExternalDataConfiguration.php
deleted file mode 100644
index 86f22801..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Bigquery/ExternalDataConfiguration.php
+++ /dev/null
@@ -1,116 +0,0 @@
-autodetect = $autodetect;
-  }
-  public function getAutodetect()
-  {
-    return $this->autodetect;
-  }
-  public function setBigtableOptions(Google_Service_Bigquery_BigtableOptions $bigtableOptions)
-  {
-    $this->bigtableOptions = $bigtableOptions;
-  }
-  public function getBigtableOptions()
-  {
-    return $this->bigtableOptions;
-  }
-  public function setCompression($compression)
-  {
-    $this->compression = $compression;
-  }
-  public function getCompression()
-  {
-    return $this->compression;
-  }
-  public function setCsvOptions(Google_Service_Bigquery_CsvOptions $csvOptions)
-  {
-    $this->csvOptions = $csvOptions;
-  }
-  public function getCsvOptions()
-  {
-    return $this->csvOptions;
-  }
-  public function setGoogleSheetsOptions(Google_Service_Bigquery_GoogleSheetsOptions $googleSheetsOptions)
-  {
-    $this->googleSheetsOptions = $googleSheetsOptions;
-  }
-  public function getGoogleSheetsOptions()
-  {
-    return $this->googleSheetsOptions;
-  }
-  public function setIgnoreUnknownValues($ignoreUnknownValues)
-  {
-    $this->ignoreUnknownValues = $ignoreUnknownValues;
-  }
-  public function getIgnoreUnknownValues()
-  {
-    return $this->ignoreUnknownValues;
-  }
-  public function setMaxBadRecords($maxBadRecords)
-  {
-    $this->maxBadRecords = $maxBadRecords;
-  }
-  public function getMaxBadRecords()
-  {
-    return $this->maxBadRecords;
-  }
-  public function setSchema(Google_Service_Bigquery_TableSchema $schema)
-  {
-    $this->schema = $schema;
-  }
-  public function getSchema()
-  {
-    return $this->schema;
-  }
-  public function setSourceFormat($sourceFormat)
-  {
-    $this->sourceFormat = $sourceFormat;
-  }
-  public function getSourceFormat()
-  {
-    return $this->sourceFormat;
-  }
-  public function setSourceUris($sourceUris)
-  {
-    $this->sourceUris = $sourceUris;
-  }
-  public function getSourceUris()
-  {
-    return $this->sourceUris;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Bigquery/GetQueryResultsResponse.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Bigquery/GetQueryResultsResponse.php
deleted file mode 100644
index 9a177fb5..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Bigquery/GetQueryResultsResponse.php
+++ /dev/null
@@ -1,134 +0,0 @@
-cacheHit = $cacheHit;
-  }
-  public function getCacheHit()
-  {
-    return $this->cacheHit;
-  }
-  public function setErrors($errors)
-  {
-    $this->errors = $errors;
-  }
-  public function getErrors()
-  {
-    return $this->errors;
-  }
-  public function setEtag($etag)
-  {
-    $this->etag = $etag;
-  }
-  public function getEtag()
-  {
-    return $this->etag;
-  }
-  public function setJobComplete($jobComplete)
-  {
-    $this->jobComplete = $jobComplete;
-  }
-  public function getJobComplete()
-  {
-    return $this->jobComplete;
-  }
-  public function setJobReference(Google_Service_Bigquery_JobReference $jobReference)
-  {
-    $this->jobReference = $jobReference;
-  }
-  public function getJobReference()
-  {
-    return $this->jobReference;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setNumDmlAffectedRows($numDmlAffectedRows)
-  {
-    $this->numDmlAffectedRows = $numDmlAffectedRows;
-  }
-  public function getNumDmlAffectedRows()
-  {
-    return $this->numDmlAffectedRows;
-  }
-  public function setPageToken($pageToken)
-  {
-    $this->pageToken = $pageToken;
-  }
-  public function getPageToken()
-  {
-    return $this->pageToken;
-  }
-  public function setRows($rows)
-  {
-    $this->rows = $rows;
-  }
-  public function getRows()
-  {
-    return $this->rows;
-  }
-  public function setSchema(Google_Service_Bigquery_TableSchema $schema)
-  {
-    $this->schema = $schema;
-  }
-  public function getSchema()
-  {
-    return $this->schema;
-  }
-  public function setTotalBytesProcessed($totalBytesProcessed)
-  {
-    $this->totalBytesProcessed = $totalBytesProcessed;
-  }
-  public function getTotalBytesProcessed()
-  {
-    return $this->totalBytesProcessed;
-  }
-  public function setTotalRows($totalRows)
-  {
-    $this->totalRows = $totalRows;
-  }
-  public function getTotalRows()
-  {
-    return $this->totalRows;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Bigquery/GoogleSheetsOptions.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Bigquery/GoogleSheetsOptions.php
deleted file mode 100644
index 359b6a46..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Bigquery/GoogleSheetsOptions.php
+++ /dev/null
@@ -1,30 +0,0 @@
-skipLeadingRows = $skipLeadingRows;
-  }
-  public function getSkipLeadingRows()
-  {
-    return $this->skipLeadingRows;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Bigquery/Job.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Bigquery/Job.php
deleted file mode 100644
index 67a242a0..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Bigquery/Job.php
+++ /dev/null
@@ -1,109 +0,0 @@
- "user_email",
-  );
-  protected $configurationType = 'Google_Service_Bigquery_JobConfiguration';
-  protected $configurationDataType = '';
-  public $etag;
-  public $id;
-  protected $jobReferenceType = 'Google_Service_Bigquery_JobReference';
-  protected $jobReferenceDataType = '';
-  public $kind;
-  public $selfLink;
-  protected $statisticsType = 'Google_Service_Bigquery_JobStatistics';
-  protected $statisticsDataType = '';
-  protected $statusType = 'Google_Service_Bigquery_JobStatus';
-  protected $statusDataType = '';
-  public $userEmail;
-
-  public function setConfiguration(Google_Service_Bigquery_JobConfiguration $configuration)
-  {
-    $this->configuration = $configuration;
-  }
-  public function getConfiguration()
-  {
-    return $this->configuration;
-  }
-  public function setEtag($etag)
-  {
-    $this->etag = $etag;
-  }
-  public function getEtag()
-  {
-    return $this->etag;
-  }
-  public function setId($id)
-  {
-    $this->id = $id;
-  }
-  public function getId()
-  {
-    return $this->id;
-  }
-  public function setJobReference(Google_Service_Bigquery_JobReference $jobReference)
-  {
-    $this->jobReference = $jobReference;
-  }
-  public function getJobReference()
-  {
-    return $this->jobReference;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setSelfLink($selfLink)
-  {
-    $this->selfLink = $selfLink;
-  }
-  public function getSelfLink()
-  {
-    return $this->selfLink;
-  }
-  public function setStatistics(Google_Service_Bigquery_JobStatistics $statistics)
-  {
-    $this->statistics = $statistics;
-  }
-  public function getStatistics()
-  {
-    return $this->statistics;
-  }
-  public function setStatus(Google_Service_Bigquery_JobStatus $status)
-  {
-    $this->status = $status;
-  }
-  public function getStatus()
-  {
-    return $this->status;
-  }
-  public function setUserEmail($userEmail)
-  {
-    $this->userEmail = $userEmail;
-  }
-  public function getUserEmail()
-  {
-    return $this->userEmail;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Bigquery/JobCancelResponse.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Bigquery/JobCancelResponse.php
deleted file mode 100644
index 19affed3..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Bigquery/JobCancelResponse.php
+++ /dev/null
@@ -1,40 +0,0 @@
-job = $job;
-  }
-  public function getJob()
-  {
-    return $this->job;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Bigquery/JobConfiguration.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Bigquery/JobConfiguration.php
deleted file mode 100644
index 9a66c970..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Bigquery/JobConfiguration.php
+++ /dev/null
@@ -1,79 +0,0 @@
-copy = $copy;
-  }
-  public function getCopy()
-  {
-    return $this->copy;
-  }
-  public function setDryRun($dryRun)
-  {
-    $this->dryRun = $dryRun;
-  }
-  public function getDryRun()
-  {
-    return $this->dryRun;
-  }
-  public function setExtract(Google_Service_Bigquery_JobConfigurationExtract $extract)
-  {
-    $this->extract = $extract;
-  }
-  public function getExtract()
-  {
-    return $this->extract;
-  }
-  public function setLabels($labels)
-  {
-    $this->labels = $labels;
-  }
-  public function getLabels()
-  {
-    return $this->labels;
-  }
-  public function setLoad(Google_Service_Bigquery_JobConfigurationLoad $load)
-  {
-    $this->load = $load;
-  }
-  public function getLoad()
-  {
-    return $this->load;
-  }
-  public function setQuery(Google_Service_Bigquery_JobConfigurationQuery $query)
-  {
-    $this->query = $query;
-  }
-  public function getQuery()
-  {
-    return $this->query;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Bigquery/JobConfigurationExtract.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Bigquery/JobConfigurationExtract.php
deleted file mode 100644
index 28cdf78a..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Bigquery/JobConfigurationExtract.php
+++ /dev/null
@@ -1,86 +0,0 @@
-compression = $compression;
-  }
-  public function getCompression()
-  {
-    return $this->compression;
-  }
-  public function setDestinationFormat($destinationFormat)
-  {
-    $this->destinationFormat = $destinationFormat;
-  }
-  public function getDestinationFormat()
-  {
-    return $this->destinationFormat;
-  }
-  public function setDestinationUri($destinationUri)
-  {
-    $this->destinationUri = $destinationUri;
-  }
-  public function getDestinationUri()
-  {
-    return $this->destinationUri;
-  }
-  public function setDestinationUris($destinationUris)
-  {
-    $this->destinationUris = $destinationUris;
-  }
-  public function getDestinationUris()
-  {
-    return $this->destinationUris;
-  }
-  public function setFieldDelimiter($fieldDelimiter)
-  {
-    $this->fieldDelimiter = $fieldDelimiter;
-  }
-  public function getFieldDelimiter()
-  {
-    return $this->fieldDelimiter;
-  }
-  public function setPrintHeader($printHeader)
-  {
-    $this->printHeader = $printHeader;
-  }
-  public function getPrintHeader()
-  {
-    return $this->printHeader;
-  }
-  public function setSourceTable(Google_Service_Bigquery_TableReference $sourceTable)
-  {
-    $this->sourceTable = $sourceTable;
-  }
-  public function getSourceTable()
-  {
-    return $this->sourceTable;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Bigquery/JobConfigurationLoad.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Bigquery/JobConfigurationLoad.php
deleted file mode 100644
index 76e0f436..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Bigquery/JobConfigurationLoad.php
+++ /dev/null
@@ -1,204 +0,0 @@
-allowJaggedRows = $allowJaggedRows;
-  }
-  public function getAllowJaggedRows()
-  {
-    return $this->allowJaggedRows;
-  }
-  public function setAllowQuotedNewlines($allowQuotedNewlines)
-  {
-    $this->allowQuotedNewlines = $allowQuotedNewlines;
-  }
-  public function getAllowQuotedNewlines()
-  {
-    return $this->allowQuotedNewlines;
-  }
-  public function setAutodetect($autodetect)
-  {
-    $this->autodetect = $autodetect;
-  }
-  public function getAutodetect()
-  {
-    return $this->autodetect;
-  }
-  public function setCreateDisposition($createDisposition)
-  {
-    $this->createDisposition = $createDisposition;
-  }
-  public function getCreateDisposition()
-  {
-    return $this->createDisposition;
-  }
-  public function setDestinationTable(Google_Service_Bigquery_TableReference $destinationTable)
-  {
-    $this->destinationTable = $destinationTable;
-  }
-  public function getDestinationTable()
-  {
-    return $this->destinationTable;
-  }
-  public function setEncoding($encoding)
-  {
-    $this->encoding = $encoding;
-  }
-  public function getEncoding()
-  {
-    return $this->encoding;
-  }
-  public function setFieldDelimiter($fieldDelimiter)
-  {
-    $this->fieldDelimiter = $fieldDelimiter;
-  }
-  public function getFieldDelimiter()
-  {
-    return $this->fieldDelimiter;
-  }
-  public function setIgnoreUnknownValues($ignoreUnknownValues)
-  {
-    $this->ignoreUnknownValues = $ignoreUnknownValues;
-  }
-  public function getIgnoreUnknownValues()
-  {
-    return $this->ignoreUnknownValues;
-  }
-  public function setMaxBadRecords($maxBadRecords)
-  {
-    $this->maxBadRecords = $maxBadRecords;
-  }
-  public function getMaxBadRecords()
-  {
-    return $this->maxBadRecords;
-  }
-  public function setNullMarker($nullMarker)
-  {
-    $this->nullMarker = $nullMarker;
-  }
-  public function getNullMarker()
-  {
-    return $this->nullMarker;
-  }
-  public function setProjectionFields($projectionFields)
-  {
-    $this->projectionFields = $projectionFields;
-  }
-  public function getProjectionFields()
-  {
-    return $this->projectionFields;
-  }
-  public function setQuote($quote)
-  {
-    $this->quote = $quote;
-  }
-  public function getQuote()
-  {
-    return $this->quote;
-  }
-  public function setSchema(Google_Service_Bigquery_TableSchema $schema)
-  {
-    $this->schema = $schema;
-  }
-  public function getSchema()
-  {
-    return $this->schema;
-  }
-  public function setSchemaInline($schemaInline)
-  {
-    $this->schemaInline = $schemaInline;
-  }
-  public function getSchemaInline()
-  {
-    return $this->schemaInline;
-  }
-  public function setSchemaInlineFormat($schemaInlineFormat)
-  {
-    $this->schemaInlineFormat = $schemaInlineFormat;
-  }
-  public function getSchemaInlineFormat()
-  {
-    return $this->schemaInlineFormat;
-  }
-  public function setSchemaUpdateOptions($schemaUpdateOptions)
-  {
-    $this->schemaUpdateOptions = $schemaUpdateOptions;
-  }
-  public function getSchemaUpdateOptions()
-  {
-    return $this->schemaUpdateOptions;
-  }
-  public function setSkipLeadingRows($skipLeadingRows)
-  {
-    $this->skipLeadingRows = $skipLeadingRows;
-  }
-  public function getSkipLeadingRows()
-  {
-    return $this->skipLeadingRows;
-  }
-  public function setSourceFormat($sourceFormat)
-  {
-    $this->sourceFormat = $sourceFormat;
-  }
-  public function getSourceFormat()
-  {
-    return $this->sourceFormat;
-  }
-  public function setSourceUris($sourceUris)
-  {
-    $this->sourceUris = $sourceUris;
-  }
-  public function getSourceUris()
-  {
-    return $this->sourceUris;
-  }
-  public function setWriteDisposition($writeDisposition)
-  {
-    $this->writeDisposition = $writeDisposition;
-  }
-  public function getWriteDisposition()
-  {
-    return $this->writeDisposition;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Bigquery/JobConfigurationQuery.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Bigquery/JobConfigurationQuery.php
deleted file mode 100644
index 0e4f8462..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Bigquery/JobConfigurationQuery.php
+++ /dev/null
@@ -1,189 +0,0 @@
-allowLargeResults = $allowLargeResults;
-  }
-  public function getAllowLargeResults()
-  {
-    return $this->allowLargeResults;
-  }
-  public function setCreateDisposition($createDisposition)
-  {
-    $this->createDisposition = $createDisposition;
-  }
-  public function getCreateDisposition()
-  {
-    return $this->createDisposition;
-  }
-  public function setDefaultDataset(Google_Service_Bigquery_DatasetReference $defaultDataset)
-  {
-    $this->defaultDataset = $defaultDataset;
-  }
-  public function getDefaultDataset()
-  {
-    return $this->defaultDataset;
-  }
-  public function setDestinationTable(Google_Service_Bigquery_TableReference $destinationTable)
-  {
-    $this->destinationTable = $destinationTable;
-  }
-  public function getDestinationTable()
-  {
-    return $this->destinationTable;
-  }
-  public function setFlattenResults($flattenResults)
-  {
-    $this->flattenResults = $flattenResults;
-  }
-  public function getFlattenResults()
-  {
-    return $this->flattenResults;
-  }
-  public function setMaximumBillingTier($maximumBillingTier)
-  {
-    $this->maximumBillingTier = $maximumBillingTier;
-  }
-  public function getMaximumBillingTier()
-  {
-    return $this->maximumBillingTier;
-  }
-  public function setMaximumBytesBilled($maximumBytesBilled)
-  {
-    $this->maximumBytesBilled = $maximumBytesBilled;
-  }
-  public function getMaximumBytesBilled()
-  {
-    return $this->maximumBytesBilled;
-  }
-  public function setParameterMode($parameterMode)
-  {
-    $this->parameterMode = $parameterMode;
-  }
-  public function getParameterMode()
-  {
-    return $this->parameterMode;
-  }
-  public function setPreserveNulls($preserveNulls)
-  {
-    $this->preserveNulls = $preserveNulls;
-  }
-  public function getPreserveNulls()
-  {
-    return $this->preserveNulls;
-  }
-  public function setPriority($priority)
-  {
-    $this->priority = $priority;
-  }
-  public function getPriority()
-  {
-    return $this->priority;
-  }
-  public function setQuery($query)
-  {
-    $this->query = $query;
-  }
-  public function getQuery()
-  {
-    return $this->query;
-  }
-  public function setQueryParameters($queryParameters)
-  {
-    $this->queryParameters = $queryParameters;
-  }
-  public function getQueryParameters()
-  {
-    return $this->queryParameters;
-  }
-  public function setSchemaUpdateOptions($schemaUpdateOptions)
-  {
-    $this->schemaUpdateOptions = $schemaUpdateOptions;
-  }
-  public function getSchemaUpdateOptions()
-  {
-    return $this->schemaUpdateOptions;
-  }
-  public function setTableDefinitions($tableDefinitions)
-  {
-    $this->tableDefinitions = $tableDefinitions;
-  }
-  public function getTableDefinitions()
-  {
-    return $this->tableDefinitions;
-  }
-  public function setUseLegacySql($useLegacySql)
-  {
-    $this->useLegacySql = $useLegacySql;
-  }
-  public function getUseLegacySql()
-  {
-    return $this->useLegacySql;
-  }
-  public function setUseQueryCache($useQueryCache)
-  {
-    $this->useQueryCache = $useQueryCache;
-  }
-  public function getUseQueryCache()
-  {
-    return $this->useQueryCache;
-  }
-  public function setUserDefinedFunctionResources($userDefinedFunctionResources)
-  {
-    $this->userDefinedFunctionResources = $userDefinedFunctionResources;
-  }
-  public function getUserDefinedFunctionResources()
-  {
-    return $this->userDefinedFunctionResources;
-  }
-  public function setWriteDisposition($writeDisposition)
-  {
-    $this->writeDisposition = $writeDisposition;
-  }
-  public function getWriteDisposition()
-  {
-    return $this->writeDisposition;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Bigquery/JobConfigurationTableCopy.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Bigquery/JobConfigurationTableCopy.php
deleted file mode 100644
index d6ba7923..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Bigquery/JobConfigurationTableCopy.php
+++ /dev/null
@@ -1,70 +0,0 @@
-createDisposition = $createDisposition;
-  }
-  public function getCreateDisposition()
-  {
-    return $this->createDisposition;
-  }
-  public function setDestinationTable(Google_Service_Bigquery_TableReference $destinationTable)
-  {
-    $this->destinationTable = $destinationTable;
-  }
-  public function getDestinationTable()
-  {
-    return $this->destinationTable;
-  }
-  public function setSourceTable(Google_Service_Bigquery_TableReference $sourceTable)
-  {
-    $this->sourceTable = $sourceTable;
-  }
-  public function getSourceTable()
-  {
-    return $this->sourceTable;
-  }
-  public function setSourceTables($sourceTables)
-  {
-    $this->sourceTables = $sourceTables;
-  }
-  public function getSourceTables()
-  {
-    return $this->sourceTables;
-  }
-  public function setWriteDisposition($writeDisposition)
-  {
-    $this->writeDisposition = $writeDisposition;
-  }
-  public function getWriteDisposition()
-  {
-    return $this->writeDisposition;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Bigquery/JobList.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Bigquery/JobList.php
deleted file mode 100644
index 174c32f7..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Bigquery/JobList.php
+++ /dev/null
@@ -1,59 +0,0 @@
-etag = $etag;
-  }
-  public function getEtag()
-  {
-    return $this->etag;
-  }
-  public function setJobs($jobs)
-  {
-    $this->jobs = $jobs;
-  }
-  public function getJobs()
-  {
-    return $this->jobs;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setNextPageToken($nextPageToken)
-  {
-    $this->nextPageToken = $nextPageToken;
-  }
-  public function getNextPageToken()
-  {
-    return $this->nextPageToken;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Bigquery/JobListJobs.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Bigquery/JobListJobs.php
deleted file mode 100644
index 36a9a9a6..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Bigquery/JobListJobs.php
+++ /dev/null
@@ -1,110 +0,0 @@
- "user_email",
-  );
-  protected $configurationType = 'Google_Service_Bigquery_JobConfiguration';
-  protected $configurationDataType = '';
-  protected $errorResultType = 'Google_Service_Bigquery_ErrorProto';
-  protected $errorResultDataType = '';
-  public $id;
-  protected $jobReferenceType = 'Google_Service_Bigquery_JobReference';
-  protected $jobReferenceDataType = '';
-  public $kind;
-  public $state;
-  protected $statisticsType = 'Google_Service_Bigquery_JobStatistics';
-  protected $statisticsDataType = '';
-  protected $statusType = 'Google_Service_Bigquery_JobStatus';
-  protected $statusDataType = '';
-  public $userEmail;
-
-  public function setConfiguration(Google_Service_Bigquery_JobConfiguration $configuration)
-  {
-    $this->configuration = $configuration;
-  }
-  public function getConfiguration()
-  {
-    return $this->configuration;
-  }
-  public function setErrorResult(Google_Service_Bigquery_ErrorProto $errorResult)
-  {
-    $this->errorResult = $errorResult;
-  }
-  public function getErrorResult()
-  {
-    return $this->errorResult;
-  }
-  public function setId($id)
-  {
-    $this->id = $id;
-  }
-  public function getId()
-  {
-    return $this->id;
-  }
-  public function setJobReference(Google_Service_Bigquery_JobReference $jobReference)
-  {
-    $this->jobReference = $jobReference;
-  }
-  public function getJobReference()
-  {
-    return $this->jobReference;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setState($state)
-  {
-    $this->state = $state;
-  }
-  public function getState()
-  {
-    return $this->state;
-  }
-  public function setStatistics(Google_Service_Bigquery_JobStatistics $statistics)
-  {
-    $this->statistics = $statistics;
-  }
-  public function getStatistics()
-  {
-    return $this->statistics;
-  }
-  public function setStatus(Google_Service_Bigquery_JobStatus $status)
-  {
-    $this->status = $status;
-  }
-  public function getStatus()
-  {
-    return $this->status;
-  }
-  public function setUserEmail($userEmail)
-  {
-    $this->userEmail = $userEmail;
-  }
-  public function getUserEmail()
-  {
-    return $this->userEmail;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Bigquery/JobReference.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Bigquery/JobReference.php
deleted file mode 100644
index 696d73aa..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Bigquery/JobReference.php
+++ /dev/null
@@ -1,39 +0,0 @@
-jobId = $jobId;
-  }
-  public function getJobId()
-  {
-    return $this->jobId;
-  }
-  public function setProjectId($projectId)
-  {
-    $this->projectId = $projectId;
-  }
-  public function getProjectId()
-  {
-    return $this->projectId;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Bigquery/JobStatistics.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Bigquery/JobStatistics.php
deleted file mode 100644
index 865e0281..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Bigquery/JobStatistics.php
+++ /dev/null
@@ -1,87 +0,0 @@
-creationTime = $creationTime;
-  }
-  public function getCreationTime()
-  {
-    return $this->creationTime;
-  }
-  public function setEndTime($endTime)
-  {
-    $this->endTime = $endTime;
-  }
-  public function getEndTime()
-  {
-    return $this->endTime;
-  }
-  public function setExtract(Google_Service_Bigquery_JobStatistics4 $extract)
-  {
-    $this->extract = $extract;
-  }
-  public function getExtract()
-  {
-    return $this->extract;
-  }
-  public function setLoad(Google_Service_Bigquery_JobStatistics3 $load)
-  {
-    $this->load = $load;
-  }
-  public function getLoad()
-  {
-    return $this->load;
-  }
-  public function setQuery(Google_Service_Bigquery_JobStatistics2 $query)
-  {
-    $this->query = $query;
-  }
-  public function getQuery()
-  {
-    return $this->query;
-  }
-  public function setStartTime($startTime)
-  {
-    $this->startTime = $startTime;
-  }
-  public function getStartTime()
-  {
-    return $this->startTime;
-  }
-  public function setTotalBytesProcessed($totalBytesProcessed)
-  {
-    $this->totalBytesProcessed = $totalBytesProcessed;
-  }
-  public function getTotalBytesProcessed()
-  {
-    return $this->totalBytesProcessed;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Bigquery/JobStatistics2.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Bigquery/JobStatistics2.php
deleted file mode 100644
index 7b9ecfa3..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Bigquery/JobStatistics2.php
+++ /dev/null
@@ -1,116 +0,0 @@
-billingTier = $billingTier;
-  }
-  public function getBillingTier()
-  {
-    return $this->billingTier;
-  }
-  public function setCacheHit($cacheHit)
-  {
-    $this->cacheHit = $cacheHit;
-  }
-  public function getCacheHit()
-  {
-    return $this->cacheHit;
-  }
-  public function setNumDmlAffectedRows($numDmlAffectedRows)
-  {
-    $this->numDmlAffectedRows = $numDmlAffectedRows;
-  }
-  public function getNumDmlAffectedRows()
-  {
-    return $this->numDmlAffectedRows;
-  }
-  public function setQueryPlan($queryPlan)
-  {
-    $this->queryPlan = $queryPlan;
-  }
-  public function getQueryPlan()
-  {
-    return $this->queryPlan;
-  }
-  public function setReferencedTables($referencedTables)
-  {
-    $this->referencedTables = $referencedTables;
-  }
-  public function getReferencedTables()
-  {
-    return $this->referencedTables;
-  }
-  public function setSchema(Google_Service_Bigquery_TableSchema $schema)
-  {
-    $this->schema = $schema;
-  }
-  public function getSchema()
-  {
-    return $this->schema;
-  }
-  public function setStatementType($statementType)
-  {
-    $this->statementType = $statementType;
-  }
-  public function getStatementType()
-  {
-    return $this->statementType;
-  }
-  public function setTotalBytesBilled($totalBytesBilled)
-  {
-    $this->totalBytesBilled = $totalBytesBilled;
-  }
-  public function getTotalBytesBilled()
-  {
-    return $this->totalBytesBilled;
-  }
-  public function setTotalBytesProcessed($totalBytesProcessed)
-  {
-    $this->totalBytesProcessed = $totalBytesProcessed;
-  }
-  public function getTotalBytesProcessed()
-  {
-    return $this->totalBytesProcessed;
-  }
-  public function setUndeclaredQueryParameters($undeclaredQueryParameters)
-  {
-    $this->undeclaredQueryParameters = $undeclaredQueryParameters;
-  }
-  public function getUndeclaredQueryParameters()
-  {
-    return $this->undeclaredQueryParameters;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Bigquery/JobStatistics3.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Bigquery/JobStatistics3.php
deleted file mode 100644
index d2b920d7..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Bigquery/JobStatistics3.php
+++ /dev/null
@@ -1,57 +0,0 @@
-inputFileBytes = $inputFileBytes;
-  }
-  public function getInputFileBytes()
-  {
-    return $this->inputFileBytes;
-  }
-  public function setInputFiles($inputFiles)
-  {
-    $this->inputFiles = $inputFiles;
-  }
-  public function getInputFiles()
-  {
-    return $this->inputFiles;
-  }
-  public function setOutputBytes($outputBytes)
-  {
-    $this->outputBytes = $outputBytes;
-  }
-  public function getOutputBytes()
-  {
-    return $this->outputBytes;
-  }
-  public function setOutputRows($outputRows)
-  {
-    $this->outputRows = $outputRows;
-  }
-  public function getOutputRows()
-  {
-    return $this->outputRows;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Bigquery/JobStatistics4.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Bigquery/JobStatistics4.php
deleted file mode 100644
index d9aebbf3..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Bigquery/JobStatistics4.php
+++ /dev/null
@@ -1,31 +0,0 @@
-destinationUriFileCounts = $destinationUriFileCounts;
-  }
-  public function getDestinationUriFileCounts()
-  {
-    return $this->destinationUriFileCounts;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Bigquery/JobStatus.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Bigquery/JobStatus.php
deleted file mode 100644
index 8afca757..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Bigquery/JobStatus.php
+++ /dev/null
@@ -1,51 +0,0 @@
-errorResult = $errorResult;
-  }
-  public function getErrorResult()
-  {
-    return $this->errorResult;
-  }
-  public function setErrors($errors)
-  {
-    $this->errors = $errors;
-  }
-  public function getErrors()
-  {
-    return $this->errors;
-  }
-  public function setState($state)
-  {
-    $this->state = $state;
-  }
-  public function getState()
-  {
-    return $this->state;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Bigquery/ProjectList.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Bigquery/ProjectList.php
deleted file mode 100644
index aa55920c..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Bigquery/ProjectList.php
+++ /dev/null
@@ -1,68 +0,0 @@
-etag = $etag;
-  }
-  public function getEtag()
-  {
-    return $this->etag;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setNextPageToken($nextPageToken)
-  {
-    $this->nextPageToken = $nextPageToken;
-  }
-  public function getNextPageToken()
-  {
-    return $this->nextPageToken;
-  }
-  public function setProjects($projects)
-  {
-    $this->projects = $projects;
-  }
-  public function getProjects()
-  {
-    return $this->projects;
-  }
-  public function setTotalItems($totalItems)
-  {
-    $this->totalItems = $totalItems;
-  }
-  public function getTotalItems()
-  {
-    return $this->totalItems;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Bigquery/ProjectListProjects.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Bigquery/ProjectListProjects.php
deleted file mode 100644
index eef33842..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Bigquery/ProjectListProjects.php
+++ /dev/null
@@ -1,67 +0,0 @@
-friendlyName = $friendlyName;
-  }
-  public function getFriendlyName()
-  {
-    return $this->friendlyName;
-  }
-  public function setId($id)
-  {
-    $this->id = $id;
-  }
-  public function getId()
-  {
-    return $this->id;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setNumericId($numericId)
-  {
-    $this->numericId = $numericId;
-  }
-  public function getNumericId()
-  {
-    return $this->numericId;
-  }
-  public function setProjectReference(Google_Service_Bigquery_ProjectReference $projectReference)
-  {
-    $this->projectReference = $projectReference;
-  }
-  public function getProjectReference()
-  {
-    return $this->projectReference;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Bigquery/ProjectReference.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Bigquery/ProjectReference.php
deleted file mode 100644
index 4f9fb3e4..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Bigquery/ProjectReference.php
+++ /dev/null
@@ -1,30 +0,0 @@
-projectId = $projectId;
-  }
-  public function getProjectId()
-  {
-    return $this->projectId;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Bigquery/QueryParameter.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Bigquery/QueryParameter.php
deleted file mode 100644
index b8e35a83..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Bigquery/QueryParameter.php
+++ /dev/null
@@ -1,50 +0,0 @@
-name = $name;
-  }
-  public function getName()
-  {
-    return $this->name;
-  }
-  public function setParameterType(Google_Service_Bigquery_QueryParameterType $parameterType)
-  {
-    $this->parameterType = $parameterType;
-  }
-  public function getParameterType()
-  {
-    return $this->parameterType;
-  }
-  public function setParameterValue(Google_Service_Bigquery_QueryParameterValue $parameterValue)
-  {
-    $this->parameterValue = $parameterValue;
-  }
-  public function getParameterValue()
-  {
-    return $this->parameterValue;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Bigquery/QueryParameterType.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Bigquery/QueryParameterType.php
deleted file mode 100644
index 12dcb449..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Bigquery/QueryParameterType.php
+++ /dev/null
@@ -1,51 +0,0 @@
-arrayType = $arrayType;
-  }
-  public function getArrayType()
-  {
-    return $this->arrayType;
-  }
-  public function setStructTypes($structTypes)
-  {
-    $this->structTypes = $structTypes;
-  }
-  public function getStructTypes()
-  {
-    return $this->structTypes;
-  }
-  public function setType($type)
-  {
-    $this->type = $type;
-  }
-  public function getType()
-  {
-    return $this->type;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Bigquery/QueryParameterTypeStructTypes.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Bigquery/QueryParameterTypeStructTypes.php
deleted file mode 100644
index 00f9f890..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Bigquery/QueryParameterTypeStructTypes.php
+++ /dev/null
@@ -1,49 +0,0 @@
-description = $description;
-  }
-  public function getDescription()
-  {
-    return $this->description;
-  }
-  public function setName($name)
-  {
-    $this->name = $name;
-  }
-  public function getName()
-  {
-    return $this->name;
-  }
-  public function setType(Google_Service_Bigquery_QueryParameterType $type)
-  {
-    $this->type = $type;
-  }
-  public function getType()
-  {
-    return $this->type;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Bigquery/QueryParameterValue.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Bigquery/QueryParameterValue.php
deleted file mode 100644
index 46f629c6..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Bigquery/QueryParameterValue.php
+++ /dev/null
@@ -1,51 +0,0 @@
-arrayValues = $arrayValues;
-  }
-  public function getArrayValues()
-  {
-    return $this->arrayValues;
-  }
-  public function setStructValues($structValues)
-  {
-    $this->structValues = $structValues;
-  }
-  public function getStructValues()
-  {
-    return $this->structValues;
-  }
-  public function setValue($value)
-  {
-    $this->value = $value;
-  }
-  public function getValue()
-  {
-    return $this->value;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Bigquery/QueryRequest.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Bigquery/QueryRequest.php
deleted file mode 100644
index 7b1d5423..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Bigquery/QueryRequest.php
+++ /dev/null
@@ -1,123 +0,0 @@
-defaultDataset = $defaultDataset;
-  }
-  public function getDefaultDataset()
-  {
-    return $this->defaultDataset;
-  }
-  public function setDryRun($dryRun)
-  {
-    $this->dryRun = $dryRun;
-  }
-  public function getDryRun()
-  {
-    return $this->dryRun;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setMaxResults($maxResults)
-  {
-    $this->maxResults = $maxResults;
-  }
-  public function getMaxResults()
-  {
-    return $this->maxResults;
-  }
-  public function setParameterMode($parameterMode)
-  {
-    $this->parameterMode = $parameterMode;
-  }
-  public function getParameterMode()
-  {
-    return $this->parameterMode;
-  }
-  public function setPreserveNulls($preserveNulls)
-  {
-    $this->preserveNulls = $preserveNulls;
-  }
-  public function getPreserveNulls()
-  {
-    return $this->preserveNulls;
-  }
-  public function setQuery($query)
-  {
-    $this->query = $query;
-  }
-  public function getQuery()
-  {
-    return $this->query;
-  }
-  public function setQueryParameters($queryParameters)
-  {
-    $this->queryParameters = $queryParameters;
-  }
-  public function getQueryParameters()
-  {
-    return $this->queryParameters;
-  }
-  public function setTimeoutMs($timeoutMs)
-  {
-    $this->timeoutMs = $timeoutMs;
-  }
-  public function getTimeoutMs()
-  {
-    return $this->timeoutMs;
-  }
-  public function setUseLegacySql($useLegacySql)
-  {
-    $this->useLegacySql = $useLegacySql;
-  }
-  public function getUseLegacySql()
-  {
-    return $this->useLegacySql;
-  }
-  public function setUseQueryCache($useQueryCache)
-  {
-    $this->useQueryCache = $useQueryCache;
-  }
-  public function getUseQueryCache()
-  {
-    return $this->useQueryCache;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Bigquery/QueryResponse.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Bigquery/QueryResponse.php
deleted file mode 100644
index 7736968a..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Bigquery/QueryResponse.php
+++ /dev/null
@@ -1,125 +0,0 @@
-cacheHit = $cacheHit;
-  }
-  public function getCacheHit()
-  {
-    return $this->cacheHit;
-  }
-  public function setErrors($errors)
-  {
-    $this->errors = $errors;
-  }
-  public function getErrors()
-  {
-    return $this->errors;
-  }
-  public function setJobComplete($jobComplete)
-  {
-    $this->jobComplete = $jobComplete;
-  }
-  public function getJobComplete()
-  {
-    return $this->jobComplete;
-  }
-  public function setJobReference(Google_Service_Bigquery_JobReference $jobReference)
-  {
-    $this->jobReference = $jobReference;
-  }
-  public function getJobReference()
-  {
-    return $this->jobReference;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setNumDmlAffectedRows($numDmlAffectedRows)
-  {
-    $this->numDmlAffectedRows = $numDmlAffectedRows;
-  }
-  public function getNumDmlAffectedRows()
-  {
-    return $this->numDmlAffectedRows;
-  }
-  public function setPageToken($pageToken)
-  {
-    $this->pageToken = $pageToken;
-  }
-  public function getPageToken()
-  {
-    return $this->pageToken;
-  }
-  public function setRows($rows)
-  {
-    $this->rows = $rows;
-  }
-  public function getRows()
-  {
-    return $this->rows;
-  }
-  public function setSchema(Google_Service_Bigquery_TableSchema $schema)
-  {
-    $this->schema = $schema;
-  }
-  public function getSchema()
-  {
-    return $this->schema;
-  }
-  public function setTotalBytesProcessed($totalBytesProcessed)
-  {
-    $this->totalBytesProcessed = $totalBytesProcessed;
-  }
-  public function getTotalBytesProcessed()
-  {
-    return $this->totalBytesProcessed;
-  }
-  public function setTotalRows($totalRows)
-  {
-    $this->totalRows = $totalRows;
-  }
-  public function getTotalRows()
-  {
-    return $this->totalRows;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Bigquery/Resource/Datasets.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Bigquery/Resource/Datasets.php
deleted file mode 100644
index ebe9716a..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Bigquery/Resource/Datasets.php
+++ /dev/null
@@ -1,134 +0,0 @@
-
- *   $bigqueryService = new Google_Service_Bigquery(...);
- *   $datasets = $bigqueryService->datasets;
- *  
- */
-class Google_Service_Bigquery_Resource_Datasets extends Google_Service_Resource
-{
-  /**
-   * Deletes the dataset specified by the datasetId value. Before you can delete a
-   * dataset, you must delete all its tables, either manually or by specifying
-   * deleteContents. Immediately after deletion, you can create another dataset
-   * with the same name. (datasets.delete)
-   *
-   * @param string $projectId Project ID of the dataset being deleted
-   * @param string $datasetId Dataset ID of dataset being deleted
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param bool deleteContents If True, delete all the tables in the dataset.
-   * If False and the dataset contains tables, the request will fail. Default is
-   * False
-   */
-  public function delete($projectId, $datasetId, $optParams = array())
-  {
-    $params = array('projectId' => $projectId, 'datasetId' => $datasetId);
-    $params = array_merge($params, $optParams);
-    return $this->call('delete', array($params));
-  }
-  /**
-   * Returns the dataset specified by datasetID. (datasets.get)
-   *
-   * @param string $projectId Project ID of the requested dataset
-   * @param string $datasetId Dataset ID of the requested dataset
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Bigquery_Dataset
-   */
-  public function get($projectId, $datasetId, $optParams = array())
-  {
-    $params = array('projectId' => $projectId, 'datasetId' => $datasetId);
-    $params = array_merge($params, $optParams);
-    return $this->call('get', array($params), "Google_Service_Bigquery_Dataset");
-  }
-  /**
-   * Creates a new empty dataset. (datasets.insert)
-   *
-   * @param string $projectId Project ID of the new dataset
-   * @param Google_Service_Bigquery_Dataset $postBody
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Bigquery_Dataset
-   */
-  public function insert($projectId, Google_Service_Bigquery_Dataset $postBody, $optParams = array())
-  {
-    $params = array('projectId' => $projectId, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('insert', array($params), "Google_Service_Bigquery_Dataset");
-  }
-  /**
-   * Lists all datasets in the specified project to which you have been granted
-   * the READER dataset role. (datasets.listDatasets)
-   *
-   * @param string $projectId Project ID of the datasets to be listed
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param bool all Whether to list all datasets, including hidden ones
-   * @opt_param string filter An expression for filtering the results of the
-   * request by label. The syntax is "labels.[:]". Multiple filters can be ANDed
-   * together by connecting with a space. Example: "labels.department:receiving
-   * labels.active". See Filtering datasets using labels for details.
-   * @opt_param string maxResults The maximum number of results to return
-   * @opt_param string pageToken Page token, returned by a previous call, to
-   * request the next page of results
-   * @return Google_Service_Bigquery_DatasetList
-   */
-  public function listDatasets($projectId, $optParams = array())
-  {
-    $params = array('projectId' => $projectId);
-    $params = array_merge($params, $optParams);
-    return $this->call('list', array($params), "Google_Service_Bigquery_DatasetList");
-  }
-  /**
-   * Updates information in an existing dataset. The update method replaces the
-   * entire dataset resource, whereas the patch method only replaces fields that
-   * are provided in the submitted dataset resource. This method supports patch
-   * semantics. (datasets.patch)
-   *
-   * @param string $projectId Project ID of the dataset being updated
-   * @param string $datasetId Dataset ID of the dataset being updated
-   * @param Google_Service_Bigquery_Dataset $postBody
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Bigquery_Dataset
-   */
-  public function patch($projectId, $datasetId, Google_Service_Bigquery_Dataset $postBody, $optParams = array())
-  {
-    $params = array('projectId' => $projectId, 'datasetId' => $datasetId, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('patch', array($params), "Google_Service_Bigquery_Dataset");
-  }
-  /**
-   * Updates information in an existing dataset. The update method replaces the
-   * entire dataset resource, whereas the patch method only replaces fields that
-   * are provided in the submitted dataset resource. (datasets.update)
-   *
-   * @param string $projectId Project ID of the dataset being updated
-   * @param string $datasetId Dataset ID of the dataset being updated
-   * @param Google_Service_Bigquery_Dataset $postBody
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Bigquery_Dataset
-   */
-  public function update($projectId, $datasetId, Google_Service_Bigquery_Dataset $postBody, $optParams = array())
-  {
-    $params = array('projectId' => $projectId, 'datasetId' => $datasetId, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('update', array($params), "Google_Service_Bigquery_Dataset");
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Bigquery/Resource/Jobs.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Bigquery/Resource/Jobs.php
deleted file mode 100644
index adc6f241..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Bigquery/Resource/Jobs.php
+++ /dev/null
@@ -1,140 +0,0 @@
-
- *   $bigqueryService = new Google_Service_Bigquery(...);
- *   $jobs = $bigqueryService->jobs;
- *  
- */
-class Google_Service_Bigquery_Resource_Jobs extends Google_Service_Resource
-{
-  /**
-   * Requests that a job be cancelled. This call will return immediately, and the
-   * client will need to poll for the job status to see if the cancel completed
-   * successfully. Cancelled jobs may still incur costs. (jobs.cancel)
-   *
-   * @param string $projectId [Required] Project ID of the job to cancel
-   * @param string $jobId [Required] Job ID of the job to cancel
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Bigquery_JobCancelResponse
-   */
-  public function cancel($projectId, $jobId, $optParams = array())
-  {
-    $params = array('projectId' => $projectId, 'jobId' => $jobId);
-    $params = array_merge($params, $optParams);
-    return $this->call('cancel', array($params), "Google_Service_Bigquery_JobCancelResponse");
-  }
-  /**
-   * Returns information about a specific job. Job information is available for a
-   * six month period after creation. Requires that you're the person who ran the
-   * job, or have the Is Owner project role. (jobs.get)
-   *
-   * @param string $projectId [Required] Project ID of the requested job
-   * @param string $jobId [Required] Job ID of the requested job
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Bigquery_Job
-   */
-  public function get($projectId, $jobId, $optParams = array())
-  {
-    $params = array('projectId' => $projectId, 'jobId' => $jobId);
-    $params = array_merge($params, $optParams);
-    return $this->call('get', array($params), "Google_Service_Bigquery_Job");
-  }
-  /**
-   * Retrieves the results of a query job. (jobs.getQueryResults)
-   *
-   * @param string $projectId [Required] Project ID of the query job
-   * @param string $jobId [Required] Job ID of the query job
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param string maxResults Maximum number of results to read
-   * @opt_param string pageToken Page token, returned by a previous call, to
-   * request the next page of results
-   * @opt_param string startIndex Zero-based index of the starting row
-   * @opt_param string timeoutMs How long to wait for the query to complete, in
-   * milliseconds, before returning. Default is 10 seconds. If the timeout passes
-   * before the job completes, the 'jobComplete' field in the response will be
-   * false
-   * @return Google_Service_Bigquery_GetQueryResultsResponse
-   */
-  public function getQueryResults($projectId, $jobId, $optParams = array())
-  {
-    $params = array('projectId' => $projectId, 'jobId' => $jobId);
-    $params = array_merge($params, $optParams);
-    return $this->call('getQueryResults', array($params), "Google_Service_Bigquery_GetQueryResultsResponse");
-  }
-  /**
-   * Starts a new asynchronous job. Requires the Can View project role.
-   * (jobs.insert)
-   *
-   * @param string $projectId Project ID of the project that will be billed for
-   * the job
-   * @param Google_Service_Bigquery_Job $postBody
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Bigquery_Job
-   */
-  public function insert($projectId, Google_Service_Bigquery_Job $postBody, $optParams = array())
-  {
-    $params = array('projectId' => $projectId, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('insert', array($params), "Google_Service_Bigquery_Job");
-  }
-  /**
-   * Lists all jobs that you started in the specified project. Job information is
-   * available for a six month period after creation. The job list is sorted in
-   * reverse chronological order, by job creation time. Requires the Can View
-   * project role, or the Is Owner project role if you set the allUsers property.
-   * (jobs.listJobs)
-   *
-   * @param string $projectId Project ID of the jobs to list
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param bool allUsers Whether to display jobs owned by all users in the
-   * project. Default false
-   * @opt_param string maxResults Maximum number of results to return
-   * @opt_param string pageToken Page token, returned by a previous call, to
-   * request the next page of results
-   * @opt_param string projection Restrict information returned to a set of
-   * selected fields
-   * @opt_param string stateFilter Filter for job state
-   * @return Google_Service_Bigquery_JobList
-   */
-  public function listJobs($projectId, $optParams = array())
-  {
-    $params = array('projectId' => $projectId);
-    $params = array_merge($params, $optParams);
-    return $this->call('list', array($params), "Google_Service_Bigquery_JobList");
-  }
-  /**
-   * Runs a BigQuery SQL query synchronously and returns query results if the
-   * query completes within a specified timeout. (jobs.query)
-   *
-   * @param string $projectId Project ID of the project billed for the query
-   * @param Google_Service_Bigquery_QueryRequest $postBody
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Bigquery_QueryResponse
-   */
-  public function query($projectId, Google_Service_Bigquery_QueryRequest $postBody, $optParams = array())
-  {
-    $params = array('projectId' => $projectId, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('query', array($params), "Google_Service_Bigquery_QueryResponse");
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Bigquery/Resource/Projects.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Bigquery/Resource/Projects.php
deleted file mode 100644
index a14b0e18..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Bigquery/Resource/Projects.php
+++ /dev/null
@@ -1,45 +0,0 @@
-
- *   $bigqueryService = new Google_Service_Bigquery(...);
- *   $projects = $bigqueryService->projects;
- *  
- */
-class Google_Service_Bigquery_Resource_Projects extends Google_Service_Resource
-{
-  /**
-   * Lists all projects to which you have been granted any project role.
-   * (projects.listProjects)
-   *
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param string maxResults Maximum number of results to return
-   * @opt_param string pageToken Page token, returned by a previous call, to
-   * request the next page of results
-   * @return Google_Service_Bigquery_ProjectList
-   */
-  public function listProjects($optParams = array())
-  {
-    $params = array();
-    $params = array_merge($params, $optParams);
-    return $this->call('list', array($params), "Google_Service_Bigquery_ProjectList");
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Bigquery/Resource/Tabledata.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Bigquery/Resource/Tabledata.php
deleted file mode 100644
index c0984a19..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Bigquery/Resource/Tabledata.php
+++ /dev/null
@@ -1,66 +0,0 @@
-
- *   $bigqueryService = new Google_Service_Bigquery(...);
- *   $tabledata = $bigqueryService->tabledata;
- *  
- */
-class Google_Service_Bigquery_Resource_Tabledata extends Google_Service_Resource
-{
-  /**
-   * Streams data into BigQuery one record at a time without needing to run a load
-   * job. Requires the WRITER dataset role. (tabledata.insertAll)
-   *
-   * @param string $projectId Project ID of the destination table.
-   * @param string $datasetId Dataset ID of the destination table.
-   * @param string $tableId Table ID of the destination table.
-   * @param Google_Service_Bigquery_TableDataInsertAllRequest $postBody
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Bigquery_TableDataInsertAllResponse
-   */
-  public function insertAll($projectId, $datasetId, $tableId, Google_Service_Bigquery_TableDataInsertAllRequest $postBody, $optParams = array())
-  {
-    $params = array('projectId' => $projectId, 'datasetId' => $datasetId, 'tableId' => $tableId, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('insertAll', array($params), "Google_Service_Bigquery_TableDataInsertAllResponse");
-  }
-  /**
-   * Retrieves table data from a specified set of rows. Requires the READER
-   * dataset role. (tabledata.listTabledata)
-   *
-   * @param string $projectId Project ID of the table to read
-   * @param string $datasetId Dataset ID of the table to read
-   * @param string $tableId Table ID of the table to read
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param string maxResults Maximum number of results to return
-   * @opt_param string pageToken Page token, returned by a previous call,
-   * identifying the result set
-   * @opt_param string startIndex Zero-based index of the starting row to read
-   * @return Google_Service_Bigquery_TableDataList
-   */
-  public function listTabledata($projectId, $datasetId, $tableId, $optParams = array())
-  {
-    $params = array('projectId' => $projectId, 'datasetId' => $datasetId, 'tableId' => $tableId);
-    $params = array_merge($params, $optParams);
-    return $this->call('list', array($params), "Google_Service_Bigquery_TableDataList");
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Bigquery/Resource/Tables.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Bigquery/Resource/Tables.php
deleted file mode 100644
index 063bddfb..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Bigquery/Resource/Tables.php
+++ /dev/null
@@ -1,131 +0,0 @@
-
- *   $bigqueryService = new Google_Service_Bigquery(...);
- *   $tables = $bigqueryService->tables;
- *  
- */
-class Google_Service_Bigquery_Resource_Tables extends Google_Service_Resource
-{
-  /**
-   * Deletes the table specified by tableId from the dataset. If the table
-   * contains data, all the data will be deleted. (tables.delete)
-   *
-   * @param string $projectId Project ID of the table to delete
-   * @param string $datasetId Dataset ID of the table to delete
-   * @param string $tableId Table ID of the table to delete
-   * @param array $optParams Optional parameters.
-   */
-  public function delete($projectId, $datasetId, $tableId, $optParams = array())
-  {
-    $params = array('projectId' => $projectId, 'datasetId' => $datasetId, 'tableId' => $tableId);
-    $params = array_merge($params, $optParams);
-    return $this->call('delete', array($params));
-  }
-  /**
-   * Gets the specified table resource by table ID. This method does not return
-   * the data in the table, it only returns the table resource, which describes
-   * the structure of this table. (tables.get)
-   *
-   * @param string $projectId Project ID of the requested table
-   * @param string $datasetId Dataset ID of the requested table
-   * @param string $tableId Table ID of the requested table
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Bigquery_Table
-   */
-  public function get($projectId, $datasetId, $tableId, $optParams = array())
-  {
-    $params = array('projectId' => $projectId, 'datasetId' => $datasetId, 'tableId' => $tableId);
-    $params = array_merge($params, $optParams);
-    return $this->call('get', array($params), "Google_Service_Bigquery_Table");
-  }
-  /**
-   * Creates a new, empty table in the dataset. (tables.insert)
-   *
-   * @param string $projectId Project ID of the new table
-   * @param string $datasetId Dataset ID of the new table
-   * @param Google_Service_Bigquery_Table $postBody
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Bigquery_Table
-   */
-  public function insert($projectId, $datasetId, Google_Service_Bigquery_Table $postBody, $optParams = array())
-  {
-    $params = array('projectId' => $projectId, 'datasetId' => $datasetId, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('insert', array($params), "Google_Service_Bigquery_Table");
-  }
-  /**
-   * Lists all tables in the specified dataset. Requires the READER dataset role.
-   * (tables.listTables)
-   *
-   * @param string $projectId Project ID of the tables to list
-   * @param string $datasetId Dataset ID of the tables to list
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param string maxResults Maximum number of results to return
-   * @opt_param string pageToken Page token, returned by a previous call, to
-   * request the next page of results
-   * @return Google_Service_Bigquery_TableList
-   */
-  public function listTables($projectId, $datasetId, $optParams = array())
-  {
-    $params = array('projectId' => $projectId, 'datasetId' => $datasetId);
-    $params = array_merge($params, $optParams);
-    return $this->call('list', array($params), "Google_Service_Bigquery_TableList");
-  }
-  /**
-   * Updates information in an existing table. The update method replaces the
-   * entire table resource, whereas the patch method only replaces fields that are
-   * provided in the submitted table resource. This method supports patch
-   * semantics. (tables.patch)
-   *
-   * @param string $projectId Project ID of the table to update
-   * @param string $datasetId Dataset ID of the table to update
-   * @param string $tableId Table ID of the table to update
-   * @param Google_Service_Bigquery_Table $postBody
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Bigquery_Table
-   */
-  public function patch($projectId, $datasetId, $tableId, Google_Service_Bigquery_Table $postBody, $optParams = array())
-  {
-    $params = array('projectId' => $projectId, 'datasetId' => $datasetId, 'tableId' => $tableId, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('patch', array($params), "Google_Service_Bigquery_Table");
-  }
-  /**
-   * Updates information in an existing table. The update method replaces the
-   * entire table resource, whereas the patch method only replaces fields that are
-   * provided in the submitted table resource. (tables.update)
-   *
-   * @param string $projectId Project ID of the table to update
-   * @param string $datasetId Dataset ID of the table to update
-   * @param string $tableId Table ID of the table to update
-   * @param Google_Service_Bigquery_Table $postBody
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Bigquery_Table
-   */
-  public function update($projectId, $datasetId, $tableId, Google_Service_Bigquery_Table $postBody, $optParams = array())
-  {
-    $params = array('projectId' => $projectId, 'datasetId' => $datasetId, 'tableId' => $tableId, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('update', array($params), "Google_Service_Bigquery_Table");
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Bigquery/Streamingbuffer.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Bigquery/Streamingbuffer.php
deleted file mode 100644
index 4bf63704..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Bigquery/Streamingbuffer.php
+++ /dev/null
@@ -1,48 +0,0 @@
-estimatedBytes = $estimatedBytes;
-  }
-  public function getEstimatedBytes()
-  {
-    return $this->estimatedBytes;
-  }
-  public function setEstimatedRows($estimatedRows)
-  {
-    $this->estimatedRows = $estimatedRows;
-  }
-  public function getEstimatedRows()
-  {
-    return $this->estimatedRows;
-  }
-  public function setOldestEntryTime($oldestEntryTime)
-  {
-    $this->oldestEntryTime = $oldestEntryTime;
-  }
-  public function getOldestEntryTime()
-  {
-    return $this->oldestEntryTime;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Bigquery/Table.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Bigquery/Table.php
deleted file mode 100644
index 6d6521fd..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Bigquery/Table.php
+++ /dev/null
@@ -1,216 +0,0 @@
-creationTime = $creationTime;
-  }
-  public function getCreationTime()
-  {
-    return $this->creationTime;
-  }
-  public function setDescription($description)
-  {
-    $this->description = $description;
-  }
-  public function getDescription()
-  {
-    return $this->description;
-  }
-  public function setEtag($etag)
-  {
-    $this->etag = $etag;
-  }
-  public function getEtag()
-  {
-    return $this->etag;
-  }
-  public function setExpirationTime($expirationTime)
-  {
-    $this->expirationTime = $expirationTime;
-  }
-  public function getExpirationTime()
-  {
-    return $this->expirationTime;
-  }
-  public function setExternalDataConfiguration(Google_Service_Bigquery_ExternalDataConfiguration $externalDataConfiguration)
-  {
-    $this->externalDataConfiguration = $externalDataConfiguration;
-  }
-  public function getExternalDataConfiguration()
-  {
-    return $this->externalDataConfiguration;
-  }
-  public function setFriendlyName($friendlyName)
-  {
-    $this->friendlyName = $friendlyName;
-  }
-  public function getFriendlyName()
-  {
-    return $this->friendlyName;
-  }
-  public function setId($id)
-  {
-    $this->id = $id;
-  }
-  public function getId()
-  {
-    return $this->id;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setLabels($labels)
-  {
-    $this->labels = $labels;
-  }
-  public function getLabels()
-  {
-    return $this->labels;
-  }
-  public function setLastModifiedTime($lastModifiedTime)
-  {
-    $this->lastModifiedTime = $lastModifiedTime;
-  }
-  public function getLastModifiedTime()
-  {
-    return $this->lastModifiedTime;
-  }
-  public function setLocation($location)
-  {
-    $this->location = $location;
-  }
-  public function getLocation()
-  {
-    return $this->location;
-  }
-  public function setNumBytes($numBytes)
-  {
-    $this->numBytes = $numBytes;
-  }
-  public function getNumBytes()
-  {
-    return $this->numBytes;
-  }
-  public function setNumLongTermBytes($numLongTermBytes)
-  {
-    $this->numLongTermBytes = $numLongTermBytes;
-  }
-  public function getNumLongTermBytes()
-  {
-    return $this->numLongTermBytes;
-  }
-  public function setNumRows($numRows)
-  {
-    $this->numRows = $numRows;
-  }
-  public function getNumRows()
-  {
-    return $this->numRows;
-  }
-  public function setSchema(Google_Service_Bigquery_TableSchema $schema)
-  {
-    $this->schema = $schema;
-  }
-  public function getSchema()
-  {
-    return $this->schema;
-  }
-  public function setSelfLink($selfLink)
-  {
-    $this->selfLink = $selfLink;
-  }
-  public function getSelfLink()
-  {
-    return $this->selfLink;
-  }
-  public function setStreamingBuffer(Google_Service_Bigquery_Streamingbuffer $streamingBuffer)
-  {
-    $this->streamingBuffer = $streamingBuffer;
-  }
-  public function getStreamingBuffer()
-  {
-    return $this->streamingBuffer;
-  }
-  public function setTableReference(Google_Service_Bigquery_TableReference $tableReference)
-  {
-    $this->tableReference = $tableReference;
-  }
-  public function getTableReference()
-  {
-    return $this->tableReference;
-  }
-  public function setTimePartitioning(Google_Service_Bigquery_TimePartitioning $timePartitioning)
-  {
-    $this->timePartitioning = $timePartitioning;
-  }
-  public function getTimePartitioning()
-  {
-    return $this->timePartitioning;
-  }
-  public function setType($type)
-  {
-    $this->type = $type;
-  }
-  public function getType()
-  {
-    return $this->type;
-  }
-  public function setView(Google_Service_Bigquery_ViewDefinition $view)
-  {
-    $this->view = $view;
-  }
-  public function getView()
-  {
-    return $this->view;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Bigquery/TableCell.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Bigquery/TableCell.php
deleted file mode 100644
index 29909c03..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Bigquery/TableCell.php
+++ /dev/null
@@ -1,30 +0,0 @@
-v = $v;
-  }
-  public function getV()
-  {
-    return $this->v;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Bigquery/TableDataInsertAllRequest.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Bigquery/TableDataInsertAllRequest.php
deleted file mode 100644
index 70b6cd7b..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Bigquery/TableDataInsertAllRequest.php
+++ /dev/null
@@ -1,68 +0,0 @@
-ignoreUnknownValues = $ignoreUnknownValues;
-  }
-  public function getIgnoreUnknownValues()
-  {
-    return $this->ignoreUnknownValues;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setRows($rows)
-  {
-    $this->rows = $rows;
-  }
-  public function getRows()
-  {
-    return $this->rows;
-  }
-  public function setSkipInvalidRows($skipInvalidRows)
-  {
-    $this->skipInvalidRows = $skipInvalidRows;
-  }
-  public function getSkipInvalidRows()
-  {
-    return $this->skipInvalidRows;
-  }
-  public function setTemplateSuffix($templateSuffix)
-  {
-    $this->templateSuffix = $templateSuffix;
-  }
-  public function getTemplateSuffix()
-  {
-    return $this->templateSuffix;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Bigquery/TableDataInsertAllRequestRows.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Bigquery/TableDataInsertAllRequestRows.php
deleted file mode 100644
index 9467a738..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Bigquery/TableDataInsertAllRequestRows.php
+++ /dev/null
@@ -1,39 +0,0 @@
-insertId = $insertId;
-  }
-  public function getInsertId()
-  {
-    return $this->insertId;
-  }
-  public function setJson($json)
-  {
-    $this->json = $json;
-  }
-  public function getJson()
-  {
-    return $this->json;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Bigquery/TableDataInsertAllResponse.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Bigquery/TableDataInsertAllResponse.php
deleted file mode 100644
index 09e42b02..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Bigquery/TableDataInsertAllResponse.php
+++ /dev/null
@@ -1,41 +0,0 @@
-insertErrors = $insertErrors;
-  }
-  public function getInsertErrors()
-  {
-    return $this->insertErrors;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Bigquery/TableDataInsertAllResponseInsertErrors.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Bigquery/TableDataInsertAllResponseInsertErrors.php
deleted file mode 100644
index 28c7b4f4..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Bigquery/TableDataInsertAllResponseInsertErrors.php
+++ /dev/null
@@ -1,41 +0,0 @@
-errors = $errors;
-  }
-  public function getErrors()
-  {
-    return $this->errors;
-  }
-  public function setIndex($index)
-  {
-    $this->index = $index;
-  }
-  public function getIndex()
-  {
-    return $this->index;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Bigquery/TableDataList.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Bigquery/TableDataList.php
deleted file mode 100644
index 0faf8c73..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Bigquery/TableDataList.php
+++ /dev/null
@@ -1,68 +0,0 @@
-etag = $etag;
-  }
-  public function getEtag()
-  {
-    return $this->etag;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setPageToken($pageToken)
-  {
-    $this->pageToken = $pageToken;
-  }
-  public function getPageToken()
-  {
-    return $this->pageToken;
-  }
-  public function setRows($rows)
-  {
-    $this->rows = $rows;
-  }
-  public function getRows()
-  {
-    return $this->rows;
-  }
-  public function setTotalRows($totalRows)
-  {
-    $this->totalRows = $totalRows;
-  }
-  public function getTotalRows()
-  {
-    return $this->totalRows;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Bigquery/TableFieldSchema.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Bigquery/TableFieldSchema.php
deleted file mode 100644
index 140fbece..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Bigquery/TableFieldSchema.php
+++ /dev/null
@@ -1,68 +0,0 @@
-description = $description;
-  }
-  public function getDescription()
-  {
-    return $this->description;
-  }
-  public function setFields($fields)
-  {
-    $this->fields = $fields;
-  }
-  public function getFields()
-  {
-    return $this->fields;
-  }
-  public function setMode($mode)
-  {
-    $this->mode = $mode;
-  }
-  public function getMode()
-  {
-    return $this->mode;
-  }
-  public function setName($name)
-  {
-    $this->name = $name;
-  }
-  public function getName()
-  {
-    return $this->name;
-  }
-  public function setType($type)
-  {
-    $this->type = $type;
-  }
-  public function getType()
-  {
-    return $this->type;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Bigquery/TableList.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Bigquery/TableList.php
deleted file mode 100644
index 1c471637..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Bigquery/TableList.php
+++ /dev/null
@@ -1,68 +0,0 @@
-etag = $etag;
-  }
-  public function getEtag()
-  {
-    return $this->etag;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setNextPageToken($nextPageToken)
-  {
-    $this->nextPageToken = $nextPageToken;
-  }
-  public function getNextPageToken()
-  {
-    return $this->nextPageToken;
-  }
-  public function setTables($tables)
-  {
-    $this->tables = $tables;
-  }
-  public function getTables()
-  {
-    return $this->tables;
-  }
-  public function setTotalItems($totalItems)
-  {
-    $this->totalItems = $totalItems;
-  }
-  public function getTotalItems()
-  {
-    return $this->totalItems;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Bigquery/TableListTables.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Bigquery/TableListTables.php
deleted file mode 100644
index 08aecbae..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Bigquery/TableListTables.php
+++ /dev/null
@@ -1,86 +0,0 @@
-friendlyName = $friendlyName;
-  }
-  public function getFriendlyName()
-  {
-    return $this->friendlyName;
-  }
-  public function setId($id)
-  {
-    $this->id = $id;
-  }
-  public function getId()
-  {
-    return $this->id;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setLabels($labels)
-  {
-    $this->labels = $labels;
-  }
-  public function getLabels()
-  {
-    return $this->labels;
-  }
-  public function setTableReference(Google_Service_Bigquery_TableReference $tableReference)
-  {
-    $this->tableReference = $tableReference;
-  }
-  public function getTableReference()
-  {
-    return $this->tableReference;
-  }
-  public function setType($type)
-  {
-    $this->type = $type;
-  }
-  public function getType()
-  {
-    return $this->type;
-  }
-  public function setView(Google_Service_Bigquery_TableListTablesView $view)
-  {
-    $this->view = $view;
-  }
-  public function getView()
-  {
-    return $this->view;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Bigquery/TableListTablesView.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Bigquery/TableListTablesView.php
deleted file mode 100644
index 75cd863a..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Bigquery/TableListTablesView.php
+++ /dev/null
@@ -1,30 +0,0 @@
-useLegacySql = $useLegacySql;
-  }
-  public function getUseLegacySql()
-  {
-    return $this->useLegacySql;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Bigquery/TableReference.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Bigquery/TableReference.php
deleted file mode 100644
index 9f6f5043..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Bigquery/TableReference.php
+++ /dev/null
@@ -1,48 +0,0 @@
-datasetId = $datasetId;
-  }
-  public function getDatasetId()
-  {
-    return $this->datasetId;
-  }
-  public function setProjectId($projectId)
-  {
-    $this->projectId = $projectId;
-  }
-  public function getProjectId()
-  {
-    return $this->projectId;
-  }
-  public function setTableId($tableId)
-  {
-    $this->tableId = $tableId;
-  }
-  public function getTableId()
-  {
-    return $this->tableId;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Bigquery/TableRow.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Bigquery/TableRow.php
deleted file mode 100644
index 2d6a0190..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Bigquery/TableRow.php
+++ /dev/null
@@ -1,32 +0,0 @@
-f = $f;
-  }
-  public function getF()
-  {
-    return $this->f;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Bigquery/TableSchema.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Bigquery/TableSchema.php
deleted file mode 100644
index 9f0266e1..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Bigquery/TableSchema.php
+++ /dev/null
@@ -1,32 +0,0 @@
-fields = $fields;
-  }
-  public function getFields()
-  {
-    return $this->fields;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Bigquery/TimePartitioning.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Bigquery/TimePartitioning.php
deleted file mode 100644
index c89e2b66..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Bigquery/TimePartitioning.php
+++ /dev/null
@@ -1,39 +0,0 @@
-expirationMs = $expirationMs;
-  }
-  public function getExpirationMs()
-  {
-    return $this->expirationMs;
-  }
-  public function setType($type)
-  {
-    $this->type = $type;
-  }
-  public function getType()
-  {
-    return $this->type;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Bigquery/UserDefinedFunctionResource.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Bigquery/UserDefinedFunctionResource.php
deleted file mode 100644
index 60d19d52..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Bigquery/UserDefinedFunctionResource.php
+++ /dev/null
@@ -1,39 +0,0 @@
-inlineCode = $inlineCode;
-  }
-  public function getInlineCode()
-  {
-    return $this->inlineCode;
-  }
-  public function setResourceUri($resourceUri)
-  {
-    $this->resourceUri = $resourceUri;
-  }
-  public function getResourceUri()
-  {
-    return $this->resourceUri;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Bigquery/ViewDefinition.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Bigquery/ViewDefinition.php
deleted file mode 100644
index 1692c994..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Bigquery/ViewDefinition.php
+++ /dev/null
@@ -1,50 +0,0 @@
-query = $query;
-  }
-  public function getQuery()
-  {
-    return $this->query;
-  }
-  public function setUseLegacySql($useLegacySql)
-  {
-    $this->useLegacySql = $useLegacySql;
-  }
-  public function getUseLegacySql()
-  {
-    return $this->useLegacySql;
-  }
-  public function setUserDefinedFunctionResources($userDefinedFunctionResources)
-  {
-    $this->userDefinedFunctionResources = $userDefinedFunctionResources;
-  }
-  public function getUserDefinedFunctionResources()
-  {
-    return $this->userDefinedFunctionResources;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Blogger.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Blogger.php
deleted file mode 100644
index f8560dc8..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Blogger.php
+++ /dev/null
@@ -1,930 +0,0 @@
-
- * API for access to the data within Blogger.

- *
- * 

- * For more information about this service, see the API
- * Documentation
- * 

- *
- * @author Google, Inc.
- */
-class Google_Service_Blogger extends Google_Service
-{
-  /** Manage your Blogger account. */
-  const BLOGGER =
-      "https://www.googleapis.com/auth/blogger";
-  /** View your Blogger account. */
-  const BLOGGER_READONLY =
-      "https://www.googleapis.com/auth/blogger.readonly";
-
-  public $blogUserInfos;
-  public $blogs;
-  public $comments;
-  public $pageViews;
-  public $pages;
-  public $postUserInfos;
-  public $posts;
-  public $users;
-  
-  /**
-   * Constructs the internal representation of the Blogger service.
-   *
-   * @param Google_Client $client
-   */
-  public function __construct(Google_Client $client)
-  {
-    parent::__construct($client);
-    $this->rootUrl = 'https://www.googleapis.com/';
-    $this->servicePath = 'blogger/v3/';
-    $this->version = 'v3';
-    $this->serviceName = 'blogger';
-
-    $this->blogUserInfos = new Google_Service_Blogger_Resource_BlogUserInfos(
-        $this,
-        $this->serviceName,
-        'blogUserInfos',
-        array(
-          'methods' => array(
-            'get' => array(
-              'path' => 'users/{userId}/blogs/{blogId}',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'userId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'blogId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'maxPosts' => array(
-                  'location' => 'query',
-                  'type' => 'integer',
-                ),
-              ),
-            ),
-          )
-        )
-    );
-    $this->blogs = new Google_Service_Blogger_Resource_Blogs(
-        $this,
-        $this->serviceName,
-        'blogs',
-        array(
-          'methods' => array(
-            'get' => array(
-              'path' => 'blogs/{blogId}',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'blogId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'maxPosts' => array(
-                  'location' => 'query',
-                  'type' => 'integer',
-                ),
-                'view' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-              ),
-            ),'getByUrl' => array(
-              'path' => 'blogs/byurl',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'url' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'view' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-              ),
-            ),'listByUser' => array(
-              'path' => 'users/{userId}/blogs',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'userId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'fetchUserInfo' => array(
-                  'location' => 'query',
-                  'type' => 'boolean',
-                ),
-                'role' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                  'repeated' => true,
-                ),
-                'status' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                  'repeated' => true,
-                ),
-                'view' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-              ),
-            ),
-          )
-        )
-    );
-    $this->comments = new Google_Service_Blogger_Resource_Comments(
-        $this,
-        $this->serviceName,
-        'comments',
-        array(
-          'methods' => array(
-            'approve' => array(
-              'path' => 'blogs/{blogId}/posts/{postId}/comments/{commentId}/approve',
-              'httpMethod' => 'POST',
-              'parameters' => array(
-                'blogId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'postId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'commentId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'delete' => array(
-              'path' => 'blogs/{blogId}/posts/{postId}/comments/{commentId}',
-              'httpMethod' => 'DELETE',
-              'parameters' => array(
-                'blogId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'postId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'commentId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'get' => array(
-              'path' => 'blogs/{blogId}/posts/{postId}/comments/{commentId}',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'blogId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'postId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'commentId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'view' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-              ),
-            ),'list' => array(
-              'path' => 'blogs/{blogId}/posts/{postId}/comments',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'blogId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'postId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'endDate' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'fetchBodies' => array(
-                  'location' => 'query',
-                  'type' => 'boolean',
-                ),
-                'maxResults' => array(
-                  'location' => 'query',
-                  'type' => 'integer',
-                ),
-                'pageToken' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'startDate' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'status' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                  'repeated' => true,
-                ),
-                'view' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-              ),
-            ),'listByBlog' => array(
-              'path' => 'blogs/{blogId}/comments',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'blogId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'endDate' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'fetchBodies' => array(
-                  'location' => 'query',
-                  'type' => 'boolean',
-                ),
-                'maxResults' => array(
-                  'location' => 'query',
-                  'type' => 'integer',
-                ),
-                'pageToken' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'startDate' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'status' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                  'repeated' => true,
-                ),
-              ),
-            ),'markAsSpam' => array(
-              'path' => 'blogs/{blogId}/posts/{postId}/comments/{commentId}/spam',
-              'httpMethod' => 'POST',
-              'parameters' => array(
-                'blogId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'postId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'commentId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'removeContent' => array(
-              'path' => 'blogs/{blogId}/posts/{postId}/comments/{commentId}/removecontent',
-              'httpMethod' => 'POST',
-              'parameters' => array(
-                'blogId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'postId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'commentId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),
-          )
-        )
-    );
-    $this->pageViews = new Google_Service_Blogger_Resource_PageViews(
-        $this,
-        $this->serviceName,
-        'pageViews',
-        array(
-          'methods' => array(
-            'get' => array(
-              'path' => 'blogs/{blogId}/pageviews',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'blogId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'range' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                  'repeated' => true,
-                ),
-              ),
-            ),
-          )
-        )
-    );
-    $this->pages = new Google_Service_Blogger_Resource_Pages(
-        $this,
-        $this->serviceName,
-        'pages',
-        array(
-          'methods' => array(
-            'delete' => array(
-              'path' => 'blogs/{blogId}/pages/{pageId}',
-              'httpMethod' => 'DELETE',
-              'parameters' => array(
-                'blogId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'pageId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'get' => array(
-              'path' => 'blogs/{blogId}/pages/{pageId}',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'blogId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'pageId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'view' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-              ),
-            ),'insert' => array(
-              'path' => 'blogs/{blogId}/pages',
-              'httpMethod' => 'POST',
-              'parameters' => array(
-                'blogId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'isDraft' => array(
-                  'location' => 'query',
-                  'type' => 'boolean',
-                ),
-              ),
-            ),'list' => array(
-              'path' => 'blogs/{blogId}/pages',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'blogId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'fetchBodies' => array(
-                  'location' => 'query',
-                  'type' => 'boolean',
-                ),
-                'maxResults' => array(
-                  'location' => 'query',
-                  'type' => 'integer',
-                ),
-                'pageToken' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'status' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                  'repeated' => true,
-                ),
-                'view' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-              ),
-            ),'patch' => array(
-              'path' => 'blogs/{blogId}/pages/{pageId}',
-              'httpMethod' => 'PATCH',
-              'parameters' => array(
-                'blogId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'pageId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'publish' => array(
-                  'location' => 'query',
-                  'type' => 'boolean',
-                ),
-                'revert' => array(
-                  'location' => 'query',
-                  'type' => 'boolean',
-                ),
-              ),
-            ),'publish' => array(
-              'path' => 'blogs/{blogId}/pages/{pageId}/publish',
-              'httpMethod' => 'POST',
-              'parameters' => array(
-                'blogId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'pageId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'revert' => array(
-              'path' => 'blogs/{blogId}/pages/{pageId}/revert',
-              'httpMethod' => 'POST',
-              'parameters' => array(
-                'blogId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'pageId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'update' => array(
-              'path' => 'blogs/{blogId}/pages/{pageId}',
-              'httpMethod' => 'PUT',
-              'parameters' => array(
-                'blogId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'pageId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'publish' => array(
-                  'location' => 'query',
-                  'type' => 'boolean',
-                ),
-                'revert' => array(
-                  'location' => 'query',
-                  'type' => 'boolean',
-                ),
-              ),
-            ),
-          )
-        )
-    );
-    $this->postUserInfos = new Google_Service_Blogger_Resource_PostUserInfos(
-        $this,
-        $this->serviceName,
-        'postUserInfos',
-        array(
-          'methods' => array(
-            'get' => array(
-              'path' => 'users/{userId}/blogs/{blogId}/posts/{postId}',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'userId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'blogId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'postId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'maxComments' => array(
-                  'location' => 'query',
-                  'type' => 'integer',
-                ),
-              ),
-            ),'list' => array(
-              'path' => 'users/{userId}/blogs/{blogId}/posts',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'userId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'blogId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'endDate' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'fetchBodies' => array(
-                  'location' => 'query',
-                  'type' => 'boolean',
-                ),
-                'labels' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'maxResults' => array(
-                  'location' => 'query',
-                  'type' => 'integer',
-                ),
-                'orderBy' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'pageToken' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'startDate' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'status' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                  'repeated' => true,
-                ),
-                'view' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-              ),
-            ),
-          )
-        )
-    );
-    $this->posts = new Google_Service_Blogger_Resource_Posts(
-        $this,
-        $this->serviceName,
-        'posts',
-        array(
-          'methods' => array(
-            'delete' => array(
-              'path' => 'blogs/{blogId}/posts/{postId}',
-              'httpMethod' => 'DELETE',
-              'parameters' => array(
-                'blogId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'postId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'get' => array(
-              'path' => 'blogs/{blogId}/posts/{postId}',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'blogId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'postId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'fetchBody' => array(
-                  'location' => 'query',
-                  'type' => 'boolean',
-                ),
-                'fetchImages' => array(
-                  'location' => 'query',
-                  'type' => 'boolean',
-                ),
-                'maxComments' => array(
-                  'location' => 'query',
-                  'type' => 'integer',
-                ),
-                'view' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-              ),
-            ),'getByPath' => array(
-              'path' => 'blogs/{blogId}/posts/bypath',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'blogId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'path' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'maxComments' => array(
-                  'location' => 'query',
-                  'type' => 'integer',
-                ),
-                'view' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-              ),
-            ),'insert' => array(
-              'path' => 'blogs/{blogId}/posts',
-              'httpMethod' => 'POST',
-              'parameters' => array(
-                'blogId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'fetchBody' => array(
-                  'location' => 'query',
-                  'type' => 'boolean',
-                ),
-                'fetchImages' => array(
-                  'location' => 'query',
-                  'type' => 'boolean',
-                ),
-                'isDraft' => array(
-                  'location' => 'query',
-                  'type' => 'boolean',
-                ),
-              ),
-            ),'list' => array(
-              'path' => 'blogs/{blogId}/posts',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'blogId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'endDate' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'fetchBodies' => array(
-                  'location' => 'query',
-                  'type' => 'boolean',
-                ),
-                'fetchImages' => array(
-                  'location' => 'query',
-                  'type' => 'boolean',
-                ),
-                'labels' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'maxResults' => array(
-                  'location' => 'query',
-                  'type' => 'integer',
-                ),
-                'orderBy' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'pageToken' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'startDate' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'status' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                  'repeated' => true,
-                ),
-                'view' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-              ),
-            ),'patch' => array(
-              'path' => 'blogs/{blogId}/posts/{postId}',
-              'httpMethod' => 'PATCH',
-              'parameters' => array(
-                'blogId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'postId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'fetchBody' => array(
-                  'location' => 'query',
-                  'type' => 'boolean',
-                ),
-                'fetchImages' => array(
-                  'location' => 'query',
-                  'type' => 'boolean',
-                ),
-                'maxComments' => array(
-                  'location' => 'query',
-                  'type' => 'integer',
-                ),
-                'publish' => array(
-                  'location' => 'query',
-                  'type' => 'boolean',
-                ),
-                'revert' => array(
-                  'location' => 'query',
-                  'type' => 'boolean',
-                ),
-              ),
-            ),'publish' => array(
-              'path' => 'blogs/{blogId}/posts/{postId}/publish',
-              'httpMethod' => 'POST',
-              'parameters' => array(
-                'blogId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'postId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'publishDate' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-              ),
-            ),'revert' => array(
-              'path' => 'blogs/{blogId}/posts/{postId}/revert',
-              'httpMethod' => 'POST',
-              'parameters' => array(
-                'blogId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'postId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'search' => array(
-              'path' => 'blogs/{blogId}/posts/search',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'blogId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'q' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'fetchBodies' => array(
-                  'location' => 'query',
-                  'type' => 'boolean',
-                ),
-                'orderBy' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-              ),
-            ),'update' => array(
-              'path' => 'blogs/{blogId}/posts/{postId}',
-              'httpMethod' => 'PUT',
-              'parameters' => array(
-                'blogId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'postId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'fetchBody' => array(
-                  'location' => 'query',
-                  'type' => 'boolean',
-                ),
-                'fetchImages' => array(
-                  'location' => 'query',
-                  'type' => 'boolean',
-                ),
-                'maxComments' => array(
-                  'location' => 'query',
-                  'type' => 'integer',
-                ),
-                'publish' => array(
-                  'location' => 'query',
-                  'type' => 'boolean',
-                ),
-                'revert' => array(
-                  'location' => 'query',
-                  'type' => 'boolean',
-                ),
-              ),
-            ),
-          )
-        )
-    );
-    $this->users = new Google_Service_Blogger_Resource_Users(
-        $this,
-        $this->serviceName,
-        'users',
-        array(
-          'methods' => array(
-            'get' => array(
-              'path' => 'users/{userId}',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'userId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),
-          )
-        )
-    );
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Blogger/Blog.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Blogger/Blog.php
deleted file mode 100644
index cab4de8f..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Blogger/Blog.php
+++ /dev/null
@@ -1,141 +0,0 @@
-customMetaData = $customMetaData;
-  }
-  public function getCustomMetaData()
-  {
-    return $this->customMetaData;
-  }
-  public function setDescription($description)
-  {
-    $this->description = $description;
-  }
-  public function getDescription()
-  {
-    return $this->description;
-  }
-  public function setId($id)
-  {
-    $this->id = $id;
-  }
-  public function getId()
-  {
-    return $this->id;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setLocale(Google_Service_Blogger_BlogLocale $locale)
-  {
-    $this->locale = $locale;
-  }
-  public function getLocale()
-  {
-    return $this->locale;
-  }
-  public function setName($name)
-  {
-    $this->name = $name;
-  }
-  public function getName()
-  {
-    return $this->name;
-  }
-  public function setPages(Google_Service_Blogger_BlogPages $pages)
-  {
-    $this->pages = $pages;
-  }
-  public function getPages()
-  {
-    return $this->pages;
-  }
-  public function setPosts(Google_Service_Blogger_BlogPosts $posts)
-  {
-    $this->posts = $posts;
-  }
-  public function getPosts()
-  {
-    return $this->posts;
-  }
-  public function setPublished($published)
-  {
-    $this->published = $published;
-  }
-  public function getPublished()
-  {
-    return $this->published;
-  }
-  public function setSelfLink($selfLink)
-  {
-    $this->selfLink = $selfLink;
-  }
-  public function getSelfLink()
-  {
-    return $this->selfLink;
-  }
-  public function setStatus($status)
-  {
-    $this->status = $status;
-  }
-  public function getStatus()
-  {
-    return $this->status;
-  }
-  public function setUpdated($updated)
-  {
-    $this->updated = $updated;
-  }
-  public function getUpdated()
-  {
-    return $this->updated;
-  }
-  public function setUrl($url)
-  {
-    $this->url = $url;
-  }
-  public function getUrl()
-  {
-    return $this->url;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Blogger/BlogList.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Blogger/BlogList.php
deleted file mode 100644
index 9fde7e1e..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Blogger/BlogList.php
+++ /dev/null
@@ -1,51 +0,0 @@
-blogUserInfos = $blogUserInfos;
-  }
-  public function getBlogUserInfos()
-  {
-    return $this->blogUserInfos;
-  }
-  public function setItems($items)
-  {
-    $this->items = $items;
-  }
-  public function getItems()
-  {
-    return $this->items;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Blogger/BlogLocale.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Blogger/BlogLocale.php
deleted file mode 100644
index 3cf95449..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Blogger/BlogLocale.php
+++ /dev/null
@@ -1,48 +0,0 @@
-country = $country;
-  }
-  public function getCountry()
-  {
-    return $this->country;
-  }
-  public function setLanguage($language)
-  {
-    $this->language = $language;
-  }
-  public function getLanguage()
-  {
-    return $this->language;
-  }
-  public function setVariant($variant)
-  {
-    $this->variant = $variant;
-  }
-  public function getVariant()
-  {
-    return $this->variant;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Blogger/BlogPages.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Blogger/BlogPages.php
deleted file mode 100644
index 48658153..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Blogger/BlogPages.php
+++ /dev/null
@@ -1,39 +0,0 @@
-selfLink = $selfLink;
-  }
-  public function getSelfLink()
-  {
-    return $this->selfLink;
-  }
-  public function setTotalItems($totalItems)
-  {
-    $this->totalItems = $totalItems;
-  }
-  public function getTotalItems()
-  {
-    return $this->totalItems;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Blogger/BlogPerUserInfo.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Blogger/BlogPerUserInfo.php
deleted file mode 100644
index 43625b90..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Blogger/BlogPerUserInfo.php
+++ /dev/null
@@ -1,75 +0,0 @@
-blogId = $blogId;
-  }
-  public function getBlogId()
-  {
-    return $this->blogId;
-  }
-  public function setHasAdminAccess($hasAdminAccess)
-  {
-    $this->hasAdminAccess = $hasAdminAccess;
-  }
-  public function getHasAdminAccess()
-  {
-    return $this->hasAdminAccess;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setPhotosAlbumKey($photosAlbumKey)
-  {
-    $this->photosAlbumKey = $photosAlbumKey;
-  }
-  public function getPhotosAlbumKey()
-  {
-    return $this->photosAlbumKey;
-  }
-  public function setRole($role)
-  {
-    $this->role = $role;
-  }
-  public function getRole()
-  {
-    return $this->role;
-  }
-  public function setUserId($userId)
-  {
-    $this->userId = $userId;
-  }
-  public function getUserId()
-  {
-    return $this->userId;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Blogger/BlogPosts.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Blogger/BlogPosts.php
deleted file mode 100644
index 20c52cc6..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Blogger/BlogPosts.php
+++ /dev/null
@@ -1,50 +0,0 @@
-items = $items;
-  }
-  public function getItems()
-  {
-    return $this->items;
-  }
-  public function setSelfLink($selfLink)
-  {
-    $this->selfLink = $selfLink;
-  }
-  public function getSelfLink()
-  {
-    return $this->selfLink;
-  }
-  public function setTotalItems($totalItems)
-  {
-    $this->totalItems = $totalItems;
-  }
-  public function getTotalItems()
-  {
-    return $this->totalItems;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Blogger/BlogUserInfo.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Blogger/BlogUserInfo.php
deleted file mode 100644
index 6c78b30b..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Blogger/BlogUserInfo.php
+++ /dev/null
@@ -1,53 +0,0 @@
- "blog_user_info",
-  );
-  protected $blogType = 'Google_Service_Blogger_Blog';
-  protected $blogDataType = '';
-  protected $blogUserInfoType = 'Google_Service_Blogger_BlogPerUserInfo';
-  protected $blogUserInfoDataType = '';
-  public $kind;
-
-  public function setBlog(Google_Service_Blogger_Blog $blog)
-  {
-    $this->blog = $blog;
-  }
-  public function getBlog()
-  {
-    return $this->blog;
-  }
-  public function setBlogUserInfo(Google_Service_Blogger_BlogPerUserInfo $blogUserInfo)
-  {
-    $this->blogUserInfo = $blogUserInfo;
-  }
-  public function getBlogUserInfo()
-  {
-    return $this->blogUserInfo;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Blogger/Comment.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Blogger/Comment.php
deleted file mode 100644
index 357f5aa0..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Blogger/Comment.php
+++ /dev/null
@@ -1,124 +0,0 @@
-author = $author;
-  }
-  public function getAuthor()
-  {
-    return $this->author;
-  }
-  public function setBlog(Google_Service_Blogger_CommentBlog $blog)
-  {
-    $this->blog = $blog;
-  }
-  public function getBlog()
-  {
-    return $this->blog;
-  }
-  public function setContent($content)
-  {
-    $this->content = $content;
-  }
-  public function getContent()
-  {
-    return $this->content;
-  }
-  public function setId($id)
-  {
-    $this->id = $id;
-  }
-  public function getId()
-  {
-    return $this->id;
-  }
-  public function setInReplyTo(Google_Service_Blogger_CommentInReplyTo $inReplyTo)
-  {
-    $this->inReplyTo = $inReplyTo;
-  }
-  public function getInReplyTo()
-  {
-    return $this->inReplyTo;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setPost(Google_Service_Blogger_CommentPost $post)
-  {
-    $this->post = $post;
-  }
-  public function getPost()
-  {
-    return $this->post;
-  }
-  public function setPublished($published)
-  {
-    $this->published = $published;
-  }
-  public function getPublished()
-  {
-    return $this->published;
-  }
-  public function setSelfLink($selfLink)
-  {
-    $this->selfLink = $selfLink;
-  }
-  public function getSelfLink()
-  {
-    return $this->selfLink;
-  }
-  public function setStatus($status)
-  {
-    $this->status = $status;
-  }
-  public function getStatus()
-  {
-    return $this->status;
-  }
-  public function setUpdated($updated)
-  {
-    $this->updated = $updated;
-  }
-  public function getUpdated()
-  {
-    return $this->updated;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Blogger/CommentAuthor.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Blogger/CommentAuthor.php
deleted file mode 100644
index fec87663..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Blogger/CommentAuthor.php
+++ /dev/null
@@ -1,58 +0,0 @@
-displayName = $displayName;
-  }
-  public function getDisplayName()
-  {
-    return $this->displayName;
-  }
-  public function setId($id)
-  {
-    $this->id = $id;
-  }
-  public function getId()
-  {
-    return $this->id;
-  }
-  public function setImage(Google_Service_Blogger_CommentAuthorImage $image)
-  {
-    $this->image = $image;
-  }
-  public function getImage()
-  {
-    return $this->image;
-  }
-  public function setUrl($url)
-  {
-    $this->url = $url;
-  }
-  public function getUrl()
-  {
-    return $this->url;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Blogger/CommentAuthorImage.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Blogger/CommentAuthorImage.php
deleted file mode 100644
index 1ed7ee8d..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Blogger/CommentAuthorImage.php
+++ /dev/null
@@ -1,30 +0,0 @@
-url = $url;
-  }
-  public function getUrl()
-  {
-    return $this->url;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Blogger/CommentBlog.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Blogger/CommentBlog.php
deleted file mode 100644
index 0118d08a..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Blogger/CommentBlog.php
+++ /dev/null
@@ -1,30 +0,0 @@
-id = $id;
-  }
-  public function getId()
-  {
-    return $this->id;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Blogger/CommentInReplyTo.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Blogger/CommentInReplyTo.php
deleted file mode 100644
index 05916ae3..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Blogger/CommentInReplyTo.php
+++ /dev/null
@@ -1,30 +0,0 @@
-id = $id;
-  }
-  public function getId()
-  {
-    return $this->id;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Blogger/CommentList.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Blogger/CommentList.php
deleted file mode 100644
index 82414c04..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Blogger/CommentList.php
+++ /dev/null
@@ -1,68 +0,0 @@
-etag = $etag;
-  }
-  public function getEtag()
-  {
-    return $this->etag;
-  }
-  public function setItems($items)
-  {
-    $this->items = $items;
-  }
-  public function getItems()
-  {
-    return $this->items;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setNextPageToken($nextPageToken)
-  {
-    $this->nextPageToken = $nextPageToken;
-  }
-  public function getNextPageToken()
-  {
-    return $this->nextPageToken;
-  }
-  public function setPrevPageToken($prevPageToken)
-  {
-    $this->prevPageToken = $prevPageToken;
-  }
-  public function getPrevPageToken()
-  {
-    return $this->prevPageToken;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Blogger/CommentPost.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Blogger/CommentPost.php
deleted file mode 100644
index e074c58a..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Blogger/CommentPost.php
+++ /dev/null
@@ -1,30 +0,0 @@
-id = $id;
-  }
-  public function getId()
-  {
-    return $this->id;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Blogger/Page.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Blogger/Page.php
deleted file mode 100644
index 756c2dfa..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Blogger/Page.php
+++ /dev/null
@@ -1,131 +0,0 @@
-author = $author;
-  }
-  public function getAuthor()
-  {
-    return $this->author;
-  }
-  public function setBlog(Google_Service_Blogger_PageBlog $blog)
-  {
-    $this->blog = $blog;
-  }
-  public function getBlog()
-  {
-    return $this->blog;
-  }
-  public function setContent($content)
-  {
-    $this->content = $content;
-  }
-  public function getContent()
-  {
-    return $this->content;
-  }
-  public function setEtag($etag)
-  {
-    $this->etag = $etag;
-  }
-  public function getEtag()
-  {
-    return $this->etag;
-  }
-  public function setId($id)
-  {
-    $this->id = $id;
-  }
-  public function getId()
-  {
-    return $this->id;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setPublished($published)
-  {
-    $this->published = $published;
-  }
-  public function getPublished()
-  {
-    return $this->published;
-  }
-  public function setSelfLink($selfLink)
-  {
-    $this->selfLink = $selfLink;
-  }
-  public function getSelfLink()
-  {
-    return $this->selfLink;
-  }
-  public function setStatus($status)
-  {
-    $this->status = $status;
-  }
-  public function getStatus()
-  {
-    return $this->status;
-  }
-  public function setTitle($title)
-  {
-    $this->title = $title;
-  }
-  public function getTitle()
-  {
-    return $this->title;
-  }
-  public function setUpdated($updated)
-  {
-    $this->updated = $updated;
-  }
-  public function getUpdated()
-  {
-    return $this->updated;
-  }
-  public function setUrl($url)
-  {
-    $this->url = $url;
-  }
-  public function getUrl()
-  {
-    return $this->url;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Blogger/PageAuthor.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Blogger/PageAuthor.php
deleted file mode 100644
index 271f82bd..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Blogger/PageAuthor.php
+++ /dev/null
@@ -1,58 +0,0 @@
-displayName = $displayName;
-  }
-  public function getDisplayName()
-  {
-    return $this->displayName;
-  }
-  public function setId($id)
-  {
-    $this->id = $id;
-  }
-  public function getId()
-  {
-    return $this->id;
-  }
-  public function setImage(Google_Service_Blogger_PageAuthorImage $image)
-  {
-    $this->image = $image;
-  }
-  public function getImage()
-  {
-    return $this->image;
-  }
-  public function setUrl($url)
-  {
-    $this->url = $url;
-  }
-  public function getUrl()
-  {
-    return $this->url;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Blogger/PageAuthorImage.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Blogger/PageAuthorImage.php
deleted file mode 100644
index ff5c679f..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Blogger/PageAuthorImage.php
+++ /dev/null
@@ -1,30 +0,0 @@
-url = $url;
-  }
-  public function getUrl()
-  {
-    return $this->url;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Blogger/PageBlog.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Blogger/PageBlog.php
deleted file mode 100644
index dbcf5cd3..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Blogger/PageBlog.php
+++ /dev/null
@@ -1,30 +0,0 @@
-id = $id;
-  }
-  public function getId()
-  {
-    return $this->id;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Blogger/PageList.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Blogger/PageList.php
deleted file mode 100644
index e9d90d63..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Blogger/PageList.php
+++ /dev/null
@@ -1,59 +0,0 @@
-etag = $etag;
-  }
-  public function getEtag()
-  {
-    return $this->etag;
-  }
-  public function setItems($items)
-  {
-    $this->items = $items;
-  }
-  public function getItems()
-  {
-    return $this->items;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setNextPageToken($nextPageToken)
-  {
-    $this->nextPageToken = $nextPageToken;
-  }
-  public function getNextPageToken()
-  {
-    return $this->nextPageToken;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Blogger/Pageviews.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Blogger/Pageviews.php
deleted file mode 100644
index c7285d57..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Blogger/Pageviews.php
+++ /dev/null
@@ -1,50 +0,0 @@
-blogId = $blogId;
-  }
-  public function getBlogId()
-  {
-    return $this->blogId;
-  }
-  public function setCounts($counts)
-  {
-    $this->counts = $counts;
-  }
-  public function getCounts()
-  {
-    return $this->counts;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Blogger/PageviewsCounts.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Blogger/PageviewsCounts.php
deleted file mode 100644
index 058d7d22..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Blogger/PageviewsCounts.php
+++ /dev/null
@@ -1,39 +0,0 @@
-count = $count;
-  }
-  public function getCount()
-  {
-    return $this->count;
-  }
-  public function setTimeRange($timeRange)
-  {
-    $this->timeRange = $timeRange;
-  }
-  public function getTimeRange()
-  {
-    return $this->timeRange;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Blogger/Post.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Blogger/Post.php
deleted file mode 100644
index 9cc40361..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Blogger/Post.php
+++ /dev/null
@@ -1,198 +0,0 @@
-author = $author;
-  }
-  public function getAuthor()
-  {
-    return $this->author;
-  }
-  public function setBlog(Google_Service_Blogger_PostBlog $blog)
-  {
-    $this->blog = $blog;
-  }
-  public function getBlog()
-  {
-    return $this->blog;
-  }
-  public function setContent($content)
-  {
-    $this->content = $content;
-  }
-  public function getContent()
-  {
-    return $this->content;
-  }
-  public function setCustomMetaData($customMetaData)
-  {
-    $this->customMetaData = $customMetaData;
-  }
-  public function getCustomMetaData()
-  {
-    return $this->customMetaData;
-  }
-  public function setEtag($etag)
-  {
-    $this->etag = $etag;
-  }
-  public function getEtag()
-  {
-    return $this->etag;
-  }
-  public function setId($id)
-  {
-    $this->id = $id;
-  }
-  public function getId()
-  {
-    return $this->id;
-  }
-  public function setImages($images)
-  {
-    $this->images = $images;
-  }
-  public function getImages()
-  {
-    return $this->images;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setLabels($labels)
-  {
-    $this->labels = $labels;
-  }
-  public function getLabels()
-  {
-    return $this->labels;
-  }
-  public function setLocation(Google_Service_Blogger_PostLocation $location)
-  {
-    $this->location = $location;
-  }
-  public function getLocation()
-  {
-    return $this->location;
-  }
-  public function setPublished($published)
-  {
-    $this->published = $published;
-  }
-  public function getPublished()
-  {
-    return $this->published;
-  }
-  public function setReaderComments($readerComments)
-  {
-    $this->readerComments = $readerComments;
-  }
-  public function getReaderComments()
-  {
-    return $this->readerComments;
-  }
-  public function setReplies(Google_Service_Blogger_PostReplies $replies)
-  {
-    $this->replies = $replies;
-  }
-  public function getReplies()
-  {
-    return $this->replies;
-  }
-  public function setSelfLink($selfLink)
-  {
-    $this->selfLink = $selfLink;
-  }
-  public function getSelfLink()
-  {
-    return $this->selfLink;
-  }
-  public function setStatus($status)
-  {
-    $this->status = $status;
-  }
-  public function getStatus()
-  {
-    return $this->status;
-  }
-  public function setTitle($title)
-  {
-    $this->title = $title;
-  }
-  public function getTitle()
-  {
-    return $this->title;
-  }
-  public function setTitleLink($titleLink)
-  {
-    $this->titleLink = $titleLink;
-  }
-  public function getTitleLink()
-  {
-    return $this->titleLink;
-  }
-  public function setUpdated($updated)
-  {
-    $this->updated = $updated;
-  }
-  public function getUpdated()
-  {
-    return $this->updated;
-  }
-  public function setUrl($url)
-  {
-    $this->url = $url;
-  }
-  public function getUrl()
-  {
-    return $this->url;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Blogger/PostAuthor.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Blogger/PostAuthor.php
deleted file mode 100644
index 4f89741e..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Blogger/PostAuthor.php
+++ /dev/null
@@ -1,58 +0,0 @@
-displayName = $displayName;
-  }
-  public function getDisplayName()
-  {
-    return $this->displayName;
-  }
-  public function setId($id)
-  {
-    $this->id = $id;
-  }
-  public function getId()
-  {
-    return $this->id;
-  }
-  public function setImage(Google_Service_Blogger_PostAuthorImage $image)
-  {
-    $this->image = $image;
-  }
-  public function getImage()
-  {
-    return $this->image;
-  }
-  public function setUrl($url)
-  {
-    $this->url = $url;
-  }
-  public function getUrl()
-  {
-    return $this->url;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Blogger/PostAuthorImage.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Blogger/PostAuthorImage.php
deleted file mode 100644
index 642a389a..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Blogger/PostAuthorImage.php
+++ /dev/null
@@ -1,30 +0,0 @@
-url = $url;
-  }
-  public function getUrl()
-  {
-    return $this->url;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Blogger/PostBlog.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Blogger/PostBlog.php
deleted file mode 100644
index 99248132..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Blogger/PostBlog.php
+++ /dev/null
@@ -1,30 +0,0 @@
-id = $id;
-  }
-  public function getId()
-  {
-    return $this->id;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Blogger/PostImages.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Blogger/PostImages.php
deleted file mode 100644
index 59a0ac02..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Blogger/PostImages.php
+++ /dev/null
@@ -1,30 +0,0 @@
-url = $url;
-  }
-  public function getUrl()
-  {
-    return $this->url;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Blogger/PostList.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Blogger/PostList.php
deleted file mode 100644
index 1e9f15ec..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Blogger/PostList.php
+++ /dev/null
@@ -1,59 +0,0 @@
-etag = $etag;
-  }
-  public function getEtag()
-  {
-    return $this->etag;
-  }
-  public function setItems($items)
-  {
-    $this->items = $items;
-  }
-  public function getItems()
-  {
-    return $this->items;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setNextPageToken($nextPageToken)
-  {
-    $this->nextPageToken = $nextPageToken;
-  }
-  public function getNextPageToken()
-  {
-    return $this->nextPageToken;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Blogger/PostLocation.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Blogger/PostLocation.php
deleted file mode 100644
index d2e65e86..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Blogger/PostLocation.php
+++ /dev/null
@@ -1,57 +0,0 @@
-lat = $lat;
-  }
-  public function getLat()
-  {
-    return $this->lat;
-  }
-  public function setLng($lng)
-  {
-    $this->lng = $lng;
-  }
-  public function getLng()
-  {
-    return $this->lng;
-  }
-  public function setName($name)
-  {
-    $this->name = $name;
-  }
-  public function getName()
-  {
-    return $this->name;
-  }
-  public function setSpan($span)
-  {
-    $this->span = $span;
-  }
-  public function getSpan()
-  {
-    return $this->span;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Blogger/PostPerUserInfo.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Blogger/PostPerUserInfo.php
deleted file mode 100644
index ec385a7b..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Blogger/PostPerUserInfo.php
+++ /dev/null
@@ -1,66 +0,0 @@
-blogId = $blogId;
-  }
-  public function getBlogId()
-  {
-    return $this->blogId;
-  }
-  public function setHasEditAccess($hasEditAccess)
-  {
-    $this->hasEditAccess = $hasEditAccess;
-  }
-  public function getHasEditAccess()
-  {
-    return $this->hasEditAccess;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setPostId($postId)
-  {
-    $this->postId = $postId;
-  }
-  public function getPostId()
-  {
-    return $this->postId;
-  }
-  public function setUserId($userId)
-  {
-    $this->userId = $userId;
-  }
-  public function getUserId()
-  {
-    return $this->userId;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Blogger/PostReplies.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Blogger/PostReplies.php
deleted file mode 100644
index b456fdcd..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Blogger/PostReplies.php
+++ /dev/null
@@ -1,50 +0,0 @@
-items = $items;
-  }
-  public function getItems()
-  {
-    return $this->items;
-  }
-  public function setSelfLink($selfLink)
-  {
-    $this->selfLink = $selfLink;
-  }
-  public function getSelfLink()
-  {
-    return $this->selfLink;
-  }
-  public function setTotalItems($totalItems)
-  {
-    $this->totalItems = $totalItems;
-  }
-  public function getTotalItems()
-  {
-    return $this->totalItems;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Blogger/PostUserInfo.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Blogger/PostUserInfo.php
deleted file mode 100644
index e3598a95..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Blogger/PostUserInfo.php
+++ /dev/null
@@ -1,53 +0,0 @@
- "post_user_info",
-  );
-  public $kind;
-  protected $postType = 'Google_Service_Blogger_Post';
-  protected $postDataType = '';
-  protected $postUserInfoType = 'Google_Service_Blogger_PostPerUserInfo';
-  protected $postUserInfoDataType = '';
-
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setPost(Google_Service_Blogger_Post $post)
-  {
-    $this->post = $post;
-  }
-  public function getPost()
-  {
-    return $this->post;
-  }
-  public function setPostUserInfo(Google_Service_Blogger_PostPerUserInfo $postUserInfo)
-  {
-    $this->postUserInfo = $postUserInfo;
-  }
-  public function getPostUserInfo()
-  {
-    return $this->postUserInfo;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Blogger/PostUserInfosList.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Blogger/PostUserInfosList.php
deleted file mode 100644
index f65b7013..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Blogger/PostUserInfosList.php
+++ /dev/null
@@ -1,50 +0,0 @@
-items = $items;
-  }
-  public function getItems()
-  {
-    return $this->items;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setNextPageToken($nextPageToken)
-  {
-    $this->nextPageToken = $nextPageToken;
-  }
-  public function getNextPageToken()
-  {
-    return $this->nextPageToken;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Blogger/Resource/BlogUserInfos.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Blogger/Resource/BlogUserInfos.php
deleted file mode 100644
index f843e4a2..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Blogger/Resource/BlogUserInfos.php
+++ /dev/null
@@ -1,46 +0,0 @@
-
- *   $bloggerService = new Google_Service_Blogger(...);
- *   $blogUserInfos = $bloggerService->blogUserInfos;
- *  
- */
-class Google_Service_Blogger_Resource_BlogUserInfos extends Google_Service_Resource
-{
-  /**
-   * Gets one blog and user info pair by blogId and userId. (blogUserInfos.get)
-   *
-   * @param string $userId ID of the user whose blogs are to be fetched. Either
-   * the word 'self' (sans quote marks) or the user's profile identifier.
-   * @param string $blogId The ID of the blog to get.
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param string maxPosts Maximum number of posts to pull back with the
-   * blog.
-   * @return Google_Service_Blogger_BlogUserInfo
-   */
-  public function get($userId, $blogId, $optParams = array())
-  {
-    $params = array('userId' => $userId, 'blogId' => $blogId);
-    $params = array_merge($params, $optParams);
-    return $this->call('get', array($params), "Google_Service_Blogger_BlogUserInfo");
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Blogger/Resource/Blogs.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Blogger/Resource/Blogs.php
deleted file mode 100644
index b97611eb..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Blogger/Resource/Blogs.php
+++ /dev/null
@@ -1,86 +0,0 @@
-
- *   $bloggerService = new Google_Service_Blogger(...);
- *   $blogs = $bloggerService->blogs;
- *  
- */
-class Google_Service_Blogger_Resource_Blogs extends Google_Service_Resource
-{
-  /**
-   * Gets one blog by ID. (blogs.get)
-   *
-   * @param string $blogId The ID of the blog to get.
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param string maxPosts Maximum number of posts to pull back with the
-   * blog.
-   * @opt_param string view Access level with which to view the blog. Note that
-   * some fields require elevated access.
-   * @return Google_Service_Blogger_Blog
-   */
-  public function get($blogId, $optParams = array())
-  {
-    $params = array('blogId' => $blogId);
-    $params = array_merge($params, $optParams);
-    return $this->call('get', array($params), "Google_Service_Blogger_Blog");
-  }
-  /**
-   * Retrieve a Blog by URL. (blogs.getByUrl)
-   *
-   * @param string $url The URL of the blog to retrieve.
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param string view Access level with which to view the blog. Note that
-   * some fields require elevated access.
-   * @return Google_Service_Blogger_Blog
-   */
-  public function getByUrl($url, $optParams = array())
-  {
-    $params = array('url' => $url);
-    $params = array_merge($params, $optParams);
-    return $this->call('getByUrl', array($params), "Google_Service_Blogger_Blog");
-  }
-  /**
-   * Retrieves a list of blogs, possibly filtered. (blogs.listByUser)
-   *
-   * @param string $userId ID of the user whose blogs are to be fetched. Either
-   * the word 'self' (sans quote marks) or the user's profile identifier.
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param bool fetchUserInfo Whether the response is a list of blogs with
-   * per-user information instead of just blogs.
-   * @opt_param string role User access types for blogs to include in the results,
-   * e.g. AUTHOR will return blogs where the user has author level access. If no
-   * roles are specified, defaults to ADMIN and AUTHOR roles.
-   * @opt_param string status Blog statuses to include in the result (default:
-   * Live blogs only). Note that ADMIN access is required to view deleted blogs.
-   * @opt_param string view Access level with which to view the blogs. Note that
-   * some fields require elevated access.
-   * @return Google_Service_Blogger_BlogList
-   */
-  public function listByUser($userId, $optParams = array())
-  {
-    $params = array('userId' => $userId);
-    $params = array_merge($params, $optParams);
-    return $this->call('listByUser', array($params), "Google_Service_Blogger_BlogList");
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Blogger/Resource/Comments.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Blogger/Resource/Comments.php
deleted file mode 100644
index ff0ca9c1..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Blogger/Resource/Comments.php
+++ /dev/null
@@ -1,159 +0,0 @@
-
- *   $bloggerService = new Google_Service_Blogger(...);
- *   $comments = $bloggerService->comments;
- *  
- */
-class Google_Service_Blogger_Resource_Comments extends Google_Service_Resource
-{
-  /**
-   * Marks a comment as not spam. (comments.approve)
-   *
-   * @param string $blogId The ID of the Blog.
-   * @param string $postId The ID of the Post.
-   * @param string $commentId The ID of the comment to mark as not spam.
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Blogger_Comment
-   */
-  public function approve($blogId, $postId, $commentId, $optParams = array())
-  {
-    $params = array('blogId' => $blogId, 'postId' => $postId, 'commentId' => $commentId);
-    $params = array_merge($params, $optParams);
-    return $this->call('approve', array($params), "Google_Service_Blogger_Comment");
-  }
-  /**
-   * Delete a comment by ID. (comments.delete)
-   *
-   * @param string $blogId The ID of the Blog.
-   * @param string $postId The ID of the Post.
-   * @param string $commentId The ID of the comment to delete.
-   * @param array $optParams Optional parameters.
-   */
-  public function delete($blogId, $postId, $commentId, $optParams = array())
-  {
-    $params = array('blogId' => $blogId, 'postId' => $postId, 'commentId' => $commentId);
-    $params = array_merge($params, $optParams);
-    return $this->call('delete', array($params));
-  }
-  /**
-   * Gets one comment by ID. (comments.get)
-   *
-   * @param string $blogId ID of the blog to containing the comment.
-   * @param string $postId ID of the post to fetch posts from.
-   * @param string $commentId The ID of the comment to get.
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param string view Access level for the requested comment (default:
-   * READER). Note that some comments will require elevated permissions, for
-   * example comments where the parent posts which is in a draft state, or
-   * comments that are pending moderation.
-   * @return Google_Service_Blogger_Comment
-   */
-  public function get($blogId, $postId, $commentId, $optParams = array())
-  {
-    $params = array('blogId' => $blogId, 'postId' => $postId, 'commentId' => $commentId);
-    $params = array_merge($params, $optParams);
-    return $this->call('get', array($params), "Google_Service_Blogger_Comment");
-  }
-  /**
-   * Retrieves the comments for a post, possibly filtered. (comments.listComments)
-   *
-   * @param string $blogId ID of the blog to fetch comments from.
-   * @param string $postId ID of the post to fetch posts from.
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param string endDate Latest date of comment to fetch, a date-time with
-   * RFC 3339 formatting.
-   * @opt_param bool fetchBodies Whether the body content of the comments is
-   * included.
-   * @opt_param string maxResults Maximum number of comments to include in the
-   * result.
-   * @opt_param string pageToken Continuation token if request is paged.
-   * @opt_param string startDate Earliest date of comment to fetch, a date-time
-   * with RFC 3339 formatting.
-   * @opt_param string status
-   * @opt_param string view Access level with which to view the returned result.
-   * Note that some fields require elevated access.
-   * @return Google_Service_Blogger_CommentList
-   */
-  public function listComments($blogId, $postId, $optParams = array())
-  {
-    $params = array('blogId' => $blogId, 'postId' => $postId);
-    $params = array_merge($params, $optParams);
-    return $this->call('list', array($params), "Google_Service_Blogger_CommentList");
-  }
-  /**
-   * Retrieves the comments for a blog, across all posts, possibly filtered.
-   * (comments.listByBlog)
-   *
-   * @param string $blogId ID of the blog to fetch comments from.
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param string endDate Latest date of comment to fetch, a date-time with
-   * RFC 3339 formatting.
-   * @opt_param bool fetchBodies Whether the body content of the comments is
-   * included.
-   * @opt_param string maxResults Maximum number of comments to include in the
-   * result.
-   * @opt_param string pageToken Continuation token if request is paged.
-   * @opt_param string startDate Earliest date of comment to fetch, a date-time
-   * with RFC 3339 formatting.
-   * @opt_param string status
-   * @return Google_Service_Blogger_CommentList
-   */
-  public function listByBlog($blogId, $optParams = array())
-  {
-    $params = array('blogId' => $blogId);
-    $params = array_merge($params, $optParams);
-    return $this->call('listByBlog', array($params), "Google_Service_Blogger_CommentList");
-  }
-  /**
-   * Marks a comment as spam. (comments.markAsSpam)
-   *
-   * @param string $blogId The ID of the Blog.
-   * @param string $postId The ID of the Post.
-   * @param string $commentId The ID of the comment to mark as spam.
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Blogger_Comment
-   */
-  public function markAsSpam($blogId, $postId, $commentId, $optParams = array())
-  {
-    $params = array('blogId' => $blogId, 'postId' => $postId, 'commentId' => $commentId);
-    $params = array_merge($params, $optParams);
-    return $this->call('markAsSpam', array($params), "Google_Service_Blogger_Comment");
-  }
-  /**
-   * Removes the content of a comment. (comments.removeContent)
-   *
-   * @param string $blogId The ID of the Blog.
-   * @param string $postId The ID of the Post.
-   * @param string $commentId The ID of the comment to delete content from.
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Blogger_Comment
-   */
-  public function removeContent($blogId, $postId, $commentId, $optParams = array())
-  {
-    $params = array('blogId' => $blogId, 'postId' => $postId, 'commentId' => $commentId);
-    $params = array_merge($params, $optParams);
-    return $this->call('removeContent', array($params), "Google_Service_Blogger_Comment");
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Blogger/Resource/PageViews.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Blogger/Resource/PageViews.php
deleted file mode 100644
index c1f231d1..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Blogger/Resource/PageViews.php
+++ /dev/null
@@ -1,43 +0,0 @@
-
- *   $bloggerService = new Google_Service_Blogger(...);
- *   $pageViews = $bloggerService->pageViews;
- *  
- */
-class Google_Service_Blogger_Resource_PageViews extends Google_Service_Resource
-{
-  /**
-   * Retrieve pageview stats for a Blog. (pageViews.get)
-   *
-   * @param string $blogId The ID of the blog to get.
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param string range
-   * @return Google_Service_Blogger_Pageviews
-   */
-  public function get($blogId, $optParams = array())
-  {
-    $params = array('blogId' => $blogId);
-    $params = array_merge($params, $optParams);
-    return $this->call('get', array($params), "Google_Service_Blogger_Pageviews");
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Blogger/Resource/Pages.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Blogger/Resource/Pages.php
deleted file mode 100644
index b27f175a..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Blogger/Resource/Pages.php
+++ /dev/null
@@ -1,163 +0,0 @@
-
- *   $bloggerService = new Google_Service_Blogger(...);
- *   $pages = $bloggerService->pages;
- *  
- */
-class Google_Service_Blogger_Resource_Pages extends Google_Service_Resource
-{
-  /**
-   * Delete a page by ID. (pages.delete)
-   *
-   * @param string $blogId The ID of the Blog.
-   * @param string $pageId The ID of the Page.
-   * @param array $optParams Optional parameters.
-   */
-  public function delete($blogId, $pageId, $optParams = array())
-  {
-    $params = array('blogId' => $blogId, 'pageId' => $pageId);
-    $params = array_merge($params, $optParams);
-    return $this->call('delete', array($params));
-  }
-  /**
-   * Gets one blog page by ID. (pages.get)
-   *
-   * @param string $blogId ID of the blog containing the page.
-   * @param string $pageId The ID of the page to get.
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param string view
-   * @return Google_Service_Blogger_Page
-   */
-  public function get($blogId, $pageId, $optParams = array())
-  {
-    $params = array('blogId' => $blogId, 'pageId' => $pageId);
-    $params = array_merge($params, $optParams);
-    return $this->call('get', array($params), "Google_Service_Blogger_Page");
-  }
-  /**
-   * Add a page. (pages.insert)
-   *
-   * @param string $blogId ID of the blog to add the page to.
-   * @param Google_Service_Blogger_Page $postBody
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param bool isDraft Whether to create the page as a draft (default:
-   * false).
-   * @return Google_Service_Blogger_Page
-   */
-  public function insert($blogId, Google_Service_Blogger_Page $postBody, $optParams = array())
-  {
-    $params = array('blogId' => $blogId, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('insert', array($params), "Google_Service_Blogger_Page");
-  }
-  /**
-   * Retrieves the pages for a blog, optionally including non-LIVE statuses.
-   * (pages.listPages)
-   *
-   * @param string $blogId ID of the blog to fetch Pages from.
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param bool fetchBodies Whether to retrieve the Page bodies.
-   * @opt_param string maxResults Maximum number of Pages to fetch.
-   * @opt_param string pageToken Continuation token if the request is paged.
-   * @opt_param string status
-   * @opt_param string view Access level with which to view the returned result.
-   * Note that some fields require elevated access.
-   * @return Google_Service_Blogger_PageList
-   */
-  public function listPages($blogId, $optParams = array())
-  {
-    $params = array('blogId' => $blogId);
-    $params = array_merge($params, $optParams);
-    return $this->call('list', array($params), "Google_Service_Blogger_PageList");
-  }
-  /**
-   * Update a page. This method supports patch semantics. (pages.patch)
-   *
-   * @param string $blogId The ID of the Blog.
-   * @param string $pageId The ID of the Page.
-   * @param Google_Service_Blogger_Page $postBody
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param bool publish Whether a publish action should be performed when the
-   * page is updated (default: false).
-   * @opt_param bool revert Whether a revert action should be performed when the
-   * page is updated (default: false).
-   * @return Google_Service_Blogger_Page
-   */
-  public function patch($blogId, $pageId, Google_Service_Blogger_Page $postBody, $optParams = array())
-  {
-    $params = array('blogId' => $blogId, 'pageId' => $pageId, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('patch', array($params), "Google_Service_Blogger_Page");
-  }
-  /**
-   * Publishes a draft page. (pages.publish)
-   *
-   * @param string $blogId The ID of the blog.
-   * @param string $pageId The ID of the page.
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Blogger_Page
-   */
-  public function publish($blogId, $pageId, $optParams = array())
-  {
-    $params = array('blogId' => $blogId, 'pageId' => $pageId);
-    $params = array_merge($params, $optParams);
-    return $this->call('publish', array($params), "Google_Service_Blogger_Page");
-  }
-  /**
-   * Revert a published or scheduled page to draft state. (pages.revert)
-   *
-   * @param string $blogId The ID of the blog.
-   * @param string $pageId The ID of the page.
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Blogger_Page
-   */
-  public function revert($blogId, $pageId, $optParams = array())
-  {
-    $params = array('blogId' => $blogId, 'pageId' => $pageId);
-    $params = array_merge($params, $optParams);
-    return $this->call('revert', array($params), "Google_Service_Blogger_Page");
-  }
-  /**
-   * Update a page. (pages.update)
-   *
-   * @param string $blogId The ID of the Blog.
-   * @param string $pageId The ID of the Page.
-   * @param Google_Service_Blogger_Page $postBody
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param bool publish Whether a publish action should be performed when the
-   * page is updated (default: false).
-   * @opt_param bool revert Whether a revert action should be performed when the
-   * page is updated (default: false).
-   * @return Google_Service_Blogger_Page
-   */
-  public function update($blogId, $pageId, Google_Service_Blogger_Page $postBody, $optParams = array())
-  {
-    $params = array('blogId' => $blogId, 'pageId' => $pageId, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('update', array($params), "Google_Service_Blogger_Page");
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Blogger/Resource/PostUserInfos.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Blogger/Resource/PostUserInfos.php
deleted file mode 100644
index aef69dc7..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Blogger/Resource/PostUserInfos.php
+++ /dev/null
@@ -1,83 +0,0 @@
-
- *   $bloggerService = new Google_Service_Blogger(...);
- *   $postUserInfos = $bloggerService->postUserInfos;
- *  
- */
-class Google_Service_Blogger_Resource_PostUserInfos extends Google_Service_Resource
-{
-  /**
-   * Gets one post and user info pair, by post ID and user ID. The post user info
-   * contains per-user information about the post, such as access rights, specific
-   * to the user. (postUserInfos.get)
-   *
-   * @param string $userId ID of the user for the per-user information to be
-   * fetched. Either the word 'self' (sans quote marks) or the user's profile
-   * identifier.
-   * @param string $blogId The ID of the blog.
-   * @param string $postId The ID of the post to get.
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param string maxComments Maximum number of comments to pull back on a
-   * post.
-   * @return Google_Service_Blogger_PostUserInfo
-   */
-  public function get($userId, $blogId, $postId, $optParams = array())
-  {
-    $params = array('userId' => $userId, 'blogId' => $blogId, 'postId' => $postId);
-    $params = array_merge($params, $optParams);
-    return $this->call('get', array($params), "Google_Service_Blogger_PostUserInfo");
-  }
-  /**
-   * Retrieves a list of post and post user info pairs, possibly filtered. The
-   * post user info contains per-user information about the post, such as access
-   * rights, specific to the user. (postUserInfos.listPostUserInfos)
-   *
-   * @param string $userId ID of the user for the per-user information to be
-   * fetched. Either the word 'self' (sans quote marks) or the user's profile
-   * identifier.
-   * @param string $blogId ID of the blog to fetch posts from.
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param string endDate Latest post date to fetch, a date-time with RFC
-   * 3339 formatting.
-   * @opt_param bool fetchBodies Whether the body content of posts is included.
-   * Default is false.
-   * @opt_param string labels Comma-separated list of labels to search for.
-   * @opt_param string maxResults Maximum number of posts to fetch.
-   * @opt_param string orderBy Sort order applied to search results. Default is
-   * published.
-   * @opt_param string pageToken Continuation token if the request is paged.
-   * @opt_param string startDate Earliest post date to fetch, a date-time with RFC
-   * 3339 formatting.
-   * @opt_param string status
-   * @opt_param string view Access level with which to view the returned result.
-   * Note that some fields require elevated access.
-   * @return Google_Service_Blogger_PostUserInfosList
-   */
-  public function listPostUserInfos($userId, $blogId, $optParams = array())
-  {
-    $params = array('userId' => $userId, 'blogId' => $blogId);
-    $params = array_merge($params, $optParams);
-    return $this->call('list', array($params), "Google_Service_Blogger_PostUserInfosList");
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Blogger/Resource/Posts.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Blogger/Resource/Posts.php
deleted file mode 100644
index d89c5623..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Blogger/Resource/Posts.php
+++ /dev/null
@@ -1,241 +0,0 @@
-
- *   $bloggerService = new Google_Service_Blogger(...);
- *   $posts = $bloggerService->posts;
- *  
- */
-class Google_Service_Blogger_Resource_Posts extends Google_Service_Resource
-{
-  /**
-   * Delete a post by ID. (posts.delete)
-   *
-   * @param string $blogId The ID of the Blog.
-   * @param string $postId The ID of the Post.
-   * @param array $optParams Optional parameters.
-   */
-  public function delete($blogId, $postId, $optParams = array())
-  {
-    $params = array('blogId' => $blogId, 'postId' => $postId);
-    $params = array_merge($params, $optParams);
-    return $this->call('delete', array($params));
-  }
-  /**
-   * Get a post by ID. (posts.get)
-   *
-   * @param string $blogId ID of the blog to fetch the post from.
-   * @param string $postId The ID of the post
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param bool fetchBody Whether the body content of the post is included
-   * (default: true). This should be set to false when the post bodies are not
-   * required, to help minimize traffic.
-   * @opt_param bool fetchImages Whether image URL metadata for each post is
-   * included (default: false).
-   * @opt_param string maxComments Maximum number of comments to pull back on a
-   * post.
-   * @opt_param string view Access level with which to view the returned result.
-   * Note that some fields require elevated access.
-   * @return Google_Service_Blogger_Post
-   */
-  public function get($blogId, $postId, $optParams = array())
-  {
-    $params = array('blogId' => $blogId, 'postId' => $postId);
-    $params = array_merge($params, $optParams);
-    return $this->call('get', array($params), "Google_Service_Blogger_Post");
-  }
-  /**
-   * Retrieve a Post by Path. (posts.getByPath)
-   *
-   * @param string $blogId ID of the blog to fetch the post from.
-   * @param string $path Path of the Post to retrieve.
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param string maxComments Maximum number of comments to pull back on a
-   * post.
-   * @opt_param string view Access level with which to view the returned result.
-   * Note that some fields require elevated access.
-   * @return Google_Service_Blogger_Post
-   */
-  public function getByPath($blogId, $path, $optParams = array())
-  {
-    $params = array('blogId' => $blogId, 'path' => $path);
-    $params = array_merge($params, $optParams);
-    return $this->call('getByPath', array($params), "Google_Service_Blogger_Post");
-  }
-  /**
-   * Add a post. (posts.insert)
-   *
-   * @param string $blogId ID of the blog to add the post to.
-   * @param Google_Service_Blogger_Post $postBody
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param bool fetchBody Whether the body content of the post is included
-   * with the result (default: true).
-   * @opt_param bool fetchImages Whether image URL metadata for each post is
-   * included in the returned result (default: false).
-   * @opt_param bool isDraft Whether to create the post as a draft (default:
-   * false).
-   * @return Google_Service_Blogger_Post
-   */
-  public function insert($blogId, Google_Service_Blogger_Post $postBody, $optParams = array())
-  {
-    $params = array('blogId' => $blogId, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('insert', array($params), "Google_Service_Blogger_Post");
-  }
-  /**
-   * Retrieves a list of posts, possibly filtered. (posts.listPosts)
-   *
-   * @param string $blogId ID of the blog to fetch posts from.
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param string endDate Latest post date to fetch, a date-time with RFC
-   * 3339 formatting.
-   * @opt_param bool fetchBodies Whether the body content of posts is included
-   * (default: true). This should be set to false when the post bodies are not
-   * required, to help minimize traffic.
-   * @opt_param bool fetchImages Whether image URL metadata for each post is
-   * included.
-   * @opt_param string labels Comma-separated list of labels to search for.
-   * @opt_param string maxResults Maximum number of posts to fetch.
-   * @opt_param string orderBy Sort search results
-   * @opt_param string pageToken Continuation token if the request is paged.
-   * @opt_param string startDate Earliest post date to fetch, a date-time with RFC
-   * 3339 formatting.
-   * @opt_param string status Statuses to include in the results.
-   * @opt_param string view Access level with which to view the returned result.
-   * Note that some fields require escalated access.
-   * @return Google_Service_Blogger_PostList
-   */
-  public function listPosts($blogId, $optParams = array())
-  {
-    $params = array('blogId' => $blogId);
-    $params = array_merge($params, $optParams);
-    return $this->call('list', array($params), "Google_Service_Blogger_PostList");
-  }
-  /**
-   * Update a post. This method supports patch semantics. (posts.patch)
-   *
-   * @param string $blogId The ID of the Blog.
-   * @param string $postId The ID of the Post.
-   * @param Google_Service_Blogger_Post $postBody
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param bool fetchBody Whether the body content of the post is included
-   * with the result (default: true).
-   * @opt_param bool fetchImages Whether image URL metadata for each post is
-   * included in the returned result (default: false).
-   * @opt_param string maxComments Maximum number of comments to retrieve with the
-   * returned post.
-   * @opt_param bool publish Whether a publish action should be performed when the
-   * post is updated (default: false).
-   * @opt_param bool revert Whether a revert action should be performed when the
-   * post is updated (default: false).
-   * @return Google_Service_Blogger_Post
-   */
-  public function patch($blogId, $postId, Google_Service_Blogger_Post $postBody, $optParams = array())
-  {
-    $params = array('blogId' => $blogId, 'postId' => $postId, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('patch', array($params), "Google_Service_Blogger_Post");
-  }
-  /**
-   * Publishes a draft post, optionally at the specific time of the given
-   * publishDate parameter. (posts.publish)
-   *
-   * @param string $blogId The ID of the Blog.
-   * @param string $postId The ID of the Post.
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param string publishDate Optional date and time to schedule the
-   * publishing of the Blog. If no publishDate parameter is given, the post is
-   * either published at the a previously saved schedule date (if present), or the
-   * current time. If a future date is given, the post will be scheduled to be
-   * published.
-   * @return Google_Service_Blogger_Post
-   */
-  public function publish($blogId, $postId, $optParams = array())
-  {
-    $params = array('blogId' => $blogId, 'postId' => $postId);
-    $params = array_merge($params, $optParams);
-    return $this->call('publish', array($params), "Google_Service_Blogger_Post");
-  }
-  /**
-   * Revert a published or scheduled post to draft state. (posts.revert)
-   *
-   * @param string $blogId The ID of the Blog.
-   * @param string $postId The ID of the Post.
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Blogger_Post
-   */
-  public function revert($blogId, $postId, $optParams = array())
-  {
-    $params = array('blogId' => $blogId, 'postId' => $postId);
-    $params = array_merge($params, $optParams);
-    return $this->call('revert', array($params), "Google_Service_Blogger_Post");
-  }
-  /**
-   * Search for a post. (posts.search)
-   *
-   * @param string $blogId ID of the blog to fetch the post from.
-   * @param string $q Query terms to search this blog for matching posts.
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param bool fetchBodies Whether the body content of posts is included
-   * (default: true). This should be set to false when the post bodies are not
-   * required, to help minimize traffic.
-   * @opt_param string orderBy Sort search results
-   * @return Google_Service_Blogger_PostList
-   */
-  public function search($blogId, $q, $optParams = array())
-  {
-    $params = array('blogId' => $blogId, 'q' => $q);
-    $params = array_merge($params, $optParams);
-    return $this->call('search', array($params), "Google_Service_Blogger_PostList");
-  }
-  /**
-   * Update a post. (posts.update)
-   *
-   * @param string $blogId The ID of the Blog.
-   * @param string $postId The ID of the Post.
-   * @param Google_Service_Blogger_Post $postBody
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param bool fetchBody Whether the body content of the post is included
-   * with the result (default: true).
-   * @opt_param bool fetchImages Whether image URL metadata for each post is
-   * included in the returned result (default: false).
-   * @opt_param string maxComments Maximum number of comments to retrieve with the
-   * returned post.
-   * @opt_param bool publish Whether a publish action should be performed when the
-   * post is updated (default: false).
-   * @opt_param bool revert Whether a revert action should be performed when the
-   * post is updated (default: false).
-   * @return Google_Service_Blogger_Post
-   */
-  public function update($blogId, $postId, Google_Service_Blogger_Post $postBody, $optParams = array())
-  {
-    $params = array('blogId' => $blogId, 'postId' => $postId, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('update', array($params), "Google_Service_Blogger_Post");
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Blogger/Resource/Users.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Blogger/Resource/Users.php
deleted file mode 100644
index 92fc8775..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Blogger/Resource/Users.php
+++ /dev/null
@@ -1,41 +0,0 @@
-
- *   $bloggerService = new Google_Service_Blogger(...);
- *   $users = $bloggerService->users;
- *  
- */
-class Google_Service_Blogger_Resource_Users extends Google_Service_Resource
-{
-  /**
-   * Gets one user by ID. (users.get)
-   *
-   * @param string $userId The ID of the user to get.
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Blogger_User
-   */
-  public function get($userId, $optParams = array())
-  {
-    $params = array('userId' => $userId);
-    $params = array_merge($params, $optParams);
-    return $this->call('get', array($params), "Google_Service_Blogger_User");
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Blogger/User.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Blogger/User.php
deleted file mode 100644
index 31abea38..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Blogger/User.php
+++ /dev/null
@@ -1,104 +0,0 @@
-about = $about;
-  }
-  public function getAbout()
-  {
-    return $this->about;
-  }
-  public function setBlogs(Google_Service_Blogger_UserBlogs $blogs)
-  {
-    $this->blogs = $blogs;
-  }
-  public function getBlogs()
-  {
-    return $this->blogs;
-  }
-  public function setCreated($created)
-  {
-    $this->created = $created;
-  }
-  public function getCreated()
-  {
-    return $this->created;
-  }
-  public function setDisplayName($displayName)
-  {
-    $this->displayName = $displayName;
-  }
-  public function getDisplayName()
-  {
-    return $this->displayName;
-  }
-  public function setId($id)
-  {
-    $this->id = $id;
-  }
-  public function getId()
-  {
-    return $this->id;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setLocale(Google_Service_Blogger_UserLocale $locale)
-  {
-    $this->locale = $locale;
-  }
-  public function getLocale()
-  {
-    return $this->locale;
-  }
-  public function setSelfLink($selfLink)
-  {
-    $this->selfLink = $selfLink;
-  }
-  public function getSelfLink()
-  {
-    return $this->selfLink;
-  }
-  public function setUrl($url)
-  {
-    $this->url = $url;
-  }
-  public function getUrl()
-  {
-    return $this->url;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Blogger/UserBlogs.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Blogger/UserBlogs.php
deleted file mode 100644
index d26dce0d..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Blogger/UserBlogs.php
+++ /dev/null
@@ -1,30 +0,0 @@
-selfLink = $selfLink;
-  }
-  public function getSelfLink()
-  {
-    return $this->selfLink;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Blogger/UserLocale.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Blogger/UserLocale.php
deleted file mode 100644
index 11c7a9e6..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Blogger/UserLocale.php
+++ /dev/null
@@ -1,48 +0,0 @@
-country = $country;
-  }
-  public function getCountry()
-  {
-    return $this->country;
-  }
-  public function setLanguage($language)
-  {
-    $this->language = $language;
-  }
-  public function getLanguage()
-  {
-    return $this->language;
-  }
-  public function setVariant($variant)
-  {
-    $this->variant = $variant;
-  }
-  public function getVariant()
-  {
-    return $this->variant;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Books.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Books.php
deleted file mode 100644
index efef02b6..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Books.php
+++ /dev/null
@@ -1,1508 +0,0 @@
-
- * Searches for books and manages your Google Books library.

- *
- * 

- * For more information about this service, see the API
- * Documentation
- * 

- *
- * @author Google, Inc.
- */
-class Google_Service_Books extends Google_Service
-{
-  /** Manage your books. */
-  const BOOKS =
-      "https://www.googleapis.com/auth/books";
-
-  public $bookshelves;
-  public $bookshelves_volumes;
-  public $cloudloading;
-  public $dictionary;
-  public $layers;
-  public $layers_annotationData;
-  public $layers_volumeAnnotations;
-  public $myconfig;
-  public $mylibrary_annotations;
-  public $mylibrary_bookshelves;
-  public $mylibrary_bookshelves_volumes;
-  public $mylibrary_readingpositions;
-  public $notification;
-  public $onboarding;
-  public $personalizedstream;
-  public $promooffer;
-  public $series;
-  public $series_membership;
-  public $volumes;
-  public $volumes_associated;
-  public $volumes_mybooks;
-  public $volumes_recommended;
-  public $volumes_useruploaded;
-  
-  /**
-   * Constructs the internal representation of the Books service.
-   *
-   * @param Google_Client $client
-   */
-  public function __construct(Google_Client $client)
-  {
-    parent::__construct($client);
-    $this->rootUrl = 'https://www.googleapis.com/';
-    $this->servicePath = 'books/v1/';
-    $this->version = 'v1';
-    $this->serviceName = 'books';
-
-    $this->bookshelves = new Google_Service_Books_Resource_Bookshelves(
-        $this,
-        $this->serviceName,
-        'bookshelves',
-        array(
-          'methods' => array(
-            'get' => array(
-              'path' => 'users/{userId}/bookshelves/{shelf}',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'userId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'shelf' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'source' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-              ),
-            ),'list' => array(
-              'path' => 'users/{userId}/bookshelves',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'userId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'source' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-              ),
-            ),
-          )
-        )
-    );
-    $this->bookshelves_volumes = new Google_Service_Books_Resource_BookshelvesVolumes(
-        $this,
-        $this->serviceName,
-        'volumes',
-        array(
-          'methods' => array(
-            'list' => array(
-              'path' => 'users/{userId}/bookshelves/{shelf}/volumes',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'userId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'shelf' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'maxResults' => array(
-                  'location' => 'query',
-                  'type' => 'integer',
-                ),
-                'showPreorders' => array(
-                  'location' => 'query',
-                  'type' => 'boolean',
-                ),
-                'source' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'startIndex' => array(
-                  'location' => 'query',
-                  'type' => 'integer',
-                ),
-              ),
-            ),
-          )
-        )
-    );
-    $this->cloudloading = new Google_Service_Books_Resource_Cloudloading(
-        $this,
-        $this->serviceName,
-        'cloudloading',
-        array(
-          'methods' => array(
-            'addBook' => array(
-              'path' => 'cloudloading/addBook',
-              'httpMethod' => 'POST',
-              'parameters' => array(
-                'drive_document_id' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'mime_type' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'name' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'upload_client_token' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-              ),
-            ),'deleteBook' => array(
-              'path' => 'cloudloading/deleteBook',
-              'httpMethod' => 'POST',
-              'parameters' => array(
-                'volumeId' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'updateBook' => array(
-              'path' => 'cloudloading/updateBook',
-              'httpMethod' => 'POST',
-              'parameters' => array(),
-            ),
-          )
-        )
-    );
-    $this->dictionary = new Google_Service_Books_Resource_Dictionary(
-        $this,
-        $this->serviceName,
-        'dictionary',
-        array(
-          'methods' => array(
-            'listOfflineMetadata' => array(
-              'path' => 'dictionary/listOfflineMetadata',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'cpksver' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),
-          )
-        )
-    );
-    $this->layers = new Google_Service_Books_Resource_Layers(
-        $this,
-        $this->serviceName,
-        'layers',
-        array(
-          'methods' => array(
-            'get' => array(
-              'path' => 'volumes/{volumeId}/layersummary/{summaryId}',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'volumeId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'summaryId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'contentVersion' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'source' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-              ),
-            ),'list' => array(
-              'path' => 'volumes/{volumeId}/layersummary',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'volumeId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'contentVersion' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'maxResults' => array(
-                  'location' => 'query',
-                  'type' => 'integer',
-                ),
-                'pageToken' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'source' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-              ),
-            ),
-          )
-        )
-    );
-    $this->layers_annotationData = new Google_Service_Books_Resource_LayersAnnotationData(
-        $this,
-        $this->serviceName,
-        'annotationData',
-        array(
-          'methods' => array(
-            'get' => array(
-              'path' => 'volumes/{volumeId}/layers/{layerId}/data/{annotationDataId}',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'volumeId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'layerId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'annotationDataId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'contentVersion' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'allowWebDefinitions' => array(
-                  'location' => 'query',
-                  'type' => 'boolean',
-                ),
-                'h' => array(
-                  'location' => 'query',
-                  'type' => 'integer',
-                ),
-                'locale' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'scale' => array(
-                  'location' => 'query',
-                  'type' => 'integer',
-                ),
-                'source' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'w' => array(
-                  'location' => 'query',
-                  'type' => 'integer',
-                ),
-              ),
-            ),'list' => array(
-              'path' => 'volumes/{volumeId}/layers/{layerId}/data',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'volumeId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'layerId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'contentVersion' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'annotationDataId' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                  'repeated' => true,
-                ),
-                'h' => array(
-                  'location' => 'query',
-                  'type' => 'integer',
-                ),
-                'locale' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'maxResults' => array(
-                  'location' => 'query',
-                  'type' => 'integer',
-                ),
-                'pageToken' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'scale' => array(
-                  'location' => 'query',
-                  'type' => 'integer',
-                ),
-                'source' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'updatedMax' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'updatedMin' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'w' => array(
-                  'location' => 'query',
-                  'type' => 'integer',
-                ),
-              ),
-            ),
-          )
-        )
-    );
-    $this->layers_volumeAnnotations = new Google_Service_Books_Resource_LayersVolumeAnnotations(
-        $this,
-        $this->serviceName,
-        'volumeAnnotations',
-        array(
-          'methods' => array(
-            'get' => array(
-              'path' => 'volumes/{volumeId}/layers/{layerId}/annotations/{annotationId}',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'volumeId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'layerId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'annotationId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'locale' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'source' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-              ),
-            ),'list' => array(
-              'path' => 'volumes/{volumeId}/layers/{layerId}',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'volumeId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'layerId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'contentVersion' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'endOffset' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'endPosition' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'locale' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'maxResults' => array(
-                  'location' => 'query',
-                  'type' => 'integer',
-                ),
-                'pageToken' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'showDeleted' => array(
-                  'location' => 'query',
-                  'type' => 'boolean',
-                ),
-                'source' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'startOffset' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'startPosition' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'updatedMax' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'updatedMin' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'volumeAnnotationsVersion' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-              ),
-            ),
-          )
-        )
-    );
-    $this->myconfig = new Google_Service_Books_Resource_Myconfig(
-        $this,
-        $this->serviceName,
-        'myconfig',
-        array(
-          'methods' => array(
-            'getUserSettings' => array(
-              'path' => 'myconfig/getUserSettings',
-              'httpMethod' => 'GET',
-              'parameters' => array(),
-            ),'releaseDownloadAccess' => array(
-              'path' => 'myconfig/releaseDownloadAccess',
-              'httpMethod' => 'POST',
-              'parameters' => array(
-                'volumeIds' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                  'repeated' => true,
-                  'required' => true,
-                ),
-                'cpksver' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'locale' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'source' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-              ),
-            ),'requestAccess' => array(
-              'path' => 'myconfig/requestAccess',
-              'httpMethod' => 'POST',
-              'parameters' => array(
-                'source' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'volumeId' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'nonce' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'cpksver' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'licenseTypes' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'locale' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-              ),
-            ),'syncVolumeLicenses' => array(
-              'path' => 'myconfig/syncVolumeLicenses',
-              'httpMethod' => 'POST',
-              'parameters' => array(
-                'source' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'nonce' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'cpksver' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'features' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                  'repeated' => true,
-                ),
-                'includeNonComicsSeries' => array(
-                  'location' => 'query',
-                  'type' => 'boolean',
-                ),
-                'locale' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'showPreorders' => array(
-                  'location' => 'query',
-                  'type' => 'boolean',
-                ),
-                'volumeIds' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                  'repeated' => true,
-                ),
-              ),
-            ),'updateUserSettings' => array(
-              'path' => 'myconfig/updateUserSettings',
-              'httpMethod' => 'POST',
-              'parameters' => array(),
-            ),
-          )
-        )
-    );
-    $this->mylibrary_annotations = new Google_Service_Books_Resource_MylibraryAnnotations(
-        $this,
-        $this->serviceName,
-        'annotations',
-        array(
-          'methods' => array(
-            'delete' => array(
-              'path' => 'mylibrary/annotations/{annotationId}',
-              'httpMethod' => 'DELETE',
-              'parameters' => array(
-                'annotationId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'source' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-              ),
-            ),'insert' => array(
-              'path' => 'mylibrary/annotations',
-              'httpMethod' => 'POST',
-              'parameters' => array(
-                'country' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'showOnlySummaryInResponse' => array(
-                  'location' => 'query',
-                  'type' => 'boolean',
-                ),
-                'source' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-              ),
-            ),'list' => array(
-              'path' => 'mylibrary/annotations',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'contentVersion' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'layerId' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'layerIds' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                  'repeated' => true,
-                ),
-                'maxResults' => array(
-                  'location' => 'query',
-                  'type' => 'integer',
-                ),
-                'pageToken' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'showDeleted' => array(
-                  'location' => 'query',
-                  'type' => 'boolean',
-                ),
-                'source' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'updatedMax' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'updatedMin' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'volumeId' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-              ),
-            ),'summary' => array(
-              'path' => 'mylibrary/annotations/summary',
-              'httpMethod' => 'POST',
-              'parameters' => array(
-                'layerIds' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                  'repeated' => true,
-                  'required' => true,
-                ),
-                'volumeId' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'update' => array(
-              'path' => 'mylibrary/annotations/{annotationId}',
-              'httpMethod' => 'PUT',
-              'parameters' => array(
-                'annotationId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'source' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-              ),
-            ),
-          )
-        )
-    );
-    $this->mylibrary_bookshelves = new Google_Service_Books_Resource_MylibraryBookshelves(
-        $this,
-        $this->serviceName,
-        'bookshelves',
-        array(
-          'methods' => array(
-            'addVolume' => array(
-              'path' => 'mylibrary/bookshelves/{shelf}/addVolume',
-              'httpMethod' => 'POST',
-              'parameters' => array(
-                'shelf' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'volumeId' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'reason' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'source' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-              ),
-            ),'clearVolumes' => array(
-              'path' => 'mylibrary/bookshelves/{shelf}/clearVolumes',
-              'httpMethod' => 'POST',
-              'parameters' => array(
-                'shelf' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'source' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-              ),
-            ),'get' => array(
-              'path' => 'mylibrary/bookshelves/{shelf}',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'shelf' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'source' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-              ),
-            ),'list' => array(
-              'path' => 'mylibrary/bookshelves',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'source' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-              ),
-            ),'moveVolume' => array(
-              'path' => 'mylibrary/bookshelves/{shelf}/moveVolume',
-              'httpMethod' => 'POST',
-              'parameters' => array(
-                'shelf' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'volumeId' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'volumePosition' => array(
-                  'location' => 'query',
-                  'type' => 'integer',
-                  'required' => true,
-                ),
-                'source' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-              ),
-            ),'removeVolume' => array(
-              'path' => 'mylibrary/bookshelves/{shelf}/removeVolume',
-              'httpMethod' => 'POST',
-              'parameters' => array(
-                'shelf' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'volumeId' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'reason' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'source' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-              ),
-            ),
-          )
-        )
-    );
-    $this->mylibrary_bookshelves_volumes = new Google_Service_Books_Resource_MylibraryBookshelvesVolumes(
-        $this,
-        $this->serviceName,
-        'volumes',
-        array(
-          'methods' => array(
-            'list' => array(
-              'path' => 'mylibrary/bookshelves/{shelf}/volumes',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'shelf' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'country' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'maxResults' => array(
-                  'location' => 'query',
-                  'type' => 'integer',
-                ),
-                'projection' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'q' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'showPreorders' => array(
-                  'location' => 'query',
-                  'type' => 'boolean',
-                ),
-                'source' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'startIndex' => array(
-                  'location' => 'query',
-                  'type' => 'integer',
-                ),
-              ),
-            ),
-          )
-        )
-    );
-    $this->mylibrary_readingpositions = new Google_Service_Books_Resource_MylibraryReadingpositions(
-        $this,
-        $this->serviceName,
-        'readingpositions',
-        array(
-          'methods' => array(
-            'get' => array(
-              'path' => 'mylibrary/readingpositions/{volumeId}',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'volumeId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'contentVersion' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'source' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-              ),
-            ),'setPosition' => array(
-              'path' => 'mylibrary/readingpositions/{volumeId}/setPosition',
-              'httpMethod' => 'POST',
-              'parameters' => array(
-                'volumeId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'timestamp' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'position' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'action' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'contentVersion' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'deviceCookie' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'source' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-              ),
-            ),
-          )
-        )
-    );
-    $this->notification = new Google_Service_Books_Resource_Notification(
-        $this,
-        $this->serviceName,
-        'notification',
-        array(
-          'methods' => array(
-            'get' => array(
-              'path' => 'notification/get',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'notification_id' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'locale' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'source' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-              ),
-            ),
-          )
-        )
-    );
-    $this->onboarding = new Google_Service_Books_Resource_Onboarding(
-        $this,
-        $this->serviceName,
-        'onboarding',
-        array(
-          'methods' => array(
-            'listCategories' => array(
-              'path' => 'onboarding/listCategories',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'locale' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-              ),
-            ),'listCategoryVolumes' => array(
-              'path' => 'onboarding/listCategoryVolumes',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'categoryId' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                  'repeated' => true,
-                ),
-                'locale' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'maxAllowedMaturityRating' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'pageSize' => array(
-                  'location' => 'query',
-                  'type' => 'integer',
-                ),
-                'pageToken' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-              ),
-            ),
-          )
-        )
-    );
-    $this->personalizedstream = new Google_Service_Books_Resource_Personalizedstream(
-        $this,
-        $this->serviceName,
-        'personalizedstream',
-        array(
-          'methods' => array(
-            'get' => array(
-              'path' => 'personalizedstream/get',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'locale' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'maxAllowedMaturityRating' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'source' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-              ),
-            ),
-          )
-        )
-    );
-    $this->promooffer = new Google_Service_Books_Resource_Promooffer(
-        $this,
-        $this->serviceName,
-        'promooffer',
-        array(
-          'methods' => array(
-            'accept' => array(
-              'path' => 'promooffer/accept',
-              'httpMethod' => 'POST',
-              'parameters' => array(
-                'androidId' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'device' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'manufacturer' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'model' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'offerId' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'product' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'serial' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'volumeId' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-              ),
-            ),'dismiss' => array(
-              'path' => 'promooffer/dismiss',
-              'httpMethod' => 'POST',
-              'parameters' => array(
-                'androidId' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'device' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'manufacturer' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'model' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'offerId' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'product' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'serial' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-              ),
-            ),'get' => array(
-              'path' => 'promooffer/get',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'androidId' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'device' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'manufacturer' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'model' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'product' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'serial' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-              ),
-            ),
-          )
-        )
-    );
-    $this->series = new Google_Service_Books_Resource_Series(
-        $this,
-        $this->serviceName,
-        'series',
-        array(
-          'methods' => array(
-            'get' => array(
-              'path' => 'series/get',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'series_id' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                  'repeated' => true,
-                  'required' => true,
-                ),
-              ),
-            ),
-          )
-        )
-    );
-    $this->series_membership = new Google_Service_Books_Resource_SeriesMembership(
-        $this,
-        $this->serviceName,
-        'membership',
-        array(
-          'methods' => array(
-            'get' => array(
-              'path' => 'series/membership/get',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'series_id' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'page_size' => array(
-                  'location' => 'query',
-                  'type' => 'integer',
-                ),
-                'page_token' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-              ),
-            ),
-          )
-        )
-    );
-    $this->volumes = new Google_Service_Books_Resource_Volumes(
-        $this,
-        $this->serviceName,
-        'volumes',
-        array(
-          'methods' => array(
-            'get' => array(
-              'path' => 'volumes/{volumeId}',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'volumeId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'country' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'includeNonComicsSeries' => array(
-                  'location' => 'query',
-                  'type' => 'boolean',
-                ),
-                'partner' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'projection' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'source' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'user_library_consistent_read' => array(
-                  'location' => 'query',
-                  'type' => 'boolean',
-                ),
-              ),
-            ),'list' => array(
-              'path' => 'volumes',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'q' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'download' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'filter' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'langRestrict' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'libraryRestrict' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'maxAllowedMaturityRating' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'maxResults' => array(
-                  'location' => 'query',
-                  'type' => 'integer',
-                ),
-                'orderBy' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'partner' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'printType' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'projection' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'showPreorders' => array(
-                  'location' => 'query',
-                  'type' => 'boolean',
-                ),
-                'source' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'startIndex' => array(
-                  'location' => 'query',
-                  'type' => 'integer',
-                ),
-              ),
-            ),
-          )
-        )
-    );
-    $this->volumes_associated = new Google_Service_Books_Resource_VolumesAssociated(
-        $this,
-        $this->serviceName,
-        'associated',
-        array(
-          'methods' => array(
-            'list' => array(
-              'path' => 'volumes/{volumeId}/associated',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'volumeId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'association' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'locale' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'maxAllowedMaturityRating' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'source' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-              ),
-            ),
-          )
-        )
-    );
-    $this->volumes_mybooks = new Google_Service_Books_Resource_VolumesMybooks(
-        $this,
-        $this->serviceName,
-        'mybooks',
-        array(
-          'methods' => array(
-            'list' => array(
-              'path' => 'volumes/mybooks',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'acquireMethod' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                  'repeated' => true,
-                ),
-                'country' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'locale' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'maxResults' => array(
-                  'location' => 'query',
-                  'type' => 'integer',
-                ),
-                'processingState' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                  'repeated' => true,
-                ),
-                'source' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'startIndex' => array(
-                  'location' => 'query',
-                  'type' => 'integer',
-                ),
-              ),
-            ),
-          )
-        )
-    );
-    $this->volumes_recommended = new Google_Service_Books_Resource_VolumesRecommended(
-        $this,
-        $this->serviceName,
-        'recommended',
-        array(
-          'methods' => array(
-            'list' => array(
-              'path' => 'volumes/recommended',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'locale' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'maxAllowedMaturityRating' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'source' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-              ),
-            ),'rate' => array(
-              'path' => 'volumes/recommended/rate',
-              'httpMethod' => 'POST',
-              'parameters' => array(
-                'rating' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'volumeId' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'locale' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'source' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-              ),
-            ),
-          )
-        )
-    );
-    $this->volumes_useruploaded = new Google_Service_Books_Resource_VolumesUseruploaded(
-        $this,
-        $this->serviceName,
-        'useruploaded',
-        array(
-          'methods' => array(
-            'list' => array(
-              'path' => 'volumes/useruploaded',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'locale' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'maxResults' => array(
-                  'location' => 'query',
-                  'type' => 'integer',
-                ),
-                'processingState' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                  'repeated' => true,
-                ),
-                'source' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'startIndex' => array(
-                  'location' => 'query',
-                  'type' => 'integer',
-                ),
-                'volumeId' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                  'repeated' => true,
-                ),
-              ),
-            ),
-          )
-        )
-    );
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Books/Annotation.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Books/Annotation.php
deleted file mode 100644
index 727c720a..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Books/Annotation.php
+++ /dev/null
@@ -1,178 +0,0 @@
-afterSelectedText = $afterSelectedText;
-  }
-  public function getAfterSelectedText()
-  {
-    return $this->afterSelectedText;
-  }
-  public function setBeforeSelectedText($beforeSelectedText)
-  {
-    $this->beforeSelectedText = $beforeSelectedText;
-  }
-  public function getBeforeSelectedText()
-  {
-    return $this->beforeSelectedText;
-  }
-  public function setClientVersionRanges(Google_Service_Books_AnnotationClientVersionRanges $clientVersionRanges)
-  {
-    $this->clientVersionRanges = $clientVersionRanges;
-  }
-  public function getClientVersionRanges()
-  {
-    return $this->clientVersionRanges;
-  }
-  public function setCreated($created)
-  {
-    $this->created = $created;
-  }
-  public function getCreated()
-  {
-    return $this->created;
-  }
-  public function setCurrentVersionRanges(Google_Service_Books_AnnotationCurrentVersionRanges $currentVersionRanges)
-  {
-    $this->currentVersionRanges = $currentVersionRanges;
-  }
-  public function getCurrentVersionRanges()
-  {
-    return $this->currentVersionRanges;
-  }
-  public function setData($data)
-  {
-    $this->data = $data;
-  }
-  public function getData()
-  {
-    return $this->data;
-  }
-  public function setDeleted($deleted)
-  {
-    $this->deleted = $deleted;
-  }
-  public function getDeleted()
-  {
-    return $this->deleted;
-  }
-  public function setHighlightStyle($highlightStyle)
-  {
-    $this->highlightStyle = $highlightStyle;
-  }
-  public function getHighlightStyle()
-  {
-    return $this->highlightStyle;
-  }
-  public function setId($id)
-  {
-    $this->id = $id;
-  }
-  public function getId()
-  {
-    return $this->id;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setLayerId($layerId)
-  {
-    $this->layerId = $layerId;
-  }
-  public function getLayerId()
-  {
-    return $this->layerId;
-  }
-  public function setLayerSummary(Google_Service_Books_AnnotationLayerSummary $layerSummary)
-  {
-    $this->layerSummary = $layerSummary;
-  }
-  public function getLayerSummary()
-  {
-    return $this->layerSummary;
-  }
-  public function setPageIds($pageIds)
-  {
-    $this->pageIds = $pageIds;
-  }
-  public function getPageIds()
-  {
-    return $this->pageIds;
-  }
-  public function setSelectedText($selectedText)
-  {
-    $this->selectedText = $selectedText;
-  }
-  public function getSelectedText()
-  {
-    return $this->selectedText;
-  }
-  public function setSelfLink($selfLink)
-  {
-    $this->selfLink = $selfLink;
-  }
-  public function getSelfLink()
-  {
-    return $this->selfLink;
-  }
-  public function setUpdated($updated)
-  {
-    $this->updated = $updated;
-  }
-  public function getUpdated()
-  {
-    return $this->updated;
-  }
-  public function setVolumeId($volumeId)
-  {
-    $this->volumeId = $volumeId;
-  }
-  public function getVolumeId()
-  {
-    return $this->volumeId;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Books/AnnotationClientVersionRanges.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Books/AnnotationClientVersionRanges.php
deleted file mode 100644
index 7bcaf052..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Books/AnnotationClientVersionRanges.php
+++ /dev/null
@@ -1,70 +0,0 @@
-cfiRange = $cfiRange;
-  }
-  public function getCfiRange()
-  {
-    return $this->cfiRange;
-  }
-  public function setContentVersion($contentVersion)
-  {
-    $this->contentVersion = $contentVersion;
-  }
-  public function getContentVersion()
-  {
-    return $this->contentVersion;
-  }
-  public function setGbImageRange(Google_Service_Books_BooksAnnotationsRange $gbImageRange)
-  {
-    $this->gbImageRange = $gbImageRange;
-  }
-  public function getGbImageRange()
-  {
-    return $this->gbImageRange;
-  }
-  public function setGbTextRange(Google_Service_Books_BooksAnnotationsRange $gbTextRange)
-  {
-    $this->gbTextRange = $gbTextRange;
-  }
-  public function getGbTextRange()
-  {
-    return $this->gbTextRange;
-  }
-  public function setImageCfiRange(Google_Service_Books_BooksAnnotationsRange $imageCfiRange)
-  {
-    $this->imageCfiRange = $imageCfiRange;
-  }
-  public function getImageCfiRange()
-  {
-    return $this->imageCfiRange;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Books/AnnotationCurrentVersionRanges.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Books/AnnotationCurrentVersionRanges.php
deleted file mode 100644
index 5a92c0c4..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Books/AnnotationCurrentVersionRanges.php
+++ /dev/null
@@ -1,70 +0,0 @@
-cfiRange = $cfiRange;
-  }
-  public function getCfiRange()
-  {
-    return $this->cfiRange;
-  }
-  public function setContentVersion($contentVersion)
-  {
-    $this->contentVersion = $contentVersion;
-  }
-  public function getContentVersion()
-  {
-    return $this->contentVersion;
-  }
-  public function setGbImageRange(Google_Service_Books_BooksAnnotationsRange $gbImageRange)
-  {
-    $this->gbImageRange = $gbImageRange;
-  }
-  public function getGbImageRange()
-  {
-    return $this->gbImageRange;
-  }
-  public function setGbTextRange(Google_Service_Books_BooksAnnotationsRange $gbTextRange)
-  {
-    $this->gbTextRange = $gbTextRange;
-  }
-  public function getGbTextRange()
-  {
-    return $this->gbTextRange;
-  }
-  public function setImageCfiRange(Google_Service_Books_BooksAnnotationsRange $imageCfiRange)
-  {
-    $this->imageCfiRange = $imageCfiRange;
-  }
-  public function getImageCfiRange()
-  {
-    return $this->imageCfiRange;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Books/AnnotationLayerSummary.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Books/AnnotationLayerSummary.php
deleted file mode 100644
index cfbe8f37..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Books/AnnotationLayerSummary.php
+++ /dev/null
@@ -1,48 +0,0 @@
-allowedCharacterCount = $allowedCharacterCount;
-  }
-  public function getAllowedCharacterCount()
-  {
-    return $this->allowedCharacterCount;
-  }
-  public function setLimitType($limitType)
-  {
-    $this->limitType = $limitType;
-  }
-  public function getLimitType()
-  {
-    return $this->limitType;
-  }
-  public function setRemainingCharacterCount($remainingCharacterCount)
-  {
-    $this->remainingCharacterCount = $remainingCharacterCount;
-  }
-  public function getRemainingCharacterCount()
-  {
-    return $this->remainingCharacterCount;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Books/Annotationdata.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Books/Annotationdata.php
deleted file mode 100644
index 2287ba55..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Books/Annotationdata.php
+++ /dev/null
@@ -1,105 +0,0 @@
- "encoded_data",
-  );
-  public $annotationType;
-  public $data;
-  public $encodedData;
-  public $id;
-  public $kind;
-  public $layerId;
-  public $selfLink;
-  public $updated;
-  public $volumeId;
-
-  public function setAnnotationType($annotationType)
-  {
-    $this->annotationType = $annotationType;
-  }
-  public function getAnnotationType()
-  {
-    return $this->annotationType;
-  }
-  public function setData($data)
-  {
-    $this->data = $data;
-  }
-  public function getData()
-  {
-    return $this->data;
-  }
-  public function setEncodedData($encodedData)
-  {
-    $this->encodedData = $encodedData;
-  }
-  public function getEncodedData()
-  {
-    return $this->encodedData;
-  }
-  public function setId($id)
-  {
-    $this->id = $id;
-  }
-  public function getId()
-  {
-    return $this->id;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setLayerId($layerId)
-  {
-    $this->layerId = $layerId;
-  }
-  public function getLayerId()
-  {
-    return $this->layerId;
-  }
-  public function setSelfLink($selfLink)
-  {
-    $this->selfLink = $selfLink;
-  }
-  public function getSelfLink()
-  {
-    return $this->selfLink;
-  }
-  public function setUpdated($updated)
-  {
-    $this->updated = $updated;
-  }
-  public function getUpdated()
-  {
-    return $this->updated;
-  }
-  public function setVolumeId($volumeId)
-  {
-    $this->volumeId = $volumeId;
-  }
-  public function getVolumeId()
-  {
-    return $this->volumeId;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Books/Annotations.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Books/Annotations.php
deleted file mode 100644
index b57862d7..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Books/Annotations.php
+++ /dev/null
@@ -1,59 +0,0 @@
-items = $items;
-  }
-  public function getItems()
-  {
-    return $this->items;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setNextPageToken($nextPageToken)
-  {
-    $this->nextPageToken = $nextPageToken;
-  }
-  public function getNextPageToken()
-  {
-    return $this->nextPageToken;
-  }
-  public function setTotalItems($totalItems)
-  {
-    $this->totalItems = $totalItems;
-  }
-  public function getTotalItems()
-  {
-    return $this->totalItems;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Books/AnnotationsSummary.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Books/AnnotationsSummary.php
deleted file mode 100644
index b9f39f6b..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Books/AnnotationsSummary.php
+++ /dev/null
@@ -1,41 +0,0 @@
-kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setLayers($layers)
-  {
-    $this->layers = $layers;
-  }
-  public function getLayers()
-  {
-    return $this->layers;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Books/AnnotationsSummaryLayers.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Books/AnnotationsSummaryLayers.php
deleted file mode 100644
index 2c5d3c77..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Books/AnnotationsSummaryLayers.php
+++ /dev/null
@@ -1,66 +0,0 @@
-allowedCharacterCount = $allowedCharacterCount;
-  }
-  public function getAllowedCharacterCount()
-  {
-    return $this->allowedCharacterCount;
-  }
-  public function setLayerId($layerId)
-  {
-    $this->layerId = $layerId;
-  }
-  public function getLayerId()
-  {
-    return $this->layerId;
-  }
-  public function setLimitType($limitType)
-  {
-    $this->limitType = $limitType;
-  }
-  public function getLimitType()
-  {
-    return $this->limitType;
-  }
-  public function setRemainingCharacterCount($remainingCharacterCount)
-  {
-    $this->remainingCharacterCount = $remainingCharacterCount;
-  }
-  public function getRemainingCharacterCount()
-  {
-    return $this->remainingCharacterCount;
-  }
-  public function setUpdated($updated)
-  {
-    $this->updated = $updated;
-  }
-  public function getUpdated()
-  {
-    return $this->updated;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Books/Annotationsdata.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Books/Annotationsdata.php
deleted file mode 100644
index e54607eb..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Books/Annotationsdata.php
+++ /dev/null
@@ -1,59 +0,0 @@
-items = $items;
-  }
-  public function getItems()
-  {
-    return $this->items;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setNextPageToken($nextPageToken)
-  {
-    $this->nextPageToken = $nextPageToken;
-  }
-  public function getNextPageToken()
-  {
-    return $this->nextPageToken;
-  }
-  public function setTotalItems($totalItems)
-  {
-    $this->totalItems = $totalItems;
-  }
-  public function getTotalItems()
-  {
-    return $this->totalItems;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Books/BooksAnnotationsRange.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Books/BooksAnnotationsRange.php
deleted file mode 100644
index af5060df..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Books/BooksAnnotationsRange.php
+++ /dev/null
@@ -1,57 +0,0 @@
-endOffset = $endOffset;
-  }
-  public function getEndOffset()
-  {
-    return $this->endOffset;
-  }
-  public function setEndPosition($endPosition)
-  {
-    $this->endPosition = $endPosition;
-  }
-  public function getEndPosition()
-  {
-    return $this->endPosition;
-  }
-  public function setStartOffset($startOffset)
-  {
-    $this->startOffset = $startOffset;
-  }
-  public function getStartOffset()
-  {
-    return $this->startOffset;
-  }
-  public function setStartPosition($startPosition)
-  {
-    $this->startPosition = $startPosition;
-  }
-  public function getStartPosition()
-  {
-    return $this->startPosition;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Books/BooksCloudloadingResource.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Books/BooksCloudloadingResource.php
deleted file mode 100644
index cde35e49..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Books/BooksCloudloadingResource.php
+++ /dev/null
@@ -1,57 +0,0 @@
-author = $author;
-  }
-  public function getAuthor()
-  {
-    return $this->author;
-  }
-  public function setProcessingState($processingState)
-  {
-    $this->processingState = $processingState;
-  }
-  public function getProcessingState()
-  {
-    return $this->processingState;
-  }
-  public function setTitle($title)
-  {
-    $this->title = $title;
-  }
-  public function getTitle()
-  {
-    return $this->title;
-  }
-  public function setVolumeId($volumeId)
-  {
-    $this->volumeId = $volumeId;
-  }
-  public function getVolumeId()
-  {
-    return $this->volumeId;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Books/BooksVolumesRecommendedRateResponse.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Books/BooksVolumesRecommendedRateResponse.php
deleted file mode 100644
index 3bf3d137..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Books/BooksVolumesRecommendedRateResponse.php
+++ /dev/null
@@ -1,33 +0,0 @@
- "consistency_token",
-  );
-  public $consistencyToken;
-
-  public function setConsistencyToken($consistencyToken)
-  {
-    $this->consistencyToken = $consistencyToken;
-  }
-  public function getConsistencyToken()
-  {
-    return $this->consistencyToken;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Books/Bookshelf.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Books/Bookshelf.php
deleted file mode 100644
index fee17066..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Books/Bookshelf.php
+++ /dev/null
@@ -1,111 +0,0 @@
-access = $access;
-  }
-  public function getAccess()
-  {
-    return $this->access;
-  }
-  public function setCreated($created)
-  {
-    $this->created = $created;
-  }
-  public function getCreated()
-  {
-    return $this->created;
-  }
-  public function setDescription($description)
-  {
-    $this->description = $description;
-  }
-  public function getDescription()
-  {
-    return $this->description;
-  }
-  public function setId($id)
-  {
-    $this->id = $id;
-  }
-  public function getId()
-  {
-    return $this->id;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setSelfLink($selfLink)
-  {
-    $this->selfLink = $selfLink;
-  }
-  public function getSelfLink()
-  {
-    return $this->selfLink;
-  }
-  public function setTitle($title)
-  {
-    $this->title = $title;
-  }
-  public function getTitle()
-  {
-    return $this->title;
-  }
-  public function setUpdated($updated)
-  {
-    $this->updated = $updated;
-  }
-  public function getUpdated()
-  {
-    return $this->updated;
-  }
-  public function setVolumeCount($volumeCount)
-  {
-    $this->volumeCount = $volumeCount;
-  }
-  public function getVolumeCount()
-  {
-    return $this->volumeCount;
-  }
-  public function setVolumesLastUpdated($volumesLastUpdated)
-  {
-    $this->volumesLastUpdated = $volumesLastUpdated;
-  }
-  public function getVolumesLastUpdated()
-  {
-    return $this->volumesLastUpdated;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Books/Bookshelves.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Books/Bookshelves.php
deleted file mode 100644
index 0f7b06e6..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Books/Bookshelves.php
+++ /dev/null
@@ -1,41 +0,0 @@
-items = $items;
-  }
-  public function getItems()
-  {
-    return $this->items;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Books/Category.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Books/Category.php
deleted file mode 100644
index 821d7b6a..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Books/Category.php
+++ /dev/null
@@ -1,41 +0,0 @@
-items = $items;
-  }
-  public function getItems()
-  {
-    return $this->items;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Books/CategoryItems.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Books/CategoryItems.php
deleted file mode 100644
index 1603d89f..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Books/CategoryItems.php
+++ /dev/null
@@ -1,48 +0,0 @@
-badgeUrl = $badgeUrl;
-  }
-  public function getBadgeUrl()
-  {
-    return $this->badgeUrl;
-  }
-  public function setCategoryId($categoryId)
-  {
-    $this->categoryId = $categoryId;
-  }
-  public function getCategoryId()
-  {
-    return $this->categoryId;
-  }
-  public function setName($name)
-  {
-    $this->name = $name;
-  }
-  public function getName()
-  {
-    return $this->name;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Books/ConcurrentAccessRestriction.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Books/ConcurrentAccessRestriction.php
deleted file mode 100644
index 5f614e4e..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Books/ConcurrentAccessRestriction.php
+++ /dev/null
@@ -1,120 +0,0 @@
-deviceAllowed = $deviceAllowed;
-  }
-  public function getDeviceAllowed()
-  {
-    return $this->deviceAllowed;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setMaxConcurrentDevices($maxConcurrentDevices)
-  {
-    $this->maxConcurrentDevices = $maxConcurrentDevices;
-  }
-  public function getMaxConcurrentDevices()
-  {
-    return $this->maxConcurrentDevices;
-  }
-  public function setMessage($message)
-  {
-    $this->message = $message;
-  }
-  public function getMessage()
-  {
-    return $this->message;
-  }
-  public function setNonce($nonce)
-  {
-    $this->nonce = $nonce;
-  }
-  public function getNonce()
-  {
-    return $this->nonce;
-  }
-  public function setReasonCode($reasonCode)
-  {
-    $this->reasonCode = $reasonCode;
-  }
-  public function getReasonCode()
-  {
-    return $this->reasonCode;
-  }
-  public function setRestricted($restricted)
-  {
-    $this->restricted = $restricted;
-  }
-  public function getRestricted()
-  {
-    return $this->restricted;
-  }
-  public function setSignature($signature)
-  {
-    $this->signature = $signature;
-  }
-  public function getSignature()
-  {
-    return $this->signature;
-  }
-  public function setSource($source)
-  {
-    $this->source = $source;
-  }
-  public function getSource()
-  {
-    return $this->source;
-  }
-  public function setTimeWindowSeconds($timeWindowSeconds)
-  {
-    $this->timeWindowSeconds = $timeWindowSeconds;
-  }
-  public function getTimeWindowSeconds()
-  {
-    return $this->timeWindowSeconds;
-  }
-  public function setVolumeId($volumeId)
-  {
-    $this->volumeId = $volumeId;
-  }
-  public function getVolumeId()
-  {
-    return $this->volumeId;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Books/Dictlayerdata.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Books/Dictlayerdata.php
deleted file mode 100644
index ac82cd19..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Books/Dictlayerdata.php
+++ /dev/null
@@ -1,50 +0,0 @@
-common = $common;
-  }
-  public function getCommon()
-  {
-    return $this->common;
-  }
-  public function setDict(Google_Service_Books_DictlayerdataDict $dict)
-  {
-    $this->dict = $dict;
-  }
-  public function getDict()
-  {
-    return $this->dict;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Books/DictlayerdataCommon.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Books/DictlayerdataCommon.php
deleted file mode 100644
index 2ef54770..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Books/DictlayerdataCommon.php
+++ /dev/null
@@ -1,30 +0,0 @@
-title = $title;
-  }
-  public function getTitle()
-  {
-    return $this->title;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Books/DictlayerdataDict.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Books/DictlayerdataDict.php
deleted file mode 100644
index 43c10e75..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Books/DictlayerdataDict.php
+++ /dev/null
@@ -1,42 +0,0 @@
-source = $source;
-  }
-  public function getSource()
-  {
-    return $this->source;
-  }
-  public function setWords($words)
-  {
-    $this->words = $words;
-  }
-  public function getWords()
-  {
-    return $this->words;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Books/DictlayerdataDictSource.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Books/DictlayerdataDictSource.php
deleted file mode 100644
index 3280b323..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Books/DictlayerdataDictSource.php
+++ /dev/null
@@ -1,39 +0,0 @@
-attribution = $attribution;
-  }
-  public function getAttribution()
-  {
-    return $this->attribution;
-  }
-  public function setUrl($url)
-  {
-    $this->url = $url;
-  }
-  public function getUrl()
-  {
-    return $this->url;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Books/DictlayerdataDictWords.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Books/DictlayerdataDictWords.php
deleted file mode 100644
index 15734a1b..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Books/DictlayerdataDictWords.php
+++ /dev/null
@@ -1,62 +0,0 @@
-derivatives = $derivatives;
-  }
-  public function getDerivatives()
-  {
-    return $this->derivatives;
-  }
-  public function setExamples($examples)
-  {
-    $this->examples = $examples;
-  }
-  public function getExamples()
-  {
-    return $this->examples;
-  }
-  public function setSenses($senses)
-  {
-    $this->senses = $senses;
-  }
-  public function getSenses()
-  {
-    return $this->senses;
-  }
-  public function setSource(Google_Service_Books_DictlayerdataDictWordsSource $source)
-  {
-    $this->source = $source;
-  }
-  public function getSource()
-  {
-    return $this->source;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Books/DictlayerdataDictWordsDerivatives.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Books/DictlayerdataDictWordsDerivatives.php
deleted file mode 100644
index f7a46615..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Books/DictlayerdataDictWordsDerivatives.php
+++ /dev/null
@@ -1,40 +0,0 @@
-source = $source;
-  }
-  public function getSource()
-  {
-    return $this->source;
-  }
-  public function setText($text)
-  {
-    $this->text = $text;
-  }
-  public function getText()
-  {
-    return $this->text;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Books/DictlayerdataDictWordsDerivativesSource.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Books/DictlayerdataDictWordsDerivativesSource.php
deleted file mode 100644
index 8fbfa35d..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Books/DictlayerdataDictWordsDerivativesSource.php
+++ /dev/null
@@ -1,39 +0,0 @@
-attribution = $attribution;
-  }
-  public function getAttribution()
-  {
-    return $this->attribution;
-  }
-  public function setUrl($url)
-  {
-    $this->url = $url;
-  }
-  public function getUrl()
-  {
-    return $this->url;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Books/DictlayerdataDictWordsExamples.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Books/DictlayerdataDictWordsExamples.php
deleted file mode 100644
index 5e9878ad..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Books/DictlayerdataDictWordsExamples.php
+++ /dev/null
@@ -1,40 +0,0 @@
-source = $source;
-  }
-  public function getSource()
-  {
-    return $this->source;
-  }
-  public function setText($text)
-  {
-    $this->text = $text;
-  }
-  public function getText()
-  {
-    return $this->text;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Books/DictlayerdataDictWordsExamplesSource.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Books/DictlayerdataDictWordsExamplesSource.php
deleted file mode 100644
index b562e689..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Books/DictlayerdataDictWordsExamplesSource.php
+++ /dev/null
@@ -1,39 +0,0 @@
-attribution = $attribution;
-  }
-  public function getAttribution()
-  {
-    return $this->attribution;
-  }
-  public function setUrl($url)
-  {
-    $this->url = $url;
-  }
-  public function getUrl()
-  {
-    return $this->url;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Books/DictlayerdataDictWordsSenses.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Books/DictlayerdataDictWordsSenses.php
deleted file mode 100644
index cf6b54a9..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Books/DictlayerdataDictWordsSenses.php
+++ /dev/null
@@ -1,98 +0,0 @@
-conjugations = $conjugations;
-  }
-  public function getConjugations()
-  {
-    return $this->conjugations;
-  }
-  public function setDefinitions($definitions)
-  {
-    $this->definitions = $definitions;
-  }
-  public function getDefinitions()
-  {
-    return $this->definitions;
-  }
-  public function setPartOfSpeech($partOfSpeech)
-  {
-    $this->partOfSpeech = $partOfSpeech;
-  }
-  public function getPartOfSpeech()
-  {
-    return $this->partOfSpeech;
-  }
-  public function setPronunciation($pronunciation)
-  {
-    $this->pronunciation = $pronunciation;
-  }
-  public function getPronunciation()
-  {
-    return $this->pronunciation;
-  }
-  public function setPronunciationUrl($pronunciationUrl)
-  {
-    $this->pronunciationUrl = $pronunciationUrl;
-  }
-  public function getPronunciationUrl()
-  {
-    return $this->pronunciationUrl;
-  }
-  public function setSource(Google_Service_Books_DictlayerdataDictWordsSensesSource $source)
-  {
-    $this->source = $source;
-  }
-  public function getSource()
-  {
-    return $this->source;
-  }
-  public function setSyllabification($syllabification)
-  {
-    $this->syllabification = $syllabification;
-  }
-  public function getSyllabification()
-  {
-    return $this->syllabification;
-  }
-  public function setSynonyms($synonyms)
-  {
-    $this->synonyms = $synonyms;
-  }
-  public function getSynonyms()
-  {
-    return $this->synonyms;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Books/DictlayerdataDictWordsSensesConjugations.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Books/DictlayerdataDictWordsSensesConjugations.php
deleted file mode 100644
index ff548961..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Books/DictlayerdataDictWordsSensesConjugations.php
+++ /dev/null
@@ -1,39 +0,0 @@
-type = $type;
-  }
-  public function getType()
-  {
-    return $this->type;
-  }
-  public function setValue($value)
-  {
-    $this->value = $value;
-  }
-  public function getValue()
-  {
-    return $this->value;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Books/DictlayerdataDictWordsSensesDefinitions.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Books/DictlayerdataDictWordsSensesDefinitions.php
deleted file mode 100644
index 031c8527..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Books/DictlayerdataDictWordsSensesDefinitions.php
+++ /dev/null
@@ -1,41 +0,0 @@
-definition = $definition;
-  }
-  public function getDefinition()
-  {
-    return $this->definition;
-  }
-  public function setExamples($examples)
-  {
-    $this->examples = $examples;
-  }
-  public function getExamples()
-  {
-    return $this->examples;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Books/DictlayerdataDictWordsSensesDefinitionsExamples.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Books/DictlayerdataDictWordsSensesDefinitionsExamples.php
deleted file mode 100644
index c1428086..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Books/DictlayerdataDictWordsSensesDefinitionsExamples.php
+++ /dev/null
@@ -1,40 +0,0 @@
-source = $source;
-  }
-  public function getSource()
-  {
-    return $this->source;
-  }
-  public function setText($text)
-  {
-    $this->text = $text;
-  }
-  public function getText()
-  {
-    return $this->text;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Books/DictlayerdataDictWordsSensesDefinitionsExamplesSource.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Books/DictlayerdataDictWordsSensesDefinitionsExamplesSource.php
deleted file mode 100644
index cbae7867..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Books/DictlayerdataDictWordsSensesDefinitionsExamplesSource.php
+++ /dev/null
@@ -1,39 +0,0 @@
-attribution = $attribution;
-  }
-  public function getAttribution()
-  {
-    return $this->attribution;
-  }
-  public function setUrl($url)
-  {
-    $this->url = $url;
-  }
-  public function getUrl()
-  {
-    return $this->url;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Books/DictlayerdataDictWordsSensesSource.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Books/DictlayerdataDictWordsSensesSource.php
deleted file mode 100644
index e8789ca5..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Books/DictlayerdataDictWordsSensesSource.php
+++ /dev/null
@@ -1,39 +0,0 @@
-attribution = $attribution;
-  }
-  public function getAttribution()
-  {
-    return $this->attribution;
-  }
-  public function setUrl($url)
-  {
-    $this->url = $url;
-  }
-  public function getUrl()
-  {
-    return $this->url;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Books/DictlayerdataDictWordsSensesSynonyms.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Books/DictlayerdataDictWordsSensesSynonyms.php
deleted file mode 100644
index 88589657..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Books/DictlayerdataDictWordsSensesSynonyms.php
+++ /dev/null
@@ -1,40 +0,0 @@
-source = $source;
-  }
-  public function getSource()
-  {
-    return $this->source;
-  }
-  public function setText($text)
-  {
-    $this->text = $text;
-  }
-  public function getText()
-  {
-    return $this->text;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Books/DictlayerdataDictWordsSensesSynonymsSource.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Books/DictlayerdataDictWordsSensesSynonymsSource.php
deleted file mode 100644
index 8a5157b4..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Books/DictlayerdataDictWordsSensesSynonymsSource.php
+++ /dev/null
@@ -1,39 +0,0 @@
-attribution = $attribution;
-  }
-  public function getAttribution()
-  {
-    return $this->attribution;
-  }
-  public function setUrl($url)
-  {
-    $this->url = $url;
-  }
-  public function getUrl()
-  {
-    return $this->url;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Books/DictlayerdataDictWordsSource.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Books/DictlayerdataDictWordsSource.php
deleted file mode 100644
index b401a3b7..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Books/DictlayerdataDictWordsSource.php
+++ /dev/null
@@ -1,39 +0,0 @@
-attribution = $attribution;
-  }
-  public function getAttribution()
-  {
-    return $this->attribution;
-  }
-  public function setUrl($url)
-  {
-    $this->url = $url;
-  }
-  public function getUrl()
-  {
-    return $this->url;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Books/Discoveryclusters.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Books/Discoveryclusters.php
deleted file mode 100644
index f69b78e2..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Books/Discoveryclusters.php
+++ /dev/null
@@ -1,50 +0,0 @@
-clusters = $clusters;
-  }
-  public function getClusters()
-  {
-    return $this->clusters;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setTotalClusters($totalClusters)
-  {
-    $this->totalClusters = $totalClusters;
-  }
-  public function getTotalClusters()
-  {
-    return $this->totalClusters;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Books/DiscoveryclustersClusters.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Books/DiscoveryclustersClusters.php
deleted file mode 100644
index 451abddf..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Books/DiscoveryclustersClusters.php
+++ /dev/null
@@ -1,81 +0,0 @@
- "banner_with_content_container",
-  );
-  protected $bannerWithContentContainerType = 'Google_Service_Books_DiscoveryclustersClustersBannerWithContentContainer';
-  protected $bannerWithContentContainerDataType = '';
-  public $subTitle;
-  public $title;
-  public $totalVolumes;
-  public $uid;
-  protected $volumesType = 'Google_Service_Books_Volume';
-  protected $volumesDataType = 'array';
-
-  public function setBannerWithContentContainer(Google_Service_Books_DiscoveryclustersClustersBannerWithContentContainer $bannerWithContentContainer)
-  {
-    $this->bannerWithContentContainer = $bannerWithContentContainer;
-  }
-  public function getBannerWithContentContainer()
-  {
-    return $this->bannerWithContentContainer;
-  }
-  public function setSubTitle($subTitle)
-  {
-    $this->subTitle = $subTitle;
-  }
-  public function getSubTitle()
-  {
-    return $this->subTitle;
-  }
-  public function setTitle($title)
-  {
-    $this->title = $title;
-  }
-  public function getTitle()
-  {
-    return $this->title;
-  }
-  public function setTotalVolumes($totalVolumes)
-  {
-    $this->totalVolumes = $totalVolumes;
-  }
-  public function getTotalVolumes()
-  {
-    return $this->totalVolumes;
-  }
-  public function setUid($uid)
-  {
-    $this->uid = $uid;
-  }
-  public function getUid()
-  {
-    return $this->uid;
-  }
-  public function setVolumes($volumes)
-  {
-    $this->volumes = $volumes;
-  }
-  public function getVolumes()
-  {
-    return $this->volumes;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Books/DiscoveryclustersClustersBannerWithContentContainer.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Books/DiscoveryclustersClustersBannerWithContentContainer.php
deleted file mode 100644
index 93373e5f..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Books/DiscoveryclustersClustersBannerWithContentContainer.php
+++ /dev/null
@@ -1,75 +0,0 @@
-fillColorArgb = $fillColorArgb;
-  }
-  public function getFillColorArgb()
-  {
-    return $this->fillColorArgb;
-  }
-  public function setImageUrl($imageUrl)
-  {
-    $this->imageUrl = $imageUrl;
-  }
-  public function getImageUrl()
-  {
-    return $this->imageUrl;
-  }
-  public function setMaskColorArgb($maskColorArgb)
-  {
-    $this->maskColorArgb = $maskColorArgb;
-  }
-  public function getMaskColorArgb()
-  {
-    return $this->maskColorArgb;
-  }
-  public function setMoreButtonText($moreButtonText)
-  {
-    $this->moreButtonText = $moreButtonText;
-  }
-  public function getMoreButtonText()
-  {
-    return $this->moreButtonText;
-  }
-  public function setMoreButtonUrl($moreButtonUrl)
-  {
-    $this->moreButtonUrl = $moreButtonUrl;
-  }
-  public function getMoreButtonUrl()
-  {
-    return $this->moreButtonUrl;
-  }
-  public function setTextColorArgb($textColorArgb)
-  {
-    $this->textColorArgb = $textColorArgb;
-  }
-  public function getTextColorArgb()
-  {
-    return $this->textColorArgb;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Books/DownloadAccessRestriction.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Books/DownloadAccessRestriction.php
deleted file mode 100644
index d5b2e8c2..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Books/DownloadAccessRestriction.php
+++ /dev/null
@@ -1,129 +0,0 @@
-deviceAllowed = $deviceAllowed;
-  }
-  public function getDeviceAllowed()
-  {
-    return $this->deviceAllowed;
-  }
-  public function setDownloadsAcquired($downloadsAcquired)
-  {
-    $this->downloadsAcquired = $downloadsAcquired;
-  }
-  public function getDownloadsAcquired()
-  {
-    return $this->downloadsAcquired;
-  }
-  public function setJustAcquired($justAcquired)
-  {
-    $this->justAcquired = $justAcquired;
-  }
-  public function getJustAcquired()
-  {
-    return $this->justAcquired;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setMaxDownloadDevices($maxDownloadDevices)
-  {
-    $this->maxDownloadDevices = $maxDownloadDevices;
-  }
-  public function getMaxDownloadDevices()
-  {
-    return $this->maxDownloadDevices;
-  }
-  public function setMessage($message)
-  {
-    $this->message = $message;
-  }
-  public function getMessage()
-  {
-    return $this->message;
-  }
-  public function setNonce($nonce)
-  {
-    $this->nonce = $nonce;
-  }
-  public function getNonce()
-  {
-    return $this->nonce;
-  }
-  public function setReasonCode($reasonCode)
-  {
-    $this->reasonCode = $reasonCode;
-  }
-  public function getReasonCode()
-  {
-    return $this->reasonCode;
-  }
-  public function setRestricted($restricted)
-  {
-    $this->restricted = $restricted;
-  }
-  public function getRestricted()
-  {
-    return $this->restricted;
-  }
-  public function setSignature($signature)
-  {
-    $this->signature = $signature;
-  }
-  public function getSignature()
-  {
-    return $this->signature;
-  }
-  public function setSource($source)
-  {
-    $this->source = $source;
-  }
-  public function getSource()
-  {
-    return $this->source;
-  }
-  public function setVolumeId($volumeId)
-  {
-    $this->volumeId = $volumeId;
-  }
-  public function getVolumeId()
-  {
-    return $this->volumeId;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Books/DownloadAccesses.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Books/DownloadAccesses.php
deleted file mode 100644
index 78bbe26f..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Books/DownloadAccesses.php
+++ /dev/null
@@ -1,41 +0,0 @@
-downloadAccessList = $downloadAccessList;
-  }
-  public function getDownloadAccessList()
-  {
-    return $this->downloadAccessList;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Books/Geolayerdata.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Books/Geolayerdata.php
deleted file mode 100644
index c9b58df5..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Books/Geolayerdata.php
+++ /dev/null
@@ -1,50 +0,0 @@
-common = $common;
-  }
-  public function getCommon()
-  {
-    return $this->common;
-  }
-  public function setGeo(Google_Service_Books_GeolayerdataGeo $geo)
-  {
-    $this->geo = $geo;
-  }
-  public function getGeo()
-  {
-    return $this->geo;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Books/GeolayerdataCommon.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Books/GeolayerdataCommon.php
deleted file mode 100644
index 0af63d59..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Books/GeolayerdataCommon.php
+++ /dev/null
@@ -1,66 +0,0 @@
-lang = $lang;
-  }
-  public function getLang()
-  {
-    return $this->lang;
-  }
-  public function setPreviewImageUrl($previewImageUrl)
-  {
-    $this->previewImageUrl = $previewImageUrl;
-  }
-  public function getPreviewImageUrl()
-  {
-    return $this->previewImageUrl;
-  }
-  public function setSnippet($snippet)
-  {
-    $this->snippet = $snippet;
-  }
-  public function getSnippet()
-  {
-    return $this->snippet;
-  }
-  public function setSnippetUrl($snippetUrl)
-  {
-    $this->snippetUrl = $snippetUrl;
-  }
-  public function getSnippetUrl()
-  {
-    return $this->snippetUrl;
-  }
-  public function setTitle($title)
-  {
-    $this->title = $title;
-  }
-  public function getTitle()
-  {
-    return $this->title;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Books/GeolayerdataGeo.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Books/GeolayerdataGeo.php
deleted file mode 100644
index 13aa2984..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Books/GeolayerdataGeo.php
+++ /dev/null
@@ -1,96 +0,0 @@
-boundary = $boundary;
-  }
-  public function getBoundary()
-  {
-    return $this->boundary;
-  }
-  public function setCachePolicy($cachePolicy)
-  {
-    $this->cachePolicy = $cachePolicy;
-  }
-  public function getCachePolicy()
-  {
-    return $this->cachePolicy;
-  }
-  public function setCountryCode($countryCode)
-  {
-    $this->countryCode = $countryCode;
-  }
-  public function getCountryCode()
-  {
-    return $this->countryCode;
-  }
-  public function setLatitude($latitude)
-  {
-    $this->latitude = $latitude;
-  }
-  public function getLatitude()
-  {
-    return $this->latitude;
-  }
-  public function setLongitude($longitude)
-  {
-    $this->longitude = $longitude;
-  }
-  public function getLongitude()
-  {
-    return $this->longitude;
-  }
-  public function setMapType($mapType)
-  {
-    $this->mapType = $mapType;
-  }
-  public function getMapType()
-  {
-    return $this->mapType;
-  }
-  public function setViewport(Google_Service_Books_GeolayerdataGeoViewport $viewport)
-  {
-    $this->viewport = $viewport;
-  }
-  public function getViewport()
-  {
-    return $this->viewport;
-  }
-  public function setZoom($zoom)
-  {
-    $this->zoom = $zoom;
-  }
-  public function getZoom()
-  {
-    return $this->zoom;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Books/GeolayerdataGeoBoundary.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Books/GeolayerdataGeoBoundary.php
deleted file mode 100644
index f72610fa..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Books/GeolayerdataGeoBoundary.php
+++ /dev/null
@@ -1,39 +0,0 @@
-latitude = $latitude;
-  }
-  public function getLatitude()
-  {
-    return $this->latitude;
-  }
-  public function setLongitude($longitude)
-  {
-    $this->longitude = $longitude;
-  }
-  public function getLongitude()
-  {
-    return $this->longitude;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Books/GeolayerdataGeoViewport.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Books/GeolayerdataGeoViewport.php
deleted file mode 100644
index ec95fd2e..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Books/GeolayerdataGeoViewport.php
+++ /dev/null
@@ -1,41 +0,0 @@
-hi = $hi;
-  }
-  public function getHi()
-  {
-    return $this->hi;
-  }
-  public function setLo(Google_Service_Books_GeolayerdataGeoViewportLo $lo)
-  {
-    $this->lo = $lo;
-  }
-  public function getLo()
-  {
-    return $this->lo;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Books/GeolayerdataGeoViewportHi.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Books/GeolayerdataGeoViewportHi.php
deleted file mode 100644
index a70b5059..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Books/GeolayerdataGeoViewportHi.php
+++ /dev/null
@@ -1,39 +0,0 @@
-latitude = $latitude;
-  }
-  public function getLatitude()
-  {
-    return $this->latitude;
-  }
-  public function setLongitude($longitude)
-  {
-    $this->longitude = $longitude;
-  }
-  public function getLongitude()
-  {
-    return $this->longitude;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Books/GeolayerdataGeoViewportLo.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Books/GeolayerdataGeoViewportLo.php
deleted file mode 100644
index 53ac070d..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Books/GeolayerdataGeoViewportLo.php
+++ /dev/null
@@ -1,39 +0,0 @@
-latitude = $latitude;
-  }
-  public function getLatitude()
-  {
-    return $this->latitude;
-  }
-  public function setLongitude($longitude)
-  {
-    $this->longitude = $longitude;
-  }
-  public function getLongitude()
-  {
-    return $this->longitude;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Books/Layersummaries.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Books/Layersummaries.php
deleted file mode 100644
index ee215018..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Books/Layersummaries.php
+++ /dev/null
@@ -1,50 +0,0 @@
-items = $items;
-  }
-  public function getItems()
-  {
-    return $this->items;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setTotalItems($totalItems)
-  {
-    $this->totalItems = $totalItems;
-  }
-  public function getTotalItems()
-  {
-    return $this->totalItems;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Books/Layersummary.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Books/Layersummary.php
deleted file mode 100644
index dc84696e..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Books/Layersummary.php
+++ /dev/null
@@ -1,139 +0,0 @@
-annotationCount = $annotationCount;
-  }
-  public function getAnnotationCount()
-  {
-    return $this->annotationCount;
-  }
-  public function setAnnotationTypes($annotationTypes)
-  {
-    $this->annotationTypes = $annotationTypes;
-  }
-  public function getAnnotationTypes()
-  {
-    return $this->annotationTypes;
-  }
-  public function setAnnotationsDataLink($annotationsDataLink)
-  {
-    $this->annotationsDataLink = $annotationsDataLink;
-  }
-  public function getAnnotationsDataLink()
-  {
-    return $this->annotationsDataLink;
-  }
-  public function setAnnotationsLink($annotationsLink)
-  {
-    $this->annotationsLink = $annotationsLink;
-  }
-  public function getAnnotationsLink()
-  {
-    return $this->annotationsLink;
-  }
-  public function setContentVersion($contentVersion)
-  {
-    $this->contentVersion = $contentVersion;
-  }
-  public function getContentVersion()
-  {
-    return $this->contentVersion;
-  }
-  public function setDataCount($dataCount)
-  {
-    $this->dataCount = $dataCount;
-  }
-  public function getDataCount()
-  {
-    return $this->dataCount;
-  }
-  public function setId($id)
-  {
-    $this->id = $id;
-  }
-  public function getId()
-  {
-    return $this->id;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setLayerId($layerId)
-  {
-    $this->layerId = $layerId;
-  }
-  public function getLayerId()
-  {
-    return $this->layerId;
-  }
-  public function setSelfLink($selfLink)
-  {
-    $this->selfLink = $selfLink;
-  }
-  public function getSelfLink()
-  {
-    return $this->selfLink;
-  }
-  public function setUpdated($updated)
-  {
-    $this->updated = $updated;
-  }
-  public function getUpdated()
-  {
-    return $this->updated;
-  }
-  public function setVolumeAnnotationsVersion($volumeAnnotationsVersion)
-  {
-    $this->volumeAnnotationsVersion = $volumeAnnotationsVersion;
-  }
-  public function getVolumeAnnotationsVersion()
-  {
-    return $this->volumeAnnotationsVersion;
-  }
-  public function setVolumeId($volumeId)
-  {
-    $this->volumeId = $volumeId;
-  }
-  public function getVolumeId()
-  {
-    return $this->volumeId;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Books/Metadata.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Books/Metadata.php
deleted file mode 100644
index 7f9688ed..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Books/Metadata.php
+++ /dev/null
@@ -1,41 +0,0 @@
-items = $items;
-  }
-  public function getItems()
-  {
-    return $this->items;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Books/MetadataItems.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Books/MetadataItems.php
deleted file mode 100644
index 67a48e3f..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Books/MetadataItems.php
+++ /dev/null
@@ -1,70 +0,0 @@
- "download_url",
-        "encryptedKey" => "encrypted_key",
-  );
-  public $downloadUrl;
-  public $encryptedKey;
-  public $language;
-  public $size;
-  public $version;
-
-  public function setDownloadUrl($downloadUrl)
-  {
-    $this->downloadUrl = $downloadUrl;
-  }
-  public function getDownloadUrl()
-  {
-    return $this->downloadUrl;
-  }
-  public function setEncryptedKey($encryptedKey)
-  {
-    $this->encryptedKey = $encryptedKey;
-  }
-  public function getEncryptedKey()
-  {
-    return $this->encryptedKey;
-  }
-  public function setLanguage($language)
-  {
-    $this->language = $language;
-  }
-  public function getLanguage()
-  {
-    return $this->language;
-  }
-  public function setSize($size)
-  {
-    $this->size = $size;
-  }
-  public function getSize()
-  {
-    return $this->size;
-  }
-  public function setVersion($version)
-  {
-    $this->version = $version;
-  }
-  public function getVersion()
-  {
-    return $this->version;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Books/Notification.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Books/Notification.php
deleted file mode 100644
index 54eca0ca..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Books/Notification.php
+++ /dev/null
@@ -1,156 +0,0 @@
- "doc_id",
-        "docType" => "doc_type",
-        "dontShowNotification" => "dont_show_notification",
-        "notificationType" => "notification_type",
-        "pcampaignId" => "pcampaign_id",
-        "showNotificationSettingsAction" => "show_notification_settings_action",
-  );
-  public $body;
-  public $crmExperimentIds;
-  public $docId;
-  public $docType;
-  public $dontShowNotification;
-  public $iconUrl;
-  public $kind;
-  public $notificationGroup;
-  public $notificationType;
-  public $pcampaignId;
-  public $reason;
-  public $showNotificationSettingsAction;
-  public $targetUrl;
-  public $title;
-
-  public function setBody($body)
-  {
-    $this->body = $body;
-  }
-  public function getBody()
-  {
-    return $this->body;
-  }
-  public function setCrmExperimentIds($crmExperimentIds)
-  {
-    $this->crmExperimentIds = $crmExperimentIds;
-  }
-  public function getCrmExperimentIds()
-  {
-    return $this->crmExperimentIds;
-  }
-  public function setDocId($docId)
-  {
-    $this->docId = $docId;
-  }
-  public function getDocId()
-  {
-    return $this->docId;
-  }
-  public function setDocType($docType)
-  {
-    $this->docType = $docType;
-  }
-  public function getDocType()
-  {
-    return $this->docType;
-  }
-  public function setDontShowNotification($dontShowNotification)
-  {
-    $this->dontShowNotification = $dontShowNotification;
-  }
-  public function getDontShowNotification()
-  {
-    return $this->dontShowNotification;
-  }
-  public function setIconUrl($iconUrl)
-  {
-    $this->iconUrl = $iconUrl;
-  }
-  public function getIconUrl()
-  {
-    return $this->iconUrl;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setNotificationGroup($notificationGroup)
-  {
-    $this->notificationGroup = $notificationGroup;
-  }
-  public function getNotificationGroup()
-  {
-    return $this->notificationGroup;
-  }
-  public function setNotificationType($notificationType)
-  {
-    $this->notificationType = $notificationType;
-  }
-  public function getNotificationType()
-  {
-    return $this->notificationType;
-  }
-  public function setPcampaignId($pcampaignId)
-  {
-    $this->pcampaignId = $pcampaignId;
-  }
-  public function getPcampaignId()
-  {
-    return $this->pcampaignId;
-  }
-  public function setReason($reason)
-  {
-    $this->reason = $reason;
-  }
-  public function getReason()
-  {
-    return $this->reason;
-  }
-  public function setShowNotificationSettingsAction($showNotificationSettingsAction)
-  {
-    $this->showNotificationSettingsAction = $showNotificationSettingsAction;
-  }
-  public function getShowNotificationSettingsAction()
-  {
-    return $this->showNotificationSettingsAction;
-  }
-  public function setTargetUrl($targetUrl)
-  {
-    $this->targetUrl = $targetUrl;
-  }
-  public function getTargetUrl()
-  {
-    return $this->targetUrl;
-  }
-  public function setTitle($title)
-  {
-    $this->title = $title;
-  }
-  public function getTitle()
-  {
-    return $this->title;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Books/Offers.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Books/Offers.php
deleted file mode 100644
index 0910f0f0..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Books/Offers.php
+++ /dev/null
@@ -1,41 +0,0 @@
-items = $items;
-  }
-  public function getItems()
-  {
-    return $this->items;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Books/OffersItems.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Books/OffersItems.php
deleted file mode 100644
index 9d70ff51..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Books/OffersItems.php
+++ /dev/null
@@ -1,59 +0,0 @@
-artUrl = $artUrl;
-  }
-  public function getArtUrl()
-  {
-    return $this->artUrl;
-  }
-  public function setGservicesKey($gservicesKey)
-  {
-    $this->gservicesKey = $gservicesKey;
-  }
-  public function getGservicesKey()
-  {
-    return $this->gservicesKey;
-  }
-  public function setId($id)
-  {
-    $this->id = $id;
-  }
-  public function getId()
-  {
-    return $this->id;
-  }
-  public function setItems($items)
-  {
-    $this->items = $items;
-  }
-  public function getItems()
-  {
-    return $this->items;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Books/OffersItemsItems.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Books/OffersItemsItems.php
deleted file mode 100644
index 23a041c4..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Books/OffersItemsItems.php
+++ /dev/null
@@ -1,75 +0,0 @@
-author = $author;
-  }
-  public function getAuthor()
-  {
-    return $this->author;
-  }
-  public function setCanonicalVolumeLink($canonicalVolumeLink)
-  {
-    $this->canonicalVolumeLink = $canonicalVolumeLink;
-  }
-  public function getCanonicalVolumeLink()
-  {
-    return $this->canonicalVolumeLink;
-  }
-  public function setCoverUrl($coverUrl)
-  {
-    $this->coverUrl = $coverUrl;
-  }
-  public function getCoverUrl()
-  {
-    return $this->coverUrl;
-  }
-  public function setDescription($description)
-  {
-    $this->description = $description;
-  }
-  public function getDescription()
-  {
-    return $this->description;
-  }
-  public function setTitle($title)
-  {
-    $this->title = $title;
-  }
-  public function getTitle()
-  {
-    return $this->title;
-  }
-  public function setVolumeId($volumeId)
-  {
-    $this->volumeId = $volumeId;
-  }
-  public function getVolumeId()
-  {
-    return $this->volumeId;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Books/ReadingPosition.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Books/ReadingPosition.php
deleted file mode 100644
index 53b3330f..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Books/ReadingPosition.php
+++ /dev/null
@@ -1,84 +0,0 @@
-epubCfiPosition = $epubCfiPosition;
-  }
-  public function getEpubCfiPosition()
-  {
-    return $this->epubCfiPosition;
-  }
-  public function setGbImagePosition($gbImagePosition)
-  {
-    $this->gbImagePosition = $gbImagePosition;
-  }
-  public function getGbImagePosition()
-  {
-    return $this->gbImagePosition;
-  }
-  public function setGbTextPosition($gbTextPosition)
-  {
-    $this->gbTextPosition = $gbTextPosition;
-  }
-  public function getGbTextPosition()
-  {
-    return $this->gbTextPosition;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setPdfPosition($pdfPosition)
-  {
-    $this->pdfPosition = $pdfPosition;
-  }
-  public function getPdfPosition()
-  {
-    return $this->pdfPosition;
-  }
-  public function setUpdated($updated)
-  {
-    $this->updated = $updated;
-  }
-  public function getUpdated()
-  {
-    return $this->updated;
-  }
-  public function setVolumeId($volumeId)
-  {
-    $this->volumeId = $volumeId;
-  }
-  public function getVolumeId()
-  {
-    return $this->volumeId;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Books/RequestAccess.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Books/RequestAccess.php
deleted file mode 100644
index 4a903ae2..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Books/RequestAccess.php
+++ /dev/null
@@ -1,50 +0,0 @@
-concurrentAccess = $concurrentAccess;
-  }
-  public function getConcurrentAccess()
-  {
-    return $this->concurrentAccess;
-  }
-  public function setDownloadAccess(Google_Service_Books_DownloadAccessRestriction $downloadAccess)
-  {
-    $this->downloadAccess = $downloadAccess;
-  }
-  public function getDownloadAccess()
-  {
-    return $this->downloadAccess;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Books/Resource/Bookshelves.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Books/Resource/Bookshelves.php
deleted file mode 100644
index 38c7d29a..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Books/Resource/Bookshelves.php
+++ /dev/null
@@ -1,61 +0,0 @@
-
- *   $booksService = new Google_Service_Books(...);
- *   $bookshelves = $booksService->bookshelves;
- *  
- */
-class Google_Service_Books_Resource_Bookshelves extends Google_Service_Resource
-{
-  /**
-   * Retrieves metadata for a specific bookshelf for the specified user.
-   * (bookshelves.get)
-   *
-   * @param string $userId ID of user for whom to retrieve bookshelves.
-   * @param string $shelf ID of bookshelf to retrieve.
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param string source String to identify the originator of this request.
-   * @return Google_Service_Books_Bookshelf
-   */
-  public function get($userId, $shelf, $optParams = array())
-  {
-    $params = array('userId' => $userId, 'shelf' => $shelf);
-    $params = array_merge($params, $optParams);
-    return $this->call('get', array($params), "Google_Service_Books_Bookshelf");
-  }
-  /**
-   * Retrieves a list of public bookshelves for the specified user.
-   * (bookshelves.listBookshelves)
-   *
-   * @param string $userId ID of user for whom to retrieve bookshelves.
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param string source String to identify the originator of this request.
-   * @return Google_Service_Books_Bookshelves
-   */
-  public function listBookshelves($userId, $optParams = array())
-  {
-    $params = array('userId' => $userId);
-    $params = array_merge($params, $optParams);
-    return $this->call('list', array($params), "Google_Service_Books_Bookshelves");
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Books/Resource/BookshelvesVolumes.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Books/Resource/BookshelvesVolumes.php
deleted file mode 100644
index 91949468..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Books/Resource/BookshelvesVolumes.php
+++ /dev/null
@@ -1,50 +0,0 @@
-
- *   $booksService = new Google_Service_Books(...);
- *   $volumes = $booksService->volumes;
- *  
- */
-class Google_Service_Books_Resource_BookshelvesVolumes extends Google_Service_Resource
-{
-  /**
-   * Retrieves volumes in a specific bookshelf for the specified user.
-   * (volumes.listBookshelvesVolumes)
-   *
-   * @param string $userId ID of user for whom to retrieve bookshelf volumes.
-   * @param string $shelf ID of bookshelf to retrieve volumes.
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param string maxResults Maximum number of results to return
-   * @opt_param bool showPreorders Set to true to show pre-ordered books. Defaults
-   * to false.
-   * @opt_param string source String to identify the originator of this request.
-   * @opt_param string startIndex Index of the first element to return (starts at
-   * 0)
-   * @return Google_Service_Books_Volumes
-   */
-  public function listBookshelvesVolumes($userId, $shelf, $optParams = array())
-  {
-    $params = array('userId' => $userId, 'shelf' => $shelf);
-    $params = array_merge($params, $optParams);
-    return $this->call('list', array($params), "Google_Service_Books_Volumes");
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Books/Resource/Cloudloading.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Books/Resource/Cloudloading.php
deleted file mode 100644
index a2d6865c..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Books/Resource/Cloudloading.php
+++ /dev/null
@@ -1,73 +0,0 @@
-
- *   $booksService = new Google_Service_Books(...);
- *   $cloudloading = $booksService->cloudloading;
- *  
- */
-class Google_Service_Books_Resource_Cloudloading extends Google_Service_Resource
-{
-  /**
-   * (cloudloading.addBook)
-   *
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param string drive_document_id A drive document id. The
-   * upload_client_token must not be set.
-   * @opt_param string mime_type The document MIME type. It can be set only if the
-   * drive_document_id is set.
-   * @opt_param string name The document name. It can be set only if the
-   * drive_document_id is set.
-   * @opt_param string upload_client_token
-   * @return Google_Service_Books_BooksCloudloadingResource
-   */
-  public function addBook($optParams = array())
-  {
-    $params = array();
-    $params = array_merge($params, $optParams);
-    return $this->call('addBook', array($params), "Google_Service_Books_BooksCloudloadingResource");
-  }
-  /**
-   * Remove the book and its contents (cloudloading.deleteBook)
-   *
-   * @param string $volumeId The id of the book to be removed.
-   * @param array $optParams Optional parameters.
-   */
-  public function deleteBook($volumeId, $optParams = array())
-  {
-    $params = array('volumeId' => $volumeId);
-    $params = array_merge($params, $optParams);
-    return $this->call('deleteBook', array($params));
-  }
-  /**
-   * (cloudloading.updateBook)
-   *
-   * @param Google_Service_Books_BooksCloudloadingResource $postBody
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Books_BooksCloudloadingResource
-   */
-  public function updateBook(Google_Service_Books_BooksCloudloadingResource $postBody, $optParams = array())
-  {
-    $params = array('postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('updateBook', array($params), "Google_Service_Books_BooksCloudloadingResource");
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Books/Resource/Dictionary.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Books/Resource/Dictionary.php
deleted file mode 100644
index 997f2781..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Books/Resource/Dictionary.php
+++ /dev/null
@@ -1,42 +0,0 @@
-
- *   $booksService = new Google_Service_Books(...);
- *   $dictionary = $booksService->dictionary;
- *  
- */
-class Google_Service_Books_Resource_Dictionary extends Google_Service_Resource
-{
-  /**
-   * Returns a list of offline dictionary metadata available
-   * (dictionary.listOfflineMetadata)
-   *
-   * @param string $cpksver The device/version ID from which to request the data.
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Books_Metadata
-   */
-  public function listOfflineMetadata($cpksver, $optParams = array())
-  {
-    $params = array('cpksver' => $cpksver);
-    $params = array_merge($params, $optParams);
-    return $this->call('listOfflineMetadata', array($params), "Google_Service_Books_Metadata");
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Books/Resource/Layers.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Books/Resource/Layers.php
deleted file mode 100644
index 3b93e8d8..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Books/Resource/Layers.php
+++ /dev/null
@@ -1,66 +0,0 @@
-
- *   $booksService = new Google_Service_Books(...);
- *   $layers = $booksService->layers;
- *  
- */
-class Google_Service_Books_Resource_Layers extends Google_Service_Resource
-{
-  /**
-   * Gets the layer summary for a volume. (layers.get)
-   *
-   * @param string $volumeId The volume to retrieve layers for.
-   * @param string $summaryId The ID for the layer to get the summary for.
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param string contentVersion The content version for the requested
-   * volume.
-   * @opt_param string source String to identify the originator of this request.
-   * @return Google_Service_Books_Layersummary
-   */
-  public function get($volumeId, $summaryId, $optParams = array())
-  {
-    $params = array('volumeId' => $volumeId, 'summaryId' => $summaryId);
-    $params = array_merge($params, $optParams);
-    return $this->call('get', array($params), "Google_Service_Books_Layersummary");
-  }
-  /**
-   * List the layer summaries for a volume. (layers.listLayers)
-   *
-   * @param string $volumeId The volume to retrieve layers for.
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param string contentVersion The content version for the requested
-   * volume.
-   * @opt_param string maxResults Maximum number of results to return
-   * @opt_param string pageToken The value of the nextToken from the previous
-   * page.
-   * @opt_param string source String to identify the originator of this request.
-   * @return Google_Service_Books_Layersummaries
-   */
-  public function listLayers($volumeId, $optParams = array())
-  {
-    $params = array('volumeId' => $volumeId);
-    $params = array_merge($params, $optParams);
-    return $this->call('list', array($params), "Google_Service_Books_Layersummaries");
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Books/Resource/LayersAnnotationData.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Books/Resource/LayersAnnotationData.php
deleted file mode 100644
index 3f04cb68..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Books/Resource/LayersAnnotationData.php
+++ /dev/null
@@ -1,90 +0,0 @@
-
- *   $booksService = new Google_Service_Books(...);
- *   $annotationData = $booksService->annotationData;
- *  
- */
-class Google_Service_Books_Resource_LayersAnnotationData extends Google_Service_Resource
-{
-  /**
-   * Gets the annotation data. (annotationData.get)
-   *
-   * @param string $volumeId The volume to retrieve annotations for.
-   * @param string $layerId The ID for the layer to get the annotations.
-   * @param string $annotationDataId The ID of the annotation data to retrieve.
-   * @param string $contentVersion The content version for the volume you are
-   * trying to retrieve.
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param bool allowWebDefinitions For the dictionary layer. Whether or not
-   * to allow web definitions.
-   * @opt_param int h The requested pixel height for any images. If height is
-   * provided width must also be provided.
-   * @opt_param string locale The locale information for the data. ISO-639-1
-   * language and ISO-3166-1 country code. Ex: 'en_US'.
-   * @opt_param int scale The requested scale for the image.
-   * @opt_param string source String to identify the originator of this request.
-   * @opt_param int w The requested pixel width for any images. If width is
-   * provided height must also be provided.
-   * @return Google_Service_Books_Annotationdata
-   */
-  public function get($volumeId, $layerId, $annotationDataId, $contentVersion, $optParams = array())
-  {
-    $params = array('volumeId' => $volumeId, 'layerId' => $layerId, 'annotationDataId' => $annotationDataId, 'contentVersion' => $contentVersion);
-    $params = array_merge($params, $optParams);
-    return $this->call('get', array($params), "Google_Service_Books_Annotationdata");
-  }
-  /**
-   * Gets the annotation data for a volume and layer.
-   * (annotationData.listLayersAnnotationData)
-   *
-   * @param string $volumeId The volume to retrieve annotation data for.
-   * @param string $layerId The ID for the layer to get the annotation data.
-   * @param string $contentVersion The content version for the requested volume.
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param string annotationDataId The list of Annotation Data Ids to
-   * retrieve. Pagination is ignored if this is set.
-   * @opt_param int h The requested pixel height for any images. If height is
-   * provided width must also be provided.
-   * @opt_param string locale The locale information for the data. ISO-639-1
-   * language and ISO-3166-1 country code. Ex: 'en_US'.
-   * @opt_param string maxResults Maximum number of results to return
-   * @opt_param string pageToken The value of the nextToken from the previous
-   * page.
-   * @opt_param int scale The requested scale for the image.
-   * @opt_param string source String to identify the originator of this request.
-   * @opt_param string updatedMax RFC 3339 timestamp to restrict to items updated
-   * prior to this timestamp (exclusive).
-   * @opt_param string updatedMin RFC 3339 timestamp to restrict to items updated
-   * since this timestamp (inclusive).
-   * @opt_param int w The requested pixel width for any images. If width is
-   * provided height must also be provided.
-   * @return Google_Service_Books_Annotationsdata
-   */
-  public function listLayersAnnotationData($volumeId, $layerId, $contentVersion, $optParams = array())
-  {
-    $params = array('volumeId' => $volumeId, 'layerId' => $layerId, 'contentVersion' => $contentVersion);
-    $params = array_merge($params, $optParams);
-    return $this->call('list', array($params), "Google_Service_Books_Annotationsdata");
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Books/Resource/LayersVolumeAnnotations.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Books/Resource/LayersVolumeAnnotations.php
deleted file mode 100644
index eef4ed83..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Books/Resource/LayersVolumeAnnotations.php
+++ /dev/null
@@ -1,83 +0,0 @@
-
- *   $booksService = new Google_Service_Books(...);
- *   $volumeAnnotations = $booksService->volumeAnnotations;
- *  
- */
-class Google_Service_Books_Resource_LayersVolumeAnnotations extends Google_Service_Resource
-{
-  /**
-   * Gets the volume annotation. (volumeAnnotations.get)
-   *
-   * @param string $volumeId The volume to retrieve annotations for.
-   * @param string $layerId The ID for the layer to get the annotations.
-   * @param string $annotationId The ID of the volume annotation to retrieve.
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param string locale The locale information for the data. ISO-639-1
-   * language and ISO-3166-1 country code. Ex: 'en_US'.
-   * @opt_param string source String to identify the originator of this request.
-   * @return Google_Service_Books_Volumeannotation
-   */
-  public function get($volumeId, $layerId, $annotationId, $optParams = array())
-  {
-    $params = array('volumeId' => $volumeId, 'layerId' => $layerId, 'annotationId' => $annotationId);
-    $params = array_merge($params, $optParams);
-    return $this->call('get', array($params), "Google_Service_Books_Volumeannotation");
-  }
-  /**
-   * Gets the volume annotations for a volume and layer.
-   * (volumeAnnotations.listLayersVolumeAnnotations)
-   *
-   * @param string $volumeId The volume to retrieve annotations for.
-   * @param string $layerId The ID for the layer to get the annotations.
-   * @param string $contentVersion The content version for the requested volume.
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param string endOffset The end offset to end retrieving data from.
-   * @opt_param string endPosition The end position to end retrieving data from.
-   * @opt_param string locale The locale information for the data. ISO-639-1
-   * language and ISO-3166-1 country code. Ex: 'en_US'.
-   * @opt_param string maxResults Maximum number of results to return
-   * @opt_param string pageToken The value of the nextToken from the previous
-   * page.
-   * @opt_param bool showDeleted Set to true to return deleted annotations.
-   * updatedMin must be in the request to use this. Defaults to false.
-   * @opt_param string source String to identify the originator of this request.
-   * @opt_param string startOffset The start offset to start retrieving data from.
-   * @opt_param string startPosition The start position to start retrieving data
-   * from.
-   * @opt_param string updatedMax RFC 3339 timestamp to restrict to items updated
-   * prior to this timestamp (exclusive).
-   * @opt_param string updatedMin RFC 3339 timestamp to restrict to items updated
-   * since this timestamp (inclusive).
-   * @opt_param string volumeAnnotationsVersion The version of the volume
-   * annotations that you are requesting.
-   * @return Google_Service_Books_Volumeannotations
-   */
-  public function listLayersVolumeAnnotations($volumeId, $layerId, $contentVersion, $optParams = array())
-  {
-    $params = array('volumeId' => $volumeId, 'layerId' => $layerId, 'contentVersion' => $contentVersion);
-    $params = array_merge($params, $optParams);
-    return $this->call('list', array($params), "Google_Service_Books_Volumeannotations");
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Books/Resource/Myconfig.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Books/Resource/Myconfig.php
deleted file mode 100644
index afe93d7f..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Books/Resource/Myconfig.php
+++ /dev/null
@@ -1,126 +0,0 @@
-
- *   $booksService = new Google_Service_Books(...);
- *   $myconfig = $booksService->myconfig;
- *  
- */
-class Google_Service_Books_Resource_Myconfig extends Google_Service_Resource
-{
-  /**
-   * Gets the current settings for the user. (myconfig.getUserSettings)
-   *
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Books_Usersettings
-   */
-  public function getUserSettings($optParams = array())
-  {
-    $params = array();
-    $params = array_merge($params, $optParams);
-    return $this->call('getUserSettings', array($params), "Google_Service_Books_Usersettings");
-  }
-  /**
-   * Release downloaded content access restriction.
-   * (myconfig.releaseDownloadAccess)
-   *
-   * @param string|array $volumeIds The volume(s) to release restrictions for.
-   * @param string $cpksver The device/version ID from which to release the
-   * restriction.
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param string locale ISO-639-1, ISO-3166-1 codes for message
-   * localization, i.e. en_US.
-   * @opt_param string source String to identify the originator of this request.
-   * @return Google_Service_Books_DownloadAccesses
-   */
-  public function releaseDownloadAccess($volumeIds, $cpksver, $optParams = array())
-  {
-    $params = array('volumeIds' => $volumeIds, 'cpksver' => $cpksver);
-    $params = array_merge($params, $optParams);
-    return $this->call('releaseDownloadAccess', array($params), "Google_Service_Books_DownloadAccesses");
-  }
-  /**
-   * Request concurrent and download access restrictions. (myconfig.requestAccess)
-   *
-   * @param string $source String to identify the originator of this request.
-   * @param string $volumeId The volume to request concurrent/download
-   * restrictions for.
-   * @param string $nonce The client nonce value.
-   * @param string $cpksver The device/version ID from which to request the
-   * restrictions.
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param string licenseTypes The type of access license to request. If not
-   * specified, the default is BOTH.
-   * @opt_param string locale ISO-639-1, ISO-3166-1 codes for message
-   * localization, i.e. en_US.
-   * @return Google_Service_Books_RequestAccess
-   */
-  public function requestAccess($source, $volumeId, $nonce, $cpksver, $optParams = array())
-  {
-    $params = array('source' => $source, 'volumeId' => $volumeId, 'nonce' => $nonce, 'cpksver' => $cpksver);
-    $params = array_merge($params, $optParams);
-    return $this->call('requestAccess', array($params), "Google_Service_Books_RequestAccess");
-  }
-  /**
-   * Request downloaded content access for specified volumes on the My eBooks
-   * shelf. (myconfig.syncVolumeLicenses)
-   *
-   * @param string $source String to identify the originator of this request.
-   * @param string $nonce The client nonce value.
-   * @param string $cpksver The device/version ID from which to release the
-   * restriction.
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param string features List of features supported by the client, i.e.,
-   * 'RENTALS'
-   * @opt_param bool includeNonComicsSeries Set to true to include non-comics
-   * series. Defaults to false.
-   * @opt_param string locale ISO-639-1, ISO-3166-1 codes for message
-   * localization, i.e. en_US.
-   * @opt_param bool showPreorders Set to true to show pre-ordered books. Defaults
-   * to false.
-   * @opt_param string volumeIds The volume(s) to request download restrictions
-   * for.
-   * @return Google_Service_Books_Volumes
-   */
-  public function syncVolumeLicenses($source, $nonce, $cpksver, $optParams = array())
-  {
-    $params = array('source' => $source, 'nonce' => $nonce, 'cpksver' => $cpksver);
-    $params = array_merge($params, $optParams);
-    return $this->call('syncVolumeLicenses', array($params), "Google_Service_Books_Volumes");
-  }
-  /**
-   * Sets the settings for the user. If a sub-object is specified, it will
-   * overwrite the existing sub-object stored in the server. Unspecified sub-
-   * objects will retain the existing value. (myconfig.updateUserSettings)
-   *
-   * @param Google_Service_Books_Usersettings $postBody
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Books_Usersettings
-   */
-  public function updateUserSettings(Google_Service_Books_Usersettings $postBody, $optParams = array())
-  {
-    $params = array('postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('updateUserSettings', array($params), "Google_Service_Books_Usersettings");
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Books/Resource/Mylibrary.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Books/Resource/Mylibrary.php
deleted file mode 100644
index 5c98fce7..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Books/Resource/Mylibrary.php
+++ /dev/null
@@ -1,28 +0,0 @@
-
- *   $booksService = new Google_Service_Books(...);
- *   $mylibrary = $booksService->mylibrary;
- *  
- */
-class Google_Service_Books_Resource_Mylibrary extends Google_Service_Resource
-{
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Books/Resource/MylibraryAnnotations.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Books/Resource/MylibraryAnnotations.php
deleted file mode 100644
index 67cdde37..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Books/Resource/MylibraryAnnotations.php
+++ /dev/null
@@ -1,119 +0,0 @@
-
- *   $booksService = new Google_Service_Books(...);
- *   $annotations = $booksService->annotations;
- *  
- */
-class Google_Service_Books_Resource_MylibraryAnnotations extends Google_Service_Resource
-{
-  /**
-   * Deletes an annotation. (annotations.delete)
-   *
-   * @param string $annotationId The ID for the annotation to delete.
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param string source String to identify the originator of this request.
-   */
-  public function delete($annotationId, $optParams = array())
-  {
-    $params = array('annotationId' => $annotationId);
-    $params = array_merge($params, $optParams);
-    return $this->call('delete', array($params));
-  }
-  /**
-   * Inserts a new annotation. (annotations.insert)
-   *
-   * @param Google_Service_Books_Annotation $postBody
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param string country ISO-3166-1 code to override the IP-based location.
-   * @opt_param bool showOnlySummaryInResponse Requests that only the summary of
-   * the specified layer be provided in the response.
-   * @opt_param string source String to identify the originator of this request.
-   * @return Google_Service_Books_Annotation
-   */
-  public function insert(Google_Service_Books_Annotation $postBody, $optParams = array())
-  {
-    $params = array('postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('insert', array($params), "Google_Service_Books_Annotation");
-  }
-  /**
-   * Retrieves a list of annotations, possibly filtered.
-   * (annotations.listMylibraryAnnotations)
-   *
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param string contentVersion The content version for the requested
-   * volume.
-   * @opt_param string layerId The layer ID to limit annotation by.
-   * @opt_param string layerIds The layer ID(s) to limit annotation by.
-   * @opt_param string maxResults Maximum number of results to return
-   * @opt_param string pageToken The value of the nextToken from the previous
-   * page.
-   * @opt_param bool showDeleted Set to true to return deleted annotations.
-   * updatedMin must be in the request to use this. Defaults to false.
-   * @opt_param string source String to identify the originator of this request.
-   * @opt_param string updatedMax RFC 3339 timestamp to restrict to items updated
-   * prior to this timestamp (exclusive).
-   * @opt_param string updatedMin RFC 3339 timestamp to restrict to items updated
-   * since this timestamp (inclusive).
-   * @opt_param string volumeId The volume to restrict annotations to.
-   * @return Google_Service_Books_Annotations
-   */
-  public function listMylibraryAnnotations($optParams = array())
-  {
-    $params = array();
-    $params = array_merge($params, $optParams);
-    return $this->call('list', array($params), "Google_Service_Books_Annotations");
-  }
-  /**
-   * Gets the summary of specified layers. (annotations.summary)
-   *
-   * @param string|array $layerIds Array of layer IDs to get the summary for.
-   * @param string $volumeId Volume id to get the summary for.
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Books_AnnotationsSummary
-   */
-  public function summary($layerIds, $volumeId, $optParams = array())
-  {
-    $params = array('layerIds' => $layerIds, 'volumeId' => $volumeId);
-    $params = array_merge($params, $optParams);
-    return $this->call('summary', array($params), "Google_Service_Books_AnnotationsSummary");
-  }
-  /**
-   * Updates an existing annotation. (annotations.update)
-   *
-   * @param string $annotationId The ID for the annotation to update.
-   * @param Google_Service_Books_Annotation $postBody
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param string source String to identify the originator of this request.
-   * @return Google_Service_Books_Annotation
-   */
-  public function update($annotationId, Google_Service_Books_Annotation $postBody, $optParams = array())
-  {
-    $params = array('annotationId' => $annotationId, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('update', array($params), "Google_Service_Books_Annotation");
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Books/Resource/MylibraryBookshelves.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Books/Resource/MylibraryBookshelves.php
deleted file mode 100644
index a88c986c..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Books/Resource/MylibraryBookshelves.php
+++ /dev/null
@@ -1,125 +0,0 @@
-
- *   $booksService = new Google_Service_Books(...);
- *   $bookshelves = $booksService->bookshelves;
- *  
- */
-class Google_Service_Books_Resource_MylibraryBookshelves extends Google_Service_Resource
-{
-  /**
-   * Adds a volume to a bookshelf. (bookshelves.addVolume)
-   *
-   * @param string $shelf ID of bookshelf to which to add a volume.
-   * @param string $volumeId ID of volume to add.
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param string reason The reason for which the book is added to the
-   * library.
-   * @opt_param string source String to identify the originator of this request.
-   */
-  public function addVolume($shelf, $volumeId, $optParams = array())
-  {
-    $params = array('shelf' => $shelf, 'volumeId' => $volumeId);
-    $params = array_merge($params, $optParams);
-    return $this->call('addVolume', array($params));
-  }
-  /**
-   * Clears all volumes from a bookshelf. (bookshelves.clearVolumes)
-   *
-   * @param string $shelf ID of bookshelf from which to remove a volume.
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param string source String to identify the originator of this request.
-   */
-  public function clearVolumes($shelf, $optParams = array())
-  {
-    $params = array('shelf' => $shelf);
-    $params = array_merge($params, $optParams);
-    return $this->call('clearVolumes', array($params));
-  }
-  /**
-   * Retrieves metadata for a specific bookshelf belonging to the authenticated
-   * user. (bookshelves.get)
-   *
-   * @param string $shelf ID of bookshelf to retrieve.
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param string source String to identify the originator of this request.
-   * @return Google_Service_Books_Bookshelf
-   */
-  public function get($shelf, $optParams = array())
-  {
-    $params = array('shelf' => $shelf);
-    $params = array_merge($params, $optParams);
-    return $this->call('get', array($params), "Google_Service_Books_Bookshelf");
-  }
-  /**
-   * Retrieves a list of bookshelves belonging to the authenticated user.
-   * (bookshelves.listMylibraryBookshelves)
-   *
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param string source String to identify the originator of this request.
-   * @return Google_Service_Books_Bookshelves
-   */
-  public function listMylibraryBookshelves($optParams = array())
-  {
-    $params = array();
-    $params = array_merge($params, $optParams);
-    return $this->call('list', array($params), "Google_Service_Books_Bookshelves");
-  }
-  /**
-   * Moves a volume within a bookshelf. (bookshelves.moveVolume)
-   *
-   * @param string $shelf ID of bookshelf with the volume.
-   * @param string $volumeId ID of volume to move.
-   * @param int $volumePosition Position on shelf to move the item (0 puts the
-   * item before the current first item, 1 puts it between the first and the
-   * second and so on.)
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param string source String to identify the originator of this request.
-   */
-  public function moveVolume($shelf, $volumeId, $volumePosition, $optParams = array())
-  {
-    $params = array('shelf' => $shelf, 'volumeId' => $volumeId, 'volumePosition' => $volumePosition);
-    $params = array_merge($params, $optParams);
-    return $this->call('moveVolume', array($params));
-  }
-  /**
-   * Removes a volume from a bookshelf. (bookshelves.removeVolume)
-   *
-   * @param string $shelf ID of bookshelf from which to remove a volume.
-   * @param string $volumeId ID of volume to remove.
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param string reason The reason for which the book is removed from the
-   * library.
-   * @opt_param string source String to identify the originator of this request.
-   */
-  public function removeVolume($shelf, $volumeId, $optParams = array())
-  {
-    $params = array('shelf' => $shelf, 'volumeId' => $volumeId);
-    $params = array_merge($params, $optParams);
-    return $this->call('removeVolume', array($params));
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Books/Resource/MylibraryBookshelvesVolumes.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Books/Resource/MylibraryBookshelvesVolumes.php
deleted file mode 100644
index c1536ffc..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Books/Resource/MylibraryBookshelvesVolumes.php
+++ /dev/null
@@ -1,53 +0,0 @@
-
- *   $booksService = new Google_Service_Books(...);
- *   $volumes = $booksService->volumes;
- *  
- */
-class Google_Service_Books_Resource_MylibraryBookshelvesVolumes extends Google_Service_Resource
-{
-  /**
-   * Gets volume information for volumes on a bookshelf.
-   * (volumes.listMylibraryBookshelvesVolumes)
-   *
-   * @param string $shelf The bookshelf ID or name retrieve volumes for.
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param string country ISO-3166-1 code to override the IP-based location.
-   * @opt_param string maxResults Maximum number of results to return
-   * @opt_param string projection Restrict information returned to a set of
-   * selected fields.
-   * @opt_param string q Full-text search query string in this bookshelf.
-   * @opt_param bool showPreorders Set to true to show pre-ordered books. Defaults
-   * to false.
-   * @opt_param string source String to identify the originator of this request.
-   * @opt_param string startIndex Index of the first element to return (starts at
-   * 0)
-   * @return Google_Service_Books_Volumes
-   */
-  public function listMylibraryBookshelvesVolumes($shelf, $optParams = array())
-  {
-    $params = array('shelf' => $shelf);
-    $params = array_merge($params, $optParams);
-    return $this->call('list', array($params), "Google_Service_Books_Volumes");
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Books/Resource/MylibraryReadingpositions.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Books/Resource/MylibraryReadingpositions.php
deleted file mode 100644
index 375c2ae1..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Books/Resource/MylibraryReadingpositions.php
+++ /dev/null
@@ -1,71 +0,0 @@
-
- *   $booksService = new Google_Service_Books(...);
- *   $readingpositions = $booksService->readingpositions;
- *  
- */
-class Google_Service_Books_Resource_MylibraryReadingpositions extends Google_Service_Resource
-{
-  /**
-   * Retrieves my reading position information for a volume.
-   * (readingpositions.get)
-   *
-   * @param string $volumeId ID of volume for which to retrieve a reading
-   * position.
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param string contentVersion Volume content version for which this
-   * reading position is requested.
-   * @opt_param string source String to identify the originator of this request.
-   * @return Google_Service_Books_ReadingPosition
-   */
-  public function get($volumeId, $optParams = array())
-  {
-    $params = array('volumeId' => $volumeId);
-    $params = array_merge($params, $optParams);
-    return $this->call('get', array($params), "Google_Service_Books_ReadingPosition");
-  }
-  /**
-   * Sets my reading position information for a volume.
-   * (readingpositions.setPosition)
-   *
-   * @param string $volumeId ID of volume for which to update the reading
-   * position.
-   * @param string $timestamp RFC 3339 UTC format timestamp associated with this
-   * reading position.
-   * @param string $position Position string for the new volume reading position.
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param string action Action that caused this reading position to be set.
-   * @opt_param string contentVersion Volume content version for which this
-   * reading position applies.
-   * @opt_param string deviceCookie Random persistent device cookie optional on
-   * set position.
-   * @opt_param string source String to identify the originator of this request.
-   */
-  public function setPosition($volumeId, $timestamp, $position, $optParams = array())
-  {
-    $params = array('volumeId' => $volumeId, 'timestamp' => $timestamp, 'position' => $position);
-    $params = array_merge($params, $optParams);
-    return $this->call('setPosition', array($params));
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Books/Resource/Notification.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Books/Resource/Notification.php
deleted file mode 100644
index f3bae929..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Books/Resource/Notification.php
+++ /dev/null
@@ -1,45 +0,0 @@
-
- *   $booksService = new Google_Service_Books(...);
- *   $notification = $booksService->notification;
- *  
- */
-class Google_Service_Books_Resource_Notification extends Google_Service_Resource
-{
-  /**
-   * Returns notification details for a given notification id. (notification.get)
-   *
-   * @param string $notificationId String to identify the notification.
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param string locale ISO-639-1 language and ISO-3166-1 country code. Ex:
-   * 'en_US'. Used for generating notification title and body.
-   * @opt_param string source String to identify the originator of this request.
-   * @return Google_Service_Books_Notification
-   */
-  public function get($notificationId, $optParams = array())
-  {
-    $params = array('notification_id' => $notificationId);
-    $params = array_merge($params, $optParams);
-    return $this->call('get', array($params), "Google_Service_Books_Notification");
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Books/Resource/Onboarding.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Books/Resource/Onboarding.php
deleted file mode 100644
index 6ad8f753..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Books/Resource/Onboarding.php
+++ /dev/null
@@ -1,67 +0,0 @@
-
- *   $booksService = new Google_Service_Books(...);
- *   $onboarding = $booksService->onboarding;
- *  
- */
-class Google_Service_Books_Resource_Onboarding extends Google_Service_Resource
-{
-  /**
-   * List categories for onboarding experience. (onboarding.listCategories)
-   *
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param string locale ISO-639-1 language and ISO-3166-1 country code.
-   * Default is en-US if unset.
-   * @return Google_Service_Books_Category
-   */
-  public function listCategories($optParams = array())
-  {
-    $params = array();
-    $params = array_merge($params, $optParams);
-    return $this->call('listCategories', array($params), "Google_Service_Books_Category");
-  }
-  /**
-   * List available volumes under categories for onboarding experience.
-   * (onboarding.listCategoryVolumes)
-   *
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param string categoryId List of category ids requested.
-   * @opt_param string locale ISO-639-1 language and ISO-3166-1 country code.
-   * Default is en-US if unset.
-   * @opt_param string maxAllowedMaturityRating The maximum allowed maturity
-   * rating of returned volumes. Books with a higher maturity rating are filtered
-   * out.
-   * @opt_param string pageSize Number of maximum results per page to be included
-   * in the response.
-   * @opt_param string pageToken The value of the nextToken from the previous
-   * page.
-   * @return Google_Service_Books_Volume2
-   */
-  public function listCategoryVolumes($optParams = array())
-  {
-    $params = array();
-    $params = array_merge($params, $optParams);
-    return $this->call('listCategoryVolumes', array($params), "Google_Service_Books_Volume2");
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Books/Resource/Personalizedstream.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Books/Resource/Personalizedstream.php
deleted file mode 100644
index 363f5edf..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Books/Resource/Personalizedstream.php
+++ /dev/null
@@ -1,47 +0,0 @@
-
- *   $booksService = new Google_Service_Books(...);
- *   $personalizedstream = $booksService->personalizedstream;
- *  
- */
-class Google_Service_Books_Resource_Personalizedstream extends Google_Service_Resource
-{
-  /**
-   * Returns a stream of personalized book clusters (personalizedstream.get)
-   *
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param string locale ISO-639-1 language and ISO-3166-1 country code. Ex:
-   * 'en_US'. Used for generating recommendations.
-   * @opt_param string maxAllowedMaturityRating The maximum allowed maturity
-   * rating of returned recommendations. Books with a higher maturity rating are
-   * filtered out.
-   * @opt_param string source String to identify the originator of this request.
-   * @return Google_Service_Books_Discoveryclusters
-   */
-  public function get($optParams = array())
-  {
-    $params = array();
-    $params = array_merge($params, $optParams);
-    return $this->call('get', array($params), "Google_Service_Books_Discoveryclusters");
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Books/Resource/Promooffer.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Books/Resource/Promooffer.php
deleted file mode 100644
index 624952f0..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Books/Resource/Promooffer.php
+++ /dev/null
@@ -1,86 +0,0 @@
-
- *   $booksService = new Google_Service_Books(...);
- *   $promooffer = $booksService->promooffer;
- *  
- */
-class Google_Service_Books_Resource_Promooffer extends Google_Service_Resource
-{
-  /**
-   * (promooffer.accept)
-   *
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param string androidId device android_id
-   * @opt_param string device device device
-   * @opt_param string manufacturer device manufacturer
-   * @opt_param string model device model
-   * @opt_param string offerId
-   * @opt_param string product device product
-   * @opt_param string serial device serial
-   * @opt_param string volumeId Volume id to exercise the offer
-   */
-  public function accept($optParams = array())
-  {
-    $params = array();
-    $params = array_merge($params, $optParams);
-    return $this->call('accept', array($params));
-  }
-  /**
-   * (promooffer.dismiss)
-   *
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param string androidId device android_id
-   * @opt_param string device device device
-   * @opt_param string manufacturer device manufacturer
-   * @opt_param string model device model
-   * @opt_param string offerId Offer to dimiss
-   * @opt_param string product device product
-   * @opt_param string serial device serial
-   */
-  public function dismiss($optParams = array())
-  {
-    $params = array();
-    $params = array_merge($params, $optParams);
-    return $this->call('dismiss', array($params));
-  }
-  /**
-   * Returns a list of promo offers available to the user (promooffer.get)
-   *
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param string androidId device android_id
-   * @opt_param string device device device
-   * @opt_param string manufacturer device manufacturer
-   * @opt_param string model device model
-   * @opt_param string product device product
-   * @opt_param string serial device serial
-   * @return Google_Service_Books_Offers
-   */
-  public function get($optParams = array())
-  {
-    $params = array();
-    $params = array_merge($params, $optParams);
-    return $this->call('get', array($params), "Google_Service_Books_Offers");
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Books/Resource/Series.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Books/Resource/Series.php
deleted file mode 100644
index a3f8bdee..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Books/Resource/Series.php
+++ /dev/null
@@ -1,41 +0,0 @@
-
- *   $booksService = new Google_Service_Books(...);
- *   $series = $booksService->series;
- *  
- */
-class Google_Service_Books_Resource_Series extends Google_Service_Resource
-{
-  /**
-   * Returns Series metadata for the given series ids. (series.get)
-   *
-   * @param string|array $seriesId String that identifies the series
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Books_Series
-   */
-  public function get($seriesId, $optParams = array())
-  {
-    $params = array('series_id' => $seriesId);
-    $params = array_merge($params, $optParams);
-    return $this->call('get', array($params), "Google_Service_Books_Series");
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Books/Resource/SeriesMembership.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Books/Resource/SeriesMembership.php
deleted file mode 100644
index 28a2e410..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Books/Resource/SeriesMembership.php
+++ /dev/null
@@ -1,46 +0,0 @@
-
- *   $booksService = new Google_Service_Books(...);
- *   $membership = $booksService->membership;
- *  
- */
-class Google_Service_Books_Resource_SeriesMembership extends Google_Service_Resource
-{
-  /**
-   * Returns Series membership data given the series id. (membership.get)
-   *
-   * @param string $seriesId String that identifies the series
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param string page_size Number of maximum results per page to be included
-   * in the response.
-   * @opt_param string page_token The value of the nextToken from the previous
-   * page.
-   * @return Google_Service_Books_Seriesmembership
-   */
-  public function get($seriesId, $optParams = array())
-  {
-    $params = array('series_id' => $seriesId);
-    $params = array_merge($params, $optParams);
-    return $this->call('get', array($params), "Google_Service_Books_Seriesmembership");
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Books/Resource/Volumes.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Books/Resource/Volumes.php
deleted file mode 100644
index 1065108c..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Books/Resource/Volumes.php
+++ /dev/null
@@ -1,83 +0,0 @@
-
- *   $booksService = new Google_Service_Books(...);
- *   $volumes = $booksService->volumes;
- *  
- */
-class Google_Service_Books_Resource_Volumes extends Google_Service_Resource
-{
-  /**
-   * Gets volume information for a single volume. (volumes.get)
-   *
-   * @param string $volumeId ID of volume to retrieve.
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param string country ISO-3166-1 code to override the IP-based location.
-   * @opt_param bool includeNonComicsSeries Set to true to include non-comics
-   * series. Defaults to false.
-   * @opt_param string partner Brand results for partner ID.
-   * @opt_param string projection Restrict information returned to a set of
-   * selected fields.
-   * @opt_param string source String to identify the originator of this request.
-   * @opt_param bool user_library_consistent_read
-   * @return Google_Service_Books_Volume
-   */
-  public function get($volumeId, $optParams = array())
-  {
-    $params = array('volumeId' => $volumeId);
-    $params = array_merge($params, $optParams);
-    return $this->call('get', array($params), "Google_Service_Books_Volume");
-  }
-  /**
-   * Performs a book search. (volumes.listVolumes)
-   *
-   * @param string $q Full-text search query string.
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param string download Restrict to volumes by download availability.
-   * @opt_param string filter Filter search results.
-   * @opt_param string langRestrict Restrict results to books with this language
-   * code.
-   * @opt_param string libraryRestrict Restrict search to this user's library.
-   * @opt_param string maxAllowedMaturityRating The maximum allowed maturity
-   * rating of returned recommendations. Books with a higher maturity rating are
-   * filtered out.
-   * @opt_param string maxResults Maximum number of results to return.
-   * @opt_param string orderBy Sort search results.
-   * @opt_param string partner Restrict and brand results for partner ID.
-   * @opt_param string printType Restrict to books or magazines.
-   * @opt_param string projection Restrict information returned to a set of
-   * selected fields.
-   * @opt_param bool showPreorders Set to true to show books available for
-   * preorder. Defaults to false.
-   * @opt_param string source String to identify the originator of this request.
-   * @opt_param string startIndex Index of the first result to return (starts at
-   * 0)
-   * @return Google_Service_Books_Volumes
-   */
-  public function listVolumes($q, $optParams = array())
-  {
-    $params = array('q' => $q);
-    $params = array_merge($params, $optParams);
-    return $this->call('list', array($params), "Google_Service_Books_Volumes");
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Books/Resource/VolumesAssociated.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Books/Resource/VolumesAssociated.php
deleted file mode 100644
index 85716456..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Books/Resource/VolumesAssociated.php
+++ /dev/null
@@ -1,49 +0,0 @@
-
- *   $booksService = new Google_Service_Books(...);
- *   $associated = $booksService->associated;
- *  
- */
-class Google_Service_Books_Resource_VolumesAssociated extends Google_Service_Resource
-{
-  /**
-   * Return a list of associated books. (associated.listVolumesAssociated)
-   *
-   * @param string $volumeId ID of the source volume.
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param string association Association type.
-   * @opt_param string locale ISO-639-1 language and ISO-3166-1 country code. Ex:
-   * 'en_US'. Used for generating recommendations.
-   * @opt_param string maxAllowedMaturityRating The maximum allowed maturity
-   * rating of returned recommendations. Books with a higher maturity rating are
-   * filtered out.
-   * @opt_param string source String to identify the originator of this request.
-   * @return Google_Service_Books_Volumes
-   */
-  public function listVolumesAssociated($volumeId, $optParams = array())
-  {
-    $params = array('volumeId' => $volumeId);
-    $params = array_merge($params, $optParams);
-    return $this->call('list', array($params), "Google_Service_Books_Volumes");
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Books/Resource/VolumesMybooks.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Books/Resource/VolumesMybooks.php
deleted file mode 100644
index b9897853..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Books/Resource/VolumesMybooks.php
+++ /dev/null
@@ -1,52 +0,0 @@
-
- *   $booksService = new Google_Service_Books(...);
- *   $mybooks = $booksService->mybooks;
- *  
- */
-class Google_Service_Books_Resource_VolumesMybooks extends Google_Service_Resource
-{
-  /**
-   * Return a list of books in My Library. (mybooks.listVolumesMybooks)
-   *
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param string acquireMethod How the book was acquired
-   * @opt_param string country ISO-3166-1 code to override the IP-based location.
-   * @opt_param string locale ISO-639-1 language and ISO-3166-1 country code.
-   * Ex:'en_US'. Used for generating recommendations.
-   * @opt_param string maxResults Maximum number of results to return.
-   * @opt_param string processingState The processing state of the user uploaded
-   * volumes to be returned. Applicable only if the UPLOADED is specified in the
-   * acquireMethod.
-   * @opt_param string source String to identify the originator of this request.
-   * @opt_param string startIndex Index of the first result to return (starts at
-   * 0)
-   * @return Google_Service_Books_Volumes
-   */
-  public function listVolumesMybooks($optParams = array())
-  {
-    $params = array();
-    $params = array_merge($params, $optParams);
-    return $this->call('list', array($params), "Google_Service_Books_Volumes");
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Books/Resource/VolumesRecommended.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Books/Resource/VolumesRecommended.php
deleted file mode 100644
index e8cb7241..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Books/Resource/VolumesRecommended.php
+++ /dev/null
@@ -1,66 +0,0 @@
-
- *   $booksService = new Google_Service_Books(...);
- *   $recommended = $booksService->recommended;
- *  
- */
-class Google_Service_Books_Resource_VolumesRecommended extends Google_Service_Resource
-{
-  /**
-   * Return a list of recommended books for the current user.
-   * (recommended.listVolumesRecommended)
-   *
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param string locale ISO-639-1 language and ISO-3166-1 country code. Ex:
-   * 'en_US'. Used for generating recommendations.
-   * @opt_param string maxAllowedMaturityRating The maximum allowed maturity
-   * rating of returned recommendations. Books with a higher maturity rating are
-   * filtered out.
-   * @opt_param string source String to identify the originator of this request.
-   * @return Google_Service_Books_Volumes
-   */
-  public function listVolumesRecommended($optParams = array())
-  {
-    $params = array();
-    $params = array_merge($params, $optParams);
-    return $this->call('list', array($params), "Google_Service_Books_Volumes");
-  }
-  /**
-   * Rate a recommended book for the current user. (recommended.rate)
-   *
-   * @param string $rating Rating to be given to the volume.
-   * @param string $volumeId ID of the source volume.
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param string locale ISO-639-1 language and ISO-3166-1 country code. Ex:
-   * 'en_US'. Used for generating recommendations.
-   * @opt_param string source String to identify the originator of this request.
-   * @return Google_Service_Books_BooksVolumesRecommendedRateResponse
-   */
-  public function rate($rating, $volumeId, $optParams = array())
-  {
-    $params = array('rating' => $rating, 'volumeId' => $volumeId);
-    $params = array_merge($params, $optParams);
-    return $this->call('rate', array($params), "Google_Service_Books_BooksVolumesRecommendedRateResponse");
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Books/Resource/VolumesUseruploaded.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Books/Resource/VolumesUseruploaded.php
deleted file mode 100644
index 12b69f46..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Books/Resource/VolumesUseruploaded.php
+++ /dev/null
@@ -1,52 +0,0 @@
-
- *   $booksService = new Google_Service_Books(...);
- *   $useruploaded = $booksService->useruploaded;
- *  
- */
-class Google_Service_Books_Resource_VolumesUseruploaded extends Google_Service_Resource
-{
-  /**
-   * Return a list of books uploaded by the current user.
-   * (useruploaded.listVolumesUseruploaded)
-   *
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param string locale ISO-639-1 language and ISO-3166-1 country code. Ex:
-   * 'en_US'. Used for generating recommendations.
-   * @opt_param string maxResults Maximum number of results to return.
-   * @opt_param string processingState The processing state of the user uploaded
-   * volumes to be returned.
-   * @opt_param string source String to identify the originator of this request.
-   * @opt_param string startIndex Index of the first result to return (starts at
-   * 0)
-   * @opt_param string volumeId The ids of the volumes to be returned. If not
-   * specified all that match the processingState are returned.
-   * @return Google_Service_Books_Volumes
-   */
-  public function listVolumesUseruploaded($optParams = array())
-  {
-    $params = array();
-    $params = array_merge($params, $optParams);
-    return $this->call('list', array($params), "Google_Service_Books_Volumes");
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Books/Review.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Books/Review.php
deleted file mode 100644
index c648e1cc..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Books/Review.php
+++ /dev/null
@@ -1,113 +0,0 @@
-author = $author;
-  }
-  public function getAuthor()
-  {
-    return $this->author;
-  }
-  public function setContent($content)
-  {
-    $this->content = $content;
-  }
-  public function getContent()
-  {
-    return $this->content;
-  }
-  public function setDate($date)
-  {
-    $this->date = $date;
-  }
-  public function getDate()
-  {
-    return $this->date;
-  }
-  public function setFullTextUrl($fullTextUrl)
-  {
-    $this->fullTextUrl = $fullTextUrl;
-  }
-  public function getFullTextUrl()
-  {
-    return $this->fullTextUrl;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setRating($rating)
-  {
-    $this->rating = $rating;
-  }
-  public function getRating()
-  {
-    return $this->rating;
-  }
-  public function setSource(Google_Service_Books_ReviewSource $source)
-  {
-    $this->source = $source;
-  }
-  public function getSource()
-  {
-    return $this->source;
-  }
-  public function setTitle($title)
-  {
-    $this->title = $title;
-  }
-  public function getTitle()
-  {
-    return $this->title;
-  }
-  public function setType($type)
-  {
-    $this->type = $type;
-  }
-  public function getType()
-  {
-    return $this->type;
-  }
-  public function setVolumeId($volumeId)
-  {
-    $this->volumeId = $volumeId;
-  }
-  public function getVolumeId()
-  {
-    return $this->volumeId;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Books/ReviewAuthor.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Books/ReviewAuthor.php
deleted file mode 100644
index 5de1b157..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Books/ReviewAuthor.php
+++ /dev/null
@@ -1,30 +0,0 @@
-displayName = $displayName;
-  }
-  public function getDisplayName()
-  {
-    return $this->displayName;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Books/ReviewSource.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Books/ReviewSource.php
deleted file mode 100644
index 7d4c0ce9..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Books/ReviewSource.php
+++ /dev/null
@@ -1,48 +0,0 @@
-description = $description;
-  }
-  public function getDescription()
-  {
-    return $this->description;
-  }
-  public function setExtraDescription($extraDescription)
-  {
-    $this->extraDescription = $extraDescription;
-  }
-  public function getExtraDescription()
-  {
-    return $this->extraDescription;
-  }
-  public function setUrl($url)
-  {
-    $this->url = $url;
-  }
-  public function getUrl()
-  {
-    return $this->url;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Books/Series.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Books/Series.php
deleted file mode 100644
index 8d546289..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Books/Series.php
+++ /dev/null
@@ -1,41 +0,0 @@
-kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setSeries($series)
-  {
-    $this->series = $series;
-  }
-  public function getSeries()
-  {
-    return $this->series;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Books/SeriesSeries.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Books/SeriesSeries.php
deleted file mode 100644
index 8fcf8fed..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Books/SeriesSeries.php
+++ /dev/null
@@ -1,66 +0,0 @@
-bannerImageUrl = $bannerImageUrl;
-  }
-  public function getBannerImageUrl()
-  {
-    return $this->bannerImageUrl;
-  }
-  public function setImageUrl($imageUrl)
-  {
-    $this->imageUrl = $imageUrl;
-  }
-  public function getImageUrl()
-  {
-    return $this->imageUrl;
-  }
-  public function setSeriesId($seriesId)
-  {
-    $this->seriesId = $seriesId;
-  }
-  public function getSeriesId()
-  {
-    return $this->seriesId;
-  }
-  public function setSeriesType($seriesType)
-  {
-    $this->seriesType = $seriesType;
-  }
-  public function getSeriesType()
-  {
-    return $this->seriesType;
-  }
-  public function setTitle($title)
-  {
-    $this->title = $title;
-  }
-  public function getTitle()
-  {
-    return $this->title;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Books/Seriesmembership.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Books/Seriesmembership.php
deleted file mode 100644
index be25c944..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Books/Seriesmembership.php
+++ /dev/null
@@ -1,50 +0,0 @@
-kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setMember($member)
-  {
-    $this->member = $member;
-  }
-  public function getMember()
-  {
-    return $this->member;
-  }
-  public function setNextPageToken($nextPageToken)
-  {
-    $this->nextPageToken = $nextPageToken;
-  }
-  public function getNextPageToken()
-  {
-    return $this->nextPageToken;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Books/Usersettings.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Books/Usersettings.php
deleted file mode 100644
index 919149e6..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Books/Usersettings.php
+++ /dev/null
@@ -1,50 +0,0 @@
-kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setNotesExport(Google_Service_Books_UsersettingsNotesExport $notesExport)
-  {
-    $this->notesExport = $notesExport;
-  }
-  public function getNotesExport()
-  {
-    return $this->notesExport;
-  }
-  public function setNotification(Google_Service_Books_UsersettingsNotification $notification)
-  {
-    $this->notification = $notification;
-  }
-  public function getNotification()
-  {
-    return $this->notification;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Books/UsersettingsNotesExport.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Books/UsersettingsNotesExport.php
deleted file mode 100644
index 9d6d2e8d..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Books/UsersettingsNotesExport.php
+++ /dev/null
@@ -1,39 +0,0 @@
-folderName = $folderName;
-  }
-  public function getFolderName()
-  {
-    return $this->folderName;
-  }
-  public function setIsEnabled($isEnabled)
-  {
-    $this->isEnabled = $isEnabled;
-  }
-  public function getIsEnabled()
-  {
-    return $this->isEnabled;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Books/UsersettingsNotification.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Books/UsersettingsNotification.php
deleted file mode 100644
index 680742f8..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Books/UsersettingsNotification.php
+++ /dev/null
@@ -1,41 +0,0 @@
-moreFromAuthors = $moreFromAuthors;
-  }
-  public function getMoreFromAuthors()
-  {
-    return $this->moreFromAuthors;
-  }
-  public function setMoreFromSeries(Google_Service_Books_UsersettingsNotificationMoreFromSeries $moreFromSeries)
-  {
-    $this->moreFromSeries = $moreFromSeries;
-  }
-  public function getMoreFromSeries()
-  {
-    return $this->moreFromSeries;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Books/UsersettingsNotificationMoreFromAuthors.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Books/UsersettingsNotificationMoreFromAuthors.php
deleted file mode 100644
index fa684173..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Books/UsersettingsNotificationMoreFromAuthors.php
+++ /dev/null
@@ -1,33 +0,0 @@
- "opted_state",
-  );
-  public $optedState;
-
-  public function setOptedState($optedState)
-  {
-    $this->optedState = $optedState;
-  }
-  public function getOptedState()
-  {
-    return $this->optedState;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Books/UsersettingsNotificationMoreFromSeries.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Books/UsersettingsNotificationMoreFromSeries.php
deleted file mode 100644
index d0b94d08..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Books/UsersettingsNotificationMoreFromSeries.php
+++ /dev/null
@@ -1,33 +0,0 @@
- "opted_state",
-  );
-  public $optedState;
-
-  public function setOptedState($optedState)
-  {
-    $this->optedState = $optedState;
-  }
-  public function getOptedState()
-  {
-    return $this->optedState;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Books/Volume.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Books/Volume.php
deleted file mode 100644
index 7017042d..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Books/Volume.php
+++ /dev/null
@@ -1,127 +0,0 @@
-accessInfo = $accessInfo;
-  }
-  public function getAccessInfo()
-  {
-    return $this->accessInfo;
-  }
-  public function setEtag($etag)
-  {
-    $this->etag = $etag;
-  }
-  public function getEtag()
-  {
-    return $this->etag;
-  }
-  public function setId($id)
-  {
-    $this->id = $id;
-  }
-  public function getId()
-  {
-    return $this->id;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setLayerInfo(Google_Service_Books_VolumeLayerInfo $layerInfo)
-  {
-    $this->layerInfo = $layerInfo;
-  }
-  public function getLayerInfo()
-  {
-    return $this->layerInfo;
-  }
-  public function setRecommendedInfo(Google_Service_Books_VolumeRecommendedInfo $recommendedInfo)
-  {
-    $this->recommendedInfo = $recommendedInfo;
-  }
-  public function getRecommendedInfo()
-  {
-    return $this->recommendedInfo;
-  }
-  public function setSaleInfo(Google_Service_Books_VolumeSaleInfo $saleInfo)
-  {
-    $this->saleInfo = $saleInfo;
-  }
-  public function getSaleInfo()
-  {
-    return $this->saleInfo;
-  }
-  public function setSearchInfo(Google_Service_Books_VolumeSearchInfo $searchInfo)
-  {
-    $this->searchInfo = $searchInfo;
-  }
-  public function getSearchInfo()
-  {
-    return $this->searchInfo;
-  }
-  public function setSelfLink($selfLink)
-  {
-    $this->selfLink = $selfLink;
-  }
-  public function getSelfLink()
-  {
-    return $this->selfLink;
-  }
-  public function setUserInfo(Google_Service_Books_VolumeUserInfo $userInfo)
-  {
-    $this->userInfo = $userInfo;
-  }
-  public function getUserInfo()
-  {
-    return $this->userInfo;
-  }
-  public function setVolumeInfo(Google_Service_Books_VolumeVolumeInfo $volumeInfo)
-  {
-    $this->volumeInfo = $volumeInfo;
-  }
-  public function getVolumeInfo()
-  {
-    return $this->volumeInfo;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Books/Volume2.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Books/Volume2.php
deleted file mode 100644
index f8608302..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Books/Volume2.php
+++ /dev/null
@@ -1,50 +0,0 @@
-items = $items;
-  }
-  public function getItems()
-  {
-    return $this->items;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setNextPageToken($nextPageToken)
-  {
-    $this->nextPageToken = $nextPageToken;
-  }
-  public function getNextPageToken()
-  {
-    return $this->nextPageToken;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Books/VolumeAccessInfo.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Books/VolumeAccessInfo.php
deleted file mode 100644
index 65fa6a80..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Books/VolumeAccessInfo.php
+++ /dev/null
@@ -1,150 +0,0 @@
-accessViewStatus = $accessViewStatus;
-  }
-  public function getAccessViewStatus()
-  {
-    return $this->accessViewStatus;
-  }
-  public function setCountry($country)
-  {
-    $this->country = $country;
-  }
-  public function getCountry()
-  {
-    return $this->country;
-  }
-  public function setDownloadAccess(Google_Service_Books_DownloadAccessRestriction $downloadAccess)
-  {
-    $this->downloadAccess = $downloadAccess;
-  }
-  public function getDownloadAccess()
-  {
-    return $this->downloadAccess;
-  }
-  public function setDriveImportedContentLink($driveImportedContentLink)
-  {
-    $this->driveImportedContentLink = $driveImportedContentLink;
-  }
-  public function getDriveImportedContentLink()
-  {
-    return $this->driveImportedContentLink;
-  }
-  public function setEmbeddable($embeddable)
-  {
-    $this->embeddable = $embeddable;
-  }
-  public function getEmbeddable()
-  {
-    return $this->embeddable;
-  }
-  public function setEpub(Google_Service_Books_VolumeAccessInfoEpub $epub)
-  {
-    $this->epub = $epub;
-  }
-  public function getEpub()
-  {
-    return $this->epub;
-  }
-  public function setExplicitOfflineLicenseManagement($explicitOfflineLicenseManagement)
-  {
-    $this->explicitOfflineLicenseManagement = $explicitOfflineLicenseManagement;
-  }
-  public function getExplicitOfflineLicenseManagement()
-  {
-    return $this->explicitOfflineLicenseManagement;
-  }
-  public function setPdf(Google_Service_Books_VolumeAccessInfoPdf $pdf)
-  {
-    $this->pdf = $pdf;
-  }
-  public function getPdf()
-  {
-    return $this->pdf;
-  }
-  public function setPublicDomain($publicDomain)
-  {
-    $this->publicDomain = $publicDomain;
-  }
-  public function getPublicDomain()
-  {
-    return $this->publicDomain;
-  }
-  public function setQuoteSharingAllowed($quoteSharingAllowed)
-  {
-    $this->quoteSharingAllowed = $quoteSharingAllowed;
-  }
-  public function getQuoteSharingAllowed()
-  {
-    return $this->quoteSharingAllowed;
-  }
-  public function setTextToSpeechPermission($textToSpeechPermission)
-  {
-    $this->textToSpeechPermission = $textToSpeechPermission;
-  }
-  public function getTextToSpeechPermission()
-  {
-    return $this->textToSpeechPermission;
-  }
-  public function setViewOrderUrl($viewOrderUrl)
-  {
-    $this->viewOrderUrl = $viewOrderUrl;
-  }
-  public function getViewOrderUrl()
-  {
-    return $this->viewOrderUrl;
-  }
-  public function setViewability($viewability)
-  {
-    $this->viewability = $viewability;
-  }
-  public function getViewability()
-  {
-    return $this->viewability;
-  }
-  public function setWebReaderLink($webReaderLink)
-  {
-    $this->webReaderLink = $webReaderLink;
-  }
-  public function getWebReaderLink()
-  {
-    return $this->webReaderLink;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Books/VolumeAccessInfoEpub.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Books/VolumeAccessInfoEpub.php
deleted file mode 100644
index a41c2150..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Books/VolumeAccessInfoEpub.php
+++ /dev/null
@@ -1,48 +0,0 @@
-acsTokenLink = $acsTokenLink;
-  }
-  public function getAcsTokenLink()
-  {
-    return $this->acsTokenLink;
-  }
-  public function setDownloadLink($downloadLink)
-  {
-    $this->downloadLink = $downloadLink;
-  }
-  public function getDownloadLink()
-  {
-    return $this->downloadLink;
-  }
-  public function setIsAvailable($isAvailable)
-  {
-    $this->isAvailable = $isAvailable;
-  }
-  public function getIsAvailable()
-  {
-    return $this->isAvailable;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Books/VolumeAccessInfoPdf.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Books/VolumeAccessInfoPdf.php
deleted file mode 100644
index 8a0f6c4f..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Books/VolumeAccessInfoPdf.php
+++ /dev/null
@@ -1,48 +0,0 @@
-acsTokenLink = $acsTokenLink;
-  }
-  public function getAcsTokenLink()
-  {
-    return $this->acsTokenLink;
-  }
-  public function setDownloadLink($downloadLink)
-  {
-    $this->downloadLink = $downloadLink;
-  }
-  public function getDownloadLink()
-  {
-    return $this->downloadLink;
-  }
-  public function setIsAvailable($isAvailable)
-  {
-    $this->isAvailable = $isAvailable;
-  }
-  public function getIsAvailable()
-  {
-    return $this->isAvailable;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Books/VolumeLayerInfo.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Books/VolumeLayerInfo.php
deleted file mode 100644
index 9802d0ca..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Books/VolumeLayerInfo.php
+++ /dev/null
@@ -1,32 +0,0 @@
-layers = $layers;
-  }
-  public function getLayers()
-  {
-    return $this->layers;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Books/VolumeLayerInfoLayers.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Books/VolumeLayerInfoLayers.php
deleted file mode 100644
index e65080cb..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Books/VolumeLayerInfoLayers.php
+++ /dev/null
@@ -1,39 +0,0 @@
-layerId = $layerId;
-  }
-  public function getLayerId()
-  {
-    return $this->layerId;
-  }
-  public function setVolumeAnnotationsVersion($volumeAnnotationsVersion)
-  {
-    $this->volumeAnnotationsVersion = $volumeAnnotationsVersion;
-  }
-  public function getVolumeAnnotationsVersion()
-  {
-    return $this->volumeAnnotationsVersion;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Books/VolumeRecommendedInfo.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Books/VolumeRecommendedInfo.php
deleted file mode 100644
index 67757950..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Books/VolumeRecommendedInfo.php
+++ /dev/null
@@ -1,30 +0,0 @@
-explanation = $explanation;
-  }
-  public function getExplanation()
-  {
-    return $this->explanation;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Books/VolumeSaleInfo.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Books/VolumeSaleInfo.php
deleted file mode 100644
index a772a103..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Books/VolumeSaleInfo.php
+++ /dev/null
@@ -1,97 +0,0 @@
-buyLink = $buyLink;
-  }
-  public function getBuyLink()
-  {
-    return $this->buyLink;
-  }
-  public function setCountry($country)
-  {
-    $this->country = $country;
-  }
-  public function getCountry()
-  {
-    return $this->country;
-  }
-  public function setIsEbook($isEbook)
-  {
-    $this->isEbook = $isEbook;
-  }
-  public function getIsEbook()
-  {
-    return $this->isEbook;
-  }
-  public function setListPrice(Google_Service_Books_VolumeSaleInfoListPrice $listPrice)
-  {
-    $this->listPrice = $listPrice;
-  }
-  public function getListPrice()
-  {
-    return $this->listPrice;
-  }
-  public function setOffers($offers)
-  {
-    $this->offers = $offers;
-  }
-  public function getOffers()
-  {
-    return $this->offers;
-  }
-  public function setOnSaleDate($onSaleDate)
-  {
-    $this->onSaleDate = $onSaleDate;
-  }
-  public function getOnSaleDate()
-  {
-    return $this->onSaleDate;
-  }
-  public function setRetailPrice(Google_Service_Books_VolumeSaleInfoRetailPrice $retailPrice)
-  {
-    $this->retailPrice = $retailPrice;
-  }
-  public function getRetailPrice()
-  {
-    return $this->retailPrice;
-  }
-  public function setSaleability($saleability)
-  {
-    $this->saleability = $saleability;
-  }
-  public function getSaleability()
-  {
-    return $this->saleability;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Books/VolumeSaleInfoListPrice.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Books/VolumeSaleInfoListPrice.php
deleted file mode 100644
index e0ccb21e..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Books/VolumeSaleInfoListPrice.php
+++ /dev/null
@@ -1,39 +0,0 @@
-amount = $amount;
-  }
-  public function getAmount()
-  {
-    return $this->amount;
-  }
-  public function setCurrencyCode($currencyCode)
-  {
-    $this->currencyCode = $currencyCode;
-  }
-  public function getCurrencyCode()
-  {
-    return $this->currencyCode;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Books/VolumeSaleInfoOffers.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Books/VolumeSaleInfoOffers.php
deleted file mode 100644
index 594ba952..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Books/VolumeSaleInfoOffers.php
+++ /dev/null
@@ -1,69 +0,0 @@
-finskyOfferType = $finskyOfferType;
-  }
-  public function getFinskyOfferType()
-  {
-    return $this->finskyOfferType;
-  }
-  public function setGiftable($giftable)
-  {
-    $this->giftable = $giftable;
-  }
-  public function getGiftable()
-  {
-    return $this->giftable;
-  }
-  public function setListPrice(Google_Service_Books_VolumeSaleInfoOffersListPrice $listPrice)
-  {
-    $this->listPrice = $listPrice;
-  }
-  public function getListPrice()
-  {
-    return $this->listPrice;
-  }
-  public function setRentalDuration(Google_Service_Books_VolumeSaleInfoOffersRentalDuration $rentalDuration)
-  {
-    $this->rentalDuration = $rentalDuration;
-  }
-  public function getRentalDuration()
-  {
-    return $this->rentalDuration;
-  }
-  public function setRetailPrice(Google_Service_Books_VolumeSaleInfoOffersRetailPrice $retailPrice)
-  {
-    $this->retailPrice = $retailPrice;
-  }
-  public function getRetailPrice()
-  {
-    return $this->retailPrice;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Books/VolumeSaleInfoOffersListPrice.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Books/VolumeSaleInfoOffersListPrice.php
deleted file mode 100644
index 7973473f..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Books/VolumeSaleInfoOffersListPrice.php
+++ /dev/null
@@ -1,39 +0,0 @@
-amountInMicros = $amountInMicros;
-  }
-  public function getAmountInMicros()
-  {
-    return $this->amountInMicros;
-  }
-  public function setCurrencyCode($currencyCode)
-  {
-    $this->currencyCode = $currencyCode;
-  }
-  public function getCurrencyCode()
-  {
-    return $this->currencyCode;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Books/VolumeSaleInfoOffersRentalDuration.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Books/VolumeSaleInfoOffersRentalDuration.php
deleted file mode 100644
index 23421ddc..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Books/VolumeSaleInfoOffersRentalDuration.php
+++ /dev/null
@@ -1,39 +0,0 @@
-count = $count;
-  }
-  public function getCount()
-  {
-    return $this->count;
-  }
-  public function setUnit($unit)
-  {
-    $this->unit = $unit;
-  }
-  public function getUnit()
-  {
-    return $this->unit;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Books/VolumeSaleInfoOffersRetailPrice.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Books/VolumeSaleInfoOffersRetailPrice.php
deleted file mode 100644
index 2928a826..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Books/VolumeSaleInfoOffersRetailPrice.php
+++ /dev/null
@@ -1,39 +0,0 @@
-amountInMicros = $amountInMicros;
-  }
-  public function getAmountInMicros()
-  {
-    return $this->amountInMicros;
-  }
-  public function setCurrencyCode($currencyCode)
-  {
-    $this->currencyCode = $currencyCode;
-  }
-  public function getCurrencyCode()
-  {
-    return $this->currencyCode;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Books/VolumeSaleInfoRetailPrice.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Books/VolumeSaleInfoRetailPrice.php
deleted file mode 100644
index 9c9d0475..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Books/VolumeSaleInfoRetailPrice.php
+++ /dev/null
@@ -1,39 +0,0 @@
-amount = $amount;
-  }
-  public function getAmount()
-  {
-    return $this->amount;
-  }
-  public function setCurrencyCode($currencyCode)
-  {
-    $this->currencyCode = $currencyCode;
-  }
-  public function getCurrencyCode()
-  {
-    return $this->currencyCode;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Books/VolumeSearchInfo.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Books/VolumeSearchInfo.php
deleted file mode 100644
index 7b36118a..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Books/VolumeSearchInfo.php
+++ /dev/null
@@ -1,30 +0,0 @@
-textSnippet = $textSnippet;
-  }
-  public function getTextSnippet()
-  {
-    return $this->textSnippet;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Books/VolumeUserInfo.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Books/VolumeUserInfo.php
deleted file mode 100644
index 86c80537..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Books/VolumeUserInfo.php
+++ /dev/null
@@ -1,198 +0,0 @@
-acquiredTime = $acquiredTime;
-  }
-  public function getAcquiredTime()
-  {
-    return $this->acquiredTime;
-  }
-  public function setAcquisitionType($acquisitionType)
-  {
-    $this->acquisitionType = $acquisitionType;
-  }
-  public function getAcquisitionType()
-  {
-    return $this->acquisitionType;
-  }
-  public function setCopy(Google_Service_Books_VolumeUserInfoCopy $copy)
-  {
-    $this->copy = $copy;
-  }
-  public function getCopy()
-  {
-    return $this->copy;
-  }
-  public function setEntitlementType($entitlementType)
-  {
-    $this->entitlementType = $entitlementType;
-  }
-  public function getEntitlementType()
-  {
-    return $this->entitlementType;
-  }
-  public function setFamilySharing(Google_Service_Books_VolumeUserInfoFamilySharing $familySharing)
-  {
-    $this->familySharing = $familySharing;
-  }
-  public function getFamilySharing()
-  {
-    return $this->familySharing;
-  }
-  public function setIsFamilySharedFromUser($isFamilySharedFromUser)
-  {
-    $this->isFamilySharedFromUser = $isFamilySharedFromUser;
-  }
-  public function getIsFamilySharedFromUser()
-  {
-    return $this->isFamilySharedFromUser;
-  }
-  public function setIsFamilySharedToUser($isFamilySharedToUser)
-  {
-    $this->isFamilySharedToUser = $isFamilySharedToUser;
-  }
-  public function getIsFamilySharedToUser()
-  {
-    return $this->isFamilySharedToUser;
-  }
-  public function setIsFamilySharingAllowed($isFamilySharingAllowed)
-  {
-    $this->isFamilySharingAllowed = $isFamilySharingAllowed;
-  }
-  public function getIsFamilySharingAllowed()
-  {
-    return $this->isFamilySharingAllowed;
-  }
-  public function setIsFamilySharingDisabledByFop($isFamilySharingDisabledByFop)
-  {
-    $this->isFamilySharingDisabledByFop = $isFamilySharingDisabledByFop;
-  }
-  public function getIsFamilySharingDisabledByFop()
-  {
-    return $this->isFamilySharingDisabledByFop;
-  }
-  public function setIsInMyBooks($isInMyBooks)
-  {
-    $this->isInMyBooks = $isInMyBooks;
-  }
-  public function getIsInMyBooks()
-  {
-    return $this->isInMyBooks;
-  }
-  public function setIsPreordered($isPreordered)
-  {
-    $this->isPreordered = $isPreordered;
-  }
-  public function getIsPreordered()
-  {
-    return $this->isPreordered;
-  }
-  public function setIsPurchased($isPurchased)
-  {
-    $this->isPurchased = $isPurchased;
-  }
-  public function getIsPurchased()
-  {
-    return $this->isPurchased;
-  }
-  public function setIsUploaded($isUploaded)
-  {
-    $this->isUploaded = $isUploaded;
-  }
-  public function getIsUploaded()
-  {
-    return $this->isUploaded;
-  }
-  public function setReadingPosition(Google_Service_Books_ReadingPosition $readingPosition)
-  {
-    $this->readingPosition = $readingPosition;
-  }
-  public function getReadingPosition()
-  {
-    return $this->readingPosition;
-  }
-  public function setRentalPeriod(Google_Service_Books_VolumeUserInfoRentalPeriod $rentalPeriod)
-  {
-    $this->rentalPeriod = $rentalPeriod;
-  }
-  public function getRentalPeriod()
-  {
-    return $this->rentalPeriod;
-  }
-  public function setRentalState($rentalState)
-  {
-    $this->rentalState = $rentalState;
-  }
-  public function getRentalState()
-  {
-    return $this->rentalState;
-  }
-  public function setReview(Google_Service_Books_Review $review)
-  {
-    $this->review = $review;
-  }
-  public function getReview()
-  {
-    return $this->review;
-  }
-  public function setUpdated($updated)
-  {
-    $this->updated = $updated;
-  }
-  public function getUpdated()
-  {
-    return $this->updated;
-  }
-  public function setUserUploadedVolumeInfo(Google_Service_Books_VolumeUserInfoUserUploadedVolumeInfo $userUploadedVolumeInfo)
-  {
-    $this->userUploadedVolumeInfo = $userUploadedVolumeInfo;
-  }
-  public function getUserUploadedVolumeInfo()
-  {
-    return $this->userUploadedVolumeInfo;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Books/VolumeUserInfoCopy.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Books/VolumeUserInfoCopy.php
deleted file mode 100644
index 837916af..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Books/VolumeUserInfoCopy.php
+++ /dev/null
@@ -1,57 +0,0 @@
-allowedCharacterCount = $allowedCharacterCount;
-  }
-  public function getAllowedCharacterCount()
-  {
-    return $this->allowedCharacterCount;
-  }
-  public function setLimitType($limitType)
-  {
-    $this->limitType = $limitType;
-  }
-  public function getLimitType()
-  {
-    return $this->limitType;
-  }
-  public function setRemainingCharacterCount($remainingCharacterCount)
-  {
-    $this->remainingCharacterCount = $remainingCharacterCount;
-  }
-  public function getRemainingCharacterCount()
-  {
-    return $this->remainingCharacterCount;
-  }
-  public function setUpdated($updated)
-  {
-    $this->updated = $updated;
-  }
-  public function getUpdated()
-  {
-    return $this->updated;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Books/VolumeUserInfoFamilySharing.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Books/VolumeUserInfoFamilySharing.php
deleted file mode 100644
index a372b4f3..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Books/VolumeUserInfoFamilySharing.php
+++ /dev/null
@@ -1,48 +0,0 @@
-familyRole = $familyRole;
-  }
-  public function getFamilyRole()
-  {
-    return $this->familyRole;
-  }
-  public function setIsSharingAllowed($isSharingAllowed)
-  {
-    $this->isSharingAllowed = $isSharingAllowed;
-  }
-  public function getIsSharingAllowed()
-  {
-    return $this->isSharingAllowed;
-  }
-  public function setIsSharingDisabledByFop($isSharingDisabledByFop)
-  {
-    $this->isSharingDisabledByFop = $isSharingDisabledByFop;
-  }
-  public function getIsSharingDisabledByFop()
-  {
-    return $this->isSharingDisabledByFop;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Books/VolumeUserInfoRentalPeriod.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Books/VolumeUserInfoRentalPeriod.php
deleted file mode 100644
index 6e2e050a..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Books/VolumeUserInfoRentalPeriod.php
+++ /dev/null
@@ -1,39 +0,0 @@
-endUtcSec = $endUtcSec;
-  }
-  public function getEndUtcSec()
-  {
-    return $this->endUtcSec;
-  }
-  public function setStartUtcSec($startUtcSec)
-  {
-    $this->startUtcSec = $startUtcSec;
-  }
-  public function getStartUtcSec()
-  {
-    return $this->startUtcSec;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Books/VolumeUserInfoUserUploadedVolumeInfo.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Books/VolumeUserInfoUserUploadedVolumeInfo.php
deleted file mode 100644
index 5eddbebe..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Books/VolumeUserInfoUserUploadedVolumeInfo.php
+++ /dev/null
@@ -1,30 +0,0 @@
-processingState = $processingState;
-  }
-  public function getProcessingState()
-  {
-    return $this->processingState;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Books/VolumeVolumeInfo.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Books/VolumeVolumeInfo.php
deleted file mode 100644
index 5d40f90d..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Books/VolumeVolumeInfo.php
+++ /dev/null
@@ -1,270 +0,0 @@
-allowAnonLogging = $allowAnonLogging;
-  }
-  public function getAllowAnonLogging()
-  {
-    return $this->allowAnonLogging;
-  }
-  public function setAuthors($authors)
-  {
-    $this->authors = $authors;
-  }
-  public function getAuthors()
-  {
-    return $this->authors;
-  }
-  public function setAverageRating($averageRating)
-  {
-    $this->averageRating = $averageRating;
-  }
-  public function getAverageRating()
-  {
-    return $this->averageRating;
-  }
-  public function setCanonicalVolumeLink($canonicalVolumeLink)
-  {
-    $this->canonicalVolumeLink = $canonicalVolumeLink;
-  }
-  public function getCanonicalVolumeLink()
-  {
-    return $this->canonicalVolumeLink;
-  }
-  public function setCategories($categories)
-  {
-    $this->categories = $categories;
-  }
-  public function getCategories()
-  {
-    return $this->categories;
-  }
-  public function setContentVersion($contentVersion)
-  {
-    $this->contentVersion = $contentVersion;
-  }
-  public function getContentVersion()
-  {
-    return $this->contentVersion;
-  }
-  public function setDescription($description)
-  {
-    $this->description = $description;
-  }
-  public function getDescription()
-  {
-    return $this->description;
-  }
-  public function setDimensions(Google_Service_Books_VolumeVolumeInfoDimensions $dimensions)
-  {
-    $this->dimensions = $dimensions;
-  }
-  public function getDimensions()
-  {
-    return $this->dimensions;
-  }
-  public function setImageLinks(Google_Service_Books_VolumeVolumeInfoImageLinks $imageLinks)
-  {
-    $this->imageLinks = $imageLinks;
-  }
-  public function getImageLinks()
-  {
-    return $this->imageLinks;
-  }
-  public function setIndustryIdentifiers($industryIdentifiers)
-  {
-    $this->industryIdentifiers = $industryIdentifiers;
-  }
-  public function getIndustryIdentifiers()
-  {
-    return $this->industryIdentifiers;
-  }
-  public function setInfoLink($infoLink)
-  {
-    $this->infoLink = $infoLink;
-  }
-  public function getInfoLink()
-  {
-    return $this->infoLink;
-  }
-  public function setLanguage($language)
-  {
-    $this->language = $language;
-  }
-  public function getLanguage()
-  {
-    return $this->language;
-  }
-  public function setMainCategory($mainCategory)
-  {
-    $this->mainCategory = $mainCategory;
-  }
-  public function getMainCategory()
-  {
-    return $this->mainCategory;
-  }
-  public function setMaturityRating($maturityRating)
-  {
-    $this->maturityRating = $maturityRating;
-  }
-  public function getMaturityRating()
-  {
-    return $this->maturityRating;
-  }
-  public function setPageCount($pageCount)
-  {
-    $this->pageCount = $pageCount;
-  }
-  public function getPageCount()
-  {
-    return $this->pageCount;
-  }
-  public function setPanelizationSummary(Google_Service_Books_VolumeVolumeInfoPanelizationSummary $panelizationSummary)
-  {
-    $this->panelizationSummary = $panelizationSummary;
-  }
-  public function getPanelizationSummary()
-  {
-    return $this->panelizationSummary;
-  }
-  public function setPreviewLink($previewLink)
-  {
-    $this->previewLink = $previewLink;
-  }
-  public function getPreviewLink()
-  {
-    return $this->previewLink;
-  }
-  public function setPrintType($printType)
-  {
-    $this->printType = $printType;
-  }
-  public function getPrintType()
-  {
-    return $this->printType;
-  }
-  public function setPrintedPageCount($printedPageCount)
-  {
-    $this->printedPageCount = $printedPageCount;
-  }
-  public function getPrintedPageCount()
-  {
-    return $this->printedPageCount;
-  }
-  public function setPublishedDate($publishedDate)
-  {
-    $this->publishedDate = $publishedDate;
-  }
-  public function getPublishedDate()
-  {
-    return $this->publishedDate;
-  }
-  public function setPublisher($publisher)
-  {
-    $this->publisher = $publisher;
-  }
-  public function getPublisher()
-  {
-    return $this->publisher;
-  }
-  public function setRatingsCount($ratingsCount)
-  {
-    $this->ratingsCount = $ratingsCount;
-  }
-  public function getRatingsCount()
-  {
-    return $this->ratingsCount;
-  }
-  public function setReadingModes($readingModes)
-  {
-    $this->readingModes = $readingModes;
-  }
-  public function getReadingModes()
-  {
-    return $this->readingModes;
-  }
-  public function setSamplePageCount($samplePageCount)
-  {
-    $this->samplePageCount = $samplePageCount;
-  }
-  public function getSamplePageCount()
-  {
-    return $this->samplePageCount;
-  }
-  public function setSeriesInfo(Google_Service_Books_Volumeseriesinfo $seriesInfo)
-  {
-    $this->seriesInfo = $seriesInfo;
-  }
-  public function getSeriesInfo()
-  {
-    return $this->seriesInfo;
-  }
-  public function setSubtitle($subtitle)
-  {
-    $this->subtitle = $subtitle;
-  }
-  public function getSubtitle()
-  {
-    return $this->subtitle;
-  }
-  public function setTitle($title)
-  {
-    $this->title = $title;
-  }
-  public function getTitle()
-  {
-    return $this->title;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Books/VolumeVolumeInfoDimensions.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Books/VolumeVolumeInfoDimensions.php
deleted file mode 100644
index db2b654e..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Books/VolumeVolumeInfoDimensions.php
+++ /dev/null
@@ -1,48 +0,0 @@
-height = $height;
-  }
-  public function getHeight()
-  {
-    return $this->height;
-  }
-  public function setThickness($thickness)
-  {
-    $this->thickness = $thickness;
-  }
-  public function getThickness()
-  {
-    return $this->thickness;
-  }
-  public function setWidth($width)
-  {
-    $this->width = $width;
-  }
-  public function getWidth()
-  {
-    return $this->width;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Books/VolumeVolumeInfoImageLinks.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Books/VolumeVolumeInfoImageLinks.php
deleted file mode 100644
index cef978a7..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Books/VolumeVolumeInfoImageLinks.php
+++ /dev/null
@@ -1,75 +0,0 @@
-extraLarge = $extraLarge;
-  }
-  public function getExtraLarge()
-  {
-    return $this->extraLarge;
-  }
-  public function setLarge($large)
-  {
-    $this->large = $large;
-  }
-  public function getLarge()
-  {
-    return $this->large;
-  }
-  public function setMedium($medium)
-  {
-    $this->medium = $medium;
-  }
-  public function getMedium()
-  {
-    return $this->medium;
-  }
-  public function setSmall($small)
-  {
-    $this->small = $small;
-  }
-  public function getSmall()
-  {
-    return $this->small;
-  }
-  public function setSmallThumbnail($smallThumbnail)
-  {
-    $this->smallThumbnail = $smallThumbnail;
-  }
-  public function getSmallThumbnail()
-  {
-    return $this->smallThumbnail;
-  }
-  public function setThumbnail($thumbnail)
-  {
-    $this->thumbnail = $thumbnail;
-  }
-  public function getThumbnail()
-  {
-    return $this->thumbnail;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Books/VolumeVolumeInfoIndustryIdentifiers.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Books/VolumeVolumeInfoIndustryIdentifiers.php
deleted file mode 100644
index cde9a418..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Books/VolumeVolumeInfoIndustryIdentifiers.php
+++ /dev/null
@@ -1,39 +0,0 @@
-identifier = $identifier;
-  }
-  public function getIdentifier()
-  {
-    return $this->identifier;
-  }
-  public function setType($type)
-  {
-    $this->type = $type;
-  }
-  public function getType()
-  {
-    return $this->type;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Books/VolumeVolumeInfoPanelizationSummary.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Books/VolumeVolumeInfoPanelizationSummary.php
deleted file mode 100644
index e2806fb3..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Books/VolumeVolumeInfoPanelizationSummary.php
+++ /dev/null
@@ -1,57 +0,0 @@
-containsEpubBubbles = $containsEpubBubbles;
-  }
-  public function getContainsEpubBubbles()
-  {
-    return $this->containsEpubBubbles;
-  }
-  public function setContainsImageBubbles($containsImageBubbles)
-  {
-    $this->containsImageBubbles = $containsImageBubbles;
-  }
-  public function getContainsImageBubbles()
-  {
-    return $this->containsImageBubbles;
-  }
-  public function setEpubBubbleVersion($epubBubbleVersion)
-  {
-    $this->epubBubbleVersion = $epubBubbleVersion;
-  }
-  public function getEpubBubbleVersion()
-  {
-    return $this->epubBubbleVersion;
-  }
-  public function setImageBubbleVersion($imageBubbleVersion)
-  {
-    $this->imageBubbleVersion = $imageBubbleVersion;
-  }
-  public function getImageBubbleVersion()
-  {
-    return $this->imageBubbleVersion;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Books/Volumeannotation.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Books/Volumeannotation.php
deleted file mode 100644
index 0dc9f6a0..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Books/Volumeannotation.php
+++ /dev/null
@@ -1,149 +0,0 @@
-annotationDataId = $annotationDataId;
-  }
-  public function getAnnotationDataId()
-  {
-    return $this->annotationDataId;
-  }
-  public function setAnnotationDataLink($annotationDataLink)
-  {
-    $this->annotationDataLink = $annotationDataLink;
-  }
-  public function getAnnotationDataLink()
-  {
-    return $this->annotationDataLink;
-  }
-  public function setAnnotationType($annotationType)
-  {
-    $this->annotationType = $annotationType;
-  }
-  public function getAnnotationType()
-  {
-    return $this->annotationType;
-  }
-  public function setContentRanges(Google_Service_Books_VolumeannotationContentRanges $contentRanges)
-  {
-    $this->contentRanges = $contentRanges;
-  }
-  public function getContentRanges()
-  {
-    return $this->contentRanges;
-  }
-  public function setData($data)
-  {
-    $this->data = $data;
-  }
-  public function getData()
-  {
-    return $this->data;
-  }
-  public function setDeleted($deleted)
-  {
-    $this->deleted = $deleted;
-  }
-  public function getDeleted()
-  {
-    return $this->deleted;
-  }
-  public function setId($id)
-  {
-    $this->id = $id;
-  }
-  public function getId()
-  {
-    return $this->id;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setLayerId($layerId)
-  {
-    $this->layerId = $layerId;
-  }
-  public function getLayerId()
-  {
-    return $this->layerId;
-  }
-  public function setPageIds($pageIds)
-  {
-    $this->pageIds = $pageIds;
-  }
-  public function getPageIds()
-  {
-    return $this->pageIds;
-  }
-  public function setSelectedText($selectedText)
-  {
-    $this->selectedText = $selectedText;
-  }
-  public function getSelectedText()
-  {
-    return $this->selectedText;
-  }
-  public function setSelfLink($selfLink)
-  {
-    $this->selfLink = $selfLink;
-  }
-  public function getSelfLink()
-  {
-    return $this->selfLink;
-  }
-  public function setUpdated($updated)
-  {
-    $this->updated = $updated;
-  }
-  public function getUpdated()
-  {
-    return $this->updated;
-  }
-  public function setVolumeId($volumeId)
-  {
-    $this->volumeId = $volumeId;
-  }
-  public function getVolumeId()
-  {
-    return $this->volumeId;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Books/VolumeannotationContentRanges.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Books/VolumeannotationContentRanges.php
deleted file mode 100644
index 5b9c720a..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Books/VolumeannotationContentRanges.php
+++ /dev/null
@@ -1,60 +0,0 @@
-cfiRange = $cfiRange;
-  }
-  public function getCfiRange()
-  {
-    return $this->cfiRange;
-  }
-  public function setContentVersion($contentVersion)
-  {
-    $this->contentVersion = $contentVersion;
-  }
-  public function getContentVersion()
-  {
-    return $this->contentVersion;
-  }
-  public function setGbImageRange(Google_Service_Books_BooksAnnotationsRange $gbImageRange)
-  {
-    $this->gbImageRange = $gbImageRange;
-  }
-  public function getGbImageRange()
-  {
-    return $this->gbImageRange;
-  }
-  public function setGbTextRange(Google_Service_Books_BooksAnnotationsRange $gbTextRange)
-  {
-    $this->gbTextRange = $gbTextRange;
-  }
-  public function getGbTextRange()
-  {
-    return $this->gbTextRange;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Books/Volumeannotations.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Books/Volumeannotations.php
deleted file mode 100644
index f28f199a..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Books/Volumeannotations.php
+++ /dev/null
@@ -1,68 +0,0 @@
-items = $items;
-  }
-  public function getItems()
-  {
-    return $this->items;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setNextPageToken($nextPageToken)
-  {
-    $this->nextPageToken = $nextPageToken;
-  }
-  public function getNextPageToken()
-  {
-    return $this->nextPageToken;
-  }
-  public function setTotalItems($totalItems)
-  {
-    $this->totalItems = $totalItems;
-  }
-  public function getTotalItems()
-  {
-    return $this->totalItems;
-  }
-  public function setVersion($version)
-  {
-    $this->version = $version;
-  }
-  public function getVersion()
-  {
-    return $this->version;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Books/Volumes.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Books/Volumes.php
deleted file mode 100644
index 89f00ff0..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Books/Volumes.php
+++ /dev/null
@@ -1,50 +0,0 @@
-items = $items;
-  }
-  public function getItems()
-  {
-    return $this->items;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setTotalItems($totalItems)
-  {
-    $this->totalItems = $totalItems;
-  }
-  public function getTotalItems()
-  {
-    return $this->totalItems;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Books/Volumeseriesinfo.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Books/Volumeseriesinfo.php
deleted file mode 100644
index 555cf367..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Books/Volumeseriesinfo.php
+++ /dev/null
@@ -1,59 +0,0 @@
-bookDisplayNumber = $bookDisplayNumber;
-  }
-  public function getBookDisplayNumber()
-  {
-    return $this->bookDisplayNumber;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setShortSeriesBookTitle($shortSeriesBookTitle)
-  {
-    $this->shortSeriesBookTitle = $shortSeriesBookTitle;
-  }
-  public function getShortSeriesBookTitle()
-  {
-    return $this->shortSeriesBookTitle;
-  }
-  public function setVolumeSeries($volumeSeries)
-  {
-    $this->volumeSeries = $volumeSeries;
-  }
-  public function getVolumeSeries()
-  {
-    return $this->volumeSeries;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Books/VolumeseriesinfoVolumeSeries.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Books/VolumeseriesinfoVolumeSeries.php
deleted file mode 100644
index f58238f5..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Books/VolumeseriesinfoVolumeSeries.php
+++ /dev/null
@@ -1,59 +0,0 @@
-issue = $issue;
-  }
-  public function getIssue()
-  {
-    return $this->issue;
-  }
-  public function setOrderNumber($orderNumber)
-  {
-    $this->orderNumber = $orderNumber;
-  }
-  public function getOrderNumber()
-  {
-    return $this->orderNumber;
-  }
-  public function setSeriesBookType($seriesBookType)
-  {
-    $this->seriesBookType = $seriesBookType;
-  }
-  public function getSeriesBookType()
-  {
-    return $this->seriesBookType;
-  }
-  public function setSeriesId($seriesId)
-  {
-    $this->seriesId = $seriesId;
-  }
-  public function getSeriesId()
-  {
-    return $this->seriesId;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Books/VolumeseriesinfoVolumeSeriesIssue.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Books/VolumeseriesinfoVolumeSeriesIssue.php
deleted file mode 100644
index 4dd85f2a..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Books/VolumeseriesinfoVolumeSeriesIssue.php
+++ /dev/null
@@ -1,39 +0,0 @@
-issueDisplayNumber = $issueDisplayNumber;
-  }
-  public function getIssueDisplayNumber()
-  {
-    return $this->issueDisplayNumber;
-  }
-  public function setIssueOrderNumber($issueOrderNumber)
-  {
-    $this->issueOrderNumber = $issueOrderNumber;
-  }
-  public function getIssueOrderNumber()
-  {
-    return $this->issueOrderNumber;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Calendar.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Calendar.php
deleted file mode 100644
index b1241bd1..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Calendar.php
+++ /dev/null
@@ -1,888 +0,0 @@
-
- * Manipulates events and other calendar data.

- *
- * 

- * For more information about this service, see the API
- * Documentation
- * 

- *
- * @author Google, Inc.
- */
-class Google_Service_Calendar extends Google_Service
-{
-  /** Manage your calendars. */
-  const CALENDAR =
-      "https://www.googleapis.com/auth/calendar";
-  /** View your calendars. */
-  const CALENDAR_READONLY =
-      "https://www.googleapis.com/auth/calendar.readonly";
-
-  public $acl;
-  public $calendarList;
-  public $calendars;
-  public $channels;
-  public $colors;
-  public $events;
-  public $freebusy;
-  public $settings;
-  
-  /**
-   * Constructs the internal representation of the Calendar service.
-   *
-   * @param Google_Client $client
-   */
-  public function __construct(Google_Client $client)
-  {
-    parent::__construct($client);
-    $this->rootUrl = 'https://www.googleapis.com/';
-    $this->servicePath = 'calendar/v3/';
-    $this->version = 'v3';
-    $this->serviceName = 'calendar';
-
-    $this->acl = new Google_Service_Calendar_Resource_Acl(
-        $this,
-        $this->serviceName,
-        'acl',
-        array(
-          'methods' => array(
-            'delete' => array(
-              'path' => 'calendars/{calendarId}/acl/{ruleId}',
-              'httpMethod' => 'DELETE',
-              'parameters' => array(
-                'calendarId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'ruleId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'get' => array(
-              'path' => 'calendars/{calendarId}/acl/{ruleId}',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'calendarId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'ruleId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'insert' => array(
-              'path' => 'calendars/{calendarId}/acl',
-              'httpMethod' => 'POST',
-              'parameters' => array(
-                'calendarId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'list' => array(
-              'path' => 'calendars/{calendarId}/acl',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'calendarId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'maxResults' => array(
-                  'location' => 'query',
-                  'type' => 'integer',
-                ),
-                'pageToken' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'showDeleted' => array(
-                  'location' => 'query',
-                  'type' => 'boolean',
-                ),
-                'syncToken' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-              ),
-            ),'patch' => array(
-              'path' => 'calendars/{calendarId}/acl/{ruleId}',
-              'httpMethod' => 'PATCH',
-              'parameters' => array(
-                'calendarId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'ruleId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'update' => array(
-              'path' => 'calendars/{calendarId}/acl/{ruleId}',
-              'httpMethod' => 'PUT',
-              'parameters' => array(
-                'calendarId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'ruleId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'watch' => array(
-              'path' => 'calendars/{calendarId}/acl/watch',
-              'httpMethod' => 'POST',
-              'parameters' => array(
-                'calendarId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'maxResults' => array(
-                  'location' => 'query',
-                  'type' => 'integer',
-                ),
-                'pageToken' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'showDeleted' => array(
-                  'location' => 'query',
-                  'type' => 'boolean',
-                ),
-                'syncToken' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-              ),
-            ),
-          )
-        )
-    );
-    $this->calendarList = new Google_Service_Calendar_Resource_CalendarList(
-        $this,
-        $this->serviceName,
-        'calendarList',
-        array(
-          'methods' => array(
-            'delete' => array(
-              'path' => 'users/me/calendarList/{calendarId}',
-              'httpMethod' => 'DELETE',
-              'parameters' => array(
-                'calendarId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'get' => array(
-              'path' => 'users/me/calendarList/{calendarId}',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'calendarId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'insert' => array(
-              'path' => 'users/me/calendarList',
-              'httpMethod' => 'POST',
-              'parameters' => array(
-                'colorRgbFormat' => array(
-                  'location' => 'query',
-                  'type' => 'boolean',
-                ),
-              ),
-            ),'list' => array(
-              'path' => 'users/me/calendarList',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'maxResults' => array(
-                  'location' => 'query',
-                  'type' => 'integer',
-                ),
-                'minAccessRole' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'pageToken' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'showDeleted' => array(
-                  'location' => 'query',
-                  'type' => 'boolean',
-                ),
-                'showHidden' => array(
-                  'location' => 'query',
-                  'type' => 'boolean',
-                ),
-                'syncToken' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-              ),
-            ),'patch' => array(
-              'path' => 'users/me/calendarList/{calendarId}',
-              'httpMethod' => 'PATCH',
-              'parameters' => array(
-                'calendarId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'colorRgbFormat' => array(
-                  'location' => 'query',
-                  'type' => 'boolean',
-                ),
-              ),
-            ),'update' => array(
-              'path' => 'users/me/calendarList/{calendarId}',
-              'httpMethod' => 'PUT',
-              'parameters' => array(
-                'calendarId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'colorRgbFormat' => array(
-                  'location' => 'query',
-                  'type' => 'boolean',
-                ),
-              ),
-            ),'watch' => array(
-              'path' => 'users/me/calendarList/watch',
-              'httpMethod' => 'POST',
-              'parameters' => array(
-                'maxResults' => array(
-                  'location' => 'query',
-                  'type' => 'integer',
-                ),
-                'minAccessRole' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'pageToken' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'showDeleted' => array(
-                  'location' => 'query',
-                  'type' => 'boolean',
-                ),
-                'showHidden' => array(
-                  'location' => 'query',
-                  'type' => 'boolean',
-                ),
-                'syncToken' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-              ),
-            ),
-          )
-        )
-    );
-    $this->calendars = new Google_Service_Calendar_Resource_Calendars(
-        $this,
-        $this->serviceName,
-        'calendars',
-        array(
-          'methods' => array(
-            'clear' => array(
-              'path' => 'calendars/{calendarId}/clear',
-              'httpMethod' => 'POST',
-              'parameters' => array(
-                'calendarId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'delete' => array(
-              'path' => 'calendars/{calendarId}',
-              'httpMethod' => 'DELETE',
-              'parameters' => array(
-                'calendarId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'get' => array(
-              'path' => 'calendars/{calendarId}',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'calendarId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'insert' => array(
-              'path' => 'calendars',
-              'httpMethod' => 'POST',
-              'parameters' => array(),
-            ),'patch' => array(
-              'path' => 'calendars/{calendarId}',
-              'httpMethod' => 'PATCH',
-              'parameters' => array(
-                'calendarId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'update' => array(
-              'path' => 'calendars/{calendarId}',
-              'httpMethod' => 'PUT',
-              'parameters' => array(
-                'calendarId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),
-          )
-        )
-    );
-    $this->channels = new Google_Service_Calendar_Resource_Channels(
-        $this,
-        $this->serviceName,
-        'channels',
-        array(
-          'methods' => array(
-            'stop' => array(
-              'path' => 'channels/stop',
-              'httpMethod' => 'POST',
-              'parameters' => array(),
-            ),
-          )
-        )
-    );
-    $this->colors = new Google_Service_Calendar_Resource_Colors(
-        $this,
-        $this->serviceName,
-        'colors',
-        array(
-          'methods' => array(
-            'get' => array(
-              'path' => 'colors',
-              'httpMethod' => 'GET',
-              'parameters' => array(),
-            ),
-          )
-        )
-    );
-    $this->events = new Google_Service_Calendar_Resource_Events(
-        $this,
-        $this->serviceName,
-        'events',
-        array(
-          'methods' => array(
-            'delete' => array(
-              'path' => 'calendars/{calendarId}/events/{eventId}',
-              'httpMethod' => 'DELETE',
-              'parameters' => array(
-                'calendarId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'eventId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'sendNotifications' => array(
-                  'location' => 'query',
-                  'type' => 'boolean',
-                ),
-              ),
-            ),'get' => array(
-              'path' => 'calendars/{calendarId}/events/{eventId}',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'calendarId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'eventId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'alwaysIncludeEmail' => array(
-                  'location' => 'query',
-                  'type' => 'boolean',
-                ),
-                'maxAttendees' => array(
-                  'location' => 'query',
-                  'type' => 'integer',
-                ),
-                'timeZone' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-              ),
-            ),'import' => array(
-              'path' => 'calendars/{calendarId}/events/import',
-              'httpMethod' => 'POST',
-              'parameters' => array(
-                'calendarId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'supportsAttachments' => array(
-                  'location' => 'query',
-                  'type' => 'boolean',
-                ),
-              ),
-            ),'insert' => array(
-              'path' => 'calendars/{calendarId}/events',
-              'httpMethod' => 'POST',
-              'parameters' => array(
-                'calendarId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'maxAttendees' => array(
-                  'location' => 'query',
-                  'type' => 'integer',
-                ),
-                'sendNotifications' => array(
-                  'location' => 'query',
-                  'type' => 'boolean',
-                ),
-                'supportsAttachments' => array(
-                  'location' => 'query',
-                  'type' => 'boolean',
-                ),
-              ),
-            ),'instances' => array(
-              'path' => 'calendars/{calendarId}/events/{eventId}/instances',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'calendarId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'eventId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'alwaysIncludeEmail' => array(
-                  'location' => 'query',
-                  'type' => 'boolean',
-                ),
-                'maxAttendees' => array(
-                  'location' => 'query',
-                  'type' => 'integer',
-                ),
-                'maxResults' => array(
-                  'location' => 'query',
-                  'type' => 'integer',
-                ),
-                'originalStart' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'pageToken' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'showDeleted' => array(
-                  'location' => 'query',
-                  'type' => 'boolean',
-                ),
-                'timeMax' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'timeMin' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'timeZone' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-              ),
-            ),'list' => array(
-              'path' => 'calendars/{calendarId}/events',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'calendarId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'alwaysIncludeEmail' => array(
-                  'location' => 'query',
-                  'type' => 'boolean',
-                ),
-                'iCalUID' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'maxAttendees' => array(
-                  'location' => 'query',
-                  'type' => 'integer',
-                ),
-                'maxResults' => array(
-                  'location' => 'query',
-                  'type' => 'integer',
-                ),
-                'orderBy' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'pageToken' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'privateExtendedProperty' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                  'repeated' => true,
-                ),
-                'q' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'sharedExtendedProperty' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                  'repeated' => true,
-                ),
-                'showDeleted' => array(
-                  'location' => 'query',
-                  'type' => 'boolean',
-                ),
-                'showHiddenInvitations' => array(
-                  'location' => 'query',
-                  'type' => 'boolean',
-                ),
-                'singleEvents' => array(
-                  'location' => 'query',
-                  'type' => 'boolean',
-                ),
-                'syncToken' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'timeMax' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'timeMin' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'timeZone' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'updatedMin' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-              ),
-            ),'move' => array(
-              'path' => 'calendars/{calendarId}/events/{eventId}/move',
-              'httpMethod' => 'POST',
-              'parameters' => array(
-                'calendarId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'eventId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'destination' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'sendNotifications' => array(
-                  'location' => 'query',
-                  'type' => 'boolean',
-                ),
-              ),
-            ),'patch' => array(
-              'path' => 'calendars/{calendarId}/events/{eventId}',
-              'httpMethod' => 'PATCH',
-              'parameters' => array(
-                'calendarId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'eventId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'alwaysIncludeEmail' => array(
-                  'location' => 'query',
-                  'type' => 'boolean',
-                ),
-                'maxAttendees' => array(
-                  'location' => 'query',
-                  'type' => 'integer',
-                ),
-                'sendNotifications' => array(
-                  'location' => 'query',
-                  'type' => 'boolean',
-                ),
-                'supportsAttachments' => array(
-                  'location' => 'query',
-                  'type' => 'boolean',
-                ),
-              ),
-            ),'quickAdd' => array(
-              'path' => 'calendars/{calendarId}/events/quickAdd',
-              'httpMethod' => 'POST',
-              'parameters' => array(
-                'calendarId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'text' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'sendNotifications' => array(
-                  'location' => 'query',
-                  'type' => 'boolean',
-                ),
-              ),
-            ),'update' => array(
-              'path' => 'calendars/{calendarId}/events/{eventId}',
-              'httpMethod' => 'PUT',
-              'parameters' => array(
-                'calendarId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'eventId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'alwaysIncludeEmail' => array(
-                  'location' => 'query',
-                  'type' => 'boolean',
-                ),
-                'maxAttendees' => array(
-                  'location' => 'query',
-                  'type' => 'integer',
-                ),
-                'sendNotifications' => array(
-                  'location' => 'query',
-                  'type' => 'boolean',
-                ),
-                'supportsAttachments' => array(
-                  'location' => 'query',
-                  'type' => 'boolean',
-                ),
-              ),
-            ),'watch' => array(
-              'path' => 'calendars/{calendarId}/events/watch',
-              'httpMethod' => 'POST',
-              'parameters' => array(
-                'calendarId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'alwaysIncludeEmail' => array(
-                  'location' => 'query',
-                  'type' => 'boolean',
-                ),
-                'iCalUID' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'maxAttendees' => array(
-                  'location' => 'query',
-                  'type' => 'integer',
-                ),
-                'maxResults' => array(
-                  'location' => 'query',
-                  'type' => 'integer',
-                ),
-                'orderBy' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'pageToken' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'privateExtendedProperty' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                  'repeated' => true,
-                ),
-                'q' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'sharedExtendedProperty' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                  'repeated' => true,
-                ),
-                'showDeleted' => array(
-                  'location' => 'query',
-                  'type' => 'boolean',
-                ),
-                'showHiddenInvitations' => array(
-                  'location' => 'query',
-                  'type' => 'boolean',
-                ),
-                'singleEvents' => array(
-                  'location' => 'query',
-                  'type' => 'boolean',
-                ),
-                'syncToken' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'timeMax' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'timeMin' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'timeZone' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'updatedMin' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-              ),
-            ),
-          )
-        )
-    );
-    $this->freebusy = new Google_Service_Calendar_Resource_Freebusy(
-        $this,
-        $this->serviceName,
-        'freebusy',
-        array(
-          'methods' => array(
-            'query' => array(
-              'path' => 'freeBusy',
-              'httpMethod' => 'POST',
-              'parameters' => array(),
-            ),
-          )
-        )
-    );
-    $this->settings = new Google_Service_Calendar_Resource_Settings(
-        $this,
-        $this->serviceName,
-        'settings',
-        array(
-          'methods' => array(
-            'get' => array(
-              'path' => 'users/me/settings/{setting}',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'setting' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'list' => array(
-              'path' => 'users/me/settings',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'maxResults' => array(
-                  'location' => 'query',
-                  'type' => 'integer',
-                ),
-                'pageToken' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'syncToken' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-              ),
-            ),'watch' => array(
-              'path' => 'users/me/settings/watch',
-              'httpMethod' => 'POST',
-              'parameters' => array(
-                'maxResults' => array(
-                  'location' => 'query',
-                  'type' => 'integer',
-                ),
-                'pageToken' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'syncToken' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-              ),
-            ),
-          )
-        )
-    );
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Calendar/Acl.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Calendar/Acl.php
deleted file mode 100644
index 94b64d21..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Calendar/Acl.php
+++ /dev/null
@@ -1,68 +0,0 @@
-etag = $etag;
-  }
-  public function getEtag()
-  {
-    return $this->etag;
-  }
-  public function setItems($items)
-  {
-    $this->items = $items;
-  }
-  public function getItems()
-  {
-    return $this->items;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setNextPageToken($nextPageToken)
-  {
-    $this->nextPageToken = $nextPageToken;
-  }
-  public function getNextPageToken()
-  {
-    return $this->nextPageToken;
-  }
-  public function setNextSyncToken($nextSyncToken)
-  {
-    $this->nextSyncToken = $nextSyncToken;
-  }
-  public function getNextSyncToken()
-  {
-    return $this->nextSyncToken;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Calendar/AclRule.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Calendar/AclRule.php
deleted file mode 100644
index 49402b02..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Calendar/AclRule.php
+++ /dev/null
@@ -1,67 +0,0 @@
-etag = $etag;
-  }
-  public function getEtag()
-  {
-    return $this->etag;
-  }
-  public function setId($id)
-  {
-    $this->id = $id;
-  }
-  public function getId()
-  {
-    return $this->id;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setRole($role)
-  {
-    $this->role = $role;
-  }
-  public function getRole()
-  {
-    return $this->role;
-  }
-  public function setScope(Google_Service_Calendar_AclRuleScope $scope)
-  {
-    $this->scope = $scope;
-  }
-  public function getScope()
-  {
-    return $this->scope;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Calendar/AclRuleScope.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Calendar/AclRuleScope.php
deleted file mode 100644
index 47a10b24..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Calendar/AclRuleScope.php
+++ /dev/null
@@ -1,39 +0,0 @@
-type = $type;
-  }
-  public function getType()
-  {
-    return $this->type;
-  }
-  public function setValue($value)
-  {
-    $this->value = $value;
-  }
-  public function getValue()
-  {
-    return $this->value;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Calendar/Calendar.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Calendar/Calendar.php
deleted file mode 100644
index a2bc1e00..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Calendar/Calendar.php
+++ /dev/null
@@ -1,84 +0,0 @@
-description = $description;
-  }
-  public function getDescription()
-  {
-    return $this->description;
-  }
-  public function setEtag($etag)
-  {
-    $this->etag = $etag;
-  }
-  public function getEtag()
-  {
-    return $this->etag;
-  }
-  public function setId($id)
-  {
-    $this->id = $id;
-  }
-  public function getId()
-  {
-    return $this->id;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setLocation($location)
-  {
-    $this->location = $location;
-  }
-  public function getLocation()
-  {
-    return $this->location;
-  }
-  public function setSummary($summary)
-  {
-    $this->summary = $summary;
-  }
-  public function getSummary()
-  {
-    return $this->summary;
-  }
-  public function setTimeZone($timeZone)
-  {
-    $this->timeZone = $timeZone;
-  }
-  public function getTimeZone()
-  {
-    return $this->timeZone;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Calendar/CalendarList.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Calendar/CalendarList.php
deleted file mode 100644
index 79281326..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Calendar/CalendarList.php
+++ /dev/null
@@ -1,68 +0,0 @@
-etag = $etag;
-  }
-  public function getEtag()
-  {
-    return $this->etag;
-  }
-  public function setItems($items)
-  {
-    $this->items = $items;
-  }
-  public function getItems()
-  {
-    return $this->items;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setNextPageToken($nextPageToken)
-  {
-    $this->nextPageToken = $nextPageToken;
-  }
-  public function getNextPageToken()
-  {
-    return $this->nextPageToken;
-  }
-  public function setNextSyncToken($nextSyncToken)
-  {
-    $this->nextSyncToken = $nextSyncToken;
-  }
-  public function getNextSyncToken()
-  {
-    return $this->nextSyncToken;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Calendar/CalendarListEntry.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Calendar/CalendarListEntry.php
deleted file mode 100644
index eb7584b0..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Calendar/CalendarListEntry.php
+++ /dev/null
@@ -1,186 +0,0 @@
-accessRole = $accessRole;
-  }
-  public function getAccessRole()
-  {
-    return $this->accessRole;
-  }
-  public function setBackgroundColor($backgroundColor)
-  {
-    $this->backgroundColor = $backgroundColor;
-  }
-  public function getBackgroundColor()
-  {
-    return $this->backgroundColor;
-  }
-  public function setColorId($colorId)
-  {
-    $this->colorId = $colorId;
-  }
-  public function getColorId()
-  {
-    return $this->colorId;
-  }
-  public function setDefaultReminders($defaultReminders)
-  {
-    $this->defaultReminders = $defaultReminders;
-  }
-  public function getDefaultReminders()
-  {
-    return $this->defaultReminders;
-  }
-  public function setDeleted($deleted)
-  {
-    $this->deleted = $deleted;
-  }
-  public function getDeleted()
-  {
-    return $this->deleted;
-  }
-  public function setDescription($description)
-  {
-    $this->description = $description;
-  }
-  public function getDescription()
-  {
-    return $this->description;
-  }
-  public function setEtag($etag)
-  {
-    $this->etag = $etag;
-  }
-  public function getEtag()
-  {
-    return $this->etag;
-  }
-  public function setForegroundColor($foregroundColor)
-  {
-    $this->foregroundColor = $foregroundColor;
-  }
-  public function getForegroundColor()
-  {
-    return $this->foregroundColor;
-  }
-  public function setHidden($hidden)
-  {
-    $this->hidden = $hidden;
-  }
-  public function getHidden()
-  {
-    return $this->hidden;
-  }
-  public function setId($id)
-  {
-    $this->id = $id;
-  }
-  public function getId()
-  {
-    return $this->id;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setLocation($location)
-  {
-    $this->location = $location;
-  }
-  public function getLocation()
-  {
-    return $this->location;
-  }
-  public function setNotificationSettings(Google_Service_Calendar_CalendarListEntryNotificationSettings $notificationSettings)
-  {
-    $this->notificationSettings = $notificationSettings;
-  }
-  public function getNotificationSettings()
-  {
-    return $this->notificationSettings;
-  }
-  public function setPrimary($primary)
-  {
-    $this->primary = $primary;
-  }
-  public function getPrimary()
-  {
-    return $this->primary;
-  }
-  public function setSelected($selected)
-  {
-    $this->selected = $selected;
-  }
-  public function getSelected()
-  {
-    return $this->selected;
-  }
-  public function setSummary($summary)
-  {
-    $this->summary = $summary;
-  }
-  public function getSummary()
-  {
-    return $this->summary;
-  }
-  public function setSummaryOverride($summaryOverride)
-  {
-    $this->summaryOverride = $summaryOverride;
-  }
-  public function getSummaryOverride()
-  {
-    return $this->summaryOverride;
-  }
-  public function setTimeZone($timeZone)
-  {
-    $this->timeZone = $timeZone;
-  }
-  public function getTimeZone()
-  {
-    return $this->timeZone;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Calendar/CalendarListEntryNotificationSettings.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Calendar/CalendarListEntryNotificationSettings.php
deleted file mode 100644
index 06a9130d..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Calendar/CalendarListEntryNotificationSettings.php
+++ /dev/null
@@ -1,32 +0,0 @@
-notifications = $notifications;
-  }
-  public function getNotifications()
-  {
-    return $this->notifications;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Calendar/CalendarNotification.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Calendar/CalendarNotification.php
deleted file mode 100644
index 7afe4dc9..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Calendar/CalendarNotification.php
+++ /dev/null
@@ -1,39 +0,0 @@
-method = $method;
-  }
-  public function getMethod()
-  {
-    return $this->method;
-  }
-  public function setType($type)
-  {
-    $this->type = $type;
-  }
-  public function getType()
-  {
-    return $this->type;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Calendar/Channel.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Calendar/Channel.php
deleted file mode 100644
index cbf151c5..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Calendar/Channel.php
+++ /dev/null
@@ -1,111 +0,0 @@
-address = $address;
-  }
-  public function getAddress()
-  {
-    return $this->address;
-  }
-  public function setExpiration($expiration)
-  {
-    $this->expiration = $expiration;
-  }
-  public function getExpiration()
-  {
-    return $this->expiration;
-  }
-  public function setId($id)
-  {
-    $this->id = $id;
-  }
-  public function getId()
-  {
-    return $this->id;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setParams($params)
-  {
-    $this->params = $params;
-  }
-  public function getParams()
-  {
-    return $this->params;
-  }
-  public function setPayload($payload)
-  {
-    $this->payload = $payload;
-  }
-  public function getPayload()
-  {
-    return $this->payload;
-  }
-  public function setResourceId($resourceId)
-  {
-    $this->resourceId = $resourceId;
-  }
-  public function getResourceId()
-  {
-    return $this->resourceId;
-  }
-  public function setResourceUri($resourceUri)
-  {
-    $this->resourceUri = $resourceUri;
-  }
-  public function getResourceUri()
-  {
-    return $this->resourceUri;
-  }
-  public function setToken($token)
-  {
-    $this->token = $token;
-  }
-  public function getToken()
-  {
-    return $this->token;
-  }
-  public function setType($type)
-  {
-    $this->type = $type;
-  }
-  public function getType()
-  {
-    return $this->type;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Calendar/ColorDefinition.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Calendar/ColorDefinition.php
deleted file mode 100644
index f42fd3b5..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Calendar/ColorDefinition.php
+++ /dev/null
@@ -1,39 +0,0 @@
-background = $background;
-  }
-  public function getBackground()
-  {
-    return $this->background;
-  }
-  public function setForeground($foreground)
-  {
-    $this->foreground = $foreground;
-  }
-  public function getForeground()
-  {
-    return $this->foreground;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Calendar/Colors.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Calendar/Colors.php
deleted file mode 100644
index 1e330ab7..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Calendar/Colors.php
+++ /dev/null
@@ -1,59 +0,0 @@
-calendar = $calendar;
-  }
-  public function getCalendar()
-  {
-    return $this->calendar;
-  }
-  public function setEvent($event)
-  {
-    $this->event = $event;
-  }
-  public function getEvent()
-  {
-    return $this->event;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setUpdated($updated)
-  {
-    $this->updated = $updated;
-  }
-  public function getUpdated()
-  {
-    return $this->updated;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Calendar/Error.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Calendar/Error.php
deleted file mode 100644
index 22d09b72..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Calendar/Error.php
+++ /dev/null
@@ -1,39 +0,0 @@
-domain = $domain;
-  }
-  public function getDomain()
-  {
-    return $this->domain;
-  }
-  public function setReason($reason)
-  {
-    $this->reason = $reason;
-  }
-  public function getReason()
-  {
-    return $this->reason;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Calendar/Event.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Calendar/Event.php
deleted file mode 100644
index 2d0a00c1..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Calendar/Event.php
+++ /dev/null
@@ -1,366 +0,0 @@
-anyoneCanAddSelf = $anyoneCanAddSelf;
-  }
-  public function getAnyoneCanAddSelf()
-  {
-    return $this->anyoneCanAddSelf;
-  }
-  public function setAttachments($attachments)
-  {
-    $this->attachments = $attachments;
-  }
-  public function getAttachments()
-  {
-    return $this->attachments;
-  }
-  public function setAttendees($attendees)
-  {
-    $this->attendees = $attendees;
-  }
-  public function getAttendees()
-  {
-    return $this->attendees;
-  }
-  public function setAttendeesOmitted($attendeesOmitted)
-  {
-    $this->attendeesOmitted = $attendeesOmitted;
-  }
-  public function getAttendeesOmitted()
-  {
-    return $this->attendeesOmitted;
-  }
-  public function setColorId($colorId)
-  {
-    $this->colorId = $colorId;
-  }
-  public function getColorId()
-  {
-    return $this->colorId;
-  }
-  public function setCreated($created)
-  {
-    $this->created = $created;
-  }
-  public function getCreated()
-  {
-    return $this->created;
-  }
-  public function setCreator(Google_Service_Calendar_EventCreator $creator)
-  {
-    $this->creator = $creator;
-  }
-  public function getCreator()
-  {
-    return $this->creator;
-  }
-  public function setDescription($description)
-  {
-    $this->description = $description;
-  }
-  public function getDescription()
-  {
-    return $this->description;
-  }
-  public function setEnd(Google_Service_Calendar_EventDateTime $end)
-  {
-    $this->end = $end;
-  }
-  public function getEnd()
-  {
-    return $this->end;
-  }
-  public function setEndTimeUnspecified($endTimeUnspecified)
-  {
-    $this->endTimeUnspecified = $endTimeUnspecified;
-  }
-  public function getEndTimeUnspecified()
-  {
-    return $this->endTimeUnspecified;
-  }
-  public function setEtag($etag)
-  {
-    $this->etag = $etag;
-  }
-  public function getEtag()
-  {
-    return $this->etag;
-  }
-  public function setExtendedProperties(Google_Service_Calendar_EventExtendedProperties $extendedProperties)
-  {
-    $this->extendedProperties = $extendedProperties;
-  }
-  public function getExtendedProperties()
-  {
-    return $this->extendedProperties;
-  }
-  public function setGadget(Google_Service_Calendar_EventGadget $gadget)
-  {
-    $this->gadget = $gadget;
-  }
-  public function getGadget()
-  {
-    return $this->gadget;
-  }
-  public function setGuestsCanInviteOthers($guestsCanInviteOthers)
-  {
-    $this->guestsCanInviteOthers = $guestsCanInviteOthers;
-  }
-  public function getGuestsCanInviteOthers()
-  {
-    return $this->guestsCanInviteOthers;
-  }
-  public function setGuestsCanModify($guestsCanModify)
-  {
-    $this->guestsCanModify = $guestsCanModify;
-  }
-  public function getGuestsCanModify()
-  {
-    return $this->guestsCanModify;
-  }
-  public function setGuestsCanSeeOtherGuests($guestsCanSeeOtherGuests)
-  {
-    $this->guestsCanSeeOtherGuests = $guestsCanSeeOtherGuests;
-  }
-  public function getGuestsCanSeeOtherGuests()
-  {
-    return $this->guestsCanSeeOtherGuests;
-  }
-  public function setHangoutLink($hangoutLink)
-  {
-    $this->hangoutLink = $hangoutLink;
-  }
-  public function getHangoutLink()
-  {
-    return $this->hangoutLink;
-  }
-  public function setHtmlLink($htmlLink)
-  {
-    $this->htmlLink = $htmlLink;
-  }
-  public function getHtmlLink()
-  {
-    return $this->htmlLink;
-  }
-  public function setICalUID($iCalUID)
-  {
-    $this->iCalUID = $iCalUID;
-  }
-  public function getICalUID()
-  {
-    return $this->iCalUID;
-  }
-  public function setId($id)
-  {
-    $this->id = $id;
-  }
-  public function getId()
-  {
-    return $this->id;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setLocation($location)
-  {
-    $this->location = $location;
-  }
-  public function getLocation()
-  {
-    return $this->location;
-  }
-  public function setLocked($locked)
-  {
-    $this->locked = $locked;
-  }
-  public function getLocked()
-  {
-    return $this->locked;
-  }
-  public function setOrganizer(Google_Service_Calendar_EventOrganizer $organizer)
-  {
-    $this->organizer = $organizer;
-  }
-  public function getOrganizer()
-  {
-    return $this->organizer;
-  }
-  public function setOriginalStartTime(Google_Service_Calendar_EventDateTime $originalStartTime)
-  {
-    $this->originalStartTime = $originalStartTime;
-  }
-  public function getOriginalStartTime()
-  {
-    return $this->originalStartTime;
-  }
-  public function setPrivateCopy($privateCopy)
-  {
-    $this->privateCopy = $privateCopy;
-  }
-  public function getPrivateCopy()
-  {
-    return $this->privateCopy;
-  }
-  public function setRecurrence($recurrence)
-  {
-    $this->recurrence = $recurrence;
-  }
-  public function getRecurrence()
-  {
-    return $this->recurrence;
-  }
-  public function setRecurringEventId($recurringEventId)
-  {
-    $this->recurringEventId = $recurringEventId;
-  }
-  public function getRecurringEventId()
-  {
-    return $this->recurringEventId;
-  }
-  public function setReminders(Google_Service_Calendar_EventReminders $reminders)
-  {
-    $this->reminders = $reminders;
-  }
-  public function getReminders()
-  {
-    return $this->reminders;
-  }
-  public function setSequence($sequence)
-  {
-    $this->sequence = $sequence;
-  }
-  public function getSequence()
-  {
-    return $this->sequence;
-  }
-  public function setSource(Google_Service_Calendar_EventSource $source)
-  {
-    $this->source = $source;
-  }
-  public function getSource()
-  {
-    return $this->source;
-  }
-  public function setStart(Google_Service_Calendar_EventDateTime $start)
-  {
-    $this->start = $start;
-  }
-  public function getStart()
-  {
-    return $this->start;
-  }
-  public function setStatus($status)
-  {
-    $this->status = $status;
-  }
-  public function getStatus()
-  {
-    return $this->status;
-  }
-  public function setSummary($summary)
-  {
-    $this->summary = $summary;
-  }
-  public function getSummary()
-  {
-    return $this->summary;
-  }
-  public function setTransparency($transparency)
-  {
-    $this->transparency = $transparency;
-  }
-  public function getTransparency()
-  {
-    return $this->transparency;
-  }
-  public function setUpdated($updated)
-  {
-    $this->updated = $updated;
-  }
-  public function getUpdated()
-  {
-    return $this->updated;
-  }
-  public function setVisibility($visibility)
-  {
-    $this->visibility = $visibility;
-  }
-  public function getVisibility()
-  {
-    return $this->visibility;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Calendar/EventAttachment.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Calendar/EventAttachment.php
deleted file mode 100644
index 8f3d6e24..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Calendar/EventAttachment.php
+++ /dev/null
@@ -1,66 +0,0 @@
-fileId = $fileId;
-  }
-  public function getFileId()
-  {
-    return $this->fileId;
-  }
-  public function setFileUrl($fileUrl)
-  {
-    $this->fileUrl = $fileUrl;
-  }
-  public function getFileUrl()
-  {
-    return $this->fileUrl;
-  }
-  public function setIconLink($iconLink)
-  {
-    $this->iconLink = $iconLink;
-  }
-  public function getIconLink()
-  {
-    return $this->iconLink;
-  }
-  public function setMimeType($mimeType)
-  {
-    $this->mimeType = $mimeType;
-  }
-  public function getMimeType()
-  {
-    return $this->mimeType;
-  }
-  public function setTitle($title)
-  {
-    $this->title = $title;
-  }
-  public function getTitle()
-  {
-    return $this->title;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Calendar/EventAttendee.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Calendar/EventAttendee.php
deleted file mode 100644
index 78572b03..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Calendar/EventAttendee.php
+++ /dev/null
@@ -1,111 +0,0 @@
-additionalGuests = $additionalGuests;
-  }
-  public function getAdditionalGuests()
-  {
-    return $this->additionalGuests;
-  }
-  public function setComment($comment)
-  {
-    $this->comment = $comment;
-  }
-  public function getComment()
-  {
-    return $this->comment;
-  }
-  public function setDisplayName($displayName)
-  {
-    $this->displayName = $displayName;
-  }
-  public function getDisplayName()
-  {
-    return $this->displayName;
-  }
-  public function setEmail($email)
-  {
-    $this->email = $email;
-  }
-  public function getEmail()
-  {
-    return $this->email;
-  }
-  public function setId($id)
-  {
-    $this->id = $id;
-  }
-  public function getId()
-  {
-    return $this->id;
-  }
-  public function setOptional($optional)
-  {
-    $this->optional = $optional;
-  }
-  public function getOptional()
-  {
-    return $this->optional;
-  }
-  public function setOrganizer($organizer)
-  {
-    $this->organizer = $organizer;
-  }
-  public function getOrganizer()
-  {
-    return $this->organizer;
-  }
-  public function setResource($resource)
-  {
-    $this->resource = $resource;
-  }
-  public function getResource()
-  {
-    return $this->resource;
-  }
-  public function setResponseStatus($responseStatus)
-  {
-    $this->responseStatus = $responseStatus;
-  }
-  public function getResponseStatus()
-  {
-    return $this->responseStatus;
-  }
-  public function setSelf($self)
-  {
-    $this->self = $self;
-  }
-  public function getSelf()
-  {
-    return $this->self;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Calendar/EventCreator.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Calendar/EventCreator.php
deleted file mode 100644
index 5ab38f69..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Calendar/EventCreator.php
+++ /dev/null
@@ -1,57 +0,0 @@
-displayName = $displayName;
-  }
-  public function getDisplayName()
-  {
-    return $this->displayName;
-  }
-  public function setEmail($email)
-  {
-    $this->email = $email;
-  }
-  public function getEmail()
-  {
-    return $this->email;
-  }
-  public function setId($id)
-  {
-    $this->id = $id;
-  }
-  public function getId()
-  {
-    return $this->id;
-  }
-  public function setSelf($self)
-  {
-    $this->self = $self;
-  }
-  public function getSelf()
-  {
-    return $this->self;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Calendar/EventDateTime.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Calendar/EventDateTime.php
deleted file mode 100644
index f47a3772..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Calendar/EventDateTime.php
+++ /dev/null
@@ -1,48 +0,0 @@
-date = $date;
-  }
-  public function getDate()
-  {
-    return $this->date;
-  }
-  public function setDateTime($dateTime)
-  {
-    $this->dateTime = $dateTime;
-  }
-  public function getDateTime()
-  {
-    return $this->dateTime;
-  }
-  public function setTimeZone($timeZone)
-  {
-    $this->timeZone = $timeZone;
-  }
-  public function getTimeZone()
-  {
-    return $this->timeZone;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Calendar/EventExtendedProperties.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Calendar/EventExtendedProperties.php
deleted file mode 100644
index 7efb26d0..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Calendar/EventExtendedProperties.php
+++ /dev/null
@@ -1,39 +0,0 @@
-private = $private;
-  }
-  public function getPrivate()
-  {
-    return $this->private;
-  }
-  public function setShared($shared)
-  {
-    $this->shared = $shared;
-  }
-  public function getShared()
-  {
-    return $this->shared;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Calendar/EventGadget.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Calendar/EventGadget.php
deleted file mode 100644
index 78844e5f..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Calendar/EventGadget.php
+++ /dev/null
@@ -1,93 +0,0 @@
-display = $display;
-  }
-  public function getDisplay()
-  {
-    return $this->display;
-  }
-  public function setHeight($height)
-  {
-    $this->height = $height;
-  }
-  public function getHeight()
-  {
-    return $this->height;
-  }
-  public function setIconLink($iconLink)
-  {
-    $this->iconLink = $iconLink;
-  }
-  public function getIconLink()
-  {
-    return $this->iconLink;
-  }
-  public function setLink($link)
-  {
-    $this->link = $link;
-  }
-  public function getLink()
-  {
-    return $this->link;
-  }
-  public function setPreferences($preferences)
-  {
-    $this->preferences = $preferences;
-  }
-  public function getPreferences()
-  {
-    return $this->preferences;
-  }
-  public function setTitle($title)
-  {
-    $this->title = $title;
-  }
-  public function getTitle()
-  {
-    return $this->title;
-  }
-  public function setType($type)
-  {
-    $this->type = $type;
-  }
-  public function getType()
-  {
-    return $this->type;
-  }
-  public function setWidth($width)
-  {
-    $this->width = $width;
-  }
-  public function getWidth()
-  {
-    return $this->width;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Calendar/EventOrganizer.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Calendar/EventOrganizer.php
deleted file mode 100644
index 5f3a658b..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Calendar/EventOrganizer.php
+++ /dev/null
@@ -1,57 +0,0 @@
-displayName = $displayName;
-  }
-  public function getDisplayName()
-  {
-    return $this->displayName;
-  }
-  public function setEmail($email)
-  {
-    $this->email = $email;
-  }
-  public function getEmail()
-  {
-    return $this->email;
-  }
-  public function setId($id)
-  {
-    $this->id = $id;
-  }
-  public function getId()
-  {
-    return $this->id;
-  }
-  public function setSelf($self)
-  {
-    $this->self = $self;
-  }
-  public function getSelf()
-  {
-    return $this->self;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Calendar/EventReminder.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Calendar/EventReminder.php
deleted file mode 100644
index 3ad8c1ff..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Calendar/EventReminder.php
+++ /dev/null
@@ -1,39 +0,0 @@
-method = $method;
-  }
-  public function getMethod()
-  {
-    return $this->method;
-  }
-  public function setMinutes($minutes)
-  {
-    $this->minutes = $minutes;
-  }
-  public function getMinutes()
-  {
-    return $this->minutes;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Calendar/EventReminders.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Calendar/EventReminders.php
deleted file mode 100644
index d2f4c2a1..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Calendar/EventReminders.php
+++ /dev/null
@@ -1,41 +0,0 @@
-overrides = $overrides;
-  }
-  public function getOverrides()
-  {
-    return $this->overrides;
-  }
-  public function setUseDefault($useDefault)
-  {
-    $this->useDefault = $useDefault;
-  }
-  public function getUseDefault()
-  {
-    return $this->useDefault;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Calendar/EventSource.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Calendar/EventSource.php
deleted file mode 100644
index f209c172..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Calendar/EventSource.php
+++ /dev/null
@@ -1,39 +0,0 @@
-title = $title;
-  }
-  public function getTitle()
-  {
-    return $this->title;
-  }
-  public function setUrl($url)
-  {
-    $this->url = $url;
-  }
-  public function getUrl()
-  {
-    return $this->url;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Calendar/Events.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Calendar/Events.php
deleted file mode 100644
index ee9e5be2..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Calendar/Events.php
+++ /dev/null
@@ -1,123 +0,0 @@
-accessRole = $accessRole;
-  }
-  public function getAccessRole()
-  {
-    return $this->accessRole;
-  }
-  public function setDefaultReminders($defaultReminders)
-  {
-    $this->defaultReminders = $defaultReminders;
-  }
-  public function getDefaultReminders()
-  {
-    return $this->defaultReminders;
-  }
-  public function setDescription($description)
-  {
-    $this->description = $description;
-  }
-  public function getDescription()
-  {
-    return $this->description;
-  }
-  public function setEtag($etag)
-  {
-    $this->etag = $etag;
-  }
-  public function getEtag()
-  {
-    return $this->etag;
-  }
-  public function setItems($items)
-  {
-    $this->items = $items;
-  }
-  public function getItems()
-  {
-    return $this->items;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setNextPageToken($nextPageToken)
-  {
-    $this->nextPageToken = $nextPageToken;
-  }
-  public function getNextPageToken()
-  {
-    return $this->nextPageToken;
-  }
-  public function setNextSyncToken($nextSyncToken)
-  {
-    $this->nextSyncToken = $nextSyncToken;
-  }
-  public function getNextSyncToken()
-  {
-    return $this->nextSyncToken;
-  }
-  public function setSummary($summary)
-  {
-    $this->summary = $summary;
-  }
-  public function getSummary()
-  {
-    return $this->summary;
-  }
-  public function setTimeZone($timeZone)
-  {
-    $this->timeZone = $timeZone;
-  }
-  public function getTimeZone()
-  {
-    return $this->timeZone;
-  }
-  public function setUpdated($updated)
-  {
-    $this->updated = $updated;
-  }
-  public function getUpdated()
-  {
-    return $this->updated;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Calendar/FreeBusyCalendar.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Calendar/FreeBusyCalendar.php
deleted file mode 100644
index 6fe872eb..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Calendar/FreeBusyCalendar.php
+++ /dev/null
@@ -1,42 +0,0 @@
-busy = $busy;
-  }
-  public function getBusy()
-  {
-    return $this->busy;
-  }
-  public function setErrors($errors)
-  {
-    $this->errors = $errors;
-  }
-  public function getErrors()
-  {
-    return $this->errors;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Calendar/FreeBusyGroup.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Calendar/FreeBusyGroup.php
deleted file mode 100644
index b1f95ea8..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Calendar/FreeBusyGroup.php
+++ /dev/null
@@ -1,41 +0,0 @@
-calendars = $calendars;
-  }
-  public function getCalendars()
-  {
-    return $this->calendars;
-  }
-  public function setErrors($errors)
-  {
-    $this->errors = $errors;
-  }
-  public function getErrors()
-  {
-    return $this->errors;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Calendar/FreeBusyRequest.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Calendar/FreeBusyRequest.php
deleted file mode 100644
index c0ffd291..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Calendar/FreeBusyRequest.php
+++ /dev/null
@@ -1,77 +0,0 @@
-calendarExpansionMax = $calendarExpansionMax;
-  }
-  public function getCalendarExpansionMax()
-  {
-    return $this->calendarExpansionMax;
-  }
-  public function setGroupExpansionMax($groupExpansionMax)
-  {
-    $this->groupExpansionMax = $groupExpansionMax;
-  }
-  public function getGroupExpansionMax()
-  {
-    return $this->groupExpansionMax;
-  }
-  public function setItems($items)
-  {
-    $this->items = $items;
-  }
-  public function getItems()
-  {
-    return $this->items;
-  }
-  public function setTimeMax($timeMax)
-  {
-    $this->timeMax = $timeMax;
-  }
-  public function getTimeMax()
-  {
-    return $this->timeMax;
-  }
-  public function setTimeMin($timeMin)
-  {
-    $this->timeMin = $timeMin;
-  }
-  public function getTimeMin()
-  {
-    return $this->timeMin;
-  }
-  public function setTimeZone($timeZone)
-  {
-    $this->timeZone = $timeZone;
-  }
-  public function getTimeZone()
-  {
-    return $this->timeZone;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Calendar/FreeBusyRequestItem.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Calendar/FreeBusyRequestItem.php
deleted file mode 100644
index f67c9eb2..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Calendar/FreeBusyRequestItem.php
+++ /dev/null
@@ -1,30 +0,0 @@
-id = $id;
-  }
-  public function getId()
-  {
-    return $this->id;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Calendar/FreeBusyResponse.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Calendar/FreeBusyResponse.php
deleted file mode 100644
index cfa74d8d..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Calendar/FreeBusyResponse.php
+++ /dev/null
@@ -1,68 +0,0 @@
-calendars = $calendars;
-  }
-  public function getCalendars()
-  {
-    return $this->calendars;
-  }
-  public function setGroups($groups)
-  {
-    $this->groups = $groups;
-  }
-  public function getGroups()
-  {
-    return $this->groups;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setTimeMax($timeMax)
-  {
-    $this->timeMax = $timeMax;
-  }
-  public function getTimeMax()
-  {
-    return $this->timeMax;
-  }
-  public function setTimeMin($timeMin)
-  {
-    $this->timeMin = $timeMin;
-  }
-  public function getTimeMin()
-  {
-    return $this->timeMin;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Calendar/Resource/Acl.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Calendar/Resource/Acl.php
deleted file mode 100644
index 3d1b6650..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Calendar/Resource/Acl.php
+++ /dev/null
@@ -1,177 +0,0 @@
-
- *   $calendarService = new Google_Service_Calendar(...);
- *   $acl = $calendarService->acl;
- *  
- */
-class Google_Service_Calendar_Resource_Acl extends Google_Service_Resource
-{
-  /**
-   * Deletes an access control rule. (acl.delete)
-   *
-   * @param string $calendarId Calendar identifier. To retrieve calendar IDs call
-   * the calendarList.list method. If you want to access the primary calendar of
-   * the currently logged in user, use the "primary" keyword.
-   * @param string $ruleId ACL rule identifier.
-   * @param array $optParams Optional parameters.
-   */
-  public function delete($calendarId, $ruleId, $optParams = array())
-  {
-    $params = array('calendarId' => $calendarId, 'ruleId' => $ruleId);
-    $params = array_merge($params, $optParams);
-    return $this->call('delete', array($params));
-  }
-  /**
-   * Returns an access control rule. (acl.get)
-   *
-   * @param string $calendarId Calendar identifier. To retrieve calendar IDs call
-   * the calendarList.list method. If you want to access the primary calendar of
-   * the currently logged in user, use the "primary" keyword.
-   * @param string $ruleId ACL rule identifier.
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Calendar_AclRule
-   */
-  public function get($calendarId, $ruleId, $optParams = array())
-  {
-    $params = array('calendarId' => $calendarId, 'ruleId' => $ruleId);
-    $params = array_merge($params, $optParams);
-    return $this->call('get', array($params), "Google_Service_Calendar_AclRule");
-  }
-  /**
-   * Creates an access control rule. (acl.insert)
-   *
-   * @param string $calendarId Calendar identifier. To retrieve calendar IDs call
-   * the calendarList.list method. If you want to access the primary calendar of
-   * the currently logged in user, use the "primary" keyword.
-   * @param Google_Service_Calendar_AclRule $postBody
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Calendar_AclRule
-   */
-  public function insert($calendarId, Google_Service_Calendar_AclRule $postBody, $optParams = array())
-  {
-    $params = array('calendarId' => $calendarId, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('insert', array($params), "Google_Service_Calendar_AclRule");
-  }
-  /**
-   * Returns the rules in the access control list for the calendar. (acl.listAcl)
-   *
-   * @param string $calendarId Calendar identifier. To retrieve calendar IDs call
-   * the calendarList.list method. If you want to access the primary calendar of
-   * the currently logged in user, use the "primary" keyword.
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param int maxResults Maximum number of entries returned on one result
-   * page. By default the value is 100 entries. The page size can never be larger
-   * than 250 entries. Optional.
-   * @opt_param string pageToken Token specifying which result page to return.
-   * Optional.
-   * @opt_param bool showDeleted Whether to include deleted ACLs in the result.
-   * Deleted ACLs are represented by role equal to "none". Deleted ACLs will
-   * always be included if syncToken is provided. Optional. The default is False.
-   * @opt_param string syncToken Token obtained from the nextSyncToken field
-   * returned on the last page of results from the previous list request. It makes
-   * the result of this list request contain only entries that have changed since
-   * then. All entries deleted since the previous list request will always be in
-   * the result set and it is not allowed to set showDeleted to False. If the
-   * syncToken expires, the server will respond with a 410 GONE response code and
-   * the client should clear its storage and perform a full synchronization
-   * without any syncToken. Learn more about incremental synchronization.
-   * Optional. The default is to return all entries.
-   * @return Google_Service_Calendar_Acl
-   */
-  public function listAcl($calendarId, $optParams = array())
-  {
-    $params = array('calendarId' => $calendarId);
-    $params = array_merge($params, $optParams);
-    return $this->call('list', array($params), "Google_Service_Calendar_Acl");
-  }
-  /**
-   * Updates an access control rule. This method supports patch semantics.
-   * (acl.patch)
-   *
-   * @param string $calendarId Calendar identifier. To retrieve calendar IDs call
-   * the calendarList.list method. If you want to access the primary calendar of
-   * the currently logged in user, use the "primary" keyword.
-   * @param string $ruleId ACL rule identifier.
-   * @param Google_Service_Calendar_AclRule $postBody
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Calendar_AclRule
-   */
-  public function patch($calendarId, $ruleId, Google_Service_Calendar_AclRule $postBody, $optParams = array())
-  {
-    $params = array('calendarId' => $calendarId, 'ruleId' => $ruleId, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('patch', array($params), "Google_Service_Calendar_AclRule");
-  }
-  /**
-   * Updates an access control rule. (acl.update)
-   *
-   * @param string $calendarId Calendar identifier. To retrieve calendar IDs call
-   * the calendarList.list method. If you want to access the primary calendar of
-   * the currently logged in user, use the "primary" keyword.
-   * @param string $ruleId ACL rule identifier.
-   * @param Google_Service_Calendar_AclRule $postBody
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Calendar_AclRule
-   */
-  public function update($calendarId, $ruleId, Google_Service_Calendar_AclRule $postBody, $optParams = array())
-  {
-    $params = array('calendarId' => $calendarId, 'ruleId' => $ruleId, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('update', array($params), "Google_Service_Calendar_AclRule");
-  }
-  /**
-   * Watch for changes to ACL resources. (acl.watch)
-   *
-   * @param string $calendarId Calendar identifier. To retrieve calendar IDs call
-   * the calendarList.list method. If you want to access the primary calendar of
-   * the currently logged in user, use the "primary" keyword.
-   * @param Google_Service_Calendar_Channel $postBody
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param int maxResults Maximum number of entries returned on one result
-   * page. By default the value is 100 entries. The page size can never be larger
-   * than 250 entries. Optional.
-   * @opt_param string pageToken Token specifying which result page to return.
-   * Optional.
-   * @opt_param bool showDeleted Whether to include deleted ACLs in the result.
-   * Deleted ACLs are represented by role equal to "none". Deleted ACLs will
-   * always be included if syncToken is provided. Optional. The default is False.
-   * @opt_param string syncToken Token obtained from the nextSyncToken field
-   * returned on the last page of results from the previous list request. It makes
-   * the result of this list request contain only entries that have changed since
-   * then. All entries deleted since the previous list request will always be in
-   * the result set and it is not allowed to set showDeleted to False. If the
-   * syncToken expires, the server will respond with a 410 GONE response code and
-   * the client should clear its storage and perform a full synchronization
-   * without any syncToken. Learn more about incremental synchronization.
-   * Optional. The default is to return all entries.
-   * @return Google_Service_Calendar_Channel
-   */
-  public function watch($calendarId, Google_Service_Calendar_Channel $postBody, $optParams = array())
-  {
-    $params = array('calendarId' => $calendarId, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('watch', array($params), "Google_Service_Calendar_Channel");
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Calendar/Resource/CalendarList.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Calendar/Resource/CalendarList.php
deleted file mode 100644
index 751b2b1a..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Calendar/Resource/CalendarList.php
+++ /dev/null
@@ -1,191 +0,0 @@
-
- *   $calendarService = new Google_Service_Calendar(...);
- *   $calendarList = $calendarService->calendarList;
- *  
- */
-class Google_Service_Calendar_Resource_CalendarList extends Google_Service_Resource
-{
-  /**
-   * Deletes an entry on the user's calendar list. (calendarList.delete)
-   *
-   * @param string $calendarId Calendar identifier. To retrieve calendar IDs call
-   * the calendarList.list method. If you want to access the primary calendar of
-   * the currently logged in user, use the "primary" keyword.
-   * @param array $optParams Optional parameters.
-   */
-  public function delete($calendarId, $optParams = array())
-  {
-    $params = array('calendarId' => $calendarId);
-    $params = array_merge($params, $optParams);
-    return $this->call('delete', array($params));
-  }
-  /**
-   * Returns an entry on the user's calendar list. (calendarList.get)
-   *
-   * @param string $calendarId Calendar identifier. To retrieve calendar IDs call
-   * the calendarList.list method. If you want to access the primary calendar of
-   * the currently logged in user, use the "primary" keyword.
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Calendar_CalendarListEntry
-   */
-  public function get($calendarId, $optParams = array())
-  {
-    $params = array('calendarId' => $calendarId);
-    $params = array_merge($params, $optParams);
-    return $this->call('get', array($params), "Google_Service_Calendar_CalendarListEntry");
-  }
-  /**
-   * Adds an entry to the user's calendar list. (calendarList.insert)
-   *
-   * @param Google_Service_Calendar_CalendarListEntry $postBody
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param bool colorRgbFormat Whether to use the foregroundColor and
-   * backgroundColor fields to write the calendar colors (RGB). If this feature is
-   * used, the index-based colorId field will be set to the best matching option
-   * automatically. Optional. The default is False.
-   * @return Google_Service_Calendar_CalendarListEntry
-   */
-  public function insert(Google_Service_Calendar_CalendarListEntry $postBody, $optParams = array())
-  {
-    $params = array('postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('insert', array($params), "Google_Service_Calendar_CalendarListEntry");
-  }
-  /**
-   * Returns entries on the user's calendar list. (calendarList.listCalendarList)
-   *
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param int maxResults Maximum number of entries returned on one result
-   * page. By default the value is 100 entries. The page size can never be larger
-   * than 250 entries. Optional.
-   * @opt_param string minAccessRole The minimum access role for the user in the
-   * returned entries. Optional. The default is no restriction.
-   * @opt_param string pageToken Token specifying which result page to return.
-   * Optional.
-   * @opt_param bool showDeleted Whether to include deleted calendar list entries
-   * in the result. Optional. The default is False.
-   * @opt_param bool showHidden Whether to show hidden entries. Optional. The
-   * default is False.
-   * @opt_param string syncToken Token obtained from the nextSyncToken field
-   * returned on the last page of results from the previous list request. It makes
-   * the result of this list request contain only entries that have changed since
-   * then. If only read-only fields such as calendar properties or ACLs have
-   * changed, the entry won't be returned. All entries deleted and hidden since
-   * the previous list request will always be in the result set and it is not
-   * allowed to set showDeleted neither showHidden to False. To ensure client
-   * state consistency minAccessRole query parameter cannot be specified together
-   * with nextSyncToken. If the syncToken expires, the server will respond with a
-   * 410 GONE response code and the client should clear its storage and perform a
-   * full synchronization without any syncToken. Learn more about incremental
-   * synchronization. Optional. The default is to return all entries.
-   * @return Google_Service_Calendar_CalendarList
-   */
-  public function listCalendarList($optParams = array())
-  {
-    $params = array();
-    $params = array_merge($params, $optParams);
-    return $this->call('list', array($params), "Google_Service_Calendar_CalendarList");
-  }
-  /**
-   * Updates an entry on the user's calendar list. This method supports patch
-   * semantics. (calendarList.patch)
-   *
-   * @param string $calendarId Calendar identifier. To retrieve calendar IDs call
-   * the calendarList.list method. If you want to access the primary calendar of
-   * the currently logged in user, use the "primary" keyword.
-   * @param Google_Service_Calendar_CalendarListEntry $postBody
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param bool colorRgbFormat Whether to use the foregroundColor and
-   * backgroundColor fields to write the calendar colors (RGB). If this feature is
-   * used, the index-based colorId field will be set to the best matching option
-   * automatically. Optional. The default is False.
-   * @return Google_Service_Calendar_CalendarListEntry
-   */
-  public function patch($calendarId, Google_Service_Calendar_CalendarListEntry $postBody, $optParams = array())
-  {
-    $params = array('calendarId' => $calendarId, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('patch', array($params), "Google_Service_Calendar_CalendarListEntry");
-  }
-  /**
-   * Updates an entry on the user's calendar list. (calendarList.update)
-   *
-   * @param string $calendarId Calendar identifier. To retrieve calendar IDs call
-   * the calendarList.list method. If you want to access the primary calendar of
-   * the currently logged in user, use the "primary" keyword.
-   * @param Google_Service_Calendar_CalendarListEntry $postBody
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param bool colorRgbFormat Whether to use the foregroundColor and
-   * backgroundColor fields to write the calendar colors (RGB). If this feature is
-   * used, the index-based colorId field will be set to the best matching option
-   * automatically. Optional. The default is False.
-   * @return Google_Service_Calendar_CalendarListEntry
-   */
-  public function update($calendarId, Google_Service_Calendar_CalendarListEntry $postBody, $optParams = array())
-  {
-    $params = array('calendarId' => $calendarId, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('update', array($params), "Google_Service_Calendar_CalendarListEntry");
-  }
-  /**
-   * Watch for changes to CalendarList resources. (calendarList.watch)
-   *
-   * @param Google_Service_Calendar_Channel $postBody
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param int maxResults Maximum number of entries returned on one result
-   * page. By default the value is 100 entries. The page size can never be larger
-   * than 250 entries. Optional.
-   * @opt_param string minAccessRole The minimum access role for the user in the
-   * returned entries. Optional. The default is no restriction.
-   * @opt_param string pageToken Token specifying which result page to return.
-   * Optional.
-   * @opt_param bool showDeleted Whether to include deleted calendar list entries
-   * in the result. Optional. The default is False.
-   * @opt_param bool showHidden Whether to show hidden entries. Optional. The
-   * default is False.
-   * @opt_param string syncToken Token obtained from the nextSyncToken field
-   * returned on the last page of results from the previous list request. It makes
-   * the result of this list request contain only entries that have changed since
-   * then. If only read-only fields such as calendar properties or ACLs have
-   * changed, the entry won't be returned. All entries deleted and hidden since
-   * the previous list request will always be in the result set and it is not
-   * allowed to set showDeleted neither showHidden to False. To ensure client
-   * state consistency minAccessRole query parameter cannot be specified together
-   * with nextSyncToken. If the syncToken expires, the server will respond with a
-   * 410 GONE response code and the client should clear its storage and perform a
-   * full synchronization without any syncToken. Learn more about incremental
-   * synchronization. Optional. The default is to return all entries.
-   * @return Google_Service_Calendar_Channel
-   */
-  public function watch(Google_Service_Calendar_Channel $postBody, $optParams = array())
-  {
-    $params = array('postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('watch', array($params), "Google_Service_Calendar_Channel");
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Calendar/Resource/Calendars.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Calendar/Resource/Calendars.php
deleted file mode 100644
index 9471e9b7..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Calendar/Resource/Calendars.php
+++ /dev/null
@@ -1,119 +0,0 @@
-
- *   $calendarService = new Google_Service_Calendar(...);
- *   $calendars = $calendarService->calendars;
- *  
- */
-class Google_Service_Calendar_Resource_Calendars extends Google_Service_Resource
-{
-  /**
-   * Clears a primary calendar. This operation deletes all events associated with
-   * the primary calendar of an account. (calendars.clear)
-   *
-   * @param string $calendarId Calendar identifier. To retrieve calendar IDs call
-   * the calendarList.list method. If you want to access the primary calendar of
-   * the currently logged in user, use the "primary" keyword.
-   * @param array $optParams Optional parameters.
-   */
-  public function clear($calendarId, $optParams = array())
-  {
-    $params = array('calendarId' => $calendarId);
-    $params = array_merge($params, $optParams);
-    return $this->call('clear', array($params));
-  }
-  /**
-   * Deletes a secondary calendar. Use calendars.clear for clearing all events on
-   * primary calendars. (calendars.delete)
-   *
-   * @param string $calendarId Calendar identifier. To retrieve calendar IDs call
-   * the calendarList.list method. If you want to access the primary calendar of
-   * the currently logged in user, use the "primary" keyword.
-   * @param array $optParams Optional parameters.
-   */
-  public function delete($calendarId, $optParams = array())
-  {
-    $params = array('calendarId' => $calendarId);
-    $params = array_merge($params, $optParams);
-    return $this->call('delete', array($params));
-  }
-  /**
-   * Returns metadata for a calendar. (calendars.get)
-   *
-   * @param string $calendarId Calendar identifier. To retrieve calendar IDs call
-   * the calendarList.list method. If you want to access the primary calendar of
-   * the currently logged in user, use the "primary" keyword.
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Calendar_Calendar
-   */
-  public function get($calendarId, $optParams = array())
-  {
-    $params = array('calendarId' => $calendarId);
-    $params = array_merge($params, $optParams);
-    return $this->call('get', array($params), "Google_Service_Calendar_Calendar");
-  }
-  /**
-   * Creates a secondary calendar. (calendars.insert)
-   *
-   * @param Google_Service_Calendar_Calendar $postBody
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Calendar_Calendar
-   */
-  public function insert(Google_Service_Calendar_Calendar $postBody, $optParams = array())
-  {
-    $params = array('postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('insert', array($params), "Google_Service_Calendar_Calendar");
-  }
-  /**
-   * Updates metadata for a calendar. This method supports patch semantics.
-   * (calendars.patch)
-   *
-   * @param string $calendarId Calendar identifier. To retrieve calendar IDs call
-   * the calendarList.list method. If you want to access the primary calendar of
-   * the currently logged in user, use the "primary" keyword.
-   * @param Google_Service_Calendar_Calendar $postBody
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Calendar_Calendar
-   */
-  public function patch($calendarId, Google_Service_Calendar_Calendar $postBody, $optParams = array())
-  {
-    $params = array('calendarId' => $calendarId, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('patch', array($params), "Google_Service_Calendar_Calendar");
-  }
-  /**
-   * Updates metadata for a calendar. (calendars.update)
-   *
-   * @param string $calendarId Calendar identifier. To retrieve calendar IDs call
-   * the calendarList.list method. If you want to access the primary calendar of
-   * the currently logged in user, use the "primary" keyword.
-   * @param Google_Service_Calendar_Calendar $postBody
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Calendar_Calendar
-   */
-  public function update($calendarId, Google_Service_Calendar_Calendar $postBody, $optParams = array())
-  {
-    $params = array('calendarId' => $calendarId, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('update', array($params), "Google_Service_Calendar_Calendar");
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Calendar/Resource/Channels.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Calendar/Resource/Channels.php
deleted file mode 100644
index 35254316..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Calendar/Resource/Channels.php
+++ /dev/null
@@ -1,40 +0,0 @@
-
- *   $calendarService = new Google_Service_Calendar(...);
- *   $channels = $calendarService->channels;
- *  
- */
-class Google_Service_Calendar_Resource_Channels extends Google_Service_Resource
-{
-  /**
-   * Stop watching resources through this channel (channels.stop)
-   *
-   * @param Google_Service_Calendar_Channel $postBody
-   * @param array $optParams Optional parameters.
-   */
-  public function stop(Google_Service_Calendar_Channel $postBody, $optParams = array())
-  {
-    $params = array('postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('stop', array($params));
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Calendar/Resource/Colors.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Calendar/Resource/Colors.php
deleted file mode 100644
index 4d281a04..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Calendar/Resource/Colors.php
+++ /dev/null
@@ -1,40 +0,0 @@
-
- *   $calendarService = new Google_Service_Calendar(...);
- *   $colors = $calendarService->colors;
- *  
- */
-class Google_Service_Calendar_Resource_Colors extends Google_Service_Resource
-{
-  /**
-   * Returns the color definitions for calendars and events. (colors.get)
-   *
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Calendar_Colors
-   */
-  public function get($optParams = array())
-  {
-    $params = array();
-    $params = array_merge($params, $optParams);
-    return $this->call('get', array($params), "Google_Service_Calendar_Colors");
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Calendar/Resource/Events.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Calendar/Resource/Events.php
deleted file mode 100644
index 53c89ce6..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Calendar/Resource/Events.php
+++ /dev/null
@@ -1,440 +0,0 @@
-
- *   $calendarService = new Google_Service_Calendar(...);
- *   $events = $calendarService->events;
- *  
- */
-class Google_Service_Calendar_Resource_Events extends Google_Service_Resource
-{
-  /**
-   * Deletes an event. (events.delete)
-   *
-   * @param string $calendarId Calendar identifier. To retrieve calendar IDs call
-   * the calendarList.list method. If you want to access the primary calendar of
-   * the currently logged in user, use the "primary" keyword.
-   * @param string $eventId Event identifier.
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param bool sendNotifications Whether to send notifications about the
-   * deletion of the event. Optional. The default is False.
-   */
-  public function delete($calendarId, $eventId, $optParams = array())
-  {
-    $params = array('calendarId' => $calendarId, 'eventId' => $eventId);
-    $params = array_merge($params, $optParams);
-    return $this->call('delete', array($params));
-  }
-  /**
-   * Returns an event. (events.get)
-   *
-   * @param string $calendarId Calendar identifier. To retrieve calendar IDs call
-   * the calendarList.list method. If you want to access the primary calendar of
-   * the currently logged in user, use the "primary" keyword.
-   * @param string $eventId Event identifier.
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param bool alwaysIncludeEmail Whether to always include a value in the
-   * email field for the organizer, creator and attendees, even if no real email
-   * is available (i.e. a generated, non-working value will be provided). The use
-   * of this option is discouraged and should only be used by clients which cannot
-   * handle the absence of an email address value in the mentioned places.
-   * Optional. The default is False.
-   * @opt_param int maxAttendees The maximum number of attendees to include in the
-   * response. If there are more than the specified number of attendees, only the
-   * participant is returned. Optional.
-   * @opt_param string timeZone Time zone used in the response. Optional. The
-   * default is the time zone of the calendar.
-   * @return Google_Service_Calendar_Event
-   */
-  public function get($calendarId, $eventId, $optParams = array())
-  {
-    $params = array('calendarId' => $calendarId, 'eventId' => $eventId);
-    $params = array_merge($params, $optParams);
-    return $this->call('get', array($params), "Google_Service_Calendar_Event");
-  }
-  /**
-   * Imports an event. This operation is used to add a private copy of an existing
-   * event to a calendar. (events.import)
-   *
-   * @param string $calendarId Calendar identifier. To retrieve calendar IDs call
-   * the calendarList.list method. If you want to access the primary calendar of
-   * the currently logged in user, use the "primary" keyword.
-   * @param Google_Service_Calendar_Event $postBody
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param bool supportsAttachments Whether API client performing operation
-   * supports event attachments. Optional. The default is False.
-   * @return Google_Service_Calendar_Event
-   */
-  public function import($calendarId, Google_Service_Calendar_Event $postBody, $optParams = array())
-  {
-    $params = array('calendarId' => $calendarId, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('import', array($params), "Google_Service_Calendar_Event");
-  }
-  /**
-   * Creates an event. (events.insert)
-   *
-   * @param string $calendarId Calendar identifier. To retrieve calendar IDs call
-   * the calendarList.list method. If you want to access the primary calendar of
-   * the currently logged in user, use the "primary" keyword.
-   * @param Google_Service_Calendar_Event $postBody
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param int maxAttendees The maximum number of attendees to include in the
-   * response. If there are more than the specified number of attendees, only the
-   * participant is returned. Optional.
-   * @opt_param bool sendNotifications Whether to send notifications about the
-   * creation of the new event. Optional. The default is False.
-   * @opt_param bool supportsAttachments Whether API client performing operation
-   * supports event attachments. Optional. The default is False.
-   * @return Google_Service_Calendar_Event
-   */
-  public function insert($calendarId, Google_Service_Calendar_Event $postBody, $optParams = array())
-  {
-    $params = array('calendarId' => $calendarId, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('insert', array($params), "Google_Service_Calendar_Event");
-  }
-  /**
-   * Returns instances of the specified recurring event. (events.instances)
-   *
-   * @param string $calendarId Calendar identifier. To retrieve calendar IDs call
-   * the calendarList.list method. If you want to access the primary calendar of
-   * the currently logged in user, use the "primary" keyword.
-   * @param string $eventId Recurring event identifier.
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param bool alwaysIncludeEmail Whether to always include a value in the
-   * email field for the organizer, creator and attendees, even if no real email
-   * is available (i.e. a generated, non-working value will be provided). The use
-   * of this option is discouraged and should only be used by clients which cannot
-   * handle the absence of an email address value in the mentioned places.
-   * Optional. The default is False.
-   * @opt_param int maxAttendees The maximum number of attendees to include in the
-   * response. If there are more than the specified number of attendees, only the
-   * participant is returned. Optional.
-   * @opt_param int maxResults Maximum number of events returned on one result
-   * page. By default the value is 250 events. The page size can never be larger
-   * than 2500 events. Optional.
-   * @opt_param string originalStart The original start time of the instance in
-   * the result. Optional.
-   * @opt_param string pageToken Token specifying which result page to return.
-   * Optional.
-   * @opt_param bool showDeleted Whether to include deleted events (with status
-   * equals "cancelled") in the result. Cancelled instances of recurring events
-   * will still be included if singleEvents is False. Optional. The default is
-   * False.
-   * @opt_param string timeMax Upper bound (exclusive) for an event's start time
-   * to filter by. Optional. The default is not to filter by start time. Must be
-   * an RFC3339 timestamp with mandatory time zone offset.
-   * @opt_param string timeMin Lower bound (inclusive) for an event's end time to
-   * filter by. Optional. The default is not to filter by end time. Must be an
-   * RFC3339 timestamp with mandatory time zone offset.
-   * @opt_param string timeZone Time zone used in the response. Optional. The
-   * default is the time zone of the calendar.
-   * @return Google_Service_Calendar_Events
-   */
-  public function instances($calendarId, $eventId, $optParams = array())
-  {
-    $params = array('calendarId' => $calendarId, 'eventId' => $eventId);
-    $params = array_merge($params, $optParams);
-    return $this->call('instances', array($params), "Google_Service_Calendar_Events");
-  }
-  /**
-   * Returns events on the specified calendar. (events.listEvents)
-   *
-   * @param string $calendarId Calendar identifier. To retrieve calendar IDs call
-   * the calendarList.list method. If you want to access the primary calendar of
-   * the currently logged in user, use the "primary" keyword.
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param bool alwaysIncludeEmail Whether to always include a value in the
-   * email field for the organizer, creator and attendees, even if no real email
-   * is available (i.e. a generated, non-working value will be provided). The use
-   * of this option is discouraged and should only be used by clients which cannot
-   * handle the absence of an email address value in the mentioned places.
-   * Optional. The default is False.
-   * @opt_param string iCalUID Specifies event ID in the iCalendar format to be
-   * included in the response. Optional.
-   * @opt_param int maxAttendees The maximum number of attendees to include in the
-   * response. If there are more than the specified number of attendees, only the
-   * participant is returned. Optional.
-   * @opt_param int maxResults Maximum number of events returned on one result
-   * page. By default the value is 250 events. The page size can never be larger
-   * than 2500 events. Optional.
-   * @opt_param string orderBy The order of the events returned in the result.
-   * Optional. The default is an unspecified, stable order.
-   * @opt_param string pageToken Token specifying which result page to return.
-   * Optional.
-   * @opt_param string privateExtendedProperty Extended properties constraint
-   * specified as propertyName=value. Matches only private properties. This
-   * parameter might be repeated multiple times to return events that match all
-   * given constraints.
-   * @opt_param string q Free text search terms to find events that match these
-   * terms in any field, except for extended properties. Optional.
-   * @opt_param string sharedExtendedProperty Extended properties constraint
-   * specified as propertyName=value. Matches only shared properties. This
-   * parameter might be repeated multiple times to return events that match all
-   * given constraints.
-   * @opt_param bool showDeleted Whether to include deleted events (with status
-   * equals "cancelled") in the result. Cancelled instances of recurring events
-   * (but not the underlying recurring event) will still be included if
-   * showDeleted and singleEvents are both False. If showDeleted and singleEvents
-   * are both True, only single instances of deleted events (but not the
-   * underlying recurring events) are returned. Optional. The default is False.
-   * @opt_param bool showHiddenInvitations Whether to include hidden invitations
-   * in the result. Optional. The default is False.
-   * @opt_param bool singleEvents Whether to expand recurring events into
-   * instances and only return single one-off events and instances of recurring
-   * events, but not the underlying recurring events themselves. Optional. The
-   * default is False.
-   * @opt_param string syncToken Token obtained from the nextSyncToken field
-   * returned on the last page of results from the previous list request. It makes
-   * the result of this list request contain only entries that have changed since
-   * then. All events deleted since the previous list request will always be in
-   * the result set and it is not allowed to set showDeleted to False. There are
-   * several query parameters that cannot be specified together with nextSyncToken
-   * to ensure consistency of the client state.
-   *
-   * These are:  - iCalUID  - orderBy  - privateExtendedProperty  - q  -
-   * sharedExtendedProperty  - timeMin  - timeMax  - updatedMin If the syncToken
-   * expires, the server will respond with a 410 GONE response code and the client
-   * should clear its storage and perform a full synchronization without any
-   * syncToken. Learn more about incremental synchronization. Optional. The
-   * default is to return all entries.
-   * @opt_param string timeMax Upper bound (exclusive) for an event's start time
-   * to filter by. Optional. The default is not to filter by start time. Must be
-   * an RFC3339 timestamp with mandatory time zone offset, e.g.,
-   * 2011-06-03T10:00:00-07:00, 2011-06-03T10:00:00Z. Milliseconds may be provided
-   * but will be ignored.
-   * @opt_param string timeMin Lower bound (inclusive) for an event's end time to
-   * filter by. Optional. The default is not to filter by end time. Must be an
-   * RFC3339 timestamp with mandatory time zone offset, e.g.,
-   * 2011-06-03T10:00:00-07:00, 2011-06-03T10:00:00Z. Milliseconds may be provided
-   * but will be ignored.
-   * @opt_param string timeZone Time zone used in the response. Optional. The
-   * default is the time zone of the calendar.
-   * @opt_param string updatedMin Lower bound for an event's last modification
-   * time (as a RFC3339 timestamp) to filter by. When specified, entries deleted
-   * since this time will always be included regardless of showDeleted. Optional.
-   * The default is not to filter by last modification time.
-   * @return Google_Service_Calendar_Events
-   */
-  public function listEvents($calendarId, $optParams = array())
-  {
-    $params = array('calendarId' => $calendarId);
-    $params = array_merge($params, $optParams);
-    return $this->call('list', array($params), "Google_Service_Calendar_Events");
-  }
-  /**
-   * Moves an event to another calendar, i.e. changes an event's organizer.
-   * (events.move)
-   *
-   * @param string $calendarId Calendar identifier of the source calendar where
-   * the event currently is on.
-   * @param string $eventId Event identifier.
-   * @param string $destination Calendar identifier of the target calendar where
-   * the event is to be moved to.
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param bool sendNotifications Whether to send notifications about the
-   * change of the event's organizer. Optional. The default is False.
-   * @return Google_Service_Calendar_Event
-   */
-  public function move($calendarId, $eventId, $destination, $optParams = array())
-  {
-    $params = array('calendarId' => $calendarId, 'eventId' => $eventId, 'destination' => $destination);
-    $params = array_merge($params, $optParams);
-    return $this->call('move', array($params), "Google_Service_Calendar_Event");
-  }
-  /**
-   * Updates an event. This method supports patch semantics. (events.patch)
-   *
-   * @param string $calendarId Calendar identifier. To retrieve calendar IDs call
-   * the calendarList.list method. If you want to access the primary calendar of
-   * the currently logged in user, use the "primary" keyword.
-   * @param string $eventId Event identifier.
-   * @param Google_Service_Calendar_Event $postBody
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param bool alwaysIncludeEmail Whether to always include a value in the
-   * email field for the organizer, creator and attendees, even if no real email
-   * is available (i.e. a generated, non-working value will be provided). The use
-   * of this option is discouraged and should only be used by clients which cannot
-   * handle the absence of an email address value in the mentioned places.
-   * Optional. The default is False.
-   * @opt_param int maxAttendees The maximum number of attendees to include in the
-   * response. If there are more than the specified number of attendees, only the
-   * participant is returned. Optional.
-   * @opt_param bool sendNotifications Whether to send notifications about the
-   * event update (e.g. attendee's responses, title changes, etc.). Optional. The
-   * default is False.
-   * @opt_param bool supportsAttachments Whether API client performing operation
-   * supports event attachments. Optional. The default is False.
-   * @return Google_Service_Calendar_Event
-   */
-  public function patch($calendarId, $eventId, Google_Service_Calendar_Event $postBody, $optParams = array())
-  {
-    $params = array('calendarId' => $calendarId, 'eventId' => $eventId, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('patch', array($params), "Google_Service_Calendar_Event");
-  }
-  /**
-   * Creates an event based on a simple text string. (events.quickAdd)
-   *
-   * @param string $calendarId Calendar identifier. To retrieve calendar IDs call
-   * the calendarList.list method. If you want to access the primary calendar of
-   * the currently logged in user, use the "primary" keyword.
-   * @param string $text The text describing the event to be created.
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param bool sendNotifications Whether to send notifications about the
-   * creation of the event. Optional. The default is False.
-   * @return Google_Service_Calendar_Event
-   */
-  public function quickAdd($calendarId, $text, $optParams = array())
-  {
-    $params = array('calendarId' => $calendarId, 'text' => $text);
-    $params = array_merge($params, $optParams);
-    return $this->call('quickAdd', array($params), "Google_Service_Calendar_Event");
-  }
-  /**
-   * Updates an event. (events.update)
-   *
-   * @param string $calendarId Calendar identifier. To retrieve calendar IDs call
-   * the calendarList.list method. If you want to access the primary calendar of
-   * the currently logged in user, use the "primary" keyword.
-   * @param string $eventId Event identifier.
-   * @param Google_Service_Calendar_Event $postBody
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param bool alwaysIncludeEmail Whether to always include a value in the
-   * email field for the organizer, creator and attendees, even if no real email
-   * is available (i.e. a generated, non-working value will be provided). The use
-   * of this option is discouraged and should only be used by clients which cannot
-   * handle the absence of an email address value in the mentioned places.
-   * Optional. The default is False.
-   * @opt_param int maxAttendees The maximum number of attendees to include in the
-   * response. If there are more than the specified number of attendees, only the
-   * participant is returned. Optional.
-   * @opt_param bool sendNotifications Whether to send notifications about the
-   * event update (e.g. attendee's responses, title changes, etc.). Optional. The
-   * default is False.
-   * @opt_param bool supportsAttachments Whether API client performing operation
-   * supports event attachments. Optional. The default is False.
-   * @return Google_Service_Calendar_Event
-   */
-  public function update($calendarId, $eventId, Google_Service_Calendar_Event $postBody, $optParams = array())
-  {
-    $params = array('calendarId' => $calendarId, 'eventId' => $eventId, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('update', array($params), "Google_Service_Calendar_Event");
-  }
-  /**
-   * Watch for changes to Events resources. (events.watch)
-   *
-   * @param string $calendarId Calendar identifier. To retrieve calendar IDs call
-   * the calendarList.list method. If you want to access the primary calendar of
-   * the currently logged in user, use the "primary" keyword.
-   * @param Google_Service_Calendar_Channel $postBody
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param bool alwaysIncludeEmail Whether to always include a value in the
-   * email field for the organizer, creator and attendees, even if no real email
-   * is available (i.e. a generated, non-working value will be provided). The use
-   * of this option is discouraged and should only be used by clients which cannot
-   * handle the absence of an email address value in the mentioned places.
-   * Optional. The default is False.
-   * @opt_param string iCalUID Specifies event ID in the iCalendar format to be
-   * included in the response. Optional.
-   * @opt_param int maxAttendees The maximum number of attendees to include in the
-   * response. If there are more than the specified number of attendees, only the
-   * participant is returned. Optional.
-   * @opt_param int maxResults Maximum number of events returned on one result
-   * page. By default the value is 250 events. The page size can never be larger
-   * than 2500 events. Optional.
-   * @opt_param string orderBy The order of the events returned in the result.
-   * Optional. The default is an unspecified, stable order.
-   * @opt_param string pageToken Token specifying which result page to return.
-   * Optional.
-   * @opt_param string privateExtendedProperty Extended properties constraint
-   * specified as propertyName=value. Matches only private properties. This
-   * parameter might be repeated multiple times to return events that match all
-   * given constraints.
-   * @opt_param string q Free text search terms to find events that match these
-   * terms in any field, except for extended properties. Optional.
-   * @opt_param string sharedExtendedProperty Extended properties constraint
-   * specified as propertyName=value. Matches only shared properties. This
-   * parameter might be repeated multiple times to return events that match all
-   * given constraints.
-   * @opt_param bool showDeleted Whether to include deleted events (with status
-   * equals "cancelled") in the result. Cancelled instances of recurring events
-   * (but not the underlying recurring event) will still be included if
-   * showDeleted and singleEvents are both False. If showDeleted and singleEvents
-   * are both True, only single instances of deleted events (but not the
-   * underlying recurring events) are returned. Optional. The default is False.
-   * @opt_param bool showHiddenInvitations Whether to include hidden invitations
-   * in the result. Optional. The default is False.
-   * @opt_param bool singleEvents Whether to expand recurring events into
-   * instances and only return single one-off events and instances of recurring
-   * events, but not the underlying recurring events themselves. Optional. The
-   * default is False.
-   * @opt_param string syncToken Token obtained from the nextSyncToken field
-   * returned on the last page of results from the previous list request. It makes
-   * the result of this list request contain only entries that have changed since
-   * then. All events deleted since the previous list request will always be in
-   * the result set and it is not allowed to set showDeleted to False. There are
-   * several query parameters that cannot be specified together with nextSyncToken
-   * to ensure consistency of the client state.
-   *
-   * These are:  - iCalUID  - orderBy  - privateExtendedProperty  - q  -
-   * sharedExtendedProperty  - timeMin  - timeMax  - updatedMin If the syncToken
-   * expires, the server will respond with a 410 GONE response code and the client
-   * should clear its storage and perform a full synchronization without any
-   * syncToken. Learn more about incremental synchronization. Optional. The
-   * default is to return all entries.
-   * @opt_param string timeMax Upper bound (exclusive) for an event's start time
-   * to filter by. Optional. The default is not to filter by start time. Must be
-   * an RFC3339 timestamp with mandatory time zone offset, e.g.,
-   * 2011-06-03T10:00:00-07:00, 2011-06-03T10:00:00Z. Milliseconds may be provided
-   * but will be ignored.
-   * @opt_param string timeMin Lower bound (inclusive) for an event's end time to
-   * filter by. Optional. The default is not to filter by end time. Must be an
-   * RFC3339 timestamp with mandatory time zone offset, e.g.,
-   * 2011-06-03T10:00:00-07:00, 2011-06-03T10:00:00Z. Milliseconds may be provided
-   * but will be ignored.
-   * @opt_param string timeZone Time zone used in the response. Optional. The
-   * default is the time zone of the calendar.
-   * @opt_param string updatedMin Lower bound for an event's last modification
-   * time (as a RFC3339 timestamp) to filter by. When specified, entries deleted
-   * since this time will always be included regardless of showDeleted. Optional.
-   * The default is not to filter by last modification time.
-   * @return Google_Service_Calendar_Channel
-   */
-  public function watch($calendarId, Google_Service_Calendar_Channel $postBody, $optParams = array())
-  {
-    $params = array('calendarId' => $calendarId, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('watch', array($params), "Google_Service_Calendar_Channel");
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Calendar/Resource/Freebusy.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Calendar/Resource/Freebusy.php
deleted file mode 100644
index 76791c78..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Calendar/Resource/Freebusy.php
+++ /dev/null
@@ -1,41 +0,0 @@
-
- *   $calendarService = new Google_Service_Calendar(...);
- *   $freebusy = $calendarService->freebusy;
- *  
- */
-class Google_Service_Calendar_Resource_Freebusy extends Google_Service_Resource
-{
-  /**
-   * Returns free/busy information for a set of calendars. (freebusy.query)
-   *
-   * @param Google_Service_Calendar_FreeBusyRequest $postBody
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Calendar_FreeBusyResponse
-   */
-  public function query(Google_Service_Calendar_FreeBusyRequest $postBody, $optParams = array())
-  {
-    $params = array('postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('query', array($params), "Google_Service_Calendar_FreeBusyResponse");
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Calendar/Resource/Settings.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Calendar/Resource/Settings.php
deleted file mode 100644
index 1b2a9370..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Calendar/Resource/Settings.php
+++ /dev/null
@@ -1,92 +0,0 @@
-
- *   $calendarService = new Google_Service_Calendar(...);
- *   $settings = $calendarService->settings;
- *  
- */
-class Google_Service_Calendar_Resource_Settings extends Google_Service_Resource
-{
-  /**
-   * Returns a single user setting. (settings.get)
-   *
-   * @param string $setting The id of the user setting.
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Calendar_Setting
-   */
-  public function get($setting, $optParams = array())
-  {
-    $params = array('setting' => $setting);
-    $params = array_merge($params, $optParams);
-    return $this->call('get', array($params), "Google_Service_Calendar_Setting");
-  }
-  /**
-   * Returns all user settings for the authenticated user. (settings.listSettings)
-   *
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param int maxResults Maximum number of entries returned on one result
-   * page. By default the value is 100 entries. The page size can never be larger
-   * than 250 entries. Optional.
-   * @opt_param string pageToken Token specifying which result page to return.
-   * Optional.
-   * @opt_param string syncToken Token obtained from the nextSyncToken field
-   * returned on the last page of results from the previous list request. It makes
-   * the result of this list request contain only entries that have changed since
-   * then. If the syncToken expires, the server will respond with a 410 GONE
-   * response code and the client should clear its storage and perform a full
-   * synchronization without any syncToken. Learn more about incremental
-   * synchronization. Optional. The default is to return all entries.
-   * @return Google_Service_Calendar_Settings
-   */
-  public function listSettings($optParams = array())
-  {
-    $params = array();
-    $params = array_merge($params, $optParams);
-    return $this->call('list', array($params), "Google_Service_Calendar_Settings");
-  }
-  /**
-   * Watch for changes to Settings resources. (settings.watch)
-   *
-   * @param Google_Service_Calendar_Channel $postBody
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param int maxResults Maximum number of entries returned on one result
-   * page. By default the value is 100 entries. The page size can never be larger
-   * than 250 entries. Optional.
-   * @opt_param string pageToken Token specifying which result page to return.
-   * Optional.
-   * @opt_param string syncToken Token obtained from the nextSyncToken field
-   * returned on the last page of results from the previous list request. It makes
-   * the result of this list request contain only entries that have changed since
-   * then. If the syncToken expires, the server will respond with a 410 GONE
-   * response code and the client should clear its storage and perform a full
-   * synchronization without any syncToken. Learn more about incremental
-   * synchronization. Optional. The default is to return all entries.
-   * @return Google_Service_Calendar_Channel
-   */
-  public function watch(Google_Service_Calendar_Channel $postBody, $optParams = array())
-  {
-    $params = array('postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('watch', array($params), "Google_Service_Calendar_Channel");
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Calendar/Setting.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Calendar/Setting.php
deleted file mode 100644
index 3e4ae0b9..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Calendar/Setting.php
+++ /dev/null
@@ -1,57 +0,0 @@
-etag = $etag;
-  }
-  public function getEtag()
-  {
-    return $this->etag;
-  }
-  public function setId($id)
-  {
-    $this->id = $id;
-  }
-  public function getId()
-  {
-    return $this->id;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setValue($value)
-  {
-    $this->value = $value;
-  }
-  public function getValue()
-  {
-    return $this->value;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Calendar/Settings.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Calendar/Settings.php
deleted file mode 100644
index fa0d9334..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Calendar/Settings.php
+++ /dev/null
@@ -1,68 +0,0 @@
-etag = $etag;
-  }
-  public function getEtag()
-  {
-    return $this->etag;
-  }
-  public function setItems($items)
-  {
-    $this->items = $items;
-  }
-  public function getItems()
-  {
-    return $this->items;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setNextPageToken($nextPageToken)
-  {
-    $this->nextPageToken = $nextPageToken;
-  }
-  public function getNextPageToken()
-  {
-    return $this->nextPageToken;
-  }
-  public function setNextSyncToken($nextSyncToken)
-  {
-    $this->nextSyncToken = $nextSyncToken;
-  }
-  public function getNextSyncToken()
-  {
-    return $this->nextSyncToken;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Calendar/TimePeriod.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Calendar/TimePeriod.php
deleted file mode 100644
index 91bda8a6..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Calendar/TimePeriod.php
+++ /dev/null
@@ -1,39 +0,0 @@
-end = $end;
-  }
-  public function getEnd()
-  {
-    return $this->end;
-  }
-  public function setStart($start)
-  {
-    $this->start = $start;
-  }
-  public function getStart()
-  {
-    return $this->start;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CivicInfo.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CivicInfo.php
deleted file mode 100644
index 8f9d7b8d..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CivicInfo.php
+++ /dev/null
@@ -1,166 +0,0 @@
-
- * Provides polling places, early vote locations, contest data, election
- * officials, and government representatives for U.S. residential addresses.

- *
- * 

- * For more information about this service, see the API
- * Documentation
- * 

- *
- * @author Google, Inc.
- */
-class Google_Service_CivicInfo extends Google_Service
-{
-
-
-  public $divisions;
-  public $elections;
-  public $representatives;
-  
-  /**
-   * Constructs the internal representation of the CivicInfo service.
-   *
-   * @param Google_Client $client
-   */
-  public function __construct(Google_Client $client)
-  {
-    parent::__construct($client);
-    $this->rootUrl = 'https://www.googleapis.com/';
-    $this->servicePath = 'civicinfo/v2/';
-    $this->version = 'v2';
-    $this->serviceName = 'civicinfo';
-
-    $this->divisions = new Google_Service_CivicInfo_Resource_Divisions(
-        $this,
-        $this->serviceName,
-        'divisions',
-        array(
-          'methods' => array(
-            'search' => array(
-              'path' => 'divisions',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'query' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-              ),
-            ),
-          )
-        )
-    );
-    $this->elections = new Google_Service_CivicInfo_Resource_Elections(
-        $this,
-        $this->serviceName,
-        'elections',
-        array(
-          'methods' => array(
-            'electionQuery' => array(
-              'path' => 'elections',
-              'httpMethod' => 'GET',
-              'parameters' => array(),
-            ),'voterInfoQuery' => array(
-              'path' => 'voterinfo',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'address' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'electionId' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'officialOnly' => array(
-                  'location' => 'query',
-                  'type' => 'boolean',
-                ),
-                'returnAllAvailableData' => array(
-                  'location' => 'query',
-                  'type' => 'boolean',
-                ),
-              ),
-            ),
-          )
-        )
-    );
-    $this->representatives = new Google_Service_CivicInfo_Resource_Representatives(
-        $this,
-        $this->serviceName,
-        'representatives',
-        array(
-          'methods' => array(
-            'representativeInfoByAddress' => array(
-              'path' => 'representatives',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'address' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'includeOffices' => array(
-                  'location' => 'query',
-                  'type' => 'boolean',
-                ),
-                'levels' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                  'repeated' => true,
-                ),
-                'roles' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                  'repeated' => true,
-                ),
-              ),
-            ),'representativeInfoByDivision' => array(
-              'path' => 'representatives/{ocdId}',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'ocdId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'levels' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                  'repeated' => true,
-                ),
-                'recursive' => array(
-                  'location' => 'query',
-                  'type' => 'boolean',
-                ),
-                'roles' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                  'repeated' => true,
-                ),
-              ),
-            ),
-          )
-        )
-    );
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CivicInfo/AdministrationRegion.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CivicInfo/AdministrationRegion.php
deleted file mode 100644
index ca275283..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CivicInfo/AdministrationRegion.php
+++ /dev/null
@@ -1,73 +0,0 @@
- "local_jurisdiction",
-  );
-  protected $electionAdministrationBodyType = 'Google_Service_CivicInfo_AdministrativeBody';
-  protected $electionAdministrationBodyDataType = '';
-  public $id;
-  protected $localJurisdictionType = 'Google_Service_CivicInfo_AdministrationRegion';
-  protected $localJurisdictionDataType = '';
-  public $name;
-  protected $sourcesType = 'Google_Service_CivicInfo_Source';
-  protected $sourcesDataType = 'array';
-
-  public function setElectionAdministrationBody(Google_Service_CivicInfo_AdministrativeBody $electionAdministrationBody)
-  {
-    $this->electionAdministrationBody = $electionAdministrationBody;
-  }
-  public function getElectionAdministrationBody()
-  {
-    return $this->electionAdministrationBody;
-  }
-  public function setId($id)
-  {
-    $this->id = $id;
-  }
-  public function getId()
-  {
-    return $this->id;
-  }
-  public function setLocalJurisdiction(Google_Service_CivicInfo_AdministrationRegion $localJurisdiction)
-  {
-    $this->localJurisdiction = $localJurisdiction;
-  }
-  public function getLocalJurisdiction()
-  {
-    return $this->localJurisdiction;
-  }
-  public function setName($name)
-  {
-    $this->name = $name;
-  }
-  public function getName()
-  {
-    return $this->name;
-  }
-  public function setSources($sources)
-  {
-    $this->sources = $sources;
-  }
-  public function getSources()
-  {
-    return $this->sources;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CivicInfo/AdministrativeBody.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CivicInfo/AdministrativeBody.php
deleted file mode 100644
index 60c3a4a0..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CivicInfo/AdministrativeBody.php
+++ /dev/null
@@ -1,154 +0,0 @@
- "voter_services",
-  );
-  public $absenteeVotingInfoUrl;
-  public $addressLines;
-  public $ballotInfoUrl;
-  protected $correspondenceAddressType = 'Google_Service_CivicInfo_SimpleAddressType';
-  protected $correspondenceAddressDataType = '';
-  public $electionInfoUrl;
-  protected $electionOfficialsType = 'Google_Service_CivicInfo_ElectionOfficial';
-  protected $electionOfficialsDataType = 'array';
-  public $electionRegistrationConfirmationUrl;
-  public $electionRegistrationUrl;
-  public $electionRulesUrl;
-  public $hoursOfOperation;
-  public $name;
-  protected $physicalAddressType = 'Google_Service_CivicInfo_SimpleAddressType';
-  protected $physicalAddressDataType = '';
-  public $voterServices;
-  public $votingLocationFinderUrl;
-
-  public function setAbsenteeVotingInfoUrl($absenteeVotingInfoUrl)
-  {
-    $this->absenteeVotingInfoUrl = $absenteeVotingInfoUrl;
-  }
-  public function getAbsenteeVotingInfoUrl()
-  {
-    return $this->absenteeVotingInfoUrl;
-  }
-  public function setAddressLines($addressLines)
-  {
-    $this->addressLines = $addressLines;
-  }
-  public function getAddressLines()
-  {
-    return $this->addressLines;
-  }
-  public function setBallotInfoUrl($ballotInfoUrl)
-  {
-    $this->ballotInfoUrl = $ballotInfoUrl;
-  }
-  public function getBallotInfoUrl()
-  {
-    return $this->ballotInfoUrl;
-  }
-  public function setCorrespondenceAddress(Google_Service_CivicInfo_SimpleAddressType $correspondenceAddress)
-  {
-    $this->correspondenceAddress = $correspondenceAddress;
-  }
-  public function getCorrespondenceAddress()
-  {
-    return $this->correspondenceAddress;
-  }
-  public function setElectionInfoUrl($electionInfoUrl)
-  {
-    $this->electionInfoUrl = $electionInfoUrl;
-  }
-  public function getElectionInfoUrl()
-  {
-    return $this->electionInfoUrl;
-  }
-  public function setElectionOfficials($electionOfficials)
-  {
-    $this->electionOfficials = $electionOfficials;
-  }
-  public function getElectionOfficials()
-  {
-    return $this->electionOfficials;
-  }
-  public function setElectionRegistrationConfirmationUrl($electionRegistrationConfirmationUrl)
-  {
-    $this->electionRegistrationConfirmationUrl = $electionRegistrationConfirmationUrl;
-  }
-  public function getElectionRegistrationConfirmationUrl()
-  {
-    return $this->electionRegistrationConfirmationUrl;
-  }
-  public function setElectionRegistrationUrl($electionRegistrationUrl)
-  {
-    $this->electionRegistrationUrl = $electionRegistrationUrl;
-  }
-  public function getElectionRegistrationUrl()
-  {
-    return $this->electionRegistrationUrl;
-  }
-  public function setElectionRulesUrl($electionRulesUrl)
-  {
-    $this->electionRulesUrl = $electionRulesUrl;
-  }
-  public function getElectionRulesUrl()
-  {
-    return $this->electionRulesUrl;
-  }
-  public function setHoursOfOperation($hoursOfOperation)
-  {
-    $this->hoursOfOperation = $hoursOfOperation;
-  }
-  public function getHoursOfOperation()
-  {
-    return $this->hoursOfOperation;
-  }
-  public function setName($name)
-  {
-    $this->name = $name;
-  }
-  public function getName()
-  {
-    return $this->name;
-  }
-  public function setPhysicalAddress(Google_Service_CivicInfo_SimpleAddressType $physicalAddress)
-  {
-    $this->physicalAddress = $physicalAddress;
-  }
-  public function getPhysicalAddress()
-  {
-    return $this->physicalAddress;
-  }
-  public function setVoterServices($voterServices)
-  {
-    $this->voterServices = $voterServices;
-  }
-  public function getVoterServices()
-  {
-    return $this->voterServices;
-  }
-  public function setVotingLocationFinderUrl($votingLocationFinderUrl)
-  {
-    $this->votingLocationFinderUrl = $votingLocationFinderUrl;
-  }
-  public function getVotingLocationFinderUrl()
-  {
-    return $this->votingLocationFinderUrl;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CivicInfo/Candidate.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CivicInfo/Candidate.php
deleted file mode 100644
index 8f5ff7d3..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CivicInfo/Candidate.php
+++ /dev/null
@@ -1,95 +0,0 @@
-candidateUrl = $candidateUrl;
-  }
-  public function getCandidateUrl()
-  {
-    return $this->candidateUrl;
-  }
-  public function setChannels($channels)
-  {
-    $this->channels = $channels;
-  }
-  public function getChannels()
-  {
-    return $this->channels;
-  }
-  public function setEmail($email)
-  {
-    $this->email = $email;
-  }
-  public function getEmail()
-  {
-    return $this->email;
-  }
-  public function setName($name)
-  {
-    $this->name = $name;
-  }
-  public function getName()
-  {
-    return $this->name;
-  }
-  public function setOrderOnBallot($orderOnBallot)
-  {
-    $this->orderOnBallot = $orderOnBallot;
-  }
-  public function getOrderOnBallot()
-  {
-    return $this->orderOnBallot;
-  }
-  public function setParty($party)
-  {
-    $this->party = $party;
-  }
-  public function getParty()
-  {
-    return $this->party;
-  }
-  public function setPhone($phone)
-  {
-    $this->phone = $phone;
-  }
-  public function getPhone()
-  {
-    return $this->phone;
-  }
-  public function setPhotoUrl($photoUrl)
-  {
-    $this->photoUrl = $photoUrl;
-  }
-  public function getPhotoUrl()
-  {
-    return $this->photoUrl;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CivicInfo/Channel.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CivicInfo/Channel.php
deleted file mode 100644
index 3d4d6731..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CivicInfo/Channel.php
+++ /dev/null
@@ -1,39 +0,0 @@
-id = $id;
-  }
-  public function getId()
-  {
-    return $this->id;
-  }
-  public function setType($type)
-  {
-    $this->type = $type;
-  }
-  public function getType()
-  {
-    return $this->type;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CivicInfo/Contest.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CivicInfo/Contest.php
deleted file mode 100644
index c555ce04..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CivicInfo/Contest.php
+++ /dev/null
@@ -1,241 +0,0 @@
-ballotPlacement = $ballotPlacement;
-  }
-  public function getBallotPlacement()
-  {
-    return $this->ballotPlacement;
-  }
-  public function setCandidates($candidates)
-  {
-    $this->candidates = $candidates;
-  }
-  public function getCandidates()
-  {
-    return $this->candidates;
-  }
-  public function setDistrict(Google_Service_CivicInfo_ElectoralDistrict $district)
-  {
-    $this->district = $district;
-  }
-  public function getDistrict()
-  {
-    return $this->district;
-  }
-  public function setElectorateSpecifications($electorateSpecifications)
-  {
-    $this->electorateSpecifications = $electorateSpecifications;
-  }
-  public function getElectorateSpecifications()
-  {
-    return $this->electorateSpecifications;
-  }
-  public function setId($id)
-  {
-    $this->id = $id;
-  }
-  public function getId()
-  {
-    return $this->id;
-  }
-  public function setLevel($level)
-  {
-    $this->level = $level;
-  }
-  public function getLevel()
-  {
-    return $this->level;
-  }
-  public function setNumberElected($numberElected)
-  {
-    $this->numberElected = $numberElected;
-  }
-  public function getNumberElected()
-  {
-    return $this->numberElected;
-  }
-  public function setNumberVotingFor($numberVotingFor)
-  {
-    $this->numberVotingFor = $numberVotingFor;
-  }
-  public function getNumberVotingFor()
-  {
-    return $this->numberVotingFor;
-  }
-  public function setOffice($office)
-  {
-    $this->office = $office;
-  }
-  public function getOffice()
-  {
-    return $this->office;
-  }
-  public function setPrimaryParty($primaryParty)
-  {
-    $this->primaryParty = $primaryParty;
-  }
-  public function getPrimaryParty()
-  {
-    return $this->primaryParty;
-  }
-  public function setReferendumBallotResponses($referendumBallotResponses)
-  {
-    $this->referendumBallotResponses = $referendumBallotResponses;
-  }
-  public function getReferendumBallotResponses()
-  {
-    return $this->referendumBallotResponses;
-  }
-  public function setReferendumBrief($referendumBrief)
-  {
-    $this->referendumBrief = $referendumBrief;
-  }
-  public function getReferendumBrief()
-  {
-    return $this->referendumBrief;
-  }
-  public function setReferendumConStatement($referendumConStatement)
-  {
-    $this->referendumConStatement = $referendumConStatement;
-  }
-  public function getReferendumConStatement()
-  {
-    return $this->referendumConStatement;
-  }
-  public function setReferendumEffectOfAbstain($referendumEffectOfAbstain)
-  {
-    $this->referendumEffectOfAbstain = $referendumEffectOfAbstain;
-  }
-  public function getReferendumEffectOfAbstain()
-  {
-    return $this->referendumEffectOfAbstain;
-  }
-  public function setReferendumPassageThreshold($referendumPassageThreshold)
-  {
-    $this->referendumPassageThreshold = $referendumPassageThreshold;
-  }
-  public function getReferendumPassageThreshold()
-  {
-    return $this->referendumPassageThreshold;
-  }
-  public function setReferendumProStatement($referendumProStatement)
-  {
-    $this->referendumProStatement = $referendumProStatement;
-  }
-  public function getReferendumProStatement()
-  {
-    return $this->referendumProStatement;
-  }
-  public function setReferendumSubtitle($referendumSubtitle)
-  {
-    $this->referendumSubtitle = $referendumSubtitle;
-  }
-  public function getReferendumSubtitle()
-  {
-    return $this->referendumSubtitle;
-  }
-  public function setReferendumText($referendumText)
-  {
-    $this->referendumText = $referendumText;
-  }
-  public function getReferendumText()
-  {
-    return $this->referendumText;
-  }
-  public function setReferendumTitle($referendumTitle)
-  {
-    $this->referendumTitle = $referendumTitle;
-  }
-  public function getReferendumTitle()
-  {
-    return $this->referendumTitle;
-  }
-  public function setReferendumUrl($referendumUrl)
-  {
-    $this->referendumUrl = $referendumUrl;
-  }
-  public function getReferendumUrl()
-  {
-    return $this->referendumUrl;
-  }
-  public function setRoles($roles)
-  {
-    $this->roles = $roles;
-  }
-  public function getRoles()
-  {
-    return $this->roles;
-  }
-  public function setSources($sources)
-  {
-    $this->sources = $sources;
-  }
-  public function getSources()
-  {
-    return $this->sources;
-  }
-  public function setSpecial($special)
-  {
-    $this->special = $special;
-  }
-  public function getSpecial()
-  {
-    return $this->special;
-  }
-  public function setType($type)
-  {
-    $this->type = $type;
-  }
-  public function getType()
-  {
-    return $this->type;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CivicInfo/ContextParams.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CivicInfo/ContextParams.php
deleted file mode 100644
index e3ac07e0..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CivicInfo/ContextParams.php
+++ /dev/null
@@ -1,30 +0,0 @@
-clientProfile = $clientProfile;
-  }
-  public function getClientProfile()
-  {
-    return $this->clientProfile;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CivicInfo/DivisionRepresentativeInfoRequest.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CivicInfo/DivisionRepresentativeInfoRequest.php
deleted file mode 100644
index db9fe2d0..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CivicInfo/DivisionRepresentativeInfoRequest.php
+++ /dev/null
@@ -1,31 +0,0 @@
-contextParams = $contextParams;
-  }
-  public function getContextParams()
-  {
-    return $this->contextParams;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CivicInfo/DivisionSearchRequest.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CivicInfo/DivisionSearchRequest.php
deleted file mode 100644
index 60a04708..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CivicInfo/DivisionSearchRequest.php
+++ /dev/null
@@ -1,31 +0,0 @@
-contextParams = $contextParams;
-  }
-  public function getContextParams()
-  {
-    return $this->contextParams;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CivicInfo/DivisionSearchResponse.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CivicInfo/DivisionSearchResponse.php
deleted file mode 100644
index 8cee4cf9..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CivicInfo/DivisionSearchResponse.php
+++ /dev/null
@@ -1,41 +0,0 @@
-kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setResults($results)
-  {
-    $this->results = $results;
-  }
-  public function getResults()
-  {
-    return $this->results;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CivicInfo/DivisionSearchResult.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CivicInfo/DivisionSearchResult.php
deleted file mode 100644
index 390937ad..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CivicInfo/DivisionSearchResult.php
+++ /dev/null
@@ -1,49 +0,0 @@
-aliases = $aliases;
-  }
-  public function getAliases()
-  {
-    return $this->aliases;
-  }
-  public function setName($name)
-  {
-    $this->name = $name;
-  }
-  public function getName()
-  {
-    return $this->name;
-  }
-  public function setOcdId($ocdId)
-  {
-    $this->ocdId = $ocdId;
-  }
-  public function getOcdId()
-  {
-    return $this->ocdId;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CivicInfo/Election.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CivicInfo/Election.php
deleted file mode 100644
index aec7e7f8..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CivicInfo/Election.php
+++ /dev/null
@@ -1,57 +0,0 @@
-electionDay = $electionDay;
-  }
-  public function getElectionDay()
-  {
-    return $this->electionDay;
-  }
-  public function setId($id)
-  {
-    $this->id = $id;
-  }
-  public function getId()
-  {
-    return $this->id;
-  }
-  public function setName($name)
-  {
-    $this->name = $name;
-  }
-  public function getName()
-  {
-    return $this->name;
-  }
-  public function setOcdDivisionId($ocdDivisionId)
-  {
-    $this->ocdDivisionId = $ocdDivisionId;
-  }
-  public function getOcdDivisionId()
-  {
-    return $this->ocdDivisionId;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CivicInfo/ElectionOfficial.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CivicInfo/ElectionOfficial.php
deleted file mode 100644
index 228f6065..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CivicInfo/ElectionOfficial.php
+++ /dev/null
@@ -1,66 +0,0 @@
-emailAddress = $emailAddress;
-  }
-  public function getEmailAddress()
-  {
-    return $this->emailAddress;
-  }
-  public function setFaxNumber($faxNumber)
-  {
-    $this->faxNumber = $faxNumber;
-  }
-  public function getFaxNumber()
-  {
-    return $this->faxNumber;
-  }
-  public function setName($name)
-  {
-    $this->name = $name;
-  }
-  public function getName()
-  {
-    return $this->name;
-  }
-  public function setOfficePhoneNumber($officePhoneNumber)
-  {
-    $this->officePhoneNumber = $officePhoneNumber;
-  }
-  public function getOfficePhoneNumber()
-  {
-    return $this->officePhoneNumber;
-  }
-  public function setTitle($title)
-  {
-    $this->title = $title;
-  }
-  public function getTitle()
-  {
-    return $this->title;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CivicInfo/ElectionsQueryRequest.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CivicInfo/ElectionsQueryRequest.php
deleted file mode 100644
index aa458541..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CivicInfo/ElectionsQueryRequest.php
+++ /dev/null
@@ -1,31 +0,0 @@
-contextParams = $contextParams;
-  }
-  public function getContextParams()
-  {
-    return $this->contextParams;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CivicInfo/ElectionsQueryResponse.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CivicInfo/ElectionsQueryResponse.php
deleted file mode 100644
index a13b9867..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CivicInfo/ElectionsQueryResponse.php
+++ /dev/null
@@ -1,41 +0,0 @@
-elections = $elections;
-  }
-  public function getElections()
-  {
-    return $this->elections;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CivicInfo/ElectoralDistrict.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CivicInfo/ElectoralDistrict.php
deleted file mode 100644
index 29dac57c..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CivicInfo/ElectoralDistrict.php
+++ /dev/null
@@ -1,57 +0,0 @@
-id = $id;
-  }
-  public function getId()
-  {
-    return $this->id;
-  }
-  public function setKgForeignKey($kgForeignKey)
-  {
-    $this->kgForeignKey = $kgForeignKey;
-  }
-  public function getKgForeignKey()
-  {
-    return $this->kgForeignKey;
-  }
-  public function setName($name)
-  {
-    $this->name = $name;
-  }
-  public function getName()
-  {
-    return $this->name;
-  }
-  public function setScope($scope)
-  {
-    $this->scope = $scope;
-  }
-  public function getScope()
-  {
-    return $this->scope;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CivicInfo/GeographicDivision.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CivicInfo/GeographicDivision.php
deleted file mode 100644
index 6f10d919..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CivicInfo/GeographicDivision.php
+++ /dev/null
@@ -1,49 +0,0 @@
-alsoKnownAs = $alsoKnownAs;
-  }
-  public function getAlsoKnownAs()
-  {
-    return $this->alsoKnownAs;
-  }
-  public function setName($name)
-  {
-    $this->name = $name;
-  }
-  public function getName()
-  {
-    return $this->name;
-  }
-  public function setOfficeIndices($officeIndices)
-  {
-    $this->officeIndices = $officeIndices;
-  }
-  public function getOfficeIndices()
-  {
-    return $this->officeIndices;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CivicInfo/Office.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CivicInfo/Office.php
deleted file mode 100644
index f5c35439..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CivicInfo/Office.php
+++ /dev/null
@@ -1,77 +0,0 @@
-divisionId = $divisionId;
-  }
-  public function getDivisionId()
-  {
-    return $this->divisionId;
-  }
-  public function setLevels($levels)
-  {
-    $this->levels = $levels;
-  }
-  public function getLevels()
-  {
-    return $this->levels;
-  }
-  public function setName($name)
-  {
-    $this->name = $name;
-  }
-  public function getName()
-  {
-    return $this->name;
-  }
-  public function setOfficialIndices($officialIndices)
-  {
-    $this->officialIndices = $officialIndices;
-  }
-  public function getOfficialIndices()
-  {
-    return $this->officialIndices;
-  }
-  public function setRoles($roles)
-  {
-    $this->roles = $roles;
-  }
-  public function getRoles()
-  {
-    return $this->roles;
-  }
-  public function setSources($sources)
-  {
-    $this->sources = $sources;
-  }
-  public function getSources()
-  {
-    return $this->sources;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CivicInfo/Official.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CivicInfo/Official.php
deleted file mode 100644
index ac7aa629..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CivicInfo/Official.php
+++ /dev/null
@@ -1,96 +0,0 @@
-address = $address;
-  }
-  public function getAddress()
-  {
-    return $this->address;
-  }
-  public function setChannels($channels)
-  {
-    $this->channels = $channels;
-  }
-  public function getChannels()
-  {
-    return $this->channels;
-  }
-  public function setEmails($emails)
-  {
-    $this->emails = $emails;
-  }
-  public function getEmails()
-  {
-    return $this->emails;
-  }
-  public function setName($name)
-  {
-    $this->name = $name;
-  }
-  public function getName()
-  {
-    return $this->name;
-  }
-  public function setParty($party)
-  {
-    $this->party = $party;
-  }
-  public function getParty()
-  {
-    return $this->party;
-  }
-  public function setPhones($phones)
-  {
-    $this->phones = $phones;
-  }
-  public function getPhones()
-  {
-    return $this->phones;
-  }
-  public function setPhotoUrl($photoUrl)
-  {
-    $this->photoUrl = $photoUrl;
-  }
-  public function getPhotoUrl()
-  {
-    return $this->photoUrl;
-  }
-  public function setUrls($urls)
-  {
-    $this->urls = $urls;
-  }
-  public function getUrls()
-  {
-    return $this->urls;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CivicInfo/PollingLocation.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CivicInfo/PollingLocation.php
deleted file mode 100644
index b7f8e064..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CivicInfo/PollingLocation.php
+++ /dev/null
@@ -1,105 +0,0 @@
-address = $address;
-  }
-  public function getAddress()
-  {
-    return $this->address;
-  }
-  public function setEndDate($endDate)
-  {
-    $this->endDate = $endDate;
-  }
-  public function getEndDate()
-  {
-    return $this->endDate;
-  }
-  public function setId($id)
-  {
-    $this->id = $id;
-  }
-  public function getId()
-  {
-    return $this->id;
-  }
-  public function setName($name)
-  {
-    $this->name = $name;
-  }
-  public function getName()
-  {
-    return $this->name;
-  }
-  public function setNotes($notes)
-  {
-    $this->notes = $notes;
-  }
-  public function getNotes()
-  {
-    return $this->notes;
-  }
-  public function setPollingHours($pollingHours)
-  {
-    $this->pollingHours = $pollingHours;
-  }
-  public function getPollingHours()
-  {
-    return $this->pollingHours;
-  }
-  public function setSources($sources)
-  {
-    $this->sources = $sources;
-  }
-  public function getSources()
-  {
-    return $this->sources;
-  }
-  public function setStartDate($startDate)
-  {
-    $this->startDate = $startDate;
-  }
-  public function getStartDate()
-  {
-    return $this->startDate;
-  }
-  public function setVoterServices($voterServices)
-  {
-    $this->voterServices = $voterServices;
-  }
-  public function getVoterServices()
-  {
-    return $this->voterServices;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CivicInfo/PostalAddress.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CivicInfo/PostalAddress.php
deleted file mode 100644
index c0f85ca6..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CivicInfo/PostalAddress.php
+++ /dev/null
@@ -1,301 +0,0 @@
-addressLines = $addressLines;
-  }
-  public function getAddressLines()
-  {
-    return $this->addressLines;
-  }
-  public function setAdministrativeAreaName($administrativeAreaName)
-  {
-    $this->administrativeAreaName = $administrativeAreaName;
-  }
-  public function getAdministrativeAreaName()
-  {
-    return $this->administrativeAreaName;
-  }
-  public function setCountryName($countryName)
-  {
-    $this->countryName = $countryName;
-  }
-  public function getCountryName()
-  {
-    return $this->countryName;
-  }
-  public function setCountryNameCode($countryNameCode)
-  {
-    $this->countryNameCode = $countryNameCode;
-  }
-  public function getCountryNameCode()
-  {
-    return $this->countryNameCode;
-  }
-  public function setDependentLocalityName($dependentLocalityName)
-  {
-    $this->dependentLocalityName = $dependentLocalityName;
-  }
-  public function getDependentLocalityName()
-  {
-    return $this->dependentLocalityName;
-  }
-  public function setDependentThoroughfareLeadingType($dependentThoroughfareLeadingType)
-  {
-    $this->dependentThoroughfareLeadingType = $dependentThoroughfareLeadingType;
-  }
-  public function getDependentThoroughfareLeadingType()
-  {
-    return $this->dependentThoroughfareLeadingType;
-  }
-  public function setDependentThoroughfareName($dependentThoroughfareName)
-  {
-    $this->dependentThoroughfareName = $dependentThoroughfareName;
-  }
-  public function getDependentThoroughfareName()
-  {
-    return $this->dependentThoroughfareName;
-  }
-  public function setDependentThoroughfarePostDirection($dependentThoroughfarePostDirection)
-  {
-    $this->dependentThoroughfarePostDirection = $dependentThoroughfarePostDirection;
-  }
-  public function getDependentThoroughfarePostDirection()
-  {
-    return $this->dependentThoroughfarePostDirection;
-  }
-  public function setDependentThoroughfarePreDirection($dependentThoroughfarePreDirection)
-  {
-    $this->dependentThoroughfarePreDirection = $dependentThoroughfarePreDirection;
-  }
-  public function getDependentThoroughfarePreDirection()
-  {
-    return $this->dependentThoroughfarePreDirection;
-  }
-  public function setDependentThoroughfareTrailingType($dependentThoroughfareTrailingType)
-  {
-    $this->dependentThoroughfareTrailingType = $dependentThoroughfareTrailingType;
-  }
-  public function getDependentThoroughfareTrailingType()
-  {
-    return $this->dependentThoroughfareTrailingType;
-  }
-  public function setDependentThoroughfaresConnector($dependentThoroughfaresConnector)
-  {
-    $this->dependentThoroughfaresConnector = $dependentThoroughfaresConnector;
-  }
-  public function getDependentThoroughfaresConnector()
-  {
-    return $this->dependentThoroughfaresConnector;
-  }
-  public function setDependentThoroughfaresIndicator($dependentThoroughfaresIndicator)
-  {
-    $this->dependentThoroughfaresIndicator = $dependentThoroughfaresIndicator;
-  }
-  public function getDependentThoroughfaresIndicator()
-  {
-    return $this->dependentThoroughfaresIndicator;
-  }
-  public function setDependentThoroughfaresType($dependentThoroughfaresType)
-  {
-    $this->dependentThoroughfaresType = $dependentThoroughfaresType;
-  }
-  public function getDependentThoroughfaresType()
-  {
-    return $this->dependentThoroughfaresType;
-  }
-  public function setFirmName($firmName)
-  {
-    $this->firmName = $firmName;
-  }
-  public function getFirmName()
-  {
-    return $this->firmName;
-  }
-  public function setIsDisputed($isDisputed)
-  {
-    $this->isDisputed = $isDisputed;
-  }
-  public function getIsDisputed()
-  {
-    return $this->isDisputed;
-  }
-  public function setLanguageCode($languageCode)
-  {
-    $this->languageCode = $languageCode;
-  }
-  public function getLanguageCode()
-  {
-    return $this->languageCode;
-  }
-  public function setLocalityName($localityName)
-  {
-    $this->localityName = $localityName;
-  }
-  public function getLocalityName()
-  {
-    return $this->localityName;
-  }
-  public function setPostBoxNumber($postBoxNumber)
-  {
-    $this->postBoxNumber = $postBoxNumber;
-  }
-  public function getPostBoxNumber()
-  {
-    return $this->postBoxNumber;
-  }
-  public function setPostalCodeNumber($postalCodeNumber)
-  {
-    $this->postalCodeNumber = $postalCodeNumber;
-  }
-  public function getPostalCodeNumber()
-  {
-    return $this->postalCodeNumber;
-  }
-  public function setPostalCodeNumberExtension($postalCodeNumberExtension)
-  {
-    $this->postalCodeNumberExtension = $postalCodeNumberExtension;
-  }
-  public function getPostalCodeNumberExtension()
-  {
-    return $this->postalCodeNumberExtension;
-  }
-  public function setPremiseName($premiseName)
-  {
-    $this->premiseName = $premiseName;
-  }
-  public function getPremiseName()
-  {
-    return $this->premiseName;
-  }
-  public function setRecipientName($recipientName)
-  {
-    $this->recipientName = $recipientName;
-  }
-  public function getRecipientName()
-  {
-    return $this->recipientName;
-  }
-  public function setSortingCode($sortingCode)
-  {
-    $this->sortingCode = $sortingCode;
-  }
-  public function getSortingCode()
-  {
-    return $this->sortingCode;
-  }
-  public function setSubAdministrativeAreaName($subAdministrativeAreaName)
-  {
-    $this->subAdministrativeAreaName = $subAdministrativeAreaName;
-  }
-  public function getSubAdministrativeAreaName()
-  {
-    return $this->subAdministrativeAreaName;
-  }
-  public function setSubPremiseName($subPremiseName)
-  {
-    $this->subPremiseName = $subPremiseName;
-  }
-  public function getSubPremiseName()
-  {
-    return $this->subPremiseName;
-  }
-  public function setThoroughfareLeadingType($thoroughfareLeadingType)
-  {
-    $this->thoroughfareLeadingType = $thoroughfareLeadingType;
-  }
-  public function getThoroughfareLeadingType()
-  {
-    return $this->thoroughfareLeadingType;
-  }
-  public function setThoroughfareName($thoroughfareName)
-  {
-    $this->thoroughfareName = $thoroughfareName;
-  }
-  public function getThoroughfareName()
-  {
-    return $this->thoroughfareName;
-  }
-  public function setThoroughfareNumber($thoroughfareNumber)
-  {
-    $this->thoroughfareNumber = $thoroughfareNumber;
-  }
-  public function getThoroughfareNumber()
-  {
-    return $this->thoroughfareNumber;
-  }
-  public function setThoroughfarePostDirection($thoroughfarePostDirection)
-  {
-    $this->thoroughfarePostDirection = $thoroughfarePostDirection;
-  }
-  public function getThoroughfarePostDirection()
-  {
-    return $this->thoroughfarePostDirection;
-  }
-  public function setThoroughfarePreDirection($thoroughfarePreDirection)
-  {
-    $this->thoroughfarePreDirection = $thoroughfarePreDirection;
-  }
-  public function getThoroughfarePreDirection()
-  {
-    return $this->thoroughfarePreDirection;
-  }
-  public function setThoroughfareTrailingType($thoroughfareTrailingType)
-  {
-    $this->thoroughfareTrailingType = $thoroughfareTrailingType;
-  }
-  public function getThoroughfareTrailingType()
-  {
-    return $this->thoroughfareTrailingType;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CivicInfo/RepresentativeInfoData.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CivicInfo/RepresentativeInfoData.php
deleted file mode 100644
index 7de91ecc..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CivicInfo/RepresentativeInfoData.php
+++ /dev/null
@@ -1,52 +0,0 @@
-divisions = $divisions;
-  }
-  public function getDivisions()
-  {
-    return $this->divisions;
-  }
-  public function setOffices($offices)
-  {
-    $this->offices = $offices;
-  }
-  public function getOffices()
-  {
-    return $this->offices;
-  }
-  public function setOfficials($officials)
-  {
-    $this->officials = $officials;
-  }
-  public function getOfficials()
-  {
-    return $this->officials;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CivicInfo/RepresentativeInfoRequest.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CivicInfo/RepresentativeInfoRequest.php
deleted file mode 100644
index 2545dc80..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CivicInfo/RepresentativeInfoRequest.php
+++ /dev/null
@@ -1,31 +0,0 @@
-contextParams = $contextParams;
-  }
-  public function getContextParams()
-  {
-    return $this->contextParams;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CivicInfo/RepresentativeInfoResponse.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CivicInfo/RepresentativeInfoResponse.php
deleted file mode 100644
index 167415a6..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CivicInfo/RepresentativeInfoResponse.php
+++ /dev/null
@@ -1,71 +0,0 @@
-divisions = $divisions;
-  }
-  public function getDivisions()
-  {
-    return $this->divisions;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setNormalizedInput(Google_Service_CivicInfo_SimpleAddressType $normalizedInput)
-  {
-    $this->normalizedInput = $normalizedInput;
-  }
-  public function getNormalizedInput()
-  {
-    return $this->normalizedInput;
-  }
-  public function setOffices($offices)
-  {
-    $this->offices = $offices;
-  }
-  public function getOffices()
-  {
-    return $this->offices;
-  }
-  public function setOfficials($officials)
-  {
-    $this->officials = $officials;
-  }
-  public function getOfficials()
-  {
-    return $this->officials;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CivicInfo/Resource/Divisions.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CivicInfo/Resource/Divisions.php
deleted file mode 100644
index 9214d3ec..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CivicInfo/Resource/Divisions.php
+++ /dev/null
@@ -1,47 +0,0 @@
-
- *   $civicinfoService = new Google_Service_CivicInfo(...);
- *   $divisions = $civicinfoService->divisions;
- *  
- */
-class Google_Service_CivicInfo_Resource_Divisions extends Google_Service_Resource
-{
-  /**
-   * Searches for political divisions by their natural name or OCD ID.
-   * (divisions.search)
-   *
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param string query The search query. Queries can cover any parts of a
-   * OCD ID or a human readable division name. All words given in the query are
-   * treated as required patterns. In addition to that, most query operators of
-   * the Apache Lucene library are supported. See
-   * http://lucene.apache.org/core/2_9_4/queryparsersyntax.html
-   * @return Google_Service_CivicInfo_DivisionSearchResponse
-   */
-  public function search($optParams = array())
-  {
-    $params = array();
-    $params = array_merge($params, $optParams);
-    return $this->call('search', array($params), "Google_Service_CivicInfo_DivisionSearchResponse");
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CivicInfo/Resource/Elections.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CivicInfo/Resource/Elections.php
deleted file mode 100644
index 7498db32..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CivicInfo/Resource/Elections.php
+++ /dev/null
@@ -1,64 +0,0 @@
-
- *   $civicinfoService = new Google_Service_CivicInfo(...);
- *   $elections = $civicinfoService->elections;
- *  
- */
-class Google_Service_CivicInfo_Resource_Elections extends Google_Service_Resource
-{
-  /**
-   * List of available elections to query. (elections.electionQuery)
-   *
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_CivicInfo_ElectionsQueryResponse
-   */
-  public function electionQuery($optParams = array())
-  {
-    $params = array();
-    $params = array_merge($params, $optParams);
-    return $this->call('electionQuery', array($params), "Google_Service_CivicInfo_ElectionsQueryResponse");
-  }
-  /**
-   * Looks up information relevant to a voter based on the voter's registered
-   * address. (elections.voterInfoQuery)
-   *
-   * @param string $address The registered address of the voter to look up.
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param string electionId The unique ID of the election to look up. A list
-   * of election IDs can be obtained at
-   * https://www.googleapis.com/civicinfo/{version}/elections
-   * @opt_param bool officialOnly If set to true, only data from official state
-   * sources will be returned.
-   * @opt_param bool returnAllAvailableData If set to true, the query will return
-   * the success codeand include any partial information when it is unable to
-   * determine a matching address or unable to determine the election for
-   * electionId=0 queries.
-   * @return Google_Service_CivicInfo_VoterInfoResponse
-   */
-  public function voterInfoQuery($address, $optParams = array())
-  {
-    $params = array('address' => $address);
-    $params = array_merge($params, $optParams);
-    return $this->call('voterInfoQuery', array($params), "Google_Service_CivicInfo_VoterInfoResponse");
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CivicInfo/Resource/Representatives.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CivicInfo/Resource/Representatives.php
deleted file mode 100644
index 73fab240..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CivicInfo/Resource/Representatives.php
+++ /dev/null
@@ -1,79 +0,0 @@
-
- *   $civicinfoService = new Google_Service_CivicInfo(...);
- *   $representatives = $civicinfoService->representatives;
- *  
- */
-class Google_Service_CivicInfo_Resource_Representatives extends Google_Service_Resource
-{
-  /**
-   * Looks up political geography and representative information for a single
-   * address. (representatives.representativeInfoByAddress)
-   *
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param string address The address to look up. May only be specified if
-   * the field ocdId is not given in the URL.
-   * @opt_param bool includeOffices Whether to return information about offices
-   * and officials. If false, only the top-level district information will be
-   * returned.
-   * @opt_param string levels A list of office levels to filter by. Only offices
-   * that serve at least one of these levels will be returned. Divisions that
-   * don't contain a matching office will not be returned.
-   * @opt_param string roles A list of office roles to filter by. Only offices
-   * fulfilling one of these roles will be returned. Divisions that don't contain
-   * a matching office will not be returned.
-   * @return Google_Service_CivicInfo_RepresentativeInfoResponse
-   */
-  public function representativeInfoByAddress($optParams = array())
-  {
-    $params = array();
-    $params = array_merge($params, $optParams);
-    return $this->call('representativeInfoByAddress', array($params), "Google_Service_CivicInfo_RepresentativeInfoResponse");
-  }
-  /**
-   * Looks up representative information for a single geographic division.
-   * (representatives.representativeInfoByDivision)
-   *
-   * @param string $ocdId The Open Civic Data division identifier of the division
-   * to look up.
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param string levels A list of office levels to filter by. Only offices
-   * that serve at least one of these levels will be returned. Divisions that
-   * don't contain a matching office will not be returned.
-   * @opt_param bool recursive If true, information about all divisions contained
-   * in the division requested will be included as well. For example, if querying
-   * ocd-division/country:us/district:dc, this would also return all DC's wards
-   * and ANCs.
-   * @opt_param string roles A list of office roles to filter by. Only offices
-   * fulfilling one of these roles will be returned. Divisions that don't contain
-   * a matching office will not be returned.
-   * @return Google_Service_CivicInfo_RepresentativeInfoData
-   */
-  public function representativeInfoByDivision($ocdId, $optParams = array())
-  {
-    $params = array('ocdId' => $ocdId);
-    $params = array_merge($params, $optParams);
-    return $this->call('representativeInfoByDivision', array($params), "Google_Service_CivicInfo_RepresentativeInfoData");
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CivicInfo/SimpleAddressType.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CivicInfo/SimpleAddressType.php
deleted file mode 100644
index 7b01fd7b..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CivicInfo/SimpleAddressType.php
+++ /dev/null
@@ -1,84 +0,0 @@
-city = $city;
-  }
-  public function getCity()
-  {
-    return $this->city;
-  }
-  public function setLine1($line1)
-  {
-    $this->line1 = $line1;
-  }
-  public function getLine1()
-  {
-    return $this->line1;
-  }
-  public function setLine2($line2)
-  {
-    $this->line2 = $line2;
-  }
-  public function getLine2()
-  {
-    return $this->line2;
-  }
-  public function setLine3($line3)
-  {
-    $this->line3 = $line3;
-  }
-  public function getLine3()
-  {
-    return $this->line3;
-  }
-  public function setLocationName($locationName)
-  {
-    $this->locationName = $locationName;
-  }
-  public function getLocationName()
-  {
-    return $this->locationName;
-  }
-  public function setState($state)
-  {
-    $this->state = $state;
-  }
-  public function getState()
-  {
-    return $this->state;
-  }
-  public function setZip($zip)
-  {
-    $this->zip = $zip;
-  }
-  public function getZip()
-  {
-    return $this->zip;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CivicInfo/Source.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CivicInfo/Source.php
deleted file mode 100644
index a183a726..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CivicInfo/Source.php
+++ /dev/null
@@ -1,39 +0,0 @@
-name = $name;
-  }
-  public function getName()
-  {
-    return $this->name;
-  }
-  public function setOfficial($official)
-  {
-    $this->official = $official;
-  }
-  public function getOfficial()
-  {
-    return $this->official;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CivicInfo/VoterInfoRequest.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CivicInfo/VoterInfoRequest.php
deleted file mode 100644
index 8f6ced1b..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CivicInfo/VoterInfoRequest.php
+++ /dev/null
@@ -1,41 +0,0 @@
-contextParams = $contextParams;
-  }
-  public function getContextParams()
-  {
-    return $this->contextParams;
-  }
-  public function setVoterInfoSegmentResult(Google_Service_CivicInfo_VoterInfoSegmentResult $voterInfoSegmentResult)
-  {
-    $this->voterInfoSegmentResult = $voterInfoSegmentResult;
-  }
-  public function getVoterInfoSegmentResult()
-  {
-    return $this->voterInfoSegmentResult;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CivicInfo/VoterInfoResponse.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CivicInfo/VoterInfoResponse.php
deleted file mode 100644
index e3f53709..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CivicInfo/VoterInfoResponse.php
+++ /dev/null
@@ -1,129 +0,0 @@
-contests = $contests;
-  }
-  public function getContests()
-  {
-    return $this->contests;
-  }
-  public function setDropOffLocations($dropOffLocations)
-  {
-    $this->dropOffLocations = $dropOffLocations;
-  }
-  public function getDropOffLocations()
-  {
-    return $this->dropOffLocations;
-  }
-  public function setEarlyVoteSites($earlyVoteSites)
-  {
-    $this->earlyVoteSites = $earlyVoteSites;
-  }
-  public function getEarlyVoteSites()
-  {
-    return $this->earlyVoteSites;
-  }
-  public function setElection(Google_Service_CivicInfo_Election $election)
-  {
-    $this->election = $election;
-  }
-  public function getElection()
-  {
-    return $this->election;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setMailOnly($mailOnly)
-  {
-    $this->mailOnly = $mailOnly;
-  }
-  public function getMailOnly()
-  {
-    return $this->mailOnly;
-  }
-  public function setNormalizedInput(Google_Service_CivicInfo_SimpleAddressType $normalizedInput)
-  {
-    $this->normalizedInput = $normalizedInput;
-  }
-  public function getNormalizedInput()
-  {
-    return $this->normalizedInput;
-  }
-  public function setOtherElections($otherElections)
-  {
-    $this->otherElections = $otherElections;
-  }
-  public function getOtherElections()
-  {
-    return $this->otherElections;
-  }
-  public function setPollingLocations($pollingLocations)
-  {
-    $this->pollingLocations = $pollingLocations;
-  }
-  public function getPollingLocations()
-  {
-    return $this->pollingLocations;
-  }
-  public function setPrecinctId($precinctId)
-  {
-    $this->precinctId = $precinctId;
-  }
-  public function getPrecinctId()
-  {
-    return $this->precinctId;
-  }
-  public function setState($state)
-  {
-    $this->state = $state;
-  }
-  public function getState()
-  {
-    return $this->state;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CivicInfo/VoterInfoSegmentResult.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CivicInfo/VoterInfoSegmentResult.php
deleted file mode 100644
index 6feceab9..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CivicInfo/VoterInfoSegmentResult.php
+++ /dev/null
@@ -1,60 +0,0 @@
-generatedMillis = $generatedMillis;
-  }
-  public function getGeneratedMillis()
-  {
-    return $this->generatedMillis;
-  }
-  public function setPostalAddress(Google_Service_CivicInfo_PostalAddress $postalAddress)
-  {
-    $this->postalAddress = $postalAddress;
-  }
-  public function getPostalAddress()
-  {
-    return $this->postalAddress;
-  }
-  public function setRequest(Google_Service_CivicInfo_VoterInfoRequest $request)
-  {
-    $this->request = $request;
-  }
-  public function getRequest()
-  {
-    return $this->request;
-  }
-  public function setResponse(Google_Service_CivicInfo_VoterInfoResponse $response)
-  {
-    $this->response = $response;
-  }
-  public function getResponse()
-  {
-    return $this->response;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Classroom.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Classroom.php
deleted file mode 100644
index acf8a1ba..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Classroom.php
+++ /dev/null
@@ -1,869 +0,0 @@
-
- * Manages classes, rosters, and invitations in Google Classroom.

- *
- * 

- * For more information about this service, see the API
- * Documentation
- * 

- *
- * @author Google, Inc.
- */
-class Google_Service_Classroom extends Google_Service
-{
-  /** View instructions for teacher-assigned work in your Google Classroom classes. */
-  const CLASSROOM_COURSE_WORK_READONLY =
-      "https://www.googleapis.com/auth/classroom.course-work.readonly";
-  /** Manage your Google Classroom classes. */
-  const CLASSROOM_COURSES =
-      "https://www.googleapis.com/auth/classroom.courses";
-  /** View your Google Classroom classes. */
-  const CLASSROOM_COURSES_READONLY =
-      "https://www.googleapis.com/auth/classroom.courses.readonly";
-  /** Manage your course work and view your grades in Google Classroom. */
-  const CLASSROOM_COURSEWORK_ME =
-      "https://www.googleapis.com/auth/classroom.coursework.me";
-  /** View your course work and grades in Google Classroom. */
-  const CLASSROOM_COURSEWORK_ME_READONLY =
-      "https://www.googleapis.com/auth/classroom.coursework.me.readonly";
-  /** Manage course work and grades for students in the Google Classroom classes you teach and view the course work and grades for classes you administer. */
-  const CLASSROOM_COURSEWORK_STUDENTS =
-      "https://www.googleapis.com/auth/classroom.coursework.students";
-  /** View course work and grades for students in the Google Classroom classes you teach or administer. */
-  const CLASSROOM_COURSEWORK_STUDENTS_READONLY =
-      "https://www.googleapis.com/auth/classroom.coursework.students.readonly";
-  /** View the email addresses of people in your classes. */
-  const CLASSROOM_PROFILE_EMAILS =
-      "https://www.googleapis.com/auth/classroom.profile.emails";
-  /** View the profile photos of people in your classes. */
-  const CLASSROOM_PROFILE_PHOTOS =
-      "https://www.googleapis.com/auth/classroom.profile.photos";
-  /** Manage your Google Classroom class rosters. */
-  const CLASSROOM_ROSTERS =
-      "https://www.googleapis.com/auth/classroom.rosters";
-  /** View your Google Classroom class rosters. */
-  const CLASSROOM_ROSTERS_READONLY =
-      "https://www.googleapis.com/auth/classroom.rosters.readonly";
-  /** View your course work and grades in Google Classroom. */
-  const CLASSROOM_STUDENT_SUBMISSIONS_ME_READONLY =
-      "https://www.googleapis.com/auth/classroom.student-submissions.me.readonly";
-  /** View course work and grades for students in the Google Classroom classes you teach or administer. */
-  const CLASSROOM_STUDENT_SUBMISSIONS_STUDENTS_READONLY =
-      "https://www.googleapis.com/auth/classroom.student-submissions.students.readonly";
-
-  public $courses;
-  public $courses_aliases;
-  public $courses_courseWork;
-  public $courses_courseWork_studentSubmissions;
-  public $courses_students;
-  public $courses_teachers;
-  public $invitations;
-  public $userProfiles;
-  public $userProfiles_guardianInvitations;
-  public $userProfiles_guardians;
-  
-  /**
-   * Constructs the internal representation of the Classroom service.
-   *
-   * @param Google_Client $client
-   */
-  public function __construct(Google_Client $client)
-  {
-    parent::__construct($client);
-    $this->rootUrl = 'https://classroom.googleapis.com/';
-    $this->servicePath = '';
-    $this->version = 'v1';
-    $this->serviceName = 'classroom';
-
-    $this->courses = new Google_Service_Classroom_Resource_Courses(
-        $this,
-        $this->serviceName,
-        'courses',
-        array(
-          'methods' => array(
-            'create' => array(
-              'path' => 'v1/courses',
-              'httpMethod' => 'POST',
-              'parameters' => array(),
-            ),'delete' => array(
-              'path' => 'v1/courses/{id}',
-              'httpMethod' => 'DELETE',
-              'parameters' => array(
-                'id' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'get' => array(
-              'path' => 'v1/courses/{id}',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'id' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'list' => array(
-              'path' => 'v1/courses',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'studentId' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'teacherId' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'courseStates' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                  'repeated' => true,
-                ),
-                'pageSize' => array(
-                  'location' => 'query',
-                  'type' => 'integer',
-                ),
-                'pageToken' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-              ),
-            ),'patch' => array(
-              'path' => 'v1/courses/{id}',
-              'httpMethod' => 'PATCH',
-              'parameters' => array(
-                'id' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'updateMask' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-              ),
-            ),'update' => array(
-              'path' => 'v1/courses/{id}',
-              'httpMethod' => 'PUT',
-              'parameters' => array(
-                'id' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),
-          )
-        )
-    );
-    $this->courses_aliases = new Google_Service_Classroom_Resource_CoursesAliases(
-        $this,
-        $this->serviceName,
-        'aliases',
-        array(
-          'methods' => array(
-            'create' => array(
-              'path' => 'v1/courses/{courseId}/aliases',
-              'httpMethod' => 'POST',
-              'parameters' => array(
-                'courseId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'delete' => array(
-              'path' => 'v1/courses/{courseId}/aliases/{alias}',
-              'httpMethod' => 'DELETE',
-              'parameters' => array(
-                'courseId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'alias' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'list' => array(
-              'path' => 'v1/courses/{courseId}/aliases',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'courseId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'pageSize' => array(
-                  'location' => 'query',
-                  'type' => 'integer',
-                ),
-                'pageToken' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-              ),
-            ),
-          )
-        )
-    );
-    $this->courses_courseWork = new Google_Service_Classroom_Resource_CoursesCourseWork(
-        $this,
-        $this->serviceName,
-        'courseWork',
-        array(
-          'methods' => array(
-            'create' => array(
-              'path' => 'v1/courses/{courseId}/courseWork',
-              'httpMethod' => 'POST',
-              'parameters' => array(
-                'courseId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'delete' => array(
-              'path' => 'v1/courses/{courseId}/courseWork/{id}',
-              'httpMethod' => 'DELETE',
-              'parameters' => array(
-                'courseId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'id' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'get' => array(
-              'path' => 'v1/courses/{courseId}/courseWork/{id}',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'courseId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'id' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'list' => array(
-              'path' => 'v1/courses/{courseId}/courseWork',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'courseId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'courseWorkStates' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                  'repeated' => true,
-                ),
-                'orderBy' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'pageSize' => array(
-                  'location' => 'query',
-                  'type' => 'integer',
-                ),
-                'pageToken' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-              ),
-            ),'patch' => array(
-              'path' => 'v1/courses/{courseId}/courseWork/{id}',
-              'httpMethod' => 'PATCH',
-              'parameters' => array(
-                'courseId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'id' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'updateMask' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-              ),
-            ),
-          )
-        )
-    );
-    $this->courses_courseWork_studentSubmissions = new Google_Service_Classroom_Resource_CoursesCourseWorkStudentSubmissions(
-        $this,
-        $this->serviceName,
-        'studentSubmissions',
-        array(
-          'methods' => array(
-            'get' => array(
-              'path' => 'v1/courses/{courseId}/courseWork/{courseWorkId}/studentSubmissions/{id}',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'courseId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'courseWorkId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'id' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'list' => array(
-              'path' => 'v1/courses/{courseId}/courseWork/{courseWorkId}/studentSubmissions',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'courseId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'courseWorkId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'userId' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'states' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                  'repeated' => true,
-                ),
-                'late' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'pageSize' => array(
-                  'location' => 'query',
-                  'type' => 'integer',
-                ),
-                'pageToken' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-              ),
-            ),'modifyAttachments' => array(
-              'path' => 'v1/courses/{courseId}/courseWork/{courseWorkId}/studentSubmissions/{id}:modifyAttachments',
-              'httpMethod' => 'POST',
-              'parameters' => array(
-                'courseId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'courseWorkId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'id' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'patch' => array(
-              'path' => 'v1/courses/{courseId}/courseWork/{courseWorkId}/studentSubmissions/{id}',
-              'httpMethod' => 'PATCH',
-              'parameters' => array(
-                'courseId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'courseWorkId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'id' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'updateMask' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-              ),
-            ),'reclaim' => array(
-              'path' => 'v1/courses/{courseId}/courseWork/{courseWorkId}/studentSubmissions/{id}:reclaim',
-              'httpMethod' => 'POST',
-              'parameters' => array(
-                'courseId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'courseWorkId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'id' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'return' => array(
-              'path' => 'v1/courses/{courseId}/courseWork/{courseWorkId}/studentSubmissions/{id}:return',
-              'httpMethod' => 'POST',
-              'parameters' => array(
-                'courseId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'courseWorkId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'id' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'turnIn' => array(
-              'path' => 'v1/courses/{courseId}/courseWork/{courseWorkId}/studentSubmissions/{id}:turnIn',
-              'httpMethod' => 'POST',
-              'parameters' => array(
-                'courseId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'courseWorkId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'id' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),
-          )
-        )
-    );
-    $this->courses_students = new Google_Service_Classroom_Resource_CoursesStudents(
-        $this,
-        $this->serviceName,
-        'students',
-        array(
-          'methods' => array(
-            'create' => array(
-              'path' => 'v1/courses/{courseId}/students',
-              'httpMethod' => 'POST',
-              'parameters' => array(
-                'courseId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'enrollmentCode' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-              ),
-            ),'delete' => array(
-              'path' => 'v1/courses/{courseId}/students/{userId}',
-              'httpMethod' => 'DELETE',
-              'parameters' => array(
-                'courseId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'userId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'get' => array(
-              'path' => 'v1/courses/{courseId}/students/{userId}',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'courseId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'userId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'list' => array(
-              'path' => 'v1/courses/{courseId}/students',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'courseId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'pageSize' => array(
-                  'location' => 'query',
-                  'type' => 'integer',
-                ),
-                'pageToken' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-              ),
-            ),
-          )
-        )
-    );
-    $this->courses_teachers = new Google_Service_Classroom_Resource_CoursesTeachers(
-        $this,
-        $this->serviceName,
-        'teachers',
-        array(
-          'methods' => array(
-            'create' => array(
-              'path' => 'v1/courses/{courseId}/teachers',
-              'httpMethod' => 'POST',
-              'parameters' => array(
-                'courseId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'delete' => array(
-              'path' => 'v1/courses/{courseId}/teachers/{userId}',
-              'httpMethod' => 'DELETE',
-              'parameters' => array(
-                'courseId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'userId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'get' => array(
-              'path' => 'v1/courses/{courseId}/teachers/{userId}',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'courseId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'userId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'list' => array(
-              'path' => 'v1/courses/{courseId}/teachers',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'courseId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'pageSize' => array(
-                  'location' => 'query',
-                  'type' => 'integer',
-                ),
-                'pageToken' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-              ),
-            ),
-          )
-        )
-    );
-    $this->invitations = new Google_Service_Classroom_Resource_Invitations(
-        $this,
-        $this->serviceName,
-        'invitations',
-        array(
-          'methods' => array(
-            'accept' => array(
-              'path' => 'v1/invitations/{id}:accept',
-              'httpMethod' => 'POST',
-              'parameters' => array(
-                'id' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'create' => array(
-              'path' => 'v1/invitations',
-              'httpMethod' => 'POST',
-              'parameters' => array(),
-            ),'delete' => array(
-              'path' => 'v1/invitations/{id}',
-              'httpMethod' => 'DELETE',
-              'parameters' => array(
-                'id' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'get' => array(
-              'path' => 'v1/invitations/{id}',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'id' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'list' => array(
-              'path' => 'v1/invitations',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'userId' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'courseId' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'pageSize' => array(
-                  'location' => 'query',
-                  'type' => 'integer',
-                ),
-                'pageToken' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-              ),
-            ),
-          )
-        )
-    );
-    $this->userProfiles = new Google_Service_Classroom_Resource_UserProfiles(
-        $this,
-        $this->serviceName,
-        'userProfiles',
-        array(
-          'methods' => array(
-            'get' => array(
-              'path' => 'v1/userProfiles/{userId}',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'userId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),
-          )
-        )
-    );
-    $this->userProfiles_guardianInvitations = new Google_Service_Classroom_Resource_UserProfilesGuardianInvitations(
-        $this,
-        $this->serviceName,
-        'guardianInvitations',
-        array(
-          'methods' => array(
-            'create' => array(
-              'path' => 'v1/userProfiles/{studentId}/guardianInvitations',
-              'httpMethod' => 'POST',
-              'parameters' => array(
-                'studentId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'get' => array(
-              'path' => 'v1/userProfiles/{studentId}/guardianInvitations/{invitationId}',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'studentId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'invitationId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'list' => array(
-              'path' => 'v1/userProfiles/{studentId}/guardianInvitations',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'studentId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'invitedEmailAddress' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'states' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                  'repeated' => true,
-                ),
-                'pageToken' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'pageSize' => array(
-                  'location' => 'query',
-                  'type' => 'integer',
-                ),
-              ),
-            ),'patch' => array(
-              'path' => 'v1/userProfiles/{studentId}/guardianInvitations/{invitationId}',
-              'httpMethod' => 'PATCH',
-              'parameters' => array(
-                'studentId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'invitationId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'updateMask' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-              ),
-            ),
-          )
-        )
-    );
-    $this->userProfiles_guardians = new Google_Service_Classroom_Resource_UserProfilesGuardians(
-        $this,
-        $this->serviceName,
-        'guardians',
-        array(
-          'methods' => array(
-            'delete' => array(
-              'path' => 'v1/userProfiles/{studentId}/guardians/{guardianId}',
-              'httpMethod' => 'DELETE',
-              'parameters' => array(
-                'studentId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'guardianId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'get' => array(
-              'path' => 'v1/userProfiles/{studentId}/guardians/{guardianId}',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'studentId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'guardianId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'list' => array(
-              'path' => 'v1/userProfiles/{studentId}/guardians',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'studentId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'invitedEmailAddress' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'pageToken' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'pageSize' => array(
-                  'location' => 'query',
-                  'type' => 'integer',
-                ),
-              ),
-            ),
-          )
-        )
-    );
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Classroom/Assignment.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Classroom/Assignment.php
deleted file mode 100644
index b90d744f..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Classroom/Assignment.php
+++ /dev/null
@@ -1,31 +0,0 @@
-studentWorkFolder = $studentWorkFolder;
-  }
-  public function getStudentWorkFolder()
-  {
-    return $this->studentWorkFolder;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Classroom/AssignmentSubmission.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Classroom/AssignmentSubmission.php
deleted file mode 100644
index 149aa4ca..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Classroom/AssignmentSubmission.php
+++ /dev/null
@@ -1,32 +0,0 @@
-attachments = $attachments;
-  }
-  public function getAttachments()
-  {
-    return $this->attachments;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Classroom/Attachment.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Classroom/Attachment.php
deleted file mode 100644
index 5fe96664..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Classroom/Attachment.php
+++ /dev/null
@@ -1,61 +0,0 @@
-driveFile = $driveFile;
-  }
-  public function getDriveFile()
-  {
-    return $this->driveFile;
-  }
-  public function setForm(Google_Service_Classroom_Form $form)
-  {
-    $this->form = $form;
-  }
-  public function getForm()
-  {
-    return $this->form;
-  }
-  public function setLink(Google_Service_Classroom_Link $link)
-  {
-    $this->link = $link;
-  }
-  public function getLink()
-  {
-    return $this->link;
-  }
-  public function setYouTubeVideo(Google_Service_Classroom_YouTubeVideo $youTubeVideo)
-  {
-    $this->youTubeVideo = $youTubeVideo;
-  }
-  public function getYouTubeVideo()
-  {
-    return $this->youTubeVideo;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Classroom/ClassroomEmpty.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Classroom/ClassroomEmpty.php
deleted file mode 100644
index 24a85010..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Classroom/ClassroomEmpty.php
+++ /dev/null
@@ -1,20 +0,0 @@
-alternateLink = $alternateLink;
-  }
-  public function getAlternateLink()
-  {
-    return $this->alternateLink;
-  }
-  public function setCourseGroupEmail($courseGroupEmail)
-  {
-    $this->courseGroupEmail = $courseGroupEmail;
-  }
-  public function getCourseGroupEmail()
-  {
-    return $this->courseGroupEmail;
-  }
-  public function setCourseMaterialSets($courseMaterialSets)
-  {
-    $this->courseMaterialSets = $courseMaterialSets;
-  }
-  public function getCourseMaterialSets()
-  {
-    return $this->courseMaterialSets;
-  }
-  public function setCourseState($courseState)
-  {
-    $this->courseState = $courseState;
-  }
-  public function getCourseState()
-  {
-    return $this->courseState;
-  }
-  public function setCreationTime($creationTime)
-  {
-    $this->creationTime = $creationTime;
-  }
-  public function getCreationTime()
-  {
-    return $this->creationTime;
-  }
-  public function setDescription($description)
-  {
-    $this->description = $description;
-  }
-  public function getDescription()
-  {
-    return $this->description;
-  }
-  public function setDescriptionHeading($descriptionHeading)
-  {
-    $this->descriptionHeading = $descriptionHeading;
-  }
-  public function getDescriptionHeading()
-  {
-    return $this->descriptionHeading;
-  }
-  public function setEnrollmentCode($enrollmentCode)
-  {
-    $this->enrollmentCode = $enrollmentCode;
-  }
-  public function getEnrollmentCode()
-  {
-    return $this->enrollmentCode;
-  }
-  public function setGuardiansEnabled($guardiansEnabled)
-  {
-    $this->guardiansEnabled = $guardiansEnabled;
-  }
-  public function getGuardiansEnabled()
-  {
-    return $this->guardiansEnabled;
-  }
-  public function setId($id)
-  {
-    $this->id = $id;
-  }
-  public function getId()
-  {
-    return $this->id;
-  }
-  public function setName($name)
-  {
-    $this->name = $name;
-  }
-  public function getName()
-  {
-    return $this->name;
-  }
-  public function setOwnerId($ownerId)
-  {
-    $this->ownerId = $ownerId;
-  }
-  public function getOwnerId()
-  {
-    return $this->ownerId;
-  }
-  public function setRoom($room)
-  {
-    $this->room = $room;
-  }
-  public function getRoom()
-  {
-    return $this->room;
-  }
-  public function setSection($section)
-  {
-    $this->section = $section;
-  }
-  public function getSection()
-  {
-    return $this->section;
-  }
-  public function setTeacherFolder(Google_Service_Classroom_DriveFolder $teacherFolder)
-  {
-    $this->teacherFolder = $teacherFolder;
-  }
-  public function getTeacherFolder()
-  {
-    return $this->teacherFolder;
-  }
-  public function setTeacherGroupEmail($teacherGroupEmail)
-  {
-    $this->teacherGroupEmail = $teacherGroupEmail;
-  }
-  public function getTeacherGroupEmail()
-  {
-    return $this->teacherGroupEmail;
-  }
-  public function setUpdateTime($updateTime)
-  {
-    $this->updateTime = $updateTime;
-  }
-  public function getUpdateTime()
-  {
-    return $this->updateTime;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Classroom/CourseAlias.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Classroom/CourseAlias.php
deleted file mode 100644
index 47d27a87..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Classroom/CourseAlias.php
+++ /dev/null
@@ -1,30 +0,0 @@
-alias = $alias;
-  }
-  public function getAlias()
-  {
-    return $this->alias;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Classroom/CourseMaterial.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Classroom/CourseMaterial.php
deleted file mode 100644
index 66362fe5..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Classroom/CourseMaterial.php
+++ /dev/null
@@ -1,61 +0,0 @@
-driveFile = $driveFile;
-  }
-  public function getDriveFile()
-  {
-    return $this->driveFile;
-  }
-  public function setForm(Google_Service_Classroom_Form $form)
-  {
-    $this->form = $form;
-  }
-  public function getForm()
-  {
-    return $this->form;
-  }
-  public function setLink(Google_Service_Classroom_Link $link)
-  {
-    $this->link = $link;
-  }
-  public function getLink()
-  {
-    return $this->link;
-  }
-  public function setYouTubeVideo(Google_Service_Classroom_YouTubeVideo $youTubeVideo)
-  {
-    $this->youTubeVideo = $youTubeVideo;
-  }
-  public function getYouTubeVideo()
-  {
-    return $this->youTubeVideo;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Classroom/CourseMaterialSet.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Classroom/CourseMaterialSet.php
deleted file mode 100644
index 81d7ac76..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Classroom/CourseMaterialSet.php
+++ /dev/null
@@ -1,41 +0,0 @@
-materials = $materials;
-  }
-  public function getMaterials()
-  {
-    return $this->materials;
-  }
-  public function setTitle($title)
-  {
-    $this->title = $title;
-  }
-  public function getTitle()
-  {
-    return $this->title;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Classroom/CourseWork.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Classroom/CourseWork.php
deleted file mode 100644
index d6f79c14..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Classroom/CourseWork.php
+++ /dev/null
@@ -1,180 +0,0 @@
-alternateLink = $alternateLink;
-  }
-  public function getAlternateLink()
-  {
-    return $this->alternateLink;
-  }
-  public function setAssignment(Google_Service_Classroom_Assignment $assignment)
-  {
-    $this->assignment = $assignment;
-  }
-  public function getAssignment()
-  {
-    return $this->assignment;
-  }
-  public function setAssociatedWithDeveloper($associatedWithDeveloper)
-  {
-    $this->associatedWithDeveloper = $associatedWithDeveloper;
-  }
-  public function getAssociatedWithDeveloper()
-  {
-    return $this->associatedWithDeveloper;
-  }
-  public function setCourseId($courseId)
-  {
-    $this->courseId = $courseId;
-  }
-  public function getCourseId()
-  {
-    return $this->courseId;
-  }
-  public function setCreationTime($creationTime)
-  {
-    $this->creationTime = $creationTime;
-  }
-  public function getCreationTime()
-  {
-    return $this->creationTime;
-  }
-  public function setDescription($description)
-  {
-    $this->description = $description;
-  }
-  public function getDescription()
-  {
-    return $this->description;
-  }
-  public function setDueDate(Google_Service_Classroom_Date $dueDate)
-  {
-    $this->dueDate = $dueDate;
-  }
-  public function getDueDate()
-  {
-    return $this->dueDate;
-  }
-  public function setDueTime(Google_Service_Classroom_TimeOfDay $dueTime)
-  {
-    $this->dueTime = $dueTime;
-  }
-  public function getDueTime()
-  {
-    return $this->dueTime;
-  }
-  public function setId($id)
-  {
-    $this->id = $id;
-  }
-  public function getId()
-  {
-    return $this->id;
-  }
-  public function setMaterials($materials)
-  {
-    $this->materials = $materials;
-  }
-  public function getMaterials()
-  {
-    return $this->materials;
-  }
-  public function setMaxPoints($maxPoints)
-  {
-    $this->maxPoints = $maxPoints;
-  }
-  public function getMaxPoints()
-  {
-    return $this->maxPoints;
-  }
-  public function setMultipleChoiceQuestion(Google_Service_Classroom_MultipleChoiceQuestion $multipleChoiceQuestion)
-  {
-    $this->multipleChoiceQuestion = $multipleChoiceQuestion;
-  }
-  public function getMultipleChoiceQuestion()
-  {
-    return $this->multipleChoiceQuestion;
-  }
-  public function setState($state)
-  {
-    $this->state = $state;
-  }
-  public function getState()
-  {
-    return $this->state;
-  }
-  public function setSubmissionModificationMode($submissionModificationMode)
-  {
-    $this->submissionModificationMode = $submissionModificationMode;
-  }
-  public function getSubmissionModificationMode()
-  {
-    return $this->submissionModificationMode;
-  }
-  public function setTitle($title)
-  {
-    $this->title = $title;
-  }
-  public function getTitle()
-  {
-    return $this->title;
-  }
-  public function setUpdateTime($updateTime)
-  {
-    $this->updateTime = $updateTime;
-  }
-  public function getUpdateTime()
-  {
-    return $this->updateTime;
-  }
-  public function setWorkType($workType)
-  {
-    $this->workType = $workType;
-  }
-  public function getWorkType()
-  {
-    return $this->workType;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Classroom/Date.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Classroom/Date.php
deleted file mode 100644
index e9872a83..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Classroom/Date.php
+++ /dev/null
@@ -1,48 +0,0 @@
-day = $day;
-  }
-  public function getDay()
-  {
-    return $this->day;
-  }
-  public function setMonth($month)
-  {
-    $this->month = $month;
-  }
-  public function getMonth()
-  {
-    return $this->month;
-  }
-  public function setYear($year)
-  {
-    $this->year = $year;
-  }
-  public function getYear()
-  {
-    return $this->year;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Classroom/DriveFile.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Classroom/DriveFile.php
deleted file mode 100644
index 19303dc1..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Classroom/DriveFile.php
+++ /dev/null
@@ -1,57 +0,0 @@
-alternateLink = $alternateLink;
-  }
-  public function getAlternateLink()
-  {
-    return $this->alternateLink;
-  }
-  public function setId($id)
-  {
-    $this->id = $id;
-  }
-  public function getId()
-  {
-    return $this->id;
-  }
-  public function setThumbnailUrl($thumbnailUrl)
-  {
-    $this->thumbnailUrl = $thumbnailUrl;
-  }
-  public function getThumbnailUrl()
-  {
-    return $this->thumbnailUrl;
-  }
-  public function setTitle($title)
-  {
-    $this->title = $title;
-  }
-  public function getTitle()
-  {
-    return $this->title;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Classroom/DriveFolder.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Classroom/DriveFolder.php
deleted file mode 100644
index 8da31945..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Classroom/DriveFolder.php
+++ /dev/null
@@ -1,48 +0,0 @@
-alternateLink = $alternateLink;
-  }
-  public function getAlternateLink()
-  {
-    return $this->alternateLink;
-  }
-  public function setId($id)
-  {
-    $this->id = $id;
-  }
-  public function getId()
-  {
-    return $this->id;
-  }
-  public function setTitle($title)
-  {
-    $this->title = $title;
-  }
-  public function getTitle()
-  {
-    return $this->title;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Classroom/Form.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Classroom/Form.php
deleted file mode 100644
index 8d942a0e..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Classroom/Form.php
+++ /dev/null
@@ -1,57 +0,0 @@
-formUrl = $formUrl;
-  }
-  public function getFormUrl()
-  {
-    return $this->formUrl;
-  }
-  public function setResponseUrl($responseUrl)
-  {
-    $this->responseUrl = $responseUrl;
-  }
-  public function getResponseUrl()
-  {
-    return $this->responseUrl;
-  }
-  public function setThumbnailUrl($thumbnailUrl)
-  {
-    $this->thumbnailUrl = $thumbnailUrl;
-  }
-  public function getThumbnailUrl()
-  {
-    return $this->thumbnailUrl;
-  }
-  public function setTitle($title)
-  {
-    $this->title = $title;
-  }
-  public function getTitle()
-  {
-    return $this->title;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Classroom/GlobalPermission.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Classroom/GlobalPermission.php
deleted file mode 100644
index 6ac872bf..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Classroom/GlobalPermission.php
+++ /dev/null
@@ -1,30 +0,0 @@
-permission = $permission;
-  }
-  public function getPermission()
-  {
-    return $this->permission;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Classroom/Guardian.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Classroom/Guardian.php
deleted file mode 100644
index b6da5951..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Classroom/Guardian.php
+++ /dev/null
@@ -1,58 +0,0 @@
-guardianId = $guardianId;
-  }
-  public function getGuardianId()
-  {
-    return $this->guardianId;
-  }
-  public function setGuardianProfile(Google_Service_Classroom_UserProfile $guardianProfile)
-  {
-    $this->guardianProfile = $guardianProfile;
-  }
-  public function getGuardianProfile()
-  {
-    return $this->guardianProfile;
-  }
-  public function setInvitedEmailAddress($invitedEmailAddress)
-  {
-    $this->invitedEmailAddress = $invitedEmailAddress;
-  }
-  public function getInvitedEmailAddress()
-  {
-    return $this->invitedEmailAddress;
-  }
-  public function setStudentId($studentId)
-  {
-    $this->studentId = $studentId;
-  }
-  public function getStudentId()
-  {
-    return $this->studentId;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Classroom/GuardianInvitation.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Classroom/GuardianInvitation.php
deleted file mode 100644
index 390dee3f..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Classroom/GuardianInvitation.php
+++ /dev/null
@@ -1,66 +0,0 @@
-creationTime = $creationTime;
-  }
-  public function getCreationTime()
-  {
-    return $this->creationTime;
-  }
-  public function setInvitationId($invitationId)
-  {
-    $this->invitationId = $invitationId;
-  }
-  public function getInvitationId()
-  {
-    return $this->invitationId;
-  }
-  public function setInvitedEmailAddress($invitedEmailAddress)
-  {
-    $this->invitedEmailAddress = $invitedEmailAddress;
-  }
-  public function getInvitedEmailAddress()
-  {
-    return $this->invitedEmailAddress;
-  }
-  public function setState($state)
-  {
-    $this->state = $state;
-  }
-  public function getState()
-  {
-    return $this->state;
-  }
-  public function setStudentId($studentId)
-  {
-    $this->studentId = $studentId;
-  }
-  public function getStudentId()
-  {
-    return $this->studentId;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Classroom/Invitation.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Classroom/Invitation.php
deleted file mode 100644
index 298bf05e..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Classroom/Invitation.php
+++ /dev/null
@@ -1,57 +0,0 @@
-courseId = $courseId;
-  }
-  public function getCourseId()
-  {
-    return $this->courseId;
-  }
-  public function setId($id)
-  {
-    $this->id = $id;
-  }
-  public function getId()
-  {
-    return $this->id;
-  }
-  public function setRole($role)
-  {
-    $this->role = $role;
-  }
-  public function getRole()
-  {
-    return $this->role;
-  }
-  public function setUserId($userId)
-  {
-    $this->userId = $userId;
-  }
-  public function getUserId()
-  {
-    return $this->userId;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Classroom/Link.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Classroom/Link.php
deleted file mode 100644
index 89ca037a..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Classroom/Link.php
+++ /dev/null
@@ -1,48 +0,0 @@
-thumbnailUrl = $thumbnailUrl;
-  }
-  public function getThumbnailUrl()
-  {
-    return $this->thumbnailUrl;
-  }
-  public function setTitle($title)
-  {
-    $this->title = $title;
-  }
-  public function getTitle()
-  {
-    return $this->title;
-  }
-  public function setUrl($url)
-  {
-    $this->url = $url;
-  }
-  public function getUrl()
-  {
-    return $this->url;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Classroom/ListCourseAliasesResponse.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Classroom/ListCourseAliasesResponse.php
deleted file mode 100644
index c04e6e4c..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Classroom/ListCourseAliasesResponse.php
+++ /dev/null
@@ -1,41 +0,0 @@
-aliases = $aliases;
-  }
-  public function getAliases()
-  {
-    return $this->aliases;
-  }
-  public function setNextPageToken($nextPageToken)
-  {
-    $this->nextPageToken = $nextPageToken;
-  }
-  public function getNextPageToken()
-  {
-    return $this->nextPageToken;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Classroom/ListCourseWorkResponse.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Classroom/ListCourseWorkResponse.php
deleted file mode 100644
index dea448d4..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Classroom/ListCourseWorkResponse.php
+++ /dev/null
@@ -1,41 +0,0 @@
-courseWork = $courseWork;
-  }
-  public function getCourseWork()
-  {
-    return $this->courseWork;
-  }
-  public function setNextPageToken($nextPageToken)
-  {
-    $this->nextPageToken = $nextPageToken;
-  }
-  public function getNextPageToken()
-  {
-    return $this->nextPageToken;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Classroom/ListCoursesResponse.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Classroom/ListCoursesResponse.php
deleted file mode 100644
index d48ed59b..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Classroom/ListCoursesResponse.php
+++ /dev/null
@@ -1,41 +0,0 @@
-courses = $courses;
-  }
-  public function getCourses()
-  {
-    return $this->courses;
-  }
-  public function setNextPageToken($nextPageToken)
-  {
-    $this->nextPageToken = $nextPageToken;
-  }
-  public function getNextPageToken()
-  {
-    return $this->nextPageToken;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Classroom/ListGuardianInvitationsResponse.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Classroom/ListGuardianInvitationsResponse.php
deleted file mode 100644
index 6454931c..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Classroom/ListGuardianInvitationsResponse.php
+++ /dev/null
@@ -1,41 +0,0 @@
-guardianInvitations = $guardianInvitations;
-  }
-  public function getGuardianInvitations()
-  {
-    return $this->guardianInvitations;
-  }
-  public function setNextPageToken($nextPageToken)
-  {
-    $this->nextPageToken = $nextPageToken;
-  }
-  public function getNextPageToken()
-  {
-    return $this->nextPageToken;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Classroom/ListGuardiansResponse.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Classroom/ListGuardiansResponse.php
deleted file mode 100644
index 4183d5e4..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Classroom/ListGuardiansResponse.php
+++ /dev/null
@@ -1,41 +0,0 @@
-guardians = $guardians;
-  }
-  public function getGuardians()
-  {
-    return $this->guardians;
-  }
-  public function setNextPageToken($nextPageToken)
-  {
-    $this->nextPageToken = $nextPageToken;
-  }
-  public function getNextPageToken()
-  {
-    return $this->nextPageToken;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Classroom/ListInvitationsResponse.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Classroom/ListInvitationsResponse.php
deleted file mode 100644
index 0e85390b..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Classroom/ListInvitationsResponse.php
+++ /dev/null
@@ -1,41 +0,0 @@
-invitations = $invitations;
-  }
-  public function getInvitations()
-  {
-    return $this->invitations;
-  }
-  public function setNextPageToken($nextPageToken)
-  {
-    $this->nextPageToken = $nextPageToken;
-  }
-  public function getNextPageToken()
-  {
-    return $this->nextPageToken;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Classroom/ListStudentSubmissionsResponse.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Classroom/ListStudentSubmissionsResponse.php
deleted file mode 100644
index 7b052d51..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Classroom/ListStudentSubmissionsResponse.php
+++ /dev/null
@@ -1,41 +0,0 @@
-nextPageToken = $nextPageToken;
-  }
-  public function getNextPageToken()
-  {
-    return $this->nextPageToken;
-  }
-  public function setStudentSubmissions($studentSubmissions)
-  {
-    $this->studentSubmissions = $studentSubmissions;
-  }
-  public function getStudentSubmissions()
-  {
-    return $this->studentSubmissions;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Classroom/ListStudentsResponse.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Classroom/ListStudentsResponse.php
deleted file mode 100644
index 516a0d11..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Classroom/ListStudentsResponse.php
+++ /dev/null
@@ -1,41 +0,0 @@
-nextPageToken = $nextPageToken;
-  }
-  public function getNextPageToken()
-  {
-    return $this->nextPageToken;
-  }
-  public function setStudents($students)
-  {
-    $this->students = $students;
-  }
-  public function getStudents()
-  {
-    return $this->students;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Classroom/ListTeachersResponse.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Classroom/ListTeachersResponse.php
deleted file mode 100644
index ccfbdcd0..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Classroom/ListTeachersResponse.php
+++ /dev/null
@@ -1,41 +0,0 @@
-nextPageToken = $nextPageToken;
-  }
-  public function getNextPageToken()
-  {
-    return $this->nextPageToken;
-  }
-  public function setTeachers($teachers)
-  {
-    $this->teachers = $teachers;
-  }
-  public function getTeachers()
-  {
-    return $this->teachers;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Classroom/Material.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Classroom/Material.php
deleted file mode 100644
index 6f79c4ba..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Classroom/Material.php
+++ /dev/null
@@ -1,61 +0,0 @@
-driveFile = $driveFile;
-  }
-  public function getDriveFile()
-  {
-    return $this->driveFile;
-  }
-  public function setForm(Google_Service_Classroom_Form $form)
-  {
-    $this->form = $form;
-  }
-  public function getForm()
-  {
-    return $this->form;
-  }
-  public function setLink(Google_Service_Classroom_Link $link)
-  {
-    $this->link = $link;
-  }
-  public function getLink()
-  {
-    return $this->link;
-  }
-  public function setYoutubeVideo(Google_Service_Classroom_YouTubeVideo $youtubeVideo)
-  {
-    $this->youtubeVideo = $youtubeVideo;
-  }
-  public function getYoutubeVideo()
-  {
-    return $this->youtubeVideo;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Classroom/ModifyAttachmentsRequest.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Classroom/ModifyAttachmentsRequest.php
deleted file mode 100644
index 02afca76..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Classroom/ModifyAttachmentsRequest.php
+++ /dev/null
@@ -1,32 +0,0 @@
-addAttachments = $addAttachments;
-  }
-  public function getAddAttachments()
-  {
-    return $this->addAttachments;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Classroom/MultipleChoiceQuestion.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Classroom/MultipleChoiceQuestion.php
deleted file mode 100644
index 623e096d..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Classroom/MultipleChoiceQuestion.php
+++ /dev/null
@@ -1,31 +0,0 @@
-choices = $choices;
-  }
-  public function getChoices()
-  {
-    return $this->choices;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Classroom/MultipleChoiceSubmission.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Classroom/MultipleChoiceSubmission.php
deleted file mode 100644
index 9e4bb806..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Classroom/MultipleChoiceSubmission.php
+++ /dev/null
@@ -1,30 +0,0 @@
-answer = $answer;
-  }
-  public function getAnswer()
-  {
-    return $this->answer;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Classroom/Name.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Classroom/Name.php
deleted file mode 100644
index d0cf628a..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Classroom/Name.php
+++ /dev/null
@@ -1,48 +0,0 @@
-familyName = $familyName;
-  }
-  public function getFamilyName()
-  {
-    return $this->familyName;
-  }
-  public function setFullName($fullName)
-  {
-    $this->fullName = $fullName;
-  }
-  public function getFullName()
-  {
-    return $this->fullName;
-  }
-  public function setGivenName($givenName)
-  {
-    $this->givenName = $givenName;
-  }
-  public function getGivenName()
-  {
-    return $this->givenName;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Classroom/ReclaimStudentSubmissionRequest.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Classroom/ReclaimStudentSubmissionRequest.php
deleted file mode 100644
index 7b06c874..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Classroom/ReclaimStudentSubmissionRequest.php
+++ /dev/null
@@ -1,20 +0,0 @@
-
- *   $classroomService = new Google_Service_Classroom(...);
- *   $courses = $classroomService->courses;
- *  
- */
-class Google_Service_Classroom_Resource_Courses extends Google_Service_Resource
-{
-  /**
-   * Creates a course. The user specified in `ownerId` is the owner of the created
-   * course and added as a teacher. This method returns the following error codes:
-   * * `PERMISSION_DENIED` if the requesting user is not permitted to create
-   * courses or for access errors. * `NOT_FOUND` if the primary teacher is not a
-   * valid user. * `FAILED_PRECONDITION` if the course owner's account is disabled
-   * or for the following request errors: * UserGroupsMembershipLimitReached *
-   * `ALREADY_EXISTS` if an alias was specified in the `id` and already exists.
-   * (courses.create)
-   *
-   * @param Google_Service_Classroom_Course $postBody
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Classroom_Course
-   */
-  public function create(Google_Service_Classroom_Course $postBody, $optParams = array())
-  {
-    $params = array('postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('create', array($params), "Google_Service_Classroom_Course");
-  }
-  /**
-   * Deletes a course. This method returns the following error codes: *
-   * `PERMISSION_DENIED` if the requesting user is not permitted to delete the
-   * requested course or for access errors. * `NOT_FOUND` if no course exists with
-   * the requested ID. (courses.delete)
-   *
-   * @param string $id Identifier of the course to delete. This identifier can be
-   * either the Classroom-assigned identifier or an alias.
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Classroom_ClassroomEmpty
-   */
-  public function delete($id, $optParams = array())
-  {
-    $params = array('id' => $id);
-    $params = array_merge($params, $optParams);
-    return $this->call('delete', array($params), "Google_Service_Classroom_ClassroomEmpty");
-  }
-  /**
-   * Returns a course. This method returns the following error codes: *
-   * `PERMISSION_DENIED` if the requesting user is not permitted to access the
-   * requested course or for access errors. * `NOT_FOUND` if no course exists with
-   * the requested ID. (courses.get)
-   *
-   * @param string $id Identifier of the course to return. This identifier can be
-   * either the Classroom-assigned identifier or an alias.
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Classroom_Course
-   */
-  public function get($id, $optParams = array())
-  {
-    $params = array('id' => $id);
-    $params = array_merge($params, $optParams);
-    return $this->call('get', array($params), "Google_Service_Classroom_Course");
-  }
-  /**
-   * Returns a list of courses that the requesting user is permitted to view,
-   * restricted to those that match the request. This method returns the following
-   * error codes: * `PERMISSION_DENIED` for access errors. * `INVALID_ARGUMENT` if
-   * the query argument is malformed. * `NOT_FOUND` if any users specified in the
-   * query arguments do not exist. (courses.listCourses)
-   *
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param string studentId Restricts returned courses to those having a
-   * student with the specified identifier. The identifier can be one of the
-   * following: * the numeric identifier for the user * the email address of the
-   * user * the string literal `"me"`, indicating the requesting user
-   * @opt_param string teacherId Restricts returned courses to those having a
-   * teacher with the specified identifier. The identifier can be one of the
-   * following: * the numeric identifier for the user * the email address of the
-   * user * the string literal `"me"`, indicating the requesting user
-   * @opt_param string courseStates Restricts returned courses to those in one of
-   * the specified states
-   * @opt_param int pageSize Maximum number of items to return. Zero or
-   * unspecified indicates that the server may assign a maximum. The server may
-   * return fewer than the specified number of results.
-   * @opt_param string pageToken nextPageToken value returned from a previous list
-   * call, indicating that the subsequent page of results should be returned. The
-   * list request must be otherwise identical to the one that resulted in this
-   * token.
-   * @return Google_Service_Classroom_ListCoursesResponse
-   */
-  public function listCourses($optParams = array())
-  {
-    $params = array();
-    $params = array_merge($params, $optParams);
-    return $this->call('list', array($params), "Google_Service_Classroom_ListCoursesResponse");
-  }
-  /**
-   * Updates one or more fields in a course. This method returns the following
-   * error codes: * `PERMISSION_DENIED` if the requesting user is not permitted to
-   * modify the requested course or for access errors. * `NOT_FOUND` if no course
-   * exists with the requested ID. * `INVALID_ARGUMENT` if invalid fields are
-   * specified in the update mask or if no update mask is supplied. *
-   * `FAILED_PRECONDITION` for the following request errors: * CourseNotModifiable
-   * (courses.patch)
-   *
-   * @param string $id Identifier of the course to update. This identifier can be
-   * either the Classroom-assigned identifier or an alias.
-   * @param Google_Service_Classroom_Course $postBody
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param string updateMask Mask that identifies which fields on the course
-   * to update. This field is required to do an update. The update will fail if
-   * invalid fields are specified. The following fields are valid: * `name` *
-   * `section` * `descriptionHeading` * `description` * `room` * `courseState`
-   * When set in a query parameter, this field should be specified as
-   * `updateMask=,,...`
-   * @return Google_Service_Classroom_Course
-   */
-  public function patch($id, Google_Service_Classroom_Course $postBody, $optParams = array())
-  {
-    $params = array('id' => $id, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('patch', array($params), "Google_Service_Classroom_Course");
-  }
-  /**
-   * Updates a course. This method returns the following error codes: *
-   * `PERMISSION_DENIED` if the requesting user is not permitted to modify the
-   * requested course or for access errors. * `NOT_FOUND` if no course exists with
-   * the requested ID. * `FAILED_PRECONDITION` for the following request errors: *
-   * CourseNotModifiable (courses.update)
-   *
-   * @param string $id Identifier of the course to update. This identifier can be
-   * either the Classroom-assigned identifier or an alias.
-   * @param Google_Service_Classroom_Course $postBody
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Classroom_Course
-   */
-  public function update($id, Google_Service_Classroom_Course $postBody, $optParams = array())
-  {
-    $params = array('id' => $id, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('update', array($params), "Google_Service_Classroom_Course");
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Classroom/Resource/CoursesAliases.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Classroom/Resource/CoursesAliases.php
deleted file mode 100644
index 8ee78852..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Classroom/Resource/CoursesAliases.php
+++ /dev/null
@@ -1,91 +0,0 @@
-
- *   $classroomService = new Google_Service_Classroom(...);
- *   $aliases = $classroomService->aliases;
- *  
- */
-class Google_Service_Classroom_Resource_CoursesAliases extends Google_Service_Resource
-{
-  /**
-   * Creates an alias for a course. This method returns the following error codes:
-   * * `PERMISSION_DENIED` if the requesting user is not permitted to create the
-   * alias or for access errors. * `NOT_FOUND` if the course does not exist. *
-   * `ALREADY_EXISTS` if the alias already exists. (aliases.create)
-   *
-   * @param string $courseId Identifier of the course to alias. This identifier
-   * can be either the Classroom-assigned identifier or an alias.
-   * @param Google_Service_Classroom_CourseAlias $postBody
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Classroom_CourseAlias
-   */
-  public function create($courseId, Google_Service_Classroom_CourseAlias $postBody, $optParams = array())
-  {
-    $params = array('courseId' => $courseId, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('create', array($params), "Google_Service_Classroom_CourseAlias");
-  }
-  /**
-   * Deletes an alias of a course. This method returns the following error codes:
-   * * `PERMISSION_DENIED` if the requesting user is not permitted to remove the
-   * alias or for access errors. * `NOT_FOUND` if the alias does not exist.
-   * (aliases.delete)
-   *
-   * @param string $courseId Identifier of the course whose alias should be
-   * deleted. This identifier can be either the Classroom-assigned identifier or
-   * an alias.
-   * @param string $alias Alias to delete. This may not be the Classroom-assigned
-   * identifier.
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Classroom_ClassroomEmpty
-   */
-  public function delete($courseId, $alias, $optParams = array())
-  {
-    $params = array('courseId' => $courseId, 'alias' => $alias);
-    $params = array_merge($params, $optParams);
-    return $this->call('delete', array($params), "Google_Service_Classroom_ClassroomEmpty");
-  }
-  /**
-   * Returns a list of aliases for a course. This method returns the following
-   * error codes: * `PERMISSION_DENIED` if the requesting user is not permitted to
-   * access the course or for access errors. * `NOT_FOUND` if the course does not
-   * exist. (aliases.listCoursesAliases)
-   *
-   * @param string $courseId The identifier of the course. This identifier can be
-   * either the Classroom-assigned identifier or an alias.
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param int pageSize Maximum number of items to return. Zero or
-   * unspecified indicates that the server may assign a maximum. The server may
-   * return fewer than the specified number of results.
-   * @opt_param string pageToken nextPageToken value returned from a previous list
-   * call, indicating that the subsequent page of results should be returned. The
-   * list request must be otherwise identical to the one that resulted in this
-   * token.
-   * @return Google_Service_Classroom_ListCourseAliasesResponse
-   */
-  public function listCoursesAliases($courseId, $optParams = array())
-  {
-    $params = array('courseId' => $courseId);
-    $params = array_merge($params, $optParams);
-    return $this->call('list', array($params), "Google_Service_Classroom_ListCourseAliasesResponse");
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Classroom/Resource/CoursesCourseWork.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Classroom/Resource/CoursesCourseWork.php
deleted file mode 100644
index a212dbc1..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Classroom/Resource/CoursesCourseWork.php
+++ /dev/null
@@ -1,170 +0,0 @@
-
- *   $classroomService = new Google_Service_Classroom(...);
- *   $courseWork = $classroomService->courseWork;
- *  
- */
-class Google_Service_Classroom_Resource_CoursesCourseWork extends Google_Service_Resource
-{
-  /**
-   * Creates course work. The resulting course work (and corresponding student
-   * submissions) are associated with the Developer Console project of the [OAuth
-   * client ID](https://support.google.com/cloud/answer/6158849) used to make the
-   * request. Classroom API requests to modify course work and student submissions
-   * must be made with an OAuth client ID from the associated Developer Console
-   * project. This method returns the following error codes: * `PERMISSION_DENIED`
-   * if the requesting user is not permitted to access the requested course,
-   * create course work in the requested course, share a Drive attachment, or for
-   * access errors. * `INVALID_ARGUMENT` if the request is malformed. *
-   * `NOT_FOUND` if the requested course does not exist. * `FAILED_PRECONDITION`
-   * for the following request error: * AttachmentNotVisible (courseWork.create)
-   *
-   * @param string $courseId Identifier of the course. This identifier can be
-   * either the Classroom-assigned identifier or an alias.
-   * @param Google_Service_Classroom_CourseWork $postBody
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Classroom_CourseWork
-   */
-  public function create($courseId, Google_Service_Classroom_CourseWork $postBody, $optParams = array())
-  {
-    $params = array('courseId' => $courseId, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('create', array($params), "Google_Service_Classroom_CourseWork");
-  }
-  /**
-   * Deletes a course work. This request must be made by the Developer Console
-   * project of the [OAuth client
-   * ID](https://support.google.com/cloud/answer/6158849) used to create the
-   * corresponding course work item. This method returns the following error
-   * codes: * `PERMISSION_DENIED` if the requesting developer project did not
-   * create the corresponding course work, if the requesting user is not permitted
-   * to delete the requested course or for access errors. * `FAILED_PRECONDITION`
-   * if the requested course work has already been deleted. * `NOT_FOUND` if no
-   * course exists with the requested ID. (courseWork.delete)
-   *
-   * @param string $courseId Identifier of the course. This identifier can be
-   * either the Classroom-assigned identifier or an alias.
-   * @param string $id Identifier of the course work to delete. This identifier is
-   * a Classroom-assigned identifier.
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Classroom_ClassroomEmpty
-   */
-  public function delete($courseId, $id, $optParams = array())
-  {
-    $params = array('courseId' => $courseId, 'id' => $id);
-    $params = array_merge($params, $optParams);
-    return $this->call('delete', array($params), "Google_Service_Classroom_ClassroomEmpty");
-  }
-  /**
-   * Returns course work. This method returns the following error codes: *
-   * `PERMISSION_DENIED` if the requesting user is not permitted to access the
-   * requested course or course work, or for access errors. * `INVALID_ARGUMENT`
-   * if the request is malformed. * `NOT_FOUND` if the requested course or course
-   * work does not exist. (courseWork.get)
-   *
-   * @param string $courseId Identifier of the course. This identifier can be
-   * either the Classroom-assigned identifier or an alias.
-   * @param string $id Identifier of the course work.
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Classroom_CourseWork
-   */
-  public function get($courseId, $id, $optParams = array())
-  {
-    $params = array('courseId' => $courseId, 'id' => $id);
-    $params = array_merge($params, $optParams);
-    return $this->call('get', array($params), "Google_Service_Classroom_CourseWork");
-  }
-  /**
-   * Returns a list of course work that the requester is permitted to view. Course
-   * students may only view `PUBLISHED` course work. Course teachers and domain
-   * administrators may view all course work. This method returns the following
-   * error codes: * `PERMISSION_DENIED` if the requesting user is not permitted to
-   * access the requested course or for access errors. * `INVALID_ARGUMENT` if the
-   * request is malformed. * `NOT_FOUND` if the requested course does not exist.
-   * (courseWork.listCoursesCourseWork)
-   *
-   * @param string $courseId Identifier of the course. This identifier can be
-   * either the Classroom-assigned identifier or an alias.
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param string courseWorkStates Restriction on the work status to return.
-   * Only courseWork that matches is returned. If unspecified, items with a work
-   * status of `PUBLISHED` is returned.
-   * @opt_param string orderBy Optional sort ordering for results. A comma-
-   * separated list of fields with an optional sort direction keyword. Supported
-   * fields are `updateTime` and `dueDate`. Supported direction keywords are `asc`
-   * and `desc`. If not specified, `updateTime desc` is the default behavior.
-   * Examples: `dueDate asc,updateTime desc`, `updateTime,dueDate desc`
-   * @opt_param int pageSize Maximum number of items to return. Zero or
-   * unspecified indicates that the server may assign a maximum. The server may
-   * return fewer than the specified number of results.
-   * @opt_param string pageToken nextPageToken value returned from a previous list
-   * call, indicating that the subsequent page of results should be returned. The
-   * list request must be otherwise identical to the one that resulted in this
-   * token.
-   * @return Google_Service_Classroom_ListCourseWorkResponse
-   */
-  public function listCoursesCourseWork($courseId, $optParams = array())
-  {
-    $params = array('courseId' => $courseId);
-    $params = array_merge($params, $optParams);
-    return $this->call('list', array($params), "Google_Service_Classroom_ListCourseWorkResponse");
-  }
-  /**
-   * Updates one or more fields of a course work. See
-   * google.classroom.v1.CourseWork for details of which fields may be updated and
-   * who may change them. This request must be made by the Developer Console
-   * project of the [OAuth client
-   * ID](https://support.google.com/cloud/answer/6158849) used to create the
-   * corresponding course work item. This method returns the following error
-   * codes: * `PERMISSION_DENIED` if the requesting developer project did not
-   * create the corresponding course work, if the user is not permitted to make
-   * the requested modification to the student submission, or for access errors. *
-   * `INVALID_ARGUMENT` if the request is malformed. * `FAILED_PRECONDITION` if
-   * the requested course work has already been deleted. * `NOT_FOUND` if the
-   * requested course, course work, or student submission does not exist.
-   * (courseWork.patch)
-   *
-   * @param string $courseId Identifier of the course. This identifier can be
-   * either the Classroom-assigned identifier or an alias.
-   * @param string $id Identifier of the course work.
-   * @param Google_Service_Classroom_CourseWork $postBody
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param string updateMask Mask that identifies which fields on the course
-   * work to update. This field is required to do an update. The update fails if
-   * invalid fields are specified. If a field supports empty values, it can be
-   * cleared by specifying it in the update mask and not in the CourseWork object.
-   * If a field that does not support empty values is included in the update mask
-   * and not set in the CourseWork object, an `INVALID_ARGUMENT` error will be
-   * returned. The following fields may be specified by teachers: * `title` *
-   * `description` * `state` * `due_date` * `due_time` * `max_points` *
-   * `submission_modification_mode`
-   * @return Google_Service_Classroom_CourseWork
-   */
-  public function patch($courseId, $id, Google_Service_Classroom_CourseWork $postBody, $optParams = array())
-  {
-    $params = array('courseId' => $courseId, 'id' => $id, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('patch', array($params), "Google_Service_Classroom_CourseWork");
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Classroom/Resource/CoursesCourseWorkStudentSubmissions.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Classroom/Resource/CoursesCourseWorkStudentSubmissions.php
deleted file mode 100644
index 8e0b3d21..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Classroom/Resource/CoursesCourseWorkStudentSubmissions.php
+++ /dev/null
@@ -1,240 +0,0 @@
-
- *   $classroomService = new Google_Service_Classroom(...);
- *   $studentSubmissions = $classroomService->studentSubmissions;
- *  
- */
-class Google_Service_Classroom_Resource_CoursesCourseWorkStudentSubmissions extends Google_Service_Resource
-{
-  /**
-   * Returns a student submission. * `PERMISSION_DENIED` if the requesting user is
-   * not permitted to access the requested course, course work, or student
-   * submission or for access errors. * `INVALID_ARGUMENT` if the request is
-   * malformed. * `NOT_FOUND` if the requested course, course work, or student
-   * submission does not exist. (studentSubmissions.get)
-   *
-   * @param string $courseId Identifier of the course. This identifier can be
-   * either the Classroom-assigned identifier or an alias.
-   * @param string $courseWorkId Identifier of the course work.
-   * @param string $id Identifier of the student submission.
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Classroom_StudentSubmission
-   */
-  public function get($courseId, $courseWorkId, $id, $optParams = array())
-  {
-    $params = array('courseId' => $courseId, 'courseWorkId' => $courseWorkId, 'id' => $id);
-    $params = array_merge($params, $optParams);
-    return $this->call('get', array($params), "Google_Service_Classroom_StudentSubmission");
-  }
-  /**
-   * Returns a list of student submissions that the requester is permitted to
-   * view, factoring in the OAuth scopes of the request. `-` may be specified as
-   * the `course_work_id` to include student submissions for multiple course work
-   * items. Course students may only view their own work. Course teachers and
-   * domain administrators may view all student submissions. This method returns
-   * the following error codes: * `PERMISSION_DENIED` if the requesting user is
-   * not permitted to access the requested course or course work, or for access
-   * errors. * `INVALID_ARGUMENT` if the request is malformed. * `NOT_FOUND` if
-   * the requested course does not exist.
-   * (studentSubmissions.listCoursesCourseWorkStudentSubmissions)
-   *
-   * @param string $courseId Identifier of the course. This identifier can be
-   * either the Classroom-assigned identifier or an alias.
-   * @param string $courseWorkId Identifer of the student work to request. This
-   * may be set to the string literal `"-"` to request student work for all course
-   * work in the specified course.
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param string userId Optional argument to restrict returned student work
-   * to those owned by the student with the specified identifier. The identifier
-   * can be one of the following: * the numeric identifier for the user * the
-   * email address of the user * the string literal `"me"`, indicating the
-   * requesting user
-   * @opt_param string states Requested submission states. If specified, returned
-   * student submissions match one of the specified submission states.
-   * @opt_param string late Requested lateness value. If specified, returned
-   * student submissions are restricted by the requested value. If unspecified,
-   * submissions are returned regardless of `late` value.
-   * @opt_param int pageSize Maximum number of items to return. Zero or
-   * unspecified indicates that the server may assign a maximum. The server may
-   * return fewer than the specified number of results.
-   * @opt_param string pageToken nextPageToken value returned from a previous list
-   * call, indicating that the subsequent page of results should be returned. The
-   * list request must be otherwise identical to the one that resulted in this
-   * token.
-   * @return Google_Service_Classroom_ListStudentSubmissionsResponse
-   */
-  public function listCoursesCourseWorkStudentSubmissions($courseId, $courseWorkId, $optParams = array())
-  {
-    $params = array('courseId' => $courseId, 'courseWorkId' => $courseWorkId);
-    $params = array_merge($params, $optParams);
-    return $this->call('list', array($params), "Google_Service_Classroom_ListStudentSubmissionsResponse");
-  }
-  /**
-   * Modifies attachments of student submission. Attachments may only be added to
-   * student submissions belonging to course work objects with a `workType` of
-   * `ASSIGNMENT`. This request must be made by the Developer Console project of
-   * the [OAuth client ID](https://support.google.com/cloud/answer/6158849) used
-   * to create the corresponding course work item. This method returns the
-   * following error codes: * `PERMISSION_DENIED` if the requesting user is not
-   * permitted to access the requested course or course work, if the user is not
-   * permitted to modify attachments on the requested student submission, or for
-   * access errors. * `INVALID_ARGUMENT` if the request is malformed. *
-   * `NOT_FOUND` if the requested course, course work, or student submission does
-   * not exist. (studentSubmissions.modifyAttachments)
-   *
-   * @param string $courseId Identifier of the course. This identifier can be
-   * either the Classroom-assigned identifier or an alias.
-   * @param string $courseWorkId Identifier of the course work.
-   * @param string $id Identifier of the student submission.
-   * @param Google_Service_Classroom_ModifyAttachmentsRequest $postBody
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Classroom_StudentSubmission
-   */
-  public function modifyAttachments($courseId, $courseWorkId, $id, Google_Service_Classroom_ModifyAttachmentsRequest $postBody, $optParams = array())
-  {
-    $params = array('courseId' => $courseId, 'courseWorkId' => $courseWorkId, 'id' => $id, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('modifyAttachments', array($params), "Google_Service_Classroom_StudentSubmission");
-  }
-  /**
-   * Updates one or more fields of a student submission. See
-   * google.classroom.v1.StudentSubmission for details of which fields may be
-   * updated and who may change them. This request must be made by the Developer
-   * Console project of the [OAuth client
-   * ID](https://support.google.com/cloud/answer/6158849) used to create the
-   * corresponding course work item. This method returns the following error
-   * codes: * `PERMISSION_DENIED` if the requesting developer project did not
-   * create the corresponding course work, if the user is not permitted to make
-   * the requested modification to the student submission, or for access errors. *
-   * `INVALID_ARGUMENT` if the request is malformed. * `NOT_FOUND` if the
-   * requested course, course work, or student submission does not exist.
-   * (studentSubmissions.patch)
-   *
-   * @param string $courseId Identifier of the course. This identifier can be
-   * either the Classroom-assigned identifier or an alias.
-   * @param string $courseWorkId Identifier of the course work.
-   * @param string $id Identifier of the student submission.
-   * @param Google_Service_Classroom_StudentSubmission $postBody
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param string updateMask Mask that identifies which fields on the student
-   * submission to update. This field is required to do an update. The update
-   * fails if invalid fields are specified. The following fields may be specified
-   * by teachers: * `draft_grade` * `assigned_grade`
-   * @return Google_Service_Classroom_StudentSubmission
-   */
-  public function patch($courseId, $courseWorkId, $id, Google_Service_Classroom_StudentSubmission $postBody, $optParams = array())
-  {
-    $params = array('courseId' => $courseId, 'courseWorkId' => $courseWorkId, 'id' => $id, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('patch', array($params), "Google_Service_Classroom_StudentSubmission");
-  }
-  /**
-   * Reclaims a student submission on behalf of the student that owns it.
-   * Reclaiming a student submission transfers ownership of attached Drive files
-   * to the student and update the submission state. Only the student that owns
-   * the requested student submission may call this method, and only for a student
-   * submission that has been turned in. This request must be made by the
-   * Developer Console project of the [OAuth client
-   * ID](https://support.google.com/cloud/answer/6158849) used to create the
-   * corresponding course work item. This method returns the following error
-   * codes: * `PERMISSION_DENIED` if the requesting user is not permitted to
-   * access the requested course or course work, unsubmit the requested student
-   * submission, or for access errors. * `FAILED_PRECONDITION` if the student
-   * submission has not been turned in. * `INVALID_ARGUMENT` if the request is
-   * malformed. * `NOT_FOUND` if the requested course, course work, or student
-   * submission does not exist. (studentSubmissions.reclaim)
-   *
-   * @param string $courseId Identifier of the course. This identifier can be
-   * either the Classroom-assigned identifier or an alias.
-   * @param string $courseWorkId Identifier of the course work.
-   * @param string $id Identifier of the student submission.
-   * @param Google_Service_Classroom_ReclaimStudentSubmissionRequest $postBody
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Classroom_ClassroomEmpty
-   */
-  public function reclaim($courseId, $courseWorkId, $id, Google_Service_Classroom_ReclaimStudentSubmissionRequest $postBody, $optParams = array())
-  {
-    $params = array('courseId' => $courseId, 'courseWorkId' => $courseWorkId, 'id' => $id, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('reclaim', array($params), "Google_Service_Classroom_ClassroomEmpty");
-  }
-  /**
-   * Returns a student submission. Returning a student submission transfers
-   * ownership of attached Drive files to the student and may also update the
-   * submission state. Unlike the Classroom application, returning a student
-   * submission does not set assignedGrade to the draftGrade value. Only a teacher
-   * of the course that contains the requested student submission may call this
-   * method. This request must be made by the Developer Console project of the
-   * [OAuth client ID](https://support.google.com/cloud/answer/6158849) used to
-   * create the corresponding course work item. This method returns the following
-   * error codes: * `PERMISSION_DENIED` if the requesting user is not permitted to
-   * access the requested course or course work, return the requested student
-   * submission, or for access errors. * `INVALID_ARGUMENT` if the request is
-   * malformed. * `NOT_FOUND` if the requested course, course work, or student
-   * submission does not exist.
-   * (studentSubmissions.returnCoursesCourseWorkStudentSubmissions)
-   *
-   * @param string $courseId Identifier of the course. This identifier can be
-   * either the Classroom-assigned identifier or an alias.
-   * @param string $courseWorkId Identifier of the course work.
-   * @param string $id Identifier of the student submission.
-   * @param Google_Service_Classroom_ReturnStudentSubmissionRequest $postBody
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Classroom_ClassroomEmpty
-   */
-  public function returnCoursesCourseWorkStudentSubmissions($courseId, $courseWorkId, $id, Google_Service_Classroom_ReturnStudentSubmissionRequest $postBody, $optParams = array())
-  {
-    $params = array('courseId' => $courseId, 'courseWorkId' => $courseWorkId, 'id' => $id, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('return', array($params), "Google_Service_Classroom_ClassroomEmpty");
-  }
-  /**
-   * Turns in a student submission. Turning in a student submission transfers
-   * ownership of attached Drive files to the teacher and may also update the
-   * submission state. This may only be called by the student that owns the
-   * specified student submission. This request must be made by the Developer
-   * Console project of the [OAuth client
-   * ID](https://support.google.com/cloud/answer/6158849) used to create the
-   * corresponding course work item. This method returns the following error
-   * codes: * `PERMISSION_DENIED` if the requesting user is not permitted to
-   * access the requested course or course work, turn in the requested student
-   * submission, or for access errors. * `INVALID_ARGUMENT` if the request is
-   * malformed. * `NOT_FOUND` if the requested course, course work, or student
-   * submission does not exist. (studentSubmissions.turnIn)
-   *
-   * @param string $courseId Identifier of the course. This identifier can be
-   * either the Classroom-assigned identifier or an alias.
-   * @param string $courseWorkId Identifier of the course work.
-   * @param string $id Identifier of the student submission.
-   * @param Google_Service_Classroom_TurnInStudentSubmissionRequest $postBody
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Classroom_ClassroomEmpty
-   */
-  public function turnIn($courseId, $courseWorkId, $id, Google_Service_Classroom_TurnInStudentSubmissionRequest $postBody, $optParams = array())
-  {
-    $params = array('courseId' => $courseId, 'courseWorkId' => $courseWorkId, 'id' => $id, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('turnIn', array($params), "Google_Service_Classroom_ClassroomEmpty");
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Classroom/Resource/CoursesStudents.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Classroom/Resource/CoursesStudents.php
deleted file mode 100644
index 2f6855cb..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Classroom/Resource/CoursesStudents.php
+++ /dev/null
@@ -1,123 +0,0 @@
-
- *   $classroomService = new Google_Service_Classroom(...);
- *   $students = $classroomService->students;
- *  
- */
-class Google_Service_Classroom_Resource_CoursesStudents extends Google_Service_Resource
-{
-  /**
-   * Adds a user as a student of a course. This method returns the following error
-   * codes: * `PERMISSION_DENIED` if the requesting user is not permitted to
-   * create students in this course or for access errors. * `NOT_FOUND` if the
-   * requested course ID does not exist. * `FAILED_PRECONDITION` if the requested
-   * user's account is disabled, for the following request errors: *
-   * CourseMemberLimitReached * CourseNotModifiable *
-   * UserGroupsMembershipLimitReached * `ALREADY_EXISTS` if the user is already a
-   * student or teacher in the course. (students.create)
-   *
-   * @param string $courseId Identifier of the course to create the student in.
-   * This identifier can be either the Classroom-assigned identifier or an alias.
-   * @param Google_Service_Classroom_Student $postBody
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param string enrollmentCode Enrollment code of the course to create the
-   * student in. This code is required if userId corresponds to the requesting
-   * user; it may be omitted if the requesting user has administrative permissions
-   * to create students for any user.
-   * @return Google_Service_Classroom_Student
-   */
-  public function create($courseId, Google_Service_Classroom_Student $postBody, $optParams = array())
-  {
-    $params = array('courseId' => $courseId, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('create', array($params), "Google_Service_Classroom_Student");
-  }
-  /**
-   * Deletes a student of a course. This method returns the following error codes:
-   * * `PERMISSION_DENIED` if the requesting user is not permitted to delete
-   * students of this course or for access errors. * `NOT_FOUND` if no student of
-   * this course has the requested ID or if the course does not exist.
-   * (students.delete)
-   *
-   * @param string $courseId Identifier of the course. This identifier can be
-   * either the Classroom-assigned identifier or an alias.
-   * @param string $userId Identifier of the student to delete. The identifier can
-   * be one of the following: * the numeric identifier for the user * the email
-   * address of the user * the string literal `"me"`, indicating the requesting
-   * user
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Classroom_ClassroomEmpty
-   */
-  public function delete($courseId, $userId, $optParams = array())
-  {
-    $params = array('courseId' => $courseId, 'userId' => $userId);
-    $params = array_merge($params, $optParams);
-    return $this->call('delete', array($params), "Google_Service_Classroom_ClassroomEmpty");
-  }
-  /**
-   * Returns a student of a course. This method returns the following error codes:
-   * * `PERMISSION_DENIED` if the requesting user is not permitted to view
-   * students of this course or for access errors. * `NOT_FOUND` if no student of
-   * this course has the requested ID or if the course does not exist.
-   * (students.get)
-   *
-   * @param string $courseId Identifier of the course. This identifier can be
-   * either the Classroom-assigned identifier or an alias.
-   * @param string $userId Identifier of the student to return. The identifier can
-   * be one of the following: * the numeric identifier for the user * the email
-   * address of the user * the string literal `"me"`, indicating the requesting
-   * user
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Classroom_Student
-   */
-  public function get($courseId, $userId, $optParams = array())
-  {
-    $params = array('courseId' => $courseId, 'userId' => $userId);
-    $params = array_merge($params, $optParams);
-    return $this->call('get', array($params), "Google_Service_Classroom_Student");
-  }
-  /**
-   * Returns a list of students of this course that the requester is permitted to
-   * view. This method returns the following error codes: * `NOT_FOUND` if the
-   * course does not exist. * `PERMISSION_DENIED` for access errors.
-   * (students.listCoursesStudents)
-   *
-   * @param string $courseId Identifier of the course. This identifier can be
-   * either the Classroom-assigned identifier or an alias.
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param int pageSize Maximum number of items to return. Zero means no
-   * maximum. The server may return fewer than the specified number of results.
-   * @opt_param string pageToken nextPageToken value returned from a previous list
-   * call, indicating that the subsequent page of results should be returned. The
-   * list request must be otherwise identical to the one that resulted in this
-   * token.
-   * @return Google_Service_Classroom_ListStudentsResponse
-   */
-  public function listCoursesStudents($courseId, $optParams = array())
-  {
-    $params = array('courseId' => $courseId);
-    $params = array_merge($params, $optParams);
-    return $this->call('list', array($params), "Google_Service_Classroom_ListStudentsResponse");
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Classroom/Resource/CoursesTeachers.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Classroom/Resource/CoursesTeachers.php
deleted file mode 100644
index 881a74b5..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Classroom/Resource/CoursesTeachers.php
+++ /dev/null
@@ -1,119 +0,0 @@
-
- *   $classroomService = new Google_Service_Classroom(...);
- *   $teachers = $classroomService->teachers;
- *  
- */
-class Google_Service_Classroom_Resource_CoursesTeachers extends Google_Service_Resource
-{
-  /**
-   * Creates a teacher of a course. This method returns the following error codes:
-   * * `PERMISSION_DENIED` if the requesting user is not permitted to create
-   * teachers in this course or for access errors. * `NOT_FOUND` if the requested
-   * course ID does not exist. * `FAILED_PRECONDITION` if the requested user's
-   * account is disabled, for the following request errors: *
-   * CourseMemberLimitReached * CourseNotModifiable * CourseTeacherLimitReached *
-   * UserGroupsMembershipLimitReached * `ALREADY_EXISTS` if the user is already a
-   * teacher or student in the course. (teachers.create)
-   *
-   * @param string $courseId Identifier of the course. This identifier can be
-   * either the Classroom-assigned identifier or an alias.
-   * @param Google_Service_Classroom_Teacher $postBody
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Classroom_Teacher
-   */
-  public function create($courseId, Google_Service_Classroom_Teacher $postBody, $optParams = array())
-  {
-    $params = array('courseId' => $courseId, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('create', array($params), "Google_Service_Classroom_Teacher");
-  }
-  /**
-   * Deletes a teacher of a course. This method returns the following error codes:
-   * * `PERMISSION_DENIED` if the requesting user is not permitted to delete
-   * teachers of this course or for access errors. * `NOT_FOUND` if no teacher of
-   * this course has the requested ID or if the course does not exist. *
-   * `FAILED_PRECONDITION` if the requested ID belongs to the primary teacher of
-   * this course. (teachers.delete)
-   *
-   * @param string $courseId Identifier of the course. This identifier can be
-   * either the Classroom-assigned identifier or an alias.
-   * @param string $userId Identifier of the teacher to delete. The identifier can
-   * be one of the following: * the numeric identifier for the user * the email
-   * address of the user * the string literal `"me"`, indicating the requesting
-   * user
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Classroom_ClassroomEmpty
-   */
-  public function delete($courseId, $userId, $optParams = array())
-  {
-    $params = array('courseId' => $courseId, 'userId' => $userId);
-    $params = array_merge($params, $optParams);
-    return $this->call('delete', array($params), "Google_Service_Classroom_ClassroomEmpty");
-  }
-  /**
-   * Returns a teacher of a course. This method returns the following error codes:
-   * * `PERMISSION_DENIED` if the requesting user is not permitted to view
-   * teachers of this course or for access errors. * `NOT_FOUND` if no teacher of
-   * this course has the requested ID or if the course does not exist.
-   * (teachers.get)
-   *
-   * @param string $courseId Identifier of the course. This identifier can be
-   * either the Classroom-assigned identifier or an alias.
-   * @param string $userId Identifier of the teacher to return. The identifier can
-   * be one of the following: * the numeric identifier for the user * the email
-   * address of the user * the string literal `"me"`, indicating the requesting
-   * user
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Classroom_Teacher
-   */
-  public function get($courseId, $userId, $optParams = array())
-  {
-    $params = array('courseId' => $courseId, 'userId' => $userId);
-    $params = array_merge($params, $optParams);
-    return $this->call('get', array($params), "Google_Service_Classroom_Teacher");
-  }
-  /**
-   * Returns a list of teachers of this course that the requester is permitted to
-   * view. This method returns the following error codes: * `NOT_FOUND` if the
-   * course does not exist. * `PERMISSION_DENIED` for access errors.
-   * (teachers.listCoursesTeachers)
-   *
-   * @param string $courseId Identifier of the course. This identifier can be
-   * either the Classroom-assigned identifier or an alias.
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param int pageSize Maximum number of items to return. Zero means no
-   * maximum. The server may return fewer than the specified number of results.
-   * @opt_param string pageToken nextPageToken value returned from a previous list
-   * call, indicating that the subsequent page of results should be returned. The
-   * list request must be otherwise identical to the one that resulted in this
-   * token.
-   * @return Google_Service_Classroom_ListTeachersResponse
-   */
-  public function listCoursesTeachers($courseId, $optParams = array())
-  {
-    $params = array('courseId' => $courseId);
-    $params = array_merge($params, $optParams);
-    return $this->call('list', array($params), "Google_Service_Classroom_ListTeachersResponse");
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Classroom/Resource/Invitations.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Classroom/Resource/Invitations.php
deleted file mode 100644
index 6c946833..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Classroom/Resource/Invitations.php
+++ /dev/null
@@ -1,131 +0,0 @@
-
- *   $classroomService = new Google_Service_Classroom(...);
- *   $invitations = $classroomService->invitations;
- *  
- */
-class Google_Service_Classroom_Resource_Invitations extends Google_Service_Resource
-{
-  /**
-   * Accepts an invitation, removing it and adding the invited user to the
-   * teachers or students (as appropriate) of the specified course. Only the
-   * invited user may accept an invitation. This method returns the following
-   * error codes: * `PERMISSION_DENIED` if the requesting user is not permitted to
-   * accept the requested invitation or for access errors. * `FAILED_PRECONDITION`
-   * for the following request errors: * CourseMemberLimitReached *
-   * CourseNotModifiable * CourseTeacherLimitReached *
-   * UserGroupsMembershipLimitReached * `NOT_FOUND` if no invitation exists with
-   * the requested ID. (invitations.accept)
-   *
-   * @param string $id Identifier of the invitation to accept.
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Classroom_ClassroomEmpty
-   */
-  public function accept($id, $optParams = array())
-  {
-    $params = array('id' => $id);
-    $params = array_merge($params, $optParams);
-    return $this->call('accept', array($params), "Google_Service_Classroom_ClassroomEmpty");
-  }
-  /**
-   * Creates an invitation. Only one invitation for a user and course may exist at
-   * a time. Delete and re-create an invitation to make changes. This method
-   * returns the following error codes: * `PERMISSION_DENIED` if the requesting
-   * user is not permitted to create invitations for this course or for access
-   * errors. * `NOT_FOUND` if the course or the user does not exist. *
-   * `FAILED_PRECONDITION` if the requested user's account is disabled or if the
-   * user already has this role or a role with greater permissions. *
-   * `ALREADY_EXISTS` if an invitation for the specified user and course already
-   * exists. (invitations.create)
-   *
-   * @param Google_Service_Classroom_Invitation $postBody
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Classroom_Invitation
-   */
-  public function create(Google_Service_Classroom_Invitation $postBody, $optParams = array())
-  {
-    $params = array('postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('create', array($params), "Google_Service_Classroom_Invitation");
-  }
-  /**
-   * Deletes an invitation. This method returns the following error codes: *
-   * `PERMISSION_DENIED` if the requesting user is not permitted to delete the
-   * requested invitation or for access errors. * `NOT_FOUND` if no invitation
-   * exists with the requested ID. (invitations.delete)
-   *
-   * @param string $id Identifier of the invitation to delete.
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Classroom_ClassroomEmpty
-   */
-  public function delete($id, $optParams = array())
-  {
-    $params = array('id' => $id);
-    $params = array_merge($params, $optParams);
-    return $this->call('delete', array($params), "Google_Service_Classroom_ClassroomEmpty");
-  }
-  /**
-   * Returns an invitation. This method returns the following error codes: *
-   * `PERMISSION_DENIED` if the requesting user is not permitted to view the
-   * requested invitation or for access errors. * `NOT_FOUND` if no invitation
-   * exists with the requested ID. (invitations.get)
-   *
-   * @param string $id Identifier of the invitation to return.
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Classroom_Invitation
-   */
-  public function get($id, $optParams = array())
-  {
-    $params = array('id' => $id);
-    $params = array_merge($params, $optParams);
-    return $this->call('get', array($params), "Google_Service_Classroom_Invitation");
-  }
-  /**
-   * Returns a list of invitations that the requesting user is permitted to view,
-   * restricted to those that match the list request. *Note:* At least one of
-   * `user_id` or `course_id` must be supplied. Both fields can be supplied. This
-   * method returns the following error codes: * `PERMISSION_DENIED` for access
-   * errors. (invitations.listInvitations)
-   *
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param string userId Restricts returned invitations to those for a
-   * specific user. The identifier can be one of the following: * the numeric
-   * identifier for the user * the email address of the user * the string literal
-   * `"me"`, indicating the requesting user
-   * @opt_param string courseId Restricts returned invitations to those for a
-   * course with the specified identifier.
-   * @opt_param int pageSize Maximum number of items to return. Zero means no
-   * maximum. The server may return fewer than the specified number of results.
-   * @opt_param string pageToken nextPageToken value returned from a previous list
-   * call, indicating that the subsequent page of results should be returned. The
-   * list request must be otherwise identical to the one that resulted in this
-   * token.
-   * @return Google_Service_Classroom_ListInvitationsResponse
-   */
-  public function listInvitations($optParams = array())
-  {
-    $params = array();
-    $params = array_merge($params, $optParams);
-    return $this->call('list', array($params), "Google_Service_Classroom_ListInvitationsResponse");
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Classroom/Resource/UserProfiles.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Classroom/Resource/UserProfiles.php
deleted file mode 100644
index 38ee3eb6..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Classroom/Resource/UserProfiles.php
+++ /dev/null
@@ -1,47 +0,0 @@
-
- *   $classroomService = new Google_Service_Classroom(...);
- *   $userProfiles = $classroomService->userProfiles;
- *  
- */
-class Google_Service_Classroom_Resource_UserProfiles extends Google_Service_Resource
-{
-  /**
-   * Returns a user profile. This method returns the following error codes: *
-   * `PERMISSION_DENIED` if the requesting user is not permitted to access this
-   * user profile, if no profile exists with the requested ID, or for access
-   * errors. (userProfiles.get)
-   *
-   * @param string $userId Identifier of the profile to return. The identifier can
-   * be one of the following: * the numeric identifier for the user * the email
-   * address of the user * the string literal `"me"`, indicating the requesting
-   * user
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Classroom_UserProfile
-   */
-  public function get($userId, $optParams = array())
-  {
-    $params = array('userId' => $userId);
-    $params = array_merge($params, $optParams);
-    return $this->call('get', array($params), "Google_Service_Classroom_UserProfile");
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Classroom/Resource/UserProfilesGuardianInvitations.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Classroom/Resource/UserProfilesGuardianInvitations.php
deleted file mode 100644
index a8a88224..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Classroom/Resource/UserProfilesGuardianInvitations.php
+++ /dev/null
@@ -1,166 +0,0 @@
-
- *   $classroomService = new Google_Service_Classroom(...);
- *   $guardianInvitations = $classroomService->guardianInvitations;
- *  
- */
-class Google_Service_Classroom_Resource_UserProfilesGuardianInvitations extends Google_Service_Resource
-{
-  /**
-   * Creates a guardian invitation, and sends an email to the guardian asking them
-   * to confirm that they are the student's guardian. Once the guardian accepts
-   * the invitation, their `state` will change to `COMPLETED` and they will start
-   * receiving guardian notifications. A `Guardian` resource will also be created
-   * to represent the active guardian. The request object must have the
-   * `student_id` and `invited_email_address` fields set. Failing to set these
-   * fields, or setting any other fields in the request, will result in an error.
-   * This method returns the following error codes: * `PERMISSION_DENIED` if the
-   * current user does not have permission to manage guardians, if the guardian in
-   * question has already rejected too many requests for that student, if
-   * guardians are not enabled for the domain in question, or for other access
-   * errors. * `RESOURCE_EXHAUSTED` if the student or guardian has exceeded the
-   * guardian link limit. * `INVALID_ARGUMENT` if the guardian email address is
-   * not valid (for example, if it is too long), or if the format of the student
-   * ID provided cannot be recognized (it is not an email address, nor a `user_id`
-   * from this API). This error will also be returned if read-only fields are set,
-   * or if the `state` field is set to to a value other than `PENDING`. *
-   * `NOT_FOUND` if the student ID provided is a valid student ID, but Classroom
-   * has no record of that student. * `ALREADY_EXISTS` if there is already a
-   * pending guardian invitation for the student and `invited_email_address`
-   * provided, or if the provided `invited_email_address` matches the Google
-   * account of an existing `Guardian` for this user. (guardianInvitations.create)
-   *
-   * @param string $studentId ID of the student (in standard format)
-   * @param Google_Service_Classroom_GuardianInvitation $postBody
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Classroom_GuardianInvitation
-   */
-  public function create($studentId, Google_Service_Classroom_GuardianInvitation $postBody, $optParams = array())
-  {
-    $params = array('studentId' => $studentId, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('create', array($params), "Google_Service_Classroom_GuardianInvitation");
-  }
-  /**
-   * Returns a specific guardian invitation. This method returns the following
-   * error codes: * `PERMISSION_DENIED` if the requesting user is not permitted to
-   * view guardian invitations for the student identified by the `student_id`, if
-   * guardians are not enabled for the domain in question, or for other access
-   * errors. * `INVALID_ARGUMENT` if a `student_id` is specified, but its format
-   * cannot be recognized (it is not an email address, nor a `student_id` from the
-   * API, nor the literal string `me`). * `NOT_FOUND` if Classroom cannot find any
-   * record of the given student or `invitation_id`. May also be returned if the
-   * student exists, but the requesting user does not have access to see that
-   * student. (guardianInvitations.get)
-   *
-   * @param string $studentId The ID of the student whose guardian invitation is
-   * being requested.
-   * @param string $invitationId The `id` field of the `GuardianInvitation` being
-   * requested.
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Classroom_GuardianInvitation
-   */
-  public function get($studentId, $invitationId, $optParams = array())
-  {
-    $params = array('studentId' => $studentId, 'invitationId' => $invitationId);
-    $params = array_merge($params, $optParams);
-    return $this->call('get', array($params), "Google_Service_Classroom_GuardianInvitation");
-  }
-  /**
-   * Returns a list of guardian invitations that the requesting user is permitted
-   * to view, filtered by the parameters provided. This method returns the
-   * following error codes: * `PERMISSION_DENIED` if a `student_id` is specified,
-   * and the requesting user is not permitted to view guardian invitations for
-   * that student, if `"-"` is specified as the `student_id` and the user is not a
-   * domain administrator, if guardians are not enabled for the domain in
-   * question, or for other access errors. * `INVALID_ARGUMENT` if a `student_id`
-   * is specified, but its format cannot be recognized (it is not an email
-   * address, nor a `student_id` from the API, nor the literal string `me`). May
-   * also be returned if an invalid `page_token` or `state` is provided. *
-   * `NOT_FOUND` if a `student_id` is specified, and its format can be recognized,
-   * but Classroom has no record of that student.
-   * (guardianInvitations.listUserProfilesGuardianInvitations)
-   *
-   * @param string $studentId The ID of the student whose guardian invitations are
-   * to be returned. The identifier can be one of the following: * the numeric
-   * identifier for the user * the email address of the user * the string literal
-   * `"me"`, indicating the requesting user * the string literal `"-"`, indicating
-   * that results should be returned for all students that the requesting user is
-   * permitted to view guardian invitations.
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param string invitedEmailAddress If specified, only results with the
-   * specified `invited_email_address` will be returned.
-   * @opt_param string states If specified, only results with the specified
-   * `state` values will be returned. Otherwise, results with a `state` of
-   * `PENDING` will be returned.
-   * @opt_param string pageToken nextPageToken value returned from a previous list
-   * call, indicating that the subsequent page of results should be returned. The
-   * list request must be otherwise identical to the one that resulted in this
-   * token.
-   * @opt_param int pageSize Maximum number of items to return. Zero or
-   * unspecified indicates that the server may assign a maximum. The server may
-   * return fewer than the specified number of results.
-   * @return Google_Service_Classroom_ListGuardianInvitationsResponse
-   */
-  public function listUserProfilesGuardianInvitations($studentId, $optParams = array())
-  {
-    $params = array('studentId' => $studentId);
-    $params = array_merge($params, $optParams);
-    return $this->call('list', array($params), "Google_Service_Classroom_ListGuardianInvitationsResponse");
-  }
-  /**
-   * Modifies a guardian invitation. Currently, the only valid modification is to
-   * change the `state` from `PENDING` to `COMPLETE`. This has the effect of
-   * withdrawing the invitation. This method returns the following error codes: *
-   * `PERMISSION_DENIED` if the current user does not have permission to manage
-   * guardians, if guardians are not enabled for the domain in question or for
-   * other access errors. * `FAILED_PRECONDITION` if the guardian link is not in
-   * the `PENDING` state. * `INVALID_ARGUMENT` if the format of the student ID
-   * provided cannot be recognized (it is not an email address, nor a `user_id`
-   * from this API), or if the passed `GuardianInvitation` has a `state` other
-   * than `COMPLETE`, or if it modifies fields other than `state`. * `NOT_FOUND`
-   * if the student ID provided is a valid student ID, but Classroom has no record
-   * of that student, or if the `id` field does not refer to a guardian invitation
-   * known to Classroom. (guardianInvitations.patch)
-   *
-   * @param string $studentId The ID of the student whose guardian invitation is
-   * to be modified.
-   * @param string $invitationId The `id` field of the `GuardianInvitation` to be
-   * modified.
-   * @param Google_Service_Classroom_GuardianInvitation $postBody
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param string updateMask Mask that identifies which fields on the course
-   * to update. This field is required to do an update. The update will fail if
-   * invalid fields are specified. The following fields are valid: * `state` When
-   * set in a query parameter, this field should be specified as
-   * `updateMask=,,...`
-   * @return Google_Service_Classroom_GuardianInvitation
-   */
-  public function patch($studentId, $invitationId, Google_Service_Classroom_GuardianInvitation $postBody, $optParams = array())
-  {
-    $params = array('studentId' => $studentId, 'invitationId' => $invitationId, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('patch', array($params), "Google_Service_Classroom_GuardianInvitation");
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Classroom/Resource/UserProfilesGuardians.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Classroom/Resource/UserProfilesGuardians.php
deleted file mode 100644
index 98a8371f..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Classroom/Resource/UserProfilesGuardians.php
+++ /dev/null
@@ -1,124 +0,0 @@
-
- *   $classroomService = new Google_Service_Classroom(...);
- *   $guardians = $classroomService->guardians;
- *  
- */
-class Google_Service_Classroom_Resource_UserProfilesGuardians extends Google_Service_Resource
-{
-  /**
-   * Deletes a guardian. The guardian will no longer receive guardian
-   * notifications and the guardian will no longer be accessible via the API. This
-   * method returns the following error codes: * `PERMISSION_DENIED` if no user
-   * that matches the provided `student_id` is visible to the requesting user, if
-   * the requesting user is not permitted to manage guardians for the student
-   * identified by the `student_id`, if guardians are not enabled for the domain
-   * in question, or for other access errors. * `INVALID_ARGUMENT` if a
-   * `student_id` is specified, but its format cannot be recognized (it is not an
-   * email address, nor a `student_id` from the API). * `NOT_FOUND` if the
-   * requesting user is permitted to modify guardians for the requested
-   * `student_id`, but no `Guardian` record exists for that student with the
-   * provided `guardian_id`. (guardians.delete)
-   *
-   * @param string $studentId The student whose guardian is to be deleted. One of
-   * the following: * the numeric identifier for the user * the email address of
-   * the user * the string literal `"me"`, indicating the requesting user
-   * @param string $guardianId The `id` field from a `Guardian`.
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Classroom_ClassroomEmpty
-   */
-  public function delete($studentId, $guardianId, $optParams = array())
-  {
-    $params = array('studentId' => $studentId, 'guardianId' => $guardianId);
-    $params = array_merge($params, $optParams);
-    return $this->call('delete', array($params), "Google_Service_Classroom_ClassroomEmpty");
-  }
-  /**
-   * Returns a specific guardian. This method returns the following error codes: *
-   * `PERMISSION_DENIED` if no user that matches the provided `student_id` is
-   * visible to the requesting user, if the requesting user is not permitted to
-   * view guardian information for the student identified by the `student_id`, if
-   * guardians are not enabled for the domain in question, or for other access
-   * errors. * `INVALID_ARGUMENT` if a `student_id` is specified, but its format
-   * cannot be recognized (it is not an email address, nor a `student_id` from the
-   * API, nor the literal string `me`). * `NOT_FOUND` if the requesting user is
-   * permitted to view guardians for the requested `student_id`, but no `Guardian`
-   * record exists for that student that matches the provided `guardian_id`.
-   * (guardians.get)
-   *
-   * @param string $studentId The student whose guardian is being requested. One
-   * of the following: * the numeric identifier for the user * the email address
-   * of the user * the string literal `"me"`, indicating the requesting user
-   * @param string $guardianId The `id` field from a `Guardian`.
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Classroom_Guardian
-   */
-  public function get($studentId, $guardianId, $optParams = array())
-  {
-    $params = array('studentId' => $studentId, 'guardianId' => $guardianId);
-    $params = array_merge($params, $optParams);
-    return $this->call('get', array($params), "Google_Service_Classroom_Guardian");
-  }
-  /**
-   * Returns a list of guardians that the requesting user is permitted to view,
-   * restricted to those that match the request. To list guardians for any student
-   * that the requesting user may view guardians for, use the literal character
-   * `-` for the student ID. This method returns the following error codes: *
-   * `PERMISSION_DENIED` if a `student_id` is specified, and the requesting user
-   * is not permitted to view guardian information for that student, if `"-"` is
-   * specified as the `student_id` and the user is not a domain administrator, if
-   * guardians are not enabled for the domain in question, if the
-   * `invited_email_address` filter is set by a user who is not a domain
-   * administrator, or for other access errors. * `INVALID_ARGUMENT` if a
-   * `student_id` is specified, but its format cannot be recognized (it is not an
-   * email address, nor a `student_id` from the API, nor the literal string `me`).
-   * May also be returned if an invalid `page_token` is provided. * `NOT_FOUND` if
-   * a `student_id` is specified, and its format can be recognized, but Classroom
-   * has no record of that student. (guardians.listUserProfilesGuardians)
-   *
-   * @param string $studentId Filter results by the student who the guardian is
-   * linked to. The identifier can be one of the following: * the numeric
-   * identifier for the user * the email address of the user * the string literal
-   * `"me"`, indicating the requesting user * the string literal `"-"`, indicating
-   * that results should be returned for all students that the requesting user has
-   * access to view.
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param string invitedEmailAddress Filter results by the email address
-   * that the original invitation was sent to, resulting in this guardian link.
-   * This filter can only be used by domain administrators.
-   * @opt_param string pageToken nextPageToken value returned from a previous list
-   * call, indicating that the subsequent page of results should be returned. The
-   * list request must be otherwise identical to the one that resulted in this
-   * token.
-   * @opt_param int pageSize Maximum number of items to return. Zero or
-   * unspecified indicates that the server may assign a maximum. The server may
-   * return fewer than the specified number of results.
-   * @return Google_Service_Classroom_ListGuardiansResponse
-   */
-  public function listUserProfilesGuardians($studentId, $optParams = array())
-  {
-    $params = array('studentId' => $studentId);
-    $params = array_merge($params, $optParams);
-    return $this->call('list', array($params), "Google_Service_Classroom_ListGuardiansResponse");
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Classroom/ReturnStudentSubmissionRequest.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Classroom/ReturnStudentSubmissionRequest.php
deleted file mode 100644
index e9b41ced..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Classroom/ReturnStudentSubmissionRequest.php
+++ /dev/null
@@ -1,20 +0,0 @@
-driveFile = $driveFile;
-  }
-  public function getDriveFile()
-  {
-    return $this->driveFile;
-  }
-  public function setShareMode($shareMode)
-  {
-    $this->shareMode = $shareMode;
-  }
-  public function getShareMode()
-  {
-    return $this->shareMode;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Classroom/ShortAnswerSubmission.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Classroom/ShortAnswerSubmission.php
deleted file mode 100644
index e4c59121..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Classroom/ShortAnswerSubmission.php
+++ /dev/null
@@ -1,30 +0,0 @@
-answer = $answer;
-  }
-  public function getAnswer()
-  {
-    return $this->answer;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Classroom/Student.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Classroom/Student.php
deleted file mode 100644
index 65e5dcdd..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Classroom/Student.php
+++ /dev/null
@@ -1,59 +0,0 @@
-courseId = $courseId;
-  }
-  public function getCourseId()
-  {
-    return $this->courseId;
-  }
-  public function setProfile(Google_Service_Classroom_UserProfile $profile)
-  {
-    $this->profile = $profile;
-  }
-  public function getProfile()
-  {
-    return $this->profile;
-  }
-  public function setStudentWorkFolder(Google_Service_Classroom_DriveFolder $studentWorkFolder)
-  {
-    $this->studentWorkFolder = $studentWorkFolder;
-  }
-  public function getStudentWorkFolder()
-  {
-    return $this->studentWorkFolder;
-  }
-  public function setUserId($userId)
-  {
-    $this->userId = $userId;
-  }
-  public function getUserId()
-  {
-    return $this->userId;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Classroom/StudentSubmission.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Classroom/StudentSubmission.php
deleted file mode 100644
index 82262450..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Classroom/StudentSubmission.php
+++ /dev/null
@@ -1,168 +0,0 @@
-alternateLink = $alternateLink;
-  }
-  public function getAlternateLink()
-  {
-    return $this->alternateLink;
-  }
-  public function setAssignedGrade($assignedGrade)
-  {
-    $this->assignedGrade = $assignedGrade;
-  }
-  public function getAssignedGrade()
-  {
-    return $this->assignedGrade;
-  }
-  public function setAssignmentSubmission(Google_Service_Classroom_AssignmentSubmission $assignmentSubmission)
-  {
-    $this->assignmentSubmission = $assignmentSubmission;
-  }
-  public function getAssignmentSubmission()
-  {
-    return $this->assignmentSubmission;
-  }
-  public function setAssociatedWithDeveloper($associatedWithDeveloper)
-  {
-    $this->associatedWithDeveloper = $associatedWithDeveloper;
-  }
-  public function getAssociatedWithDeveloper()
-  {
-    return $this->associatedWithDeveloper;
-  }
-  public function setCourseId($courseId)
-  {
-    $this->courseId = $courseId;
-  }
-  public function getCourseId()
-  {
-    return $this->courseId;
-  }
-  public function setCourseWorkId($courseWorkId)
-  {
-    $this->courseWorkId = $courseWorkId;
-  }
-  public function getCourseWorkId()
-  {
-    return $this->courseWorkId;
-  }
-  public function setCourseWorkType($courseWorkType)
-  {
-    $this->courseWorkType = $courseWorkType;
-  }
-  public function getCourseWorkType()
-  {
-    return $this->courseWorkType;
-  }
-  public function setCreationTime($creationTime)
-  {
-    $this->creationTime = $creationTime;
-  }
-  public function getCreationTime()
-  {
-    return $this->creationTime;
-  }
-  public function setDraftGrade($draftGrade)
-  {
-    $this->draftGrade = $draftGrade;
-  }
-  public function getDraftGrade()
-  {
-    return $this->draftGrade;
-  }
-  public function setId($id)
-  {
-    $this->id = $id;
-  }
-  public function getId()
-  {
-    return $this->id;
-  }
-  public function setLate($late)
-  {
-    $this->late = $late;
-  }
-  public function getLate()
-  {
-    return $this->late;
-  }
-  public function setMultipleChoiceSubmission(Google_Service_Classroom_MultipleChoiceSubmission $multipleChoiceSubmission)
-  {
-    $this->multipleChoiceSubmission = $multipleChoiceSubmission;
-  }
-  public function getMultipleChoiceSubmission()
-  {
-    return $this->multipleChoiceSubmission;
-  }
-  public function setShortAnswerSubmission(Google_Service_Classroom_ShortAnswerSubmission $shortAnswerSubmission)
-  {
-    $this->shortAnswerSubmission = $shortAnswerSubmission;
-  }
-  public function getShortAnswerSubmission()
-  {
-    return $this->shortAnswerSubmission;
-  }
-  public function setState($state)
-  {
-    $this->state = $state;
-  }
-  public function getState()
-  {
-    return $this->state;
-  }
-  public function setUpdateTime($updateTime)
-  {
-    $this->updateTime = $updateTime;
-  }
-  public function getUpdateTime()
-  {
-    return $this->updateTime;
-  }
-  public function setUserId($userId)
-  {
-    $this->userId = $userId;
-  }
-  public function getUserId()
-  {
-    return $this->userId;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Classroom/Teacher.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Classroom/Teacher.php
deleted file mode 100644
index a8ae4511..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Classroom/Teacher.php
+++ /dev/null
@@ -1,49 +0,0 @@
-courseId = $courseId;
-  }
-  public function getCourseId()
-  {
-    return $this->courseId;
-  }
-  public function setProfile(Google_Service_Classroom_UserProfile $profile)
-  {
-    $this->profile = $profile;
-  }
-  public function getProfile()
-  {
-    return $this->profile;
-  }
-  public function setUserId($userId)
-  {
-    $this->userId = $userId;
-  }
-  public function getUserId()
-  {
-    return $this->userId;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Classroom/TimeOfDay.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Classroom/TimeOfDay.php
deleted file mode 100644
index 77255e1c..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Classroom/TimeOfDay.php
+++ /dev/null
@@ -1,57 +0,0 @@
-hours = $hours;
-  }
-  public function getHours()
-  {
-    return $this->hours;
-  }
-  public function setMinutes($minutes)
-  {
-    $this->minutes = $minutes;
-  }
-  public function getMinutes()
-  {
-    return $this->minutes;
-  }
-  public function setNanos($nanos)
-  {
-    $this->nanos = $nanos;
-  }
-  public function getNanos()
-  {
-    return $this->nanos;
-  }
-  public function setSeconds($seconds)
-  {
-    $this->seconds = $seconds;
-  }
-  public function getSeconds()
-  {
-    return $this->seconds;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Classroom/TurnInStudentSubmissionRequest.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Classroom/TurnInStudentSubmissionRequest.php
deleted file mode 100644
index 47f135bd..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Classroom/TurnInStudentSubmissionRequest.php
+++ /dev/null
@@ -1,20 +0,0 @@
-emailAddress = $emailAddress;
-  }
-  public function getEmailAddress()
-  {
-    return $this->emailAddress;
-  }
-  public function setId($id)
-  {
-    $this->id = $id;
-  }
-  public function getId()
-  {
-    return $this->id;
-  }
-  public function setName(Google_Service_Classroom_Name $name)
-  {
-    $this->name = $name;
-  }
-  public function getName()
-  {
-    return $this->name;
-  }
-  public function setPermissions($permissions)
-  {
-    $this->permissions = $permissions;
-  }
-  public function getPermissions()
-  {
-    return $this->permissions;
-  }
-  public function setPhotoUrl($photoUrl)
-  {
-    $this->photoUrl = $photoUrl;
-  }
-  public function getPhotoUrl()
-  {
-    return $this->photoUrl;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Classroom/YouTubeVideo.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Classroom/YouTubeVideo.php
deleted file mode 100644
index b3c33abc..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Classroom/YouTubeVideo.php
+++ /dev/null
@@ -1,57 +0,0 @@
-alternateLink = $alternateLink;
-  }
-  public function getAlternateLink()
-  {
-    return $this->alternateLink;
-  }
-  public function setId($id)
-  {
-    $this->id = $id;
-  }
-  public function getId()
-  {
-    return $this->id;
-  }
-  public function setThumbnailUrl($thumbnailUrl)
-  {
-    $this->thumbnailUrl = $thumbnailUrl;
-  }
-  public function getThumbnailUrl()
-  {
-    return $this->thumbnailUrl;
-  }
-  public function setTitle($title)
-  {
-    $this->title = $title;
-  }
-  public function getTitle()
-  {
-    return $this->title;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudBuild.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudBuild.php
deleted file mode 100644
index 7f483bf1..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudBuild.php
+++ /dev/null
@@ -1,254 +0,0 @@
-
- * Builds container images in the cloud.

- *
- * 

- * For more information about this service, see the API
- * Documentation
- * 

- *
- * @author Google, Inc.
- */
-class Google_Service_CloudBuild extends Google_Service
-{
-  /** View and manage your data across Google Cloud Platform services. */
-  const CLOUD_PLATFORM =
-      "https://www.googleapis.com/auth/cloud-platform";
-
-  public $operations;
-  public $projects_builds;
-  public $projects_triggers;
-  
-  /**
-   * Constructs the internal representation of the CloudBuild service.
-   *
-   * @param Google_Client $client
-   */
-  public function __construct(Google_Client $client)
-  {
-    parent::__construct($client);
-    $this->rootUrl = 'https://cloudbuild.googleapis.com/';
-    $this->servicePath = '';
-    $this->version = 'v1';
-    $this->serviceName = 'cloudbuild';
-
-    $this->operations = new Google_Service_CloudBuild_Resource_Operations(
-        $this,
-        $this->serviceName,
-        'operations',
-        array(
-          'methods' => array(
-            'cancel' => array(
-              'path' => 'v1/{+name}:cancel',
-              'httpMethod' => 'POST',
-              'parameters' => array(
-                'name' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'get' => array(
-              'path' => 'v1/{+name}',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'name' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'list' => array(
-              'path' => 'v1/{+name}',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'name' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'pageToken' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'pageSize' => array(
-                  'location' => 'query',
-                  'type' => 'integer',
-                ),
-                'filter' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-              ),
-            ),
-          )
-        )
-    );
-    $this->projects_builds = new Google_Service_CloudBuild_Resource_ProjectsBuilds(
-        $this,
-        $this->serviceName,
-        'builds',
-        array(
-          'methods' => array(
-            'cancel' => array(
-              'path' => 'v1/projects/{projectId}/builds/{id}:cancel',
-              'httpMethod' => 'POST',
-              'parameters' => array(
-                'projectId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'id' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'create' => array(
-              'path' => 'v1/projects/{projectId}/builds',
-              'httpMethod' => 'POST',
-              'parameters' => array(
-                'projectId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'get' => array(
-              'path' => 'v1/projects/{projectId}/builds/{id}',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'projectId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'id' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'list' => array(
-              'path' => 'v1/projects/{projectId}/builds',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'projectId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'filter' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'pageToken' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'pageSize' => array(
-                  'location' => 'query',
-                  'type' => 'integer',
-                ),
-              ),
-            ),
-          )
-        )
-    );
-    $this->projects_triggers = new Google_Service_CloudBuild_Resource_ProjectsTriggers(
-        $this,
-        $this->serviceName,
-        'triggers',
-        array(
-          'methods' => array(
-            'create' => array(
-              'path' => 'v1/projects/{projectId}/triggers',
-              'httpMethod' => 'POST',
-              'parameters' => array(
-                'projectId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'delete' => array(
-              'path' => 'v1/projects/{projectId}/triggers/{triggerId}',
-              'httpMethod' => 'DELETE',
-              'parameters' => array(
-                'projectId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'triggerId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'get' => array(
-              'path' => 'v1/projects/{projectId}/triggers/{triggerId}',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'projectId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'triggerId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'list' => array(
-              'path' => 'v1/projects/{projectId}/triggers',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'projectId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'patch' => array(
-              'path' => 'v1/projects/{projectId}/triggers/{triggerId}',
-              'httpMethod' => 'PATCH',
-              'parameters' => array(
-                'projectId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'triggerId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),
-          )
-        )
-    );
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudBuild/Build.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudBuild/Build.php
deleted file mode 100644
index 7f926793..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudBuild/Build.php
+++ /dev/null
@@ -1,189 +0,0 @@
-buildTriggerId = $buildTriggerId;
-  }
-  public function getBuildTriggerId()
-  {
-    return $this->buildTriggerId;
-  }
-  public function setCreateTime($createTime)
-  {
-    $this->createTime = $createTime;
-  }
-  public function getCreateTime()
-  {
-    return $this->createTime;
-  }
-  public function setFinishTime($finishTime)
-  {
-    $this->finishTime = $finishTime;
-  }
-  public function getFinishTime()
-  {
-    return $this->finishTime;
-  }
-  public function setId($id)
-  {
-    $this->id = $id;
-  }
-  public function getId()
-  {
-    return $this->id;
-  }
-  public function setImages($images)
-  {
-    $this->images = $images;
-  }
-  public function getImages()
-  {
-    return $this->images;
-  }
-  public function setLogUrl($logUrl)
-  {
-    $this->logUrl = $logUrl;
-  }
-  public function getLogUrl()
-  {
-    return $this->logUrl;
-  }
-  public function setLogsBucket($logsBucket)
-  {
-    $this->logsBucket = $logsBucket;
-  }
-  public function getLogsBucket()
-  {
-    return $this->logsBucket;
-  }
-  public function setOptions(Google_Service_CloudBuild_BuildOptions $options)
-  {
-    $this->options = $options;
-  }
-  public function getOptions()
-  {
-    return $this->options;
-  }
-  public function setProjectId($projectId)
-  {
-    $this->projectId = $projectId;
-  }
-  public function getProjectId()
-  {
-    return $this->projectId;
-  }
-  public function setResults(Google_Service_CloudBuild_Results $results)
-  {
-    $this->results = $results;
-  }
-  public function getResults()
-  {
-    return $this->results;
-  }
-  public function setSource(Google_Service_CloudBuild_Source $source)
-  {
-    $this->source = $source;
-  }
-  public function getSource()
-  {
-    return $this->source;
-  }
-  public function setSourceProvenance(Google_Service_CloudBuild_SourceProvenance $sourceProvenance)
-  {
-    $this->sourceProvenance = $sourceProvenance;
-  }
-  public function getSourceProvenance()
-  {
-    return $this->sourceProvenance;
-  }
-  public function setStartTime($startTime)
-  {
-    $this->startTime = $startTime;
-  }
-  public function getStartTime()
-  {
-    return $this->startTime;
-  }
-  public function setStatus($status)
-  {
-    $this->status = $status;
-  }
-  public function getStatus()
-  {
-    return $this->status;
-  }
-  public function setStatusDetail($statusDetail)
-  {
-    $this->statusDetail = $statusDetail;
-  }
-  public function getStatusDetail()
-  {
-    return $this->statusDetail;
-  }
-  public function setSteps($steps)
-  {
-    $this->steps = $steps;
-  }
-  public function getSteps()
-  {
-    return $this->steps;
-  }
-  public function setSubstitutions($substitutions)
-  {
-    $this->substitutions = $substitutions;
-  }
-  public function getSubstitutions()
-  {
-    return $this->substitutions;
-  }
-  public function setTimeout($timeout)
-  {
-    $this->timeout = $timeout;
-  }
-  public function getTimeout()
-  {
-    return $this->timeout;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudBuild/BuildOperationMetadata.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudBuild/BuildOperationMetadata.php
deleted file mode 100644
index 7eaa492c..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudBuild/BuildOperationMetadata.php
+++ /dev/null
@@ -1,31 +0,0 @@
-build = $build;
-  }
-  public function getBuild()
-  {
-    return $this->build;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudBuild/BuildOptions.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudBuild/BuildOptions.php
deleted file mode 100644
index a5bec28a..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudBuild/BuildOptions.php
+++ /dev/null
@@ -1,40 +0,0 @@
-requestedVerifyOption = $requestedVerifyOption;
-  }
-  public function getRequestedVerifyOption()
-  {
-    return $this->requestedVerifyOption;
-  }
-  public function setSourceProvenanceHash($sourceProvenanceHash)
-  {
-    $this->sourceProvenanceHash = $sourceProvenanceHash;
-  }
-  public function getSourceProvenanceHash()
-  {
-    return $this->sourceProvenanceHash;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudBuild/BuildStep.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudBuild/BuildStep.php
deleted file mode 100644
index bf4b78be..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudBuild/BuildStep.php
+++ /dev/null
@@ -1,85 +0,0 @@
-args = $args;
-  }
-  public function getArgs()
-  {
-    return $this->args;
-  }
-  public function setDir($dir)
-  {
-    $this->dir = $dir;
-  }
-  public function getDir()
-  {
-    return $this->dir;
-  }
-  public function setEntrypoint($entrypoint)
-  {
-    $this->entrypoint = $entrypoint;
-  }
-  public function getEntrypoint()
-  {
-    return $this->entrypoint;
-  }
-  public function setEnv($env)
-  {
-    $this->env = $env;
-  }
-  public function getEnv()
-  {
-    return $this->env;
-  }
-  public function setId($id)
-  {
-    $this->id = $id;
-  }
-  public function getId()
-  {
-    return $this->id;
-  }
-  public function setName($name)
-  {
-    $this->name = $name;
-  }
-  public function getName()
-  {
-    return $this->name;
-  }
-  public function setWaitFor($waitFor)
-  {
-    $this->waitFor = $waitFor;
-  }
-  public function getWaitFor()
-  {
-    return $this->waitFor;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudBuild/BuildTrigger.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudBuild/BuildTrigger.php
deleted file mode 100644
index 1c9a2274..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudBuild/BuildTrigger.php
+++ /dev/null
@@ -1,95 +0,0 @@
-build = $build;
-  }
-  public function getBuild()
-  {
-    return $this->build;
-  }
-  public function setCreateTime($createTime)
-  {
-    $this->createTime = $createTime;
-  }
-  public function getCreateTime()
-  {
-    return $this->createTime;
-  }
-  public function setDescription($description)
-  {
-    $this->description = $description;
-  }
-  public function getDescription()
-  {
-    return $this->description;
-  }
-  public function setDisabled($disabled)
-  {
-    $this->disabled = $disabled;
-  }
-  public function getDisabled()
-  {
-    return $this->disabled;
-  }
-  public function setFilename($filename)
-  {
-    $this->filename = $filename;
-  }
-  public function getFilename()
-  {
-    return $this->filename;
-  }
-  public function setId($id)
-  {
-    $this->id = $id;
-  }
-  public function getId()
-  {
-    return $this->id;
-  }
-  public function setSubstitutions($substitutions)
-  {
-    $this->substitutions = $substitutions;
-  }
-  public function getSubstitutions()
-  {
-    return $this->substitutions;
-  }
-  public function setTriggerTemplate(Google_Service_CloudBuild_RepoSource $triggerTemplate)
-  {
-    $this->triggerTemplate = $triggerTemplate;
-  }
-  public function getTriggerTemplate()
-  {
-    return $this->triggerTemplate;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudBuild/BuiltImage.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudBuild/BuiltImage.php
deleted file mode 100644
index 018efa99..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudBuild/BuiltImage.php
+++ /dev/null
@@ -1,39 +0,0 @@
-digest = $digest;
-  }
-  public function getDigest()
-  {
-    return $this->digest;
-  }
-  public function setName($name)
-  {
-    $this->name = $name;
-  }
-  public function getName()
-  {
-    return $this->name;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudBuild/CancelBuildRequest.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudBuild/CancelBuildRequest.php
deleted file mode 100644
index ffb7bbbb..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudBuild/CancelBuildRequest.php
+++ /dev/null
@@ -1,20 +0,0 @@
-fileHash = $fileHash;
-  }
-  public function getFileHash()
-  {
-    return $this->fileHash;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudBuild/Hash.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudBuild/Hash.php
deleted file mode 100644
index 3040ebf6..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudBuild/Hash.php
+++ /dev/null
@@ -1,39 +0,0 @@
-type = $type;
-  }
-  public function getType()
-  {
-    return $this->type;
-  }
-  public function setValue($value)
-  {
-    $this->value = $value;
-  }
-  public function getValue()
-  {
-    return $this->value;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudBuild/ListBuildTriggersResponse.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudBuild/ListBuildTriggersResponse.php
deleted file mode 100644
index 73b9afaa..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudBuild/ListBuildTriggersResponse.php
+++ /dev/null
@@ -1,32 +0,0 @@
-triggers = $triggers;
-  }
-  public function getTriggers()
-  {
-    return $this->triggers;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudBuild/ListBuildsResponse.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudBuild/ListBuildsResponse.php
deleted file mode 100644
index f6749c76..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudBuild/ListBuildsResponse.php
+++ /dev/null
@@ -1,41 +0,0 @@
-builds = $builds;
-  }
-  public function getBuilds()
-  {
-    return $this->builds;
-  }
-  public function setNextPageToken($nextPageToken)
-  {
-    $this->nextPageToken = $nextPageToken;
-  }
-  public function getNextPageToken()
-  {
-    return $this->nextPageToken;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudBuild/ListOperationsResponse.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudBuild/ListOperationsResponse.php
deleted file mode 100644
index ac6517dd..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudBuild/ListOperationsResponse.php
+++ /dev/null
@@ -1,41 +0,0 @@
-nextPageToken = $nextPageToken;
-  }
-  public function getNextPageToken()
-  {
-    return $this->nextPageToken;
-  }
-  public function setOperations($operations)
-  {
-    $this->operations = $operations;
-  }
-  public function getOperations()
-  {
-    return $this->operations;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudBuild/Operation.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudBuild/Operation.php
deleted file mode 100644
index 2aeb3224..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudBuild/Operation.php
+++ /dev/null
@@ -1,67 +0,0 @@
-done = $done;
-  }
-  public function getDone()
-  {
-    return $this->done;
-  }
-  public function setError(Google_Service_CloudBuild_Status $error)
-  {
-    $this->error = $error;
-  }
-  public function getError()
-  {
-    return $this->error;
-  }
-  public function setMetadata($metadata)
-  {
-    $this->metadata = $metadata;
-  }
-  public function getMetadata()
-  {
-    return $this->metadata;
-  }
-  public function setName($name)
-  {
-    $this->name = $name;
-  }
-  public function getName()
-  {
-    return $this->name;
-  }
-  public function setResponse($response)
-  {
-    $this->response = $response;
-  }
-  public function getResponse()
-  {
-    return $this->response;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudBuild/RepoSource.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudBuild/RepoSource.php
deleted file mode 100644
index aae7ef58..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudBuild/RepoSource.php
+++ /dev/null
@@ -1,66 +0,0 @@
-branchName = $branchName;
-  }
-  public function getBranchName()
-  {
-    return $this->branchName;
-  }
-  public function setCommitSha($commitSha)
-  {
-    $this->commitSha = $commitSha;
-  }
-  public function getCommitSha()
-  {
-    return $this->commitSha;
-  }
-  public function setProjectId($projectId)
-  {
-    $this->projectId = $projectId;
-  }
-  public function getProjectId()
-  {
-    return $this->projectId;
-  }
-  public function setRepoName($repoName)
-  {
-    $this->repoName = $repoName;
-  }
-  public function getRepoName()
-  {
-    return $this->repoName;
-  }
-  public function setTagName($tagName)
-  {
-    $this->tagName = $tagName;
-  }
-  public function getTagName()
-  {
-    return $this->tagName;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudBuild/Resource/Operations.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudBuild/Resource/Operations.php
deleted file mode 100644
index e4adde4d..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudBuild/Resource/Operations.php
+++ /dev/null
@@ -1,87 +0,0 @@
-
- *   $cloudbuildService = new Google_Service_CloudBuild(...);
- *   $operations = $cloudbuildService->operations;
- *  
- */
-class Google_Service_CloudBuild_Resource_Operations extends Google_Service_Resource
-{
-  /**
-   * Starts asynchronous cancellation on a long-running operation.  The server
-   * makes a best effort to cancel the operation, but success is not guaranteed.
-   * If the server doesn't support this method, it returns
-   * `google.rpc.Code.UNIMPLEMENTED`.  Clients can use Operations.GetOperation or
-   * other methods to check whether the cancellation succeeded or whether the
-   * operation completed despite cancellation. On successful cancellation, the
-   * operation is not deleted; instead, it becomes an operation with an
-   * Operation.error value with a google.rpc.Status.code of 1, corresponding to
-   * `Code.CANCELLED`. (operations.cancel)
-   *
-   * @param string $name The name of the operation resource to be cancelled.
-   * @param Google_Service_CloudBuild_CancelOperationRequest $postBody
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_CloudBuild_CloudbuildEmpty
-   */
-  public function cancel($name, Google_Service_CloudBuild_CancelOperationRequest $postBody, $optParams = array())
-  {
-    $params = array('name' => $name, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('cancel', array($params), "Google_Service_CloudBuild_CloudbuildEmpty");
-  }
-  /**
-   * Gets the latest state of a long-running operation.  Clients can use this
-   * method to poll the operation result at intervals as recommended by the API
-   * service. (operations.get)
-   *
-   * @param string $name The name of the operation resource.
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_CloudBuild_Operation
-   */
-  public function get($name, $optParams = array())
-  {
-    $params = array('name' => $name);
-    $params = array_merge($params, $optParams);
-    return $this->call('get', array($params), "Google_Service_CloudBuild_Operation");
-  }
-  /**
-   * Lists operations that match the specified filter in the request. If the
-   * server doesn't support this method, it returns `UNIMPLEMENTED`.
-   *
-   * NOTE: the `name` binding below allows API services to override the binding to
-   * use different resource name schemes, such as `users/operations`.
-   * (operations.listOperations)
-   *
-   * @param string $name The name of the operation collection.
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param string pageToken The standard list page token.
-   * @opt_param int pageSize The standard list page size.
-   * @opt_param string filter The standard list filter.
-   * @return Google_Service_CloudBuild_ListOperationsResponse
-   */
-  public function listOperations($name, $optParams = array())
-  {
-    $params = array('name' => $name);
-    $params = array_merge($params, $optParams);
-    return $this->call('list', array($params), "Google_Service_CloudBuild_ListOperationsResponse");
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudBuild/Resource/Projects.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudBuild/Resource/Projects.php
deleted file mode 100644
index d9806091..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudBuild/Resource/Projects.php
+++ /dev/null
@@ -1,28 +0,0 @@
-
- *   $cloudbuildService = new Google_Service_CloudBuild(...);
- *   $projects = $cloudbuildService->projects;
- *  
- */
-class Google_Service_CloudBuild_Resource_Projects extends Google_Service_Resource
-{
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudBuild/Resource/ProjectsBuilds.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudBuild/Resource/ProjectsBuilds.php
deleted file mode 100644
index e3f22516..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudBuild/Resource/ProjectsBuilds.php
+++ /dev/null
@@ -1,99 +0,0 @@
-
- *   $cloudbuildService = new Google_Service_CloudBuild(...);
- *   $builds = $cloudbuildService->builds;
- *  
- */
-class Google_Service_CloudBuild_Resource_ProjectsBuilds extends Google_Service_Resource
-{
-  /**
-   * Cancels a requested build in progress. (builds.cancel)
-   *
-   * @param string $projectId ID of the project.
-   * @param string $id ID of the build.
-   * @param Google_Service_CloudBuild_CancelBuildRequest $postBody
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_CloudBuild_Build
-   */
-  public function cancel($projectId, $id, Google_Service_CloudBuild_CancelBuildRequest $postBody, $optParams = array())
-  {
-    $params = array('projectId' => $projectId, 'id' => $id, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('cancel', array($params), "Google_Service_CloudBuild_Build");
-  }
-  /**
-   * Starts a build with the specified configuration.
-   *
-   * The long-running Operation returned by this method will include the ID of the
-   * build, which can be passed to GetBuild to determine its status (e.g., success
-   * or failure). (builds.create)
-   *
-   * @param string $projectId ID of the project.
-   * @param Google_Service_CloudBuild_Build $postBody
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_CloudBuild_Operation
-   */
-  public function create($projectId, Google_Service_CloudBuild_Build $postBody, $optParams = array())
-  {
-    $params = array('projectId' => $projectId, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('create', array($params), "Google_Service_CloudBuild_Operation");
-  }
-  /**
-   * Returns information about a previously requested build.
-   *
-   * The Build that is returned includes its status (e.g., success or failure, or
-   * in-progress), and timing information. (builds.get)
-   *
-   * @param string $projectId ID of the project.
-   * @param string $id ID of the build.
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_CloudBuild_Build
-   */
-  public function get($projectId, $id, $optParams = array())
-  {
-    $params = array('projectId' => $projectId, 'id' => $id);
-    $params = array_merge($params, $optParams);
-    return $this->call('get', array($params), "Google_Service_CloudBuild_Build");
-  }
-  /**
-   * Lists previously requested builds.
-   *
-   * Previously requested builds may still be in-progress, or may have finished
-   * successfully or unsuccessfully. (builds.listProjectsBuilds)
-   *
-   * @param string $projectId ID of the project.
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param string filter The raw filter text to constrain the results.
-   * @opt_param string pageToken Token to provide to skip to a particular spot in
-   * the list.
-   * @opt_param int pageSize Number of results to return in the list.
-   * @return Google_Service_CloudBuild_ListBuildsResponse
-   */
-  public function listProjectsBuilds($projectId, $optParams = array())
-  {
-    $params = array('projectId' => $projectId);
-    $params = array_merge($params, $optParams);
-    return $this->call('list', array($params), "Google_Service_CloudBuild_ListBuildsResponse");
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudBuild/Resource/ProjectsTriggers.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudBuild/Resource/ProjectsTriggers.php
deleted file mode 100644
index d978fc4c..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudBuild/Resource/ProjectsTriggers.php
+++ /dev/null
@@ -1,109 +0,0 @@
-
- *   $cloudbuildService = new Google_Service_CloudBuild(...);
- *   $triggers = $cloudbuildService->triggers;
- *  
- */
-class Google_Service_CloudBuild_Resource_ProjectsTriggers extends Google_Service_Resource
-{
-  /**
-   * Creates a new BuildTrigger.
-   *
-   * This API is experimental. (triggers.create)
-   *
-   * @param string $projectId ID of the project for which to configure automatic
-   * builds.
-   * @param Google_Service_CloudBuild_BuildTrigger $postBody
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_CloudBuild_BuildTrigger
-   */
-  public function create($projectId, Google_Service_CloudBuild_BuildTrigger $postBody, $optParams = array())
-  {
-    $params = array('projectId' => $projectId, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('create', array($params), "Google_Service_CloudBuild_BuildTrigger");
-  }
-  /**
-   * Deletes an BuildTrigger by its project ID and trigger ID.
-   *
-   * This API is experimental. (triggers.delete)
-   *
-   * @param string $projectId ID of the project that owns the trigger.
-   * @param string $triggerId ID of the BuildTrigger to delete.
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_CloudBuild_CloudbuildEmpty
-   */
-  public function delete($projectId, $triggerId, $optParams = array())
-  {
-    $params = array('projectId' => $projectId, 'triggerId' => $triggerId);
-    $params = array_merge($params, $optParams);
-    return $this->call('delete', array($params), "Google_Service_CloudBuild_CloudbuildEmpty");
-  }
-  /**
-   * Gets information about a BuildTrigger.
-   *
-   * This API is experimental. (triggers.get)
-   *
-   * @param string $projectId ID of the project that owns the trigger.
-   * @param string $triggerId ID of the BuildTrigger to get.
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_CloudBuild_BuildTrigger
-   */
-  public function get($projectId, $triggerId, $optParams = array())
-  {
-    $params = array('projectId' => $projectId, 'triggerId' => $triggerId);
-    $params = array_merge($params, $optParams);
-    return $this->call('get', array($params), "Google_Service_CloudBuild_BuildTrigger");
-  }
-  /**
-   * Lists existing BuildTrigger.
-   *
-   * This API is experimental. (triggers.listProjectsTriggers)
-   *
-   * @param string $projectId ID of the project for which to list BuildTriggers.
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_CloudBuild_ListBuildTriggersResponse
-   */
-  public function listProjectsTriggers($projectId, $optParams = array())
-  {
-    $params = array('projectId' => $projectId);
-    $params = array_merge($params, $optParams);
-    return $this->call('list', array($params), "Google_Service_CloudBuild_ListBuildTriggersResponse");
-  }
-  /**
-   * Updates an BuildTrigger by its project ID and trigger ID.
-   *
-   * This API is experimental. (triggers.patch)
-   *
-   * @param string $projectId ID of the project that owns the trigger.
-   * @param string $triggerId ID of the BuildTrigger to update.
-   * @param Google_Service_CloudBuild_BuildTrigger $postBody
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_CloudBuild_BuildTrigger
-   */
-  public function patch($projectId, $triggerId, Google_Service_CloudBuild_BuildTrigger $postBody, $optParams = array())
-  {
-    $params = array('projectId' => $projectId, 'triggerId' => $triggerId, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('patch', array($params), "Google_Service_CloudBuild_BuildTrigger");
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudBuild/Results.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudBuild/Results.php
deleted file mode 100644
index a1f776d4..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudBuild/Results.php
+++ /dev/null
@@ -1,41 +0,0 @@
-buildStepImages = $buildStepImages;
-  }
-  public function getBuildStepImages()
-  {
-    return $this->buildStepImages;
-  }
-  public function setImages($images)
-  {
-    $this->images = $images;
-  }
-  public function getImages()
-  {
-    return $this->images;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudBuild/Source.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudBuild/Source.php
deleted file mode 100644
index a6e26a02..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudBuild/Source.php
+++ /dev/null
@@ -1,41 +0,0 @@
-repoSource = $repoSource;
-  }
-  public function getRepoSource()
-  {
-    return $this->repoSource;
-  }
-  public function setStorageSource(Google_Service_CloudBuild_StorageSource $storageSource)
-  {
-    $this->storageSource = $storageSource;
-  }
-  public function getStorageSource()
-  {
-    return $this->storageSource;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudBuild/SourceProvenance.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudBuild/SourceProvenance.php
deleted file mode 100644
index a89a9c5f..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudBuild/SourceProvenance.php
+++ /dev/null
@@ -1,51 +0,0 @@
-fileHashes = $fileHashes;
-  }
-  public function getFileHashes()
-  {
-    return $this->fileHashes;
-  }
-  public function setResolvedRepoSource(Google_Service_CloudBuild_RepoSource $resolvedRepoSource)
-  {
-    $this->resolvedRepoSource = $resolvedRepoSource;
-  }
-  public function getResolvedRepoSource()
-  {
-    return $this->resolvedRepoSource;
-  }
-  public function setResolvedStorageSource(Google_Service_CloudBuild_StorageSource $resolvedStorageSource)
-  {
-    $this->resolvedStorageSource = $resolvedStorageSource;
-  }
-  public function getResolvedStorageSource()
-  {
-    return $this->resolvedStorageSource;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudBuild/Status.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudBuild/Status.php
deleted file mode 100644
index 66067950..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudBuild/Status.php
+++ /dev/null
@@ -1,49 +0,0 @@
-code = $code;
-  }
-  public function getCode()
-  {
-    return $this->code;
-  }
-  public function setDetails($details)
-  {
-    $this->details = $details;
-  }
-  public function getDetails()
-  {
-    return $this->details;
-  }
-  public function setMessage($message)
-  {
-    $this->message = $message;
-  }
-  public function getMessage()
-  {
-    return $this->message;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudBuild/StorageSource.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudBuild/StorageSource.php
deleted file mode 100644
index 3a3df0a4..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudBuild/StorageSource.php
+++ /dev/null
@@ -1,48 +0,0 @@
-bucket = $bucket;
-  }
-  public function getBucket()
-  {
-    return $this->bucket;
-  }
-  public function setGeneration($generation)
-  {
-    $this->generation = $generation;
-  }
-  public function getGeneration()
-  {
-    return $this->generation;
-  }
-  public function setObject($object)
-  {
-    $this->object = $object;
-  }
-  public function getObject()
-  {
-    return $this->object;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudDebugger.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudDebugger.php
deleted file mode 100644
index 79744f14..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudDebugger.php
+++ /dev/null
@@ -1,240 +0,0 @@
-
- * Examines the call stack and variables of a running application without
- * stopping or slowing it down.

- *
- * 

- * For more information about this service, see the API
- * Documentation
- * 

- *
- * @author Google, Inc.
- */
-class Google_Service_CloudDebugger extends Google_Service
-{
-  /** View and manage your data across Google Cloud Platform services. */
-  const CLOUD_PLATFORM =
-      "https://www.googleapis.com/auth/cloud-platform";
-  /** Manage cloud debugger. */
-  const CLOUD_DEBUGGER =
-      "https://www.googleapis.com/auth/cloud_debugger";
-
-  public $controller_debuggees;
-  public $controller_debuggees_breakpoints;
-  public $debugger_debuggees;
-  public $debugger_debuggees_breakpoints;
-  
-  /**
-   * Constructs the internal representation of the CloudDebugger service.
-   *
-   * @param Google_Client $client
-   */
-  public function __construct(Google_Client $client)
-  {
-    parent::__construct($client);
-    $this->rootUrl = 'https://clouddebugger.googleapis.com/';
-    $this->servicePath = '';
-    $this->version = 'v2';
-    $this->serviceName = 'clouddebugger';
-
-    $this->controller_debuggees = new Google_Service_CloudDebugger_Resource_ControllerDebuggees(
-        $this,
-        $this->serviceName,
-        'debuggees',
-        array(
-          'methods' => array(
-            'register' => array(
-              'path' => 'v2/controller/debuggees/register',
-              'httpMethod' => 'POST',
-              'parameters' => array(),
-            ),
-          )
-        )
-    );
-    $this->controller_debuggees_breakpoints = new Google_Service_CloudDebugger_Resource_ControllerDebuggeesBreakpoints(
-        $this,
-        $this->serviceName,
-        'breakpoints',
-        array(
-          'methods' => array(
-            'list' => array(
-              'path' => 'v2/controller/debuggees/{debuggeeId}/breakpoints',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'debuggeeId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'successOnTimeout' => array(
-                  'location' => 'query',
-                  'type' => 'boolean',
-                ),
-                'waitToken' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-              ),
-            ),'update' => array(
-              'path' => 'v2/controller/debuggees/{debuggeeId}/breakpoints/{id}',
-              'httpMethod' => 'PUT',
-              'parameters' => array(
-                'debuggeeId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'id' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),
-          )
-        )
-    );
-    $this->debugger_debuggees = new Google_Service_CloudDebugger_Resource_DebuggerDebuggees(
-        $this,
-        $this->serviceName,
-        'debuggees',
-        array(
-          'methods' => array(
-            'list' => array(
-              'path' => 'v2/debugger/debuggees',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'clientVersion' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'includeInactive' => array(
-                  'location' => 'query',
-                  'type' => 'boolean',
-                ),
-                'project' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-              ),
-            ),
-          )
-        )
-    );
-    $this->debugger_debuggees_breakpoints = new Google_Service_CloudDebugger_Resource_DebuggerDebuggeesBreakpoints(
-        $this,
-        $this->serviceName,
-        'breakpoints',
-        array(
-          'methods' => array(
-            'delete' => array(
-              'path' => 'v2/debugger/debuggees/{debuggeeId}/breakpoints/{breakpointId}',
-              'httpMethod' => 'DELETE',
-              'parameters' => array(
-                'debuggeeId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'breakpointId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'clientVersion' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-              ),
-            ),'get' => array(
-              'path' => 'v2/debugger/debuggees/{debuggeeId}/breakpoints/{breakpointId}',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'debuggeeId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'breakpointId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'clientVersion' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-              ),
-            ),'list' => array(
-              'path' => 'v2/debugger/debuggees/{debuggeeId}/breakpoints',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'debuggeeId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'stripResults' => array(
-                  'location' => 'query',
-                  'type' => 'boolean',
-                ),
-                'waitToken' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'clientVersion' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'action.value' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'includeAllUsers' => array(
-                  'location' => 'query',
-                  'type' => 'boolean',
-                ),
-                'includeInactive' => array(
-                  'location' => 'query',
-                  'type' => 'boolean',
-                ),
-              ),
-            ),'set' => array(
-              'path' => 'v2/debugger/debuggees/{debuggeeId}/breakpoints/set',
-              'httpMethod' => 'POST',
-              'parameters' => array(
-                'debuggeeId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'clientVersion' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-              ),
-            ),
-          )
-        )
-    );
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudDebugger/AliasContext.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudDebugger/AliasContext.php
deleted file mode 100644
index 0a0d9892..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudDebugger/AliasContext.php
+++ /dev/null
@@ -1,39 +0,0 @@
-kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setName($name)
-  {
-    $this->name = $name;
-  }
-  public function getName()
-  {
-    return $this->name;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudDebugger/Breakpoint.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudDebugger/Breakpoint.php
deleted file mode 100644
index 146ca95a..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudDebugger/Breakpoint.php
+++ /dev/null
@@ -1,171 +0,0 @@
-action = $action;
-  }
-  public function getAction()
-  {
-    return $this->action;
-  }
-  public function setCondition($condition)
-  {
-    $this->condition = $condition;
-  }
-  public function getCondition()
-  {
-    return $this->condition;
-  }
-  public function setCreateTime($createTime)
-  {
-    $this->createTime = $createTime;
-  }
-  public function getCreateTime()
-  {
-    return $this->createTime;
-  }
-  public function setEvaluatedExpressions($evaluatedExpressions)
-  {
-    $this->evaluatedExpressions = $evaluatedExpressions;
-  }
-  public function getEvaluatedExpressions()
-  {
-    return $this->evaluatedExpressions;
-  }
-  public function setExpressions($expressions)
-  {
-    $this->expressions = $expressions;
-  }
-  public function getExpressions()
-  {
-    return $this->expressions;
-  }
-  public function setFinalTime($finalTime)
-  {
-    $this->finalTime = $finalTime;
-  }
-  public function getFinalTime()
-  {
-    return $this->finalTime;
-  }
-  public function setId($id)
-  {
-    $this->id = $id;
-  }
-  public function getId()
-  {
-    return $this->id;
-  }
-  public function setIsFinalState($isFinalState)
-  {
-    $this->isFinalState = $isFinalState;
-  }
-  public function getIsFinalState()
-  {
-    return $this->isFinalState;
-  }
-  public function setLabels($labels)
-  {
-    $this->labels = $labels;
-  }
-  public function getLabels()
-  {
-    return $this->labels;
-  }
-  public function setLocation(Google_Service_CloudDebugger_SourceLocation $location)
-  {
-    $this->location = $location;
-  }
-  public function getLocation()
-  {
-    return $this->location;
-  }
-  public function setLogLevel($logLevel)
-  {
-    $this->logLevel = $logLevel;
-  }
-  public function getLogLevel()
-  {
-    return $this->logLevel;
-  }
-  public function setLogMessageFormat($logMessageFormat)
-  {
-    $this->logMessageFormat = $logMessageFormat;
-  }
-  public function getLogMessageFormat()
-  {
-    return $this->logMessageFormat;
-  }
-  public function setStackFrames($stackFrames)
-  {
-    $this->stackFrames = $stackFrames;
-  }
-  public function getStackFrames()
-  {
-    return $this->stackFrames;
-  }
-  public function setStatus(Google_Service_CloudDebugger_StatusMessage $status)
-  {
-    $this->status = $status;
-  }
-  public function getStatus()
-  {
-    return $this->status;
-  }
-  public function setUserEmail($userEmail)
-  {
-    $this->userEmail = $userEmail;
-  }
-  public function getUserEmail()
-  {
-    return $this->userEmail;
-  }
-  public function setVariableTable($variableTable)
-  {
-    $this->variableTable = $variableTable;
-  }
-  public function getVariableTable()
-  {
-    return $this->variableTable;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudDebugger/CloudRepoSourceContext.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudDebugger/CloudRepoSourceContext.php
deleted file mode 100644
index fcd5d8b8..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudDebugger/CloudRepoSourceContext.php
+++ /dev/null
@@ -1,59 +0,0 @@
-aliasContext = $aliasContext;
-  }
-  public function getAliasContext()
-  {
-    return $this->aliasContext;
-  }
-  public function setAliasName($aliasName)
-  {
-    $this->aliasName = $aliasName;
-  }
-  public function getAliasName()
-  {
-    return $this->aliasName;
-  }
-  public function setRepoId(Google_Service_CloudDebugger_RepoId $repoId)
-  {
-    $this->repoId = $repoId;
-  }
-  public function getRepoId()
-  {
-    return $this->repoId;
-  }
-  public function setRevisionId($revisionId)
-  {
-    $this->revisionId = $revisionId;
-  }
-  public function getRevisionId()
-  {
-    return $this->revisionId;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudDebugger/CloudWorkspaceId.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudDebugger/CloudWorkspaceId.php
deleted file mode 100644
index 30d3bd82..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudDebugger/CloudWorkspaceId.php
+++ /dev/null
@@ -1,40 +0,0 @@
-name = $name;
-  }
-  public function getName()
-  {
-    return $this->name;
-  }
-  public function setRepoId(Google_Service_CloudDebugger_RepoId $repoId)
-  {
-    $this->repoId = $repoId;
-  }
-  public function getRepoId()
-  {
-    return $this->repoId;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudDebugger/CloudWorkspaceSourceContext.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudDebugger/CloudWorkspaceSourceContext.php
deleted file mode 100644
index a29c6abb..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudDebugger/CloudWorkspaceSourceContext.php
+++ /dev/null
@@ -1,40 +0,0 @@
-snapshotId = $snapshotId;
-  }
-  public function getSnapshotId()
-  {
-    return $this->snapshotId;
-  }
-  public function setWorkspaceId(Google_Service_CloudDebugger_CloudWorkspaceId $workspaceId)
-  {
-    $this->workspaceId = $workspaceId;
-  }
-  public function getWorkspaceId()
-  {
-    return $this->workspaceId;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudDebugger/ClouddebuggerEmpty.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudDebugger/ClouddebuggerEmpty.php
deleted file mode 100644
index 1baaee17..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudDebugger/ClouddebuggerEmpty.php
+++ /dev/null
@@ -1,20 +0,0 @@
-agentVersion = $agentVersion;
-  }
-  public function getAgentVersion()
-  {
-    return $this->agentVersion;
-  }
-  public function setDescription($description)
-  {
-    $this->description = $description;
-  }
-  public function getDescription()
-  {
-    return $this->description;
-  }
-  public function setExtSourceContexts($extSourceContexts)
-  {
-    $this->extSourceContexts = $extSourceContexts;
-  }
-  public function getExtSourceContexts()
-  {
-    return $this->extSourceContexts;
-  }
-  public function setId($id)
-  {
-    $this->id = $id;
-  }
-  public function getId()
-  {
-    return $this->id;
-  }
-  public function setIsDisabled($isDisabled)
-  {
-    $this->isDisabled = $isDisabled;
-  }
-  public function getIsDisabled()
-  {
-    return $this->isDisabled;
-  }
-  public function setIsInactive($isInactive)
-  {
-    $this->isInactive = $isInactive;
-  }
-  public function getIsInactive()
-  {
-    return $this->isInactive;
-  }
-  public function setLabels($labels)
-  {
-    $this->labels = $labels;
-  }
-  public function getLabels()
-  {
-    return $this->labels;
-  }
-  public function setProject($project)
-  {
-    $this->project = $project;
-  }
-  public function getProject()
-  {
-    return $this->project;
-  }
-  public function setSourceContexts($sourceContexts)
-  {
-    $this->sourceContexts = $sourceContexts;
-  }
-  public function getSourceContexts()
-  {
-    return $this->sourceContexts;
-  }
-  public function setStatus(Google_Service_CloudDebugger_StatusMessage $status)
-  {
-    $this->status = $status;
-  }
-  public function getStatus()
-  {
-    return $this->status;
-  }
-  public function setUniquifier($uniquifier)
-  {
-    $this->uniquifier = $uniquifier;
-  }
-  public function getUniquifier()
-  {
-    return $this->uniquifier;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudDebugger/ExtendedSourceContext.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudDebugger/ExtendedSourceContext.php
deleted file mode 100644
index bdde38dd..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudDebugger/ExtendedSourceContext.php
+++ /dev/null
@@ -1,40 +0,0 @@
-context = $context;
-  }
-  public function getContext()
-  {
-    return $this->context;
-  }
-  public function setLabels($labels)
-  {
-    $this->labels = $labels;
-  }
-  public function getLabels()
-  {
-    return $this->labels;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudDebugger/FormatMessage.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudDebugger/FormatMessage.php
deleted file mode 100644
index e56e5f9c..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudDebugger/FormatMessage.php
+++ /dev/null
@@ -1,40 +0,0 @@
-format = $format;
-  }
-  public function getFormat()
-  {
-    return $this->format;
-  }
-  public function setParameters($parameters)
-  {
-    $this->parameters = $parameters;
-  }
-  public function getParameters()
-  {
-    return $this->parameters;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudDebugger/GerritSourceContext.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudDebugger/GerritSourceContext.php
deleted file mode 100644
index 4cb77f83..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudDebugger/GerritSourceContext.php
+++ /dev/null
@@ -1,67 +0,0 @@
-aliasContext = $aliasContext;
-  }
-  public function getAliasContext()
-  {
-    return $this->aliasContext;
-  }
-  public function setAliasName($aliasName)
-  {
-    $this->aliasName = $aliasName;
-  }
-  public function getAliasName()
-  {
-    return $this->aliasName;
-  }
-  public function setGerritProject($gerritProject)
-  {
-    $this->gerritProject = $gerritProject;
-  }
-  public function getGerritProject()
-  {
-    return $this->gerritProject;
-  }
-  public function setHostUri($hostUri)
-  {
-    $this->hostUri = $hostUri;
-  }
-  public function getHostUri()
-  {
-    return $this->hostUri;
-  }
-  public function setRevisionId($revisionId)
-  {
-    $this->revisionId = $revisionId;
-  }
-  public function getRevisionId()
-  {
-    return $this->revisionId;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudDebugger/GetBreakpointResponse.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudDebugger/GetBreakpointResponse.php
deleted file mode 100644
index de523178..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudDebugger/GetBreakpointResponse.php
+++ /dev/null
@@ -1,31 +0,0 @@
-breakpoint = $breakpoint;
-  }
-  public function getBreakpoint()
-  {
-    return $this->breakpoint;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudDebugger/GitSourceContext.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudDebugger/GitSourceContext.php
deleted file mode 100644
index 2d916fc1..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudDebugger/GitSourceContext.php
+++ /dev/null
@@ -1,39 +0,0 @@
-revisionId = $revisionId;
-  }
-  public function getRevisionId()
-  {
-    return $this->revisionId;
-  }
-  public function setUrl($url)
-  {
-    $this->url = $url;
-  }
-  public function getUrl()
-  {
-    return $this->url;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudDebugger/ListActiveBreakpointsResponse.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudDebugger/ListActiveBreakpointsResponse.php
deleted file mode 100644
index ec0375dc..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudDebugger/ListActiveBreakpointsResponse.php
+++ /dev/null
@@ -1,50 +0,0 @@
-breakpoints = $breakpoints;
-  }
-  public function getBreakpoints()
-  {
-    return $this->breakpoints;
-  }
-  public function setNextWaitToken($nextWaitToken)
-  {
-    $this->nextWaitToken = $nextWaitToken;
-  }
-  public function getNextWaitToken()
-  {
-    return $this->nextWaitToken;
-  }
-  public function setWaitExpired($waitExpired)
-  {
-    $this->waitExpired = $waitExpired;
-  }
-  public function getWaitExpired()
-  {
-    return $this->waitExpired;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudDebugger/ListBreakpointsResponse.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudDebugger/ListBreakpointsResponse.php
deleted file mode 100644
index dabcf969..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudDebugger/ListBreakpointsResponse.php
+++ /dev/null
@@ -1,41 +0,0 @@
-breakpoints = $breakpoints;
-  }
-  public function getBreakpoints()
-  {
-    return $this->breakpoints;
-  }
-  public function setNextWaitToken($nextWaitToken)
-  {
-    $this->nextWaitToken = $nextWaitToken;
-  }
-  public function getNextWaitToken()
-  {
-    return $this->nextWaitToken;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudDebugger/ListDebuggeesResponse.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudDebugger/ListDebuggeesResponse.php
deleted file mode 100644
index 2669e3cb..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudDebugger/ListDebuggeesResponse.php
+++ /dev/null
@@ -1,32 +0,0 @@
-debuggees = $debuggees;
-  }
-  public function getDebuggees()
-  {
-    return $this->debuggees;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudDebugger/ProjectRepoId.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudDebugger/ProjectRepoId.php
deleted file mode 100644
index 7036340f..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudDebugger/ProjectRepoId.php
+++ /dev/null
@@ -1,39 +0,0 @@
-projectId = $projectId;
-  }
-  public function getProjectId()
-  {
-    return $this->projectId;
-  }
-  public function setRepoName($repoName)
-  {
-    $this->repoName = $repoName;
-  }
-  public function getRepoName()
-  {
-    return $this->repoName;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudDebugger/RegisterDebuggeeRequest.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudDebugger/RegisterDebuggeeRequest.php
deleted file mode 100644
index 1e395463..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudDebugger/RegisterDebuggeeRequest.php
+++ /dev/null
@@ -1,31 +0,0 @@
-debuggee = $debuggee;
-  }
-  public function getDebuggee()
-  {
-    return $this->debuggee;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudDebugger/RegisterDebuggeeResponse.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudDebugger/RegisterDebuggeeResponse.php
deleted file mode 100644
index cbd171c1..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudDebugger/RegisterDebuggeeResponse.php
+++ /dev/null
@@ -1,31 +0,0 @@
-debuggee = $debuggee;
-  }
-  public function getDebuggee()
-  {
-    return $this->debuggee;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudDebugger/RepoId.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudDebugger/RepoId.php
deleted file mode 100644
index c5a3b8bb..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudDebugger/RepoId.php
+++ /dev/null
@@ -1,40 +0,0 @@
-projectRepoId = $projectRepoId;
-  }
-  public function getProjectRepoId()
-  {
-    return $this->projectRepoId;
-  }
-  public function setUid($uid)
-  {
-    $this->uid = $uid;
-  }
-  public function getUid()
-  {
-    return $this->uid;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudDebugger/Resource/Controller.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudDebugger/Resource/Controller.php
deleted file mode 100644
index 70699a84..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudDebugger/Resource/Controller.php
+++ /dev/null
@@ -1,28 +0,0 @@
-
- *   $clouddebuggerService = new Google_Service_CloudDebugger(...);
- *   $controller = $clouddebuggerService->controller;
- *  
- */
-class Google_Service_CloudDebugger_Resource_Controller extends Google_Service_Resource
-{
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudDebugger/Resource/ControllerDebuggees.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudDebugger/Resource/ControllerDebuggees.php
deleted file mode 100644
index e016aabf..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudDebugger/Resource/ControllerDebuggees.php
+++ /dev/null
@@ -1,50 +0,0 @@
-
- *   $clouddebuggerService = new Google_Service_CloudDebugger(...);
- *   $debuggees = $clouddebuggerService->debuggees;
- *  
- */
-class Google_Service_CloudDebugger_Resource_ControllerDebuggees extends Google_Service_Resource
-{
-  /**
-   * Registers the debuggee with the controller service.
-   *
-   * All agents attached to the same application should call this method with the
-   * same request content to get back the same stable `debuggee_id`. Agents should
-   * call this method again whenever `google.rpc.Code.NOT_FOUND` is returned from
-   * any controller method.
-   *
-   * This allows the controller service to disable the agent or recover from any
-   * data loss. If the debuggee is disabled by the server, the response will have
-   * `is_disabled` set to `true`. (debuggees.register)
-   *
-   * @param Google_Service_CloudDebugger_RegisterDebuggeeRequest $postBody
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_CloudDebugger_RegisterDebuggeeResponse
-   */
-  public function register(Google_Service_CloudDebugger_RegisterDebuggeeRequest $postBody, $optParams = array())
-  {
-    $params = array('postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('register', array($params), "Google_Service_CloudDebugger_RegisterDebuggeeResponse");
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudDebugger/Resource/ControllerDebuggeesBreakpoints.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudDebugger/Resource/ControllerDebuggeesBreakpoints.php
deleted file mode 100644
index 9c948c8c..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudDebugger/Resource/ControllerDebuggeesBreakpoints.php
+++ /dev/null
@@ -1,85 +0,0 @@
-
- *   $clouddebuggerService = new Google_Service_CloudDebugger(...);
- *   $breakpoints = $clouddebuggerService->breakpoints;
- *  
- */
-class Google_Service_CloudDebugger_Resource_ControllerDebuggeesBreakpoints extends Google_Service_Resource
-{
-  /**
-   * Returns the list of all active breakpoints for the debuggee.
-   *
-   * The breakpoint specification (location, condition, and expression fields) is
-   * semantically immutable, although the field values may change. For example, an
-   * agent may update the location line number to reflect the actual line where
-   * the breakpoint was set, but this doesn't change the breakpoint semantics.
-   *
-   * This means that an agent does not need to check if a breakpoint has changed
-   * when it encounters the same breakpoint on a successive call. Moreover, an
-   * agent should remember the breakpoints that are completed until the controller
-   * removes them from the active list to avoid setting those breakpoints again.
-   * (breakpoints.listControllerDebuggeesBreakpoints)
-   *
-   * @param string $debuggeeId Identifies the debuggee.
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param bool successOnTimeout If set to `true`, returns
-   * `google.rpc.Code.OK` status and sets the `wait_expired` response field to
-   * `true` when the server-selected timeout has expired (recommended).
-   *
-   * If set to `false`, returns `google.rpc.Code.ABORTED` status when the server-
-   * selected timeout has expired (deprecated).
-   * @opt_param string waitToken A wait token that, if specified, blocks the
-   * method call until the list of active breakpoints has changed, or a server
-   * selected timeout has expired.  The value should be set from the last returned
-   * response.
-   * @return Google_Service_CloudDebugger_ListActiveBreakpointsResponse
-   */
-  public function listControllerDebuggeesBreakpoints($debuggeeId, $optParams = array())
-  {
-    $params = array('debuggeeId' => $debuggeeId);
-    $params = array_merge($params, $optParams);
-    return $this->call('list', array($params), "Google_Service_CloudDebugger_ListActiveBreakpointsResponse");
-  }
-  /**
-   * Updates the breakpoint state or mutable fields. The entire Breakpoint message
-   * must be sent back to the controller service.
-   *
-   * Updates to active breakpoint fields are only allowed if the new value does
-   * not change the breakpoint specification. Updates to the `location`,
-   * `condition` and `expression` fields should not alter the breakpoint
-   * semantics. These may only make changes such as canonicalizing a value or
-   * snapping the location to the correct line of code. (breakpoints.update)
-   *
-   * @param string $debuggeeId Identifies the debuggee being debugged.
-   * @param string $id Breakpoint identifier, unique in the scope of the debuggee.
-   * @param Google_Service_CloudDebugger_UpdateActiveBreakpointRequest $postBody
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_CloudDebugger_UpdateActiveBreakpointResponse
-   */
-  public function update($debuggeeId, $id, Google_Service_CloudDebugger_UpdateActiveBreakpointRequest $postBody, $optParams = array())
-  {
-    $params = array('debuggeeId' => $debuggeeId, 'id' => $id, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('update', array($params), "Google_Service_CloudDebugger_UpdateActiveBreakpointResponse");
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudDebugger/Resource/Debugger.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudDebugger/Resource/Debugger.php
deleted file mode 100644
index 955317f5..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudDebugger/Resource/Debugger.php
+++ /dev/null
@@ -1,28 +0,0 @@
-
- *   $clouddebuggerService = new Google_Service_CloudDebugger(...);
- *   $debugger = $clouddebuggerService->debugger;
- *  
- */
-class Google_Service_CloudDebugger_Resource_Debugger extends Google_Service_Resource
-{
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudDebugger/Resource/DebuggerDebuggees.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudDebugger/Resource/DebuggerDebuggees.php
deleted file mode 100644
index 09871712..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudDebugger/Resource/DebuggerDebuggees.php
+++ /dev/null
@@ -1,48 +0,0 @@
-
- *   $clouddebuggerService = new Google_Service_CloudDebugger(...);
- *   $debuggees = $clouddebuggerService->debuggees;
- *  
- */
-class Google_Service_CloudDebugger_Resource_DebuggerDebuggees extends Google_Service_Resource
-{
-  /**
-   * Lists all the debuggees that the user can set breakpoints to.
-   * (debuggees.listDebuggerDebuggees)
-   *
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param string clientVersion The client version making the call.
-   * Following: `domain/type/version` (e.g., `google.com/intellij/v1`).
-   * @opt_param bool includeInactive When set to `true`, the result includes all
-   * debuggees. Otherwise, the result includes only debuggees that are active.
-   * @opt_param string project Project number of a Google Cloud project whose
-   * debuggees to list.
-   * @return Google_Service_CloudDebugger_ListDebuggeesResponse
-   */
-  public function listDebuggerDebuggees($optParams = array())
-  {
-    $params = array();
-    $params = array_merge($params, $optParams);
-    return $this->call('list', array($params), "Google_Service_CloudDebugger_ListDebuggeesResponse");
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudDebugger/Resource/DebuggerDebuggeesBreakpoints.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudDebugger/Resource/DebuggerDebuggeesBreakpoints.php
deleted file mode 100644
index dc07a2c1..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudDebugger/Resource/DebuggerDebuggeesBreakpoints.php
+++ /dev/null
@@ -1,113 +0,0 @@
-
- *   $clouddebuggerService = new Google_Service_CloudDebugger(...);
- *   $breakpoints = $clouddebuggerService->breakpoints;
- *  
- */
-class Google_Service_CloudDebugger_Resource_DebuggerDebuggeesBreakpoints extends Google_Service_Resource
-{
-  /**
-   * Deletes the breakpoint from the debuggee. (breakpoints.delete)
-   *
-   * @param string $debuggeeId ID of the debuggee whose breakpoint to delete.
-   * @param string $breakpointId ID of the breakpoint to delete.
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param string clientVersion The client version making the call.
-   * Following: `domain/type/version` (e.g., `google.com/intellij/v1`).
-   * @return Google_Service_CloudDebugger_ClouddebuggerEmpty
-   */
-  public function delete($debuggeeId, $breakpointId, $optParams = array())
-  {
-    $params = array('debuggeeId' => $debuggeeId, 'breakpointId' => $breakpointId);
-    $params = array_merge($params, $optParams);
-    return $this->call('delete', array($params), "Google_Service_CloudDebugger_ClouddebuggerEmpty");
-  }
-  /**
-   * Gets breakpoint information. (breakpoints.get)
-   *
-   * @param string $debuggeeId ID of the debuggee whose breakpoint to get.
-   * @param string $breakpointId ID of the breakpoint to get.
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param string clientVersion The client version making the call.
-   * Following: `domain/type/version` (e.g., `google.com/intellij/v1`).
-   * @return Google_Service_CloudDebugger_GetBreakpointResponse
-   */
-  public function get($debuggeeId, $breakpointId, $optParams = array())
-  {
-    $params = array('debuggeeId' => $debuggeeId, 'breakpointId' => $breakpointId);
-    $params = array_merge($params, $optParams);
-    return $this->call('get', array($params), "Google_Service_CloudDebugger_GetBreakpointResponse");
-  }
-  /**
-   * Lists all breakpoints for the debuggee.
-   * (breakpoints.listDebuggerDebuggeesBreakpoints)
-   *
-   * @param string $debuggeeId ID of the debuggee whose breakpoints to list.
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param bool stripResults This field is deprecated. The following fields
-   * are always stripped out of the result: `stack_frames`,
-   * `evaluated_expressions` and `variable_table`.
-   * @opt_param string waitToken A wait token that, if specified, blocks the call
-   * until the breakpoints list has changed, or a server selected timeout has
-   * expired.  The value should be set from the last response. The error code
-   * `google.rpc.Code.ABORTED` (RPC) is returned on wait timeout, which should be
-   * called again with the same `wait_token`.
-   * @opt_param string clientVersion The client version making the call.
-   * Following: `domain/type/version` (e.g., `google.com/intellij/v1`).
-   * @opt_param string action.value Only breakpoints with the specified action
-   * will pass the filter.
-   * @opt_param bool includeAllUsers When set to `true`, the response includes the
-   * list of breakpoints set by any user. Otherwise, it includes only breakpoints
-   * set by the caller.
-   * @opt_param bool includeInactive When set to `true`, the response includes
-   * active and inactive breakpoints. Otherwise, it includes only active
-   * breakpoints.
-   * @return Google_Service_CloudDebugger_ListBreakpointsResponse
-   */
-  public function listDebuggerDebuggeesBreakpoints($debuggeeId, $optParams = array())
-  {
-    $params = array('debuggeeId' => $debuggeeId);
-    $params = array_merge($params, $optParams);
-    return $this->call('list', array($params), "Google_Service_CloudDebugger_ListBreakpointsResponse");
-  }
-  /**
-   * Sets the breakpoint to the debuggee. (breakpoints.set)
-   *
-   * @param string $debuggeeId ID of the debuggee where the breakpoint is to be
-   * set.
-   * @param Google_Service_CloudDebugger_Breakpoint $postBody
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param string clientVersion The client version making the call.
-   * Following: `domain/type/version` (e.g., `google.com/intellij/v1`).
-   * @return Google_Service_CloudDebugger_SetBreakpointResponse
-   */
-  public function set($debuggeeId, Google_Service_CloudDebugger_Breakpoint $postBody, $optParams = array())
-  {
-    $params = array('debuggeeId' => $debuggeeId, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('set', array($params), "Google_Service_CloudDebugger_SetBreakpointResponse");
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudDebugger/SetBreakpointResponse.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudDebugger/SetBreakpointResponse.php
deleted file mode 100644
index 4616a51d..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudDebugger/SetBreakpointResponse.php
+++ /dev/null
@@ -1,31 +0,0 @@
-breakpoint = $breakpoint;
-  }
-  public function getBreakpoint()
-  {
-    return $this->breakpoint;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudDebugger/SourceContext.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudDebugger/SourceContext.php
deleted file mode 100644
index e6eb484b..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudDebugger/SourceContext.php
+++ /dev/null
@@ -1,61 +0,0 @@
-cloudRepo = $cloudRepo;
-  }
-  public function getCloudRepo()
-  {
-    return $this->cloudRepo;
-  }
-  public function setCloudWorkspace(Google_Service_CloudDebugger_CloudWorkspaceSourceContext $cloudWorkspace)
-  {
-    $this->cloudWorkspace = $cloudWorkspace;
-  }
-  public function getCloudWorkspace()
-  {
-    return $this->cloudWorkspace;
-  }
-  public function setGerrit(Google_Service_CloudDebugger_GerritSourceContext $gerrit)
-  {
-    $this->gerrit = $gerrit;
-  }
-  public function getGerrit()
-  {
-    return $this->gerrit;
-  }
-  public function setGit(Google_Service_CloudDebugger_GitSourceContext $git)
-  {
-    $this->git = $git;
-  }
-  public function getGit()
-  {
-    return $this->git;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudDebugger/SourceLocation.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudDebugger/SourceLocation.php
deleted file mode 100644
index a896bb7f..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudDebugger/SourceLocation.php
+++ /dev/null
@@ -1,39 +0,0 @@
-line = $line;
-  }
-  public function getLine()
-  {
-    return $this->line;
-  }
-  public function setPath($path)
-  {
-    $this->path = $path;
-  }
-  public function getPath()
-  {
-    return $this->path;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudDebugger/StackFrame.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudDebugger/StackFrame.php
deleted file mode 100644
index a06beb7e..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudDebugger/StackFrame.php
+++ /dev/null
@@ -1,61 +0,0 @@
-arguments = $arguments;
-  }
-  public function getArguments()
-  {
-    return $this->arguments;
-  }
-  public function setFunction($function)
-  {
-    $this->function = $function;
-  }
-  public function getFunction()
-  {
-    return $this->function;
-  }
-  public function setLocals($locals)
-  {
-    $this->locals = $locals;
-  }
-  public function getLocals()
-  {
-    return $this->locals;
-  }
-  public function setLocation(Google_Service_CloudDebugger_SourceLocation $location)
-  {
-    $this->location = $location;
-  }
-  public function getLocation()
-  {
-    return $this->location;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudDebugger/StatusMessage.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudDebugger/StatusMessage.php
deleted file mode 100644
index 43ba9882..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudDebugger/StatusMessage.php
+++ /dev/null
@@ -1,49 +0,0 @@
-description = $description;
-  }
-  public function getDescription()
-  {
-    return $this->description;
-  }
-  public function setIsError($isError)
-  {
-    $this->isError = $isError;
-  }
-  public function getIsError()
-  {
-    return $this->isError;
-  }
-  public function setRefersTo($refersTo)
-  {
-    $this->refersTo = $refersTo;
-  }
-  public function getRefersTo()
-  {
-    return $this->refersTo;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudDebugger/UpdateActiveBreakpointRequest.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudDebugger/UpdateActiveBreakpointRequest.php
deleted file mode 100644
index 3181a61a..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudDebugger/UpdateActiveBreakpointRequest.php
+++ /dev/null
@@ -1,31 +0,0 @@
-breakpoint = $breakpoint;
-  }
-  public function getBreakpoint()
-  {
-    return $this->breakpoint;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudDebugger/UpdateActiveBreakpointResponse.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudDebugger/UpdateActiveBreakpointResponse.php
deleted file mode 100644
index a65647da..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudDebugger/UpdateActiveBreakpointResponse.php
+++ /dev/null
@@ -1,20 +0,0 @@
-members = $members;
-  }
-  public function getMembers()
-  {
-    return $this->members;
-  }
-  public function setName($name)
-  {
-    $this->name = $name;
-  }
-  public function getName()
-  {
-    return $this->name;
-  }
-  public function setStatus(Google_Service_CloudDebugger_StatusMessage $status)
-  {
-    $this->status = $status;
-  }
-  public function getStatus()
-  {
-    return $this->status;
-  }
-  public function setType($type)
-  {
-    $this->type = $type;
-  }
-  public function getType()
-  {
-    return $this->type;
-  }
-  public function setValue($value)
-  {
-    $this->value = $value;
-  }
-  public function getValue()
-  {
-    return $this->value;
-  }
-  public function setVarTableIndex($varTableIndex)
-  {
-    $this->varTableIndex = $varTableIndex;
-  }
-  public function getVarTableIndex()
-  {
-    return $this->varTableIndex;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudFunctions.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudFunctions.php
deleted file mode 100644
index 2ce8b7d2..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudFunctions.php
+++ /dev/null
@@ -1,207 +0,0 @@
-
- * API for managing lightweight user-provided functions executed in response to
- * events.

- *
- * 

- * For more information about this service, see the API
- * Documentation
- * 

- *
- * @author Google, Inc.
- */
-class Google_Service_CloudFunctions extends Google_Service
-{
-  /** View and manage your data across Google Cloud Platform services. */
-  const CLOUD_PLATFORM =
-      "https://www.googleapis.com/auth/cloud-platform";
-
-  public $operations;
-  public $projects_locations;
-  public $projects_locations_functions;
-  
-  /**
-   * Constructs the internal representation of the CloudFunctions service.
-   *
-   * @param Google_Client $client
-   */
-  public function __construct(Google_Client $client)
-  {
-    parent::__construct($client);
-    $this->rootUrl = 'https://cloudfunctions.googleapis.com/';
-    $this->servicePath = '';
-    $this->version = 'v1beta2';
-    $this->serviceName = 'cloudfunctions';
-
-    $this->operations = new Google_Service_CloudFunctions_Resource_Operations(
-        $this,
-        $this->serviceName,
-        'operations',
-        array(
-          'methods' => array(
-            'get' => array(
-              'path' => 'v1beta2/{+name}',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'name' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'list' => array(
-              'path' => 'v1beta2/operations',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'filter' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'name' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'pageToken' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'pageSize' => array(
-                  'location' => 'query',
-                  'type' => 'integer',
-                ),
-              ),
-            ),
-          )
-        )
-    );
-    $this->projects_locations = new Google_Service_CloudFunctions_Resource_ProjectsLocations(
-        $this,
-        $this->serviceName,
-        'locations',
-        array(
-          'methods' => array(
-            'list' => array(
-              'path' => 'v1beta2/{+name}/locations',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'name' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'filter' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'pageToken' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'pageSize' => array(
-                  'location' => 'query',
-                  'type' => 'integer',
-                ),
-              ),
-            ),
-          )
-        )
-    );
-    $this->projects_locations_functions = new Google_Service_CloudFunctions_Resource_ProjectsLocationsFunctions(
-        $this,
-        $this->serviceName,
-        'functions',
-        array(
-          'methods' => array(
-            'call' => array(
-              'path' => 'v1beta2/{+name}:call',
-              'httpMethod' => 'POST',
-              'parameters' => array(
-                'name' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'create' => array(
-              'path' => 'v1beta2/{+location}/functions',
-              'httpMethod' => 'POST',
-              'parameters' => array(
-                'location' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'delete' => array(
-              'path' => 'v1beta2/{+name}',
-              'httpMethod' => 'DELETE',
-              'parameters' => array(
-                'name' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'get' => array(
-              'path' => 'v1beta2/{+name}',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'name' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'list' => array(
-              'path' => 'v1beta2/{+location}/functions',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'location' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'pageToken' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'pageSize' => array(
-                  'location' => 'query',
-                  'type' => 'integer',
-                ),
-              ),
-            ),'update' => array(
-              'path' => 'v1beta2/{+name}',
-              'httpMethod' => 'PUT',
-              'parameters' => array(
-                'name' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),
-          )
-        )
-    );
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudFunctions/CallFunctionRequest.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudFunctions/CallFunctionRequest.php
deleted file mode 100644
index 5ab182c3..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudFunctions/CallFunctionRequest.php
+++ /dev/null
@@ -1,30 +0,0 @@
-data = $data;
-  }
-  public function getData()
-  {
-    return $this->data;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudFunctions/CallFunctionResponse.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudFunctions/CallFunctionResponse.php
deleted file mode 100644
index c610940e..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudFunctions/CallFunctionResponse.php
+++ /dev/null
@@ -1,48 +0,0 @@
-error = $error;
-  }
-  public function getError()
-  {
-    return $this->error;
-  }
-  public function setExecutionId($executionId)
-  {
-    $this->executionId = $executionId;
-  }
-  public function getExecutionId()
-  {
-    return $this->executionId;
-  }
-  public function setResult($result)
-  {
-    $this->result = $result;
-  }
-  public function getResult()
-  {
-    return $this->result;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudFunctions/CloudFunction.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudFunctions/CloudFunction.php
deleted file mode 100644
index 09ce0bba..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudFunctions/CloudFunction.php
+++ /dev/null
@@ -1,132 +0,0 @@
-availableMemoryMb = $availableMemoryMb;
-  }
-  public function getAvailableMemoryMb()
-  {
-    return $this->availableMemoryMb;
-  }
-  public function setEntryPoint($entryPoint)
-  {
-    $this->entryPoint = $entryPoint;
-  }
-  public function getEntryPoint()
-  {
-    return $this->entryPoint;
-  }
-  public function setEventTrigger(Google_Service_CloudFunctions_EventTrigger $eventTrigger)
-  {
-    $this->eventTrigger = $eventTrigger;
-  }
-  public function getEventTrigger()
-  {
-    return $this->eventTrigger;
-  }
-  public function setHttpsTrigger(Google_Service_CloudFunctions_HTTPSTrigger $httpsTrigger)
-  {
-    $this->httpsTrigger = $httpsTrigger;
-  }
-  public function getHttpsTrigger()
-  {
-    return $this->httpsTrigger;
-  }
-  public function setLatestOperation($latestOperation)
-  {
-    $this->latestOperation = $latestOperation;
-  }
-  public function getLatestOperation()
-  {
-    return $this->latestOperation;
-  }
-  public function setName($name)
-  {
-    $this->name = $name;
-  }
-  public function getName()
-  {
-    return $this->name;
-  }
-  public function setServiceAccount($serviceAccount)
-  {
-    $this->serviceAccount = $serviceAccount;
-  }
-  public function getServiceAccount()
-  {
-    return $this->serviceAccount;
-  }
-  public function setSourceArchiveUrl($sourceArchiveUrl)
-  {
-    $this->sourceArchiveUrl = $sourceArchiveUrl;
-  }
-  public function getSourceArchiveUrl()
-  {
-    return $this->sourceArchiveUrl;
-  }
-  public function setSourceRepository(Google_Service_CloudFunctions_SourceRepository $sourceRepository)
-  {
-    $this->sourceRepository = $sourceRepository;
-  }
-  public function getSourceRepository()
-  {
-    return $this->sourceRepository;
-  }
-  public function setStatus($status)
-  {
-    $this->status = $status;
-  }
-  public function getStatus()
-  {
-    return $this->status;
-  }
-  public function setTimeout($timeout)
-  {
-    $this->timeout = $timeout;
-  }
-  public function getTimeout()
-  {
-    return $this->timeout;
-  }
-  public function setUpdateTime($updateTime)
-  {
-    $this->updateTime = $updateTime;
-  }
-  public function getUpdateTime()
-  {
-    return $this->updateTime;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudFunctions/EventTrigger.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudFunctions/EventTrigger.php
deleted file mode 100644
index 03095384..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudFunctions/EventTrigger.php
+++ /dev/null
@@ -1,39 +0,0 @@
-eventType = $eventType;
-  }
-  public function getEventType()
-  {
-    return $this->eventType;
-  }
-  public function setResource($resource)
-  {
-    $this->resource = $resource;
-  }
-  public function getResource()
-  {
-    return $this->resource;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudFunctions/HTTPSTrigger.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudFunctions/HTTPSTrigger.php
deleted file mode 100644
index 1141c4bd..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudFunctions/HTTPSTrigger.php
+++ /dev/null
@@ -1,30 +0,0 @@
-url = $url;
-  }
-  public function getUrl()
-  {
-    return $this->url;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudFunctions/ListFunctionsResponse.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudFunctions/ListFunctionsResponse.php
deleted file mode 100644
index c8ec7722..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudFunctions/ListFunctionsResponse.php
+++ /dev/null
@@ -1,41 +0,0 @@
-functions = $functions;
-  }
-  public function getFunctions()
-  {
-    return $this->functions;
-  }
-  public function setNextPageToken($nextPageToken)
-  {
-    $this->nextPageToken = $nextPageToken;
-  }
-  public function getNextPageToken()
-  {
-    return $this->nextPageToken;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudFunctions/ListLocationsResponse.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudFunctions/ListLocationsResponse.php
deleted file mode 100644
index 5e4fe418..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudFunctions/ListLocationsResponse.php
+++ /dev/null
@@ -1,41 +0,0 @@
-locations = $locations;
-  }
-  public function getLocations()
-  {
-    return $this->locations;
-  }
-  public function setNextPageToken($nextPageToken)
-  {
-    $this->nextPageToken = $nextPageToken;
-  }
-  public function getNextPageToken()
-  {
-    return $this->nextPageToken;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudFunctions/ListOperationsResponse.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudFunctions/ListOperationsResponse.php
deleted file mode 100644
index 9de98b6d..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudFunctions/ListOperationsResponse.php
+++ /dev/null
@@ -1,41 +0,0 @@
-nextPageToken = $nextPageToken;
-  }
-  public function getNextPageToken()
-  {
-    return $this->nextPageToken;
-  }
-  public function setOperations($operations)
-  {
-    $this->operations = $operations;
-  }
-  public function getOperations()
-  {
-    return $this->operations;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudFunctions/Location.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudFunctions/Location.php
deleted file mode 100644
index 1cf8057d..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudFunctions/Location.php
+++ /dev/null
@@ -1,57 +0,0 @@
-labels = $labels;
-  }
-  public function getLabels()
-  {
-    return $this->labels;
-  }
-  public function setLocationId($locationId)
-  {
-    $this->locationId = $locationId;
-  }
-  public function getLocationId()
-  {
-    return $this->locationId;
-  }
-  public function setMetadata($metadata)
-  {
-    $this->metadata = $metadata;
-  }
-  public function getMetadata()
-  {
-    return $this->metadata;
-  }
-  public function setName($name)
-  {
-    $this->name = $name;
-  }
-  public function getName()
-  {
-    return $this->name;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudFunctions/Operation.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudFunctions/Operation.php
deleted file mode 100644
index 4385fb57..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudFunctions/Operation.php
+++ /dev/null
@@ -1,67 +0,0 @@
-done = $done;
-  }
-  public function getDone()
-  {
-    return $this->done;
-  }
-  public function setError(Google_Service_CloudFunctions_Status $error)
-  {
-    $this->error = $error;
-  }
-  public function getError()
-  {
-    return $this->error;
-  }
-  public function setMetadata($metadata)
-  {
-    $this->metadata = $metadata;
-  }
-  public function getMetadata()
-  {
-    return $this->metadata;
-  }
-  public function setName($name)
-  {
-    $this->name = $name;
-  }
-  public function getName()
-  {
-    return $this->name;
-  }
-  public function setResponse($response)
-  {
-    $this->response = $response;
-  }
-  public function getResponse()
-  {
-    return $this->response;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudFunctions/OperationMetadataV1Beta2.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudFunctions/OperationMetadataV1Beta2.php
deleted file mode 100644
index 76430bc5..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudFunctions/OperationMetadataV1Beta2.php
+++ /dev/null
@@ -1,48 +0,0 @@
-request = $request;
-  }
-  public function getRequest()
-  {
-    return $this->request;
-  }
-  public function setTarget($target)
-  {
-    $this->target = $target;
-  }
-  public function getTarget()
-  {
-    return $this->target;
-  }
-  public function setType($type)
-  {
-    $this->type = $type;
-  }
-  public function getType()
-  {
-    return $this->type;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudFunctions/Resource/Operations.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudFunctions/Resource/Operations.php
deleted file mode 100644
index 4b431326..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudFunctions/Resource/Operations.php
+++ /dev/null
@@ -1,65 +0,0 @@
-
- *   $cloudfunctionsService = new Google_Service_CloudFunctions(...);
- *   $operations = $cloudfunctionsService->operations;
- *  
- */
-class Google_Service_CloudFunctions_Resource_Operations extends Google_Service_Resource
-{
-  /**
-   * Gets the latest state of a long-running operation.  Clients can use this
-   * method to poll the operation result at intervals as recommended by the API
-   * service. (operations.get)
-   *
-   * @param string $name The name of the operation resource.
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_CloudFunctions_Operation
-   */
-  public function get($name, $optParams = array())
-  {
-    $params = array('name' => $name);
-    $params = array_merge($params, $optParams);
-    return $this->call('get', array($params), "Google_Service_CloudFunctions_Operation");
-  }
-  /**
-   * Lists operations that match the specified filter in the request. If the
-   * server doesn't support this method, it returns `UNIMPLEMENTED`.
-   *
-   * NOTE: the `name` binding below allows API services to override the binding to
-   * use different resource name schemes, such as `users/operations`.
-   * (operations.listOperations)
-   *
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param string filter The standard list filter.
-   * @opt_param string name The name of the operation collection.
-   * @opt_param string pageToken The standard list page token.
-   * @opt_param int pageSize The standard list page size.
-   * @return Google_Service_CloudFunctions_ListOperationsResponse
-   */
-  public function listOperations($optParams = array())
-  {
-    $params = array();
-    $params = array_merge($params, $optParams);
-    return $this->call('list', array($params), "Google_Service_CloudFunctions_ListOperationsResponse");
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudFunctions/Resource/Projects.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudFunctions/Resource/Projects.php
deleted file mode 100644
index 96f030fa..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudFunctions/Resource/Projects.php
+++ /dev/null
@@ -1,28 +0,0 @@
-
- *   $cloudfunctionsService = new Google_Service_CloudFunctions(...);
- *   $projects = $cloudfunctionsService->projects;
- *  
- */
-class Google_Service_CloudFunctions_Resource_Projects extends Google_Service_Resource
-{
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudFunctions/Resource/ProjectsLocations.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudFunctions/Resource/ProjectsLocations.php
deleted file mode 100644
index b233fcce..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudFunctions/Resource/ProjectsLocations.php
+++ /dev/null
@@ -1,47 +0,0 @@
-
- *   $cloudfunctionsService = new Google_Service_CloudFunctions(...);
- *   $locations = $cloudfunctionsService->locations;
- *  
- */
-class Google_Service_CloudFunctions_Resource_ProjectsLocations extends Google_Service_Resource
-{
-  /**
-   * Lists information about the supported locations for this service.
-   * (locations.listProjectsLocations)
-   *
-   * @param string $name The resource that owns the locations collection, if
-   * applicable.
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param string filter The standard list filter.
-   * @opt_param string pageToken The standard list page token.
-   * @opt_param int pageSize The standard list page size.
-   * @return Google_Service_CloudFunctions_ListLocationsResponse
-   */
-  public function listProjectsLocations($name, $optParams = array())
-  {
-    $params = array('name' => $name);
-    $params = array_merge($params, $optParams);
-    return $this->call('list', array($params), "Google_Service_CloudFunctions_ListLocationsResponse");
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudFunctions/Resource/ProjectsLocationsFunctions.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudFunctions/Resource/ProjectsLocationsFunctions.php
deleted file mode 100644
index bf62afc3..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudFunctions/Resource/ProjectsLocationsFunctions.php
+++ /dev/null
@@ -1,126 +0,0 @@
-
- *   $cloudfunctionsService = new Google_Service_CloudFunctions(...);
- *   $functions = $cloudfunctionsService->functions;
- *  
- */
-class Google_Service_CloudFunctions_Resource_ProjectsLocationsFunctions extends Google_Service_Resource
-{
-  /**
-   * Invokes synchronously deployed function. To be used for testing, very limited
-   * traffic allowed. (functions.callProjectsLocationsFunctions)
-   *
-   * @param string $name The name of the function to be called.
-   * @param Google_Service_CloudFunctions_CallFunctionRequest $postBody
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_CloudFunctions_CallFunctionResponse
-   */
-  public function callProjectsLocationsFunctions($name, Google_Service_CloudFunctions_CallFunctionRequest $postBody, $optParams = array())
-  {
-    $params = array('name' => $name, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('call', array($params), "Google_Service_CloudFunctions_CallFunctionResponse");
-  }
-  /**
-   * Creates a new function. If a function with the given name already exists in
-   * the specified project, the long running operation will return
-   * `ALREADY_EXISTS` error. (functions.create)
-   *
-   * @param string $location The project and location in which the function should
-   * be created, specified in the format `projects/locations`
-   * @param Google_Service_CloudFunctions_CloudFunction $postBody
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_CloudFunctions_Operation
-   */
-  public function create($location, Google_Service_CloudFunctions_CloudFunction $postBody, $optParams = array())
-  {
-    $params = array('location' => $location, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('create', array($params), "Google_Service_CloudFunctions_Operation");
-  }
-  /**
-   * Deletes a function with the given name from the specified project. If the
-   * given function is used by some trigger, the trigger will be updated to remove
-   * this function. (functions.delete)
-   *
-   * @param string $name The name of the function which should be deleted.
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_CloudFunctions_Operation
-   */
-  public function delete($name, $optParams = array())
-  {
-    $params = array('name' => $name);
-    $params = array_merge($params, $optParams);
-    return $this->call('delete', array($params), "Google_Service_CloudFunctions_Operation");
-  }
-  /**
-   * Returns a function with the given name from the requested project.
-   * (functions.get)
-   *
-   * @param string $name The name of the function which details should be
-   * obtained.
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_CloudFunctions_CloudFunction
-   */
-  public function get($name, $optParams = array())
-  {
-    $params = array('name' => $name);
-    $params = array_merge($params, $optParams);
-    return $this->call('get', array($params), "Google_Service_CloudFunctions_CloudFunction");
-  }
-  /**
-   * Returns a list of functions that belong to the requested project.
-   * (functions.listProjectsLocationsFunctions)
-   *
-   * @param string $location The project and location from which the function
-   * should be listed, specified in the format `projects/locations` If you want to
-   * list functions in all locations, use "-" in place of a location.
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param string pageToken The value returned by the last
-   * `ListFunctionsResponse`; indicates that this is a continuation of a prior
-   * `ListFunctions` call, and that the system should return the next page of
-   * data.
-   * @opt_param int pageSize Maximum number of functions to return per call.
-   * @return Google_Service_CloudFunctions_ListFunctionsResponse
-   */
-  public function listProjectsLocationsFunctions($location, $optParams = array())
-  {
-    $params = array('location' => $location);
-    $params = array_merge($params, $optParams);
-    return $this->call('list', array($params), "Google_Service_CloudFunctions_ListFunctionsResponse");
-  }
-  /**
-   * Updates existing function. (functions.update)
-   *
-   * @param string $name The name of the function to be updated.
-   * @param Google_Service_CloudFunctions_CloudFunction $postBody
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_CloudFunctions_Operation
-   */
-  public function update($name, Google_Service_CloudFunctions_CloudFunction $postBody, $optParams = array())
-  {
-    $params = array('name' => $name, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('update', array($params), "Google_Service_CloudFunctions_Operation");
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudFunctions/SourceRepository.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudFunctions/SourceRepository.php
deleted file mode 100644
index d1727e45..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudFunctions/SourceRepository.php
+++ /dev/null
@@ -1,75 +0,0 @@
-branch = $branch;
-  }
-  public function getBranch()
-  {
-    return $this->branch;
-  }
-  public function setDeployedRevision($deployedRevision)
-  {
-    $this->deployedRevision = $deployedRevision;
-  }
-  public function getDeployedRevision()
-  {
-    return $this->deployedRevision;
-  }
-  public function setRepositoryUrl($repositoryUrl)
-  {
-    $this->repositoryUrl = $repositoryUrl;
-  }
-  public function getRepositoryUrl()
-  {
-    return $this->repositoryUrl;
-  }
-  public function setRevision($revision)
-  {
-    $this->revision = $revision;
-  }
-  public function getRevision()
-  {
-    return $this->revision;
-  }
-  public function setSourcePath($sourcePath)
-  {
-    $this->sourcePath = $sourcePath;
-  }
-  public function getSourcePath()
-  {
-    return $this->sourcePath;
-  }
-  public function setTag($tag)
-  {
-    $this->tag = $tag;
-  }
-  public function getTag()
-  {
-    return $this->tag;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudFunctions/Status.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudFunctions/Status.php
deleted file mode 100644
index c0a151cc..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudFunctions/Status.php
+++ /dev/null
@@ -1,49 +0,0 @@
-code = $code;
-  }
-  public function getCode()
-  {
-    return $this->code;
-  }
-  public function setDetails($details)
-  {
-    $this->details = $details;
-  }
-  public function getDetails()
-  {
-    return $this->details;
-  }
-  public function setMessage($message)
-  {
-    $this->message = $message;
-  }
-  public function getMessage()
-  {
-    return $this->message;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudKMS.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudKMS.php
deleted file mode 100644
index 2ee4d958..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudKMS.php
+++ /dev/null
@@ -1,389 +0,0 @@
-
- * Manages encryption for your cloud services the same way you do on-premise.
- * You can generate, use, rotate, and destroy AES256 encryption keys.

- *
- * 

- * For more information about this service, see the API
- * Documentation
- * 

- *
- * @author Google, Inc.
- */
-class Google_Service_CloudKMS extends Google_Service
-{
-  /** View and manage your data across Google Cloud Platform services. */
-  const CLOUD_PLATFORM =
-      "https://www.googleapis.com/auth/cloud-platform";
-
-  public $projects_locations;
-  public $projects_locations_keyRings;
-  public $projects_locations_keyRings_cryptoKeys;
-  public $projects_locations_keyRings_cryptoKeys_cryptoKeyVersions;
-  
-  /**
-   * Constructs the internal representation of the CloudKMS service.
-   *
-   * @param Google_Client $client
-   */
-  public function __construct(Google_Client $client)
-  {
-    parent::__construct($client);
-    $this->rootUrl = 'https://cloudkms.googleapis.com/';
-    $this->servicePath = '';
-    $this->version = 'v1';
-    $this->serviceName = 'cloudkms';
-
-    $this->projects_locations = new Google_Service_CloudKMS_Resource_ProjectsLocations(
-        $this,
-        $this->serviceName,
-        'locations',
-        array(
-          'methods' => array(
-            'get' => array(
-              'path' => 'v1/{+name}',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'name' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'list' => array(
-              'path' => 'v1/{+name}/locations',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'name' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'filter' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'pageToken' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'pageSize' => array(
-                  'location' => 'query',
-                  'type' => 'integer',
-                ),
-              ),
-            ),
-          )
-        )
-    );
-    $this->projects_locations_keyRings = new Google_Service_CloudKMS_Resource_ProjectsLocationsKeyRings(
-        $this,
-        $this->serviceName,
-        'keyRings',
-        array(
-          'methods' => array(
-            'create' => array(
-              'path' => 'v1/{+parent}/keyRings',
-              'httpMethod' => 'POST',
-              'parameters' => array(
-                'parent' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'keyRingId' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-              ),
-            ),'get' => array(
-              'path' => 'v1/{+name}',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'name' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'getIamPolicy' => array(
-              'path' => 'v1/{+resource}:getIamPolicy',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'resource' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'list' => array(
-              'path' => 'v1/{+parent}/keyRings',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'parent' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'pageToken' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'pageSize' => array(
-                  'location' => 'query',
-                  'type' => 'integer',
-                ),
-              ),
-            ),'setIamPolicy' => array(
-              'path' => 'v1/{+resource}:setIamPolicy',
-              'httpMethod' => 'POST',
-              'parameters' => array(
-                'resource' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'testIamPermissions' => array(
-              'path' => 'v1/{+resource}:testIamPermissions',
-              'httpMethod' => 'POST',
-              'parameters' => array(
-                'resource' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),
-          )
-        )
-    );
-    $this->projects_locations_keyRings_cryptoKeys = new Google_Service_CloudKMS_Resource_ProjectsLocationsKeyRingsCryptoKeys(
-        $this,
-        $this->serviceName,
-        'cryptoKeys',
-        array(
-          'methods' => array(
-            'create' => array(
-              'path' => 'v1/{+parent}/cryptoKeys',
-              'httpMethod' => 'POST',
-              'parameters' => array(
-                'parent' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'cryptoKeyId' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-              ),
-            ),'decrypt' => array(
-              'path' => 'v1/{+name}:decrypt',
-              'httpMethod' => 'POST',
-              'parameters' => array(
-                'name' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'encrypt' => array(
-              'path' => 'v1/{+name}:encrypt',
-              'httpMethod' => 'POST',
-              'parameters' => array(
-                'name' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'get' => array(
-              'path' => 'v1/{+name}',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'name' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'getIamPolicy' => array(
-              'path' => 'v1/{+resource}:getIamPolicy',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'resource' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'list' => array(
-              'path' => 'v1/{+parent}/cryptoKeys',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'parent' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'pageToken' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'pageSize' => array(
-                  'location' => 'query',
-                  'type' => 'integer',
-                ),
-              ),
-            ),'patch' => array(
-              'path' => 'v1/{+name}',
-              'httpMethod' => 'PATCH',
-              'parameters' => array(
-                'name' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'updateMask' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-              ),
-            ),'setIamPolicy' => array(
-              'path' => 'v1/{+resource}:setIamPolicy',
-              'httpMethod' => 'POST',
-              'parameters' => array(
-                'resource' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'testIamPermissions' => array(
-              'path' => 'v1/{+resource}:testIamPermissions',
-              'httpMethod' => 'POST',
-              'parameters' => array(
-                'resource' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'updatePrimaryVersion' => array(
-              'path' => 'v1/{+name}:updatePrimaryVersion',
-              'httpMethod' => 'POST',
-              'parameters' => array(
-                'name' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),
-          )
-        )
-    );
-    $this->projects_locations_keyRings_cryptoKeys_cryptoKeyVersions = new Google_Service_CloudKMS_Resource_ProjectsLocationsKeyRingsCryptoKeysCryptoKeyVersions(
-        $this,
-        $this->serviceName,
-        'cryptoKeyVersions',
-        array(
-          'methods' => array(
-            'create' => array(
-              'path' => 'v1/{+parent}/cryptoKeyVersions',
-              'httpMethod' => 'POST',
-              'parameters' => array(
-                'parent' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'destroy' => array(
-              'path' => 'v1/{+name}:destroy',
-              'httpMethod' => 'POST',
-              'parameters' => array(
-                'name' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'get' => array(
-              'path' => 'v1/{+name}',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'name' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'list' => array(
-              'path' => 'v1/{+parent}/cryptoKeyVersions',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'parent' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'pageToken' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'pageSize' => array(
-                  'location' => 'query',
-                  'type' => 'integer',
-                ),
-              ),
-            ),'patch' => array(
-              'path' => 'v1/{+name}',
-              'httpMethod' => 'PATCH',
-              'parameters' => array(
-                'name' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'updateMask' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-              ),
-            ),'restore' => array(
-              'path' => 'v1/{+name}:restore',
-              'httpMethod' => 'POST',
-              'parameters' => array(
-                'name' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),
-          )
-        )
-    );
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudKMS/AuditConfig.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudKMS/AuditConfig.php
deleted file mode 100644
index d723d3ad..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudKMS/AuditConfig.php
+++ /dev/null
@@ -1,50 +0,0 @@
-auditLogConfigs = $auditLogConfigs;
-  }
-  public function getAuditLogConfigs()
-  {
-    return $this->auditLogConfigs;
-  }
-  public function setExemptedMembers($exemptedMembers)
-  {
-    $this->exemptedMembers = $exemptedMembers;
-  }
-  public function getExemptedMembers()
-  {
-    return $this->exemptedMembers;
-  }
-  public function setService($service)
-  {
-    $this->service = $service;
-  }
-  public function getService()
-  {
-    return $this->service;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudKMS/AuditLogConfig.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudKMS/AuditLogConfig.php
deleted file mode 100644
index 1e4df3fc..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudKMS/AuditLogConfig.php
+++ /dev/null
@@ -1,40 +0,0 @@
-exemptedMembers = $exemptedMembers;
-  }
-  public function getExemptedMembers()
-  {
-    return $this->exemptedMembers;
-  }
-  public function setLogType($logType)
-  {
-    $this->logType = $logType;
-  }
-  public function getLogType()
-  {
-    return $this->logType;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudKMS/Binding.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudKMS/Binding.php
deleted file mode 100644
index 518959df..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudKMS/Binding.php
+++ /dev/null
@@ -1,40 +0,0 @@
-members = $members;
-  }
-  public function getMembers()
-  {
-    return $this->members;
-  }
-  public function setRole($role)
-  {
-    $this->role = $role;
-  }
-  public function getRole()
-  {
-    return $this->role;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudKMS/CloudAuditOptions.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudKMS/CloudAuditOptions.php
deleted file mode 100644
index a46f146b..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudKMS/CloudAuditOptions.php
+++ /dev/null
@@ -1,20 +0,0 @@
-iam = $iam;
-  }
-  public function getIam()
-  {
-    return $this->iam;
-  }
-  public function setOp($op)
-  {
-    $this->op = $op;
-  }
-  public function getOp()
-  {
-    return $this->op;
-  }
-  public function setSvc($svc)
-  {
-    $this->svc = $svc;
-  }
-  public function getSvc()
-  {
-    return $this->svc;
-  }
-  public function setSys($sys)
-  {
-    $this->sys = $sys;
-  }
-  public function getSys()
-  {
-    return $this->sys;
-  }
-  public function setValue($value)
-  {
-    $this->value = $value;
-  }
-  public function getValue()
-  {
-    return $this->value;
-  }
-  public function setValues($values)
-  {
-    $this->values = $values;
-  }
-  public function getValues()
-  {
-    return $this->values;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudKMS/CounterOptions.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudKMS/CounterOptions.php
deleted file mode 100644
index 13bd4afb..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudKMS/CounterOptions.php
+++ /dev/null
@@ -1,39 +0,0 @@
-field = $field;
-  }
-  public function getField()
-  {
-    return $this->field;
-  }
-  public function setMetric($metric)
-  {
-    $this->metric = $metric;
-  }
-  public function getMetric()
-  {
-    return $this->metric;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudKMS/CryptoKey.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudKMS/CryptoKey.php
deleted file mode 100644
index ce6443e2..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudKMS/CryptoKey.php
+++ /dev/null
@@ -1,76 +0,0 @@
-createTime = $createTime;
-  }
-  public function getCreateTime()
-  {
-    return $this->createTime;
-  }
-  public function setName($name)
-  {
-    $this->name = $name;
-  }
-  public function getName()
-  {
-    return $this->name;
-  }
-  public function setNextRotationTime($nextRotationTime)
-  {
-    $this->nextRotationTime = $nextRotationTime;
-  }
-  public function getNextRotationTime()
-  {
-    return $this->nextRotationTime;
-  }
-  public function setPrimary(Google_Service_CloudKMS_CryptoKeyVersion $primary)
-  {
-    $this->primary = $primary;
-  }
-  public function getPrimary()
-  {
-    return $this->primary;
-  }
-  public function setPurpose($purpose)
-  {
-    $this->purpose = $purpose;
-  }
-  public function getPurpose()
-  {
-    return $this->purpose;
-  }
-  public function setRotationPeriod($rotationPeriod)
-  {
-    $this->rotationPeriod = $rotationPeriod;
-  }
-  public function getRotationPeriod()
-  {
-    return $this->rotationPeriod;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudKMS/CryptoKeyVersion.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudKMS/CryptoKeyVersion.php
deleted file mode 100644
index 764a3b57..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudKMS/CryptoKeyVersion.php
+++ /dev/null
@@ -1,66 +0,0 @@
-createTime = $createTime;
-  }
-  public function getCreateTime()
-  {
-    return $this->createTime;
-  }
-  public function setDestroyEventTime($destroyEventTime)
-  {
-    $this->destroyEventTime = $destroyEventTime;
-  }
-  public function getDestroyEventTime()
-  {
-    return $this->destroyEventTime;
-  }
-  public function setDestroyTime($destroyTime)
-  {
-    $this->destroyTime = $destroyTime;
-  }
-  public function getDestroyTime()
-  {
-    return $this->destroyTime;
-  }
-  public function setName($name)
-  {
-    $this->name = $name;
-  }
-  public function getName()
-  {
-    return $this->name;
-  }
-  public function setState($state)
-  {
-    $this->state = $state;
-  }
-  public function getState()
-  {
-    return $this->state;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudKMS/DataAccessOptions.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudKMS/DataAccessOptions.php
deleted file mode 100644
index 616a5a64..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudKMS/DataAccessOptions.php
+++ /dev/null
@@ -1,20 +0,0 @@
-additionalAuthenticatedData = $additionalAuthenticatedData;
-  }
-  public function getAdditionalAuthenticatedData()
-  {
-    return $this->additionalAuthenticatedData;
-  }
-  public function setCiphertext($ciphertext)
-  {
-    $this->ciphertext = $ciphertext;
-  }
-  public function getCiphertext()
-  {
-    return $this->ciphertext;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudKMS/DecryptResponse.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudKMS/DecryptResponse.php
deleted file mode 100644
index 25834642..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudKMS/DecryptResponse.php
+++ /dev/null
@@ -1,30 +0,0 @@
-plaintext = $plaintext;
-  }
-  public function getPlaintext()
-  {
-    return $this->plaintext;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudKMS/DestroyCryptoKeyVersionRequest.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudKMS/DestroyCryptoKeyVersionRequest.php
deleted file mode 100644
index 080dff6e..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudKMS/DestroyCryptoKeyVersionRequest.php
+++ /dev/null
@@ -1,20 +0,0 @@
-additionalAuthenticatedData = $additionalAuthenticatedData;
-  }
-  public function getAdditionalAuthenticatedData()
-  {
-    return $this->additionalAuthenticatedData;
-  }
-  public function setPlaintext($plaintext)
-  {
-    $this->plaintext = $plaintext;
-  }
-  public function getPlaintext()
-  {
-    return $this->plaintext;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudKMS/EncryptResponse.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudKMS/EncryptResponse.php
deleted file mode 100644
index 59756352..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudKMS/EncryptResponse.php
+++ /dev/null
@@ -1,39 +0,0 @@
-ciphertext = $ciphertext;
-  }
-  public function getCiphertext()
-  {
-    return $this->ciphertext;
-  }
-  public function setName($name)
-  {
-    $this->name = $name;
-  }
-  public function getName()
-  {
-    return $this->name;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudKMS/KeyRing.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudKMS/KeyRing.php
deleted file mode 100644
index 0c28e6c8..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudKMS/KeyRing.php
+++ /dev/null
@@ -1,39 +0,0 @@
-createTime = $createTime;
-  }
-  public function getCreateTime()
-  {
-    return $this->createTime;
-  }
-  public function setName($name)
-  {
-    $this->name = $name;
-  }
-  public function getName()
-  {
-    return $this->name;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudKMS/ListCryptoKeyVersionsResponse.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudKMS/ListCryptoKeyVersionsResponse.php
deleted file mode 100644
index e2fb03b6..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudKMS/ListCryptoKeyVersionsResponse.php
+++ /dev/null
@@ -1,50 +0,0 @@
-cryptoKeyVersions = $cryptoKeyVersions;
-  }
-  public function getCryptoKeyVersions()
-  {
-    return $this->cryptoKeyVersions;
-  }
-  public function setNextPageToken($nextPageToken)
-  {
-    $this->nextPageToken = $nextPageToken;
-  }
-  public function getNextPageToken()
-  {
-    return $this->nextPageToken;
-  }
-  public function setTotalSize($totalSize)
-  {
-    $this->totalSize = $totalSize;
-  }
-  public function getTotalSize()
-  {
-    return $this->totalSize;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudKMS/ListCryptoKeysResponse.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudKMS/ListCryptoKeysResponse.php
deleted file mode 100644
index 6c601d48..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudKMS/ListCryptoKeysResponse.php
+++ /dev/null
@@ -1,50 +0,0 @@
-cryptoKeys = $cryptoKeys;
-  }
-  public function getCryptoKeys()
-  {
-    return $this->cryptoKeys;
-  }
-  public function setNextPageToken($nextPageToken)
-  {
-    $this->nextPageToken = $nextPageToken;
-  }
-  public function getNextPageToken()
-  {
-    return $this->nextPageToken;
-  }
-  public function setTotalSize($totalSize)
-  {
-    $this->totalSize = $totalSize;
-  }
-  public function getTotalSize()
-  {
-    return $this->totalSize;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudKMS/ListKeyRingsResponse.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudKMS/ListKeyRingsResponse.php
deleted file mode 100644
index 07b0a709..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudKMS/ListKeyRingsResponse.php
+++ /dev/null
@@ -1,50 +0,0 @@
-keyRings = $keyRings;
-  }
-  public function getKeyRings()
-  {
-    return $this->keyRings;
-  }
-  public function setNextPageToken($nextPageToken)
-  {
-    $this->nextPageToken = $nextPageToken;
-  }
-  public function getNextPageToken()
-  {
-    return $this->nextPageToken;
-  }
-  public function setTotalSize($totalSize)
-  {
-    $this->totalSize = $totalSize;
-  }
-  public function getTotalSize()
-  {
-    return $this->totalSize;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudKMS/ListLocationsResponse.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudKMS/ListLocationsResponse.php
deleted file mode 100644
index c8d71f4f..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudKMS/ListLocationsResponse.php
+++ /dev/null
@@ -1,41 +0,0 @@
-locations = $locations;
-  }
-  public function getLocations()
-  {
-    return $this->locations;
-  }
-  public function setNextPageToken($nextPageToken)
-  {
-    $this->nextPageToken = $nextPageToken;
-  }
-  public function getNextPageToken()
-  {
-    return $this->nextPageToken;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudKMS/Location.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudKMS/Location.php
deleted file mode 100644
index f9960bfd..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudKMS/Location.php
+++ /dev/null
@@ -1,57 +0,0 @@
-labels = $labels;
-  }
-  public function getLabels()
-  {
-    return $this->labels;
-  }
-  public function setLocationId($locationId)
-  {
-    $this->locationId = $locationId;
-  }
-  public function getLocationId()
-  {
-    return $this->locationId;
-  }
-  public function setMetadata($metadata)
-  {
-    $this->metadata = $metadata;
-  }
-  public function getMetadata()
-  {
-    return $this->metadata;
-  }
-  public function setName($name)
-  {
-    $this->name = $name;
-  }
-  public function getName()
-  {
-    return $this->name;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudKMS/LogConfig.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudKMS/LogConfig.php
deleted file mode 100644
index 0e9affde..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudKMS/LogConfig.php
+++ /dev/null
@@ -1,51 +0,0 @@
-cloudAudit = $cloudAudit;
-  }
-  public function getCloudAudit()
-  {
-    return $this->cloudAudit;
-  }
-  public function setCounter(Google_Service_CloudKMS_CounterOptions $counter)
-  {
-    $this->counter = $counter;
-  }
-  public function getCounter()
-  {
-    return $this->counter;
-  }
-  public function setDataAccess(Google_Service_CloudKMS_DataAccessOptions $dataAccess)
-  {
-    $this->dataAccess = $dataAccess;
-  }
-  public function getDataAccess()
-  {
-    return $this->dataAccess;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudKMS/Policy.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudKMS/Policy.php
deleted file mode 100644
index 8fbce2c2..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudKMS/Policy.php
+++ /dev/null
@@ -1,79 +0,0 @@
-auditConfigs = $auditConfigs;
-  }
-  public function getAuditConfigs()
-  {
-    return $this->auditConfigs;
-  }
-  public function setBindings($bindings)
-  {
-    $this->bindings = $bindings;
-  }
-  public function getBindings()
-  {
-    return $this->bindings;
-  }
-  public function setEtag($etag)
-  {
-    $this->etag = $etag;
-  }
-  public function getEtag()
-  {
-    return $this->etag;
-  }
-  public function setIamOwned($iamOwned)
-  {
-    $this->iamOwned = $iamOwned;
-  }
-  public function getIamOwned()
-  {
-    return $this->iamOwned;
-  }
-  public function setRules($rules)
-  {
-    $this->rules = $rules;
-  }
-  public function getRules()
-  {
-    return $this->rules;
-  }
-  public function setVersion($version)
-  {
-    $this->version = $version;
-  }
-  public function getVersion()
-  {
-    return $this->version;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudKMS/Resource/Projects.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudKMS/Resource/Projects.php
deleted file mode 100644
index e8e959e8..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudKMS/Resource/Projects.php
+++ /dev/null
@@ -1,28 +0,0 @@
-
- *   $cloudkmsService = new Google_Service_CloudKMS(...);
- *   $projects = $cloudkmsService->projects;
- *  
- */
-class Google_Service_CloudKMS_Resource_Projects extends Google_Service_Resource
-{
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudKMS/Resource/ProjectsLocations.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudKMS/Resource/ProjectsLocations.php
deleted file mode 100644
index 4db94ee2..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudKMS/Resource/ProjectsLocations.php
+++ /dev/null
@@ -1,60 +0,0 @@
-
- *   $cloudkmsService = new Google_Service_CloudKMS(...);
- *   $locations = $cloudkmsService->locations;
- *  
- */
-class Google_Service_CloudKMS_Resource_ProjectsLocations extends Google_Service_Resource
-{
-  /**
-   * Get information about a location. (locations.get)
-   *
-   * @param string $name Resource name for the location.
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_CloudKMS_Location
-   */
-  public function get($name, $optParams = array())
-  {
-    $params = array('name' => $name);
-    $params = array_merge($params, $optParams);
-    return $this->call('get', array($params), "Google_Service_CloudKMS_Location");
-  }
-  /**
-   * Lists information about the supported locations for this service.
-   * (locations.listProjectsLocations)
-   *
-   * @param string $name The resource that owns the locations collection, if
-   * applicable.
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param string filter The standard list filter.
-   * @opt_param string pageToken The standard list page token.
-   * @opt_param int pageSize The standard list page size.
-   * @return Google_Service_CloudKMS_ListLocationsResponse
-   */
-  public function listProjectsLocations($name, $optParams = array())
-  {
-    $params = array('name' => $name);
-    $params = array_merge($params, $optParams);
-    return $this->call('list', array($params), "Google_Service_CloudKMS_ListLocationsResponse");
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudKMS/Resource/ProjectsLocationsKeyRings.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudKMS/Resource/ProjectsLocationsKeyRings.php
deleted file mode 100644
index 8acd8a5d..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudKMS/Resource/ProjectsLocationsKeyRings.php
+++ /dev/null
@@ -1,135 +0,0 @@
-
- *   $cloudkmsService = new Google_Service_CloudKMS(...);
- *   $keyRings = $cloudkmsService->keyRings;
- *  
- */
-class Google_Service_CloudKMS_Resource_ProjectsLocationsKeyRings extends Google_Service_Resource
-{
-  /**
-   * Create a new KeyRing in a given Project and Location. (keyRings.create)
-   *
-   * @param string $parent Required. The resource name of the location associated
-   * with the KeyRings, in the format `projects/locations`.
-   * @param Google_Service_CloudKMS_KeyRing $postBody
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param string keyRingId Required. It must be unique within a location and
-   * match the regular expression `[a-zA-Z0-9_-]{1,63}`
-   * @return Google_Service_CloudKMS_KeyRing
-   */
-  public function create($parent, Google_Service_CloudKMS_KeyRing $postBody, $optParams = array())
-  {
-    $params = array('parent' => $parent, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('create', array($params), "Google_Service_CloudKMS_KeyRing");
-  }
-  /**
-   * Returns metadata for a given KeyRing. (keyRings.get)
-   *
-   * @param string $name The name of the KeyRing to get.
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_CloudKMS_KeyRing
-   */
-  public function get($name, $optParams = array())
-  {
-    $params = array('name' => $name);
-    $params = array_merge($params, $optParams);
-    return $this->call('get', array($params), "Google_Service_CloudKMS_KeyRing");
-  }
-  /**
-   * Gets the access control policy for a resource. Returns an empty policy if the
-   * resource exists and does not have a policy set. (keyRings.getIamPolicy)
-   *
-   * @param string $resource REQUIRED: The resource for which the policy is being
-   * requested. See the operation documentation for the appropriate value for this
-   * field.
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_CloudKMS_Policy
-   */
-  public function getIamPolicy($resource, $optParams = array())
-  {
-    $params = array('resource' => $resource);
-    $params = array_merge($params, $optParams);
-    return $this->call('getIamPolicy', array($params), "Google_Service_CloudKMS_Policy");
-  }
-  /**
-   * Lists KeyRings. (keyRings.listProjectsLocationsKeyRings)
-   *
-   * @param string $parent Required. The resource name of the location associated
-   * with the KeyRings, in the format `projects/locations`.
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param string pageToken Optional pagination token, returned earlier via
-   * ListKeyRingsResponse.next_page_token.
-   * @opt_param int pageSize Optional limit on the number of KeyRings to include
-   * in the response.  Further KeyRings can subsequently be obtained by including
-   * the ListKeyRingsResponse.next_page_token in a subsequent request.  If
-   * unspecified, the server will pick an appropriate default.
-   * @return Google_Service_CloudKMS_ListKeyRingsResponse
-   */
-  public function listProjectsLocationsKeyRings($parent, $optParams = array())
-  {
-    $params = array('parent' => $parent);
-    $params = array_merge($params, $optParams);
-    return $this->call('list', array($params), "Google_Service_CloudKMS_ListKeyRingsResponse");
-  }
-  /**
-   * Sets the access control policy on the specified resource. Replaces any
-   * existing policy. (keyRings.setIamPolicy)
-   *
-   * @param string $resource REQUIRED: The resource for which the policy is being
-   * specified. See the operation documentation for the appropriate value for this
-   * field.
-   * @param Google_Service_CloudKMS_SetIamPolicyRequest $postBody
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_CloudKMS_Policy
-   */
-  public function setIamPolicy($resource, Google_Service_CloudKMS_SetIamPolicyRequest $postBody, $optParams = array())
-  {
-    $params = array('resource' => $resource, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('setIamPolicy', array($params), "Google_Service_CloudKMS_Policy");
-  }
-  /**
-   * Returns permissions that a caller has on the specified resource. If the
-   * resource does not exist, this will return an empty set of permissions, not a
-   * NOT_FOUND error.
-   *
-   * Note: This operation is designed to be used for building permission-aware UIs
-   * and command-line tools, not for authorization checking. This operation may
-   * "fail open" without warning. (keyRings.testIamPermissions)
-   *
-   * @param string $resource REQUIRED: The resource for which the policy detail is
-   * being requested. See the operation documentation for the appropriate value
-   * for this field.
-   * @param Google_Service_CloudKMS_TestIamPermissionsRequest $postBody
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_CloudKMS_TestIamPermissionsResponse
-   */
-  public function testIamPermissions($resource, Google_Service_CloudKMS_TestIamPermissionsRequest $postBody, $optParams = array())
-  {
-    $params = array('resource' => $resource, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('testIamPermissions', array($params), "Google_Service_CloudKMS_TestIamPermissionsResponse");
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudKMS/Resource/ProjectsLocationsKeyRingsCryptoKeys.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudKMS/Resource/ProjectsLocationsKeyRingsCryptoKeys.php
deleted file mode 100644
index 503233c4..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudKMS/Resource/ProjectsLocationsKeyRingsCryptoKeys.php
+++ /dev/null
@@ -1,204 +0,0 @@
-
- *   $cloudkmsService = new Google_Service_CloudKMS(...);
- *   $cryptoKeys = $cloudkmsService->cryptoKeys;
- *  
- */
-class Google_Service_CloudKMS_Resource_ProjectsLocationsKeyRingsCryptoKeys extends Google_Service_Resource
-{
-  /**
-   * Create a new CryptoKey within a KeyRing.
-   *
-   * CryptoKey.purpose is required. (cryptoKeys.create)
-   *
-   * @param string $parent Required. The name of the KeyRing associated with the
-   * CryptoKeys.
-   * @param Google_Service_CloudKMS_CryptoKey $postBody
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param string cryptoKeyId Required. It must be unique within a KeyRing
-   * and match the regular expression `[a-zA-Z0-9_-]{1,63}`
-   * @return Google_Service_CloudKMS_CryptoKey
-   */
-  public function create($parent, Google_Service_CloudKMS_CryptoKey $postBody, $optParams = array())
-  {
-    $params = array('parent' => $parent, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('create', array($params), "Google_Service_CloudKMS_CryptoKey");
-  }
-  /**
-   * Decrypt data that was protected by Encrypt. (cryptoKeys.decrypt)
-   *
-   * @param string $name Required. The resource name of the CryptoKey to use for
-   * decryption. The server will choose the appropriate version.
-   * @param Google_Service_CloudKMS_DecryptRequest $postBody
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_CloudKMS_DecryptResponse
-   */
-  public function decrypt($name, Google_Service_CloudKMS_DecryptRequest $postBody, $optParams = array())
-  {
-    $params = array('name' => $name, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('decrypt', array($params), "Google_Service_CloudKMS_DecryptResponse");
-  }
-  /**
-   * Encrypt data, so that it can only be recovered by a call to Decrypt.
-   * (cryptoKeys.encrypt)
-   *
-   * @param string $name Required. The resource name of the CryptoKey or
-   * CryptoKeyVersion to use for encryption.
-   *
-   * If a CryptoKey is specified, the server will use its primary version.
-   * @param Google_Service_CloudKMS_EncryptRequest $postBody
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_CloudKMS_EncryptResponse
-   */
-  public function encrypt($name, Google_Service_CloudKMS_EncryptRequest $postBody, $optParams = array())
-  {
-    $params = array('name' => $name, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('encrypt', array($params), "Google_Service_CloudKMS_EncryptResponse");
-  }
-  /**
-   * Returns metadata for a given CryptoKey, as well as its primary
-   * CryptoKeyVersion. (cryptoKeys.get)
-   *
-   * @param string $name The name of the CryptoKey to get.
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_CloudKMS_CryptoKey
-   */
-  public function get($name, $optParams = array())
-  {
-    $params = array('name' => $name);
-    $params = array_merge($params, $optParams);
-    return $this->call('get', array($params), "Google_Service_CloudKMS_CryptoKey");
-  }
-  /**
-   * Gets the access control policy for a resource. Returns an empty policy if the
-   * resource exists and does not have a policy set. (cryptoKeys.getIamPolicy)
-   *
-   * @param string $resource REQUIRED: The resource for which the policy is being
-   * requested. See the operation documentation for the appropriate value for this
-   * field.
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_CloudKMS_Policy
-   */
-  public function getIamPolicy($resource, $optParams = array())
-  {
-    $params = array('resource' => $resource);
-    $params = array_merge($params, $optParams);
-    return $this->call('getIamPolicy', array($params), "Google_Service_CloudKMS_Policy");
-  }
-  /**
-   * Lists CryptoKeys. (cryptoKeys.listProjectsLocationsKeyRingsCryptoKeys)
-   *
-   * @param string $parent Required. The resource name of the KeyRing to list, in
-   * the format `projects/locations/keyRings`.
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param string pageToken Optional pagination token, returned earlier via
-   * ListCryptoKeysResponse.next_page_token.
-   * @opt_param int pageSize Optional limit on the number of CryptoKeys to include
-   * in the response.  Further CryptoKeys can subsequently be obtained by
-   * including the ListCryptoKeysResponse.next_page_token in a subsequent request.
-   * If unspecified, the server will pick an appropriate default.
-   * @return Google_Service_CloudKMS_ListCryptoKeysResponse
-   */
-  public function listProjectsLocationsKeyRingsCryptoKeys($parent, $optParams = array())
-  {
-    $params = array('parent' => $parent);
-    $params = array_merge($params, $optParams);
-    return $this->call('list', array($params), "Google_Service_CloudKMS_ListCryptoKeysResponse");
-  }
-  /**
-   * Update a CryptoKey. (cryptoKeys.patch)
-   *
-   * @param string $name Output only. The resource name for this CryptoKey in the
-   * format `projects/locations/keyRings/cryptoKeys`.
-   * @param Google_Service_CloudKMS_CryptoKey $postBody
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param string updateMask Required list of fields to be updated in this
-   * request.
-   * @return Google_Service_CloudKMS_CryptoKey
-   */
-  public function patch($name, Google_Service_CloudKMS_CryptoKey $postBody, $optParams = array())
-  {
-    $params = array('name' => $name, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('patch', array($params), "Google_Service_CloudKMS_CryptoKey");
-  }
-  /**
-   * Sets the access control policy on the specified resource. Replaces any
-   * existing policy. (cryptoKeys.setIamPolicy)
-   *
-   * @param string $resource REQUIRED: The resource for which the policy is being
-   * specified. See the operation documentation for the appropriate value for this
-   * field.
-   * @param Google_Service_CloudKMS_SetIamPolicyRequest $postBody
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_CloudKMS_Policy
-   */
-  public function setIamPolicy($resource, Google_Service_CloudKMS_SetIamPolicyRequest $postBody, $optParams = array())
-  {
-    $params = array('resource' => $resource, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('setIamPolicy', array($params), "Google_Service_CloudKMS_Policy");
-  }
-  /**
-   * Returns permissions that a caller has on the specified resource. If the
-   * resource does not exist, this will return an empty set of permissions, not a
-   * NOT_FOUND error.
-   *
-   * Note: This operation is designed to be used for building permission-aware UIs
-   * and command-line tools, not for authorization checking. This operation may
-   * "fail open" without warning. (cryptoKeys.testIamPermissions)
-   *
-   * @param string $resource REQUIRED: The resource for which the policy detail is
-   * being requested. See the operation documentation for the appropriate value
-   * for this field.
-   * @param Google_Service_CloudKMS_TestIamPermissionsRequest $postBody
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_CloudKMS_TestIamPermissionsResponse
-   */
-  public function testIamPermissions($resource, Google_Service_CloudKMS_TestIamPermissionsRequest $postBody, $optParams = array())
-  {
-    $params = array('resource' => $resource, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('testIamPermissions', array($params), "Google_Service_CloudKMS_TestIamPermissionsResponse");
-  }
-  /**
-   * Update the version of a CryptoKey that will be used in Encrypt
-   * (cryptoKeys.updatePrimaryVersion)
-   *
-   * @param string $name The resource name of the CryptoKey to update.
-   * @param Google_Service_CloudKMS_UpdateCryptoKeyPrimaryVersionRequest $postBody
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_CloudKMS_CryptoKey
-   */
-  public function updatePrimaryVersion($name, Google_Service_CloudKMS_UpdateCryptoKeyPrimaryVersionRequest $postBody, $optParams = array())
-  {
-    $params = array('name' => $name, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('updatePrimaryVersion', array($params), "Google_Service_CloudKMS_CryptoKey");
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudKMS/Resource/ProjectsLocationsKeyRingsCryptoKeysCryptoKeyVersions.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudKMS/Resource/ProjectsLocationsKeyRingsCryptoKeysCryptoKeyVersions.php
deleted file mode 100644
index e0f6ed75..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudKMS/Resource/ProjectsLocationsKeyRingsCryptoKeysCryptoKeyVersions.php
+++ /dev/null
@@ -1,143 +0,0 @@
-
- *   $cloudkmsService = new Google_Service_CloudKMS(...);
- *   $cryptoKeyVersions = $cloudkmsService->cryptoKeyVersions;
- *  
- */
-class Google_Service_CloudKMS_Resource_ProjectsLocationsKeyRingsCryptoKeysCryptoKeyVersions extends Google_Service_Resource
-{
-  /**
-   * Create a new CryptoKeyVersion in a CryptoKey.
-   *
-   * The server will assign the next sequential id. If unset, state will be set to
-   * ENABLED. (cryptoKeyVersions.create)
-   *
-   * @param string $parent Required. The name of the CryptoKey associated with the
-   * CryptoKeyVersions.
-   * @param Google_Service_CloudKMS_CryptoKeyVersion $postBody
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_CloudKMS_CryptoKeyVersion
-   */
-  public function create($parent, Google_Service_CloudKMS_CryptoKeyVersion $postBody, $optParams = array())
-  {
-    $params = array('parent' => $parent, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('create', array($params), "Google_Service_CloudKMS_CryptoKeyVersion");
-  }
-  /**
-   * Schedule a CryptoKeyVersion for destruction.
-   *
-   * Upon calling this method, CryptoKeyVersion.state will be set to
-   * DESTROY_SCHEDULED and destroy_time will be set to a time 24 hours in the
-   * future, at which point the state will be changed to DESTROYED, and the key
-   * material will be irrevocably destroyed.
-   *
-   * Before the destroy_time is reached, RestoreCryptoKeyVersion may be called to
-   * reverse the process. (cryptoKeyVersions.destroy)
-   *
-   * @param string $name The resource name of the CryptoKeyVersion to destroy.
-   * @param Google_Service_CloudKMS_DestroyCryptoKeyVersionRequest $postBody
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_CloudKMS_CryptoKeyVersion
-   */
-  public function destroy($name, Google_Service_CloudKMS_DestroyCryptoKeyVersionRequest $postBody, $optParams = array())
-  {
-    $params = array('name' => $name, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('destroy', array($params), "Google_Service_CloudKMS_CryptoKeyVersion");
-  }
-  /**
-   * Returns metadata for a given CryptoKeyVersion. (cryptoKeyVersions.get)
-   *
-   * @param string $name The name of the CryptoKeyVersion to get.
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_CloudKMS_CryptoKeyVersion
-   */
-  public function get($name, $optParams = array())
-  {
-    $params = array('name' => $name);
-    $params = array_merge($params, $optParams);
-    return $this->call('get', array($params), "Google_Service_CloudKMS_CryptoKeyVersion");
-  }
-  /**
-   * Lists CryptoKeyVersions.
-   * (cryptoKeyVersions.listProjectsLocationsKeyRingsCryptoKeysCryptoKeyVersions)
-   *
-   * @param string $parent Required. The resource name of the CryptoKey to list,
-   * in the format `projects/locations/keyRings/cryptoKeys`.
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param string pageToken Optional pagination token, returned earlier via
-   * ListCryptoKeyVersionsResponse.next_page_token.
-   * @opt_param int pageSize Optional limit on the number of CryptoKeyVersions to
-   * include in the response. Further CryptoKeyVersions can subsequently be
-   * obtained by including the ListCryptoKeyVersionsResponse.next_page_token in a
-   * subsequent request. If unspecified, the server will pick an appropriate
-   * default.
-   * @return Google_Service_CloudKMS_ListCryptoKeyVersionsResponse
-   */
-  public function listProjectsLocationsKeyRingsCryptoKeysCryptoKeyVersions($parent, $optParams = array())
-  {
-    $params = array('parent' => $parent);
-    $params = array_merge($params, $optParams);
-    return $this->call('list', array($params), "Google_Service_CloudKMS_ListCryptoKeyVersionsResponse");
-  }
-  /**
-   * Update a CryptoKeyVersion's metadata.
-   *
-   * state may be changed between ENABLED and DISABLED using this method. See
-   * DestroyCryptoKeyVersion and RestoreCryptoKeyVersion to move between other
-   * states. (cryptoKeyVersions.patch)
-   *
-   * @param string $name Output only. The resource name for this CryptoKeyVersion
-   * in the format `projects/locations/keyRings/cryptoKeys/cryptoKeyVersions`.
-   * @param Google_Service_CloudKMS_CryptoKeyVersion $postBody
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param string updateMask Required list of fields to be updated in this
-   * request.
-   * @return Google_Service_CloudKMS_CryptoKeyVersion
-   */
-  public function patch($name, Google_Service_CloudKMS_CryptoKeyVersion $postBody, $optParams = array())
-  {
-    $params = array('name' => $name, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('patch', array($params), "Google_Service_CloudKMS_CryptoKeyVersion");
-  }
-  /**
-   * Restore a CryptoKeyVersion in the DESTROY_SCHEDULED, state.
-   *
-   * Upon restoration of the CryptoKeyVersion, state will be set to DISABLED, and
-   * destroy_time will be cleared. (cryptoKeyVersions.restore)
-   *
-   * @param string $name The resource name of the CryptoKeyVersion to restore.
-   * @param Google_Service_CloudKMS_RestoreCryptoKeyVersionRequest $postBody
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_CloudKMS_CryptoKeyVersion
-   */
-  public function restore($name, Google_Service_CloudKMS_RestoreCryptoKeyVersionRequest $postBody, $optParams = array())
-  {
-    $params = array('name' => $name, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('restore', array($params), "Google_Service_CloudKMS_CryptoKeyVersion");
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudKMS/RestoreCryptoKeyVersionRequest.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudKMS/RestoreCryptoKeyVersionRequest.php
deleted file mode 100644
index 5408e12f..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudKMS/RestoreCryptoKeyVersionRequest.php
+++ /dev/null
@@ -1,20 +0,0 @@
-action = $action;
-  }
-  public function getAction()
-  {
-    return $this->action;
-  }
-  public function setConditions($conditions)
-  {
-    $this->conditions = $conditions;
-  }
-  public function getConditions()
-  {
-    return $this->conditions;
-  }
-  public function setDescription($description)
-  {
-    $this->description = $description;
-  }
-  public function getDescription()
-  {
-    return $this->description;
-  }
-  public function setIn($in)
-  {
-    $this->in = $in;
-  }
-  public function getIn()
-  {
-    return $this->in;
-  }
-  public function setLogConfig($logConfig)
-  {
-    $this->logConfig = $logConfig;
-  }
-  public function getLogConfig()
-  {
-    return $this->logConfig;
-  }
-  public function setNotIn($notIn)
-  {
-    $this->notIn = $notIn;
-  }
-  public function getNotIn()
-  {
-    return $this->notIn;
-  }
-  public function setPermissions($permissions)
-  {
-    $this->permissions = $permissions;
-  }
-  public function getPermissions()
-  {
-    return $this->permissions;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudKMS/SetIamPolicyRequest.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudKMS/SetIamPolicyRequest.php
deleted file mode 100644
index cf66febc..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudKMS/SetIamPolicyRequest.php
+++ /dev/null
@@ -1,40 +0,0 @@
-policy = $policy;
-  }
-  public function getPolicy()
-  {
-    return $this->policy;
-  }
-  public function setUpdateMask($updateMask)
-  {
-    $this->updateMask = $updateMask;
-  }
-  public function getUpdateMask()
-  {
-    return $this->updateMask;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudKMS/TestIamPermissionsRequest.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudKMS/TestIamPermissionsRequest.php
deleted file mode 100644
index c83b1cb4..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudKMS/TestIamPermissionsRequest.php
+++ /dev/null
@@ -1,31 +0,0 @@
-permissions = $permissions;
-  }
-  public function getPermissions()
-  {
-    return $this->permissions;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudKMS/TestIamPermissionsResponse.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudKMS/TestIamPermissionsResponse.php
deleted file mode 100644
index 43f1a915..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudKMS/TestIamPermissionsResponse.php
+++ /dev/null
@@ -1,31 +0,0 @@
-permissions = $permissions;
-  }
-  public function getPermissions()
-  {
-    return $this->permissions;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudKMS/UpdateCryptoKeyPrimaryVersionRequest.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudKMS/UpdateCryptoKeyPrimaryVersionRequest.php
deleted file mode 100644
index 673148bf..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudKMS/UpdateCryptoKeyPrimaryVersionRequest.php
+++ /dev/null
@@ -1,30 +0,0 @@
-cryptoKeyVersionId = $cryptoKeyVersionId;
-  }
-  public function getCryptoKeyVersionId()
-  {
-    return $this->cryptoKeyVersionId;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudMachineLearning.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudMachineLearning.php
deleted file mode 100644
index 851a3419..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudMachineLearning.php
+++ /dev/null
@@ -1,337 +0,0 @@
-
- * An API to enable creating and using machine learning models.

- *
- * 

- * For more information about this service, see the API
- * Documentation
- * 

- *
- * @author Google, Inc.
- */
-class Google_Service_CloudMachineLearning extends Google_Service
-{
-  /** View and manage your data across Google Cloud Platform services. */
-  const CLOUD_PLATFORM =
-      "https://www.googleapis.com/auth/cloud-platform";
-
-  public $projects;
-  public $projects_jobs;
-  public $projects_models;
-  public $projects_models_versions;
-  public $projects_operations;
-  
-  /**
-   * Constructs the internal representation of the CloudMachineLearning service.
-   *
-   * @param Google_Client $client
-   */
-  public function __construct(Google_Client $client)
-  {
-    parent::__construct($client);
-    $this->rootUrl = 'https://ml.googleapis.com/';
-    $this->servicePath = '';
-    $this->version = 'v1beta1';
-    $this->serviceName = 'ml';
-
-    $this->projects = new Google_Service_CloudMachineLearning_Resource_Projects(
-        $this,
-        $this->serviceName,
-        'projects',
-        array(
-          'methods' => array(
-            'getConfig' => array(
-              'path' => 'v1beta1/{+name}:getConfig',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'name' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'predict' => array(
-              'path' => 'v1beta1/{+name}:predict',
-              'httpMethod' => 'POST',
-              'parameters' => array(
-                'name' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),
-          )
-        )
-    );
-    $this->projects_jobs = new Google_Service_CloudMachineLearning_Resource_ProjectsJobs(
-        $this,
-        $this->serviceName,
-        'jobs',
-        array(
-          'methods' => array(
-            'cancel' => array(
-              'path' => 'v1beta1/{+name}:cancel',
-              'httpMethod' => 'POST',
-              'parameters' => array(
-                'name' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'create' => array(
-              'path' => 'v1beta1/{+parent}/jobs',
-              'httpMethod' => 'POST',
-              'parameters' => array(
-                'parent' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'get' => array(
-              'path' => 'v1beta1/{+name}',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'name' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'list' => array(
-              'path' => 'v1beta1/{+parent}/jobs',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'parent' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'pageSize' => array(
-                  'location' => 'query',
-                  'type' => 'integer',
-                ),
-                'filter' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'pageToken' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-              ),
-            ),
-          )
-        )
-    );
-    $this->projects_models = new Google_Service_CloudMachineLearning_Resource_ProjectsModels(
-        $this,
-        $this->serviceName,
-        'models',
-        array(
-          'methods' => array(
-            'create' => array(
-              'path' => 'v1beta1/{+parent}/models',
-              'httpMethod' => 'POST',
-              'parameters' => array(
-                'parent' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'delete' => array(
-              'path' => 'v1beta1/{+name}',
-              'httpMethod' => 'DELETE',
-              'parameters' => array(
-                'name' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'get' => array(
-              'path' => 'v1beta1/{+name}',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'name' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'list' => array(
-              'path' => 'v1beta1/{+parent}/models',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'parent' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'pageSize' => array(
-                  'location' => 'query',
-                  'type' => 'integer',
-                ),
-                'pageToken' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-              ),
-            ),
-          )
-        )
-    );
-    $this->projects_models_versions = new Google_Service_CloudMachineLearning_Resource_ProjectsModelsVersions(
-        $this,
-        $this->serviceName,
-        'versions',
-        array(
-          'methods' => array(
-            'create' => array(
-              'path' => 'v1beta1/{+parent}/versions',
-              'httpMethod' => 'POST',
-              'parameters' => array(
-                'parent' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'delete' => array(
-              'path' => 'v1beta1/{+name}',
-              'httpMethod' => 'DELETE',
-              'parameters' => array(
-                'name' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'get' => array(
-              'path' => 'v1beta1/{+name}',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'name' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'list' => array(
-              'path' => 'v1beta1/{+parent}/versions',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'parent' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'pageSize' => array(
-                  'location' => 'query',
-                  'type' => 'integer',
-                ),
-                'pageToken' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-              ),
-            ),'setDefault' => array(
-              'path' => 'v1beta1/{+name}:setDefault',
-              'httpMethod' => 'POST',
-              'parameters' => array(
-                'name' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),
-          )
-        )
-    );
-    $this->projects_operations = new Google_Service_CloudMachineLearning_Resource_ProjectsOperations(
-        $this,
-        $this->serviceName,
-        'operations',
-        array(
-          'methods' => array(
-            'cancel' => array(
-              'path' => 'v1beta1/{+name}:cancel',
-              'httpMethod' => 'POST',
-              'parameters' => array(
-                'name' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'delete' => array(
-              'path' => 'v1beta1/{+name}',
-              'httpMethod' => 'DELETE',
-              'parameters' => array(
-                'name' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'get' => array(
-              'path' => 'v1beta1/{+name}',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'name' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'list' => array(
-              'path' => 'v1beta1/{+name}/operations',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'name' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'pageSize' => array(
-                  'location' => 'query',
-                  'type' => 'integer',
-                ),
-                'filter' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'pageToken' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-              ),
-            ),
-          )
-        )
-    );
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudMachineLearning/GoogleApiHttpBody.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudMachineLearning/GoogleApiHttpBody.php
deleted file mode 100644
index 21929b73..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudMachineLearning/GoogleApiHttpBody.php
+++ /dev/null
@@ -1,39 +0,0 @@
-contentType = $contentType;
-  }
-  public function getContentType()
-  {
-    return $this->contentType;
-  }
-  public function setData($data)
-  {
-    $this->data = $data;
-  }
-  public function getData()
-  {
-    return $this->data;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudMachineLearning/GoogleCloudMlV1beta1CancelJobRequest.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudMachineLearning/GoogleCloudMlV1beta1CancelJobRequest.php
deleted file mode 100644
index 2203115f..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudMachineLearning/GoogleCloudMlV1beta1CancelJobRequest.php
+++ /dev/null
@@ -1,20 +0,0 @@
-serviceAccount = $serviceAccount;
-  }
-  public function getServiceAccount()
-  {
-    return $this->serviceAccount;
-  }
-  public function setServiceAccountProject($serviceAccountProject)
-  {
-    $this->serviceAccountProject = $serviceAccountProject;
-  }
-  public function getServiceAccountProject()
-  {
-    return $this->serviceAccountProject;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudMachineLearning/GoogleCloudMlV1beta1HyperparameterOutput.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudMachineLearning/GoogleCloudMlV1beta1HyperparameterOutput.php
deleted file mode 100644
index 3c5cd116..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudMachineLearning/GoogleCloudMlV1beta1HyperparameterOutput.php
+++ /dev/null
@@ -1,60 +0,0 @@
-allMetrics = $allMetrics;
-  }
-  public function getAllMetrics()
-  {
-    return $this->allMetrics;
-  }
-  public function setFinalMetric(Google_Service_CloudMachineLearning_GoogleCloudMlV1beta1HyperparameterOutputHyperparameterMetric $finalMetric)
-  {
-    $this->finalMetric = $finalMetric;
-  }
-  public function getFinalMetric()
-  {
-    return $this->finalMetric;
-  }
-  public function setHyperparameters($hyperparameters)
-  {
-    $this->hyperparameters = $hyperparameters;
-  }
-  public function getHyperparameters()
-  {
-    return $this->hyperparameters;
-  }
-  public function setTrialId($trialId)
-  {
-    $this->trialId = $trialId;
-  }
-  public function getTrialId()
-  {
-    return $this->trialId;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudMachineLearning/GoogleCloudMlV1beta1HyperparameterOutputHyperparameterMetric.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudMachineLearning/GoogleCloudMlV1beta1HyperparameterOutputHyperparameterMetric.php
deleted file mode 100644
index 14694e4f..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudMachineLearning/GoogleCloudMlV1beta1HyperparameterOutputHyperparameterMetric.php
+++ /dev/null
@@ -1,39 +0,0 @@
-objectiveValue = $objectiveValue;
-  }
-  public function getObjectiveValue()
-  {
-    return $this->objectiveValue;
-  }
-  public function setTrainingStep($trainingStep)
-  {
-    $this->trainingStep = $trainingStep;
-  }
-  public function getTrainingStep()
-  {
-    return $this->trainingStep;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudMachineLearning/GoogleCloudMlV1beta1HyperparameterSpec.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudMachineLearning/GoogleCloudMlV1beta1HyperparameterSpec.php
deleted file mode 100644
index c03f7274..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudMachineLearning/GoogleCloudMlV1beta1HyperparameterSpec.php
+++ /dev/null
@@ -1,59 +0,0 @@
-goal = $goal;
-  }
-  public function getGoal()
-  {
-    return $this->goal;
-  }
-  public function setMaxParallelTrials($maxParallelTrials)
-  {
-    $this->maxParallelTrials = $maxParallelTrials;
-  }
-  public function getMaxParallelTrials()
-  {
-    return $this->maxParallelTrials;
-  }
-  public function setMaxTrials($maxTrials)
-  {
-    $this->maxTrials = $maxTrials;
-  }
-  public function getMaxTrials()
-  {
-    return $this->maxTrials;
-  }
-  public function setParams($params)
-  {
-    $this->params = $params;
-  }
-  public function getParams()
-  {
-    return $this->params;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudMachineLearning/GoogleCloudMlV1beta1Job.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudMachineLearning/GoogleCloudMlV1beta1Job.php
deleted file mode 100644
index 6817d8a4..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudMachineLearning/GoogleCloudMlV1beta1Job.php
+++ /dev/null
@@ -1,115 +0,0 @@
-createTime = $createTime;
-  }
-  public function getCreateTime()
-  {
-    return $this->createTime;
-  }
-  public function setEndTime($endTime)
-  {
-    $this->endTime = $endTime;
-  }
-  public function getEndTime()
-  {
-    return $this->endTime;
-  }
-  public function setErrorMessage($errorMessage)
-  {
-    $this->errorMessage = $errorMessage;
-  }
-  public function getErrorMessage()
-  {
-    return $this->errorMessage;
-  }
-  public function setJobId($jobId)
-  {
-    $this->jobId = $jobId;
-  }
-  public function getJobId()
-  {
-    return $this->jobId;
-  }
-  public function setPredictionInput(Google_Service_CloudMachineLearning_GoogleCloudMlV1beta1PredictionInput $predictionInput)
-  {
-    $this->predictionInput = $predictionInput;
-  }
-  public function getPredictionInput()
-  {
-    return $this->predictionInput;
-  }
-  public function setPredictionOutput(Google_Service_CloudMachineLearning_GoogleCloudMlV1beta1PredictionOutput $predictionOutput)
-  {
-    $this->predictionOutput = $predictionOutput;
-  }
-  public function getPredictionOutput()
-  {
-    return $this->predictionOutput;
-  }
-  public function setStartTime($startTime)
-  {
-    $this->startTime = $startTime;
-  }
-  public function getStartTime()
-  {
-    return $this->startTime;
-  }
-  public function setState($state)
-  {
-    $this->state = $state;
-  }
-  public function getState()
-  {
-    return $this->state;
-  }
-  public function setTrainingInput(Google_Service_CloudMachineLearning_GoogleCloudMlV1beta1TrainingInput $trainingInput)
-  {
-    $this->trainingInput = $trainingInput;
-  }
-  public function getTrainingInput()
-  {
-    return $this->trainingInput;
-  }
-  public function setTrainingOutput(Google_Service_CloudMachineLearning_GoogleCloudMlV1beta1TrainingOutput $trainingOutput)
-  {
-    $this->trainingOutput = $trainingOutput;
-  }
-  public function getTrainingOutput()
-  {
-    return $this->trainingOutput;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudMachineLearning/GoogleCloudMlV1beta1ListJobsResponse.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudMachineLearning/GoogleCloudMlV1beta1ListJobsResponse.php
deleted file mode 100644
index 4fdb12be..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudMachineLearning/GoogleCloudMlV1beta1ListJobsResponse.php
+++ /dev/null
@@ -1,41 +0,0 @@
-jobs = $jobs;
-  }
-  public function getJobs()
-  {
-    return $this->jobs;
-  }
-  public function setNextPageToken($nextPageToken)
-  {
-    $this->nextPageToken = $nextPageToken;
-  }
-  public function getNextPageToken()
-  {
-    return $this->nextPageToken;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudMachineLearning/GoogleCloudMlV1beta1ListModelsResponse.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudMachineLearning/GoogleCloudMlV1beta1ListModelsResponse.php
deleted file mode 100644
index fdea12aa..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudMachineLearning/GoogleCloudMlV1beta1ListModelsResponse.php
+++ /dev/null
@@ -1,41 +0,0 @@
-models = $models;
-  }
-  public function getModels()
-  {
-    return $this->models;
-  }
-  public function setNextPageToken($nextPageToken)
-  {
-    $this->nextPageToken = $nextPageToken;
-  }
-  public function getNextPageToken()
-  {
-    return $this->nextPageToken;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudMachineLearning/GoogleCloudMlV1beta1ListVersionsResponse.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudMachineLearning/GoogleCloudMlV1beta1ListVersionsResponse.php
deleted file mode 100644
index 4a0bbc87..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudMachineLearning/GoogleCloudMlV1beta1ListVersionsResponse.php
+++ /dev/null
@@ -1,41 +0,0 @@
-nextPageToken = $nextPageToken;
-  }
-  public function getNextPageToken()
-  {
-    return $this->nextPageToken;
-  }
-  public function setVersions($versions)
-  {
-    $this->versions = $versions;
-  }
-  public function getVersions()
-  {
-    return $this->versions;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudMachineLearning/GoogleCloudMlV1beta1Model.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudMachineLearning/GoogleCloudMlV1beta1Model.php
deleted file mode 100644
index a86a626b..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudMachineLearning/GoogleCloudMlV1beta1Model.php
+++ /dev/null
@@ -1,49 +0,0 @@
-defaultVersion = $defaultVersion;
-  }
-  public function getDefaultVersion()
-  {
-    return $this->defaultVersion;
-  }
-  public function setDescription($description)
-  {
-    $this->description = $description;
-  }
-  public function getDescription()
-  {
-    return $this->description;
-  }
-  public function setName($name)
-  {
-    $this->name = $name;
-  }
-  public function getName()
-  {
-    return $this->name;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudMachineLearning/GoogleCloudMlV1beta1OperationMetadata.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudMachineLearning/GoogleCloudMlV1beta1OperationMetadata.php
deleted file mode 100644
index c434b276..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudMachineLearning/GoogleCloudMlV1beta1OperationMetadata.php
+++ /dev/null
@@ -1,85 +0,0 @@
-createTime = $createTime;
-  }
-  public function getCreateTime()
-  {
-    return $this->createTime;
-  }
-  public function setEndTime($endTime)
-  {
-    $this->endTime = $endTime;
-  }
-  public function getEndTime()
-  {
-    return $this->endTime;
-  }
-  public function setIsCancellationRequested($isCancellationRequested)
-  {
-    $this->isCancellationRequested = $isCancellationRequested;
-  }
-  public function getIsCancellationRequested()
-  {
-    return $this->isCancellationRequested;
-  }
-  public function setModelName($modelName)
-  {
-    $this->modelName = $modelName;
-  }
-  public function getModelName()
-  {
-    return $this->modelName;
-  }
-  public function setOperationType($operationType)
-  {
-    $this->operationType = $operationType;
-  }
-  public function getOperationType()
-  {
-    return $this->operationType;
-  }
-  public function setStartTime($startTime)
-  {
-    $this->startTime = $startTime;
-  }
-  public function getStartTime()
-  {
-    return $this->startTime;
-  }
-  public function setVersion(Google_Service_CloudMachineLearning_GoogleCloudMlV1beta1Version $version)
-  {
-    $this->version = $version;
-  }
-  public function getVersion()
-  {
-    return $this->version;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudMachineLearning/GoogleCloudMlV1beta1ParameterSpec.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudMachineLearning/GoogleCloudMlV1beta1ParameterSpec.php
deleted file mode 100644
index 4403e505..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudMachineLearning/GoogleCloudMlV1beta1ParameterSpec.php
+++ /dev/null
@@ -1,85 +0,0 @@
-categoricalValues = $categoricalValues;
-  }
-  public function getCategoricalValues()
-  {
-    return $this->categoricalValues;
-  }
-  public function setDiscreteValues($discreteValues)
-  {
-    $this->discreteValues = $discreteValues;
-  }
-  public function getDiscreteValues()
-  {
-    return $this->discreteValues;
-  }
-  public function setMaxValue($maxValue)
-  {
-    $this->maxValue = $maxValue;
-  }
-  public function getMaxValue()
-  {
-    return $this->maxValue;
-  }
-  public function setMinValue($minValue)
-  {
-    $this->minValue = $minValue;
-  }
-  public function getMinValue()
-  {
-    return $this->minValue;
-  }
-  public function setParameterName($parameterName)
-  {
-    $this->parameterName = $parameterName;
-  }
-  public function getParameterName()
-  {
-    return $this->parameterName;
-  }
-  public function setScaleType($scaleType)
-  {
-    $this->scaleType = $scaleType;
-  }
-  public function getScaleType()
-  {
-    return $this->scaleType;
-  }
-  public function setType($type)
-  {
-    $this->type = $type;
-  }
-  public function getType()
-  {
-    return $this->type;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudMachineLearning/GoogleCloudMlV1beta1PredictRequest.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudMachineLearning/GoogleCloudMlV1beta1PredictRequest.php
deleted file mode 100644
index e27cfe46..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudMachineLearning/GoogleCloudMlV1beta1PredictRequest.php
+++ /dev/null
@@ -1,31 +0,0 @@
-httpBody = $httpBody;
-  }
-  public function getHttpBody()
-  {
-    return $this->httpBody;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudMachineLearning/GoogleCloudMlV1beta1PredictionInput.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudMachineLearning/GoogleCloudMlV1beta1PredictionInput.php
deleted file mode 100644
index 1dbd8138..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudMachineLearning/GoogleCloudMlV1beta1PredictionInput.php
+++ /dev/null
@@ -1,85 +0,0 @@
-dataFormat = $dataFormat;
-  }
-  public function getDataFormat()
-  {
-    return $this->dataFormat;
-  }
-  public function setInputPaths($inputPaths)
-  {
-    $this->inputPaths = $inputPaths;
-  }
-  public function getInputPaths()
-  {
-    return $this->inputPaths;
-  }
-  public function setMaxWorkerCount($maxWorkerCount)
-  {
-    $this->maxWorkerCount = $maxWorkerCount;
-  }
-  public function getMaxWorkerCount()
-  {
-    return $this->maxWorkerCount;
-  }
-  public function setModelName($modelName)
-  {
-    $this->modelName = $modelName;
-  }
-  public function getModelName()
-  {
-    return $this->modelName;
-  }
-  public function setOutputPath($outputPath)
-  {
-    $this->outputPath = $outputPath;
-  }
-  public function getOutputPath()
-  {
-    return $this->outputPath;
-  }
-  public function setRegion($region)
-  {
-    $this->region = $region;
-  }
-  public function getRegion()
-  {
-    return $this->region;
-  }
-  public function setVersionName($versionName)
-  {
-    $this->versionName = $versionName;
-  }
-  public function getVersionName()
-  {
-    return $this->versionName;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudMachineLearning/GoogleCloudMlV1beta1PredictionOutput.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudMachineLearning/GoogleCloudMlV1beta1PredictionOutput.php
deleted file mode 100644
index 7a8080c3..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudMachineLearning/GoogleCloudMlV1beta1PredictionOutput.php
+++ /dev/null
@@ -1,48 +0,0 @@
-errorCount = $errorCount;
-  }
-  public function getErrorCount()
-  {
-    return $this->errorCount;
-  }
-  public function setOutputPath($outputPath)
-  {
-    $this->outputPath = $outputPath;
-  }
-  public function getOutputPath()
-  {
-    return $this->outputPath;
-  }
-  public function setPredictionCount($predictionCount)
-  {
-    $this->predictionCount = $predictionCount;
-  }
-  public function getPredictionCount()
-  {
-    return $this->predictionCount;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudMachineLearning/GoogleCloudMlV1beta1SetDefaultVersionRequest.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudMachineLearning/GoogleCloudMlV1beta1SetDefaultVersionRequest.php
deleted file mode 100644
index 71268c53..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudMachineLearning/GoogleCloudMlV1beta1SetDefaultVersionRequest.php
+++ /dev/null
@@ -1,20 +0,0 @@
-args = $args;
-  }
-  public function getArgs()
-  {
-    return $this->args;
-  }
-  public function setHyperparameters(Google_Service_CloudMachineLearning_GoogleCloudMlV1beta1HyperparameterSpec $hyperparameters)
-  {
-    $this->hyperparameters = $hyperparameters;
-  }
-  public function getHyperparameters()
-  {
-    return $this->hyperparameters;
-  }
-  public function setMasterType($masterType)
-  {
-    $this->masterType = $masterType;
-  }
-  public function getMasterType()
-  {
-    return $this->masterType;
-  }
-  public function setPackageUris($packageUris)
-  {
-    $this->packageUris = $packageUris;
-  }
-  public function getPackageUris()
-  {
-    return $this->packageUris;
-  }
-  public function setParameterServerCount($parameterServerCount)
-  {
-    $this->parameterServerCount = $parameterServerCount;
-  }
-  public function getParameterServerCount()
-  {
-    return $this->parameterServerCount;
-  }
-  public function setParameterServerType($parameterServerType)
-  {
-    $this->parameterServerType = $parameterServerType;
-  }
-  public function getParameterServerType()
-  {
-    return $this->parameterServerType;
-  }
-  public function setPythonModule($pythonModule)
-  {
-    $this->pythonModule = $pythonModule;
-  }
-  public function getPythonModule()
-  {
-    return $this->pythonModule;
-  }
-  public function setRegion($region)
-  {
-    $this->region = $region;
-  }
-  public function getRegion()
-  {
-    return $this->region;
-  }
-  public function setScaleTier($scaleTier)
-  {
-    $this->scaleTier = $scaleTier;
-  }
-  public function getScaleTier()
-  {
-    return $this->scaleTier;
-  }
-  public function setWorkerCount($workerCount)
-  {
-    $this->workerCount = $workerCount;
-  }
-  public function getWorkerCount()
-  {
-    return $this->workerCount;
-  }
-  public function setWorkerType($workerType)
-  {
-    $this->workerType = $workerType;
-  }
-  public function getWorkerType()
-  {
-    return $this->workerType;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudMachineLearning/GoogleCloudMlV1beta1TrainingOutput.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudMachineLearning/GoogleCloudMlV1beta1TrainingOutput.php
deleted file mode 100644
index a23e6ddd..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudMachineLearning/GoogleCloudMlV1beta1TrainingOutput.php
+++ /dev/null
@@ -1,50 +0,0 @@
-completedTrialCount = $completedTrialCount;
-  }
-  public function getCompletedTrialCount()
-  {
-    return $this->completedTrialCount;
-  }
-  public function setConsumedMLUnits($consumedMLUnits)
-  {
-    $this->consumedMLUnits = $consumedMLUnits;
-  }
-  public function getConsumedMLUnits()
-  {
-    return $this->consumedMLUnits;
-  }
-  public function setTrials($trials)
-  {
-    $this->trials = $trials;
-  }
-  public function getTrials()
-  {
-    return $this->trials;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudMachineLearning/GoogleCloudMlV1beta1Version.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudMachineLearning/GoogleCloudMlV1beta1Version.php
deleted file mode 100644
index 4e06e3f3..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudMachineLearning/GoogleCloudMlV1beta1Version.php
+++ /dev/null
@@ -1,75 +0,0 @@
-createTime = $createTime;
-  }
-  public function getCreateTime()
-  {
-    return $this->createTime;
-  }
-  public function setDeploymentUri($deploymentUri)
-  {
-    $this->deploymentUri = $deploymentUri;
-  }
-  public function getDeploymentUri()
-  {
-    return $this->deploymentUri;
-  }
-  public function setDescription($description)
-  {
-    $this->description = $description;
-  }
-  public function getDescription()
-  {
-    return $this->description;
-  }
-  public function setIsDefault($isDefault)
-  {
-    $this->isDefault = $isDefault;
-  }
-  public function getIsDefault()
-  {
-    return $this->isDefault;
-  }
-  public function setLastUseTime($lastUseTime)
-  {
-    $this->lastUseTime = $lastUseTime;
-  }
-  public function getLastUseTime()
-  {
-    return $this->lastUseTime;
-  }
-  public function setName($name)
-  {
-    $this->name = $name;
-  }
-  public function getName()
-  {
-    return $this->name;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudMachineLearning/GoogleLongrunningListOperationsResponse.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudMachineLearning/GoogleLongrunningListOperationsResponse.php
deleted file mode 100644
index bddb8930..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudMachineLearning/GoogleLongrunningListOperationsResponse.php
+++ /dev/null
@@ -1,41 +0,0 @@
-nextPageToken = $nextPageToken;
-  }
-  public function getNextPageToken()
-  {
-    return $this->nextPageToken;
-  }
-  public function setOperations($operations)
-  {
-    $this->operations = $operations;
-  }
-  public function getOperations()
-  {
-    return $this->operations;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudMachineLearning/GoogleLongrunningOperation.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudMachineLearning/GoogleLongrunningOperation.php
deleted file mode 100644
index d9f2c4c7..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudMachineLearning/GoogleLongrunningOperation.php
+++ /dev/null
@@ -1,67 +0,0 @@
-done = $done;
-  }
-  public function getDone()
-  {
-    return $this->done;
-  }
-  public function setError(Google_Service_CloudMachineLearning_GoogleRpcStatus $error)
-  {
-    $this->error = $error;
-  }
-  public function getError()
-  {
-    return $this->error;
-  }
-  public function setMetadata($metadata)
-  {
-    $this->metadata = $metadata;
-  }
-  public function getMetadata()
-  {
-    return $this->metadata;
-  }
-  public function setName($name)
-  {
-    $this->name = $name;
-  }
-  public function getName()
-  {
-    return $this->name;
-  }
-  public function setResponse($response)
-  {
-    $this->response = $response;
-  }
-  public function getResponse()
-  {
-    return $this->response;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudMachineLearning/GoogleProtobufEmpty.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudMachineLearning/GoogleProtobufEmpty.php
deleted file mode 100644
index 3ae84da2..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudMachineLearning/GoogleProtobufEmpty.php
+++ /dev/null
@@ -1,20 +0,0 @@
-code = $code;
-  }
-  public function getCode()
-  {
-    return $this->code;
-  }
-  public function setDetails($details)
-  {
-    $this->details = $details;
-  }
-  public function getDetails()
-  {
-    return $this->details;
-  }
-  public function setMessage($message)
-  {
-    $this->message = $message;
-  }
-  public function getMessage()
-  {
-    return $this->message;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudMachineLearning/Resource/Projects.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudMachineLearning/Resource/Projects.php
deleted file mode 100644
index 2f959bf2..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudMachineLearning/Resource/Projects.php
+++ /dev/null
@@ -1,103 +0,0 @@
-
- *   $mlService = new Google_Service_CloudMachineLearning(...);
- *   $projects = $mlService->projects;
- *  
- */
-class Google_Service_CloudMachineLearning_Resource_Projects extends Google_Service_Resource
-{
-  /**
-   * Get the service account information associated with your project. You need
-   * this information in order to grant the service account persmissions for the
-   * Google Cloud Storage location where you put your model training code for
-   * training the model with Google Cloud Machine Learning. (projects.getConfig)
-   *
-   * @param string $name Required. The project name.
-   *
-   * Authorization: requires `Viewer` role on the specified project.
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_CloudMachineLearning_GoogleCloudMlV1beta1GetConfigResponse
-   */
-  public function getConfig($name, $optParams = array())
-  {
-    $params = array('name' => $name);
-    $params = array_merge($params, $optParams);
-    return $this->call('getConfig', array($params), "Google_Service_CloudMachineLearning_GoogleCloudMlV1beta1GetConfigResponse");
-  }
-  /**
-   * Performs prediction on the data in the request.
-   *
-   * Responses are very similar to requests. There are two top-level fields, each
-   * of which are JSON lists:
-   *
-   *   predictions   The list of predictions, one per instance in the request.
-   * error   An error message returned instead of a prediction list if any
-   * instance produced an error.
-   *
-   * If the call is successful, the response body will contain one prediction
-   * entry per instance in the request body. If prediction fails for any instance,
-   * the response body will contain no predictions and will contian a single error
-   * entry instead.
-   *
-   * Even though there is one prediction per instance, the format of a prediction
-   * is not directly related to the format of an instance. Predictions take
-   * whatever format is specified in the outputs collection defined in the model.
-   * The collection of predictions is returned in a JSON list. Each member of the
-   * list can be a simple value, a list, or a JSON object of any complexity. If
-   * your model has more than one output tensor, each prediction will be a JSON
-   * object containing a name/value pair for each output. The names identify the
-   * output aliases in the graph.
-   *
-   * The following examples show some possible responses:
-   *
-   * A simple set of predictions for three input instances, where each prediction
-   * is an integer value:
-   *
-   * {"predictions": [5, 4, 3]}
-   *
-   * A more complex set of predictions, each containing two named values that
-   * correspond to output tensors, named **label** and **scores** respectively.
-   * The value of **label** is the predicted category ("car" or "beach") and
-   * **scores** contains a list of probabilities for that instance across the
-   * possible categories.
-   *
-   * {"predictions": [{"label": "beach", "scores": [0.1, 0.9]},
-   * {"label": "car", "scores": [0.75, 0.25]}]}
-   *
-   * A response when there is an error processing an input instance:
-   *
-   * {"error": "Divide by zero"}  (projects.predict)
-   *
-   * @param string $name Required. The resource name of a model or a version.
-   *
-   * Authorization: requires `Viewer` role on the parent project.
-   * @param Google_Service_CloudMachineLearning_GoogleCloudMlV1beta1PredictRequest $postBody
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_CloudMachineLearning_GoogleApiHttpBody
-   */
-  public function predict($name, Google_Service_CloudMachineLearning_GoogleCloudMlV1beta1PredictRequest $postBody, $optParams = array())
-  {
-    $params = array('name' => $name, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('predict', array($params), "Google_Service_CloudMachineLearning_GoogleApiHttpBody");
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudMachineLearning/Resource/ProjectsJobs.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudMachineLearning/Resource/ProjectsJobs.php
deleted file mode 100644
index ba4459bf..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudMachineLearning/Resource/ProjectsJobs.php
+++ /dev/null
@@ -1,103 +0,0 @@
-
- *   $mlService = new Google_Service_CloudMachineLearning(...);
- *   $jobs = $mlService->jobs;
- *  
- */
-class Google_Service_CloudMachineLearning_Resource_ProjectsJobs extends Google_Service_Resource
-{
-  /**
-   * Cancels a running job. (jobs.cancel)
-   *
-   * @param string $name Required. The name of the job to cancel.
-   *
-   * Authorization: requires `Editor` role on the parent project.
-   * @param Google_Service_CloudMachineLearning_GoogleCloudMlV1beta1CancelJobRequest $postBody
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_CloudMachineLearning_GoogleProtobufEmpty
-   */
-  public function cancel($name, Google_Service_CloudMachineLearning_GoogleCloudMlV1beta1CancelJobRequest $postBody, $optParams = array())
-  {
-    $params = array('name' => $name, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('cancel', array($params), "Google_Service_CloudMachineLearning_GoogleProtobufEmpty");
-  }
-  /**
-   * Creates a training or a batch prediction job. (jobs.create)
-   *
-   * @param string $parent Required. The project name.
-   *
-   * Authorization: requires `Editor` role on the specified project.
-   * @param Google_Service_CloudMachineLearning_GoogleCloudMlV1beta1Job $postBody
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_CloudMachineLearning_GoogleCloudMlV1beta1Job
-   */
-  public function create($parent, Google_Service_CloudMachineLearning_GoogleCloudMlV1beta1Job $postBody, $optParams = array())
-  {
-    $params = array('parent' => $parent, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('create', array($params), "Google_Service_CloudMachineLearning_GoogleCloudMlV1beta1Job");
-  }
-  /**
-   * Describes a job. (jobs.get)
-   *
-   * @param string $name Required. The name of the job to get the description of.
-   *
-   * Authorization: requires `Viewer` role on the parent project.
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_CloudMachineLearning_GoogleCloudMlV1beta1Job
-   */
-  public function get($name, $optParams = array())
-  {
-    $params = array('name' => $name);
-    $params = array_merge($params, $optParams);
-    return $this->call('get', array($params), "Google_Service_CloudMachineLearning_GoogleCloudMlV1beta1Job");
-  }
-  /**
-   * Lists the jobs in the project. (jobs.listProjectsJobs)
-   *
-   * @param string $parent Required. The name of the project for which to list
-   * jobs.
-   *
-   * Authorization: requires `Viewer` role on the specified project.
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param int pageSize Optional. The number of jobs to retrieve per "page"
-   * of results. If there are more remaining results than this number, the
-   * response message will contain a valid value in the `next_page_token` field.
-   *
-   * The default value is 20, and the maximum page size is 100.
-   * @opt_param string filter Optional. Specifies the subset of jobs to retrieve.
-   * @opt_param string pageToken Optional. A page token to request the next page
-   * of results.
-   *
-   * You get the token from the `next_page_token` field of the response from the
-   * previous call.
-   * @return Google_Service_CloudMachineLearning_GoogleCloudMlV1beta1ListJobsResponse
-   */
-  public function listProjectsJobs($parent, $optParams = array())
-  {
-    $params = array('parent' => $parent);
-    $params = array_merge($params, $optParams);
-    return $this->call('list', array($params), "Google_Service_CloudMachineLearning_GoogleCloudMlV1beta1ListJobsResponse");
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudMachineLearning/Resource/ProjectsModels.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudMachineLearning/Resource/ProjectsModels.php
deleted file mode 100644
index 8a4a3422..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudMachineLearning/Resource/ProjectsModels.php
+++ /dev/null
@@ -1,114 +0,0 @@
-
- *   $mlService = new Google_Service_CloudMachineLearning(...);
- *   $models = $mlService->models;
- *  
- */
-class Google_Service_CloudMachineLearning_Resource_ProjectsModels extends Google_Service_Resource
-{
-  /**
-   * Creates a model which will later contain one or more versions.
-   *
-   * You must add at least one version before you can request predictions from the
-   * model. Add versions by calling [projects.models.versions.create](/ml/referenc
-   * e/rest/v1beta1/projects.models.versions/create). (models.create)
-   *
-   * @param string $parent Required. The project name.
-   *
-   * Authorization: requires `Editor` role on the specified project.
-   * @param Google_Service_CloudMachineLearning_GoogleCloudMlV1beta1Model $postBody
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_CloudMachineLearning_GoogleCloudMlV1beta1Model
-   */
-  public function create($parent, Google_Service_CloudMachineLearning_GoogleCloudMlV1beta1Model $postBody, $optParams = array())
-  {
-    $params = array('parent' => $parent, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('create', array($params), "Google_Service_CloudMachineLearning_GoogleCloudMlV1beta1Model");
-  }
-  /**
-   * Deletes a model.
-   *
-   * You can only delete a model if there are no versions in it. You can delete
-   * versions by calling [projects.models.versions.delete](/ml/reference/rest/v1be
-   * ta1/projects.models.versions/delete). (models.delete)
-   *
-   * @param string $name Required. The name of the model.
-   *
-   * Authorization: requires `Editor` role on the parent project.
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_CloudMachineLearning_GoogleLongrunningOperation
-   */
-  public function delete($name, $optParams = array())
-  {
-    $params = array('name' => $name);
-    $params = array_merge($params, $optParams);
-    return $this->call('delete', array($params), "Google_Service_CloudMachineLearning_GoogleLongrunningOperation");
-  }
-  /**
-   * Gets information about a model, including its name, the description (if set),
-   * and the default version (if at least one version of the model has been
-   * deployed). (models.get)
-   *
-   * @param string $name Required. The name of the model.
-   *
-   * Authorization: requires `Viewer` role on the parent project.
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_CloudMachineLearning_GoogleCloudMlV1beta1Model
-   */
-  public function get($name, $optParams = array())
-  {
-    $params = array('name' => $name);
-    $params = array_merge($params, $optParams);
-    return $this->call('get', array($params), "Google_Service_CloudMachineLearning_GoogleCloudMlV1beta1Model");
-  }
-  /**
-   * Lists the models in a project.
-   *
-   * Each project can contain multiple models, and each model can have multiple
-   * versions. (models.listProjectsModels)
-   *
-   * @param string $parent Required. The name of the project whose models are to
-   * be listed.
-   *
-   * Authorization: requires `Viewer` role on the specified project.
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param int pageSize Optional. The number of models to retrieve per "page"
-   * of results. If there are more remaining results than this number, the
-   * response message will contain a valid value in the `next_page_token` field.
-   *
-   * The default value is 20, and the maximum page size is 100.
-   * @opt_param string pageToken Optional. A page token to request the next page
-   * of results.
-   *
-   * You get the token from the `next_page_token` field of the response from the
-   * previous call.
-   * @return Google_Service_CloudMachineLearning_GoogleCloudMlV1beta1ListModelsResponse
-   */
-  public function listProjectsModels($parent, $optParams = array())
-  {
-    $params = array('parent' => $parent);
-    $params = array_merge($params, $optParams);
-    return $this->call('list', array($params), "Google_Service_CloudMachineLearning_GoogleCloudMlV1beta1ListModelsResponse");
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudMachineLearning/Resource/ProjectsModelsVersions.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudMachineLearning/Resource/ProjectsModelsVersions.php
deleted file mode 100644
index 0f264fd8..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudMachineLearning/Resource/ProjectsModelsVersions.php
+++ /dev/null
@@ -1,152 +0,0 @@
-
- *   $mlService = new Google_Service_CloudMachineLearning(...);
- *   $versions = $mlService->versions;
- *  
- */
-class Google_Service_CloudMachineLearning_Resource_ProjectsModelsVersions extends Google_Service_Resource
-{
-  /**
-   * Creates a new version of a model from a trained TensorFlow model.
-   *
-   * If the version created in the cloud by this call is the first deployed
-   * version of the specified model, it will be made the default version of the
-   * model. When you add a version to a model that already has one or more
-   * versions, the default version does not automatically change. If you want a
-   * new version to be the default, you must call [projects.models.versions.setDef
-   * ault](/ml/reference/rest/v1beta1/projects.models.versions/setDefault).
-   * (versions.create)
-   *
-   * @param string $parent Required. The name of the model.
-   *
-   * Authorization: requires `Editor` role on the parent project.
-   * @param Google_Service_CloudMachineLearning_GoogleCloudMlV1beta1Version $postBody
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_CloudMachineLearning_GoogleLongrunningOperation
-   */
-  public function create($parent, Google_Service_CloudMachineLearning_GoogleCloudMlV1beta1Version $postBody, $optParams = array())
-  {
-    $params = array('parent' => $parent, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('create', array($params), "Google_Service_CloudMachineLearning_GoogleLongrunningOperation");
-  }
-  /**
-   * Deletes a model version.
-   *
-   * Each model can have multiple versions deployed and in use at any given time.
-   * Use this method to remove a single version.
-   *
-   * Note: You cannot delete the version that is set as the default version of the
-   * model unless it is the only remaining version. (versions.delete)
-   *
-   * @param string $name Required. The name of the version. You can get the names
-   * of all the versions of a model by calling [projects.models.versions.list](/ml
-   * /reference/rest/v1beta1/projects.models.versions/list).
-   *
-   * Authorization: requires `Editor` role on the parent project.
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_CloudMachineLearning_GoogleLongrunningOperation
-   */
-  public function delete($name, $optParams = array())
-  {
-    $params = array('name' => $name);
-    $params = array_merge($params, $optParams);
-    return $this->call('delete', array($params), "Google_Service_CloudMachineLearning_GoogleLongrunningOperation");
-  }
-  /**
-   * Gets information about a model version.
-   *
-   * Models can have multiple versions. You can call [projects.models.versions.lis
-   * t](/ml/reference/rest/v1beta1/projects.models.versions/list) to get the same
-   * information that this method returns for all of the versions of a model.
-   * (versions.get)
-   *
-   * @param string $name Required. The name of the version.
-   *
-   * Authorization: requires `Viewer` role on the parent project.
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_CloudMachineLearning_GoogleCloudMlV1beta1Version
-   */
-  public function get($name, $optParams = array())
-  {
-    $params = array('name' => $name);
-    $params = array_merge($params, $optParams);
-    return $this->call('get', array($params), "Google_Service_CloudMachineLearning_GoogleCloudMlV1beta1Version");
-  }
-  /**
-   * Gets basic information about all the versions of a model.
-   *
-   * If you expect that a model has a lot of versions, or if you need to handle
-   * only a limited number of results at a time, you can request that the list be
-   * retrieved in batches (called pages): (versions.listProjectsModelsVersions)
-   *
-   * @param string $parent Required. The name of the model for which to list the
-   * version.
-   *
-   * Authorization: requires `Viewer` role on the parent project.
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param int pageSize Optional. The number of versions to retrieve per
-   * "page" of results. If there are more remaining results than this number, the
-   * response message will contain a valid value in the `next_page_token` field.
-   *
-   * The default value is 20, and the maximum page size is 100.
-   * @opt_param string pageToken Optional. A page token to request the next page
-   * of results.
-   *
-   * You get the token from the `next_page_token` field of the response from the
-   * previous call.
-   * @return Google_Service_CloudMachineLearning_GoogleCloudMlV1beta1ListVersionsResponse
-   */
-  public function listProjectsModelsVersions($parent, $optParams = array())
-  {
-    $params = array('parent' => $parent);
-    $params = array_merge($params, $optParams);
-    return $this->call('list', array($params), "Google_Service_CloudMachineLearning_GoogleCloudMlV1beta1ListVersionsResponse");
-  }
-  /**
-   * Designates a version to be the default for the model.
-   *
-   * The default version is used for prediction requests made against the model
-   * that don't specify a version.
-   *
-   * The first version to be created for a model is automatically set as the
-   * default. You must make any subsequent changes to the default version setting
-   * manually using this method. (versions.setDefault)
-   *
-   * @param string $name Required. The name of the version to make the default for
-   * the model. You can get the names of all the versions of a model by calling [p
-   * rojects.models.versions.list](/ml/reference/rest/v1beta1/projects.models.vers
-   * ions/list).
-   *
-   * Authorization: requires `Editor` role on the parent project.
-   * @param Google_Service_CloudMachineLearning_GoogleCloudMlV1beta1SetDefaultVersionRequest $postBody
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_CloudMachineLearning_GoogleCloudMlV1beta1Version
-   */
-  public function setDefault($name, Google_Service_CloudMachineLearning_GoogleCloudMlV1beta1SetDefaultVersionRequest $postBody, $optParams = array())
-  {
-    $params = array('name' => $name, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('setDefault', array($params), "Google_Service_CloudMachineLearning_GoogleCloudMlV1beta1Version");
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudMachineLearning/Resource/ProjectsOperations.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudMachineLearning/Resource/ProjectsOperations.php
deleted file mode 100644
index 3deb6405..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudMachineLearning/Resource/ProjectsOperations.php
+++ /dev/null
@@ -1,102 +0,0 @@
-
- *   $mlService = new Google_Service_CloudMachineLearning(...);
- *   $operations = $mlService->operations;
- *  
- */
-class Google_Service_CloudMachineLearning_Resource_ProjectsOperations extends Google_Service_Resource
-{
-  /**
-   * Starts asynchronous cancellation on a long-running operation.  The server
-   * makes a best effort to cancel the operation, but success is not guaranteed.
-   * If the server doesn't support this method, it returns
-   * `google.rpc.Code.UNIMPLEMENTED`.  Clients can use Operations.GetOperation or
-   * other methods to check whether the cancellation succeeded or whether the
-   * operation completed despite cancellation. On successful cancellation, the
-   * operation is not deleted; instead, it becomes an operation with an
-   * Operation.error value with a google.rpc.Status.code of 1, corresponding to
-   * `Code.CANCELLED`. (operations.cancel)
-   *
-   * @param string $name The name of the operation resource to be cancelled.
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_CloudMachineLearning_GoogleProtobufEmpty
-   */
-  public function cancel($name, $optParams = array())
-  {
-    $params = array('name' => $name);
-    $params = array_merge($params, $optParams);
-    return $this->call('cancel', array($params), "Google_Service_CloudMachineLearning_GoogleProtobufEmpty");
-  }
-  /**
-   * Deletes a long-running operation. This method indicates that the client is no
-   * longer interested in the operation result. It does not cancel the operation.
-   * If the server doesn't support this method, it returns
-   * `google.rpc.Code.UNIMPLEMENTED`. (operations.delete)
-   *
-   * @param string $name The name of the operation resource to be deleted.
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_CloudMachineLearning_GoogleProtobufEmpty
-   */
-  public function delete($name, $optParams = array())
-  {
-    $params = array('name' => $name);
-    $params = array_merge($params, $optParams);
-    return $this->call('delete', array($params), "Google_Service_CloudMachineLearning_GoogleProtobufEmpty");
-  }
-  /**
-   * Gets the latest state of a long-running operation.  Clients can use this
-   * method to poll the operation result at intervals as recommended by the API
-   * service. (operations.get)
-   *
-   * @param string $name The name of the operation resource.
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_CloudMachineLearning_GoogleLongrunningOperation
-   */
-  public function get($name, $optParams = array())
-  {
-    $params = array('name' => $name);
-    $params = array_merge($params, $optParams);
-    return $this->call('get', array($params), "Google_Service_CloudMachineLearning_GoogleLongrunningOperation");
-  }
-  /**
-   * Lists operations that match the specified filter in the request. If the
-   * server doesn't support this method, it returns `UNIMPLEMENTED`.
-   *
-   * NOTE: the `name` binding below allows API services to override the binding to
-   * use different resource name schemes, such as `users/operations`.
-   * (operations.listProjectsOperations)
-   *
-   * @param string $name The name of the operation collection.
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param int pageSize The standard list page size.
-   * @opt_param string filter The standard list filter.
-   * @opt_param string pageToken The standard list page token.
-   * @return Google_Service_CloudMachineLearning_GoogleLongrunningListOperationsResponse
-   */
-  public function listProjectsOperations($name, $optParams = array())
-  {
-    $params = array('name' => $name);
-    $params = array_merge($params, $optParams);
-    return $this->call('list', array($params), "Google_Service_CloudMachineLearning_GoogleLongrunningListOperationsResponse");
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudMachineLearningEngine.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudMachineLearningEngine.php
deleted file mode 100644
index 22cf5f6b..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudMachineLearningEngine.php
+++ /dev/null
@@ -1,338 +0,0 @@
-
- * An API to enable creating and using machine learning models.

- *
- * 

- * For more information about this service, see the API
- * Documentation
- * 

- *
- * @author Google, Inc.
- */
-class Google_Service_CloudMachineLearningEngine extends Google_Service
-{
-  /** View and manage your data across Google Cloud Platform services. */
-  const CLOUD_PLATFORM =
-      "https://www.googleapis.com/auth/cloud-platform";
-
-  public $projects;
-  public $projects_jobs;
-  public $projects_models;
-  public $projects_models_versions;
-  public $projects_operations;
-  
-  /**
-   * Constructs the internal representation of the CloudMachineLearningEngine
-   * service.
-   *
-   * @param Google_Client $client
-   */
-  public function __construct(Google_Client $client)
-  {
-    parent::__construct($client);
-    $this->rootUrl = 'https://ml.googleapis.com/';
-    $this->servicePath = '';
-    $this->version = 'v1';
-    $this->serviceName = 'ml';
-
-    $this->projects = new Google_Service_CloudMachineLearningEngine_Resource_Projects(
-        $this,
-        $this->serviceName,
-        'projects',
-        array(
-          'methods' => array(
-            'getConfig' => array(
-              'path' => 'v1/{+name}:getConfig',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'name' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'predict' => array(
-              'path' => 'v1/{+name}:predict',
-              'httpMethod' => 'POST',
-              'parameters' => array(
-                'name' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),
-          )
-        )
-    );
-    $this->projects_jobs = new Google_Service_CloudMachineLearningEngine_Resource_ProjectsJobs(
-        $this,
-        $this->serviceName,
-        'jobs',
-        array(
-          'methods' => array(
-            'cancel' => array(
-              'path' => 'v1/{+name}:cancel',
-              'httpMethod' => 'POST',
-              'parameters' => array(
-                'name' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'create' => array(
-              'path' => 'v1/{+parent}/jobs',
-              'httpMethod' => 'POST',
-              'parameters' => array(
-                'parent' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'get' => array(
-              'path' => 'v1/{+name}',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'name' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'list' => array(
-              'path' => 'v1/{+parent}/jobs',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'parent' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'filter' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'pageToken' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'pageSize' => array(
-                  'location' => 'query',
-                  'type' => 'integer',
-                ),
-              ),
-            ),
-          )
-        )
-    );
-    $this->projects_models = new Google_Service_CloudMachineLearningEngine_Resource_ProjectsModels(
-        $this,
-        $this->serviceName,
-        'models',
-        array(
-          'methods' => array(
-            'create' => array(
-              'path' => 'v1/{+parent}/models',
-              'httpMethod' => 'POST',
-              'parameters' => array(
-                'parent' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'delete' => array(
-              'path' => 'v1/{+name}',
-              'httpMethod' => 'DELETE',
-              'parameters' => array(
-                'name' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'get' => array(
-              'path' => 'v1/{+name}',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'name' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'list' => array(
-              'path' => 'v1/{+parent}/models',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'parent' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'pageToken' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'pageSize' => array(
-                  'location' => 'query',
-                  'type' => 'integer',
-                ),
-              ),
-            ),
-          )
-        )
-    );
-    $this->projects_models_versions = new Google_Service_CloudMachineLearningEngine_Resource_ProjectsModelsVersions(
-        $this,
-        $this->serviceName,
-        'versions',
-        array(
-          'methods' => array(
-            'create' => array(
-              'path' => 'v1/{+parent}/versions',
-              'httpMethod' => 'POST',
-              'parameters' => array(
-                'parent' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'delete' => array(
-              'path' => 'v1/{+name}',
-              'httpMethod' => 'DELETE',
-              'parameters' => array(
-                'name' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'get' => array(
-              'path' => 'v1/{+name}',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'name' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'list' => array(
-              'path' => 'v1/{+parent}/versions',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'parent' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'pageToken' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'pageSize' => array(
-                  'location' => 'query',
-                  'type' => 'integer',
-                ),
-              ),
-            ),'setDefault' => array(
-              'path' => 'v1/{+name}:setDefault',
-              'httpMethod' => 'POST',
-              'parameters' => array(
-                'name' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),
-          )
-        )
-    );
-    $this->projects_operations = new Google_Service_CloudMachineLearningEngine_Resource_ProjectsOperations(
-        $this,
-        $this->serviceName,
-        'operations',
-        array(
-          'methods' => array(
-            'cancel' => array(
-              'path' => 'v1/{+name}:cancel',
-              'httpMethod' => 'POST',
-              'parameters' => array(
-                'name' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'delete' => array(
-              'path' => 'v1/{+name}',
-              'httpMethod' => 'DELETE',
-              'parameters' => array(
-                'name' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'get' => array(
-              'path' => 'v1/{+name}',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'name' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'list' => array(
-              'path' => 'v1/{+name}/operations',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'name' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'pageToken' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'pageSize' => array(
-                  'location' => 'query',
-                  'type' => 'integer',
-                ),
-                'filter' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-              ),
-            ),
-          )
-        )
-    );
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudMachineLearningEngine/GoogleApiHttpBody.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudMachineLearningEngine/GoogleApiHttpBody.php
deleted file mode 100644
index 9defb8c5..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudMachineLearningEngine/GoogleApiHttpBody.php
+++ /dev/null
@@ -1,39 +0,0 @@
-contentType = $contentType;
-  }
-  public function getContentType()
-  {
-    return $this->contentType;
-  }
-  public function setData($data)
-  {
-    $this->data = $data;
-  }
-  public function getData()
-  {
-    return $this->data;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudMachineLearningEngine/GoogleCloudMlV1CancelJobRequest.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudMachineLearningEngine/GoogleCloudMlV1CancelJobRequest.php
deleted file mode 100644
index a53fd50d..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudMachineLearningEngine/GoogleCloudMlV1CancelJobRequest.php
+++ /dev/null
@@ -1,20 +0,0 @@
-serviceAccount = $serviceAccount;
-  }
-  public function getServiceAccount()
-  {
-    return $this->serviceAccount;
-  }
-  public function setServiceAccountProject($serviceAccountProject)
-  {
-    $this->serviceAccountProject = $serviceAccountProject;
-  }
-  public function getServiceAccountProject()
-  {
-    return $this->serviceAccountProject;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudMachineLearningEngine/GoogleCloudMlV1HyperparameterOutput.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudMachineLearningEngine/GoogleCloudMlV1HyperparameterOutput.php
deleted file mode 100644
index 090b9545..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudMachineLearningEngine/GoogleCloudMlV1HyperparameterOutput.php
+++ /dev/null
@@ -1,60 +0,0 @@
-allMetrics = $allMetrics;
-  }
-  public function getAllMetrics()
-  {
-    return $this->allMetrics;
-  }
-  public function setFinalMetric(Google_Service_CloudMachineLearningEngine_GoogleCloudMlV1HyperparameterOutputHyperparameterMetric $finalMetric)
-  {
-    $this->finalMetric = $finalMetric;
-  }
-  public function getFinalMetric()
-  {
-    return $this->finalMetric;
-  }
-  public function setHyperparameters($hyperparameters)
-  {
-    $this->hyperparameters = $hyperparameters;
-  }
-  public function getHyperparameters()
-  {
-    return $this->hyperparameters;
-  }
-  public function setTrialId($trialId)
-  {
-    $this->trialId = $trialId;
-  }
-  public function getTrialId()
-  {
-    return $this->trialId;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudMachineLearningEngine/GoogleCloudMlV1HyperparameterOutputHyperparameterMetric.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudMachineLearningEngine/GoogleCloudMlV1HyperparameterOutputHyperparameterMetric.php
deleted file mode 100644
index 6ce8feaf..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudMachineLearningEngine/GoogleCloudMlV1HyperparameterOutputHyperparameterMetric.php
+++ /dev/null
@@ -1,39 +0,0 @@
-objectiveValue = $objectiveValue;
-  }
-  public function getObjectiveValue()
-  {
-    return $this->objectiveValue;
-  }
-  public function setTrainingStep($trainingStep)
-  {
-    $this->trainingStep = $trainingStep;
-  }
-  public function getTrainingStep()
-  {
-    return $this->trainingStep;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudMachineLearningEngine/GoogleCloudMlV1HyperparameterSpec.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudMachineLearningEngine/GoogleCloudMlV1HyperparameterSpec.php
deleted file mode 100644
index 8a5bbab8..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudMachineLearningEngine/GoogleCloudMlV1HyperparameterSpec.php
+++ /dev/null
@@ -1,68 +0,0 @@
-goal = $goal;
-  }
-  public function getGoal()
-  {
-    return $this->goal;
-  }
-  public function setHyperparameterMetricTag($hyperparameterMetricTag)
-  {
-    $this->hyperparameterMetricTag = $hyperparameterMetricTag;
-  }
-  public function getHyperparameterMetricTag()
-  {
-    return $this->hyperparameterMetricTag;
-  }
-  public function setMaxParallelTrials($maxParallelTrials)
-  {
-    $this->maxParallelTrials = $maxParallelTrials;
-  }
-  public function getMaxParallelTrials()
-  {
-    return $this->maxParallelTrials;
-  }
-  public function setMaxTrials($maxTrials)
-  {
-    $this->maxTrials = $maxTrials;
-  }
-  public function getMaxTrials()
-  {
-    return $this->maxTrials;
-  }
-  public function setParams($params)
-  {
-    $this->params = $params;
-  }
-  public function getParams()
-  {
-    return $this->params;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudMachineLearningEngine/GoogleCloudMlV1Job.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudMachineLearningEngine/GoogleCloudMlV1Job.php
deleted file mode 100644
index 12477968..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudMachineLearningEngine/GoogleCloudMlV1Job.php
+++ /dev/null
@@ -1,115 +0,0 @@
-createTime = $createTime;
-  }
-  public function getCreateTime()
-  {
-    return $this->createTime;
-  }
-  public function setEndTime($endTime)
-  {
-    $this->endTime = $endTime;
-  }
-  public function getEndTime()
-  {
-    return $this->endTime;
-  }
-  public function setErrorMessage($errorMessage)
-  {
-    $this->errorMessage = $errorMessage;
-  }
-  public function getErrorMessage()
-  {
-    return $this->errorMessage;
-  }
-  public function setJobId($jobId)
-  {
-    $this->jobId = $jobId;
-  }
-  public function getJobId()
-  {
-    return $this->jobId;
-  }
-  public function setPredictionInput(Google_Service_CloudMachineLearningEngine_GoogleCloudMlV1PredictionInput $predictionInput)
-  {
-    $this->predictionInput = $predictionInput;
-  }
-  public function getPredictionInput()
-  {
-    return $this->predictionInput;
-  }
-  public function setPredictionOutput(Google_Service_CloudMachineLearningEngine_GoogleCloudMlV1PredictionOutput $predictionOutput)
-  {
-    $this->predictionOutput = $predictionOutput;
-  }
-  public function getPredictionOutput()
-  {
-    return $this->predictionOutput;
-  }
-  public function setStartTime($startTime)
-  {
-    $this->startTime = $startTime;
-  }
-  public function getStartTime()
-  {
-    return $this->startTime;
-  }
-  public function setState($state)
-  {
-    $this->state = $state;
-  }
-  public function getState()
-  {
-    return $this->state;
-  }
-  public function setTrainingInput(Google_Service_CloudMachineLearningEngine_GoogleCloudMlV1TrainingInput $trainingInput)
-  {
-    $this->trainingInput = $trainingInput;
-  }
-  public function getTrainingInput()
-  {
-    return $this->trainingInput;
-  }
-  public function setTrainingOutput(Google_Service_CloudMachineLearningEngine_GoogleCloudMlV1TrainingOutput $trainingOutput)
-  {
-    $this->trainingOutput = $trainingOutput;
-  }
-  public function getTrainingOutput()
-  {
-    return $this->trainingOutput;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudMachineLearningEngine/GoogleCloudMlV1ListJobsResponse.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudMachineLearningEngine/GoogleCloudMlV1ListJobsResponse.php
deleted file mode 100644
index 64ee1e51..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudMachineLearningEngine/GoogleCloudMlV1ListJobsResponse.php
+++ /dev/null
@@ -1,41 +0,0 @@
-jobs = $jobs;
-  }
-  public function getJobs()
-  {
-    return $this->jobs;
-  }
-  public function setNextPageToken($nextPageToken)
-  {
-    $this->nextPageToken = $nextPageToken;
-  }
-  public function getNextPageToken()
-  {
-    return $this->nextPageToken;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudMachineLearningEngine/GoogleCloudMlV1ListModelsResponse.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudMachineLearningEngine/GoogleCloudMlV1ListModelsResponse.php
deleted file mode 100644
index 94073eb1..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudMachineLearningEngine/GoogleCloudMlV1ListModelsResponse.php
+++ /dev/null
@@ -1,41 +0,0 @@
-models = $models;
-  }
-  public function getModels()
-  {
-    return $this->models;
-  }
-  public function setNextPageToken($nextPageToken)
-  {
-    $this->nextPageToken = $nextPageToken;
-  }
-  public function getNextPageToken()
-  {
-    return $this->nextPageToken;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudMachineLearningEngine/GoogleCloudMlV1ListVersionsResponse.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudMachineLearningEngine/GoogleCloudMlV1ListVersionsResponse.php
deleted file mode 100644
index 3854c313..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudMachineLearningEngine/GoogleCloudMlV1ListVersionsResponse.php
+++ /dev/null
@@ -1,41 +0,0 @@
-nextPageToken = $nextPageToken;
-  }
-  public function getNextPageToken()
-  {
-    return $this->nextPageToken;
-  }
-  public function setVersions($versions)
-  {
-    $this->versions = $versions;
-  }
-  public function getVersions()
-  {
-    return $this->versions;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudMachineLearningEngine/GoogleCloudMlV1ManualScaling.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudMachineLearningEngine/GoogleCloudMlV1ManualScaling.php
deleted file mode 100644
index e2ce19b7..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudMachineLearningEngine/GoogleCloudMlV1ManualScaling.php
+++ /dev/null
@@ -1,30 +0,0 @@
-nodes = $nodes;
-  }
-  public function getNodes()
-  {
-    return $this->nodes;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudMachineLearningEngine/GoogleCloudMlV1Model.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudMachineLearningEngine/GoogleCloudMlV1Model.php
deleted file mode 100644
index f510f862..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudMachineLearningEngine/GoogleCloudMlV1Model.php
+++ /dev/null
@@ -1,68 +0,0 @@
-defaultVersion = $defaultVersion;
-  }
-  public function getDefaultVersion()
-  {
-    return $this->defaultVersion;
-  }
-  public function setDescription($description)
-  {
-    $this->description = $description;
-  }
-  public function getDescription()
-  {
-    return $this->description;
-  }
-  public function setName($name)
-  {
-    $this->name = $name;
-  }
-  public function getName()
-  {
-    return $this->name;
-  }
-  public function setOnlinePredictionLogging($onlinePredictionLogging)
-  {
-    $this->onlinePredictionLogging = $onlinePredictionLogging;
-  }
-  public function getOnlinePredictionLogging()
-  {
-    return $this->onlinePredictionLogging;
-  }
-  public function setRegions($regions)
-  {
-    $this->regions = $regions;
-  }
-  public function getRegions()
-  {
-    return $this->regions;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudMachineLearningEngine/GoogleCloudMlV1OperationMetadata.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudMachineLearningEngine/GoogleCloudMlV1OperationMetadata.php
deleted file mode 100644
index f1b33712..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudMachineLearningEngine/GoogleCloudMlV1OperationMetadata.php
+++ /dev/null
@@ -1,85 +0,0 @@
-createTime = $createTime;
-  }
-  public function getCreateTime()
-  {
-    return $this->createTime;
-  }
-  public function setEndTime($endTime)
-  {
-    $this->endTime = $endTime;
-  }
-  public function getEndTime()
-  {
-    return $this->endTime;
-  }
-  public function setIsCancellationRequested($isCancellationRequested)
-  {
-    $this->isCancellationRequested = $isCancellationRequested;
-  }
-  public function getIsCancellationRequested()
-  {
-    return $this->isCancellationRequested;
-  }
-  public function setModelName($modelName)
-  {
-    $this->modelName = $modelName;
-  }
-  public function getModelName()
-  {
-    return $this->modelName;
-  }
-  public function setOperationType($operationType)
-  {
-    $this->operationType = $operationType;
-  }
-  public function getOperationType()
-  {
-    return $this->operationType;
-  }
-  public function setStartTime($startTime)
-  {
-    $this->startTime = $startTime;
-  }
-  public function getStartTime()
-  {
-    return $this->startTime;
-  }
-  public function setVersion(Google_Service_CloudMachineLearningEngine_GoogleCloudMlV1Version $version)
-  {
-    $this->version = $version;
-  }
-  public function getVersion()
-  {
-    return $this->version;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudMachineLearningEngine/GoogleCloudMlV1ParameterSpec.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudMachineLearningEngine/GoogleCloudMlV1ParameterSpec.php
deleted file mode 100644
index d75f5915..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudMachineLearningEngine/GoogleCloudMlV1ParameterSpec.php
+++ /dev/null
@@ -1,85 +0,0 @@
-categoricalValues = $categoricalValues;
-  }
-  public function getCategoricalValues()
-  {
-    return $this->categoricalValues;
-  }
-  public function setDiscreteValues($discreteValues)
-  {
-    $this->discreteValues = $discreteValues;
-  }
-  public function getDiscreteValues()
-  {
-    return $this->discreteValues;
-  }
-  public function setMaxValue($maxValue)
-  {
-    $this->maxValue = $maxValue;
-  }
-  public function getMaxValue()
-  {
-    return $this->maxValue;
-  }
-  public function setMinValue($minValue)
-  {
-    $this->minValue = $minValue;
-  }
-  public function getMinValue()
-  {
-    return $this->minValue;
-  }
-  public function setParameterName($parameterName)
-  {
-    $this->parameterName = $parameterName;
-  }
-  public function getParameterName()
-  {
-    return $this->parameterName;
-  }
-  public function setScaleType($scaleType)
-  {
-    $this->scaleType = $scaleType;
-  }
-  public function getScaleType()
-  {
-    return $this->scaleType;
-  }
-  public function setType($type)
-  {
-    $this->type = $type;
-  }
-  public function getType()
-  {
-    return $this->type;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudMachineLearningEngine/GoogleCloudMlV1PredictRequest.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudMachineLearningEngine/GoogleCloudMlV1PredictRequest.php
deleted file mode 100644
index 763b83a9..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudMachineLearningEngine/GoogleCloudMlV1PredictRequest.php
+++ /dev/null
@@ -1,31 +0,0 @@
-httpBody = $httpBody;
-  }
-  public function getHttpBody()
-  {
-    return $this->httpBody;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudMachineLearningEngine/GoogleCloudMlV1PredictionInput.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudMachineLearningEngine/GoogleCloudMlV1PredictionInput.php
deleted file mode 100644
index 64b3b2a3..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudMachineLearningEngine/GoogleCloudMlV1PredictionInput.php
+++ /dev/null
@@ -1,103 +0,0 @@
-dataFormat = $dataFormat;
-  }
-  public function getDataFormat()
-  {
-    return $this->dataFormat;
-  }
-  public function setInputPaths($inputPaths)
-  {
-    $this->inputPaths = $inputPaths;
-  }
-  public function getInputPaths()
-  {
-    return $this->inputPaths;
-  }
-  public function setMaxWorkerCount($maxWorkerCount)
-  {
-    $this->maxWorkerCount = $maxWorkerCount;
-  }
-  public function getMaxWorkerCount()
-  {
-    return $this->maxWorkerCount;
-  }
-  public function setModelName($modelName)
-  {
-    $this->modelName = $modelName;
-  }
-  public function getModelName()
-  {
-    return $this->modelName;
-  }
-  public function setOutputPath($outputPath)
-  {
-    $this->outputPath = $outputPath;
-  }
-  public function getOutputPath()
-  {
-    return $this->outputPath;
-  }
-  public function setRegion($region)
-  {
-    $this->region = $region;
-  }
-  public function getRegion()
-  {
-    return $this->region;
-  }
-  public function setRuntimeVersion($runtimeVersion)
-  {
-    $this->runtimeVersion = $runtimeVersion;
-  }
-  public function getRuntimeVersion()
-  {
-    return $this->runtimeVersion;
-  }
-  public function setUri($uri)
-  {
-    $this->uri = $uri;
-  }
-  public function getUri()
-  {
-    return $this->uri;
-  }
-  public function setVersionName($versionName)
-  {
-    $this->versionName = $versionName;
-  }
-  public function getVersionName()
-  {
-    return $this->versionName;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudMachineLearningEngine/GoogleCloudMlV1PredictionOutput.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudMachineLearningEngine/GoogleCloudMlV1PredictionOutput.php
deleted file mode 100644
index b3765585..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudMachineLearningEngine/GoogleCloudMlV1PredictionOutput.php
+++ /dev/null
@@ -1,57 +0,0 @@
-errorCount = $errorCount;
-  }
-  public function getErrorCount()
-  {
-    return $this->errorCount;
-  }
-  public function setNodeHours($nodeHours)
-  {
-    $this->nodeHours = $nodeHours;
-  }
-  public function getNodeHours()
-  {
-    return $this->nodeHours;
-  }
-  public function setOutputPath($outputPath)
-  {
-    $this->outputPath = $outputPath;
-  }
-  public function getOutputPath()
-  {
-    return $this->outputPath;
-  }
-  public function setPredictionCount($predictionCount)
-  {
-    $this->predictionCount = $predictionCount;
-  }
-  public function getPredictionCount()
-  {
-    return $this->predictionCount;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudMachineLearningEngine/GoogleCloudMlV1SetDefaultVersionRequest.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudMachineLearningEngine/GoogleCloudMlV1SetDefaultVersionRequest.php
deleted file mode 100644
index cc51eec8..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudMachineLearningEngine/GoogleCloudMlV1SetDefaultVersionRequest.php
+++ /dev/null
@@ -1,20 +0,0 @@
-args = $args;
-  }
-  public function getArgs()
-  {
-    return $this->args;
-  }
-  public function setHyperparameters(Google_Service_CloudMachineLearningEngine_GoogleCloudMlV1HyperparameterSpec $hyperparameters)
-  {
-    $this->hyperparameters = $hyperparameters;
-  }
-  public function getHyperparameters()
-  {
-    return $this->hyperparameters;
-  }
-  public function setJobDir($jobDir)
-  {
-    $this->jobDir = $jobDir;
-  }
-  public function getJobDir()
-  {
-    return $this->jobDir;
-  }
-  public function setMasterType($masterType)
-  {
-    $this->masterType = $masterType;
-  }
-  public function getMasterType()
-  {
-    return $this->masterType;
-  }
-  public function setPackageUris($packageUris)
-  {
-    $this->packageUris = $packageUris;
-  }
-  public function getPackageUris()
-  {
-    return $this->packageUris;
-  }
-  public function setParameterServerCount($parameterServerCount)
-  {
-    $this->parameterServerCount = $parameterServerCount;
-  }
-  public function getParameterServerCount()
-  {
-    return $this->parameterServerCount;
-  }
-  public function setParameterServerType($parameterServerType)
-  {
-    $this->parameterServerType = $parameterServerType;
-  }
-  public function getParameterServerType()
-  {
-    return $this->parameterServerType;
-  }
-  public function setPythonModule($pythonModule)
-  {
-    $this->pythonModule = $pythonModule;
-  }
-  public function getPythonModule()
-  {
-    return $this->pythonModule;
-  }
-  public function setRegion($region)
-  {
-    $this->region = $region;
-  }
-  public function getRegion()
-  {
-    return $this->region;
-  }
-  public function setRuntimeVersion($runtimeVersion)
-  {
-    $this->runtimeVersion = $runtimeVersion;
-  }
-  public function getRuntimeVersion()
-  {
-    return $this->runtimeVersion;
-  }
-  public function setScaleTier($scaleTier)
-  {
-    $this->scaleTier = $scaleTier;
-  }
-  public function getScaleTier()
-  {
-    return $this->scaleTier;
-  }
-  public function setWorkerCount($workerCount)
-  {
-    $this->workerCount = $workerCount;
-  }
-  public function getWorkerCount()
-  {
-    return $this->workerCount;
-  }
-  public function setWorkerType($workerType)
-  {
-    $this->workerType = $workerType;
-  }
-  public function getWorkerType()
-  {
-    return $this->workerType;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudMachineLearningEngine/GoogleCloudMlV1TrainingOutput.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudMachineLearningEngine/GoogleCloudMlV1TrainingOutput.php
deleted file mode 100644
index 1e67d343..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudMachineLearningEngine/GoogleCloudMlV1TrainingOutput.php
+++ /dev/null
@@ -1,59 +0,0 @@
-completedTrialCount = $completedTrialCount;
-  }
-  public function getCompletedTrialCount()
-  {
-    return $this->completedTrialCount;
-  }
-  public function setConsumedMLUnits($consumedMLUnits)
-  {
-    $this->consumedMLUnits = $consumedMLUnits;
-  }
-  public function getConsumedMLUnits()
-  {
-    return $this->consumedMLUnits;
-  }
-  public function setIsHyperparameterTuningJob($isHyperparameterTuningJob)
-  {
-    $this->isHyperparameterTuningJob = $isHyperparameterTuningJob;
-  }
-  public function getIsHyperparameterTuningJob()
-  {
-    return $this->isHyperparameterTuningJob;
-  }
-  public function setTrials($trials)
-  {
-    $this->trials = $trials;
-  }
-  public function getTrials()
-  {
-    return $this->trials;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudMachineLearningEngine/GoogleCloudMlV1Version.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudMachineLearningEngine/GoogleCloudMlV1Version.php
deleted file mode 100644
index 426b7cbe..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudMachineLearningEngine/GoogleCloudMlV1Version.php
+++ /dev/null
@@ -1,94 +0,0 @@
-createTime = $createTime;
-  }
-  public function getCreateTime()
-  {
-    return $this->createTime;
-  }
-  public function setDeploymentUri($deploymentUri)
-  {
-    $this->deploymentUri = $deploymentUri;
-  }
-  public function getDeploymentUri()
-  {
-    return $this->deploymentUri;
-  }
-  public function setDescription($description)
-  {
-    $this->description = $description;
-  }
-  public function getDescription()
-  {
-    return $this->description;
-  }
-  public function setIsDefault($isDefault)
-  {
-    $this->isDefault = $isDefault;
-  }
-  public function getIsDefault()
-  {
-    return $this->isDefault;
-  }
-  public function setLastUseTime($lastUseTime)
-  {
-    $this->lastUseTime = $lastUseTime;
-  }
-  public function getLastUseTime()
-  {
-    return $this->lastUseTime;
-  }
-  public function setManualScaling(Google_Service_CloudMachineLearningEngine_GoogleCloudMlV1ManualScaling $manualScaling)
-  {
-    $this->manualScaling = $manualScaling;
-  }
-  public function getManualScaling()
-  {
-    return $this->manualScaling;
-  }
-  public function setName($name)
-  {
-    $this->name = $name;
-  }
-  public function getName()
-  {
-    return $this->name;
-  }
-  public function setRuntimeVersion($runtimeVersion)
-  {
-    $this->runtimeVersion = $runtimeVersion;
-  }
-  public function getRuntimeVersion()
-  {
-    return $this->runtimeVersion;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudMachineLearningEngine/GoogleCloudMlV1beta1ManualScaling.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudMachineLearningEngine/GoogleCloudMlV1beta1ManualScaling.php
deleted file mode 100644
index 5d0677a7..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudMachineLearningEngine/GoogleCloudMlV1beta1ManualScaling.php
+++ /dev/null
@@ -1,30 +0,0 @@
-nodes = $nodes;
-  }
-  public function getNodes()
-  {
-    return $this->nodes;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudMachineLearningEngine/GoogleCloudMlV1beta1OperationMetadata.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudMachineLearningEngine/GoogleCloudMlV1beta1OperationMetadata.php
deleted file mode 100644
index 8b5c5254..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudMachineLearningEngine/GoogleCloudMlV1beta1OperationMetadata.php
+++ /dev/null
@@ -1,85 +0,0 @@
-createTime = $createTime;
-  }
-  public function getCreateTime()
-  {
-    return $this->createTime;
-  }
-  public function setEndTime($endTime)
-  {
-    $this->endTime = $endTime;
-  }
-  public function getEndTime()
-  {
-    return $this->endTime;
-  }
-  public function setIsCancellationRequested($isCancellationRequested)
-  {
-    $this->isCancellationRequested = $isCancellationRequested;
-  }
-  public function getIsCancellationRequested()
-  {
-    return $this->isCancellationRequested;
-  }
-  public function setModelName($modelName)
-  {
-    $this->modelName = $modelName;
-  }
-  public function getModelName()
-  {
-    return $this->modelName;
-  }
-  public function setOperationType($operationType)
-  {
-    $this->operationType = $operationType;
-  }
-  public function getOperationType()
-  {
-    return $this->operationType;
-  }
-  public function setStartTime($startTime)
-  {
-    $this->startTime = $startTime;
-  }
-  public function getStartTime()
-  {
-    return $this->startTime;
-  }
-  public function setVersion(Google_Service_CloudMachineLearningEngine_GoogleCloudMlV1beta1Version $version)
-  {
-    $this->version = $version;
-  }
-  public function getVersion()
-  {
-    return $this->version;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudMachineLearningEngine/GoogleCloudMlV1beta1Version.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudMachineLearningEngine/GoogleCloudMlV1beta1Version.php
deleted file mode 100644
index 642dff3d..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudMachineLearningEngine/GoogleCloudMlV1beta1Version.php
+++ /dev/null
@@ -1,94 +0,0 @@
-createTime = $createTime;
-  }
-  public function getCreateTime()
-  {
-    return $this->createTime;
-  }
-  public function setDeploymentUri($deploymentUri)
-  {
-    $this->deploymentUri = $deploymentUri;
-  }
-  public function getDeploymentUri()
-  {
-    return $this->deploymentUri;
-  }
-  public function setDescription($description)
-  {
-    $this->description = $description;
-  }
-  public function getDescription()
-  {
-    return $this->description;
-  }
-  public function setIsDefault($isDefault)
-  {
-    $this->isDefault = $isDefault;
-  }
-  public function getIsDefault()
-  {
-    return $this->isDefault;
-  }
-  public function setLastUseTime($lastUseTime)
-  {
-    $this->lastUseTime = $lastUseTime;
-  }
-  public function getLastUseTime()
-  {
-    return $this->lastUseTime;
-  }
-  public function setManualScaling(Google_Service_CloudMachineLearningEngine_GoogleCloudMlV1beta1ManualScaling $manualScaling)
-  {
-    $this->manualScaling = $manualScaling;
-  }
-  public function getManualScaling()
-  {
-    return $this->manualScaling;
-  }
-  public function setName($name)
-  {
-    $this->name = $name;
-  }
-  public function getName()
-  {
-    return $this->name;
-  }
-  public function setRuntimeVersion($runtimeVersion)
-  {
-    $this->runtimeVersion = $runtimeVersion;
-  }
-  public function getRuntimeVersion()
-  {
-    return $this->runtimeVersion;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudMachineLearningEngine/GoogleLongrunningListOperationsResponse.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudMachineLearningEngine/GoogleLongrunningListOperationsResponse.php
deleted file mode 100644
index 9ee43c8d..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudMachineLearningEngine/GoogleLongrunningListOperationsResponse.php
+++ /dev/null
@@ -1,41 +0,0 @@
-nextPageToken = $nextPageToken;
-  }
-  public function getNextPageToken()
-  {
-    return $this->nextPageToken;
-  }
-  public function setOperations($operations)
-  {
-    $this->operations = $operations;
-  }
-  public function getOperations()
-  {
-    return $this->operations;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudMachineLearningEngine/GoogleLongrunningOperation.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudMachineLearningEngine/GoogleLongrunningOperation.php
deleted file mode 100644
index 8438a2ba..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudMachineLearningEngine/GoogleLongrunningOperation.php
+++ /dev/null
@@ -1,67 +0,0 @@
-done = $done;
-  }
-  public function getDone()
-  {
-    return $this->done;
-  }
-  public function setError(Google_Service_CloudMachineLearningEngine_GoogleRpcStatus $error)
-  {
-    $this->error = $error;
-  }
-  public function getError()
-  {
-    return $this->error;
-  }
-  public function setMetadata($metadata)
-  {
-    $this->metadata = $metadata;
-  }
-  public function getMetadata()
-  {
-    return $this->metadata;
-  }
-  public function setName($name)
-  {
-    $this->name = $name;
-  }
-  public function getName()
-  {
-    return $this->name;
-  }
-  public function setResponse($response)
-  {
-    $this->response = $response;
-  }
-  public function getResponse()
-  {
-    return $this->response;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudMachineLearningEngine/GoogleProtobufEmpty.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudMachineLearningEngine/GoogleProtobufEmpty.php
deleted file mode 100644
index cb33b8d6..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudMachineLearningEngine/GoogleProtobufEmpty.php
+++ /dev/null
@@ -1,20 +0,0 @@
-code = $code;
-  }
-  public function getCode()
-  {
-    return $this->code;
-  }
-  public function setDetails($details)
-  {
-    $this->details = $details;
-  }
-  public function getDetails()
-  {
-    return $this->details;
-  }
-  public function setMessage($message)
-  {
-    $this->message = $message;
-  }
-  public function getMessage()
-  {
-    return $this->message;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudMachineLearningEngine/Resource/Projects.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudMachineLearningEngine/Resource/Projects.php
deleted file mode 100644
index fbda629d..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudMachineLearningEngine/Resource/Projects.php
+++ /dev/null
@@ -1,64 +0,0 @@
-
- *   $mlService = new Google_Service_CloudMachineLearningEngine(...);
- *   $projects = $mlService->projects;
- *  
- */
-class Google_Service_CloudMachineLearningEngine_Resource_Projects extends Google_Service_Resource
-{
-  /**
-   * Get the service account information associated with your project. You need
-   * this information in order to grant the service account persmissions for the
-   * Google Cloud Storage location where you put your model training code for
-   * training the model with Google Cloud Machine Learning. (projects.getConfig)
-   *
-   * @param string $name Required. The project name.
-   *
-   * Authorization: requires `Viewer` role on the specified project.
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_CloudMachineLearningEngine_GoogleCloudMlV1GetConfigResponse
-   */
-  public function getConfig($name, $optParams = array())
-  {
-    $params = array('name' => $name);
-    $params = array_merge($params, $optParams);
-    return $this->call('getConfig', array($params), "Google_Service_CloudMachineLearningEngine_GoogleCloudMlV1GetConfigResponse");
-  }
-  /**
-   * Performs prediction on the data in the request.
-   *
-   * **** REMOVE FROM GENERATED DOCUMENTATION (projects.predict)
-   *
-   * @param string $name Required. The resource name of a model or a version.
-   *
-   * Authorization: requires `Viewer` role on the parent project.
-   * @param Google_Service_CloudMachineLearningEngine_GoogleCloudMlV1PredictRequest $postBody
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_CloudMachineLearningEngine_GoogleApiHttpBody
-   */
-  public function predict($name, Google_Service_CloudMachineLearningEngine_GoogleCloudMlV1PredictRequest $postBody, $optParams = array())
-  {
-    $params = array('name' => $name, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('predict', array($params), "Google_Service_CloudMachineLearningEngine_GoogleApiHttpBody");
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudMachineLearningEngine/Resource/ProjectsJobs.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudMachineLearningEngine/Resource/ProjectsJobs.php
deleted file mode 100644
index ced6a517..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudMachineLearningEngine/Resource/ProjectsJobs.php
+++ /dev/null
@@ -1,103 +0,0 @@
-
- *   $mlService = new Google_Service_CloudMachineLearningEngine(...);
- *   $jobs = $mlService->jobs;
- *  
- */
-class Google_Service_CloudMachineLearningEngine_Resource_ProjectsJobs extends Google_Service_Resource
-{
-  /**
-   * Cancels a running job. (jobs.cancel)
-   *
-   * @param string $name Required. The name of the job to cancel.
-   *
-   * Authorization: requires `Editor` role on the parent project.
-   * @param Google_Service_CloudMachineLearningEngine_GoogleCloudMlV1CancelJobRequest $postBody
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_CloudMachineLearningEngine_GoogleProtobufEmpty
-   */
-  public function cancel($name, Google_Service_CloudMachineLearningEngine_GoogleCloudMlV1CancelJobRequest $postBody, $optParams = array())
-  {
-    $params = array('name' => $name, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('cancel', array($params), "Google_Service_CloudMachineLearningEngine_GoogleProtobufEmpty");
-  }
-  /**
-   * Creates a training or a batch prediction job. (jobs.create)
-   *
-   * @param string $parent Required. The project name.
-   *
-   * Authorization: requires `Editor` role on the specified project.
-   * @param Google_Service_CloudMachineLearningEngine_GoogleCloudMlV1Job $postBody
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_CloudMachineLearningEngine_GoogleCloudMlV1Job
-   */
-  public function create($parent, Google_Service_CloudMachineLearningEngine_GoogleCloudMlV1Job $postBody, $optParams = array())
-  {
-    $params = array('parent' => $parent, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('create', array($params), "Google_Service_CloudMachineLearningEngine_GoogleCloudMlV1Job");
-  }
-  /**
-   * Describes a job. (jobs.get)
-   *
-   * @param string $name Required. The name of the job to get the description of.
-   *
-   * Authorization: requires `Viewer` role on the parent project.
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_CloudMachineLearningEngine_GoogleCloudMlV1Job
-   */
-  public function get($name, $optParams = array())
-  {
-    $params = array('name' => $name);
-    $params = array_merge($params, $optParams);
-    return $this->call('get', array($params), "Google_Service_CloudMachineLearningEngine_GoogleCloudMlV1Job");
-  }
-  /**
-   * Lists the jobs in the project. (jobs.listProjectsJobs)
-   *
-   * @param string $parent Required. The name of the project for which to list
-   * jobs.
-   *
-   * Authorization: requires `Viewer` role on the specified project.
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param string filter Optional. Specifies the subset of jobs to retrieve.
-   * @opt_param string pageToken Optional. A page token to request the next page
-   * of results.
-   *
-   * You get the token from the `next_page_token` field of the response from the
-   * previous call.
-   * @opt_param int pageSize Optional. The number of jobs to retrieve per "page"
-   * of results. If there are more remaining results than this number, the
-   * response message will contain a valid value in the `next_page_token` field.
-   *
-   * The default value is 20, and the maximum page size is 100.
-   * @return Google_Service_CloudMachineLearningEngine_GoogleCloudMlV1ListJobsResponse
-   */
-  public function listProjectsJobs($parent, $optParams = array())
-  {
-    $params = array('parent' => $parent);
-    $params = array_merge($params, $optParams);
-    return $this->call('list', array($params), "Google_Service_CloudMachineLearningEngine_GoogleCloudMlV1ListJobsResponse");
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudMachineLearningEngine/Resource/ProjectsModels.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudMachineLearningEngine/Resource/ProjectsModels.php
deleted file mode 100644
index 96a165c4..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudMachineLearningEngine/Resource/ProjectsModels.php
+++ /dev/null
@@ -1,114 +0,0 @@
-
- *   $mlService = new Google_Service_CloudMachineLearningEngine(...);
- *   $models = $mlService->models;
- *  
- */
-class Google_Service_CloudMachineLearningEngine_Resource_ProjectsModels extends Google_Service_Resource
-{
-  /**
-   * Creates a model which will later contain one or more versions.
-   *
-   * You must add at least one version before you can request predictions from the
-   * model. Add versions by calling [projects.models.versions.create](/ml/referenc
-   * e/rest/v1/projects.models.versions/create). (models.create)
-   *
-   * @param string $parent Required. The project name.
-   *
-   * Authorization: requires `Editor` role on the specified project.
-   * @param Google_Service_CloudMachineLearningEngine_GoogleCloudMlV1Model $postBody
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_CloudMachineLearningEngine_GoogleCloudMlV1Model
-   */
-  public function create($parent, Google_Service_CloudMachineLearningEngine_GoogleCloudMlV1Model $postBody, $optParams = array())
-  {
-    $params = array('parent' => $parent, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('create', array($params), "Google_Service_CloudMachineLearningEngine_GoogleCloudMlV1Model");
-  }
-  /**
-   * Deletes a model.
-   *
-   * You can only delete a model if there are no versions in it. You can delete
-   * versions by calling [projects.models.versions.delete](/ml/reference/rest/v1/p
-   * rojects.models.versions/delete). (models.delete)
-   *
-   * @param string $name Required. The name of the model.
-   *
-   * Authorization: requires `Editor` role on the parent project.
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_CloudMachineLearningEngine_GoogleLongrunningOperation
-   */
-  public function delete($name, $optParams = array())
-  {
-    $params = array('name' => $name);
-    $params = array_merge($params, $optParams);
-    return $this->call('delete', array($params), "Google_Service_CloudMachineLearningEngine_GoogleLongrunningOperation");
-  }
-  /**
-   * Gets information about a model, including its name, the description (if set),
-   * and the default version (if at least one version of the model has been
-   * deployed). (models.get)
-   *
-   * @param string $name Required. The name of the model.
-   *
-   * Authorization: requires `Viewer` role on the parent project.
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_CloudMachineLearningEngine_GoogleCloudMlV1Model
-   */
-  public function get($name, $optParams = array())
-  {
-    $params = array('name' => $name);
-    $params = array_merge($params, $optParams);
-    return $this->call('get', array($params), "Google_Service_CloudMachineLearningEngine_GoogleCloudMlV1Model");
-  }
-  /**
-   * Lists the models in a project.
-   *
-   * Each project can contain multiple models, and each model can have multiple
-   * versions. (models.listProjectsModels)
-   *
-   * @param string $parent Required. The name of the project whose models are to
-   * be listed.
-   *
-   * Authorization: requires `Viewer` role on the specified project.
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param string pageToken Optional. A page token to request the next page
-   * of results.
-   *
-   * You get the token from the `next_page_token` field of the response from the
-   * previous call.
-   * @opt_param int pageSize Optional. The number of models to retrieve per "page"
-   * of results. If there are more remaining results than this number, the
-   * response message will contain a valid value in the `next_page_token` field.
-   *
-   * The default value is 20, and the maximum page size is 100.
-   * @return Google_Service_CloudMachineLearningEngine_GoogleCloudMlV1ListModelsResponse
-   */
-  public function listProjectsModels($parent, $optParams = array())
-  {
-    $params = array('parent' => $parent);
-    $params = array_merge($params, $optParams);
-    return $this->call('list', array($params), "Google_Service_CloudMachineLearningEngine_GoogleCloudMlV1ListModelsResponse");
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudMachineLearningEngine/Resource/ProjectsModelsVersions.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudMachineLearningEngine/Resource/ProjectsModelsVersions.php
deleted file mode 100644
index 030482b7..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudMachineLearningEngine/Resource/ProjectsModelsVersions.php
+++ /dev/null
@@ -1,152 +0,0 @@
-
- *   $mlService = new Google_Service_CloudMachineLearningEngine(...);
- *   $versions = $mlService->versions;
- *  
- */
-class Google_Service_CloudMachineLearningEngine_Resource_ProjectsModelsVersions extends Google_Service_Resource
-{
-  /**
-   * Creates a new version of a model from a trained TensorFlow model.
-   *
-   * If the version created in the cloud by this call is the first deployed
-   * version of the specified model, it will be made the default version of the
-   * model. When you add a version to a model that already has one or more
-   * versions, the default version does not automatically change. If you want a
-   * new version to be the default, you must call [projects.models.versions.setDef
-   * ault](/ml/reference/rest/v1/projects.models.versions/setDefault).
-   * (versions.create)
-   *
-   * @param string $parent Required. The name of the model.
-   *
-   * Authorization: requires `Editor` role on the parent project.
-   * @param Google_Service_CloudMachineLearningEngine_GoogleCloudMlV1Version $postBody
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_CloudMachineLearningEngine_GoogleLongrunningOperation
-   */
-  public function create($parent, Google_Service_CloudMachineLearningEngine_GoogleCloudMlV1Version $postBody, $optParams = array())
-  {
-    $params = array('parent' => $parent, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('create', array($params), "Google_Service_CloudMachineLearningEngine_GoogleLongrunningOperation");
-  }
-  /**
-   * Deletes a model version.
-   *
-   * Each model can have multiple versions deployed and in use at any given time.
-   * Use this method to remove a single version.
-   *
-   * Note: You cannot delete the version that is set as the default version of the
-   * model unless it is the only remaining version. (versions.delete)
-   *
-   * @param string $name Required. The name of the version. You can get the names
-   * of all the versions of a model by calling [projects.models.versions.list](/ml
-   * /reference/rest/v1/projects.models.versions/list).
-   *
-   * Authorization: requires `Editor` role on the parent project.
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_CloudMachineLearningEngine_GoogleLongrunningOperation
-   */
-  public function delete($name, $optParams = array())
-  {
-    $params = array('name' => $name);
-    $params = array_merge($params, $optParams);
-    return $this->call('delete', array($params), "Google_Service_CloudMachineLearningEngine_GoogleLongrunningOperation");
-  }
-  /**
-   * Gets information about a model version.
-   *
-   * Models can have multiple versions. You can call [projects.models.versions.lis
-   * t](/ml/reference/rest/v1/projects.models.versions/list) to get the same
-   * information that this method returns for all of the versions of a model.
-   * (versions.get)
-   *
-   * @param string $name Required. The name of the version.
-   *
-   * Authorization: requires `Viewer` role on the parent project.
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_CloudMachineLearningEngine_GoogleCloudMlV1Version
-   */
-  public function get($name, $optParams = array())
-  {
-    $params = array('name' => $name);
-    $params = array_merge($params, $optParams);
-    return $this->call('get', array($params), "Google_Service_CloudMachineLearningEngine_GoogleCloudMlV1Version");
-  }
-  /**
-   * Gets basic information about all the versions of a model.
-   *
-   * If you expect that a model has a lot of versions, or if you need to handle
-   * only a limited number of results at a time, you can request that the list be
-   * retrieved in batches (called pages): (versions.listProjectsModelsVersions)
-   *
-   * @param string $parent Required. The name of the model for which to list the
-   * version.
-   *
-   * Authorization: requires `Viewer` role on the parent project.
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param string pageToken Optional. A page token to request the next page
-   * of results.
-   *
-   * You get the token from the `next_page_token` field of the response from the
-   * previous call.
-   * @opt_param int pageSize Optional. The number of versions to retrieve per
-   * "page" of results. If there are more remaining results than this number, the
-   * response message will contain a valid value in the `next_page_token` field.
-   *
-   * The default value is 20, and the maximum page size is 100.
-   * @return Google_Service_CloudMachineLearningEngine_GoogleCloudMlV1ListVersionsResponse
-   */
-  public function listProjectsModelsVersions($parent, $optParams = array())
-  {
-    $params = array('parent' => $parent);
-    $params = array_merge($params, $optParams);
-    return $this->call('list', array($params), "Google_Service_CloudMachineLearningEngine_GoogleCloudMlV1ListVersionsResponse");
-  }
-  /**
-   * Designates a version to be the default for the model.
-   *
-   * The default version is used for prediction requests made against the model
-   * that don't specify a version.
-   *
-   * The first version to be created for a model is automatically set as the
-   * default. You must make any subsequent changes to the default version setting
-   * manually using this method. (versions.setDefault)
-   *
-   * @param string $name Required. The name of the version to make the default for
-   * the model. You can get the names of all the versions of a model by calling [p
-   * rojects.models.versions.list](/ml/reference/rest/v1/projects.models.versions/
-   * list).
-   *
-   * Authorization: requires `Editor` role on the parent project.
-   * @param Google_Service_CloudMachineLearningEngine_GoogleCloudMlV1SetDefaultVersionRequest $postBody
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_CloudMachineLearningEngine_GoogleCloudMlV1Version
-   */
-  public function setDefault($name, Google_Service_CloudMachineLearningEngine_GoogleCloudMlV1SetDefaultVersionRequest $postBody, $optParams = array())
-  {
-    $params = array('name' => $name, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('setDefault', array($params), "Google_Service_CloudMachineLearningEngine_GoogleCloudMlV1Version");
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudMachineLearningEngine/Resource/ProjectsOperations.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudMachineLearningEngine/Resource/ProjectsOperations.php
deleted file mode 100644
index d2a577c3..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudMachineLearningEngine/Resource/ProjectsOperations.php
+++ /dev/null
@@ -1,102 +0,0 @@
-
- *   $mlService = new Google_Service_CloudMachineLearningEngine(...);
- *   $operations = $mlService->operations;
- *  
- */
-class Google_Service_CloudMachineLearningEngine_Resource_ProjectsOperations extends Google_Service_Resource
-{
-  /**
-   * Starts asynchronous cancellation on a long-running operation.  The server
-   * makes a best effort to cancel the operation, but success is not guaranteed.
-   * If the server doesn't support this method, it returns
-   * `google.rpc.Code.UNIMPLEMENTED`.  Clients can use Operations.GetOperation or
-   * other methods to check whether the cancellation succeeded or whether the
-   * operation completed despite cancellation. On successful cancellation, the
-   * operation is not deleted; instead, it becomes an operation with an
-   * Operation.error value with a google.rpc.Status.code of 1, corresponding to
-   * `Code.CANCELLED`. (operations.cancel)
-   *
-   * @param string $name The name of the operation resource to be cancelled.
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_CloudMachineLearningEngine_GoogleProtobufEmpty
-   */
-  public function cancel($name, $optParams = array())
-  {
-    $params = array('name' => $name);
-    $params = array_merge($params, $optParams);
-    return $this->call('cancel', array($params), "Google_Service_CloudMachineLearningEngine_GoogleProtobufEmpty");
-  }
-  /**
-   * Deletes a long-running operation. This method indicates that the client is no
-   * longer interested in the operation result. It does not cancel the operation.
-   * If the server doesn't support this method, it returns
-   * `google.rpc.Code.UNIMPLEMENTED`. (operations.delete)
-   *
-   * @param string $name The name of the operation resource to be deleted.
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_CloudMachineLearningEngine_GoogleProtobufEmpty
-   */
-  public function delete($name, $optParams = array())
-  {
-    $params = array('name' => $name);
-    $params = array_merge($params, $optParams);
-    return $this->call('delete', array($params), "Google_Service_CloudMachineLearningEngine_GoogleProtobufEmpty");
-  }
-  /**
-   * Gets the latest state of a long-running operation.  Clients can use this
-   * method to poll the operation result at intervals as recommended by the API
-   * service. (operations.get)
-   *
-   * @param string $name The name of the operation resource.
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_CloudMachineLearningEngine_GoogleLongrunningOperation
-   */
-  public function get($name, $optParams = array())
-  {
-    $params = array('name' => $name);
-    $params = array_merge($params, $optParams);
-    return $this->call('get', array($params), "Google_Service_CloudMachineLearningEngine_GoogleLongrunningOperation");
-  }
-  /**
-   * Lists operations that match the specified filter in the request. If the
-   * server doesn't support this method, it returns `UNIMPLEMENTED`.
-   *
-   * NOTE: the `name` binding below allows API services to override the binding to
-   * use different resource name schemes, such as `users/operations`.
-   * (operations.listProjectsOperations)
-   *
-   * @param string $name The name of the operation collection.
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param string pageToken The standard list page token.
-   * @opt_param int pageSize The standard list page size.
-   * @opt_param string filter The standard list filter.
-   * @return Google_Service_CloudMachineLearningEngine_GoogleLongrunningListOperationsResponse
-   */
-  public function listProjectsOperations($name, $optParams = array())
-  {
-    $params = array('name' => $name);
-    $params = array_merge($params, $optParams);
-    return $this->call('list', array($params), "Google_Service_CloudMachineLearningEngine_GoogleLongrunningListOperationsResponse");
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudMonitoring.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudMonitoring.php
deleted file mode 100644
index 2e1560a7..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudMonitoring.php
+++ /dev/null
@@ -1,243 +0,0 @@
-
- * Accesses Google Cloud Monitoring data.

- *
- * 

- * For more information about this service, see the API
- * Documentation
- * 

- *
- * @author Google, Inc.
- */
-class Google_Service_CloudMonitoring extends Google_Service
-{
-  /** View and manage your data across Google Cloud Platform services. */
-  const CLOUD_PLATFORM =
-      "https://www.googleapis.com/auth/cloud-platform";
-  /** View and write monitoring data for all of your Google and third-party Cloud and API projects. */
-  const MONITORING =
-      "https://www.googleapis.com/auth/monitoring";
-
-  public $metricDescriptors;
-  public $timeseries;
-  public $timeseriesDescriptors;
-  
-  /**
-   * Constructs the internal representation of the CloudMonitoring service.
-   *
-   * @param Google_Client $client
-   */
-  public function __construct(Google_Client $client)
-  {
-    parent::__construct($client);
-    $this->rootUrl = 'https://www.googleapis.com/';
-    $this->servicePath = 'cloudmonitoring/v2beta2/projects/';
-    $this->version = 'v2beta2';
-    $this->serviceName = 'cloudmonitoring';
-
-    $this->metricDescriptors = new Google_Service_CloudMonitoring_Resource_MetricDescriptors(
-        $this,
-        $this->serviceName,
-        'metricDescriptors',
-        array(
-          'methods' => array(
-            'create' => array(
-              'path' => '{project}/metricDescriptors',
-              'httpMethod' => 'POST',
-              'parameters' => array(
-                'project' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'delete' => array(
-              'path' => '{project}/metricDescriptors/{metric}',
-              'httpMethod' => 'DELETE',
-              'parameters' => array(
-                'project' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'metric' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'list' => array(
-              'path' => '{project}/metricDescriptors',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'project' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'count' => array(
-                  'location' => 'query',
-                  'type' => 'integer',
-                ),
-                'pageToken' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'query' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-              ),
-            ),
-          )
-        )
-    );
-    $this->timeseries = new Google_Service_CloudMonitoring_Resource_Timeseries(
-        $this,
-        $this->serviceName,
-        'timeseries',
-        array(
-          'methods' => array(
-            'list' => array(
-              'path' => '{project}/timeseries/{metric}',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'project' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'metric' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'youngest' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'aggregator' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'count' => array(
-                  'location' => 'query',
-                  'type' => 'integer',
-                ),
-                'labels' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                  'repeated' => true,
-                ),
-                'oldest' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'pageToken' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'timespan' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'window' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-              ),
-            ),'write' => array(
-              'path' => '{project}/timeseries:write',
-              'httpMethod' => 'POST',
-              'parameters' => array(
-                'project' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),
-          )
-        )
-    );
-    $this->timeseriesDescriptors = new Google_Service_CloudMonitoring_Resource_TimeseriesDescriptors(
-        $this,
-        $this->serviceName,
-        'timeseriesDescriptors',
-        array(
-          'methods' => array(
-            'list' => array(
-              'path' => '{project}/timeseriesDescriptors/{metric}',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'project' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'metric' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'youngest' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'aggregator' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'count' => array(
-                  'location' => 'query',
-                  'type' => 'integer',
-                ),
-                'labels' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                  'repeated' => true,
-                ),
-                'oldest' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'pageToken' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'timespan' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'window' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-              ),
-            ),
-          )
-        )
-    );
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudMonitoring/DeleteMetricDescriptorResponse.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudMonitoring/DeleteMetricDescriptorResponse.php
deleted file mode 100644
index 4a7c777f..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudMonitoring/DeleteMetricDescriptorResponse.php
+++ /dev/null
@@ -1,30 +0,0 @@
-kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudMonitoring/ListMetricDescriptorsRequest.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudMonitoring/ListMetricDescriptorsRequest.php
deleted file mode 100644
index 660d96a2..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudMonitoring/ListMetricDescriptorsRequest.php
+++ /dev/null
@@ -1,30 +0,0 @@
-kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudMonitoring/ListMetricDescriptorsResponse.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudMonitoring/ListMetricDescriptorsResponse.php
deleted file mode 100644
index 0265b2ee..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudMonitoring/ListMetricDescriptorsResponse.php
+++ /dev/null
@@ -1,50 +0,0 @@
-kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setMetrics($metrics)
-  {
-    $this->metrics = $metrics;
-  }
-  public function getMetrics()
-  {
-    return $this->metrics;
-  }
-  public function setNextPageToken($nextPageToken)
-  {
-    $this->nextPageToken = $nextPageToken;
-  }
-  public function getNextPageToken()
-  {
-    return $this->nextPageToken;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudMonitoring/ListTimeseriesDescriptorsRequest.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudMonitoring/ListTimeseriesDescriptorsRequest.php
deleted file mode 100644
index df36f657..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudMonitoring/ListTimeseriesDescriptorsRequest.php
+++ /dev/null
@@ -1,30 +0,0 @@
-kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudMonitoring/ListTimeseriesDescriptorsResponse.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudMonitoring/ListTimeseriesDescriptorsResponse.php
deleted file mode 100644
index 3a7c26a3..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudMonitoring/ListTimeseriesDescriptorsResponse.php
+++ /dev/null
@@ -1,68 +0,0 @@
-kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setNextPageToken($nextPageToken)
-  {
-    $this->nextPageToken = $nextPageToken;
-  }
-  public function getNextPageToken()
-  {
-    return $this->nextPageToken;
-  }
-  public function setOldest($oldest)
-  {
-    $this->oldest = $oldest;
-  }
-  public function getOldest()
-  {
-    return $this->oldest;
-  }
-  public function setTimeseries($timeseries)
-  {
-    $this->timeseries = $timeseries;
-  }
-  public function getTimeseries()
-  {
-    return $this->timeseries;
-  }
-  public function setYoungest($youngest)
-  {
-    $this->youngest = $youngest;
-  }
-  public function getYoungest()
-  {
-    return $this->youngest;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudMonitoring/ListTimeseriesRequest.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudMonitoring/ListTimeseriesRequest.php
deleted file mode 100644
index 1d6db5a3..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudMonitoring/ListTimeseriesRequest.php
+++ /dev/null
@@ -1,30 +0,0 @@
-kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudMonitoring/ListTimeseriesResponse.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudMonitoring/ListTimeseriesResponse.php
deleted file mode 100644
index ad11b4d5..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudMonitoring/ListTimeseriesResponse.php
+++ /dev/null
@@ -1,68 +0,0 @@
-kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setNextPageToken($nextPageToken)
-  {
-    $this->nextPageToken = $nextPageToken;
-  }
-  public function getNextPageToken()
-  {
-    return $this->nextPageToken;
-  }
-  public function setOldest($oldest)
-  {
-    $this->oldest = $oldest;
-  }
-  public function getOldest()
-  {
-    return $this->oldest;
-  }
-  public function setTimeseries($timeseries)
-  {
-    $this->timeseries = $timeseries;
-  }
-  public function getTimeseries()
-  {
-    return $this->timeseries;
-  }
-  public function setYoungest($youngest)
-  {
-    $this->youngest = $youngest;
-  }
-  public function getYoungest()
-  {
-    return $this->youngest;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudMonitoring/MetricDescriptor.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudMonitoring/MetricDescriptor.php
deleted file mode 100644
index b4d47467..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudMonitoring/MetricDescriptor.php
+++ /dev/null
@@ -1,69 +0,0 @@
-description = $description;
-  }
-  public function getDescription()
-  {
-    return $this->description;
-  }
-  public function setLabels($labels)
-  {
-    $this->labels = $labels;
-  }
-  public function getLabels()
-  {
-    return $this->labels;
-  }
-  public function setName($name)
-  {
-    $this->name = $name;
-  }
-  public function getName()
-  {
-    return $this->name;
-  }
-  public function setProject($project)
-  {
-    $this->project = $project;
-  }
-  public function getProject()
-  {
-    return $this->project;
-  }
-  public function setTypeDescriptor(Google_Service_CloudMonitoring_MetricDescriptorTypeDescriptor $typeDescriptor)
-  {
-    $this->typeDescriptor = $typeDescriptor;
-  }
-  public function getTypeDescriptor()
-  {
-    return $this->typeDescriptor;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudMonitoring/MetricDescriptorLabelDescriptor.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudMonitoring/MetricDescriptorLabelDescriptor.php
deleted file mode 100644
index a480cc32..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudMonitoring/MetricDescriptorLabelDescriptor.php
+++ /dev/null
@@ -1,39 +0,0 @@
-description = $description;
-  }
-  public function getDescription()
-  {
-    return $this->description;
-  }
-  public function setKey($key)
-  {
-    $this->key = $key;
-  }
-  public function getKey()
-  {
-    return $this->key;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudMonitoring/MetricDescriptorTypeDescriptor.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudMonitoring/MetricDescriptorTypeDescriptor.php
deleted file mode 100644
index 54fffce5..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudMonitoring/MetricDescriptorTypeDescriptor.php
+++ /dev/null
@@ -1,39 +0,0 @@
-metricType = $metricType;
-  }
-  public function getMetricType()
-  {
-    return $this->metricType;
-  }
-  public function setValueType($valueType)
-  {
-    $this->valueType = $valueType;
-  }
-  public function getValueType()
-  {
-    return $this->valueType;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudMonitoring/Point.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudMonitoring/Point.php
deleted file mode 100644
index 28eb9305..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudMonitoring/Point.php
+++ /dev/null
@@ -1,85 +0,0 @@
-boolValue = $boolValue;
-  }
-  public function getBoolValue()
-  {
-    return $this->boolValue;
-  }
-  public function setDistributionValue(Google_Service_CloudMonitoring_PointDistribution $distributionValue)
-  {
-    $this->distributionValue = $distributionValue;
-  }
-  public function getDistributionValue()
-  {
-    return $this->distributionValue;
-  }
-  public function setDoubleValue($doubleValue)
-  {
-    $this->doubleValue = $doubleValue;
-  }
-  public function getDoubleValue()
-  {
-    return $this->doubleValue;
-  }
-  public function setEnd($end)
-  {
-    $this->end = $end;
-  }
-  public function getEnd()
-  {
-    return $this->end;
-  }
-  public function setInt64Value($int64Value)
-  {
-    $this->int64Value = $int64Value;
-  }
-  public function getInt64Value()
-  {
-    return $this->int64Value;
-  }
-  public function setStart($start)
-  {
-    $this->start = $start;
-  }
-  public function getStart()
-  {
-    return $this->start;
-  }
-  public function setStringValue($stringValue)
-  {
-    $this->stringValue = $stringValue;
-  }
-  public function getStringValue()
-  {
-    return $this->stringValue;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudMonitoring/PointDistribution.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudMonitoring/PointDistribution.php
deleted file mode 100644
index 7138dab0..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudMonitoring/PointDistribution.php
+++ /dev/null
@@ -1,52 +0,0 @@
-buckets = $buckets;
-  }
-  public function getBuckets()
-  {
-    return $this->buckets;
-  }
-  public function setOverflowBucket(Google_Service_CloudMonitoring_PointDistributionOverflowBucket $overflowBucket)
-  {
-    $this->overflowBucket = $overflowBucket;
-  }
-  public function getOverflowBucket()
-  {
-    return $this->overflowBucket;
-  }
-  public function setUnderflowBucket(Google_Service_CloudMonitoring_PointDistributionUnderflowBucket $underflowBucket)
-  {
-    $this->underflowBucket = $underflowBucket;
-  }
-  public function getUnderflowBucket()
-  {
-    return $this->underflowBucket;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudMonitoring/PointDistributionBucket.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudMonitoring/PointDistributionBucket.php
deleted file mode 100644
index 540148e3..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudMonitoring/PointDistributionBucket.php
+++ /dev/null
@@ -1,48 +0,0 @@
-count = $count;
-  }
-  public function getCount()
-  {
-    return $this->count;
-  }
-  public function setLowerBound($lowerBound)
-  {
-    $this->lowerBound = $lowerBound;
-  }
-  public function getLowerBound()
-  {
-    return $this->lowerBound;
-  }
-  public function setUpperBound($upperBound)
-  {
-    $this->upperBound = $upperBound;
-  }
-  public function getUpperBound()
-  {
-    return $this->upperBound;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudMonitoring/PointDistributionOverflowBucket.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudMonitoring/PointDistributionOverflowBucket.php
deleted file mode 100644
index ec933786..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudMonitoring/PointDistributionOverflowBucket.php
+++ /dev/null
@@ -1,39 +0,0 @@
-count = $count;
-  }
-  public function getCount()
-  {
-    return $this->count;
-  }
-  public function setLowerBound($lowerBound)
-  {
-    $this->lowerBound = $lowerBound;
-  }
-  public function getLowerBound()
-  {
-    return $this->lowerBound;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudMonitoring/PointDistributionUnderflowBucket.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudMonitoring/PointDistributionUnderflowBucket.php
deleted file mode 100644
index dab82c7e..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudMonitoring/PointDistributionUnderflowBucket.php
+++ /dev/null
@@ -1,39 +0,0 @@
-count = $count;
-  }
-  public function getCount()
-  {
-    return $this->count;
-  }
-  public function setUpperBound($upperBound)
-  {
-    $this->upperBound = $upperBound;
-  }
-  public function getUpperBound()
-  {
-    return $this->upperBound;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudMonitoring/Resource/MetricDescriptors.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudMonitoring/Resource/MetricDescriptors.php
deleted file mode 100644
index f4088a47..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudMonitoring/Resource/MetricDescriptors.php
+++ /dev/null
@@ -1,86 +0,0 @@
-
- *   $cloudmonitoringService = new Google_Service_CloudMonitoring(...);
- *   $metricDescriptors = $cloudmonitoringService->metricDescriptors;
- *  
- */
-class Google_Service_CloudMonitoring_Resource_MetricDescriptors extends Google_Service_Resource
-{
-  /**
-   * Create a new metric. (metricDescriptors.create)
-   *
-   * @param string $project The project id. The value can be the numeric project
-   * ID or string-based project name.
-   * @param Google_Service_CloudMonitoring_MetricDescriptor $postBody
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_CloudMonitoring_MetricDescriptor
-   */
-  public function create($project, Google_Service_CloudMonitoring_MetricDescriptor $postBody, $optParams = array())
-  {
-    $params = array('project' => $project, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('create', array($params), "Google_Service_CloudMonitoring_MetricDescriptor");
-  }
-  /**
-   * Delete an existing metric. (metricDescriptors.delete)
-   *
-   * @param string $project The project ID to which the metric belongs.
-   * @param string $metric Name of the metric.
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_CloudMonitoring_DeleteMetricDescriptorResponse
-   */
-  public function delete($project, $metric, $optParams = array())
-  {
-    $params = array('project' => $project, 'metric' => $metric);
-    $params = array_merge($params, $optParams);
-    return $this->call('delete', array($params), "Google_Service_CloudMonitoring_DeleteMetricDescriptorResponse");
-  }
-  /**
-   * List metric descriptors that match the query. If the query is not set, then
-   * all of the metric descriptors will be returned. Large responses will be
-   * paginated, use the nextPageToken returned in the response to request
-   * subsequent pages of results by setting the pageToken query parameter to the
-   * value of the nextPageToken. (metricDescriptors.listMetricDescriptors)
-   *
-   * @param string $project The project id. The value can be the numeric project
-   * ID or string-based project name.
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param int count Maximum number of metric descriptors per page. Used for
-   * pagination. If not specified, count = 100.
-   * @opt_param string pageToken The pagination token, which is used to page
-   * through large result sets. Set this value to the value of the nextPageToken
-   * to retrieve the next page of results.
-   * @opt_param string query The query used to search against existing metrics.
-   * Separate keywords with a space; the service joins all keywords with AND,
-   * meaning that all keywords must match for a metric to be returned. If this
-   * field is omitted, all metrics are returned. If an empty string is passed with
-   * this field, no metrics are returned.
-   * @return Google_Service_CloudMonitoring_ListMetricDescriptorsResponse
-   */
-  public function listMetricDescriptors($project, $optParams = array())
-  {
-    $params = array('project' => $project);
-    $params = array_merge($params, $optParams);
-    return $this->call('list', array($params), "Google_Service_CloudMonitoring_ListMetricDescriptorsResponse");
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudMonitoring/Resource/Timeseries.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudMonitoring/Resource/Timeseries.php
deleted file mode 100644
index 4a647349..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudMonitoring/Resource/Timeseries.php
+++ /dev/null
@@ -1,104 +0,0 @@
-
- *   $cloudmonitoringService = new Google_Service_CloudMonitoring(...);
- *   $timeseries = $cloudmonitoringService->timeseries;
- *  
- */
-class Google_Service_CloudMonitoring_Resource_Timeseries extends Google_Service_Resource
-{
-  /**
-   * List the data points of the time series that match the metric and labels
-   * values and that have data points in the interval. Large responses are
-   * paginated; use the nextPageToken returned in the response to request
-   * subsequent pages of results by setting the pageToken query parameter to the
-   * value of the nextPageToken. (timeseries.listTimeseries)
-   *
-   * @param string $project The project ID to which this time series belongs. The
-   * value can be the numeric project ID or string-based project name.
-   * @param string $metric Metric names are protocol-free URLs as listed in the
-   * Supported Metrics page. For example,
-   * compute.googleapis.com/instance/disk/read_ops_count.
-   * @param string $youngest End of the time interval (inclusive), which is
-   * expressed as an RFC 3339 timestamp.
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param string aggregator The aggregation function that will reduce the
-   * data points in each window to a single point. This parameter is only valid
-   * for non-cumulative metrics with a value type of INT64 or DOUBLE.
-   * @opt_param int count Maximum number of data points per page, which is used
-   * for pagination of results.
-   * @opt_param string labels A collection of labels for the matching time series,
-   * which are represented as: - key==value: key equals the value  - key=~value:
-   * key regex matches the value  - key!=value: key does not equal the value  -
-   * key!~value: key regex does not match the value  For example, to list all of
-   * the time series descriptors for the region us-central1, you could specify:
-   * label=cloud.googleapis.com%2Flocation=~us-central1.*
-   * @opt_param string oldest Start of the time interval (exclusive), which is
-   * expressed as an RFC 3339 timestamp. If neither oldest nor timespan is
-   * specified, the default time interval will be (youngest - 4 hours, youngest]
-   * @opt_param string pageToken The pagination token, which is used to page
-   * through large result sets. Set this value to the value of the nextPageToken
-   * to retrieve the next page of results.
-   * @opt_param string timespan Length of the time interval to query, which is an
-   * alternative way to declare the interval: (youngest - timespan, youngest]. The
-   * timespan and oldest parameters should not be used together. Units: - s:
-   * second  - m: minute  - h: hour  - d: day  - w: week  Examples: 2s, 3m, 4w.
-   * Only one unit is allowed, for example: 2w3d is not allowed; you should use
-   * 17d instead.
-   *
-   * If neither oldest nor timespan is specified, the default time interval will
-   * be (youngest - 4 hours, youngest].
-   * @opt_param string window The sampling window. At most one data point will be
-   * returned for each window in the requested time interval. This parameter is
-   * only valid for non-cumulative metric types. Units: - m: minute  - h: hour  -
-   * d: day  - w: week  Examples: 3m, 4w. Only one unit is allowed, for example:
-   * 2w3d is not allowed; you should use 17d instead.
-   * @return Google_Service_CloudMonitoring_ListTimeseriesResponse
-   */
-  public function listTimeseries($project, $metric, $youngest, $optParams = array())
-  {
-    $params = array('project' => $project, 'metric' => $metric, 'youngest' => $youngest);
-    $params = array_merge($params, $optParams);
-    return $this->call('list', array($params), "Google_Service_CloudMonitoring_ListTimeseriesResponse");
-  }
-  /**
-   * Put data points to one or more time series for one or more metrics. If a time
-   * series does not exist, a new time series will be created. It is not allowed
-   * to write a time series point that is older than the existing youngest point
-   * of that time series. Points that are older than the existing youngest point
-   * of that time series will be discarded silently. Therefore, users should make
-   * sure that points of a time series are written sequentially in the order of
-   * their end time. (timeseries.write)
-   *
-   * @param string $project The project ID. The value can be the numeric project
-   * ID or string-based project name.
-   * @param Google_Service_CloudMonitoring_WriteTimeseriesRequest $postBody
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_CloudMonitoring_WriteTimeseriesResponse
-   */
-  public function write($project, Google_Service_CloudMonitoring_WriteTimeseriesRequest $postBody, $optParams = array())
-  {
-    $params = array('project' => $project, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('write', array($params), "Google_Service_CloudMonitoring_WriteTimeseriesResponse");
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudMonitoring/Resource/TimeseriesDescriptors.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudMonitoring/Resource/TimeseriesDescriptors.php
deleted file mode 100644
index ff24d0a6..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudMonitoring/Resource/TimeseriesDescriptors.php
+++ /dev/null
@@ -1,83 +0,0 @@
-
- *   $cloudmonitoringService = new Google_Service_CloudMonitoring(...);
- *   $timeseriesDescriptors = $cloudmonitoringService->timeseriesDescriptors;
- *  
- */
-class Google_Service_CloudMonitoring_Resource_TimeseriesDescriptors extends Google_Service_Resource
-{
-  /**
-   * List the descriptors of the time series that match the metric and labels
-   * values and that have data points in the interval. Large responses are
-   * paginated; use the nextPageToken returned in the response to request
-   * subsequent pages of results by setting the pageToken query parameter to the
-   * value of the nextPageToken. (timeseriesDescriptors.listTimeseriesDescriptors)
-   *
-   * @param string $project The project ID to which this time series belongs. The
-   * value can be the numeric project ID or string-based project name.
-   * @param string $metric Metric names are protocol-free URLs as listed in the
-   * Supported Metrics page. For example,
-   * compute.googleapis.com/instance/disk/read_ops_count.
-   * @param string $youngest End of the time interval (inclusive), which is
-   * expressed as an RFC 3339 timestamp.
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param string aggregator The aggregation function that will reduce the
-   * data points in each window to a single point. This parameter is only valid
-   * for non-cumulative metrics with a value type of INT64 or DOUBLE.
-   * @opt_param int count Maximum number of time series descriptors per page. Used
-   * for pagination. If not specified, count = 100.
-   * @opt_param string labels A collection of labels for the matching time series,
-   * which are represented as: - key==value: key equals the value  - key=~value:
-   * key regex matches the value  - key!=value: key does not equal the value  -
-   * key!~value: key regex does not match the value  For example, to list all of
-   * the time series descriptors for the region us-central1, you could specify:
-   * label=cloud.googleapis.com%2Flocation=~us-central1.*
-   * @opt_param string oldest Start of the time interval (exclusive), which is
-   * expressed as an RFC 3339 timestamp. If neither oldest nor timespan is
-   * specified, the default time interval will be (youngest - 4 hours, youngest]
-   * @opt_param string pageToken The pagination token, which is used to page
-   * through large result sets. Set this value to the value of the nextPageToken
-   * to retrieve the next page of results.
-   * @opt_param string timespan Length of the time interval to query, which is an
-   * alternative way to declare the interval: (youngest - timespan, youngest]. The
-   * timespan and oldest parameters should not be used together. Units: - s:
-   * second  - m: minute  - h: hour  - d: day  - w: week  Examples: 2s, 3m, 4w.
-   * Only one unit is allowed, for example: 2w3d is not allowed; you should use
-   * 17d instead.
-   *
-   * If neither oldest nor timespan is specified, the default time interval will
-   * be (youngest - 4 hours, youngest].
-   * @opt_param string window The sampling window. At most one data point will be
-   * returned for each window in the requested time interval. This parameter is
-   * only valid for non-cumulative metric types. Units: - m: minute  - h: hour  -
-   * d: day  - w: week  Examples: 3m, 4w. Only one unit is allowed, for example:
-   * 2w3d is not allowed; you should use 17d instead.
-   * @return Google_Service_CloudMonitoring_ListTimeseriesDescriptorsResponse
-   */
-  public function listTimeseriesDescriptors($project, $metric, $youngest, $optParams = array())
-  {
-    $params = array('project' => $project, 'metric' => $metric, 'youngest' => $youngest);
-    $params = array_merge($params, $optParams);
-    return $this->call('list', array($params), "Google_Service_CloudMonitoring_ListTimeseriesDescriptorsResponse");
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudMonitoring/Timeseries.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudMonitoring/Timeseries.php
deleted file mode 100644
index ed77beb3..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudMonitoring/Timeseries.php
+++ /dev/null
@@ -1,42 +0,0 @@
-points = $points;
-  }
-  public function getPoints()
-  {
-    return $this->points;
-  }
-  public function setTimeseriesDesc(Google_Service_CloudMonitoring_TimeseriesDescriptor $timeseriesDesc)
-  {
-    $this->timeseriesDesc = $timeseriesDesc;
-  }
-  public function getTimeseriesDesc()
-  {
-    return $this->timeseriesDesc;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudMonitoring/TimeseriesDescriptor.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudMonitoring/TimeseriesDescriptor.php
deleted file mode 100644
index b7de3d5f..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudMonitoring/TimeseriesDescriptor.php
+++ /dev/null
@@ -1,48 +0,0 @@
-labels = $labels;
-  }
-  public function getLabels()
-  {
-    return $this->labels;
-  }
-  public function setMetric($metric)
-  {
-    $this->metric = $metric;
-  }
-  public function getMetric()
-  {
-    return $this->metric;
-  }
-  public function setProject($project)
-  {
-    $this->project = $project;
-  }
-  public function getProject()
-  {
-    return $this->project;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudMonitoring/TimeseriesDescriptorLabel.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudMonitoring/TimeseriesDescriptorLabel.php
deleted file mode 100644
index 2c46fc25..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudMonitoring/TimeseriesDescriptorLabel.php
+++ /dev/null
@@ -1,39 +0,0 @@
-key = $key;
-  }
-  public function getKey()
-  {
-    return $this->key;
-  }
-  public function setValue($value)
-  {
-    $this->value = $value;
-  }
-  public function getValue()
-  {
-    return $this->value;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudMonitoring/TimeseriesPoint.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudMonitoring/TimeseriesPoint.php
deleted file mode 100644
index b447a427..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudMonitoring/TimeseriesPoint.php
+++ /dev/null
@@ -1,41 +0,0 @@
-point = $point;
-  }
-  public function getPoint()
-  {
-    return $this->point;
-  }
-  public function setTimeseriesDesc(Google_Service_CloudMonitoring_TimeseriesDescriptor $timeseriesDesc)
-  {
-    $this->timeseriesDesc = $timeseriesDesc;
-  }
-  public function getTimeseriesDesc()
-  {
-    return $this->timeseriesDesc;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudMonitoring/WriteTimeseriesRequest.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudMonitoring/WriteTimeseriesRequest.php
deleted file mode 100644
index 18951de9..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudMonitoring/WriteTimeseriesRequest.php
+++ /dev/null
@@ -1,41 +0,0 @@
-commonLabels = $commonLabels;
-  }
-  public function getCommonLabels()
-  {
-    return $this->commonLabels;
-  }
-  public function setTimeseries($timeseries)
-  {
-    $this->timeseries = $timeseries;
-  }
-  public function getTimeseries()
-  {
-    return $this->timeseries;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudMonitoring/WriteTimeseriesResponse.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudMonitoring/WriteTimeseriesResponse.php
deleted file mode 100644
index 4d24fd34..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudMonitoring/WriteTimeseriesResponse.php
+++ /dev/null
@@ -1,30 +0,0 @@
-kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudNaturalLanguage.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudNaturalLanguage.php
deleted file mode 100644
index ac55a21b..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudNaturalLanguage.php
+++ /dev/null
@@ -1,81 +0,0 @@
-
- * Google Cloud Natural Language API provides natural language understanding
- * technologies to developers. Examples include sentiment analysis, entity
- * recognition, and text annotations.

- *
- * 

- * For more information about this service, see the API
- * Documentation
- * 

- *
- * @author Google, Inc.
- */
-class Google_Service_CloudNaturalLanguage extends Google_Service
-{
-  /** View and manage your data across Google Cloud Platform services. */
-  const CLOUD_PLATFORM =
-      "https://www.googleapis.com/auth/cloud-platform";
-
-  public $documents;
-  
-  /**
-   * Constructs the internal representation of the CloudNaturalLanguage service.
-   *
-   * @param Google_Client $client
-   */
-  public function __construct(Google_Client $client)
-  {
-    parent::__construct($client);
-    $this->rootUrl = 'https://language.googleapis.com/';
-    $this->servicePath = '';
-    $this->version = 'v1';
-    $this->serviceName = 'language';
-
-    $this->documents = new Google_Service_CloudNaturalLanguage_Resource_Documents(
-        $this,
-        $this->serviceName,
-        'documents',
-        array(
-          'methods' => array(
-            'analyzeEntities' => array(
-              'path' => 'v1/documents:analyzeEntities',
-              'httpMethod' => 'POST',
-              'parameters' => array(),
-            ),'analyzeSentiment' => array(
-              'path' => 'v1/documents:analyzeSentiment',
-              'httpMethod' => 'POST',
-              'parameters' => array(),
-            ),'analyzeSyntax' => array(
-              'path' => 'v1/documents:analyzeSyntax',
-              'httpMethod' => 'POST',
-              'parameters' => array(),
-            ),'annotateText' => array(
-              'path' => 'v1/documents:annotateText',
-              'httpMethod' => 'POST',
-              'parameters' => array(),
-            ),
-          )
-        )
-    );
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudNaturalLanguage/AnalyzeEntitiesRequest.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudNaturalLanguage/AnalyzeEntitiesRequest.php
deleted file mode 100644
index 6317ea54..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudNaturalLanguage/AnalyzeEntitiesRequest.php
+++ /dev/null
@@ -1,40 +0,0 @@
-document = $document;
-  }
-  public function getDocument()
-  {
-    return $this->document;
-  }
-  public function setEncodingType($encodingType)
-  {
-    $this->encodingType = $encodingType;
-  }
-  public function getEncodingType()
-  {
-    return $this->encodingType;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudNaturalLanguage/AnalyzeEntitiesResponse.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudNaturalLanguage/AnalyzeEntitiesResponse.php
deleted file mode 100644
index 376f1db0..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudNaturalLanguage/AnalyzeEntitiesResponse.php
+++ /dev/null
@@ -1,41 +0,0 @@
-entities = $entities;
-  }
-  public function getEntities()
-  {
-    return $this->entities;
-  }
-  public function setLanguage($language)
-  {
-    $this->language = $language;
-  }
-  public function getLanguage()
-  {
-    return $this->language;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudNaturalLanguage/AnalyzeSentimentRequest.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudNaturalLanguage/AnalyzeSentimentRequest.php
deleted file mode 100644
index 3496cda1..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudNaturalLanguage/AnalyzeSentimentRequest.php
+++ /dev/null
@@ -1,40 +0,0 @@
-document = $document;
-  }
-  public function getDocument()
-  {
-    return $this->document;
-  }
-  public function setEncodingType($encodingType)
-  {
-    $this->encodingType = $encodingType;
-  }
-  public function getEncodingType()
-  {
-    return $this->encodingType;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudNaturalLanguage/AnalyzeSentimentResponse.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudNaturalLanguage/AnalyzeSentimentResponse.php
deleted file mode 100644
index b2b4cb09..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudNaturalLanguage/AnalyzeSentimentResponse.php
+++ /dev/null
@@ -1,51 +0,0 @@
-documentSentiment = $documentSentiment;
-  }
-  public function getDocumentSentiment()
-  {
-    return $this->documentSentiment;
-  }
-  public function setLanguage($language)
-  {
-    $this->language = $language;
-  }
-  public function getLanguage()
-  {
-    return $this->language;
-  }
-  public function setSentences($sentences)
-  {
-    $this->sentences = $sentences;
-  }
-  public function getSentences()
-  {
-    return $this->sentences;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudNaturalLanguage/AnalyzeSyntaxRequest.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudNaturalLanguage/AnalyzeSyntaxRequest.php
deleted file mode 100644
index ca5a040f..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudNaturalLanguage/AnalyzeSyntaxRequest.php
+++ /dev/null
@@ -1,40 +0,0 @@
-document = $document;
-  }
-  public function getDocument()
-  {
-    return $this->document;
-  }
-  public function setEncodingType($encodingType)
-  {
-    $this->encodingType = $encodingType;
-  }
-  public function getEncodingType()
-  {
-    return $this->encodingType;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudNaturalLanguage/AnalyzeSyntaxResponse.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudNaturalLanguage/AnalyzeSyntaxResponse.php
deleted file mode 100644
index d11d2afd..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudNaturalLanguage/AnalyzeSyntaxResponse.php
+++ /dev/null
@@ -1,51 +0,0 @@
-language = $language;
-  }
-  public function getLanguage()
-  {
-    return $this->language;
-  }
-  public function setSentences($sentences)
-  {
-    $this->sentences = $sentences;
-  }
-  public function getSentences()
-  {
-    return $this->sentences;
-  }
-  public function setTokens($tokens)
-  {
-    $this->tokens = $tokens;
-  }
-  public function getTokens()
-  {
-    return $this->tokens;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudNaturalLanguage/AnnotateTextRequest.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudNaturalLanguage/AnnotateTextRequest.php
deleted file mode 100644
index eb19a0cb..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudNaturalLanguage/AnnotateTextRequest.php
+++ /dev/null
@@ -1,50 +0,0 @@
-document = $document;
-  }
-  public function getDocument()
-  {
-    return $this->document;
-  }
-  public function setEncodingType($encodingType)
-  {
-    $this->encodingType = $encodingType;
-  }
-  public function getEncodingType()
-  {
-    return $this->encodingType;
-  }
-  public function setFeatures(Google_Service_CloudNaturalLanguage_Features $features)
-  {
-    $this->features = $features;
-  }
-  public function getFeatures()
-  {
-    return $this->features;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudNaturalLanguage/AnnotateTextResponse.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudNaturalLanguage/AnnotateTextResponse.php
deleted file mode 100644
index cc64170f..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudNaturalLanguage/AnnotateTextResponse.php
+++ /dev/null
@@ -1,71 +0,0 @@
-documentSentiment = $documentSentiment;
-  }
-  public function getDocumentSentiment()
-  {
-    return $this->documentSentiment;
-  }
-  public function setEntities($entities)
-  {
-    $this->entities = $entities;
-  }
-  public function getEntities()
-  {
-    return $this->entities;
-  }
-  public function setLanguage($language)
-  {
-    $this->language = $language;
-  }
-  public function getLanguage()
-  {
-    return $this->language;
-  }
-  public function setSentences($sentences)
-  {
-    $this->sentences = $sentences;
-  }
-  public function getSentences()
-  {
-    return $this->sentences;
-  }
-  public function setTokens($tokens)
-  {
-    $this->tokens = $tokens;
-  }
-  public function getTokens()
-  {
-    return $this->tokens;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudNaturalLanguage/DependencyEdge.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudNaturalLanguage/DependencyEdge.php
deleted file mode 100644
index 017a344d..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudNaturalLanguage/DependencyEdge.php
+++ /dev/null
@@ -1,39 +0,0 @@
-headTokenIndex = $headTokenIndex;
-  }
-  public function getHeadTokenIndex()
-  {
-    return $this->headTokenIndex;
-  }
-  public function setLabel($label)
-  {
-    $this->label = $label;
-  }
-  public function getLabel()
-  {
-    return $this->label;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudNaturalLanguage/Document.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudNaturalLanguage/Document.php
deleted file mode 100644
index 327a84f7..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudNaturalLanguage/Document.php
+++ /dev/null
@@ -1,57 +0,0 @@
-content = $content;
-  }
-  public function getContent()
-  {
-    return $this->content;
-  }
-  public function setGcsContentUri($gcsContentUri)
-  {
-    $this->gcsContentUri = $gcsContentUri;
-  }
-  public function getGcsContentUri()
-  {
-    return $this->gcsContentUri;
-  }
-  public function setLanguage($language)
-  {
-    $this->language = $language;
-  }
-  public function getLanguage()
-  {
-    return $this->language;
-  }
-  public function setType($type)
-  {
-    $this->type = $type;
-  }
-  public function getType()
-  {
-    return $this->type;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudNaturalLanguage/Entity.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudNaturalLanguage/Entity.php
deleted file mode 100644
index b855e87a..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudNaturalLanguage/Entity.php
+++ /dev/null
@@ -1,68 +0,0 @@
-mentions = $mentions;
-  }
-  public function getMentions()
-  {
-    return $this->mentions;
-  }
-  public function setMetadata($metadata)
-  {
-    $this->metadata = $metadata;
-  }
-  public function getMetadata()
-  {
-    return $this->metadata;
-  }
-  public function setName($name)
-  {
-    $this->name = $name;
-  }
-  public function getName()
-  {
-    return $this->name;
-  }
-  public function setSalience($salience)
-  {
-    $this->salience = $salience;
-  }
-  public function getSalience()
-  {
-    return $this->salience;
-  }
-  public function setType($type)
-  {
-    $this->type = $type;
-  }
-  public function getType()
-  {
-    return $this->type;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudNaturalLanguage/EntityMention.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudNaturalLanguage/EntityMention.php
deleted file mode 100644
index 3675f328..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudNaturalLanguage/EntityMention.php
+++ /dev/null
@@ -1,40 +0,0 @@
-text = $text;
-  }
-  public function getText()
-  {
-    return $this->text;
-  }
-  public function setType($type)
-  {
-    $this->type = $type;
-  }
-  public function getType()
-  {
-    return $this->type;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudNaturalLanguage/Features.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudNaturalLanguage/Features.php
deleted file mode 100644
index 1d2e977d..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudNaturalLanguage/Features.php
+++ /dev/null
@@ -1,48 +0,0 @@
-extractDocumentSentiment = $extractDocumentSentiment;
-  }
-  public function getExtractDocumentSentiment()
-  {
-    return $this->extractDocumentSentiment;
-  }
-  public function setExtractEntities($extractEntities)
-  {
-    $this->extractEntities = $extractEntities;
-  }
-  public function getExtractEntities()
-  {
-    return $this->extractEntities;
-  }
-  public function setExtractSyntax($extractSyntax)
-  {
-    $this->extractSyntax = $extractSyntax;
-  }
-  public function getExtractSyntax()
-  {
-    return $this->extractSyntax;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudNaturalLanguage/PartOfSpeech.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudNaturalLanguage/PartOfSpeech.php
deleted file mode 100644
index 81123c08..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudNaturalLanguage/PartOfSpeech.php
+++ /dev/null
@@ -1,129 +0,0 @@
-aspect = $aspect;
-  }
-  public function getAspect()
-  {
-    return $this->aspect;
-  }
-  public function setCase($case)
-  {
-    $this->case = $case;
-  }
-  public function getCase()
-  {
-    return $this->case;
-  }
-  public function setForm($form)
-  {
-    $this->form = $form;
-  }
-  public function getForm()
-  {
-    return $this->form;
-  }
-  public function setGender($gender)
-  {
-    $this->gender = $gender;
-  }
-  public function getGender()
-  {
-    return $this->gender;
-  }
-  public function setMood($mood)
-  {
-    $this->mood = $mood;
-  }
-  public function getMood()
-  {
-    return $this->mood;
-  }
-  public function setNumber($number)
-  {
-    $this->number = $number;
-  }
-  public function getNumber()
-  {
-    return $this->number;
-  }
-  public function setPerson($person)
-  {
-    $this->person = $person;
-  }
-  public function getPerson()
-  {
-    return $this->person;
-  }
-  public function setProper($proper)
-  {
-    $this->proper = $proper;
-  }
-  public function getProper()
-  {
-    return $this->proper;
-  }
-  public function setReciprocity($reciprocity)
-  {
-    $this->reciprocity = $reciprocity;
-  }
-  public function getReciprocity()
-  {
-    return $this->reciprocity;
-  }
-  public function setTag($tag)
-  {
-    $this->tag = $tag;
-  }
-  public function getTag()
-  {
-    return $this->tag;
-  }
-  public function setTense($tense)
-  {
-    $this->tense = $tense;
-  }
-  public function getTense()
-  {
-    return $this->tense;
-  }
-  public function setVoice($voice)
-  {
-    $this->voice = $voice;
-  }
-  public function getVoice()
-  {
-    return $this->voice;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudNaturalLanguage/Resource/Documents.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudNaturalLanguage/Resource/Documents.php
deleted file mode 100644
index 3c051a0c..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudNaturalLanguage/Resource/Documents.php
+++ /dev/null
@@ -1,86 +0,0 @@
-
- *   $languageService = new Google_Service_CloudNaturalLanguage(...);
- *   $documents = $languageService->documents;
- *  
- */
-class Google_Service_CloudNaturalLanguage_Resource_Documents extends Google_Service_Resource
-{
-  /**
-   * Finds named entities (currently finds proper names) in the text, entity
-   * types, salience, mentions for each entity, and other properties.
-   * (documents.analyzeEntities)
-   *
-   * @param Google_Service_CloudNaturalLanguage_AnalyzeEntitiesRequest $postBody
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_CloudNaturalLanguage_AnalyzeEntitiesResponse
-   */
-  public function analyzeEntities(Google_Service_CloudNaturalLanguage_AnalyzeEntitiesRequest $postBody, $optParams = array())
-  {
-    $params = array('postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('analyzeEntities', array($params), "Google_Service_CloudNaturalLanguage_AnalyzeEntitiesResponse");
-  }
-  /**
-   * Analyzes the sentiment of the provided text. (documents.analyzeSentiment)
-   *
-   * @param Google_Service_CloudNaturalLanguage_AnalyzeSentimentRequest $postBody
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_CloudNaturalLanguage_AnalyzeSentimentResponse
-   */
-  public function analyzeSentiment(Google_Service_CloudNaturalLanguage_AnalyzeSentimentRequest $postBody, $optParams = array())
-  {
-    $params = array('postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('analyzeSentiment', array($params), "Google_Service_CloudNaturalLanguage_AnalyzeSentimentResponse");
-  }
-  /**
-   * Analyzes the syntax of the text and provides sentence boundaries and
-   * tokenization along with part of speech tags, dependency trees, and other
-   * properties. (documents.analyzeSyntax)
-   *
-   * @param Google_Service_CloudNaturalLanguage_AnalyzeSyntaxRequest $postBody
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_CloudNaturalLanguage_AnalyzeSyntaxResponse
-   */
-  public function analyzeSyntax(Google_Service_CloudNaturalLanguage_AnalyzeSyntaxRequest $postBody, $optParams = array())
-  {
-    $params = array('postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('analyzeSyntax', array($params), "Google_Service_CloudNaturalLanguage_AnalyzeSyntaxResponse");
-  }
-  /**
-   * A convenience method that provides all the features that analyzeSentiment,
-   * analyzeEntities, and analyzeSyntax provide in one call.
-   * (documents.annotateText)
-   *
-   * @param Google_Service_CloudNaturalLanguage_AnnotateTextRequest $postBody
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_CloudNaturalLanguage_AnnotateTextResponse
-   */
-  public function annotateText(Google_Service_CloudNaturalLanguage_AnnotateTextRequest $postBody, $optParams = array())
-  {
-    $params = array('postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('annotateText', array($params), "Google_Service_CloudNaturalLanguage_AnnotateTextResponse");
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudNaturalLanguage/Sentence.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudNaturalLanguage/Sentence.php
deleted file mode 100644
index e02ad371..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudNaturalLanguage/Sentence.php
+++ /dev/null
@@ -1,41 +0,0 @@
-sentiment = $sentiment;
-  }
-  public function getSentiment()
-  {
-    return $this->sentiment;
-  }
-  public function setText(Google_Service_CloudNaturalLanguage_TextSpan $text)
-  {
-    $this->text = $text;
-  }
-  public function getText()
-  {
-    return $this->text;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudNaturalLanguage/Sentiment.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudNaturalLanguage/Sentiment.php
deleted file mode 100644
index ec64f7e6..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudNaturalLanguage/Sentiment.php
+++ /dev/null
@@ -1,39 +0,0 @@
-magnitude = $magnitude;
-  }
-  public function getMagnitude()
-  {
-    return $this->magnitude;
-  }
-  public function setScore($score)
-  {
-    $this->score = $score;
-  }
-  public function getScore()
-  {
-    return $this->score;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudNaturalLanguage/Status.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudNaturalLanguage/Status.php
deleted file mode 100644
index 4e8a91c8..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudNaturalLanguage/Status.php
+++ /dev/null
@@ -1,49 +0,0 @@
-code = $code;
-  }
-  public function getCode()
-  {
-    return $this->code;
-  }
-  public function setDetails($details)
-  {
-    $this->details = $details;
-  }
-  public function getDetails()
-  {
-    return $this->details;
-  }
-  public function setMessage($message)
-  {
-    $this->message = $message;
-  }
-  public function getMessage()
-  {
-    return $this->message;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudNaturalLanguage/TextSpan.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudNaturalLanguage/TextSpan.php
deleted file mode 100644
index 5ea23c55..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudNaturalLanguage/TextSpan.php
+++ /dev/null
@@ -1,39 +0,0 @@
-beginOffset = $beginOffset;
-  }
-  public function getBeginOffset()
-  {
-    return $this->beginOffset;
-  }
-  public function setContent($content)
-  {
-    $this->content = $content;
-  }
-  public function getContent()
-  {
-    return $this->content;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudNaturalLanguage/Token.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudNaturalLanguage/Token.php
deleted file mode 100644
index 7e38024d..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudNaturalLanguage/Token.php
+++ /dev/null
@@ -1,60 +0,0 @@
-dependencyEdge = $dependencyEdge;
-  }
-  public function getDependencyEdge()
-  {
-    return $this->dependencyEdge;
-  }
-  public function setLemma($lemma)
-  {
-    $this->lemma = $lemma;
-  }
-  public function getLemma()
-  {
-    return $this->lemma;
-  }
-  public function setPartOfSpeech(Google_Service_CloudNaturalLanguage_PartOfSpeech $partOfSpeech)
-  {
-    $this->partOfSpeech = $partOfSpeech;
-  }
-  public function getPartOfSpeech()
-  {
-    return $this->partOfSpeech;
-  }
-  public function setText(Google_Service_CloudNaturalLanguage_TextSpan $text)
-  {
-    $this->text = $text;
-  }
-  public function getText()
-  {
-    return $this->text;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudNaturalLanguageAPI.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudNaturalLanguageAPI.php
deleted file mode 100644
index a1d10e14..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudNaturalLanguageAPI.php
+++ /dev/null
@@ -1,78 +0,0 @@
-
- * Google Cloud Natural Language API provides natural language understanding
- * technologies to developers. Examples include sentiment analysis, entity
- * recognition, and text annotations.

- *
- * 

- * For more information about this service, see the API
- * Documentation
- * 

- *
- * @author Google, Inc.
- */
-class Google_Service_CloudNaturalLanguageAPI extends Google_Service
-{
-  /** View and manage your data across Google Cloud Platform services. */
-  const CLOUD_PLATFORM =
-      "https://www.googleapis.com/auth/cloud-platform";
-
-  public $documents;
-  
-  /**
-   * Constructs the internal representation of the CloudNaturalLanguageAPI
-   * service.
-   *
-   * @param Google_Client $client
-   */
-  public function __construct(Google_Client $client)
-  {
-    parent::__construct($client);
-    $this->rootUrl = 'https://language.googleapis.com/';
-    $this->servicePath = '';
-    $this->version = 'v1beta1';
-    $this->serviceName = 'language';
-
-    $this->documents = new Google_Service_CloudNaturalLanguageAPI_Resource_Documents(
-        $this,
-        $this->serviceName,
-        'documents',
-        array(
-          'methods' => array(
-            'analyzeEntities' => array(
-              'path' => 'v1beta1/documents:analyzeEntities',
-              'httpMethod' => 'POST',
-              'parameters' => array(),
-            ),'analyzeSentiment' => array(
-              'path' => 'v1beta1/documents:analyzeSentiment',
-              'httpMethod' => 'POST',
-              'parameters' => array(),
-            ),'annotateText' => array(
-              'path' => 'v1beta1/documents:annotateText',
-              'httpMethod' => 'POST',
-              'parameters' => array(),
-            ),
-          )
-        )
-    );
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudNaturalLanguageAPI/AnalyzeEntitiesRequest.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudNaturalLanguageAPI/AnalyzeEntitiesRequest.php
deleted file mode 100644
index 4a018366..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudNaturalLanguageAPI/AnalyzeEntitiesRequest.php
+++ /dev/null
@@ -1,40 +0,0 @@
-document = $document;
-  }
-  public function getDocument()
-  {
-    return $this->document;
-  }
-  public function setEncodingType($encodingType)
-  {
-    $this->encodingType = $encodingType;
-  }
-  public function getEncodingType()
-  {
-    return $this->encodingType;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudNaturalLanguageAPI/AnalyzeEntitiesResponse.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudNaturalLanguageAPI/AnalyzeEntitiesResponse.php
deleted file mode 100644
index 545954f3..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudNaturalLanguageAPI/AnalyzeEntitiesResponse.php
+++ /dev/null
@@ -1,41 +0,0 @@
-entities = $entities;
-  }
-  public function getEntities()
-  {
-    return $this->entities;
-  }
-  public function setLanguage($language)
-  {
-    $this->language = $language;
-  }
-  public function getLanguage()
-  {
-    return $this->language;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudNaturalLanguageAPI/AnalyzeSentimentRequest.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudNaturalLanguageAPI/AnalyzeSentimentRequest.php
deleted file mode 100644
index f404a604..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudNaturalLanguageAPI/AnalyzeSentimentRequest.php
+++ /dev/null
@@ -1,31 +0,0 @@
-document = $document;
-  }
-  public function getDocument()
-  {
-    return $this->document;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudNaturalLanguageAPI/AnalyzeSentimentResponse.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudNaturalLanguageAPI/AnalyzeSentimentResponse.php
deleted file mode 100644
index a3baa1b8..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudNaturalLanguageAPI/AnalyzeSentimentResponse.php
+++ /dev/null
@@ -1,40 +0,0 @@
-documentSentiment = $documentSentiment;
-  }
-  public function getDocumentSentiment()
-  {
-    return $this->documentSentiment;
-  }
-  public function setLanguage($language)
-  {
-    $this->language = $language;
-  }
-  public function getLanguage()
-  {
-    return $this->language;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudNaturalLanguageAPI/AnnotateTextRequest.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudNaturalLanguageAPI/AnnotateTextRequest.php
deleted file mode 100644
index cc3e90ad..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudNaturalLanguageAPI/AnnotateTextRequest.php
+++ /dev/null
@@ -1,50 +0,0 @@
-document = $document;
-  }
-  public function getDocument()
-  {
-    return $this->document;
-  }
-  public function setEncodingType($encodingType)
-  {
-    $this->encodingType = $encodingType;
-  }
-  public function getEncodingType()
-  {
-    return $this->encodingType;
-  }
-  public function setFeatures(Google_Service_CloudNaturalLanguageAPI_Features $features)
-  {
-    $this->features = $features;
-  }
-  public function getFeatures()
-  {
-    return $this->features;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudNaturalLanguageAPI/AnnotateTextResponse.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudNaturalLanguageAPI/AnnotateTextResponse.php
deleted file mode 100644
index 4efb2962..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudNaturalLanguageAPI/AnnotateTextResponse.php
+++ /dev/null
@@ -1,71 +0,0 @@
-documentSentiment = $documentSentiment;
-  }
-  public function getDocumentSentiment()
-  {
-    return $this->documentSentiment;
-  }
-  public function setEntities($entities)
-  {
-    $this->entities = $entities;
-  }
-  public function getEntities()
-  {
-    return $this->entities;
-  }
-  public function setLanguage($language)
-  {
-    $this->language = $language;
-  }
-  public function getLanguage()
-  {
-    return $this->language;
-  }
-  public function setSentences($sentences)
-  {
-    $this->sentences = $sentences;
-  }
-  public function getSentences()
-  {
-    return $this->sentences;
-  }
-  public function setTokens($tokens)
-  {
-    $this->tokens = $tokens;
-  }
-  public function getTokens()
-  {
-    return $this->tokens;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudNaturalLanguageAPI/DependencyEdge.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudNaturalLanguageAPI/DependencyEdge.php
deleted file mode 100644
index bb243a0d..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudNaturalLanguageAPI/DependencyEdge.php
+++ /dev/null
@@ -1,39 +0,0 @@
-headTokenIndex = $headTokenIndex;
-  }
-  public function getHeadTokenIndex()
-  {
-    return $this->headTokenIndex;
-  }
-  public function setLabel($label)
-  {
-    $this->label = $label;
-  }
-  public function getLabel()
-  {
-    return $this->label;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudNaturalLanguageAPI/Document.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudNaturalLanguageAPI/Document.php
deleted file mode 100644
index e4039aee..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudNaturalLanguageAPI/Document.php
+++ /dev/null
@@ -1,57 +0,0 @@
-content = $content;
-  }
-  public function getContent()
-  {
-    return $this->content;
-  }
-  public function setGcsContentUri($gcsContentUri)
-  {
-    $this->gcsContentUri = $gcsContentUri;
-  }
-  public function getGcsContentUri()
-  {
-    return $this->gcsContentUri;
-  }
-  public function setLanguage($language)
-  {
-    $this->language = $language;
-  }
-  public function getLanguage()
-  {
-    return $this->language;
-  }
-  public function setType($type)
-  {
-    $this->type = $type;
-  }
-  public function getType()
-  {
-    return $this->type;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudNaturalLanguageAPI/Entity.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudNaturalLanguageAPI/Entity.php
deleted file mode 100644
index 2579c08f..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudNaturalLanguageAPI/Entity.php
+++ /dev/null
@@ -1,68 +0,0 @@
-mentions = $mentions;
-  }
-  public function getMentions()
-  {
-    return $this->mentions;
-  }
-  public function setMetadata($metadata)
-  {
-    $this->metadata = $metadata;
-  }
-  public function getMetadata()
-  {
-    return $this->metadata;
-  }
-  public function setName($name)
-  {
-    $this->name = $name;
-  }
-  public function getName()
-  {
-    return $this->name;
-  }
-  public function setSalience($salience)
-  {
-    $this->salience = $salience;
-  }
-  public function getSalience()
-  {
-    return $this->salience;
-  }
-  public function setType($type)
-  {
-    $this->type = $type;
-  }
-  public function getType()
-  {
-    return $this->type;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudNaturalLanguageAPI/EntityMention.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudNaturalLanguageAPI/EntityMention.php
deleted file mode 100644
index e01f0cde..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudNaturalLanguageAPI/EntityMention.php
+++ /dev/null
@@ -1,31 +0,0 @@
-text = $text;
-  }
-  public function getText()
-  {
-    return $this->text;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudNaturalLanguageAPI/Features.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudNaturalLanguageAPI/Features.php
deleted file mode 100644
index ab0a7cbb..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudNaturalLanguageAPI/Features.php
+++ /dev/null
@@ -1,48 +0,0 @@
-extractDocumentSentiment = $extractDocumentSentiment;
-  }
-  public function getExtractDocumentSentiment()
-  {
-    return $this->extractDocumentSentiment;
-  }
-  public function setExtractEntities($extractEntities)
-  {
-    $this->extractEntities = $extractEntities;
-  }
-  public function getExtractEntities()
-  {
-    return $this->extractEntities;
-  }
-  public function setExtractSyntax($extractSyntax)
-  {
-    $this->extractSyntax = $extractSyntax;
-  }
-  public function getExtractSyntax()
-  {
-    return $this->extractSyntax;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudNaturalLanguageAPI/PartOfSpeech.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudNaturalLanguageAPI/PartOfSpeech.php
deleted file mode 100644
index e2593898..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudNaturalLanguageAPI/PartOfSpeech.php
+++ /dev/null
@@ -1,30 +0,0 @@
-tag = $tag;
-  }
-  public function getTag()
-  {
-    return $this->tag;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudNaturalLanguageAPI/Resource/Documents.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudNaturalLanguageAPI/Resource/Documents.php
deleted file mode 100644
index ff2470c3..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudNaturalLanguageAPI/Resource/Documents.php
+++ /dev/null
@@ -1,71 +0,0 @@
-
- *   $languageService = new Google_Service_CloudNaturalLanguageAPI(...);
- *   $documents = $languageService->documents;
- *  
- */
-class Google_Service_CloudNaturalLanguageAPI_Resource_Documents extends Google_Service_Resource
-{
-  /**
-   * Finds named entities (currently finds proper names) in the text, entity
-   * types, salience, mentions for each entity, and other properties.
-   * (documents.analyzeEntities)
-   *
-   * @param Google_Service_CloudNaturalLanguageAPI_AnalyzeEntitiesRequest $postBody
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_CloudNaturalLanguageAPI_AnalyzeEntitiesResponse
-   */
-  public function analyzeEntities(Google_Service_CloudNaturalLanguageAPI_AnalyzeEntitiesRequest $postBody, $optParams = array())
-  {
-    $params = array('postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('analyzeEntities', array($params), "Google_Service_CloudNaturalLanguageAPI_AnalyzeEntitiesResponse");
-  }
-  /**
-   * Analyzes the sentiment of the provided text. (documents.analyzeSentiment)
-   *
-   * @param Google_Service_CloudNaturalLanguageAPI_AnalyzeSentimentRequest $postBody
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_CloudNaturalLanguageAPI_AnalyzeSentimentResponse
-   */
-  public function analyzeSentiment(Google_Service_CloudNaturalLanguageAPI_AnalyzeSentimentRequest $postBody, $optParams = array())
-  {
-    $params = array('postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('analyzeSentiment', array($params), "Google_Service_CloudNaturalLanguageAPI_AnalyzeSentimentResponse");
-  }
-  /**
-   * A convenience method that provides all the features that analyzeSentiment,
-   * analyzeEntities, and analyzeSyntax provide in one call.
-   * (documents.annotateText)
-   *
-   * @param Google_Service_CloudNaturalLanguageAPI_AnnotateTextRequest $postBody
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_CloudNaturalLanguageAPI_AnnotateTextResponse
-   */
-  public function annotateText(Google_Service_CloudNaturalLanguageAPI_AnnotateTextRequest $postBody, $optParams = array())
-  {
-    $params = array('postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('annotateText', array($params), "Google_Service_CloudNaturalLanguageAPI_AnnotateTextResponse");
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudNaturalLanguageAPI/Sentence.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudNaturalLanguageAPI/Sentence.php
deleted file mode 100644
index 20d45c41..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudNaturalLanguageAPI/Sentence.php
+++ /dev/null
@@ -1,31 +0,0 @@
-text = $text;
-  }
-  public function getText()
-  {
-    return $this->text;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudNaturalLanguageAPI/Sentiment.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudNaturalLanguageAPI/Sentiment.php
deleted file mode 100644
index 2e189c6e..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudNaturalLanguageAPI/Sentiment.php
+++ /dev/null
@@ -1,39 +0,0 @@
-magnitude = $magnitude;
-  }
-  public function getMagnitude()
-  {
-    return $this->magnitude;
-  }
-  public function setPolarity($polarity)
-  {
-    $this->polarity = $polarity;
-  }
-  public function getPolarity()
-  {
-    return $this->polarity;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudNaturalLanguageAPI/Status.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudNaturalLanguageAPI/Status.php
deleted file mode 100644
index 6d4b0942..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudNaturalLanguageAPI/Status.php
+++ /dev/null
@@ -1,49 +0,0 @@
-code = $code;
-  }
-  public function getCode()
-  {
-    return $this->code;
-  }
-  public function setDetails($details)
-  {
-    $this->details = $details;
-  }
-  public function getDetails()
-  {
-    return $this->details;
-  }
-  public function setMessage($message)
-  {
-    $this->message = $message;
-  }
-  public function getMessage()
-  {
-    return $this->message;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudNaturalLanguageAPI/TextSpan.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudNaturalLanguageAPI/TextSpan.php
deleted file mode 100644
index 560aaa78..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudNaturalLanguageAPI/TextSpan.php
+++ /dev/null
@@ -1,39 +0,0 @@
-beginOffset = $beginOffset;
-  }
-  public function getBeginOffset()
-  {
-    return $this->beginOffset;
-  }
-  public function setContent($content)
-  {
-    $this->content = $content;
-  }
-  public function getContent()
-  {
-    return $this->content;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudNaturalLanguageAPI/Token.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudNaturalLanguageAPI/Token.php
deleted file mode 100644
index 15b33b41..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudNaturalLanguageAPI/Token.php
+++ /dev/null
@@ -1,60 +0,0 @@
-dependencyEdge = $dependencyEdge;
-  }
-  public function getDependencyEdge()
-  {
-    return $this->dependencyEdge;
-  }
-  public function setLemma($lemma)
-  {
-    $this->lemma = $lemma;
-  }
-  public function getLemma()
-  {
-    return $this->lemma;
-  }
-  public function setPartOfSpeech(Google_Service_CloudNaturalLanguageAPI_PartOfSpeech $partOfSpeech)
-  {
-    $this->partOfSpeech = $partOfSpeech;
-  }
-  public function getPartOfSpeech()
-  {
-    return $this->partOfSpeech;
-  }
-  public function setText(Google_Service_CloudNaturalLanguageAPI_TextSpan $text)
-  {
-    $this->text = $text;
-  }
-  public function getText()
-  {
-    return $this->text;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudResourceManager.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudResourceManager.php
deleted file mode 100644
index 1f5d220f..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudResourceManager.php
+++ /dev/null
@@ -1,286 +0,0 @@
-
- * The Google Cloud Resource Manager API provides methods for creating, reading,
- * and updating project metadata.

- *
- * 

- * For more information about this service, see the API
- * Documentation
- * 

- *
- * @author Google, Inc.
- */
-class Google_Service_CloudResourceManager extends Google_Service
-{
-  /** View and manage your data across Google Cloud Platform services. */
-  const CLOUD_PLATFORM =
-      "https://www.googleapis.com/auth/cloud-platform";
-  /** View your data across Google Cloud Platform services. */
-  const CLOUD_PLATFORM_READ_ONLY =
-      "https://www.googleapis.com/auth/cloud-platform.read-only";
-
-  public $liens;
-  public $operations;
-  public $organizations;
-  public $projects;
-  
-  /**
-   * Constructs the internal representation of the CloudResourceManager service.
-   *
-   * @param Google_Client $client
-   */
-  public function __construct(Google_Client $client)
-  {
-    parent::__construct($client);
-    $this->rootUrl = 'https://cloudresourcemanager.googleapis.com/';
-    $this->servicePath = '';
-    $this->version = 'v1';
-    $this->serviceName = 'cloudresourcemanager';
-
-    $this->liens = new Google_Service_CloudResourceManager_Resource_Liens(
-        $this,
-        $this->serviceName,
-        'liens',
-        array(
-          'methods' => array(
-            'create' => array(
-              'path' => 'v1/liens',
-              'httpMethod' => 'POST',
-              'parameters' => array(),
-            ),'delete' => array(
-              'path' => 'v1/{+name}',
-              'httpMethod' => 'DELETE',
-              'parameters' => array(
-                'name' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'list' => array(
-              'path' => 'v1/liens',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'parent' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'pageToken' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'pageSize' => array(
-                  'location' => 'query',
-                  'type' => 'integer',
-                ),
-              ),
-            ),
-          )
-        )
-    );
-    $this->operations = new Google_Service_CloudResourceManager_Resource_Operations(
-        $this,
-        $this->serviceName,
-        'operations',
-        array(
-          'methods' => array(
-            'get' => array(
-              'path' => 'v1/{+name}',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'name' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),
-          )
-        )
-    );
-    $this->organizations = new Google_Service_CloudResourceManager_Resource_Organizations(
-        $this,
-        $this->serviceName,
-        'organizations',
-        array(
-          'methods' => array(
-            'get' => array(
-              'path' => 'v1/{+name}',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'name' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'getIamPolicy' => array(
-              'path' => 'v1/{+resource}:getIamPolicy',
-              'httpMethod' => 'POST',
-              'parameters' => array(
-                'resource' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'search' => array(
-              'path' => 'v1/organizations:search',
-              'httpMethod' => 'POST',
-              'parameters' => array(),
-            ),'setIamPolicy' => array(
-              'path' => 'v1/{+resource}:setIamPolicy',
-              'httpMethod' => 'POST',
-              'parameters' => array(
-                'resource' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'testIamPermissions' => array(
-              'path' => 'v1/{+resource}:testIamPermissions',
-              'httpMethod' => 'POST',
-              'parameters' => array(
-                'resource' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),
-          )
-        )
-    );
-    $this->projects = new Google_Service_CloudResourceManager_Resource_Projects(
-        $this,
-        $this->serviceName,
-        'projects',
-        array(
-          'methods' => array(
-            'create' => array(
-              'path' => 'v1/projects',
-              'httpMethod' => 'POST',
-              'parameters' => array(),
-            ),'delete' => array(
-              'path' => 'v1/projects/{projectId}',
-              'httpMethod' => 'DELETE',
-              'parameters' => array(
-                'projectId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'get' => array(
-              'path' => 'v1/projects/{projectId}',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'projectId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'getAncestry' => array(
-              'path' => 'v1/projects/{projectId}:getAncestry',
-              'httpMethod' => 'POST',
-              'parameters' => array(
-                'projectId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'getIamPolicy' => array(
-              'path' => 'v1/projects/{resource}:getIamPolicy',
-              'httpMethod' => 'POST',
-              'parameters' => array(
-                'resource' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'list' => array(
-              'path' => 'v1/projects',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'filter' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'pageToken' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'pageSize' => array(
-                  'location' => 'query',
-                  'type' => 'integer',
-                ),
-              ),
-            ),'setIamPolicy' => array(
-              'path' => 'v1/projects/{resource}:setIamPolicy',
-              'httpMethod' => 'POST',
-              'parameters' => array(
-                'resource' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'testIamPermissions' => array(
-              'path' => 'v1/projects/{resource}:testIamPermissions',
-              'httpMethod' => 'POST',
-              'parameters' => array(
-                'resource' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'undelete' => array(
-              'path' => 'v1/projects/{projectId}:undelete',
-              'httpMethod' => 'POST',
-              'parameters' => array(
-                'projectId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'update' => array(
-              'path' => 'v1/projects/{projectId}',
-              'httpMethod' => 'PUT',
-              'parameters' => array(
-                'projectId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),
-          )
-        )
-    );
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudResourceManager/Ancestor.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudResourceManager/Ancestor.php
deleted file mode 100644
index 044d2ba5..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudResourceManager/Ancestor.php
+++ /dev/null
@@ -1,31 +0,0 @@
-resourceId = $resourceId;
-  }
-  public function getResourceId()
-  {
-    return $this->resourceId;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudResourceManager/AuditConfig.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudResourceManager/AuditConfig.php
deleted file mode 100644
index 8e55adbb..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudResourceManager/AuditConfig.php
+++ /dev/null
@@ -1,41 +0,0 @@
-auditLogConfigs = $auditLogConfigs;
-  }
-  public function getAuditLogConfigs()
-  {
-    return $this->auditLogConfigs;
-  }
-  public function setService($service)
-  {
-    $this->service = $service;
-  }
-  public function getService()
-  {
-    return $this->service;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudResourceManager/AuditLogConfig.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudResourceManager/AuditLogConfig.php
deleted file mode 100644
index 9bd433bd..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudResourceManager/AuditLogConfig.php
+++ /dev/null
@@ -1,40 +0,0 @@
-exemptedMembers = $exemptedMembers;
-  }
-  public function getExemptedMembers()
-  {
-    return $this->exemptedMembers;
-  }
-  public function setLogType($logType)
-  {
-    $this->logType = $logType;
-  }
-  public function getLogType()
-  {
-    return $this->logType;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudResourceManager/Binding.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudResourceManager/Binding.php
deleted file mode 100644
index e08ea655..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudResourceManager/Binding.php
+++ /dev/null
@@ -1,40 +0,0 @@
-members = $members;
-  }
-  public function getMembers()
-  {
-    return $this->members;
-  }
-  public function setRole($role)
-  {
-    $this->role = $role;
-  }
-  public function getRole()
-  {
-    return $this->role;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudResourceManager/CloudresourcemanagerEmpty.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudResourceManager/CloudresourcemanagerEmpty.php
deleted file mode 100644
index f4bb9538..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudResourceManager/CloudresourcemanagerEmpty.php
+++ /dev/null
@@ -1,20 +0,0 @@
-destinationParent = $destinationParent;
-  }
-  public function getDestinationParent()
-  {
-    return $this->destinationParent;
-  }
-  public function setDisplayName($displayName)
-  {
-    $this->displayName = $displayName;
-  }
-  public function getDisplayName()
-  {
-    return $this->displayName;
-  }
-  public function setOperationType($operationType)
-  {
-    $this->operationType = $operationType;
-  }
-  public function getOperationType()
-  {
-    return $this->operationType;
-  }
-  public function setSourceParent($sourceParent)
-  {
-    $this->sourceParent = $sourceParent;
-  }
-  public function getSourceParent()
-  {
-    return $this->sourceParent;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudResourceManager/FolderOperationError.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudResourceManager/FolderOperationError.php
deleted file mode 100644
index 2a1c994d..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudResourceManager/FolderOperationError.php
+++ /dev/null
@@ -1,30 +0,0 @@
-errorMessageId = $errorMessageId;
-  }
-  public function getErrorMessageId()
-  {
-    return $this->errorMessageId;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudResourceManager/GetAncestryRequest.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudResourceManager/GetAncestryRequest.php
deleted file mode 100644
index ab9ddd03..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudResourceManager/GetAncestryRequest.php
+++ /dev/null
@@ -1,20 +0,0 @@
-ancestor = $ancestor;
-  }
-  public function getAncestor()
-  {
-    return $this->ancestor;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudResourceManager/GetIamPolicyRequest.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudResourceManager/GetIamPolicyRequest.php
deleted file mode 100644
index 2157401c..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudResourceManager/GetIamPolicyRequest.php
+++ /dev/null
@@ -1,20 +0,0 @@
-createTime = $createTime;
-  }
-  public function getCreateTime()
-  {
-    return $this->createTime;
-  }
-  public function setName($name)
-  {
-    $this->name = $name;
-  }
-  public function getName()
-  {
-    return $this->name;
-  }
-  public function setOrigin($origin)
-  {
-    $this->origin = $origin;
-  }
-  public function getOrigin()
-  {
-    return $this->origin;
-  }
-  public function setParent($parent)
-  {
-    $this->parent = $parent;
-  }
-  public function getParent()
-  {
-    return $this->parent;
-  }
-  public function setReason($reason)
-  {
-    $this->reason = $reason;
-  }
-  public function getReason()
-  {
-    return $this->reason;
-  }
-  public function setRestrictions($restrictions)
-  {
-    $this->restrictions = $restrictions;
-  }
-  public function getRestrictions()
-  {
-    return $this->restrictions;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudResourceManager/ListLiensResponse.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudResourceManager/ListLiensResponse.php
deleted file mode 100644
index 93c61cf1..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudResourceManager/ListLiensResponse.php
+++ /dev/null
@@ -1,41 +0,0 @@
-liens = $liens;
-  }
-  public function getLiens()
-  {
-    return $this->liens;
-  }
-  public function setNextPageToken($nextPageToken)
-  {
-    $this->nextPageToken = $nextPageToken;
-  }
-  public function getNextPageToken()
-  {
-    return $this->nextPageToken;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudResourceManager/ListProjectsResponse.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudResourceManager/ListProjectsResponse.php
deleted file mode 100644
index 571f22b2..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudResourceManager/ListProjectsResponse.php
+++ /dev/null
@@ -1,41 +0,0 @@
-nextPageToken = $nextPageToken;
-  }
-  public function getNextPageToken()
-  {
-    return $this->nextPageToken;
-  }
-  public function setProjects($projects)
-  {
-    $this->projects = $projects;
-  }
-  public function getProjects()
-  {
-    return $this->projects;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudResourceManager/Operation.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudResourceManager/Operation.php
deleted file mode 100644
index c86ec471..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudResourceManager/Operation.php
+++ /dev/null
@@ -1,67 +0,0 @@
-done = $done;
-  }
-  public function getDone()
-  {
-    return $this->done;
-  }
-  public function setError(Google_Service_CloudResourceManager_Status $error)
-  {
-    $this->error = $error;
-  }
-  public function getError()
-  {
-    return $this->error;
-  }
-  public function setMetadata($metadata)
-  {
-    $this->metadata = $metadata;
-  }
-  public function getMetadata()
-  {
-    return $this->metadata;
-  }
-  public function setName($name)
-  {
-    $this->name = $name;
-  }
-  public function getName()
-  {
-    return $this->name;
-  }
-  public function setResponse($response)
-  {
-    $this->response = $response;
-  }
-  public function getResponse()
-  {
-    return $this->response;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudResourceManager/Organization.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudResourceManager/Organization.php
deleted file mode 100644
index b78fc265..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudResourceManager/Organization.php
+++ /dev/null
@@ -1,67 +0,0 @@
-creationTime = $creationTime;
-  }
-  public function getCreationTime()
-  {
-    return $this->creationTime;
-  }
-  public function setDisplayName($displayName)
-  {
-    $this->displayName = $displayName;
-  }
-  public function getDisplayName()
-  {
-    return $this->displayName;
-  }
-  public function setLifecycleState($lifecycleState)
-  {
-    $this->lifecycleState = $lifecycleState;
-  }
-  public function getLifecycleState()
-  {
-    return $this->lifecycleState;
-  }
-  public function setName($name)
-  {
-    $this->name = $name;
-  }
-  public function getName()
-  {
-    return $this->name;
-  }
-  public function setOwner(Google_Service_CloudResourceManager_OrganizationOwner $owner)
-  {
-    $this->owner = $owner;
-  }
-  public function getOwner()
-  {
-    return $this->owner;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudResourceManager/OrganizationOwner.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudResourceManager/OrganizationOwner.php
deleted file mode 100644
index 45896675..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudResourceManager/OrganizationOwner.php
+++ /dev/null
@@ -1,30 +0,0 @@
-directoryCustomerId = $directoryCustomerId;
-  }
-  public function getDirectoryCustomerId()
-  {
-    return $this->directoryCustomerId;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudResourceManager/Policy.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudResourceManager/Policy.php
deleted file mode 100644
index bf55c2fc..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudResourceManager/Policy.php
+++ /dev/null
@@ -1,60 +0,0 @@
-auditConfigs = $auditConfigs;
-  }
-  public function getAuditConfigs()
-  {
-    return $this->auditConfigs;
-  }
-  public function setBindings($bindings)
-  {
-    $this->bindings = $bindings;
-  }
-  public function getBindings()
-  {
-    return $this->bindings;
-  }
-  public function setEtag($etag)
-  {
-    $this->etag = $etag;
-  }
-  public function getEtag()
-  {
-    return $this->etag;
-  }
-  public function setVersion($version)
-  {
-    $this->version = $version;
-  }
-  public function getVersion()
-  {
-    return $this->version;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudResourceManager/Project.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudResourceManager/Project.php
deleted file mode 100644
index 1756338b..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudResourceManager/Project.php
+++ /dev/null
@@ -1,85 +0,0 @@
-createTime = $createTime;
-  }
-  public function getCreateTime()
-  {
-    return $this->createTime;
-  }
-  public function setLabels($labels)
-  {
-    $this->labels = $labels;
-  }
-  public function getLabels()
-  {
-    return $this->labels;
-  }
-  public function setLifecycleState($lifecycleState)
-  {
-    $this->lifecycleState = $lifecycleState;
-  }
-  public function getLifecycleState()
-  {
-    return $this->lifecycleState;
-  }
-  public function setName($name)
-  {
-    $this->name = $name;
-  }
-  public function getName()
-  {
-    return $this->name;
-  }
-  public function setParent(Google_Service_CloudResourceManager_ResourceId $parent)
-  {
-    $this->parent = $parent;
-  }
-  public function getParent()
-  {
-    return $this->parent;
-  }
-  public function setProjectId($projectId)
-  {
-    $this->projectId = $projectId;
-  }
-  public function getProjectId()
-  {
-    return $this->projectId;
-  }
-  public function setProjectNumber($projectNumber)
-  {
-    $this->projectNumber = $projectNumber;
-  }
-  public function getProjectNumber()
-  {
-    return $this->projectNumber;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudResourceManager/ProjectCreationStatus.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudResourceManager/ProjectCreationStatus.php
deleted file mode 100644
index 5264612d..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudResourceManager/ProjectCreationStatus.php
+++ /dev/null
@@ -1,48 +0,0 @@
-createTime = $createTime;
-  }
-  public function getCreateTime()
-  {
-    return $this->createTime;
-  }
-  public function setGettable($gettable)
-  {
-    $this->gettable = $gettable;
-  }
-  public function getGettable()
-  {
-    return $this->gettable;
-  }
-  public function setReady($ready)
-  {
-    $this->ready = $ready;
-  }
-  public function getReady()
-  {
-    return $this->ready;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudResourceManager/Resource/Liens.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudResourceManager/Resource/Liens.php
deleted file mode 100644
index 69c7f435..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudResourceManager/Resource/Liens.php
+++ /dev/null
@@ -1,88 +0,0 @@
-
- *   $cloudresourcemanagerService = new Google_Service_CloudResourceManager(...);
- *   $liens = $cloudresourcemanagerService->liens;
- *  
- */
-class Google_Service_CloudResourceManager_Resource_Liens extends Google_Service_Resource
-{
-  /**
-   * Create a Lien which applies to the resource denoted by the `parent` field.
-   *
-   * Callers of this method will require permission on the `parent` resource. For
-   * example, applying to `projects/1234` requires permission
-   * `resourcemanager.projects.updateLiens`.
-   *
-   * NOTE: Some resources may limit the number of Liens which may be applied.
-   * (liens.create)
-   *
-   * @param Google_Service_CloudResourceManager_Lien $postBody
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_CloudResourceManager_Lien
-   */
-  public function create(Google_Service_CloudResourceManager_Lien $postBody, $optParams = array())
-  {
-    $params = array('postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('create', array($params), "Google_Service_CloudResourceManager_Lien");
-  }
-  /**
-   * Delete a Lien by `name`.
-   *
-   * Callers of this method will require permission on the `parent` resource. For
-   * example, a Lien with a `parent` of `projects/1234` requires permission
-   * `resourcemanager.projects.updateLiens`. (liens.delete)
-   *
-   * @param string $name The name/identifier of the Lien to delete.
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_CloudResourceManager_CloudresourcemanagerEmpty
-   */
-  public function delete($name, $optParams = array())
-  {
-    $params = array('name' => $name);
-    $params = array_merge($params, $optParams);
-    return $this->call('delete', array($params), "Google_Service_CloudResourceManager_CloudresourcemanagerEmpty");
-  }
-  /**
-   * List all Liens applied to the `parent` resource.
-   *
-   * Callers of this method will require permission on the `parent` resource. For
-   * example, a Lien with a `parent` of `projects/1234` requires permission
-   * `resourcemanager.projects.get`. (liens.listLiens)
-   *
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param string parent The name of the resource to list all attached Liens.
-   * For example, `projects/1234`.
-   * @opt_param string pageToken The `next_page_token` value returned from a
-   * previous List request, if any.
-   * @opt_param int pageSize The maximum number of items to return. This is a
-   * suggestion for the server.
-   * @return Google_Service_CloudResourceManager_ListLiensResponse
-   */
-  public function listLiens($optParams = array())
-  {
-    $params = array();
-    $params = array_merge($params, $optParams);
-    return $this->call('list', array($params), "Google_Service_CloudResourceManager_ListLiensResponse");
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudResourceManager/Resource/Operations.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudResourceManager/Resource/Operations.php
deleted file mode 100644
index 096b85b7..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudResourceManager/Resource/Operations.php
+++ /dev/null
@@ -1,43 +0,0 @@
-
- *   $cloudresourcemanagerService = new Google_Service_CloudResourceManager(...);
- *   $operations = $cloudresourcemanagerService->operations;
- *  
- */
-class Google_Service_CloudResourceManager_Resource_Operations extends Google_Service_Resource
-{
-  /**
-   * Gets the latest state of a long-running operation.  Clients can use this
-   * method to poll the operation result at intervals as recommended by the API
-   * service. (operations.get)
-   *
-   * @param string $name The name of the operation resource.
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_CloudResourceManager_Operation
-   */
-  public function get($name, $optParams = array())
-  {
-    $params = array('name' => $name);
-    $params = array_merge($params, $optParams);
-    return $this->call('get', array($params), "Google_Service_CloudResourceManager_Operation");
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudResourceManager/Resource/Organizations.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudResourceManager/Resource/Organizations.php
deleted file mode 100644
index 4e04bef5..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudResourceManager/Resource/Organizations.php
+++ /dev/null
@@ -1,114 +0,0 @@
-
- *   $cloudresourcemanagerService = new Google_Service_CloudResourceManager(...);
- *   $organizations = $cloudresourcemanagerService->organizations;
- *  
- */
-class Google_Service_CloudResourceManager_Resource_Organizations extends Google_Service_Resource
-{
-  /**
-   * Fetches an Organization resource identified by the specified resource name.
-   * (organizations.get)
-   *
-   * @param string $name The resource name of the Organization to fetch, e.g.
-   * "organizations/1234".
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_CloudResourceManager_Organization
-   */
-  public function get($name, $optParams = array())
-  {
-    $params = array('name' => $name);
-    $params = array_merge($params, $optParams);
-    return $this->call('get', array($params), "Google_Service_CloudResourceManager_Organization");
-  }
-  /**
-   * Gets the access control policy for an Organization resource. May be empty if
-   * no such policy or resource exists. The `resource` field should be the
-   * organization's resource name, e.g. "organizations/123".
-   * (organizations.getIamPolicy)
-   *
-   * @param string $resource REQUIRED: The resource for which the policy is being
-   * requested. See the operation documentation for the appropriate value for this
-   * field.
-   * @param Google_Service_CloudResourceManager_GetIamPolicyRequest $postBody
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_CloudResourceManager_Policy
-   */
-  public function getIamPolicy($resource, Google_Service_CloudResourceManager_GetIamPolicyRequest $postBody, $optParams = array())
-  {
-    $params = array('resource' => $resource, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('getIamPolicy', array($params), "Google_Service_CloudResourceManager_Policy");
-  }
-  /**
-   * Searches Organization resources that are visible to the user and satisfy the
-   * specified filter. This method returns Organizations in an unspecified order.
-   * New Organizations do not necessarily appear at the end of the results.
-   * (organizations.search)
-   *
-   * @param Google_Service_CloudResourceManager_SearchOrganizationsRequest $postBody
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_CloudResourceManager_SearchOrganizationsResponse
-   */
-  public function search(Google_Service_CloudResourceManager_SearchOrganizationsRequest $postBody, $optParams = array())
-  {
-    $params = array('postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('search', array($params), "Google_Service_CloudResourceManager_SearchOrganizationsResponse");
-  }
-  /**
-   * Sets the access control policy on an Organization resource. Replaces any
-   * existing policy. The `resource` field should be the organization's resource
-   * name, e.g. "organizations/123". (organizations.setIamPolicy)
-   *
-   * @param string $resource REQUIRED: The resource for which the policy is being
-   * specified. See the operation documentation for the appropriate value for this
-   * field.
-   * @param Google_Service_CloudResourceManager_SetIamPolicyRequest $postBody
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_CloudResourceManager_Policy
-   */
-  public function setIamPolicy($resource, Google_Service_CloudResourceManager_SetIamPolicyRequest $postBody, $optParams = array())
-  {
-    $params = array('resource' => $resource, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('setIamPolicy', array($params), "Google_Service_CloudResourceManager_Policy");
-  }
-  /**
-   * Returns permissions that a caller has on the specified Organization. The
-   * `resource` field should be the organization's resource name, e.g.
-   * "organizations/123". (organizations.testIamPermissions)
-   *
-   * @param string $resource REQUIRED: The resource for which the policy detail is
-   * being requested. See the operation documentation for the appropriate value
-   * for this field.
-   * @param Google_Service_CloudResourceManager_TestIamPermissionsRequest $postBody
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_CloudResourceManager_TestIamPermissionsResponse
-   */
-  public function testIamPermissions($resource, Google_Service_CloudResourceManager_TestIamPermissionsRequest $postBody, $optParams = array())
-  {
-    $params = array('resource' => $resource, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('testIamPermissions', array($params), "Google_Service_CloudResourceManager_TestIamPermissionsResponse");
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudResourceManager/Resource/Projects.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudResourceManager/Resource/Projects.php
deleted file mode 100644
index 5291c3d2..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudResourceManager/Resource/Projects.php
+++ /dev/null
@@ -1,286 +0,0 @@
-
- *   $cloudresourcemanagerService = new Google_Service_CloudResourceManager(...);
- *   $projects = $cloudresourcemanagerService->projects;
- *  
- */
-class Google_Service_CloudResourceManager_Resource_Projects extends Google_Service_Resource
-{
-  /**
-   * Request that a new Project be created. The result is an Operation which can
-   * be used to track the creation process. It is automatically deleted after a
-   * few hours, so there is no need to call DeleteOperation.
-   *
-   * Our SLO permits Project creation to take up to 30 seconds at the 90th
-   * percentile. As of 2016-08-29, we are observing 6 seconds 50th percentile
-   * latency. 95th percentile latency is around 11 seconds. We recommend polling
-   * at the 5th second with an exponential backoff. (projects.create)
-   *
-   * @param Google_Service_CloudResourceManager_Project $postBody
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_CloudResourceManager_Operation
-   */
-  public function create(Google_Service_CloudResourceManager_Project $postBody, $optParams = array())
-  {
-    $params = array('postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('create', array($params), "Google_Service_CloudResourceManager_Operation");
-  }
-  /**
-   * Marks the Project identified by the specified `project_id` (for example, `my-
-   * project-123`) for deletion. This method will only affect the Project if the
-   * following criteria are met:
-   *
-   * + The Project does not have a billing account associated with it. + The
-   * Project has a lifecycle state of ACTIVE.
-   *
-   * This method changes the Project's lifecycle state from ACTIVE to
-   * DELETE_REQUESTED. The deletion starts at an unspecified time, at which point
-   * the Project is no longer accessible.
-   *
-   * Until the deletion completes, you can check the lifecycle state checked by
-   * retrieving the Project with GetProject, and the Project remains visible to
-   * ListProjects. However, you cannot update the project.
-   *
-   * After the deletion completes, the Project is not retrievable by the
-   * GetProject and ListProjects methods.
-   *
-   * The caller must have modify permissions for this Project. (projects.delete)
-   *
-   * @param string $projectId The Project ID (for example, `foo-bar-123`).
-   *
-   * Required.
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_CloudResourceManager_CloudresourcemanagerEmpty
-   */
-  public function delete($projectId, $optParams = array())
-  {
-    $params = array('projectId' => $projectId);
-    $params = array_merge($params, $optParams);
-    return $this->call('delete', array($params), "Google_Service_CloudResourceManager_CloudresourcemanagerEmpty");
-  }
-  /**
-   * Retrieves the Project identified by the specified `project_id` (for example,
-   * `my-project-123`).
-   *
-   * The caller must have read permissions for this Project. (projects.get)
-   *
-   * @param string $projectId The Project ID (for example, `my-project-123`).
-   *
-   * Required.
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_CloudResourceManager_Project
-   */
-  public function get($projectId, $optParams = array())
-  {
-    $params = array('projectId' => $projectId);
-    $params = array_merge($params, $optParams);
-    return $this->call('get', array($params), "Google_Service_CloudResourceManager_Project");
-  }
-  /**
-   * Gets a list of ancestors in the resource hierarchy for the Project identified
-   * by the specified `project_id` (for example, `my-project-123`).
-   *
-   * The caller must have read permissions for this Project.
-   * (projects.getAncestry)
-   *
-   * @param string $projectId The Project ID (for example, `my-project-123`).
-   *
-   * Required.
-   * @param Google_Service_CloudResourceManager_GetAncestryRequest $postBody
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_CloudResourceManager_GetAncestryResponse
-   */
-  public function getAncestry($projectId, Google_Service_CloudResourceManager_GetAncestryRequest $postBody, $optParams = array())
-  {
-    $params = array('projectId' => $projectId, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('getAncestry', array($params), "Google_Service_CloudResourceManager_GetAncestryResponse");
-  }
-  /**
-   * Returns the IAM access control policy for the specified Project. Permission
-   * is denied if the policy or the resource does not exist.
-   * (projects.getIamPolicy)
-   *
-   * @param string $resource REQUIRED: The resource for which the policy is being
-   * requested. See the operation documentation for the appropriate value for this
-   * field.
-   * @param Google_Service_CloudResourceManager_GetIamPolicyRequest $postBody
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_CloudResourceManager_Policy
-   */
-  public function getIamPolicy($resource, Google_Service_CloudResourceManager_GetIamPolicyRequest $postBody, $optParams = array())
-  {
-    $params = array('resource' => $resource, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('getIamPolicy', array($params), "Google_Service_CloudResourceManager_Policy");
-  }
-  /**
-   * Lists Projects that are visible to the user and satisfy the specified filter.
-   * This method returns Projects in an unspecified order. New Projects do not
-   * necessarily appear at the end of the list. (projects.listProjects)
-   *
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param string filter An expression for filtering the results of the
-   * request.  Filter rules are case insensitive. The fields eligible for
-   * filtering are:
-   *
-   * + `name` + `id` + labels.key where *key* is the name of a label
-   *
-   * Some examples of using labels as filters:
-   *
-   * |Filter|Description| |------|-----------| |name:*|The project has a name.|
-   * |name:Howl|The project's name is `Howl` or `howl`.| |name:HOWL|Equivalent to
-   * above.| |NAME:howl|Equivalent to above.| |labels.color:*|The project has the
-   * label `color`.| |labels.color:red|The project's label `color` has the value
-   * `red`.| |labels.color:redlabel.size:big|The project's label `color` has the
-   * value `red` and its label `size` has the value `big`.
-   *
-   * Optional.
-   * @opt_param string pageToken A pagination token returned from a previous call
-   * to ListProjects that indicates from where listing should continue.
-   *
-   * Optional.
-   * @opt_param int pageSize The maximum number of Projects to return in the
-   * response. The server can return fewer Projects than requested. If
-   * unspecified, server picks an appropriate default.
-   *
-   * Optional.
-   * @return Google_Service_CloudResourceManager_ListProjectsResponse
-   */
-  public function listProjects($optParams = array())
-  {
-    $params = array();
-    $params = array_merge($params, $optParams);
-    return $this->call('list', array($params), "Google_Service_CloudResourceManager_ListProjectsResponse");
-  }
-  /**
-   * Sets the IAM access control policy for the specified Project. Replaces any
-   * existing policy.
-   *
-   * The following constraints apply when using `setIamPolicy()`:
-   *
-   * + Project does not support `allUsers` and `allAuthenticatedUsers` as
-   * `members` in a `Binding` of a `Policy`.
-   *
-   * + The owner role can be granted only to `user` and `serviceAccount`.
-   *
-   * + Service accounts can be made owners of a project directly without any
-   * restrictions. However, to be added as an owner, a user must be invited via
-   * Cloud Platform console and must accept the invitation.
-   *
-   * + A user cannot be granted the owner role using `setIamPolicy()`. The user
-   * must be granted the owner role using the Cloud Platform Console and must
-   * explicitly accept the invitation.
-   *
-   * + Invitations to grant the owner role cannot be sent using `setIamPolicy()`;
-   * they must be sent only using the Cloud Platform Console.
-   *
-   * + Membership changes that leave the project without any owners that have
-   * accepted the Terms of Service (ToS) will be rejected.
-   *
-   * + There must be at least one owner who has accepted the Terms of Service
-   * (ToS) agreement in the policy. Calling `setIamPolicy()` to to remove the last
-   * ToS-accepted owner from the policy will fail. This restriction also applies
-   * to legacy projects that no longer have owners who have accepted the ToS.
-   * Edits to IAM policies will be rejected until the lack of a ToS-accepting
-   * owner is rectified.
-   *
-   * + Calling this method requires enabling the App Engine Admin API.
-   *
-   * Note: Removing service accounts from policies or changing their roles can
-   * render services completely inoperable. It is important to understand how the
-   * service account is being used before removing or updating its roles.
-   * (projects.setIamPolicy)
-   *
-   * @param string $resource REQUIRED: The resource for which the policy is being
-   * specified. See the operation documentation for the appropriate value for this
-   * field.
-   * @param Google_Service_CloudResourceManager_SetIamPolicyRequest $postBody
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_CloudResourceManager_Policy
-   */
-  public function setIamPolicy($resource, Google_Service_CloudResourceManager_SetIamPolicyRequest $postBody, $optParams = array())
-  {
-    $params = array('resource' => $resource, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('setIamPolicy', array($params), "Google_Service_CloudResourceManager_Policy");
-  }
-  /**
-   * Returns permissions that a caller has on the specified Project.
-   * (projects.testIamPermissions)
-   *
-   * @param string $resource REQUIRED: The resource for which the policy detail is
-   * being requested. See the operation documentation for the appropriate value
-   * for this field.
-   * @param Google_Service_CloudResourceManager_TestIamPermissionsRequest $postBody
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_CloudResourceManager_TestIamPermissionsResponse
-   */
-  public function testIamPermissions($resource, Google_Service_CloudResourceManager_TestIamPermissionsRequest $postBody, $optParams = array())
-  {
-    $params = array('resource' => $resource, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('testIamPermissions', array($params), "Google_Service_CloudResourceManager_TestIamPermissionsResponse");
-  }
-  /**
-   * Restores the Project identified by the specified `project_id` (for example,
-   * `my-project-123`). You can only use this method for a Project that has a
-   * lifecycle state of DELETE_REQUESTED. After deletion starts, the Project
-   * cannot be restored.
-   *
-   * The caller must have modify permissions for this Project. (projects.undelete)
-   *
-   * @param string $projectId The project ID (for example, `foo-bar-123`).
-   *
-   * Required.
-   * @param Google_Service_CloudResourceManager_UndeleteProjectRequest $postBody
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_CloudResourceManager_CloudresourcemanagerEmpty
-   */
-  public function undelete($projectId, Google_Service_CloudResourceManager_UndeleteProjectRequest $postBody, $optParams = array())
-  {
-    $params = array('projectId' => $projectId, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('undelete', array($params), "Google_Service_CloudResourceManager_CloudresourcemanagerEmpty");
-  }
-  /**
-   * Updates the attributes of the Project identified by the specified
-   * `project_id` (for example, `my-project-123`).
-   *
-   * The caller must have modify permissions for this Project. (projects.update)
-   *
-   * @param string $projectId The project ID (for example, `my-project-123`).
-   *
-   * Required.
-   * @param Google_Service_CloudResourceManager_Project $postBody
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_CloudResourceManager_Project
-   */
-  public function update($projectId, Google_Service_CloudResourceManager_Project $postBody, $optParams = array())
-  {
-    $params = array('projectId' => $projectId, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('update', array($params), "Google_Service_CloudResourceManager_Project");
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudResourceManager/ResourceId.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudResourceManager/ResourceId.php
deleted file mode 100644
index ac1347bc..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudResourceManager/ResourceId.php
+++ /dev/null
@@ -1,39 +0,0 @@
-id = $id;
-  }
-  public function getId()
-  {
-    return $this->id;
-  }
-  public function setType($type)
-  {
-    $this->type = $type;
-  }
-  public function getType()
-  {
-    return $this->type;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudResourceManager/SearchOrganizationsRequest.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudResourceManager/SearchOrganizationsRequest.php
deleted file mode 100644
index d682ba0c..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudResourceManager/SearchOrganizationsRequest.php
+++ /dev/null
@@ -1,48 +0,0 @@
-filter = $filter;
-  }
-  public function getFilter()
-  {
-    return $this->filter;
-  }
-  public function setPageSize($pageSize)
-  {
-    $this->pageSize = $pageSize;
-  }
-  public function getPageSize()
-  {
-    return $this->pageSize;
-  }
-  public function setPageToken($pageToken)
-  {
-    $this->pageToken = $pageToken;
-  }
-  public function getPageToken()
-  {
-    return $this->pageToken;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudResourceManager/SearchOrganizationsResponse.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudResourceManager/SearchOrganizationsResponse.php
deleted file mode 100644
index d05ba06e..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudResourceManager/SearchOrganizationsResponse.php
+++ /dev/null
@@ -1,41 +0,0 @@
-nextPageToken = $nextPageToken;
-  }
-  public function getNextPageToken()
-  {
-    return $this->nextPageToken;
-  }
-  public function setOrganizations($organizations)
-  {
-    $this->organizations = $organizations;
-  }
-  public function getOrganizations()
-  {
-    return $this->organizations;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudResourceManager/SetIamPolicyRequest.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudResourceManager/SetIamPolicyRequest.php
deleted file mode 100644
index e84b61c8..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudResourceManager/SetIamPolicyRequest.php
+++ /dev/null
@@ -1,40 +0,0 @@
-policy = $policy;
-  }
-  public function getPolicy()
-  {
-    return $this->policy;
-  }
-  public function setUpdateMask($updateMask)
-  {
-    $this->updateMask = $updateMask;
-  }
-  public function getUpdateMask()
-  {
-    return $this->updateMask;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudResourceManager/Status.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudResourceManager/Status.php
deleted file mode 100644
index b5c5b7ac..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudResourceManager/Status.php
+++ /dev/null
@@ -1,49 +0,0 @@
-code = $code;
-  }
-  public function getCode()
-  {
-    return $this->code;
-  }
-  public function setDetails($details)
-  {
-    $this->details = $details;
-  }
-  public function getDetails()
-  {
-    return $this->details;
-  }
-  public function setMessage($message)
-  {
-    $this->message = $message;
-  }
-  public function getMessage()
-  {
-    return $this->message;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudResourceManager/TestIamPermissionsRequest.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudResourceManager/TestIamPermissionsRequest.php
deleted file mode 100644
index 9f69000b..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudResourceManager/TestIamPermissionsRequest.php
+++ /dev/null
@@ -1,31 +0,0 @@
-permissions = $permissions;
-  }
-  public function getPermissions()
-  {
-    return $this->permissions;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudResourceManager/TestIamPermissionsResponse.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudResourceManager/TestIamPermissionsResponse.php
deleted file mode 100644
index 252c3846..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudResourceManager/TestIamPermissionsResponse.php
+++ /dev/null
@@ -1,31 +0,0 @@
-permissions = $permissions;
-  }
-  public function getPermissions()
-  {
-    return $this->permissions;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudResourceManager/UndeleteProjectRequest.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudResourceManager/UndeleteProjectRequest.php
deleted file mode 100644
index b79b4629..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudResourceManager/UndeleteProjectRequest.php
+++ /dev/null
@@ -1,20 +0,0 @@
-
- * Provides capabilities for dynamic configuration and coordination for
- * applications running on Google Cloud Platform.

- *
- * 

- * For more information about this service, see the API
- * Documentation
- * 

- *
- * @author Google, Inc.
- */
-class Google_Service_CloudRuntimeConfig extends Google_Service
-{
-  /** View and manage your data across Google Cloud Platform services. */
-  const CLOUD_PLATFORM =
-      "https://www.googleapis.com/auth/cloud-platform";
-  /** Manage your Google Cloud Platform services' runtime configuration. */
-  const CLOUDRUNTIMECONFIG =
-      "https://www.googleapis.com/auth/cloudruntimeconfig";
-
-  public $operations;
-  
-  /**
-   * Constructs the internal representation of the CloudRuntimeConfig service.
-   *
-   * @param Google_Client $client
-   */
-  public function __construct(Google_Client $client)
-  {
-    parent::__construct($client);
-    $this->rootUrl = 'https://runtimeconfig.googleapis.com/';
-    $this->servicePath = '';
-    $this->version = 'v1';
-    $this->serviceName = 'runtimeconfig';
-
-    $this->operations = new Google_Service_CloudRuntimeConfig_Resource_Operations(
-        $this,
-        $this->serviceName,
-        'operations',
-        array(
-          'methods' => array(
-            'cancel' => array(
-              'path' => 'v1/{+name}:cancel',
-              'httpMethod' => 'POST',
-              'parameters' => array(
-                'name' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'delete' => array(
-              'path' => 'v1/{+name}',
-              'httpMethod' => 'DELETE',
-              'parameters' => array(
-                'name' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'list' => array(
-              'path' => 'v1/{+name}',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'name' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'pageToken' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'pageSize' => array(
-                  'location' => 'query',
-                  'type' => 'integer',
-                ),
-                'filter' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-              ),
-            ),
-          )
-        )
-    );
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudRuntimeConfig/CancelOperationRequest.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudRuntimeConfig/CancelOperationRequest.php
deleted file mode 100644
index 948405c0..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudRuntimeConfig/CancelOperationRequest.php
+++ /dev/null
@@ -1,20 +0,0 @@
-number = $number;
-  }
-  public function getNumber()
-  {
-    return $this->number;
-  }
-  public function setPath($path)
-  {
-    $this->path = $path;
-  }
-  public function getPath()
-  {
-    return $this->path;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudRuntimeConfig/EndCondition.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudRuntimeConfig/EndCondition.php
deleted file mode 100644
index e1321943..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudRuntimeConfig/EndCondition.php
+++ /dev/null
@@ -1,31 +0,0 @@
-cardinality = $cardinality;
-  }
-  public function getCardinality()
-  {
-    return $this->cardinality;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudRuntimeConfig/ListConfigsResponse.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudRuntimeConfig/ListConfigsResponse.php
deleted file mode 100644
index 607dbbc7..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudRuntimeConfig/ListConfigsResponse.php
+++ /dev/null
@@ -1,41 +0,0 @@
-configs = $configs;
-  }
-  public function getConfigs()
-  {
-    return $this->configs;
-  }
-  public function setNextPageToken($nextPageToken)
-  {
-    $this->nextPageToken = $nextPageToken;
-  }
-  public function getNextPageToken()
-  {
-    return $this->nextPageToken;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudRuntimeConfig/ListOperationsResponse.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudRuntimeConfig/ListOperationsResponse.php
deleted file mode 100644
index 9ef11d09..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudRuntimeConfig/ListOperationsResponse.php
+++ /dev/null
@@ -1,41 +0,0 @@
-nextPageToken = $nextPageToken;
-  }
-  public function getNextPageToken()
-  {
-    return $this->nextPageToken;
-  }
-  public function setOperations($operations)
-  {
-    $this->operations = $operations;
-  }
-  public function getOperations()
-  {
-    return $this->operations;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudRuntimeConfig/ListVariablesResponse.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudRuntimeConfig/ListVariablesResponse.php
deleted file mode 100644
index b063e7ac..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudRuntimeConfig/ListVariablesResponse.php
+++ /dev/null
@@ -1,41 +0,0 @@
-nextPageToken = $nextPageToken;
-  }
-  public function getNextPageToken()
-  {
-    return $this->nextPageToken;
-  }
-  public function setVariables($variables)
-  {
-    $this->variables = $variables;
-  }
-  public function getVariables()
-  {
-    return $this->variables;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudRuntimeConfig/ListWaitersResponse.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudRuntimeConfig/ListWaitersResponse.php
deleted file mode 100644
index e6b7a0d6..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudRuntimeConfig/ListWaitersResponse.php
+++ /dev/null
@@ -1,41 +0,0 @@
-nextPageToken = $nextPageToken;
-  }
-  public function getNextPageToken()
-  {
-    return $this->nextPageToken;
-  }
-  public function setWaiters($waiters)
-  {
-    $this->waiters = $waiters;
-  }
-  public function getWaiters()
-  {
-    return $this->waiters;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudRuntimeConfig/Operation.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudRuntimeConfig/Operation.php
deleted file mode 100644
index 7339420d..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudRuntimeConfig/Operation.php
+++ /dev/null
@@ -1,67 +0,0 @@
-done = $done;
-  }
-  public function getDone()
-  {
-    return $this->done;
-  }
-  public function setError(Google_Service_CloudRuntimeConfig_Status $error)
-  {
-    $this->error = $error;
-  }
-  public function getError()
-  {
-    return $this->error;
-  }
-  public function setMetadata($metadata)
-  {
-    $this->metadata = $metadata;
-  }
-  public function getMetadata()
-  {
-    return $this->metadata;
-  }
-  public function setName($name)
-  {
-    $this->name = $name;
-  }
-  public function getName()
-  {
-    return $this->name;
-  }
-  public function setResponse($response)
-  {
-    $this->response = $response;
-  }
-  public function getResponse()
-  {
-    return $this->response;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudRuntimeConfig/Resource/Operations.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudRuntimeConfig/Resource/Operations.php
deleted file mode 100644
index 25354914..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudRuntimeConfig/Resource/Operations.php
+++ /dev/null
@@ -1,88 +0,0 @@
-
- *   $runtimeconfigService = new Google_Service_CloudRuntimeConfig(...);
- *   $operations = $runtimeconfigService->operations;
- *  
- */
-class Google_Service_CloudRuntimeConfig_Resource_Operations extends Google_Service_Resource
-{
-  /**
-   * Starts asynchronous cancellation on a long-running operation.  The server
-   * makes a best effort to cancel the operation, but success is not guaranteed.
-   * If the server doesn't support this method, it returns
-   * `google.rpc.Code.UNIMPLEMENTED`.  Clients can use Operations.GetOperation or
-   * other methods to check whether the cancellation succeeded or whether the
-   * operation completed despite cancellation. On successful cancellation, the
-   * operation is not deleted; instead, it becomes an operation with an
-   * Operation.error value with a google.rpc.Status.code of 1, corresponding to
-   * `Code.CANCELLED`. (operations.cancel)
-   *
-   * @param string $name The name of the operation resource to be cancelled.
-   * @param Google_Service_CloudRuntimeConfig_CancelOperationRequest $postBody
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_CloudRuntimeConfig_RuntimeconfigEmpty
-   */
-  public function cancel($name, Google_Service_CloudRuntimeConfig_CancelOperationRequest $postBody, $optParams = array())
-  {
-    $params = array('name' => $name, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('cancel', array($params), "Google_Service_CloudRuntimeConfig_RuntimeconfigEmpty");
-  }
-  /**
-   * Deletes a long-running operation. This method indicates that the client is no
-   * longer interested in the operation result. It does not cancel the operation.
-   * If the server doesn't support this method, it returns
-   * `google.rpc.Code.UNIMPLEMENTED`. (operations.delete)
-   *
-   * @param string $name The name of the operation resource to be deleted.
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_CloudRuntimeConfig_RuntimeconfigEmpty
-   */
-  public function delete($name, $optParams = array())
-  {
-    $params = array('name' => $name);
-    $params = array_merge($params, $optParams);
-    return $this->call('delete', array($params), "Google_Service_CloudRuntimeConfig_RuntimeconfigEmpty");
-  }
-  /**
-   * Lists operations that match the specified filter in the request. If the
-   * server doesn't support this method, it returns `UNIMPLEMENTED`.
-   *
-   * NOTE: the `name` binding below allows API services to override the binding to
-   * use different resource name schemes, such as `users/operations`.
-   * (operations.listOperations)
-   *
-   * @param string $name The name of the operation collection.
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param string pageToken The standard list page token.
-   * @opt_param int pageSize The standard list page size.
-   * @opt_param string filter The standard list filter.
-   * @return Google_Service_CloudRuntimeConfig_ListOperationsResponse
-   */
-  public function listOperations($name, $optParams = array())
-  {
-    $params = array('name' => $name);
-    $params = array_merge($params, $optParams);
-    return $this->call('list', array($params), "Google_Service_CloudRuntimeConfig_ListOperationsResponse");
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudRuntimeConfig/Resource/Projects.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudRuntimeConfig/Resource/Projects.php
deleted file mode 100644
index 10009973..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudRuntimeConfig/Resource/Projects.php
+++ /dev/null
@@ -1,28 +0,0 @@
-
- *   $runtimeconfigService = new Google_Service_CloudRuntimeConfig(...);
- *   $projects = $runtimeconfigService->projects;
- *  
- */
-class Google_Service_CloudRuntimeConfig_Resource_Projects extends Google_Service_Resource
-{
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudRuntimeConfig/Resource/ProjectsConfigs.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudRuntimeConfig/Resource/ProjectsConfigs.php
deleted file mode 100644
index 013afd37..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudRuntimeConfig/Resource/ProjectsConfigs.php
+++ /dev/null
@@ -1,123 +0,0 @@
-
- *   $runtimeconfigService = new Google_Service_CloudRuntimeConfig(...);
- *   $configs = $runtimeconfigService->configs;
- *  
- */
-class Google_Service_CloudRuntimeConfig_Resource_ProjectsConfigs extends Google_Service_Resource
-{
-  /**
-   * Creates a new RuntimeConfig resource. The configuration name must be unique
-   * within project. (configs.create)
-   *
-   * @param string $parent The [project
-   * ID](https://support.google.com/cloud/answer/6158840?hl=en_topic=6158848) for
-   * this request, in the format `projects/[PROJECT_ID]`.
-   * @param Google_Service_CloudRuntimeConfig_RuntimeConfig $postBody
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param string requestId An optional unique request_id. If server receives
-   * two Create requests with the same request_id then second request will be
-   * ignored and the resource stored in the backend will be returned. Empty
-   * request_id fields are ignored. It is responsibility of the client to ensure
-   * uniqueness of the request_id strings. The strings are limited to 64
-   * characters.
-   * @return Google_Service_CloudRuntimeConfig_RuntimeConfig
-   */
-  public function create($parent, Google_Service_CloudRuntimeConfig_RuntimeConfig $postBody, $optParams = array())
-  {
-    $params = array('parent' => $parent, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('create', array($params), "Google_Service_CloudRuntimeConfig_RuntimeConfig");
-  }
-  /**
-   * Deletes a RuntimeConfig resource. (configs.delete)
-   *
-   * @param string $name The RuntimeConfig resource to delete, in the format:
-   *
-   * `projects/[PROJECT_ID]/configs/[CONFIG_NAME]`
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_CloudRuntimeConfig_RuntimeconfigEmpty
-   */
-  public function delete($name, $optParams = array())
-  {
-    $params = array('name' => $name);
-    $params = array_merge($params, $optParams);
-    return $this->call('delete', array($params), "Google_Service_CloudRuntimeConfig_RuntimeconfigEmpty");
-  }
-  /**
-   * Gets information about a RuntimeConfig resource. (configs.get)
-   *
-   * @param string $name The name of the RuntimeConfig resource to retrieve, in
-   * the format:
-   *
-   * `projects/[PROJECT_ID]/configs/[CONFIG_NAME]`
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_CloudRuntimeConfig_RuntimeConfig
-   */
-  public function get($name, $optParams = array())
-  {
-    $params = array('name' => $name);
-    $params = array_merge($params, $optParams);
-    return $this->call('get', array($params), "Google_Service_CloudRuntimeConfig_RuntimeConfig");
-  }
-  /**
-   * Lists all the RuntimeConfig resources within project.
-   * (configs.listProjectsConfigs)
-   *
-   * @param string $parent The [project
-   * ID](https://support.google.com/cloud/answer/6158840?hl=en_topic=6158848) for
-   * this request, in the format `projects/[PROJECT_ID]`.
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param int pageSize Specifies the number of results to return per page.
-   * If there are fewer elements than the specified number, returns all elements.
-   * @opt_param string pageToken Specifies a page token to use. Set `pageToken` to
-   * a `nextPageToken` returned by a previous list request to get the next page of
-   * results.
-   * @return Google_Service_CloudRuntimeConfig_ListConfigsResponse
-   */
-  public function listProjectsConfigs($parent, $optParams = array())
-  {
-    $params = array('parent' => $parent);
-    $params = array_merge($params, $optParams);
-    return $this->call('list', array($params), "Google_Service_CloudRuntimeConfig_ListConfigsResponse");
-  }
-  /**
-   * Updates a RuntimeConfig resource. The configuration must exist beforehand.
-   * (configs.update)
-   *
-   * @param string $name The name of the RuntimeConfig resource to update, in the
-   * format:
-   *
-   * `projects/[PROJECT_ID]/configs/[CONFIG_NAME]`
-   * @param Google_Service_CloudRuntimeConfig_RuntimeConfig $postBody
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_CloudRuntimeConfig_RuntimeConfig
-   */
-  public function update($name, Google_Service_CloudRuntimeConfig_RuntimeConfig $postBody, $optParams = array())
-  {
-    $params = array('name' => $name, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('update', array($params), "Google_Service_CloudRuntimeConfig_RuntimeConfig");
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudRuntimeConfig/Resource/ProjectsConfigsOperations.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudRuntimeConfig/Resource/ProjectsConfigsOperations.php
deleted file mode 100644
index 9e00b34d..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudRuntimeConfig/Resource/ProjectsConfigsOperations.php
+++ /dev/null
@@ -1,43 +0,0 @@
-
- *   $runtimeconfigService = new Google_Service_CloudRuntimeConfig(...);
- *   $operations = $runtimeconfigService->operations;
- *  
- */
-class Google_Service_CloudRuntimeConfig_Resource_ProjectsConfigsOperations extends Google_Service_Resource
-{
-  /**
-   * Gets the latest state of a long-running operation.  Clients can use this
-   * method to poll the operation result at intervals as recommended by the API
-   * service. (operations.get)
-   *
-   * @param string $name The name of the operation resource.
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_CloudRuntimeConfig_Operation
-   */
-  public function get($name, $optParams = array())
-  {
-    $params = array('name' => $name);
-    $params = array_merge($params, $optParams);
-    return $this->call('get', array($params), "Google_Service_CloudRuntimeConfig_Operation");
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudRuntimeConfig/Resource/ProjectsConfigsVariables.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudRuntimeConfig/Resource/ProjectsConfigsVariables.php
deleted file mode 100644
index 23713ff3..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudRuntimeConfig/Resource/ProjectsConfigsVariables.php
+++ /dev/null
@@ -1,170 +0,0 @@
-
- *   $runtimeconfigService = new Google_Service_CloudRuntimeConfig(...);
- *   $variables = $runtimeconfigService->variables;
- *  
- */
-class Google_Service_CloudRuntimeConfig_Resource_ProjectsConfigsVariables extends Google_Service_Resource
-{
-  /**
-   * Creates a variable within the given configuration. You cannot create a
-   * variable with a name that is a prefix of an existing variable name, or a name
-   * that has an existing variable name as a prefix.
-   *
-   * To learn more about creating a variable, read the [Setting and Getting Data
-   * ](/deployment-manager/runtime-configurator/set-and-get-variables)
-   * documentation. (variables.create)
-   *
-   * @param string $parent The path to the RutimeConfig resource that this
-   * variable should belong to. The configuration must exist beforehand; the path
-   * must by in the format:
-   *
-   * `projects/[PROJECT_ID]/configs/[CONFIG_NAME]`
-   * @param Google_Service_CloudRuntimeConfig_Variable $postBody
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param string requestId An optional unique request_id. If server receives
-   * two Create requests with the same request_id then second request will be
-   * ignored and the resource stored in the backend will be returned. Empty
-   * request_id fields are ignored. It is responsibility of the client to ensure
-   * uniqueness of the request_id strings. The strings are limited to 64
-   * characters.
-   * @return Google_Service_CloudRuntimeConfig_Variable
-   */
-  public function create($parent, Google_Service_CloudRuntimeConfig_Variable $postBody, $optParams = array())
-  {
-    $params = array('parent' => $parent, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('create', array($params), "Google_Service_CloudRuntimeConfig_Variable");
-  }
-  /**
-   * Deletes a variable or multiple variables.
-   *
-   * If you specify a variable name, then that variable is deleted. If you specify
-   * a prefix and `recursive` is true, then all variables with that prefix are
-   * deleted. You must set a `recursive` to true if you delete variables by
-   * prefix. (variables.delete)
-   *
-   * @param string $name The name of the variable to delete, in the format:
-   *
-   * `projects/[PROJECT_ID]/configs/[CONFIG_NAME]/variables/[VARIABLE_NAME]`
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param bool recursive Set to `true` to recursively delete multiple
-   * variables with the same prefix.
-   * @return Google_Service_CloudRuntimeConfig_RuntimeconfigEmpty
-   */
-  public function delete($name, $optParams = array())
-  {
-    $params = array('name' => $name);
-    $params = array_merge($params, $optParams);
-    return $this->call('delete', array($params), "Google_Service_CloudRuntimeConfig_RuntimeconfigEmpty");
-  }
-  /**
-   * Gets information about a single variable. (variables.get)
-   *
-   * @param string $name The name of the variable to return, in the format:
-   *
-   * `projects/[PROJECT_ID]/configs/[CONFIG_NAME]/variables/[VARIBLE_NAME]`
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_CloudRuntimeConfig_Variable
-   */
-  public function get($name, $optParams = array())
-  {
-    $params = array('name' => $name);
-    $params = array_merge($params, $optParams);
-    return $this->call('get', array($params), "Google_Service_CloudRuntimeConfig_Variable");
-  }
-  /**
-   * Lists variables within given a configuration, matching any provided filters.
-   * This only lists variable names, not the values.
-   * (variables.listProjectsConfigsVariables)
-   *
-   * @param string $parent The path to the RuntimeConfig resource for which you
-   * want to list variables. The configuration must exist beforehand; the path
-   * must by in the format:
-   *
-   * `projects/[PROJECT_ID]/configs/[CONFIG_NAME]`
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param int pageSize Specifies the number of results to return per page.
-   * If there are fewer elements than the specified number, returns all elements.
-   * @opt_param string filter Filters variables by matching the specified filter.
-   * For example:
-   *
-   * `projects/example-project/config/[CONFIG_NAME]/variables/example-variable`.
-   * @opt_param string pageToken Specifies a page token to use. Set `pageToken` to
-   * a `nextPageToken` returned by a previous list request to get the next page of
-   * results.
-   * @return Google_Service_CloudRuntimeConfig_ListVariablesResponse
-   */
-  public function listProjectsConfigsVariables($parent, $optParams = array())
-  {
-    $params = array('parent' => $parent);
-    $params = array_merge($params, $optParams);
-    return $this->call('list', array($params), "Google_Service_CloudRuntimeConfig_ListVariablesResponse");
-  }
-  /**
-   * Updates an existing variable with a new value. (variables.update)
-   *
-   * @param string $name The name of the variable to update, in the format:
-   *
-   * `projects/[PROJECT_ID]/configs/[CONFIG_NAME]/variables/[VARIABLE_NAME]`
-   * @param Google_Service_CloudRuntimeConfig_Variable $postBody
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_CloudRuntimeConfig_Variable
-   */
-  public function update($name, Google_Service_CloudRuntimeConfig_Variable $postBody, $optParams = array())
-  {
-    $params = array('name' => $name, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('update', array($params), "Google_Service_CloudRuntimeConfig_Variable");
-  }
-  /**
-   * Watches a specific variable and waits for a change in the variable's value.
-   * When there is a change, this method returns the new value or times out.
-   *
-   * If a variable is deleted while being watched, the `variableState` state is
-   * set to `DELETED` and the method returns the last known variable `value`.
-   *
-   * If you set the deadline for watching to a larger value than internal timeout
-   * (60 seconds), the current variable value is returned and the `variableState`
-   * will be `VARIABLE_STATE_UNSPECIFIED`.
-   *
-   * To learn more about creating a watcher, read the [Watching a Variable for
-   * Changes](/deployment-manager/runtime-configurator/watching-a-variable)
-   * documentation. (variables.watch)
-   *
-   * @param string $name The name of the variable to watch, in the format:
-   *
-   * `projects/[PROJECT_ID]/configs/[CONFIG_NAME]`
-   * @param Google_Service_CloudRuntimeConfig_WatchVariableRequest $postBody
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_CloudRuntimeConfig_Variable
-   */
-  public function watch($name, Google_Service_CloudRuntimeConfig_WatchVariableRequest $postBody, $optParams = array())
-  {
-    $params = array('name' => $name, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('watch', array($params), "Google_Service_CloudRuntimeConfig_Variable");
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudRuntimeConfig/Resource/ProjectsConfigsWaiters.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudRuntimeConfig/Resource/ProjectsConfigsWaiters.php
deleted file mode 100644
index 7f407cbd..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudRuntimeConfig/Resource/ProjectsConfigsWaiters.php
+++ /dev/null
@@ -1,111 +0,0 @@
-
- *   $runtimeconfigService = new Google_Service_CloudRuntimeConfig(...);
- *   $waiters = $runtimeconfigService->waiters;
- *  
- */
-class Google_Service_CloudRuntimeConfig_Resource_ProjectsConfigsWaiters extends Google_Service_Resource
-{
-  /**
-   * Creates a Waiter resource. This operation returns a long-running Operation
-   * resource which can be polled for completion. However, a waiter with the given
-   * name will exist (and can be retrieved) prior to the operation completing. If
-   * the operation fails, the failed Waiter resource will still exist and must be
-   * deleted prior to subsequent creation attempts. (waiters.create)
-   *
-   * @param string $parent The path to the configuration that will own the waiter.
-   * The configuration must exist beforehand; the path must by in the format:
-   *
-   * `projects/[PROJECT_ID]/configs/[CONFIG_NAME]`.
-   * @param Google_Service_CloudRuntimeConfig_Waiter $postBody
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param string requestId An optional unique request_id. If server receives
-   * two Create requests with the same request_id then second request will be
-   * ignored and information stored in the backend will be returned. Empty
-   * request_id fields are ignored. It is responsibility of the client to ensure
-   * uniqueness of the request_id strings. The strings are limited to 64
-   * characters.
-   * @return Google_Service_CloudRuntimeConfig_Operation
-   */
-  public function create($parent, Google_Service_CloudRuntimeConfig_Waiter $postBody, $optParams = array())
-  {
-    $params = array('parent' => $parent, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('create', array($params), "Google_Service_CloudRuntimeConfig_Operation");
-  }
-  /**
-   * Deletes the waiter with the specified name. (waiters.delete)
-   *
-   * @param string $name The Waiter resource to delete, in the format:
-   *
-   *  `projects/[PROJECT_ID]/configs/[CONFIG_NAME]/waiters/[WAITER_NAME]`
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_CloudRuntimeConfig_RuntimeconfigEmpty
-   */
-  public function delete($name, $optParams = array())
-  {
-    $params = array('name' => $name);
-    $params = array_merge($params, $optParams);
-    return $this->call('delete', array($params), "Google_Service_CloudRuntimeConfig_RuntimeconfigEmpty");
-  }
-  /**
-   * Gets information about a single waiter. (waiters.get)
-   *
-   * @param string $name The fully-qualified name of the Waiter resource object to
-   * retrieve, in the format:
-   *
-   * `projects/[PROJECT_ID]/configs/[CONFIG_NAME]/waiters/[WAITER_NAME]`
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_CloudRuntimeConfig_Waiter
-   */
-  public function get($name, $optParams = array())
-  {
-    $params = array('name' => $name);
-    $params = array_merge($params, $optParams);
-    return $this->call('get', array($params), "Google_Service_CloudRuntimeConfig_Waiter");
-  }
-  /**
-   * List waiters within the given configuration.
-   * (waiters.listProjectsConfigsWaiters)
-   *
-   * @param string $parent The path to the configuration for which you want to get
-   * a list of waiters. The configuration must exist beforehand; the path must by
-   * in the format:
-   *
-   * `projects/[PROJECT_ID]/configs/[CONFIG_NAME]`
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param int pageSize Specifies the number of results to return per page.
-   * If there are fewer elements than the specified number, returns all elements.
-   * @opt_param string pageToken Specifies a page token to use. Set `pageToken` to
-   * a `nextPageToken` returned by a previous list request to get the next page of
-   * results.
-   * @return Google_Service_CloudRuntimeConfig_ListWaitersResponse
-   */
-  public function listProjectsConfigsWaiters($parent, $optParams = array())
-  {
-    $params = array('parent' => $parent);
-    $params = array_merge($params, $optParams);
-    return $this->call('list', array($params), "Google_Service_CloudRuntimeConfig_ListWaitersResponse");
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudRuntimeConfig/RuntimeConfig.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudRuntimeConfig/RuntimeConfig.php
deleted file mode 100644
index 445bade1..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudRuntimeConfig/RuntimeConfig.php
+++ /dev/null
@@ -1,39 +0,0 @@
-description = $description;
-  }
-  public function getDescription()
-  {
-    return $this->description;
-  }
-  public function setName($name)
-  {
-    $this->name = $name;
-  }
-  public function getName()
-  {
-    return $this->name;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudRuntimeConfig/RuntimeconfigEmpty.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudRuntimeConfig/RuntimeconfigEmpty.php
deleted file mode 100644
index a07606d7..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudRuntimeConfig/RuntimeconfigEmpty.php
+++ /dev/null
@@ -1,20 +0,0 @@
-code = $code;
-  }
-  public function getCode()
-  {
-    return $this->code;
-  }
-  public function setDetails($details)
-  {
-    $this->details = $details;
-  }
-  public function getDetails()
-  {
-    return $this->details;
-  }
-  public function setMessage($message)
-  {
-    $this->message = $message;
-  }
-  public function getMessage()
-  {
-    return $this->message;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudRuntimeConfig/Variable.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudRuntimeConfig/Variable.php
deleted file mode 100644
index 2d0159cb..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudRuntimeConfig/Variable.php
+++ /dev/null
@@ -1,66 +0,0 @@
-name = $name;
-  }
-  public function getName()
-  {
-    return $this->name;
-  }
-  public function setState($state)
-  {
-    $this->state = $state;
-  }
-  public function getState()
-  {
-    return $this->state;
-  }
-  public function setText($text)
-  {
-    $this->text = $text;
-  }
-  public function getText()
-  {
-    return $this->text;
-  }
-  public function setUpdateTime($updateTime)
-  {
-    $this->updateTime = $updateTime;
-  }
-  public function getUpdateTime()
-  {
-    return $this->updateTime;
-  }
-  public function setValue($value)
-  {
-    $this->value = $value;
-  }
-  public function getValue()
-  {
-    return $this->value;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudRuntimeConfig/Waiter.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudRuntimeConfig/Waiter.php
deleted file mode 100644
index d115775b..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudRuntimeConfig/Waiter.php
+++ /dev/null
@@ -1,87 +0,0 @@
-createTime = $createTime;
-  }
-  public function getCreateTime()
-  {
-    return $this->createTime;
-  }
-  public function setDone($done)
-  {
-    $this->done = $done;
-  }
-  public function getDone()
-  {
-    return $this->done;
-  }
-  public function setError(Google_Service_CloudRuntimeConfig_Status $error)
-  {
-    $this->error = $error;
-  }
-  public function getError()
-  {
-    return $this->error;
-  }
-  public function setFailure(Google_Service_CloudRuntimeConfig_EndCondition $failure)
-  {
-    $this->failure = $failure;
-  }
-  public function getFailure()
-  {
-    return $this->failure;
-  }
-  public function setName($name)
-  {
-    $this->name = $name;
-  }
-  public function getName()
-  {
-    return $this->name;
-  }
-  public function setSuccess(Google_Service_CloudRuntimeConfig_EndCondition $success)
-  {
-    $this->success = $success;
-  }
-  public function getSuccess()
-  {
-    return $this->success;
-  }
-  public function setTimeout($timeout)
-  {
-    $this->timeout = $timeout;
-  }
-  public function getTimeout()
-  {
-    return $this->timeout;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudRuntimeConfig/WatchVariableRequest.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudRuntimeConfig/WatchVariableRequest.php
deleted file mode 100644
index 7de9800f..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudRuntimeConfig/WatchVariableRequest.php
+++ /dev/null
@@ -1,30 +0,0 @@
-newerThan = $newerThan;
-  }
-  public function getNewerThan()
-  {
-    return $this->newerThan;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudSourceRepositories.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudSourceRepositories.php
deleted file mode 100644
index 4aa4def0..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudSourceRepositories.php
+++ /dev/null
@@ -1,134 +0,0 @@
-
- * Access source code repositories hosted by Google.

- *
- * 

- * For more information about this service, see the API
- * Documentation
- * 

- *
- * @author Google, Inc.
- */
-class Google_Service_CloudSourceRepositories extends Google_Service
-{
-  /** View and manage your data across Google Cloud Platform services. */
-  const CLOUD_PLATFORM =
-      "https://www.googleapis.com/auth/cloud-platform";
-
-  public $projects_repos;
-  
-  /**
-   * Constructs the internal representation of the CloudSourceRepositories
-   * service.
-   *
-   * @param Google_Client $client
-   */
-  public function __construct(Google_Client $client)
-  {
-    parent::__construct($client);
-    $this->rootUrl = 'https://sourcerepo.googleapis.com/';
-    $this->servicePath = '';
-    $this->version = 'v1';
-    $this->serviceName = 'sourcerepo';
-
-    $this->projects_repos = new Google_Service_CloudSourceRepositories_Resource_ProjectsRepos(
-        $this,
-        $this->serviceName,
-        'repos',
-        array(
-          'methods' => array(
-            'create' => array(
-              'path' => 'v1/{+parent}/repos',
-              'httpMethod' => 'POST',
-              'parameters' => array(
-                'parent' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'delete' => array(
-              'path' => 'v1/{+name}',
-              'httpMethod' => 'DELETE',
-              'parameters' => array(
-                'name' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'get' => array(
-              'path' => 'v1/{+name}',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'name' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'getIamPolicy' => array(
-              'path' => 'v1/{+resource}:getIamPolicy',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'resource' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'list' => array(
-              'path' => 'v1/{+name}/repos',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'name' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'setIamPolicy' => array(
-              'path' => 'v1/{+resource}:setIamPolicy',
-              'httpMethod' => 'POST',
-              'parameters' => array(
-                'resource' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'testIamPermissions' => array(
-              'path' => 'v1/{+resource}:testIamPermissions',
-              'httpMethod' => 'POST',
-              'parameters' => array(
-                'resource' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),
-          )
-        )
-    );
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudSourceRepositories/AuditConfig.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudSourceRepositories/AuditConfig.php
deleted file mode 100644
index 28d14b9b..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudSourceRepositories/AuditConfig.php
+++ /dev/null
@@ -1,50 +0,0 @@
-auditLogConfigs = $auditLogConfigs;
-  }
-  public function getAuditLogConfigs()
-  {
-    return $this->auditLogConfigs;
-  }
-  public function setExemptedMembers($exemptedMembers)
-  {
-    $this->exemptedMembers = $exemptedMembers;
-  }
-  public function getExemptedMembers()
-  {
-    return $this->exemptedMembers;
-  }
-  public function setService($service)
-  {
-    $this->service = $service;
-  }
-  public function getService()
-  {
-    return $this->service;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudSourceRepositories/AuditLogConfig.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudSourceRepositories/AuditLogConfig.php
deleted file mode 100644
index 6e518855..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudSourceRepositories/AuditLogConfig.php
+++ /dev/null
@@ -1,40 +0,0 @@
-exemptedMembers = $exemptedMembers;
-  }
-  public function getExemptedMembers()
-  {
-    return $this->exemptedMembers;
-  }
-  public function setLogType($logType)
-  {
-    $this->logType = $logType;
-  }
-  public function getLogType()
-  {
-    return $this->logType;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudSourceRepositories/Binding.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudSourceRepositories/Binding.php
deleted file mode 100644
index 4cec3792..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudSourceRepositories/Binding.php
+++ /dev/null
@@ -1,40 +0,0 @@
-members = $members;
-  }
-  public function getMembers()
-  {
-    return $this->members;
-  }
-  public function setRole($role)
-  {
-    $this->role = $role;
-  }
-  public function getRole()
-  {
-    return $this->role;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudSourceRepositories/CloudAuditOptions.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudSourceRepositories/CloudAuditOptions.php
deleted file mode 100644
index 48b8fc29..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudSourceRepositories/CloudAuditOptions.php
+++ /dev/null
@@ -1,20 +0,0 @@
-iam = $iam;
-  }
-  public function getIam()
-  {
-    return $this->iam;
-  }
-  public function setOp($op)
-  {
-    $this->op = $op;
-  }
-  public function getOp()
-  {
-    return $this->op;
-  }
-  public function setSvc($svc)
-  {
-    $this->svc = $svc;
-  }
-  public function getSvc()
-  {
-    return $this->svc;
-  }
-  public function setSys($sys)
-  {
-    $this->sys = $sys;
-  }
-  public function getSys()
-  {
-    return $this->sys;
-  }
-  public function setValue($value)
-  {
-    $this->value = $value;
-  }
-  public function getValue()
-  {
-    return $this->value;
-  }
-  public function setValues($values)
-  {
-    $this->values = $values;
-  }
-  public function getValues()
-  {
-    return $this->values;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudSourceRepositories/CounterOptions.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudSourceRepositories/CounterOptions.php
deleted file mode 100644
index bd46c5de..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudSourceRepositories/CounterOptions.php
+++ /dev/null
@@ -1,39 +0,0 @@
-field = $field;
-  }
-  public function getField()
-  {
-    return $this->field;
-  }
-  public function setMetric($metric)
-  {
-    $this->metric = $metric;
-  }
-  public function getMetric()
-  {
-    return $this->metric;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudSourceRepositories/DataAccessOptions.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudSourceRepositories/DataAccessOptions.php
deleted file mode 100644
index 7ca520ea..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudSourceRepositories/DataAccessOptions.php
+++ /dev/null
@@ -1,20 +0,0 @@
-repos = $repos;
-  }
-  public function getRepos()
-  {
-    return $this->repos;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudSourceRepositories/LogConfig.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudSourceRepositories/LogConfig.php
deleted file mode 100644
index dd5aec75..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudSourceRepositories/LogConfig.php
+++ /dev/null
@@ -1,51 +0,0 @@
-cloudAudit = $cloudAudit;
-  }
-  public function getCloudAudit()
-  {
-    return $this->cloudAudit;
-  }
-  public function setCounter(Google_Service_CloudSourceRepositories_CounterOptions $counter)
-  {
-    $this->counter = $counter;
-  }
-  public function getCounter()
-  {
-    return $this->counter;
-  }
-  public function setDataAccess(Google_Service_CloudSourceRepositories_DataAccessOptions $dataAccess)
-  {
-    $this->dataAccess = $dataAccess;
-  }
-  public function getDataAccess()
-  {
-    return $this->dataAccess;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudSourceRepositories/MirrorConfig.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudSourceRepositories/MirrorConfig.php
deleted file mode 100644
index ed8f6f0d..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudSourceRepositories/MirrorConfig.php
+++ /dev/null
@@ -1,48 +0,0 @@
-deployKeyId = $deployKeyId;
-  }
-  public function getDeployKeyId()
-  {
-    return $this->deployKeyId;
-  }
-  public function setUrl($url)
-  {
-    $this->url = $url;
-  }
-  public function getUrl()
-  {
-    return $this->url;
-  }
-  public function setWebhookId($webhookId)
-  {
-    $this->webhookId = $webhookId;
-  }
-  public function getWebhookId()
-  {
-    return $this->webhookId;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudSourceRepositories/Policy.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudSourceRepositories/Policy.php
deleted file mode 100644
index 8be72e81..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudSourceRepositories/Policy.php
+++ /dev/null
@@ -1,79 +0,0 @@
-auditConfigs = $auditConfigs;
-  }
-  public function getAuditConfigs()
-  {
-    return $this->auditConfigs;
-  }
-  public function setBindings($bindings)
-  {
-    $this->bindings = $bindings;
-  }
-  public function getBindings()
-  {
-    return $this->bindings;
-  }
-  public function setEtag($etag)
-  {
-    $this->etag = $etag;
-  }
-  public function getEtag()
-  {
-    return $this->etag;
-  }
-  public function setIamOwned($iamOwned)
-  {
-    $this->iamOwned = $iamOwned;
-  }
-  public function getIamOwned()
-  {
-    return $this->iamOwned;
-  }
-  public function setRules($rules)
-  {
-    $this->rules = $rules;
-  }
-  public function getRules()
-  {
-    return $this->rules;
-  }
-  public function setVersion($version)
-  {
-    $this->version = $version;
-  }
-  public function getVersion()
-  {
-    return $this->version;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudSourceRepositories/Repo.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudSourceRepositories/Repo.php
deleted file mode 100644
index 6dae23e0..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudSourceRepositories/Repo.php
+++ /dev/null
@@ -1,58 +0,0 @@
-mirrorConfig = $mirrorConfig;
-  }
-  public function getMirrorConfig()
-  {
-    return $this->mirrorConfig;
-  }
-  public function setName($name)
-  {
-    $this->name = $name;
-  }
-  public function getName()
-  {
-    return $this->name;
-  }
-  public function setSize($size)
-  {
-    $this->size = $size;
-  }
-  public function getSize()
-  {
-    return $this->size;
-  }
-  public function setUrl($url)
-  {
-    $this->url = $url;
-  }
-  public function getUrl()
-  {
-    return $this->url;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudSourceRepositories/Resource/Projects.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudSourceRepositories/Resource/Projects.php
deleted file mode 100644
index fcac6a61..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudSourceRepositories/Resource/Projects.php
+++ /dev/null
@@ -1,28 +0,0 @@
-
- *   $sourcerepoService = new Google_Service_CloudSourceRepositories(...);
- *   $projects = $sourcerepoService->projects;
- *  
- */
-class Google_Service_CloudSourceRepositories_Resource_Projects extends Google_Service_Resource
-{
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudSourceRepositories/Resource/ProjectsRepos.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudSourceRepositories/Resource/ProjectsRepos.php
deleted file mode 100644
index 8defb71c..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudSourceRepositories/Resource/ProjectsRepos.php
+++ /dev/null
@@ -1,139 +0,0 @@
-
- *   $sourcerepoService = new Google_Service_CloudSourceRepositories(...);
- *   $repos = $sourcerepoService->repos;
- *  
- */
-class Google_Service_CloudSourceRepositories_Resource_ProjectsRepos extends Google_Service_Resource
-{
-  /**
-   * Creates a repo in the given project with the given name..
-   *
-   * If the named repository already exists, `CreateRepo` returns
-   * `ALREADY_EXISTS`. (repos.create)
-   *
-   * @param string $parent The project in which to create the repo. Values are of
-   * the form `projects/`.
-   * @param Google_Service_CloudSourceRepositories_Repo $postBody
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_CloudSourceRepositories_Repo
-   */
-  public function create($parent, Google_Service_CloudSourceRepositories_Repo $postBody, $optParams = array())
-  {
-    $params = array('parent' => $parent, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('create', array($params), "Google_Service_CloudSourceRepositories_Repo");
-  }
-  /**
-   * Deletes a repo. (repos.delete)
-   *
-   * @param string $name The name of the repo to delete. Values are of the form
-   * `projects//repos/`.
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_CloudSourceRepositories_SourcerepoEmpty
-   */
-  public function delete($name, $optParams = array())
-  {
-    $params = array('name' => $name);
-    $params = array_merge($params, $optParams);
-    return $this->call('delete', array($params), "Google_Service_CloudSourceRepositories_SourcerepoEmpty");
-  }
-  /**
-   * Returns information about a repo. (repos.get)
-   *
-   * @param string $name The name of the requested repository. Values are of the
-   * form `projects//repos/`.
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_CloudSourceRepositories_Repo
-   */
-  public function get($name, $optParams = array())
-  {
-    $params = array('name' => $name);
-    $params = array_merge($params, $optParams);
-    return $this->call('get', array($params), "Google_Service_CloudSourceRepositories_Repo");
-  }
-  /**
-   * Gets the access control policy for a resource. Returns an empty policy if the
-   * resource exists and does not have a policy set. (repos.getIamPolicy)
-   *
-   * @param string $resource REQUIRED: The resource for which the policy is being
-   * requested. See the operation documentation for the appropriate value for this
-   * field.
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_CloudSourceRepositories_Policy
-   */
-  public function getIamPolicy($resource, $optParams = array())
-  {
-    $params = array('resource' => $resource);
-    $params = array_merge($params, $optParams);
-    return $this->call('getIamPolicy', array($params), "Google_Service_CloudSourceRepositories_Policy");
-  }
-  /**
-   * Returns all repos belonging to a project. (repos.listProjectsRepos)
-   *
-   * @param string $name The project ID whose repos should be listed. Values are
-   * of the form `projects/`.
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_CloudSourceRepositories_ListReposResponse
-   */
-  public function listProjectsRepos($name, $optParams = array())
-  {
-    $params = array('name' => $name);
-    $params = array_merge($params, $optParams);
-    return $this->call('list', array($params), "Google_Service_CloudSourceRepositories_ListReposResponse");
-  }
-  /**
-   * Sets the access control policy on the specified resource. Replaces any
-   * existing policy. (repos.setIamPolicy)
-   *
-   * @param string $resource REQUIRED: The resource for which the policy is being
-   * specified. See the operation documentation for the appropriate value for this
-   * field.
-   * @param Google_Service_CloudSourceRepositories_SetIamPolicyRequest $postBody
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_CloudSourceRepositories_Policy
-   */
-  public function setIamPolicy($resource, Google_Service_CloudSourceRepositories_SetIamPolicyRequest $postBody, $optParams = array())
-  {
-    $params = array('resource' => $resource, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('setIamPolicy', array($params), "Google_Service_CloudSourceRepositories_Policy");
-  }
-  /**
-   * Returns permissions that a caller has on the specified resource. If the
-   * resource does not exist, this will return an empty set of permissions, not a
-   * NOT_FOUND error. (repos.testIamPermissions)
-   *
-   * @param string $resource REQUIRED: The resource for which the policy detail is
-   * being requested. See the operation documentation for the appropriate value
-   * for this field.
-   * @param Google_Service_CloudSourceRepositories_TestIamPermissionsRequest $postBody
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_CloudSourceRepositories_TestIamPermissionsResponse
-   */
-  public function testIamPermissions($resource, Google_Service_CloudSourceRepositories_TestIamPermissionsRequest $postBody, $optParams = array())
-  {
-    $params = array('resource' => $resource, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('testIamPermissions', array($params), "Google_Service_CloudSourceRepositories_TestIamPermissionsResponse");
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudSourceRepositories/Rule.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudSourceRepositories/Rule.php
deleted file mode 100644
index fb546cda..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudSourceRepositories/Rule.php
+++ /dev/null
@@ -1,87 +0,0 @@
-action = $action;
-  }
-  public function getAction()
-  {
-    return $this->action;
-  }
-  public function setConditions($conditions)
-  {
-    $this->conditions = $conditions;
-  }
-  public function getConditions()
-  {
-    return $this->conditions;
-  }
-  public function setDescription($description)
-  {
-    $this->description = $description;
-  }
-  public function getDescription()
-  {
-    return $this->description;
-  }
-  public function setIn($in)
-  {
-    $this->in = $in;
-  }
-  public function getIn()
-  {
-    return $this->in;
-  }
-  public function setLogConfig($logConfig)
-  {
-    $this->logConfig = $logConfig;
-  }
-  public function getLogConfig()
-  {
-    return $this->logConfig;
-  }
-  public function setNotIn($notIn)
-  {
-    $this->notIn = $notIn;
-  }
-  public function getNotIn()
-  {
-    return $this->notIn;
-  }
-  public function setPermissions($permissions)
-  {
-    $this->permissions = $permissions;
-  }
-  public function getPermissions()
-  {
-    return $this->permissions;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudSourceRepositories/SetIamPolicyRequest.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudSourceRepositories/SetIamPolicyRequest.php
deleted file mode 100644
index f3539dbc..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudSourceRepositories/SetIamPolicyRequest.php
+++ /dev/null
@@ -1,40 +0,0 @@
-policy = $policy;
-  }
-  public function getPolicy()
-  {
-    return $this->policy;
-  }
-  public function setUpdateMask($updateMask)
-  {
-    $this->updateMask = $updateMask;
-  }
-  public function getUpdateMask()
-  {
-    return $this->updateMask;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudSourceRepositories/SourcerepoEmpty.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudSourceRepositories/SourcerepoEmpty.php
deleted file mode 100644
index 46cf8752..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudSourceRepositories/SourcerepoEmpty.php
+++ /dev/null
@@ -1,20 +0,0 @@
-permissions = $permissions;
-  }
-  public function getPermissions()
-  {
-    return $this->permissions;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudSourceRepositories/TestIamPermissionsResponse.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudSourceRepositories/TestIamPermissionsResponse.php
deleted file mode 100644
index f8cb728e..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudSourceRepositories/TestIamPermissionsResponse.php
+++ /dev/null
@@ -1,31 +0,0 @@
-permissions = $permissions;
-  }
-  public function getPermissions()
-  {
-    return $this->permissions;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudSpeechAPI.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudSpeechAPI.php
deleted file mode 100644
index 065ec190..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudSpeechAPI.php
+++ /dev/null
@@ -1,133 +0,0 @@
-
- * Google Cloud Speech API.

- *
- * 

- * For more information about this service, see the API
- * Documentation
- * 

- *
- * @author Google, Inc.
- */
-class Google_Service_CloudSpeechAPI extends Google_Service
-{
-  /** View and manage your data across Google Cloud Platform services. */
-  const CLOUD_PLATFORM =
-      "https://www.googleapis.com/auth/cloud-platform";
-
-  public $operations;
-  public $speech;
-  
-  /**
-   * Constructs the internal representation of the CloudSpeechAPI service.
-   *
-   * @param Google_Client $client
-   */
-  public function __construct(Google_Client $client)
-  {
-    parent::__construct($client);
-    $this->rootUrl = 'https://speech.googleapis.com/';
-    $this->servicePath = '';
-    $this->version = 'v1beta1';
-    $this->serviceName = 'speech';
-
-    $this->operations = new Google_Service_CloudSpeechAPI_Resource_Operations(
-        $this,
-        $this->serviceName,
-        'operations',
-        array(
-          'methods' => array(
-            'cancel' => array(
-              'path' => 'v1beta1/operations/{+name}:cancel',
-              'httpMethod' => 'POST',
-              'parameters' => array(
-                'name' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'delete' => array(
-              'path' => 'v1beta1/operations/{+name}',
-              'httpMethod' => 'DELETE',
-              'parameters' => array(
-                'name' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'get' => array(
-              'path' => 'v1beta1/operations/{+name}',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'name' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'list' => array(
-              'path' => 'v1beta1/operations',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'pageSize' => array(
-                  'location' => 'query',
-                  'type' => 'integer',
-                ),
-                'filter' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'name' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'pageToken' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-              ),
-            ),
-          )
-        )
-    );
-    $this->speech = new Google_Service_CloudSpeechAPI_Resource_Speech(
-        $this,
-        $this->serviceName,
-        'speech',
-        array(
-          'methods' => array(
-            'asyncrecognize' => array(
-              'path' => 'v1beta1/speech:asyncrecognize',
-              'httpMethod' => 'POST',
-              'parameters' => array(),
-            ),'syncrecognize' => array(
-              'path' => 'v1beta1/speech:syncrecognize',
-              'httpMethod' => 'POST',
-              'parameters' => array(),
-            ),
-          )
-        )
-    );
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudSpeechAPI/AsyncRecognizeRequest.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudSpeechAPI/AsyncRecognizeRequest.php
deleted file mode 100644
index cf03fbd9..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudSpeechAPI/AsyncRecognizeRequest.php
+++ /dev/null
@@ -1,41 +0,0 @@
-audio = $audio;
-  }
-  public function getAudio()
-  {
-    return $this->audio;
-  }
-  public function setConfig(Google_Service_CloudSpeechAPI_RecognitionConfig $config)
-  {
-    $this->config = $config;
-  }
-  public function getConfig()
-  {
-    return $this->config;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudSpeechAPI/CancelOperationRequest.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudSpeechAPI/CancelOperationRequest.php
deleted file mode 100644
index 123426e2..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudSpeechAPI/CancelOperationRequest.php
+++ /dev/null
@@ -1,20 +0,0 @@
-nextPageToken = $nextPageToken;
-  }
-  public function getNextPageToken()
-  {
-    return $this->nextPageToken;
-  }
-  public function setOperations($operations)
-  {
-    $this->operations = $operations;
-  }
-  public function getOperations()
-  {
-    return $this->operations;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudSpeechAPI/Operation.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudSpeechAPI/Operation.php
deleted file mode 100644
index 1f356d2d..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudSpeechAPI/Operation.php
+++ /dev/null
@@ -1,67 +0,0 @@
-done = $done;
-  }
-  public function getDone()
-  {
-    return $this->done;
-  }
-  public function setError(Google_Service_CloudSpeechAPI_Status $error)
-  {
-    $this->error = $error;
-  }
-  public function getError()
-  {
-    return $this->error;
-  }
-  public function setMetadata($metadata)
-  {
-    $this->metadata = $metadata;
-  }
-  public function getMetadata()
-  {
-    return $this->metadata;
-  }
-  public function setName($name)
-  {
-    $this->name = $name;
-  }
-  public function getName()
-  {
-    return $this->name;
-  }
-  public function setResponse($response)
-  {
-    $this->response = $response;
-  }
-  public function getResponse()
-  {
-    return $this->response;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudSpeechAPI/RecognitionAudio.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudSpeechAPI/RecognitionAudio.php
deleted file mode 100644
index 8b08ac8f..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudSpeechAPI/RecognitionAudio.php
+++ /dev/null
@@ -1,39 +0,0 @@
-content = $content;
-  }
-  public function getContent()
-  {
-    return $this->content;
-  }
-  public function setUri($uri)
-  {
-    $this->uri = $uri;
-  }
-  public function getUri()
-  {
-    return $this->uri;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudSpeechAPI/RecognitionConfig.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudSpeechAPI/RecognitionConfig.php
deleted file mode 100644
index a656b8de..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudSpeechAPI/RecognitionConfig.php
+++ /dev/null
@@ -1,76 +0,0 @@
-encoding = $encoding;
-  }
-  public function getEncoding()
-  {
-    return $this->encoding;
-  }
-  public function setLanguageCode($languageCode)
-  {
-    $this->languageCode = $languageCode;
-  }
-  public function getLanguageCode()
-  {
-    return $this->languageCode;
-  }
-  public function setMaxAlternatives($maxAlternatives)
-  {
-    $this->maxAlternatives = $maxAlternatives;
-  }
-  public function getMaxAlternatives()
-  {
-    return $this->maxAlternatives;
-  }
-  public function setProfanityFilter($profanityFilter)
-  {
-    $this->profanityFilter = $profanityFilter;
-  }
-  public function getProfanityFilter()
-  {
-    return $this->profanityFilter;
-  }
-  public function setSampleRate($sampleRate)
-  {
-    $this->sampleRate = $sampleRate;
-  }
-  public function getSampleRate()
-  {
-    return $this->sampleRate;
-  }
-  public function setSpeechContext(Google_Service_CloudSpeechAPI_SpeechContext $speechContext)
-  {
-    $this->speechContext = $speechContext;
-  }
-  public function getSpeechContext()
-  {
-    return $this->speechContext;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudSpeechAPI/Resource/Operations.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudSpeechAPI/Resource/Operations.php
deleted file mode 100644
index 07efe1ce..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudSpeechAPI/Resource/Operations.php
+++ /dev/null
@@ -1,100 +0,0 @@
-
- *   $speechService = new Google_Service_CloudSpeechAPI(...);
- *   $operations = $speechService->operations;
- *  
- */
-class Google_Service_CloudSpeechAPI_Resource_Operations extends Google_Service_Resource
-{
-  /**
-   * Starts asynchronous cancellation on a long-running operation.  The server
-   * makes a best effort to cancel the operation, but success is not guaranteed.
-   * If the server doesn't support this method, it returns
-   * `google.rpc.Code.UNIMPLEMENTED`.  Clients can use Operations.GetOperation or
-   * other methods to check whether the cancellation succeeded or whether the
-   * operation completed despite cancellation. (operations.cancel)
-   *
-   * @param string $name The name of the operation resource to be cancelled.
-   * @param Google_Service_CloudSpeechAPI_CancelOperationRequest $postBody
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_CloudSpeechAPI_SpeechEmpty
-   */
-  public function cancel($name, Google_Service_CloudSpeechAPI_CancelOperationRequest $postBody, $optParams = array())
-  {
-    $params = array('name' => $name, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('cancel', array($params), "Google_Service_CloudSpeechAPI_SpeechEmpty");
-  }
-  /**
-   * Deletes a long-running operation. This method indicates that the client is no
-   * longer interested in the operation result. It does not cancel the operation.
-   * If the server doesn't support this method, it returns
-   * `google.rpc.Code.UNIMPLEMENTED`. (operations.delete)
-   *
-   * @param string $name The name of the operation resource to be deleted.
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_CloudSpeechAPI_SpeechEmpty
-   */
-  public function delete($name, $optParams = array())
-  {
-    $params = array('name' => $name);
-    $params = array_merge($params, $optParams);
-    return $this->call('delete', array($params), "Google_Service_CloudSpeechAPI_SpeechEmpty");
-  }
-  /**
-   * Gets the latest state of a long-running operation.  Clients can use this
-   * method to poll the operation result at intervals as recommended by the API
-   * service. (operations.get)
-   *
-   * @param string $name The name of the operation resource.
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_CloudSpeechAPI_Operation
-   */
-  public function get($name, $optParams = array())
-  {
-    $params = array('name' => $name);
-    $params = array_merge($params, $optParams);
-    return $this->call('get', array($params), "Google_Service_CloudSpeechAPI_Operation");
-  }
-  /**
-   * Lists operations that match the specified filter in the request. If the
-   * server doesn't support this method, it returns `UNIMPLEMENTED`.
-   *
-   * NOTE: the `name` binding below allows API services to override the binding to
-   * use different resource name schemes, such as `users/operations`.
-   * (operations.listOperations)
-   *
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param int pageSize The standard list page size.
-   * @opt_param string filter The standard list filter.
-   * @opt_param string name The name of the operation collection.
-   * @opt_param string pageToken The standard list page token.
-   * @return Google_Service_CloudSpeechAPI_ListOperationsResponse
-   */
-  public function listOperations($optParams = array())
-  {
-    $params = array();
-    $params = array_merge($params, $optParams);
-    return $this->call('list', array($params), "Google_Service_CloudSpeechAPI_ListOperationsResponse");
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudSpeechAPI/Resource/Speech.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudSpeechAPI/Resource/Speech.php
deleted file mode 100644
index 694ecd44..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudSpeechAPI/Resource/Speech.php
+++ /dev/null
@@ -1,58 +0,0 @@
-
- *   $speechService = new Google_Service_CloudSpeechAPI(...);
- *   $speech = $speechService->speech;
- *  
- */
-class Google_Service_CloudSpeechAPI_Resource_Speech extends Google_Service_Resource
-{
-  /**
-   * Perform asynchronous speech-recognition: receive results via the
-   * google.longrunning.Operations interface. Returns either an `Operation.error`
-   * or an `Operation.response` which contains an `AsyncRecognizeResponse`
-   * message. (speech.asyncrecognize)
-   *
-   * @param Google_Service_CloudSpeechAPI_AsyncRecognizeRequest $postBody
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_CloudSpeechAPI_Operation
-   */
-  public function asyncrecognize(Google_Service_CloudSpeechAPI_AsyncRecognizeRequest $postBody, $optParams = array())
-  {
-    $params = array('postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('asyncrecognize', array($params), "Google_Service_CloudSpeechAPI_Operation");
-  }
-  /**
-   * Perform synchronous speech-recognition: receive results after all audio has
-   * been sent and processed. (speech.syncrecognize)
-   *
-   * @param Google_Service_CloudSpeechAPI_SyncRecognizeRequest $postBody
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_CloudSpeechAPI_SyncRecognizeResponse
-   */
-  public function syncrecognize(Google_Service_CloudSpeechAPI_SyncRecognizeRequest $postBody, $optParams = array())
-  {
-    $params = array('postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('syncrecognize', array($params), "Google_Service_CloudSpeechAPI_SyncRecognizeResponse");
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudSpeechAPI/SpeechContext.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudSpeechAPI/SpeechContext.php
deleted file mode 100644
index 256dfd05..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudSpeechAPI/SpeechContext.php
+++ /dev/null
@@ -1,31 +0,0 @@
-phrases = $phrases;
-  }
-  public function getPhrases()
-  {
-    return $this->phrases;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudSpeechAPI/SpeechEmpty.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudSpeechAPI/SpeechEmpty.php
deleted file mode 100644
index e699d424..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudSpeechAPI/SpeechEmpty.php
+++ /dev/null
@@ -1,20 +0,0 @@
-confidence = $confidence;
-  }
-  public function getConfidence()
-  {
-    return $this->confidence;
-  }
-  public function setTranscript($transcript)
-  {
-    $this->transcript = $transcript;
-  }
-  public function getTranscript()
-  {
-    return $this->transcript;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudSpeechAPI/SpeechRecognitionResult.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudSpeechAPI/SpeechRecognitionResult.php
deleted file mode 100644
index 5bab6493..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudSpeechAPI/SpeechRecognitionResult.php
+++ /dev/null
@@ -1,32 +0,0 @@
-alternatives = $alternatives;
-  }
-  public function getAlternatives()
-  {
-    return $this->alternatives;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudSpeechAPI/Status.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudSpeechAPI/Status.php
deleted file mode 100644
index 62ed7860..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudSpeechAPI/Status.php
+++ /dev/null
@@ -1,49 +0,0 @@
-code = $code;
-  }
-  public function getCode()
-  {
-    return $this->code;
-  }
-  public function setDetails($details)
-  {
-    $this->details = $details;
-  }
-  public function getDetails()
-  {
-    return $this->details;
-  }
-  public function setMessage($message)
-  {
-    $this->message = $message;
-  }
-  public function getMessage()
-  {
-    return $this->message;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudSpeechAPI/SyncRecognizeRequest.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudSpeechAPI/SyncRecognizeRequest.php
deleted file mode 100644
index 0cb07439..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudSpeechAPI/SyncRecognizeRequest.php
+++ /dev/null
@@ -1,41 +0,0 @@
-audio = $audio;
-  }
-  public function getAudio()
-  {
-    return $this->audio;
-  }
-  public function setConfig(Google_Service_CloudSpeechAPI_RecognitionConfig $config)
-  {
-    $this->config = $config;
-  }
-  public function getConfig()
-  {
-    return $this->config;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudSpeechAPI/SyncRecognizeResponse.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudSpeechAPI/SyncRecognizeResponse.php
deleted file mode 100644
index 753753bb..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudSpeechAPI/SyncRecognizeResponse.php
+++ /dev/null
@@ -1,32 +0,0 @@
-results = $results;
-  }
-  public function getResults()
-  {
-    return $this->results;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudTrace.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudTrace.php
deleted file mode 100644
index 8a7b7876..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudTrace.php
+++ /dev/null
@@ -1,146 +0,0 @@
-
- * Send and retrieve trace data from Stackdriver Trace. Data is generated and
- * available by default for all App Engine applications. Data from other
- * applications can be written to Stackdriver Trace for display, reporting, and
- * analysis.

- *
- * 

- * For more information about this service, see the API
- * Documentation
- * 

- *
- * @author Google, Inc.
- */
-class Google_Service_CloudTrace extends Google_Service
-{
-  /** View and manage your data across Google Cloud Platform services. */
-  const CLOUD_PLATFORM =
-      "https://www.googleapis.com/auth/cloud-platform";
-  /** Write Trace data for a project or application. */
-  const TRACE_APPEND =
-      "https://www.googleapis.com/auth/trace.append";
-  /** Read Trace data for a project or application. */
-  const TRACE_READONLY =
-      "https://www.googleapis.com/auth/trace.readonly";
-
-  public $projects;
-  public $projects_traces;
-  
-  /**
-   * Constructs the internal representation of the CloudTrace service.
-   *
-   * @param Google_Client $client
-   */
-  public function __construct(Google_Client $client)
-  {
-    parent::__construct($client);
-    $this->rootUrl = 'https://cloudtrace.googleapis.com/';
-    $this->servicePath = '';
-    $this->version = 'v1';
-    $this->serviceName = 'cloudtrace';
-
-    $this->projects = new Google_Service_CloudTrace_Resource_Projects(
-        $this,
-        $this->serviceName,
-        'projects',
-        array(
-          'methods' => array(
-            'patchTraces' => array(
-              'path' => 'v1/projects/{projectId}/traces',
-              'httpMethod' => 'PATCH',
-              'parameters' => array(
-                'projectId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),
-          )
-        )
-    );
-    $this->projects_traces = new Google_Service_CloudTrace_Resource_ProjectsTraces(
-        $this,
-        $this->serviceName,
-        'traces',
-        array(
-          'methods' => array(
-            'get' => array(
-              'path' => 'v1/projects/{projectId}/traces/{traceId}',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'projectId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'traceId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'list' => array(
-              'path' => 'v1/projects/{projectId}/traces',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'projectId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'orderBy' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'filter' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'endTime' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'pageToken' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'startTime' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'pageSize' => array(
-                  'location' => 'query',
-                  'type' => 'integer',
-                ),
-                'view' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-              ),
-            ),
-          )
-        )
-    );
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudTrace/CloudtraceEmpty.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudTrace/CloudtraceEmpty.php
deleted file mode 100644
index 70f91b23..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudTrace/CloudtraceEmpty.php
+++ /dev/null
@@ -1,20 +0,0 @@
-nextPageToken = $nextPageToken;
-  }
-  public function getNextPageToken()
-  {
-    return $this->nextPageToken;
-  }
-  public function setTraces($traces)
-  {
-    $this->traces = $traces;
-  }
-  public function getTraces()
-  {
-    return $this->traces;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudTrace/Resource/Projects.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudTrace/Resource/Projects.php
deleted file mode 100644
index 18a26dbe..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudTrace/Resource/Projects.php
+++ /dev/null
@@ -1,47 +0,0 @@
-
- *   $cloudtraceService = new Google_Service_CloudTrace(...);
- *   $projects = $cloudtraceService->projects;
- *  
- */
-class Google_Service_CloudTrace_Resource_Projects extends Google_Service_Resource
-{
-  /**
-   * Sends new traces to Stackdriver Trace or updates existing traces. If the ID
-   * of a trace that you send matches that of an existing trace, any fields in the
-   * existing trace and its spans are overwritten by the provided values, and any
-   * new fields provided are merged with the existing trace data. If the ID does
-   * not match, a new trace is created. (projects.patchTraces)
-   *
-   * @param string $projectId ID of the Cloud project where the trace data is
-   * stored.
-   * @param Google_Service_CloudTrace_Traces $postBody
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_CloudTrace_CloudtraceEmpty
-   */
-  public function patchTraces($projectId, Google_Service_CloudTrace_Traces $postBody, $optParams = array())
-  {
-    $params = array('projectId' => $projectId, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('patchTraces', array($params), "Google_Service_CloudTrace_CloudtraceEmpty");
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudTrace/Resource/ProjectsTraces.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudTrace/Resource/ProjectsTraces.php
deleted file mode 100644
index 2fe3f790..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudTrace/Resource/ProjectsTraces.php
+++ /dev/null
@@ -1,83 +0,0 @@
-
- *   $cloudtraceService = new Google_Service_CloudTrace(...);
- *   $traces = $cloudtraceService->traces;
- *  
- */
-class Google_Service_CloudTrace_Resource_ProjectsTraces extends Google_Service_Resource
-{
-  /**
-   * Gets a single trace by its ID. (traces.get)
-   *
-   * @param string $projectId ID of the Cloud project where the trace data is
-   * stored.
-   * @param string $traceId ID of the trace to return.
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_CloudTrace_Trace
-   */
-  public function get($projectId, $traceId, $optParams = array())
-  {
-    $params = array('projectId' => $projectId, 'traceId' => $traceId);
-    $params = array_merge($params, $optParams);
-    return $this->call('get', array($params), "Google_Service_CloudTrace_Trace");
-  }
-  /**
-   * Returns of a list of traces that match the specified filter conditions.
-   * (traces.listProjectsTraces)
-   *
-   * @param string $projectId ID of the Cloud project where the trace data is
-   * stored.
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param string orderBy Field used to sort the returned traces. Optional.
-   * Can be one of the following:
-   *
-   * *   `trace_id` *   `name` (`name` field of root span in the trace) *
-   * `duration` (difference between `end_time` and `start_time` fields of      the
-   * root span) *   `start` (`start_time` field of the root span)
-   *
-   * Descending order can be specified by appending `desc` to the sort field (for
-   * example, `name desc`).
-   *
-   * Only one sort field is permitted.
-   * @opt_param string filter An optional filter for the request.
-   * @opt_param string endTime Start of the time interval (inclusive) during which
-   * the trace data was collected from the application.
-   * @opt_param string pageToken Token identifying the page of results to return.
-   * If provided, use the value of the `next_page_token` field from a previous
-   * request. Optional.
-   * @opt_param string startTime End of the time interval (inclusive) during which
-   * the trace data was collected from the application.
-   * @opt_param int pageSize Maximum number of traces to return. If not specified
-   * or <= 0, the implementation selects a reasonable value.  The implementation
-   * may return fewer traces than the requested page size. Optional.
-   * @opt_param string view Type of data returned for traces in the list.
-   * Optional. Default is `MINIMAL`.
-   * @return Google_Service_CloudTrace_ListTracesResponse
-   */
-  public function listProjectsTraces($projectId, $optParams = array())
-  {
-    $params = array('projectId' => $projectId);
-    $params = array_merge($params, $optParams);
-    return $this->call('list', array($params), "Google_Service_CloudTrace_ListTracesResponse");
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudTrace/Trace.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudTrace/Trace.php
deleted file mode 100644
index f44f3558..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudTrace/Trace.php
+++ /dev/null
@@ -1,50 +0,0 @@
-projectId = $projectId;
-  }
-  public function getProjectId()
-  {
-    return $this->projectId;
-  }
-  public function setSpans($spans)
-  {
-    $this->spans = $spans;
-  }
-  public function getSpans()
-  {
-    return $this->spans;
-  }
-  public function setTraceId($traceId)
-  {
-    $this->traceId = $traceId;
-  }
-  public function getTraceId()
-  {
-    return $this->traceId;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudTrace/TraceSpan.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudTrace/TraceSpan.php
deleted file mode 100644
index d14b2f8f..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudTrace/TraceSpan.php
+++ /dev/null
@@ -1,84 +0,0 @@
-endTime = $endTime;
-  }
-  public function getEndTime()
-  {
-    return $this->endTime;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setLabels($labels)
-  {
-    $this->labels = $labels;
-  }
-  public function getLabels()
-  {
-    return $this->labels;
-  }
-  public function setName($name)
-  {
-    $this->name = $name;
-  }
-  public function getName()
-  {
-    return $this->name;
-  }
-  public function setParentSpanId($parentSpanId)
-  {
-    $this->parentSpanId = $parentSpanId;
-  }
-  public function getParentSpanId()
-  {
-    return $this->parentSpanId;
-  }
-  public function setSpanId($spanId)
-  {
-    $this->spanId = $spanId;
-  }
-  public function getSpanId()
-  {
-    return $this->spanId;
-  }
-  public function setStartTime($startTime)
-  {
-    $this->startTime = $startTime;
-  }
-  public function getStartTime()
-  {
-    return $this->startTime;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudTrace/Traces.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudTrace/Traces.php
deleted file mode 100644
index 411f545c..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudTrace/Traces.php
+++ /dev/null
@@ -1,32 +0,0 @@
-traces = $traces;
-  }
-  public function getTraces()
-  {
-    return $this->traces;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudUserAccounts.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudUserAccounts.php
deleted file mode 100644
index 615084f3..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudUserAccounts.php
+++ /dev/null
@@ -1,514 +0,0 @@
-
- * Creates and manages users and groups for accessing Google Compute Engine
- * virtual machines.

- *
- * 

- * For more information about this service, see the API
- * Documentation
- * 

- *
- * @author Google, Inc.
- */
-class Google_Service_CloudUserAccounts extends Google_Service
-{
-  /** View and manage your data across Google Cloud Platform services. */
-  const CLOUD_PLATFORM =
-      "https://www.googleapis.com/auth/cloud-platform";
-  /** View your data across Google Cloud Platform services. */
-  const CLOUD_PLATFORM_READ_ONLY =
-      "https://www.googleapis.com/auth/cloud-platform.read-only";
-  /** Manage your Google Cloud User Accounts. */
-  const CLOUD_USERACCOUNTS =
-      "https://www.googleapis.com/auth/cloud.useraccounts";
-  /** View your Google Cloud User Accounts. */
-  const CLOUD_USERACCOUNTS_READONLY =
-      "https://www.googleapis.com/auth/cloud.useraccounts.readonly";
-
-  public $globalAccountsOperations;
-  public $groups;
-  public $linux;
-  public $users;
-  
-  /**
-   * Constructs the internal representation of the CloudUserAccounts service.
-   *
-   * @param Google_Client $client
-   */
-  public function __construct(Google_Client $client)
-  {
-    parent::__construct($client);
-    $this->rootUrl = 'https://www.googleapis.com/';
-    $this->servicePath = 'clouduseraccounts/vm_alpha/projects/';
-    $this->version = 'vm_alpha';
-    $this->serviceName = 'clouduseraccounts';
-
-    $this->globalAccountsOperations = new Google_Service_CloudUserAccounts_Resource_GlobalAccountsOperations(
-        $this,
-        $this->serviceName,
-        'globalAccountsOperations',
-        array(
-          'methods' => array(
-            'delete' => array(
-              'path' => '{project}/global/operations/{operation}',
-              'httpMethod' => 'DELETE',
-              'parameters' => array(
-                'project' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'operation' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'get' => array(
-              'path' => '{project}/global/operations/{operation}',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'project' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'operation' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'list' => array(
-              'path' => '{project}/global/operations',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'project' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'filter' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'maxResults' => array(
-                  'location' => 'query',
-                  'type' => 'integer',
-                ),
-                'orderBy' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'pageToken' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-              ),
-            ),
-          )
-        )
-    );
-    $this->groups = new Google_Service_CloudUserAccounts_Resource_Groups(
-        $this,
-        $this->serviceName,
-        'groups',
-        array(
-          'methods' => array(
-            'addMember' => array(
-              'path' => '{project}/global/groups/{groupName}/addMember',
-              'httpMethod' => 'POST',
-              'parameters' => array(
-                'project' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'groupName' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'delete' => array(
-              'path' => '{project}/global/groups/{groupName}',
-              'httpMethod' => 'DELETE',
-              'parameters' => array(
-                'project' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'groupName' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'get' => array(
-              'path' => '{project}/global/groups/{groupName}',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'project' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'groupName' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'getIamPolicy' => array(
-              'path' => '{project}/global/groups/{resource}/getIamPolicy',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'project' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'resource' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'insert' => array(
-              'path' => '{project}/global/groups',
-              'httpMethod' => 'POST',
-              'parameters' => array(
-                'project' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'list' => array(
-              'path' => '{project}/global/groups',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'project' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'filter' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'maxResults' => array(
-                  'location' => 'query',
-                  'type' => 'integer',
-                ),
-                'orderBy' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'pageToken' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-              ),
-            ),'removeMember' => array(
-              'path' => '{project}/global/groups/{groupName}/removeMember',
-              'httpMethod' => 'POST',
-              'parameters' => array(
-                'project' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'groupName' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'setIamPolicy' => array(
-              'path' => '{project}/global/groups/{resource}/setIamPolicy',
-              'httpMethod' => 'POST',
-              'parameters' => array(
-                'project' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'resource' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'testIamPermissions' => array(
-              'path' => '{project}/global/groups/{resource}/testIamPermissions',
-              'httpMethod' => 'POST',
-              'parameters' => array(
-                'project' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'resource' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),
-          )
-        )
-    );
-    $this->linux = new Google_Service_CloudUserAccounts_Resource_Linux(
-        $this,
-        $this->serviceName,
-        'linux',
-        array(
-          'methods' => array(
-            'getAuthorizedKeysView' => array(
-              'path' => '{project}/zones/{zone}/authorizedKeysView/{user}',
-              'httpMethod' => 'POST',
-              'parameters' => array(
-                'project' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'zone' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'user' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'instance' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'login' => array(
-                  'location' => 'query',
-                  'type' => 'boolean',
-                ),
-              ),
-            ),'getLinuxAccountViews' => array(
-              'path' => '{project}/zones/{zone}/linuxAccountViews',
-              'httpMethod' => 'POST',
-              'parameters' => array(
-                'project' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'zone' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'instance' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'filter' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'maxResults' => array(
-                  'location' => 'query',
-                  'type' => 'integer',
-                ),
-                'orderBy' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'pageToken' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-              ),
-            ),
-          )
-        )
-    );
-    $this->users = new Google_Service_CloudUserAccounts_Resource_Users(
-        $this,
-        $this->serviceName,
-        'users',
-        array(
-          'methods' => array(
-            'addPublicKey' => array(
-              'path' => '{project}/global/users/{user}/addPublicKey',
-              'httpMethod' => 'POST',
-              'parameters' => array(
-                'project' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'user' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'delete' => array(
-              'path' => '{project}/global/users/{user}',
-              'httpMethod' => 'DELETE',
-              'parameters' => array(
-                'project' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'user' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'get' => array(
-              'path' => '{project}/global/users/{user}',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'project' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'user' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'getIamPolicy' => array(
-              'path' => '{project}/global/users/{resource}/getIamPolicy',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'project' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'resource' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'insert' => array(
-              'path' => '{project}/global/users',
-              'httpMethod' => 'POST',
-              'parameters' => array(
-                'project' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'list' => array(
-              'path' => '{project}/global/users',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'project' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'filter' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'maxResults' => array(
-                  'location' => 'query',
-                  'type' => 'integer',
-                ),
-                'orderBy' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'pageToken' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-              ),
-            ),'removePublicKey' => array(
-              'path' => '{project}/global/users/{user}/removePublicKey',
-              'httpMethod' => 'POST',
-              'parameters' => array(
-                'project' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'user' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'fingerprint' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'setIamPolicy' => array(
-              'path' => '{project}/global/users/{resource}/setIamPolicy',
-              'httpMethod' => 'POST',
-              'parameters' => array(
-                'project' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'resource' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'testIamPermissions' => array(
-              'path' => '{project}/global/users/{resource}/testIamPermissions',
-              'httpMethod' => 'POST',
-              'parameters' => array(
-                'project' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'resource' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),
-          )
-        )
-    );
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudUserAccounts/AuditConfig.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudUserAccounts/AuditConfig.php
deleted file mode 100644
index aeef16e0..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudUserAccounts/AuditConfig.php
+++ /dev/null
@@ -1,40 +0,0 @@
-exemptedMembers = $exemptedMembers;
-  }
-  public function getExemptedMembers()
-  {
-    return $this->exemptedMembers;
-  }
-  public function setService($service)
-  {
-    $this->service = $service;
-  }
-  public function getService()
-  {
-    return $this->service;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudUserAccounts/AuthorizedKeysView.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudUserAccounts/AuthorizedKeysView.php
deleted file mode 100644
index 839aa89b..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudUserAccounts/AuthorizedKeysView.php
+++ /dev/null
@@ -1,40 +0,0 @@
-keys = $keys;
-  }
-  public function getKeys()
-  {
-    return $this->keys;
-  }
-  public function setSudoer($sudoer)
-  {
-    $this->sudoer = $sudoer;
-  }
-  public function getSudoer()
-  {
-    return $this->sudoer;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudUserAccounts/Binding.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudUserAccounts/Binding.php
deleted file mode 100644
index 187630d4..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudUserAccounts/Binding.php
+++ /dev/null
@@ -1,40 +0,0 @@
-members = $members;
-  }
-  public function getMembers()
-  {
-    return $this->members;
-  }
-  public function setRole($role)
-  {
-    $this->role = $role;
-  }
-  public function getRole()
-  {
-    return $this->role;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudUserAccounts/Condition.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudUserAccounts/Condition.php
deleted file mode 100644
index 51da8763..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudUserAccounts/Condition.php
+++ /dev/null
@@ -1,76 +0,0 @@
-iam = $iam;
-  }
-  public function getIam()
-  {
-    return $this->iam;
-  }
-  public function setOp($op)
-  {
-    $this->op = $op;
-  }
-  public function getOp()
-  {
-    return $this->op;
-  }
-  public function setSvc($svc)
-  {
-    $this->svc = $svc;
-  }
-  public function getSvc()
-  {
-    return $this->svc;
-  }
-  public function setSys($sys)
-  {
-    $this->sys = $sys;
-  }
-  public function getSys()
-  {
-    return $this->sys;
-  }
-  public function setValue($value)
-  {
-    $this->value = $value;
-  }
-  public function getValue()
-  {
-    return $this->value;
-  }
-  public function setValues($values)
-  {
-    $this->values = $values;
-  }
-  public function getValues()
-  {
-    return $this->values;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudUserAccounts/Group.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudUserAccounts/Group.php
deleted file mode 100644
index b7bb5f58..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudUserAccounts/Group.php
+++ /dev/null
@@ -1,85 +0,0 @@
-creationTimestamp = $creationTimestamp;
-  }
-  public function getCreationTimestamp()
-  {
-    return $this->creationTimestamp;
-  }
-  public function setDescription($description)
-  {
-    $this->description = $description;
-  }
-  public function getDescription()
-  {
-    return $this->description;
-  }
-  public function setId($id)
-  {
-    $this->id = $id;
-  }
-  public function getId()
-  {
-    return $this->id;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setMembers($members)
-  {
-    $this->members = $members;
-  }
-  public function getMembers()
-  {
-    return $this->members;
-  }
-  public function setName($name)
-  {
-    $this->name = $name;
-  }
-  public function getName()
-  {
-    return $this->name;
-  }
-  public function setSelfLink($selfLink)
-  {
-    $this->selfLink = $selfLink;
-  }
-  public function getSelfLink()
-  {
-    return $this->selfLink;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudUserAccounts/GroupList.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudUserAccounts/GroupList.php
deleted file mode 100644
index 89e71e64..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudUserAccounts/GroupList.php
+++ /dev/null
@@ -1,68 +0,0 @@
-id = $id;
-  }
-  public function getId()
-  {
-    return $this->id;
-  }
-  public function setItems($items)
-  {
-    $this->items = $items;
-  }
-  public function getItems()
-  {
-    return $this->items;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setNextPageToken($nextPageToken)
-  {
-    $this->nextPageToken = $nextPageToken;
-  }
-  public function getNextPageToken()
-  {
-    return $this->nextPageToken;
-  }
-  public function setSelfLink($selfLink)
-  {
-    $this->selfLink = $selfLink;
-  }
-  public function getSelfLink()
-  {
-    return $this->selfLink;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudUserAccounts/GroupsAddMemberRequest.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudUserAccounts/GroupsAddMemberRequest.php
deleted file mode 100644
index 7683d8fa..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudUserAccounts/GroupsAddMemberRequest.php
+++ /dev/null
@@ -1,31 +0,0 @@
-users = $users;
-  }
-  public function getUsers()
-  {
-    return $this->users;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudUserAccounts/GroupsRemoveMemberRequest.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudUserAccounts/GroupsRemoveMemberRequest.php
deleted file mode 100644
index 5d5cf7c8..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudUserAccounts/GroupsRemoveMemberRequest.php
+++ /dev/null
@@ -1,31 +0,0 @@
-users = $users;
-  }
-  public function getUsers()
-  {
-    return $this->users;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudUserAccounts/LinuxAccountViews.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudUserAccounts/LinuxAccountViews.php
deleted file mode 100644
index c7498762..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudUserAccounts/LinuxAccountViews.php
+++ /dev/null
@@ -1,51 +0,0 @@
-groupViews = $groupViews;
-  }
-  public function getGroupViews()
-  {
-    return $this->groupViews;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setUserViews($userViews)
-  {
-    $this->userViews = $userViews;
-  }
-  public function getUserViews()
-  {
-    return $this->userViews;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudUserAccounts/LinuxGetAuthorizedKeysViewResponse.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudUserAccounts/LinuxGetAuthorizedKeysViewResponse.php
deleted file mode 100644
index 04442f27..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudUserAccounts/LinuxGetAuthorizedKeysViewResponse.php
+++ /dev/null
@@ -1,31 +0,0 @@
-resource = $resource;
-  }
-  public function getResource()
-  {
-    return $this->resource;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudUserAccounts/LinuxGetLinuxAccountViewsResponse.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudUserAccounts/LinuxGetLinuxAccountViewsResponse.php
deleted file mode 100644
index 97979a16..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudUserAccounts/LinuxGetLinuxAccountViewsResponse.php
+++ /dev/null
@@ -1,31 +0,0 @@
-resource = $resource;
-  }
-  public function getResource()
-  {
-    return $this->resource;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudUserAccounts/LinuxGroupView.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudUserAccounts/LinuxGroupView.php
deleted file mode 100644
index 9faa5af9..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudUserAccounts/LinuxGroupView.php
+++ /dev/null
@@ -1,49 +0,0 @@
-gid = $gid;
-  }
-  public function getGid()
-  {
-    return $this->gid;
-  }
-  public function setGroupName($groupName)
-  {
-    $this->groupName = $groupName;
-  }
-  public function getGroupName()
-  {
-    return $this->groupName;
-  }
-  public function setMembers($members)
-  {
-    $this->members = $members;
-  }
-  public function getMembers()
-  {
-    return $this->members;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudUserAccounts/LinuxUserView.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudUserAccounts/LinuxUserView.php
deleted file mode 100644
index c1fedb20..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudUserAccounts/LinuxUserView.php
+++ /dev/null
@@ -1,75 +0,0 @@
-gecos = $gecos;
-  }
-  public function getGecos()
-  {
-    return $this->gecos;
-  }
-  public function setGid($gid)
-  {
-    $this->gid = $gid;
-  }
-  public function getGid()
-  {
-    return $this->gid;
-  }
-  public function setHomeDirectory($homeDirectory)
-  {
-    $this->homeDirectory = $homeDirectory;
-  }
-  public function getHomeDirectory()
-  {
-    return $this->homeDirectory;
-  }
-  public function setShell($shell)
-  {
-    $this->shell = $shell;
-  }
-  public function getShell()
-  {
-    return $this->shell;
-  }
-  public function setUid($uid)
-  {
-    $this->uid = $uid;
-  }
-  public function getUid()
-  {
-    return $this->uid;
-  }
-  public function setUsername($username)
-  {
-    $this->username = $username;
-  }
-  public function getUsername()
-  {
-    return $this->username;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudUserAccounts/LogConfig.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudUserAccounts/LogConfig.php
deleted file mode 100644
index 2b4839e7..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudUserAccounts/LogConfig.php
+++ /dev/null
@@ -1,31 +0,0 @@
-counter = $counter;
-  }
-  public function getCounter()
-  {
-    return $this->counter;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudUserAccounts/LogConfigCounterOptions.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudUserAccounts/LogConfigCounterOptions.php
deleted file mode 100644
index 4efe7f1f..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudUserAccounts/LogConfigCounterOptions.php
+++ /dev/null
@@ -1,39 +0,0 @@
-field = $field;
-  }
-  public function getField()
-  {
-    return $this->field;
-  }
-  public function setMetric($metric)
-  {
-    $this->metric = $metric;
-  }
-  public function getMetric()
-  {
-    return $this->metric;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudUserAccounts/Operation.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudUserAccounts/Operation.php
deleted file mode 100644
index 851faf5e..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudUserAccounts/Operation.php
+++ /dev/null
@@ -1,231 +0,0 @@
-clientOperationId = $clientOperationId;
-  }
-  public function getClientOperationId()
-  {
-    return $this->clientOperationId;
-  }
-  public function setCreationTimestamp($creationTimestamp)
-  {
-    $this->creationTimestamp = $creationTimestamp;
-  }
-  public function getCreationTimestamp()
-  {
-    return $this->creationTimestamp;
-  }
-  public function setDescription($description)
-  {
-    $this->description = $description;
-  }
-  public function getDescription()
-  {
-    return $this->description;
-  }
-  public function setEndTime($endTime)
-  {
-    $this->endTime = $endTime;
-  }
-  public function getEndTime()
-  {
-    return $this->endTime;
-  }
-  public function setError(Google_Service_CloudUserAccounts_OperationError $error)
-  {
-    $this->error = $error;
-  }
-  public function getError()
-  {
-    return $this->error;
-  }
-  public function setHttpErrorMessage($httpErrorMessage)
-  {
-    $this->httpErrorMessage = $httpErrorMessage;
-  }
-  public function getHttpErrorMessage()
-  {
-    return $this->httpErrorMessage;
-  }
-  public function setHttpErrorStatusCode($httpErrorStatusCode)
-  {
-    $this->httpErrorStatusCode = $httpErrorStatusCode;
-  }
-  public function getHttpErrorStatusCode()
-  {
-    return $this->httpErrorStatusCode;
-  }
-  public function setId($id)
-  {
-    $this->id = $id;
-  }
-  public function getId()
-  {
-    return $this->id;
-  }
-  public function setInsertTime($insertTime)
-  {
-    $this->insertTime = $insertTime;
-  }
-  public function getInsertTime()
-  {
-    return $this->insertTime;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setName($name)
-  {
-    $this->name = $name;
-  }
-  public function getName()
-  {
-    return $this->name;
-  }
-  public function setOperationType($operationType)
-  {
-    $this->operationType = $operationType;
-  }
-  public function getOperationType()
-  {
-    return $this->operationType;
-  }
-  public function setProgress($progress)
-  {
-    $this->progress = $progress;
-  }
-  public function getProgress()
-  {
-    return $this->progress;
-  }
-  public function setRegion($region)
-  {
-    $this->region = $region;
-  }
-  public function getRegion()
-  {
-    return $this->region;
-  }
-  public function setSelfLink($selfLink)
-  {
-    $this->selfLink = $selfLink;
-  }
-  public function getSelfLink()
-  {
-    return $this->selfLink;
-  }
-  public function setStartTime($startTime)
-  {
-    $this->startTime = $startTime;
-  }
-  public function getStartTime()
-  {
-    return $this->startTime;
-  }
-  public function setStatus($status)
-  {
-    $this->status = $status;
-  }
-  public function getStatus()
-  {
-    return $this->status;
-  }
-  public function setStatusMessage($statusMessage)
-  {
-    $this->statusMessage = $statusMessage;
-  }
-  public function getStatusMessage()
-  {
-    return $this->statusMessage;
-  }
-  public function setTargetId($targetId)
-  {
-    $this->targetId = $targetId;
-  }
-  public function getTargetId()
-  {
-    return $this->targetId;
-  }
-  public function setTargetLink($targetLink)
-  {
-    $this->targetLink = $targetLink;
-  }
-  public function getTargetLink()
-  {
-    return $this->targetLink;
-  }
-  public function setUser($user)
-  {
-    $this->user = $user;
-  }
-  public function getUser()
-  {
-    return $this->user;
-  }
-  public function setWarnings($warnings)
-  {
-    $this->warnings = $warnings;
-  }
-  public function getWarnings()
-  {
-    return $this->warnings;
-  }
-  public function setZone($zone)
-  {
-    $this->zone = $zone;
-  }
-  public function getZone()
-  {
-    return $this->zone;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudUserAccounts/OperationError.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudUserAccounts/OperationError.php
deleted file mode 100644
index 87f1583a..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudUserAccounts/OperationError.php
+++ /dev/null
@@ -1,32 +0,0 @@
-errors = $errors;
-  }
-  public function getErrors()
-  {
-    return $this->errors;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudUserAccounts/OperationErrorErrors.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudUserAccounts/OperationErrorErrors.php
deleted file mode 100644
index 59fccfb6..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudUserAccounts/OperationErrorErrors.php
+++ /dev/null
@@ -1,48 +0,0 @@
-code = $code;
-  }
-  public function getCode()
-  {
-    return $this->code;
-  }
-  public function setLocation($location)
-  {
-    $this->location = $location;
-  }
-  public function getLocation()
-  {
-    return $this->location;
-  }
-  public function setMessage($message)
-  {
-    $this->message = $message;
-  }
-  public function getMessage()
-  {
-    return $this->message;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudUserAccounts/OperationList.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudUserAccounts/OperationList.php
deleted file mode 100644
index c60b9998..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudUserAccounts/OperationList.php
+++ /dev/null
@@ -1,68 +0,0 @@
-id = $id;
-  }
-  public function getId()
-  {
-    return $this->id;
-  }
-  public function setItems($items)
-  {
-    $this->items = $items;
-  }
-  public function getItems()
-  {
-    return $this->items;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setNextPageToken($nextPageToken)
-  {
-    $this->nextPageToken = $nextPageToken;
-  }
-  public function getNextPageToken()
-  {
-    return $this->nextPageToken;
-  }
-  public function setSelfLink($selfLink)
-  {
-    $this->selfLink = $selfLink;
-  }
-  public function getSelfLink()
-  {
-    return $this->selfLink;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudUserAccounts/OperationWarnings.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudUserAccounts/OperationWarnings.php
deleted file mode 100644
index 0efbc0ea..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudUserAccounts/OperationWarnings.php
+++ /dev/null
@@ -1,50 +0,0 @@
-code = $code;
-  }
-  public function getCode()
-  {
-    return $this->code;
-  }
-  public function setData($data)
-  {
-    $this->data = $data;
-  }
-  public function getData()
-  {
-    return $this->data;
-  }
-  public function setMessage($message)
-  {
-    $this->message = $message;
-  }
-  public function getMessage()
-  {
-    return $this->message;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudUserAccounts/OperationWarningsData.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudUserAccounts/OperationWarningsData.php
deleted file mode 100644
index f93758cd..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudUserAccounts/OperationWarningsData.php
+++ /dev/null
@@ -1,39 +0,0 @@
-key = $key;
-  }
-  public function getKey()
-  {
-    return $this->key;
-  }
-  public function setValue($value)
-  {
-    $this->value = $value;
-  }
-  public function getValue()
-  {
-    return $this->value;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudUserAccounts/Policy.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudUserAccounts/Policy.php
deleted file mode 100644
index bc8b2b22..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudUserAccounts/Policy.php
+++ /dev/null
@@ -1,79 +0,0 @@
-auditConfigs = $auditConfigs;
-  }
-  public function getAuditConfigs()
-  {
-    return $this->auditConfigs;
-  }
-  public function setBindings($bindings)
-  {
-    $this->bindings = $bindings;
-  }
-  public function getBindings()
-  {
-    return $this->bindings;
-  }
-  public function setEtag($etag)
-  {
-    $this->etag = $etag;
-  }
-  public function getEtag()
-  {
-    return $this->etag;
-  }
-  public function setIamOwned($iamOwned)
-  {
-    $this->iamOwned = $iamOwned;
-  }
-  public function getIamOwned()
-  {
-    return $this->iamOwned;
-  }
-  public function setRules($rules)
-  {
-    $this->rules = $rules;
-  }
-  public function getRules()
-  {
-    return $this->rules;
-  }
-  public function setVersion($version)
-  {
-    $this->version = $version;
-  }
-  public function getVersion()
-  {
-    return $this->version;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudUserAccounts/PublicKey.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudUserAccounts/PublicKey.php
deleted file mode 100644
index c796f305..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudUserAccounts/PublicKey.php
+++ /dev/null
@@ -1,66 +0,0 @@
-creationTimestamp = $creationTimestamp;
-  }
-  public function getCreationTimestamp()
-  {
-    return $this->creationTimestamp;
-  }
-  public function setDescription($description)
-  {
-    $this->description = $description;
-  }
-  public function getDescription()
-  {
-    return $this->description;
-  }
-  public function setExpirationTimestamp($expirationTimestamp)
-  {
-    $this->expirationTimestamp = $expirationTimestamp;
-  }
-  public function getExpirationTimestamp()
-  {
-    return $this->expirationTimestamp;
-  }
-  public function setFingerprint($fingerprint)
-  {
-    $this->fingerprint = $fingerprint;
-  }
-  public function getFingerprint()
-  {
-    return $this->fingerprint;
-  }
-  public function setKey($key)
-  {
-    $this->key = $key;
-  }
-  public function getKey()
-  {
-    return $this->key;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudUserAccounts/Resource/GlobalAccountsOperations.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudUserAccounts/Resource/GlobalAccountsOperations.php
deleted file mode 100644
index 8291b075..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudUserAccounts/Resource/GlobalAccountsOperations.php
+++ /dev/null
@@ -1,113 +0,0 @@
-
- *   $clouduseraccountsService = new Google_Service_CloudUserAccounts(...);
- *   $globalAccountsOperations = $clouduseraccountsService->globalAccountsOperations;
- *  
- */
-class Google_Service_CloudUserAccounts_Resource_GlobalAccountsOperations extends Google_Service_Resource
-{
-  /**
-   * Deletes the specified operation resource. (globalAccountsOperations.delete)
-   *
-   * @param string $project Project ID for this request.
-   * @param string $operation Name of the Operations resource to delete.
-   * @param array $optParams Optional parameters.
-   */
-  public function delete($project, $operation, $optParams = array())
-  {
-    $params = array('project' => $project, 'operation' => $operation);
-    $params = array_merge($params, $optParams);
-    return $this->call('delete', array($params));
-  }
-  /**
-   * Retrieves the specified operation resource. (globalAccountsOperations.get)
-   *
-   * @param string $project Project ID for this request.
-   * @param string $operation Name of the Operations resource to return.
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_CloudUserAccounts_Operation
-   */
-  public function get($project, $operation, $optParams = array())
-  {
-    $params = array('project' => $project, 'operation' => $operation);
-    $params = array_merge($params, $optParams);
-    return $this->call('get', array($params), "Google_Service_CloudUserAccounts_Operation");
-  }
-  /**
-   * Retrieves the list of operation resources contained within the specified
-   * project. (globalAccountsOperations.listGlobalAccountsOperations)
-   *
-   * @param string $project Project ID for this request.
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param string filter Sets a filter expression for filtering listed
-   * resources, in the form filter={expression}. Your {expression} must be in the
-   * format: field_name comparison_string literal_string.
-   *
-   * The field_name is the name of the field you want to compare. Only atomic
-   * field types are supported (string, number, boolean). The comparison_string
-   * must be either eq (equals) or ne (not equals). The literal_string is the
-   * string value to filter to. The literal value must be valid for the type of
-   * field you are filtering by (string, number, boolean). For string fields, the
-   * literal value is interpreted as a regular expression using RE2 syntax. The
-   * literal value must match the entire field.
-   *
-   * For example, to filter for instances that do not have a name of example-
-   * instance, you would use filter=name ne example-instance.
-   *
-   * Compute Engine Beta API Only: If you use filtering in the Beta API, you can
-   * also filter on nested fields. For example, you could filter on instances that
-   * have set the scheduling.automaticRestart field to true. In particular, use
-   * filtering on nested fields to take advantage of instance labels to organize
-   * and filter results based on label values.
-   *
-   * The Beta API also supports filtering on multiple expressions by providing
-   * each separate expression within parentheses. For example,
-   * (scheduling.automaticRestart eq true) (zone eq us-central1-f). Multiple
-   * expressions are treated as AND expressions, meaning that resources must match
-   * all expressions to pass the filters.
-   * @opt_param string maxResults The maximum number of results per page that
-   * should be returned. If the number of available results is larger than
-   * maxResults, Compute Engine returns a nextPageToken that can be used to get
-   * the next page of results in subsequent list requests.
-   * @opt_param string orderBy Sorts list results by a certain order. By default,
-   * results are returned in alphanumerical order based on the resource name.
-   *
-   * You can also sort results in descending order based on the creation timestamp
-   * using orderBy="creationTimestamp desc". This sorts results based on the
-   * creationTimestamp field in reverse chronological order (newest result first).
-   * Use this to sort resources like operations so that the newest operation is
-   * returned first.
-   *
-   * Currently, only sorting by name or creationTimestamp desc is supported.
-   * @opt_param string pageToken Specifies a page token to use. Set pageToken to
-   * the nextPageToken returned by a previous list request to get the next page of
-   * results.
-   * @return Google_Service_CloudUserAccounts_OperationList
-   */
-  public function listGlobalAccountsOperations($project, $optParams = array())
-  {
-    $params = array('project' => $project);
-    $params = array_merge($params, $optParams);
-    return $this->call('list', array($params), "Google_Service_CloudUserAccounts_OperationList");
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudUserAccounts/Resource/Groups.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudUserAccounts/Resource/Groups.php
deleted file mode 100644
index bdb4be98..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudUserAccounts/Resource/Groups.php
+++ /dev/null
@@ -1,206 +0,0 @@
-
- *   $clouduseraccountsService = new Google_Service_CloudUserAccounts(...);
- *   $groups = $clouduseraccountsService->groups;
- *  
- */
-class Google_Service_CloudUserAccounts_Resource_Groups extends Google_Service_Resource
-{
-  /**
-   * Adds users to the specified group. (groups.addMember)
-   *
-   * @param string $project Project ID for this request.
-   * @param string $groupName Name of the group for this request.
-   * @param Google_Service_CloudUserAccounts_GroupsAddMemberRequest $postBody
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_CloudUserAccounts_Operation
-   */
-  public function addMember($project, $groupName, Google_Service_CloudUserAccounts_GroupsAddMemberRequest $postBody, $optParams = array())
-  {
-    $params = array('project' => $project, 'groupName' => $groupName, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('addMember', array($params), "Google_Service_CloudUserAccounts_Operation");
-  }
-  /**
-   * Deletes the specified Group resource. (groups.delete)
-   *
-   * @param string $project Project ID for this request.
-   * @param string $groupName Name of the Group resource to delete.
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_CloudUserAccounts_Operation
-   */
-  public function delete($project, $groupName, $optParams = array())
-  {
-    $params = array('project' => $project, 'groupName' => $groupName);
-    $params = array_merge($params, $optParams);
-    return $this->call('delete', array($params), "Google_Service_CloudUserAccounts_Operation");
-  }
-  /**
-   * Returns the specified Group resource. (groups.get)
-   *
-   * @param string $project Project ID for this request.
-   * @param string $groupName Name of the Group resource to return.
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_CloudUserAccounts_Group
-   */
-  public function get($project, $groupName, $optParams = array())
-  {
-    $params = array('project' => $project, 'groupName' => $groupName);
-    $params = array_merge($params, $optParams);
-    return $this->call('get', array($params), "Google_Service_CloudUserAccounts_Group");
-  }
-  /**
-   * Gets the access control policy for a resource. May be empty if no such policy
-   * or resource exists. (groups.getIamPolicy)
-   *
-   * @param string $project Project ID for this request.
-   * @param string $resource Name of the resource for this request.
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_CloudUserAccounts_Policy
-   */
-  public function getIamPolicy($project, $resource, $optParams = array())
-  {
-    $params = array('project' => $project, 'resource' => $resource);
-    $params = array_merge($params, $optParams);
-    return $this->call('getIamPolicy', array($params), "Google_Service_CloudUserAccounts_Policy");
-  }
-  /**
-   * Creates a Group resource in the specified project using the data included in
-   * the request. (groups.insert)
-   *
-   * @param string $project Project ID for this request.
-   * @param Google_Service_CloudUserAccounts_Group $postBody
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_CloudUserAccounts_Operation
-   */
-  public function insert($project, Google_Service_CloudUserAccounts_Group $postBody, $optParams = array())
-  {
-    $params = array('project' => $project, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('insert', array($params), "Google_Service_CloudUserAccounts_Operation");
-  }
-  /**
-   * Retrieves the list of groups contained within the specified project.
-   * (groups.listGroups)
-   *
-   * @param string $project Project ID for this request.
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param string filter Sets a filter expression for filtering listed
-   * resources, in the form filter={expression}. Your {expression} must be in the
-   * format: field_name comparison_string literal_string.
-   *
-   * The field_name is the name of the field you want to compare. Only atomic
-   * field types are supported (string, number, boolean). The comparison_string
-   * must be either eq (equals) or ne (not equals). The literal_string is the
-   * string value to filter to. The literal value must be valid for the type of
-   * field you are filtering by (string, number, boolean). For string fields, the
-   * literal value is interpreted as a regular expression using RE2 syntax. The
-   * literal value must match the entire field.
-   *
-   * For example, to filter for instances that do not have a name of example-
-   * instance, you would use filter=name ne example-instance.
-   *
-   * Compute Engine Beta API Only: If you use filtering in the Beta API, you can
-   * also filter on nested fields. For example, you could filter on instances that
-   * have set the scheduling.automaticRestart field to true. In particular, use
-   * filtering on nested fields to take advantage of instance labels to organize
-   * and filter results based on label values.
-   *
-   * The Beta API also supports filtering on multiple expressions by providing
-   * each separate expression within parentheses. For example,
-   * (scheduling.automaticRestart eq true) (zone eq us-central1-f). Multiple
-   * expressions are treated as AND expressions, meaning that resources must match
-   * all expressions to pass the filters.
-   * @opt_param string maxResults The maximum number of results per page that
-   * should be returned. If the number of available results is larger than
-   * maxResults, Compute Engine returns a nextPageToken that can be used to get
-   * the next page of results in subsequent list requests.
-   * @opt_param string orderBy Sorts list results by a certain order. By default,
-   * results are returned in alphanumerical order based on the resource name.
-   *
-   * You can also sort results in descending order based on the creation timestamp
-   * using orderBy="creationTimestamp desc". This sorts results based on the
-   * creationTimestamp field in reverse chronological order (newest result first).
-   * Use this to sort resources like operations so that the newest operation is
-   * returned first.
-   *
-   * Currently, only sorting by name or creationTimestamp desc is supported.
-   * @opt_param string pageToken Specifies a page token to use. Set pageToken to
-   * the nextPageToken returned by a previous list request to get the next page of
-   * results.
-   * @return Google_Service_CloudUserAccounts_GroupList
-   */
-  public function listGroups($project, $optParams = array())
-  {
-    $params = array('project' => $project);
-    $params = array_merge($params, $optParams);
-    return $this->call('list', array($params), "Google_Service_CloudUserAccounts_GroupList");
-  }
-  /**
-   * Removes users from the specified group. (groups.removeMember)
-   *
-   * @param string $project Project ID for this request.
-   * @param string $groupName Name of the group for this request.
-   * @param Google_Service_CloudUserAccounts_GroupsRemoveMemberRequest $postBody
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_CloudUserAccounts_Operation
-   */
-  public function removeMember($project, $groupName, Google_Service_CloudUserAccounts_GroupsRemoveMemberRequest $postBody, $optParams = array())
-  {
-    $params = array('project' => $project, 'groupName' => $groupName, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('removeMember', array($params), "Google_Service_CloudUserAccounts_Operation");
-  }
-  /**
-   * Sets the access control policy on the specified resource. Replaces any
-   * existing policy. (groups.setIamPolicy)
-   *
-   * @param string $project Project ID for this request.
-   * @param string $resource Name of the resource for this request.
-   * @param Google_Service_CloudUserAccounts_Policy $postBody
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_CloudUserAccounts_Policy
-   */
-  public function setIamPolicy($project, $resource, Google_Service_CloudUserAccounts_Policy $postBody, $optParams = array())
-  {
-    $params = array('project' => $project, 'resource' => $resource, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('setIamPolicy', array($params), "Google_Service_CloudUserAccounts_Policy");
-  }
-  /**
-   * Returns permissions that a caller has on the specified resource.
-   * (groups.testIamPermissions)
-   *
-   * @param string $project Project ID for this request.
-   * @param string $resource Name of the resource for this request.
-   * @param Google_Service_CloudUserAccounts_TestPermissionsRequest $postBody
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_CloudUserAccounts_TestPermissionsResponse
-   */
-  public function testIamPermissions($project, $resource, Google_Service_CloudUserAccounts_TestPermissionsRequest $postBody, $optParams = array())
-  {
-    $params = array('project' => $project, 'resource' => $resource, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('testIamPermissions', array($params), "Google_Service_CloudUserAccounts_TestPermissionsResponse");
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudUserAccounts/Resource/Linux.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudUserAccounts/Resource/Linux.php
deleted file mode 100644
index b43fd1d9..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudUserAccounts/Resource/Linux.php
+++ /dev/null
@@ -1,111 +0,0 @@
-
- *   $clouduseraccountsService = new Google_Service_CloudUserAccounts(...);
- *   $linux = $clouduseraccountsService->linux;
- *  
- */
-class Google_Service_CloudUserAccounts_Resource_Linux extends Google_Service_Resource
-{
-  /**
-   * Returns a list of authorized public keys for a specific user account.
-   * (linux.getAuthorizedKeysView)
-   *
-   * @param string $project Project ID for this request.
-   * @param string $zone Name of the zone for this request.
-   * @param string $user The user account for which you want to get a list of
-   * authorized public keys.
-   * @param string $instance The fully-qualified URL of the virtual machine
-   * requesting the view.
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param bool login Whether the view was requested as part of a user-
-   * initiated login.
-   * @return Google_Service_CloudUserAccounts_LinuxGetAuthorizedKeysViewResponse
-   */
-  public function getAuthorizedKeysView($project, $zone, $user, $instance, $optParams = array())
-  {
-    $params = array('project' => $project, 'zone' => $zone, 'user' => $user, 'instance' => $instance);
-    $params = array_merge($params, $optParams);
-    return $this->call('getAuthorizedKeysView', array($params), "Google_Service_CloudUserAccounts_LinuxGetAuthorizedKeysViewResponse");
-  }
-  /**
-   * Retrieves a list of user accounts for an instance within a specific project.
-   * (linux.getLinuxAccountViews)
-   *
-   * @param string $project Project ID for this request.
-   * @param string $zone Name of the zone for this request.
-   * @param string $instance The fully-qualified URL of the virtual machine
-   * requesting the views.
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param string filter Sets a filter expression for filtering listed
-   * resources, in the form filter={expression}. Your {expression} must be in the
-   * format: field_name comparison_string literal_string.
-   *
-   * The field_name is the name of the field you want to compare. Only atomic
-   * field types are supported (string, number, boolean). The comparison_string
-   * must be either eq (equals) or ne (not equals). The literal_string is the
-   * string value to filter to. The literal value must be valid for the type of
-   * field you are filtering by (string, number, boolean). For string fields, the
-   * literal value is interpreted as a regular expression using RE2 syntax. The
-   * literal value must match the entire field.
-   *
-   * For example, to filter for instances that do not have a name of example-
-   * instance, you would use filter=name ne example-instance.
-   *
-   * Compute Engine Beta API Only: If you use filtering in the Beta API, you can
-   * also filter on nested fields. For example, you could filter on instances that
-   * have set the scheduling.automaticRestart field to true. In particular, use
-   * filtering on nested fields to take advantage of instance labels to organize
-   * and filter results based on label values.
-   *
-   * The Beta API also supports filtering on multiple expressions by providing
-   * each separate expression within parentheses. For example,
-   * (scheduling.automaticRestart eq true) (zone eq us-central1-f). Multiple
-   * expressions are treated as AND expressions, meaning that resources must match
-   * all expressions to pass the filters.
-   * @opt_param string maxResults The maximum number of results per page that
-   * should be returned. If the number of available results is larger than
-   * maxResults, Compute Engine returns a nextPageToken that can be used to get
-   * the next page of results in subsequent list requests.
-   * @opt_param string orderBy Sorts list results by a certain order. By default,
-   * results are returned in alphanumerical order based on the resource name.
-   *
-   * You can also sort results in descending order based on the creation timestamp
-   * using orderBy="creationTimestamp desc". This sorts results based on the
-   * creationTimestamp field in reverse chronological order (newest result first).
-   * Use this to sort resources like operations so that the newest operation is
-   * returned first.
-   *
-   * Currently, only sorting by name or creationTimestamp desc is supported.
-   * @opt_param string pageToken Specifies a page token to use. Set pageToken to
-   * the nextPageToken returned by a previous list request to get the next page of
-   * results.
-   * @return Google_Service_CloudUserAccounts_LinuxGetLinuxAccountViewsResponse
-   */
-  public function getLinuxAccountViews($project, $zone, $instance, $optParams = array())
-  {
-    $params = array('project' => $project, 'zone' => $zone, 'instance' => $instance);
-    $params = array_merge($params, $optParams);
-    return $this->call('getLinuxAccountViews', array($params), "Google_Service_CloudUserAccounts_LinuxGetLinuxAccountViewsResponse");
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudUserAccounts/Resource/Users.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudUserAccounts/Resource/Users.php
deleted file mode 100644
index 39756972..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudUserAccounts/Resource/Users.php
+++ /dev/null
@@ -1,209 +0,0 @@
-
- *   $clouduseraccountsService = new Google_Service_CloudUserAccounts(...);
- *   $users = $clouduseraccountsService->users;
- *  
- */
-class Google_Service_CloudUserAccounts_Resource_Users extends Google_Service_Resource
-{
-  /**
-   * Adds a public key to the specified User resource with the data included in
-   * the request. (users.addPublicKey)
-   *
-   * @param string $project Project ID for this request.
-   * @param string $user Name of the user for this request.
-   * @param Google_Service_CloudUserAccounts_PublicKey $postBody
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_CloudUserAccounts_Operation
-   */
-  public function addPublicKey($project, $user, Google_Service_CloudUserAccounts_PublicKey $postBody, $optParams = array())
-  {
-    $params = array('project' => $project, 'user' => $user, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('addPublicKey', array($params), "Google_Service_CloudUserAccounts_Operation");
-  }
-  /**
-   * Deletes the specified User resource. (users.delete)
-   *
-   * @param string $project Project ID for this request.
-   * @param string $user Name of the user resource to delete.
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_CloudUserAccounts_Operation
-   */
-  public function delete($project, $user, $optParams = array())
-  {
-    $params = array('project' => $project, 'user' => $user);
-    $params = array_merge($params, $optParams);
-    return $this->call('delete', array($params), "Google_Service_CloudUserAccounts_Operation");
-  }
-  /**
-   * Returns the specified User resource. (users.get)
-   *
-   * @param string $project Project ID for this request.
-   * @param string $user Name of the user resource to return.
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_CloudUserAccounts_User
-   */
-  public function get($project, $user, $optParams = array())
-  {
-    $params = array('project' => $project, 'user' => $user);
-    $params = array_merge($params, $optParams);
-    return $this->call('get', array($params), "Google_Service_CloudUserAccounts_User");
-  }
-  /**
-   * Gets the access control policy for a resource. May be empty if no such policy
-   * or resource exists. (users.getIamPolicy)
-   *
-   * @param string $project Project ID for this request.
-   * @param string $resource Name of the resource for this request.
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_CloudUserAccounts_Policy
-   */
-  public function getIamPolicy($project, $resource, $optParams = array())
-  {
-    $params = array('project' => $project, 'resource' => $resource);
-    $params = array_merge($params, $optParams);
-    return $this->call('getIamPolicy', array($params), "Google_Service_CloudUserAccounts_Policy");
-  }
-  /**
-   * Creates a User resource in the specified project using the data included in
-   * the request. (users.insert)
-   *
-   * @param string $project Project ID for this request.
-   * @param Google_Service_CloudUserAccounts_User $postBody
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_CloudUserAccounts_Operation
-   */
-  public function insert($project, Google_Service_CloudUserAccounts_User $postBody, $optParams = array())
-  {
-    $params = array('project' => $project, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('insert', array($params), "Google_Service_CloudUserAccounts_Operation");
-  }
-  /**
-   * Retrieves a list of users contained within the specified project.
-   * (users.listUsers)
-   *
-   * @param string $project Project ID for this request.
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param string filter Sets a filter expression for filtering listed
-   * resources, in the form filter={expression}. Your {expression} must be in the
-   * format: field_name comparison_string literal_string.
-   *
-   * The field_name is the name of the field you want to compare. Only atomic
-   * field types are supported (string, number, boolean). The comparison_string
-   * must be either eq (equals) or ne (not equals). The literal_string is the
-   * string value to filter to. The literal value must be valid for the type of
-   * field you are filtering by (string, number, boolean). For string fields, the
-   * literal value is interpreted as a regular expression using RE2 syntax. The
-   * literal value must match the entire field.
-   *
-   * For example, to filter for instances that do not have a name of example-
-   * instance, you would use filter=name ne example-instance.
-   *
-   * Compute Engine Beta API Only: If you use filtering in the Beta API, you can
-   * also filter on nested fields. For example, you could filter on instances that
-   * have set the scheduling.automaticRestart field to true. In particular, use
-   * filtering on nested fields to take advantage of instance labels to organize
-   * and filter results based on label values.
-   *
-   * The Beta API also supports filtering on multiple expressions by providing
-   * each separate expression within parentheses. For example,
-   * (scheduling.automaticRestart eq true) (zone eq us-central1-f). Multiple
-   * expressions are treated as AND expressions, meaning that resources must match
-   * all expressions to pass the filters.
-   * @opt_param string maxResults The maximum number of results per page that
-   * should be returned. If the number of available results is larger than
-   * maxResults, Compute Engine returns a nextPageToken that can be used to get
-   * the next page of results in subsequent list requests.
-   * @opt_param string orderBy Sorts list results by a certain order. By default,
-   * results are returned in alphanumerical order based on the resource name.
-   *
-   * You can also sort results in descending order based on the creation timestamp
-   * using orderBy="creationTimestamp desc". This sorts results based on the
-   * creationTimestamp field in reverse chronological order (newest result first).
-   * Use this to sort resources like operations so that the newest operation is
-   * returned first.
-   *
-   * Currently, only sorting by name or creationTimestamp desc is supported.
-   * @opt_param string pageToken Specifies a page token to use. Set pageToken to
-   * the nextPageToken returned by a previous list request to get the next page of
-   * results.
-   * @return Google_Service_CloudUserAccounts_UserList
-   */
-  public function listUsers($project, $optParams = array())
-  {
-    $params = array('project' => $project);
-    $params = array_merge($params, $optParams);
-    return $this->call('list', array($params), "Google_Service_CloudUserAccounts_UserList");
-  }
-  /**
-   * Removes the specified public key from the user. (users.removePublicKey)
-   *
-   * @param string $project Project ID for this request.
-   * @param string $user Name of the user for this request.
-   * @param string $fingerprint The fingerprint of the public key to delete.
-   * Public keys are identified by their fingerprint, which is defined by RFC4716
-   * to be the MD5 digest of the public key.
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_CloudUserAccounts_Operation
-   */
-  public function removePublicKey($project, $user, $fingerprint, $optParams = array())
-  {
-    $params = array('project' => $project, 'user' => $user, 'fingerprint' => $fingerprint);
-    $params = array_merge($params, $optParams);
-    return $this->call('removePublicKey', array($params), "Google_Service_CloudUserAccounts_Operation");
-  }
-  /**
-   * Sets the access control policy on the specified resource. Replaces any
-   * existing policy. (users.setIamPolicy)
-   *
-   * @param string $project Project ID for this request.
-   * @param string $resource Name of the resource for this request.
-   * @param Google_Service_CloudUserAccounts_Policy $postBody
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_CloudUserAccounts_Policy
-   */
-  public function setIamPolicy($project, $resource, Google_Service_CloudUserAccounts_Policy $postBody, $optParams = array())
-  {
-    $params = array('project' => $project, 'resource' => $resource, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('setIamPolicy', array($params), "Google_Service_CloudUserAccounts_Policy");
-  }
-  /**
-   * Returns permissions that a caller has on the specified resource.
-   * (users.testIamPermissions)
-   *
-   * @param string $project Project ID for this request.
-   * @param string $resource Name of the resource for this request.
-   * @param Google_Service_CloudUserAccounts_TestPermissionsRequest $postBody
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_CloudUserAccounts_TestPermissionsResponse
-   */
-  public function testIamPermissions($project, $resource, Google_Service_CloudUserAccounts_TestPermissionsRequest $postBody, $optParams = array())
-  {
-    $params = array('project' => $project, 'resource' => $resource, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('testIamPermissions', array($params), "Google_Service_CloudUserAccounts_TestPermissionsResponse");
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudUserAccounts/Rule.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudUserAccounts/Rule.php
deleted file mode 100644
index 8f68ad31..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudUserAccounts/Rule.php
+++ /dev/null
@@ -1,87 +0,0 @@
-action = $action;
-  }
-  public function getAction()
-  {
-    return $this->action;
-  }
-  public function setConditions($conditions)
-  {
-    $this->conditions = $conditions;
-  }
-  public function getConditions()
-  {
-    return $this->conditions;
-  }
-  public function setDescription($description)
-  {
-    $this->description = $description;
-  }
-  public function getDescription()
-  {
-    return $this->description;
-  }
-  public function setIns($ins)
-  {
-    $this->ins = $ins;
-  }
-  public function getIns()
-  {
-    return $this->ins;
-  }
-  public function setLogConfigs($logConfigs)
-  {
-    $this->logConfigs = $logConfigs;
-  }
-  public function getLogConfigs()
-  {
-    return $this->logConfigs;
-  }
-  public function setNotIns($notIns)
-  {
-    $this->notIns = $notIns;
-  }
-  public function getNotIns()
-  {
-    return $this->notIns;
-  }
-  public function setPermissions($permissions)
-  {
-    $this->permissions = $permissions;
-  }
-  public function getPermissions()
-  {
-    return $this->permissions;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudUserAccounts/TestPermissionsRequest.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudUserAccounts/TestPermissionsRequest.php
deleted file mode 100644
index 23f1e843..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudUserAccounts/TestPermissionsRequest.php
+++ /dev/null
@@ -1,31 +0,0 @@
-permissions = $permissions;
-  }
-  public function getPermissions()
-  {
-    return $this->permissions;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudUserAccounts/TestPermissionsResponse.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudUserAccounts/TestPermissionsResponse.php
deleted file mode 100644
index 96307a87..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudUserAccounts/TestPermissionsResponse.php
+++ /dev/null
@@ -1,31 +0,0 @@
-permissions = $permissions;
-  }
-  public function getPermissions()
-  {
-    return $this->permissions;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudUserAccounts/User.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudUserAccounts/User.php
deleted file mode 100644
index 06de7d06..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudUserAccounts/User.php
+++ /dev/null
@@ -1,104 +0,0 @@
-creationTimestamp = $creationTimestamp;
-  }
-  public function getCreationTimestamp()
-  {
-    return $this->creationTimestamp;
-  }
-  public function setDescription($description)
-  {
-    $this->description = $description;
-  }
-  public function getDescription()
-  {
-    return $this->description;
-  }
-  public function setGroups($groups)
-  {
-    $this->groups = $groups;
-  }
-  public function getGroups()
-  {
-    return $this->groups;
-  }
-  public function setId($id)
-  {
-    $this->id = $id;
-  }
-  public function getId()
-  {
-    return $this->id;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setName($name)
-  {
-    $this->name = $name;
-  }
-  public function getName()
-  {
-    return $this->name;
-  }
-  public function setOwner($owner)
-  {
-    $this->owner = $owner;
-  }
-  public function getOwner()
-  {
-    return $this->owner;
-  }
-  public function setPublicKeys($publicKeys)
-  {
-    $this->publicKeys = $publicKeys;
-  }
-  public function getPublicKeys()
-  {
-    return $this->publicKeys;
-  }
-  public function setSelfLink($selfLink)
-  {
-    $this->selfLink = $selfLink;
-  }
-  public function getSelfLink()
-  {
-    return $this->selfLink;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudUserAccounts/UserList.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudUserAccounts/UserList.php
deleted file mode 100644
index 14ca859d..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/CloudUserAccounts/UserList.php
+++ /dev/null
@@ -1,68 +0,0 @@
-id = $id;
-  }
-  public function getId()
-  {
-    return $this->id;
-  }
-  public function setItems($items)
-  {
-    $this->items = $items;
-  }
-  public function getItems()
-  {
-    return $this->items;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setNextPageToken($nextPageToken)
-  {
-    $this->nextPageToken = $nextPageToken;
-  }
-  public function getNextPageToken()
-  {
-    return $this->nextPageToken;
-  }
-  public function setSelfLink($selfLink)
-  {
-    $this->selfLink = $selfLink;
-  }
-  public function getSelfLink()
-  {
-    return $this->selfLink;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Cloudbilling.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Cloudbilling.php
deleted file mode 100644
index 8ee068d0..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Cloudbilling.php
+++ /dev/null
@@ -1,147 +0,0 @@
-
- * Allows developers to manage billing for their Google Cloud Platform projects
- * programmatically.

- *
- * 

- * For more information about this service, see the API
- * Documentation
- * 

- *
- * @author Google, Inc.
- */
-class Google_Service_Cloudbilling extends Google_Service
-{
-  /** View and manage your data across Google Cloud Platform services. */
-  const CLOUD_PLATFORM =
-      "https://www.googleapis.com/auth/cloud-platform";
-
-  public $billingAccounts;
-  public $billingAccounts_projects;
-  public $projects;
-  
-  /**
-   * Constructs the internal representation of the Cloudbilling service.
-   *
-   * @param Google_Client $client
-   */
-  public function __construct(Google_Client $client)
-  {
-    parent::__construct($client);
-    $this->rootUrl = 'https://cloudbilling.googleapis.com/';
-    $this->servicePath = '';
-    $this->version = 'v1';
-    $this->serviceName = 'cloudbilling';
-
-    $this->billingAccounts = new Google_Service_Cloudbilling_Resource_BillingAccounts(
-        $this,
-        $this->serviceName,
-        'billingAccounts',
-        array(
-          'methods' => array(
-            'get' => array(
-              'path' => 'v1/{+name}',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'name' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'list' => array(
-              'path' => 'v1/billingAccounts',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'pageSize' => array(
-                  'location' => 'query',
-                  'type' => 'integer',
-                ),
-                'pageToken' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-              ),
-            ),
-          )
-        )
-    );
-    $this->billingAccounts_projects = new Google_Service_Cloudbilling_Resource_BillingAccountsProjects(
-        $this,
-        $this->serviceName,
-        'projects',
-        array(
-          'methods' => array(
-            'list' => array(
-              'path' => 'v1/{+name}/projects',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'name' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'pageSize' => array(
-                  'location' => 'query',
-                  'type' => 'integer',
-                ),
-                'pageToken' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-              ),
-            ),
-          )
-        )
-    );
-    $this->projects = new Google_Service_Cloudbilling_Resource_Projects(
-        $this,
-        $this->serviceName,
-        'projects',
-        array(
-          'methods' => array(
-            'getBillingInfo' => array(
-              'path' => 'v1/{+name}/billingInfo',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'name' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'updateBillingInfo' => array(
-              'path' => 'v1/{+name}/billingInfo',
-              'httpMethod' => 'PUT',
-              'parameters' => array(
-                'name' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),
-          )
-        )
-    );
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Cloudbilling/BillingAccount.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Cloudbilling/BillingAccount.php
deleted file mode 100644
index 89fee313..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Cloudbilling/BillingAccount.php
+++ /dev/null
@@ -1,48 +0,0 @@
-displayName = $displayName;
-  }
-  public function getDisplayName()
-  {
-    return $this->displayName;
-  }
-  public function setName($name)
-  {
-    $this->name = $name;
-  }
-  public function getName()
-  {
-    return $this->name;
-  }
-  public function setOpen($open)
-  {
-    $this->open = $open;
-  }
-  public function getOpen()
-  {
-    return $this->open;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Cloudbilling/ListBillingAccountsResponse.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Cloudbilling/ListBillingAccountsResponse.php
deleted file mode 100644
index 79165eb4..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Cloudbilling/ListBillingAccountsResponse.php
+++ /dev/null
@@ -1,41 +0,0 @@
-billingAccounts = $billingAccounts;
-  }
-  public function getBillingAccounts()
-  {
-    return $this->billingAccounts;
-  }
-  public function setNextPageToken($nextPageToken)
-  {
-    $this->nextPageToken = $nextPageToken;
-  }
-  public function getNextPageToken()
-  {
-    return $this->nextPageToken;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Cloudbilling/ListProjectBillingInfoResponse.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Cloudbilling/ListProjectBillingInfoResponse.php
deleted file mode 100644
index 0b7ff5ff..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Cloudbilling/ListProjectBillingInfoResponse.php
+++ /dev/null
@@ -1,41 +0,0 @@
-nextPageToken = $nextPageToken;
-  }
-  public function getNextPageToken()
-  {
-    return $this->nextPageToken;
-  }
-  public function setProjectBillingInfo($projectBillingInfo)
-  {
-    $this->projectBillingInfo = $projectBillingInfo;
-  }
-  public function getProjectBillingInfo()
-  {
-    return $this->projectBillingInfo;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Cloudbilling/ProjectBillingInfo.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Cloudbilling/ProjectBillingInfo.php
deleted file mode 100644
index 09e2e0fb..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Cloudbilling/ProjectBillingInfo.php
+++ /dev/null
@@ -1,57 +0,0 @@
-billingAccountName = $billingAccountName;
-  }
-  public function getBillingAccountName()
-  {
-    return $this->billingAccountName;
-  }
-  public function setBillingEnabled($billingEnabled)
-  {
-    $this->billingEnabled = $billingEnabled;
-  }
-  public function getBillingEnabled()
-  {
-    return $this->billingEnabled;
-  }
-  public function setName($name)
-  {
-    $this->name = $name;
-  }
-  public function getName()
-  {
-    return $this->name;
-  }
-  public function setProjectId($projectId)
-  {
-    $this->projectId = $projectId;
-  }
-  public function getProjectId()
-  {
-    return $this->projectId;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Cloudbilling/Resource/BillingAccounts.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Cloudbilling/Resource/BillingAccounts.php
deleted file mode 100644
index 3adfa84d..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Cloudbilling/Resource/BillingAccounts.php
+++ /dev/null
@@ -1,66 +0,0 @@
-
- *   $cloudbillingService = new Google_Service_Cloudbilling(...);
- *   $billingAccounts = $cloudbillingService->billingAccounts;
- *  
- */
-class Google_Service_Cloudbilling_Resource_BillingAccounts extends Google_Service_Resource
-{
-  /**
-   * Gets information about a billing account. The current authenticated user must
-   * be an [owner of the billing
-   * account](https://support.google.com/cloud/answer/4430947).
-   * (billingAccounts.get)
-   *
-   * @param string $name The resource name of the billing account to retrieve. For
-   * example, `billingAccounts/012345-567890-ABCDEF`.
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Cloudbilling_BillingAccount
-   */
-  public function get($name, $optParams = array())
-  {
-    $params = array('name' => $name);
-    $params = array_merge($params, $optParams);
-    return $this->call('get', array($params), "Google_Service_Cloudbilling_BillingAccount");
-  }
-  /**
-   * Lists the billing accounts that the current authenticated user
-   * [owns](https://support.google.com/cloud/answer/4430947).
-   * (billingAccounts.listBillingAccounts)
-   *
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param int pageSize Requested page size. The maximum page size is 100;
-   * this is also the default.
-   * @opt_param string pageToken A token identifying a page of results to return.
-   * This should be a `next_page_token` value returned from a previous
-   * `ListBillingAccounts` call. If unspecified, the first page of results is
-   * returned.
-   * @return Google_Service_Cloudbilling_ListBillingAccountsResponse
-   */
-  public function listBillingAccounts($optParams = array())
-  {
-    $params = array();
-    $params = array_merge($params, $optParams);
-    return $this->call('list', array($params), "Google_Service_Cloudbilling_ListBillingAccountsResponse");
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Cloudbilling/Resource/BillingAccountsProjects.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Cloudbilling/Resource/BillingAccountsProjects.php
deleted file mode 100644
index 7cd8ce59..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Cloudbilling/Resource/BillingAccountsProjects.php
+++ /dev/null
@@ -1,53 +0,0 @@
-
- *   $cloudbillingService = new Google_Service_Cloudbilling(...);
- *   $projects = $cloudbillingService->projects;
- *  
- */
-class Google_Service_Cloudbilling_Resource_BillingAccountsProjects extends Google_Service_Resource
-{
-  /**
-   * Lists the projects associated with a billing account. The current
-   * authenticated user must be an [owner of the billing
-   * account](https://support.google.com/cloud/answer/4430947).
-   * (projects.listBillingAccountsProjects)
-   *
-   * @param string $name The resource name of the billing account associated with
-   * the projects that you want to list. For example,
-   * `billingAccounts/012345-567890-ABCDEF`.
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param int pageSize Requested page size. The maximum page size is 100;
-   * this is also the default.
-   * @opt_param string pageToken A token identifying a page of results to be
-   * returned. This should be a `next_page_token` value returned from a previous
-   * `ListProjectBillingInfo` call. If unspecified, the first page of results is
-   * returned.
-   * @return Google_Service_Cloudbilling_ListProjectBillingInfoResponse
-   */
-  public function listBillingAccountsProjects($name, $optParams = array())
-  {
-    $params = array('name' => $name);
-    $params = array_merge($params, $optParams);
-    return $this->call('list', array($params), "Google_Service_Cloudbilling_ListProjectBillingInfoResponse");
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Cloudbilling/Resource/Projects.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Cloudbilling/Resource/Projects.php
deleted file mode 100644
index 222ebccf..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Cloudbilling/Resource/Projects.php
+++ /dev/null
@@ -1,89 +0,0 @@
-
- *   $cloudbillingService = new Google_Service_Cloudbilling(...);
- *   $projects = $cloudbillingService->projects;
- *  
- */
-class Google_Service_Cloudbilling_Resource_Projects extends Google_Service_Resource
-{
-  /**
-   * Gets the billing information for a project. The current authenticated user
-   * must have [permission to view the project](https://cloud.google.com/docs
-   * /permissions-overview#h.bgs0oxofvnoo ). (projects.getBillingInfo)
-   *
-   * @param string $name The resource name of the project for which billing
-   * information is retrieved. For example, `projects/tokyo-rain-123`.
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Cloudbilling_ProjectBillingInfo
-   */
-  public function getBillingInfo($name, $optParams = array())
-  {
-    $params = array('name' => $name);
-    $params = array_merge($params, $optParams);
-    return $this->call('getBillingInfo', array($params), "Google_Service_Cloudbilling_ProjectBillingInfo");
-  }
-  /**
-   * Sets or updates the billing account associated with a project. You specify
-   * the new billing account by setting the `billing_account_name` in the
-   * `ProjectBillingInfo` resource to the resource name of a billing account.
-   * Associating a project with an open billing account enables billing on the
-   * project and allows charges for resource usage. If the project already had a
-   * billing account, this method changes the billing account used for resource
-   * usage charges.
-   *
-   * *Note:* Incurred charges that have not yet been reported in the transaction
-   * history of the Google Cloud Console may be billed to the new billing account,
-   * even if the charge occurred before the new billing account was assigned to
-   * the project.
-   *
-   * The current authenticated user must have ownership privileges for both the
-   * [project](https://cloud.google.com/docs/permissions-overview#h.bgs0oxofvnoo )
-   * and the [billing account](https://support.google.com/cloud/answer/4430947).
-   *
-   * You can disable billing on the project by setting the `billing_account_name`
-   * field to empty. This action disassociates the current billing account from
-   * the project. Any billable activity of your in-use services will stop, and
-   * your application could stop functioning as expected. Any unbilled charges to
-   * date will be billed to the previously associated account. The current
-   * authenticated user must be either an owner of the project or an owner of the
-   * billing account for the project.
-   *
-   * Note that associating a project with a *closed* billing account will have
-   * much the same effect as disabling billing on the project: any paid resources
-   * used by the project will be shut down. Thus, unless you wish to disable
-   * billing, you should always call this method with the name of an *open*
-   * billing account. (projects.updateBillingInfo)
-   *
-   * @param string $name The resource name of the project associated with the
-   * billing information that you want to update. For example, `projects/tokyo-
-   * rain-123`.
-   * @param Google_Service_Cloudbilling_ProjectBillingInfo $postBody
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Cloudbilling_ProjectBillingInfo
-   */
-  public function updateBillingInfo($name, Google_Service_Cloudbilling_ProjectBillingInfo $postBody, $optParams = array())
-  {
-    $params = array('name' => $name, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('updateBillingInfo', array($params), "Google_Service_Cloudbilling_ProjectBillingInfo");
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Clouderrorreporting.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Clouderrorreporting.php
deleted file mode 100644
index fce44e1b..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Clouderrorreporting.php
+++ /dev/null
@@ -1,231 +0,0 @@
-
- * Stackdriver Error Reporting groups and counts similar errors from cloud
- * services. The Stackdriver Error Reporting API provides a way to report new
- * errors and read access to error groups and their associated errors.

- *
- * 

- * For more information about this service, see the API
- * Documentation
- * 

- *
- * @author Google, Inc.
- */
-class Google_Service_Clouderrorreporting extends Google_Service
-{
-  /** View and manage your data across Google Cloud Platform services. */
-  const CLOUD_PLATFORM =
-      "https://www.googleapis.com/auth/cloud-platform";
-
-  public $projects;
-  public $projects_events;
-  public $projects_groupStats;
-  public $projects_groups;
-  
-  /**
-   * Constructs the internal representation of the Clouderrorreporting service.
-   *
-   * @param Google_Client $client
-   */
-  public function __construct(Google_Client $client)
-  {
-    parent::__construct($client);
-    $this->rootUrl = 'https://clouderrorreporting.googleapis.com/';
-    $this->servicePath = '';
-    $this->version = 'v1beta1';
-    $this->serviceName = 'clouderrorreporting';
-
-    $this->projects = new Google_Service_Clouderrorreporting_Resource_Projects(
-        $this,
-        $this->serviceName,
-        'projects',
-        array(
-          'methods' => array(
-            'deleteEvents' => array(
-              'path' => 'v1beta1/{+projectName}/events',
-              'httpMethod' => 'DELETE',
-              'parameters' => array(
-                'projectName' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),
-          )
-        )
-    );
-    $this->projects_events = new Google_Service_Clouderrorreporting_Resource_ProjectsEvents(
-        $this,
-        $this->serviceName,
-        'events',
-        array(
-          'methods' => array(
-            'list' => array(
-              'path' => 'v1beta1/{+projectName}/events',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'projectName' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'groupId' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'pageToken' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'serviceFilter.service' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'pageSize' => array(
-                  'location' => 'query',
-                  'type' => 'integer',
-                ),
-                'serviceFilter.version' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'serviceFilter.resourceType' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'timeRange.period' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-              ),
-            ),'report' => array(
-              'path' => 'v1beta1/{+projectName}/events:report',
-              'httpMethod' => 'POST',
-              'parameters' => array(
-                'projectName' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),
-          )
-        )
-    );
-    $this->projects_groupStats = new Google_Service_Clouderrorreporting_Resource_ProjectsGroupStats(
-        $this,
-        $this->serviceName,
-        'groupStats',
-        array(
-          'methods' => array(
-            'list' => array(
-              'path' => 'v1beta1/{+projectName}/groupStats',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'projectName' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'timedCountDuration' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'pageToken' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'timeRange.period' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'alignment' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'groupId' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                  'repeated' => true,
-                ),
-                'serviceFilter.service' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'pageSize' => array(
-                  'location' => 'query',
-                  'type' => 'integer',
-                ),
-                'serviceFilter.version' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'order' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'serviceFilter.resourceType' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'alignmentTime' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-              ),
-            ),
-          )
-        )
-    );
-    $this->projects_groups = new Google_Service_Clouderrorreporting_Resource_ProjectsGroups(
-        $this,
-        $this->serviceName,
-        'groups',
-        array(
-          'methods' => array(
-            'get' => array(
-              'path' => 'v1beta1/{+groupName}',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'groupName' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'update' => array(
-              'path' => 'v1beta1/{+name}',
-              'httpMethod' => 'PUT',
-              'parameters' => array(
-                'name' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),
-          )
-        )
-    );
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Clouderrorreporting/DeleteEventsResponse.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Clouderrorreporting/DeleteEventsResponse.php
deleted file mode 100644
index 967bddb6..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Clouderrorreporting/DeleteEventsResponse.php
+++ /dev/null
@@ -1,20 +0,0 @@
-httpRequest = $httpRequest;
-  }
-  public function getHttpRequest()
-  {
-    return $this->httpRequest;
-  }
-  public function setReportLocation(Google_Service_Clouderrorreporting_SourceLocation $reportLocation)
-  {
-    $this->reportLocation = $reportLocation;
-  }
-  public function getReportLocation()
-  {
-    return $this->reportLocation;
-  }
-  public function setUser($user)
-  {
-    $this->user = $user;
-  }
-  public function getUser()
-  {
-    return $this->user;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Clouderrorreporting/ErrorEvent.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Clouderrorreporting/ErrorEvent.php
deleted file mode 100644
index 762f70d1..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Clouderrorreporting/ErrorEvent.php
+++ /dev/null
@@ -1,59 +0,0 @@
-context = $context;
-  }
-  public function getContext()
-  {
-    return $this->context;
-  }
-  public function setEventTime($eventTime)
-  {
-    $this->eventTime = $eventTime;
-  }
-  public function getEventTime()
-  {
-    return $this->eventTime;
-  }
-  public function setMessage($message)
-  {
-    $this->message = $message;
-  }
-  public function getMessage()
-  {
-    return $this->message;
-  }
-  public function setServiceContext(Google_Service_Clouderrorreporting_ServiceContext $serviceContext)
-  {
-    $this->serviceContext = $serviceContext;
-  }
-  public function getServiceContext()
-  {
-    return $this->serviceContext;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Clouderrorreporting/ErrorGroup.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Clouderrorreporting/ErrorGroup.php
deleted file mode 100644
index b31a8f56..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Clouderrorreporting/ErrorGroup.php
+++ /dev/null
@@ -1,50 +0,0 @@
-groupId = $groupId;
-  }
-  public function getGroupId()
-  {
-    return $this->groupId;
-  }
-  public function setName($name)
-  {
-    $this->name = $name;
-  }
-  public function getName()
-  {
-    return $this->name;
-  }
-  public function setTrackingIssues($trackingIssues)
-  {
-    $this->trackingIssues = $trackingIssues;
-  }
-  public function getTrackingIssues()
-  {
-    return $this->trackingIssues;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Clouderrorreporting/ErrorGroupStats.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Clouderrorreporting/ErrorGroupStats.php
deleted file mode 100644
index d02e9ace..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Clouderrorreporting/ErrorGroupStats.php
+++ /dev/null
@@ -1,107 +0,0 @@
-affectedServices = $affectedServices;
-  }
-  public function getAffectedServices()
-  {
-    return $this->affectedServices;
-  }
-  public function setAffectedUsersCount($affectedUsersCount)
-  {
-    $this->affectedUsersCount = $affectedUsersCount;
-  }
-  public function getAffectedUsersCount()
-  {
-    return $this->affectedUsersCount;
-  }
-  public function setCount($count)
-  {
-    $this->count = $count;
-  }
-  public function getCount()
-  {
-    return $this->count;
-  }
-  public function setFirstSeenTime($firstSeenTime)
-  {
-    $this->firstSeenTime = $firstSeenTime;
-  }
-  public function getFirstSeenTime()
-  {
-    return $this->firstSeenTime;
-  }
-  public function setGroup(Google_Service_Clouderrorreporting_ErrorGroup $group)
-  {
-    $this->group = $group;
-  }
-  public function getGroup()
-  {
-    return $this->group;
-  }
-  public function setLastSeenTime($lastSeenTime)
-  {
-    $this->lastSeenTime = $lastSeenTime;
-  }
-  public function getLastSeenTime()
-  {
-    return $this->lastSeenTime;
-  }
-  public function setNumAffectedServices($numAffectedServices)
-  {
-    $this->numAffectedServices = $numAffectedServices;
-  }
-  public function getNumAffectedServices()
-  {
-    return $this->numAffectedServices;
-  }
-  public function setRepresentative(Google_Service_Clouderrorreporting_ErrorEvent $representative)
-  {
-    $this->representative = $representative;
-  }
-  public function getRepresentative()
-  {
-    return $this->representative;
-  }
-  public function setTimedCounts($timedCounts)
-  {
-    $this->timedCounts = $timedCounts;
-  }
-  public function getTimedCounts()
-  {
-    return $this->timedCounts;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Clouderrorreporting/HttpRequestContext.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Clouderrorreporting/HttpRequestContext.php
deleted file mode 100644
index ef8c0125..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Clouderrorreporting/HttpRequestContext.php
+++ /dev/null
@@ -1,75 +0,0 @@
-method = $method;
-  }
-  public function getMethod()
-  {
-    return $this->method;
-  }
-  public function setReferrer($referrer)
-  {
-    $this->referrer = $referrer;
-  }
-  public function getReferrer()
-  {
-    return $this->referrer;
-  }
-  public function setRemoteIp($remoteIp)
-  {
-    $this->remoteIp = $remoteIp;
-  }
-  public function getRemoteIp()
-  {
-    return $this->remoteIp;
-  }
-  public function setResponseStatusCode($responseStatusCode)
-  {
-    $this->responseStatusCode = $responseStatusCode;
-  }
-  public function getResponseStatusCode()
-  {
-    return $this->responseStatusCode;
-  }
-  public function setUrl($url)
-  {
-    $this->url = $url;
-  }
-  public function getUrl()
-  {
-    return $this->url;
-  }
-  public function setUserAgent($userAgent)
-  {
-    $this->userAgent = $userAgent;
-  }
-  public function getUserAgent()
-  {
-    return $this->userAgent;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Clouderrorreporting/ListEventsResponse.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Clouderrorreporting/ListEventsResponse.php
deleted file mode 100644
index 8081c8b5..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Clouderrorreporting/ListEventsResponse.php
+++ /dev/null
@@ -1,50 +0,0 @@
-errorEvents = $errorEvents;
-  }
-  public function getErrorEvents()
-  {
-    return $this->errorEvents;
-  }
-  public function setNextPageToken($nextPageToken)
-  {
-    $this->nextPageToken = $nextPageToken;
-  }
-  public function getNextPageToken()
-  {
-    return $this->nextPageToken;
-  }
-  public function setTimeRangeBegin($timeRangeBegin)
-  {
-    $this->timeRangeBegin = $timeRangeBegin;
-  }
-  public function getTimeRangeBegin()
-  {
-    return $this->timeRangeBegin;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Clouderrorreporting/ListGroupStatsResponse.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Clouderrorreporting/ListGroupStatsResponse.php
deleted file mode 100644
index a1339e0e..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Clouderrorreporting/ListGroupStatsResponse.php
+++ /dev/null
@@ -1,50 +0,0 @@
-errorGroupStats = $errorGroupStats;
-  }
-  public function getErrorGroupStats()
-  {
-    return $this->errorGroupStats;
-  }
-  public function setNextPageToken($nextPageToken)
-  {
-    $this->nextPageToken = $nextPageToken;
-  }
-  public function getNextPageToken()
-  {
-    return $this->nextPageToken;
-  }
-  public function setTimeRangeBegin($timeRangeBegin)
-  {
-    $this->timeRangeBegin = $timeRangeBegin;
-  }
-  public function getTimeRangeBegin()
-  {
-    return $this->timeRangeBegin;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Clouderrorreporting/ReportErrorEventResponse.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Clouderrorreporting/ReportErrorEventResponse.php
deleted file mode 100644
index 84b4ae18..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Clouderrorreporting/ReportErrorEventResponse.php
+++ /dev/null
@@ -1,20 +0,0 @@
-context = $context;
-  }
-  public function getContext()
-  {
-    return $this->context;
-  }
-  public function setEventTime($eventTime)
-  {
-    $this->eventTime = $eventTime;
-  }
-  public function getEventTime()
-  {
-    return $this->eventTime;
-  }
-  public function setMessage($message)
-  {
-    $this->message = $message;
-  }
-  public function getMessage()
-  {
-    return $this->message;
-  }
-  public function setServiceContext(Google_Service_Clouderrorreporting_ServiceContext $serviceContext)
-  {
-    $this->serviceContext = $serviceContext;
-  }
-  public function getServiceContext()
-  {
-    return $this->serviceContext;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Clouderrorreporting/Resource/Projects.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Clouderrorreporting/Resource/Projects.php
deleted file mode 100644
index 2d656604..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Clouderrorreporting/Resource/Projects.php
+++ /dev/null
@@ -1,44 +0,0 @@
-
- *   $clouderrorreportingService = new Google_Service_Clouderrorreporting(...);
- *   $projects = $clouderrorreportingService->projects;
- *  
- */
-class Google_Service_Clouderrorreporting_Resource_Projects extends Google_Service_Resource
-{
-  /**
-   * Deletes all error events of a given project. (projects.deleteEvents)
-   *
-   * @param string $projectName [Required] The resource name of the Google Cloud
-   * Platform project. Written as `projects/` plus the [Google Cloud Platform
-   * project ID](https://support.google.com/cloud/answer/6158840). Example:
-   * `projects/my-project-123`.
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Clouderrorreporting_DeleteEventsResponse
-   */
-  public function deleteEvents($projectName, $optParams = array())
-  {
-    $params = array('projectName' => $projectName);
-    $params = array_merge($params, $optParams);
-    return $this->call('deleteEvents', array($params), "Google_Service_Clouderrorreporting_DeleteEventsResponse");
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Clouderrorreporting/Resource/ProjectsEvents.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Clouderrorreporting/Resource/ProjectsEvents.php
deleted file mode 100644
index dd6ef5ae..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Clouderrorreporting/Resource/ProjectsEvents.php
+++ /dev/null
@@ -1,85 +0,0 @@
-
- *   $clouderrorreportingService = new Google_Service_Clouderrorreporting(...);
- *   $events = $clouderrorreportingService->events;
- *  
- */
-class Google_Service_Clouderrorreporting_Resource_ProjectsEvents extends Google_Service_Resource
-{
-  /**
-   * Lists the specified events. (events.listProjectsEvents)
-   *
-   * @param string $projectName [Required] The resource name of the Google Cloud
-   * Platform project. Written as `projects/` plus the [Google Cloud Platform
-   * project ID](https://support.google.com/cloud/answer/6158840). Example:
-   * `projects/my-project-123`.
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param string groupId [Required] The group for which events shall be
-   * returned.
-   * @opt_param string pageToken [Optional] A `next_page_token` provided by a
-   * previous response.
-   * @opt_param string serviceFilter.service [Optional] The exact value to match
-   * against [`ServiceContext.service`](/error-
-   * reporting/reference/rest/v1beta1/ServiceContext#FIELDS.service).
-   * @opt_param int pageSize [Optional] The maximum number of results to return
-   * per response.
-   * @opt_param string serviceFilter.version [Optional] The exact value to match
-   * against [`ServiceContext.version`](/error-
-   * reporting/reference/rest/v1beta1/ServiceContext#FIELDS.version).
-   * @opt_param string serviceFilter.resourceType [Optional] The exact value to
-   * match against [`ServiceContext.resource_type`](/error-
-   * reporting/reference/rest/v1beta1/ServiceContext#FIELDS.resource_type).
-   * @opt_param string timeRange.period Restricts the query to the specified time
-   * range.
-   * @return Google_Service_Clouderrorreporting_ListEventsResponse
-   */
-  public function listProjectsEvents($projectName, $optParams = array())
-  {
-    $params = array('projectName' => $projectName);
-    $params = array_merge($params, $optParams);
-    return $this->call('list', array($params), "Google_Service_Clouderrorreporting_ListEventsResponse");
-  }
-  /**
-   * Report an individual error event.
-   *
-   * This endpoint accepts either an OAuth token, or an API key for
-   * authentication. To use an API key, append it to the URL as the value of a
-   * `key` parameter. For example: POST
-   * https://clouderrorreporting.googleapis.com/v1beta1/projects/example-
-   * project/events:report?key=123ABC456 (events.report)
-   *
-   * @param string $projectName [Required] The resource name of the Google Cloud
-   * Platform project. Written as `projects/` plus the [Google Cloud Platform
-   * project ID](https://support.google.com/cloud/answer/6158840). Example:
-   * `projects/my-project-123`.
-   * @param Google_Service_Clouderrorreporting_ReportedErrorEvent $postBody
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Clouderrorreporting_ReportErrorEventResponse
-   */
-  public function report($projectName, Google_Service_Clouderrorreporting_ReportedErrorEvent $postBody, $optParams = array())
-  {
-    $params = array('projectName' => $projectName, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('report', array($params), "Google_Service_Clouderrorreporting_ReportErrorEventResponse");
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Clouderrorreporting/Resource/ProjectsGroupStats.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Clouderrorreporting/Resource/ProjectsGroupStats.php
deleted file mode 100644
index d1787fd0..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Clouderrorreporting/Resource/ProjectsGroupStats.php
+++ /dev/null
@@ -1,71 +0,0 @@
-
- *   $clouderrorreportingService = new Google_Service_Clouderrorreporting(...);
- *   $groupStats = $clouderrorreportingService->groupStats;
- *  
- */
-class Google_Service_Clouderrorreporting_Resource_ProjectsGroupStats extends Google_Service_Resource
-{
-  /**
-   * Lists the specified groups. (groupStats.listProjectsGroupStats)
-   *
-   * @param string $projectName [Required] The resource name of the Google Cloud
-   * Platform project. Written as projects/ plus the Google Cloud Platform project
-   * ID.
-   *
-   * Example: projects/my-project-123.
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param string timedCountDuration [Optional] The preferred duration for a
-   * single returned `TimedCount`. If not set, no timed counts are returned.
-   * @opt_param string pageToken [Optional] A `next_page_token` provided by a
-   * previous response. To view additional results, pass this token along with the
-   * identical query parameters as the first request.
-   * @opt_param string timeRange.period Restricts the query to the specified time
-   * range.
-   * @opt_param string alignment [Optional] The alignment of the timed counts to
-   * be returned. Default is `ALIGNMENT_EQUAL_AT_END`.
-   * @opt_param string groupId [Optional] List all ErrorGroupStats with these IDs.
-   * @opt_param string serviceFilter.service [Optional] The exact value to match
-   * against [`ServiceContext.service`](/error-
-   * reporting/reference/rest/v1beta1/ServiceContext#FIELDS.service).
-   * @opt_param int pageSize [Optional] The maximum number of results to return
-   * per response. Default is 20.
-   * @opt_param string serviceFilter.version [Optional] The exact value to match
-   * against [`ServiceContext.version`](/error-
-   * reporting/reference/rest/v1beta1/ServiceContext#FIELDS.version).
-   * @opt_param string order [Optional] The sort order in which the results are
-   * returned. Default is `COUNT_DESC`.
-   * @opt_param string serviceFilter.resourceType [Optional] The exact value to
-   * match against [`ServiceContext.resource_type`](/error-
-   * reporting/reference/rest/v1beta1/ServiceContext#FIELDS.resource_type).
-   * @opt_param string alignmentTime [Optional] Time where the timed counts shall
-   * be aligned if rounded alignment is chosen. Default is 00:00 UTC.
-   * @return Google_Service_Clouderrorreporting_ListGroupStatsResponse
-   */
-  public function listProjectsGroupStats($projectName, $optParams = array())
-  {
-    $params = array('projectName' => $projectName);
-    $params = array_merge($params, $optParams);
-    return $this->call('list', array($params), "Google_Service_Clouderrorreporting_ListGroupStatsResponse");
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Clouderrorreporting/Resource/ProjectsGroups.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Clouderrorreporting/Resource/ProjectsGroups.php
deleted file mode 100644
index a75d8a28..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Clouderrorreporting/Resource/ProjectsGroups.php
+++ /dev/null
@@ -1,62 +0,0 @@
-
- *   $clouderrorreportingService = new Google_Service_Clouderrorreporting(...);
- *   $groups = $clouderrorreportingService->groups;
- *  
- */
-class Google_Service_Clouderrorreporting_Resource_ProjectsGroups extends Google_Service_Resource
-{
-  /**
-   * Get the specified group. (groups.get)
-   *
-   * @param string $groupName [Required] The group resource name. Written as
-   * projects/projectID/groups/group_name. Call
-   *
-   * groupStats.list to return a list of groups belonging to this project.
-   *
-   * Example: projects/my-project-123/groups/my-group
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Clouderrorreporting_ErrorGroup
-   */
-  public function get($groupName, $optParams = array())
-  {
-    $params = array('groupName' => $groupName);
-    $params = array_merge($params, $optParams);
-    return $this->call('get', array($params), "Google_Service_Clouderrorreporting_ErrorGroup");
-  }
-  /**
-   * Replace the data for the specified group. Fails if the group does not exist.
-   * (groups.update)
-   *
-   * @param string $name The group resource name. Example: projects/my-
-   * project-123/groups/my-groupid
-   * @param Google_Service_Clouderrorreporting_ErrorGroup $postBody
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Clouderrorreporting_ErrorGroup
-   */
-  public function update($name, Google_Service_Clouderrorreporting_ErrorGroup $postBody, $optParams = array())
-  {
-    $params = array('name' => $name, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('update', array($params), "Google_Service_Clouderrorreporting_ErrorGroup");
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Clouderrorreporting/ServiceContext.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Clouderrorreporting/ServiceContext.php
deleted file mode 100644
index 5c421858..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Clouderrorreporting/ServiceContext.php
+++ /dev/null
@@ -1,48 +0,0 @@
-resourceType = $resourceType;
-  }
-  public function getResourceType()
-  {
-    return $this->resourceType;
-  }
-  public function setService($service)
-  {
-    $this->service = $service;
-  }
-  public function getService()
-  {
-    return $this->service;
-  }
-  public function setVersion($version)
-  {
-    $this->version = $version;
-  }
-  public function getVersion()
-  {
-    return $this->version;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Clouderrorreporting/SourceLocation.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Clouderrorreporting/SourceLocation.php
deleted file mode 100644
index 0af36afa..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Clouderrorreporting/SourceLocation.php
+++ /dev/null
@@ -1,48 +0,0 @@
-filePath = $filePath;
-  }
-  public function getFilePath()
-  {
-    return $this->filePath;
-  }
-  public function setFunctionName($functionName)
-  {
-    $this->functionName = $functionName;
-  }
-  public function getFunctionName()
-  {
-    return $this->functionName;
-  }
-  public function setLineNumber($lineNumber)
-  {
-    $this->lineNumber = $lineNumber;
-  }
-  public function getLineNumber()
-  {
-    return $this->lineNumber;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Clouderrorreporting/TimedCount.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Clouderrorreporting/TimedCount.php
deleted file mode 100644
index 81bb63ae..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Clouderrorreporting/TimedCount.php
+++ /dev/null
@@ -1,48 +0,0 @@
-count = $count;
-  }
-  public function getCount()
-  {
-    return $this->count;
-  }
-  public function setEndTime($endTime)
-  {
-    $this->endTime = $endTime;
-  }
-  public function getEndTime()
-  {
-    return $this->endTime;
-  }
-  public function setStartTime($startTime)
-  {
-    $this->startTime = $startTime;
-  }
-  public function getStartTime()
-  {
-    return $this->startTime;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Clouderrorreporting/TrackingIssue.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Clouderrorreporting/TrackingIssue.php
deleted file mode 100644
index d6595405..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Clouderrorreporting/TrackingIssue.php
+++ /dev/null
@@ -1,30 +0,0 @@
-url = $url;
-  }
-  public function getUrl()
-  {
-    return $this->url;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Cloudlatencytest.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Cloudlatencytest.php
deleted file mode 100644
index c33743ab..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Cloudlatencytest.php
+++ /dev/null
@@ -1,71 +0,0 @@
-
- * Reports latency data.

- *
- * 

- * For more information about this service, see the API
- * Documentation
- * 

- *
- * @author Google, Inc.
- */
-class Google_Service_Cloudlatencytest extends Google_Service
-{
-  /** View monitoring data for all of your Google Cloud and API projects. */
-  const MONITORING_READONLY =
-      "https://www.googleapis.com/auth/monitoring.readonly";
-
-  public $statscollection;
-  
-  /**
-   * Constructs the internal representation of the Cloudlatencytest service.
-   *
-   * @param Google_Client $client
-   */
-  public function __construct(Google_Client $client)
-  {
-    parent::__construct($client);
-    $this->rootUrl = 'https://cloudlatencytest-pa.googleapis.com/';
-    $this->servicePath = 'v2/statscollection/';
-    $this->version = 'v2';
-    $this->serviceName = 'cloudlatencytest';
-
-    $this->statscollection = new Google_Service_Cloudlatencytest_StatscollectionResource(
-        $this,
-        $this->serviceName,
-        'statscollection',
-        array(
-          'methods' => array(
-            'updateaggregatedstats' => array(
-              'path' => 'updateaggregatedstats',
-              'httpMethod' => 'POST',
-              'parameters' => array(),
-            ),'updatestats' => array(
-              'path' => 'updatestats',
-              'httpMethod' => 'POST',
-              'parameters' => array(),
-            ),
-          )
-        )
-    );
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Cloudlatencytest/AggregatedStats.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Cloudlatencytest/AggregatedStats.php
deleted file mode 100644
index 94d7d0af..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Cloudlatencytest/AggregatedStats.php
+++ /dev/null
@@ -1,32 +0,0 @@
-stats = $stats;
-  }
-  public function getStats()
-  {
-    return $this->stats;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Cloudlatencytest/AggregatedStatsReply.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Cloudlatencytest/AggregatedStatsReply.php
deleted file mode 100644
index 41230f5b..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Cloudlatencytest/AggregatedStatsReply.php
+++ /dev/null
@@ -1,30 +0,0 @@
-testValue = $testValue;
-  }
-  public function getTestValue()
-  {
-    return $this->testValue;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Cloudlatencytest/DoubleValue.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Cloudlatencytest/DoubleValue.php
deleted file mode 100644
index 02ec2e2f..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Cloudlatencytest/DoubleValue.php
+++ /dev/null
@@ -1,39 +0,0 @@
-label = $label;
-  }
-  public function getLabel()
-  {
-    return $this->label;
-  }
-  public function setValue($value)
-  {
-    $this->value = $value;
-  }
-  public function getValue()
-  {
-    return $this->value;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Cloudlatencytest/IntValue.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Cloudlatencytest/IntValue.php
deleted file mode 100644
index 53c5b93e..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Cloudlatencytest/IntValue.php
+++ /dev/null
@@ -1,39 +0,0 @@
-label = $label;
-  }
-  public function getLabel()
-  {
-    return $this->label;
-  }
-  public function setValue($value)
-  {
-    $this->value = $value;
-  }
-  public function getValue()
-  {
-    return $this->value;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Cloudlatencytest/Stats.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Cloudlatencytest/Stats.php
deleted file mode 100644
index 51e62a7e..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Cloudlatencytest/Stats.php
+++ /dev/null
@@ -1,61 +0,0 @@
-doubleValues = $doubleValues;
-  }
-  public function getDoubleValues()
-  {
-    return $this->doubleValues;
-  }
-  public function setIntValues($intValues)
-  {
-    $this->intValues = $intValues;
-  }
-  public function getIntValues()
-  {
-    return $this->intValues;
-  }
-  public function setStringValues($stringValues)
-  {
-    $this->stringValues = $stringValues;
-  }
-  public function getStringValues()
-  {
-    return $this->stringValues;
-  }
-  public function setTime($time)
-  {
-    $this->time = $time;
-  }
-  public function getTime()
-  {
-    return $this->time;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Cloudlatencytest/StatsReply.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Cloudlatencytest/StatsReply.php
deleted file mode 100644
index 238ae50e..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Cloudlatencytest/StatsReply.php
+++ /dev/null
@@ -1,30 +0,0 @@
-testValue = $testValue;
-  }
-  public function getTestValue()
-  {
-    return $this->testValue;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Cloudlatencytest/StatscollectionResource.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Cloudlatencytest/StatscollectionResource.php
deleted file mode 100644
index 3f9b41d3..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Cloudlatencytest/StatscollectionResource.php
+++ /dev/null
@@ -1,54 +0,0 @@
-
- *   $cloudlatencytestService = new Google_Service_Cloudlatencytest(...);
- *   $statscollection = $cloudlatencytestService->statscollection;
- *  
- */
-class Google_Service_Cloudlatencytest_StatscollectionResource extends Google_Service_Resource
-{
-  /**
-   * RPC to update the new TCP stats. (statscollection.updateaggregatedstats)
-   *
-   * @param Google_Service_Cloudlatencytest_AggregatedStats $postBody
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Cloudlatencytest_AggregatedStatsReply
-   */
-  public function updateaggregatedstats(Google_Service_Cloudlatencytest_AggregatedStats $postBody, $optParams = array())
-  {
-    $params = array('postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('updateaggregatedstats', array($params), "Google_Service_Cloudlatencytest_AggregatedStatsReply");
-  }
-  /**
-   * RPC to update the new TCP stats. (statscollection.updatestats)
-   *
-   * @param Google_Service_Cloudlatencytest_Stats $postBody
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Cloudlatencytest_StatsReply
-   */
-  public function updatestats(Google_Service_Cloudlatencytest_Stats $postBody, $optParams = array())
-  {
-    $params = array('postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('updatestats', array($params), "Google_Service_Cloudlatencytest_StatsReply");
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Cloudlatencytest/StringValue.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Cloudlatencytest/StringValue.php
deleted file mode 100644
index 2d79f3ff..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Cloudlatencytest/StringValue.php
+++ /dev/null
@@ -1,39 +0,0 @@
-label = $label;
-  }
-  public function getLabel()
-  {
-    return $this->label;
-  }
-  public function setValue($value)
-  {
-    $this->value = $value;
-  }
-  public function getValue()
-  {
-    return $this->value;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute.php
deleted file mode 100644
index 15627e1f..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute.php
+++ /dev/null
@@ -1,5692 +0,0 @@
-
- * Creates and runs virtual machines on Google Cloud Platform.

- *
- * 

- * For more information about this service, see the API
- * Documentation
- * 

- *
- * @author Google, Inc.
- */
-class Google_Service_Compute extends Google_Service
-{
-  /** View and manage your data across Google Cloud Platform services. */
-  const CLOUD_PLATFORM =
-      "https://www.googleapis.com/auth/cloud-platform";
-  /** View and manage your Google Compute Engine resources. */
-  const COMPUTE =
-      "https://www.googleapis.com/auth/compute";
-  /** View your Google Compute Engine resources. */
-  const COMPUTE_READONLY =
-      "https://www.googleapis.com/auth/compute.readonly";
-  /** Manage your data and permissions in Google Cloud Storage. */
-  const DEVSTORAGE_FULL_CONTROL =
-      "https://www.googleapis.com/auth/devstorage.full_control";
-  /** View your data in Google Cloud Storage. */
-  const DEVSTORAGE_READ_ONLY =
-      "https://www.googleapis.com/auth/devstorage.read_only";
-  /** Manage your data in Google Cloud Storage. */
-  const DEVSTORAGE_READ_WRITE =
-      "https://www.googleapis.com/auth/devstorage.read_write";
-
-  public $addresses;
-  public $autoscalers;
-  public $backendBuckets;
-  public $backendServices;
-  public $diskTypes;
-  public $disks;
-  public $firewalls;
-  public $forwardingRules;
-  public $globalAddresses;
-  public $globalForwardingRules;
-  public $globalOperations;
-  public $healthChecks;
-  public $httpHealthChecks;
-  public $httpsHealthChecks;
-  public $images;
-  public $instanceGroupManagers;
-  public $instanceGroups;
-  public $instanceTemplates;
-  public $instances;
-  public $licenses;
-  public $machineTypes;
-  public $networks;
-  public $projects;
-  public $regionAutoscalers;
-  public $regionBackendServices;
-  public $regionInstanceGroupManagers;
-  public $regionInstanceGroups;
-  public $regionOperations;
-  public $regions;
-  public $routers;
-  public $routes;
-  public $snapshots;
-  public $sslCertificates;
-  public $subnetworks;
-  public $targetHttpProxies;
-  public $targetHttpsProxies;
-  public $targetInstances;
-  public $targetPools;
-  public $targetSslProxies;
-  public $targetVpnGateways;
-  public $urlMaps;
-  public $vpnTunnels;
-  public $zoneOperations;
-  public $zones;
-  
-  /**
-   * Constructs the internal representation of the Compute service.
-   *
-   * @param Google_Client $client
-   */
-  public function __construct(Google_Client $client)
-  {
-    parent::__construct($client);
-    $this->rootUrl = 'https://www.googleapis.com/';
-    $this->servicePath = 'compute/v1/projects/';
-    $this->version = 'v1';
-    $this->serviceName = 'compute';
-
-    $this->addresses = new Google_Service_Compute_Resource_Addresses(
-        $this,
-        $this->serviceName,
-        'addresses',
-        array(
-          'methods' => array(
-            'aggregatedList' => array(
-              'path' => '{project}/aggregated/addresses',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'project' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'filter' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'maxResults' => array(
-                  'location' => 'query',
-                  'type' => 'integer',
-                ),
-                'orderBy' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'pageToken' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-              ),
-            ),'delete' => array(
-              'path' => '{project}/regions/{region}/addresses/{address}',
-              'httpMethod' => 'DELETE',
-              'parameters' => array(
-                'project' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'region' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'address' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'get' => array(
-              'path' => '{project}/regions/{region}/addresses/{address}',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'project' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'region' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'address' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'insert' => array(
-              'path' => '{project}/regions/{region}/addresses',
-              'httpMethod' => 'POST',
-              'parameters' => array(
-                'project' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'region' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'list' => array(
-              'path' => '{project}/regions/{region}/addresses',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'project' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'region' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'filter' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'maxResults' => array(
-                  'location' => 'query',
-                  'type' => 'integer',
-                ),
-                'orderBy' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'pageToken' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-              ),
-            ),
-          )
-        )
-    );
-    $this->autoscalers = new Google_Service_Compute_Resource_Autoscalers(
-        $this,
-        $this->serviceName,
-        'autoscalers',
-        array(
-          'methods' => array(
-            'aggregatedList' => array(
-              'path' => '{project}/aggregated/autoscalers',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'project' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'filter' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'maxResults' => array(
-                  'location' => 'query',
-                  'type' => 'integer',
-                ),
-                'orderBy' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'pageToken' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-              ),
-            ),'delete' => array(
-              'path' => '{project}/zones/{zone}/autoscalers/{autoscaler}',
-              'httpMethod' => 'DELETE',
-              'parameters' => array(
-                'project' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'zone' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'autoscaler' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'get' => array(
-              'path' => '{project}/zones/{zone}/autoscalers/{autoscaler}',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'project' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'zone' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'autoscaler' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'insert' => array(
-              'path' => '{project}/zones/{zone}/autoscalers',
-              'httpMethod' => 'POST',
-              'parameters' => array(
-                'project' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'zone' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'list' => array(
-              'path' => '{project}/zones/{zone}/autoscalers',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'project' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'zone' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'filter' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'maxResults' => array(
-                  'location' => 'query',
-                  'type' => 'integer',
-                ),
-                'orderBy' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'pageToken' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-              ),
-            ),'patch' => array(
-              'path' => '{project}/zones/{zone}/autoscalers',
-              'httpMethod' => 'PATCH',
-              'parameters' => array(
-                'project' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'zone' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'autoscaler' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'update' => array(
-              'path' => '{project}/zones/{zone}/autoscalers',
-              'httpMethod' => 'PUT',
-              'parameters' => array(
-                'project' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'zone' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'autoscaler' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-              ),
-            ),
-          )
-        )
-    );
-    $this->backendBuckets = new Google_Service_Compute_Resource_BackendBuckets(
-        $this,
-        $this->serviceName,
-        'backendBuckets',
-        array(
-          'methods' => array(
-            'delete' => array(
-              'path' => '{project}/global/backendBuckets/{backendBucket}',
-              'httpMethod' => 'DELETE',
-              'parameters' => array(
-                'project' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'backendBucket' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'get' => array(
-              'path' => '{project}/global/backendBuckets/{backendBucket}',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'project' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'backendBucket' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'insert' => array(
-              'path' => '{project}/global/backendBuckets',
-              'httpMethod' => 'POST',
-              'parameters' => array(
-                'project' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'list' => array(
-              'path' => '{project}/global/backendBuckets',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'project' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'filter' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'maxResults' => array(
-                  'location' => 'query',
-                  'type' => 'integer',
-                ),
-                'orderBy' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'pageToken' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-              ),
-            ),'patch' => array(
-              'path' => '{project}/global/backendBuckets/{backendBucket}',
-              'httpMethod' => 'PATCH',
-              'parameters' => array(
-                'project' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'backendBucket' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'update' => array(
-              'path' => '{project}/global/backendBuckets/{backendBucket}',
-              'httpMethod' => 'PUT',
-              'parameters' => array(
-                'project' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'backendBucket' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),
-          )
-        )
-    );
-    $this->backendServices = new Google_Service_Compute_Resource_BackendServices(
-        $this,
-        $this->serviceName,
-        'backendServices',
-        array(
-          'methods' => array(
-            'aggregatedList' => array(
-              'path' => '{project}/aggregated/backendServices',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'project' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'filter' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'maxResults' => array(
-                  'location' => 'query',
-                  'type' => 'integer',
-                ),
-                'orderBy' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'pageToken' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-              ),
-            ),'delete' => array(
-              'path' => '{project}/global/backendServices/{backendService}',
-              'httpMethod' => 'DELETE',
-              'parameters' => array(
-                'project' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'backendService' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'get' => array(
-              'path' => '{project}/global/backendServices/{backendService}',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'project' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'backendService' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'getHealth' => array(
-              'path' => '{project}/global/backendServices/{backendService}/getHealth',
-              'httpMethod' => 'POST',
-              'parameters' => array(
-                'project' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'backendService' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'insert' => array(
-              'path' => '{project}/global/backendServices',
-              'httpMethod' => 'POST',
-              'parameters' => array(
-                'project' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'list' => array(
-              'path' => '{project}/global/backendServices',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'project' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'filter' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'maxResults' => array(
-                  'location' => 'query',
-                  'type' => 'integer',
-                ),
-                'orderBy' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'pageToken' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-              ),
-            ),'patch' => array(
-              'path' => '{project}/global/backendServices/{backendService}',
-              'httpMethod' => 'PATCH',
-              'parameters' => array(
-                'project' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'backendService' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'update' => array(
-              'path' => '{project}/global/backendServices/{backendService}',
-              'httpMethod' => 'PUT',
-              'parameters' => array(
-                'project' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'backendService' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),
-          )
-        )
-    );
-    $this->diskTypes = new Google_Service_Compute_Resource_DiskTypes(
-        $this,
-        $this->serviceName,
-        'diskTypes',
-        array(
-          'methods' => array(
-            'aggregatedList' => array(
-              'path' => '{project}/aggregated/diskTypes',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'project' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'filter' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'maxResults' => array(
-                  'location' => 'query',
-                  'type' => 'integer',
-                ),
-                'orderBy' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'pageToken' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-              ),
-            ),'get' => array(
-              'path' => '{project}/zones/{zone}/diskTypes/{diskType}',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'project' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'zone' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'diskType' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'list' => array(
-              'path' => '{project}/zones/{zone}/diskTypes',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'project' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'zone' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'filter' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'maxResults' => array(
-                  'location' => 'query',
-                  'type' => 'integer',
-                ),
-                'orderBy' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'pageToken' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-              ),
-            ),
-          )
-        )
-    );
-    $this->disks = new Google_Service_Compute_Resource_Disks(
-        $this,
-        $this->serviceName,
-        'disks',
-        array(
-          'methods' => array(
-            'aggregatedList' => array(
-              'path' => '{project}/aggregated/disks',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'project' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'filter' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'maxResults' => array(
-                  'location' => 'query',
-                  'type' => 'integer',
-                ),
-                'orderBy' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'pageToken' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-              ),
-            ),'createSnapshot' => array(
-              'path' => '{project}/zones/{zone}/disks/{disk}/createSnapshot',
-              'httpMethod' => 'POST',
-              'parameters' => array(
-                'project' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'zone' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'disk' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'guestFlush' => array(
-                  'location' => 'query',
-                  'type' => 'boolean',
-                ),
-              ),
-            ),'delete' => array(
-              'path' => '{project}/zones/{zone}/disks/{disk}',
-              'httpMethod' => 'DELETE',
-              'parameters' => array(
-                'project' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'zone' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'disk' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'get' => array(
-              'path' => '{project}/zones/{zone}/disks/{disk}',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'project' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'zone' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'disk' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'insert' => array(
-              'path' => '{project}/zones/{zone}/disks',
-              'httpMethod' => 'POST',
-              'parameters' => array(
-                'project' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'zone' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'sourceImage' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-              ),
-            ),'list' => array(
-              'path' => '{project}/zones/{zone}/disks',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'project' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'zone' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'filter' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'maxResults' => array(
-                  'location' => 'query',
-                  'type' => 'integer',
-                ),
-                'orderBy' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'pageToken' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-              ),
-            ),'resize' => array(
-              'path' => '{project}/zones/{zone}/disks/{disk}/resize',
-              'httpMethod' => 'POST',
-              'parameters' => array(
-                'project' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'zone' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'disk' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),
-          )
-        )
-    );
-    $this->firewalls = new Google_Service_Compute_Resource_Firewalls(
-        $this,
-        $this->serviceName,
-        'firewalls',
-        array(
-          'methods' => array(
-            'delete' => array(
-              'path' => '{project}/global/firewalls/{firewall}',
-              'httpMethod' => 'DELETE',
-              'parameters' => array(
-                'project' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'firewall' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'get' => array(
-              'path' => '{project}/global/firewalls/{firewall}',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'project' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'firewall' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'insert' => array(
-              'path' => '{project}/global/firewalls',
-              'httpMethod' => 'POST',
-              'parameters' => array(
-                'project' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'list' => array(
-              'path' => '{project}/global/firewalls',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'project' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'filter' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'maxResults' => array(
-                  'location' => 'query',
-                  'type' => 'integer',
-                ),
-                'orderBy' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'pageToken' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-              ),
-            ),'patch' => array(
-              'path' => '{project}/global/firewalls/{firewall}',
-              'httpMethod' => 'PATCH',
-              'parameters' => array(
-                'project' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'firewall' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'update' => array(
-              'path' => '{project}/global/firewalls/{firewall}',
-              'httpMethod' => 'PUT',
-              'parameters' => array(
-                'project' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'firewall' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),
-          )
-        )
-    );
-    $this->forwardingRules = new Google_Service_Compute_Resource_ForwardingRules(
-        $this,
-        $this->serviceName,
-        'forwardingRules',
-        array(
-          'methods' => array(
-            'aggregatedList' => array(
-              'path' => '{project}/aggregated/forwardingRules',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'project' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'filter' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'maxResults' => array(
-                  'location' => 'query',
-                  'type' => 'integer',
-                ),
-                'orderBy' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'pageToken' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-              ),
-            ),'delete' => array(
-              'path' => '{project}/regions/{region}/forwardingRules/{forwardingRule}',
-              'httpMethod' => 'DELETE',
-              'parameters' => array(
-                'project' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'region' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'forwardingRule' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'get' => array(
-              'path' => '{project}/regions/{region}/forwardingRules/{forwardingRule}',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'project' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'region' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'forwardingRule' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'insert' => array(
-              'path' => '{project}/regions/{region}/forwardingRules',
-              'httpMethod' => 'POST',
-              'parameters' => array(
-                'project' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'region' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'list' => array(
-              'path' => '{project}/regions/{region}/forwardingRules',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'project' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'region' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'filter' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'maxResults' => array(
-                  'location' => 'query',
-                  'type' => 'integer',
-                ),
-                'orderBy' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'pageToken' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-              ),
-            ),'setTarget' => array(
-              'path' => '{project}/regions/{region}/forwardingRules/{forwardingRule}/setTarget',
-              'httpMethod' => 'POST',
-              'parameters' => array(
-                'project' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'region' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'forwardingRule' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),
-          )
-        )
-    );
-    $this->globalAddresses = new Google_Service_Compute_Resource_GlobalAddresses(
-        $this,
-        $this->serviceName,
-        'globalAddresses',
-        array(
-          'methods' => array(
-            'delete' => array(
-              'path' => '{project}/global/addresses/{address}',
-              'httpMethod' => 'DELETE',
-              'parameters' => array(
-                'project' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'address' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'get' => array(
-              'path' => '{project}/global/addresses/{address}',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'project' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'address' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'insert' => array(
-              'path' => '{project}/global/addresses',
-              'httpMethod' => 'POST',
-              'parameters' => array(
-                'project' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'list' => array(
-              'path' => '{project}/global/addresses',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'project' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'filter' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'maxResults' => array(
-                  'location' => 'query',
-                  'type' => 'integer',
-                ),
-                'orderBy' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'pageToken' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-              ),
-            ),
-          )
-        )
-    );
-    $this->globalForwardingRules = new Google_Service_Compute_Resource_GlobalForwardingRules(
-        $this,
-        $this->serviceName,
-        'globalForwardingRules',
-        array(
-          'methods' => array(
-            'delete' => array(
-              'path' => '{project}/global/forwardingRules/{forwardingRule}',
-              'httpMethod' => 'DELETE',
-              'parameters' => array(
-                'project' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'forwardingRule' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'get' => array(
-              'path' => '{project}/global/forwardingRules/{forwardingRule}',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'project' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'forwardingRule' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'insert' => array(
-              'path' => '{project}/global/forwardingRules',
-              'httpMethod' => 'POST',
-              'parameters' => array(
-                'project' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'list' => array(
-              'path' => '{project}/global/forwardingRules',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'project' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'filter' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'maxResults' => array(
-                  'location' => 'query',
-                  'type' => 'integer',
-                ),
-                'orderBy' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'pageToken' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-              ),
-            ),'setTarget' => array(
-              'path' => '{project}/global/forwardingRules/{forwardingRule}/setTarget',
-              'httpMethod' => 'POST',
-              'parameters' => array(
-                'project' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'forwardingRule' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),
-          )
-        )
-    );
-    $this->globalOperations = new Google_Service_Compute_Resource_GlobalOperations(
-        $this,
-        $this->serviceName,
-        'globalOperations',
-        array(
-          'methods' => array(
-            'aggregatedList' => array(
-              'path' => '{project}/aggregated/operations',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'project' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'filter' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'maxResults' => array(
-                  'location' => 'query',
-                  'type' => 'integer',
-                ),
-                'orderBy' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'pageToken' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-              ),
-            ),'delete' => array(
-              'path' => '{project}/global/operations/{operation}',
-              'httpMethod' => 'DELETE',
-              'parameters' => array(
-                'project' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'operation' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'get' => array(
-              'path' => '{project}/global/operations/{operation}',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'project' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'operation' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'list' => array(
-              'path' => '{project}/global/operations',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'project' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'filter' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'maxResults' => array(
-                  'location' => 'query',
-                  'type' => 'integer',
-                ),
-                'orderBy' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'pageToken' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-              ),
-            ),
-          )
-        )
-    );
-    $this->healthChecks = new Google_Service_Compute_Resource_HealthChecks(
-        $this,
-        $this->serviceName,
-        'healthChecks',
-        array(
-          'methods' => array(
-            'delete' => array(
-              'path' => '{project}/global/healthChecks/{healthCheck}',
-              'httpMethod' => 'DELETE',
-              'parameters' => array(
-                'project' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'healthCheck' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'get' => array(
-              'path' => '{project}/global/healthChecks/{healthCheck}',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'project' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'healthCheck' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'insert' => array(
-              'path' => '{project}/global/healthChecks',
-              'httpMethod' => 'POST',
-              'parameters' => array(
-                'project' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'list' => array(
-              'path' => '{project}/global/healthChecks',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'project' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'filter' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'maxResults' => array(
-                  'location' => 'query',
-                  'type' => 'integer',
-                ),
-                'orderBy' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'pageToken' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-              ),
-            ),'patch' => array(
-              'path' => '{project}/global/healthChecks/{healthCheck}',
-              'httpMethod' => 'PATCH',
-              'parameters' => array(
-                'project' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'healthCheck' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'update' => array(
-              'path' => '{project}/global/healthChecks/{healthCheck}',
-              'httpMethod' => 'PUT',
-              'parameters' => array(
-                'project' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'healthCheck' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),
-          )
-        )
-    );
-    $this->httpHealthChecks = new Google_Service_Compute_Resource_HttpHealthChecks(
-        $this,
-        $this->serviceName,
-        'httpHealthChecks',
-        array(
-          'methods' => array(
-            'delete' => array(
-              'path' => '{project}/global/httpHealthChecks/{httpHealthCheck}',
-              'httpMethod' => 'DELETE',
-              'parameters' => array(
-                'project' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'httpHealthCheck' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'get' => array(
-              'path' => '{project}/global/httpHealthChecks/{httpHealthCheck}',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'project' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'httpHealthCheck' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'insert' => array(
-              'path' => '{project}/global/httpHealthChecks',
-              'httpMethod' => 'POST',
-              'parameters' => array(
-                'project' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'list' => array(
-              'path' => '{project}/global/httpHealthChecks',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'project' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'filter' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'maxResults' => array(
-                  'location' => 'query',
-                  'type' => 'integer',
-                ),
-                'orderBy' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'pageToken' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-              ),
-            ),'patch' => array(
-              'path' => '{project}/global/httpHealthChecks/{httpHealthCheck}',
-              'httpMethod' => 'PATCH',
-              'parameters' => array(
-                'project' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'httpHealthCheck' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'update' => array(
-              'path' => '{project}/global/httpHealthChecks/{httpHealthCheck}',
-              'httpMethod' => 'PUT',
-              'parameters' => array(
-                'project' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'httpHealthCheck' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),
-          )
-        )
-    );
-    $this->httpsHealthChecks = new Google_Service_Compute_Resource_HttpsHealthChecks(
-        $this,
-        $this->serviceName,
-        'httpsHealthChecks',
-        array(
-          'methods' => array(
-            'delete' => array(
-              'path' => '{project}/global/httpsHealthChecks/{httpsHealthCheck}',
-              'httpMethod' => 'DELETE',
-              'parameters' => array(
-                'project' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'httpsHealthCheck' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'get' => array(
-              'path' => '{project}/global/httpsHealthChecks/{httpsHealthCheck}',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'project' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'httpsHealthCheck' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'insert' => array(
-              'path' => '{project}/global/httpsHealthChecks',
-              'httpMethod' => 'POST',
-              'parameters' => array(
-                'project' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'list' => array(
-              'path' => '{project}/global/httpsHealthChecks',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'project' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'filter' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'maxResults' => array(
-                  'location' => 'query',
-                  'type' => 'integer',
-                ),
-                'orderBy' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'pageToken' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-              ),
-            ),'patch' => array(
-              'path' => '{project}/global/httpsHealthChecks/{httpsHealthCheck}',
-              'httpMethod' => 'PATCH',
-              'parameters' => array(
-                'project' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'httpsHealthCheck' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'update' => array(
-              'path' => '{project}/global/httpsHealthChecks/{httpsHealthCheck}',
-              'httpMethod' => 'PUT',
-              'parameters' => array(
-                'project' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'httpsHealthCheck' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),
-          )
-        )
-    );
-    $this->images = new Google_Service_Compute_Resource_Images(
-        $this,
-        $this->serviceName,
-        'images',
-        array(
-          'methods' => array(
-            'delete' => array(
-              'path' => '{project}/global/images/{image}',
-              'httpMethod' => 'DELETE',
-              'parameters' => array(
-                'project' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'image' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'deprecate' => array(
-              'path' => '{project}/global/images/{image}/deprecate',
-              'httpMethod' => 'POST',
-              'parameters' => array(
-                'project' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'image' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'get' => array(
-              'path' => '{project}/global/images/{image}',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'project' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'image' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'getFromFamily' => array(
-              'path' => '{project}/global/images/family/{family}',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'project' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'family' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'insert' => array(
-              'path' => '{project}/global/images',
-              'httpMethod' => 'POST',
-              'parameters' => array(
-                'project' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'list' => array(
-              'path' => '{project}/global/images',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'project' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'filter' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'maxResults' => array(
-                  'location' => 'query',
-                  'type' => 'integer',
-                ),
-                'orderBy' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'pageToken' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-              ),
-            ),
-          )
-        )
-    );
-    $this->instanceGroupManagers = new Google_Service_Compute_Resource_InstanceGroupManagers(
-        $this,
-        $this->serviceName,
-        'instanceGroupManagers',
-        array(
-          'methods' => array(
-            'abandonInstances' => array(
-              'path' => '{project}/zones/{zone}/instanceGroupManagers/{instanceGroupManager}/abandonInstances',
-              'httpMethod' => 'POST',
-              'parameters' => array(
-                'project' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'zone' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'instanceGroupManager' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'aggregatedList' => array(
-              'path' => '{project}/aggregated/instanceGroupManagers',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'project' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'filter' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'maxResults' => array(
-                  'location' => 'query',
-                  'type' => 'integer',
-                ),
-                'orderBy' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'pageToken' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-              ),
-            ),'delete' => array(
-              'path' => '{project}/zones/{zone}/instanceGroupManagers/{instanceGroupManager}',
-              'httpMethod' => 'DELETE',
-              'parameters' => array(
-                'project' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'zone' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'instanceGroupManager' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'deleteInstances' => array(
-              'path' => '{project}/zones/{zone}/instanceGroupManagers/{instanceGroupManager}/deleteInstances',
-              'httpMethod' => 'POST',
-              'parameters' => array(
-                'project' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'zone' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'instanceGroupManager' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'get' => array(
-              'path' => '{project}/zones/{zone}/instanceGroupManagers/{instanceGroupManager}',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'project' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'zone' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'instanceGroupManager' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'insert' => array(
-              'path' => '{project}/zones/{zone}/instanceGroupManagers',
-              'httpMethod' => 'POST',
-              'parameters' => array(
-                'project' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'zone' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'list' => array(
-              'path' => '{project}/zones/{zone}/instanceGroupManagers',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'project' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'zone' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'filter' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'maxResults' => array(
-                  'location' => 'query',
-                  'type' => 'integer',
-                ),
-                'orderBy' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'pageToken' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-              ),
-            ),'listManagedInstances' => array(
-              'path' => '{project}/zones/{zone}/instanceGroupManagers/{instanceGroupManager}/listManagedInstances',
-              'httpMethod' => 'POST',
-              'parameters' => array(
-                'project' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'zone' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'instanceGroupManager' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'filter' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'maxResults' => array(
-                  'location' => 'query',
-                  'type' => 'integer',
-                ),
-                'order_by' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'pageToken' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-              ),
-            ),'recreateInstances' => array(
-              'path' => '{project}/zones/{zone}/instanceGroupManagers/{instanceGroupManager}/recreateInstances',
-              'httpMethod' => 'POST',
-              'parameters' => array(
-                'project' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'zone' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'instanceGroupManager' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'resize' => array(
-              'path' => '{project}/zones/{zone}/instanceGroupManagers/{instanceGroupManager}/resize',
-              'httpMethod' => 'POST',
-              'parameters' => array(
-                'project' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'zone' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'instanceGroupManager' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'size' => array(
-                  'location' => 'query',
-                  'type' => 'integer',
-                  'required' => true,
-                ),
-              ),
-            ),'setInstanceTemplate' => array(
-              'path' => '{project}/zones/{zone}/instanceGroupManagers/{instanceGroupManager}/setInstanceTemplate',
-              'httpMethod' => 'POST',
-              'parameters' => array(
-                'project' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'zone' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'instanceGroupManager' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'setTargetPools' => array(
-              'path' => '{project}/zones/{zone}/instanceGroupManagers/{instanceGroupManager}/setTargetPools',
-              'httpMethod' => 'POST',
-              'parameters' => array(
-                'project' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'zone' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'instanceGroupManager' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),
-          )
-        )
-    );
-    $this->instanceGroups = new Google_Service_Compute_Resource_InstanceGroups(
-        $this,
-        $this->serviceName,
-        'instanceGroups',
-        array(
-          'methods' => array(
-            'addInstances' => array(
-              'path' => '{project}/zones/{zone}/instanceGroups/{instanceGroup}/addInstances',
-              'httpMethod' => 'POST',
-              'parameters' => array(
-                'project' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'zone' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'instanceGroup' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'aggregatedList' => array(
-              'path' => '{project}/aggregated/instanceGroups',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'project' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'filter' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'maxResults' => array(
-                  'location' => 'query',
-                  'type' => 'integer',
-                ),
-                'orderBy' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'pageToken' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-              ),
-            ),'delete' => array(
-              'path' => '{project}/zones/{zone}/instanceGroups/{instanceGroup}',
-              'httpMethod' => 'DELETE',
-              'parameters' => array(
-                'project' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'zone' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'instanceGroup' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'get' => array(
-              'path' => '{project}/zones/{zone}/instanceGroups/{instanceGroup}',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'project' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'zone' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'instanceGroup' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'insert' => array(
-              'path' => '{project}/zones/{zone}/instanceGroups',
-              'httpMethod' => 'POST',
-              'parameters' => array(
-                'project' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'zone' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'list' => array(
-              'path' => '{project}/zones/{zone}/instanceGroups',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'project' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'zone' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'filter' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'maxResults' => array(
-                  'location' => 'query',
-                  'type' => 'integer',
-                ),
-                'orderBy' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'pageToken' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-              ),
-            ),'listInstances' => array(
-              'path' => '{project}/zones/{zone}/instanceGroups/{instanceGroup}/listInstances',
-              'httpMethod' => 'POST',
-              'parameters' => array(
-                'project' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'zone' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'instanceGroup' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'filter' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'maxResults' => array(
-                  'location' => 'query',
-                  'type' => 'integer',
-                ),
-                'orderBy' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'pageToken' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-              ),
-            ),'removeInstances' => array(
-              'path' => '{project}/zones/{zone}/instanceGroups/{instanceGroup}/removeInstances',
-              'httpMethod' => 'POST',
-              'parameters' => array(
-                'project' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'zone' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'instanceGroup' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'setNamedPorts' => array(
-              'path' => '{project}/zones/{zone}/instanceGroups/{instanceGroup}/setNamedPorts',
-              'httpMethod' => 'POST',
-              'parameters' => array(
-                'project' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'zone' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'instanceGroup' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),
-          )
-        )
-    );
-    $this->instanceTemplates = new Google_Service_Compute_Resource_InstanceTemplates(
-        $this,
-        $this->serviceName,
-        'instanceTemplates',
-        array(
-          'methods' => array(
-            'delete' => array(
-              'path' => '{project}/global/instanceTemplates/{instanceTemplate}',
-              'httpMethod' => 'DELETE',
-              'parameters' => array(
-                'project' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'instanceTemplate' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'get' => array(
-              'path' => '{project}/global/instanceTemplates/{instanceTemplate}',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'project' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'instanceTemplate' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'insert' => array(
-              'path' => '{project}/global/instanceTemplates',
-              'httpMethod' => 'POST',
-              'parameters' => array(
-                'project' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'list' => array(
-              'path' => '{project}/global/instanceTemplates',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'project' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'filter' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'maxResults' => array(
-                  'location' => 'query',
-                  'type' => 'integer',
-                ),
-                'orderBy' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'pageToken' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-              ),
-            ),
-          )
-        )
-    );
-    $this->instances = new Google_Service_Compute_Resource_Instances(
-        $this,
-        $this->serviceName,
-        'instances',
-        array(
-          'methods' => array(
-            'addAccessConfig' => array(
-              'path' => '{project}/zones/{zone}/instances/{instance}/addAccessConfig',
-              'httpMethod' => 'POST',
-              'parameters' => array(
-                'project' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'zone' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'instance' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'networkInterface' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'aggregatedList' => array(
-              'path' => '{project}/aggregated/instances',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'project' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'filter' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'maxResults' => array(
-                  'location' => 'query',
-                  'type' => 'integer',
-                ),
-                'orderBy' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'pageToken' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-              ),
-            ),'attachDisk' => array(
-              'path' => '{project}/zones/{zone}/instances/{instance}/attachDisk',
-              'httpMethod' => 'POST',
-              'parameters' => array(
-                'project' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'zone' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'instance' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'delete' => array(
-              'path' => '{project}/zones/{zone}/instances/{instance}',
-              'httpMethod' => 'DELETE',
-              'parameters' => array(
-                'project' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'zone' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'instance' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'deleteAccessConfig' => array(
-              'path' => '{project}/zones/{zone}/instances/{instance}/deleteAccessConfig',
-              'httpMethod' => 'POST',
-              'parameters' => array(
-                'project' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'zone' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'instance' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'accessConfig' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'networkInterface' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'detachDisk' => array(
-              'path' => '{project}/zones/{zone}/instances/{instance}/detachDisk',
-              'httpMethod' => 'POST',
-              'parameters' => array(
-                'project' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'zone' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'instance' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'deviceName' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'get' => array(
-              'path' => '{project}/zones/{zone}/instances/{instance}',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'project' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'zone' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'instance' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'getSerialPortOutput' => array(
-              'path' => '{project}/zones/{zone}/instances/{instance}/serialPort',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'project' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'zone' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'instance' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'port' => array(
-                  'location' => 'query',
-                  'type' => 'integer',
-                ),
-                'start' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-              ),
-            ),'insert' => array(
-              'path' => '{project}/zones/{zone}/instances',
-              'httpMethod' => 'POST',
-              'parameters' => array(
-                'project' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'zone' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'list' => array(
-              'path' => '{project}/zones/{zone}/instances',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'project' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'zone' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'filter' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'maxResults' => array(
-                  'location' => 'query',
-                  'type' => 'integer',
-                ),
-                'orderBy' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'pageToken' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-              ),
-            ),'reset' => array(
-              'path' => '{project}/zones/{zone}/instances/{instance}/reset',
-              'httpMethod' => 'POST',
-              'parameters' => array(
-                'project' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'zone' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'instance' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'setDiskAutoDelete' => array(
-              'path' => '{project}/zones/{zone}/instances/{instance}/setDiskAutoDelete',
-              'httpMethod' => 'POST',
-              'parameters' => array(
-                'project' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'zone' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'instance' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'autoDelete' => array(
-                  'location' => 'query',
-                  'type' => 'boolean',
-                  'required' => true,
-                ),
-                'deviceName' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'setMachineType' => array(
-              'path' => '{project}/zones/{zone}/instances/{instance}/setMachineType',
-              'httpMethod' => 'POST',
-              'parameters' => array(
-                'project' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'zone' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'instance' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'setMetadata' => array(
-              'path' => '{project}/zones/{zone}/instances/{instance}/setMetadata',
-              'httpMethod' => 'POST',
-              'parameters' => array(
-                'project' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'zone' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'instance' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'setScheduling' => array(
-              'path' => '{project}/zones/{zone}/instances/{instance}/setScheduling',
-              'httpMethod' => 'POST',
-              'parameters' => array(
-                'project' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'zone' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'instance' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'setServiceAccount' => array(
-              'path' => '{project}/zones/{zone}/instances/{instance}/setServiceAccount',
-              'httpMethod' => 'POST',
-              'parameters' => array(
-                'project' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'zone' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'instance' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'setTags' => array(
-              'path' => '{project}/zones/{zone}/instances/{instance}/setTags',
-              'httpMethod' => 'POST',
-              'parameters' => array(
-                'project' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'zone' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'instance' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'start' => array(
-              'path' => '{project}/zones/{zone}/instances/{instance}/start',
-              'httpMethod' => 'POST',
-              'parameters' => array(
-                'project' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'zone' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'instance' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'startWithEncryptionKey' => array(
-              'path' => '{project}/zones/{zone}/instances/{instance}/startWithEncryptionKey',
-              'httpMethod' => 'POST',
-              'parameters' => array(
-                'project' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'zone' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'instance' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'stop' => array(
-              'path' => '{project}/zones/{zone}/instances/{instance}/stop',
-              'httpMethod' => 'POST',
-              'parameters' => array(
-                'project' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'zone' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'instance' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),
-          )
-        )
-    );
-    $this->licenses = new Google_Service_Compute_Resource_Licenses(
-        $this,
-        $this->serviceName,
-        'licenses',
-        array(
-          'methods' => array(
-            'get' => array(
-              'path' => '{project}/global/licenses/{license}',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'project' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'license' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),
-          )
-        )
-    );
-    $this->machineTypes = new Google_Service_Compute_Resource_MachineTypes(
-        $this,
-        $this->serviceName,
-        'machineTypes',
-        array(
-          'methods' => array(
-            'aggregatedList' => array(
-              'path' => '{project}/aggregated/machineTypes',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'project' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'filter' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'maxResults' => array(
-                  'location' => 'query',
-                  'type' => 'integer',
-                ),
-                'orderBy' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'pageToken' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-              ),
-            ),'get' => array(
-              'path' => '{project}/zones/{zone}/machineTypes/{machineType}',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'project' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'zone' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'machineType' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'list' => array(
-              'path' => '{project}/zones/{zone}/machineTypes',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'project' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'zone' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'filter' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'maxResults' => array(
-                  'location' => 'query',
-                  'type' => 'integer',
-                ),
-                'orderBy' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'pageToken' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-              ),
-            ),
-          )
-        )
-    );
-    $this->networks = new Google_Service_Compute_Resource_Networks(
-        $this,
-        $this->serviceName,
-        'networks',
-        array(
-          'methods' => array(
-            'delete' => array(
-              'path' => '{project}/global/networks/{network}',
-              'httpMethod' => 'DELETE',
-              'parameters' => array(
-                'project' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'network' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'get' => array(
-              'path' => '{project}/global/networks/{network}',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'project' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'network' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'insert' => array(
-              'path' => '{project}/global/networks',
-              'httpMethod' => 'POST',
-              'parameters' => array(
-                'project' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'list' => array(
-              'path' => '{project}/global/networks',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'project' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'filter' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'maxResults' => array(
-                  'location' => 'query',
-                  'type' => 'integer',
-                ),
-                'orderBy' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'pageToken' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-              ),
-            ),'switchToCustomMode' => array(
-              'path' => '{project}/global/networks/{network}/switchToCustomMode',
-              'httpMethod' => 'POST',
-              'parameters' => array(
-                'project' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'network' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),
-          )
-        )
-    );
-    $this->projects = new Google_Service_Compute_Resource_Projects(
-        $this,
-        $this->serviceName,
-        'projects',
-        array(
-          'methods' => array(
-            'get' => array(
-              'path' => '{project}',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'project' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'moveDisk' => array(
-              'path' => '{project}/moveDisk',
-              'httpMethod' => 'POST',
-              'parameters' => array(
-                'project' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'moveInstance' => array(
-              'path' => '{project}/moveInstance',
-              'httpMethod' => 'POST',
-              'parameters' => array(
-                'project' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'setCommonInstanceMetadata' => array(
-              'path' => '{project}/setCommonInstanceMetadata',
-              'httpMethod' => 'POST',
-              'parameters' => array(
-                'project' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'setUsageExportBucket' => array(
-              'path' => '{project}/setUsageExportBucket',
-              'httpMethod' => 'POST',
-              'parameters' => array(
-                'project' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),
-          )
-        )
-    );
-    $this->regionAutoscalers = new Google_Service_Compute_Resource_RegionAutoscalers(
-        $this,
-        $this->serviceName,
-        'regionAutoscalers',
-        array(
-          'methods' => array(
-            'delete' => array(
-              'path' => '{project}/regions/{region}/autoscalers/{autoscaler}',
-              'httpMethod' => 'DELETE',
-              'parameters' => array(
-                'project' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'region' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'autoscaler' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'get' => array(
-              'path' => '{project}/regions/{region}/autoscalers/{autoscaler}',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'project' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'region' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'autoscaler' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'insert' => array(
-              'path' => '{project}/regions/{region}/autoscalers',
-              'httpMethod' => 'POST',
-              'parameters' => array(
-                'project' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'region' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'list' => array(
-              'path' => '{project}/regions/{region}/autoscalers',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'project' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'region' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'filter' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'maxResults' => array(
-                  'location' => 'query',
-                  'type' => 'integer',
-                ),
-                'orderBy' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'pageToken' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-              ),
-            ),'patch' => array(
-              'path' => '{project}/regions/{region}/autoscalers',
-              'httpMethod' => 'PATCH',
-              'parameters' => array(
-                'project' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'region' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'autoscaler' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'update' => array(
-              'path' => '{project}/regions/{region}/autoscalers',
-              'httpMethod' => 'PUT',
-              'parameters' => array(
-                'project' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'region' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'autoscaler' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-              ),
-            ),
-          )
-        )
-    );
-    $this->regionBackendServices = new Google_Service_Compute_Resource_RegionBackendServices(
-        $this,
-        $this->serviceName,
-        'regionBackendServices',
-        array(
-          'methods' => array(
-            'delete' => array(
-              'path' => '{project}/regions/{region}/backendServices/{backendService}',
-              'httpMethod' => 'DELETE',
-              'parameters' => array(
-                'project' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'region' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'backendService' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'get' => array(
-              'path' => '{project}/regions/{region}/backendServices/{backendService}',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'project' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'region' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'backendService' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'getHealth' => array(
-              'path' => '{project}/regions/{region}/backendServices/{backendService}/getHealth',
-              'httpMethod' => 'POST',
-              'parameters' => array(
-                'project' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'region' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'backendService' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'insert' => array(
-              'path' => '{project}/regions/{region}/backendServices',
-              'httpMethod' => 'POST',
-              'parameters' => array(
-                'project' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'region' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'list' => array(
-              'path' => '{project}/regions/{region}/backendServices',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'project' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'region' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'filter' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'maxResults' => array(
-                  'location' => 'query',
-                  'type' => 'integer',
-                ),
-                'orderBy' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'pageToken' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-              ),
-            ),'patch' => array(
-              'path' => '{project}/regions/{region}/backendServices/{backendService}',
-              'httpMethod' => 'PATCH',
-              'parameters' => array(
-                'project' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'region' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'backendService' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'update' => array(
-              'path' => '{project}/regions/{region}/backendServices/{backendService}',
-              'httpMethod' => 'PUT',
-              'parameters' => array(
-                'project' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'region' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'backendService' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),
-          )
-        )
-    );
-    $this->regionInstanceGroupManagers = new Google_Service_Compute_Resource_RegionInstanceGroupManagers(
-        $this,
-        $this->serviceName,
-        'regionInstanceGroupManagers',
-        array(
-          'methods' => array(
-            'abandonInstances' => array(
-              'path' => '{project}/regions/{region}/instanceGroupManagers/{instanceGroupManager}/abandonInstances',
-              'httpMethod' => 'POST',
-              'parameters' => array(
-                'project' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'region' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'instanceGroupManager' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'delete' => array(
-              'path' => '{project}/regions/{region}/instanceGroupManagers/{instanceGroupManager}',
-              'httpMethod' => 'DELETE',
-              'parameters' => array(
-                'project' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'region' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'instanceGroupManager' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'deleteInstances' => array(
-              'path' => '{project}/regions/{region}/instanceGroupManagers/{instanceGroupManager}/deleteInstances',
-              'httpMethod' => 'POST',
-              'parameters' => array(
-                'project' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'region' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'instanceGroupManager' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'get' => array(
-              'path' => '{project}/regions/{region}/instanceGroupManagers/{instanceGroupManager}',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'project' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'region' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'instanceGroupManager' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'insert' => array(
-              'path' => '{project}/regions/{region}/instanceGroupManagers',
-              'httpMethod' => 'POST',
-              'parameters' => array(
-                'project' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'region' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'list' => array(
-              'path' => '{project}/regions/{region}/instanceGroupManagers',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'project' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'region' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'filter' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'maxResults' => array(
-                  'location' => 'query',
-                  'type' => 'integer',
-                ),
-                'orderBy' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'pageToken' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-              ),
-            ),'listManagedInstances' => array(
-              'path' => '{project}/regions/{region}/instanceGroupManagers/{instanceGroupManager}/listManagedInstances',
-              'httpMethod' => 'POST',
-              'parameters' => array(
-                'project' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'region' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'instanceGroupManager' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'filter' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'maxResults' => array(
-                  'location' => 'query',
-                  'type' => 'integer',
-                ),
-                'order_by' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'pageToken' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-              ),
-            ),'recreateInstances' => array(
-              'path' => '{project}/regions/{region}/instanceGroupManagers/{instanceGroupManager}/recreateInstances',
-              'httpMethod' => 'POST',
-              'parameters' => array(
-                'project' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'region' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'instanceGroupManager' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'resize' => array(
-              'path' => '{project}/regions/{region}/instanceGroupManagers/{instanceGroupManager}/resize',
-              'httpMethod' => 'POST',
-              'parameters' => array(
-                'project' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'region' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'instanceGroupManager' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'size' => array(
-                  'location' => 'query',
-                  'type' => 'integer',
-                  'required' => true,
-                ),
-              ),
-            ),'setInstanceTemplate' => array(
-              'path' => '{project}/regions/{region}/instanceGroupManagers/{instanceGroupManager}/setInstanceTemplate',
-              'httpMethod' => 'POST',
-              'parameters' => array(
-                'project' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'region' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'instanceGroupManager' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'setTargetPools' => array(
-              'path' => '{project}/regions/{region}/instanceGroupManagers/{instanceGroupManager}/setTargetPools',
-              'httpMethod' => 'POST',
-              'parameters' => array(
-                'project' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'region' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'instanceGroupManager' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),
-          )
-        )
-    );
-    $this->regionInstanceGroups = new Google_Service_Compute_Resource_RegionInstanceGroups(
-        $this,
-        $this->serviceName,
-        'regionInstanceGroups',
-        array(
-          'methods' => array(
-            'get' => array(
-              'path' => '{project}/regions/{region}/instanceGroups/{instanceGroup}',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'project' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'region' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'instanceGroup' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'list' => array(
-              'path' => '{project}/regions/{region}/instanceGroups',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'project' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'region' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'filter' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'maxResults' => array(
-                  'location' => 'query',
-                  'type' => 'integer',
-                ),
-                'orderBy' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'pageToken' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-              ),
-            ),'listInstances' => array(
-              'path' => '{project}/regions/{region}/instanceGroups/{instanceGroup}/listInstances',
-              'httpMethod' => 'POST',
-              'parameters' => array(
-                'project' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'region' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'instanceGroup' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'filter' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'maxResults' => array(
-                  'location' => 'query',
-                  'type' => 'integer',
-                ),
-                'orderBy' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'pageToken' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-              ),
-            ),'setNamedPorts' => array(
-              'path' => '{project}/regions/{region}/instanceGroups/{instanceGroup}/setNamedPorts',
-              'httpMethod' => 'POST',
-              'parameters' => array(
-                'project' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'region' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'instanceGroup' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),
-          )
-        )
-    );
-    $this->regionOperations = new Google_Service_Compute_Resource_RegionOperations(
-        $this,
-        $this->serviceName,
-        'regionOperations',
-        array(
-          'methods' => array(
-            'delete' => array(
-              'path' => '{project}/regions/{region}/operations/{operation}',
-              'httpMethod' => 'DELETE',
-              'parameters' => array(
-                'project' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'region' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'operation' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'get' => array(
-              'path' => '{project}/regions/{region}/operations/{operation}',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'project' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'region' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'operation' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'list' => array(
-              'path' => '{project}/regions/{region}/operations',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'project' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'region' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'filter' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'maxResults' => array(
-                  'location' => 'query',
-                  'type' => 'integer',
-                ),
-                'orderBy' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'pageToken' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-              ),
-            ),
-          )
-        )
-    );
-    $this->regions = new Google_Service_Compute_Resource_Regions(
-        $this,
-        $this->serviceName,
-        'regions',
-        array(
-          'methods' => array(
-            'get' => array(
-              'path' => '{project}/regions/{region}',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'project' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'region' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'list' => array(
-              'path' => '{project}/regions',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'project' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'filter' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'maxResults' => array(
-                  'location' => 'query',
-                  'type' => 'integer',
-                ),
-                'orderBy' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'pageToken' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-              ),
-            ),
-          )
-        )
-    );
-    $this->routers = new Google_Service_Compute_Resource_Routers(
-        $this,
-        $this->serviceName,
-        'routers',
-        array(
-          'methods' => array(
-            'aggregatedList' => array(
-              'path' => '{project}/aggregated/routers',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'project' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'filter' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'maxResults' => array(
-                  'location' => 'query',
-                  'type' => 'integer',
-                ),
-                'orderBy' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'pageToken' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-              ),
-            ),'delete' => array(
-              'path' => '{project}/regions/{region}/routers/{router}',
-              'httpMethod' => 'DELETE',
-              'parameters' => array(
-                'project' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'region' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'router' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'get' => array(
-              'path' => '{project}/regions/{region}/routers/{router}',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'project' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'region' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'router' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'getRouterStatus' => array(
-              'path' => '{project}/regions/{region}/routers/{router}/getRouterStatus',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'project' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'region' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'router' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'insert' => array(
-              'path' => '{project}/regions/{region}/routers',
-              'httpMethod' => 'POST',
-              'parameters' => array(
-                'project' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'region' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'list' => array(
-              'path' => '{project}/regions/{region}/routers',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'project' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'region' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'filter' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'maxResults' => array(
-                  'location' => 'query',
-                  'type' => 'integer',
-                ),
-                'orderBy' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'pageToken' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-              ),
-            ),'patch' => array(
-              'path' => '{project}/regions/{region}/routers/{router}',
-              'httpMethod' => 'PATCH',
-              'parameters' => array(
-                'project' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'region' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'router' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'preview' => array(
-              'path' => '{project}/regions/{region}/routers/{router}/preview',
-              'httpMethod' => 'POST',
-              'parameters' => array(
-                'project' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'region' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'router' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'update' => array(
-              'path' => '{project}/regions/{region}/routers/{router}',
-              'httpMethod' => 'PUT',
-              'parameters' => array(
-                'project' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'region' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'router' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),
-          )
-        )
-    );
-    $this->routes = new Google_Service_Compute_Resource_Routes(
-        $this,
-        $this->serviceName,
-        'routes',
-        array(
-          'methods' => array(
-            'delete' => array(
-              'path' => '{project}/global/routes/{route}',
-              'httpMethod' => 'DELETE',
-              'parameters' => array(
-                'project' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'route' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'get' => array(
-              'path' => '{project}/global/routes/{route}',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'project' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'route' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'insert' => array(
-              'path' => '{project}/global/routes',
-              'httpMethod' => 'POST',
-              'parameters' => array(
-                'project' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'list' => array(
-              'path' => '{project}/global/routes',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'project' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'filter' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'maxResults' => array(
-                  'location' => 'query',
-                  'type' => 'integer',
-                ),
-                'orderBy' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'pageToken' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-              ),
-            ),
-          )
-        )
-    );
-    $this->snapshots = new Google_Service_Compute_Resource_Snapshots(
-        $this,
-        $this->serviceName,
-        'snapshots',
-        array(
-          'methods' => array(
-            'delete' => array(
-              'path' => '{project}/global/snapshots/{snapshot}',
-              'httpMethod' => 'DELETE',
-              'parameters' => array(
-                'project' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'snapshot' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'get' => array(
-              'path' => '{project}/global/snapshots/{snapshot}',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'project' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'snapshot' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'list' => array(
-              'path' => '{project}/global/snapshots',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'project' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'filter' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'maxResults' => array(
-                  'location' => 'query',
-                  'type' => 'integer',
-                ),
-                'orderBy' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'pageToken' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-              ),
-            ),
-          )
-        )
-    );
-    $this->sslCertificates = new Google_Service_Compute_Resource_SslCertificates(
-        $this,
-        $this->serviceName,
-        'sslCertificates',
-        array(
-          'methods' => array(
-            'delete' => array(
-              'path' => '{project}/global/sslCertificates/{sslCertificate}',
-              'httpMethod' => 'DELETE',
-              'parameters' => array(
-                'project' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'sslCertificate' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'get' => array(
-              'path' => '{project}/global/sslCertificates/{sslCertificate}',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'project' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'sslCertificate' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'insert' => array(
-              'path' => '{project}/global/sslCertificates',
-              'httpMethod' => 'POST',
-              'parameters' => array(
-                'project' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'list' => array(
-              'path' => '{project}/global/sslCertificates',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'project' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'filter' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'maxResults' => array(
-                  'location' => 'query',
-                  'type' => 'integer',
-                ),
-                'orderBy' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'pageToken' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-              ),
-            ),
-          )
-        )
-    );
-    $this->subnetworks = new Google_Service_Compute_Resource_Subnetworks(
-        $this,
-        $this->serviceName,
-        'subnetworks',
-        array(
-          'methods' => array(
-            'aggregatedList' => array(
-              'path' => '{project}/aggregated/subnetworks',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'project' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'filter' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'maxResults' => array(
-                  'location' => 'query',
-                  'type' => 'integer',
-                ),
-                'orderBy' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'pageToken' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-              ),
-            ),'delete' => array(
-              'path' => '{project}/regions/{region}/subnetworks/{subnetwork}',
-              'httpMethod' => 'DELETE',
-              'parameters' => array(
-                'project' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'region' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'subnetwork' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'expandIpCidrRange' => array(
-              'path' => '{project}/regions/{region}/subnetworks/{subnetwork}/expandIpCidrRange',
-              'httpMethod' => 'POST',
-              'parameters' => array(
-                'project' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'region' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'subnetwork' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'get' => array(
-              'path' => '{project}/regions/{region}/subnetworks/{subnetwork}',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'project' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'region' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'subnetwork' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'insert' => array(
-              'path' => '{project}/regions/{region}/subnetworks',
-              'httpMethod' => 'POST',
-              'parameters' => array(
-                'project' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'region' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'list' => array(
-              'path' => '{project}/regions/{region}/subnetworks',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'project' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'region' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'filter' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'maxResults' => array(
-                  'location' => 'query',
-                  'type' => 'integer',
-                ),
-                'orderBy' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'pageToken' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-              ),
-            ),
-          )
-        )
-    );
-    $this->targetHttpProxies = new Google_Service_Compute_Resource_TargetHttpProxies(
-        $this,
-        $this->serviceName,
-        'targetHttpProxies',
-        array(
-          'methods' => array(
-            'delete' => array(
-              'path' => '{project}/global/targetHttpProxies/{targetHttpProxy}',
-              'httpMethod' => 'DELETE',
-              'parameters' => array(
-                'project' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'targetHttpProxy' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'get' => array(
-              'path' => '{project}/global/targetHttpProxies/{targetHttpProxy}',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'project' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'targetHttpProxy' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'insert' => array(
-              'path' => '{project}/global/targetHttpProxies',
-              'httpMethod' => 'POST',
-              'parameters' => array(
-                'project' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'list' => array(
-              'path' => '{project}/global/targetHttpProxies',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'project' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'filter' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'maxResults' => array(
-                  'location' => 'query',
-                  'type' => 'integer',
-                ),
-                'orderBy' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'pageToken' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-              ),
-            ),'setUrlMap' => array(
-              'path' => '{project}/targetHttpProxies/{targetHttpProxy}/setUrlMap',
-              'httpMethod' => 'POST',
-              'parameters' => array(
-                'project' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'targetHttpProxy' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),
-          )
-        )
-    );
-    $this->targetHttpsProxies = new Google_Service_Compute_Resource_TargetHttpsProxies(
-        $this,
-        $this->serviceName,
-        'targetHttpsProxies',
-        array(
-          'methods' => array(
-            'delete' => array(
-              'path' => '{project}/global/targetHttpsProxies/{targetHttpsProxy}',
-              'httpMethod' => 'DELETE',
-              'parameters' => array(
-                'project' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'targetHttpsProxy' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'get' => array(
-              'path' => '{project}/global/targetHttpsProxies/{targetHttpsProxy}',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'project' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'targetHttpsProxy' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'insert' => array(
-              'path' => '{project}/global/targetHttpsProxies',
-              'httpMethod' => 'POST',
-              'parameters' => array(
-                'project' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'list' => array(
-              'path' => '{project}/global/targetHttpsProxies',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'project' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'filter' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'maxResults' => array(
-                  'location' => 'query',
-                  'type' => 'integer',
-                ),
-                'orderBy' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'pageToken' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-              ),
-            ),'setSslCertificates' => array(
-              'path' => '{project}/targetHttpsProxies/{targetHttpsProxy}/setSslCertificates',
-              'httpMethod' => 'POST',
-              'parameters' => array(
-                'project' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'targetHttpsProxy' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'setUrlMap' => array(
-              'path' => '{project}/targetHttpsProxies/{targetHttpsProxy}/setUrlMap',
-              'httpMethod' => 'POST',
-              'parameters' => array(
-                'project' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'targetHttpsProxy' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),
-          )
-        )
-    );
-    $this->targetInstances = new Google_Service_Compute_Resource_TargetInstances(
-        $this,
-        $this->serviceName,
-        'targetInstances',
-        array(
-          'methods' => array(
-            'aggregatedList' => array(
-              'path' => '{project}/aggregated/targetInstances',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'project' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'filter' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'maxResults' => array(
-                  'location' => 'query',
-                  'type' => 'integer',
-                ),
-                'orderBy' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'pageToken' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-              ),
-            ),'delete' => array(
-              'path' => '{project}/zones/{zone}/targetInstances/{targetInstance}',
-              'httpMethod' => 'DELETE',
-              'parameters' => array(
-                'project' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'zone' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'targetInstance' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'get' => array(
-              'path' => '{project}/zones/{zone}/targetInstances/{targetInstance}',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'project' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'zone' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'targetInstance' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'insert' => array(
-              'path' => '{project}/zones/{zone}/targetInstances',
-              'httpMethod' => 'POST',
-              'parameters' => array(
-                'project' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'zone' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'list' => array(
-              'path' => '{project}/zones/{zone}/targetInstances',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'project' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'zone' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'filter' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'maxResults' => array(
-                  'location' => 'query',
-                  'type' => 'integer',
-                ),
-                'orderBy' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'pageToken' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-              ),
-            ),
-          )
-        )
-    );
-    $this->targetPools = new Google_Service_Compute_Resource_TargetPools(
-        $this,
-        $this->serviceName,
-        'targetPools',
-        array(
-          'methods' => array(
-            'addHealthCheck' => array(
-              'path' => '{project}/regions/{region}/targetPools/{targetPool}/addHealthCheck',
-              'httpMethod' => 'POST',
-              'parameters' => array(
-                'project' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'region' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'targetPool' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'addInstance' => array(
-              'path' => '{project}/regions/{region}/targetPools/{targetPool}/addInstance',
-              'httpMethod' => 'POST',
-              'parameters' => array(
-                'project' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'region' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'targetPool' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'aggregatedList' => array(
-              'path' => '{project}/aggregated/targetPools',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'project' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'filter' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'maxResults' => array(
-                  'location' => 'query',
-                  'type' => 'integer',
-                ),
-                'orderBy' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'pageToken' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-              ),
-            ),'delete' => array(
-              'path' => '{project}/regions/{region}/targetPools/{targetPool}',
-              'httpMethod' => 'DELETE',
-              'parameters' => array(
-                'project' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'region' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'targetPool' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'get' => array(
-              'path' => '{project}/regions/{region}/targetPools/{targetPool}',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'project' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'region' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'targetPool' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'getHealth' => array(
-              'path' => '{project}/regions/{region}/targetPools/{targetPool}/getHealth',
-              'httpMethod' => 'POST',
-              'parameters' => array(
-                'project' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'region' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'targetPool' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'insert' => array(
-              'path' => '{project}/regions/{region}/targetPools',
-              'httpMethod' => 'POST',
-              'parameters' => array(
-                'project' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'region' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'list' => array(
-              'path' => '{project}/regions/{region}/targetPools',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'project' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'region' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'filter' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'maxResults' => array(
-                  'location' => 'query',
-                  'type' => 'integer',
-                ),
-                'orderBy' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'pageToken' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-              ),
-            ),'removeHealthCheck' => array(
-              'path' => '{project}/regions/{region}/targetPools/{targetPool}/removeHealthCheck',
-              'httpMethod' => 'POST',
-              'parameters' => array(
-                'project' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'region' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'targetPool' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'removeInstance' => array(
-              'path' => '{project}/regions/{region}/targetPools/{targetPool}/removeInstance',
-              'httpMethod' => 'POST',
-              'parameters' => array(
-                'project' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'region' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'targetPool' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'setBackup' => array(
-              'path' => '{project}/regions/{region}/targetPools/{targetPool}/setBackup',
-              'httpMethod' => 'POST',
-              'parameters' => array(
-                'project' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'region' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'targetPool' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'failoverRatio' => array(
-                  'location' => 'query',
-                  'type' => 'number',
-                ),
-              ),
-            ),
-          )
-        )
-    );
-    $this->targetSslProxies = new Google_Service_Compute_Resource_TargetSslProxies(
-        $this,
-        $this->serviceName,
-        'targetSslProxies',
-        array(
-          'methods' => array(
-            'delete' => array(
-              'path' => '{project}/global/targetSslProxies/{targetSslProxy}',
-              'httpMethod' => 'DELETE',
-              'parameters' => array(
-                'project' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'targetSslProxy' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'get' => array(
-              'path' => '{project}/global/targetSslProxies/{targetSslProxy}',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'project' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'targetSslProxy' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'insert' => array(
-              'path' => '{project}/global/targetSslProxies',
-              'httpMethod' => 'POST',
-              'parameters' => array(
-                'project' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'list' => array(
-              'path' => '{project}/global/targetSslProxies',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'project' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'filter' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'maxResults' => array(
-                  'location' => 'query',
-                  'type' => 'integer',
-                ),
-                'orderBy' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'pageToken' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-              ),
-            ),'setBackendService' => array(
-              'path' => '{project}/global/targetSslProxies/{targetSslProxy}/setBackendService',
-              'httpMethod' => 'POST',
-              'parameters' => array(
-                'project' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'targetSslProxy' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'setProxyHeader' => array(
-              'path' => '{project}/global/targetSslProxies/{targetSslProxy}/setProxyHeader',
-              'httpMethod' => 'POST',
-              'parameters' => array(
-                'project' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'targetSslProxy' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'setSslCertificates' => array(
-              'path' => '{project}/global/targetSslProxies/{targetSslProxy}/setSslCertificates',
-              'httpMethod' => 'POST',
-              'parameters' => array(
-                'project' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'targetSslProxy' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),
-          )
-        )
-    );
-    $this->targetVpnGateways = new Google_Service_Compute_Resource_TargetVpnGateways(
-        $this,
-        $this->serviceName,
-        'targetVpnGateways',
-        array(
-          'methods' => array(
-            'aggregatedList' => array(
-              'path' => '{project}/aggregated/targetVpnGateways',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'project' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'filter' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'maxResults' => array(
-                  'location' => 'query',
-                  'type' => 'integer',
-                ),
-                'orderBy' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'pageToken' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-              ),
-            ),'delete' => array(
-              'path' => '{project}/regions/{region}/targetVpnGateways/{targetVpnGateway}',
-              'httpMethod' => 'DELETE',
-              'parameters' => array(
-                'project' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'region' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'targetVpnGateway' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'get' => array(
-              'path' => '{project}/regions/{region}/targetVpnGateways/{targetVpnGateway}',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'project' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'region' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'targetVpnGateway' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'insert' => array(
-              'path' => '{project}/regions/{region}/targetVpnGateways',
-              'httpMethod' => 'POST',
-              'parameters' => array(
-                'project' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'region' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'list' => array(
-              'path' => '{project}/regions/{region}/targetVpnGateways',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'project' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'region' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'filter' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'maxResults' => array(
-                  'location' => 'query',
-                  'type' => 'integer',
-                ),
-                'orderBy' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'pageToken' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-              ),
-            ),
-          )
-        )
-    );
-    $this->urlMaps = new Google_Service_Compute_Resource_UrlMaps(
-        $this,
-        $this->serviceName,
-        'urlMaps',
-        array(
-          'methods' => array(
-            'delete' => array(
-              'path' => '{project}/global/urlMaps/{urlMap}',
-              'httpMethod' => 'DELETE',
-              'parameters' => array(
-                'project' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'urlMap' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'get' => array(
-              'path' => '{project}/global/urlMaps/{urlMap}',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'project' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'urlMap' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'insert' => array(
-              'path' => '{project}/global/urlMaps',
-              'httpMethod' => 'POST',
-              'parameters' => array(
-                'project' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'invalidateCache' => array(
-              'path' => '{project}/global/urlMaps/{urlMap}/invalidateCache',
-              'httpMethod' => 'POST',
-              'parameters' => array(
-                'project' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'urlMap' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'list' => array(
-              'path' => '{project}/global/urlMaps',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'project' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'filter' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'maxResults' => array(
-                  'location' => 'query',
-                  'type' => 'integer',
-                ),
-                'orderBy' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'pageToken' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-              ),
-            ),'patch' => array(
-              'path' => '{project}/global/urlMaps/{urlMap}',
-              'httpMethod' => 'PATCH',
-              'parameters' => array(
-                'project' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'urlMap' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'update' => array(
-              'path' => '{project}/global/urlMaps/{urlMap}',
-              'httpMethod' => 'PUT',
-              'parameters' => array(
-                'project' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'urlMap' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'validate' => array(
-              'path' => '{project}/global/urlMaps/{urlMap}/validate',
-              'httpMethod' => 'POST',
-              'parameters' => array(
-                'project' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'urlMap' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),
-          )
-        )
-    );
-    $this->vpnTunnels = new Google_Service_Compute_Resource_VpnTunnels(
-        $this,
-        $this->serviceName,
-        'vpnTunnels',
-        array(
-          'methods' => array(
-            'aggregatedList' => array(
-              'path' => '{project}/aggregated/vpnTunnels',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'project' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'filter' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'maxResults' => array(
-                  'location' => 'query',
-                  'type' => 'integer',
-                ),
-                'orderBy' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'pageToken' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-              ),
-            ),'delete' => array(
-              'path' => '{project}/regions/{region}/vpnTunnels/{vpnTunnel}',
-              'httpMethod' => 'DELETE',
-              'parameters' => array(
-                'project' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'region' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'vpnTunnel' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'get' => array(
-              'path' => '{project}/regions/{region}/vpnTunnels/{vpnTunnel}',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'project' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'region' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'vpnTunnel' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'insert' => array(
-              'path' => '{project}/regions/{region}/vpnTunnels',
-              'httpMethod' => 'POST',
-              'parameters' => array(
-                'project' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'region' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'list' => array(
-              'path' => '{project}/regions/{region}/vpnTunnels',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'project' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'region' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'filter' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'maxResults' => array(
-                  'location' => 'query',
-                  'type' => 'integer',
-                ),
-                'orderBy' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'pageToken' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-              ),
-            ),
-          )
-        )
-    );
-    $this->zoneOperations = new Google_Service_Compute_Resource_ZoneOperations(
-        $this,
-        $this->serviceName,
-        'zoneOperations',
-        array(
-          'methods' => array(
-            'delete' => array(
-              'path' => '{project}/zones/{zone}/operations/{operation}',
-              'httpMethod' => 'DELETE',
-              'parameters' => array(
-                'project' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'zone' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'operation' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'get' => array(
-              'path' => '{project}/zones/{zone}/operations/{operation}',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'project' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'zone' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'operation' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'list' => array(
-              'path' => '{project}/zones/{zone}/operations',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'project' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'zone' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'filter' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'maxResults' => array(
-                  'location' => 'query',
-                  'type' => 'integer',
-                ),
-                'orderBy' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'pageToken' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-              ),
-            ),
-          )
-        )
-    );
-    $this->zones = new Google_Service_Compute_Resource_Zones(
-        $this,
-        $this->serviceName,
-        'zones',
-        array(
-          'methods' => array(
-            'get' => array(
-              'path' => '{project}/zones/{zone}',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'project' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'zone' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'list' => array(
-              'path' => '{project}/zones',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'project' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'filter' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'maxResults' => array(
-                  'location' => 'query',
-                  'type' => 'integer',
-                ),
-                'orderBy' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'pageToken' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-              ),
-            ),
-          )
-        )
-    );
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/AccessConfig.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/AccessConfig.php
deleted file mode 100644
index a016c52e..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/AccessConfig.php
+++ /dev/null
@@ -1,57 +0,0 @@
-kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setName($name)
-  {
-    $this->name = $name;
-  }
-  public function getName()
-  {
-    return $this->name;
-  }
-  public function setNatIP($natIP)
-  {
-    $this->natIP = $natIP;
-  }
-  public function getNatIP()
-  {
-    return $this->natIP;
-  }
-  public function setType($type)
-  {
-    $this->type = $type;
-  }
-  public function getType()
-  {
-    return $this->type;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/Address.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/Address.php
deleted file mode 100644
index 0c8773cd..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/Address.php
+++ /dev/null
@@ -1,112 +0,0 @@
-address = $address;
-  }
-  public function getAddress()
-  {
-    return $this->address;
-  }
-  public function setCreationTimestamp($creationTimestamp)
-  {
-    $this->creationTimestamp = $creationTimestamp;
-  }
-  public function getCreationTimestamp()
-  {
-    return $this->creationTimestamp;
-  }
-  public function setDescription($description)
-  {
-    $this->description = $description;
-  }
-  public function getDescription()
-  {
-    return $this->description;
-  }
-  public function setId($id)
-  {
-    $this->id = $id;
-  }
-  public function getId()
-  {
-    return $this->id;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setName($name)
-  {
-    $this->name = $name;
-  }
-  public function getName()
-  {
-    return $this->name;
-  }
-  public function setRegion($region)
-  {
-    $this->region = $region;
-  }
-  public function getRegion()
-  {
-    return $this->region;
-  }
-  public function setSelfLink($selfLink)
-  {
-    $this->selfLink = $selfLink;
-  }
-  public function getSelfLink()
-  {
-    return $this->selfLink;
-  }
-  public function setStatus($status)
-  {
-    $this->status = $status;
-  }
-  public function getStatus()
-  {
-    return $this->status;
-  }
-  public function setUsers($users)
-  {
-    $this->users = $users;
-  }
-  public function getUsers()
-  {
-    return $this->users;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/AddressAggregatedList.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/AddressAggregatedList.php
deleted file mode 100644
index 99fbc3c5..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/AddressAggregatedList.php
+++ /dev/null
@@ -1,67 +0,0 @@
-id = $id;
-  }
-  public function getId()
-  {
-    return $this->id;
-  }
-  public function setItems($items)
-  {
-    $this->items = $items;
-  }
-  public function getItems()
-  {
-    return $this->items;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setNextPageToken($nextPageToken)
-  {
-    $this->nextPageToken = $nextPageToken;
-  }
-  public function getNextPageToken()
-  {
-    return $this->nextPageToken;
-  }
-  public function setSelfLink($selfLink)
-  {
-    $this->selfLink = $selfLink;
-  }
-  public function getSelfLink()
-  {
-    return $this->selfLink;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/AddressList.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/AddressList.php
deleted file mode 100644
index 2bb8cc9c..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/AddressList.php
+++ /dev/null
@@ -1,68 +0,0 @@
-id = $id;
-  }
-  public function getId()
-  {
-    return $this->id;
-  }
-  public function setItems($items)
-  {
-    $this->items = $items;
-  }
-  public function getItems()
-  {
-    return $this->items;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setNextPageToken($nextPageToken)
-  {
-    $this->nextPageToken = $nextPageToken;
-  }
-  public function getNextPageToken()
-  {
-    return $this->nextPageToken;
-  }
-  public function setSelfLink($selfLink)
-  {
-    $this->selfLink = $selfLink;
-  }
-  public function getSelfLink()
-  {
-    return $this->selfLink;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/AddressesScopedList.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/AddressesScopedList.php
deleted file mode 100644
index 2789ebb4..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/AddressesScopedList.php
+++ /dev/null
@@ -1,42 +0,0 @@
-addresses = $addresses;
-  }
-  public function getAddresses()
-  {
-    return $this->addresses;
-  }
-  public function setWarning(Google_Service_Compute_AddressesScopedListWarning $warning)
-  {
-    $this->warning = $warning;
-  }
-  public function getWarning()
-  {
-    return $this->warning;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/AddressesScopedListWarning.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/AddressesScopedListWarning.php
deleted file mode 100644
index 4638a137..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/AddressesScopedListWarning.php
+++ /dev/null
@@ -1,50 +0,0 @@
-code = $code;
-  }
-  public function getCode()
-  {
-    return $this->code;
-  }
-  public function setData($data)
-  {
-    $this->data = $data;
-  }
-  public function getData()
-  {
-    return $this->data;
-  }
-  public function setMessage($message)
-  {
-    $this->message = $message;
-  }
-  public function getMessage()
-  {
-    return $this->message;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/AddressesScopedListWarningData.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/AddressesScopedListWarningData.php
deleted file mode 100644
index 825996cf..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/AddressesScopedListWarningData.php
+++ /dev/null
@@ -1,39 +0,0 @@
-key = $key;
-  }
-  public function getKey()
-  {
-    return $this->key;
-  }
-  public function setValue($value)
-  {
-    $this->value = $value;
-  }
-  public function getValue()
-  {
-    return $this->value;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/AttachedDisk.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/AttachedDisk.php
deleted file mode 100644
index a8f994c6..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/AttachedDisk.php
+++ /dev/null
@@ -1,132 +0,0 @@
-autoDelete = $autoDelete;
-  }
-  public function getAutoDelete()
-  {
-    return $this->autoDelete;
-  }
-  public function setBoot($boot)
-  {
-    $this->boot = $boot;
-  }
-  public function getBoot()
-  {
-    return $this->boot;
-  }
-  public function setDeviceName($deviceName)
-  {
-    $this->deviceName = $deviceName;
-  }
-  public function getDeviceName()
-  {
-    return $this->deviceName;
-  }
-  public function setDiskEncryptionKey(Google_Service_Compute_CustomerEncryptionKey $diskEncryptionKey)
-  {
-    $this->diskEncryptionKey = $diskEncryptionKey;
-  }
-  public function getDiskEncryptionKey()
-  {
-    return $this->diskEncryptionKey;
-  }
-  public function setIndex($index)
-  {
-    $this->index = $index;
-  }
-  public function getIndex()
-  {
-    return $this->index;
-  }
-  public function setInitializeParams(Google_Service_Compute_AttachedDiskInitializeParams $initializeParams)
-  {
-    $this->initializeParams = $initializeParams;
-  }
-  public function getInitializeParams()
-  {
-    return $this->initializeParams;
-  }
-  public function setInterface($interface)
-  {
-    $this->interface = $interface;
-  }
-  public function getInterface()
-  {
-    return $this->interface;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setLicenses($licenses)
-  {
-    $this->licenses = $licenses;
-  }
-  public function getLicenses()
-  {
-    return $this->licenses;
-  }
-  public function setMode($mode)
-  {
-    $this->mode = $mode;
-  }
-  public function getMode()
-  {
-    return $this->mode;
-  }
-  public function setSource($source)
-  {
-    $this->source = $source;
-  }
-  public function getSource()
-  {
-    return $this->source;
-  }
-  public function setType($type)
-  {
-    $this->type = $type;
-  }
-  public function getType()
-  {
-    return $this->type;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/AttachedDiskInitializeParams.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/AttachedDiskInitializeParams.php
deleted file mode 100644
index 90f8f752..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/AttachedDiskInitializeParams.php
+++ /dev/null
@@ -1,67 +0,0 @@
-diskName = $diskName;
-  }
-  public function getDiskName()
-  {
-    return $this->diskName;
-  }
-  public function setDiskSizeGb($diskSizeGb)
-  {
-    $this->diskSizeGb = $diskSizeGb;
-  }
-  public function getDiskSizeGb()
-  {
-    return $this->diskSizeGb;
-  }
-  public function setDiskType($diskType)
-  {
-    $this->diskType = $diskType;
-  }
-  public function getDiskType()
-  {
-    return $this->diskType;
-  }
-  public function setSourceImage($sourceImage)
-  {
-    $this->sourceImage = $sourceImage;
-  }
-  public function getSourceImage()
-  {
-    return $this->sourceImage;
-  }
-  public function setSourceImageEncryptionKey(Google_Service_Compute_CustomerEncryptionKey $sourceImageEncryptionKey)
-  {
-    $this->sourceImageEncryptionKey = $sourceImageEncryptionKey;
-  }
-  public function getSourceImageEncryptionKey()
-  {
-    return $this->sourceImageEncryptionKey;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/Autoscaler.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/Autoscaler.php
deleted file mode 100644
index f60faf8a..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/Autoscaler.php
+++ /dev/null
@@ -1,112 +0,0 @@
-autoscalingPolicy = $autoscalingPolicy;
-  }
-  public function getAutoscalingPolicy()
-  {
-    return $this->autoscalingPolicy;
-  }
-  public function setCreationTimestamp($creationTimestamp)
-  {
-    $this->creationTimestamp = $creationTimestamp;
-  }
-  public function getCreationTimestamp()
-  {
-    return $this->creationTimestamp;
-  }
-  public function setDescription($description)
-  {
-    $this->description = $description;
-  }
-  public function getDescription()
-  {
-    return $this->description;
-  }
-  public function setId($id)
-  {
-    $this->id = $id;
-  }
-  public function getId()
-  {
-    return $this->id;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setName($name)
-  {
-    $this->name = $name;
-  }
-  public function getName()
-  {
-    return $this->name;
-  }
-  public function setRegion($region)
-  {
-    $this->region = $region;
-  }
-  public function getRegion()
-  {
-    return $this->region;
-  }
-  public function setSelfLink($selfLink)
-  {
-    $this->selfLink = $selfLink;
-  }
-  public function getSelfLink()
-  {
-    return $this->selfLink;
-  }
-  public function setTarget($target)
-  {
-    $this->target = $target;
-  }
-  public function getTarget()
-  {
-    return $this->target;
-  }
-  public function setZone($zone)
-  {
-    $this->zone = $zone;
-  }
-  public function getZone()
-  {
-    return $this->zone;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/AutoscalerAggregatedList.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/AutoscalerAggregatedList.php
deleted file mode 100644
index 9d980f2c..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/AutoscalerAggregatedList.php
+++ /dev/null
@@ -1,67 +0,0 @@
-id = $id;
-  }
-  public function getId()
-  {
-    return $this->id;
-  }
-  public function setItems($items)
-  {
-    $this->items = $items;
-  }
-  public function getItems()
-  {
-    return $this->items;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setNextPageToken($nextPageToken)
-  {
-    $this->nextPageToken = $nextPageToken;
-  }
-  public function getNextPageToken()
-  {
-    return $this->nextPageToken;
-  }
-  public function setSelfLink($selfLink)
-  {
-    $this->selfLink = $selfLink;
-  }
-  public function getSelfLink()
-  {
-    return $this->selfLink;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/AutoscalerList.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/AutoscalerList.php
deleted file mode 100644
index 30c52054..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/AutoscalerList.php
+++ /dev/null
@@ -1,68 +0,0 @@
-id = $id;
-  }
-  public function getId()
-  {
-    return $this->id;
-  }
-  public function setItems($items)
-  {
-    $this->items = $items;
-  }
-  public function getItems()
-  {
-    return $this->items;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setNextPageToken($nextPageToken)
-  {
-    $this->nextPageToken = $nextPageToken;
-  }
-  public function getNextPageToken()
-  {
-    return $this->nextPageToken;
-  }
-  public function setSelfLink($selfLink)
-  {
-    $this->selfLink = $selfLink;
-  }
-  public function getSelfLink()
-  {
-    return $this->selfLink;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/AutoscalersScopedList.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/AutoscalersScopedList.php
deleted file mode 100644
index 41f1be32..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/AutoscalersScopedList.php
+++ /dev/null
@@ -1,42 +0,0 @@
-autoscalers = $autoscalers;
-  }
-  public function getAutoscalers()
-  {
-    return $this->autoscalers;
-  }
-  public function setWarning(Google_Service_Compute_AutoscalersScopedListWarning $warning)
-  {
-    $this->warning = $warning;
-  }
-  public function getWarning()
-  {
-    return $this->warning;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/AutoscalersScopedListWarning.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/AutoscalersScopedListWarning.php
deleted file mode 100644
index 7471eda9..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/AutoscalersScopedListWarning.php
+++ /dev/null
@@ -1,50 +0,0 @@
-code = $code;
-  }
-  public function getCode()
-  {
-    return $this->code;
-  }
-  public function setData($data)
-  {
-    $this->data = $data;
-  }
-  public function getData()
-  {
-    return $this->data;
-  }
-  public function setMessage($message)
-  {
-    $this->message = $message;
-  }
-  public function getMessage()
-  {
-    return $this->message;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/AutoscalersScopedListWarningData.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/AutoscalersScopedListWarningData.php
deleted file mode 100644
index d6139c26..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/AutoscalersScopedListWarningData.php
+++ /dev/null
@@ -1,39 +0,0 @@
-key = $key;
-  }
-  public function getKey()
-  {
-    return $this->key;
-  }
-  public function setValue($value)
-  {
-    $this->value = $value;
-  }
-  public function getValue()
-  {
-    return $this->value;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/AutoscalingPolicy.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/AutoscalingPolicy.php
deleted file mode 100644
index 80ba5188..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/AutoscalingPolicy.php
+++ /dev/null
@@ -1,79 +0,0 @@
-coolDownPeriodSec = $coolDownPeriodSec;
-  }
-  public function getCoolDownPeriodSec()
-  {
-    return $this->coolDownPeriodSec;
-  }
-  public function setCpuUtilization(Google_Service_Compute_AutoscalingPolicyCpuUtilization $cpuUtilization)
-  {
-    $this->cpuUtilization = $cpuUtilization;
-  }
-  public function getCpuUtilization()
-  {
-    return $this->cpuUtilization;
-  }
-  public function setCustomMetricUtilizations($customMetricUtilizations)
-  {
-    $this->customMetricUtilizations = $customMetricUtilizations;
-  }
-  public function getCustomMetricUtilizations()
-  {
-    return $this->customMetricUtilizations;
-  }
-  public function setLoadBalancingUtilization(Google_Service_Compute_AutoscalingPolicyLoadBalancingUtilization $loadBalancingUtilization)
-  {
-    $this->loadBalancingUtilization = $loadBalancingUtilization;
-  }
-  public function getLoadBalancingUtilization()
-  {
-    return $this->loadBalancingUtilization;
-  }
-  public function setMaxNumReplicas($maxNumReplicas)
-  {
-    $this->maxNumReplicas = $maxNumReplicas;
-  }
-  public function getMaxNumReplicas()
-  {
-    return $this->maxNumReplicas;
-  }
-  public function setMinNumReplicas($minNumReplicas)
-  {
-    $this->minNumReplicas = $minNumReplicas;
-  }
-  public function getMinNumReplicas()
-  {
-    return $this->minNumReplicas;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/AutoscalingPolicyCpuUtilization.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/AutoscalingPolicyCpuUtilization.php
deleted file mode 100644
index e528d597..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/AutoscalingPolicyCpuUtilization.php
+++ /dev/null
@@ -1,30 +0,0 @@
-utilizationTarget = $utilizationTarget;
-  }
-  public function getUtilizationTarget()
-  {
-    return $this->utilizationTarget;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/AutoscalingPolicyCustomMetricUtilization.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/AutoscalingPolicyCustomMetricUtilization.php
deleted file mode 100644
index c733d3da..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/AutoscalingPolicyCustomMetricUtilization.php
+++ /dev/null
@@ -1,48 +0,0 @@
-metric = $metric;
-  }
-  public function getMetric()
-  {
-    return $this->metric;
-  }
-  public function setUtilizationTarget($utilizationTarget)
-  {
-    $this->utilizationTarget = $utilizationTarget;
-  }
-  public function getUtilizationTarget()
-  {
-    return $this->utilizationTarget;
-  }
-  public function setUtilizationTargetType($utilizationTargetType)
-  {
-    $this->utilizationTargetType = $utilizationTargetType;
-  }
-  public function getUtilizationTargetType()
-  {
-    return $this->utilizationTargetType;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/AutoscalingPolicyLoadBalancingUtilization.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/AutoscalingPolicyLoadBalancingUtilization.php
deleted file mode 100644
index f52e3e67..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/AutoscalingPolicyLoadBalancingUtilization.php
+++ /dev/null
@@ -1,30 +0,0 @@
-utilizationTarget = $utilizationTarget;
-  }
-  public function getUtilizationTarget()
-  {
-    return $this->utilizationTarget;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/Backend.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/Backend.php
deleted file mode 100644
index 77240d08..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/Backend.php
+++ /dev/null
@@ -1,102 +0,0 @@
-balancingMode = $balancingMode;
-  }
-  public function getBalancingMode()
-  {
-    return $this->balancingMode;
-  }
-  public function setCapacityScaler($capacityScaler)
-  {
-    $this->capacityScaler = $capacityScaler;
-  }
-  public function getCapacityScaler()
-  {
-    return $this->capacityScaler;
-  }
-  public function setDescription($description)
-  {
-    $this->description = $description;
-  }
-  public function getDescription()
-  {
-    return $this->description;
-  }
-  public function setGroup($group)
-  {
-    $this->group = $group;
-  }
-  public function getGroup()
-  {
-    return $this->group;
-  }
-  public function setMaxConnections($maxConnections)
-  {
-    $this->maxConnections = $maxConnections;
-  }
-  public function getMaxConnections()
-  {
-    return $this->maxConnections;
-  }
-  public function setMaxConnectionsPerInstance($maxConnectionsPerInstance)
-  {
-    $this->maxConnectionsPerInstance = $maxConnectionsPerInstance;
-  }
-  public function getMaxConnectionsPerInstance()
-  {
-    return $this->maxConnectionsPerInstance;
-  }
-  public function setMaxRate($maxRate)
-  {
-    $this->maxRate = $maxRate;
-  }
-  public function getMaxRate()
-  {
-    return $this->maxRate;
-  }
-  public function setMaxRatePerInstance($maxRatePerInstance)
-  {
-    $this->maxRatePerInstance = $maxRatePerInstance;
-  }
-  public function getMaxRatePerInstance()
-  {
-    return $this->maxRatePerInstance;
-  }
-  public function setMaxUtilization($maxUtilization)
-  {
-    $this->maxUtilization = $maxUtilization;
-  }
-  public function getMaxUtilization()
-  {
-    return $this->maxUtilization;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/BackendBucket.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/BackendBucket.php
deleted file mode 100644
index b0c1811b..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/BackendBucket.php
+++ /dev/null
@@ -1,93 +0,0 @@
-bucketName = $bucketName;
-  }
-  public function getBucketName()
-  {
-    return $this->bucketName;
-  }
-  public function setCreationTimestamp($creationTimestamp)
-  {
-    $this->creationTimestamp = $creationTimestamp;
-  }
-  public function getCreationTimestamp()
-  {
-    return $this->creationTimestamp;
-  }
-  public function setDescription($description)
-  {
-    $this->description = $description;
-  }
-  public function getDescription()
-  {
-    return $this->description;
-  }
-  public function setEnableCdn($enableCdn)
-  {
-    $this->enableCdn = $enableCdn;
-  }
-  public function getEnableCdn()
-  {
-    return $this->enableCdn;
-  }
-  public function setId($id)
-  {
-    $this->id = $id;
-  }
-  public function getId()
-  {
-    return $this->id;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setName($name)
-  {
-    $this->name = $name;
-  }
-  public function getName()
-  {
-    return $this->name;
-  }
-  public function setSelfLink($selfLink)
-  {
-    $this->selfLink = $selfLink;
-  }
-  public function getSelfLink()
-  {
-    return $this->selfLink;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/BackendBucketList.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/BackendBucketList.php
deleted file mode 100644
index dfad709e..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/BackendBucketList.php
+++ /dev/null
@@ -1,68 +0,0 @@
-id = $id;
-  }
-  public function getId()
-  {
-    return $this->id;
-  }
-  public function setItems($items)
-  {
-    $this->items = $items;
-  }
-  public function getItems()
-  {
-    return $this->items;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setNextPageToken($nextPageToken)
-  {
-    $this->nextPageToken = $nextPageToken;
-  }
-  public function getNextPageToken()
-  {
-    return $this->nextPageToken;
-  }
-  public function setSelfLink($selfLink)
-  {
-    $this->selfLink = $selfLink;
-  }
-  public function getSelfLink()
-  {
-    return $this->selfLink;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/BackendService.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/BackendService.php
deleted file mode 100644
index 0ac30517..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/BackendService.php
+++ /dev/null
@@ -1,195 +0,0 @@
-affinityCookieTtlSec = $affinityCookieTtlSec;
-  }
-  public function getAffinityCookieTtlSec()
-  {
-    return $this->affinityCookieTtlSec;
-  }
-  public function setBackends($backends)
-  {
-    $this->backends = $backends;
-  }
-  public function getBackends()
-  {
-    return $this->backends;
-  }
-  public function setConnectionDraining(Google_Service_Compute_ConnectionDraining $connectionDraining)
-  {
-    $this->connectionDraining = $connectionDraining;
-  }
-  public function getConnectionDraining()
-  {
-    return $this->connectionDraining;
-  }
-  public function setCreationTimestamp($creationTimestamp)
-  {
-    $this->creationTimestamp = $creationTimestamp;
-  }
-  public function getCreationTimestamp()
-  {
-    return $this->creationTimestamp;
-  }
-  public function setDescription($description)
-  {
-    $this->description = $description;
-  }
-  public function getDescription()
-  {
-    return $this->description;
-  }
-  public function setEnableCDN($enableCDN)
-  {
-    $this->enableCDN = $enableCDN;
-  }
-  public function getEnableCDN()
-  {
-    return $this->enableCDN;
-  }
-  public function setFingerprint($fingerprint)
-  {
-    $this->fingerprint = $fingerprint;
-  }
-  public function getFingerprint()
-  {
-    return $this->fingerprint;
-  }
-  public function setHealthChecks($healthChecks)
-  {
-    $this->healthChecks = $healthChecks;
-  }
-  public function getHealthChecks()
-  {
-    return $this->healthChecks;
-  }
-  public function setId($id)
-  {
-    $this->id = $id;
-  }
-  public function getId()
-  {
-    return $this->id;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setLoadBalancingScheme($loadBalancingScheme)
-  {
-    $this->loadBalancingScheme = $loadBalancingScheme;
-  }
-  public function getLoadBalancingScheme()
-  {
-    return $this->loadBalancingScheme;
-  }
-  public function setName($name)
-  {
-    $this->name = $name;
-  }
-  public function getName()
-  {
-    return $this->name;
-  }
-  public function setPort($port)
-  {
-    $this->port = $port;
-  }
-  public function getPort()
-  {
-    return $this->port;
-  }
-  public function setPortName($portName)
-  {
-    $this->portName = $portName;
-  }
-  public function getPortName()
-  {
-    return $this->portName;
-  }
-  public function setProtocol($protocol)
-  {
-    $this->protocol = $protocol;
-  }
-  public function getProtocol()
-  {
-    return $this->protocol;
-  }
-  public function setRegion($region)
-  {
-    $this->region = $region;
-  }
-  public function getRegion()
-  {
-    return $this->region;
-  }
-  public function setSelfLink($selfLink)
-  {
-    $this->selfLink = $selfLink;
-  }
-  public function getSelfLink()
-  {
-    return $this->selfLink;
-  }
-  public function setSessionAffinity($sessionAffinity)
-  {
-    $this->sessionAffinity = $sessionAffinity;
-  }
-  public function getSessionAffinity()
-  {
-    return $this->sessionAffinity;
-  }
-  public function setTimeoutSec($timeoutSec)
-  {
-    $this->timeoutSec = $timeoutSec;
-  }
-  public function getTimeoutSec()
-  {
-    return $this->timeoutSec;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/BackendServiceAggregatedList.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/BackendServiceAggregatedList.php
deleted file mode 100644
index c84b4081..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/BackendServiceAggregatedList.php
+++ /dev/null
@@ -1,67 +0,0 @@
-id = $id;
-  }
-  public function getId()
-  {
-    return $this->id;
-  }
-  public function setItems($items)
-  {
-    $this->items = $items;
-  }
-  public function getItems()
-  {
-    return $this->items;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setNextPageToken($nextPageToken)
-  {
-    $this->nextPageToken = $nextPageToken;
-  }
-  public function getNextPageToken()
-  {
-    return $this->nextPageToken;
-  }
-  public function setSelfLink($selfLink)
-  {
-    $this->selfLink = $selfLink;
-  }
-  public function getSelfLink()
-  {
-    return $this->selfLink;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/BackendServiceGroupHealth.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/BackendServiceGroupHealth.php
deleted file mode 100644
index e748b062..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/BackendServiceGroupHealth.php
+++ /dev/null
@@ -1,41 +0,0 @@
-healthStatus = $healthStatus;
-  }
-  public function getHealthStatus()
-  {
-    return $this->healthStatus;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/BackendServiceList.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/BackendServiceList.php
deleted file mode 100644
index c0800a67..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/BackendServiceList.php
+++ /dev/null
@@ -1,68 +0,0 @@
-id = $id;
-  }
-  public function getId()
-  {
-    return $this->id;
-  }
-  public function setItems($items)
-  {
-    $this->items = $items;
-  }
-  public function getItems()
-  {
-    return $this->items;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setNextPageToken($nextPageToken)
-  {
-    $this->nextPageToken = $nextPageToken;
-  }
-  public function getNextPageToken()
-  {
-    return $this->nextPageToken;
-  }
-  public function setSelfLink($selfLink)
-  {
-    $this->selfLink = $selfLink;
-  }
-  public function getSelfLink()
-  {
-    return $this->selfLink;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/BackendServicesScopedList.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/BackendServicesScopedList.php
deleted file mode 100644
index 2ac8c28a..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/BackendServicesScopedList.php
+++ /dev/null
@@ -1,42 +0,0 @@
-backendServices = $backendServices;
-  }
-  public function getBackendServices()
-  {
-    return $this->backendServices;
-  }
-  public function setWarning(Google_Service_Compute_BackendServicesScopedListWarning $warning)
-  {
-    $this->warning = $warning;
-  }
-  public function getWarning()
-  {
-    return $this->warning;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/BackendServicesScopedListWarning.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/BackendServicesScopedListWarning.php
deleted file mode 100644
index 87b27240..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/BackendServicesScopedListWarning.php
+++ /dev/null
@@ -1,50 +0,0 @@
-code = $code;
-  }
-  public function getCode()
-  {
-    return $this->code;
-  }
-  public function setData($data)
-  {
-    $this->data = $data;
-  }
-  public function getData()
-  {
-    return $this->data;
-  }
-  public function setMessage($message)
-  {
-    $this->message = $message;
-  }
-  public function getMessage()
-  {
-    return $this->message;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/BackendServicesScopedListWarningData.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/BackendServicesScopedListWarningData.php
deleted file mode 100644
index a3e254cd..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/BackendServicesScopedListWarningData.php
+++ /dev/null
@@ -1,39 +0,0 @@
-key = $key;
-  }
-  public function getKey()
-  {
-    return $this->key;
-  }
-  public function setValue($value)
-  {
-    $this->value = $value;
-  }
-  public function getValue()
-  {
-    return $this->value;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/CacheInvalidationRule.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/CacheInvalidationRule.php
deleted file mode 100644
index f4cf93be..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/CacheInvalidationRule.php
+++ /dev/null
@@ -1,39 +0,0 @@
-host = $host;
-  }
-  public function getHost()
-  {
-    return $this->host;
-  }
-  public function setPath($path)
-  {
-    $this->path = $path;
-  }
-  public function getPath()
-  {
-    return $this->path;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/ConnectionDraining.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/ConnectionDraining.php
deleted file mode 100644
index 21a63afd..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/ConnectionDraining.php
+++ /dev/null
@@ -1,30 +0,0 @@
-drainingTimeoutSec = $drainingTimeoutSec;
-  }
-  public function getDrainingTimeoutSec()
-  {
-    return $this->drainingTimeoutSec;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/CustomerEncryptionKey.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/CustomerEncryptionKey.php
deleted file mode 100644
index 423e6d12..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/CustomerEncryptionKey.php
+++ /dev/null
@@ -1,39 +0,0 @@
-rawKey = $rawKey;
-  }
-  public function getRawKey()
-  {
-    return $this->rawKey;
-  }
-  public function setSha256($sha256)
-  {
-    $this->sha256 = $sha256;
-  }
-  public function getSha256()
-  {
-    return $this->sha256;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/CustomerEncryptionKeyProtectedDisk.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/CustomerEncryptionKeyProtectedDisk.php
deleted file mode 100644
index 91203db0..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/CustomerEncryptionKeyProtectedDisk.php
+++ /dev/null
@@ -1,40 +0,0 @@
-diskEncryptionKey = $diskEncryptionKey;
-  }
-  public function getDiskEncryptionKey()
-  {
-    return $this->diskEncryptionKey;
-  }
-  public function setSource($source)
-  {
-    $this->source = $source;
-  }
-  public function getSource()
-  {
-    return $this->source;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/DeprecationStatus.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/DeprecationStatus.php
deleted file mode 100644
index 90c0e85f..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/DeprecationStatus.php
+++ /dev/null
@@ -1,66 +0,0 @@
-deleted = $deleted;
-  }
-  public function getDeleted()
-  {
-    return $this->deleted;
-  }
-  public function setDeprecated($deprecated)
-  {
-    $this->deprecated = $deprecated;
-  }
-  public function getDeprecated()
-  {
-    return $this->deprecated;
-  }
-  public function setObsolete($obsolete)
-  {
-    $this->obsolete = $obsolete;
-  }
-  public function getObsolete()
-  {
-    return $this->obsolete;
-  }
-  public function setReplacement($replacement)
-  {
-    $this->replacement = $replacement;
-  }
-  public function getReplacement()
-  {
-    return $this->replacement;
-  }
-  public function setState($state)
-  {
-    $this->state = $state;
-  }
-  public function getState()
-  {
-    return $this->state;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/Disk.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/Disk.php
deleted file mode 100644
index 58c2e3ae..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/Disk.php
+++ /dev/null
@@ -1,223 +0,0 @@
-creationTimestamp = $creationTimestamp;
-  }
-  public function getCreationTimestamp()
-  {
-    return $this->creationTimestamp;
-  }
-  public function setDescription($description)
-  {
-    $this->description = $description;
-  }
-  public function getDescription()
-  {
-    return $this->description;
-  }
-  public function setDiskEncryptionKey(Google_Service_Compute_CustomerEncryptionKey $diskEncryptionKey)
-  {
-    $this->diskEncryptionKey = $diskEncryptionKey;
-  }
-  public function getDiskEncryptionKey()
-  {
-    return $this->diskEncryptionKey;
-  }
-  public function setId($id)
-  {
-    $this->id = $id;
-  }
-  public function getId()
-  {
-    return $this->id;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setLastAttachTimestamp($lastAttachTimestamp)
-  {
-    $this->lastAttachTimestamp = $lastAttachTimestamp;
-  }
-  public function getLastAttachTimestamp()
-  {
-    return $this->lastAttachTimestamp;
-  }
-  public function setLastDetachTimestamp($lastDetachTimestamp)
-  {
-    $this->lastDetachTimestamp = $lastDetachTimestamp;
-  }
-  public function getLastDetachTimestamp()
-  {
-    return $this->lastDetachTimestamp;
-  }
-  public function setLicenses($licenses)
-  {
-    $this->licenses = $licenses;
-  }
-  public function getLicenses()
-  {
-    return $this->licenses;
-  }
-  public function setName($name)
-  {
-    $this->name = $name;
-  }
-  public function getName()
-  {
-    return $this->name;
-  }
-  public function setOptions($options)
-  {
-    $this->options = $options;
-  }
-  public function getOptions()
-  {
-    return $this->options;
-  }
-  public function setSelfLink($selfLink)
-  {
-    $this->selfLink = $selfLink;
-  }
-  public function getSelfLink()
-  {
-    return $this->selfLink;
-  }
-  public function setSizeGb($sizeGb)
-  {
-    $this->sizeGb = $sizeGb;
-  }
-  public function getSizeGb()
-  {
-    return $this->sizeGb;
-  }
-  public function setSourceImage($sourceImage)
-  {
-    $this->sourceImage = $sourceImage;
-  }
-  public function getSourceImage()
-  {
-    return $this->sourceImage;
-  }
-  public function setSourceImageEncryptionKey(Google_Service_Compute_CustomerEncryptionKey $sourceImageEncryptionKey)
-  {
-    $this->sourceImageEncryptionKey = $sourceImageEncryptionKey;
-  }
-  public function getSourceImageEncryptionKey()
-  {
-    return $this->sourceImageEncryptionKey;
-  }
-  public function setSourceImageId($sourceImageId)
-  {
-    $this->sourceImageId = $sourceImageId;
-  }
-  public function getSourceImageId()
-  {
-    return $this->sourceImageId;
-  }
-  public function setSourceSnapshot($sourceSnapshot)
-  {
-    $this->sourceSnapshot = $sourceSnapshot;
-  }
-  public function getSourceSnapshot()
-  {
-    return $this->sourceSnapshot;
-  }
-  public function setSourceSnapshotEncryptionKey(Google_Service_Compute_CustomerEncryptionKey $sourceSnapshotEncryptionKey)
-  {
-    $this->sourceSnapshotEncryptionKey = $sourceSnapshotEncryptionKey;
-  }
-  public function getSourceSnapshotEncryptionKey()
-  {
-    return $this->sourceSnapshotEncryptionKey;
-  }
-  public function setSourceSnapshotId($sourceSnapshotId)
-  {
-    $this->sourceSnapshotId = $sourceSnapshotId;
-  }
-  public function getSourceSnapshotId()
-  {
-    return $this->sourceSnapshotId;
-  }
-  public function setStatus($status)
-  {
-    $this->status = $status;
-  }
-  public function getStatus()
-  {
-    return $this->status;
-  }
-  public function setType($type)
-  {
-    $this->type = $type;
-  }
-  public function getType()
-  {
-    return $this->type;
-  }
-  public function setUsers($users)
-  {
-    $this->users = $users;
-  }
-  public function getUsers()
-  {
-    return $this->users;
-  }
-  public function setZone($zone)
-  {
-    $this->zone = $zone;
-  }
-  public function getZone()
-  {
-    return $this->zone;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/DiskAggregatedList.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/DiskAggregatedList.php
deleted file mode 100644
index 77707292..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/DiskAggregatedList.php
+++ /dev/null
@@ -1,67 +0,0 @@
-id = $id;
-  }
-  public function getId()
-  {
-    return $this->id;
-  }
-  public function setItems($items)
-  {
-    $this->items = $items;
-  }
-  public function getItems()
-  {
-    return $this->items;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setNextPageToken($nextPageToken)
-  {
-    $this->nextPageToken = $nextPageToken;
-  }
-  public function getNextPageToken()
-  {
-    return $this->nextPageToken;
-  }
-  public function setSelfLink($selfLink)
-  {
-    $this->selfLink = $selfLink;
-  }
-  public function getSelfLink()
-  {
-    return $this->selfLink;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/DiskList.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/DiskList.php
deleted file mode 100644
index 5cc85b9f..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/DiskList.php
+++ /dev/null
@@ -1,68 +0,0 @@
-id = $id;
-  }
-  public function getId()
-  {
-    return $this->id;
-  }
-  public function setItems($items)
-  {
-    $this->items = $items;
-  }
-  public function getItems()
-  {
-    return $this->items;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setNextPageToken($nextPageToken)
-  {
-    $this->nextPageToken = $nextPageToken;
-  }
-  public function getNextPageToken()
-  {
-    return $this->nextPageToken;
-  }
-  public function setSelfLink($selfLink)
-  {
-    $this->selfLink = $selfLink;
-  }
-  public function getSelfLink()
-  {
-    return $this->selfLink;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/DiskMoveRequest.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/DiskMoveRequest.php
deleted file mode 100644
index e95d4668..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/DiskMoveRequest.php
+++ /dev/null
@@ -1,39 +0,0 @@
-destinationZone = $destinationZone;
-  }
-  public function getDestinationZone()
-  {
-    return $this->destinationZone;
-  }
-  public function setTargetDisk($targetDisk)
-  {
-    $this->targetDisk = $targetDisk;
-  }
-  public function getTargetDisk()
-  {
-    return $this->targetDisk;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/DiskType.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/DiskType.php
deleted file mode 100644
index f283fc27..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/DiskType.php
+++ /dev/null
@@ -1,112 +0,0 @@
-creationTimestamp = $creationTimestamp;
-  }
-  public function getCreationTimestamp()
-  {
-    return $this->creationTimestamp;
-  }
-  public function setDefaultDiskSizeGb($defaultDiskSizeGb)
-  {
-    $this->defaultDiskSizeGb = $defaultDiskSizeGb;
-  }
-  public function getDefaultDiskSizeGb()
-  {
-    return $this->defaultDiskSizeGb;
-  }
-  public function setDeprecated(Google_Service_Compute_DeprecationStatus $deprecated)
-  {
-    $this->deprecated = $deprecated;
-  }
-  public function getDeprecated()
-  {
-    return $this->deprecated;
-  }
-  public function setDescription($description)
-  {
-    $this->description = $description;
-  }
-  public function getDescription()
-  {
-    return $this->description;
-  }
-  public function setId($id)
-  {
-    $this->id = $id;
-  }
-  public function getId()
-  {
-    return $this->id;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setName($name)
-  {
-    $this->name = $name;
-  }
-  public function getName()
-  {
-    return $this->name;
-  }
-  public function setSelfLink($selfLink)
-  {
-    $this->selfLink = $selfLink;
-  }
-  public function getSelfLink()
-  {
-    return $this->selfLink;
-  }
-  public function setValidDiskSize($validDiskSize)
-  {
-    $this->validDiskSize = $validDiskSize;
-  }
-  public function getValidDiskSize()
-  {
-    return $this->validDiskSize;
-  }
-  public function setZone($zone)
-  {
-    $this->zone = $zone;
-  }
-  public function getZone()
-  {
-    return $this->zone;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/DiskTypeAggregatedList.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/DiskTypeAggregatedList.php
deleted file mode 100644
index c866b2af..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/DiskTypeAggregatedList.php
+++ /dev/null
@@ -1,67 +0,0 @@
-id = $id;
-  }
-  public function getId()
-  {
-    return $this->id;
-  }
-  public function setItems($items)
-  {
-    $this->items = $items;
-  }
-  public function getItems()
-  {
-    return $this->items;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setNextPageToken($nextPageToken)
-  {
-    $this->nextPageToken = $nextPageToken;
-  }
-  public function getNextPageToken()
-  {
-    return $this->nextPageToken;
-  }
-  public function setSelfLink($selfLink)
-  {
-    $this->selfLink = $selfLink;
-  }
-  public function getSelfLink()
-  {
-    return $this->selfLink;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/DiskTypeList.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/DiskTypeList.php
deleted file mode 100644
index 4ae1c27c..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/DiskTypeList.php
+++ /dev/null
@@ -1,68 +0,0 @@
-id = $id;
-  }
-  public function getId()
-  {
-    return $this->id;
-  }
-  public function setItems($items)
-  {
-    $this->items = $items;
-  }
-  public function getItems()
-  {
-    return $this->items;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setNextPageToken($nextPageToken)
-  {
-    $this->nextPageToken = $nextPageToken;
-  }
-  public function getNextPageToken()
-  {
-    return $this->nextPageToken;
-  }
-  public function setSelfLink($selfLink)
-  {
-    $this->selfLink = $selfLink;
-  }
-  public function getSelfLink()
-  {
-    return $this->selfLink;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/DiskTypesScopedList.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/DiskTypesScopedList.php
deleted file mode 100644
index 174396be..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/DiskTypesScopedList.php
+++ /dev/null
@@ -1,42 +0,0 @@
-diskTypes = $diskTypes;
-  }
-  public function getDiskTypes()
-  {
-    return $this->diskTypes;
-  }
-  public function setWarning(Google_Service_Compute_DiskTypesScopedListWarning $warning)
-  {
-    $this->warning = $warning;
-  }
-  public function getWarning()
-  {
-    return $this->warning;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/DiskTypesScopedListWarning.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/DiskTypesScopedListWarning.php
deleted file mode 100644
index c12c0d7a..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/DiskTypesScopedListWarning.php
+++ /dev/null
@@ -1,50 +0,0 @@
-code = $code;
-  }
-  public function getCode()
-  {
-    return $this->code;
-  }
-  public function setData($data)
-  {
-    $this->data = $data;
-  }
-  public function getData()
-  {
-    return $this->data;
-  }
-  public function setMessage($message)
-  {
-    $this->message = $message;
-  }
-  public function getMessage()
-  {
-    return $this->message;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/DiskTypesScopedListWarningData.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/DiskTypesScopedListWarningData.php
deleted file mode 100644
index a3b73434..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/DiskTypesScopedListWarningData.php
+++ /dev/null
@@ -1,39 +0,0 @@
-key = $key;
-  }
-  public function getKey()
-  {
-    return $this->key;
-  }
-  public function setValue($value)
-  {
-    $this->value = $value;
-  }
-  public function getValue()
-  {
-    return $this->value;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/DisksResizeRequest.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/DisksResizeRequest.php
deleted file mode 100644
index 3d961a60..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/DisksResizeRequest.php
+++ /dev/null
@@ -1,30 +0,0 @@
-sizeGb = $sizeGb;
-  }
-  public function getSizeGb()
-  {
-    return $this->sizeGb;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/DisksScopedList.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/DisksScopedList.php
deleted file mode 100644
index 4d886495..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/DisksScopedList.php
+++ /dev/null
@@ -1,42 +0,0 @@
-disks = $disks;
-  }
-  public function getDisks()
-  {
-    return $this->disks;
-  }
-  public function setWarning(Google_Service_Compute_DisksScopedListWarning $warning)
-  {
-    $this->warning = $warning;
-  }
-  public function getWarning()
-  {
-    return $this->warning;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/DisksScopedListWarning.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/DisksScopedListWarning.php
deleted file mode 100644
index 22ac1b64..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/DisksScopedListWarning.php
+++ /dev/null
@@ -1,50 +0,0 @@
-code = $code;
-  }
-  public function getCode()
-  {
-    return $this->code;
-  }
-  public function setData($data)
-  {
-    $this->data = $data;
-  }
-  public function getData()
-  {
-    return $this->data;
-  }
-  public function setMessage($message)
-  {
-    $this->message = $message;
-  }
-  public function getMessage()
-  {
-    return $this->message;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/DisksScopedListWarningData.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/DisksScopedListWarningData.php
deleted file mode 100644
index 905acde1..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/DisksScopedListWarningData.php
+++ /dev/null
@@ -1,39 +0,0 @@
-key = $key;
-  }
-  public function getKey()
-  {
-    return $this->key;
-  }
-  public function setValue($value)
-  {
-    $this->value = $value;
-  }
-  public function getValue()
-  {
-    return $this->value;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/Firewall.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/Firewall.php
deleted file mode 100644
index 35c6bbc8..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/Firewall.php
+++ /dev/null
@@ -1,122 +0,0 @@
-allowed = $allowed;
-  }
-  public function getAllowed()
-  {
-    return $this->allowed;
-  }
-  public function setCreationTimestamp($creationTimestamp)
-  {
-    $this->creationTimestamp = $creationTimestamp;
-  }
-  public function getCreationTimestamp()
-  {
-    return $this->creationTimestamp;
-  }
-  public function setDescription($description)
-  {
-    $this->description = $description;
-  }
-  public function getDescription()
-  {
-    return $this->description;
-  }
-  public function setId($id)
-  {
-    $this->id = $id;
-  }
-  public function getId()
-  {
-    return $this->id;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setName($name)
-  {
-    $this->name = $name;
-  }
-  public function getName()
-  {
-    return $this->name;
-  }
-  public function setNetwork($network)
-  {
-    $this->network = $network;
-  }
-  public function getNetwork()
-  {
-    return $this->network;
-  }
-  public function setSelfLink($selfLink)
-  {
-    $this->selfLink = $selfLink;
-  }
-  public function getSelfLink()
-  {
-    return $this->selfLink;
-  }
-  public function setSourceRanges($sourceRanges)
-  {
-    $this->sourceRanges = $sourceRanges;
-  }
-  public function getSourceRanges()
-  {
-    return $this->sourceRanges;
-  }
-  public function setSourceTags($sourceTags)
-  {
-    $this->sourceTags = $sourceTags;
-  }
-  public function getSourceTags()
-  {
-    return $this->sourceTags;
-  }
-  public function setTargetTags($targetTags)
-  {
-    $this->targetTags = $targetTags;
-  }
-  public function getTargetTags()
-  {
-    return $this->targetTags;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/FirewallAllowed.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/FirewallAllowed.php
deleted file mode 100644
index 8b301412..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/FirewallAllowed.php
+++ /dev/null
@@ -1,43 +0,0 @@
- "IPProtocol",
-  );
-  public $iPProtocol;
-  public $ports;
-
-  public function setIPProtocol($iPProtocol)
-  {
-    $this->iPProtocol = $iPProtocol;
-  }
-  public function getIPProtocol()
-  {
-    return $this->iPProtocol;
-  }
-  public function setPorts($ports)
-  {
-    $this->ports = $ports;
-  }
-  public function getPorts()
-  {
-    return $this->ports;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/FirewallList.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/FirewallList.php
deleted file mode 100644
index 6d6f46dc..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/FirewallList.php
+++ /dev/null
@@ -1,68 +0,0 @@
-id = $id;
-  }
-  public function getId()
-  {
-    return $this->id;
-  }
-  public function setItems($items)
-  {
-    $this->items = $items;
-  }
-  public function getItems()
-  {
-    return $this->items;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setNextPageToken($nextPageToken)
-  {
-    $this->nextPageToken = $nextPageToken;
-  }
-  public function getNextPageToken()
-  {
-    return $this->nextPageToken;
-  }
-  public function setSelfLink($selfLink)
-  {
-    $this->selfLink = $selfLink;
-  }
-  public function getSelfLink()
-  {
-    return $this->selfLink;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/ForwardingRule.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/ForwardingRule.php
deleted file mode 100644
index df993147..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/ForwardingRule.php
+++ /dev/null
@@ -1,170 +0,0 @@
- "IPAddress",
-        "iPProtocol" => "IPProtocol",
-  );
-  public $iPAddress;
-  public $iPProtocol;
-  public $backendService;
-  public $creationTimestamp;
-  public $description;
-  public $id;
-  public $kind;
-  public $loadBalancingScheme;
-  public $name;
-  public $network;
-  public $portRange;
-  public $ports;
-  public $region;
-  public $selfLink;
-  public $subnetwork;
-  public $target;
-
-  public function setIPAddress($iPAddress)
-  {
-    $this->iPAddress = $iPAddress;
-  }
-  public function getIPAddress()
-  {
-    return $this->iPAddress;
-  }
-  public function setIPProtocol($iPProtocol)
-  {
-    $this->iPProtocol = $iPProtocol;
-  }
-  public function getIPProtocol()
-  {
-    return $this->iPProtocol;
-  }
-  public function setBackendService($backendService)
-  {
-    $this->backendService = $backendService;
-  }
-  public function getBackendService()
-  {
-    return $this->backendService;
-  }
-  public function setCreationTimestamp($creationTimestamp)
-  {
-    $this->creationTimestamp = $creationTimestamp;
-  }
-  public function getCreationTimestamp()
-  {
-    return $this->creationTimestamp;
-  }
-  public function setDescription($description)
-  {
-    $this->description = $description;
-  }
-  public function getDescription()
-  {
-    return $this->description;
-  }
-  public function setId($id)
-  {
-    $this->id = $id;
-  }
-  public function getId()
-  {
-    return $this->id;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setLoadBalancingScheme($loadBalancingScheme)
-  {
-    $this->loadBalancingScheme = $loadBalancingScheme;
-  }
-  public function getLoadBalancingScheme()
-  {
-    return $this->loadBalancingScheme;
-  }
-  public function setName($name)
-  {
-    $this->name = $name;
-  }
-  public function getName()
-  {
-    return $this->name;
-  }
-  public function setNetwork($network)
-  {
-    $this->network = $network;
-  }
-  public function getNetwork()
-  {
-    return $this->network;
-  }
-  public function setPortRange($portRange)
-  {
-    $this->portRange = $portRange;
-  }
-  public function getPortRange()
-  {
-    return $this->portRange;
-  }
-  public function setPorts($ports)
-  {
-    $this->ports = $ports;
-  }
-  public function getPorts()
-  {
-    return $this->ports;
-  }
-  public function setRegion($region)
-  {
-    $this->region = $region;
-  }
-  public function getRegion()
-  {
-    return $this->region;
-  }
-  public function setSelfLink($selfLink)
-  {
-    $this->selfLink = $selfLink;
-  }
-  public function getSelfLink()
-  {
-    return $this->selfLink;
-  }
-  public function setSubnetwork($subnetwork)
-  {
-    $this->subnetwork = $subnetwork;
-  }
-  public function getSubnetwork()
-  {
-    return $this->subnetwork;
-  }
-  public function setTarget($target)
-  {
-    $this->target = $target;
-  }
-  public function getTarget()
-  {
-    return $this->target;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/ForwardingRuleAggregatedList.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/ForwardingRuleAggregatedList.php
deleted file mode 100644
index 06994bd3..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/ForwardingRuleAggregatedList.php
+++ /dev/null
@@ -1,67 +0,0 @@
-id = $id;
-  }
-  public function getId()
-  {
-    return $this->id;
-  }
-  public function setItems($items)
-  {
-    $this->items = $items;
-  }
-  public function getItems()
-  {
-    return $this->items;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setNextPageToken($nextPageToken)
-  {
-    $this->nextPageToken = $nextPageToken;
-  }
-  public function getNextPageToken()
-  {
-    return $this->nextPageToken;
-  }
-  public function setSelfLink($selfLink)
-  {
-    $this->selfLink = $selfLink;
-  }
-  public function getSelfLink()
-  {
-    return $this->selfLink;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/ForwardingRuleList.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/ForwardingRuleList.php
deleted file mode 100644
index 8c0701c6..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/ForwardingRuleList.php
+++ /dev/null
@@ -1,68 +0,0 @@
-id = $id;
-  }
-  public function getId()
-  {
-    return $this->id;
-  }
-  public function setItems($items)
-  {
-    $this->items = $items;
-  }
-  public function getItems()
-  {
-    return $this->items;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setNextPageToken($nextPageToken)
-  {
-    $this->nextPageToken = $nextPageToken;
-  }
-  public function getNextPageToken()
-  {
-    return $this->nextPageToken;
-  }
-  public function setSelfLink($selfLink)
-  {
-    $this->selfLink = $selfLink;
-  }
-  public function getSelfLink()
-  {
-    return $this->selfLink;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/ForwardingRulesScopedList.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/ForwardingRulesScopedList.php
deleted file mode 100644
index cff55a4a..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/ForwardingRulesScopedList.php
+++ /dev/null
@@ -1,42 +0,0 @@
-forwardingRules = $forwardingRules;
-  }
-  public function getForwardingRules()
-  {
-    return $this->forwardingRules;
-  }
-  public function setWarning(Google_Service_Compute_ForwardingRulesScopedListWarning $warning)
-  {
-    $this->warning = $warning;
-  }
-  public function getWarning()
-  {
-    return $this->warning;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/ForwardingRulesScopedListWarning.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/ForwardingRulesScopedListWarning.php
deleted file mode 100644
index 82ff32b6..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/ForwardingRulesScopedListWarning.php
+++ /dev/null
@@ -1,50 +0,0 @@
-code = $code;
-  }
-  public function getCode()
-  {
-    return $this->code;
-  }
-  public function setData($data)
-  {
-    $this->data = $data;
-  }
-  public function getData()
-  {
-    return $this->data;
-  }
-  public function setMessage($message)
-  {
-    $this->message = $message;
-  }
-  public function getMessage()
-  {
-    return $this->message;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/ForwardingRulesScopedListWarningData.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/ForwardingRulesScopedListWarningData.php
deleted file mode 100644
index f330149d..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/ForwardingRulesScopedListWarningData.php
+++ /dev/null
@@ -1,39 +0,0 @@
-key = $key;
-  }
-  public function getKey()
-  {
-    return $this->key;
-  }
-  public function setValue($value)
-  {
-    $this->value = $value;
-  }
-  public function getValue()
-  {
-    return $this->value;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/GuestOsFeature.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/GuestOsFeature.php
deleted file mode 100644
index 60bd8857..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/GuestOsFeature.php
+++ /dev/null
@@ -1,30 +0,0 @@
-type = $type;
-  }
-  public function getType()
-  {
-    return $this->type;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/HTTP2HealthCheck.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/HTTP2HealthCheck.php
deleted file mode 100644
index d1939e79..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/HTTP2HealthCheck.php
+++ /dev/null
@@ -1,66 +0,0 @@
-host = $host;
-  }
-  public function getHost()
-  {
-    return $this->host;
-  }
-  public function setPort($port)
-  {
-    $this->port = $port;
-  }
-  public function getPort()
-  {
-    return $this->port;
-  }
-  public function setPortName($portName)
-  {
-    $this->portName = $portName;
-  }
-  public function getPortName()
-  {
-    return $this->portName;
-  }
-  public function setProxyHeader($proxyHeader)
-  {
-    $this->proxyHeader = $proxyHeader;
-  }
-  public function getProxyHeader()
-  {
-    return $this->proxyHeader;
-  }
-  public function setRequestPath($requestPath)
-  {
-    $this->requestPath = $requestPath;
-  }
-  public function getRequestPath()
-  {
-    return $this->requestPath;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/HealthCheck.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/HealthCheck.php
deleted file mode 100644
index 9f2d9b3e..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/HealthCheck.php
+++ /dev/null
@@ -1,160 +0,0 @@
-checkIntervalSec = $checkIntervalSec;
-  }
-  public function getCheckIntervalSec()
-  {
-    return $this->checkIntervalSec;
-  }
-  public function setCreationTimestamp($creationTimestamp)
-  {
-    $this->creationTimestamp = $creationTimestamp;
-  }
-  public function getCreationTimestamp()
-  {
-    return $this->creationTimestamp;
-  }
-  public function setDescription($description)
-  {
-    $this->description = $description;
-  }
-  public function getDescription()
-  {
-    return $this->description;
-  }
-  public function setHealthyThreshold($healthyThreshold)
-  {
-    $this->healthyThreshold = $healthyThreshold;
-  }
-  public function getHealthyThreshold()
-  {
-    return $this->healthyThreshold;
-  }
-  public function setHttpHealthCheck(Google_Service_Compute_HTTPHealthCheck $httpHealthCheck)
-  {
-    $this->httpHealthCheck = $httpHealthCheck;
-  }
-  public function getHttpHealthCheck()
-  {
-    return $this->httpHealthCheck;
-  }
-  public function setHttpsHealthCheck(Google_Service_Compute_HTTPSHealthCheck $httpsHealthCheck)
-  {
-    $this->httpsHealthCheck = $httpsHealthCheck;
-  }
-  public function getHttpsHealthCheck()
-  {
-    return $this->httpsHealthCheck;
-  }
-  public function setId($id)
-  {
-    $this->id = $id;
-  }
-  public function getId()
-  {
-    return $this->id;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setName($name)
-  {
-    $this->name = $name;
-  }
-  public function getName()
-  {
-    return $this->name;
-  }
-  public function setSelfLink($selfLink)
-  {
-    $this->selfLink = $selfLink;
-  }
-  public function getSelfLink()
-  {
-    return $this->selfLink;
-  }
-  public function setSslHealthCheck(Google_Service_Compute_SSLHealthCheck $sslHealthCheck)
-  {
-    $this->sslHealthCheck = $sslHealthCheck;
-  }
-  public function getSslHealthCheck()
-  {
-    return $this->sslHealthCheck;
-  }
-  public function setTcpHealthCheck(Google_Service_Compute_TCPHealthCheck $tcpHealthCheck)
-  {
-    $this->tcpHealthCheck = $tcpHealthCheck;
-  }
-  public function getTcpHealthCheck()
-  {
-    return $this->tcpHealthCheck;
-  }
-  public function setTimeoutSec($timeoutSec)
-  {
-    $this->timeoutSec = $timeoutSec;
-  }
-  public function getTimeoutSec()
-  {
-    return $this->timeoutSec;
-  }
-  public function setType($type)
-  {
-    $this->type = $type;
-  }
-  public function getType()
-  {
-    return $this->type;
-  }
-  public function setUnhealthyThreshold($unhealthyThreshold)
-  {
-    $this->unhealthyThreshold = $unhealthyThreshold;
-  }
-  public function getUnhealthyThreshold()
-  {
-    return $this->unhealthyThreshold;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/HealthCheckList.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/HealthCheckList.php
deleted file mode 100644
index 9a7da005..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/HealthCheckList.php
+++ /dev/null
@@ -1,68 +0,0 @@
-id = $id;
-  }
-  public function getId()
-  {
-    return $this->id;
-  }
-  public function setItems($items)
-  {
-    $this->items = $items;
-  }
-  public function getItems()
-  {
-    return $this->items;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setNextPageToken($nextPageToken)
-  {
-    $this->nextPageToken = $nextPageToken;
-  }
-  public function getNextPageToken()
-  {
-    return $this->nextPageToken;
-  }
-  public function setSelfLink($selfLink)
-  {
-    $this->selfLink = $selfLink;
-  }
-  public function getSelfLink()
-  {
-    return $this->selfLink;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/HealthCheckReference.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/HealthCheckReference.php
deleted file mode 100644
index ecd0a0b2..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/HealthCheckReference.php
+++ /dev/null
@@ -1,30 +0,0 @@
-healthCheck = $healthCheck;
-  }
-  public function getHealthCheck()
-  {
-    return $this->healthCheck;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/HealthStatus.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/HealthStatus.php
deleted file mode 100644
index 264694a1..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/HealthStatus.php
+++ /dev/null
@@ -1,57 +0,0 @@
-healthState = $healthState;
-  }
-  public function getHealthState()
-  {
-    return $this->healthState;
-  }
-  public function setInstance($instance)
-  {
-    $this->instance = $instance;
-  }
-  public function getInstance()
-  {
-    return $this->instance;
-  }
-  public function setIpAddress($ipAddress)
-  {
-    $this->ipAddress = $ipAddress;
-  }
-  public function getIpAddress()
-  {
-    return $this->ipAddress;
-  }
-  public function setPort($port)
-  {
-    $this->port = $port;
-  }
-  public function getPort()
-  {
-    return $this->port;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/HostRule.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/HostRule.php
deleted file mode 100644
index 345b3254..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/HostRule.php
+++ /dev/null
@@ -1,49 +0,0 @@
-description = $description;
-  }
-  public function getDescription()
-  {
-    return $this->description;
-  }
-  public function setHosts($hosts)
-  {
-    $this->hosts = $hosts;
-  }
-  public function getHosts()
-  {
-    return $this->hosts;
-  }
-  public function setPathMatcher($pathMatcher)
-  {
-    $this->pathMatcher = $pathMatcher;
-  }
-  public function getPathMatcher()
-  {
-    return $this->pathMatcher;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/HttpHealthCheck.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/HttpHealthCheck.php
deleted file mode 100644
index d886f6bc..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/HttpHealthCheck.php
+++ /dev/null
@@ -1,138 +0,0 @@
-checkIntervalSec = $checkIntervalSec;
-  }
-  public function getCheckIntervalSec()
-  {
-    return $this->checkIntervalSec;
-  }
-  public function setCreationTimestamp($creationTimestamp)
-  {
-    $this->creationTimestamp = $creationTimestamp;
-  }
-  public function getCreationTimestamp()
-  {
-    return $this->creationTimestamp;
-  }
-  public function setDescription($description)
-  {
-    $this->description = $description;
-  }
-  public function getDescription()
-  {
-    return $this->description;
-  }
-  public function setHealthyThreshold($healthyThreshold)
-  {
-    $this->healthyThreshold = $healthyThreshold;
-  }
-  public function getHealthyThreshold()
-  {
-    return $this->healthyThreshold;
-  }
-  public function setHost($host)
-  {
-    $this->host = $host;
-  }
-  public function getHost()
-  {
-    return $this->host;
-  }
-  public function setId($id)
-  {
-    $this->id = $id;
-  }
-  public function getId()
-  {
-    return $this->id;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setName($name)
-  {
-    $this->name = $name;
-  }
-  public function getName()
-  {
-    return $this->name;
-  }
-  public function setPort($port)
-  {
-    $this->port = $port;
-  }
-  public function getPort()
-  {
-    return $this->port;
-  }
-  public function setRequestPath($requestPath)
-  {
-    $this->requestPath = $requestPath;
-  }
-  public function getRequestPath()
-  {
-    return $this->requestPath;
-  }
-  public function setSelfLink($selfLink)
-  {
-    $this->selfLink = $selfLink;
-  }
-  public function getSelfLink()
-  {
-    return $this->selfLink;
-  }
-  public function setTimeoutSec($timeoutSec)
-  {
-    $this->timeoutSec = $timeoutSec;
-  }
-  public function getTimeoutSec()
-  {
-    return $this->timeoutSec;
-  }
-  public function setUnhealthyThreshold($unhealthyThreshold)
-  {
-    $this->unhealthyThreshold = $unhealthyThreshold;
-  }
-  public function getUnhealthyThreshold()
-  {
-    return $this->unhealthyThreshold;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/HttpHealthCheckList.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/HttpHealthCheckList.php
deleted file mode 100644
index c700cf50..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/HttpHealthCheckList.php
+++ /dev/null
@@ -1,68 +0,0 @@
-id = $id;
-  }
-  public function getId()
-  {
-    return $this->id;
-  }
-  public function setItems($items)
-  {
-    $this->items = $items;
-  }
-  public function getItems()
-  {
-    return $this->items;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setNextPageToken($nextPageToken)
-  {
-    $this->nextPageToken = $nextPageToken;
-  }
-  public function getNextPageToken()
-  {
-    return $this->nextPageToken;
-  }
-  public function setSelfLink($selfLink)
-  {
-    $this->selfLink = $selfLink;
-  }
-  public function getSelfLink()
-  {
-    return $this->selfLink;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/HttpsHealthCheck.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/HttpsHealthCheck.php
deleted file mode 100644
index 22cfe26b..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/HttpsHealthCheck.php
+++ /dev/null
@@ -1,138 +0,0 @@
-checkIntervalSec = $checkIntervalSec;
-  }
-  public function getCheckIntervalSec()
-  {
-    return $this->checkIntervalSec;
-  }
-  public function setCreationTimestamp($creationTimestamp)
-  {
-    $this->creationTimestamp = $creationTimestamp;
-  }
-  public function getCreationTimestamp()
-  {
-    return $this->creationTimestamp;
-  }
-  public function setDescription($description)
-  {
-    $this->description = $description;
-  }
-  public function getDescription()
-  {
-    return $this->description;
-  }
-  public function setHealthyThreshold($healthyThreshold)
-  {
-    $this->healthyThreshold = $healthyThreshold;
-  }
-  public function getHealthyThreshold()
-  {
-    return $this->healthyThreshold;
-  }
-  public function setHost($host)
-  {
-    $this->host = $host;
-  }
-  public function getHost()
-  {
-    return $this->host;
-  }
-  public function setId($id)
-  {
-    $this->id = $id;
-  }
-  public function getId()
-  {
-    return $this->id;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setName($name)
-  {
-    $this->name = $name;
-  }
-  public function getName()
-  {
-    return $this->name;
-  }
-  public function setPort($port)
-  {
-    $this->port = $port;
-  }
-  public function getPort()
-  {
-    return $this->port;
-  }
-  public function setRequestPath($requestPath)
-  {
-    $this->requestPath = $requestPath;
-  }
-  public function getRequestPath()
-  {
-    return $this->requestPath;
-  }
-  public function setSelfLink($selfLink)
-  {
-    $this->selfLink = $selfLink;
-  }
-  public function getSelfLink()
-  {
-    return $this->selfLink;
-  }
-  public function setTimeoutSec($timeoutSec)
-  {
-    $this->timeoutSec = $timeoutSec;
-  }
-  public function getTimeoutSec()
-  {
-    return $this->timeoutSec;
-  }
-  public function setUnhealthyThreshold($unhealthyThreshold)
-  {
-    $this->unhealthyThreshold = $unhealthyThreshold;
-  }
-  public function getUnhealthyThreshold()
-  {
-    return $this->unhealthyThreshold;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/HttpsHealthCheckList.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/HttpsHealthCheckList.php
deleted file mode 100644
index 6db553d6..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/HttpsHealthCheckList.php
+++ /dev/null
@@ -1,68 +0,0 @@
-id = $id;
-  }
-  public function getId()
-  {
-    return $this->id;
-  }
-  public function setItems($items)
-  {
-    $this->items = $items;
-  }
-  public function getItems()
-  {
-    return $this->items;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setNextPageToken($nextPageToken)
-  {
-    $this->nextPageToken = $nextPageToken;
-  }
-  public function getNextPageToken()
-  {
-    return $this->nextPageToken;
-  }
-  public function setSelfLink($selfLink)
-  {
-    $this->selfLink = $selfLink;
-  }
-  public function getSelfLink()
-  {
-    return $this->selfLink;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/Image.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/Image.php
deleted file mode 100644
index 4f72521f..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/Image.php
+++ /dev/null
@@ -1,198 +0,0 @@
-archiveSizeBytes = $archiveSizeBytes;
-  }
-  public function getArchiveSizeBytes()
-  {
-    return $this->archiveSizeBytes;
-  }
-  public function setCreationTimestamp($creationTimestamp)
-  {
-    $this->creationTimestamp = $creationTimestamp;
-  }
-  public function getCreationTimestamp()
-  {
-    return $this->creationTimestamp;
-  }
-  public function setDeprecated(Google_Service_Compute_DeprecationStatus $deprecated)
-  {
-    $this->deprecated = $deprecated;
-  }
-  public function getDeprecated()
-  {
-    return $this->deprecated;
-  }
-  public function setDescription($description)
-  {
-    $this->description = $description;
-  }
-  public function getDescription()
-  {
-    return $this->description;
-  }
-  public function setDiskSizeGb($diskSizeGb)
-  {
-    $this->diskSizeGb = $diskSizeGb;
-  }
-  public function getDiskSizeGb()
-  {
-    return $this->diskSizeGb;
-  }
-  public function setFamily($family)
-  {
-    $this->family = $family;
-  }
-  public function getFamily()
-  {
-    return $this->family;
-  }
-  public function setGuestOsFeatures($guestOsFeatures)
-  {
-    $this->guestOsFeatures = $guestOsFeatures;
-  }
-  public function getGuestOsFeatures()
-  {
-    return $this->guestOsFeatures;
-  }
-  public function setId($id)
-  {
-    $this->id = $id;
-  }
-  public function getId()
-  {
-    return $this->id;
-  }
-  public function setImageEncryptionKey(Google_Service_Compute_CustomerEncryptionKey $imageEncryptionKey)
-  {
-    $this->imageEncryptionKey = $imageEncryptionKey;
-  }
-  public function getImageEncryptionKey()
-  {
-    return $this->imageEncryptionKey;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setLicenses($licenses)
-  {
-    $this->licenses = $licenses;
-  }
-  public function getLicenses()
-  {
-    return $this->licenses;
-  }
-  public function setName($name)
-  {
-    $this->name = $name;
-  }
-  public function getName()
-  {
-    return $this->name;
-  }
-  public function setRawDisk(Google_Service_Compute_ImageRawDisk $rawDisk)
-  {
-    $this->rawDisk = $rawDisk;
-  }
-  public function getRawDisk()
-  {
-    return $this->rawDisk;
-  }
-  public function setSelfLink($selfLink)
-  {
-    $this->selfLink = $selfLink;
-  }
-  public function getSelfLink()
-  {
-    return $this->selfLink;
-  }
-  public function setSourceDisk($sourceDisk)
-  {
-    $this->sourceDisk = $sourceDisk;
-  }
-  public function getSourceDisk()
-  {
-    return $this->sourceDisk;
-  }
-  public function setSourceDiskEncryptionKey(Google_Service_Compute_CustomerEncryptionKey $sourceDiskEncryptionKey)
-  {
-    $this->sourceDiskEncryptionKey = $sourceDiskEncryptionKey;
-  }
-  public function getSourceDiskEncryptionKey()
-  {
-    return $this->sourceDiskEncryptionKey;
-  }
-  public function setSourceDiskId($sourceDiskId)
-  {
-    $this->sourceDiskId = $sourceDiskId;
-  }
-  public function getSourceDiskId()
-  {
-    return $this->sourceDiskId;
-  }
-  public function setSourceType($sourceType)
-  {
-    $this->sourceType = $sourceType;
-  }
-  public function getSourceType()
-  {
-    return $this->sourceType;
-  }
-  public function setStatus($status)
-  {
-    $this->status = $status;
-  }
-  public function getStatus()
-  {
-    return $this->status;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/ImageList.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/ImageList.php
deleted file mode 100644
index 0ad2e978..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/ImageList.php
+++ /dev/null
@@ -1,68 +0,0 @@
-id = $id;
-  }
-  public function getId()
-  {
-    return $this->id;
-  }
-  public function setItems($items)
-  {
-    $this->items = $items;
-  }
-  public function getItems()
-  {
-    return $this->items;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setNextPageToken($nextPageToken)
-  {
-    $this->nextPageToken = $nextPageToken;
-  }
-  public function getNextPageToken()
-  {
-    return $this->nextPageToken;
-  }
-  public function setSelfLink($selfLink)
-  {
-    $this->selfLink = $selfLink;
-  }
-  public function getSelfLink()
-  {
-    return $this->selfLink;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/ImageRawDisk.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/ImageRawDisk.php
deleted file mode 100644
index 80344fb9..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/ImageRawDisk.php
+++ /dev/null
@@ -1,48 +0,0 @@
-containerType = $containerType;
-  }
-  public function getContainerType()
-  {
-    return $this->containerType;
-  }
-  public function setSha1Checksum($sha1Checksum)
-  {
-    $this->sha1Checksum = $sha1Checksum;
-  }
-  public function getSha1Checksum()
-  {
-    return $this->sha1Checksum;
-  }
-  public function setSource($source)
-  {
-    $this->source = $source;
-  }
-  public function getSource()
-  {
-    return $this->source;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/Instance.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/Instance.php
deleted file mode 100644
index 6f7d7004..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/Instance.php
+++ /dev/null
@@ -1,190 +0,0 @@
-canIpForward = $canIpForward;
-  }
-  public function getCanIpForward()
-  {
-    return $this->canIpForward;
-  }
-  public function setCpuPlatform($cpuPlatform)
-  {
-    $this->cpuPlatform = $cpuPlatform;
-  }
-  public function getCpuPlatform()
-  {
-    return $this->cpuPlatform;
-  }
-  public function setCreationTimestamp($creationTimestamp)
-  {
-    $this->creationTimestamp = $creationTimestamp;
-  }
-  public function getCreationTimestamp()
-  {
-    return $this->creationTimestamp;
-  }
-  public function setDescription($description)
-  {
-    $this->description = $description;
-  }
-  public function getDescription()
-  {
-    return $this->description;
-  }
-  public function setDisks($disks)
-  {
-    $this->disks = $disks;
-  }
-  public function getDisks()
-  {
-    return $this->disks;
-  }
-  public function setId($id)
-  {
-    $this->id = $id;
-  }
-  public function getId()
-  {
-    return $this->id;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setMachineType($machineType)
-  {
-    $this->machineType = $machineType;
-  }
-  public function getMachineType()
-  {
-    return $this->machineType;
-  }
-  public function setMetadata(Google_Service_Compute_Metadata $metadata)
-  {
-    $this->metadata = $metadata;
-  }
-  public function getMetadata()
-  {
-    return $this->metadata;
-  }
-  public function setName($name)
-  {
-    $this->name = $name;
-  }
-  public function getName()
-  {
-    return $this->name;
-  }
-  public function setNetworkInterfaces($networkInterfaces)
-  {
-    $this->networkInterfaces = $networkInterfaces;
-  }
-  public function getNetworkInterfaces()
-  {
-    return $this->networkInterfaces;
-  }
-  public function setScheduling(Google_Service_Compute_Scheduling $scheduling)
-  {
-    $this->scheduling = $scheduling;
-  }
-  public function getScheduling()
-  {
-    return $this->scheduling;
-  }
-  public function setSelfLink($selfLink)
-  {
-    $this->selfLink = $selfLink;
-  }
-  public function getSelfLink()
-  {
-    return $this->selfLink;
-  }
-  public function setServiceAccounts($serviceAccounts)
-  {
-    $this->serviceAccounts = $serviceAccounts;
-  }
-  public function getServiceAccounts()
-  {
-    return $this->serviceAccounts;
-  }
-  public function setStatus($status)
-  {
-    $this->status = $status;
-  }
-  public function getStatus()
-  {
-    return $this->status;
-  }
-  public function setStatusMessage($statusMessage)
-  {
-    $this->statusMessage = $statusMessage;
-  }
-  public function getStatusMessage()
-  {
-    return $this->statusMessage;
-  }
-  public function setTags(Google_Service_Compute_Tags $tags)
-  {
-    $this->tags = $tags;
-  }
-  public function getTags()
-  {
-    return $this->tags;
-  }
-  public function setZone($zone)
-  {
-    $this->zone = $zone;
-  }
-  public function getZone()
-  {
-    return $this->zone;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/InstanceAggregatedList.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/InstanceAggregatedList.php
deleted file mode 100644
index 91a83c56..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/InstanceAggregatedList.php
+++ /dev/null
@@ -1,67 +0,0 @@
-id = $id;
-  }
-  public function getId()
-  {
-    return $this->id;
-  }
-  public function setItems($items)
-  {
-    $this->items = $items;
-  }
-  public function getItems()
-  {
-    return $this->items;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setNextPageToken($nextPageToken)
-  {
-    $this->nextPageToken = $nextPageToken;
-  }
-  public function getNextPageToken()
-  {
-    return $this->nextPageToken;
-  }
-  public function setSelfLink($selfLink)
-  {
-    $this->selfLink = $selfLink;
-  }
-  public function getSelfLink()
-  {
-    return $this->selfLink;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/InstanceGroup.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/InstanceGroup.php
deleted file mode 100644
index f2d83179..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/InstanceGroup.php
+++ /dev/null
@@ -1,140 +0,0 @@
-creationTimestamp = $creationTimestamp;
-  }
-  public function getCreationTimestamp()
-  {
-    return $this->creationTimestamp;
-  }
-  public function setDescription($description)
-  {
-    $this->description = $description;
-  }
-  public function getDescription()
-  {
-    return $this->description;
-  }
-  public function setFingerprint($fingerprint)
-  {
-    $this->fingerprint = $fingerprint;
-  }
-  public function getFingerprint()
-  {
-    return $this->fingerprint;
-  }
-  public function setId($id)
-  {
-    $this->id = $id;
-  }
-  public function getId()
-  {
-    return $this->id;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setName($name)
-  {
-    $this->name = $name;
-  }
-  public function getName()
-  {
-    return $this->name;
-  }
-  public function setNamedPorts($namedPorts)
-  {
-    $this->namedPorts = $namedPorts;
-  }
-  public function getNamedPorts()
-  {
-    return $this->namedPorts;
-  }
-  public function setNetwork($network)
-  {
-    $this->network = $network;
-  }
-  public function getNetwork()
-  {
-    return $this->network;
-  }
-  public function setRegion($region)
-  {
-    $this->region = $region;
-  }
-  public function getRegion()
-  {
-    return $this->region;
-  }
-  public function setSelfLink($selfLink)
-  {
-    $this->selfLink = $selfLink;
-  }
-  public function getSelfLink()
-  {
-    return $this->selfLink;
-  }
-  public function setSize($size)
-  {
-    $this->size = $size;
-  }
-  public function getSize()
-  {
-    return $this->size;
-  }
-  public function setSubnetwork($subnetwork)
-  {
-    $this->subnetwork = $subnetwork;
-  }
-  public function getSubnetwork()
-  {
-    return $this->subnetwork;
-  }
-  public function setZone($zone)
-  {
-    $this->zone = $zone;
-  }
-  public function getZone()
-  {
-    return $this->zone;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/InstanceGroupAggregatedList.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/InstanceGroupAggregatedList.php
deleted file mode 100644
index 1530d36e..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/InstanceGroupAggregatedList.php
+++ /dev/null
@@ -1,67 +0,0 @@
-id = $id;
-  }
-  public function getId()
-  {
-    return $this->id;
-  }
-  public function setItems($items)
-  {
-    $this->items = $items;
-  }
-  public function getItems()
-  {
-    return $this->items;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setNextPageToken($nextPageToken)
-  {
-    $this->nextPageToken = $nextPageToken;
-  }
-  public function getNextPageToken()
-  {
-    return $this->nextPageToken;
-  }
-  public function setSelfLink($selfLink)
-  {
-    $this->selfLink = $selfLink;
-  }
-  public function getSelfLink()
-  {
-    return $this->selfLink;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/InstanceGroupList.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/InstanceGroupList.php
deleted file mode 100644
index 7e3a843f..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/InstanceGroupList.php
+++ /dev/null
@@ -1,68 +0,0 @@
-id = $id;
-  }
-  public function getId()
-  {
-    return $this->id;
-  }
-  public function setItems($items)
-  {
-    $this->items = $items;
-  }
-  public function getItems()
-  {
-    return $this->items;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setNextPageToken($nextPageToken)
-  {
-    $this->nextPageToken = $nextPageToken;
-  }
-  public function getNextPageToken()
-  {
-    return $this->nextPageToken;
-  }
-  public function setSelfLink($selfLink)
-  {
-    $this->selfLink = $selfLink;
-  }
-  public function getSelfLink()
-  {
-    return $this->selfLink;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/InstanceGroupManager.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/InstanceGroupManager.php
deleted file mode 100644
index 04a8641f..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/InstanceGroupManager.php
+++ /dev/null
@@ -1,168 +0,0 @@
-baseInstanceName = $baseInstanceName;
-  }
-  public function getBaseInstanceName()
-  {
-    return $this->baseInstanceName;
-  }
-  public function setCreationTimestamp($creationTimestamp)
-  {
-    $this->creationTimestamp = $creationTimestamp;
-  }
-  public function getCreationTimestamp()
-  {
-    return $this->creationTimestamp;
-  }
-  public function setCurrentActions(Google_Service_Compute_InstanceGroupManagerActionsSummary $currentActions)
-  {
-    $this->currentActions = $currentActions;
-  }
-  public function getCurrentActions()
-  {
-    return $this->currentActions;
-  }
-  public function setDescription($description)
-  {
-    $this->description = $description;
-  }
-  public function getDescription()
-  {
-    return $this->description;
-  }
-  public function setFingerprint($fingerprint)
-  {
-    $this->fingerprint = $fingerprint;
-  }
-  public function getFingerprint()
-  {
-    return $this->fingerprint;
-  }
-  public function setId($id)
-  {
-    $this->id = $id;
-  }
-  public function getId()
-  {
-    return $this->id;
-  }
-  public function setInstanceGroup($instanceGroup)
-  {
-    $this->instanceGroup = $instanceGroup;
-  }
-  public function getInstanceGroup()
-  {
-    return $this->instanceGroup;
-  }
-  public function setInstanceTemplate($instanceTemplate)
-  {
-    $this->instanceTemplate = $instanceTemplate;
-  }
-  public function getInstanceTemplate()
-  {
-    return $this->instanceTemplate;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setName($name)
-  {
-    $this->name = $name;
-  }
-  public function getName()
-  {
-    return $this->name;
-  }
-  public function setNamedPorts($namedPorts)
-  {
-    $this->namedPorts = $namedPorts;
-  }
-  public function getNamedPorts()
-  {
-    return $this->namedPorts;
-  }
-  public function setRegion($region)
-  {
-    $this->region = $region;
-  }
-  public function getRegion()
-  {
-    return $this->region;
-  }
-  public function setSelfLink($selfLink)
-  {
-    $this->selfLink = $selfLink;
-  }
-  public function getSelfLink()
-  {
-    return $this->selfLink;
-  }
-  public function setTargetPools($targetPools)
-  {
-    $this->targetPools = $targetPools;
-  }
-  public function getTargetPools()
-  {
-    return $this->targetPools;
-  }
-  public function setTargetSize($targetSize)
-  {
-    $this->targetSize = $targetSize;
-  }
-  public function getTargetSize()
-  {
-    return $this->targetSize;
-  }
-  public function setZone($zone)
-  {
-    $this->zone = $zone;
-  }
-  public function getZone()
-  {
-    return $this->zone;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/InstanceGroupManagerActionsSummary.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/InstanceGroupManagerActionsSummary.php
deleted file mode 100644
index 3c115ade..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/InstanceGroupManagerActionsSummary.php
+++ /dev/null
@@ -1,93 +0,0 @@
-abandoning = $abandoning;
-  }
-  public function getAbandoning()
-  {
-    return $this->abandoning;
-  }
-  public function setCreating($creating)
-  {
-    $this->creating = $creating;
-  }
-  public function getCreating()
-  {
-    return $this->creating;
-  }
-  public function setCreatingWithoutRetries($creatingWithoutRetries)
-  {
-    $this->creatingWithoutRetries = $creatingWithoutRetries;
-  }
-  public function getCreatingWithoutRetries()
-  {
-    return $this->creatingWithoutRetries;
-  }
-  public function setDeleting($deleting)
-  {
-    $this->deleting = $deleting;
-  }
-  public function getDeleting()
-  {
-    return $this->deleting;
-  }
-  public function setNone($none)
-  {
-    $this->none = $none;
-  }
-  public function getNone()
-  {
-    return $this->none;
-  }
-  public function setRecreating($recreating)
-  {
-    $this->recreating = $recreating;
-  }
-  public function getRecreating()
-  {
-    return $this->recreating;
-  }
-  public function setRefreshing($refreshing)
-  {
-    $this->refreshing = $refreshing;
-  }
-  public function getRefreshing()
-  {
-    return $this->refreshing;
-  }
-  public function setRestarting($restarting)
-  {
-    $this->restarting = $restarting;
-  }
-  public function getRestarting()
-  {
-    return $this->restarting;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/InstanceGroupManagerAggregatedList.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/InstanceGroupManagerAggregatedList.php
deleted file mode 100644
index f323d5f1..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/InstanceGroupManagerAggregatedList.php
+++ /dev/null
@@ -1,67 +0,0 @@
-id = $id;
-  }
-  public function getId()
-  {
-    return $this->id;
-  }
-  public function setItems($items)
-  {
-    $this->items = $items;
-  }
-  public function getItems()
-  {
-    return $this->items;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setNextPageToken($nextPageToken)
-  {
-    $this->nextPageToken = $nextPageToken;
-  }
-  public function getNextPageToken()
-  {
-    return $this->nextPageToken;
-  }
-  public function setSelfLink($selfLink)
-  {
-    $this->selfLink = $selfLink;
-  }
-  public function getSelfLink()
-  {
-    return $this->selfLink;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/InstanceGroupManagerList.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/InstanceGroupManagerList.php
deleted file mode 100644
index b477ff89..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/InstanceGroupManagerList.php
+++ /dev/null
@@ -1,68 +0,0 @@
-id = $id;
-  }
-  public function getId()
-  {
-    return $this->id;
-  }
-  public function setItems($items)
-  {
-    $this->items = $items;
-  }
-  public function getItems()
-  {
-    return $this->items;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setNextPageToken($nextPageToken)
-  {
-    $this->nextPageToken = $nextPageToken;
-  }
-  public function getNextPageToken()
-  {
-    return $this->nextPageToken;
-  }
-  public function setSelfLink($selfLink)
-  {
-    $this->selfLink = $selfLink;
-  }
-  public function getSelfLink()
-  {
-    return $this->selfLink;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/InstanceGroupManagersAbandonInstancesRequest.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/InstanceGroupManagersAbandonInstancesRequest.php
deleted file mode 100644
index 003f395a..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/InstanceGroupManagersAbandonInstancesRequest.php
+++ /dev/null
@@ -1,31 +0,0 @@
-instances = $instances;
-  }
-  public function getInstances()
-  {
-    return $this->instances;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/InstanceGroupManagersDeleteInstancesRequest.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/InstanceGroupManagersDeleteInstancesRequest.php
deleted file mode 100644
index 730134f6..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/InstanceGroupManagersDeleteInstancesRequest.php
+++ /dev/null
@@ -1,31 +0,0 @@
-instances = $instances;
-  }
-  public function getInstances()
-  {
-    return $this->instances;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/InstanceGroupManagersListManagedInstancesResponse.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/InstanceGroupManagersListManagedInstancesResponse.php
deleted file mode 100644
index af31cdf0..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/InstanceGroupManagersListManagedInstancesResponse.php
+++ /dev/null
@@ -1,32 +0,0 @@
-managedInstances = $managedInstances;
-  }
-  public function getManagedInstances()
-  {
-    return $this->managedInstances;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/InstanceGroupManagersRecreateInstancesRequest.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/InstanceGroupManagersRecreateInstancesRequest.php
deleted file mode 100644
index 33c6fdc2..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/InstanceGroupManagersRecreateInstancesRequest.php
+++ /dev/null
@@ -1,31 +0,0 @@
-instances = $instances;
-  }
-  public function getInstances()
-  {
-    return $this->instances;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/InstanceGroupManagersScopedList.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/InstanceGroupManagersScopedList.php
deleted file mode 100644
index 03a6c2f6..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/InstanceGroupManagersScopedList.php
+++ /dev/null
@@ -1,42 +0,0 @@
-instanceGroupManagers = $instanceGroupManagers;
-  }
-  public function getInstanceGroupManagers()
-  {
-    return $this->instanceGroupManagers;
-  }
-  public function setWarning(Google_Service_Compute_InstanceGroupManagersScopedListWarning $warning)
-  {
-    $this->warning = $warning;
-  }
-  public function getWarning()
-  {
-    return $this->warning;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/InstanceGroupManagersScopedListWarning.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/InstanceGroupManagersScopedListWarning.php
deleted file mode 100644
index b5263d91..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/InstanceGroupManagersScopedListWarning.php
+++ /dev/null
@@ -1,50 +0,0 @@
-code = $code;
-  }
-  public function getCode()
-  {
-    return $this->code;
-  }
-  public function setData($data)
-  {
-    $this->data = $data;
-  }
-  public function getData()
-  {
-    return $this->data;
-  }
-  public function setMessage($message)
-  {
-    $this->message = $message;
-  }
-  public function getMessage()
-  {
-    return $this->message;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/InstanceGroupManagersScopedListWarningData.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/InstanceGroupManagersScopedListWarningData.php
deleted file mode 100644
index 782c8669..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/InstanceGroupManagersScopedListWarningData.php
+++ /dev/null
@@ -1,39 +0,0 @@
-key = $key;
-  }
-  public function getKey()
-  {
-    return $this->key;
-  }
-  public function setValue($value)
-  {
-    $this->value = $value;
-  }
-  public function getValue()
-  {
-    return $this->value;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/InstanceGroupManagersSetInstanceTemplateRequest.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/InstanceGroupManagersSetInstanceTemplateRequest.php
deleted file mode 100644
index f4eb6d4b..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/InstanceGroupManagersSetInstanceTemplateRequest.php
+++ /dev/null
@@ -1,30 +0,0 @@
-instanceTemplate = $instanceTemplate;
-  }
-  public function getInstanceTemplate()
-  {
-    return $this->instanceTemplate;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/InstanceGroupManagersSetTargetPoolsRequest.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/InstanceGroupManagersSetTargetPoolsRequest.php
deleted file mode 100644
index faf92961..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/InstanceGroupManagersSetTargetPoolsRequest.php
+++ /dev/null
@@ -1,40 +0,0 @@
-fingerprint = $fingerprint;
-  }
-  public function getFingerprint()
-  {
-    return $this->fingerprint;
-  }
-  public function setTargetPools($targetPools)
-  {
-    $this->targetPools = $targetPools;
-  }
-  public function getTargetPools()
-  {
-    return $this->targetPools;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/InstanceGroupsAddInstancesRequest.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/InstanceGroupsAddInstancesRequest.php
deleted file mode 100644
index 61f2d30a..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/InstanceGroupsAddInstancesRequest.php
+++ /dev/null
@@ -1,32 +0,0 @@
-instances = $instances;
-  }
-  public function getInstances()
-  {
-    return $this->instances;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/InstanceGroupsListInstances.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/InstanceGroupsListInstances.php
deleted file mode 100644
index 00d3c8ce..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/InstanceGroupsListInstances.php
+++ /dev/null
@@ -1,68 +0,0 @@
-id = $id;
-  }
-  public function getId()
-  {
-    return $this->id;
-  }
-  public function setItems($items)
-  {
-    $this->items = $items;
-  }
-  public function getItems()
-  {
-    return $this->items;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setNextPageToken($nextPageToken)
-  {
-    $this->nextPageToken = $nextPageToken;
-  }
-  public function getNextPageToken()
-  {
-    return $this->nextPageToken;
-  }
-  public function setSelfLink($selfLink)
-  {
-    $this->selfLink = $selfLink;
-  }
-  public function getSelfLink()
-  {
-    return $this->selfLink;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/InstanceGroupsListInstancesRequest.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/InstanceGroupsListInstancesRequest.php
deleted file mode 100644
index 96626eba..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/InstanceGroupsListInstancesRequest.php
+++ /dev/null
@@ -1,30 +0,0 @@
-instanceState = $instanceState;
-  }
-  public function getInstanceState()
-  {
-    return $this->instanceState;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/InstanceGroupsRemoveInstancesRequest.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/InstanceGroupsRemoveInstancesRequest.php
deleted file mode 100644
index 90025aab..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/InstanceGroupsRemoveInstancesRequest.php
+++ /dev/null
@@ -1,32 +0,0 @@
-instances = $instances;
-  }
-  public function getInstances()
-  {
-    return $this->instances;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/InstanceGroupsScopedList.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/InstanceGroupsScopedList.php
deleted file mode 100644
index 3a842801..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/InstanceGroupsScopedList.php
+++ /dev/null
@@ -1,42 +0,0 @@
-instanceGroups = $instanceGroups;
-  }
-  public function getInstanceGroups()
-  {
-    return $this->instanceGroups;
-  }
-  public function setWarning(Google_Service_Compute_InstanceGroupsScopedListWarning $warning)
-  {
-    $this->warning = $warning;
-  }
-  public function getWarning()
-  {
-    return $this->warning;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/InstanceGroupsScopedListWarning.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/InstanceGroupsScopedListWarning.php
deleted file mode 100644
index 9e66c4cd..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/InstanceGroupsScopedListWarning.php
+++ /dev/null
@@ -1,50 +0,0 @@
-code = $code;
-  }
-  public function getCode()
-  {
-    return $this->code;
-  }
-  public function setData($data)
-  {
-    $this->data = $data;
-  }
-  public function getData()
-  {
-    return $this->data;
-  }
-  public function setMessage($message)
-  {
-    $this->message = $message;
-  }
-  public function getMessage()
-  {
-    return $this->message;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/InstanceGroupsScopedListWarningData.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/InstanceGroupsScopedListWarningData.php
deleted file mode 100644
index 5afedbde..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/InstanceGroupsScopedListWarningData.php
+++ /dev/null
@@ -1,39 +0,0 @@
-key = $key;
-  }
-  public function getKey()
-  {
-    return $this->key;
-  }
-  public function setValue($value)
-  {
-    $this->value = $value;
-  }
-  public function getValue()
-  {
-    return $this->value;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/InstanceGroupsSetNamedPortsRequest.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/InstanceGroupsSetNamedPortsRequest.php
deleted file mode 100644
index 39b90bec..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/InstanceGroupsSetNamedPortsRequest.php
+++ /dev/null
@@ -1,41 +0,0 @@
-fingerprint = $fingerprint;
-  }
-  public function getFingerprint()
-  {
-    return $this->fingerprint;
-  }
-  public function setNamedPorts($namedPorts)
-  {
-    $this->namedPorts = $namedPorts;
-  }
-  public function getNamedPorts()
-  {
-    return $this->namedPorts;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/InstanceList.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/InstanceList.php
deleted file mode 100644
index 2b4972f0..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/InstanceList.php
+++ /dev/null
@@ -1,68 +0,0 @@
-id = $id;
-  }
-  public function getId()
-  {
-    return $this->id;
-  }
-  public function setItems($items)
-  {
-    $this->items = $items;
-  }
-  public function getItems()
-  {
-    return $this->items;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setNextPageToken($nextPageToken)
-  {
-    $this->nextPageToken = $nextPageToken;
-  }
-  public function getNextPageToken()
-  {
-    return $this->nextPageToken;
-  }
-  public function setSelfLink($selfLink)
-  {
-    $this->selfLink = $selfLink;
-  }
-  public function getSelfLink()
-  {
-    return $this->selfLink;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/InstanceMoveRequest.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/InstanceMoveRequest.php
deleted file mode 100644
index 31128eac..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/InstanceMoveRequest.php
+++ /dev/null
@@ -1,39 +0,0 @@
-destinationZone = $destinationZone;
-  }
-  public function getDestinationZone()
-  {
-    return $this->destinationZone;
-  }
-  public function setTargetInstance($targetInstance)
-  {
-    $this->targetInstance = $targetInstance;
-  }
-  public function getTargetInstance()
-  {
-    return $this->targetInstance;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/InstanceProperties.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/InstanceProperties.php
deleted file mode 100644
index 80c3bc30..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/InstanceProperties.php
+++ /dev/null
@@ -1,109 +0,0 @@
-canIpForward = $canIpForward;
-  }
-  public function getCanIpForward()
-  {
-    return $this->canIpForward;
-  }
-  public function setDescription($description)
-  {
-    $this->description = $description;
-  }
-  public function getDescription()
-  {
-    return $this->description;
-  }
-  public function setDisks($disks)
-  {
-    $this->disks = $disks;
-  }
-  public function getDisks()
-  {
-    return $this->disks;
-  }
-  public function setMachineType($machineType)
-  {
-    $this->machineType = $machineType;
-  }
-  public function getMachineType()
-  {
-    return $this->machineType;
-  }
-  public function setMetadata(Google_Service_Compute_Metadata $metadata)
-  {
-    $this->metadata = $metadata;
-  }
-  public function getMetadata()
-  {
-    return $this->metadata;
-  }
-  public function setNetworkInterfaces($networkInterfaces)
-  {
-    $this->networkInterfaces = $networkInterfaces;
-  }
-  public function getNetworkInterfaces()
-  {
-    return $this->networkInterfaces;
-  }
-  public function setScheduling(Google_Service_Compute_Scheduling $scheduling)
-  {
-    $this->scheduling = $scheduling;
-  }
-  public function getScheduling()
-  {
-    return $this->scheduling;
-  }
-  public function setServiceAccounts($serviceAccounts)
-  {
-    $this->serviceAccounts = $serviceAccounts;
-  }
-  public function getServiceAccounts()
-  {
-    return $this->serviceAccounts;
-  }
-  public function setTags(Google_Service_Compute_Tags $tags)
-  {
-    $this->tags = $tags;
-  }
-  public function getTags()
-  {
-    return $this->tags;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/InstanceReference.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/InstanceReference.php
deleted file mode 100644
index 76f5da37..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/InstanceReference.php
+++ /dev/null
@@ -1,30 +0,0 @@
-instance = $instance;
-  }
-  public function getInstance()
-  {
-    return $this->instance;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/InstanceTemplate.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/InstanceTemplate.php
deleted file mode 100644
index 5a251d31..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/InstanceTemplate.php
+++ /dev/null
@@ -1,85 +0,0 @@
-creationTimestamp = $creationTimestamp;
-  }
-  public function getCreationTimestamp()
-  {
-    return $this->creationTimestamp;
-  }
-  public function setDescription($description)
-  {
-    $this->description = $description;
-  }
-  public function getDescription()
-  {
-    return $this->description;
-  }
-  public function setId($id)
-  {
-    $this->id = $id;
-  }
-  public function getId()
-  {
-    return $this->id;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setName($name)
-  {
-    $this->name = $name;
-  }
-  public function getName()
-  {
-    return $this->name;
-  }
-  public function setProperties(Google_Service_Compute_InstanceProperties $properties)
-  {
-    $this->properties = $properties;
-  }
-  public function getProperties()
-  {
-    return $this->properties;
-  }
-  public function setSelfLink($selfLink)
-  {
-    $this->selfLink = $selfLink;
-  }
-  public function getSelfLink()
-  {
-    return $this->selfLink;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/InstanceTemplateList.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/InstanceTemplateList.php
deleted file mode 100644
index 3b001023..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/InstanceTemplateList.php
+++ /dev/null
@@ -1,68 +0,0 @@
-id = $id;
-  }
-  public function getId()
-  {
-    return $this->id;
-  }
-  public function setItems($items)
-  {
-    $this->items = $items;
-  }
-  public function getItems()
-  {
-    return $this->items;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setNextPageToken($nextPageToken)
-  {
-    $this->nextPageToken = $nextPageToken;
-  }
-  public function getNextPageToken()
-  {
-    return $this->nextPageToken;
-  }
-  public function setSelfLink($selfLink)
-  {
-    $this->selfLink = $selfLink;
-  }
-  public function getSelfLink()
-  {
-    return $this->selfLink;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/InstanceWithNamedPorts.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/InstanceWithNamedPorts.php
deleted file mode 100644
index f7d57487..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/InstanceWithNamedPorts.php
+++ /dev/null
@@ -1,50 +0,0 @@
-instance = $instance;
-  }
-  public function getInstance()
-  {
-    return $this->instance;
-  }
-  public function setNamedPorts($namedPorts)
-  {
-    $this->namedPorts = $namedPorts;
-  }
-  public function getNamedPorts()
-  {
-    return $this->namedPorts;
-  }
-  public function setStatus($status)
-  {
-    $this->status = $status;
-  }
-  public function getStatus()
-  {
-    return $this->status;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/InstancesScopedList.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/InstancesScopedList.php
deleted file mode 100644
index 54aadd51..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/InstancesScopedList.php
+++ /dev/null
@@ -1,42 +0,0 @@
-instances = $instances;
-  }
-  public function getInstances()
-  {
-    return $this->instances;
-  }
-  public function setWarning(Google_Service_Compute_InstancesScopedListWarning $warning)
-  {
-    $this->warning = $warning;
-  }
-  public function getWarning()
-  {
-    return $this->warning;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/InstancesScopedListWarning.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/InstancesScopedListWarning.php
deleted file mode 100644
index 13901e5d..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/InstancesScopedListWarning.php
+++ /dev/null
@@ -1,50 +0,0 @@
-code = $code;
-  }
-  public function getCode()
-  {
-    return $this->code;
-  }
-  public function setData($data)
-  {
-    $this->data = $data;
-  }
-  public function getData()
-  {
-    return $this->data;
-  }
-  public function setMessage($message)
-  {
-    $this->message = $message;
-  }
-  public function getMessage()
-  {
-    return $this->message;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/InstancesScopedListWarningData.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/InstancesScopedListWarningData.php
deleted file mode 100644
index 26d37b6c..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/InstancesScopedListWarningData.php
+++ /dev/null
@@ -1,39 +0,0 @@
-key = $key;
-  }
-  public function getKey()
-  {
-    return $this->key;
-  }
-  public function setValue($value)
-  {
-    $this->value = $value;
-  }
-  public function getValue()
-  {
-    return $this->value;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/InstancesSetMachineTypeRequest.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/InstancesSetMachineTypeRequest.php
deleted file mode 100644
index 236b546d..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/InstancesSetMachineTypeRequest.php
+++ /dev/null
@@ -1,30 +0,0 @@
-machineType = $machineType;
-  }
-  public function getMachineType()
-  {
-    return $this->machineType;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/InstancesSetServiceAccountRequest.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/InstancesSetServiceAccountRequest.php
deleted file mode 100644
index 47d01e54..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/InstancesSetServiceAccountRequest.php
+++ /dev/null
@@ -1,40 +0,0 @@
-email = $email;
-  }
-  public function getEmail()
-  {
-    return $this->email;
-  }
-  public function setScopes($scopes)
-  {
-    $this->scopes = $scopes;
-  }
-  public function getScopes()
-  {
-    return $this->scopes;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/InstancesStartWithEncryptionKeyRequest.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/InstancesStartWithEncryptionKeyRequest.php
deleted file mode 100644
index 74908607..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/InstancesStartWithEncryptionKeyRequest.php
+++ /dev/null
@@ -1,32 +0,0 @@
-disks = $disks;
-  }
-  public function getDisks()
-  {
-    return $this->disks;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/License.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/License.php
deleted file mode 100644
index c118c70d..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/License.php
+++ /dev/null
@@ -1,57 +0,0 @@
-chargesUseFee = $chargesUseFee;
-  }
-  public function getChargesUseFee()
-  {
-    return $this->chargesUseFee;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setName($name)
-  {
-    $this->name = $name;
-  }
-  public function getName()
-  {
-    return $this->name;
-  }
-  public function setSelfLink($selfLink)
-  {
-    $this->selfLink = $selfLink;
-  }
-  public function getSelfLink()
-  {
-    return $this->selfLink;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/MachineType.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/MachineType.php
deleted file mode 100644
index bd6c6074..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/MachineType.php
+++ /dev/null
@@ -1,159 +0,0 @@
-creationTimestamp = $creationTimestamp;
-  }
-  public function getCreationTimestamp()
-  {
-    return $this->creationTimestamp;
-  }
-  public function setDeprecated(Google_Service_Compute_DeprecationStatus $deprecated)
-  {
-    $this->deprecated = $deprecated;
-  }
-  public function getDeprecated()
-  {
-    return $this->deprecated;
-  }
-  public function setDescription($description)
-  {
-    $this->description = $description;
-  }
-  public function getDescription()
-  {
-    return $this->description;
-  }
-  public function setGuestCpus($guestCpus)
-  {
-    $this->guestCpus = $guestCpus;
-  }
-  public function getGuestCpus()
-  {
-    return $this->guestCpus;
-  }
-  public function setId($id)
-  {
-    $this->id = $id;
-  }
-  public function getId()
-  {
-    return $this->id;
-  }
-  public function setImageSpaceGb($imageSpaceGb)
-  {
-    $this->imageSpaceGb = $imageSpaceGb;
-  }
-  public function getImageSpaceGb()
-  {
-    return $this->imageSpaceGb;
-  }
-  public function setIsSharedCpu($isSharedCpu)
-  {
-    $this->isSharedCpu = $isSharedCpu;
-  }
-  public function getIsSharedCpu()
-  {
-    return $this->isSharedCpu;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setMaximumPersistentDisks($maximumPersistentDisks)
-  {
-    $this->maximumPersistentDisks = $maximumPersistentDisks;
-  }
-  public function getMaximumPersistentDisks()
-  {
-    return $this->maximumPersistentDisks;
-  }
-  public function setMaximumPersistentDisksSizeGb($maximumPersistentDisksSizeGb)
-  {
-    $this->maximumPersistentDisksSizeGb = $maximumPersistentDisksSizeGb;
-  }
-  public function getMaximumPersistentDisksSizeGb()
-  {
-    return $this->maximumPersistentDisksSizeGb;
-  }
-  public function setMemoryMb($memoryMb)
-  {
-    $this->memoryMb = $memoryMb;
-  }
-  public function getMemoryMb()
-  {
-    return $this->memoryMb;
-  }
-  public function setName($name)
-  {
-    $this->name = $name;
-  }
-  public function getName()
-  {
-    return $this->name;
-  }
-  public function setScratchDisks($scratchDisks)
-  {
-    $this->scratchDisks = $scratchDisks;
-  }
-  public function getScratchDisks()
-  {
-    return $this->scratchDisks;
-  }
-  public function setSelfLink($selfLink)
-  {
-    $this->selfLink = $selfLink;
-  }
-  public function getSelfLink()
-  {
-    return $this->selfLink;
-  }
-  public function setZone($zone)
-  {
-    $this->zone = $zone;
-  }
-  public function getZone()
-  {
-    return $this->zone;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/MachineTypeAggregatedList.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/MachineTypeAggregatedList.php
deleted file mode 100644
index 7797003a..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/MachineTypeAggregatedList.php
+++ /dev/null
@@ -1,67 +0,0 @@
-id = $id;
-  }
-  public function getId()
-  {
-    return $this->id;
-  }
-  public function setItems($items)
-  {
-    $this->items = $items;
-  }
-  public function getItems()
-  {
-    return $this->items;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setNextPageToken($nextPageToken)
-  {
-    $this->nextPageToken = $nextPageToken;
-  }
-  public function getNextPageToken()
-  {
-    return $this->nextPageToken;
-  }
-  public function setSelfLink($selfLink)
-  {
-    $this->selfLink = $selfLink;
-  }
-  public function getSelfLink()
-  {
-    return $this->selfLink;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/MachineTypeList.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/MachineTypeList.php
deleted file mode 100644
index 318bc1c3..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/MachineTypeList.php
+++ /dev/null
@@ -1,68 +0,0 @@
-id = $id;
-  }
-  public function getId()
-  {
-    return $this->id;
-  }
-  public function setItems($items)
-  {
-    $this->items = $items;
-  }
-  public function getItems()
-  {
-    return $this->items;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setNextPageToken($nextPageToken)
-  {
-    $this->nextPageToken = $nextPageToken;
-  }
-  public function getNextPageToken()
-  {
-    return $this->nextPageToken;
-  }
-  public function setSelfLink($selfLink)
-  {
-    $this->selfLink = $selfLink;
-  }
-  public function getSelfLink()
-  {
-    return $this->selfLink;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/MachineTypeScratchDisks.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/MachineTypeScratchDisks.php
deleted file mode 100644
index cb288a4e..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/MachineTypeScratchDisks.php
+++ /dev/null
@@ -1,30 +0,0 @@
-diskGb = $diskGb;
-  }
-  public function getDiskGb()
-  {
-    return $this->diskGb;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/MachineTypesScopedList.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/MachineTypesScopedList.php
deleted file mode 100644
index 9837344a..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/MachineTypesScopedList.php
+++ /dev/null
@@ -1,42 +0,0 @@
-machineTypes = $machineTypes;
-  }
-  public function getMachineTypes()
-  {
-    return $this->machineTypes;
-  }
-  public function setWarning(Google_Service_Compute_MachineTypesScopedListWarning $warning)
-  {
-    $this->warning = $warning;
-  }
-  public function getWarning()
-  {
-    return $this->warning;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/MachineTypesScopedListWarning.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/MachineTypesScopedListWarning.php
deleted file mode 100644
index a388962b..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/MachineTypesScopedListWarning.php
+++ /dev/null
@@ -1,50 +0,0 @@
-code = $code;
-  }
-  public function getCode()
-  {
-    return $this->code;
-  }
-  public function setData($data)
-  {
-    $this->data = $data;
-  }
-  public function getData()
-  {
-    return $this->data;
-  }
-  public function setMessage($message)
-  {
-    $this->message = $message;
-  }
-  public function getMessage()
-  {
-    return $this->message;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/MachineTypesScopedListWarningData.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/MachineTypesScopedListWarningData.php
deleted file mode 100644
index bfc4bbd6..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/MachineTypesScopedListWarningData.php
+++ /dev/null
@@ -1,39 +0,0 @@
-key = $key;
-  }
-  public function getKey()
-  {
-    return $this->key;
-  }
-  public function setValue($value)
-  {
-    $this->value = $value;
-  }
-  public function getValue()
-  {
-    return $this->value;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/ManagedInstance.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/ManagedInstance.php
deleted file mode 100644
index d4185edc..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/ManagedInstance.php
+++ /dev/null
@@ -1,67 +0,0 @@
-currentAction = $currentAction;
-  }
-  public function getCurrentAction()
-  {
-    return $this->currentAction;
-  }
-  public function setId($id)
-  {
-    $this->id = $id;
-  }
-  public function getId()
-  {
-    return $this->id;
-  }
-  public function setInstance($instance)
-  {
-    $this->instance = $instance;
-  }
-  public function getInstance()
-  {
-    return $this->instance;
-  }
-  public function setInstanceStatus($instanceStatus)
-  {
-    $this->instanceStatus = $instanceStatus;
-  }
-  public function getInstanceStatus()
-  {
-    return $this->instanceStatus;
-  }
-  public function setLastAttempt(Google_Service_Compute_ManagedInstanceLastAttempt $lastAttempt)
-  {
-    $this->lastAttempt = $lastAttempt;
-  }
-  public function getLastAttempt()
-  {
-    return $this->lastAttempt;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/ManagedInstanceLastAttempt.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/ManagedInstanceLastAttempt.php
deleted file mode 100644
index 659d6477..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/ManagedInstanceLastAttempt.php
+++ /dev/null
@@ -1,31 +0,0 @@
-errors = $errors;
-  }
-  public function getErrors()
-  {
-    return $this->errors;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/ManagedInstanceLastAttemptErrors.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/ManagedInstanceLastAttemptErrors.php
deleted file mode 100644
index 52b1f880..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/ManagedInstanceLastAttemptErrors.php
+++ /dev/null
@@ -1,32 +0,0 @@
-errors = $errors;
-  }
-  public function getErrors()
-  {
-    return $this->errors;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/ManagedInstanceLastAttemptErrorsErrors.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/ManagedInstanceLastAttemptErrorsErrors.php
deleted file mode 100644
index cba3b4e4..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/ManagedInstanceLastAttemptErrorsErrors.php
+++ /dev/null
@@ -1,48 +0,0 @@
-code = $code;
-  }
-  public function getCode()
-  {
-    return $this->code;
-  }
-  public function setLocation($location)
-  {
-    $this->location = $location;
-  }
-  public function getLocation()
-  {
-    return $this->location;
-  }
-  public function setMessage($message)
-  {
-    $this->message = $message;
-  }
-  public function getMessage()
-  {
-    return $this->message;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/Metadata.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/Metadata.php
deleted file mode 100644
index f35c3842..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/Metadata.php
+++ /dev/null
@@ -1,50 +0,0 @@
-fingerprint = $fingerprint;
-  }
-  public function getFingerprint()
-  {
-    return $this->fingerprint;
-  }
-  public function setItems($items)
-  {
-    $this->items = $items;
-  }
-  public function getItems()
-  {
-    return $this->items;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/MetadataItems.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/MetadataItems.php
deleted file mode 100644
index f0244b54..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/MetadataItems.php
+++ /dev/null
@@ -1,39 +0,0 @@
-key = $key;
-  }
-  public function getKey()
-  {
-    return $this->key;
-  }
-  public function setValue($value)
-  {
-    $this->value = $value;
-  }
-  public function getValue()
-  {
-    return $this->value;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/NamedPort.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/NamedPort.php
deleted file mode 100644
index d654f378..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/NamedPort.php
+++ /dev/null
@@ -1,39 +0,0 @@
-name = $name;
-  }
-  public function getName()
-  {
-    return $this->name;
-  }
-  public function setPort($port)
-  {
-    $this->port = $port;
-  }
-  public function getPort()
-  {
-    return $this->port;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/Network.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/Network.php
deleted file mode 100644
index c8b3a1ac..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/Network.php
+++ /dev/null
@@ -1,115 +0,0 @@
- "IPv4Range",
-  );
-  public $iPv4Range;
-  public $autoCreateSubnetworks;
-  public $creationTimestamp;
-  public $description;
-  public $gatewayIPv4;
-  public $id;
-  public $kind;
-  public $name;
-  public $selfLink;
-  public $subnetworks;
-
-  public function setIPv4Range($iPv4Range)
-  {
-    $this->iPv4Range = $iPv4Range;
-  }
-  public function getIPv4Range()
-  {
-    return $this->iPv4Range;
-  }
-  public function setAutoCreateSubnetworks($autoCreateSubnetworks)
-  {
-    $this->autoCreateSubnetworks = $autoCreateSubnetworks;
-  }
-  public function getAutoCreateSubnetworks()
-  {
-    return $this->autoCreateSubnetworks;
-  }
-  public function setCreationTimestamp($creationTimestamp)
-  {
-    $this->creationTimestamp = $creationTimestamp;
-  }
-  public function getCreationTimestamp()
-  {
-    return $this->creationTimestamp;
-  }
-  public function setDescription($description)
-  {
-    $this->description = $description;
-  }
-  public function getDescription()
-  {
-    return $this->description;
-  }
-  public function setGatewayIPv4($gatewayIPv4)
-  {
-    $this->gatewayIPv4 = $gatewayIPv4;
-  }
-  public function getGatewayIPv4()
-  {
-    return $this->gatewayIPv4;
-  }
-  public function setId($id)
-  {
-    $this->id = $id;
-  }
-  public function getId()
-  {
-    return $this->id;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setName($name)
-  {
-    $this->name = $name;
-  }
-  public function getName()
-  {
-    return $this->name;
-  }
-  public function setSelfLink($selfLink)
-  {
-    $this->selfLink = $selfLink;
-  }
-  public function getSelfLink()
-  {
-    return $this->selfLink;
-  }
-  public function setSubnetworks($subnetworks)
-  {
-    $this->subnetworks = $subnetworks;
-  }
-  public function getSubnetworks()
-  {
-    return $this->subnetworks;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/NetworkInterface.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/NetworkInterface.php
deleted file mode 100644
index 52529961..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/NetworkInterface.php
+++ /dev/null
@@ -1,77 +0,0 @@
-accessConfigs = $accessConfigs;
-  }
-  public function getAccessConfigs()
-  {
-    return $this->accessConfigs;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setName($name)
-  {
-    $this->name = $name;
-  }
-  public function getName()
-  {
-    return $this->name;
-  }
-  public function setNetwork($network)
-  {
-    $this->network = $network;
-  }
-  public function getNetwork()
-  {
-    return $this->network;
-  }
-  public function setNetworkIP($networkIP)
-  {
-    $this->networkIP = $networkIP;
-  }
-  public function getNetworkIP()
-  {
-    return $this->networkIP;
-  }
-  public function setSubnetwork($subnetwork)
-  {
-    $this->subnetwork = $subnetwork;
-  }
-  public function getSubnetwork()
-  {
-    return $this->subnetwork;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/NetworkList.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/NetworkList.php
deleted file mode 100644
index a1b084e7..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/NetworkList.php
+++ /dev/null
@@ -1,68 +0,0 @@
-id = $id;
-  }
-  public function getId()
-  {
-    return $this->id;
-  }
-  public function setItems($items)
-  {
-    $this->items = $items;
-  }
-  public function getItems()
-  {
-    return $this->items;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setNextPageToken($nextPageToken)
-  {
-    $this->nextPageToken = $nextPageToken;
-  }
-  public function getNextPageToken()
-  {
-    return $this->nextPageToken;
-  }
-  public function setSelfLink($selfLink)
-  {
-    $this->selfLink = $selfLink;
-  }
-  public function getSelfLink()
-  {
-    return $this->selfLink;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/Operation.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/Operation.php
deleted file mode 100644
index 977d65d2..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/Operation.php
+++ /dev/null
@@ -1,231 +0,0 @@
-clientOperationId = $clientOperationId;
-  }
-  public function getClientOperationId()
-  {
-    return $this->clientOperationId;
-  }
-  public function setCreationTimestamp($creationTimestamp)
-  {
-    $this->creationTimestamp = $creationTimestamp;
-  }
-  public function getCreationTimestamp()
-  {
-    return $this->creationTimestamp;
-  }
-  public function setDescription($description)
-  {
-    $this->description = $description;
-  }
-  public function getDescription()
-  {
-    return $this->description;
-  }
-  public function setEndTime($endTime)
-  {
-    $this->endTime = $endTime;
-  }
-  public function getEndTime()
-  {
-    return $this->endTime;
-  }
-  public function setError(Google_Service_Compute_OperationError $error)
-  {
-    $this->error = $error;
-  }
-  public function getError()
-  {
-    return $this->error;
-  }
-  public function setHttpErrorMessage($httpErrorMessage)
-  {
-    $this->httpErrorMessage = $httpErrorMessage;
-  }
-  public function getHttpErrorMessage()
-  {
-    return $this->httpErrorMessage;
-  }
-  public function setHttpErrorStatusCode($httpErrorStatusCode)
-  {
-    $this->httpErrorStatusCode = $httpErrorStatusCode;
-  }
-  public function getHttpErrorStatusCode()
-  {
-    return $this->httpErrorStatusCode;
-  }
-  public function setId($id)
-  {
-    $this->id = $id;
-  }
-  public function getId()
-  {
-    return $this->id;
-  }
-  public function setInsertTime($insertTime)
-  {
-    $this->insertTime = $insertTime;
-  }
-  public function getInsertTime()
-  {
-    return $this->insertTime;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setName($name)
-  {
-    $this->name = $name;
-  }
-  public function getName()
-  {
-    return $this->name;
-  }
-  public function setOperationType($operationType)
-  {
-    $this->operationType = $operationType;
-  }
-  public function getOperationType()
-  {
-    return $this->operationType;
-  }
-  public function setProgress($progress)
-  {
-    $this->progress = $progress;
-  }
-  public function getProgress()
-  {
-    return $this->progress;
-  }
-  public function setRegion($region)
-  {
-    $this->region = $region;
-  }
-  public function getRegion()
-  {
-    return $this->region;
-  }
-  public function setSelfLink($selfLink)
-  {
-    $this->selfLink = $selfLink;
-  }
-  public function getSelfLink()
-  {
-    return $this->selfLink;
-  }
-  public function setStartTime($startTime)
-  {
-    $this->startTime = $startTime;
-  }
-  public function getStartTime()
-  {
-    return $this->startTime;
-  }
-  public function setStatus($status)
-  {
-    $this->status = $status;
-  }
-  public function getStatus()
-  {
-    return $this->status;
-  }
-  public function setStatusMessage($statusMessage)
-  {
-    $this->statusMessage = $statusMessage;
-  }
-  public function getStatusMessage()
-  {
-    return $this->statusMessage;
-  }
-  public function setTargetId($targetId)
-  {
-    $this->targetId = $targetId;
-  }
-  public function getTargetId()
-  {
-    return $this->targetId;
-  }
-  public function setTargetLink($targetLink)
-  {
-    $this->targetLink = $targetLink;
-  }
-  public function getTargetLink()
-  {
-    return $this->targetLink;
-  }
-  public function setUser($user)
-  {
-    $this->user = $user;
-  }
-  public function getUser()
-  {
-    return $this->user;
-  }
-  public function setWarnings($warnings)
-  {
-    $this->warnings = $warnings;
-  }
-  public function getWarnings()
-  {
-    return $this->warnings;
-  }
-  public function setZone($zone)
-  {
-    $this->zone = $zone;
-  }
-  public function getZone()
-  {
-    return $this->zone;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/OperationAggregatedList.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/OperationAggregatedList.php
deleted file mode 100644
index fac3ad79..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/OperationAggregatedList.php
+++ /dev/null
@@ -1,67 +0,0 @@
-id = $id;
-  }
-  public function getId()
-  {
-    return $this->id;
-  }
-  public function setItems($items)
-  {
-    $this->items = $items;
-  }
-  public function getItems()
-  {
-    return $this->items;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setNextPageToken($nextPageToken)
-  {
-    $this->nextPageToken = $nextPageToken;
-  }
-  public function getNextPageToken()
-  {
-    return $this->nextPageToken;
-  }
-  public function setSelfLink($selfLink)
-  {
-    $this->selfLink = $selfLink;
-  }
-  public function getSelfLink()
-  {
-    return $this->selfLink;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/OperationError.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/OperationError.php
deleted file mode 100644
index 129e54f5..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/OperationError.php
+++ /dev/null
@@ -1,32 +0,0 @@
-errors = $errors;
-  }
-  public function getErrors()
-  {
-    return $this->errors;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/OperationErrorErrors.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/OperationErrorErrors.php
deleted file mode 100644
index f2d6343e..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/OperationErrorErrors.php
+++ /dev/null
@@ -1,48 +0,0 @@
-code = $code;
-  }
-  public function getCode()
-  {
-    return $this->code;
-  }
-  public function setLocation($location)
-  {
-    $this->location = $location;
-  }
-  public function getLocation()
-  {
-    return $this->location;
-  }
-  public function setMessage($message)
-  {
-    $this->message = $message;
-  }
-  public function getMessage()
-  {
-    return $this->message;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/OperationList.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/OperationList.php
deleted file mode 100644
index 464ee133..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/OperationList.php
+++ /dev/null
@@ -1,68 +0,0 @@
-id = $id;
-  }
-  public function getId()
-  {
-    return $this->id;
-  }
-  public function setItems($items)
-  {
-    $this->items = $items;
-  }
-  public function getItems()
-  {
-    return $this->items;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setNextPageToken($nextPageToken)
-  {
-    $this->nextPageToken = $nextPageToken;
-  }
-  public function getNextPageToken()
-  {
-    return $this->nextPageToken;
-  }
-  public function setSelfLink($selfLink)
-  {
-    $this->selfLink = $selfLink;
-  }
-  public function getSelfLink()
-  {
-    return $this->selfLink;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/OperationWarnings.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/OperationWarnings.php
deleted file mode 100644
index 0f926dc5..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/OperationWarnings.php
+++ /dev/null
@@ -1,50 +0,0 @@
-code = $code;
-  }
-  public function getCode()
-  {
-    return $this->code;
-  }
-  public function setData($data)
-  {
-    $this->data = $data;
-  }
-  public function getData()
-  {
-    return $this->data;
-  }
-  public function setMessage($message)
-  {
-    $this->message = $message;
-  }
-  public function getMessage()
-  {
-    return $this->message;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/OperationWarningsData.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/OperationWarningsData.php
deleted file mode 100644
index e780c0e3..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/OperationWarningsData.php
+++ /dev/null
@@ -1,39 +0,0 @@
-key = $key;
-  }
-  public function getKey()
-  {
-    return $this->key;
-  }
-  public function setValue($value)
-  {
-    $this->value = $value;
-  }
-  public function getValue()
-  {
-    return $this->value;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/OperationsScopedList.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/OperationsScopedList.php
deleted file mode 100644
index a20264ec..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/OperationsScopedList.php
+++ /dev/null
@@ -1,42 +0,0 @@
-operations = $operations;
-  }
-  public function getOperations()
-  {
-    return $this->operations;
-  }
-  public function setWarning(Google_Service_Compute_OperationsScopedListWarning $warning)
-  {
-    $this->warning = $warning;
-  }
-  public function getWarning()
-  {
-    return $this->warning;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/OperationsScopedListWarning.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/OperationsScopedListWarning.php
deleted file mode 100644
index e21b32ca..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/OperationsScopedListWarning.php
+++ /dev/null
@@ -1,50 +0,0 @@
-code = $code;
-  }
-  public function getCode()
-  {
-    return $this->code;
-  }
-  public function setData($data)
-  {
-    $this->data = $data;
-  }
-  public function getData()
-  {
-    return $this->data;
-  }
-  public function setMessage($message)
-  {
-    $this->message = $message;
-  }
-  public function getMessage()
-  {
-    return $this->message;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/OperationsScopedListWarningData.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/OperationsScopedListWarningData.php
deleted file mode 100644
index 5465df98..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/OperationsScopedListWarningData.php
+++ /dev/null
@@ -1,39 +0,0 @@
-key = $key;
-  }
-  public function getKey()
-  {
-    return $this->key;
-  }
-  public function setValue($value)
-  {
-    $this->value = $value;
-  }
-  public function getValue()
-  {
-    return $this->value;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/PathMatcher.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/PathMatcher.php
deleted file mode 100644
index 68589956..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/PathMatcher.php
+++ /dev/null
@@ -1,59 +0,0 @@
-defaultService = $defaultService;
-  }
-  public function getDefaultService()
-  {
-    return $this->defaultService;
-  }
-  public function setDescription($description)
-  {
-    $this->description = $description;
-  }
-  public function getDescription()
-  {
-    return $this->description;
-  }
-  public function setName($name)
-  {
-    $this->name = $name;
-  }
-  public function getName()
-  {
-    return $this->name;
-  }
-  public function setPathRules($pathRules)
-  {
-    $this->pathRules = $pathRules;
-  }
-  public function getPathRules()
-  {
-    return $this->pathRules;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/PathRule.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/PathRule.php
deleted file mode 100644
index 6e6f1a2b..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/PathRule.php
+++ /dev/null
@@ -1,40 +0,0 @@
-paths = $paths;
-  }
-  public function getPaths()
-  {
-    return $this->paths;
-  }
-  public function setService($service)
-  {
-    $this->service = $service;
-  }
-  public function getService()
-  {
-    return $this->service;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/Project.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/Project.php
deleted file mode 100644
index 2b287643..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/Project.php
+++ /dev/null
@@ -1,124 +0,0 @@
-commonInstanceMetadata = $commonInstanceMetadata;
-  }
-  public function getCommonInstanceMetadata()
-  {
-    return $this->commonInstanceMetadata;
-  }
-  public function setCreationTimestamp($creationTimestamp)
-  {
-    $this->creationTimestamp = $creationTimestamp;
-  }
-  public function getCreationTimestamp()
-  {
-    return $this->creationTimestamp;
-  }
-  public function setDefaultServiceAccount($defaultServiceAccount)
-  {
-    $this->defaultServiceAccount = $defaultServiceAccount;
-  }
-  public function getDefaultServiceAccount()
-  {
-    return $this->defaultServiceAccount;
-  }
-  public function setDescription($description)
-  {
-    $this->description = $description;
-  }
-  public function getDescription()
-  {
-    return $this->description;
-  }
-  public function setEnabledFeatures($enabledFeatures)
-  {
-    $this->enabledFeatures = $enabledFeatures;
-  }
-  public function getEnabledFeatures()
-  {
-    return $this->enabledFeatures;
-  }
-  public function setId($id)
-  {
-    $this->id = $id;
-  }
-  public function getId()
-  {
-    return $this->id;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setName($name)
-  {
-    $this->name = $name;
-  }
-  public function getName()
-  {
-    return $this->name;
-  }
-  public function setQuotas($quotas)
-  {
-    $this->quotas = $quotas;
-  }
-  public function getQuotas()
-  {
-    return $this->quotas;
-  }
-  public function setSelfLink($selfLink)
-  {
-    $this->selfLink = $selfLink;
-  }
-  public function getSelfLink()
-  {
-    return $this->selfLink;
-  }
-  public function setUsageExportLocation(Google_Service_Compute_UsageExportLocation $usageExportLocation)
-  {
-    $this->usageExportLocation = $usageExportLocation;
-  }
-  public function getUsageExportLocation()
-  {
-    return $this->usageExportLocation;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/Quota.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/Quota.php
deleted file mode 100644
index a1a30905..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/Quota.php
+++ /dev/null
@@ -1,48 +0,0 @@
-limit = $limit;
-  }
-  public function getLimit()
-  {
-    return $this->limit;
-  }
-  public function setMetric($metric)
-  {
-    $this->metric = $metric;
-  }
-  public function getMetric()
-  {
-    return $this->metric;
-  }
-  public function setUsage($usage)
-  {
-    $this->usage = $usage;
-  }
-  public function getUsage()
-  {
-    return $this->usage;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/Region.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/Region.php
deleted file mode 100644
index bd4fc843..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/Region.php
+++ /dev/null
@@ -1,114 +0,0 @@
-creationTimestamp = $creationTimestamp;
-  }
-  public function getCreationTimestamp()
-  {
-    return $this->creationTimestamp;
-  }
-  public function setDeprecated(Google_Service_Compute_DeprecationStatus $deprecated)
-  {
-    $this->deprecated = $deprecated;
-  }
-  public function getDeprecated()
-  {
-    return $this->deprecated;
-  }
-  public function setDescription($description)
-  {
-    $this->description = $description;
-  }
-  public function getDescription()
-  {
-    return $this->description;
-  }
-  public function setId($id)
-  {
-    $this->id = $id;
-  }
-  public function getId()
-  {
-    return $this->id;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setName($name)
-  {
-    $this->name = $name;
-  }
-  public function getName()
-  {
-    return $this->name;
-  }
-  public function setQuotas($quotas)
-  {
-    $this->quotas = $quotas;
-  }
-  public function getQuotas()
-  {
-    return $this->quotas;
-  }
-  public function setSelfLink($selfLink)
-  {
-    $this->selfLink = $selfLink;
-  }
-  public function getSelfLink()
-  {
-    return $this->selfLink;
-  }
-  public function setStatus($status)
-  {
-    $this->status = $status;
-  }
-  public function getStatus()
-  {
-    return $this->status;
-  }
-  public function setZones($zones)
-  {
-    $this->zones = $zones;
-  }
-  public function getZones()
-  {
-    return $this->zones;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/RegionAutoscalerList.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/RegionAutoscalerList.php
deleted file mode 100644
index 0cd5ad76..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/RegionAutoscalerList.php
+++ /dev/null
@@ -1,68 +0,0 @@
-id = $id;
-  }
-  public function getId()
-  {
-    return $this->id;
-  }
-  public function setItems($items)
-  {
-    $this->items = $items;
-  }
-  public function getItems()
-  {
-    return $this->items;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setNextPageToken($nextPageToken)
-  {
-    $this->nextPageToken = $nextPageToken;
-  }
-  public function getNextPageToken()
-  {
-    return $this->nextPageToken;
-  }
-  public function setSelfLink($selfLink)
-  {
-    $this->selfLink = $selfLink;
-  }
-  public function getSelfLink()
-  {
-    return $this->selfLink;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/RegionInstanceGroupList.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/RegionInstanceGroupList.php
deleted file mode 100644
index 69931641..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/RegionInstanceGroupList.php
+++ /dev/null
@@ -1,68 +0,0 @@
-id = $id;
-  }
-  public function getId()
-  {
-    return $this->id;
-  }
-  public function setItems($items)
-  {
-    $this->items = $items;
-  }
-  public function getItems()
-  {
-    return $this->items;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setNextPageToken($nextPageToken)
-  {
-    $this->nextPageToken = $nextPageToken;
-  }
-  public function getNextPageToken()
-  {
-    return $this->nextPageToken;
-  }
-  public function setSelfLink($selfLink)
-  {
-    $this->selfLink = $selfLink;
-  }
-  public function getSelfLink()
-  {
-    return $this->selfLink;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/RegionInstanceGroupManagerList.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/RegionInstanceGroupManagerList.php
deleted file mode 100644
index 6d0123bd..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/RegionInstanceGroupManagerList.php
+++ /dev/null
@@ -1,68 +0,0 @@
-id = $id;
-  }
-  public function getId()
-  {
-    return $this->id;
-  }
-  public function setItems($items)
-  {
-    $this->items = $items;
-  }
-  public function getItems()
-  {
-    return $this->items;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setNextPageToken($nextPageToken)
-  {
-    $this->nextPageToken = $nextPageToken;
-  }
-  public function getNextPageToken()
-  {
-    return $this->nextPageToken;
-  }
-  public function setSelfLink($selfLink)
-  {
-    $this->selfLink = $selfLink;
-  }
-  public function getSelfLink()
-  {
-    return $this->selfLink;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/RegionInstanceGroupManagersAbandonInstancesRequest.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/RegionInstanceGroupManagersAbandonInstancesRequest.php
deleted file mode 100644
index a6b34ae2..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/RegionInstanceGroupManagersAbandonInstancesRequest.php
+++ /dev/null
@@ -1,31 +0,0 @@
-instances = $instances;
-  }
-  public function getInstances()
-  {
-    return $this->instances;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/RegionInstanceGroupManagersDeleteInstancesRequest.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/RegionInstanceGroupManagersDeleteInstancesRequest.php
deleted file mode 100644
index c56fa201..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/RegionInstanceGroupManagersDeleteInstancesRequest.php
+++ /dev/null
@@ -1,31 +0,0 @@
-instances = $instances;
-  }
-  public function getInstances()
-  {
-    return $this->instances;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/RegionInstanceGroupManagersListInstancesResponse.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/RegionInstanceGroupManagersListInstancesResponse.php
deleted file mode 100644
index c8783a1c..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/RegionInstanceGroupManagersListInstancesResponse.php
+++ /dev/null
@@ -1,32 +0,0 @@
-managedInstances = $managedInstances;
-  }
-  public function getManagedInstances()
-  {
-    return $this->managedInstances;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/RegionInstanceGroupManagersRecreateRequest.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/RegionInstanceGroupManagersRecreateRequest.php
deleted file mode 100644
index 9be7b4e0..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/RegionInstanceGroupManagersRecreateRequest.php
+++ /dev/null
@@ -1,31 +0,0 @@
-instances = $instances;
-  }
-  public function getInstances()
-  {
-    return $this->instances;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/RegionInstanceGroupManagersSetTargetPoolsRequest.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/RegionInstanceGroupManagersSetTargetPoolsRequest.php
deleted file mode 100644
index fcd97d18..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/RegionInstanceGroupManagersSetTargetPoolsRequest.php
+++ /dev/null
@@ -1,40 +0,0 @@
-fingerprint = $fingerprint;
-  }
-  public function getFingerprint()
-  {
-    return $this->fingerprint;
-  }
-  public function setTargetPools($targetPools)
-  {
-    $this->targetPools = $targetPools;
-  }
-  public function getTargetPools()
-  {
-    return $this->targetPools;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/RegionInstanceGroupManagersSetTemplateRequest.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/RegionInstanceGroupManagersSetTemplateRequest.php
deleted file mode 100644
index 1aeebcd0..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/RegionInstanceGroupManagersSetTemplateRequest.php
+++ /dev/null
@@ -1,30 +0,0 @@
-instanceTemplate = $instanceTemplate;
-  }
-  public function getInstanceTemplate()
-  {
-    return $this->instanceTemplate;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/RegionInstanceGroupsListInstances.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/RegionInstanceGroupsListInstances.php
deleted file mode 100644
index 739d2e27..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/RegionInstanceGroupsListInstances.php
+++ /dev/null
@@ -1,68 +0,0 @@
-id = $id;
-  }
-  public function getId()
-  {
-    return $this->id;
-  }
-  public function setItems($items)
-  {
-    $this->items = $items;
-  }
-  public function getItems()
-  {
-    return $this->items;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setNextPageToken($nextPageToken)
-  {
-    $this->nextPageToken = $nextPageToken;
-  }
-  public function getNextPageToken()
-  {
-    return $this->nextPageToken;
-  }
-  public function setSelfLink($selfLink)
-  {
-    $this->selfLink = $selfLink;
-  }
-  public function getSelfLink()
-  {
-    return $this->selfLink;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/RegionInstanceGroupsListInstancesRequest.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/RegionInstanceGroupsListInstancesRequest.php
deleted file mode 100644
index faecfb8b..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/RegionInstanceGroupsListInstancesRequest.php
+++ /dev/null
@@ -1,39 +0,0 @@
-instanceState = $instanceState;
-  }
-  public function getInstanceState()
-  {
-    return $this->instanceState;
-  }
-  public function setPortName($portName)
-  {
-    $this->portName = $portName;
-  }
-  public function getPortName()
-  {
-    return $this->portName;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/RegionInstanceGroupsSetNamedPortsRequest.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/RegionInstanceGroupsSetNamedPortsRequest.php
deleted file mode 100644
index e5ec1b7b..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/RegionInstanceGroupsSetNamedPortsRequest.php
+++ /dev/null
@@ -1,41 +0,0 @@
-fingerprint = $fingerprint;
-  }
-  public function getFingerprint()
-  {
-    return $this->fingerprint;
-  }
-  public function setNamedPorts($namedPorts)
-  {
-    $this->namedPorts = $namedPorts;
-  }
-  public function getNamedPorts()
-  {
-    return $this->namedPorts;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/RegionList.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/RegionList.php
deleted file mode 100644
index 630c76b8..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/RegionList.php
+++ /dev/null
@@ -1,68 +0,0 @@
-id = $id;
-  }
-  public function getId()
-  {
-    return $this->id;
-  }
-  public function setItems($items)
-  {
-    $this->items = $items;
-  }
-  public function getItems()
-  {
-    return $this->items;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setNextPageToken($nextPageToken)
-  {
-    $this->nextPageToken = $nextPageToken;
-  }
-  public function getNextPageToken()
-  {
-    return $this->nextPageToken;
-  }
-  public function setSelfLink($selfLink)
-  {
-    $this->selfLink = $selfLink;
-  }
-  public function getSelfLink()
-  {
-    return $this->selfLink;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/Resource/Addresses.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/Resource/Addresses.php
deleted file mode 100644
index 20769450..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/Resource/Addresses.php
+++ /dev/null
@@ -1,188 +0,0 @@
-
- *   $computeService = new Google_Service_Compute(...);
- *   $addresses = $computeService->addresses;
- *  
- */
-class Google_Service_Compute_Resource_Addresses extends Google_Service_Resource
-{
-  /**
-   * Retrieves an aggregated list of addresses. (addresses.aggregatedList)
-   *
-   * @param string $project Project ID for this request.
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param string filter Sets a filter expression for filtering listed
-   * resources, in the form filter={expression}. Your {expression} must be in the
-   * format: field_name comparison_string literal_string.
-   *
-   * The field_name is the name of the field you want to compare. Only atomic
-   * field types are supported (string, number, boolean). The comparison_string
-   * must be either eq (equals) or ne (not equals). The literal_string is the
-   * string value to filter to. The literal value must be valid for the type of
-   * field you are filtering by (string, number, boolean). For string fields, the
-   * literal value is interpreted as a regular expression using RE2 syntax. The
-   * literal value must match the entire field.
-   *
-   * For example, to filter for instances that do not have a name of example-
-   * instance, you would use filter=name ne example-instance.
-   *
-   * You can filter on nested fields. For example, you could filter on instances
-   * that have set the scheduling.automaticRestart field to true. Use filtering on
-   * nested fields to take advantage of labels to organize and search for results
-   * based on label values.
-   *
-   * To filter on multiple expressions, provide each separate expression within
-   * parentheses. For example, (scheduling.automaticRestart eq true) (zone eq us-
-   * central1-f). Multiple expressions are treated as AND expressions, meaning
-   * that resources must match all expressions to pass the filters.
-   * @opt_param string maxResults The maximum number of results per page that
-   * should be returned. If the number of available results is larger than
-   * maxResults, Compute Engine returns a nextPageToken that can be used to get
-   * the next page of results in subsequent list requests. Acceptable values are 0
-   * to 500, inclusive. (Default: 500)
-   * @opt_param string orderBy Sorts list results by a certain order. By default,
-   * results are returned in alphanumerical order based on the resource name.
-   *
-   * You can also sort results in descending order based on the creation timestamp
-   * using orderBy="creationTimestamp desc". This sorts results based on the
-   * creationTimestamp field in reverse chronological order (newest result first).
-   * Use this to sort resources like operations so that the newest operation is
-   * returned first.
-   *
-   * Currently, only sorting by name or creationTimestamp desc is supported.
-   * @opt_param string pageToken Specifies a page token to use. Set pageToken to
-   * the nextPageToken returned by a previous list request to get the next page of
-   * results.
-   * @return Google_Service_Compute_AddressAggregatedList
-   */
-  public function aggregatedList($project, $optParams = array())
-  {
-    $params = array('project' => $project);
-    $params = array_merge($params, $optParams);
-    return $this->call('aggregatedList', array($params), "Google_Service_Compute_AddressAggregatedList");
-  }
-  /**
-   * Deletes the specified address resource. (addresses.delete)
-   *
-   * @param string $project Project ID for this request.
-   * @param string $region Name of the region for this request.
-   * @param string $address Name of the address resource to delete.
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Compute_Operation
-   */
-  public function delete($project, $region, $address, $optParams = array())
-  {
-    $params = array('project' => $project, 'region' => $region, 'address' => $address);
-    $params = array_merge($params, $optParams);
-    return $this->call('delete', array($params), "Google_Service_Compute_Operation");
-  }
-  /**
-   * Returns the specified address resource. (addresses.get)
-   *
-   * @param string $project Project ID for this request.
-   * @param string $region Name of the region for this request.
-   * @param string $address Name of the address resource to return.
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Compute_Address
-   */
-  public function get($project, $region, $address, $optParams = array())
-  {
-    $params = array('project' => $project, 'region' => $region, 'address' => $address);
-    $params = array_merge($params, $optParams);
-    return $this->call('get', array($params), "Google_Service_Compute_Address");
-  }
-  /**
-   * Creates an address resource in the specified project using the data included
-   * in the request. (addresses.insert)
-   *
-   * @param string $project Project ID for this request.
-   * @param string $region Name of the region for this request.
-   * @param Google_Service_Compute_Address $postBody
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Compute_Operation
-   */
-  public function insert($project, $region, Google_Service_Compute_Address $postBody, $optParams = array())
-  {
-    $params = array('project' => $project, 'region' => $region, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('insert', array($params), "Google_Service_Compute_Operation");
-  }
-  /**
-   * Retrieves a list of addresses contained within the specified region.
-   * (addresses.listAddresses)
-   *
-   * @param string $project Project ID for this request.
-   * @param string $region Name of the region for this request.
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param string filter Sets a filter expression for filtering listed
-   * resources, in the form filter={expression}. Your {expression} must be in the
-   * format: field_name comparison_string literal_string.
-   *
-   * The field_name is the name of the field you want to compare. Only atomic
-   * field types are supported (string, number, boolean). The comparison_string
-   * must be either eq (equals) or ne (not equals). The literal_string is the
-   * string value to filter to. The literal value must be valid for the type of
-   * field you are filtering by (string, number, boolean). For string fields, the
-   * literal value is interpreted as a regular expression using RE2 syntax. The
-   * literal value must match the entire field.
-   *
-   * For example, to filter for instances that do not have a name of example-
-   * instance, you would use filter=name ne example-instance.
-   *
-   * You can filter on nested fields. For example, you could filter on instances
-   * that have set the scheduling.automaticRestart field to true. Use filtering on
-   * nested fields to take advantage of labels to organize and search for results
-   * based on label values.
-   *
-   * To filter on multiple expressions, provide each separate expression within
-   * parentheses. For example, (scheduling.automaticRestart eq true) (zone eq us-
-   * central1-f). Multiple expressions are treated as AND expressions, meaning
-   * that resources must match all expressions to pass the filters.
-   * @opt_param string maxResults The maximum number of results per page that
-   * should be returned. If the number of available results is larger than
-   * maxResults, Compute Engine returns a nextPageToken that can be used to get
-   * the next page of results in subsequent list requests. Acceptable values are 0
-   * to 500, inclusive. (Default: 500)
-   * @opt_param string orderBy Sorts list results by a certain order. By default,
-   * results are returned in alphanumerical order based on the resource name.
-   *
-   * You can also sort results in descending order based on the creation timestamp
-   * using orderBy="creationTimestamp desc". This sorts results based on the
-   * creationTimestamp field in reverse chronological order (newest result first).
-   * Use this to sort resources like operations so that the newest operation is
-   * returned first.
-   *
-   * Currently, only sorting by name or creationTimestamp desc is supported.
-   * @opt_param string pageToken Specifies a page token to use. Set pageToken to
-   * the nextPageToken returned by a previous list request to get the next page of
-   * results.
-   * @return Google_Service_Compute_AddressList
-   */
-  public function listAddresses($project, $region, $optParams = array())
-  {
-    $params = array('project' => $project, 'region' => $region);
-    $params = array_merge($params, $optParams);
-    return $this->call('list', array($params), "Google_Service_Compute_AddressList");
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/Resource/Autoscalers.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/Resource/Autoscalers.php
deleted file mode 100644
index c0084e0a..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/Resource/Autoscalers.php
+++ /dev/null
@@ -1,224 +0,0 @@
-
- *   $computeService = new Google_Service_Compute(...);
- *   $autoscalers = $computeService->autoscalers;
- *  
- */
-class Google_Service_Compute_Resource_Autoscalers extends Google_Service_Resource
-{
-  /**
-   * Retrieves an aggregated list of autoscalers. (autoscalers.aggregatedList)
-   *
-   * @param string $project Project ID for this request.
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param string filter Sets a filter expression for filtering listed
-   * resources, in the form filter={expression}. Your {expression} must be in the
-   * format: field_name comparison_string literal_string.
-   *
-   * The field_name is the name of the field you want to compare. Only atomic
-   * field types are supported (string, number, boolean). The comparison_string
-   * must be either eq (equals) or ne (not equals). The literal_string is the
-   * string value to filter to. The literal value must be valid for the type of
-   * field you are filtering by (string, number, boolean). For string fields, the
-   * literal value is interpreted as a regular expression using RE2 syntax. The
-   * literal value must match the entire field.
-   *
-   * For example, to filter for instances that do not have a name of example-
-   * instance, you would use filter=name ne example-instance.
-   *
-   * You can filter on nested fields. For example, you could filter on instances
-   * that have set the scheduling.automaticRestart field to true. Use filtering on
-   * nested fields to take advantage of labels to organize and search for results
-   * based on label values.
-   *
-   * To filter on multiple expressions, provide each separate expression within
-   * parentheses. For example, (scheduling.automaticRestart eq true) (zone eq us-
-   * central1-f). Multiple expressions are treated as AND expressions, meaning
-   * that resources must match all expressions to pass the filters.
-   * @opt_param string maxResults The maximum number of results per page that
-   * should be returned. If the number of available results is larger than
-   * maxResults, Compute Engine returns a nextPageToken that can be used to get
-   * the next page of results in subsequent list requests. Acceptable values are 0
-   * to 500, inclusive. (Default: 500)
-   * @opt_param string orderBy Sorts list results by a certain order. By default,
-   * results are returned in alphanumerical order based on the resource name.
-   *
-   * You can also sort results in descending order based on the creation timestamp
-   * using orderBy="creationTimestamp desc". This sorts results based on the
-   * creationTimestamp field in reverse chronological order (newest result first).
-   * Use this to sort resources like operations so that the newest operation is
-   * returned first.
-   *
-   * Currently, only sorting by name or creationTimestamp desc is supported.
-   * @opt_param string pageToken Specifies a page token to use. Set pageToken to
-   * the nextPageToken returned by a previous list request to get the next page of
-   * results.
-   * @return Google_Service_Compute_AutoscalerAggregatedList
-   */
-  public function aggregatedList($project, $optParams = array())
-  {
-    $params = array('project' => $project);
-    $params = array_merge($params, $optParams);
-    return $this->call('aggregatedList', array($params), "Google_Service_Compute_AutoscalerAggregatedList");
-  }
-  /**
-   * Deletes the specified autoscaler. (autoscalers.delete)
-   *
-   * @param string $project Project ID for this request.
-   * @param string $zone Name of the zone for this request.
-   * @param string $autoscaler Name of the autoscaler to delete.
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Compute_Operation
-   */
-  public function delete($project, $zone, $autoscaler, $optParams = array())
-  {
-    $params = array('project' => $project, 'zone' => $zone, 'autoscaler' => $autoscaler);
-    $params = array_merge($params, $optParams);
-    return $this->call('delete', array($params), "Google_Service_Compute_Operation");
-  }
-  /**
-   * Returns the specified autoscaler resource. Get a list of available
-   * autoscalers by making a list() request. (autoscalers.get)
-   *
-   * @param string $project Project ID for this request.
-   * @param string $zone Name of the zone for this request.
-   * @param string $autoscaler Name of the autoscaler to return.
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Compute_Autoscaler
-   */
-  public function get($project, $zone, $autoscaler, $optParams = array())
-  {
-    $params = array('project' => $project, 'zone' => $zone, 'autoscaler' => $autoscaler);
-    $params = array_merge($params, $optParams);
-    return $this->call('get', array($params), "Google_Service_Compute_Autoscaler");
-  }
-  /**
-   * Creates an autoscaler in the specified project using the data included in the
-   * request. (autoscalers.insert)
-   *
-   * @param string $project Project ID for this request.
-   * @param string $zone Name of the zone for this request.
-   * @param Google_Service_Compute_Autoscaler $postBody
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Compute_Operation
-   */
-  public function insert($project, $zone, Google_Service_Compute_Autoscaler $postBody, $optParams = array())
-  {
-    $params = array('project' => $project, 'zone' => $zone, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('insert', array($params), "Google_Service_Compute_Operation");
-  }
-  /**
-   * Retrieves a list of autoscalers contained within the specified zone.
-   * (autoscalers.listAutoscalers)
-   *
-   * @param string $project Project ID for this request.
-   * @param string $zone Name of the zone for this request.
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param string filter Sets a filter expression for filtering listed
-   * resources, in the form filter={expression}. Your {expression} must be in the
-   * format: field_name comparison_string literal_string.
-   *
-   * The field_name is the name of the field you want to compare. Only atomic
-   * field types are supported (string, number, boolean). The comparison_string
-   * must be either eq (equals) or ne (not equals). The literal_string is the
-   * string value to filter to. The literal value must be valid for the type of
-   * field you are filtering by (string, number, boolean). For string fields, the
-   * literal value is interpreted as a regular expression using RE2 syntax. The
-   * literal value must match the entire field.
-   *
-   * For example, to filter for instances that do not have a name of example-
-   * instance, you would use filter=name ne example-instance.
-   *
-   * You can filter on nested fields. For example, you could filter on instances
-   * that have set the scheduling.automaticRestart field to true. Use filtering on
-   * nested fields to take advantage of labels to organize and search for results
-   * based on label values.
-   *
-   * To filter on multiple expressions, provide each separate expression within
-   * parentheses. For example, (scheduling.automaticRestart eq true) (zone eq us-
-   * central1-f). Multiple expressions are treated as AND expressions, meaning
-   * that resources must match all expressions to pass the filters.
-   * @opt_param string maxResults The maximum number of results per page that
-   * should be returned. If the number of available results is larger than
-   * maxResults, Compute Engine returns a nextPageToken that can be used to get
-   * the next page of results in subsequent list requests. Acceptable values are 0
-   * to 500, inclusive. (Default: 500)
-   * @opt_param string orderBy Sorts list results by a certain order. By default,
-   * results are returned in alphanumerical order based on the resource name.
-   *
-   * You can also sort results in descending order based on the creation timestamp
-   * using orderBy="creationTimestamp desc". This sorts results based on the
-   * creationTimestamp field in reverse chronological order (newest result first).
-   * Use this to sort resources like operations so that the newest operation is
-   * returned first.
-   *
-   * Currently, only sorting by name or creationTimestamp desc is supported.
-   * @opt_param string pageToken Specifies a page token to use. Set pageToken to
-   * the nextPageToken returned by a previous list request to get the next page of
-   * results.
-   * @return Google_Service_Compute_AutoscalerList
-   */
-  public function listAutoscalers($project, $zone, $optParams = array())
-  {
-    $params = array('project' => $project, 'zone' => $zone);
-    $params = array_merge($params, $optParams);
-    return $this->call('list', array($params), "Google_Service_Compute_AutoscalerList");
-  }
-  /**
-   * Updates an autoscaler in the specified project using the data included in the
-   * request. This method supports patch semantics. (autoscalers.patch)
-   *
-   * @param string $project Project ID for this request.
-   * @param string $zone Name of the zone for this request.
-   * @param string $autoscaler Name of the autoscaler to update.
-   * @param Google_Service_Compute_Autoscaler $postBody
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Compute_Operation
-   */
-  public function patch($project, $zone, $autoscaler, Google_Service_Compute_Autoscaler $postBody, $optParams = array())
-  {
-    $params = array('project' => $project, 'zone' => $zone, 'autoscaler' => $autoscaler, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('patch', array($params), "Google_Service_Compute_Operation");
-  }
-  /**
-   * Updates an autoscaler in the specified project using the data included in the
-   * request. (autoscalers.update)
-   *
-   * @param string $project Project ID for this request.
-   * @param string $zone Name of the zone for this request.
-   * @param Google_Service_Compute_Autoscaler $postBody
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param string autoscaler Name of the autoscaler to update.
-   * @return Google_Service_Compute_Operation
-   */
-  public function update($project, $zone, Google_Service_Compute_Autoscaler $postBody, $optParams = array())
-  {
-    $params = array('project' => $project, 'zone' => $zone, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('update', array($params), "Google_Service_Compute_Operation");
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/Resource/BackendBuckets.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/Resource/BackendBuckets.php
deleted file mode 100644
index 4c510e32..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/Resource/BackendBuckets.php
+++ /dev/null
@@ -1,161 +0,0 @@
-
- *   $computeService = new Google_Service_Compute(...);
- *   $backendBuckets = $computeService->backendBuckets;
- *  
- */
-class Google_Service_Compute_Resource_BackendBuckets extends Google_Service_Resource
-{
-  /**
-   * Deletes the specified BackendBucket resource. (backendBuckets.delete)
-   *
-   * @param string $project Project ID for this request.
-   * @param string $backendBucket Name of the BackendBucket resource to delete.
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Compute_Operation
-   */
-  public function delete($project, $backendBucket, $optParams = array())
-  {
-    $params = array('project' => $project, 'backendBucket' => $backendBucket);
-    $params = array_merge($params, $optParams);
-    return $this->call('delete', array($params), "Google_Service_Compute_Operation");
-  }
-  /**
-   * Returns the specified BackendBucket resource. Get a list of available backend
-   * buckets by making a list() request. (backendBuckets.get)
-   *
-   * @param string $project Project ID for this request.
-   * @param string $backendBucket Name of the BackendBucket resource to return.
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Compute_BackendBucket
-   */
-  public function get($project, $backendBucket, $optParams = array())
-  {
-    $params = array('project' => $project, 'backendBucket' => $backendBucket);
-    $params = array_merge($params, $optParams);
-    return $this->call('get', array($params), "Google_Service_Compute_BackendBucket");
-  }
-  /**
-   * Creates a BackendBucket resource in the specified project using the data
-   * included in the request. (backendBuckets.insert)
-   *
-   * @param string $project Project ID for this request.
-   * @param Google_Service_Compute_BackendBucket $postBody
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Compute_Operation
-   */
-  public function insert($project, Google_Service_Compute_BackendBucket $postBody, $optParams = array())
-  {
-    $params = array('project' => $project, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('insert', array($params), "Google_Service_Compute_Operation");
-  }
-  /**
-   * Retrieves the list of BackendBucket resources available to the specified
-   * project. (backendBuckets.listBackendBuckets)
-   *
-   * @param string $project Project ID for this request.
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param string filter Sets a filter expression for filtering listed
-   * resources, in the form filter={expression}. Your {expression} must be in the
-   * format: field_name comparison_string literal_string.
-   *
-   * The field_name is the name of the field you want to compare. Only atomic
-   * field types are supported (string, number, boolean). The comparison_string
-   * must be either eq (equals) or ne (not equals). The literal_string is the
-   * string value to filter to. The literal value must be valid for the type of
-   * field you are filtering by (string, number, boolean). For string fields, the
-   * literal value is interpreted as a regular expression using RE2 syntax. The
-   * literal value must match the entire field.
-   *
-   * For example, to filter for instances that do not have a name of example-
-   * instance, you would use filter=name ne example-instance.
-   *
-   * You can filter on nested fields. For example, you could filter on instances
-   * that have set the scheduling.automaticRestart field to true. Use filtering on
-   * nested fields to take advantage of labels to organize and search for results
-   * based on label values.
-   *
-   * To filter on multiple expressions, provide each separate expression within
-   * parentheses. For example, (scheduling.automaticRestart eq true) (zone eq us-
-   * central1-f). Multiple expressions are treated as AND expressions, meaning
-   * that resources must match all expressions to pass the filters.
-   * @opt_param string maxResults The maximum number of results per page that
-   * should be returned. If the number of available results is larger than
-   * maxResults, Compute Engine returns a nextPageToken that can be used to get
-   * the next page of results in subsequent list requests. Acceptable values are 0
-   * to 500, inclusive. (Default: 500)
-   * @opt_param string orderBy Sorts list results by a certain order. By default,
-   * results are returned in alphanumerical order based on the resource name.
-   *
-   * You can also sort results in descending order based on the creation timestamp
-   * using orderBy="creationTimestamp desc". This sorts results based on the
-   * creationTimestamp field in reverse chronological order (newest result first).
-   * Use this to sort resources like operations so that the newest operation is
-   * returned first.
-   *
-   * Currently, only sorting by name or creationTimestamp desc is supported.
-   * @opt_param string pageToken Specifies a page token to use. Set pageToken to
-   * the nextPageToken returned by a previous list request to get the next page of
-   * results.
-   * @return Google_Service_Compute_BackendBucketList
-   */
-  public function listBackendBuckets($project, $optParams = array())
-  {
-    $params = array('project' => $project);
-    $params = array_merge($params, $optParams);
-    return $this->call('list', array($params), "Google_Service_Compute_BackendBucketList");
-  }
-  /**
-   * Updates the specified BackendBucket resource with the data included in the
-   * request. This method supports patch semantics. (backendBuckets.patch)
-   *
-   * @param string $project Project ID for this request.
-   * @param string $backendBucket Name of the BackendBucket resource to update.
-   * @param Google_Service_Compute_BackendBucket $postBody
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Compute_Operation
-   */
-  public function patch($project, $backendBucket, Google_Service_Compute_BackendBucket $postBody, $optParams = array())
-  {
-    $params = array('project' => $project, 'backendBucket' => $backendBucket, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('patch', array($params), "Google_Service_Compute_Operation");
-  }
-  /**
-   * Updates the specified BackendBucket resource with the data included in the
-   * request. (backendBuckets.update)
-   *
-   * @param string $project Project ID for this request.
-   * @param string $backendBucket Name of the BackendBucket resource to update.
-   * @param Google_Service_Compute_BackendBucket $postBody
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Compute_Operation
-   */
-  public function update($project, $backendBucket, Google_Service_Compute_BackendBucket $postBody, $optParams = array())
-  {
-    $params = array('project' => $project, 'backendBucket' => $backendBucket, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('update', array($params), "Google_Service_Compute_Operation");
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/Resource/BackendServices.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/Resource/BackendServices.php
deleted file mode 100644
index b234747b..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/Resource/BackendServices.php
+++ /dev/null
@@ -1,241 +0,0 @@
-
- *   $computeService = new Google_Service_Compute(...);
- *   $backendServices = $computeService->backendServices;
- *  
- */
-class Google_Service_Compute_Resource_BackendServices extends Google_Service_Resource
-{
-  /**
-   * Retrieves the list of all BackendService resources, regional and global,
-   * available to the specified project. (backendServices.aggregatedList)
-   *
-   * @param string $project Name of the project scoping this request.
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param string filter Sets a filter expression for filtering listed
-   * resources, in the form filter={expression}. Your {expression} must be in the
-   * format: field_name comparison_string literal_string.
-   *
-   * The field_name is the name of the field you want to compare. Only atomic
-   * field types are supported (string, number, boolean). The comparison_string
-   * must be either eq (equals) or ne (not equals). The literal_string is the
-   * string value to filter to. The literal value must be valid for the type of
-   * field you are filtering by (string, number, boolean). For string fields, the
-   * literal value is interpreted as a regular expression using RE2 syntax. The
-   * literal value must match the entire field.
-   *
-   * For example, to filter for instances that do not have a name of example-
-   * instance, you would use filter=name ne example-instance.
-   *
-   * You can filter on nested fields. For example, you could filter on instances
-   * that have set the scheduling.automaticRestart field to true. Use filtering on
-   * nested fields to take advantage of labels to organize and search for results
-   * based on label values.
-   *
-   * To filter on multiple expressions, provide each separate expression within
-   * parentheses. For example, (scheduling.automaticRestart eq true) (zone eq us-
-   * central1-f). Multiple expressions are treated as AND expressions, meaning
-   * that resources must match all expressions to pass the filters.
-   * @opt_param string maxResults The maximum number of results per page that
-   * should be returned. If the number of available results is larger than
-   * maxResults, Compute Engine returns a nextPageToken that can be used to get
-   * the next page of results in subsequent list requests. Acceptable values are 0
-   * to 500, inclusive. (Default: 500)
-   * @opt_param string orderBy Sorts list results by a certain order. By default,
-   * results are returned in alphanumerical order based on the resource name.
-   *
-   * You can also sort results in descending order based on the creation timestamp
-   * using orderBy="creationTimestamp desc". This sorts results based on the
-   * creationTimestamp field in reverse chronological order (newest result first).
-   * Use this to sort resources like operations so that the newest operation is
-   * returned first.
-   *
-   * Currently, only sorting by name or creationTimestamp desc is supported.
-   * @opt_param string pageToken Specifies a page token to use. Set pageToken to
-   * the nextPageToken returned by a previous list request to get the next page of
-   * results.
-   * @return Google_Service_Compute_BackendServiceAggregatedList
-   */
-  public function aggregatedList($project, $optParams = array())
-  {
-    $params = array('project' => $project);
-    $params = array_merge($params, $optParams);
-    return $this->call('aggregatedList', array($params), "Google_Service_Compute_BackendServiceAggregatedList");
-  }
-  /**
-   * Deletes the specified BackendService resource. (backendServices.delete)
-   *
-   * @param string $project Project ID for this request.
-   * @param string $backendService Name of the BackendService resource to delete.
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Compute_Operation
-   */
-  public function delete($project, $backendService, $optParams = array())
-  {
-    $params = array('project' => $project, 'backendService' => $backendService);
-    $params = array_merge($params, $optParams);
-    return $this->call('delete', array($params), "Google_Service_Compute_Operation");
-  }
-  /**
-   * Returns the specified BackendService resource. Get a list of available
-   * backend services by making a list() request. (backendServices.get)
-   *
-   * @param string $project Project ID for this request.
-   * @param string $backendService Name of the BackendService resource to return.
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Compute_BackendService
-   */
-  public function get($project, $backendService, $optParams = array())
-  {
-    $params = array('project' => $project, 'backendService' => $backendService);
-    $params = array_merge($params, $optParams);
-    return $this->call('get', array($params), "Google_Service_Compute_BackendService");
-  }
-  /**
-   * Gets the most recent health check results for this BackendService.
-   * (backendServices.getHealth)
-   *
-   * @param string $project
-   * @param string $backendService Name of the BackendService resource to which
-   * the queried instance belongs.
-   * @param Google_Service_Compute_ResourceGroupReference $postBody
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Compute_BackendServiceGroupHealth
-   */
-  public function getHealth($project, $backendService, Google_Service_Compute_ResourceGroupReference $postBody, $optParams = array())
-  {
-    $params = array('project' => $project, 'backendService' => $backendService, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('getHealth', array($params), "Google_Service_Compute_BackendServiceGroupHealth");
-  }
-  /**
-   * Creates a BackendService resource in the specified project using the data
-   * included in the request. There are several restrictions and guidelines to
-   * keep in mind when creating a backend service. Read  Restrictions and
-   * Guidelines for more information. (backendServices.insert)
-   *
-   * @param string $project Project ID for this request.
-   * @param Google_Service_Compute_BackendService $postBody
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Compute_Operation
-   */
-  public function insert($project, Google_Service_Compute_BackendService $postBody, $optParams = array())
-  {
-    $params = array('project' => $project, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('insert', array($params), "Google_Service_Compute_Operation");
-  }
-  /**
-   * Retrieves the list of BackendService resources available to the specified
-   * project. (backendServices.listBackendServices)
-   *
-   * @param string $project Project ID for this request.
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param string filter Sets a filter expression for filtering listed
-   * resources, in the form filter={expression}. Your {expression} must be in the
-   * format: field_name comparison_string literal_string.
-   *
-   * The field_name is the name of the field you want to compare. Only atomic
-   * field types are supported (string, number, boolean). The comparison_string
-   * must be either eq (equals) or ne (not equals). The literal_string is the
-   * string value to filter to. The literal value must be valid for the type of
-   * field you are filtering by (string, number, boolean). For string fields, the
-   * literal value is interpreted as a regular expression using RE2 syntax. The
-   * literal value must match the entire field.
-   *
-   * For example, to filter for instances that do not have a name of example-
-   * instance, you would use filter=name ne example-instance.
-   *
-   * You can filter on nested fields. For example, you could filter on instances
-   * that have set the scheduling.automaticRestart field to true. Use filtering on
-   * nested fields to take advantage of labels to organize and search for results
-   * based on label values.
-   *
-   * To filter on multiple expressions, provide each separate expression within
-   * parentheses. For example, (scheduling.automaticRestart eq true) (zone eq us-
-   * central1-f). Multiple expressions are treated as AND expressions, meaning
-   * that resources must match all expressions to pass the filters.
-   * @opt_param string maxResults The maximum number of results per page that
-   * should be returned. If the number of available results is larger than
-   * maxResults, Compute Engine returns a nextPageToken that can be used to get
-   * the next page of results in subsequent list requests. Acceptable values are 0
-   * to 500, inclusive. (Default: 500)
-   * @opt_param string orderBy Sorts list results by a certain order. By default,
-   * results are returned in alphanumerical order based on the resource name.
-   *
-   * You can also sort results in descending order based on the creation timestamp
-   * using orderBy="creationTimestamp desc". This sorts results based on the
-   * creationTimestamp field in reverse chronological order (newest result first).
-   * Use this to sort resources like operations so that the newest operation is
-   * returned first.
-   *
-   * Currently, only sorting by name or creationTimestamp desc is supported.
-   * @opt_param string pageToken Specifies a page token to use. Set pageToken to
-   * the nextPageToken returned by a previous list request to get the next page of
-   * results.
-   * @return Google_Service_Compute_BackendServiceList
-   */
-  public function listBackendServices($project, $optParams = array())
-  {
-    $params = array('project' => $project);
-    $params = array_merge($params, $optParams);
-    return $this->call('list', array($params), "Google_Service_Compute_BackendServiceList");
-  }
-  /**
-   * Updates the specified BackendService resource with the data included in the
-   * request. There are several restrictions and guidelines to keep in mind when
-   * updating a backend service. Read  Restrictions and Guidelines for more
-   * information. This method supports patch semantics. (backendServices.patch)
-   *
-   * @param string $project Project ID for this request.
-   * @param string $backendService Name of the BackendService resource to update.
-   * @param Google_Service_Compute_BackendService $postBody
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Compute_Operation
-   */
-  public function patch($project, $backendService, Google_Service_Compute_BackendService $postBody, $optParams = array())
-  {
-    $params = array('project' => $project, 'backendService' => $backendService, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('patch', array($params), "Google_Service_Compute_Operation");
-  }
-  /**
-   * Updates the specified BackendService resource with the data included in the
-   * request. There are several restrictions and guidelines to keep in mind when
-   * updating a backend service. Read  Restrictions and Guidelines for more
-   * information. (backendServices.update)
-   *
-   * @param string $project Project ID for this request.
-   * @param string $backendService Name of the BackendService resource to update.
-   * @param Google_Service_Compute_BackendService $postBody
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Compute_Operation
-   */
-  public function update($project, $backendService, Google_Service_Compute_BackendService $postBody, $optParams = array())
-  {
-    $params = array('project' => $project, 'backendService' => $backendService, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('update', array($params), "Google_Service_Compute_Operation");
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/Resource/DiskTypes.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/Resource/DiskTypes.php
deleted file mode 100644
index 83fcc523..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/Resource/DiskTypes.php
+++ /dev/null
@@ -1,158 +0,0 @@
-
- *   $computeService = new Google_Service_Compute(...);
- *   $diskTypes = $computeService->diskTypes;
- *  
- */
-class Google_Service_Compute_Resource_DiskTypes extends Google_Service_Resource
-{
-  /**
-   * Retrieves an aggregated list of disk types. (diskTypes.aggregatedList)
-   *
-   * @param string $project Project ID for this request.
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param string filter Sets a filter expression for filtering listed
-   * resources, in the form filter={expression}. Your {expression} must be in the
-   * format: field_name comparison_string literal_string.
-   *
-   * The field_name is the name of the field you want to compare. Only atomic
-   * field types are supported (string, number, boolean). The comparison_string
-   * must be either eq (equals) or ne (not equals). The literal_string is the
-   * string value to filter to. The literal value must be valid for the type of
-   * field you are filtering by (string, number, boolean). For string fields, the
-   * literal value is interpreted as a regular expression using RE2 syntax. The
-   * literal value must match the entire field.
-   *
-   * For example, to filter for instances that do not have a name of example-
-   * instance, you would use filter=name ne example-instance.
-   *
-   * You can filter on nested fields. For example, you could filter on instances
-   * that have set the scheduling.automaticRestart field to true. Use filtering on
-   * nested fields to take advantage of labels to organize and search for results
-   * based on label values.
-   *
-   * To filter on multiple expressions, provide each separate expression within
-   * parentheses. For example, (scheduling.automaticRestart eq true) (zone eq us-
-   * central1-f). Multiple expressions are treated as AND expressions, meaning
-   * that resources must match all expressions to pass the filters.
-   * @opt_param string maxResults The maximum number of results per page that
-   * should be returned. If the number of available results is larger than
-   * maxResults, Compute Engine returns a nextPageToken that can be used to get
-   * the next page of results in subsequent list requests. Acceptable values are 0
-   * to 500, inclusive. (Default: 500)
-   * @opt_param string orderBy Sorts list results by a certain order. By default,
-   * results are returned in alphanumerical order based on the resource name.
-   *
-   * You can also sort results in descending order based on the creation timestamp
-   * using orderBy="creationTimestamp desc". This sorts results based on the
-   * creationTimestamp field in reverse chronological order (newest result first).
-   * Use this to sort resources like operations so that the newest operation is
-   * returned first.
-   *
-   * Currently, only sorting by name or creationTimestamp desc is supported.
-   * @opt_param string pageToken Specifies a page token to use. Set pageToken to
-   * the nextPageToken returned by a previous list request to get the next page of
-   * results.
-   * @return Google_Service_Compute_DiskTypeAggregatedList
-   */
-  public function aggregatedList($project, $optParams = array())
-  {
-    $params = array('project' => $project);
-    $params = array_merge($params, $optParams);
-    return $this->call('aggregatedList', array($params), "Google_Service_Compute_DiskTypeAggregatedList");
-  }
-  /**
-   * Returns the specified disk type. Get a list of available disk types by making
-   * a list() request. (diskTypes.get)
-   *
-   * @param string $project Project ID for this request.
-   * @param string $zone The name of the zone for this request.
-   * @param string $diskType Name of the disk type to return.
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Compute_DiskType
-   */
-  public function get($project, $zone, $diskType, $optParams = array())
-  {
-    $params = array('project' => $project, 'zone' => $zone, 'diskType' => $diskType);
-    $params = array_merge($params, $optParams);
-    return $this->call('get', array($params), "Google_Service_Compute_DiskType");
-  }
-  /**
-   * Retrieves a list of disk types available to the specified project.
-   * (diskTypes.listDiskTypes)
-   *
-   * @param string $project Project ID for this request.
-   * @param string $zone The name of the zone for this request.
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param string filter Sets a filter expression for filtering listed
-   * resources, in the form filter={expression}. Your {expression} must be in the
-   * format: field_name comparison_string literal_string.
-   *
-   * The field_name is the name of the field you want to compare. Only atomic
-   * field types are supported (string, number, boolean). The comparison_string
-   * must be either eq (equals) or ne (not equals). The literal_string is the
-   * string value to filter to. The literal value must be valid for the type of
-   * field you are filtering by (string, number, boolean). For string fields, the
-   * literal value is interpreted as a regular expression using RE2 syntax. The
-   * literal value must match the entire field.
-   *
-   * For example, to filter for instances that do not have a name of example-
-   * instance, you would use filter=name ne example-instance.
-   *
-   * You can filter on nested fields. For example, you could filter on instances
-   * that have set the scheduling.automaticRestart field to true. Use filtering on
-   * nested fields to take advantage of labels to organize and search for results
-   * based on label values.
-   *
-   * To filter on multiple expressions, provide each separate expression within
-   * parentheses. For example, (scheduling.automaticRestart eq true) (zone eq us-
-   * central1-f). Multiple expressions are treated as AND expressions, meaning
-   * that resources must match all expressions to pass the filters.
-   * @opt_param string maxResults The maximum number of results per page that
-   * should be returned. If the number of available results is larger than
-   * maxResults, Compute Engine returns a nextPageToken that can be used to get
-   * the next page of results in subsequent list requests. Acceptable values are 0
-   * to 500, inclusive. (Default: 500)
-   * @opt_param string orderBy Sorts list results by a certain order. By default,
-   * results are returned in alphanumerical order based on the resource name.
-   *
-   * You can also sort results in descending order based on the creation timestamp
-   * using orderBy="creationTimestamp desc". This sorts results based on the
-   * creationTimestamp field in reverse chronological order (newest result first).
-   * Use this to sort resources like operations so that the newest operation is
-   * returned first.
-   *
-   * Currently, only sorting by name or creationTimestamp desc is supported.
-   * @opt_param string pageToken Specifies a page token to use. Set pageToken to
-   * the nextPageToken returned by a previous list request to get the next page of
-   * results.
-   * @return Google_Service_Compute_DiskTypeList
-   */
-  public function listDiskTypes($project, $zone, $optParams = array())
-  {
-    $params = array('project' => $project, 'zone' => $zone);
-    $params = array_merge($params, $optParams);
-    return $this->call('list', array($params), "Google_Service_Compute_DiskTypeList");
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/Resource/Disks.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/Resource/Disks.php
deleted file mode 100644
index be69f684..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/Resource/Disks.php
+++ /dev/null
@@ -1,231 +0,0 @@
-
- *   $computeService = new Google_Service_Compute(...);
- *   $disks = $computeService->disks;
- *  
- */
-class Google_Service_Compute_Resource_Disks extends Google_Service_Resource
-{
-  /**
-   * Retrieves an aggregated list of persistent disks. (disks.aggregatedList)
-   *
-   * @param string $project Project ID for this request.
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param string filter Sets a filter expression for filtering listed
-   * resources, in the form filter={expression}. Your {expression} must be in the
-   * format: field_name comparison_string literal_string.
-   *
-   * The field_name is the name of the field you want to compare. Only atomic
-   * field types are supported (string, number, boolean). The comparison_string
-   * must be either eq (equals) or ne (not equals). The literal_string is the
-   * string value to filter to. The literal value must be valid for the type of
-   * field you are filtering by (string, number, boolean). For string fields, the
-   * literal value is interpreted as a regular expression using RE2 syntax. The
-   * literal value must match the entire field.
-   *
-   * For example, to filter for instances that do not have a name of example-
-   * instance, you would use filter=name ne example-instance.
-   *
-   * You can filter on nested fields. For example, you could filter on instances
-   * that have set the scheduling.automaticRestart field to true. Use filtering on
-   * nested fields to take advantage of labels to organize and search for results
-   * based on label values.
-   *
-   * To filter on multiple expressions, provide each separate expression within
-   * parentheses. For example, (scheduling.automaticRestart eq true) (zone eq us-
-   * central1-f). Multiple expressions are treated as AND expressions, meaning
-   * that resources must match all expressions to pass the filters.
-   * @opt_param string maxResults The maximum number of results per page that
-   * should be returned. If the number of available results is larger than
-   * maxResults, Compute Engine returns a nextPageToken that can be used to get
-   * the next page of results in subsequent list requests. Acceptable values are 0
-   * to 500, inclusive. (Default: 500)
-   * @opt_param string orderBy Sorts list results by a certain order. By default,
-   * results are returned in alphanumerical order based on the resource name.
-   *
-   * You can also sort results in descending order based on the creation timestamp
-   * using orderBy="creationTimestamp desc". This sorts results based on the
-   * creationTimestamp field in reverse chronological order (newest result first).
-   * Use this to sort resources like operations so that the newest operation is
-   * returned first.
-   *
-   * Currently, only sorting by name or creationTimestamp desc is supported.
-   * @opt_param string pageToken Specifies a page token to use. Set pageToken to
-   * the nextPageToken returned by a previous list request to get the next page of
-   * results.
-   * @return Google_Service_Compute_DiskAggregatedList
-   */
-  public function aggregatedList($project, $optParams = array())
-  {
-    $params = array('project' => $project);
-    $params = array_merge($params, $optParams);
-    return $this->call('aggregatedList', array($params), "Google_Service_Compute_DiskAggregatedList");
-  }
-  /**
-   * Creates a snapshot of a specified persistent disk. (disks.createSnapshot)
-   *
-   * @param string $project Project ID for this request.
-   * @param string $zone The name of the zone for this request.
-   * @param string $disk Name of the persistent disk to snapshot.
-   * @param Google_Service_Compute_Snapshot $postBody
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param bool guestFlush
-   * @return Google_Service_Compute_Operation
-   */
-  public function createSnapshot($project, $zone, $disk, Google_Service_Compute_Snapshot $postBody, $optParams = array())
-  {
-    $params = array('project' => $project, 'zone' => $zone, 'disk' => $disk, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('createSnapshot', array($params), "Google_Service_Compute_Operation");
-  }
-  /**
-   * Deletes the specified persistent disk. Deleting a disk removes its data
-   * permanently and is irreversible. However, deleting a disk does not delete any
-   * snapshots previously made from the disk. You must separately delete
-   * snapshots. (disks.delete)
-   *
-   * @param string $project Project ID for this request.
-   * @param string $zone The name of the zone for this request.
-   * @param string $disk Name of the persistent disk to delete.
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Compute_Operation
-   */
-  public function delete($project, $zone, $disk, $optParams = array())
-  {
-    $params = array('project' => $project, 'zone' => $zone, 'disk' => $disk);
-    $params = array_merge($params, $optParams);
-    return $this->call('delete', array($params), "Google_Service_Compute_Operation");
-  }
-  /**
-   * Returns a specified persistent disk. Get a list of available persistent disks
-   * by making a list() request. (disks.get)
-   *
-   * @param string $project Project ID for this request.
-   * @param string $zone The name of the zone for this request.
-   * @param string $disk Name of the persistent disk to return.
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Compute_Disk
-   */
-  public function get($project, $zone, $disk, $optParams = array())
-  {
-    $params = array('project' => $project, 'zone' => $zone, 'disk' => $disk);
-    $params = array_merge($params, $optParams);
-    return $this->call('get', array($params), "Google_Service_Compute_Disk");
-  }
-  /**
-   * Creates a persistent disk in the specified project using the data in the
-   * request. You can create a disk with a sourceImage, a sourceSnapshot, or
-   * create an empty 500 GB data disk by omitting all properties. You can also
-   * create a disk that is larger than the default size by specifying the sizeGb
-   * property. (disks.insert)
-   *
-   * @param string $project Project ID for this request.
-   * @param string $zone The name of the zone for this request.
-   * @param Google_Service_Compute_Disk $postBody
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param string sourceImage Optional. Source image to restore onto a disk.
-   * @return Google_Service_Compute_Operation
-   */
-  public function insert($project, $zone, Google_Service_Compute_Disk $postBody, $optParams = array())
-  {
-    $params = array('project' => $project, 'zone' => $zone, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('insert', array($params), "Google_Service_Compute_Operation");
-  }
-  /**
-   * Retrieves a list of persistent disks contained within the specified zone.
-   * (disks.listDisks)
-   *
-   * @param string $project Project ID for this request.
-   * @param string $zone The name of the zone for this request.
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param string filter Sets a filter expression for filtering listed
-   * resources, in the form filter={expression}. Your {expression} must be in the
-   * format: field_name comparison_string literal_string.
-   *
-   * The field_name is the name of the field you want to compare. Only atomic
-   * field types are supported (string, number, boolean). The comparison_string
-   * must be either eq (equals) or ne (not equals). The literal_string is the
-   * string value to filter to. The literal value must be valid for the type of
-   * field you are filtering by (string, number, boolean). For string fields, the
-   * literal value is interpreted as a regular expression using RE2 syntax. The
-   * literal value must match the entire field.
-   *
-   * For example, to filter for instances that do not have a name of example-
-   * instance, you would use filter=name ne example-instance.
-   *
-   * You can filter on nested fields. For example, you could filter on instances
-   * that have set the scheduling.automaticRestart field to true. Use filtering on
-   * nested fields to take advantage of labels to organize and search for results
-   * based on label values.
-   *
-   * To filter on multiple expressions, provide each separate expression within
-   * parentheses. For example, (scheduling.automaticRestart eq true) (zone eq us-
-   * central1-f). Multiple expressions are treated as AND expressions, meaning
-   * that resources must match all expressions to pass the filters.
-   * @opt_param string maxResults The maximum number of results per page that
-   * should be returned. If the number of available results is larger than
-   * maxResults, Compute Engine returns a nextPageToken that can be used to get
-   * the next page of results in subsequent list requests. Acceptable values are 0
-   * to 500, inclusive. (Default: 500)
-   * @opt_param string orderBy Sorts list results by a certain order. By default,
-   * results are returned in alphanumerical order based on the resource name.
-   *
-   * You can also sort results in descending order based on the creation timestamp
-   * using orderBy="creationTimestamp desc". This sorts results based on the
-   * creationTimestamp field in reverse chronological order (newest result first).
-   * Use this to sort resources like operations so that the newest operation is
-   * returned first.
-   *
-   * Currently, only sorting by name or creationTimestamp desc is supported.
-   * @opt_param string pageToken Specifies a page token to use. Set pageToken to
-   * the nextPageToken returned by a previous list request to get the next page of
-   * results.
-   * @return Google_Service_Compute_DiskList
-   */
-  public function listDisks($project, $zone, $optParams = array())
-  {
-    $params = array('project' => $project, 'zone' => $zone);
-    $params = array_merge($params, $optParams);
-    return $this->call('list', array($params), "Google_Service_Compute_DiskList");
-  }
-  /**
-   * Resizes the specified persistent disk. (disks.resize)
-   *
-   * @param string $project Project ID for this request.
-   * @param string $zone The name of the zone for this request.
-   * @param string $disk The name of the persistent disk.
-   * @param Google_Service_Compute_DisksResizeRequest $postBody
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Compute_Operation
-   */
-  public function resize($project, $zone, $disk, Google_Service_Compute_DisksResizeRequest $postBody, $optParams = array())
-  {
-    $params = array('project' => $project, 'zone' => $zone, 'disk' => $disk, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('resize', array($params), "Google_Service_Compute_Operation");
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/Resource/Firewalls.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/Resource/Firewalls.php
deleted file mode 100644
index 850bbd95..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/Resource/Firewalls.php
+++ /dev/null
@@ -1,160 +0,0 @@
-
- *   $computeService = new Google_Service_Compute(...);
- *   $firewalls = $computeService->firewalls;
- *  
- */
-class Google_Service_Compute_Resource_Firewalls extends Google_Service_Resource
-{
-  /**
-   * Deletes the specified firewall. (firewalls.delete)
-   *
-   * @param string $project Project ID for this request.
-   * @param string $firewall Name of the firewall rule to delete.
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Compute_Operation
-   */
-  public function delete($project, $firewall, $optParams = array())
-  {
-    $params = array('project' => $project, 'firewall' => $firewall);
-    $params = array_merge($params, $optParams);
-    return $this->call('delete', array($params), "Google_Service_Compute_Operation");
-  }
-  /**
-   * Returns the specified firewall. (firewalls.get)
-   *
-   * @param string $project Project ID for this request.
-   * @param string $firewall Name of the firewall rule to return.
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Compute_Firewall
-   */
-  public function get($project, $firewall, $optParams = array())
-  {
-    $params = array('project' => $project, 'firewall' => $firewall);
-    $params = array_merge($params, $optParams);
-    return $this->call('get', array($params), "Google_Service_Compute_Firewall");
-  }
-  /**
-   * Creates a firewall rule in the specified project using the data included in
-   * the request. (firewalls.insert)
-   *
-   * @param string $project Project ID for this request.
-   * @param Google_Service_Compute_Firewall $postBody
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Compute_Operation
-   */
-  public function insert($project, Google_Service_Compute_Firewall $postBody, $optParams = array())
-  {
-    $params = array('project' => $project, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('insert', array($params), "Google_Service_Compute_Operation");
-  }
-  /**
-   * Retrieves the list of firewall rules available to the specified project.
-   * (firewalls.listFirewalls)
-   *
-   * @param string $project Project ID for this request.
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param string filter Sets a filter expression for filtering listed
-   * resources, in the form filter={expression}. Your {expression} must be in the
-   * format: field_name comparison_string literal_string.
-   *
-   * The field_name is the name of the field you want to compare. Only atomic
-   * field types are supported (string, number, boolean). The comparison_string
-   * must be either eq (equals) or ne (not equals). The literal_string is the
-   * string value to filter to. The literal value must be valid for the type of
-   * field you are filtering by (string, number, boolean). For string fields, the
-   * literal value is interpreted as a regular expression using RE2 syntax. The
-   * literal value must match the entire field.
-   *
-   * For example, to filter for instances that do not have a name of example-
-   * instance, you would use filter=name ne example-instance.
-   *
-   * You can filter on nested fields. For example, you could filter on instances
-   * that have set the scheduling.automaticRestart field to true. Use filtering on
-   * nested fields to take advantage of labels to organize and search for results
-   * based on label values.
-   *
-   * To filter on multiple expressions, provide each separate expression within
-   * parentheses. For example, (scheduling.automaticRestart eq true) (zone eq us-
-   * central1-f). Multiple expressions are treated as AND expressions, meaning
-   * that resources must match all expressions to pass the filters.
-   * @opt_param string maxResults The maximum number of results per page that
-   * should be returned. If the number of available results is larger than
-   * maxResults, Compute Engine returns a nextPageToken that can be used to get
-   * the next page of results in subsequent list requests. Acceptable values are 0
-   * to 500, inclusive. (Default: 500)
-   * @opt_param string orderBy Sorts list results by a certain order. By default,
-   * results are returned in alphanumerical order based on the resource name.
-   *
-   * You can also sort results in descending order based on the creation timestamp
-   * using orderBy="creationTimestamp desc". This sorts results based on the
-   * creationTimestamp field in reverse chronological order (newest result first).
-   * Use this to sort resources like operations so that the newest operation is
-   * returned first.
-   *
-   * Currently, only sorting by name or creationTimestamp desc is supported.
-   * @opt_param string pageToken Specifies a page token to use. Set pageToken to
-   * the nextPageToken returned by a previous list request to get the next page of
-   * results.
-   * @return Google_Service_Compute_FirewallList
-   */
-  public function listFirewalls($project, $optParams = array())
-  {
-    $params = array('project' => $project);
-    $params = array_merge($params, $optParams);
-    return $this->call('list', array($params), "Google_Service_Compute_FirewallList");
-  }
-  /**
-   * Updates the specified firewall rule with the data included in the request.
-   * This method supports patch semantics. (firewalls.patch)
-   *
-   * @param string $project Project ID for this request.
-   * @param string $firewall Name of the firewall rule to update.
-   * @param Google_Service_Compute_Firewall $postBody
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Compute_Operation
-   */
-  public function patch($project, $firewall, Google_Service_Compute_Firewall $postBody, $optParams = array())
-  {
-    $params = array('project' => $project, 'firewall' => $firewall, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('patch', array($params), "Google_Service_Compute_Operation");
-  }
-  /**
-   * Updates the specified firewall rule with the data included in the request.
-   * (firewalls.update)
-   *
-   * @param string $project Project ID for this request.
-   * @param string $firewall Name of the firewall rule to update.
-   * @param Google_Service_Compute_Firewall $postBody
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Compute_Operation
-   */
-  public function update($project, $firewall, Google_Service_Compute_Firewall $postBody, $optParams = array())
-  {
-    $params = array('project' => $project, 'firewall' => $firewall, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('update', array($params), "Google_Service_Compute_Operation");
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/Resource/ForwardingRules.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/Resource/ForwardingRules.php
deleted file mode 100644
index 9ee235b8..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/Resource/ForwardingRules.php
+++ /dev/null
@@ -1,207 +0,0 @@
-
- *   $computeService = new Google_Service_Compute(...);
- *   $forwardingRules = $computeService->forwardingRules;
- *  
- */
-class Google_Service_Compute_Resource_ForwardingRules extends Google_Service_Resource
-{
-  /**
-   * Retrieves an aggregated list of forwarding rules.
-   * (forwardingRules.aggregatedList)
-   *
-   * @param string $project Project ID for this request.
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param string filter Sets a filter expression for filtering listed
-   * resources, in the form filter={expression}. Your {expression} must be in the
-   * format: field_name comparison_string literal_string.
-   *
-   * The field_name is the name of the field you want to compare. Only atomic
-   * field types are supported (string, number, boolean). The comparison_string
-   * must be either eq (equals) or ne (not equals). The literal_string is the
-   * string value to filter to. The literal value must be valid for the type of
-   * field you are filtering by (string, number, boolean). For string fields, the
-   * literal value is interpreted as a regular expression using RE2 syntax. The
-   * literal value must match the entire field.
-   *
-   * For example, to filter for instances that do not have a name of example-
-   * instance, you would use filter=name ne example-instance.
-   *
-   * You can filter on nested fields. For example, you could filter on instances
-   * that have set the scheduling.automaticRestart field to true. Use filtering on
-   * nested fields to take advantage of labels to organize and search for results
-   * based on label values.
-   *
-   * To filter on multiple expressions, provide each separate expression within
-   * parentheses. For example, (scheduling.automaticRestart eq true) (zone eq us-
-   * central1-f). Multiple expressions are treated as AND expressions, meaning
-   * that resources must match all expressions to pass the filters.
-   * @opt_param string maxResults The maximum number of results per page that
-   * should be returned. If the number of available results is larger than
-   * maxResults, Compute Engine returns a nextPageToken that can be used to get
-   * the next page of results in subsequent list requests. Acceptable values are 0
-   * to 500, inclusive. (Default: 500)
-   * @opt_param string orderBy Sorts list results by a certain order. By default,
-   * results are returned in alphanumerical order based on the resource name.
-   *
-   * You can also sort results in descending order based on the creation timestamp
-   * using orderBy="creationTimestamp desc". This sorts results based on the
-   * creationTimestamp field in reverse chronological order (newest result first).
-   * Use this to sort resources like operations so that the newest operation is
-   * returned first.
-   *
-   * Currently, only sorting by name or creationTimestamp desc is supported.
-   * @opt_param string pageToken Specifies a page token to use. Set pageToken to
-   * the nextPageToken returned by a previous list request to get the next page of
-   * results.
-   * @return Google_Service_Compute_ForwardingRuleAggregatedList
-   */
-  public function aggregatedList($project, $optParams = array())
-  {
-    $params = array('project' => $project);
-    $params = array_merge($params, $optParams);
-    return $this->call('aggregatedList', array($params), "Google_Service_Compute_ForwardingRuleAggregatedList");
-  }
-  /**
-   * Deletes the specified ForwardingRule resource. (forwardingRules.delete)
-   *
-   * @param string $project Project ID for this request.
-   * @param string $region Name of the region scoping this request.
-   * @param string $forwardingRule Name of the ForwardingRule resource to delete.
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Compute_Operation
-   */
-  public function delete($project, $region, $forwardingRule, $optParams = array())
-  {
-    $params = array('project' => $project, 'region' => $region, 'forwardingRule' => $forwardingRule);
-    $params = array_merge($params, $optParams);
-    return $this->call('delete', array($params), "Google_Service_Compute_Operation");
-  }
-  /**
-   * Returns the specified ForwardingRule resource. (forwardingRules.get)
-   *
-   * @param string $project Project ID for this request.
-   * @param string $region Name of the region scoping this request.
-   * @param string $forwardingRule Name of the ForwardingRule resource to return.
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Compute_ForwardingRule
-   */
-  public function get($project, $region, $forwardingRule, $optParams = array())
-  {
-    $params = array('project' => $project, 'region' => $region, 'forwardingRule' => $forwardingRule);
-    $params = array_merge($params, $optParams);
-    return $this->call('get', array($params), "Google_Service_Compute_ForwardingRule");
-  }
-  /**
-   * Creates a ForwardingRule resource in the specified project and region using
-   * the data included in the request. (forwardingRules.insert)
-   *
-   * @param string $project Project ID for this request.
-   * @param string $region Name of the region scoping this request.
-   * @param Google_Service_Compute_ForwardingRule $postBody
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Compute_Operation
-   */
-  public function insert($project, $region, Google_Service_Compute_ForwardingRule $postBody, $optParams = array())
-  {
-    $params = array('project' => $project, 'region' => $region, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('insert', array($params), "Google_Service_Compute_Operation");
-  }
-  /**
-   * Retrieves a list of ForwardingRule resources available to the specified
-   * project and region. (forwardingRules.listForwardingRules)
-   *
-   * @param string $project Project ID for this request.
-   * @param string $region Name of the region scoping this request.
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param string filter Sets a filter expression for filtering listed
-   * resources, in the form filter={expression}. Your {expression} must be in the
-   * format: field_name comparison_string literal_string.
-   *
-   * The field_name is the name of the field you want to compare. Only atomic
-   * field types are supported (string, number, boolean). The comparison_string
-   * must be either eq (equals) or ne (not equals). The literal_string is the
-   * string value to filter to. The literal value must be valid for the type of
-   * field you are filtering by (string, number, boolean). For string fields, the
-   * literal value is interpreted as a regular expression using RE2 syntax. The
-   * literal value must match the entire field.
-   *
-   * For example, to filter for instances that do not have a name of example-
-   * instance, you would use filter=name ne example-instance.
-   *
-   * You can filter on nested fields. For example, you could filter on instances
-   * that have set the scheduling.automaticRestart field to true. Use filtering on
-   * nested fields to take advantage of labels to organize and search for results
-   * based on label values.
-   *
-   * To filter on multiple expressions, provide each separate expression within
-   * parentheses. For example, (scheduling.automaticRestart eq true) (zone eq us-
-   * central1-f). Multiple expressions are treated as AND expressions, meaning
-   * that resources must match all expressions to pass the filters.
-   * @opt_param string maxResults The maximum number of results per page that
-   * should be returned. If the number of available results is larger than
-   * maxResults, Compute Engine returns a nextPageToken that can be used to get
-   * the next page of results in subsequent list requests. Acceptable values are 0
-   * to 500, inclusive. (Default: 500)
-   * @opt_param string orderBy Sorts list results by a certain order. By default,
-   * results are returned in alphanumerical order based on the resource name.
-   *
-   * You can also sort results in descending order based on the creation timestamp
-   * using orderBy="creationTimestamp desc". This sorts results based on the
-   * creationTimestamp field in reverse chronological order (newest result first).
-   * Use this to sort resources like operations so that the newest operation is
-   * returned first.
-   *
-   * Currently, only sorting by name or creationTimestamp desc is supported.
-   * @opt_param string pageToken Specifies a page token to use. Set pageToken to
-   * the nextPageToken returned by a previous list request to get the next page of
-   * results.
-   * @return Google_Service_Compute_ForwardingRuleList
-   */
-  public function listForwardingRules($project, $region, $optParams = array())
-  {
-    $params = array('project' => $project, 'region' => $region);
-    $params = array_merge($params, $optParams);
-    return $this->call('list', array($params), "Google_Service_Compute_ForwardingRuleList");
-  }
-  /**
-   * Changes target URL for forwarding rule. The new target should be of the same
-   * type as the old target. (forwardingRules.setTarget)
-   *
-   * @param string $project Project ID for this request.
-   * @param string $region Name of the region scoping this request.
-   * @param string $forwardingRule Name of the ForwardingRule resource in which
-   * target is to be set.
-   * @param Google_Service_Compute_TargetReference $postBody
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Compute_Operation
-   */
-  public function setTarget($project, $region, $forwardingRule, Google_Service_Compute_TargetReference $postBody, $optParams = array())
-  {
-    $params = array('project' => $project, 'region' => $region, 'forwardingRule' => $forwardingRule, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('setTarget', array($params), "Google_Service_Compute_Operation");
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/Resource/GlobalAddresses.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/Resource/GlobalAddresses.php
deleted file mode 100644
index eb1878d0..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/Resource/GlobalAddresses.php
+++ /dev/null
@@ -1,128 +0,0 @@
-
- *   $computeService = new Google_Service_Compute(...);
- *   $globalAddresses = $computeService->globalAddresses;
- *  
- */
-class Google_Service_Compute_Resource_GlobalAddresses extends Google_Service_Resource
-{
-  /**
-   * Deletes the specified address resource. (globalAddresses.delete)
-   *
-   * @param string $project Project ID for this request.
-   * @param string $address Name of the address resource to delete.
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Compute_Operation
-   */
-  public function delete($project, $address, $optParams = array())
-  {
-    $params = array('project' => $project, 'address' => $address);
-    $params = array_merge($params, $optParams);
-    return $this->call('delete', array($params), "Google_Service_Compute_Operation");
-  }
-  /**
-   * Returns the specified address resource. Get a list of available addresses by
-   * making a list() request. (globalAddresses.get)
-   *
-   * @param string $project Project ID for this request.
-   * @param string $address Name of the address resource to return.
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Compute_Address
-   */
-  public function get($project, $address, $optParams = array())
-  {
-    $params = array('project' => $project, 'address' => $address);
-    $params = array_merge($params, $optParams);
-    return $this->call('get', array($params), "Google_Service_Compute_Address");
-  }
-  /**
-   * Creates an address resource in the specified project using the data included
-   * in the request. (globalAddresses.insert)
-   *
-   * @param string $project Project ID for this request.
-   * @param Google_Service_Compute_Address $postBody
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Compute_Operation
-   */
-  public function insert($project, Google_Service_Compute_Address $postBody, $optParams = array())
-  {
-    $params = array('project' => $project, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('insert', array($params), "Google_Service_Compute_Operation");
-  }
-  /**
-   * Retrieves a list of global addresses. (globalAddresses.listGlobalAddresses)
-   *
-   * @param string $project Project ID for this request.
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param string filter Sets a filter expression for filtering listed
-   * resources, in the form filter={expression}. Your {expression} must be in the
-   * format: field_name comparison_string literal_string.
-   *
-   * The field_name is the name of the field you want to compare. Only atomic
-   * field types are supported (string, number, boolean). The comparison_string
-   * must be either eq (equals) or ne (not equals). The literal_string is the
-   * string value to filter to. The literal value must be valid for the type of
-   * field you are filtering by (string, number, boolean). For string fields, the
-   * literal value is interpreted as a regular expression using RE2 syntax. The
-   * literal value must match the entire field.
-   *
-   * For example, to filter for instances that do not have a name of example-
-   * instance, you would use filter=name ne example-instance.
-   *
-   * You can filter on nested fields. For example, you could filter on instances
-   * that have set the scheduling.automaticRestart field to true. Use filtering on
-   * nested fields to take advantage of labels to organize and search for results
-   * based on label values.
-   *
-   * To filter on multiple expressions, provide each separate expression within
-   * parentheses. For example, (scheduling.automaticRestart eq true) (zone eq us-
-   * central1-f). Multiple expressions are treated as AND expressions, meaning
-   * that resources must match all expressions to pass the filters.
-   * @opt_param string maxResults The maximum number of results per page that
-   * should be returned. If the number of available results is larger than
-   * maxResults, Compute Engine returns a nextPageToken that can be used to get
-   * the next page of results in subsequent list requests. Acceptable values are 0
-   * to 500, inclusive. (Default: 500)
-   * @opt_param string orderBy Sorts list results by a certain order. By default,
-   * results are returned in alphanumerical order based on the resource name.
-   *
-   * You can also sort results in descending order based on the creation timestamp
-   * using orderBy="creationTimestamp desc". This sorts results based on the
-   * creationTimestamp field in reverse chronological order (newest result first).
-   * Use this to sort resources like operations so that the newest operation is
-   * returned first.
-   *
-   * Currently, only sorting by name or creationTimestamp desc is supported.
-   * @opt_param string pageToken Specifies a page token to use. Set pageToken to
-   * the nextPageToken returned by a previous list request to get the next page of
-   * results.
-   * @return Google_Service_Compute_AddressList
-   */
-  public function listGlobalAddresses($project, $optParams = array())
-  {
-    $params = array('project' => $project);
-    $params = array_merge($params, $optParams);
-    return $this->call('list', array($params), "Google_Service_Compute_AddressList");
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/Resource/GlobalForwardingRules.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/Resource/GlobalForwardingRules.php
deleted file mode 100644
index 2edee631..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/Resource/GlobalForwardingRules.php
+++ /dev/null
@@ -1,146 +0,0 @@
-
- *   $computeService = new Google_Service_Compute(...);
- *   $globalForwardingRules = $computeService->globalForwardingRules;
- *  
- */
-class Google_Service_Compute_Resource_GlobalForwardingRules extends Google_Service_Resource
-{
-  /**
-   * Deletes the specified ForwardingRule resource. (globalForwardingRules.delete)
-   *
-   * @param string $project Project ID for this request.
-   * @param string $forwardingRule Name of the ForwardingRule resource to delete.
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Compute_Operation
-   */
-  public function delete($project, $forwardingRule, $optParams = array())
-  {
-    $params = array('project' => $project, 'forwardingRule' => $forwardingRule);
-    $params = array_merge($params, $optParams);
-    return $this->call('delete', array($params), "Google_Service_Compute_Operation");
-  }
-  /**
-   * Returns the specified ForwardingRule resource. Get a list of available
-   * forwarding rules by making a list() request. (globalForwardingRules.get)
-   *
-   * @param string $project Project ID for this request.
-   * @param string $forwardingRule Name of the ForwardingRule resource to return.
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Compute_ForwardingRule
-   */
-  public function get($project, $forwardingRule, $optParams = array())
-  {
-    $params = array('project' => $project, 'forwardingRule' => $forwardingRule);
-    $params = array_merge($params, $optParams);
-    return $this->call('get', array($params), "Google_Service_Compute_ForwardingRule");
-  }
-  /**
-   * Creates a ForwardingRule resource in the specified project and region using
-   * the data included in the request. (globalForwardingRules.insert)
-   *
-   * @param string $project Project ID for this request.
-   * @param Google_Service_Compute_ForwardingRule $postBody
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Compute_Operation
-   */
-  public function insert($project, Google_Service_Compute_ForwardingRule $postBody, $optParams = array())
-  {
-    $params = array('project' => $project, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('insert', array($params), "Google_Service_Compute_Operation");
-  }
-  /**
-   * Retrieves a list of ForwardingRule resources available to the specified
-   * project. (globalForwardingRules.listGlobalForwardingRules)
-   *
-   * @param string $project Project ID for this request.
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param string filter Sets a filter expression for filtering listed
-   * resources, in the form filter={expression}. Your {expression} must be in the
-   * format: field_name comparison_string literal_string.
-   *
-   * The field_name is the name of the field you want to compare. Only atomic
-   * field types are supported (string, number, boolean). The comparison_string
-   * must be either eq (equals) or ne (not equals). The literal_string is the
-   * string value to filter to. The literal value must be valid for the type of
-   * field you are filtering by (string, number, boolean). For string fields, the
-   * literal value is interpreted as a regular expression using RE2 syntax. The
-   * literal value must match the entire field.
-   *
-   * For example, to filter for instances that do not have a name of example-
-   * instance, you would use filter=name ne example-instance.
-   *
-   * You can filter on nested fields. For example, you could filter on instances
-   * that have set the scheduling.automaticRestart field to true. Use filtering on
-   * nested fields to take advantage of labels to organize and search for results
-   * based on label values.
-   *
-   * To filter on multiple expressions, provide each separate expression within
-   * parentheses. For example, (scheduling.automaticRestart eq true) (zone eq us-
-   * central1-f). Multiple expressions are treated as AND expressions, meaning
-   * that resources must match all expressions to pass the filters.
-   * @opt_param string maxResults The maximum number of results per page that
-   * should be returned. If the number of available results is larger than
-   * maxResults, Compute Engine returns a nextPageToken that can be used to get
-   * the next page of results in subsequent list requests. Acceptable values are 0
-   * to 500, inclusive. (Default: 500)
-   * @opt_param string orderBy Sorts list results by a certain order. By default,
-   * results are returned in alphanumerical order based on the resource name.
-   *
-   * You can also sort results in descending order based on the creation timestamp
-   * using orderBy="creationTimestamp desc". This sorts results based on the
-   * creationTimestamp field in reverse chronological order (newest result first).
-   * Use this to sort resources like operations so that the newest operation is
-   * returned first.
-   *
-   * Currently, only sorting by name or creationTimestamp desc is supported.
-   * @opt_param string pageToken Specifies a page token to use. Set pageToken to
-   * the nextPageToken returned by a previous list request to get the next page of
-   * results.
-   * @return Google_Service_Compute_ForwardingRuleList
-   */
-  public function listGlobalForwardingRules($project, $optParams = array())
-  {
-    $params = array('project' => $project);
-    $params = array_merge($params, $optParams);
-    return $this->call('list', array($params), "Google_Service_Compute_ForwardingRuleList");
-  }
-  /**
-   * Changes target URL for forwarding rule. The new target should be of the same
-   * type as the old target. (globalForwardingRules.setTarget)
-   *
-   * @param string $project Project ID for this request.
-   * @param string $forwardingRule Name of the ForwardingRule resource in which
-   * target is to be set.
-   * @param Google_Service_Compute_TargetReference $postBody
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Compute_Operation
-   */
-  public function setTarget($project, $forwardingRule, Google_Service_Compute_TargetReference $postBody, $optParams = array())
-  {
-    $params = array('project' => $project, 'forwardingRule' => $forwardingRule, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('setTarget', array($params), "Google_Service_Compute_Operation");
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/Resource/GlobalOperations.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/Resource/GlobalOperations.php
deleted file mode 100644
index ce1a9417..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/Resource/GlobalOperations.php
+++ /dev/null
@@ -1,170 +0,0 @@
-
- *   $computeService = new Google_Service_Compute(...);
- *   $globalOperations = $computeService->globalOperations;
- *  
- */
-class Google_Service_Compute_Resource_GlobalOperations extends Google_Service_Resource
-{
-  /**
-   * Retrieves an aggregated list of all operations.
-   * (globalOperations.aggregatedList)
-   *
-   * @param string $project Project ID for this request.
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param string filter Sets a filter expression for filtering listed
-   * resources, in the form filter={expression}. Your {expression} must be in the
-   * format: field_name comparison_string literal_string.
-   *
-   * The field_name is the name of the field you want to compare. Only atomic
-   * field types are supported (string, number, boolean). The comparison_string
-   * must be either eq (equals) or ne (not equals). The literal_string is the
-   * string value to filter to. The literal value must be valid for the type of
-   * field you are filtering by (string, number, boolean). For string fields, the
-   * literal value is interpreted as a regular expression using RE2 syntax. The
-   * literal value must match the entire field.
-   *
-   * For example, to filter for instances that do not have a name of example-
-   * instance, you would use filter=name ne example-instance.
-   *
-   * You can filter on nested fields. For example, you could filter on instances
-   * that have set the scheduling.automaticRestart field to true. Use filtering on
-   * nested fields to take advantage of labels to organize and search for results
-   * based on label values.
-   *
-   * To filter on multiple expressions, provide each separate expression within
-   * parentheses. For example, (scheduling.automaticRestart eq true) (zone eq us-
-   * central1-f). Multiple expressions are treated as AND expressions, meaning
-   * that resources must match all expressions to pass the filters.
-   * @opt_param string maxResults The maximum number of results per page that
-   * should be returned. If the number of available results is larger than
-   * maxResults, Compute Engine returns a nextPageToken that can be used to get
-   * the next page of results in subsequent list requests. Acceptable values are 0
-   * to 500, inclusive. (Default: 500)
-   * @opt_param string orderBy Sorts list results by a certain order. By default,
-   * results are returned in alphanumerical order based on the resource name.
-   *
-   * You can also sort results in descending order based on the creation timestamp
-   * using orderBy="creationTimestamp desc". This sorts results based on the
-   * creationTimestamp field in reverse chronological order (newest result first).
-   * Use this to sort resources like operations so that the newest operation is
-   * returned first.
-   *
-   * Currently, only sorting by name or creationTimestamp desc is supported.
-   * @opt_param string pageToken Specifies a page token to use. Set pageToken to
-   * the nextPageToken returned by a previous list request to get the next page of
-   * results.
-   * @return Google_Service_Compute_OperationAggregatedList
-   */
-  public function aggregatedList($project, $optParams = array())
-  {
-    $params = array('project' => $project);
-    $params = array_merge($params, $optParams);
-    return $this->call('aggregatedList', array($params), "Google_Service_Compute_OperationAggregatedList");
-  }
-  /**
-   * Deletes the specified Operations resource. (globalOperations.delete)
-   *
-   * @param string $project Project ID for this request.
-   * @param string $operation Name of the Operations resource to delete.
-   * @param array $optParams Optional parameters.
-   */
-  public function delete($project, $operation, $optParams = array())
-  {
-    $params = array('project' => $project, 'operation' => $operation);
-    $params = array_merge($params, $optParams);
-    return $this->call('delete', array($params));
-  }
-  /**
-   * Retrieves the specified Operations resource. Get a list of operations by
-   * making a list() request. (globalOperations.get)
-   *
-   * @param string $project Project ID for this request.
-   * @param string $operation Name of the Operations resource to return.
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Compute_Operation
-   */
-  public function get($project, $operation, $optParams = array())
-  {
-    $params = array('project' => $project, 'operation' => $operation);
-    $params = array_merge($params, $optParams);
-    return $this->call('get', array($params), "Google_Service_Compute_Operation");
-  }
-  /**
-   * Retrieves a list of Operation resources contained within the specified
-   * project. (globalOperations.listGlobalOperations)
-   *
-   * @param string $project Project ID for this request.
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param string filter Sets a filter expression for filtering listed
-   * resources, in the form filter={expression}. Your {expression} must be in the
-   * format: field_name comparison_string literal_string.
-   *
-   * The field_name is the name of the field you want to compare. Only atomic
-   * field types are supported (string, number, boolean). The comparison_string
-   * must be either eq (equals) or ne (not equals). The literal_string is the
-   * string value to filter to. The literal value must be valid for the type of
-   * field you are filtering by (string, number, boolean). For string fields, the
-   * literal value is interpreted as a regular expression using RE2 syntax. The
-   * literal value must match the entire field.
-   *
-   * For example, to filter for instances that do not have a name of example-
-   * instance, you would use filter=name ne example-instance.
-   *
-   * You can filter on nested fields. For example, you could filter on instances
-   * that have set the scheduling.automaticRestart field to true. Use filtering on
-   * nested fields to take advantage of labels to organize and search for results
-   * based on label values.
-   *
-   * To filter on multiple expressions, provide each separate expression within
-   * parentheses. For example, (scheduling.automaticRestart eq true) (zone eq us-
-   * central1-f). Multiple expressions are treated as AND expressions, meaning
-   * that resources must match all expressions to pass the filters.
-   * @opt_param string maxResults The maximum number of results per page that
-   * should be returned. If the number of available results is larger than
-   * maxResults, Compute Engine returns a nextPageToken that can be used to get
-   * the next page of results in subsequent list requests. Acceptable values are 0
-   * to 500, inclusive. (Default: 500)
-   * @opt_param string orderBy Sorts list results by a certain order. By default,
-   * results are returned in alphanumerical order based on the resource name.
-   *
-   * You can also sort results in descending order based on the creation timestamp
-   * using orderBy="creationTimestamp desc". This sorts results based on the
-   * creationTimestamp field in reverse chronological order (newest result first).
-   * Use this to sort resources like operations so that the newest operation is
-   * returned first.
-   *
-   * Currently, only sorting by name or creationTimestamp desc is supported.
-   * @opt_param string pageToken Specifies a page token to use. Set pageToken to
-   * the nextPageToken returned by a previous list request to get the next page of
-   * results.
-   * @return Google_Service_Compute_OperationList
-   */
-  public function listGlobalOperations($project, $optParams = array())
-  {
-    $params = array('project' => $project);
-    $params = array_merge($params, $optParams);
-    return $this->call('list', array($params), "Google_Service_Compute_OperationList");
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/Resource/HealthChecks.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/Resource/HealthChecks.php
deleted file mode 100644
index c46e7e73..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/Resource/HealthChecks.php
+++ /dev/null
@@ -1,162 +0,0 @@
-
- *   $computeService = new Google_Service_Compute(...);
- *   $healthChecks = $computeService->healthChecks;
- *  
- */
-class Google_Service_Compute_Resource_HealthChecks extends Google_Service_Resource
-{
-  /**
-   * Deletes the specified HealthCheck resource. (healthChecks.delete)
-   *
-   * @param string $project Project ID for this request.
-   * @param string $healthCheck Name of the HealthCheck resource to delete.
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Compute_Operation
-   */
-  public function delete($project, $healthCheck, $optParams = array())
-  {
-    $params = array('project' => $project, 'healthCheck' => $healthCheck);
-    $params = array_merge($params, $optParams);
-    return $this->call('delete', array($params), "Google_Service_Compute_Operation");
-  }
-  /**
-   * Returns the specified HealthCheck resource. Get a list of available health
-   * checks by making a list() request. (healthChecks.get)
-   *
-   * @param string $project Project ID for this request.
-   * @param string $healthCheck Name of the HealthCheck resource to return.
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Compute_HealthCheck
-   */
-  public function get($project, $healthCheck, $optParams = array())
-  {
-    $params = array('project' => $project, 'healthCheck' => $healthCheck);
-    $params = array_merge($params, $optParams);
-    return $this->call('get', array($params), "Google_Service_Compute_HealthCheck");
-  }
-  /**
-   * Creates a HealthCheck resource in the specified project using the data
-   * included in the request. (healthChecks.insert)
-   *
-   * @param string $project Project ID for this request.
-   * @param Google_Service_Compute_HealthCheck $postBody
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Compute_Operation
-   */
-  public function insert($project, Google_Service_Compute_HealthCheck $postBody, $optParams = array())
-  {
-    $params = array('project' => $project, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('insert', array($params), "Google_Service_Compute_Operation");
-  }
-  /**
-   * Retrieves the list of HealthCheck resources available to the specified
-   * project. (healthChecks.listHealthChecks)
-   *
-   * @param string $project Project ID for this request.
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param string filter Sets a filter expression for filtering listed
-   * resources, in the form filter={expression}. Your {expression} must be in the
-   * format: field_name comparison_string literal_string.
-   *
-   * The field_name is the name of the field you want to compare. Only atomic
-   * field types are supported (string, number, boolean). The comparison_string
-   * must be either eq (equals) or ne (not equals). The literal_string is the
-   * string value to filter to. The literal value must be valid for the type of
-   * field you are filtering by (string, number, boolean). For string fields, the
-   * literal value is interpreted as a regular expression using RE2 syntax. The
-   * literal value must match the entire field.
-   *
-   * For example, to filter for instances that do not have a name of example-
-   * instance, you would use filter=name ne example-instance.
-   *
-   * You can filter on nested fields. For example, you could filter on instances
-   * that have set the scheduling.automaticRestart field to true. Use filtering on
-   * nested fields to take advantage of labels to organize and search for results
-   * based on label values.
-   *
-   * To filter on multiple expressions, provide each separate expression within
-   * parentheses. For example, (scheduling.automaticRestart eq true) (zone eq us-
-   * central1-f). Multiple expressions are treated as AND expressions, meaning
-   * that resources must match all expressions to pass the filters.
-   * @opt_param string maxResults The maximum number of results per page that
-   * should be returned. If the number of available results is larger than
-   * maxResults, Compute Engine returns a nextPageToken that can be used to get
-   * the next page of results in subsequent list requests. Acceptable values are 0
-   * to 500, inclusive. (Default: 500)
-   * @opt_param string orderBy Sorts list results by a certain order. By default,
-   * results are returned in alphanumerical order based on the resource name.
-   *
-   * You can also sort results in descending order based on the creation timestamp
-   * using orderBy="creationTimestamp desc". This sorts results based on the
-   * creationTimestamp field in reverse chronological order (newest result first).
-   * Use this to sort resources like operations so that the newest operation is
-   * returned first.
-   *
-   * Currently, only sorting by name or creationTimestamp desc is supported.
-   * @opt_param string pageToken Specifies a page token to use. Set pageToken to
-   * the nextPageToken returned by a previous list request to get the next page of
-   * results.
-   * @return Google_Service_Compute_HealthCheckList
-   */
-  public function listHealthChecks($project, $optParams = array())
-  {
-    $params = array('project' => $project);
-    $params = array_merge($params, $optParams);
-    return $this->call('list', array($params), "Google_Service_Compute_HealthCheckList");
-  }
-  /**
-   * Updates a HealthCheck resource in the specified project using the data
-   * included in the request. This method supports patch semantics.
-   * (healthChecks.patch)
-   *
-   * @param string $project Project ID for this request.
-   * @param string $healthCheck Name of the HealthCheck resource to update.
-   * @param Google_Service_Compute_HealthCheck $postBody
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Compute_Operation
-   */
-  public function patch($project, $healthCheck, Google_Service_Compute_HealthCheck $postBody, $optParams = array())
-  {
-    $params = array('project' => $project, 'healthCheck' => $healthCheck, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('patch', array($params), "Google_Service_Compute_Operation");
-  }
-  /**
-   * Updates a HealthCheck resource in the specified project using the data
-   * included in the request. (healthChecks.update)
-   *
-   * @param string $project Project ID for this request.
-   * @param string $healthCheck Name of the HealthCheck resource to update.
-   * @param Google_Service_Compute_HealthCheck $postBody
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Compute_Operation
-   */
-  public function update($project, $healthCheck, Google_Service_Compute_HealthCheck $postBody, $optParams = array())
-  {
-    $params = array('project' => $project, 'healthCheck' => $healthCheck, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('update', array($params), "Google_Service_Compute_Operation");
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/Resource/HttpHealthChecks.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/Resource/HttpHealthChecks.php
deleted file mode 100644
index bd261fa8..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/Resource/HttpHealthChecks.php
+++ /dev/null
@@ -1,166 +0,0 @@
-
- *   $computeService = new Google_Service_Compute(...);
- *   $httpHealthChecks = $computeService->httpHealthChecks;
- *  
- */
-class Google_Service_Compute_Resource_HttpHealthChecks extends Google_Service_Resource
-{
-  /**
-   * Deletes the specified HttpHealthCheck resource. (httpHealthChecks.delete)
-   *
-   * @param string $project Project ID for this request.
-   * @param string $httpHealthCheck Name of the HttpHealthCheck resource to
-   * delete.
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Compute_Operation
-   */
-  public function delete($project, $httpHealthCheck, $optParams = array())
-  {
-    $params = array('project' => $project, 'httpHealthCheck' => $httpHealthCheck);
-    $params = array_merge($params, $optParams);
-    return $this->call('delete', array($params), "Google_Service_Compute_Operation");
-  }
-  /**
-   * Returns the specified HttpHealthCheck resource. Get a list of available HTTP
-   * health checks by making a list() request. (httpHealthChecks.get)
-   *
-   * @param string $project Project ID for this request.
-   * @param string $httpHealthCheck Name of the HttpHealthCheck resource to
-   * return.
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Compute_HttpHealthCheck
-   */
-  public function get($project, $httpHealthCheck, $optParams = array())
-  {
-    $params = array('project' => $project, 'httpHealthCheck' => $httpHealthCheck);
-    $params = array_merge($params, $optParams);
-    return $this->call('get', array($params), "Google_Service_Compute_HttpHealthCheck");
-  }
-  /**
-   * Creates a HttpHealthCheck resource in the specified project using the data
-   * included in the request. (httpHealthChecks.insert)
-   *
-   * @param string $project Project ID for this request.
-   * @param Google_Service_Compute_HttpHealthCheck $postBody
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Compute_Operation
-   */
-  public function insert($project, Google_Service_Compute_HttpHealthCheck $postBody, $optParams = array())
-  {
-    $params = array('project' => $project, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('insert', array($params), "Google_Service_Compute_Operation");
-  }
-  /**
-   * Retrieves the list of HttpHealthCheck resources available to the specified
-   * project. (httpHealthChecks.listHttpHealthChecks)
-   *
-   * @param string $project Project ID for this request.
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param string filter Sets a filter expression for filtering listed
-   * resources, in the form filter={expression}. Your {expression} must be in the
-   * format: field_name comparison_string literal_string.
-   *
-   * The field_name is the name of the field you want to compare. Only atomic
-   * field types are supported (string, number, boolean). The comparison_string
-   * must be either eq (equals) or ne (not equals). The literal_string is the
-   * string value to filter to. The literal value must be valid for the type of
-   * field you are filtering by (string, number, boolean). For string fields, the
-   * literal value is interpreted as a regular expression using RE2 syntax. The
-   * literal value must match the entire field.
-   *
-   * For example, to filter for instances that do not have a name of example-
-   * instance, you would use filter=name ne example-instance.
-   *
-   * You can filter on nested fields. For example, you could filter on instances
-   * that have set the scheduling.automaticRestart field to true. Use filtering on
-   * nested fields to take advantage of labels to organize and search for results
-   * based on label values.
-   *
-   * To filter on multiple expressions, provide each separate expression within
-   * parentheses. For example, (scheduling.automaticRestart eq true) (zone eq us-
-   * central1-f). Multiple expressions are treated as AND expressions, meaning
-   * that resources must match all expressions to pass the filters.
-   * @opt_param string maxResults The maximum number of results per page that
-   * should be returned. If the number of available results is larger than
-   * maxResults, Compute Engine returns a nextPageToken that can be used to get
-   * the next page of results in subsequent list requests. Acceptable values are 0
-   * to 500, inclusive. (Default: 500)
-   * @opt_param string orderBy Sorts list results by a certain order. By default,
-   * results are returned in alphanumerical order based on the resource name.
-   *
-   * You can also sort results in descending order based on the creation timestamp
-   * using orderBy="creationTimestamp desc". This sorts results based on the
-   * creationTimestamp field in reverse chronological order (newest result first).
-   * Use this to sort resources like operations so that the newest operation is
-   * returned first.
-   *
-   * Currently, only sorting by name or creationTimestamp desc is supported.
-   * @opt_param string pageToken Specifies a page token to use. Set pageToken to
-   * the nextPageToken returned by a previous list request to get the next page of
-   * results.
-   * @return Google_Service_Compute_HttpHealthCheckList
-   */
-  public function listHttpHealthChecks($project, $optParams = array())
-  {
-    $params = array('project' => $project);
-    $params = array_merge($params, $optParams);
-    return $this->call('list', array($params), "Google_Service_Compute_HttpHealthCheckList");
-  }
-  /**
-   * Updates a HttpHealthCheck resource in the specified project using the data
-   * included in the request. This method supports patch semantics.
-   * (httpHealthChecks.patch)
-   *
-   * @param string $project Project ID for this request.
-   * @param string $httpHealthCheck Name of the HttpHealthCheck resource to
-   * update.
-   * @param Google_Service_Compute_HttpHealthCheck $postBody
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Compute_Operation
-   */
-  public function patch($project, $httpHealthCheck, Google_Service_Compute_HttpHealthCheck $postBody, $optParams = array())
-  {
-    $params = array('project' => $project, 'httpHealthCheck' => $httpHealthCheck, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('patch', array($params), "Google_Service_Compute_Operation");
-  }
-  /**
-   * Updates a HttpHealthCheck resource in the specified project using the data
-   * included in the request. (httpHealthChecks.update)
-   *
-   * @param string $project Project ID for this request.
-   * @param string $httpHealthCheck Name of the HttpHealthCheck resource to
-   * update.
-   * @param Google_Service_Compute_HttpHealthCheck $postBody
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Compute_Operation
-   */
-  public function update($project, $httpHealthCheck, Google_Service_Compute_HttpHealthCheck $postBody, $optParams = array())
-  {
-    $params = array('project' => $project, 'httpHealthCheck' => $httpHealthCheck, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('update', array($params), "Google_Service_Compute_Operation");
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/Resource/HttpsHealthChecks.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/Resource/HttpsHealthChecks.php
deleted file mode 100644
index dcbfe55f..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/Resource/HttpsHealthChecks.php
+++ /dev/null
@@ -1,166 +0,0 @@
-
- *   $computeService = new Google_Service_Compute(...);
- *   $httpsHealthChecks = $computeService->httpsHealthChecks;
- *  
- */
-class Google_Service_Compute_Resource_HttpsHealthChecks extends Google_Service_Resource
-{
-  /**
-   * Deletes the specified HttpsHealthCheck resource. (httpsHealthChecks.delete)
-   *
-   * @param string $project Project ID for this request.
-   * @param string $httpsHealthCheck Name of the HttpsHealthCheck resource to
-   * delete.
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Compute_Operation
-   */
-  public function delete($project, $httpsHealthCheck, $optParams = array())
-  {
-    $params = array('project' => $project, 'httpsHealthCheck' => $httpsHealthCheck);
-    $params = array_merge($params, $optParams);
-    return $this->call('delete', array($params), "Google_Service_Compute_Operation");
-  }
-  /**
-   * Returns the specified HttpsHealthCheck resource. Get a list of available
-   * HTTPS health checks by making a list() request. (httpsHealthChecks.get)
-   *
-   * @param string $project Project ID for this request.
-   * @param string $httpsHealthCheck Name of the HttpsHealthCheck resource to
-   * return.
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Compute_HttpsHealthCheck
-   */
-  public function get($project, $httpsHealthCheck, $optParams = array())
-  {
-    $params = array('project' => $project, 'httpsHealthCheck' => $httpsHealthCheck);
-    $params = array_merge($params, $optParams);
-    return $this->call('get', array($params), "Google_Service_Compute_HttpsHealthCheck");
-  }
-  /**
-   * Creates a HttpsHealthCheck resource in the specified project using the data
-   * included in the request. (httpsHealthChecks.insert)
-   *
-   * @param string $project Project ID for this request.
-   * @param Google_Service_Compute_HttpsHealthCheck $postBody
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Compute_Operation
-   */
-  public function insert($project, Google_Service_Compute_HttpsHealthCheck $postBody, $optParams = array())
-  {
-    $params = array('project' => $project, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('insert', array($params), "Google_Service_Compute_Operation");
-  }
-  /**
-   * Retrieves the list of HttpsHealthCheck resources available to the specified
-   * project. (httpsHealthChecks.listHttpsHealthChecks)
-   *
-   * @param string $project Project ID for this request.
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param string filter Sets a filter expression for filtering listed
-   * resources, in the form filter={expression}. Your {expression} must be in the
-   * format: field_name comparison_string literal_string.
-   *
-   * The field_name is the name of the field you want to compare. Only atomic
-   * field types are supported (string, number, boolean). The comparison_string
-   * must be either eq (equals) or ne (not equals). The literal_string is the
-   * string value to filter to. The literal value must be valid for the type of
-   * field you are filtering by (string, number, boolean). For string fields, the
-   * literal value is interpreted as a regular expression using RE2 syntax. The
-   * literal value must match the entire field.
-   *
-   * For example, to filter for instances that do not have a name of example-
-   * instance, you would use filter=name ne example-instance.
-   *
-   * You can filter on nested fields. For example, you could filter on instances
-   * that have set the scheduling.automaticRestart field to true. Use filtering on
-   * nested fields to take advantage of labels to organize and search for results
-   * based on label values.
-   *
-   * To filter on multiple expressions, provide each separate expression within
-   * parentheses. For example, (scheduling.automaticRestart eq true) (zone eq us-
-   * central1-f). Multiple expressions are treated as AND expressions, meaning
-   * that resources must match all expressions to pass the filters.
-   * @opt_param string maxResults The maximum number of results per page that
-   * should be returned. If the number of available results is larger than
-   * maxResults, Compute Engine returns a nextPageToken that can be used to get
-   * the next page of results in subsequent list requests. Acceptable values are 0
-   * to 500, inclusive. (Default: 500)
-   * @opt_param string orderBy Sorts list results by a certain order. By default,
-   * results are returned in alphanumerical order based on the resource name.
-   *
-   * You can also sort results in descending order based on the creation timestamp
-   * using orderBy="creationTimestamp desc". This sorts results based on the
-   * creationTimestamp field in reverse chronological order (newest result first).
-   * Use this to sort resources like operations so that the newest operation is
-   * returned first.
-   *
-   * Currently, only sorting by name or creationTimestamp desc is supported.
-   * @opt_param string pageToken Specifies a page token to use. Set pageToken to
-   * the nextPageToken returned by a previous list request to get the next page of
-   * results.
-   * @return Google_Service_Compute_HttpsHealthCheckList
-   */
-  public function listHttpsHealthChecks($project, $optParams = array())
-  {
-    $params = array('project' => $project);
-    $params = array_merge($params, $optParams);
-    return $this->call('list', array($params), "Google_Service_Compute_HttpsHealthCheckList");
-  }
-  /**
-   * Updates a HttpsHealthCheck resource in the specified project using the data
-   * included in the request. This method supports patch semantics.
-   * (httpsHealthChecks.patch)
-   *
-   * @param string $project Project ID for this request.
-   * @param string $httpsHealthCheck Name of the HttpsHealthCheck resource to
-   * update.
-   * @param Google_Service_Compute_HttpsHealthCheck $postBody
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Compute_Operation
-   */
-  public function patch($project, $httpsHealthCheck, Google_Service_Compute_HttpsHealthCheck $postBody, $optParams = array())
-  {
-    $params = array('project' => $project, 'httpsHealthCheck' => $httpsHealthCheck, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('patch', array($params), "Google_Service_Compute_Operation");
-  }
-  /**
-   * Updates a HttpsHealthCheck resource in the specified project using the data
-   * included in the request. (httpsHealthChecks.update)
-   *
-   * @param string $project Project ID for this request.
-   * @param string $httpsHealthCheck Name of the HttpsHealthCheck resource to
-   * update.
-   * @param Google_Service_Compute_HttpsHealthCheck $postBody
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Compute_Operation
-   */
-  public function update($project, $httpsHealthCheck, Google_Service_Compute_HttpsHealthCheck $postBody, $optParams = array())
-  {
-    $params = array('project' => $project, 'httpsHealthCheck' => $httpsHealthCheck, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('update', array($params), "Google_Service_Compute_Operation");
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/Resource/Images.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/Resource/Images.php
deleted file mode 100644
index e3b5ac1f..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/Resource/Images.php
+++ /dev/null
@@ -1,166 +0,0 @@
-
- *   $computeService = new Google_Service_Compute(...);
- *   $images = $computeService->images;
- *  
- */
-class Google_Service_Compute_Resource_Images extends Google_Service_Resource
-{
-  /**
-   * Deletes the specified image. (images.delete)
-   *
-   * @param string $project Project ID for this request.
-   * @param string $image Name of the image resource to delete.
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Compute_Operation
-   */
-  public function delete($project, $image, $optParams = array())
-  {
-    $params = array('project' => $project, 'image' => $image);
-    $params = array_merge($params, $optParams);
-    return $this->call('delete', array($params), "Google_Service_Compute_Operation");
-  }
-  /**
-   * Sets the deprecation status of an image.
-   *
-   * If an empty request body is given, clears the deprecation status instead.
-   * (images.deprecate)
-   *
-   * @param string $project Project ID for this request.
-   * @param string $image Image name.
-   * @param Google_Service_Compute_DeprecationStatus $postBody
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Compute_Operation
-   */
-  public function deprecate($project, $image, Google_Service_Compute_DeprecationStatus $postBody, $optParams = array())
-  {
-    $params = array('project' => $project, 'image' => $image, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('deprecate', array($params), "Google_Service_Compute_Operation");
-  }
-  /**
-   * Returns the specified image. Get a list of available images by making a
-   * list() request. (images.get)
-   *
-   * @param string $project Project ID for this request.
-   * @param string $image Name of the image resource to return.
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Compute_Image
-   */
-  public function get($project, $image, $optParams = array())
-  {
-    $params = array('project' => $project, 'image' => $image);
-    $params = array_merge($params, $optParams);
-    return $this->call('get', array($params), "Google_Service_Compute_Image");
-  }
-  /**
-   * Returns the latest image that is part of an image family and is not
-   * deprecated. (images.getFromFamily)
-   *
-   * @param string $project Project ID for this request.
-   * @param string $family Name of the image family to search for.
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Compute_Image
-   */
-  public function getFromFamily($project, $family, $optParams = array())
-  {
-    $params = array('project' => $project, 'family' => $family);
-    $params = array_merge($params, $optParams);
-    return $this->call('getFromFamily', array($params), "Google_Service_Compute_Image");
-  }
-  /**
-   * Creates an image in the specified project using the data included in the
-   * request. (images.insert)
-   *
-   * @param string $project Project ID for this request.
-   * @param Google_Service_Compute_Image $postBody
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Compute_Operation
-   */
-  public function insert($project, Google_Service_Compute_Image $postBody, $optParams = array())
-  {
-    $params = array('project' => $project, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('insert', array($params), "Google_Service_Compute_Operation");
-  }
-  /**
-   * Retrieves the list of private images available to the specified project.
-   * Private images are images you create that belong to your project. This method
-   * does not get any images that belong to other projects, including publicly-
-   * available images, like Debian 8. If you want to get a list of publicly-
-   * available images, use this method to make a request to the respective image
-   * project, such as debian-cloud or windows-cloud. (images.listImages)
-   *
-   * @param string $project Project ID for this request.
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param string filter Sets a filter expression for filtering listed
-   * resources, in the form filter={expression}. Your {expression} must be in the
-   * format: field_name comparison_string literal_string.
-   *
-   * The field_name is the name of the field you want to compare. Only atomic
-   * field types are supported (string, number, boolean). The comparison_string
-   * must be either eq (equals) or ne (not equals). The literal_string is the
-   * string value to filter to. The literal value must be valid for the type of
-   * field you are filtering by (string, number, boolean). For string fields, the
-   * literal value is interpreted as a regular expression using RE2 syntax. The
-   * literal value must match the entire field.
-   *
-   * For example, to filter for instances that do not have a name of example-
-   * instance, you would use filter=name ne example-instance.
-   *
-   * You can filter on nested fields. For example, you could filter on instances
-   * that have set the scheduling.automaticRestart field to true. Use filtering on
-   * nested fields to take advantage of labels to organize and search for results
-   * based on label values.
-   *
-   * To filter on multiple expressions, provide each separate expression within
-   * parentheses. For example, (scheduling.automaticRestart eq true) (zone eq us-
-   * central1-f). Multiple expressions are treated as AND expressions, meaning
-   * that resources must match all expressions to pass the filters.
-   * @opt_param string maxResults The maximum number of results per page that
-   * should be returned. If the number of available results is larger than
-   * maxResults, Compute Engine returns a nextPageToken that can be used to get
-   * the next page of results in subsequent list requests. Acceptable values are 0
-   * to 500, inclusive. (Default: 500)
-   * @opt_param string orderBy Sorts list results by a certain order. By default,
-   * results are returned in alphanumerical order based on the resource name.
-   *
-   * You can also sort results in descending order based on the creation timestamp
-   * using orderBy="creationTimestamp desc". This sorts results based on the
-   * creationTimestamp field in reverse chronological order (newest result first).
-   * Use this to sort resources like operations so that the newest operation is
-   * returned first.
-   *
-   * Currently, only sorting by name or creationTimestamp desc is supported.
-   * @opt_param string pageToken Specifies a page token to use. Set pageToken to
-   * the nextPageToken returned by a previous list request to get the next page of
-   * results.
-   * @return Google_Service_Compute_ImageList
-   */
-  public function listImages($project, $optParams = array())
-  {
-    $params = array('project' => $project);
-    $params = array_merge($params, $optParams);
-    return $this->call('list', array($params), "Google_Service_Compute_ImageList");
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/Resource/InstanceGroupManagers.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/Resource/InstanceGroupManagers.php
deleted file mode 100644
index 1fb564e0..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/Resource/InstanceGroupManagers.php
+++ /dev/null
@@ -1,369 +0,0 @@
-
- *   $computeService = new Google_Service_Compute(...);
- *   $instanceGroupManagers = $computeService->instanceGroupManagers;
- *  
- */
-class Google_Service_Compute_Resource_InstanceGroupManagers extends Google_Service_Resource
-{
-  /**
-   * Schedules a group action to remove the specified instances from the managed
-   * instance group. Abandoning an instance does not delete the instance, but it
-   * does remove the instance from any target pools that are applied by the
-   * managed instance group. This method reduces the targetSize of the managed
-   * instance group by the number of instances that you abandon. This operation is
-   * marked as DONE when the action is scheduled even if the instances have not
-   * yet been removed from the group. You must separately verify the status of the
-   * abandoning action with the listmanagedinstances method.
-   * (instanceGroupManagers.abandonInstances)
-   *
-   * @param string $project Project ID for this request.
-   * @param string $zone The name of the zone where the managed instance group is
-   * located.
-   * @param string $instanceGroupManager The name of the managed instance group.
-   * @param Google_Service_Compute_InstanceGroupManagersAbandonInstancesRequest $postBody
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Compute_Operation
-   */
-  public function abandonInstances($project, $zone, $instanceGroupManager, Google_Service_Compute_InstanceGroupManagersAbandonInstancesRequest $postBody, $optParams = array())
-  {
-    $params = array('project' => $project, 'zone' => $zone, 'instanceGroupManager' => $instanceGroupManager, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('abandonInstances', array($params), "Google_Service_Compute_Operation");
-  }
-  /**
-   * Retrieves the list of managed instance groups and groups them by zone.
-   * (instanceGroupManagers.aggregatedList)
-   *
-   * @param string $project Project ID for this request.
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param string filter Sets a filter expression for filtering listed
-   * resources, in the form filter={expression}. Your {expression} must be in the
-   * format: field_name comparison_string literal_string.
-   *
-   * The field_name is the name of the field you want to compare. Only atomic
-   * field types are supported (string, number, boolean). The comparison_string
-   * must be either eq (equals) or ne (not equals). The literal_string is the
-   * string value to filter to. The literal value must be valid for the type of
-   * field you are filtering by (string, number, boolean). For string fields, the
-   * literal value is interpreted as a regular expression using RE2 syntax. The
-   * literal value must match the entire field.
-   *
-   * For example, to filter for instances that do not have a name of example-
-   * instance, you would use filter=name ne example-instance.
-   *
-   * You can filter on nested fields. For example, you could filter on instances
-   * that have set the scheduling.automaticRestart field to true. Use filtering on
-   * nested fields to take advantage of labels to organize and search for results
-   * based on label values.
-   *
-   * To filter on multiple expressions, provide each separate expression within
-   * parentheses. For example, (scheduling.automaticRestart eq true) (zone eq us-
-   * central1-f). Multiple expressions are treated as AND expressions, meaning
-   * that resources must match all expressions to pass the filters.
-   * @opt_param string maxResults The maximum number of results per page that
-   * should be returned. If the number of available results is larger than
-   * maxResults, Compute Engine returns a nextPageToken that can be used to get
-   * the next page of results in subsequent list requests. Acceptable values are 0
-   * to 500, inclusive. (Default: 500)
-   * @opt_param string orderBy Sorts list results by a certain order. By default,
-   * results are returned in alphanumerical order based on the resource name.
-   *
-   * You can also sort results in descending order based on the creation timestamp
-   * using orderBy="creationTimestamp desc". This sorts results based on the
-   * creationTimestamp field in reverse chronological order (newest result first).
-   * Use this to sort resources like operations so that the newest operation is
-   * returned first.
-   *
-   * Currently, only sorting by name or creationTimestamp desc is supported.
-   * @opt_param string pageToken Specifies a page token to use. Set pageToken to
-   * the nextPageToken returned by a previous list request to get the next page of
-   * results.
-   * @return Google_Service_Compute_InstanceGroupManagerAggregatedList
-   */
-  public function aggregatedList($project, $optParams = array())
-  {
-    $params = array('project' => $project);
-    $params = array_merge($params, $optParams);
-    return $this->call('aggregatedList', array($params), "Google_Service_Compute_InstanceGroupManagerAggregatedList");
-  }
-  /**
-   * Deletes the specified managed instance group and all of the instances in that
-   * group. Note that the instance group must not belong to a backend service.
-   * Read  Deleting an instance group for more information.
-   * (instanceGroupManagers.delete)
-   *
-   * @param string $project Project ID for this request.
-   * @param string $zone The name of the zone where the managed instance group is
-   * located.
-   * @param string $instanceGroupManager The name of the managed instance group to
-   * delete.
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Compute_Operation
-   */
-  public function delete($project, $zone, $instanceGroupManager, $optParams = array())
-  {
-    $params = array('project' => $project, 'zone' => $zone, 'instanceGroupManager' => $instanceGroupManager);
-    $params = array_merge($params, $optParams);
-    return $this->call('delete', array($params), "Google_Service_Compute_Operation");
-  }
-  /**
-   * Schedules a group action to delete the specified instances in the managed
-   * instance group. The instances are also removed from any target pools of which
-   * they were a member. This method reduces the targetSize of the managed
-   * instance group by the number of instances that you delete. This operation is
-   * marked as DONE when the action is scheduled even if the instances are still
-   * being deleted. You must separately verify the status of the deleting action
-   * with the listmanagedinstances method. (instanceGroupManagers.deleteInstances)
-   *
-   * @param string $project Project ID for this request.
-   * @param string $zone The name of the zone where the managed instance group is
-   * located.
-   * @param string $instanceGroupManager The name of the managed instance group.
-   * @param Google_Service_Compute_InstanceGroupManagersDeleteInstancesRequest $postBody
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Compute_Operation
-   */
-  public function deleteInstances($project, $zone, $instanceGroupManager, Google_Service_Compute_InstanceGroupManagersDeleteInstancesRequest $postBody, $optParams = array())
-  {
-    $params = array('project' => $project, 'zone' => $zone, 'instanceGroupManager' => $instanceGroupManager, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('deleteInstances', array($params), "Google_Service_Compute_Operation");
-  }
-  /**
-   * Returns all of the details about the specified managed instance group. Get a
-   * list of available managed instance groups by making a list() request.
-   * (instanceGroupManagers.get)
-   *
-   * @param string $project Project ID for this request.
-   * @param string $zone The name of the zone where the managed instance group is
-   * located.
-   * @param string $instanceGroupManager The name of the managed instance group.
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Compute_InstanceGroupManager
-   */
-  public function get($project, $zone, $instanceGroupManager, $optParams = array())
-  {
-    $params = array('project' => $project, 'zone' => $zone, 'instanceGroupManager' => $instanceGroupManager);
-    $params = array_merge($params, $optParams);
-    return $this->call('get', array($params), "Google_Service_Compute_InstanceGroupManager");
-  }
-  /**
-   * Creates a managed instance group using the information that you specify in
-   * the request. After the group is created, it schedules an action to create
-   * instances in the group using the specified instance template. This operation
-   * is marked as DONE when the group is created even if the instances in the
-   * group have not yet been created. You must separately verify the status of the
-   * individual instances with the listmanagedinstances method.
-   * (instanceGroupManagers.insert)
-   *
-   * @param string $project Project ID for this request.
-   * @param string $zone The name of the zone where you want to create the managed
-   * instance group.
-   * @param Google_Service_Compute_InstanceGroupManager $postBody
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Compute_Operation
-   */
-  public function insert($project, $zone, Google_Service_Compute_InstanceGroupManager $postBody, $optParams = array())
-  {
-    $params = array('project' => $project, 'zone' => $zone, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('insert', array($params), "Google_Service_Compute_Operation");
-  }
-  /**
-   * Retrieves a list of managed instance groups that are contained within the
-   * specified project and zone. (instanceGroupManagers.listInstanceGroupManagers)
-   *
-   * @param string $project Project ID for this request.
-   * @param string $zone The name of the zone where the managed instance group is
-   * located.
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param string filter Sets a filter expression for filtering listed
-   * resources, in the form filter={expression}. Your {expression} must be in the
-   * format: field_name comparison_string literal_string.
-   *
-   * The field_name is the name of the field you want to compare. Only atomic
-   * field types are supported (string, number, boolean). The comparison_string
-   * must be either eq (equals) or ne (not equals). The literal_string is the
-   * string value to filter to. The literal value must be valid for the type of
-   * field you are filtering by (string, number, boolean). For string fields, the
-   * literal value is interpreted as a regular expression using RE2 syntax. The
-   * literal value must match the entire field.
-   *
-   * For example, to filter for instances that do not have a name of example-
-   * instance, you would use filter=name ne example-instance.
-   *
-   * You can filter on nested fields. For example, you could filter on instances
-   * that have set the scheduling.automaticRestart field to true. Use filtering on
-   * nested fields to take advantage of labels to organize and search for results
-   * based on label values.
-   *
-   * To filter on multiple expressions, provide each separate expression within
-   * parentheses. For example, (scheduling.automaticRestart eq true) (zone eq us-
-   * central1-f). Multiple expressions are treated as AND expressions, meaning
-   * that resources must match all expressions to pass the filters.
-   * @opt_param string maxResults The maximum number of results per page that
-   * should be returned. If the number of available results is larger than
-   * maxResults, Compute Engine returns a nextPageToken that can be used to get
-   * the next page of results in subsequent list requests. Acceptable values are 0
-   * to 500, inclusive. (Default: 500)
-   * @opt_param string orderBy Sorts list results by a certain order. By default,
-   * results are returned in alphanumerical order based on the resource name.
-   *
-   * You can also sort results in descending order based on the creation timestamp
-   * using orderBy="creationTimestamp desc". This sorts results based on the
-   * creationTimestamp field in reverse chronological order (newest result first).
-   * Use this to sort resources like operations so that the newest operation is
-   * returned first.
-   *
-   * Currently, only sorting by name or creationTimestamp desc is supported.
-   * @opt_param string pageToken Specifies a page token to use. Set pageToken to
-   * the nextPageToken returned by a previous list request to get the next page of
-   * results.
-   * @return Google_Service_Compute_InstanceGroupManagerList
-   */
-  public function listInstanceGroupManagers($project, $zone, $optParams = array())
-  {
-    $params = array('project' => $project, 'zone' => $zone);
-    $params = array_merge($params, $optParams);
-    return $this->call('list', array($params), "Google_Service_Compute_InstanceGroupManagerList");
-  }
-  /**
-   * Lists all of the instances in the managed instance group. Each instance in
-   * the list has a currentAction, which indicates the action that the managed
-   * instance group is performing on the instance. For example, if the group is
-   * still creating an instance, the currentAction is CREATING. If a previous
-   * action failed, the list displays the errors for that failed action.
-   * (instanceGroupManagers.listManagedInstances)
-   *
-   * @param string $project Project ID for this request.
-   * @param string $zone The name of the zone where the managed instance group is
-   * located.
-   * @param string $instanceGroupManager The name of the managed instance group.
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param string filter
-   * @opt_param string maxResults
-   * @opt_param string order_by
-   * @opt_param string pageToken
-   * @return Google_Service_Compute_InstanceGroupManagersListManagedInstancesResponse
-   */
-  public function listManagedInstances($project, $zone, $instanceGroupManager, $optParams = array())
-  {
-    $params = array('project' => $project, 'zone' => $zone, 'instanceGroupManager' => $instanceGroupManager);
-    $params = array_merge($params, $optParams);
-    return $this->call('listManagedInstances', array($params), "Google_Service_Compute_InstanceGroupManagersListManagedInstancesResponse");
-  }
-  /**
-   * Schedules a group action to recreate the specified instances in the managed
-   * instance group. The instances are deleted and recreated using the current
-   * instance template for the managed instance group. This operation is marked as
-   * DONE when the action is scheduled even if the instances have not yet been
-   * recreated. You must separately verify the status of the recreating action
-   * with the listmanagedinstances method.
-   * (instanceGroupManagers.recreateInstances)
-   *
-   * @param string $project Project ID for this request.
-   * @param string $zone The name of the zone where the managed instance group is
-   * located.
-   * @param string $instanceGroupManager The name of the managed instance group.
-   * @param Google_Service_Compute_InstanceGroupManagersRecreateInstancesRequest $postBody
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Compute_Operation
-   */
-  public function recreateInstances($project, $zone, $instanceGroupManager, Google_Service_Compute_InstanceGroupManagersRecreateInstancesRequest $postBody, $optParams = array())
-  {
-    $params = array('project' => $project, 'zone' => $zone, 'instanceGroupManager' => $instanceGroupManager, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('recreateInstances', array($params), "Google_Service_Compute_Operation");
-  }
-  /**
-   * Resizes the managed instance group. If you increase the size, the group
-   * creates new instances using the current instance template. If you decrease
-   * the size, the group deletes instances. The resize operation is marked DONE
-   * when the resize actions are scheduled even if the group has not yet added or
-   * deleted any instances. You must separately verify the status of the creating
-   * or deleting actions with the listmanagedinstances method.
-   * (instanceGroupManagers.resize)
-   *
-   * @param string $project Project ID for this request.
-   * @param string $zone The name of the zone where the managed instance group is
-   * located.
-   * @param string $instanceGroupManager The name of the managed instance group.
-   * @param int $size The number of running instances that the managed instance
-   * group should maintain at any given time. The group automatically adds or
-   * removes instances to maintain the number of instances specified by this
-   * parameter.
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Compute_Operation
-   */
-  public function resize($project, $zone, $instanceGroupManager, $size, $optParams = array())
-  {
-    $params = array('project' => $project, 'zone' => $zone, 'instanceGroupManager' => $instanceGroupManager, 'size' => $size);
-    $params = array_merge($params, $optParams);
-    return $this->call('resize', array($params), "Google_Service_Compute_Operation");
-  }
-  /**
-   * Specifies the instance template to use when creating new instances in this
-   * group. The templates for existing instances in the group do not change unless
-   * you recreate them. (instanceGroupManagers.setInstanceTemplate)
-   *
-   * @param string $project Project ID for this request.
-   * @param string $zone The name of the zone where the managed instance group is
-   * located.
-   * @param string $instanceGroupManager The name of the managed instance group.
-   * @param Google_Service_Compute_InstanceGroupManagersSetInstanceTemplateRequest $postBody
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Compute_Operation
-   */
-  public function setInstanceTemplate($project, $zone, $instanceGroupManager, Google_Service_Compute_InstanceGroupManagersSetInstanceTemplateRequest $postBody, $optParams = array())
-  {
-    $params = array('project' => $project, 'zone' => $zone, 'instanceGroupManager' => $instanceGroupManager, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('setInstanceTemplate', array($params), "Google_Service_Compute_Operation");
-  }
-  /**
-   * Modifies the target pools to which all instances in this managed instance
-   * group are assigned. The target pools automatically apply to all of the
-   * instances in the managed instance group. This operation is marked DONE when
-   * you make the request even if the instances have not yet been added to their
-   * target pools. The change might take some time to apply to all of the
-   * instances in the group depending on the size of the group.
-   * (instanceGroupManagers.setTargetPools)
-   *
-   * @param string $project Project ID for this request.
-   * @param string $zone The name of the zone where the managed instance group is
-   * located.
-   * @param string $instanceGroupManager The name of the managed instance group.
-   * @param Google_Service_Compute_InstanceGroupManagersSetTargetPoolsRequest $postBody
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Compute_Operation
-   */
-  public function setTargetPools($project, $zone, $instanceGroupManager, Google_Service_Compute_InstanceGroupManagersSetTargetPoolsRequest $postBody, $optParams = array())
-  {
-    $params = array('project' => $project, 'zone' => $zone, 'instanceGroupManager' => $instanceGroupManager, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('setTargetPools', array($params), "Google_Service_Compute_Operation");
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/Resource/InstanceGroups.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/Resource/InstanceGroups.php
deleted file mode 100644
index 6945f6df..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/Resource/InstanceGroups.php
+++ /dev/null
@@ -1,309 +0,0 @@
-
- *   $computeService = new Google_Service_Compute(...);
- *   $instanceGroups = $computeService->instanceGroups;
- *  
- */
-class Google_Service_Compute_Resource_InstanceGroups extends Google_Service_Resource
-{
-  /**
-   * Adds a list of instances to the specified instance group. All of the
-   * instances in the instance group must be in the same network/subnetwork. Read
-   * Adding instances for more information. (instanceGroups.addInstances)
-   *
-   * @param string $project Project ID for this request.
-   * @param string $zone The name of the zone where the instance group is located.
-   * @param string $instanceGroup The name of the instance group where you are
-   * adding instances.
-   * @param Google_Service_Compute_InstanceGroupsAddInstancesRequest $postBody
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Compute_Operation
-   */
-  public function addInstances($project, $zone, $instanceGroup, Google_Service_Compute_InstanceGroupsAddInstancesRequest $postBody, $optParams = array())
-  {
-    $params = array('project' => $project, 'zone' => $zone, 'instanceGroup' => $instanceGroup, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('addInstances', array($params), "Google_Service_Compute_Operation");
-  }
-  /**
-   * Retrieves the list of instance groups and sorts them by zone.
-   * (instanceGroups.aggregatedList)
-   *
-   * @param string $project Project ID for this request.
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param string filter Sets a filter expression for filtering listed
-   * resources, in the form filter={expression}. Your {expression} must be in the
-   * format: field_name comparison_string literal_string.
-   *
-   * The field_name is the name of the field you want to compare. Only atomic
-   * field types are supported (string, number, boolean). The comparison_string
-   * must be either eq (equals) or ne (not equals). The literal_string is the
-   * string value to filter to. The literal value must be valid for the type of
-   * field you are filtering by (string, number, boolean). For string fields, the
-   * literal value is interpreted as a regular expression using RE2 syntax. The
-   * literal value must match the entire field.
-   *
-   * For example, to filter for instances that do not have a name of example-
-   * instance, you would use filter=name ne example-instance.
-   *
-   * You can filter on nested fields. For example, you could filter on instances
-   * that have set the scheduling.automaticRestart field to true. Use filtering on
-   * nested fields to take advantage of labels to organize and search for results
-   * based on label values.
-   *
-   * To filter on multiple expressions, provide each separate expression within
-   * parentheses. For example, (scheduling.automaticRestart eq true) (zone eq us-
-   * central1-f). Multiple expressions are treated as AND expressions, meaning
-   * that resources must match all expressions to pass the filters.
-   * @opt_param string maxResults The maximum number of results per page that
-   * should be returned. If the number of available results is larger than
-   * maxResults, Compute Engine returns a nextPageToken that can be used to get
-   * the next page of results in subsequent list requests. Acceptable values are 0
-   * to 500, inclusive. (Default: 500)
-   * @opt_param string orderBy Sorts list results by a certain order. By default,
-   * results are returned in alphanumerical order based on the resource name.
-   *
-   * You can also sort results in descending order based on the creation timestamp
-   * using orderBy="creationTimestamp desc". This sorts results based on the
-   * creationTimestamp field in reverse chronological order (newest result first).
-   * Use this to sort resources like operations so that the newest operation is
-   * returned first.
-   *
-   * Currently, only sorting by name or creationTimestamp desc is supported.
-   * @opt_param string pageToken Specifies a page token to use. Set pageToken to
-   * the nextPageToken returned by a previous list request to get the next page of
-   * results.
-   * @return Google_Service_Compute_InstanceGroupAggregatedList
-   */
-  public function aggregatedList($project, $optParams = array())
-  {
-    $params = array('project' => $project);
-    $params = array_merge($params, $optParams);
-    return $this->call('aggregatedList', array($params), "Google_Service_Compute_InstanceGroupAggregatedList");
-  }
-  /**
-   * Deletes the specified instance group. The instances in the group are not
-   * deleted. Note that instance group must not belong to a backend service. Read
-   * Deleting an instance group for more information. (instanceGroups.delete)
-   *
-   * @param string $project Project ID for this request.
-   * @param string $zone The name of the zone where the instance group is located.
-   * @param string $instanceGroup The name of the instance group to delete.
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Compute_Operation
-   */
-  public function delete($project, $zone, $instanceGroup, $optParams = array())
-  {
-    $params = array('project' => $project, 'zone' => $zone, 'instanceGroup' => $instanceGroup);
-    $params = array_merge($params, $optParams);
-    return $this->call('delete', array($params), "Google_Service_Compute_Operation");
-  }
-  /**
-   * Returns the specified instance group. Get a list of available instance groups
-   * by making a list() request. (instanceGroups.get)
-   *
-   * @param string $project Project ID for this request.
-   * @param string $zone The name of the zone where the instance group is located.
-   * @param string $instanceGroup The name of the instance group.
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Compute_InstanceGroup
-   */
-  public function get($project, $zone, $instanceGroup, $optParams = array())
-  {
-    $params = array('project' => $project, 'zone' => $zone, 'instanceGroup' => $instanceGroup);
-    $params = array_merge($params, $optParams);
-    return $this->call('get', array($params), "Google_Service_Compute_InstanceGroup");
-  }
-  /**
-   * Creates an instance group in the specified project using the parameters that
-   * are included in the request. (instanceGroups.insert)
-   *
-   * @param string $project Project ID for this request.
-   * @param string $zone The name of the zone where you want to create the
-   * instance group.
-   * @param Google_Service_Compute_InstanceGroup $postBody
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Compute_Operation
-   */
-  public function insert($project, $zone, Google_Service_Compute_InstanceGroup $postBody, $optParams = array())
-  {
-    $params = array('project' => $project, 'zone' => $zone, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('insert', array($params), "Google_Service_Compute_Operation");
-  }
-  /**
-   * Retrieves the list of instance groups that are located in the specified
-   * project and zone. (instanceGroups.listInstanceGroups)
-   *
-   * @param string $project Project ID for this request.
-   * @param string $zone The name of the zone where the instance group is located.
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param string filter Sets a filter expression for filtering listed
-   * resources, in the form filter={expression}. Your {expression} must be in the
-   * format: field_name comparison_string literal_string.
-   *
-   * The field_name is the name of the field you want to compare. Only atomic
-   * field types are supported (string, number, boolean). The comparison_string
-   * must be either eq (equals) or ne (not equals). The literal_string is the
-   * string value to filter to. The literal value must be valid for the type of
-   * field you are filtering by (string, number, boolean). For string fields, the
-   * literal value is interpreted as a regular expression using RE2 syntax. The
-   * literal value must match the entire field.
-   *
-   * For example, to filter for instances that do not have a name of example-
-   * instance, you would use filter=name ne example-instance.
-   *
-   * You can filter on nested fields. For example, you could filter on instances
-   * that have set the scheduling.automaticRestart field to true. Use filtering on
-   * nested fields to take advantage of labels to organize and search for results
-   * based on label values.
-   *
-   * To filter on multiple expressions, provide each separate expression within
-   * parentheses. For example, (scheduling.automaticRestart eq true) (zone eq us-
-   * central1-f). Multiple expressions are treated as AND expressions, meaning
-   * that resources must match all expressions to pass the filters.
-   * @opt_param string maxResults The maximum number of results per page that
-   * should be returned. If the number of available results is larger than
-   * maxResults, Compute Engine returns a nextPageToken that can be used to get
-   * the next page of results in subsequent list requests. Acceptable values are 0
-   * to 500, inclusive. (Default: 500)
-   * @opt_param string orderBy Sorts list results by a certain order. By default,
-   * results are returned in alphanumerical order based on the resource name.
-   *
-   * You can also sort results in descending order based on the creation timestamp
-   * using orderBy="creationTimestamp desc". This sorts results based on the
-   * creationTimestamp field in reverse chronological order (newest result first).
-   * Use this to sort resources like operations so that the newest operation is
-   * returned first.
-   *
-   * Currently, only sorting by name or creationTimestamp desc is supported.
-   * @opt_param string pageToken Specifies a page token to use. Set pageToken to
-   * the nextPageToken returned by a previous list request to get the next page of
-   * results.
-   * @return Google_Service_Compute_InstanceGroupList
-   */
-  public function listInstanceGroups($project, $zone, $optParams = array())
-  {
-    $params = array('project' => $project, 'zone' => $zone);
-    $params = array_merge($params, $optParams);
-    return $this->call('list', array($params), "Google_Service_Compute_InstanceGroupList");
-  }
-  /**
-   * Lists the instances in the specified instance group.
-   * (instanceGroups.listInstances)
-   *
-   * @param string $project Project ID for this request.
-   * @param string $zone The name of the zone where the instance group is located.
-   * @param string $instanceGroup The name of the instance group from which you
-   * want to generate a list of included instances.
-   * @param Google_Service_Compute_InstanceGroupsListInstancesRequest $postBody
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param string filter Sets a filter expression for filtering listed
-   * resources, in the form filter={expression}. Your {expression} must be in the
-   * format: field_name comparison_string literal_string.
-   *
-   * The field_name is the name of the field you want to compare. Only atomic
-   * field types are supported (string, number, boolean). The comparison_string
-   * must be either eq (equals) or ne (not equals). The literal_string is the
-   * string value to filter to. The literal value must be valid for the type of
-   * field you are filtering by (string, number, boolean). For string fields, the
-   * literal value is interpreted as a regular expression using RE2 syntax. The
-   * literal value must match the entire field.
-   *
-   * For example, to filter for instances that do not have a name of example-
-   * instance, you would use filter=name ne example-instance.
-   *
-   * You can filter on nested fields. For example, you could filter on instances
-   * that have set the scheduling.automaticRestart field to true. Use filtering on
-   * nested fields to take advantage of labels to organize and search for results
-   * based on label values.
-   *
-   * To filter on multiple expressions, provide each separate expression within
-   * parentheses. For example, (scheduling.automaticRestart eq true) (zone eq us-
-   * central1-f). Multiple expressions are treated as AND expressions, meaning
-   * that resources must match all expressions to pass the filters.
-   * @opt_param string maxResults The maximum number of results per page that
-   * should be returned. If the number of available results is larger than
-   * maxResults, Compute Engine returns a nextPageToken that can be used to get
-   * the next page of results in subsequent list requests. Acceptable values are 0
-   * to 500, inclusive. (Default: 500)
-   * @opt_param string orderBy Sorts list results by a certain order. By default,
-   * results are returned in alphanumerical order based on the resource name.
-   *
-   * You can also sort results in descending order based on the creation timestamp
-   * using orderBy="creationTimestamp desc". This sorts results based on the
-   * creationTimestamp field in reverse chronological order (newest result first).
-   * Use this to sort resources like operations so that the newest operation is
-   * returned first.
-   *
-   * Currently, only sorting by name or creationTimestamp desc is supported.
-   * @opt_param string pageToken Specifies a page token to use. Set pageToken to
-   * the nextPageToken returned by a previous list request to get the next page of
-   * results.
-   * @return Google_Service_Compute_InstanceGroupsListInstances
-   */
-  public function listInstances($project, $zone, $instanceGroup, Google_Service_Compute_InstanceGroupsListInstancesRequest $postBody, $optParams = array())
-  {
-    $params = array('project' => $project, 'zone' => $zone, 'instanceGroup' => $instanceGroup, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('listInstances', array($params), "Google_Service_Compute_InstanceGroupsListInstances");
-  }
-  /**
-   * Removes one or more instances from the specified instance group, but does not
-   * delete those instances. (instanceGroups.removeInstances)
-   *
-   * @param string $project Project ID for this request.
-   * @param string $zone The name of the zone where the instance group is located.
-   * @param string $instanceGroup The name of the instance group where the
-   * specified instances will be removed.
-   * @param Google_Service_Compute_InstanceGroupsRemoveInstancesRequest $postBody
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Compute_Operation
-   */
-  public function removeInstances($project, $zone, $instanceGroup, Google_Service_Compute_InstanceGroupsRemoveInstancesRequest $postBody, $optParams = array())
-  {
-    $params = array('project' => $project, 'zone' => $zone, 'instanceGroup' => $instanceGroup, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('removeInstances', array($params), "Google_Service_Compute_Operation");
-  }
-  /**
-   * Sets the named ports for the specified instance group.
-   * (instanceGroups.setNamedPorts)
-   *
-   * @param string $project Project ID for this request.
-   * @param string $zone The name of the zone where the instance group is located.
-   * @param string $instanceGroup The name of the instance group where the named
-   * ports are updated.
-   * @param Google_Service_Compute_InstanceGroupsSetNamedPortsRequest $postBody
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Compute_Operation
-   */
-  public function setNamedPorts($project, $zone, $instanceGroup, Google_Service_Compute_InstanceGroupsSetNamedPortsRequest $postBody, $optParams = array())
-  {
-    $params = array('project' => $project, 'zone' => $zone, 'instanceGroup' => $instanceGroup, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('setNamedPorts', array($params), "Google_Service_Compute_Operation");
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/Resource/InstanceTemplates.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/Resource/InstanceTemplates.php
deleted file mode 100644
index e2dd0e2b..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/Resource/InstanceTemplates.php
+++ /dev/null
@@ -1,136 +0,0 @@
-
- *   $computeService = new Google_Service_Compute(...);
- *   $instanceTemplates = $computeService->instanceTemplates;
- *  
- */
-class Google_Service_Compute_Resource_InstanceTemplates extends Google_Service_Resource
-{
-  /**
-   * Deletes the specified instance template. If you delete an instance template
-   * that is being referenced from another instance group, the instance group will
-   * not be able to create or recreate virtual machine instances. Deleting an
-   * instance template is permanent and cannot be undone.
-   * (instanceTemplates.delete)
-   *
-   * @param string $project Project ID for this request.
-   * @param string $instanceTemplate The name of the instance template to delete.
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Compute_Operation
-   */
-  public function delete($project, $instanceTemplate, $optParams = array())
-  {
-    $params = array('project' => $project, 'instanceTemplate' => $instanceTemplate);
-    $params = array_merge($params, $optParams);
-    return $this->call('delete', array($params), "Google_Service_Compute_Operation");
-  }
-  /**
-   * Returns the specified instance template. Get a list of available instance
-   * templates by making a list() request. (instanceTemplates.get)
-   *
-   * @param string $project Project ID for this request.
-   * @param string $instanceTemplate The name of the instance template.
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Compute_InstanceTemplate
-   */
-  public function get($project, $instanceTemplate, $optParams = array())
-  {
-    $params = array('project' => $project, 'instanceTemplate' => $instanceTemplate);
-    $params = array_merge($params, $optParams);
-    return $this->call('get', array($params), "Google_Service_Compute_InstanceTemplate");
-  }
-  /**
-   * Creates an instance template in the specified project using the data that is
-   * included in the request. If you are creating a new template to update an
-   * existing instance group, your new instance template must use the same network
-   * or, if applicable, the same subnetwork as the original template.
-   * (instanceTemplates.insert)
-   *
-   * @param string $project Project ID for this request.
-   * @param Google_Service_Compute_InstanceTemplate $postBody
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Compute_Operation
-   */
-  public function insert($project, Google_Service_Compute_InstanceTemplate $postBody, $optParams = array())
-  {
-    $params = array('project' => $project, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('insert', array($params), "Google_Service_Compute_Operation");
-  }
-  /**
-   * Retrieves a list of instance templates that are contained within the
-   * specified project and zone. (instanceTemplates.listInstanceTemplates)
-   *
-   * @param string $project Project ID for this request.
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param string filter Sets a filter expression for filtering listed
-   * resources, in the form filter={expression}. Your {expression} must be in the
-   * format: field_name comparison_string literal_string.
-   *
-   * The field_name is the name of the field you want to compare. Only atomic
-   * field types are supported (string, number, boolean). The comparison_string
-   * must be either eq (equals) or ne (not equals). The literal_string is the
-   * string value to filter to. The literal value must be valid for the type of
-   * field you are filtering by (string, number, boolean). For string fields, the
-   * literal value is interpreted as a regular expression using RE2 syntax. The
-   * literal value must match the entire field.
-   *
-   * For example, to filter for instances that do not have a name of example-
-   * instance, you would use filter=name ne example-instance.
-   *
-   * You can filter on nested fields. For example, you could filter on instances
-   * that have set the scheduling.automaticRestart field to true. Use filtering on
-   * nested fields to take advantage of labels to organize and search for results
-   * based on label values.
-   *
-   * To filter on multiple expressions, provide each separate expression within
-   * parentheses. For example, (scheduling.automaticRestart eq true) (zone eq us-
-   * central1-f). Multiple expressions are treated as AND expressions, meaning
-   * that resources must match all expressions to pass the filters.
-   * @opt_param string maxResults The maximum number of results per page that
-   * should be returned. If the number of available results is larger than
-   * maxResults, Compute Engine returns a nextPageToken that can be used to get
-   * the next page of results in subsequent list requests. Acceptable values are 0
-   * to 500, inclusive. (Default: 500)
-   * @opt_param string orderBy Sorts list results by a certain order. By default,
-   * results are returned in alphanumerical order based on the resource name.
-   *
-   * You can also sort results in descending order based on the creation timestamp
-   * using orderBy="creationTimestamp desc". This sorts results based on the
-   * creationTimestamp field in reverse chronological order (newest result first).
-   * Use this to sort resources like operations so that the newest operation is
-   * returned first.
-   *
-   * Currently, only sorting by name or creationTimestamp desc is supported.
-   * @opt_param string pageToken Specifies a page token to use. Set pageToken to
-   * the nextPageToken returned by a previous list request to get the next page of
-   * results.
-   * @return Google_Service_Compute_InstanceTemplateList
-   */
-  public function listInstanceTemplates($project, $optParams = array())
-  {
-    $params = array('project' => $project);
-    $params = array_merge($params, $optParams);
-    return $this->call('list', array($params), "Google_Service_Compute_InstanceTemplateList");
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/Resource/Instances.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/Resource/Instances.php
deleted file mode 100644
index 4c1d6cf5..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/Resource/Instances.php
+++ /dev/null
@@ -1,455 +0,0 @@
-
- *   $computeService = new Google_Service_Compute(...);
- *   $instances = $computeService->instances;
- *  
- */
-class Google_Service_Compute_Resource_Instances extends Google_Service_Resource
-{
-  /**
-   * Adds an access config to an instance's network interface.
-   * (instances.addAccessConfig)
-   *
-   * @param string $project Project ID for this request.
-   * @param string $zone The name of the zone for this request.
-   * @param string $instance The instance name for this request.
-   * @param string $networkInterface The name of the network interface to add to
-   * this instance.
-   * @param Google_Service_Compute_AccessConfig $postBody
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Compute_Operation
-   */
-  public function addAccessConfig($project, $zone, $instance, $networkInterface, Google_Service_Compute_AccessConfig $postBody, $optParams = array())
-  {
-    $params = array('project' => $project, 'zone' => $zone, 'instance' => $instance, 'networkInterface' => $networkInterface, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('addAccessConfig', array($params), "Google_Service_Compute_Operation");
-  }
-  /**
-   * Retrieves aggregated list of instances. (instances.aggregatedList)
-   *
-   * @param string $project Project ID for this request.
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param string filter Sets a filter expression for filtering listed
-   * resources, in the form filter={expression}. Your {expression} must be in the
-   * format: field_name comparison_string literal_string.
-   *
-   * The field_name is the name of the field you want to compare. Only atomic
-   * field types are supported (string, number, boolean). The comparison_string
-   * must be either eq (equals) or ne (not equals). The literal_string is the
-   * string value to filter to. The literal value must be valid for the type of
-   * field you are filtering by (string, number, boolean). For string fields, the
-   * literal value is interpreted as a regular expression using RE2 syntax. The
-   * literal value must match the entire field.
-   *
-   * For example, to filter for instances that do not have a name of example-
-   * instance, you would use filter=name ne example-instance.
-   *
-   * You can filter on nested fields. For example, you could filter on instances
-   * that have set the scheduling.automaticRestart field to true. Use filtering on
-   * nested fields to take advantage of labels to organize and search for results
-   * based on label values.
-   *
-   * To filter on multiple expressions, provide each separate expression within
-   * parentheses. For example, (scheduling.automaticRestart eq true) (zone eq us-
-   * central1-f). Multiple expressions are treated as AND expressions, meaning
-   * that resources must match all expressions to pass the filters.
-   * @opt_param string maxResults The maximum number of results per page that
-   * should be returned. If the number of available results is larger than
-   * maxResults, Compute Engine returns a nextPageToken that can be used to get
-   * the next page of results in subsequent list requests. Acceptable values are 0
-   * to 500, inclusive. (Default: 500)
-   * @opt_param string orderBy Sorts list results by a certain order. By default,
-   * results are returned in alphanumerical order based on the resource name.
-   *
-   * You can also sort results in descending order based on the creation timestamp
-   * using orderBy="creationTimestamp desc". This sorts results based on the
-   * creationTimestamp field in reverse chronological order (newest result first).
-   * Use this to sort resources like operations so that the newest operation is
-   * returned first.
-   *
-   * Currently, only sorting by name or creationTimestamp desc is supported.
-   * @opt_param string pageToken Specifies a page token to use. Set pageToken to
-   * the nextPageToken returned by a previous list request to get the next page of
-   * results.
-   * @return Google_Service_Compute_InstanceAggregatedList
-   */
-  public function aggregatedList($project, $optParams = array())
-  {
-    $params = array('project' => $project);
-    $params = array_merge($params, $optParams);
-    return $this->call('aggregatedList', array($params), "Google_Service_Compute_InstanceAggregatedList");
-  }
-  /**
-   * Attaches a Disk resource to an instance. (instances.attachDisk)
-   *
-   * @param string $project Project ID for this request.
-   * @param string $zone The name of the zone for this request.
-   * @param string $instance The instance name for this request.
-   * @param Google_Service_Compute_AttachedDisk $postBody
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Compute_Operation
-   */
-  public function attachDisk($project, $zone, $instance, Google_Service_Compute_AttachedDisk $postBody, $optParams = array())
-  {
-    $params = array('project' => $project, 'zone' => $zone, 'instance' => $instance, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('attachDisk', array($params), "Google_Service_Compute_Operation");
-  }
-  /**
-   * Deletes the specified Instance resource. For more information, see Stopping
-   * or Deleting an Instance. (instances.delete)
-   *
-   * @param string $project Project ID for this request.
-   * @param string $zone The name of the zone for this request.
-   * @param string $instance Name of the instance resource to delete.
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Compute_Operation
-   */
-  public function delete($project, $zone, $instance, $optParams = array())
-  {
-    $params = array('project' => $project, 'zone' => $zone, 'instance' => $instance);
-    $params = array_merge($params, $optParams);
-    return $this->call('delete', array($params), "Google_Service_Compute_Operation");
-  }
-  /**
-   * Deletes an access config from an instance's network interface.
-   * (instances.deleteAccessConfig)
-   *
-   * @param string $project Project ID for this request.
-   * @param string $zone The name of the zone for this request.
-   * @param string $instance The instance name for this request.
-   * @param string $accessConfig The name of the access config to delete.
-   * @param string $networkInterface The name of the network interface.
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Compute_Operation
-   */
-  public function deleteAccessConfig($project, $zone, $instance, $accessConfig, $networkInterface, $optParams = array())
-  {
-    $params = array('project' => $project, 'zone' => $zone, 'instance' => $instance, 'accessConfig' => $accessConfig, 'networkInterface' => $networkInterface);
-    $params = array_merge($params, $optParams);
-    return $this->call('deleteAccessConfig', array($params), "Google_Service_Compute_Operation");
-  }
-  /**
-   * Detaches a disk from an instance. (instances.detachDisk)
-   *
-   * @param string $project Project ID for this request.
-   * @param string $zone The name of the zone for this request.
-   * @param string $instance Instance name.
-   * @param string $deviceName Disk device name to detach.
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Compute_Operation
-   */
-  public function detachDisk($project, $zone, $instance, $deviceName, $optParams = array())
-  {
-    $params = array('project' => $project, 'zone' => $zone, 'instance' => $instance, 'deviceName' => $deviceName);
-    $params = array_merge($params, $optParams);
-    return $this->call('detachDisk', array($params), "Google_Service_Compute_Operation");
-  }
-  /**
-   * Returns the specified Instance resource. Get a list of available instances by
-   * making a list() request. (instances.get)
-   *
-   * @param string $project Project ID for this request.
-   * @param string $zone The name of the zone for this request.
-   * @param string $instance Name of the instance resource to return.
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Compute_Instance
-   */
-  public function get($project, $zone, $instance, $optParams = array())
-  {
-    $params = array('project' => $project, 'zone' => $zone, 'instance' => $instance);
-    $params = array_merge($params, $optParams);
-    return $this->call('get', array($params), "Google_Service_Compute_Instance");
-  }
-  /**
-   * Returns the specified instance's serial port output.
-   * (instances.getSerialPortOutput)
-   *
-   * @param string $project Project ID for this request.
-   * @param string $zone The name of the zone for this request.
-   * @param string $instance Name of the instance scoping this request.
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param int port Specifies which COM or serial port to retrieve data from.
-   * @opt_param string start Returns output starting from a specific byte
-   * position. Use this to page through output when the output is too large to
-   * return in a single request. For the initial request, leave this field
-   * unspecified. For subsequent calls, this field should be set to the next value
-   * returned in the previous call.
-   * @return Google_Service_Compute_SerialPortOutput
-   */
-  public function getSerialPortOutput($project, $zone, $instance, $optParams = array())
-  {
-    $params = array('project' => $project, 'zone' => $zone, 'instance' => $instance);
-    $params = array_merge($params, $optParams);
-    return $this->call('getSerialPortOutput', array($params), "Google_Service_Compute_SerialPortOutput");
-  }
-  /**
-   * Creates an instance resource in the specified project using the data included
-   * in the request. (instances.insert)
-   *
-   * @param string $project Project ID for this request.
-   * @param string $zone The name of the zone for this request.
-   * @param Google_Service_Compute_Instance $postBody
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Compute_Operation
-   */
-  public function insert($project, $zone, Google_Service_Compute_Instance $postBody, $optParams = array())
-  {
-    $params = array('project' => $project, 'zone' => $zone, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('insert', array($params), "Google_Service_Compute_Operation");
-  }
-  /**
-   * Retrieves the list of instances contained within the specified zone.
-   * (instances.listInstances)
-   *
-   * @param string $project Project ID for this request.
-   * @param string $zone The name of the zone for this request.
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param string filter Sets a filter expression for filtering listed
-   * resources, in the form filter={expression}. Your {expression} must be in the
-   * format: field_name comparison_string literal_string.
-   *
-   * The field_name is the name of the field you want to compare. Only atomic
-   * field types are supported (string, number, boolean). The comparison_string
-   * must be either eq (equals) or ne (not equals). The literal_string is the
-   * string value to filter to. The literal value must be valid for the type of
-   * field you are filtering by (string, number, boolean). For string fields, the
-   * literal value is interpreted as a regular expression using RE2 syntax. The
-   * literal value must match the entire field.
-   *
-   * For example, to filter for instances that do not have a name of example-
-   * instance, you would use filter=name ne example-instance.
-   *
-   * You can filter on nested fields. For example, you could filter on instances
-   * that have set the scheduling.automaticRestart field to true. Use filtering on
-   * nested fields to take advantage of labels to organize and search for results
-   * based on label values.
-   *
-   * To filter on multiple expressions, provide each separate expression within
-   * parentheses. For example, (scheduling.automaticRestart eq true) (zone eq us-
-   * central1-f). Multiple expressions are treated as AND expressions, meaning
-   * that resources must match all expressions to pass the filters.
-   * @opt_param string maxResults The maximum number of results per page that
-   * should be returned. If the number of available results is larger than
-   * maxResults, Compute Engine returns a nextPageToken that can be used to get
-   * the next page of results in subsequent list requests. Acceptable values are 0
-   * to 500, inclusive. (Default: 500)
-   * @opt_param string orderBy Sorts list results by a certain order. By default,
-   * results are returned in alphanumerical order based on the resource name.
-   *
-   * You can also sort results in descending order based on the creation timestamp
-   * using orderBy="creationTimestamp desc". This sorts results based on the
-   * creationTimestamp field in reverse chronological order (newest result first).
-   * Use this to sort resources like operations so that the newest operation is
-   * returned first.
-   *
-   * Currently, only sorting by name or creationTimestamp desc is supported.
-   * @opt_param string pageToken Specifies a page token to use. Set pageToken to
-   * the nextPageToken returned by a previous list request to get the next page of
-   * results.
-   * @return Google_Service_Compute_InstanceList
-   */
-  public function listInstances($project, $zone, $optParams = array())
-  {
-    $params = array('project' => $project, 'zone' => $zone);
-    $params = array_merge($params, $optParams);
-    return $this->call('list', array($params), "Google_Service_Compute_InstanceList");
-  }
-  /**
-   * Performs a hard reset on the instance. (instances.reset)
-   *
-   * @param string $project Project ID for this request.
-   * @param string $zone The name of the zone for this request.
-   * @param string $instance Name of the instance scoping this request.
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Compute_Operation
-   */
-  public function reset($project, $zone, $instance, $optParams = array())
-  {
-    $params = array('project' => $project, 'zone' => $zone, 'instance' => $instance);
-    $params = array_merge($params, $optParams);
-    return $this->call('reset', array($params), "Google_Service_Compute_Operation");
-  }
-  /**
-   * Sets the auto-delete flag for a disk attached to an instance.
-   * (instances.setDiskAutoDelete)
-   *
-   * @param string $project Project ID for this request.
-   * @param string $zone The name of the zone for this request.
-   * @param string $instance The instance name.
-   * @param bool $autoDelete Whether to auto-delete the disk when the instance is
-   * deleted.
-   * @param string $deviceName The device name of the disk to modify.
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Compute_Operation
-   */
-  public function setDiskAutoDelete($project, $zone, $instance, $autoDelete, $deviceName, $optParams = array())
-  {
-    $params = array('project' => $project, 'zone' => $zone, 'instance' => $instance, 'autoDelete' => $autoDelete, 'deviceName' => $deviceName);
-    $params = array_merge($params, $optParams);
-    return $this->call('setDiskAutoDelete', array($params), "Google_Service_Compute_Operation");
-  }
-  /**
-   * Changes the machine type for a stopped instance to the machine type specified
-   * in the request. (instances.setMachineType)
-   *
-   * @param string $project Project ID for this request.
-   * @param string $zone The name of the zone for this request.
-   * @param string $instance Name of the instance scoping this request.
-   * @param Google_Service_Compute_InstancesSetMachineTypeRequest $postBody
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Compute_Operation
-   */
-  public function setMachineType($project, $zone, $instance, Google_Service_Compute_InstancesSetMachineTypeRequest $postBody, $optParams = array())
-  {
-    $params = array('project' => $project, 'zone' => $zone, 'instance' => $instance, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('setMachineType', array($params), "Google_Service_Compute_Operation");
-  }
-  /**
-   * Sets metadata for the specified instance to the data included in the request.
-   * (instances.setMetadata)
-   *
-   * @param string $project Project ID for this request.
-   * @param string $zone The name of the zone for this request.
-   * @param string $instance Name of the instance scoping this request.
-   * @param Google_Service_Compute_Metadata $postBody
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Compute_Operation
-   */
-  public function setMetadata($project, $zone, $instance, Google_Service_Compute_Metadata $postBody, $optParams = array())
-  {
-    $params = array('project' => $project, 'zone' => $zone, 'instance' => $instance, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('setMetadata', array($params), "Google_Service_Compute_Operation");
-  }
-  /**
-   * Sets an instance's scheduling options. (instances.setScheduling)
-   *
-   * @param string $project Project ID for this request.
-   * @param string $zone The name of the zone for this request.
-   * @param string $instance Instance name.
-   * @param Google_Service_Compute_Scheduling $postBody
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Compute_Operation
-   */
-  public function setScheduling($project, $zone, $instance, Google_Service_Compute_Scheduling $postBody, $optParams = array())
-  {
-    $params = array('project' => $project, 'zone' => $zone, 'instance' => $instance, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('setScheduling', array($params), "Google_Service_Compute_Operation");
-  }
-  /**
-   * Sets the service account on the instance. For more information, read Changing
-   * the service account and access scopes for an instance.
-   * (instances.setServiceAccount)
-   *
-   * @param string $project Project ID for this request.
-   * @param string $zone The name of the zone for this request.
-   * @param string $instance Name of the instance resource to start.
-   * @param Google_Service_Compute_InstancesSetServiceAccountRequest $postBody
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Compute_Operation
-   */
-  public function setServiceAccount($project, $zone, $instance, Google_Service_Compute_InstancesSetServiceAccountRequest $postBody, $optParams = array())
-  {
-    $params = array('project' => $project, 'zone' => $zone, 'instance' => $instance, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('setServiceAccount', array($params), "Google_Service_Compute_Operation");
-  }
-  /**
-   * Sets tags for the specified instance to the data included in the request.
-   * (instances.setTags)
-   *
-   * @param string $project Project ID for this request.
-   * @param string $zone The name of the zone for this request.
-   * @param string $instance Name of the instance scoping this request.
-   * @param Google_Service_Compute_Tags $postBody
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Compute_Operation
-   */
-  public function setTags($project, $zone, $instance, Google_Service_Compute_Tags $postBody, $optParams = array())
-  {
-    $params = array('project' => $project, 'zone' => $zone, 'instance' => $instance, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('setTags', array($params), "Google_Service_Compute_Operation");
-  }
-  /**
-   * Starts an instance that was stopped using the using the instances().stop
-   * method. For more information, see Restart an instance. (instances.start)
-   *
-   * @param string $project Project ID for this request.
-   * @param string $zone The name of the zone for this request.
-   * @param string $instance Name of the instance resource to start.
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Compute_Operation
-   */
-  public function start($project, $zone, $instance, $optParams = array())
-  {
-    $params = array('project' => $project, 'zone' => $zone, 'instance' => $instance);
-    $params = array_merge($params, $optParams);
-    return $this->call('start', array($params), "Google_Service_Compute_Operation");
-  }
-  /**
-   * Starts an instance that was stopped using the using the instances().stop
-   * method. For more information, see Restart an instance.
-   * (instances.startWithEncryptionKey)
-   *
-   * @param string $project Project ID for this request.
-   * @param string $zone The name of the zone for this request.
-   * @param string $instance Name of the instance resource to start.
-   * @param Google_Service_Compute_InstancesStartWithEncryptionKeyRequest $postBody
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Compute_Operation
-   */
-  public function startWithEncryptionKey($project, $zone, $instance, Google_Service_Compute_InstancesStartWithEncryptionKeyRequest $postBody, $optParams = array())
-  {
-    $params = array('project' => $project, 'zone' => $zone, 'instance' => $instance, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('startWithEncryptionKey', array($params), "Google_Service_Compute_Operation");
-  }
-  /**
-   * Stops a running instance, shutting it down cleanly, and allows you to restart
-   * the instance at a later time. Stopped instances do not incur per-minute,
-   * virtual machine usage charges while they are stopped, but any resources that
-   * the virtual machine is using, such as persistent disks and static IP
-   * addresses, will continue to be charged until they are deleted. For more
-   * information, see Stopping an instance. (instances.stop)
-   *
-   * @param string $project Project ID for this request.
-   * @param string $zone The name of the zone for this request.
-   * @param string $instance Name of the instance resource to stop.
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Compute_Operation
-   */
-  public function stop($project, $zone, $instance, $optParams = array())
-  {
-    $params = array('project' => $project, 'zone' => $zone, 'instance' => $instance);
-    $params = array_merge($params, $optParams);
-    return $this->call('stop', array($params), "Google_Service_Compute_Operation");
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/Resource/Licenses.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/Resource/Licenses.php
deleted file mode 100644
index c6656a7c..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/Resource/Licenses.php
+++ /dev/null
@@ -1,43 +0,0 @@
-
- *   $computeService = new Google_Service_Compute(...);
- *   $licenses = $computeService->licenses;
- *  
- */
-class Google_Service_Compute_Resource_Licenses extends Google_Service_Resource
-{
-  /**
-   * Returns the specified License resource. Get a list of available licenses by
-   * making a list() request. (licenses.get)
-   *
-   * @param string $project Project ID for this request.
-   * @param string $license Name of the License resource to return.
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Compute_License
-   */
-  public function get($project, $license, $optParams = array())
-  {
-    $params = array('project' => $project, 'license' => $license);
-    $params = array_merge($params, $optParams);
-    return $this->call('get', array($params), "Google_Service_Compute_License");
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/Resource/MachineTypes.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/Resource/MachineTypes.php
deleted file mode 100644
index 1e822f87..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/Resource/MachineTypes.php
+++ /dev/null
@@ -1,158 +0,0 @@
-
- *   $computeService = new Google_Service_Compute(...);
- *   $machineTypes = $computeService->machineTypes;
- *  
- */
-class Google_Service_Compute_Resource_MachineTypes extends Google_Service_Resource
-{
-  /**
-   * Retrieves an aggregated list of machine types. (machineTypes.aggregatedList)
-   *
-   * @param string $project Project ID for this request.
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param string filter Sets a filter expression for filtering listed
-   * resources, in the form filter={expression}. Your {expression} must be in the
-   * format: field_name comparison_string literal_string.
-   *
-   * The field_name is the name of the field you want to compare. Only atomic
-   * field types are supported (string, number, boolean). The comparison_string
-   * must be either eq (equals) or ne (not equals). The literal_string is the
-   * string value to filter to. The literal value must be valid for the type of
-   * field you are filtering by (string, number, boolean). For string fields, the
-   * literal value is interpreted as a regular expression using RE2 syntax. The
-   * literal value must match the entire field.
-   *
-   * For example, to filter for instances that do not have a name of example-
-   * instance, you would use filter=name ne example-instance.
-   *
-   * You can filter on nested fields. For example, you could filter on instances
-   * that have set the scheduling.automaticRestart field to true. Use filtering on
-   * nested fields to take advantage of labels to organize and search for results
-   * based on label values.
-   *
-   * To filter on multiple expressions, provide each separate expression within
-   * parentheses. For example, (scheduling.automaticRestart eq true) (zone eq us-
-   * central1-f). Multiple expressions are treated as AND expressions, meaning
-   * that resources must match all expressions to pass the filters.
-   * @opt_param string maxResults The maximum number of results per page that
-   * should be returned. If the number of available results is larger than
-   * maxResults, Compute Engine returns a nextPageToken that can be used to get
-   * the next page of results in subsequent list requests. Acceptable values are 0
-   * to 500, inclusive. (Default: 500)
-   * @opt_param string orderBy Sorts list results by a certain order. By default,
-   * results are returned in alphanumerical order based on the resource name.
-   *
-   * You can also sort results in descending order based on the creation timestamp
-   * using orderBy="creationTimestamp desc". This sorts results based on the
-   * creationTimestamp field in reverse chronological order (newest result first).
-   * Use this to sort resources like operations so that the newest operation is
-   * returned first.
-   *
-   * Currently, only sorting by name or creationTimestamp desc is supported.
-   * @opt_param string pageToken Specifies a page token to use. Set pageToken to
-   * the nextPageToken returned by a previous list request to get the next page of
-   * results.
-   * @return Google_Service_Compute_MachineTypeAggregatedList
-   */
-  public function aggregatedList($project, $optParams = array())
-  {
-    $params = array('project' => $project);
-    $params = array_merge($params, $optParams);
-    return $this->call('aggregatedList', array($params), "Google_Service_Compute_MachineTypeAggregatedList");
-  }
-  /**
-   * Returns the specified machine type. Get a list of available machine types by
-   * making a list() request. (machineTypes.get)
-   *
-   * @param string $project Project ID for this request.
-   * @param string $zone The name of the zone for this request.
-   * @param string $machineType Name of the machine type to return.
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Compute_MachineType
-   */
-  public function get($project, $zone, $machineType, $optParams = array())
-  {
-    $params = array('project' => $project, 'zone' => $zone, 'machineType' => $machineType);
-    $params = array_merge($params, $optParams);
-    return $this->call('get', array($params), "Google_Service_Compute_MachineType");
-  }
-  /**
-   * Retrieves a list of machine types available to the specified project.
-   * (machineTypes.listMachineTypes)
-   *
-   * @param string $project Project ID for this request.
-   * @param string $zone The name of the zone for this request.
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param string filter Sets a filter expression for filtering listed
-   * resources, in the form filter={expression}. Your {expression} must be in the
-   * format: field_name comparison_string literal_string.
-   *
-   * The field_name is the name of the field you want to compare. Only atomic
-   * field types are supported (string, number, boolean). The comparison_string
-   * must be either eq (equals) or ne (not equals). The literal_string is the
-   * string value to filter to. The literal value must be valid for the type of
-   * field you are filtering by (string, number, boolean). For string fields, the
-   * literal value is interpreted as a regular expression using RE2 syntax. The
-   * literal value must match the entire field.
-   *
-   * For example, to filter for instances that do not have a name of example-
-   * instance, you would use filter=name ne example-instance.
-   *
-   * You can filter on nested fields. For example, you could filter on instances
-   * that have set the scheduling.automaticRestart field to true. Use filtering on
-   * nested fields to take advantage of labels to organize and search for results
-   * based on label values.
-   *
-   * To filter on multiple expressions, provide each separate expression within
-   * parentheses. For example, (scheduling.automaticRestart eq true) (zone eq us-
-   * central1-f). Multiple expressions are treated as AND expressions, meaning
-   * that resources must match all expressions to pass the filters.
-   * @opt_param string maxResults The maximum number of results per page that
-   * should be returned. If the number of available results is larger than
-   * maxResults, Compute Engine returns a nextPageToken that can be used to get
-   * the next page of results in subsequent list requests. Acceptable values are 0
-   * to 500, inclusive. (Default: 500)
-   * @opt_param string orderBy Sorts list results by a certain order. By default,
-   * results are returned in alphanumerical order based on the resource name.
-   *
-   * You can also sort results in descending order based on the creation timestamp
-   * using orderBy="creationTimestamp desc". This sorts results based on the
-   * creationTimestamp field in reverse chronological order (newest result first).
-   * Use this to sort resources like operations so that the newest operation is
-   * returned first.
-   *
-   * Currently, only sorting by name or creationTimestamp desc is supported.
-   * @opt_param string pageToken Specifies a page token to use. Set pageToken to
-   * the nextPageToken returned by a previous list request to get the next page of
-   * results.
-   * @return Google_Service_Compute_MachineTypeList
-   */
-  public function listMachineTypes($project, $zone, $optParams = array())
-  {
-    $params = array('project' => $project, 'zone' => $zone);
-    $params = array_merge($params, $optParams);
-    return $this->call('list', array($params), "Google_Service_Compute_MachineTypeList");
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/Resource/Networks.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/Resource/Networks.php
deleted file mode 100644
index 6e9d4383..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/Resource/Networks.php
+++ /dev/null
@@ -1,144 +0,0 @@
-
- *   $computeService = new Google_Service_Compute(...);
- *   $networks = $computeService->networks;
- *  
- */
-class Google_Service_Compute_Resource_Networks extends Google_Service_Resource
-{
-  /**
-   * Deletes the specified network. (networks.delete)
-   *
-   * @param string $project Project ID for this request.
-   * @param string $network Name of the network to delete.
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Compute_Operation
-   */
-  public function delete($project, $network, $optParams = array())
-  {
-    $params = array('project' => $project, 'network' => $network);
-    $params = array_merge($params, $optParams);
-    return $this->call('delete', array($params), "Google_Service_Compute_Operation");
-  }
-  /**
-   * Returns the specified network. Get a list of available networks by making a
-   * list() request. (networks.get)
-   *
-   * @param string $project Project ID for this request.
-   * @param string $network Name of the network to return.
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Compute_Network
-   */
-  public function get($project, $network, $optParams = array())
-  {
-    $params = array('project' => $project, 'network' => $network);
-    $params = array_merge($params, $optParams);
-    return $this->call('get', array($params), "Google_Service_Compute_Network");
-  }
-  /**
-   * Creates a network in the specified project using the data included in the
-   * request. (networks.insert)
-   *
-   * @param string $project Project ID for this request.
-   * @param Google_Service_Compute_Network $postBody
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Compute_Operation
-   */
-  public function insert($project, Google_Service_Compute_Network $postBody, $optParams = array())
-  {
-    $params = array('project' => $project, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('insert', array($params), "Google_Service_Compute_Operation");
-  }
-  /**
-   * Retrieves the list of networks available to the specified project.
-   * (networks.listNetworks)
-   *
-   * @param string $project Project ID for this request.
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param string filter Sets a filter expression for filtering listed
-   * resources, in the form filter={expression}. Your {expression} must be in the
-   * format: field_name comparison_string literal_string.
-   *
-   * The field_name is the name of the field you want to compare. Only atomic
-   * field types are supported (string, number, boolean). The comparison_string
-   * must be either eq (equals) or ne (not equals). The literal_string is the
-   * string value to filter to. The literal value must be valid for the type of
-   * field you are filtering by (string, number, boolean). For string fields, the
-   * literal value is interpreted as a regular expression using RE2 syntax. The
-   * literal value must match the entire field.
-   *
-   * For example, to filter for instances that do not have a name of example-
-   * instance, you would use filter=name ne example-instance.
-   *
-   * You can filter on nested fields. For example, you could filter on instances
-   * that have set the scheduling.automaticRestart field to true. Use filtering on
-   * nested fields to take advantage of labels to organize and search for results
-   * based on label values.
-   *
-   * To filter on multiple expressions, provide each separate expression within
-   * parentheses. For example, (scheduling.automaticRestart eq true) (zone eq us-
-   * central1-f). Multiple expressions are treated as AND expressions, meaning
-   * that resources must match all expressions to pass the filters.
-   * @opt_param string maxResults The maximum number of results per page that
-   * should be returned. If the number of available results is larger than
-   * maxResults, Compute Engine returns a nextPageToken that can be used to get
-   * the next page of results in subsequent list requests. Acceptable values are 0
-   * to 500, inclusive. (Default: 500)
-   * @opt_param string orderBy Sorts list results by a certain order. By default,
-   * results are returned in alphanumerical order based on the resource name.
-   *
-   * You can also sort results in descending order based on the creation timestamp
-   * using orderBy="creationTimestamp desc". This sorts results based on the
-   * creationTimestamp field in reverse chronological order (newest result first).
-   * Use this to sort resources like operations so that the newest operation is
-   * returned first.
-   *
-   * Currently, only sorting by name or creationTimestamp desc is supported.
-   * @opt_param string pageToken Specifies a page token to use. Set pageToken to
-   * the nextPageToken returned by a previous list request to get the next page of
-   * results.
-   * @return Google_Service_Compute_NetworkList
-   */
-  public function listNetworks($project, $optParams = array())
-  {
-    $params = array('project' => $project);
-    $params = array_merge($params, $optParams);
-    return $this->call('list', array($params), "Google_Service_Compute_NetworkList");
-  }
-  /**
-   * Switches the network mode from auto subnet mode to custom subnet mode.
-   * (networks.switchToCustomMode)
-   *
-   * @param string $project Project ID for this request.
-   * @param string $network Name of the network to be updated.
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Compute_Operation
-   */
-  public function switchToCustomMode($project, $network, $optParams = array())
-  {
-    $params = array('project' => $project, 'network' => $network);
-    $params = array_merge($params, $optParams);
-    return $this->call('switchToCustomMode', array($params), "Google_Service_Compute_Operation");
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/Resource/Projects.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/Resource/Projects.php
deleted file mode 100644
index 99410cc7..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/Resource/Projects.php
+++ /dev/null
@@ -1,101 +0,0 @@
-
- *   $computeService = new Google_Service_Compute(...);
- *   $projects = $computeService->projects;
- *  
- */
-class Google_Service_Compute_Resource_Projects extends Google_Service_Resource
-{
-  /**
-   * Returns the specified Project resource. (projects.get)
-   *
-   * @param string $project Project ID for this request.
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Compute_Project
-   */
-  public function get($project, $optParams = array())
-  {
-    $params = array('project' => $project);
-    $params = array_merge($params, $optParams);
-    return $this->call('get', array($params), "Google_Service_Compute_Project");
-  }
-  /**
-   * Moves a persistent disk from one zone to another. (projects.moveDisk)
-   *
-   * @param string $project Project ID for this request.
-   * @param Google_Service_Compute_DiskMoveRequest $postBody
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Compute_Operation
-   */
-  public function moveDisk($project, Google_Service_Compute_DiskMoveRequest $postBody, $optParams = array())
-  {
-    $params = array('project' => $project, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('moveDisk', array($params), "Google_Service_Compute_Operation");
-  }
-  /**
-   * Moves an instance and its attached persistent disks from one zone to another.
-   * (projects.moveInstance)
-   *
-   * @param string $project Project ID for this request.
-   * @param Google_Service_Compute_InstanceMoveRequest $postBody
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Compute_Operation
-   */
-  public function moveInstance($project, Google_Service_Compute_InstanceMoveRequest $postBody, $optParams = array())
-  {
-    $params = array('project' => $project, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('moveInstance', array($params), "Google_Service_Compute_Operation");
-  }
-  /**
-   * Sets metadata common to all instances within the specified project using the
-   * data included in the request. (projects.setCommonInstanceMetadata)
-   *
-   * @param string $project Project ID for this request.
-   * @param Google_Service_Compute_Metadata $postBody
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Compute_Operation
-   */
-  public function setCommonInstanceMetadata($project, Google_Service_Compute_Metadata $postBody, $optParams = array())
-  {
-    $params = array('project' => $project, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('setCommonInstanceMetadata', array($params), "Google_Service_Compute_Operation");
-  }
-  /**
-   * Enables the usage export feature and sets the usage export bucket where
-   * reports are stored. If you provide an empty request body using this method,
-   * the usage export feature will be disabled. (projects.setUsageExportBucket)
-   *
-   * @param string $project Project ID for this request.
-   * @param Google_Service_Compute_UsageExportLocation $postBody
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Compute_Operation
-   */
-  public function setUsageExportBucket($project, Google_Service_Compute_UsageExportLocation $postBody, $optParams = array())
-  {
-    $params = array('project' => $project, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('setUsageExportBucket', array($params), "Google_Service_Compute_Operation");
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/Resource/RegionAutoscalers.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/Resource/RegionAutoscalers.php
deleted file mode 100644
index a9a30977..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/Resource/RegionAutoscalers.php
+++ /dev/null
@@ -1,167 +0,0 @@
-
- *   $computeService = new Google_Service_Compute(...);
- *   $regionAutoscalers = $computeService->regionAutoscalers;
- *  
- */
-class Google_Service_Compute_Resource_RegionAutoscalers extends Google_Service_Resource
-{
-  /**
-   * Deletes the specified autoscaler. (regionAutoscalers.delete)
-   *
-   * @param string $project Project ID for this request.
-   * @param string $region Name of the region scoping this request.
-   * @param string $autoscaler Name of the autoscaler to delete.
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Compute_Operation
-   */
-  public function delete($project, $region, $autoscaler, $optParams = array())
-  {
-    $params = array('project' => $project, 'region' => $region, 'autoscaler' => $autoscaler);
-    $params = array_merge($params, $optParams);
-    return $this->call('delete', array($params), "Google_Service_Compute_Operation");
-  }
-  /**
-   * Returns the specified autoscaler. (regionAutoscalers.get)
-   *
-   * @param string $project Project ID for this request.
-   * @param string $region Name of the region scoping this request.
-   * @param string $autoscaler Name of the autoscaler to return.
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Compute_Autoscaler
-   */
-  public function get($project, $region, $autoscaler, $optParams = array())
-  {
-    $params = array('project' => $project, 'region' => $region, 'autoscaler' => $autoscaler);
-    $params = array_merge($params, $optParams);
-    return $this->call('get', array($params), "Google_Service_Compute_Autoscaler");
-  }
-  /**
-   * Creates an autoscaler in the specified project using the data included in the
-   * request. (regionAutoscalers.insert)
-   *
-   * @param string $project Project ID for this request.
-   * @param string $region Name of the region scoping this request.
-   * @param Google_Service_Compute_Autoscaler $postBody
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Compute_Operation
-   */
-  public function insert($project, $region, Google_Service_Compute_Autoscaler $postBody, $optParams = array())
-  {
-    $params = array('project' => $project, 'region' => $region, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('insert', array($params), "Google_Service_Compute_Operation");
-  }
-  /**
-   * Retrieves a list of autoscalers contained within the specified region.
-   * (regionAutoscalers.listRegionAutoscalers)
-   *
-   * @param string $project Project ID for this request.
-   * @param string $region Name of the region scoping this request.
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param string filter Sets a filter expression for filtering listed
-   * resources, in the form filter={expression}. Your {expression} must be in the
-   * format: field_name comparison_string literal_string.
-   *
-   * The field_name is the name of the field you want to compare. Only atomic
-   * field types are supported (string, number, boolean). The comparison_string
-   * must be either eq (equals) or ne (not equals). The literal_string is the
-   * string value to filter to. The literal value must be valid for the type of
-   * field you are filtering by (string, number, boolean). For string fields, the
-   * literal value is interpreted as a regular expression using RE2 syntax. The
-   * literal value must match the entire field.
-   *
-   * For example, to filter for instances that do not have a name of example-
-   * instance, you would use filter=name ne example-instance.
-   *
-   * You can filter on nested fields. For example, you could filter on instances
-   * that have set the scheduling.automaticRestart field to true. Use filtering on
-   * nested fields to take advantage of labels to organize and search for results
-   * based on label values.
-   *
-   * To filter on multiple expressions, provide each separate expression within
-   * parentheses. For example, (scheduling.automaticRestart eq true) (zone eq us-
-   * central1-f). Multiple expressions are treated as AND expressions, meaning
-   * that resources must match all expressions to pass the filters.
-   * @opt_param string maxResults The maximum number of results per page that
-   * should be returned. If the number of available results is larger than
-   * maxResults, Compute Engine returns a nextPageToken that can be used to get
-   * the next page of results in subsequent list requests. Acceptable values are 0
-   * to 500, inclusive. (Default: 500)
-   * @opt_param string orderBy Sorts list results by a certain order. By default,
-   * results are returned in alphanumerical order based on the resource name.
-   *
-   * You can also sort results in descending order based on the creation timestamp
-   * using orderBy="creationTimestamp desc". This sorts results based on the
-   * creationTimestamp field in reverse chronological order (newest result first).
-   * Use this to sort resources like operations so that the newest operation is
-   * returned first.
-   *
-   * Currently, only sorting by name or creationTimestamp desc is supported.
-   * @opt_param string pageToken Specifies a page token to use. Set pageToken to
-   * the nextPageToken returned by a previous list request to get the next page of
-   * results.
-   * @return Google_Service_Compute_RegionAutoscalerList
-   */
-  public function listRegionAutoscalers($project, $region, $optParams = array())
-  {
-    $params = array('project' => $project, 'region' => $region);
-    $params = array_merge($params, $optParams);
-    return $this->call('list', array($params), "Google_Service_Compute_RegionAutoscalerList");
-  }
-  /**
-   * Updates an autoscaler in the specified project using the data included in the
-   * request. This method supports patch semantics. (regionAutoscalers.patch)
-   *
-   * @param string $project Project ID for this request.
-   * @param string $region Name of the region scoping this request.
-   * @param string $autoscaler Name of the autoscaler to update.
-   * @param Google_Service_Compute_Autoscaler $postBody
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Compute_Operation
-   */
-  public function patch($project, $region, $autoscaler, Google_Service_Compute_Autoscaler $postBody, $optParams = array())
-  {
-    $params = array('project' => $project, 'region' => $region, 'autoscaler' => $autoscaler, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('patch', array($params), "Google_Service_Compute_Operation");
-  }
-  /**
-   * Updates an autoscaler in the specified project using the data included in the
-   * request. (regionAutoscalers.update)
-   *
-   * @param string $project Project ID for this request.
-   * @param string $region Name of the region scoping this request.
-   * @param Google_Service_Compute_Autoscaler $postBody
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param string autoscaler Name of the autoscaler to update.
-   * @return Google_Service_Compute_Operation
-   */
-  public function update($project, $region, Google_Service_Compute_Autoscaler $postBody, $optParams = array())
-  {
-    $params = array('project' => $project, 'region' => $region, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('update', array($params), "Google_Service_Compute_Operation");
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/Resource/RegionBackendServices.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/Resource/RegionBackendServices.php
deleted file mode 100644
index e82facce..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/Resource/RegionBackendServices.php
+++ /dev/null
@@ -1,194 +0,0 @@
-
- *   $computeService = new Google_Service_Compute(...);
- *   $regionBackendServices = $computeService->regionBackendServices;
- *  
- */
-class Google_Service_Compute_Resource_RegionBackendServices extends Google_Service_Resource
-{
-  /**
-   * Deletes the specified regional BackendService resource.
-   * (regionBackendServices.delete)
-   *
-   * @param string $project Project ID for this request.
-   * @param string $region Name of the region scoping this request.
-   * @param string $backendService Name of the BackendService resource to delete.
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Compute_Operation
-   */
-  public function delete($project, $region, $backendService, $optParams = array())
-  {
-    $params = array('project' => $project, 'region' => $region, 'backendService' => $backendService);
-    $params = array_merge($params, $optParams);
-    return $this->call('delete', array($params), "Google_Service_Compute_Operation");
-  }
-  /**
-   * Returns the specified regional BackendService resource.
-   * (regionBackendServices.get)
-   *
-   * @param string $project Project ID for this request.
-   * @param string $region Name of the region scoping this request.
-   * @param string $backendService Name of the BackendService resource to return.
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Compute_BackendService
-   */
-  public function get($project, $region, $backendService, $optParams = array())
-  {
-    $params = array('project' => $project, 'region' => $region, 'backendService' => $backendService);
-    $params = array_merge($params, $optParams);
-    return $this->call('get', array($params), "Google_Service_Compute_BackendService");
-  }
-  /**
-   * Gets the most recent health check results for this regional BackendService.
-   * (regionBackendServices.getHealth)
-   *
-   * @param string $project
-   * @param string $region Name of the region scoping this request.
-   * @param string $backendService Name of the BackendService resource to which
-   * the queried instance belongs.
-   * @param Google_Service_Compute_ResourceGroupReference $postBody
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Compute_BackendServiceGroupHealth
-   */
-  public function getHealth($project, $region, $backendService, Google_Service_Compute_ResourceGroupReference $postBody, $optParams = array())
-  {
-    $params = array('project' => $project, 'region' => $region, 'backendService' => $backendService, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('getHealth', array($params), "Google_Service_Compute_BackendServiceGroupHealth");
-  }
-  /**
-   * Creates a regional BackendService resource in the specified project using the
-   * data included in the request. There are several restrictions and guidelines
-   * to keep in mind when creating a regional backend service. Read  Restrictions
-   * and Guidelines for more information. (regionBackendServices.insert)
-   *
-   * @param string $project Project ID for this request.
-   * @param string $region Name of the region scoping this request.
-   * @param Google_Service_Compute_BackendService $postBody
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Compute_Operation
-   */
-  public function insert($project, $region, Google_Service_Compute_BackendService $postBody, $optParams = array())
-  {
-    $params = array('project' => $project, 'region' => $region, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('insert', array($params), "Google_Service_Compute_Operation");
-  }
-  /**
-   * Retrieves the list of regional BackendService resources available to the
-   * specified project in the given region.
-   * (regionBackendServices.listRegionBackendServices)
-   *
-   * @param string $project Project ID for this request.
-   * @param string $region Name of the region scoping this request.
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param string filter Sets a filter expression for filtering listed
-   * resources, in the form filter={expression}. Your {expression} must be in the
-   * format: field_name comparison_string literal_string.
-   *
-   * The field_name is the name of the field you want to compare. Only atomic
-   * field types are supported (string, number, boolean). The comparison_string
-   * must be either eq (equals) or ne (not equals). The literal_string is the
-   * string value to filter to. The literal value must be valid for the type of
-   * field you are filtering by (string, number, boolean). For string fields, the
-   * literal value is interpreted as a regular expression using RE2 syntax. The
-   * literal value must match the entire field.
-   *
-   * For example, to filter for instances that do not have a name of example-
-   * instance, you would use filter=name ne example-instance.
-   *
-   * You can filter on nested fields. For example, you could filter on instances
-   * that have set the scheduling.automaticRestart field to true. Use filtering on
-   * nested fields to take advantage of labels to organize and search for results
-   * based on label values.
-   *
-   * To filter on multiple expressions, provide each separate expression within
-   * parentheses. For example, (scheduling.automaticRestart eq true) (zone eq us-
-   * central1-f). Multiple expressions are treated as AND expressions, meaning
-   * that resources must match all expressions to pass the filters.
-   * @opt_param string maxResults The maximum number of results per page that
-   * should be returned. If the number of available results is larger than
-   * maxResults, Compute Engine returns a nextPageToken that can be used to get
-   * the next page of results in subsequent list requests. Acceptable values are 0
-   * to 500, inclusive. (Default: 500)
-   * @opt_param string orderBy Sorts list results by a certain order. By default,
-   * results are returned in alphanumerical order based on the resource name.
-   *
-   * You can also sort results in descending order based on the creation timestamp
-   * using orderBy="creationTimestamp desc". This sorts results based on the
-   * creationTimestamp field in reverse chronological order (newest result first).
-   * Use this to sort resources like operations so that the newest operation is
-   * returned first.
-   *
-   * Currently, only sorting by name or creationTimestamp desc is supported.
-   * @opt_param string pageToken Specifies a page token to use. Set pageToken to
-   * the nextPageToken returned by a previous list request to get the next page of
-   * results.
-   * @return Google_Service_Compute_BackendServiceList
-   */
-  public function listRegionBackendServices($project, $region, $optParams = array())
-  {
-    $params = array('project' => $project, 'region' => $region);
-    $params = array_merge($params, $optParams);
-    return $this->call('list', array($params), "Google_Service_Compute_BackendServiceList");
-  }
-  /**
-   * Updates the specified regional BackendService resource with the data included
-   * in the request. There are several restrictions and guidelines to keep in mind
-   * when updating a backend service. Read  Restrictions and Guidelines for more
-   * information. This method supports patch semantics.
-   * (regionBackendServices.patch)
-   *
-   * @param string $project Project ID for this request.
-   * @param string $region Name of the region scoping this request.
-   * @param string $backendService Name of the BackendService resource to update.
-   * @param Google_Service_Compute_BackendService $postBody
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Compute_Operation
-   */
-  public function patch($project, $region, $backendService, Google_Service_Compute_BackendService $postBody, $optParams = array())
-  {
-    $params = array('project' => $project, 'region' => $region, 'backendService' => $backendService, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('patch', array($params), "Google_Service_Compute_Operation");
-  }
-  /**
-   * Updates the specified regional BackendService resource with the data included
-   * in the request. There are several restrictions and guidelines to keep in mind
-   * when updating a backend service. Read  Restrictions and Guidelines for more
-   * information. (regionBackendServices.update)
-   *
-   * @param string $project Project ID for this request.
-   * @param string $region Name of the region scoping this request.
-   * @param string $backendService Name of the BackendService resource to update.
-   * @param Google_Service_Compute_BackendService $postBody
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Compute_Operation
-   */
-  public function update($project, $region, $backendService, Google_Service_Compute_BackendService $postBody, $optParams = array())
-  {
-    $params = array('project' => $project, 'region' => $region, 'backendService' => $backendService, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('update', array($params), "Google_Service_Compute_Operation");
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/Resource/RegionInstanceGroupManagers.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/Resource/RegionInstanceGroupManagers.php
deleted file mode 100644
index 94e89eda..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/Resource/RegionInstanceGroupManagers.php
+++ /dev/null
@@ -1,294 +0,0 @@
-
- *   $computeService = new Google_Service_Compute(...);
- *   $regionInstanceGroupManagers = $computeService->regionInstanceGroupManagers;
- *  
- */
-class Google_Service_Compute_Resource_RegionInstanceGroupManagers extends Google_Service_Resource
-{
-  /**
-   * Schedules a group action to remove the specified instances from the managed
-   * instance group. Abandoning an instance does not delete the instance, but it
-   * does remove the instance from any target pools that are applied by the
-   * managed instance group. This method reduces the targetSize of the managed
-   * instance group by the number of instances that you abandon. This operation is
-   * marked as DONE when the action is scheduled even if the instances have not
-   * yet been removed from the group. You must separately verify the status of the
-   * abandoning action with the listmanagedinstances method.
-   * (regionInstanceGroupManagers.abandonInstances)
-   *
-   * @param string $project Project ID for this request.
-   * @param string $region Name of the region scoping this request.
-   * @param string $instanceGroupManager Name of the managed instance group.
-   * @param Google_Service_Compute_RegionInstanceGroupManagersAbandonInstancesRequest $postBody
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Compute_Operation
-   */
-  public function abandonInstances($project, $region, $instanceGroupManager, Google_Service_Compute_RegionInstanceGroupManagersAbandonInstancesRequest $postBody, $optParams = array())
-  {
-    $params = array('project' => $project, 'region' => $region, 'instanceGroupManager' => $instanceGroupManager, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('abandonInstances', array($params), "Google_Service_Compute_Operation");
-  }
-  /**
-   * Deletes the specified managed instance group and all of the instances in that
-   * group. (regionInstanceGroupManagers.delete)
-   *
-   * @param string $project Project ID for this request.
-   * @param string $region Name of the region scoping this request.
-   * @param string $instanceGroupManager Name of the managed instance group to
-   * delete.
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Compute_Operation
-   */
-  public function delete($project, $region, $instanceGroupManager, $optParams = array())
-  {
-    $params = array('project' => $project, 'region' => $region, 'instanceGroupManager' => $instanceGroupManager);
-    $params = array_merge($params, $optParams);
-    return $this->call('delete', array($params), "Google_Service_Compute_Operation");
-  }
-  /**
-   * Schedules a group action to delete the specified instances in the managed
-   * instance group. The instances are also removed from any target pools of which
-   * they were a member. This method reduces the targetSize of the managed
-   * instance group by the number of instances that you delete. This operation is
-   * marked as DONE when the action is scheduled even if the instances are still
-   * being deleted. You must separately verify the status of the deleting action
-   * with the listmanagedinstances method.
-   * (regionInstanceGroupManagers.deleteInstances)
-   *
-   * @param string $project Project ID for this request.
-   * @param string $region Name of the region scoping this request.
-   * @param string $instanceGroupManager Name of the managed instance group.
-   * @param Google_Service_Compute_RegionInstanceGroupManagersDeleteInstancesRequest $postBody
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Compute_Operation
-   */
-  public function deleteInstances($project, $region, $instanceGroupManager, Google_Service_Compute_RegionInstanceGroupManagersDeleteInstancesRequest $postBody, $optParams = array())
-  {
-    $params = array('project' => $project, 'region' => $region, 'instanceGroupManager' => $instanceGroupManager, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('deleteInstances', array($params), "Google_Service_Compute_Operation");
-  }
-  /**
-   * Returns all of the details about the specified managed instance group.
-   * (regionInstanceGroupManagers.get)
-   *
-   * @param string $project Project ID for this request.
-   * @param string $region Name of the region scoping this request.
-   * @param string $instanceGroupManager Name of the managed instance group to
-   * return.
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Compute_InstanceGroupManager
-   */
-  public function get($project, $region, $instanceGroupManager, $optParams = array())
-  {
-    $params = array('project' => $project, 'region' => $region, 'instanceGroupManager' => $instanceGroupManager);
-    $params = array_merge($params, $optParams);
-    return $this->call('get', array($params), "Google_Service_Compute_InstanceGroupManager");
-  }
-  /**
-   * Creates a managed instance group using the information that you specify in
-   * the request. After the group is created, it schedules an action to create
-   * instances in the group using the specified instance template. This operation
-   * is marked as DONE when the group is created even if the instances in the
-   * group have not yet been created. You must separately verify the status of the
-   * individual instances with the listmanagedinstances method.
-   * (regionInstanceGroupManagers.insert)
-   *
-   * @param string $project Project ID for this request.
-   * @param string $region Name of the region scoping this request.
-   * @param Google_Service_Compute_InstanceGroupManager $postBody
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Compute_Operation
-   */
-  public function insert($project, $region, Google_Service_Compute_InstanceGroupManager $postBody, $optParams = array())
-  {
-    $params = array('project' => $project, 'region' => $region, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('insert', array($params), "Google_Service_Compute_Operation");
-  }
-  /**
-   * Retrieves the list of managed instance groups that are contained within the
-   * specified region.
-   * (regionInstanceGroupManagers.listRegionInstanceGroupManagers)
-   *
-   * @param string $project Project ID for this request.
-   * @param string $region Name of the region scoping this request.
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param string filter Sets a filter expression for filtering listed
-   * resources, in the form filter={expression}. Your {expression} must be in the
-   * format: field_name comparison_string literal_string.
-   *
-   * The field_name is the name of the field you want to compare. Only atomic
-   * field types are supported (string, number, boolean). The comparison_string
-   * must be either eq (equals) or ne (not equals). The literal_string is the
-   * string value to filter to. The literal value must be valid for the type of
-   * field you are filtering by (string, number, boolean). For string fields, the
-   * literal value is interpreted as a regular expression using RE2 syntax. The
-   * literal value must match the entire field.
-   *
-   * For example, to filter for instances that do not have a name of example-
-   * instance, you would use filter=name ne example-instance.
-   *
-   * You can filter on nested fields. For example, you could filter on instances
-   * that have set the scheduling.automaticRestart field to true. Use filtering on
-   * nested fields to take advantage of labels to organize and search for results
-   * based on label values.
-   *
-   * To filter on multiple expressions, provide each separate expression within
-   * parentheses. For example, (scheduling.automaticRestart eq true) (zone eq us-
-   * central1-f). Multiple expressions are treated as AND expressions, meaning
-   * that resources must match all expressions to pass the filters.
-   * @opt_param string maxResults The maximum number of results per page that
-   * should be returned. If the number of available results is larger than
-   * maxResults, Compute Engine returns a nextPageToken that can be used to get
-   * the next page of results in subsequent list requests. Acceptable values are 0
-   * to 500, inclusive. (Default: 500)
-   * @opt_param string orderBy Sorts list results by a certain order. By default,
-   * results are returned in alphanumerical order based on the resource name.
-   *
-   * You can also sort results in descending order based on the creation timestamp
-   * using orderBy="creationTimestamp desc". This sorts results based on the
-   * creationTimestamp field in reverse chronological order (newest result first).
-   * Use this to sort resources like operations so that the newest operation is
-   * returned first.
-   *
-   * Currently, only sorting by name or creationTimestamp desc is supported.
-   * @opt_param string pageToken Specifies a page token to use. Set pageToken to
-   * the nextPageToken returned by a previous list request to get the next page of
-   * results.
-   * @return Google_Service_Compute_RegionInstanceGroupManagerList
-   */
-  public function listRegionInstanceGroupManagers($project, $region, $optParams = array())
-  {
-    $params = array('project' => $project, 'region' => $region);
-    $params = array_merge($params, $optParams);
-    return $this->call('list', array($params), "Google_Service_Compute_RegionInstanceGroupManagerList");
-  }
-  /**
-   * Lists the instances in the managed instance group and instances that are
-   * scheduled to be created. The list includes any current actions that the group
-   * has scheduled for its instances.
-   * (regionInstanceGroupManagers.listManagedInstances)
-   *
-   * @param string $project Project ID for this request.
-   * @param string $region Name of the region scoping this request.
-   * @param string $instanceGroupManager The name of the managed instance group.
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param string filter
-   * @opt_param string maxResults
-   * @opt_param string order_by
-   * @opt_param string pageToken
-   * @return Google_Service_Compute_RegionInstanceGroupManagersListInstancesResponse
-   */
-  public function listManagedInstances($project, $region, $instanceGroupManager, $optParams = array())
-  {
-    $params = array('project' => $project, 'region' => $region, 'instanceGroupManager' => $instanceGroupManager);
-    $params = array_merge($params, $optParams);
-    return $this->call('listManagedInstances', array($params), "Google_Service_Compute_RegionInstanceGroupManagersListInstancesResponse");
-  }
-  /**
-   * Schedules a group action to recreate the specified instances in the managed
-   * instance group. The instances are deleted and recreated using the current
-   * instance template for the managed instance group. This operation is marked as
-   * DONE when the action is scheduled even if the instances have not yet been
-   * recreated. You must separately verify the status of the recreating action
-   * with the listmanagedinstances method.
-   * (regionInstanceGroupManagers.recreateInstances)
-   *
-   * @param string $project Project ID for this request.
-   * @param string $region Name of the region scoping this request.
-   * @param string $instanceGroupManager Name of the managed instance group.
-   * @param Google_Service_Compute_RegionInstanceGroupManagersRecreateRequest $postBody
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Compute_Operation
-   */
-  public function recreateInstances($project, $region, $instanceGroupManager, Google_Service_Compute_RegionInstanceGroupManagersRecreateRequest $postBody, $optParams = array())
-  {
-    $params = array('project' => $project, 'region' => $region, 'instanceGroupManager' => $instanceGroupManager, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('recreateInstances', array($params), "Google_Service_Compute_Operation");
-  }
-  /**
-   * Changes the intended size for the managed instance group. If you increase the
-   * size, the group schedules actions to create new instances using the current
-   * instance template. If you decrease the size, the group schedules delete
-   * actions on one or more instances. The resize operation is marked DONE when
-   * the resize actions are scheduled even if the group has not yet added or
-   * deleted any instances. You must separately verify the status of the creating
-   * or deleting actions with the listmanagedinstances method.
-   * (regionInstanceGroupManagers.resize)
-   *
-   * @param string $project Project ID for this request.
-   * @param string $region Name of the region scoping this request.
-   * @param string $instanceGroupManager Name of the managed instance group.
-   * @param int $size Number of instances that should exist in this instance group
-   * manager.
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Compute_Operation
-   */
-  public function resize($project, $region, $instanceGroupManager, $size, $optParams = array())
-  {
-    $params = array('project' => $project, 'region' => $region, 'instanceGroupManager' => $instanceGroupManager, 'size' => $size);
-    $params = array_merge($params, $optParams);
-    return $this->call('resize', array($params), "Google_Service_Compute_Operation");
-  }
-  /**
-   * Sets the instance template to use when creating new instances or recreating
-   * instances in this group. Existing instances are not affected.
-   * (regionInstanceGroupManagers.setInstanceTemplate)
-   *
-   * @param string $project Project ID for this request.
-   * @param string $region Name of the region scoping this request.
-   * @param string $instanceGroupManager The name of the managed instance group.
-   * @param Google_Service_Compute_RegionInstanceGroupManagersSetTemplateRequest $postBody
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Compute_Operation
-   */
-  public function setInstanceTemplate($project, $region, $instanceGroupManager, Google_Service_Compute_RegionInstanceGroupManagersSetTemplateRequest $postBody, $optParams = array())
-  {
-    $params = array('project' => $project, 'region' => $region, 'instanceGroupManager' => $instanceGroupManager, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('setInstanceTemplate', array($params), "Google_Service_Compute_Operation");
-  }
-  /**
-   * Modifies the target pools to which all new instances in this group are
-   * assigned. Existing instances in the group are not affected.
-   * (regionInstanceGroupManagers.setTargetPools)
-   *
-   * @param string $project Project ID for this request.
-   * @param string $region Name of the region scoping this request.
-   * @param string $instanceGroupManager Name of the managed instance group.
-   * @param Google_Service_Compute_RegionInstanceGroupManagersSetTargetPoolsRequest $postBody
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Compute_Operation
-   */
-  public function setTargetPools($project, $region, $instanceGroupManager, Google_Service_Compute_RegionInstanceGroupManagersSetTargetPoolsRequest $postBody, $optParams = array())
-  {
-    $params = array('project' => $project, 'region' => $region, 'instanceGroupManager' => $instanceGroupManager, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('setTargetPools', array($params), "Google_Service_Compute_Operation");
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/Resource/RegionInstanceGroups.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/Resource/RegionInstanceGroups.php
deleted file mode 100644
index 27934ab4..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/Resource/RegionInstanceGroups.php
+++ /dev/null
@@ -1,182 +0,0 @@
-
- *   $computeService = new Google_Service_Compute(...);
- *   $regionInstanceGroups = $computeService->regionInstanceGroups;
- *  
- */
-class Google_Service_Compute_Resource_RegionInstanceGroups extends Google_Service_Resource
-{
-  /**
-   * Returns the specified instance group resource. (regionInstanceGroups.get)
-   *
-   * @param string $project Project ID for this request.
-   * @param string $region Name of the region scoping this request.
-   * @param string $instanceGroup Name of the instance group resource to return.
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Compute_InstanceGroup
-   */
-  public function get($project, $region, $instanceGroup, $optParams = array())
-  {
-    $params = array('project' => $project, 'region' => $region, 'instanceGroup' => $instanceGroup);
-    $params = array_merge($params, $optParams);
-    return $this->call('get', array($params), "Google_Service_Compute_InstanceGroup");
-  }
-  /**
-   * Retrieves the list of instance group resources contained within the specified
-   * region. (regionInstanceGroups.listRegionInstanceGroups)
-   *
-   * @param string $project Project ID for this request.
-   * @param string $region Name of the region scoping this request.
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param string filter Sets a filter expression for filtering listed
-   * resources, in the form filter={expression}. Your {expression} must be in the
-   * format: field_name comparison_string literal_string.
-   *
-   * The field_name is the name of the field you want to compare. Only atomic
-   * field types are supported (string, number, boolean). The comparison_string
-   * must be either eq (equals) or ne (not equals). The literal_string is the
-   * string value to filter to. The literal value must be valid for the type of
-   * field you are filtering by (string, number, boolean). For string fields, the
-   * literal value is interpreted as a regular expression using RE2 syntax. The
-   * literal value must match the entire field.
-   *
-   * For example, to filter for instances that do not have a name of example-
-   * instance, you would use filter=name ne example-instance.
-   *
-   * You can filter on nested fields. For example, you could filter on instances
-   * that have set the scheduling.automaticRestart field to true. Use filtering on
-   * nested fields to take advantage of labels to organize and search for results
-   * based on label values.
-   *
-   * To filter on multiple expressions, provide each separate expression within
-   * parentheses. For example, (scheduling.automaticRestart eq true) (zone eq us-
-   * central1-f). Multiple expressions are treated as AND expressions, meaning
-   * that resources must match all expressions to pass the filters.
-   * @opt_param string maxResults The maximum number of results per page that
-   * should be returned. If the number of available results is larger than
-   * maxResults, Compute Engine returns a nextPageToken that can be used to get
-   * the next page of results in subsequent list requests. Acceptable values are 0
-   * to 500, inclusive. (Default: 500)
-   * @opt_param string orderBy Sorts list results by a certain order. By default,
-   * results are returned in alphanumerical order based on the resource name.
-   *
-   * You can also sort results in descending order based on the creation timestamp
-   * using orderBy="creationTimestamp desc". This sorts results based on the
-   * creationTimestamp field in reverse chronological order (newest result first).
-   * Use this to sort resources like operations so that the newest operation is
-   * returned first.
-   *
-   * Currently, only sorting by name or creationTimestamp desc is supported.
-   * @opt_param string pageToken Specifies a page token to use. Set pageToken to
-   * the nextPageToken returned by a previous list request to get the next page of
-   * results.
-   * @return Google_Service_Compute_RegionInstanceGroupList
-   */
-  public function listRegionInstanceGroups($project, $region, $optParams = array())
-  {
-    $params = array('project' => $project, 'region' => $region);
-    $params = array_merge($params, $optParams);
-    return $this->call('list', array($params), "Google_Service_Compute_RegionInstanceGroupList");
-  }
-  /**
-   * Lists the instances in the specified instance group and displays information
-   * about the named ports. Depending on the specified options, this method can
-   * list all instances or only the instances that are running.
-   * (regionInstanceGroups.listInstances)
-   *
-   * @param string $project Project ID for this request.
-   * @param string $region Name of the region scoping this request.
-   * @param string $instanceGroup Name of the regional instance group for which we
-   * want to list the instances.
-   * @param Google_Service_Compute_RegionInstanceGroupsListInstancesRequest $postBody
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param string filter Sets a filter expression for filtering listed
-   * resources, in the form filter={expression}. Your {expression} must be in the
-   * format: field_name comparison_string literal_string.
-   *
-   * The field_name is the name of the field you want to compare. Only atomic
-   * field types are supported (string, number, boolean). The comparison_string
-   * must be either eq (equals) or ne (not equals). The literal_string is the
-   * string value to filter to. The literal value must be valid for the type of
-   * field you are filtering by (string, number, boolean). For string fields, the
-   * literal value is interpreted as a regular expression using RE2 syntax. The
-   * literal value must match the entire field.
-   *
-   * For example, to filter for instances that do not have a name of example-
-   * instance, you would use filter=name ne example-instance.
-   *
-   * You can filter on nested fields. For example, you could filter on instances
-   * that have set the scheduling.automaticRestart field to true. Use filtering on
-   * nested fields to take advantage of labels to organize and search for results
-   * based on label values.
-   *
-   * To filter on multiple expressions, provide each separate expression within
-   * parentheses. For example, (scheduling.automaticRestart eq true) (zone eq us-
-   * central1-f). Multiple expressions are treated as AND expressions, meaning
-   * that resources must match all expressions to pass the filters.
-   * @opt_param string maxResults The maximum number of results per page that
-   * should be returned. If the number of available results is larger than
-   * maxResults, Compute Engine returns a nextPageToken that can be used to get
-   * the next page of results in subsequent list requests. Acceptable values are 0
-   * to 500, inclusive. (Default: 500)
-   * @opt_param string orderBy Sorts list results by a certain order. By default,
-   * results are returned in alphanumerical order based on the resource name.
-   *
-   * You can also sort results in descending order based on the creation timestamp
-   * using orderBy="creationTimestamp desc". This sorts results based on the
-   * creationTimestamp field in reverse chronological order (newest result first).
-   * Use this to sort resources like operations so that the newest operation is
-   * returned first.
-   *
-   * Currently, only sorting by name or creationTimestamp desc is supported.
-   * @opt_param string pageToken Specifies a page token to use. Set pageToken to
-   * the nextPageToken returned by a previous list request to get the next page of
-   * results.
-   * @return Google_Service_Compute_RegionInstanceGroupsListInstances
-   */
-  public function listInstances($project, $region, $instanceGroup, Google_Service_Compute_RegionInstanceGroupsListInstancesRequest $postBody, $optParams = array())
-  {
-    $params = array('project' => $project, 'region' => $region, 'instanceGroup' => $instanceGroup, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('listInstances', array($params), "Google_Service_Compute_RegionInstanceGroupsListInstances");
-  }
-  /**
-   * Sets the named ports for the specified regional instance group.
-   * (regionInstanceGroups.setNamedPorts)
-   *
-   * @param string $project Project ID for this request.
-   * @param string $region Name of the region scoping this request.
-   * @param string $instanceGroup The name of the regional instance group where
-   * the named ports are updated.
-   * @param Google_Service_Compute_RegionInstanceGroupsSetNamedPortsRequest $postBody
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Compute_Operation
-   */
-  public function setNamedPorts($project, $region, $instanceGroup, Google_Service_Compute_RegionInstanceGroupsSetNamedPortsRequest $postBody, $optParams = array())
-  {
-    $params = array('project' => $project, 'region' => $region, 'instanceGroup' => $instanceGroup, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('setNamedPorts', array($params), "Google_Service_Compute_Operation");
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/Resource/RegionOperations.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/Resource/RegionOperations.php
deleted file mode 100644
index 40d91319..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/Resource/RegionOperations.php
+++ /dev/null
@@ -1,117 +0,0 @@
-
- *   $computeService = new Google_Service_Compute(...);
- *   $regionOperations = $computeService->regionOperations;
- *  
- */
-class Google_Service_Compute_Resource_RegionOperations extends Google_Service_Resource
-{
-  /**
-   * Deletes the specified region-specific Operations resource.
-   * (regionOperations.delete)
-   *
-   * @param string $project Project ID for this request.
-   * @param string $region Name of the region for this request.
-   * @param string $operation Name of the Operations resource to delete.
-   * @param array $optParams Optional parameters.
-   */
-  public function delete($project, $region, $operation, $optParams = array())
-  {
-    $params = array('project' => $project, 'region' => $region, 'operation' => $operation);
-    $params = array_merge($params, $optParams);
-    return $this->call('delete', array($params));
-  }
-  /**
-   * Retrieves the specified region-specific Operations resource.
-   * (regionOperations.get)
-   *
-   * @param string $project Project ID for this request.
-   * @param string $region Name of the region for this request.
-   * @param string $operation Name of the Operations resource to return.
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Compute_Operation
-   */
-  public function get($project, $region, $operation, $optParams = array())
-  {
-    $params = array('project' => $project, 'region' => $region, 'operation' => $operation);
-    $params = array_merge($params, $optParams);
-    return $this->call('get', array($params), "Google_Service_Compute_Operation");
-  }
-  /**
-   * Retrieves a list of Operation resources contained within the specified
-   * region. (regionOperations.listRegionOperations)
-   *
-   * @param string $project Project ID for this request.
-   * @param string $region Name of the region for this request.
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param string filter Sets a filter expression for filtering listed
-   * resources, in the form filter={expression}. Your {expression} must be in the
-   * format: field_name comparison_string literal_string.
-   *
-   * The field_name is the name of the field you want to compare. Only atomic
-   * field types are supported (string, number, boolean). The comparison_string
-   * must be either eq (equals) or ne (not equals). The literal_string is the
-   * string value to filter to. The literal value must be valid for the type of
-   * field you are filtering by (string, number, boolean). For string fields, the
-   * literal value is interpreted as a regular expression using RE2 syntax. The
-   * literal value must match the entire field.
-   *
-   * For example, to filter for instances that do not have a name of example-
-   * instance, you would use filter=name ne example-instance.
-   *
-   * You can filter on nested fields. For example, you could filter on instances
-   * that have set the scheduling.automaticRestart field to true. Use filtering on
-   * nested fields to take advantage of labels to organize and search for results
-   * based on label values.
-   *
-   * To filter on multiple expressions, provide each separate expression within
-   * parentheses. For example, (scheduling.automaticRestart eq true) (zone eq us-
-   * central1-f). Multiple expressions are treated as AND expressions, meaning
-   * that resources must match all expressions to pass the filters.
-   * @opt_param string maxResults The maximum number of results per page that
-   * should be returned. If the number of available results is larger than
-   * maxResults, Compute Engine returns a nextPageToken that can be used to get
-   * the next page of results in subsequent list requests. Acceptable values are 0
-   * to 500, inclusive. (Default: 500)
-   * @opt_param string orderBy Sorts list results by a certain order. By default,
-   * results are returned in alphanumerical order based on the resource name.
-   *
-   * You can also sort results in descending order based on the creation timestamp
-   * using orderBy="creationTimestamp desc". This sorts results based on the
-   * creationTimestamp field in reverse chronological order (newest result first).
-   * Use this to sort resources like operations so that the newest operation is
-   * returned first.
-   *
-   * Currently, only sorting by name or creationTimestamp desc is supported.
-   * @opt_param string pageToken Specifies a page token to use. Set pageToken to
-   * the nextPageToken returned by a previous list request to get the next page of
-   * results.
-   * @return Google_Service_Compute_OperationList
-   */
-  public function listRegionOperations($project, $region, $optParams = array())
-  {
-    $params = array('project' => $project, 'region' => $region);
-    $params = array_merge($params, $optParams);
-    return $this->call('list', array($params), "Google_Service_Compute_OperationList");
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/Resource/Regions.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/Resource/Regions.php
deleted file mode 100644
index b5e859a0..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/Resource/Regions.php
+++ /dev/null
@@ -1,100 +0,0 @@
-
- *   $computeService = new Google_Service_Compute(...);
- *   $regions = $computeService->regions;
- *  
- */
-class Google_Service_Compute_Resource_Regions extends Google_Service_Resource
-{
-  /**
-   * Returns the specified Region resource. Get a list of available regions by
-   * making a list() request. (regions.get)
-   *
-   * @param string $project Project ID for this request.
-   * @param string $region Name of the region resource to return.
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Compute_Region
-   */
-  public function get($project, $region, $optParams = array())
-  {
-    $params = array('project' => $project, 'region' => $region);
-    $params = array_merge($params, $optParams);
-    return $this->call('get', array($params), "Google_Service_Compute_Region");
-  }
-  /**
-   * Retrieves the list of region resources available to the specified project.
-   * (regions.listRegions)
-   *
-   * @param string $project Project ID for this request.
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param string filter Sets a filter expression for filtering listed
-   * resources, in the form filter={expression}. Your {expression} must be in the
-   * format: field_name comparison_string literal_string.
-   *
-   * The field_name is the name of the field you want to compare. Only atomic
-   * field types are supported (string, number, boolean). The comparison_string
-   * must be either eq (equals) or ne (not equals). The literal_string is the
-   * string value to filter to. The literal value must be valid for the type of
-   * field you are filtering by (string, number, boolean). For string fields, the
-   * literal value is interpreted as a regular expression using RE2 syntax. The
-   * literal value must match the entire field.
-   *
-   * For example, to filter for instances that do not have a name of example-
-   * instance, you would use filter=name ne example-instance.
-   *
-   * You can filter on nested fields. For example, you could filter on instances
-   * that have set the scheduling.automaticRestart field to true. Use filtering on
-   * nested fields to take advantage of labels to organize and search for results
-   * based on label values.
-   *
-   * To filter on multiple expressions, provide each separate expression within
-   * parentheses. For example, (scheduling.automaticRestart eq true) (zone eq us-
-   * central1-f). Multiple expressions are treated as AND expressions, meaning
-   * that resources must match all expressions to pass the filters.
-   * @opt_param string maxResults The maximum number of results per page that
-   * should be returned. If the number of available results is larger than
-   * maxResults, Compute Engine returns a nextPageToken that can be used to get
-   * the next page of results in subsequent list requests. Acceptable values are 0
-   * to 500, inclusive. (Default: 500)
-   * @opt_param string orderBy Sorts list results by a certain order. By default,
-   * results are returned in alphanumerical order based on the resource name.
-   *
-   * You can also sort results in descending order based on the creation timestamp
-   * using orderBy="creationTimestamp desc". This sorts results based on the
-   * creationTimestamp field in reverse chronological order (newest result first).
-   * Use this to sort resources like operations so that the newest operation is
-   * returned first.
-   *
-   * Currently, only sorting by name or creationTimestamp desc is supported.
-   * @opt_param string pageToken Specifies a page token to use. Set pageToken to
-   * the nextPageToken returned by a previous list request to get the next page of
-   * results.
-   * @return Google_Service_Compute_RegionList
-   */
-  public function listRegions($project, $optParams = array())
-  {
-    $params = array('project' => $project);
-    $params = array_merge($params, $optParams);
-    return $this->call('list', array($params), "Google_Service_Compute_RegionList");
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/Resource/Routers.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/Resource/Routers.php
deleted file mode 100644
index 8ab17d0c..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/Resource/Routers.php
+++ /dev/null
@@ -1,256 +0,0 @@
-
- *   $computeService = new Google_Service_Compute(...);
- *   $routers = $computeService->routers;
- *  
- */
-class Google_Service_Compute_Resource_Routers extends Google_Service_Resource
-{
-  /**
-   * Retrieves an aggregated list of routers. (routers.aggregatedList)
-   *
-   * @param string $project Project ID for this request.
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param string filter Sets a filter expression for filtering listed
-   * resources, in the form filter={expression}. Your {expression} must be in the
-   * format: field_name comparison_string literal_string.
-   *
-   * The field_name is the name of the field you want to compare. Only atomic
-   * field types are supported (string, number, boolean). The comparison_string
-   * must be either eq (equals) or ne (not equals). The literal_string is the
-   * string value to filter to. The literal value must be valid for the type of
-   * field you are filtering by (string, number, boolean). For string fields, the
-   * literal value is interpreted as a regular expression using RE2 syntax. The
-   * literal value must match the entire field.
-   *
-   * For example, to filter for instances that do not have a name of example-
-   * instance, you would use filter=name ne example-instance.
-   *
-   * You can filter on nested fields. For example, you could filter on instances
-   * that have set the scheduling.automaticRestart field to true. Use filtering on
-   * nested fields to take advantage of labels to organize and search for results
-   * based on label values.
-   *
-   * To filter on multiple expressions, provide each separate expression within
-   * parentheses. For example, (scheduling.automaticRestart eq true) (zone eq us-
-   * central1-f). Multiple expressions are treated as AND expressions, meaning
-   * that resources must match all expressions to pass the filters.
-   * @opt_param string maxResults The maximum number of results per page that
-   * should be returned. If the number of available results is larger than
-   * maxResults, Compute Engine returns a nextPageToken that can be used to get
-   * the next page of results in subsequent list requests. Acceptable values are 0
-   * to 500, inclusive. (Default: 500)
-   * @opt_param string orderBy Sorts list results by a certain order. By default,
-   * results are returned in alphanumerical order based on the resource name.
-   *
-   * You can also sort results in descending order based on the creation timestamp
-   * using orderBy="creationTimestamp desc". This sorts results based on the
-   * creationTimestamp field in reverse chronological order (newest result first).
-   * Use this to sort resources like operations so that the newest operation is
-   * returned first.
-   *
-   * Currently, only sorting by name or creationTimestamp desc is supported.
-   * @opt_param string pageToken Specifies a page token to use. Set pageToken to
-   * the nextPageToken returned by a previous list request to get the next page of
-   * results.
-   * @return Google_Service_Compute_RouterAggregatedList
-   */
-  public function aggregatedList($project, $optParams = array())
-  {
-    $params = array('project' => $project);
-    $params = array_merge($params, $optParams);
-    return $this->call('aggregatedList', array($params), "Google_Service_Compute_RouterAggregatedList");
-  }
-  /**
-   * Deletes the specified Router resource. (routers.delete)
-   *
-   * @param string $project Project ID for this request.
-   * @param string $region Name of the region for this request.
-   * @param string $router Name of the Router resource to delete.
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Compute_Operation
-   */
-  public function delete($project, $region, $router, $optParams = array())
-  {
-    $params = array('project' => $project, 'region' => $region, 'router' => $router);
-    $params = array_merge($params, $optParams);
-    return $this->call('delete', array($params), "Google_Service_Compute_Operation");
-  }
-  /**
-   * Returns the specified Router resource. Get a list of available routers by
-   * making a list() request. (routers.get)
-   *
-   * @param string $project Project ID for this request.
-   * @param string $region Name of the region for this request.
-   * @param string $router Name of the Router resource to return.
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Compute_Router
-   */
-  public function get($project, $region, $router, $optParams = array())
-  {
-    $params = array('project' => $project, 'region' => $region, 'router' => $router);
-    $params = array_merge($params, $optParams);
-    return $this->call('get', array($params), "Google_Service_Compute_Router");
-  }
-  /**
-   * Retrieves runtime information of the specified router.
-   * (routers.getRouterStatus)
-   *
-   * @param string $project Project ID for this request.
-   * @param string $region Name of the region for this request.
-   * @param string $router Name of the Router resource to query.
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Compute_RouterStatusResponse
-   */
-  public function getRouterStatus($project, $region, $router, $optParams = array())
-  {
-    $params = array('project' => $project, 'region' => $region, 'router' => $router);
-    $params = array_merge($params, $optParams);
-    return $this->call('getRouterStatus', array($params), "Google_Service_Compute_RouterStatusResponse");
-  }
-  /**
-   * Creates a Router resource in the specified project and region using the data
-   * included in the request. (routers.insert)
-   *
-   * @param string $project Project ID for this request.
-   * @param string $region Name of the region for this request.
-   * @param Google_Service_Compute_Router $postBody
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Compute_Operation
-   */
-  public function insert($project, $region, Google_Service_Compute_Router $postBody, $optParams = array())
-  {
-    $params = array('project' => $project, 'region' => $region, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('insert', array($params), "Google_Service_Compute_Operation");
-  }
-  /**
-   * Retrieves a list of Router resources available to the specified project.
-   * (routers.listRouters)
-   *
-   * @param string $project Project ID for this request.
-   * @param string $region Name of the region for this request.
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param string filter Sets a filter expression for filtering listed
-   * resources, in the form filter={expression}. Your {expression} must be in the
-   * format: field_name comparison_string literal_string.
-   *
-   * The field_name is the name of the field you want to compare. Only atomic
-   * field types are supported (string, number, boolean). The comparison_string
-   * must be either eq (equals) or ne (not equals). The literal_string is the
-   * string value to filter to. The literal value must be valid for the type of
-   * field you are filtering by (string, number, boolean). For string fields, the
-   * literal value is interpreted as a regular expression using RE2 syntax. The
-   * literal value must match the entire field.
-   *
-   * For example, to filter for instances that do not have a name of example-
-   * instance, you would use filter=name ne example-instance.
-   *
-   * You can filter on nested fields. For example, you could filter on instances
-   * that have set the scheduling.automaticRestart field to true. Use filtering on
-   * nested fields to take advantage of labels to organize and search for results
-   * based on label values.
-   *
-   * To filter on multiple expressions, provide each separate expression within
-   * parentheses. For example, (scheduling.automaticRestart eq true) (zone eq us-
-   * central1-f). Multiple expressions are treated as AND expressions, meaning
-   * that resources must match all expressions to pass the filters.
-   * @opt_param string maxResults The maximum number of results per page that
-   * should be returned. If the number of available results is larger than
-   * maxResults, Compute Engine returns a nextPageToken that can be used to get
-   * the next page of results in subsequent list requests. Acceptable values are 0
-   * to 500, inclusive. (Default: 500)
-   * @opt_param string orderBy Sorts list results by a certain order. By default,
-   * results are returned in alphanumerical order based on the resource name.
-   *
-   * You can also sort results in descending order based on the creation timestamp
-   * using orderBy="creationTimestamp desc". This sorts results based on the
-   * creationTimestamp field in reverse chronological order (newest result first).
-   * Use this to sort resources like operations so that the newest operation is
-   * returned first.
-   *
-   * Currently, only sorting by name or creationTimestamp desc is supported.
-   * @opt_param string pageToken Specifies a page token to use. Set pageToken to
-   * the nextPageToken returned by a previous list request to get the next page of
-   * results.
-   * @return Google_Service_Compute_RouterList
-   */
-  public function listRouters($project, $region, $optParams = array())
-  {
-    $params = array('project' => $project, 'region' => $region);
-    $params = array_merge($params, $optParams);
-    return $this->call('list', array($params), "Google_Service_Compute_RouterList");
-  }
-  /**
-   * Updates the specified Router resource with the data included in the request.
-   * This method supports patch semantics. (routers.patch)
-   *
-   * @param string $project Project ID for this request.
-   * @param string $region Name of the region for this request.
-   * @param string $router Name of the Router resource to update.
-   * @param Google_Service_Compute_Router $postBody
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Compute_Operation
-   */
-  public function patch($project, $region, $router, Google_Service_Compute_Router $postBody, $optParams = array())
-  {
-    $params = array('project' => $project, 'region' => $region, 'router' => $router, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('patch', array($params), "Google_Service_Compute_Operation");
-  }
-  /**
-   * Preview fields auto-generated during router create and update operations.
-   * Calling this method does NOT create or update the router. (routers.preview)
-   *
-   * @param string $project Project ID for this request.
-   * @param string $region Name of the region for this request.
-   * @param string $router Name of the Router resource to query.
-   * @param Google_Service_Compute_Router $postBody
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Compute_RoutersPreviewResponse
-   */
-  public function preview($project, $region, $router, Google_Service_Compute_Router $postBody, $optParams = array())
-  {
-    $params = array('project' => $project, 'region' => $region, 'router' => $router, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('preview', array($params), "Google_Service_Compute_RoutersPreviewResponse");
-  }
-  /**
-   * Updates the specified Router resource with the data included in the request.
-   * (routers.update)
-   *
-   * @param string $project Project ID for this request.
-   * @param string $region Name of the region for this request.
-   * @param string $router Name of the Router resource to update.
-   * @param Google_Service_Compute_Router $postBody
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Compute_Operation
-   */
-  public function update($project, $region, $router, Google_Service_Compute_Router $postBody, $optParams = array())
-  {
-    $params = array('project' => $project, 'region' => $region, 'router' => $router, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('update', array($params), "Google_Service_Compute_Operation");
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/Resource/Routes.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/Resource/Routes.php
deleted file mode 100644
index 2970f5e7..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/Resource/Routes.php
+++ /dev/null
@@ -1,129 +0,0 @@
-
- *   $computeService = new Google_Service_Compute(...);
- *   $routes = $computeService->routes;
- *  
- */
-class Google_Service_Compute_Resource_Routes extends Google_Service_Resource
-{
-  /**
-   * Deletes the specified Route resource. (routes.delete)
-   *
-   * @param string $project Project ID for this request.
-   * @param string $route Name of the Route resource to delete.
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Compute_Operation
-   */
-  public function delete($project, $route, $optParams = array())
-  {
-    $params = array('project' => $project, 'route' => $route);
-    $params = array_merge($params, $optParams);
-    return $this->call('delete', array($params), "Google_Service_Compute_Operation");
-  }
-  /**
-   * Returns the specified Route resource. Get a list of available routes by
-   * making a list() request. (routes.get)
-   *
-   * @param string $project Project ID for this request.
-   * @param string $route Name of the Route resource to return.
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Compute_Route
-   */
-  public function get($project, $route, $optParams = array())
-  {
-    $params = array('project' => $project, 'route' => $route);
-    $params = array_merge($params, $optParams);
-    return $this->call('get', array($params), "Google_Service_Compute_Route");
-  }
-  /**
-   * Creates a Route resource in the specified project using the data included in
-   * the request. (routes.insert)
-   *
-   * @param string $project Project ID for this request.
-   * @param Google_Service_Compute_Route $postBody
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Compute_Operation
-   */
-  public function insert($project, Google_Service_Compute_Route $postBody, $optParams = array())
-  {
-    $params = array('project' => $project, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('insert', array($params), "Google_Service_Compute_Operation");
-  }
-  /**
-   * Retrieves the list of Route resources available to the specified project.
-   * (routes.listRoutes)
-   *
-   * @param string $project Project ID for this request.
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param string filter Sets a filter expression for filtering listed
-   * resources, in the form filter={expression}. Your {expression} must be in the
-   * format: field_name comparison_string literal_string.
-   *
-   * The field_name is the name of the field you want to compare. Only atomic
-   * field types are supported (string, number, boolean). The comparison_string
-   * must be either eq (equals) or ne (not equals). The literal_string is the
-   * string value to filter to. The literal value must be valid for the type of
-   * field you are filtering by (string, number, boolean). For string fields, the
-   * literal value is interpreted as a regular expression using RE2 syntax. The
-   * literal value must match the entire field.
-   *
-   * For example, to filter for instances that do not have a name of example-
-   * instance, you would use filter=name ne example-instance.
-   *
-   * You can filter on nested fields. For example, you could filter on instances
-   * that have set the scheduling.automaticRestart field to true. Use filtering on
-   * nested fields to take advantage of labels to organize and search for results
-   * based on label values.
-   *
-   * To filter on multiple expressions, provide each separate expression within
-   * parentheses. For example, (scheduling.automaticRestart eq true) (zone eq us-
-   * central1-f). Multiple expressions are treated as AND expressions, meaning
-   * that resources must match all expressions to pass the filters.
-   * @opt_param string maxResults The maximum number of results per page that
-   * should be returned. If the number of available results is larger than
-   * maxResults, Compute Engine returns a nextPageToken that can be used to get
-   * the next page of results in subsequent list requests. Acceptable values are 0
-   * to 500, inclusive. (Default: 500)
-   * @opt_param string orderBy Sorts list results by a certain order. By default,
-   * results are returned in alphanumerical order based on the resource name.
-   *
-   * You can also sort results in descending order based on the creation timestamp
-   * using orderBy="creationTimestamp desc". This sorts results based on the
-   * creationTimestamp field in reverse chronological order (newest result first).
-   * Use this to sort resources like operations so that the newest operation is
-   * returned first.
-   *
-   * Currently, only sorting by name or creationTimestamp desc is supported.
-   * @opt_param string pageToken Specifies a page token to use. Set pageToken to
-   * the nextPageToken returned by a previous list request to get the next page of
-   * results.
-   * @return Google_Service_Compute_RouteList
-   */
-  public function listRoutes($project, $optParams = array())
-  {
-    $params = array('project' => $project);
-    $params = array_merge($params, $optParams);
-    return $this->call('list', array($params), "Google_Service_Compute_RouteList");
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/Resource/Snapshots.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/Resource/Snapshots.php
deleted file mode 100644
index 30fbf0b5..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/Resource/Snapshots.php
+++ /dev/null
@@ -1,119 +0,0 @@
-
- *   $computeService = new Google_Service_Compute(...);
- *   $snapshots = $computeService->snapshots;
- *  
- */
-class Google_Service_Compute_Resource_Snapshots extends Google_Service_Resource
-{
-  /**
-   * Deletes the specified Snapshot resource. Keep in mind that deleting a single
-   * snapshot might not necessarily delete all the data on that snapshot. If any
-   * data on the snapshot that is marked for deletion is needed for subsequent
-   * snapshots, the data will be moved to the next corresponding snapshot.
-   *
-   * For more information, see Deleting snaphots. (snapshots.delete)
-   *
-   * @param string $project Project ID for this request.
-   * @param string $snapshot Name of the Snapshot resource to delete.
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Compute_Operation
-   */
-  public function delete($project, $snapshot, $optParams = array())
-  {
-    $params = array('project' => $project, 'snapshot' => $snapshot);
-    $params = array_merge($params, $optParams);
-    return $this->call('delete', array($params), "Google_Service_Compute_Operation");
-  }
-  /**
-   * Returns the specified Snapshot resource. Get a list of available snapshots by
-   * making a list() request. (snapshots.get)
-   *
-   * @param string $project Project ID for this request.
-   * @param string $snapshot Name of the Snapshot resource to return.
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Compute_Snapshot
-   */
-  public function get($project, $snapshot, $optParams = array())
-  {
-    $params = array('project' => $project, 'snapshot' => $snapshot);
-    $params = array_merge($params, $optParams);
-    return $this->call('get', array($params), "Google_Service_Compute_Snapshot");
-  }
-  /**
-   * Retrieves the list of Snapshot resources contained within the specified
-   * project. (snapshots.listSnapshots)
-   *
-   * @param string $project Project ID for this request.
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param string filter Sets a filter expression for filtering listed
-   * resources, in the form filter={expression}. Your {expression} must be in the
-   * format: field_name comparison_string literal_string.
-   *
-   * The field_name is the name of the field you want to compare. Only atomic
-   * field types are supported (string, number, boolean). The comparison_string
-   * must be either eq (equals) or ne (not equals). The literal_string is the
-   * string value to filter to. The literal value must be valid for the type of
-   * field you are filtering by (string, number, boolean). For string fields, the
-   * literal value is interpreted as a regular expression using RE2 syntax. The
-   * literal value must match the entire field.
-   *
-   * For example, to filter for instances that do not have a name of example-
-   * instance, you would use filter=name ne example-instance.
-   *
-   * You can filter on nested fields. For example, you could filter on instances
-   * that have set the scheduling.automaticRestart field to true. Use filtering on
-   * nested fields to take advantage of labels to organize and search for results
-   * based on label values.
-   *
-   * To filter on multiple expressions, provide each separate expression within
-   * parentheses. For example, (scheduling.automaticRestart eq true) (zone eq us-
-   * central1-f). Multiple expressions are treated as AND expressions, meaning
-   * that resources must match all expressions to pass the filters.
-   * @opt_param string maxResults The maximum number of results per page that
-   * should be returned. If the number of available results is larger than
-   * maxResults, Compute Engine returns a nextPageToken that can be used to get
-   * the next page of results in subsequent list requests. Acceptable values are 0
-   * to 500, inclusive. (Default: 500)
-   * @opt_param string orderBy Sorts list results by a certain order. By default,
-   * results are returned in alphanumerical order based on the resource name.
-   *
-   * You can also sort results in descending order based on the creation timestamp
-   * using orderBy="creationTimestamp desc". This sorts results based on the
-   * creationTimestamp field in reverse chronological order (newest result first).
-   * Use this to sort resources like operations so that the newest operation is
-   * returned first.
-   *
-   * Currently, only sorting by name or creationTimestamp desc is supported.
-   * @opt_param string pageToken Specifies a page token to use. Set pageToken to
-   * the nextPageToken returned by a previous list request to get the next page of
-   * results.
-   * @return Google_Service_Compute_SnapshotList
-   */
-  public function listSnapshots($project, $optParams = array())
-  {
-    $params = array('project' => $project);
-    $params = array_merge($params, $optParams);
-    return $this->call('list', array($params), "Google_Service_Compute_SnapshotList");
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/Resource/SslCertificates.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/Resource/SslCertificates.php
deleted file mode 100644
index b445378c..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/Resource/SslCertificates.php
+++ /dev/null
@@ -1,129 +0,0 @@
-
- *   $computeService = new Google_Service_Compute(...);
- *   $sslCertificates = $computeService->sslCertificates;
- *  
- */
-class Google_Service_Compute_Resource_SslCertificates extends Google_Service_Resource
-{
-  /**
-   * Deletes the specified SslCertificate resource. (sslCertificates.delete)
-   *
-   * @param string $project Project ID for this request.
-   * @param string $sslCertificate Name of the SslCertificate resource to delete.
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Compute_Operation
-   */
-  public function delete($project, $sslCertificate, $optParams = array())
-  {
-    $params = array('project' => $project, 'sslCertificate' => $sslCertificate);
-    $params = array_merge($params, $optParams);
-    return $this->call('delete', array($params), "Google_Service_Compute_Operation");
-  }
-  /**
-   * Returns the specified SslCertificate resource. Get a list of available SSL
-   * certificates by making a list() request. (sslCertificates.get)
-   *
-   * @param string $project Project ID for this request.
-   * @param string $sslCertificate Name of the SslCertificate resource to return.
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Compute_SslCertificate
-   */
-  public function get($project, $sslCertificate, $optParams = array())
-  {
-    $params = array('project' => $project, 'sslCertificate' => $sslCertificate);
-    $params = array_merge($params, $optParams);
-    return $this->call('get', array($params), "Google_Service_Compute_SslCertificate");
-  }
-  /**
-   * Creates a SslCertificate resource in the specified project using the data
-   * included in the request. (sslCertificates.insert)
-   *
-   * @param string $project Project ID for this request.
-   * @param Google_Service_Compute_SslCertificate $postBody
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Compute_Operation
-   */
-  public function insert($project, Google_Service_Compute_SslCertificate $postBody, $optParams = array())
-  {
-    $params = array('project' => $project, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('insert', array($params), "Google_Service_Compute_Operation");
-  }
-  /**
-   * Retrieves the list of SslCertificate resources available to the specified
-   * project. (sslCertificates.listSslCertificates)
-   *
-   * @param string $project Project ID for this request.
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param string filter Sets a filter expression for filtering listed
-   * resources, in the form filter={expression}. Your {expression} must be in the
-   * format: field_name comparison_string literal_string.
-   *
-   * The field_name is the name of the field you want to compare. Only atomic
-   * field types are supported (string, number, boolean). The comparison_string
-   * must be either eq (equals) or ne (not equals). The literal_string is the
-   * string value to filter to. The literal value must be valid for the type of
-   * field you are filtering by (string, number, boolean). For string fields, the
-   * literal value is interpreted as a regular expression using RE2 syntax. The
-   * literal value must match the entire field.
-   *
-   * For example, to filter for instances that do not have a name of example-
-   * instance, you would use filter=name ne example-instance.
-   *
-   * You can filter on nested fields. For example, you could filter on instances
-   * that have set the scheduling.automaticRestart field to true. Use filtering on
-   * nested fields to take advantage of labels to organize and search for results
-   * based on label values.
-   *
-   * To filter on multiple expressions, provide each separate expression within
-   * parentheses. For example, (scheduling.automaticRestart eq true) (zone eq us-
-   * central1-f). Multiple expressions are treated as AND expressions, meaning
-   * that resources must match all expressions to pass the filters.
-   * @opt_param string maxResults The maximum number of results per page that
-   * should be returned. If the number of available results is larger than
-   * maxResults, Compute Engine returns a nextPageToken that can be used to get
-   * the next page of results in subsequent list requests. Acceptable values are 0
-   * to 500, inclusive. (Default: 500)
-   * @opt_param string orderBy Sorts list results by a certain order. By default,
-   * results are returned in alphanumerical order based on the resource name.
-   *
-   * You can also sort results in descending order based on the creation timestamp
-   * using orderBy="creationTimestamp desc". This sorts results based on the
-   * creationTimestamp field in reverse chronological order (newest result first).
-   * Use this to sort resources like operations so that the newest operation is
-   * returned first.
-   *
-   * Currently, only sorting by name or creationTimestamp desc is supported.
-   * @opt_param string pageToken Specifies a page token to use. Set pageToken to
-   * the nextPageToken returned by a previous list request to get the next page of
-   * results.
-   * @return Google_Service_Compute_SslCertificateList
-   */
-  public function listSslCertificates($project, $optParams = array())
-  {
-    $params = array('project' => $project);
-    $params = array_merge($params, $optParams);
-    return $this->call('list', array($params), "Google_Service_Compute_SslCertificateList");
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/Resource/Subnetworks.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/Resource/Subnetworks.php
deleted file mode 100644
index 9e0fd05b..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/Resource/Subnetworks.php
+++ /dev/null
@@ -1,206 +0,0 @@
-
- *   $computeService = new Google_Service_Compute(...);
- *   $subnetworks = $computeService->subnetworks;
- *  
- */
-class Google_Service_Compute_Resource_Subnetworks extends Google_Service_Resource
-{
-  /**
-   * Retrieves an aggregated list of subnetworks. (subnetworks.aggregatedList)
-   *
-   * @param string $project Project ID for this request.
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param string filter Sets a filter expression for filtering listed
-   * resources, in the form filter={expression}. Your {expression} must be in the
-   * format: field_name comparison_string literal_string.
-   *
-   * The field_name is the name of the field you want to compare. Only atomic
-   * field types are supported (string, number, boolean). The comparison_string
-   * must be either eq (equals) or ne (not equals). The literal_string is the
-   * string value to filter to. The literal value must be valid for the type of
-   * field you are filtering by (string, number, boolean). For string fields, the
-   * literal value is interpreted as a regular expression using RE2 syntax. The
-   * literal value must match the entire field.
-   *
-   * For example, to filter for instances that do not have a name of example-
-   * instance, you would use filter=name ne example-instance.
-   *
-   * You can filter on nested fields. For example, you could filter on instances
-   * that have set the scheduling.automaticRestart field to true. Use filtering on
-   * nested fields to take advantage of labels to organize and search for results
-   * based on label values.
-   *
-   * To filter on multiple expressions, provide each separate expression within
-   * parentheses. For example, (scheduling.automaticRestart eq true) (zone eq us-
-   * central1-f). Multiple expressions are treated as AND expressions, meaning
-   * that resources must match all expressions to pass the filters.
-   * @opt_param string maxResults The maximum number of results per page that
-   * should be returned. If the number of available results is larger than
-   * maxResults, Compute Engine returns a nextPageToken that can be used to get
-   * the next page of results in subsequent list requests. Acceptable values are 0
-   * to 500, inclusive. (Default: 500)
-   * @opt_param string orderBy Sorts list results by a certain order. By default,
-   * results are returned in alphanumerical order based on the resource name.
-   *
-   * You can also sort results in descending order based on the creation timestamp
-   * using orderBy="creationTimestamp desc". This sorts results based on the
-   * creationTimestamp field in reverse chronological order (newest result first).
-   * Use this to sort resources like operations so that the newest operation is
-   * returned first.
-   *
-   * Currently, only sorting by name or creationTimestamp desc is supported.
-   * @opt_param string pageToken Specifies a page token to use. Set pageToken to
-   * the nextPageToken returned by a previous list request to get the next page of
-   * results.
-   * @return Google_Service_Compute_SubnetworkAggregatedList
-   */
-  public function aggregatedList($project, $optParams = array())
-  {
-    $params = array('project' => $project);
-    $params = array_merge($params, $optParams);
-    return $this->call('aggregatedList', array($params), "Google_Service_Compute_SubnetworkAggregatedList");
-  }
-  /**
-   * Deletes the specified subnetwork. (subnetworks.delete)
-   *
-   * @param string $project Project ID for this request.
-   * @param string $region Name of the region scoping this request.
-   * @param string $subnetwork Name of the Subnetwork resource to delete.
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Compute_Operation
-   */
-  public function delete($project, $region, $subnetwork, $optParams = array())
-  {
-    $params = array('project' => $project, 'region' => $region, 'subnetwork' => $subnetwork);
-    $params = array_merge($params, $optParams);
-    return $this->call('delete', array($params), "Google_Service_Compute_Operation");
-  }
-  /**
-   * Expands the IP CIDR range of the subnetwork to a specified value.
-   * (subnetworks.expandIpCidrRange)
-   *
-   * @param string $project Project ID for this request.
-   * @param string $region Name of the region scoping this request.
-   * @param string $subnetwork Name of the Subnetwork resource to update.
-   * @param Google_Service_Compute_SubnetworksExpandIpCidrRangeRequest $postBody
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Compute_Operation
-   */
-  public function expandIpCidrRange($project, $region, $subnetwork, Google_Service_Compute_SubnetworksExpandIpCidrRangeRequest $postBody, $optParams = array())
-  {
-    $params = array('project' => $project, 'region' => $region, 'subnetwork' => $subnetwork, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('expandIpCidrRange', array($params), "Google_Service_Compute_Operation");
-  }
-  /**
-   * Returns the specified subnetwork. Get a list of available subnetworks list()
-   * request. (subnetworks.get)
-   *
-   * @param string $project Project ID for this request.
-   * @param string $region Name of the region scoping this request.
-   * @param string $subnetwork Name of the Subnetwork resource to return.
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Compute_Subnetwork
-   */
-  public function get($project, $region, $subnetwork, $optParams = array())
-  {
-    $params = array('project' => $project, 'region' => $region, 'subnetwork' => $subnetwork);
-    $params = array_merge($params, $optParams);
-    return $this->call('get', array($params), "Google_Service_Compute_Subnetwork");
-  }
-  /**
-   * Creates a subnetwork in the specified project using the data included in the
-   * request. (subnetworks.insert)
-   *
-   * @param string $project Project ID for this request.
-   * @param string $region Name of the region scoping this request.
-   * @param Google_Service_Compute_Subnetwork $postBody
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Compute_Operation
-   */
-  public function insert($project, $region, Google_Service_Compute_Subnetwork $postBody, $optParams = array())
-  {
-    $params = array('project' => $project, 'region' => $region, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('insert', array($params), "Google_Service_Compute_Operation");
-  }
-  /**
-   * Retrieves a list of subnetworks available to the specified project.
-   * (subnetworks.listSubnetworks)
-   *
-   * @param string $project Project ID for this request.
-   * @param string $region Name of the region scoping this request.
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param string filter Sets a filter expression for filtering listed
-   * resources, in the form filter={expression}. Your {expression} must be in the
-   * format: field_name comparison_string literal_string.
-   *
-   * The field_name is the name of the field you want to compare. Only atomic
-   * field types are supported (string, number, boolean). The comparison_string
-   * must be either eq (equals) or ne (not equals). The literal_string is the
-   * string value to filter to. The literal value must be valid for the type of
-   * field you are filtering by (string, number, boolean). For string fields, the
-   * literal value is interpreted as a regular expression using RE2 syntax. The
-   * literal value must match the entire field.
-   *
-   * For example, to filter for instances that do not have a name of example-
-   * instance, you would use filter=name ne example-instance.
-   *
-   * You can filter on nested fields. For example, you could filter on instances
-   * that have set the scheduling.automaticRestart field to true. Use filtering on
-   * nested fields to take advantage of labels to organize and search for results
-   * based on label values.
-   *
-   * To filter on multiple expressions, provide each separate expression within
-   * parentheses. For example, (scheduling.automaticRestart eq true) (zone eq us-
-   * central1-f). Multiple expressions are treated as AND expressions, meaning
-   * that resources must match all expressions to pass the filters.
-   * @opt_param string maxResults The maximum number of results per page that
-   * should be returned. If the number of available results is larger than
-   * maxResults, Compute Engine returns a nextPageToken that can be used to get
-   * the next page of results in subsequent list requests. Acceptable values are 0
-   * to 500, inclusive. (Default: 500)
-   * @opt_param string orderBy Sorts list results by a certain order. By default,
-   * results are returned in alphanumerical order based on the resource name.
-   *
-   * You can also sort results in descending order based on the creation timestamp
-   * using orderBy="creationTimestamp desc". This sorts results based on the
-   * creationTimestamp field in reverse chronological order (newest result first).
-   * Use this to sort resources like operations so that the newest operation is
-   * returned first.
-   *
-   * Currently, only sorting by name or creationTimestamp desc is supported.
-   * @opt_param string pageToken Specifies a page token to use. Set pageToken to
-   * the nextPageToken returned by a previous list request to get the next page of
-   * results.
-   * @return Google_Service_Compute_SubnetworkList
-   */
-  public function listSubnetworks($project, $region, $optParams = array())
-  {
-    $params = array('project' => $project, 'region' => $region);
-    $params = array_merge($params, $optParams);
-    return $this->call('list', array($params), "Google_Service_Compute_SubnetworkList");
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/Resource/TargetHttpProxies.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/Resource/TargetHttpProxies.php
deleted file mode 100644
index 3f19cfe8..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/Resource/TargetHttpProxies.php
+++ /dev/null
@@ -1,147 +0,0 @@
-
- *   $computeService = new Google_Service_Compute(...);
- *   $targetHttpProxies = $computeService->targetHttpProxies;
- *  
- */
-class Google_Service_Compute_Resource_TargetHttpProxies extends Google_Service_Resource
-{
-  /**
-   * Deletes the specified TargetHttpProxy resource. (targetHttpProxies.delete)
-   *
-   * @param string $project Project ID for this request.
-   * @param string $targetHttpProxy Name of the TargetHttpProxy resource to
-   * delete.
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Compute_Operation
-   */
-  public function delete($project, $targetHttpProxy, $optParams = array())
-  {
-    $params = array('project' => $project, 'targetHttpProxy' => $targetHttpProxy);
-    $params = array_merge($params, $optParams);
-    return $this->call('delete', array($params), "Google_Service_Compute_Operation");
-  }
-  /**
-   * Returns the specified TargetHttpProxy resource. Get a list of available
-   * target HTTP proxies by making a list() request. (targetHttpProxies.get)
-   *
-   * @param string $project Project ID for this request.
-   * @param string $targetHttpProxy Name of the TargetHttpProxy resource to
-   * return.
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Compute_TargetHttpProxy
-   */
-  public function get($project, $targetHttpProxy, $optParams = array())
-  {
-    $params = array('project' => $project, 'targetHttpProxy' => $targetHttpProxy);
-    $params = array_merge($params, $optParams);
-    return $this->call('get', array($params), "Google_Service_Compute_TargetHttpProxy");
-  }
-  /**
-   * Creates a TargetHttpProxy resource in the specified project using the data
-   * included in the request. (targetHttpProxies.insert)
-   *
-   * @param string $project Project ID for this request.
-   * @param Google_Service_Compute_TargetHttpProxy $postBody
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Compute_Operation
-   */
-  public function insert($project, Google_Service_Compute_TargetHttpProxy $postBody, $optParams = array())
-  {
-    $params = array('project' => $project, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('insert', array($params), "Google_Service_Compute_Operation");
-  }
-  /**
-   * Retrieves the list of TargetHttpProxy resources available to the specified
-   * project. (targetHttpProxies.listTargetHttpProxies)
-   *
-   * @param string $project Project ID for this request.
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param string filter Sets a filter expression for filtering listed
-   * resources, in the form filter={expression}. Your {expression} must be in the
-   * format: field_name comparison_string literal_string.
-   *
-   * The field_name is the name of the field you want to compare. Only atomic
-   * field types are supported (string, number, boolean). The comparison_string
-   * must be either eq (equals) or ne (not equals). The literal_string is the
-   * string value to filter to. The literal value must be valid for the type of
-   * field you are filtering by (string, number, boolean). For string fields, the
-   * literal value is interpreted as a regular expression using RE2 syntax. The
-   * literal value must match the entire field.
-   *
-   * For example, to filter for instances that do not have a name of example-
-   * instance, you would use filter=name ne example-instance.
-   *
-   * You can filter on nested fields. For example, you could filter on instances
-   * that have set the scheduling.automaticRestart field to true. Use filtering on
-   * nested fields to take advantage of labels to organize and search for results
-   * based on label values.
-   *
-   * To filter on multiple expressions, provide each separate expression within
-   * parentheses. For example, (scheduling.automaticRestart eq true) (zone eq us-
-   * central1-f). Multiple expressions are treated as AND expressions, meaning
-   * that resources must match all expressions to pass the filters.
-   * @opt_param string maxResults The maximum number of results per page that
-   * should be returned. If the number of available results is larger than
-   * maxResults, Compute Engine returns a nextPageToken that can be used to get
-   * the next page of results in subsequent list requests. Acceptable values are 0
-   * to 500, inclusive. (Default: 500)
-   * @opt_param string orderBy Sorts list results by a certain order. By default,
-   * results are returned in alphanumerical order based on the resource name.
-   *
-   * You can also sort results in descending order based on the creation timestamp
-   * using orderBy="creationTimestamp desc". This sorts results based on the
-   * creationTimestamp field in reverse chronological order (newest result first).
-   * Use this to sort resources like operations so that the newest operation is
-   * returned first.
-   *
-   * Currently, only sorting by name or creationTimestamp desc is supported.
-   * @opt_param string pageToken Specifies a page token to use. Set pageToken to
-   * the nextPageToken returned by a previous list request to get the next page of
-   * results.
-   * @return Google_Service_Compute_TargetHttpProxyList
-   */
-  public function listTargetHttpProxies($project, $optParams = array())
-  {
-    $params = array('project' => $project);
-    $params = array_merge($params, $optParams);
-    return $this->call('list', array($params), "Google_Service_Compute_TargetHttpProxyList");
-  }
-  /**
-   * Changes the URL map for TargetHttpProxy. (targetHttpProxies.setUrlMap)
-   *
-   * @param string $project Project ID for this request.
-   * @param string $targetHttpProxy Name of the TargetHttpProxy to set a URL map
-   * for.
-   * @param Google_Service_Compute_UrlMapReference $postBody
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Compute_Operation
-   */
-  public function setUrlMap($project, $targetHttpProxy, Google_Service_Compute_UrlMapReference $postBody, $optParams = array())
-  {
-    $params = array('project' => $project, 'targetHttpProxy' => $targetHttpProxy, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('setUrlMap', array($params), "Google_Service_Compute_Operation");
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/Resource/TargetHttpsProxies.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/Resource/TargetHttpsProxies.php
deleted file mode 100644
index dd659717..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/Resource/TargetHttpsProxies.php
+++ /dev/null
@@ -1,164 +0,0 @@
-
- *   $computeService = new Google_Service_Compute(...);
- *   $targetHttpsProxies = $computeService->targetHttpsProxies;
- *  
- */
-class Google_Service_Compute_Resource_TargetHttpsProxies extends Google_Service_Resource
-{
-  /**
-   * Deletes the specified TargetHttpsProxy resource. (targetHttpsProxies.delete)
-   *
-   * @param string $project Project ID for this request.
-   * @param string $targetHttpsProxy Name of the TargetHttpsProxy resource to
-   * delete.
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Compute_Operation
-   */
-  public function delete($project, $targetHttpsProxy, $optParams = array())
-  {
-    $params = array('project' => $project, 'targetHttpsProxy' => $targetHttpsProxy);
-    $params = array_merge($params, $optParams);
-    return $this->call('delete', array($params), "Google_Service_Compute_Operation");
-  }
-  /**
-   * Returns the specified TargetHttpsProxy resource. Get a list of available
-   * target HTTPS proxies by making a list() request. (targetHttpsProxies.get)
-   *
-   * @param string $project Project ID for this request.
-   * @param string $targetHttpsProxy Name of the TargetHttpsProxy resource to
-   * return.
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Compute_TargetHttpsProxy
-   */
-  public function get($project, $targetHttpsProxy, $optParams = array())
-  {
-    $params = array('project' => $project, 'targetHttpsProxy' => $targetHttpsProxy);
-    $params = array_merge($params, $optParams);
-    return $this->call('get', array($params), "Google_Service_Compute_TargetHttpsProxy");
-  }
-  /**
-   * Creates a TargetHttpsProxy resource in the specified project using the data
-   * included in the request. (targetHttpsProxies.insert)
-   *
-   * @param string $project Project ID for this request.
-   * @param Google_Service_Compute_TargetHttpsProxy $postBody
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Compute_Operation
-   */
-  public function insert($project, Google_Service_Compute_TargetHttpsProxy $postBody, $optParams = array())
-  {
-    $params = array('project' => $project, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('insert', array($params), "Google_Service_Compute_Operation");
-  }
-  /**
-   * Retrieves the list of TargetHttpsProxy resources available to the specified
-   * project. (targetHttpsProxies.listTargetHttpsProxies)
-   *
-   * @param string $project Project ID for this request.
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param string filter Sets a filter expression for filtering listed
-   * resources, in the form filter={expression}. Your {expression} must be in the
-   * format: field_name comparison_string literal_string.
-   *
-   * The field_name is the name of the field you want to compare. Only atomic
-   * field types are supported (string, number, boolean). The comparison_string
-   * must be either eq (equals) or ne (not equals). The literal_string is the
-   * string value to filter to. The literal value must be valid for the type of
-   * field you are filtering by (string, number, boolean). For string fields, the
-   * literal value is interpreted as a regular expression using RE2 syntax. The
-   * literal value must match the entire field.
-   *
-   * For example, to filter for instances that do not have a name of example-
-   * instance, you would use filter=name ne example-instance.
-   *
-   * You can filter on nested fields. For example, you could filter on instances
-   * that have set the scheduling.automaticRestart field to true. Use filtering on
-   * nested fields to take advantage of labels to organize and search for results
-   * based on label values.
-   *
-   * To filter on multiple expressions, provide each separate expression within
-   * parentheses. For example, (scheduling.automaticRestart eq true) (zone eq us-
-   * central1-f). Multiple expressions are treated as AND expressions, meaning
-   * that resources must match all expressions to pass the filters.
-   * @opt_param string maxResults The maximum number of results per page that
-   * should be returned. If the number of available results is larger than
-   * maxResults, Compute Engine returns a nextPageToken that can be used to get
-   * the next page of results in subsequent list requests. Acceptable values are 0
-   * to 500, inclusive. (Default: 500)
-   * @opt_param string orderBy Sorts list results by a certain order. By default,
-   * results are returned in alphanumerical order based on the resource name.
-   *
-   * You can also sort results in descending order based on the creation timestamp
-   * using orderBy="creationTimestamp desc". This sorts results based on the
-   * creationTimestamp field in reverse chronological order (newest result first).
-   * Use this to sort resources like operations so that the newest operation is
-   * returned first.
-   *
-   * Currently, only sorting by name or creationTimestamp desc is supported.
-   * @opt_param string pageToken Specifies a page token to use. Set pageToken to
-   * the nextPageToken returned by a previous list request to get the next page of
-   * results.
-   * @return Google_Service_Compute_TargetHttpsProxyList
-   */
-  public function listTargetHttpsProxies($project, $optParams = array())
-  {
-    $params = array('project' => $project);
-    $params = array_merge($params, $optParams);
-    return $this->call('list', array($params), "Google_Service_Compute_TargetHttpsProxyList");
-  }
-  /**
-   * Replaces SslCertificates for TargetHttpsProxy.
-   * (targetHttpsProxies.setSslCertificates)
-   *
-   * @param string $project Project ID for this request.
-   * @param string $targetHttpsProxy Name of the TargetHttpsProxy resource to set
-   * an SslCertificates resource for.
-   * @param Google_Service_Compute_TargetHttpsProxiesSetSslCertificatesRequest $postBody
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Compute_Operation
-   */
-  public function setSslCertificates($project, $targetHttpsProxy, Google_Service_Compute_TargetHttpsProxiesSetSslCertificatesRequest $postBody, $optParams = array())
-  {
-    $params = array('project' => $project, 'targetHttpsProxy' => $targetHttpsProxy, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('setSslCertificates', array($params), "Google_Service_Compute_Operation");
-  }
-  /**
-   * Changes the URL map for TargetHttpsProxy. (targetHttpsProxies.setUrlMap)
-   *
-   * @param string $project Project ID for this request.
-   * @param string $targetHttpsProxy Name of the TargetHttpsProxy resource whose
-   * URL map is to be set.
-   * @param Google_Service_Compute_UrlMapReference $postBody
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Compute_Operation
-   */
-  public function setUrlMap($project, $targetHttpsProxy, Google_Service_Compute_UrlMapReference $postBody, $optParams = array())
-  {
-    $params = array('project' => $project, 'targetHttpsProxy' => $targetHttpsProxy, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('setUrlMap', array($params), "Google_Service_Compute_Operation");
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/Resource/TargetInstances.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/Resource/TargetInstances.php
deleted file mode 100644
index e421bf42..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/Resource/TargetInstances.php
+++ /dev/null
@@ -1,190 +0,0 @@
-
- *   $computeService = new Google_Service_Compute(...);
- *   $targetInstances = $computeService->targetInstances;
- *  
- */
-class Google_Service_Compute_Resource_TargetInstances extends Google_Service_Resource
-{
-  /**
-   * Retrieves an aggregated list of target instances.
-   * (targetInstances.aggregatedList)
-   *
-   * @param string $project Project ID for this request.
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param string filter Sets a filter expression for filtering listed
-   * resources, in the form filter={expression}. Your {expression} must be in the
-   * format: field_name comparison_string literal_string.
-   *
-   * The field_name is the name of the field you want to compare. Only atomic
-   * field types are supported (string, number, boolean). The comparison_string
-   * must be either eq (equals) or ne (not equals). The literal_string is the
-   * string value to filter to. The literal value must be valid for the type of
-   * field you are filtering by (string, number, boolean). For string fields, the
-   * literal value is interpreted as a regular expression using RE2 syntax. The
-   * literal value must match the entire field.
-   *
-   * For example, to filter for instances that do not have a name of example-
-   * instance, you would use filter=name ne example-instance.
-   *
-   * You can filter on nested fields. For example, you could filter on instances
-   * that have set the scheduling.automaticRestart field to true. Use filtering on
-   * nested fields to take advantage of labels to organize and search for results
-   * based on label values.
-   *
-   * To filter on multiple expressions, provide each separate expression within
-   * parentheses. For example, (scheduling.automaticRestart eq true) (zone eq us-
-   * central1-f). Multiple expressions are treated as AND expressions, meaning
-   * that resources must match all expressions to pass the filters.
-   * @opt_param string maxResults The maximum number of results per page that
-   * should be returned. If the number of available results is larger than
-   * maxResults, Compute Engine returns a nextPageToken that can be used to get
-   * the next page of results in subsequent list requests. Acceptable values are 0
-   * to 500, inclusive. (Default: 500)
-   * @opt_param string orderBy Sorts list results by a certain order. By default,
-   * results are returned in alphanumerical order based on the resource name.
-   *
-   * You can also sort results in descending order based on the creation timestamp
-   * using orderBy="creationTimestamp desc". This sorts results based on the
-   * creationTimestamp field in reverse chronological order (newest result first).
-   * Use this to sort resources like operations so that the newest operation is
-   * returned first.
-   *
-   * Currently, only sorting by name or creationTimestamp desc is supported.
-   * @opt_param string pageToken Specifies a page token to use. Set pageToken to
-   * the nextPageToken returned by a previous list request to get the next page of
-   * results.
-   * @return Google_Service_Compute_TargetInstanceAggregatedList
-   */
-  public function aggregatedList($project, $optParams = array())
-  {
-    $params = array('project' => $project);
-    $params = array_merge($params, $optParams);
-    return $this->call('aggregatedList', array($params), "Google_Service_Compute_TargetInstanceAggregatedList");
-  }
-  /**
-   * Deletes the specified TargetInstance resource. (targetInstances.delete)
-   *
-   * @param string $project Project ID for this request.
-   * @param string $zone Name of the zone scoping this request.
-   * @param string $targetInstance Name of the TargetInstance resource to delete.
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Compute_Operation
-   */
-  public function delete($project, $zone, $targetInstance, $optParams = array())
-  {
-    $params = array('project' => $project, 'zone' => $zone, 'targetInstance' => $targetInstance);
-    $params = array_merge($params, $optParams);
-    return $this->call('delete', array($params), "Google_Service_Compute_Operation");
-  }
-  /**
-   * Returns the specified TargetInstance resource. Get a list of available target
-   * instances by making a list() request. (targetInstances.get)
-   *
-   * @param string $project Project ID for this request.
-   * @param string $zone Name of the zone scoping this request.
-   * @param string $targetInstance Name of the TargetInstance resource to return.
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Compute_TargetInstance
-   */
-  public function get($project, $zone, $targetInstance, $optParams = array())
-  {
-    $params = array('project' => $project, 'zone' => $zone, 'targetInstance' => $targetInstance);
-    $params = array_merge($params, $optParams);
-    return $this->call('get', array($params), "Google_Service_Compute_TargetInstance");
-  }
-  /**
-   * Creates a TargetInstance resource in the specified project and zone using the
-   * data included in the request. (targetInstances.insert)
-   *
-   * @param string $project Project ID for this request.
-   * @param string $zone Name of the zone scoping this request.
-   * @param Google_Service_Compute_TargetInstance $postBody
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Compute_Operation
-   */
-  public function insert($project, $zone, Google_Service_Compute_TargetInstance $postBody, $optParams = array())
-  {
-    $params = array('project' => $project, 'zone' => $zone, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('insert', array($params), "Google_Service_Compute_Operation");
-  }
-  /**
-   * Retrieves a list of TargetInstance resources available to the specified
-   * project and zone. (targetInstances.listTargetInstances)
-   *
-   * @param string $project Project ID for this request.
-   * @param string $zone Name of the zone scoping this request.
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param string filter Sets a filter expression for filtering listed
-   * resources, in the form filter={expression}. Your {expression} must be in the
-   * format: field_name comparison_string literal_string.
-   *
-   * The field_name is the name of the field you want to compare. Only atomic
-   * field types are supported (string, number, boolean). The comparison_string
-   * must be either eq (equals) or ne (not equals). The literal_string is the
-   * string value to filter to. The literal value must be valid for the type of
-   * field you are filtering by (string, number, boolean). For string fields, the
-   * literal value is interpreted as a regular expression using RE2 syntax. The
-   * literal value must match the entire field.
-   *
-   * For example, to filter for instances that do not have a name of example-
-   * instance, you would use filter=name ne example-instance.
-   *
-   * You can filter on nested fields. For example, you could filter on instances
-   * that have set the scheduling.automaticRestart field to true. Use filtering on
-   * nested fields to take advantage of labels to organize and search for results
-   * based on label values.
-   *
-   * To filter on multiple expressions, provide each separate expression within
-   * parentheses. For example, (scheduling.automaticRestart eq true) (zone eq us-
-   * central1-f). Multiple expressions are treated as AND expressions, meaning
-   * that resources must match all expressions to pass the filters.
-   * @opt_param string maxResults The maximum number of results per page that
-   * should be returned. If the number of available results is larger than
-   * maxResults, Compute Engine returns a nextPageToken that can be used to get
-   * the next page of results in subsequent list requests. Acceptable values are 0
-   * to 500, inclusive. (Default: 500)
-   * @opt_param string orderBy Sorts list results by a certain order. By default,
-   * results are returned in alphanumerical order based on the resource name.
-   *
-   * You can also sort results in descending order based on the creation timestamp
-   * using orderBy="creationTimestamp desc". This sorts results based on the
-   * creationTimestamp field in reverse chronological order (newest result first).
-   * Use this to sort resources like operations so that the newest operation is
-   * returned first.
-   *
-   * Currently, only sorting by name or creationTimestamp desc is supported.
-   * @opt_param string pageToken Specifies a page token to use. Set pageToken to
-   * the nextPageToken returned by a previous list request to get the next page of
-   * results.
-   * @return Google_Service_Compute_TargetInstanceList
-   */
-  public function listTargetInstances($project, $zone, $optParams = array())
-  {
-    $params = array('project' => $project, 'zone' => $zone);
-    $params = array_merge($params, $optParams);
-    return $this->call('list', array($params), "Google_Service_Compute_TargetInstanceList");
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/Resource/TargetPools.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/Resource/TargetPools.php
deleted file mode 100644
index 7d462298..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/Resource/TargetPools.php
+++ /dev/null
@@ -1,293 +0,0 @@
-
- *   $computeService = new Google_Service_Compute(...);
- *   $targetPools = $computeService->targetPools;
- *  
- */
-class Google_Service_Compute_Resource_TargetPools extends Google_Service_Resource
-{
-  /**
-   * Adds health check URLs to a target pool. (targetPools.addHealthCheck)
-   *
-   * @param string $project Project ID for this request.
-   * @param string $region Name of the region scoping this request.
-   * @param string $targetPool Name of the target pool to add a health check to.
-   * @param Google_Service_Compute_TargetPoolsAddHealthCheckRequest $postBody
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Compute_Operation
-   */
-  public function addHealthCheck($project, $region, $targetPool, Google_Service_Compute_TargetPoolsAddHealthCheckRequest $postBody, $optParams = array())
-  {
-    $params = array('project' => $project, 'region' => $region, 'targetPool' => $targetPool, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('addHealthCheck', array($params), "Google_Service_Compute_Operation");
-  }
-  /**
-   * Adds an instance to a target pool. (targetPools.addInstance)
-   *
-   * @param string $project Project ID for this request.
-   * @param string $region Name of the region scoping this request.
-   * @param string $targetPool Name of the TargetPool resource to add instances
-   * to.
-   * @param Google_Service_Compute_TargetPoolsAddInstanceRequest $postBody
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Compute_Operation
-   */
-  public function addInstance($project, $region, $targetPool, Google_Service_Compute_TargetPoolsAddInstanceRequest $postBody, $optParams = array())
-  {
-    $params = array('project' => $project, 'region' => $region, 'targetPool' => $targetPool, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('addInstance', array($params), "Google_Service_Compute_Operation");
-  }
-  /**
-   * Retrieves an aggregated list of target pools. (targetPools.aggregatedList)
-   *
-   * @param string $project Project ID for this request.
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param string filter Sets a filter expression for filtering listed
-   * resources, in the form filter={expression}. Your {expression} must be in the
-   * format: field_name comparison_string literal_string.
-   *
-   * The field_name is the name of the field you want to compare. Only atomic
-   * field types are supported (string, number, boolean). The comparison_string
-   * must be either eq (equals) or ne (not equals). The literal_string is the
-   * string value to filter to. The literal value must be valid for the type of
-   * field you are filtering by (string, number, boolean). For string fields, the
-   * literal value is interpreted as a regular expression using RE2 syntax. The
-   * literal value must match the entire field.
-   *
-   * For example, to filter for instances that do not have a name of example-
-   * instance, you would use filter=name ne example-instance.
-   *
-   * You can filter on nested fields. For example, you could filter on instances
-   * that have set the scheduling.automaticRestart field to true. Use filtering on
-   * nested fields to take advantage of labels to organize and search for results
-   * based on label values.
-   *
-   * To filter on multiple expressions, provide each separate expression within
-   * parentheses. For example, (scheduling.automaticRestart eq true) (zone eq us-
-   * central1-f). Multiple expressions are treated as AND expressions, meaning
-   * that resources must match all expressions to pass the filters.
-   * @opt_param string maxResults The maximum number of results per page that
-   * should be returned. If the number of available results is larger than
-   * maxResults, Compute Engine returns a nextPageToken that can be used to get
-   * the next page of results in subsequent list requests. Acceptable values are 0
-   * to 500, inclusive. (Default: 500)
-   * @opt_param string orderBy Sorts list results by a certain order. By default,
-   * results are returned in alphanumerical order based on the resource name.
-   *
-   * You can also sort results in descending order based on the creation timestamp
-   * using orderBy="creationTimestamp desc". This sorts results based on the
-   * creationTimestamp field in reverse chronological order (newest result first).
-   * Use this to sort resources like operations so that the newest operation is
-   * returned first.
-   *
-   * Currently, only sorting by name or creationTimestamp desc is supported.
-   * @opt_param string pageToken Specifies a page token to use. Set pageToken to
-   * the nextPageToken returned by a previous list request to get the next page of
-   * results.
-   * @return Google_Service_Compute_TargetPoolAggregatedList
-   */
-  public function aggregatedList($project, $optParams = array())
-  {
-    $params = array('project' => $project);
-    $params = array_merge($params, $optParams);
-    return $this->call('aggregatedList', array($params), "Google_Service_Compute_TargetPoolAggregatedList");
-  }
-  /**
-   * Deletes the specified target pool. (targetPools.delete)
-   *
-   * @param string $project Project ID for this request.
-   * @param string $region Name of the region scoping this request.
-   * @param string $targetPool Name of the TargetPool resource to delete.
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Compute_Operation
-   */
-  public function delete($project, $region, $targetPool, $optParams = array())
-  {
-    $params = array('project' => $project, 'region' => $region, 'targetPool' => $targetPool);
-    $params = array_merge($params, $optParams);
-    return $this->call('delete', array($params), "Google_Service_Compute_Operation");
-  }
-  /**
-   * Returns the specified target pool. Get a list of available target pools by
-   * making a list() request. (targetPools.get)
-   *
-   * @param string $project Project ID for this request.
-   * @param string $region Name of the region scoping this request.
-   * @param string $targetPool Name of the TargetPool resource to return.
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Compute_TargetPool
-   */
-  public function get($project, $region, $targetPool, $optParams = array())
-  {
-    $params = array('project' => $project, 'region' => $region, 'targetPool' => $targetPool);
-    $params = array_merge($params, $optParams);
-    return $this->call('get', array($params), "Google_Service_Compute_TargetPool");
-  }
-  /**
-   * Gets the most recent health check results for each IP for the instance that
-   * is referenced by the given target pool. (targetPools.getHealth)
-   *
-   * @param string $project Project ID for this request.
-   * @param string $region Name of the region scoping this request.
-   * @param string $targetPool Name of the TargetPool resource to which the
-   * queried instance belongs.
-   * @param Google_Service_Compute_InstanceReference $postBody
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Compute_TargetPoolInstanceHealth
-   */
-  public function getHealth($project, $region, $targetPool, Google_Service_Compute_InstanceReference $postBody, $optParams = array())
-  {
-    $params = array('project' => $project, 'region' => $region, 'targetPool' => $targetPool, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('getHealth', array($params), "Google_Service_Compute_TargetPoolInstanceHealth");
-  }
-  /**
-   * Creates a target pool in the specified project and region using the data
-   * included in the request. (targetPools.insert)
-   *
-   * @param string $project Project ID for this request.
-   * @param string $region Name of the region scoping this request.
-   * @param Google_Service_Compute_TargetPool $postBody
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Compute_Operation
-   */
-  public function insert($project, $region, Google_Service_Compute_TargetPool $postBody, $optParams = array())
-  {
-    $params = array('project' => $project, 'region' => $region, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('insert', array($params), "Google_Service_Compute_Operation");
-  }
-  /**
-   * Retrieves a list of target pools available to the specified project and
-   * region. (targetPools.listTargetPools)
-   *
-   * @param string $project Project ID for this request.
-   * @param string $region Name of the region scoping this request.
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param string filter Sets a filter expression for filtering listed
-   * resources, in the form filter={expression}. Your {expression} must be in the
-   * format: field_name comparison_string literal_string.
-   *
-   * The field_name is the name of the field you want to compare. Only atomic
-   * field types are supported (string, number, boolean). The comparison_string
-   * must be either eq (equals) or ne (not equals). The literal_string is the
-   * string value to filter to. The literal value must be valid for the type of
-   * field you are filtering by (string, number, boolean). For string fields, the
-   * literal value is interpreted as a regular expression using RE2 syntax. The
-   * literal value must match the entire field.
-   *
-   * For example, to filter for instances that do not have a name of example-
-   * instance, you would use filter=name ne example-instance.
-   *
-   * You can filter on nested fields. For example, you could filter on instances
-   * that have set the scheduling.automaticRestart field to true. Use filtering on
-   * nested fields to take advantage of labels to organize and search for results
-   * based on label values.
-   *
-   * To filter on multiple expressions, provide each separate expression within
-   * parentheses. For example, (scheduling.automaticRestart eq true) (zone eq us-
-   * central1-f). Multiple expressions are treated as AND expressions, meaning
-   * that resources must match all expressions to pass the filters.
-   * @opt_param string maxResults The maximum number of results per page that
-   * should be returned. If the number of available results is larger than
-   * maxResults, Compute Engine returns a nextPageToken that can be used to get
-   * the next page of results in subsequent list requests. Acceptable values are 0
-   * to 500, inclusive. (Default: 500)
-   * @opt_param string orderBy Sorts list results by a certain order. By default,
-   * results are returned in alphanumerical order based on the resource name.
-   *
-   * You can also sort results in descending order based on the creation timestamp
-   * using orderBy="creationTimestamp desc". This sorts results based on the
-   * creationTimestamp field in reverse chronological order (newest result first).
-   * Use this to sort resources like operations so that the newest operation is
-   * returned first.
-   *
-   * Currently, only sorting by name or creationTimestamp desc is supported.
-   * @opt_param string pageToken Specifies a page token to use. Set pageToken to
-   * the nextPageToken returned by a previous list request to get the next page of
-   * results.
-   * @return Google_Service_Compute_TargetPoolList
-   */
-  public function listTargetPools($project, $region, $optParams = array())
-  {
-    $params = array('project' => $project, 'region' => $region);
-    $params = array_merge($params, $optParams);
-    return $this->call('list', array($params), "Google_Service_Compute_TargetPoolList");
-  }
-  /**
-   * Removes health check URL from a target pool. (targetPools.removeHealthCheck)
-   *
-   * @param string $project Project ID for this request.
-   * @param string $region Name of the region for this request.
-   * @param string $targetPool Name of the target pool to remove health checks
-   * from.
-   * @param Google_Service_Compute_TargetPoolsRemoveHealthCheckRequest $postBody
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Compute_Operation
-   */
-  public function removeHealthCheck($project, $region, $targetPool, Google_Service_Compute_TargetPoolsRemoveHealthCheckRequest $postBody, $optParams = array())
-  {
-    $params = array('project' => $project, 'region' => $region, 'targetPool' => $targetPool, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('removeHealthCheck', array($params), "Google_Service_Compute_Operation");
-  }
-  /**
-   * Removes instance URL from a target pool. (targetPools.removeInstance)
-   *
-   * @param string $project Project ID for this request.
-   * @param string $region Name of the region scoping this request.
-   * @param string $targetPool Name of the TargetPool resource to remove instances
-   * from.
-   * @param Google_Service_Compute_TargetPoolsRemoveInstanceRequest $postBody
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Compute_Operation
-   */
-  public function removeInstance($project, $region, $targetPool, Google_Service_Compute_TargetPoolsRemoveInstanceRequest $postBody, $optParams = array())
-  {
-    $params = array('project' => $project, 'region' => $region, 'targetPool' => $targetPool, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('removeInstance', array($params), "Google_Service_Compute_Operation");
-  }
-  /**
-   * Changes a backup target pool's configurations. (targetPools.setBackup)
-   *
-   * @param string $project Project ID for this request.
-   * @param string $region Name of the region scoping this request.
-   * @param string $targetPool Name of the TargetPool resource to set a backup
-   * pool for.
-   * @param Google_Service_Compute_TargetReference $postBody
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param float failoverRatio New failoverRatio value for the target pool.
-   * @return Google_Service_Compute_Operation
-   */
-  public function setBackup($project, $region, $targetPool, Google_Service_Compute_TargetReference $postBody, $optParams = array())
-  {
-    $params = array('project' => $project, 'region' => $region, 'targetPool' => $targetPool, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('setBackup', array($params), "Google_Service_Compute_Operation");
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/Resource/TargetSslProxies.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/Resource/TargetSslProxies.php
deleted file mode 100644
index b6e2458d..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/Resource/TargetSslProxies.php
+++ /dev/null
@@ -1,180 +0,0 @@
-
- *   $computeService = new Google_Service_Compute(...);
- *   $targetSslProxies = $computeService->targetSslProxies;
- *  
- */
-class Google_Service_Compute_Resource_TargetSslProxies extends Google_Service_Resource
-{
-  /**
-   * Deletes the specified TargetSslProxy resource. (targetSslProxies.delete)
-   *
-   * @param string $project Project ID for this request.
-   * @param string $targetSslProxy Name of the TargetSslProxy resource to delete.
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Compute_Operation
-   */
-  public function delete($project, $targetSslProxy, $optParams = array())
-  {
-    $params = array('project' => $project, 'targetSslProxy' => $targetSslProxy);
-    $params = array_merge($params, $optParams);
-    return $this->call('delete', array($params), "Google_Service_Compute_Operation");
-  }
-  /**
-   * Returns the specified TargetSslProxy resource. Get a list of available target
-   * SSL proxies by making a list() request. (targetSslProxies.get)
-   *
-   * @param string $project Project ID for this request.
-   * @param string $targetSslProxy Name of the TargetSslProxy resource to return.
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Compute_TargetSslProxy
-   */
-  public function get($project, $targetSslProxy, $optParams = array())
-  {
-    $params = array('project' => $project, 'targetSslProxy' => $targetSslProxy);
-    $params = array_merge($params, $optParams);
-    return $this->call('get', array($params), "Google_Service_Compute_TargetSslProxy");
-  }
-  /**
-   * Creates a TargetSslProxy resource in the specified project using the data
-   * included in the request. (targetSslProxies.insert)
-   *
-   * @param string $project Project ID for this request.
-   * @param Google_Service_Compute_TargetSslProxy $postBody
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Compute_Operation
-   */
-  public function insert($project, Google_Service_Compute_TargetSslProxy $postBody, $optParams = array())
-  {
-    $params = array('project' => $project, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('insert', array($params), "Google_Service_Compute_Operation");
-  }
-  /**
-   * Retrieves the list of TargetSslProxy resources available to the specified
-   * project. (targetSslProxies.listTargetSslProxies)
-   *
-   * @param string $project Project ID for this request.
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param string filter Sets a filter expression for filtering listed
-   * resources, in the form filter={expression}. Your {expression} must be in the
-   * format: field_name comparison_string literal_string.
-   *
-   * The field_name is the name of the field you want to compare. Only atomic
-   * field types are supported (string, number, boolean). The comparison_string
-   * must be either eq (equals) or ne (not equals). The literal_string is the
-   * string value to filter to. The literal value must be valid for the type of
-   * field you are filtering by (string, number, boolean). For string fields, the
-   * literal value is interpreted as a regular expression using RE2 syntax. The
-   * literal value must match the entire field.
-   *
-   * For example, to filter for instances that do not have a name of example-
-   * instance, you would use filter=name ne example-instance.
-   *
-   * You can filter on nested fields. For example, you could filter on instances
-   * that have set the scheduling.automaticRestart field to true. Use filtering on
-   * nested fields to take advantage of labels to organize and search for results
-   * based on label values.
-   *
-   * To filter on multiple expressions, provide each separate expression within
-   * parentheses. For example, (scheduling.automaticRestart eq true) (zone eq us-
-   * central1-f). Multiple expressions are treated as AND expressions, meaning
-   * that resources must match all expressions to pass the filters.
-   * @opt_param string maxResults The maximum number of results per page that
-   * should be returned. If the number of available results is larger than
-   * maxResults, Compute Engine returns a nextPageToken that can be used to get
-   * the next page of results in subsequent list requests. Acceptable values are 0
-   * to 500, inclusive. (Default: 500)
-   * @opt_param string orderBy Sorts list results by a certain order. By default,
-   * results are returned in alphanumerical order based on the resource name.
-   *
-   * You can also sort results in descending order based on the creation timestamp
-   * using orderBy="creationTimestamp desc". This sorts results based on the
-   * creationTimestamp field in reverse chronological order (newest result first).
-   * Use this to sort resources like operations so that the newest operation is
-   * returned first.
-   *
-   * Currently, only sorting by name or creationTimestamp desc is supported.
-   * @opt_param string pageToken Specifies a page token to use. Set pageToken to
-   * the nextPageToken returned by a previous list request to get the next page of
-   * results.
-   * @return Google_Service_Compute_TargetSslProxyList
-   */
-  public function listTargetSslProxies($project, $optParams = array())
-  {
-    $params = array('project' => $project);
-    $params = array_merge($params, $optParams);
-    return $this->call('list', array($params), "Google_Service_Compute_TargetSslProxyList");
-  }
-  /**
-   * Changes the BackendService for TargetSslProxy.
-   * (targetSslProxies.setBackendService)
-   *
-   * @param string $project Project ID for this request.
-   * @param string $targetSslProxy Name of the TargetSslProxy resource whose
-   * BackendService resource is to be set.
-   * @param Google_Service_Compute_TargetSslProxiesSetBackendServiceRequest $postBody
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Compute_Operation
-   */
-  public function setBackendService($project, $targetSslProxy, Google_Service_Compute_TargetSslProxiesSetBackendServiceRequest $postBody, $optParams = array())
-  {
-    $params = array('project' => $project, 'targetSslProxy' => $targetSslProxy, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('setBackendService', array($params), "Google_Service_Compute_Operation");
-  }
-  /**
-   * Changes the ProxyHeaderType for TargetSslProxy.
-   * (targetSslProxies.setProxyHeader)
-   *
-   * @param string $project Project ID for this request.
-   * @param string $targetSslProxy Name of the TargetSslProxy resource whose
-   * ProxyHeader is to be set.
-   * @param Google_Service_Compute_TargetSslProxiesSetProxyHeaderRequest $postBody
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Compute_Operation
-   */
-  public function setProxyHeader($project, $targetSslProxy, Google_Service_Compute_TargetSslProxiesSetProxyHeaderRequest $postBody, $optParams = array())
-  {
-    $params = array('project' => $project, 'targetSslProxy' => $targetSslProxy, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('setProxyHeader', array($params), "Google_Service_Compute_Operation");
-  }
-  /**
-   * Changes SslCertificates for TargetSslProxy.
-   * (targetSslProxies.setSslCertificates)
-   *
-   * @param string $project Project ID for this request.
-   * @param string $targetSslProxy Name of the TargetSslProxy resource whose
-   * SslCertificate resource is to be set.
-   * @param Google_Service_Compute_TargetSslProxiesSetSslCertificatesRequest $postBody
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Compute_Operation
-   */
-  public function setSslCertificates($project, $targetSslProxy, Google_Service_Compute_TargetSslProxiesSetSslCertificatesRequest $postBody, $optParams = array())
-  {
-    $params = array('project' => $project, 'targetSslProxy' => $targetSslProxy, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('setSslCertificates', array($params), "Google_Service_Compute_Operation");
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/Resource/TargetVpnGateways.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/Resource/TargetVpnGateways.php
deleted file mode 100644
index a4dc75ab..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/Resource/TargetVpnGateways.php
+++ /dev/null
@@ -1,190 +0,0 @@
-
- *   $computeService = new Google_Service_Compute(...);
- *   $targetVpnGateways = $computeService->targetVpnGateways;
- *  
- */
-class Google_Service_Compute_Resource_TargetVpnGateways extends Google_Service_Resource
-{
-  /**
-   * Retrieves an aggregated list of target VPN gateways.
-   * (targetVpnGateways.aggregatedList)
-   *
-   * @param string $project Project ID for this request.
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param string filter Sets a filter expression for filtering listed
-   * resources, in the form filter={expression}. Your {expression} must be in the
-   * format: field_name comparison_string literal_string.
-   *
-   * The field_name is the name of the field you want to compare. Only atomic
-   * field types are supported (string, number, boolean). The comparison_string
-   * must be either eq (equals) or ne (not equals). The literal_string is the
-   * string value to filter to. The literal value must be valid for the type of
-   * field you are filtering by (string, number, boolean). For string fields, the
-   * literal value is interpreted as a regular expression using RE2 syntax. The
-   * literal value must match the entire field.
-   *
-   * For example, to filter for instances that do not have a name of example-
-   * instance, you would use filter=name ne example-instance.
-   *
-   * You can filter on nested fields. For example, you could filter on instances
-   * that have set the scheduling.automaticRestart field to true. Use filtering on
-   * nested fields to take advantage of labels to organize and search for results
-   * based on label values.
-   *
-   * To filter on multiple expressions, provide each separate expression within
-   * parentheses. For example, (scheduling.automaticRestart eq true) (zone eq us-
-   * central1-f). Multiple expressions are treated as AND expressions, meaning
-   * that resources must match all expressions to pass the filters.
-   * @opt_param string maxResults The maximum number of results per page that
-   * should be returned. If the number of available results is larger than
-   * maxResults, Compute Engine returns a nextPageToken that can be used to get
-   * the next page of results in subsequent list requests. Acceptable values are 0
-   * to 500, inclusive. (Default: 500)
-   * @opt_param string orderBy Sorts list results by a certain order. By default,
-   * results are returned in alphanumerical order based on the resource name.
-   *
-   * You can also sort results in descending order based on the creation timestamp
-   * using orderBy="creationTimestamp desc". This sorts results based on the
-   * creationTimestamp field in reverse chronological order (newest result first).
-   * Use this to sort resources like operations so that the newest operation is
-   * returned first.
-   *
-   * Currently, only sorting by name or creationTimestamp desc is supported.
-   * @opt_param string pageToken Specifies a page token to use. Set pageToken to
-   * the nextPageToken returned by a previous list request to get the next page of
-   * results.
-   * @return Google_Service_Compute_TargetVpnGatewayAggregatedList
-   */
-  public function aggregatedList($project, $optParams = array())
-  {
-    $params = array('project' => $project);
-    $params = array_merge($params, $optParams);
-    return $this->call('aggregatedList', array($params), "Google_Service_Compute_TargetVpnGatewayAggregatedList");
-  }
-  /**
-   * Deletes the specified target VPN gateway. (targetVpnGateways.delete)
-   *
-   * @param string $project Project ID for this request.
-   * @param string $region Name of the region for this request.
-   * @param string $targetVpnGateway Name of the target VPN gateway to delete.
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Compute_Operation
-   */
-  public function delete($project, $region, $targetVpnGateway, $optParams = array())
-  {
-    $params = array('project' => $project, 'region' => $region, 'targetVpnGateway' => $targetVpnGateway);
-    $params = array_merge($params, $optParams);
-    return $this->call('delete', array($params), "Google_Service_Compute_Operation");
-  }
-  /**
-   * Returns the specified target VPN gateway. Get a list of available target VPN
-   * gateways by making a list() request. (targetVpnGateways.get)
-   *
-   * @param string $project Project ID for this request.
-   * @param string $region Name of the region for this request.
-   * @param string $targetVpnGateway Name of the target VPN gateway to return.
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Compute_TargetVpnGateway
-   */
-  public function get($project, $region, $targetVpnGateway, $optParams = array())
-  {
-    $params = array('project' => $project, 'region' => $region, 'targetVpnGateway' => $targetVpnGateway);
-    $params = array_merge($params, $optParams);
-    return $this->call('get', array($params), "Google_Service_Compute_TargetVpnGateway");
-  }
-  /**
-   * Creates a target VPN gateway in the specified project and region using the
-   * data included in the request. (targetVpnGateways.insert)
-   *
-   * @param string $project Project ID for this request.
-   * @param string $region Name of the region for this request.
-   * @param Google_Service_Compute_TargetVpnGateway $postBody
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Compute_Operation
-   */
-  public function insert($project, $region, Google_Service_Compute_TargetVpnGateway $postBody, $optParams = array())
-  {
-    $params = array('project' => $project, 'region' => $region, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('insert', array($params), "Google_Service_Compute_Operation");
-  }
-  /**
-   * Retrieves a list of target VPN gateways available to the specified project
-   * and region. (targetVpnGateways.listTargetVpnGateways)
-   *
-   * @param string $project Project ID for this request.
-   * @param string $region Name of the region for this request.
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param string filter Sets a filter expression for filtering listed
-   * resources, in the form filter={expression}. Your {expression} must be in the
-   * format: field_name comparison_string literal_string.
-   *
-   * The field_name is the name of the field you want to compare. Only atomic
-   * field types are supported (string, number, boolean). The comparison_string
-   * must be either eq (equals) or ne (not equals). The literal_string is the
-   * string value to filter to. The literal value must be valid for the type of
-   * field you are filtering by (string, number, boolean). For string fields, the
-   * literal value is interpreted as a regular expression using RE2 syntax. The
-   * literal value must match the entire field.
-   *
-   * For example, to filter for instances that do not have a name of example-
-   * instance, you would use filter=name ne example-instance.
-   *
-   * You can filter on nested fields. For example, you could filter on instances
-   * that have set the scheduling.automaticRestart field to true. Use filtering on
-   * nested fields to take advantage of labels to organize and search for results
-   * based on label values.
-   *
-   * To filter on multiple expressions, provide each separate expression within
-   * parentheses. For example, (scheduling.automaticRestart eq true) (zone eq us-
-   * central1-f). Multiple expressions are treated as AND expressions, meaning
-   * that resources must match all expressions to pass the filters.
-   * @opt_param string maxResults The maximum number of results per page that
-   * should be returned. If the number of available results is larger than
-   * maxResults, Compute Engine returns a nextPageToken that can be used to get
-   * the next page of results in subsequent list requests. Acceptable values are 0
-   * to 500, inclusive. (Default: 500)
-   * @opt_param string orderBy Sorts list results by a certain order. By default,
-   * results are returned in alphanumerical order based on the resource name.
-   *
-   * You can also sort results in descending order based on the creation timestamp
-   * using orderBy="creationTimestamp desc". This sorts results based on the
-   * creationTimestamp field in reverse chronological order (newest result first).
-   * Use this to sort resources like operations so that the newest operation is
-   * returned first.
-   *
-   * Currently, only sorting by name or creationTimestamp desc is supported.
-   * @opt_param string pageToken Specifies a page token to use. Set pageToken to
-   * the nextPageToken returned by a previous list request to get the next page of
-   * results.
-   * @return Google_Service_Compute_TargetVpnGatewayList
-   */
-  public function listTargetVpnGateways($project, $region, $optParams = array())
-  {
-    $params = array('project' => $project, 'region' => $region);
-    $params = array_merge($params, $optParams);
-    return $this->call('list', array($params), "Google_Service_Compute_TargetVpnGatewayList");
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/Resource/UrlMaps.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/Resource/UrlMaps.php
deleted file mode 100644
index 3a3460d0..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/Resource/UrlMaps.php
+++ /dev/null
@@ -1,194 +0,0 @@
-
- *   $computeService = new Google_Service_Compute(...);
- *   $urlMaps = $computeService->urlMaps;
- *  
- */
-class Google_Service_Compute_Resource_UrlMaps extends Google_Service_Resource
-{
-  /**
-   * Deletes the specified UrlMap resource. (urlMaps.delete)
-   *
-   * @param string $project Project ID for this request.
-   * @param string $urlMap Name of the UrlMap resource to delete.
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Compute_Operation
-   */
-  public function delete($project, $urlMap, $optParams = array())
-  {
-    $params = array('project' => $project, 'urlMap' => $urlMap);
-    $params = array_merge($params, $optParams);
-    return $this->call('delete', array($params), "Google_Service_Compute_Operation");
-  }
-  /**
-   * Returns the specified UrlMap resource. Get a list of available URL maps by
-   * making a list() request. (urlMaps.get)
-   *
-   * @param string $project Project ID for this request.
-   * @param string $urlMap Name of the UrlMap resource to return.
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Compute_UrlMap
-   */
-  public function get($project, $urlMap, $optParams = array())
-  {
-    $params = array('project' => $project, 'urlMap' => $urlMap);
-    $params = array_merge($params, $optParams);
-    return $this->call('get', array($params), "Google_Service_Compute_UrlMap");
-  }
-  /**
-   * Creates a UrlMap resource in the specified project using the data included in
-   * the request. (urlMaps.insert)
-   *
-   * @param string $project Project ID for this request.
-   * @param Google_Service_Compute_UrlMap $postBody
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Compute_Operation
-   */
-  public function insert($project, Google_Service_Compute_UrlMap $postBody, $optParams = array())
-  {
-    $params = array('project' => $project, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('insert', array($params), "Google_Service_Compute_Operation");
-  }
-  /**
-   * Initiates a cache invalidation operation, invalidating the specified path,
-   * scoped to the specified UrlMap. (urlMaps.invalidateCache)
-   *
-   * @param string $project Project ID for this request.
-   * @param string $urlMap Name of the UrlMap scoping this request.
-   * @param Google_Service_Compute_CacheInvalidationRule $postBody
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Compute_Operation
-   */
-  public function invalidateCache($project, $urlMap, Google_Service_Compute_CacheInvalidationRule $postBody, $optParams = array())
-  {
-    $params = array('project' => $project, 'urlMap' => $urlMap, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('invalidateCache', array($params), "Google_Service_Compute_Operation");
-  }
-  /**
-   * Retrieves the list of UrlMap resources available to the specified project.
-   * (urlMaps.listUrlMaps)
-   *
-   * @param string $project Project ID for this request.
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param string filter Sets a filter expression for filtering listed
-   * resources, in the form filter={expression}. Your {expression} must be in the
-   * format: field_name comparison_string literal_string.
-   *
-   * The field_name is the name of the field you want to compare. Only atomic
-   * field types are supported (string, number, boolean). The comparison_string
-   * must be either eq (equals) or ne (not equals). The literal_string is the
-   * string value to filter to. The literal value must be valid for the type of
-   * field you are filtering by (string, number, boolean). For string fields, the
-   * literal value is interpreted as a regular expression using RE2 syntax. The
-   * literal value must match the entire field.
-   *
-   * For example, to filter for instances that do not have a name of example-
-   * instance, you would use filter=name ne example-instance.
-   *
-   * You can filter on nested fields. For example, you could filter on instances
-   * that have set the scheduling.automaticRestart field to true. Use filtering on
-   * nested fields to take advantage of labels to organize and search for results
-   * based on label values.
-   *
-   * To filter on multiple expressions, provide each separate expression within
-   * parentheses. For example, (scheduling.automaticRestart eq true) (zone eq us-
-   * central1-f). Multiple expressions are treated as AND expressions, meaning
-   * that resources must match all expressions to pass the filters.
-   * @opt_param string maxResults The maximum number of results per page that
-   * should be returned. If the number of available results is larger than
-   * maxResults, Compute Engine returns a nextPageToken that can be used to get
-   * the next page of results in subsequent list requests. Acceptable values are 0
-   * to 500, inclusive. (Default: 500)
-   * @opt_param string orderBy Sorts list results by a certain order. By default,
-   * results are returned in alphanumerical order based on the resource name.
-   *
-   * You can also sort results in descending order based on the creation timestamp
-   * using orderBy="creationTimestamp desc". This sorts results based on the
-   * creationTimestamp field in reverse chronological order (newest result first).
-   * Use this to sort resources like operations so that the newest operation is
-   * returned first.
-   *
-   * Currently, only sorting by name or creationTimestamp desc is supported.
-   * @opt_param string pageToken Specifies a page token to use. Set pageToken to
-   * the nextPageToken returned by a previous list request to get the next page of
-   * results.
-   * @return Google_Service_Compute_UrlMapList
-   */
-  public function listUrlMaps($project, $optParams = array())
-  {
-    $params = array('project' => $project);
-    $params = array_merge($params, $optParams);
-    return $this->call('list', array($params), "Google_Service_Compute_UrlMapList");
-  }
-  /**
-   * Updates the specified UrlMap resource with the data included in the request.
-   * This method supports patch semantics. (urlMaps.patch)
-   *
-   * @param string $project Project ID for this request.
-   * @param string $urlMap Name of the UrlMap resource to update.
-   * @param Google_Service_Compute_UrlMap $postBody
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Compute_Operation
-   */
-  public function patch($project, $urlMap, Google_Service_Compute_UrlMap $postBody, $optParams = array())
-  {
-    $params = array('project' => $project, 'urlMap' => $urlMap, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('patch', array($params), "Google_Service_Compute_Operation");
-  }
-  /**
-   * Updates the specified UrlMap resource with the data included in the request.
-   * (urlMaps.update)
-   *
-   * @param string $project Project ID for this request.
-   * @param string $urlMap Name of the UrlMap resource to update.
-   * @param Google_Service_Compute_UrlMap $postBody
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Compute_Operation
-   */
-  public function update($project, $urlMap, Google_Service_Compute_UrlMap $postBody, $optParams = array())
-  {
-    $params = array('project' => $project, 'urlMap' => $urlMap, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('update', array($params), "Google_Service_Compute_Operation");
-  }
-  /**
-   * Runs static validation for the UrlMap. In particular, the tests of the
-   * provided UrlMap will be run. Calling this method does NOT create the UrlMap.
-   * (urlMaps.validate)
-   *
-   * @param string $project Project ID for this request.
-   * @param string $urlMap Name of the UrlMap resource to be validated as.
-   * @param Google_Service_Compute_UrlMapsValidateRequest $postBody
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Compute_UrlMapsValidateResponse
-   */
-  public function validate($project, $urlMap, Google_Service_Compute_UrlMapsValidateRequest $postBody, $optParams = array())
-  {
-    $params = array('project' => $project, 'urlMap' => $urlMap, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('validate', array($params), "Google_Service_Compute_UrlMapsValidateResponse");
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/Resource/VpnTunnels.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/Resource/VpnTunnels.php
deleted file mode 100644
index 4d9fd312..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/Resource/VpnTunnels.php
+++ /dev/null
@@ -1,189 +0,0 @@
-
- *   $computeService = new Google_Service_Compute(...);
- *   $vpnTunnels = $computeService->vpnTunnels;
- *  
- */
-class Google_Service_Compute_Resource_VpnTunnels extends Google_Service_Resource
-{
-  /**
-   * Retrieves an aggregated list of VPN tunnels. (vpnTunnels.aggregatedList)
-   *
-   * @param string $project Project ID for this request.
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param string filter Sets a filter expression for filtering listed
-   * resources, in the form filter={expression}. Your {expression} must be in the
-   * format: field_name comparison_string literal_string.
-   *
-   * The field_name is the name of the field you want to compare. Only atomic
-   * field types are supported (string, number, boolean). The comparison_string
-   * must be either eq (equals) or ne (not equals). The literal_string is the
-   * string value to filter to. The literal value must be valid for the type of
-   * field you are filtering by (string, number, boolean). For string fields, the
-   * literal value is interpreted as a regular expression using RE2 syntax. The
-   * literal value must match the entire field.
-   *
-   * For example, to filter for instances that do not have a name of example-
-   * instance, you would use filter=name ne example-instance.
-   *
-   * You can filter on nested fields. For example, you could filter on instances
-   * that have set the scheduling.automaticRestart field to true. Use filtering on
-   * nested fields to take advantage of labels to organize and search for results
-   * based on label values.
-   *
-   * To filter on multiple expressions, provide each separate expression within
-   * parentheses. For example, (scheduling.automaticRestart eq true) (zone eq us-
-   * central1-f). Multiple expressions are treated as AND expressions, meaning
-   * that resources must match all expressions to pass the filters.
-   * @opt_param string maxResults The maximum number of results per page that
-   * should be returned. If the number of available results is larger than
-   * maxResults, Compute Engine returns a nextPageToken that can be used to get
-   * the next page of results in subsequent list requests. Acceptable values are 0
-   * to 500, inclusive. (Default: 500)
-   * @opt_param string orderBy Sorts list results by a certain order. By default,
-   * results are returned in alphanumerical order based on the resource name.
-   *
-   * You can also sort results in descending order based on the creation timestamp
-   * using orderBy="creationTimestamp desc". This sorts results based on the
-   * creationTimestamp field in reverse chronological order (newest result first).
-   * Use this to sort resources like operations so that the newest operation is
-   * returned first.
-   *
-   * Currently, only sorting by name or creationTimestamp desc is supported.
-   * @opt_param string pageToken Specifies a page token to use. Set pageToken to
-   * the nextPageToken returned by a previous list request to get the next page of
-   * results.
-   * @return Google_Service_Compute_VpnTunnelAggregatedList
-   */
-  public function aggregatedList($project, $optParams = array())
-  {
-    $params = array('project' => $project);
-    $params = array_merge($params, $optParams);
-    return $this->call('aggregatedList', array($params), "Google_Service_Compute_VpnTunnelAggregatedList");
-  }
-  /**
-   * Deletes the specified VpnTunnel resource. (vpnTunnels.delete)
-   *
-   * @param string $project Project ID for this request.
-   * @param string $region Name of the region for this request.
-   * @param string $vpnTunnel Name of the VpnTunnel resource to delete.
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Compute_Operation
-   */
-  public function delete($project, $region, $vpnTunnel, $optParams = array())
-  {
-    $params = array('project' => $project, 'region' => $region, 'vpnTunnel' => $vpnTunnel);
-    $params = array_merge($params, $optParams);
-    return $this->call('delete', array($params), "Google_Service_Compute_Operation");
-  }
-  /**
-   * Returns the specified VpnTunnel resource. Get a list of available VPN tunnels
-   * by making a list() request. (vpnTunnels.get)
-   *
-   * @param string $project Project ID for this request.
-   * @param string $region Name of the region for this request.
-   * @param string $vpnTunnel Name of the VpnTunnel resource to return.
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Compute_VpnTunnel
-   */
-  public function get($project, $region, $vpnTunnel, $optParams = array())
-  {
-    $params = array('project' => $project, 'region' => $region, 'vpnTunnel' => $vpnTunnel);
-    $params = array_merge($params, $optParams);
-    return $this->call('get', array($params), "Google_Service_Compute_VpnTunnel");
-  }
-  /**
-   * Creates a VpnTunnel resource in the specified project and region using the
-   * data included in the request. (vpnTunnels.insert)
-   *
-   * @param string $project Project ID for this request.
-   * @param string $region Name of the region for this request.
-   * @param Google_Service_Compute_VpnTunnel $postBody
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Compute_Operation
-   */
-  public function insert($project, $region, Google_Service_Compute_VpnTunnel $postBody, $optParams = array())
-  {
-    $params = array('project' => $project, 'region' => $region, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('insert', array($params), "Google_Service_Compute_Operation");
-  }
-  /**
-   * Retrieves a list of VpnTunnel resources contained in the specified project
-   * and region. (vpnTunnels.listVpnTunnels)
-   *
-   * @param string $project Project ID for this request.
-   * @param string $region Name of the region for this request.
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param string filter Sets a filter expression for filtering listed
-   * resources, in the form filter={expression}. Your {expression} must be in the
-   * format: field_name comparison_string literal_string.
-   *
-   * The field_name is the name of the field you want to compare. Only atomic
-   * field types are supported (string, number, boolean). The comparison_string
-   * must be either eq (equals) or ne (not equals). The literal_string is the
-   * string value to filter to. The literal value must be valid for the type of
-   * field you are filtering by (string, number, boolean). For string fields, the
-   * literal value is interpreted as a regular expression using RE2 syntax. The
-   * literal value must match the entire field.
-   *
-   * For example, to filter for instances that do not have a name of example-
-   * instance, you would use filter=name ne example-instance.
-   *
-   * You can filter on nested fields. For example, you could filter on instances
-   * that have set the scheduling.automaticRestart field to true. Use filtering on
-   * nested fields to take advantage of labels to organize and search for results
-   * based on label values.
-   *
-   * To filter on multiple expressions, provide each separate expression within
-   * parentheses. For example, (scheduling.automaticRestart eq true) (zone eq us-
-   * central1-f). Multiple expressions are treated as AND expressions, meaning
-   * that resources must match all expressions to pass the filters.
-   * @opt_param string maxResults The maximum number of results per page that
-   * should be returned. If the number of available results is larger than
-   * maxResults, Compute Engine returns a nextPageToken that can be used to get
-   * the next page of results in subsequent list requests. Acceptable values are 0
-   * to 500, inclusive. (Default: 500)
-   * @opt_param string orderBy Sorts list results by a certain order. By default,
-   * results are returned in alphanumerical order based on the resource name.
-   *
-   * You can also sort results in descending order based on the creation timestamp
-   * using orderBy="creationTimestamp desc". This sorts results based on the
-   * creationTimestamp field in reverse chronological order (newest result first).
-   * Use this to sort resources like operations so that the newest operation is
-   * returned first.
-   *
-   * Currently, only sorting by name or creationTimestamp desc is supported.
-   * @opt_param string pageToken Specifies a page token to use. Set pageToken to
-   * the nextPageToken returned by a previous list request to get the next page of
-   * results.
-   * @return Google_Service_Compute_VpnTunnelList
-   */
-  public function listVpnTunnels($project, $region, $optParams = array())
-  {
-    $params = array('project' => $project, 'region' => $region);
-    $params = array_merge($params, $optParams);
-    return $this->call('list', array($params), "Google_Service_Compute_VpnTunnelList");
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/Resource/ZoneOperations.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/Resource/ZoneOperations.php
deleted file mode 100644
index 2c7117ca..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/Resource/ZoneOperations.php
+++ /dev/null
@@ -1,117 +0,0 @@
-
- *   $computeService = new Google_Service_Compute(...);
- *   $zoneOperations = $computeService->zoneOperations;
- *  
- */
-class Google_Service_Compute_Resource_ZoneOperations extends Google_Service_Resource
-{
-  /**
-   * Deletes the specified zone-specific Operations resource.
-   * (zoneOperations.delete)
-   *
-   * @param string $project Project ID for this request.
-   * @param string $zone Name of the zone for this request.
-   * @param string $operation Name of the Operations resource to delete.
-   * @param array $optParams Optional parameters.
-   */
-  public function delete($project, $zone, $operation, $optParams = array())
-  {
-    $params = array('project' => $project, 'zone' => $zone, 'operation' => $operation);
-    $params = array_merge($params, $optParams);
-    return $this->call('delete', array($params));
-  }
-  /**
-   * Retrieves the specified zone-specific Operations resource.
-   * (zoneOperations.get)
-   *
-   * @param string $project Project ID for this request.
-   * @param string $zone Name of the zone for this request.
-   * @param string $operation Name of the Operations resource to return.
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Compute_Operation
-   */
-  public function get($project, $zone, $operation, $optParams = array())
-  {
-    $params = array('project' => $project, 'zone' => $zone, 'operation' => $operation);
-    $params = array_merge($params, $optParams);
-    return $this->call('get', array($params), "Google_Service_Compute_Operation");
-  }
-  /**
-   * Retrieves a list of Operation resources contained within the specified zone.
-   * (zoneOperations.listZoneOperations)
-   *
-   * @param string $project Project ID for this request.
-   * @param string $zone Name of the zone for request.
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param string filter Sets a filter expression for filtering listed
-   * resources, in the form filter={expression}. Your {expression} must be in the
-   * format: field_name comparison_string literal_string.
-   *
-   * The field_name is the name of the field you want to compare. Only atomic
-   * field types are supported (string, number, boolean). The comparison_string
-   * must be either eq (equals) or ne (not equals). The literal_string is the
-   * string value to filter to. The literal value must be valid for the type of
-   * field you are filtering by (string, number, boolean). For string fields, the
-   * literal value is interpreted as a regular expression using RE2 syntax. The
-   * literal value must match the entire field.
-   *
-   * For example, to filter for instances that do not have a name of example-
-   * instance, you would use filter=name ne example-instance.
-   *
-   * You can filter on nested fields. For example, you could filter on instances
-   * that have set the scheduling.automaticRestart field to true. Use filtering on
-   * nested fields to take advantage of labels to organize and search for results
-   * based on label values.
-   *
-   * To filter on multiple expressions, provide each separate expression within
-   * parentheses. For example, (scheduling.automaticRestart eq true) (zone eq us-
-   * central1-f). Multiple expressions are treated as AND expressions, meaning
-   * that resources must match all expressions to pass the filters.
-   * @opt_param string maxResults The maximum number of results per page that
-   * should be returned. If the number of available results is larger than
-   * maxResults, Compute Engine returns a nextPageToken that can be used to get
-   * the next page of results in subsequent list requests. Acceptable values are 0
-   * to 500, inclusive. (Default: 500)
-   * @opt_param string orderBy Sorts list results by a certain order. By default,
-   * results are returned in alphanumerical order based on the resource name.
-   *
-   * You can also sort results in descending order based on the creation timestamp
-   * using orderBy="creationTimestamp desc". This sorts results based on the
-   * creationTimestamp field in reverse chronological order (newest result first).
-   * Use this to sort resources like operations so that the newest operation is
-   * returned first.
-   *
-   * Currently, only sorting by name or creationTimestamp desc is supported.
-   * @opt_param string pageToken Specifies a page token to use. Set pageToken to
-   * the nextPageToken returned by a previous list request to get the next page of
-   * results.
-   * @return Google_Service_Compute_OperationList
-   */
-  public function listZoneOperations($project, $zone, $optParams = array())
-  {
-    $params = array('project' => $project, 'zone' => $zone);
-    $params = array_merge($params, $optParams);
-    return $this->call('list', array($params), "Google_Service_Compute_OperationList");
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/Resource/Zones.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/Resource/Zones.php
deleted file mode 100644
index 7cb7a9ab..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/Resource/Zones.php
+++ /dev/null
@@ -1,100 +0,0 @@
-
- *   $computeService = new Google_Service_Compute(...);
- *   $zones = $computeService->zones;
- *  
- */
-class Google_Service_Compute_Resource_Zones extends Google_Service_Resource
-{
-  /**
-   * Returns the specified Zone resource. Get a list of available zones by making
-   * a list() request. (zones.get)
-   *
-   * @param string $project Project ID for this request.
-   * @param string $zone Name of the zone resource to return.
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Compute_Zone
-   */
-  public function get($project, $zone, $optParams = array())
-  {
-    $params = array('project' => $project, 'zone' => $zone);
-    $params = array_merge($params, $optParams);
-    return $this->call('get', array($params), "Google_Service_Compute_Zone");
-  }
-  /**
-   * Retrieves the list of Zone resources available to the specified project.
-   * (zones.listZones)
-   *
-   * @param string $project Project ID for this request.
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param string filter Sets a filter expression for filtering listed
-   * resources, in the form filter={expression}. Your {expression} must be in the
-   * format: field_name comparison_string literal_string.
-   *
-   * The field_name is the name of the field you want to compare. Only atomic
-   * field types are supported (string, number, boolean). The comparison_string
-   * must be either eq (equals) or ne (not equals). The literal_string is the
-   * string value to filter to. The literal value must be valid for the type of
-   * field you are filtering by (string, number, boolean). For string fields, the
-   * literal value is interpreted as a regular expression using RE2 syntax. The
-   * literal value must match the entire field.
-   *
-   * For example, to filter for instances that do not have a name of example-
-   * instance, you would use filter=name ne example-instance.
-   *
-   * You can filter on nested fields. For example, you could filter on instances
-   * that have set the scheduling.automaticRestart field to true. Use filtering on
-   * nested fields to take advantage of labels to organize and search for results
-   * based on label values.
-   *
-   * To filter on multiple expressions, provide each separate expression within
-   * parentheses. For example, (scheduling.automaticRestart eq true) (zone eq us-
-   * central1-f). Multiple expressions are treated as AND expressions, meaning
-   * that resources must match all expressions to pass the filters.
-   * @opt_param string maxResults The maximum number of results per page that
-   * should be returned. If the number of available results is larger than
-   * maxResults, Compute Engine returns a nextPageToken that can be used to get
-   * the next page of results in subsequent list requests. Acceptable values are 0
-   * to 500, inclusive. (Default: 500)
-   * @opt_param string orderBy Sorts list results by a certain order. By default,
-   * results are returned in alphanumerical order based on the resource name.
-   *
-   * You can also sort results in descending order based on the creation timestamp
-   * using orderBy="creationTimestamp desc". This sorts results based on the
-   * creationTimestamp field in reverse chronological order (newest result first).
-   * Use this to sort resources like operations so that the newest operation is
-   * returned first.
-   *
-   * Currently, only sorting by name or creationTimestamp desc is supported.
-   * @opt_param string pageToken Specifies a page token to use. Set pageToken to
-   * the nextPageToken returned by a previous list request to get the next page of
-   * results.
-   * @return Google_Service_Compute_ZoneList
-   */
-  public function listZones($project, $optParams = array())
-  {
-    $params = array('project' => $project);
-    $params = array_merge($params, $optParams);
-    return $this->call('list', array($params), "Google_Service_Compute_ZoneList");
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/ResourceGroupReference.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/ResourceGroupReference.php
deleted file mode 100644
index aff90a0b..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/ResourceGroupReference.php
+++ /dev/null
@@ -1,30 +0,0 @@
-group = $group;
-  }
-  public function getGroup()
-  {
-    return $this->group;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/Route.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/Route.php
deleted file mode 100644
index 115d95be..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/Route.php
+++ /dev/null
@@ -1,167 +0,0 @@
-creationTimestamp = $creationTimestamp;
-  }
-  public function getCreationTimestamp()
-  {
-    return $this->creationTimestamp;
-  }
-  public function setDescription($description)
-  {
-    $this->description = $description;
-  }
-  public function getDescription()
-  {
-    return $this->description;
-  }
-  public function setDestRange($destRange)
-  {
-    $this->destRange = $destRange;
-  }
-  public function getDestRange()
-  {
-    return $this->destRange;
-  }
-  public function setId($id)
-  {
-    $this->id = $id;
-  }
-  public function getId()
-  {
-    return $this->id;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setName($name)
-  {
-    $this->name = $name;
-  }
-  public function getName()
-  {
-    return $this->name;
-  }
-  public function setNetwork($network)
-  {
-    $this->network = $network;
-  }
-  public function getNetwork()
-  {
-    return $this->network;
-  }
-  public function setNextHopGateway($nextHopGateway)
-  {
-    $this->nextHopGateway = $nextHopGateway;
-  }
-  public function getNextHopGateway()
-  {
-    return $this->nextHopGateway;
-  }
-  public function setNextHopInstance($nextHopInstance)
-  {
-    $this->nextHopInstance = $nextHopInstance;
-  }
-  public function getNextHopInstance()
-  {
-    return $this->nextHopInstance;
-  }
-  public function setNextHopIp($nextHopIp)
-  {
-    $this->nextHopIp = $nextHopIp;
-  }
-  public function getNextHopIp()
-  {
-    return $this->nextHopIp;
-  }
-  public function setNextHopNetwork($nextHopNetwork)
-  {
-    $this->nextHopNetwork = $nextHopNetwork;
-  }
-  public function getNextHopNetwork()
-  {
-    return $this->nextHopNetwork;
-  }
-  public function setNextHopVpnTunnel($nextHopVpnTunnel)
-  {
-    $this->nextHopVpnTunnel = $nextHopVpnTunnel;
-  }
-  public function getNextHopVpnTunnel()
-  {
-    return $this->nextHopVpnTunnel;
-  }
-  public function setPriority($priority)
-  {
-    $this->priority = $priority;
-  }
-  public function getPriority()
-  {
-    return $this->priority;
-  }
-  public function setSelfLink($selfLink)
-  {
-    $this->selfLink = $selfLink;
-  }
-  public function getSelfLink()
-  {
-    return $this->selfLink;
-  }
-  public function setTags($tags)
-  {
-    $this->tags = $tags;
-  }
-  public function getTags()
-  {
-    return $this->tags;
-  }
-  public function setWarnings($warnings)
-  {
-    $this->warnings = $warnings;
-  }
-  public function getWarnings()
-  {
-    return $this->warnings;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/RouteList.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/RouteList.php
deleted file mode 100644
index 8587856c..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/RouteList.php
+++ /dev/null
@@ -1,68 +0,0 @@
-id = $id;
-  }
-  public function getId()
-  {
-    return $this->id;
-  }
-  public function setItems($items)
-  {
-    $this->items = $items;
-  }
-  public function getItems()
-  {
-    return $this->items;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setNextPageToken($nextPageToken)
-  {
-    $this->nextPageToken = $nextPageToken;
-  }
-  public function getNextPageToken()
-  {
-    return $this->nextPageToken;
-  }
-  public function setSelfLink($selfLink)
-  {
-    $this->selfLink = $selfLink;
-  }
-  public function getSelfLink()
-  {
-    return $this->selfLink;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/RouteWarnings.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/RouteWarnings.php
deleted file mode 100644
index d41e2c71..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/RouteWarnings.php
+++ /dev/null
@@ -1,50 +0,0 @@
-code = $code;
-  }
-  public function getCode()
-  {
-    return $this->code;
-  }
-  public function setData($data)
-  {
-    $this->data = $data;
-  }
-  public function getData()
-  {
-    return $this->data;
-  }
-  public function setMessage($message)
-  {
-    $this->message = $message;
-  }
-  public function getMessage()
-  {
-    return $this->message;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/RouteWarningsData.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/RouteWarningsData.php
deleted file mode 100644
index 19826730..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/RouteWarningsData.php
+++ /dev/null
@@ -1,39 +0,0 @@
-key = $key;
-  }
-  public function getKey()
-  {
-    return $this->key;
-  }
-  public function setValue($value)
-  {
-    $this->value = $value;
-  }
-  public function getValue()
-  {
-    return $this->value;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/Router.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/Router.php
deleted file mode 100644
index abcb67d6..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/Router.php
+++ /dev/null
@@ -1,124 +0,0 @@
-bgp = $bgp;
-  }
-  public function getBgp()
-  {
-    return $this->bgp;
-  }
-  public function setBgpPeers($bgpPeers)
-  {
-    $this->bgpPeers = $bgpPeers;
-  }
-  public function getBgpPeers()
-  {
-    return $this->bgpPeers;
-  }
-  public function setCreationTimestamp($creationTimestamp)
-  {
-    $this->creationTimestamp = $creationTimestamp;
-  }
-  public function getCreationTimestamp()
-  {
-    return $this->creationTimestamp;
-  }
-  public function setDescription($description)
-  {
-    $this->description = $description;
-  }
-  public function getDescription()
-  {
-    return $this->description;
-  }
-  public function setId($id)
-  {
-    $this->id = $id;
-  }
-  public function getId()
-  {
-    return $this->id;
-  }
-  public function setInterfaces($interfaces)
-  {
-    $this->interfaces = $interfaces;
-  }
-  public function getInterfaces()
-  {
-    return $this->interfaces;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setName($name)
-  {
-    $this->name = $name;
-  }
-  public function getName()
-  {
-    return $this->name;
-  }
-  public function setNetwork($network)
-  {
-    $this->network = $network;
-  }
-  public function getNetwork()
-  {
-    return $this->network;
-  }
-  public function setRegion($region)
-  {
-    $this->region = $region;
-  }
-  public function getRegion()
-  {
-    return $this->region;
-  }
-  public function setSelfLink($selfLink)
-  {
-    $this->selfLink = $selfLink;
-  }
-  public function getSelfLink()
-  {
-    return $this->selfLink;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/RouterAggregatedList.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/RouterAggregatedList.php
deleted file mode 100644
index fb5d0d93..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/RouterAggregatedList.php
+++ /dev/null
@@ -1,67 +0,0 @@
-id = $id;
-  }
-  public function getId()
-  {
-    return $this->id;
-  }
-  public function setItems($items)
-  {
-    $this->items = $items;
-  }
-  public function getItems()
-  {
-    return $this->items;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setNextPageToken($nextPageToken)
-  {
-    $this->nextPageToken = $nextPageToken;
-  }
-  public function getNextPageToken()
-  {
-    return $this->nextPageToken;
-  }
-  public function setSelfLink($selfLink)
-  {
-    $this->selfLink = $selfLink;
-  }
-  public function getSelfLink()
-  {
-    return $this->selfLink;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/RouterBgp.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/RouterBgp.php
deleted file mode 100644
index c7e25f65..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/RouterBgp.php
+++ /dev/null
@@ -1,30 +0,0 @@
-asn = $asn;
-  }
-  public function getAsn()
-  {
-    return $this->asn;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/RouterBgpPeer.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/RouterBgpPeer.php
deleted file mode 100644
index a65fb824..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/RouterBgpPeer.php
+++ /dev/null
@@ -1,75 +0,0 @@
-advertisedRoutePriority = $advertisedRoutePriority;
-  }
-  public function getAdvertisedRoutePriority()
-  {
-    return $this->advertisedRoutePriority;
-  }
-  public function setInterfaceName($interfaceName)
-  {
-    $this->interfaceName = $interfaceName;
-  }
-  public function getInterfaceName()
-  {
-    return $this->interfaceName;
-  }
-  public function setIpAddress($ipAddress)
-  {
-    $this->ipAddress = $ipAddress;
-  }
-  public function getIpAddress()
-  {
-    return $this->ipAddress;
-  }
-  public function setName($name)
-  {
-    $this->name = $name;
-  }
-  public function getName()
-  {
-    return $this->name;
-  }
-  public function setPeerAsn($peerAsn)
-  {
-    $this->peerAsn = $peerAsn;
-  }
-  public function getPeerAsn()
-  {
-    return $this->peerAsn;
-  }
-  public function setPeerIpAddress($peerIpAddress)
-  {
-    $this->peerIpAddress = $peerIpAddress;
-  }
-  public function getPeerIpAddress()
-  {
-    return $this->peerIpAddress;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/RouterInterface.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/RouterInterface.php
deleted file mode 100644
index af0bc908..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/RouterInterface.php
+++ /dev/null
@@ -1,48 +0,0 @@
-ipRange = $ipRange;
-  }
-  public function getIpRange()
-  {
-    return $this->ipRange;
-  }
-  public function setLinkedVpnTunnel($linkedVpnTunnel)
-  {
-    $this->linkedVpnTunnel = $linkedVpnTunnel;
-  }
-  public function getLinkedVpnTunnel()
-  {
-    return $this->linkedVpnTunnel;
-  }
-  public function setName($name)
-  {
-    $this->name = $name;
-  }
-  public function getName()
-  {
-    return $this->name;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/RouterList.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/RouterList.php
deleted file mode 100644
index 146168d8..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/RouterList.php
+++ /dev/null
@@ -1,68 +0,0 @@
-id = $id;
-  }
-  public function getId()
-  {
-    return $this->id;
-  }
-  public function setItems($items)
-  {
-    $this->items = $items;
-  }
-  public function getItems()
-  {
-    return $this->items;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setNextPageToken($nextPageToken)
-  {
-    $this->nextPageToken = $nextPageToken;
-  }
-  public function getNextPageToken()
-  {
-    return $this->nextPageToken;
-  }
-  public function setSelfLink($selfLink)
-  {
-    $this->selfLink = $selfLink;
-  }
-  public function getSelfLink()
-  {
-    return $this->selfLink;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/RouterStatus.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/RouterStatus.php
deleted file mode 100644
index b737bc96..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/RouterStatus.php
+++ /dev/null
@@ -1,51 +0,0 @@
-bestRoutes = $bestRoutes;
-  }
-  public function getBestRoutes()
-  {
-    return $this->bestRoutes;
-  }
-  public function setBgpPeerStatus($bgpPeerStatus)
-  {
-    $this->bgpPeerStatus = $bgpPeerStatus;
-  }
-  public function getBgpPeerStatus()
-  {
-    return $this->bgpPeerStatus;
-  }
-  public function setNetwork($network)
-  {
-    $this->network = $network;
-  }
-  public function getNetwork()
-  {
-    return $this->network;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/RouterStatusBgpPeerStatus.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/RouterStatusBgpPeerStatus.php
deleted file mode 100644
index bc657b2b..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/RouterStatusBgpPeerStatus.php
+++ /dev/null
@@ -1,113 +0,0 @@
-advertisedRoutes = $advertisedRoutes;
-  }
-  public function getAdvertisedRoutes()
-  {
-    return $this->advertisedRoutes;
-  }
-  public function setIpAddress($ipAddress)
-  {
-    $this->ipAddress = $ipAddress;
-  }
-  public function getIpAddress()
-  {
-    return $this->ipAddress;
-  }
-  public function setLinkedVpnTunnel($linkedVpnTunnel)
-  {
-    $this->linkedVpnTunnel = $linkedVpnTunnel;
-  }
-  public function getLinkedVpnTunnel()
-  {
-    return $this->linkedVpnTunnel;
-  }
-  public function setName($name)
-  {
-    $this->name = $name;
-  }
-  public function getName()
-  {
-    return $this->name;
-  }
-  public function setNumLearnedRoutes($numLearnedRoutes)
-  {
-    $this->numLearnedRoutes = $numLearnedRoutes;
-  }
-  public function getNumLearnedRoutes()
-  {
-    return $this->numLearnedRoutes;
-  }
-  public function setPeerIpAddress($peerIpAddress)
-  {
-    $this->peerIpAddress = $peerIpAddress;
-  }
-  public function getPeerIpAddress()
-  {
-    return $this->peerIpAddress;
-  }
-  public function setState($state)
-  {
-    $this->state = $state;
-  }
-  public function getState()
-  {
-    return $this->state;
-  }
-  public function setStatus($status)
-  {
-    $this->status = $status;
-  }
-  public function getStatus()
-  {
-    return $this->status;
-  }
-  public function setUptime($uptime)
-  {
-    $this->uptime = $uptime;
-  }
-  public function getUptime()
-  {
-    return $this->uptime;
-  }
-  public function setUptimeSeconds($uptimeSeconds)
-  {
-    $this->uptimeSeconds = $uptimeSeconds;
-  }
-  public function getUptimeSeconds()
-  {
-    return $this->uptimeSeconds;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/RouterStatusResponse.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/RouterStatusResponse.php
deleted file mode 100644
index a78812e3..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/RouterStatusResponse.php
+++ /dev/null
@@ -1,40 +0,0 @@
-kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setResult(Google_Service_Compute_RouterStatus $result)
-  {
-    $this->result = $result;
-  }
-  public function getResult()
-  {
-    return $this->result;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/RoutersPreviewResponse.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/RoutersPreviewResponse.php
deleted file mode 100644
index 79372e6d..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/RoutersPreviewResponse.php
+++ /dev/null
@@ -1,31 +0,0 @@
-resource = $resource;
-  }
-  public function getResource()
-  {
-    return $this->resource;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/RoutersScopedList.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/RoutersScopedList.php
deleted file mode 100644
index 7f321f15..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/RoutersScopedList.php
+++ /dev/null
@@ -1,42 +0,0 @@
-routers = $routers;
-  }
-  public function getRouters()
-  {
-    return $this->routers;
-  }
-  public function setWarning(Google_Service_Compute_RoutersScopedListWarning $warning)
-  {
-    $this->warning = $warning;
-  }
-  public function getWarning()
-  {
-    return $this->warning;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/RoutersScopedListWarning.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/RoutersScopedListWarning.php
deleted file mode 100644
index 0aa8c3ce..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/RoutersScopedListWarning.php
+++ /dev/null
@@ -1,50 +0,0 @@
-code = $code;
-  }
-  public function getCode()
-  {
-    return $this->code;
-  }
-  public function setData($data)
-  {
-    $this->data = $data;
-  }
-  public function getData()
-  {
-    return $this->data;
-  }
-  public function setMessage($message)
-  {
-    $this->message = $message;
-  }
-  public function getMessage()
-  {
-    return $this->message;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/RoutersScopedListWarningData.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/RoutersScopedListWarningData.php
deleted file mode 100644
index d4c75d1c..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/RoutersScopedListWarningData.php
+++ /dev/null
@@ -1,39 +0,0 @@
-key = $key;
-  }
-  public function getKey()
-  {
-    return $this->key;
-  }
-  public function setValue($value)
-  {
-    $this->value = $value;
-  }
-  public function getValue()
-  {
-    return $this->value;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/SSLHealthCheck.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/SSLHealthCheck.php
deleted file mode 100644
index 8ba4fdef..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/SSLHealthCheck.php
+++ /dev/null
@@ -1,66 +0,0 @@
-port = $port;
-  }
-  public function getPort()
-  {
-    return $this->port;
-  }
-  public function setPortName($portName)
-  {
-    $this->portName = $portName;
-  }
-  public function getPortName()
-  {
-    return $this->portName;
-  }
-  public function setProxyHeader($proxyHeader)
-  {
-    $this->proxyHeader = $proxyHeader;
-  }
-  public function getProxyHeader()
-  {
-    return $this->proxyHeader;
-  }
-  public function setRequest($request)
-  {
-    $this->request = $request;
-  }
-  public function getRequest()
-  {
-    return $this->request;
-  }
-  public function setResponse($response)
-  {
-    $this->response = $response;
-  }
-  public function getResponse()
-  {
-    return $this->response;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/Scheduling.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/Scheduling.php
deleted file mode 100644
index cebeebb1..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/Scheduling.php
+++ /dev/null
@@ -1,48 +0,0 @@
-automaticRestart = $automaticRestart;
-  }
-  public function getAutomaticRestart()
-  {
-    return $this->automaticRestart;
-  }
-  public function setOnHostMaintenance($onHostMaintenance)
-  {
-    $this->onHostMaintenance = $onHostMaintenance;
-  }
-  public function getOnHostMaintenance()
-  {
-    return $this->onHostMaintenance;
-  }
-  public function setPreemptible($preemptible)
-  {
-    $this->preemptible = $preemptible;
-  }
-  public function getPreemptible()
-  {
-    return $this->preemptible;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/SerialPortOutput.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/SerialPortOutput.php
deleted file mode 100644
index 79a96a7d..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/SerialPortOutput.php
+++ /dev/null
@@ -1,66 +0,0 @@
-contents = $contents;
-  }
-  public function getContents()
-  {
-    return $this->contents;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setNext($next)
-  {
-    $this->next = $next;
-  }
-  public function getNext()
-  {
-    return $this->next;
-  }
-  public function setSelfLink($selfLink)
-  {
-    $this->selfLink = $selfLink;
-  }
-  public function getSelfLink()
-  {
-    return $this->selfLink;
-  }
-  public function setStart($start)
-  {
-    $this->start = $start;
-  }
-  public function getStart()
-  {
-    return $this->start;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/ServiceAccount.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/ServiceAccount.php
deleted file mode 100644
index c3f5df0b..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/ServiceAccount.php
+++ /dev/null
@@ -1,40 +0,0 @@
-email = $email;
-  }
-  public function getEmail()
-  {
-    return $this->email;
-  }
-  public function setScopes($scopes)
-  {
-    $this->scopes = $scopes;
-  }
-  public function getScopes()
-  {
-    return $this->scopes;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/Snapshot.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/Snapshot.php
deleted file mode 100644
index 60616e74..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/Snapshot.php
+++ /dev/null
@@ -1,159 +0,0 @@
-creationTimestamp = $creationTimestamp;
-  }
-  public function getCreationTimestamp()
-  {
-    return $this->creationTimestamp;
-  }
-  public function setDescription($description)
-  {
-    $this->description = $description;
-  }
-  public function getDescription()
-  {
-    return $this->description;
-  }
-  public function setDiskSizeGb($diskSizeGb)
-  {
-    $this->diskSizeGb = $diskSizeGb;
-  }
-  public function getDiskSizeGb()
-  {
-    return $this->diskSizeGb;
-  }
-  public function setId($id)
-  {
-    $this->id = $id;
-  }
-  public function getId()
-  {
-    return $this->id;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setLicenses($licenses)
-  {
-    $this->licenses = $licenses;
-  }
-  public function getLicenses()
-  {
-    return $this->licenses;
-  }
-  public function setName($name)
-  {
-    $this->name = $name;
-  }
-  public function getName()
-  {
-    return $this->name;
-  }
-  public function setSelfLink($selfLink)
-  {
-    $this->selfLink = $selfLink;
-  }
-  public function getSelfLink()
-  {
-    return $this->selfLink;
-  }
-  public function setSnapshotEncryptionKey(Google_Service_Compute_CustomerEncryptionKey $snapshotEncryptionKey)
-  {
-    $this->snapshotEncryptionKey = $snapshotEncryptionKey;
-  }
-  public function getSnapshotEncryptionKey()
-  {
-    return $this->snapshotEncryptionKey;
-  }
-  public function setSourceDisk($sourceDisk)
-  {
-    $this->sourceDisk = $sourceDisk;
-  }
-  public function getSourceDisk()
-  {
-    return $this->sourceDisk;
-  }
-  public function setSourceDiskEncryptionKey(Google_Service_Compute_CustomerEncryptionKey $sourceDiskEncryptionKey)
-  {
-    $this->sourceDiskEncryptionKey = $sourceDiskEncryptionKey;
-  }
-  public function getSourceDiskEncryptionKey()
-  {
-    return $this->sourceDiskEncryptionKey;
-  }
-  public function setSourceDiskId($sourceDiskId)
-  {
-    $this->sourceDiskId = $sourceDiskId;
-  }
-  public function getSourceDiskId()
-  {
-    return $this->sourceDiskId;
-  }
-  public function setStatus($status)
-  {
-    $this->status = $status;
-  }
-  public function getStatus()
-  {
-    return $this->status;
-  }
-  public function setStorageBytes($storageBytes)
-  {
-    $this->storageBytes = $storageBytes;
-  }
-  public function getStorageBytes()
-  {
-    return $this->storageBytes;
-  }
-  public function setStorageBytesStatus($storageBytesStatus)
-  {
-    $this->storageBytesStatus = $storageBytesStatus;
-  }
-  public function getStorageBytesStatus()
-  {
-    return $this->storageBytesStatus;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/SnapshotList.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/SnapshotList.php
deleted file mode 100644
index 0cce5fc9..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/SnapshotList.php
+++ /dev/null
@@ -1,68 +0,0 @@
-id = $id;
-  }
-  public function getId()
-  {
-    return $this->id;
-  }
-  public function setItems($items)
-  {
-    $this->items = $items;
-  }
-  public function getItems()
-  {
-    return $this->items;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setNextPageToken($nextPageToken)
-  {
-    $this->nextPageToken = $nextPageToken;
-  }
-  public function getNextPageToken()
-  {
-    return $this->nextPageToken;
-  }
-  public function setSelfLink($selfLink)
-  {
-    $this->selfLink = $selfLink;
-  }
-  public function getSelfLink()
-  {
-    return $this->selfLink;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/SslCertificate.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/SslCertificate.php
deleted file mode 100644
index e1b3425e..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/SslCertificate.php
+++ /dev/null
@@ -1,93 +0,0 @@
-certificate = $certificate;
-  }
-  public function getCertificate()
-  {
-    return $this->certificate;
-  }
-  public function setCreationTimestamp($creationTimestamp)
-  {
-    $this->creationTimestamp = $creationTimestamp;
-  }
-  public function getCreationTimestamp()
-  {
-    return $this->creationTimestamp;
-  }
-  public function setDescription($description)
-  {
-    $this->description = $description;
-  }
-  public function getDescription()
-  {
-    return $this->description;
-  }
-  public function setId($id)
-  {
-    $this->id = $id;
-  }
-  public function getId()
-  {
-    return $this->id;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setName($name)
-  {
-    $this->name = $name;
-  }
-  public function getName()
-  {
-    return $this->name;
-  }
-  public function setPrivateKey($privateKey)
-  {
-    $this->privateKey = $privateKey;
-  }
-  public function getPrivateKey()
-  {
-    return $this->privateKey;
-  }
-  public function setSelfLink($selfLink)
-  {
-    $this->selfLink = $selfLink;
-  }
-  public function getSelfLink()
-  {
-    return $this->selfLink;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/SslCertificateList.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/SslCertificateList.php
deleted file mode 100644
index 14eeaf12..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/SslCertificateList.php
+++ /dev/null
@@ -1,68 +0,0 @@
-id = $id;
-  }
-  public function getId()
-  {
-    return $this->id;
-  }
-  public function setItems($items)
-  {
-    $this->items = $items;
-  }
-  public function getItems()
-  {
-    return $this->items;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setNextPageToken($nextPageToken)
-  {
-    $this->nextPageToken = $nextPageToken;
-  }
-  public function getNextPageToken()
-  {
-    return $this->nextPageToken;
-  }
-  public function setSelfLink($selfLink)
-  {
-    $this->selfLink = $selfLink;
-  }
-  public function getSelfLink()
-  {
-    return $this->selfLink;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/Subnetwork.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/Subnetwork.php
deleted file mode 100644
index a9253ed4..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/Subnetwork.php
+++ /dev/null
@@ -1,111 +0,0 @@
-creationTimestamp = $creationTimestamp;
-  }
-  public function getCreationTimestamp()
-  {
-    return $this->creationTimestamp;
-  }
-  public function setDescription($description)
-  {
-    $this->description = $description;
-  }
-  public function getDescription()
-  {
-    return $this->description;
-  }
-  public function setGatewayAddress($gatewayAddress)
-  {
-    $this->gatewayAddress = $gatewayAddress;
-  }
-  public function getGatewayAddress()
-  {
-    return $this->gatewayAddress;
-  }
-  public function setId($id)
-  {
-    $this->id = $id;
-  }
-  public function getId()
-  {
-    return $this->id;
-  }
-  public function setIpCidrRange($ipCidrRange)
-  {
-    $this->ipCidrRange = $ipCidrRange;
-  }
-  public function getIpCidrRange()
-  {
-    return $this->ipCidrRange;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setName($name)
-  {
-    $this->name = $name;
-  }
-  public function getName()
-  {
-    return $this->name;
-  }
-  public function setNetwork($network)
-  {
-    $this->network = $network;
-  }
-  public function getNetwork()
-  {
-    return $this->network;
-  }
-  public function setRegion($region)
-  {
-    $this->region = $region;
-  }
-  public function getRegion()
-  {
-    return $this->region;
-  }
-  public function setSelfLink($selfLink)
-  {
-    $this->selfLink = $selfLink;
-  }
-  public function getSelfLink()
-  {
-    return $this->selfLink;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/SubnetworkAggregatedList.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/SubnetworkAggregatedList.php
deleted file mode 100644
index 454b55a5..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/SubnetworkAggregatedList.php
+++ /dev/null
@@ -1,67 +0,0 @@
-id = $id;
-  }
-  public function getId()
-  {
-    return $this->id;
-  }
-  public function setItems($items)
-  {
-    $this->items = $items;
-  }
-  public function getItems()
-  {
-    return $this->items;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setNextPageToken($nextPageToken)
-  {
-    $this->nextPageToken = $nextPageToken;
-  }
-  public function getNextPageToken()
-  {
-    return $this->nextPageToken;
-  }
-  public function setSelfLink($selfLink)
-  {
-    $this->selfLink = $selfLink;
-  }
-  public function getSelfLink()
-  {
-    return $this->selfLink;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/SubnetworkList.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/SubnetworkList.php
deleted file mode 100644
index 5dcb4cfe..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/SubnetworkList.php
+++ /dev/null
@@ -1,68 +0,0 @@
-id = $id;
-  }
-  public function getId()
-  {
-    return $this->id;
-  }
-  public function setItems($items)
-  {
-    $this->items = $items;
-  }
-  public function getItems()
-  {
-    return $this->items;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setNextPageToken($nextPageToken)
-  {
-    $this->nextPageToken = $nextPageToken;
-  }
-  public function getNextPageToken()
-  {
-    return $this->nextPageToken;
-  }
-  public function setSelfLink($selfLink)
-  {
-    $this->selfLink = $selfLink;
-  }
-  public function getSelfLink()
-  {
-    return $this->selfLink;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/SubnetworksExpandIpCidrRangeRequest.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/SubnetworksExpandIpCidrRangeRequest.php
deleted file mode 100644
index d8bf7116..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/SubnetworksExpandIpCidrRangeRequest.php
+++ /dev/null
@@ -1,30 +0,0 @@
-ipCidrRange = $ipCidrRange;
-  }
-  public function getIpCidrRange()
-  {
-    return $this->ipCidrRange;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/SubnetworksScopedList.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/SubnetworksScopedList.php
deleted file mode 100644
index 5ef2e8e6..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/SubnetworksScopedList.php
+++ /dev/null
@@ -1,42 +0,0 @@
-subnetworks = $subnetworks;
-  }
-  public function getSubnetworks()
-  {
-    return $this->subnetworks;
-  }
-  public function setWarning(Google_Service_Compute_SubnetworksScopedListWarning $warning)
-  {
-    $this->warning = $warning;
-  }
-  public function getWarning()
-  {
-    return $this->warning;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/SubnetworksScopedListWarning.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/SubnetworksScopedListWarning.php
deleted file mode 100644
index 298eebb4..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/SubnetworksScopedListWarning.php
+++ /dev/null
@@ -1,50 +0,0 @@
-code = $code;
-  }
-  public function getCode()
-  {
-    return $this->code;
-  }
-  public function setData($data)
-  {
-    $this->data = $data;
-  }
-  public function getData()
-  {
-    return $this->data;
-  }
-  public function setMessage($message)
-  {
-    $this->message = $message;
-  }
-  public function getMessage()
-  {
-    return $this->message;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/SubnetworksScopedListWarningData.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/SubnetworksScopedListWarningData.php
deleted file mode 100644
index f83c966b..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/SubnetworksScopedListWarningData.php
+++ /dev/null
@@ -1,39 +0,0 @@
-key = $key;
-  }
-  public function getKey()
-  {
-    return $this->key;
-  }
-  public function setValue($value)
-  {
-    $this->value = $value;
-  }
-  public function getValue()
-  {
-    return $this->value;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/TCPHealthCheck.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/TCPHealthCheck.php
deleted file mode 100644
index 0584c7ec..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/TCPHealthCheck.php
+++ /dev/null
@@ -1,66 +0,0 @@
-port = $port;
-  }
-  public function getPort()
-  {
-    return $this->port;
-  }
-  public function setPortName($portName)
-  {
-    $this->portName = $portName;
-  }
-  public function getPortName()
-  {
-    return $this->portName;
-  }
-  public function setProxyHeader($proxyHeader)
-  {
-    $this->proxyHeader = $proxyHeader;
-  }
-  public function getProxyHeader()
-  {
-    return $this->proxyHeader;
-  }
-  public function setRequest($request)
-  {
-    $this->request = $request;
-  }
-  public function getRequest()
-  {
-    return $this->request;
-  }
-  public function setResponse($response)
-  {
-    $this->response = $response;
-  }
-  public function getResponse()
-  {
-    return $this->response;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/Tags.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/Tags.php
deleted file mode 100644
index 84321b75..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/Tags.php
+++ /dev/null
@@ -1,40 +0,0 @@
-fingerprint = $fingerprint;
-  }
-  public function getFingerprint()
-  {
-    return $this->fingerprint;
-  }
-  public function setItems($items)
-  {
-    $this->items = $items;
-  }
-  public function getItems()
-  {
-    return $this->items;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/TargetHttpProxy.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/TargetHttpProxy.php
deleted file mode 100644
index afdfe85b..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/TargetHttpProxy.php
+++ /dev/null
@@ -1,84 +0,0 @@
-creationTimestamp = $creationTimestamp;
-  }
-  public function getCreationTimestamp()
-  {
-    return $this->creationTimestamp;
-  }
-  public function setDescription($description)
-  {
-    $this->description = $description;
-  }
-  public function getDescription()
-  {
-    return $this->description;
-  }
-  public function setId($id)
-  {
-    $this->id = $id;
-  }
-  public function getId()
-  {
-    return $this->id;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setName($name)
-  {
-    $this->name = $name;
-  }
-  public function getName()
-  {
-    return $this->name;
-  }
-  public function setSelfLink($selfLink)
-  {
-    $this->selfLink = $selfLink;
-  }
-  public function getSelfLink()
-  {
-    return $this->selfLink;
-  }
-  public function setUrlMap($urlMap)
-  {
-    $this->urlMap = $urlMap;
-  }
-  public function getUrlMap()
-  {
-    return $this->urlMap;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/TargetHttpProxyList.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/TargetHttpProxyList.php
deleted file mode 100644
index d58d9dd3..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/TargetHttpProxyList.php
+++ /dev/null
@@ -1,68 +0,0 @@
-id = $id;
-  }
-  public function getId()
-  {
-    return $this->id;
-  }
-  public function setItems($items)
-  {
-    $this->items = $items;
-  }
-  public function getItems()
-  {
-    return $this->items;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setNextPageToken($nextPageToken)
-  {
-    $this->nextPageToken = $nextPageToken;
-  }
-  public function getNextPageToken()
-  {
-    return $this->nextPageToken;
-  }
-  public function setSelfLink($selfLink)
-  {
-    $this->selfLink = $selfLink;
-  }
-  public function getSelfLink()
-  {
-    return $this->selfLink;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/TargetHttpsProxiesSetSslCertificatesRequest.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/TargetHttpsProxiesSetSslCertificatesRequest.php
deleted file mode 100644
index 73ef2fe9..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/TargetHttpsProxiesSetSslCertificatesRequest.php
+++ /dev/null
@@ -1,31 +0,0 @@
-sslCertificates = $sslCertificates;
-  }
-  public function getSslCertificates()
-  {
-    return $this->sslCertificates;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/TargetHttpsProxy.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/TargetHttpsProxy.php
deleted file mode 100644
index a945b6b4..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/TargetHttpsProxy.php
+++ /dev/null
@@ -1,94 +0,0 @@
-creationTimestamp = $creationTimestamp;
-  }
-  public function getCreationTimestamp()
-  {
-    return $this->creationTimestamp;
-  }
-  public function setDescription($description)
-  {
-    $this->description = $description;
-  }
-  public function getDescription()
-  {
-    return $this->description;
-  }
-  public function setId($id)
-  {
-    $this->id = $id;
-  }
-  public function getId()
-  {
-    return $this->id;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setName($name)
-  {
-    $this->name = $name;
-  }
-  public function getName()
-  {
-    return $this->name;
-  }
-  public function setSelfLink($selfLink)
-  {
-    $this->selfLink = $selfLink;
-  }
-  public function getSelfLink()
-  {
-    return $this->selfLink;
-  }
-  public function setSslCertificates($sslCertificates)
-  {
-    $this->sslCertificates = $sslCertificates;
-  }
-  public function getSslCertificates()
-  {
-    return $this->sslCertificates;
-  }
-  public function setUrlMap($urlMap)
-  {
-    $this->urlMap = $urlMap;
-  }
-  public function getUrlMap()
-  {
-    return $this->urlMap;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/TargetHttpsProxyList.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/TargetHttpsProxyList.php
deleted file mode 100644
index 414156e7..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/TargetHttpsProxyList.php
+++ /dev/null
@@ -1,68 +0,0 @@
-id = $id;
-  }
-  public function getId()
-  {
-    return $this->id;
-  }
-  public function setItems($items)
-  {
-    $this->items = $items;
-  }
-  public function getItems()
-  {
-    return $this->items;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setNextPageToken($nextPageToken)
-  {
-    $this->nextPageToken = $nextPageToken;
-  }
-  public function getNextPageToken()
-  {
-    return $this->nextPageToken;
-  }
-  public function setSelfLink($selfLink)
-  {
-    $this->selfLink = $selfLink;
-  }
-  public function getSelfLink()
-  {
-    return $this->selfLink;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/TargetInstance.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/TargetInstance.php
deleted file mode 100644
index efc5d2b6..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/TargetInstance.php
+++ /dev/null
@@ -1,102 +0,0 @@
-creationTimestamp = $creationTimestamp;
-  }
-  public function getCreationTimestamp()
-  {
-    return $this->creationTimestamp;
-  }
-  public function setDescription($description)
-  {
-    $this->description = $description;
-  }
-  public function getDescription()
-  {
-    return $this->description;
-  }
-  public function setId($id)
-  {
-    $this->id = $id;
-  }
-  public function getId()
-  {
-    return $this->id;
-  }
-  public function setInstance($instance)
-  {
-    $this->instance = $instance;
-  }
-  public function getInstance()
-  {
-    return $this->instance;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setName($name)
-  {
-    $this->name = $name;
-  }
-  public function getName()
-  {
-    return $this->name;
-  }
-  public function setNatPolicy($natPolicy)
-  {
-    $this->natPolicy = $natPolicy;
-  }
-  public function getNatPolicy()
-  {
-    return $this->natPolicy;
-  }
-  public function setSelfLink($selfLink)
-  {
-    $this->selfLink = $selfLink;
-  }
-  public function getSelfLink()
-  {
-    return $this->selfLink;
-  }
-  public function setZone($zone)
-  {
-    $this->zone = $zone;
-  }
-  public function getZone()
-  {
-    return $this->zone;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/TargetInstanceAggregatedList.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/TargetInstanceAggregatedList.php
deleted file mode 100644
index fda5e3c5..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/TargetInstanceAggregatedList.php
+++ /dev/null
@@ -1,67 +0,0 @@
-id = $id;
-  }
-  public function getId()
-  {
-    return $this->id;
-  }
-  public function setItems($items)
-  {
-    $this->items = $items;
-  }
-  public function getItems()
-  {
-    return $this->items;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setNextPageToken($nextPageToken)
-  {
-    $this->nextPageToken = $nextPageToken;
-  }
-  public function getNextPageToken()
-  {
-    return $this->nextPageToken;
-  }
-  public function setSelfLink($selfLink)
-  {
-    $this->selfLink = $selfLink;
-  }
-  public function getSelfLink()
-  {
-    return $this->selfLink;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/TargetInstanceList.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/TargetInstanceList.php
deleted file mode 100644
index 8419c6a5..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/TargetInstanceList.php
+++ /dev/null
@@ -1,68 +0,0 @@
-id = $id;
-  }
-  public function getId()
-  {
-    return $this->id;
-  }
-  public function setItems($items)
-  {
-    $this->items = $items;
-  }
-  public function getItems()
-  {
-    return $this->items;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setNextPageToken($nextPageToken)
-  {
-    $this->nextPageToken = $nextPageToken;
-  }
-  public function getNextPageToken()
-  {
-    return $this->nextPageToken;
-  }
-  public function setSelfLink($selfLink)
-  {
-    $this->selfLink = $selfLink;
-  }
-  public function getSelfLink()
-  {
-    return $this->selfLink;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/TargetInstancesScopedList.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/TargetInstancesScopedList.php
deleted file mode 100644
index fba4e82b..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/TargetInstancesScopedList.php
+++ /dev/null
@@ -1,42 +0,0 @@
-targetInstances = $targetInstances;
-  }
-  public function getTargetInstances()
-  {
-    return $this->targetInstances;
-  }
-  public function setWarning(Google_Service_Compute_TargetInstancesScopedListWarning $warning)
-  {
-    $this->warning = $warning;
-  }
-  public function getWarning()
-  {
-    return $this->warning;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/TargetInstancesScopedListWarning.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/TargetInstancesScopedListWarning.php
deleted file mode 100644
index 15538355..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/TargetInstancesScopedListWarning.php
+++ /dev/null
@@ -1,50 +0,0 @@
-code = $code;
-  }
-  public function getCode()
-  {
-    return $this->code;
-  }
-  public function setData($data)
-  {
-    $this->data = $data;
-  }
-  public function getData()
-  {
-    return $this->data;
-  }
-  public function setMessage($message)
-  {
-    $this->message = $message;
-  }
-  public function getMessage()
-  {
-    return $this->message;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/TargetInstancesScopedListWarningData.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/TargetInstancesScopedListWarningData.php
deleted file mode 100644
index fa2252c7..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/TargetInstancesScopedListWarningData.php
+++ /dev/null
@@ -1,39 +0,0 @@
-key = $key;
-  }
-  public function getKey()
-  {
-    return $this->key;
-  }
-  public function setValue($value)
-  {
-    $this->value = $value;
-  }
-  public function getValue()
-  {
-    return $this->value;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/TargetPool.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/TargetPool.php
deleted file mode 100644
index 1e714d32..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/TargetPool.php
+++ /dev/null
@@ -1,130 +0,0 @@
-backupPool = $backupPool;
-  }
-  public function getBackupPool()
-  {
-    return $this->backupPool;
-  }
-  public function setCreationTimestamp($creationTimestamp)
-  {
-    $this->creationTimestamp = $creationTimestamp;
-  }
-  public function getCreationTimestamp()
-  {
-    return $this->creationTimestamp;
-  }
-  public function setDescription($description)
-  {
-    $this->description = $description;
-  }
-  public function getDescription()
-  {
-    return $this->description;
-  }
-  public function setFailoverRatio($failoverRatio)
-  {
-    $this->failoverRatio = $failoverRatio;
-  }
-  public function getFailoverRatio()
-  {
-    return $this->failoverRatio;
-  }
-  public function setHealthChecks($healthChecks)
-  {
-    $this->healthChecks = $healthChecks;
-  }
-  public function getHealthChecks()
-  {
-    return $this->healthChecks;
-  }
-  public function setId($id)
-  {
-    $this->id = $id;
-  }
-  public function getId()
-  {
-    return $this->id;
-  }
-  public function setInstances($instances)
-  {
-    $this->instances = $instances;
-  }
-  public function getInstances()
-  {
-    return $this->instances;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setName($name)
-  {
-    $this->name = $name;
-  }
-  public function getName()
-  {
-    return $this->name;
-  }
-  public function setRegion($region)
-  {
-    $this->region = $region;
-  }
-  public function getRegion()
-  {
-    return $this->region;
-  }
-  public function setSelfLink($selfLink)
-  {
-    $this->selfLink = $selfLink;
-  }
-  public function getSelfLink()
-  {
-    return $this->selfLink;
-  }
-  public function setSessionAffinity($sessionAffinity)
-  {
-    $this->sessionAffinity = $sessionAffinity;
-  }
-  public function getSessionAffinity()
-  {
-    return $this->sessionAffinity;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/TargetPoolAggregatedList.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/TargetPoolAggregatedList.php
deleted file mode 100644
index d3d8199f..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/TargetPoolAggregatedList.php
+++ /dev/null
@@ -1,67 +0,0 @@
-id = $id;
-  }
-  public function getId()
-  {
-    return $this->id;
-  }
-  public function setItems($items)
-  {
-    $this->items = $items;
-  }
-  public function getItems()
-  {
-    return $this->items;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setNextPageToken($nextPageToken)
-  {
-    $this->nextPageToken = $nextPageToken;
-  }
-  public function getNextPageToken()
-  {
-    return $this->nextPageToken;
-  }
-  public function setSelfLink($selfLink)
-  {
-    $this->selfLink = $selfLink;
-  }
-  public function getSelfLink()
-  {
-    return $this->selfLink;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/TargetPoolInstanceHealth.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/TargetPoolInstanceHealth.php
deleted file mode 100644
index 2c452132..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/TargetPoolInstanceHealth.php
+++ /dev/null
@@ -1,41 +0,0 @@
-healthStatus = $healthStatus;
-  }
-  public function getHealthStatus()
-  {
-    return $this->healthStatus;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/TargetPoolList.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/TargetPoolList.php
deleted file mode 100644
index 9ef1a0bd..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/TargetPoolList.php
+++ /dev/null
@@ -1,68 +0,0 @@
-id = $id;
-  }
-  public function getId()
-  {
-    return $this->id;
-  }
-  public function setItems($items)
-  {
-    $this->items = $items;
-  }
-  public function getItems()
-  {
-    return $this->items;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setNextPageToken($nextPageToken)
-  {
-    $this->nextPageToken = $nextPageToken;
-  }
-  public function getNextPageToken()
-  {
-    return $this->nextPageToken;
-  }
-  public function setSelfLink($selfLink)
-  {
-    $this->selfLink = $selfLink;
-  }
-  public function getSelfLink()
-  {
-    return $this->selfLink;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/TargetPoolsAddHealthCheckRequest.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/TargetPoolsAddHealthCheckRequest.php
deleted file mode 100644
index f4a05e03..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/TargetPoolsAddHealthCheckRequest.php
+++ /dev/null
@@ -1,32 +0,0 @@
-healthChecks = $healthChecks;
-  }
-  public function getHealthChecks()
-  {
-    return $this->healthChecks;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/TargetPoolsAddInstanceRequest.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/TargetPoolsAddInstanceRequest.php
deleted file mode 100644
index 97005f79..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/TargetPoolsAddInstanceRequest.php
+++ /dev/null
@@ -1,32 +0,0 @@
-instances = $instances;
-  }
-  public function getInstances()
-  {
-    return $this->instances;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/TargetPoolsRemoveHealthCheckRequest.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/TargetPoolsRemoveHealthCheckRequest.php
deleted file mode 100644
index 964f8fa1..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/TargetPoolsRemoveHealthCheckRequest.php
+++ /dev/null
@@ -1,32 +0,0 @@
-healthChecks = $healthChecks;
-  }
-  public function getHealthChecks()
-  {
-    return $this->healthChecks;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/TargetPoolsRemoveInstanceRequest.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/TargetPoolsRemoveInstanceRequest.php
deleted file mode 100644
index ab2b5713..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/TargetPoolsRemoveInstanceRequest.php
+++ /dev/null
@@ -1,32 +0,0 @@
-instances = $instances;
-  }
-  public function getInstances()
-  {
-    return $this->instances;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/TargetPoolsScopedList.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/TargetPoolsScopedList.php
deleted file mode 100644
index b444054f..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/TargetPoolsScopedList.php
+++ /dev/null
@@ -1,42 +0,0 @@
-targetPools = $targetPools;
-  }
-  public function getTargetPools()
-  {
-    return $this->targetPools;
-  }
-  public function setWarning(Google_Service_Compute_TargetPoolsScopedListWarning $warning)
-  {
-    $this->warning = $warning;
-  }
-  public function getWarning()
-  {
-    return $this->warning;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/TargetPoolsScopedListWarning.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/TargetPoolsScopedListWarning.php
deleted file mode 100644
index d15ea6eb..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/TargetPoolsScopedListWarning.php
+++ /dev/null
@@ -1,50 +0,0 @@
-code = $code;
-  }
-  public function getCode()
-  {
-    return $this->code;
-  }
-  public function setData($data)
-  {
-    $this->data = $data;
-  }
-  public function getData()
-  {
-    return $this->data;
-  }
-  public function setMessage($message)
-  {
-    $this->message = $message;
-  }
-  public function getMessage()
-  {
-    return $this->message;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/TargetPoolsScopedListWarningData.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/TargetPoolsScopedListWarningData.php
deleted file mode 100644
index 907436bf..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/TargetPoolsScopedListWarningData.php
+++ /dev/null
@@ -1,39 +0,0 @@
-key = $key;
-  }
-  public function getKey()
-  {
-    return $this->key;
-  }
-  public function setValue($value)
-  {
-    $this->value = $value;
-  }
-  public function getValue()
-  {
-    return $this->value;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/TargetReference.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/TargetReference.php
deleted file mode 100644
index d07481b9..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/TargetReference.php
+++ /dev/null
@@ -1,30 +0,0 @@
-target = $target;
-  }
-  public function getTarget()
-  {
-    return $this->target;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/TargetSslProxiesSetBackendServiceRequest.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/TargetSslProxiesSetBackendServiceRequest.php
deleted file mode 100644
index b0e7a3f5..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/TargetSslProxiesSetBackendServiceRequest.php
+++ /dev/null
@@ -1,30 +0,0 @@
-service = $service;
-  }
-  public function getService()
-  {
-    return $this->service;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/TargetSslProxiesSetProxyHeaderRequest.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/TargetSslProxiesSetProxyHeaderRequest.php
deleted file mode 100644
index fd4336d7..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/TargetSslProxiesSetProxyHeaderRequest.php
+++ /dev/null
@@ -1,30 +0,0 @@
-proxyHeader = $proxyHeader;
-  }
-  public function getProxyHeader()
-  {
-    return $this->proxyHeader;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/TargetSslProxiesSetSslCertificatesRequest.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/TargetSslProxiesSetSslCertificatesRequest.php
deleted file mode 100644
index 6bb01ee4..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/TargetSslProxiesSetSslCertificatesRequest.php
+++ /dev/null
@@ -1,31 +0,0 @@
-sslCertificates = $sslCertificates;
-  }
-  public function getSslCertificates()
-  {
-    return $this->sslCertificates;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/TargetSslProxy.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/TargetSslProxy.php
deleted file mode 100644
index f61f8bc7..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/TargetSslProxy.php
+++ /dev/null
@@ -1,103 +0,0 @@
-creationTimestamp = $creationTimestamp;
-  }
-  public function getCreationTimestamp()
-  {
-    return $this->creationTimestamp;
-  }
-  public function setDescription($description)
-  {
-    $this->description = $description;
-  }
-  public function getDescription()
-  {
-    return $this->description;
-  }
-  public function setId($id)
-  {
-    $this->id = $id;
-  }
-  public function getId()
-  {
-    return $this->id;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setName($name)
-  {
-    $this->name = $name;
-  }
-  public function getName()
-  {
-    return $this->name;
-  }
-  public function setProxyHeader($proxyHeader)
-  {
-    $this->proxyHeader = $proxyHeader;
-  }
-  public function getProxyHeader()
-  {
-    return $this->proxyHeader;
-  }
-  public function setSelfLink($selfLink)
-  {
-    $this->selfLink = $selfLink;
-  }
-  public function getSelfLink()
-  {
-    return $this->selfLink;
-  }
-  public function setService($service)
-  {
-    $this->service = $service;
-  }
-  public function getService()
-  {
-    return $this->service;
-  }
-  public function setSslCertificates($sslCertificates)
-  {
-    $this->sslCertificates = $sslCertificates;
-  }
-  public function getSslCertificates()
-  {
-    return $this->sslCertificates;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/TargetSslProxyList.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/TargetSslProxyList.php
deleted file mode 100644
index 1cbd310d..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/TargetSslProxyList.php
+++ /dev/null
@@ -1,68 +0,0 @@
-id = $id;
-  }
-  public function getId()
-  {
-    return $this->id;
-  }
-  public function setItems($items)
-  {
-    $this->items = $items;
-  }
-  public function getItems()
-  {
-    return $this->items;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setNextPageToken($nextPageToken)
-  {
-    $this->nextPageToken = $nextPageToken;
-  }
-  public function getNextPageToken()
-  {
-    return $this->nextPageToken;
-  }
-  public function setSelfLink($selfLink)
-  {
-    $this->selfLink = $selfLink;
-  }
-  public function getSelfLink()
-  {
-    return $this->selfLink;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/TargetVpnGateway.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/TargetVpnGateway.php
deleted file mode 100644
index 08a13f7f..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/TargetVpnGateway.php
+++ /dev/null
@@ -1,121 +0,0 @@
-creationTimestamp = $creationTimestamp;
-  }
-  public function getCreationTimestamp()
-  {
-    return $this->creationTimestamp;
-  }
-  public function setDescription($description)
-  {
-    $this->description = $description;
-  }
-  public function getDescription()
-  {
-    return $this->description;
-  }
-  public function setForwardingRules($forwardingRules)
-  {
-    $this->forwardingRules = $forwardingRules;
-  }
-  public function getForwardingRules()
-  {
-    return $this->forwardingRules;
-  }
-  public function setId($id)
-  {
-    $this->id = $id;
-  }
-  public function getId()
-  {
-    return $this->id;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setName($name)
-  {
-    $this->name = $name;
-  }
-  public function getName()
-  {
-    return $this->name;
-  }
-  public function setNetwork($network)
-  {
-    $this->network = $network;
-  }
-  public function getNetwork()
-  {
-    return $this->network;
-  }
-  public function setRegion($region)
-  {
-    $this->region = $region;
-  }
-  public function getRegion()
-  {
-    return $this->region;
-  }
-  public function setSelfLink($selfLink)
-  {
-    $this->selfLink = $selfLink;
-  }
-  public function getSelfLink()
-  {
-    return $this->selfLink;
-  }
-  public function setStatus($status)
-  {
-    $this->status = $status;
-  }
-  public function getStatus()
-  {
-    return $this->status;
-  }
-  public function setTunnels($tunnels)
-  {
-    $this->tunnels = $tunnels;
-  }
-  public function getTunnels()
-  {
-    return $this->tunnels;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/TargetVpnGatewayAggregatedList.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/TargetVpnGatewayAggregatedList.php
deleted file mode 100644
index e85fc8b5..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/TargetVpnGatewayAggregatedList.php
+++ /dev/null
@@ -1,67 +0,0 @@
-id = $id;
-  }
-  public function getId()
-  {
-    return $this->id;
-  }
-  public function setItems($items)
-  {
-    $this->items = $items;
-  }
-  public function getItems()
-  {
-    return $this->items;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setNextPageToken($nextPageToken)
-  {
-    $this->nextPageToken = $nextPageToken;
-  }
-  public function getNextPageToken()
-  {
-    return $this->nextPageToken;
-  }
-  public function setSelfLink($selfLink)
-  {
-    $this->selfLink = $selfLink;
-  }
-  public function getSelfLink()
-  {
-    return $this->selfLink;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/TargetVpnGatewayList.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/TargetVpnGatewayList.php
deleted file mode 100644
index d81e2c1b..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/TargetVpnGatewayList.php
+++ /dev/null
@@ -1,68 +0,0 @@
-id = $id;
-  }
-  public function getId()
-  {
-    return $this->id;
-  }
-  public function setItems($items)
-  {
-    $this->items = $items;
-  }
-  public function getItems()
-  {
-    return $this->items;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setNextPageToken($nextPageToken)
-  {
-    $this->nextPageToken = $nextPageToken;
-  }
-  public function getNextPageToken()
-  {
-    return $this->nextPageToken;
-  }
-  public function setSelfLink($selfLink)
-  {
-    $this->selfLink = $selfLink;
-  }
-  public function getSelfLink()
-  {
-    return $this->selfLink;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/TargetVpnGatewaysScopedList.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/TargetVpnGatewaysScopedList.php
deleted file mode 100644
index b09c456d..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/TargetVpnGatewaysScopedList.php
+++ /dev/null
@@ -1,42 +0,0 @@
-targetVpnGateways = $targetVpnGateways;
-  }
-  public function getTargetVpnGateways()
-  {
-    return $this->targetVpnGateways;
-  }
-  public function setWarning(Google_Service_Compute_TargetVpnGatewaysScopedListWarning $warning)
-  {
-    $this->warning = $warning;
-  }
-  public function getWarning()
-  {
-    return $this->warning;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/TargetVpnGatewaysScopedListWarning.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/TargetVpnGatewaysScopedListWarning.php
deleted file mode 100644
index 048886fa..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/TargetVpnGatewaysScopedListWarning.php
+++ /dev/null
@@ -1,50 +0,0 @@
-code = $code;
-  }
-  public function getCode()
-  {
-    return $this->code;
-  }
-  public function setData($data)
-  {
-    $this->data = $data;
-  }
-  public function getData()
-  {
-    return $this->data;
-  }
-  public function setMessage($message)
-  {
-    $this->message = $message;
-  }
-  public function getMessage()
-  {
-    return $this->message;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/TargetVpnGatewaysScopedListWarningData.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/TargetVpnGatewaysScopedListWarningData.php
deleted file mode 100644
index fc7b4d7e..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/TargetVpnGatewaysScopedListWarningData.php
+++ /dev/null
@@ -1,39 +0,0 @@
-key = $key;
-  }
-  public function getKey()
-  {
-    return $this->key;
-  }
-  public function setValue($value)
-  {
-    $this->value = $value;
-  }
-  public function getValue()
-  {
-    return $this->value;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/TestFailure.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/TestFailure.php
deleted file mode 100644
index 266d2b63..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/TestFailure.php
+++ /dev/null
@@ -1,57 +0,0 @@
-actualService = $actualService;
-  }
-  public function getActualService()
-  {
-    return $this->actualService;
-  }
-  public function setExpectedService($expectedService)
-  {
-    $this->expectedService = $expectedService;
-  }
-  public function getExpectedService()
-  {
-    return $this->expectedService;
-  }
-  public function setHost($host)
-  {
-    $this->host = $host;
-  }
-  public function getHost()
-  {
-    return $this->host;
-  }
-  public function setPath($path)
-  {
-    $this->path = $path;
-  }
-  public function getPath()
-  {
-    return $this->path;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/UrlMap.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/UrlMap.php
deleted file mode 100644
index 9ab743ba..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/UrlMap.php
+++ /dev/null
@@ -1,124 +0,0 @@
-creationTimestamp = $creationTimestamp;
-  }
-  public function getCreationTimestamp()
-  {
-    return $this->creationTimestamp;
-  }
-  public function setDefaultService($defaultService)
-  {
-    $this->defaultService = $defaultService;
-  }
-  public function getDefaultService()
-  {
-    return $this->defaultService;
-  }
-  public function setDescription($description)
-  {
-    $this->description = $description;
-  }
-  public function getDescription()
-  {
-    return $this->description;
-  }
-  public function setFingerprint($fingerprint)
-  {
-    $this->fingerprint = $fingerprint;
-  }
-  public function getFingerprint()
-  {
-    return $this->fingerprint;
-  }
-  public function setHostRules($hostRules)
-  {
-    $this->hostRules = $hostRules;
-  }
-  public function getHostRules()
-  {
-    return $this->hostRules;
-  }
-  public function setId($id)
-  {
-    $this->id = $id;
-  }
-  public function getId()
-  {
-    return $this->id;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setName($name)
-  {
-    $this->name = $name;
-  }
-  public function getName()
-  {
-    return $this->name;
-  }
-  public function setPathMatchers($pathMatchers)
-  {
-    $this->pathMatchers = $pathMatchers;
-  }
-  public function getPathMatchers()
-  {
-    return $this->pathMatchers;
-  }
-  public function setSelfLink($selfLink)
-  {
-    $this->selfLink = $selfLink;
-  }
-  public function getSelfLink()
-  {
-    return $this->selfLink;
-  }
-  public function setTests($tests)
-  {
-    $this->tests = $tests;
-  }
-  public function getTests()
-  {
-    return $this->tests;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/UrlMapList.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/UrlMapList.php
deleted file mode 100644
index c3e90e18..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/UrlMapList.php
+++ /dev/null
@@ -1,68 +0,0 @@
-id = $id;
-  }
-  public function getId()
-  {
-    return $this->id;
-  }
-  public function setItems($items)
-  {
-    $this->items = $items;
-  }
-  public function getItems()
-  {
-    return $this->items;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setNextPageToken($nextPageToken)
-  {
-    $this->nextPageToken = $nextPageToken;
-  }
-  public function getNextPageToken()
-  {
-    return $this->nextPageToken;
-  }
-  public function setSelfLink($selfLink)
-  {
-    $this->selfLink = $selfLink;
-  }
-  public function getSelfLink()
-  {
-    return $this->selfLink;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/UrlMapReference.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/UrlMapReference.php
deleted file mode 100644
index 99f5e30a..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/UrlMapReference.php
+++ /dev/null
@@ -1,30 +0,0 @@
-urlMap = $urlMap;
-  }
-  public function getUrlMap()
-  {
-    return $this->urlMap;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/UrlMapTest.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/UrlMapTest.php
deleted file mode 100644
index 2d2479e8..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/UrlMapTest.php
+++ /dev/null
@@ -1,57 +0,0 @@
-description = $description;
-  }
-  public function getDescription()
-  {
-    return $this->description;
-  }
-  public function setHost($host)
-  {
-    $this->host = $host;
-  }
-  public function getHost()
-  {
-    return $this->host;
-  }
-  public function setPath($path)
-  {
-    $this->path = $path;
-  }
-  public function getPath()
-  {
-    return $this->path;
-  }
-  public function setService($service)
-  {
-    $this->service = $service;
-  }
-  public function getService()
-  {
-    return $this->service;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/UrlMapValidationResult.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/UrlMapValidationResult.php
deleted file mode 100644
index 6a0b5d34..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/UrlMapValidationResult.php
+++ /dev/null
@@ -1,59 +0,0 @@
-loadErrors = $loadErrors;
-  }
-  public function getLoadErrors()
-  {
-    return $this->loadErrors;
-  }
-  public function setLoadSucceeded($loadSucceeded)
-  {
-    $this->loadSucceeded = $loadSucceeded;
-  }
-  public function getLoadSucceeded()
-  {
-    return $this->loadSucceeded;
-  }
-  public function setTestFailures($testFailures)
-  {
-    $this->testFailures = $testFailures;
-  }
-  public function getTestFailures()
-  {
-    return $this->testFailures;
-  }
-  public function setTestPassed($testPassed)
-  {
-    $this->testPassed = $testPassed;
-  }
-  public function getTestPassed()
-  {
-    return $this->testPassed;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/UrlMapsValidateRequest.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/UrlMapsValidateRequest.php
deleted file mode 100644
index 5e9b6084..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/UrlMapsValidateRequest.php
+++ /dev/null
@@ -1,31 +0,0 @@
-resource = $resource;
-  }
-  public function getResource()
-  {
-    return $this->resource;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/UrlMapsValidateResponse.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/UrlMapsValidateResponse.php
deleted file mode 100644
index 8da23749..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/UrlMapsValidateResponse.php
+++ /dev/null
@@ -1,31 +0,0 @@
-result = $result;
-  }
-  public function getResult()
-  {
-    return $this->result;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/UsageExportLocation.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/UsageExportLocation.php
deleted file mode 100644
index 13c7d580..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/UsageExportLocation.php
+++ /dev/null
@@ -1,39 +0,0 @@
-bucketName = $bucketName;
-  }
-  public function getBucketName()
-  {
-    return $this->bucketName;
-  }
-  public function setReportNamePrefix($reportNamePrefix)
-  {
-    $this->reportNamePrefix = $reportNamePrefix;
-  }
-  public function getReportNamePrefix()
-  {
-    return $this->reportNamePrefix;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/VpnTunnel.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/VpnTunnel.php
deleted file mode 100644
index 6ac775bf..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/VpnTunnel.php
+++ /dev/null
@@ -1,175 +0,0 @@
-creationTimestamp = $creationTimestamp;
-  }
-  public function getCreationTimestamp()
-  {
-    return $this->creationTimestamp;
-  }
-  public function setDescription($description)
-  {
-    $this->description = $description;
-  }
-  public function getDescription()
-  {
-    return $this->description;
-  }
-  public function setDetailedStatus($detailedStatus)
-  {
-    $this->detailedStatus = $detailedStatus;
-  }
-  public function getDetailedStatus()
-  {
-    return $this->detailedStatus;
-  }
-  public function setId($id)
-  {
-    $this->id = $id;
-  }
-  public function getId()
-  {
-    return $this->id;
-  }
-  public function setIkeVersion($ikeVersion)
-  {
-    $this->ikeVersion = $ikeVersion;
-  }
-  public function getIkeVersion()
-  {
-    return $this->ikeVersion;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setLocalTrafficSelector($localTrafficSelector)
-  {
-    $this->localTrafficSelector = $localTrafficSelector;
-  }
-  public function getLocalTrafficSelector()
-  {
-    return $this->localTrafficSelector;
-  }
-  public function setName($name)
-  {
-    $this->name = $name;
-  }
-  public function getName()
-  {
-    return $this->name;
-  }
-  public function setPeerIp($peerIp)
-  {
-    $this->peerIp = $peerIp;
-  }
-  public function getPeerIp()
-  {
-    return $this->peerIp;
-  }
-  public function setRegion($region)
-  {
-    $this->region = $region;
-  }
-  public function getRegion()
-  {
-    return $this->region;
-  }
-  public function setRemoteTrafficSelector($remoteTrafficSelector)
-  {
-    $this->remoteTrafficSelector = $remoteTrafficSelector;
-  }
-  public function getRemoteTrafficSelector()
-  {
-    return $this->remoteTrafficSelector;
-  }
-  public function setRouter($router)
-  {
-    $this->router = $router;
-  }
-  public function getRouter()
-  {
-    return $this->router;
-  }
-  public function setSelfLink($selfLink)
-  {
-    $this->selfLink = $selfLink;
-  }
-  public function getSelfLink()
-  {
-    return $this->selfLink;
-  }
-  public function setSharedSecret($sharedSecret)
-  {
-    $this->sharedSecret = $sharedSecret;
-  }
-  public function getSharedSecret()
-  {
-    return $this->sharedSecret;
-  }
-  public function setSharedSecretHash($sharedSecretHash)
-  {
-    $this->sharedSecretHash = $sharedSecretHash;
-  }
-  public function getSharedSecretHash()
-  {
-    return $this->sharedSecretHash;
-  }
-  public function setStatus($status)
-  {
-    $this->status = $status;
-  }
-  public function getStatus()
-  {
-    return $this->status;
-  }
-  public function setTargetVpnGateway($targetVpnGateway)
-  {
-    $this->targetVpnGateway = $targetVpnGateway;
-  }
-  public function getTargetVpnGateway()
-  {
-    return $this->targetVpnGateway;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/VpnTunnelAggregatedList.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/VpnTunnelAggregatedList.php
deleted file mode 100644
index 999c68e2..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/VpnTunnelAggregatedList.php
+++ /dev/null
@@ -1,67 +0,0 @@
-id = $id;
-  }
-  public function getId()
-  {
-    return $this->id;
-  }
-  public function setItems($items)
-  {
-    $this->items = $items;
-  }
-  public function getItems()
-  {
-    return $this->items;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setNextPageToken($nextPageToken)
-  {
-    $this->nextPageToken = $nextPageToken;
-  }
-  public function getNextPageToken()
-  {
-    return $this->nextPageToken;
-  }
-  public function setSelfLink($selfLink)
-  {
-    $this->selfLink = $selfLink;
-  }
-  public function getSelfLink()
-  {
-    return $this->selfLink;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/VpnTunnelList.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/VpnTunnelList.php
deleted file mode 100644
index ce35247f..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/VpnTunnelList.php
+++ /dev/null
@@ -1,68 +0,0 @@
-id = $id;
-  }
-  public function getId()
-  {
-    return $this->id;
-  }
-  public function setItems($items)
-  {
-    $this->items = $items;
-  }
-  public function getItems()
-  {
-    return $this->items;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setNextPageToken($nextPageToken)
-  {
-    $this->nextPageToken = $nextPageToken;
-  }
-  public function getNextPageToken()
-  {
-    return $this->nextPageToken;
-  }
-  public function setSelfLink($selfLink)
-  {
-    $this->selfLink = $selfLink;
-  }
-  public function getSelfLink()
-  {
-    return $this->selfLink;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/VpnTunnelsScopedList.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/VpnTunnelsScopedList.php
deleted file mode 100644
index 2f961f7a..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/VpnTunnelsScopedList.php
+++ /dev/null
@@ -1,42 +0,0 @@
-vpnTunnels = $vpnTunnels;
-  }
-  public function getVpnTunnels()
-  {
-    return $this->vpnTunnels;
-  }
-  public function setWarning(Google_Service_Compute_VpnTunnelsScopedListWarning $warning)
-  {
-    $this->warning = $warning;
-  }
-  public function getWarning()
-  {
-    return $this->warning;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/VpnTunnelsScopedListWarning.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/VpnTunnelsScopedListWarning.php
deleted file mode 100644
index aaae80a6..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/VpnTunnelsScopedListWarning.php
+++ /dev/null
@@ -1,50 +0,0 @@
-code = $code;
-  }
-  public function getCode()
-  {
-    return $this->code;
-  }
-  public function setData($data)
-  {
-    $this->data = $data;
-  }
-  public function getData()
-  {
-    return $this->data;
-  }
-  public function setMessage($message)
-  {
-    $this->message = $message;
-  }
-  public function getMessage()
-  {
-    return $this->message;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/VpnTunnelsScopedListWarningData.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/VpnTunnelsScopedListWarningData.php
deleted file mode 100644
index bee2d992..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/VpnTunnelsScopedListWarningData.php
+++ /dev/null
@@ -1,39 +0,0 @@
-key = $key;
-  }
-  public function getKey()
-  {
-    return $this->key;
-  }
-  public function setValue($value)
-  {
-    $this->value = $value;
-  }
-  public function getValue()
-  {
-    return $this->value;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/Zone.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/Zone.php
deleted file mode 100644
index 744e13ad..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/Zone.php
+++ /dev/null
@@ -1,103 +0,0 @@
-creationTimestamp = $creationTimestamp;
-  }
-  public function getCreationTimestamp()
-  {
-    return $this->creationTimestamp;
-  }
-  public function setDeprecated(Google_Service_Compute_DeprecationStatus $deprecated)
-  {
-    $this->deprecated = $deprecated;
-  }
-  public function getDeprecated()
-  {
-    return $this->deprecated;
-  }
-  public function setDescription($description)
-  {
-    $this->description = $description;
-  }
-  public function getDescription()
-  {
-    return $this->description;
-  }
-  public function setId($id)
-  {
-    $this->id = $id;
-  }
-  public function getId()
-  {
-    return $this->id;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setName($name)
-  {
-    $this->name = $name;
-  }
-  public function getName()
-  {
-    return $this->name;
-  }
-  public function setRegion($region)
-  {
-    $this->region = $region;
-  }
-  public function getRegion()
-  {
-    return $this->region;
-  }
-  public function setSelfLink($selfLink)
-  {
-    $this->selfLink = $selfLink;
-  }
-  public function getSelfLink()
-  {
-    return $this->selfLink;
-  }
-  public function setStatus($status)
-  {
-    $this->status = $status;
-  }
-  public function getStatus()
-  {
-    return $this->status;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/ZoneList.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/ZoneList.php
deleted file mode 100644
index 0cc44199..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Compute/ZoneList.php
+++ /dev/null
@@ -1,68 +0,0 @@
-id = $id;
-  }
-  public function getId()
-  {
-    return $this->id;
-  }
-  public function setItems($items)
-  {
-    $this->items = $items;
-  }
-  public function getItems()
-  {
-    return $this->items;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setNextPageToken($nextPageToken)
-  {
-    $this->nextPageToken = $nextPageToken;
-  }
-  public function getNextPageToken()
-  {
-    return $this->nextPageToken;
-  }
-  public function setSelfLink($selfLink)
-  {
-    $this->selfLink = $selfLink;
-  }
-  public function getSelfLink()
-  {
-    return $this->selfLink;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ConsumerSurveys.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ConsumerSurveys.php
deleted file mode 100644
index bcf53834..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ConsumerSurveys.php
+++ /dev/null
@@ -1,210 +0,0 @@
-
- * Creates and conducts surveys, lists the surveys that an authenticated user
- * owns, and retrieves survey results and information about specified surveys.

- *
- * 

- * For more information about this service, see the API
- * Documentation
- * 

- *
- * @author Google, Inc.
- */
-class Google_Service_ConsumerSurveys extends Google_Service
-{
-  /** View and edit your surveys and results. */
-  const CONSUMERSURVEYS =
-      "https://www.googleapis.com/auth/consumersurveys";
-  /** View the results for your surveys. */
-  const CONSUMERSURVEYS_READONLY =
-      "https://www.googleapis.com/auth/consumersurveys.readonly";
-  /** View your email address. */
-  const USERINFO_EMAIL =
-      "https://www.googleapis.com/auth/userinfo.email";
-
-  public $mobileapppanels;
-  public $results;
-  public $surveys;
-  
-  /**
-   * Constructs the internal representation of the ConsumerSurveys service.
-   *
-   * @param Google_Client $client
-   */
-  public function __construct(Google_Client $client)
-  {
-    parent::__construct($client);
-    $this->rootUrl = 'https://www.googleapis.com/';
-    $this->servicePath = 'consumersurveys/v2/';
-    $this->version = 'v2';
-    $this->serviceName = 'consumersurveys';
-
-    $this->mobileapppanels = new Google_Service_ConsumerSurveys_Resource_Mobileapppanels(
-        $this,
-        $this->serviceName,
-        'mobileapppanels',
-        array(
-          'methods' => array(
-            'get' => array(
-              'path' => 'mobileAppPanels/{panelId}',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'panelId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'list' => array(
-              'path' => 'mobileAppPanels',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'maxResults' => array(
-                  'location' => 'query',
-                  'type' => 'integer',
-                ),
-                'startIndex' => array(
-                  'location' => 'query',
-                  'type' => 'integer',
-                ),
-                'token' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-              ),
-            ),'update' => array(
-              'path' => 'mobileAppPanels/{panelId}',
-              'httpMethod' => 'PUT',
-              'parameters' => array(
-                'panelId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),
-          )
-        )
-    );
-    $this->results = new Google_Service_ConsumerSurveys_Resource_Results(
-        $this,
-        $this->serviceName,
-        'results',
-        array(
-          'methods' => array(
-            'get' => array(
-              'path' => 'surveys/{surveyUrlId}/results',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'surveyUrlId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),
-          )
-        )
-    );
-    $this->surveys = new Google_Service_ConsumerSurveys_Resource_Surveys(
-        $this,
-        $this->serviceName,
-        'surveys',
-        array(
-          'methods' => array(
-            'delete' => array(
-              'path' => 'surveys/{surveyUrlId}',
-              'httpMethod' => 'DELETE',
-              'parameters' => array(
-                'surveyUrlId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'get' => array(
-              'path' => 'surveys/{surveyUrlId}',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'surveyUrlId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'insert' => array(
-              'path' => 'surveys',
-              'httpMethod' => 'POST',
-              'parameters' => array(),
-            ),'list' => array(
-              'path' => 'surveys',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'maxResults' => array(
-                  'location' => 'query',
-                  'type' => 'integer',
-                ),
-                'startIndex' => array(
-                  'location' => 'query',
-                  'type' => 'integer',
-                ),
-                'token' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-              ),
-            ),'start' => array(
-              'path' => 'surveys/{resourceId}/start',
-              'httpMethod' => 'POST',
-              'parameters' => array(
-                'resourceId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'stop' => array(
-              'path' => 'surveys/{resourceId}/stop',
-              'httpMethod' => 'POST',
-              'parameters' => array(
-                'resourceId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'update' => array(
-              'path' => 'surveys/{surveyUrlId}',
-              'httpMethod' => 'PUT',
-              'parameters' => array(
-                'surveyUrlId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),
-          )
-        )
-    );
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ConsumerSurveys/FieldMask.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ConsumerSurveys/FieldMask.php
deleted file mode 100644
index bad9f171..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ConsumerSurveys/FieldMask.php
+++ /dev/null
@@ -1,41 +0,0 @@
-fields = $fields;
-  }
-  public function getFields()
-  {
-    return $this->fields;
-  }
-  public function setId($id)
-  {
-    $this->id = $id;
-  }
-  public function getId()
-  {
-    return $this->id;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ConsumerSurveys/MobileAppPanel.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ConsumerSurveys/MobileAppPanel.php
deleted file mode 100644
index 5e99b768..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ConsumerSurveys/MobileAppPanel.php
+++ /dev/null
@@ -1,76 +0,0 @@
-country = $country;
-  }
-  public function getCountry()
-  {
-    return $this->country;
-  }
-  public function setIsPublicPanel($isPublicPanel)
-  {
-    $this->isPublicPanel = $isPublicPanel;
-  }
-  public function getIsPublicPanel()
-  {
-    return $this->isPublicPanel;
-  }
-  public function setLanguage($language)
-  {
-    $this->language = $language;
-  }
-  public function getLanguage()
-  {
-    return $this->language;
-  }
-  public function setMobileAppPanelId($mobileAppPanelId)
-  {
-    $this->mobileAppPanelId = $mobileAppPanelId;
-  }
-  public function getMobileAppPanelId()
-  {
-    return $this->mobileAppPanelId;
-  }
-  public function setName($name)
-  {
-    $this->name = $name;
-  }
-  public function getName()
-  {
-    return $this->name;
-  }
-  public function setOwners($owners)
-  {
-    $this->owners = $owners;
-  }
-  public function getOwners()
-  {
-    return $this->owners;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ConsumerSurveys/MobileAppPanelsListResponse.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ConsumerSurveys/MobileAppPanelsListResponse.php
deleted file mode 100644
index 3bbb595e..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ConsumerSurveys/MobileAppPanelsListResponse.php
+++ /dev/null
@@ -1,61 +0,0 @@
-pageInfo = $pageInfo;
-  }
-  public function getPageInfo()
-  {
-    return $this->pageInfo;
-  }
-  public function setRequestId($requestId)
-  {
-    $this->requestId = $requestId;
-  }
-  public function getRequestId()
-  {
-    return $this->requestId;
-  }
-  public function setResources($resources)
-  {
-    $this->resources = $resources;
-  }
-  public function getResources()
-  {
-    return $this->resources;
-  }
-  public function setTokenPagination(Google_Service_ConsumerSurveys_TokenPagination $tokenPagination)
-  {
-    $this->tokenPagination = $tokenPagination;
-  }
-  public function getTokenPagination()
-  {
-    return $this->tokenPagination;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ConsumerSurveys/PageInfo.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ConsumerSurveys/PageInfo.php
deleted file mode 100644
index 1e3c526a..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ConsumerSurveys/PageInfo.php
+++ /dev/null
@@ -1,48 +0,0 @@
-resultPerPage = $resultPerPage;
-  }
-  public function getResultPerPage()
-  {
-    return $this->resultPerPage;
-  }
-  public function setStartIndex($startIndex)
-  {
-    $this->startIndex = $startIndex;
-  }
-  public function getStartIndex()
-  {
-    return $this->startIndex;
-  }
-  public function setTotalResults($totalResults)
-  {
-    $this->totalResults = $totalResults;
-  }
-  public function getTotalResults()
-  {
-    return $this->totalResults;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ConsumerSurveys/Resource/Mobileapppanels.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ConsumerSurveys/Resource/Mobileapppanels.php
deleted file mode 100644
index bc6e07f8..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ConsumerSurveys/Resource/Mobileapppanels.php
+++ /dev/null
@@ -1,74 +0,0 @@
-
- *   $consumersurveysService = new Google_Service_ConsumerSurveys(...);
- *   $mobileapppanels = $consumersurveysService->mobileapppanels;
- *  
- */
-class Google_Service_ConsumerSurveys_Resource_Mobileapppanels extends Google_Service_Resource
-{
-  /**
-   * Retrieves a MobileAppPanel that is available to the authenticated user.
-   * (mobileapppanels.get)
-   *
-   * @param string $panelId External URL ID for the panel.
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_ConsumerSurveys_MobileAppPanel
-   */
-  public function get($panelId, $optParams = array())
-  {
-    $params = array('panelId' => $panelId);
-    $params = array_merge($params, $optParams);
-    return $this->call('get', array($params), "Google_Service_ConsumerSurveys_MobileAppPanel");
-  }
-  /**
-   * Lists the MobileAppPanels available to the authenticated user.
-   * (mobileapppanels.listMobileapppanels)
-   *
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param string maxResults
-   * @opt_param string startIndex
-   * @opt_param string token
-   * @return Google_Service_ConsumerSurveys_MobileAppPanelsListResponse
-   */
-  public function listMobileapppanels($optParams = array())
-  {
-    $params = array();
-    $params = array_merge($params, $optParams);
-    return $this->call('list', array($params), "Google_Service_ConsumerSurveys_MobileAppPanelsListResponse");
-  }
-  /**
-   * Updates a MobileAppPanel. Currently the only property that can be updated is
-   * the owners property. (mobileapppanels.update)
-   *
-   * @param string $panelId External URL ID for the panel.
-   * @param Google_Service_ConsumerSurveys_MobileAppPanel $postBody
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_ConsumerSurveys_MobileAppPanel
-   */
-  public function update($panelId, Google_Service_ConsumerSurveys_MobileAppPanel $postBody, $optParams = array())
-  {
-    $params = array('panelId' => $panelId, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('update', array($params), "Google_Service_ConsumerSurveys_MobileAppPanel");
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ConsumerSurveys/Resource/Results.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ConsumerSurveys/Resource/Results.php
deleted file mode 100644
index 2060052f..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ConsumerSurveys/Resource/Results.php
+++ /dev/null
@@ -1,43 +0,0 @@
-
- *   $consumersurveysService = new Google_Service_ConsumerSurveys(...);
- *   $results = $consumersurveysService->results;
- *  
- */
-class Google_Service_ConsumerSurveys_Resource_Results extends Google_Service_Resource
-{
-  /**
-   * Retrieves any survey results that have been produced so far. Results are
-   * formatted as an Excel file. You must add "?alt=media" to the URL as an
-   * argument to get results. (results.get)
-   *
-   * @param string $surveyUrlId External URL ID for the survey.
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_ConsumerSurveys_SurveyResults
-   */
-  public function get($surveyUrlId, $optParams = array())
-  {
-    $params = array('surveyUrlId' => $surveyUrlId);
-    $params = array_merge($params, $optParams);
-    return $this->call('get', array($params), "Google_Service_ConsumerSurveys_SurveyResults");
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ConsumerSurveys/Resource/Surveys.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ConsumerSurveys/Resource/Surveys.php
deleted file mode 100644
index 2a14092c..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ConsumerSurveys/Resource/Surveys.php
+++ /dev/null
@@ -1,125 +0,0 @@
-
- *   $consumersurveysService = new Google_Service_ConsumerSurveys(...);
- *   $surveys = $consumersurveysService->surveys;
- *  
- */
-class Google_Service_ConsumerSurveys_Resource_Surveys extends Google_Service_Resource
-{
-  /**
-   * Removes a survey from view in all user GET requests. (surveys.delete)
-   *
-   * @param string $surveyUrlId External URL ID for the survey.
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_ConsumerSurveys_SurveysDeleteResponse
-   */
-  public function delete($surveyUrlId, $optParams = array())
-  {
-    $params = array('surveyUrlId' => $surveyUrlId);
-    $params = array_merge($params, $optParams);
-    return $this->call('delete', array($params), "Google_Service_ConsumerSurveys_SurveysDeleteResponse");
-  }
-  /**
-   * Retrieves information about the specified survey. (surveys.get)
-   *
-   * @param string $surveyUrlId External URL ID for the survey.
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_ConsumerSurveys_Survey
-   */
-  public function get($surveyUrlId, $optParams = array())
-  {
-    $params = array('surveyUrlId' => $surveyUrlId);
-    $params = array_merge($params, $optParams);
-    return $this->call('get', array($params), "Google_Service_ConsumerSurveys_Survey");
-  }
-  /**
-   * Creates a survey. (surveys.insert)
-   *
-   * @param Google_Service_ConsumerSurveys_Survey $postBody
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_ConsumerSurveys_Survey
-   */
-  public function insert(Google_Service_ConsumerSurveys_Survey $postBody, $optParams = array())
-  {
-    $params = array('postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('insert', array($params), "Google_Service_ConsumerSurveys_Survey");
-  }
-  /**
-   * Lists the surveys owned by the authenticated user. (surveys.listSurveys)
-   *
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param string maxResults
-   * @opt_param string startIndex
-   * @opt_param string token
-   * @return Google_Service_ConsumerSurveys_SurveysListResponse
-   */
-  public function listSurveys($optParams = array())
-  {
-    $params = array();
-    $params = array_merge($params, $optParams);
-    return $this->call('list', array($params), "Google_Service_ConsumerSurveys_SurveysListResponse");
-  }
-  /**
-   * Begins running a survey. (surveys.start)
-   *
-   * @param string $resourceId
-   * @param Google_Service_ConsumerSurveys_SurveysStartRequest $postBody
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_ConsumerSurveys_SurveysStartResponse
-   */
-  public function start($resourceId, Google_Service_ConsumerSurveys_SurveysStartRequest $postBody, $optParams = array())
-  {
-    $params = array('resourceId' => $resourceId, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('start', array($params), "Google_Service_ConsumerSurveys_SurveysStartResponse");
-  }
-  /**
-   * Stops a running survey. (surveys.stop)
-   *
-   * @param string $resourceId
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_ConsumerSurveys_SurveysStopResponse
-   */
-  public function stop($resourceId, $optParams = array())
-  {
-    $params = array('resourceId' => $resourceId);
-    $params = array_merge($params, $optParams);
-    return $this->call('stop', array($params), "Google_Service_ConsumerSurveys_SurveysStopResponse");
-  }
-  /**
-   * Updates a survey. Currently the only property that can be updated is the
-   * owners property. (surveys.update)
-   *
-   * @param string $surveyUrlId External URL ID for the survey.
-   * @param Google_Service_ConsumerSurveys_Survey $postBody
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_ConsumerSurveys_Survey
-   */
-  public function update($surveyUrlId, Google_Service_ConsumerSurveys_Survey $postBody, $optParams = array())
-  {
-    $params = array('surveyUrlId' => $surveyUrlId, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('update', array($params), "Google_Service_ConsumerSurveys_Survey");
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ConsumerSurveys/ResultsGetRequest.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ConsumerSurveys/ResultsGetRequest.php
deleted file mode 100644
index 6016c193..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ConsumerSurveys/ResultsGetRequest.php
+++ /dev/null
@@ -1,31 +0,0 @@
-resultMask = $resultMask;
-  }
-  public function getResultMask()
-  {
-    return $this->resultMask;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ConsumerSurveys/ResultsMask.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ConsumerSurveys/ResultsMask.php
deleted file mode 100644
index 333d934e..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ConsumerSurveys/ResultsMask.php
+++ /dev/null
@@ -1,41 +0,0 @@
-fields = $fields;
-  }
-  public function getFields()
-  {
-    return $this->fields;
-  }
-  public function setProjection($projection)
-  {
-    $this->projection = $projection;
-  }
-  public function getProjection()
-  {
-    return $this->projection;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ConsumerSurveys/Survey.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ConsumerSurveys/Survey.php
deleted file mode 100644
index 7b24d69e..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ConsumerSurveys/Survey.php
+++ /dev/null
@@ -1,125 +0,0 @@
-audience = $audience;
-  }
-  public function getAudience()
-  {
-    return $this->audience;
-  }
-  public function setCost(Google_Service_ConsumerSurveys_SurveyCost $cost)
-  {
-    $this->cost = $cost;
-  }
-  public function getCost()
-  {
-    return $this->cost;
-  }
-  public function setCustomerData($customerData)
-  {
-    $this->customerData = $customerData;
-  }
-  public function getCustomerData()
-  {
-    return $this->customerData;
-  }
-  public function setDescription($description)
-  {
-    $this->description = $description;
-  }
-  public function getDescription()
-  {
-    return $this->description;
-  }
-  public function setOwners($owners)
-  {
-    $this->owners = $owners;
-  }
-  public function getOwners()
-  {
-    return $this->owners;
-  }
-  public function setQuestions($questions)
-  {
-    $this->questions = $questions;
-  }
-  public function getQuestions()
-  {
-    return $this->questions;
-  }
-  public function setRejectionReason(Google_Service_ConsumerSurveys_SurveyRejection $rejectionReason)
-  {
-    $this->rejectionReason = $rejectionReason;
-  }
-  public function getRejectionReason()
-  {
-    return $this->rejectionReason;
-  }
-  public function setState($state)
-  {
-    $this->state = $state;
-  }
-  public function getState()
-  {
-    return $this->state;
-  }
-  public function setSurveyUrlId($surveyUrlId)
-  {
-    $this->surveyUrlId = $surveyUrlId;
-  }
-  public function getSurveyUrlId()
-  {
-    return $this->surveyUrlId;
-  }
-  public function setTitle($title)
-  {
-    $this->title = $title;
-  }
-  public function getTitle()
-  {
-    return $this->title;
-  }
-  public function setWantedResponseCount($wantedResponseCount)
-  {
-    $this->wantedResponseCount = $wantedResponseCount;
-  }
-  public function getWantedResponseCount()
-  {
-    return $this->wantedResponseCount;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ConsumerSurveys/SurveyAudience.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ConsumerSurveys/SurveyAudience.php
deleted file mode 100644
index 9ae7e0fa..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ConsumerSurveys/SurveyAudience.php
+++ /dev/null
@@ -1,85 +0,0 @@
-ages = $ages;
-  }
-  public function getAges()
-  {
-    return $this->ages;
-  }
-  public function setCountry($country)
-  {
-    $this->country = $country;
-  }
-  public function getCountry()
-  {
-    return $this->country;
-  }
-  public function setCountrySubdivision($countrySubdivision)
-  {
-    $this->countrySubdivision = $countrySubdivision;
-  }
-  public function getCountrySubdivision()
-  {
-    return $this->countrySubdivision;
-  }
-  public function setGender($gender)
-  {
-    $this->gender = $gender;
-  }
-  public function getGender()
-  {
-    return $this->gender;
-  }
-  public function setLanguages($languages)
-  {
-    $this->languages = $languages;
-  }
-  public function getLanguages()
-  {
-    return $this->languages;
-  }
-  public function setMobileAppPanelId($mobileAppPanelId)
-  {
-    $this->mobileAppPanelId = $mobileAppPanelId;
-  }
-  public function getMobileAppPanelId()
-  {
-    return $this->mobileAppPanelId;
-  }
-  public function setPopulationSource($populationSource)
-  {
-    $this->populationSource = $populationSource;
-  }
-  public function getPopulationSource()
-  {
-    return $this->populationSource;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ConsumerSurveys/SurveyCost.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ConsumerSurveys/SurveyCost.php
deleted file mode 100644
index 686a8ace..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ConsumerSurveys/SurveyCost.php
+++ /dev/null
@@ -1,57 +0,0 @@
-costPerResponseNanos = $costPerResponseNanos;
-  }
-  public function getCostPerResponseNanos()
-  {
-    return $this->costPerResponseNanos;
-  }
-  public function setCurrencyCode($currencyCode)
-  {
-    $this->currencyCode = $currencyCode;
-  }
-  public function getCurrencyCode()
-  {
-    return $this->currencyCode;
-  }
-  public function setMaxCostPerResponseNanos($maxCostPerResponseNanos)
-  {
-    $this->maxCostPerResponseNanos = $maxCostPerResponseNanos;
-  }
-  public function getMaxCostPerResponseNanos()
-  {
-    return $this->maxCostPerResponseNanos;
-  }
-  public function setNanos($nanos)
-  {
-    $this->nanos = $nanos;
-  }
-  public function getNanos()
-  {
-    return $this->nanos;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ConsumerSurveys/SurveyQuestion.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ConsumerSurveys/SurveyQuestion.php
deleted file mode 100644
index 976ac510..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ConsumerSurveys/SurveyQuestion.php
+++ /dev/null
@@ -1,185 +0,0 @@
-answerOrder = $answerOrder;
-  }
-  public function getAnswerOrder()
-  {
-    return $this->answerOrder;
-  }
-  public function setAnswers($answers)
-  {
-    $this->answers = $answers;
-  }
-  public function getAnswers()
-  {
-    return $this->answers;
-  }
-  public function setHasOther($hasOther)
-  {
-    $this->hasOther = $hasOther;
-  }
-  public function getHasOther()
-  {
-    return $this->hasOther;
-  }
-  public function setHighValueLabel($highValueLabel)
-  {
-    $this->highValueLabel = $highValueLabel;
-  }
-  public function getHighValueLabel()
-  {
-    return $this->highValueLabel;
-  }
-  public function setImages($images)
-  {
-    $this->images = $images;
-  }
-  public function getImages()
-  {
-    return $this->images;
-  }
-  public function setLastAnswerPositionPinned($lastAnswerPositionPinned)
-  {
-    $this->lastAnswerPositionPinned = $lastAnswerPositionPinned;
-  }
-  public function getLastAnswerPositionPinned()
-  {
-    return $this->lastAnswerPositionPinned;
-  }
-  public function setLowValueLabel($lowValueLabel)
-  {
-    $this->lowValueLabel = $lowValueLabel;
-  }
-  public function getLowValueLabel()
-  {
-    return $this->lowValueLabel;
-  }
-  public function setMustPickSuggestion($mustPickSuggestion)
-  {
-    $this->mustPickSuggestion = $mustPickSuggestion;
-  }
-  public function getMustPickSuggestion()
-  {
-    return $this->mustPickSuggestion;
-  }
-  public function setNumStars($numStars)
-  {
-    $this->numStars = $numStars;
-  }
-  public function getNumStars()
-  {
-    return $this->numStars;
-  }
-  public function setOpenTextPlaceholder($openTextPlaceholder)
-  {
-    $this->openTextPlaceholder = $openTextPlaceholder;
-  }
-  public function getOpenTextPlaceholder()
-  {
-    return $this->openTextPlaceholder;
-  }
-  public function setOpenTextSuggestions($openTextSuggestions)
-  {
-    $this->openTextSuggestions = $openTextSuggestions;
-  }
-  public function getOpenTextSuggestions()
-  {
-    return $this->openTextSuggestions;
-  }
-  public function setQuestion($question)
-  {
-    $this->question = $question;
-  }
-  public function getQuestion()
-  {
-    return $this->question;
-  }
-  public function setSentimentText($sentimentText)
-  {
-    $this->sentimentText = $sentimentText;
-  }
-  public function getSentimentText()
-  {
-    return $this->sentimentText;
-  }
-  public function setSingleLineResponse($singleLineResponse)
-  {
-    $this->singleLineResponse = $singleLineResponse;
-  }
-  public function getSingleLineResponse()
-  {
-    return $this->singleLineResponse;
-  }
-  public function setThresholdAnswers($thresholdAnswers)
-  {
-    $this->thresholdAnswers = $thresholdAnswers;
-  }
-  public function getThresholdAnswers()
-  {
-    return $this->thresholdAnswers;
-  }
-  public function setType($type)
-  {
-    $this->type = $type;
-  }
-  public function getType()
-  {
-    return $this->type;
-  }
-  public function setUnitOfMeasurementLabel($unitOfMeasurementLabel)
-  {
-    $this->unitOfMeasurementLabel = $unitOfMeasurementLabel;
-  }
-  public function getUnitOfMeasurementLabel()
-  {
-    return $this->unitOfMeasurementLabel;
-  }
-  public function setVideoId($videoId)
-  {
-    $this->videoId = $videoId;
-  }
-  public function getVideoId()
-  {
-    return $this->videoId;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ConsumerSurveys/SurveyQuestionImage.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ConsumerSurveys/SurveyQuestionImage.php
deleted file mode 100644
index d065e7b2..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ConsumerSurveys/SurveyQuestionImage.php
+++ /dev/null
@@ -1,48 +0,0 @@
-altText = $altText;
-  }
-  public function getAltText()
-  {
-    return $this->altText;
-  }
-  public function setData($data)
-  {
-    $this->data = $data;
-  }
-  public function getData()
-  {
-    return $this->data;
-  }
-  public function setUrl($url)
-  {
-    $this->url = $url;
-  }
-  public function getUrl()
-  {
-    return $this->url;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ConsumerSurveys/SurveyRejection.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ConsumerSurveys/SurveyRejection.php
deleted file mode 100644
index de95eab8..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ConsumerSurveys/SurveyRejection.php
+++ /dev/null
@@ -1,39 +0,0 @@
-explanation = $explanation;
-  }
-  public function getExplanation()
-  {
-    return $this->explanation;
-  }
-  public function setType($type)
-  {
-    $this->type = $type;
-  }
-  public function getType()
-  {
-    return $this->type;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ConsumerSurveys/SurveyResults.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ConsumerSurveys/SurveyResults.php
deleted file mode 100644
index d69a9cc4..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ConsumerSurveys/SurveyResults.php
+++ /dev/null
@@ -1,39 +0,0 @@
-status = $status;
-  }
-  public function getStatus()
-  {
-    return $this->status;
-  }
-  public function setSurveyUrlId($surveyUrlId)
-  {
-    $this->surveyUrlId = $surveyUrlId;
-  }
-  public function getSurveyUrlId()
-  {
-    return $this->surveyUrlId;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ConsumerSurveys/SurveysDeleteResponse.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ConsumerSurveys/SurveysDeleteResponse.php
deleted file mode 100644
index dc0358a9..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ConsumerSurveys/SurveysDeleteResponse.php
+++ /dev/null
@@ -1,30 +0,0 @@
-requestId = $requestId;
-  }
-  public function getRequestId()
-  {
-    return $this->requestId;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ConsumerSurveys/SurveysListResponse.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ConsumerSurveys/SurveysListResponse.php
deleted file mode 100644
index e51ac29b..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ConsumerSurveys/SurveysListResponse.php
+++ /dev/null
@@ -1,61 +0,0 @@
-pageInfo = $pageInfo;
-  }
-  public function getPageInfo()
-  {
-    return $this->pageInfo;
-  }
-  public function setRequestId($requestId)
-  {
-    $this->requestId = $requestId;
-  }
-  public function getRequestId()
-  {
-    return $this->requestId;
-  }
-  public function setResources($resources)
-  {
-    $this->resources = $resources;
-  }
-  public function getResources()
-  {
-    return $this->resources;
-  }
-  public function setTokenPagination(Google_Service_ConsumerSurveys_TokenPagination $tokenPagination)
-  {
-    $this->tokenPagination = $tokenPagination;
-  }
-  public function getTokenPagination()
-  {
-    return $this->tokenPagination;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ConsumerSurveys/SurveysStartRequest.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ConsumerSurveys/SurveysStartRequest.php
deleted file mode 100644
index 430de935..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ConsumerSurveys/SurveysStartRequest.php
+++ /dev/null
@@ -1,30 +0,0 @@
-maxCostPerResponseNanos = $maxCostPerResponseNanos;
-  }
-  public function getMaxCostPerResponseNanos()
-  {
-    return $this->maxCostPerResponseNanos;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ConsumerSurveys/SurveysStartResponse.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ConsumerSurveys/SurveysStartResponse.php
deleted file mode 100644
index ac97933b..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ConsumerSurveys/SurveysStartResponse.php
+++ /dev/null
@@ -1,40 +0,0 @@
-requestId = $requestId;
-  }
-  public function getRequestId()
-  {
-    return $this->requestId;
-  }
-  public function setResource(Google_Service_ConsumerSurveys_Survey $resource)
-  {
-    $this->resource = $resource;
-  }
-  public function getResource()
-  {
-    return $this->resource;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ConsumerSurveys/SurveysStopResponse.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ConsumerSurveys/SurveysStopResponse.php
deleted file mode 100644
index 575c385f..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ConsumerSurveys/SurveysStopResponse.php
+++ /dev/null
@@ -1,40 +0,0 @@
-requestId = $requestId;
-  }
-  public function getRequestId()
-  {
-    return $this->requestId;
-  }
-  public function setResource(Google_Service_ConsumerSurveys_Survey $resource)
-  {
-    $this->resource = $resource;
-  }
-  public function getResource()
-  {
-    return $this->resource;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ConsumerSurveys/TokenPagination.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ConsumerSurveys/TokenPagination.php
deleted file mode 100644
index 77b58605..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ConsumerSurveys/TokenPagination.php
+++ /dev/null
@@ -1,39 +0,0 @@
-nextPageToken = $nextPageToken;
-  }
-  public function getNextPageToken()
-  {
-    return $this->nextPageToken;
-  }
-  public function setPreviousPageToken($previousPageToken)
-  {
-    $this->previousPageToken = $previousPageToken;
-  }
-  public function getPreviousPageToken()
-  {
-    return $this->previousPageToken;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Container.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Container.php
deleted file mode 100644
index 68aba51d..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Container.php
+++ /dev/null
@@ -1,397 +0,0 @@
-
- * Builds and manages clusters that run container-based applications, powered by
- * open source Kubernetes technology.

- *
- * 

- * For more information about this service, see the API
- * Documentation
- * 

- *
- * @author Google, Inc.
- */
-class Google_Service_Container extends Google_Service
-{
-  /** View and manage your data across Google Cloud Platform services. */
-  const CLOUD_PLATFORM =
-      "https://www.googleapis.com/auth/cloud-platform";
-
-  public $projects_zones;
-  public $projects_zones_clusters;
-  public $projects_zones_clusters_nodePools;
-  public $projects_zones_operations;
-  
-  /**
-   * Constructs the internal representation of the Container service.
-   *
-   * @param Google_Client $client
-   */
-  public function __construct(Google_Client $client)
-  {
-    parent::__construct($client);
-    $this->rootUrl = 'https://container.googleapis.com/';
-    $this->servicePath = '';
-    $this->version = 'v1';
-    $this->serviceName = 'container';
-
-    $this->projects_zones = new Google_Service_Container_Resource_ProjectsZones(
-        $this,
-        $this->serviceName,
-        'zones',
-        array(
-          'methods' => array(
-            'getServerconfig' => array(
-              'path' => 'v1/projects/{projectId}/zones/{zone}/serverconfig',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'projectId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'zone' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),
-          )
-        )
-    );
-    $this->projects_zones_clusters = new Google_Service_Container_Resource_ProjectsZonesClusters(
-        $this,
-        $this->serviceName,
-        'clusters',
-        array(
-          'methods' => array(
-            'create' => array(
-              'path' => 'v1/projects/{projectId}/zones/{zone}/clusters',
-              'httpMethod' => 'POST',
-              'parameters' => array(
-                'projectId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'zone' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'delete' => array(
-              'path' => 'v1/projects/{projectId}/zones/{zone}/clusters/{clusterId}',
-              'httpMethod' => 'DELETE',
-              'parameters' => array(
-                'projectId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'zone' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'clusterId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'get' => array(
-              'path' => 'v1/projects/{projectId}/zones/{zone}/clusters/{clusterId}',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'projectId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'zone' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'clusterId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'list' => array(
-              'path' => 'v1/projects/{projectId}/zones/{zone}/clusters',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'projectId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'zone' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'update' => array(
-              'path' => 'v1/projects/{projectId}/zones/{zone}/clusters/{clusterId}',
-              'httpMethod' => 'PUT',
-              'parameters' => array(
-                'projectId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'zone' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'clusterId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),
-          )
-        )
-    );
-    $this->projects_zones_clusters_nodePools = new Google_Service_Container_Resource_ProjectsZonesClustersNodePools(
-        $this,
-        $this->serviceName,
-        'nodePools',
-        array(
-          'methods' => array(
-            'create' => array(
-              'path' => 'v1/projects/{projectId}/zones/{zone}/clusters/{clusterId}/nodePools',
-              'httpMethod' => 'POST',
-              'parameters' => array(
-                'projectId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'zone' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'clusterId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'delete' => array(
-              'path' => 'v1/projects/{projectId}/zones/{zone}/clusters/{clusterId}/nodePools/{nodePoolId}',
-              'httpMethod' => 'DELETE',
-              'parameters' => array(
-                'projectId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'zone' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'clusterId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'nodePoolId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'get' => array(
-              'path' => 'v1/projects/{projectId}/zones/{zone}/clusters/{clusterId}/nodePools/{nodePoolId}',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'projectId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'zone' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'clusterId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'nodePoolId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'list' => array(
-              'path' => 'v1/projects/{projectId}/zones/{zone}/clusters/{clusterId}/nodePools',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'projectId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'zone' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'clusterId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'rollback' => array(
-              'path' => 'v1/projects/{projectId}/zones/{zone}/clusters/{clusterId}/nodePools/{nodePoolId}:rollback',
-              'httpMethod' => 'POST',
-              'parameters' => array(
-                'projectId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'zone' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'clusterId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'nodePoolId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'setManagement' => array(
-              'path' => 'v1/projects/{projectId}/zones/{zone}/clusters/{clusterId}/nodePools/{nodePoolId}/setManagement',
-              'httpMethod' => 'POST',
-              'parameters' => array(
-                'projectId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'zone' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'clusterId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'nodePoolId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),
-          )
-        )
-    );
-    $this->projects_zones_operations = new Google_Service_Container_Resource_ProjectsZonesOperations(
-        $this,
-        $this->serviceName,
-        'operations',
-        array(
-          'methods' => array(
-            'cancel' => array(
-              'path' => 'v1/projects/{projectId}/zones/{zone}/operations/{operationId}:cancel',
-              'httpMethod' => 'POST',
-              'parameters' => array(
-                'projectId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'zone' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'operationId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'get' => array(
-              'path' => 'v1/projects/{projectId}/zones/{zone}/operations/{operationId}',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'projectId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'zone' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'operationId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'list' => array(
-              'path' => 'v1/projects/{projectId}/zones/{zone}/operations',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'projectId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'zone' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),
-          )
-        )
-    );
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Container/AddonsConfig.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Container/AddonsConfig.php
deleted file mode 100644
index 4954faf4..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Container/AddonsConfig.php
+++ /dev/null
@@ -1,41 +0,0 @@
-horizontalPodAutoscaling = $horizontalPodAutoscaling;
-  }
-  public function getHorizontalPodAutoscaling()
-  {
-    return $this->horizontalPodAutoscaling;
-  }
-  public function setHttpLoadBalancing(Google_Service_Container_HttpLoadBalancing $httpLoadBalancing)
-  {
-    $this->httpLoadBalancing = $httpLoadBalancing;
-  }
-  public function getHttpLoadBalancing()
-  {
-    return $this->httpLoadBalancing;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Container/AutoUpgradeOptions.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Container/AutoUpgradeOptions.php
deleted file mode 100644
index a65f5408..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Container/AutoUpgradeOptions.php
+++ /dev/null
@@ -1,39 +0,0 @@
-autoUpgradeStartTime = $autoUpgradeStartTime;
-  }
-  public function getAutoUpgradeStartTime()
-  {
-    return $this->autoUpgradeStartTime;
-  }
-  public function setDescription($description)
-  {
-    $this->description = $description;
-  }
-  public function getDescription()
-  {
-    return $this->description;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Container/CancelOperationRequest.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Container/CancelOperationRequest.php
deleted file mode 100644
index 27d7732d..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Container/CancelOperationRequest.php
+++ /dev/null
@@ -1,20 +0,0 @@
-addonsConfig = $addonsConfig;
-  }
-  public function getAddonsConfig()
-  {
-    return $this->addonsConfig;
-  }
-  public function setClusterIpv4Cidr($clusterIpv4Cidr)
-  {
-    $this->clusterIpv4Cidr = $clusterIpv4Cidr;
-  }
-  public function getClusterIpv4Cidr()
-  {
-    return $this->clusterIpv4Cidr;
-  }
-  public function setCreateTime($createTime)
-  {
-    $this->createTime = $createTime;
-  }
-  public function getCreateTime()
-  {
-    return $this->createTime;
-  }
-  public function setCurrentMasterVersion($currentMasterVersion)
-  {
-    $this->currentMasterVersion = $currentMasterVersion;
-  }
-  public function getCurrentMasterVersion()
-  {
-    return $this->currentMasterVersion;
-  }
-  public function setCurrentNodeCount($currentNodeCount)
-  {
-    $this->currentNodeCount = $currentNodeCount;
-  }
-  public function getCurrentNodeCount()
-  {
-    return $this->currentNodeCount;
-  }
-  public function setCurrentNodeVersion($currentNodeVersion)
-  {
-    $this->currentNodeVersion = $currentNodeVersion;
-  }
-  public function getCurrentNodeVersion()
-  {
-    return $this->currentNodeVersion;
-  }
-  public function setDescription($description)
-  {
-    $this->description = $description;
-  }
-  public function getDescription()
-  {
-    return $this->description;
-  }
-  public function setEnableKubernetesAlpha($enableKubernetesAlpha)
-  {
-    $this->enableKubernetesAlpha = $enableKubernetesAlpha;
-  }
-  public function getEnableKubernetesAlpha()
-  {
-    return $this->enableKubernetesAlpha;
-  }
-  public function setEndpoint($endpoint)
-  {
-    $this->endpoint = $endpoint;
-  }
-  public function getEndpoint()
-  {
-    return $this->endpoint;
-  }
-  public function setExpireTime($expireTime)
-  {
-    $this->expireTime = $expireTime;
-  }
-  public function getExpireTime()
-  {
-    return $this->expireTime;
-  }
-  public function setInitialClusterVersion($initialClusterVersion)
-  {
-    $this->initialClusterVersion = $initialClusterVersion;
-  }
-  public function getInitialClusterVersion()
-  {
-    return $this->initialClusterVersion;
-  }
-  public function setInitialNodeCount($initialNodeCount)
-  {
-    $this->initialNodeCount = $initialNodeCount;
-  }
-  public function getInitialNodeCount()
-  {
-    return $this->initialNodeCount;
-  }
-  public function setInstanceGroupUrls($instanceGroupUrls)
-  {
-    $this->instanceGroupUrls = $instanceGroupUrls;
-  }
-  public function getInstanceGroupUrls()
-  {
-    return $this->instanceGroupUrls;
-  }
-  public function setLocations($locations)
-  {
-    $this->locations = $locations;
-  }
-  public function getLocations()
-  {
-    return $this->locations;
-  }
-  public function setLoggingService($loggingService)
-  {
-    $this->loggingService = $loggingService;
-  }
-  public function getLoggingService()
-  {
-    return $this->loggingService;
-  }
-  public function setMasterAuth(Google_Service_Container_MasterAuth $masterAuth)
-  {
-    $this->masterAuth = $masterAuth;
-  }
-  public function getMasterAuth()
-  {
-    return $this->masterAuth;
-  }
-  public function setMonitoringService($monitoringService)
-  {
-    $this->monitoringService = $monitoringService;
-  }
-  public function getMonitoringService()
-  {
-    return $this->monitoringService;
-  }
-  public function setName($name)
-  {
-    $this->name = $name;
-  }
-  public function getName()
-  {
-    return $this->name;
-  }
-  public function setNetwork($network)
-  {
-    $this->network = $network;
-  }
-  public function getNetwork()
-  {
-    return $this->network;
-  }
-  public function setNodeConfig(Google_Service_Container_NodeConfig $nodeConfig)
-  {
-    $this->nodeConfig = $nodeConfig;
-  }
-  public function getNodeConfig()
-  {
-    return $this->nodeConfig;
-  }
-  public function setNodeIpv4CidrSize($nodeIpv4CidrSize)
-  {
-    $this->nodeIpv4CidrSize = $nodeIpv4CidrSize;
-  }
-  public function getNodeIpv4CidrSize()
-  {
-    return $this->nodeIpv4CidrSize;
-  }
-  public function setNodePools($nodePools)
-  {
-    $this->nodePools = $nodePools;
-  }
-  public function getNodePools()
-  {
-    return $this->nodePools;
-  }
-  public function setSelfLink($selfLink)
-  {
-    $this->selfLink = $selfLink;
-  }
-  public function getSelfLink()
-  {
-    return $this->selfLink;
-  }
-  public function setServicesIpv4Cidr($servicesIpv4Cidr)
-  {
-    $this->servicesIpv4Cidr = $servicesIpv4Cidr;
-  }
-  public function getServicesIpv4Cidr()
-  {
-    return $this->servicesIpv4Cidr;
-  }
-  public function setStatus($status)
-  {
-    $this->status = $status;
-  }
-  public function getStatus()
-  {
-    return $this->status;
-  }
-  public function setStatusMessage($statusMessage)
-  {
-    $this->statusMessage = $statusMessage;
-  }
-  public function getStatusMessage()
-  {
-    return $this->statusMessage;
-  }
-  public function setSubnetwork($subnetwork)
-  {
-    $this->subnetwork = $subnetwork;
-  }
-  public function getSubnetwork()
-  {
-    return $this->subnetwork;
-  }
-  public function setZone($zone)
-  {
-    $this->zone = $zone;
-  }
-  public function getZone()
-  {
-    return $this->zone;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Container/ClusterUpdate.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Container/ClusterUpdate.php
deleted file mode 100644
index ce55c078..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Container/ClusterUpdate.php
+++ /dev/null
@@ -1,96 +0,0 @@
-desiredAddonsConfig = $desiredAddonsConfig;
-  }
-  public function getDesiredAddonsConfig()
-  {
-    return $this->desiredAddonsConfig;
-  }
-  public function setDesiredImageType($desiredImageType)
-  {
-    $this->desiredImageType = $desiredImageType;
-  }
-  public function getDesiredImageType()
-  {
-    return $this->desiredImageType;
-  }
-  public function setDesiredLocations($desiredLocations)
-  {
-    $this->desiredLocations = $desiredLocations;
-  }
-  public function getDesiredLocations()
-  {
-    return $this->desiredLocations;
-  }
-  public function setDesiredMasterVersion($desiredMasterVersion)
-  {
-    $this->desiredMasterVersion = $desiredMasterVersion;
-  }
-  public function getDesiredMasterVersion()
-  {
-    return $this->desiredMasterVersion;
-  }
-  public function setDesiredMonitoringService($desiredMonitoringService)
-  {
-    $this->desiredMonitoringService = $desiredMonitoringService;
-  }
-  public function getDesiredMonitoringService()
-  {
-    return $this->desiredMonitoringService;
-  }
-  public function setDesiredNodePoolAutoscaling(Google_Service_Container_NodePoolAutoscaling $desiredNodePoolAutoscaling)
-  {
-    $this->desiredNodePoolAutoscaling = $desiredNodePoolAutoscaling;
-  }
-  public function getDesiredNodePoolAutoscaling()
-  {
-    return $this->desiredNodePoolAutoscaling;
-  }
-  public function setDesiredNodePoolId($desiredNodePoolId)
-  {
-    $this->desiredNodePoolId = $desiredNodePoolId;
-  }
-  public function getDesiredNodePoolId()
-  {
-    return $this->desiredNodePoolId;
-  }
-  public function setDesiredNodeVersion($desiredNodeVersion)
-  {
-    $this->desiredNodeVersion = $desiredNodeVersion;
-  }
-  public function getDesiredNodeVersion()
-  {
-    return $this->desiredNodeVersion;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Container/ContainerEmpty.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Container/ContainerEmpty.php
deleted file mode 100644
index 0695e622..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Container/ContainerEmpty.php
+++ /dev/null
@@ -1,20 +0,0 @@
-cluster = $cluster;
-  }
-  public function getCluster()
-  {
-    return $this->cluster;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Container/CreateNodePoolRequest.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Container/CreateNodePoolRequest.php
deleted file mode 100644
index 6088cb84..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Container/CreateNodePoolRequest.php
+++ /dev/null
@@ -1,31 +0,0 @@
-nodePool = $nodePool;
-  }
-  public function getNodePool()
-  {
-    return $this->nodePool;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Container/HorizontalPodAutoscaling.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Container/HorizontalPodAutoscaling.php
deleted file mode 100644
index 8e139c55..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Container/HorizontalPodAutoscaling.php
+++ /dev/null
@@ -1,30 +0,0 @@
-disabled = $disabled;
-  }
-  public function getDisabled()
-  {
-    return $this->disabled;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Container/HttpLoadBalancing.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Container/HttpLoadBalancing.php
deleted file mode 100644
index b8db1f2a..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Container/HttpLoadBalancing.php
+++ /dev/null
@@ -1,30 +0,0 @@
-disabled = $disabled;
-  }
-  public function getDisabled()
-  {
-    return $this->disabled;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Container/ListClustersResponse.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Container/ListClustersResponse.php
deleted file mode 100644
index e9dc6a97..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Container/ListClustersResponse.php
+++ /dev/null
@@ -1,41 +0,0 @@
-clusters = $clusters;
-  }
-  public function getClusters()
-  {
-    return $this->clusters;
-  }
-  public function setMissingZones($missingZones)
-  {
-    $this->missingZones = $missingZones;
-  }
-  public function getMissingZones()
-  {
-    return $this->missingZones;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Container/ListNodePoolsResponse.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Container/ListNodePoolsResponse.php
deleted file mode 100644
index 30f73741..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Container/ListNodePoolsResponse.php
+++ /dev/null
@@ -1,32 +0,0 @@
-nodePools = $nodePools;
-  }
-  public function getNodePools()
-  {
-    return $this->nodePools;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Container/ListOperationsResponse.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Container/ListOperationsResponse.php
deleted file mode 100644
index f5d6c3bc..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Container/ListOperationsResponse.php
+++ /dev/null
@@ -1,41 +0,0 @@
-missingZones = $missingZones;
-  }
-  public function getMissingZones()
-  {
-    return $this->missingZones;
-  }
-  public function setOperations($operations)
-  {
-    $this->operations = $operations;
-  }
-  public function getOperations()
-  {
-    return $this->operations;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Container/MasterAuth.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Container/MasterAuth.php
deleted file mode 100644
index e5db3e92..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Container/MasterAuth.php
+++ /dev/null
@@ -1,66 +0,0 @@
-clientCertificate = $clientCertificate;
-  }
-  public function getClientCertificate()
-  {
-    return $this->clientCertificate;
-  }
-  public function setClientKey($clientKey)
-  {
-    $this->clientKey = $clientKey;
-  }
-  public function getClientKey()
-  {
-    return $this->clientKey;
-  }
-  public function setClusterCaCertificate($clusterCaCertificate)
-  {
-    $this->clusterCaCertificate = $clusterCaCertificate;
-  }
-  public function getClusterCaCertificate()
-  {
-    return $this->clusterCaCertificate;
-  }
-  public function setPassword($password)
-  {
-    $this->password = $password;
-  }
-  public function getPassword()
-  {
-    return $this->password;
-  }
-  public function setUsername($username)
-  {
-    $this->username = $username;
-  }
-  public function getUsername()
-  {
-    return $this->username;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Container/NodeConfig.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Container/NodeConfig.php
deleted file mode 100644
index 9551ad12..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Container/NodeConfig.php
+++ /dev/null
@@ -1,112 +0,0 @@
-diskSizeGb = $diskSizeGb;
-  }
-  public function getDiskSizeGb()
-  {
-    return $this->diskSizeGb;
-  }
-  public function setImageType($imageType)
-  {
-    $this->imageType = $imageType;
-  }
-  public function getImageType()
-  {
-    return $this->imageType;
-  }
-  public function setLabels($labels)
-  {
-    $this->labels = $labels;
-  }
-  public function getLabels()
-  {
-    return $this->labels;
-  }
-  public function setLocalSsdCount($localSsdCount)
-  {
-    $this->localSsdCount = $localSsdCount;
-  }
-  public function getLocalSsdCount()
-  {
-    return $this->localSsdCount;
-  }
-  public function setMachineType($machineType)
-  {
-    $this->machineType = $machineType;
-  }
-  public function getMachineType()
-  {
-    return $this->machineType;
-  }
-  public function setMetadata($metadata)
-  {
-    $this->metadata = $metadata;
-  }
-  public function getMetadata()
-  {
-    return $this->metadata;
-  }
-  public function setOauthScopes($oauthScopes)
-  {
-    $this->oauthScopes = $oauthScopes;
-  }
-  public function getOauthScopes()
-  {
-    return $this->oauthScopes;
-  }
-  public function setPreemptible($preemptible)
-  {
-    $this->preemptible = $preemptible;
-  }
-  public function getPreemptible()
-  {
-    return $this->preemptible;
-  }
-  public function setServiceAccount($serviceAccount)
-  {
-    $this->serviceAccount = $serviceAccount;
-  }
-  public function getServiceAccount()
-  {
-    return $this->serviceAccount;
-  }
-  public function setTags($tags)
-  {
-    $this->tags = $tags;
-  }
-  public function getTags()
-  {
-    return $this->tags;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Container/NodeManagement.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Container/NodeManagement.php
deleted file mode 100644
index 833c5033..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Container/NodeManagement.php
+++ /dev/null
@@ -1,40 +0,0 @@
-autoUpgrade = $autoUpgrade;
-  }
-  public function getAutoUpgrade()
-  {
-    return $this->autoUpgrade;
-  }
-  public function setUpgradeOptions(Google_Service_Container_AutoUpgradeOptions $upgradeOptions)
-  {
-    $this->upgradeOptions = $upgradeOptions;
-  }
-  public function getUpgradeOptions()
-  {
-    return $this->upgradeOptions;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Container/NodePool.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Container/NodePool.php
deleted file mode 100644
index 0be52bb0..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Container/NodePool.php
+++ /dev/null
@@ -1,115 +0,0 @@
-autoscaling = $autoscaling;
-  }
-  public function getAutoscaling()
-  {
-    return $this->autoscaling;
-  }
-  public function setConfig(Google_Service_Container_NodeConfig $config)
-  {
-    $this->config = $config;
-  }
-  public function getConfig()
-  {
-    return $this->config;
-  }
-  public function setInitialNodeCount($initialNodeCount)
-  {
-    $this->initialNodeCount = $initialNodeCount;
-  }
-  public function getInitialNodeCount()
-  {
-    return $this->initialNodeCount;
-  }
-  public function setInstanceGroupUrls($instanceGroupUrls)
-  {
-    $this->instanceGroupUrls = $instanceGroupUrls;
-  }
-  public function getInstanceGroupUrls()
-  {
-    return $this->instanceGroupUrls;
-  }
-  public function setManagement(Google_Service_Container_NodeManagement $management)
-  {
-    $this->management = $management;
-  }
-  public function getManagement()
-  {
-    return $this->management;
-  }
-  public function setName($name)
-  {
-    $this->name = $name;
-  }
-  public function getName()
-  {
-    return $this->name;
-  }
-  public function setSelfLink($selfLink)
-  {
-    $this->selfLink = $selfLink;
-  }
-  public function getSelfLink()
-  {
-    return $this->selfLink;
-  }
-  public function setStatus($status)
-  {
-    $this->status = $status;
-  }
-  public function getStatus()
-  {
-    return $this->status;
-  }
-  public function setStatusMessage($statusMessage)
-  {
-    $this->statusMessage = $statusMessage;
-  }
-  public function getStatusMessage()
-  {
-    return $this->statusMessage;
-  }
-  public function setVersion($version)
-  {
-    $this->version = $version;
-  }
-  public function getVersion()
-  {
-    return $this->version;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Container/NodePoolAutoscaling.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Container/NodePoolAutoscaling.php
deleted file mode 100644
index 14386b5f..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Container/NodePoolAutoscaling.php
+++ /dev/null
@@ -1,48 +0,0 @@
-enabled = $enabled;
-  }
-  public function getEnabled()
-  {
-    return $this->enabled;
-  }
-  public function setMaxNodeCount($maxNodeCount)
-  {
-    $this->maxNodeCount = $maxNodeCount;
-  }
-  public function getMaxNodeCount()
-  {
-    return $this->maxNodeCount;
-  }
-  public function setMinNodeCount($minNodeCount)
-  {
-    $this->minNodeCount = $minNodeCount;
-  }
-  public function getMinNodeCount()
-  {
-    return $this->minNodeCount;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Container/Operation.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Container/Operation.php
deleted file mode 100644
index 65421cb0..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Container/Operation.php
+++ /dev/null
@@ -1,93 +0,0 @@
-detail = $detail;
-  }
-  public function getDetail()
-  {
-    return $this->detail;
-  }
-  public function setName($name)
-  {
-    $this->name = $name;
-  }
-  public function getName()
-  {
-    return $this->name;
-  }
-  public function setOperationType($operationType)
-  {
-    $this->operationType = $operationType;
-  }
-  public function getOperationType()
-  {
-    return $this->operationType;
-  }
-  public function setSelfLink($selfLink)
-  {
-    $this->selfLink = $selfLink;
-  }
-  public function getSelfLink()
-  {
-    return $this->selfLink;
-  }
-  public function setStatus($status)
-  {
-    $this->status = $status;
-  }
-  public function getStatus()
-  {
-    return $this->status;
-  }
-  public function setStatusMessage($statusMessage)
-  {
-    $this->statusMessage = $statusMessage;
-  }
-  public function getStatusMessage()
-  {
-    return $this->statusMessage;
-  }
-  public function setTargetLink($targetLink)
-  {
-    $this->targetLink = $targetLink;
-  }
-  public function getTargetLink()
-  {
-    return $this->targetLink;
-  }
-  public function setZone($zone)
-  {
-    $this->zone = $zone;
-  }
-  public function getZone()
-  {
-    return $this->zone;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Container/Resource/Projects.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Container/Resource/Projects.php
deleted file mode 100644
index 219380b2..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Container/Resource/Projects.php
+++ /dev/null
@@ -1,28 +0,0 @@
-
- *   $containerService = new Google_Service_Container(...);
- *   $projects = $containerService->projects;
- *  
- */
-class Google_Service_Container_Resource_Projects extends Google_Service_Resource
-{
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Container/Resource/ProjectsZones.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Container/Resource/ProjectsZones.php
deleted file mode 100644
index 0ed185df..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Container/Resource/ProjectsZones.php
+++ /dev/null
@@ -1,45 +0,0 @@
-
- *   $containerService = new Google_Service_Container(...);
- *   $zones = $containerService->zones;
- *  
- */
-class Google_Service_Container_Resource_ProjectsZones extends Google_Service_Resource
-{
-  /**
-   * Returns configuration info about the Container Engine service.
-   * (zones.getServerconfig)
-   *
-   * @param string $projectId The Google Developers Console [project ID or project
-   * number](https://support.google.com/cloud/answer/6158840).
-   * @param string $zone The name of the Google Compute Engine
-   * [zone](/compute/docs/zones#available) to return operations for.
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Container_ServerConfig
-   */
-  public function getServerconfig($projectId, $zone, $optParams = array())
-  {
-    $params = array('projectId' => $projectId, 'zone' => $zone);
-    $params = array_merge($params, $optParams);
-    return $this->call('getServerconfig', array($params), "Google_Service_Container_ServerConfig");
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Container/Resource/ProjectsZonesClusters.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Container/Resource/ProjectsZonesClusters.php
deleted file mode 100644
index 33a47edf..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Container/Resource/ProjectsZonesClusters.php
+++ /dev/null
@@ -1,126 +0,0 @@
-
- *   $containerService = new Google_Service_Container(...);
- *   $clusters = $containerService->clusters;
- *  
- */
-class Google_Service_Container_Resource_ProjectsZonesClusters extends Google_Service_Resource
-{
-  /**
-   * Creates a cluster, consisting of the specified number and type of Google
-   * Compute Engine instances. By default, the cluster is created in the project's
-   * [default network](/compute/docs/networks-and-firewalls#networks). One
-   * firewall is added for the cluster. After cluster creation, the cluster
-   * creates routes for each node to allow the containers on that node to
-   * communicate with all other instances in the cluster. Finally, an entry is
-   * added to the project's global metadata indicating which CIDR range is being
-   * used by the cluster. (clusters.create)
-   *
-   * @param string $projectId The Google Developers Console [project ID or project
-   * number](https://support.google.com/cloud/answer/6158840).
-   * @param string $zone The name of the Google Compute Engine
-   * [zone](/compute/docs/zones#available) in which the cluster resides.
-   * @param Google_Service_Container_CreateClusterRequest $postBody
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Container_Operation
-   */
-  public function create($projectId, $zone, Google_Service_Container_CreateClusterRequest $postBody, $optParams = array())
-  {
-    $params = array('projectId' => $projectId, 'zone' => $zone, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('create', array($params), "Google_Service_Container_Operation");
-  }
-  /**
-   * Deletes the cluster, including the Kubernetes endpoint and all worker nodes.
-   * Firewalls and routes that were configured during cluster creation are also
-   * deleted. Other Google Compute Engine resources that might be in use by the
-   * cluster (e.g. load balancer resources) will not be deleted if they weren't
-   * present at the initial create time. (clusters.delete)
-   *
-   * @param string $projectId The Google Developers Console [project ID or project
-   * number](https://support.google.com/cloud/answer/6158840).
-   * @param string $zone The name of the Google Compute Engine
-   * [zone](/compute/docs/zones#available) in which the cluster resides.
-   * @param string $clusterId The name of the cluster to delete.
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Container_Operation
-   */
-  public function delete($projectId, $zone, $clusterId, $optParams = array())
-  {
-    $params = array('projectId' => $projectId, 'zone' => $zone, 'clusterId' => $clusterId);
-    $params = array_merge($params, $optParams);
-    return $this->call('delete', array($params), "Google_Service_Container_Operation");
-  }
-  /**
-   * Gets the details of a specific cluster. (clusters.get)
-   *
-   * @param string $projectId The Google Developers Console [project ID or project
-   * number](https://support.google.com/cloud/answer/6158840).
-   * @param string $zone The name of the Google Compute Engine
-   * [zone](/compute/docs/zones#available) in which the cluster resides.
-   * @param string $clusterId The name of the cluster to retrieve.
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Container_Cluster
-   */
-  public function get($projectId, $zone, $clusterId, $optParams = array())
-  {
-    $params = array('projectId' => $projectId, 'zone' => $zone, 'clusterId' => $clusterId);
-    $params = array_merge($params, $optParams);
-    return $this->call('get', array($params), "Google_Service_Container_Cluster");
-  }
-  /**
-   * Lists all clusters owned by a project in either the specified zone or all
-   * zones. (clusters.listProjectsZonesClusters)
-   *
-   * @param string $projectId The Google Developers Console [project ID or project
-   * number](https://support.google.com/cloud/answer/6158840).
-   * @param string $zone The name of the Google Compute Engine
-   * [zone](/compute/docs/zones#available) in which the cluster resides, or "-"
-   * for all zones.
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Container_ListClustersResponse
-   */
-  public function listProjectsZonesClusters($projectId, $zone, $optParams = array())
-  {
-    $params = array('projectId' => $projectId, 'zone' => $zone);
-    $params = array_merge($params, $optParams);
-    return $this->call('list', array($params), "Google_Service_Container_ListClustersResponse");
-  }
-  /**
-   * Updates the settings of a specific cluster. (clusters.update)
-   *
-   * @param string $projectId The Google Developers Console [project ID or project
-   * number](https://support.google.com/cloud/answer/6158840).
-   * @param string $zone The name of the Google Compute Engine
-   * [zone](/compute/docs/zones#available) in which the cluster resides.
-   * @param string $clusterId The name of the cluster to upgrade.
-   * @param Google_Service_Container_UpdateClusterRequest $postBody
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Container_Operation
-   */
-  public function update($projectId, $zone, $clusterId, Google_Service_Container_UpdateClusterRequest $postBody, $optParams = array())
-  {
-    $params = array('projectId' => $projectId, 'zone' => $zone, 'clusterId' => $clusterId, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('update', array($params), "Google_Service_Container_Operation");
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Container/Resource/ProjectsZonesClustersNodePools.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Container/Resource/ProjectsZonesClustersNodePools.php
deleted file mode 100644
index 7763c92a..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Container/Resource/ProjectsZonesClustersNodePools.php
+++ /dev/null
@@ -1,139 +0,0 @@
-
- *   $containerService = new Google_Service_Container(...);
- *   $nodePools = $containerService->nodePools;
- *  
- */
-class Google_Service_Container_Resource_ProjectsZonesClustersNodePools extends Google_Service_Resource
-{
-  /**
-   * Creates a node pool for a cluster. (nodePools.create)
-   *
-   * @param string $projectId The Google Developers Console [project ID or project
-   * number](https://developers.google.com/console/help/new/#projectnumber).
-   * @param string $zone The name of the Google Compute Engine
-   * [zone](/compute/docs/zones#available) in which the cluster resides.
-   * @param string $clusterId The name of the cluster.
-   * @param Google_Service_Container_CreateNodePoolRequest $postBody
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Container_Operation
-   */
-  public function create($projectId, $zone, $clusterId, Google_Service_Container_CreateNodePoolRequest $postBody, $optParams = array())
-  {
-    $params = array('projectId' => $projectId, 'zone' => $zone, 'clusterId' => $clusterId, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('create', array($params), "Google_Service_Container_Operation");
-  }
-  /**
-   * Deletes a node pool from a cluster. (nodePools.delete)
-   *
-   * @param string $projectId The Google Developers Console [project ID or project
-   * number](https://developers.google.com/console/help/new/#projectnumber).
-   * @param string $zone The name of the Google Compute Engine
-   * [zone](/compute/docs/zones#available) in which the cluster resides.
-   * @param string $clusterId The name of the cluster.
-   * @param string $nodePoolId The name of the node pool to delete.
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Container_Operation
-   */
-  public function delete($projectId, $zone, $clusterId, $nodePoolId, $optParams = array())
-  {
-    $params = array('projectId' => $projectId, 'zone' => $zone, 'clusterId' => $clusterId, 'nodePoolId' => $nodePoolId);
-    $params = array_merge($params, $optParams);
-    return $this->call('delete', array($params), "Google_Service_Container_Operation");
-  }
-  /**
-   * Retrieves the node pool requested. (nodePools.get)
-   *
-   * @param string $projectId The Google Developers Console [project ID or project
-   * number](https://developers.google.com/console/help/new/#projectnumber).
-   * @param string $zone The name of the Google Compute Engine
-   * [zone](/compute/docs/zones#available) in which the cluster resides.
-   * @param string $clusterId The name of the cluster.
-   * @param string $nodePoolId The name of the node pool.
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Container_NodePool
-   */
-  public function get($projectId, $zone, $clusterId, $nodePoolId, $optParams = array())
-  {
-    $params = array('projectId' => $projectId, 'zone' => $zone, 'clusterId' => $clusterId, 'nodePoolId' => $nodePoolId);
-    $params = array_merge($params, $optParams);
-    return $this->call('get', array($params), "Google_Service_Container_NodePool");
-  }
-  /**
-   * Lists the node pools for a cluster.
-   * (nodePools.listProjectsZonesClustersNodePools)
-   *
-   * @param string $projectId The Google Developers Console [project ID or project
-   * number](https://developers.google.com/console/help/new/#projectnumber).
-   * @param string $zone The name of the Google Compute Engine
-   * [zone](/compute/docs/zones#available) in which the cluster resides.
-   * @param string $clusterId The name of the cluster.
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Container_ListNodePoolsResponse
-   */
-  public function listProjectsZonesClustersNodePools($projectId, $zone, $clusterId, $optParams = array())
-  {
-    $params = array('projectId' => $projectId, 'zone' => $zone, 'clusterId' => $clusterId);
-    $params = array_merge($params, $optParams);
-    return $this->call('list', array($params), "Google_Service_Container_ListNodePoolsResponse");
-  }
-  /**
-   * Roll back the previously Aborted or Failed NodePool upgrade. This will be an
-   * no-op if the last upgrade successfully completed. (nodePools.rollback)
-   *
-   * @param string $projectId The Google Developers Console [project ID or project
-   * number](https://support.google.com/cloud/answer/6158840).
-   * @param string $zone The name of the Google Compute Engine
-   * [zone](/compute/docs/zones#available) in which the cluster resides.
-   * @param string $clusterId The name of the cluster to rollback.
-   * @param string $nodePoolId The name of the node pool to rollback.
-   * @param Google_Service_Container_RollbackNodePoolUpgradeRequest $postBody
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Container_Operation
-   */
-  public function rollback($projectId, $zone, $clusterId, $nodePoolId, Google_Service_Container_RollbackNodePoolUpgradeRequest $postBody, $optParams = array())
-  {
-    $params = array('projectId' => $projectId, 'zone' => $zone, 'clusterId' => $clusterId, 'nodePoolId' => $nodePoolId, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('rollback', array($params), "Google_Service_Container_Operation");
-  }
-  /**
-   * Sets the NodeManagement options for a node pool. (nodePools.setManagement)
-   *
-   * @param string $projectId The Google Developers Console [project ID or project
-   * number](https://support.google.com/cloud/answer/6158840).
-   * @param string $zone The name of the Google Compute Engine
-   * [zone](/compute/docs/zones#available) in which the cluster resides.
-   * @param string $clusterId The name of the cluster to update.
-   * @param string $nodePoolId The name of the node pool to update.
-   * @param Google_Service_Container_SetNodePoolManagementRequest $postBody
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Container_Operation
-   */
-  public function setManagement($projectId, $zone, $clusterId, $nodePoolId, Google_Service_Container_SetNodePoolManagementRequest $postBody, $optParams = array())
-  {
-    $params = array('projectId' => $projectId, 'zone' => $zone, 'clusterId' => $clusterId, 'nodePoolId' => $nodePoolId, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('setManagement', array($params), "Google_Service_Container_Operation");
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Container/Resource/ProjectsZonesOperations.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Container/Resource/ProjectsZonesOperations.php
deleted file mode 100644
index 2622ee32..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Container/Resource/ProjectsZonesOperations.php
+++ /dev/null
@@ -1,81 +0,0 @@
-
- *   $containerService = new Google_Service_Container(...);
- *   $operations = $containerService->operations;
- *  
- */
-class Google_Service_Container_Resource_ProjectsZonesOperations extends Google_Service_Resource
-{
-  /**
-   * Cancels the specified operation. (operations.cancel)
-   *
-   * @param string $projectId The Google Developers Console [project ID or project
-   * number](https://support.google.com/cloud/answer/6158840).
-   * @param string $zone The name of the Google Compute Engine
-   * [zone](/compute/docs/zones#available) in which the operation resides.
-   * @param string $operationId The server-assigned `name` of the operation.
-   * @param Google_Service_Container_CancelOperationRequest $postBody
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Container_ContainerEmpty
-   */
-  public function cancel($projectId, $zone, $operationId, Google_Service_Container_CancelOperationRequest $postBody, $optParams = array())
-  {
-    $params = array('projectId' => $projectId, 'zone' => $zone, 'operationId' => $operationId, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('cancel', array($params), "Google_Service_Container_ContainerEmpty");
-  }
-  /**
-   * Gets the specified operation. (operations.get)
-   *
-   * @param string $projectId The Google Developers Console [project ID or project
-   * number](https://support.google.com/cloud/answer/6158840).
-   * @param string $zone The name of the Google Compute Engine
-   * [zone](/compute/docs/zones#available) in which the cluster resides.
-   * @param string $operationId The server-assigned `name` of the operation.
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Container_Operation
-   */
-  public function get($projectId, $zone, $operationId, $optParams = array())
-  {
-    $params = array('projectId' => $projectId, 'zone' => $zone, 'operationId' => $operationId);
-    $params = array_merge($params, $optParams);
-    return $this->call('get', array($params), "Google_Service_Container_Operation");
-  }
-  /**
-   * Lists all operations in a project in a specific zone or all zones.
-   * (operations.listProjectsZonesOperations)
-   *
-   * @param string $projectId The Google Developers Console [project ID or project
-   * number](https://support.google.com/cloud/answer/6158840).
-   * @param string $zone The name of the Google Compute Engine
-   * [zone](/compute/docs/zones#available) to return operations for, or `-` for
-   * all zones.
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Container_ListOperationsResponse
-   */
-  public function listProjectsZonesOperations($projectId, $zone, $optParams = array())
-  {
-    $params = array('projectId' => $projectId, 'zone' => $zone);
-    $params = array_merge($params, $optParams);
-    return $this->call('list', array($params), "Google_Service_Container_ListOperationsResponse");
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Container/RollbackNodePoolUpgradeRequest.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Container/RollbackNodePoolUpgradeRequest.php
deleted file mode 100644
index 7054ca00..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Container/RollbackNodePoolUpgradeRequest.php
+++ /dev/null
@@ -1,20 +0,0 @@
-defaultClusterVersion = $defaultClusterVersion;
-  }
-  public function getDefaultClusterVersion()
-  {
-    return $this->defaultClusterVersion;
-  }
-  public function setDefaultImageType($defaultImageType)
-  {
-    $this->defaultImageType = $defaultImageType;
-  }
-  public function getDefaultImageType()
-  {
-    return $this->defaultImageType;
-  }
-  public function setValidImageTypes($validImageTypes)
-  {
-    $this->validImageTypes = $validImageTypes;
-  }
-  public function getValidImageTypes()
-  {
-    return $this->validImageTypes;
-  }
-  public function setValidMasterVersions($validMasterVersions)
-  {
-    $this->validMasterVersions = $validMasterVersions;
-  }
-  public function getValidMasterVersions()
-  {
-    return $this->validMasterVersions;
-  }
-  public function setValidNodeVersions($validNodeVersions)
-  {
-    $this->validNodeVersions = $validNodeVersions;
-  }
-  public function getValidNodeVersions()
-  {
-    return $this->validNodeVersions;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Container/SetNodePoolManagementRequest.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Container/SetNodePoolManagementRequest.php
deleted file mode 100644
index 591c099a..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Container/SetNodePoolManagementRequest.php
+++ /dev/null
@@ -1,31 +0,0 @@
-management = $management;
-  }
-  public function getManagement()
-  {
-    return $this->management;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Container/UpdateClusterRequest.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Container/UpdateClusterRequest.php
deleted file mode 100644
index 76f262c3..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Container/UpdateClusterRequest.php
+++ /dev/null
@@ -1,31 +0,0 @@
-update = $update;
-  }
-  public function getUpdate()
-  {
-    return $this->update;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Coordinate.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Coordinate.php
deleted file mode 100644
index 5d25c17f..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Coordinate.php
+++ /dev/null
@@ -1,467 +0,0 @@
-
- * Lets you view and manage jobs in a Coordinate team.

- *
- * 

- * For more information about this service, see the API
- * Documentation
- * 

- *
- * @author Google, Inc.
- */
-class Google_Service_Coordinate extends Google_Service
-{
-  /** View and manage your Google Maps Coordinate jobs. */
-  const COORDINATE =
-      "https://www.googleapis.com/auth/coordinate";
-  /** View your Google Coordinate jobs. */
-  const COORDINATE_READONLY =
-      "https://www.googleapis.com/auth/coordinate.readonly";
-
-  public $customFieldDef;
-  public $jobs;
-  public $location;
-  public $schedule;
-  public $team;
-  public $worker;
-  
-  /**
-   * Constructs the internal representation of the Coordinate service.
-   *
-   * @param Google_Client $client
-   */
-  public function __construct(Google_Client $client)
-  {
-    parent::__construct($client);
-    $this->rootUrl = 'https://www.googleapis.com/';
-    $this->servicePath = 'coordinate/v1/';
-    $this->version = 'v1';
-    $this->serviceName = 'coordinate';
-
-    $this->customFieldDef = new Google_Service_Coordinate_Resource_CustomFieldDef(
-        $this,
-        $this->serviceName,
-        'customFieldDef',
-        array(
-          'methods' => array(
-            'list' => array(
-              'path' => 'teams/{teamId}/custom_fields',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'teamId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),
-          )
-        )
-    );
-    $this->jobs = new Google_Service_Coordinate_Resource_Jobs(
-        $this,
-        $this->serviceName,
-        'jobs',
-        array(
-          'methods' => array(
-            'get' => array(
-              'path' => 'teams/{teamId}/jobs/{jobId}',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'teamId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'jobId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'insert' => array(
-              'path' => 'teams/{teamId}/jobs',
-              'httpMethod' => 'POST',
-              'parameters' => array(
-                'teamId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'address' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'lat' => array(
-                  'location' => 'query',
-                  'type' => 'number',
-                  'required' => true,
-                ),
-                'lng' => array(
-                  'location' => 'query',
-                  'type' => 'number',
-                  'required' => true,
-                ),
-                'title' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'assignee' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'customField' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                  'repeated' => true,
-                ),
-                'customerName' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'customerPhoneNumber' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'note' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-              ),
-            ),'list' => array(
-              'path' => 'teams/{teamId}/jobs',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'teamId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'maxResults' => array(
-                  'location' => 'query',
-                  'type' => 'integer',
-                ),
-                'minModifiedTimestampMs' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'omitJobChanges' => array(
-                  'location' => 'query',
-                  'type' => 'boolean',
-                ),
-                'pageToken' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-              ),
-            ),'patch' => array(
-              'path' => 'teams/{teamId}/jobs/{jobId}',
-              'httpMethod' => 'PATCH',
-              'parameters' => array(
-                'teamId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'jobId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'address' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'assignee' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'customField' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                  'repeated' => true,
-                ),
-                'customerName' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'customerPhoneNumber' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'lat' => array(
-                  'location' => 'query',
-                  'type' => 'number',
-                ),
-                'lng' => array(
-                  'location' => 'query',
-                  'type' => 'number',
-                ),
-                'note' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'progress' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'title' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-              ),
-            ),'update' => array(
-              'path' => 'teams/{teamId}/jobs/{jobId}',
-              'httpMethod' => 'PUT',
-              'parameters' => array(
-                'teamId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'jobId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'address' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'assignee' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'customField' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                  'repeated' => true,
-                ),
-                'customerName' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'customerPhoneNumber' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'lat' => array(
-                  'location' => 'query',
-                  'type' => 'number',
-                ),
-                'lng' => array(
-                  'location' => 'query',
-                  'type' => 'number',
-                ),
-                'note' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'progress' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'title' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-              ),
-            ),
-          )
-        )
-    );
-    $this->location = new Google_Service_Coordinate_Resource_Location(
-        $this,
-        $this->serviceName,
-        'location',
-        array(
-          'methods' => array(
-            'list' => array(
-              'path' => 'teams/{teamId}/workers/{workerEmail}/locations',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'teamId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'workerEmail' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'startTimestampMs' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'maxResults' => array(
-                  'location' => 'query',
-                  'type' => 'integer',
-                ),
-                'pageToken' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-              ),
-            ),
-          )
-        )
-    );
-    $this->schedule = new Google_Service_Coordinate_Resource_Schedule(
-        $this,
-        $this->serviceName,
-        'schedule',
-        array(
-          'methods' => array(
-            'get' => array(
-              'path' => 'teams/{teamId}/jobs/{jobId}/schedule',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'teamId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'jobId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'patch' => array(
-              'path' => 'teams/{teamId}/jobs/{jobId}/schedule',
-              'httpMethod' => 'PATCH',
-              'parameters' => array(
-                'teamId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'jobId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'allDay' => array(
-                  'location' => 'query',
-                  'type' => 'boolean',
-                ),
-                'duration' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'endTime' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'startTime' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-              ),
-            ),'update' => array(
-              'path' => 'teams/{teamId}/jobs/{jobId}/schedule',
-              'httpMethod' => 'PUT',
-              'parameters' => array(
-                'teamId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'jobId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'allDay' => array(
-                  'location' => 'query',
-                  'type' => 'boolean',
-                ),
-                'duration' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'endTime' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'startTime' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-              ),
-            ),
-          )
-        )
-    );
-    $this->team = new Google_Service_Coordinate_Resource_Team(
-        $this,
-        $this->serviceName,
-        'team',
-        array(
-          'methods' => array(
-            'list' => array(
-              'path' => 'teams',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'admin' => array(
-                  'location' => 'query',
-                  'type' => 'boolean',
-                ),
-                'dispatcher' => array(
-                  'location' => 'query',
-                  'type' => 'boolean',
-                ),
-                'worker' => array(
-                  'location' => 'query',
-                  'type' => 'boolean',
-                ),
-              ),
-            ),
-          )
-        )
-    );
-    $this->worker = new Google_Service_Coordinate_Resource_Worker(
-        $this,
-        $this->serviceName,
-        'worker',
-        array(
-          'methods' => array(
-            'list' => array(
-              'path' => 'teams/{teamId}/workers',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'teamId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),
-          )
-        )
-    );
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Coordinate/CustomField.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Coordinate/CustomField.php
deleted file mode 100644
index 13226bff..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Coordinate/CustomField.php
+++ /dev/null
@@ -1,48 +0,0 @@
-customFieldId = $customFieldId;
-  }
-  public function getCustomFieldId()
-  {
-    return $this->customFieldId;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setValue($value)
-  {
-    $this->value = $value;
-  }
-  public function getValue()
-  {
-    return $this->value;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Coordinate/CustomFieldDef.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Coordinate/CustomFieldDef.php
deleted file mode 100644
index 82a8837c..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Coordinate/CustomFieldDef.php
+++ /dev/null
@@ -1,86 +0,0 @@
-enabled = $enabled;
-  }
-  public function getEnabled()
-  {
-    return $this->enabled;
-  }
-  public function setEnumitems($enumitems)
-  {
-    $this->enumitems = $enumitems;
-  }
-  public function getEnumitems()
-  {
-    return $this->enumitems;
-  }
-  public function setId($id)
-  {
-    $this->id = $id;
-  }
-  public function getId()
-  {
-    return $this->id;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setName($name)
-  {
-    $this->name = $name;
-  }
-  public function getName()
-  {
-    return $this->name;
-  }
-  public function setRequiredForCheckout($requiredForCheckout)
-  {
-    $this->requiredForCheckout = $requiredForCheckout;
-  }
-  public function getRequiredForCheckout()
-  {
-    return $this->requiredForCheckout;
-  }
-  public function setType($type)
-  {
-    $this->type = $type;
-  }
-  public function getType()
-  {
-    return $this->type;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Coordinate/CustomFieldDefListResponse.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Coordinate/CustomFieldDefListResponse.php
deleted file mode 100644
index af1d038d..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Coordinate/CustomFieldDefListResponse.php
+++ /dev/null
@@ -1,41 +0,0 @@
-items = $items;
-  }
-  public function getItems()
-  {
-    return $this->items;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Coordinate/CustomFields.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Coordinate/CustomFields.php
deleted file mode 100644
index 32f9900c..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Coordinate/CustomFields.php
+++ /dev/null
@@ -1,41 +0,0 @@
-customField = $customField;
-  }
-  public function getCustomField()
-  {
-    return $this->customField;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Coordinate/EnumItemDef.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Coordinate/EnumItemDef.php
deleted file mode 100644
index 2086600a..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Coordinate/EnumItemDef.php
+++ /dev/null
@@ -1,48 +0,0 @@
-active = $active;
-  }
-  public function getActive()
-  {
-    return $this->active;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setValue($value)
-  {
-    $this->value = $value;
-  }
-  public function getValue()
-  {
-    return $this->value;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Coordinate/Job.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Coordinate/Job.php
deleted file mode 100644
index 4c6a337c..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Coordinate/Job.php
+++ /dev/null
@@ -1,60 +0,0 @@
-id = $id;
-  }
-  public function getId()
-  {
-    return $this->id;
-  }
-  public function setJobChange($jobChange)
-  {
-    $this->jobChange = $jobChange;
-  }
-  public function getJobChange()
-  {
-    return $this->jobChange;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setState(Google_Service_Coordinate_JobState $state)
-  {
-    $this->state = $state;
-  }
-  public function getState()
-  {
-    return $this->state;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Coordinate/JobChange.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Coordinate/JobChange.php
deleted file mode 100644
index a3e0611c..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Coordinate/JobChange.php
+++ /dev/null
@@ -1,49 +0,0 @@
-kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setState(Google_Service_Coordinate_JobState $state)
-  {
-    $this->state = $state;
-  }
-  public function getState()
-  {
-    return $this->state;
-  }
-  public function setTimestamp($timestamp)
-  {
-    $this->timestamp = $timestamp;
-  }
-  public function getTimestamp()
-  {
-    return $this->timestamp;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Coordinate/JobListResponse.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Coordinate/JobListResponse.php
deleted file mode 100644
index 0793fc41..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Coordinate/JobListResponse.php
+++ /dev/null
@@ -1,50 +0,0 @@
-items = $items;
-  }
-  public function getItems()
-  {
-    return $this->items;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setNextPageToken($nextPageToken)
-  {
-    $this->nextPageToken = $nextPageToken;
-  }
-  public function getNextPageToken()
-  {
-    return $this->nextPageToken;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Coordinate/JobState.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Coordinate/JobState.php
deleted file mode 100644
index c997d69d..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Coordinate/JobState.php
+++ /dev/null
@@ -1,105 +0,0 @@
-assignee = $assignee;
-  }
-  public function getAssignee()
-  {
-    return $this->assignee;
-  }
-  public function setCustomFields(Google_Service_Coordinate_CustomFields $customFields)
-  {
-    $this->customFields = $customFields;
-  }
-  public function getCustomFields()
-  {
-    return $this->customFields;
-  }
-  public function setCustomerName($customerName)
-  {
-    $this->customerName = $customerName;
-  }
-  public function getCustomerName()
-  {
-    return $this->customerName;
-  }
-  public function setCustomerPhoneNumber($customerPhoneNumber)
-  {
-    $this->customerPhoneNumber = $customerPhoneNumber;
-  }
-  public function getCustomerPhoneNumber()
-  {
-    return $this->customerPhoneNumber;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setLocation(Google_Service_Coordinate_Location $location)
-  {
-    $this->location = $location;
-  }
-  public function getLocation()
-  {
-    return $this->location;
-  }
-  public function setNote($note)
-  {
-    $this->note = $note;
-  }
-  public function getNote()
-  {
-    return $this->note;
-  }
-  public function setProgress($progress)
-  {
-    $this->progress = $progress;
-  }
-  public function getProgress()
-  {
-    return $this->progress;
-  }
-  public function setTitle($title)
-  {
-    $this->title = $title;
-  }
-  public function getTitle()
-  {
-    return $this->title;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Coordinate/Location.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Coordinate/Location.php
deleted file mode 100644
index 1b699eec..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Coordinate/Location.php
+++ /dev/null
@@ -1,58 +0,0 @@
-addressLine = $addressLine;
-  }
-  public function getAddressLine()
-  {
-    return $this->addressLine;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setLat($lat)
-  {
-    $this->lat = $lat;
-  }
-  public function getLat()
-  {
-    return $this->lat;
-  }
-  public function setLng($lng)
-  {
-    $this->lng = $lng;
-  }
-  public function getLng()
-  {
-    return $this->lng;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Coordinate/LocationListResponse.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Coordinate/LocationListResponse.php
deleted file mode 100644
index ac5334a9..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Coordinate/LocationListResponse.php
+++ /dev/null
@@ -1,60 +0,0 @@
-items = $items;
-  }
-  public function getItems()
-  {
-    return $this->items;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setNextPageToken($nextPageToken)
-  {
-    $this->nextPageToken = $nextPageToken;
-  }
-  public function getNextPageToken()
-  {
-    return $this->nextPageToken;
-  }
-  public function setTokenPagination(Google_Service_Coordinate_TokenPagination $tokenPagination)
-  {
-    $this->tokenPagination = $tokenPagination;
-  }
-  public function getTokenPagination()
-  {
-    return $this->tokenPagination;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Coordinate/LocationRecord.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Coordinate/LocationRecord.php
deleted file mode 100644
index 79a6839a..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Coordinate/LocationRecord.php
+++ /dev/null
@@ -1,66 +0,0 @@
-collectionTime = $collectionTime;
-  }
-  public function getCollectionTime()
-  {
-    return $this->collectionTime;
-  }
-  public function setConfidenceRadius($confidenceRadius)
-  {
-    $this->confidenceRadius = $confidenceRadius;
-  }
-  public function getConfidenceRadius()
-  {
-    return $this->confidenceRadius;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setLatitude($latitude)
-  {
-    $this->latitude = $latitude;
-  }
-  public function getLatitude()
-  {
-    return $this->latitude;
-  }
-  public function setLongitude($longitude)
-  {
-    $this->longitude = $longitude;
-  }
-  public function getLongitude()
-  {
-    return $this->longitude;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Coordinate/Resource/CustomFieldDef.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Coordinate/Resource/CustomFieldDef.php
deleted file mode 100644
index 59f814c1..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Coordinate/Resource/CustomFieldDef.php
+++ /dev/null
@@ -1,42 +0,0 @@
-
- *   $coordinateService = new Google_Service_Coordinate(...);
- *   $customFieldDef = $coordinateService->customFieldDef;
- *  
- */
-class Google_Service_Coordinate_Resource_CustomFieldDef extends Google_Service_Resource
-{
-  /**
-   * Retrieves a list of custom field definitions for a team.
-   * (customFieldDef.listCustomFieldDef)
-   *
-   * @param string $teamId Team ID
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Coordinate_CustomFieldDefListResponse
-   */
-  public function listCustomFieldDef($teamId, $optParams = array())
-  {
-    $params = array('teamId' => $teamId);
-    $params = array_merge($params, $optParams);
-    return $this->call('list', array($params), "Google_Service_Coordinate_CustomFieldDefListResponse");
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Coordinate/Resource/Jobs.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Coordinate/Resource/Jobs.php
deleted file mode 100644
index a6a3021a..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Coordinate/Resource/Jobs.php
+++ /dev/null
@@ -1,159 +0,0 @@
-
- *   $coordinateService = new Google_Service_Coordinate(...);
- *   $jobs = $coordinateService->jobs;
- *  
- */
-class Google_Service_Coordinate_Resource_Jobs extends Google_Service_Resource
-{
-  /**
-   * Retrieves a job, including all the changes made to the job. (jobs.get)
-   *
-   * @param string $teamId Team ID
-   * @param string $jobId Job number
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Coordinate_Job
-   */
-  public function get($teamId, $jobId, $optParams = array())
-  {
-    $params = array('teamId' => $teamId, 'jobId' => $jobId);
-    $params = array_merge($params, $optParams);
-    return $this->call('get', array($params), "Google_Service_Coordinate_Job");
-  }
-  /**
-   * Inserts a new job. Only the state field of the job should be set.
-   * (jobs.insert)
-   *
-   * @param string $teamId Team ID
-   * @param string $address Job address as newline (Unix) separated string
-   * @param double $lat The latitude coordinate of this job's location.
-   * @param double $lng The longitude coordinate of this job's location.
-   * @param string $title Job title
-   * @param Google_Service_Coordinate_Job $postBody
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param string assignee Assignee email address, or empty string to
-   * unassign.
-   * @opt_param string customField Sets the value of custom fields. To set a
-   * custom field, pass the field id (from /team/teamId/custom_fields), a URL
-   * escaped '=' character, and the desired value as a parameter. For example,
-   * customField=12%3DAlice. Repeat the parameter for each custom field. Note that
-   * '=' cannot appear in the parameter value. Specifying an invalid, or inactive
-   * enum field will result in an error 500.
-   * @opt_param string customerName Customer name
-   * @opt_param string customerPhoneNumber Customer phone number
-   * @opt_param string note Job note as newline (Unix) separated string
-   * @return Google_Service_Coordinate_Job
-   */
-  public function insert($teamId, $address, $lat, $lng, $title, Google_Service_Coordinate_Job $postBody, $optParams = array())
-  {
-    $params = array('teamId' => $teamId, 'address' => $address, 'lat' => $lat, 'lng' => $lng, 'title' => $title, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('insert', array($params), "Google_Service_Coordinate_Job");
-  }
-  /**
-   * Retrieves jobs created or modified since the given timestamp. (jobs.listJobs)
-   *
-   * @param string $teamId Team ID
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param string maxResults Maximum number of results to return in one page.
-   * @opt_param string minModifiedTimestampMs Minimum time a job was modified in
-   * milliseconds since epoch.
-   * @opt_param bool omitJobChanges Whether to omit detail job history
-   * information.
-   * @opt_param string pageToken Continuation token
-   * @return Google_Service_Coordinate_JobListResponse
-   */
-  public function listJobs($teamId, $optParams = array())
-  {
-    $params = array('teamId' => $teamId);
-    $params = array_merge($params, $optParams);
-    return $this->call('list', array($params), "Google_Service_Coordinate_JobListResponse");
-  }
-  /**
-   * Updates a job. Fields that are set in the job state will be updated. This
-   * method supports patch semantics. (jobs.patch)
-   *
-   * @param string $teamId Team ID
-   * @param string $jobId Job number
-   * @param Google_Service_Coordinate_Job $postBody
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param string address Job address as newline (Unix) separated string
-   * @opt_param string assignee Assignee email address, or empty string to
-   * unassign.
-   * @opt_param string customField Sets the value of custom fields. To set a
-   * custom field, pass the field id (from /team/teamId/custom_fields), a URL
-   * escaped '=' character, and the desired value as a parameter. For example,
-   * customField=12%3DAlice. Repeat the parameter for each custom field. Note that
-   * '=' cannot appear in the parameter value. Specifying an invalid, or inactive
-   * enum field will result in an error 500.
-   * @opt_param string customerName Customer name
-   * @opt_param string customerPhoneNumber Customer phone number
-   * @opt_param double lat The latitude coordinate of this job's location.
-   * @opt_param double lng The longitude coordinate of this job's location.
-   * @opt_param string note Job note as newline (Unix) separated string
-   * @opt_param string progress Job progress
-   * @opt_param string title Job title
-   * @return Google_Service_Coordinate_Job
-   */
-  public function patch($teamId, $jobId, Google_Service_Coordinate_Job $postBody, $optParams = array())
-  {
-    $params = array('teamId' => $teamId, 'jobId' => $jobId, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('patch', array($params), "Google_Service_Coordinate_Job");
-  }
-  /**
-   * Updates a job. Fields that are set in the job state will be updated.
-   * (jobs.update)
-   *
-   * @param string $teamId Team ID
-   * @param string $jobId Job number
-   * @param Google_Service_Coordinate_Job $postBody
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param string address Job address as newline (Unix) separated string
-   * @opt_param string assignee Assignee email address, or empty string to
-   * unassign.
-   * @opt_param string customField Sets the value of custom fields. To set a
-   * custom field, pass the field id (from /team/teamId/custom_fields), a URL
-   * escaped '=' character, and the desired value as a parameter. For example,
-   * customField=12%3DAlice. Repeat the parameter for each custom field. Note that
-   * '=' cannot appear in the parameter value. Specifying an invalid, or inactive
-   * enum field will result in an error 500.
-   * @opt_param string customerName Customer name
-   * @opt_param string customerPhoneNumber Customer phone number
-   * @opt_param double lat The latitude coordinate of this job's location.
-   * @opt_param double lng The longitude coordinate of this job's location.
-   * @opt_param string note Job note as newline (Unix) separated string
-   * @opt_param string progress Job progress
-   * @opt_param string title Job title
-   * @return Google_Service_Coordinate_Job
-   */
-  public function update($teamId, $jobId, Google_Service_Coordinate_Job $postBody, $optParams = array())
-  {
-    $params = array('teamId' => $teamId, 'jobId' => $jobId, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('update', array($params), "Google_Service_Coordinate_Job");
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Coordinate/Resource/Location.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Coordinate/Resource/Location.php
deleted file mode 100644
index e879bdaf..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Coordinate/Resource/Location.php
+++ /dev/null
@@ -1,47 +0,0 @@
-
- *   $coordinateService = new Google_Service_Coordinate(...);
- *   $location = $coordinateService->location;
- *  
- */
-class Google_Service_Coordinate_Resource_Location extends Google_Service_Resource
-{
-  /**
-   * Retrieves a list of locations for a worker. (location.listLocation)
-   *
-   * @param string $teamId Team ID
-   * @param string $workerEmail Worker email address.
-   * @param string $startTimestampMs Start timestamp in milliseconds since the
-   * epoch.
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param string maxResults Maximum number of results to return in one page.
-   * @opt_param string pageToken Continuation token
-   * @return Google_Service_Coordinate_LocationListResponse
-   */
-  public function listLocation($teamId, $workerEmail, $startTimestampMs, $optParams = array())
-  {
-    $params = array('teamId' => $teamId, 'workerEmail' => $workerEmail, 'startTimestampMs' => $startTimestampMs);
-    $params = array_merge($params, $optParams);
-    return $this->call('list', array($params), "Google_Service_Coordinate_LocationListResponse");
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Coordinate/Resource/Schedule.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Coordinate/Resource/Schedule.php
deleted file mode 100644
index 8978e4c1..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Coordinate/Resource/Schedule.php
+++ /dev/null
@@ -1,85 +0,0 @@
-
- *   $coordinateService = new Google_Service_Coordinate(...);
- *   $schedule = $coordinateService->schedule;
- *  
- */
-class Google_Service_Coordinate_Resource_Schedule extends Google_Service_Resource
-{
-  /**
-   * Retrieves the schedule for a job. (schedule.get)
-   *
-   * @param string $teamId Team ID
-   * @param string $jobId Job number
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Coordinate_Schedule
-   */
-  public function get($teamId, $jobId, $optParams = array())
-  {
-    $params = array('teamId' => $teamId, 'jobId' => $jobId);
-    $params = array_merge($params, $optParams);
-    return $this->call('get', array($params), "Google_Service_Coordinate_Schedule");
-  }
-  /**
-   * Replaces the schedule of a job with the provided schedule. This method
-   * supports patch semantics. (schedule.patch)
-   *
-   * @param string $teamId Team ID
-   * @param string $jobId Job number
-   * @param Google_Service_Coordinate_Schedule $postBody
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param bool allDay Whether the job is scheduled for the whole day. Time
-   * of day in start/end times is ignored if this is true.
-   * @opt_param string duration Job duration in milliseconds.
-   * @opt_param string endTime Scheduled end time in milliseconds since epoch.
-   * @opt_param string startTime Scheduled start time in milliseconds since epoch.
-   * @return Google_Service_Coordinate_Schedule
-   */
-  public function patch($teamId, $jobId, Google_Service_Coordinate_Schedule $postBody, $optParams = array())
-  {
-    $params = array('teamId' => $teamId, 'jobId' => $jobId, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('patch', array($params), "Google_Service_Coordinate_Schedule");
-  }
-  /**
-   * Replaces the schedule of a job with the provided schedule. (schedule.update)
-   *
-   * @param string $teamId Team ID
-   * @param string $jobId Job number
-   * @param Google_Service_Coordinate_Schedule $postBody
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param bool allDay Whether the job is scheduled for the whole day. Time
-   * of day in start/end times is ignored if this is true.
-   * @opt_param string duration Job duration in milliseconds.
-   * @opt_param string endTime Scheduled end time in milliseconds since epoch.
-   * @opt_param string startTime Scheduled start time in milliseconds since epoch.
-   * @return Google_Service_Coordinate_Schedule
-   */
-  public function update($teamId, $jobId, Google_Service_Coordinate_Schedule $postBody, $optParams = array())
-  {
-    $params = array('teamId' => $teamId, 'jobId' => $jobId, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('update', array($params), "Google_Service_Coordinate_Schedule");
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Coordinate/Resource/Team.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Coordinate/Resource/Team.php
deleted file mode 100644
index e3355321..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Coordinate/Resource/Team.php
+++ /dev/null
@@ -1,47 +0,0 @@
-
- *   $coordinateService = new Google_Service_Coordinate(...);
- *   $team = $coordinateService->team;
- *  
- */
-class Google_Service_Coordinate_Resource_Team extends Google_Service_Resource
-{
-  /**
-   * Retrieves a list of teams for a user. (team.listTeam)
-   *
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param bool admin Whether to include teams for which the user has the
-   * Admin role.
-   * @opt_param bool dispatcher Whether to include teams for which the user has
-   * the Dispatcher role.
-   * @opt_param bool worker Whether to include teams for which the user has the
-   * Worker role.
-   * @return Google_Service_Coordinate_TeamListResponse
-   */
-  public function listTeam($optParams = array())
-  {
-    $params = array();
-    $params = array_merge($params, $optParams);
-    return $this->call('list', array($params), "Google_Service_Coordinate_TeamListResponse");
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Coordinate/Resource/Worker.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Coordinate/Resource/Worker.php
deleted file mode 100644
index d01fc571..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Coordinate/Resource/Worker.php
+++ /dev/null
@@ -1,41 +0,0 @@
-
- *   $coordinateService = new Google_Service_Coordinate(...);
- *   $worker = $coordinateService->worker;
- *  
- */
-class Google_Service_Coordinate_Resource_Worker extends Google_Service_Resource
-{
-  /**
-   * Retrieves a list of workers in a team. (worker.listWorker)
-   *
-   * @param string $teamId Team ID
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Coordinate_WorkerListResponse
-   */
-  public function listWorker($teamId, $optParams = array())
-  {
-    $params = array('teamId' => $teamId);
-    $params = array_merge($params, $optParams);
-    return $this->call('list', array($params), "Google_Service_Coordinate_WorkerListResponse");
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Coordinate/Schedule.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Coordinate/Schedule.php
deleted file mode 100644
index dc75febe..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Coordinate/Schedule.php
+++ /dev/null
@@ -1,66 +0,0 @@
-allDay = $allDay;
-  }
-  public function getAllDay()
-  {
-    return $this->allDay;
-  }
-  public function setDuration($duration)
-  {
-    $this->duration = $duration;
-  }
-  public function getDuration()
-  {
-    return $this->duration;
-  }
-  public function setEndTime($endTime)
-  {
-    $this->endTime = $endTime;
-  }
-  public function getEndTime()
-  {
-    return $this->endTime;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setStartTime($startTime)
-  {
-    $this->startTime = $startTime;
-  }
-  public function getStartTime()
-  {
-    return $this->startTime;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Coordinate/Team.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Coordinate/Team.php
deleted file mode 100644
index 0fb51956..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Coordinate/Team.php
+++ /dev/null
@@ -1,48 +0,0 @@
-id = $id;
-  }
-  public function getId()
-  {
-    return $this->id;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setName($name)
-  {
-    $this->name = $name;
-  }
-  public function getName()
-  {
-    return $this->name;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Coordinate/TeamListResponse.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Coordinate/TeamListResponse.php
deleted file mode 100644
index fa86755c..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Coordinate/TeamListResponse.php
+++ /dev/null
@@ -1,41 +0,0 @@
-items = $items;
-  }
-  public function getItems()
-  {
-    return $this->items;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Coordinate/TokenPagination.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Coordinate/TokenPagination.php
deleted file mode 100644
index e66763ce..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Coordinate/TokenPagination.php
+++ /dev/null
@@ -1,48 +0,0 @@
-kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setNextPageToken($nextPageToken)
-  {
-    $this->nextPageToken = $nextPageToken;
-  }
-  public function getNextPageToken()
-  {
-    return $this->nextPageToken;
-  }
-  public function setPreviousPageToken($previousPageToken)
-  {
-    $this->previousPageToken = $previousPageToken;
-  }
-  public function getPreviousPageToken()
-  {
-    return $this->previousPageToken;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Coordinate/Worker.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Coordinate/Worker.php
deleted file mode 100644
index 1f078063..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Coordinate/Worker.php
+++ /dev/null
@@ -1,39 +0,0 @@
-id = $id;
-  }
-  public function getId()
-  {
-    return $this->id;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Coordinate/WorkerListResponse.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Coordinate/WorkerListResponse.php
deleted file mode 100644
index 39dfe75e..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Coordinate/WorkerListResponse.php
+++ /dev/null
@@ -1,41 +0,0 @@
-items = $items;
-  }
-  public function getItems()
-  {
-    return $this->items;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Customsearch.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Customsearch.php
deleted file mode 100644
index 568833c7..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Customsearch.php
+++ /dev/null
@@ -1,195 +0,0 @@
-
- * Lets you search over a website or collection of websites

- *
- * 

- * For more information about this service, see the API
- * Documentation
- * 

- *
- * @author Google, Inc.
- */
-class Google_Service_Customsearch extends Google_Service
-{
-
-
-  public $cse;
-  
-  /**
-   * Constructs the internal representation of the Customsearch service.
-   *
-   * @param Google_Client $client
-   */
-  public function __construct(Google_Client $client)
-  {
-    parent::__construct($client);
-    $this->rootUrl = 'https://www.googleapis.com/';
-    $this->servicePath = 'customsearch/';
-    $this->version = 'v1';
-    $this->serviceName = 'customsearch';
-
-    $this->cse = new Google_Service_Customsearch_Resource_Cse(
-        $this,
-        $this->serviceName,
-        'cse',
-        array(
-          'methods' => array(
-            'list' => array(
-              'path' => 'v1',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'q' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'c2coff' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'cr' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'cref' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'cx' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'dateRestrict' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'exactTerms' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'excludeTerms' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'fileType' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'filter' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'gl' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'googlehost' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'highRange' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'hl' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'hq' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'imgColorType' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'imgDominantColor' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'imgSize' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'imgType' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'linkSite' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'lowRange' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'lr' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'num' => array(
-                  'location' => 'query',
-                  'type' => 'integer',
-                ),
-                'orTerms' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'relatedSite' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'rights' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'safe' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'searchType' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'siteSearch' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'siteSearchFilter' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'sort' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'start' => array(
-                  'location' => 'query',
-                  'type' => 'integer',
-                ),
-              ),
-            ),
-          )
-        )
-    );
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Customsearch/Context.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Customsearch/Context.php
deleted file mode 100644
index e20a860c..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Customsearch/Context.php
+++ /dev/null
@@ -1,41 +0,0 @@
-facets = $facets;
-  }
-  public function getFacets()
-  {
-    return $this->facets;
-  }
-  public function setTitle($title)
-  {
-    $this->title = $title;
-  }
-  public function getTitle()
-  {
-    return $this->title;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Customsearch/ContextFacets.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Customsearch/ContextFacets.php
deleted file mode 100644
index ba8e5265..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Customsearch/ContextFacets.php
+++ /dev/null
@@ -1,51 +0,0 @@
- "label_with_op",
-  );
-  public $anchor;
-  public $label;
-  public $labelWithOp;
-
-  public function setAnchor($anchor)
-  {
-    $this->anchor = $anchor;
-  }
-  public function getAnchor()
-  {
-    return $this->anchor;
-  }
-  public function setLabel($label)
-  {
-    $this->label = $label;
-  }
-  public function getLabel()
-  {
-    return $this->label;
-  }
-  public function setLabelWithOp($labelWithOp)
-  {
-    $this->labelWithOp = $labelWithOp;
-  }
-  public function getLabelWithOp()
-  {
-    return $this->labelWithOp;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Customsearch/Promotion.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Customsearch/Promotion.php
deleted file mode 100644
index cda98fb0..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Customsearch/Promotion.php
+++ /dev/null
@@ -1,78 +0,0 @@
-bodyLines = $bodyLines;
-  }
-  public function getBodyLines()
-  {
-    return $this->bodyLines;
-  }
-  public function setDisplayLink($displayLink)
-  {
-    $this->displayLink = $displayLink;
-  }
-  public function getDisplayLink()
-  {
-    return $this->displayLink;
-  }
-  public function setHtmlTitle($htmlTitle)
-  {
-    $this->htmlTitle = $htmlTitle;
-  }
-  public function getHtmlTitle()
-  {
-    return $this->htmlTitle;
-  }
-  public function setImage(Google_Service_Customsearch_PromotionImage $image)
-  {
-    $this->image = $image;
-  }
-  public function getImage()
-  {
-    return $this->image;
-  }
-  public function setLink($link)
-  {
-    $this->link = $link;
-  }
-  public function getLink()
-  {
-    return $this->link;
-  }
-  public function setTitle($title)
-  {
-    $this->title = $title;
-  }
-  public function getTitle()
-  {
-    return $this->title;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Customsearch/PromotionBodyLines.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Customsearch/PromotionBodyLines.php
deleted file mode 100644
index 4201ddf0..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Customsearch/PromotionBodyLines.php
+++ /dev/null
@@ -1,57 +0,0 @@
-htmlTitle = $htmlTitle;
-  }
-  public function getHtmlTitle()
-  {
-    return $this->htmlTitle;
-  }
-  public function setLink($link)
-  {
-    $this->link = $link;
-  }
-  public function getLink()
-  {
-    return $this->link;
-  }
-  public function setTitle($title)
-  {
-    $this->title = $title;
-  }
-  public function getTitle()
-  {
-    return $this->title;
-  }
-  public function setUrl($url)
-  {
-    $this->url = $url;
-  }
-  public function getUrl()
-  {
-    return $this->url;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Customsearch/PromotionImage.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Customsearch/PromotionImage.php
deleted file mode 100644
index 475feb52..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Customsearch/PromotionImage.php
+++ /dev/null
@@ -1,48 +0,0 @@
-height = $height;
-  }
-  public function getHeight()
-  {
-    return $this->height;
-  }
-  public function setSource($source)
-  {
-    $this->source = $source;
-  }
-  public function getSource()
-  {
-    return $this->source;
-  }
-  public function setWidth($width)
-  {
-    $this->width = $width;
-  }
-  public function getWidth()
-  {
-    return $this->width;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Customsearch/Query.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Customsearch/Query.php
deleted file mode 100644
index 6c0e92c0..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Customsearch/Query.php
+++ /dev/null
@@ -1,354 +0,0 @@
-count = $count;
-  }
-  public function getCount()
-  {
-    return $this->count;
-  }
-  public function setCr($cr)
-  {
-    $this->cr = $cr;
-  }
-  public function getCr()
-  {
-    return $this->cr;
-  }
-  public function setCref($cref)
-  {
-    $this->cref = $cref;
-  }
-  public function getCref()
-  {
-    return $this->cref;
-  }
-  public function setCx($cx)
-  {
-    $this->cx = $cx;
-  }
-  public function getCx()
-  {
-    return $this->cx;
-  }
-  public function setDateRestrict($dateRestrict)
-  {
-    $this->dateRestrict = $dateRestrict;
-  }
-  public function getDateRestrict()
-  {
-    return $this->dateRestrict;
-  }
-  public function setDisableCnTwTranslation($disableCnTwTranslation)
-  {
-    $this->disableCnTwTranslation = $disableCnTwTranslation;
-  }
-  public function getDisableCnTwTranslation()
-  {
-    return $this->disableCnTwTranslation;
-  }
-  public function setExactTerms($exactTerms)
-  {
-    $this->exactTerms = $exactTerms;
-  }
-  public function getExactTerms()
-  {
-    return $this->exactTerms;
-  }
-  public function setExcludeTerms($excludeTerms)
-  {
-    $this->excludeTerms = $excludeTerms;
-  }
-  public function getExcludeTerms()
-  {
-    return $this->excludeTerms;
-  }
-  public function setFileType($fileType)
-  {
-    $this->fileType = $fileType;
-  }
-  public function getFileType()
-  {
-    return $this->fileType;
-  }
-  public function setFilter($filter)
-  {
-    $this->filter = $filter;
-  }
-  public function getFilter()
-  {
-    return $this->filter;
-  }
-  public function setGl($gl)
-  {
-    $this->gl = $gl;
-  }
-  public function getGl()
-  {
-    return $this->gl;
-  }
-  public function setGoogleHost($googleHost)
-  {
-    $this->googleHost = $googleHost;
-  }
-  public function getGoogleHost()
-  {
-    return $this->googleHost;
-  }
-  public function setHighRange($highRange)
-  {
-    $this->highRange = $highRange;
-  }
-  public function getHighRange()
-  {
-    return $this->highRange;
-  }
-  public function setHl($hl)
-  {
-    $this->hl = $hl;
-  }
-  public function getHl()
-  {
-    return $this->hl;
-  }
-  public function setHq($hq)
-  {
-    $this->hq = $hq;
-  }
-  public function getHq()
-  {
-    return $this->hq;
-  }
-  public function setImgColorType($imgColorType)
-  {
-    $this->imgColorType = $imgColorType;
-  }
-  public function getImgColorType()
-  {
-    return $this->imgColorType;
-  }
-  public function setImgDominantColor($imgDominantColor)
-  {
-    $this->imgDominantColor = $imgDominantColor;
-  }
-  public function getImgDominantColor()
-  {
-    return $this->imgDominantColor;
-  }
-  public function setImgSize($imgSize)
-  {
-    $this->imgSize = $imgSize;
-  }
-  public function getImgSize()
-  {
-    return $this->imgSize;
-  }
-  public function setImgType($imgType)
-  {
-    $this->imgType = $imgType;
-  }
-  public function getImgType()
-  {
-    return $this->imgType;
-  }
-  public function setInputEncoding($inputEncoding)
-  {
-    $this->inputEncoding = $inputEncoding;
-  }
-  public function getInputEncoding()
-  {
-    return $this->inputEncoding;
-  }
-  public function setLanguage($language)
-  {
-    $this->language = $language;
-  }
-  public function getLanguage()
-  {
-    return $this->language;
-  }
-  public function setLinkSite($linkSite)
-  {
-    $this->linkSite = $linkSite;
-  }
-  public function getLinkSite()
-  {
-    return $this->linkSite;
-  }
-  public function setLowRange($lowRange)
-  {
-    $this->lowRange = $lowRange;
-  }
-  public function getLowRange()
-  {
-    return $this->lowRange;
-  }
-  public function setOrTerms($orTerms)
-  {
-    $this->orTerms = $orTerms;
-  }
-  public function getOrTerms()
-  {
-    return $this->orTerms;
-  }
-  public function setOutputEncoding($outputEncoding)
-  {
-    $this->outputEncoding = $outputEncoding;
-  }
-  public function getOutputEncoding()
-  {
-    return $this->outputEncoding;
-  }
-  public function setRelatedSite($relatedSite)
-  {
-    $this->relatedSite = $relatedSite;
-  }
-  public function getRelatedSite()
-  {
-    return $this->relatedSite;
-  }
-  public function setRights($rights)
-  {
-    $this->rights = $rights;
-  }
-  public function getRights()
-  {
-    return $this->rights;
-  }
-  public function setSafe($safe)
-  {
-    $this->safe = $safe;
-  }
-  public function getSafe()
-  {
-    return $this->safe;
-  }
-  public function setSearchTerms($searchTerms)
-  {
-    $this->searchTerms = $searchTerms;
-  }
-  public function getSearchTerms()
-  {
-    return $this->searchTerms;
-  }
-  public function setSearchType($searchType)
-  {
-    $this->searchType = $searchType;
-  }
-  public function getSearchType()
-  {
-    return $this->searchType;
-  }
-  public function setSiteSearch($siteSearch)
-  {
-    $this->siteSearch = $siteSearch;
-  }
-  public function getSiteSearch()
-  {
-    return $this->siteSearch;
-  }
-  public function setSiteSearchFilter($siteSearchFilter)
-  {
-    $this->siteSearchFilter = $siteSearchFilter;
-  }
-  public function getSiteSearchFilter()
-  {
-    return $this->siteSearchFilter;
-  }
-  public function setSort($sort)
-  {
-    $this->sort = $sort;
-  }
-  public function getSort()
-  {
-    return $this->sort;
-  }
-  public function setStartIndex($startIndex)
-  {
-    $this->startIndex = $startIndex;
-  }
-  public function getStartIndex()
-  {
-    return $this->startIndex;
-  }
-  public function setStartPage($startPage)
-  {
-    $this->startPage = $startPage;
-  }
-  public function getStartPage()
-  {
-    return $this->startPage;
-  }
-  public function setTitle($title)
-  {
-    $this->title = $title;
-  }
-  public function getTitle()
-  {
-    return $this->title;
-  }
-  public function setTotalResults($totalResults)
-  {
-    $this->totalResults = $totalResults;
-  }
-  public function getTotalResults()
-  {
-    return $this->totalResults;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Customsearch/Resource/Cse.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Customsearch/Resource/Cse.php
deleted file mode 100644
index c70ebbf7..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Customsearch/Resource/Cse.php
+++ /dev/null
@@ -1,94 +0,0 @@
-
- *   $customsearchService = new Google_Service_Customsearch(...);
- *   $cse = $customsearchService->cse;
- *  
- */
-class Google_Service_Customsearch_Resource_Cse extends Google_Service_Resource
-{
-  /**
-   * Returns metadata about the search performed, metadata about the custom search
-   * engine used for the search, and the search results. (cse.listCse)
-   *
-   * @param string $q Query
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param string c2coff Turns off the translation between zh-CN and zh-TW.
-   * @opt_param string cr Country restrict(s).
-   * @opt_param string cref The URL of a linked custom search engine
-   * @opt_param string cx The custom search engine ID to scope this search query
-   * @opt_param string dateRestrict Specifies all search results are from a time
-   * period
-   * @opt_param string exactTerms Identifies a phrase that all documents in the
-   * search results must contain
-   * @opt_param string excludeTerms Identifies a word or phrase that should not
-   * appear in any documents in the search results
-   * @opt_param string fileType Returns images of a specified type. Some of the
-   * allowed values are: bmp, gif, png, jpg, svg, pdf, ...
-   * @opt_param string filter Controls turning on or off the duplicate content
-   * filter.
-   * @opt_param string gl Geolocation of end user.
-   * @opt_param string googlehost The local Google domain to use to perform the
-   * search.
-   * @opt_param string highRange Creates a range in form as_nlo value..as_nhi
-   * value and attempts to append it to query
-   * @opt_param string hl Sets the user interface language.
-   * @opt_param string hq Appends the extra query terms to the query.
-   * @opt_param string imgColorType Returns black and white, grayscale, or color
-   * images: mono, gray, and color.
-   * @opt_param string imgDominantColor Returns images of a specific dominant
-   * color: yellow, green, teal, blue, purple, pink, white, gray, black and brown.
-   * @opt_param string imgSize Returns images of a specified size, where size can
-   * be one of: icon, small, medium, large, xlarge, xxlarge, and huge.
-   * @opt_param string imgType Returns images of a type, which can be one of:
-   * clipart, face, lineart, news, and photo.
-   * @opt_param string linkSite Specifies that all search results should contain a
-   * link to a particular URL
-   * @opt_param string lowRange Creates a range in form as_nlo value..as_nhi value
-   * and attempts to append it to query
-   * @opt_param string lr The language restriction for the search results
-   * @opt_param string num Number of search results to return
-   * @opt_param string orTerms Provides additional search terms to check for in a
-   * document, where each document in the search results must contain at least one
-   * of the additional search terms
-   * @opt_param string relatedSite Specifies that all search results should be
-   * pages that are related to the specified URL
-   * @opt_param string rights Filters based on licensing. Supported values
-   * include: cc_publicdomain, cc_attribute, cc_sharealike, cc_noncommercial,
-   * cc_nonderived and combinations of these.
-   * @opt_param string safe Search safety level
-   * @opt_param string searchType Specifies the search type: image.
-   * @opt_param string siteSearch Specifies all search results should be pages
-   * from a given site
-   * @opt_param string siteSearchFilter Controls whether to include or exclude
-   * results from the site named in the as_sitesearch parameter
-   * @opt_param string sort The sort expression to apply to the results
-   * @opt_param string start The index of the first result to return
-   * @return Google_Service_Customsearch_Search
-   */
-  public function listCse($q, $optParams = array())
-  {
-    $params = array('q' => $q);
-    $params = array_merge($params, $optParams);
-    return $this->call('list', array($params), "Google_Service_Customsearch_Search");
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Customsearch/Result.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Customsearch/Result.php
deleted file mode 100644
index 8d32894f..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Customsearch/Result.php
+++ /dev/null
@@ -1,159 +0,0 @@
-cacheId = $cacheId;
-  }
-  public function getCacheId()
-  {
-    return $this->cacheId;
-  }
-  public function setDisplayLink($displayLink)
-  {
-    $this->displayLink = $displayLink;
-  }
-  public function getDisplayLink()
-  {
-    return $this->displayLink;
-  }
-  public function setFileFormat($fileFormat)
-  {
-    $this->fileFormat = $fileFormat;
-  }
-  public function getFileFormat()
-  {
-    return $this->fileFormat;
-  }
-  public function setFormattedUrl($formattedUrl)
-  {
-    $this->formattedUrl = $formattedUrl;
-  }
-  public function getFormattedUrl()
-  {
-    return $this->formattedUrl;
-  }
-  public function setHtmlFormattedUrl($htmlFormattedUrl)
-  {
-    $this->htmlFormattedUrl = $htmlFormattedUrl;
-  }
-  public function getHtmlFormattedUrl()
-  {
-    return $this->htmlFormattedUrl;
-  }
-  public function setHtmlSnippet($htmlSnippet)
-  {
-    $this->htmlSnippet = $htmlSnippet;
-  }
-  public function getHtmlSnippet()
-  {
-    return $this->htmlSnippet;
-  }
-  public function setHtmlTitle($htmlTitle)
-  {
-    $this->htmlTitle = $htmlTitle;
-  }
-  public function getHtmlTitle()
-  {
-    return $this->htmlTitle;
-  }
-  public function setImage(Google_Service_Customsearch_ResultImage $image)
-  {
-    $this->image = $image;
-  }
-  public function getImage()
-  {
-    return $this->image;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setLabels($labels)
-  {
-    $this->labels = $labels;
-  }
-  public function getLabels()
-  {
-    return $this->labels;
-  }
-  public function setLink($link)
-  {
-    $this->link = $link;
-  }
-  public function getLink()
-  {
-    return $this->link;
-  }
-  public function setMime($mime)
-  {
-    $this->mime = $mime;
-  }
-  public function getMime()
-  {
-    return $this->mime;
-  }
-  public function setPagemap($pagemap)
-  {
-    $this->pagemap = $pagemap;
-  }
-  public function getPagemap()
-  {
-    return $this->pagemap;
-  }
-  public function setSnippet($snippet)
-  {
-    $this->snippet = $snippet;
-  }
-  public function getSnippet()
-  {
-    return $this->snippet;
-  }
-  public function setTitle($title)
-  {
-    $this->title = $title;
-  }
-  public function getTitle()
-  {
-    return $this->title;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Customsearch/ResultImage.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Customsearch/ResultImage.php
deleted file mode 100644
index d48f967f..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Customsearch/ResultImage.php
+++ /dev/null
@@ -1,84 +0,0 @@
-byteSize = $byteSize;
-  }
-  public function getByteSize()
-  {
-    return $this->byteSize;
-  }
-  public function setContextLink($contextLink)
-  {
-    $this->contextLink = $contextLink;
-  }
-  public function getContextLink()
-  {
-    return $this->contextLink;
-  }
-  public function setHeight($height)
-  {
-    $this->height = $height;
-  }
-  public function getHeight()
-  {
-    return $this->height;
-  }
-  public function setThumbnailHeight($thumbnailHeight)
-  {
-    $this->thumbnailHeight = $thumbnailHeight;
-  }
-  public function getThumbnailHeight()
-  {
-    return $this->thumbnailHeight;
-  }
-  public function setThumbnailLink($thumbnailLink)
-  {
-    $this->thumbnailLink = $thumbnailLink;
-  }
-  public function getThumbnailLink()
-  {
-    return $this->thumbnailLink;
-  }
-  public function setThumbnailWidth($thumbnailWidth)
-  {
-    $this->thumbnailWidth = $thumbnailWidth;
-  }
-  public function getThumbnailWidth()
-  {
-    return $this->thumbnailWidth;
-  }
-  public function setWidth($width)
-  {
-    $this->width = $width;
-  }
-  public function getWidth()
-  {
-    return $this->width;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Customsearch/ResultLabels.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Customsearch/ResultLabels.php
deleted file mode 100644
index 8685e43e..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Customsearch/ResultLabels.php
+++ /dev/null
@@ -1,51 +0,0 @@
- "label_with_op",
-  );
-  public $displayName;
-  public $labelWithOp;
-  public $name;
-
-  public function setDisplayName($displayName)
-  {
-    $this->displayName = $displayName;
-  }
-  public function getDisplayName()
-  {
-    return $this->displayName;
-  }
-  public function setLabelWithOp($labelWithOp)
-  {
-    $this->labelWithOp = $labelWithOp;
-  }
-  public function getLabelWithOp()
-  {
-    return $this->labelWithOp;
-  }
-  public function setName($name)
-  {
-    $this->name = $name;
-  }
-  public function getName()
-  {
-    return $this->name;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Customsearch/Search.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Customsearch/Search.php
deleted file mode 100644
index be2c6836..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Customsearch/Search.php
+++ /dev/null
@@ -1,101 +0,0 @@
-context = $context;
-  }
-  public function getContext()
-  {
-    return $this->context;
-  }
-  public function setItems($items)
-  {
-    $this->items = $items;
-  }
-  public function getItems()
-  {
-    return $this->items;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setPromotions($promotions)
-  {
-    $this->promotions = $promotions;
-  }
-  public function getPromotions()
-  {
-    return $this->promotions;
-  }
-  public function setQueries($queries)
-  {
-    $this->queries = $queries;
-  }
-  public function getQueries()
-  {
-    return $this->queries;
-  }
-  public function setSearchInformation(Google_Service_Customsearch_SearchSearchInformation $searchInformation)
-  {
-    $this->searchInformation = $searchInformation;
-  }
-  public function getSearchInformation()
-  {
-    return $this->searchInformation;
-  }
-  public function setSpelling(Google_Service_Customsearch_SearchSpelling $spelling)
-  {
-    $this->spelling = $spelling;
-  }
-  public function getSpelling()
-  {
-    return $this->spelling;
-  }
-  public function setUrl(Google_Service_Customsearch_SearchUrl $url)
-  {
-    $this->url = $url;
-  }
-  public function getUrl()
-  {
-    return $this->url;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Customsearch/SearchSearchInformation.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Customsearch/SearchSearchInformation.php
deleted file mode 100644
index 8c8b787d..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Customsearch/SearchSearchInformation.php
+++ /dev/null
@@ -1,57 +0,0 @@
-formattedSearchTime = $formattedSearchTime;
-  }
-  public function getFormattedSearchTime()
-  {
-    return $this->formattedSearchTime;
-  }
-  public function setFormattedTotalResults($formattedTotalResults)
-  {
-    $this->formattedTotalResults = $formattedTotalResults;
-  }
-  public function getFormattedTotalResults()
-  {
-    return $this->formattedTotalResults;
-  }
-  public function setSearchTime($searchTime)
-  {
-    $this->searchTime = $searchTime;
-  }
-  public function getSearchTime()
-  {
-    return $this->searchTime;
-  }
-  public function setTotalResults($totalResults)
-  {
-    $this->totalResults = $totalResults;
-  }
-  public function getTotalResults()
-  {
-    return $this->totalResults;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Customsearch/SearchSpelling.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Customsearch/SearchSpelling.php
deleted file mode 100644
index bf5351e8..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Customsearch/SearchSpelling.php
+++ /dev/null
@@ -1,39 +0,0 @@
-correctedQuery = $correctedQuery;
-  }
-  public function getCorrectedQuery()
-  {
-    return $this->correctedQuery;
-  }
-  public function setHtmlCorrectedQuery($htmlCorrectedQuery)
-  {
-    $this->htmlCorrectedQuery = $htmlCorrectedQuery;
-  }
-  public function getHtmlCorrectedQuery()
-  {
-    return $this->htmlCorrectedQuery;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Customsearch/SearchUrl.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Customsearch/SearchUrl.php
deleted file mode 100644
index a89e160f..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Customsearch/SearchUrl.php
+++ /dev/null
@@ -1,39 +0,0 @@
-template = $template;
-  }
-  public function getTemplate()
-  {
-    return $this->template;
-  }
-  public function setType($type)
-  {
-    $this->type = $type;
-  }
-  public function getType()
-  {
-    return $this->type;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/DataTransfer.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/DataTransfer.php
deleted file mode 100644
index 8bb7f3b2..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/DataTransfer.php
+++ /dev/null
@@ -1,147 +0,0 @@
-
- * Transfers user data from one user to another.

- *
- * 

- * For more information about this service, see the API
- * Documentation
- * 

- *
- * @author Google, Inc.
- */
-class Google_Service_DataTransfer extends Google_Service
-{
-  /** View and manage data transfers between users in your organization. */
-  const ADMIN_DATATRANSFER =
-      "https://www.googleapis.com/auth/admin.datatransfer";
-  /** View data transfers between users in your organization. */
-  const ADMIN_DATATRANSFER_READONLY =
-      "https://www.googleapis.com/auth/admin.datatransfer.readonly";
-
-  public $applications;
-  public $transfers;
-  
-  /**
-   * Constructs the internal representation of the DataTransfer service.
-   *
-   * @param Google_Client $client
-   */
-  public function __construct(Google_Client $client)
-  {
-    parent::__construct($client);
-    $this->rootUrl = 'https://www.googleapis.com/';
-    $this->servicePath = 'admin/datatransfer/v1/';
-    $this->version = 'datatransfer_v1';
-    $this->serviceName = 'admin';
-
-    $this->applications = new Google_Service_DataTransfer_Resource_Applications(
-        $this,
-        $this->serviceName,
-        'applications',
-        array(
-          'methods' => array(
-            'get' => array(
-              'path' => 'applications/{applicationId}',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'applicationId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'list' => array(
-              'path' => 'applications',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'customerId' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'maxResults' => array(
-                  'location' => 'query',
-                  'type' => 'integer',
-                ),
-                'pageToken' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-              ),
-            ),
-          )
-        )
-    );
-    $this->transfers = new Google_Service_DataTransfer_Resource_Transfers(
-        $this,
-        $this->serviceName,
-        'transfers',
-        array(
-          'methods' => array(
-            'get' => array(
-              'path' => 'transfers/{dataTransferId}',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'dataTransferId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'insert' => array(
-              'path' => 'transfers',
-              'httpMethod' => 'POST',
-              'parameters' => array(),
-            ),'list' => array(
-              'path' => 'transfers',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'customerId' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'maxResults' => array(
-                  'location' => 'query',
-                  'type' => 'integer',
-                ),
-                'newOwnerUserId' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'oldOwnerUserId' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'pageToken' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'status' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-              ),
-            ),
-          )
-        )
-    );
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/DataTransfer/Application.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/DataTransfer/Application.php
deleted file mode 100644
index fe402a05..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/DataTransfer/Application.php
+++ /dev/null
@@ -1,68 +0,0 @@
-etag = $etag;
-  }
-  public function getEtag()
-  {
-    return $this->etag;
-  }
-  public function setId($id)
-  {
-    $this->id = $id;
-  }
-  public function getId()
-  {
-    return $this->id;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setName($name)
-  {
-    $this->name = $name;
-  }
-  public function getName()
-  {
-    return $this->name;
-  }
-  public function setTransferParams($transferParams)
-  {
-    $this->transferParams = $transferParams;
-  }
-  public function getTransferParams()
-  {
-    return $this->transferParams;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/DataTransfer/ApplicationDataTransfer.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/DataTransfer/ApplicationDataTransfer.php
deleted file mode 100644
index 3b701c9c..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/DataTransfer/ApplicationDataTransfer.php
+++ /dev/null
@@ -1,50 +0,0 @@
-applicationId = $applicationId;
-  }
-  public function getApplicationId()
-  {
-    return $this->applicationId;
-  }
-  public function setApplicationTransferParams($applicationTransferParams)
-  {
-    $this->applicationTransferParams = $applicationTransferParams;
-  }
-  public function getApplicationTransferParams()
-  {
-    return $this->applicationTransferParams;
-  }
-  public function setApplicationTransferStatus($applicationTransferStatus)
-  {
-    $this->applicationTransferStatus = $applicationTransferStatus;
-  }
-  public function getApplicationTransferStatus()
-  {
-    return $this->applicationTransferStatus;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/DataTransfer/ApplicationTransferParam.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/DataTransfer/ApplicationTransferParam.php
deleted file mode 100644
index d9ebbf5d..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/DataTransfer/ApplicationTransferParam.php
+++ /dev/null
@@ -1,40 +0,0 @@
-key = $key;
-  }
-  public function getKey()
-  {
-    return $this->key;
-  }
-  public function setValue($value)
-  {
-    $this->value = $value;
-  }
-  public function getValue()
-  {
-    return $this->value;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/DataTransfer/ApplicationsListResponse.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/DataTransfer/ApplicationsListResponse.php
deleted file mode 100644
index 4d7f5e05..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/DataTransfer/ApplicationsListResponse.php
+++ /dev/null
@@ -1,59 +0,0 @@
-applications = $applications;
-  }
-  public function getApplications()
-  {
-    return $this->applications;
-  }
-  public function setEtag($etag)
-  {
-    $this->etag = $etag;
-  }
-  public function getEtag()
-  {
-    return $this->etag;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setNextPageToken($nextPageToken)
-  {
-    $this->nextPageToken = $nextPageToken;
-  }
-  public function getNextPageToken()
-  {
-    return $this->nextPageToken;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/DataTransfer/DataTransfer.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/DataTransfer/DataTransfer.php
deleted file mode 100644
index 70b666ca..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/DataTransfer/DataTransfer.php
+++ /dev/null
@@ -1,95 +0,0 @@
-applicationDataTransfers = $applicationDataTransfers;
-  }
-  public function getApplicationDataTransfers()
-  {
-    return $this->applicationDataTransfers;
-  }
-  public function setEtag($etag)
-  {
-    $this->etag = $etag;
-  }
-  public function getEtag()
-  {
-    return $this->etag;
-  }
-  public function setId($id)
-  {
-    $this->id = $id;
-  }
-  public function getId()
-  {
-    return $this->id;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setNewOwnerUserId($newOwnerUserId)
-  {
-    $this->newOwnerUserId = $newOwnerUserId;
-  }
-  public function getNewOwnerUserId()
-  {
-    return $this->newOwnerUserId;
-  }
-  public function setOldOwnerUserId($oldOwnerUserId)
-  {
-    $this->oldOwnerUserId = $oldOwnerUserId;
-  }
-  public function getOldOwnerUserId()
-  {
-    return $this->oldOwnerUserId;
-  }
-  public function setOverallTransferStatusCode($overallTransferStatusCode)
-  {
-    $this->overallTransferStatusCode = $overallTransferStatusCode;
-  }
-  public function getOverallTransferStatusCode()
-  {
-    return $this->overallTransferStatusCode;
-  }
-  public function setRequestTime($requestTime)
-  {
-    $this->requestTime = $requestTime;
-  }
-  public function getRequestTime()
-  {
-    return $this->requestTime;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/DataTransfer/DataTransfersListResponse.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/DataTransfer/DataTransfersListResponse.php
deleted file mode 100644
index e4e016b1..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/DataTransfer/DataTransfersListResponse.php
+++ /dev/null
@@ -1,59 +0,0 @@
-dataTransfers = $dataTransfers;
-  }
-  public function getDataTransfers()
-  {
-    return $this->dataTransfers;
-  }
-  public function setEtag($etag)
-  {
-    $this->etag = $etag;
-  }
-  public function getEtag()
-  {
-    return $this->etag;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setNextPageToken($nextPageToken)
-  {
-    $this->nextPageToken = $nextPageToken;
-  }
-  public function getNextPageToken()
-  {
-    return $this->nextPageToken;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/DataTransfer/Resource/Applications.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/DataTransfer/Resource/Applications.php
deleted file mode 100644
index b16b46f8..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/DataTransfer/Resource/Applications.php
+++ /dev/null
@@ -1,60 +0,0 @@
-
- *   $adminService = new Google_Service_DataTransfer(...);
- *   $applications = $adminService->applications;
- *  
- */
-class Google_Service_DataTransfer_Resource_Applications extends Google_Service_Resource
-{
-  /**
-   * Retrieves information about an application for the given application ID.
-   * (applications.get)
-   *
-   * @param string $applicationId ID of the application resource to be retrieved.
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_DataTransfer_Application
-   */
-  public function get($applicationId, $optParams = array())
-  {
-    $params = array('applicationId' => $applicationId);
-    $params = array_merge($params, $optParams);
-    return $this->call('get', array($params), "Google_Service_DataTransfer_Application");
-  }
-  /**
-   * Lists the applications available for data transfer for a customer.
-   * (applications.listApplications)
-   *
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param string customerId Immutable ID of the Google Apps account.
-   * @opt_param int maxResults Maximum number of results to return. Default is
-   * 100.
-   * @opt_param string pageToken Token to specify next page in the list.
-   * @return Google_Service_DataTransfer_ApplicationsListResponse
-   */
-  public function listApplications($optParams = array())
-  {
-    $params = array();
-    $params = array_merge($params, $optParams);
-    return $this->call('list', array($params), "Google_Service_DataTransfer_ApplicationsListResponse");
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/DataTransfer/Resource/Transfers.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/DataTransfer/Resource/Transfers.php
deleted file mode 100644
index 34389dad..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/DataTransfer/Resource/Transfers.php
+++ /dev/null
@@ -1,76 +0,0 @@
-
- *   $adminService = new Google_Service_DataTransfer(...);
- *   $transfers = $adminService->transfers;
- *  
- */
-class Google_Service_DataTransfer_Resource_Transfers extends Google_Service_Resource
-{
-  /**
-   * Retrieves a data transfer request by its resource ID. (transfers.get)
-   *
-   * @param string $dataTransferId ID of the resource to be retrieved. This is
-   * returned in the response from the insert method.
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_DataTransfer_DataTransfer
-   */
-  public function get($dataTransferId, $optParams = array())
-  {
-    $params = array('dataTransferId' => $dataTransferId);
-    $params = array_merge($params, $optParams);
-    return $this->call('get', array($params), "Google_Service_DataTransfer_DataTransfer");
-  }
-  /**
-   * Inserts a data transfer request. (transfers.insert)
-   *
-   * @param Google_Service_DataTransfer_DataTransfer $postBody
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_DataTransfer_DataTransfer
-   */
-  public function insert(Google_Service_DataTransfer_DataTransfer $postBody, $optParams = array())
-  {
-    $params = array('postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('insert', array($params), "Google_Service_DataTransfer_DataTransfer");
-  }
-  /**
-   * Lists the transfers for a customer by source user, destination user, or
-   * status. (transfers.listTransfers)
-   *
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param string customerId Immutable ID of the Google Apps account.
-   * @opt_param int maxResults Maximum number of results to return. Default is
-   * 100.
-   * @opt_param string newOwnerUserId Destination user's profile ID.
-   * @opt_param string oldOwnerUserId Source user's profile ID.
-   * @opt_param string pageToken Token to specify the next page in the list.
-   * @opt_param string status Status of the transfer.
-   * @return Google_Service_DataTransfer_DataTransfersListResponse
-   */
-  public function listTransfers($optParams = array())
-  {
-    $params = array();
-    $params = array_merge($params, $optParams);
-    return $this->call('list', array($params), "Google_Service_DataTransfer_DataTransfersListResponse");
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dataflow.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dataflow.php
deleted file mode 100644
index a76d4dc8..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dataflow.php
+++ /dev/null
@@ -1,628 +0,0 @@
-
- * Manages Google Cloud Dataflow projects on Google Cloud Platform.

- *
- * 

- * For more information about this service, see the API
- * Documentation
- * 

- *
- * @author Google, Inc.
- */
-class Google_Service_Dataflow extends Google_Service
-{
-  /** View and manage your data across Google Cloud Platform services. */
-  const CLOUD_PLATFORM =
-      "https://www.googleapis.com/auth/cloud-platform";
-  /** View your email address. */
-  const USERINFO_EMAIL =
-      "https://www.googleapis.com/auth/userinfo.email";
-
-  public $projects;
-  public $projects_jobs;
-  public $projects_jobs_debug;
-  public $projects_jobs_messages;
-  public $projects_jobs_workItems;
-  public $projects_locations_jobs;
-  public $projects_locations_jobs_messages;
-  public $projects_locations_jobs_workItems;
-  public $projects_templates;
-  
-  /**
-   * Constructs the internal representation of the Dataflow service.
-   *
-   * @param Google_Client $client
-   */
-  public function __construct(Google_Client $client)
-  {
-    parent::__construct($client);
-    $this->rootUrl = 'https://dataflow.googleapis.com/';
-    $this->servicePath = '';
-    $this->version = 'v1b3';
-    $this->serviceName = 'dataflow';
-
-    $this->projects = new Google_Service_Dataflow_Resource_Projects(
-        $this,
-        $this->serviceName,
-        'projects',
-        array(
-          'methods' => array(
-            'workerMessages' => array(
-              'path' => 'v1b3/projects/{projectId}/WorkerMessages',
-              'httpMethod' => 'POST',
-              'parameters' => array(
-                'projectId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),
-          )
-        )
-    );
-    $this->projects_jobs = new Google_Service_Dataflow_Resource_ProjectsJobs(
-        $this,
-        $this->serviceName,
-        'jobs',
-        array(
-          'methods' => array(
-            'create' => array(
-              'path' => 'v1b3/projects/{projectId}/jobs',
-              'httpMethod' => 'POST',
-              'parameters' => array(
-                'projectId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'location' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'replaceJobId' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'view' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-              ),
-            ),'get' => array(
-              'path' => 'v1b3/projects/{projectId}/jobs/{jobId}',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'projectId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'jobId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'location' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'view' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-              ),
-            ),'getMetrics' => array(
-              'path' => 'v1b3/projects/{projectId}/jobs/{jobId}/metrics',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'projectId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'jobId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'startTime' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'location' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-              ),
-            ),'list' => array(
-              'path' => 'v1b3/projects/{projectId}/jobs',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'projectId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'filter' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'location' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'pageToken' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'pageSize' => array(
-                  'location' => 'query',
-                  'type' => 'integer',
-                ),
-                'view' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-              ),
-            ),'update' => array(
-              'path' => 'v1b3/projects/{projectId}/jobs/{jobId}',
-              'httpMethod' => 'PUT',
-              'parameters' => array(
-                'projectId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'jobId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'location' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-              ),
-            ),
-          )
-        )
-    );
-    $this->projects_jobs_debug = new Google_Service_Dataflow_Resource_ProjectsJobsDebug(
-        $this,
-        $this->serviceName,
-        'debug',
-        array(
-          'methods' => array(
-            'getConfig' => array(
-              'path' => 'v1b3/projects/{projectId}/jobs/{jobId}/debug/getConfig',
-              'httpMethod' => 'POST',
-              'parameters' => array(
-                'projectId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'jobId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'sendCapture' => array(
-              'path' => 'v1b3/projects/{projectId}/jobs/{jobId}/debug/sendCapture',
-              'httpMethod' => 'POST',
-              'parameters' => array(
-                'projectId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'jobId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),
-          )
-        )
-    );
-    $this->projects_jobs_messages = new Google_Service_Dataflow_Resource_ProjectsJobsMessages(
-        $this,
-        $this->serviceName,
-        'messages',
-        array(
-          'methods' => array(
-            'list' => array(
-              'path' => 'v1b3/projects/{projectId}/jobs/{jobId}/messages',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'projectId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'jobId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'endTime' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'location' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'pageToken' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'startTime' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'pageSize' => array(
-                  'location' => 'query',
-                  'type' => 'integer',
-                ),
-                'minimumImportance' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-              ),
-            ),
-          )
-        )
-    );
-    $this->projects_jobs_workItems = new Google_Service_Dataflow_Resource_ProjectsJobsWorkItems(
-        $this,
-        $this->serviceName,
-        'workItems',
-        array(
-          'methods' => array(
-            'lease' => array(
-              'path' => 'v1b3/projects/{projectId}/jobs/{jobId}/workItems:lease',
-              'httpMethod' => 'POST',
-              'parameters' => array(
-                'projectId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'jobId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'reportStatus' => array(
-              'path' => 'v1b3/projects/{projectId}/jobs/{jobId}/workItems:reportStatus',
-              'httpMethod' => 'POST',
-              'parameters' => array(
-                'projectId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'jobId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),
-          )
-        )
-    );
-    $this->projects_locations_jobs = new Google_Service_Dataflow_Resource_ProjectsLocationsJobs(
-        $this,
-        $this->serviceName,
-        'jobs',
-        array(
-          'methods' => array(
-            'create' => array(
-              'path' => 'v1b3/projects/{projectId}/locations/{location}/jobs',
-              'httpMethod' => 'POST',
-              'parameters' => array(
-                'projectId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'location' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'replaceJobId' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'view' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-              ),
-            ),'get' => array(
-              'path' => 'v1b3/projects/{projectId}/locations/{location}/jobs/{jobId}',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'projectId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'location' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'jobId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'view' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-              ),
-            ),'getMetrics' => array(
-              'path' => 'v1b3/projects/{projectId}/locations/{location}/jobs/{jobId}/metrics',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'projectId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'location' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'jobId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'startTime' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-              ),
-            ),'list' => array(
-              'path' => 'v1b3/projects/{projectId}/locations/{location}/jobs',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'projectId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'location' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'filter' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'pageToken' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'pageSize' => array(
-                  'location' => 'query',
-                  'type' => 'integer',
-                ),
-                'view' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-              ),
-            ),'update' => array(
-              'path' => 'v1b3/projects/{projectId}/locations/{location}/jobs/{jobId}',
-              'httpMethod' => 'PUT',
-              'parameters' => array(
-                'projectId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'location' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'jobId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),
-          )
-        )
-    );
-    $this->projects_locations_jobs_messages = new Google_Service_Dataflow_Resource_ProjectsLocationsJobsMessages(
-        $this,
-        $this->serviceName,
-        'messages',
-        array(
-          'methods' => array(
-            'list' => array(
-              'path' => 'v1b3/projects/{projectId}/locations/{location}/jobs/{jobId}/messages',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'projectId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'location' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'jobId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'endTime' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'startTime' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'pageToken' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'pageSize' => array(
-                  'location' => 'query',
-                  'type' => 'integer',
-                ),
-                'minimumImportance' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-              ),
-            ),
-          )
-        )
-    );
-    $this->projects_locations_jobs_workItems = new Google_Service_Dataflow_Resource_ProjectsLocationsJobsWorkItems(
-        $this,
-        $this->serviceName,
-        'workItems',
-        array(
-          'methods' => array(
-            'lease' => array(
-              'path' => 'v1b3/projects/{projectId}/locations/{location}/jobs/{jobId}/workItems:lease',
-              'httpMethod' => 'POST',
-              'parameters' => array(
-                'projectId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'location' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'jobId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'reportStatus' => array(
-              'path' => 'v1b3/projects/{projectId}/locations/{location}/jobs/{jobId}/workItems:reportStatus',
-              'httpMethod' => 'POST',
-              'parameters' => array(
-                'projectId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'location' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'jobId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),
-          )
-        )
-    );
-    $this->projects_templates = new Google_Service_Dataflow_Resource_ProjectsTemplates(
-        $this,
-        $this->serviceName,
-        'templates',
-        array(
-          'methods' => array(
-            'create' => array(
-              'path' => 'v1b3/projects/{projectId}/templates',
-              'httpMethod' => 'POST',
-              'parameters' => array(
-                'projectId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'get' => array(
-              'path' => 'v1b3/projects/{projectId}/templates:get',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'projectId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'view' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'gcsPath' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-              ),
-            ),'launch' => array(
-              'path' => 'v1b3/projects/{projectId}/templates:launch',
-              'httpMethod' => 'POST',
-              'parameters' => array(
-                'projectId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'gcsPath' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'dryRun' => array(
-                  'location' => 'query',
-                  'type' => 'boolean',
-                ),
-              ),
-            ),
-          )
-        )
-    );
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dataflow/ApproximateProgress.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dataflow/ApproximateProgress.php
deleted file mode 100644
index 8cb3234d..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dataflow/ApproximateProgress.php
+++ /dev/null
@@ -1,49 +0,0 @@
-percentComplete = $percentComplete;
-  }
-  public function getPercentComplete()
-  {
-    return $this->percentComplete;
-  }
-  public function setPosition(Google_Service_Dataflow_Position $position)
-  {
-    $this->position = $position;
-  }
-  public function getPosition()
-  {
-    return $this->position;
-  }
-  public function setRemainingTime($remainingTime)
-  {
-    $this->remainingTime = $remainingTime;
-  }
-  public function getRemainingTime()
-  {
-    return $this->remainingTime;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dataflow/ApproximateReportedProgress.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dataflow/ApproximateReportedProgress.php
deleted file mode 100644
index a74e93bc..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dataflow/ApproximateReportedProgress.php
+++ /dev/null
@@ -1,60 +0,0 @@
-consumedParallelism = $consumedParallelism;
-  }
-  public function getConsumedParallelism()
-  {
-    return $this->consumedParallelism;
-  }
-  public function setFractionConsumed($fractionConsumed)
-  {
-    $this->fractionConsumed = $fractionConsumed;
-  }
-  public function getFractionConsumed()
-  {
-    return $this->fractionConsumed;
-  }
-  public function setPosition(Google_Service_Dataflow_Position $position)
-  {
-    $this->position = $position;
-  }
-  public function getPosition()
-  {
-    return $this->position;
-  }
-  public function setRemainingParallelism(Google_Service_Dataflow_ReportedParallelism $remainingParallelism)
-  {
-    $this->remainingParallelism = $remainingParallelism;
-  }
-  public function getRemainingParallelism()
-  {
-    return $this->remainingParallelism;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dataflow/ApproximateSplitRequest.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dataflow/ApproximateSplitRequest.php
deleted file mode 100644
index f37e7ef2..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dataflow/ApproximateSplitRequest.php
+++ /dev/null
@@ -1,40 +0,0 @@
-fractionConsumed = $fractionConsumed;
-  }
-  public function getFractionConsumed()
-  {
-    return $this->fractionConsumed;
-  }
-  public function setPosition(Google_Service_Dataflow_Position $position)
-  {
-    $this->position = $position;
-  }
-  public function getPosition()
-  {
-    return $this->position;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dataflow/AutoscalingSettings.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dataflow/AutoscalingSettings.php
deleted file mode 100644
index 457ae2e9..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dataflow/AutoscalingSettings.php
+++ /dev/null
@@ -1,39 +0,0 @@
-algorithm = $algorithm;
-  }
-  public function getAlgorithm()
-  {
-    return $this->algorithm;
-  }
-  public function setMaxNumWorkers($maxNumWorkers)
-  {
-    $this->maxNumWorkers = $maxNumWorkers;
-  }
-  public function getMaxNumWorkers()
-  {
-    return $this->maxNumWorkers;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dataflow/CPUTime.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dataflow/CPUTime.php
deleted file mode 100644
index 346202f2..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dataflow/CPUTime.php
+++ /dev/null
@@ -1,48 +0,0 @@
-rate = $rate;
-  }
-  public function getRate()
-  {
-    return $this->rate;
-  }
-  public function setTimestamp($timestamp)
-  {
-    $this->timestamp = $timestamp;
-  }
-  public function getTimestamp()
-  {
-    return $this->timestamp;
-  }
-  public function setTotalMs($totalMs)
-  {
-    $this->totalMs = $totalMs;
-  }
-  public function getTotalMs()
-  {
-    return $this->totalMs;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dataflow/ComponentSource.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dataflow/ComponentSource.php
deleted file mode 100644
index 35860b7c..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dataflow/ComponentSource.php
+++ /dev/null
@@ -1,48 +0,0 @@
-name = $name;
-  }
-  public function getName()
-  {
-    return $this->name;
-  }
-  public function setOriginalTransformOrCollection($originalTransformOrCollection)
-  {
-    $this->originalTransformOrCollection = $originalTransformOrCollection;
-  }
-  public function getOriginalTransformOrCollection()
-  {
-    return $this->originalTransformOrCollection;
-  }
-  public function setUserName($userName)
-  {
-    $this->userName = $userName;
-  }
-  public function getUserName()
-  {
-    return $this->userName;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dataflow/ComponentTransform.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dataflow/ComponentTransform.php
deleted file mode 100644
index 7c2f1d9c..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dataflow/ComponentTransform.php
+++ /dev/null
@@ -1,48 +0,0 @@
-name = $name;
-  }
-  public function getName()
-  {
-    return $this->name;
-  }
-  public function setOriginalTransform($originalTransform)
-  {
-    $this->originalTransform = $originalTransform;
-  }
-  public function getOriginalTransform()
-  {
-    return $this->originalTransform;
-  }
-  public function setUserName($userName)
-  {
-    $this->userName = $userName;
-  }
-  public function getUserName()
-  {
-    return $this->userName;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dataflow/ComputationTopology.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dataflow/ComputationTopology.php
deleted file mode 100644
index f6b7b06a..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dataflow/ComputationTopology.php
+++ /dev/null
@@ -1,89 +0,0 @@
-computationId = $computationId;
-  }
-  public function getComputationId()
-  {
-    return $this->computationId;
-  }
-  public function setInputs($inputs)
-  {
-    $this->inputs = $inputs;
-  }
-  public function getInputs()
-  {
-    return $this->inputs;
-  }
-  public function setKeyRanges($keyRanges)
-  {
-    $this->keyRanges = $keyRanges;
-  }
-  public function getKeyRanges()
-  {
-    return $this->keyRanges;
-  }
-  public function setOutputs($outputs)
-  {
-    $this->outputs = $outputs;
-  }
-  public function getOutputs()
-  {
-    return $this->outputs;
-  }
-  public function setStateFamilies($stateFamilies)
-  {
-    $this->stateFamilies = $stateFamilies;
-  }
-  public function getStateFamilies()
-  {
-    return $this->stateFamilies;
-  }
-  public function setSystemStageName($systemStageName)
-  {
-    $this->systemStageName = $systemStageName;
-  }
-  public function getSystemStageName()
-  {
-    return $this->systemStageName;
-  }
-  public function setUserStageName($userStageName)
-  {
-    $this->userStageName = $userStageName;
-  }
-  public function getUserStageName()
-  {
-    return $this->userStageName;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dataflow/ConcatPosition.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dataflow/ConcatPosition.php
deleted file mode 100644
index 06f884a9..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dataflow/ConcatPosition.php
+++ /dev/null
@@ -1,40 +0,0 @@
-index = $index;
-  }
-  public function getIndex()
-  {
-    return $this->index;
-  }
-  public function setPosition(Google_Service_Dataflow_Position $position)
-  {
-    $this->position = $position;
-  }
-  public function getPosition()
-  {
-    return $this->position;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dataflow/CounterMetadata.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dataflow/CounterMetadata.php
deleted file mode 100644
index d0546068..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dataflow/CounterMetadata.php
+++ /dev/null
@@ -1,57 +0,0 @@
-description = $description;
-  }
-  public function getDescription()
-  {
-    return $this->description;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setOtherUnits($otherUnits)
-  {
-    $this->otherUnits = $otherUnits;
-  }
-  public function getOtherUnits()
-  {
-    return $this->otherUnits;
-  }
-  public function setStandardUnits($standardUnits)
-  {
-    $this->standardUnits = $standardUnits;
-  }
-  public function getStandardUnits()
-  {
-    return $this->standardUnits;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dataflow/CounterStructuredName.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dataflow/CounterStructuredName.php
deleted file mode 100644
index defd6b1e..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dataflow/CounterStructuredName.php
+++ /dev/null
@@ -1,93 +0,0 @@
-componentStepName = $componentStepName;
-  }
-  public function getComponentStepName()
-  {
-    return $this->componentStepName;
-  }
-  public function setExecutionStepName($executionStepName)
-  {
-    $this->executionStepName = $executionStepName;
-  }
-  public function getExecutionStepName()
-  {
-    return $this->executionStepName;
-  }
-  public function setName($name)
-  {
-    $this->name = $name;
-  }
-  public function getName()
-  {
-    return $this->name;
-  }
-  public function setOrigin($origin)
-  {
-    $this->origin = $origin;
-  }
-  public function getOrigin()
-  {
-    return $this->origin;
-  }
-  public function setOriginNamespace($originNamespace)
-  {
-    $this->originNamespace = $originNamespace;
-  }
-  public function getOriginNamespace()
-  {
-    return $this->originNamespace;
-  }
-  public function setOriginalStepName($originalStepName)
-  {
-    $this->originalStepName = $originalStepName;
-  }
-  public function getOriginalStepName()
-  {
-    return $this->originalStepName;
-  }
-  public function setPortion($portion)
-  {
-    $this->portion = $portion;
-  }
-  public function getPortion()
-  {
-    return $this->portion;
-  }
-  public function setWorkerId($workerId)
-  {
-    $this->workerId = $workerId;
-  }
-  public function getWorkerId()
-  {
-    return $this->workerId;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dataflow/CounterStructuredNameAndMetadata.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dataflow/CounterStructuredNameAndMetadata.php
deleted file mode 100644
index 4d22eaf3..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dataflow/CounterStructuredNameAndMetadata.php
+++ /dev/null
@@ -1,41 +0,0 @@
-metadata = $metadata;
-  }
-  public function getMetadata()
-  {
-    return $this->metadata;
-  }
-  public function setName(Google_Service_Dataflow_CounterStructuredName $name)
-  {
-    $this->name = $name;
-  }
-  public function getName()
-  {
-    return $this->name;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dataflow/CounterUpdate.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dataflow/CounterUpdate.php
deleted file mode 100644
index 025d61b3..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dataflow/CounterUpdate.php
+++ /dev/null
@@ -1,156 +0,0 @@
-boolean = $boolean;
-  }
-  public function getBoolean()
-  {
-    return $this->boolean;
-  }
-  public function setCumulative($cumulative)
-  {
-    $this->cumulative = $cumulative;
-  }
-  public function getCumulative()
-  {
-    return $this->cumulative;
-  }
-  public function setDistribution(Google_Service_Dataflow_DistributionUpdate $distribution)
-  {
-    $this->distribution = $distribution;
-  }
-  public function getDistribution()
-  {
-    return $this->distribution;
-  }
-  public function setFloatingPoint($floatingPoint)
-  {
-    $this->floatingPoint = $floatingPoint;
-  }
-  public function getFloatingPoint()
-  {
-    return $this->floatingPoint;
-  }
-  public function setFloatingPointList(Google_Service_Dataflow_FloatingPointList $floatingPointList)
-  {
-    $this->floatingPointList = $floatingPointList;
-  }
-  public function getFloatingPointList()
-  {
-    return $this->floatingPointList;
-  }
-  public function setFloatingPointMean(Google_Service_Dataflow_FloatingPointMean $floatingPointMean)
-  {
-    $this->floatingPointMean = $floatingPointMean;
-  }
-  public function getFloatingPointMean()
-  {
-    return $this->floatingPointMean;
-  }
-  public function setInteger(Google_Service_Dataflow_SplitInt64 $integer)
-  {
-    $this->integer = $integer;
-  }
-  public function getInteger()
-  {
-    return $this->integer;
-  }
-  public function setIntegerList(Google_Service_Dataflow_IntegerList $integerList)
-  {
-    $this->integerList = $integerList;
-  }
-  public function getIntegerList()
-  {
-    return $this->integerList;
-  }
-  public function setIntegerMean(Google_Service_Dataflow_IntegerMean $integerMean)
-  {
-    $this->integerMean = $integerMean;
-  }
-  public function getIntegerMean()
-  {
-    return $this->integerMean;
-  }
-  public function setInternal($internal)
-  {
-    $this->internal = $internal;
-  }
-  public function getInternal()
-  {
-    return $this->internal;
-  }
-  public function setNameAndKind(Google_Service_Dataflow_NameAndKind $nameAndKind)
-  {
-    $this->nameAndKind = $nameAndKind;
-  }
-  public function getNameAndKind()
-  {
-    return $this->nameAndKind;
-  }
-  public function setShortId($shortId)
-  {
-    $this->shortId = $shortId;
-  }
-  public function getShortId()
-  {
-    return $this->shortId;
-  }
-  public function setStringList(Google_Service_Dataflow_StringList $stringList)
-  {
-    $this->stringList = $stringList;
-  }
-  public function getStringList()
-  {
-    return $this->stringList;
-  }
-  public function setStructuredNameAndMetadata(Google_Service_Dataflow_CounterStructuredNameAndMetadata $structuredNameAndMetadata)
-  {
-    $this->structuredNameAndMetadata = $structuredNameAndMetadata;
-  }
-  public function getStructuredNameAndMetadata()
-  {
-    return $this->structuredNameAndMetadata;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dataflow/CreateJobFromTemplateRequest.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dataflow/CreateJobFromTemplateRequest.php
deleted file mode 100644
index 5d95c17e..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dataflow/CreateJobFromTemplateRequest.php
+++ /dev/null
@@ -1,58 +0,0 @@
-environment = $environment;
-  }
-  public function getEnvironment()
-  {
-    return $this->environment;
-  }
-  public function setGcsPath($gcsPath)
-  {
-    $this->gcsPath = $gcsPath;
-  }
-  public function getGcsPath()
-  {
-    return $this->gcsPath;
-  }
-  public function setJobName($jobName)
-  {
-    $this->jobName = $jobName;
-  }
-  public function getJobName()
-  {
-    return $this->jobName;
-  }
-  public function setParameters($parameters)
-  {
-    $this->parameters = $parameters;
-  }
-  public function getParameters()
-  {
-    return $this->parameters;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dataflow/CustomSourceLocation.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dataflow/CustomSourceLocation.php
deleted file mode 100644
index 953c4d66..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dataflow/CustomSourceLocation.php
+++ /dev/null
@@ -1,30 +0,0 @@
-stateful = $stateful;
-  }
-  public function getStateful()
-  {
-    return $this->stateful;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dataflow/DataDiskAssignment.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dataflow/DataDiskAssignment.php
deleted file mode 100644
index dc94b888..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dataflow/DataDiskAssignment.php
+++ /dev/null
@@ -1,40 +0,0 @@
-dataDisks = $dataDisks;
-  }
-  public function getDataDisks()
-  {
-    return $this->dataDisks;
-  }
-  public function setVmInstance($vmInstance)
-  {
-    $this->vmInstance = $vmInstance;
-  }
-  public function getVmInstance()
-  {
-    return $this->vmInstance;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dataflow/DerivedSource.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dataflow/DerivedSource.php
deleted file mode 100644
index 26c6d0ac..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dataflow/DerivedSource.php
+++ /dev/null
@@ -1,40 +0,0 @@
-derivationMode = $derivationMode;
-  }
-  public function getDerivationMode()
-  {
-    return $this->derivationMode;
-  }
-  public function setSource(Google_Service_Dataflow_Source $source)
-  {
-    $this->source = $source;
-  }
-  public function getSource()
-  {
-    return $this->source;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dataflow/Disk.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dataflow/Disk.php
deleted file mode 100644
index 510ab3e0..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dataflow/Disk.php
+++ /dev/null
@@ -1,48 +0,0 @@
-diskType = $diskType;
-  }
-  public function getDiskType()
-  {
-    return $this->diskType;
-  }
-  public function setMountPoint($mountPoint)
-  {
-    $this->mountPoint = $mountPoint;
-  }
-  public function getMountPoint()
-  {
-    return $this->mountPoint;
-  }
-  public function setSizeGb($sizeGb)
-  {
-    $this->sizeGb = $sizeGb;
-  }
-  public function getSizeGb()
-  {
-    return $this->sizeGb;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dataflow/DisplayData.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dataflow/DisplayData.php
deleted file mode 100644
index 5755a466..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dataflow/DisplayData.php
+++ /dev/null
@@ -1,129 +0,0 @@
-boolValue = $boolValue;
-  }
-  public function getBoolValue()
-  {
-    return $this->boolValue;
-  }
-  public function setDurationValue($durationValue)
-  {
-    $this->durationValue = $durationValue;
-  }
-  public function getDurationValue()
-  {
-    return $this->durationValue;
-  }
-  public function setFloatValue($floatValue)
-  {
-    $this->floatValue = $floatValue;
-  }
-  public function getFloatValue()
-  {
-    return $this->floatValue;
-  }
-  public function setInt64Value($int64Value)
-  {
-    $this->int64Value = $int64Value;
-  }
-  public function getInt64Value()
-  {
-    return $this->int64Value;
-  }
-  public function setJavaClassValue($javaClassValue)
-  {
-    $this->javaClassValue = $javaClassValue;
-  }
-  public function getJavaClassValue()
-  {
-    return $this->javaClassValue;
-  }
-  public function setKey($key)
-  {
-    $this->key = $key;
-  }
-  public function getKey()
-  {
-    return $this->key;
-  }
-  public function setLabel($label)
-  {
-    $this->label = $label;
-  }
-  public function getLabel()
-  {
-    return $this->label;
-  }
-  public function setNamespace($namespace)
-  {
-    $this->namespace = $namespace;
-  }
-  public function getNamespace()
-  {
-    return $this->namespace;
-  }
-  public function setShortStrValue($shortStrValue)
-  {
-    $this->shortStrValue = $shortStrValue;
-  }
-  public function getShortStrValue()
-  {
-    return $this->shortStrValue;
-  }
-  public function setStrValue($strValue)
-  {
-    $this->strValue = $strValue;
-  }
-  public function getStrValue()
-  {
-    return $this->strValue;
-  }
-  public function setTimestampValue($timestampValue)
-  {
-    $this->timestampValue = $timestampValue;
-  }
-  public function getTimestampValue()
-  {
-    return $this->timestampValue;
-  }
-  public function setUrl($url)
-  {
-    $this->url = $url;
-  }
-  public function getUrl()
-  {
-    return $this->url;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dataflow/DistributionUpdate.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dataflow/DistributionUpdate.php
deleted file mode 100644
index 0776ed81..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dataflow/DistributionUpdate.php
+++ /dev/null
@@ -1,70 +0,0 @@
-count = $count;
-  }
-  public function getCount()
-  {
-    return $this->count;
-  }
-  public function setMax(Google_Service_Dataflow_SplitInt64 $max)
-  {
-    $this->max = $max;
-  }
-  public function getMax()
-  {
-    return $this->max;
-  }
-  public function setMin(Google_Service_Dataflow_SplitInt64 $min)
-  {
-    $this->min = $min;
-  }
-  public function getMin()
-  {
-    return $this->min;
-  }
-  public function setSum(Google_Service_Dataflow_SplitInt64 $sum)
-  {
-    $this->sum = $sum;
-  }
-  public function getSum()
-  {
-    return $this->sum;
-  }
-  public function setSumOfSquares($sumOfSquares)
-  {
-    $this->sumOfSquares = $sumOfSquares;
-  }
-  public function getSumOfSquares()
-  {
-    return $this->sumOfSquares;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dataflow/DynamicSourceSplit.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dataflow/DynamicSourceSplit.php
deleted file mode 100644
index e7eb306e..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dataflow/DynamicSourceSplit.php
+++ /dev/null
@@ -1,41 +0,0 @@
-primary = $primary;
-  }
-  public function getPrimary()
-  {
-    return $this->primary;
-  }
-  public function setResidual(Google_Service_Dataflow_DerivedSource $residual)
-  {
-    $this->residual = $residual;
-  }
-  public function getResidual()
-  {
-    return $this->residual;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dataflow/Environment.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dataflow/Environment.php
deleted file mode 100644
index 893044cc..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dataflow/Environment.php
+++ /dev/null
@@ -1,113 +0,0 @@
-clusterManagerApiService = $clusterManagerApiService;
-  }
-  public function getClusterManagerApiService()
-  {
-    return $this->clusterManagerApiService;
-  }
-  public function setDataset($dataset)
-  {
-    $this->dataset = $dataset;
-  }
-  public function getDataset()
-  {
-    return $this->dataset;
-  }
-  public function setExperiments($experiments)
-  {
-    $this->experiments = $experiments;
-  }
-  public function getExperiments()
-  {
-    return $this->experiments;
-  }
-  public function setInternalExperiments($internalExperiments)
-  {
-    $this->internalExperiments = $internalExperiments;
-  }
-  public function getInternalExperiments()
-  {
-    return $this->internalExperiments;
-  }
-  public function setSdkPipelineOptions($sdkPipelineOptions)
-  {
-    $this->sdkPipelineOptions = $sdkPipelineOptions;
-  }
-  public function getSdkPipelineOptions()
-  {
-    return $this->sdkPipelineOptions;
-  }
-  public function setServiceAccountEmail($serviceAccountEmail)
-  {
-    $this->serviceAccountEmail = $serviceAccountEmail;
-  }
-  public function getServiceAccountEmail()
-  {
-    return $this->serviceAccountEmail;
-  }
-  public function setTempStoragePrefix($tempStoragePrefix)
-  {
-    $this->tempStoragePrefix = $tempStoragePrefix;
-  }
-  public function getTempStoragePrefix()
-  {
-    return $this->tempStoragePrefix;
-  }
-  public function setUserAgent($userAgent)
-  {
-    $this->userAgent = $userAgent;
-  }
-  public function getUserAgent()
-  {
-    return $this->userAgent;
-  }
-  public function setVersion($version)
-  {
-    $this->version = $version;
-  }
-  public function getVersion()
-  {
-    return $this->version;
-  }
-  public function setWorkerPools($workerPools)
-  {
-    $this->workerPools = $workerPools;
-  }
-  public function getWorkerPools()
-  {
-    return $this->workerPools;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dataflow/ExecutionStageSummary.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dataflow/ExecutionStageSummary.php
deleted file mode 100644
index 0015f6ff..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dataflow/ExecutionStageSummary.php
+++ /dev/null
@@ -1,89 +0,0 @@
-componentSource = $componentSource;
-  }
-  public function getComponentSource()
-  {
-    return $this->componentSource;
-  }
-  public function setComponentTransform($componentTransform)
-  {
-    $this->componentTransform = $componentTransform;
-  }
-  public function getComponentTransform()
-  {
-    return $this->componentTransform;
-  }
-  public function setId($id)
-  {
-    $this->id = $id;
-  }
-  public function getId()
-  {
-    return $this->id;
-  }
-  public function setInputSource($inputSource)
-  {
-    $this->inputSource = $inputSource;
-  }
-  public function getInputSource()
-  {
-    return $this->inputSource;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setName($name)
-  {
-    $this->name = $name;
-  }
-  public function getName()
-  {
-    return $this->name;
-  }
-  public function setOutputSource($outputSource)
-  {
-    $this->outputSource = $outputSource;
-  }
-  public function getOutputSource()
-  {
-    return $this->outputSource;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dataflow/FailedLocation.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dataflow/FailedLocation.php
deleted file mode 100644
index 86ad9bf0..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dataflow/FailedLocation.php
+++ /dev/null
@@ -1,30 +0,0 @@
-name = $name;
-  }
-  public function getName()
-  {
-    return $this->name;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dataflow/FlattenInstruction.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dataflow/FlattenInstruction.php
deleted file mode 100644
index b553b04f..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dataflow/FlattenInstruction.php
+++ /dev/null
@@ -1,32 +0,0 @@
-inputs = $inputs;
-  }
-  public function getInputs()
-  {
-    return $this->inputs;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dataflow/FloatingPointList.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dataflow/FloatingPointList.php
deleted file mode 100644
index 82c587e6..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dataflow/FloatingPointList.php
+++ /dev/null
@@ -1,31 +0,0 @@
-elements = $elements;
-  }
-  public function getElements()
-  {
-    return $this->elements;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dataflow/FloatingPointMean.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dataflow/FloatingPointMean.php
deleted file mode 100644
index 344fff82..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dataflow/FloatingPointMean.php
+++ /dev/null
@@ -1,40 +0,0 @@
-count = $count;
-  }
-  public function getCount()
-  {
-    return $this->count;
-  }
-  public function setSum($sum)
-  {
-    $this->sum = $sum;
-  }
-  public function getSum()
-  {
-    return $this->sum;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dataflow/GetDebugConfigRequest.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dataflow/GetDebugConfigRequest.php
deleted file mode 100644
index 0b9c5738..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dataflow/GetDebugConfigRequest.php
+++ /dev/null
@@ -1,39 +0,0 @@
-componentId = $componentId;
-  }
-  public function getComponentId()
-  {
-    return $this->componentId;
-  }
-  public function setWorkerId($workerId)
-  {
-    $this->workerId = $workerId;
-  }
-  public function getWorkerId()
-  {
-    return $this->workerId;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dataflow/GetDebugConfigResponse.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dataflow/GetDebugConfigResponse.php
deleted file mode 100644
index e5e033e8..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dataflow/GetDebugConfigResponse.php
+++ /dev/null
@@ -1,30 +0,0 @@
-config = $config;
-  }
-  public function getConfig()
-  {
-    return $this->config;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dataflow/GetTemplateResponse.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dataflow/GetTemplateResponse.php
deleted file mode 100644
index 532ac258..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dataflow/GetTemplateResponse.php
+++ /dev/null
@@ -1,41 +0,0 @@
-metadata = $metadata;
-  }
-  public function getMetadata()
-  {
-    return $this->metadata;
-  }
-  public function setStatus(Google_Service_Dataflow_Status $status)
-  {
-    $this->status = $status;
-  }
-  public function getStatus()
-  {
-    return $this->status;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dataflow/InstructionInput.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dataflow/InstructionInput.php
deleted file mode 100644
index cee054b8..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dataflow/InstructionInput.php
+++ /dev/null
@@ -1,39 +0,0 @@
-outputNum = $outputNum;
-  }
-  public function getOutputNum()
-  {
-    return $this->outputNum;
-  }
-  public function setProducerInstructionIndex($producerInstructionIndex)
-  {
-    $this->producerInstructionIndex = $producerInstructionIndex;
-  }
-  public function getProducerInstructionIndex()
-  {
-    return $this->producerInstructionIndex;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dataflow/InstructionOutput.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dataflow/InstructionOutput.php
deleted file mode 100644
index ceb12186..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dataflow/InstructionOutput.php
+++ /dev/null
@@ -1,75 +0,0 @@
-codec = $codec;
-  }
-  public function getCodec()
-  {
-    return $this->codec;
-  }
-  public function setName($name)
-  {
-    $this->name = $name;
-  }
-  public function getName()
-  {
-    return $this->name;
-  }
-  public function setOnlyCountKeyBytes($onlyCountKeyBytes)
-  {
-    $this->onlyCountKeyBytes = $onlyCountKeyBytes;
-  }
-  public function getOnlyCountKeyBytes()
-  {
-    return $this->onlyCountKeyBytes;
-  }
-  public function setOnlyCountValueBytes($onlyCountValueBytes)
-  {
-    $this->onlyCountValueBytes = $onlyCountValueBytes;
-  }
-  public function getOnlyCountValueBytes()
-  {
-    return $this->onlyCountValueBytes;
-  }
-  public function setOriginalName($originalName)
-  {
-    $this->originalName = $originalName;
-  }
-  public function getOriginalName()
-  {
-    return $this->originalName;
-  }
-  public function setSystemName($systemName)
-  {
-    $this->systemName = $systemName;
-  }
-  public function getSystemName()
-  {
-    return $this->systemName;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dataflow/IntegerList.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dataflow/IntegerList.php
deleted file mode 100644
index 98f733f5..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dataflow/IntegerList.php
+++ /dev/null
@@ -1,32 +0,0 @@
-elements = $elements;
-  }
-  public function getElements()
-  {
-    return $this->elements;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dataflow/IntegerMean.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dataflow/IntegerMean.php
deleted file mode 100644
index a82b2813..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dataflow/IntegerMean.php
+++ /dev/null
@@ -1,41 +0,0 @@
-count = $count;
-  }
-  public function getCount()
-  {
-    return $this->count;
-  }
-  public function setSum(Google_Service_Dataflow_SplitInt64 $sum)
-  {
-    $this->sum = $sum;
-  }
-  public function getSum()
-  {
-    return $this->sum;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dataflow/Job.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dataflow/Job.php
deleted file mode 100644
index 151c2876..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dataflow/Job.php
+++ /dev/null
@@ -1,197 +0,0 @@
-clientRequestId = $clientRequestId;
-  }
-  public function getClientRequestId()
-  {
-    return $this->clientRequestId;
-  }
-  public function setCreateTime($createTime)
-  {
-    $this->createTime = $createTime;
-  }
-  public function getCreateTime()
-  {
-    return $this->createTime;
-  }
-  public function setCurrentState($currentState)
-  {
-    $this->currentState = $currentState;
-  }
-  public function getCurrentState()
-  {
-    return $this->currentState;
-  }
-  public function setCurrentStateTime($currentStateTime)
-  {
-    $this->currentStateTime = $currentStateTime;
-  }
-  public function getCurrentStateTime()
-  {
-    return $this->currentStateTime;
-  }
-  public function setEnvironment(Google_Service_Dataflow_Environment $environment)
-  {
-    $this->environment = $environment;
-  }
-  public function getEnvironment()
-  {
-    return $this->environment;
-  }
-  public function setExecutionInfo(Google_Service_Dataflow_JobExecutionInfo $executionInfo)
-  {
-    $this->executionInfo = $executionInfo;
-  }
-  public function getExecutionInfo()
-  {
-    return $this->executionInfo;
-  }
-  public function setId($id)
-  {
-    $this->id = $id;
-  }
-  public function getId()
-  {
-    return $this->id;
-  }
-  public function setLabels($labels)
-  {
-    $this->labels = $labels;
-  }
-  public function getLabels()
-  {
-    return $this->labels;
-  }
-  public function setLocation($location)
-  {
-    $this->location = $location;
-  }
-  public function getLocation()
-  {
-    return $this->location;
-  }
-  public function setName($name)
-  {
-    $this->name = $name;
-  }
-  public function getName()
-  {
-    return $this->name;
-  }
-  public function setPipelineDescription(Google_Service_Dataflow_PipelineDescription $pipelineDescription)
-  {
-    $this->pipelineDescription = $pipelineDescription;
-  }
-  public function getPipelineDescription()
-  {
-    return $this->pipelineDescription;
-  }
-  public function setProjectId($projectId)
-  {
-    $this->projectId = $projectId;
-  }
-  public function getProjectId()
-  {
-    return $this->projectId;
-  }
-  public function setReplaceJobId($replaceJobId)
-  {
-    $this->replaceJobId = $replaceJobId;
-  }
-  public function getReplaceJobId()
-  {
-    return $this->replaceJobId;
-  }
-  public function setReplacedByJobId($replacedByJobId)
-  {
-    $this->replacedByJobId = $replacedByJobId;
-  }
-  public function getReplacedByJobId()
-  {
-    return $this->replacedByJobId;
-  }
-  public function setRequestedState($requestedState)
-  {
-    $this->requestedState = $requestedState;
-  }
-  public function getRequestedState()
-  {
-    return $this->requestedState;
-  }
-  public function setSteps($steps)
-  {
-    $this->steps = $steps;
-  }
-  public function getSteps()
-  {
-    return $this->steps;
-  }
-  public function setTempFiles($tempFiles)
-  {
-    $this->tempFiles = $tempFiles;
-  }
-  public function getTempFiles()
-  {
-    return $this->tempFiles;
-  }
-  public function setTransformNameMapping($transformNameMapping)
-  {
-    $this->transformNameMapping = $transformNameMapping;
-  }
-  public function getTransformNameMapping()
-  {
-    return $this->transformNameMapping;
-  }
-  public function setType($type)
-  {
-    $this->type = $type;
-  }
-  public function getType()
-  {
-    return $this->type;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dataflow/JobExecutionInfo.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dataflow/JobExecutionInfo.php
deleted file mode 100644
index 602dc87f..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dataflow/JobExecutionInfo.php
+++ /dev/null
@@ -1,31 +0,0 @@
-stages = $stages;
-  }
-  public function getStages()
-  {
-    return $this->stages;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dataflow/JobExecutionStageInfo.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dataflow/JobExecutionStageInfo.php
deleted file mode 100644
index 765af53c..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dataflow/JobExecutionStageInfo.php
+++ /dev/null
@@ -1,31 +0,0 @@
-stepName = $stepName;
-  }
-  public function getStepName()
-  {
-    return $this->stepName;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dataflow/JobMessage.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dataflow/JobMessage.php
deleted file mode 100644
index 6ef9ad0e..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dataflow/JobMessage.php
+++ /dev/null
@@ -1,57 +0,0 @@
-id = $id;
-  }
-  public function getId()
-  {
-    return $this->id;
-  }
-  public function setMessageImportance($messageImportance)
-  {
-    $this->messageImportance = $messageImportance;
-  }
-  public function getMessageImportance()
-  {
-    return $this->messageImportance;
-  }
-  public function setMessageText($messageText)
-  {
-    $this->messageText = $messageText;
-  }
-  public function getMessageText()
-  {
-    return $this->messageText;
-  }
-  public function setTime($time)
-  {
-    $this->time = $time;
-  }
-  public function getTime()
-  {
-    return $this->time;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dataflow/JobMetrics.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dataflow/JobMetrics.php
deleted file mode 100644
index c096b480..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dataflow/JobMetrics.php
+++ /dev/null
@@ -1,41 +0,0 @@
-metricTime = $metricTime;
-  }
-  public function getMetricTime()
-  {
-    return $this->metricTime;
-  }
-  public function setMetrics($metrics)
-  {
-    $this->metrics = $metrics;
-  }
-  public function getMetrics()
-  {
-    return $this->metrics;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dataflow/KeyRangeDataDiskAssignment.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dataflow/KeyRangeDataDiskAssignment.php
deleted file mode 100644
index b4cca2b6..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dataflow/KeyRangeDataDiskAssignment.php
+++ /dev/null
@@ -1,48 +0,0 @@
-dataDisk = $dataDisk;
-  }
-  public function getDataDisk()
-  {
-    return $this->dataDisk;
-  }
-  public function setEnd($end)
-  {
-    $this->end = $end;
-  }
-  public function getEnd()
-  {
-    return $this->end;
-  }
-  public function setStart($start)
-  {
-    $this->start = $start;
-  }
-  public function getStart()
-  {
-    return $this->start;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dataflow/KeyRangeLocation.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dataflow/KeyRangeLocation.php
deleted file mode 100644
index 0c398718..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dataflow/KeyRangeLocation.php
+++ /dev/null
@@ -1,66 +0,0 @@
-dataDisk = $dataDisk;
-  }
-  public function getDataDisk()
-  {
-    return $this->dataDisk;
-  }
-  public function setDeliveryEndpoint($deliveryEndpoint)
-  {
-    $this->deliveryEndpoint = $deliveryEndpoint;
-  }
-  public function getDeliveryEndpoint()
-  {
-    return $this->deliveryEndpoint;
-  }
-  public function setEnd($end)
-  {
-    $this->end = $end;
-  }
-  public function getEnd()
-  {
-    return $this->end;
-  }
-  public function setPersistentDirectory($persistentDirectory)
-  {
-    $this->persistentDirectory = $persistentDirectory;
-  }
-  public function getPersistentDirectory()
-  {
-    return $this->persistentDirectory;
-  }
-  public function setStart($start)
-  {
-    $this->start = $start;
-  }
-  public function getStart()
-  {
-    return $this->start;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dataflow/LaunchTemplateParameters.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dataflow/LaunchTemplateParameters.php
deleted file mode 100644
index 6d8f02af..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dataflow/LaunchTemplateParameters.php
+++ /dev/null
@@ -1,49 +0,0 @@
-environment = $environment;
-  }
-  public function getEnvironment()
-  {
-    return $this->environment;
-  }
-  public function setJobName($jobName)
-  {
-    $this->jobName = $jobName;
-  }
-  public function getJobName()
-  {
-    return $this->jobName;
-  }
-  public function setParameters($parameters)
-  {
-    $this->parameters = $parameters;
-  }
-  public function getParameters()
-  {
-    return $this->parameters;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dataflow/LaunchTemplateResponse.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dataflow/LaunchTemplateResponse.php
deleted file mode 100644
index 04e2a323..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dataflow/LaunchTemplateResponse.php
+++ /dev/null
@@ -1,41 +0,0 @@
-job = $job;
-  }
-  public function getJob()
-  {
-    return $this->job;
-  }
-  public function setStatus(Google_Service_Dataflow_Status $status)
-  {
-    $this->status = $status;
-  }
-  public function getStatus()
-  {
-    return $this->status;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dataflow/LeaseWorkItemRequest.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dataflow/LeaseWorkItemRequest.php
deleted file mode 100644
index 9a193a10..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dataflow/LeaseWorkItemRequest.php
+++ /dev/null
@@ -1,76 +0,0 @@
-currentWorkerTime = $currentWorkerTime;
-  }
-  public function getCurrentWorkerTime()
-  {
-    return $this->currentWorkerTime;
-  }
-  public function setLocation($location)
-  {
-    $this->location = $location;
-  }
-  public function getLocation()
-  {
-    return $this->location;
-  }
-  public function setRequestedLeaseDuration($requestedLeaseDuration)
-  {
-    $this->requestedLeaseDuration = $requestedLeaseDuration;
-  }
-  public function getRequestedLeaseDuration()
-  {
-    return $this->requestedLeaseDuration;
-  }
-  public function setWorkItemTypes($workItemTypes)
-  {
-    $this->workItemTypes = $workItemTypes;
-  }
-  public function getWorkItemTypes()
-  {
-    return $this->workItemTypes;
-  }
-  public function setWorkerCapabilities($workerCapabilities)
-  {
-    $this->workerCapabilities = $workerCapabilities;
-  }
-  public function getWorkerCapabilities()
-  {
-    return $this->workerCapabilities;
-  }
-  public function setWorkerId($workerId)
-  {
-    $this->workerId = $workerId;
-  }
-  public function getWorkerId()
-  {
-    return $this->workerId;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dataflow/LeaseWorkItemResponse.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dataflow/LeaseWorkItemResponse.php
deleted file mode 100644
index c4df8496..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dataflow/LeaseWorkItemResponse.php
+++ /dev/null
@@ -1,32 +0,0 @@
-workItems = $workItems;
-  }
-  public function getWorkItems()
-  {
-    return $this->workItems;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dataflow/ListJobMessagesResponse.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dataflow/ListJobMessagesResponse.php
deleted file mode 100644
index e71cdfb9..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dataflow/ListJobMessagesResponse.php
+++ /dev/null
@@ -1,41 +0,0 @@
-jobMessages = $jobMessages;
-  }
-  public function getJobMessages()
-  {
-    return $this->jobMessages;
-  }
-  public function setNextPageToken($nextPageToken)
-  {
-    $this->nextPageToken = $nextPageToken;
-  }
-  public function getNextPageToken()
-  {
-    return $this->nextPageToken;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dataflow/ListJobsResponse.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dataflow/ListJobsResponse.php
deleted file mode 100644
index 65d7f213..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dataflow/ListJobsResponse.php
+++ /dev/null
@@ -1,51 +0,0 @@
-failedLocation = $failedLocation;
-  }
-  public function getFailedLocation()
-  {
-    return $this->failedLocation;
-  }
-  public function setJobs($jobs)
-  {
-    $this->jobs = $jobs;
-  }
-  public function getJobs()
-  {
-    return $this->jobs;
-  }
-  public function setNextPageToken($nextPageToken)
-  {
-    $this->nextPageToken = $nextPageToken;
-  }
-  public function getNextPageToken()
-  {
-    return $this->nextPageToken;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dataflow/MapTask.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dataflow/MapTask.php
deleted file mode 100644
index c34ffcae..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dataflow/MapTask.php
+++ /dev/null
@@ -1,50 +0,0 @@
-instructions = $instructions;
-  }
-  public function getInstructions()
-  {
-    return $this->instructions;
-  }
-  public function setStageName($stageName)
-  {
-    $this->stageName = $stageName;
-  }
-  public function getStageName()
-  {
-    return $this->stageName;
-  }
-  public function setSystemName($systemName)
-  {
-    $this->systemName = $systemName;
-  }
-  public function getSystemName()
-  {
-    return $this->systemName;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dataflow/MetricShortId.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dataflow/MetricShortId.php
deleted file mode 100644
index f16334fb..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dataflow/MetricShortId.php
+++ /dev/null
@@ -1,39 +0,0 @@
-metricIndex = $metricIndex;
-  }
-  public function getMetricIndex()
-  {
-    return $this->metricIndex;
-  }
-  public function setShortId($shortId)
-  {
-    $this->shortId = $shortId;
-  }
-  public function getShortId()
-  {
-    return $this->shortId;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dataflow/MetricStructuredName.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dataflow/MetricStructuredName.php
deleted file mode 100644
index 93f44ee7..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dataflow/MetricStructuredName.php
+++ /dev/null
@@ -1,48 +0,0 @@
-context = $context;
-  }
-  public function getContext()
-  {
-    return $this->context;
-  }
-  public function setName($name)
-  {
-    $this->name = $name;
-  }
-  public function getName()
-  {
-    return $this->name;
-  }
-  public function setOrigin($origin)
-  {
-    $this->origin = $origin;
-  }
-  public function getOrigin()
-  {
-    return $this->origin;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dataflow/MetricUpdate.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dataflow/MetricUpdate.php
deleted file mode 100644
index d3db38c3..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dataflow/MetricUpdate.php
+++ /dev/null
@@ -1,103 +0,0 @@
-cumulative = $cumulative;
-  }
-  public function getCumulative()
-  {
-    return $this->cumulative;
-  }
-  public function setInternal($internal)
-  {
-    $this->internal = $internal;
-  }
-  public function getInternal()
-  {
-    return $this->internal;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setMeanCount($meanCount)
-  {
-    $this->meanCount = $meanCount;
-  }
-  public function getMeanCount()
-  {
-    return $this->meanCount;
-  }
-  public function setMeanSum($meanSum)
-  {
-    $this->meanSum = $meanSum;
-  }
-  public function getMeanSum()
-  {
-    return $this->meanSum;
-  }
-  public function setName(Google_Service_Dataflow_MetricStructuredName $name)
-  {
-    $this->name = $name;
-  }
-  public function getName()
-  {
-    return $this->name;
-  }
-  public function setScalar($scalar)
-  {
-    $this->scalar = $scalar;
-  }
-  public function getScalar()
-  {
-    return $this->scalar;
-  }
-  public function setSet($set)
-  {
-    $this->set = $set;
-  }
-  public function getSet()
-  {
-    return $this->set;
-  }
-  public function setUpdateTime($updateTime)
-  {
-    $this->updateTime = $updateTime;
-  }
-  public function getUpdateTime()
-  {
-    return $this->updateTime;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dataflow/MountedDataDisk.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dataflow/MountedDataDisk.php
deleted file mode 100644
index d718ca84..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dataflow/MountedDataDisk.php
+++ /dev/null
@@ -1,30 +0,0 @@
-dataDisk = $dataDisk;
-  }
-  public function getDataDisk()
-  {
-    return $this->dataDisk;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dataflow/MultiOutputInfo.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dataflow/MultiOutputInfo.php
deleted file mode 100644
index ed025f9a..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dataflow/MultiOutputInfo.php
+++ /dev/null
@@ -1,30 +0,0 @@
-tag = $tag;
-  }
-  public function getTag()
-  {
-    return $this->tag;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dataflow/NameAndKind.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dataflow/NameAndKind.php
deleted file mode 100644
index 31f3a8b5..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dataflow/NameAndKind.php
+++ /dev/null
@@ -1,39 +0,0 @@
-kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setName($name)
-  {
-    $this->name = $name;
-  }
-  public function getName()
-  {
-    return $this->name;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dataflow/Package.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dataflow/Package.php
deleted file mode 100644
index 7ca41364..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dataflow/Package.php
+++ /dev/null
@@ -1,39 +0,0 @@
-location = $location;
-  }
-  public function getLocation()
-  {
-    return $this->location;
-  }
-  public function setName($name)
-  {
-    $this->name = $name;
-  }
-  public function getName()
-  {
-    return $this->name;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dataflow/ParDoInstruction.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dataflow/ParDoInstruction.php
deleted file mode 100644
index 9978da58..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dataflow/ParDoInstruction.php
+++ /dev/null
@@ -1,70 +0,0 @@
-input = $input;
-  }
-  public function getInput()
-  {
-    return $this->input;
-  }
-  public function setMultiOutputInfos($multiOutputInfos)
-  {
-    $this->multiOutputInfos = $multiOutputInfos;
-  }
-  public function getMultiOutputInfos()
-  {
-    return $this->multiOutputInfos;
-  }
-  public function setNumOutputs($numOutputs)
-  {
-    $this->numOutputs = $numOutputs;
-  }
-  public function getNumOutputs()
-  {
-    return $this->numOutputs;
-  }
-  public function setSideInputs($sideInputs)
-  {
-    $this->sideInputs = $sideInputs;
-  }
-  public function getSideInputs()
-  {
-    return $this->sideInputs;
-  }
-  public function setUserFn($userFn)
-  {
-    $this->userFn = $userFn;
-  }
-  public function getUserFn()
-  {
-    return $this->userFn;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dataflow/ParallelInstruction.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dataflow/ParallelInstruction.php
deleted file mode 100644
index 1efb2afb..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dataflow/ParallelInstruction.php
+++ /dev/null
@@ -1,109 +0,0 @@
-flatten = $flatten;
-  }
-  public function getFlatten()
-  {
-    return $this->flatten;
-  }
-  public function setName($name)
-  {
-    $this->name = $name;
-  }
-  public function getName()
-  {
-    return $this->name;
-  }
-  public function setOriginalName($originalName)
-  {
-    $this->originalName = $originalName;
-  }
-  public function getOriginalName()
-  {
-    return $this->originalName;
-  }
-  public function setOutputs($outputs)
-  {
-    $this->outputs = $outputs;
-  }
-  public function getOutputs()
-  {
-    return $this->outputs;
-  }
-  public function setParDo(Google_Service_Dataflow_ParDoInstruction $parDo)
-  {
-    $this->parDo = $parDo;
-  }
-  public function getParDo()
-  {
-    return $this->parDo;
-  }
-  public function setPartialGroupByKey(Google_Service_Dataflow_PartialGroupByKeyInstruction $partialGroupByKey)
-  {
-    $this->partialGroupByKey = $partialGroupByKey;
-  }
-  public function getPartialGroupByKey()
-  {
-    return $this->partialGroupByKey;
-  }
-  public function setRead(Google_Service_Dataflow_ReadInstruction $read)
-  {
-    $this->read = $read;
-  }
-  public function getRead()
-  {
-    return $this->read;
-  }
-  public function setSystemName($systemName)
-  {
-    $this->systemName = $systemName;
-  }
-  public function getSystemName()
-  {
-    return $this->systemName;
-  }
-  public function setWrite(Google_Service_Dataflow_WriteInstruction $write)
-  {
-    $this->write = $write;
-  }
-  public function getWrite()
-  {
-    return $this->write;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dataflow/ParameterMetadata.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dataflow/ParameterMetadata.php
deleted file mode 100644
index 36038cc8..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dataflow/ParameterMetadata.php
+++ /dev/null
@@ -1,67 +0,0 @@
-helpText = $helpText;
-  }
-  public function getHelpText()
-  {
-    return $this->helpText;
-  }
-  public function setIsOptional($isOptional)
-  {
-    $this->isOptional = $isOptional;
-  }
-  public function getIsOptional()
-  {
-    return $this->isOptional;
-  }
-  public function setLabel($label)
-  {
-    $this->label = $label;
-  }
-  public function getLabel()
-  {
-    return $this->label;
-  }
-  public function setName($name)
-  {
-    $this->name = $name;
-  }
-  public function getName()
-  {
-    return $this->name;
-  }
-  public function setRegexes($regexes)
-  {
-    $this->regexes = $regexes;
-  }
-  public function getRegexes()
-  {
-    return $this->regexes;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dataflow/PartialGroupByKeyInstruction.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dataflow/PartialGroupByKeyInstruction.php
deleted file mode 100644
index 85f514f8..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dataflow/PartialGroupByKeyInstruction.php
+++ /dev/null
@@ -1,78 +0,0 @@
-input = $input;
-  }
-  public function getInput()
-  {
-    return $this->input;
-  }
-  public function setInputElementCodec($inputElementCodec)
-  {
-    $this->inputElementCodec = $inputElementCodec;
-  }
-  public function getInputElementCodec()
-  {
-    return $this->inputElementCodec;
-  }
-  public function setOriginalCombineValuesInputStoreName($originalCombineValuesInputStoreName)
-  {
-    $this->originalCombineValuesInputStoreName = $originalCombineValuesInputStoreName;
-  }
-  public function getOriginalCombineValuesInputStoreName()
-  {
-    return $this->originalCombineValuesInputStoreName;
-  }
-  public function setOriginalCombineValuesStepName($originalCombineValuesStepName)
-  {
-    $this->originalCombineValuesStepName = $originalCombineValuesStepName;
-  }
-  public function getOriginalCombineValuesStepName()
-  {
-    return $this->originalCombineValuesStepName;
-  }
-  public function setSideInputs($sideInputs)
-  {
-    $this->sideInputs = $sideInputs;
-  }
-  public function getSideInputs()
-  {
-    return $this->sideInputs;
-  }
-  public function setValueCombiningFn($valueCombiningFn)
-  {
-    $this->valueCombiningFn = $valueCombiningFn;
-  }
-  public function getValueCombiningFn()
-  {
-    return $this->valueCombiningFn;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dataflow/PipelineDescription.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dataflow/PipelineDescription.php
deleted file mode 100644
index 289da1f3..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dataflow/PipelineDescription.php
+++ /dev/null
@@ -1,52 +0,0 @@
-displayData = $displayData;
-  }
-  public function getDisplayData()
-  {
-    return $this->displayData;
-  }
-  public function setExecutionPipelineStage($executionPipelineStage)
-  {
-    $this->executionPipelineStage = $executionPipelineStage;
-  }
-  public function getExecutionPipelineStage()
-  {
-    return $this->executionPipelineStage;
-  }
-  public function setOriginalPipelineTransform($originalPipelineTransform)
-  {
-    $this->originalPipelineTransform = $originalPipelineTransform;
-  }
-  public function getOriginalPipelineTransform()
-  {
-    return $this->originalPipelineTransform;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dataflow/Position.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dataflow/Position.php
deleted file mode 100644
index 9942c245..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dataflow/Position.php
+++ /dev/null
@@ -1,76 +0,0 @@
-byteOffset = $byteOffset;
-  }
-  public function getByteOffset()
-  {
-    return $this->byteOffset;
-  }
-  public function setConcatPosition(Google_Service_Dataflow_ConcatPosition $concatPosition)
-  {
-    $this->concatPosition = $concatPosition;
-  }
-  public function getConcatPosition()
-  {
-    return $this->concatPosition;
-  }
-  public function setEnd($end)
-  {
-    $this->end = $end;
-  }
-  public function getEnd()
-  {
-    return $this->end;
-  }
-  public function setKey($key)
-  {
-    $this->key = $key;
-  }
-  public function getKey()
-  {
-    return $this->key;
-  }
-  public function setRecordIndex($recordIndex)
-  {
-    $this->recordIndex = $recordIndex;
-  }
-  public function getRecordIndex()
-  {
-    return $this->recordIndex;
-  }
-  public function setShufflePosition($shufflePosition)
-  {
-    $this->shufflePosition = $shufflePosition;
-  }
-  public function getShufflePosition()
-  {
-    return $this->shufflePosition;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dataflow/PubsubLocation.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dataflow/PubsubLocation.php
deleted file mode 100644
index 775e7ed6..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dataflow/PubsubLocation.php
+++ /dev/null
@@ -1,84 +0,0 @@
-dropLateData = $dropLateData;
-  }
-  public function getDropLateData()
-  {
-    return $this->dropLateData;
-  }
-  public function setIdLabel($idLabel)
-  {
-    $this->idLabel = $idLabel;
-  }
-  public function getIdLabel()
-  {
-    return $this->idLabel;
-  }
-  public function setSubscription($subscription)
-  {
-    $this->subscription = $subscription;
-  }
-  public function getSubscription()
-  {
-    return $this->subscription;
-  }
-  public function setTimestampLabel($timestampLabel)
-  {
-    $this->timestampLabel = $timestampLabel;
-  }
-  public function getTimestampLabel()
-  {
-    return $this->timestampLabel;
-  }
-  public function setTopic($topic)
-  {
-    $this->topic = $topic;
-  }
-  public function getTopic()
-  {
-    return $this->topic;
-  }
-  public function setTrackingSubscription($trackingSubscription)
-  {
-    $this->trackingSubscription = $trackingSubscription;
-  }
-  public function getTrackingSubscription()
-  {
-    return $this->trackingSubscription;
-  }
-  public function setWithAttributes($withAttributes)
-  {
-    $this->withAttributes = $withAttributes;
-  }
-  public function getWithAttributes()
-  {
-    return $this->withAttributes;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dataflow/ReadInstruction.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dataflow/ReadInstruction.php
deleted file mode 100644
index ed30b3de..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dataflow/ReadInstruction.php
+++ /dev/null
@@ -1,31 +0,0 @@
-source = $source;
-  }
-  public function getSource()
-  {
-    return $this->source;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dataflow/ReportWorkItemStatusRequest.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dataflow/ReportWorkItemStatusRequest.php
deleted file mode 100644
index 23cc2175..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dataflow/ReportWorkItemStatusRequest.php
+++ /dev/null
@@ -1,59 +0,0 @@
-currentWorkerTime = $currentWorkerTime;
-  }
-  public function getCurrentWorkerTime()
-  {
-    return $this->currentWorkerTime;
-  }
-  public function setLocation($location)
-  {
-    $this->location = $location;
-  }
-  public function getLocation()
-  {
-    return $this->location;
-  }
-  public function setWorkItemStatuses($workItemStatuses)
-  {
-    $this->workItemStatuses = $workItemStatuses;
-  }
-  public function getWorkItemStatuses()
-  {
-    return $this->workItemStatuses;
-  }
-  public function setWorkerId($workerId)
-  {
-    $this->workerId = $workerId;
-  }
-  public function getWorkerId()
-  {
-    return $this->workerId;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dataflow/ReportWorkItemStatusResponse.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dataflow/ReportWorkItemStatusResponse.php
deleted file mode 100644
index ec7e4202..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dataflow/ReportWorkItemStatusResponse.php
+++ /dev/null
@@ -1,32 +0,0 @@
-workItemServiceStates = $workItemServiceStates;
-  }
-  public function getWorkItemServiceStates()
-  {
-    return $this->workItemServiceStates;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dataflow/ReportedParallelism.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dataflow/ReportedParallelism.php
deleted file mode 100644
index c0b1089e..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dataflow/ReportedParallelism.php
+++ /dev/null
@@ -1,39 +0,0 @@
-isInfinite = $isInfinite;
-  }
-  public function getIsInfinite()
-  {
-    return $this->isInfinite;
-  }
-  public function setValue($value)
-  {
-    $this->value = $value;
-  }
-  public function getValue()
-  {
-    return $this->value;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dataflow/Resource/Projects.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dataflow/Resource/Projects.php
deleted file mode 100644
index cb87dc99..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dataflow/Resource/Projects.php
+++ /dev/null
@@ -1,42 +0,0 @@
-
- *   $dataflowService = new Google_Service_Dataflow(...);
- *   $projects = $dataflowService->projects;
- *  
- */
-class Google_Service_Dataflow_Resource_Projects extends Google_Service_Resource
-{
-  /**
-   * Send a worker_message to the service. (projects.workerMessages)
-   *
-   * @param string $projectId The project to send the WorkerMessages to.
-   * @param Google_Service_Dataflow_SendWorkerMessagesRequest $postBody
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Dataflow_SendWorkerMessagesResponse
-   */
-  public function workerMessages($projectId, Google_Service_Dataflow_SendWorkerMessagesRequest $postBody, $optParams = array())
-  {
-    $params = array('projectId' => $projectId, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('workerMessages', array($params), "Google_Service_Dataflow_SendWorkerMessagesResponse");
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dataflow/Resource/ProjectsJobs.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dataflow/Resource/ProjectsJobs.php
deleted file mode 100644
index f7465aa8..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dataflow/Resource/ProjectsJobs.php
+++ /dev/null
@@ -1,127 +0,0 @@
-
- *   $dataflowService = new Google_Service_Dataflow(...);
- *   $jobs = $dataflowService->jobs;
- *  
- */
-class Google_Service_Dataflow_Resource_ProjectsJobs extends Google_Service_Resource
-{
-  /**
-   * Creates a Cloud Dataflow job. (jobs.create)
-   *
-   * @param string $projectId The ID of the Cloud Platform project that the job
-   * belongs to.
-   * @param Google_Service_Dataflow_Job $postBody
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param string location The location that contains this job.
-   * @opt_param string replaceJobId Deprecated. This field is now in the Job
-   * message.
-   * @opt_param string view The level of information requested in response.
-   * @return Google_Service_Dataflow_Job
-   */
-  public function create($projectId, Google_Service_Dataflow_Job $postBody, $optParams = array())
-  {
-    $params = array('projectId' => $projectId, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('create', array($params), "Google_Service_Dataflow_Job");
-  }
-  /**
-   * Gets the state of the specified Cloud Dataflow job. (jobs.get)
-   *
-   * @param string $projectId The ID of the Cloud Platform project that the job
-   * belongs to.
-   * @param string $jobId The job ID.
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param string location The location that contains this job.
-   * @opt_param string view The level of information requested in response.
-   * @return Google_Service_Dataflow_Job
-   */
-  public function get($projectId, $jobId, $optParams = array())
-  {
-    $params = array('projectId' => $projectId, 'jobId' => $jobId);
-    $params = array_merge($params, $optParams);
-    return $this->call('get', array($params), "Google_Service_Dataflow_Job");
-  }
-  /**
-   * Request the job status. (jobs.getMetrics)
-   *
-   * @param string $projectId A project id.
-   * @param string $jobId The job to get messages for.
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param string startTime Return only metric data that has changed since
-   * this time. Default is to return all information about all metrics for the
-   * job.
-   * @opt_param string location The location which contains the job specified by
-   * job_id.
-   * @return Google_Service_Dataflow_JobMetrics
-   */
-  public function getMetrics($projectId, $jobId, $optParams = array())
-  {
-    $params = array('projectId' => $projectId, 'jobId' => $jobId);
-    $params = array_merge($params, $optParams);
-    return $this->call('getMetrics', array($params), "Google_Service_Dataflow_JobMetrics");
-  }
-  /**
-   * List the jobs of a project. (jobs.listProjectsJobs)
-   *
-   * @param string $projectId The project which owns the jobs.
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param string filter The kind of filter to use.
-   * @opt_param string location The location that contains this job.
-   * @opt_param string pageToken Set this to the 'next_page_token' field of a
-   * previous response to request additional results in a long list.
-   * @opt_param int pageSize If there are many jobs, limit response to at most
-   * this many. The actual number of jobs returned will be the lesser of
-   * max_responses and an unspecified server-defined limit.
-   * @opt_param string view Level of information requested in response. Default is
-   * `JOB_VIEW_SUMMARY`.
-   * @return Google_Service_Dataflow_ListJobsResponse
-   */
-  public function listProjectsJobs($projectId, $optParams = array())
-  {
-    $params = array('projectId' => $projectId);
-    $params = array_merge($params, $optParams);
-    return $this->call('list', array($params), "Google_Service_Dataflow_ListJobsResponse");
-  }
-  /**
-   * Updates the state of an existing Cloud Dataflow job. (jobs.update)
-   *
-   * @param string $projectId The ID of the Cloud Platform project that the job
-   * belongs to.
-   * @param string $jobId The job ID.
-   * @param Google_Service_Dataflow_Job $postBody
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param string location The location that contains this job.
-   * @return Google_Service_Dataflow_Job
-   */
-  public function update($projectId, $jobId, Google_Service_Dataflow_Job $postBody, $optParams = array())
-  {
-    $params = array('projectId' => $projectId, 'jobId' => $jobId, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('update', array($params), "Google_Service_Dataflow_Job");
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dataflow/Resource/ProjectsJobsDebug.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dataflow/Resource/ProjectsJobsDebug.php
deleted file mode 100644
index ea70131e..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dataflow/Resource/ProjectsJobsDebug.php
+++ /dev/null
@@ -1,59 +0,0 @@
-
- *   $dataflowService = new Google_Service_Dataflow(...);
- *   $debug = $dataflowService->debug;
- *  
- */
-class Google_Service_Dataflow_Resource_ProjectsJobsDebug extends Google_Service_Resource
-{
-  /**
-   * Get encoded debug configuration for component. Not cacheable.
-   * (debug.getConfig)
-   *
-   * @param string $projectId The project id.
-   * @param string $jobId The job id.
-   * @param Google_Service_Dataflow_GetDebugConfigRequest $postBody
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Dataflow_GetDebugConfigResponse
-   */
-  public function getConfig($projectId, $jobId, Google_Service_Dataflow_GetDebugConfigRequest $postBody, $optParams = array())
-  {
-    $params = array('projectId' => $projectId, 'jobId' => $jobId, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('getConfig', array($params), "Google_Service_Dataflow_GetDebugConfigResponse");
-  }
-  /**
-   * Send encoded debug capture data for component. (debug.sendCapture)
-   *
-   * @param string $projectId The project id.
-   * @param string $jobId The job id.
-   * @param Google_Service_Dataflow_SendDebugCaptureRequest $postBody
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Dataflow_SendDebugCaptureResponse
-   */
-  public function sendCapture($projectId, $jobId, Google_Service_Dataflow_SendDebugCaptureRequest $postBody, $optParams = array())
-  {
-    $params = array('projectId' => $projectId, 'jobId' => $jobId, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('sendCapture', array($params), "Google_Service_Dataflow_SendDebugCaptureResponse");
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dataflow/Resource/ProjectsJobsMessages.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dataflow/Resource/ProjectsJobsMessages.php
deleted file mode 100644
index e9740951..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dataflow/Resource/ProjectsJobsMessages.php
+++ /dev/null
@@ -1,58 +0,0 @@
-
- *   $dataflowService = new Google_Service_Dataflow(...);
- *   $messages = $dataflowService->messages;
- *  
- */
-class Google_Service_Dataflow_Resource_ProjectsJobsMessages extends Google_Service_Resource
-{
-  /**
-   * Request the job status. (messages.listProjectsJobsMessages)
-   *
-   * @param string $projectId A project id.
-   * @param string $jobId The job to get messages about.
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param string endTime Return only messages with timestamps < end_time.
-   * The default is now (i.e. return up to the latest messages available).
-   * @opt_param string location The location which contains the job specified by
-   * job_id.
-   * @opt_param string pageToken If supplied, this should be the value of
-   * next_page_token returned by an earlier call. This will cause the next page of
-   * results to be returned.
-   * @opt_param string startTime If specified, return only messages with
-   * timestamps >= start_time. The default is the job creation time (i.e.
-   * beginning of messages).
-   * @opt_param int pageSize If specified, determines the maximum number of
-   * messages to return.  If unspecified, the service may choose an appropriate
-   * default, or may return an arbitrarily large number of results.
-   * @opt_param string minimumImportance Filter to only get messages with
-   * importance >= level
-   * @return Google_Service_Dataflow_ListJobMessagesResponse
-   */
-  public function listProjectsJobsMessages($projectId, $jobId, $optParams = array())
-  {
-    $params = array('projectId' => $projectId, 'jobId' => $jobId);
-    $params = array_merge($params, $optParams);
-    return $this->call('list', array($params), "Google_Service_Dataflow_ListJobMessagesResponse");
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dataflow/Resource/ProjectsJobsWorkItems.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dataflow/Resource/ProjectsJobsWorkItems.php
deleted file mode 100644
index 82c3b780..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dataflow/Resource/ProjectsJobsWorkItems.php
+++ /dev/null
@@ -1,59 +0,0 @@
-
- *   $dataflowService = new Google_Service_Dataflow(...);
- *   $workItems = $dataflowService->workItems;
- *  
- */
-class Google_Service_Dataflow_Resource_ProjectsJobsWorkItems extends Google_Service_Resource
-{
-  /**
-   * Leases a dataflow WorkItem to run. (workItems.lease)
-   *
-   * @param string $projectId Identifies the project this worker belongs to.
-   * @param string $jobId Identifies the workflow job this worker belongs to.
-   * @param Google_Service_Dataflow_LeaseWorkItemRequest $postBody
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Dataflow_LeaseWorkItemResponse
-   */
-  public function lease($projectId, $jobId, Google_Service_Dataflow_LeaseWorkItemRequest $postBody, $optParams = array())
-  {
-    $params = array('projectId' => $projectId, 'jobId' => $jobId, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('lease', array($params), "Google_Service_Dataflow_LeaseWorkItemResponse");
-  }
-  /**
-   * Reports the status of dataflow WorkItems leased by a worker.
-   * (workItems.reportStatus)
-   *
-   * @param string $projectId The project which owns the WorkItem's job.
-   * @param string $jobId The job which the WorkItem is part of.
-   * @param Google_Service_Dataflow_ReportWorkItemStatusRequest $postBody
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Dataflow_ReportWorkItemStatusResponse
-   */
-  public function reportStatus($projectId, $jobId, Google_Service_Dataflow_ReportWorkItemStatusRequest $postBody, $optParams = array())
-  {
-    $params = array('projectId' => $projectId, 'jobId' => $jobId, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('reportStatus', array($params), "Google_Service_Dataflow_ReportWorkItemStatusResponse");
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dataflow/Resource/ProjectsLocations.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dataflow/Resource/ProjectsLocations.php
deleted file mode 100644
index ebf4947d..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dataflow/Resource/ProjectsLocations.php
+++ /dev/null
@@ -1,28 +0,0 @@
-
- *   $dataflowService = new Google_Service_Dataflow(...);
- *   $locations = $dataflowService->locations;
- *  
- */
-class Google_Service_Dataflow_Resource_ProjectsLocations extends Google_Service_Resource
-{
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dataflow/Resource/ProjectsLocationsJobs.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dataflow/Resource/ProjectsLocationsJobs.php
deleted file mode 100644
index 5c4d2679..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dataflow/Resource/ProjectsLocationsJobs.php
+++ /dev/null
@@ -1,126 +0,0 @@
-
- *   $dataflowService = new Google_Service_Dataflow(...);
- *   $jobs = $dataflowService->jobs;
- *  
- */
-class Google_Service_Dataflow_Resource_ProjectsLocationsJobs extends Google_Service_Resource
-{
-  /**
-   * Creates a Cloud Dataflow job. (jobs.create)
-   *
-   * @param string $projectId The ID of the Cloud Platform project that the job
-   * belongs to.
-   * @param string $location The location that contains this job.
-   * @param Google_Service_Dataflow_Job $postBody
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param string replaceJobId Deprecated. This field is now in the Job
-   * message.
-   * @opt_param string view The level of information requested in response.
-   * @return Google_Service_Dataflow_Job
-   */
-  public function create($projectId, $location, Google_Service_Dataflow_Job $postBody, $optParams = array())
-  {
-    $params = array('projectId' => $projectId, 'location' => $location, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('create', array($params), "Google_Service_Dataflow_Job");
-  }
-  /**
-   * Gets the state of the specified Cloud Dataflow job. (jobs.get)
-   *
-   * @param string $projectId The ID of the Cloud Platform project that the job
-   * belongs to.
-   * @param string $location The location that contains this job.
-   * @param string $jobId The job ID.
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param string view The level of information requested in response.
-   * @return Google_Service_Dataflow_Job
-   */
-  public function get($projectId, $location, $jobId, $optParams = array())
-  {
-    $params = array('projectId' => $projectId, 'location' => $location, 'jobId' => $jobId);
-    $params = array_merge($params, $optParams);
-    return $this->call('get', array($params), "Google_Service_Dataflow_Job");
-  }
-  /**
-   * Request the job status. (jobs.getMetrics)
-   *
-   * @param string $projectId A project id.
-   * @param string $location The location which contains the job specified by
-   * job_id.
-   * @param string $jobId The job to get messages for.
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param string startTime Return only metric data that has changed since
-   * this time. Default is to return all information about all metrics for the
-   * job.
-   * @return Google_Service_Dataflow_JobMetrics
-   */
-  public function getMetrics($projectId, $location, $jobId, $optParams = array())
-  {
-    $params = array('projectId' => $projectId, 'location' => $location, 'jobId' => $jobId);
-    $params = array_merge($params, $optParams);
-    return $this->call('getMetrics', array($params), "Google_Service_Dataflow_JobMetrics");
-  }
-  /**
-   * List the jobs of a project. (jobs.listProjectsLocationsJobs)
-   *
-   * @param string $projectId The project which owns the jobs.
-   * @param string $location The location that contains this job.
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param string filter The kind of filter to use.
-   * @opt_param string pageToken Set this to the 'next_page_token' field of a
-   * previous response to request additional results in a long list.
-   * @opt_param int pageSize If there are many jobs, limit response to at most
-   * this many. The actual number of jobs returned will be the lesser of
-   * max_responses and an unspecified server-defined limit.
-   * @opt_param string view Level of information requested in response. Default is
-   * `JOB_VIEW_SUMMARY`.
-   * @return Google_Service_Dataflow_ListJobsResponse
-   */
-  public function listProjectsLocationsJobs($projectId, $location, $optParams = array())
-  {
-    $params = array('projectId' => $projectId, 'location' => $location);
-    $params = array_merge($params, $optParams);
-    return $this->call('list', array($params), "Google_Service_Dataflow_ListJobsResponse");
-  }
-  /**
-   * Updates the state of an existing Cloud Dataflow job. (jobs.update)
-   *
-   * @param string $projectId The ID of the Cloud Platform project that the job
-   * belongs to.
-   * @param string $location The location that contains this job.
-   * @param string $jobId The job ID.
-   * @param Google_Service_Dataflow_Job $postBody
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Dataflow_Job
-   */
-  public function update($projectId, $location, $jobId, Google_Service_Dataflow_Job $postBody, $optParams = array())
-  {
-    $params = array('projectId' => $projectId, 'location' => $location, 'jobId' => $jobId, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('update', array($params), "Google_Service_Dataflow_Job");
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dataflow/Resource/ProjectsLocationsJobsMessages.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dataflow/Resource/ProjectsLocationsJobsMessages.php
deleted file mode 100644
index 822af3f8..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dataflow/Resource/ProjectsLocationsJobsMessages.php
+++ /dev/null
@@ -1,58 +0,0 @@
-
- *   $dataflowService = new Google_Service_Dataflow(...);
- *   $messages = $dataflowService->messages;
- *  
- */
-class Google_Service_Dataflow_Resource_ProjectsLocationsJobsMessages extends Google_Service_Resource
-{
-  /**
-   * Request the job status. (messages.listProjectsLocationsJobsMessages)
-   *
-   * @param string $projectId A project id.
-   * @param string $location The location which contains the job specified by
-   * job_id.
-   * @param string $jobId The job to get messages about.
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param string endTime Return only messages with timestamps < end_time.
-   * The default is now (i.e. return up to the latest messages available).
-   * @opt_param string startTime If specified, return only messages with
-   * timestamps >= start_time. The default is the job creation time (i.e.
-   * beginning of messages).
-   * @opt_param string pageToken If supplied, this should be the value of
-   * next_page_token returned by an earlier call. This will cause the next page of
-   * results to be returned.
-   * @opt_param int pageSize If specified, determines the maximum number of
-   * messages to return.  If unspecified, the service may choose an appropriate
-   * default, or may return an arbitrarily large number of results.
-   * @opt_param string minimumImportance Filter to only get messages with
-   * importance >= level
-   * @return Google_Service_Dataflow_ListJobMessagesResponse
-   */
-  public function listProjectsLocationsJobsMessages($projectId, $location, $jobId, $optParams = array())
-  {
-    $params = array('projectId' => $projectId, 'location' => $location, 'jobId' => $jobId);
-    $params = array_merge($params, $optParams);
-    return $this->call('list', array($params), "Google_Service_Dataflow_ListJobMessagesResponse");
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dataflow/Resource/ProjectsLocationsJobsWorkItems.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dataflow/Resource/ProjectsLocationsJobsWorkItems.php
deleted file mode 100644
index ca422936..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dataflow/Resource/ProjectsLocationsJobsWorkItems.php
+++ /dev/null
@@ -1,61 +0,0 @@
-
- *   $dataflowService = new Google_Service_Dataflow(...);
- *   $workItems = $dataflowService->workItems;
- *  
- */
-class Google_Service_Dataflow_Resource_ProjectsLocationsJobsWorkItems extends Google_Service_Resource
-{
-  /**
-   * Leases a dataflow WorkItem to run. (workItems.lease)
-   *
-   * @param string $projectId Identifies the project this worker belongs to.
-   * @param string $location The location which contains the WorkItem's job.
-   * @param string $jobId Identifies the workflow job this worker belongs to.
-   * @param Google_Service_Dataflow_LeaseWorkItemRequest $postBody
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Dataflow_LeaseWorkItemResponse
-   */
-  public function lease($projectId, $location, $jobId, Google_Service_Dataflow_LeaseWorkItemRequest $postBody, $optParams = array())
-  {
-    $params = array('projectId' => $projectId, 'location' => $location, 'jobId' => $jobId, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('lease', array($params), "Google_Service_Dataflow_LeaseWorkItemResponse");
-  }
-  /**
-   * Reports the status of dataflow WorkItems leased by a worker.
-   * (workItems.reportStatus)
-   *
-   * @param string $projectId The project which owns the WorkItem's job.
-   * @param string $location The location which contains the WorkItem's job.
-   * @param string $jobId The job which the WorkItem is part of.
-   * @param Google_Service_Dataflow_ReportWorkItemStatusRequest $postBody
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Dataflow_ReportWorkItemStatusResponse
-   */
-  public function reportStatus($projectId, $location, $jobId, Google_Service_Dataflow_ReportWorkItemStatusRequest $postBody, $optParams = array())
-  {
-    $params = array('projectId' => $projectId, 'location' => $location, 'jobId' => $jobId, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('reportStatus', array($params), "Google_Service_Dataflow_ReportWorkItemStatusResponse");
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dataflow/Resource/ProjectsTemplates.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dataflow/Resource/ProjectsTemplates.php
deleted file mode 100644
index ff18cd72..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dataflow/Resource/ProjectsTemplates.php
+++ /dev/null
@@ -1,84 +0,0 @@
-
- *   $dataflowService = new Google_Service_Dataflow(...);
- *   $templates = $dataflowService->templates;
- *  
- */
-class Google_Service_Dataflow_Resource_ProjectsTemplates extends Google_Service_Resource
-{
-  /**
-   * Creates a Cloud Dataflow job from a template. (templates.create)
-   *
-   * @param string $projectId Required. The ID of the Cloud Platform project that
-   * the job belongs to.
-   * @param Google_Service_Dataflow_CreateJobFromTemplateRequest $postBody
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Dataflow_Job
-   */
-  public function create($projectId, Google_Service_Dataflow_CreateJobFromTemplateRequest $postBody, $optParams = array())
-  {
-    $params = array('projectId' => $projectId, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('create', array($params), "Google_Service_Dataflow_Job");
-  }
-  /**
-   * Get the template associated with a template. (templates.get)
-   *
-   * @param string $projectId Required. The ID of the Cloud Platform project that
-   * the job belongs to.
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param string view The view to retrieve. Defaults to METADATA_ONLY.
-   * @opt_param string gcsPath Required. A Cloud Storage path to the template from
-   * which to create the job. Must be a valid Cloud Storage URL, beginning with
-   * `gs://`.
-   * @return Google_Service_Dataflow_GetTemplateResponse
-   */
-  public function get($projectId, $optParams = array())
-  {
-    $params = array('projectId' => $projectId);
-    $params = array_merge($params, $optParams);
-    return $this->call('get', array($params), "Google_Service_Dataflow_GetTemplateResponse");
-  }
-  /**
-   * Launch a template. (templates.launch)
-   *
-   * @param string $projectId Required. The ID of the Cloud Platform project that
-   * the job belongs to.
-   * @param Google_Service_Dataflow_LaunchTemplateParameters $postBody
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param string gcsPath Required. A Cloud Storage path to the template from
-   * which to create the job. Must be valid Cloud Storage URL, beginning with
-   * 'gs://'.
-   * @opt_param bool dryRun Whether or not the job should actually be executed
-   * after validating parameters. Defaults to false. Validation errors do not
-   * cause the HTTP request to fail if true.
-   * @return Google_Service_Dataflow_LaunchTemplateResponse
-   */
-  public function launch($projectId, Google_Service_Dataflow_LaunchTemplateParameters $postBody, $optParams = array())
-  {
-    $params = array('projectId' => $projectId, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('launch', array($params), "Google_Service_Dataflow_LaunchTemplateResponse");
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dataflow/ResourceUtilizationReport.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dataflow/ResourceUtilizationReport.php
deleted file mode 100644
index 7bafe4e2..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dataflow/ResourceUtilizationReport.php
+++ /dev/null
@@ -1,32 +0,0 @@
-cpuTime = $cpuTime;
-  }
-  public function getCpuTime()
-  {
-    return $this->cpuTime;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dataflow/ResourceUtilizationReportResponse.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dataflow/ResourceUtilizationReportResponse.php
deleted file mode 100644
index 82d07b32..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dataflow/ResourceUtilizationReportResponse.php
+++ /dev/null
@@ -1,20 +0,0 @@
-bypassTempDirValidation = $bypassTempDirValidation;
-  }
-  public function getBypassTempDirValidation()
-  {
-    return $this->bypassTempDirValidation;
-  }
-  public function setMaxWorkers($maxWorkers)
-  {
-    $this->maxWorkers = $maxWorkers;
-  }
-  public function getMaxWorkers()
-  {
-    return $this->maxWorkers;
-  }
-  public function setServiceAccountEmail($serviceAccountEmail)
-  {
-    $this->serviceAccountEmail = $serviceAccountEmail;
-  }
-  public function getServiceAccountEmail()
-  {
-    return $this->serviceAccountEmail;
-  }
-  public function setTempLocation($tempLocation)
-  {
-    $this->tempLocation = $tempLocation;
-  }
-  public function getTempLocation()
-  {
-    return $this->tempLocation;
-  }
-  public function setZone($zone)
-  {
-    $this->zone = $zone;
-  }
-  public function getZone()
-  {
-    return $this->zone;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dataflow/SendDebugCaptureRequest.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dataflow/SendDebugCaptureRequest.php
deleted file mode 100644
index 07c1688f..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dataflow/SendDebugCaptureRequest.php
+++ /dev/null
@@ -1,48 +0,0 @@
-componentId = $componentId;
-  }
-  public function getComponentId()
-  {
-    return $this->componentId;
-  }
-  public function setData($data)
-  {
-    $this->data = $data;
-  }
-  public function getData()
-  {
-    return $this->data;
-  }
-  public function setWorkerId($workerId)
-  {
-    $this->workerId = $workerId;
-  }
-  public function getWorkerId()
-  {
-    return $this->workerId;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dataflow/SendDebugCaptureResponse.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dataflow/SendDebugCaptureResponse.php
deleted file mode 100644
index 99d30d74..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dataflow/SendDebugCaptureResponse.php
+++ /dev/null
@@ -1,20 +0,0 @@
-workerMessages = $workerMessages;
-  }
-  public function getWorkerMessages()
-  {
-    return $this->workerMessages;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dataflow/SendWorkerMessagesResponse.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dataflow/SendWorkerMessagesResponse.php
deleted file mode 100644
index eab6a5d0..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dataflow/SendWorkerMessagesResponse.php
+++ /dev/null
@@ -1,32 +0,0 @@
-workerMessageResponses = $workerMessageResponses;
-  }
-  public function getWorkerMessageResponses()
-  {
-    return $this->workerMessageResponses;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dataflow/SeqMapTask.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dataflow/SeqMapTask.php
deleted file mode 100644
index 0b6450c5..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dataflow/SeqMapTask.php
+++ /dev/null
@@ -1,78 +0,0 @@
-inputs = $inputs;
-  }
-  public function getInputs()
-  {
-    return $this->inputs;
-  }
-  public function setName($name)
-  {
-    $this->name = $name;
-  }
-  public function getName()
-  {
-    return $this->name;
-  }
-  public function setOutputInfos($outputInfos)
-  {
-    $this->outputInfos = $outputInfos;
-  }
-  public function getOutputInfos()
-  {
-    return $this->outputInfos;
-  }
-  public function setStageName($stageName)
-  {
-    $this->stageName = $stageName;
-  }
-  public function getStageName()
-  {
-    return $this->stageName;
-  }
-  public function setSystemName($systemName)
-  {
-    $this->systemName = $systemName;
-  }
-  public function getSystemName()
-  {
-    return $this->systemName;
-  }
-  public function setUserFn($userFn)
-  {
-    $this->userFn = $userFn;
-  }
-  public function getUserFn()
-  {
-    return $this->userFn;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dataflow/SeqMapTaskOutputInfo.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dataflow/SeqMapTaskOutputInfo.php
deleted file mode 100644
index 92049428..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dataflow/SeqMapTaskOutputInfo.php
+++ /dev/null
@@ -1,40 +0,0 @@
-sink = $sink;
-  }
-  public function getSink()
-  {
-    return $this->sink;
-  }
-  public function setTag($tag)
-  {
-    $this->tag = $tag;
-  }
-  public function getTag()
-  {
-    return $this->tag;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dataflow/ShellTask.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dataflow/ShellTask.php
deleted file mode 100644
index 5ff9c107..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dataflow/ShellTask.php
+++ /dev/null
@@ -1,39 +0,0 @@
-command = $command;
-  }
-  public function getCommand()
-  {
-    return $this->command;
-  }
-  public function setExitCode($exitCode)
-  {
-    $this->exitCode = $exitCode;
-  }
-  public function getExitCode()
-  {
-    return $this->exitCode;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dataflow/SideInputInfo.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dataflow/SideInputInfo.php
deleted file mode 100644
index 6f863788..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dataflow/SideInputInfo.php
+++ /dev/null
@@ -1,50 +0,0 @@
-kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setSources($sources)
-  {
-    $this->sources = $sources;
-  }
-  public function getSources()
-  {
-    return $this->sources;
-  }
-  public function setTag($tag)
-  {
-    $this->tag = $tag;
-  }
-  public function getTag()
-  {
-    return $this->tag;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dataflow/Sink.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dataflow/Sink.php
deleted file mode 100644
index 18e8c52f..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dataflow/Sink.php
+++ /dev/null
@@ -1,39 +0,0 @@
-codec = $codec;
-  }
-  public function getCodec()
-  {
-    return $this->codec;
-  }
-  public function setSpec($spec)
-  {
-    $this->spec = $spec;
-  }
-  public function getSpec()
-  {
-    return $this->spec;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dataflow/Source.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dataflow/Source.php
deleted file mode 100644
index 587ee0bc..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dataflow/Source.php
+++ /dev/null
@@ -1,68 +0,0 @@
-baseSpecs = $baseSpecs;
-  }
-  public function getBaseSpecs()
-  {
-    return $this->baseSpecs;
-  }
-  public function setCodec($codec)
-  {
-    $this->codec = $codec;
-  }
-  public function getCodec()
-  {
-    return $this->codec;
-  }
-  public function setDoesNotNeedSplitting($doesNotNeedSplitting)
-  {
-    $this->doesNotNeedSplitting = $doesNotNeedSplitting;
-  }
-  public function getDoesNotNeedSplitting()
-  {
-    return $this->doesNotNeedSplitting;
-  }
-  public function setMetadata(Google_Service_Dataflow_SourceMetadata $metadata)
-  {
-    $this->metadata = $metadata;
-  }
-  public function getMetadata()
-  {
-    return $this->metadata;
-  }
-  public function setSpec($spec)
-  {
-    $this->spec = $spec;
-  }
-  public function getSpec()
-  {
-    return $this->spec;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dataflow/SourceFork.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dataflow/SourceFork.php
deleted file mode 100644
index 810201f5..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dataflow/SourceFork.php
+++ /dev/null
@@ -1,61 +0,0 @@
-primary = $primary;
-  }
-  public function getPrimary()
-  {
-    return $this->primary;
-  }
-  public function setPrimarySource(Google_Service_Dataflow_DerivedSource $primarySource)
-  {
-    $this->primarySource = $primarySource;
-  }
-  public function getPrimarySource()
-  {
-    return $this->primarySource;
-  }
-  public function setResidual(Google_Service_Dataflow_SourceSplitShard $residual)
-  {
-    $this->residual = $residual;
-  }
-  public function getResidual()
-  {
-    return $this->residual;
-  }
-  public function setResidualSource(Google_Service_Dataflow_DerivedSource $residualSource)
-  {
-    $this->residualSource = $residualSource;
-  }
-  public function getResidualSource()
-  {
-    return $this->residualSource;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dataflow/SourceGetMetadataRequest.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dataflow/SourceGetMetadataRequest.php
deleted file mode 100644
index 4baff3b2..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dataflow/SourceGetMetadataRequest.php
+++ /dev/null
@@ -1,31 +0,0 @@
-source = $source;
-  }
-  public function getSource()
-  {
-    return $this->source;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dataflow/SourceGetMetadataResponse.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dataflow/SourceGetMetadataResponse.php
deleted file mode 100644
index dda0e312..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dataflow/SourceGetMetadataResponse.php
+++ /dev/null
@@ -1,31 +0,0 @@
-metadata = $metadata;
-  }
-  public function getMetadata()
-  {
-    return $this->metadata;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dataflow/SourceMetadata.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dataflow/SourceMetadata.php
deleted file mode 100644
index 2512f4a5..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dataflow/SourceMetadata.php
+++ /dev/null
@@ -1,48 +0,0 @@
-estimatedSizeBytes = $estimatedSizeBytes;
-  }
-  public function getEstimatedSizeBytes()
-  {
-    return $this->estimatedSizeBytes;
-  }
-  public function setInfinite($infinite)
-  {
-    $this->infinite = $infinite;
-  }
-  public function getInfinite()
-  {
-    return $this->infinite;
-  }
-  public function setProducesSortedKeys($producesSortedKeys)
-  {
-    $this->producesSortedKeys = $producesSortedKeys;
-  }
-  public function getProducesSortedKeys()
-  {
-    return $this->producesSortedKeys;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dataflow/SourceOperationRequest.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dataflow/SourceOperationRequest.php
deleted file mode 100644
index 926fe71b..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dataflow/SourceOperationRequest.php
+++ /dev/null
@@ -1,41 +0,0 @@
-getMetadata = $getMetadata;
-  }
-  public function getGetMetadata()
-  {
-    return $this->getMetadata;
-  }
-  public function setSplit(Google_Service_Dataflow_SourceSplitRequest $split)
-  {
-    $this->split = $split;
-  }
-  public function getSplit()
-  {
-    return $this->split;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dataflow/SourceOperationResponse.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dataflow/SourceOperationResponse.php
deleted file mode 100644
index f551b522..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dataflow/SourceOperationResponse.php
+++ /dev/null
@@ -1,41 +0,0 @@
-getMetadata = $getMetadata;
-  }
-  public function getGetMetadata()
-  {
-    return $this->getMetadata;
-  }
-  public function setSplit(Google_Service_Dataflow_SourceSplitResponse $split)
-  {
-    $this->split = $split;
-  }
-  public function getSplit()
-  {
-    return $this->split;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dataflow/SourceSplitOptions.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dataflow/SourceSplitOptions.php
deleted file mode 100644
index 68c96736..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dataflow/SourceSplitOptions.php
+++ /dev/null
@@ -1,39 +0,0 @@
-desiredBundleSizeBytes = $desiredBundleSizeBytes;
-  }
-  public function getDesiredBundleSizeBytes()
-  {
-    return $this->desiredBundleSizeBytes;
-  }
-  public function setDesiredShardSizeBytes($desiredShardSizeBytes)
-  {
-    $this->desiredShardSizeBytes = $desiredShardSizeBytes;
-  }
-  public function getDesiredShardSizeBytes()
-  {
-    return $this->desiredShardSizeBytes;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dataflow/SourceSplitRequest.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dataflow/SourceSplitRequest.php
deleted file mode 100644
index c819be45..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dataflow/SourceSplitRequest.php
+++ /dev/null
@@ -1,41 +0,0 @@
-options = $options;
-  }
-  public function getOptions()
-  {
-    return $this->options;
-  }
-  public function setSource(Google_Service_Dataflow_Source $source)
-  {
-    $this->source = $source;
-  }
-  public function getSource()
-  {
-    return $this->source;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dataflow/SourceSplitResponse.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dataflow/SourceSplitResponse.php
deleted file mode 100644
index abedc3c7..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dataflow/SourceSplitResponse.php
+++ /dev/null
@@ -1,51 +0,0 @@
-bundles = $bundles;
-  }
-  public function getBundles()
-  {
-    return $this->bundles;
-  }
-  public function setOutcome($outcome)
-  {
-    $this->outcome = $outcome;
-  }
-  public function getOutcome()
-  {
-    return $this->outcome;
-  }
-  public function setShards($shards)
-  {
-    $this->shards = $shards;
-  }
-  public function getShards()
-  {
-    return $this->shards;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dataflow/SourceSplitShard.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dataflow/SourceSplitShard.php
deleted file mode 100644
index ed49befc..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dataflow/SourceSplitShard.php
+++ /dev/null
@@ -1,40 +0,0 @@
-derivationMode = $derivationMode;
-  }
-  public function getDerivationMode()
-  {
-    return $this->derivationMode;
-  }
-  public function setSource(Google_Service_Dataflow_Source $source)
-  {
-    $this->source = $source;
-  }
-  public function getSource()
-  {
-    return $this->source;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dataflow/SplitInt64.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dataflow/SplitInt64.php
deleted file mode 100644
index 62934864..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dataflow/SplitInt64.php
+++ /dev/null
@@ -1,39 +0,0 @@
-highBits = $highBits;
-  }
-  public function getHighBits()
-  {
-    return $this->highBits;
-  }
-  public function setLowBits($lowBits)
-  {
-    $this->lowBits = $lowBits;
-  }
-  public function getLowBits()
-  {
-    return $this->lowBits;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dataflow/StageSource.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dataflow/StageSource.php
deleted file mode 100644
index 55db56b4..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dataflow/StageSource.php
+++ /dev/null
@@ -1,57 +0,0 @@
-name = $name;
-  }
-  public function getName()
-  {
-    return $this->name;
-  }
-  public function setOriginalTransformOrCollection($originalTransformOrCollection)
-  {
-    $this->originalTransformOrCollection = $originalTransformOrCollection;
-  }
-  public function getOriginalTransformOrCollection()
-  {
-    return $this->originalTransformOrCollection;
-  }
-  public function setSizeBytes($sizeBytes)
-  {
-    $this->sizeBytes = $sizeBytes;
-  }
-  public function getSizeBytes()
-  {
-    return $this->sizeBytes;
-  }
-  public function setUserName($userName)
-  {
-    $this->userName = $userName;
-  }
-  public function getUserName()
-  {
-    return $this->userName;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dataflow/StateFamilyConfig.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dataflow/StateFamilyConfig.php
deleted file mode 100644
index 471d23e2..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dataflow/StateFamilyConfig.php
+++ /dev/null
@@ -1,39 +0,0 @@
-isRead = $isRead;
-  }
-  public function getIsRead()
-  {
-    return $this->isRead;
-  }
-  public function setStateFamily($stateFamily)
-  {
-    $this->stateFamily = $stateFamily;
-  }
-  public function getStateFamily()
-  {
-    return $this->stateFamily;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dataflow/Status.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dataflow/Status.php
deleted file mode 100644
index 19942df7..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dataflow/Status.php
+++ /dev/null
@@ -1,49 +0,0 @@
-code = $code;
-  }
-  public function getCode()
-  {
-    return $this->code;
-  }
-  public function setDetails($details)
-  {
-    $this->details = $details;
-  }
-  public function getDetails()
-  {
-    return $this->details;
-  }
-  public function setMessage($message)
-  {
-    $this->message = $message;
-  }
-  public function getMessage()
-  {
-    return $this->message;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dataflow/Step.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dataflow/Step.php
deleted file mode 100644
index e9f5bad0..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dataflow/Step.php
+++ /dev/null
@@ -1,48 +0,0 @@
-kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setName($name)
-  {
-    $this->name = $name;
-  }
-  public function getName()
-  {
-    return $this->name;
-  }
-  public function setProperties($properties)
-  {
-    $this->properties = $properties;
-  }
-  public function getProperties()
-  {
-    return $this->properties;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dataflow/StreamLocation.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dataflow/StreamLocation.php
deleted file mode 100644
index feec6a28..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dataflow/StreamLocation.php
+++ /dev/null
@@ -1,61 +0,0 @@
-customSourceLocation = $customSourceLocation;
-  }
-  public function getCustomSourceLocation()
-  {
-    return $this->customSourceLocation;
-  }
-  public function setPubsubLocation(Google_Service_Dataflow_PubsubLocation $pubsubLocation)
-  {
-    $this->pubsubLocation = $pubsubLocation;
-  }
-  public function getPubsubLocation()
-  {
-    return $this->pubsubLocation;
-  }
-  public function setSideInputLocation(Google_Service_Dataflow_StreamingSideInputLocation $sideInputLocation)
-  {
-    $this->sideInputLocation = $sideInputLocation;
-  }
-  public function getSideInputLocation()
-  {
-    return $this->sideInputLocation;
-  }
-  public function setStreamingStageLocation(Google_Service_Dataflow_StreamingStageLocation $streamingStageLocation)
-  {
-    $this->streamingStageLocation = $streamingStageLocation;
-  }
-  public function getStreamingStageLocation()
-  {
-    return $this->streamingStageLocation;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dataflow/StreamingComputationConfig.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dataflow/StreamingComputationConfig.php
deleted file mode 100644
index 0cba9956..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dataflow/StreamingComputationConfig.php
+++ /dev/null
@@ -1,59 +0,0 @@
-computationId = $computationId;
-  }
-  public function getComputationId()
-  {
-    return $this->computationId;
-  }
-  public function setInstructions($instructions)
-  {
-    $this->instructions = $instructions;
-  }
-  public function getInstructions()
-  {
-    return $this->instructions;
-  }
-  public function setStageName($stageName)
-  {
-    $this->stageName = $stageName;
-  }
-  public function getStageName()
-  {
-    return $this->stageName;
-  }
-  public function setSystemName($systemName)
-  {
-    $this->systemName = $systemName;
-  }
-  public function getSystemName()
-  {
-    return $this->systemName;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dataflow/StreamingComputationRanges.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dataflow/StreamingComputationRanges.php
deleted file mode 100644
index 9d618c93..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dataflow/StreamingComputationRanges.php
+++ /dev/null
@@ -1,41 +0,0 @@
-computationId = $computationId;
-  }
-  public function getComputationId()
-  {
-    return $this->computationId;
-  }
-  public function setRangeAssignments($rangeAssignments)
-  {
-    $this->rangeAssignments = $rangeAssignments;
-  }
-  public function getRangeAssignments()
-  {
-    return $this->rangeAssignments;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dataflow/StreamingComputationTask.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dataflow/StreamingComputationTask.php
deleted file mode 100644
index e83408e0..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dataflow/StreamingComputationTask.php
+++ /dev/null
@@ -1,51 +0,0 @@
-computationRanges = $computationRanges;
-  }
-  public function getComputationRanges()
-  {
-    return $this->computationRanges;
-  }
-  public function setDataDisks($dataDisks)
-  {
-    $this->dataDisks = $dataDisks;
-  }
-  public function getDataDisks()
-  {
-    return $this->dataDisks;
-  }
-  public function setTaskType($taskType)
-  {
-    $this->taskType = $taskType;
-  }
-  public function getTaskType()
-  {
-    return $this->taskType;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dataflow/StreamingConfigTask.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dataflow/StreamingConfigTask.php
deleted file mode 100644
index 38741425..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dataflow/StreamingConfigTask.php
+++ /dev/null
@@ -1,41 +0,0 @@
-streamingComputationConfigs = $streamingComputationConfigs;
-  }
-  public function getStreamingComputationConfigs()
-  {
-    return $this->streamingComputationConfigs;
-  }
-  public function setUserStepToStateFamilyNameMap($userStepToStateFamilyNameMap)
-  {
-    $this->userStepToStateFamilyNameMap = $userStepToStateFamilyNameMap;
-  }
-  public function getUserStepToStateFamilyNameMap()
-  {
-    return $this->userStepToStateFamilyNameMap;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dataflow/StreamingSetupTask.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dataflow/StreamingSetupTask.php
deleted file mode 100644
index a3786ce7..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dataflow/StreamingSetupTask.php
+++ /dev/null
@@ -1,58 +0,0 @@
-drain = $drain;
-  }
-  public function getDrain()
-  {
-    return $this->drain;
-  }
-  public function setReceiveWorkPort($receiveWorkPort)
-  {
-    $this->receiveWorkPort = $receiveWorkPort;
-  }
-  public function getReceiveWorkPort()
-  {
-    return $this->receiveWorkPort;
-  }
-  public function setStreamingComputationTopology(Google_Service_Dataflow_TopologyConfig $streamingComputationTopology)
-  {
-    $this->streamingComputationTopology = $streamingComputationTopology;
-  }
-  public function getStreamingComputationTopology()
-  {
-    return $this->streamingComputationTopology;
-  }
-  public function setWorkerHarnessPort($workerHarnessPort)
-  {
-    $this->workerHarnessPort = $workerHarnessPort;
-  }
-  public function getWorkerHarnessPort()
-  {
-    return $this->workerHarnessPort;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dataflow/StreamingSideInputLocation.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dataflow/StreamingSideInputLocation.php
deleted file mode 100644
index 04643d12..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dataflow/StreamingSideInputLocation.php
+++ /dev/null
@@ -1,39 +0,0 @@
-stateFamily = $stateFamily;
-  }
-  public function getStateFamily()
-  {
-    return $this->stateFamily;
-  }
-  public function setTag($tag)
-  {
-    $this->tag = $tag;
-  }
-  public function getTag()
-  {
-    return $this->tag;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dataflow/StreamingStageLocation.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dataflow/StreamingStageLocation.php
deleted file mode 100644
index 2d9474e8..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dataflow/StreamingStageLocation.php
+++ /dev/null
@@ -1,30 +0,0 @@
-streamId = $streamId;
-  }
-  public function getStreamId()
-  {
-    return $this->streamId;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dataflow/StringList.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dataflow/StringList.php
deleted file mode 100644
index 04779e71..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dataflow/StringList.php
+++ /dev/null
@@ -1,31 +0,0 @@
-elements = $elements;
-  }
-  public function getElements()
-  {
-    return $this->elements;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dataflow/TaskRunnerSettings.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dataflow/TaskRunnerSettings.php
deleted file mode 100644
index 50bac084..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dataflow/TaskRunnerSettings.php
+++ /dev/null
@@ -1,194 +0,0 @@
-alsologtostderr = $alsologtostderr;
-  }
-  public function getAlsologtostderr()
-  {
-    return $this->alsologtostderr;
-  }
-  public function setBaseTaskDir($baseTaskDir)
-  {
-    $this->baseTaskDir = $baseTaskDir;
-  }
-  public function getBaseTaskDir()
-  {
-    return $this->baseTaskDir;
-  }
-  public function setBaseUrl($baseUrl)
-  {
-    $this->baseUrl = $baseUrl;
-  }
-  public function getBaseUrl()
-  {
-    return $this->baseUrl;
-  }
-  public function setCommandlinesFileName($commandlinesFileName)
-  {
-    $this->commandlinesFileName = $commandlinesFileName;
-  }
-  public function getCommandlinesFileName()
-  {
-    return $this->commandlinesFileName;
-  }
-  public function setContinueOnException($continueOnException)
-  {
-    $this->continueOnException = $continueOnException;
-  }
-  public function getContinueOnException()
-  {
-    return $this->continueOnException;
-  }
-  public function setDataflowApiVersion($dataflowApiVersion)
-  {
-    $this->dataflowApiVersion = $dataflowApiVersion;
-  }
-  public function getDataflowApiVersion()
-  {
-    return $this->dataflowApiVersion;
-  }
-  public function setHarnessCommand($harnessCommand)
-  {
-    $this->harnessCommand = $harnessCommand;
-  }
-  public function getHarnessCommand()
-  {
-    return $this->harnessCommand;
-  }
-  public function setLanguageHint($languageHint)
-  {
-    $this->languageHint = $languageHint;
-  }
-  public function getLanguageHint()
-  {
-    return $this->languageHint;
-  }
-  public function setLogDir($logDir)
-  {
-    $this->logDir = $logDir;
-  }
-  public function getLogDir()
-  {
-    return $this->logDir;
-  }
-  public function setLogToSerialconsole($logToSerialconsole)
-  {
-    $this->logToSerialconsole = $logToSerialconsole;
-  }
-  public function getLogToSerialconsole()
-  {
-    return $this->logToSerialconsole;
-  }
-  public function setLogUploadLocation($logUploadLocation)
-  {
-    $this->logUploadLocation = $logUploadLocation;
-  }
-  public function getLogUploadLocation()
-  {
-    return $this->logUploadLocation;
-  }
-  public function setOauthScopes($oauthScopes)
-  {
-    $this->oauthScopes = $oauthScopes;
-  }
-  public function getOauthScopes()
-  {
-    return $this->oauthScopes;
-  }
-  public function setParallelWorkerSettings(Google_Service_Dataflow_WorkerSettings $parallelWorkerSettings)
-  {
-    $this->parallelWorkerSettings = $parallelWorkerSettings;
-  }
-  public function getParallelWorkerSettings()
-  {
-    return $this->parallelWorkerSettings;
-  }
-  public function setStreamingWorkerMainClass($streamingWorkerMainClass)
-  {
-    $this->streamingWorkerMainClass = $streamingWorkerMainClass;
-  }
-  public function getStreamingWorkerMainClass()
-  {
-    return $this->streamingWorkerMainClass;
-  }
-  public function setTaskGroup($taskGroup)
-  {
-    $this->taskGroup = $taskGroup;
-  }
-  public function getTaskGroup()
-  {
-    return $this->taskGroup;
-  }
-  public function setTaskUser($taskUser)
-  {
-    $this->taskUser = $taskUser;
-  }
-  public function getTaskUser()
-  {
-    return $this->taskUser;
-  }
-  public function setTempStoragePrefix($tempStoragePrefix)
-  {
-    $this->tempStoragePrefix = $tempStoragePrefix;
-  }
-  public function getTempStoragePrefix()
-  {
-    return $this->tempStoragePrefix;
-  }
-  public function setVmId($vmId)
-  {
-    $this->vmId = $vmId;
-  }
-  public function getVmId()
-  {
-    return $this->vmId;
-  }
-  public function setWorkflowFileName($workflowFileName)
-  {
-    $this->workflowFileName = $workflowFileName;
-  }
-  public function getWorkflowFileName()
-  {
-    return $this->workflowFileName;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dataflow/TemplateMetadata.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dataflow/TemplateMetadata.php
deleted file mode 100644
index 3428c67e..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dataflow/TemplateMetadata.php
+++ /dev/null
@@ -1,59 +0,0 @@
-bypassTempDirValidation = $bypassTempDirValidation;
-  }
-  public function getBypassTempDirValidation()
-  {
-    return $this->bypassTempDirValidation;
-  }
-  public function setDescription($description)
-  {
-    $this->description = $description;
-  }
-  public function getDescription()
-  {
-    return $this->description;
-  }
-  public function setName($name)
-  {
-    $this->name = $name;
-  }
-  public function getName()
-  {
-    return $this->name;
-  }
-  public function setParameters($parameters)
-  {
-    $this->parameters = $parameters;
-  }
-  public function getParameters()
-  {
-    return $this->parameters;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dataflow/TopologyConfig.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dataflow/TopologyConfig.php
deleted file mode 100644
index 0eb190b6..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dataflow/TopologyConfig.php
+++ /dev/null
@@ -1,69 +0,0 @@
-computations = $computations;
-  }
-  public function getComputations()
-  {
-    return $this->computations;
-  }
-  public function setDataDiskAssignments($dataDiskAssignments)
-  {
-    $this->dataDiskAssignments = $dataDiskAssignments;
-  }
-  public function getDataDiskAssignments()
-  {
-    return $this->dataDiskAssignments;
-  }
-  public function setForwardingKeyBits($forwardingKeyBits)
-  {
-    $this->forwardingKeyBits = $forwardingKeyBits;
-  }
-  public function getForwardingKeyBits()
-  {
-    return $this->forwardingKeyBits;
-  }
-  public function setPersistentStateVersion($persistentStateVersion)
-  {
-    $this->persistentStateVersion = $persistentStateVersion;
-  }
-  public function getPersistentStateVersion()
-  {
-    return $this->persistentStateVersion;
-  }
-  public function setUserStageToComputationNameMap($userStageToComputationNameMap)
-  {
-    $this->userStageToComputationNameMap = $userStageToComputationNameMap;
-  }
-  public function getUserStageToComputationNameMap()
-  {
-    return $this->userStageToComputationNameMap;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dataflow/TransformSummary.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dataflow/TransformSummary.php
deleted file mode 100644
index e967dd99..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dataflow/TransformSummary.php
+++ /dev/null
@@ -1,77 +0,0 @@
-displayData = $displayData;
-  }
-  public function getDisplayData()
-  {
-    return $this->displayData;
-  }
-  public function setId($id)
-  {
-    $this->id = $id;
-  }
-  public function getId()
-  {
-    return $this->id;
-  }
-  public function setInputCollectionName($inputCollectionName)
-  {
-    $this->inputCollectionName = $inputCollectionName;
-  }
-  public function getInputCollectionName()
-  {
-    return $this->inputCollectionName;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setName($name)
-  {
-    $this->name = $name;
-  }
-  public function getName()
-  {
-    return $this->name;
-  }
-  public function setOutputCollectionName($outputCollectionName)
-  {
-    $this->outputCollectionName = $outputCollectionName;
-  }
-  public function getOutputCollectionName()
-  {
-    return $this->outputCollectionName;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dataflow/WorkItem.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dataflow/WorkItem.php
deleted file mode 100644
index 98a544ec..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dataflow/WorkItem.php
+++ /dev/null
@@ -1,165 +0,0 @@
-configuration = $configuration;
-  }
-  public function getConfiguration()
-  {
-    return $this->configuration;
-  }
-  public function setId($id)
-  {
-    $this->id = $id;
-  }
-  public function getId()
-  {
-    return $this->id;
-  }
-  public function setInitialReportIndex($initialReportIndex)
-  {
-    $this->initialReportIndex = $initialReportIndex;
-  }
-  public function getInitialReportIndex()
-  {
-    return $this->initialReportIndex;
-  }
-  public function setJobId($jobId)
-  {
-    $this->jobId = $jobId;
-  }
-  public function getJobId()
-  {
-    return $this->jobId;
-  }
-  public function setLeaseExpireTime($leaseExpireTime)
-  {
-    $this->leaseExpireTime = $leaseExpireTime;
-  }
-  public function getLeaseExpireTime()
-  {
-    return $this->leaseExpireTime;
-  }
-  public function setMapTask(Google_Service_Dataflow_MapTask $mapTask)
-  {
-    $this->mapTask = $mapTask;
-  }
-  public function getMapTask()
-  {
-    return $this->mapTask;
-  }
-  public function setPackages($packages)
-  {
-    $this->packages = $packages;
-  }
-  public function getPackages()
-  {
-    return $this->packages;
-  }
-  public function setProjectId($projectId)
-  {
-    $this->projectId = $projectId;
-  }
-  public function getProjectId()
-  {
-    return $this->projectId;
-  }
-  public function setReportStatusInterval($reportStatusInterval)
-  {
-    $this->reportStatusInterval = $reportStatusInterval;
-  }
-  public function getReportStatusInterval()
-  {
-    return $this->reportStatusInterval;
-  }
-  public function setSeqMapTask(Google_Service_Dataflow_SeqMapTask $seqMapTask)
-  {
-    $this->seqMapTask = $seqMapTask;
-  }
-  public function getSeqMapTask()
-  {
-    return $this->seqMapTask;
-  }
-  public function setShellTask(Google_Service_Dataflow_ShellTask $shellTask)
-  {
-    $this->shellTask = $shellTask;
-  }
-  public function getShellTask()
-  {
-    return $this->shellTask;
-  }
-  public function setSourceOperationTask(Google_Service_Dataflow_SourceOperationRequest $sourceOperationTask)
-  {
-    $this->sourceOperationTask = $sourceOperationTask;
-  }
-  public function getSourceOperationTask()
-  {
-    return $this->sourceOperationTask;
-  }
-  public function setStreamingComputationTask(Google_Service_Dataflow_StreamingComputationTask $streamingComputationTask)
-  {
-    $this->streamingComputationTask = $streamingComputationTask;
-  }
-  public function getStreamingComputationTask()
-  {
-    return $this->streamingComputationTask;
-  }
-  public function setStreamingConfigTask(Google_Service_Dataflow_StreamingConfigTask $streamingConfigTask)
-  {
-    $this->streamingConfigTask = $streamingConfigTask;
-  }
-  public function getStreamingConfigTask()
-  {
-    return $this->streamingConfigTask;
-  }
-  public function setStreamingSetupTask(Google_Service_Dataflow_StreamingSetupTask $streamingSetupTask)
-  {
-    $this->streamingSetupTask = $streamingSetupTask;
-  }
-  public function getStreamingSetupTask()
-  {
-    return $this->streamingSetupTask;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dataflow/WorkItemServiceState.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dataflow/WorkItemServiceState.php
deleted file mode 100644
index 3398321e..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dataflow/WorkItemServiceState.php
+++ /dev/null
@@ -1,98 +0,0 @@
-harnessData = $harnessData;
-  }
-  public function getHarnessData()
-  {
-    return $this->harnessData;
-  }
-  public function setLeaseExpireTime($leaseExpireTime)
-  {
-    $this->leaseExpireTime = $leaseExpireTime;
-  }
-  public function getLeaseExpireTime()
-  {
-    return $this->leaseExpireTime;
-  }
-  public function setMetricShortId($metricShortId)
-  {
-    $this->metricShortId = $metricShortId;
-  }
-  public function getMetricShortId()
-  {
-    return $this->metricShortId;
-  }
-  public function setNextReportIndex($nextReportIndex)
-  {
-    $this->nextReportIndex = $nextReportIndex;
-  }
-  public function getNextReportIndex()
-  {
-    return $this->nextReportIndex;
-  }
-  public function setReportStatusInterval($reportStatusInterval)
-  {
-    $this->reportStatusInterval = $reportStatusInterval;
-  }
-  public function getReportStatusInterval()
-  {
-    return $this->reportStatusInterval;
-  }
-  public function setSplitRequest(Google_Service_Dataflow_ApproximateSplitRequest $splitRequest)
-  {
-    $this->splitRequest = $splitRequest;
-  }
-  public function getSplitRequest()
-  {
-    return $this->splitRequest;
-  }
-  public function setSuggestedStopPoint(Google_Service_Dataflow_ApproximateProgress $suggestedStopPoint)
-  {
-    $this->suggestedStopPoint = $suggestedStopPoint;
-  }
-  public function getSuggestedStopPoint()
-  {
-    return $this->suggestedStopPoint;
-  }
-  public function setSuggestedStopPosition(Google_Service_Dataflow_Position $suggestedStopPosition)
-  {
-    $this->suggestedStopPosition = $suggestedStopPosition;
-  }
-  public function getSuggestedStopPosition()
-  {
-    return $this->suggestedStopPosition;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dataflow/WorkItemStatus.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dataflow/WorkItemStatus.php
deleted file mode 100644
index 0eba4843..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dataflow/WorkItemStatus.php
+++ /dev/null
@@ -1,148 +0,0 @@
-completed = $completed;
-  }
-  public function getCompleted()
-  {
-    return $this->completed;
-  }
-  public function setCounterUpdates($counterUpdates)
-  {
-    $this->counterUpdates = $counterUpdates;
-  }
-  public function getCounterUpdates()
-  {
-    return $this->counterUpdates;
-  }
-  public function setDynamicSourceSplit(Google_Service_Dataflow_DynamicSourceSplit $dynamicSourceSplit)
-  {
-    $this->dynamicSourceSplit = $dynamicSourceSplit;
-  }
-  public function getDynamicSourceSplit()
-  {
-    return $this->dynamicSourceSplit;
-  }
-  public function setErrors($errors)
-  {
-    $this->errors = $errors;
-  }
-  public function getErrors()
-  {
-    return $this->errors;
-  }
-  public function setMetricUpdates($metricUpdates)
-  {
-    $this->metricUpdates = $metricUpdates;
-  }
-  public function getMetricUpdates()
-  {
-    return $this->metricUpdates;
-  }
-  public function setProgress(Google_Service_Dataflow_ApproximateProgress $progress)
-  {
-    $this->progress = $progress;
-  }
-  public function getProgress()
-  {
-    return $this->progress;
-  }
-  public function setReportIndex($reportIndex)
-  {
-    $this->reportIndex = $reportIndex;
-  }
-  public function getReportIndex()
-  {
-    return $this->reportIndex;
-  }
-  public function setReportedProgress(Google_Service_Dataflow_ApproximateReportedProgress $reportedProgress)
-  {
-    $this->reportedProgress = $reportedProgress;
-  }
-  public function getReportedProgress()
-  {
-    return $this->reportedProgress;
-  }
-  public function setRequestedLeaseDuration($requestedLeaseDuration)
-  {
-    $this->requestedLeaseDuration = $requestedLeaseDuration;
-  }
-  public function getRequestedLeaseDuration()
-  {
-    return $this->requestedLeaseDuration;
-  }
-  public function setSourceFork(Google_Service_Dataflow_SourceFork $sourceFork)
-  {
-    $this->sourceFork = $sourceFork;
-  }
-  public function getSourceFork()
-  {
-    return $this->sourceFork;
-  }
-  public function setSourceOperationResponse(Google_Service_Dataflow_SourceOperationResponse $sourceOperationResponse)
-  {
-    $this->sourceOperationResponse = $sourceOperationResponse;
-  }
-  public function getSourceOperationResponse()
-  {
-    return $this->sourceOperationResponse;
-  }
-  public function setStopPosition(Google_Service_Dataflow_Position $stopPosition)
-  {
-    $this->stopPosition = $stopPosition;
-  }
-  public function getStopPosition()
-  {
-    return $this->stopPosition;
-  }
-  public function setWorkItemId($workItemId)
-  {
-    $this->workItemId = $workItemId;
-  }
-  public function getWorkItemId()
-  {
-    return $this->workItemId;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dataflow/WorkerHealthReport.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dataflow/WorkerHealthReport.php
deleted file mode 100644
index ee81dd17..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dataflow/WorkerHealthReport.php
+++ /dev/null
@@ -1,58 +0,0 @@
-pods = $pods;
-  }
-  public function getPods()
-  {
-    return $this->pods;
-  }
-  public function setReportInterval($reportInterval)
-  {
-    $this->reportInterval = $reportInterval;
-  }
-  public function getReportInterval()
-  {
-    return $this->reportInterval;
-  }
-  public function setVmIsHealthy($vmIsHealthy)
-  {
-    $this->vmIsHealthy = $vmIsHealthy;
-  }
-  public function getVmIsHealthy()
-  {
-    return $this->vmIsHealthy;
-  }
-  public function setVmStartupTime($vmStartupTime)
-  {
-    $this->vmStartupTime = $vmStartupTime;
-  }
-  public function getVmStartupTime()
-  {
-    return $this->vmStartupTime;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dataflow/WorkerHealthReportResponse.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dataflow/WorkerHealthReportResponse.php
deleted file mode 100644
index 8ba4d47c..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dataflow/WorkerHealthReportResponse.php
+++ /dev/null
@@ -1,30 +0,0 @@
-reportInterval = $reportInterval;
-  }
-  public function getReportInterval()
-  {
-    return $this->reportInterval;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dataflow/WorkerMessage.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dataflow/WorkerMessage.php
deleted file mode 100644
index d3af1017..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dataflow/WorkerMessage.php
+++ /dev/null
@@ -1,69 +0,0 @@
-labels = $labels;
-  }
-  public function getLabels()
-  {
-    return $this->labels;
-  }
-  public function setTime($time)
-  {
-    $this->time = $time;
-  }
-  public function getTime()
-  {
-    return $this->time;
-  }
-  public function setWorkerHealthReport(Google_Service_Dataflow_WorkerHealthReport $workerHealthReport)
-  {
-    $this->workerHealthReport = $workerHealthReport;
-  }
-  public function getWorkerHealthReport()
-  {
-    return $this->workerHealthReport;
-  }
-  public function setWorkerMessageCode(Google_Service_Dataflow_WorkerMessageCode $workerMessageCode)
-  {
-    $this->workerMessageCode = $workerMessageCode;
-  }
-  public function getWorkerMessageCode()
-  {
-    return $this->workerMessageCode;
-  }
-  public function setWorkerMetrics(Google_Service_Dataflow_ResourceUtilizationReport $workerMetrics)
-  {
-    $this->workerMetrics = $workerMetrics;
-  }
-  public function getWorkerMetrics()
-  {
-    return $this->workerMetrics;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dataflow/WorkerMessageCode.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dataflow/WorkerMessageCode.php
deleted file mode 100644
index 1a4a6841..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dataflow/WorkerMessageCode.php
+++ /dev/null
@@ -1,39 +0,0 @@
-code = $code;
-  }
-  public function getCode()
-  {
-    return $this->code;
-  }
-  public function setParameters($parameters)
-  {
-    $this->parameters = $parameters;
-  }
-  public function getParameters()
-  {
-    return $this->parameters;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dataflow/WorkerMessageResponse.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dataflow/WorkerMessageResponse.php
deleted file mode 100644
index edd8da8f..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dataflow/WorkerMessageResponse.php
+++ /dev/null
@@ -1,41 +0,0 @@
-workerHealthReportResponse = $workerHealthReportResponse;
-  }
-  public function getWorkerHealthReportResponse()
-  {
-    return $this->workerHealthReportResponse;
-  }
-  public function setWorkerMetricsResponse(Google_Service_Dataflow_ResourceUtilizationReportResponse $workerMetricsResponse)
-  {
-    $this->workerMetricsResponse = $workerMetricsResponse;
-  }
-  public function getWorkerMetricsResponse()
-  {
-    return $this->workerMetricsResponse;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dataflow/WorkerPool.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dataflow/WorkerPool.php
deleted file mode 100644
index a75cecc9..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dataflow/WorkerPool.php
+++ /dev/null
@@ -1,215 +0,0 @@
-autoscalingSettings = $autoscalingSettings;
-  }
-  public function getAutoscalingSettings()
-  {
-    return $this->autoscalingSettings;
-  }
-  public function setDataDisks($dataDisks)
-  {
-    $this->dataDisks = $dataDisks;
-  }
-  public function getDataDisks()
-  {
-    return $this->dataDisks;
-  }
-  public function setDefaultPackageSet($defaultPackageSet)
-  {
-    $this->defaultPackageSet = $defaultPackageSet;
-  }
-  public function getDefaultPackageSet()
-  {
-    return $this->defaultPackageSet;
-  }
-  public function setDiskSizeGb($diskSizeGb)
-  {
-    $this->diskSizeGb = $diskSizeGb;
-  }
-  public function getDiskSizeGb()
-  {
-    return $this->diskSizeGb;
-  }
-  public function setDiskSourceImage($diskSourceImage)
-  {
-    $this->diskSourceImage = $diskSourceImage;
-  }
-  public function getDiskSourceImage()
-  {
-    return $this->diskSourceImage;
-  }
-  public function setDiskType($diskType)
-  {
-    $this->diskType = $diskType;
-  }
-  public function getDiskType()
-  {
-    return $this->diskType;
-  }
-  public function setIpConfiguration($ipConfiguration)
-  {
-    $this->ipConfiguration = $ipConfiguration;
-  }
-  public function getIpConfiguration()
-  {
-    return $this->ipConfiguration;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setMachineType($machineType)
-  {
-    $this->machineType = $machineType;
-  }
-  public function getMachineType()
-  {
-    return $this->machineType;
-  }
-  public function setMetadata($metadata)
-  {
-    $this->metadata = $metadata;
-  }
-  public function getMetadata()
-  {
-    return $this->metadata;
-  }
-  public function setNetwork($network)
-  {
-    $this->network = $network;
-  }
-  public function getNetwork()
-  {
-    return $this->network;
-  }
-  public function setNumThreadsPerWorker($numThreadsPerWorker)
-  {
-    $this->numThreadsPerWorker = $numThreadsPerWorker;
-  }
-  public function getNumThreadsPerWorker()
-  {
-    return $this->numThreadsPerWorker;
-  }
-  public function setNumWorkers($numWorkers)
-  {
-    $this->numWorkers = $numWorkers;
-  }
-  public function getNumWorkers()
-  {
-    return $this->numWorkers;
-  }
-  public function setOnHostMaintenance($onHostMaintenance)
-  {
-    $this->onHostMaintenance = $onHostMaintenance;
-  }
-  public function getOnHostMaintenance()
-  {
-    return $this->onHostMaintenance;
-  }
-  public function setPackages($packages)
-  {
-    $this->packages = $packages;
-  }
-  public function getPackages()
-  {
-    return $this->packages;
-  }
-  public function setPoolArgs($poolArgs)
-  {
-    $this->poolArgs = $poolArgs;
-  }
-  public function getPoolArgs()
-  {
-    return $this->poolArgs;
-  }
-  public function setSubnetwork($subnetwork)
-  {
-    $this->subnetwork = $subnetwork;
-  }
-  public function getSubnetwork()
-  {
-    return $this->subnetwork;
-  }
-  public function setTaskrunnerSettings(Google_Service_Dataflow_TaskRunnerSettings $taskrunnerSettings)
-  {
-    $this->taskrunnerSettings = $taskrunnerSettings;
-  }
-  public function getTaskrunnerSettings()
-  {
-    return $this->taskrunnerSettings;
-  }
-  public function setTeardownPolicy($teardownPolicy)
-  {
-    $this->teardownPolicy = $teardownPolicy;
-  }
-  public function getTeardownPolicy()
-  {
-    return $this->teardownPolicy;
-  }
-  public function setWorkerHarnessContainerImage($workerHarnessContainerImage)
-  {
-    $this->workerHarnessContainerImage = $workerHarnessContainerImage;
-  }
-  public function getWorkerHarnessContainerImage()
-  {
-    return $this->workerHarnessContainerImage;
-  }
-  public function setZone($zone)
-  {
-    $this->zone = $zone;
-  }
-  public function getZone()
-  {
-    return $this->zone;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dataflow/WorkerSettings.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dataflow/WorkerSettings.php
deleted file mode 100644
index d3a58d39..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dataflow/WorkerSettings.php
+++ /dev/null
@@ -1,75 +0,0 @@
-baseUrl = $baseUrl;
-  }
-  public function getBaseUrl()
-  {
-    return $this->baseUrl;
-  }
-  public function setReportingEnabled($reportingEnabled)
-  {
-    $this->reportingEnabled = $reportingEnabled;
-  }
-  public function getReportingEnabled()
-  {
-    return $this->reportingEnabled;
-  }
-  public function setServicePath($servicePath)
-  {
-    $this->servicePath = $servicePath;
-  }
-  public function getServicePath()
-  {
-    return $this->servicePath;
-  }
-  public function setShuffleServicePath($shuffleServicePath)
-  {
-    $this->shuffleServicePath = $shuffleServicePath;
-  }
-  public function getShuffleServicePath()
-  {
-    return $this->shuffleServicePath;
-  }
-  public function setTempStoragePrefix($tempStoragePrefix)
-  {
-    $this->tempStoragePrefix = $tempStoragePrefix;
-  }
-  public function getTempStoragePrefix()
-  {
-    return $this->tempStoragePrefix;
-  }
-  public function setWorkerId($workerId)
-  {
-    $this->workerId = $workerId;
-  }
-  public function getWorkerId()
-  {
-    return $this->workerId;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dataflow/WriteInstruction.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dataflow/WriteInstruction.php
deleted file mode 100644
index 62bebc75..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dataflow/WriteInstruction.php
+++ /dev/null
@@ -1,41 +0,0 @@
-input = $input;
-  }
-  public function getInput()
-  {
-    return $this->input;
-  }
-  public function setSink(Google_Service_Dataflow_Sink $sink)
-  {
-    $this->sink = $sink;
-  }
-  public function getSink()
-  {
-    return $this->sink;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dataproc.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dataproc.php
deleted file mode 100644
index ddd618c1..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dataproc.php
+++ /dev/null
@@ -1,397 +0,0 @@
-
- * Manages Hadoop-based clusters and jobs on Google Cloud Platform.

- *
- * 

- * For more information about this service, see the API
- * Documentation
- * 

- *
- * @author Google, Inc.
- */
-class Google_Service_Dataproc extends Google_Service
-{
-  /** View and manage your data across Google Cloud Platform services. */
-  const CLOUD_PLATFORM =
-      "https://www.googleapis.com/auth/cloud-platform";
-
-  public $projects_regions_clusters;
-  public $projects_regions_jobs;
-  public $projects_regions_operations;
-  
-  /**
-   * Constructs the internal representation of the Dataproc service.
-   *
-   * @param Google_Client $client
-   */
-  public function __construct(Google_Client $client)
-  {
-    parent::__construct($client);
-    $this->rootUrl = 'https://dataproc.googleapis.com/';
-    $this->servicePath = '';
-    $this->version = 'v1';
-    $this->serviceName = 'dataproc';
-
-    $this->projects_regions_clusters = new Google_Service_Dataproc_Resource_ProjectsRegionsClusters(
-        $this,
-        $this->serviceName,
-        'clusters',
-        array(
-          'methods' => array(
-            'create' => array(
-              'path' => 'v1/projects/{projectId}/regions/{region}/clusters',
-              'httpMethod' => 'POST',
-              'parameters' => array(
-                'projectId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'region' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'delete' => array(
-              'path' => 'v1/projects/{projectId}/regions/{region}/clusters/{clusterName}',
-              'httpMethod' => 'DELETE',
-              'parameters' => array(
-                'projectId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'region' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'clusterName' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'diagnose' => array(
-              'path' => 'v1/projects/{projectId}/regions/{region}/clusters/{clusterName}:diagnose',
-              'httpMethod' => 'POST',
-              'parameters' => array(
-                'projectId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'region' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'clusterName' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'get' => array(
-              'path' => 'v1/projects/{projectId}/regions/{region}/clusters/{clusterName}',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'projectId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'region' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'clusterName' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'list' => array(
-              'path' => 'v1/projects/{projectId}/regions/{region}/clusters',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'projectId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'region' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'filter' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'pageToken' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'pageSize' => array(
-                  'location' => 'query',
-                  'type' => 'integer',
-                ),
-              ),
-            ),'patch' => array(
-              'path' => 'v1/projects/{projectId}/regions/{region}/clusters/{clusterName}',
-              'httpMethod' => 'PATCH',
-              'parameters' => array(
-                'projectId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'region' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'clusterName' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'updateMask' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-              ),
-            ),
-          )
-        )
-    );
-    $this->projects_regions_jobs = new Google_Service_Dataproc_Resource_ProjectsRegionsJobs(
-        $this,
-        $this->serviceName,
-        'jobs',
-        array(
-          'methods' => array(
-            'cancel' => array(
-              'path' => 'v1/projects/{projectId}/regions/{region}/jobs/{jobId}:cancel',
-              'httpMethod' => 'POST',
-              'parameters' => array(
-                'projectId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'region' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'jobId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'delete' => array(
-              'path' => 'v1/projects/{projectId}/regions/{region}/jobs/{jobId}',
-              'httpMethod' => 'DELETE',
-              'parameters' => array(
-                'projectId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'region' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'jobId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'get' => array(
-              'path' => 'v1/projects/{projectId}/regions/{region}/jobs/{jobId}',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'projectId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'region' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'jobId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'list' => array(
-              'path' => 'v1/projects/{projectId}/regions/{region}/jobs',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'projectId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'region' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'pageToken' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'pageSize' => array(
-                  'location' => 'query',
-                  'type' => 'integer',
-                ),
-                'clusterName' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'filter' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'jobStateMatcher' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-              ),
-            ),'patch' => array(
-              'path' => 'v1/projects/{projectId}/regions/{region}/jobs/{jobId}',
-              'httpMethod' => 'PATCH',
-              'parameters' => array(
-                'projectId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'region' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'jobId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'updateMask' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-              ),
-            ),'submit' => array(
-              'path' => 'v1/projects/{projectId}/regions/{region}/jobs:submit',
-              'httpMethod' => 'POST',
-              'parameters' => array(
-                'projectId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'region' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),
-          )
-        )
-    );
-    $this->projects_regions_operations = new Google_Service_Dataproc_Resource_ProjectsRegionsOperations(
-        $this,
-        $this->serviceName,
-        'operations',
-        array(
-          'methods' => array(
-            'cancel' => array(
-              'path' => 'v1/{+name}:cancel',
-              'httpMethod' => 'POST',
-              'parameters' => array(
-                'name' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'delete' => array(
-              'path' => 'v1/{+name}',
-              'httpMethod' => 'DELETE',
-              'parameters' => array(
-                'name' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'get' => array(
-              'path' => 'v1/{+name}',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'name' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'list' => array(
-              'path' => 'v1/{+name}',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'name' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'pageSize' => array(
-                  'location' => 'query',
-                  'type' => 'integer',
-                ),
-                'filter' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'pageToken' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-              ),
-            ),
-          )
-        )
-    );
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dataproc/AcceleratorConfig.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dataproc/AcceleratorConfig.php
deleted file mode 100644
index 626cb25a..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dataproc/AcceleratorConfig.php
+++ /dev/null
@@ -1,39 +0,0 @@
-acceleratorCount = $acceleratorCount;
-  }
-  public function getAcceleratorCount()
-  {
-    return $this->acceleratorCount;
-  }
-  public function setAcceleratorTypeUri($acceleratorTypeUri)
-  {
-    $this->acceleratorTypeUri = $acceleratorTypeUri;
-  }
-  public function getAcceleratorTypeUri()
-  {
-    return $this->acceleratorTypeUri;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dataproc/CancelJobRequest.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dataproc/CancelJobRequest.php
deleted file mode 100644
index 3eeeb947..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dataproc/CancelJobRequest.php
+++ /dev/null
@@ -1,20 +0,0 @@
-clusterName = $clusterName;
-  }
-  public function getClusterName()
-  {
-    return $this->clusterName;
-  }
-  public function setClusterUuid($clusterUuid)
-  {
-    $this->clusterUuid = $clusterUuid;
-  }
-  public function getClusterUuid()
-  {
-    return $this->clusterUuid;
-  }
-  public function setConfig(Google_Service_Dataproc_ClusterConfig $config)
-  {
-    $this->config = $config;
-  }
-  public function getConfig()
-  {
-    return $this->config;
-  }
-  public function setLabels($labels)
-  {
-    $this->labels = $labels;
-  }
-  public function getLabels()
-  {
-    return $this->labels;
-  }
-  public function setMetrics(Google_Service_Dataproc_ClusterMetrics $metrics)
-  {
-    $this->metrics = $metrics;
-  }
-  public function getMetrics()
-  {
-    return $this->metrics;
-  }
-  public function setProjectId($projectId)
-  {
-    $this->projectId = $projectId;
-  }
-  public function getProjectId()
-  {
-    return $this->projectId;
-  }
-  public function setStatus(Google_Service_Dataproc_ClusterStatus $status)
-  {
-    $this->status = $status;
-  }
-  public function getStatus()
-  {
-    return $this->status;
-  }
-  public function setStatusHistory($statusHistory)
-  {
-    $this->statusHistory = $statusHistory;
-  }
-  public function getStatusHistory()
-  {
-    return $this->statusHistory;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dataproc/ClusterConfig.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dataproc/ClusterConfig.php
deleted file mode 100644
index f70e0a13..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dataproc/ClusterConfig.php
+++ /dev/null
@@ -1,91 +0,0 @@
-configBucket = $configBucket;
-  }
-  public function getConfigBucket()
-  {
-    return $this->configBucket;
-  }
-  public function setGceClusterConfig(Google_Service_Dataproc_GceClusterConfig $gceClusterConfig)
-  {
-    $this->gceClusterConfig = $gceClusterConfig;
-  }
-  public function getGceClusterConfig()
-  {
-    return $this->gceClusterConfig;
-  }
-  public function setInitializationActions($initializationActions)
-  {
-    $this->initializationActions = $initializationActions;
-  }
-  public function getInitializationActions()
-  {
-    return $this->initializationActions;
-  }
-  public function setMasterConfig(Google_Service_Dataproc_InstanceGroupConfig $masterConfig)
-  {
-    $this->masterConfig = $masterConfig;
-  }
-  public function getMasterConfig()
-  {
-    return $this->masterConfig;
-  }
-  public function setSecondaryWorkerConfig(Google_Service_Dataproc_InstanceGroupConfig $secondaryWorkerConfig)
-  {
-    $this->secondaryWorkerConfig = $secondaryWorkerConfig;
-  }
-  public function getSecondaryWorkerConfig()
-  {
-    return $this->secondaryWorkerConfig;
-  }
-  public function setSoftwareConfig(Google_Service_Dataproc_SoftwareConfig $softwareConfig)
-  {
-    $this->softwareConfig = $softwareConfig;
-  }
-  public function getSoftwareConfig()
-  {
-    return $this->softwareConfig;
-  }
-  public function setWorkerConfig(Google_Service_Dataproc_InstanceGroupConfig $workerConfig)
-  {
-    $this->workerConfig = $workerConfig;
-  }
-  public function getWorkerConfig()
-  {
-    return $this->workerConfig;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dataproc/ClusterMetrics.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dataproc/ClusterMetrics.php
deleted file mode 100644
index 985b469a..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dataproc/ClusterMetrics.php
+++ /dev/null
@@ -1,39 +0,0 @@
-hdfsMetrics = $hdfsMetrics;
-  }
-  public function getHdfsMetrics()
-  {
-    return $this->hdfsMetrics;
-  }
-  public function setYarnMetrics($yarnMetrics)
-  {
-    $this->yarnMetrics = $yarnMetrics;
-  }
-  public function getYarnMetrics()
-  {
-    return $this->yarnMetrics;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dataproc/ClusterOperationMetadata.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dataproc/ClusterOperationMetadata.php
deleted file mode 100644
index 7c2fab7a..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dataproc/ClusterOperationMetadata.php
+++ /dev/null
@@ -1,96 +0,0 @@
-clusterName = $clusterName;
-  }
-  public function getClusterName()
-  {
-    return $this->clusterName;
-  }
-  public function setClusterUuid($clusterUuid)
-  {
-    $this->clusterUuid = $clusterUuid;
-  }
-  public function getClusterUuid()
-  {
-    return $this->clusterUuid;
-  }
-  public function setDescription($description)
-  {
-    $this->description = $description;
-  }
-  public function getDescription()
-  {
-    return $this->description;
-  }
-  public function setLabels($labels)
-  {
-    $this->labels = $labels;
-  }
-  public function getLabels()
-  {
-    return $this->labels;
-  }
-  public function setOperationType($operationType)
-  {
-    $this->operationType = $operationType;
-  }
-  public function getOperationType()
-  {
-    return $this->operationType;
-  }
-  public function setStatus(Google_Service_Dataproc_ClusterOperationStatus $status)
-  {
-    $this->status = $status;
-  }
-  public function getStatus()
-  {
-    return $this->status;
-  }
-  public function setStatusHistory($statusHistory)
-  {
-    $this->statusHistory = $statusHistory;
-  }
-  public function getStatusHistory()
-  {
-    return $this->statusHistory;
-  }
-  public function setWarnings($warnings)
-  {
-    $this->warnings = $warnings;
-  }
-  public function getWarnings()
-  {
-    return $this->warnings;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dataproc/ClusterOperationStatus.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dataproc/ClusterOperationStatus.php
deleted file mode 100644
index 8d4bc5ae..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dataproc/ClusterOperationStatus.php
+++ /dev/null
@@ -1,57 +0,0 @@
-details = $details;
-  }
-  public function getDetails()
-  {
-    return $this->details;
-  }
-  public function setInnerState($innerState)
-  {
-    $this->innerState = $innerState;
-  }
-  public function getInnerState()
-  {
-    return $this->innerState;
-  }
-  public function setState($state)
-  {
-    $this->state = $state;
-  }
-  public function getState()
-  {
-    return $this->state;
-  }
-  public function setStateStartTime($stateStartTime)
-  {
-    $this->stateStartTime = $stateStartTime;
-  }
-  public function getStateStartTime()
-  {
-    return $this->stateStartTime;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dataproc/ClusterStatus.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dataproc/ClusterStatus.php
deleted file mode 100644
index 81312805..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dataproc/ClusterStatus.php
+++ /dev/null
@@ -1,48 +0,0 @@
-detail = $detail;
-  }
-  public function getDetail()
-  {
-    return $this->detail;
-  }
-  public function setState($state)
-  {
-    $this->state = $state;
-  }
-  public function getState()
-  {
-    return $this->state;
-  }
-  public function setStateStartTime($stateStartTime)
-  {
-    $this->stateStartTime = $stateStartTime;
-  }
-  public function getStateStartTime()
-  {
-    return $this->stateStartTime;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dataproc/DataprocEmpty.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dataproc/DataprocEmpty.php
deleted file mode 100644
index 90de61d5..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dataproc/DataprocEmpty.php
+++ /dev/null
@@ -1,20 +0,0 @@
-outputUri = $outputUri;
-  }
-  public function getOutputUri()
-  {
-    return $this->outputUri;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dataproc/DiagnoseClusterRequest.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dataproc/DiagnoseClusterRequest.php
deleted file mode 100644
index 6c50fa5f..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dataproc/DiagnoseClusterRequest.php
+++ /dev/null
@@ -1,20 +0,0 @@
-outputUri = $outputUri;
-  }
-  public function getOutputUri()
-  {
-    return $this->outputUri;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dataproc/DiskConfig.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dataproc/DiskConfig.php
deleted file mode 100644
index 2ec2379e..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dataproc/DiskConfig.php
+++ /dev/null
@@ -1,39 +0,0 @@
-bootDiskSizeGb = $bootDiskSizeGb;
-  }
-  public function getBootDiskSizeGb()
-  {
-    return $this->bootDiskSizeGb;
-  }
-  public function setNumLocalSsds($numLocalSsds)
-  {
-    $this->numLocalSsds = $numLocalSsds;
-  }
-  public function getNumLocalSsds()
-  {
-    return $this->numLocalSsds;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dataproc/GceClusterConfig.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dataproc/GceClusterConfig.php
deleted file mode 100644
index 1bad1cdb..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dataproc/GceClusterConfig.php
+++ /dev/null
@@ -1,94 +0,0 @@
-internalIpOnly = $internalIpOnly;
-  }
-  public function getInternalIpOnly()
-  {
-    return $this->internalIpOnly;
-  }
-  public function setMetadata($metadata)
-  {
-    $this->metadata = $metadata;
-  }
-  public function getMetadata()
-  {
-    return $this->metadata;
-  }
-  public function setNetworkUri($networkUri)
-  {
-    $this->networkUri = $networkUri;
-  }
-  public function getNetworkUri()
-  {
-    return $this->networkUri;
-  }
-  public function setServiceAccount($serviceAccount)
-  {
-    $this->serviceAccount = $serviceAccount;
-  }
-  public function getServiceAccount()
-  {
-    return $this->serviceAccount;
-  }
-  public function setServiceAccountScopes($serviceAccountScopes)
-  {
-    $this->serviceAccountScopes = $serviceAccountScopes;
-  }
-  public function getServiceAccountScopes()
-  {
-    return $this->serviceAccountScopes;
-  }
-  public function setSubnetworkUri($subnetworkUri)
-  {
-    $this->subnetworkUri = $subnetworkUri;
-  }
-  public function getSubnetworkUri()
-  {
-    return $this->subnetworkUri;
-  }
-  public function setTags($tags)
-  {
-    $this->tags = $tags;
-  }
-  public function getTags()
-  {
-    return $this->tags;
-  }
-  public function setZoneUri($zoneUri)
-  {
-    $this->zoneUri = $zoneUri;
-  }
-  public function getZoneUri()
-  {
-    return $this->zoneUri;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dataproc/HadoopJob.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dataproc/HadoopJob.php
deleted file mode 100644
index fa2395c8..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dataproc/HadoopJob.php
+++ /dev/null
@@ -1,95 +0,0 @@
-archiveUris = $archiveUris;
-  }
-  public function getArchiveUris()
-  {
-    return $this->archiveUris;
-  }
-  public function setArgs($args)
-  {
-    $this->args = $args;
-  }
-  public function getArgs()
-  {
-    return $this->args;
-  }
-  public function setFileUris($fileUris)
-  {
-    $this->fileUris = $fileUris;
-  }
-  public function getFileUris()
-  {
-    return $this->fileUris;
-  }
-  public function setJarFileUris($jarFileUris)
-  {
-    $this->jarFileUris = $jarFileUris;
-  }
-  public function getJarFileUris()
-  {
-    return $this->jarFileUris;
-  }
-  public function setLoggingConfig(Google_Service_Dataproc_LoggingConfig $loggingConfig)
-  {
-    $this->loggingConfig = $loggingConfig;
-  }
-  public function getLoggingConfig()
-  {
-    return $this->loggingConfig;
-  }
-  public function setMainClass($mainClass)
-  {
-    $this->mainClass = $mainClass;
-  }
-  public function getMainClass()
-  {
-    return $this->mainClass;
-  }
-  public function setMainJarFileUri($mainJarFileUri)
-  {
-    $this->mainJarFileUri = $mainJarFileUri;
-  }
-  public function getMainJarFileUri()
-  {
-    return $this->mainJarFileUri;
-  }
-  public function setProperties($properties)
-  {
-    $this->properties = $properties;
-  }
-  public function getProperties()
-  {
-    return $this->properties;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dataproc/HiveJob.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dataproc/HiveJob.php
deleted file mode 100644
index 1e99ec2f..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dataproc/HiveJob.php
+++ /dev/null
@@ -1,77 +0,0 @@
-continueOnFailure = $continueOnFailure;
-  }
-  public function getContinueOnFailure()
-  {
-    return $this->continueOnFailure;
-  }
-  public function setJarFileUris($jarFileUris)
-  {
-    $this->jarFileUris = $jarFileUris;
-  }
-  public function getJarFileUris()
-  {
-    return $this->jarFileUris;
-  }
-  public function setProperties($properties)
-  {
-    $this->properties = $properties;
-  }
-  public function getProperties()
-  {
-    return $this->properties;
-  }
-  public function setQueryFileUri($queryFileUri)
-  {
-    $this->queryFileUri = $queryFileUri;
-  }
-  public function getQueryFileUri()
-  {
-    return $this->queryFileUri;
-  }
-  public function setQueryList(Google_Service_Dataproc_QueryList $queryList)
-  {
-    $this->queryList = $queryList;
-  }
-  public function getQueryList()
-  {
-    return $this->queryList;
-  }
-  public function setScriptVariables($scriptVariables)
-  {
-    $this->scriptVariables = $scriptVariables;
-  }
-  public function getScriptVariables()
-  {
-    return $this->scriptVariables;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dataproc/InstanceGroupConfig.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dataproc/InstanceGroupConfig.php
deleted file mode 100644
index 4c77e500..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dataproc/InstanceGroupConfig.php
+++ /dev/null
@@ -1,97 +0,0 @@
-accelerators = $accelerators;
-  }
-  public function getAccelerators()
-  {
-    return $this->accelerators;
-  }
-  public function setDiskConfig(Google_Service_Dataproc_DiskConfig $diskConfig)
-  {
-    $this->diskConfig = $diskConfig;
-  }
-  public function getDiskConfig()
-  {
-    return $this->diskConfig;
-  }
-  public function setImageUri($imageUri)
-  {
-    $this->imageUri = $imageUri;
-  }
-  public function getImageUri()
-  {
-    return $this->imageUri;
-  }
-  public function setInstanceNames($instanceNames)
-  {
-    $this->instanceNames = $instanceNames;
-  }
-  public function getInstanceNames()
-  {
-    return $this->instanceNames;
-  }
-  public function setIsPreemptible($isPreemptible)
-  {
-    $this->isPreemptible = $isPreemptible;
-  }
-  public function getIsPreemptible()
-  {
-    return $this->isPreemptible;
-  }
-  public function setMachineTypeUri($machineTypeUri)
-  {
-    $this->machineTypeUri = $machineTypeUri;
-  }
-  public function getMachineTypeUri()
-  {
-    return $this->machineTypeUri;
-  }
-  public function setManagedGroupConfig(Google_Service_Dataproc_ManagedGroupConfig $managedGroupConfig)
-  {
-    $this->managedGroupConfig = $managedGroupConfig;
-  }
-  public function getManagedGroupConfig()
-  {
-    return $this->managedGroupConfig;
-  }
-  public function setNumInstances($numInstances)
-  {
-    $this->numInstances = $numInstances;
-  }
-  public function getNumInstances()
-  {
-    return $this->numInstances;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dataproc/Job.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dataproc/Job.php
deleted file mode 100644
index 8b9fb432..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dataproc/Job.php
+++ /dev/null
@@ -1,169 +0,0 @@
-driverControlFilesUri = $driverControlFilesUri;
-  }
-  public function getDriverControlFilesUri()
-  {
-    return $this->driverControlFilesUri;
-  }
-  public function setDriverOutputResourceUri($driverOutputResourceUri)
-  {
-    $this->driverOutputResourceUri = $driverOutputResourceUri;
-  }
-  public function getDriverOutputResourceUri()
-  {
-    return $this->driverOutputResourceUri;
-  }
-  public function setHadoopJob(Google_Service_Dataproc_HadoopJob $hadoopJob)
-  {
-    $this->hadoopJob = $hadoopJob;
-  }
-  public function getHadoopJob()
-  {
-    return $this->hadoopJob;
-  }
-  public function setHiveJob(Google_Service_Dataproc_HiveJob $hiveJob)
-  {
-    $this->hiveJob = $hiveJob;
-  }
-  public function getHiveJob()
-  {
-    return $this->hiveJob;
-  }
-  public function setLabels($labels)
-  {
-    $this->labels = $labels;
-  }
-  public function getLabels()
-  {
-    return $this->labels;
-  }
-  public function setPigJob(Google_Service_Dataproc_PigJob $pigJob)
-  {
-    $this->pigJob = $pigJob;
-  }
-  public function getPigJob()
-  {
-    return $this->pigJob;
-  }
-  public function setPlacement(Google_Service_Dataproc_JobPlacement $placement)
-  {
-    $this->placement = $placement;
-  }
-  public function getPlacement()
-  {
-    return $this->placement;
-  }
-  public function setPysparkJob(Google_Service_Dataproc_PySparkJob $pysparkJob)
-  {
-    $this->pysparkJob = $pysparkJob;
-  }
-  public function getPysparkJob()
-  {
-    return $this->pysparkJob;
-  }
-  public function setReference(Google_Service_Dataproc_JobReference $reference)
-  {
-    $this->reference = $reference;
-  }
-  public function getReference()
-  {
-    return $this->reference;
-  }
-  public function setScheduling(Google_Service_Dataproc_JobScheduling $scheduling)
-  {
-    $this->scheduling = $scheduling;
-  }
-  public function getScheduling()
-  {
-    return $this->scheduling;
-  }
-  public function setSparkJob(Google_Service_Dataproc_SparkJob $sparkJob)
-  {
-    $this->sparkJob = $sparkJob;
-  }
-  public function getSparkJob()
-  {
-    return $this->sparkJob;
-  }
-  public function setSparkSqlJob(Google_Service_Dataproc_SparkSqlJob $sparkSqlJob)
-  {
-    $this->sparkSqlJob = $sparkSqlJob;
-  }
-  public function getSparkSqlJob()
-  {
-    return $this->sparkSqlJob;
-  }
-  public function setStatus(Google_Service_Dataproc_JobStatus $status)
-  {
-    $this->status = $status;
-  }
-  public function getStatus()
-  {
-    return $this->status;
-  }
-  public function setStatusHistory($statusHistory)
-  {
-    $this->statusHistory = $statusHistory;
-  }
-  public function getStatusHistory()
-  {
-    return $this->statusHistory;
-  }
-  public function setYarnApplications($yarnApplications)
-  {
-    $this->yarnApplications = $yarnApplications;
-  }
-  public function getYarnApplications()
-  {
-    return $this->yarnApplications;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dataproc/JobPlacement.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dataproc/JobPlacement.php
deleted file mode 100644
index 16705b8c..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dataproc/JobPlacement.php
+++ /dev/null
@@ -1,39 +0,0 @@
-clusterName = $clusterName;
-  }
-  public function getClusterName()
-  {
-    return $this->clusterName;
-  }
-  public function setClusterUuid($clusterUuid)
-  {
-    $this->clusterUuid = $clusterUuid;
-  }
-  public function getClusterUuid()
-  {
-    return $this->clusterUuid;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dataproc/JobReference.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dataproc/JobReference.php
deleted file mode 100644
index 977cd0d8..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dataproc/JobReference.php
+++ /dev/null
@@ -1,39 +0,0 @@
-jobId = $jobId;
-  }
-  public function getJobId()
-  {
-    return $this->jobId;
-  }
-  public function setProjectId($projectId)
-  {
-    $this->projectId = $projectId;
-  }
-  public function getProjectId()
-  {
-    return $this->projectId;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dataproc/JobScheduling.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dataproc/JobScheduling.php
deleted file mode 100644
index e698e4ac..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dataproc/JobScheduling.php
+++ /dev/null
@@ -1,30 +0,0 @@
-maxFailuresPerHour = $maxFailuresPerHour;
-  }
-  public function getMaxFailuresPerHour()
-  {
-    return $this->maxFailuresPerHour;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dataproc/JobStatus.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dataproc/JobStatus.php
deleted file mode 100644
index 60f8df6b..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dataproc/JobStatus.php
+++ /dev/null
@@ -1,48 +0,0 @@
-details = $details;
-  }
-  public function getDetails()
-  {
-    return $this->details;
-  }
-  public function setState($state)
-  {
-    $this->state = $state;
-  }
-  public function getState()
-  {
-    return $this->state;
-  }
-  public function setStateStartTime($stateStartTime)
-  {
-    $this->stateStartTime = $stateStartTime;
-  }
-  public function getStateStartTime()
-  {
-    return $this->stateStartTime;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dataproc/ListClustersResponse.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dataproc/ListClustersResponse.php
deleted file mode 100644
index d3589082..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dataproc/ListClustersResponse.php
+++ /dev/null
@@ -1,41 +0,0 @@
-clusters = $clusters;
-  }
-  public function getClusters()
-  {
-    return $this->clusters;
-  }
-  public function setNextPageToken($nextPageToken)
-  {
-    $this->nextPageToken = $nextPageToken;
-  }
-  public function getNextPageToken()
-  {
-    return $this->nextPageToken;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dataproc/ListJobsResponse.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dataproc/ListJobsResponse.php
deleted file mode 100644
index be99793b..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dataproc/ListJobsResponse.php
+++ /dev/null
@@ -1,41 +0,0 @@
-jobs = $jobs;
-  }
-  public function getJobs()
-  {
-    return $this->jobs;
-  }
-  public function setNextPageToken($nextPageToken)
-  {
-    $this->nextPageToken = $nextPageToken;
-  }
-  public function getNextPageToken()
-  {
-    return $this->nextPageToken;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dataproc/ListOperationsResponse.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dataproc/ListOperationsResponse.php
deleted file mode 100644
index dd749a87..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dataproc/ListOperationsResponse.php
+++ /dev/null
@@ -1,41 +0,0 @@
-nextPageToken = $nextPageToken;
-  }
-  public function getNextPageToken()
-  {
-    return $this->nextPageToken;
-  }
-  public function setOperations($operations)
-  {
-    $this->operations = $operations;
-  }
-  public function getOperations()
-  {
-    return $this->operations;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dataproc/LoggingConfig.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dataproc/LoggingConfig.php
deleted file mode 100644
index 90e5f33d..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dataproc/LoggingConfig.php
+++ /dev/null
@@ -1,30 +0,0 @@
-driverLogLevels = $driverLogLevels;
-  }
-  public function getDriverLogLevels()
-  {
-    return $this->driverLogLevels;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dataproc/ManagedGroupConfig.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dataproc/ManagedGroupConfig.php
deleted file mode 100644
index 1725fe5f..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dataproc/ManagedGroupConfig.php
+++ /dev/null
@@ -1,39 +0,0 @@
-instanceGroupManagerName = $instanceGroupManagerName;
-  }
-  public function getInstanceGroupManagerName()
-  {
-    return $this->instanceGroupManagerName;
-  }
-  public function setInstanceTemplateName($instanceTemplateName)
-  {
-    $this->instanceTemplateName = $instanceTemplateName;
-  }
-  public function getInstanceTemplateName()
-  {
-    return $this->instanceTemplateName;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dataproc/NodeInitializationAction.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dataproc/NodeInitializationAction.php
deleted file mode 100644
index d7f296c1..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dataproc/NodeInitializationAction.php
+++ /dev/null
@@ -1,39 +0,0 @@
-executableFile = $executableFile;
-  }
-  public function getExecutableFile()
-  {
-    return $this->executableFile;
-  }
-  public function setExecutionTimeout($executionTimeout)
-  {
-    $this->executionTimeout = $executionTimeout;
-  }
-  public function getExecutionTimeout()
-  {
-    return $this->executionTimeout;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dataproc/Operation.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dataproc/Operation.php
deleted file mode 100644
index 71e287c1..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dataproc/Operation.php
+++ /dev/null
@@ -1,67 +0,0 @@
-done = $done;
-  }
-  public function getDone()
-  {
-    return $this->done;
-  }
-  public function setError(Google_Service_Dataproc_Status $error)
-  {
-    $this->error = $error;
-  }
-  public function getError()
-  {
-    return $this->error;
-  }
-  public function setMetadata($metadata)
-  {
-    $this->metadata = $metadata;
-  }
-  public function getMetadata()
-  {
-    return $this->metadata;
-  }
-  public function setName($name)
-  {
-    $this->name = $name;
-  }
-  public function getName()
-  {
-    return $this->name;
-  }
-  public function setResponse($response)
-  {
-    $this->response = $response;
-  }
-  public function getResponse()
-  {
-    return $this->response;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dataproc/OperationMetadata.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dataproc/OperationMetadata.php
deleted file mode 100644
index e57db919..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dataproc/OperationMetadata.php
+++ /dev/null
@@ -1,141 +0,0 @@
-clusterName = $clusterName;
-  }
-  public function getClusterName()
-  {
-    return $this->clusterName;
-  }
-  public function setClusterUuid($clusterUuid)
-  {
-    $this->clusterUuid = $clusterUuid;
-  }
-  public function getClusterUuid()
-  {
-    return $this->clusterUuid;
-  }
-  public function setDescription($description)
-  {
-    $this->description = $description;
-  }
-  public function getDescription()
-  {
-    return $this->description;
-  }
-  public function setDetails($details)
-  {
-    $this->details = $details;
-  }
-  public function getDetails()
-  {
-    return $this->details;
-  }
-  public function setEndTime($endTime)
-  {
-    $this->endTime = $endTime;
-  }
-  public function getEndTime()
-  {
-    return $this->endTime;
-  }
-  public function setInnerState($innerState)
-  {
-    $this->innerState = $innerState;
-  }
-  public function getInnerState()
-  {
-    return $this->innerState;
-  }
-  public function setInsertTime($insertTime)
-  {
-    $this->insertTime = $insertTime;
-  }
-  public function getInsertTime()
-  {
-    return $this->insertTime;
-  }
-  public function setOperationType($operationType)
-  {
-    $this->operationType = $operationType;
-  }
-  public function getOperationType()
-  {
-    return $this->operationType;
-  }
-  public function setStartTime($startTime)
-  {
-    $this->startTime = $startTime;
-  }
-  public function getStartTime()
-  {
-    return $this->startTime;
-  }
-  public function setState($state)
-  {
-    $this->state = $state;
-  }
-  public function getState()
-  {
-    return $this->state;
-  }
-  public function setStatus(Google_Service_Dataproc_OperationStatus $status)
-  {
-    $this->status = $status;
-  }
-  public function getStatus()
-  {
-    return $this->status;
-  }
-  public function setStatusHistory($statusHistory)
-  {
-    $this->statusHistory = $statusHistory;
-  }
-  public function getStatusHistory()
-  {
-    return $this->statusHistory;
-  }
-  public function setWarnings($warnings)
-  {
-    $this->warnings = $warnings;
-  }
-  public function getWarnings()
-  {
-    return $this->warnings;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dataproc/OperationStatus.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dataproc/OperationStatus.php
deleted file mode 100644
index 90f1143d..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dataproc/OperationStatus.php
+++ /dev/null
@@ -1,57 +0,0 @@
-details = $details;
-  }
-  public function getDetails()
-  {
-    return $this->details;
-  }
-  public function setInnerState($innerState)
-  {
-    $this->innerState = $innerState;
-  }
-  public function getInnerState()
-  {
-    return $this->innerState;
-  }
-  public function setState($state)
-  {
-    $this->state = $state;
-  }
-  public function getState()
-  {
-    return $this->state;
-  }
-  public function setStateStartTime($stateStartTime)
-  {
-    $this->stateStartTime = $stateStartTime;
-  }
-  public function getStateStartTime()
-  {
-    return $this->stateStartTime;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dataproc/PigJob.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dataproc/PigJob.php
deleted file mode 100644
index e09142cf..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dataproc/PigJob.php
+++ /dev/null
@@ -1,87 +0,0 @@
-continueOnFailure = $continueOnFailure;
-  }
-  public function getContinueOnFailure()
-  {
-    return $this->continueOnFailure;
-  }
-  public function setJarFileUris($jarFileUris)
-  {
-    $this->jarFileUris = $jarFileUris;
-  }
-  public function getJarFileUris()
-  {
-    return $this->jarFileUris;
-  }
-  public function setLoggingConfig(Google_Service_Dataproc_LoggingConfig $loggingConfig)
-  {
-    $this->loggingConfig = $loggingConfig;
-  }
-  public function getLoggingConfig()
-  {
-    return $this->loggingConfig;
-  }
-  public function setProperties($properties)
-  {
-    $this->properties = $properties;
-  }
-  public function getProperties()
-  {
-    return $this->properties;
-  }
-  public function setQueryFileUri($queryFileUri)
-  {
-    $this->queryFileUri = $queryFileUri;
-  }
-  public function getQueryFileUri()
-  {
-    return $this->queryFileUri;
-  }
-  public function setQueryList(Google_Service_Dataproc_QueryList $queryList)
-  {
-    $this->queryList = $queryList;
-  }
-  public function getQueryList()
-  {
-    return $this->queryList;
-  }
-  public function setScriptVariables($scriptVariables)
-  {
-    $this->scriptVariables = $scriptVariables;
-  }
-  public function getScriptVariables()
-  {
-    return $this->scriptVariables;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dataproc/PySparkJob.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dataproc/PySparkJob.php
deleted file mode 100644
index 4ab147d0..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dataproc/PySparkJob.php
+++ /dev/null
@@ -1,95 +0,0 @@
-archiveUris = $archiveUris;
-  }
-  public function getArchiveUris()
-  {
-    return $this->archiveUris;
-  }
-  public function setArgs($args)
-  {
-    $this->args = $args;
-  }
-  public function getArgs()
-  {
-    return $this->args;
-  }
-  public function setFileUris($fileUris)
-  {
-    $this->fileUris = $fileUris;
-  }
-  public function getFileUris()
-  {
-    return $this->fileUris;
-  }
-  public function setJarFileUris($jarFileUris)
-  {
-    $this->jarFileUris = $jarFileUris;
-  }
-  public function getJarFileUris()
-  {
-    return $this->jarFileUris;
-  }
-  public function setLoggingConfig(Google_Service_Dataproc_LoggingConfig $loggingConfig)
-  {
-    $this->loggingConfig = $loggingConfig;
-  }
-  public function getLoggingConfig()
-  {
-    return $this->loggingConfig;
-  }
-  public function setMainPythonFileUri($mainPythonFileUri)
-  {
-    $this->mainPythonFileUri = $mainPythonFileUri;
-  }
-  public function getMainPythonFileUri()
-  {
-    return $this->mainPythonFileUri;
-  }
-  public function setProperties($properties)
-  {
-    $this->properties = $properties;
-  }
-  public function getProperties()
-  {
-    return $this->properties;
-  }
-  public function setPythonFileUris($pythonFileUris)
-  {
-    $this->pythonFileUris = $pythonFileUris;
-  }
-  public function getPythonFileUris()
-  {
-    return $this->pythonFileUris;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dataproc/QueryList.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dataproc/QueryList.php
deleted file mode 100644
index a14da25d..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dataproc/QueryList.php
+++ /dev/null
@@ -1,31 +0,0 @@
-queries = $queries;
-  }
-  public function getQueries()
-  {
-    return $this->queries;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dataproc/Resource/Projects.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dataproc/Resource/Projects.php
deleted file mode 100644
index 505f9dd5..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dataproc/Resource/Projects.php
+++ /dev/null
@@ -1,28 +0,0 @@
-
- *   $dataprocService = new Google_Service_Dataproc(...);
- *   $projects = $dataprocService->projects;
- *  
- */
-class Google_Service_Dataproc_Resource_Projects extends Google_Service_Resource
-{
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dataproc/Resource/ProjectsRegions.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dataproc/Resource/ProjectsRegions.php
deleted file mode 100644
index ba626814..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dataproc/Resource/ProjectsRegions.php
+++ /dev/null
@@ -1,28 +0,0 @@
-
- *   $dataprocService = new Google_Service_Dataproc(...);
- *   $regions = $dataprocService->regions;
- *  
- */
-class Google_Service_Dataproc_Resource_ProjectsRegions extends Google_Service_Resource
-{
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dataproc/Resource/ProjectsRegionsClusters.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dataproc/Resource/ProjectsRegionsClusters.php
deleted file mode 100644
index 77c97dd1..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dataproc/Resource/ProjectsRegionsClusters.php
+++ /dev/null
@@ -1,162 +0,0 @@
-
- *   $dataprocService = new Google_Service_Dataproc(...);
- *   $clusters = $dataprocService->clusters;
- *  
- */
-class Google_Service_Dataproc_Resource_ProjectsRegionsClusters extends Google_Service_Resource
-{
-  /**
-   * Creates a cluster in a project. (clusters.create)
-   *
-   * @param string $projectId Required The ID of the Google Cloud Platform project
-   * that the cluster belongs to.
-   * @param string $region Required The Cloud Dataproc region in which to handle
-   * the request.
-   * @param Google_Service_Dataproc_Cluster $postBody
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Dataproc_Operation
-   */
-  public function create($projectId, $region, Google_Service_Dataproc_Cluster $postBody, $optParams = array())
-  {
-    $params = array('projectId' => $projectId, 'region' => $region, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('create', array($params), "Google_Service_Dataproc_Operation");
-  }
-  /**
-   * Deletes a cluster in a project. (clusters.delete)
-   *
-   * @param string $projectId Required The ID of the Google Cloud Platform project
-   * that the cluster belongs to.
-   * @param string $region Required The Cloud Dataproc region in which to handle
-   * the request.
-   * @param string $clusterName Required The cluster name.
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Dataproc_Operation
-   */
-  public function delete($projectId, $region, $clusterName, $optParams = array())
-  {
-    $params = array('projectId' => $projectId, 'region' => $region, 'clusterName' => $clusterName);
-    $params = array_merge($params, $optParams);
-    return $this->call('delete', array($params), "Google_Service_Dataproc_Operation");
-  }
-  /**
-   * Gets cluster diagnostic information. After the operation completes, the
-   * Operation.response field contains DiagnoseClusterOutputLocation.
-   * (clusters.diagnose)
-   *
-   * @param string $projectId Required The ID of the Google Cloud Platform project
-   * that the cluster belongs to.
-   * @param string $region Required The Cloud Dataproc region in which to handle
-   * the request.
-   * @param string $clusterName Required The cluster name.
-   * @param Google_Service_Dataproc_DiagnoseClusterRequest $postBody
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Dataproc_Operation
-   */
-  public function diagnose($projectId, $region, $clusterName, Google_Service_Dataproc_DiagnoseClusterRequest $postBody, $optParams = array())
-  {
-    $params = array('projectId' => $projectId, 'region' => $region, 'clusterName' => $clusterName, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('diagnose', array($params), "Google_Service_Dataproc_Operation");
-  }
-  /**
-   * Gets the resource representation for a cluster in a project. (clusters.get)
-   *
-   * @param string $projectId Required The ID of the Google Cloud Platform project
-   * that the cluster belongs to.
-   * @param string $region Required The Cloud Dataproc region in which to handle
-   * the request.
-   * @param string $clusterName Required The cluster name.
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Dataproc_Cluster
-   */
-  public function get($projectId, $region, $clusterName, $optParams = array())
-  {
-    $params = array('projectId' => $projectId, 'region' => $region, 'clusterName' => $clusterName);
-    $params = array_merge($params, $optParams);
-    return $this->call('get', array($params), "Google_Service_Dataproc_Cluster");
-  }
-  /**
-   * Lists all regions/{region}/clusters in a project.
-   * (clusters.listProjectsRegionsClusters)
-   *
-   * @param string $projectId Required The ID of the Google Cloud Platform project
-   * that the cluster belongs to.
-   * @param string $region Required The Cloud Dataproc region in which to handle
-   * the request.
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param string filter Optional A filter constraining the clusters to list.
-   * Filters are case-sensitive and have the following syntax:field = value AND
-   * field = value ...where field is one of status.state, clusterName, or
-   * labels.[KEY], and [KEY] is a label key. value can be * to match all values.
-   * status.state can be one of the following: ACTIVE, INACTIVE, CREATING,
-   * RUNNING, ERROR, DELETING, or UPDATING. ACTIVE contains the CREATING,
-   * UPDATING, and RUNNING states. INACTIVE contains the DELETING and ERROR
-   * states. clusterName is the name of the cluster provided at creation time.
-   * Only the logical AND operator is supported; space-separated items are treated
-   * as having an implicit AND operator.Example filter:status.state = ACTIVE AND
-   * clusterName = mycluster AND labels.env = staging AND labels.starred = *
-   * @opt_param string pageToken Optional The standard List page token.
-   * @opt_param int pageSize Optional The standard List page size.
-   * @return Google_Service_Dataproc_ListClustersResponse
-   */
-  public function listProjectsRegionsClusters($projectId, $region, $optParams = array())
-  {
-    $params = array('projectId' => $projectId, 'region' => $region);
-    $params = array_merge($params, $optParams);
-    return $this->call('list', array($params), "Google_Service_Dataproc_ListClustersResponse");
-  }
-  /**
-   * Updates a cluster in a project. (clusters.patch)
-   *
-   * @param string $projectId Required The ID of the Google Cloud Platform project
-   * the cluster belongs to.
-   * @param string $region Required The Cloud Dataproc region in which to handle
-   * the request.
-   * @param string $clusterName Required The cluster name.
-   * @param Google_Service_Dataproc_Cluster $postBody
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param string updateMask Required Specifies the path, relative to
-   * Cluster, of the field to update. For example, to change the number of workers
-   * in a cluster to 5, the update_mask parameter would be specified as
-   * config.worker_config.num_instances, and the PATCH request body would specify
-   * the new value, as follows: {   "config":{     "workerConfig":{
-   * "numInstances":"5"     }   } } Similarly, to change the number of preemptible
-   * workers in a cluster to 5, the update_mask parameter would be
-   * config.secondary_worker_config.num_instances, and the PATCH request body
-   * would be set as follows: {   "config":{     "secondaryWorkerConfig":{
-   * "numInstances":"5"     }   } } Note: Currently,
-   * config.worker_config.num_instances and
-   * config.secondary_worker_config.num_instances are the only fields that can be
-   * updated.
-   * @return Google_Service_Dataproc_Operation
-   */
-  public function patch($projectId, $region, $clusterName, Google_Service_Dataproc_Cluster $postBody, $optParams = array())
-  {
-    $params = array('projectId' => $projectId, 'region' => $region, 'clusterName' => $clusterName, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('patch', array($params), "Google_Service_Dataproc_Operation");
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dataproc/Resource/ProjectsRegionsJobs.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dataproc/Resource/ProjectsRegionsJobs.php
deleted file mode 100644
index 23cb52ca..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dataproc/Resource/ProjectsRegionsJobs.php
+++ /dev/null
@@ -1,156 +0,0 @@
-
- *   $dataprocService = new Google_Service_Dataproc(...);
- *   $jobs = $dataprocService->jobs;
- *  
- */
-class Google_Service_Dataproc_Resource_ProjectsRegionsJobs extends Google_Service_Resource
-{
-  /**
-   * Starts a job cancellation request. To access the job resource after
-   * cancellation, call regions/{region}/jobs.list or regions/{region}/jobs.get.
-   * (jobs.cancel)
-   *
-   * @param string $projectId Required The ID of the Google Cloud Platform project
-   * that the job belongs to.
-   * @param string $region Required The Cloud Dataproc region in which to handle
-   * the request.
-   * @param string $jobId Required The job ID.
-   * @param Google_Service_Dataproc_CancelJobRequest $postBody
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Dataproc_Job
-   */
-  public function cancel($projectId, $region, $jobId, Google_Service_Dataproc_CancelJobRequest $postBody, $optParams = array())
-  {
-    $params = array('projectId' => $projectId, 'region' => $region, 'jobId' => $jobId, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('cancel', array($params), "Google_Service_Dataproc_Job");
-  }
-  /**
-   * Deletes the job from the project. If the job is active, the delete fails, and
-   * the response returns FAILED_PRECONDITION. (jobs.delete)
-   *
-   * @param string $projectId Required The ID of the Google Cloud Platform project
-   * that the job belongs to.
-   * @param string $region Required The Cloud Dataproc region in which to handle
-   * the request.
-   * @param string $jobId Required The job ID.
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Dataproc_DataprocEmpty
-   */
-  public function delete($projectId, $region, $jobId, $optParams = array())
-  {
-    $params = array('projectId' => $projectId, 'region' => $region, 'jobId' => $jobId);
-    $params = array_merge($params, $optParams);
-    return $this->call('delete', array($params), "Google_Service_Dataproc_DataprocEmpty");
-  }
-  /**
-   * Gets the resource representation for a job in a project. (jobs.get)
-   *
-   * @param string $projectId Required The ID of the Google Cloud Platform project
-   * that the job belongs to.
-   * @param string $region Required The Cloud Dataproc region in which to handle
-   * the request.
-   * @param string $jobId Required The job ID.
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Dataproc_Job
-   */
-  public function get($projectId, $region, $jobId, $optParams = array())
-  {
-    $params = array('projectId' => $projectId, 'region' => $region, 'jobId' => $jobId);
-    $params = array_merge($params, $optParams);
-    return $this->call('get', array($params), "Google_Service_Dataproc_Job");
-  }
-  /**
-   * Lists regions/{region}/jobs in a project. (jobs.listProjectsRegionsJobs)
-   *
-   * @param string $projectId Required The ID of the Google Cloud Platform project
-   * that the job belongs to.
-   * @param string $region Required The Cloud Dataproc region in which to handle
-   * the request.
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param string pageToken Optional The page token, returned by a previous
-   * call, to request the next page of results.
-   * @opt_param int pageSize Optional The number of results to return in each
-   * response.
-   * @opt_param string clusterName Optional If set, the returned jobs list
-   * includes only jobs that were submitted to the named cluster.
-   * @opt_param string filter Optional A filter constraining the jobs to list.
-   * Filters are case-sensitive and have the following syntax:field = value AND
-   * field = value ...where field is status.state or labels.[KEY], and [KEY] is a
-   * label key. value can be * to match all values. status.state can be either
-   * ACTIVE or INACTIVE. Only the logical AND operator is supported; space-
-   * separated items are treated as having an implicit AND operator.Example
-   * filter:status.state = ACTIVE AND labels.env = staging AND labels.starred = *
-   * @opt_param string jobStateMatcher Optional Specifies enumerated categories of
-   * jobs to list (default = match ALL jobs).
-   * @return Google_Service_Dataproc_ListJobsResponse
-   */
-  public function listProjectsRegionsJobs($projectId, $region, $optParams = array())
-  {
-    $params = array('projectId' => $projectId, 'region' => $region);
-    $params = array_merge($params, $optParams);
-    return $this->call('list', array($params), "Google_Service_Dataproc_ListJobsResponse");
-  }
-  /**
-   * Updates a job in a project. (jobs.patch)
-   *
-   * @param string $projectId Required The ID of the Google Cloud Platform project
-   * that the job belongs to.
-   * @param string $region Required The Cloud Dataproc region in which to handle
-   * the request.
-   * @param string $jobId Required The job ID.
-   * @param Google_Service_Dataproc_Job $postBody
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param string updateMask Required Specifies the path, relative to Job, of
-   * the field to update. For example, to update the labels of a Job the
-   * update_mask parameter would be specified as labels, and the PATCH request
-   * body would specify the new value. Note: Currently, labels is the only field
-   * that can be updated.
-   * @return Google_Service_Dataproc_Job
-   */
-  public function patch($projectId, $region, $jobId, Google_Service_Dataproc_Job $postBody, $optParams = array())
-  {
-    $params = array('projectId' => $projectId, 'region' => $region, 'jobId' => $jobId, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('patch', array($params), "Google_Service_Dataproc_Job");
-  }
-  /**
-   * Submits a job to a cluster. (jobs.submit)
-   *
-   * @param string $projectId Required The ID of the Google Cloud Platform project
-   * that the job belongs to.
-   * @param string $region Required The Cloud Dataproc region in which to handle
-   * the request.
-   * @param Google_Service_Dataproc_SubmitJobRequest $postBody
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Dataproc_Job
-   */
-  public function submit($projectId, $region, Google_Service_Dataproc_SubmitJobRequest $postBody, $optParams = array())
-  {
-    $params = array('projectId' => $projectId, 'region' => $region, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('submit', array($params), "Google_Service_Dataproc_Job");
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dataproc/Resource/ProjectsRegionsOperations.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dataproc/Resource/ProjectsRegionsOperations.php
deleted file mode 100644
index b366e26b..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dataproc/Resource/ProjectsRegionsOperations.php
+++ /dev/null
@@ -1,101 +0,0 @@
-
- *   $dataprocService = new Google_Service_Dataproc(...);
- *   $operations = $dataprocService->operations;
- *  
- */
-class Google_Service_Dataproc_Resource_ProjectsRegionsOperations extends Google_Service_Resource
-{
-  /**
-   * Starts asynchronous cancellation on a long-running operation. The server
-   * makes a best effort to cancel the operation, but success is not guaranteed.
-   * If the server doesn't support this method, it returns
-   * google.rpc.Code.UNIMPLEMENTED. Clients can use Operations.GetOperation or
-   * other methods to check whether the cancellation succeeded or whether the
-   * operation completed despite cancellation. On successful cancellation, the
-   * operation is not deleted; instead, it becomes an operation with an
-   * Operation.error value with a google.rpc.Status.code of 1, corresponding to
-   * Code.CANCELLED. (operations.cancel)
-   *
-   * @param string $name The name of the operation resource to be cancelled.
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Dataproc_DataprocEmpty
-   */
-  public function cancel($name, $optParams = array())
-  {
-    $params = array('name' => $name);
-    $params = array_merge($params, $optParams);
-    return $this->call('cancel', array($params), "Google_Service_Dataproc_DataprocEmpty");
-  }
-  /**
-   * Deletes a long-running operation. This method indicates that the client is no
-   * longer interested in the operation result. It does not cancel the operation.
-   * If the server doesn't support this method, it returns
-   * google.rpc.Code.UNIMPLEMENTED. (operations.delete)
-   *
-   * @param string $name The name of the operation resource to be deleted.
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Dataproc_DataprocEmpty
-   */
-  public function delete($name, $optParams = array())
-  {
-    $params = array('name' => $name);
-    $params = array_merge($params, $optParams);
-    return $this->call('delete', array($params), "Google_Service_Dataproc_DataprocEmpty");
-  }
-  /**
-   * Gets the latest state of a long-running operation. Clients can use this
-   * method to poll the operation result at intervals as recommended by the API
-   * service. (operations.get)
-   *
-   * @param string $name The name of the operation resource.
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Dataproc_Operation
-   */
-  public function get($name, $optParams = array())
-  {
-    $params = array('name' => $name);
-    $params = array_merge($params, $optParams);
-    return $this->call('get', array($params), "Google_Service_Dataproc_Operation");
-  }
-  /**
-   * Lists operations that match the specified filter in the request. If the
-   * server doesn't support this method, it returns UNIMPLEMENTED.NOTE: the name
-   * binding below allows API services to override the binding to use different
-   * resource name schemes, such as users/operations.
-   * (operations.listProjectsRegionsOperations)
-   *
-   * @param string $name The name of the operation collection.
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param int pageSize The standard list page size.
-   * @opt_param string filter The standard list filter.
-   * @opt_param string pageToken The standard list page token.
-   * @return Google_Service_Dataproc_ListOperationsResponse
-   */
-  public function listProjectsRegionsOperations($name, $optParams = array())
-  {
-    $params = array('name' => $name);
-    $params = array_merge($params, $optParams);
-    return $this->call('list', array($params), "Google_Service_Dataproc_ListOperationsResponse");
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dataproc/SoftwareConfig.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dataproc/SoftwareConfig.php
deleted file mode 100644
index 26abe390..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dataproc/SoftwareConfig.php
+++ /dev/null
@@ -1,39 +0,0 @@
-imageVersion = $imageVersion;
-  }
-  public function getImageVersion()
-  {
-    return $this->imageVersion;
-  }
-  public function setProperties($properties)
-  {
-    $this->properties = $properties;
-  }
-  public function getProperties()
-  {
-    return $this->properties;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dataproc/SparkJob.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dataproc/SparkJob.php
deleted file mode 100644
index 845b7e88..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dataproc/SparkJob.php
+++ /dev/null
@@ -1,95 +0,0 @@
-archiveUris = $archiveUris;
-  }
-  public function getArchiveUris()
-  {
-    return $this->archiveUris;
-  }
-  public function setArgs($args)
-  {
-    $this->args = $args;
-  }
-  public function getArgs()
-  {
-    return $this->args;
-  }
-  public function setFileUris($fileUris)
-  {
-    $this->fileUris = $fileUris;
-  }
-  public function getFileUris()
-  {
-    return $this->fileUris;
-  }
-  public function setJarFileUris($jarFileUris)
-  {
-    $this->jarFileUris = $jarFileUris;
-  }
-  public function getJarFileUris()
-  {
-    return $this->jarFileUris;
-  }
-  public function setLoggingConfig(Google_Service_Dataproc_LoggingConfig $loggingConfig)
-  {
-    $this->loggingConfig = $loggingConfig;
-  }
-  public function getLoggingConfig()
-  {
-    return $this->loggingConfig;
-  }
-  public function setMainClass($mainClass)
-  {
-    $this->mainClass = $mainClass;
-  }
-  public function getMainClass()
-  {
-    return $this->mainClass;
-  }
-  public function setMainJarFileUri($mainJarFileUri)
-  {
-    $this->mainJarFileUri = $mainJarFileUri;
-  }
-  public function getMainJarFileUri()
-  {
-    return $this->mainJarFileUri;
-  }
-  public function setProperties($properties)
-  {
-    $this->properties = $properties;
-  }
-  public function getProperties()
-  {
-    return $this->properties;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dataproc/SparkSqlJob.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dataproc/SparkSqlJob.php
deleted file mode 100644
index d5dba5d8..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dataproc/SparkSqlJob.php
+++ /dev/null
@@ -1,78 +0,0 @@
-jarFileUris = $jarFileUris;
-  }
-  public function getJarFileUris()
-  {
-    return $this->jarFileUris;
-  }
-  public function setLoggingConfig(Google_Service_Dataproc_LoggingConfig $loggingConfig)
-  {
-    $this->loggingConfig = $loggingConfig;
-  }
-  public function getLoggingConfig()
-  {
-    return $this->loggingConfig;
-  }
-  public function setProperties($properties)
-  {
-    $this->properties = $properties;
-  }
-  public function getProperties()
-  {
-    return $this->properties;
-  }
-  public function setQueryFileUri($queryFileUri)
-  {
-    $this->queryFileUri = $queryFileUri;
-  }
-  public function getQueryFileUri()
-  {
-    return $this->queryFileUri;
-  }
-  public function setQueryList(Google_Service_Dataproc_QueryList $queryList)
-  {
-    $this->queryList = $queryList;
-  }
-  public function getQueryList()
-  {
-    return $this->queryList;
-  }
-  public function setScriptVariables($scriptVariables)
-  {
-    $this->scriptVariables = $scriptVariables;
-  }
-  public function getScriptVariables()
-  {
-    return $this->scriptVariables;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dataproc/Status.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dataproc/Status.php
deleted file mode 100644
index 55bc1464..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dataproc/Status.php
+++ /dev/null
@@ -1,49 +0,0 @@
-code = $code;
-  }
-  public function getCode()
-  {
-    return $this->code;
-  }
-  public function setDetails($details)
-  {
-    $this->details = $details;
-  }
-  public function getDetails()
-  {
-    return $this->details;
-  }
-  public function setMessage($message)
-  {
-    $this->message = $message;
-  }
-  public function getMessage()
-  {
-    return $this->message;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dataproc/SubmitJobRequest.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dataproc/SubmitJobRequest.php
deleted file mode 100644
index e35ec7c8..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dataproc/SubmitJobRequest.php
+++ /dev/null
@@ -1,31 +0,0 @@
-job = $job;
-  }
-  public function getJob()
-  {
-    return $this->job;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dataproc/YarnApplication.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dataproc/YarnApplication.php
deleted file mode 100644
index 3e9ec6b8..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dataproc/YarnApplication.php
+++ /dev/null
@@ -1,57 +0,0 @@
-name = $name;
-  }
-  public function getName()
-  {
-    return $this->name;
-  }
-  public function setProgress($progress)
-  {
-    $this->progress = $progress;
-  }
-  public function getProgress()
-  {
-    return $this->progress;
-  }
-  public function setState($state)
-  {
-    $this->state = $state;
-  }
-  public function getState()
-  {
-    return $this->state;
-  }
-  public function setTrackingUrl($trackingUrl)
-  {
-    $this->trackingUrl = $trackingUrl;
-  }
-  public function getTrackingUrl()
-  {
-    return $this->trackingUrl;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Datastore.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Datastore.php
deleted file mode 100644
index f51d9628..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Datastore.php
+++ /dev/null
@@ -1,127 +0,0 @@
-
- * Accesses the schemaless NoSQL database to provide fully managed, robust,
- * scalable storage for your application.

- *
- * 

- * For more information about this service, see the API
- * Documentation
- * 

- *
- * @author Google, Inc.
- */
-class Google_Service_Datastore extends Google_Service
-{
-  /** View and manage your data across Google Cloud Platform services. */
-  const CLOUD_PLATFORM =
-      "https://www.googleapis.com/auth/cloud-platform";
-  /** View and manage your Google Cloud Datastore data. */
-  const DATASTORE =
-      "https://www.googleapis.com/auth/datastore";
-
-  public $projects;
-  
-  /**
-   * Constructs the internal representation of the Datastore service.
-   *
-   * @param Google_Client $client
-   */
-  public function __construct(Google_Client $client)
-  {
-    parent::__construct($client);
-    $this->rootUrl = 'https://datastore.googleapis.com/';
-    $this->servicePath = '';
-    $this->version = 'v1';
-    $this->serviceName = 'datastore';
-
-    $this->projects = new Google_Service_Datastore_Resource_Projects(
-        $this,
-        $this->serviceName,
-        'projects',
-        array(
-          'methods' => array(
-            'allocateIds' => array(
-              'path' => 'v1/projects/{projectId}:allocateIds',
-              'httpMethod' => 'POST',
-              'parameters' => array(
-                'projectId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'beginTransaction' => array(
-              'path' => 'v1/projects/{projectId}:beginTransaction',
-              'httpMethod' => 'POST',
-              'parameters' => array(
-                'projectId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'commit' => array(
-              'path' => 'v1/projects/{projectId}:commit',
-              'httpMethod' => 'POST',
-              'parameters' => array(
-                'projectId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'lookup' => array(
-              'path' => 'v1/projects/{projectId}:lookup',
-              'httpMethod' => 'POST',
-              'parameters' => array(
-                'projectId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'rollback' => array(
-              'path' => 'v1/projects/{projectId}:rollback',
-              'httpMethod' => 'POST',
-              'parameters' => array(
-                'projectId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'runQuery' => array(
-              'path' => 'v1/projects/{projectId}:runQuery',
-              'httpMethod' => 'POST',
-              'parameters' => array(
-                'projectId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),
-          )
-        )
-    );
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Datastore/AllocateIdsRequest.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Datastore/AllocateIdsRequest.php
deleted file mode 100644
index a188b51e..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Datastore/AllocateIdsRequest.php
+++ /dev/null
@@ -1,32 +0,0 @@
-keys = $keys;
-  }
-  public function getKeys()
-  {
-    return $this->keys;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Datastore/AllocateIdsResponse.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Datastore/AllocateIdsResponse.php
deleted file mode 100644
index 19fbe936..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Datastore/AllocateIdsResponse.php
+++ /dev/null
@@ -1,32 +0,0 @@
-keys = $keys;
-  }
-  public function getKeys()
-  {
-    return $this->keys;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Datastore/ArrayValue.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Datastore/ArrayValue.php
deleted file mode 100644
index 70ce9602..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Datastore/ArrayValue.php
+++ /dev/null
@@ -1,32 +0,0 @@
-values = $values;
-  }
-  public function getValues()
-  {
-    return $this->values;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Datastore/BeginTransactionRequest.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Datastore/BeginTransactionRequest.php
deleted file mode 100644
index 407ed6e7..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Datastore/BeginTransactionRequest.php
+++ /dev/null
@@ -1,20 +0,0 @@
-transaction = $transaction;
-  }
-  public function getTransaction()
-  {
-    return $this->transaction;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Datastore/CommitRequest.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Datastore/CommitRequest.php
deleted file mode 100644
index cbb98544..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Datastore/CommitRequest.php
+++ /dev/null
@@ -1,50 +0,0 @@
-mode = $mode;
-  }
-  public function getMode()
-  {
-    return $this->mode;
-  }
-  public function setMutations($mutations)
-  {
-    $this->mutations = $mutations;
-  }
-  public function getMutations()
-  {
-    return $this->mutations;
-  }
-  public function setTransaction($transaction)
-  {
-    $this->transaction = $transaction;
-  }
-  public function getTransaction()
-  {
-    return $this->transaction;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Datastore/CommitResponse.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Datastore/CommitResponse.php
deleted file mode 100644
index 93395723..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Datastore/CommitResponse.php
+++ /dev/null
@@ -1,41 +0,0 @@
-indexUpdates = $indexUpdates;
-  }
-  public function getIndexUpdates()
-  {
-    return $this->indexUpdates;
-  }
-  public function setMutationResults($mutationResults)
-  {
-    $this->mutationResults = $mutationResults;
-  }
-  public function getMutationResults()
-  {
-    return $this->mutationResults;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Datastore/CompositeFilter.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Datastore/CompositeFilter.php
deleted file mode 100644
index e9774d7a..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Datastore/CompositeFilter.php
+++ /dev/null
@@ -1,41 +0,0 @@
-filters = $filters;
-  }
-  public function getFilters()
-  {
-    return $this->filters;
-  }
-  public function setOp($op)
-  {
-    $this->op = $op;
-  }
-  public function getOp()
-  {
-    return $this->op;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Datastore/Entity.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Datastore/Entity.php
deleted file mode 100644
index dbc9e52f..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Datastore/Entity.php
+++ /dev/null
@@ -1,41 +0,0 @@
-key = $key;
-  }
-  public function getKey()
-  {
-    return $this->key;
-  }
-  public function setProperties($properties)
-  {
-    $this->properties = $properties;
-  }
-  public function getProperties()
-  {
-    return $this->properties;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Datastore/EntityResult.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Datastore/EntityResult.php
deleted file mode 100644
index 41fae807..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Datastore/EntityResult.php
+++ /dev/null
@@ -1,49 +0,0 @@
-cursor = $cursor;
-  }
-  public function getCursor()
-  {
-    return $this->cursor;
-  }
-  public function setEntity(Google_Service_Datastore_Entity $entity)
-  {
-    $this->entity = $entity;
-  }
-  public function getEntity()
-  {
-    return $this->entity;
-  }
-  public function setVersion($version)
-  {
-    $this->version = $version;
-  }
-  public function getVersion()
-  {
-    return $this->version;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Datastore/Filter.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Datastore/Filter.php
deleted file mode 100644
index 579c95c8..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Datastore/Filter.php
+++ /dev/null
@@ -1,41 +0,0 @@
-compositeFilter = $compositeFilter;
-  }
-  public function getCompositeFilter()
-  {
-    return $this->compositeFilter;
-  }
-  public function setPropertyFilter(Google_Service_Datastore_PropertyFilter $propertyFilter)
-  {
-    $this->propertyFilter = $propertyFilter;
-  }
-  public function getPropertyFilter()
-  {
-    return $this->propertyFilter;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Datastore/GqlQuery.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Datastore/GqlQuery.php
deleted file mode 100644
index 271d43e0..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Datastore/GqlQuery.php
+++ /dev/null
@@ -1,60 +0,0 @@
-allowLiterals = $allowLiterals;
-  }
-  public function getAllowLiterals()
-  {
-    return $this->allowLiterals;
-  }
-  public function setNamedBindings($namedBindings)
-  {
-    $this->namedBindings = $namedBindings;
-  }
-  public function getNamedBindings()
-  {
-    return $this->namedBindings;
-  }
-  public function setPositionalBindings($positionalBindings)
-  {
-    $this->positionalBindings = $positionalBindings;
-  }
-  public function getPositionalBindings()
-  {
-    return $this->positionalBindings;
-  }
-  public function setQueryString($queryString)
-  {
-    $this->queryString = $queryString;
-  }
-  public function getQueryString()
-  {
-    return $this->queryString;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Datastore/GqlQueryParameter.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Datastore/GqlQueryParameter.php
deleted file mode 100644
index fa47a775..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Datastore/GqlQueryParameter.php
+++ /dev/null
@@ -1,40 +0,0 @@
-cursor = $cursor;
-  }
-  public function getCursor()
-  {
-    return $this->cursor;
-  }
-  public function setValue(Google_Service_Datastore_Value $value)
-  {
-    $this->value = $value;
-  }
-  public function getValue()
-  {
-    return $this->value;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Datastore/Key.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Datastore/Key.php
deleted file mode 100644
index 0febfdf9..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Datastore/Key.php
+++ /dev/null
@@ -1,42 +0,0 @@
-partitionId = $partitionId;
-  }
-  public function getPartitionId()
-  {
-    return $this->partitionId;
-  }
-  public function setPath($path)
-  {
-    $this->path = $path;
-  }
-  public function getPath()
-  {
-    return $this->path;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Datastore/KindExpression.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Datastore/KindExpression.php
deleted file mode 100644
index 5831a6a2..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Datastore/KindExpression.php
+++ /dev/null
@@ -1,30 +0,0 @@
-name = $name;
-  }
-  public function getName()
-  {
-    return $this->name;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Datastore/LatLng.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Datastore/LatLng.php
deleted file mode 100644
index e5eae8fb..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Datastore/LatLng.php
+++ /dev/null
@@ -1,39 +0,0 @@
-latitude = $latitude;
-  }
-  public function getLatitude()
-  {
-    return $this->latitude;
-  }
-  public function setLongitude($longitude)
-  {
-    $this->longitude = $longitude;
-  }
-  public function getLongitude()
-  {
-    return $this->longitude;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Datastore/LookupRequest.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Datastore/LookupRequest.php
deleted file mode 100644
index 19a5f33e..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Datastore/LookupRequest.php
+++ /dev/null
@@ -1,42 +0,0 @@
-keys = $keys;
-  }
-  public function getKeys()
-  {
-    return $this->keys;
-  }
-  public function setReadOptions(Google_Service_Datastore_ReadOptions $readOptions)
-  {
-    $this->readOptions = $readOptions;
-  }
-  public function getReadOptions()
-  {
-    return $this->readOptions;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Datastore/LookupResponse.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Datastore/LookupResponse.php
deleted file mode 100644
index 9568c94e..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Datastore/LookupResponse.php
+++ /dev/null
@@ -1,52 +0,0 @@
-deferred = $deferred;
-  }
-  public function getDeferred()
-  {
-    return $this->deferred;
-  }
-  public function setFound($found)
-  {
-    $this->found = $found;
-  }
-  public function getFound()
-  {
-    return $this->found;
-  }
-  public function setMissing($missing)
-  {
-    $this->missing = $missing;
-  }
-  public function getMissing()
-  {
-    return $this->missing;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Datastore/Mutation.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Datastore/Mutation.php
deleted file mode 100644
index 6be38521..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Datastore/Mutation.php
+++ /dev/null
@@ -1,70 +0,0 @@
-baseVersion = $baseVersion;
-  }
-  public function getBaseVersion()
-  {
-    return $this->baseVersion;
-  }
-  public function setDelete(Google_Service_Datastore_Key $delete)
-  {
-    $this->delete = $delete;
-  }
-  public function getDelete()
-  {
-    return $this->delete;
-  }
-  public function setInsert(Google_Service_Datastore_Entity $insert)
-  {
-    $this->insert = $insert;
-  }
-  public function getInsert()
-  {
-    return $this->insert;
-  }
-  public function setUpdate(Google_Service_Datastore_Entity $update)
-  {
-    $this->update = $update;
-  }
-  public function getUpdate()
-  {
-    return $this->update;
-  }
-  public function setUpsert(Google_Service_Datastore_Entity $upsert)
-  {
-    $this->upsert = $upsert;
-  }
-  public function getUpsert()
-  {
-    return $this->upsert;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Datastore/MutationResult.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Datastore/MutationResult.php
deleted file mode 100644
index 9016d38e..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Datastore/MutationResult.php
+++ /dev/null
@@ -1,49 +0,0 @@
-conflictDetected = $conflictDetected;
-  }
-  public function getConflictDetected()
-  {
-    return $this->conflictDetected;
-  }
-  public function setKey(Google_Service_Datastore_Key $key)
-  {
-    $this->key = $key;
-  }
-  public function getKey()
-  {
-    return $this->key;
-  }
-  public function setVersion($version)
-  {
-    $this->version = $version;
-  }
-  public function getVersion()
-  {
-    return $this->version;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Datastore/PartitionId.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Datastore/PartitionId.php
deleted file mode 100644
index 39a95139..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Datastore/PartitionId.php
+++ /dev/null
@@ -1,39 +0,0 @@
-namespaceId = $namespaceId;
-  }
-  public function getNamespaceId()
-  {
-    return $this->namespaceId;
-  }
-  public function setProjectId($projectId)
-  {
-    $this->projectId = $projectId;
-  }
-  public function getProjectId()
-  {
-    return $this->projectId;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Datastore/PathElement.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Datastore/PathElement.php
deleted file mode 100644
index 9ff2480e..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Datastore/PathElement.php
+++ /dev/null
@@ -1,48 +0,0 @@
-id = $id;
-  }
-  public function getId()
-  {
-    return $this->id;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setName($name)
-  {
-    $this->name = $name;
-  }
-  public function getName()
-  {
-    return $this->name;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Datastore/Projection.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Datastore/Projection.php
deleted file mode 100644
index 2576f2ac..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Datastore/Projection.php
+++ /dev/null
@@ -1,31 +0,0 @@
-property = $property;
-  }
-  public function getProperty()
-  {
-    return $this->property;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Datastore/PropertyFilter.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Datastore/PropertyFilter.php
deleted file mode 100644
index b6331bd4..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Datastore/PropertyFilter.php
+++ /dev/null
@@ -1,50 +0,0 @@
-op = $op;
-  }
-  public function getOp()
-  {
-    return $this->op;
-  }
-  public function setProperty(Google_Service_Datastore_PropertyReference $property)
-  {
-    $this->property = $property;
-  }
-  public function getProperty()
-  {
-    return $this->property;
-  }
-  public function setValue(Google_Service_Datastore_Value $value)
-  {
-    $this->value = $value;
-  }
-  public function getValue()
-  {
-    return $this->value;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Datastore/PropertyOrder.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Datastore/PropertyOrder.php
deleted file mode 100644
index ae15b758..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Datastore/PropertyOrder.php
+++ /dev/null
@@ -1,40 +0,0 @@
-direction = $direction;
-  }
-  public function getDirection()
-  {
-    return $this->direction;
-  }
-  public function setProperty(Google_Service_Datastore_PropertyReference $property)
-  {
-    $this->property = $property;
-  }
-  public function getProperty()
-  {
-    return $this->property;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Datastore/PropertyReference.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Datastore/PropertyReference.php
deleted file mode 100644
index bc565d58..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Datastore/PropertyReference.php
+++ /dev/null
@@ -1,30 +0,0 @@
-name = $name;
-  }
-  public function getName()
-  {
-    return $this->name;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Datastore/Query.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Datastore/Query.php
deleted file mode 100644
index c3c32780..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Datastore/Query.php
+++ /dev/null
@@ -1,108 +0,0 @@
-distinctOn = $distinctOn;
-  }
-  public function getDistinctOn()
-  {
-    return $this->distinctOn;
-  }
-  public function setEndCursor($endCursor)
-  {
-    $this->endCursor = $endCursor;
-  }
-  public function getEndCursor()
-  {
-    return $this->endCursor;
-  }
-  public function setFilter(Google_Service_Datastore_Filter $filter)
-  {
-    $this->filter = $filter;
-  }
-  public function getFilter()
-  {
-    return $this->filter;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setLimit($limit)
-  {
-    $this->limit = $limit;
-  }
-  public function getLimit()
-  {
-    return $this->limit;
-  }
-  public function setOffset($offset)
-  {
-    $this->offset = $offset;
-  }
-  public function getOffset()
-  {
-    return $this->offset;
-  }
-  public function setOrder($order)
-  {
-    $this->order = $order;
-  }
-  public function getOrder()
-  {
-    return $this->order;
-  }
-  public function setProjection($projection)
-  {
-    $this->projection = $projection;
-  }
-  public function getProjection()
-  {
-    return $this->projection;
-  }
-  public function setStartCursor($startCursor)
-  {
-    $this->startCursor = $startCursor;
-  }
-  public function getStartCursor()
-  {
-    return $this->startCursor;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Datastore/QueryResultBatch.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Datastore/QueryResultBatch.php
deleted file mode 100644
index 268c7737..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Datastore/QueryResultBatch.php
+++ /dev/null
@@ -1,86 +0,0 @@
-endCursor = $endCursor;
-  }
-  public function getEndCursor()
-  {
-    return $this->endCursor;
-  }
-  public function setEntityResultType($entityResultType)
-  {
-    $this->entityResultType = $entityResultType;
-  }
-  public function getEntityResultType()
-  {
-    return $this->entityResultType;
-  }
-  public function setEntityResults($entityResults)
-  {
-    $this->entityResults = $entityResults;
-  }
-  public function getEntityResults()
-  {
-    return $this->entityResults;
-  }
-  public function setMoreResults($moreResults)
-  {
-    $this->moreResults = $moreResults;
-  }
-  public function getMoreResults()
-  {
-    return $this->moreResults;
-  }
-  public function setSkippedCursor($skippedCursor)
-  {
-    $this->skippedCursor = $skippedCursor;
-  }
-  public function getSkippedCursor()
-  {
-    return $this->skippedCursor;
-  }
-  public function setSkippedResults($skippedResults)
-  {
-    $this->skippedResults = $skippedResults;
-  }
-  public function getSkippedResults()
-  {
-    return $this->skippedResults;
-  }
-  public function setSnapshotVersion($snapshotVersion)
-  {
-    $this->snapshotVersion = $snapshotVersion;
-  }
-  public function getSnapshotVersion()
-  {
-    return $this->snapshotVersion;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Datastore/ReadOptions.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Datastore/ReadOptions.php
deleted file mode 100644
index 7e934ec0..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Datastore/ReadOptions.php
+++ /dev/null
@@ -1,39 +0,0 @@
-readConsistency = $readConsistency;
-  }
-  public function getReadConsistency()
-  {
-    return $this->readConsistency;
-  }
-  public function setTransaction($transaction)
-  {
-    $this->transaction = $transaction;
-  }
-  public function getTransaction()
-  {
-    return $this->transaction;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Datastore/Resource/Projects.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Datastore/Resource/Projects.php
deleted file mode 100644
index e786e729..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Datastore/Resource/Projects.php
+++ /dev/null
@@ -1,120 +0,0 @@
-
- *   $datastoreService = new Google_Service_Datastore(...);
- *   $projects = $datastoreService->projects;
- *  
- */
-class Google_Service_Datastore_Resource_Projects extends Google_Service_Resource
-{
-  /**
-   * Allocates IDs for the given keys, which is useful for referencing an entity
-   * before it is inserted. (projects.allocateIds)
-   *
-   * @param string $projectId The ID of the project against which to make the
-   * request.
-   * @param Google_Service_Datastore_AllocateIdsRequest $postBody
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Datastore_AllocateIdsResponse
-   */
-  public function allocateIds($projectId, Google_Service_Datastore_AllocateIdsRequest $postBody, $optParams = array())
-  {
-    $params = array('projectId' => $projectId, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('allocateIds', array($params), "Google_Service_Datastore_AllocateIdsResponse");
-  }
-  /**
-   * Begins a new transaction. (projects.beginTransaction)
-   *
-   * @param string $projectId The ID of the project against which to make the
-   * request.
-   * @param Google_Service_Datastore_BeginTransactionRequest $postBody
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Datastore_BeginTransactionResponse
-   */
-  public function beginTransaction($projectId, Google_Service_Datastore_BeginTransactionRequest $postBody, $optParams = array())
-  {
-    $params = array('projectId' => $projectId, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('beginTransaction', array($params), "Google_Service_Datastore_BeginTransactionResponse");
-  }
-  /**
-   * Commits a transaction, optionally creating, deleting or modifying some
-   * entities. (projects.commit)
-   *
-   * @param string $projectId The ID of the project against which to make the
-   * request.
-   * @param Google_Service_Datastore_CommitRequest $postBody
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Datastore_CommitResponse
-   */
-  public function commit($projectId, Google_Service_Datastore_CommitRequest $postBody, $optParams = array())
-  {
-    $params = array('projectId' => $projectId, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('commit', array($params), "Google_Service_Datastore_CommitResponse");
-  }
-  /**
-   * Looks up entities by key. (projects.lookup)
-   *
-   * @param string $projectId The ID of the project against which to make the
-   * request.
-   * @param Google_Service_Datastore_LookupRequest $postBody
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Datastore_LookupResponse
-   */
-  public function lookup($projectId, Google_Service_Datastore_LookupRequest $postBody, $optParams = array())
-  {
-    $params = array('projectId' => $projectId, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('lookup', array($params), "Google_Service_Datastore_LookupResponse");
-  }
-  /**
-   * Rolls back a transaction. (projects.rollback)
-   *
-   * @param string $projectId The ID of the project against which to make the
-   * request.
-   * @param Google_Service_Datastore_RollbackRequest $postBody
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Datastore_RollbackResponse
-   */
-  public function rollback($projectId, Google_Service_Datastore_RollbackRequest $postBody, $optParams = array())
-  {
-    $params = array('projectId' => $projectId, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('rollback', array($params), "Google_Service_Datastore_RollbackResponse");
-  }
-  /**
-   * Queries for entities. (projects.runQuery)
-   *
-   * @param string $projectId The ID of the project against which to make the
-   * request.
-   * @param Google_Service_Datastore_RunQueryRequest $postBody
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Datastore_RunQueryResponse
-   */
-  public function runQuery($projectId, Google_Service_Datastore_RunQueryRequest $postBody, $optParams = array())
-  {
-    $params = array('projectId' => $projectId, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('runQuery', array($params), "Google_Service_Datastore_RunQueryResponse");
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Datastore/RollbackRequest.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Datastore/RollbackRequest.php
deleted file mode 100644
index 2faa9679..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Datastore/RollbackRequest.php
+++ /dev/null
@@ -1,30 +0,0 @@
-transaction = $transaction;
-  }
-  public function getTransaction()
-  {
-    return $this->transaction;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Datastore/RollbackResponse.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Datastore/RollbackResponse.php
deleted file mode 100644
index d80eb517..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Datastore/RollbackResponse.php
+++ /dev/null
@@ -1,20 +0,0 @@
-gqlQuery = $gqlQuery;
-  }
-  public function getGqlQuery()
-  {
-    return $this->gqlQuery;
-  }
-  public function setPartitionId(Google_Service_Datastore_PartitionId $partitionId)
-  {
-    $this->partitionId = $partitionId;
-  }
-  public function getPartitionId()
-  {
-    return $this->partitionId;
-  }
-  public function setQuery(Google_Service_Datastore_Query $query)
-  {
-    $this->query = $query;
-  }
-  public function getQuery()
-  {
-    return $this->query;
-  }
-  public function setReadOptions(Google_Service_Datastore_ReadOptions $readOptions)
-  {
-    $this->readOptions = $readOptions;
-  }
-  public function getReadOptions()
-  {
-    return $this->readOptions;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Datastore/RunQueryResponse.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Datastore/RunQueryResponse.php
deleted file mode 100644
index 201368c0..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Datastore/RunQueryResponse.php
+++ /dev/null
@@ -1,41 +0,0 @@
-batch = $batch;
-  }
-  public function getBatch()
-  {
-    return $this->batch;
-  }
-  public function setQuery(Google_Service_Datastore_Query $query)
-  {
-    $this->query = $query;
-  }
-  public function getQuery()
-  {
-    return $this->query;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Datastore/Value.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Datastore/Value.php
deleted file mode 100644
index 6d3c32d6..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Datastore/Value.php
+++ /dev/null
@@ -1,142 +0,0 @@
-arrayValue = $arrayValue;
-  }
-  public function getArrayValue()
-  {
-    return $this->arrayValue;
-  }
-  public function setBlobValue($blobValue)
-  {
-    $this->blobValue = $blobValue;
-  }
-  public function getBlobValue()
-  {
-    return $this->blobValue;
-  }
-  public function setBooleanValue($booleanValue)
-  {
-    $this->booleanValue = $booleanValue;
-  }
-  public function getBooleanValue()
-  {
-    return $this->booleanValue;
-  }
-  public function setDoubleValue($doubleValue)
-  {
-    $this->doubleValue = $doubleValue;
-  }
-  public function getDoubleValue()
-  {
-    return $this->doubleValue;
-  }
-  public function setEntityValue(Google_Service_Datastore_Entity $entityValue)
-  {
-    $this->entityValue = $entityValue;
-  }
-  public function getEntityValue()
-  {
-    return $this->entityValue;
-  }
-  public function setExcludeFromIndexes($excludeFromIndexes)
-  {
-    $this->excludeFromIndexes = $excludeFromIndexes;
-  }
-  public function getExcludeFromIndexes()
-  {
-    return $this->excludeFromIndexes;
-  }
-  public function setGeoPointValue(Google_Service_Datastore_LatLng $geoPointValue)
-  {
-    $this->geoPointValue = $geoPointValue;
-  }
-  public function getGeoPointValue()
-  {
-    return $this->geoPointValue;
-  }
-  public function setIntegerValue($integerValue)
-  {
-    $this->integerValue = $integerValue;
-  }
-  public function getIntegerValue()
-  {
-    return $this->integerValue;
-  }
-  public function setKeyValue(Google_Service_Datastore_Key $keyValue)
-  {
-    $this->keyValue = $keyValue;
-  }
-  public function getKeyValue()
-  {
-    return $this->keyValue;
-  }
-  public function setMeaning($meaning)
-  {
-    $this->meaning = $meaning;
-  }
-  public function getMeaning()
-  {
-    return $this->meaning;
-  }
-  public function setNullValue($nullValue)
-  {
-    $this->nullValue = $nullValue;
-  }
-  public function getNullValue()
-  {
-    return $this->nullValue;
-  }
-  public function setStringValue($stringValue)
-  {
-    $this->stringValue = $stringValue;
-  }
-  public function getStringValue()
-  {
-    return $this->stringValue;
-  }
-  public function setTimestampValue($timestampValue)
-  {
-    $this->timestampValue = $timestampValue;
-  }
-  public function getTimestampValue()
-  {
-    return $this->timestampValue;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/DeploymentManager.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/DeploymentManager.php
deleted file mode 100644
index fe887c23..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/DeploymentManager.php
+++ /dev/null
@@ -1,488 +0,0 @@
-
- * Declares, configures, and deploys complex solutions on Google Cloud Platform.

- *
- * 

- * For more information about this service, see the API
- * Documentation
- * 

- *
- * @author Google, Inc.
- */
-class Google_Service_DeploymentManager extends Google_Service
-{
-  /** View and manage your data across Google Cloud Platform services. */
-  const CLOUD_PLATFORM =
-      "https://www.googleapis.com/auth/cloud-platform";
-  /** View your data across Google Cloud Platform services. */
-  const CLOUD_PLATFORM_READ_ONLY =
-      "https://www.googleapis.com/auth/cloud-platform.read-only";
-  /** View and manage your Google Cloud Platform management resources and deployment status information. */
-  const NDEV_CLOUDMAN =
-      "https://www.googleapis.com/auth/ndev.cloudman";
-  /** View your Google Cloud Platform management resources and deployment status information. */
-  const NDEV_CLOUDMAN_READONLY =
-      "https://www.googleapis.com/auth/ndev.cloudman.readonly";
-
-  public $deployments;
-  public $manifests;
-  public $operations;
-  public $resources;
-  public $types;
-  
-  /**
-   * Constructs the internal representation of the DeploymentManager service.
-   *
-   * @param Google_Client $client
-   */
-  public function __construct(Google_Client $client)
-  {
-    parent::__construct($client);
-    $this->rootUrl = 'https://www.googleapis.com/';
-    $this->servicePath = 'deploymentmanager/v2/projects/';
-    $this->version = 'v2';
-    $this->serviceName = 'deploymentmanager';
-
-    $this->deployments = new Google_Service_DeploymentManager_Resource_Deployments(
-        $this,
-        $this->serviceName,
-        'deployments',
-        array(
-          'methods' => array(
-            'cancelPreview' => array(
-              'path' => '{project}/global/deployments/{deployment}/cancelPreview',
-              'httpMethod' => 'POST',
-              'parameters' => array(
-                'project' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'deployment' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'delete' => array(
-              'path' => '{project}/global/deployments/{deployment}',
-              'httpMethod' => 'DELETE',
-              'parameters' => array(
-                'project' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'deployment' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'deletePolicy' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-              ),
-            ),'get' => array(
-              'path' => '{project}/global/deployments/{deployment}',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'project' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'deployment' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'getIamPolicy' => array(
-              'path' => '{project}/global/deployments/{resource}/getIamPolicy',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'project' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'resource' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'insert' => array(
-              'path' => '{project}/global/deployments',
-              'httpMethod' => 'POST',
-              'parameters' => array(
-                'project' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'preview' => array(
-                  'location' => 'query',
-                  'type' => 'boolean',
-                ),
-              ),
-            ),'list' => array(
-              'path' => '{project}/global/deployments',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'project' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'filter' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'maxResults' => array(
-                  'location' => 'query',
-                  'type' => 'integer',
-                ),
-                'orderBy' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'pageToken' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-              ),
-            ),'patch' => array(
-              'path' => '{project}/global/deployments/{deployment}',
-              'httpMethod' => 'PATCH',
-              'parameters' => array(
-                'project' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'deployment' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'createPolicy' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'deletePolicy' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'preview' => array(
-                  'location' => 'query',
-                  'type' => 'boolean',
-                ),
-              ),
-            ),'setIamPolicy' => array(
-              'path' => '{project}/global/deployments/{resource}/setIamPolicy',
-              'httpMethod' => 'POST',
-              'parameters' => array(
-                'project' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'resource' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'stop' => array(
-              'path' => '{project}/global/deployments/{deployment}/stop',
-              'httpMethod' => 'POST',
-              'parameters' => array(
-                'project' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'deployment' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'testIamPermissions' => array(
-              'path' => '{project}/global/deployments/{resource}/testIamPermissions',
-              'httpMethod' => 'POST',
-              'parameters' => array(
-                'project' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'resource' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'update' => array(
-              'path' => '{project}/global/deployments/{deployment}',
-              'httpMethod' => 'PUT',
-              'parameters' => array(
-                'project' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'deployment' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'createPolicy' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'deletePolicy' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'preview' => array(
-                  'location' => 'query',
-                  'type' => 'boolean',
-                ),
-              ),
-            ),
-          )
-        )
-    );
-    $this->manifests = new Google_Service_DeploymentManager_Resource_Manifests(
-        $this,
-        $this->serviceName,
-        'manifests',
-        array(
-          'methods' => array(
-            'get' => array(
-              'path' => '{project}/global/deployments/{deployment}/manifests/{manifest}',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'project' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'deployment' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'manifest' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'list' => array(
-              'path' => '{project}/global/deployments/{deployment}/manifests',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'project' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'deployment' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'filter' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'maxResults' => array(
-                  'location' => 'query',
-                  'type' => 'integer',
-                ),
-                'orderBy' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'pageToken' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-              ),
-            ),
-          )
-        )
-    );
-    $this->operations = new Google_Service_DeploymentManager_Resource_Operations(
-        $this,
-        $this->serviceName,
-        'operations',
-        array(
-          'methods' => array(
-            'get' => array(
-              'path' => '{project}/global/operations/{operation}',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'project' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'operation' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'list' => array(
-              'path' => '{project}/global/operations',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'project' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'filter' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'maxResults' => array(
-                  'location' => 'query',
-                  'type' => 'integer',
-                ),
-                'orderBy' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'pageToken' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-              ),
-            ),
-          )
-        )
-    );
-    $this->resources = new Google_Service_DeploymentManager_Resource_Resources(
-        $this,
-        $this->serviceName,
-        'resources',
-        array(
-          'methods' => array(
-            'get' => array(
-              'path' => '{project}/global/deployments/{deployment}/resources/{resource}',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'project' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'deployment' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'resource' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'list' => array(
-              'path' => '{project}/global/deployments/{deployment}/resources',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'project' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'deployment' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'filter' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'maxResults' => array(
-                  'location' => 'query',
-                  'type' => 'integer',
-                ),
-                'orderBy' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'pageToken' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-              ),
-            ),
-          )
-        )
-    );
-    $this->types = new Google_Service_DeploymentManager_Resource_Types(
-        $this,
-        $this->serviceName,
-        'types',
-        array(
-          'methods' => array(
-            'list' => array(
-              'path' => '{project}/global/types',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'project' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'filter' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'maxResults' => array(
-                  'location' => 'query',
-                  'type' => 'integer',
-                ),
-                'orderBy' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'pageToken' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-              ),
-            ),
-          )
-        )
-    );
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/DeploymentManager/AuditConfig.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/DeploymentManager/AuditConfig.php
deleted file mode 100644
index 3dcd22fe..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/DeploymentManager/AuditConfig.php
+++ /dev/null
@@ -1,50 +0,0 @@
-auditLogConfigs = $auditLogConfigs;
-  }
-  public function getAuditLogConfigs()
-  {
-    return $this->auditLogConfigs;
-  }
-  public function setExemptedMembers($exemptedMembers)
-  {
-    $this->exemptedMembers = $exemptedMembers;
-  }
-  public function getExemptedMembers()
-  {
-    return $this->exemptedMembers;
-  }
-  public function setService($service)
-  {
-    $this->service = $service;
-  }
-  public function getService()
-  {
-    return $this->service;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/DeploymentManager/AuditLogConfig.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/DeploymentManager/AuditLogConfig.php
deleted file mode 100644
index 7cb4e52d..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/DeploymentManager/AuditLogConfig.php
+++ /dev/null
@@ -1,40 +0,0 @@
-exemptedMembers = $exemptedMembers;
-  }
-  public function getExemptedMembers()
-  {
-    return $this->exemptedMembers;
-  }
-  public function setLogType($logType)
-  {
-    $this->logType = $logType;
-  }
-  public function getLogType()
-  {
-    return $this->logType;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/DeploymentManager/Binding.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/DeploymentManager/Binding.php
deleted file mode 100644
index 06bd6104..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/DeploymentManager/Binding.php
+++ /dev/null
@@ -1,40 +0,0 @@
-members = $members;
-  }
-  public function getMembers()
-  {
-    return $this->members;
-  }
-  public function setRole($role)
-  {
-    $this->role = $role;
-  }
-  public function getRole()
-  {
-    return $this->role;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/DeploymentManager/Condition.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/DeploymentManager/Condition.php
deleted file mode 100644
index 60097131..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/DeploymentManager/Condition.php
+++ /dev/null
@@ -1,76 +0,0 @@
-iam = $iam;
-  }
-  public function getIam()
-  {
-    return $this->iam;
-  }
-  public function setOp($op)
-  {
-    $this->op = $op;
-  }
-  public function getOp()
-  {
-    return $this->op;
-  }
-  public function setSvc($svc)
-  {
-    $this->svc = $svc;
-  }
-  public function getSvc()
-  {
-    return $this->svc;
-  }
-  public function setSys($sys)
-  {
-    $this->sys = $sys;
-  }
-  public function getSys()
-  {
-    return $this->sys;
-  }
-  public function setValue($value)
-  {
-    $this->value = $value;
-  }
-  public function getValue()
-  {
-    return $this->value;
-  }
-  public function setValues($values)
-  {
-    $this->values = $values;
-  }
-  public function getValues()
-  {
-    return $this->values;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/DeploymentManager/ConfigFile.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/DeploymentManager/ConfigFile.php
deleted file mode 100644
index 8abb1a99..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/DeploymentManager/ConfigFile.php
+++ /dev/null
@@ -1,30 +0,0 @@
-content = $content;
-  }
-  public function getContent()
-  {
-    return $this->content;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/DeploymentManager/Deployment.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/DeploymentManager/Deployment.php
deleted file mode 100644
index 065f0662..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/DeploymentManager/Deployment.php
+++ /dev/null
@@ -1,125 +0,0 @@
-description = $description;
-  }
-  public function getDescription()
-  {
-    return $this->description;
-  }
-  public function setFingerprint($fingerprint)
-  {
-    $this->fingerprint = $fingerprint;
-  }
-  public function getFingerprint()
-  {
-    return $this->fingerprint;
-  }
-  public function setId($id)
-  {
-    $this->id = $id;
-  }
-  public function getId()
-  {
-    return $this->id;
-  }
-  public function setInsertTime($insertTime)
-  {
-    $this->insertTime = $insertTime;
-  }
-  public function getInsertTime()
-  {
-    return $this->insertTime;
-  }
-  public function setLabels($labels)
-  {
-    $this->labels = $labels;
-  }
-  public function getLabels()
-  {
-    return $this->labels;
-  }
-  public function setManifest($manifest)
-  {
-    $this->manifest = $manifest;
-  }
-  public function getManifest()
-  {
-    return $this->manifest;
-  }
-  public function setName($name)
-  {
-    $this->name = $name;
-  }
-  public function getName()
-  {
-    return $this->name;
-  }
-  public function setOperation(Google_Service_DeploymentManager_Operation $operation)
-  {
-    $this->operation = $operation;
-  }
-  public function getOperation()
-  {
-    return $this->operation;
-  }
-  public function setSelfLink($selfLink)
-  {
-    $this->selfLink = $selfLink;
-  }
-  public function getSelfLink()
-  {
-    return $this->selfLink;
-  }
-  public function setTarget(Google_Service_DeploymentManager_TargetConfiguration $target)
-  {
-    $this->target = $target;
-  }
-  public function getTarget()
-  {
-    return $this->target;
-  }
-  public function setUpdate(Google_Service_DeploymentManager_DeploymentUpdate $update)
-  {
-    $this->update = $update;
-  }
-  public function getUpdate()
-  {
-    return $this->update;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/DeploymentManager/DeploymentLabelEntry.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/DeploymentManager/DeploymentLabelEntry.php
deleted file mode 100644
index dfefc929..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/DeploymentManager/DeploymentLabelEntry.php
+++ /dev/null
@@ -1,39 +0,0 @@
-key = $key;
-  }
-  public function getKey()
-  {
-    return $this->key;
-  }
-  public function setValue($value)
-  {
-    $this->value = $value;
-  }
-  public function getValue()
-  {
-    return $this->value;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/DeploymentManager/DeploymentUpdate.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/DeploymentManager/DeploymentUpdate.php
deleted file mode 100644
index 99beda8f..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/DeploymentManager/DeploymentUpdate.php
+++ /dev/null
@@ -1,50 +0,0 @@
-description = $description;
-  }
-  public function getDescription()
-  {
-    return $this->description;
-  }
-  public function setLabels($labels)
-  {
-    $this->labels = $labels;
-  }
-  public function getLabels()
-  {
-    return $this->labels;
-  }
-  public function setManifest($manifest)
-  {
-    $this->manifest = $manifest;
-  }
-  public function getManifest()
-  {
-    return $this->manifest;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/DeploymentManager/DeploymentUpdateLabelEntry.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/DeploymentManager/DeploymentUpdateLabelEntry.php
deleted file mode 100644
index f7c160c6..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/DeploymentManager/DeploymentUpdateLabelEntry.php
+++ /dev/null
@@ -1,39 +0,0 @@
-key = $key;
-  }
-  public function getKey()
-  {
-    return $this->key;
-  }
-  public function setValue($value)
-  {
-    $this->value = $value;
-  }
-  public function getValue()
-  {
-    return $this->value;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/DeploymentManager/DeploymentmanagerResource.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/DeploymentManager/DeploymentmanagerResource.php
deleted file mode 100644
index 6fdc0d7e..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/DeploymentManager/DeploymentmanagerResource.php
+++ /dev/null
@@ -1,133 +0,0 @@
-accessControl = $accessControl;
-  }
-  public function getAccessControl()
-  {
-    return $this->accessControl;
-  }
-  public function setFinalProperties($finalProperties)
-  {
-    $this->finalProperties = $finalProperties;
-  }
-  public function getFinalProperties()
-  {
-    return $this->finalProperties;
-  }
-  public function setId($id)
-  {
-    $this->id = $id;
-  }
-  public function getId()
-  {
-    return $this->id;
-  }
-  public function setInsertTime($insertTime)
-  {
-    $this->insertTime = $insertTime;
-  }
-  public function getInsertTime()
-  {
-    return $this->insertTime;
-  }
-  public function setManifest($manifest)
-  {
-    $this->manifest = $manifest;
-  }
-  public function getManifest()
-  {
-    return $this->manifest;
-  }
-  public function setName($name)
-  {
-    $this->name = $name;
-  }
-  public function getName()
-  {
-    return $this->name;
-  }
-  public function setProperties($properties)
-  {
-    $this->properties = $properties;
-  }
-  public function getProperties()
-  {
-    return $this->properties;
-  }
-  public function setType($type)
-  {
-    $this->type = $type;
-  }
-  public function getType()
-  {
-    return $this->type;
-  }
-  public function setUpdate(Google_Service_DeploymentManager_ResourceUpdate $update)
-  {
-    $this->update = $update;
-  }
-  public function getUpdate()
-  {
-    return $this->update;
-  }
-  public function setUpdateTime($updateTime)
-  {
-    $this->updateTime = $updateTime;
-  }
-  public function getUpdateTime()
-  {
-    return $this->updateTime;
-  }
-  public function setUrl($url)
-  {
-    $this->url = $url;
-  }
-  public function getUrl()
-  {
-    return $this->url;
-  }
-  public function setWarnings($warnings)
-  {
-    $this->warnings = $warnings;
-  }
-  public function getWarnings()
-  {
-    return $this->warnings;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/DeploymentManager/DeploymentmanagerResourceWarnings.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/DeploymentManager/DeploymentmanagerResourceWarnings.php
deleted file mode 100644
index 2e5c54d2..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/DeploymentManager/DeploymentmanagerResourceWarnings.php
+++ /dev/null
@@ -1,50 +0,0 @@
-code = $code;
-  }
-  public function getCode()
-  {
-    return $this->code;
-  }
-  public function setData($data)
-  {
-    $this->data = $data;
-  }
-  public function getData()
-  {
-    return $this->data;
-  }
-  public function setMessage($message)
-  {
-    $this->message = $message;
-  }
-  public function getMessage()
-  {
-    return $this->message;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/DeploymentManager/DeploymentmanagerResourceWarningsData.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/DeploymentManager/DeploymentmanagerResourceWarningsData.php
deleted file mode 100644
index 0ee7e71b..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/DeploymentManager/DeploymentmanagerResourceWarningsData.php
+++ /dev/null
@@ -1,39 +0,0 @@
-key = $key;
-  }
-  public function getKey()
-  {
-    return $this->key;
-  }
-  public function setValue($value)
-  {
-    $this->value = $value;
-  }
-  public function getValue()
-  {
-    return $this->value;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/DeploymentManager/DeploymentsCancelPreviewRequest.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/DeploymentManager/DeploymentsCancelPreviewRequest.php
deleted file mode 100644
index 7e4d1e75..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/DeploymentManager/DeploymentsCancelPreviewRequest.php
+++ /dev/null
@@ -1,30 +0,0 @@
-fingerprint = $fingerprint;
-  }
-  public function getFingerprint()
-  {
-    return $this->fingerprint;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/DeploymentManager/DeploymentsListResponse.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/DeploymentManager/DeploymentsListResponse.php
deleted file mode 100644
index 8cbd2724..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/DeploymentManager/DeploymentsListResponse.php
+++ /dev/null
@@ -1,41 +0,0 @@
-deployments = $deployments;
-  }
-  public function getDeployments()
-  {
-    return $this->deployments;
-  }
-  public function setNextPageToken($nextPageToken)
-  {
-    $this->nextPageToken = $nextPageToken;
-  }
-  public function getNextPageToken()
-  {
-    return $this->nextPageToken;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/DeploymentManager/DeploymentsStopRequest.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/DeploymentManager/DeploymentsStopRequest.php
deleted file mode 100644
index 262c7b30..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/DeploymentManager/DeploymentsStopRequest.php
+++ /dev/null
@@ -1,30 +0,0 @@
-fingerprint = $fingerprint;
-  }
-  public function getFingerprint()
-  {
-    return $this->fingerprint;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/DeploymentManager/ImportFile.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/DeploymentManager/ImportFile.php
deleted file mode 100644
index ab85668f..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/DeploymentManager/ImportFile.php
+++ /dev/null
@@ -1,39 +0,0 @@
-content = $content;
-  }
-  public function getContent()
-  {
-    return $this->content;
-  }
-  public function setName($name)
-  {
-    $this->name = $name;
-  }
-  public function getName()
-  {
-    return $this->name;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/DeploymentManager/LogConfig.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/DeploymentManager/LogConfig.php
deleted file mode 100644
index 3599f1ac..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/DeploymentManager/LogConfig.php
+++ /dev/null
@@ -1,31 +0,0 @@
-counter = $counter;
-  }
-  public function getCounter()
-  {
-    return $this->counter;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/DeploymentManager/LogConfigCounterOptions.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/DeploymentManager/LogConfigCounterOptions.php
deleted file mode 100644
index b9a9b9bb..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/DeploymentManager/LogConfigCounterOptions.php
+++ /dev/null
@@ -1,39 +0,0 @@
-field = $field;
-  }
-  public function getField()
-  {
-    return $this->field;
-  }
-  public function setMetric($metric)
-  {
-    $this->metric = $metric;
-  }
-  public function getMetric()
-  {
-    return $this->metric;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/DeploymentManager/Manifest.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/DeploymentManager/Manifest.php
deleted file mode 100644
index 7adc20f7..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/DeploymentManager/Manifest.php
+++ /dev/null
@@ -1,96 +0,0 @@
-config = $config;
-  }
-  public function getConfig()
-  {
-    return $this->config;
-  }
-  public function setExpandedConfig($expandedConfig)
-  {
-    $this->expandedConfig = $expandedConfig;
-  }
-  public function getExpandedConfig()
-  {
-    return $this->expandedConfig;
-  }
-  public function setId($id)
-  {
-    $this->id = $id;
-  }
-  public function getId()
-  {
-    return $this->id;
-  }
-  public function setImports($imports)
-  {
-    $this->imports = $imports;
-  }
-  public function getImports()
-  {
-    return $this->imports;
-  }
-  public function setInsertTime($insertTime)
-  {
-    $this->insertTime = $insertTime;
-  }
-  public function getInsertTime()
-  {
-    return $this->insertTime;
-  }
-  public function setLayout($layout)
-  {
-    $this->layout = $layout;
-  }
-  public function getLayout()
-  {
-    return $this->layout;
-  }
-  public function setName($name)
-  {
-    $this->name = $name;
-  }
-  public function getName()
-  {
-    return $this->name;
-  }
-  public function setSelfLink($selfLink)
-  {
-    $this->selfLink = $selfLink;
-  }
-  public function getSelfLink()
-  {
-    return $this->selfLink;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/DeploymentManager/ManifestsListResponse.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/DeploymentManager/ManifestsListResponse.php
deleted file mode 100644
index 6859ab30..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/DeploymentManager/ManifestsListResponse.php
+++ /dev/null
@@ -1,41 +0,0 @@
-manifests = $manifests;
-  }
-  public function getManifests()
-  {
-    return $this->manifests;
-  }
-  public function setNextPageToken($nextPageToken)
-  {
-    $this->nextPageToken = $nextPageToken;
-  }
-  public function getNextPageToken()
-  {
-    return $this->nextPageToken;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/DeploymentManager/Operation.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/DeploymentManager/Operation.php
deleted file mode 100644
index a9993c6e..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/DeploymentManager/Operation.php
+++ /dev/null
@@ -1,231 +0,0 @@
-clientOperationId = $clientOperationId;
-  }
-  public function getClientOperationId()
-  {
-    return $this->clientOperationId;
-  }
-  public function setCreationTimestamp($creationTimestamp)
-  {
-    $this->creationTimestamp = $creationTimestamp;
-  }
-  public function getCreationTimestamp()
-  {
-    return $this->creationTimestamp;
-  }
-  public function setDescription($description)
-  {
-    $this->description = $description;
-  }
-  public function getDescription()
-  {
-    return $this->description;
-  }
-  public function setEndTime($endTime)
-  {
-    $this->endTime = $endTime;
-  }
-  public function getEndTime()
-  {
-    return $this->endTime;
-  }
-  public function setError(Google_Service_DeploymentManager_OperationError $error)
-  {
-    $this->error = $error;
-  }
-  public function getError()
-  {
-    return $this->error;
-  }
-  public function setHttpErrorMessage($httpErrorMessage)
-  {
-    $this->httpErrorMessage = $httpErrorMessage;
-  }
-  public function getHttpErrorMessage()
-  {
-    return $this->httpErrorMessage;
-  }
-  public function setHttpErrorStatusCode($httpErrorStatusCode)
-  {
-    $this->httpErrorStatusCode = $httpErrorStatusCode;
-  }
-  public function getHttpErrorStatusCode()
-  {
-    return $this->httpErrorStatusCode;
-  }
-  public function setId($id)
-  {
-    $this->id = $id;
-  }
-  public function getId()
-  {
-    return $this->id;
-  }
-  public function setInsertTime($insertTime)
-  {
-    $this->insertTime = $insertTime;
-  }
-  public function getInsertTime()
-  {
-    return $this->insertTime;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setName($name)
-  {
-    $this->name = $name;
-  }
-  public function getName()
-  {
-    return $this->name;
-  }
-  public function setOperationType($operationType)
-  {
-    $this->operationType = $operationType;
-  }
-  public function getOperationType()
-  {
-    return $this->operationType;
-  }
-  public function setProgress($progress)
-  {
-    $this->progress = $progress;
-  }
-  public function getProgress()
-  {
-    return $this->progress;
-  }
-  public function setRegion($region)
-  {
-    $this->region = $region;
-  }
-  public function getRegion()
-  {
-    return $this->region;
-  }
-  public function setSelfLink($selfLink)
-  {
-    $this->selfLink = $selfLink;
-  }
-  public function getSelfLink()
-  {
-    return $this->selfLink;
-  }
-  public function setStartTime($startTime)
-  {
-    $this->startTime = $startTime;
-  }
-  public function getStartTime()
-  {
-    return $this->startTime;
-  }
-  public function setStatus($status)
-  {
-    $this->status = $status;
-  }
-  public function getStatus()
-  {
-    return $this->status;
-  }
-  public function setStatusMessage($statusMessage)
-  {
-    $this->statusMessage = $statusMessage;
-  }
-  public function getStatusMessage()
-  {
-    return $this->statusMessage;
-  }
-  public function setTargetId($targetId)
-  {
-    $this->targetId = $targetId;
-  }
-  public function getTargetId()
-  {
-    return $this->targetId;
-  }
-  public function setTargetLink($targetLink)
-  {
-    $this->targetLink = $targetLink;
-  }
-  public function getTargetLink()
-  {
-    return $this->targetLink;
-  }
-  public function setUser($user)
-  {
-    $this->user = $user;
-  }
-  public function getUser()
-  {
-    return $this->user;
-  }
-  public function setWarnings($warnings)
-  {
-    $this->warnings = $warnings;
-  }
-  public function getWarnings()
-  {
-    return $this->warnings;
-  }
-  public function setZone($zone)
-  {
-    $this->zone = $zone;
-  }
-  public function getZone()
-  {
-    return $this->zone;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/DeploymentManager/OperationError.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/DeploymentManager/OperationError.php
deleted file mode 100644
index 7f37bf68..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/DeploymentManager/OperationError.php
+++ /dev/null
@@ -1,32 +0,0 @@
-errors = $errors;
-  }
-  public function getErrors()
-  {
-    return $this->errors;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/DeploymentManager/OperationErrorErrors.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/DeploymentManager/OperationErrorErrors.php
deleted file mode 100644
index 544661ae..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/DeploymentManager/OperationErrorErrors.php
+++ /dev/null
@@ -1,48 +0,0 @@
-code = $code;
-  }
-  public function getCode()
-  {
-    return $this->code;
-  }
-  public function setLocation($location)
-  {
-    $this->location = $location;
-  }
-  public function getLocation()
-  {
-    return $this->location;
-  }
-  public function setMessage($message)
-  {
-    $this->message = $message;
-  }
-  public function getMessage()
-  {
-    return $this->message;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/DeploymentManager/OperationWarnings.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/DeploymentManager/OperationWarnings.php
deleted file mode 100644
index 342aa444..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/DeploymentManager/OperationWarnings.php
+++ /dev/null
@@ -1,50 +0,0 @@
-code = $code;
-  }
-  public function getCode()
-  {
-    return $this->code;
-  }
-  public function setData($data)
-  {
-    $this->data = $data;
-  }
-  public function getData()
-  {
-    return $this->data;
-  }
-  public function setMessage($message)
-  {
-    $this->message = $message;
-  }
-  public function getMessage()
-  {
-    return $this->message;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/DeploymentManager/OperationWarningsData.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/DeploymentManager/OperationWarningsData.php
deleted file mode 100644
index ddf46398..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/DeploymentManager/OperationWarningsData.php
+++ /dev/null
@@ -1,39 +0,0 @@
-key = $key;
-  }
-  public function getKey()
-  {
-    return $this->key;
-  }
-  public function setValue($value)
-  {
-    $this->value = $value;
-  }
-  public function getValue()
-  {
-    return $this->value;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/DeploymentManager/OperationsListResponse.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/DeploymentManager/OperationsListResponse.php
deleted file mode 100644
index 09f20c50..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/DeploymentManager/OperationsListResponse.php
+++ /dev/null
@@ -1,41 +0,0 @@
-nextPageToken = $nextPageToken;
-  }
-  public function getNextPageToken()
-  {
-    return $this->nextPageToken;
-  }
-  public function setOperations($operations)
-  {
-    $this->operations = $operations;
-  }
-  public function getOperations()
-  {
-    return $this->operations;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/DeploymentManager/Policy.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/DeploymentManager/Policy.php
deleted file mode 100644
index c9ae1046..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/DeploymentManager/Policy.php
+++ /dev/null
@@ -1,79 +0,0 @@
-auditConfigs = $auditConfigs;
-  }
-  public function getAuditConfigs()
-  {
-    return $this->auditConfigs;
-  }
-  public function setBindings($bindings)
-  {
-    $this->bindings = $bindings;
-  }
-  public function getBindings()
-  {
-    return $this->bindings;
-  }
-  public function setEtag($etag)
-  {
-    $this->etag = $etag;
-  }
-  public function getEtag()
-  {
-    return $this->etag;
-  }
-  public function setIamOwned($iamOwned)
-  {
-    $this->iamOwned = $iamOwned;
-  }
-  public function getIamOwned()
-  {
-    return $this->iamOwned;
-  }
-  public function setRules($rules)
-  {
-    $this->rules = $rules;
-  }
-  public function getRules()
-  {
-    return $this->rules;
-  }
-  public function setVersion($version)
-  {
-    $this->version = $version;
-  }
-  public function getVersion()
-  {
-    return $this->version;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/DeploymentManager/Resource/Deployments.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/DeploymentManager/Resource/Deployments.php
deleted file mode 100644
index 890bfb18..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/DeploymentManager/Resource/Deployments.php
+++ /dev/null
@@ -1,279 +0,0 @@
-
- *   $deploymentmanagerService = new Google_Service_DeploymentManager(...);
- *   $deployments = $deploymentmanagerService->deployments;
- *  
- */
-class Google_Service_DeploymentManager_Resource_Deployments extends Google_Service_Resource
-{
-  /**
-   * Cancels and removes the preview currently associated with the deployment.
-   * (deployments.cancelPreview)
-   *
-   * @param string $project The project ID for this request.
-   * @param string $deployment The name of the deployment for this request.
-   * @param Google_Service_DeploymentManager_DeploymentsCancelPreviewRequest $postBody
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_DeploymentManager_Operation
-   */
-  public function cancelPreview($project, $deployment, Google_Service_DeploymentManager_DeploymentsCancelPreviewRequest $postBody, $optParams = array())
-  {
-    $params = array('project' => $project, 'deployment' => $deployment, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('cancelPreview', array($params), "Google_Service_DeploymentManager_Operation");
-  }
-  /**
-   * Deletes a deployment and all of the resources in the deployment.
-   * (deployments.delete)
-   *
-   * @param string $project The project ID for this request.
-   * @param string $deployment The name of the deployment for this request.
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param string deletePolicy Sets the policy to use for deleting resources.
-   * @return Google_Service_DeploymentManager_Operation
-   */
-  public function delete($project, $deployment, $optParams = array())
-  {
-    $params = array('project' => $project, 'deployment' => $deployment);
-    $params = array_merge($params, $optParams);
-    return $this->call('delete', array($params), "Google_Service_DeploymentManager_Operation");
-  }
-  /**
-   * Gets information about a specific deployment. (deployments.get)
-   *
-   * @param string $project The project ID for this request.
-   * @param string $deployment The name of the deployment for this request.
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_DeploymentManager_Deployment
-   */
-  public function get($project, $deployment, $optParams = array())
-  {
-    $params = array('project' => $project, 'deployment' => $deployment);
-    $params = array_merge($params, $optParams);
-    return $this->call('get', array($params), "Google_Service_DeploymentManager_Deployment");
-  }
-  /**
-   * Gets the access control policy for a resource. May be empty if no such policy
-   * or resource exists. (deployments.getIamPolicy)
-   *
-   * @param string $project Project ID for this request.
-   * @param string $resource Name of the resource for this request.
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_DeploymentManager_Policy
-   */
-  public function getIamPolicy($project, $resource, $optParams = array())
-  {
-    $params = array('project' => $project, 'resource' => $resource);
-    $params = array_merge($params, $optParams);
-    return $this->call('getIamPolicy', array($params), "Google_Service_DeploymentManager_Policy");
-  }
-  /**
-   * Creates a deployment and all of the resources described by the deployment
-   * manifest. (deployments.insert)
-   *
-   * @param string $project The project ID for this request.
-   * @param Google_Service_DeploymentManager_Deployment $postBody
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param bool preview If set to true, creates a deployment and creates
-   * "shell" resources but does not actually instantiate these resources. This
-   * allows you to preview what your deployment looks like. After previewing a
-   * deployment, you can deploy your resources by making a request with the
-   * update() method or you can use the cancelPreview() method to cancel the
-   * preview altogether. Note that the deployment will still exist after you
-   * cancel the preview and you must separately delete this deployment if you want
-   * to remove it.
-   * @return Google_Service_DeploymentManager_Operation
-   */
-  public function insert($project, Google_Service_DeploymentManager_Deployment $postBody, $optParams = array())
-  {
-    $params = array('project' => $project, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('insert', array($params), "Google_Service_DeploymentManager_Operation");
-  }
-  /**
-   * Lists all deployments for a given project. (deployments.listDeployments)
-   *
-   * @param string $project The project ID for this request.
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param string filter Sets a filter expression for filtering listed
-   * resources, in the form filter={expression}. Your {expression} must be in the
-   * format: field_name comparison_string literal_string.
-   *
-   * The field_name is the name of the field you want to compare. Only atomic
-   * field types are supported (string, number, boolean). The comparison_string
-   * must be either eq (equals) or ne (not equals). The literal_string is the
-   * string value to filter to. The literal value must be valid for the type of
-   * field you are filtering by (string, number, boolean). For string fields, the
-   * literal value is interpreted as a regular expression using RE2 syntax. The
-   * literal value must match the entire field.
-   *
-   * For example, to filter for instances that do not have a name of example-
-   * instance, you would use filter=name ne example-instance.
-   *
-   * You can filter on nested fields. For example, you could filter on instances
-   * that have set the scheduling.automaticRestart field to true. Use filtering on
-   * nested fields to take advantage of labels to organize and search for results
-   * based on label values.
-   *
-   * To filter on multiple expressions, provide each separate expression within
-   * parentheses. For example, (scheduling.automaticRestart eq true) (zone eq us-
-   * central1-f). Multiple expressions are treated as AND expressions, meaning
-   * that resources must match all expressions to pass the filters.
-   * @opt_param string maxResults The maximum number of results per page that
-   * should be returned. If the number of available results is larger than
-   * maxResults, Compute Engine returns a nextPageToken that can be used to get
-   * the next page of results in subsequent list requests. Acceptable values are 0
-   * to 500, inclusive. (Default: 500)
-   * @opt_param string orderBy Sorts list results by a certain order. By default,
-   * results are returned in alphanumerical order based on the resource name.
-   *
-   * You can also sort results in descending order based on the creation timestamp
-   * using orderBy="creationTimestamp desc". This sorts results based on the
-   * creationTimestamp field in reverse chronological order (newest result first).
-   * Use this to sort resources like operations so that the newest operation is
-   * returned first.
-   *
-   * Currently, only sorting by name or creationTimestamp desc is supported.
-   * @opt_param string pageToken Specifies a page token to use. Set pageToken to
-   * the nextPageToken returned by a previous list request to get the next page of
-   * results.
-   * @return Google_Service_DeploymentManager_DeploymentsListResponse
-   */
-  public function listDeployments($project, $optParams = array())
-  {
-    $params = array('project' => $project);
-    $params = array_merge($params, $optParams);
-    return $this->call('list', array($params), "Google_Service_DeploymentManager_DeploymentsListResponse");
-  }
-  /**
-   * Updates a deployment and all of the resources described by the deployment
-   * manifest. This method supports patch semantics. (deployments.patch)
-   *
-   * @param string $project The project ID for this request.
-   * @param string $deployment The name of the deployment for this request.
-   * @param Google_Service_DeploymentManager_Deployment $postBody
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param string createPolicy Sets the policy to use for creating new
-   * resources.
-   * @opt_param string deletePolicy Sets the policy to use for deleting resources.
-   * @opt_param bool preview If set to true, updates the deployment and creates
-   * and updates the "shell" resources but does not actually alter or instantiate
-   * these resources. This allows you to preview what your deployment will look
-   * like. You can use this intent to preview how an update would affect your
-   * deployment. You must provide a target.config with a configuration if this is
-   * set to true. After previewing a deployment, you can deploy your resources by
-   * making a request with the update() or you can cancelPreview() to remove the
-   * preview altogether. Note that the deployment will still exist after you
-   * cancel the preview and you must separately delete this deployment if you want
-   * to remove it.
-   * @return Google_Service_DeploymentManager_Operation
-   */
-  public function patch($project, $deployment, Google_Service_DeploymentManager_Deployment $postBody, $optParams = array())
-  {
-    $params = array('project' => $project, 'deployment' => $deployment, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('patch', array($params), "Google_Service_DeploymentManager_Operation");
-  }
-  /**
-   * Sets the access control policy on the specified resource. Replaces any
-   * existing policy. (deployments.setIamPolicy)
-   *
-   * @param string $project Project ID for this request.
-   * @param string $resource Name of the resource for this request.
-   * @param Google_Service_DeploymentManager_Policy $postBody
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_DeploymentManager_Policy
-   */
-  public function setIamPolicy($project, $resource, Google_Service_DeploymentManager_Policy $postBody, $optParams = array())
-  {
-    $params = array('project' => $project, 'resource' => $resource, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('setIamPolicy', array($params), "Google_Service_DeploymentManager_Policy");
-  }
-  /**
-   * Stops an ongoing operation. This does not roll back any work that has already
-   * been completed, but prevents any new work from being started.
-   * (deployments.stop)
-   *
-   * @param string $project The project ID for this request.
-   * @param string $deployment The name of the deployment for this request.
-   * @param Google_Service_DeploymentManager_DeploymentsStopRequest $postBody
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_DeploymentManager_Operation
-   */
-  public function stop($project, $deployment, Google_Service_DeploymentManager_DeploymentsStopRequest $postBody, $optParams = array())
-  {
-    $params = array('project' => $project, 'deployment' => $deployment, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('stop', array($params), "Google_Service_DeploymentManager_Operation");
-  }
-  /**
-   * Returns permissions that a caller has on the specified resource.
-   * (deployments.testIamPermissions)
-   *
-   * @param string $project Project ID for this request.
-   * @param string $resource Name of the resource for this request.
-   * @param Google_Service_DeploymentManager_TestPermissionsRequest $postBody
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_DeploymentManager_TestPermissionsResponse
-   */
-  public function testIamPermissions($project, $resource, Google_Service_DeploymentManager_TestPermissionsRequest $postBody, $optParams = array())
-  {
-    $params = array('project' => $project, 'resource' => $resource, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('testIamPermissions', array($params), "Google_Service_DeploymentManager_TestPermissionsResponse");
-  }
-  /**
-   * Updates a deployment and all of the resources described by the deployment
-   * manifest. (deployments.update)
-   *
-   * @param string $project The project ID for this request.
-   * @param string $deployment The name of the deployment for this request.
-   * @param Google_Service_DeploymentManager_Deployment $postBody
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param string createPolicy Sets the policy to use for creating new
-   * resources.
-   * @opt_param string deletePolicy Sets the policy to use for deleting resources.
-   * @opt_param bool preview If set to true, updates the deployment and creates
-   * and updates the "shell" resources but does not actually alter or instantiate
-   * these resources. This allows you to preview what your deployment will look
-   * like. You can use this intent to preview how an update would affect your
-   * deployment. You must provide a target.config with a configuration if this is
-   * set to true. After previewing a deployment, you can deploy your resources by
-   * making a request with the update() or you can cancelPreview() to remove the
-   * preview altogether. Note that the deployment will still exist after you
-   * cancel the preview and you must separately delete this deployment if you want
-   * to remove it.
-   * @return Google_Service_DeploymentManager_Operation
-   */
-  public function update($project, $deployment, Google_Service_DeploymentManager_Deployment $postBody, $optParams = array())
-  {
-    $params = array('project' => $project, 'deployment' => $deployment, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('update', array($params), "Google_Service_DeploymentManager_Operation");
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/DeploymentManager/Resource/Manifests.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/DeploymentManager/Resource/Manifests.php
deleted file mode 100644
index 866783bb..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/DeploymentManager/Resource/Manifests.php
+++ /dev/null
@@ -1,100 +0,0 @@
-
- *   $deploymentmanagerService = new Google_Service_DeploymentManager(...);
- *   $manifests = $deploymentmanagerService->manifests;
- *  
- */
-class Google_Service_DeploymentManager_Resource_Manifests extends Google_Service_Resource
-{
-  /**
-   * Gets information about a specific manifest. (manifests.get)
-   *
-   * @param string $project The project ID for this request.
-   * @param string $deployment The name of the deployment for this request.
-   * @param string $manifest The name of the manifest for this request.
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_DeploymentManager_Manifest
-   */
-  public function get($project, $deployment, $manifest, $optParams = array())
-  {
-    $params = array('project' => $project, 'deployment' => $deployment, 'manifest' => $manifest);
-    $params = array_merge($params, $optParams);
-    return $this->call('get', array($params), "Google_Service_DeploymentManager_Manifest");
-  }
-  /**
-   * Lists all manifests for a given deployment. (manifests.listManifests)
-   *
-   * @param string $project The project ID for this request.
-   * @param string $deployment The name of the deployment for this request.
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param string filter Sets a filter expression for filtering listed
-   * resources, in the form filter={expression}. Your {expression} must be in the
-   * format: field_name comparison_string literal_string.
-   *
-   * The field_name is the name of the field you want to compare. Only atomic
-   * field types are supported (string, number, boolean). The comparison_string
-   * must be either eq (equals) or ne (not equals). The literal_string is the
-   * string value to filter to. The literal value must be valid for the type of
-   * field you are filtering by (string, number, boolean). For string fields, the
-   * literal value is interpreted as a regular expression using RE2 syntax. The
-   * literal value must match the entire field.
-   *
-   * For example, to filter for instances that do not have a name of example-
-   * instance, you would use filter=name ne example-instance.
-   *
-   * You can filter on nested fields. For example, you could filter on instances
-   * that have set the scheduling.automaticRestart field to true. Use filtering on
-   * nested fields to take advantage of labels to organize and search for results
-   * based on label values.
-   *
-   * To filter on multiple expressions, provide each separate expression within
-   * parentheses. For example, (scheduling.automaticRestart eq true) (zone eq us-
-   * central1-f). Multiple expressions are treated as AND expressions, meaning
-   * that resources must match all expressions to pass the filters.
-   * @opt_param string maxResults The maximum number of results per page that
-   * should be returned. If the number of available results is larger than
-   * maxResults, Compute Engine returns a nextPageToken that can be used to get
-   * the next page of results in subsequent list requests. Acceptable values are 0
-   * to 500, inclusive. (Default: 500)
-   * @opt_param string orderBy Sorts list results by a certain order. By default,
-   * results are returned in alphanumerical order based on the resource name.
-   *
-   * You can also sort results in descending order based on the creation timestamp
-   * using orderBy="creationTimestamp desc". This sorts results based on the
-   * creationTimestamp field in reverse chronological order (newest result first).
-   * Use this to sort resources like operations so that the newest operation is
-   * returned first.
-   *
-   * Currently, only sorting by name or creationTimestamp desc is supported.
-   * @opt_param string pageToken Specifies a page token to use. Set pageToken to
-   * the nextPageToken returned by a previous list request to get the next page of
-   * results.
-   * @return Google_Service_DeploymentManager_ManifestsListResponse
-   */
-  public function listManifests($project, $deployment, $optParams = array())
-  {
-    $params = array('project' => $project, 'deployment' => $deployment);
-    $params = array_merge($params, $optParams);
-    return $this->call('list', array($params), "Google_Service_DeploymentManager_ManifestsListResponse");
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/DeploymentManager/Resource/Operations.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/DeploymentManager/Resource/Operations.php
deleted file mode 100644
index 937b87f4..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/DeploymentManager/Resource/Operations.php
+++ /dev/null
@@ -1,98 +0,0 @@
-
- *   $deploymentmanagerService = new Google_Service_DeploymentManager(...);
- *   $operations = $deploymentmanagerService->operations;
- *  
- */
-class Google_Service_DeploymentManager_Resource_Operations extends Google_Service_Resource
-{
-  /**
-   * Gets information about a specific operation. (operations.get)
-   *
-   * @param string $project The project ID for this request.
-   * @param string $operation The name of the operation for this request.
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_DeploymentManager_Operation
-   */
-  public function get($project, $operation, $optParams = array())
-  {
-    $params = array('project' => $project, 'operation' => $operation);
-    $params = array_merge($params, $optParams);
-    return $this->call('get', array($params), "Google_Service_DeploymentManager_Operation");
-  }
-  /**
-   * Lists all operations for a project. (operations.listOperations)
-   *
-   * @param string $project The project ID for this request.
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param string filter Sets a filter expression for filtering listed
-   * resources, in the form filter={expression}. Your {expression} must be in the
-   * format: field_name comparison_string literal_string.
-   *
-   * The field_name is the name of the field you want to compare. Only atomic
-   * field types are supported (string, number, boolean). The comparison_string
-   * must be either eq (equals) or ne (not equals). The literal_string is the
-   * string value to filter to. The literal value must be valid for the type of
-   * field you are filtering by (string, number, boolean). For string fields, the
-   * literal value is interpreted as a regular expression using RE2 syntax. The
-   * literal value must match the entire field.
-   *
-   * For example, to filter for instances that do not have a name of example-
-   * instance, you would use filter=name ne example-instance.
-   *
-   * You can filter on nested fields. For example, you could filter on instances
-   * that have set the scheduling.automaticRestart field to true. Use filtering on
-   * nested fields to take advantage of labels to organize and search for results
-   * based on label values.
-   *
-   * To filter on multiple expressions, provide each separate expression within
-   * parentheses. For example, (scheduling.automaticRestart eq true) (zone eq us-
-   * central1-f). Multiple expressions are treated as AND expressions, meaning
-   * that resources must match all expressions to pass the filters.
-   * @opt_param string maxResults The maximum number of results per page that
-   * should be returned. If the number of available results is larger than
-   * maxResults, Compute Engine returns a nextPageToken that can be used to get
-   * the next page of results in subsequent list requests. Acceptable values are 0
-   * to 500, inclusive. (Default: 500)
-   * @opt_param string orderBy Sorts list results by a certain order. By default,
-   * results are returned in alphanumerical order based on the resource name.
-   *
-   * You can also sort results in descending order based on the creation timestamp
-   * using orderBy="creationTimestamp desc". This sorts results based on the
-   * creationTimestamp field in reverse chronological order (newest result first).
-   * Use this to sort resources like operations so that the newest operation is
-   * returned first.
-   *
-   * Currently, only sorting by name or creationTimestamp desc is supported.
-   * @opt_param string pageToken Specifies a page token to use. Set pageToken to
-   * the nextPageToken returned by a previous list request to get the next page of
-   * results.
-   * @return Google_Service_DeploymentManager_OperationsListResponse
-   */
-  public function listOperations($project, $optParams = array())
-  {
-    $params = array('project' => $project);
-    $params = array_merge($params, $optParams);
-    return $this->call('list', array($params), "Google_Service_DeploymentManager_OperationsListResponse");
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/DeploymentManager/Resource/Resources.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/DeploymentManager/Resource/Resources.php
deleted file mode 100644
index ed154b2a..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/DeploymentManager/Resource/Resources.php
+++ /dev/null
@@ -1,100 +0,0 @@
-
- *   $deploymentmanagerService = new Google_Service_DeploymentManager(...);
- *   $resources = $deploymentmanagerService->resources;
- *  
- */
-class Google_Service_DeploymentManager_Resource_Resources extends Google_Service_Resource
-{
-  /**
-   * Gets information about a single resource. (resources.get)
-   *
-   * @param string $project The project ID for this request.
-   * @param string $deployment The name of the deployment for this request.
-   * @param string $resource The name of the resource for this request.
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_DeploymentManager_DeploymentmanagerResource
-   */
-  public function get($project, $deployment, $resource, $optParams = array())
-  {
-    $params = array('project' => $project, 'deployment' => $deployment, 'resource' => $resource);
-    $params = array_merge($params, $optParams);
-    return $this->call('get', array($params), "Google_Service_DeploymentManager_DeploymentmanagerResource");
-  }
-  /**
-   * Lists all resources in a given deployment. (resources.listResources)
-   *
-   * @param string $project The project ID for this request.
-   * @param string $deployment The name of the deployment for this request.
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param string filter Sets a filter expression for filtering listed
-   * resources, in the form filter={expression}. Your {expression} must be in the
-   * format: field_name comparison_string literal_string.
-   *
-   * The field_name is the name of the field you want to compare. Only atomic
-   * field types are supported (string, number, boolean). The comparison_string
-   * must be either eq (equals) or ne (not equals). The literal_string is the
-   * string value to filter to. The literal value must be valid for the type of
-   * field you are filtering by (string, number, boolean). For string fields, the
-   * literal value is interpreted as a regular expression using RE2 syntax. The
-   * literal value must match the entire field.
-   *
-   * For example, to filter for instances that do not have a name of example-
-   * instance, you would use filter=name ne example-instance.
-   *
-   * You can filter on nested fields. For example, you could filter on instances
-   * that have set the scheduling.automaticRestart field to true. Use filtering on
-   * nested fields to take advantage of labels to organize and search for results
-   * based on label values.
-   *
-   * To filter on multiple expressions, provide each separate expression within
-   * parentheses. For example, (scheduling.automaticRestart eq true) (zone eq us-
-   * central1-f). Multiple expressions are treated as AND expressions, meaning
-   * that resources must match all expressions to pass the filters.
-   * @opt_param string maxResults The maximum number of results per page that
-   * should be returned. If the number of available results is larger than
-   * maxResults, Compute Engine returns a nextPageToken that can be used to get
-   * the next page of results in subsequent list requests. Acceptable values are 0
-   * to 500, inclusive. (Default: 500)
-   * @opt_param string orderBy Sorts list results by a certain order. By default,
-   * results are returned in alphanumerical order based on the resource name.
-   *
-   * You can also sort results in descending order based on the creation timestamp
-   * using orderBy="creationTimestamp desc". This sorts results based on the
-   * creationTimestamp field in reverse chronological order (newest result first).
-   * Use this to sort resources like operations so that the newest operation is
-   * returned first.
-   *
-   * Currently, only sorting by name or creationTimestamp desc is supported.
-   * @opt_param string pageToken Specifies a page token to use. Set pageToken to
-   * the nextPageToken returned by a previous list request to get the next page of
-   * results.
-   * @return Google_Service_DeploymentManager_ResourcesListResponse
-   */
-  public function listResources($project, $deployment, $optParams = array())
-  {
-    $params = array('project' => $project, 'deployment' => $deployment);
-    $params = array_merge($params, $optParams);
-    return $this->call('list', array($params), "Google_Service_DeploymentManager_ResourcesListResponse");
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/DeploymentManager/Resource/Types.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/DeploymentManager/Resource/Types.php
deleted file mode 100644
index 290fd50e..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/DeploymentManager/Resource/Types.php
+++ /dev/null
@@ -1,84 +0,0 @@
-
- *   $deploymentmanagerService = new Google_Service_DeploymentManager(...);
- *   $types = $deploymentmanagerService->types;
- *  
- */
-class Google_Service_DeploymentManager_Resource_Types extends Google_Service_Resource
-{
-  /**
-   * Lists all resource types for Deployment Manager. (types.listTypes)
-   *
-   * @param string $project The project ID for this request.
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param string filter Sets a filter expression for filtering listed
-   * resources, in the form filter={expression}. Your {expression} must be in the
-   * format: field_name comparison_string literal_string.
-   *
-   * The field_name is the name of the field you want to compare. Only atomic
-   * field types are supported (string, number, boolean). The comparison_string
-   * must be either eq (equals) or ne (not equals). The literal_string is the
-   * string value to filter to. The literal value must be valid for the type of
-   * field you are filtering by (string, number, boolean). For string fields, the
-   * literal value is interpreted as a regular expression using RE2 syntax. The
-   * literal value must match the entire field.
-   *
-   * For example, to filter for instances that do not have a name of example-
-   * instance, you would use filter=name ne example-instance.
-   *
-   * You can filter on nested fields. For example, you could filter on instances
-   * that have set the scheduling.automaticRestart field to true. Use filtering on
-   * nested fields to take advantage of labels to organize and search for results
-   * based on label values.
-   *
-   * To filter on multiple expressions, provide each separate expression within
-   * parentheses. For example, (scheduling.automaticRestart eq true) (zone eq us-
-   * central1-f). Multiple expressions are treated as AND expressions, meaning
-   * that resources must match all expressions to pass the filters.
-   * @opt_param string maxResults The maximum number of results per page that
-   * should be returned. If the number of available results is larger than
-   * maxResults, Compute Engine returns a nextPageToken that can be used to get
-   * the next page of results in subsequent list requests. Acceptable values are 0
-   * to 500, inclusive. (Default: 500)
-   * @opt_param string orderBy Sorts list results by a certain order. By default,
-   * results are returned in alphanumerical order based on the resource name.
-   *
-   * You can also sort results in descending order based on the creation timestamp
-   * using orderBy="creationTimestamp desc". This sorts results based on the
-   * creationTimestamp field in reverse chronological order (newest result first).
-   * Use this to sort resources like operations so that the newest operation is
-   * returned first.
-   *
-   * Currently, only sorting by name or creationTimestamp desc is supported.
-   * @opt_param string pageToken Specifies a page token to use. Set pageToken to
-   * the nextPageToken returned by a previous list request to get the next page of
-   * results.
-   * @return Google_Service_DeploymentManager_TypesListResponse
-   */
-  public function listTypes($project, $optParams = array())
-  {
-    $params = array('project' => $project);
-    $params = array_merge($params, $optParams);
-    return $this->call('list', array($params), "Google_Service_DeploymentManager_TypesListResponse");
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/DeploymentManager/ResourceAccessControl.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/DeploymentManager/ResourceAccessControl.php
deleted file mode 100644
index 33a43bbf..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/DeploymentManager/ResourceAccessControl.php
+++ /dev/null
@@ -1,30 +0,0 @@
-gcpIamPolicy = $gcpIamPolicy;
-  }
-  public function getGcpIamPolicy()
-  {
-    return $this->gcpIamPolicy;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/DeploymentManager/ResourceUpdate.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/DeploymentManager/ResourceUpdate.php
deleted file mode 100644
index 5191d8f0..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/DeploymentManager/ResourceUpdate.php
+++ /dev/null
@@ -1,97 +0,0 @@
-accessControl = $accessControl;
-  }
-  public function getAccessControl()
-  {
-    return $this->accessControl;
-  }
-  public function setError(Google_Service_DeploymentManager_ResourceUpdateError $error)
-  {
-    $this->error = $error;
-  }
-  public function getError()
-  {
-    return $this->error;
-  }
-  public function setFinalProperties($finalProperties)
-  {
-    $this->finalProperties = $finalProperties;
-  }
-  public function getFinalProperties()
-  {
-    return $this->finalProperties;
-  }
-  public function setIntent($intent)
-  {
-    $this->intent = $intent;
-  }
-  public function getIntent()
-  {
-    return $this->intent;
-  }
-  public function setManifest($manifest)
-  {
-    $this->manifest = $manifest;
-  }
-  public function getManifest()
-  {
-    return $this->manifest;
-  }
-  public function setProperties($properties)
-  {
-    $this->properties = $properties;
-  }
-  public function getProperties()
-  {
-    return $this->properties;
-  }
-  public function setState($state)
-  {
-    $this->state = $state;
-  }
-  public function getState()
-  {
-    return $this->state;
-  }
-  public function setWarnings($warnings)
-  {
-    $this->warnings = $warnings;
-  }
-  public function getWarnings()
-  {
-    return $this->warnings;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/DeploymentManager/ResourceUpdateError.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/DeploymentManager/ResourceUpdateError.php
deleted file mode 100644
index 0d2afdc8..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/DeploymentManager/ResourceUpdateError.php
+++ /dev/null
@@ -1,32 +0,0 @@
-errors = $errors;
-  }
-  public function getErrors()
-  {
-    return $this->errors;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/DeploymentManager/ResourceUpdateErrorErrors.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/DeploymentManager/ResourceUpdateErrorErrors.php
deleted file mode 100644
index 6fc49050..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/DeploymentManager/ResourceUpdateErrorErrors.php
+++ /dev/null
@@ -1,48 +0,0 @@
-code = $code;
-  }
-  public function getCode()
-  {
-    return $this->code;
-  }
-  public function setLocation($location)
-  {
-    $this->location = $location;
-  }
-  public function getLocation()
-  {
-    return $this->location;
-  }
-  public function setMessage($message)
-  {
-    $this->message = $message;
-  }
-  public function getMessage()
-  {
-    return $this->message;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/DeploymentManager/ResourceUpdateWarnings.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/DeploymentManager/ResourceUpdateWarnings.php
deleted file mode 100644
index 39f3f579..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/DeploymentManager/ResourceUpdateWarnings.php
+++ /dev/null
@@ -1,50 +0,0 @@
-code = $code;
-  }
-  public function getCode()
-  {
-    return $this->code;
-  }
-  public function setData($data)
-  {
-    $this->data = $data;
-  }
-  public function getData()
-  {
-    return $this->data;
-  }
-  public function setMessage($message)
-  {
-    $this->message = $message;
-  }
-  public function getMessage()
-  {
-    return $this->message;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/DeploymentManager/ResourceUpdateWarningsData.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/DeploymentManager/ResourceUpdateWarningsData.php
deleted file mode 100644
index f5f43c48..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/DeploymentManager/ResourceUpdateWarningsData.php
+++ /dev/null
@@ -1,39 +0,0 @@
-key = $key;
-  }
-  public function getKey()
-  {
-    return $this->key;
-  }
-  public function setValue($value)
-  {
-    $this->value = $value;
-  }
-  public function getValue()
-  {
-    return $this->value;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/DeploymentManager/ResourcesListResponse.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/DeploymentManager/ResourcesListResponse.php
deleted file mode 100644
index ec94bf3c..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/DeploymentManager/ResourcesListResponse.php
+++ /dev/null
@@ -1,41 +0,0 @@
-nextPageToken = $nextPageToken;
-  }
-  public function getNextPageToken()
-  {
-    return $this->nextPageToken;
-  }
-  public function setResources($resources)
-  {
-    $this->resources = $resources;
-  }
-  public function getResources()
-  {
-    return $this->resources;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/DeploymentManager/Rule.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/DeploymentManager/Rule.php
deleted file mode 100644
index b5794ae0..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/DeploymentManager/Rule.php
+++ /dev/null
@@ -1,87 +0,0 @@
-action = $action;
-  }
-  public function getAction()
-  {
-    return $this->action;
-  }
-  public function setConditions($conditions)
-  {
-    $this->conditions = $conditions;
-  }
-  public function getConditions()
-  {
-    return $this->conditions;
-  }
-  public function setDescription($description)
-  {
-    $this->description = $description;
-  }
-  public function getDescription()
-  {
-    return $this->description;
-  }
-  public function setIns($ins)
-  {
-    $this->ins = $ins;
-  }
-  public function getIns()
-  {
-    return $this->ins;
-  }
-  public function setLogConfigs($logConfigs)
-  {
-    $this->logConfigs = $logConfigs;
-  }
-  public function getLogConfigs()
-  {
-    return $this->logConfigs;
-  }
-  public function setNotIns($notIns)
-  {
-    $this->notIns = $notIns;
-  }
-  public function getNotIns()
-  {
-    return $this->notIns;
-  }
-  public function setPermissions($permissions)
-  {
-    $this->permissions = $permissions;
-  }
-  public function getPermissions()
-  {
-    return $this->permissions;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/DeploymentManager/TargetConfiguration.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/DeploymentManager/TargetConfiguration.php
deleted file mode 100644
index 89a758a7..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/DeploymentManager/TargetConfiguration.php
+++ /dev/null
@@ -1,42 +0,0 @@
-config = $config;
-  }
-  public function getConfig()
-  {
-    return $this->config;
-  }
-  public function setImports($imports)
-  {
-    $this->imports = $imports;
-  }
-  public function getImports()
-  {
-    return $this->imports;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/DeploymentManager/TestPermissionsRequest.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/DeploymentManager/TestPermissionsRequest.php
deleted file mode 100644
index 27d0c28b..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/DeploymentManager/TestPermissionsRequest.php
+++ /dev/null
@@ -1,31 +0,0 @@
-permissions = $permissions;
-  }
-  public function getPermissions()
-  {
-    return $this->permissions;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/DeploymentManager/TestPermissionsResponse.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/DeploymentManager/TestPermissionsResponse.php
deleted file mode 100644
index c3a1ab70..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/DeploymentManager/TestPermissionsResponse.php
+++ /dev/null
@@ -1,31 +0,0 @@
-permissions = $permissions;
-  }
-  public function getPermissions()
-  {
-    return $this->permissions;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/DeploymentManager/Type.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/DeploymentManager/Type.php
deleted file mode 100644
index b4239c73..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/DeploymentManager/Type.php
+++ /dev/null
@@ -1,67 +0,0 @@
-id = $id;
-  }
-  public function getId()
-  {
-    return $this->id;
-  }
-  public function setInsertTime($insertTime)
-  {
-    $this->insertTime = $insertTime;
-  }
-  public function getInsertTime()
-  {
-    return $this->insertTime;
-  }
-  public function setName($name)
-  {
-    $this->name = $name;
-  }
-  public function getName()
-  {
-    return $this->name;
-  }
-  public function setOperation(Google_Service_DeploymentManager_Operation $operation)
-  {
-    $this->operation = $operation;
-  }
-  public function getOperation()
-  {
-    return $this->operation;
-  }
-  public function setSelfLink($selfLink)
-  {
-    $this->selfLink = $selfLink;
-  }
-  public function getSelfLink()
-  {
-    return $this->selfLink;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/DeploymentManager/TypesListResponse.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/DeploymentManager/TypesListResponse.php
deleted file mode 100644
index 180b0536..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/DeploymentManager/TypesListResponse.php
+++ /dev/null
@@ -1,41 +0,0 @@
-nextPageToken = $nextPageToken;
-  }
-  public function getNextPageToken()
-  {
-    return $this->nextPageToken;
-  }
-  public function setTypes($types)
-  {
-    $this->types = $types;
-  }
-  public function getTypes()
-  {
-    return $this->types;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting.php
deleted file mode 100644
index 5538348b..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting.php
+++ /dev/null
@@ -1,4816 +0,0 @@
-
- * Manages your DoubleClick Campaign Manager ad campaigns and reports.

- *
- * 

- * For more information about this service, see the API
- * Documentation
- * 

- *
- * @author Google, Inc.
- */
-class Google_Service_Dfareporting extends Google_Service
-{
-  /** Manage DoubleClick Digital Marketing conversions. */
-  const DDMCONVERSIONS =
-      "https://www.googleapis.com/auth/ddmconversions";
-  /** View and manage DoubleClick for Advertisers reports. */
-  const DFAREPORTING =
-      "https://www.googleapis.com/auth/dfareporting";
-  /** View and manage your DoubleClick Campaign Manager's (DCM) display ad campaigns. */
-  const DFATRAFFICKING =
-      "https://www.googleapis.com/auth/dfatrafficking";
-
-  public $accountActiveAdSummaries;
-  public $accountPermissionGroups;
-  public $accountPermissions;
-  public $accountUserProfiles;
-  public $accounts;
-  public $ads;
-  public $advertiserGroups;
-  public $advertisers;
-  public $browsers;
-  public $campaignCreativeAssociations;
-  public $campaigns;
-  public $changeLogs;
-  public $cities;
-  public $connectionTypes;
-  public $contentCategories;
-  public $conversions;
-  public $countries;
-  public $creativeAssets;
-  public $creativeFieldValues;
-  public $creativeFields;
-  public $creativeGroups;
-  public $creatives;
-  public $dimensionValues;
-  public $directorySiteContacts;
-  public $directorySites;
-  public $dynamicTargetingKeys;
-  public $eventTags;
-  public $files;
-  public $floodlightActivities;
-  public $floodlightActivityGroups;
-  public $floodlightConfigurations;
-  public $inventoryItems;
-  public $landingPages;
-  public $languages;
-  public $metros;
-  public $mobileCarriers;
-  public $operatingSystemVersions;
-  public $operatingSystems;
-  public $orderDocuments;
-  public $orders;
-  public $placementGroups;
-  public $placementStrategies;
-  public $placements;
-  public $platformTypes;
-  public $postalCodes;
-  public $projects;
-  public $regions;
-  public $remarketingListShares;
-  public $remarketingLists;
-  public $reports;
-  public $reports_compatibleFields;
-  public $reports_files;
-  public $sites;
-  public $sizes;
-  public $subaccounts;
-  public $targetableRemarketingLists;
-  public $targetingTemplates;
-  public $userProfiles;
-  public $userRolePermissionGroups;
-  public $userRolePermissions;
-  public $userRoles;
-  public $videoFormats;
-  
-  /**
-   * Constructs the internal representation of the Dfareporting service.
-   *
-   * @param Google_Client $client
-   */
-  public function __construct(Google_Client $client)
-  {
-    parent::__construct($client);
-    $this->rootUrl = 'https://www.googleapis.com/';
-    $this->servicePath = 'dfareporting/v2.7/';
-    $this->version = 'v2.7';
-    $this->serviceName = 'dfareporting';
-
-    $this->accountActiveAdSummaries = new Google_Service_Dfareporting_Resource_AccountActiveAdSummaries(
-        $this,
-        $this->serviceName,
-        'accountActiveAdSummaries',
-        array(
-          'methods' => array(
-            'get' => array(
-              'path' => 'userprofiles/{profileId}/accountActiveAdSummaries/{summaryAccountId}',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'profileId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'summaryAccountId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),
-          )
-        )
-    );
-    $this->accountPermissionGroups = new Google_Service_Dfareporting_Resource_AccountPermissionGroups(
-        $this,
-        $this->serviceName,
-        'accountPermissionGroups',
-        array(
-          'methods' => array(
-            'get' => array(
-              'path' => 'userprofiles/{profileId}/accountPermissionGroups/{id}',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'profileId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'id' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'list' => array(
-              'path' => 'userprofiles/{profileId}/accountPermissionGroups',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'profileId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),
-          )
-        )
-    );
-    $this->accountPermissions = new Google_Service_Dfareporting_Resource_AccountPermissions(
-        $this,
-        $this->serviceName,
-        'accountPermissions',
-        array(
-          'methods' => array(
-            'get' => array(
-              'path' => 'userprofiles/{profileId}/accountPermissions/{id}',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'profileId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'id' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'list' => array(
-              'path' => 'userprofiles/{profileId}/accountPermissions',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'profileId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),
-          )
-        )
-    );
-    $this->accountUserProfiles = new Google_Service_Dfareporting_Resource_AccountUserProfiles(
-        $this,
-        $this->serviceName,
-        'accountUserProfiles',
-        array(
-          'methods' => array(
-            'get' => array(
-              'path' => 'userprofiles/{profileId}/accountUserProfiles/{id}',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'profileId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'id' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'insert' => array(
-              'path' => 'userprofiles/{profileId}/accountUserProfiles',
-              'httpMethod' => 'POST',
-              'parameters' => array(
-                'profileId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'list' => array(
-              'path' => 'userprofiles/{profileId}/accountUserProfiles',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'profileId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'active' => array(
-                  'location' => 'query',
-                  'type' => 'boolean',
-                ),
-                'ids' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                  'repeated' => true,
-                ),
-                'maxResults' => array(
-                  'location' => 'query',
-                  'type' => 'integer',
-                ),
-                'pageToken' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'searchString' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'sortField' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'sortOrder' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'subaccountId' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'userRoleId' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-              ),
-            ),'patch' => array(
-              'path' => 'userprofiles/{profileId}/accountUserProfiles',
-              'httpMethod' => 'PATCH',
-              'parameters' => array(
-                'profileId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'id' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'update' => array(
-              'path' => 'userprofiles/{profileId}/accountUserProfiles',
-              'httpMethod' => 'PUT',
-              'parameters' => array(
-                'profileId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),
-          )
-        )
-    );
-    $this->accounts = new Google_Service_Dfareporting_Resource_Accounts(
-        $this,
-        $this->serviceName,
-        'accounts',
-        array(
-          'methods' => array(
-            'get' => array(
-              'path' => 'userprofiles/{profileId}/accounts/{id}',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'profileId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'id' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'list' => array(
-              'path' => 'userprofiles/{profileId}/accounts',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'profileId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'active' => array(
-                  'location' => 'query',
-                  'type' => 'boolean',
-                ),
-                'ids' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                  'repeated' => true,
-                ),
-                'maxResults' => array(
-                  'location' => 'query',
-                  'type' => 'integer',
-                ),
-                'pageToken' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'searchString' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'sortField' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'sortOrder' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-              ),
-            ),'patch' => array(
-              'path' => 'userprofiles/{profileId}/accounts',
-              'httpMethod' => 'PATCH',
-              'parameters' => array(
-                'profileId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'id' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'update' => array(
-              'path' => 'userprofiles/{profileId}/accounts',
-              'httpMethod' => 'PUT',
-              'parameters' => array(
-                'profileId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),
-          )
-        )
-    );
-    $this->ads = new Google_Service_Dfareporting_Resource_Ads(
-        $this,
-        $this->serviceName,
-        'ads',
-        array(
-          'methods' => array(
-            'get' => array(
-              'path' => 'userprofiles/{profileId}/ads/{id}',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'profileId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'id' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'insert' => array(
-              'path' => 'userprofiles/{profileId}/ads',
-              'httpMethod' => 'POST',
-              'parameters' => array(
-                'profileId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'list' => array(
-              'path' => 'userprofiles/{profileId}/ads',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'profileId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'active' => array(
-                  'location' => 'query',
-                  'type' => 'boolean',
-                ),
-                'advertiserId' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'archived' => array(
-                  'location' => 'query',
-                  'type' => 'boolean',
-                ),
-                'audienceSegmentIds' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                  'repeated' => true,
-                ),
-                'campaignIds' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                  'repeated' => true,
-                ),
-                'compatibility' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'creativeIds' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                  'repeated' => true,
-                ),
-                'creativeOptimizationConfigurationIds' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                  'repeated' => true,
-                ),
-                'dynamicClickTracker' => array(
-                  'location' => 'query',
-                  'type' => 'boolean',
-                ),
-                'ids' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                  'repeated' => true,
-                ),
-                'landingPageIds' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                  'repeated' => true,
-                ),
-                'maxResults' => array(
-                  'location' => 'query',
-                  'type' => 'integer',
-                ),
-                'overriddenEventTagId' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'pageToken' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'placementIds' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                  'repeated' => true,
-                ),
-                'remarketingListIds' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                  'repeated' => true,
-                ),
-                'searchString' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'sizeIds' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                  'repeated' => true,
-                ),
-                'sortField' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'sortOrder' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'sslCompliant' => array(
-                  'location' => 'query',
-                  'type' => 'boolean',
-                ),
-                'sslRequired' => array(
-                  'location' => 'query',
-                  'type' => 'boolean',
-                ),
-                'type' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                  'repeated' => true,
-                ),
-              ),
-            ),'patch' => array(
-              'path' => 'userprofiles/{profileId}/ads',
-              'httpMethod' => 'PATCH',
-              'parameters' => array(
-                'profileId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'id' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'update' => array(
-              'path' => 'userprofiles/{profileId}/ads',
-              'httpMethod' => 'PUT',
-              'parameters' => array(
-                'profileId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),
-          )
-        )
-    );
-    $this->advertiserGroups = new Google_Service_Dfareporting_Resource_AdvertiserGroups(
-        $this,
-        $this->serviceName,
-        'advertiserGroups',
-        array(
-          'methods' => array(
-            'delete' => array(
-              'path' => 'userprofiles/{profileId}/advertiserGroups/{id}',
-              'httpMethod' => 'DELETE',
-              'parameters' => array(
-                'profileId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'id' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'get' => array(
-              'path' => 'userprofiles/{profileId}/advertiserGroups/{id}',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'profileId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'id' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'insert' => array(
-              'path' => 'userprofiles/{profileId}/advertiserGroups',
-              'httpMethod' => 'POST',
-              'parameters' => array(
-                'profileId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'list' => array(
-              'path' => 'userprofiles/{profileId}/advertiserGroups',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'profileId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'ids' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                  'repeated' => true,
-                ),
-                'maxResults' => array(
-                  'location' => 'query',
-                  'type' => 'integer',
-                ),
-                'pageToken' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'searchString' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'sortField' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'sortOrder' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-              ),
-            ),'patch' => array(
-              'path' => 'userprofiles/{profileId}/advertiserGroups',
-              'httpMethod' => 'PATCH',
-              'parameters' => array(
-                'profileId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'id' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'update' => array(
-              'path' => 'userprofiles/{profileId}/advertiserGroups',
-              'httpMethod' => 'PUT',
-              'parameters' => array(
-                'profileId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),
-          )
-        )
-    );
-    $this->advertisers = new Google_Service_Dfareporting_Resource_Advertisers(
-        $this,
-        $this->serviceName,
-        'advertisers',
-        array(
-          'methods' => array(
-            'get' => array(
-              'path' => 'userprofiles/{profileId}/advertisers/{id}',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'profileId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'id' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'insert' => array(
-              'path' => 'userprofiles/{profileId}/advertisers',
-              'httpMethod' => 'POST',
-              'parameters' => array(
-                'profileId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'list' => array(
-              'path' => 'userprofiles/{profileId}/advertisers',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'profileId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'advertiserGroupIds' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                  'repeated' => true,
-                ),
-                'floodlightConfigurationIds' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                  'repeated' => true,
-                ),
-                'ids' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                  'repeated' => true,
-                ),
-                'includeAdvertisersWithoutGroupsOnly' => array(
-                  'location' => 'query',
-                  'type' => 'boolean',
-                ),
-                'maxResults' => array(
-                  'location' => 'query',
-                  'type' => 'integer',
-                ),
-                'onlyParent' => array(
-                  'location' => 'query',
-                  'type' => 'boolean',
-                ),
-                'pageToken' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'searchString' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'sortField' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'sortOrder' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'status' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'subaccountId' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-              ),
-            ),'patch' => array(
-              'path' => 'userprofiles/{profileId}/advertisers',
-              'httpMethod' => 'PATCH',
-              'parameters' => array(
-                'profileId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'id' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'update' => array(
-              'path' => 'userprofiles/{profileId}/advertisers',
-              'httpMethod' => 'PUT',
-              'parameters' => array(
-                'profileId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),
-          )
-        )
-    );
-    $this->browsers = new Google_Service_Dfareporting_Resource_Browsers(
-        $this,
-        $this->serviceName,
-        'browsers',
-        array(
-          'methods' => array(
-            'list' => array(
-              'path' => 'userprofiles/{profileId}/browsers',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'profileId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),
-          )
-        )
-    );
-    $this->campaignCreativeAssociations = new Google_Service_Dfareporting_Resource_CampaignCreativeAssociations(
-        $this,
-        $this->serviceName,
-        'campaignCreativeAssociations',
-        array(
-          'methods' => array(
-            'insert' => array(
-              'path' => 'userprofiles/{profileId}/campaigns/{campaignId}/campaignCreativeAssociations',
-              'httpMethod' => 'POST',
-              'parameters' => array(
-                'profileId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'campaignId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'list' => array(
-              'path' => 'userprofiles/{profileId}/campaigns/{campaignId}/campaignCreativeAssociations',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'profileId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'campaignId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'maxResults' => array(
-                  'location' => 'query',
-                  'type' => 'integer',
-                ),
-                'pageToken' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'sortOrder' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-              ),
-            ),
-          )
-        )
-    );
-    $this->campaigns = new Google_Service_Dfareporting_Resource_Campaigns(
-        $this,
-        $this->serviceName,
-        'campaigns',
-        array(
-          'methods' => array(
-            'get' => array(
-              'path' => 'userprofiles/{profileId}/campaigns/{id}',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'profileId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'id' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'insert' => array(
-              'path' => 'userprofiles/{profileId}/campaigns',
-              'httpMethod' => 'POST',
-              'parameters' => array(
-                'profileId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'defaultLandingPageName' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'defaultLandingPageUrl' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'list' => array(
-              'path' => 'userprofiles/{profileId}/campaigns',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'profileId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'advertiserGroupIds' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                  'repeated' => true,
-                ),
-                'advertiserIds' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                  'repeated' => true,
-                ),
-                'archived' => array(
-                  'location' => 'query',
-                  'type' => 'boolean',
-                ),
-                'atLeastOneOptimizationActivity' => array(
-                  'location' => 'query',
-                  'type' => 'boolean',
-                ),
-                'excludedIds' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                  'repeated' => true,
-                ),
-                'ids' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                  'repeated' => true,
-                ),
-                'maxResults' => array(
-                  'location' => 'query',
-                  'type' => 'integer',
-                ),
-                'overriddenEventTagId' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'pageToken' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'searchString' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'sortField' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'sortOrder' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'subaccountId' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-              ),
-            ),'patch' => array(
-              'path' => 'userprofiles/{profileId}/campaigns',
-              'httpMethod' => 'PATCH',
-              'parameters' => array(
-                'profileId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'id' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'update' => array(
-              'path' => 'userprofiles/{profileId}/campaigns',
-              'httpMethod' => 'PUT',
-              'parameters' => array(
-                'profileId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),
-          )
-        )
-    );
-    $this->changeLogs = new Google_Service_Dfareporting_Resource_ChangeLogs(
-        $this,
-        $this->serviceName,
-        'changeLogs',
-        array(
-          'methods' => array(
-            'get' => array(
-              'path' => 'userprofiles/{profileId}/changeLogs/{id}',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'profileId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'id' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'list' => array(
-              'path' => 'userprofiles/{profileId}/changeLogs',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'profileId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'action' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'ids' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                  'repeated' => true,
-                ),
-                'maxChangeTime' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'maxResults' => array(
-                  'location' => 'query',
-                  'type' => 'integer',
-                ),
-                'minChangeTime' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'objectIds' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                  'repeated' => true,
-                ),
-                'objectType' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'pageToken' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'searchString' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'userProfileIds' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                  'repeated' => true,
-                ),
-              ),
-            ),
-          )
-        )
-    );
-    $this->cities = new Google_Service_Dfareporting_Resource_Cities(
-        $this,
-        $this->serviceName,
-        'cities',
-        array(
-          'methods' => array(
-            'list' => array(
-              'path' => 'userprofiles/{profileId}/cities',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'profileId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'countryDartIds' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                  'repeated' => true,
-                ),
-                'dartIds' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                  'repeated' => true,
-                ),
-                'namePrefix' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'regionDartIds' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                  'repeated' => true,
-                ),
-              ),
-            ),
-          )
-        )
-    );
-    $this->connectionTypes = new Google_Service_Dfareporting_Resource_ConnectionTypes(
-        $this,
-        $this->serviceName,
-        'connectionTypes',
-        array(
-          'methods' => array(
-            'get' => array(
-              'path' => 'userprofiles/{profileId}/connectionTypes/{id}',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'profileId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'id' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'list' => array(
-              'path' => 'userprofiles/{profileId}/connectionTypes',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'profileId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),
-          )
-        )
-    );
-    $this->contentCategories = new Google_Service_Dfareporting_Resource_ContentCategories(
-        $this,
-        $this->serviceName,
-        'contentCategories',
-        array(
-          'methods' => array(
-            'delete' => array(
-              'path' => 'userprofiles/{profileId}/contentCategories/{id}',
-              'httpMethod' => 'DELETE',
-              'parameters' => array(
-                'profileId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'id' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'get' => array(
-              'path' => 'userprofiles/{profileId}/contentCategories/{id}',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'profileId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'id' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'insert' => array(
-              'path' => 'userprofiles/{profileId}/contentCategories',
-              'httpMethod' => 'POST',
-              'parameters' => array(
-                'profileId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'list' => array(
-              'path' => 'userprofiles/{profileId}/contentCategories',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'profileId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'ids' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                  'repeated' => true,
-                ),
-                'maxResults' => array(
-                  'location' => 'query',
-                  'type' => 'integer',
-                ),
-                'pageToken' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'searchString' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'sortField' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'sortOrder' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-              ),
-            ),'patch' => array(
-              'path' => 'userprofiles/{profileId}/contentCategories',
-              'httpMethod' => 'PATCH',
-              'parameters' => array(
-                'profileId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'id' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'update' => array(
-              'path' => 'userprofiles/{profileId}/contentCategories',
-              'httpMethod' => 'PUT',
-              'parameters' => array(
-                'profileId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),
-          )
-        )
-    );
-    $this->conversions = new Google_Service_Dfareporting_Resource_Conversions(
-        $this,
-        $this->serviceName,
-        'conversions',
-        array(
-          'methods' => array(
-            'batchinsert' => array(
-              'path' => 'userprofiles/{profileId}/conversions/batchinsert',
-              'httpMethod' => 'POST',
-              'parameters' => array(
-                'profileId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),
-          )
-        )
-    );
-    $this->countries = new Google_Service_Dfareporting_Resource_Countries(
-        $this,
-        $this->serviceName,
-        'countries',
-        array(
-          'methods' => array(
-            'get' => array(
-              'path' => 'userprofiles/{profileId}/countries/{dartId}',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'profileId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'dartId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'list' => array(
-              'path' => 'userprofiles/{profileId}/countries',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'profileId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),
-          )
-        )
-    );
-    $this->creativeAssets = new Google_Service_Dfareporting_Resource_CreativeAssets(
-        $this,
-        $this->serviceName,
-        'creativeAssets',
-        array(
-          'methods' => array(
-            'insert' => array(
-              'path' => 'userprofiles/{profileId}/creativeAssets/{advertiserId}/creativeAssets',
-              'httpMethod' => 'POST',
-              'parameters' => array(
-                'profileId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'advertiserId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),
-          )
-        )
-    );
-    $this->creativeFieldValues = new Google_Service_Dfareporting_Resource_CreativeFieldValues(
-        $this,
-        $this->serviceName,
-        'creativeFieldValues',
-        array(
-          'methods' => array(
-            'delete' => array(
-              'path' => 'userprofiles/{profileId}/creativeFields/{creativeFieldId}/creativeFieldValues/{id}',
-              'httpMethod' => 'DELETE',
-              'parameters' => array(
-                'profileId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'creativeFieldId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'id' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'get' => array(
-              'path' => 'userprofiles/{profileId}/creativeFields/{creativeFieldId}/creativeFieldValues/{id}',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'profileId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'creativeFieldId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'id' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'insert' => array(
-              'path' => 'userprofiles/{profileId}/creativeFields/{creativeFieldId}/creativeFieldValues',
-              'httpMethod' => 'POST',
-              'parameters' => array(
-                'profileId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'creativeFieldId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'list' => array(
-              'path' => 'userprofiles/{profileId}/creativeFields/{creativeFieldId}/creativeFieldValues',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'profileId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'creativeFieldId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'ids' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                  'repeated' => true,
-                ),
-                'maxResults' => array(
-                  'location' => 'query',
-                  'type' => 'integer',
-                ),
-                'pageToken' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'searchString' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'sortField' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'sortOrder' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-              ),
-            ),'patch' => array(
-              'path' => 'userprofiles/{profileId}/creativeFields/{creativeFieldId}/creativeFieldValues',
-              'httpMethod' => 'PATCH',
-              'parameters' => array(
-                'profileId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'creativeFieldId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'id' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'update' => array(
-              'path' => 'userprofiles/{profileId}/creativeFields/{creativeFieldId}/creativeFieldValues',
-              'httpMethod' => 'PUT',
-              'parameters' => array(
-                'profileId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'creativeFieldId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),
-          )
-        )
-    );
-    $this->creativeFields = new Google_Service_Dfareporting_Resource_CreativeFields(
-        $this,
-        $this->serviceName,
-        'creativeFields',
-        array(
-          'methods' => array(
-            'delete' => array(
-              'path' => 'userprofiles/{profileId}/creativeFields/{id}',
-              'httpMethod' => 'DELETE',
-              'parameters' => array(
-                'profileId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'id' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'get' => array(
-              'path' => 'userprofiles/{profileId}/creativeFields/{id}',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'profileId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'id' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'insert' => array(
-              'path' => 'userprofiles/{profileId}/creativeFields',
-              'httpMethod' => 'POST',
-              'parameters' => array(
-                'profileId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'list' => array(
-              'path' => 'userprofiles/{profileId}/creativeFields',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'profileId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'advertiserIds' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                  'repeated' => true,
-                ),
-                'ids' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                  'repeated' => true,
-                ),
-                'maxResults' => array(
-                  'location' => 'query',
-                  'type' => 'integer',
-                ),
-                'pageToken' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'searchString' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'sortField' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'sortOrder' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-              ),
-            ),'patch' => array(
-              'path' => 'userprofiles/{profileId}/creativeFields',
-              'httpMethod' => 'PATCH',
-              'parameters' => array(
-                'profileId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'id' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'update' => array(
-              'path' => 'userprofiles/{profileId}/creativeFields',
-              'httpMethod' => 'PUT',
-              'parameters' => array(
-                'profileId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),
-          )
-        )
-    );
-    $this->creativeGroups = new Google_Service_Dfareporting_Resource_CreativeGroups(
-        $this,
-        $this->serviceName,
-        'creativeGroups',
-        array(
-          'methods' => array(
-            'get' => array(
-              'path' => 'userprofiles/{profileId}/creativeGroups/{id}',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'profileId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'id' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'insert' => array(
-              'path' => 'userprofiles/{profileId}/creativeGroups',
-              'httpMethod' => 'POST',
-              'parameters' => array(
-                'profileId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'list' => array(
-              'path' => 'userprofiles/{profileId}/creativeGroups',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'profileId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'advertiserIds' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                  'repeated' => true,
-                ),
-                'groupNumber' => array(
-                  'location' => 'query',
-                  'type' => 'integer',
-                ),
-                'ids' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                  'repeated' => true,
-                ),
-                'maxResults' => array(
-                  'location' => 'query',
-                  'type' => 'integer',
-                ),
-                'pageToken' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'searchString' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'sortField' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'sortOrder' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-              ),
-            ),'patch' => array(
-              'path' => 'userprofiles/{profileId}/creativeGroups',
-              'httpMethod' => 'PATCH',
-              'parameters' => array(
-                'profileId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'id' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'update' => array(
-              'path' => 'userprofiles/{profileId}/creativeGroups',
-              'httpMethod' => 'PUT',
-              'parameters' => array(
-                'profileId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),
-          )
-        )
-    );
-    $this->creatives = new Google_Service_Dfareporting_Resource_Creatives(
-        $this,
-        $this->serviceName,
-        'creatives',
-        array(
-          'methods' => array(
-            'get' => array(
-              'path' => 'userprofiles/{profileId}/creatives/{id}',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'profileId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'id' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'insert' => array(
-              'path' => 'userprofiles/{profileId}/creatives',
-              'httpMethod' => 'POST',
-              'parameters' => array(
-                'profileId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'list' => array(
-              'path' => 'userprofiles/{profileId}/creatives',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'profileId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'active' => array(
-                  'location' => 'query',
-                  'type' => 'boolean',
-                ),
-                'advertiserId' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'archived' => array(
-                  'location' => 'query',
-                  'type' => 'boolean',
-                ),
-                'campaignId' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'companionCreativeIds' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                  'repeated' => true,
-                ),
-                'creativeFieldIds' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                  'repeated' => true,
-                ),
-                'ids' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                  'repeated' => true,
-                ),
-                'maxResults' => array(
-                  'location' => 'query',
-                  'type' => 'integer',
-                ),
-                'pageToken' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'renderingIds' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                  'repeated' => true,
-                ),
-                'searchString' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'sizeIds' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                  'repeated' => true,
-                ),
-                'sortField' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'sortOrder' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'studioCreativeId' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'types' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                  'repeated' => true,
-                ),
-              ),
-            ),'patch' => array(
-              'path' => 'userprofiles/{profileId}/creatives',
-              'httpMethod' => 'PATCH',
-              'parameters' => array(
-                'profileId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'id' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'update' => array(
-              'path' => 'userprofiles/{profileId}/creatives',
-              'httpMethod' => 'PUT',
-              'parameters' => array(
-                'profileId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),
-          )
-        )
-    );
-    $this->dimensionValues = new Google_Service_Dfareporting_Resource_DimensionValues(
-        $this,
-        $this->serviceName,
-        'dimensionValues',
-        array(
-          'methods' => array(
-            'query' => array(
-              'path' => 'userprofiles/{profileId}/dimensionvalues/query',
-              'httpMethod' => 'POST',
-              'parameters' => array(
-                'profileId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'maxResults' => array(
-                  'location' => 'query',
-                  'type' => 'integer',
-                ),
-                'pageToken' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-              ),
-            ),
-          )
-        )
-    );
-    $this->directorySiteContacts = new Google_Service_Dfareporting_Resource_DirectorySiteContacts(
-        $this,
-        $this->serviceName,
-        'directorySiteContacts',
-        array(
-          'methods' => array(
-            'get' => array(
-              'path' => 'userprofiles/{profileId}/directorySiteContacts/{id}',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'profileId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'id' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'list' => array(
-              'path' => 'userprofiles/{profileId}/directorySiteContacts',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'profileId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'directorySiteIds' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                  'repeated' => true,
-                ),
-                'ids' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                  'repeated' => true,
-                ),
-                'maxResults' => array(
-                  'location' => 'query',
-                  'type' => 'integer',
-                ),
-                'pageToken' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'searchString' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'sortField' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'sortOrder' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-              ),
-            ),
-          )
-        )
-    );
-    $this->directorySites = new Google_Service_Dfareporting_Resource_DirectorySites(
-        $this,
-        $this->serviceName,
-        'directorySites',
-        array(
-          'methods' => array(
-            'get' => array(
-              'path' => 'userprofiles/{profileId}/directorySites/{id}',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'profileId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'id' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'insert' => array(
-              'path' => 'userprofiles/{profileId}/directorySites',
-              'httpMethod' => 'POST',
-              'parameters' => array(
-                'profileId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'list' => array(
-              'path' => 'userprofiles/{profileId}/directorySites',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'profileId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'acceptsInStreamVideoPlacements' => array(
-                  'location' => 'query',
-                  'type' => 'boolean',
-                ),
-                'acceptsInterstitialPlacements' => array(
-                  'location' => 'query',
-                  'type' => 'boolean',
-                ),
-                'acceptsPublisherPaidPlacements' => array(
-                  'location' => 'query',
-                  'type' => 'boolean',
-                ),
-                'active' => array(
-                  'location' => 'query',
-                  'type' => 'boolean',
-                ),
-                'countryId' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'dfp_network_code' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'ids' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                  'repeated' => true,
-                ),
-                'maxResults' => array(
-                  'location' => 'query',
-                  'type' => 'integer',
-                ),
-                'pageToken' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'parentId' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'searchString' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'sortField' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'sortOrder' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-              ),
-            ),
-          )
-        )
-    );
-    $this->dynamicTargetingKeys = new Google_Service_Dfareporting_Resource_DynamicTargetingKeys(
-        $this,
-        $this->serviceName,
-        'dynamicTargetingKeys',
-        array(
-          'methods' => array(
-            'delete' => array(
-              'path' => 'userprofiles/{profileId}/dynamicTargetingKeys/{objectId}',
-              'httpMethod' => 'DELETE',
-              'parameters' => array(
-                'profileId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'objectId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'name' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'objectType' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'insert' => array(
-              'path' => 'userprofiles/{profileId}/dynamicTargetingKeys',
-              'httpMethod' => 'POST',
-              'parameters' => array(
-                'profileId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'list' => array(
-              'path' => 'userprofiles/{profileId}/dynamicTargetingKeys',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'profileId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'advertiserId' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'names' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                  'repeated' => true,
-                ),
-                'objectId' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'objectType' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-              ),
-            ),
-          )
-        )
-    );
-    $this->eventTags = new Google_Service_Dfareporting_Resource_EventTags(
-        $this,
-        $this->serviceName,
-        'eventTags',
-        array(
-          'methods' => array(
-            'delete' => array(
-              'path' => 'userprofiles/{profileId}/eventTags/{id}',
-              'httpMethod' => 'DELETE',
-              'parameters' => array(
-                'profileId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'id' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'get' => array(
-              'path' => 'userprofiles/{profileId}/eventTags/{id}',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'profileId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'id' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'insert' => array(
-              'path' => 'userprofiles/{profileId}/eventTags',
-              'httpMethod' => 'POST',
-              'parameters' => array(
-                'profileId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'list' => array(
-              'path' => 'userprofiles/{profileId}/eventTags',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'profileId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'adId' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'advertiserId' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'campaignId' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'definitionsOnly' => array(
-                  'location' => 'query',
-                  'type' => 'boolean',
-                ),
-                'enabled' => array(
-                  'location' => 'query',
-                  'type' => 'boolean',
-                ),
-                'eventTagTypes' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                  'repeated' => true,
-                ),
-                'ids' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                  'repeated' => true,
-                ),
-                'searchString' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'sortField' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'sortOrder' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-              ),
-            ),'patch' => array(
-              'path' => 'userprofiles/{profileId}/eventTags',
-              'httpMethod' => 'PATCH',
-              'parameters' => array(
-                'profileId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'id' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'update' => array(
-              'path' => 'userprofiles/{profileId}/eventTags',
-              'httpMethod' => 'PUT',
-              'parameters' => array(
-                'profileId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),
-          )
-        )
-    );
-    $this->files = new Google_Service_Dfareporting_Resource_Files(
-        $this,
-        $this->serviceName,
-        'files',
-        array(
-          'methods' => array(
-            'get' => array(
-              'path' => 'reports/{reportId}/files/{fileId}',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'reportId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'fileId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'list' => array(
-              'path' => 'userprofiles/{profileId}/files',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'profileId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'maxResults' => array(
-                  'location' => 'query',
-                  'type' => 'integer',
-                ),
-                'pageToken' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'scope' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'sortField' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'sortOrder' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-              ),
-            ),
-          )
-        )
-    );
-    $this->floodlightActivities = new Google_Service_Dfareporting_Resource_FloodlightActivities(
-        $this,
-        $this->serviceName,
-        'floodlightActivities',
-        array(
-          'methods' => array(
-            'delete' => array(
-              'path' => 'userprofiles/{profileId}/floodlightActivities/{id}',
-              'httpMethod' => 'DELETE',
-              'parameters' => array(
-                'profileId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'id' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'generatetag' => array(
-              'path' => 'userprofiles/{profileId}/floodlightActivities/generatetag',
-              'httpMethod' => 'POST',
-              'parameters' => array(
-                'profileId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'floodlightActivityId' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-              ),
-            ),'get' => array(
-              'path' => 'userprofiles/{profileId}/floodlightActivities/{id}',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'profileId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'id' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'insert' => array(
-              'path' => 'userprofiles/{profileId}/floodlightActivities',
-              'httpMethod' => 'POST',
-              'parameters' => array(
-                'profileId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'list' => array(
-              'path' => 'userprofiles/{profileId}/floodlightActivities',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'profileId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'advertiserId' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'floodlightActivityGroupIds' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                  'repeated' => true,
-                ),
-                'floodlightActivityGroupName' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'floodlightActivityGroupTagString' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'floodlightActivityGroupType' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'floodlightConfigurationId' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'ids' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                  'repeated' => true,
-                ),
-                'maxResults' => array(
-                  'location' => 'query',
-                  'type' => 'integer',
-                ),
-                'pageToken' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'searchString' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'sortField' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'sortOrder' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'tagString' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-              ),
-            ),'patch' => array(
-              'path' => 'userprofiles/{profileId}/floodlightActivities',
-              'httpMethod' => 'PATCH',
-              'parameters' => array(
-                'profileId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'id' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'update' => array(
-              'path' => 'userprofiles/{profileId}/floodlightActivities',
-              'httpMethod' => 'PUT',
-              'parameters' => array(
-                'profileId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),
-          )
-        )
-    );
-    $this->floodlightActivityGroups = new Google_Service_Dfareporting_Resource_FloodlightActivityGroups(
-        $this,
-        $this->serviceName,
-        'floodlightActivityGroups',
-        array(
-          'methods' => array(
-            'get' => array(
-              'path' => 'userprofiles/{profileId}/floodlightActivityGroups/{id}',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'profileId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'id' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'insert' => array(
-              'path' => 'userprofiles/{profileId}/floodlightActivityGroups',
-              'httpMethod' => 'POST',
-              'parameters' => array(
-                'profileId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'list' => array(
-              'path' => 'userprofiles/{profileId}/floodlightActivityGroups',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'profileId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'advertiserId' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'floodlightConfigurationId' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'ids' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                  'repeated' => true,
-                ),
-                'maxResults' => array(
-                  'location' => 'query',
-                  'type' => 'integer',
-                ),
-                'pageToken' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'searchString' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'sortField' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'sortOrder' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'type' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-              ),
-            ),'patch' => array(
-              'path' => 'userprofiles/{profileId}/floodlightActivityGroups',
-              'httpMethod' => 'PATCH',
-              'parameters' => array(
-                'profileId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'id' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'update' => array(
-              'path' => 'userprofiles/{profileId}/floodlightActivityGroups',
-              'httpMethod' => 'PUT',
-              'parameters' => array(
-                'profileId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),
-          )
-        )
-    );
-    $this->floodlightConfigurations = new Google_Service_Dfareporting_Resource_FloodlightConfigurations(
-        $this,
-        $this->serviceName,
-        'floodlightConfigurations',
-        array(
-          'methods' => array(
-            'get' => array(
-              'path' => 'userprofiles/{profileId}/floodlightConfigurations/{id}',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'profileId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'id' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'list' => array(
-              'path' => 'userprofiles/{profileId}/floodlightConfigurations',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'profileId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'ids' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                  'repeated' => true,
-                ),
-              ),
-            ),'patch' => array(
-              'path' => 'userprofiles/{profileId}/floodlightConfigurations',
-              'httpMethod' => 'PATCH',
-              'parameters' => array(
-                'profileId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'id' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'update' => array(
-              'path' => 'userprofiles/{profileId}/floodlightConfigurations',
-              'httpMethod' => 'PUT',
-              'parameters' => array(
-                'profileId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),
-          )
-        )
-    );
-    $this->inventoryItems = new Google_Service_Dfareporting_Resource_InventoryItems(
-        $this,
-        $this->serviceName,
-        'inventoryItems',
-        array(
-          'methods' => array(
-            'get' => array(
-              'path' => 'userprofiles/{profileId}/projects/{projectId}/inventoryItems/{id}',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'profileId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'projectId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'id' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'list' => array(
-              'path' => 'userprofiles/{profileId}/projects/{projectId}/inventoryItems',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'profileId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'projectId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'ids' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                  'repeated' => true,
-                ),
-                'inPlan' => array(
-                  'location' => 'query',
-                  'type' => 'boolean',
-                ),
-                'maxResults' => array(
-                  'location' => 'query',
-                  'type' => 'integer',
-                ),
-                'orderId' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                  'repeated' => true,
-                ),
-                'pageToken' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'siteId' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                  'repeated' => true,
-                ),
-                'sortField' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'sortOrder' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'type' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-              ),
-            ),
-          )
-        )
-    );
-    $this->landingPages = new Google_Service_Dfareporting_Resource_LandingPages(
-        $this,
-        $this->serviceName,
-        'landingPages',
-        array(
-          'methods' => array(
-            'delete' => array(
-              'path' => 'userprofiles/{profileId}/campaigns/{campaignId}/landingPages/{id}',
-              'httpMethod' => 'DELETE',
-              'parameters' => array(
-                'profileId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'campaignId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'id' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'get' => array(
-              'path' => 'userprofiles/{profileId}/campaigns/{campaignId}/landingPages/{id}',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'profileId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'campaignId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'id' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'insert' => array(
-              'path' => 'userprofiles/{profileId}/campaigns/{campaignId}/landingPages',
-              'httpMethod' => 'POST',
-              'parameters' => array(
-                'profileId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'campaignId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'list' => array(
-              'path' => 'userprofiles/{profileId}/campaigns/{campaignId}/landingPages',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'profileId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'campaignId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'patch' => array(
-              'path' => 'userprofiles/{profileId}/campaigns/{campaignId}/landingPages',
-              'httpMethod' => 'PATCH',
-              'parameters' => array(
-                'profileId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'campaignId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'id' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'update' => array(
-              'path' => 'userprofiles/{profileId}/campaigns/{campaignId}/landingPages',
-              'httpMethod' => 'PUT',
-              'parameters' => array(
-                'profileId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'campaignId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),
-          )
-        )
-    );
-    $this->languages = new Google_Service_Dfareporting_Resource_Languages(
-        $this,
-        $this->serviceName,
-        'languages',
-        array(
-          'methods' => array(
-            'list' => array(
-              'path' => 'userprofiles/{profileId}/languages',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'profileId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),
-          )
-        )
-    );
-    $this->metros = new Google_Service_Dfareporting_Resource_Metros(
-        $this,
-        $this->serviceName,
-        'metros',
-        array(
-          'methods' => array(
-            'list' => array(
-              'path' => 'userprofiles/{profileId}/metros',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'profileId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),
-          )
-        )
-    );
-    $this->mobileCarriers = new Google_Service_Dfareporting_Resource_MobileCarriers(
-        $this,
-        $this->serviceName,
-        'mobileCarriers',
-        array(
-          'methods' => array(
-            'get' => array(
-              'path' => 'userprofiles/{profileId}/mobileCarriers/{id}',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'profileId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'id' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'list' => array(
-              'path' => 'userprofiles/{profileId}/mobileCarriers',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'profileId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),
-          )
-        )
-    );
-    $this->operatingSystemVersions = new Google_Service_Dfareporting_Resource_OperatingSystemVersions(
-        $this,
-        $this->serviceName,
-        'operatingSystemVersions',
-        array(
-          'methods' => array(
-            'get' => array(
-              'path' => 'userprofiles/{profileId}/operatingSystemVersions/{id}',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'profileId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'id' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'list' => array(
-              'path' => 'userprofiles/{profileId}/operatingSystemVersions',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'profileId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),
-          )
-        )
-    );
-    $this->operatingSystems = new Google_Service_Dfareporting_Resource_OperatingSystems(
-        $this,
-        $this->serviceName,
-        'operatingSystems',
-        array(
-          'methods' => array(
-            'get' => array(
-              'path' => 'userprofiles/{profileId}/operatingSystems/{dartId}',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'profileId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'dartId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'list' => array(
-              'path' => 'userprofiles/{profileId}/operatingSystems',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'profileId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),
-          )
-        )
-    );
-    $this->orderDocuments = new Google_Service_Dfareporting_Resource_OrderDocuments(
-        $this,
-        $this->serviceName,
-        'orderDocuments',
-        array(
-          'methods' => array(
-            'get' => array(
-              'path' => 'userprofiles/{profileId}/projects/{projectId}/orderDocuments/{id}',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'profileId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'projectId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'id' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'list' => array(
-              'path' => 'userprofiles/{profileId}/projects/{projectId}/orderDocuments',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'profileId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'projectId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'approved' => array(
-                  'location' => 'query',
-                  'type' => 'boolean',
-                ),
-                'ids' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                  'repeated' => true,
-                ),
-                'maxResults' => array(
-                  'location' => 'query',
-                  'type' => 'integer',
-                ),
-                'orderId' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                  'repeated' => true,
-                ),
-                'pageToken' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'searchString' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'siteId' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                  'repeated' => true,
-                ),
-                'sortField' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'sortOrder' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-              ),
-            ),
-          )
-        )
-    );
-    $this->orders = new Google_Service_Dfareporting_Resource_Orders(
-        $this,
-        $this->serviceName,
-        'orders',
-        array(
-          'methods' => array(
-            'get' => array(
-              'path' => 'userprofiles/{profileId}/projects/{projectId}/orders/{id}',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'profileId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'projectId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'id' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'list' => array(
-              'path' => 'userprofiles/{profileId}/projects/{projectId}/orders',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'profileId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'projectId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'ids' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                  'repeated' => true,
-                ),
-                'maxResults' => array(
-                  'location' => 'query',
-                  'type' => 'integer',
-                ),
-                'pageToken' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'searchString' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'siteId' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                  'repeated' => true,
-                ),
-                'sortField' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'sortOrder' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-              ),
-            ),
-          )
-        )
-    );
-    $this->placementGroups = new Google_Service_Dfareporting_Resource_PlacementGroups(
-        $this,
-        $this->serviceName,
-        'placementGroups',
-        array(
-          'methods' => array(
-            'get' => array(
-              'path' => 'userprofiles/{profileId}/placementGroups/{id}',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'profileId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'id' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'insert' => array(
-              'path' => 'userprofiles/{profileId}/placementGroups',
-              'httpMethod' => 'POST',
-              'parameters' => array(
-                'profileId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'list' => array(
-              'path' => 'userprofiles/{profileId}/placementGroups',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'profileId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'advertiserIds' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                  'repeated' => true,
-                ),
-                'archived' => array(
-                  'location' => 'query',
-                  'type' => 'boolean',
-                ),
-                'campaignIds' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                  'repeated' => true,
-                ),
-                'contentCategoryIds' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                  'repeated' => true,
-                ),
-                'directorySiteIds' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                  'repeated' => true,
-                ),
-                'ids' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                  'repeated' => true,
-                ),
-                'maxEndDate' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'maxResults' => array(
-                  'location' => 'query',
-                  'type' => 'integer',
-                ),
-                'maxStartDate' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'minEndDate' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'minStartDate' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'pageToken' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'placementGroupType' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'placementStrategyIds' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                  'repeated' => true,
-                ),
-                'pricingTypes' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                  'repeated' => true,
-                ),
-                'searchString' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'siteIds' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                  'repeated' => true,
-                ),
-                'sortField' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'sortOrder' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-              ),
-            ),'patch' => array(
-              'path' => 'userprofiles/{profileId}/placementGroups',
-              'httpMethod' => 'PATCH',
-              'parameters' => array(
-                'profileId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'id' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'update' => array(
-              'path' => 'userprofiles/{profileId}/placementGroups',
-              'httpMethod' => 'PUT',
-              'parameters' => array(
-                'profileId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),
-          )
-        )
-    );
-    $this->placementStrategies = new Google_Service_Dfareporting_Resource_PlacementStrategies(
-        $this,
-        $this->serviceName,
-        'placementStrategies',
-        array(
-          'methods' => array(
-            'delete' => array(
-              'path' => 'userprofiles/{profileId}/placementStrategies/{id}',
-              'httpMethod' => 'DELETE',
-              'parameters' => array(
-                'profileId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'id' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'get' => array(
-              'path' => 'userprofiles/{profileId}/placementStrategies/{id}',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'profileId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'id' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'insert' => array(
-              'path' => 'userprofiles/{profileId}/placementStrategies',
-              'httpMethod' => 'POST',
-              'parameters' => array(
-                'profileId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'list' => array(
-              'path' => 'userprofiles/{profileId}/placementStrategies',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'profileId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'ids' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                  'repeated' => true,
-                ),
-                'maxResults' => array(
-                  'location' => 'query',
-                  'type' => 'integer',
-                ),
-                'pageToken' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'searchString' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'sortField' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'sortOrder' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-              ),
-            ),'patch' => array(
-              'path' => 'userprofiles/{profileId}/placementStrategies',
-              'httpMethod' => 'PATCH',
-              'parameters' => array(
-                'profileId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'id' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'update' => array(
-              'path' => 'userprofiles/{profileId}/placementStrategies',
-              'httpMethod' => 'PUT',
-              'parameters' => array(
-                'profileId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),
-          )
-        )
-    );
-    $this->placements = new Google_Service_Dfareporting_Resource_Placements(
-        $this,
-        $this->serviceName,
-        'placements',
-        array(
-          'methods' => array(
-            'generatetags' => array(
-              'path' => 'userprofiles/{profileId}/placements/generatetags',
-              'httpMethod' => 'POST',
-              'parameters' => array(
-                'profileId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'campaignId' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'placementIds' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                  'repeated' => true,
-                ),
-                'tagFormats' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                  'repeated' => true,
-                ),
-              ),
-            ),'get' => array(
-              'path' => 'userprofiles/{profileId}/placements/{id}',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'profileId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'id' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'insert' => array(
-              'path' => 'userprofiles/{profileId}/placements',
-              'httpMethod' => 'POST',
-              'parameters' => array(
-                'profileId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'list' => array(
-              'path' => 'userprofiles/{profileId}/placements',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'profileId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'advertiserIds' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                  'repeated' => true,
-                ),
-                'archived' => array(
-                  'location' => 'query',
-                  'type' => 'boolean',
-                ),
-                'campaignIds' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                  'repeated' => true,
-                ),
-                'compatibilities' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                  'repeated' => true,
-                ),
-                'contentCategoryIds' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                  'repeated' => true,
-                ),
-                'directorySiteIds' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                  'repeated' => true,
-                ),
-                'groupIds' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                  'repeated' => true,
-                ),
-                'ids' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                  'repeated' => true,
-                ),
-                'maxEndDate' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'maxResults' => array(
-                  'location' => 'query',
-                  'type' => 'integer',
-                ),
-                'maxStartDate' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'minEndDate' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'minStartDate' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'pageToken' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'paymentSource' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'placementStrategyIds' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                  'repeated' => true,
-                ),
-                'pricingTypes' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                  'repeated' => true,
-                ),
-                'searchString' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'siteIds' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                  'repeated' => true,
-                ),
-                'sizeIds' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                  'repeated' => true,
-                ),
-                'sortField' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'sortOrder' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-              ),
-            ),'patch' => array(
-              'path' => 'userprofiles/{profileId}/placements',
-              'httpMethod' => 'PATCH',
-              'parameters' => array(
-                'profileId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'id' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'update' => array(
-              'path' => 'userprofiles/{profileId}/placements',
-              'httpMethod' => 'PUT',
-              'parameters' => array(
-                'profileId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),
-          )
-        )
-    );
-    $this->platformTypes = new Google_Service_Dfareporting_Resource_PlatformTypes(
-        $this,
-        $this->serviceName,
-        'platformTypes',
-        array(
-          'methods' => array(
-            'get' => array(
-              'path' => 'userprofiles/{profileId}/platformTypes/{id}',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'profileId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'id' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'list' => array(
-              'path' => 'userprofiles/{profileId}/platformTypes',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'profileId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),
-          )
-        )
-    );
-    $this->postalCodes = new Google_Service_Dfareporting_Resource_PostalCodes(
-        $this,
-        $this->serviceName,
-        'postalCodes',
-        array(
-          'methods' => array(
-            'get' => array(
-              'path' => 'userprofiles/{profileId}/postalCodes/{code}',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'profileId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'code' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'list' => array(
-              'path' => 'userprofiles/{profileId}/postalCodes',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'profileId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),
-          )
-        )
-    );
-    $this->projects = new Google_Service_Dfareporting_Resource_Projects(
-        $this,
-        $this->serviceName,
-        'projects',
-        array(
-          'methods' => array(
-            'get' => array(
-              'path' => 'userprofiles/{profileId}/projects/{id}',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'profileId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'id' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'list' => array(
-              'path' => 'userprofiles/{profileId}/projects',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'profileId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'advertiserIds' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                  'repeated' => true,
-                ),
-                'ids' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                  'repeated' => true,
-                ),
-                'maxResults' => array(
-                  'location' => 'query',
-                  'type' => 'integer',
-                ),
-                'pageToken' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'searchString' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'sortField' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'sortOrder' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-              ),
-            ),
-          )
-        )
-    );
-    $this->regions = new Google_Service_Dfareporting_Resource_Regions(
-        $this,
-        $this->serviceName,
-        'regions',
-        array(
-          'methods' => array(
-            'list' => array(
-              'path' => 'userprofiles/{profileId}/regions',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'profileId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),
-          )
-        )
-    );
-    $this->remarketingListShares = new Google_Service_Dfareporting_Resource_RemarketingListShares(
-        $this,
-        $this->serviceName,
-        'remarketingListShares',
-        array(
-          'methods' => array(
-            'get' => array(
-              'path' => 'userprofiles/{profileId}/remarketingListShares/{remarketingListId}',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'profileId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'remarketingListId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'patch' => array(
-              'path' => 'userprofiles/{profileId}/remarketingListShares',
-              'httpMethod' => 'PATCH',
-              'parameters' => array(
-                'profileId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'remarketingListId' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'update' => array(
-              'path' => 'userprofiles/{profileId}/remarketingListShares',
-              'httpMethod' => 'PUT',
-              'parameters' => array(
-                'profileId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),
-          )
-        )
-    );
-    $this->remarketingLists = new Google_Service_Dfareporting_Resource_RemarketingLists(
-        $this,
-        $this->serviceName,
-        'remarketingLists',
-        array(
-          'methods' => array(
-            'get' => array(
-              'path' => 'userprofiles/{profileId}/remarketingLists/{id}',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'profileId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'id' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'insert' => array(
-              'path' => 'userprofiles/{profileId}/remarketingLists',
-              'httpMethod' => 'POST',
-              'parameters' => array(
-                'profileId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'list' => array(
-              'path' => 'userprofiles/{profileId}/remarketingLists',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'profileId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'advertiserId' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'active' => array(
-                  'location' => 'query',
-                  'type' => 'boolean',
-                ),
-                'floodlightActivityId' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'maxResults' => array(
-                  'location' => 'query',
-                  'type' => 'integer',
-                ),
-                'name' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'pageToken' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'sortField' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'sortOrder' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-              ),
-            ),'patch' => array(
-              'path' => 'userprofiles/{profileId}/remarketingLists',
-              'httpMethod' => 'PATCH',
-              'parameters' => array(
-                'profileId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'id' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'update' => array(
-              'path' => 'userprofiles/{profileId}/remarketingLists',
-              'httpMethod' => 'PUT',
-              'parameters' => array(
-                'profileId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),
-          )
-        )
-    );
-    $this->reports = new Google_Service_Dfareporting_Resource_Reports(
-        $this,
-        $this->serviceName,
-        'reports',
-        array(
-          'methods' => array(
-            'delete' => array(
-              'path' => 'userprofiles/{profileId}/reports/{reportId}',
-              'httpMethod' => 'DELETE',
-              'parameters' => array(
-                'profileId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'reportId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'get' => array(
-              'path' => 'userprofiles/{profileId}/reports/{reportId}',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'profileId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'reportId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'insert' => array(
-              'path' => 'userprofiles/{profileId}/reports',
-              'httpMethod' => 'POST',
-              'parameters' => array(
-                'profileId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'list' => array(
-              'path' => 'userprofiles/{profileId}/reports',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'profileId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'maxResults' => array(
-                  'location' => 'query',
-                  'type' => 'integer',
-                ),
-                'pageToken' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'scope' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'sortField' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'sortOrder' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-              ),
-            ),'patch' => array(
-              'path' => 'userprofiles/{profileId}/reports/{reportId}',
-              'httpMethod' => 'PATCH',
-              'parameters' => array(
-                'profileId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'reportId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'run' => array(
-              'path' => 'userprofiles/{profileId}/reports/{reportId}/run',
-              'httpMethod' => 'POST',
-              'parameters' => array(
-                'profileId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'reportId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'synchronous' => array(
-                  'location' => 'query',
-                  'type' => 'boolean',
-                ),
-              ),
-            ),'update' => array(
-              'path' => 'userprofiles/{profileId}/reports/{reportId}',
-              'httpMethod' => 'PUT',
-              'parameters' => array(
-                'profileId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'reportId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),
-          )
-        )
-    );
-    $this->reports_compatibleFields = new Google_Service_Dfareporting_Resource_ReportsCompatibleFields(
-        $this,
-        $this->serviceName,
-        'compatibleFields',
-        array(
-          'methods' => array(
-            'query' => array(
-              'path' => 'userprofiles/{profileId}/reports/compatiblefields/query',
-              'httpMethod' => 'POST',
-              'parameters' => array(
-                'profileId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),
-          )
-        )
-    );
-    $this->reports_files = new Google_Service_Dfareporting_Resource_ReportsFiles(
-        $this,
-        $this->serviceName,
-        'files',
-        array(
-          'methods' => array(
-            'get' => array(
-              'path' => 'userprofiles/{profileId}/reports/{reportId}/files/{fileId}',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'profileId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'reportId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'fileId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'list' => array(
-              'path' => 'userprofiles/{profileId}/reports/{reportId}/files',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'profileId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'reportId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'maxResults' => array(
-                  'location' => 'query',
-                  'type' => 'integer',
-                ),
-                'pageToken' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'sortField' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'sortOrder' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-              ),
-            ),
-          )
-        )
-    );
-    $this->sites = new Google_Service_Dfareporting_Resource_Sites(
-        $this,
-        $this->serviceName,
-        'sites',
-        array(
-          'methods' => array(
-            'get' => array(
-              'path' => 'userprofiles/{profileId}/sites/{id}',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'profileId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'id' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'insert' => array(
-              'path' => 'userprofiles/{profileId}/sites',
-              'httpMethod' => 'POST',
-              'parameters' => array(
-                'profileId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'list' => array(
-              'path' => 'userprofiles/{profileId}/sites',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'profileId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'acceptsInStreamVideoPlacements' => array(
-                  'location' => 'query',
-                  'type' => 'boolean',
-                ),
-                'acceptsInterstitialPlacements' => array(
-                  'location' => 'query',
-                  'type' => 'boolean',
-                ),
-                'acceptsPublisherPaidPlacements' => array(
-                  'location' => 'query',
-                  'type' => 'boolean',
-                ),
-                'adWordsSite' => array(
-                  'location' => 'query',
-                  'type' => 'boolean',
-                ),
-                'approved' => array(
-                  'location' => 'query',
-                  'type' => 'boolean',
-                ),
-                'campaignIds' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                  'repeated' => true,
-                ),
-                'directorySiteIds' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                  'repeated' => true,
-                ),
-                'ids' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                  'repeated' => true,
-                ),
-                'maxResults' => array(
-                  'location' => 'query',
-                  'type' => 'integer',
-                ),
-                'pageToken' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'searchString' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'sortField' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'sortOrder' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'subaccountId' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'unmappedSite' => array(
-                  'location' => 'query',
-                  'type' => 'boolean',
-                ),
-              ),
-            ),'patch' => array(
-              'path' => 'userprofiles/{profileId}/sites',
-              'httpMethod' => 'PATCH',
-              'parameters' => array(
-                'profileId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'id' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'update' => array(
-              'path' => 'userprofiles/{profileId}/sites',
-              'httpMethod' => 'PUT',
-              'parameters' => array(
-                'profileId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),
-          )
-        )
-    );
-    $this->sizes = new Google_Service_Dfareporting_Resource_Sizes(
-        $this,
-        $this->serviceName,
-        'sizes',
-        array(
-          'methods' => array(
-            'get' => array(
-              'path' => 'userprofiles/{profileId}/sizes/{id}',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'profileId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'id' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'insert' => array(
-              'path' => 'userprofiles/{profileId}/sizes',
-              'httpMethod' => 'POST',
-              'parameters' => array(
-                'profileId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'list' => array(
-              'path' => 'userprofiles/{profileId}/sizes',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'profileId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'height' => array(
-                  'location' => 'query',
-                  'type' => 'integer',
-                ),
-                'iabStandard' => array(
-                  'location' => 'query',
-                  'type' => 'boolean',
-                ),
-                'ids' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                  'repeated' => true,
-                ),
-                'width' => array(
-                  'location' => 'query',
-                  'type' => 'integer',
-                ),
-              ),
-            ),
-          )
-        )
-    );
-    $this->subaccounts = new Google_Service_Dfareporting_Resource_Subaccounts(
-        $this,
-        $this->serviceName,
-        'subaccounts',
-        array(
-          'methods' => array(
-            'get' => array(
-              'path' => 'userprofiles/{profileId}/subaccounts/{id}',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'profileId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'id' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'insert' => array(
-              'path' => 'userprofiles/{profileId}/subaccounts',
-              'httpMethod' => 'POST',
-              'parameters' => array(
-                'profileId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'list' => array(
-              'path' => 'userprofiles/{profileId}/subaccounts',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'profileId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'ids' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                  'repeated' => true,
-                ),
-                'maxResults' => array(
-                  'location' => 'query',
-                  'type' => 'integer',
-                ),
-                'pageToken' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'searchString' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'sortField' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'sortOrder' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-              ),
-            ),'patch' => array(
-              'path' => 'userprofiles/{profileId}/subaccounts',
-              'httpMethod' => 'PATCH',
-              'parameters' => array(
-                'profileId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'id' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'update' => array(
-              'path' => 'userprofiles/{profileId}/subaccounts',
-              'httpMethod' => 'PUT',
-              'parameters' => array(
-                'profileId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),
-          )
-        )
-    );
-    $this->targetableRemarketingLists = new Google_Service_Dfareporting_Resource_TargetableRemarketingLists(
-        $this,
-        $this->serviceName,
-        'targetableRemarketingLists',
-        array(
-          'methods' => array(
-            'get' => array(
-              'path' => 'userprofiles/{profileId}/targetableRemarketingLists/{id}',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'profileId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'id' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'list' => array(
-              'path' => 'userprofiles/{profileId}/targetableRemarketingLists',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'profileId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'advertiserId' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'active' => array(
-                  'location' => 'query',
-                  'type' => 'boolean',
-                ),
-                'maxResults' => array(
-                  'location' => 'query',
-                  'type' => 'integer',
-                ),
-                'name' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'pageToken' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'sortField' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'sortOrder' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-              ),
-            ),
-          )
-        )
-    );
-    $this->targetingTemplates = new Google_Service_Dfareporting_Resource_TargetingTemplates(
-        $this,
-        $this->serviceName,
-        'targetingTemplates',
-        array(
-          'methods' => array(
-            'get' => array(
-              'path' => 'userprofiles/{profileId}/targetingTemplates/{id}',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'profileId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'id' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'insert' => array(
-              'path' => 'userprofiles/{profileId}/targetingTemplates',
-              'httpMethod' => 'POST',
-              'parameters' => array(
-                'profileId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'list' => array(
-              'path' => 'userprofiles/{profileId}/targetingTemplates',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'profileId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'advertiserId' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'ids' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                  'repeated' => true,
-                ),
-                'maxResults' => array(
-                  'location' => 'query',
-                  'type' => 'integer',
-                ),
-                'pageToken' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'searchString' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'sortField' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'sortOrder' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-              ),
-            ),'patch' => array(
-              'path' => 'userprofiles/{profileId}/targetingTemplates',
-              'httpMethod' => 'PATCH',
-              'parameters' => array(
-                'profileId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'id' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'update' => array(
-              'path' => 'userprofiles/{profileId}/targetingTemplates',
-              'httpMethod' => 'PUT',
-              'parameters' => array(
-                'profileId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),
-          )
-        )
-    );
-    $this->userProfiles = new Google_Service_Dfareporting_Resource_UserProfiles(
-        $this,
-        $this->serviceName,
-        'userProfiles',
-        array(
-          'methods' => array(
-            'get' => array(
-              'path' => 'userprofiles/{profileId}',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'profileId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'list' => array(
-              'path' => 'userprofiles',
-              'httpMethod' => 'GET',
-              'parameters' => array(),
-            ),
-          )
-        )
-    );
-    $this->userRolePermissionGroups = new Google_Service_Dfareporting_Resource_UserRolePermissionGroups(
-        $this,
-        $this->serviceName,
-        'userRolePermissionGroups',
-        array(
-          'methods' => array(
-            'get' => array(
-              'path' => 'userprofiles/{profileId}/userRolePermissionGroups/{id}',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'profileId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'id' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'list' => array(
-              'path' => 'userprofiles/{profileId}/userRolePermissionGroups',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'profileId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),
-          )
-        )
-    );
-    $this->userRolePermissions = new Google_Service_Dfareporting_Resource_UserRolePermissions(
-        $this,
-        $this->serviceName,
-        'userRolePermissions',
-        array(
-          'methods' => array(
-            'get' => array(
-              'path' => 'userprofiles/{profileId}/userRolePermissions/{id}',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'profileId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'id' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'list' => array(
-              'path' => 'userprofiles/{profileId}/userRolePermissions',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'profileId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'ids' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                  'repeated' => true,
-                ),
-              ),
-            ),
-          )
-        )
-    );
-    $this->userRoles = new Google_Service_Dfareporting_Resource_UserRoles(
-        $this,
-        $this->serviceName,
-        'userRoles',
-        array(
-          'methods' => array(
-            'delete' => array(
-              'path' => 'userprofiles/{profileId}/userRoles/{id}',
-              'httpMethod' => 'DELETE',
-              'parameters' => array(
-                'profileId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'id' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'get' => array(
-              'path' => 'userprofiles/{profileId}/userRoles/{id}',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'profileId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'id' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'insert' => array(
-              'path' => 'userprofiles/{profileId}/userRoles',
-              'httpMethod' => 'POST',
-              'parameters' => array(
-                'profileId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'list' => array(
-              'path' => 'userprofiles/{profileId}/userRoles',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'profileId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'accountUserRoleOnly' => array(
-                  'location' => 'query',
-                  'type' => 'boolean',
-                ),
-                'ids' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                  'repeated' => true,
-                ),
-                'maxResults' => array(
-                  'location' => 'query',
-                  'type' => 'integer',
-                ),
-                'pageToken' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'searchString' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'sortField' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'sortOrder' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'subaccountId' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-              ),
-            ),'patch' => array(
-              'path' => 'userprofiles/{profileId}/userRoles',
-              'httpMethod' => 'PATCH',
-              'parameters' => array(
-                'profileId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'id' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'update' => array(
-              'path' => 'userprofiles/{profileId}/userRoles',
-              'httpMethod' => 'PUT',
-              'parameters' => array(
-                'profileId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),
-          )
-        )
-    );
-    $this->videoFormats = new Google_Service_Dfareporting_Resource_VideoFormats(
-        $this,
-        $this->serviceName,
-        'videoFormats',
-        array(
-          'methods' => array(
-            'get' => array(
-              'path' => 'userprofiles/{profileId}/videoFormats/{id}',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'profileId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'id' => array(
-                  'location' => 'path',
-                  'type' => 'integer',
-                  'required' => true,
-                ),
-              ),
-            ),'list' => array(
-              'path' => 'userprofiles/{profileId}/videoFormats',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'profileId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),
-          )
-        )
-    );
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/Account.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/Account.php
deleted file mode 100644
index 1d44a2e4..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/Account.php
+++ /dev/null
@@ -1,194 +0,0 @@
-accountPermissionIds = $accountPermissionIds;
-  }
-  public function getAccountPermissionIds()
-  {
-    return $this->accountPermissionIds;
-  }
-  public function setAccountProfile($accountProfile)
-  {
-    $this->accountProfile = $accountProfile;
-  }
-  public function getAccountProfile()
-  {
-    return $this->accountProfile;
-  }
-  public function setActive($active)
-  {
-    $this->active = $active;
-  }
-  public function getActive()
-  {
-    return $this->active;
-  }
-  public function setActiveAdsLimitTier($activeAdsLimitTier)
-  {
-    $this->activeAdsLimitTier = $activeAdsLimitTier;
-  }
-  public function getActiveAdsLimitTier()
-  {
-    return $this->activeAdsLimitTier;
-  }
-  public function setActiveViewOptOut($activeViewOptOut)
-  {
-    $this->activeViewOptOut = $activeViewOptOut;
-  }
-  public function getActiveViewOptOut()
-  {
-    return $this->activeViewOptOut;
-  }
-  public function setAvailablePermissionIds($availablePermissionIds)
-  {
-    $this->availablePermissionIds = $availablePermissionIds;
-  }
-  public function getAvailablePermissionIds()
-  {
-    return $this->availablePermissionIds;
-  }
-  public function setCountryId($countryId)
-  {
-    $this->countryId = $countryId;
-  }
-  public function getCountryId()
-  {
-    return $this->countryId;
-  }
-  public function setCurrencyId($currencyId)
-  {
-    $this->currencyId = $currencyId;
-  }
-  public function getCurrencyId()
-  {
-    return $this->currencyId;
-  }
-  public function setDefaultCreativeSizeId($defaultCreativeSizeId)
-  {
-    $this->defaultCreativeSizeId = $defaultCreativeSizeId;
-  }
-  public function getDefaultCreativeSizeId()
-  {
-    return $this->defaultCreativeSizeId;
-  }
-  public function setDescription($description)
-  {
-    $this->description = $description;
-  }
-  public function getDescription()
-  {
-    return $this->description;
-  }
-  public function setId($id)
-  {
-    $this->id = $id;
-  }
-  public function getId()
-  {
-    return $this->id;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setLocale($locale)
-  {
-    $this->locale = $locale;
-  }
-  public function getLocale()
-  {
-    return $this->locale;
-  }
-  public function setMaximumImageSize($maximumImageSize)
-  {
-    $this->maximumImageSize = $maximumImageSize;
-  }
-  public function getMaximumImageSize()
-  {
-    return $this->maximumImageSize;
-  }
-  public function setName($name)
-  {
-    $this->name = $name;
-  }
-  public function getName()
-  {
-    return $this->name;
-  }
-  public function setNielsenOcrEnabled($nielsenOcrEnabled)
-  {
-    $this->nielsenOcrEnabled = $nielsenOcrEnabled;
-  }
-  public function getNielsenOcrEnabled()
-  {
-    return $this->nielsenOcrEnabled;
-  }
-  public function setReportsConfiguration(Google_Service_Dfareporting_ReportsConfiguration $reportsConfiguration)
-  {
-    $this->reportsConfiguration = $reportsConfiguration;
-  }
-  public function getReportsConfiguration()
-  {
-    return $this->reportsConfiguration;
-  }
-  public function setShareReportsWithTwitter($shareReportsWithTwitter)
-  {
-    $this->shareReportsWithTwitter = $shareReportsWithTwitter;
-  }
-  public function getShareReportsWithTwitter()
-  {
-    return $this->shareReportsWithTwitter;
-  }
-  public function setTeaserSizeLimit($teaserSizeLimit)
-  {
-    $this->teaserSizeLimit = $teaserSizeLimit;
-  }
-  public function getTeaserSizeLimit()
-  {
-    return $this->teaserSizeLimit;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/AccountActiveAdSummary.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/AccountActiveAdSummary.php
deleted file mode 100644
index 1fa446ba..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/AccountActiveAdSummary.php
+++ /dev/null
@@ -1,66 +0,0 @@
-accountId = $accountId;
-  }
-  public function getAccountId()
-  {
-    return $this->accountId;
-  }
-  public function setActiveAds($activeAds)
-  {
-    $this->activeAds = $activeAds;
-  }
-  public function getActiveAds()
-  {
-    return $this->activeAds;
-  }
-  public function setActiveAdsLimitTier($activeAdsLimitTier)
-  {
-    $this->activeAdsLimitTier = $activeAdsLimitTier;
-  }
-  public function getActiveAdsLimitTier()
-  {
-    return $this->activeAdsLimitTier;
-  }
-  public function setAvailableAds($availableAds)
-  {
-    $this->availableAds = $availableAds;
-  }
-  public function getAvailableAds()
-  {
-    return $this->availableAds;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/AccountPermission.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/AccountPermission.php
deleted file mode 100644
index a2c2dfe3..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/AccountPermission.php
+++ /dev/null
@@ -1,76 +0,0 @@
-accountProfiles = $accountProfiles;
-  }
-  public function getAccountProfiles()
-  {
-    return $this->accountProfiles;
-  }
-  public function setId($id)
-  {
-    $this->id = $id;
-  }
-  public function getId()
-  {
-    return $this->id;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setLevel($level)
-  {
-    $this->level = $level;
-  }
-  public function getLevel()
-  {
-    return $this->level;
-  }
-  public function setName($name)
-  {
-    $this->name = $name;
-  }
-  public function getName()
-  {
-    return $this->name;
-  }
-  public function setPermissionGroupId($permissionGroupId)
-  {
-    $this->permissionGroupId = $permissionGroupId;
-  }
-  public function getPermissionGroupId()
-  {
-    return $this->permissionGroupId;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/AccountPermissionGroup.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/AccountPermissionGroup.php
deleted file mode 100644
index e8f74cba..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/AccountPermissionGroup.php
+++ /dev/null
@@ -1,48 +0,0 @@
-id = $id;
-  }
-  public function getId()
-  {
-    return $this->id;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setName($name)
-  {
-    $this->name = $name;
-  }
-  public function getName()
-  {
-    return $this->name;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/AccountPermissionGroupsListResponse.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/AccountPermissionGroupsListResponse.php
deleted file mode 100644
index 00f724ff..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/AccountPermissionGroupsListResponse.php
+++ /dev/null
@@ -1,41 +0,0 @@
-accountPermissionGroups = $accountPermissionGroups;
-  }
-  public function getAccountPermissionGroups()
-  {
-    return $this->accountPermissionGroups;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/AccountPermissionsListResponse.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/AccountPermissionsListResponse.php
deleted file mode 100644
index 3828ca6f..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/AccountPermissionsListResponse.php
+++ /dev/null
@@ -1,41 +0,0 @@
-accountPermissions = $accountPermissions;
-  }
-  public function getAccountPermissions()
-  {
-    return $this->accountPermissions;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/AccountUserProfile.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/AccountUserProfile.php
deleted file mode 100644
index 2c40cc88..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/AccountUserProfile.php
+++ /dev/null
@@ -1,169 +0,0 @@
-accountId = $accountId;
-  }
-  public function getAccountId()
-  {
-    return $this->accountId;
-  }
-  public function setActive($active)
-  {
-    $this->active = $active;
-  }
-  public function getActive()
-  {
-    return $this->active;
-  }
-  public function setAdvertiserFilter(Google_Service_Dfareporting_ObjectFilter $advertiserFilter)
-  {
-    $this->advertiserFilter = $advertiserFilter;
-  }
-  public function getAdvertiserFilter()
-  {
-    return $this->advertiserFilter;
-  }
-  public function setCampaignFilter(Google_Service_Dfareporting_ObjectFilter $campaignFilter)
-  {
-    $this->campaignFilter = $campaignFilter;
-  }
-  public function getCampaignFilter()
-  {
-    return $this->campaignFilter;
-  }
-  public function setComments($comments)
-  {
-    $this->comments = $comments;
-  }
-  public function getComments()
-  {
-    return $this->comments;
-  }
-  public function setEmail($email)
-  {
-    $this->email = $email;
-  }
-  public function getEmail()
-  {
-    return $this->email;
-  }
-  public function setId($id)
-  {
-    $this->id = $id;
-  }
-  public function getId()
-  {
-    return $this->id;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setLocale($locale)
-  {
-    $this->locale = $locale;
-  }
-  public function getLocale()
-  {
-    return $this->locale;
-  }
-  public function setName($name)
-  {
-    $this->name = $name;
-  }
-  public function getName()
-  {
-    return $this->name;
-  }
-  public function setSiteFilter(Google_Service_Dfareporting_ObjectFilter $siteFilter)
-  {
-    $this->siteFilter = $siteFilter;
-  }
-  public function getSiteFilter()
-  {
-    return $this->siteFilter;
-  }
-  public function setSubaccountId($subaccountId)
-  {
-    $this->subaccountId = $subaccountId;
-  }
-  public function getSubaccountId()
-  {
-    return $this->subaccountId;
-  }
-  public function setTraffickerType($traffickerType)
-  {
-    $this->traffickerType = $traffickerType;
-  }
-  public function getTraffickerType()
-  {
-    return $this->traffickerType;
-  }
-  public function setUserAccessType($userAccessType)
-  {
-    $this->userAccessType = $userAccessType;
-  }
-  public function getUserAccessType()
-  {
-    return $this->userAccessType;
-  }
-  public function setUserRoleFilter(Google_Service_Dfareporting_ObjectFilter $userRoleFilter)
-  {
-    $this->userRoleFilter = $userRoleFilter;
-  }
-  public function getUserRoleFilter()
-  {
-    return $this->userRoleFilter;
-  }
-  public function setUserRoleId($userRoleId)
-  {
-    $this->userRoleId = $userRoleId;
-  }
-  public function getUserRoleId()
-  {
-    return $this->userRoleId;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/AccountUserProfilesListResponse.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/AccountUserProfilesListResponse.php
deleted file mode 100644
index 5bd57051..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/AccountUserProfilesListResponse.php
+++ /dev/null
@@ -1,50 +0,0 @@
-accountUserProfiles = $accountUserProfiles;
-  }
-  public function getAccountUserProfiles()
-  {
-    return $this->accountUserProfiles;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setNextPageToken($nextPageToken)
-  {
-    $this->nextPageToken = $nextPageToken;
-  }
-  public function getNextPageToken()
-  {
-    return $this->nextPageToken;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/AccountsListResponse.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/AccountsListResponse.php
deleted file mode 100644
index 7d2efbd4..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/AccountsListResponse.php
+++ /dev/null
@@ -1,50 +0,0 @@
-accounts = $accounts;
-  }
-  public function getAccounts()
-  {
-    return $this->accounts;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setNextPageToken($nextPageToken)
-  {
-    $this->nextPageToken = $nextPageToken;
-  }
-  public function getNextPageToken()
-  {
-    return $this->nextPageToken;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/Activities.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/Activities.php
deleted file mode 100644
index 1dd0b515..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/Activities.php
+++ /dev/null
@@ -1,50 +0,0 @@
-filters = $filters;
-  }
-  public function getFilters()
-  {
-    return $this->filters;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setMetricNames($metricNames)
-  {
-    $this->metricNames = $metricNames;
-  }
-  public function getMetricNames()
-  {
-    return $this->metricNames;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/Ad.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/Ad.php
deleted file mode 100644
index b794138f..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/Ad.php
+++ /dev/null
@@ -1,393 +0,0 @@
-accountId = $accountId;
-  }
-  public function getAccountId()
-  {
-    return $this->accountId;
-  }
-  public function setActive($active)
-  {
-    $this->active = $active;
-  }
-  public function getActive()
-  {
-    return $this->active;
-  }
-  public function setAdvertiserId($advertiserId)
-  {
-    $this->advertiserId = $advertiserId;
-  }
-  public function getAdvertiserId()
-  {
-    return $this->advertiserId;
-  }
-  public function setAdvertiserIdDimensionValue(Google_Service_Dfareporting_DimensionValue $advertiserIdDimensionValue)
-  {
-    $this->advertiserIdDimensionValue = $advertiserIdDimensionValue;
-  }
-  public function getAdvertiserIdDimensionValue()
-  {
-    return $this->advertiserIdDimensionValue;
-  }
-  public function setArchived($archived)
-  {
-    $this->archived = $archived;
-  }
-  public function getArchived()
-  {
-    return $this->archived;
-  }
-  public function setAudienceSegmentId($audienceSegmentId)
-  {
-    $this->audienceSegmentId = $audienceSegmentId;
-  }
-  public function getAudienceSegmentId()
-  {
-    return $this->audienceSegmentId;
-  }
-  public function setCampaignId($campaignId)
-  {
-    $this->campaignId = $campaignId;
-  }
-  public function getCampaignId()
-  {
-    return $this->campaignId;
-  }
-  public function setCampaignIdDimensionValue(Google_Service_Dfareporting_DimensionValue $campaignIdDimensionValue)
-  {
-    $this->campaignIdDimensionValue = $campaignIdDimensionValue;
-  }
-  public function getCampaignIdDimensionValue()
-  {
-    return $this->campaignIdDimensionValue;
-  }
-  public function setClickThroughUrl(Google_Service_Dfareporting_ClickThroughUrl $clickThroughUrl)
-  {
-    $this->clickThroughUrl = $clickThroughUrl;
-  }
-  public function getClickThroughUrl()
-  {
-    return $this->clickThroughUrl;
-  }
-  public function setClickThroughUrlSuffixProperties(Google_Service_Dfareporting_ClickThroughUrlSuffixProperties $clickThroughUrlSuffixProperties)
-  {
-    $this->clickThroughUrlSuffixProperties = $clickThroughUrlSuffixProperties;
-  }
-  public function getClickThroughUrlSuffixProperties()
-  {
-    return $this->clickThroughUrlSuffixProperties;
-  }
-  public function setComments($comments)
-  {
-    $this->comments = $comments;
-  }
-  public function getComments()
-  {
-    return $this->comments;
-  }
-  public function setCompatibility($compatibility)
-  {
-    $this->compatibility = $compatibility;
-  }
-  public function getCompatibility()
-  {
-    return $this->compatibility;
-  }
-  public function setCreateInfo(Google_Service_Dfareporting_LastModifiedInfo $createInfo)
-  {
-    $this->createInfo = $createInfo;
-  }
-  public function getCreateInfo()
-  {
-    return $this->createInfo;
-  }
-  public function setCreativeGroupAssignments($creativeGroupAssignments)
-  {
-    $this->creativeGroupAssignments = $creativeGroupAssignments;
-  }
-  public function getCreativeGroupAssignments()
-  {
-    return $this->creativeGroupAssignments;
-  }
-  public function setCreativeRotation(Google_Service_Dfareporting_CreativeRotation $creativeRotation)
-  {
-    $this->creativeRotation = $creativeRotation;
-  }
-  public function getCreativeRotation()
-  {
-    return $this->creativeRotation;
-  }
-  public function setDayPartTargeting(Google_Service_Dfareporting_DayPartTargeting $dayPartTargeting)
-  {
-    $this->dayPartTargeting = $dayPartTargeting;
-  }
-  public function getDayPartTargeting()
-  {
-    return $this->dayPartTargeting;
-  }
-  public function setDefaultClickThroughEventTagProperties(Google_Service_Dfareporting_DefaultClickThroughEventTagProperties $defaultClickThroughEventTagProperties)
-  {
-    $this->defaultClickThroughEventTagProperties = $defaultClickThroughEventTagProperties;
-  }
-  public function getDefaultClickThroughEventTagProperties()
-  {
-    return $this->defaultClickThroughEventTagProperties;
-  }
-  public function setDeliverySchedule(Google_Service_Dfareporting_DeliverySchedule $deliverySchedule)
-  {
-    $this->deliverySchedule = $deliverySchedule;
-  }
-  public function getDeliverySchedule()
-  {
-    return $this->deliverySchedule;
-  }
-  public function setDynamicClickTracker($dynamicClickTracker)
-  {
-    $this->dynamicClickTracker = $dynamicClickTracker;
-  }
-  public function getDynamicClickTracker()
-  {
-    return $this->dynamicClickTracker;
-  }
-  public function setEndTime($endTime)
-  {
-    $this->endTime = $endTime;
-  }
-  public function getEndTime()
-  {
-    return $this->endTime;
-  }
-  public function setEventTagOverrides($eventTagOverrides)
-  {
-    $this->eventTagOverrides = $eventTagOverrides;
-  }
-  public function getEventTagOverrides()
-  {
-    return $this->eventTagOverrides;
-  }
-  public function setGeoTargeting(Google_Service_Dfareporting_GeoTargeting $geoTargeting)
-  {
-    $this->geoTargeting = $geoTargeting;
-  }
-  public function getGeoTargeting()
-  {
-    return $this->geoTargeting;
-  }
-  public function setId($id)
-  {
-    $this->id = $id;
-  }
-  public function getId()
-  {
-    return $this->id;
-  }
-  public function setIdDimensionValue(Google_Service_Dfareporting_DimensionValue $idDimensionValue)
-  {
-    $this->idDimensionValue = $idDimensionValue;
-  }
-  public function getIdDimensionValue()
-  {
-    return $this->idDimensionValue;
-  }
-  public function setKeyValueTargetingExpression(Google_Service_Dfareporting_KeyValueTargetingExpression $keyValueTargetingExpression)
-  {
-    $this->keyValueTargetingExpression = $keyValueTargetingExpression;
-  }
-  public function getKeyValueTargetingExpression()
-  {
-    return $this->keyValueTargetingExpression;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setLanguageTargeting(Google_Service_Dfareporting_LanguageTargeting $languageTargeting)
-  {
-    $this->languageTargeting = $languageTargeting;
-  }
-  public function getLanguageTargeting()
-  {
-    return $this->languageTargeting;
-  }
-  public function setLastModifiedInfo(Google_Service_Dfareporting_LastModifiedInfo $lastModifiedInfo)
-  {
-    $this->lastModifiedInfo = $lastModifiedInfo;
-  }
-  public function getLastModifiedInfo()
-  {
-    return $this->lastModifiedInfo;
-  }
-  public function setName($name)
-  {
-    $this->name = $name;
-  }
-  public function getName()
-  {
-    return $this->name;
-  }
-  public function setPlacementAssignments($placementAssignments)
-  {
-    $this->placementAssignments = $placementAssignments;
-  }
-  public function getPlacementAssignments()
-  {
-    return $this->placementAssignments;
-  }
-  public function setRemarketingListExpression(Google_Service_Dfareporting_ListTargetingExpression $remarketingListExpression)
-  {
-    $this->remarketingListExpression = $remarketingListExpression;
-  }
-  public function getRemarketingListExpression()
-  {
-    return $this->remarketingListExpression;
-  }
-  public function setSize(Google_Service_Dfareporting_Size $size)
-  {
-    $this->size = $size;
-  }
-  public function getSize()
-  {
-    return $this->size;
-  }
-  public function setSslCompliant($sslCompliant)
-  {
-    $this->sslCompliant = $sslCompliant;
-  }
-  public function getSslCompliant()
-  {
-    return $this->sslCompliant;
-  }
-  public function setSslRequired($sslRequired)
-  {
-    $this->sslRequired = $sslRequired;
-  }
-  public function getSslRequired()
-  {
-    return $this->sslRequired;
-  }
-  public function setStartTime($startTime)
-  {
-    $this->startTime = $startTime;
-  }
-  public function getStartTime()
-  {
-    return $this->startTime;
-  }
-  public function setSubaccountId($subaccountId)
-  {
-    $this->subaccountId = $subaccountId;
-  }
-  public function getSubaccountId()
-  {
-    return $this->subaccountId;
-  }
-  public function setTargetingTemplateId($targetingTemplateId)
-  {
-    $this->targetingTemplateId = $targetingTemplateId;
-  }
-  public function getTargetingTemplateId()
-  {
-    return $this->targetingTemplateId;
-  }
-  public function setTechnologyTargeting(Google_Service_Dfareporting_TechnologyTargeting $technologyTargeting)
-  {
-    $this->technologyTargeting = $technologyTargeting;
-  }
-  public function getTechnologyTargeting()
-  {
-    return $this->technologyTargeting;
-  }
-  public function setType($type)
-  {
-    $this->type = $type;
-  }
-  public function getType()
-  {
-    return $this->type;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/AdSlot.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/AdSlot.php
deleted file mode 100644
index f6e2fec7..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/AdSlot.php
+++ /dev/null
@@ -1,93 +0,0 @@
-comment = $comment;
-  }
-  public function getComment()
-  {
-    return $this->comment;
-  }
-  public function setCompatibility($compatibility)
-  {
-    $this->compatibility = $compatibility;
-  }
-  public function getCompatibility()
-  {
-    return $this->compatibility;
-  }
-  public function setHeight($height)
-  {
-    $this->height = $height;
-  }
-  public function getHeight()
-  {
-    return $this->height;
-  }
-  public function setLinkedPlacementId($linkedPlacementId)
-  {
-    $this->linkedPlacementId = $linkedPlacementId;
-  }
-  public function getLinkedPlacementId()
-  {
-    return $this->linkedPlacementId;
-  }
-  public function setName($name)
-  {
-    $this->name = $name;
-  }
-  public function getName()
-  {
-    return $this->name;
-  }
-  public function setPaymentSourceType($paymentSourceType)
-  {
-    $this->paymentSourceType = $paymentSourceType;
-  }
-  public function getPaymentSourceType()
-  {
-    return $this->paymentSourceType;
-  }
-  public function setPrimary($primary)
-  {
-    $this->primary = $primary;
-  }
-  public function getPrimary()
-  {
-    return $this->primary;
-  }
-  public function setWidth($width)
-  {
-    $this->width = $width;
-  }
-  public function getWidth()
-  {
-    return $this->width;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/AdsListResponse.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/AdsListResponse.php
deleted file mode 100644
index 480ccece..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/AdsListResponse.php
+++ /dev/null
@@ -1,50 +0,0 @@
-ads = $ads;
-  }
-  public function getAds()
-  {
-    return $this->ads;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setNextPageToken($nextPageToken)
-  {
-    $this->nextPageToken = $nextPageToken;
-  }
-  public function getNextPageToken()
-  {
-    return $this->nextPageToken;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/Advertiser.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/Advertiser.php
deleted file mode 100644
index f8998ef8..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/Advertiser.php
+++ /dev/null
@@ -1,158 +0,0 @@
-accountId = $accountId;
-  }
-  public function getAccountId()
-  {
-    return $this->accountId;
-  }
-  public function setAdvertiserGroupId($advertiserGroupId)
-  {
-    $this->advertiserGroupId = $advertiserGroupId;
-  }
-  public function getAdvertiserGroupId()
-  {
-    return $this->advertiserGroupId;
-  }
-  public function setClickThroughUrlSuffix($clickThroughUrlSuffix)
-  {
-    $this->clickThroughUrlSuffix = $clickThroughUrlSuffix;
-  }
-  public function getClickThroughUrlSuffix()
-  {
-    return $this->clickThroughUrlSuffix;
-  }
-  public function setDefaultClickThroughEventTagId($defaultClickThroughEventTagId)
-  {
-    $this->defaultClickThroughEventTagId = $defaultClickThroughEventTagId;
-  }
-  public function getDefaultClickThroughEventTagId()
-  {
-    return $this->defaultClickThroughEventTagId;
-  }
-  public function setDefaultEmail($defaultEmail)
-  {
-    $this->defaultEmail = $defaultEmail;
-  }
-  public function getDefaultEmail()
-  {
-    return $this->defaultEmail;
-  }
-  public function setFloodlightConfigurationId($floodlightConfigurationId)
-  {
-    $this->floodlightConfigurationId = $floodlightConfigurationId;
-  }
-  public function getFloodlightConfigurationId()
-  {
-    return $this->floodlightConfigurationId;
-  }
-  public function setFloodlightConfigurationIdDimensionValue(Google_Service_Dfareporting_DimensionValue $floodlightConfigurationIdDimensionValue)
-  {
-    $this->floodlightConfigurationIdDimensionValue = $floodlightConfigurationIdDimensionValue;
-  }
-  public function getFloodlightConfigurationIdDimensionValue()
-  {
-    return $this->floodlightConfigurationIdDimensionValue;
-  }
-  public function setId($id)
-  {
-    $this->id = $id;
-  }
-  public function getId()
-  {
-    return $this->id;
-  }
-  public function setIdDimensionValue(Google_Service_Dfareporting_DimensionValue $idDimensionValue)
-  {
-    $this->idDimensionValue = $idDimensionValue;
-  }
-  public function getIdDimensionValue()
-  {
-    return $this->idDimensionValue;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setName($name)
-  {
-    $this->name = $name;
-  }
-  public function getName()
-  {
-    return $this->name;
-  }
-  public function setOriginalFloodlightConfigurationId($originalFloodlightConfigurationId)
-  {
-    $this->originalFloodlightConfigurationId = $originalFloodlightConfigurationId;
-  }
-  public function getOriginalFloodlightConfigurationId()
-  {
-    return $this->originalFloodlightConfigurationId;
-  }
-  public function setStatus($status)
-  {
-    $this->status = $status;
-  }
-  public function getStatus()
-  {
-    return $this->status;
-  }
-  public function setSubaccountId($subaccountId)
-  {
-    $this->subaccountId = $subaccountId;
-  }
-  public function getSubaccountId()
-  {
-    return $this->subaccountId;
-  }
-  public function setSuspended($suspended)
-  {
-    $this->suspended = $suspended;
-  }
-  public function getSuspended()
-  {
-    return $this->suspended;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/AdvertiserGroup.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/AdvertiserGroup.php
deleted file mode 100644
index f954b61f..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/AdvertiserGroup.php
+++ /dev/null
@@ -1,57 +0,0 @@
-accountId = $accountId;
-  }
-  public function getAccountId()
-  {
-    return $this->accountId;
-  }
-  public function setId($id)
-  {
-    $this->id = $id;
-  }
-  public function getId()
-  {
-    return $this->id;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setName($name)
-  {
-    $this->name = $name;
-  }
-  public function getName()
-  {
-    return $this->name;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/AdvertiserGroupsListResponse.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/AdvertiserGroupsListResponse.php
deleted file mode 100644
index 611a5d06..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/AdvertiserGroupsListResponse.php
+++ /dev/null
@@ -1,50 +0,0 @@
-advertiserGroups = $advertiserGroups;
-  }
-  public function getAdvertiserGroups()
-  {
-    return $this->advertiserGroups;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setNextPageToken($nextPageToken)
-  {
-    $this->nextPageToken = $nextPageToken;
-  }
-  public function getNextPageToken()
-  {
-    return $this->nextPageToken;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/AdvertisersListResponse.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/AdvertisersListResponse.php
deleted file mode 100644
index b639a4c1..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/AdvertisersListResponse.php
+++ /dev/null
@@ -1,50 +0,0 @@
-advertisers = $advertisers;
-  }
-  public function getAdvertisers()
-  {
-    return $this->advertisers;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setNextPageToken($nextPageToken)
-  {
-    $this->nextPageToken = $nextPageToken;
-  }
-  public function getNextPageToken()
-  {
-    return $this->nextPageToken;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/AudienceSegment.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/AudienceSegment.php
deleted file mode 100644
index 9b42a36d..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/AudienceSegment.php
+++ /dev/null
@@ -1,48 +0,0 @@
-allocation = $allocation;
-  }
-  public function getAllocation()
-  {
-    return $this->allocation;
-  }
-  public function setId($id)
-  {
-    $this->id = $id;
-  }
-  public function getId()
-  {
-    return $this->id;
-  }
-  public function setName($name)
-  {
-    $this->name = $name;
-  }
-  public function getName()
-  {
-    return $this->name;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/AudienceSegmentGroup.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/AudienceSegmentGroup.php
deleted file mode 100644
index 411fa1c8..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/AudienceSegmentGroup.php
+++ /dev/null
@@ -1,50 +0,0 @@
-audienceSegments = $audienceSegments;
-  }
-  public function getAudienceSegments()
-  {
-    return $this->audienceSegments;
-  }
-  public function setId($id)
-  {
-    $this->id = $id;
-  }
-  public function getId()
-  {
-    return $this->id;
-  }
-  public function setName($name)
-  {
-    $this->name = $name;
-  }
-  public function getName()
-  {
-    return $this->name;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/Browser.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/Browser.php
deleted file mode 100644
index acdd5a97..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/Browser.php
+++ /dev/null
@@ -1,75 +0,0 @@
-browserVersionId = $browserVersionId;
-  }
-  public function getBrowserVersionId()
-  {
-    return $this->browserVersionId;
-  }
-  public function setDartId($dartId)
-  {
-    $this->dartId = $dartId;
-  }
-  public function getDartId()
-  {
-    return $this->dartId;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setMajorVersion($majorVersion)
-  {
-    $this->majorVersion = $majorVersion;
-  }
-  public function getMajorVersion()
-  {
-    return $this->majorVersion;
-  }
-  public function setMinorVersion($minorVersion)
-  {
-    $this->minorVersion = $minorVersion;
-  }
-  public function getMinorVersion()
-  {
-    return $this->minorVersion;
-  }
-  public function setName($name)
-  {
-    $this->name = $name;
-  }
-  public function getName()
-  {
-    return $this->name;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/BrowsersListResponse.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/BrowsersListResponse.php
deleted file mode 100644
index c3caa3d5..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/BrowsersListResponse.php
+++ /dev/null
@@ -1,41 +0,0 @@
-browsers = $browsers;
-  }
-  public function getBrowsers()
-  {
-    return $this->browsers;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/Campaign.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/Campaign.php
deleted file mode 100644
index 562bb71d..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/Campaign.php
+++ /dev/null
@@ -1,276 +0,0 @@
-accountId = $accountId;
-  }
-  public function getAccountId()
-  {
-    return $this->accountId;
-  }
-  public function setAdditionalCreativeOptimizationConfigurations($additionalCreativeOptimizationConfigurations)
-  {
-    $this->additionalCreativeOptimizationConfigurations = $additionalCreativeOptimizationConfigurations;
-  }
-  public function getAdditionalCreativeOptimizationConfigurations()
-  {
-    return $this->additionalCreativeOptimizationConfigurations;
-  }
-  public function setAdvertiserGroupId($advertiserGroupId)
-  {
-    $this->advertiserGroupId = $advertiserGroupId;
-  }
-  public function getAdvertiserGroupId()
-  {
-    return $this->advertiserGroupId;
-  }
-  public function setAdvertiserId($advertiserId)
-  {
-    $this->advertiserId = $advertiserId;
-  }
-  public function getAdvertiserId()
-  {
-    return $this->advertiserId;
-  }
-  public function setAdvertiserIdDimensionValue(Google_Service_Dfareporting_DimensionValue $advertiserIdDimensionValue)
-  {
-    $this->advertiserIdDimensionValue = $advertiserIdDimensionValue;
-  }
-  public function getAdvertiserIdDimensionValue()
-  {
-    return $this->advertiserIdDimensionValue;
-  }
-  public function setArchived($archived)
-  {
-    $this->archived = $archived;
-  }
-  public function getArchived()
-  {
-    return $this->archived;
-  }
-  public function setAudienceSegmentGroups($audienceSegmentGroups)
-  {
-    $this->audienceSegmentGroups = $audienceSegmentGroups;
-  }
-  public function getAudienceSegmentGroups()
-  {
-    return $this->audienceSegmentGroups;
-  }
-  public function setBillingInvoiceCode($billingInvoiceCode)
-  {
-    $this->billingInvoiceCode = $billingInvoiceCode;
-  }
-  public function getBillingInvoiceCode()
-  {
-    return $this->billingInvoiceCode;
-  }
-  public function setClickThroughUrlSuffixProperties(Google_Service_Dfareporting_ClickThroughUrlSuffixProperties $clickThroughUrlSuffixProperties)
-  {
-    $this->clickThroughUrlSuffixProperties = $clickThroughUrlSuffixProperties;
-  }
-  public function getClickThroughUrlSuffixProperties()
-  {
-    return $this->clickThroughUrlSuffixProperties;
-  }
-  public function setComment($comment)
-  {
-    $this->comment = $comment;
-  }
-  public function getComment()
-  {
-    return $this->comment;
-  }
-  public function setCreateInfo(Google_Service_Dfareporting_LastModifiedInfo $createInfo)
-  {
-    $this->createInfo = $createInfo;
-  }
-  public function getCreateInfo()
-  {
-    return $this->createInfo;
-  }
-  public function setCreativeGroupIds($creativeGroupIds)
-  {
-    $this->creativeGroupIds = $creativeGroupIds;
-  }
-  public function getCreativeGroupIds()
-  {
-    return $this->creativeGroupIds;
-  }
-  public function setCreativeOptimizationConfiguration(Google_Service_Dfareporting_CreativeOptimizationConfiguration $creativeOptimizationConfiguration)
-  {
-    $this->creativeOptimizationConfiguration = $creativeOptimizationConfiguration;
-  }
-  public function getCreativeOptimizationConfiguration()
-  {
-    return $this->creativeOptimizationConfiguration;
-  }
-  public function setDefaultClickThroughEventTagProperties(Google_Service_Dfareporting_DefaultClickThroughEventTagProperties $defaultClickThroughEventTagProperties)
-  {
-    $this->defaultClickThroughEventTagProperties = $defaultClickThroughEventTagProperties;
-  }
-  public function getDefaultClickThroughEventTagProperties()
-  {
-    return $this->defaultClickThroughEventTagProperties;
-  }
-  public function setEndDate($endDate)
-  {
-    $this->endDate = $endDate;
-  }
-  public function getEndDate()
-  {
-    return $this->endDate;
-  }
-  public function setEventTagOverrides($eventTagOverrides)
-  {
-    $this->eventTagOverrides = $eventTagOverrides;
-  }
-  public function getEventTagOverrides()
-  {
-    return $this->eventTagOverrides;
-  }
-  public function setExternalId($externalId)
-  {
-    $this->externalId = $externalId;
-  }
-  public function getExternalId()
-  {
-    return $this->externalId;
-  }
-  public function setId($id)
-  {
-    $this->id = $id;
-  }
-  public function getId()
-  {
-    return $this->id;
-  }
-  public function setIdDimensionValue(Google_Service_Dfareporting_DimensionValue $idDimensionValue)
-  {
-    $this->idDimensionValue = $idDimensionValue;
-  }
-  public function getIdDimensionValue()
-  {
-    return $this->idDimensionValue;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setLastModifiedInfo(Google_Service_Dfareporting_LastModifiedInfo $lastModifiedInfo)
-  {
-    $this->lastModifiedInfo = $lastModifiedInfo;
-  }
-  public function getLastModifiedInfo()
-  {
-    return $this->lastModifiedInfo;
-  }
-  public function setLookbackConfiguration(Google_Service_Dfareporting_LookbackConfiguration $lookbackConfiguration)
-  {
-    $this->lookbackConfiguration = $lookbackConfiguration;
-  }
-  public function getLookbackConfiguration()
-  {
-    return $this->lookbackConfiguration;
-  }
-  public function setName($name)
-  {
-    $this->name = $name;
-  }
-  public function getName()
-  {
-    return $this->name;
-  }
-  public function setNielsenOcrEnabled($nielsenOcrEnabled)
-  {
-    $this->nielsenOcrEnabled = $nielsenOcrEnabled;
-  }
-  public function getNielsenOcrEnabled()
-  {
-    return $this->nielsenOcrEnabled;
-  }
-  public function setStartDate($startDate)
-  {
-    $this->startDate = $startDate;
-  }
-  public function getStartDate()
-  {
-    return $this->startDate;
-  }
-  public function setSubaccountId($subaccountId)
-  {
-    $this->subaccountId = $subaccountId;
-  }
-  public function getSubaccountId()
-  {
-    return $this->subaccountId;
-  }
-  public function setTraffickerEmails($traffickerEmails)
-  {
-    $this->traffickerEmails = $traffickerEmails;
-  }
-  public function getTraffickerEmails()
-  {
-    return $this->traffickerEmails;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/CampaignCreativeAssociation.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/CampaignCreativeAssociation.php
deleted file mode 100644
index 4ff18d41..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/CampaignCreativeAssociation.php
+++ /dev/null
@@ -1,39 +0,0 @@
-creativeId = $creativeId;
-  }
-  public function getCreativeId()
-  {
-    return $this->creativeId;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/CampaignCreativeAssociationsListResponse.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/CampaignCreativeAssociationsListResponse.php
deleted file mode 100644
index a3749f17..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/CampaignCreativeAssociationsListResponse.php
+++ /dev/null
@@ -1,50 +0,0 @@
-campaignCreativeAssociations = $campaignCreativeAssociations;
-  }
-  public function getCampaignCreativeAssociations()
-  {
-    return $this->campaignCreativeAssociations;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setNextPageToken($nextPageToken)
-  {
-    $this->nextPageToken = $nextPageToken;
-  }
-  public function getNextPageToken()
-  {
-    return $this->nextPageToken;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/CampaignsListResponse.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/CampaignsListResponse.php
deleted file mode 100644
index 5bd547f2..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/CampaignsListResponse.php
+++ /dev/null
@@ -1,50 +0,0 @@
-campaigns = $campaigns;
-  }
-  public function getCampaigns()
-  {
-    return $this->campaigns;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setNextPageToken($nextPageToken)
-  {
-    $this->nextPageToken = $nextPageToken;
-  }
-  public function getNextPageToken()
-  {
-    return $this->nextPageToken;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/ChangeLog.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/ChangeLog.php
deleted file mode 100644
index 9cd64f3a..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/ChangeLog.php
+++ /dev/null
@@ -1,147 +0,0 @@
-accountId = $accountId;
-  }
-  public function getAccountId()
-  {
-    return $this->accountId;
-  }
-  public function setAction($action)
-  {
-    $this->action = $action;
-  }
-  public function getAction()
-  {
-    return $this->action;
-  }
-  public function setChangeTime($changeTime)
-  {
-    $this->changeTime = $changeTime;
-  }
-  public function getChangeTime()
-  {
-    return $this->changeTime;
-  }
-  public function setFieldName($fieldName)
-  {
-    $this->fieldName = $fieldName;
-  }
-  public function getFieldName()
-  {
-    return $this->fieldName;
-  }
-  public function setId($id)
-  {
-    $this->id = $id;
-  }
-  public function getId()
-  {
-    return $this->id;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setNewValue($newValue)
-  {
-    $this->newValue = $newValue;
-  }
-  public function getNewValue()
-  {
-    return $this->newValue;
-  }
-  public function setObjectId($objectId)
-  {
-    $this->objectId = $objectId;
-  }
-  public function getObjectId()
-  {
-    return $this->objectId;
-  }
-  public function setObjectType($objectType)
-  {
-    $this->objectType = $objectType;
-  }
-  public function getObjectType()
-  {
-    return $this->objectType;
-  }
-  public function setOldValue($oldValue)
-  {
-    $this->oldValue = $oldValue;
-  }
-  public function getOldValue()
-  {
-    return $this->oldValue;
-  }
-  public function setSubaccountId($subaccountId)
-  {
-    $this->subaccountId = $subaccountId;
-  }
-  public function getSubaccountId()
-  {
-    return $this->subaccountId;
-  }
-  public function setTransactionId($transactionId)
-  {
-    $this->transactionId = $transactionId;
-  }
-  public function getTransactionId()
-  {
-    return $this->transactionId;
-  }
-  public function setUserProfileId($userProfileId)
-  {
-    $this->userProfileId = $userProfileId;
-  }
-  public function getUserProfileId()
-  {
-    return $this->userProfileId;
-  }
-  public function setUserProfileName($userProfileName)
-  {
-    $this->userProfileName = $userProfileName;
-  }
-  public function getUserProfileName()
-  {
-    return $this->userProfileName;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/ChangeLogsListResponse.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/ChangeLogsListResponse.php
deleted file mode 100644
index a90331c5..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/ChangeLogsListResponse.php
+++ /dev/null
@@ -1,50 +0,0 @@
-changeLogs = $changeLogs;
-  }
-  public function getChangeLogs()
-  {
-    return $this->changeLogs;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setNextPageToken($nextPageToken)
-  {
-    $this->nextPageToken = $nextPageToken;
-  }
-  public function getNextPageToken()
-  {
-    return $this->nextPageToken;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/CitiesListResponse.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/CitiesListResponse.php
deleted file mode 100644
index c9ba81e1..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/CitiesListResponse.php
+++ /dev/null
@@ -1,41 +0,0 @@
-cities = $cities;
-  }
-  public function getCities()
-  {
-    return $this->cities;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/City.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/City.php
deleted file mode 100644
index 6204f7b7..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/City.php
+++ /dev/null
@@ -1,102 +0,0 @@
-countryCode = $countryCode;
-  }
-  public function getCountryCode()
-  {
-    return $this->countryCode;
-  }
-  public function setCountryDartId($countryDartId)
-  {
-    $this->countryDartId = $countryDartId;
-  }
-  public function getCountryDartId()
-  {
-    return $this->countryDartId;
-  }
-  public function setDartId($dartId)
-  {
-    $this->dartId = $dartId;
-  }
-  public function getDartId()
-  {
-    return $this->dartId;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setMetroCode($metroCode)
-  {
-    $this->metroCode = $metroCode;
-  }
-  public function getMetroCode()
-  {
-    return $this->metroCode;
-  }
-  public function setMetroDmaId($metroDmaId)
-  {
-    $this->metroDmaId = $metroDmaId;
-  }
-  public function getMetroDmaId()
-  {
-    return $this->metroDmaId;
-  }
-  public function setName($name)
-  {
-    $this->name = $name;
-  }
-  public function getName()
-  {
-    return $this->name;
-  }
-  public function setRegionCode($regionCode)
-  {
-    $this->regionCode = $regionCode;
-  }
-  public function getRegionCode()
-  {
-    return $this->regionCode;
-  }
-  public function setRegionDartId($regionDartId)
-  {
-    $this->regionDartId = $regionDartId;
-  }
-  public function getRegionDartId()
-  {
-    return $this->regionDartId;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/ClickTag.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/ClickTag.php
deleted file mode 100644
index 943101c0..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/ClickTag.php
+++ /dev/null
@@ -1,48 +0,0 @@
-eventName = $eventName;
-  }
-  public function getEventName()
-  {
-    return $this->eventName;
-  }
-  public function setName($name)
-  {
-    $this->name = $name;
-  }
-  public function getName()
-  {
-    return $this->name;
-  }
-  public function setValue($value)
-  {
-    $this->value = $value;
-  }
-  public function getValue()
-  {
-    return $this->value;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/ClickThroughUrl.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/ClickThroughUrl.php
deleted file mode 100644
index 40b85556..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/ClickThroughUrl.php
+++ /dev/null
@@ -1,57 +0,0 @@
-computedClickThroughUrl = $computedClickThroughUrl;
-  }
-  public function getComputedClickThroughUrl()
-  {
-    return $this->computedClickThroughUrl;
-  }
-  public function setCustomClickThroughUrl($customClickThroughUrl)
-  {
-    $this->customClickThroughUrl = $customClickThroughUrl;
-  }
-  public function getCustomClickThroughUrl()
-  {
-    return $this->customClickThroughUrl;
-  }
-  public function setDefaultLandingPage($defaultLandingPage)
-  {
-    $this->defaultLandingPage = $defaultLandingPage;
-  }
-  public function getDefaultLandingPage()
-  {
-    return $this->defaultLandingPage;
-  }
-  public function setLandingPageId($landingPageId)
-  {
-    $this->landingPageId = $landingPageId;
-  }
-  public function getLandingPageId()
-  {
-    return $this->landingPageId;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/ClickThroughUrlSuffixProperties.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/ClickThroughUrlSuffixProperties.php
deleted file mode 100644
index a192e47c..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/ClickThroughUrlSuffixProperties.php
+++ /dev/null
@@ -1,39 +0,0 @@
-clickThroughUrlSuffix = $clickThroughUrlSuffix;
-  }
-  public function getClickThroughUrlSuffix()
-  {
-    return $this->clickThroughUrlSuffix;
-  }
-  public function setOverrideInheritedSuffix($overrideInheritedSuffix)
-  {
-    $this->overrideInheritedSuffix = $overrideInheritedSuffix;
-  }
-  public function getOverrideInheritedSuffix()
-  {
-    return $this->overrideInheritedSuffix;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/CompanionClickThroughOverride.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/CompanionClickThroughOverride.php
deleted file mode 100644
index a6333bd8..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/CompanionClickThroughOverride.php
+++ /dev/null
@@ -1,40 +0,0 @@
-clickThroughUrl = $clickThroughUrl;
-  }
-  public function getClickThroughUrl()
-  {
-    return $this->clickThroughUrl;
-  }
-  public function setCreativeId($creativeId)
-  {
-    $this->creativeId = $creativeId;
-  }
-  public function getCreativeId()
-  {
-    return $this->creativeId;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/CompanionSetting.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/CompanionSetting.php
deleted file mode 100644
index f75ab2e2..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/CompanionSetting.php
+++ /dev/null
@@ -1,59 +0,0 @@
-companionsDisabled = $companionsDisabled;
-  }
-  public function getCompanionsDisabled()
-  {
-    return $this->companionsDisabled;
-  }
-  public function setEnabledSizes($enabledSizes)
-  {
-    $this->enabledSizes = $enabledSizes;
-  }
-  public function getEnabledSizes()
-  {
-    return $this->enabledSizes;
-  }
-  public function setImageOnly($imageOnly)
-  {
-    $this->imageOnly = $imageOnly;
-  }
-  public function getImageOnly()
-  {
-    return $this->imageOnly;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/CompatibleFields.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/CompatibleFields.php
deleted file mode 100644
index 5619b83c..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/CompatibleFields.php
+++ /dev/null
@@ -1,80 +0,0 @@
-crossDimensionReachReportCompatibleFields = $crossDimensionReachReportCompatibleFields;
-  }
-  public function getCrossDimensionReachReportCompatibleFields()
-  {
-    return $this->crossDimensionReachReportCompatibleFields;
-  }
-  public function setFloodlightReportCompatibleFields(Google_Service_Dfareporting_FloodlightReportCompatibleFields $floodlightReportCompatibleFields)
-  {
-    $this->floodlightReportCompatibleFields = $floodlightReportCompatibleFields;
-  }
-  public function getFloodlightReportCompatibleFields()
-  {
-    return $this->floodlightReportCompatibleFields;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setPathToConversionReportCompatibleFields(Google_Service_Dfareporting_PathToConversionReportCompatibleFields $pathToConversionReportCompatibleFields)
-  {
-    $this->pathToConversionReportCompatibleFields = $pathToConversionReportCompatibleFields;
-  }
-  public function getPathToConversionReportCompatibleFields()
-  {
-    return $this->pathToConversionReportCompatibleFields;
-  }
-  public function setReachReportCompatibleFields(Google_Service_Dfareporting_ReachReportCompatibleFields $reachReportCompatibleFields)
-  {
-    $this->reachReportCompatibleFields = $reachReportCompatibleFields;
-  }
-  public function getReachReportCompatibleFields()
-  {
-    return $this->reachReportCompatibleFields;
-  }
-  public function setReportCompatibleFields(Google_Service_Dfareporting_ReportCompatibleFields $reportCompatibleFields)
-  {
-    $this->reportCompatibleFields = $reportCompatibleFields;
-  }
-  public function getReportCompatibleFields()
-  {
-    return $this->reportCompatibleFields;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/ConnectionType.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/ConnectionType.php
deleted file mode 100644
index 5a2899a5..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/ConnectionType.php
+++ /dev/null
@@ -1,48 +0,0 @@
-id = $id;
-  }
-  public function getId()
-  {
-    return $this->id;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setName($name)
-  {
-    $this->name = $name;
-  }
-  public function getName()
-  {
-    return $this->name;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/ConnectionTypesListResponse.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/ConnectionTypesListResponse.php
deleted file mode 100644
index 2ef44105..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/ConnectionTypesListResponse.php
+++ /dev/null
@@ -1,41 +0,0 @@
-connectionTypes = $connectionTypes;
-  }
-  public function getConnectionTypes()
-  {
-    return $this->connectionTypes;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/ContentCategoriesListResponse.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/ContentCategoriesListResponse.php
deleted file mode 100644
index 2618be9d..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/ContentCategoriesListResponse.php
+++ /dev/null
@@ -1,50 +0,0 @@
-contentCategories = $contentCategories;
-  }
-  public function getContentCategories()
-  {
-    return $this->contentCategories;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setNextPageToken($nextPageToken)
-  {
-    $this->nextPageToken = $nextPageToken;
-  }
-  public function getNextPageToken()
-  {
-    return $this->nextPageToken;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/ContentCategory.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/ContentCategory.php
deleted file mode 100644
index d3ebe712..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/ContentCategory.php
+++ /dev/null
@@ -1,57 +0,0 @@
-accountId = $accountId;
-  }
-  public function getAccountId()
-  {
-    return $this->accountId;
-  }
-  public function setId($id)
-  {
-    $this->id = $id;
-  }
-  public function getId()
-  {
-    return $this->id;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setName($name)
-  {
-    $this->name = $name;
-  }
-  public function getName()
-  {
-    return $this->name;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/Conversion.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/Conversion.php
deleted file mode 100644
index c189b613..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/Conversion.php
+++ /dev/null
@@ -1,140 +0,0 @@
-childDirectedTreatment = $childDirectedTreatment;
-  }
-  public function getChildDirectedTreatment()
-  {
-    return $this->childDirectedTreatment;
-  }
-  public function setCustomVariables($customVariables)
-  {
-    $this->customVariables = $customVariables;
-  }
-  public function getCustomVariables()
-  {
-    return $this->customVariables;
-  }
-  public function setEncryptedUserId($encryptedUserId)
-  {
-    $this->encryptedUserId = $encryptedUserId;
-  }
-  public function getEncryptedUserId()
-  {
-    return $this->encryptedUserId;
-  }
-  public function setEncryptedUserIdCandidates($encryptedUserIdCandidates)
-  {
-    $this->encryptedUserIdCandidates = $encryptedUserIdCandidates;
-  }
-  public function getEncryptedUserIdCandidates()
-  {
-    return $this->encryptedUserIdCandidates;
-  }
-  public function setFloodlightActivityId($floodlightActivityId)
-  {
-    $this->floodlightActivityId = $floodlightActivityId;
-  }
-  public function getFloodlightActivityId()
-  {
-    return $this->floodlightActivityId;
-  }
-  public function setFloodlightConfigurationId($floodlightConfigurationId)
-  {
-    $this->floodlightConfigurationId = $floodlightConfigurationId;
-  }
-  public function getFloodlightConfigurationId()
-  {
-    return $this->floodlightConfigurationId;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setLimitAdTracking($limitAdTracking)
-  {
-    $this->limitAdTracking = $limitAdTracking;
-  }
-  public function getLimitAdTracking()
-  {
-    return $this->limitAdTracking;
-  }
-  public function setMobileDeviceId($mobileDeviceId)
-  {
-    $this->mobileDeviceId = $mobileDeviceId;
-  }
-  public function getMobileDeviceId()
-  {
-    return $this->mobileDeviceId;
-  }
-  public function setOrdinal($ordinal)
-  {
-    $this->ordinal = $ordinal;
-  }
-  public function getOrdinal()
-  {
-    return $this->ordinal;
-  }
-  public function setQuantity($quantity)
-  {
-    $this->quantity = $quantity;
-  }
-  public function getQuantity()
-  {
-    return $this->quantity;
-  }
-  public function setTimestampMicros($timestampMicros)
-  {
-    $this->timestampMicros = $timestampMicros;
-  }
-  public function getTimestampMicros()
-  {
-    return $this->timestampMicros;
-  }
-  public function setValue($value)
-  {
-    $this->value = $value;
-  }
-  public function getValue()
-  {
-    return $this->value;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/ConversionError.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/ConversionError.php
deleted file mode 100644
index 8eae13e2..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/ConversionError.php
+++ /dev/null
@@ -1,48 +0,0 @@
-code = $code;
-  }
-  public function getCode()
-  {
-    return $this->code;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setMessage($message)
-  {
-    $this->message = $message;
-  }
-  public function getMessage()
-  {
-    return $this->message;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/ConversionStatus.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/ConversionStatus.php
deleted file mode 100644
index 520a0fd5..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/ConversionStatus.php
+++ /dev/null
@@ -1,51 +0,0 @@
-conversion = $conversion;
-  }
-  public function getConversion()
-  {
-    return $this->conversion;
-  }
-  public function setErrors($errors)
-  {
-    $this->errors = $errors;
-  }
-  public function getErrors()
-  {
-    return $this->errors;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/ConversionsBatchInsertRequest.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/ConversionsBatchInsertRequest.php
deleted file mode 100644
index acf5e24a..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/ConversionsBatchInsertRequest.php
+++ /dev/null
@@ -1,51 +0,0 @@
-conversions = $conversions;
-  }
-  public function getConversions()
-  {
-    return $this->conversions;
-  }
-  public function setEncryptionInfo(Google_Service_Dfareporting_EncryptionInfo $encryptionInfo)
-  {
-    $this->encryptionInfo = $encryptionInfo;
-  }
-  public function getEncryptionInfo()
-  {
-    return $this->encryptionInfo;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/ConversionsBatchInsertResponse.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/ConversionsBatchInsertResponse.php
deleted file mode 100644
index b3591cc6..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/ConversionsBatchInsertResponse.php
+++ /dev/null
@@ -1,50 +0,0 @@
-hasFailures = $hasFailures;
-  }
-  public function getHasFailures()
-  {
-    return $this->hasFailures;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setStatus($status)
-  {
-    $this->status = $status;
-  }
-  public function getStatus()
-  {
-    return $this->status;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/CountriesListResponse.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/CountriesListResponse.php
deleted file mode 100644
index 02349753..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/CountriesListResponse.php
+++ /dev/null
@@ -1,41 +0,0 @@
-countries = $countries;
-  }
-  public function getCountries()
-  {
-    return $this->countries;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/Country.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/Country.php
deleted file mode 100644
index d1496294..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/Country.php
+++ /dev/null
@@ -1,66 +0,0 @@
-countryCode = $countryCode;
-  }
-  public function getCountryCode()
-  {
-    return $this->countryCode;
-  }
-  public function setDartId($dartId)
-  {
-    $this->dartId = $dartId;
-  }
-  public function getDartId()
-  {
-    return $this->dartId;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setName($name)
-  {
-    $this->name = $name;
-  }
-  public function getName()
-  {
-    return $this->name;
-  }
-  public function setSslEnabled($sslEnabled)
-  {
-    $this->sslEnabled = $sslEnabled;
-  }
-  public function getSslEnabled()
-  {
-    return $this->sslEnabled;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/Creative.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/Creative.php
deleted file mode 100644
index 1fcc633a..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/Creative.php
+++ /dev/null
@@ -1,599 +0,0 @@
- "auto_advance_images",
-  );
-  public $accountId;
-  public $active;
-  public $adParameters;
-  public $adTagKeys;
-  public $advertiserId;
-  public $allowScriptAccess;
-  public $archived;
-  public $artworkType;
-  public $authoringSource;
-  public $authoringTool;
-  public $autoAdvanceImages;
-  public $backgroundColor;
-  public $backupImageClickThroughUrl;
-  public $backupImageFeatures;
-  public $backupImageReportingLabel;
-  protected $backupImageTargetWindowType = 'Google_Service_Dfareporting_TargetWindow';
-  protected $backupImageTargetWindowDataType = '';
-  protected $clickTagsType = 'Google_Service_Dfareporting_ClickTag';
-  protected $clickTagsDataType = 'array';
-  public $commercialId;
-  public $companionCreatives;
-  public $compatibility;
-  public $convertFlashToHtml5;
-  protected $counterCustomEventsType = 'Google_Service_Dfareporting_CreativeCustomEvent';
-  protected $counterCustomEventsDataType = 'array';
-  protected $creativeAssetSelectionType = 'Google_Service_Dfareporting_CreativeAssetSelection';
-  protected $creativeAssetSelectionDataType = '';
-  protected $creativeAssetsType = 'Google_Service_Dfareporting_CreativeAsset';
-  protected $creativeAssetsDataType = 'array';
-  protected $creativeFieldAssignmentsType = 'Google_Service_Dfareporting_CreativeFieldAssignment';
-  protected $creativeFieldAssignmentsDataType = 'array';
-  public $customKeyValues;
-  public $dynamicAssetSelection;
-  protected $exitCustomEventsType = 'Google_Service_Dfareporting_CreativeCustomEvent';
-  protected $exitCustomEventsDataType = 'array';
-  protected $fsCommandType = 'Google_Service_Dfareporting_FsCommand';
-  protected $fsCommandDataType = '';
-  public $htmlCode;
-  public $htmlCodeLocked;
-  public $id;
-  protected $idDimensionValueType = 'Google_Service_Dfareporting_DimensionValue';
-  protected $idDimensionValueDataType = '';
-  public $kind;
-  protected $lastModifiedInfoType = 'Google_Service_Dfareporting_LastModifiedInfo';
-  protected $lastModifiedInfoDataType = '';
-  public $latestTraffickedCreativeId;
-  public $name;
-  public $overrideCss;
-  protected $progressOffsetType = 'Google_Service_Dfareporting_VideoOffset';
-  protected $progressOffsetDataType = '';
-  public $redirectUrl;
-  public $renderingId;
-  protected $renderingIdDimensionValueType = 'Google_Service_Dfareporting_DimensionValue';
-  protected $renderingIdDimensionValueDataType = '';
-  public $requiredFlashPluginVersion;
-  public $requiredFlashVersion;
-  protected $sizeType = 'Google_Service_Dfareporting_Size';
-  protected $sizeDataType = '';
-  protected $skipOffsetType = 'Google_Service_Dfareporting_VideoOffset';
-  protected $skipOffsetDataType = '';
-  public $skippable;
-  public $sslCompliant;
-  public $sslOverride;
-  public $studioAdvertiserId;
-  public $studioCreativeId;
-  public $studioTraffickedCreativeId;
-  public $subaccountId;
-  public $thirdPartyBackupImageImpressionsUrl;
-  public $thirdPartyRichMediaImpressionsUrl;
-  protected $thirdPartyUrlsType = 'Google_Service_Dfareporting_ThirdPartyTrackingUrl';
-  protected $thirdPartyUrlsDataType = 'array';
-  protected $timerCustomEventsType = 'Google_Service_Dfareporting_CreativeCustomEvent';
-  protected $timerCustomEventsDataType = 'array';
-  public $totalFileSize;
-  public $type;
-  public $version;
-  public $videoDescription;
-  public $videoDuration;
-
-  public function setAccountId($accountId)
-  {
-    $this->accountId = $accountId;
-  }
-  public function getAccountId()
-  {
-    return $this->accountId;
-  }
-  public function setActive($active)
-  {
-    $this->active = $active;
-  }
-  public function getActive()
-  {
-    return $this->active;
-  }
-  public function setAdParameters($adParameters)
-  {
-    $this->adParameters = $adParameters;
-  }
-  public function getAdParameters()
-  {
-    return $this->adParameters;
-  }
-  public function setAdTagKeys($adTagKeys)
-  {
-    $this->adTagKeys = $adTagKeys;
-  }
-  public function getAdTagKeys()
-  {
-    return $this->adTagKeys;
-  }
-  public function setAdvertiserId($advertiserId)
-  {
-    $this->advertiserId = $advertiserId;
-  }
-  public function getAdvertiserId()
-  {
-    return $this->advertiserId;
-  }
-  public function setAllowScriptAccess($allowScriptAccess)
-  {
-    $this->allowScriptAccess = $allowScriptAccess;
-  }
-  public function getAllowScriptAccess()
-  {
-    return $this->allowScriptAccess;
-  }
-  public function setArchived($archived)
-  {
-    $this->archived = $archived;
-  }
-  public function getArchived()
-  {
-    return $this->archived;
-  }
-  public function setArtworkType($artworkType)
-  {
-    $this->artworkType = $artworkType;
-  }
-  public function getArtworkType()
-  {
-    return $this->artworkType;
-  }
-  public function setAuthoringSource($authoringSource)
-  {
-    $this->authoringSource = $authoringSource;
-  }
-  public function getAuthoringSource()
-  {
-    return $this->authoringSource;
-  }
-  public function setAuthoringTool($authoringTool)
-  {
-    $this->authoringTool = $authoringTool;
-  }
-  public function getAuthoringTool()
-  {
-    return $this->authoringTool;
-  }
-  public function setAutoAdvanceImages($autoAdvanceImages)
-  {
-    $this->autoAdvanceImages = $autoAdvanceImages;
-  }
-  public function getAutoAdvanceImages()
-  {
-    return $this->autoAdvanceImages;
-  }
-  public function setBackgroundColor($backgroundColor)
-  {
-    $this->backgroundColor = $backgroundColor;
-  }
-  public function getBackgroundColor()
-  {
-    return $this->backgroundColor;
-  }
-  public function setBackupImageClickThroughUrl($backupImageClickThroughUrl)
-  {
-    $this->backupImageClickThroughUrl = $backupImageClickThroughUrl;
-  }
-  public function getBackupImageClickThroughUrl()
-  {
-    return $this->backupImageClickThroughUrl;
-  }
-  public function setBackupImageFeatures($backupImageFeatures)
-  {
-    $this->backupImageFeatures = $backupImageFeatures;
-  }
-  public function getBackupImageFeatures()
-  {
-    return $this->backupImageFeatures;
-  }
-  public function setBackupImageReportingLabel($backupImageReportingLabel)
-  {
-    $this->backupImageReportingLabel = $backupImageReportingLabel;
-  }
-  public function getBackupImageReportingLabel()
-  {
-    return $this->backupImageReportingLabel;
-  }
-  public function setBackupImageTargetWindow(Google_Service_Dfareporting_TargetWindow $backupImageTargetWindow)
-  {
-    $this->backupImageTargetWindow = $backupImageTargetWindow;
-  }
-  public function getBackupImageTargetWindow()
-  {
-    return $this->backupImageTargetWindow;
-  }
-  public function setClickTags($clickTags)
-  {
-    $this->clickTags = $clickTags;
-  }
-  public function getClickTags()
-  {
-    return $this->clickTags;
-  }
-  public function setCommercialId($commercialId)
-  {
-    $this->commercialId = $commercialId;
-  }
-  public function getCommercialId()
-  {
-    return $this->commercialId;
-  }
-  public function setCompanionCreatives($companionCreatives)
-  {
-    $this->companionCreatives = $companionCreatives;
-  }
-  public function getCompanionCreatives()
-  {
-    return $this->companionCreatives;
-  }
-  public function setCompatibility($compatibility)
-  {
-    $this->compatibility = $compatibility;
-  }
-  public function getCompatibility()
-  {
-    return $this->compatibility;
-  }
-  public function setConvertFlashToHtml5($convertFlashToHtml5)
-  {
-    $this->convertFlashToHtml5 = $convertFlashToHtml5;
-  }
-  public function getConvertFlashToHtml5()
-  {
-    return $this->convertFlashToHtml5;
-  }
-  public function setCounterCustomEvents($counterCustomEvents)
-  {
-    $this->counterCustomEvents = $counterCustomEvents;
-  }
-  public function getCounterCustomEvents()
-  {
-    return $this->counterCustomEvents;
-  }
-  public function setCreativeAssetSelection(Google_Service_Dfareporting_CreativeAssetSelection $creativeAssetSelection)
-  {
-    $this->creativeAssetSelection = $creativeAssetSelection;
-  }
-  public function getCreativeAssetSelection()
-  {
-    return $this->creativeAssetSelection;
-  }
-  public function setCreativeAssets($creativeAssets)
-  {
-    $this->creativeAssets = $creativeAssets;
-  }
-  public function getCreativeAssets()
-  {
-    return $this->creativeAssets;
-  }
-  public function setCreativeFieldAssignments($creativeFieldAssignments)
-  {
-    $this->creativeFieldAssignments = $creativeFieldAssignments;
-  }
-  public function getCreativeFieldAssignments()
-  {
-    return $this->creativeFieldAssignments;
-  }
-  public function setCustomKeyValues($customKeyValues)
-  {
-    $this->customKeyValues = $customKeyValues;
-  }
-  public function getCustomKeyValues()
-  {
-    return $this->customKeyValues;
-  }
-  public function setDynamicAssetSelection($dynamicAssetSelection)
-  {
-    $this->dynamicAssetSelection = $dynamicAssetSelection;
-  }
-  public function getDynamicAssetSelection()
-  {
-    return $this->dynamicAssetSelection;
-  }
-  public function setExitCustomEvents($exitCustomEvents)
-  {
-    $this->exitCustomEvents = $exitCustomEvents;
-  }
-  public function getExitCustomEvents()
-  {
-    return $this->exitCustomEvents;
-  }
-  public function setFsCommand(Google_Service_Dfareporting_FsCommand $fsCommand)
-  {
-    $this->fsCommand = $fsCommand;
-  }
-  public function getFsCommand()
-  {
-    return $this->fsCommand;
-  }
-  public function setHtmlCode($htmlCode)
-  {
-    $this->htmlCode = $htmlCode;
-  }
-  public function getHtmlCode()
-  {
-    return $this->htmlCode;
-  }
-  public function setHtmlCodeLocked($htmlCodeLocked)
-  {
-    $this->htmlCodeLocked = $htmlCodeLocked;
-  }
-  public function getHtmlCodeLocked()
-  {
-    return $this->htmlCodeLocked;
-  }
-  public function setId($id)
-  {
-    $this->id = $id;
-  }
-  public function getId()
-  {
-    return $this->id;
-  }
-  public function setIdDimensionValue(Google_Service_Dfareporting_DimensionValue $idDimensionValue)
-  {
-    $this->idDimensionValue = $idDimensionValue;
-  }
-  public function getIdDimensionValue()
-  {
-    return $this->idDimensionValue;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setLastModifiedInfo(Google_Service_Dfareporting_LastModifiedInfo $lastModifiedInfo)
-  {
-    $this->lastModifiedInfo = $lastModifiedInfo;
-  }
-  public function getLastModifiedInfo()
-  {
-    return $this->lastModifiedInfo;
-  }
-  public function setLatestTraffickedCreativeId($latestTraffickedCreativeId)
-  {
-    $this->latestTraffickedCreativeId = $latestTraffickedCreativeId;
-  }
-  public function getLatestTraffickedCreativeId()
-  {
-    return $this->latestTraffickedCreativeId;
-  }
-  public function setName($name)
-  {
-    $this->name = $name;
-  }
-  public function getName()
-  {
-    return $this->name;
-  }
-  public function setOverrideCss($overrideCss)
-  {
-    $this->overrideCss = $overrideCss;
-  }
-  public function getOverrideCss()
-  {
-    return $this->overrideCss;
-  }
-  public function setProgressOffset(Google_Service_Dfareporting_VideoOffset $progressOffset)
-  {
-    $this->progressOffset = $progressOffset;
-  }
-  public function getProgressOffset()
-  {
-    return $this->progressOffset;
-  }
-  public function setRedirectUrl($redirectUrl)
-  {
-    $this->redirectUrl = $redirectUrl;
-  }
-  public function getRedirectUrl()
-  {
-    return $this->redirectUrl;
-  }
-  public function setRenderingId($renderingId)
-  {
-    $this->renderingId = $renderingId;
-  }
-  public function getRenderingId()
-  {
-    return $this->renderingId;
-  }
-  public function setRenderingIdDimensionValue(Google_Service_Dfareporting_DimensionValue $renderingIdDimensionValue)
-  {
-    $this->renderingIdDimensionValue = $renderingIdDimensionValue;
-  }
-  public function getRenderingIdDimensionValue()
-  {
-    return $this->renderingIdDimensionValue;
-  }
-  public function setRequiredFlashPluginVersion($requiredFlashPluginVersion)
-  {
-    $this->requiredFlashPluginVersion = $requiredFlashPluginVersion;
-  }
-  public function getRequiredFlashPluginVersion()
-  {
-    return $this->requiredFlashPluginVersion;
-  }
-  public function setRequiredFlashVersion($requiredFlashVersion)
-  {
-    $this->requiredFlashVersion = $requiredFlashVersion;
-  }
-  public function getRequiredFlashVersion()
-  {
-    return $this->requiredFlashVersion;
-  }
-  public function setSize(Google_Service_Dfareporting_Size $size)
-  {
-    $this->size = $size;
-  }
-  public function getSize()
-  {
-    return $this->size;
-  }
-  public function setSkipOffset(Google_Service_Dfareporting_VideoOffset $skipOffset)
-  {
-    $this->skipOffset = $skipOffset;
-  }
-  public function getSkipOffset()
-  {
-    return $this->skipOffset;
-  }
-  public function setSkippable($skippable)
-  {
-    $this->skippable = $skippable;
-  }
-  public function getSkippable()
-  {
-    return $this->skippable;
-  }
-  public function setSslCompliant($sslCompliant)
-  {
-    $this->sslCompliant = $sslCompliant;
-  }
-  public function getSslCompliant()
-  {
-    return $this->sslCompliant;
-  }
-  public function setSslOverride($sslOverride)
-  {
-    $this->sslOverride = $sslOverride;
-  }
-  public function getSslOverride()
-  {
-    return $this->sslOverride;
-  }
-  public function setStudioAdvertiserId($studioAdvertiserId)
-  {
-    $this->studioAdvertiserId = $studioAdvertiserId;
-  }
-  public function getStudioAdvertiserId()
-  {
-    return $this->studioAdvertiserId;
-  }
-  public function setStudioCreativeId($studioCreativeId)
-  {
-    $this->studioCreativeId = $studioCreativeId;
-  }
-  public function getStudioCreativeId()
-  {
-    return $this->studioCreativeId;
-  }
-  public function setStudioTraffickedCreativeId($studioTraffickedCreativeId)
-  {
-    $this->studioTraffickedCreativeId = $studioTraffickedCreativeId;
-  }
-  public function getStudioTraffickedCreativeId()
-  {
-    return $this->studioTraffickedCreativeId;
-  }
-  public function setSubaccountId($subaccountId)
-  {
-    $this->subaccountId = $subaccountId;
-  }
-  public function getSubaccountId()
-  {
-    return $this->subaccountId;
-  }
-  public function setThirdPartyBackupImageImpressionsUrl($thirdPartyBackupImageImpressionsUrl)
-  {
-    $this->thirdPartyBackupImageImpressionsUrl = $thirdPartyBackupImageImpressionsUrl;
-  }
-  public function getThirdPartyBackupImageImpressionsUrl()
-  {
-    return $this->thirdPartyBackupImageImpressionsUrl;
-  }
-  public function setThirdPartyRichMediaImpressionsUrl($thirdPartyRichMediaImpressionsUrl)
-  {
-    $this->thirdPartyRichMediaImpressionsUrl = $thirdPartyRichMediaImpressionsUrl;
-  }
-  public function getThirdPartyRichMediaImpressionsUrl()
-  {
-    return $this->thirdPartyRichMediaImpressionsUrl;
-  }
-  public function setThirdPartyUrls($thirdPartyUrls)
-  {
-    $this->thirdPartyUrls = $thirdPartyUrls;
-  }
-  public function getThirdPartyUrls()
-  {
-    return $this->thirdPartyUrls;
-  }
-  public function setTimerCustomEvents($timerCustomEvents)
-  {
-    $this->timerCustomEvents = $timerCustomEvents;
-  }
-  public function getTimerCustomEvents()
-  {
-    return $this->timerCustomEvents;
-  }
-  public function setTotalFileSize($totalFileSize)
-  {
-    $this->totalFileSize = $totalFileSize;
-  }
-  public function getTotalFileSize()
-  {
-    return $this->totalFileSize;
-  }
-  public function setType($type)
-  {
-    $this->type = $type;
-  }
-  public function getType()
-  {
-    return $this->type;
-  }
-  public function setVersion($version)
-  {
-    $this->version = $version;
-  }
-  public function getVersion()
-  {
-    return $this->version;
-  }
-  public function setVideoDescription($videoDescription)
-  {
-    $this->videoDescription = $videoDescription;
-  }
-  public function getVideoDescription()
-  {
-    return $this->videoDescription;
-  }
-  public function setVideoDuration($videoDuration)
-  {
-    $this->videoDuration = $videoDuration;
-  }
-  public function getVideoDuration()
-  {
-    return $this->videoDuration;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/CreativeAsset.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/CreativeAsset.php
deleted file mode 100644
index e2d06db5..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/CreativeAsset.php
+++ /dev/null
@@ -1,426 +0,0 @@
-actionScript3 = $actionScript3;
-  }
-  public function getActionScript3()
-  {
-    return $this->actionScript3;
-  }
-  public function setActive($active)
-  {
-    $this->active = $active;
-  }
-  public function getActive()
-  {
-    return $this->active;
-  }
-  public function setAlignment($alignment)
-  {
-    $this->alignment = $alignment;
-  }
-  public function getAlignment()
-  {
-    return $this->alignment;
-  }
-  public function setArtworkType($artworkType)
-  {
-    $this->artworkType = $artworkType;
-  }
-  public function getArtworkType()
-  {
-    return $this->artworkType;
-  }
-  public function setAssetIdentifier(Google_Service_Dfareporting_CreativeAssetId $assetIdentifier)
-  {
-    $this->assetIdentifier = $assetIdentifier;
-  }
-  public function getAssetIdentifier()
-  {
-    return $this->assetIdentifier;
-  }
-  public function setBackupImageExit(Google_Service_Dfareporting_CreativeCustomEvent $backupImageExit)
-  {
-    $this->backupImageExit = $backupImageExit;
-  }
-  public function getBackupImageExit()
-  {
-    return $this->backupImageExit;
-  }
-  public function setBitRate($bitRate)
-  {
-    $this->bitRate = $bitRate;
-  }
-  public function getBitRate()
-  {
-    return $this->bitRate;
-  }
-  public function setChildAssetType($childAssetType)
-  {
-    $this->childAssetType = $childAssetType;
-  }
-  public function getChildAssetType()
-  {
-    return $this->childAssetType;
-  }
-  public function setCollapsedSize(Google_Service_Dfareporting_Size $collapsedSize)
-  {
-    $this->collapsedSize = $collapsedSize;
-  }
-  public function getCollapsedSize()
-  {
-    return $this->collapsedSize;
-  }
-  public function setCompanionCreativeIds($companionCreativeIds)
-  {
-    $this->companionCreativeIds = $companionCreativeIds;
-  }
-  public function getCompanionCreativeIds()
-  {
-    return $this->companionCreativeIds;
-  }
-  public function setCustomStartTimeValue($customStartTimeValue)
-  {
-    $this->customStartTimeValue = $customStartTimeValue;
-  }
-  public function getCustomStartTimeValue()
-  {
-    return $this->customStartTimeValue;
-  }
-  public function setDetectedFeatures($detectedFeatures)
-  {
-    $this->detectedFeatures = $detectedFeatures;
-  }
-  public function getDetectedFeatures()
-  {
-    return $this->detectedFeatures;
-  }
-  public function setDisplayType($displayType)
-  {
-    $this->displayType = $displayType;
-  }
-  public function getDisplayType()
-  {
-    return $this->displayType;
-  }
-  public function setDuration($duration)
-  {
-    $this->duration = $duration;
-  }
-  public function getDuration()
-  {
-    return $this->duration;
-  }
-  public function setDurationType($durationType)
-  {
-    $this->durationType = $durationType;
-  }
-  public function getDurationType()
-  {
-    return $this->durationType;
-  }
-  public function setExpandedDimension(Google_Service_Dfareporting_Size $expandedDimension)
-  {
-    $this->expandedDimension = $expandedDimension;
-  }
-  public function getExpandedDimension()
-  {
-    return $this->expandedDimension;
-  }
-  public function setFileSize($fileSize)
-  {
-    $this->fileSize = $fileSize;
-  }
-  public function getFileSize()
-  {
-    return $this->fileSize;
-  }
-  public function setFlashVersion($flashVersion)
-  {
-    $this->flashVersion = $flashVersion;
-  }
-  public function getFlashVersion()
-  {
-    return $this->flashVersion;
-  }
-  public function setHideFlashObjects($hideFlashObjects)
-  {
-    $this->hideFlashObjects = $hideFlashObjects;
-  }
-  public function getHideFlashObjects()
-  {
-    return $this->hideFlashObjects;
-  }
-  public function setHideSelectionBoxes($hideSelectionBoxes)
-  {
-    $this->hideSelectionBoxes = $hideSelectionBoxes;
-  }
-  public function getHideSelectionBoxes()
-  {
-    return $this->hideSelectionBoxes;
-  }
-  public function setHorizontallyLocked($horizontallyLocked)
-  {
-    $this->horizontallyLocked = $horizontallyLocked;
-  }
-  public function getHorizontallyLocked()
-  {
-    return $this->horizontallyLocked;
-  }
-  public function setId($id)
-  {
-    $this->id = $id;
-  }
-  public function getId()
-  {
-    return $this->id;
-  }
-  public function setIdDimensionValue(Google_Service_Dfareporting_DimensionValue $idDimensionValue)
-  {
-    $this->idDimensionValue = $idDimensionValue;
-  }
-  public function getIdDimensionValue()
-  {
-    return $this->idDimensionValue;
-  }
-  public function setMimeType($mimeType)
-  {
-    $this->mimeType = $mimeType;
-  }
-  public function getMimeType()
-  {
-    return $this->mimeType;
-  }
-  public function setOffset(Google_Service_Dfareporting_OffsetPosition $offset)
-  {
-    $this->offset = $offset;
-  }
-  public function getOffset()
-  {
-    return $this->offset;
-  }
-  public function setOriginalBackup($originalBackup)
-  {
-    $this->originalBackup = $originalBackup;
-  }
-  public function getOriginalBackup()
-  {
-    return $this->originalBackup;
-  }
-  public function setPosition(Google_Service_Dfareporting_OffsetPosition $position)
-  {
-    $this->position = $position;
-  }
-  public function getPosition()
-  {
-    return $this->position;
-  }
-  public function setPositionLeftUnit($positionLeftUnit)
-  {
-    $this->positionLeftUnit = $positionLeftUnit;
-  }
-  public function getPositionLeftUnit()
-  {
-    return $this->positionLeftUnit;
-  }
-  public function setPositionTopUnit($positionTopUnit)
-  {
-    $this->positionTopUnit = $positionTopUnit;
-  }
-  public function getPositionTopUnit()
-  {
-    return $this->positionTopUnit;
-  }
-  public function setProgressiveServingUrl($progressiveServingUrl)
-  {
-    $this->progressiveServingUrl = $progressiveServingUrl;
-  }
-  public function getProgressiveServingUrl()
-  {
-    return $this->progressiveServingUrl;
-  }
-  public function setPushdown($pushdown)
-  {
-    $this->pushdown = $pushdown;
-  }
-  public function getPushdown()
-  {
-    return $this->pushdown;
-  }
-  public function setPushdownDuration($pushdownDuration)
-  {
-    $this->pushdownDuration = $pushdownDuration;
-  }
-  public function getPushdownDuration()
-  {
-    return $this->pushdownDuration;
-  }
-  public function setRole($role)
-  {
-    $this->role = $role;
-  }
-  public function getRole()
-  {
-    return $this->role;
-  }
-  public function setSize(Google_Service_Dfareporting_Size $size)
-  {
-    $this->size = $size;
-  }
-  public function getSize()
-  {
-    return $this->size;
-  }
-  public function setSslCompliant($sslCompliant)
-  {
-    $this->sslCompliant = $sslCompliant;
-  }
-  public function getSslCompliant()
-  {
-    return $this->sslCompliant;
-  }
-  public function setStartTimeType($startTimeType)
-  {
-    $this->startTimeType = $startTimeType;
-  }
-  public function getStartTimeType()
-  {
-    return $this->startTimeType;
-  }
-  public function setStreamingServingUrl($streamingServingUrl)
-  {
-    $this->streamingServingUrl = $streamingServingUrl;
-  }
-  public function getStreamingServingUrl()
-  {
-    return $this->streamingServingUrl;
-  }
-  public function setTransparency($transparency)
-  {
-    $this->transparency = $transparency;
-  }
-  public function getTransparency()
-  {
-    return $this->transparency;
-  }
-  public function setVerticallyLocked($verticallyLocked)
-  {
-    $this->verticallyLocked = $verticallyLocked;
-  }
-  public function getVerticallyLocked()
-  {
-    return $this->verticallyLocked;
-  }
-  public function setVideoDuration($videoDuration)
-  {
-    $this->videoDuration = $videoDuration;
-  }
-  public function getVideoDuration()
-  {
-    return $this->videoDuration;
-  }
-  public function setWindowMode($windowMode)
-  {
-    $this->windowMode = $windowMode;
-  }
-  public function getWindowMode()
-  {
-    return $this->windowMode;
-  }
-  public function setZIndex($zIndex)
-  {
-    $this->zIndex = $zIndex;
-  }
-  public function getZIndex()
-  {
-    return $this->zIndex;
-  }
-  public function setZipFilename($zipFilename)
-  {
-    $this->zipFilename = $zipFilename;
-  }
-  public function getZipFilename()
-  {
-    return $this->zipFilename;
-  }
-  public function setZipFilesize($zipFilesize)
-  {
-    $this->zipFilesize = $zipFilesize;
-  }
-  public function getZipFilesize()
-  {
-    return $this->zipFilesize;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/CreativeAssetId.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/CreativeAssetId.php
deleted file mode 100644
index 593fb02b..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/CreativeAssetId.php
+++ /dev/null
@@ -1,39 +0,0 @@
-name = $name;
-  }
-  public function getName()
-  {
-    return $this->name;
-  }
-  public function setType($type)
-  {
-    $this->type = $type;
-  }
-  public function getType()
-  {
-    return $this->type;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/CreativeAssetMetadata.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/CreativeAssetMetadata.php
deleted file mode 100644
index 9ce9e146..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/CreativeAssetMetadata.php
+++ /dev/null
@@ -1,88 +0,0 @@
-assetIdentifier = $assetIdentifier;
-  }
-  public function getAssetIdentifier()
-  {
-    return $this->assetIdentifier;
-  }
-  public function setClickTags($clickTags)
-  {
-    $this->clickTags = $clickTags;
-  }
-  public function getClickTags()
-  {
-    return $this->clickTags;
-  }
-  public function setDetectedFeatures($detectedFeatures)
-  {
-    $this->detectedFeatures = $detectedFeatures;
-  }
-  public function getDetectedFeatures()
-  {
-    return $this->detectedFeatures;
-  }
-  public function setId($id)
-  {
-    $this->id = $id;
-  }
-  public function getId()
-  {
-    return $this->id;
-  }
-  public function setIdDimensionValue(Google_Service_Dfareporting_DimensionValue $idDimensionValue)
-  {
-    $this->idDimensionValue = $idDimensionValue;
-  }
-  public function getIdDimensionValue()
-  {
-    return $this->idDimensionValue;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setWarnedValidationRules($warnedValidationRules)
-  {
-    $this->warnedValidationRules = $warnedValidationRules;
-  }
-  public function getWarnedValidationRules()
-  {
-    return $this->warnedValidationRules;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/CreativeAssetSelection.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/CreativeAssetSelection.php
deleted file mode 100644
index 14581ad1..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/CreativeAssetSelection.php
+++ /dev/null
@@ -1,41 +0,0 @@
-defaultAssetId = $defaultAssetId;
-  }
-  public function getDefaultAssetId()
-  {
-    return $this->defaultAssetId;
-  }
-  public function setRules($rules)
-  {
-    $this->rules = $rules;
-  }
-  public function getRules()
-  {
-    return $this->rules;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/CreativeAssignment.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/CreativeAssignment.php
deleted file mode 100644
index bf9c21bf..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/CreativeAssignment.php
+++ /dev/null
@@ -1,144 +0,0 @@
-active = $active;
-  }
-  public function getActive()
-  {
-    return $this->active;
-  }
-  public function setApplyEventTags($applyEventTags)
-  {
-    $this->applyEventTags = $applyEventTags;
-  }
-  public function getApplyEventTags()
-  {
-    return $this->applyEventTags;
-  }
-  public function setClickThroughUrl(Google_Service_Dfareporting_ClickThroughUrl $clickThroughUrl)
-  {
-    $this->clickThroughUrl = $clickThroughUrl;
-  }
-  public function getClickThroughUrl()
-  {
-    return $this->clickThroughUrl;
-  }
-  public function setCompanionCreativeOverrides($companionCreativeOverrides)
-  {
-    $this->companionCreativeOverrides = $companionCreativeOverrides;
-  }
-  public function getCompanionCreativeOverrides()
-  {
-    return $this->companionCreativeOverrides;
-  }
-  public function setCreativeGroupAssignments($creativeGroupAssignments)
-  {
-    $this->creativeGroupAssignments = $creativeGroupAssignments;
-  }
-  public function getCreativeGroupAssignments()
-  {
-    return $this->creativeGroupAssignments;
-  }
-  public function setCreativeId($creativeId)
-  {
-    $this->creativeId = $creativeId;
-  }
-  public function getCreativeId()
-  {
-    return $this->creativeId;
-  }
-  public function setCreativeIdDimensionValue(Google_Service_Dfareporting_DimensionValue $creativeIdDimensionValue)
-  {
-    $this->creativeIdDimensionValue = $creativeIdDimensionValue;
-  }
-  public function getCreativeIdDimensionValue()
-  {
-    return $this->creativeIdDimensionValue;
-  }
-  public function setEndTime($endTime)
-  {
-    $this->endTime = $endTime;
-  }
-  public function getEndTime()
-  {
-    return $this->endTime;
-  }
-  public function setRichMediaExitOverrides($richMediaExitOverrides)
-  {
-    $this->richMediaExitOverrides = $richMediaExitOverrides;
-  }
-  public function getRichMediaExitOverrides()
-  {
-    return $this->richMediaExitOverrides;
-  }
-  public function setSequence($sequence)
-  {
-    $this->sequence = $sequence;
-  }
-  public function getSequence()
-  {
-    return $this->sequence;
-  }
-  public function setSslCompliant($sslCompliant)
-  {
-    $this->sslCompliant = $sslCompliant;
-  }
-  public function getSslCompliant()
-  {
-    return $this->sslCompliant;
-  }
-  public function setStartTime($startTime)
-  {
-    $this->startTime = $startTime;
-  }
-  public function getStartTime()
-  {
-    return $this->startTime;
-  }
-  public function setWeight($weight)
-  {
-    $this->weight = $weight;
-  }
-  public function getWeight()
-  {
-    return $this->weight;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/CreativeCustomEvent.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/CreativeCustomEvent.php
deleted file mode 100644
index 3c755bac..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/CreativeCustomEvent.php
+++ /dev/null
@@ -1,112 +0,0 @@
-advertiserCustomEventId = $advertiserCustomEventId;
-  }
-  public function getAdvertiserCustomEventId()
-  {
-    return $this->advertiserCustomEventId;
-  }
-  public function setAdvertiserCustomEventName($advertiserCustomEventName)
-  {
-    $this->advertiserCustomEventName = $advertiserCustomEventName;
-  }
-  public function getAdvertiserCustomEventName()
-  {
-    return $this->advertiserCustomEventName;
-  }
-  public function setAdvertiserCustomEventType($advertiserCustomEventType)
-  {
-    $this->advertiserCustomEventType = $advertiserCustomEventType;
-  }
-  public function getAdvertiserCustomEventType()
-  {
-    return $this->advertiserCustomEventType;
-  }
-  public function setArtworkLabel($artworkLabel)
-  {
-    $this->artworkLabel = $artworkLabel;
-  }
-  public function getArtworkLabel()
-  {
-    return $this->artworkLabel;
-  }
-  public function setArtworkType($artworkType)
-  {
-    $this->artworkType = $artworkType;
-  }
-  public function getArtworkType()
-  {
-    return $this->artworkType;
-  }
-  public function setExitUrl($exitUrl)
-  {
-    $this->exitUrl = $exitUrl;
-  }
-  public function getExitUrl()
-  {
-    return $this->exitUrl;
-  }
-  public function setId($id)
-  {
-    $this->id = $id;
-  }
-  public function getId()
-  {
-    return $this->id;
-  }
-  public function setPopupWindowProperties(Google_Service_Dfareporting_PopupWindowProperties $popupWindowProperties)
-  {
-    $this->popupWindowProperties = $popupWindowProperties;
-  }
-  public function getPopupWindowProperties()
-  {
-    return $this->popupWindowProperties;
-  }
-  public function setTargetType($targetType)
-  {
-    $this->targetType = $targetType;
-  }
-  public function getTargetType()
-  {
-    return $this->targetType;
-  }
-  public function setVideoReportingId($videoReportingId)
-  {
-    $this->videoReportingId = $videoReportingId;
-  }
-  public function getVideoReportingId()
-  {
-    return $this->videoReportingId;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/CreativeField.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/CreativeField.php
deleted file mode 100644
index 9a88cfa5..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/CreativeField.php
+++ /dev/null
@@ -1,85 +0,0 @@
-accountId = $accountId;
-  }
-  public function getAccountId()
-  {
-    return $this->accountId;
-  }
-  public function setAdvertiserId($advertiserId)
-  {
-    $this->advertiserId = $advertiserId;
-  }
-  public function getAdvertiserId()
-  {
-    return $this->advertiserId;
-  }
-  public function setAdvertiserIdDimensionValue(Google_Service_Dfareporting_DimensionValue $advertiserIdDimensionValue)
-  {
-    $this->advertiserIdDimensionValue = $advertiserIdDimensionValue;
-  }
-  public function getAdvertiserIdDimensionValue()
-  {
-    return $this->advertiserIdDimensionValue;
-  }
-  public function setId($id)
-  {
-    $this->id = $id;
-  }
-  public function getId()
-  {
-    return $this->id;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setName($name)
-  {
-    $this->name = $name;
-  }
-  public function getName()
-  {
-    return $this->name;
-  }
-  public function setSubaccountId($subaccountId)
-  {
-    $this->subaccountId = $subaccountId;
-  }
-  public function getSubaccountId()
-  {
-    return $this->subaccountId;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/CreativeFieldAssignment.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/CreativeFieldAssignment.php
deleted file mode 100644
index b5b71bd2..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/CreativeFieldAssignment.php
+++ /dev/null
@@ -1,39 +0,0 @@
-creativeFieldId = $creativeFieldId;
-  }
-  public function getCreativeFieldId()
-  {
-    return $this->creativeFieldId;
-  }
-  public function setCreativeFieldValueId($creativeFieldValueId)
-  {
-    $this->creativeFieldValueId = $creativeFieldValueId;
-  }
-  public function getCreativeFieldValueId()
-  {
-    return $this->creativeFieldValueId;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/CreativeFieldValue.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/CreativeFieldValue.php
deleted file mode 100644
index e2eb6741..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/CreativeFieldValue.php
+++ /dev/null
@@ -1,48 +0,0 @@
-id = $id;
-  }
-  public function getId()
-  {
-    return $this->id;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setValue($value)
-  {
-    $this->value = $value;
-  }
-  public function getValue()
-  {
-    return $this->value;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/CreativeFieldValuesListResponse.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/CreativeFieldValuesListResponse.php
deleted file mode 100644
index 6f18e338..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/CreativeFieldValuesListResponse.php
+++ /dev/null
@@ -1,50 +0,0 @@
-creativeFieldValues = $creativeFieldValues;
-  }
-  public function getCreativeFieldValues()
-  {
-    return $this->creativeFieldValues;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setNextPageToken($nextPageToken)
-  {
-    $this->nextPageToken = $nextPageToken;
-  }
-  public function getNextPageToken()
-  {
-    return $this->nextPageToken;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/CreativeFieldsListResponse.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/CreativeFieldsListResponse.php
deleted file mode 100644
index 90270241..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/CreativeFieldsListResponse.php
+++ /dev/null
@@ -1,50 +0,0 @@
-creativeFields = $creativeFields;
-  }
-  public function getCreativeFields()
-  {
-    return $this->creativeFields;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setNextPageToken($nextPageToken)
-  {
-    $this->nextPageToken = $nextPageToken;
-  }
-  public function getNextPageToken()
-  {
-    return $this->nextPageToken;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/CreativeGroup.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/CreativeGroup.php
deleted file mode 100644
index 5dc2513f..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/CreativeGroup.php
+++ /dev/null
@@ -1,94 +0,0 @@
-accountId = $accountId;
-  }
-  public function getAccountId()
-  {
-    return $this->accountId;
-  }
-  public function setAdvertiserId($advertiserId)
-  {
-    $this->advertiserId = $advertiserId;
-  }
-  public function getAdvertiserId()
-  {
-    return $this->advertiserId;
-  }
-  public function setAdvertiserIdDimensionValue(Google_Service_Dfareporting_DimensionValue $advertiserIdDimensionValue)
-  {
-    $this->advertiserIdDimensionValue = $advertiserIdDimensionValue;
-  }
-  public function getAdvertiserIdDimensionValue()
-  {
-    return $this->advertiserIdDimensionValue;
-  }
-  public function setGroupNumber($groupNumber)
-  {
-    $this->groupNumber = $groupNumber;
-  }
-  public function getGroupNumber()
-  {
-    return $this->groupNumber;
-  }
-  public function setId($id)
-  {
-    $this->id = $id;
-  }
-  public function getId()
-  {
-    return $this->id;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setName($name)
-  {
-    $this->name = $name;
-  }
-  public function getName()
-  {
-    return $this->name;
-  }
-  public function setSubaccountId($subaccountId)
-  {
-    $this->subaccountId = $subaccountId;
-  }
-  public function getSubaccountId()
-  {
-    return $this->subaccountId;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/CreativeGroupAssignment.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/CreativeGroupAssignment.php
deleted file mode 100644
index a8ae2cc2..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/CreativeGroupAssignment.php
+++ /dev/null
@@ -1,39 +0,0 @@
-creativeGroupId = $creativeGroupId;
-  }
-  public function getCreativeGroupId()
-  {
-    return $this->creativeGroupId;
-  }
-  public function setCreativeGroupNumber($creativeGroupNumber)
-  {
-    $this->creativeGroupNumber = $creativeGroupNumber;
-  }
-  public function getCreativeGroupNumber()
-  {
-    return $this->creativeGroupNumber;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/CreativeGroupsListResponse.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/CreativeGroupsListResponse.php
deleted file mode 100644
index 3aec0094..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/CreativeGroupsListResponse.php
+++ /dev/null
@@ -1,50 +0,0 @@
-creativeGroups = $creativeGroups;
-  }
-  public function getCreativeGroups()
-  {
-    return $this->creativeGroups;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setNextPageToken($nextPageToken)
-  {
-    $this->nextPageToken = $nextPageToken;
-  }
-  public function getNextPageToken()
-  {
-    return $this->nextPageToken;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/CreativeOptimizationConfiguration.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/CreativeOptimizationConfiguration.php
deleted file mode 100644
index b573e93d..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/CreativeOptimizationConfiguration.php
+++ /dev/null
@@ -1,59 +0,0 @@
-id = $id;
-  }
-  public function getId()
-  {
-    return $this->id;
-  }
-  public function setName($name)
-  {
-    $this->name = $name;
-  }
-  public function getName()
-  {
-    return $this->name;
-  }
-  public function setOptimizationActivitys($optimizationActivitys)
-  {
-    $this->optimizationActivitys = $optimizationActivitys;
-  }
-  public function getOptimizationActivitys()
-  {
-    return $this->optimizationActivitys;
-  }
-  public function setOptimizationModel($optimizationModel)
-  {
-    $this->optimizationModel = $optimizationModel;
-  }
-  public function getOptimizationModel()
-  {
-    return $this->optimizationModel;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/CreativeRotation.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/CreativeRotation.php
deleted file mode 100644
index 61e12e6e..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/CreativeRotation.php
+++ /dev/null
@@ -1,59 +0,0 @@
-creativeAssignments = $creativeAssignments;
-  }
-  public function getCreativeAssignments()
-  {
-    return $this->creativeAssignments;
-  }
-  public function setCreativeOptimizationConfigurationId($creativeOptimizationConfigurationId)
-  {
-    $this->creativeOptimizationConfigurationId = $creativeOptimizationConfigurationId;
-  }
-  public function getCreativeOptimizationConfigurationId()
-  {
-    return $this->creativeOptimizationConfigurationId;
-  }
-  public function setType($type)
-  {
-    $this->type = $type;
-  }
-  public function getType()
-  {
-    return $this->type;
-  }
-  public function setWeightCalculationStrategy($weightCalculationStrategy)
-  {
-    $this->weightCalculationStrategy = $weightCalculationStrategy;
-  }
-  public function getWeightCalculationStrategy()
-  {
-    return $this->weightCalculationStrategy;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/CreativeSettings.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/CreativeSettings.php
deleted file mode 100644
index c9535f84..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/CreativeSettings.php
+++ /dev/null
@@ -1,39 +0,0 @@
-iFrameFooter = $iFrameFooter;
-  }
-  public function getIFrameFooter()
-  {
-    return $this->iFrameFooter;
-  }
-  public function setIFrameHeader($iFrameHeader)
-  {
-    $this->iFrameHeader = $iFrameHeader;
-  }
-  public function getIFrameHeader()
-  {
-    return $this->iFrameHeader;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/CreativesListResponse.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/CreativesListResponse.php
deleted file mode 100644
index 10cfce90..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/CreativesListResponse.php
+++ /dev/null
@@ -1,50 +0,0 @@
-creatives = $creatives;
-  }
-  public function getCreatives()
-  {
-    return $this->creatives;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setNextPageToken($nextPageToken)
-  {
-    $this->nextPageToken = $nextPageToken;
-  }
-  public function getNextPageToken()
-  {
-    return $this->nextPageToken;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/CrossDimensionReachReportCompatibleFields.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/CrossDimensionReachReportCompatibleFields.php
deleted file mode 100644
index 66675717..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/CrossDimensionReachReportCompatibleFields.php
+++ /dev/null
@@ -1,71 +0,0 @@
-breakdown = $breakdown;
-  }
-  public function getBreakdown()
-  {
-    return $this->breakdown;
-  }
-  public function setDimensionFilters($dimensionFilters)
-  {
-    $this->dimensionFilters = $dimensionFilters;
-  }
-  public function getDimensionFilters()
-  {
-    return $this->dimensionFilters;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setMetrics($metrics)
-  {
-    $this->metrics = $metrics;
-  }
-  public function getMetrics()
-  {
-    return $this->metrics;
-  }
-  public function setOverlapMetrics($overlapMetrics)
-  {
-    $this->overlapMetrics = $overlapMetrics;
-  }
-  public function getOverlapMetrics()
-  {
-    return $this->overlapMetrics;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/CustomFloodlightVariable.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/CustomFloodlightVariable.php
deleted file mode 100644
index 6e7bb7d7..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/CustomFloodlightVariable.php
+++ /dev/null
@@ -1,48 +0,0 @@
-kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setType($type)
-  {
-    $this->type = $type;
-  }
-  public function getType()
-  {
-    return $this->type;
-  }
-  public function setValue($value)
-  {
-    $this->value = $value;
-  }
-  public function getValue()
-  {
-    return $this->value;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/CustomRichMediaEvents.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/CustomRichMediaEvents.php
deleted file mode 100644
index 26801149..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/CustomRichMediaEvents.php
+++ /dev/null
@@ -1,41 +0,0 @@
-filteredEventIds = $filteredEventIds;
-  }
-  public function getFilteredEventIds()
-  {
-    return $this->filteredEventIds;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/DateRange.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/DateRange.php
deleted file mode 100644
index 7aceccb7..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/DateRange.php
+++ /dev/null
@@ -1,57 +0,0 @@
-endDate = $endDate;
-  }
-  public function getEndDate()
-  {
-    return $this->endDate;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setRelativeDateRange($relativeDateRange)
-  {
-    $this->relativeDateRange = $relativeDateRange;
-  }
-  public function getRelativeDateRange()
-  {
-    return $this->relativeDateRange;
-  }
-  public function setStartDate($startDate)
-  {
-    $this->startDate = $startDate;
-  }
-  public function getStartDate()
-  {
-    return $this->startDate;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/DayPartTargeting.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/DayPartTargeting.php
deleted file mode 100644
index 122a7dd4..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/DayPartTargeting.php
+++ /dev/null
@@ -1,49 +0,0 @@
-daysOfWeek = $daysOfWeek;
-  }
-  public function getDaysOfWeek()
-  {
-    return $this->daysOfWeek;
-  }
-  public function setHoursOfDay($hoursOfDay)
-  {
-    $this->hoursOfDay = $hoursOfDay;
-  }
-  public function getHoursOfDay()
-  {
-    return $this->hoursOfDay;
-  }
-  public function setUserLocalTime($userLocalTime)
-  {
-    $this->userLocalTime = $userLocalTime;
-  }
-  public function getUserLocalTime()
-  {
-    return $this->userLocalTime;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/DefaultClickThroughEventTagProperties.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/DefaultClickThroughEventTagProperties.php
deleted file mode 100644
index fd54dfad..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/DefaultClickThroughEventTagProperties.php
+++ /dev/null
@@ -1,39 +0,0 @@
-defaultClickThroughEventTagId = $defaultClickThroughEventTagId;
-  }
-  public function getDefaultClickThroughEventTagId()
-  {
-    return $this->defaultClickThroughEventTagId;
-  }
-  public function setOverrideInheritedEventTag($overrideInheritedEventTag)
-  {
-    $this->overrideInheritedEventTag = $overrideInheritedEventTag;
-  }
-  public function getOverrideInheritedEventTag()
-  {
-    return $this->overrideInheritedEventTag;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/DeliverySchedule.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/DeliverySchedule.php
deleted file mode 100644
index 8ae4dde9..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/DeliverySchedule.php
+++ /dev/null
@@ -1,58 +0,0 @@
-frequencyCap = $frequencyCap;
-  }
-  public function getFrequencyCap()
-  {
-    return $this->frequencyCap;
-  }
-  public function setHardCutoff($hardCutoff)
-  {
-    $this->hardCutoff = $hardCutoff;
-  }
-  public function getHardCutoff()
-  {
-    return $this->hardCutoff;
-  }
-  public function setImpressionRatio($impressionRatio)
-  {
-    $this->impressionRatio = $impressionRatio;
-  }
-  public function getImpressionRatio()
-  {
-    return $this->impressionRatio;
-  }
-  public function setPriority($priority)
-  {
-    $this->priority = $priority;
-  }
-  public function getPriority()
-  {
-    return $this->priority;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/DfareportingFile.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/DfareportingFile.php
deleted file mode 100644
index f8715a3c..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/DfareportingFile.php
+++ /dev/null
@@ -1,113 +0,0 @@
-dateRange = $dateRange;
-  }
-  public function getDateRange()
-  {
-    return $this->dateRange;
-  }
-  public function setEtag($etag)
-  {
-    $this->etag = $etag;
-  }
-  public function getEtag()
-  {
-    return $this->etag;
-  }
-  public function setFileName($fileName)
-  {
-    $this->fileName = $fileName;
-  }
-  public function getFileName()
-  {
-    return $this->fileName;
-  }
-  public function setFormat($format)
-  {
-    $this->format = $format;
-  }
-  public function getFormat()
-  {
-    return $this->format;
-  }
-  public function setId($id)
-  {
-    $this->id = $id;
-  }
-  public function getId()
-  {
-    return $this->id;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setLastModifiedTime($lastModifiedTime)
-  {
-    $this->lastModifiedTime = $lastModifiedTime;
-  }
-  public function getLastModifiedTime()
-  {
-    return $this->lastModifiedTime;
-  }
-  public function setReportId($reportId)
-  {
-    $this->reportId = $reportId;
-  }
-  public function getReportId()
-  {
-    return $this->reportId;
-  }
-  public function setStatus($status)
-  {
-    $this->status = $status;
-  }
-  public function getStatus()
-  {
-    return $this->status;
-  }
-  public function setUrls(Google_Service_Dfareporting_DfareportingFileUrls $urls)
-  {
-    $this->urls = $urls;
-  }
-  public function getUrls()
-  {
-    return $this->urls;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/DfareportingFileUrls.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/DfareportingFileUrls.php
deleted file mode 100644
index 5a293820..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/DfareportingFileUrls.php
+++ /dev/null
@@ -1,39 +0,0 @@
-apiUrl = $apiUrl;
-  }
-  public function getApiUrl()
-  {
-    return $this->apiUrl;
-  }
-  public function setBrowserUrl($browserUrl)
-  {
-    $this->browserUrl = $browserUrl;
-  }
-  public function getBrowserUrl()
-  {
-    return $this->browserUrl;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/DfpSettings.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/DfpSettings.php
deleted file mode 100644
index 06ff5b6d..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/DfpSettings.php
+++ /dev/null
@@ -1,70 +0,0 @@
- "dfp_network_code",
-        "dfpNetworkName" => "dfp_network_name",
-  );
-  public $dfpNetworkCode;
-  public $dfpNetworkName;
-  public $programmaticPlacementAccepted;
-  public $pubPaidPlacementAccepted;
-  public $publisherPortalOnly;
-
-  public function setDfpNetworkCode($dfpNetworkCode)
-  {
-    $this->dfpNetworkCode = $dfpNetworkCode;
-  }
-  public function getDfpNetworkCode()
-  {
-    return $this->dfpNetworkCode;
-  }
-  public function setDfpNetworkName($dfpNetworkName)
-  {
-    $this->dfpNetworkName = $dfpNetworkName;
-  }
-  public function getDfpNetworkName()
-  {
-    return $this->dfpNetworkName;
-  }
-  public function setProgrammaticPlacementAccepted($programmaticPlacementAccepted)
-  {
-    $this->programmaticPlacementAccepted = $programmaticPlacementAccepted;
-  }
-  public function getProgrammaticPlacementAccepted()
-  {
-    return $this->programmaticPlacementAccepted;
-  }
-  public function setPubPaidPlacementAccepted($pubPaidPlacementAccepted)
-  {
-    $this->pubPaidPlacementAccepted = $pubPaidPlacementAccepted;
-  }
-  public function getPubPaidPlacementAccepted()
-  {
-    return $this->pubPaidPlacementAccepted;
-  }
-  public function setPublisherPortalOnly($publisherPortalOnly)
-  {
-    $this->publisherPortalOnly = $publisherPortalOnly;
-  }
-  public function getPublisherPortalOnly()
-  {
-    return $this->publisherPortalOnly;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/Dimension.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/Dimension.php
deleted file mode 100644
index 74ce2a92..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/Dimension.php
+++ /dev/null
@@ -1,39 +0,0 @@
-kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setName($name)
-  {
-    $this->name = $name;
-  }
-  public function getName()
-  {
-    return $this->name;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/DimensionFilter.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/DimensionFilter.php
deleted file mode 100644
index 5d19b820..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/DimensionFilter.php
+++ /dev/null
@@ -1,48 +0,0 @@
-dimensionName = $dimensionName;
-  }
-  public function getDimensionName()
-  {
-    return $this->dimensionName;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setValue($value)
-  {
-    $this->value = $value;
-  }
-  public function getValue()
-  {
-    return $this->value;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/DimensionValue.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/DimensionValue.php
deleted file mode 100644
index c02b6df8..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/DimensionValue.php
+++ /dev/null
@@ -1,75 +0,0 @@
-dimensionName = $dimensionName;
-  }
-  public function getDimensionName()
-  {
-    return $this->dimensionName;
-  }
-  public function setEtag($etag)
-  {
-    $this->etag = $etag;
-  }
-  public function getEtag()
-  {
-    return $this->etag;
-  }
-  public function setId($id)
-  {
-    $this->id = $id;
-  }
-  public function getId()
-  {
-    return $this->id;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setMatchType($matchType)
-  {
-    $this->matchType = $matchType;
-  }
-  public function getMatchType()
-  {
-    return $this->matchType;
-  }
-  public function setValue($value)
-  {
-    $this->value = $value;
-  }
-  public function getValue()
-  {
-    return $this->value;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/DimensionValueList.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/DimensionValueList.php
deleted file mode 100644
index 473c5e5e..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/DimensionValueList.php
+++ /dev/null
@@ -1,59 +0,0 @@
-etag = $etag;
-  }
-  public function getEtag()
-  {
-    return $this->etag;
-  }
-  public function setItems($items)
-  {
-    $this->items = $items;
-  }
-  public function getItems()
-  {
-    return $this->items;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setNextPageToken($nextPageToken)
-  {
-    $this->nextPageToken = $nextPageToken;
-  }
-  public function getNextPageToken()
-  {
-    return $this->nextPageToken;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/DimensionValueRequest.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/DimensionValueRequest.php
deleted file mode 100644
index 5a4dcc0f..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/DimensionValueRequest.php
+++ /dev/null
@@ -1,68 +0,0 @@
-dimensionName = $dimensionName;
-  }
-  public function getDimensionName()
-  {
-    return $this->dimensionName;
-  }
-  public function setEndDate($endDate)
-  {
-    $this->endDate = $endDate;
-  }
-  public function getEndDate()
-  {
-    return $this->endDate;
-  }
-  public function setFilters($filters)
-  {
-    $this->filters = $filters;
-  }
-  public function getFilters()
-  {
-    return $this->filters;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setStartDate($startDate)
-  {
-    $this->startDate = $startDate;
-  }
-  public function getStartDate()
-  {
-    return $this->startDate;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/DirectorySite.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/DirectorySite.php
deleted file mode 100644
index 06505841..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/DirectorySite.php
+++ /dev/null
@@ -1,151 +0,0 @@
-active = $active;
-  }
-  public function getActive()
-  {
-    return $this->active;
-  }
-  public function setContactAssignments($contactAssignments)
-  {
-    $this->contactAssignments = $contactAssignments;
-  }
-  public function getContactAssignments()
-  {
-    return $this->contactAssignments;
-  }
-  public function setCountryId($countryId)
-  {
-    $this->countryId = $countryId;
-  }
-  public function getCountryId()
-  {
-    return $this->countryId;
-  }
-  public function setCurrencyId($currencyId)
-  {
-    $this->currencyId = $currencyId;
-  }
-  public function getCurrencyId()
-  {
-    return $this->currencyId;
-  }
-  public function setDescription($description)
-  {
-    $this->description = $description;
-  }
-  public function getDescription()
-  {
-    return $this->description;
-  }
-  public function setId($id)
-  {
-    $this->id = $id;
-  }
-  public function getId()
-  {
-    return $this->id;
-  }
-  public function setIdDimensionValue(Google_Service_Dfareporting_DimensionValue $idDimensionValue)
-  {
-    $this->idDimensionValue = $idDimensionValue;
-  }
-  public function getIdDimensionValue()
-  {
-    return $this->idDimensionValue;
-  }
-  public function setInpageTagFormats($inpageTagFormats)
-  {
-    $this->inpageTagFormats = $inpageTagFormats;
-  }
-  public function getInpageTagFormats()
-  {
-    return $this->inpageTagFormats;
-  }
-  public function setInterstitialTagFormats($interstitialTagFormats)
-  {
-    $this->interstitialTagFormats = $interstitialTagFormats;
-  }
-  public function getInterstitialTagFormats()
-  {
-    return $this->interstitialTagFormats;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setName($name)
-  {
-    $this->name = $name;
-  }
-  public function getName()
-  {
-    return $this->name;
-  }
-  public function setParentId($parentId)
-  {
-    $this->parentId = $parentId;
-  }
-  public function getParentId()
-  {
-    return $this->parentId;
-  }
-  public function setSettings(Google_Service_Dfareporting_DirectorySiteSettings $settings)
-  {
-    $this->settings = $settings;
-  }
-  public function getSettings()
-  {
-    return $this->settings;
-  }
-  public function setUrl($url)
-  {
-    $this->url = $url;
-  }
-  public function getUrl()
-  {
-    return $this->url;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/DirectorySiteContact.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/DirectorySiteContact.php
deleted file mode 100644
index bf9851c5..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/DirectorySiteContact.php
+++ /dev/null
@@ -1,111 +0,0 @@
-address = $address;
-  }
-  public function getAddress()
-  {
-    return $this->address;
-  }
-  public function setEmail($email)
-  {
-    $this->email = $email;
-  }
-  public function getEmail()
-  {
-    return $this->email;
-  }
-  public function setFirstName($firstName)
-  {
-    $this->firstName = $firstName;
-  }
-  public function getFirstName()
-  {
-    return $this->firstName;
-  }
-  public function setId($id)
-  {
-    $this->id = $id;
-  }
-  public function getId()
-  {
-    return $this->id;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setLastName($lastName)
-  {
-    $this->lastName = $lastName;
-  }
-  public function getLastName()
-  {
-    return $this->lastName;
-  }
-  public function setPhone($phone)
-  {
-    $this->phone = $phone;
-  }
-  public function getPhone()
-  {
-    return $this->phone;
-  }
-  public function setRole($role)
-  {
-    $this->role = $role;
-  }
-  public function getRole()
-  {
-    return $this->role;
-  }
-  public function setTitle($title)
-  {
-    $this->title = $title;
-  }
-  public function getTitle()
-  {
-    return $this->title;
-  }
-  public function setType($type)
-  {
-    $this->type = $type;
-  }
-  public function getType()
-  {
-    return $this->type;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/DirectorySiteContactAssignment.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/DirectorySiteContactAssignment.php
deleted file mode 100644
index d0072b2d..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/DirectorySiteContactAssignment.php
+++ /dev/null
@@ -1,39 +0,0 @@
-contactId = $contactId;
-  }
-  public function getContactId()
-  {
-    return $this->contactId;
-  }
-  public function setVisibility($visibility)
-  {
-    $this->visibility = $visibility;
-  }
-  public function getVisibility()
-  {
-    return $this->visibility;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/DirectorySiteContactsListResponse.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/DirectorySiteContactsListResponse.php
deleted file mode 100644
index d7cbdd8d..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/DirectorySiteContactsListResponse.php
+++ /dev/null
@@ -1,50 +0,0 @@
-directorySiteContacts = $directorySiteContacts;
-  }
-  public function getDirectorySiteContacts()
-  {
-    return $this->directorySiteContacts;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setNextPageToken($nextPageToken)
-  {
-    $this->nextPageToken = $nextPageToken;
-  }
-  public function getNextPageToken()
-  {
-    return $this->nextPageToken;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/DirectorySiteSettings.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/DirectorySiteSettings.php
deleted file mode 100644
index 6fb0da5a..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/DirectorySiteSettings.php
+++ /dev/null
@@ -1,89 +0,0 @@
- "dfp_settings",
-        "instreamVideoPlacementAccepted" => "instream_video_placement_accepted",
-  );
-  public $activeViewOptOut;
-  protected $dfpSettingsType = 'Google_Service_Dfareporting_DfpSettings';
-  protected $dfpSettingsDataType = '';
-  public $instreamVideoPlacementAccepted;
-  public $interstitialPlacementAccepted;
-  public $nielsenOcrOptOut;
-  public $verificationTagOptOut;
-  public $videoActiveViewOptOut;
-
-  public function setActiveViewOptOut($activeViewOptOut)
-  {
-    $this->activeViewOptOut = $activeViewOptOut;
-  }
-  public function getActiveViewOptOut()
-  {
-    return $this->activeViewOptOut;
-  }
-  public function setDfpSettings(Google_Service_Dfareporting_DfpSettings $dfpSettings)
-  {
-    $this->dfpSettings = $dfpSettings;
-  }
-  public function getDfpSettings()
-  {
-    return $this->dfpSettings;
-  }
-  public function setInstreamVideoPlacementAccepted($instreamVideoPlacementAccepted)
-  {
-    $this->instreamVideoPlacementAccepted = $instreamVideoPlacementAccepted;
-  }
-  public function getInstreamVideoPlacementAccepted()
-  {
-    return $this->instreamVideoPlacementAccepted;
-  }
-  public function setInterstitialPlacementAccepted($interstitialPlacementAccepted)
-  {
-    $this->interstitialPlacementAccepted = $interstitialPlacementAccepted;
-  }
-  public function getInterstitialPlacementAccepted()
-  {
-    return $this->interstitialPlacementAccepted;
-  }
-  public function setNielsenOcrOptOut($nielsenOcrOptOut)
-  {
-    $this->nielsenOcrOptOut = $nielsenOcrOptOut;
-  }
-  public function getNielsenOcrOptOut()
-  {
-    return $this->nielsenOcrOptOut;
-  }
-  public function setVerificationTagOptOut($verificationTagOptOut)
-  {
-    $this->verificationTagOptOut = $verificationTagOptOut;
-  }
-  public function getVerificationTagOptOut()
-  {
-    return $this->verificationTagOptOut;
-  }
-  public function setVideoActiveViewOptOut($videoActiveViewOptOut)
-  {
-    $this->videoActiveViewOptOut = $videoActiveViewOptOut;
-  }
-  public function getVideoActiveViewOptOut()
-  {
-    return $this->videoActiveViewOptOut;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/DirectorySitesListResponse.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/DirectorySitesListResponse.php
deleted file mode 100644
index 89990085..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/DirectorySitesListResponse.php
+++ /dev/null
@@ -1,50 +0,0 @@
-directorySites = $directorySites;
-  }
-  public function getDirectorySites()
-  {
-    return $this->directorySites;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setNextPageToken($nextPageToken)
-  {
-    $this->nextPageToken = $nextPageToken;
-  }
-  public function getNextPageToken()
-  {
-    return $this->nextPageToken;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/DynamicTargetingKey.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/DynamicTargetingKey.php
deleted file mode 100644
index c29d347b..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/DynamicTargetingKey.php
+++ /dev/null
@@ -1,57 +0,0 @@
-kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setName($name)
-  {
-    $this->name = $name;
-  }
-  public function getName()
-  {
-    return $this->name;
-  }
-  public function setObjectId($objectId)
-  {
-    $this->objectId = $objectId;
-  }
-  public function getObjectId()
-  {
-    return $this->objectId;
-  }
-  public function setObjectType($objectType)
-  {
-    $this->objectType = $objectType;
-  }
-  public function getObjectType()
-  {
-    return $this->objectType;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/DynamicTargetingKeysListResponse.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/DynamicTargetingKeysListResponse.php
deleted file mode 100644
index f38295f6..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/DynamicTargetingKeysListResponse.php
+++ /dev/null
@@ -1,41 +0,0 @@
-dynamicTargetingKeys = $dynamicTargetingKeys;
-  }
-  public function getDynamicTargetingKeys()
-  {
-    return $this->dynamicTargetingKeys;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/EncryptionInfo.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/EncryptionInfo.php
deleted file mode 100644
index c1bccd19..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/EncryptionInfo.php
+++ /dev/null
@@ -1,57 +0,0 @@
-encryptionEntityId = $encryptionEntityId;
-  }
-  public function getEncryptionEntityId()
-  {
-    return $this->encryptionEntityId;
-  }
-  public function setEncryptionEntityType($encryptionEntityType)
-  {
-    $this->encryptionEntityType = $encryptionEntityType;
-  }
-  public function getEncryptionEntityType()
-  {
-    return $this->encryptionEntityType;
-  }
-  public function setEncryptionSource($encryptionSource)
-  {
-    $this->encryptionSource = $encryptionSource;
-  }
-  public function getEncryptionSource()
-  {
-    return $this->encryptionSource;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/EventTag.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/EventTag.php
deleted file mode 100644
index a08a7ba8..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/EventTag.php
+++ /dev/null
@@ -1,186 +0,0 @@
-accountId = $accountId;
-  }
-  public function getAccountId()
-  {
-    return $this->accountId;
-  }
-  public function setAdvertiserId($advertiserId)
-  {
-    $this->advertiserId = $advertiserId;
-  }
-  public function getAdvertiserId()
-  {
-    return $this->advertiserId;
-  }
-  public function setAdvertiserIdDimensionValue(Google_Service_Dfareporting_DimensionValue $advertiserIdDimensionValue)
-  {
-    $this->advertiserIdDimensionValue = $advertiserIdDimensionValue;
-  }
-  public function getAdvertiserIdDimensionValue()
-  {
-    return $this->advertiserIdDimensionValue;
-  }
-  public function setCampaignId($campaignId)
-  {
-    $this->campaignId = $campaignId;
-  }
-  public function getCampaignId()
-  {
-    return $this->campaignId;
-  }
-  public function setCampaignIdDimensionValue(Google_Service_Dfareporting_DimensionValue $campaignIdDimensionValue)
-  {
-    $this->campaignIdDimensionValue = $campaignIdDimensionValue;
-  }
-  public function getCampaignIdDimensionValue()
-  {
-    return $this->campaignIdDimensionValue;
-  }
-  public function setEnabledByDefault($enabledByDefault)
-  {
-    $this->enabledByDefault = $enabledByDefault;
-  }
-  public function getEnabledByDefault()
-  {
-    return $this->enabledByDefault;
-  }
-  public function setExcludeFromAdxRequests($excludeFromAdxRequests)
-  {
-    $this->excludeFromAdxRequests = $excludeFromAdxRequests;
-  }
-  public function getExcludeFromAdxRequests()
-  {
-    return $this->excludeFromAdxRequests;
-  }
-  public function setId($id)
-  {
-    $this->id = $id;
-  }
-  public function getId()
-  {
-    return $this->id;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setName($name)
-  {
-    $this->name = $name;
-  }
-  public function getName()
-  {
-    return $this->name;
-  }
-  public function setSiteFilterType($siteFilterType)
-  {
-    $this->siteFilterType = $siteFilterType;
-  }
-  public function getSiteFilterType()
-  {
-    return $this->siteFilterType;
-  }
-  public function setSiteIds($siteIds)
-  {
-    $this->siteIds = $siteIds;
-  }
-  public function getSiteIds()
-  {
-    return $this->siteIds;
-  }
-  public function setSslCompliant($sslCompliant)
-  {
-    $this->sslCompliant = $sslCompliant;
-  }
-  public function getSslCompliant()
-  {
-    return $this->sslCompliant;
-  }
-  public function setStatus($status)
-  {
-    $this->status = $status;
-  }
-  public function getStatus()
-  {
-    return $this->status;
-  }
-  public function setSubaccountId($subaccountId)
-  {
-    $this->subaccountId = $subaccountId;
-  }
-  public function getSubaccountId()
-  {
-    return $this->subaccountId;
-  }
-  public function setType($type)
-  {
-    $this->type = $type;
-  }
-  public function getType()
-  {
-    return $this->type;
-  }
-  public function setUrl($url)
-  {
-    $this->url = $url;
-  }
-  public function getUrl()
-  {
-    return $this->url;
-  }
-  public function setUrlEscapeLevels($urlEscapeLevels)
-  {
-    $this->urlEscapeLevels = $urlEscapeLevels;
-  }
-  public function getUrlEscapeLevels()
-  {
-    return $this->urlEscapeLevels;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/EventTagOverride.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/EventTagOverride.php
deleted file mode 100644
index d2d4a501..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/EventTagOverride.php
+++ /dev/null
@@ -1,39 +0,0 @@
-enabled = $enabled;
-  }
-  public function getEnabled()
-  {
-    return $this->enabled;
-  }
-  public function setId($id)
-  {
-    $this->id = $id;
-  }
-  public function getId()
-  {
-    return $this->id;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/EventTagsListResponse.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/EventTagsListResponse.php
deleted file mode 100644
index bae72d7e..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/EventTagsListResponse.php
+++ /dev/null
@@ -1,41 +0,0 @@
-eventTags = $eventTags;
-  }
-  public function getEventTags()
-  {
-    return $this->eventTags;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/FileList.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/FileList.php
deleted file mode 100644
index b4fab4e0..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/FileList.php
+++ /dev/null
@@ -1,59 +0,0 @@
-etag = $etag;
-  }
-  public function getEtag()
-  {
-    return $this->etag;
-  }
-  public function setItems($items)
-  {
-    $this->items = $items;
-  }
-  public function getItems()
-  {
-    return $this->items;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setNextPageToken($nextPageToken)
-  {
-    $this->nextPageToken = $nextPageToken;
-  }
-  public function getNextPageToken()
-  {
-    return $this->nextPageToken;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/Flight.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/Flight.php
deleted file mode 100644
index ec0ff945..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/Flight.php
+++ /dev/null
@@ -1,57 +0,0 @@
-endDate = $endDate;
-  }
-  public function getEndDate()
-  {
-    return $this->endDate;
-  }
-  public function setRateOrCost($rateOrCost)
-  {
-    $this->rateOrCost = $rateOrCost;
-  }
-  public function getRateOrCost()
-  {
-    return $this->rateOrCost;
-  }
-  public function setStartDate($startDate)
-  {
-    $this->startDate = $startDate;
-  }
-  public function getStartDate()
-  {
-    return $this->startDate;
-  }
-  public function setUnits($units)
-  {
-    $this->units = $units;
-  }
-  public function getUnits()
-  {
-    return $this->units;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/FloodlightActivitiesGenerateTagResponse.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/FloodlightActivitiesGenerateTagResponse.php
deleted file mode 100644
index c0ad645f..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/FloodlightActivitiesGenerateTagResponse.php
+++ /dev/null
@@ -1,39 +0,0 @@
-floodlightActivityTag = $floodlightActivityTag;
-  }
-  public function getFloodlightActivityTag()
-  {
-    return $this->floodlightActivityTag;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/FloodlightActivitiesListResponse.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/FloodlightActivitiesListResponse.php
deleted file mode 100644
index 12ff2c83..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/FloodlightActivitiesListResponse.php
+++ /dev/null
@@ -1,50 +0,0 @@
-floodlightActivities = $floodlightActivities;
-  }
-  public function getFloodlightActivities()
-  {
-    return $this->floodlightActivities;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setNextPageToken($nextPageToken)
-  {
-    $this->nextPageToken = $nextPageToken;
-  }
-  public function getNextPageToken()
-  {
-    return $this->nextPageToken;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/FloodlightActivity.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/FloodlightActivity.php
deleted file mode 100644
index 4be8d151..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/FloodlightActivity.php
+++ /dev/null
@@ -1,279 +0,0 @@
-accountId = $accountId;
-  }
-  public function getAccountId()
-  {
-    return $this->accountId;
-  }
-  public function setAdvertiserId($advertiserId)
-  {
-    $this->advertiserId = $advertiserId;
-  }
-  public function getAdvertiserId()
-  {
-    return $this->advertiserId;
-  }
-  public function setAdvertiserIdDimensionValue(Google_Service_Dfareporting_DimensionValue $advertiserIdDimensionValue)
-  {
-    $this->advertiserIdDimensionValue = $advertiserIdDimensionValue;
-  }
-  public function getAdvertiserIdDimensionValue()
-  {
-    return $this->advertiserIdDimensionValue;
-  }
-  public function setCacheBustingType($cacheBustingType)
-  {
-    $this->cacheBustingType = $cacheBustingType;
-  }
-  public function getCacheBustingType()
-  {
-    return $this->cacheBustingType;
-  }
-  public function setCountingMethod($countingMethod)
-  {
-    $this->countingMethod = $countingMethod;
-  }
-  public function getCountingMethod()
-  {
-    return $this->countingMethod;
-  }
-  public function setDefaultTags($defaultTags)
-  {
-    $this->defaultTags = $defaultTags;
-  }
-  public function getDefaultTags()
-  {
-    return $this->defaultTags;
-  }
-  public function setExpectedUrl($expectedUrl)
-  {
-    $this->expectedUrl = $expectedUrl;
-  }
-  public function getExpectedUrl()
-  {
-    return $this->expectedUrl;
-  }
-  public function setFloodlightActivityGroupId($floodlightActivityGroupId)
-  {
-    $this->floodlightActivityGroupId = $floodlightActivityGroupId;
-  }
-  public function getFloodlightActivityGroupId()
-  {
-    return $this->floodlightActivityGroupId;
-  }
-  public function setFloodlightActivityGroupName($floodlightActivityGroupName)
-  {
-    $this->floodlightActivityGroupName = $floodlightActivityGroupName;
-  }
-  public function getFloodlightActivityGroupName()
-  {
-    return $this->floodlightActivityGroupName;
-  }
-  public function setFloodlightActivityGroupTagString($floodlightActivityGroupTagString)
-  {
-    $this->floodlightActivityGroupTagString = $floodlightActivityGroupTagString;
-  }
-  public function getFloodlightActivityGroupTagString()
-  {
-    return $this->floodlightActivityGroupTagString;
-  }
-  public function setFloodlightActivityGroupType($floodlightActivityGroupType)
-  {
-    $this->floodlightActivityGroupType = $floodlightActivityGroupType;
-  }
-  public function getFloodlightActivityGroupType()
-  {
-    return $this->floodlightActivityGroupType;
-  }
-  public function setFloodlightConfigurationId($floodlightConfigurationId)
-  {
-    $this->floodlightConfigurationId = $floodlightConfigurationId;
-  }
-  public function getFloodlightConfigurationId()
-  {
-    return $this->floodlightConfigurationId;
-  }
-  public function setFloodlightConfigurationIdDimensionValue(Google_Service_Dfareporting_DimensionValue $floodlightConfigurationIdDimensionValue)
-  {
-    $this->floodlightConfigurationIdDimensionValue = $floodlightConfigurationIdDimensionValue;
-  }
-  public function getFloodlightConfigurationIdDimensionValue()
-  {
-    return $this->floodlightConfigurationIdDimensionValue;
-  }
-  public function setHidden($hidden)
-  {
-    $this->hidden = $hidden;
-  }
-  public function getHidden()
-  {
-    return $this->hidden;
-  }
-  public function setId($id)
-  {
-    $this->id = $id;
-  }
-  public function getId()
-  {
-    return $this->id;
-  }
-  public function setIdDimensionValue(Google_Service_Dfareporting_DimensionValue $idDimensionValue)
-  {
-    $this->idDimensionValue = $idDimensionValue;
-  }
-  public function getIdDimensionValue()
-  {
-    return $this->idDimensionValue;
-  }
-  public function setImageTagEnabled($imageTagEnabled)
-  {
-    $this->imageTagEnabled = $imageTagEnabled;
-  }
-  public function getImageTagEnabled()
-  {
-    return $this->imageTagEnabled;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setName($name)
-  {
-    $this->name = $name;
-  }
-  public function getName()
-  {
-    return $this->name;
-  }
-  public function setNotes($notes)
-  {
-    $this->notes = $notes;
-  }
-  public function getNotes()
-  {
-    return $this->notes;
-  }
-  public function setPublisherTags($publisherTags)
-  {
-    $this->publisherTags = $publisherTags;
-  }
-  public function getPublisherTags()
-  {
-    return $this->publisherTags;
-  }
-  public function setSecure($secure)
-  {
-    $this->secure = $secure;
-  }
-  public function getSecure()
-  {
-    return $this->secure;
-  }
-  public function setSslCompliant($sslCompliant)
-  {
-    $this->sslCompliant = $sslCompliant;
-  }
-  public function getSslCompliant()
-  {
-    return $this->sslCompliant;
-  }
-  public function setSslRequired($sslRequired)
-  {
-    $this->sslRequired = $sslRequired;
-  }
-  public function getSslRequired()
-  {
-    return $this->sslRequired;
-  }
-  public function setSubaccountId($subaccountId)
-  {
-    $this->subaccountId = $subaccountId;
-  }
-  public function getSubaccountId()
-  {
-    return $this->subaccountId;
-  }
-  public function setTagFormat($tagFormat)
-  {
-    $this->tagFormat = $tagFormat;
-  }
-  public function getTagFormat()
-  {
-    return $this->tagFormat;
-  }
-  public function setTagString($tagString)
-  {
-    $this->tagString = $tagString;
-  }
-  public function getTagString()
-  {
-    return $this->tagString;
-  }
-  public function setUserDefinedVariableTypes($userDefinedVariableTypes)
-  {
-    $this->userDefinedVariableTypes = $userDefinedVariableTypes;
-  }
-  public function getUserDefinedVariableTypes()
-  {
-    return $this->userDefinedVariableTypes;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/FloodlightActivityDynamicTag.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/FloodlightActivityDynamicTag.php
deleted file mode 100644
index 0235ca3a..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/FloodlightActivityDynamicTag.php
+++ /dev/null
@@ -1,48 +0,0 @@
-id = $id;
-  }
-  public function getId()
-  {
-    return $this->id;
-  }
-  public function setName($name)
-  {
-    $this->name = $name;
-  }
-  public function getName()
-  {
-    return $this->name;
-  }
-  public function setTag($tag)
-  {
-    $this->tag = $tag;
-  }
-  public function getTag()
-  {
-    return $this->tag;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/FloodlightActivityGroup.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/FloodlightActivityGroup.php
deleted file mode 100644
index 5d4fdbe6..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/FloodlightActivityGroup.php
+++ /dev/null
@@ -1,132 +0,0 @@
-accountId = $accountId;
-  }
-  public function getAccountId()
-  {
-    return $this->accountId;
-  }
-  public function setAdvertiserId($advertiserId)
-  {
-    $this->advertiserId = $advertiserId;
-  }
-  public function getAdvertiserId()
-  {
-    return $this->advertiserId;
-  }
-  public function setAdvertiserIdDimensionValue(Google_Service_Dfareporting_DimensionValue $advertiserIdDimensionValue)
-  {
-    $this->advertiserIdDimensionValue = $advertiserIdDimensionValue;
-  }
-  public function getAdvertiserIdDimensionValue()
-  {
-    return $this->advertiserIdDimensionValue;
-  }
-  public function setFloodlightConfigurationId($floodlightConfigurationId)
-  {
-    $this->floodlightConfigurationId = $floodlightConfigurationId;
-  }
-  public function getFloodlightConfigurationId()
-  {
-    return $this->floodlightConfigurationId;
-  }
-  public function setFloodlightConfigurationIdDimensionValue(Google_Service_Dfareporting_DimensionValue $floodlightConfigurationIdDimensionValue)
-  {
-    $this->floodlightConfigurationIdDimensionValue = $floodlightConfigurationIdDimensionValue;
-  }
-  public function getFloodlightConfigurationIdDimensionValue()
-  {
-    return $this->floodlightConfigurationIdDimensionValue;
-  }
-  public function setId($id)
-  {
-    $this->id = $id;
-  }
-  public function getId()
-  {
-    return $this->id;
-  }
-  public function setIdDimensionValue(Google_Service_Dfareporting_DimensionValue $idDimensionValue)
-  {
-    $this->idDimensionValue = $idDimensionValue;
-  }
-  public function getIdDimensionValue()
-  {
-    return $this->idDimensionValue;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setName($name)
-  {
-    $this->name = $name;
-  }
-  public function getName()
-  {
-    return $this->name;
-  }
-  public function setSubaccountId($subaccountId)
-  {
-    $this->subaccountId = $subaccountId;
-  }
-  public function getSubaccountId()
-  {
-    return $this->subaccountId;
-  }
-  public function setTagString($tagString)
-  {
-    $this->tagString = $tagString;
-  }
-  public function getTagString()
-  {
-    return $this->tagString;
-  }
-  public function setType($type)
-  {
-    $this->type = $type;
-  }
-  public function getType()
-  {
-    return $this->type;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/FloodlightActivityGroupsListResponse.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/FloodlightActivityGroupsListResponse.php
deleted file mode 100644
index 82def03b..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/FloodlightActivityGroupsListResponse.php
+++ /dev/null
@@ -1,50 +0,0 @@
-floodlightActivityGroups = $floodlightActivityGroups;
-  }
-  public function getFloodlightActivityGroups()
-  {
-    return $this->floodlightActivityGroups;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setNextPageToken($nextPageToken)
-  {
-    $this->nextPageToken = $nextPageToken;
-  }
-  public function getNextPageToken()
-  {
-    return $this->nextPageToken;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/FloodlightActivityPublisherDynamicTag.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/FloodlightActivityPublisherDynamicTag.php
deleted file mode 100644
index 032b96fc..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/FloodlightActivityPublisherDynamicTag.php
+++ /dev/null
@@ -1,77 +0,0 @@
-clickThrough = $clickThrough;
-  }
-  public function getClickThrough()
-  {
-    return $this->clickThrough;
-  }
-  public function setDirectorySiteId($directorySiteId)
-  {
-    $this->directorySiteId = $directorySiteId;
-  }
-  public function getDirectorySiteId()
-  {
-    return $this->directorySiteId;
-  }
-  public function setDynamicTag(Google_Service_Dfareporting_FloodlightActivityDynamicTag $dynamicTag)
-  {
-    $this->dynamicTag = $dynamicTag;
-  }
-  public function getDynamicTag()
-  {
-    return $this->dynamicTag;
-  }
-  public function setSiteId($siteId)
-  {
-    $this->siteId = $siteId;
-  }
-  public function getSiteId()
-  {
-    return $this->siteId;
-  }
-  public function setSiteIdDimensionValue(Google_Service_Dfareporting_DimensionValue $siteIdDimensionValue)
-  {
-    $this->siteIdDimensionValue = $siteIdDimensionValue;
-  }
-  public function getSiteIdDimensionValue()
-  {
-    return $this->siteIdDimensionValue;
-  }
-  public function setViewThrough($viewThrough)
-  {
-    $this->viewThrough = $viewThrough;
-  }
-  public function getViewThrough()
-  {
-    return $this->viewThrough;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/FloodlightConfiguration.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/FloodlightConfiguration.php
deleted file mode 100644
index b923bd2d..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/FloodlightConfiguration.php
+++ /dev/null
@@ -1,191 +0,0 @@
-accountId = $accountId;
-  }
-  public function getAccountId()
-  {
-    return $this->accountId;
-  }
-  public function setAdvertiserId($advertiserId)
-  {
-    $this->advertiserId = $advertiserId;
-  }
-  public function getAdvertiserId()
-  {
-    return $this->advertiserId;
-  }
-  public function setAdvertiserIdDimensionValue(Google_Service_Dfareporting_DimensionValue $advertiserIdDimensionValue)
-  {
-    $this->advertiserIdDimensionValue = $advertiserIdDimensionValue;
-  }
-  public function getAdvertiserIdDimensionValue()
-  {
-    return $this->advertiserIdDimensionValue;
-  }
-  public function setAnalyticsDataSharingEnabled($analyticsDataSharingEnabled)
-  {
-    $this->analyticsDataSharingEnabled = $analyticsDataSharingEnabled;
-  }
-  public function getAnalyticsDataSharingEnabled()
-  {
-    return $this->analyticsDataSharingEnabled;
-  }
-  public function setExposureToConversionEnabled($exposureToConversionEnabled)
-  {
-    $this->exposureToConversionEnabled = $exposureToConversionEnabled;
-  }
-  public function getExposureToConversionEnabled()
-  {
-    return $this->exposureToConversionEnabled;
-  }
-  public function setFirstDayOfWeek($firstDayOfWeek)
-  {
-    $this->firstDayOfWeek = $firstDayOfWeek;
-  }
-  public function getFirstDayOfWeek()
-  {
-    return $this->firstDayOfWeek;
-  }
-  public function setId($id)
-  {
-    $this->id = $id;
-  }
-  public function getId()
-  {
-    return $this->id;
-  }
-  public function setIdDimensionValue(Google_Service_Dfareporting_DimensionValue $idDimensionValue)
-  {
-    $this->idDimensionValue = $idDimensionValue;
-  }
-  public function getIdDimensionValue()
-  {
-    return $this->idDimensionValue;
-  }
-  public function setInAppAttributionTrackingEnabled($inAppAttributionTrackingEnabled)
-  {
-    $this->inAppAttributionTrackingEnabled = $inAppAttributionTrackingEnabled;
-  }
-  public function getInAppAttributionTrackingEnabled()
-  {
-    return $this->inAppAttributionTrackingEnabled;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setLookbackConfiguration(Google_Service_Dfareporting_LookbackConfiguration $lookbackConfiguration)
-  {
-    $this->lookbackConfiguration = $lookbackConfiguration;
-  }
-  public function getLookbackConfiguration()
-  {
-    return $this->lookbackConfiguration;
-  }
-  public function setNaturalSearchConversionAttributionOption($naturalSearchConversionAttributionOption)
-  {
-    $this->naturalSearchConversionAttributionOption = $naturalSearchConversionAttributionOption;
-  }
-  public function getNaturalSearchConversionAttributionOption()
-  {
-    return $this->naturalSearchConversionAttributionOption;
-  }
-  public function setOmnitureSettings(Google_Service_Dfareporting_OmnitureSettings $omnitureSettings)
-  {
-    $this->omnitureSettings = $omnitureSettings;
-  }
-  public function getOmnitureSettings()
-  {
-    return $this->omnitureSettings;
-  }
-  public function setStandardVariableTypes($standardVariableTypes)
-  {
-    $this->standardVariableTypes = $standardVariableTypes;
-  }
-  public function getStandardVariableTypes()
-  {
-    return $this->standardVariableTypes;
-  }
-  public function setSubaccountId($subaccountId)
-  {
-    $this->subaccountId = $subaccountId;
-  }
-  public function getSubaccountId()
-  {
-    return $this->subaccountId;
-  }
-  public function setTagSettings(Google_Service_Dfareporting_TagSettings $tagSettings)
-  {
-    $this->tagSettings = $tagSettings;
-  }
-  public function getTagSettings()
-  {
-    return $this->tagSettings;
-  }
-  public function setThirdPartyAuthenticationTokens($thirdPartyAuthenticationTokens)
-  {
-    $this->thirdPartyAuthenticationTokens = $thirdPartyAuthenticationTokens;
-  }
-  public function getThirdPartyAuthenticationTokens()
-  {
-    return $this->thirdPartyAuthenticationTokens;
-  }
-  public function setUserDefinedVariableConfigurations($userDefinedVariableConfigurations)
-  {
-    $this->userDefinedVariableConfigurations = $userDefinedVariableConfigurations;
-  }
-  public function getUserDefinedVariableConfigurations()
-  {
-    return $this->userDefinedVariableConfigurations;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/FloodlightConfigurationsListResponse.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/FloodlightConfigurationsListResponse.php
deleted file mode 100644
index 18e68ca7..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/FloodlightConfigurationsListResponse.php
+++ /dev/null
@@ -1,41 +0,0 @@
-floodlightConfigurations = $floodlightConfigurations;
-  }
-  public function getFloodlightConfigurations()
-  {
-    return $this->floodlightConfigurations;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/FloodlightReportCompatibleFields.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/FloodlightReportCompatibleFields.php
deleted file mode 100644
index 9e9de516..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/FloodlightReportCompatibleFields.php
+++ /dev/null
@@ -1,61 +0,0 @@
-dimensionFilters = $dimensionFilters;
-  }
-  public function getDimensionFilters()
-  {
-    return $this->dimensionFilters;
-  }
-  public function setDimensions($dimensions)
-  {
-    $this->dimensions = $dimensions;
-  }
-  public function getDimensions()
-  {
-    return $this->dimensions;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setMetrics($metrics)
-  {
-    $this->metrics = $metrics;
-  }
-  public function getMetrics()
-  {
-    return $this->metrics;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/FrequencyCap.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/FrequencyCap.php
deleted file mode 100644
index 575b905e..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/FrequencyCap.php
+++ /dev/null
@@ -1,39 +0,0 @@
-duration = $duration;
-  }
-  public function getDuration()
-  {
-    return $this->duration;
-  }
-  public function setImpressions($impressions)
-  {
-    $this->impressions = $impressions;
-  }
-  public function getImpressions()
-  {
-    return $this->impressions;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/FsCommand.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/FsCommand.php
deleted file mode 100644
index 1dc4c0c9..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/FsCommand.php
+++ /dev/null
@@ -1,66 +0,0 @@
-left = $left;
-  }
-  public function getLeft()
-  {
-    return $this->left;
-  }
-  public function setPositionOption($positionOption)
-  {
-    $this->positionOption = $positionOption;
-  }
-  public function getPositionOption()
-  {
-    return $this->positionOption;
-  }
-  public function setTop($top)
-  {
-    $this->top = $top;
-  }
-  public function getTop()
-  {
-    return $this->top;
-  }
-  public function setWindowHeight($windowHeight)
-  {
-    $this->windowHeight = $windowHeight;
-  }
-  public function getWindowHeight()
-  {
-    return $this->windowHeight;
-  }
-  public function setWindowWidth($windowWidth)
-  {
-    $this->windowWidth = $windowWidth;
-  }
-  public function getWindowWidth()
-  {
-    return $this->windowWidth;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/GeoTargeting.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/GeoTargeting.php
deleted file mode 100644
index 164960f6..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/GeoTargeting.php
+++ /dev/null
@@ -1,81 +0,0 @@
-cities = $cities;
-  }
-  public function getCities()
-  {
-    return $this->cities;
-  }
-  public function setCountries($countries)
-  {
-    $this->countries = $countries;
-  }
-  public function getCountries()
-  {
-    return $this->countries;
-  }
-  public function setExcludeCountries($excludeCountries)
-  {
-    $this->excludeCountries = $excludeCountries;
-  }
-  public function getExcludeCountries()
-  {
-    return $this->excludeCountries;
-  }
-  public function setMetros($metros)
-  {
-    $this->metros = $metros;
-  }
-  public function getMetros()
-  {
-    return $this->metros;
-  }
-  public function setPostalCodes($postalCodes)
-  {
-    $this->postalCodes = $postalCodes;
-  }
-  public function getPostalCodes()
-  {
-    return $this->postalCodes;
-  }
-  public function setRegions($regions)
-  {
-    $this->regions = $regions;
-  }
-  public function getRegions()
-  {
-    return $this->regions;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/InventoryItem.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/InventoryItem.php
deleted file mode 100644
index 560ea238..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/InventoryItem.php
+++ /dev/null
@@ -1,205 +0,0 @@
-accountId = $accountId;
-  }
-  public function getAccountId()
-  {
-    return $this->accountId;
-  }
-  public function setAdSlots($adSlots)
-  {
-    $this->adSlots = $adSlots;
-  }
-  public function getAdSlots()
-  {
-    return $this->adSlots;
-  }
-  public function setAdvertiserId($advertiserId)
-  {
-    $this->advertiserId = $advertiserId;
-  }
-  public function getAdvertiserId()
-  {
-    return $this->advertiserId;
-  }
-  public function setContentCategoryId($contentCategoryId)
-  {
-    $this->contentCategoryId = $contentCategoryId;
-  }
-  public function getContentCategoryId()
-  {
-    return $this->contentCategoryId;
-  }
-  public function setEstimatedClickThroughRate($estimatedClickThroughRate)
-  {
-    $this->estimatedClickThroughRate = $estimatedClickThroughRate;
-  }
-  public function getEstimatedClickThroughRate()
-  {
-    return $this->estimatedClickThroughRate;
-  }
-  public function setEstimatedConversionRate($estimatedConversionRate)
-  {
-    $this->estimatedConversionRate = $estimatedConversionRate;
-  }
-  public function getEstimatedConversionRate()
-  {
-    return $this->estimatedConversionRate;
-  }
-  public function setId($id)
-  {
-    $this->id = $id;
-  }
-  public function getId()
-  {
-    return $this->id;
-  }
-  public function setInPlan($inPlan)
-  {
-    $this->inPlan = $inPlan;
-  }
-  public function getInPlan()
-  {
-    return $this->inPlan;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setLastModifiedInfo(Google_Service_Dfareporting_LastModifiedInfo $lastModifiedInfo)
-  {
-    $this->lastModifiedInfo = $lastModifiedInfo;
-  }
-  public function getLastModifiedInfo()
-  {
-    return $this->lastModifiedInfo;
-  }
-  public function setName($name)
-  {
-    $this->name = $name;
-  }
-  public function getName()
-  {
-    return $this->name;
-  }
-  public function setNegotiationChannelId($negotiationChannelId)
-  {
-    $this->negotiationChannelId = $negotiationChannelId;
-  }
-  public function getNegotiationChannelId()
-  {
-    return $this->negotiationChannelId;
-  }
-  public function setOrderId($orderId)
-  {
-    $this->orderId = $orderId;
-  }
-  public function getOrderId()
-  {
-    return $this->orderId;
-  }
-  public function setPlacementStrategyId($placementStrategyId)
-  {
-    $this->placementStrategyId = $placementStrategyId;
-  }
-  public function getPlacementStrategyId()
-  {
-    return $this->placementStrategyId;
-  }
-  public function setPricing(Google_Service_Dfareporting_Pricing $pricing)
-  {
-    $this->pricing = $pricing;
-  }
-  public function getPricing()
-  {
-    return $this->pricing;
-  }
-  public function setProjectId($projectId)
-  {
-    $this->projectId = $projectId;
-  }
-  public function getProjectId()
-  {
-    return $this->projectId;
-  }
-  public function setRfpId($rfpId)
-  {
-    $this->rfpId = $rfpId;
-  }
-  public function getRfpId()
-  {
-    return $this->rfpId;
-  }
-  public function setSiteId($siteId)
-  {
-    $this->siteId = $siteId;
-  }
-  public function getSiteId()
-  {
-    return $this->siteId;
-  }
-  public function setSubaccountId($subaccountId)
-  {
-    $this->subaccountId = $subaccountId;
-  }
-  public function getSubaccountId()
-  {
-    return $this->subaccountId;
-  }
-  public function setType($type)
-  {
-    $this->type = $type;
-  }
-  public function getType()
-  {
-    return $this->type;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/InventoryItemsListResponse.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/InventoryItemsListResponse.php
deleted file mode 100644
index 07824ba3..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/InventoryItemsListResponse.php
+++ /dev/null
@@ -1,50 +0,0 @@
-inventoryItems = $inventoryItems;
-  }
-  public function getInventoryItems()
-  {
-    return $this->inventoryItems;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setNextPageToken($nextPageToken)
-  {
-    $this->nextPageToken = $nextPageToken;
-  }
-  public function getNextPageToken()
-  {
-    return $this->nextPageToken;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/KeyValueTargetingExpression.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/KeyValueTargetingExpression.php
deleted file mode 100644
index cce2661b..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/KeyValueTargetingExpression.php
+++ /dev/null
@@ -1,30 +0,0 @@
-expression = $expression;
-  }
-  public function getExpression()
-  {
-    return $this->expression;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/LandingPage.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/LandingPage.php
deleted file mode 100644
index b5156804..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/LandingPage.php
+++ /dev/null
@@ -1,66 +0,0 @@
-default = $default;
-  }
-  public function getDefault()
-  {
-    return $this->default;
-  }
-  public function setId($id)
-  {
-    $this->id = $id;
-  }
-  public function getId()
-  {
-    return $this->id;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setName($name)
-  {
-    $this->name = $name;
-  }
-  public function getName()
-  {
-    return $this->name;
-  }
-  public function setUrl($url)
-  {
-    $this->url = $url;
-  }
-  public function getUrl()
-  {
-    return $this->url;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/LandingPagesListResponse.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/LandingPagesListResponse.php
deleted file mode 100644
index b402046f..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/LandingPagesListResponse.php
+++ /dev/null
@@ -1,41 +0,0 @@
-kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setLandingPages($landingPages)
-  {
-    $this->landingPages = $landingPages;
-  }
-  public function getLandingPages()
-  {
-    return $this->landingPages;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/Language.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/Language.php
deleted file mode 100644
index e9ebe424..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/Language.php
+++ /dev/null
@@ -1,57 +0,0 @@
-id = $id;
-  }
-  public function getId()
-  {
-    return $this->id;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setLanguageCode($languageCode)
-  {
-    $this->languageCode = $languageCode;
-  }
-  public function getLanguageCode()
-  {
-    return $this->languageCode;
-  }
-  public function setName($name)
-  {
-    $this->name = $name;
-  }
-  public function getName()
-  {
-    return $this->name;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/LanguageTargeting.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/LanguageTargeting.php
deleted file mode 100644
index 3d375866..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/LanguageTargeting.php
+++ /dev/null
@@ -1,32 +0,0 @@
-languages = $languages;
-  }
-  public function getLanguages()
-  {
-    return $this->languages;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/LanguagesListResponse.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/LanguagesListResponse.php
deleted file mode 100644
index db2ea185..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/LanguagesListResponse.php
+++ /dev/null
@@ -1,41 +0,0 @@
-kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setLanguages($languages)
-  {
-    $this->languages = $languages;
-  }
-  public function getLanguages()
-  {
-    return $this->languages;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/LastModifiedInfo.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/LastModifiedInfo.php
deleted file mode 100644
index 985e97f9..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/LastModifiedInfo.php
+++ /dev/null
@@ -1,30 +0,0 @@
-time = $time;
-  }
-  public function getTime()
-  {
-    return $this->time;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/ListPopulationClause.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/ListPopulationClause.php
deleted file mode 100644
index c5b1cd25..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/ListPopulationClause.php
+++ /dev/null
@@ -1,32 +0,0 @@
-terms = $terms;
-  }
-  public function getTerms()
-  {
-    return $this->terms;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/ListPopulationRule.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/ListPopulationRule.php
deleted file mode 100644
index 3841c63c..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/ListPopulationRule.php
+++ /dev/null
@@ -1,50 +0,0 @@
-floodlightActivityId = $floodlightActivityId;
-  }
-  public function getFloodlightActivityId()
-  {
-    return $this->floodlightActivityId;
-  }
-  public function setFloodlightActivityName($floodlightActivityName)
-  {
-    $this->floodlightActivityName = $floodlightActivityName;
-  }
-  public function getFloodlightActivityName()
-  {
-    return $this->floodlightActivityName;
-  }
-  public function setListPopulationClauses($listPopulationClauses)
-  {
-    $this->listPopulationClauses = $listPopulationClauses;
-  }
-  public function getListPopulationClauses()
-  {
-    return $this->listPopulationClauses;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/ListPopulationTerm.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/ListPopulationTerm.php
deleted file mode 100644
index 54f358ff..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/ListPopulationTerm.php
+++ /dev/null
@@ -1,93 +0,0 @@
-contains = $contains;
-  }
-  public function getContains()
-  {
-    return $this->contains;
-  }
-  public function setNegation($negation)
-  {
-    $this->negation = $negation;
-  }
-  public function getNegation()
-  {
-    return $this->negation;
-  }
-  public function setOperator($operator)
-  {
-    $this->operator = $operator;
-  }
-  public function getOperator()
-  {
-    return $this->operator;
-  }
-  public function setRemarketingListId($remarketingListId)
-  {
-    $this->remarketingListId = $remarketingListId;
-  }
-  public function getRemarketingListId()
-  {
-    return $this->remarketingListId;
-  }
-  public function setType($type)
-  {
-    $this->type = $type;
-  }
-  public function getType()
-  {
-    return $this->type;
-  }
-  public function setValue($value)
-  {
-    $this->value = $value;
-  }
-  public function getValue()
-  {
-    return $this->value;
-  }
-  public function setVariableFriendlyName($variableFriendlyName)
-  {
-    $this->variableFriendlyName = $variableFriendlyName;
-  }
-  public function getVariableFriendlyName()
-  {
-    return $this->variableFriendlyName;
-  }
-  public function setVariableName($variableName)
-  {
-    $this->variableName = $variableName;
-  }
-  public function getVariableName()
-  {
-    return $this->variableName;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/ListTargetingExpression.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/ListTargetingExpression.php
deleted file mode 100644
index b8ae7dca..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/ListTargetingExpression.php
+++ /dev/null
@@ -1,30 +0,0 @@
-expression = $expression;
-  }
-  public function getExpression()
-  {
-    return $this->expression;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/LookbackConfiguration.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/LookbackConfiguration.php
deleted file mode 100644
index 75529d53..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/LookbackConfiguration.php
+++ /dev/null
@@ -1,39 +0,0 @@
-clickDuration = $clickDuration;
-  }
-  public function getClickDuration()
-  {
-    return $this->clickDuration;
-  }
-  public function setPostImpressionActivitiesDuration($postImpressionActivitiesDuration)
-  {
-    $this->postImpressionActivitiesDuration = $postImpressionActivitiesDuration;
-  }
-  public function getPostImpressionActivitiesDuration()
-  {
-    return $this->postImpressionActivitiesDuration;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/Metric.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/Metric.php
deleted file mode 100644
index 9b2ea3a1..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/Metric.php
+++ /dev/null
@@ -1,39 +0,0 @@
-kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setName($name)
-  {
-    $this->name = $name;
-  }
-  public function getName()
-  {
-    return $this->name;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/Metro.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/Metro.php
deleted file mode 100644
index 4234051c..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/Metro.php
+++ /dev/null
@@ -1,84 +0,0 @@
-countryCode = $countryCode;
-  }
-  public function getCountryCode()
-  {
-    return $this->countryCode;
-  }
-  public function setCountryDartId($countryDartId)
-  {
-    $this->countryDartId = $countryDartId;
-  }
-  public function getCountryDartId()
-  {
-    return $this->countryDartId;
-  }
-  public function setDartId($dartId)
-  {
-    $this->dartId = $dartId;
-  }
-  public function getDartId()
-  {
-    return $this->dartId;
-  }
-  public function setDmaId($dmaId)
-  {
-    $this->dmaId = $dmaId;
-  }
-  public function getDmaId()
-  {
-    return $this->dmaId;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setMetroCode($metroCode)
-  {
-    $this->metroCode = $metroCode;
-  }
-  public function getMetroCode()
-  {
-    return $this->metroCode;
-  }
-  public function setName($name)
-  {
-    $this->name = $name;
-  }
-  public function getName()
-  {
-    return $this->name;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/MetrosListResponse.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/MetrosListResponse.php
deleted file mode 100644
index 5378847f..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/MetrosListResponse.php
+++ /dev/null
@@ -1,41 +0,0 @@
-kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setMetros($metros)
-  {
-    $this->metros = $metros;
-  }
-  public function getMetros()
-  {
-    return $this->metros;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/MobileCarrier.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/MobileCarrier.php
deleted file mode 100644
index 952922d2..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/MobileCarrier.php
+++ /dev/null
@@ -1,66 +0,0 @@
-countryCode = $countryCode;
-  }
-  public function getCountryCode()
-  {
-    return $this->countryCode;
-  }
-  public function setCountryDartId($countryDartId)
-  {
-    $this->countryDartId = $countryDartId;
-  }
-  public function getCountryDartId()
-  {
-    return $this->countryDartId;
-  }
-  public function setId($id)
-  {
-    $this->id = $id;
-  }
-  public function getId()
-  {
-    return $this->id;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setName($name)
-  {
-    $this->name = $name;
-  }
-  public function getName()
-  {
-    return $this->name;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/MobileCarriersListResponse.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/MobileCarriersListResponse.php
deleted file mode 100644
index f330ea60..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/MobileCarriersListResponse.php
+++ /dev/null
@@ -1,41 +0,0 @@
-kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setMobileCarriers($mobileCarriers)
-  {
-    $this->mobileCarriers = $mobileCarriers;
-  }
-  public function getMobileCarriers()
-  {
-    return $this->mobileCarriers;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/ObjectFilter.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/ObjectFilter.php
deleted file mode 100644
index a61bb339..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/ObjectFilter.php
+++ /dev/null
@@ -1,49 +0,0 @@
-kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setObjectIds($objectIds)
-  {
-    $this->objectIds = $objectIds;
-  }
-  public function getObjectIds()
-  {
-    return $this->objectIds;
-  }
-  public function setStatus($status)
-  {
-    $this->status = $status;
-  }
-  public function getStatus()
-  {
-    return $this->status;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/OffsetPosition.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/OffsetPosition.php
deleted file mode 100644
index f91e3df4..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/OffsetPosition.php
+++ /dev/null
@@ -1,39 +0,0 @@
-left = $left;
-  }
-  public function getLeft()
-  {
-    return $this->left;
-  }
-  public function setTop($top)
-  {
-    $this->top = $top;
-  }
-  public function getTop()
-  {
-    return $this->top;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/OmnitureSettings.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/OmnitureSettings.php
deleted file mode 100644
index 461af1f4..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/OmnitureSettings.php
+++ /dev/null
@@ -1,39 +0,0 @@
-omnitureCostDataEnabled = $omnitureCostDataEnabled;
-  }
-  public function getOmnitureCostDataEnabled()
-  {
-    return $this->omnitureCostDataEnabled;
-  }
-  public function setOmnitureIntegrationEnabled($omnitureIntegrationEnabled)
-  {
-    $this->omnitureIntegrationEnabled = $omnitureIntegrationEnabled;
-  }
-  public function getOmnitureIntegrationEnabled()
-  {
-    return $this->omnitureIntegrationEnabled;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/OperatingSystem.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/OperatingSystem.php
deleted file mode 100644
index 90d0b79b..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/OperatingSystem.php
+++ /dev/null
@@ -1,66 +0,0 @@
-dartId = $dartId;
-  }
-  public function getDartId()
-  {
-    return $this->dartId;
-  }
-  public function setDesktop($desktop)
-  {
-    $this->desktop = $desktop;
-  }
-  public function getDesktop()
-  {
-    return $this->desktop;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setMobile($mobile)
-  {
-    $this->mobile = $mobile;
-  }
-  public function getMobile()
-  {
-    return $this->mobile;
-  }
-  public function setName($name)
-  {
-    $this->name = $name;
-  }
-  public function getName()
-  {
-    return $this->name;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/OperatingSystemVersion.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/OperatingSystemVersion.php
deleted file mode 100644
index f033d258..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/OperatingSystemVersion.php
+++ /dev/null
@@ -1,76 +0,0 @@
-id = $id;
-  }
-  public function getId()
-  {
-    return $this->id;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setMajorVersion($majorVersion)
-  {
-    $this->majorVersion = $majorVersion;
-  }
-  public function getMajorVersion()
-  {
-    return $this->majorVersion;
-  }
-  public function setMinorVersion($minorVersion)
-  {
-    $this->minorVersion = $minorVersion;
-  }
-  public function getMinorVersion()
-  {
-    return $this->minorVersion;
-  }
-  public function setName($name)
-  {
-    $this->name = $name;
-  }
-  public function getName()
-  {
-    return $this->name;
-  }
-  public function setOperatingSystem(Google_Service_Dfareporting_OperatingSystem $operatingSystem)
-  {
-    $this->operatingSystem = $operatingSystem;
-  }
-  public function getOperatingSystem()
-  {
-    return $this->operatingSystem;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/OperatingSystemVersionsListResponse.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/OperatingSystemVersionsListResponse.php
deleted file mode 100644
index e6930897..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/OperatingSystemVersionsListResponse.php
+++ /dev/null
@@ -1,41 +0,0 @@
-kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setOperatingSystemVersions($operatingSystemVersions)
-  {
-    $this->operatingSystemVersions = $operatingSystemVersions;
-  }
-  public function getOperatingSystemVersions()
-  {
-    return $this->operatingSystemVersions;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/OperatingSystemsListResponse.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/OperatingSystemsListResponse.php
deleted file mode 100644
index bdcc6a28..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/OperatingSystemsListResponse.php
+++ /dev/null
@@ -1,41 +0,0 @@
-kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setOperatingSystems($operatingSystems)
-  {
-    $this->operatingSystems = $operatingSystems;
-  }
-  public function getOperatingSystems()
-  {
-    return $this->operatingSystems;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/OptimizationActivity.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/OptimizationActivity.php
deleted file mode 100644
index f9539cde..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/OptimizationActivity.php
+++ /dev/null
@@ -1,49 +0,0 @@
-floodlightActivityId = $floodlightActivityId;
-  }
-  public function getFloodlightActivityId()
-  {
-    return $this->floodlightActivityId;
-  }
-  public function setFloodlightActivityIdDimensionValue(Google_Service_Dfareporting_DimensionValue $floodlightActivityIdDimensionValue)
-  {
-    $this->floodlightActivityIdDimensionValue = $floodlightActivityIdDimensionValue;
-  }
-  public function getFloodlightActivityIdDimensionValue()
-  {
-    return $this->floodlightActivityIdDimensionValue;
-  }
-  public function setWeight($weight)
-  {
-    $this->weight = $weight;
-  }
-  public function getWeight()
-  {
-    return $this->weight;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/Order.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/Order.php
deleted file mode 100644
index da665f4f..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/Order.php
+++ /dev/null
@@ -1,204 +0,0 @@
-accountId = $accountId;
-  }
-  public function getAccountId()
-  {
-    return $this->accountId;
-  }
-  public function setAdvertiserId($advertiserId)
-  {
-    $this->advertiserId = $advertiserId;
-  }
-  public function getAdvertiserId()
-  {
-    return $this->advertiserId;
-  }
-  public function setApproverUserProfileIds($approverUserProfileIds)
-  {
-    $this->approverUserProfileIds = $approverUserProfileIds;
-  }
-  public function getApproverUserProfileIds()
-  {
-    return $this->approverUserProfileIds;
-  }
-  public function setBuyerInvoiceId($buyerInvoiceId)
-  {
-    $this->buyerInvoiceId = $buyerInvoiceId;
-  }
-  public function getBuyerInvoiceId()
-  {
-    return $this->buyerInvoiceId;
-  }
-  public function setBuyerOrganizationName($buyerOrganizationName)
-  {
-    $this->buyerOrganizationName = $buyerOrganizationName;
-  }
-  public function getBuyerOrganizationName()
-  {
-    return $this->buyerOrganizationName;
-  }
-  public function setComments($comments)
-  {
-    $this->comments = $comments;
-  }
-  public function getComments()
-  {
-    return $this->comments;
-  }
-  public function setContacts($contacts)
-  {
-    $this->contacts = $contacts;
-  }
-  public function getContacts()
-  {
-    return $this->contacts;
-  }
-  public function setId($id)
-  {
-    $this->id = $id;
-  }
-  public function getId()
-  {
-    return $this->id;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setLastModifiedInfo(Google_Service_Dfareporting_LastModifiedInfo $lastModifiedInfo)
-  {
-    $this->lastModifiedInfo = $lastModifiedInfo;
-  }
-  public function getLastModifiedInfo()
-  {
-    return $this->lastModifiedInfo;
-  }
-  public function setName($name)
-  {
-    $this->name = $name;
-  }
-  public function getName()
-  {
-    return $this->name;
-  }
-  public function setNotes($notes)
-  {
-    $this->notes = $notes;
-  }
-  public function getNotes()
-  {
-    return $this->notes;
-  }
-  public function setPlanningTermId($planningTermId)
-  {
-    $this->planningTermId = $planningTermId;
-  }
-  public function getPlanningTermId()
-  {
-    return $this->planningTermId;
-  }
-  public function setProjectId($projectId)
-  {
-    $this->projectId = $projectId;
-  }
-  public function getProjectId()
-  {
-    return $this->projectId;
-  }
-  public function setSellerOrderId($sellerOrderId)
-  {
-    $this->sellerOrderId = $sellerOrderId;
-  }
-  public function getSellerOrderId()
-  {
-    return $this->sellerOrderId;
-  }
-  public function setSellerOrganizationName($sellerOrganizationName)
-  {
-    $this->sellerOrganizationName = $sellerOrganizationName;
-  }
-  public function getSellerOrganizationName()
-  {
-    return $this->sellerOrganizationName;
-  }
-  public function setSiteId($siteId)
-  {
-    $this->siteId = $siteId;
-  }
-  public function getSiteId()
-  {
-    return $this->siteId;
-  }
-  public function setSiteNames($siteNames)
-  {
-    $this->siteNames = $siteNames;
-  }
-  public function getSiteNames()
-  {
-    return $this->siteNames;
-  }
-  public function setSubaccountId($subaccountId)
-  {
-    $this->subaccountId = $subaccountId;
-  }
-  public function getSubaccountId()
-  {
-    return $this->subaccountId;
-  }
-  public function setTermsAndConditions($termsAndConditions)
-  {
-    $this->termsAndConditions = $termsAndConditions;
-  }
-  public function getTermsAndConditions()
-  {
-    return $this->termsAndConditions;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/OrderContact.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/OrderContact.php
deleted file mode 100644
index 2166196f..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/OrderContact.php
+++ /dev/null
@@ -1,66 +0,0 @@
-contactInfo = $contactInfo;
-  }
-  public function getContactInfo()
-  {
-    return $this->contactInfo;
-  }
-  public function setContactName($contactName)
-  {
-    $this->contactName = $contactName;
-  }
-  public function getContactName()
-  {
-    return $this->contactName;
-  }
-  public function setContactTitle($contactTitle)
-  {
-    $this->contactTitle = $contactTitle;
-  }
-  public function getContactTitle()
-  {
-    return $this->contactTitle;
-  }
-  public function setContactType($contactType)
-  {
-    $this->contactType = $contactType;
-  }
-  public function getContactType()
-  {
-    return $this->contactType;
-  }
-  public function setSignatureUserProfileId($signatureUserProfileId)
-  {
-    $this->signatureUserProfileId = $signatureUserProfileId;
-  }
-  public function getSignatureUserProfileId()
-  {
-    return $this->signatureUserProfileId;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/OrderDocument.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/OrderDocument.php
deleted file mode 100644
index a7a26bf4..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/OrderDocument.php
+++ /dev/null
@@ -1,176 +0,0 @@
-accountId = $accountId;
-  }
-  public function getAccountId()
-  {
-    return $this->accountId;
-  }
-  public function setAdvertiserId($advertiserId)
-  {
-    $this->advertiserId = $advertiserId;
-  }
-  public function getAdvertiserId()
-  {
-    return $this->advertiserId;
-  }
-  public function setAmendedOrderDocumentId($amendedOrderDocumentId)
-  {
-    $this->amendedOrderDocumentId = $amendedOrderDocumentId;
-  }
-  public function getAmendedOrderDocumentId()
-  {
-    return $this->amendedOrderDocumentId;
-  }
-  public function setApprovedByUserProfileIds($approvedByUserProfileIds)
-  {
-    $this->approvedByUserProfileIds = $approvedByUserProfileIds;
-  }
-  public function getApprovedByUserProfileIds()
-  {
-    return $this->approvedByUserProfileIds;
-  }
-  public function setCancelled($cancelled)
-  {
-    $this->cancelled = $cancelled;
-  }
-  public function getCancelled()
-  {
-    return $this->cancelled;
-  }
-  public function setCreatedInfo(Google_Service_Dfareporting_LastModifiedInfo $createdInfo)
-  {
-    $this->createdInfo = $createdInfo;
-  }
-  public function getCreatedInfo()
-  {
-    return $this->createdInfo;
-  }
-  public function setEffectiveDate($effectiveDate)
-  {
-    $this->effectiveDate = $effectiveDate;
-  }
-  public function getEffectiveDate()
-  {
-    return $this->effectiveDate;
-  }
-  public function setId($id)
-  {
-    $this->id = $id;
-  }
-  public function getId()
-  {
-    return $this->id;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setLastSentRecipients($lastSentRecipients)
-  {
-    $this->lastSentRecipients = $lastSentRecipients;
-  }
-  public function getLastSentRecipients()
-  {
-    return $this->lastSentRecipients;
-  }
-  public function setLastSentTime($lastSentTime)
-  {
-    $this->lastSentTime = $lastSentTime;
-  }
-  public function getLastSentTime()
-  {
-    return $this->lastSentTime;
-  }
-  public function setOrderId($orderId)
-  {
-    $this->orderId = $orderId;
-  }
-  public function getOrderId()
-  {
-    return $this->orderId;
-  }
-  public function setProjectId($projectId)
-  {
-    $this->projectId = $projectId;
-  }
-  public function getProjectId()
-  {
-    return $this->projectId;
-  }
-  public function setSigned($signed)
-  {
-    $this->signed = $signed;
-  }
-  public function getSigned()
-  {
-    return $this->signed;
-  }
-  public function setSubaccountId($subaccountId)
-  {
-    $this->subaccountId = $subaccountId;
-  }
-  public function getSubaccountId()
-  {
-    return $this->subaccountId;
-  }
-  public function setTitle($title)
-  {
-    $this->title = $title;
-  }
-  public function getTitle()
-  {
-    return $this->title;
-  }
-  public function setType($type)
-  {
-    $this->type = $type;
-  }
-  public function getType()
-  {
-    return $this->type;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/OrderDocumentsListResponse.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/OrderDocumentsListResponse.php
deleted file mode 100644
index 63a41b30..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/OrderDocumentsListResponse.php
+++ /dev/null
@@ -1,50 +0,0 @@
-kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setNextPageToken($nextPageToken)
-  {
-    $this->nextPageToken = $nextPageToken;
-  }
-  public function getNextPageToken()
-  {
-    return $this->nextPageToken;
-  }
-  public function setOrderDocuments($orderDocuments)
-  {
-    $this->orderDocuments = $orderDocuments;
-  }
-  public function getOrderDocuments()
-  {
-    return $this->orderDocuments;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/OrdersListResponse.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/OrdersListResponse.php
deleted file mode 100644
index e90bee1a..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/OrdersListResponse.php
+++ /dev/null
@@ -1,50 +0,0 @@
-kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setNextPageToken($nextPageToken)
-  {
-    $this->nextPageToken = $nextPageToken;
-  }
-  public function getNextPageToken()
-  {
-    return $this->nextPageToken;
-  }
-  public function setOrders($orders)
-  {
-    $this->orders = $orders;
-  }
-  public function getOrders()
-  {
-    return $this->orders;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/PathToConversionReportCompatibleFields.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/PathToConversionReportCompatibleFields.php
deleted file mode 100644
index 8583dd86..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/PathToConversionReportCompatibleFields.php
+++ /dev/null
@@ -1,71 +0,0 @@
-conversionDimensions = $conversionDimensions;
-  }
-  public function getConversionDimensions()
-  {
-    return $this->conversionDimensions;
-  }
-  public function setCustomFloodlightVariables($customFloodlightVariables)
-  {
-    $this->customFloodlightVariables = $customFloodlightVariables;
-  }
-  public function getCustomFloodlightVariables()
-  {
-    return $this->customFloodlightVariables;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setMetrics($metrics)
-  {
-    $this->metrics = $metrics;
-  }
-  public function getMetrics()
-  {
-    return $this->metrics;
-  }
-  public function setPerInteractionDimensions($perInteractionDimensions)
-  {
-    $this->perInteractionDimensions = $perInteractionDimensions;
-  }
-  public function getPerInteractionDimensions()
-  {
-    return $this->perInteractionDimensions;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/Placement.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/Placement.php
deleted file mode 100644
index ffb824ce..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/Placement.php
+++ /dev/null
@@ -1,387 +0,0 @@
-accountId = $accountId;
-  }
-  public function getAccountId()
-  {
-    return $this->accountId;
-  }
-  public function setAdvertiserId($advertiserId)
-  {
-    $this->advertiserId = $advertiserId;
-  }
-  public function getAdvertiserId()
-  {
-    return $this->advertiserId;
-  }
-  public function setAdvertiserIdDimensionValue(Google_Service_Dfareporting_DimensionValue $advertiserIdDimensionValue)
-  {
-    $this->advertiserIdDimensionValue = $advertiserIdDimensionValue;
-  }
-  public function getAdvertiserIdDimensionValue()
-  {
-    return $this->advertiserIdDimensionValue;
-  }
-  public function setArchived($archived)
-  {
-    $this->archived = $archived;
-  }
-  public function getArchived()
-  {
-    return $this->archived;
-  }
-  public function setCampaignId($campaignId)
-  {
-    $this->campaignId = $campaignId;
-  }
-  public function getCampaignId()
-  {
-    return $this->campaignId;
-  }
-  public function setCampaignIdDimensionValue(Google_Service_Dfareporting_DimensionValue $campaignIdDimensionValue)
-  {
-    $this->campaignIdDimensionValue = $campaignIdDimensionValue;
-  }
-  public function getCampaignIdDimensionValue()
-  {
-    return $this->campaignIdDimensionValue;
-  }
-  public function setComment($comment)
-  {
-    $this->comment = $comment;
-  }
-  public function getComment()
-  {
-    return $this->comment;
-  }
-  public function setCompatibility($compatibility)
-  {
-    $this->compatibility = $compatibility;
-  }
-  public function getCompatibility()
-  {
-    return $this->compatibility;
-  }
-  public function setContentCategoryId($contentCategoryId)
-  {
-    $this->contentCategoryId = $contentCategoryId;
-  }
-  public function getContentCategoryId()
-  {
-    return $this->contentCategoryId;
-  }
-  public function setCreateInfo(Google_Service_Dfareporting_LastModifiedInfo $createInfo)
-  {
-    $this->createInfo = $createInfo;
-  }
-  public function getCreateInfo()
-  {
-    return $this->createInfo;
-  }
-  public function setDirectorySiteId($directorySiteId)
-  {
-    $this->directorySiteId = $directorySiteId;
-  }
-  public function getDirectorySiteId()
-  {
-    return $this->directorySiteId;
-  }
-  public function setDirectorySiteIdDimensionValue(Google_Service_Dfareporting_DimensionValue $directorySiteIdDimensionValue)
-  {
-    $this->directorySiteIdDimensionValue = $directorySiteIdDimensionValue;
-  }
-  public function getDirectorySiteIdDimensionValue()
-  {
-    return $this->directorySiteIdDimensionValue;
-  }
-  public function setExternalId($externalId)
-  {
-    $this->externalId = $externalId;
-  }
-  public function getExternalId()
-  {
-    return $this->externalId;
-  }
-  public function setId($id)
-  {
-    $this->id = $id;
-  }
-  public function getId()
-  {
-    return $this->id;
-  }
-  public function setIdDimensionValue(Google_Service_Dfareporting_DimensionValue $idDimensionValue)
-  {
-    $this->idDimensionValue = $idDimensionValue;
-  }
-  public function getIdDimensionValue()
-  {
-    return $this->idDimensionValue;
-  }
-  public function setKeyName($keyName)
-  {
-    $this->keyName = $keyName;
-  }
-  public function getKeyName()
-  {
-    return $this->keyName;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setLastModifiedInfo(Google_Service_Dfareporting_LastModifiedInfo $lastModifiedInfo)
-  {
-    $this->lastModifiedInfo = $lastModifiedInfo;
-  }
-  public function getLastModifiedInfo()
-  {
-    return $this->lastModifiedInfo;
-  }
-  public function setLookbackConfiguration(Google_Service_Dfareporting_LookbackConfiguration $lookbackConfiguration)
-  {
-    $this->lookbackConfiguration = $lookbackConfiguration;
-  }
-  public function getLookbackConfiguration()
-  {
-    return $this->lookbackConfiguration;
-  }
-  public function setName($name)
-  {
-    $this->name = $name;
-  }
-  public function getName()
-  {
-    return $this->name;
-  }
-  public function setPaymentApproved($paymentApproved)
-  {
-    $this->paymentApproved = $paymentApproved;
-  }
-  public function getPaymentApproved()
-  {
-    return $this->paymentApproved;
-  }
-  public function setPaymentSource($paymentSource)
-  {
-    $this->paymentSource = $paymentSource;
-  }
-  public function getPaymentSource()
-  {
-    return $this->paymentSource;
-  }
-  public function setPlacementGroupId($placementGroupId)
-  {
-    $this->placementGroupId = $placementGroupId;
-  }
-  public function getPlacementGroupId()
-  {
-    return $this->placementGroupId;
-  }
-  public function setPlacementGroupIdDimensionValue(Google_Service_Dfareporting_DimensionValue $placementGroupIdDimensionValue)
-  {
-    $this->placementGroupIdDimensionValue = $placementGroupIdDimensionValue;
-  }
-  public function getPlacementGroupIdDimensionValue()
-  {
-    return $this->placementGroupIdDimensionValue;
-  }
-  public function setPlacementStrategyId($placementStrategyId)
-  {
-    $this->placementStrategyId = $placementStrategyId;
-  }
-  public function getPlacementStrategyId()
-  {
-    return $this->placementStrategyId;
-  }
-  public function setPricingSchedule(Google_Service_Dfareporting_PricingSchedule $pricingSchedule)
-  {
-    $this->pricingSchedule = $pricingSchedule;
-  }
-  public function getPricingSchedule()
-  {
-    return $this->pricingSchedule;
-  }
-  public function setPrimary($primary)
-  {
-    $this->primary = $primary;
-  }
-  public function getPrimary()
-  {
-    return $this->primary;
-  }
-  public function setPublisherUpdateInfo(Google_Service_Dfareporting_LastModifiedInfo $publisherUpdateInfo)
-  {
-    $this->publisherUpdateInfo = $publisherUpdateInfo;
-  }
-  public function getPublisherUpdateInfo()
-  {
-    return $this->publisherUpdateInfo;
-  }
-  public function setSiteId($siteId)
-  {
-    $this->siteId = $siteId;
-  }
-  public function getSiteId()
-  {
-    return $this->siteId;
-  }
-  public function setSiteIdDimensionValue(Google_Service_Dfareporting_DimensionValue $siteIdDimensionValue)
-  {
-    $this->siteIdDimensionValue = $siteIdDimensionValue;
-  }
-  public function getSiteIdDimensionValue()
-  {
-    return $this->siteIdDimensionValue;
-  }
-  public function setSize(Google_Service_Dfareporting_Size $size)
-  {
-    $this->size = $size;
-  }
-  public function getSize()
-  {
-    return $this->size;
-  }
-  public function setSslRequired($sslRequired)
-  {
-    $this->sslRequired = $sslRequired;
-  }
-  public function getSslRequired()
-  {
-    return $this->sslRequired;
-  }
-  public function setStatus($status)
-  {
-    $this->status = $status;
-  }
-  public function getStatus()
-  {
-    return $this->status;
-  }
-  public function setSubaccountId($subaccountId)
-  {
-    $this->subaccountId = $subaccountId;
-  }
-  public function getSubaccountId()
-  {
-    return $this->subaccountId;
-  }
-  public function setTagFormats($tagFormats)
-  {
-    $this->tagFormats = $tagFormats;
-  }
-  public function getTagFormats()
-  {
-    return $this->tagFormats;
-  }
-  public function setTagSetting(Google_Service_Dfareporting_TagSetting $tagSetting)
-  {
-    $this->tagSetting = $tagSetting;
-  }
-  public function getTagSetting()
-  {
-    return $this->tagSetting;
-  }
-  public function setVideoActiveViewOptOut($videoActiveViewOptOut)
-  {
-    $this->videoActiveViewOptOut = $videoActiveViewOptOut;
-  }
-  public function getVideoActiveViewOptOut()
-  {
-    return $this->videoActiveViewOptOut;
-  }
-  public function setVideoSettings(Google_Service_Dfareporting_VideoSettings $videoSettings)
-  {
-    $this->videoSettings = $videoSettings;
-  }
-  public function getVideoSettings()
-  {
-    return $this->videoSettings;
-  }
-  public function setVpaidAdapterChoice($vpaidAdapterChoice)
-  {
-    $this->vpaidAdapterChoice = $vpaidAdapterChoice;
-  }
-  public function getVpaidAdapterChoice()
-  {
-    return $this->vpaidAdapterChoice;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/PlacementAssignment.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/PlacementAssignment.php
deleted file mode 100644
index f19b7374..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/PlacementAssignment.php
+++ /dev/null
@@ -1,58 +0,0 @@
-active = $active;
-  }
-  public function getActive()
-  {
-    return $this->active;
-  }
-  public function setPlacementId($placementId)
-  {
-    $this->placementId = $placementId;
-  }
-  public function getPlacementId()
-  {
-    return $this->placementId;
-  }
-  public function setPlacementIdDimensionValue(Google_Service_Dfareporting_DimensionValue $placementIdDimensionValue)
-  {
-    $this->placementIdDimensionValue = $placementIdDimensionValue;
-  }
-  public function getPlacementIdDimensionValue()
-  {
-    return $this->placementIdDimensionValue;
-  }
-  public function setSslRequired($sslRequired)
-  {
-    $this->sslRequired = $sslRequired;
-  }
-  public function getSslRequired()
-  {
-    return $this->sslRequired;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/PlacementGroup.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/PlacementGroup.php
deleted file mode 100644
index 266a1cf6..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/PlacementGroup.php
+++ /dev/null
@@ -1,265 +0,0 @@
-accountId = $accountId;
-  }
-  public function getAccountId()
-  {
-    return $this->accountId;
-  }
-  public function setAdvertiserId($advertiserId)
-  {
-    $this->advertiserId = $advertiserId;
-  }
-  public function getAdvertiserId()
-  {
-    return $this->advertiserId;
-  }
-  public function setAdvertiserIdDimensionValue(Google_Service_Dfareporting_DimensionValue $advertiserIdDimensionValue)
-  {
-    $this->advertiserIdDimensionValue = $advertiserIdDimensionValue;
-  }
-  public function getAdvertiserIdDimensionValue()
-  {
-    return $this->advertiserIdDimensionValue;
-  }
-  public function setArchived($archived)
-  {
-    $this->archived = $archived;
-  }
-  public function getArchived()
-  {
-    return $this->archived;
-  }
-  public function setCampaignId($campaignId)
-  {
-    $this->campaignId = $campaignId;
-  }
-  public function getCampaignId()
-  {
-    return $this->campaignId;
-  }
-  public function setCampaignIdDimensionValue(Google_Service_Dfareporting_DimensionValue $campaignIdDimensionValue)
-  {
-    $this->campaignIdDimensionValue = $campaignIdDimensionValue;
-  }
-  public function getCampaignIdDimensionValue()
-  {
-    return $this->campaignIdDimensionValue;
-  }
-  public function setChildPlacementIds($childPlacementIds)
-  {
-    $this->childPlacementIds = $childPlacementIds;
-  }
-  public function getChildPlacementIds()
-  {
-    return $this->childPlacementIds;
-  }
-  public function setComment($comment)
-  {
-    $this->comment = $comment;
-  }
-  public function getComment()
-  {
-    return $this->comment;
-  }
-  public function setContentCategoryId($contentCategoryId)
-  {
-    $this->contentCategoryId = $contentCategoryId;
-  }
-  public function getContentCategoryId()
-  {
-    return $this->contentCategoryId;
-  }
-  public function setCreateInfo(Google_Service_Dfareporting_LastModifiedInfo $createInfo)
-  {
-    $this->createInfo = $createInfo;
-  }
-  public function getCreateInfo()
-  {
-    return $this->createInfo;
-  }
-  public function setDirectorySiteId($directorySiteId)
-  {
-    $this->directorySiteId = $directorySiteId;
-  }
-  public function getDirectorySiteId()
-  {
-    return $this->directorySiteId;
-  }
-  public function setDirectorySiteIdDimensionValue(Google_Service_Dfareporting_DimensionValue $directorySiteIdDimensionValue)
-  {
-    $this->directorySiteIdDimensionValue = $directorySiteIdDimensionValue;
-  }
-  public function getDirectorySiteIdDimensionValue()
-  {
-    return $this->directorySiteIdDimensionValue;
-  }
-  public function setExternalId($externalId)
-  {
-    $this->externalId = $externalId;
-  }
-  public function getExternalId()
-  {
-    return $this->externalId;
-  }
-  public function setId($id)
-  {
-    $this->id = $id;
-  }
-  public function getId()
-  {
-    return $this->id;
-  }
-  public function setIdDimensionValue(Google_Service_Dfareporting_DimensionValue $idDimensionValue)
-  {
-    $this->idDimensionValue = $idDimensionValue;
-  }
-  public function getIdDimensionValue()
-  {
-    return $this->idDimensionValue;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setLastModifiedInfo(Google_Service_Dfareporting_LastModifiedInfo $lastModifiedInfo)
-  {
-    $this->lastModifiedInfo = $lastModifiedInfo;
-  }
-  public function getLastModifiedInfo()
-  {
-    return $this->lastModifiedInfo;
-  }
-  public function setName($name)
-  {
-    $this->name = $name;
-  }
-  public function getName()
-  {
-    return $this->name;
-  }
-  public function setPlacementGroupType($placementGroupType)
-  {
-    $this->placementGroupType = $placementGroupType;
-  }
-  public function getPlacementGroupType()
-  {
-    return $this->placementGroupType;
-  }
-  public function setPlacementStrategyId($placementStrategyId)
-  {
-    $this->placementStrategyId = $placementStrategyId;
-  }
-  public function getPlacementStrategyId()
-  {
-    return $this->placementStrategyId;
-  }
-  public function setPricingSchedule(Google_Service_Dfareporting_PricingSchedule $pricingSchedule)
-  {
-    $this->pricingSchedule = $pricingSchedule;
-  }
-  public function getPricingSchedule()
-  {
-    return $this->pricingSchedule;
-  }
-  public function setPrimaryPlacementId($primaryPlacementId)
-  {
-    $this->primaryPlacementId = $primaryPlacementId;
-  }
-  public function getPrimaryPlacementId()
-  {
-    return $this->primaryPlacementId;
-  }
-  public function setPrimaryPlacementIdDimensionValue(Google_Service_Dfareporting_DimensionValue $primaryPlacementIdDimensionValue)
-  {
-    $this->primaryPlacementIdDimensionValue = $primaryPlacementIdDimensionValue;
-  }
-  public function getPrimaryPlacementIdDimensionValue()
-  {
-    return $this->primaryPlacementIdDimensionValue;
-  }
-  public function setSiteId($siteId)
-  {
-    $this->siteId = $siteId;
-  }
-  public function getSiteId()
-  {
-    return $this->siteId;
-  }
-  public function setSiteIdDimensionValue(Google_Service_Dfareporting_DimensionValue $siteIdDimensionValue)
-  {
-    $this->siteIdDimensionValue = $siteIdDimensionValue;
-  }
-  public function getSiteIdDimensionValue()
-  {
-    return $this->siteIdDimensionValue;
-  }
-  public function setSubaccountId($subaccountId)
-  {
-    $this->subaccountId = $subaccountId;
-  }
-  public function getSubaccountId()
-  {
-    return $this->subaccountId;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/PlacementGroupsListResponse.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/PlacementGroupsListResponse.php
deleted file mode 100644
index 8adaa3c4..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/PlacementGroupsListResponse.php
+++ /dev/null
@@ -1,50 +0,0 @@
-kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setNextPageToken($nextPageToken)
-  {
-    $this->nextPageToken = $nextPageToken;
-  }
-  public function getNextPageToken()
-  {
-    return $this->nextPageToken;
-  }
-  public function setPlacementGroups($placementGroups)
-  {
-    $this->placementGroups = $placementGroups;
-  }
-  public function getPlacementGroups()
-  {
-    return $this->placementGroups;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/PlacementStrategiesListResponse.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/PlacementStrategiesListResponse.php
deleted file mode 100644
index d96c5b2b..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/PlacementStrategiesListResponse.php
+++ /dev/null
@@ -1,50 +0,0 @@
-kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setNextPageToken($nextPageToken)
-  {
-    $this->nextPageToken = $nextPageToken;
-  }
-  public function getNextPageToken()
-  {
-    return $this->nextPageToken;
-  }
-  public function setPlacementStrategies($placementStrategies)
-  {
-    $this->placementStrategies = $placementStrategies;
-  }
-  public function getPlacementStrategies()
-  {
-    return $this->placementStrategies;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/PlacementStrategy.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/PlacementStrategy.php
deleted file mode 100644
index 61aac46d..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/PlacementStrategy.php
+++ /dev/null
@@ -1,57 +0,0 @@
-accountId = $accountId;
-  }
-  public function getAccountId()
-  {
-    return $this->accountId;
-  }
-  public function setId($id)
-  {
-    $this->id = $id;
-  }
-  public function getId()
-  {
-    return $this->id;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setName($name)
-  {
-    $this->name = $name;
-  }
-  public function getName()
-  {
-    return $this->name;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/PlacementTag.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/PlacementTag.php
deleted file mode 100644
index 8c560674..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/PlacementTag.php
+++ /dev/null
@@ -1,41 +0,0 @@
-placementId = $placementId;
-  }
-  public function getPlacementId()
-  {
-    return $this->placementId;
-  }
-  public function setTagDatas($tagDatas)
-  {
-    $this->tagDatas = $tagDatas;
-  }
-  public function getTagDatas()
-  {
-    return $this->tagDatas;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/PlacementsGenerateTagsResponse.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/PlacementsGenerateTagsResponse.php
deleted file mode 100644
index e2ec68bb..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/PlacementsGenerateTagsResponse.php
+++ /dev/null
@@ -1,41 +0,0 @@
-kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setPlacementTags($placementTags)
-  {
-    $this->placementTags = $placementTags;
-  }
-  public function getPlacementTags()
-  {
-    return $this->placementTags;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/PlacementsListResponse.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/PlacementsListResponse.php
deleted file mode 100644
index d1b5b6f3..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/PlacementsListResponse.php
+++ /dev/null
@@ -1,50 +0,0 @@
-kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setNextPageToken($nextPageToken)
-  {
-    $this->nextPageToken = $nextPageToken;
-  }
-  public function getNextPageToken()
-  {
-    return $this->nextPageToken;
-  }
-  public function setPlacements($placements)
-  {
-    $this->placements = $placements;
-  }
-  public function getPlacements()
-  {
-    return $this->placements;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/PlatformType.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/PlatformType.php
deleted file mode 100644
index da474be9..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/PlatformType.php
+++ /dev/null
@@ -1,48 +0,0 @@
-id = $id;
-  }
-  public function getId()
-  {
-    return $this->id;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setName($name)
-  {
-    $this->name = $name;
-  }
-  public function getName()
-  {
-    return $this->name;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/PlatformTypesListResponse.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/PlatformTypesListResponse.php
deleted file mode 100644
index 0eee5f46..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/PlatformTypesListResponse.php
+++ /dev/null
@@ -1,41 +0,0 @@
-kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setPlatformTypes($platformTypes)
-  {
-    $this->platformTypes = $platformTypes;
-  }
-  public function getPlatformTypes()
-  {
-    return $this->platformTypes;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/PopupWindowProperties.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/PopupWindowProperties.php
deleted file mode 100644
index 2cf0dbc5..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/PopupWindowProperties.php
+++ /dev/null
@@ -1,104 +0,0 @@
-dimension = $dimension;
-  }
-  public function getDimension()
-  {
-    return $this->dimension;
-  }
-  public function setOffset(Google_Service_Dfareporting_OffsetPosition $offset)
-  {
-    $this->offset = $offset;
-  }
-  public function getOffset()
-  {
-    return $this->offset;
-  }
-  public function setPositionType($positionType)
-  {
-    $this->positionType = $positionType;
-  }
-  public function getPositionType()
-  {
-    return $this->positionType;
-  }
-  public function setShowAddressBar($showAddressBar)
-  {
-    $this->showAddressBar = $showAddressBar;
-  }
-  public function getShowAddressBar()
-  {
-    return $this->showAddressBar;
-  }
-  public function setShowMenuBar($showMenuBar)
-  {
-    $this->showMenuBar = $showMenuBar;
-  }
-  public function getShowMenuBar()
-  {
-    return $this->showMenuBar;
-  }
-  public function setShowScrollBar($showScrollBar)
-  {
-    $this->showScrollBar = $showScrollBar;
-  }
-  public function getShowScrollBar()
-  {
-    return $this->showScrollBar;
-  }
-  public function setShowStatusBar($showStatusBar)
-  {
-    $this->showStatusBar = $showStatusBar;
-  }
-  public function getShowStatusBar()
-  {
-    return $this->showStatusBar;
-  }
-  public function setShowToolBar($showToolBar)
-  {
-    $this->showToolBar = $showToolBar;
-  }
-  public function getShowToolBar()
-  {
-    return $this->showToolBar;
-  }
-  public function setTitle($title)
-  {
-    $this->title = $title;
-  }
-  public function getTitle()
-  {
-    return $this->title;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/PostalCode.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/PostalCode.php
deleted file mode 100644
index 03cd3ede..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/PostalCode.php
+++ /dev/null
@@ -1,66 +0,0 @@
-code = $code;
-  }
-  public function getCode()
-  {
-    return $this->code;
-  }
-  public function setCountryCode($countryCode)
-  {
-    $this->countryCode = $countryCode;
-  }
-  public function getCountryCode()
-  {
-    return $this->countryCode;
-  }
-  public function setCountryDartId($countryDartId)
-  {
-    $this->countryDartId = $countryDartId;
-  }
-  public function getCountryDartId()
-  {
-    return $this->countryDartId;
-  }
-  public function setId($id)
-  {
-    $this->id = $id;
-  }
-  public function getId()
-  {
-    return $this->id;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/PostalCodesListResponse.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/PostalCodesListResponse.php
deleted file mode 100644
index 93d9d799..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/PostalCodesListResponse.php
+++ /dev/null
@@ -1,41 +0,0 @@
-kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setPostalCodes($postalCodes)
-  {
-    $this->postalCodes = $postalCodes;
-  }
-  public function getPostalCodes()
-  {
-    return $this->postalCodes;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/Pricing.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/Pricing.php
deleted file mode 100644
index 0e1abfb2..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/Pricing.php
+++ /dev/null
@@ -1,77 +0,0 @@
-capCostType = $capCostType;
-  }
-  public function getCapCostType()
-  {
-    return $this->capCostType;
-  }
-  public function setEndDate($endDate)
-  {
-    $this->endDate = $endDate;
-  }
-  public function getEndDate()
-  {
-    return $this->endDate;
-  }
-  public function setFlights($flights)
-  {
-    $this->flights = $flights;
-  }
-  public function getFlights()
-  {
-    return $this->flights;
-  }
-  public function setGroupType($groupType)
-  {
-    $this->groupType = $groupType;
-  }
-  public function getGroupType()
-  {
-    return $this->groupType;
-  }
-  public function setPricingType($pricingType)
-  {
-    $this->pricingType = $pricingType;
-  }
-  public function getPricingType()
-  {
-    return $this->pricingType;
-  }
-  public function setStartDate($startDate)
-  {
-    $this->startDate = $startDate;
-  }
-  public function getStartDate()
-  {
-    return $this->startDate;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/PricingSchedule.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/PricingSchedule.php
deleted file mode 100644
index 5ba2b971..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/PricingSchedule.php
+++ /dev/null
@@ -1,104 +0,0 @@
-capCostOption = $capCostOption;
-  }
-  public function getCapCostOption()
-  {
-    return $this->capCostOption;
-  }
-  public function setDisregardOverdelivery($disregardOverdelivery)
-  {
-    $this->disregardOverdelivery = $disregardOverdelivery;
-  }
-  public function getDisregardOverdelivery()
-  {
-    return $this->disregardOverdelivery;
-  }
-  public function setEndDate($endDate)
-  {
-    $this->endDate = $endDate;
-  }
-  public function getEndDate()
-  {
-    return $this->endDate;
-  }
-  public function setFlighted($flighted)
-  {
-    $this->flighted = $flighted;
-  }
-  public function getFlighted()
-  {
-    return $this->flighted;
-  }
-  public function setFloodlightActivityId($floodlightActivityId)
-  {
-    $this->floodlightActivityId = $floodlightActivityId;
-  }
-  public function getFloodlightActivityId()
-  {
-    return $this->floodlightActivityId;
-  }
-  public function setPricingPeriods($pricingPeriods)
-  {
-    $this->pricingPeriods = $pricingPeriods;
-  }
-  public function getPricingPeriods()
-  {
-    return $this->pricingPeriods;
-  }
-  public function setPricingType($pricingType)
-  {
-    $this->pricingType = $pricingType;
-  }
-  public function getPricingType()
-  {
-    return $this->pricingType;
-  }
-  public function setStartDate($startDate)
-  {
-    $this->startDate = $startDate;
-  }
-  public function getStartDate()
-  {
-    return $this->startDate;
-  }
-  public function setTestingStartDate($testingStartDate)
-  {
-    $this->testingStartDate = $testingStartDate;
-  }
-  public function getTestingStartDate()
-  {
-    return $this->testingStartDate;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/PricingSchedulePricingPeriod.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/PricingSchedulePricingPeriod.php
deleted file mode 100644
index 0e55ed62..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/PricingSchedulePricingPeriod.php
+++ /dev/null
@@ -1,66 +0,0 @@
-endDate = $endDate;
-  }
-  public function getEndDate()
-  {
-    return $this->endDate;
-  }
-  public function setPricingComment($pricingComment)
-  {
-    $this->pricingComment = $pricingComment;
-  }
-  public function getPricingComment()
-  {
-    return $this->pricingComment;
-  }
-  public function setRateOrCostNanos($rateOrCostNanos)
-  {
-    $this->rateOrCostNanos = $rateOrCostNanos;
-  }
-  public function getRateOrCostNanos()
-  {
-    return $this->rateOrCostNanos;
-  }
-  public function setStartDate($startDate)
-  {
-    $this->startDate = $startDate;
-  }
-  public function getStartDate()
-  {
-    return $this->startDate;
-  }
-  public function setUnits($units)
-  {
-    $this->units = $units;
-  }
-  public function getUnits()
-  {
-    return $this->units;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/Project.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/Project.php
deleted file mode 100644
index a7fc809e..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/Project.php
+++ /dev/null
@@ -1,220 +0,0 @@
-accountId = $accountId;
-  }
-  public function getAccountId()
-  {
-    return $this->accountId;
-  }
-  public function setAdvertiserId($advertiserId)
-  {
-    $this->advertiserId = $advertiserId;
-  }
-  public function getAdvertiserId()
-  {
-    return $this->advertiserId;
-  }
-  public function setAudienceAgeGroup($audienceAgeGroup)
-  {
-    $this->audienceAgeGroup = $audienceAgeGroup;
-  }
-  public function getAudienceAgeGroup()
-  {
-    return $this->audienceAgeGroup;
-  }
-  public function setAudienceGender($audienceGender)
-  {
-    $this->audienceGender = $audienceGender;
-  }
-  public function getAudienceGender()
-  {
-    return $this->audienceGender;
-  }
-  public function setBudget($budget)
-  {
-    $this->budget = $budget;
-  }
-  public function getBudget()
-  {
-    return $this->budget;
-  }
-  public function setClientBillingCode($clientBillingCode)
-  {
-    $this->clientBillingCode = $clientBillingCode;
-  }
-  public function getClientBillingCode()
-  {
-    return $this->clientBillingCode;
-  }
-  public function setClientName($clientName)
-  {
-    $this->clientName = $clientName;
-  }
-  public function getClientName()
-  {
-    return $this->clientName;
-  }
-  public function setEndDate($endDate)
-  {
-    $this->endDate = $endDate;
-  }
-  public function getEndDate()
-  {
-    return $this->endDate;
-  }
-  public function setId($id)
-  {
-    $this->id = $id;
-  }
-  public function getId()
-  {
-    return $this->id;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setLastModifiedInfo(Google_Service_Dfareporting_LastModifiedInfo $lastModifiedInfo)
-  {
-    $this->lastModifiedInfo = $lastModifiedInfo;
-  }
-  public function getLastModifiedInfo()
-  {
-    return $this->lastModifiedInfo;
-  }
-  public function setName($name)
-  {
-    $this->name = $name;
-  }
-  public function getName()
-  {
-    return $this->name;
-  }
-  public function setOverview($overview)
-  {
-    $this->overview = $overview;
-  }
-  public function getOverview()
-  {
-    return $this->overview;
-  }
-  public function setStartDate($startDate)
-  {
-    $this->startDate = $startDate;
-  }
-  public function getStartDate()
-  {
-    return $this->startDate;
-  }
-  public function setSubaccountId($subaccountId)
-  {
-    $this->subaccountId = $subaccountId;
-  }
-  public function getSubaccountId()
-  {
-    return $this->subaccountId;
-  }
-  public function setTargetClicks($targetClicks)
-  {
-    $this->targetClicks = $targetClicks;
-  }
-  public function getTargetClicks()
-  {
-    return $this->targetClicks;
-  }
-  public function setTargetConversions($targetConversions)
-  {
-    $this->targetConversions = $targetConversions;
-  }
-  public function getTargetConversions()
-  {
-    return $this->targetConversions;
-  }
-  public function setTargetCpaNanos($targetCpaNanos)
-  {
-    $this->targetCpaNanos = $targetCpaNanos;
-  }
-  public function getTargetCpaNanos()
-  {
-    return $this->targetCpaNanos;
-  }
-  public function setTargetCpcNanos($targetCpcNanos)
-  {
-    $this->targetCpcNanos = $targetCpcNanos;
-  }
-  public function getTargetCpcNanos()
-  {
-    return $this->targetCpcNanos;
-  }
-  public function setTargetCpmActiveViewNanos($targetCpmActiveViewNanos)
-  {
-    $this->targetCpmActiveViewNanos = $targetCpmActiveViewNanos;
-  }
-  public function getTargetCpmActiveViewNanos()
-  {
-    return $this->targetCpmActiveViewNanos;
-  }
-  public function setTargetCpmNanos($targetCpmNanos)
-  {
-    $this->targetCpmNanos = $targetCpmNanos;
-  }
-  public function getTargetCpmNanos()
-  {
-    return $this->targetCpmNanos;
-  }
-  public function setTargetImpressions($targetImpressions)
-  {
-    $this->targetImpressions = $targetImpressions;
-  }
-  public function getTargetImpressions()
-  {
-    return $this->targetImpressions;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/ProjectsListResponse.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/ProjectsListResponse.php
deleted file mode 100644
index 2fa5d6bd..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/ProjectsListResponse.php
+++ /dev/null
@@ -1,50 +0,0 @@
-kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setNextPageToken($nextPageToken)
-  {
-    $this->nextPageToken = $nextPageToken;
-  }
-  public function getNextPageToken()
-  {
-    return $this->nextPageToken;
-  }
-  public function setProjects($projects)
-  {
-    $this->projects = $projects;
-  }
-  public function getProjects()
-  {
-    return $this->projects;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/ReachReportCompatibleFields.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/ReachReportCompatibleFields.php
deleted file mode 100644
index 5909785d..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/ReachReportCompatibleFields.php
+++ /dev/null
@@ -1,81 +0,0 @@
-dimensionFilters = $dimensionFilters;
-  }
-  public function getDimensionFilters()
-  {
-    return $this->dimensionFilters;
-  }
-  public function setDimensions($dimensions)
-  {
-    $this->dimensions = $dimensions;
-  }
-  public function getDimensions()
-  {
-    return $this->dimensions;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setMetrics($metrics)
-  {
-    $this->metrics = $metrics;
-  }
-  public function getMetrics()
-  {
-    return $this->metrics;
-  }
-  public function setPivotedActivityMetrics($pivotedActivityMetrics)
-  {
-    $this->pivotedActivityMetrics = $pivotedActivityMetrics;
-  }
-  public function getPivotedActivityMetrics()
-  {
-    return $this->pivotedActivityMetrics;
-  }
-  public function setReachByFrequencyMetrics($reachByFrequencyMetrics)
-  {
-    $this->reachByFrequencyMetrics = $reachByFrequencyMetrics;
-  }
-  public function getReachByFrequencyMetrics()
-  {
-    return $this->reachByFrequencyMetrics;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/Recipient.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/Recipient.php
deleted file mode 100644
index a802e2d9..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/Recipient.php
+++ /dev/null
@@ -1,48 +0,0 @@
-deliveryType = $deliveryType;
-  }
-  public function getDeliveryType()
-  {
-    return $this->deliveryType;
-  }
-  public function setEmail($email)
-  {
-    $this->email = $email;
-  }
-  public function getEmail()
-  {
-    return $this->email;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/Region.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/Region.php
deleted file mode 100644
index 91d986a2..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/Region.php
+++ /dev/null
@@ -1,75 +0,0 @@
-countryCode = $countryCode;
-  }
-  public function getCountryCode()
-  {
-    return $this->countryCode;
-  }
-  public function setCountryDartId($countryDartId)
-  {
-    $this->countryDartId = $countryDartId;
-  }
-  public function getCountryDartId()
-  {
-    return $this->countryDartId;
-  }
-  public function setDartId($dartId)
-  {
-    $this->dartId = $dartId;
-  }
-  public function getDartId()
-  {
-    return $this->dartId;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setName($name)
-  {
-    $this->name = $name;
-  }
-  public function getName()
-  {
-    return $this->name;
-  }
-  public function setRegionCode($regionCode)
-  {
-    $this->regionCode = $regionCode;
-  }
-  public function getRegionCode()
-  {
-    return $this->regionCode;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/RegionsListResponse.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/RegionsListResponse.php
deleted file mode 100644
index df314e88..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/RegionsListResponse.php
+++ /dev/null
@@ -1,41 +0,0 @@
-kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setRegions($regions)
-  {
-    $this->regions = $regions;
-  }
-  public function getRegions()
-  {
-    return $this->regions;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/RemarketingList.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/RemarketingList.php
deleted file mode 100644
index 2a98707d..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/RemarketingList.php
+++ /dev/null
@@ -1,140 +0,0 @@
-accountId = $accountId;
-  }
-  public function getAccountId()
-  {
-    return $this->accountId;
-  }
-  public function setActive($active)
-  {
-    $this->active = $active;
-  }
-  public function getActive()
-  {
-    return $this->active;
-  }
-  public function setAdvertiserId($advertiserId)
-  {
-    $this->advertiserId = $advertiserId;
-  }
-  public function getAdvertiserId()
-  {
-    return $this->advertiserId;
-  }
-  public function setAdvertiserIdDimensionValue(Google_Service_Dfareporting_DimensionValue $advertiserIdDimensionValue)
-  {
-    $this->advertiserIdDimensionValue = $advertiserIdDimensionValue;
-  }
-  public function getAdvertiserIdDimensionValue()
-  {
-    return $this->advertiserIdDimensionValue;
-  }
-  public function setDescription($description)
-  {
-    $this->description = $description;
-  }
-  public function getDescription()
-  {
-    return $this->description;
-  }
-  public function setId($id)
-  {
-    $this->id = $id;
-  }
-  public function getId()
-  {
-    return $this->id;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setLifeSpan($lifeSpan)
-  {
-    $this->lifeSpan = $lifeSpan;
-  }
-  public function getLifeSpan()
-  {
-    return $this->lifeSpan;
-  }
-  public function setListPopulationRule(Google_Service_Dfareporting_ListPopulationRule $listPopulationRule)
-  {
-    $this->listPopulationRule = $listPopulationRule;
-  }
-  public function getListPopulationRule()
-  {
-    return $this->listPopulationRule;
-  }
-  public function setListSize($listSize)
-  {
-    $this->listSize = $listSize;
-  }
-  public function getListSize()
-  {
-    return $this->listSize;
-  }
-  public function setListSource($listSource)
-  {
-    $this->listSource = $listSource;
-  }
-  public function getListSource()
-  {
-    return $this->listSource;
-  }
-  public function setName($name)
-  {
-    $this->name = $name;
-  }
-  public function getName()
-  {
-    return $this->name;
-  }
-  public function setSubaccountId($subaccountId)
-  {
-    $this->subaccountId = $subaccountId;
-  }
-  public function getSubaccountId()
-  {
-    return $this->subaccountId;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/RemarketingListShare.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/RemarketingListShare.php
deleted file mode 100644
index 17be3a9e..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/RemarketingListShare.php
+++ /dev/null
@@ -1,58 +0,0 @@
-kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setRemarketingListId($remarketingListId)
-  {
-    $this->remarketingListId = $remarketingListId;
-  }
-  public function getRemarketingListId()
-  {
-    return $this->remarketingListId;
-  }
-  public function setSharedAccountIds($sharedAccountIds)
-  {
-    $this->sharedAccountIds = $sharedAccountIds;
-  }
-  public function getSharedAccountIds()
-  {
-    return $this->sharedAccountIds;
-  }
-  public function setSharedAdvertiserIds($sharedAdvertiserIds)
-  {
-    $this->sharedAdvertiserIds = $sharedAdvertiserIds;
-  }
-  public function getSharedAdvertiserIds()
-  {
-    return $this->sharedAdvertiserIds;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/RemarketingListsListResponse.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/RemarketingListsListResponse.php
deleted file mode 100644
index bce9de6f..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/RemarketingListsListResponse.php
+++ /dev/null
@@ -1,50 +0,0 @@
-kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setNextPageToken($nextPageToken)
-  {
-    $this->nextPageToken = $nextPageToken;
-  }
-  public function getNextPageToken()
-  {
-    return $this->nextPageToken;
-  }
-  public function setRemarketingLists($remarketingLists)
-  {
-    $this->remarketingLists = $remarketingLists;
-  }
-  public function getRemarketingLists()
-  {
-    return $this->remarketingLists;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/Report.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/Report.php
deleted file mode 100644
index a31b1674..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/Report.php
+++ /dev/null
@@ -1,190 +0,0 @@
-accountId = $accountId;
-  }
-  public function getAccountId()
-  {
-    return $this->accountId;
-  }
-  public function setCriteria(Google_Service_Dfareporting_ReportCriteria $criteria)
-  {
-    $this->criteria = $criteria;
-  }
-  public function getCriteria()
-  {
-    return $this->criteria;
-  }
-  public function setCrossDimensionReachCriteria(Google_Service_Dfareporting_ReportCrossDimensionReachCriteria $crossDimensionReachCriteria)
-  {
-    $this->crossDimensionReachCriteria = $crossDimensionReachCriteria;
-  }
-  public function getCrossDimensionReachCriteria()
-  {
-    return $this->crossDimensionReachCriteria;
-  }
-  public function setDelivery(Google_Service_Dfareporting_ReportDelivery $delivery)
-  {
-    $this->delivery = $delivery;
-  }
-  public function getDelivery()
-  {
-    return $this->delivery;
-  }
-  public function setEtag($etag)
-  {
-    $this->etag = $etag;
-  }
-  public function getEtag()
-  {
-    return $this->etag;
-  }
-  public function setFileName($fileName)
-  {
-    $this->fileName = $fileName;
-  }
-  public function getFileName()
-  {
-    return $this->fileName;
-  }
-  public function setFloodlightCriteria(Google_Service_Dfareporting_ReportFloodlightCriteria $floodlightCriteria)
-  {
-    $this->floodlightCriteria = $floodlightCriteria;
-  }
-  public function getFloodlightCriteria()
-  {
-    return $this->floodlightCriteria;
-  }
-  public function setFormat($format)
-  {
-    $this->format = $format;
-  }
-  public function getFormat()
-  {
-    return $this->format;
-  }
-  public function setId($id)
-  {
-    $this->id = $id;
-  }
-  public function getId()
-  {
-    return $this->id;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setLastModifiedTime($lastModifiedTime)
-  {
-    $this->lastModifiedTime = $lastModifiedTime;
-  }
-  public function getLastModifiedTime()
-  {
-    return $this->lastModifiedTime;
-  }
-  public function setName($name)
-  {
-    $this->name = $name;
-  }
-  public function getName()
-  {
-    return $this->name;
-  }
-  public function setOwnerProfileId($ownerProfileId)
-  {
-    $this->ownerProfileId = $ownerProfileId;
-  }
-  public function getOwnerProfileId()
-  {
-    return $this->ownerProfileId;
-  }
-  public function setPathToConversionCriteria(Google_Service_Dfareporting_ReportPathToConversionCriteria $pathToConversionCriteria)
-  {
-    $this->pathToConversionCriteria = $pathToConversionCriteria;
-  }
-  public function getPathToConversionCriteria()
-  {
-    return $this->pathToConversionCriteria;
-  }
-  public function setReachCriteria(Google_Service_Dfareporting_ReportReachCriteria $reachCriteria)
-  {
-    $this->reachCriteria = $reachCriteria;
-  }
-  public function getReachCriteria()
-  {
-    return $this->reachCriteria;
-  }
-  public function setSchedule(Google_Service_Dfareporting_ReportSchedule $schedule)
-  {
-    $this->schedule = $schedule;
-  }
-  public function getSchedule()
-  {
-    return $this->schedule;
-  }
-  public function setSubAccountId($subAccountId)
-  {
-    $this->subAccountId = $subAccountId;
-  }
-  public function getSubAccountId()
-  {
-    return $this->subAccountId;
-  }
-  public function setType($type)
-  {
-    $this->type = $type;
-  }
-  public function getType()
-  {
-    return $this->type;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/ReportCompatibleFields.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/ReportCompatibleFields.php
deleted file mode 100644
index c21df0aa..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/ReportCompatibleFields.php
+++ /dev/null
@@ -1,71 +0,0 @@
-dimensionFilters = $dimensionFilters;
-  }
-  public function getDimensionFilters()
-  {
-    return $this->dimensionFilters;
-  }
-  public function setDimensions($dimensions)
-  {
-    $this->dimensions = $dimensions;
-  }
-  public function getDimensions()
-  {
-    return $this->dimensions;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setMetrics($metrics)
-  {
-    $this->metrics = $metrics;
-  }
-  public function getMetrics()
-  {
-    return $this->metrics;
-  }
-  public function setPivotedActivityMetrics($pivotedActivityMetrics)
-  {
-    $this->pivotedActivityMetrics = $pivotedActivityMetrics;
-  }
-  public function getPivotedActivityMetrics()
-  {
-    return $this->pivotedActivityMetrics;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/ReportCriteria.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/ReportCriteria.php
deleted file mode 100644
index 1b740bd5..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/ReportCriteria.php
+++ /dev/null
@@ -1,81 +0,0 @@
-activities = $activities;
-  }
-  public function getActivities()
-  {
-    return $this->activities;
-  }
-  public function setCustomRichMediaEvents(Google_Service_Dfareporting_CustomRichMediaEvents $customRichMediaEvents)
-  {
-    $this->customRichMediaEvents = $customRichMediaEvents;
-  }
-  public function getCustomRichMediaEvents()
-  {
-    return $this->customRichMediaEvents;
-  }
-  public function setDateRange(Google_Service_Dfareporting_DateRange $dateRange)
-  {
-    $this->dateRange = $dateRange;
-  }
-  public function getDateRange()
-  {
-    return $this->dateRange;
-  }
-  public function setDimensionFilters($dimensionFilters)
-  {
-    $this->dimensionFilters = $dimensionFilters;
-  }
-  public function getDimensionFilters()
-  {
-    return $this->dimensionFilters;
-  }
-  public function setDimensions($dimensions)
-  {
-    $this->dimensions = $dimensions;
-  }
-  public function getDimensions()
-  {
-    return $this->dimensions;
-  }
-  public function setMetricNames($metricNames)
-  {
-    $this->metricNames = $metricNames;
-  }
-  public function getMetricNames()
-  {
-    return $this->metricNames;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/ReportCrossDimensionReachCriteria.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/ReportCrossDimensionReachCriteria.php
deleted file mode 100644
index e896f436..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/ReportCrossDimensionReachCriteria.php
+++ /dev/null
@@ -1,88 +0,0 @@
-breakdown = $breakdown;
-  }
-  public function getBreakdown()
-  {
-    return $this->breakdown;
-  }
-  public function setDateRange(Google_Service_Dfareporting_DateRange $dateRange)
-  {
-    $this->dateRange = $dateRange;
-  }
-  public function getDateRange()
-  {
-    return $this->dateRange;
-  }
-  public function setDimension($dimension)
-  {
-    $this->dimension = $dimension;
-  }
-  public function getDimension()
-  {
-    return $this->dimension;
-  }
-  public function setDimensionFilters($dimensionFilters)
-  {
-    $this->dimensionFilters = $dimensionFilters;
-  }
-  public function getDimensionFilters()
-  {
-    return $this->dimensionFilters;
-  }
-  public function setMetricNames($metricNames)
-  {
-    $this->metricNames = $metricNames;
-  }
-  public function getMetricNames()
-  {
-    return $this->metricNames;
-  }
-  public function setOverlapMetricNames($overlapMetricNames)
-  {
-    $this->overlapMetricNames = $overlapMetricNames;
-  }
-  public function getOverlapMetricNames()
-  {
-    return $this->overlapMetricNames;
-  }
-  public function setPivoted($pivoted)
-  {
-    $this->pivoted = $pivoted;
-  }
-  public function getPivoted()
-  {
-    return $this->pivoted;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/ReportDelivery.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/ReportDelivery.php
deleted file mode 100644
index 1788b2b1..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/ReportDelivery.php
+++ /dev/null
@@ -1,59 +0,0 @@
-emailOwner = $emailOwner;
-  }
-  public function getEmailOwner()
-  {
-    return $this->emailOwner;
-  }
-  public function setEmailOwnerDeliveryType($emailOwnerDeliveryType)
-  {
-    $this->emailOwnerDeliveryType = $emailOwnerDeliveryType;
-  }
-  public function getEmailOwnerDeliveryType()
-  {
-    return $this->emailOwnerDeliveryType;
-  }
-  public function setMessage($message)
-  {
-    $this->message = $message;
-  }
-  public function getMessage()
-  {
-    return $this->message;
-  }
-  public function setRecipients($recipients)
-  {
-    $this->recipients = $recipients;
-  }
-  public function getRecipients()
-  {
-    return $this->recipients;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/ReportFloodlightCriteria.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/ReportFloodlightCriteria.php
deleted file mode 100644
index 6e82ad1b..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/ReportFloodlightCriteria.php
+++ /dev/null
@@ -1,91 +0,0 @@
-customRichMediaEvents = $customRichMediaEvents;
-  }
-  public function getCustomRichMediaEvents()
-  {
-    return $this->customRichMediaEvents;
-  }
-  public function setDateRange(Google_Service_Dfareporting_DateRange $dateRange)
-  {
-    $this->dateRange = $dateRange;
-  }
-  public function getDateRange()
-  {
-    return $this->dateRange;
-  }
-  public function setDimensionFilters($dimensionFilters)
-  {
-    $this->dimensionFilters = $dimensionFilters;
-  }
-  public function getDimensionFilters()
-  {
-    return $this->dimensionFilters;
-  }
-  public function setDimensions($dimensions)
-  {
-    $this->dimensions = $dimensions;
-  }
-  public function getDimensions()
-  {
-    return $this->dimensions;
-  }
-  public function setFloodlightConfigId(Google_Service_Dfareporting_DimensionValue $floodlightConfigId)
-  {
-    $this->floodlightConfigId = $floodlightConfigId;
-  }
-  public function getFloodlightConfigId()
-  {
-    return $this->floodlightConfigId;
-  }
-  public function setMetricNames($metricNames)
-  {
-    $this->metricNames = $metricNames;
-  }
-  public function getMetricNames()
-  {
-    return $this->metricNames;
-  }
-  public function setReportProperties(Google_Service_Dfareporting_ReportFloodlightCriteriaReportProperties $reportProperties)
-  {
-    $this->reportProperties = $reportProperties;
-  }
-  public function getReportProperties()
-  {
-    return $this->reportProperties;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/ReportFloodlightCriteriaReportProperties.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/ReportFloodlightCriteriaReportProperties.php
deleted file mode 100644
index 5f6bb423..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/ReportFloodlightCriteriaReportProperties.php
+++ /dev/null
@@ -1,48 +0,0 @@
-includeAttributedIPConversions = $includeAttributedIPConversions;
-  }
-  public function getIncludeAttributedIPConversions()
-  {
-    return $this->includeAttributedIPConversions;
-  }
-  public function setIncludeUnattributedCookieConversions($includeUnattributedCookieConversions)
-  {
-    $this->includeUnattributedCookieConversions = $includeUnattributedCookieConversions;
-  }
-  public function getIncludeUnattributedCookieConversions()
-  {
-    return $this->includeUnattributedCookieConversions;
-  }
-  public function setIncludeUnattributedIPConversions($includeUnattributedIPConversions)
-  {
-    $this->includeUnattributedIPConversions = $includeUnattributedIPConversions;
-  }
-  public function getIncludeUnattributedIPConversions()
-  {
-    return $this->includeUnattributedIPConversions;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/ReportList.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/ReportList.php
deleted file mode 100644
index d551c362..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/ReportList.php
+++ /dev/null
@@ -1,59 +0,0 @@
-etag = $etag;
-  }
-  public function getEtag()
-  {
-    return $this->etag;
-  }
-  public function setItems($items)
-  {
-    $this->items = $items;
-  }
-  public function getItems()
-  {
-    return $this->items;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setNextPageToken($nextPageToken)
-  {
-    $this->nextPageToken = $nextPageToken;
-  }
-  public function getNextPageToken()
-  {
-    return $this->nextPageToken;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/ReportPathToConversionCriteria.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/ReportPathToConversionCriteria.php
deleted file mode 100644
index ba8f19f4..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/ReportPathToConversionCriteria.php
+++ /dev/null
@@ -1,111 +0,0 @@
-activityFilters = $activityFilters;
-  }
-  public function getActivityFilters()
-  {
-    return $this->activityFilters;
-  }
-  public function setConversionDimensions($conversionDimensions)
-  {
-    $this->conversionDimensions = $conversionDimensions;
-  }
-  public function getConversionDimensions()
-  {
-    return $this->conversionDimensions;
-  }
-  public function setCustomFloodlightVariables($customFloodlightVariables)
-  {
-    $this->customFloodlightVariables = $customFloodlightVariables;
-  }
-  public function getCustomFloodlightVariables()
-  {
-    return $this->customFloodlightVariables;
-  }
-  public function setCustomRichMediaEvents($customRichMediaEvents)
-  {
-    $this->customRichMediaEvents = $customRichMediaEvents;
-  }
-  public function getCustomRichMediaEvents()
-  {
-    return $this->customRichMediaEvents;
-  }
-  public function setDateRange(Google_Service_Dfareporting_DateRange $dateRange)
-  {
-    $this->dateRange = $dateRange;
-  }
-  public function getDateRange()
-  {
-    return $this->dateRange;
-  }
-  public function setFloodlightConfigId(Google_Service_Dfareporting_DimensionValue $floodlightConfigId)
-  {
-    $this->floodlightConfigId = $floodlightConfigId;
-  }
-  public function getFloodlightConfigId()
-  {
-    return $this->floodlightConfigId;
-  }
-  public function setMetricNames($metricNames)
-  {
-    $this->metricNames = $metricNames;
-  }
-  public function getMetricNames()
-  {
-    return $this->metricNames;
-  }
-  public function setPerInteractionDimensions($perInteractionDimensions)
-  {
-    $this->perInteractionDimensions = $perInteractionDimensions;
-  }
-  public function getPerInteractionDimensions()
-  {
-    return $this->perInteractionDimensions;
-  }
-  public function setReportProperties(Google_Service_Dfareporting_ReportPathToConversionCriteriaReportProperties $reportProperties)
-  {
-    $this->reportProperties = $reportProperties;
-  }
-  public function getReportProperties()
-  {
-    return $this->reportProperties;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/ReportPathToConversionCriteriaReportProperties.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/ReportPathToConversionCriteriaReportProperties.php
deleted file mode 100644
index f6e4ef30..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/ReportPathToConversionCriteriaReportProperties.php
+++ /dev/null
@@ -1,102 +0,0 @@
-clicksLookbackWindow = $clicksLookbackWindow;
-  }
-  public function getClicksLookbackWindow()
-  {
-    return $this->clicksLookbackWindow;
-  }
-  public function setImpressionsLookbackWindow($impressionsLookbackWindow)
-  {
-    $this->impressionsLookbackWindow = $impressionsLookbackWindow;
-  }
-  public function getImpressionsLookbackWindow()
-  {
-    return $this->impressionsLookbackWindow;
-  }
-  public function setIncludeAttributedIPConversions($includeAttributedIPConversions)
-  {
-    $this->includeAttributedIPConversions = $includeAttributedIPConversions;
-  }
-  public function getIncludeAttributedIPConversions()
-  {
-    return $this->includeAttributedIPConversions;
-  }
-  public function setIncludeUnattributedCookieConversions($includeUnattributedCookieConversions)
-  {
-    $this->includeUnattributedCookieConversions = $includeUnattributedCookieConversions;
-  }
-  public function getIncludeUnattributedCookieConversions()
-  {
-    return $this->includeUnattributedCookieConversions;
-  }
-  public function setIncludeUnattributedIPConversions($includeUnattributedIPConversions)
-  {
-    $this->includeUnattributedIPConversions = $includeUnattributedIPConversions;
-  }
-  public function getIncludeUnattributedIPConversions()
-  {
-    return $this->includeUnattributedIPConversions;
-  }
-  public function setMaximumClickInteractions($maximumClickInteractions)
-  {
-    $this->maximumClickInteractions = $maximumClickInteractions;
-  }
-  public function getMaximumClickInteractions()
-  {
-    return $this->maximumClickInteractions;
-  }
-  public function setMaximumImpressionInteractions($maximumImpressionInteractions)
-  {
-    $this->maximumImpressionInteractions = $maximumImpressionInteractions;
-  }
-  public function getMaximumImpressionInteractions()
-  {
-    return $this->maximumImpressionInteractions;
-  }
-  public function setMaximumInteractionGap($maximumInteractionGap)
-  {
-    $this->maximumInteractionGap = $maximumInteractionGap;
-  }
-  public function getMaximumInteractionGap()
-  {
-    return $this->maximumInteractionGap;
-  }
-  public function setPivotOnInteractionPath($pivotOnInteractionPath)
-  {
-    $this->pivotOnInteractionPath = $pivotOnInteractionPath;
-  }
-  public function getPivotOnInteractionPath()
-  {
-    return $this->pivotOnInteractionPath;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/ReportReachCriteria.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/ReportReachCriteria.php
deleted file mode 100644
index 959ed9a7..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/ReportReachCriteria.php
+++ /dev/null
@@ -1,99 +0,0 @@
-activities = $activities;
-  }
-  public function getActivities()
-  {
-    return $this->activities;
-  }
-  public function setCustomRichMediaEvents(Google_Service_Dfareporting_CustomRichMediaEvents $customRichMediaEvents)
-  {
-    $this->customRichMediaEvents = $customRichMediaEvents;
-  }
-  public function getCustomRichMediaEvents()
-  {
-    return $this->customRichMediaEvents;
-  }
-  public function setDateRange(Google_Service_Dfareporting_DateRange $dateRange)
-  {
-    $this->dateRange = $dateRange;
-  }
-  public function getDateRange()
-  {
-    return $this->dateRange;
-  }
-  public function setDimensionFilters($dimensionFilters)
-  {
-    $this->dimensionFilters = $dimensionFilters;
-  }
-  public function getDimensionFilters()
-  {
-    return $this->dimensionFilters;
-  }
-  public function setDimensions($dimensions)
-  {
-    $this->dimensions = $dimensions;
-  }
-  public function getDimensions()
-  {
-    return $this->dimensions;
-  }
-  public function setEnableAllDimensionCombinations($enableAllDimensionCombinations)
-  {
-    $this->enableAllDimensionCombinations = $enableAllDimensionCombinations;
-  }
-  public function getEnableAllDimensionCombinations()
-  {
-    return $this->enableAllDimensionCombinations;
-  }
-  public function setMetricNames($metricNames)
-  {
-    $this->metricNames = $metricNames;
-  }
-  public function getMetricNames()
-  {
-    return $this->metricNames;
-  }
-  public function setReachByFrequencyMetricNames($reachByFrequencyMetricNames)
-  {
-    $this->reachByFrequencyMetricNames = $reachByFrequencyMetricNames;
-  }
-  public function getReachByFrequencyMetricNames()
-  {
-    return $this->reachByFrequencyMetricNames;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/ReportSchedule.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/ReportSchedule.php
deleted file mode 100644
index 61724d02..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/ReportSchedule.php
+++ /dev/null
@@ -1,85 +0,0 @@
-active = $active;
-  }
-  public function getActive()
-  {
-    return $this->active;
-  }
-  public function setEvery($every)
-  {
-    $this->every = $every;
-  }
-  public function getEvery()
-  {
-    return $this->every;
-  }
-  public function setExpirationDate($expirationDate)
-  {
-    $this->expirationDate = $expirationDate;
-  }
-  public function getExpirationDate()
-  {
-    return $this->expirationDate;
-  }
-  public function setRepeats($repeats)
-  {
-    $this->repeats = $repeats;
-  }
-  public function getRepeats()
-  {
-    return $this->repeats;
-  }
-  public function setRepeatsOnWeekDays($repeatsOnWeekDays)
-  {
-    $this->repeatsOnWeekDays = $repeatsOnWeekDays;
-  }
-  public function getRepeatsOnWeekDays()
-  {
-    return $this->repeatsOnWeekDays;
-  }
-  public function setRunsOnDayOfMonth($runsOnDayOfMonth)
-  {
-    $this->runsOnDayOfMonth = $runsOnDayOfMonth;
-  }
-  public function getRunsOnDayOfMonth()
-  {
-    return $this->runsOnDayOfMonth;
-  }
-  public function setStartDate($startDate)
-  {
-    $this->startDate = $startDate;
-  }
-  public function getStartDate()
-  {
-    return $this->startDate;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/ReportsConfiguration.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/ReportsConfiguration.php
deleted file mode 100644
index 9b40a574..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/ReportsConfiguration.php
+++ /dev/null
@@ -1,49 +0,0 @@
-exposureToConversionEnabled = $exposureToConversionEnabled;
-  }
-  public function getExposureToConversionEnabled()
-  {
-    return $this->exposureToConversionEnabled;
-  }
-  public function setLookbackConfiguration(Google_Service_Dfareporting_LookbackConfiguration $lookbackConfiguration)
-  {
-    $this->lookbackConfiguration = $lookbackConfiguration;
-  }
-  public function getLookbackConfiguration()
-  {
-    return $this->lookbackConfiguration;
-  }
-  public function setReportGenerationTimeZoneId($reportGenerationTimeZoneId)
-  {
-    $this->reportGenerationTimeZoneId = $reportGenerationTimeZoneId;
-  }
-  public function getReportGenerationTimeZoneId()
-  {
-    return $this->reportGenerationTimeZoneId;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/Resource/AccountActiveAdSummaries.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/Resource/AccountActiveAdSummaries.php
deleted file mode 100644
index 03afb6ac..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/Resource/AccountActiveAdSummaries.php
+++ /dev/null
@@ -1,43 +0,0 @@
-
- *   $dfareportingService = new Google_Service_Dfareporting(...);
- *   $accountActiveAdSummaries = $dfareportingService->accountActiveAdSummaries;
- *  
- */
-class Google_Service_Dfareporting_Resource_AccountActiveAdSummaries extends Google_Service_Resource
-{
-  /**
-   * Gets the account's active ad summary by account ID.
-   * (accountActiveAdSummaries.get)
-   *
-   * @param string $profileId User profile ID associated with this request.
-   * @param string $summaryAccountId Account ID.
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Dfareporting_AccountActiveAdSummary
-   */
-  public function get($profileId, $summaryAccountId, $optParams = array())
-  {
-    $params = array('profileId' => $profileId, 'summaryAccountId' => $summaryAccountId);
-    $params = array_merge($params, $optParams);
-    return $this->call('get', array($params), "Google_Service_Dfareporting_AccountActiveAdSummary");
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/Resource/AccountPermissionGroups.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/Resource/AccountPermissionGroups.php
deleted file mode 100644
index a63efce5..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/Resource/AccountPermissionGroups.php
+++ /dev/null
@@ -1,56 +0,0 @@
-
- *   $dfareportingService = new Google_Service_Dfareporting(...);
- *   $accountPermissionGroups = $dfareportingService->accountPermissionGroups;
- *  
- */
-class Google_Service_Dfareporting_Resource_AccountPermissionGroups extends Google_Service_Resource
-{
-  /**
-   * Gets one account permission group by ID. (accountPermissionGroups.get)
-   *
-   * @param string $profileId User profile ID associated with this request.
-   * @param string $id Account permission group ID.
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Dfareporting_AccountPermissionGroup
-   */
-  public function get($profileId, $id, $optParams = array())
-  {
-    $params = array('profileId' => $profileId, 'id' => $id);
-    $params = array_merge($params, $optParams);
-    return $this->call('get', array($params), "Google_Service_Dfareporting_AccountPermissionGroup");
-  }
-  /**
-   * Retrieves the list of account permission groups.
-   * (accountPermissionGroups.listAccountPermissionGroups)
-   *
-   * @param string $profileId User profile ID associated with this request.
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Dfareporting_AccountPermissionGroupsListResponse
-   */
-  public function listAccountPermissionGroups($profileId, $optParams = array())
-  {
-    $params = array('profileId' => $profileId);
-    $params = array_merge($params, $optParams);
-    return $this->call('list', array($params), "Google_Service_Dfareporting_AccountPermissionGroupsListResponse");
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/Resource/AccountPermissions.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/Resource/AccountPermissions.php
deleted file mode 100644
index ccc70f62..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/Resource/AccountPermissions.php
+++ /dev/null
@@ -1,56 +0,0 @@
-
- *   $dfareportingService = new Google_Service_Dfareporting(...);
- *   $accountPermissions = $dfareportingService->accountPermissions;
- *  
- */
-class Google_Service_Dfareporting_Resource_AccountPermissions extends Google_Service_Resource
-{
-  /**
-   * Gets one account permission by ID. (accountPermissions.get)
-   *
-   * @param string $profileId User profile ID associated with this request.
-   * @param string $id Account permission ID.
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Dfareporting_AccountPermission
-   */
-  public function get($profileId, $id, $optParams = array())
-  {
-    $params = array('profileId' => $profileId, 'id' => $id);
-    $params = array_merge($params, $optParams);
-    return $this->call('get', array($params), "Google_Service_Dfareporting_AccountPermission");
-  }
-  /**
-   * Retrieves the list of account permissions.
-   * (accountPermissions.listAccountPermissions)
-   *
-   * @param string $profileId User profile ID associated with this request.
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Dfareporting_AccountPermissionsListResponse
-   */
-  public function listAccountPermissions($profileId, $optParams = array())
-  {
-    $params = array('profileId' => $profileId);
-    $params = array_merge($params, $optParams);
-    return $this->call('list', array($params), "Google_Service_Dfareporting_AccountPermissionsListResponse");
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/Resource/AccountUserProfiles.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/Resource/AccountUserProfiles.php
deleted file mode 100644
index 4dbd6f9c..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/Resource/AccountUserProfiles.php
+++ /dev/null
@@ -1,119 +0,0 @@
-
- *   $dfareportingService = new Google_Service_Dfareporting(...);
- *   $accountUserProfiles = $dfareportingService->accountUserProfiles;
- *  
- */
-class Google_Service_Dfareporting_Resource_AccountUserProfiles extends Google_Service_Resource
-{
-  /**
-   * Gets one account user profile by ID. (accountUserProfiles.get)
-   *
-   * @param string $profileId User profile ID associated with this request.
-   * @param string $id User profile ID.
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Dfareporting_AccountUserProfile
-   */
-  public function get($profileId, $id, $optParams = array())
-  {
-    $params = array('profileId' => $profileId, 'id' => $id);
-    $params = array_merge($params, $optParams);
-    return $this->call('get', array($params), "Google_Service_Dfareporting_AccountUserProfile");
-  }
-  /**
-   * Inserts a new account user profile. (accountUserProfiles.insert)
-   *
-   * @param string $profileId User profile ID associated with this request.
-   * @param Google_Service_Dfareporting_AccountUserProfile $postBody
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Dfareporting_AccountUserProfile
-   */
-  public function insert($profileId, Google_Service_Dfareporting_AccountUserProfile $postBody, $optParams = array())
-  {
-    $params = array('profileId' => $profileId, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('insert', array($params), "Google_Service_Dfareporting_AccountUserProfile");
-  }
-  /**
-   * Retrieves a list of account user profiles, possibly filtered. This method
-   * supports paging. (accountUserProfiles.listAccountUserProfiles)
-   *
-   * @param string $profileId User profile ID associated with this request.
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param bool active Select only active user profiles.
-   * @opt_param string ids Select only user profiles with these IDs.
-   * @opt_param int maxResults Maximum number of results to return.
-   * @opt_param string pageToken Value of the nextPageToken from the previous
-   * result page.
-   * @opt_param string searchString Allows searching for objects by name, ID or
-   * email. Wildcards (*) are allowed. For example, "user profile*2015" will
-   * return objects with names like "user profile June 2015", "user profile April
-   * 2015", or simply "user profile 2015". Most of the searches also add wildcards
-   * implicitly at the start and the end of the search string. For example, a
-   * search string of "user profile" will match objects with name "my user
-   * profile", "user profile 2015", or simply "user profile".
-   * @opt_param string sortField Field by which to sort the list.
-   * @opt_param string sortOrder Order of sorted results, default is ASCENDING.
-   * @opt_param string subaccountId Select only user profiles with the specified
-   * subaccount ID.
-   * @opt_param string userRoleId Select only user profiles with the specified
-   * user role ID.
-   * @return Google_Service_Dfareporting_AccountUserProfilesListResponse
-   */
-  public function listAccountUserProfiles($profileId, $optParams = array())
-  {
-    $params = array('profileId' => $profileId);
-    $params = array_merge($params, $optParams);
-    return $this->call('list', array($params), "Google_Service_Dfareporting_AccountUserProfilesListResponse");
-  }
-  /**
-   * Updates an existing account user profile. This method supports patch
-   * semantics. (accountUserProfiles.patch)
-   *
-   * @param string $profileId User profile ID associated with this request.
-   * @param string $id User profile ID.
-   * @param Google_Service_Dfareporting_AccountUserProfile $postBody
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Dfareporting_AccountUserProfile
-   */
-  public function patch($profileId, $id, Google_Service_Dfareporting_AccountUserProfile $postBody, $optParams = array())
-  {
-    $params = array('profileId' => $profileId, 'id' => $id, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('patch', array($params), "Google_Service_Dfareporting_AccountUserProfile");
-  }
-  /**
-   * Updates an existing account user profile. (accountUserProfiles.update)
-   *
-   * @param string $profileId User profile ID associated with this request.
-   * @param Google_Service_Dfareporting_AccountUserProfile $postBody
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Dfareporting_AccountUserProfile
-   */
-  public function update($profileId, Google_Service_Dfareporting_AccountUserProfile $postBody, $optParams = array())
-  {
-    $params = array('profileId' => $profileId, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('update', array($params), "Google_Service_Dfareporting_AccountUserProfile");
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/Resource/Accounts.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/Resource/Accounts.php
deleted file mode 100644
index ae6b22f3..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/Resource/Accounts.php
+++ /dev/null
@@ -1,101 +0,0 @@
-
- *   $dfareportingService = new Google_Service_Dfareporting(...);
- *   $accounts = $dfareportingService->accounts;
- *  
- */
-class Google_Service_Dfareporting_Resource_Accounts extends Google_Service_Resource
-{
-  /**
-   * Gets one account by ID. (accounts.get)
-   *
-   * @param string $profileId User profile ID associated with this request.
-   * @param string $id Account ID.
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Dfareporting_Account
-   */
-  public function get($profileId, $id, $optParams = array())
-  {
-    $params = array('profileId' => $profileId, 'id' => $id);
-    $params = array_merge($params, $optParams);
-    return $this->call('get', array($params), "Google_Service_Dfareporting_Account");
-  }
-  /**
-   * Retrieves the list of accounts, possibly filtered. This method supports
-   * paging. (accounts.listAccounts)
-   *
-   * @param string $profileId User profile ID associated with this request.
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param bool active Select only active accounts. Don't set this field to
-   * select both active and non-active accounts.
-   * @opt_param string ids Select only accounts with these IDs.
-   * @opt_param int maxResults Maximum number of results to return.
-   * @opt_param string pageToken Value of the nextPageToken from the previous
-   * result page.
-   * @opt_param string searchString Allows searching for objects by name or ID.
-   * Wildcards (*) are allowed. For example, "account*2015" will return objects
-   * with names like "account June 2015", "account April 2015", or simply "account
-   * 2015". Most of the searches also add wildcards implicitly at the start and
-   * the end of the search string. For example, a search string of "account" will
-   * match objects with name "my account", "account 2015", or simply "account".
-   * @opt_param string sortField Field by which to sort the list.
-   * @opt_param string sortOrder Order of sorted results, default is ASCENDING.
-   * @return Google_Service_Dfareporting_AccountsListResponse
-   */
-  public function listAccounts($profileId, $optParams = array())
-  {
-    $params = array('profileId' => $profileId);
-    $params = array_merge($params, $optParams);
-    return $this->call('list', array($params), "Google_Service_Dfareporting_AccountsListResponse");
-  }
-  /**
-   * Updates an existing account. This method supports patch semantics.
-   * (accounts.patch)
-   *
-   * @param string $profileId User profile ID associated with this request.
-   * @param string $id Account ID.
-   * @param Google_Service_Dfareporting_Account $postBody
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Dfareporting_Account
-   */
-  public function patch($profileId, $id, Google_Service_Dfareporting_Account $postBody, $optParams = array())
-  {
-    $params = array('profileId' => $profileId, 'id' => $id, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('patch', array($params), "Google_Service_Dfareporting_Account");
-  }
-  /**
-   * Updates an existing account. (accounts.update)
-   *
-   * @param string $profileId User profile ID associated with this request.
-   * @param Google_Service_Dfareporting_Account $postBody
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Dfareporting_Account
-   */
-  public function update($profileId, Google_Service_Dfareporting_Account $postBody, $optParams = array())
-  {
-    $params = array('profileId' => $profileId, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('update', array($params), "Google_Service_Dfareporting_Account");
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/Resource/Ads.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/Resource/Ads.php
deleted file mode 100644
index b899e84d..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/Resource/Ads.php
+++ /dev/null
@@ -1,143 +0,0 @@
-
- *   $dfareportingService = new Google_Service_Dfareporting(...);
- *   $ads = $dfareportingService->ads;
- *  
- */
-class Google_Service_Dfareporting_Resource_Ads extends Google_Service_Resource
-{
-  /**
-   * Gets one ad by ID. (ads.get)
-   *
-   * @param string $profileId User profile ID associated with this request.
-   * @param string $id Ad ID.
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Dfareporting_Ad
-   */
-  public function get($profileId, $id, $optParams = array())
-  {
-    $params = array('profileId' => $profileId, 'id' => $id);
-    $params = array_merge($params, $optParams);
-    return $this->call('get', array($params), "Google_Service_Dfareporting_Ad");
-  }
-  /**
-   * Inserts a new ad. (ads.insert)
-   *
-   * @param string $profileId User profile ID associated with this request.
-   * @param Google_Service_Dfareporting_Ad $postBody
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Dfareporting_Ad
-   */
-  public function insert($profileId, Google_Service_Dfareporting_Ad $postBody, $optParams = array())
-  {
-    $params = array('profileId' => $profileId, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('insert', array($params), "Google_Service_Dfareporting_Ad");
-  }
-  /**
-   * Retrieves a list of ads, possibly filtered. This method supports paging.
-   * (ads.listAds)
-   *
-   * @param string $profileId User profile ID associated with this request.
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param bool active Select only active ads.
-   * @opt_param string advertiserId Select only ads with this advertiser ID.
-   * @opt_param bool archived Select only archived ads.
-   * @opt_param string audienceSegmentIds Select only ads with these audience
-   * segment IDs.
-   * @opt_param string campaignIds Select only ads with these campaign IDs.
-   * @opt_param string compatibility Select default ads with the specified
-   * compatibility. Applicable when type is AD_SERVING_DEFAULT_AD. DISPLAY and
-   * DISPLAY_INTERSTITIAL refer to rendering either on desktop or on mobile
-   * devices for regular or interstitial ads, respectively. APP and
-   * APP_INTERSTITIAL are for rendering in mobile apps. IN_STREAM_VIDEO refers to
-   * rendering an in-stream video ads developed with the VAST standard.
-   * @opt_param string creativeIds Select only ads with these creative IDs
-   * assigned.
-   * @opt_param string creativeOptimizationConfigurationIds Select only ads with
-   * these creative optimization configuration IDs.
-   * @opt_param bool dynamicClickTracker Select only dynamic click trackers.
-   * Applicable when type is AD_SERVING_CLICK_TRACKER. If true, select dynamic
-   * click trackers. If false, select static click trackers. Leave unset to select
-   * both.
-   * @opt_param string ids Select only ads with these IDs.
-   * @opt_param string landingPageIds Select only ads with these landing page IDs.
-   * @opt_param int maxResults Maximum number of results to return.
-   * @opt_param string overriddenEventTagId Select only ads with this event tag
-   * override ID.
-   * @opt_param string pageToken Value of the nextPageToken from the previous
-   * result page.
-   * @opt_param string placementIds Select only ads with these placement IDs
-   * assigned.
-   * @opt_param string remarketingListIds Select only ads whose list targeting
-   * expression use these remarketing list IDs.
-   * @opt_param string searchString Allows searching for objects by name or ID.
-   * Wildcards (*) are allowed. For example, "ad*2015" will return objects with
-   * names like "ad June 2015", "ad April 2015", or simply "ad 2015". Most of the
-   * searches also add wildcards implicitly at the start and the end of the search
-   * string. For example, a search string of "ad" will match objects with name "my
-   * ad", "ad 2015", or simply "ad".
-   * @opt_param string sizeIds Select only ads with these size IDs.
-   * @opt_param string sortField Field by which to sort the list.
-   * @opt_param string sortOrder Order of sorted results, default is ASCENDING.
-   * @opt_param bool sslCompliant Select only ads that are SSL-compliant.
-   * @opt_param bool sslRequired Select only ads that require SSL.
-   * @opt_param string type Select only ads with these types.
-   * @return Google_Service_Dfareporting_AdsListResponse
-   */
-  public function listAds($profileId, $optParams = array())
-  {
-    $params = array('profileId' => $profileId);
-    $params = array_merge($params, $optParams);
-    return $this->call('list', array($params), "Google_Service_Dfareporting_AdsListResponse");
-  }
-  /**
-   * Updates an existing ad. This method supports patch semantics. (ads.patch)
-   *
-   * @param string $profileId User profile ID associated with this request.
-   * @param string $id Ad ID.
-   * @param Google_Service_Dfareporting_Ad $postBody
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Dfareporting_Ad
-   */
-  public function patch($profileId, $id, Google_Service_Dfareporting_Ad $postBody, $optParams = array())
-  {
-    $params = array('profileId' => $profileId, 'id' => $id, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('patch', array($params), "Google_Service_Dfareporting_Ad");
-  }
-  /**
-   * Updates an existing ad. (ads.update)
-   *
-   * @param string $profileId User profile ID associated with this request.
-   * @param Google_Service_Dfareporting_Ad $postBody
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Dfareporting_Ad
-   */
-  public function update($profileId, Google_Service_Dfareporting_Ad $postBody, $optParams = array())
-  {
-    $params = array('profileId' => $profileId, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('update', array($params), "Google_Service_Dfareporting_Ad");
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/Resource/AdvertiserGroups.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/Resource/AdvertiserGroups.php
deleted file mode 100644
index 66ddb8b8..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/Resource/AdvertiserGroups.php
+++ /dev/null
@@ -1,127 +0,0 @@
-
- *   $dfareportingService = new Google_Service_Dfareporting(...);
- *   $advertiserGroups = $dfareportingService->advertiserGroups;
- *  
- */
-class Google_Service_Dfareporting_Resource_AdvertiserGroups extends Google_Service_Resource
-{
-  /**
-   * Deletes an existing advertiser group. (advertiserGroups.delete)
-   *
-   * @param string $profileId User profile ID associated with this request.
-   * @param string $id Advertiser group ID.
-   * @param array $optParams Optional parameters.
-   */
-  public function delete($profileId, $id, $optParams = array())
-  {
-    $params = array('profileId' => $profileId, 'id' => $id);
-    $params = array_merge($params, $optParams);
-    return $this->call('delete', array($params));
-  }
-  /**
-   * Gets one advertiser group by ID. (advertiserGroups.get)
-   *
-   * @param string $profileId User profile ID associated with this request.
-   * @param string $id Advertiser group ID.
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Dfareporting_AdvertiserGroup
-   */
-  public function get($profileId, $id, $optParams = array())
-  {
-    $params = array('profileId' => $profileId, 'id' => $id);
-    $params = array_merge($params, $optParams);
-    return $this->call('get', array($params), "Google_Service_Dfareporting_AdvertiserGroup");
-  }
-  /**
-   * Inserts a new advertiser group. (advertiserGroups.insert)
-   *
-   * @param string $profileId User profile ID associated with this request.
-   * @param Google_Service_Dfareporting_AdvertiserGroup $postBody
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Dfareporting_AdvertiserGroup
-   */
-  public function insert($profileId, Google_Service_Dfareporting_AdvertiserGroup $postBody, $optParams = array())
-  {
-    $params = array('profileId' => $profileId, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('insert', array($params), "Google_Service_Dfareporting_AdvertiserGroup");
-  }
-  /**
-   * Retrieves a list of advertiser groups, possibly filtered. This method
-   * supports paging. (advertiserGroups.listAdvertiserGroups)
-   *
-   * @param string $profileId User profile ID associated with this request.
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param string ids Select only advertiser groups with these IDs.
-   * @opt_param int maxResults Maximum number of results to return.
-   * @opt_param string pageToken Value of the nextPageToken from the previous
-   * result page.
-   * @opt_param string searchString Allows searching for objects by name or ID.
-   * Wildcards (*) are allowed. For example, "advertiser*2015" will return objects
-   * with names like "advertiser group June 2015", "advertiser group April 2015",
-   * or simply "advertiser group 2015". Most of the searches also add wildcards
-   * implicitly at the start and the end of the search string. For example, a
-   * search string of "advertisergroup" will match objects with name "my
-   * advertisergroup", "advertisergroup 2015", or simply "advertisergroup".
-   * @opt_param string sortField Field by which to sort the list.
-   * @opt_param string sortOrder Order of sorted results, default is ASCENDING.
-   * @return Google_Service_Dfareporting_AdvertiserGroupsListResponse
-   */
-  public function listAdvertiserGroups($profileId, $optParams = array())
-  {
-    $params = array('profileId' => $profileId);
-    $params = array_merge($params, $optParams);
-    return $this->call('list', array($params), "Google_Service_Dfareporting_AdvertiserGroupsListResponse");
-  }
-  /**
-   * Updates an existing advertiser group. This method supports patch semantics.
-   * (advertiserGroups.patch)
-   *
-   * @param string $profileId User profile ID associated with this request.
-   * @param string $id Advertiser group ID.
-   * @param Google_Service_Dfareporting_AdvertiserGroup $postBody
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Dfareporting_AdvertiserGroup
-   */
-  public function patch($profileId, $id, Google_Service_Dfareporting_AdvertiserGroup $postBody, $optParams = array())
-  {
-    $params = array('profileId' => $profileId, 'id' => $id, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('patch', array($params), "Google_Service_Dfareporting_AdvertiserGroup");
-  }
-  /**
-   * Updates an existing advertiser group. (advertiserGroups.update)
-   *
-   * @param string $profileId User profile ID associated with this request.
-   * @param Google_Service_Dfareporting_AdvertiserGroup $postBody
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Dfareporting_AdvertiserGroup
-   */
-  public function update($profileId, Google_Service_Dfareporting_AdvertiserGroup $postBody, $optParams = array())
-  {
-    $params = array('profileId' => $profileId, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('update', array($params), "Google_Service_Dfareporting_AdvertiserGroup");
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/Resource/Advertisers.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/Resource/Advertisers.php
deleted file mode 100644
index adf14824..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/Resource/Advertisers.php
+++ /dev/null
@@ -1,125 +0,0 @@
-
- *   $dfareportingService = new Google_Service_Dfareporting(...);
- *   $advertisers = $dfareportingService->advertisers;
- *  
- */
-class Google_Service_Dfareporting_Resource_Advertisers extends Google_Service_Resource
-{
-  /**
-   * Gets one advertiser by ID. (advertisers.get)
-   *
-   * @param string $profileId User profile ID associated with this request.
-   * @param string $id Advertiser ID.
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Dfareporting_Advertiser
-   */
-  public function get($profileId, $id, $optParams = array())
-  {
-    $params = array('profileId' => $profileId, 'id' => $id);
-    $params = array_merge($params, $optParams);
-    return $this->call('get', array($params), "Google_Service_Dfareporting_Advertiser");
-  }
-  /**
-   * Inserts a new advertiser. (advertisers.insert)
-   *
-   * @param string $profileId User profile ID associated with this request.
-   * @param Google_Service_Dfareporting_Advertiser $postBody
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Dfareporting_Advertiser
-   */
-  public function insert($profileId, Google_Service_Dfareporting_Advertiser $postBody, $optParams = array())
-  {
-    $params = array('profileId' => $profileId, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('insert', array($params), "Google_Service_Dfareporting_Advertiser");
-  }
-  /**
-   * Retrieves a list of advertisers, possibly filtered. This method supports
-   * paging. (advertisers.listAdvertisers)
-   *
-   * @param string $profileId User profile ID associated with this request.
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param string advertiserGroupIds Select only advertisers with these
-   * advertiser group IDs.
-   * @opt_param string floodlightConfigurationIds Select only advertisers with
-   * these floodlight configuration IDs.
-   * @opt_param string ids Select only advertisers with these IDs.
-   * @opt_param bool includeAdvertisersWithoutGroupsOnly Select only advertisers
-   * which do not belong to any advertiser group.
-   * @opt_param int maxResults Maximum number of results to return.
-   * @opt_param bool onlyParent Select only advertisers which use another
-   * advertiser's floodlight configuration.
-   * @opt_param string pageToken Value of the nextPageToken from the previous
-   * result page.
-   * @opt_param string searchString Allows searching for objects by name or ID.
-   * Wildcards (*) are allowed. For example, "advertiser*2015" will return objects
-   * with names like "advertiser June 2015", "advertiser April 2015", or simply
-   * "advertiser 2015". Most of the searches also add wildcards implicitly at the
-   * start and the end of the search string. For example, a search string of
-   * "advertiser" will match objects with name "my advertiser", "advertiser 2015",
-   * or simply "advertiser".
-   * @opt_param string sortField Field by which to sort the list.
-   * @opt_param string sortOrder Order of sorted results, default is ASCENDING.
-   * @opt_param string status Select only advertisers with the specified status.
-   * @opt_param string subaccountId Select only advertisers with these subaccount
-   * IDs.
-   * @return Google_Service_Dfareporting_AdvertisersListResponse
-   */
-  public function listAdvertisers($profileId, $optParams = array())
-  {
-    $params = array('profileId' => $profileId);
-    $params = array_merge($params, $optParams);
-    return $this->call('list', array($params), "Google_Service_Dfareporting_AdvertisersListResponse");
-  }
-  /**
-   * Updates an existing advertiser. This method supports patch semantics.
-   * (advertisers.patch)
-   *
-   * @param string $profileId User profile ID associated with this request.
-   * @param string $id Advertiser ID.
-   * @param Google_Service_Dfareporting_Advertiser $postBody
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Dfareporting_Advertiser
-   */
-  public function patch($profileId, $id, Google_Service_Dfareporting_Advertiser $postBody, $optParams = array())
-  {
-    $params = array('profileId' => $profileId, 'id' => $id, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('patch', array($params), "Google_Service_Dfareporting_Advertiser");
-  }
-  /**
-   * Updates an existing advertiser. (advertisers.update)
-   *
-   * @param string $profileId User profile ID associated with this request.
-   * @param Google_Service_Dfareporting_Advertiser $postBody
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Dfareporting_Advertiser
-   */
-  public function update($profileId, Google_Service_Dfareporting_Advertiser $postBody, $optParams = array())
-  {
-    $params = array('profileId' => $profileId, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('update', array($params), "Google_Service_Dfareporting_Advertiser");
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/Resource/Browsers.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/Resource/Browsers.php
deleted file mode 100644
index c1cacb90..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/Resource/Browsers.php
+++ /dev/null
@@ -1,41 +0,0 @@
-
- *   $dfareportingService = new Google_Service_Dfareporting(...);
- *   $browsers = $dfareportingService->browsers;
- *  
- */
-class Google_Service_Dfareporting_Resource_Browsers extends Google_Service_Resource
-{
-  /**
-   * Retrieves a list of browsers. (browsers.listBrowsers)
-   *
-   * @param string $profileId User profile ID associated with this request.
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Dfareporting_BrowsersListResponse
-   */
-  public function listBrowsers($profileId, $optParams = array())
-  {
-    $params = array('profileId' => $profileId);
-    $params = array_merge($params, $optParams);
-    return $this->call('list', array($params), "Google_Service_Dfareporting_BrowsersListResponse");
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/Resource/CampaignCreativeAssociations.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/Resource/CampaignCreativeAssociations.php
deleted file mode 100644
index fe5912f4..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/Resource/CampaignCreativeAssociations.php
+++ /dev/null
@@ -1,66 +0,0 @@
-
- *   $dfareportingService = new Google_Service_Dfareporting(...);
- *   $campaignCreativeAssociations = $dfareportingService->campaignCreativeAssociations;
- *  
- */
-class Google_Service_Dfareporting_Resource_CampaignCreativeAssociations extends Google_Service_Resource
-{
-  /**
-   * Associates a creative with the specified campaign. This method creates a
-   * default ad with dimensions matching the creative in the campaign if such a
-   * default ad does not exist already. (campaignCreativeAssociations.insert)
-   *
-   * @param string $profileId User profile ID associated with this request.
-   * @param string $campaignId Campaign ID in this association.
-   * @param Google_Service_Dfareporting_CampaignCreativeAssociation $postBody
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Dfareporting_CampaignCreativeAssociation
-   */
-  public function insert($profileId, $campaignId, Google_Service_Dfareporting_CampaignCreativeAssociation $postBody, $optParams = array())
-  {
-    $params = array('profileId' => $profileId, 'campaignId' => $campaignId, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('insert', array($params), "Google_Service_Dfareporting_CampaignCreativeAssociation");
-  }
-  /**
-   * Retrieves the list of creative IDs associated with the specified campaign.
-   * This method supports paging.
-   * (campaignCreativeAssociations.listCampaignCreativeAssociations)
-   *
-   * @param string $profileId User profile ID associated with this request.
-   * @param string $campaignId Campaign ID in this association.
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param int maxResults Maximum number of results to return.
-   * @opt_param string pageToken Value of the nextPageToken from the previous
-   * result page.
-   * @opt_param string sortOrder Order of sorted results, default is ASCENDING.
-   * @return Google_Service_Dfareporting_CampaignCreativeAssociationsListResponse
-   */
-  public function listCampaignCreativeAssociations($profileId, $campaignId, $optParams = array())
-  {
-    $params = array('profileId' => $profileId, 'campaignId' => $campaignId);
-    $params = array_merge($params, $optParams);
-    return $this->call('list', array($params), "Google_Service_Dfareporting_CampaignCreativeAssociationsListResponse");
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/Resource/Campaigns.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/Resource/Campaigns.php
deleted file mode 100644
index c34969bf..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/Resource/Campaigns.php
+++ /dev/null
@@ -1,131 +0,0 @@
-
- *   $dfareportingService = new Google_Service_Dfareporting(...);
- *   $campaigns = $dfareportingService->campaigns;
- *  
- */
-class Google_Service_Dfareporting_Resource_Campaigns extends Google_Service_Resource
-{
-  /**
-   * Gets one campaign by ID. (campaigns.get)
-   *
-   * @param string $profileId User profile ID associated with this request.
-   * @param string $id Campaign ID.
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Dfareporting_Campaign
-   */
-  public function get($profileId, $id, $optParams = array())
-  {
-    $params = array('profileId' => $profileId, 'id' => $id);
-    $params = array_merge($params, $optParams);
-    return $this->call('get', array($params), "Google_Service_Dfareporting_Campaign");
-  }
-  /**
-   * Inserts a new campaign. (campaigns.insert)
-   *
-   * @param string $profileId User profile ID associated with this request.
-   * @param string $defaultLandingPageName Default landing page name for this new
-   * campaign. Must be less than 256 characters long.
-   * @param string $defaultLandingPageUrl Default landing page URL for this new
-   * campaign.
-   * @param Google_Service_Dfareporting_Campaign $postBody
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Dfareporting_Campaign
-   */
-  public function insert($profileId, $defaultLandingPageName, $defaultLandingPageUrl, Google_Service_Dfareporting_Campaign $postBody, $optParams = array())
-  {
-    $params = array('profileId' => $profileId, 'defaultLandingPageName' => $defaultLandingPageName, 'defaultLandingPageUrl' => $defaultLandingPageUrl, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('insert', array($params), "Google_Service_Dfareporting_Campaign");
-  }
-  /**
-   * Retrieves a list of campaigns, possibly filtered. This method supports
-   * paging. (campaigns.listCampaigns)
-   *
-   * @param string $profileId User profile ID associated with this request.
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param string advertiserGroupIds Select only campaigns whose advertisers
-   * belong to these advertiser groups.
-   * @opt_param string advertiserIds Select only campaigns that belong to these
-   * advertisers.
-   * @opt_param bool archived Select only archived campaigns. Don't set this field
-   * to select both archived and non-archived campaigns.
-   * @opt_param bool atLeastOneOptimizationActivity Select only campaigns that
-   * have at least one optimization activity.
-   * @opt_param string excludedIds Exclude campaigns with these IDs.
-   * @opt_param string ids Select only campaigns with these IDs.
-   * @opt_param int maxResults Maximum number of results to return.
-   * @opt_param string overriddenEventTagId Select only campaigns that have
-   * overridden this event tag ID.
-   * @opt_param string pageToken Value of the nextPageToken from the previous
-   * result page.
-   * @opt_param string searchString Allows searching for campaigns by name or ID.
-   * Wildcards (*) are allowed. For example, "campaign*2015" will return campaigns
-   * with names like "campaign June 2015", "campaign April 2015", or simply
-   * "campaign 2015". Most of the searches also add wildcards implicitly at the
-   * start and the end of the search string. For example, a search string of
-   * "campaign" will match campaigns with name "my campaign", "campaign 2015", or
-   * simply "campaign".
-   * @opt_param string sortField Field by which to sort the list.
-   * @opt_param string sortOrder Order of sorted results, default is ASCENDING.
-   * @opt_param string subaccountId Select only campaigns that belong to this
-   * subaccount.
-   * @return Google_Service_Dfareporting_CampaignsListResponse
-   */
-  public function listCampaigns($profileId, $optParams = array())
-  {
-    $params = array('profileId' => $profileId);
-    $params = array_merge($params, $optParams);
-    return $this->call('list', array($params), "Google_Service_Dfareporting_CampaignsListResponse");
-  }
-  /**
-   * Updates an existing campaign. This method supports patch semantics.
-   * (campaigns.patch)
-   *
-   * @param string $profileId User profile ID associated with this request.
-   * @param string $id Campaign ID.
-   * @param Google_Service_Dfareporting_Campaign $postBody
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Dfareporting_Campaign
-   */
-  public function patch($profileId, $id, Google_Service_Dfareporting_Campaign $postBody, $optParams = array())
-  {
-    $params = array('profileId' => $profileId, 'id' => $id, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('patch', array($params), "Google_Service_Dfareporting_Campaign");
-  }
-  /**
-   * Updates an existing campaign. (campaigns.update)
-   *
-   * @param string $profileId User profile ID associated with this request.
-   * @param Google_Service_Dfareporting_Campaign $postBody
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Dfareporting_Campaign
-   */
-  public function update($profileId, Google_Service_Dfareporting_Campaign $postBody, $optParams = array())
-  {
-    $params = array('profileId' => $profileId, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('update', array($params), "Google_Service_Dfareporting_Campaign");
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/Resource/ChangeLogs.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/Resource/ChangeLogs.php
deleted file mode 100644
index f35a7c6b..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/Resource/ChangeLogs.php
+++ /dev/null
@@ -1,81 +0,0 @@
-
- *   $dfareportingService = new Google_Service_Dfareporting(...);
- *   $changeLogs = $dfareportingService->changeLogs;
- *  
- */
-class Google_Service_Dfareporting_Resource_ChangeLogs extends Google_Service_Resource
-{
-  /**
-   * Gets one change log by ID. (changeLogs.get)
-   *
-   * @param string $profileId User profile ID associated with this request.
-   * @param string $id Change log ID.
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Dfareporting_ChangeLog
-   */
-  public function get($profileId, $id, $optParams = array())
-  {
-    $params = array('profileId' => $profileId, 'id' => $id);
-    $params = array_merge($params, $optParams);
-    return $this->call('get', array($params), "Google_Service_Dfareporting_ChangeLog");
-  }
-  /**
-   * Retrieves a list of change logs. This method supports paging.
-   * (changeLogs.listChangeLogs)
-   *
-   * @param string $profileId User profile ID associated with this request.
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param string action Select only change logs with the specified action.
-   * @opt_param string ids Select only change logs with these IDs.
-   * @opt_param string maxChangeTime Select only change logs whose change time is
-   * before the specified maxChangeTime.The time should be formatted as an RFC3339
-   * date/time string. For example, for 10:54 PM on July 18th, 2015, in the
-   * America/New York time zone, the format is "2015-07-18T22:54:00-04:00". In
-   * other words, the year, month, day, the letter T, the hour (24-hour clock
-   * system), minute, second, and then the time zone offset.
-   * @opt_param int maxResults Maximum number of results to return.
-   * @opt_param string minChangeTime Select only change logs whose change time is
-   * before the specified minChangeTime.The time should be formatted as an RFC3339
-   * date/time string. For example, for 10:54 PM on July 18th, 2015, in the
-   * America/New York time zone, the format is "2015-07-18T22:54:00-04:00". In
-   * other words, the year, month, day, the letter T, the hour (24-hour clock
-   * system), minute, second, and then the time zone offset.
-   * @opt_param string objectIds Select only change logs with these object IDs.
-   * @opt_param string objectType Select only change logs with the specified
-   * object type.
-   * @opt_param string pageToken Value of the nextPageToken from the previous
-   * result page.
-   * @opt_param string searchString Select only change logs whose object ID, user
-   * name, old or new values match the search string.
-   * @opt_param string userProfileIds Select only change logs with these user
-   * profile IDs.
-   * @return Google_Service_Dfareporting_ChangeLogsListResponse
-   */
-  public function listChangeLogs($profileId, $optParams = array())
-  {
-    $params = array('profileId' => $profileId);
-    $params = array_merge($params, $optParams);
-    return $this->call('list', array($params), "Google_Service_Dfareporting_ChangeLogsListResponse");
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/Resource/Cities.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/Resource/Cities.php
deleted file mode 100644
index eb04d0d7..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/Resource/Cities.php
+++ /dev/null
@@ -1,47 +0,0 @@
-
- *   $dfareportingService = new Google_Service_Dfareporting(...);
- *   $cities = $dfareportingService->cities;
- *  
- */
-class Google_Service_Dfareporting_Resource_Cities extends Google_Service_Resource
-{
-  /**
-   * Retrieves a list of cities, possibly filtered. (cities.listCities)
-   *
-   * @param string $profileId User profile ID associated with this request.
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param string countryDartIds Select only cities from these countries.
-   * @opt_param string dartIds Select only cities with these DART IDs.
-   * @opt_param string namePrefix Select only cities with names starting with this
-   * prefix.
-   * @opt_param string regionDartIds Select only cities from these regions.
-   * @return Google_Service_Dfareporting_CitiesListResponse
-   */
-  public function listCities($profileId, $optParams = array())
-  {
-    $params = array('profileId' => $profileId);
-    $params = array_merge($params, $optParams);
-    return $this->call('list', array($params), "Google_Service_Dfareporting_CitiesListResponse");
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/Resource/ConnectionTypes.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/Resource/ConnectionTypes.php
deleted file mode 100644
index f0e60ffb..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/Resource/ConnectionTypes.php
+++ /dev/null
@@ -1,55 +0,0 @@
-
- *   $dfareportingService = new Google_Service_Dfareporting(...);
- *   $connectionTypes = $dfareportingService->connectionTypes;
- *  
- */
-class Google_Service_Dfareporting_Resource_ConnectionTypes extends Google_Service_Resource
-{
-  /**
-   * Gets one connection type by ID. (connectionTypes.get)
-   *
-   * @param string $profileId User profile ID associated with this request.
-   * @param string $id Connection type ID.
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Dfareporting_ConnectionType
-   */
-  public function get($profileId, $id, $optParams = array())
-  {
-    $params = array('profileId' => $profileId, 'id' => $id);
-    $params = array_merge($params, $optParams);
-    return $this->call('get', array($params), "Google_Service_Dfareporting_ConnectionType");
-  }
-  /**
-   * Retrieves a list of connection types. (connectionTypes.listConnectionTypes)
-   *
-   * @param string $profileId User profile ID associated with this request.
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Dfareporting_ConnectionTypesListResponse
-   */
-  public function listConnectionTypes($profileId, $optParams = array())
-  {
-    $params = array('profileId' => $profileId);
-    $params = array_merge($params, $optParams);
-    return $this->call('list', array($params), "Google_Service_Dfareporting_ConnectionTypesListResponse");
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/Resource/ContentCategories.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/Resource/ContentCategories.php
deleted file mode 100644
index 8d2bb3ac..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/Resource/ContentCategories.php
+++ /dev/null
@@ -1,127 +0,0 @@
-
- *   $dfareportingService = new Google_Service_Dfareporting(...);
- *   $contentCategories = $dfareportingService->contentCategories;
- *  
- */
-class Google_Service_Dfareporting_Resource_ContentCategories extends Google_Service_Resource
-{
-  /**
-   * Deletes an existing content category. (contentCategories.delete)
-   *
-   * @param string $profileId User profile ID associated with this request.
-   * @param string $id Content category ID.
-   * @param array $optParams Optional parameters.
-   */
-  public function delete($profileId, $id, $optParams = array())
-  {
-    $params = array('profileId' => $profileId, 'id' => $id);
-    $params = array_merge($params, $optParams);
-    return $this->call('delete', array($params));
-  }
-  /**
-   * Gets one content category by ID. (contentCategories.get)
-   *
-   * @param string $profileId User profile ID associated with this request.
-   * @param string $id Content category ID.
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Dfareporting_ContentCategory
-   */
-  public function get($profileId, $id, $optParams = array())
-  {
-    $params = array('profileId' => $profileId, 'id' => $id);
-    $params = array_merge($params, $optParams);
-    return $this->call('get', array($params), "Google_Service_Dfareporting_ContentCategory");
-  }
-  /**
-   * Inserts a new content category. (contentCategories.insert)
-   *
-   * @param string $profileId User profile ID associated with this request.
-   * @param Google_Service_Dfareporting_ContentCategory $postBody
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Dfareporting_ContentCategory
-   */
-  public function insert($profileId, Google_Service_Dfareporting_ContentCategory $postBody, $optParams = array())
-  {
-    $params = array('profileId' => $profileId, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('insert', array($params), "Google_Service_Dfareporting_ContentCategory");
-  }
-  /**
-   * Retrieves a list of content categories, possibly filtered. This method
-   * supports paging. (contentCategories.listContentCategories)
-   *
-   * @param string $profileId User profile ID associated with this request.
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param string ids Select only content categories with these IDs.
-   * @opt_param int maxResults Maximum number of results to return.
-   * @opt_param string pageToken Value of the nextPageToken from the previous
-   * result page.
-   * @opt_param string searchString Allows searching for objects by name or ID.
-   * Wildcards (*) are allowed. For example, "contentcategory*2015" will return
-   * objects with names like "contentcategory June 2015", "contentcategory April
-   * 2015", or simply "contentcategory 2015". Most of the searches also add
-   * wildcards implicitly at the start and the end of the search string. For
-   * example, a search string of "contentcategory" will match objects with name
-   * "my contentcategory", "contentcategory 2015", or simply "contentcategory".
-   * @opt_param string sortField Field by which to sort the list.
-   * @opt_param string sortOrder Order of sorted results, default is ASCENDING.
-   * @return Google_Service_Dfareporting_ContentCategoriesListResponse
-   */
-  public function listContentCategories($profileId, $optParams = array())
-  {
-    $params = array('profileId' => $profileId);
-    $params = array_merge($params, $optParams);
-    return $this->call('list', array($params), "Google_Service_Dfareporting_ContentCategoriesListResponse");
-  }
-  /**
-   * Updates an existing content category. This method supports patch semantics.
-   * (contentCategories.patch)
-   *
-   * @param string $profileId User profile ID associated with this request.
-   * @param string $id Content category ID.
-   * @param Google_Service_Dfareporting_ContentCategory $postBody
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Dfareporting_ContentCategory
-   */
-  public function patch($profileId, $id, Google_Service_Dfareporting_ContentCategory $postBody, $optParams = array())
-  {
-    $params = array('profileId' => $profileId, 'id' => $id, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('patch', array($params), "Google_Service_Dfareporting_ContentCategory");
-  }
-  /**
-   * Updates an existing content category. (contentCategories.update)
-   *
-   * @param string $profileId User profile ID associated with this request.
-   * @param Google_Service_Dfareporting_ContentCategory $postBody
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Dfareporting_ContentCategory
-   */
-  public function update($profileId, Google_Service_Dfareporting_ContentCategory $postBody, $optParams = array())
-  {
-    $params = array('profileId' => $profileId, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('update', array($params), "Google_Service_Dfareporting_ContentCategory");
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/Resource/Conversions.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/Resource/Conversions.php
deleted file mode 100644
index 70f5588b..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/Resource/Conversions.php
+++ /dev/null
@@ -1,42 +0,0 @@
-
- *   $dfareportingService = new Google_Service_Dfareporting(...);
- *   $conversions = $dfareportingService->conversions;
- *  
- */
-class Google_Service_Dfareporting_Resource_Conversions extends Google_Service_Resource
-{
-  /**
-   * Inserts conversions. (conversions.batchinsert)
-   *
-   * @param string $profileId User profile ID associated with this request.
-   * @param Google_Service_Dfareporting_ConversionsBatchInsertRequest $postBody
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Dfareporting_ConversionsBatchInsertResponse
-   */
-  public function batchinsert($profileId, Google_Service_Dfareporting_ConversionsBatchInsertRequest $postBody, $optParams = array())
-  {
-    $params = array('profileId' => $profileId, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('batchinsert', array($params), "Google_Service_Dfareporting_ConversionsBatchInsertResponse");
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/Resource/Countries.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/Resource/Countries.php
deleted file mode 100644
index 92eb622d..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/Resource/Countries.php
+++ /dev/null
@@ -1,55 +0,0 @@
-
- *   $dfareportingService = new Google_Service_Dfareporting(...);
- *   $countries = $dfareportingService->countries;
- *  
- */
-class Google_Service_Dfareporting_Resource_Countries extends Google_Service_Resource
-{
-  /**
-   * Gets one country by ID. (countries.get)
-   *
-   * @param string $profileId User profile ID associated with this request.
-   * @param string $dartId Country DART ID.
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Dfareporting_Country
-   */
-  public function get($profileId, $dartId, $optParams = array())
-  {
-    $params = array('profileId' => $profileId, 'dartId' => $dartId);
-    $params = array_merge($params, $optParams);
-    return $this->call('get', array($params), "Google_Service_Dfareporting_Country");
-  }
-  /**
-   * Retrieves a list of countries. (countries.listCountries)
-   *
-   * @param string $profileId User profile ID associated with this request.
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Dfareporting_CountriesListResponse
-   */
-  public function listCountries($profileId, $optParams = array())
-  {
-    $params = array('profileId' => $profileId);
-    $params = array_merge($params, $optParams);
-    return $this->call('list', array($params), "Google_Service_Dfareporting_CountriesListResponse");
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/Resource/CreativeAssets.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/Resource/CreativeAssets.php
deleted file mode 100644
index 99cb9f71..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/Resource/CreativeAssets.php
+++ /dev/null
@@ -1,44 +0,0 @@
-
- *   $dfareportingService = new Google_Service_Dfareporting(...);
- *   $creativeAssets = $dfareportingService->creativeAssets;
- *  
- */
-class Google_Service_Dfareporting_Resource_CreativeAssets extends Google_Service_Resource
-{
-  /**
-   * Inserts a new creative asset. (creativeAssets.insert)
-   *
-   * @param string $profileId User profile ID associated with this request.
-   * @param string $advertiserId Advertiser ID of this creative. This is a
-   * required field.
-   * @param Google_Service_Dfareporting_CreativeAssetMetadata $postBody
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Dfareporting_CreativeAssetMetadata
-   */
-  public function insert($profileId, $advertiserId, Google_Service_Dfareporting_CreativeAssetMetadata $postBody, $optParams = array())
-  {
-    $params = array('profileId' => $profileId, 'advertiserId' => $advertiserId, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('insert', array($params), "Google_Service_Dfareporting_CreativeAssetMetadata");
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/Resource/CreativeFieldValues.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/Resource/CreativeFieldValues.php
deleted file mode 100644
index 50aa7aa0..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/Resource/CreativeFieldValues.php
+++ /dev/null
@@ -1,134 +0,0 @@
-
- *   $dfareportingService = new Google_Service_Dfareporting(...);
- *   $creativeFieldValues = $dfareportingService->creativeFieldValues;
- *  
- */
-class Google_Service_Dfareporting_Resource_CreativeFieldValues extends Google_Service_Resource
-{
-  /**
-   * Deletes an existing creative field value. (creativeFieldValues.delete)
-   *
-   * @param string $profileId User profile ID associated with this request.
-   * @param string $creativeFieldId Creative field ID for this creative field
-   * value.
-   * @param string $id Creative Field Value ID
-   * @param array $optParams Optional parameters.
-   */
-  public function delete($profileId, $creativeFieldId, $id, $optParams = array())
-  {
-    $params = array('profileId' => $profileId, 'creativeFieldId' => $creativeFieldId, 'id' => $id);
-    $params = array_merge($params, $optParams);
-    return $this->call('delete', array($params));
-  }
-  /**
-   * Gets one creative field value by ID. (creativeFieldValues.get)
-   *
-   * @param string $profileId User profile ID associated with this request.
-   * @param string $creativeFieldId Creative field ID for this creative field
-   * value.
-   * @param string $id Creative Field Value ID
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Dfareporting_CreativeFieldValue
-   */
-  public function get($profileId, $creativeFieldId, $id, $optParams = array())
-  {
-    $params = array('profileId' => $profileId, 'creativeFieldId' => $creativeFieldId, 'id' => $id);
-    $params = array_merge($params, $optParams);
-    return $this->call('get', array($params), "Google_Service_Dfareporting_CreativeFieldValue");
-  }
-  /**
-   * Inserts a new creative field value. (creativeFieldValues.insert)
-   *
-   * @param string $profileId User profile ID associated with this request.
-   * @param string $creativeFieldId Creative field ID for this creative field
-   * value.
-   * @param Google_Service_Dfareporting_CreativeFieldValue $postBody
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Dfareporting_CreativeFieldValue
-   */
-  public function insert($profileId, $creativeFieldId, Google_Service_Dfareporting_CreativeFieldValue $postBody, $optParams = array())
-  {
-    $params = array('profileId' => $profileId, 'creativeFieldId' => $creativeFieldId, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('insert', array($params), "Google_Service_Dfareporting_CreativeFieldValue");
-  }
-  /**
-   * Retrieves a list of creative field values, possibly filtered. This method
-   * supports paging. (creativeFieldValues.listCreativeFieldValues)
-   *
-   * @param string $profileId User profile ID associated with this request.
-   * @param string $creativeFieldId Creative field ID for this creative field
-   * value.
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param string ids Select only creative field values with these IDs.
-   * @opt_param int maxResults Maximum number of results to return.
-   * @opt_param string pageToken Value of the nextPageToken from the previous
-   * result page.
-   * @opt_param string searchString Allows searching for creative field values by
-   * their values. Wildcards (e.g. *) are not allowed.
-   * @opt_param string sortField Field by which to sort the list.
-   * @opt_param string sortOrder Order of sorted results, default is ASCENDING.
-   * @return Google_Service_Dfareporting_CreativeFieldValuesListResponse
-   */
-  public function listCreativeFieldValues($profileId, $creativeFieldId, $optParams = array())
-  {
-    $params = array('profileId' => $profileId, 'creativeFieldId' => $creativeFieldId);
-    $params = array_merge($params, $optParams);
-    return $this->call('list', array($params), "Google_Service_Dfareporting_CreativeFieldValuesListResponse");
-  }
-  /**
-   * Updates an existing creative field value. This method supports patch
-   * semantics. (creativeFieldValues.patch)
-   *
-   * @param string $profileId User profile ID associated with this request.
-   * @param string $creativeFieldId Creative field ID for this creative field
-   * value.
-   * @param string $id Creative Field Value ID
-   * @param Google_Service_Dfareporting_CreativeFieldValue $postBody
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Dfareporting_CreativeFieldValue
-   */
-  public function patch($profileId, $creativeFieldId, $id, Google_Service_Dfareporting_CreativeFieldValue $postBody, $optParams = array())
-  {
-    $params = array('profileId' => $profileId, 'creativeFieldId' => $creativeFieldId, 'id' => $id, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('patch', array($params), "Google_Service_Dfareporting_CreativeFieldValue");
-  }
-  /**
-   * Updates an existing creative field value. (creativeFieldValues.update)
-   *
-   * @param string $profileId User profile ID associated with this request.
-   * @param string $creativeFieldId Creative field ID for this creative field
-   * value.
-   * @param Google_Service_Dfareporting_CreativeFieldValue $postBody
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Dfareporting_CreativeFieldValue
-   */
-  public function update($profileId, $creativeFieldId, Google_Service_Dfareporting_CreativeFieldValue $postBody, $optParams = array())
-  {
-    $params = array('profileId' => $profileId, 'creativeFieldId' => $creativeFieldId, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('update', array($params), "Google_Service_Dfareporting_CreativeFieldValue");
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/Resource/CreativeFields.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/Resource/CreativeFields.php
deleted file mode 100644
index 5739828b..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/Resource/CreativeFields.php
+++ /dev/null
@@ -1,130 +0,0 @@
-
- *   $dfareportingService = new Google_Service_Dfareporting(...);
- *   $creativeFields = $dfareportingService->creativeFields;
- *  
- */
-class Google_Service_Dfareporting_Resource_CreativeFields extends Google_Service_Resource
-{
-  /**
-   * Deletes an existing creative field. (creativeFields.delete)
-   *
-   * @param string $profileId User profile ID associated with this request.
-   * @param string $id Creative Field ID
-   * @param array $optParams Optional parameters.
-   */
-  public function delete($profileId, $id, $optParams = array())
-  {
-    $params = array('profileId' => $profileId, 'id' => $id);
-    $params = array_merge($params, $optParams);
-    return $this->call('delete', array($params));
-  }
-  /**
-   * Gets one creative field by ID. (creativeFields.get)
-   *
-   * @param string $profileId User profile ID associated with this request.
-   * @param string $id Creative Field ID
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Dfareporting_CreativeField
-   */
-  public function get($profileId, $id, $optParams = array())
-  {
-    $params = array('profileId' => $profileId, 'id' => $id);
-    $params = array_merge($params, $optParams);
-    return $this->call('get', array($params), "Google_Service_Dfareporting_CreativeField");
-  }
-  /**
-   * Inserts a new creative field. (creativeFields.insert)
-   *
-   * @param string $profileId User profile ID associated with this request.
-   * @param Google_Service_Dfareporting_CreativeField $postBody
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Dfareporting_CreativeField
-   */
-  public function insert($profileId, Google_Service_Dfareporting_CreativeField $postBody, $optParams = array())
-  {
-    $params = array('profileId' => $profileId, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('insert', array($params), "Google_Service_Dfareporting_CreativeField");
-  }
-  /**
-   * Retrieves a list of creative fields, possibly filtered. This method supports
-   * paging. (creativeFields.listCreativeFields)
-   *
-   * @param string $profileId User profile ID associated with this request.
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param string advertiserIds Select only creative fields that belong to
-   * these advertisers.
-   * @opt_param string ids Select only creative fields with these IDs.
-   * @opt_param int maxResults Maximum number of results to return.
-   * @opt_param string pageToken Value of the nextPageToken from the previous
-   * result page.
-   * @opt_param string searchString Allows searching for creative fields by name
-   * or ID. Wildcards (*) are allowed. For example, "creativefield*2015" will
-   * return creative fields with names like "creativefield June 2015",
-   * "creativefield April 2015", or simply "creativefield 2015". Most of the
-   * searches also add wild-cards implicitly at the start and the end of the
-   * search string. For example, a search string of "creativefield" will match
-   * creative fields with the name "my creativefield", "creativefield 2015", or
-   * simply "creativefield".
-   * @opt_param string sortField Field by which to sort the list.
-   * @opt_param string sortOrder Order of sorted results, default is ASCENDING.
-   * @return Google_Service_Dfareporting_CreativeFieldsListResponse
-   */
-  public function listCreativeFields($profileId, $optParams = array())
-  {
-    $params = array('profileId' => $profileId);
-    $params = array_merge($params, $optParams);
-    return $this->call('list', array($params), "Google_Service_Dfareporting_CreativeFieldsListResponse");
-  }
-  /**
-   * Updates an existing creative field. This method supports patch semantics.
-   * (creativeFields.patch)
-   *
-   * @param string $profileId User profile ID associated with this request.
-   * @param string $id Creative Field ID
-   * @param Google_Service_Dfareporting_CreativeField $postBody
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Dfareporting_CreativeField
-   */
-  public function patch($profileId, $id, Google_Service_Dfareporting_CreativeField $postBody, $optParams = array())
-  {
-    $params = array('profileId' => $profileId, 'id' => $id, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('patch', array($params), "Google_Service_Dfareporting_CreativeField");
-  }
-  /**
-   * Updates an existing creative field. (creativeFields.update)
-   *
-   * @param string $profileId User profile ID associated with this request.
-   * @param Google_Service_Dfareporting_CreativeField $postBody
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Dfareporting_CreativeField
-   */
-  public function update($profileId, Google_Service_Dfareporting_CreativeField $postBody, $optParams = array())
-  {
-    $params = array('profileId' => $profileId, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('update', array($params), "Google_Service_Dfareporting_CreativeField");
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/Resource/CreativeGroups.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/Resource/CreativeGroups.php
deleted file mode 100644
index 44d70d04..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/Resource/CreativeGroups.php
+++ /dev/null
@@ -1,119 +0,0 @@
-
- *   $dfareportingService = new Google_Service_Dfareporting(...);
- *   $creativeGroups = $dfareportingService->creativeGroups;
- *  
- */
-class Google_Service_Dfareporting_Resource_CreativeGroups extends Google_Service_Resource
-{
-  /**
-   * Gets one creative group by ID. (creativeGroups.get)
-   *
-   * @param string $profileId User profile ID associated with this request.
-   * @param string $id Creative group ID.
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Dfareporting_CreativeGroup
-   */
-  public function get($profileId, $id, $optParams = array())
-  {
-    $params = array('profileId' => $profileId, 'id' => $id);
-    $params = array_merge($params, $optParams);
-    return $this->call('get', array($params), "Google_Service_Dfareporting_CreativeGroup");
-  }
-  /**
-   * Inserts a new creative group. (creativeGroups.insert)
-   *
-   * @param string $profileId User profile ID associated with this request.
-   * @param Google_Service_Dfareporting_CreativeGroup $postBody
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Dfareporting_CreativeGroup
-   */
-  public function insert($profileId, Google_Service_Dfareporting_CreativeGroup $postBody, $optParams = array())
-  {
-    $params = array('profileId' => $profileId, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('insert', array($params), "Google_Service_Dfareporting_CreativeGroup");
-  }
-  /**
-   * Retrieves a list of creative groups, possibly filtered. This method supports
-   * paging. (creativeGroups.listCreativeGroups)
-   *
-   * @param string $profileId User profile ID associated with this request.
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param string advertiserIds Select only creative groups that belong to
-   * these advertisers.
-   * @opt_param int groupNumber Select only creative groups that belong to this
-   * subgroup.
-   * @opt_param string ids Select only creative groups with these IDs.
-   * @opt_param int maxResults Maximum number of results to return.
-   * @opt_param string pageToken Value of the nextPageToken from the previous
-   * result page.
-   * @opt_param string searchString Allows searching for creative groups by name
-   * or ID. Wildcards (*) are allowed. For example, "creativegroup*2015" will
-   * return creative groups with names like "creativegroup June 2015",
-   * "creativegroup April 2015", or simply "creativegroup 2015". Most of the
-   * searches also add wild-cards implicitly at the start and the end of the
-   * search string. For example, a search string of "creativegroup" will match
-   * creative groups with the name "my creativegroup", "creativegroup 2015", or
-   * simply "creativegroup".
-   * @opt_param string sortField Field by which to sort the list.
-   * @opt_param string sortOrder Order of sorted results, default is ASCENDING.
-   * @return Google_Service_Dfareporting_CreativeGroupsListResponse
-   */
-  public function listCreativeGroups($profileId, $optParams = array())
-  {
-    $params = array('profileId' => $profileId);
-    $params = array_merge($params, $optParams);
-    return $this->call('list', array($params), "Google_Service_Dfareporting_CreativeGroupsListResponse");
-  }
-  /**
-   * Updates an existing creative group. This method supports patch semantics.
-   * (creativeGroups.patch)
-   *
-   * @param string $profileId User profile ID associated with this request.
-   * @param string $id Creative group ID.
-   * @param Google_Service_Dfareporting_CreativeGroup $postBody
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Dfareporting_CreativeGroup
-   */
-  public function patch($profileId, $id, Google_Service_Dfareporting_CreativeGroup $postBody, $optParams = array())
-  {
-    $params = array('profileId' => $profileId, 'id' => $id, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('patch', array($params), "Google_Service_Dfareporting_CreativeGroup");
-  }
-  /**
-   * Updates an existing creative group. (creativeGroups.update)
-   *
-   * @param string $profileId User profile ID associated with this request.
-   * @param Google_Service_Dfareporting_CreativeGroup $postBody
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Dfareporting_CreativeGroup
-   */
-  public function update($profileId, Google_Service_Dfareporting_CreativeGroup $postBody, $optParams = array())
-  {
-    $params = array('profileId' => $profileId, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('update', array($params), "Google_Service_Dfareporting_CreativeGroup");
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/Resource/Creatives.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/Resource/Creatives.php
deleted file mode 100644
index 9cfe4548..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/Resource/Creatives.php
+++ /dev/null
@@ -1,130 +0,0 @@
-
- *   $dfareportingService = new Google_Service_Dfareporting(...);
- *   $creatives = $dfareportingService->creatives;
- *  
- */
-class Google_Service_Dfareporting_Resource_Creatives extends Google_Service_Resource
-{
-  /**
-   * Gets one creative by ID. (creatives.get)
-   *
-   * @param string $profileId User profile ID associated with this request.
-   * @param string $id Creative ID.
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Dfareporting_Creative
-   */
-  public function get($profileId, $id, $optParams = array())
-  {
-    $params = array('profileId' => $profileId, 'id' => $id);
-    $params = array_merge($params, $optParams);
-    return $this->call('get', array($params), "Google_Service_Dfareporting_Creative");
-  }
-  /**
-   * Inserts a new creative. (creatives.insert)
-   *
-   * @param string $profileId User profile ID associated with this request.
-   * @param Google_Service_Dfareporting_Creative $postBody
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Dfareporting_Creative
-   */
-  public function insert($profileId, Google_Service_Dfareporting_Creative $postBody, $optParams = array())
-  {
-    $params = array('profileId' => $profileId, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('insert', array($params), "Google_Service_Dfareporting_Creative");
-  }
-  /**
-   * Retrieves a list of creatives, possibly filtered. This method supports
-   * paging. (creatives.listCreatives)
-   *
-   * @param string $profileId User profile ID associated with this request.
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param bool active Select only active creatives. Leave blank to select
-   * active and inactive creatives.
-   * @opt_param string advertiserId Select only creatives with this advertiser ID.
-   * @opt_param bool archived Select only archived creatives. Leave blank to
-   * select archived and unarchived creatives.
-   * @opt_param string campaignId Select only creatives with this campaign ID.
-   * @opt_param string companionCreativeIds Select only in-stream video creatives
-   * with these companion IDs.
-   * @opt_param string creativeFieldIds Select only creatives with these creative
-   * field IDs.
-   * @opt_param string ids Select only creatives with these IDs.
-   * @opt_param int maxResults Maximum number of results to return.
-   * @opt_param string pageToken Value of the nextPageToken from the previous
-   * result page.
-   * @opt_param string renderingIds Select only creatives with these rendering
-   * IDs.
-   * @opt_param string searchString Allows searching for objects by name or ID.
-   * Wildcards (*) are allowed. For example, "creative*2015" will return objects
-   * with names like "creative June 2015", "creative April 2015", or simply
-   * "creative 2015". Most of the searches also add wildcards implicitly at the
-   * start and the end of the search string. For example, a search string of
-   * "creative" will match objects with name "my creative", "creative 2015", or
-   * simply "creative".
-   * @opt_param string sizeIds Select only creatives with these size IDs.
-   * @opt_param string sortField Field by which to sort the list.
-   * @opt_param string sortOrder Order of sorted results, default is ASCENDING.
-   * @opt_param string studioCreativeId Select only creatives corresponding to
-   * this Studio creative ID.
-   * @opt_param string types Select only creatives with these creative types.
-   * @return Google_Service_Dfareporting_CreativesListResponse
-   */
-  public function listCreatives($profileId, $optParams = array())
-  {
-    $params = array('profileId' => $profileId);
-    $params = array_merge($params, $optParams);
-    return $this->call('list', array($params), "Google_Service_Dfareporting_CreativesListResponse");
-  }
-  /**
-   * Updates an existing creative. This method supports patch semantics.
-   * (creatives.patch)
-   *
-   * @param string $profileId User profile ID associated with this request.
-   * @param string $id Creative ID.
-   * @param Google_Service_Dfareporting_Creative $postBody
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Dfareporting_Creative
-   */
-  public function patch($profileId, $id, Google_Service_Dfareporting_Creative $postBody, $optParams = array())
-  {
-    $params = array('profileId' => $profileId, 'id' => $id, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('patch', array($params), "Google_Service_Dfareporting_Creative");
-  }
-  /**
-   * Updates an existing creative. (creatives.update)
-   *
-   * @param string $profileId User profile ID associated with this request.
-   * @param Google_Service_Dfareporting_Creative $postBody
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Dfareporting_Creative
-   */
-  public function update($profileId, Google_Service_Dfareporting_Creative $postBody, $optParams = array())
-  {
-    $params = array('profileId' => $profileId, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('update', array($params), "Google_Service_Dfareporting_Creative");
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/Resource/DimensionValues.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/Resource/DimensionValues.php
deleted file mode 100644
index c7ea3a23..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/Resource/DimensionValues.php
+++ /dev/null
@@ -1,47 +0,0 @@
-
- *   $dfareportingService = new Google_Service_Dfareporting(...);
- *   $dimensionValues = $dfareportingService->dimensionValues;
- *  
- */
-class Google_Service_Dfareporting_Resource_DimensionValues extends Google_Service_Resource
-{
-  /**
-   * Retrieves list of report dimension values for a list of filters.
-   * (dimensionValues.query)
-   *
-   * @param string $profileId The DFA user profile ID.
-   * @param Google_Service_Dfareporting_DimensionValueRequest $postBody
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param int maxResults Maximum number of results to return.
-   * @opt_param string pageToken The value of the nextToken from the previous
-   * result page.
-   * @return Google_Service_Dfareporting_DimensionValueList
-   */
-  public function query($profileId, Google_Service_Dfareporting_DimensionValueRequest $postBody, $optParams = array())
-  {
-    $params = array('profileId' => $profileId, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('query', array($params), "Google_Service_Dfareporting_DimensionValueList");
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/Resource/DirectorySiteContacts.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/Resource/DirectorySiteContacts.php
deleted file mode 100644
index fc05b0fb..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/Resource/DirectorySiteContacts.php
+++ /dev/null
@@ -1,73 +0,0 @@
-
- *   $dfareportingService = new Google_Service_Dfareporting(...);
- *   $directorySiteContacts = $dfareportingService->directorySiteContacts;
- *  
- */
-class Google_Service_Dfareporting_Resource_DirectorySiteContacts extends Google_Service_Resource
-{
-  /**
-   * Gets one directory site contact by ID. (directorySiteContacts.get)
-   *
-   * @param string $profileId User profile ID associated with this request.
-   * @param string $id Directory site contact ID.
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Dfareporting_DirectorySiteContact
-   */
-  public function get($profileId, $id, $optParams = array())
-  {
-    $params = array('profileId' => $profileId, 'id' => $id);
-    $params = array_merge($params, $optParams);
-    return $this->call('get', array($params), "Google_Service_Dfareporting_DirectorySiteContact");
-  }
-  /**
-   * Retrieves a list of directory site contacts, possibly filtered. This method
-   * supports paging. (directorySiteContacts.listDirectorySiteContacts)
-   *
-   * @param string $profileId User profile ID associated with this request.
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param string directorySiteIds Select only directory site contacts with
-   * these directory site IDs. This is a required field.
-   * @opt_param string ids Select only directory site contacts with these IDs.
-   * @opt_param int maxResults Maximum number of results to return.
-   * @opt_param string pageToken Value of the nextPageToken from the previous
-   * result page.
-   * @opt_param string searchString Allows searching for objects by name, ID or
-   * email. Wildcards (*) are allowed. For example, "directory site contact*2015"
-   * will return objects with names like "directory site contact June 2015",
-   * "directory site contact April 2015", or simply "directory site contact 2015".
-   * Most of the searches also add wildcards implicitly at the start and the end
-   * of the search string. For example, a search string of "directory site
-   * contact" will match objects with name "my directory site contact", "directory
-   * site contact 2015", or simply "directory site contact".
-   * @opt_param string sortField Field by which to sort the list.
-   * @opt_param string sortOrder Order of sorted results, default is ASCENDING.
-   * @return Google_Service_Dfareporting_DirectorySiteContactsListResponse
-   */
-  public function listDirectorySiteContacts($profileId, $optParams = array())
-  {
-    $params = array('profileId' => $profileId);
-    $params = array_merge($params, $optParams);
-    return $this->call('list', array($params), "Google_Service_Dfareporting_DirectorySiteContactsListResponse");
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/Resource/DirectorySites.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/Resource/DirectorySites.php
deleted file mode 100644
index ea3ac23f..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/Resource/DirectorySites.php
+++ /dev/null
@@ -1,96 +0,0 @@
-
- *   $dfareportingService = new Google_Service_Dfareporting(...);
- *   $directorySites = $dfareportingService->directorySites;
- *  
- */
-class Google_Service_Dfareporting_Resource_DirectorySites extends Google_Service_Resource
-{
-  /**
-   * Gets one directory site by ID. (directorySites.get)
-   *
-   * @param string $profileId User profile ID associated with this request.
-   * @param string $id Directory site ID.
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Dfareporting_DirectorySite
-   */
-  public function get($profileId, $id, $optParams = array())
-  {
-    $params = array('profileId' => $profileId, 'id' => $id);
-    $params = array_merge($params, $optParams);
-    return $this->call('get', array($params), "Google_Service_Dfareporting_DirectorySite");
-  }
-  /**
-   * Inserts a new directory site. (directorySites.insert)
-   *
-   * @param string $profileId User profile ID associated with this request.
-   * @param Google_Service_Dfareporting_DirectorySite $postBody
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Dfareporting_DirectorySite
-   */
-  public function insert($profileId, Google_Service_Dfareporting_DirectorySite $postBody, $optParams = array())
-  {
-    $params = array('profileId' => $profileId, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('insert', array($params), "Google_Service_Dfareporting_DirectorySite");
-  }
-  /**
-   * Retrieves a list of directory sites, possibly filtered. This method supports
-   * paging. (directorySites.listDirectorySites)
-   *
-   * @param string $profileId User profile ID associated with this request.
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param bool acceptsInStreamVideoPlacements This search filter is no
-   * longer supported and will have no effect on the results returned.
-   * @opt_param bool acceptsInterstitialPlacements This search filter is no longer
-   * supported and will have no effect on the results returned.
-   * @opt_param bool acceptsPublisherPaidPlacements Select only directory sites
-   * that accept publisher paid placements. This field can be left blank.
-   * @opt_param bool active Select only active directory sites. Leave blank to
-   * retrieve both active and inactive directory sites.
-   * @opt_param string countryId Select only directory sites with this country ID.
-   * @opt_param string dfp_network_code Select only directory sites with this DFP
-   * network code.
-   * @opt_param string ids Select only directory sites with these IDs.
-   * @opt_param int maxResults Maximum number of results to return.
-   * @opt_param string pageToken Value of the nextPageToken from the previous
-   * result page.
-   * @opt_param string parentId Select only directory sites with this parent ID.
-   * @opt_param string searchString Allows searching for objects by name, ID or
-   * URL. Wildcards (*) are allowed. For example, "directory site*2015" will
-   * return objects with names like "directory site June 2015", "directory site
-   * April 2015", or simply "directory site 2015". Most of the searches also add
-   * wildcards implicitly at the start and the end of the search string. For
-   * example, a search string of "directory site" will match objects with name "my
-   * directory site", "directory site 2015" or simply, "directory site".
-   * @opt_param string sortField Field by which to sort the list.
-   * @opt_param string sortOrder Order of sorted results, default is ASCENDING.
-   * @return Google_Service_Dfareporting_DirectorySitesListResponse
-   */
-  public function listDirectorySites($profileId, $optParams = array())
-  {
-    $params = array('profileId' => $profileId);
-    $params = array_merge($params, $optParams);
-    return $this->call('list', array($params), "Google_Service_Dfareporting_DirectorySitesListResponse");
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/Resource/DynamicTargetingKeys.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/Resource/DynamicTargetingKeys.php
deleted file mode 100644
index 2b210267..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/Resource/DynamicTargetingKeys.php
+++ /dev/null
@@ -1,88 +0,0 @@
-
- *   $dfareportingService = new Google_Service_Dfareporting(...);
- *   $dynamicTargetingKeys = $dfareportingService->dynamicTargetingKeys;
- *  
- */
-class Google_Service_Dfareporting_Resource_DynamicTargetingKeys extends Google_Service_Resource
-{
-  /**
-   * Deletes an existing dynamic targeting key. (dynamicTargetingKeys.delete)
-   *
-   * @param string $profileId User profile ID associated with this request.
-   * @param string $objectId ID of the object of this dynamic targeting key. This
-   * is a required field.
-   * @param string $name Name of this dynamic targeting key. This is a required
-   * field. Must be less than 256 characters long and cannot contain commas. All
-   * characters are converted to lowercase.
-   * @param string $objectType Type of the object of this dynamic targeting key.
-   * This is a required field.
-   * @param array $optParams Optional parameters.
-   */
-  public function delete($profileId, $objectId, $name, $objectType, $optParams = array())
-  {
-    $params = array('profileId' => $profileId, 'objectId' => $objectId, 'name' => $name, 'objectType' => $objectType);
-    $params = array_merge($params, $optParams);
-    return $this->call('delete', array($params));
-  }
-  /**
-   * Inserts a new dynamic targeting key. Keys must be created at the advertiser
-   * level before being assigned to the advertiser's ads, creatives, or
-   * placements. There is a maximum of 1000 keys per advertiser, out of which a
-   * maximum of 20 keys can be assigned per ad, creative, or placement.
-   * (dynamicTargetingKeys.insert)
-   *
-   * @param string $profileId User profile ID associated with this request.
-   * @param Google_Service_Dfareporting_DynamicTargetingKey $postBody
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Dfareporting_DynamicTargetingKey
-   */
-  public function insert($profileId, Google_Service_Dfareporting_DynamicTargetingKey $postBody, $optParams = array())
-  {
-    $params = array('profileId' => $profileId, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('insert', array($params), "Google_Service_Dfareporting_DynamicTargetingKey");
-  }
-  /**
-   * Retrieves a list of dynamic targeting keys.
-   * (dynamicTargetingKeys.listDynamicTargetingKeys)
-   *
-   * @param string $profileId User profile ID associated with this request.
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param string advertiserId Select only dynamic targeting keys whose
-   * object has this advertiser ID.
-   * @opt_param string names Select only dynamic targeting keys exactly matching
-   * these names.
-   * @opt_param string objectId Select only dynamic targeting keys with this
-   * object ID.
-   * @opt_param string objectType Select only dynamic targeting keys with this
-   * object type.
-   * @return Google_Service_Dfareporting_DynamicTargetingKeysListResponse
-   */
-  public function listDynamicTargetingKeys($profileId, $optParams = array())
-  {
-    $params = array('profileId' => $profileId);
-    $params = array_merge($params, $optParams);
-    return $this->call('list', array($params), "Google_Service_Dfareporting_DynamicTargetingKeysListResponse");
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/Resource/EventTags.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/Resource/EventTags.php
deleted file mode 100644
index 34ef31a4..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/Resource/EventTags.php
+++ /dev/null
@@ -1,146 +0,0 @@
-
- *   $dfareportingService = new Google_Service_Dfareporting(...);
- *   $eventTags = $dfareportingService->eventTags;
- *  
- */
-class Google_Service_Dfareporting_Resource_EventTags extends Google_Service_Resource
-{
-  /**
-   * Deletes an existing event tag. (eventTags.delete)
-   *
-   * @param string $profileId User profile ID associated with this request.
-   * @param string $id Event tag ID.
-   * @param array $optParams Optional parameters.
-   */
-  public function delete($profileId, $id, $optParams = array())
-  {
-    $params = array('profileId' => $profileId, 'id' => $id);
-    $params = array_merge($params, $optParams);
-    return $this->call('delete', array($params));
-  }
-  /**
-   * Gets one event tag by ID. (eventTags.get)
-   *
-   * @param string $profileId User profile ID associated with this request.
-   * @param string $id Event tag ID.
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Dfareporting_EventTag
-   */
-  public function get($profileId, $id, $optParams = array())
-  {
-    $params = array('profileId' => $profileId, 'id' => $id);
-    $params = array_merge($params, $optParams);
-    return $this->call('get', array($params), "Google_Service_Dfareporting_EventTag");
-  }
-  /**
-   * Inserts a new event tag. (eventTags.insert)
-   *
-   * @param string $profileId User profile ID associated with this request.
-   * @param Google_Service_Dfareporting_EventTag $postBody
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Dfareporting_EventTag
-   */
-  public function insert($profileId, Google_Service_Dfareporting_EventTag $postBody, $optParams = array())
-  {
-    $params = array('profileId' => $profileId, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('insert', array($params), "Google_Service_Dfareporting_EventTag");
-  }
-  /**
-   * Retrieves a list of event tags, possibly filtered. (eventTags.listEventTags)
-   *
-   * @param string $profileId User profile ID associated with this request.
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param string adId Select only event tags that belong to this ad.
-   * @opt_param string advertiserId Select only event tags that belong to this
-   * advertiser.
-   * @opt_param string campaignId Select only event tags that belong to this
-   * campaign.
-   * @opt_param bool definitionsOnly Examine only the specified campaign or
-   * advertiser's event tags for matching selector criteria. When set to false,
-   * the parent advertiser and parent campaign of the specified ad or campaign is
-   * examined as well. In addition, when set to false, the status field is
-   * examined as well, along with the enabledByDefault field. This parameter can
-   * not be set to true when adId is specified as ads do not define their own even
-   * tags.
-   * @opt_param bool enabled Select only enabled event tags. What is considered
-   * enabled or disabled depends on the definitionsOnly parameter. When
-   * definitionsOnly is set to true, only the specified advertiser or campaign's
-   * event tags' enabledByDefault field is examined. When definitionsOnly is set
-   * to false, the specified ad or specified campaign's parent advertiser's or
-   * parent campaign's event tags' enabledByDefault and status fields are examined
-   * as well.
-   * @opt_param string eventTagTypes Select only event tags with the specified
-   * event tag types. Event tag types can be used to specify whether to use a
-   * third-party pixel, a third-party JavaScript URL, or a third-party click-
-   * through URL for either impression or click tracking.
-   * @opt_param string ids Select only event tags with these IDs.
-   * @opt_param string searchString Allows searching for objects by name or ID.
-   * Wildcards (*) are allowed. For example, "eventtag*2015" will return objects
-   * with names like "eventtag June 2015", "eventtag April 2015", or simply
-   * "eventtag 2015". Most of the searches also add wildcards implicitly at the
-   * start and the end of the search string. For example, a search string of
-   * "eventtag" will match objects with name "my eventtag", "eventtag 2015", or
-   * simply "eventtag".
-   * @opt_param string sortField Field by which to sort the list.
-   * @opt_param string sortOrder Order of sorted results, default is ASCENDING.
-   * @return Google_Service_Dfareporting_EventTagsListResponse
-   */
-  public function listEventTags($profileId, $optParams = array())
-  {
-    $params = array('profileId' => $profileId);
-    $params = array_merge($params, $optParams);
-    return $this->call('list', array($params), "Google_Service_Dfareporting_EventTagsListResponse");
-  }
-  /**
-   * Updates an existing event tag. This method supports patch semantics.
-   * (eventTags.patch)
-   *
-   * @param string $profileId User profile ID associated with this request.
-   * @param string $id Event tag ID.
-   * @param Google_Service_Dfareporting_EventTag $postBody
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Dfareporting_EventTag
-   */
-  public function patch($profileId, $id, Google_Service_Dfareporting_EventTag $postBody, $optParams = array())
-  {
-    $params = array('profileId' => $profileId, 'id' => $id, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('patch', array($params), "Google_Service_Dfareporting_EventTag");
-  }
-  /**
-   * Updates an existing event tag. (eventTags.update)
-   *
-   * @param string $profileId User profile ID associated with this request.
-   * @param Google_Service_Dfareporting_EventTag $postBody
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Dfareporting_EventTag
-   */
-  public function update($profileId, Google_Service_Dfareporting_EventTag $postBody, $optParams = array())
-  {
-    $params = array('profileId' => $profileId, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('update', array($params), "Google_Service_Dfareporting_EventTag");
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/Resource/Files.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/Resource/Files.php
deleted file mode 100644
index 6ab986ea..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/Resource/Files.php
+++ /dev/null
@@ -1,63 +0,0 @@
-
- *   $dfareportingService = new Google_Service_Dfareporting(...);
- *   $files = $dfareportingService->files;
- *  
- */
-class Google_Service_Dfareporting_Resource_Files extends Google_Service_Resource
-{
-  /**
-   * Retrieves a report file by its report ID and file ID. (files.get)
-   *
-   * @param string $reportId The ID of the report.
-   * @param string $fileId The ID of the report file.
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Dfareporting_DfareportingFile
-   */
-  public function get($reportId, $fileId, $optParams = array())
-  {
-    $params = array('reportId' => $reportId, 'fileId' => $fileId);
-    $params = array_merge($params, $optParams);
-    return $this->call('get', array($params), "Google_Service_Dfareporting_DfareportingFile");
-  }
-  /**
-   * Lists files for a user profile. (files.listFiles)
-   *
-   * @param string $profileId The DFA profile ID.
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param int maxResults Maximum number of results to return.
-   * @opt_param string pageToken The value of the nextToken from the previous
-   * result page.
-   * @opt_param string scope The scope that defines which results are returned,
-   * default is 'MINE'.
-   * @opt_param string sortField The field by which to sort the list.
-   * @opt_param string sortOrder Order of sorted results, default is 'DESCENDING'.
-   * @return Google_Service_Dfareporting_FileList
-   */
-  public function listFiles($profileId, $optParams = array())
-  {
-    $params = array('profileId' => $profileId);
-    $params = array_merge($params, $optParams);
-    return $this->call('list', array($params), "Google_Service_Dfareporting_FileList");
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/Resource/FloodlightActivities.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/Resource/FloodlightActivities.php
deleted file mode 100644
index ddf61e83..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/Resource/FloodlightActivities.php
+++ /dev/null
@@ -1,162 +0,0 @@
-
- *   $dfareportingService = new Google_Service_Dfareporting(...);
- *   $floodlightActivities = $dfareportingService->floodlightActivities;
- *  
- */
-class Google_Service_Dfareporting_Resource_FloodlightActivities extends Google_Service_Resource
-{
-  /**
-   * Deletes an existing floodlight activity. (floodlightActivities.delete)
-   *
-   * @param string $profileId User profile ID associated with this request.
-   * @param string $id Floodlight activity ID.
-   * @param array $optParams Optional parameters.
-   */
-  public function delete($profileId, $id, $optParams = array())
-  {
-    $params = array('profileId' => $profileId, 'id' => $id);
-    $params = array_merge($params, $optParams);
-    return $this->call('delete', array($params));
-  }
-  /**
-   * Generates a tag for a floodlight activity. (floodlightActivities.generatetag)
-   *
-   * @param string $profileId User profile ID associated with this request.
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param string floodlightActivityId Floodlight activity ID for which we
-   * want to generate a tag.
-   * @return Google_Service_Dfareporting_FloodlightActivitiesGenerateTagResponse
-   */
-  public function generatetag($profileId, $optParams = array())
-  {
-    $params = array('profileId' => $profileId);
-    $params = array_merge($params, $optParams);
-    return $this->call('generatetag', array($params), "Google_Service_Dfareporting_FloodlightActivitiesGenerateTagResponse");
-  }
-  /**
-   * Gets one floodlight activity by ID. (floodlightActivities.get)
-   *
-   * @param string $profileId User profile ID associated with this request.
-   * @param string $id Floodlight activity ID.
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Dfareporting_FloodlightActivity
-   */
-  public function get($profileId, $id, $optParams = array())
-  {
-    $params = array('profileId' => $profileId, 'id' => $id);
-    $params = array_merge($params, $optParams);
-    return $this->call('get', array($params), "Google_Service_Dfareporting_FloodlightActivity");
-  }
-  /**
-   * Inserts a new floodlight activity. (floodlightActivities.insert)
-   *
-   * @param string $profileId User profile ID associated with this request.
-   * @param Google_Service_Dfareporting_FloodlightActivity $postBody
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Dfareporting_FloodlightActivity
-   */
-  public function insert($profileId, Google_Service_Dfareporting_FloodlightActivity $postBody, $optParams = array())
-  {
-    $params = array('profileId' => $profileId, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('insert', array($params), "Google_Service_Dfareporting_FloodlightActivity");
-  }
-  /**
-   * Retrieves a list of floodlight activities, possibly filtered. This method
-   * supports paging. (floodlightActivities.listFloodlightActivities)
-   *
-   * @param string $profileId User profile ID associated with this request.
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param string advertiserId Select only floodlight activities for the
-   * specified advertiser ID. Must specify either ids, advertiserId, or
-   * floodlightConfigurationId for a non-empty result.
-   * @opt_param string floodlightActivityGroupIds Select only floodlight
-   * activities with the specified floodlight activity group IDs.
-   * @opt_param string floodlightActivityGroupName Select only floodlight
-   * activities with the specified floodlight activity group name.
-   * @opt_param string floodlightActivityGroupTagString Select only floodlight
-   * activities with the specified floodlight activity group tag string.
-   * @opt_param string floodlightActivityGroupType Select only floodlight
-   * activities with the specified floodlight activity group type.
-   * @opt_param string floodlightConfigurationId Select only floodlight activities
-   * for the specified floodlight configuration ID. Must specify either ids,
-   * advertiserId, or floodlightConfigurationId for a non-empty result.
-   * @opt_param string ids Select only floodlight activities with the specified
-   * IDs. Must specify either ids, advertiserId, or floodlightConfigurationId for
-   * a non-empty result.
-   * @opt_param int maxResults Maximum number of results to return.
-   * @opt_param string pageToken Value of the nextPageToken from the previous
-   * result page.
-   * @opt_param string searchString Allows searching for objects by name or ID.
-   * Wildcards (*) are allowed. For example, "floodlightactivity*2015" will return
-   * objects with names like "floodlightactivity June 2015", "floodlightactivity
-   * April 2015", or simply "floodlightactivity 2015". Most of the searches also
-   * add wildcards implicitly at the start and the end of the search string. For
-   * example, a search string of "floodlightactivity" will match objects with name
-   * "my floodlightactivity activity", "floodlightactivity 2015", or simply
-   * "floodlightactivity".
-   * @opt_param string sortField Field by which to sort the list.
-   * @opt_param string sortOrder Order of sorted results, default is ASCENDING.
-   * @opt_param string tagString Select only floodlight activities with the
-   * specified tag string.
-   * @return Google_Service_Dfareporting_FloodlightActivitiesListResponse
-   */
-  public function listFloodlightActivities($profileId, $optParams = array())
-  {
-    $params = array('profileId' => $profileId);
-    $params = array_merge($params, $optParams);
-    return $this->call('list', array($params), "Google_Service_Dfareporting_FloodlightActivitiesListResponse");
-  }
-  /**
-   * Updates an existing floodlight activity. This method supports patch
-   * semantics. (floodlightActivities.patch)
-   *
-   * @param string $profileId User profile ID associated with this request.
-   * @param string $id Floodlight activity ID.
-   * @param Google_Service_Dfareporting_FloodlightActivity $postBody
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Dfareporting_FloodlightActivity
-   */
-  public function patch($profileId, $id, Google_Service_Dfareporting_FloodlightActivity $postBody, $optParams = array())
-  {
-    $params = array('profileId' => $profileId, 'id' => $id, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('patch', array($params), "Google_Service_Dfareporting_FloodlightActivity");
-  }
-  /**
-   * Updates an existing floodlight activity. (floodlightActivities.update)
-   *
-   * @param string $profileId User profile ID associated with this request.
-   * @param Google_Service_Dfareporting_FloodlightActivity $postBody
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Dfareporting_FloodlightActivity
-   */
-  public function update($profileId, Google_Service_Dfareporting_FloodlightActivity $postBody, $optParams = array())
-  {
-    $params = array('profileId' => $profileId, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('update', array($params), "Google_Service_Dfareporting_FloodlightActivity");
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/Resource/FloodlightActivityGroups.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/Resource/FloodlightActivityGroups.php
deleted file mode 100644
index 1eb3442f..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/Resource/FloodlightActivityGroups.php
+++ /dev/null
@@ -1,128 +0,0 @@
-
- *   $dfareportingService = new Google_Service_Dfareporting(...);
- *   $floodlightActivityGroups = $dfareportingService->floodlightActivityGroups;
- *  
- */
-class Google_Service_Dfareporting_Resource_FloodlightActivityGroups extends Google_Service_Resource
-{
-  /**
-   * Gets one floodlight activity group by ID. (floodlightActivityGroups.get)
-   *
-   * @param string $profileId User profile ID associated with this request.
-   * @param string $id Floodlight activity Group ID.
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Dfareporting_FloodlightActivityGroup
-   */
-  public function get($profileId, $id, $optParams = array())
-  {
-    $params = array('profileId' => $profileId, 'id' => $id);
-    $params = array_merge($params, $optParams);
-    return $this->call('get', array($params), "Google_Service_Dfareporting_FloodlightActivityGroup");
-  }
-  /**
-   * Inserts a new floodlight activity group. (floodlightActivityGroups.insert)
-   *
-   * @param string $profileId User profile ID associated with this request.
-   * @param Google_Service_Dfareporting_FloodlightActivityGroup $postBody
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Dfareporting_FloodlightActivityGroup
-   */
-  public function insert($profileId, Google_Service_Dfareporting_FloodlightActivityGroup $postBody, $optParams = array())
-  {
-    $params = array('profileId' => $profileId, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('insert', array($params), "Google_Service_Dfareporting_FloodlightActivityGroup");
-  }
-  /**
-   * Retrieves a list of floodlight activity groups, possibly filtered. This
-   * method supports paging.
-   * (floodlightActivityGroups.listFloodlightActivityGroups)
-   *
-   * @param string $profileId User profile ID associated with this request.
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param string advertiserId Select only floodlight activity groups with
-   * the specified advertiser ID. Must specify either advertiserId or
-   * floodlightConfigurationId for a non-empty result.
-   * @opt_param string floodlightConfigurationId Select only floodlight activity
-   * groups with the specified floodlight configuration ID. Must specify either
-   * advertiserId, or floodlightConfigurationId for a non-empty result.
-   * @opt_param string ids Select only floodlight activity groups with the
-   * specified IDs. Must specify either advertiserId or floodlightConfigurationId
-   * for a non-empty result.
-   * @opt_param int maxResults Maximum number of results to return.
-   * @opt_param string pageToken Value of the nextPageToken from the previous
-   * result page.
-   * @opt_param string searchString Allows searching for objects by name or ID.
-   * Wildcards (*) are allowed. For example, "floodlightactivitygroup*2015" will
-   * return objects with names like "floodlightactivitygroup June 2015",
-   * "floodlightactivitygroup April 2015", or simply "floodlightactivitygroup
-   * 2015". Most of the searches also add wildcards implicitly at the start and
-   * the end of the search string. For example, a search string of
-   * "floodlightactivitygroup" will match objects with name "my
-   * floodlightactivitygroup activity", "floodlightactivitygroup 2015", or simply
-   * "floodlightactivitygroup".
-   * @opt_param string sortField Field by which to sort the list.
-   * @opt_param string sortOrder Order of sorted results, default is ASCENDING.
-   * @opt_param string type Select only floodlight activity groups with the
-   * specified floodlight activity group type.
-   * @return Google_Service_Dfareporting_FloodlightActivityGroupsListResponse
-   */
-  public function listFloodlightActivityGroups($profileId, $optParams = array())
-  {
-    $params = array('profileId' => $profileId);
-    $params = array_merge($params, $optParams);
-    return $this->call('list', array($params), "Google_Service_Dfareporting_FloodlightActivityGroupsListResponse");
-  }
-  /**
-   * Updates an existing floodlight activity group. This method supports patch
-   * semantics. (floodlightActivityGroups.patch)
-   *
-   * @param string $profileId User profile ID associated with this request.
-   * @param string $id Floodlight activity Group ID.
-   * @param Google_Service_Dfareporting_FloodlightActivityGroup $postBody
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Dfareporting_FloodlightActivityGroup
-   */
-  public function patch($profileId, $id, Google_Service_Dfareporting_FloodlightActivityGroup $postBody, $optParams = array())
-  {
-    $params = array('profileId' => $profileId, 'id' => $id, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('patch', array($params), "Google_Service_Dfareporting_FloodlightActivityGroup");
-  }
-  /**
-   * Updates an existing floodlight activity group.
-   * (floodlightActivityGroups.update)
-   *
-   * @param string $profileId User profile ID associated with this request.
-   * @param Google_Service_Dfareporting_FloodlightActivityGroup $postBody
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Dfareporting_FloodlightActivityGroup
-   */
-  public function update($profileId, Google_Service_Dfareporting_FloodlightActivityGroup $postBody, $optParams = array())
-  {
-    $params = array('profileId' => $profileId, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('update', array($params), "Google_Service_Dfareporting_FloodlightActivityGroup");
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/Resource/FloodlightConfigurations.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/Resource/FloodlightConfigurations.php
deleted file mode 100644
index 43449332..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/Resource/FloodlightConfigurations.php
+++ /dev/null
@@ -1,90 +0,0 @@
-
- *   $dfareportingService = new Google_Service_Dfareporting(...);
- *   $floodlightConfigurations = $dfareportingService->floodlightConfigurations;
- *  
- */
-class Google_Service_Dfareporting_Resource_FloodlightConfigurations extends Google_Service_Resource
-{
-  /**
-   * Gets one floodlight configuration by ID. (floodlightConfigurations.get)
-   *
-   * @param string $profileId User profile ID associated with this request.
-   * @param string $id Floodlight configuration ID.
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Dfareporting_FloodlightConfiguration
-   */
-  public function get($profileId, $id, $optParams = array())
-  {
-    $params = array('profileId' => $profileId, 'id' => $id);
-    $params = array_merge($params, $optParams);
-    return $this->call('get', array($params), "Google_Service_Dfareporting_FloodlightConfiguration");
-  }
-  /**
-   * Retrieves a list of floodlight configurations, possibly filtered.
-   * (floodlightConfigurations.listFloodlightConfigurations)
-   *
-   * @param string $profileId User profile ID associated with this request.
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param string ids Set of IDs of floodlight configurations to retrieve.
-   * Required field; otherwise an empty list will be returned.
-   * @return Google_Service_Dfareporting_FloodlightConfigurationsListResponse
-   */
-  public function listFloodlightConfigurations($profileId, $optParams = array())
-  {
-    $params = array('profileId' => $profileId);
-    $params = array_merge($params, $optParams);
-    return $this->call('list', array($params), "Google_Service_Dfareporting_FloodlightConfigurationsListResponse");
-  }
-  /**
-   * Updates an existing floodlight configuration. This method supports patch
-   * semantics. (floodlightConfigurations.patch)
-   *
-   * @param string $profileId User profile ID associated with this request.
-   * @param string $id Floodlight configuration ID.
-   * @param Google_Service_Dfareporting_FloodlightConfiguration $postBody
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Dfareporting_FloodlightConfiguration
-   */
-  public function patch($profileId, $id, Google_Service_Dfareporting_FloodlightConfiguration $postBody, $optParams = array())
-  {
-    $params = array('profileId' => $profileId, 'id' => $id, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('patch', array($params), "Google_Service_Dfareporting_FloodlightConfiguration");
-  }
-  /**
-   * Updates an existing floodlight configuration.
-   * (floodlightConfigurations.update)
-   *
-   * @param string $profileId User profile ID associated with this request.
-   * @param Google_Service_Dfareporting_FloodlightConfiguration $postBody
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Dfareporting_FloodlightConfiguration
-   */
-  public function update($profileId, Google_Service_Dfareporting_FloodlightConfiguration $postBody, $optParams = array())
-  {
-    $params = array('profileId' => $profileId, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('update', array($params), "Google_Service_Dfareporting_FloodlightConfiguration");
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/Resource/InventoryItems.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/Resource/InventoryItems.php
deleted file mode 100644
index 39193822..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/Resource/InventoryItems.php
+++ /dev/null
@@ -1,71 +0,0 @@
-
- *   $dfareportingService = new Google_Service_Dfareporting(...);
- *   $inventoryItems = $dfareportingService->inventoryItems;
- *  
- */
-class Google_Service_Dfareporting_Resource_InventoryItems extends Google_Service_Resource
-{
-  /**
-   * Gets one inventory item by ID. (inventoryItems.get)
-   *
-   * @param string $profileId User profile ID associated with this request.
-   * @param string $projectId Project ID for order documents.
-   * @param string $id Inventory item ID.
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Dfareporting_InventoryItem
-   */
-  public function get($profileId, $projectId, $id, $optParams = array())
-  {
-    $params = array('profileId' => $profileId, 'projectId' => $projectId, 'id' => $id);
-    $params = array_merge($params, $optParams);
-    return $this->call('get', array($params), "Google_Service_Dfareporting_InventoryItem");
-  }
-  /**
-   * Retrieves a list of inventory items, possibly filtered. This method supports
-   * paging. (inventoryItems.listInventoryItems)
-   *
-   * @param string $profileId User profile ID associated with this request.
-   * @param string $projectId Project ID for order documents.
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param string ids Select only inventory items with these IDs.
-   * @opt_param bool inPlan Select only inventory items that are in plan.
-   * @opt_param int maxResults Maximum number of results to return.
-   * @opt_param string orderId Select only inventory items that belong to
-   * specified orders.
-   * @opt_param string pageToken Value of the nextPageToken from the previous
-   * result page.
-   * @opt_param string siteId Select only inventory items that are associated with
-   * these sites.
-   * @opt_param string sortField Field by which to sort the list.
-   * @opt_param string sortOrder Order of sorted results, default is ASCENDING.
-   * @opt_param string type Select only inventory items with this type.
-   * @return Google_Service_Dfareporting_InventoryItemsListResponse
-   */
-  public function listInventoryItems($profileId, $projectId, $optParams = array())
-  {
-    $params = array('profileId' => $profileId, 'projectId' => $projectId);
-    $params = array_merge($params, $optParams);
-    return $this->call('list', array($params), "Google_Service_Dfareporting_InventoryItemsListResponse");
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/Resource/LandingPages.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/Resource/LandingPages.php
deleted file mode 100644
index d067e4f7..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/Resource/LandingPages.php
+++ /dev/null
@@ -1,119 +0,0 @@
-
- *   $dfareportingService = new Google_Service_Dfareporting(...);
- *   $landingPages = $dfareportingService->landingPages;
- *  
- */
-class Google_Service_Dfareporting_Resource_LandingPages extends Google_Service_Resource
-{
-  /**
-   * Deletes an existing campaign landing page. (landingPages.delete)
-   *
-   * @param string $profileId User profile ID associated with this request.
-   * @param string $campaignId Landing page campaign ID.
-   * @param string $id Landing page ID.
-   * @param array $optParams Optional parameters.
-   */
-  public function delete($profileId, $campaignId, $id, $optParams = array())
-  {
-    $params = array('profileId' => $profileId, 'campaignId' => $campaignId, 'id' => $id);
-    $params = array_merge($params, $optParams);
-    return $this->call('delete', array($params));
-  }
-  /**
-   * Gets one campaign landing page by ID. (landingPages.get)
-   *
-   * @param string $profileId User profile ID associated with this request.
-   * @param string $campaignId Landing page campaign ID.
-   * @param string $id Landing page ID.
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Dfareporting_LandingPage
-   */
-  public function get($profileId, $campaignId, $id, $optParams = array())
-  {
-    $params = array('profileId' => $profileId, 'campaignId' => $campaignId, 'id' => $id);
-    $params = array_merge($params, $optParams);
-    return $this->call('get', array($params), "Google_Service_Dfareporting_LandingPage");
-  }
-  /**
-   * Inserts a new landing page for the specified campaign. (landingPages.insert)
-   *
-   * @param string $profileId User profile ID associated with this request.
-   * @param string $campaignId Landing page campaign ID.
-   * @param Google_Service_Dfareporting_LandingPage $postBody
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Dfareporting_LandingPage
-   */
-  public function insert($profileId, $campaignId, Google_Service_Dfareporting_LandingPage $postBody, $optParams = array())
-  {
-    $params = array('profileId' => $profileId, 'campaignId' => $campaignId, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('insert', array($params), "Google_Service_Dfareporting_LandingPage");
-  }
-  /**
-   * Retrieves the list of landing pages for the specified campaign.
-   * (landingPages.listLandingPages)
-   *
-   * @param string $profileId User profile ID associated with this request.
-   * @param string $campaignId Landing page campaign ID.
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Dfareporting_LandingPagesListResponse
-   */
-  public function listLandingPages($profileId, $campaignId, $optParams = array())
-  {
-    $params = array('profileId' => $profileId, 'campaignId' => $campaignId);
-    $params = array_merge($params, $optParams);
-    return $this->call('list', array($params), "Google_Service_Dfareporting_LandingPagesListResponse");
-  }
-  /**
-   * Updates an existing campaign landing page. This method supports patch
-   * semantics. (landingPages.patch)
-   *
-   * @param string $profileId User profile ID associated with this request.
-   * @param string $campaignId Landing page campaign ID.
-   * @param string $id Landing page ID.
-   * @param Google_Service_Dfareporting_LandingPage $postBody
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Dfareporting_LandingPage
-   */
-  public function patch($profileId, $campaignId, $id, Google_Service_Dfareporting_LandingPage $postBody, $optParams = array())
-  {
-    $params = array('profileId' => $profileId, 'campaignId' => $campaignId, 'id' => $id, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('patch', array($params), "Google_Service_Dfareporting_LandingPage");
-  }
-  /**
-   * Updates an existing campaign landing page. (landingPages.update)
-   *
-   * @param string $profileId User profile ID associated with this request.
-   * @param string $campaignId Landing page campaign ID.
-   * @param Google_Service_Dfareporting_LandingPage $postBody
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Dfareporting_LandingPage
-   */
-  public function update($profileId, $campaignId, Google_Service_Dfareporting_LandingPage $postBody, $optParams = array())
-  {
-    $params = array('profileId' => $profileId, 'campaignId' => $campaignId, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('update', array($params), "Google_Service_Dfareporting_LandingPage");
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/Resource/Languages.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/Resource/Languages.php
deleted file mode 100644
index 79e856af..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/Resource/Languages.php
+++ /dev/null
@@ -1,41 +0,0 @@
-
- *   $dfareportingService = new Google_Service_Dfareporting(...);
- *   $languages = $dfareportingService->languages;
- *  
- */
-class Google_Service_Dfareporting_Resource_Languages extends Google_Service_Resource
-{
-  /**
-   * Retrieves a list of languages. (languages.listLanguages)
-   *
-   * @param string $profileId User profile ID associated with this request.
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Dfareporting_LanguagesListResponse
-   */
-  public function listLanguages($profileId, $optParams = array())
-  {
-    $params = array('profileId' => $profileId);
-    $params = array_merge($params, $optParams);
-    return $this->call('list', array($params), "Google_Service_Dfareporting_LanguagesListResponse");
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/Resource/Metros.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/Resource/Metros.php
deleted file mode 100644
index 57cf15e6..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/Resource/Metros.php
+++ /dev/null
@@ -1,41 +0,0 @@
-
- *   $dfareportingService = new Google_Service_Dfareporting(...);
- *   $metros = $dfareportingService->metros;
- *  
- */
-class Google_Service_Dfareporting_Resource_Metros extends Google_Service_Resource
-{
-  /**
-   * Retrieves a list of metros. (metros.listMetros)
-   *
-   * @param string $profileId User profile ID associated with this request.
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Dfareporting_MetrosListResponse
-   */
-  public function listMetros($profileId, $optParams = array())
-  {
-    $params = array('profileId' => $profileId);
-    $params = array_merge($params, $optParams);
-    return $this->call('list', array($params), "Google_Service_Dfareporting_MetrosListResponse");
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/Resource/MobileCarriers.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/Resource/MobileCarriers.php
deleted file mode 100644
index a9c62290..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/Resource/MobileCarriers.php
+++ /dev/null
@@ -1,55 +0,0 @@
-
- *   $dfareportingService = new Google_Service_Dfareporting(...);
- *   $mobileCarriers = $dfareportingService->mobileCarriers;
- *  
- */
-class Google_Service_Dfareporting_Resource_MobileCarriers extends Google_Service_Resource
-{
-  /**
-   * Gets one mobile carrier by ID. (mobileCarriers.get)
-   *
-   * @param string $profileId User profile ID associated with this request.
-   * @param string $id Mobile carrier ID.
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Dfareporting_MobileCarrier
-   */
-  public function get($profileId, $id, $optParams = array())
-  {
-    $params = array('profileId' => $profileId, 'id' => $id);
-    $params = array_merge($params, $optParams);
-    return $this->call('get', array($params), "Google_Service_Dfareporting_MobileCarrier");
-  }
-  /**
-   * Retrieves a list of mobile carriers. (mobileCarriers.listMobileCarriers)
-   *
-   * @param string $profileId User profile ID associated with this request.
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Dfareporting_MobileCarriersListResponse
-   */
-  public function listMobileCarriers($profileId, $optParams = array())
-  {
-    $params = array('profileId' => $profileId);
-    $params = array_merge($params, $optParams);
-    return $this->call('list', array($params), "Google_Service_Dfareporting_MobileCarriersListResponse");
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/Resource/OperatingSystemVersions.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/Resource/OperatingSystemVersions.php
deleted file mode 100644
index d5b7903e..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/Resource/OperatingSystemVersions.php
+++ /dev/null
@@ -1,56 +0,0 @@
-
- *   $dfareportingService = new Google_Service_Dfareporting(...);
- *   $operatingSystemVersions = $dfareportingService->operatingSystemVersions;
- *  
- */
-class Google_Service_Dfareporting_Resource_OperatingSystemVersions extends Google_Service_Resource
-{
-  /**
-   * Gets one operating system version by ID. (operatingSystemVersions.get)
-   *
-   * @param string $profileId User profile ID associated with this request.
-   * @param string $id Operating system version ID.
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Dfareporting_OperatingSystemVersion
-   */
-  public function get($profileId, $id, $optParams = array())
-  {
-    $params = array('profileId' => $profileId, 'id' => $id);
-    $params = array_merge($params, $optParams);
-    return $this->call('get', array($params), "Google_Service_Dfareporting_OperatingSystemVersion");
-  }
-  /**
-   * Retrieves a list of operating system versions.
-   * (operatingSystemVersions.listOperatingSystemVersions)
-   *
-   * @param string $profileId User profile ID associated with this request.
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Dfareporting_OperatingSystemVersionsListResponse
-   */
-  public function listOperatingSystemVersions($profileId, $optParams = array())
-  {
-    $params = array('profileId' => $profileId);
-    $params = array_merge($params, $optParams);
-    return $this->call('list', array($params), "Google_Service_Dfareporting_OperatingSystemVersionsListResponse");
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/Resource/OperatingSystems.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/Resource/OperatingSystems.php
deleted file mode 100644
index c17b2635..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/Resource/OperatingSystems.php
+++ /dev/null
@@ -1,56 +0,0 @@
-
- *   $dfareportingService = new Google_Service_Dfareporting(...);
- *   $operatingSystems = $dfareportingService->operatingSystems;
- *  
- */
-class Google_Service_Dfareporting_Resource_OperatingSystems extends Google_Service_Resource
-{
-  /**
-   * Gets one operating system by DART ID. (operatingSystems.get)
-   *
-   * @param string $profileId User profile ID associated with this request.
-   * @param string $dartId Operating system DART ID.
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Dfareporting_OperatingSystem
-   */
-  public function get($profileId, $dartId, $optParams = array())
-  {
-    $params = array('profileId' => $profileId, 'dartId' => $dartId);
-    $params = array_merge($params, $optParams);
-    return $this->call('get', array($params), "Google_Service_Dfareporting_OperatingSystem");
-  }
-  /**
-   * Retrieves a list of operating systems.
-   * (operatingSystems.listOperatingSystems)
-   *
-   * @param string $profileId User profile ID associated with this request.
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Dfareporting_OperatingSystemsListResponse
-   */
-  public function listOperatingSystems($profileId, $optParams = array())
-  {
-    $params = array('profileId' => $profileId);
-    $params = array_merge($params, $optParams);
-    return $this->call('list', array($params), "Google_Service_Dfareporting_OperatingSystemsListResponse");
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/Resource/OrderDocuments.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/Resource/OrderDocuments.php
deleted file mode 100644
index 281d64cc..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/Resource/OrderDocuments.php
+++ /dev/null
@@ -1,78 +0,0 @@
-
- *   $dfareportingService = new Google_Service_Dfareporting(...);
- *   $orderDocuments = $dfareportingService->orderDocuments;
- *  
- */
-class Google_Service_Dfareporting_Resource_OrderDocuments extends Google_Service_Resource
-{
-  /**
-   * Gets one order document by ID. (orderDocuments.get)
-   *
-   * @param string $profileId User profile ID associated with this request.
-   * @param string $projectId Project ID for order documents.
-   * @param string $id Order document ID.
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Dfareporting_OrderDocument
-   */
-  public function get($profileId, $projectId, $id, $optParams = array())
-  {
-    $params = array('profileId' => $profileId, 'projectId' => $projectId, 'id' => $id);
-    $params = array_merge($params, $optParams);
-    return $this->call('get', array($params), "Google_Service_Dfareporting_OrderDocument");
-  }
-  /**
-   * Retrieves a list of order documents, possibly filtered. This method supports
-   * paging. (orderDocuments.listOrderDocuments)
-   *
-   * @param string $profileId User profile ID associated with this request.
-   * @param string $projectId Project ID for order documents.
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param bool approved Select only order documents that have been approved
-   * by at least one user.
-   * @opt_param string ids Select only order documents with these IDs.
-   * @opt_param int maxResults Maximum number of results to return.
-   * @opt_param string orderId Select only order documents for specified orders.
-   * @opt_param string pageToken Value of the nextPageToken from the previous
-   * result page.
-   * @opt_param string searchString Allows searching for order documents by name
-   * or ID. Wildcards (*) are allowed. For example, "orderdocument*2015" will
-   * return order documents with names like "orderdocument June 2015",
-   * "orderdocument April 2015", or simply "orderdocument 2015". Most of the
-   * searches also add wildcards implicitly at the start and the end of the search
-   * string. For example, a search string of "orderdocument" will match order
-   * documents with name "my orderdocument", "orderdocument 2015", or simply
-   * "orderdocument".
-   * @opt_param string siteId Select only order documents that are associated with
-   * these sites.
-   * @opt_param string sortField Field by which to sort the list.
-   * @opt_param string sortOrder Order of sorted results, default is ASCENDING.
-   * @return Google_Service_Dfareporting_OrderDocumentsListResponse
-   */
-  public function listOrderDocuments($profileId, $projectId, $optParams = array())
-  {
-    $params = array('profileId' => $profileId, 'projectId' => $projectId);
-    $params = array_merge($params, $optParams);
-    return $this->call('list', array($params), "Google_Service_Dfareporting_OrderDocumentsListResponse");
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/Resource/Orders.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/Resource/Orders.php
deleted file mode 100644
index ce882dda..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/Resource/Orders.php
+++ /dev/null
@@ -1,73 +0,0 @@
-
- *   $dfareportingService = new Google_Service_Dfareporting(...);
- *   $orders = $dfareportingService->orders;
- *  
- */
-class Google_Service_Dfareporting_Resource_Orders extends Google_Service_Resource
-{
-  /**
-   * Gets one order by ID. (orders.get)
-   *
-   * @param string $profileId User profile ID associated with this request.
-   * @param string $projectId Project ID for orders.
-   * @param string $id Order ID.
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Dfareporting_Order
-   */
-  public function get($profileId, $projectId, $id, $optParams = array())
-  {
-    $params = array('profileId' => $profileId, 'projectId' => $projectId, 'id' => $id);
-    $params = array_merge($params, $optParams);
-    return $this->call('get', array($params), "Google_Service_Dfareporting_Order");
-  }
-  /**
-   * Retrieves a list of orders, possibly filtered. This method supports paging.
-   * (orders.listOrders)
-   *
-   * @param string $profileId User profile ID associated with this request.
-   * @param string $projectId Project ID for orders.
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param string ids Select only orders with these IDs.
-   * @opt_param int maxResults Maximum number of results to return.
-   * @opt_param string pageToken Value of the nextPageToken from the previous
-   * result page.
-   * @opt_param string searchString Allows searching for orders by name or ID.
-   * Wildcards (*) are allowed. For example, "order*2015" will return orders with
-   * names like "order June 2015", "order April 2015", or simply "order 2015".
-   * Most of the searches also add wildcards implicitly at the start and the end
-   * of the search string. For example, a search string of "order" will match
-   * orders with name "my order", "order 2015", or simply "order".
-   * @opt_param string siteId Select only orders that are associated with these
-   * site IDs.
-   * @opt_param string sortField Field by which to sort the list.
-   * @opt_param string sortOrder Order of sorted results, default is ASCENDING.
-   * @return Google_Service_Dfareporting_OrdersListResponse
-   */
-  public function listOrders($profileId, $projectId, $optParams = array())
-  {
-    $params = array('profileId' => $profileId, 'projectId' => $projectId);
-    $params = array_merge($params, $optParams);
-    return $this->call('list', array($params), "Google_Service_Dfareporting_OrdersListResponse");
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/Resource/PlacementGroups.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/Resource/PlacementGroups.php
deleted file mode 100644
index 97b9a75c..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/Resource/PlacementGroups.php
+++ /dev/null
@@ -1,148 +0,0 @@
-
- *   $dfareportingService = new Google_Service_Dfareporting(...);
- *   $placementGroups = $dfareportingService->placementGroups;
- *  
- */
-class Google_Service_Dfareporting_Resource_PlacementGroups extends Google_Service_Resource
-{
-  /**
-   * Gets one placement group by ID. (placementGroups.get)
-   *
-   * @param string $profileId User profile ID associated with this request.
-   * @param string $id Placement group ID.
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Dfareporting_PlacementGroup
-   */
-  public function get($profileId, $id, $optParams = array())
-  {
-    $params = array('profileId' => $profileId, 'id' => $id);
-    $params = array_merge($params, $optParams);
-    return $this->call('get', array($params), "Google_Service_Dfareporting_PlacementGroup");
-  }
-  /**
-   * Inserts a new placement group. (placementGroups.insert)
-   *
-   * @param string $profileId User profile ID associated with this request.
-   * @param Google_Service_Dfareporting_PlacementGroup $postBody
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Dfareporting_PlacementGroup
-   */
-  public function insert($profileId, Google_Service_Dfareporting_PlacementGroup $postBody, $optParams = array())
-  {
-    $params = array('profileId' => $profileId, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('insert', array($params), "Google_Service_Dfareporting_PlacementGroup");
-  }
-  /**
-   * Retrieves a list of placement groups, possibly filtered. This method supports
-   * paging. (placementGroups.listPlacementGroups)
-   *
-   * @param string $profileId User profile ID associated with this request.
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param string advertiserIds Select only placement groups that belong to
-   * these advertisers.
-   * @opt_param bool archived Select only archived placements. Don't set this
-   * field to select both archived and non-archived placements.
-   * @opt_param string campaignIds Select only placement groups that belong to
-   * these campaigns.
-   * @opt_param string contentCategoryIds Select only placement groups that are
-   * associated with these content categories.
-   * @opt_param string directorySiteIds Select only placement groups that are
-   * associated with these directory sites.
-   * @opt_param string ids Select only placement groups with these IDs.
-   * @opt_param string maxEndDate Select only placements or placement groups whose
-   * end date is on or before the specified maxEndDate. The date should be
-   * formatted as "yyyy-MM-dd".
-   * @opt_param int maxResults Maximum number of results to return.
-   * @opt_param string maxStartDate Select only placements or placement groups
-   * whose start date is on or before the specified maxStartDate. The date should
-   * be formatted as "yyyy-MM-dd".
-   * @opt_param string minEndDate Select only placements or placement groups whose
-   * end date is on or after the specified minEndDate. The date should be
-   * formatted as "yyyy-MM-dd".
-   * @opt_param string minStartDate Select only placements or placement groups
-   * whose start date is on or after the specified minStartDate. The date should
-   * be formatted as "yyyy-MM-dd".
-   * @opt_param string pageToken Value of the nextPageToken from the previous
-   * result page.
-   * @opt_param string placementGroupType Select only placement groups belonging
-   * with this group type. A package is a simple group of placements that acts as
-   * a single pricing point for a group of tags. A roadblock is a group of
-   * placements that not only acts as a single pricing point but also assumes that
-   * all the tags in it will be served at the same time. A roadblock requires one
-   * of its assigned placements to be marked as primary for reporting.
-   * @opt_param string placementStrategyIds Select only placement groups that are
-   * associated with these placement strategies.
-   * @opt_param string pricingTypes Select only placement groups with these
-   * pricing types.
-   * @opt_param string searchString Allows searching for placement groups by name
-   * or ID. Wildcards (*) are allowed. For example, "placement*2015" will return
-   * placement groups with names like "placement group June 2015", "placement
-   * group May 2015", or simply "placements 2015". Most of the searches also add
-   * wildcards implicitly at the start and the end of the search string. For
-   * example, a search string of "placementgroup" will match placement groups with
-   * name "my placementgroup", "placementgroup 2015", or simply "placementgroup".
-   * @opt_param string siteIds Select only placement groups that are associated
-   * with these sites.
-   * @opt_param string sortField Field by which to sort the list.
-   * @opt_param string sortOrder Order of sorted results, default is ASCENDING.
-   * @return Google_Service_Dfareporting_PlacementGroupsListResponse
-   */
-  public function listPlacementGroups($profileId, $optParams = array())
-  {
-    $params = array('profileId' => $profileId);
-    $params = array_merge($params, $optParams);
-    return $this->call('list', array($params), "Google_Service_Dfareporting_PlacementGroupsListResponse");
-  }
-  /**
-   * Updates an existing placement group. This method supports patch semantics.
-   * (placementGroups.patch)
-   *
-   * @param string $profileId User profile ID associated with this request.
-   * @param string $id Placement group ID.
-   * @param Google_Service_Dfareporting_PlacementGroup $postBody
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Dfareporting_PlacementGroup
-   */
-  public function patch($profileId, $id, Google_Service_Dfareporting_PlacementGroup $postBody, $optParams = array())
-  {
-    $params = array('profileId' => $profileId, 'id' => $id, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('patch', array($params), "Google_Service_Dfareporting_PlacementGroup");
-  }
-  /**
-   * Updates an existing placement group. (placementGroups.update)
-   *
-   * @param string $profileId User profile ID associated with this request.
-   * @param Google_Service_Dfareporting_PlacementGroup $postBody
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Dfareporting_PlacementGroup
-   */
-  public function update($profileId, Google_Service_Dfareporting_PlacementGroup $postBody, $optParams = array())
-  {
-    $params = array('profileId' => $profileId, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('update', array($params), "Google_Service_Dfareporting_PlacementGroup");
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/Resource/PlacementStrategies.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/Resource/PlacementStrategies.php
deleted file mode 100644
index 7ce914cd..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/Resource/PlacementStrategies.php
+++ /dev/null
@@ -1,128 +0,0 @@
-
- *   $dfareportingService = new Google_Service_Dfareporting(...);
- *   $placementStrategies = $dfareportingService->placementStrategies;
- *  
- */
-class Google_Service_Dfareporting_Resource_PlacementStrategies extends Google_Service_Resource
-{
-  /**
-   * Deletes an existing placement strategy. (placementStrategies.delete)
-   *
-   * @param string $profileId User profile ID associated with this request.
-   * @param string $id Placement strategy ID.
-   * @param array $optParams Optional parameters.
-   */
-  public function delete($profileId, $id, $optParams = array())
-  {
-    $params = array('profileId' => $profileId, 'id' => $id);
-    $params = array_merge($params, $optParams);
-    return $this->call('delete', array($params));
-  }
-  /**
-   * Gets one placement strategy by ID. (placementStrategies.get)
-   *
-   * @param string $profileId User profile ID associated with this request.
-   * @param string $id Placement strategy ID.
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Dfareporting_PlacementStrategy
-   */
-  public function get($profileId, $id, $optParams = array())
-  {
-    $params = array('profileId' => $profileId, 'id' => $id);
-    $params = array_merge($params, $optParams);
-    return $this->call('get', array($params), "Google_Service_Dfareporting_PlacementStrategy");
-  }
-  /**
-   * Inserts a new placement strategy. (placementStrategies.insert)
-   *
-   * @param string $profileId User profile ID associated with this request.
-   * @param Google_Service_Dfareporting_PlacementStrategy $postBody
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Dfareporting_PlacementStrategy
-   */
-  public function insert($profileId, Google_Service_Dfareporting_PlacementStrategy $postBody, $optParams = array())
-  {
-    $params = array('profileId' => $profileId, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('insert', array($params), "Google_Service_Dfareporting_PlacementStrategy");
-  }
-  /**
-   * Retrieves a list of placement strategies, possibly filtered. This method
-   * supports paging. (placementStrategies.listPlacementStrategies)
-   *
-   * @param string $profileId User profile ID associated with this request.
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param string ids Select only placement strategies with these IDs.
-   * @opt_param int maxResults Maximum number of results to return.
-   * @opt_param string pageToken Value of the nextPageToken from the previous
-   * result page.
-   * @opt_param string searchString Allows searching for objects by name or ID.
-   * Wildcards (*) are allowed. For example, "placementstrategy*2015" will return
-   * objects with names like "placementstrategy June 2015", "placementstrategy
-   * April 2015", or simply "placementstrategy 2015". Most of the searches also
-   * add wildcards implicitly at the start and the end of the search string. For
-   * example, a search string of "placementstrategy" will match objects with name
-   * "my placementstrategy", "placementstrategy 2015", or simply
-   * "placementstrategy".
-   * @opt_param string sortField Field by which to sort the list.
-   * @opt_param string sortOrder Order of sorted results, default is ASCENDING.
-   * @return Google_Service_Dfareporting_PlacementStrategiesListResponse
-   */
-  public function listPlacementStrategies($profileId, $optParams = array())
-  {
-    $params = array('profileId' => $profileId);
-    $params = array_merge($params, $optParams);
-    return $this->call('list', array($params), "Google_Service_Dfareporting_PlacementStrategiesListResponse");
-  }
-  /**
-   * Updates an existing placement strategy. This method supports patch semantics.
-   * (placementStrategies.patch)
-   *
-   * @param string $profileId User profile ID associated with this request.
-   * @param string $id Placement strategy ID.
-   * @param Google_Service_Dfareporting_PlacementStrategy $postBody
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Dfareporting_PlacementStrategy
-   */
-  public function patch($profileId, $id, Google_Service_Dfareporting_PlacementStrategy $postBody, $optParams = array())
-  {
-    $params = array('profileId' => $profileId, 'id' => $id, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('patch', array($params), "Google_Service_Dfareporting_PlacementStrategy");
-  }
-  /**
-   * Updates an existing placement strategy. (placementStrategies.update)
-   *
-   * @param string $profileId User profile ID associated with this request.
-   * @param Google_Service_Dfareporting_PlacementStrategy $postBody
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Dfareporting_PlacementStrategy
-   */
-  public function update($profileId, Google_Service_Dfareporting_PlacementStrategy $postBody, $optParams = array())
-  {
-    $params = array('profileId' => $profileId, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('update', array($params), "Google_Service_Dfareporting_PlacementStrategy");
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/Resource/Placements.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/Resource/Placements.php
deleted file mode 100644
index cf27a58a..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/Resource/Placements.php
+++ /dev/null
@@ -1,172 +0,0 @@
-
- *   $dfareportingService = new Google_Service_Dfareporting(...);
- *   $placements = $dfareportingService->placements;
- *  
- */
-class Google_Service_Dfareporting_Resource_Placements extends Google_Service_Resource
-{
-  /**
-   * Generates tags for a placement. (placements.generatetags)
-   *
-   * @param string $profileId User profile ID associated with this request.
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param string campaignId Generate placements belonging to this campaign.
-   * This is a required field.
-   * @opt_param string placementIds Generate tags for these placements.
-   * @opt_param string tagFormats Tag formats to generate for these placements.
-   * @return Google_Service_Dfareporting_PlacementsGenerateTagsResponse
-   */
-  public function generatetags($profileId, $optParams = array())
-  {
-    $params = array('profileId' => $profileId);
-    $params = array_merge($params, $optParams);
-    return $this->call('generatetags', array($params), "Google_Service_Dfareporting_PlacementsGenerateTagsResponse");
-  }
-  /**
-   * Gets one placement by ID. (placements.get)
-   *
-   * @param string $profileId User profile ID associated with this request.
-   * @param string $id Placement ID.
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Dfareporting_Placement
-   */
-  public function get($profileId, $id, $optParams = array())
-  {
-    $params = array('profileId' => $profileId, 'id' => $id);
-    $params = array_merge($params, $optParams);
-    return $this->call('get', array($params), "Google_Service_Dfareporting_Placement");
-  }
-  /**
-   * Inserts a new placement. (placements.insert)
-   *
-   * @param string $profileId User profile ID associated with this request.
-   * @param Google_Service_Dfareporting_Placement $postBody
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Dfareporting_Placement
-   */
-  public function insert($profileId, Google_Service_Dfareporting_Placement $postBody, $optParams = array())
-  {
-    $params = array('profileId' => $profileId, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('insert', array($params), "Google_Service_Dfareporting_Placement");
-  }
-  /**
-   * Retrieves a list of placements, possibly filtered. This method supports
-   * paging. (placements.listPlacements)
-   *
-   * @param string $profileId User profile ID associated with this request.
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param string advertiserIds Select only placements that belong to these
-   * advertisers.
-   * @opt_param bool archived Select only archived placements. Don't set this
-   * field to select both archived and non-archived placements.
-   * @opt_param string campaignIds Select only placements that belong to these
-   * campaigns.
-   * @opt_param string compatibilities Select only placements that are associated
-   * with these compatibilities. DISPLAY and DISPLAY_INTERSTITIAL refer to
-   * rendering either on desktop or on mobile devices for regular or interstitial
-   * ads respectively. APP and APP_INTERSTITIAL are for rendering in mobile apps.
-   * IN_STREAM_VIDEO refers to rendering in in-stream video ads developed with the
-   * VAST standard.
-   * @opt_param string contentCategoryIds Select only placements that are
-   * associated with these content categories.
-   * @opt_param string directorySiteIds Select only placements that are associated
-   * with these directory sites.
-   * @opt_param string groupIds Select only placements that belong to these
-   * placement groups.
-   * @opt_param string ids Select only placements with these IDs.
-   * @opt_param string maxEndDate Select only placements or placement groups whose
-   * end date is on or before the specified maxEndDate. The date should be
-   * formatted as "yyyy-MM-dd".
-   * @opt_param int maxResults Maximum number of results to return.
-   * @opt_param string maxStartDate Select only placements or placement groups
-   * whose start date is on or before the specified maxStartDate. The date should
-   * be formatted as "yyyy-MM-dd".
-   * @opt_param string minEndDate Select only placements or placement groups whose
-   * end date is on or after the specified minEndDate. The date should be
-   * formatted as "yyyy-MM-dd".
-   * @opt_param string minStartDate Select only placements or placement groups
-   * whose start date is on or after the specified minStartDate. The date should
-   * be formatted as "yyyy-MM-dd".
-   * @opt_param string pageToken Value of the nextPageToken from the previous
-   * result page.
-   * @opt_param string paymentSource Select only placements with this payment
-   * source.
-   * @opt_param string placementStrategyIds Select only placements that are
-   * associated with these placement strategies.
-   * @opt_param string pricingTypes Select only placements with these pricing
-   * types.
-   * @opt_param string searchString Allows searching for placements by name or ID.
-   * Wildcards (*) are allowed. For example, "placement*2015" will return
-   * placements with names like "placement June 2015", "placement May 2015", or
-   * simply "placements 2015". Most of the searches also add wildcards implicitly
-   * at the start and the end of the search string. For example, a search string
-   * of "placement" will match placements with name "my placement", "placement
-   * 2015", or simply "placement".
-   * @opt_param string siteIds Select only placements that are associated with
-   * these sites.
-   * @opt_param string sizeIds Select only placements that are associated with
-   * these sizes.
-   * @opt_param string sortField Field by which to sort the list.
-   * @opt_param string sortOrder Order of sorted results, default is ASCENDING.
-   * @return Google_Service_Dfareporting_PlacementsListResponse
-   */
-  public function listPlacements($profileId, $optParams = array())
-  {
-    $params = array('profileId' => $profileId);
-    $params = array_merge($params, $optParams);
-    return $this->call('list', array($params), "Google_Service_Dfareporting_PlacementsListResponse");
-  }
-  /**
-   * Updates an existing placement. This method supports patch semantics.
-   * (placements.patch)
-   *
-   * @param string $profileId User profile ID associated with this request.
-   * @param string $id Placement ID.
-   * @param Google_Service_Dfareporting_Placement $postBody
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Dfareporting_Placement
-   */
-  public function patch($profileId, $id, Google_Service_Dfareporting_Placement $postBody, $optParams = array())
-  {
-    $params = array('profileId' => $profileId, 'id' => $id, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('patch', array($params), "Google_Service_Dfareporting_Placement");
-  }
-  /**
-   * Updates an existing placement. (placements.update)
-   *
-   * @param string $profileId User profile ID associated with this request.
-   * @param Google_Service_Dfareporting_Placement $postBody
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Dfareporting_Placement
-   */
-  public function update($profileId, Google_Service_Dfareporting_Placement $postBody, $optParams = array())
-  {
-    $params = array('profileId' => $profileId, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('update', array($params), "Google_Service_Dfareporting_Placement");
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/Resource/PlatformTypes.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/Resource/PlatformTypes.php
deleted file mode 100644
index 8437cb42..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/Resource/PlatformTypes.php
+++ /dev/null
@@ -1,55 +0,0 @@
-
- *   $dfareportingService = new Google_Service_Dfareporting(...);
- *   $platformTypes = $dfareportingService->platformTypes;
- *  
- */
-class Google_Service_Dfareporting_Resource_PlatformTypes extends Google_Service_Resource
-{
-  /**
-   * Gets one platform type by ID. (platformTypes.get)
-   *
-   * @param string $profileId User profile ID associated with this request.
-   * @param string $id Platform type ID.
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Dfareporting_PlatformType
-   */
-  public function get($profileId, $id, $optParams = array())
-  {
-    $params = array('profileId' => $profileId, 'id' => $id);
-    $params = array_merge($params, $optParams);
-    return $this->call('get', array($params), "Google_Service_Dfareporting_PlatformType");
-  }
-  /**
-   * Retrieves a list of platform types. (platformTypes.listPlatformTypes)
-   *
-   * @param string $profileId User profile ID associated with this request.
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Dfareporting_PlatformTypesListResponse
-   */
-  public function listPlatformTypes($profileId, $optParams = array())
-  {
-    $params = array('profileId' => $profileId);
-    $params = array_merge($params, $optParams);
-    return $this->call('list', array($params), "Google_Service_Dfareporting_PlatformTypesListResponse");
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/Resource/PostalCodes.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/Resource/PostalCodes.php
deleted file mode 100644
index d5cf00ee..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/Resource/PostalCodes.php
+++ /dev/null
@@ -1,55 +0,0 @@
-
- *   $dfareportingService = new Google_Service_Dfareporting(...);
- *   $postalCodes = $dfareportingService->postalCodes;
- *  
- */
-class Google_Service_Dfareporting_Resource_PostalCodes extends Google_Service_Resource
-{
-  /**
-   * Gets one postal code by ID. (postalCodes.get)
-   *
-   * @param string $profileId User profile ID associated with this request.
-   * @param string $code Postal code ID.
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Dfareporting_PostalCode
-   */
-  public function get($profileId, $code, $optParams = array())
-  {
-    $params = array('profileId' => $profileId, 'code' => $code);
-    $params = array_merge($params, $optParams);
-    return $this->call('get', array($params), "Google_Service_Dfareporting_PostalCode");
-  }
-  /**
-   * Retrieves a list of postal codes. (postalCodes.listPostalCodes)
-   *
-   * @param string $profileId User profile ID associated with this request.
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Dfareporting_PostalCodesListResponse
-   */
-  public function listPostalCodes($profileId, $optParams = array())
-  {
-    $params = array('profileId' => $profileId);
-    $params = array_merge($params, $optParams);
-    return $this->call('list', array($params), "Google_Service_Dfareporting_PostalCodesListResponse");
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/Resource/Projects.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/Resource/Projects.php
deleted file mode 100644
index 0f396f8e..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/Resource/Projects.php
+++ /dev/null
@@ -1,71 +0,0 @@
-
- *   $dfareportingService = new Google_Service_Dfareporting(...);
- *   $projects = $dfareportingService->projects;
- *  
- */
-class Google_Service_Dfareporting_Resource_Projects extends Google_Service_Resource
-{
-  /**
-   * Gets one project by ID. (projects.get)
-   *
-   * @param string $profileId User profile ID associated with this request.
-   * @param string $id Project ID.
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Dfareporting_Project
-   */
-  public function get($profileId, $id, $optParams = array())
-  {
-    $params = array('profileId' => $profileId, 'id' => $id);
-    $params = array_merge($params, $optParams);
-    return $this->call('get', array($params), "Google_Service_Dfareporting_Project");
-  }
-  /**
-   * Retrieves a list of projects, possibly filtered. This method supports paging.
-   * (projects.listProjects)
-   *
-   * @param string $profileId User profile ID associated with this request.
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param string advertiserIds Select only projects with these advertiser
-   * IDs.
-   * @opt_param string ids Select only projects with these IDs.
-   * @opt_param int maxResults Maximum number of results to return.
-   * @opt_param string pageToken Value of the nextPageToken from the previous
-   * result page.
-   * @opt_param string searchString Allows searching for projects by name or ID.
-   * Wildcards (*) are allowed. For example, "project*2015" will return projects
-   * with names like "project June 2015", "project April 2015", or simply "project
-   * 2015". Most of the searches also add wildcards implicitly at the start and
-   * the end of the search string. For example, a search string of "project" will
-   * match projects with name "my project", "project 2015", or simply "project".
-   * @opt_param string sortField Field by which to sort the list.
-   * @opt_param string sortOrder Order of sorted results, default is ASCENDING.
-   * @return Google_Service_Dfareporting_ProjectsListResponse
-   */
-  public function listProjects($profileId, $optParams = array())
-  {
-    $params = array('profileId' => $profileId);
-    $params = array_merge($params, $optParams);
-    return $this->call('list', array($params), "Google_Service_Dfareporting_ProjectsListResponse");
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/Resource/Regions.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/Resource/Regions.php
deleted file mode 100644
index a6e170ca..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/Resource/Regions.php
+++ /dev/null
@@ -1,41 +0,0 @@
-
- *   $dfareportingService = new Google_Service_Dfareporting(...);
- *   $regions = $dfareportingService->regions;
- *  
- */
-class Google_Service_Dfareporting_Resource_Regions extends Google_Service_Resource
-{
-  /**
-   * Retrieves a list of regions. (regions.listRegions)
-   *
-   * @param string $profileId User profile ID associated with this request.
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Dfareporting_RegionsListResponse
-   */
-  public function listRegions($profileId, $optParams = array())
-  {
-    $params = array('profileId' => $profileId);
-    $params = array_merge($params, $optParams);
-    return $this->call('list', array($params), "Google_Service_Dfareporting_RegionsListResponse");
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/Resource/RemarketingListShares.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/Resource/RemarketingListShares.php
deleted file mode 100644
index 09123dd3..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/Resource/RemarketingListShares.php
+++ /dev/null
@@ -1,73 +0,0 @@
-
- *   $dfareportingService = new Google_Service_Dfareporting(...);
- *   $remarketingListShares = $dfareportingService->remarketingListShares;
- *  
- */
-class Google_Service_Dfareporting_Resource_RemarketingListShares extends Google_Service_Resource
-{
-  /**
-   * Gets one remarketing list share by remarketing list ID.
-   * (remarketingListShares.get)
-   *
-   * @param string $profileId User profile ID associated with this request.
-   * @param string $remarketingListId Remarketing list ID.
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Dfareporting_RemarketingListShare
-   */
-  public function get($profileId, $remarketingListId, $optParams = array())
-  {
-    $params = array('profileId' => $profileId, 'remarketingListId' => $remarketingListId);
-    $params = array_merge($params, $optParams);
-    return $this->call('get', array($params), "Google_Service_Dfareporting_RemarketingListShare");
-  }
-  /**
-   * Updates an existing remarketing list share. This method supports patch
-   * semantics. (remarketingListShares.patch)
-   *
-   * @param string $profileId User profile ID associated with this request.
-   * @param string $remarketingListId Remarketing list ID.
-   * @param Google_Service_Dfareporting_RemarketingListShare $postBody
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Dfareporting_RemarketingListShare
-   */
-  public function patch($profileId, $remarketingListId, Google_Service_Dfareporting_RemarketingListShare $postBody, $optParams = array())
-  {
-    $params = array('profileId' => $profileId, 'remarketingListId' => $remarketingListId, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('patch', array($params), "Google_Service_Dfareporting_RemarketingListShare");
-  }
-  /**
-   * Updates an existing remarketing list share. (remarketingListShares.update)
-   *
-   * @param string $profileId User profile ID associated with this request.
-   * @param Google_Service_Dfareporting_RemarketingListShare $postBody
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Dfareporting_RemarketingListShare
-   */
-  public function update($profileId, Google_Service_Dfareporting_RemarketingListShare $postBody, $optParams = array())
-  {
-    $params = array('profileId' => $profileId, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('update', array($params), "Google_Service_Dfareporting_RemarketingListShare");
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/Resource/RemarketingLists.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/Resource/RemarketingLists.php
deleted file mode 100644
index 990f476a..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/Resource/RemarketingLists.php
+++ /dev/null
@@ -1,118 +0,0 @@
-
- *   $dfareportingService = new Google_Service_Dfareporting(...);
- *   $remarketingLists = $dfareportingService->remarketingLists;
- *  
- */
-class Google_Service_Dfareporting_Resource_RemarketingLists extends Google_Service_Resource
-{
-  /**
-   * Gets one remarketing list by ID. (remarketingLists.get)
-   *
-   * @param string $profileId User profile ID associated with this request.
-   * @param string $id Remarketing list ID.
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Dfareporting_RemarketingList
-   */
-  public function get($profileId, $id, $optParams = array())
-  {
-    $params = array('profileId' => $profileId, 'id' => $id);
-    $params = array_merge($params, $optParams);
-    return $this->call('get', array($params), "Google_Service_Dfareporting_RemarketingList");
-  }
-  /**
-   * Inserts a new remarketing list. (remarketingLists.insert)
-   *
-   * @param string $profileId User profile ID associated with this request.
-   * @param Google_Service_Dfareporting_RemarketingList $postBody
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Dfareporting_RemarketingList
-   */
-  public function insert($profileId, Google_Service_Dfareporting_RemarketingList $postBody, $optParams = array())
-  {
-    $params = array('profileId' => $profileId, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('insert', array($params), "Google_Service_Dfareporting_RemarketingList");
-  }
-  /**
-   * Retrieves a list of remarketing lists, possibly filtered. This method
-   * supports paging. (remarketingLists.listRemarketingLists)
-   *
-   * @param string $profileId User profile ID associated with this request.
-   * @param string $advertiserId Select only remarketing lists owned by this
-   * advertiser.
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param bool active Select only active or only inactive remarketing lists.
-   * @opt_param string floodlightActivityId Select only remarketing lists that
-   * have this floodlight activity ID.
-   * @opt_param int maxResults Maximum number of results to return.
-   * @opt_param string name Allows searching for objects by name or ID. Wildcards
-   * (*) are allowed. For example, "remarketing list*2015" will return objects
-   * with names like "remarketing list June 2015", "remarketing list April 2015",
-   * or simply "remarketing list 2015". Most of the searches also add wildcards
-   * implicitly at the start and the end of the search string. For example, a
-   * search string of "remarketing list" will match objects with name "my
-   * remarketing list", "remarketing list 2015", or simply "remarketing list".
-   * @opt_param string pageToken Value of the nextPageToken from the previous
-   * result page.
-   * @opt_param string sortField Field by which to sort the list.
-   * @opt_param string sortOrder Order of sorted results, default is ASCENDING.
-   * @return Google_Service_Dfareporting_RemarketingListsListResponse
-   */
-  public function listRemarketingLists($profileId, $advertiserId, $optParams = array())
-  {
-    $params = array('profileId' => $profileId, 'advertiserId' => $advertiserId);
-    $params = array_merge($params, $optParams);
-    return $this->call('list', array($params), "Google_Service_Dfareporting_RemarketingListsListResponse");
-  }
-  /**
-   * Updates an existing remarketing list. This method supports patch semantics.
-   * (remarketingLists.patch)
-   *
-   * @param string $profileId User profile ID associated with this request.
-   * @param string $id Remarketing list ID.
-   * @param Google_Service_Dfareporting_RemarketingList $postBody
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Dfareporting_RemarketingList
-   */
-  public function patch($profileId, $id, Google_Service_Dfareporting_RemarketingList $postBody, $optParams = array())
-  {
-    $params = array('profileId' => $profileId, 'id' => $id, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('patch', array($params), "Google_Service_Dfareporting_RemarketingList");
-  }
-  /**
-   * Updates an existing remarketing list. (remarketingLists.update)
-   *
-   * @param string $profileId User profile ID associated with this request.
-   * @param Google_Service_Dfareporting_RemarketingList $postBody
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Dfareporting_RemarketingList
-   */
-  public function update($profileId, Google_Service_Dfareporting_RemarketingList $postBody, $optParams = array())
-  {
-    $params = array('profileId' => $profileId, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('update', array($params), "Google_Service_Dfareporting_RemarketingList");
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/Resource/Reports.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/Resource/Reports.php
deleted file mode 100644
index 1598d799..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/Resource/Reports.php
+++ /dev/null
@@ -1,137 +0,0 @@
-
- *   $dfareportingService = new Google_Service_Dfareporting(...);
- *   $reports = $dfareportingService->reports;
- *  
- */
-class Google_Service_Dfareporting_Resource_Reports extends Google_Service_Resource
-{
-  /**
-   * Deletes a report by its ID. (reports.delete)
-   *
-   * @param string $profileId The DFA user profile ID.
-   * @param string $reportId The ID of the report.
-   * @param array $optParams Optional parameters.
-   */
-  public function delete($profileId, $reportId, $optParams = array())
-  {
-    $params = array('profileId' => $profileId, 'reportId' => $reportId);
-    $params = array_merge($params, $optParams);
-    return $this->call('delete', array($params));
-  }
-  /**
-   * Retrieves a report by its ID. (reports.get)
-   *
-   * @param string $profileId The DFA user profile ID.
-   * @param string $reportId The ID of the report.
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Dfareporting_Report
-   */
-  public function get($profileId, $reportId, $optParams = array())
-  {
-    $params = array('profileId' => $profileId, 'reportId' => $reportId);
-    $params = array_merge($params, $optParams);
-    return $this->call('get', array($params), "Google_Service_Dfareporting_Report");
-  }
-  /**
-   * Creates a report. (reports.insert)
-   *
-   * @param string $profileId The DFA user profile ID.
-   * @param Google_Service_Dfareporting_Report $postBody
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Dfareporting_Report
-   */
-  public function insert($profileId, Google_Service_Dfareporting_Report $postBody, $optParams = array())
-  {
-    $params = array('profileId' => $profileId, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('insert', array($params), "Google_Service_Dfareporting_Report");
-  }
-  /**
-   * Retrieves list of reports. (reports.listReports)
-   *
-   * @param string $profileId The DFA user profile ID.
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param int maxResults Maximum number of results to return.
-   * @opt_param string pageToken The value of the nextToken from the previous
-   * result page.
-   * @opt_param string scope The scope that defines which results are returned,
-   * default is 'MINE'.
-   * @opt_param string sortField The field by which to sort the list.
-   * @opt_param string sortOrder Order of sorted results, default is 'DESCENDING'.
-   * @return Google_Service_Dfareporting_ReportList
-   */
-  public function listReports($profileId, $optParams = array())
-  {
-    $params = array('profileId' => $profileId);
-    $params = array_merge($params, $optParams);
-    return $this->call('list', array($params), "Google_Service_Dfareporting_ReportList");
-  }
-  /**
-   * Updates a report. This method supports patch semantics. (reports.patch)
-   *
-   * @param string $profileId The DFA user profile ID.
-   * @param string $reportId The ID of the report.
-   * @param Google_Service_Dfareporting_Report $postBody
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Dfareporting_Report
-   */
-  public function patch($profileId, $reportId, Google_Service_Dfareporting_Report $postBody, $optParams = array())
-  {
-    $params = array('profileId' => $profileId, 'reportId' => $reportId, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('patch', array($params), "Google_Service_Dfareporting_Report");
-  }
-  /**
-   * Runs a report. (reports.run)
-   *
-   * @param string $profileId The DFA profile ID.
-   * @param string $reportId The ID of the report.
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param bool synchronous If set and true, tries to run the report
-   * synchronously.
-   * @return Google_Service_Dfareporting_DfareportingFile
-   */
-  public function run($profileId, $reportId, $optParams = array())
-  {
-    $params = array('profileId' => $profileId, 'reportId' => $reportId);
-    $params = array_merge($params, $optParams);
-    return $this->call('run', array($params), "Google_Service_Dfareporting_DfareportingFile");
-  }
-  /**
-   * Updates a report. (reports.update)
-   *
-   * @param string $profileId The DFA user profile ID.
-   * @param string $reportId The ID of the report.
-   * @param Google_Service_Dfareporting_Report $postBody
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Dfareporting_Report
-   */
-  public function update($profileId, $reportId, Google_Service_Dfareporting_Report $postBody, $optParams = array())
-  {
-    $params = array('profileId' => $profileId, 'reportId' => $reportId, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('update', array($params), "Google_Service_Dfareporting_Report");
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/Resource/ReportsCompatibleFields.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/Resource/ReportsCompatibleFields.php
deleted file mode 100644
index b6a9c9ea..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/Resource/ReportsCompatibleFields.php
+++ /dev/null
@@ -1,44 +0,0 @@
-
- *   $dfareportingService = new Google_Service_Dfareporting(...);
- *   $compatibleFields = $dfareportingService->compatibleFields;
- *  
- */
-class Google_Service_Dfareporting_Resource_ReportsCompatibleFields extends Google_Service_Resource
-{
-  /**
-   * Returns the fields that are compatible to be selected in the respective
-   * sections of a report criteria, given the fields already selected in the input
-   * report and user permissions. (compatibleFields.query)
-   *
-   * @param string $profileId The DFA user profile ID.
-   * @param Google_Service_Dfareporting_Report $postBody
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Dfareporting_CompatibleFields
-   */
-  public function query($profileId, Google_Service_Dfareporting_Report $postBody, $optParams = array())
-  {
-    $params = array('profileId' => $profileId, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('query', array($params), "Google_Service_Dfareporting_CompatibleFields");
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/Resource/ReportsFiles.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/Resource/ReportsFiles.php
deleted file mode 100644
index 6c76e792..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/Resource/ReportsFiles.php
+++ /dev/null
@@ -1,63 +0,0 @@
-
- *   $dfareportingService = new Google_Service_Dfareporting(...);
- *   $files = $dfareportingService->files;
- *  
- */
-class Google_Service_Dfareporting_Resource_ReportsFiles extends Google_Service_Resource
-{
-  /**
-   * Retrieves a report file. (files.get)
-   *
-   * @param string $profileId The DFA profile ID.
-   * @param string $reportId The ID of the report.
-   * @param string $fileId The ID of the report file.
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Dfareporting_DfareportingFile
-   */
-  public function get($profileId, $reportId, $fileId, $optParams = array())
-  {
-    $params = array('profileId' => $profileId, 'reportId' => $reportId, 'fileId' => $fileId);
-    $params = array_merge($params, $optParams);
-    return $this->call('get', array($params), "Google_Service_Dfareporting_DfareportingFile");
-  }
-  /**
-   * Lists files for a report. (files.listReportsFiles)
-   *
-   * @param string $profileId The DFA profile ID.
-   * @param string $reportId The ID of the parent report.
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param int maxResults Maximum number of results to return.
-   * @opt_param string pageToken The value of the nextToken from the previous
-   * result page.
-   * @opt_param string sortField The field by which to sort the list.
-   * @opt_param string sortOrder Order of sorted results, default is 'DESCENDING'.
-   * @return Google_Service_Dfareporting_FileList
-   */
-  public function listReportsFiles($profileId, $reportId, $optParams = array())
-  {
-    $params = array('profileId' => $profileId, 'reportId' => $reportId);
-    $params = array_merge($params, $optParams);
-    return $this->call('list', array($params), "Google_Service_Dfareporting_FileList");
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/Resource/Sites.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/Resource/Sites.php
deleted file mode 100644
index 1911c88b..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/Resource/Sites.php
+++ /dev/null
@@ -1,126 +0,0 @@
-
- *   $dfareportingService = new Google_Service_Dfareporting(...);
- *   $sites = $dfareportingService->sites;
- *  
- */
-class Google_Service_Dfareporting_Resource_Sites extends Google_Service_Resource
-{
-  /**
-   * Gets one site by ID. (sites.get)
-   *
-   * @param string $profileId User profile ID associated with this request.
-   * @param string $id Site ID.
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Dfareporting_Site
-   */
-  public function get($profileId, $id, $optParams = array())
-  {
-    $params = array('profileId' => $profileId, 'id' => $id);
-    $params = array_merge($params, $optParams);
-    return $this->call('get', array($params), "Google_Service_Dfareporting_Site");
-  }
-  /**
-   * Inserts a new site. (sites.insert)
-   *
-   * @param string $profileId User profile ID associated with this request.
-   * @param Google_Service_Dfareporting_Site $postBody
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Dfareporting_Site
-   */
-  public function insert($profileId, Google_Service_Dfareporting_Site $postBody, $optParams = array())
-  {
-    $params = array('profileId' => $profileId, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('insert', array($params), "Google_Service_Dfareporting_Site");
-  }
-  /**
-   * Retrieves a list of sites, possibly filtered. This method supports paging.
-   * (sites.listSites)
-   *
-   * @param string $profileId User profile ID associated with this request.
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param bool acceptsInStreamVideoPlacements This search filter is no
-   * longer supported and will have no effect on the results returned.
-   * @opt_param bool acceptsInterstitialPlacements This search filter is no longer
-   * supported and will have no effect on the results returned.
-   * @opt_param bool acceptsPublisherPaidPlacements Select only sites that accept
-   * publisher paid placements.
-   * @opt_param bool adWordsSite Select only AdWords sites.
-   * @opt_param bool approved Select only approved sites.
-   * @opt_param string campaignIds Select only sites with these campaign IDs.
-   * @opt_param string directorySiteIds Select only sites with these directory
-   * site IDs.
-   * @opt_param string ids Select only sites with these IDs.
-   * @opt_param int maxResults Maximum number of results to return.
-   * @opt_param string pageToken Value of the nextPageToken from the previous
-   * result page.
-   * @opt_param string searchString Allows searching for objects by name, ID or
-   * keyName. Wildcards (*) are allowed. For example, "site*2015" will return
-   * objects with names like "site June 2015", "site April 2015", or simply "site
-   * 2015". Most of the searches also add wildcards implicitly at the start and
-   * the end of the search string. For example, a search string of "site" will
-   * match objects with name "my site", "site 2015", or simply "site".
-   * @opt_param string sortField Field by which to sort the list.
-   * @opt_param string sortOrder Order of sorted results, default is ASCENDING.
-   * @opt_param string subaccountId Select only sites with this subaccount ID.
-   * @opt_param bool unmappedSite Select only sites that have not been mapped to a
-   * directory site.
-   * @return Google_Service_Dfareporting_SitesListResponse
-   */
-  public function listSites($profileId, $optParams = array())
-  {
-    $params = array('profileId' => $profileId);
-    $params = array_merge($params, $optParams);
-    return $this->call('list', array($params), "Google_Service_Dfareporting_SitesListResponse");
-  }
-  /**
-   * Updates an existing site. This method supports patch semantics. (sites.patch)
-   *
-   * @param string $profileId User profile ID associated with this request.
-   * @param string $id Site ID.
-   * @param Google_Service_Dfareporting_Site $postBody
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Dfareporting_Site
-   */
-  public function patch($profileId, $id, Google_Service_Dfareporting_Site $postBody, $optParams = array())
-  {
-    $params = array('profileId' => $profileId, 'id' => $id, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('patch', array($params), "Google_Service_Dfareporting_Site");
-  }
-  /**
-   * Updates an existing site. (sites.update)
-   *
-   * @param string $profileId User profile ID associated with this request.
-   * @param Google_Service_Dfareporting_Site $postBody
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Dfareporting_Site
-   */
-  public function update($profileId, Google_Service_Dfareporting_Site $postBody, $optParams = array())
-  {
-    $params = array('profileId' => $profileId, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('update', array($params), "Google_Service_Dfareporting_Site");
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/Resource/Sizes.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/Resource/Sizes.php
deleted file mode 100644
index 51c9a36c..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/Resource/Sizes.php
+++ /dev/null
@@ -1,74 +0,0 @@
-
- *   $dfareportingService = new Google_Service_Dfareporting(...);
- *   $sizes = $dfareportingService->sizes;
- *  
- */
-class Google_Service_Dfareporting_Resource_Sizes extends Google_Service_Resource
-{
-  /**
-   * Gets one size by ID. (sizes.get)
-   *
-   * @param string $profileId User profile ID associated with this request.
-   * @param string $id Size ID.
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Dfareporting_Size
-   */
-  public function get($profileId, $id, $optParams = array())
-  {
-    $params = array('profileId' => $profileId, 'id' => $id);
-    $params = array_merge($params, $optParams);
-    return $this->call('get', array($params), "Google_Service_Dfareporting_Size");
-  }
-  /**
-   * Inserts a new size. (sizes.insert)
-   *
-   * @param string $profileId User profile ID associated with this request.
-   * @param Google_Service_Dfareporting_Size $postBody
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Dfareporting_Size
-   */
-  public function insert($profileId, Google_Service_Dfareporting_Size $postBody, $optParams = array())
-  {
-    $params = array('profileId' => $profileId, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('insert', array($params), "Google_Service_Dfareporting_Size");
-  }
-  /**
-   * Retrieves a list of sizes, possibly filtered. (sizes.listSizes)
-   *
-   * @param string $profileId User profile ID associated with this request.
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param int height Select only sizes with this height.
-   * @opt_param bool iabStandard Select only IAB standard sizes.
-   * @opt_param string ids Select only sizes with these IDs.
-   * @opt_param int width Select only sizes with this width.
-   * @return Google_Service_Dfareporting_SizesListResponse
-   */
-  public function listSizes($profileId, $optParams = array())
-  {
-    $params = array('profileId' => $profileId);
-    $params = array_merge($params, $optParams);
-    return $this->call('list', array($params), "Google_Service_Dfareporting_SizesListResponse");
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/Resource/Subaccounts.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/Resource/Subaccounts.php
deleted file mode 100644
index 27ac2feb..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/Resource/Subaccounts.php
+++ /dev/null
@@ -1,114 +0,0 @@
-
- *   $dfareportingService = new Google_Service_Dfareporting(...);
- *   $subaccounts = $dfareportingService->subaccounts;
- *  
- */
-class Google_Service_Dfareporting_Resource_Subaccounts extends Google_Service_Resource
-{
-  /**
-   * Gets one subaccount by ID. (subaccounts.get)
-   *
-   * @param string $profileId User profile ID associated with this request.
-   * @param string $id Subaccount ID.
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Dfareporting_Subaccount
-   */
-  public function get($profileId, $id, $optParams = array())
-  {
-    $params = array('profileId' => $profileId, 'id' => $id);
-    $params = array_merge($params, $optParams);
-    return $this->call('get', array($params), "Google_Service_Dfareporting_Subaccount");
-  }
-  /**
-   * Inserts a new subaccount. (subaccounts.insert)
-   *
-   * @param string $profileId User profile ID associated with this request.
-   * @param Google_Service_Dfareporting_Subaccount $postBody
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Dfareporting_Subaccount
-   */
-  public function insert($profileId, Google_Service_Dfareporting_Subaccount $postBody, $optParams = array())
-  {
-    $params = array('profileId' => $profileId, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('insert', array($params), "Google_Service_Dfareporting_Subaccount");
-  }
-  /**
-   * Gets a list of subaccounts, possibly filtered. This method supports paging.
-   * (subaccounts.listSubaccounts)
-   *
-   * @param string $profileId User profile ID associated with this request.
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param string ids Select only subaccounts with these IDs.
-   * @opt_param int maxResults Maximum number of results to return.
-   * @opt_param string pageToken Value of the nextPageToken from the previous
-   * result page.
-   * @opt_param string searchString Allows searching for objects by name or ID.
-   * Wildcards (*) are allowed. For example, "subaccount*2015" will return objects
-   * with names like "subaccount June 2015", "subaccount April 2015", or simply
-   * "subaccount 2015". Most of the searches also add wildcards implicitly at the
-   * start and the end of the search string. For example, a search string of
-   * "subaccount" will match objects with name "my subaccount", "subaccount 2015",
-   * or simply "subaccount".
-   * @opt_param string sortField Field by which to sort the list.
-   * @opt_param string sortOrder Order of sorted results, default is ASCENDING.
-   * @return Google_Service_Dfareporting_SubaccountsListResponse
-   */
-  public function listSubaccounts($profileId, $optParams = array())
-  {
-    $params = array('profileId' => $profileId);
-    $params = array_merge($params, $optParams);
-    return $this->call('list', array($params), "Google_Service_Dfareporting_SubaccountsListResponse");
-  }
-  /**
-   * Updates an existing subaccount. This method supports patch semantics.
-   * (subaccounts.patch)
-   *
-   * @param string $profileId User profile ID associated with this request.
-   * @param string $id Subaccount ID.
-   * @param Google_Service_Dfareporting_Subaccount $postBody
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Dfareporting_Subaccount
-   */
-  public function patch($profileId, $id, Google_Service_Dfareporting_Subaccount $postBody, $optParams = array())
-  {
-    $params = array('profileId' => $profileId, 'id' => $id, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('patch', array($params), "Google_Service_Dfareporting_Subaccount");
-  }
-  /**
-   * Updates an existing subaccount. (subaccounts.update)
-   *
-   * @param string $profileId User profile ID associated with this request.
-   * @param Google_Service_Dfareporting_Subaccount $postBody
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Dfareporting_Subaccount
-   */
-  public function update($profileId, Google_Service_Dfareporting_Subaccount $postBody, $optParams = array())
-  {
-    $params = array('profileId' => $profileId, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('update', array($params), "Google_Service_Dfareporting_Subaccount");
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/Resource/TargetableRemarketingLists.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/Resource/TargetableRemarketingLists.php
deleted file mode 100644
index 43d9de4a..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/Resource/TargetableRemarketingLists.php
+++ /dev/null
@@ -1,74 +0,0 @@
-
- *   $dfareportingService = new Google_Service_Dfareporting(...);
- *   $targetableRemarketingLists = $dfareportingService->targetableRemarketingLists;
- *  
- */
-class Google_Service_Dfareporting_Resource_TargetableRemarketingLists extends Google_Service_Resource
-{
-  /**
-   * Gets one remarketing list by ID. (targetableRemarketingLists.get)
-   *
-   * @param string $profileId User profile ID associated with this request.
-   * @param string $id Remarketing list ID.
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Dfareporting_TargetableRemarketingList
-   */
-  public function get($profileId, $id, $optParams = array())
-  {
-    $params = array('profileId' => $profileId, 'id' => $id);
-    $params = array_merge($params, $optParams);
-    return $this->call('get', array($params), "Google_Service_Dfareporting_TargetableRemarketingList");
-  }
-  /**
-   * Retrieves a list of targetable remarketing lists, possibly filtered. This
-   * method supports paging.
-   * (targetableRemarketingLists.listTargetableRemarketingLists)
-   *
-   * @param string $profileId User profile ID associated with this request.
-   * @param string $advertiserId Select only targetable remarketing lists
-   * targetable by these advertisers.
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param bool active Select only active or only inactive targetable
-   * remarketing lists.
-   * @opt_param int maxResults Maximum number of results to return.
-   * @opt_param string name Allows searching for objects by name or ID. Wildcards
-   * (*) are allowed. For example, "remarketing list*2015" will return objects
-   * with names like "remarketing list June 2015", "remarketing list April 2015",
-   * or simply "remarketing list 2015". Most of the searches also add wildcards
-   * implicitly at the start and the end of the search string. For example, a
-   * search string of "remarketing list" will match objects with name "my
-   * remarketing list", "remarketing list 2015", or simply "remarketing list".
-   * @opt_param string pageToken Value of the nextPageToken from the previous
-   * result page.
-   * @opt_param string sortField Field by which to sort the list.
-   * @opt_param string sortOrder Order of sorted results, default is ASCENDING.
-   * @return Google_Service_Dfareporting_TargetableRemarketingListsListResponse
-   */
-  public function listTargetableRemarketingLists($profileId, $advertiserId, $optParams = array())
-  {
-    $params = array('profileId' => $profileId, 'advertiserId' => $advertiserId);
-    $params = array_merge($params, $optParams);
-    return $this->call('list', array($params), "Google_Service_Dfareporting_TargetableRemarketingListsListResponse");
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/Resource/TargetingTemplates.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/Resource/TargetingTemplates.php
deleted file mode 100644
index afe7af7e..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/Resource/TargetingTemplates.php
+++ /dev/null
@@ -1,116 +0,0 @@
-
- *   $dfareportingService = new Google_Service_Dfareporting(...);
- *   $targetingTemplates = $dfareportingService->targetingTemplates;
- *  
- */
-class Google_Service_Dfareporting_Resource_TargetingTemplates extends Google_Service_Resource
-{
-  /**
-   * Gets one targeting template by ID. (targetingTemplates.get)
-   *
-   * @param string $profileId User profile ID associated with this request.
-   * @param string $id Targeting template ID.
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Dfareporting_TargetingTemplate
-   */
-  public function get($profileId, $id, $optParams = array())
-  {
-    $params = array('profileId' => $profileId, 'id' => $id);
-    $params = array_merge($params, $optParams);
-    return $this->call('get', array($params), "Google_Service_Dfareporting_TargetingTemplate");
-  }
-  /**
-   * Inserts a new targeting template. (targetingTemplates.insert)
-   *
-   * @param string $profileId User profile ID associated with this request.
-   * @param Google_Service_Dfareporting_TargetingTemplate $postBody
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Dfareporting_TargetingTemplate
-   */
-  public function insert($profileId, Google_Service_Dfareporting_TargetingTemplate $postBody, $optParams = array())
-  {
-    $params = array('profileId' => $profileId, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('insert', array($params), "Google_Service_Dfareporting_TargetingTemplate");
-  }
-  /**
-   * Retrieves a list of targeting templates, optionally filtered. This method
-   * supports paging. (targetingTemplates.listTargetingTemplates)
-   *
-   * @param string $profileId User profile ID associated with this request.
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param string advertiserId Select only targeting templates with this
-   * advertiser ID.
-   * @opt_param string ids Select only targeting templates with these IDs.
-   * @opt_param int maxResults Maximum number of results to return.
-   * @opt_param string pageToken Value of the nextPageToken from the previous
-   * result page.
-   * @opt_param string searchString Allows searching for objects by name or ID.
-   * Wildcards (*) are allowed. For example, "template*2015" will return objects
-   * with names like "template June 2015", "template April 2015", or simply
-   * "template 2015". Most of the searches also add wildcards implicitly at the
-   * start and the end of the search string. For example, a search string of
-   * "template" will match objects with name "my template", "template 2015", or
-   * simply "template".
-   * @opt_param string sortField Field by which to sort the list.
-   * @opt_param string sortOrder Order of sorted results, default is ASCENDING.
-   * @return Google_Service_Dfareporting_TargetingTemplatesListResponse
-   */
-  public function listTargetingTemplates($profileId, $optParams = array())
-  {
-    $params = array('profileId' => $profileId);
-    $params = array_merge($params, $optParams);
-    return $this->call('list', array($params), "Google_Service_Dfareporting_TargetingTemplatesListResponse");
-  }
-  /**
-   * Updates an existing targeting template. This method supports patch semantics.
-   * (targetingTemplates.patch)
-   *
-   * @param string $profileId User profile ID associated with this request.
-   * @param string $id Targeting template ID.
-   * @param Google_Service_Dfareporting_TargetingTemplate $postBody
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Dfareporting_TargetingTemplate
-   */
-  public function patch($profileId, $id, Google_Service_Dfareporting_TargetingTemplate $postBody, $optParams = array())
-  {
-    $params = array('profileId' => $profileId, 'id' => $id, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('patch', array($params), "Google_Service_Dfareporting_TargetingTemplate");
-  }
-  /**
-   * Updates an existing targeting template. (targetingTemplates.update)
-   *
-   * @param string $profileId User profile ID associated with this request.
-   * @param Google_Service_Dfareporting_TargetingTemplate $postBody
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Dfareporting_TargetingTemplate
-   */
-  public function update($profileId, Google_Service_Dfareporting_TargetingTemplate $postBody, $optParams = array())
-  {
-    $params = array('profileId' => $profileId, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('update', array($params), "Google_Service_Dfareporting_TargetingTemplate");
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/Resource/UserProfiles.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/Resource/UserProfiles.php
deleted file mode 100644
index 019ce69f..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/Resource/UserProfiles.php
+++ /dev/null
@@ -1,53 +0,0 @@
-
- *   $dfareportingService = new Google_Service_Dfareporting(...);
- *   $userProfiles = $dfareportingService->userProfiles;
- *  
- */
-class Google_Service_Dfareporting_Resource_UserProfiles extends Google_Service_Resource
-{
-  /**
-   * Gets one user profile by ID. (userProfiles.get)
-   *
-   * @param string $profileId The user profile ID.
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Dfareporting_UserProfile
-   */
-  public function get($profileId, $optParams = array())
-  {
-    $params = array('profileId' => $profileId);
-    $params = array_merge($params, $optParams);
-    return $this->call('get', array($params), "Google_Service_Dfareporting_UserProfile");
-  }
-  /**
-   * Retrieves list of user profiles for a user. (userProfiles.listUserProfiles)
-   *
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Dfareporting_UserProfileList
-   */
-  public function listUserProfiles($optParams = array())
-  {
-    $params = array();
-    $params = array_merge($params, $optParams);
-    return $this->call('list', array($params), "Google_Service_Dfareporting_UserProfileList");
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/Resource/UserRolePermissionGroups.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/Resource/UserRolePermissionGroups.php
deleted file mode 100644
index 198da780..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/Resource/UserRolePermissionGroups.php
+++ /dev/null
@@ -1,56 +0,0 @@
-
- *   $dfareportingService = new Google_Service_Dfareporting(...);
- *   $userRolePermissionGroups = $dfareportingService->userRolePermissionGroups;
- *  
- */
-class Google_Service_Dfareporting_Resource_UserRolePermissionGroups extends Google_Service_Resource
-{
-  /**
-   * Gets one user role permission group by ID. (userRolePermissionGroups.get)
-   *
-   * @param string $profileId User profile ID associated with this request.
-   * @param string $id User role permission group ID.
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Dfareporting_UserRolePermissionGroup
-   */
-  public function get($profileId, $id, $optParams = array())
-  {
-    $params = array('profileId' => $profileId, 'id' => $id);
-    $params = array_merge($params, $optParams);
-    return $this->call('get', array($params), "Google_Service_Dfareporting_UserRolePermissionGroup");
-  }
-  /**
-   * Gets a list of all supported user role permission groups.
-   * (userRolePermissionGroups.listUserRolePermissionGroups)
-   *
-   * @param string $profileId User profile ID associated with this request.
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Dfareporting_UserRolePermissionGroupsListResponse
-   */
-  public function listUserRolePermissionGroups($profileId, $optParams = array())
-  {
-    $params = array('profileId' => $profileId);
-    $params = array_merge($params, $optParams);
-    return $this->call('list', array($params), "Google_Service_Dfareporting_UserRolePermissionGroupsListResponse");
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/Resource/UserRolePermissions.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/Resource/UserRolePermissions.php
deleted file mode 100644
index 4780e226..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/Resource/UserRolePermissions.php
+++ /dev/null
@@ -1,58 +0,0 @@
-
- *   $dfareportingService = new Google_Service_Dfareporting(...);
- *   $userRolePermissions = $dfareportingService->userRolePermissions;
- *  
- */
-class Google_Service_Dfareporting_Resource_UserRolePermissions extends Google_Service_Resource
-{
-  /**
-   * Gets one user role permission by ID. (userRolePermissions.get)
-   *
-   * @param string $profileId User profile ID associated with this request.
-   * @param string $id User role permission ID.
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Dfareporting_UserRolePermission
-   */
-  public function get($profileId, $id, $optParams = array())
-  {
-    $params = array('profileId' => $profileId, 'id' => $id);
-    $params = array_merge($params, $optParams);
-    return $this->call('get', array($params), "Google_Service_Dfareporting_UserRolePermission");
-  }
-  /**
-   * Gets a list of user role permissions, possibly filtered.
-   * (userRolePermissions.listUserRolePermissions)
-   *
-   * @param string $profileId User profile ID associated with this request.
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param string ids Select only user role permissions with these IDs.
-   * @return Google_Service_Dfareporting_UserRolePermissionsListResponse
-   */
-  public function listUserRolePermissions($profileId, $optParams = array())
-  {
-    $params = array('profileId' => $profileId);
-    $params = array_merge($params, $optParams);
-    return $this->call('list', array($params), "Google_Service_Dfareporting_UserRolePermissionsListResponse");
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/Resource/UserRoles.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/Resource/UserRoles.php
deleted file mode 100644
index a8769cd5..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/Resource/UserRoles.php
+++ /dev/null
@@ -1,131 +0,0 @@
-
- *   $dfareportingService = new Google_Service_Dfareporting(...);
- *   $userRoles = $dfareportingService->userRoles;
- *  
- */
-class Google_Service_Dfareporting_Resource_UserRoles extends Google_Service_Resource
-{
-  /**
-   * Deletes an existing user role. (userRoles.delete)
-   *
-   * @param string $profileId User profile ID associated with this request.
-   * @param string $id User role ID.
-   * @param array $optParams Optional parameters.
-   */
-  public function delete($profileId, $id, $optParams = array())
-  {
-    $params = array('profileId' => $profileId, 'id' => $id);
-    $params = array_merge($params, $optParams);
-    return $this->call('delete', array($params));
-  }
-  /**
-   * Gets one user role by ID. (userRoles.get)
-   *
-   * @param string $profileId User profile ID associated with this request.
-   * @param string $id User role ID.
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Dfareporting_UserRole
-   */
-  public function get($profileId, $id, $optParams = array())
-  {
-    $params = array('profileId' => $profileId, 'id' => $id);
-    $params = array_merge($params, $optParams);
-    return $this->call('get', array($params), "Google_Service_Dfareporting_UserRole");
-  }
-  /**
-   * Inserts a new user role. (userRoles.insert)
-   *
-   * @param string $profileId User profile ID associated with this request.
-   * @param Google_Service_Dfareporting_UserRole $postBody
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Dfareporting_UserRole
-   */
-  public function insert($profileId, Google_Service_Dfareporting_UserRole $postBody, $optParams = array())
-  {
-    $params = array('profileId' => $profileId, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('insert', array($params), "Google_Service_Dfareporting_UserRole");
-  }
-  /**
-   * Retrieves a list of user roles, possibly filtered. This method supports
-   * paging. (userRoles.listUserRoles)
-   *
-   * @param string $profileId User profile ID associated with this request.
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param bool accountUserRoleOnly Select only account level user roles not
-   * associated with any specific subaccount.
-   * @opt_param string ids Select only user roles with the specified IDs.
-   * @opt_param int maxResults Maximum number of results to return.
-   * @opt_param string pageToken Value of the nextPageToken from the previous
-   * result page.
-   * @opt_param string searchString Allows searching for objects by name or ID.
-   * Wildcards (*) are allowed. For example, "userrole*2015" will return objects
-   * with names like "userrole June 2015", "userrole April 2015", or simply
-   * "userrole 2015". Most of the searches also add wildcards implicitly at the
-   * start and the end of the search string. For example, a search string of
-   * "userrole" will match objects with name "my userrole", "userrole 2015", or
-   * simply "userrole".
-   * @opt_param string sortField Field by which to sort the list.
-   * @opt_param string sortOrder Order of sorted results, default is ASCENDING.
-   * @opt_param string subaccountId Select only user roles that belong to this
-   * subaccount.
-   * @return Google_Service_Dfareporting_UserRolesListResponse
-   */
-  public function listUserRoles($profileId, $optParams = array())
-  {
-    $params = array('profileId' => $profileId);
-    $params = array_merge($params, $optParams);
-    return $this->call('list', array($params), "Google_Service_Dfareporting_UserRolesListResponse");
-  }
-  /**
-   * Updates an existing user role. This method supports patch semantics.
-   * (userRoles.patch)
-   *
-   * @param string $profileId User profile ID associated with this request.
-   * @param string $id User role ID.
-   * @param Google_Service_Dfareporting_UserRole $postBody
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Dfareporting_UserRole
-   */
-  public function patch($profileId, $id, Google_Service_Dfareporting_UserRole $postBody, $optParams = array())
-  {
-    $params = array('profileId' => $profileId, 'id' => $id, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('patch', array($params), "Google_Service_Dfareporting_UserRole");
-  }
-  /**
-   * Updates an existing user role. (userRoles.update)
-   *
-   * @param string $profileId User profile ID associated with this request.
-   * @param Google_Service_Dfareporting_UserRole $postBody
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Dfareporting_UserRole
-   */
-  public function update($profileId, Google_Service_Dfareporting_UserRole $postBody, $optParams = array())
-  {
-    $params = array('profileId' => $profileId, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('update', array($params), "Google_Service_Dfareporting_UserRole");
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/Resource/VideoFormats.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/Resource/VideoFormats.php
deleted file mode 100644
index 065cadac..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/Resource/VideoFormats.php
+++ /dev/null
@@ -1,55 +0,0 @@
-
- *   $dfareportingService = new Google_Service_Dfareporting(...);
- *   $videoFormats = $dfareportingService->videoFormats;
- *  
- */
-class Google_Service_Dfareporting_Resource_VideoFormats extends Google_Service_Resource
-{
-  /**
-   * Gets one video format by ID. (videoFormats.get)
-   *
-   * @param string $profileId User profile ID associated with this request.
-   * @param int $id Video format ID.
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Dfareporting_VideoFormat
-   */
-  public function get($profileId, $id, $optParams = array())
-  {
-    $params = array('profileId' => $profileId, 'id' => $id);
-    $params = array_merge($params, $optParams);
-    return $this->call('get', array($params), "Google_Service_Dfareporting_VideoFormat");
-  }
-  /**
-   * Lists available video formats. (videoFormats.listVideoFormats)
-   *
-   * @param string $profileId User profile ID associated with this request.
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Dfareporting_VideoFormatsListResponse
-   */
-  public function listVideoFormats($profileId, $optParams = array())
-  {
-    $params = array('profileId' => $profileId);
-    $params = array_merge($params, $optParams);
-    return $this->call('list', array($params), "Google_Service_Dfareporting_VideoFormatsListResponse");
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/RichMediaExitOverride.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/RichMediaExitOverride.php
deleted file mode 100644
index b53c2601..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/RichMediaExitOverride.php
+++ /dev/null
@@ -1,49 +0,0 @@
-clickThroughUrl = $clickThroughUrl;
-  }
-  public function getClickThroughUrl()
-  {
-    return $this->clickThroughUrl;
-  }
-  public function setEnabled($enabled)
-  {
-    $this->enabled = $enabled;
-  }
-  public function getEnabled()
-  {
-    return $this->enabled;
-  }
-  public function setExitId($exitId)
-  {
-    $this->exitId = $exitId;
-  }
-  public function getExitId()
-  {
-    return $this->exitId;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/Rule.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/Rule.php
deleted file mode 100644
index 77226d90..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/Rule.php
+++ /dev/null
@@ -1,48 +0,0 @@
-assetId = $assetId;
-  }
-  public function getAssetId()
-  {
-    return $this->assetId;
-  }
-  public function setName($name)
-  {
-    $this->name = $name;
-  }
-  public function getName()
-  {
-    return $this->name;
-  }
-  public function setTargetingTemplateId($targetingTemplateId)
-  {
-    $this->targetingTemplateId = $targetingTemplateId;
-  }
-  public function getTargetingTemplateId()
-  {
-    return $this->targetingTemplateId;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/Site.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/Site.php
deleted file mode 100644
index 11e2630f..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/Site.php
+++ /dev/null
@@ -1,134 +0,0 @@
-accountId = $accountId;
-  }
-  public function getAccountId()
-  {
-    return $this->accountId;
-  }
-  public function setApproved($approved)
-  {
-    $this->approved = $approved;
-  }
-  public function getApproved()
-  {
-    return $this->approved;
-  }
-  public function setDirectorySiteId($directorySiteId)
-  {
-    $this->directorySiteId = $directorySiteId;
-  }
-  public function getDirectorySiteId()
-  {
-    return $this->directorySiteId;
-  }
-  public function setDirectorySiteIdDimensionValue(Google_Service_Dfareporting_DimensionValue $directorySiteIdDimensionValue)
-  {
-    $this->directorySiteIdDimensionValue = $directorySiteIdDimensionValue;
-  }
-  public function getDirectorySiteIdDimensionValue()
-  {
-    return $this->directorySiteIdDimensionValue;
-  }
-  public function setId($id)
-  {
-    $this->id = $id;
-  }
-  public function getId()
-  {
-    return $this->id;
-  }
-  public function setIdDimensionValue(Google_Service_Dfareporting_DimensionValue $idDimensionValue)
-  {
-    $this->idDimensionValue = $idDimensionValue;
-  }
-  public function getIdDimensionValue()
-  {
-    return $this->idDimensionValue;
-  }
-  public function setKeyName($keyName)
-  {
-    $this->keyName = $keyName;
-  }
-  public function getKeyName()
-  {
-    return $this->keyName;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setName($name)
-  {
-    $this->name = $name;
-  }
-  public function getName()
-  {
-    return $this->name;
-  }
-  public function setSiteContacts($siteContacts)
-  {
-    $this->siteContacts = $siteContacts;
-  }
-  public function getSiteContacts()
-  {
-    return $this->siteContacts;
-  }
-  public function setSiteSettings(Google_Service_Dfareporting_SiteSettings $siteSettings)
-  {
-    $this->siteSettings = $siteSettings;
-  }
-  public function getSiteSettings()
-  {
-    return $this->siteSettings;
-  }
-  public function setSubaccountId($subaccountId)
-  {
-    $this->subaccountId = $subaccountId;
-  }
-  public function getSubaccountId()
-  {
-    return $this->subaccountId;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/SiteContact.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/SiteContact.php
deleted file mode 100644
index f2547cde..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/SiteContact.php
+++ /dev/null
@@ -1,93 +0,0 @@
-address = $address;
-  }
-  public function getAddress()
-  {
-    return $this->address;
-  }
-  public function setContactType($contactType)
-  {
-    $this->contactType = $contactType;
-  }
-  public function getContactType()
-  {
-    return $this->contactType;
-  }
-  public function setEmail($email)
-  {
-    $this->email = $email;
-  }
-  public function getEmail()
-  {
-    return $this->email;
-  }
-  public function setFirstName($firstName)
-  {
-    $this->firstName = $firstName;
-  }
-  public function getFirstName()
-  {
-    return $this->firstName;
-  }
-  public function setId($id)
-  {
-    $this->id = $id;
-  }
-  public function getId()
-  {
-    return $this->id;
-  }
-  public function setLastName($lastName)
-  {
-    $this->lastName = $lastName;
-  }
-  public function getLastName()
-  {
-    return $this->lastName;
-  }
-  public function setPhone($phone)
-  {
-    $this->phone = $phone;
-  }
-  public function getPhone()
-  {
-    return $this->phone;
-  }
-  public function setTitle($title)
-  {
-    $this->title = $title;
-  }
-  public function getTitle()
-  {
-    return $this->title;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/SiteSettings.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/SiteSettings.php
deleted file mode 100644
index ef948304..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/SiteSettings.php
+++ /dev/null
@@ -1,96 +0,0 @@
-activeViewOptOut = $activeViewOptOut;
-  }
-  public function getActiveViewOptOut()
-  {
-    return $this->activeViewOptOut;
-  }
-  public function setCreativeSettings(Google_Service_Dfareporting_CreativeSettings $creativeSettings)
-  {
-    $this->creativeSettings = $creativeSettings;
-  }
-  public function getCreativeSettings()
-  {
-    return $this->creativeSettings;
-  }
-  public function setDisableBrandSafeAds($disableBrandSafeAds)
-  {
-    $this->disableBrandSafeAds = $disableBrandSafeAds;
-  }
-  public function getDisableBrandSafeAds()
-  {
-    return $this->disableBrandSafeAds;
-  }
-  public function setDisableNewCookie($disableNewCookie)
-  {
-    $this->disableNewCookie = $disableNewCookie;
-  }
-  public function getDisableNewCookie()
-  {
-    return $this->disableNewCookie;
-  }
-  public function setLookbackConfiguration(Google_Service_Dfareporting_LookbackConfiguration $lookbackConfiguration)
-  {
-    $this->lookbackConfiguration = $lookbackConfiguration;
-  }
-  public function getLookbackConfiguration()
-  {
-    return $this->lookbackConfiguration;
-  }
-  public function setTagSetting(Google_Service_Dfareporting_TagSetting $tagSetting)
-  {
-    $this->tagSetting = $tagSetting;
-  }
-  public function getTagSetting()
-  {
-    return $this->tagSetting;
-  }
-  public function setVideoActiveViewOptOutTemplate($videoActiveViewOptOutTemplate)
-  {
-    $this->videoActiveViewOptOutTemplate = $videoActiveViewOptOutTemplate;
-  }
-  public function getVideoActiveViewOptOutTemplate()
-  {
-    return $this->videoActiveViewOptOutTemplate;
-  }
-  public function setVpaidAdapterChoiceTemplate($vpaidAdapterChoiceTemplate)
-  {
-    $this->vpaidAdapterChoiceTemplate = $vpaidAdapterChoiceTemplate;
-  }
-  public function getVpaidAdapterChoiceTemplate()
-  {
-    return $this->vpaidAdapterChoiceTemplate;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/SitesListResponse.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/SitesListResponse.php
deleted file mode 100644
index 649333ad..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/SitesListResponse.php
+++ /dev/null
@@ -1,50 +0,0 @@
-kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setNextPageToken($nextPageToken)
-  {
-    $this->nextPageToken = $nextPageToken;
-  }
-  public function getNextPageToken()
-  {
-    return $this->nextPageToken;
-  }
-  public function setSites($sites)
-  {
-    $this->sites = $sites;
-  }
-  public function getSites()
-  {
-    return $this->sites;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/Size.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/Size.php
deleted file mode 100644
index 2d175cab..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/Size.php
+++ /dev/null
@@ -1,66 +0,0 @@
-height = $height;
-  }
-  public function getHeight()
-  {
-    return $this->height;
-  }
-  public function setIab($iab)
-  {
-    $this->iab = $iab;
-  }
-  public function getIab()
-  {
-    return $this->iab;
-  }
-  public function setId($id)
-  {
-    $this->id = $id;
-  }
-  public function getId()
-  {
-    return $this->id;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setWidth($width)
-  {
-    $this->width = $width;
-  }
-  public function getWidth()
-  {
-    return $this->width;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/SizesListResponse.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/SizesListResponse.php
deleted file mode 100644
index 6e0eb6b5..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/SizesListResponse.php
+++ /dev/null
@@ -1,41 +0,0 @@
-kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setSizes($sizes)
-  {
-    $this->sizes = $sizes;
-  }
-  public function getSizes()
-  {
-    return $this->sizes;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/SkippableSetting.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/SkippableSetting.php
deleted file mode 100644
index f1656e86..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/SkippableSetting.php
+++ /dev/null
@@ -1,59 +0,0 @@
-kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setProgressOffset(Google_Service_Dfareporting_VideoOffset $progressOffset)
-  {
-    $this->progressOffset = $progressOffset;
-  }
-  public function getProgressOffset()
-  {
-    return $this->progressOffset;
-  }
-  public function setSkipOffset(Google_Service_Dfareporting_VideoOffset $skipOffset)
-  {
-    $this->skipOffset = $skipOffset;
-  }
-  public function getSkipOffset()
-  {
-    return $this->skipOffset;
-  }
-  public function setSkippable($skippable)
-  {
-    $this->skippable = $skippable;
-  }
-  public function getSkippable()
-  {
-    return $this->skippable;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/SortedDimension.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/SortedDimension.php
deleted file mode 100644
index 4d6dbed9..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/SortedDimension.php
+++ /dev/null
@@ -1,48 +0,0 @@
-kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setName($name)
-  {
-    $this->name = $name;
-  }
-  public function getName()
-  {
-    return $this->name;
-  }
-  public function setSortOrder($sortOrder)
-  {
-    $this->sortOrder = $sortOrder;
-  }
-  public function getSortOrder()
-  {
-    return $this->sortOrder;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/Subaccount.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/Subaccount.php
deleted file mode 100644
index 51322bb7..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/Subaccount.php
+++ /dev/null
@@ -1,67 +0,0 @@
-accountId = $accountId;
-  }
-  public function getAccountId()
-  {
-    return $this->accountId;
-  }
-  public function setAvailablePermissionIds($availablePermissionIds)
-  {
-    $this->availablePermissionIds = $availablePermissionIds;
-  }
-  public function getAvailablePermissionIds()
-  {
-    return $this->availablePermissionIds;
-  }
-  public function setId($id)
-  {
-    $this->id = $id;
-  }
-  public function getId()
-  {
-    return $this->id;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setName($name)
-  {
-    $this->name = $name;
-  }
-  public function getName()
-  {
-    return $this->name;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/SubaccountsListResponse.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/SubaccountsListResponse.php
deleted file mode 100644
index 22a06155..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/SubaccountsListResponse.php
+++ /dev/null
@@ -1,50 +0,0 @@
-kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setNextPageToken($nextPageToken)
-  {
-    $this->nextPageToken = $nextPageToken;
-  }
-  public function getNextPageToken()
-  {
-    return $this->nextPageToken;
-  }
-  public function setSubaccounts($subaccounts)
-  {
-    $this->subaccounts = $subaccounts;
-  }
-  public function getSubaccounts()
-  {
-    return $this->subaccounts;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/TagData.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/TagData.php
deleted file mode 100644
index 4d293b04..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/TagData.php
+++ /dev/null
@@ -1,66 +0,0 @@
-adId = $adId;
-  }
-  public function getAdId()
-  {
-    return $this->adId;
-  }
-  public function setClickTag($clickTag)
-  {
-    $this->clickTag = $clickTag;
-  }
-  public function getClickTag()
-  {
-    return $this->clickTag;
-  }
-  public function setCreativeId($creativeId)
-  {
-    $this->creativeId = $creativeId;
-  }
-  public function getCreativeId()
-  {
-    return $this->creativeId;
-  }
-  public function setFormat($format)
-  {
-    $this->format = $format;
-  }
-  public function getFormat()
-  {
-    return $this->format;
-  }
-  public function setImpressionTag($impressionTag)
-  {
-    $this->impressionTag = $impressionTag;
-  }
-  public function getImpressionTag()
-  {
-    return $this->impressionTag;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/TagSetting.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/TagSetting.php
deleted file mode 100644
index 888f4ef9..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/TagSetting.php
+++ /dev/null
@@ -1,57 +0,0 @@
-additionalKeyValues = $additionalKeyValues;
-  }
-  public function getAdditionalKeyValues()
-  {
-    return $this->additionalKeyValues;
-  }
-  public function setIncludeClickThroughUrls($includeClickThroughUrls)
-  {
-    $this->includeClickThroughUrls = $includeClickThroughUrls;
-  }
-  public function getIncludeClickThroughUrls()
-  {
-    return $this->includeClickThroughUrls;
-  }
-  public function setIncludeClickTracking($includeClickTracking)
-  {
-    $this->includeClickTracking = $includeClickTracking;
-  }
-  public function getIncludeClickTracking()
-  {
-    return $this->includeClickTracking;
-  }
-  public function setKeywordOption($keywordOption)
-  {
-    $this->keywordOption = $keywordOption;
-  }
-  public function getKeywordOption()
-  {
-    return $this->keywordOption;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/TagSettings.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/TagSettings.php
deleted file mode 100644
index 954cd30d..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/TagSettings.php
+++ /dev/null
@@ -1,39 +0,0 @@
-dynamicTagEnabled = $dynamicTagEnabled;
-  }
-  public function getDynamicTagEnabled()
-  {
-    return $this->dynamicTagEnabled;
-  }
-  public function setImageTagEnabled($imageTagEnabled)
-  {
-    $this->imageTagEnabled = $imageTagEnabled;
-  }
-  public function getImageTagEnabled()
-  {
-    return $this->imageTagEnabled;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/TargetWindow.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/TargetWindow.php
deleted file mode 100644
index 91cb9ac7..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/TargetWindow.php
+++ /dev/null
@@ -1,39 +0,0 @@
-customHtml = $customHtml;
-  }
-  public function getCustomHtml()
-  {
-    return $this->customHtml;
-  }
-  public function setTargetWindowOption($targetWindowOption)
-  {
-    $this->targetWindowOption = $targetWindowOption;
-  }
-  public function getTargetWindowOption()
-  {
-    return $this->targetWindowOption;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/TargetableRemarketingList.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/TargetableRemarketingList.php
deleted file mode 100644
index 874918e5..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/TargetableRemarketingList.php
+++ /dev/null
@@ -1,130 +0,0 @@
-accountId = $accountId;
-  }
-  public function getAccountId()
-  {
-    return $this->accountId;
-  }
-  public function setActive($active)
-  {
-    $this->active = $active;
-  }
-  public function getActive()
-  {
-    return $this->active;
-  }
-  public function setAdvertiserId($advertiserId)
-  {
-    $this->advertiserId = $advertiserId;
-  }
-  public function getAdvertiserId()
-  {
-    return $this->advertiserId;
-  }
-  public function setAdvertiserIdDimensionValue(Google_Service_Dfareporting_DimensionValue $advertiserIdDimensionValue)
-  {
-    $this->advertiserIdDimensionValue = $advertiserIdDimensionValue;
-  }
-  public function getAdvertiserIdDimensionValue()
-  {
-    return $this->advertiserIdDimensionValue;
-  }
-  public function setDescription($description)
-  {
-    $this->description = $description;
-  }
-  public function getDescription()
-  {
-    return $this->description;
-  }
-  public function setId($id)
-  {
-    $this->id = $id;
-  }
-  public function getId()
-  {
-    return $this->id;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setLifeSpan($lifeSpan)
-  {
-    $this->lifeSpan = $lifeSpan;
-  }
-  public function getLifeSpan()
-  {
-    return $this->lifeSpan;
-  }
-  public function setListSize($listSize)
-  {
-    $this->listSize = $listSize;
-  }
-  public function getListSize()
-  {
-    return $this->listSize;
-  }
-  public function setListSource($listSource)
-  {
-    $this->listSource = $listSource;
-  }
-  public function getListSource()
-  {
-    return $this->listSource;
-  }
-  public function setName($name)
-  {
-    $this->name = $name;
-  }
-  public function getName()
-  {
-    return $this->name;
-  }
-  public function setSubaccountId($subaccountId)
-  {
-    $this->subaccountId = $subaccountId;
-  }
-  public function getSubaccountId()
-  {
-    return $this->subaccountId;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/TargetableRemarketingListsListResponse.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/TargetableRemarketingListsListResponse.php
deleted file mode 100644
index 3db5c694..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/TargetableRemarketingListsListResponse.php
+++ /dev/null
@@ -1,50 +0,0 @@
-kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setNextPageToken($nextPageToken)
-  {
-    $this->nextPageToken = $nextPageToken;
-  }
-  public function getNextPageToken()
-  {
-    return $this->nextPageToken;
-  }
-  public function setTargetableRemarketingLists($targetableRemarketingLists)
-  {
-    $this->targetableRemarketingLists = $targetableRemarketingLists;
-  }
-  public function getTargetableRemarketingLists()
-  {
-    return $this->targetableRemarketingLists;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/TargetingTemplate.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/TargetingTemplate.php
deleted file mode 100644
index 82aaae48..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/TargetingTemplate.php
+++ /dev/null
@@ -1,145 +0,0 @@
-accountId = $accountId;
-  }
-  public function getAccountId()
-  {
-    return $this->accountId;
-  }
-  public function setAdvertiserId($advertiserId)
-  {
-    $this->advertiserId = $advertiserId;
-  }
-  public function getAdvertiserId()
-  {
-    return $this->advertiserId;
-  }
-  public function setAdvertiserIdDimensionValue(Google_Service_Dfareporting_DimensionValue $advertiserIdDimensionValue)
-  {
-    $this->advertiserIdDimensionValue = $advertiserIdDimensionValue;
-  }
-  public function getAdvertiserIdDimensionValue()
-  {
-    return $this->advertiserIdDimensionValue;
-  }
-  public function setDayPartTargeting(Google_Service_Dfareporting_DayPartTargeting $dayPartTargeting)
-  {
-    $this->dayPartTargeting = $dayPartTargeting;
-  }
-  public function getDayPartTargeting()
-  {
-    return $this->dayPartTargeting;
-  }
-  public function setGeoTargeting(Google_Service_Dfareporting_GeoTargeting $geoTargeting)
-  {
-    $this->geoTargeting = $geoTargeting;
-  }
-  public function getGeoTargeting()
-  {
-    return $this->geoTargeting;
-  }
-  public function setId($id)
-  {
-    $this->id = $id;
-  }
-  public function getId()
-  {
-    return $this->id;
-  }
-  public function setKeyValueTargetingExpression(Google_Service_Dfareporting_KeyValueTargetingExpression $keyValueTargetingExpression)
-  {
-    $this->keyValueTargetingExpression = $keyValueTargetingExpression;
-  }
-  public function getKeyValueTargetingExpression()
-  {
-    return $this->keyValueTargetingExpression;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setLanguageTargeting(Google_Service_Dfareporting_LanguageTargeting $languageTargeting)
-  {
-    $this->languageTargeting = $languageTargeting;
-  }
-  public function getLanguageTargeting()
-  {
-    return $this->languageTargeting;
-  }
-  public function setListTargetingExpression(Google_Service_Dfareporting_ListTargetingExpression $listTargetingExpression)
-  {
-    $this->listTargetingExpression = $listTargetingExpression;
-  }
-  public function getListTargetingExpression()
-  {
-    return $this->listTargetingExpression;
-  }
-  public function setName($name)
-  {
-    $this->name = $name;
-  }
-  public function getName()
-  {
-    return $this->name;
-  }
-  public function setSubaccountId($subaccountId)
-  {
-    $this->subaccountId = $subaccountId;
-  }
-  public function getSubaccountId()
-  {
-    return $this->subaccountId;
-  }
-  public function setTechnologyTargeting(Google_Service_Dfareporting_TechnologyTargeting $technologyTargeting)
-  {
-    $this->technologyTargeting = $technologyTargeting;
-  }
-  public function getTechnologyTargeting()
-  {
-    return $this->technologyTargeting;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/TargetingTemplatesListResponse.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/TargetingTemplatesListResponse.php
deleted file mode 100644
index 5cbe40fa..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/TargetingTemplatesListResponse.php
+++ /dev/null
@@ -1,50 +0,0 @@
-kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setNextPageToken($nextPageToken)
-  {
-    $this->nextPageToken = $nextPageToken;
-  }
-  public function getNextPageToken()
-  {
-    return $this->nextPageToken;
-  }
-  public function setTargetingTemplates($targetingTemplates)
-  {
-    $this->targetingTemplates = $targetingTemplates;
-  }
-  public function getTargetingTemplates()
-  {
-    return $this->targetingTemplates;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/TechnologyTargeting.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/TechnologyTargeting.php
deleted file mode 100644
index 1284b19c..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/TechnologyTargeting.php
+++ /dev/null
@@ -1,82 +0,0 @@
-browsers = $browsers;
-  }
-  public function getBrowsers()
-  {
-    return $this->browsers;
-  }
-  public function setConnectionTypes($connectionTypes)
-  {
-    $this->connectionTypes = $connectionTypes;
-  }
-  public function getConnectionTypes()
-  {
-    return $this->connectionTypes;
-  }
-  public function setMobileCarriers($mobileCarriers)
-  {
-    $this->mobileCarriers = $mobileCarriers;
-  }
-  public function getMobileCarriers()
-  {
-    return $this->mobileCarriers;
-  }
-  public function setOperatingSystemVersions($operatingSystemVersions)
-  {
-    $this->operatingSystemVersions = $operatingSystemVersions;
-  }
-  public function getOperatingSystemVersions()
-  {
-    return $this->operatingSystemVersions;
-  }
-  public function setOperatingSystems($operatingSystems)
-  {
-    $this->operatingSystems = $operatingSystems;
-  }
-  public function getOperatingSystems()
-  {
-    return $this->operatingSystems;
-  }
-  public function setPlatformTypes($platformTypes)
-  {
-    $this->platformTypes = $platformTypes;
-  }
-  public function getPlatformTypes()
-  {
-    return $this->platformTypes;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/ThirdPartyAuthenticationToken.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/ThirdPartyAuthenticationToken.php
deleted file mode 100644
index 5f240020..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/ThirdPartyAuthenticationToken.php
+++ /dev/null
@@ -1,39 +0,0 @@
-name = $name;
-  }
-  public function getName()
-  {
-    return $this->name;
-  }
-  public function setValue($value)
-  {
-    $this->value = $value;
-  }
-  public function getValue()
-  {
-    return $this->value;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/ThirdPartyTrackingUrl.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/ThirdPartyTrackingUrl.php
deleted file mode 100644
index 0c3afdf4..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/ThirdPartyTrackingUrl.php
+++ /dev/null
@@ -1,39 +0,0 @@
-thirdPartyUrlType = $thirdPartyUrlType;
-  }
-  public function getThirdPartyUrlType()
-  {
-    return $this->thirdPartyUrlType;
-  }
-  public function setUrl($url)
-  {
-    $this->url = $url;
-  }
-  public function getUrl()
-  {
-    return $this->url;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/TranscodeSetting.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/TranscodeSetting.php
deleted file mode 100644
index dd691696..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/TranscodeSetting.php
+++ /dev/null
@@ -1,40 +0,0 @@
-enabledVideoFormats = $enabledVideoFormats;
-  }
-  public function getEnabledVideoFormats()
-  {
-    return $this->enabledVideoFormats;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/UserDefinedVariableConfiguration.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/UserDefinedVariableConfiguration.php
deleted file mode 100644
index a3bf7433..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/UserDefinedVariableConfiguration.php
+++ /dev/null
@@ -1,48 +0,0 @@
-dataType = $dataType;
-  }
-  public function getDataType()
-  {
-    return $this->dataType;
-  }
-  public function setReportName($reportName)
-  {
-    $this->reportName = $reportName;
-  }
-  public function getReportName()
-  {
-    return $this->reportName;
-  }
-  public function setVariableType($variableType)
-  {
-    $this->variableType = $variableType;
-  }
-  public function getVariableType()
-  {
-    return $this->variableType;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/UserProfile.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/UserProfile.php
deleted file mode 100644
index 55dffef4..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/UserProfile.php
+++ /dev/null
@@ -1,93 +0,0 @@
-accountId = $accountId;
-  }
-  public function getAccountId()
-  {
-    return $this->accountId;
-  }
-  public function setAccountName($accountName)
-  {
-    $this->accountName = $accountName;
-  }
-  public function getAccountName()
-  {
-    return $this->accountName;
-  }
-  public function setEtag($etag)
-  {
-    $this->etag = $etag;
-  }
-  public function getEtag()
-  {
-    return $this->etag;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setProfileId($profileId)
-  {
-    $this->profileId = $profileId;
-  }
-  public function getProfileId()
-  {
-    return $this->profileId;
-  }
-  public function setSubAccountId($subAccountId)
-  {
-    $this->subAccountId = $subAccountId;
-  }
-  public function getSubAccountId()
-  {
-    return $this->subAccountId;
-  }
-  public function setSubAccountName($subAccountName)
-  {
-    $this->subAccountName = $subAccountName;
-  }
-  public function getSubAccountName()
-  {
-    return $this->subAccountName;
-  }
-  public function setUserName($userName)
-  {
-    $this->userName = $userName;
-  }
-  public function getUserName()
-  {
-    return $this->userName;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/UserProfileList.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/UserProfileList.php
deleted file mode 100644
index 57217604..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/UserProfileList.php
+++ /dev/null
@@ -1,50 +0,0 @@
-etag = $etag;
-  }
-  public function getEtag()
-  {
-    return $this->etag;
-  }
-  public function setItems($items)
-  {
-    $this->items = $items;
-  }
-  public function getItems()
-  {
-    return $this->items;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/UserRole.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/UserRole.php
deleted file mode 100644
index dfb7b1eb..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/UserRole.php
+++ /dev/null
@@ -1,95 +0,0 @@
-accountId = $accountId;
-  }
-  public function getAccountId()
-  {
-    return $this->accountId;
-  }
-  public function setDefaultUserRole($defaultUserRole)
-  {
-    $this->defaultUserRole = $defaultUserRole;
-  }
-  public function getDefaultUserRole()
-  {
-    return $this->defaultUserRole;
-  }
-  public function setId($id)
-  {
-    $this->id = $id;
-  }
-  public function getId()
-  {
-    return $this->id;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setName($name)
-  {
-    $this->name = $name;
-  }
-  public function getName()
-  {
-    return $this->name;
-  }
-  public function setParentUserRoleId($parentUserRoleId)
-  {
-    $this->parentUserRoleId = $parentUserRoleId;
-  }
-  public function getParentUserRoleId()
-  {
-    return $this->parentUserRoleId;
-  }
-  public function setPermissions($permissions)
-  {
-    $this->permissions = $permissions;
-  }
-  public function getPermissions()
-  {
-    return $this->permissions;
-  }
-  public function setSubaccountId($subaccountId)
-  {
-    $this->subaccountId = $subaccountId;
-  }
-  public function getSubaccountId()
-  {
-    return $this->subaccountId;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/UserRolePermission.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/UserRolePermission.php
deleted file mode 100644
index a6963c65..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/UserRolePermission.php
+++ /dev/null
@@ -1,66 +0,0 @@
-availability = $availability;
-  }
-  public function getAvailability()
-  {
-    return $this->availability;
-  }
-  public function setId($id)
-  {
-    $this->id = $id;
-  }
-  public function getId()
-  {
-    return $this->id;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setName($name)
-  {
-    $this->name = $name;
-  }
-  public function getName()
-  {
-    return $this->name;
-  }
-  public function setPermissionGroupId($permissionGroupId)
-  {
-    $this->permissionGroupId = $permissionGroupId;
-  }
-  public function getPermissionGroupId()
-  {
-    return $this->permissionGroupId;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/UserRolePermissionGroup.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/UserRolePermissionGroup.php
deleted file mode 100644
index 2d07d1f7..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/UserRolePermissionGroup.php
+++ /dev/null
@@ -1,48 +0,0 @@
-id = $id;
-  }
-  public function getId()
-  {
-    return $this->id;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setName($name)
-  {
-    $this->name = $name;
-  }
-  public function getName()
-  {
-    return $this->name;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/UserRolePermissionGroupsListResponse.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/UserRolePermissionGroupsListResponse.php
deleted file mode 100644
index db2370e1..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/UserRolePermissionGroupsListResponse.php
+++ /dev/null
@@ -1,41 +0,0 @@
-kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setUserRolePermissionGroups($userRolePermissionGroups)
-  {
-    $this->userRolePermissionGroups = $userRolePermissionGroups;
-  }
-  public function getUserRolePermissionGroups()
-  {
-    return $this->userRolePermissionGroups;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/UserRolePermissionsListResponse.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/UserRolePermissionsListResponse.php
deleted file mode 100644
index 8e5092e4..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/UserRolePermissionsListResponse.php
+++ /dev/null
@@ -1,41 +0,0 @@
-kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setUserRolePermissions($userRolePermissions)
-  {
-    $this->userRolePermissions = $userRolePermissions;
-  }
-  public function getUserRolePermissions()
-  {
-    return $this->userRolePermissions;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/UserRolesListResponse.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/UserRolesListResponse.php
deleted file mode 100644
index 03f56d95..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/UserRolesListResponse.php
+++ /dev/null
@@ -1,50 +0,0 @@
-kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setNextPageToken($nextPageToken)
-  {
-    $this->nextPageToken = $nextPageToken;
-  }
-  public function getNextPageToken()
-  {
-    return $this->nextPageToken;
-  }
-  public function setUserRoles($userRoles)
-  {
-    $this->userRoles = $userRoles;
-  }
-  public function getUserRoles()
-  {
-    return $this->userRoles;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/VideoFormat.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/VideoFormat.php
deleted file mode 100644
index 816cab22..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/VideoFormat.php
+++ /dev/null
@@ -1,67 +0,0 @@
-fileType = $fileType;
-  }
-  public function getFileType()
-  {
-    return $this->fileType;
-  }
-  public function setId($id)
-  {
-    $this->id = $id;
-  }
-  public function getId()
-  {
-    return $this->id;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setResolution(Google_Service_Dfareporting_Size $resolution)
-  {
-    $this->resolution = $resolution;
-  }
-  public function getResolution()
-  {
-    return $this->resolution;
-  }
-  public function setTargetBitRate($targetBitRate)
-  {
-    $this->targetBitRate = $targetBitRate;
-  }
-  public function getTargetBitRate()
-  {
-    return $this->targetBitRate;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/VideoFormatsListResponse.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/VideoFormatsListResponse.php
deleted file mode 100644
index 08cba30e..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/VideoFormatsListResponse.php
+++ /dev/null
@@ -1,41 +0,0 @@
-kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setVideoFormats($videoFormats)
-  {
-    $this->videoFormats = $videoFormats;
-  }
-  public function getVideoFormats()
-  {
-    return $this->videoFormats;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/VideoOffset.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/VideoOffset.php
deleted file mode 100644
index 0df6f9cf..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/VideoOffset.php
+++ /dev/null
@@ -1,39 +0,0 @@
-offsetPercentage = $offsetPercentage;
-  }
-  public function getOffsetPercentage()
-  {
-    return $this->offsetPercentage;
-  }
-  public function setOffsetSeconds($offsetSeconds)
-  {
-    $this->offsetSeconds = $offsetSeconds;
-  }
-  public function getOffsetSeconds()
-  {
-    return $this->offsetSeconds;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/VideoSettings.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/VideoSettings.php
deleted file mode 100644
index 4e4a0330..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dfareporting/VideoSettings.php
+++ /dev/null
@@ -1,60 +0,0 @@
-companionSettings = $companionSettings;
-  }
-  public function getCompanionSettings()
-  {
-    return $this->companionSettings;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setSkippableSettings(Google_Service_Dfareporting_SkippableSetting $skippableSettings)
-  {
-    $this->skippableSettings = $skippableSettings;
-  }
-  public function getSkippableSettings()
-  {
-    return $this->skippableSettings;
-  }
-  public function setTranscodeSettings(Google_Service_Dfareporting_TranscodeSetting $transcodeSettings)
-  {
-    $this->transcodeSettings = $transcodeSettings;
-  }
-  public function getTranscodeSettings()
-  {
-    return $this->transcodeSettings;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Directory.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Directory.php
deleted file mode 100644
index fafcfaad..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Directory.php
+++ /dev/null
@@ -1,1788 +0,0 @@
-
- * The Admin SDK Directory API lets you view and manage enterprise resources
- * such as users and groups, administrative notifications, security features,
- * and more.

- *
- * 

- * For more information about this service, see the API
- * Documentation
- * 

- *
- * @author Google, Inc.
- */
-class Google_Service_Directory extends Google_Service
-{
-  /** View and manage customer related information. */
-  const ADMIN_DIRECTORY_CUSTOMER =
-      "https://www.googleapis.com/auth/admin.directory.customer";
-  /** View customer related information. */
-  const ADMIN_DIRECTORY_CUSTOMER_READONLY =
-      "https://www.googleapis.com/auth/admin.directory.customer.readonly";
-  /** View and manage your Chrome OS devices' metadata. */
-  const ADMIN_DIRECTORY_DEVICE_CHROMEOS =
-      "https://www.googleapis.com/auth/admin.directory.device.chromeos";
-  /** View your Chrome OS devices' metadata. */
-  const ADMIN_DIRECTORY_DEVICE_CHROMEOS_READONLY =
-      "https://www.googleapis.com/auth/admin.directory.device.chromeos.readonly";
-  /** View and manage your mobile devices' metadata. */
-  const ADMIN_DIRECTORY_DEVICE_MOBILE =
-      "https://www.googleapis.com/auth/admin.directory.device.mobile";
-  /** Manage your mobile devices by performing administrative tasks. */
-  const ADMIN_DIRECTORY_DEVICE_MOBILE_ACTION =
-      "https://www.googleapis.com/auth/admin.directory.device.mobile.action";
-  /** View your mobile devices' metadata. */
-  const ADMIN_DIRECTORY_DEVICE_MOBILE_READONLY =
-      "https://www.googleapis.com/auth/admin.directory.device.mobile.readonly";
-  /** View and manage the provisioning of domains for your customers. */
-  const ADMIN_DIRECTORY_DOMAIN =
-      "https://www.googleapis.com/auth/admin.directory.domain";
-  /** View domains related to your customers. */
-  const ADMIN_DIRECTORY_DOMAIN_READONLY =
-      "https://www.googleapis.com/auth/admin.directory.domain.readonly";
-  /** View and manage the provisioning of groups on your domain. */
-  const ADMIN_DIRECTORY_GROUP =
-      "https://www.googleapis.com/auth/admin.directory.group";
-  /** View and manage group subscriptions on your domain. */
-  const ADMIN_DIRECTORY_GROUP_MEMBER =
-      "https://www.googleapis.com/auth/admin.directory.group.member";
-  /** View group subscriptions on your domain. */
-  const ADMIN_DIRECTORY_GROUP_MEMBER_READONLY =
-      "https://www.googleapis.com/auth/admin.directory.group.member.readonly";
-  /** View groups on your domain. */
-  const ADMIN_DIRECTORY_GROUP_READONLY =
-      "https://www.googleapis.com/auth/admin.directory.group.readonly";
-  /** View and manage notifications received on your domain. */
-  const ADMIN_DIRECTORY_NOTIFICATIONS =
-      "https://www.googleapis.com/auth/admin.directory.notifications";
-  /** View and manage organization units on your domain. */
-  const ADMIN_DIRECTORY_ORGUNIT =
-      "https://www.googleapis.com/auth/admin.directory.orgunit";
-  /** View organization units on your domain. */
-  const ADMIN_DIRECTORY_ORGUNIT_READONLY =
-      "https://www.googleapis.com/auth/admin.directory.orgunit.readonly";
-  /** View and manage the provisioning of calendar resources on your domain. */
-  const ADMIN_DIRECTORY_RESOURCE_CALENDAR =
-      "https://www.googleapis.com/auth/admin.directory.resource.calendar";
-  /** View calendar resources on your domain. */
-  const ADMIN_DIRECTORY_RESOURCE_CALENDAR_READONLY =
-      "https://www.googleapis.com/auth/admin.directory.resource.calendar.readonly";
-  /** Manage delegated admin roles for your domain. */
-  const ADMIN_DIRECTORY_ROLEMANAGEMENT =
-      "https://www.googleapis.com/auth/admin.directory.rolemanagement";
-  /** View delegated admin roles for your domain. */
-  const ADMIN_DIRECTORY_ROLEMANAGEMENT_READONLY =
-      "https://www.googleapis.com/auth/admin.directory.rolemanagement.readonly";
-  /** View and manage the provisioning of users on your domain. */
-  const ADMIN_DIRECTORY_USER =
-      "https://www.googleapis.com/auth/admin.directory.user";
-  /** View and manage user aliases on your domain. */
-  const ADMIN_DIRECTORY_USER_ALIAS =
-      "https://www.googleapis.com/auth/admin.directory.user.alias";
-  /** View user aliases on your domain. */
-  const ADMIN_DIRECTORY_USER_ALIAS_READONLY =
-      "https://www.googleapis.com/auth/admin.directory.user.alias.readonly";
-  /** View users on your domain. */
-  const ADMIN_DIRECTORY_USER_READONLY =
-      "https://www.googleapis.com/auth/admin.directory.user.readonly";
-  /** Manage data access permissions for users on your domain. */
-  const ADMIN_DIRECTORY_USER_SECURITY =
-      "https://www.googleapis.com/auth/admin.directory.user.security";
-  /** View and manage the provisioning of user schemas on your domain. */
-  const ADMIN_DIRECTORY_USERSCHEMA =
-      "https://www.googleapis.com/auth/admin.directory.userschema";
-  /** View user schemas on your domain. */
-  const ADMIN_DIRECTORY_USERSCHEMA_READONLY =
-      "https://www.googleapis.com/auth/admin.directory.userschema.readonly";
-
-  public $asps;
-  public $channels;
-  public $chromeosdevices;
-  public $customers;
-  public $domainAliases;
-  public $domains;
-  public $groups;
-  public $groups_aliases;
-  public $members;
-  public $mobiledevices;
-  public $notifications;
-  public $orgunits;
-  public $privileges;
-  public $resources_calendars;
-  public $roleAssignments;
-  public $roles;
-  public $schemas;
-  public $tokens;
-  public $users;
-  public $users_aliases;
-  public $users_photos;
-  public $verificationCodes;
-  
-  /**
-   * Constructs the internal representation of the Directory service.
-   *
-   * @param Google_Client $client
-   */
-  public function __construct(Google_Client $client)
-  {
-    parent::__construct($client);
-    $this->rootUrl = 'https://www.googleapis.com/';
-    $this->servicePath = 'admin/directory/v1/';
-    $this->version = 'directory_v1';
-    $this->serviceName = 'admin';
-
-    $this->asps = new Google_Service_Directory_Resource_Asps(
-        $this,
-        $this->serviceName,
-        'asps',
-        array(
-          'methods' => array(
-            'delete' => array(
-              'path' => 'users/{userKey}/asps/{codeId}',
-              'httpMethod' => 'DELETE',
-              'parameters' => array(
-                'userKey' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'codeId' => array(
-                  'location' => 'path',
-                  'type' => 'integer',
-                  'required' => true,
-                ),
-              ),
-            ),'get' => array(
-              'path' => 'users/{userKey}/asps/{codeId}',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'userKey' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'codeId' => array(
-                  'location' => 'path',
-                  'type' => 'integer',
-                  'required' => true,
-                ),
-              ),
-            ),'list' => array(
-              'path' => 'users/{userKey}/asps',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'userKey' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),
-          )
-        )
-    );
-    $this->channels = new Google_Service_Directory_Resource_Channels(
-        $this,
-        $this->serviceName,
-        'channels',
-        array(
-          'methods' => array(
-            'stop' => array(
-              'path' => '/admin/directory_v1/channels/stop',
-              'httpMethod' => 'POST',
-              'parameters' => array(),
-            ),
-          )
-        )
-    );
-    $this->chromeosdevices = new Google_Service_Directory_Resource_Chromeosdevices(
-        $this,
-        $this->serviceName,
-        'chromeosdevices',
-        array(
-          'methods' => array(
-            'action' => array(
-              'path' => 'customer/{customerId}/devices/chromeos/{resourceId}/action',
-              'httpMethod' => 'POST',
-              'parameters' => array(
-                'customerId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'resourceId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'get' => array(
-              'path' => 'customer/{customerId}/devices/chromeos/{deviceId}',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'customerId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'deviceId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'projection' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-              ),
-            ),'list' => array(
-              'path' => 'customer/{customerId}/devices/chromeos',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'customerId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'maxResults' => array(
-                  'location' => 'query',
-                  'type' => 'integer',
-                ),
-                'orderBy' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'pageToken' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'projection' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'query' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'sortOrder' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-              ),
-            ),'patch' => array(
-              'path' => 'customer/{customerId}/devices/chromeos/{deviceId}',
-              'httpMethod' => 'PATCH',
-              'parameters' => array(
-                'customerId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'deviceId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'projection' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-              ),
-            ),'update' => array(
-              'path' => 'customer/{customerId}/devices/chromeos/{deviceId}',
-              'httpMethod' => 'PUT',
-              'parameters' => array(
-                'customerId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'deviceId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'projection' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-              ),
-            ),
-          )
-        )
-    );
-    $this->customers = new Google_Service_Directory_Resource_Customers(
-        $this,
-        $this->serviceName,
-        'customers',
-        array(
-          'methods' => array(
-            'get' => array(
-              'path' => 'customers/{customerKey}',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'customerKey' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'patch' => array(
-              'path' => 'customers/{customerKey}',
-              'httpMethod' => 'PATCH',
-              'parameters' => array(
-                'customerKey' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'update' => array(
-              'path' => 'customers/{customerKey}',
-              'httpMethod' => 'PUT',
-              'parameters' => array(
-                'customerKey' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),
-          )
-        )
-    );
-    $this->domainAliases = new Google_Service_Directory_Resource_DomainAliases(
-        $this,
-        $this->serviceName,
-        'domainAliases',
-        array(
-          'methods' => array(
-            'delete' => array(
-              'path' => 'customer/{customer}/domainaliases/{domainAliasName}',
-              'httpMethod' => 'DELETE',
-              'parameters' => array(
-                'customer' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'domainAliasName' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'get' => array(
-              'path' => 'customer/{customer}/domainaliases/{domainAliasName}',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'customer' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'domainAliasName' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'insert' => array(
-              'path' => 'customer/{customer}/domainaliases',
-              'httpMethod' => 'POST',
-              'parameters' => array(
-                'customer' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'list' => array(
-              'path' => 'customer/{customer}/domainaliases',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'customer' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'parentDomainName' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-              ),
-            ),
-          )
-        )
-    );
-    $this->domains = new Google_Service_Directory_Resource_Domains(
-        $this,
-        $this->serviceName,
-        'domains',
-        array(
-          'methods' => array(
-            'delete' => array(
-              'path' => 'customer/{customer}/domains/{domainName}',
-              'httpMethod' => 'DELETE',
-              'parameters' => array(
-                'customer' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'domainName' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'get' => array(
-              'path' => 'customer/{customer}/domains/{domainName}',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'customer' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'domainName' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'insert' => array(
-              'path' => 'customer/{customer}/domains',
-              'httpMethod' => 'POST',
-              'parameters' => array(
-                'customer' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'list' => array(
-              'path' => 'customer/{customer}/domains',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'customer' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),
-          )
-        )
-    );
-    $this->groups = new Google_Service_Directory_Resource_Groups(
-        $this,
-        $this->serviceName,
-        'groups',
-        array(
-          'methods' => array(
-            'delete' => array(
-              'path' => 'groups/{groupKey}',
-              'httpMethod' => 'DELETE',
-              'parameters' => array(
-                'groupKey' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'get' => array(
-              'path' => 'groups/{groupKey}',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'groupKey' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'insert' => array(
-              'path' => 'groups',
-              'httpMethod' => 'POST',
-              'parameters' => array(),
-            ),'list' => array(
-              'path' => 'groups',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'customer' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'domain' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'maxResults' => array(
-                  'location' => 'query',
-                  'type' => 'integer',
-                ),
-                'pageToken' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'userKey' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-              ),
-            ),'patch' => array(
-              'path' => 'groups/{groupKey}',
-              'httpMethod' => 'PATCH',
-              'parameters' => array(
-                'groupKey' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'update' => array(
-              'path' => 'groups/{groupKey}',
-              'httpMethod' => 'PUT',
-              'parameters' => array(
-                'groupKey' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),
-          )
-        )
-    );
-    $this->groups_aliases = new Google_Service_Directory_Resource_GroupsAliases(
-        $this,
-        $this->serviceName,
-        'aliases',
-        array(
-          'methods' => array(
-            'delete' => array(
-              'path' => 'groups/{groupKey}/aliases/{alias}',
-              'httpMethod' => 'DELETE',
-              'parameters' => array(
-                'groupKey' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'alias' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'insert' => array(
-              'path' => 'groups/{groupKey}/aliases',
-              'httpMethod' => 'POST',
-              'parameters' => array(
-                'groupKey' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'list' => array(
-              'path' => 'groups/{groupKey}/aliases',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'groupKey' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),
-          )
-        )
-    );
-    $this->members = new Google_Service_Directory_Resource_Members(
-        $this,
-        $this->serviceName,
-        'members',
-        array(
-          'methods' => array(
-            'delete' => array(
-              'path' => 'groups/{groupKey}/members/{memberKey}',
-              'httpMethod' => 'DELETE',
-              'parameters' => array(
-                'groupKey' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'memberKey' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'get' => array(
-              'path' => 'groups/{groupKey}/members/{memberKey}',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'groupKey' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'memberKey' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'insert' => array(
-              'path' => 'groups/{groupKey}/members',
-              'httpMethod' => 'POST',
-              'parameters' => array(
-                'groupKey' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'list' => array(
-              'path' => 'groups/{groupKey}/members',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'groupKey' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'maxResults' => array(
-                  'location' => 'query',
-                  'type' => 'integer',
-                ),
-                'pageToken' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'roles' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-              ),
-            ),'patch' => array(
-              'path' => 'groups/{groupKey}/members/{memberKey}',
-              'httpMethod' => 'PATCH',
-              'parameters' => array(
-                'groupKey' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'memberKey' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'update' => array(
-              'path' => 'groups/{groupKey}/members/{memberKey}',
-              'httpMethod' => 'PUT',
-              'parameters' => array(
-                'groupKey' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'memberKey' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),
-          )
-        )
-    );
-    $this->mobiledevices = new Google_Service_Directory_Resource_Mobiledevices(
-        $this,
-        $this->serviceName,
-        'mobiledevices',
-        array(
-          'methods' => array(
-            'action' => array(
-              'path' => 'customer/{customerId}/devices/mobile/{resourceId}/action',
-              'httpMethod' => 'POST',
-              'parameters' => array(
-                'customerId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'resourceId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'delete' => array(
-              'path' => 'customer/{customerId}/devices/mobile/{resourceId}',
-              'httpMethod' => 'DELETE',
-              'parameters' => array(
-                'customerId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'resourceId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'get' => array(
-              'path' => 'customer/{customerId}/devices/mobile/{resourceId}',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'customerId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'resourceId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'projection' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-              ),
-            ),'list' => array(
-              'path' => 'customer/{customerId}/devices/mobile',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'customerId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'maxResults' => array(
-                  'location' => 'query',
-                  'type' => 'integer',
-                ),
-                'orderBy' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'pageToken' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'projection' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'query' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'sortOrder' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-              ),
-            ),
-          )
-        )
-    );
-    $this->notifications = new Google_Service_Directory_Resource_Notifications(
-        $this,
-        $this->serviceName,
-        'notifications',
-        array(
-          'methods' => array(
-            'delete' => array(
-              'path' => 'customer/{customer}/notifications/{notificationId}',
-              'httpMethod' => 'DELETE',
-              'parameters' => array(
-                'customer' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'notificationId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'get' => array(
-              'path' => 'customer/{customer}/notifications/{notificationId}',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'customer' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'notificationId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'list' => array(
-              'path' => 'customer/{customer}/notifications',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'customer' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'language' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'maxResults' => array(
-                  'location' => 'query',
-                  'type' => 'integer',
-                ),
-                'pageToken' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-              ),
-            ),'patch' => array(
-              'path' => 'customer/{customer}/notifications/{notificationId}',
-              'httpMethod' => 'PATCH',
-              'parameters' => array(
-                'customer' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'notificationId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'update' => array(
-              'path' => 'customer/{customer}/notifications/{notificationId}',
-              'httpMethod' => 'PUT',
-              'parameters' => array(
-                'customer' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'notificationId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),
-          )
-        )
-    );
-    $this->orgunits = new Google_Service_Directory_Resource_Orgunits(
-        $this,
-        $this->serviceName,
-        'orgunits',
-        array(
-          'methods' => array(
-            'delete' => array(
-              'path' => 'customer/{customerId}/orgunits{/orgUnitPath*}',
-              'httpMethod' => 'DELETE',
-              'parameters' => array(
-                'customerId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'orgUnitPath' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'repeated' => true,
-                  'required' => true,
-                ),
-              ),
-            ),'get' => array(
-              'path' => 'customer/{customerId}/orgunits{/orgUnitPath*}',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'customerId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'orgUnitPath' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'repeated' => true,
-                  'required' => true,
-                ),
-              ),
-            ),'insert' => array(
-              'path' => 'customer/{customerId}/orgunits',
-              'httpMethod' => 'POST',
-              'parameters' => array(
-                'customerId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'list' => array(
-              'path' => 'customer/{customerId}/orgunits',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'customerId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'orgUnitPath' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'type' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-              ),
-            ),'patch' => array(
-              'path' => 'customer/{customerId}/orgunits{/orgUnitPath*}',
-              'httpMethod' => 'PATCH',
-              'parameters' => array(
-                'customerId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'orgUnitPath' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'repeated' => true,
-                  'required' => true,
-                ),
-              ),
-            ),'update' => array(
-              'path' => 'customer/{customerId}/orgunits{/orgUnitPath*}',
-              'httpMethod' => 'PUT',
-              'parameters' => array(
-                'customerId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'orgUnitPath' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'repeated' => true,
-                  'required' => true,
-                ),
-              ),
-            ),
-          )
-        )
-    );
-    $this->privileges = new Google_Service_Directory_Resource_Privileges(
-        $this,
-        $this->serviceName,
-        'privileges',
-        array(
-          'methods' => array(
-            'list' => array(
-              'path' => 'customer/{customer}/roles/ALL/privileges',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'customer' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),
-          )
-        )
-    );
-    $this->resources_calendars = new Google_Service_Directory_Resource_ResourcesCalendars(
-        $this,
-        $this->serviceName,
-        'calendars',
-        array(
-          'methods' => array(
-            'delete' => array(
-              'path' => 'customer/{customer}/resources/calendars/{calendarResourceId}',
-              'httpMethod' => 'DELETE',
-              'parameters' => array(
-                'customer' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'calendarResourceId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'get' => array(
-              'path' => 'customer/{customer}/resources/calendars/{calendarResourceId}',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'customer' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'calendarResourceId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'insert' => array(
-              'path' => 'customer/{customer}/resources/calendars',
-              'httpMethod' => 'POST',
-              'parameters' => array(
-                'customer' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'list' => array(
-              'path' => 'customer/{customer}/resources/calendars',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'customer' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'maxResults' => array(
-                  'location' => 'query',
-                  'type' => 'integer',
-                ),
-                'pageToken' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-              ),
-            ),'patch' => array(
-              'path' => 'customer/{customer}/resources/calendars/{calendarResourceId}',
-              'httpMethod' => 'PATCH',
-              'parameters' => array(
-                'customer' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'calendarResourceId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'update' => array(
-              'path' => 'customer/{customer}/resources/calendars/{calendarResourceId}',
-              'httpMethod' => 'PUT',
-              'parameters' => array(
-                'customer' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'calendarResourceId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),
-          )
-        )
-    );
-    $this->roleAssignments = new Google_Service_Directory_Resource_RoleAssignments(
-        $this,
-        $this->serviceName,
-        'roleAssignments',
-        array(
-          'methods' => array(
-            'delete' => array(
-              'path' => 'customer/{customer}/roleassignments/{roleAssignmentId}',
-              'httpMethod' => 'DELETE',
-              'parameters' => array(
-                'customer' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'roleAssignmentId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'get' => array(
-              'path' => 'customer/{customer}/roleassignments/{roleAssignmentId}',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'customer' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'roleAssignmentId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'insert' => array(
-              'path' => 'customer/{customer}/roleassignments',
-              'httpMethod' => 'POST',
-              'parameters' => array(
-                'customer' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'list' => array(
-              'path' => 'customer/{customer}/roleassignments',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'customer' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'maxResults' => array(
-                  'location' => 'query',
-                  'type' => 'integer',
-                ),
-                'pageToken' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'roleId' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'userKey' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-              ),
-            ),
-          )
-        )
-    );
-    $this->roles = new Google_Service_Directory_Resource_Roles(
-        $this,
-        $this->serviceName,
-        'roles',
-        array(
-          'methods' => array(
-            'delete' => array(
-              'path' => 'customer/{customer}/roles/{roleId}',
-              'httpMethod' => 'DELETE',
-              'parameters' => array(
-                'customer' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'roleId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'get' => array(
-              'path' => 'customer/{customer}/roles/{roleId}',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'customer' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'roleId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'insert' => array(
-              'path' => 'customer/{customer}/roles',
-              'httpMethod' => 'POST',
-              'parameters' => array(
-                'customer' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'list' => array(
-              'path' => 'customer/{customer}/roles',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'customer' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'maxResults' => array(
-                  'location' => 'query',
-                  'type' => 'integer',
-                ),
-                'pageToken' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-              ),
-            ),'patch' => array(
-              'path' => 'customer/{customer}/roles/{roleId}',
-              'httpMethod' => 'PATCH',
-              'parameters' => array(
-                'customer' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'roleId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'update' => array(
-              'path' => 'customer/{customer}/roles/{roleId}',
-              'httpMethod' => 'PUT',
-              'parameters' => array(
-                'customer' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'roleId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),
-          )
-        )
-    );
-    $this->schemas = new Google_Service_Directory_Resource_Schemas(
-        $this,
-        $this->serviceName,
-        'schemas',
-        array(
-          'methods' => array(
-            'delete' => array(
-              'path' => 'customer/{customerId}/schemas/{schemaKey}',
-              'httpMethod' => 'DELETE',
-              'parameters' => array(
-                'customerId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'schemaKey' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'get' => array(
-              'path' => 'customer/{customerId}/schemas/{schemaKey}',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'customerId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'schemaKey' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'insert' => array(
-              'path' => 'customer/{customerId}/schemas',
-              'httpMethod' => 'POST',
-              'parameters' => array(
-                'customerId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'list' => array(
-              'path' => 'customer/{customerId}/schemas',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'customerId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'patch' => array(
-              'path' => 'customer/{customerId}/schemas/{schemaKey}',
-              'httpMethod' => 'PATCH',
-              'parameters' => array(
-                'customerId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'schemaKey' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'update' => array(
-              'path' => 'customer/{customerId}/schemas/{schemaKey}',
-              'httpMethod' => 'PUT',
-              'parameters' => array(
-                'customerId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'schemaKey' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),
-          )
-        )
-    );
-    $this->tokens = new Google_Service_Directory_Resource_Tokens(
-        $this,
-        $this->serviceName,
-        'tokens',
-        array(
-          'methods' => array(
-            'delete' => array(
-              'path' => 'users/{userKey}/tokens/{clientId}',
-              'httpMethod' => 'DELETE',
-              'parameters' => array(
-                'userKey' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'clientId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'get' => array(
-              'path' => 'users/{userKey}/tokens/{clientId}',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'userKey' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'clientId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'list' => array(
-              'path' => 'users/{userKey}/tokens',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'userKey' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),
-          )
-        )
-    );
-    $this->users = new Google_Service_Directory_Resource_Users(
-        $this,
-        $this->serviceName,
-        'users',
-        array(
-          'methods' => array(
-            'delete' => array(
-              'path' => 'users/{userKey}',
-              'httpMethod' => 'DELETE',
-              'parameters' => array(
-                'userKey' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'get' => array(
-              'path' => 'users/{userKey}',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'userKey' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'customFieldMask' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'projection' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'viewType' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-              ),
-            ),'insert' => array(
-              'path' => 'users',
-              'httpMethod' => 'POST',
-              'parameters' => array(),
-            ),'list' => array(
-              'path' => 'users',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'customFieldMask' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'customer' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'domain' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'event' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'maxResults' => array(
-                  'location' => 'query',
-                  'type' => 'integer',
-                ),
-                'orderBy' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'pageToken' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'projection' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'query' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'showDeleted' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'sortOrder' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'viewType' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-              ),
-            ),'makeAdmin' => array(
-              'path' => 'users/{userKey}/makeAdmin',
-              'httpMethod' => 'POST',
-              'parameters' => array(
-                'userKey' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'patch' => array(
-              'path' => 'users/{userKey}',
-              'httpMethod' => 'PATCH',
-              'parameters' => array(
-                'userKey' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'undelete' => array(
-              'path' => 'users/{userKey}/undelete',
-              'httpMethod' => 'POST',
-              'parameters' => array(
-                'userKey' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'update' => array(
-              'path' => 'users/{userKey}',
-              'httpMethod' => 'PUT',
-              'parameters' => array(
-                'userKey' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'watch' => array(
-              'path' => 'users/watch',
-              'httpMethod' => 'POST',
-              'parameters' => array(
-                'customFieldMask' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'customer' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'domain' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'event' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'maxResults' => array(
-                  'location' => 'query',
-                  'type' => 'integer',
-                ),
-                'orderBy' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'pageToken' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'projection' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'query' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'showDeleted' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'sortOrder' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'viewType' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-              ),
-            ),
-          )
-        )
-    );
-    $this->users_aliases = new Google_Service_Directory_Resource_UsersAliases(
-        $this,
-        $this->serviceName,
-        'aliases',
-        array(
-          'methods' => array(
-            'delete' => array(
-              'path' => 'users/{userKey}/aliases/{alias}',
-              'httpMethod' => 'DELETE',
-              'parameters' => array(
-                'userKey' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'alias' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'insert' => array(
-              'path' => 'users/{userKey}/aliases',
-              'httpMethod' => 'POST',
-              'parameters' => array(
-                'userKey' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'list' => array(
-              'path' => 'users/{userKey}/aliases',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'userKey' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'event' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-              ),
-            ),'watch' => array(
-              'path' => 'users/{userKey}/aliases/watch',
-              'httpMethod' => 'POST',
-              'parameters' => array(
-                'userKey' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'event' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-              ),
-            ),
-          )
-        )
-    );
-    $this->users_photos = new Google_Service_Directory_Resource_UsersPhotos(
-        $this,
-        $this->serviceName,
-        'photos',
-        array(
-          'methods' => array(
-            'delete' => array(
-              'path' => 'users/{userKey}/photos/thumbnail',
-              'httpMethod' => 'DELETE',
-              'parameters' => array(
-                'userKey' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'get' => array(
-              'path' => 'users/{userKey}/photos/thumbnail',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'userKey' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'patch' => array(
-              'path' => 'users/{userKey}/photos/thumbnail',
-              'httpMethod' => 'PATCH',
-              'parameters' => array(
-                'userKey' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'update' => array(
-              'path' => 'users/{userKey}/photos/thumbnail',
-              'httpMethod' => 'PUT',
-              'parameters' => array(
-                'userKey' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),
-          )
-        )
-    );
-    $this->verificationCodes = new Google_Service_Directory_Resource_VerificationCodes(
-        $this,
-        $this->serviceName,
-        'verificationCodes',
-        array(
-          'methods' => array(
-            'generate' => array(
-              'path' => 'users/{userKey}/verificationCodes/generate',
-              'httpMethod' => 'POST',
-              'parameters' => array(
-                'userKey' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'invalidate' => array(
-              'path' => 'users/{userKey}/verificationCodes/invalidate',
-              'httpMethod' => 'POST',
-              'parameters' => array(
-                'userKey' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'list' => array(
-              'path' => 'users/{userKey}/verificationCodes',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'userKey' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),
-          )
-        )
-    );
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Directory/Alias.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Directory/Alias.php
deleted file mode 100644
index f9cf8e76..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Directory/Alias.php
+++ /dev/null
@@ -1,66 +0,0 @@
-alias = $alias;
-  }
-  public function getAlias()
-  {
-    return $this->alias;
-  }
-  public function setEtag($etag)
-  {
-    $this->etag = $etag;
-  }
-  public function getEtag()
-  {
-    return $this->etag;
-  }
-  public function setId($id)
-  {
-    $this->id = $id;
-  }
-  public function getId()
-  {
-    return $this->id;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setPrimaryEmail($primaryEmail)
-  {
-    $this->primaryEmail = $primaryEmail;
-  }
-  public function getPrimaryEmail()
-  {
-    return $this->primaryEmail;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Directory/Aliases.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Directory/Aliases.php
deleted file mode 100644
index 419bca95..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Directory/Aliases.php
+++ /dev/null
@@ -1,49 +0,0 @@
-aliases = $aliases;
-  }
-  public function getAliases()
-  {
-    return $this->aliases;
-  }
-  public function setEtag($etag)
-  {
-    $this->etag = $etag;
-  }
-  public function getEtag()
-  {
-    return $this->etag;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Directory/Asp.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Directory/Asp.php
deleted file mode 100644
index 9a6dc3bc..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Directory/Asp.php
+++ /dev/null
@@ -1,84 +0,0 @@
-codeId = $codeId;
-  }
-  public function getCodeId()
-  {
-    return $this->codeId;
-  }
-  public function setCreationTime($creationTime)
-  {
-    $this->creationTime = $creationTime;
-  }
-  public function getCreationTime()
-  {
-    return $this->creationTime;
-  }
-  public function setEtag($etag)
-  {
-    $this->etag = $etag;
-  }
-  public function getEtag()
-  {
-    return $this->etag;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setLastTimeUsed($lastTimeUsed)
-  {
-    $this->lastTimeUsed = $lastTimeUsed;
-  }
-  public function getLastTimeUsed()
-  {
-    return $this->lastTimeUsed;
-  }
-  public function setName($name)
-  {
-    $this->name = $name;
-  }
-  public function getName()
-  {
-    return $this->name;
-  }
-  public function setUserKey($userKey)
-  {
-    $this->userKey = $userKey;
-  }
-  public function getUserKey()
-  {
-    return $this->userKey;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Directory/Asps.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Directory/Asps.php
deleted file mode 100644
index 05ca38b8..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Directory/Asps.php
+++ /dev/null
@@ -1,50 +0,0 @@
-etag = $etag;
-  }
-  public function getEtag()
-  {
-    return $this->etag;
-  }
-  public function setItems($items)
-  {
-    $this->items = $items;
-  }
-  public function getItems()
-  {
-    return $this->items;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Directory/CalendarResource.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Directory/CalendarResource.php
deleted file mode 100644
index 6a573ee6..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Directory/CalendarResource.php
+++ /dev/null
@@ -1,84 +0,0 @@
-etags = $etags;
-  }
-  public function getEtags()
-  {
-    return $this->etags;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setResourceDescription($resourceDescription)
-  {
-    $this->resourceDescription = $resourceDescription;
-  }
-  public function getResourceDescription()
-  {
-    return $this->resourceDescription;
-  }
-  public function setResourceEmail($resourceEmail)
-  {
-    $this->resourceEmail = $resourceEmail;
-  }
-  public function getResourceEmail()
-  {
-    return $this->resourceEmail;
-  }
-  public function setResourceId($resourceId)
-  {
-    $this->resourceId = $resourceId;
-  }
-  public function getResourceId()
-  {
-    return $this->resourceId;
-  }
-  public function setResourceName($resourceName)
-  {
-    $this->resourceName = $resourceName;
-  }
-  public function getResourceName()
-  {
-    return $this->resourceName;
-  }
-  public function setResourceType($resourceType)
-  {
-    $this->resourceType = $resourceType;
-  }
-  public function getResourceType()
-  {
-    return $this->resourceType;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Directory/CalendarResources.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Directory/CalendarResources.php
deleted file mode 100644
index a6de5992..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Directory/CalendarResources.php
+++ /dev/null
@@ -1,59 +0,0 @@
-etag = $etag;
-  }
-  public function getEtag()
-  {
-    return $this->etag;
-  }
-  public function setItems($items)
-  {
-    $this->items = $items;
-  }
-  public function getItems()
-  {
-    return $this->items;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setNextPageToken($nextPageToken)
-  {
-    $this->nextPageToken = $nextPageToken;
-  }
-  public function getNextPageToken()
-  {
-    return $this->nextPageToken;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Directory/Channel.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Directory/Channel.php
deleted file mode 100644
index 63d6702c..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Directory/Channel.php
+++ /dev/null
@@ -1,111 +0,0 @@
-address = $address;
-  }
-  public function getAddress()
-  {
-    return $this->address;
-  }
-  public function setExpiration($expiration)
-  {
-    $this->expiration = $expiration;
-  }
-  public function getExpiration()
-  {
-    return $this->expiration;
-  }
-  public function setId($id)
-  {
-    $this->id = $id;
-  }
-  public function getId()
-  {
-    return $this->id;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setParams($params)
-  {
-    $this->params = $params;
-  }
-  public function getParams()
-  {
-    return $this->params;
-  }
-  public function setPayload($payload)
-  {
-    $this->payload = $payload;
-  }
-  public function getPayload()
-  {
-    return $this->payload;
-  }
-  public function setResourceId($resourceId)
-  {
-    $this->resourceId = $resourceId;
-  }
-  public function getResourceId()
-  {
-    return $this->resourceId;
-  }
-  public function setResourceUri($resourceUri)
-  {
-    $this->resourceUri = $resourceUri;
-  }
-  public function getResourceUri()
-  {
-    return $this->resourceUri;
-  }
-  public function setToken($token)
-  {
-    $this->token = $token;
-  }
-  public function getToken()
-  {
-    return $this->token;
-  }
-  public function setType($type)
-  {
-    $this->type = $type;
-  }
-  public function getType()
-  {
-    return $this->type;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Directory/ChromeOsDevice.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Directory/ChromeOsDevice.php
deleted file mode 100644
index c4b7492e..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Directory/ChromeOsDevice.php
+++ /dev/null
@@ -1,249 +0,0 @@
-activeTimeRanges = $activeTimeRanges;
-  }
-  public function getActiveTimeRanges()
-  {
-    return $this->activeTimeRanges;
-  }
-  public function setAnnotatedAssetId($annotatedAssetId)
-  {
-    $this->annotatedAssetId = $annotatedAssetId;
-  }
-  public function getAnnotatedAssetId()
-  {
-    return $this->annotatedAssetId;
-  }
-  public function setAnnotatedLocation($annotatedLocation)
-  {
-    $this->annotatedLocation = $annotatedLocation;
-  }
-  public function getAnnotatedLocation()
-  {
-    return $this->annotatedLocation;
-  }
-  public function setAnnotatedUser($annotatedUser)
-  {
-    $this->annotatedUser = $annotatedUser;
-  }
-  public function getAnnotatedUser()
-  {
-    return $this->annotatedUser;
-  }
-  public function setBootMode($bootMode)
-  {
-    $this->bootMode = $bootMode;
-  }
-  public function getBootMode()
-  {
-    return $this->bootMode;
-  }
-  public function setDeviceId($deviceId)
-  {
-    $this->deviceId = $deviceId;
-  }
-  public function getDeviceId()
-  {
-    return $this->deviceId;
-  }
-  public function setEtag($etag)
-  {
-    $this->etag = $etag;
-  }
-  public function getEtag()
-  {
-    return $this->etag;
-  }
-  public function setEthernetMacAddress($ethernetMacAddress)
-  {
-    $this->ethernetMacAddress = $ethernetMacAddress;
-  }
-  public function getEthernetMacAddress()
-  {
-    return $this->ethernetMacAddress;
-  }
-  public function setFirmwareVersion($firmwareVersion)
-  {
-    $this->firmwareVersion = $firmwareVersion;
-  }
-  public function getFirmwareVersion()
-  {
-    return $this->firmwareVersion;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setLastEnrollmentTime($lastEnrollmentTime)
-  {
-    $this->lastEnrollmentTime = $lastEnrollmentTime;
-  }
-  public function getLastEnrollmentTime()
-  {
-    return $this->lastEnrollmentTime;
-  }
-  public function setLastSync($lastSync)
-  {
-    $this->lastSync = $lastSync;
-  }
-  public function getLastSync()
-  {
-    return $this->lastSync;
-  }
-  public function setMacAddress($macAddress)
-  {
-    $this->macAddress = $macAddress;
-  }
-  public function getMacAddress()
-  {
-    return $this->macAddress;
-  }
-  public function setMeid($meid)
-  {
-    $this->meid = $meid;
-  }
-  public function getMeid()
-  {
-    return $this->meid;
-  }
-  public function setModel($model)
-  {
-    $this->model = $model;
-  }
-  public function getModel()
-  {
-    return $this->model;
-  }
-  public function setNotes($notes)
-  {
-    $this->notes = $notes;
-  }
-  public function getNotes()
-  {
-    return $this->notes;
-  }
-  public function setOrderNumber($orderNumber)
-  {
-    $this->orderNumber = $orderNumber;
-  }
-  public function getOrderNumber()
-  {
-    return $this->orderNumber;
-  }
-  public function setOrgUnitPath($orgUnitPath)
-  {
-    $this->orgUnitPath = $orgUnitPath;
-  }
-  public function getOrgUnitPath()
-  {
-    return $this->orgUnitPath;
-  }
-  public function setOsVersion($osVersion)
-  {
-    $this->osVersion = $osVersion;
-  }
-  public function getOsVersion()
-  {
-    return $this->osVersion;
-  }
-  public function setPlatformVersion($platformVersion)
-  {
-    $this->platformVersion = $platformVersion;
-  }
-  public function getPlatformVersion()
-  {
-    return $this->platformVersion;
-  }
-  public function setRecentUsers($recentUsers)
-  {
-    $this->recentUsers = $recentUsers;
-  }
-  public function getRecentUsers()
-  {
-    return $this->recentUsers;
-  }
-  public function setSerialNumber($serialNumber)
-  {
-    $this->serialNumber = $serialNumber;
-  }
-  public function getSerialNumber()
-  {
-    return $this->serialNumber;
-  }
-  public function setStatus($status)
-  {
-    $this->status = $status;
-  }
-  public function getStatus()
-  {
-    return $this->status;
-  }
-  public function setSupportEndDate($supportEndDate)
-  {
-    $this->supportEndDate = $supportEndDate;
-  }
-  public function getSupportEndDate()
-  {
-    return $this->supportEndDate;
-  }
-  public function setWillAutoRenew($willAutoRenew)
-  {
-    $this->willAutoRenew = $willAutoRenew;
-  }
-  public function getWillAutoRenew()
-  {
-    return $this->willAutoRenew;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Directory/ChromeOsDeviceAction.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Directory/ChromeOsDeviceAction.php
deleted file mode 100644
index 4b27a170..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Directory/ChromeOsDeviceAction.php
+++ /dev/null
@@ -1,39 +0,0 @@
-action = $action;
-  }
-  public function getAction()
-  {
-    return $this->action;
-  }
-  public function setDeprovisionReason($deprovisionReason)
-  {
-    $this->deprovisionReason = $deprovisionReason;
-  }
-  public function getDeprovisionReason()
-  {
-    return $this->deprovisionReason;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Directory/ChromeOsDeviceActiveTimeRanges.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Directory/ChromeOsDeviceActiveTimeRanges.php
deleted file mode 100644
index d07a88bd..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Directory/ChromeOsDeviceActiveTimeRanges.php
+++ /dev/null
@@ -1,39 +0,0 @@
-activeTime = $activeTime;
-  }
-  public function getActiveTime()
-  {
-    return $this->activeTime;
-  }
-  public function setDate($date)
-  {
-    $this->date = $date;
-  }
-  public function getDate()
-  {
-    return $this->date;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Directory/ChromeOsDeviceRecentUsers.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Directory/ChromeOsDeviceRecentUsers.php
deleted file mode 100644
index 7e9de091..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Directory/ChromeOsDeviceRecentUsers.php
+++ /dev/null
@@ -1,39 +0,0 @@
-email = $email;
-  }
-  public function getEmail()
-  {
-    return $this->email;
-  }
-  public function setType($type)
-  {
-    $this->type = $type;
-  }
-  public function getType()
-  {
-    return $this->type;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Directory/ChromeOsDevices.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Directory/ChromeOsDevices.php
deleted file mode 100644
index ca52967a..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Directory/ChromeOsDevices.php
+++ /dev/null
@@ -1,59 +0,0 @@
-chromeosdevices = $chromeosdevices;
-  }
-  public function getChromeosdevices()
-  {
-    return $this->chromeosdevices;
-  }
-  public function setEtag($etag)
-  {
-    $this->etag = $etag;
-  }
-  public function getEtag()
-  {
-    return $this->etag;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setNextPageToken($nextPageToken)
-  {
-    $this->nextPageToken = $nextPageToken;
-  }
-  public function getNextPageToken()
-  {
-    return $this->nextPageToken;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Directory/Customer.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Directory/Customer.php
deleted file mode 100644
index 30461ac1..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Directory/Customer.php
+++ /dev/null
@@ -1,103 +0,0 @@
-alternateEmail = $alternateEmail;
-  }
-  public function getAlternateEmail()
-  {
-    return $this->alternateEmail;
-  }
-  public function setCustomerCreationTime($customerCreationTime)
-  {
-    $this->customerCreationTime = $customerCreationTime;
-  }
-  public function getCustomerCreationTime()
-  {
-    return $this->customerCreationTime;
-  }
-  public function setCustomerDomain($customerDomain)
-  {
-    $this->customerDomain = $customerDomain;
-  }
-  public function getCustomerDomain()
-  {
-    return $this->customerDomain;
-  }
-  public function setEtag($etag)
-  {
-    $this->etag = $etag;
-  }
-  public function getEtag()
-  {
-    return $this->etag;
-  }
-  public function setId($id)
-  {
-    $this->id = $id;
-  }
-  public function getId()
-  {
-    return $this->id;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setLanguage($language)
-  {
-    $this->language = $language;
-  }
-  public function getLanguage()
-  {
-    return $this->language;
-  }
-  public function setPhoneNumber($phoneNumber)
-  {
-    $this->phoneNumber = $phoneNumber;
-  }
-  public function getPhoneNumber()
-  {
-    return $this->phoneNumber;
-  }
-  public function setPostalAddress(Google_Service_Directory_CustomerPostalAddress $postalAddress)
-  {
-    $this->postalAddress = $postalAddress;
-  }
-  public function getPostalAddress()
-  {
-    return $this->postalAddress;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Directory/CustomerPostalAddress.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Directory/CustomerPostalAddress.php
deleted file mode 100644
index bf05a06a..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Directory/CustomerPostalAddress.php
+++ /dev/null
@@ -1,102 +0,0 @@
-addressLine1 = $addressLine1;
-  }
-  public function getAddressLine1()
-  {
-    return $this->addressLine1;
-  }
-  public function setAddressLine2($addressLine2)
-  {
-    $this->addressLine2 = $addressLine2;
-  }
-  public function getAddressLine2()
-  {
-    return $this->addressLine2;
-  }
-  public function setAddressLine3($addressLine3)
-  {
-    $this->addressLine3 = $addressLine3;
-  }
-  public function getAddressLine3()
-  {
-    return $this->addressLine3;
-  }
-  public function setContactName($contactName)
-  {
-    $this->contactName = $contactName;
-  }
-  public function getContactName()
-  {
-    return $this->contactName;
-  }
-  public function setCountryCode($countryCode)
-  {
-    $this->countryCode = $countryCode;
-  }
-  public function getCountryCode()
-  {
-    return $this->countryCode;
-  }
-  public function setLocality($locality)
-  {
-    $this->locality = $locality;
-  }
-  public function getLocality()
-  {
-    return $this->locality;
-  }
-  public function setOrganizationName($organizationName)
-  {
-    $this->organizationName = $organizationName;
-  }
-  public function getOrganizationName()
-  {
-    return $this->organizationName;
-  }
-  public function setPostalCode($postalCode)
-  {
-    $this->postalCode = $postalCode;
-  }
-  public function getPostalCode()
-  {
-    return $this->postalCode;
-  }
-  public function setRegion($region)
-  {
-    $this->region = $region;
-  }
-  public function getRegion()
-  {
-    return $this->region;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Directory/DomainAlias.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Directory/DomainAlias.php
deleted file mode 100644
index 5f5192b1..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Directory/DomainAlias.php
+++ /dev/null
@@ -1,75 +0,0 @@
-creationTime = $creationTime;
-  }
-  public function getCreationTime()
-  {
-    return $this->creationTime;
-  }
-  public function setDomainAliasName($domainAliasName)
-  {
-    $this->domainAliasName = $domainAliasName;
-  }
-  public function getDomainAliasName()
-  {
-    return $this->domainAliasName;
-  }
-  public function setEtag($etag)
-  {
-    $this->etag = $etag;
-  }
-  public function getEtag()
-  {
-    return $this->etag;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setParentDomainName($parentDomainName)
-  {
-    $this->parentDomainName = $parentDomainName;
-  }
-  public function getParentDomainName()
-  {
-    return $this->parentDomainName;
-  }
-  public function setVerified($verified)
-  {
-    $this->verified = $verified;
-  }
-  public function getVerified()
-  {
-    return $this->verified;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Directory/DomainAliases.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Directory/DomainAliases.php
deleted file mode 100644
index 2b08b131..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Directory/DomainAliases.php
+++ /dev/null
@@ -1,50 +0,0 @@
-domainAliases = $domainAliases;
-  }
-  public function getDomainAliases()
-  {
-    return $this->domainAliases;
-  }
-  public function setEtag($etag)
-  {
-    $this->etag = $etag;
-  }
-  public function getEtag()
-  {
-    return $this->etag;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Directory/Domains.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Directory/Domains.php
deleted file mode 100644
index a1573a21..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Directory/Domains.php
+++ /dev/null
@@ -1,86 +0,0 @@
-creationTime = $creationTime;
-  }
-  public function getCreationTime()
-  {
-    return $this->creationTime;
-  }
-  public function setDomainAliases($domainAliases)
-  {
-    $this->domainAliases = $domainAliases;
-  }
-  public function getDomainAliases()
-  {
-    return $this->domainAliases;
-  }
-  public function setDomainName($domainName)
-  {
-    $this->domainName = $domainName;
-  }
-  public function getDomainName()
-  {
-    return $this->domainName;
-  }
-  public function setEtag($etag)
-  {
-    $this->etag = $etag;
-  }
-  public function getEtag()
-  {
-    return $this->etag;
-  }
-  public function setIsPrimary($isPrimary)
-  {
-    $this->isPrimary = $isPrimary;
-  }
-  public function getIsPrimary()
-  {
-    return $this->isPrimary;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setVerified($verified)
-  {
-    $this->verified = $verified;
-  }
-  public function getVerified()
-  {
-    return $this->verified;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Directory/Domains2.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Directory/Domains2.php
deleted file mode 100644
index 73fbd448..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Directory/Domains2.php
+++ /dev/null
@@ -1,50 +0,0 @@
-domains = $domains;
-  }
-  public function getDomains()
-  {
-    return $this->domains;
-  }
-  public function setEtag($etag)
-  {
-    $this->etag = $etag;
-  }
-  public function getEtag()
-  {
-    return $this->etag;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Directory/Group.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Directory/Group.php
deleted file mode 100644
index 4d5c5534..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Directory/Group.php
+++ /dev/null
@@ -1,112 +0,0 @@
-adminCreated = $adminCreated;
-  }
-  public function getAdminCreated()
-  {
-    return $this->adminCreated;
-  }
-  public function setAliases($aliases)
-  {
-    $this->aliases = $aliases;
-  }
-  public function getAliases()
-  {
-    return $this->aliases;
-  }
-  public function setDescription($description)
-  {
-    $this->description = $description;
-  }
-  public function getDescription()
-  {
-    return $this->description;
-  }
-  public function setDirectMembersCount($directMembersCount)
-  {
-    $this->directMembersCount = $directMembersCount;
-  }
-  public function getDirectMembersCount()
-  {
-    return $this->directMembersCount;
-  }
-  public function setEmail($email)
-  {
-    $this->email = $email;
-  }
-  public function getEmail()
-  {
-    return $this->email;
-  }
-  public function setEtag($etag)
-  {
-    $this->etag = $etag;
-  }
-  public function getEtag()
-  {
-    return $this->etag;
-  }
-  public function setId($id)
-  {
-    $this->id = $id;
-  }
-  public function getId()
-  {
-    return $this->id;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setName($name)
-  {
-    $this->name = $name;
-  }
-  public function getName()
-  {
-    return $this->name;
-  }
-  public function setNonEditableAliases($nonEditableAliases)
-  {
-    $this->nonEditableAliases = $nonEditableAliases;
-  }
-  public function getNonEditableAliases()
-  {
-    return $this->nonEditableAliases;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Directory/Groups.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Directory/Groups.php
deleted file mode 100644
index fcd7ef5b..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Directory/Groups.php
+++ /dev/null
@@ -1,59 +0,0 @@
-etag = $etag;
-  }
-  public function getEtag()
-  {
-    return $this->etag;
-  }
-  public function setGroups($groups)
-  {
-    $this->groups = $groups;
-  }
-  public function getGroups()
-  {
-    return $this->groups;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setNextPageToken($nextPageToken)
-  {
-    $this->nextPageToken = $nextPageToken;
-  }
-  public function getNextPageToken()
-  {
-    return $this->nextPageToken;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Directory/Member.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Directory/Member.php
deleted file mode 100644
index 84713b82..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Directory/Member.php
+++ /dev/null
@@ -1,84 +0,0 @@
-email = $email;
-  }
-  public function getEmail()
-  {
-    return $this->email;
-  }
-  public function setEtag($etag)
-  {
-    $this->etag = $etag;
-  }
-  public function getEtag()
-  {
-    return $this->etag;
-  }
-  public function setId($id)
-  {
-    $this->id = $id;
-  }
-  public function getId()
-  {
-    return $this->id;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setRole($role)
-  {
-    $this->role = $role;
-  }
-  public function getRole()
-  {
-    return $this->role;
-  }
-  public function setStatus($status)
-  {
-    $this->status = $status;
-  }
-  public function getStatus()
-  {
-    return $this->status;
-  }
-  public function setType($type)
-  {
-    $this->type = $type;
-  }
-  public function getType()
-  {
-    return $this->type;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Directory/Members.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Directory/Members.php
deleted file mode 100644
index 6a7206d2..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Directory/Members.php
+++ /dev/null
@@ -1,59 +0,0 @@
-etag = $etag;
-  }
-  public function getEtag()
-  {
-    return $this->etag;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setMembers($members)
-  {
-    $this->members = $members;
-  }
-  public function getMembers()
-  {
-    return $this->members;
-  }
-  public function setNextPageToken($nextPageToken)
-  {
-    $this->nextPageToken = $nextPageToken;
-  }
-  public function getNextPageToken()
-  {
-    return $this->nextPageToken;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Directory/MobileDevice.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Directory/MobileDevice.php
deleted file mode 100644
index c67448ca..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Directory/MobileDevice.php
+++ /dev/null
@@ -1,383 +0,0 @@
-adbStatus = $adbStatus;
-  }
-  public function getAdbStatus()
-  {
-    return $this->adbStatus;
-  }
-  public function setApplications($applications)
-  {
-    $this->applications = $applications;
-  }
-  public function getApplications()
-  {
-    return $this->applications;
-  }
-  public function setBasebandVersion($basebandVersion)
-  {
-    $this->basebandVersion = $basebandVersion;
-  }
-  public function getBasebandVersion()
-  {
-    return $this->basebandVersion;
-  }
-  public function setBootloaderVersion($bootloaderVersion)
-  {
-    $this->bootloaderVersion = $bootloaderVersion;
-  }
-  public function getBootloaderVersion()
-  {
-    return $this->bootloaderVersion;
-  }
-  public function setBrand($brand)
-  {
-    $this->brand = $brand;
-  }
-  public function getBrand()
-  {
-    return $this->brand;
-  }
-  public function setBuildNumber($buildNumber)
-  {
-    $this->buildNumber = $buildNumber;
-  }
-  public function getBuildNumber()
-  {
-    return $this->buildNumber;
-  }
-  public function setDefaultLanguage($defaultLanguage)
-  {
-    $this->defaultLanguage = $defaultLanguage;
-  }
-  public function getDefaultLanguage()
-  {
-    return $this->defaultLanguage;
-  }
-  public function setDeveloperOptionsStatus($developerOptionsStatus)
-  {
-    $this->developerOptionsStatus = $developerOptionsStatus;
-  }
-  public function getDeveloperOptionsStatus()
-  {
-    return $this->developerOptionsStatus;
-  }
-  public function setDeviceCompromisedStatus($deviceCompromisedStatus)
-  {
-    $this->deviceCompromisedStatus = $deviceCompromisedStatus;
-  }
-  public function getDeviceCompromisedStatus()
-  {
-    return $this->deviceCompromisedStatus;
-  }
-  public function setDeviceId($deviceId)
-  {
-    $this->deviceId = $deviceId;
-  }
-  public function getDeviceId()
-  {
-    return $this->deviceId;
-  }
-  public function setDevicePasswordStatus($devicePasswordStatus)
-  {
-    $this->devicePasswordStatus = $devicePasswordStatus;
-  }
-  public function getDevicePasswordStatus()
-  {
-    return $this->devicePasswordStatus;
-  }
-  public function setEmail($email)
-  {
-    $this->email = $email;
-  }
-  public function getEmail()
-  {
-    return $this->email;
-  }
-  public function setEncryptionStatus($encryptionStatus)
-  {
-    $this->encryptionStatus = $encryptionStatus;
-  }
-  public function getEncryptionStatus()
-  {
-    return $this->encryptionStatus;
-  }
-  public function setEtag($etag)
-  {
-    $this->etag = $etag;
-  }
-  public function getEtag()
-  {
-    return $this->etag;
-  }
-  public function setFirstSync($firstSync)
-  {
-    $this->firstSync = $firstSync;
-  }
-  public function getFirstSync()
-  {
-    return $this->firstSync;
-  }
-  public function setHardware($hardware)
-  {
-    $this->hardware = $hardware;
-  }
-  public function getHardware()
-  {
-    return $this->hardware;
-  }
-  public function setHardwareId($hardwareId)
-  {
-    $this->hardwareId = $hardwareId;
-  }
-  public function getHardwareId()
-  {
-    return $this->hardwareId;
-  }
-  public function setImei($imei)
-  {
-    $this->imei = $imei;
-  }
-  public function getImei()
-  {
-    return $this->imei;
-  }
-  public function setKernelVersion($kernelVersion)
-  {
-    $this->kernelVersion = $kernelVersion;
-  }
-  public function getKernelVersion()
-  {
-    return $this->kernelVersion;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setLastSync($lastSync)
-  {
-    $this->lastSync = $lastSync;
-  }
-  public function getLastSync()
-  {
-    return $this->lastSync;
-  }
-  public function setManagedAccountIsOnOwnerProfile($managedAccountIsOnOwnerProfile)
-  {
-    $this->managedAccountIsOnOwnerProfile = $managedAccountIsOnOwnerProfile;
-  }
-  public function getManagedAccountIsOnOwnerProfile()
-  {
-    return $this->managedAccountIsOnOwnerProfile;
-  }
-  public function setManufacturer($manufacturer)
-  {
-    $this->manufacturer = $manufacturer;
-  }
-  public function getManufacturer()
-  {
-    return $this->manufacturer;
-  }
-  public function setMeid($meid)
-  {
-    $this->meid = $meid;
-  }
-  public function getMeid()
-  {
-    return $this->meid;
-  }
-  public function setModel($model)
-  {
-    $this->model = $model;
-  }
-  public function getModel()
-  {
-    return $this->model;
-  }
-  public function setName($name)
-  {
-    $this->name = $name;
-  }
-  public function getName()
-  {
-    return $this->name;
-  }
-  public function setNetworkOperator($networkOperator)
-  {
-    $this->networkOperator = $networkOperator;
-  }
-  public function getNetworkOperator()
-  {
-    return $this->networkOperator;
-  }
-  public function setOs($os)
-  {
-    $this->os = $os;
-  }
-  public function getOs()
-  {
-    return $this->os;
-  }
-  public function setOtherAccountsInfo($otherAccountsInfo)
-  {
-    $this->otherAccountsInfo = $otherAccountsInfo;
-  }
-  public function getOtherAccountsInfo()
-  {
-    return $this->otherAccountsInfo;
-  }
-  public function setPrivilege($privilege)
-  {
-    $this->privilege = $privilege;
-  }
-  public function getPrivilege()
-  {
-    return $this->privilege;
-  }
-  public function setReleaseVersion($releaseVersion)
-  {
-    $this->releaseVersion = $releaseVersion;
-  }
-  public function getReleaseVersion()
-  {
-    return $this->releaseVersion;
-  }
-  public function setResourceId($resourceId)
-  {
-    $this->resourceId = $resourceId;
-  }
-  public function getResourceId()
-  {
-    return $this->resourceId;
-  }
-  public function setSecurityPatchLevel($securityPatchLevel)
-  {
-    $this->securityPatchLevel = $securityPatchLevel;
-  }
-  public function getSecurityPatchLevel()
-  {
-    return $this->securityPatchLevel;
-  }
-  public function setSerialNumber($serialNumber)
-  {
-    $this->serialNumber = $serialNumber;
-  }
-  public function getSerialNumber()
-  {
-    return $this->serialNumber;
-  }
-  public function setStatus($status)
-  {
-    $this->status = $status;
-  }
-  public function getStatus()
-  {
-    return $this->status;
-  }
-  public function setSupportsWorkProfile($supportsWorkProfile)
-  {
-    $this->supportsWorkProfile = $supportsWorkProfile;
-  }
-  public function getSupportsWorkProfile()
-  {
-    return $this->supportsWorkProfile;
-  }
-  public function setType($type)
-  {
-    $this->type = $type;
-  }
-  public function getType()
-  {
-    return $this->type;
-  }
-  public function setUnknownSourcesStatus($unknownSourcesStatus)
-  {
-    $this->unknownSourcesStatus = $unknownSourcesStatus;
-  }
-  public function getUnknownSourcesStatus()
-  {
-    return $this->unknownSourcesStatus;
-  }
-  public function setUserAgent($userAgent)
-  {
-    $this->userAgent = $userAgent;
-  }
-  public function getUserAgent()
-  {
-    return $this->userAgent;
-  }
-  public function setWifiMacAddress($wifiMacAddress)
-  {
-    $this->wifiMacAddress = $wifiMacAddress;
-  }
-  public function getWifiMacAddress()
-  {
-    return $this->wifiMacAddress;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Directory/MobileDeviceAction.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Directory/MobileDeviceAction.php
deleted file mode 100644
index b829d0d9..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Directory/MobileDeviceAction.php
+++ /dev/null
@@ -1,30 +0,0 @@
-action = $action;
-  }
-  public function getAction()
-  {
-    return $this->action;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Directory/MobileDeviceApplications.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Directory/MobileDeviceApplications.php
deleted file mode 100644
index 24f81570..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Directory/MobileDeviceApplications.php
+++ /dev/null
@@ -1,67 +0,0 @@
-displayName = $displayName;
-  }
-  public function getDisplayName()
-  {
-    return $this->displayName;
-  }
-  public function setPackageName($packageName)
-  {
-    $this->packageName = $packageName;
-  }
-  public function getPackageName()
-  {
-    return $this->packageName;
-  }
-  public function setPermission($permission)
-  {
-    $this->permission = $permission;
-  }
-  public function getPermission()
-  {
-    return $this->permission;
-  }
-  public function setVersionCode($versionCode)
-  {
-    $this->versionCode = $versionCode;
-  }
-  public function getVersionCode()
-  {
-    return $this->versionCode;
-  }
-  public function setVersionName($versionName)
-  {
-    $this->versionName = $versionName;
-  }
-  public function getVersionName()
-  {
-    return $this->versionName;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Directory/MobileDevices.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Directory/MobileDevices.php
deleted file mode 100644
index 8d7a3761..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Directory/MobileDevices.php
+++ /dev/null
@@ -1,59 +0,0 @@
-etag = $etag;
-  }
-  public function getEtag()
-  {
-    return $this->etag;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setMobiledevices($mobiledevices)
-  {
-    $this->mobiledevices = $mobiledevices;
-  }
-  public function getMobiledevices()
-  {
-    return $this->mobiledevices;
-  }
-  public function setNextPageToken($nextPageToken)
-  {
-    $this->nextPageToken = $nextPageToken;
-  }
-  public function getNextPageToken()
-  {
-    return $this->nextPageToken;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Directory/Notification.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Directory/Notification.php
deleted file mode 100644
index 17884c12..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Directory/Notification.php
+++ /dev/null
@@ -1,93 +0,0 @@
-body = $body;
-  }
-  public function getBody()
-  {
-    return $this->body;
-  }
-  public function setEtag($etag)
-  {
-    $this->etag = $etag;
-  }
-  public function getEtag()
-  {
-    return $this->etag;
-  }
-  public function setFromAddress($fromAddress)
-  {
-    $this->fromAddress = $fromAddress;
-  }
-  public function getFromAddress()
-  {
-    return $this->fromAddress;
-  }
-  public function setIsUnread($isUnread)
-  {
-    $this->isUnread = $isUnread;
-  }
-  public function getIsUnread()
-  {
-    return $this->isUnread;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setNotificationId($notificationId)
-  {
-    $this->notificationId = $notificationId;
-  }
-  public function getNotificationId()
-  {
-    return $this->notificationId;
-  }
-  public function setSendTime($sendTime)
-  {
-    $this->sendTime = $sendTime;
-  }
-  public function getSendTime()
-  {
-    return $this->sendTime;
-  }
-  public function setSubject($subject)
-  {
-    $this->subject = $subject;
-  }
-  public function getSubject()
-  {
-    return $this->subject;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Directory/Notifications.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Directory/Notifications.php
deleted file mode 100644
index 8b7bbd61..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Directory/Notifications.php
+++ /dev/null
@@ -1,68 +0,0 @@
-etag = $etag;
-  }
-  public function getEtag()
-  {
-    return $this->etag;
-  }
-  public function setItems($items)
-  {
-    $this->items = $items;
-  }
-  public function getItems()
-  {
-    return $this->items;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setNextPageToken($nextPageToken)
-  {
-    $this->nextPageToken = $nextPageToken;
-  }
-  public function getNextPageToken()
-  {
-    return $this->nextPageToken;
-  }
-  public function setUnreadNotificationsCount($unreadNotificationsCount)
-  {
-    $this->unreadNotificationsCount = $unreadNotificationsCount;
-  }
-  public function getUnreadNotificationsCount()
-  {
-    return $this->unreadNotificationsCount;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Directory/OrgUnit.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Directory/OrgUnit.php
deleted file mode 100644
index dfa9c3b7..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Directory/OrgUnit.php
+++ /dev/null
@@ -1,102 +0,0 @@
-blockInheritance = $blockInheritance;
-  }
-  public function getBlockInheritance()
-  {
-    return $this->blockInheritance;
-  }
-  public function setDescription($description)
-  {
-    $this->description = $description;
-  }
-  public function getDescription()
-  {
-    return $this->description;
-  }
-  public function setEtag($etag)
-  {
-    $this->etag = $etag;
-  }
-  public function getEtag()
-  {
-    return $this->etag;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setName($name)
-  {
-    $this->name = $name;
-  }
-  public function getName()
-  {
-    return $this->name;
-  }
-  public function setOrgUnitId($orgUnitId)
-  {
-    $this->orgUnitId = $orgUnitId;
-  }
-  public function getOrgUnitId()
-  {
-    return $this->orgUnitId;
-  }
-  public function setOrgUnitPath($orgUnitPath)
-  {
-    $this->orgUnitPath = $orgUnitPath;
-  }
-  public function getOrgUnitPath()
-  {
-    return $this->orgUnitPath;
-  }
-  public function setParentOrgUnitId($parentOrgUnitId)
-  {
-    $this->parentOrgUnitId = $parentOrgUnitId;
-  }
-  public function getParentOrgUnitId()
-  {
-    return $this->parentOrgUnitId;
-  }
-  public function setParentOrgUnitPath($parentOrgUnitPath)
-  {
-    $this->parentOrgUnitPath = $parentOrgUnitPath;
-  }
-  public function getParentOrgUnitPath()
-  {
-    return $this->parentOrgUnitPath;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Directory/OrgUnits.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Directory/OrgUnits.php
deleted file mode 100644
index db604d57..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Directory/OrgUnits.php
+++ /dev/null
@@ -1,50 +0,0 @@
-etag = $etag;
-  }
-  public function getEtag()
-  {
-    return $this->etag;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setOrganizationUnits($organizationUnits)
-  {
-    $this->organizationUnits = $organizationUnits;
-  }
-  public function getOrganizationUnits()
-  {
-    return $this->organizationUnits;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Directory/Privilege.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Directory/Privilege.php
deleted file mode 100644
index bb275168..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Directory/Privilege.php
+++ /dev/null
@@ -1,86 +0,0 @@
-childPrivileges = $childPrivileges;
-  }
-  public function getChildPrivileges()
-  {
-    return $this->childPrivileges;
-  }
-  public function setEtag($etag)
-  {
-    $this->etag = $etag;
-  }
-  public function getEtag()
-  {
-    return $this->etag;
-  }
-  public function setIsOuScopable($isOuScopable)
-  {
-    $this->isOuScopable = $isOuScopable;
-  }
-  public function getIsOuScopable()
-  {
-    return $this->isOuScopable;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setPrivilegeName($privilegeName)
-  {
-    $this->privilegeName = $privilegeName;
-  }
-  public function getPrivilegeName()
-  {
-    return $this->privilegeName;
-  }
-  public function setServiceId($serviceId)
-  {
-    $this->serviceId = $serviceId;
-  }
-  public function getServiceId()
-  {
-    return $this->serviceId;
-  }
-  public function setServiceName($serviceName)
-  {
-    $this->serviceName = $serviceName;
-  }
-  public function getServiceName()
-  {
-    return $this->serviceName;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Directory/Privileges.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Directory/Privileges.php
deleted file mode 100644
index 952ff8d5..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Directory/Privileges.php
+++ /dev/null
@@ -1,50 +0,0 @@
-etag = $etag;
-  }
-  public function getEtag()
-  {
-    return $this->etag;
-  }
-  public function setItems($items)
-  {
-    $this->items = $items;
-  }
-  public function getItems()
-  {
-    return $this->items;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Directory/Resource/Asps.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Directory/Resource/Asps.php
deleted file mode 100644
index 18b9c680..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Directory/Resource/Asps.php
+++ /dev/null
@@ -1,71 +0,0 @@
-
- *   $adminService = new Google_Service_Directory(...);
- *   $asps = $adminService->asps;
- *  
- */
-class Google_Service_Directory_Resource_Asps extends Google_Service_Resource
-{
-  /**
-   * Delete an ASP issued by a user. (asps.delete)
-   *
-   * @param string $userKey Identifies the user in the API request. The value can
-   * be the user's primary email address, alias email address, or unique user ID.
-   * @param int $codeId The unique ID of the ASP to be deleted.
-   * @param array $optParams Optional parameters.
-   */
-  public function delete($userKey, $codeId, $optParams = array())
-  {
-    $params = array('userKey' => $userKey, 'codeId' => $codeId);
-    $params = array_merge($params, $optParams);
-    return $this->call('delete', array($params));
-  }
-  /**
-   * Get information about an ASP issued by a user. (asps.get)
-   *
-   * @param string $userKey Identifies the user in the API request. The value can
-   * be the user's primary email address, alias email address, or unique user ID.
-   * @param int $codeId The unique ID of the ASP.
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Directory_Asp
-   */
-  public function get($userKey, $codeId, $optParams = array())
-  {
-    $params = array('userKey' => $userKey, 'codeId' => $codeId);
-    $params = array_merge($params, $optParams);
-    return $this->call('get', array($params), "Google_Service_Directory_Asp");
-  }
-  /**
-   * List the ASPs issued by a user. (asps.listAsps)
-   *
-   * @param string $userKey Identifies the user in the API request. The value can
-   * be the user's primary email address, alias email address, or unique user ID.
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Directory_Asps
-   */
-  public function listAsps($userKey, $optParams = array())
-  {
-    $params = array('userKey' => $userKey);
-    $params = array_merge($params, $optParams);
-    return $this->call('list', array($params), "Google_Service_Directory_Asps");
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Directory/Resource/Channels.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Directory/Resource/Channels.php
deleted file mode 100644
index 841a8198..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Directory/Resource/Channels.php
+++ /dev/null
@@ -1,40 +0,0 @@
-
- *   $adminService = new Google_Service_Directory(...);
- *   $channels = $adminService->channels;
- *  
- */
-class Google_Service_Directory_Resource_Channels extends Google_Service_Resource
-{
-  /**
-   * Stop watching resources through this channel (channels.stop)
-   *
-   * @param Google_Service_Directory_Channel $postBody
-   * @param array $optParams Optional parameters.
-   */
-  public function stop(Google_Service_Directory_Channel $postBody, $optParams = array())
-  {
-    $params = array('postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('stop', array($params));
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Directory/Resource/Chromeosdevices.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Directory/Resource/Chromeosdevices.php
deleted file mode 100644
index d44bfd16..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Directory/Resource/Chromeosdevices.php
+++ /dev/null
@@ -1,120 +0,0 @@
-
- *   $adminService = new Google_Service_Directory(...);
- *   $chromeosdevices = $adminService->chromeosdevices;
- *  
- */
-class Google_Service_Directory_Resource_Chromeosdevices extends Google_Service_Resource
-{
-  /**
-   * Take action on Chrome OS Device (chromeosdevices.action)
-   *
-   * @param string $customerId Immutable id of the Google Apps account
-   * @param string $resourceId Immutable id of Chrome OS Device
-   * @param Google_Service_Directory_ChromeOsDeviceAction $postBody
-   * @param array $optParams Optional parameters.
-   */
-  public function action($customerId, $resourceId, Google_Service_Directory_ChromeOsDeviceAction $postBody, $optParams = array())
-  {
-    $params = array('customerId' => $customerId, 'resourceId' => $resourceId, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('action', array($params));
-  }
-  /**
-   * Retrieve Chrome OS Device (chromeosdevices.get)
-   *
-   * @param string $customerId Immutable id of the Google Apps account
-   * @param string $deviceId Immutable id of Chrome OS Device
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param string projection Restrict information returned to a set of
-   * selected fields.
-   * @return Google_Service_Directory_ChromeOsDevice
-   */
-  public function get($customerId, $deviceId, $optParams = array())
-  {
-    $params = array('customerId' => $customerId, 'deviceId' => $deviceId);
-    $params = array_merge($params, $optParams);
-    return $this->call('get', array($params), "Google_Service_Directory_ChromeOsDevice");
-  }
-  /**
-   * Retrieve all Chrome OS Devices of a customer (paginated)
-   * (chromeosdevices.listChromeosdevices)
-   *
-   * @param string $customerId Immutable id of the Google Apps account
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param int maxResults Maximum number of results to return. Default is 100
-   * @opt_param string orderBy Column to use for sorting results
-   * @opt_param string pageToken Token to specify next page in the list
-   * @opt_param string projection Restrict information returned to a set of
-   * selected fields.
-   * @opt_param string query Search string in the format given at
-   * http://support.google.com/chromeos/a/bin/answer.py?hl=en=1698333
-   * @opt_param string sortOrder Whether to return results in ascending or
-   * descending order. Only of use when orderBy is also used
-   * @return Google_Service_Directory_ChromeOsDevices
-   */
-  public function listChromeosdevices($customerId, $optParams = array())
-  {
-    $params = array('customerId' => $customerId);
-    $params = array_merge($params, $optParams);
-    return $this->call('list', array($params), "Google_Service_Directory_ChromeOsDevices");
-  }
-  /**
-   * Update Chrome OS Device. This method supports patch semantics.
-   * (chromeosdevices.patch)
-   *
-   * @param string $customerId Immutable id of the Google Apps account
-   * @param string $deviceId Immutable id of Chrome OS Device
-   * @param Google_Service_Directory_ChromeOsDevice $postBody
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param string projection Restrict information returned to a set of
-   * selected fields.
-   * @return Google_Service_Directory_ChromeOsDevice
-   */
-  public function patch($customerId, $deviceId, Google_Service_Directory_ChromeOsDevice $postBody, $optParams = array())
-  {
-    $params = array('customerId' => $customerId, 'deviceId' => $deviceId, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('patch', array($params), "Google_Service_Directory_ChromeOsDevice");
-  }
-  /**
-   * Update Chrome OS Device (chromeosdevices.update)
-   *
-   * @param string $customerId Immutable id of the Google Apps account
-   * @param string $deviceId Immutable id of Chrome OS Device
-   * @param Google_Service_Directory_ChromeOsDevice $postBody
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param string projection Restrict information returned to a set of
-   * selected fields.
-   * @return Google_Service_Directory_ChromeOsDevice
-   */
-  public function update($customerId, $deviceId, Google_Service_Directory_ChromeOsDevice $postBody, $optParams = array())
-  {
-    $params = array('customerId' => $customerId, 'deviceId' => $deviceId, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('update', array($params), "Google_Service_Directory_ChromeOsDevice");
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Directory/Resource/Customers.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Directory/Resource/Customers.php
deleted file mode 100644
index cae53ef3..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Directory/Resource/Customers.php
+++ /dev/null
@@ -1,69 +0,0 @@
-
- *   $adminService = new Google_Service_Directory(...);
- *   $customers = $adminService->customers;
- *  
- */
-class Google_Service_Directory_Resource_Customers extends Google_Service_Resource
-{
-  /**
-   * Retrieves a customer. (customers.get)
-   *
-   * @param string $customerKey Id of the customer to be retrieved
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Directory_Customer
-   */
-  public function get($customerKey, $optParams = array())
-  {
-    $params = array('customerKey' => $customerKey);
-    $params = array_merge($params, $optParams);
-    return $this->call('get', array($params), "Google_Service_Directory_Customer");
-  }
-  /**
-   * Updates a customer. This method supports patch semantics. (customers.patch)
-   *
-   * @param string $customerKey Id of the customer to be updated
-   * @param Google_Service_Directory_Customer $postBody
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Directory_Customer
-   */
-  public function patch($customerKey, Google_Service_Directory_Customer $postBody, $optParams = array())
-  {
-    $params = array('customerKey' => $customerKey, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('patch', array($params), "Google_Service_Directory_Customer");
-  }
-  /**
-   * Updates a customer. (customers.update)
-   *
-   * @param string $customerKey Id of the customer to be updated
-   * @param Google_Service_Directory_Customer $postBody
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Directory_Customer
-   */
-  public function update($customerKey, Google_Service_Directory_Customer $postBody, $optParams = array())
-  {
-    $params = array('customerKey' => $customerKey, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('update', array($params), "Google_Service_Directory_Customer");
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Directory/Resource/DomainAliases.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Directory/Resource/DomainAliases.php
deleted file mode 100644
index 9a27afa4..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Directory/Resource/DomainAliases.php
+++ /dev/null
@@ -1,85 +0,0 @@
-
- *   $adminService = new Google_Service_Directory(...);
- *   $domainAliases = $adminService->domainAliases;
- *  
- */
-class Google_Service_Directory_Resource_DomainAliases extends Google_Service_Resource
-{
-  /**
-   * Deletes a Domain Alias of the customer. (domainAliases.delete)
-   *
-   * @param string $customer Immutable id of the Google Apps account.
-   * @param string $domainAliasName Name of domain alias to be retrieved.
-   * @param array $optParams Optional parameters.
-   */
-  public function delete($customer, $domainAliasName, $optParams = array())
-  {
-    $params = array('customer' => $customer, 'domainAliasName' => $domainAliasName);
-    $params = array_merge($params, $optParams);
-    return $this->call('delete', array($params));
-  }
-  /**
-   * Retrieves a domain alias of the customer. (domainAliases.get)
-   *
-   * @param string $customer Immutable id of the Google Apps account.
-   * @param string $domainAliasName Name of domain alias to be retrieved.
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Directory_DomainAlias
-   */
-  public function get($customer, $domainAliasName, $optParams = array())
-  {
-    $params = array('customer' => $customer, 'domainAliasName' => $domainAliasName);
-    $params = array_merge($params, $optParams);
-    return $this->call('get', array($params), "Google_Service_Directory_DomainAlias");
-  }
-  /**
-   * Inserts a Domain alias of the customer. (domainAliases.insert)
-   *
-   * @param string $customer Immutable id of the Google Apps account.
-   * @param Google_Service_Directory_DomainAlias $postBody
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Directory_DomainAlias
-   */
-  public function insert($customer, Google_Service_Directory_DomainAlias $postBody, $optParams = array())
-  {
-    $params = array('customer' => $customer, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('insert', array($params), "Google_Service_Directory_DomainAlias");
-  }
-  /**
-   * Lists the domain aliases of the customer. (domainAliases.listDomainAliases)
-   *
-   * @param string $customer Immutable id of the Google Apps account.
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param string parentDomainName Name of the parent domain for which domain
-   * aliases are to be fetched.
-   * @return Google_Service_Directory_DomainAliases
-   */
-  public function listDomainAliases($customer, $optParams = array())
-  {
-    $params = array('customer' => $customer);
-    $params = array_merge($params, $optParams);
-    return $this->call('list', array($params), "Google_Service_Directory_DomainAliases");
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Directory/Resource/Domains.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Directory/Resource/Domains.php
deleted file mode 100644
index 7e6fc27a..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Directory/Resource/Domains.php
+++ /dev/null
@@ -1,82 +0,0 @@
-
- *   $adminService = new Google_Service_Directory(...);
- *   $domains = $adminService->domains;
- *  
- */
-class Google_Service_Directory_Resource_Domains extends Google_Service_Resource
-{
-  /**
-   * Deletes a domain of the customer. (domains.delete)
-   *
-   * @param string $customer Immutable id of the Google Apps account.
-   * @param string $domainName Name of domain to be deleted
-   * @param array $optParams Optional parameters.
-   */
-  public function delete($customer, $domainName, $optParams = array())
-  {
-    $params = array('customer' => $customer, 'domainName' => $domainName);
-    $params = array_merge($params, $optParams);
-    return $this->call('delete', array($params));
-  }
-  /**
-   * Retrieves a domain of the customer. (domains.get)
-   *
-   * @param string $customer Immutable id of the Google Apps account.
-   * @param string $domainName Name of domain to be retrieved
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Directory_Domains
-   */
-  public function get($customer, $domainName, $optParams = array())
-  {
-    $params = array('customer' => $customer, 'domainName' => $domainName);
-    $params = array_merge($params, $optParams);
-    return $this->call('get', array($params), "Google_Service_Directory_Domains");
-  }
-  /**
-   * Inserts a domain of the customer. (domains.insert)
-   *
-   * @param string $customer Immutable id of the Google Apps account.
-   * @param Google_Service_Directory_Domains $postBody
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Directory_Domains
-   */
-  public function insert($customer, Google_Service_Directory_Domains $postBody, $optParams = array())
-  {
-    $params = array('customer' => $customer, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('insert', array($params), "Google_Service_Directory_Domains");
-  }
-  /**
-   * Lists the domains of the customer. (domains.listDomains)
-   *
-   * @param string $customer Immutable id of the Google Apps account.
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Directory_Domains2
-   */
-  public function listDomains($customer, $optParams = array())
-  {
-    $params = array('customer' => $customer);
-    $params = array_merge($params, $optParams);
-    return $this->call('list', array($params), "Google_Service_Directory_Domains2");
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Directory/Resource/Groups.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Directory/Resource/Groups.php
deleted file mode 100644
index 85960fd5..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Directory/Resource/Groups.php
+++ /dev/null
@@ -1,120 +0,0 @@
-
- *   $adminService = new Google_Service_Directory(...);
- *   $groups = $adminService->groups;
- *  
- */
-class Google_Service_Directory_Resource_Groups extends Google_Service_Resource
-{
-  /**
-   * Delete Group (groups.delete)
-   *
-   * @param string $groupKey Email or immutable Id of the group
-   * @param array $optParams Optional parameters.
-   */
-  public function delete($groupKey, $optParams = array())
-  {
-    $params = array('groupKey' => $groupKey);
-    $params = array_merge($params, $optParams);
-    return $this->call('delete', array($params));
-  }
-  /**
-   * Retrieve Group (groups.get)
-   *
-   * @param string $groupKey Email or immutable Id of the group
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Directory_Group
-   */
-  public function get($groupKey, $optParams = array())
-  {
-    $params = array('groupKey' => $groupKey);
-    $params = array_merge($params, $optParams);
-    return $this->call('get', array($params), "Google_Service_Directory_Group");
-  }
-  /**
-   * Create Group (groups.insert)
-   *
-   * @param Google_Service_Directory_Group $postBody
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Directory_Group
-   */
-  public function insert(Google_Service_Directory_Group $postBody, $optParams = array())
-  {
-    $params = array('postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('insert', array($params), "Google_Service_Directory_Group");
-  }
-  /**
-   * Retrieve all groups in a domain (paginated) (groups.listGroups)
-   *
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param string customer Immutable id of the Google Apps account. In case
-   * of multi-domain, to fetch all groups for a customer, fill this field instead
-   * of domain.
-   * @opt_param string domain Name of the domain. Fill this field to get groups
-   * from only this domain. To return all groups in a multi-domain fill customer
-   * field instead.
-   * @opt_param int maxResults Maximum number of results to return. Default is 200
-   * @opt_param string pageToken Token to specify next page in the list
-   * @opt_param string userKey Email or immutable Id of the user if only those
-   * groups are to be listed, the given user is a member of. If Id, it should
-   * match with id of user object
-   * @return Google_Service_Directory_Groups
-   */
-  public function listGroups($optParams = array())
-  {
-    $params = array();
-    $params = array_merge($params, $optParams);
-    return $this->call('list', array($params), "Google_Service_Directory_Groups");
-  }
-  /**
-   * Update Group. This method supports patch semantics. (groups.patch)
-   *
-   * @param string $groupKey Email or immutable Id of the group. If Id, it should
-   * match with id of group object
-   * @param Google_Service_Directory_Group $postBody
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Directory_Group
-   */
-  public function patch($groupKey, Google_Service_Directory_Group $postBody, $optParams = array())
-  {
-    $params = array('groupKey' => $groupKey, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('patch', array($params), "Google_Service_Directory_Group");
-  }
-  /**
-   * Update Group (groups.update)
-   *
-   * @param string $groupKey Email or immutable Id of the group. If Id, it should
-   * match with id of group object
-   * @param Google_Service_Directory_Group $postBody
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Directory_Group
-   */
-  public function update($groupKey, Google_Service_Directory_Group $postBody, $optParams = array())
-  {
-    $params = array('groupKey' => $groupKey, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('update', array($params), "Google_Service_Directory_Group");
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Directory/Resource/GroupsAliases.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Directory/Resource/GroupsAliases.php
deleted file mode 100644
index 2a684876..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Directory/Resource/GroupsAliases.php
+++ /dev/null
@@ -1,68 +0,0 @@
-
- *   $adminService = new Google_Service_Directory(...);
- *   $aliases = $adminService->aliases;
- *  
- */
-class Google_Service_Directory_Resource_GroupsAliases extends Google_Service_Resource
-{
-  /**
-   * Remove a alias for the group (aliases.delete)
-   *
-   * @param string $groupKey Email or immutable Id of the group
-   * @param string $alias The alias to be removed
-   * @param array $optParams Optional parameters.
-   */
-  public function delete($groupKey, $alias, $optParams = array())
-  {
-    $params = array('groupKey' => $groupKey, 'alias' => $alias);
-    $params = array_merge($params, $optParams);
-    return $this->call('delete', array($params));
-  }
-  /**
-   * Add a alias for the group (aliases.insert)
-   *
-   * @param string $groupKey Email or immutable Id of the group
-   * @param Google_Service_Directory_Alias $postBody
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Directory_Alias
-   */
-  public function insert($groupKey, Google_Service_Directory_Alias $postBody, $optParams = array())
-  {
-    $params = array('groupKey' => $groupKey, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('insert', array($params), "Google_Service_Directory_Alias");
-  }
-  /**
-   * List all aliases for a group (aliases.listGroupsAliases)
-   *
-   * @param string $groupKey Email or immutable Id of the group
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Directory_Aliases
-   */
-  public function listGroupsAliases($groupKey, $optParams = array())
-  {
-    $params = array('groupKey' => $groupKey);
-    $params = array_merge($params, $optParams);
-    return $this->call('list', array($params), "Google_Service_Directory_Aliases");
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Directory/Resource/Members.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Directory/Resource/Members.php
deleted file mode 100644
index 1dbdd8aa..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Directory/Resource/Members.php
+++ /dev/null
@@ -1,122 +0,0 @@
-
- *   $adminService = new Google_Service_Directory(...);
- *   $members = $adminService->members;
- *  
- */
-class Google_Service_Directory_Resource_Members extends Google_Service_Resource
-{
-  /**
-   * Remove membership. (members.delete)
-   *
-   * @param string $groupKey Email or immutable Id of the group
-   * @param string $memberKey Email or immutable Id of the member
-   * @param array $optParams Optional parameters.
-   */
-  public function delete($groupKey, $memberKey, $optParams = array())
-  {
-    $params = array('groupKey' => $groupKey, 'memberKey' => $memberKey);
-    $params = array_merge($params, $optParams);
-    return $this->call('delete', array($params));
-  }
-  /**
-   * Retrieve Group Member (members.get)
-   *
-   * @param string $groupKey Email or immutable Id of the group
-   * @param string $memberKey Email or immutable Id of the member
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Directory_Member
-   */
-  public function get($groupKey, $memberKey, $optParams = array())
-  {
-    $params = array('groupKey' => $groupKey, 'memberKey' => $memberKey);
-    $params = array_merge($params, $optParams);
-    return $this->call('get', array($params), "Google_Service_Directory_Member");
-  }
-  /**
-   * Add user to the specified group. (members.insert)
-   *
-   * @param string $groupKey Email or immutable Id of the group
-   * @param Google_Service_Directory_Member $postBody
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Directory_Member
-   */
-  public function insert($groupKey, Google_Service_Directory_Member $postBody, $optParams = array())
-  {
-    $params = array('groupKey' => $groupKey, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('insert', array($params), "Google_Service_Directory_Member");
-  }
-  /**
-   * Retrieve all members in a group (paginated) (members.listMembers)
-   *
-   * @param string $groupKey Email or immutable Id of the group
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param int maxResults Maximum number of results to return. Default is 200
-   * @opt_param string pageToken Token to specify next page in the list
-   * @opt_param string roles Comma separated role values to filter list results
-   * on.
-   * @return Google_Service_Directory_Members
-   */
-  public function listMembers($groupKey, $optParams = array())
-  {
-    $params = array('groupKey' => $groupKey);
-    $params = array_merge($params, $optParams);
-    return $this->call('list', array($params), "Google_Service_Directory_Members");
-  }
-  /**
-   * Update membership of a user in the specified group. This method supports
-   * patch semantics. (members.patch)
-   *
-   * @param string $groupKey Email or immutable Id of the group. If Id, it should
-   * match with id of group object
-   * @param string $memberKey Email or immutable Id of the user. If Id, it should
-   * match with id of member object
-   * @param Google_Service_Directory_Member $postBody
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Directory_Member
-   */
-  public function patch($groupKey, $memberKey, Google_Service_Directory_Member $postBody, $optParams = array())
-  {
-    $params = array('groupKey' => $groupKey, 'memberKey' => $memberKey, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('patch', array($params), "Google_Service_Directory_Member");
-  }
-  /**
-   * Update membership of a user in the specified group. (members.update)
-   *
-   * @param string $groupKey Email or immutable Id of the group. If Id, it should
-   * match with id of group object
-   * @param string $memberKey Email or immutable Id of the user. If Id, it should
-   * match with id of member object
-   * @param Google_Service_Directory_Member $postBody
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Directory_Member
-   */
-  public function update($groupKey, $memberKey, Google_Service_Directory_Member $postBody, $optParams = array())
-  {
-    $params = array('groupKey' => $groupKey, 'memberKey' => $memberKey, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('update', array($params), "Google_Service_Directory_Member");
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Directory/Resource/Mobiledevices.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Directory/Resource/Mobiledevices.php
deleted file mode 100644
index 343d622a..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Directory/Resource/Mobiledevices.php
+++ /dev/null
@@ -1,96 +0,0 @@
-
- *   $adminService = new Google_Service_Directory(...);
- *   $mobiledevices = $adminService->mobiledevices;
- *  
- */
-class Google_Service_Directory_Resource_Mobiledevices extends Google_Service_Resource
-{
-  /**
-   * Take action on Mobile Device (mobiledevices.action)
-   *
-   * @param string $customerId Immutable id of the Google Apps account
-   * @param string $resourceId Immutable id of Mobile Device
-   * @param Google_Service_Directory_MobileDeviceAction $postBody
-   * @param array $optParams Optional parameters.
-   */
-  public function action($customerId, $resourceId, Google_Service_Directory_MobileDeviceAction $postBody, $optParams = array())
-  {
-    $params = array('customerId' => $customerId, 'resourceId' => $resourceId, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('action', array($params));
-  }
-  /**
-   * Delete Mobile Device (mobiledevices.delete)
-   *
-   * @param string $customerId Immutable id of the Google Apps account
-   * @param string $resourceId Immutable id of Mobile Device
-   * @param array $optParams Optional parameters.
-   */
-  public function delete($customerId, $resourceId, $optParams = array())
-  {
-    $params = array('customerId' => $customerId, 'resourceId' => $resourceId);
-    $params = array_merge($params, $optParams);
-    return $this->call('delete', array($params));
-  }
-  /**
-   * Retrieve Mobile Device (mobiledevices.get)
-   *
-   * @param string $customerId Immutable id of the Google Apps account
-   * @param string $resourceId Immutable id of Mobile Device
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param string projection Restrict information returned to a set of
-   * selected fields.
-   * @return Google_Service_Directory_MobileDevice
-   */
-  public function get($customerId, $resourceId, $optParams = array())
-  {
-    $params = array('customerId' => $customerId, 'resourceId' => $resourceId);
-    $params = array_merge($params, $optParams);
-    return $this->call('get', array($params), "Google_Service_Directory_MobileDevice");
-  }
-  /**
-   * Retrieve all Mobile Devices of a customer (paginated)
-   * (mobiledevices.listMobiledevices)
-   *
-   * @param string $customerId Immutable id of the Google Apps account
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param int maxResults Maximum number of results to return. Default is 100
-   * @opt_param string orderBy Column to use for sorting results
-   * @opt_param string pageToken Token to specify next page in the list
-   * @opt_param string projection Restrict information returned to a set of
-   * selected fields.
-   * @opt_param string query Search string in the format given at
-   * http://support.google.com/a/bin/answer.py?hl=en=1408863#search
-   * @opt_param string sortOrder Whether to return results in ascending or
-   * descending order. Only of use when orderBy is also used
-   * @return Google_Service_Directory_MobileDevices
-   */
-  public function listMobiledevices($customerId, $optParams = array())
-  {
-    $params = array('customerId' => $customerId);
-    $params = array_merge($params, $optParams);
-    return $this->call('list', array($params), "Google_Service_Directory_MobileDevices");
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Directory/Resource/Notifications.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Directory/Resource/Notifications.php
deleted file mode 100644
index 6c0981e2..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Directory/Resource/Notifications.php
+++ /dev/null
@@ -1,108 +0,0 @@
-
- *   $adminService = new Google_Service_Directory(...);
- *   $notifications = $adminService->notifications;
- *  
- */
-class Google_Service_Directory_Resource_Notifications extends Google_Service_Resource
-{
-  /**
-   * Deletes a notification (notifications.delete)
-   *
-   * @param string $customer The unique ID for the customer's Google account. The
-   * customerId is also returned as part of the Users resource.
-   * @param string $notificationId The unique ID of the notification.
-   * @param array $optParams Optional parameters.
-   */
-  public function delete($customer, $notificationId, $optParams = array())
-  {
-    $params = array('customer' => $customer, 'notificationId' => $notificationId);
-    $params = array_merge($params, $optParams);
-    return $this->call('delete', array($params));
-  }
-  /**
-   * Retrieves a notification. (notifications.get)
-   *
-   * @param string $customer The unique ID for the customer's Google account. The
-   * customerId is also returned as part of the Users resource.
-   * @param string $notificationId The unique ID of the notification.
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Directory_Notification
-   */
-  public function get($customer, $notificationId, $optParams = array())
-  {
-    $params = array('customer' => $customer, 'notificationId' => $notificationId);
-    $params = array_merge($params, $optParams);
-    return $this->call('get', array($params), "Google_Service_Directory_Notification");
-  }
-  /**
-   * Retrieves a list of notifications. (notifications.listNotifications)
-   *
-   * @param string $customer The unique ID for the customer's Google account.
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param string language The ISO 639-1 code of the language notifications
-   * are returned in. The default is English (en).
-   * @opt_param string maxResults Maximum number of notifications to return per
-   * page. The default is 100.
-   * @opt_param string pageToken The token to specify the page of results to
-   * retrieve.
-   * @return Google_Service_Directory_Notifications
-   */
-  public function listNotifications($customer, $optParams = array())
-  {
-    $params = array('customer' => $customer);
-    $params = array_merge($params, $optParams);
-    return $this->call('list', array($params), "Google_Service_Directory_Notifications");
-  }
-  /**
-   * Updates a notification. This method supports patch semantics.
-   * (notifications.patch)
-   *
-   * @param string $customer The unique ID for the customer's Google account.
-   * @param string $notificationId The unique ID of the notification.
-   * @param Google_Service_Directory_Notification $postBody
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Directory_Notification
-   */
-  public function patch($customer, $notificationId, Google_Service_Directory_Notification $postBody, $optParams = array())
-  {
-    $params = array('customer' => $customer, 'notificationId' => $notificationId, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('patch', array($params), "Google_Service_Directory_Notification");
-  }
-  /**
-   * Updates a notification. (notifications.update)
-   *
-   * @param string $customer The unique ID for the customer's Google account.
-   * @param string $notificationId The unique ID of the notification.
-   * @param Google_Service_Directory_Notification $postBody
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Directory_Notification
-   */
-  public function update($customer, $notificationId, Google_Service_Directory_Notification $postBody, $optParams = array())
-  {
-    $params = array('customer' => $customer, 'notificationId' => $notificationId, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('update', array($params), "Google_Service_Directory_Notification");
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Directory/Resource/Orgunits.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Directory/Resource/Orgunits.php
deleted file mode 100644
index 233f08b6..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Directory/Resource/Orgunits.php
+++ /dev/null
@@ -1,118 +0,0 @@
-
- *   $adminService = new Google_Service_Directory(...);
- *   $orgunits = $adminService->orgunits;
- *  
- */
-class Google_Service_Directory_Resource_Orgunits extends Google_Service_Resource
-{
-  /**
-   * Remove Organization Unit (orgunits.delete)
-   *
-   * @param string $customerId Immutable id of the Google Apps account
-   * @param string|array $orgUnitPath Full path of the organization unit or its Id
-   * @param array $optParams Optional parameters.
-   */
-  public function delete($customerId, $orgUnitPath, $optParams = array())
-  {
-    $params = array('customerId' => $customerId, 'orgUnitPath' => $orgUnitPath);
-    $params = array_merge($params, $optParams);
-    return $this->call('delete', array($params));
-  }
-  /**
-   * Retrieve Organization Unit (orgunits.get)
-   *
-   * @param string $customerId Immutable id of the Google Apps account
-   * @param string|array $orgUnitPath Full path of the organization unit or its Id
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Directory_OrgUnit
-   */
-  public function get($customerId, $orgUnitPath, $optParams = array())
-  {
-    $params = array('customerId' => $customerId, 'orgUnitPath' => $orgUnitPath);
-    $params = array_merge($params, $optParams);
-    return $this->call('get', array($params), "Google_Service_Directory_OrgUnit");
-  }
-  /**
-   * Add Organization Unit (orgunits.insert)
-   *
-   * @param string $customerId Immutable id of the Google Apps account
-   * @param Google_Service_Directory_OrgUnit $postBody
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Directory_OrgUnit
-   */
-  public function insert($customerId, Google_Service_Directory_OrgUnit $postBody, $optParams = array())
-  {
-    $params = array('customerId' => $customerId, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('insert', array($params), "Google_Service_Directory_OrgUnit");
-  }
-  /**
-   * Retrieve all Organization Units (orgunits.listOrgunits)
-   *
-   * @param string $customerId Immutable id of the Google Apps account
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param string orgUnitPath the URL-encoded organization unit's path or its
-   * Id
-   * @opt_param string type Whether to return all sub-organizations or just
-   * immediate children
-   * @return Google_Service_Directory_OrgUnits
-   */
-  public function listOrgunits($customerId, $optParams = array())
-  {
-    $params = array('customerId' => $customerId);
-    $params = array_merge($params, $optParams);
-    return $this->call('list', array($params), "Google_Service_Directory_OrgUnits");
-  }
-  /**
-   * Update Organization Unit. This method supports patch semantics.
-   * (orgunits.patch)
-   *
-   * @param string $customerId Immutable id of the Google Apps account
-   * @param string|array $orgUnitPath Full path of the organization unit or its Id
-   * @param Google_Service_Directory_OrgUnit $postBody
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Directory_OrgUnit
-   */
-  public function patch($customerId, $orgUnitPath, Google_Service_Directory_OrgUnit $postBody, $optParams = array())
-  {
-    $params = array('customerId' => $customerId, 'orgUnitPath' => $orgUnitPath, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('patch', array($params), "Google_Service_Directory_OrgUnit");
-  }
-  /**
-   * Update Organization Unit (orgunits.update)
-   *
-   * @param string $customerId Immutable id of the Google Apps account
-   * @param string|array $orgUnitPath Full path of the organization unit or its Id
-   * @param Google_Service_Directory_OrgUnit $postBody
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Directory_OrgUnit
-   */
-  public function update($customerId, $orgUnitPath, Google_Service_Directory_OrgUnit $postBody, $optParams = array())
-  {
-    $params = array('customerId' => $customerId, 'orgUnitPath' => $orgUnitPath, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('update', array($params), "Google_Service_Directory_OrgUnit");
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Directory/Resource/Privileges.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Directory/Resource/Privileges.php
deleted file mode 100644
index 2e55cb62..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Directory/Resource/Privileges.php
+++ /dev/null
@@ -1,42 +0,0 @@
-
- *   $adminService = new Google_Service_Directory(...);
- *   $privileges = $adminService->privileges;
- *  
- */
-class Google_Service_Directory_Resource_Privileges extends Google_Service_Resource
-{
-  /**
-   * Retrieves a paginated list of all privileges for a customer.
-   * (privileges.listPrivileges)
-   *
-   * @param string $customer Immutable ID of the Google Apps account.
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Directory_Privileges
-   */
-  public function listPrivileges($customer, $optParams = array())
-  {
-    $params = array('customer' => $customer);
-    $params = array_merge($params, $optParams);
-    return $this->call('list', array($params), "Google_Service_Directory_Privileges");
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Directory/Resource/Resources.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Directory/Resource/Resources.php
deleted file mode 100644
index a725d02a..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Directory/Resource/Resources.php
+++ /dev/null
@@ -1,28 +0,0 @@
-
- *   $adminService = new Google_Service_Directory(...);
- *   $resources = $adminService->resources;
- *  
- */
-class Google_Service_Directory_Resource_Resources extends Google_Service_Resource
-{
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Directory/Resource/ResourcesCalendars.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Directory/Resource/ResourcesCalendars.php
deleted file mode 100644
index 822f20f8..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Directory/Resource/ResourcesCalendars.php
+++ /dev/null
@@ -1,133 +0,0 @@
-
- *   $adminService = new Google_Service_Directory(...);
- *   $calendars = $adminService->calendars;
- *  
- */
-class Google_Service_Directory_Resource_ResourcesCalendars extends Google_Service_Resource
-{
-  /**
-   * Deletes a calendar resource. (calendars.delete)
-   *
-   * @param string $customer The unique ID for the customer's Google account. As
-   * an account administrator, you can also use the my_customer alias to represent
-   * your account's customer ID.
-   * @param string $calendarResourceId The unique ID of the calendar resource to
-   * delete.
-   * @param array $optParams Optional parameters.
-   */
-  public function delete($customer, $calendarResourceId, $optParams = array())
-  {
-    $params = array('customer' => $customer, 'calendarResourceId' => $calendarResourceId);
-    $params = array_merge($params, $optParams);
-    return $this->call('delete', array($params));
-  }
-  /**
-   * Retrieves a calendar resource. (calendars.get)
-   *
-   * @param string $customer The unique ID for the customer's Google account. As
-   * an account administrator, you can also use the my_customer alias to represent
-   * your account's customer ID.
-   * @param string $calendarResourceId The unique ID of the calendar resource to
-   * retrieve.
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Directory_CalendarResource
-   */
-  public function get($customer, $calendarResourceId, $optParams = array())
-  {
-    $params = array('customer' => $customer, 'calendarResourceId' => $calendarResourceId);
-    $params = array_merge($params, $optParams);
-    return $this->call('get', array($params), "Google_Service_Directory_CalendarResource");
-  }
-  /**
-   * Inserts a calendar resource. (calendars.insert)
-   *
-   * @param string $customer The unique ID for the customer's Google account. As
-   * an account administrator, you can also use the my_customer alias to represent
-   * your account's customer ID.
-   * @param Google_Service_Directory_CalendarResource $postBody
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Directory_CalendarResource
-   */
-  public function insert($customer, Google_Service_Directory_CalendarResource $postBody, $optParams = array())
-  {
-    $params = array('customer' => $customer, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('insert', array($params), "Google_Service_Directory_CalendarResource");
-  }
-  /**
-   * Retrieves a list of calendar resources for an account.
-   * (calendars.listResourcesCalendars)
-   *
-   * @param string $customer The unique ID for the customer's Google account. As
-   * an account administrator, you can also use the my_customer alias to represent
-   * your account's customer ID.
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param int maxResults Maximum number of results to return.
-   * @opt_param string pageToken Token to specify the next page in the list.
-   * @return Google_Service_Directory_CalendarResources
-   */
-  public function listResourcesCalendars($customer, $optParams = array())
-  {
-    $params = array('customer' => $customer);
-    $params = array_merge($params, $optParams);
-    return $this->call('list', array($params), "Google_Service_Directory_CalendarResources");
-  }
-  /**
-   * Updates a calendar resource. This method supports patch semantics.
-   * (calendars.patch)
-   *
-   * @param string $customer The unique ID for the customer's Google account. As
-   * an account administrator, you can also use the my_customer alias to represent
-   * your account's customer ID.
-   * @param string $calendarResourceId The unique ID of the calendar resource to
-   * update.
-   * @param Google_Service_Directory_CalendarResource $postBody
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Directory_CalendarResource
-   */
-  public function patch($customer, $calendarResourceId, Google_Service_Directory_CalendarResource $postBody, $optParams = array())
-  {
-    $params = array('customer' => $customer, 'calendarResourceId' => $calendarResourceId, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('patch', array($params), "Google_Service_Directory_CalendarResource");
-  }
-  /**
-   * Updates a calendar resource. (calendars.update)
-   *
-   * @param string $customer The unique ID for the customer's Google account. As
-   * an account administrator, you can also use the my_customer alias to represent
-   * your account's customer ID.
-   * @param string $calendarResourceId The unique ID of the calendar resource to
-   * update.
-   * @param Google_Service_Directory_CalendarResource $postBody
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Directory_CalendarResource
-   */
-  public function update($customer, $calendarResourceId, Google_Service_Directory_CalendarResource $postBody, $optParams = array())
-  {
-    $params = array('customer' => $customer, 'calendarResourceId' => $calendarResourceId, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('update', array($params), "Google_Service_Directory_CalendarResource");
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Directory/Resource/RoleAssignments.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Directory/Resource/RoleAssignments.php
deleted file mode 100644
index 78be4cee..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Directory/Resource/RoleAssignments.php
+++ /dev/null
@@ -1,91 +0,0 @@
-
- *   $adminService = new Google_Service_Directory(...);
- *   $roleAssignments = $adminService->roleAssignments;
- *  
- */
-class Google_Service_Directory_Resource_RoleAssignments extends Google_Service_Resource
-{
-  /**
-   * Deletes a role assignment. (roleAssignments.delete)
-   *
-   * @param string $customer Immutable ID of the Google Apps account.
-   * @param string $roleAssignmentId Immutable ID of the role assignment.
-   * @param array $optParams Optional parameters.
-   */
-  public function delete($customer, $roleAssignmentId, $optParams = array())
-  {
-    $params = array('customer' => $customer, 'roleAssignmentId' => $roleAssignmentId);
-    $params = array_merge($params, $optParams);
-    return $this->call('delete', array($params));
-  }
-  /**
-   * Retrieve a role assignment. (roleAssignments.get)
-   *
-   * @param string $customer Immutable ID of the Google Apps account.
-   * @param string $roleAssignmentId Immutable ID of the role assignment.
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Directory_RoleAssignment
-   */
-  public function get($customer, $roleAssignmentId, $optParams = array())
-  {
-    $params = array('customer' => $customer, 'roleAssignmentId' => $roleAssignmentId);
-    $params = array_merge($params, $optParams);
-    return $this->call('get', array($params), "Google_Service_Directory_RoleAssignment");
-  }
-  /**
-   * Creates a role assignment. (roleAssignments.insert)
-   *
-   * @param string $customer Immutable ID of the Google Apps account.
-   * @param Google_Service_Directory_RoleAssignment $postBody
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Directory_RoleAssignment
-   */
-  public function insert($customer, Google_Service_Directory_RoleAssignment $postBody, $optParams = array())
-  {
-    $params = array('customer' => $customer, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('insert', array($params), "Google_Service_Directory_RoleAssignment");
-  }
-  /**
-   * Retrieves a paginated list of all roleAssignments.
-   * (roleAssignments.listRoleAssignments)
-   *
-   * @param string $customer Immutable ID of the Google Apps account.
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param int maxResults Maximum number of results to return.
-   * @opt_param string pageToken Token to specify the next page in the list.
-   * @opt_param string roleId Immutable ID of a role. If included in the request,
-   * returns only role assignments containing this role ID.
-   * @opt_param string userKey The user's primary email address, alias email
-   * address, or unique user ID. If included in the request, returns role
-   * assignments only for this user.
-   * @return Google_Service_Directory_RoleAssignments
-   */
-  public function listRoleAssignments($customer, $optParams = array())
-  {
-    $params = array('customer' => $customer);
-    $params = array_merge($params, $optParams);
-    return $this->call('list', array($params), "Google_Service_Directory_RoleAssignments");
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Directory/Resource/Roles.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Directory/Resource/Roles.php
deleted file mode 100644
index 93036598..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Directory/Resource/Roles.php
+++ /dev/null
@@ -1,115 +0,0 @@
-
- *   $adminService = new Google_Service_Directory(...);
- *   $roles = $adminService->roles;
- *  
- */
-class Google_Service_Directory_Resource_Roles extends Google_Service_Resource
-{
-  /**
-   * Deletes a role. (roles.delete)
-   *
-   * @param string $customer Immutable ID of the Google Apps account.
-   * @param string $roleId Immutable ID of the role.
-   * @param array $optParams Optional parameters.
-   */
-  public function delete($customer, $roleId, $optParams = array())
-  {
-    $params = array('customer' => $customer, 'roleId' => $roleId);
-    $params = array_merge($params, $optParams);
-    return $this->call('delete', array($params));
-  }
-  /**
-   * Retrieves a role. (roles.get)
-   *
-   * @param string $customer Immutable ID of the Google Apps account.
-   * @param string $roleId Immutable ID of the role.
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Directory_Role
-   */
-  public function get($customer, $roleId, $optParams = array())
-  {
-    $params = array('customer' => $customer, 'roleId' => $roleId);
-    $params = array_merge($params, $optParams);
-    return $this->call('get', array($params), "Google_Service_Directory_Role");
-  }
-  /**
-   * Creates a role. (roles.insert)
-   *
-   * @param string $customer Immutable ID of the Google Apps account.
-   * @param Google_Service_Directory_Role $postBody
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Directory_Role
-   */
-  public function insert($customer, Google_Service_Directory_Role $postBody, $optParams = array())
-  {
-    $params = array('customer' => $customer, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('insert', array($params), "Google_Service_Directory_Role");
-  }
-  /**
-   * Retrieves a paginated list of all the roles in a domain. (roles.listRoles)
-   *
-   * @param string $customer Immutable id of the Google Apps account.
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param int maxResults Maximum number of results to return.
-   * @opt_param string pageToken Token to specify the next page in the list.
-   * @return Google_Service_Directory_Roles
-   */
-  public function listRoles($customer, $optParams = array())
-  {
-    $params = array('customer' => $customer);
-    $params = array_merge($params, $optParams);
-    return $this->call('list', array($params), "Google_Service_Directory_Roles");
-  }
-  /**
-   * Updates a role. This method supports patch semantics. (roles.patch)
-   *
-   * @param string $customer Immutable ID of the Google Apps account.
-   * @param string $roleId Immutable ID of the role.
-   * @param Google_Service_Directory_Role $postBody
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Directory_Role
-   */
-  public function patch($customer, $roleId, Google_Service_Directory_Role $postBody, $optParams = array())
-  {
-    $params = array('customer' => $customer, 'roleId' => $roleId, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('patch', array($params), "Google_Service_Directory_Role");
-  }
-  /**
-   * Updates a role. (roles.update)
-   *
-   * @param string $customer Immutable ID of the Google Apps account.
-   * @param string $roleId Immutable ID of the role.
-   * @param Google_Service_Directory_Role $postBody
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Directory_Role
-   */
-  public function update($customer, $roleId, Google_Service_Directory_Role $postBody, $optParams = array())
-  {
-    $params = array('customer' => $customer, 'roleId' => $roleId, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('update', array($params), "Google_Service_Directory_Role");
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Directory/Resource/Schemas.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Directory/Resource/Schemas.php
deleted file mode 100644
index 4592c082..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Directory/Resource/Schemas.php
+++ /dev/null
@@ -1,112 +0,0 @@
-
- *   $adminService = new Google_Service_Directory(...);
- *   $schemas = $adminService->schemas;
- *  
- */
-class Google_Service_Directory_Resource_Schemas extends Google_Service_Resource
-{
-  /**
-   * Delete schema (schemas.delete)
-   *
-   * @param string $customerId Immutable id of the Google Apps account
-   * @param string $schemaKey Name or immutable Id of the schema
-   * @param array $optParams Optional parameters.
-   */
-  public function delete($customerId, $schemaKey, $optParams = array())
-  {
-    $params = array('customerId' => $customerId, 'schemaKey' => $schemaKey);
-    $params = array_merge($params, $optParams);
-    return $this->call('delete', array($params));
-  }
-  /**
-   * Retrieve schema (schemas.get)
-   *
-   * @param string $customerId Immutable id of the Google Apps account
-   * @param string $schemaKey Name or immutable Id of the schema
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Directory_Schema
-   */
-  public function get($customerId, $schemaKey, $optParams = array())
-  {
-    $params = array('customerId' => $customerId, 'schemaKey' => $schemaKey);
-    $params = array_merge($params, $optParams);
-    return $this->call('get', array($params), "Google_Service_Directory_Schema");
-  }
-  /**
-   * Create schema. (schemas.insert)
-   *
-   * @param string $customerId Immutable id of the Google Apps account
-   * @param Google_Service_Directory_Schema $postBody
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Directory_Schema
-   */
-  public function insert($customerId, Google_Service_Directory_Schema $postBody, $optParams = array())
-  {
-    $params = array('customerId' => $customerId, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('insert', array($params), "Google_Service_Directory_Schema");
-  }
-  /**
-   * Retrieve all schemas for a customer (schemas.listSchemas)
-   *
-   * @param string $customerId Immutable id of the Google Apps account
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Directory_Schemas
-   */
-  public function listSchemas($customerId, $optParams = array())
-  {
-    $params = array('customerId' => $customerId);
-    $params = array_merge($params, $optParams);
-    return $this->call('list', array($params), "Google_Service_Directory_Schemas");
-  }
-  /**
-   * Update schema. This method supports patch semantics. (schemas.patch)
-   *
-   * @param string $customerId Immutable id of the Google Apps account
-   * @param string $schemaKey Name or immutable Id of the schema.
-   * @param Google_Service_Directory_Schema $postBody
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Directory_Schema
-   */
-  public function patch($customerId, $schemaKey, Google_Service_Directory_Schema $postBody, $optParams = array())
-  {
-    $params = array('customerId' => $customerId, 'schemaKey' => $schemaKey, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('patch', array($params), "Google_Service_Directory_Schema");
-  }
-  /**
-   * Update schema (schemas.update)
-   *
-   * @param string $customerId Immutable id of the Google Apps account
-   * @param string $schemaKey Name or immutable Id of the schema.
-   * @param Google_Service_Directory_Schema $postBody
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Directory_Schema
-   */
-  public function update($customerId, $schemaKey, Google_Service_Directory_Schema $postBody, $optParams = array())
-  {
-    $params = array('customerId' => $customerId, 'schemaKey' => $schemaKey, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('update', array($params), "Google_Service_Directory_Schema");
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Directory/Resource/Tokens.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Directory/Resource/Tokens.php
deleted file mode 100644
index fed72312..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Directory/Resource/Tokens.php
+++ /dev/null
@@ -1,74 +0,0 @@
-
- *   $adminService = new Google_Service_Directory(...);
- *   $tokens = $adminService->tokens;
- *  
- */
-class Google_Service_Directory_Resource_Tokens extends Google_Service_Resource
-{
-  /**
-   * Delete all access tokens issued by a user for an application. (tokens.delete)
-   *
-   * @param string $userKey Identifies the user in the API request. The value can
-   * be the user's primary email address, alias email address, or unique user ID.
-   * @param string $clientId The Client ID of the application the token is issued
-   * to.
-   * @param array $optParams Optional parameters.
-   */
-  public function delete($userKey, $clientId, $optParams = array())
-  {
-    $params = array('userKey' => $userKey, 'clientId' => $clientId);
-    $params = array_merge($params, $optParams);
-    return $this->call('delete', array($params));
-  }
-  /**
-   * Get information about an access token issued by a user. (tokens.get)
-   *
-   * @param string $userKey Identifies the user in the API request. The value can
-   * be the user's primary email address, alias email address, or unique user ID.
-   * @param string $clientId The Client ID of the application the token is issued
-   * to.
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Directory_Token
-   */
-  public function get($userKey, $clientId, $optParams = array())
-  {
-    $params = array('userKey' => $userKey, 'clientId' => $clientId);
-    $params = array_merge($params, $optParams);
-    return $this->call('get', array($params), "Google_Service_Directory_Token");
-  }
-  /**
-   * Returns the set of tokens specified user has issued to 3rd party
-   * applications. (tokens.listTokens)
-   *
-   * @param string $userKey Identifies the user in the API request. The value can
-   * be the user's primary email address, alias email address, or unique user ID.
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Directory_Tokens
-   */
-  public function listTokens($userKey, $optParams = array())
-  {
-    $params = array('userKey' => $userKey);
-    $params = array_merge($params, $optParams);
-    return $this->call('list', array($params), "Google_Service_Directory_Tokens");
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Directory/Resource/Users.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Directory/Resource/Users.php
deleted file mode 100644
index 111b287e..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Directory/Resource/Users.php
+++ /dev/null
@@ -1,207 +0,0 @@
-
- *   $adminService = new Google_Service_Directory(...);
- *   $users = $adminService->users;
- *  
- */
-class Google_Service_Directory_Resource_Users extends Google_Service_Resource
-{
-  /**
-   * Delete user (users.delete)
-   *
-   * @param string $userKey Email or immutable Id of the user
-   * @param array $optParams Optional parameters.
-   */
-  public function delete($userKey, $optParams = array())
-  {
-    $params = array('userKey' => $userKey);
-    $params = array_merge($params, $optParams);
-    return $this->call('delete', array($params));
-  }
-  /**
-   * retrieve user (users.get)
-   *
-   * @param string $userKey Email or immutable Id of the user
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param string customFieldMask Comma-separated list of schema names. All
-   * fields from these schemas are fetched. This should only be set when
-   * projection=custom.
-   * @opt_param string projection What subset of fields to fetch for this user.
-   * @opt_param string viewType Whether to fetch the ADMIN_VIEW or DOMAIN_PUBLIC
-   * view of the user.
-   * @return Google_Service_Directory_User
-   */
-  public function get($userKey, $optParams = array())
-  {
-    $params = array('userKey' => $userKey);
-    $params = array_merge($params, $optParams);
-    return $this->call('get', array($params), "Google_Service_Directory_User");
-  }
-  /**
-   * create user. (users.insert)
-   *
-   * @param Google_Service_Directory_User $postBody
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Directory_User
-   */
-  public function insert(Google_Service_Directory_User $postBody, $optParams = array())
-  {
-    $params = array('postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('insert', array($params), "Google_Service_Directory_User");
-  }
-  /**
-   * Retrieve either deleted users or all users in a domain (paginated)
-   * (users.listUsers)
-   *
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param string customFieldMask Comma-separated list of schema names. All
-   * fields from these schemas are fetched. This should only be set when
-   * projection=custom.
-   * @opt_param string customer Immutable id of the Google Apps account. In case
-   * of multi-domain, to fetch all users for a customer, fill this field instead
-   * of domain.
-   * @opt_param string domain Name of the domain. Fill this field to get users
-   * from only this domain. To return all users in a multi-domain fill customer
-   * field instead.
-   * @opt_param string event Event on which subscription is intended (if
-   * subscribing)
-   * @opt_param int maxResults Maximum number of results to return. Default is
-   * 100. Max allowed is 500
-   * @opt_param string orderBy Column to use for sorting results
-   * @opt_param string pageToken Token to specify next page in the list
-   * @opt_param string projection What subset of fields to fetch for this user.
-   * @opt_param string query Query string search. Should be of the form "".
-   * Complete documentation is at https://developers.google.com/admin-
-   * sdk/directory/v1/guides/search-users
-   * @opt_param string showDeleted If set to true retrieves the list of deleted
-   * users. Default is false
-   * @opt_param string sortOrder Whether to return results in ascending or
-   * descending order.
-   * @opt_param string viewType Whether to fetch the ADMIN_VIEW or DOMAIN_PUBLIC
-   * view of the user.
-   * @return Google_Service_Directory_Users
-   */
-  public function listUsers($optParams = array())
-  {
-    $params = array();
-    $params = array_merge($params, $optParams);
-    return $this->call('list', array($params), "Google_Service_Directory_Users");
-  }
-  /**
-   * change admin status of a user (users.makeAdmin)
-   *
-   * @param string $userKey Email or immutable Id of the user as admin
-   * @param Google_Service_Directory_UserMakeAdmin $postBody
-   * @param array $optParams Optional parameters.
-   */
-  public function makeAdmin($userKey, Google_Service_Directory_UserMakeAdmin $postBody, $optParams = array())
-  {
-    $params = array('userKey' => $userKey, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('makeAdmin', array($params));
-  }
-  /**
-   * update user. This method supports patch semantics. (users.patch)
-   *
-   * @param string $userKey Email or immutable Id of the user. If Id, it should
-   * match with id of user object
-   * @param Google_Service_Directory_User $postBody
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Directory_User
-   */
-  public function patch($userKey, Google_Service_Directory_User $postBody, $optParams = array())
-  {
-    $params = array('userKey' => $userKey, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('patch', array($params), "Google_Service_Directory_User");
-  }
-  /**
-   * Undelete a deleted user (users.undelete)
-   *
-   * @param string $userKey The immutable id of the user
-   * @param Google_Service_Directory_UserUndelete $postBody
-   * @param array $optParams Optional parameters.
-   */
-  public function undelete($userKey, Google_Service_Directory_UserUndelete $postBody, $optParams = array())
-  {
-    $params = array('userKey' => $userKey, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('undelete', array($params));
-  }
-  /**
-   * update user (users.update)
-   *
-   * @param string $userKey Email or immutable Id of the user. If Id, it should
-   * match with id of user object
-   * @param Google_Service_Directory_User $postBody
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Directory_User
-   */
-  public function update($userKey, Google_Service_Directory_User $postBody, $optParams = array())
-  {
-    $params = array('userKey' => $userKey, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('update', array($params), "Google_Service_Directory_User");
-  }
-  /**
-   * Watch for changes in users list (users.watch)
-   *
-   * @param Google_Service_Directory_Channel $postBody
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param string customFieldMask Comma-separated list of schema names. All
-   * fields from these schemas are fetched. This should only be set when
-   * projection=custom.
-   * @opt_param string customer Immutable id of the Google Apps account. In case
-   * of multi-domain, to fetch all users for a customer, fill this field instead
-   * of domain.
-   * @opt_param string domain Name of the domain. Fill this field to get users
-   * from only this domain. To return all users in a multi-domain fill customer
-   * field instead.
-   * @opt_param string event Event on which subscription is intended (if
-   * subscribing)
-   * @opt_param int maxResults Maximum number of results to return. Default is
-   * 100. Max allowed is 500
-   * @opt_param string orderBy Column to use for sorting results
-   * @opt_param string pageToken Token to specify next page in the list
-   * @opt_param string projection What subset of fields to fetch for this user.
-   * @opt_param string query Query string search. Should be of the form "".
-   * Complete documentation is at https://developers.google.com/admin-
-   * sdk/directory/v1/guides/search-users
-   * @opt_param string showDeleted If set to true retrieves the list of deleted
-   * users. Default is false
-   * @opt_param string sortOrder Whether to return results in ascending or
-   * descending order.
-   * @opt_param string viewType Whether to fetch the ADMIN_VIEW or DOMAIN_PUBLIC
-   * view of the user.
-   * @return Google_Service_Directory_Channel
-   */
-  public function watch(Google_Service_Directory_Channel $postBody, $optParams = array())
-  {
-    $params = array('postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('watch', array($params), "Google_Service_Directory_Channel");
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Directory/Resource/UsersAliases.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Directory/Resource/UsersAliases.php
deleted file mode 100644
index 545b4271..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Directory/Resource/UsersAliases.php
+++ /dev/null
@@ -1,88 +0,0 @@
-
- *   $adminService = new Google_Service_Directory(...);
- *   $aliases = $adminService->aliases;
- *  
- */
-class Google_Service_Directory_Resource_UsersAliases extends Google_Service_Resource
-{
-  /**
-   * Remove a alias for the user (aliases.delete)
-   *
-   * @param string $userKey Email or immutable Id of the user
-   * @param string $alias The alias to be removed
-   * @param array $optParams Optional parameters.
-   */
-  public function delete($userKey, $alias, $optParams = array())
-  {
-    $params = array('userKey' => $userKey, 'alias' => $alias);
-    $params = array_merge($params, $optParams);
-    return $this->call('delete', array($params));
-  }
-  /**
-   * Add a alias for the user (aliases.insert)
-   *
-   * @param string $userKey Email or immutable Id of the user
-   * @param Google_Service_Directory_Alias $postBody
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Directory_Alias
-   */
-  public function insert($userKey, Google_Service_Directory_Alias $postBody, $optParams = array())
-  {
-    $params = array('userKey' => $userKey, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('insert', array($params), "Google_Service_Directory_Alias");
-  }
-  /**
-   * List all aliases for a user (aliases.listUsersAliases)
-   *
-   * @param string $userKey Email or immutable Id of the user
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param string event Event on which subscription is intended (if
-   * subscribing)
-   * @return Google_Service_Directory_Aliases
-   */
-  public function listUsersAliases($userKey, $optParams = array())
-  {
-    $params = array('userKey' => $userKey);
-    $params = array_merge($params, $optParams);
-    return $this->call('list', array($params), "Google_Service_Directory_Aliases");
-  }
-  /**
-   * Watch for changes in user aliases list (aliases.watch)
-   *
-   * @param string $userKey Email or immutable Id of the user
-   * @param Google_Service_Directory_Channel $postBody
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param string event Event on which subscription is intended (if
-   * subscribing)
-   * @return Google_Service_Directory_Channel
-   */
-  public function watch($userKey, Google_Service_Directory_Channel $postBody, $optParams = array())
-  {
-    $params = array('userKey' => $userKey, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('watch', array($params), "Google_Service_Directory_Channel");
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Directory/Resource/UsersPhotos.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Directory/Resource/UsersPhotos.php
deleted file mode 100644
index 6b3e5a32..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Directory/Resource/UsersPhotos.php
+++ /dev/null
@@ -1,82 +0,0 @@
-
- *   $adminService = new Google_Service_Directory(...);
- *   $photos = $adminService->photos;
- *  
- */
-class Google_Service_Directory_Resource_UsersPhotos extends Google_Service_Resource
-{
-  /**
-   * Remove photos for the user (photos.delete)
-   *
-   * @param string $userKey Email or immutable Id of the user
-   * @param array $optParams Optional parameters.
-   */
-  public function delete($userKey, $optParams = array())
-  {
-    $params = array('userKey' => $userKey);
-    $params = array_merge($params, $optParams);
-    return $this->call('delete', array($params));
-  }
-  /**
-   * Retrieve photo of a user (photos.get)
-   *
-   * @param string $userKey Email or immutable Id of the user
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Directory_UserPhoto
-   */
-  public function get($userKey, $optParams = array())
-  {
-    $params = array('userKey' => $userKey);
-    $params = array_merge($params, $optParams);
-    return $this->call('get', array($params), "Google_Service_Directory_UserPhoto");
-  }
-  /**
-   * Add a photo for the user. This method supports patch semantics.
-   * (photos.patch)
-   *
-   * @param string $userKey Email or immutable Id of the user
-   * @param Google_Service_Directory_UserPhoto $postBody
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Directory_UserPhoto
-   */
-  public function patch($userKey, Google_Service_Directory_UserPhoto $postBody, $optParams = array())
-  {
-    $params = array('userKey' => $userKey, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('patch', array($params), "Google_Service_Directory_UserPhoto");
-  }
-  /**
-   * Add a photo for the user (photos.update)
-   *
-   * @param string $userKey Email or immutable Id of the user
-   * @param Google_Service_Directory_UserPhoto $postBody
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Directory_UserPhoto
-   */
-  public function update($userKey, Google_Service_Directory_UserPhoto $postBody, $optParams = array())
-  {
-    $params = array('userKey' => $userKey, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('update', array($params), "Google_Service_Directory_UserPhoto");
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Directory/Resource/VerificationCodes.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Directory/Resource/VerificationCodes.php
deleted file mode 100644
index e67ff742..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Directory/Resource/VerificationCodes.php
+++ /dev/null
@@ -1,69 +0,0 @@
-
- *   $adminService = new Google_Service_Directory(...);
- *   $verificationCodes = $adminService->verificationCodes;
- *  
- */
-class Google_Service_Directory_Resource_VerificationCodes extends Google_Service_Resource
-{
-  /**
-   * Generate new backup verification codes for the user.
-   * (verificationCodes.generate)
-   *
-   * @param string $userKey Email or immutable Id of the user
-   * @param array $optParams Optional parameters.
-   */
-  public function generate($userKey, $optParams = array())
-  {
-    $params = array('userKey' => $userKey);
-    $params = array_merge($params, $optParams);
-    return $this->call('generate', array($params));
-  }
-  /**
-   * Invalidate the current backup verification codes for the user.
-   * (verificationCodes.invalidate)
-   *
-   * @param string $userKey Email or immutable Id of the user
-   * @param array $optParams Optional parameters.
-   */
-  public function invalidate($userKey, $optParams = array())
-  {
-    $params = array('userKey' => $userKey);
-    $params = array_merge($params, $optParams);
-    return $this->call('invalidate', array($params));
-  }
-  /**
-   * Returns the current set of valid backup verification codes for the specified
-   * user. (verificationCodes.listVerificationCodes)
-   *
-   * @param string $userKey Identifies the user in the API request. The value can
-   * be the user's primary email address, alias email address, or unique user ID.
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Directory_VerificationCodes
-   */
-  public function listVerificationCodes($userKey, $optParams = array())
-  {
-    $params = array('userKey' => $userKey);
-    $params = array_merge($params, $optParams);
-    return $this->call('list', array($params), "Google_Service_Directory_VerificationCodes");
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Directory/Role.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Directory/Role.php
deleted file mode 100644
index 8bc11164..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Directory/Role.php
+++ /dev/null
@@ -1,95 +0,0 @@
-etag = $etag;
-  }
-  public function getEtag()
-  {
-    return $this->etag;
-  }
-  public function setIsSuperAdminRole($isSuperAdminRole)
-  {
-    $this->isSuperAdminRole = $isSuperAdminRole;
-  }
-  public function getIsSuperAdminRole()
-  {
-    return $this->isSuperAdminRole;
-  }
-  public function setIsSystemRole($isSystemRole)
-  {
-    $this->isSystemRole = $isSystemRole;
-  }
-  public function getIsSystemRole()
-  {
-    return $this->isSystemRole;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setRoleDescription($roleDescription)
-  {
-    $this->roleDescription = $roleDescription;
-  }
-  public function getRoleDescription()
-  {
-    return $this->roleDescription;
-  }
-  public function setRoleId($roleId)
-  {
-    $this->roleId = $roleId;
-  }
-  public function getRoleId()
-  {
-    return $this->roleId;
-  }
-  public function setRoleName($roleName)
-  {
-    $this->roleName = $roleName;
-  }
-  public function getRoleName()
-  {
-    return $this->roleName;
-  }
-  public function setRolePrivileges($rolePrivileges)
-  {
-    $this->rolePrivileges = $rolePrivileges;
-  }
-  public function getRolePrivileges()
-  {
-    return $this->rolePrivileges;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Directory/RoleAssignment.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Directory/RoleAssignment.php
deleted file mode 100644
index ed27cfc9..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Directory/RoleAssignment.php
+++ /dev/null
@@ -1,84 +0,0 @@
-assignedTo = $assignedTo;
-  }
-  public function getAssignedTo()
-  {
-    return $this->assignedTo;
-  }
-  public function setEtag($etag)
-  {
-    $this->etag = $etag;
-  }
-  public function getEtag()
-  {
-    return $this->etag;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setOrgUnitId($orgUnitId)
-  {
-    $this->orgUnitId = $orgUnitId;
-  }
-  public function getOrgUnitId()
-  {
-    return $this->orgUnitId;
-  }
-  public function setRoleAssignmentId($roleAssignmentId)
-  {
-    $this->roleAssignmentId = $roleAssignmentId;
-  }
-  public function getRoleAssignmentId()
-  {
-    return $this->roleAssignmentId;
-  }
-  public function setRoleId($roleId)
-  {
-    $this->roleId = $roleId;
-  }
-  public function getRoleId()
-  {
-    return $this->roleId;
-  }
-  public function setScopeType($scopeType)
-  {
-    $this->scopeType = $scopeType;
-  }
-  public function getScopeType()
-  {
-    return $this->scopeType;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Directory/RoleAssignments.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Directory/RoleAssignments.php
deleted file mode 100644
index d1fbe4d9..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Directory/RoleAssignments.php
+++ /dev/null
@@ -1,59 +0,0 @@
-etag = $etag;
-  }
-  public function getEtag()
-  {
-    return $this->etag;
-  }
-  public function setItems($items)
-  {
-    $this->items = $items;
-  }
-  public function getItems()
-  {
-    return $this->items;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setNextPageToken($nextPageToken)
-  {
-    $this->nextPageToken = $nextPageToken;
-  }
-  public function getNextPageToken()
-  {
-    return $this->nextPageToken;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Directory/RoleRolePrivileges.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Directory/RoleRolePrivileges.php
deleted file mode 100644
index 7de85b02..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Directory/RoleRolePrivileges.php
+++ /dev/null
@@ -1,39 +0,0 @@
-privilegeName = $privilegeName;
-  }
-  public function getPrivilegeName()
-  {
-    return $this->privilegeName;
-  }
-  public function setServiceId($serviceId)
-  {
-    $this->serviceId = $serviceId;
-  }
-  public function getServiceId()
-  {
-    return $this->serviceId;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Directory/Roles.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Directory/Roles.php
deleted file mode 100644
index d65f436f..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Directory/Roles.php
+++ /dev/null
@@ -1,59 +0,0 @@
-etag = $etag;
-  }
-  public function getEtag()
-  {
-    return $this->etag;
-  }
-  public function setItems($items)
-  {
-    $this->items = $items;
-  }
-  public function getItems()
-  {
-    return $this->items;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setNextPageToken($nextPageToken)
-  {
-    $this->nextPageToken = $nextPageToken;
-  }
-  public function getNextPageToken()
-  {
-    return $this->nextPageToken;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Directory/Schema.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Directory/Schema.php
deleted file mode 100644
index ed958bca..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Directory/Schema.php
+++ /dev/null
@@ -1,68 +0,0 @@
-etag = $etag;
-  }
-  public function getEtag()
-  {
-    return $this->etag;
-  }
-  public function setFields($fields)
-  {
-    $this->fields = $fields;
-  }
-  public function getFields()
-  {
-    return $this->fields;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setSchemaId($schemaId)
-  {
-    $this->schemaId = $schemaId;
-  }
-  public function getSchemaId()
-  {
-    return $this->schemaId;
-  }
-  public function setSchemaName($schemaName)
-  {
-    $this->schemaName = $schemaName;
-  }
-  public function getSchemaName()
-  {
-    return $this->schemaName;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Directory/SchemaFieldSpec.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Directory/SchemaFieldSpec.php
deleted file mode 100644
index c2bdac87..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Directory/SchemaFieldSpec.php
+++ /dev/null
@@ -1,103 +0,0 @@
-etag = $etag;
-  }
-  public function getEtag()
-  {
-    return $this->etag;
-  }
-  public function setFieldId($fieldId)
-  {
-    $this->fieldId = $fieldId;
-  }
-  public function getFieldId()
-  {
-    return $this->fieldId;
-  }
-  public function setFieldName($fieldName)
-  {
-    $this->fieldName = $fieldName;
-  }
-  public function getFieldName()
-  {
-    return $this->fieldName;
-  }
-  public function setFieldType($fieldType)
-  {
-    $this->fieldType = $fieldType;
-  }
-  public function getFieldType()
-  {
-    return $this->fieldType;
-  }
-  public function setIndexed($indexed)
-  {
-    $this->indexed = $indexed;
-  }
-  public function getIndexed()
-  {
-    return $this->indexed;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setMultiValued($multiValued)
-  {
-    $this->multiValued = $multiValued;
-  }
-  public function getMultiValued()
-  {
-    return $this->multiValued;
-  }
-  public function setNumericIndexingSpec(Google_Service_Directory_SchemaFieldSpecNumericIndexingSpec $numericIndexingSpec)
-  {
-    $this->numericIndexingSpec = $numericIndexingSpec;
-  }
-  public function getNumericIndexingSpec()
-  {
-    return $this->numericIndexingSpec;
-  }
-  public function setReadAccessType($readAccessType)
-  {
-    $this->readAccessType = $readAccessType;
-  }
-  public function getReadAccessType()
-  {
-    return $this->readAccessType;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Directory/SchemaFieldSpecNumericIndexingSpec.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Directory/SchemaFieldSpecNumericIndexingSpec.php
deleted file mode 100644
index 26a015e5..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Directory/SchemaFieldSpecNumericIndexingSpec.php
+++ /dev/null
@@ -1,39 +0,0 @@
-maxValue = $maxValue;
-  }
-  public function getMaxValue()
-  {
-    return $this->maxValue;
-  }
-  public function setMinValue($minValue)
-  {
-    $this->minValue = $minValue;
-  }
-  public function getMinValue()
-  {
-    return $this->minValue;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Directory/Schemas.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Directory/Schemas.php
deleted file mode 100644
index f5ab8e3d..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Directory/Schemas.php
+++ /dev/null
@@ -1,50 +0,0 @@
-etag = $etag;
-  }
-  public function getEtag()
-  {
-    return $this->etag;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setSchemas($schemas)
-  {
-    $this->schemas = $schemas;
-  }
-  public function getSchemas()
-  {
-    return $this->schemas;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Directory/Token.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Directory/Token.php
deleted file mode 100644
index c51391b8..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Directory/Token.php
+++ /dev/null
@@ -1,94 +0,0 @@
-anonymous = $anonymous;
-  }
-  public function getAnonymous()
-  {
-    return $this->anonymous;
-  }
-  public function setClientId($clientId)
-  {
-    $this->clientId = $clientId;
-  }
-  public function getClientId()
-  {
-    return $this->clientId;
-  }
-  public function setDisplayText($displayText)
-  {
-    $this->displayText = $displayText;
-  }
-  public function getDisplayText()
-  {
-    return $this->displayText;
-  }
-  public function setEtag($etag)
-  {
-    $this->etag = $etag;
-  }
-  public function getEtag()
-  {
-    return $this->etag;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setNativeApp($nativeApp)
-  {
-    $this->nativeApp = $nativeApp;
-  }
-  public function getNativeApp()
-  {
-    return $this->nativeApp;
-  }
-  public function setScopes($scopes)
-  {
-    $this->scopes = $scopes;
-  }
-  public function getScopes()
-  {
-    return $this->scopes;
-  }
-  public function setUserKey($userKey)
-  {
-    $this->userKey = $userKey;
-  }
-  public function getUserKey()
-  {
-    return $this->userKey;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Directory/Tokens.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Directory/Tokens.php
deleted file mode 100644
index 3174c8c9..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Directory/Tokens.php
+++ /dev/null
@@ -1,50 +0,0 @@
-etag = $etag;
-  }
-  public function getEtag()
-  {
-    return $this->etag;
-  }
-  public function setItems($items)
-  {
-    $this->items = $items;
-  }
-  public function getItems()
-  {
-    return $this->items;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Directory/User.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Directory/User.php
deleted file mode 100644
index e17d7c41..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Directory/User.php
+++ /dev/null
@@ -1,356 +0,0 @@
-addresses = $addresses;
-  }
-  public function getAddresses()
-  {
-    return $this->addresses;
-  }
-  public function setAgreedToTerms($agreedToTerms)
-  {
-    $this->agreedToTerms = $agreedToTerms;
-  }
-  public function getAgreedToTerms()
-  {
-    return $this->agreedToTerms;
-  }
-  public function setAliases($aliases)
-  {
-    $this->aliases = $aliases;
-  }
-  public function getAliases()
-  {
-    return $this->aliases;
-  }
-  public function setChangePasswordAtNextLogin($changePasswordAtNextLogin)
-  {
-    $this->changePasswordAtNextLogin = $changePasswordAtNextLogin;
-  }
-  public function getChangePasswordAtNextLogin()
-  {
-    return $this->changePasswordAtNextLogin;
-  }
-  public function setCreationTime($creationTime)
-  {
-    $this->creationTime = $creationTime;
-  }
-  public function getCreationTime()
-  {
-    return $this->creationTime;
-  }
-  public function setCustomSchemas($customSchemas)
-  {
-    $this->customSchemas = $customSchemas;
-  }
-  public function getCustomSchemas()
-  {
-    return $this->customSchemas;
-  }
-  public function setCustomerId($customerId)
-  {
-    $this->customerId = $customerId;
-  }
-  public function getCustomerId()
-  {
-    return $this->customerId;
-  }
-  public function setDeletionTime($deletionTime)
-  {
-    $this->deletionTime = $deletionTime;
-  }
-  public function getDeletionTime()
-  {
-    return $this->deletionTime;
-  }
-  public function setEmails($emails)
-  {
-    $this->emails = $emails;
-  }
-  public function getEmails()
-  {
-    return $this->emails;
-  }
-  public function setEtag($etag)
-  {
-    $this->etag = $etag;
-  }
-  public function getEtag()
-  {
-    return $this->etag;
-  }
-  public function setExternalIds($externalIds)
-  {
-    $this->externalIds = $externalIds;
-  }
-  public function getExternalIds()
-  {
-    return $this->externalIds;
-  }
-  public function setHashFunction($hashFunction)
-  {
-    $this->hashFunction = $hashFunction;
-  }
-  public function getHashFunction()
-  {
-    return $this->hashFunction;
-  }
-  public function setId($id)
-  {
-    $this->id = $id;
-  }
-  public function getId()
-  {
-    return $this->id;
-  }
-  public function setIms($ims)
-  {
-    $this->ims = $ims;
-  }
-  public function getIms()
-  {
-    return $this->ims;
-  }
-  public function setIncludeInGlobalAddressList($includeInGlobalAddressList)
-  {
-    $this->includeInGlobalAddressList = $includeInGlobalAddressList;
-  }
-  public function getIncludeInGlobalAddressList()
-  {
-    return $this->includeInGlobalAddressList;
-  }
-  public function setIpWhitelisted($ipWhitelisted)
-  {
-    $this->ipWhitelisted = $ipWhitelisted;
-  }
-  public function getIpWhitelisted()
-  {
-    return $this->ipWhitelisted;
-  }
-  public function setIsAdmin($isAdmin)
-  {
-    $this->isAdmin = $isAdmin;
-  }
-  public function getIsAdmin()
-  {
-    return $this->isAdmin;
-  }
-  public function setIsDelegatedAdmin($isDelegatedAdmin)
-  {
-    $this->isDelegatedAdmin = $isDelegatedAdmin;
-  }
-  public function getIsDelegatedAdmin()
-  {
-    return $this->isDelegatedAdmin;
-  }
-  public function setIsEnforcedIn2Sv($isEnforcedIn2Sv)
-  {
-    $this->isEnforcedIn2Sv = $isEnforcedIn2Sv;
-  }
-  public function getIsEnforcedIn2Sv()
-  {
-    return $this->isEnforcedIn2Sv;
-  }
-  public function setIsEnrolledIn2Sv($isEnrolledIn2Sv)
-  {
-    $this->isEnrolledIn2Sv = $isEnrolledIn2Sv;
-  }
-  public function getIsEnrolledIn2Sv()
-  {
-    return $this->isEnrolledIn2Sv;
-  }
-  public function setIsMailboxSetup($isMailboxSetup)
-  {
-    $this->isMailboxSetup = $isMailboxSetup;
-  }
-  public function getIsMailboxSetup()
-  {
-    return $this->isMailboxSetup;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setLastLoginTime($lastLoginTime)
-  {
-    $this->lastLoginTime = $lastLoginTime;
-  }
-  public function getLastLoginTime()
-  {
-    return $this->lastLoginTime;
-  }
-  public function setName(Google_Service_Directory_UserName $name)
-  {
-    $this->name = $name;
-  }
-  public function getName()
-  {
-    return $this->name;
-  }
-  public function setNonEditableAliases($nonEditableAliases)
-  {
-    $this->nonEditableAliases = $nonEditableAliases;
-  }
-  public function getNonEditableAliases()
-  {
-    return $this->nonEditableAliases;
-  }
-  public function setNotes($notes)
-  {
-    $this->notes = $notes;
-  }
-  public function getNotes()
-  {
-    return $this->notes;
-  }
-  public function setOrgUnitPath($orgUnitPath)
-  {
-    $this->orgUnitPath = $orgUnitPath;
-  }
-  public function getOrgUnitPath()
-  {
-    return $this->orgUnitPath;
-  }
-  public function setOrganizations($organizations)
-  {
-    $this->organizations = $organizations;
-  }
-  public function getOrganizations()
-  {
-    return $this->organizations;
-  }
-  public function setPassword($password)
-  {
-    $this->password = $password;
-  }
-  public function getPassword()
-  {
-    return $this->password;
-  }
-  public function setPhones($phones)
-  {
-    $this->phones = $phones;
-  }
-  public function getPhones()
-  {
-    return $this->phones;
-  }
-  public function setPrimaryEmail($primaryEmail)
-  {
-    $this->primaryEmail = $primaryEmail;
-  }
-  public function getPrimaryEmail()
-  {
-    return $this->primaryEmail;
-  }
-  public function setRelations($relations)
-  {
-    $this->relations = $relations;
-  }
-  public function getRelations()
-  {
-    return $this->relations;
-  }
-  public function setSuspended($suspended)
-  {
-    $this->suspended = $suspended;
-  }
-  public function getSuspended()
-  {
-    return $this->suspended;
-  }
-  public function setSuspensionReason($suspensionReason)
-  {
-    $this->suspensionReason = $suspensionReason;
-  }
-  public function getSuspensionReason()
-  {
-    return $this->suspensionReason;
-  }
-  public function setThumbnailPhotoEtag($thumbnailPhotoEtag)
-  {
-    $this->thumbnailPhotoEtag = $thumbnailPhotoEtag;
-  }
-  public function getThumbnailPhotoEtag()
-  {
-    return $this->thumbnailPhotoEtag;
-  }
-  public function setThumbnailPhotoUrl($thumbnailPhotoUrl)
-  {
-    $this->thumbnailPhotoUrl = $thumbnailPhotoUrl;
-  }
-  public function getThumbnailPhotoUrl()
-  {
-    return $this->thumbnailPhotoUrl;
-  }
-  public function setWebsites($websites)
-  {
-    $this->websites = $websites;
-  }
-  public function getWebsites()
-  {
-    return $this->websites;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Directory/UserAbout.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Directory/UserAbout.php
deleted file mode 100644
index 10e4af5f..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Directory/UserAbout.php
+++ /dev/null
@@ -1,39 +0,0 @@
-contentType = $contentType;
-  }
-  public function getContentType()
-  {
-    return $this->contentType;
-  }
-  public function setValue($value)
-  {
-    $this->value = $value;
-  }
-  public function getValue()
-  {
-    return $this->value;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Directory/UserAddress.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Directory/UserAddress.php
deleted file mode 100644
index 0c68b39e..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Directory/UserAddress.php
+++ /dev/null
@@ -1,138 +0,0 @@
-country = $country;
-  }
-  public function getCountry()
-  {
-    return $this->country;
-  }
-  public function setCountryCode($countryCode)
-  {
-    $this->countryCode = $countryCode;
-  }
-  public function getCountryCode()
-  {
-    return $this->countryCode;
-  }
-  public function setCustomType($customType)
-  {
-    $this->customType = $customType;
-  }
-  public function getCustomType()
-  {
-    return $this->customType;
-  }
-  public function setExtendedAddress($extendedAddress)
-  {
-    $this->extendedAddress = $extendedAddress;
-  }
-  public function getExtendedAddress()
-  {
-    return $this->extendedAddress;
-  }
-  public function setFormatted($formatted)
-  {
-    $this->formatted = $formatted;
-  }
-  public function getFormatted()
-  {
-    return $this->formatted;
-  }
-  public function setLocality($locality)
-  {
-    $this->locality = $locality;
-  }
-  public function getLocality()
-  {
-    return $this->locality;
-  }
-  public function setPoBox($poBox)
-  {
-    $this->poBox = $poBox;
-  }
-  public function getPoBox()
-  {
-    return $this->poBox;
-  }
-  public function setPostalCode($postalCode)
-  {
-    $this->postalCode = $postalCode;
-  }
-  public function getPostalCode()
-  {
-    return $this->postalCode;
-  }
-  public function setPrimary($primary)
-  {
-    $this->primary = $primary;
-  }
-  public function getPrimary()
-  {
-    return $this->primary;
-  }
-  public function setRegion($region)
-  {
-    $this->region = $region;
-  }
-  public function getRegion()
-  {
-    return $this->region;
-  }
-  public function setSourceIsStructured($sourceIsStructured)
-  {
-    $this->sourceIsStructured = $sourceIsStructured;
-  }
-  public function getSourceIsStructured()
-  {
-    return $this->sourceIsStructured;
-  }
-  public function setStreetAddress($streetAddress)
-  {
-    $this->streetAddress = $streetAddress;
-  }
-  public function getStreetAddress()
-  {
-    return $this->streetAddress;
-  }
-  public function setType($type)
-  {
-    $this->type = $type;
-  }
-  public function getType()
-  {
-    return $this->type;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Directory/UserEmail.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Directory/UserEmail.php
deleted file mode 100644
index ed684d7e..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Directory/UserEmail.php
+++ /dev/null
@@ -1,57 +0,0 @@
-address = $address;
-  }
-  public function getAddress()
-  {
-    return $this->address;
-  }
-  public function setCustomType($customType)
-  {
-    $this->customType = $customType;
-  }
-  public function getCustomType()
-  {
-    return $this->customType;
-  }
-  public function setPrimary($primary)
-  {
-    $this->primary = $primary;
-  }
-  public function getPrimary()
-  {
-    return $this->primary;
-  }
-  public function setType($type)
-  {
-    $this->type = $type;
-  }
-  public function getType()
-  {
-    return $this->type;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Directory/UserExternalId.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Directory/UserExternalId.php
deleted file mode 100644
index 9eabc336..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Directory/UserExternalId.php
+++ /dev/null
@@ -1,48 +0,0 @@
-customType = $customType;
-  }
-  public function getCustomType()
-  {
-    return $this->customType;
-  }
-  public function setType($type)
-  {
-    $this->type = $type;
-  }
-  public function getType()
-  {
-    return $this->type;
-  }
-  public function setValue($value)
-  {
-    $this->value = $value;
-  }
-  public function getValue()
-  {
-    return $this->value;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Directory/UserIm.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Directory/UserIm.php
deleted file mode 100644
index 84522e4b..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Directory/UserIm.php
+++ /dev/null
@@ -1,75 +0,0 @@
-customProtocol = $customProtocol;
-  }
-  public function getCustomProtocol()
-  {
-    return $this->customProtocol;
-  }
-  public function setCustomType($customType)
-  {
-    $this->customType = $customType;
-  }
-  public function getCustomType()
-  {
-    return $this->customType;
-  }
-  public function setIm($im)
-  {
-    $this->im = $im;
-  }
-  public function getIm()
-  {
-    return $this->im;
-  }
-  public function setPrimary($primary)
-  {
-    $this->primary = $primary;
-  }
-  public function getPrimary()
-  {
-    return $this->primary;
-  }
-  public function setProtocol($protocol)
-  {
-    $this->protocol = $protocol;
-  }
-  public function getProtocol()
-  {
-    return $this->protocol;
-  }
-  public function setType($type)
-  {
-    $this->type = $type;
-  }
-  public function getType()
-  {
-    return $this->type;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Directory/UserMakeAdmin.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Directory/UserMakeAdmin.php
deleted file mode 100644
index 8c5ac86b..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Directory/UserMakeAdmin.php
+++ /dev/null
@@ -1,30 +0,0 @@
-status = $status;
-  }
-  public function getStatus()
-  {
-    return $this->status;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Directory/UserName.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Directory/UserName.php
deleted file mode 100644
index 677a5d99..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Directory/UserName.php
+++ /dev/null
@@ -1,48 +0,0 @@
-familyName = $familyName;
-  }
-  public function getFamilyName()
-  {
-    return $this->familyName;
-  }
-  public function setFullName($fullName)
-  {
-    $this->fullName = $fullName;
-  }
-  public function getFullName()
-  {
-    return $this->fullName;
-  }
-  public function setGivenName($givenName)
-  {
-    $this->givenName = $givenName;
-  }
-  public function getGivenName()
-  {
-    return $this->givenName;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Directory/UserOrganization.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Directory/UserOrganization.php
deleted file mode 100644
index 2481928b..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Directory/UserOrganization.php
+++ /dev/null
@@ -1,120 +0,0 @@
-costCenter = $costCenter;
-  }
-  public function getCostCenter()
-  {
-    return $this->costCenter;
-  }
-  public function setCustomType($customType)
-  {
-    $this->customType = $customType;
-  }
-  public function getCustomType()
-  {
-    return $this->customType;
-  }
-  public function setDepartment($department)
-  {
-    $this->department = $department;
-  }
-  public function getDepartment()
-  {
-    return $this->department;
-  }
-  public function setDescription($description)
-  {
-    $this->description = $description;
-  }
-  public function getDescription()
-  {
-    return $this->description;
-  }
-  public function setDomain($domain)
-  {
-    $this->domain = $domain;
-  }
-  public function getDomain()
-  {
-    return $this->domain;
-  }
-  public function setLocation($location)
-  {
-    $this->location = $location;
-  }
-  public function getLocation()
-  {
-    return $this->location;
-  }
-  public function setName($name)
-  {
-    $this->name = $name;
-  }
-  public function getName()
-  {
-    return $this->name;
-  }
-  public function setPrimary($primary)
-  {
-    $this->primary = $primary;
-  }
-  public function getPrimary()
-  {
-    return $this->primary;
-  }
-  public function setSymbol($symbol)
-  {
-    $this->symbol = $symbol;
-  }
-  public function getSymbol()
-  {
-    return $this->symbol;
-  }
-  public function setTitle($title)
-  {
-    $this->title = $title;
-  }
-  public function getTitle()
-  {
-    return $this->title;
-  }
-  public function setType($type)
-  {
-    $this->type = $type;
-  }
-  public function getType()
-  {
-    return $this->type;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Directory/UserPhone.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Directory/UserPhone.php
deleted file mode 100644
index 2e13223c..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Directory/UserPhone.php
+++ /dev/null
@@ -1,57 +0,0 @@
-customType = $customType;
-  }
-  public function getCustomType()
-  {
-    return $this->customType;
-  }
-  public function setPrimary($primary)
-  {
-    $this->primary = $primary;
-  }
-  public function getPrimary()
-  {
-    return $this->primary;
-  }
-  public function setType($type)
-  {
-    $this->type = $type;
-  }
-  public function getType()
-  {
-    return $this->type;
-  }
-  public function setValue($value)
-  {
-    $this->value = $value;
-  }
-  public function getValue()
-  {
-    return $this->value;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Directory/UserPhoto.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Directory/UserPhoto.php
deleted file mode 100644
index f667c80b..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Directory/UserPhoto.php
+++ /dev/null
@@ -1,93 +0,0 @@
-etag = $etag;
-  }
-  public function getEtag()
-  {
-    return $this->etag;
-  }
-  public function setHeight($height)
-  {
-    $this->height = $height;
-  }
-  public function getHeight()
-  {
-    return $this->height;
-  }
-  public function setId($id)
-  {
-    $this->id = $id;
-  }
-  public function getId()
-  {
-    return $this->id;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setMimeType($mimeType)
-  {
-    $this->mimeType = $mimeType;
-  }
-  public function getMimeType()
-  {
-    return $this->mimeType;
-  }
-  public function setPhotoData($photoData)
-  {
-    $this->photoData = $photoData;
-  }
-  public function getPhotoData()
-  {
-    return $this->photoData;
-  }
-  public function setPrimaryEmail($primaryEmail)
-  {
-    $this->primaryEmail = $primaryEmail;
-  }
-  public function getPrimaryEmail()
-  {
-    return $this->primaryEmail;
-  }
-  public function setWidth($width)
-  {
-    $this->width = $width;
-  }
-  public function getWidth()
-  {
-    return $this->width;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Directory/UserRelation.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Directory/UserRelation.php
deleted file mode 100644
index 41e5c781..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Directory/UserRelation.php
+++ /dev/null
@@ -1,48 +0,0 @@
-customType = $customType;
-  }
-  public function getCustomType()
-  {
-    return $this->customType;
-  }
-  public function setType($type)
-  {
-    $this->type = $type;
-  }
-  public function getType()
-  {
-    return $this->type;
-  }
-  public function setValue($value)
-  {
-    $this->value = $value;
-  }
-  public function getValue()
-  {
-    return $this->value;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Directory/UserUndelete.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Directory/UserUndelete.php
deleted file mode 100644
index 2b166047..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Directory/UserUndelete.php
+++ /dev/null
@@ -1,30 +0,0 @@
-orgUnitPath = $orgUnitPath;
-  }
-  public function getOrgUnitPath()
-  {
-    return $this->orgUnitPath;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Directory/UserWebsite.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Directory/UserWebsite.php
deleted file mode 100644
index 4b2d0c24..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Directory/UserWebsite.php
+++ /dev/null
@@ -1,57 +0,0 @@
-customType = $customType;
-  }
-  public function getCustomType()
-  {
-    return $this->customType;
-  }
-  public function setPrimary($primary)
-  {
-    $this->primary = $primary;
-  }
-  public function getPrimary()
-  {
-    return $this->primary;
-  }
-  public function setType($type)
-  {
-    $this->type = $type;
-  }
-  public function getType()
-  {
-    return $this->type;
-  }
-  public function setValue($value)
-  {
-    $this->value = $value;
-  }
-  public function getValue()
-  {
-    return $this->value;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Directory/Users.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Directory/Users.php
deleted file mode 100644
index ce525cf7..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Directory/Users.php
+++ /dev/null
@@ -1,71 +0,0 @@
- "trigger_event",
-  );
-  public $etag;
-  public $kind;
-  public $nextPageToken;
-  public $triggerEvent;
-  protected $usersType = 'Google_Service_Directory_User';
-  protected $usersDataType = 'array';
-
-  public function setEtag($etag)
-  {
-    $this->etag = $etag;
-  }
-  public function getEtag()
-  {
-    return $this->etag;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setNextPageToken($nextPageToken)
-  {
-    $this->nextPageToken = $nextPageToken;
-  }
-  public function getNextPageToken()
-  {
-    return $this->nextPageToken;
-  }
-  public function setTriggerEvent($triggerEvent)
-  {
-    $this->triggerEvent = $triggerEvent;
-  }
-  public function getTriggerEvent()
-  {
-    return $this->triggerEvent;
-  }
-  public function setUsers($users)
-  {
-    $this->users = $users;
-  }
-  public function getUsers()
-  {
-    return $this->users;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Directory/VerificationCode.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Directory/VerificationCode.php
deleted file mode 100644
index fbf95a3a..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Directory/VerificationCode.php
+++ /dev/null
@@ -1,57 +0,0 @@
-etag = $etag;
-  }
-  public function getEtag()
-  {
-    return $this->etag;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setUserId($userId)
-  {
-    $this->userId = $userId;
-  }
-  public function getUserId()
-  {
-    return $this->userId;
-  }
-  public function setVerificationCode($verificationCode)
-  {
-    $this->verificationCode = $verificationCode;
-  }
-  public function getVerificationCode()
-  {
-    return $this->verificationCode;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Directory/VerificationCodes.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Directory/VerificationCodes.php
deleted file mode 100644
index 3d4a8b8d..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Directory/VerificationCodes.php
+++ /dev/null
@@ -1,50 +0,0 @@
-etag = $etag;
-  }
-  public function getEtag()
-  {
-    return $this->etag;
-  }
-  public function setItems($items)
-  {
-    $this->items = $items;
-  }
-  public function getItems()
-  {
-    return $this->items;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dns.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dns.php
deleted file mode 100644
index a6820eb9..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dns.php
+++ /dev/null
@@ -1,274 +0,0 @@
-
- * Configures and serves authoritative DNS records.

- *
- * 

- * For more information about this service, see the API
- * Documentation
- * 

- *
- * @author Google, Inc.
- */
-class Google_Service_Dns extends Google_Service
-{
-  /** View and manage your data across Google Cloud Platform services. */
-  const CLOUD_PLATFORM =
-      "https://www.googleapis.com/auth/cloud-platform";
-  /** View your data across Google Cloud Platform services. */
-  const CLOUD_PLATFORM_READ_ONLY =
-      "https://www.googleapis.com/auth/cloud-platform.read-only";
-  /** View your DNS records hosted by Google Cloud DNS. */
-  const NDEV_CLOUDDNS_READONLY =
-      "https://www.googleapis.com/auth/ndev.clouddns.readonly";
-  /** View and manage your DNS records hosted by Google Cloud DNS. */
-  const NDEV_CLOUDDNS_READWRITE =
-      "https://www.googleapis.com/auth/ndev.clouddns.readwrite";
-
-  public $changes;
-  public $managedZones;
-  public $projects;
-  public $resourceRecordSets;
-  
-  /**
-   * Constructs the internal representation of the Dns service.
-   *
-   * @param Google_Client $client
-   */
-  public function __construct(Google_Client $client)
-  {
-    parent::__construct($client);
-    $this->rootUrl = 'https://www.googleapis.com/';
-    $this->servicePath = 'dns/v1/projects/';
-    $this->version = 'v1';
-    $this->serviceName = 'dns';
-
-    $this->changes = new Google_Service_Dns_Resource_Changes(
-        $this,
-        $this->serviceName,
-        'changes',
-        array(
-          'methods' => array(
-            'create' => array(
-              'path' => '{project}/managedZones/{managedZone}/changes',
-              'httpMethod' => 'POST',
-              'parameters' => array(
-                'project' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'managedZone' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'get' => array(
-              'path' => '{project}/managedZones/{managedZone}/changes/{changeId}',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'project' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'managedZone' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'changeId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'list' => array(
-              'path' => '{project}/managedZones/{managedZone}/changes',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'project' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'managedZone' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'maxResults' => array(
-                  'location' => 'query',
-                  'type' => 'integer',
-                ),
-                'pageToken' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'sortBy' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'sortOrder' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-              ),
-            ),
-          )
-        )
-    );
-    $this->managedZones = new Google_Service_Dns_Resource_ManagedZones(
-        $this,
-        $this->serviceName,
-        'managedZones',
-        array(
-          'methods' => array(
-            'create' => array(
-              'path' => '{project}/managedZones',
-              'httpMethod' => 'POST',
-              'parameters' => array(
-                'project' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'delete' => array(
-              'path' => '{project}/managedZones/{managedZone}',
-              'httpMethod' => 'DELETE',
-              'parameters' => array(
-                'project' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'managedZone' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'get' => array(
-              'path' => '{project}/managedZones/{managedZone}',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'project' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'managedZone' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'list' => array(
-              'path' => '{project}/managedZones',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'project' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'dnsName' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'maxResults' => array(
-                  'location' => 'query',
-                  'type' => 'integer',
-                ),
-                'pageToken' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-              ),
-            ),
-          )
-        )
-    );
-    $this->projects = new Google_Service_Dns_Resource_Projects(
-        $this,
-        $this->serviceName,
-        'projects',
-        array(
-          'methods' => array(
-            'get' => array(
-              'path' => '{project}',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'project' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),
-          )
-        )
-    );
-    $this->resourceRecordSets = new Google_Service_Dns_Resource_ResourceRecordSets(
-        $this,
-        $this->serviceName,
-        'resourceRecordSets',
-        array(
-          'methods' => array(
-            'list' => array(
-              'path' => '{project}/managedZones/{managedZone}/rrsets',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'project' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'managedZone' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'maxResults' => array(
-                  'location' => 'query',
-                  'type' => 'integer',
-                ),
-                'name' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'pageToken' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'type' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-              ),
-            ),
-          )
-        )
-    );
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dns/Change.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dns/Change.php
deleted file mode 100644
index 7547319d..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dns/Change.php
+++ /dev/null
@@ -1,78 +0,0 @@
-additions = $additions;
-  }
-  public function getAdditions()
-  {
-    return $this->additions;
-  }
-  public function setDeletions($deletions)
-  {
-    $this->deletions = $deletions;
-  }
-  public function getDeletions()
-  {
-    return $this->deletions;
-  }
-  public function setId($id)
-  {
-    $this->id = $id;
-  }
-  public function getId()
-  {
-    return $this->id;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setStartTime($startTime)
-  {
-    $this->startTime = $startTime;
-  }
-  public function getStartTime()
-  {
-    return $this->startTime;
-  }
-  public function setStatus($status)
-  {
-    $this->status = $status;
-  }
-  public function getStatus()
-  {
-    return $this->status;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dns/ChangesListResponse.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dns/ChangesListResponse.php
deleted file mode 100644
index d5966aa1..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dns/ChangesListResponse.php
+++ /dev/null
@@ -1,50 +0,0 @@
-changes = $changes;
-  }
-  public function getChanges()
-  {
-    return $this->changes;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setNextPageToken($nextPageToken)
-  {
-    $this->nextPageToken = $nextPageToken;
-  }
-  public function getNextPageToken()
-  {
-    return $this->nextPageToken;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dns/ManagedZone.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dns/ManagedZone.php
deleted file mode 100644
index 1a325ee5..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dns/ManagedZone.php
+++ /dev/null
@@ -1,94 +0,0 @@
-creationTime = $creationTime;
-  }
-  public function getCreationTime()
-  {
-    return $this->creationTime;
-  }
-  public function setDescription($description)
-  {
-    $this->description = $description;
-  }
-  public function getDescription()
-  {
-    return $this->description;
-  }
-  public function setDnsName($dnsName)
-  {
-    $this->dnsName = $dnsName;
-  }
-  public function getDnsName()
-  {
-    return $this->dnsName;
-  }
-  public function setId($id)
-  {
-    $this->id = $id;
-  }
-  public function getId()
-  {
-    return $this->id;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setName($name)
-  {
-    $this->name = $name;
-  }
-  public function getName()
-  {
-    return $this->name;
-  }
-  public function setNameServerSet($nameServerSet)
-  {
-    $this->nameServerSet = $nameServerSet;
-  }
-  public function getNameServerSet()
-  {
-    return $this->nameServerSet;
-  }
-  public function setNameServers($nameServers)
-  {
-    $this->nameServers = $nameServers;
-  }
-  public function getNameServers()
-  {
-    return $this->nameServers;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dns/ManagedZonesListResponse.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dns/ManagedZonesListResponse.php
deleted file mode 100644
index 3427f0de..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dns/ManagedZonesListResponse.php
+++ /dev/null
@@ -1,50 +0,0 @@
-kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setManagedZones($managedZones)
-  {
-    $this->managedZones = $managedZones;
-  }
-  public function getManagedZones()
-  {
-    return $this->managedZones;
-  }
-  public function setNextPageToken($nextPageToken)
-  {
-    $this->nextPageToken = $nextPageToken;
-  }
-  public function getNextPageToken()
-  {
-    return $this->nextPageToken;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dns/Project.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dns/Project.php
deleted file mode 100644
index aaa65267..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dns/Project.php
+++ /dev/null
@@ -1,58 +0,0 @@
-id = $id;
-  }
-  public function getId()
-  {
-    return $this->id;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setNumber($number)
-  {
-    $this->number = $number;
-  }
-  public function getNumber()
-  {
-    return $this->number;
-  }
-  public function setQuota(Google_Service_Dns_Quota $quota)
-  {
-    $this->quota = $quota;
-  }
-  public function getQuota()
-  {
-    return $this->quota;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dns/Quota.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dns/Quota.php
deleted file mode 100644
index f08f06e1..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dns/Quota.php
+++ /dev/null
@@ -1,84 +0,0 @@
-kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setManagedZones($managedZones)
-  {
-    $this->managedZones = $managedZones;
-  }
-  public function getManagedZones()
-  {
-    return $this->managedZones;
-  }
-  public function setResourceRecordsPerRrset($resourceRecordsPerRrset)
-  {
-    $this->resourceRecordsPerRrset = $resourceRecordsPerRrset;
-  }
-  public function getResourceRecordsPerRrset()
-  {
-    return $this->resourceRecordsPerRrset;
-  }
-  public function setRrsetAdditionsPerChange($rrsetAdditionsPerChange)
-  {
-    $this->rrsetAdditionsPerChange = $rrsetAdditionsPerChange;
-  }
-  public function getRrsetAdditionsPerChange()
-  {
-    return $this->rrsetAdditionsPerChange;
-  }
-  public function setRrsetDeletionsPerChange($rrsetDeletionsPerChange)
-  {
-    $this->rrsetDeletionsPerChange = $rrsetDeletionsPerChange;
-  }
-  public function getRrsetDeletionsPerChange()
-  {
-    return $this->rrsetDeletionsPerChange;
-  }
-  public function setRrsetsPerManagedZone($rrsetsPerManagedZone)
-  {
-    $this->rrsetsPerManagedZone = $rrsetsPerManagedZone;
-  }
-  public function getRrsetsPerManagedZone()
-  {
-    return $this->rrsetsPerManagedZone;
-  }
-  public function setTotalRrdataSizePerChange($totalRrdataSizePerChange)
-  {
-    $this->totalRrdataSizePerChange = $totalRrdataSizePerChange;
-  }
-  public function getTotalRrdataSizePerChange()
-  {
-    return $this->totalRrdataSizePerChange;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dns/Resource/Changes.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dns/Resource/Changes.php
deleted file mode 100644
index 49f96f93..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dns/Resource/Changes.php
+++ /dev/null
@@ -1,86 +0,0 @@
-
- *   $dnsService = new Google_Service_Dns(...);
- *   $changes = $dnsService->changes;
- *  
- */
-class Google_Service_Dns_Resource_Changes extends Google_Service_Resource
-{
-  /**
-   * Atomically update the ResourceRecordSet collection. (changes.create)
-   *
-   * @param string $project Identifies the project addressed by this request.
-   * @param string $managedZone Identifies the managed zone addressed by this
-   * request. Can be the managed zone name or id.
-   * @param Google_Service_Dns_Change $postBody
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Dns_Change
-   */
-  public function create($project, $managedZone, Google_Service_Dns_Change $postBody, $optParams = array())
-  {
-    $params = array('project' => $project, 'managedZone' => $managedZone, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('create', array($params), "Google_Service_Dns_Change");
-  }
-  /**
-   * Fetch the representation of an existing Change. (changes.get)
-   *
-   * @param string $project Identifies the project addressed by this request.
-   * @param string $managedZone Identifies the managed zone addressed by this
-   * request. Can be the managed zone name or id.
-   * @param string $changeId The identifier of the requested change, from a
-   * previous ResourceRecordSetsChangeResponse.
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Dns_Change
-   */
-  public function get($project, $managedZone, $changeId, $optParams = array())
-  {
-    $params = array('project' => $project, 'managedZone' => $managedZone, 'changeId' => $changeId);
-    $params = array_merge($params, $optParams);
-    return $this->call('get', array($params), "Google_Service_Dns_Change");
-  }
-  /**
-   * Enumerate Changes to a ResourceRecordSet collection. (changes.listChanges)
-   *
-   * @param string $project Identifies the project addressed by this request.
-   * @param string $managedZone Identifies the managed zone addressed by this
-   * request. Can be the managed zone name or id.
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param int maxResults Optional. Maximum number of results to be returned.
-   * If unspecified, the server will decide how many results to return.
-   * @opt_param string pageToken Optional. A tag returned by a previous list
-   * request that was truncated. Use this parameter to continue a previous list
-   * request.
-   * @opt_param string sortBy Sorting criterion. The only supported value is
-   * change sequence.
-   * @opt_param string sortOrder Sorting order direction: 'ascending' or
-   * 'descending'.
-   * @return Google_Service_Dns_ChangesListResponse
-   */
-  public function listChanges($project, $managedZone, $optParams = array())
-  {
-    $params = array('project' => $project, 'managedZone' => $managedZone);
-    $params = array_merge($params, $optParams);
-    return $this->call('list', array($params), "Google_Service_Dns_ChangesListResponse");
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dns/Resource/ManagedZones.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dns/Resource/ManagedZones.php
deleted file mode 100644
index bbe8316c..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dns/Resource/ManagedZones.php
+++ /dev/null
@@ -1,93 +0,0 @@
-
- *   $dnsService = new Google_Service_Dns(...);
- *   $managedZones = $dnsService->managedZones;
- *  
- */
-class Google_Service_Dns_Resource_ManagedZones extends Google_Service_Resource
-{
-  /**
-   * Create a new ManagedZone. (managedZones.create)
-   *
-   * @param string $project Identifies the project addressed by this request.
-   * @param Google_Service_Dns_ManagedZone $postBody
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Dns_ManagedZone
-   */
-  public function create($project, Google_Service_Dns_ManagedZone $postBody, $optParams = array())
-  {
-    $params = array('project' => $project, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('create', array($params), "Google_Service_Dns_ManagedZone");
-  }
-  /**
-   * Delete a previously created ManagedZone. (managedZones.delete)
-   *
-   * @param string $project Identifies the project addressed by this request.
-   * @param string $managedZone Identifies the managed zone addressed by this
-   * request. Can be the managed zone name or id.
-   * @param array $optParams Optional parameters.
-   */
-  public function delete($project, $managedZone, $optParams = array())
-  {
-    $params = array('project' => $project, 'managedZone' => $managedZone);
-    $params = array_merge($params, $optParams);
-    return $this->call('delete', array($params));
-  }
-  /**
-   * Fetch the representation of an existing ManagedZone. (managedZones.get)
-   *
-   * @param string $project Identifies the project addressed by this request.
-   * @param string $managedZone Identifies the managed zone addressed by this
-   * request. Can be the managed zone name or id.
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Dns_ManagedZone
-   */
-  public function get($project, $managedZone, $optParams = array())
-  {
-    $params = array('project' => $project, 'managedZone' => $managedZone);
-    $params = array_merge($params, $optParams);
-    return $this->call('get', array($params), "Google_Service_Dns_ManagedZone");
-  }
-  /**
-   * Enumerate ManagedZones that have been created but not yet deleted.
-   * (managedZones.listManagedZones)
-   *
-   * @param string $project Identifies the project addressed by this request.
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param string dnsName Restricts the list to return only zones with this
-   * domain name.
-   * @opt_param int maxResults Optional. Maximum number of results to be returned.
-   * If unspecified, the server will decide how many results to return.
-   * @opt_param string pageToken Optional. A tag returned by a previous list
-   * request that was truncated. Use this parameter to continue a previous list
-   * request.
-   * @return Google_Service_Dns_ManagedZonesListResponse
-   */
-  public function listManagedZones($project, $optParams = array())
-  {
-    $params = array('project' => $project);
-    $params = array_merge($params, $optParams);
-    return $this->call('list', array($params), "Google_Service_Dns_ManagedZonesListResponse");
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dns/Resource/Projects.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dns/Resource/Projects.php
deleted file mode 100644
index db8ef93e..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dns/Resource/Projects.php
+++ /dev/null
@@ -1,41 +0,0 @@
-
- *   $dnsService = new Google_Service_Dns(...);
- *   $projects = $dnsService->projects;
- *  
- */
-class Google_Service_Dns_Resource_Projects extends Google_Service_Resource
-{
-  /**
-   * Fetch the representation of an existing Project. (projects.get)
-   *
-   * @param string $project Identifies the project addressed by this request.
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Dns_Project
-   */
-  public function get($project, $optParams = array())
-  {
-    $params = array('project' => $project);
-    $params = array_merge($params, $optParams);
-    return $this->call('get', array($params), "Google_Service_Dns_Project");
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dns/Resource/ResourceRecordSets.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dns/Resource/ResourceRecordSets.php
deleted file mode 100644
index ee539fdf..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dns/Resource/ResourceRecordSets.php
+++ /dev/null
@@ -1,54 +0,0 @@
-
- *   $dnsService = new Google_Service_Dns(...);
- *   $resourceRecordSets = $dnsService->resourceRecordSets;
- *  
- */
-class Google_Service_Dns_Resource_ResourceRecordSets extends Google_Service_Resource
-{
-  /**
-   * Enumerate ResourceRecordSets that have been created but not yet deleted.
-   * (resourceRecordSets.listResourceRecordSets)
-   *
-   * @param string $project Identifies the project addressed by this request.
-   * @param string $managedZone Identifies the managed zone addressed by this
-   * request. Can be the managed zone name or id.
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param int maxResults Optional. Maximum number of results to be returned.
-   * If unspecified, the server will decide how many results to return.
-   * @opt_param string name Restricts the list to return only records with this
-   * fully qualified domain name.
-   * @opt_param string pageToken Optional. A tag returned by a previous list
-   * request that was truncated. Use this parameter to continue a previous list
-   * request.
-   * @opt_param string type Restricts the list to return only records of this
-   * type. If present, the "name" parameter must also be present.
-   * @return Google_Service_Dns_ResourceRecordSetsListResponse
-   */
-  public function listResourceRecordSets($project, $managedZone, $optParams = array())
-  {
-    $params = array('project' => $project, 'managedZone' => $managedZone);
-    $params = array_merge($params, $optParams);
-    return $this->call('list', array($params), "Google_Service_Dns_ResourceRecordSetsListResponse");
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dns/ResourceRecordSet.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dns/ResourceRecordSet.php
deleted file mode 100644
index 6a057eac..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dns/ResourceRecordSet.php
+++ /dev/null
@@ -1,67 +0,0 @@
-kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setName($name)
-  {
-    $this->name = $name;
-  }
-  public function getName()
-  {
-    return $this->name;
-  }
-  public function setRrdatas($rrdatas)
-  {
-    $this->rrdatas = $rrdatas;
-  }
-  public function getRrdatas()
-  {
-    return $this->rrdatas;
-  }
-  public function setTtl($ttl)
-  {
-    $this->ttl = $ttl;
-  }
-  public function getTtl()
-  {
-    return $this->ttl;
-  }
-  public function setType($type)
-  {
-    $this->type = $type;
-  }
-  public function getType()
-  {
-    return $this->type;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dns/ResourceRecordSetsListResponse.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dns/ResourceRecordSetsListResponse.php
deleted file mode 100644
index e86438f2..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Dns/ResourceRecordSetsListResponse.php
+++ /dev/null
@@ -1,50 +0,0 @@
-kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setNextPageToken($nextPageToken)
-  {
-    $this->nextPageToken = $nextPageToken;
-  }
-  public function getNextPageToken()
-  {
-    return $this->nextPageToken;
-  }
-  public function setRrsets($rrsets)
-  {
-    $this->rrsets = $rrsets;
-  }
-  public function getRrsets()
-  {
-    return $this->rrsets;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/DoubleClickBidManager.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/DoubleClickBidManager.php
deleted file mode 100644
index 656266ed..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/DoubleClickBidManager.php
+++ /dev/null
@@ -1,155 +0,0 @@
-
- * API for viewing and managing your reports in DoubleClick Bid Manager.

- *
- * 

- * For more information about this service, see the API
- * Documentation
- * 

- *
- * @author Google, Inc.
- */
-class Google_Service_DoubleClickBidManager extends Google_Service
-{
-
-
-  public $lineitems;
-  public $queries;
-  public $reports;
-  public $sdf;
-  
-  /**
-   * Constructs the internal representation of the DoubleClickBidManager
-   * service.
-   *
-   * @param Google_Client $client
-   */
-  public function __construct(Google_Client $client)
-  {
-    parent::__construct($client);
-    $this->rootUrl = 'https://www.googleapis.com/';
-    $this->servicePath = 'doubleclickbidmanager/v1/';
-    $this->version = 'v1';
-    $this->serviceName = 'doubleclickbidmanager';
-
-    $this->lineitems = new Google_Service_DoubleClickBidManager_Resource_Lineitems(
-        $this,
-        $this->serviceName,
-        'lineitems',
-        array(
-          'methods' => array(
-            'downloadlineitems' => array(
-              'path' => 'lineitems/downloadlineitems',
-              'httpMethod' => 'POST',
-              'parameters' => array(),
-            ),'uploadlineitems' => array(
-              'path' => 'lineitems/uploadlineitems',
-              'httpMethod' => 'POST',
-              'parameters' => array(),
-            ),
-          )
-        )
-    );
-    $this->queries = new Google_Service_DoubleClickBidManager_Resource_Queries(
-        $this,
-        $this->serviceName,
-        'queries',
-        array(
-          'methods' => array(
-            'createquery' => array(
-              'path' => 'query',
-              'httpMethod' => 'POST',
-              'parameters' => array(),
-            ),'deletequery' => array(
-              'path' => 'query/{queryId}',
-              'httpMethod' => 'DELETE',
-              'parameters' => array(
-                'queryId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'getquery' => array(
-              'path' => 'query/{queryId}',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'queryId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'listqueries' => array(
-              'path' => 'queries',
-              'httpMethod' => 'GET',
-              'parameters' => array(),
-            ),'runquery' => array(
-              'path' => 'query/{queryId}',
-              'httpMethod' => 'POST',
-              'parameters' => array(
-                'queryId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),
-          )
-        )
-    );
-    $this->reports = new Google_Service_DoubleClickBidManager_Resource_Reports(
-        $this,
-        $this->serviceName,
-        'reports',
-        array(
-          'methods' => array(
-            'listreports' => array(
-              'path' => 'queries/{queryId}/reports',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'queryId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),
-          )
-        )
-    );
-    $this->sdf = new Google_Service_DoubleClickBidManager_Resource_Sdf(
-        $this,
-        $this->serviceName,
-        'sdf',
-        array(
-          'methods' => array(
-            'download' => array(
-              'path' => 'sdf/download',
-              'httpMethod' => 'POST',
-              'parameters' => array(),
-            ),
-          )
-        )
-    );
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/DoubleClickBidManager/DownloadLineItemsRequest.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/DoubleClickBidManager/DownloadLineItemsRequest.php
deleted file mode 100644
index 08bb5c9d..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/DoubleClickBidManager/DownloadLineItemsRequest.php
+++ /dev/null
@@ -1,58 +0,0 @@
-fileSpec = $fileSpec;
-  }
-  public function getFileSpec()
-  {
-    return $this->fileSpec;
-  }
-  public function setFilterIds($filterIds)
-  {
-    $this->filterIds = $filterIds;
-  }
-  public function getFilterIds()
-  {
-    return $this->filterIds;
-  }
-  public function setFilterType($filterType)
-  {
-    $this->filterType = $filterType;
-  }
-  public function getFilterType()
-  {
-    return $this->filterType;
-  }
-  public function setFormat($format)
-  {
-    $this->format = $format;
-  }
-  public function getFormat()
-  {
-    return $this->format;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/DoubleClickBidManager/DownloadLineItemsResponse.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/DoubleClickBidManager/DownloadLineItemsResponse.php
deleted file mode 100644
index 5fcebc41..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/DoubleClickBidManager/DownloadLineItemsResponse.php
+++ /dev/null
@@ -1,30 +0,0 @@
-lineItems = $lineItems;
-  }
-  public function getLineItems()
-  {
-    return $this->lineItems;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/DoubleClickBidManager/DownloadRequest.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/DoubleClickBidManager/DownloadRequest.php
deleted file mode 100644
index 062a89b8..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/DoubleClickBidManager/DownloadRequest.php
+++ /dev/null
@@ -1,58 +0,0 @@
-fileTypes = $fileTypes;
-  }
-  public function getFileTypes()
-  {
-    return $this->fileTypes;
-  }
-  public function setFilterIds($filterIds)
-  {
-    $this->filterIds = $filterIds;
-  }
-  public function getFilterIds()
-  {
-    return $this->filterIds;
-  }
-  public function setFilterType($filterType)
-  {
-    $this->filterType = $filterType;
-  }
-  public function getFilterType()
-  {
-    return $this->filterType;
-  }
-  public function setVersion($version)
-  {
-    $this->version = $version;
-  }
-  public function getVersion()
-  {
-    return $this->version;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/DoubleClickBidManager/DownloadResponse.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/DoubleClickBidManager/DownloadResponse.php
deleted file mode 100644
index 4a289e82..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/DoubleClickBidManager/DownloadResponse.php
+++ /dev/null
@@ -1,57 +0,0 @@
-adGroups = $adGroups;
-  }
-  public function getAdGroups()
-  {
-    return $this->adGroups;
-  }
-  public function setAds($ads)
-  {
-    $this->ads = $ads;
-  }
-  public function getAds()
-  {
-    return $this->ads;
-  }
-  public function setInsertionOrders($insertionOrders)
-  {
-    $this->insertionOrders = $insertionOrders;
-  }
-  public function getInsertionOrders()
-  {
-    return $this->insertionOrders;
-  }
-  public function setLineItems($lineItems)
-  {
-    $this->lineItems = $lineItems;
-  }
-  public function getLineItems()
-  {
-    return $this->lineItems;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/DoubleClickBidManager/FilterPair.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/DoubleClickBidManager/FilterPair.php
deleted file mode 100644
index af28d25d..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/DoubleClickBidManager/FilterPair.php
+++ /dev/null
@@ -1,39 +0,0 @@
-type = $type;
-  }
-  public function getType()
-  {
-    return $this->type;
-  }
-  public function setValue($value)
-  {
-    $this->value = $value;
-  }
-  public function getValue()
-  {
-    return $this->value;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/DoubleClickBidManager/ListQueriesResponse.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/DoubleClickBidManager/ListQueriesResponse.php
deleted file mode 100644
index ff2d7ec7..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/DoubleClickBidManager/ListQueriesResponse.php
+++ /dev/null
@@ -1,41 +0,0 @@
-kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setQueries($queries)
-  {
-    $this->queries = $queries;
-  }
-  public function getQueries()
-  {
-    return $this->queries;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/DoubleClickBidManager/ListReportsResponse.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/DoubleClickBidManager/ListReportsResponse.php
deleted file mode 100644
index 45295b01..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/DoubleClickBidManager/ListReportsResponse.php
+++ /dev/null
@@ -1,41 +0,0 @@
-kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setReports($reports)
-  {
-    $this->reports = $reports;
-  }
-  public function getReports()
-  {
-    return $this->reports;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/DoubleClickBidManager/Note.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/DoubleClickBidManager/Note.php
deleted file mode 100644
index 1443b729..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/DoubleClickBidManager/Note.php
+++ /dev/null
@@ -1,66 +0,0 @@
-id = $id;
-  }
-  public function getId()
-  {
-    return $this->id;
-  }
-  public function setMessage($message)
-  {
-    $this->message = $message;
-  }
-  public function getMessage()
-  {
-    return $this->message;
-  }
-  public function setSource($source)
-  {
-    $this->source = $source;
-  }
-  public function getSource()
-  {
-    return $this->source;
-  }
-  public function setTimestamp($timestamp)
-  {
-    $this->timestamp = $timestamp;
-  }
-  public function getTimestamp()
-  {
-    return $this->timestamp;
-  }
-  public function setUsername($username)
-  {
-    $this->username = $username;
-  }
-  public function getUsername()
-  {
-    return $this->username;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/DoubleClickBidManager/NotifyProposalChangeRequest.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/DoubleClickBidManager/NotifyProposalChangeRequest.php
deleted file mode 100644
index 81bf5449..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/DoubleClickBidManager/NotifyProposalChangeRequest.php
+++ /dev/null
@@ -1,68 +0,0 @@
-action = $action;
-  }
-  public function getAction()
-  {
-    return $this->action;
-  }
-  public function setHref($href)
-  {
-    $this->href = $href;
-  }
-  public function getHref()
-  {
-    return $this->href;
-  }
-  public function setId($id)
-  {
-    $this->id = $id;
-  }
-  public function getId()
-  {
-    return $this->id;
-  }
-  public function setNotes($notes)
-  {
-    $this->notes = $notes;
-  }
-  public function getNotes()
-  {
-    return $this->notes;
-  }
-  public function setToken($token)
-  {
-    $this->token = $token;
-  }
-  public function getToken()
-  {
-    return $this->token;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/DoubleClickBidManager/Parameters.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/DoubleClickBidManager/Parameters.php
deleted file mode 100644
index 6d16406f..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/DoubleClickBidManager/Parameters.php
+++ /dev/null
@@ -1,68 +0,0 @@
-filters = $filters;
-  }
-  public function getFilters()
-  {
-    return $this->filters;
-  }
-  public function setGroupBys($groupBys)
-  {
-    $this->groupBys = $groupBys;
-  }
-  public function getGroupBys()
-  {
-    return $this->groupBys;
-  }
-  public function setIncludeInviteData($includeInviteData)
-  {
-    $this->includeInviteData = $includeInviteData;
-  }
-  public function getIncludeInviteData()
-  {
-    return $this->includeInviteData;
-  }
-  public function setMetrics($metrics)
-  {
-    $this->metrics = $metrics;
-  }
-  public function getMetrics()
-  {
-    return $this->metrics;
-  }
-  public function setType($type)
-  {
-    $this->type = $type;
-  }
-  public function getType()
-  {
-    return $this->type;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/DoubleClickBidManager/Query.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/DoubleClickBidManager/Query.php
deleted file mode 100644
index bed6d208..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/DoubleClickBidManager/Query.php
+++ /dev/null
@@ -1,96 +0,0 @@
-kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setMetadata(Google_Service_DoubleClickBidManager_QueryMetadata $metadata)
-  {
-    $this->metadata = $metadata;
-  }
-  public function getMetadata()
-  {
-    return $this->metadata;
-  }
-  public function setParams(Google_Service_DoubleClickBidManager_Parameters $params)
-  {
-    $this->params = $params;
-  }
-  public function getParams()
-  {
-    return $this->params;
-  }
-  public function setQueryId($queryId)
-  {
-    $this->queryId = $queryId;
-  }
-  public function getQueryId()
-  {
-    return $this->queryId;
-  }
-  public function setReportDataEndTimeMs($reportDataEndTimeMs)
-  {
-    $this->reportDataEndTimeMs = $reportDataEndTimeMs;
-  }
-  public function getReportDataEndTimeMs()
-  {
-    return $this->reportDataEndTimeMs;
-  }
-  public function setReportDataStartTimeMs($reportDataStartTimeMs)
-  {
-    $this->reportDataStartTimeMs = $reportDataStartTimeMs;
-  }
-  public function getReportDataStartTimeMs()
-  {
-    return $this->reportDataStartTimeMs;
-  }
-  public function setSchedule(Google_Service_DoubleClickBidManager_QuerySchedule $schedule)
-  {
-    $this->schedule = $schedule;
-  }
-  public function getSchedule()
-  {
-    return $this->schedule;
-  }
-  public function setTimezoneCode($timezoneCode)
-  {
-    $this->timezoneCode = $timezoneCode;
-  }
-  public function getTimezoneCode()
-  {
-    return $this->timezoneCode;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/DoubleClickBidManager/QueryMetadata.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/DoubleClickBidManager/QueryMetadata.php
deleted file mode 100644
index 5409a6b9..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/DoubleClickBidManager/QueryMetadata.php
+++ /dev/null
@@ -1,121 +0,0 @@
-dataRange = $dataRange;
-  }
-  public function getDataRange()
-  {
-    return $this->dataRange;
-  }
-  public function setFormat($format)
-  {
-    $this->format = $format;
-  }
-  public function getFormat()
-  {
-    return $this->format;
-  }
-  public function setGoogleCloudStoragePathForLatestReport($googleCloudStoragePathForLatestReport)
-  {
-    $this->googleCloudStoragePathForLatestReport = $googleCloudStoragePathForLatestReport;
-  }
-  public function getGoogleCloudStoragePathForLatestReport()
-  {
-    return $this->googleCloudStoragePathForLatestReport;
-  }
-  public function setGoogleDrivePathForLatestReport($googleDrivePathForLatestReport)
-  {
-    $this->googleDrivePathForLatestReport = $googleDrivePathForLatestReport;
-  }
-  public function getGoogleDrivePathForLatestReport()
-  {
-    return $this->googleDrivePathForLatestReport;
-  }
-  public function setLatestReportRunTimeMs($latestReportRunTimeMs)
-  {
-    $this->latestReportRunTimeMs = $latestReportRunTimeMs;
-  }
-  public function getLatestReportRunTimeMs()
-  {
-    return $this->latestReportRunTimeMs;
-  }
-  public function setLocale($locale)
-  {
-    $this->locale = $locale;
-  }
-  public function getLocale()
-  {
-    return $this->locale;
-  }
-  public function setReportCount($reportCount)
-  {
-    $this->reportCount = $reportCount;
-  }
-  public function getReportCount()
-  {
-    return $this->reportCount;
-  }
-  public function setRunning($running)
-  {
-    $this->running = $running;
-  }
-  public function getRunning()
-  {
-    return $this->running;
-  }
-  public function setSendNotification($sendNotification)
-  {
-    $this->sendNotification = $sendNotification;
-  }
-  public function getSendNotification()
-  {
-    return $this->sendNotification;
-  }
-  public function setShareEmailAddress($shareEmailAddress)
-  {
-    $this->shareEmailAddress = $shareEmailAddress;
-  }
-  public function getShareEmailAddress()
-  {
-    return $this->shareEmailAddress;
-  }
-  public function setTitle($title)
-  {
-    $this->title = $title;
-  }
-  public function getTitle()
-  {
-    return $this->title;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/DoubleClickBidManager/QuerySchedule.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/DoubleClickBidManager/QuerySchedule.php
deleted file mode 100644
index 47268685..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/DoubleClickBidManager/QuerySchedule.php
+++ /dev/null
@@ -1,57 +0,0 @@
-endTimeMs = $endTimeMs;
-  }
-  public function getEndTimeMs()
-  {
-    return $this->endTimeMs;
-  }
-  public function setFrequency($frequency)
-  {
-    $this->frequency = $frequency;
-  }
-  public function getFrequency()
-  {
-    return $this->frequency;
-  }
-  public function setNextRunMinuteOfDay($nextRunMinuteOfDay)
-  {
-    $this->nextRunMinuteOfDay = $nextRunMinuteOfDay;
-  }
-  public function getNextRunMinuteOfDay()
-  {
-    return $this->nextRunMinuteOfDay;
-  }
-  public function setNextRunTimezoneCode($nextRunTimezoneCode)
-  {
-    $this->nextRunTimezoneCode = $nextRunTimezoneCode;
-  }
-  public function getNextRunTimezoneCode()
-  {
-    return $this->nextRunTimezoneCode;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/DoubleClickBidManager/Report.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/DoubleClickBidManager/Report.php
deleted file mode 100644
index 1a146db4..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/DoubleClickBidManager/Report.php
+++ /dev/null
@@ -1,51 +0,0 @@
-key = $key;
-  }
-  public function getKey()
-  {
-    return $this->key;
-  }
-  public function setMetadata(Google_Service_DoubleClickBidManager_ReportMetadata $metadata)
-  {
-    $this->metadata = $metadata;
-  }
-  public function getMetadata()
-  {
-    return $this->metadata;
-  }
-  public function setParams(Google_Service_DoubleClickBidManager_Parameters $params)
-  {
-    $this->params = $params;
-  }
-  public function getParams()
-  {
-    return $this->params;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/DoubleClickBidManager/ReportFailure.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/DoubleClickBidManager/ReportFailure.php
deleted file mode 100644
index 99be54fd..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/DoubleClickBidManager/ReportFailure.php
+++ /dev/null
@@ -1,30 +0,0 @@
-errorCode = $errorCode;
-  }
-  public function getErrorCode()
-  {
-    return $this->errorCode;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/DoubleClickBidManager/ReportKey.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/DoubleClickBidManager/ReportKey.php
deleted file mode 100644
index 7c1f30dc..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/DoubleClickBidManager/ReportKey.php
+++ /dev/null
@@ -1,39 +0,0 @@
-queryId = $queryId;
-  }
-  public function getQueryId()
-  {
-    return $this->queryId;
-  }
-  public function setReportId($reportId)
-  {
-    $this->reportId = $reportId;
-  }
-  public function getReportId()
-  {
-    return $this->reportId;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/DoubleClickBidManager/ReportMetadata.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/DoubleClickBidManager/ReportMetadata.php
deleted file mode 100644
index 8f4d9342..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/DoubleClickBidManager/ReportMetadata.php
+++ /dev/null
@@ -1,58 +0,0 @@
-googleCloudStoragePath = $googleCloudStoragePath;
-  }
-  public function getGoogleCloudStoragePath()
-  {
-    return $this->googleCloudStoragePath;
-  }
-  public function setReportDataEndTimeMs($reportDataEndTimeMs)
-  {
-    $this->reportDataEndTimeMs = $reportDataEndTimeMs;
-  }
-  public function getReportDataEndTimeMs()
-  {
-    return $this->reportDataEndTimeMs;
-  }
-  public function setReportDataStartTimeMs($reportDataStartTimeMs)
-  {
-    $this->reportDataStartTimeMs = $reportDataStartTimeMs;
-  }
-  public function getReportDataStartTimeMs()
-  {
-    return $this->reportDataStartTimeMs;
-  }
-  public function setStatus(Google_Service_DoubleClickBidManager_ReportStatus $status)
-  {
-    $this->status = $status;
-  }
-  public function getStatus()
-  {
-    return $this->status;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/DoubleClickBidManager/ReportStatus.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/DoubleClickBidManager/ReportStatus.php
deleted file mode 100644
index 83f35473..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/DoubleClickBidManager/ReportStatus.php
+++ /dev/null
@@ -1,58 +0,0 @@
-failure = $failure;
-  }
-  public function getFailure()
-  {
-    return $this->failure;
-  }
-  public function setFinishTimeMs($finishTimeMs)
-  {
-    $this->finishTimeMs = $finishTimeMs;
-  }
-  public function getFinishTimeMs()
-  {
-    return $this->finishTimeMs;
-  }
-  public function setFormat($format)
-  {
-    $this->format = $format;
-  }
-  public function getFormat()
-  {
-    return $this->format;
-  }
-  public function setState($state)
-  {
-    $this->state = $state;
-  }
-  public function getState()
-  {
-    return $this->state;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/DoubleClickBidManager/Resource/Lineitems.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/DoubleClickBidManager/Resource/Lineitems.php
deleted file mode 100644
index 4dc8fe19..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/DoubleClickBidManager/Resource/Lineitems.php
+++ /dev/null
@@ -1,54 +0,0 @@
-
- *   $doubleclickbidmanagerService = new Google_Service_DoubleClickBidManager(...);
- *   $lineitems = $doubleclickbidmanagerService->lineitems;
- *  
- */
-class Google_Service_DoubleClickBidManager_Resource_Lineitems extends Google_Service_Resource
-{
-  /**
-   * Retrieves line items in CSV format. (lineitems.downloadlineitems)
-   *
-   * @param Google_Service_DoubleClickBidManager_DownloadLineItemsRequest $postBody
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_DoubleClickBidManager_DownloadLineItemsResponse
-   */
-  public function downloadlineitems(Google_Service_DoubleClickBidManager_DownloadLineItemsRequest $postBody, $optParams = array())
-  {
-    $params = array('postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('downloadlineitems', array($params), "Google_Service_DoubleClickBidManager_DownloadLineItemsResponse");
-  }
-  /**
-   * Uploads line items in CSV format. (lineitems.uploadlineitems)
-   *
-   * @param Google_Service_DoubleClickBidManager_UploadLineItemsRequest $postBody
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_DoubleClickBidManager_UploadLineItemsResponse
-   */
-  public function uploadlineitems(Google_Service_DoubleClickBidManager_UploadLineItemsRequest $postBody, $optParams = array())
-  {
-    $params = array('postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('uploadlineitems', array($params), "Google_Service_DoubleClickBidManager_UploadLineItemsResponse");
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/DoubleClickBidManager/Resource/Queries.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/DoubleClickBidManager/Resource/Queries.php
deleted file mode 100644
index 86e13458..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/DoubleClickBidManager/Resource/Queries.php
+++ /dev/null
@@ -1,92 +0,0 @@
-
- *   $doubleclickbidmanagerService = new Google_Service_DoubleClickBidManager(...);
- *   $queries = $doubleclickbidmanagerService->queries;
- *  
- */
-class Google_Service_DoubleClickBidManager_Resource_Queries extends Google_Service_Resource
-{
-  /**
-   * Creates a query. (queries.createquery)
-   *
-   * @param Google_Service_DoubleClickBidManager_Query $postBody
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_DoubleClickBidManager_Query
-   */
-  public function createquery(Google_Service_DoubleClickBidManager_Query $postBody, $optParams = array())
-  {
-    $params = array('postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('createquery', array($params), "Google_Service_DoubleClickBidManager_Query");
-  }
-  /**
-   * Deletes a stored query as well as the associated stored reports.
-   * (queries.deletequery)
-   *
-   * @param string $queryId Query ID to delete.
-   * @param array $optParams Optional parameters.
-   */
-  public function deletequery($queryId, $optParams = array())
-  {
-    $params = array('queryId' => $queryId);
-    $params = array_merge($params, $optParams);
-    return $this->call('deletequery', array($params));
-  }
-  /**
-   * Retrieves a stored query. (queries.getquery)
-   *
-   * @param string $queryId Query ID to retrieve.
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_DoubleClickBidManager_Query
-   */
-  public function getquery($queryId, $optParams = array())
-  {
-    $params = array('queryId' => $queryId);
-    $params = array_merge($params, $optParams);
-    return $this->call('getquery', array($params), "Google_Service_DoubleClickBidManager_Query");
-  }
-  /**
-   * Retrieves stored queries. (queries.listqueries)
-   *
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_DoubleClickBidManager_ListQueriesResponse
-   */
-  public function listqueries($optParams = array())
-  {
-    $params = array();
-    $params = array_merge($params, $optParams);
-    return $this->call('listqueries', array($params), "Google_Service_DoubleClickBidManager_ListQueriesResponse");
-  }
-  /**
-   * Runs a stored query to generate a report. (queries.runquery)
-   *
-   * @param string $queryId Query ID to run.
-   * @param Google_Service_DoubleClickBidManager_RunQueryRequest $postBody
-   * @param array $optParams Optional parameters.
-   */
-  public function runquery($queryId, Google_Service_DoubleClickBidManager_RunQueryRequest $postBody, $optParams = array())
-  {
-    $params = array('queryId' => $queryId, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('runquery', array($params));
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/DoubleClickBidManager/Resource/Reports.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/DoubleClickBidManager/Resource/Reports.php
deleted file mode 100644
index a6e3e956..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/DoubleClickBidManager/Resource/Reports.php
+++ /dev/null
@@ -1,41 +0,0 @@
-
- *   $doubleclickbidmanagerService = new Google_Service_DoubleClickBidManager(...);
- *   $reports = $doubleclickbidmanagerService->reports;
- *  
- */
-class Google_Service_DoubleClickBidManager_Resource_Reports extends Google_Service_Resource
-{
-  /**
-   * Retrieves stored reports. (reports.listreports)
-   *
-   * @param string $queryId Query ID with which the reports are associated.
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_DoubleClickBidManager_ListReportsResponse
-   */
-  public function listreports($queryId, $optParams = array())
-  {
-    $params = array('queryId' => $queryId);
-    $params = array_merge($params, $optParams);
-    return $this->call('listreports', array($params), "Google_Service_DoubleClickBidManager_ListReportsResponse");
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/DoubleClickBidManager/Resource/Rubicon.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/DoubleClickBidManager/Resource/Rubicon.php
deleted file mode 100644
index e45fe907..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/DoubleClickBidManager/Resource/Rubicon.php
+++ /dev/null
@@ -1,41 +0,0 @@
-
- *   $doubleclickbidmanagerService = new Google_Service_DoubleClickBidManager(...);
- *   $rubicon = $doubleclickbidmanagerService->rubicon;
- *  
- */
-class Google_Service_DoubleClickBidManager_Resource_Rubicon extends Google_Service_Resource
-{
-  /**
-   * Update proposal upon actions of Rubicon publisher.
-   * (rubicon.notifyproposalchange)
-   *
-   * @param Google_Service_DoubleClickBidManager_NotifyProposalChangeRequest $postBody
-   * @param array $optParams Optional parameters.
-   */
-  public function notifyproposalchange(Google_Service_DoubleClickBidManager_NotifyProposalChangeRequest $postBody, $optParams = array())
-  {
-    $params = array('postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('notifyproposalchange', array($params));
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/DoubleClickBidManager/Resource/Sdf.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/DoubleClickBidManager/Resource/Sdf.php
deleted file mode 100644
index c94ee4a6..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/DoubleClickBidManager/Resource/Sdf.php
+++ /dev/null
@@ -1,41 +0,0 @@
-
- *   $doubleclickbidmanagerService = new Google_Service_DoubleClickBidManager(...);
- *   $sdf = $doubleclickbidmanagerService->sdf;
- *  
- */
-class Google_Service_DoubleClickBidManager_Resource_Sdf extends Google_Service_Resource
-{
-  /**
-   * Retrieves entities in SDF format. (sdf.download)
-   *
-   * @param Google_Service_DoubleClickBidManager_DownloadRequest $postBody
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_DoubleClickBidManager_DownloadResponse
-   */
-  public function download(Google_Service_DoubleClickBidManager_DownloadRequest $postBody, $optParams = array())
-  {
-    $params = array('postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('download', array($params), "Google_Service_DoubleClickBidManager_DownloadResponse");
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/DoubleClickBidManager/RowStatus.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/DoubleClickBidManager/RowStatus.php
deleted file mode 100644
index 5644fe13..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/DoubleClickBidManager/RowStatus.php
+++ /dev/null
@@ -1,76 +0,0 @@
-changed = $changed;
-  }
-  public function getChanged()
-  {
-    return $this->changed;
-  }
-  public function setEntityId($entityId)
-  {
-    $this->entityId = $entityId;
-  }
-  public function getEntityId()
-  {
-    return $this->entityId;
-  }
-  public function setEntityName($entityName)
-  {
-    $this->entityName = $entityName;
-  }
-  public function getEntityName()
-  {
-    return $this->entityName;
-  }
-  public function setErrors($errors)
-  {
-    $this->errors = $errors;
-  }
-  public function getErrors()
-  {
-    return $this->errors;
-  }
-  public function setPersisted($persisted)
-  {
-    $this->persisted = $persisted;
-  }
-  public function getPersisted()
-  {
-    return $this->persisted;
-  }
-  public function setRowNumber($rowNumber)
-  {
-    $this->rowNumber = $rowNumber;
-  }
-  public function getRowNumber()
-  {
-    return $this->rowNumber;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/DoubleClickBidManager/RunQueryRequest.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/DoubleClickBidManager/RunQueryRequest.php
deleted file mode 100644
index 3345b965..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/DoubleClickBidManager/RunQueryRequest.php
+++ /dev/null
@@ -1,57 +0,0 @@
-dataRange = $dataRange;
-  }
-  public function getDataRange()
-  {
-    return $this->dataRange;
-  }
-  public function setReportDataEndTimeMs($reportDataEndTimeMs)
-  {
-    $this->reportDataEndTimeMs = $reportDataEndTimeMs;
-  }
-  public function getReportDataEndTimeMs()
-  {
-    return $this->reportDataEndTimeMs;
-  }
-  public function setReportDataStartTimeMs($reportDataStartTimeMs)
-  {
-    $this->reportDataStartTimeMs = $reportDataStartTimeMs;
-  }
-  public function getReportDataStartTimeMs()
-  {
-    return $this->reportDataStartTimeMs;
-  }
-  public function setTimezoneCode($timezoneCode)
-  {
-    $this->timezoneCode = $timezoneCode;
-  }
-  public function getTimezoneCode()
-  {
-    return $this->timezoneCode;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/DoubleClickBidManager/UploadLineItemsRequest.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/DoubleClickBidManager/UploadLineItemsRequest.php
deleted file mode 100644
index bc26187c..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/DoubleClickBidManager/UploadLineItemsRequest.php
+++ /dev/null
@@ -1,48 +0,0 @@
-dryRun = $dryRun;
-  }
-  public function getDryRun()
-  {
-    return $this->dryRun;
-  }
-  public function setFormat($format)
-  {
-    $this->format = $format;
-  }
-  public function getFormat()
-  {
-    return $this->format;
-  }
-  public function setLineItems($lineItems)
-  {
-    $this->lineItems = $lineItems;
-  }
-  public function getLineItems()
-  {
-    return $this->lineItems;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/DoubleClickBidManager/UploadLineItemsResponse.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/DoubleClickBidManager/UploadLineItemsResponse.php
deleted file mode 100644
index ec9dc789..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/DoubleClickBidManager/UploadLineItemsResponse.php
+++ /dev/null
@@ -1,31 +0,0 @@
-uploadStatus = $uploadStatus;
-  }
-  public function getUploadStatus()
-  {
-    return $this->uploadStatus;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/DoubleClickBidManager/UploadStatus.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/DoubleClickBidManager/UploadStatus.php
deleted file mode 100644
index 258519c9..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/DoubleClickBidManager/UploadStatus.php
+++ /dev/null
@@ -1,41 +0,0 @@
-errors = $errors;
-  }
-  public function getErrors()
-  {
-    return $this->errors;
-  }
-  public function setRowStatus($rowStatus)
-  {
-    $this->rowStatus = $rowStatus;
-  }
-  public function getRowStatus()
-  {
-    return $this->rowStatus;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Doubleclicksearch.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Doubleclicksearch.php
deleted file mode 100644
index 6df519f3..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Doubleclicksearch.php
+++ /dev/null
@@ -1,242 +0,0 @@
-
- * Reports and modifies your advertising data in DoubleClick Search (for
- * example, campaigns, ad groups, keywords, and conversions).

- *
- * 

- * For more information about this service, see the API
- * Documentation
- * 

- *
- * @author Google, Inc.
- */
-class Google_Service_Doubleclicksearch extends Google_Service
-{
-  /** View and manage your advertising data in DoubleClick Search. */
-  const DOUBLECLICKSEARCH =
-      "https://www.googleapis.com/auth/doubleclicksearch";
-
-  public $conversion;
-  public $reports;
-  public $savedColumns;
-  
-  /**
-   * Constructs the internal representation of the Doubleclicksearch service.
-   *
-   * @param Google_Client $client
-   */
-  public function __construct(Google_Client $client)
-  {
-    parent::__construct($client);
-    $this->rootUrl = 'https://www.googleapis.com/';
-    $this->servicePath = 'doubleclicksearch/v2/';
-    $this->version = 'v2';
-    $this->serviceName = 'doubleclicksearch';
-
-    $this->conversion = new Google_Service_Doubleclicksearch_Resource_Conversion(
-        $this,
-        $this->serviceName,
-        'conversion',
-        array(
-          'methods' => array(
-            'get' => array(
-              'path' => 'agency/{agencyId}/advertiser/{advertiserId}/engine/{engineAccountId}/conversion',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'agencyId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'advertiserId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'engineAccountId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'endDate' => array(
-                  'location' => 'query',
-                  'type' => 'integer',
-                  'required' => true,
-                ),
-                'rowCount' => array(
-                  'location' => 'query',
-                  'type' => 'integer',
-                  'required' => true,
-                ),
-                'startDate' => array(
-                  'location' => 'query',
-                  'type' => 'integer',
-                  'required' => true,
-                ),
-                'startRow' => array(
-                  'location' => 'query',
-                  'type' => 'integer',
-                  'required' => true,
-                ),
-                'adGroupId' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'adId' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'campaignId' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'criterionId' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-              ),
-            ),'insert' => array(
-              'path' => 'conversion',
-              'httpMethod' => 'POST',
-              'parameters' => array(),
-            ),'patch' => array(
-              'path' => 'conversion',
-              'httpMethod' => 'PATCH',
-              'parameters' => array(
-                'advertiserId' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'agencyId' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'endDate' => array(
-                  'location' => 'query',
-                  'type' => 'integer',
-                  'required' => true,
-                ),
-                'engineAccountId' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'rowCount' => array(
-                  'location' => 'query',
-                  'type' => 'integer',
-                  'required' => true,
-                ),
-                'startDate' => array(
-                  'location' => 'query',
-                  'type' => 'integer',
-                  'required' => true,
-                ),
-                'startRow' => array(
-                  'location' => 'query',
-                  'type' => 'integer',
-                  'required' => true,
-                ),
-              ),
-            ),'update' => array(
-              'path' => 'conversion',
-              'httpMethod' => 'PUT',
-              'parameters' => array(),
-            ),'updateAvailability' => array(
-              'path' => 'conversion/updateAvailability',
-              'httpMethod' => 'POST',
-              'parameters' => array(),
-            ),
-          )
-        )
-    );
-    $this->reports = new Google_Service_Doubleclicksearch_Resource_Reports(
-        $this,
-        $this->serviceName,
-        'reports',
-        array(
-          'methods' => array(
-            'generate' => array(
-              'path' => 'reports/generate',
-              'httpMethod' => 'POST',
-              'parameters' => array(),
-            ),'get' => array(
-              'path' => 'reports/{reportId}',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'reportId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'getFile' => array(
-              'path' => 'reports/{reportId}/files/{reportFragment}',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'reportId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'reportFragment' => array(
-                  'location' => 'path',
-                  'type' => 'integer',
-                  'required' => true,
-                ),
-              ),
-            ),'request' => array(
-              'path' => 'reports',
-              'httpMethod' => 'POST',
-              'parameters' => array(),
-            ),
-          )
-        )
-    );
-    $this->savedColumns = new Google_Service_Doubleclicksearch_Resource_SavedColumns(
-        $this,
-        $this->serviceName,
-        'savedColumns',
-        array(
-          'methods' => array(
-            'list' => array(
-              'path' => 'agency/{agencyId}/advertiser/{advertiserId}/savedcolumns',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'agencyId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'advertiserId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),
-          )
-        )
-    );
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Doubleclicksearch/Availability.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Doubleclicksearch/Availability.php
deleted file mode 100644
index 9487d037..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Doubleclicksearch/Availability.php
+++ /dev/null
@@ -1,75 +0,0 @@
-advertiserId = $advertiserId;
-  }
-  public function getAdvertiserId()
-  {
-    return $this->advertiserId;
-  }
-  public function setAgencyId($agencyId)
-  {
-    $this->agencyId = $agencyId;
-  }
-  public function getAgencyId()
-  {
-    return $this->agencyId;
-  }
-  public function setAvailabilityTimestamp($availabilityTimestamp)
-  {
-    $this->availabilityTimestamp = $availabilityTimestamp;
-  }
-  public function getAvailabilityTimestamp()
-  {
-    return $this->availabilityTimestamp;
-  }
-  public function setSegmentationId($segmentationId)
-  {
-    $this->segmentationId = $segmentationId;
-  }
-  public function getSegmentationId()
-  {
-    return $this->segmentationId;
-  }
-  public function setSegmentationName($segmentationName)
-  {
-    $this->segmentationName = $segmentationName;
-  }
-  public function getSegmentationName()
-  {
-    return $this->segmentationName;
-  }
-  public function setSegmentationType($segmentationType)
-  {
-    $this->segmentationType = $segmentationType;
-  }
-  public function getSegmentationType()
-  {
-    return $this->segmentationType;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Doubleclicksearch/Conversion.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Doubleclicksearch/Conversion.php
deleted file mode 100644
index 8ea6e5b5..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Doubleclicksearch/Conversion.php
+++ /dev/null
@@ -1,321 +0,0 @@
-adGroupId = $adGroupId;
-  }
-  public function getAdGroupId()
-  {
-    return $this->adGroupId;
-  }
-  public function setAdId($adId)
-  {
-    $this->adId = $adId;
-  }
-  public function getAdId()
-  {
-    return $this->adId;
-  }
-  public function setAdvertiserId($advertiserId)
-  {
-    $this->advertiserId = $advertiserId;
-  }
-  public function getAdvertiserId()
-  {
-    return $this->advertiserId;
-  }
-  public function setAgencyId($agencyId)
-  {
-    $this->agencyId = $agencyId;
-  }
-  public function getAgencyId()
-  {
-    return $this->agencyId;
-  }
-  public function setAttributionModel($attributionModel)
-  {
-    $this->attributionModel = $attributionModel;
-  }
-  public function getAttributionModel()
-  {
-    return $this->attributionModel;
-  }
-  public function setCampaignId($campaignId)
-  {
-    $this->campaignId = $campaignId;
-  }
-  public function getCampaignId()
-  {
-    return $this->campaignId;
-  }
-  public function setChannel($channel)
-  {
-    $this->channel = $channel;
-  }
-  public function getChannel()
-  {
-    return $this->channel;
-  }
-  public function setClickId($clickId)
-  {
-    $this->clickId = $clickId;
-  }
-  public function getClickId()
-  {
-    return $this->clickId;
-  }
-  public function setConversionId($conversionId)
-  {
-    $this->conversionId = $conversionId;
-  }
-  public function getConversionId()
-  {
-    return $this->conversionId;
-  }
-  public function setConversionModifiedTimestamp($conversionModifiedTimestamp)
-  {
-    $this->conversionModifiedTimestamp = $conversionModifiedTimestamp;
-  }
-  public function getConversionModifiedTimestamp()
-  {
-    return $this->conversionModifiedTimestamp;
-  }
-  public function setConversionTimestamp($conversionTimestamp)
-  {
-    $this->conversionTimestamp = $conversionTimestamp;
-  }
-  public function getConversionTimestamp()
-  {
-    return $this->conversionTimestamp;
-  }
-  public function setCountMillis($countMillis)
-  {
-    $this->countMillis = $countMillis;
-  }
-  public function getCountMillis()
-  {
-    return $this->countMillis;
-  }
-  public function setCriterionId($criterionId)
-  {
-    $this->criterionId = $criterionId;
-  }
-  public function getCriterionId()
-  {
-    return $this->criterionId;
-  }
-  public function setCurrencyCode($currencyCode)
-  {
-    $this->currencyCode = $currencyCode;
-  }
-  public function getCurrencyCode()
-  {
-    return $this->currencyCode;
-  }
-  public function setCustomDimension($customDimension)
-  {
-    $this->customDimension = $customDimension;
-  }
-  public function getCustomDimension()
-  {
-    return $this->customDimension;
-  }
-  public function setCustomMetric($customMetric)
-  {
-    $this->customMetric = $customMetric;
-  }
-  public function getCustomMetric()
-  {
-    return $this->customMetric;
-  }
-  public function setDeviceType($deviceType)
-  {
-    $this->deviceType = $deviceType;
-  }
-  public function getDeviceType()
-  {
-    return $this->deviceType;
-  }
-  public function setDsConversionId($dsConversionId)
-  {
-    $this->dsConversionId = $dsConversionId;
-  }
-  public function getDsConversionId()
-  {
-    return $this->dsConversionId;
-  }
-  public function setEngineAccountId($engineAccountId)
-  {
-    $this->engineAccountId = $engineAccountId;
-  }
-  public function getEngineAccountId()
-  {
-    return $this->engineAccountId;
-  }
-  public function setFloodlightOrderId($floodlightOrderId)
-  {
-    $this->floodlightOrderId = $floodlightOrderId;
-  }
-  public function getFloodlightOrderId()
-  {
-    return $this->floodlightOrderId;
-  }
-  public function setInventoryAccountId($inventoryAccountId)
-  {
-    $this->inventoryAccountId = $inventoryAccountId;
-  }
-  public function getInventoryAccountId()
-  {
-    return $this->inventoryAccountId;
-  }
-  public function setProductCountry($productCountry)
-  {
-    $this->productCountry = $productCountry;
-  }
-  public function getProductCountry()
-  {
-    return $this->productCountry;
-  }
-  public function setProductGroupId($productGroupId)
-  {
-    $this->productGroupId = $productGroupId;
-  }
-  public function getProductGroupId()
-  {
-    return $this->productGroupId;
-  }
-  public function setProductId($productId)
-  {
-    $this->productId = $productId;
-  }
-  public function getProductId()
-  {
-    return $this->productId;
-  }
-  public function setProductLanguage($productLanguage)
-  {
-    $this->productLanguage = $productLanguage;
-  }
-  public function getProductLanguage()
-  {
-    return $this->productLanguage;
-  }
-  public function setQuantityMillis($quantityMillis)
-  {
-    $this->quantityMillis = $quantityMillis;
-  }
-  public function getQuantityMillis()
-  {
-    return $this->quantityMillis;
-  }
-  public function setRevenueMicros($revenueMicros)
-  {
-    $this->revenueMicros = $revenueMicros;
-  }
-  public function getRevenueMicros()
-  {
-    return $this->revenueMicros;
-  }
-  public function setSegmentationId($segmentationId)
-  {
-    $this->segmentationId = $segmentationId;
-  }
-  public function getSegmentationId()
-  {
-    return $this->segmentationId;
-  }
-  public function setSegmentationName($segmentationName)
-  {
-    $this->segmentationName = $segmentationName;
-  }
-  public function getSegmentationName()
-  {
-    return $this->segmentationName;
-  }
-  public function setSegmentationType($segmentationType)
-  {
-    $this->segmentationType = $segmentationType;
-  }
-  public function getSegmentationType()
-  {
-    return $this->segmentationType;
-  }
-  public function setState($state)
-  {
-    $this->state = $state;
-  }
-  public function getState()
-  {
-    return $this->state;
-  }
-  public function setStoreId($storeId)
-  {
-    $this->storeId = $storeId;
-  }
-  public function getStoreId()
-  {
-    return $this->storeId;
-  }
-  public function setType($type)
-  {
-    $this->type = $type;
-  }
-  public function getType()
-  {
-    return $this->type;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Doubleclicksearch/ConversionList.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Doubleclicksearch/ConversionList.php
deleted file mode 100644
index 14ec937d..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Doubleclicksearch/ConversionList.php
+++ /dev/null
@@ -1,41 +0,0 @@
-conversion = $conversion;
-  }
-  public function getConversion()
-  {
-    return $this->conversion;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Doubleclicksearch/CustomDimension.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Doubleclicksearch/CustomDimension.php
deleted file mode 100644
index 2df84411..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Doubleclicksearch/CustomDimension.php
+++ /dev/null
@@ -1,39 +0,0 @@
-name = $name;
-  }
-  public function getName()
-  {
-    return $this->name;
-  }
-  public function setValue($value)
-  {
-    $this->value = $value;
-  }
-  public function getValue()
-  {
-    return $this->value;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Doubleclicksearch/CustomMetric.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Doubleclicksearch/CustomMetric.php
deleted file mode 100644
index 3f499106..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Doubleclicksearch/CustomMetric.php
+++ /dev/null
@@ -1,39 +0,0 @@
-name = $name;
-  }
-  public function getName()
-  {
-    return $this->name;
-  }
-  public function setValue($value)
-  {
-    $this->value = $value;
-  }
-  public function getValue()
-  {
-    return $this->value;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Doubleclicksearch/Report.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Doubleclicksearch/Report.php
deleted file mode 100644
index 1b696dab..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Doubleclicksearch/Report.php
+++ /dev/null
@@ -1,105 +0,0 @@
-files = $files;
-  }
-  public function getFiles()
-  {
-    return $this->files;
-  }
-  public function setId($id)
-  {
-    $this->id = $id;
-  }
-  public function getId()
-  {
-    return $this->id;
-  }
-  public function setIsReportReady($isReportReady)
-  {
-    $this->isReportReady = $isReportReady;
-  }
-  public function getIsReportReady()
-  {
-    return $this->isReportReady;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setRequest(Google_Service_Doubleclicksearch_ReportRequest $request)
-  {
-    $this->request = $request;
-  }
-  public function getRequest()
-  {
-    return $this->request;
-  }
-  public function setRowCount($rowCount)
-  {
-    $this->rowCount = $rowCount;
-  }
-  public function getRowCount()
-  {
-    return $this->rowCount;
-  }
-  public function setRows($rows)
-  {
-    $this->rows = $rows;
-  }
-  public function getRows()
-  {
-    return $this->rows;
-  }
-  public function setStatisticsCurrencyCode($statisticsCurrencyCode)
-  {
-    $this->statisticsCurrencyCode = $statisticsCurrencyCode;
-  }
-  public function getStatisticsCurrencyCode()
-  {
-    return $this->statisticsCurrencyCode;
-  }
-  public function setStatisticsTimeZone($statisticsTimeZone)
-  {
-    $this->statisticsTimeZone = $statisticsTimeZone;
-  }
-  public function getStatisticsTimeZone()
-  {
-    return $this->statisticsTimeZone;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Doubleclicksearch/ReportApiColumnSpec.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Doubleclicksearch/ReportApiColumnSpec.php
deleted file mode 100644
index c4a3a4b1..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Doubleclicksearch/ReportApiColumnSpec.php
+++ /dev/null
@@ -1,111 +0,0 @@
-columnName = $columnName;
-  }
-  public function getColumnName()
-  {
-    return $this->columnName;
-  }
-  public function setCustomDimensionName($customDimensionName)
-  {
-    $this->customDimensionName = $customDimensionName;
-  }
-  public function getCustomDimensionName()
-  {
-    return $this->customDimensionName;
-  }
-  public function setCustomMetricName($customMetricName)
-  {
-    $this->customMetricName = $customMetricName;
-  }
-  public function getCustomMetricName()
-  {
-    return $this->customMetricName;
-  }
-  public function setEndDate($endDate)
-  {
-    $this->endDate = $endDate;
-  }
-  public function getEndDate()
-  {
-    return $this->endDate;
-  }
-  public function setGroupByColumn($groupByColumn)
-  {
-    $this->groupByColumn = $groupByColumn;
-  }
-  public function getGroupByColumn()
-  {
-    return $this->groupByColumn;
-  }
-  public function setHeaderText($headerText)
-  {
-    $this->headerText = $headerText;
-  }
-  public function getHeaderText()
-  {
-    return $this->headerText;
-  }
-  public function setPlatformSource($platformSource)
-  {
-    $this->platformSource = $platformSource;
-  }
-  public function getPlatformSource()
-  {
-    return $this->platformSource;
-  }
-  public function setProductReportPerspective($productReportPerspective)
-  {
-    $this->productReportPerspective = $productReportPerspective;
-  }
-  public function getProductReportPerspective()
-  {
-    return $this->productReportPerspective;
-  }
-  public function setSavedColumnName($savedColumnName)
-  {
-    $this->savedColumnName = $savedColumnName;
-  }
-  public function getSavedColumnName()
-  {
-    return $this->savedColumnName;
-  }
-  public function setStartDate($startDate)
-  {
-    $this->startDate = $startDate;
-  }
-  public function getStartDate()
-  {
-    return $this->startDate;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Doubleclicksearch/ReportFiles.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Doubleclicksearch/ReportFiles.php
deleted file mode 100644
index e0a0aaa6..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Doubleclicksearch/ReportFiles.php
+++ /dev/null
@@ -1,39 +0,0 @@
-byteCount = $byteCount;
-  }
-  public function getByteCount()
-  {
-    return $this->byteCount;
-  }
-  public function setUrl($url)
-  {
-    $this->url = $url;
-  }
-  public function getUrl()
-  {
-    return $this->url;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Doubleclicksearch/ReportRequest.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Doubleclicksearch/ReportRequest.php
deleted file mode 100644
index 8fb74a78..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Doubleclicksearch/ReportRequest.php
+++ /dev/null
@@ -1,153 +0,0 @@
-columns = $columns;
-  }
-  public function getColumns()
-  {
-    return $this->columns;
-  }
-  public function setDownloadFormat($downloadFormat)
-  {
-    $this->downloadFormat = $downloadFormat;
-  }
-  public function getDownloadFormat()
-  {
-    return $this->downloadFormat;
-  }
-  public function setFilters($filters)
-  {
-    $this->filters = $filters;
-  }
-  public function getFilters()
-  {
-    return $this->filters;
-  }
-  public function setIncludeDeletedEntities($includeDeletedEntities)
-  {
-    $this->includeDeletedEntities = $includeDeletedEntities;
-  }
-  public function getIncludeDeletedEntities()
-  {
-    return $this->includeDeletedEntities;
-  }
-  public function setIncludeRemovedEntities($includeRemovedEntities)
-  {
-    $this->includeRemovedEntities = $includeRemovedEntities;
-  }
-  public function getIncludeRemovedEntities()
-  {
-    return $this->includeRemovedEntities;
-  }
-  public function setMaxRowsPerFile($maxRowsPerFile)
-  {
-    $this->maxRowsPerFile = $maxRowsPerFile;
-  }
-  public function getMaxRowsPerFile()
-  {
-    return $this->maxRowsPerFile;
-  }
-  public function setOrderBy($orderBy)
-  {
-    $this->orderBy = $orderBy;
-  }
-  public function getOrderBy()
-  {
-    return $this->orderBy;
-  }
-  public function setReportScope(Google_Service_Doubleclicksearch_ReportRequestReportScope $reportScope)
-  {
-    $this->reportScope = $reportScope;
-  }
-  public function getReportScope()
-  {
-    return $this->reportScope;
-  }
-  public function setReportType($reportType)
-  {
-    $this->reportType = $reportType;
-  }
-  public function getReportType()
-  {
-    return $this->reportType;
-  }
-  public function setRowCount($rowCount)
-  {
-    $this->rowCount = $rowCount;
-  }
-  public function getRowCount()
-  {
-    return $this->rowCount;
-  }
-  public function setStartRow($startRow)
-  {
-    $this->startRow = $startRow;
-  }
-  public function getStartRow()
-  {
-    return $this->startRow;
-  }
-  public function setStatisticsCurrency($statisticsCurrency)
-  {
-    $this->statisticsCurrency = $statisticsCurrency;
-  }
-  public function getStatisticsCurrency()
-  {
-    return $this->statisticsCurrency;
-  }
-  public function setTimeRange(Google_Service_Doubleclicksearch_ReportRequestTimeRange $timeRange)
-  {
-    $this->timeRange = $timeRange;
-  }
-  public function getTimeRange()
-  {
-    return $this->timeRange;
-  }
-  public function setVerifySingleTimeZone($verifySingleTimeZone)
-  {
-    $this->verifySingleTimeZone = $verifySingleTimeZone;
-  }
-  public function getVerifySingleTimeZone()
-  {
-    return $this->verifySingleTimeZone;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Doubleclicksearch/ReportRequestFilters.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Doubleclicksearch/ReportRequestFilters.php
deleted file mode 100644
index b3329743..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Doubleclicksearch/ReportRequestFilters.php
+++ /dev/null
@@ -1,50 +0,0 @@
-column = $column;
-  }
-  public function getColumn()
-  {
-    return $this->column;
-  }
-  public function setOperator($operator)
-  {
-    $this->operator = $operator;
-  }
-  public function getOperator()
-  {
-    return $this->operator;
-  }
-  public function setValues($values)
-  {
-    $this->values = $values;
-  }
-  public function getValues()
-  {
-    return $this->values;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Doubleclicksearch/ReportRequestOrderBy.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Doubleclicksearch/ReportRequestOrderBy.php
deleted file mode 100644
index c2967c6c..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Doubleclicksearch/ReportRequestOrderBy.php
+++ /dev/null
@@ -1,40 +0,0 @@
-column = $column;
-  }
-  public function getColumn()
-  {
-    return $this->column;
-  }
-  public function setSortOrder($sortOrder)
-  {
-    $this->sortOrder = $sortOrder;
-  }
-  public function getSortOrder()
-  {
-    return $this->sortOrder;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Doubleclicksearch/ReportRequestReportScope.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Doubleclicksearch/ReportRequestReportScope.php
deleted file mode 100644
index 2323f7a6..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Doubleclicksearch/ReportRequestReportScope.php
+++ /dev/null
@@ -1,84 +0,0 @@
-adGroupId = $adGroupId;
-  }
-  public function getAdGroupId()
-  {
-    return $this->adGroupId;
-  }
-  public function setAdId($adId)
-  {
-    $this->adId = $adId;
-  }
-  public function getAdId()
-  {
-    return $this->adId;
-  }
-  public function setAdvertiserId($advertiserId)
-  {
-    $this->advertiserId = $advertiserId;
-  }
-  public function getAdvertiserId()
-  {
-    return $this->advertiserId;
-  }
-  public function setAgencyId($agencyId)
-  {
-    $this->agencyId = $agencyId;
-  }
-  public function getAgencyId()
-  {
-    return $this->agencyId;
-  }
-  public function setCampaignId($campaignId)
-  {
-    $this->campaignId = $campaignId;
-  }
-  public function getCampaignId()
-  {
-    return $this->campaignId;
-  }
-  public function setEngineAccountId($engineAccountId)
-  {
-    $this->engineAccountId = $engineAccountId;
-  }
-  public function getEngineAccountId()
-  {
-    return $this->engineAccountId;
-  }
-  public function setKeywordId($keywordId)
-  {
-    $this->keywordId = $keywordId;
-  }
-  public function getKeywordId()
-  {
-    return $this->keywordId;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Doubleclicksearch/ReportRequestTimeRange.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Doubleclicksearch/ReportRequestTimeRange.php
deleted file mode 100644
index d8c6338e..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Doubleclicksearch/ReportRequestTimeRange.php
+++ /dev/null
@@ -1,57 +0,0 @@
-changedAttributesSinceTimestamp = $changedAttributesSinceTimestamp;
-  }
-  public function getChangedAttributesSinceTimestamp()
-  {
-    return $this->changedAttributesSinceTimestamp;
-  }
-  public function setChangedMetricsSinceTimestamp($changedMetricsSinceTimestamp)
-  {
-    $this->changedMetricsSinceTimestamp = $changedMetricsSinceTimestamp;
-  }
-  public function getChangedMetricsSinceTimestamp()
-  {
-    return $this->changedMetricsSinceTimestamp;
-  }
-  public function setEndDate($endDate)
-  {
-    $this->endDate = $endDate;
-  }
-  public function getEndDate()
-  {
-    return $this->endDate;
-  }
-  public function setStartDate($startDate)
-  {
-    $this->startDate = $startDate;
-  }
-  public function getStartDate()
-  {
-    return $this->startDate;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Doubleclicksearch/Resource/Conversion.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Doubleclicksearch/Resource/Conversion.php
deleted file mode 100644
index b7d6342e..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Doubleclicksearch/Resource/Conversion.php
+++ /dev/null
@@ -1,121 +0,0 @@
-
- *   $doubleclicksearchService = new Google_Service_Doubleclicksearch(...);
- *   $conversion = $doubleclicksearchService->conversion;
- *  
- */
-class Google_Service_Doubleclicksearch_Resource_Conversion extends Google_Service_Resource
-{
-  /**
-   * Retrieves a list of conversions from a DoubleClick Search engine account.
-   * (conversion.get)
-   *
-   * @param string $agencyId Numeric ID of the agency.
-   * @param string $advertiserId Numeric ID of the advertiser.
-   * @param string $engineAccountId Numeric ID of the engine account.
-   * @param int $endDate Last date (inclusive) on which to retrieve conversions.
-   * Format is yyyymmdd.
-   * @param int $rowCount The number of conversions to return per call.
-   * @param int $startDate First date (inclusive) on which to retrieve
-   * conversions. Format is yyyymmdd.
-   * @param string $startRow The 0-based starting index for retrieving conversions
-   * results.
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param string adGroupId Numeric ID of the ad group.
-   * @opt_param string adId Numeric ID of the ad.
-   * @opt_param string campaignId Numeric ID of the campaign.
-   * @opt_param string criterionId Numeric ID of the criterion.
-   * @return Google_Service_Doubleclicksearch_ConversionList
-   */
-  public function get($agencyId, $advertiserId, $engineAccountId, $endDate, $rowCount, $startDate, $startRow, $optParams = array())
-  {
-    $params = array('agencyId' => $agencyId, 'advertiserId' => $advertiserId, 'engineAccountId' => $engineAccountId, 'endDate' => $endDate, 'rowCount' => $rowCount, 'startDate' => $startDate, 'startRow' => $startRow);
-    $params = array_merge($params, $optParams);
-    return $this->call('get', array($params), "Google_Service_Doubleclicksearch_ConversionList");
-  }
-  /**
-   * Inserts a batch of new conversions into DoubleClick Search.
-   * (conversion.insert)
-   *
-   * @param Google_Service_Doubleclicksearch_ConversionList $postBody
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Doubleclicksearch_ConversionList
-   */
-  public function insert(Google_Service_Doubleclicksearch_ConversionList $postBody, $optParams = array())
-  {
-    $params = array('postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('insert', array($params), "Google_Service_Doubleclicksearch_ConversionList");
-  }
-  /**
-   * Updates a batch of conversions in DoubleClick Search. This method supports
-   * patch semantics. (conversion.patch)
-   *
-   * @param string $advertiserId Numeric ID of the advertiser.
-   * @param string $agencyId Numeric ID of the agency.
-   * @param int $endDate Last date (inclusive) on which to retrieve conversions.
-   * Format is yyyymmdd.
-   * @param string $engineAccountId Numeric ID of the engine account.
-   * @param int $rowCount The number of conversions to return per call.
-   * @param int $startDate First date (inclusive) on which to retrieve
-   * conversions. Format is yyyymmdd.
-   * @param string $startRow The 0-based starting index for retrieving conversions
-   * results.
-   * @param Google_Service_Doubleclicksearch_ConversionList $postBody
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Doubleclicksearch_ConversionList
-   */
-  public function patch($advertiserId, $agencyId, $endDate, $engineAccountId, $rowCount, $startDate, $startRow, Google_Service_Doubleclicksearch_ConversionList $postBody, $optParams = array())
-  {
-    $params = array('advertiserId' => $advertiserId, 'agencyId' => $agencyId, 'endDate' => $endDate, 'engineAccountId' => $engineAccountId, 'rowCount' => $rowCount, 'startDate' => $startDate, 'startRow' => $startRow, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('patch', array($params), "Google_Service_Doubleclicksearch_ConversionList");
-  }
-  /**
-   * Updates a batch of conversions in DoubleClick Search. (conversion.update)
-   *
-   * @param Google_Service_Doubleclicksearch_ConversionList $postBody
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Doubleclicksearch_ConversionList
-   */
-  public function update(Google_Service_Doubleclicksearch_ConversionList $postBody, $optParams = array())
-  {
-    $params = array('postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('update', array($params), "Google_Service_Doubleclicksearch_ConversionList");
-  }
-  /**
-   * Updates the availabilities of a batch of floodlight activities in DoubleClick
-   * Search. (conversion.updateAvailability)
-   *
-   * @param Google_Service_Doubleclicksearch_UpdateAvailabilityRequest $postBody
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Doubleclicksearch_UpdateAvailabilityResponse
-   */
-  public function updateAvailability(Google_Service_Doubleclicksearch_UpdateAvailabilityRequest $postBody, $optParams = array())
-  {
-    $params = array('postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('updateAvailability', array($params), "Google_Service_Doubleclicksearch_UpdateAvailabilityResponse");
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Doubleclicksearch/Resource/Reports.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Doubleclicksearch/Resource/Reports.php
deleted file mode 100644
index 51f76f13..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Doubleclicksearch/Resource/Reports.php
+++ /dev/null
@@ -1,80 +0,0 @@
-
- *   $doubleclicksearchService = new Google_Service_Doubleclicksearch(...);
- *   $reports = $doubleclicksearchService->reports;
- *  
- */
-class Google_Service_Doubleclicksearch_Resource_Reports extends Google_Service_Resource
-{
-  /**
-   * Generates and returns a report immediately. (reports.generate)
-   *
-   * @param Google_Service_Doubleclicksearch_ReportRequest $postBody
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Doubleclicksearch_Report
-   */
-  public function generate(Google_Service_Doubleclicksearch_ReportRequest $postBody, $optParams = array())
-  {
-    $params = array('postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('generate', array($params), "Google_Service_Doubleclicksearch_Report");
-  }
-  /**
-   * Polls for the status of a report request. (reports.get)
-   *
-   * @param string $reportId ID of the report request being polled.
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Doubleclicksearch_Report
-   */
-  public function get($reportId, $optParams = array())
-  {
-    $params = array('reportId' => $reportId);
-    $params = array_merge($params, $optParams);
-    return $this->call('get', array($params), "Google_Service_Doubleclicksearch_Report");
-  }
-  /**
-   * Downloads a report file encoded in UTF-8. (reports.getFile)
-   *
-   * @param string $reportId ID of the report.
-   * @param int $reportFragment The index of the report fragment to download.
-   * @param array $optParams Optional parameters.
-   */
-  public function getFile($reportId, $reportFragment, $optParams = array())
-  {
-    $params = array('reportId' => $reportId, 'reportFragment' => $reportFragment);
-    $params = array_merge($params, $optParams);
-    return $this->call('getFile', array($params));
-  }
-  /**
-   * Inserts a report request into the reporting system. (reports.request)
-   *
-   * @param Google_Service_Doubleclicksearch_ReportRequest $postBody
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Doubleclicksearch_Report
-   */
-  public function request(Google_Service_Doubleclicksearch_ReportRequest $postBody, $optParams = array())
-  {
-    $params = array('postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('request', array($params), "Google_Service_Doubleclicksearch_Report");
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Doubleclicksearch/Resource/SavedColumns.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Doubleclicksearch/Resource/SavedColumns.php
deleted file mode 100644
index 52783ab0..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Doubleclicksearch/Resource/SavedColumns.php
+++ /dev/null
@@ -1,43 +0,0 @@
-
- *   $doubleclicksearchService = new Google_Service_Doubleclicksearch(...);
- *   $savedColumns = $doubleclicksearchService->savedColumns;
- *  
- */
-class Google_Service_Doubleclicksearch_Resource_SavedColumns extends Google_Service_Resource
-{
-  /**
-   * Retrieve the list of saved columns for a specified advertiser.
-   * (savedColumns.listSavedColumns)
-   *
-   * @param string $agencyId DS ID of the agency.
-   * @param string $advertiserId DS ID of the advertiser.
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Doubleclicksearch_SavedColumnList
-   */
-  public function listSavedColumns($agencyId, $advertiserId, $optParams = array())
-  {
-    $params = array('agencyId' => $agencyId, 'advertiserId' => $advertiserId);
-    $params = array_merge($params, $optParams);
-    return $this->call('list', array($params), "Google_Service_Doubleclicksearch_SavedColumnList");
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Doubleclicksearch/SavedColumn.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Doubleclicksearch/SavedColumn.php
deleted file mode 100644
index 2328e440..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Doubleclicksearch/SavedColumn.php
+++ /dev/null
@@ -1,48 +0,0 @@
-kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setSavedColumnName($savedColumnName)
-  {
-    $this->savedColumnName = $savedColumnName;
-  }
-  public function getSavedColumnName()
-  {
-    return $this->savedColumnName;
-  }
-  public function setType($type)
-  {
-    $this->type = $type;
-  }
-  public function getType()
-  {
-    return $this->type;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Doubleclicksearch/SavedColumnList.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Doubleclicksearch/SavedColumnList.php
deleted file mode 100644
index 1eab97b4..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Doubleclicksearch/SavedColumnList.php
+++ /dev/null
@@ -1,41 +0,0 @@
-items = $items;
-  }
-  public function getItems()
-  {
-    return $this->items;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Doubleclicksearch/UpdateAvailabilityRequest.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Doubleclicksearch/UpdateAvailabilityRequest.php
deleted file mode 100644
index aab3acbd..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Doubleclicksearch/UpdateAvailabilityRequest.php
+++ /dev/null
@@ -1,32 +0,0 @@
-availabilities = $availabilities;
-  }
-  public function getAvailabilities()
-  {
-    return $this->availabilities;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Doubleclicksearch/UpdateAvailabilityResponse.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Doubleclicksearch/UpdateAvailabilityResponse.php
deleted file mode 100644
index 7e43f5a6..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Doubleclicksearch/UpdateAvailabilityResponse.php
+++ /dev/null
@@ -1,32 +0,0 @@
-availabilities = $availabilities;
-  }
-  public function getAvailabilities()
-  {
-    return $this->availabilities;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Drive.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Drive.php
deleted file mode 100644
index 8bfdfe79..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Drive.php
+++ /dev/null
@@ -1,914 +0,0 @@
-
- * Manages files in Drive including uploading, downloading, searching, detecting
- * changes, and updating sharing permissions.

- *
- * 

- * For more information about this service, see the API
- * Documentation
- * 

- *
- * @author Google, Inc.
- */
-class Google_Service_Drive extends Google_Service
-{
-  /** View and manage the files in your Google Drive. */
-  const DRIVE =
-      "https://www.googleapis.com/auth/drive";
-  /** View and manage its own configuration data in your Google Drive. */
-  const DRIVE_APPDATA =
-      "https://www.googleapis.com/auth/drive.appdata";
-  /** View and manage Google Drive files and folders that you have opened or created with this app. */
-  const DRIVE_FILE =
-      "https://www.googleapis.com/auth/drive.file";
-  /** View and manage metadata of files in your Google Drive. */
-  const DRIVE_METADATA =
-      "https://www.googleapis.com/auth/drive.metadata";
-  /** View metadata for files in your Google Drive. */
-  const DRIVE_METADATA_READONLY =
-      "https://www.googleapis.com/auth/drive.metadata.readonly";
-  /** View the photos, videos and albums in your Google Photos. */
-  const DRIVE_PHOTOS_READONLY =
-      "https://www.googleapis.com/auth/drive.photos.readonly";
-  /** View the files in your Google Drive. */
-  const DRIVE_READONLY =
-      "https://www.googleapis.com/auth/drive.readonly";
-  /** Modify your Google Apps Script scripts' behavior. */
-  const DRIVE_SCRIPTS =
-      "https://www.googleapis.com/auth/drive.scripts";
-
-  public $about;
-  public $changes;
-  public $channels;
-  public $comments;
-  public $files;
-  public $permissions;
-  public $replies;
-  public $revisions;
-  public $teamdrives;
-  
-  /**
-   * Constructs the internal representation of the Drive service.
-   *
-   * @param Google_Client $client
-   */
-  public function __construct(Google_Client $client)
-  {
-    parent::__construct($client);
-    $this->rootUrl = 'https://www.googleapis.com/';
-    $this->servicePath = 'drive/v3/';
-    $this->version = 'v3';
-    $this->serviceName = 'drive';
-
-    $this->about = new Google_Service_Drive_Resource_About(
-        $this,
-        $this->serviceName,
-        'about',
-        array(
-          'methods' => array(
-            'get' => array(
-              'path' => 'about',
-              'httpMethod' => 'GET',
-              'parameters' => array(),
-            ),
-          )
-        )
-    );
-    $this->changes = new Google_Service_Drive_Resource_Changes(
-        $this,
-        $this->serviceName,
-        'changes',
-        array(
-          'methods' => array(
-            'getStartPageToken' => array(
-              'path' => 'changes/startPageToken',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'supportsTeamDrives' => array(
-                  'location' => 'query',
-                  'type' => 'boolean',
-                ),
-                'teamDriveId' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-              ),
-            ),'list' => array(
-              'path' => 'changes',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'pageToken' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'includeCorpusRemovals' => array(
-                  'location' => 'query',
-                  'type' => 'boolean',
-                ),
-                'includeRemoved' => array(
-                  'location' => 'query',
-                  'type' => 'boolean',
-                ),
-                'includeTeamDriveItems' => array(
-                  'location' => 'query',
-                  'type' => 'boolean',
-                ),
-                'pageSize' => array(
-                  'location' => 'query',
-                  'type' => 'integer',
-                ),
-                'restrictToMyDrive' => array(
-                  'location' => 'query',
-                  'type' => 'boolean',
-                ),
-                'spaces' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'supportsTeamDrives' => array(
-                  'location' => 'query',
-                  'type' => 'boolean',
-                ),
-                'teamDriveId' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-              ),
-            ),'watch' => array(
-              'path' => 'changes/watch',
-              'httpMethod' => 'POST',
-              'parameters' => array(
-                'pageToken' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'includeCorpusRemovals' => array(
-                  'location' => 'query',
-                  'type' => 'boolean',
-                ),
-                'includeRemoved' => array(
-                  'location' => 'query',
-                  'type' => 'boolean',
-                ),
-                'includeTeamDriveItems' => array(
-                  'location' => 'query',
-                  'type' => 'boolean',
-                ),
-                'pageSize' => array(
-                  'location' => 'query',
-                  'type' => 'integer',
-                ),
-                'restrictToMyDrive' => array(
-                  'location' => 'query',
-                  'type' => 'boolean',
-                ),
-                'spaces' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'supportsTeamDrives' => array(
-                  'location' => 'query',
-                  'type' => 'boolean',
-                ),
-                'teamDriveId' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-              ),
-            ),
-          )
-        )
-    );
-    $this->channels = new Google_Service_Drive_Resource_Channels(
-        $this,
-        $this->serviceName,
-        'channels',
-        array(
-          'methods' => array(
-            'stop' => array(
-              'path' => 'channels/stop',
-              'httpMethod' => 'POST',
-              'parameters' => array(),
-            ),
-          )
-        )
-    );
-    $this->comments = new Google_Service_Drive_Resource_Comments(
-        $this,
-        $this->serviceName,
-        'comments',
-        array(
-          'methods' => array(
-            'create' => array(
-              'path' => 'files/{fileId}/comments',
-              'httpMethod' => 'POST',
-              'parameters' => array(
-                'fileId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'delete' => array(
-              'path' => 'files/{fileId}/comments/{commentId}',
-              'httpMethod' => 'DELETE',
-              'parameters' => array(
-                'fileId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'commentId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'get' => array(
-              'path' => 'files/{fileId}/comments/{commentId}',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'fileId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'commentId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'includeDeleted' => array(
-                  'location' => 'query',
-                  'type' => 'boolean',
-                ),
-              ),
-            ),'list' => array(
-              'path' => 'files/{fileId}/comments',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'fileId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'includeDeleted' => array(
-                  'location' => 'query',
-                  'type' => 'boolean',
-                ),
-                'pageSize' => array(
-                  'location' => 'query',
-                  'type' => 'integer',
-                ),
-                'pageToken' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'startModifiedTime' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-              ),
-            ),'update' => array(
-              'path' => 'files/{fileId}/comments/{commentId}',
-              'httpMethod' => 'PATCH',
-              'parameters' => array(
-                'fileId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'commentId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),
-          )
-        )
-    );
-    $this->files = new Google_Service_Drive_Resource_Files(
-        $this,
-        $this->serviceName,
-        'files',
-        array(
-          'methods' => array(
-            'copy' => array(
-              'path' => 'files/{fileId}/copy',
-              'httpMethod' => 'POST',
-              'parameters' => array(
-                'fileId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'ignoreDefaultVisibility' => array(
-                  'location' => 'query',
-                  'type' => 'boolean',
-                ),
-                'keepRevisionForever' => array(
-                  'location' => 'query',
-                  'type' => 'boolean',
-                ),
-                'ocrLanguage' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'supportsTeamDrives' => array(
-                  'location' => 'query',
-                  'type' => 'boolean',
-                ),
-              ),
-            ),'create' => array(
-              'path' => 'files',
-              'httpMethod' => 'POST',
-              'parameters' => array(
-                'ignoreDefaultVisibility' => array(
-                  'location' => 'query',
-                  'type' => 'boolean',
-                ),
-                'keepRevisionForever' => array(
-                  'location' => 'query',
-                  'type' => 'boolean',
-                ),
-                'ocrLanguage' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'supportsTeamDrives' => array(
-                  'location' => 'query',
-                  'type' => 'boolean',
-                ),
-                'useContentAsIndexableText' => array(
-                  'location' => 'query',
-                  'type' => 'boolean',
-                ),
-              ),
-            ),'delete' => array(
-              'path' => 'files/{fileId}',
-              'httpMethod' => 'DELETE',
-              'parameters' => array(
-                'fileId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'supportsTeamDrives' => array(
-                  'location' => 'query',
-                  'type' => 'boolean',
-                ),
-              ),
-            ),'emptyTrash' => array(
-              'path' => 'files/trash',
-              'httpMethod' => 'DELETE',
-              'parameters' => array(),
-            ),'export' => array(
-              'path' => 'files/{fileId}/export',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'fileId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'mimeType' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'generateIds' => array(
-              'path' => 'files/generateIds',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'count' => array(
-                  'location' => 'query',
-                  'type' => 'integer',
-                ),
-                'space' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-              ),
-            ),'get' => array(
-              'path' => 'files/{fileId}',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'fileId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'acknowledgeAbuse' => array(
-                  'location' => 'query',
-                  'type' => 'boolean',
-                ),
-                'supportsTeamDrives' => array(
-                  'location' => 'query',
-                  'type' => 'boolean',
-                ),
-              ),
-            ),'list' => array(
-              'path' => 'files',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'corpora' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'corpus' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'includeTeamDriveItems' => array(
-                  'location' => 'query',
-                  'type' => 'boolean',
-                ),
-                'orderBy' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'pageSize' => array(
-                  'location' => 'query',
-                  'type' => 'integer',
-                ),
-                'pageToken' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'q' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'spaces' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'supportsTeamDrives' => array(
-                  'location' => 'query',
-                  'type' => 'boolean',
-                ),
-                'teamDriveId' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-              ),
-            ),'update' => array(
-              'path' => 'files/{fileId}',
-              'httpMethod' => 'PATCH',
-              'parameters' => array(
-                'fileId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'addParents' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'keepRevisionForever' => array(
-                  'location' => 'query',
-                  'type' => 'boolean',
-                ),
-                'ocrLanguage' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'removeParents' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'supportsTeamDrives' => array(
-                  'location' => 'query',
-                  'type' => 'boolean',
-                ),
-                'useContentAsIndexableText' => array(
-                  'location' => 'query',
-                  'type' => 'boolean',
-                ),
-              ),
-            ),'watch' => array(
-              'path' => 'files/{fileId}/watch',
-              'httpMethod' => 'POST',
-              'parameters' => array(
-                'fileId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'acknowledgeAbuse' => array(
-                  'location' => 'query',
-                  'type' => 'boolean',
-                ),
-                'supportsTeamDrives' => array(
-                  'location' => 'query',
-                  'type' => 'boolean',
-                ),
-              ),
-            ),
-          )
-        )
-    );
-    $this->permissions = new Google_Service_Drive_Resource_Permissions(
-        $this,
-        $this->serviceName,
-        'permissions',
-        array(
-          'methods' => array(
-            'create' => array(
-              'path' => 'files/{fileId}/permissions',
-              'httpMethod' => 'POST',
-              'parameters' => array(
-                'fileId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'emailMessage' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'sendNotificationEmail' => array(
-                  'location' => 'query',
-                  'type' => 'boolean',
-                ),
-                'supportsTeamDrives' => array(
-                  'location' => 'query',
-                  'type' => 'boolean',
-                ),
-                'transferOwnership' => array(
-                  'location' => 'query',
-                  'type' => 'boolean',
-                ),
-              ),
-            ),'delete' => array(
-              'path' => 'files/{fileId}/permissions/{permissionId}',
-              'httpMethod' => 'DELETE',
-              'parameters' => array(
-                'fileId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'permissionId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'supportsTeamDrives' => array(
-                  'location' => 'query',
-                  'type' => 'boolean',
-                ),
-              ),
-            ),'get' => array(
-              'path' => 'files/{fileId}/permissions/{permissionId}',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'fileId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'permissionId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'supportsTeamDrives' => array(
-                  'location' => 'query',
-                  'type' => 'boolean',
-                ),
-              ),
-            ),'list' => array(
-              'path' => 'files/{fileId}/permissions',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'fileId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'pageSize' => array(
-                  'location' => 'query',
-                  'type' => 'integer',
-                ),
-                'pageToken' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'supportsTeamDrives' => array(
-                  'location' => 'query',
-                  'type' => 'boolean',
-                ),
-              ),
-            ),'update' => array(
-              'path' => 'files/{fileId}/permissions/{permissionId}',
-              'httpMethod' => 'PATCH',
-              'parameters' => array(
-                'fileId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'permissionId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'removeExpiration' => array(
-                  'location' => 'query',
-                  'type' => 'boolean',
-                ),
-                'supportsTeamDrives' => array(
-                  'location' => 'query',
-                  'type' => 'boolean',
-                ),
-                'transferOwnership' => array(
-                  'location' => 'query',
-                  'type' => 'boolean',
-                ),
-              ),
-            ),
-          )
-        )
-    );
-    $this->replies = new Google_Service_Drive_Resource_Replies(
-        $this,
-        $this->serviceName,
-        'replies',
-        array(
-          'methods' => array(
-            'create' => array(
-              'path' => 'files/{fileId}/comments/{commentId}/replies',
-              'httpMethod' => 'POST',
-              'parameters' => array(
-                'fileId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'commentId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'delete' => array(
-              'path' => 'files/{fileId}/comments/{commentId}/replies/{replyId}',
-              'httpMethod' => 'DELETE',
-              'parameters' => array(
-                'fileId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'commentId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'replyId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'get' => array(
-              'path' => 'files/{fileId}/comments/{commentId}/replies/{replyId}',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'fileId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'commentId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'replyId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'includeDeleted' => array(
-                  'location' => 'query',
-                  'type' => 'boolean',
-                ),
-              ),
-            ),'list' => array(
-              'path' => 'files/{fileId}/comments/{commentId}/replies',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'fileId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'commentId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'includeDeleted' => array(
-                  'location' => 'query',
-                  'type' => 'boolean',
-                ),
-                'pageSize' => array(
-                  'location' => 'query',
-                  'type' => 'integer',
-                ),
-                'pageToken' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-              ),
-            ),'update' => array(
-              'path' => 'files/{fileId}/comments/{commentId}/replies/{replyId}',
-              'httpMethod' => 'PATCH',
-              'parameters' => array(
-                'fileId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'commentId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'replyId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),
-          )
-        )
-    );
-    $this->revisions = new Google_Service_Drive_Resource_Revisions(
-        $this,
-        $this->serviceName,
-        'revisions',
-        array(
-          'methods' => array(
-            'delete' => array(
-              'path' => 'files/{fileId}/revisions/{revisionId}',
-              'httpMethod' => 'DELETE',
-              'parameters' => array(
-                'fileId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'revisionId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'get' => array(
-              'path' => 'files/{fileId}/revisions/{revisionId}',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'fileId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'revisionId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'acknowledgeAbuse' => array(
-                  'location' => 'query',
-                  'type' => 'boolean',
-                ),
-              ),
-            ),'list' => array(
-              'path' => 'files/{fileId}/revisions',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'fileId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'pageSize' => array(
-                  'location' => 'query',
-                  'type' => 'integer',
-                ),
-                'pageToken' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-              ),
-            ),'update' => array(
-              'path' => 'files/{fileId}/revisions/{revisionId}',
-              'httpMethod' => 'PATCH',
-              'parameters' => array(
-                'fileId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'revisionId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),
-          )
-        )
-    );
-    $this->teamdrives = new Google_Service_Drive_Resource_Teamdrives(
-        $this,
-        $this->serviceName,
-        'teamdrives',
-        array(
-          'methods' => array(
-            'create' => array(
-              'path' => 'teamdrives',
-              'httpMethod' => 'POST',
-              'parameters' => array(
-                'requestId' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'delete' => array(
-              'path' => 'teamdrives/{teamDriveId}',
-              'httpMethod' => 'DELETE',
-              'parameters' => array(
-                'teamDriveId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'get' => array(
-              'path' => 'teamdrives/{teamDriveId}',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'teamDriveId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'list' => array(
-              'path' => 'teamdrives',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'pageSize' => array(
-                  'location' => 'query',
-                  'type' => 'integer',
-                ),
-                'pageToken' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-              ),
-            ),'update' => array(
-              'path' => 'teamdrives/{teamDriveId}',
-              'httpMethod' => 'PATCH',
-              'parameters' => array(
-                'teamDriveId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),
-          )
-        )
-    );
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Drive/About.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Drive/About.php
deleted file mode 100644
index 07d73694..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Drive/About.php
+++ /dev/null
@@ -1,105 +0,0 @@
-appInstalled = $appInstalled;
-  }
-  public function getAppInstalled()
-  {
-    return $this->appInstalled;
-  }
-  public function setExportFormats($exportFormats)
-  {
-    $this->exportFormats = $exportFormats;
-  }
-  public function getExportFormats()
-  {
-    return $this->exportFormats;
-  }
-  public function setFolderColorPalette($folderColorPalette)
-  {
-    $this->folderColorPalette = $folderColorPalette;
-  }
-  public function getFolderColorPalette()
-  {
-    return $this->folderColorPalette;
-  }
-  public function setImportFormats($importFormats)
-  {
-    $this->importFormats = $importFormats;
-  }
-  public function getImportFormats()
-  {
-    return $this->importFormats;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setMaxImportSizes($maxImportSizes)
-  {
-    $this->maxImportSizes = $maxImportSizes;
-  }
-  public function getMaxImportSizes()
-  {
-    return $this->maxImportSizes;
-  }
-  public function setMaxUploadSize($maxUploadSize)
-  {
-    $this->maxUploadSize = $maxUploadSize;
-  }
-  public function getMaxUploadSize()
-  {
-    return $this->maxUploadSize;
-  }
-  public function setStorageQuota(Google_Service_Drive_AboutStorageQuota $storageQuota)
-  {
-    $this->storageQuota = $storageQuota;
-  }
-  public function getStorageQuota()
-  {
-    return $this->storageQuota;
-  }
-  public function setUser(Google_Service_Drive_User $user)
-  {
-    $this->user = $user;
-  }
-  public function getUser()
-  {
-    return $this->user;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Drive/AboutStorageQuota.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Drive/AboutStorageQuota.php
deleted file mode 100644
index 67aa7530..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Drive/AboutStorageQuota.php
+++ /dev/null
@@ -1,57 +0,0 @@
-limit = $limit;
-  }
-  public function getLimit()
-  {
-    return $this->limit;
-  }
-  public function setUsage($usage)
-  {
-    $this->usage = $usage;
-  }
-  public function getUsage()
-  {
-    return $this->usage;
-  }
-  public function setUsageInDrive($usageInDrive)
-  {
-    $this->usageInDrive = $usageInDrive;
-  }
-  public function getUsageInDrive()
-  {
-    return $this->usageInDrive;
-  }
-  public function setUsageInDriveTrash($usageInDriveTrash)
-  {
-    $this->usageInDriveTrash = $usageInDriveTrash;
-  }
-  public function getUsageInDriveTrash()
-  {
-    return $this->usageInDriveTrash;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Drive/Change.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Drive/Change.php
deleted file mode 100644
index d4755a46..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Drive/Change.php
+++ /dev/null
@@ -1,95 +0,0 @@
-file = $file;
-  }
-  public function getFile()
-  {
-    return $this->file;
-  }
-  public function setFileId($fileId)
-  {
-    $this->fileId = $fileId;
-  }
-  public function getFileId()
-  {
-    return $this->fileId;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setRemoved($removed)
-  {
-    $this->removed = $removed;
-  }
-  public function getRemoved()
-  {
-    return $this->removed;
-  }
-  public function setTeamDrive(Google_Service_Drive_TeamDrive $teamDrive)
-  {
-    $this->teamDrive = $teamDrive;
-  }
-  public function getTeamDrive()
-  {
-    return $this->teamDrive;
-  }
-  public function setTeamDriveId($teamDriveId)
-  {
-    $this->teamDriveId = $teamDriveId;
-  }
-  public function getTeamDriveId()
-  {
-    return $this->teamDriveId;
-  }
-  public function setTime($time)
-  {
-    $this->time = $time;
-  }
-  public function getTime()
-  {
-    return $this->time;
-  }
-  public function setType($type)
-  {
-    $this->type = $type;
-  }
-  public function getType()
-  {
-    return $this->type;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Drive/ChangeList.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Drive/ChangeList.php
deleted file mode 100644
index 406447be..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Drive/ChangeList.php
+++ /dev/null
@@ -1,59 +0,0 @@
-changes = $changes;
-  }
-  public function getChanges()
-  {
-    return $this->changes;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setNewStartPageToken($newStartPageToken)
-  {
-    $this->newStartPageToken = $newStartPageToken;
-  }
-  public function getNewStartPageToken()
-  {
-    return $this->newStartPageToken;
-  }
-  public function setNextPageToken($nextPageToken)
-  {
-    $this->nextPageToken = $nextPageToken;
-  }
-  public function getNextPageToken()
-  {
-    return $this->nextPageToken;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Drive/Channel.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Drive/Channel.php
deleted file mode 100644
index e3208a3a..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Drive/Channel.php
+++ /dev/null
@@ -1,111 +0,0 @@
-address = $address;
-  }
-  public function getAddress()
-  {
-    return $this->address;
-  }
-  public function setExpiration($expiration)
-  {
-    $this->expiration = $expiration;
-  }
-  public function getExpiration()
-  {
-    return $this->expiration;
-  }
-  public function setId($id)
-  {
-    $this->id = $id;
-  }
-  public function getId()
-  {
-    return $this->id;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setParams($params)
-  {
-    $this->params = $params;
-  }
-  public function getParams()
-  {
-    return $this->params;
-  }
-  public function setPayload($payload)
-  {
-    $this->payload = $payload;
-  }
-  public function getPayload()
-  {
-    return $this->payload;
-  }
-  public function setResourceId($resourceId)
-  {
-    $this->resourceId = $resourceId;
-  }
-  public function getResourceId()
-  {
-    return $this->resourceId;
-  }
-  public function setResourceUri($resourceUri)
-  {
-    $this->resourceUri = $resourceUri;
-  }
-  public function getResourceUri()
-  {
-    return $this->resourceUri;
-  }
-  public function setToken($token)
-  {
-    $this->token = $token;
-  }
-  public function getToken()
-  {
-    return $this->token;
-  }
-  public function setType($type)
-  {
-    $this->type = $type;
-  }
-  public function getType()
-  {
-    return $this->type;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Drive/Comment.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Drive/Comment.php
deleted file mode 100644
index baa836d6..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Drive/Comment.php
+++ /dev/null
@@ -1,133 +0,0 @@
-anchor = $anchor;
-  }
-  public function getAnchor()
-  {
-    return $this->anchor;
-  }
-  public function setAuthor(Google_Service_Drive_User $author)
-  {
-    $this->author = $author;
-  }
-  public function getAuthor()
-  {
-    return $this->author;
-  }
-  public function setContent($content)
-  {
-    $this->content = $content;
-  }
-  public function getContent()
-  {
-    return $this->content;
-  }
-  public function setCreatedTime($createdTime)
-  {
-    $this->createdTime = $createdTime;
-  }
-  public function getCreatedTime()
-  {
-    return $this->createdTime;
-  }
-  public function setDeleted($deleted)
-  {
-    $this->deleted = $deleted;
-  }
-  public function getDeleted()
-  {
-    return $this->deleted;
-  }
-  public function setHtmlContent($htmlContent)
-  {
-    $this->htmlContent = $htmlContent;
-  }
-  public function getHtmlContent()
-  {
-    return $this->htmlContent;
-  }
-  public function setId($id)
-  {
-    $this->id = $id;
-  }
-  public function getId()
-  {
-    return $this->id;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setModifiedTime($modifiedTime)
-  {
-    $this->modifiedTime = $modifiedTime;
-  }
-  public function getModifiedTime()
-  {
-    return $this->modifiedTime;
-  }
-  public function setQuotedFileContent(Google_Service_Drive_CommentQuotedFileContent $quotedFileContent)
-  {
-    $this->quotedFileContent = $quotedFileContent;
-  }
-  public function getQuotedFileContent()
-  {
-    return $this->quotedFileContent;
-  }
-  public function setReplies($replies)
-  {
-    $this->replies = $replies;
-  }
-  public function getReplies()
-  {
-    return $this->replies;
-  }
-  public function setResolved($resolved)
-  {
-    $this->resolved = $resolved;
-  }
-  public function getResolved()
-  {
-    return $this->resolved;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Drive/CommentList.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Drive/CommentList.php
deleted file mode 100644
index d6b49c46..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Drive/CommentList.php
+++ /dev/null
@@ -1,50 +0,0 @@
-comments = $comments;
-  }
-  public function getComments()
-  {
-    return $this->comments;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setNextPageToken($nextPageToken)
-  {
-    $this->nextPageToken = $nextPageToken;
-  }
-  public function getNextPageToken()
-  {
-    return $this->nextPageToken;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Drive/CommentQuotedFileContent.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Drive/CommentQuotedFileContent.php
deleted file mode 100644
index 9a257728..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Drive/CommentQuotedFileContent.php
+++ /dev/null
@@ -1,39 +0,0 @@
-mimeType = $mimeType;
-  }
-  public function getMimeType()
-  {
-    return $this->mimeType;
-  }
-  public function setValue($value)
-  {
-    $this->value = $value;
-  }
-  public function getValue()
-  {
-    return $this->value;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Drive/DriveFile.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Drive/DriveFile.php
deleted file mode 100644
index 36fb42d4..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Drive/DriveFile.php
+++ /dev/null
@@ -1,490 +0,0 @@
-appProperties = $appProperties;
-  }
-  public function getAppProperties()
-  {
-    return $this->appProperties;
-  }
-  public function setCapabilities(Google_Service_Drive_DriveFileCapabilities $capabilities)
-  {
-    $this->capabilities = $capabilities;
-  }
-  public function getCapabilities()
-  {
-    return $this->capabilities;
-  }
-  public function setContentHints(Google_Service_Drive_DriveFileContentHints $contentHints)
-  {
-    $this->contentHints = $contentHints;
-  }
-  public function getContentHints()
-  {
-    return $this->contentHints;
-  }
-  public function setCreatedTime($createdTime)
-  {
-    $this->createdTime = $createdTime;
-  }
-  public function getCreatedTime()
-  {
-    return $this->createdTime;
-  }
-  public function setDescription($description)
-  {
-    $this->description = $description;
-  }
-  public function getDescription()
-  {
-    return $this->description;
-  }
-  public function setExplicitlyTrashed($explicitlyTrashed)
-  {
-    $this->explicitlyTrashed = $explicitlyTrashed;
-  }
-  public function getExplicitlyTrashed()
-  {
-    return $this->explicitlyTrashed;
-  }
-  public function setFileExtension($fileExtension)
-  {
-    $this->fileExtension = $fileExtension;
-  }
-  public function getFileExtension()
-  {
-    return $this->fileExtension;
-  }
-  public function setFolderColorRgb($folderColorRgb)
-  {
-    $this->folderColorRgb = $folderColorRgb;
-  }
-  public function getFolderColorRgb()
-  {
-    return $this->folderColorRgb;
-  }
-  public function setFullFileExtension($fullFileExtension)
-  {
-    $this->fullFileExtension = $fullFileExtension;
-  }
-  public function getFullFileExtension()
-  {
-    return $this->fullFileExtension;
-  }
-  public function setHasAugmentedPermissions($hasAugmentedPermissions)
-  {
-    $this->hasAugmentedPermissions = $hasAugmentedPermissions;
-  }
-  public function getHasAugmentedPermissions()
-  {
-    return $this->hasAugmentedPermissions;
-  }
-  public function setHasThumbnail($hasThumbnail)
-  {
-    $this->hasThumbnail = $hasThumbnail;
-  }
-  public function getHasThumbnail()
-  {
-    return $this->hasThumbnail;
-  }
-  public function setHeadRevisionId($headRevisionId)
-  {
-    $this->headRevisionId = $headRevisionId;
-  }
-  public function getHeadRevisionId()
-  {
-    return $this->headRevisionId;
-  }
-  public function setIconLink($iconLink)
-  {
-    $this->iconLink = $iconLink;
-  }
-  public function getIconLink()
-  {
-    return $this->iconLink;
-  }
-  public function setId($id)
-  {
-    $this->id = $id;
-  }
-  public function getId()
-  {
-    return $this->id;
-  }
-  public function setImageMediaMetadata(Google_Service_Drive_DriveFileImageMediaMetadata $imageMediaMetadata)
-  {
-    $this->imageMediaMetadata = $imageMediaMetadata;
-  }
-  public function getImageMediaMetadata()
-  {
-    return $this->imageMediaMetadata;
-  }
-  public function setIsAppAuthorized($isAppAuthorized)
-  {
-    $this->isAppAuthorized = $isAppAuthorized;
-  }
-  public function getIsAppAuthorized()
-  {
-    return $this->isAppAuthorized;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setLastModifyingUser(Google_Service_Drive_User $lastModifyingUser)
-  {
-    $this->lastModifyingUser = $lastModifyingUser;
-  }
-  public function getLastModifyingUser()
-  {
-    return $this->lastModifyingUser;
-  }
-  public function setMd5Checksum($md5Checksum)
-  {
-    $this->md5Checksum = $md5Checksum;
-  }
-  public function getMd5Checksum()
-  {
-    return $this->md5Checksum;
-  }
-  public function setMimeType($mimeType)
-  {
-    $this->mimeType = $mimeType;
-  }
-  public function getMimeType()
-  {
-    return $this->mimeType;
-  }
-  public function setModifiedByMe($modifiedByMe)
-  {
-    $this->modifiedByMe = $modifiedByMe;
-  }
-  public function getModifiedByMe()
-  {
-    return $this->modifiedByMe;
-  }
-  public function setModifiedByMeTime($modifiedByMeTime)
-  {
-    $this->modifiedByMeTime = $modifiedByMeTime;
-  }
-  public function getModifiedByMeTime()
-  {
-    return $this->modifiedByMeTime;
-  }
-  public function setModifiedTime($modifiedTime)
-  {
-    $this->modifiedTime = $modifiedTime;
-  }
-  public function getModifiedTime()
-  {
-    return $this->modifiedTime;
-  }
-  public function setName($name)
-  {
-    $this->name = $name;
-  }
-  public function getName()
-  {
-    return $this->name;
-  }
-  public function setOriginalFilename($originalFilename)
-  {
-    $this->originalFilename = $originalFilename;
-  }
-  public function getOriginalFilename()
-  {
-    return $this->originalFilename;
-  }
-  public function setOwnedByMe($ownedByMe)
-  {
-    $this->ownedByMe = $ownedByMe;
-  }
-  public function getOwnedByMe()
-  {
-    return $this->ownedByMe;
-  }
-  public function setOwners($owners)
-  {
-    $this->owners = $owners;
-  }
-  public function getOwners()
-  {
-    return $this->owners;
-  }
-  public function setParents($parents)
-  {
-    $this->parents = $parents;
-  }
-  public function getParents()
-  {
-    return $this->parents;
-  }
-  public function setPermissions($permissions)
-  {
-    $this->permissions = $permissions;
-  }
-  public function getPermissions()
-  {
-    return $this->permissions;
-  }
-  public function setProperties($properties)
-  {
-    $this->properties = $properties;
-  }
-  public function getProperties()
-  {
-    return $this->properties;
-  }
-  public function setQuotaBytesUsed($quotaBytesUsed)
-  {
-    $this->quotaBytesUsed = $quotaBytesUsed;
-  }
-  public function getQuotaBytesUsed()
-  {
-    return $this->quotaBytesUsed;
-  }
-  public function setShared($shared)
-  {
-    $this->shared = $shared;
-  }
-  public function getShared()
-  {
-    return $this->shared;
-  }
-  public function setSharedWithMeTime($sharedWithMeTime)
-  {
-    $this->sharedWithMeTime = $sharedWithMeTime;
-  }
-  public function getSharedWithMeTime()
-  {
-    return $this->sharedWithMeTime;
-  }
-  public function setSharingUser(Google_Service_Drive_User $sharingUser)
-  {
-    $this->sharingUser = $sharingUser;
-  }
-  public function getSharingUser()
-  {
-    return $this->sharingUser;
-  }
-  public function setSize($size)
-  {
-    $this->size = $size;
-  }
-  public function getSize()
-  {
-    return $this->size;
-  }
-  public function setSpaces($spaces)
-  {
-    $this->spaces = $spaces;
-  }
-  public function getSpaces()
-  {
-    return $this->spaces;
-  }
-  public function setStarred($starred)
-  {
-    $this->starred = $starred;
-  }
-  public function getStarred()
-  {
-    return $this->starred;
-  }
-  public function setTeamDriveId($teamDriveId)
-  {
-    $this->teamDriveId = $teamDriveId;
-  }
-  public function getTeamDriveId()
-  {
-    return $this->teamDriveId;
-  }
-  public function setThumbnailLink($thumbnailLink)
-  {
-    $this->thumbnailLink = $thumbnailLink;
-  }
-  public function getThumbnailLink()
-  {
-    return $this->thumbnailLink;
-  }
-  public function setThumbnailVersion($thumbnailVersion)
-  {
-    $this->thumbnailVersion = $thumbnailVersion;
-  }
-  public function getThumbnailVersion()
-  {
-    return $this->thumbnailVersion;
-  }
-  public function setTrashed($trashed)
-  {
-    $this->trashed = $trashed;
-  }
-  public function getTrashed()
-  {
-    return $this->trashed;
-  }
-  public function setTrashedTime($trashedTime)
-  {
-    $this->trashedTime = $trashedTime;
-  }
-  public function getTrashedTime()
-  {
-    return $this->trashedTime;
-  }
-  public function setTrashingUser(Google_Service_Drive_User $trashingUser)
-  {
-    $this->trashingUser = $trashingUser;
-  }
-  public function getTrashingUser()
-  {
-    return $this->trashingUser;
-  }
-  public function setVersion($version)
-  {
-    $this->version = $version;
-  }
-  public function getVersion()
-  {
-    return $this->version;
-  }
-  public function setVideoMediaMetadata(Google_Service_Drive_DriveFileVideoMediaMetadata $videoMediaMetadata)
-  {
-    $this->videoMediaMetadata = $videoMediaMetadata;
-  }
-  public function getVideoMediaMetadata()
-  {
-    return $this->videoMediaMetadata;
-  }
-  public function setViewedByMe($viewedByMe)
-  {
-    $this->viewedByMe = $viewedByMe;
-  }
-  public function getViewedByMe()
-  {
-    return $this->viewedByMe;
-  }
-  public function setViewedByMeTime($viewedByMeTime)
-  {
-    $this->viewedByMeTime = $viewedByMeTime;
-  }
-  public function getViewedByMeTime()
-  {
-    return $this->viewedByMeTime;
-  }
-  public function setViewersCanCopyContent($viewersCanCopyContent)
-  {
-    $this->viewersCanCopyContent = $viewersCanCopyContent;
-  }
-  public function getViewersCanCopyContent()
-  {
-    return $this->viewersCanCopyContent;
-  }
-  public function setWebContentLink($webContentLink)
-  {
-    $this->webContentLink = $webContentLink;
-  }
-  public function getWebContentLink()
-  {
-    return $this->webContentLink;
-  }
-  public function setWebViewLink($webViewLink)
-  {
-    $this->webViewLink = $webViewLink;
-  }
-  public function getWebViewLink()
-  {
-    return $this->webViewLink;
-  }
-  public function setWritersCanShare($writersCanShare)
-  {
-    $this->writersCanShare = $writersCanShare;
-  }
-  public function getWritersCanShare()
-  {
-    return $this->writersCanShare;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Drive/DriveFileCapabilities.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Drive/DriveFileCapabilities.php
deleted file mode 100644
index af3ffda7..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Drive/DriveFileCapabilities.php
+++ /dev/null
@@ -1,165 +0,0 @@
-canAddChildren = $canAddChildren;
-  }
-  public function getCanAddChildren()
-  {
-    return $this->canAddChildren;
-  }
-  public function setCanComment($canComment)
-  {
-    $this->canComment = $canComment;
-  }
-  public function getCanComment()
-  {
-    return $this->canComment;
-  }
-  public function setCanCopy($canCopy)
-  {
-    $this->canCopy = $canCopy;
-  }
-  public function getCanCopy()
-  {
-    return $this->canCopy;
-  }
-  public function setCanDelete($canDelete)
-  {
-    $this->canDelete = $canDelete;
-  }
-  public function getCanDelete()
-  {
-    return $this->canDelete;
-  }
-  public function setCanDownload($canDownload)
-  {
-    $this->canDownload = $canDownload;
-  }
-  public function getCanDownload()
-  {
-    return $this->canDownload;
-  }
-  public function setCanEdit($canEdit)
-  {
-    $this->canEdit = $canEdit;
-  }
-  public function getCanEdit()
-  {
-    return $this->canEdit;
-  }
-  public function setCanListChildren($canListChildren)
-  {
-    $this->canListChildren = $canListChildren;
-  }
-  public function getCanListChildren()
-  {
-    return $this->canListChildren;
-  }
-  public function setCanMoveItemIntoTeamDrive($canMoveItemIntoTeamDrive)
-  {
-    $this->canMoveItemIntoTeamDrive = $canMoveItemIntoTeamDrive;
-  }
-  public function getCanMoveItemIntoTeamDrive()
-  {
-    return $this->canMoveItemIntoTeamDrive;
-  }
-  public function setCanMoveTeamDriveItem($canMoveTeamDriveItem)
-  {
-    $this->canMoveTeamDriveItem = $canMoveTeamDriveItem;
-  }
-  public function getCanMoveTeamDriveItem()
-  {
-    return $this->canMoveTeamDriveItem;
-  }
-  public function setCanReadRevisions($canReadRevisions)
-  {
-    $this->canReadRevisions = $canReadRevisions;
-  }
-  public function getCanReadRevisions()
-  {
-    return $this->canReadRevisions;
-  }
-  public function setCanReadTeamDrive($canReadTeamDrive)
-  {
-    $this->canReadTeamDrive = $canReadTeamDrive;
-  }
-  public function getCanReadTeamDrive()
-  {
-    return $this->canReadTeamDrive;
-  }
-  public function setCanRemoveChildren($canRemoveChildren)
-  {
-    $this->canRemoveChildren = $canRemoveChildren;
-  }
-  public function getCanRemoveChildren()
-  {
-    return $this->canRemoveChildren;
-  }
-  public function setCanRename($canRename)
-  {
-    $this->canRename = $canRename;
-  }
-  public function getCanRename()
-  {
-    return $this->canRename;
-  }
-  public function setCanShare($canShare)
-  {
-    $this->canShare = $canShare;
-  }
-  public function getCanShare()
-  {
-    return $this->canShare;
-  }
-  public function setCanTrash($canTrash)
-  {
-    $this->canTrash = $canTrash;
-  }
-  public function getCanTrash()
-  {
-    return $this->canTrash;
-  }
-  public function setCanUntrash($canUntrash)
-  {
-    $this->canUntrash = $canUntrash;
-  }
-  public function getCanUntrash()
-  {
-    return $this->canUntrash;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Drive/DriveFileContentHints.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Drive/DriveFileContentHints.php
deleted file mode 100644
index ea263125..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Drive/DriveFileContentHints.php
+++ /dev/null
@@ -1,40 +0,0 @@
-indexableText = $indexableText;
-  }
-  public function getIndexableText()
-  {
-    return $this->indexableText;
-  }
-  public function setThumbnail(Google_Service_Drive_DriveFileContentHintsThumbnail $thumbnail)
-  {
-    $this->thumbnail = $thumbnail;
-  }
-  public function getThumbnail()
-  {
-    return $this->thumbnail;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Drive/DriveFileContentHintsThumbnail.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Drive/DriveFileContentHintsThumbnail.php
deleted file mode 100644
index 7594db55..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Drive/DriveFileContentHintsThumbnail.php
+++ /dev/null
@@ -1,39 +0,0 @@
-image = $image;
-  }
-  public function getImage()
-  {
-    return $this->image;
-  }
-  public function setMimeType($mimeType)
-  {
-    $this->mimeType = $mimeType;
-  }
-  public function getMimeType()
-  {
-    return $this->mimeType;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Drive/DriveFileImageMediaMetadata.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Drive/DriveFileImageMediaMetadata.php
deleted file mode 100644
index 560aa7f9..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Drive/DriveFileImageMediaMetadata.php
+++ /dev/null
@@ -1,211 +0,0 @@
-aperture = $aperture;
-  }
-  public function getAperture()
-  {
-    return $this->aperture;
-  }
-  public function setCameraMake($cameraMake)
-  {
-    $this->cameraMake = $cameraMake;
-  }
-  public function getCameraMake()
-  {
-    return $this->cameraMake;
-  }
-  public function setCameraModel($cameraModel)
-  {
-    $this->cameraModel = $cameraModel;
-  }
-  public function getCameraModel()
-  {
-    return $this->cameraModel;
-  }
-  public function setColorSpace($colorSpace)
-  {
-    $this->colorSpace = $colorSpace;
-  }
-  public function getColorSpace()
-  {
-    return $this->colorSpace;
-  }
-  public function setExposureBias($exposureBias)
-  {
-    $this->exposureBias = $exposureBias;
-  }
-  public function getExposureBias()
-  {
-    return $this->exposureBias;
-  }
-  public function setExposureMode($exposureMode)
-  {
-    $this->exposureMode = $exposureMode;
-  }
-  public function getExposureMode()
-  {
-    return $this->exposureMode;
-  }
-  public function setExposureTime($exposureTime)
-  {
-    $this->exposureTime = $exposureTime;
-  }
-  public function getExposureTime()
-  {
-    return $this->exposureTime;
-  }
-  public function setFlashUsed($flashUsed)
-  {
-    $this->flashUsed = $flashUsed;
-  }
-  public function getFlashUsed()
-  {
-    return $this->flashUsed;
-  }
-  public function setFocalLength($focalLength)
-  {
-    $this->focalLength = $focalLength;
-  }
-  public function getFocalLength()
-  {
-    return $this->focalLength;
-  }
-  public function setHeight($height)
-  {
-    $this->height = $height;
-  }
-  public function getHeight()
-  {
-    return $this->height;
-  }
-  public function setIsoSpeed($isoSpeed)
-  {
-    $this->isoSpeed = $isoSpeed;
-  }
-  public function getIsoSpeed()
-  {
-    return $this->isoSpeed;
-  }
-  public function setLens($lens)
-  {
-    $this->lens = $lens;
-  }
-  public function getLens()
-  {
-    return $this->lens;
-  }
-  public function setLocation(Google_Service_Drive_DriveFileImageMediaMetadataLocation $location)
-  {
-    $this->location = $location;
-  }
-  public function getLocation()
-  {
-    return $this->location;
-  }
-  public function setMaxApertureValue($maxApertureValue)
-  {
-    $this->maxApertureValue = $maxApertureValue;
-  }
-  public function getMaxApertureValue()
-  {
-    return $this->maxApertureValue;
-  }
-  public function setMeteringMode($meteringMode)
-  {
-    $this->meteringMode = $meteringMode;
-  }
-  public function getMeteringMode()
-  {
-    return $this->meteringMode;
-  }
-  public function setRotation($rotation)
-  {
-    $this->rotation = $rotation;
-  }
-  public function getRotation()
-  {
-    return $this->rotation;
-  }
-  public function setSensor($sensor)
-  {
-    $this->sensor = $sensor;
-  }
-  public function getSensor()
-  {
-    return $this->sensor;
-  }
-  public function setSubjectDistance($subjectDistance)
-  {
-    $this->subjectDistance = $subjectDistance;
-  }
-  public function getSubjectDistance()
-  {
-    return $this->subjectDistance;
-  }
-  public function setTime($time)
-  {
-    $this->time = $time;
-  }
-  public function getTime()
-  {
-    return $this->time;
-  }
-  public function setWhiteBalance($whiteBalance)
-  {
-    $this->whiteBalance = $whiteBalance;
-  }
-  public function getWhiteBalance()
-  {
-    return $this->whiteBalance;
-  }
-  public function setWidth($width)
-  {
-    $this->width = $width;
-  }
-  public function getWidth()
-  {
-    return $this->width;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Drive/DriveFileImageMediaMetadataLocation.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Drive/DriveFileImageMediaMetadataLocation.php
deleted file mode 100644
index 7de118a1..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Drive/DriveFileImageMediaMetadataLocation.php
+++ /dev/null
@@ -1,48 +0,0 @@
-altitude = $altitude;
-  }
-  public function getAltitude()
-  {
-    return $this->altitude;
-  }
-  public function setLatitude($latitude)
-  {
-    $this->latitude = $latitude;
-  }
-  public function getLatitude()
-  {
-    return $this->latitude;
-  }
-  public function setLongitude($longitude)
-  {
-    $this->longitude = $longitude;
-  }
-  public function getLongitude()
-  {
-    return $this->longitude;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Drive/DriveFileVideoMediaMetadata.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Drive/DriveFileVideoMediaMetadata.php
deleted file mode 100644
index 97cd5114..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Drive/DriveFileVideoMediaMetadata.php
+++ /dev/null
@@ -1,48 +0,0 @@
-durationMillis = $durationMillis;
-  }
-  public function getDurationMillis()
-  {
-    return $this->durationMillis;
-  }
-  public function setHeight($height)
-  {
-    $this->height = $height;
-  }
-  public function getHeight()
-  {
-    return $this->height;
-  }
-  public function setWidth($width)
-  {
-    $this->width = $width;
-  }
-  public function getWidth()
-  {
-    return $this->width;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Drive/FileList.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Drive/FileList.php
deleted file mode 100644
index ba18998c..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Drive/FileList.php
+++ /dev/null
@@ -1,59 +0,0 @@
-files = $files;
-  }
-  public function getFiles()
-  {
-    return $this->files;
-  }
-  public function setIncompleteSearch($incompleteSearch)
-  {
-    $this->incompleteSearch = $incompleteSearch;
-  }
-  public function getIncompleteSearch()
-  {
-    return $this->incompleteSearch;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setNextPageToken($nextPageToken)
-  {
-    $this->nextPageToken = $nextPageToken;
-  }
-  public function getNextPageToken()
-  {
-    return $this->nextPageToken;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Drive/GeneratedIds.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Drive/GeneratedIds.php
deleted file mode 100644
index b27fc330..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Drive/GeneratedIds.php
+++ /dev/null
@@ -1,49 +0,0 @@
-ids = $ids;
-  }
-  public function getIds()
-  {
-    return $this->ids;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setSpace($space)
-  {
-    $this->space = $space;
-  }
-  public function getSpace()
-  {
-    return $this->space;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Drive/Permission.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Drive/Permission.php
deleted file mode 100644
index 58e1e0b7..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Drive/Permission.php
+++ /dev/null
@@ -1,122 +0,0 @@
-allowFileDiscovery = $allowFileDiscovery;
-  }
-  public function getAllowFileDiscovery()
-  {
-    return $this->allowFileDiscovery;
-  }
-  public function setDisplayName($displayName)
-  {
-    $this->displayName = $displayName;
-  }
-  public function getDisplayName()
-  {
-    return $this->displayName;
-  }
-  public function setDomain($domain)
-  {
-    $this->domain = $domain;
-  }
-  public function getDomain()
-  {
-    return $this->domain;
-  }
-  public function setEmailAddress($emailAddress)
-  {
-    $this->emailAddress = $emailAddress;
-  }
-  public function getEmailAddress()
-  {
-    return $this->emailAddress;
-  }
-  public function setExpirationTime($expirationTime)
-  {
-    $this->expirationTime = $expirationTime;
-  }
-  public function getExpirationTime()
-  {
-    return $this->expirationTime;
-  }
-  public function setId($id)
-  {
-    $this->id = $id;
-  }
-  public function getId()
-  {
-    return $this->id;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setPhotoLink($photoLink)
-  {
-    $this->photoLink = $photoLink;
-  }
-  public function getPhotoLink()
-  {
-    return $this->photoLink;
-  }
-  public function setRole($role)
-  {
-    $this->role = $role;
-  }
-  public function getRole()
-  {
-    return $this->role;
-  }
-  public function setTeamDrivePermissionDetails($teamDrivePermissionDetails)
-  {
-    $this->teamDrivePermissionDetails = $teamDrivePermissionDetails;
-  }
-  public function getTeamDrivePermissionDetails()
-  {
-    return $this->teamDrivePermissionDetails;
-  }
-  public function setType($type)
-  {
-    $this->type = $type;
-  }
-  public function getType()
-  {
-    return $this->type;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Drive/PermissionList.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Drive/PermissionList.php
deleted file mode 100644
index a269f764..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Drive/PermissionList.php
+++ /dev/null
@@ -1,50 +0,0 @@
-kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setNextPageToken($nextPageToken)
-  {
-    $this->nextPageToken = $nextPageToken;
-  }
-  public function getNextPageToken()
-  {
-    return $this->nextPageToken;
-  }
-  public function setPermissions($permissions)
-  {
-    $this->permissions = $permissions;
-  }
-  public function getPermissions()
-  {
-    return $this->permissions;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Drive/PermissionTeamDrivePermissionDetails.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Drive/PermissionTeamDrivePermissionDetails.php
deleted file mode 100644
index e7430d53..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Drive/PermissionTeamDrivePermissionDetails.php
+++ /dev/null
@@ -1,57 +0,0 @@
-inherited = $inherited;
-  }
-  public function getInherited()
-  {
-    return $this->inherited;
-  }
-  public function setInheritedFrom($inheritedFrom)
-  {
-    $this->inheritedFrom = $inheritedFrom;
-  }
-  public function getInheritedFrom()
-  {
-    return $this->inheritedFrom;
-  }
-  public function setRole($role)
-  {
-    $this->role = $role;
-  }
-  public function getRole()
-  {
-    return $this->role;
-  }
-  public function setTeamDrivePermissionType($teamDrivePermissionType)
-  {
-    $this->teamDrivePermissionType = $teamDrivePermissionType;
-  }
-  public function getTeamDrivePermissionType()
-  {
-    return $this->teamDrivePermissionType;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Drive/Reply.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Drive/Reply.php
deleted file mode 100644
index a8102157..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Drive/Reply.php
+++ /dev/null
@@ -1,103 +0,0 @@
-action = $action;
-  }
-  public function getAction()
-  {
-    return $this->action;
-  }
-  public function setAuthor(Google_Service_Drive_User $author)
-  {
-    $this->author = $author;
-  }
-  public function getAuthor()
-  {
-    return $this->author;
-  }
-  public function setContent($content)
-  {
-    $this->content = $content;
-  }
-  public function getContent()
-  {
-    return $this->content;
-  }
-  public function setCreatedTime($createdTime)
-  {
-    $this->createdTime = $createdTime;
-  }
-  public function getCreatedTime()
-  {
-    return $this->createdTime;
-  }
-  public function setDeleted($deleted)
-  {
-    $this->deleted = $deleted;
-  }
-  public function getDeleted()
-  {
-    return $this->deleted;
-  }
-  public function setHtmlContent($htmlContent)
-  {
-    $this->htmlContent = $htmlContent;
-  }
-  public function getHtmlContent()
-  {
-    return $this->htmlContent;
-  }
-  public function setId($id)
-  {
-    $this->id = $id;
-  }
-  public function getId()
-  {
-    return $this->id;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setModifiedTime($modifiedTime)
-  {
-    $this->modifiedTime = $modifiedTime;
-  }
-  public function getModifiedTime()
-  {
-    return $this->modifiedTime;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Drive/ReplyList.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Drive/ReplyList.php
deleted file mode 100644
index a68fdbcc..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Drive/ReplyList.php
+++ /dev/null
@@ -1,50 +0,0 @@
-kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setNextPageToken($nextPageToken)
-  {
-    $this->nextPageToken = $nextPageToken;
-  }
-  public function getNextPageToken()
-  {
-    return $this->nextPageToken;
-  }
-  public function setReplies($replies)
-  {
-    $this->replies = $replies;
-  }
-  public function getReplies()
-  {
-    return $this->replies;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Drive/Resource/About.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Drive/Resource/About.php
deleted file mode 100644
index 67bf18a7..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Drive/Resource/About.php
+++ /dev/null
@@ -1,41 +0,0 @@
-
- *   $driveService = new Google_Service_Drive(...);
- *   $about = $driveService->about;
- *  
- */
-class Google_Service_Drive_Resource_About extends Google_Service_Resource
-{
-  /**
-   * Gets information about the user, the user's Drive, and system capabilities.
-   * (about.get)
-   *
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Drive_About
-   */
-  public function get($optParams = array())
-  {
-    $params = array();
-    $params = array_merge($params, $optParams);
-    return $this->call('get', array($params), "Google_Service_Drive_About");
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Drive/Resource/Changes.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Drive/Resource/Changes.php
deleted file mode 100644
index cfdcf8c5..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Drive/Resource/Changes.php
+++ /dev/null
@@ -1,121 +0,0 @@
-
- *   $driveService = new Google_Service_Drive(...);
- *   $changes = $driveService->changes;
- *  
- */
-class Google_Service_Drive_Resource_Changes extends Google_Service_Resource
-{
-  /**
-   * Gets the starting pageToken for listing future changes.
-   * (changes.getStartPageToken)
-   *
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param bool supportsTeamDrives Whether the requesting application
-   * supports Team Drives.
-   * @opt_param string teamDriveId The ID of the Team Drive for which the starting
-   * pageToken for listing future changes from that Team Drive will be returned.
-   * @return Google_Service_Drive_StartPageToken
-   */
-  public function getStartPageToken($optParams = array())
-  {
-    $params = array();
-    $params = array_merge($params, $optParams);
-    return $this->call('getStartPageToken', array($params), "Google_Service_Drive_StartPageToken");
-  }
-  /**
-   * Lists the changes for a user or Team Drive. (changes.listChanges)
-   *
-   * @param string $pageToken The token for continuing a previous list request on
-   * the next page. This should be set to the value of 'nextPageToken' from the
-   * previous response or to the response from the getStartPageToken method.
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param bool includeCorpusRemovals Whether changes should include the file
-   * resource if the file is still accessible by the user at the time of the
-   * request, even when a file was removed from the list of changes and there will
-   * be no further change entries for this file.
-   * @opt_param bool includeRemoved Whether to include changes indicating that
-   * items have been removed from the list of changes, for example by deletion or
-   * loss of access.
-   * @opt_param bool includeTeamDriveItems Whether Team Drive files or changes
-   * should be included in results.
-   * @opt_param int pageSize The maximum number of changes to return per page.
-   * @opt_param bool restrictToMyDrive Whether to restrict the results to changes
-   * inside the My Drive hierarchy. This omits changes to files such as those in
-   * the Application Data folder or shared files which have not been added to My
-   * Drive.
-   * @opt_param string spaces A comma-separated list of spaces to query within the
-   * user corpus. Supported values are 'drive', 'appDataFolder' and 'photos'.
-   * @opt_param bool supportsTeamDrives Whether the requesting application
-   * supports Team Drives.
-   * @opt_param string teamDriveId The Team Drive from which changes will be
-   * returned. If specified the change IDs will be reflective of the Team Drive;
-   * use the combined Team Drive ID and change ID as an identifier.
-   * @return Google_Service_Drive_ChangeList
-   */
-  public function listChanges($pageToken, $optParams = array())
-  {
-    $params = array('pageToken' => $pageToken);
-    $params = array_merge($params, $optParams);
-    return $this->call('list', array($params), "Google_Service_Drive_ChangeList");
-  }
-  /**
-   * Subscribes to changes for a user. (changes.watch)
-   *
-   * @param string $pageToken The token for continuing a previous list request on
-   * the next page. This should be set to the value of 'nextPageToken' from the
-   * previous response or to the response from the getStartPageToken method.
-   * @param Google_Service_Drive_Channel $postBody
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param bool includeCorpusRemovals Whether changes should include the file
-   * resource if the file is still accessible by the user at the time of the
-   * request, even when a file was removed from the list of changes and there will
-   * be no further change entries for this file.
-   * @opt_param bool includeRemoved Whether to include changes indicating that
-   * items have been removed from the list of changes, for example by deletion or
-   * loss of access.
-   * @opt_param bool includeTeamDriveItems Whether Team Drive files or changes
-   * should be included in results.
-   * @opt_param int pageSize The maximum number of changes to return per page.
-   * @opt_param bool restrictToMyDrive Whether to restrict the results to changes
-   * inside the My Drive hierarchy. This omits changes to files such as those in
-   * the Application Data folder or shared files which have not been added to My
-   * Drive.
-   * @opt_param string spaces A comma-separated list of spaces to query within the
-   * user corpus. Supported values are 'drive', 'appDataFolder' and 'photos'.
-   * @opt_param bool supportsTeamDrives Whether the requesting application
-   * supports Team Drives.
-   * @opt_param string teamDriveId The Team Drive from which changes will be
-   * returned. If specified the change IDs will be reflective of the Team Drive;
-   * use the combined Team Drive ID and change ID as an identifier.
-   * @return Google_Service_Drive_Channel
-   */
-  public function watch($pageToken, Google_Service_Drive_Channel $postBody, $optParams = array())
-  {
-    $params = array('pageToken' => $pageToken, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('watch', array($params), "Google_Service_Drive_Channel");
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Drive/Resource/Channels.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Drive/Resource/Channels.php
deleted file mode 100644
index 39f9eda9..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Drive/Resource/Channels.php
+++ /dev/null
@@ -1,40 +0,0 @@
-
- *   $driveService = new Google_Service_Drive(...);
- *   $channels = $driveService->channels;
- *  
- */
-class Google_Service_Drive_Resource_Channels extends Google_Service_Resource
-{
-  /**
-   * Stop watching resources through this channel (channels.stop)
-   *
-   * @param Google_Service_Drive_Channel $postBody
-   * @param array $optParams Optional parameters.
-   */
-  public function stop(Google_Service_Drive_Channel $postBody, $optParams = array())
-  {
-    $params = array('postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('stop', array($params));
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Drive/Resource/Comments.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Drive/Resource/Comments.php
deleted file mode 100644
index 2a09affd..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Drive/Resource/Comments.php
+++ /dev/null
@@ -1,109 +0,0 @@
-
- *   $driveService = new Google_Service_Drive(...);
- *   $comments = $driveService->comments;
- *  
- */
-class Google_Service_Drive_Resource_Comments extends Google_Service_Resource
-{
-  /**
-   * Creates a new comment on a file. (comments.create)
-   *
-   * @param string $fileId The ID of the file.
-   * @param Google_Service_Drive_Comment $postBody
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Drive_Comment
-   */
-  public function create($fileId, Google_Service_Drive_Comment $postBody, $optParams = array())
-  {
-    $params = array('fileId' => $fileId, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('create', array($params), "Google_Service_Drive_Comment");
-  }
-  /**
-   * Deletes a comment. (comments.delete)
-   *
-   * @param string $fileId The ID of the file.
-   * @param string $commentId The ID of the comment.
-   * @param array $optParams Optional parameters.
-   */
-  public function delete($fileId, $commentId, $optParams = array())
-  {
-    $params = array('fileId' => $fileId, 'commentId' => $commentId);
-    $params = array_merge($params, $optParams);
-    return $this->call('delete', array($params));
-  }
-  /**
-   * Gets a comment by ID. (comments.get)
-   *
-   * @param string $fileId The ID of the file.
-   * @param string $commentId The ID of the comment.
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param bool includeDeleted Whether to return deleted comments. Deleted
-   * comments will not include their original content.
-   * @return Google_Service_Drive_Comment
-   */
-  public function get($fileId, $commentId, $optParams = array())
-  {
-    $params = array('fileId' => $fileId, 'commentId' => $commentId);
-    $params = array_merge($params, $optParams);
-    return $this->call('get', array($params), "Google_Service_Drive_Comment");
-  }
-  /**
-   * Lists a file's comments. (comments.listComments)
-   *
-   * @param string $fileId The ID of the file.
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param bool includeDeleted Whether to include deleted comments. Deleted
-   * comments will not include their original content.
-   * @opt_param int pageSize The maximum number of comments to return per page.
-   * @opt_param string pageToken The token for continuing a previous list request
-   * on the next page. This should be set to the value of 'nextPageToken' from the
-   * previous response.
-   * @opt_param string startModifiedTime The minimum value of 'modifiedTime' for
-   * the result comments (RFC 3339 date-time).
-   * @return Google_Service_Drive_CommentList
-   */
-  public function listComments($fileId, $optParams = array())
-  {
-    $params = array('fileId' => $fileId);
-    $params = array_merge($params, $optParams);
-    return $this->call('list', array($params), "Google_Service_Drive_CommentList");
-  }
-  /**
-   * Updates a comment with patch semantics. (comments.update)
-   *
-   * @param string $fileId The ID of the file.
-   * @param string $commentId The ID of the comment.
-   * @param Google_Service_Drive_Comment $postBody
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Drive_Comment
-   */
-  public function update($fileId, $commentId, Google_Service_Drive_Comment $postBody, $optParams = array())
-  {
-    $params = array('fileId' => $fileId, 'commentId' => $commentId, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('update', array($params), "Google_Service_Drive_Comment");
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Drive/Resource/Files.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Drive/Resource/Files.php
deleted file mode 100644
index e8180228..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Drive/Resource/Files.php
+++ /dev/null
@@ -1,251 +0,0 @@
-
- *   $driveService = new Google_Service_Drive(...);
- *   $files = $driveService->files;
- *  
- */
-class Google_Service_Drive_Resource_Files extends Google_Service_Resource
-{
-  /**
-   * Creates a copy of a file and applies any requested updates with patch
-   * semantics. (files.copy)
-   *
-   * @param string $fileId The ID of the file.
-   * @param Google_Service_Drive_DriveFile $postBody
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param bool ignoreDefaultVisibility Whether to ignore the domain's
-   * default visibility settings for the created file. Domain administrators can
-   * choose to make all uploaded files visible to the domain by default; this
-   * parameter bypasses that behavior for the request. Permissions are still
-   * inherited from parent folders.
-   * @opt_param bool keepRevisionForever Whether to set the 'keepForever' field in
-   * the new head revision. This is only applicable to files with binary content
-   * in Drive.
-   * @opt_param string ocrLanguage A language hint for OCR processing during image
-   * import (ISO 639-1 code).
-   * @opt_param bool supportsTeamDrives Whether the requesting application
-   * supports Team Drives.
-   * @return Google_Service_Drive_DriveFile
-   */
-  public function copy($fileId, Google_Service_Drive_DriveFile $postBody, $optParams = array())
-  {
-    $params = array('fileId' => $fileId, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('copy', array($params), "Google_Service_Drive_DriveFile");
-  }
-  /**
-   * Creates a new file. (files.create)
-   *
-   * @param Google_Service_Drive_DriveFile $postBody
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param bool ignoreDefaultVisibility Whether to ignore the domain's
-   * default visibility settings for the created file. Domain administrators can
-   * choose to make all uploaded files visible to the domain by default; this
-   * parameter bypasses that behavior for the request. Permissions are still
-   * inherited from parent folders.
-   * @opt_param bool keepRevisionForever Whether to set the 'keepForever' field in
-   * the new head revision. This is only applicable to files with binary content
-   * in Drive.
-   * @opt_param string ocrLanguage A language hint for OCR processing during image
-   * import (ISO 639-1 code).
-   * @opt_param bool supportsTeamDrives Whether the requesting application
-   * supports Team Drives.
-   * @opt_param bool useContentAsIndexableText Whether to use the uploaded content
-   * as indexable text.
-   * @return Google_Service_Drive_DriveFile
-   */
-  public function create(Google_Service_Drive_DriveFile $postBody, $optParams = array())
-  {
-    $params = array('postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('create', array($params), "Google_Service_Drive_DriveFile");
-  }
-  /**
-   * Permanently deletes a file owned by the user without moving it to the trash.
-   * If the file belongs to a Team Drive the user must be an organizer on the
-   * parent. If the target is a folder, all descendants owned by the user are also
-   * deleted. (files.delete)
-   *
-   * @param string $fileId The ID of the file.
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param bool supportsTeamDrives Whether the requesting application
-   * supports Team Drives.
-   */
-  public function delete($fileId, $optParams = array())
-  {
-    $params = array('fileId' => $fileId);
-    $params = array_merge($params, $optParams);
-    return $this->call('delete', array($params));
-  }
-  /**
-   * Permanently deletes all of the user's trashed files. (files.emptyTrash)
-   *
-   * @param array $optParams Optional parameters.
-   */
-  public function emptyTrash($optParams = array())
-  {
-    $params = array();
-    $params = array_merge($params, $optParams);
-    return $this->call('emptyTrash', array($params));
-  }
-  /**
-   * Exports a Google Doc to the requested MIME type and returns the exported
-   * content. (files.export)
-   *
-   * @param string $fileId The ID of the file.
-   * @param string $mimeType The MIME type of the format requested for this
-   * export.
-   * @param array $optParams Optional parameters.
-   */
-  public function export($fileId, $mimeType, $optParams = array())
-  {
-    $params = array('fileId' => $fileId, 'mimeType' => $mimeType);
-    $params = array_merge($params, $optParams);
-    return $this->call('export', array($params));
-  }
-  /**
-   * Generates a set of file IDs which can be provided in create requests.
-   * (files.generateIds)
-   *
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param int count The number of IDs to return.
-   * @opt_param string space The space in which the IDs can be used to create new
-   * files. Supported values are 'drive' and 'appDataFolder'.
-   * @return Google_Service_Drive_GeneratedIds
-   */
-  public function generateIds($optParams = array())
-  {
-    $params = array();
-    $params = array_merge($params, $optParams);
-    return $this->call('generateIds', array($params), "Google_Service_Drive_GeneratedIds");
-  }
-  /**
-   * Gets a file's metadata or content by ID. (files.get)
-   *
-   * @param string $fileId The ID of the file.
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param bool acknowledgeAbuse Whether the user is acknowledging the risk
-   * of downloading known malware or other abusive files. This is only applicable
-   * when alt=media.
-   * @opt_param bool supportsTeamDrives Whether the requesting application
-   * supports Team Drives.
-   * @return Google_Service_Drive_DriveFile
-   */
-  public function get($fileId, $optParams = array())
-  {
-    $params = array('fileId' => $fileId);
-    $params = array_merge($params, $optParams);
-    return $this->call('get', array($params), "Google_Service_Drive_DriveFile");
-  }
-  /**
-   * Lists or searches files. (files.listFiles)
-   *
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param string corpora Comma-separated list of bodies of items
-   * (files/documents) to which the query applies. Supported bodies are 'user',
-   * 'domain', 'teamDrive' and 'allTeamDrives'. 'allTeamDrives' must be combined
-   * with 'user'; all other values must be used in isolation. Prefer 'user' or
-   * 'teamDrive' to 'allTeamDrives' for efficiency.
-   * @opt_param string corpus The source of files to list. Deprecated: use
-   * 'corpora' instead.
-   * @opt_param bool includeTeamDriveItems Whether Team Drive items should be
-   * included in results.
-   * @opt_param string orderBy A comma-separated list of sort keys. Valid keys are
-   * 'createdTime', 'folder', 'modifiedByMeTime', 'modifiedTime', 'name',
-   * 'quotaBytesUsed', 'recency', 'sharedWithMeTime', 'starred', and
-   * 'viewedByMeTime'. Each key sorts ascending by default, but may be reversed
-   * with the 'desc' modifier. Example usage: ?orderBy=folder,modifiedTime
-   * desc,name. Please note that there is a current limitation for users with
-   * approximately one million files in which the requested sort order is ignored.
-   * @opt_param int pageSize The maximum number of files to return per page.
-   * @opt_param string pageToken The token for continuing a previous list request
-   * on the next page. This should be set to the value of 'nextPageToken' from the
-   * previous response.
-   * @opt_param string q A query for filtering the file results. See the "Search
-   * for Files" guide for supported syntax.
-   * @opt_param string spaces A comma-separated list of spaces to query within the
-   * corpus. Supported values are 'drive', 'appDataFolder' and 'photos'.
-   * @opt_param bool supportsTeamDrives Whether the requesting application
-   * supports Team Drives.
-   * @opt_param string teamDriveId ID of Team Drive to search.
-   * @return Google_Service_Drive_FileList
-   */
-  public function listFiles($optParams = array())
-  {
-    $params = array();
-    $params = array_merge($params, $optParams);
-    return $this->call('list', array($params), "Google_Service_Drive_FileList");
-  }
-  /**
-   * Updates a file's metadata and/or content with patch semantics. (files.update)
-   *
-   * @param string $fileId The ID of the file.
-   * @param Google_Service_Drive_DriveFile $postBody
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param string addParents A comma-separated list of parent IDs to add.
-   * @opt_param bool keepRevisionForever Whether to set the 'keepForever' field in
-   * the new head revision. This is only applicable to files with binary content
-   * in Drive.
-   * @opt_param string ocrLanguage A language hint for OCR processing during image
-   * import (ISO 639-1 code).
-   * @opt_param string removeParents A comma-separated list of parent IDs to
-   * remove.
-   * @opt_param bool supportsTeamDrives Whether the requesting application
-   * supports Team Drives.
-   * @opt_param bool useContentAsIndexableText Whether to use the uploaded content
-   * as indexable text.
-   * @return Google_Service_Drive_DriveFile
-   */
-  public function update($fileId, Google_Service_Drive_DriveFile $postBody, $optParams = array())
-  {
-    $params = array('fileId' => $fileId, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('update', array($params), "Google_Service_Drive_DriveFile");
-  }
-  /**
-   * Subscribes to changes to a file (files.watch)
-   *
-   * @param string $fileId The ID of the file.
-   * @param Google_Service_Drive_Channel $postBody
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param bool acknowledgeAbuse Whether the user is acknowledging the risk
-   * of downloading known malware or other abusive files. This is only applicable
-   * when alt=media.
-   * @opt_param bool supportsTeamDrives Whether the requesting application
-   * supports Team Drives.
-   * @return Google_Service_Drive_Channel
-   */
-  public function watch($fileId, Google_Service_Drive_Channel $postBody, $optParams = array())
-  {
-    $params = array('fileId' => $fileId, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('watch', array($params), "Google_Service_Drive_Channel");
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Drive/Resource/Permissions.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Drive/Resource/Permissions.php
deleted file mode 100644
index 76462ba2..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Drive/Resource/Permissions.php
+++ /dev/null
@@ -1,132 +0,0 @@
-
- *   $driveService = new Google_Service_Drive(...);
- *   $permissions = $driveService->permissions;
- *  
- */
-class Google_Service_Drive_Resource_Permissions extends Google_Service_Resource
-{
-  /**
-   * Creates a permission for a file or Team Drive. (permissions.create)
-   *
-   * @param string $fileId The ID of the file or Team Drive.
-   * @param Google_Service_Drive_Permission $postBody
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param string emailMessage A custom message to include in the
-   * notification email.
-   * @opt_param bool sendNotificationEmail Whether to send a notification email
-   * when sharing to users or groups. This defaults to true for users and groups,
-   * and is not allowed for other requests. It must not be disabled for ownership
-   * transfers.
-   * @opt_param bool supportsTeamDrives Whether the requesting application
-   * supports Team Drives.
-   * @opt_param bool transferOwnership Whether to transfer ownership to the
-   * specified user and downgrade the current owner to a writer. This parameter is
-   * required as an acknowledgement of the side effect.
-   * @return Google_Service_Drive_Permission
-   */
-  public function create($fileId, Google_Service_Drive_Permission $postBody, $optParams = array())
-  {
-    $params = array('fileId' => $fileId, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('create', array($params), "Google_Service_Drive_Permission");
-  }
-  /**
-   * Deletes a permission. (permissions.delete)
-   *
-   * @param string $fileId The ID of the file or Team Drive.
-   * @param string $permissionId The ID of the permission.
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param bool supportsTeamDrives Whether the requesting application
-   * supports Team Drives.
-   */
-  public function delete($fileId, $permissionId, $optParams = array())
-  {
-    $params = array('fileId' => $fileId, 'permissionId' => $permissionId);
-    $params = array_merge($params, $optParams);
-    return $this->call('delete', array($params));
-  }
-  /**
-   * Gets a permission by ID. (permissions.get)
-   *
-   * @param string $fileId The ID of the file.
-   * @param string $permissionId The ID of the permission.
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param bool supportsTeamDrives Whether the requesting application
-   * supports Team Drives.
-   * @return Google_Service_Drive_Permission
-   */
-  public function get($fileId, $permissionId, $optParams = array())
-  {
-    $params = array('fileId' => $fileId, 'permissionId' => $permissionId);
-    $params = array_merge($params, $optParams);
-    return $this->call('get', array($params), "Google_Service_Drive_Permission");
-  }
-  /**
-   * Lists a file's or Team Drive's permissions. (permissions.listPermissions)
-   *
-   * @param string $fileId The ID of the file or Team Drive.
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param int pageSize The maximum number of permissions to return per page.
-   * When not set for files in a Team Drive, at most 100 results will be returned.
-   * When not set for files that are not in a Team Drive, the entire list will be
-   * returned.
-   * @opt_param string pageToken The token for continuing a previous list request
-   * on the next page. This should be set to the value of 'nextPageToken' from the
-   * previous response.
-   * @opt_param bool supportsTeamDrives Whether the requesting application
-   * supports Team Drives.
-   * @return Google_Service_Drive_PermissionList
-   */
-  public function listPermissions($fileId, $optParams = array())
-  {
-    $params = array('fileId' => $fileId);
-    $params = array_merge($params, $optParams);
-    return $this->call('list', array($params), "Google_Service_Drive_PermissionList");
-  }
-  /**
-   * Updates a permission with patch semantics. (permissions.update)
-   *
-   * @param string $fileId The ID of the file or Team Drive.
-   * @param string $permissionId The ID of the permission.
-   * @param Google_Service_Drive_Permission $postBody
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param bool removeExpiration Whether to remove the expiration date.
-   * @opt_param bool supportsTeamDrives Whether the requesting application
-   * supports Team Drives.
-   * @opt_param bool transferOwnership Whether to transfer ownership to the
-   * specified user and downgrade the current owner to a writer. This parameter is
-   * required as an acknowledgement of the side effect.
-   * @return Google_Service_Drive_Permission
-   */
-  public function update($fileId, $permissionId, Google_Service_Drive_Permission $postBody, $optParams = array())
-  {
-    $params = array('fileId' => $fileId, 'permissionId' => $permissionId, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('update', array($params), "Google_Service_Drive_Permission");
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Drive/Resource/Replies.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Drive/Resource/Replies.php
deleted file mode 100644
index 3db6854a..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Drive/Resource/Replies.php
+++ /dev/null
@@ -1,112 +0,0 @@
-
- *   $driveService = new Google_Service_Drive(...);
- *   $replies = $driveService->replies;
- *  
- */
-class Google_Service_Drive_Resource_Replies extends Google_Service_Resource
-{
-  /**
-   * Creates a new reply to a comment. (replies.create)
-   *
-   * @param string $fileId The ID of the file.
-   * @param string $commentId The ID of the comment.
-   * @param Google_Service_Drive_Reply $postBody
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Drive_Reply
-   */
-  public function create($fileId, $commentId, Google_Service_Drive_Reply $postBody, $optParams = array())
-  {
-    $params = array('fileId' => $fileId, 'commentId' => $commentId, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('create', array($params), "Google_Service_Drive_Reply");
-  }
-  /**
-   * Deletes a reply. (replies.delete)
-   *
-   * @param string $fileId The ID of the file.
-   * @param string $commentId The ID of the comment.
-   * @param string $replyId The ID of the reply.
-   * @param array $optParams Optional parameters.
-   */
-  public function delete($fileId, $commentId, $replyId, $optParams = array())
-  {
-    $params = array('fileId' => $fileId, 'commentId' => $commentId, 'replyId' => $replyId);
-    $params = array_merge($params, $optParams);
-    return $this->call('delete', array($params));
-  }
-  /**
-   * Gets a reply by ID. (replies.get)
-   *
-   * @param string $fileId The ID of the file.
-   * @param string $commentId The ID of the comment.
-   * @param string $replyId The ID of the reply.
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param bool includeDeleted Whether to return deleted replies. Deleted
-   * replies will not include their original content.
-   * @return Google_Service_Drive_Reply
-   */
-  public function get($fileId, $commentId, $replyId, $optParams = array())
-  {
-    $params = array('fileId' => $fileId, 'commentId' => $commentId, 'replyId' => $replyId);
-    $params = array_merge($params, $optParams);
-    return $this->call('get', array($params), "Google_Service_Drive_Reply");
-  }
-  /**
-   * Lists a comment's replies. (replies.listReplies)
-   *
-   * @param string $fileId The ID of the file.
-   * @param string $commentId The ID of the comment.
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param bool includeDeleted Whether to include deleted replies. Deleted
-   * replies will not include their original content.
-   * @opt_param int pageSize The maximum number of replies to return per page.
-   * @opt_param string pageToken The token for continuing a previous list request
-   * on the next page. This should be set to the value of 'nextPageToken' from the
-   * previous response.
-   * @return Google_Service_Drive_ReplyList
-   */
-  public function listReplies($fileId, $commentId, $optParams = array())
-  {
-    $params = array('fileId' => $fileId, 'commentId' => $commentId);
-    $params = array_merge($params, $optParams);
-    return $this->call('list', array($params), "Google_Service_Drive_ReplyList");
-  }
-  /**
-   * Updates a reply with patch semantics. (replies.update)
-   *
-   * @param string $fileId The ID of the file.
-   * @param string $commentId The ID of the comment.
-   * @param string $replyId The ID of the reply.
-   * @param Google_Service_Drive_Reply $postBody
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Drive_Reply
-   */
-  public function update($fileId, $commentId, $replyId, Google_Service_Drive_Reply $postBody, $optParams = array())
-  {
-    $params = array('fileId' => $fileId, 'commentId' => $commentId, 'replyId' => $replyId, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('update', array($params), "Google_Service_Drive_Reply");
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Drive/Resource/Revisions.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Drive/Resource/Revisions.php
deleted file mode 100644
index 78278396..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Drive/Resource/Revisions.php
+++ /dev/null
@@ -1,93 +0,0 @@
-
- *   $driveService = new Google_Service_Drive(...);
- *   $revisions = $driveService->revisions;
- *  
- */
-class Google_Service_Drive_Resource_Revisions extends Google_Service_Resource
-{
-  /**
-   * Permanently deletes a revision. This method is only applicable to files with
-   * binary content in Drive. (revisions.delete)
-   *
-   * @param string $fileId The ID of the file.
-   * @param string $revisionId The ID of the revision.
-   * @param array $optParams Optional parameters.
-   */
-  public function delete($fileId, $revisionId, $optParams = array())
-  {
-    $params = array('fileId' => $fileId, 'revisionId' => $revisionId);
-    $params = array_merge($params, $optParams);
-    return $this->call('delete', array($params));
-  }
-  /**
-   * Gets a revision's metadata or content by ID. (revisions.get)
-   *
-   * @param string $fileId The ID of the file.
-   * @param string $revisionId The ID of the revision.
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param bool acknowledgeAbuse Whether the user is acknowledging the risk
-   * of downloading known malware or other abusive files. This is only applicable
-   * when alt=media.
-   * @return Google_Service_Drive_Revision
-   */
-  public function get($fileId, $revisionId, $optParams = array())
-  {
-    $params = array('fileId' => $fileId, 'revisionId' => $revisionId);
-    $params = array_merge($params, $optParams);
-    return $this->call('get', array($params), "Google_Service_Drive_Revision");
-  }
-  /**
-   * Lists a file's revisions. (revisions.listRevisions)
-   *
-   * @param string $fileId The ID of the file.
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param int pageSize The maximum number of revisions to return per page.
-   * @opt_param string pageToken The token for continuing a previous list request
-   * on the next page. This should be set to the value of 'nextPageToken' from the
-   * previous response.
-   * @return Google_Service_Drive_RevisionList
-   */
-  public function listRevisions($fileId, $optParams = array())
-  {
-    $params = array('fileId' => $fileId);
-    $params = array_merge($params, $optParams);
-    return $this->call('list', array($params), "Google_Service_Drive_RevisionList");
-  }
-  /**
-   * Updates a revision with patch semantics. (revisions.update)
-   *
-   * @param string $fileId The ID of the file.
-   * @param string $revisionId The ID of the revision.
-   * @param Google_Service_Drive_Revision $postBody
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Drive_Revision
-   */
-  public function update($fileId, $revisionId, Google_Service_Drive_Revision $postBody, $optParams = array())
-  {
-    $params = array('fileId' => $fileId, 'revisionId' => $revisionId, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('update', array($params), "Google_Service_Drive_Revision");
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Drive/Resource/Teamdrives.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Drive/Resource/Teamdrives.php
deleted file mode 100644
index 847ef4cc..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Drive/Resource/Teamdrives.php
+++ /dev/null
@@ -1,101 +0,0 @@
-
- *   $driveService = new Google_Service_Drive(...);
- *   $teamdrives = $driveService->teamdrives;
- *  
- */
-class Google_Service_Drive_Resource_Teamdrives extends Google_Service_Resource
-{
-  /**
-   * Creates a new Team Drive. (teamdrives.create)
-   *
-   * @param string $requestId An ID, such as a random UUID, which uniquely
-   * identifies this user's request for idempotent creation of a Team Drive. A
-   * repeated request by the same user and with the same request ID will avoid
-   * creating duplicates by attempting to create the same Team Drive. If the Team
-   * Drive already exists a 409 error will be returned.
-   * @param Google_Service_Drive_TeamDrive $postBody
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Drive_TeamDrive
-   */
-  public function create($requestId, Google_Service_Drive_TeamDrive $postBody, $optParams = array())
-  {
-    $params = array('requestId' => $requestId, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('create', array($params), "Google_Service_Drive_TeamDrive");
-  }
-  /**
-   * Permanently deletes a Team Drive for which the user is an organizer. The Team
-   * Drive cannot contain any untrashed items. (teamdrives.delete)
-   *
-   * @param string $teamDriveId The ID of the Team Drive
-   * @param array $optParams Optional parameters.
-   */
-  public function delete($teamDriveId, $optParams = array())
-  {
-    $params = array('teamDriveId' => $teamDriveId);
-    $params = array_merge($params, $optParams);
-    return $this->call('delete', array($params));
-  }
-  /**
-   * Gets a Team Drive's metadata by ID. (teamdrives.get)
-   *
-   * @param string $teamDriveId The ID of the Team Drive
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Drive_TeamDrive
-   */
-  public function get($teamDriveId, $optParams = array())
-  {
-    $params = array('teamDriveId' => $teamDriveId);
-    $params = array_merge($params, $optParams);
-    return $this->call('get', array($params), "Google_Service_Drive_TeamDrive");
-  }
-  /**
-   * Lists the user's Team Drives. (teamdrives.listTeamdrives)
-   *
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param int pageSize Maximum number of Team Drives to return.
-   * @opt_param string pageToken Page token for Team Drives.
-   * @return Google_Service_Drive_TeamDriveList
-   */
-  public function listTeamdrives($optParams = array())
-  {
-    $params = array();
-    $params = array_merge($params, $optParams);
-    return $this->call('list', array($params), "Google_Service_Drive_TeamDriveList");
-  }
-  /**
-   * Updates a Team Drive's metadata (teamdrives.update)
-   *
-   * @param string $teamDriveId The ID of the Team Drive
-   * @param Google_Service_Drive_TeamDrive $postBody
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Drive_TeamDrive
-   */
-  public function update($teamDriveId, Google_Service_Drive_TeamDrive $postBody, $optParams = array())
-  {
-    $params = array('teamDriveId' => $teamDriveId, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('update', array($params), "Google_Service_Drive_TeamDrive");
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Drive/Revision.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Drive/Revision.php
deleted file mode 100644
index c783e621..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Drive/Revision.php
+++ /dev/null
@@ -1,130 +0,0 @@
-id = $id;
-  }
-  public function getId()
-  {
-    return $this->id;
-  }
-  public function setKeepForever($keepForever)
-  {
-    $this->keepForever = $keepForever;
-  }
-  public function getKeepForever()
-  {
-    return $this->keepForever;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setLastModifyingUser(Google_Service_Drive_User $lastModifyingUser)
-  {
-    $this->lastModifyingUser = $lastModifyingUser;
-  }
-  public function getLastModifyingUser()
-  {
-    return $this->lastModifyingUser;
-  }
-  public function setMd5Checksum($md5Checksum)
-  {
-    $this->md5Checksum = $md5Checksum;
-  }
-  public function getMd5Checksum()
-  {
-    return $this->md5Checksum;
-  }
-  public function setMimeType($mimeType)
-  {
-    $this->mimeType = $mimeType;
-  }
-  public function getMimeType()
-  {
-    return $this->mimeType;
-  }
-  public function setModifiedTime($modifiedTime)
-  {
-    $this->modifiedTime = $modifiedTime;
-  }
-  public function getModifiedTime()
-  {
-    return $this->modifiedTime;
-  }
-  public function setOriginalFilename($originalFilename)
-  {
-    $this->originalFilename = $originalFilename;
-  }
-  public function getOriginalFilename()
-  {
-    return $this->originalFilename;
-  }
-  public function setPublishAuto($publishAuto)
-  {
-    $this->publishAuto = $publishAuto;
-  }
-  public function getPublishAuto()
-  {
-    return $this->publishAuto;
-  }
-  public function setPublished($published)
-  {
-    $this->published = $published;
-  }
-  public function getPublished()
-  {
-    return $this->published;
-  }
-  public function setPublishedOutsideDomain($publishedOutsideDomain)
-  {
-    $this->publishedOutsideDomain = $publishedOutsideDomain;
-  }
-  public function getPublishedOutsideDomain()
-  {
-    return $this->publishedOutsideDomain;
-  }
-  public function setSize($size)
-  {
-    $this->size = $size;
-  }
-  public function getSize()
-  {
-    return $this->size;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Drive/RevisionList.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Drive/RevisionList.php
deleted file mode 100644
index 973ea951..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Drive/RevisionList.php
+++ /dev/null
@@ -1,50 +0,0 @@
-kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setNextPageToken($nextPageToken)
-  {
-    $this->nextPageToken = $nextPageToken;
-  }
-  public function getNextPageToken()
-  {
-    return $this->nextPageToken;
-  }
-  public function setRevisions($revisions)
-  {
-    $this->revisions = $revisions;
-  }
-  public function getRevisions()
-  {
-    return $this->revisions;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Drive/StartPageToken.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Drive/StartPageToken.php
deleted file mode 100644
index cd2615ca..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Drive/StartPageToken.php
+++ /dev/null
@@ -1,39 +0,0 @@
-kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setStartPageToken($startPageToken)
-  {
-    $this->startPageToken = $startPageToken;
-  }
-  public function getStartPageToken()
-  {
-    return $this->startPageToken;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Drive/TeamDrive.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Drive/TeamDrive.php
deleted file mode 100644
index 716a74fa..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Drive/TeamDrive.php
+++ /dev/null
@@ -1,58 +0,0 @@
-capabilities = $capabilities;
-  }
-  public function getCapabilities()
-  {
-    return $this->capabilities;
-  }
-  public function setId($id)
-  {
-    $this->id = $id;
-  }
-  public function getId()
-  {
-    return $this->id;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setName($name)
-  {
-    $this->name = $name;
-  }
-  public function getName()
-  {
-    return $this->name;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Drive/TeamDriveCapabilities.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Drive/TeamDriveCapabilities.php
deleted file mode 100644
index 69913d97..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Drive/TeamDriveCapabilities.php
+++ /dev/null
@@ -1,138 +0,0 @@
-canAddChildren = $canAddChildren;
-  }
-  public function getCanAddChildren()
-  {
-    return $this->canAddChildren;
-  }
-  public function setCanComment($canComment)
-  {
-    $this->canComment = $canComment;
-  }
-  public function getCanComment()
-  {
-    return $this->canComment;
-  }
-  public function setCanCopy($canCopy)
-  {
-    $this->canCopy = $canCopy;
-  }
-  public function getCanCopy()
-  {
-    return $this->canCopy;
-  }
-  public function setCanDeleteTeamDrive($canDeleteTeamDrive)
-  {
-    $this->canDeleteTeamDrive = $canDeleteTeamDrive;
-  }
-  public function getCanDeleteTeamDrive()
-  {
-    return $this->canDeleteTeamDrive;
-  }
-  public function setCanDownload($canDownload)
-  {
-    $this->canDownload = $canDownload;
-  }
-  public function getCanDownload()
-  {
-    return $this->canDownload;
-  }
-  public function setCanEdit($canEdit)
-  {
-    $this->canEdit = $canEdit;
-  }
-  public function getCanEdit()
-  {
-    return $this->canEdit;
-  }
-  public function setCanListChildren($canListChildren)
-  {
-    $this->canListChildren = $canListChildren;
-  }
-  public function getCanListChildren()
-  {
-    return $this->canListChildren;
-  }
-  public function setCanManageMembers($canManageMembers)
-  {
-    $this->canManageMembers = $canManageMembers;
-  }
-  public function getCanManageMembers()
-  {
-    return $this->canManageMembers;
-  }
-  public function setCanReadRevisions($canReadRevisions)
-  {
-    $this->canReadRevisions = $canReadRevisions;
-  }
-  public function getCanReadRevisions()
-  {
-    return $this->canReadRevisions;
-  }
-  public function setCanRemoveChildren($canRemoveChildren)
-  {
-    $this->canRemoveChildren = $canRemoveChildren;
-  }
-  public function getCanRemoveChildren()
-  {
-    return $this->canRemoveChildren;
-  }
-  public function setCanRename($canRename)
-  {
-    $this->canRename = $canRename;
-  }
-  public function getCanRename()
-  {
-    return $this->canRename;
-  }
-  public function setCanRenameTeamDrive($canRenameTeamDrive)
-  {
-    $this->canRenameTeamDrive = $canRenameTeamDrive;
-  }
-  public function getCanRenameTeamDrive()
-  {
-    return $this->canRenameTeamDrive;
-  }
-  public function setCanShare($canShare)
-  {
-    $this->canShare = $canShare;
-  }
-  public function getCanShare()
-  {
-    return $this->canShare;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Drive/TeamDriveList.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Drive/TeamDriveList.php
deleted file mode 100644
index a64ba690..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Drive/TeamDriveList.php
+++ /dev/null
@@ -1,50 +0,0 @@
-kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setNextPageToken($nextPageToken)
-  {
-    $this->nextPageToken = $nextPageToken;
-  }
-  public function getNextPageToken()
-  {
-    return $this->nextPageToken;
-  }
-  public function setTeamDrives($teamDrives)
-  {
-    $this->teamDrives = $teamDrives;
-  }
-  public function getTeamDrives()
-  {
-    return $this->teamDrives;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Drive/User.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Drive/User.php
deleted file mode 100644
index aaa044d5..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Drive/User.php
+++ /dev/null
@@ -1,75 +0,0 @@
-displayName = $displayName;
-  }
-  public function getDisplayName()
-  {
-    return $this->displayName;
-  }
-  public function setEmailAddress($emailAddress)
-  {
-    $this->emailAddress = $emailAddress;
-  }
-  public function getEmailAddress()
-  {
-    return $this->emailAddress;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setMe($me)
-  {
-    $this->me = $me;
-  }
-  public function getMe()
-  {
-    return $this->me;
-  }
-  public function setPermissionId($permissionId)
-  {
-    $this->permissionId = $permissionId;
-  }
-  public function getPermissionId()
-  {
-    return $this->permissionId;
-  }
-  public function setPhotoLink($photoLink)
-  {
-    $this->photoLink = $photoLink;
-  }
-  public function getPhotoLink()
-  {
-    return $this->photoLink;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/FirebaseDynamicLinks.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/FirebaseDynamicLinks.php
deleted file mode 100644
index 0f7ff87b..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/FirebaseDynamicLinks.php
+++ /dev/null
@@ -1,68 +0,0 @@
-
- * Firebase Dynamic Links API enables third party developers to programmatically
- * create and manage Dynamic Links.

- *
- * 

- * For more information about this service, see the API
- * Documentation
- * 

- *
- * @author Google, Inc.
- */
-class Google_Service_FirebaseDynamicLinks extends Google_Service
-{
-  /** View and administer all your Firebase data and settings. */
-  const FIREBASE =
-      "https://www.googleapis.com/auth/firebase";
-
-  public $shortLinks;
-  
-  /**
-   * Constructs the internal representation of the FirebaseDynamicLinks service.
-   *
-   * @param Google_Client $client
-   */
-  public function __construct(Google_Client $client)
-  {
-    parent::__construct($client);
-    $this->rootUrl = 'https://firebasedynamiclinks.googleapis.com/';
-    $this->servicePath = '';
-    $this->version = 'v1';
-    $this->serviceName = 'firebasedynamiclinks';
-
-    $this->shortLinks = new Google_Service_FirebaseDynamicLinks_Resource_ShortLinks(
-        $this,
-        $this->serviceName,
-        'shortLinks',
-        array(
-          'methods' => array(
-            'create' => array(
-              'path' => 'v1/shortLinks',
-              'httpMethod' => 'POST',
-              'parameters' => array(),
-            ),
-          )
-        )
-    );
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/FirebaseDynamicLinks/AnalyticsInfo.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/FirebaseDynamicLinks/AnalyticsInfo.php
deleted file mode 100644
index f1cd2465..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/FirebaseDynamicLinks/AnalyticsInfo.php
+++ /dev/null
@@ -1,41 +0,0 @@
-googlePlayAnalytics = $googlePlayAnalytics;
-  }
-  public function getGooglePlayAnalytics()
-  {
-    return $this->googlePlayAnalytics;
-  }
-  public function setItunesConnectAnalytics(Google_Service_FirebaseDynamicLinks_ITunesConnectAnalytics $itunesConnectAnalytics)
-  {
-    $this->itunesConnectAnalytics = $itunesConnectAnalytics;
-  }
-  public function getItunesConnectAnalytics()
-  {
-    return $this->itunesConnectAnalytics;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/FirebaseDynamicLinks/AndroidInfo.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/FirebaseDynamicLinks/AndroidInfo.php
deleted file mode 100644
index d32653e9..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/FirebaseDynamicLinks/AndroidInfo.php
+++ /dev/null
@@ -1,57 +0,0 @@
-androidFallbackLink = $androidFallbackLink;
-  }
-  public function getAndroidFallbackLink()
-  {
-    return $this->androidFallbackLink;
-  }
-  public function setAndroidLink($androidLink)
-  {
-    $this->androidLink = $androidLink;
-  }
-  public function getAndroidLink()
-  {
-    return $this->androidLink;
-  }
-  public function setAndroidMinPackageVersionCode($androidMinPackageVersionCode)
-  {
-    $this->androidMinPackageVersionCode = $androidMinPackageVersionCode;
-  }
-  public function getAndroidMinPackageVersionCode()
-  {
-    return $this->androidMinPackageVersionCode;
-  }
-  public function setAndroidPackageName($androidPackageName)
-  {
-    $this->androidPackageName = $androidPackageName;
-  }
-  public function getAndroidPackageName()
-  {
-    return $this->androidPackageName;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/FirebaseDynamicLinks/CreateShortDynamicLinkRequest.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/FirebaseDynamicLinks/CreateShortDynamicLinkRequest.php
deleted file mode 100644
index 8ed9aac5..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/FirebaseDynamicLinks/CreateShortDynamicLinkRequest.php
+++ /dev/null
@@ -1,50 +0,0 @@
-dynamicLinkInfo = $dynamicLinkInfo;
-  }
-  public function getDynamicLinkInfo()
-  {
-    return $this->dynamicLinkInfo;
-  }
-  public function setLongDynamicLink($longDynamicLink)
-  {
-    $this->longDynamicLink = $longDynamicLink;
-  }
-  public function getLongDynamicLink()
-  {
-    return $this->longDynamicLink;
-  }
-  public function setSuffix(Google_Service_FirebaseDynamicLinks_Suffix $suffix)
-  {
-    $this->suffix = $suffix;
-  }
-  public function getSuffix()
-  {
-    return $this->suffix;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/FirebaseDynamicLinks/CreateShortDynamicLinkResponse.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/FirebaseDynamicLinks/CreateShortDynamicLinkResponse.php
deleted file mode 100644
index 4bc4f6f7..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/FirebaseDynamicLinks/CreateShortDynamicLinkResponse.php
+++ /dev/null
@@ -1,50 +0,0 @@
-previewLink = $previewLink;
-  }
-  public function getPreviewLink()
-  {
-    return $this->previewLink;
-  }
-  public function setShortLink($shortLink)
-  {
-    $this->shortLink = $shortLink;
-  }
-  public function getShortLink()
-  {
-    return $this->shortLink;
-  }
-  public function setWarning($warning)
-  {
-    $this->warning = $warning;
-  }
-  public function getWarning()
-  {
-    return $this->warning;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/FirebaseDynamicLinks/DynamicLinkInfo.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/FirebaseDynamicLinks/DynamicLinkInfo.php
deleted file mode 100644
index 2d5e2989..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/FirebaseDynamicLinks/DynamicLinkInfo.php
+++ /dev/null
@@ -1,89 +0,0 @@
-analyticsInfo = $analyticsInfo;
-  }
-  public function getAnalyticsInfo()
-  {
-    return $this->analyticsInfo;
-  }
-  public function setAndroidInfo(Google_Service_FirebaseDynamicLinks_AndroidInfo $androidInfo)
-  {
-    $this->androidInfo = $androidInfo;
-  }
-  public function getAndroidInfo()
-  {
-    return $this->androidInfo;
-  }
-  public function setDynamicLinkDomain($dynamicLinkDomain)
-  {
-    $this->dynamicLinkDomain = $dynamicLinkDomain;
-  }
-  public function getDynamicLinkDomain()
-  {
-    return $this->dynamicLinkDomain;
-  }
-  public function setIosInfo(Google_Service_FirebaseDynamicLinks_IosInfo $iosInfo)
-  {
-    $this->iosInfo = $iosInfo;
-  }
-  public function getIosInfo()
-  {
-    return $this->iosInfo;
-  }
-  public function setLink($link)
-  {
-    $this->link = $link;
-  }
-  public function getLink()
-  {
-    return $this->link;
-  }
-  public function setNavigationInfo(Google_Service_FirebaseDynamicLinks_NavigationInfo $navigationInfo)
-  {
-    $this->navigationInfo = $navigationInfo;
-  }
-  public function getNavigationInfo()
-  {
-    return $this->navigationInfo;
-  }
-  public function setSocialMetaTagInfo(Google_Service_FirebaseDynamicLinks_SocialMetaTagInfo $socialMetaTagInfo)
-  {
-    $this->socialMetaTagInfo = $socialMetaTagInfo;
-  }
-  public function getSocialMetaTagInfo()
-  {
-    return $this->socialMetaTagInfo;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/FirebaseDynamicLinks/DynamicLinkWarning.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/FirebaseDynamicLinks/DynamicLinkWarning.php
deleted file mode 100644
index f0e0bf48..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/FirebaseDynamicLinks/DynamicLinkWarning.php
+++ /dev/null
@@ -1,39 +0,0 @@
-warningCode = $warningCode;
-  }
-  public function getWarningCode()
-  {
-    return $this->warningCode;
-  }
-  public function setWarningMessage($warningMessage)
-  {
-    $this->warningMessage = $warningMessage;
-  }
-  public function getWarningMessage()
-  {
-    return $this->warningMessage;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/FirebaseDynamicLinks/GooglePlayAnalytics.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/FirebaseDynamicLinks/GooglePlayAnalytics.php
deleted file mode 100644
index d5a67d25..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/FirebaseDynamicLinks/GooglePlayAnalytics.php
+++ /dev/null
@@ -1,75 +0,0 @@
-gclid = $gclid;
-  }
-  public function getGclid()
-  {
-    return $this->gclid;
-  }
-  public function setUtmCampaign($utmCampaign)
-  {
-    $this->utmCampaign = $utmCampaign;
-  }
-  public function getUtmCampaign()
-  {
-    return $this->utmCampaign;
-  }
-  public function setUtmContent($utmContent)
-  {
-    $this->utmContent = $utmContent;
-  }
-  public function getUtmContent()
-  {
-    return $this->utmContent;
-  }
-  public function setUtmMedium($utmMedium)
-  {
-    $this->utmMedium = $utmMedium;
-  }
-  public function getUtmMedium()
-  {
-    return $this->utmMedium;
-  }
-  public function setUtmSource($utmSource)
-  {
-    $this->utmSource = $utmSource;
-  }
-  public function getUtmSource()
-  {
-    return $this->utmSource;
-  }
-  public function setUtmTerm($utmTerm)
-  {
-    $this->utmTerm = $utmTerm;
-  }
-  public function getUtmTerm()
-  {
-    return $this->utmTerm;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/FirebaseDynamicLinks/ITunesConnectAnalytics.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/FirebaseDynamicLinks/ITunesConnectAnalytics.php
deleted file mode 100644
index a922dfa5..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/FirebaseDynamicLinks/ITunesConnectAnalytics.php
+++ /dev/null
@@ -1,57 +0,0 @@
-at = $at;
-  }
-  public function getAt()
-  {
-    return $this->at;
-  }
-  public function setCt($ct)
-  {
-    $this->ct = $ct;
-  }
-  public function getCt()
-  {
-    return $this->ct;
-  }
-  public function setMt($mt)
-  {
-    $this->mt = $mt;
-  }
-  public function getMt()
-  {
-    return $this->mt;
-  }
-  public function setPt($pt)
-  {
-    $this->pt = $pt;
-  }
-  public function getPt()
-  {
-    return $this->pt;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/FirebaseDynamicLinks/IosInfo.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/FirebaseDynamicLinks/IosInfo.php
deleted file mode 100644
index 3ae84bc0..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/FirebaseDynamicLinks/IosInfo.php
+++ /dev/null
@@ -1,75 +0,0 @@
-iosAppStoreId = $iosAppStoreId;
-  }
-  public function getIosAppStoreId()
-  {
-    return $this->iosAppStoreId;
-  }
-  public function setIosBundleId($iosBundleId)
-  {
-    $this->iosBundleId = $iosBundleId;
-  }
-  public function getIosBundleId()
-  {
-    return $this->iosBundleId;
-  }
-  public function setIosCustomScheme($iosCustomScheme)
-  {
-    $this->iosCustomScheme = $iosCustomScheme;
-  }
-  public function getIosCustomScheme()
-  {
-    return $this->iosCustomScheme;
-  }
-  public function setIosFallbackLink($iosFallbackLink)
-  {
-    $this->iosFallbackLink = $iosFallbackLink;
-  }
-  public function getIosFallbackLink()
-  {
-    return $this->iosFallbackLink;
-  }
-  public function setIosIpadBundleId($iosIpadBundleId)
-  {
-    $this->iosIpadBundleId = $iosIpadBundleId;
-  }
-  public function getIosIpadBundleId()
-  {
-    return $this->iosIpadBundleId;
-  }
-  public function setIosIpadFallbackLink($iosIpadFallbackLink)
-  {
-    $this->iosIpadFallbackLink = $iosIpadFallbackLink;
-  }
-  public function getIosIpadFallbackLink()
-  {
-    return $this->iosIpadFallbackLink;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/FirebaseDynamicLinks/NavigationInfo.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/FirebaseDynamicLinks/NavigationInfo.php
deleted file mode 100644
index fdae5f34..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/FirebaseDynamicLinks/NavigationInfo.php
+++ /dev/null
@@ -1,30 +0,0 @@
-enableForcedRedirect = $enableForcedRedirect;
-  }
-  public function getEnableForcedRedirect()
-  {
-    return $this->enableForcedRedirect;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/FirebaseDynamicLinks/Resource/ShortLinks.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/FirebaseDynamicLinks/Resource/ShortLinks.php
deleted file mode 100644
index c725504f..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/FirebaseDynamicLinks/Resource/ShortLinks.php
+++ /dev/null
@@ -1,49 +0,0 @@
-
- *   $firebasedynamiclinksService = new Google_Service_FirebaseDynamicLinks(...);
- *   $shortLinks = $firebasedynamiclinksService->shortLinks;
- *  
- */
-class Google_Service_FirebaseDynamicLinks_Resource_ShortLinks extends Google_Service_Resource
-{
-  /**
-   * Creates a short Dynamic Link given either a valid long Dynamic Link or
-   * details such as Dynamic Link domain, Android and iOS app information. The
-   * created short Dynamic Link will not expire.
-   *
-   * Repeated calls with the same long Dynamic Link or Dynamic Link information
-   * will produce the same short Dynamic Link.
-   *
-   * The Dynamic Link domain in the request must be owned by requester's Firebase
-   * project. (shortLinks.create)
-   *
-   * @param Google_Service_FirebaseDynamicLinks_CreateShortDynamicLinkRequest $postBody
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_FirebaseDynamicLinks_CreateShortDynamicLinkResponse
-   */
-  public function create(Google_Service_FirebaseDynamicLinks_CreateShortDynamicLinkRequest $postBody, $optParams = array())
-  {
-    $params = array('postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('create', array($params), "Google_Service_FirebaseDynamicLinks_CreateShortDynamicLinkResponse");
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/FirebaseDynamicLinks/SocialMetaTagInfo.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/FirebaseDynamicLinks/SocialMetaTagInfo.php
deleted file mode 100644
index efa8c5ee..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/FirebaseDynamicLinks/SocialMetaTagInfo.php
+++ /dev/null
@@ -1,48 +0,0 @@
-socialDescription = $socialDescription;
-  }
-  public function getSocialDescription()
-  {
-    return $this->socialDescription;
-  }
-  public function setSocialImageLink($socialImageLink)
-  {
-    $this->socialImageLink = $socialImageLink;
-  }
-  public function getSocialImageLink()
-  {
-    return $this->socialImageLink;
-  }
-  public function setSocialTitle($socialTitle)
-  {
-    $this->socialTitle = $socialTitle;
-  }
-  public function getSocialTitle()
-  {
-    return $this->socialTitle;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/FirebaseDynamicLinks/Suffix.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/FirebaseDynamicLinks/Suffix.php
deleted file mode 100644
index 4e9cb2d9..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/FirebaseDynamicLinks/Suffix.php
+++ /dev/null
@@ -1,30 +0,0 @@
-option = $option;
-  }
-  public function getOption()
-  {
-    return $this->option;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/FirebaseDynamicLinksAPI.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/FirebaseDynamicLinksAPI.php
deleted file mode 100644
index 4c8ade40..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/FirebaseDynamicLinksAPI.php
+++ /dev/null
@@ -1,69 +0,0 @@
-
- * Firebase Dynamic Links API enables third party developers to create and
- * manage the Dynamic Links(go/fdl).

- *
- * 

- * For more information about this service, see the API
- * Documentation
- * 

- *
- * @author Google, Inc.
- */
-class Google_Service_FirebaseDynamicLinksAPI extends Google_Service
-{
-  /** View and administer all your Firebase data and settings. */
-  const FIREBASE =
-      "https://www.googleapis.com/auth/firebase";
-
-  public $shortDynamicLinks;
-  
-  /**
-   * Constructs the internal representation of the FirebaseDynamicLinksAPI
-   * service.
-   *
-   * @param Google_Client $client
-   */
-  public function __construct(Google_Client $client)
-  {
-    parent::__construct($client);
-    $this->rootUrl = 'https://firebasedynamiclinks.googleapis.com/';
-    $this->servicePath = '';
-    $this->version = 'v1';
-    $this->serviceName = 'firebasedynamiclinks';
-
-    $this->shortDynamicLinks = new Google_Service_FirebaseDynamicLinksAPI_Resource_ShortDynamicLinks(
-        $this,
-        $this->serviceName,
-        'shortDynamicLinks',
-        array(
-          'methods' => array(
-            'create' => array(
-              'path' => 'v1/shortDynamicLinks',
-              'httpMethod' => 'POST',
-              'parameters' => array(),
-            ),
-          )
-        )
-    );
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/FirebaseDynamicLinksAPI/AnalyticsInfo.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/FirebaseDynamicLinksAPI/AnalyticsInfo.php
deleted file mode 100644
index 07ac37af..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/FirebaseDynamicLinksAPI/AnalyticsInfo.php
+++ /dev/null
@@ -1,41 +0,0 @@
-googlePlayAnalytics = $googlePlayAnalytics;
-  }
-  public function getGooglePlayAnalytics()
-  {
-    return $this->googlePlayAnalytics;
-  }
-  public function setItunesConnectAnalytics(Google_Service_FirebaseDynamicLinksAPI_ITunesConnectAnalytics $itunesConnectAnalytics)
-  {
-    $this->itunesConnectAnalytics = $itunesConnectAnalytics;
-  }
-  public function getItunesConnectAnalytics()
-  {
-    return $this->itunesConnectAnalytics;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/FirebaseDynamicLinksAPI/AndroidInfo.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/FirebaseDynamicLinksAPI/AndroidInfo.php
deleted file mode 100644
index 63badeac..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/FirebaseDynamicLinksAPI/AndroidInfo.php
+++ /dev/null
@@ -1,57 +0,0 @@
-androidFallbackLink = $androidFallbackLink;
-  }
-  public function getAndroidFallbackLink()
-  {
-    return $this->androidFallbackLink;
-  }
-  public function setAndroidLink($androidLink)
-  {
-    $this->androidLink = $androidLink;
-  }
-  public function getAndroidLink()
-  {
-    return $this->androidLink;
-  }
-  public function setAndroidMinPackageVersionCode($androidMinPackageVersionCode)
-  {
-    $this->androidMinPackageVersionCode = $androidMinPackageVersionCode;
-  }
-  public function getAndroidMinPackageVersionCode()
-  {
-    return $this->androidMinPackageVersionCode;
-  }
-  public function setAndroidPackageName($androidPackageName)
-  {
-    $this->androidPackageName = $androidPackageName;
-  }
-  public function getAndroidPackageName()
-  {
-    return $this->androidPackageName;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/FirebaseDynamicLinksAPI/CreateShortDynamicLinkRequest.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/FirebaseDynamicLinksAPI/CreateShortDynamicLinkRequest.php
deleted file mode 100644
index 969f4ed7..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/FirebaseDynamicLinksAPI/CreateShortDynamicLinkRequest.php
+++ /dev/null
@@ -1,50 +0,0 @@
-dynamicLinkInfo = $dynamicLinkInfo;
-  }
-  public function getDynamicLinkInfo()
-  {
-    return $this->dynamicLinkInfo;
-  }
-  public function setLongDynamicLink($longDynamicLink)
-  {
-    $this->longDynamicLink = $longDynamicLink;
-  }
-  public function getLongDynamicLink()
-  {
-    return $this->longDynamicLink;
-  }
-  public function setSuffix(Google_Service_FirebaseDynamicLinksAPI_Suffix $suffix)
-  {
-    $this->suffix = $suffix;
-  }
-  public function getSuffix()
-  {
-    return $this->suffix;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/FirebaseDynamicLinksAPI/CreateShortDynamicLinkResponse.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/FirebaseDynamicLinksAPI/CreateShortDynamicLinkResponse.php
deleted file mode 100644
index 36d3f033..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/FirebaseDynamicLinksAPI/CreateShortDynamicLinkResponse.php
+++ /dev/null
@@ -1,50 +0,0 @@
-previewLink = $previewLink;
-  }
-  public function getPreviewLink()
-  {
-    return $this->previewLink;
-  }
-  public function setShortLink($shortLink)
-  {
-    $this->shortLink = $shortLink;
-  }
-  public function getShortLink()
-  {
-    return $this->shortLink;
-  }
-  public function setWarning($warning)
-  {
-    $this->warning = $warning;
-  }
-  public function getWarning()
-  {
-    return $this->warning;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/FirebaseDynamicLinksAPI/DynamicLinkInfo.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/FirebaseDynamicLinksAPI/DynamicLinkInfo.php
deleted file mode 100644
index 5848ca45..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/FirebaseDynamicLinksAPI/DynamicLinkInfo.php
+++ /dev/null
@@ -1,88 +0,0 @@
-analyticsInfo = $analyticsInfo;
-  }
-  public function getAnalyticsInfo()
-  {
-    return $this->analyticsInfo;
-  }
-  public function setAndroidInfo(Google_Service_FirebaseDynamicLinksAPI_AndroidInfo $androidInfo)
-  {
-    $this->androidInfo = $androidInfo;
-  }
-  public function getAndroidInfo()
-  {
-    return $this->androidInfo;
-  }
-  public function setDynamicLinkDomain($dynamicLinkDomain)
-  {
-    $this->dynamicLinkDomain = $dynamicLinkDomain;
-  }
-  public function getDynamicLinkDomain()
-  {
-    return $this->dynamicLinkDomain;
-  }
-  public function setIosInfo(Google_Service_FirebaseDynamicLinksAPI_IosInfo $iosInfo)
-  {
-    $this->iosInfo = $iosInfo;
-  }
-  public function getIosInfo()
-  {
-    return $this->iosInfo;
-  }
-  public function setIsAd($isAd)
-  {
-    $this->isAd = $isAd;
-  }
-  public function getIsAd()
-  {
-    return $this->isAd;
-  }
-  public function setLink($link)
-  {
-    $this->link = $link;
-  }
-  public function getLink()
-  {
-    return $this->link;
-  }
-  public function setSocialMetaTagInfo(Google_Service_FirebaseDynamicLinksAPI_SocialMetaTagInfo $socialMetaTagInfo)
-  {
-    $this->socialMetaTagInfo = $socialMetaTagInfo;
-  }
-  public function getSocialMetaTagInfo()
-  {
-    return $this->socialMetaTagInfo;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/FirebaseDynamicLinksAPI/DynamicLinkWarning.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/FirebaseDynamicLinksAPI/DynamicLinkWarning.php
deleted file mode 100644
index d67a925d..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/FirebaseDynamicLinksAPI/DynamicLinkWarning.php
+++ /dev/null
@@ -1,39 +0,0 @@
-warningCode = $warningCode;
-  }
-  public function getWarningCode()
-  {
-    return $this->warningCode;
-  }
-  public function setWarningMessage($warningMessage)
-  {
-    $this->warningMessage = $warningMessage;
-  }
-  public function getWarningMessage()
-  {
-    return $this->warningMessage;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/FirebaseDynamicLinksAPI/GooglePlayAnalytics.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/FirebaseDynamicLinksAPI/GooglePlayAnalytics.php
deleted file mode 100644
index 906acffb..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/FirebaseDynamicLinksAPI/GooglePlayAnalytics.php
+++ /dev/null
@@ -1,75 +0,0 @@
-gclid = $gclid;
-  }
-  public function getGclid()
-  {
-    return $this->gclid;
-  }
-  public function setUtmCampaign($utmCampaign)
-  {
-    $this->utmCampaign = $utmCampaign;
-  }
-  public function getUtmCampaign()
-  {
-    return $this->utmCampaign;
-  }
-  public function setUtmContent($utmContent)
-  {
-    $this->utmContent = $utmContent;
-  }
-  public function getUtmContent()
-  {
-    return $this->utmContent;
-  }
-  public function setUtmMedium($utmMedium)
-  {
-    $this->utmMedium = $utmMedium;
-  }
-  public function getUtmMedium()
-  {
-    return $this->utmMedium;
-  }
-  public function setUtmSource($utmSource)
-  {
-    $this->utmSource = $utmSource;
-  }
-  public function getUtmSource()
-  {
-    return $this->utmSource;
-  }
-  public function setUtmTerm($utmTerm)
-  {
-    $this->utmTerm = $utmTerm;
-  }
-  public function getUtmTerm()
-  {
-    return $this->utmTerm;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/FirebaseDynamicLinksAPI/ITunesConnectAnalytics.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/FirebaseDynamicLinksAPI/ITunesConnectAnalytics.php
deleted file mode 100644
index 14f77741..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/FirebaseDynamicLinksAPI/ITunesConnectAnalytics.php
+++ /dev/null
@@ -1,57 +0,0 @@
-at = $at;
-  }
-  public function getAt()
-  {
-    return $this->at;
-  }
-  public function setCt($ct)
-  {
-    $this->ct = $ct;
-  }
-  public function getCt()
-  {
-    return $this->ct;
-  }
-  public function setMt($mt)
-  {
-    $this->mt = $mt;
-  }
-  public function getMt()
-  {
-    return $this->mt;
-  }
-  public function setPt($pt)
-  {
-    $this->pt = $pt;
-  }
-  public function getPt()
-  {
-    return $this->pt;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/FirebaseDynamicLinksAPI/IosInfo.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/FirebaseDynamicLinksAPI/IosInfo.php
deleted file mode 100644
index acea3641..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/FirebaseDynamicLinksAPI/IosInfo.php
+++ /dev/null
@@ -1,75 +0,0 @@
-iosAppStoreId = $iosAppStoreId;
-  }
-  public function getIosAppStoreId()
-  {
-    return $this->iosAppStoreId;
-  }
-  public function setIosBundleId($iosBundleId)
-  {
-    $this->iosBundleId = $iosBundleId;
-  }
-  public function getIosBundleId()
-  {
-    return $this->iosBundleId;
-  }
-  public function setIosCustomScheme($iosCustomScheme)
-  {
-    $this->iosCustomScheme = $iosCustomScheme;
-  }
-  public function getIosCustomScheme()
-  {
-    return $this->iosCustomScheme;
-  }
-  public function setIosFallbackLink($iosFallbackLink)
-  {
-    $this->iosFallbackLink = $iosFallbackLink;
-  }
-  public function getIosFallbackLink()
-  {
-    return $this->iosFallbackLink;
-  }
-  public function setIosIpadBundleId($iosIpadBundleId)
-  {
-    $this->iosIpadBundleId = $iosIpadBundleId;
-  }
-  public function getIosIpadBundleId()
-  {
-    return $this->iosIpadBundleId;
-  }
-  public function setIosIpadFallbackLink($iosIpadFallbackLink)
-  {
-    $this->iosIpadFallbackLink = $iosIpadFallbackLink;
-  }
-  public function getIosIpadFallbackLink()
-  {
-    return $this->iosIpadFallbackLink;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/FirebaseDynamicLinksAPI/Resource/ShortDynamicLinks.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/FirebaseDynamicLinksAPI/Resource/ShortDynamicLinks.php
deleted file mode 100644
index 9c4a183d..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/FirebaseDynamicLinksAPI/Resource/ShortDynamicLinks.php
+++ /dev/null
@@ -1,49 +0,0 @@
-
- *   $firebasedynamiclinksService = new Google_Service_FirebaseDynamicLinksAPI(...);
- *   $shortDynamicLinks = $firebasedynamiclinksService->shortDynamicLinks;
- *  
- */
-class Google_Service_FirebaseDynamicLinksAPI_Resource_ShortDynamicLinks extends Google_Service_Resource
-{
-  /**
-   * Creates a short Dynamic Link given either a valid long Dynamic Link or
-   * details such as Dynamic Link domain, Android and iOS app information. The
-   * created short Dynamic Link will not expire.
-   *
-   * Repeated calls with the same long Dynamic Link or Dynamic Link information
-   * will produce the same short Dynamic Link.
-   *
-   * The Dynamic Link domain in the request must be owned by requester's Firebase
-   * project. (shortDynamicLinks.create)
-   *
-   * @param Google_Service_FirebaseDynamicLinksAPI_CreateShortDynamicLinkRequest $postBody
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_FirebaseDynamicLinksAPI_CreateShortDynamicLinkResponse
-   */
-  public function create(Google_Service_FirebaseDynamicLinksAPI_CreateShortDynamicLinkRequest $postBody, $optParams = array())
-  {
-    $params = array('postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('create', array($params), "Google_Service_FirebaseDynamicLinksAPI_CreateShortDynamicLinkResponse");
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/FirebaseDynamicLinksAPI/SocialMetaTagInfo.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/FirebaseDynamicLinksAPI/SocialMetaTagInfo.php
deleted file mode 100644
index e7317da7..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/FirebaseDynamicLinksAPI/SocialMetaTagInfo.php
+++ /dev/null
@@ -1,48 +0,0 @@
-socialDescription = $socialDescription;
-  }
-  public function getSocialDescription()
-  {
-    return $this->socialDescription;
-  }
-  public function setSocialImageLink($socialImageLink)
-  {
-    $this->socialImageLink = $socialImageLink;
-  }
-  public function getSocialImageLink()
-  {
-    return $this->socialImageLink;
-  }
-  public function setSocialTitle($socialTitle)
-  {
-    $this->socialTitle = $socialTitle;
-  }
-  public function getSocialTitle()
-  {
-    return $this->socialTitle;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/FirebaseDynamicLinksAPI/Suffix.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/FirebaseDynamicLinksAPI/Suffix.php
deleted file mode 100644
index 63b6f42d..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/FirebaseDynamicLinksAPI/Suffix.php
+++ /dev/null
@@ -1,30 +0,0 @@
-option = $option;
-  }
-  public function getOption()
-  {
-    return $this->option;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/FirebaseRulesAPI.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/FirebaseRulesAPI.php
deleted file mode 100644
index 459af977..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/FirebaseRulesAPI.php
+++ /dev/null
@@ -1,212 +0,0 @@
-
- * Creates and manages rules that determine when a Firebase Rules-enabled
- * service should permit a request.

- *
- * 

- * For more information about this service, see the API
- * Documentation
- * 

- *
- * @author Google, Inc.
- */
-class Google_Service_FirebaseRulesAPI extends Google_Service
-{
-  /** View and manage your data across Google Cloud Platform services. */
-  const CLOUD_PLATFORM =
-      "https://www.googleapis.com/auth/cloud-platform";
-  /** View and administer all your Firebase data and settings. */
-  const FIREBASE =
-      "https://www.googleapis.com/auth/firebase";
-  /** View all your Firebase data and settings. */
-  const FIREBASE_READONLY =
-      "https://www.googleapis.com/auth/firebase.readonly";
-
-  public $projects;
-  public $projects_releases;
-  public $projects_rulesets;
-  
-  /**
-   * Constructs the internal representation of the FirebaseRulesAPI service.
-   *
-   * @param Google_Client $client
-   */
-  public function __construct(Google_Client $client)
-  {
-    parent::__construct($client);
-    $this->rootUrl = 'https://firebaserules.googleapis.com/';
-    $this->servicePath = '';
-    $this->version = 'v1';
-    $this->serviceName = 'firebaserules';
-
-    $this->projects = new Google_Service_FirebaseRulesAPI_Resource_Projects(
-        $this,
-        $this->serviceName,
-        'projects',
-        array(
-          'methods' => array(
-            'test' => array(
-              'path' => 'v1/{+name}:test',
-              'httpMethod' => 'POST',
-              'parameters' => array(
-                'name' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),
-          )
-        )
-    );
-    $this->projects_releases = new Google_Service_FirebaseRulesAPI_Resource_ProjectsReleases(
-        $this,
-        $this->serviceName,
-        'releases',
-        array(
-          'methods' => array(
-            'create' => array(
-              'path' => 'v1/{+name}/releases',
-              'httpMethod' => 'POST',
-              'parameters' => array(
-                'name' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'delete' => array(
-              'path' => 'v1/{+name}',
-              'httpMethod' => 'DELETE',
-              'parameters' => array(
-                'name' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'get' => array(
-              'path' => 'v1/{+name}',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'name' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'list' => array(
-              'path' => 'v1/{+name}/releases',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'name' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'pageSize' => array(
-                  'location' => 'query',
-                  'type' => 'integer',
-                ),
-                'filter' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'pageToken' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-              ),
-            ),'update' => array(
-              'path' => 'v1/{+name}',
-              'httpMethod' => 'PUT',
-              'parameters' => array(
-                'name' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),
-          )
-        )
-    );
-    $this->projects_rulesets = new Google_Service_FirebaseRulesAPI_Resource_ProjectsRulesets(
-        $this,
-        $this->serviceName,
-        'rulesets',
-        array(
-          'methods' => array(
-            'create' => array(
-              'path' => 'v1/{+name}/rulesets',
-              'httpMethod' => 'POST',
-              'parameters' => array(
-                'name' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'delete' => array(
-              'path' => 'v1/{+name}',
-              'httpMethod' => 'DELETE',
-              'parameters' => array(
-                'name' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'get' => array(
-              'path' => 'v1/{+name}',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'name' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'list' => array(
-              'path' => 'v1/{+name}/rulesets',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'name' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'pageSize' => array(
-                  'location' => 'query',
-                  'type' => 'integer',
-                ),
-                'pageToken' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-              ),
-            ),
-          )
-        )
-    );
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/FirebaseRulesAPI/FirebaserulesEmpty.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/FirebaseRulesAPI/FirebaserulesEmpty.php
deleted file mode 100644
index 2583a330..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/FirebaseRulesAPI/FirebaserulesEmpty.php
+++ /dev/null
@@ -1,20 +0,0 @@
-content = $content;
-  }
-  public function getContent()
-  {
-    return $this->content;
-  }
-  public function setFingerprint($fingerprint)
-  {
-    $this->fingerprint = $fingerprint;
-  }
-  public function getFingerprint()
-  {
-    return $this->fingerprint;
-  }
-  public function setName($name)
-  {
-    $this->name = $name;
-  }
-  public function getName()
-  {
-    return $this->name;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/FirebaseRulesAPI/Issue.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/FirebaseRulesAPI/Issue.php
deleted file mode 100644
index 01b73c9a..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/FirebaseRulesAPI/Issue.php
+++ /dev/null
@@ -1,49 +0,0 @@
-description = $description;
-  }
-  public function getDescription()
-  {
-    return $this->description;
-  }
-  public function setSeverity($severity)
-  {
-    $this->severity = $severity;
-  }
-  public function getSeverity()
-  {
-    return $this->severity;
-  }
-  public function setSourcePosition(Google_Service_FirebaseRulesAPI_SourcePosition $sourcePosition)
-  {
-    $this->sourcePosition = $sourcePosition;
-  }
-  public function getSourcePosition()
-  {
-    return $this->sourcePosition;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/FirebaseRulesAPI/ListReleasesResponse.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/FirebaseRulesAPI/ListReleasesResponse.php
deleted file mode 100644
index a3f9575d..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/FirebaseRulesAPI/ListReleasesResponse.php
+++ /dev/null
@@ -1,41 +0,0 @@
-nextPageToken = $nextPageToken;
-  }
-  public function getNextPageToken()
-  {
-    return $this->nextPageToken;
-  }
-  public function setReleases($releases)
-  {
-    $this->releases = $releases;
-  }
-  public function getReleases()
-  {
-    return $this->releases;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/FirebaseRulesAPI/ListRulesetsResponse.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/FirebaseRulesAPI/ListRulesetsResponse.php
deleted file mode 100644
index c94753cb..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/FirebaseRulesAPI/ListRulesetsResponse.php
+++ /dev/null
@@ -1,41 +0,0 @@
-nextPageToken = $nextPageToken;
-  }
-  public function getNextPageToken()
-  {
-    return $this->nextPageToken;
-  }
-  public function setRulesets($rulesets)
-  {
-    $this->rulesets = $rulesets;
-  }
-  public function getRulesets()
-  {
-    return $this->rulesets;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/FirebaseRulesAPI/Release.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/FirebaseRulesAPI/Release.php
deleted file mode 100644
index eff6c456..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/FirebaseRulesAPI/Release.php
+++ /dev/null
@@ -1,57 +0,0 @@
-createTime = $createTime;
-  }
-  public function getCreateTime()
-  {
-    return $this->createTime;
-  }
-  public function setName($name)
-  {
-    $this->name = $name;
-  }
-  public function getName()
-  {
-    return $this->name;
-  }
-  public function setRulesetName($rulesetName)
-  {
-    $this->rulesetName = $rulesetName;
-  }
-  public function getRulesetName()
-  {
-    return $this->rulesetName;
-  }
-  public function setUpdateTime($updateTime)
-  {
-    $this->updateTime = $updateTime;
-  }
-  public function getUpdateTime()
-  {
-    return $this->updateTime;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/FirebaseRulesAPI/Resource/Projects.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/FirebaseRulesAPI/Resource/Projects.php
deleted file mode 100644
index 344eda48..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/FirebaseRulesAPI/Resource/Projects.php
+++ /dev/null
@@ -1,62 +0,0 @@
-
- *   $firebaserulesService = new Google_Service_FirebaseRulesAPI(...);
- *   $projects = $firebaserulesService->projects;
- *  
- */
-class Google_Service_FirebaseRulesAPI_Resource_Projects extends Google_Service_Resource
-{
-  /**
-   * Test `Source` for syntactic and semantic correctness. Issues present in the
-   * rules, if any, will be returned to the caller with a description, severity,
-   * and source location.
-   *
-   * The test method will typically be executed with a developer provided
-   * `Source`, but if regression testing is desired, this method may be executed
-   * against a `Ruleset` resource name and the `Source` will be retrieved from the
-   * persisted `Ruleset`.
-   *
-   * The following is an example of `Source` that permits users to upload images
-   * to a bucket bearing their user id and matching the correct metadata:
-   *
-   * _*Example*_
-   *
-   *     // Users are allowed to subscribe and unsubscribe to the blog.
-   * service firebase.storage {       match /users/{userId}/images/{imageName} {
-   * allow write: if userId == request.userId               &&
-   * (imageName.endsWith('.png') || imageName.endsWith('.jpg'))               &&
-   * resource.mimeType.startsWith('image/')       }     } (projects.test)
-   *
-   * @param string $name Name of the project.
-   *
-   * Format: `projects/{project_id}`
-   * @param Google_Service_FirebaseRulesAPI_TestRulesetRequest $postBody
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_FirebaseRulesAPI_TestRulesetResponse
-   */
-  public function test($name, Google_Service_FirebaseRulesAPI_TestRulesetRequest $postBody, $optParams = array())
-  {
-    $params = array('name' => $name, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('test', array($params), "Google_Service_FirebaseRulesAPI_TestRulesetResponse");
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/FirebaseRulesAPI/Resource/ProjectsReleases.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/FirebaseRulesAPI/Resource/ProjectsReleases.php
deleted file mode 100644
index b0911978..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/FirebaseRulesAPI/Resource/ProjectsReleases.php
+++ /dev/null
@@ -1,186 +0,0 @@
-
- *   $firebaserulesService = new Google_Service_FirebaseRulesAPI(...);
- *   $releases = $firebaserulesService->releases;
- *  
- */
-class Google_Service_FirebaseRulesAPI_Resource_ProjectsReleases extends Google_Service_Resource
-{
-  /**
-   * Create a `Release`.
-   *
-   * Release names should reflect the developer's deployment practices. For
-   * example, the release name may include the environment name, application name,
-   * application version, or any other name meaningful to the developer. Once a
-   * `Release` refers to a `Ruleset`, the rules can be enforced by Firebase Rules-
-   * enabled services.
-   *
-   * More than one `Release` may be 'live' concurrently. Consider the following
-   * three `Release` names for `projects/foo` and the `Ruleset` to which they
-   * refer.
-   *
-   * Release Name                    | Ruleset Name
-   * --------------------------------|------------- projects/foo/releases/prod
-   * | projects/foo/rulesets/uuid123 projects/foo/releases/prod/beta |
-   * projects/foo/rulesets/uuid123 projects/foo/releases/prod/v23  |
-   * projects/foo/rulesets/uuid456
-   *
-   * The table reflects the `Ruleset` rollout in progress. The `prod` and
-   * `prod/beta` releases refer to the same `Ruleset`. However, `prod/v23` refers
-   * to a new `Ruleset`. The `Ruleset` reference for a `Release` may be updated
-   * using the UpdateRelease method, and the custom `Release` name may be
-   * referenced by specifying the `X-Firebase-Rules-Release-Name` header.
-   * (releases.create)
-   *
-   * @param string $name Resource name for the project which owns this `Release`.
-   *
-   * Format: `projects/{project_id}`
-   * @param Google_Service_FirebaseRulesAPI_Release $postBody
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_FirebaseRulesAPI_Release
-   */
-  public function create($name, Google_Service_FirebaseRulesAPI_Release $postBody, $optParams = array())
-  {
-    $params = array('name' => $name, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('create', array($params), "Google_Service_FirebaseRulesAPI_Release");
-  }
-  /**
-   * Delete a `Release` by resource name. (releases.delete)
-   *
-   * @param string $name Resource name for the `Release` to delete.
-   *
-   * Format: `projects/{project_id}/releases/{release_id}`
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_FirebaseRulesAPI_FirebaserulesEmpty
-   */
-  public function delete($name, $optParams = array())
-  {
-    $params = array('name' => $name);
-    $params = array_merge($params, $optParams);
-    return $this->call('delete', array($params), "Google_Service_FirebaseRulesAPI_FirebaserulesEmpty");
-  }
-  /**
-   * Get a `Release` by name. (releases.get)
-   *
-   * @param string $name Resource name of the `Release`.
-   *
-   * Format: `projects/{project_id}/releases/{release_id}`
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_FirebaseRulesAPI_Release
-   */
-  public function get($name, $optParams = array())
-  {
-    $params = array('name' => $name);
-    $params = array_merge($params, $optParams);
-    return $this->call('get', array($params), "Google_Service_FirebaseRulesAPI_Release");
-  }
-  /**
-   * List the `Release` values for a project. This list may optionally be filtered
-   * by `Release` name or `Ruleset` id or both. (releases.listProjectsReleases)
-   *
-   * @param string $name Resource name for the project.
-   *
-   * Format: `projects/{project_id}`
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param int pageSize Page size to load. Maximum of 100. Defaults to 10.
-   * Note: `page_size` is just a hint and the service may choose to load less than
-   * `page_size` due to the size of the output. To traverse all of the releases,
-   * caller should iterate until the `page_token` is empty.
-   * @opt_param string filter `Release` filter. The list method supports filters
-   * with restrictions on the `Release` `name` and also on the `Ruleset`
-   * `ruleset_name`.
-   *
-   * Example 1) A filter of 'name=prod*' might return `Release`s with names within
-   * 'projects/foo' prefixed with 'prod':
-   *
-   * Name                          | Ruleset Name
-   * ------------------------------|------------- projects/foo/releases/prod    |
-   * projects/foo/rulesets/uuid1234 projects/foo/releases/prod/v1 |
-   * projects/foo/rulesets/uuid1234 projects/foo/releases/prod/v2 |
-   * projects/foo/rulesets/uuid8888
-   *
-   * Example 2) A filter of `name=prod* ruleset_name=uuid1234` would return only
-   * `Release` instances for 'projects/foo' with names prefixed with 'prod'
-   * referring to the same `Ruleset` name of 'uuid1234':
-   *
-   * Name                          | Ruleset Name
-   * ------------------------------|------------- projects/foo/releases/prod    |
-   * projects/foo/rulesets/1234 projects/foo/releases/prod/v1 |
-   * projects/foo/rulesets/1234
-   *
-   * In the examples, the filter parameters refer to the search filters for
-   * release and ruleset names are relative to the project releases and rulesets
-   * collections. Fully qualified prefixed may also be used. e.g.
-   * `name=projects/foo/releases/prod* ruleset_name=projects/foo/rulesets/uuid1`
-   * @opt_param string pageToken Next page token for the next batch of `Release`
-   * instances.
-   * @return Google_Service_FirebaseRulesAPI_ListReleasesResponse
-   */
-  public function listProjectsReleases($name, $optParams = array())
-  {
-    $params = array('name' => $name);
-    $params = array_merge($params, $optParams);
-    return $this->call('list', array($params), "Google_Service_FirebaseRulesAPI_ListReleasesResponse");
-  }
-  /**
-   * Update a `Release`.
-   *
-   * Only updates to the `ruleset_name` field will be honored. `Release` rename is
-   * not supported. To create a `Release` use the CreateRelease method instead.
-   * (releases.update)
-   *
-   * @param string $name Resource name for the `Release`.
-   *
-   * `Release` names may be structured `app1/prod/v2` or flat `app1_prod_v2` which
-   * affords developers a great deal of flexibility in mapping the name to the
-   * style that best fits their existing development practices. For example, a
-   * name could refer to an environment, an app, a version, or some combination of
-   * three.
-   *
-   * In the table below, for the project name `projects/foo`, the following
-   * relative release paths show how flat and structured names might be chosen to
-   * match a desired development / deployment strategy.
-   *
-   * Use Case     | Flat Name           | Structured Name
-   * -------------|---------------------|---------------- Environments |
-   * releases/qa         | releases/qa Apps         | releases/app1_qa    |
-   * releases/app1/qa Versions     | releases/app1_v2_qa | releases/app1/v2/qa
-   *
-   * The delimiter between the release name path elements can be almost anything
-   * and it should work equally well with the release name list filter, but in
-   * many ways the structured paths provide a clearer picture of the relationship
-   * between `Release` instances.
-   *
-   * Format: `projects/{project_id}/releases/{release_id}`
-   * @param Google_Service_FirebaseRulesAPI_Release $postBody
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_FirebaseRulesAPI_Release
-   */
-  public function update($name, Google_Service_FirebaseRulesAPI_Release $postBody, $optParams = array())
-  {
-    $params = array('name' => $name, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('update', array($params), "Google_Service_FirebaseRulesAPI_Release");
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/FirebaseRulesAPI/Resource/ProjectsRulesets.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/FirebaseRulesAPI/Resource/ProjectsRulesets.php
deleted file mode 100644
index 56b66c4e..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/FirebaseRulesAPI/Resource/ProjectsRulesets.php
+++ /dev/null
@@ -1,108 +0,0 @@
-
- *   $firebaserulesService = new Google_Service_FirebaseRulesAPI(...);
- *   $rulesets = $firebaserulesService->rulesets;
- *  
- */
-class Google_Service_FirebaseRulesAPI_Resource_ProjectsRulesets extends Google_Service_Resource
-{
-  /**
-   * Create a `Ruleset` from `Source`.
-   *
-   * The `Ruleset` is given a unique generated name which is returned to the
-   * caller. `Source` containing syntactic or semantics errors will result in an
-   * error response indicating the first error encountered. For a detailed view of
-   * `Source` issues, use TestRuleset. (rulesets.create)
-   *
-   * @param string $name Resource name for Project which owns this `Ruleset`.
-   *
-   * Format: `projects/{project_id}`
-   * @param Google_Service_FirebaseRulesAPI_Ruleset $postBody
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_FirebaseRulesAPI_Ruleset
-   */
-  public function create($name, Google_Service_FirebaseRulesAPI_Ruleset $postBody, $optParams = array())
-  {
-    $params = array('name' => $name, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('create', array($params), "Google_Service_FirebaseRulesAPI_Ruleset");
-  }
-  /**
-   * Delete a `Ruleset` by resource name.
-   *
-   * If the `Ruleset` is referenced by a `Release` the operation will fail.
-   * (rulesets.delete)
-   *
-   * @param string $name Resource name for the ruleset to delete.
-   *
-   * Format: `projects/{project_id}/rulesets/{ruleset_id}`
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_FirebaseRulesAPI_FirebaserulesEmpty
-   */
-  public function delete($name, $optParams = array())
-  {
-    $params = array('name' => $name);
-    $params = array_merge($params, $optParams);
-    return $this->call('delete', array($params), "Google_Service_FirebaseRulesAPI_FirebaserulesEmpty");
-  }
-  /**
-   * Get a `Ruleset` by name including the full `Source` contents. (rulesets.get)
-   *
-   * @param string $name Resource name for the ruleset to get.
-   *
-   * Format: `projects/{project_id}/rulesets/{ruleset_id}`
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_FirebaseRulesAPI_Ruleset
-   */
-  public function get($name, $optParams = array())
-  {
-    $params = array('name' => $name);
-    $params = array_merge($params, $optParams);
-    return $this->call('get', array($params), "Google_Service_FirebaseRulesAPI_Ruleset");
-  }
-  /**
-   * List `Ruleset` metadata only and optionally filter the results by Ruleset
-   * name.
-   *
-   * The full `Source` contents of a `Ruleset` may be retrieved with GetRuleset.
-   * (rulesets.listProjectsRulesets)
-   *
-   * @param string $name Resource name for the project.
-   *
-   * Format: `projects/{project_id}`
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param int pageSize Page size to load. Maximum of 100. Defaults to 10.
-   * Note: `page_size` is just a hint and the service may choose to load less than
-   * `page_size` due to the size of the output. To traverse all of the releases,
-   * caller should iterate until the `page_token` is empty.
-   * @opt_param string pageToken Next page token for loading the next batch of
-   * `Ruleset` instances.
-   * @return Google_Service_FirebaseRulesAPI_ListRulesetsResponse
-   */
-  public function listProjectsRulesets($name, $optParams = array())
-  {
-    $params = array('name' => $name);
-    $params = array_merge($params, $optParams);
-    return $this->call('list', array($params), "Google_Service_FirebaseRulesAPI_ListRulesetsResponse");
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/FirebaseRulesAPI/Ruleset.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/FirebaseRulesAPI/Ruleset.php
deleted file mode 100644
index 567d1017..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/FirebaseRulesAPI/Ruleset.php
+++ /dev/null
@@ -1,49 +0,0 @@
-createTime = $createTime;
-  }
-  public function getCreateTime()
-  {
-    return $this->createTime;
-  }
-  public function setName($name)
-  {
-    $this->name = $name;
-  }
-  public function getName()
-  {
-    return $this->name;
-  }
-  public function setSource(Google_Service_FirebaseRulesAPI_Source $source)
-  {
-    $this->source = $source;
-  }
-  public function getSource()
-  {
-    return $this->source;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/FirebaseRulesAPI/Source.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/FirebaseRulesAPI/Source.php
deleted file mode 100644
index 4ad6e5bb..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/FirebaseRulesAPI/Source.php
+++ /dev/null
@@ -1,32 +0,0 @@
-files = $files;
-  }
-  public function getFiles()
-  {
-    return $this->files;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/FirebaseRulesAPI/SourcePosition.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/FirebaseRulesAPI/SourcePosition.php
deleted file mode 100644
index 4c62629e..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/FirebaseRulesAPI/SourcePosition.php
+++ /dev/null
@@ -1,48 +0,0 @@
-column = $column;
-  }
-  public function getColumn()
-  {
-    return $this->column;
-  }
-  public function setFileName($fileName)
-  {
-    $this->fileName = $fileName;
-  }
-  public function getFileName()
-  {
-    return $this->fileName;
-  }
-  public function setLine($line)
-  {
-    $this->line = $line;
-  }
-  public function getLine()
-  {
-    return $this->line;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/FirebaseRulesAPI/TestRulesetRequest.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/FirebaseRulesAPI/TestRulesetRequest.php
deleted file mode 100644
index 48533a52..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/FirebaseRulesAPI/TestRulesetRequest.php
+++ /dev/null
@@ -1,31 +0,0 @@
-source = $source;
-  }
-  public function getSource()
-  {
-    return $this->source;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/FirebaseRulesAPI/TestRulesetResponse.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/FirebaseRulesAPI/TestRulesetResponse.php
deleted file mode 100644
index f888d46b..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/FirebaseRulesAPI/TestRulesetResponse.php
+++ /dev/null
@@ -1,32 +0,0 @@
-issues = $issues;
-  }
-  public function getIssues()
-  {
-    return $this->issues;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Fitness.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Fitness.php
deleted file mode 100644
index be8fc184..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Fitness.php
+++ /dev/null
@@ -1,386 +0,0 @@
-
- * Stores and accesses user data in the fitness store from apps on any platform.

- *
- * 

- * For more information about this service, see the API
- * Documentation
- * 

- *
- * @author Google, Inc.
- */
-class Google_Service_Fitness extends Google_Service
-{
-  /** View your activity information in Google Fit. */
-  const FITNESS_ACTIVITY_READ =
-      "https://www.googleapis.com/auth/fitness.activity.read";
-  /** View and store your activity information in Google Fit. */
-  const FITNESS_ACTIVITY_WRITE =
-      "https://www.googleapis.com/auth/fitness.activity.write";
-  /** View blood glucose data in Google Fit. */
-  const FITNESS_BLOOD_GLUCOSE_READ =
-      "https://www.googleapis.com/auth/fitness.blood_glucose.read";
-  /** View and store blood glucose data in Google Fit. */
-  const FITNESS_BLOOD_GLUCOSE_WRITE =
-      "https://www.googleapis.com/auth/fitness.blood_glucose.write";
-  /** View blood pressure data in Google Fit. */
-  const FITNESS_BLOOD_PRESSURE_READ =
-      "https://www.googleapis.com/auth/fitness.blood_pressure.read";
-  /** View and store blood pressure data in Google Fit. */
-  const FITNESS_BLOOD_PRESSURE_WRITE =
-      "https://www.googleapis.com/auth/fitness.blood_pressure.write";
-  /** View body sensor information in Google Fit. */
-  const FITNESS_BODY_READ =
-      "https://www.googleapis.com/auth/fitness.body.read";
-  /** View and store body sensor data in Google Fit. */
-  const FITNESS_BODY_WRITE =
-      "https://www.googleapis.com/auth/fitness.body.write";
-  /** View body temperature data in Google Fit. */
-  const FITNESS_BODY_TEMPERATURE_READ =
-      "https://www.googleapis.com/auth/fitness.body_temperature.read";
-  /** View and store body temperature data in Google Fit. */
-  const FITNESS_BODY_TEMPERATURE_WRITE =
-      "https://www.googleapis.com/auth/fitness.body_temperature.write";
-  /** View your stored location data in Google Fit. */
-  const FITNESS_LOCATION_READ =
-      "https://www.googleapis.com/auth/fitness.location.read";
-  /** View and store your location data in Google Fit. */
-  const FITNESS_LOCATION_WRITE =
-      "https://www.googleapis.com/auth/fitness.location.write";
-  /** View nutrition information in Google Fit. */
-  const FITNESS_NUTRITION_READ =
-      "https://www.googleapis.com/auth/fitness.nutrition.read";
-  /** View and store nutrition information in Google Fit. */
-  const FITNESS_NUTRITION_WRITE =
-      "https://www.googleapis.com/auth/fitness.nutrition.write";
-  /** View oxygen saturation data in Google Fit. */
-  const FITNESS_OXYGEN_SATURATION_READ =
-      "https://www.googleapis.com/auth/fitness.oxygen_saturation.read";
-  /** View and store oxygen saturation data in Google Fit. */
-  const FITNESS_OXYGEN_SATURATION_WRITE =
-      "https://www.googleapis.com/auth/fitness.oxygen_saturation.write";
-  /** View reproductive health data in Google Fit. */
-  const FITNESS_REPRODUCTIVE_HEALTH_READ =
-      "https://www.googleapis.com/auth/fitness.reproductive_health.read";
-  /** View and store reproductive health data in Google Fit. */
-  const FITNESS_REPRODUCTIVE_HEALTH_WRITE =
-      "https://www.googleapis.com/auth/fitness.reproductive_health.write";
-
-  public $users_dataSources;
-  public $users_dataSources_datasets;
-  public $users_dataset;
-  public $users_sessions;
-  
-  /**
-   * Constructs the internal representation of the Fitness service.
-   *
-   * @param Google_Client $client
-   */
-  public function __construct(Google_Client $client)
-  {
-    parent::__construct($client);
-    $this->rootUrl = 'https://www.googleapis.com/';
-    $this->servicePath = 'fitness/v1/users/';
-    $this->version = 'v1';
-    $this->serviceName = 'fitness';
-
-    $this->users_dataSources = new Google_Service_Fitness_Resource_UsersDataSources(
-        $this,
-        $this->serviceName,
-        'dataSources',
-        array(
-          'methods' => array(
-            'create' => array(
-              'path' => '{userId}/dataSources',
-              'httpMethod' => 'POST',
-              'parameters' => array(
-                'userId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'delete' => array(
-              'path' => '{userId}/dataSources/{dataSourceId}',
-              'httpMethod' => 'DELETE',
-              'parameters' => array(
-                'userId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'dataSourceId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'get' => array(
-              'path' => '{userId}/dataSources/{dataSourceId}',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'userId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'dataSourceId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'list' => array(
-              'path' => '{userId}/dataSources',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'userId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'dataTypeName' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                  'repeated' => true,
-                ),
-              ),
-            ),'patch' => array(
-              'path' => '{userId}/dataSources/{dataSourceId}',
-              'httpMethod' => 'PATCH',
-              'parameters' => array(
-                'userId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'dataSourceId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'update' => array(
-              'path' => '{userId}/dataSources/{dataSourceId}',
-              'httpMethod' => 'PUT',
-              'parameters' => array(
-                'userId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'dataSourceId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),
-          )
-        )
-    );
-    $this->users_dataSources_datasets = new Google_Service_Fitness_Resource_UsersDataSourcesDatasets(
-        $this,
-        $this->serviceName,
-        'datasets',
-        array(
-          'methods' => array(
-            'delete' => array(
-              'path' => '{userId}/dataSources/{dataSourceId}/datasets/{datasetId}',
-              'httpMethod' => 'DELETE',
-              'parameters' => array(
-                'userId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'dataSourceId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'datasetId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'currentTimeMillis' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'modifiedTimeMillis' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-              ),
-            ),'get' => array(
-              'path' => '{userId}/dataSources/{dataSourceId}/datasets/{datasetId}',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'userId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'dataSourceId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'datasetId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'limit' => array(
-                  'location' => 'query',
-                  'type' => 'integer',
-                ),
-                'pageToken' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-              ),
-            ),'patch' => array(
-              'path' => '{userId}/dataSources/{dataSourceId}/datasets/{datasetId}',
-              'httpMethod' => 'PATCH',
-              'parameters' => array(
-                'userId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'dataSourceId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'datasetId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'currentTimeMillis' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-              ),
-            ),
-          )
-        )
-    );
-    $this->users_dataset = new Google_Service_Fitness_Resource_UsersDataset(
-        $this,
-        $this->serviceName,
-        'dataset',
-        array(
-          'methods' => array(
-            'aggregate' => array(
-              'path' => '{userId}/dataset:aggregate',
-              'httpMethod' => 'POST',
-              'parameters' => array(
-                'userId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),
-          )
-        )
-    );
-    $this->users_sessions = new Google_Service_Fitness_Resource_UsersSessions(
-        $this,
-        $this->serviceName,
-        'sessions',
-        array(
-          'methods' => array(
-            'delete' => array(
-              'path' => '{userId}/sessions/{sessionId}',
-              'httpMethod' => 'DELETE',
-              'parameters' => array(
-                'userId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'sessionId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'currentTimeMillis' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-              ),
-            ),'list' => array(
-              'path' => '{userId}/sessions',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'userId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'endTime' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'includeDeleted' => array(
-                  'location' => 'query',
-                  'type' => 'boolean',
-                ),
-                'pageToken' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'startTime' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-              ),
-            ),'update' => array(
-              'path' => '{userId}/sessions/{sessionId}',
-              'httpMethod' => 'PUT',
-              'parameters' => array(
-                'userId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'sessionId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'currentTimeMillis' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-              ),
-            ),
-          )
-        )
-    );
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Fitness/AggregateBucket.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Fitness/AggregateBucket.php
deleted file mode 100644
index 99f9430f..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Fitness/AggregateBucket.php
+++ /dev/null
@@ -1,78 +0,0 @@
-activity = $activity;
-  }
-  public function getActivity()
-  {
-    return $this->activity;
-  }
-  public function setDataset($dataset)
-  {
-    $this->dataset = $dataset;
-  }
-  public function getDataset()
-  {
-    return $this->dataset;
-  }
-  public function setEndTimeMillis($endTimeMillis)
-  {
-    $this->endTimeMillis = $endTimeMillis;
-  }
-  public function getEndTimeMillis()
-  {
-    return $this->endTimeMillis;
-  }
-  public function setSession(Google_Service_Fitness_Session $session)
-  {
-    $this->session = $session;
-  }
-  public function getSession()
-  {
-    return $this->session;
-  }
-  public function setStartTimeMillis($startTimeMillis)
-  {
-    $this->startTimeMillis = $startTimeMillis;
-  }
-  public function getStartTimeMillis()
-  {
-    return $this->startTimeMillis;
-  }
-  public function setType($type)
-  {
-    $this->type = $type;
-  }
-  public function getType()
-  {
-    return $this->type;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Fitness/AggregateBy.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Fitness/AggregateBy.php
deleted file mode 100644
index f93f1b2f..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Fitness/AggregateBy.php
+++ /dev/null
@@ -1,39 +0,0 @@
-dataSourceId = $dataSourceId;
-  }
-  public function getDataSourceId()
-  {
-    return $this->dataSourceId;
-  }
-  public function setDataTypeName($dataTypeName)
-  {
-    $this->dataTypeName = $dataTypeName;
-  }
-  public function getDataTypeName()
-  {
-    return $this->dataTypeName;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Fitness/AggregateRequest.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Fitness/AggregateRequest.php
deleted file mode 100644
index bf8d760c..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Fitness/AggregateRequest.php
+++ /dev/null
@@ -1,99 +0,0 @@
-aggregateBy = $aggregateBy;
-  }
-  public function getAggregateBy()
-  {
-    return $this->aggregateBy;
-  }
-  public function setBucketByActivitySegment(Google_Service_Fitness_BucketByActivity $bucketByActivitySegment)
-  {
-    $this->bucketByActivitySegment = $bucketByActivitySegment;
-  }
-  public function getBucketByActivitySegment()
-  {
-    return $this->bucketByActivitySegment;
-  }
-  public function setBucketByActivityType(Google_Service_Fitness_BucketByActivity $bucketByActivityType)
-  {
-    $this->bucketByActivityType = $bucketByActivityType;
-  }
-  public function getBucketByActivityType()
-  {
-    return $this->bucketByActivityType;
-  }
-  public function setBucketBySession(Google_Service_Fitness_BucketBySession $bucketBySession)
-  {
-    $this->bucketBySession = $bucketBySession;
-  }
-  public function getBucketBySession()
-  {
-    return $this->bucketBySession;
-  }
-  public function setBucketByTime(Google_Service_Fitness_BucketByTime $bucketByTime)
-  {
-    $this->bucketByTime = $bucketByTime;
-  }
-  public function getBucketByTime()
-  {
-    return $this->bucketByTime;
-  }
-  public function setEndTimeMillis($endTimeMillis)
-  {
-    $this->endTimeMillis = $endTimeMillis;
-  }
-  public function getEndTimeMillis()
-  {
-    return $this->endTimeMillis;
-  }
-  public function setFilteredDataQualityStandard($filteredDataQualityStandard)
-  {
-    $this->filteredDataQualityStandard = $filteredDataQualityStandard;
-  }
-  public function getFilteredDataQualityStandard()
-  {
-    return $this->filteredDataQualityStandard;
-  }
-  public function setStartTimeMillis($startTimeMillis)
-  {
-    $this->startTimeMillis = $startTimeMillis;
-  }
-  public function getStartTimeMillis()
-  {
-    return $this->startTimeMillis;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Fitness/AggregateResponse.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Fitness/AggregateResponse.php
deleted file mode 100644
index d01f54a9..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Fitness/AggregateResponse.php
+++ /dev/null
@@ -1,32 +0,0 @@
-bucket = $bucket;
-  }
-  public function getBucket()
-  {
-    return $this->bucket;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Fitness/Application.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Fitness/Application.php
deleted file mode 100644
index aae83b93..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Fitness/Application.php
+++ /dev/null
@@ -1,57 +0,0 @@
-detailsUrl = $detailsUrl;
-  }
-  public function getDetailsUrl()
-  {
-    return $this->detailsUrl;
-  }
-  public function setName($name)
-  {
-    $this->name = $name;
-  }
-  public function getName()
-  {
-    return $this->name;
-  }
-  public function setPackageName($packageName)
-  {
-    $this->packageName = $packageName;
-  }
-  public function getPackageName()
-  {
-    return $this->packageName;
-  }
-  public function setVersion($version)
-  {
-    $this->version = $version;
-  }
-  public function getVersion()
-  {
-    return $this->version;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Fitness/BucketByActivity.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Fitness/BucketByActivity.php
deleted file mode 100644
index a4949320..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Fitness/BucketByActivity.php
+++ /dev/null
@@ -1,39 +0,0 @@
-activityDataSourceId = $activityDataSourceId;
-  }
-  public function getActivityDataSourceId()
-  {
-    return $this->activityDataSourceId;
-  }
-  public function setMinDurationMillis($minDurationMillis)
-  {
-    $this->minDurationMillis = $minDurationMillis;
-  }
-  public function getMinDurationMillis()
-  {
-    return $this->minDurationMillis;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Fitness/BucketBySession.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Fitness/BucketBySession.php
deleted file mode 100644
index 45d3fdf5..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Fitness/BucketBySession.php
+++ /dev/null
@@ -1,30 +0,0 @@
-minDurationMillis = $minDurationMillis;
-  }
-  public function getMinDurationMillis()
-  {
-    return $this->minDurationMillis;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Fitness/BucketByTime.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Fitness/BucketByTime.php
deleted file mode 100644
index 2ef6e9d9..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Fitness/BucketByTime.php
+++ /dev/null
@@ -1,40 +0,0 @@
-durationMillis = $durationMillis;
-  }
-  public function getDurationMillis()
-  {
-    return $this->durationMillis;
-  }
-  public function setPeriod(Google_Service_Fitness_BucketByTimePeriod $period)
-  {
-    $this->period = $period;
-  }
-  public function getPeriod()
-  {
-    return $this->period;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Fitness/BucketByTimePeriod.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Fitness/BucketByTimePeriod.php
deleted file mode 100644
index e24450be..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Fitness/BucketByTimePeriod.php
+++ /dev/null
@@ -1,48 +0,0 @@
-timeZoneId = $timeZoneId;
-  }
-  public function getTimeZoneId()
-  {
-    return $this->timeZoneId;
-  }
-  public function setType($type)
-  {
-    $this->type = $type;
-  }
-  public function getType()
-  {
-    return $this->type;
-  }
-  public function setValue($value)
-  {
-    $this->value = $value;
-  }
-  public function getValue()
-  {
-    return $this->value;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Fitness/DataPoint.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Fitness/DataPoint.php
deleted file mode 100644
index fba8a4b6..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Fitness/DataPoint.php
+++ /dev/null
@@ -1,95 +0,0 @@
-computationTimeMillis = $computationTimeMillis;
-  }
-  public function getComputationTimeMillis()
-  {
-    return $this->computationTimeMillis;
-  }
-  public function setDataTypeName($dataTypeName)
-  {
-    $this->dataTypeName = $dataTypeName;
-  }
-  public function getDataTypeName()
-  {
-    return $this->dataTypeName;
-  }
-  public function setEndTimeNanos($endTimeNanos)
-  {
-    $this->endTimeNanos = $endTimeNanos;
-  }
-  public function getEndTimeNanos()
-  {
-    return $this->endTimeNanos;
-  }
-  public function setModifiedTimeMillis($modifiedTimeMillis)
-  {
-    $this->modifiedTimeMillis = $modifiedTimeMillis;
-  }
-  public function getModifiedTimeMillis()
-  {
-    return $this->modifiedTimeMillis;
-  }
-  public function setOriginDataSourceId($originDataSourceId)
-  {
-    $this->originDataSourceId = $originDataSourceId;
-  }
-  public function getOriginDataSourceId()
-  {
-    return $this->originDataSourceId;
-  }
-  public function setRawTimestampNanos($rawTimestampNanos)
-  {
-    $this->rawTimestampNanos = $rawTimestampNanos;
-  }
-  public function getRawTimestampNanos()
-  {
-    return $this->rawTimestampNanos;
-  }
-  public function setStartTimeNanos($startTimeNanos)
-  {
-    $this->startTimeNanos = $startTimeNanos;
-  }
-  public function getStartTimeNanos()
-  {
-    return $this->startTimeNanos;
-  }
-  public function setValue($value)
-  {
-    $this->value = $value;
-  }
-  public function getValue()
-  {
-    return $this->value;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Fitness/DataSource.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Fitness/DataSource.php
deleted file mode 100644
index 837ec6f9..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Fitness/DataSource.php
+++ /dev/null
@@ -1,97 +0,0 @@
-application = $application;
-  }
-  public function getApplication()
-  {
-    return $this->application;
-  }
-  public function setDataQualityStandard($dataQualityStandard)
-  {
-    $this->dataQualityStandard = $dataQualityStandard;
-  }
-  public function getDataQualityStandard()
-  {
-    return $this->dataQualityStandard;
-  }
-  public function setDataStreamId($dataStreamId)
-  {
-    $this->dataStreamId = $dataStreamId;
-  }
-  public function getDataStreamId()
-  {
-    return $this->dataStreamId;
-  }
-  public function setDataStreamName($dataStreamName)
-  {
-    $this->dataStreamName = $dataStreamName;
-  }
-  public function getDataStreamName()
-  {
-    return $this->dataStreamName;
-  }
-  public function setDataType(Google_Service_Fitness_DataType $dataType)
-  {
-    $this->dataType = $dataType;
-  }
-  public function getDataType()
-  {
-    return $this->dataType;
-  }
-  public function setDevice(Google_Service_Fitness_Device $device)
-  {
-    $this->device = $device;
-  }
-  public function getDevice()
-  {
-    return $this->device;
-  }
-  public function setName($name)
-  {
-    $this->name = $name;
-  }
-  public function getName()
-  {
-    return $this->name;
-  }
-  public function setType($type)
-  {
-    $this->type = $type;
-  }
-  public function getType()
-  {
-    return $this->type;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Fitness/DataType.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Fitness/DataType.php
deleted file mode 100644
index 74042d11..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Fitness/DataType.php
+++ /dev/null
@@ -1,41 +0,0 @@
-field = $field;
-  }
-  public function getField()
-  {
-    return $this->field;
-  }
-  public function setName($name)
-  {
-    $this->name = $name;
-  }
-  public function getName()
-  {
-    return $this->name;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Fitness/DataTypeField.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Fitness/DataTypeField.php
deleted file mode 100644
index 4439ed84..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Fitness/DataTypeField.php
+++ /dev/null
@@ -1,48 +0,0 @@
-format = $format;
-  }
-  public function getFormat()
-  {
-    return $this->format;
-  }
-  public function setName($name)
-  {
-    $this->name = $name;
-  }
-  public function getName()
-  {
-    return $this->name;
-  }
-  public function setOptional($optional)
-  {
-    $this->optional = $optional;
-  }
-  public function getOptional()
-  {
-    return $this->optional;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Fitness/Dataset.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Fitness/Dataset.php
deleted file mode 100644
index cc005a09..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Fitness/Dataset.php
+++ /dev/null
@@ -1,68 +0,0 @@
-dataSourceId = $dataSourceId;
-  }
-  public function getDataSourceId()
-  {
-    return $this->dataSourceId;
-  }
-  public function setMaxEndTimeNs($maxEndTimeNs)
-  {
-    $this->maxEndTimeNs = $maxEndTimeNs;
-  }
-  public function getMaxEndTimeNs()
-  {
-    return $this->maxEndTimeNs;
-  }
-  public function setMinStartTimeNs($minStartTimeNs)
-  {
-    $this->minStartTimeNs = $minStartTimeNs;
-  }
-  public function getMinStartTimeNs()
-  {
-    return $this->minStartTimeNs;
-  }
-  public function setNextPageToken($nextPageToken)
-  {
-    $this->nextPageToken = $nextPageToken;
-  }
-  public function getNextPageToken()
-  {
-    return $this->nextPageToken;
-  }
-  public function setPoint($point)
-  {
-    $this->point = $point;
-  }
-  public function getPoint()
-  {
-    return $this->point;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Fitness/Device.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Fitness/Device.php
deleted file mode 100644
index f286ef1b..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Fitness/Device.php
+++ /dev/null
@@ -1,66 +0,0 @@
-manufacturer = $manufacturer;
-  }
-  public function getManufacturer()
-  {
-    return $this->manufacturer;
-  }
-  public function setModel($model)
-  {
-    $this->model = $model;
-  }
-  public function getModel()
-  {
-    return $this->model;
-  }
-  public function setType($type)
-  {
-    $this->type = $type;
-  }
-  public function getType()
-  {
-    return $this->type;
-  }
-  public function setUid($uid)
-  {
-    $this->uid = $uid;
-  }
-  public function getUid()
-  {
-    return $this->uid;
-  }
-  public function setVersion($version)
-  {
-    $this->version = $version;
-  }
-  public function getVersion()
-  {
-    return $this->version;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Fitness/ListDataSourcesResponse.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Fitness/ListDataSourcesResponse.php
deleted file mode 100644
index 941acc9c..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Fitness/ListDataSourcesResponse.php
+++ /dev/null
@@ -1,32 +0,0 @@
-dataSource = $dataSource;
-  }
-  public function getDataSource()
-  {
-    return $this->dataSource;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Fitness/ListSessionsResponse.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Fitness/ListSessionsResponse.php
deleted file mode 100644
index ef0b85f0..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Fitness/ListSessionsResponse.php
+++ /dev/null
@@ -1,60 +0,0 @@
-deletedSession = $deletedSession;
-  }
-  public function getDeletedSession()
-  {
-    return $this->deletedSession;
-  }
-  public function setHasMoreData($hasMoreData)
-  {
-    $this->hasMoreData = $hasMoreData;
-  }
-  public function getHasMoreData()
-  {
-    return $this->hasMoreData;
-  }
-  public function setNextPageToken($nextPageToken)
-  {
-    $this->nextPageToken = $nextPageToken;
-  }
-  public function getNextPageToken()
-  {
-    return $this->nextPageToken;
-  }
-  public function setSession($session)
-  {
-    $this->session = $session;
-  }
-  public function getSession()
-  {
-    return $this->session;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Fitness/MapValue.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Fitness/MapValue.php
deleted file mode 100644
index 5131de54..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Fitness/MapValue.php
+++ /dev/null
@@ -1,30 +0,0 @@
-fpVal = $fpVal;
-  }
-  public function getFpVal()
-  {
-    return $this->fpVal;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Fitness/Resource/Users.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Fitness/Resource/Users.php
deleted file mode 100644
index 1137392d..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Fitness/Resource/Users.php
+++ /dev/null
@@ -1,28 +0,0 @@
-
- *   $fitnessService = new Google_Service_Fitness(...);
- *   $users = $fitnessService->users;
- *  
- */
-class Google_Service_Fitness_Resource_Users extends Google_Service_Resource
-{
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Fitness/Resource/UsersDataSources.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Fitness/Resource/UsersDataSources.php
deleted file mode 100644
index 7616597d..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Fitness/Resource/UsersDataSources.php
+++ /dev/null
@@ -1,143 +0,0 @@
-
- *   $fitnessService = new Google_Service_Fitness(...);
- *   $dataSources = $fitnessService->dataSources;
- *  
- */
-class Google_Service_Fitness_Resource_UsersDataSources extends Google_Service_Resource
-{
-  /**
-   * Creates a new data source that is unique across all data sources belonging to
-   * this user. The data stream ID field can be omitted and will be generated by
-   * the server with the correct format. The data stream ID is an ordered
-   * combination of some fields from the data source. In addition to the data
-   * source fields reflected into the data source ID, the developer project number
-   * that is authenticated when creating the data source is included. This
-   * developer project number is obfuscated when read by any other developer
-   * reading public data types. (dataSources.create)
-   *
-   * @param string $userId Create the data source for the person identified. Use
-   * me to indicate the authenticated user. Only me is supported at this time.
-   * @param Google_Service_Fitness_DataSource $postBody
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Fitness_DataSource
-   */
-  public function create($userId, Google_Service_Fitness_DataSource $postBody, $optParams = array())
-  {
-    $params = array('userId' => $userId, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('create', array($params), "Google_Service_Fitness_DataSource");
-  }
-  /**
-   * Deletes the specified data source. The request will fail if the data source
-   * contains any data points. (dataSources.delete)
-   *
-   * @param string $userId Retrieve a data source for the person identified. Use
-   * me to indicate the authenticated user. Only me is supported at this time.
-   * @param string $dataSourceId The data stream ID of the data source to delete.
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Fitness_DataSource
-   */
-  public function delete($userId, $dataSourceId, $optParams = array())
-  {
-    $params = array('userId' => $userId, 'dataSourceId' => $dataSourceId);
-    $params = array_merge($params, $optParams);
-    return $this->call('delete', array($params), "Google_Service_Fitness_DataSource");
-  }
-  /**
-   * Returns the specified data source. (dataSources.get)
-   *
-   * @param string $userId Retrieve a data source for the person identified. Use
-   * me to indicate the authenticated user. Only me is supported at this time.
-   * @param string $dataSourceId The data stream ID of the data source to
-   * retrieve.
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Fitness_DataSource
-   */
-  public function get($userId, $dataSourceId, $optParams = array())
-  {
-    $params = array('userId' => $userId, 'dataSourceId' => $dataSourceId);
-    $params = array_merge($params, $optParams);
-    return $this->call('get', array($params), "Google_Service_Fitness_DataSource");
-  }
-  /**
-   * Lists all data sources that are visible to the developer, using the OAuth
-   * scopes provided. The list is not exhaustive; the user may have private data
-   * sources that are only visible to other developers, or calls using other
-   * scopes. (dataSources.listUsersDataSources)
-   *
-   * @param string $userId List data sources for the person identified. Use me to
-   * indicate the authenticated user. Only me is supported at this time.
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param string dataTypeName The names of data types to include in the
-   * list. If not specified, all data sources will be returned.
-   * @return Google_Service_Fitness_ListDataSourcesResponse
-   */
-  public function listUsersDataSources($userId, $optParams = array())
-  {
-    $params = array('userId' => $userId);
-    $params = array_merge($params, $optParams);
-    return $this->call('list', array($params), "Google_Service_Fitness_ListDataSourcesResponse");
-  }
-  /**
-   * Updates the specified data source. The dataStreamId, dataType, type,
-   * dataStreamName, and device properties with the exception of version, cannot
-   * be modified.
-   *
-   * Data sources are identified by their dataStreamId. This method supports patch
-   * semantics. (dataSources.patch)
-   *
-   * @param string $userId Update the data source for the person identified. Use
-   * me to indicate the authenticated user. Only me is supported at this time.
-   * @param string $dataSourceId The data stream ID of the data source to update.
-   * @param Google_Service_Fitness_DataSource $postBody
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Fitness_DataSource
-   */
-  public function patch($userId, $dataSourceId, Google_Service_Fitness_DataSource $postBody, $optParams = array())
-  {
-    $params = array('userId' => $userId, 'dataSourceId' => $dataSourceId, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('patch', array($params), "Google_Service_Fitness_DataSource");
-  }
-  /**
-   * Updates the specified data source. The dataStreamId, dataType, type,
-   * dataStreamName, and device properties with the exception of version, cannot
-   * be modified.
-   *
-   * Data sources are identified by their dataStreamId. (dataSources.update)
-   *
-   * @param string $userId Update the data source for the person identified. Use
-   * me to indicate the authenticated user. Only me is supported at this time.
-   * @param string $dataSourceId The data stream ID of the data source to update.
-   * @param Google_Service_Fitness_DataSource $postBody
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Fitness_DataSource
-   */
-  public function update($userId, $dataSourceId, Google_Service_Fitness_DataSource $postBody, $optParams = array())
-  {
-    $params = array('userId' => $userId, 'dataSourceId' => $dataSourceId, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('update', array($params), "Google_Service_Fitness_DataSource");
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Fitness/Resource/UsersDataSourcesDatasets.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Fitness/Resource/UsersDataSourcesDatasets.php
deleted file mode 100644
index 0fca4bd1..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Fitness/Resource/UsersDataSourcesDatasets.php
+++ /dev/null
@@ -1,119 +0,0 @@
-
- *   $fitnessService = new Google_Service_Fitness(...);
- *   $datasets = $fitnessService->datasets;
- *  
- */
-class Google_Service_Fitness_Resource_UsersDataSourcesDatasets extends Google_Service_Resource
-{
-  /**
-   * Performs an inclusive delete of all data points whose start and end times
-   * have any overlap with the time range specified by the dataset ID. For most
-   * data types, the entire data point will be deleted. For data types where the
-   * time span represents a consistent value (such as
-   * com.google.activity.segment), and a data point straddles either end point of
-   * the dataset, only the overlapping portion of the data point will be deleted.
-   * (datasets.delete)
-   *
-   * @param string $userId Delete a dataset for the person identified. Use me to
-   * indicate the authenticated user. Only me is supported at this time.
-   * @param string $dataSourceId The data stream ID of the data source that
-   * created the dataset.
-   * @param string $datasetId Dataset identifier that is a composite of the
-   * minimum data point start time and maximum data point end time represented as
-   * nanoseconds from the epoch. The ID is formatted like: "startTime-endTime"
-   * where startTime and endTime are 64 bit integers.
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param string currentTimeMillis The client's current time in milliseconds
-   * since epoch.
-   * @opt_param string modifiedTimeMillis When the operation was performed on the
-   * client.
-   */
-  public function delete($userId, $dataSourceId, $datasetId, $optParams = array())
-  {
-    $params = array('userId' => $userId, 'dataSourceId' => $dataSourceId, 'datasetId' => $datasetId);
-    $params = array_merge($params, $optParams);
-    return $this->call('delete', array($params));
-  }
-  /**
-   * Returns a dataset containing all data points whose start and end times
-   * overlap with the specified range of the dataset minimum start time and
-   * maximum end time. Specifically, any data point whose start time is less than
-   * or equal to the dataset end time and whose end time is greater than or equal
-   * to the dataset start time. (datasets.get)
-   *
-   * @param string $userId Retrieve a dataset for the person identified. Use me to
-   * indicate the authenticated user. Only me is supported at this time.
-   * @param string $dataSourceId The data stream ID of the data source that
-   * created the dataset.
-   * @param string $datasetId Dataset identifier that is a composite of the
-   * minimum data point start time and maximum data point end time represented as
-   * nanoseconds from the epoch. The ID is formatted like: "startTime-endTime"
-   * where startTime and endTime are 64 bit integers.
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param int limit If specified, no more than this many data points will be
-   * included in the dataset. If there are more data points in the dataset,
-   * nextPageToken will be set in the dataset response.
-   * @opt_param string pageToken The continuation token, which is used to page
-   * through large datasets. To get the next page of a dataset, set this parameter
-   * to the value of nextPageToken from the previous response. Each subsequent
-   * call will yield a partial dataset with data point end timestamps that are
-   * strictly smaller than those in the previous partial response.
-   * @return Google_Service_Fitness_Dataset
-   */
-  public function get($userId, $dataSourceId, $datasetId, $optParams = array())
-  {
-    $params = array('userId' => $userId, 'dataSourceId' => $dataSourceId, 'datasetId' => $datasetId);
-    $params = array_merge($params, $optParams);
-    return $this->call('get', array($params), "Google_Service_Fitness_Dataset");
-  }
-  /**
-   * Adds data points to a dataset. The dataset need not be previously created.
-   * All points within the given dataset will be returned with subsquent calls to
-   * retrieve this dataset. Data points can belong to more than one dataset. This
-   * method does not use patch semantics. (datasets.patch)
-   *
-   * @param string $userId Patch a dataset for the person identified. Use me to
-   * indicate the authenticated user. Only me is supported at this time.
-   * @param string $dataSourceId The data stream ID of the data source that
-   * created the dataset.
-   * @param string $datasetId Dataset identifier that is a composite of the
-   * minimum data point start time and maximum data point end time represented as
-   * nanoseconds from the epoch. The ID is formatted like: "startTime-endTime"
-   * where startTime and endTime are 64 bit integers.
-   * @param Google_Service_Fitness_Dataset $postBody
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param string currentTimeMillis The client's current time in milliseconds
-   * since epoch. Note that the minStartTimeNs and maxEndTimeNs properties in the
-   * request body are in nanoseconds instead of milliseconds.
-   * @return Google_Service_Fitness_Dataset
-   */
-  public function patch($userId, $dataSourceId, $datasetId, Google_Service_Fitness_Dataset $postBody, $optParams = array())
-  {
-    $params = array('userId' => $userId, 'dataSourceId' => $dataSourceId, 'datasetId' => $datasetId, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('patch', array($params), "Google_Service_Fitness_Dataset");
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Fitness/Resource/UsersDataset.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Fitness/Resource/UsersDataset.php
deleted file mode 100644
index 76e83451..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Fitness/Resource/UsersDataset.php
+++ /dev/null
@@ -1,46 +0,0 @@
-
- *   $fitnessService = new Google_Service_Fitness(...);
- *   $dataset = $fitnessService->dataset;
- *  
- */
-class Google_Service_Fitness_Resource_UsersDataset extends Google_Service_Resource
-{
-  /**
-   * Aggregates data of a certain type or stream into buckets divided by a given
-   * type of boundary. Multiple data sets of multiple types and from multiple
-   * sources can be aggreated into exactly one bucket type per request.
-   * (dataset.aggregate)
-   *
-   * @param string $userId Aggregate data for the person identified. Use me to
-   * indicate the authenticated user. Only me is supported at this time.
-   * @param Google_Service_Fitness_AggregateRequest $postBody
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Fitness_AggregateResponse
-   */
-  public function aggregate($userId, Google_Service_Fitness_AggregateRequest $postBody, $optParams = array())
-  {
-    $params = array('userId' => $userId, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('aggregate', array($params), "Google_Service_Fitness_AggregateResponse");
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Fitness/Resource/UsersSessions.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Fitness/Resource/UsersSessions.php
deleted file mode 100644
index d610485c..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Fitness/Resource/UsersSessions.php
+++ /dev/null
@@ -1,89 +0,0 @@
-
- *   $fitnessService = new Google_Service_Fitness(...);
- *   $sessions = $fitnessService->sessions;
- *  
- */
-class Google_Service_Fitness_Resource_UsersSessions extends Google_Service_Resource
-{
-  /**
-   * Deletes a session specified by the given session ID. (sessions.delete)
-   *
-   * @param string $userId Delete a session for the person identified. Use me to
-   * indicate the authenticated user. Only me is supported at this time.
-   * @param string $sessionId The ID of the session to be deleted.
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param string currentTimeMillis The client's current time in milliseconds
-   * since epoch.
-   */
-  public function delete($userId, $sessionId, $optParams = array())
-  {
-    $params = array('userId' => $userId, 'sessionId' => $sessionId);
-    $params = array_merge($params, $optParams);
-    return $this->call('delete', array($params));
-  }
-  /**
-   * Lists sessions previously created. (sessions.listUsersSessions)
-   *
-   * @param string $userId List sessions for the person identified. Use me to
-   * indicate the authenticated user. Only me is supported at this time.
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param string endTime An RFC3339 timestamp. Only sessions ending between
-   * the start and end times will be included in the response.
-   * @opt_param bool includeDeleted If true, deleted sessions will be returned.
-   * When set to true, sessions returned in this response will only have an ID and
-   * will not have any other fields.
-   * @opt_param string pageToken The continuation token, which is used to page
-   * through large result sets. To get the next page of results, set this
-   * parameter to the value of nextPageToken from the previous response.
-   * @opt_param string startTime An RFC3339 timestamp. Only sessions ending
-   * between the start and end times will be included in the response.
-   * @return Google_Service_Fitness_ListSessionsResponse
-   */
-  public function listUsersSessions($userId, $optParams = array())
-  {
-    $params = array('userId' => $userId);
-    $params = array_merge($params, $optParams);
-    return $this->call('list', array($params), "Google_Service_Fitness_ListSessionsResponse");
-  }
-  /**
-   * Updates or insert a given session. (sessions.update)
-   *
-   * @param string $userId Create sessions for the person identified. Use me to
-   * indicate the authenticated user. Only me is supported at this time.
-   * @param string $sessionId The ID of the session to be created.
-   * @param Google_Service_Fitness_Session $postBody
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param string currentTimeMillis The client's current time in milliseconds
-   * since epoch.
-   * @return Google_Service_Fitness_Session
-   */
-  public function update($userId, $sessionId, Google_Service_Fitness_Session $postBody, $optParams = array())
-  {
-    $params = array('userId' => $userId, 'sessionId' => $sessionId, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('update', array($params), "Google_Service_Fitness_Session");
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Fitness/Session.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Fitness/Session.php
deleted file mode 100644
index c1ae1290..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Fitness/Session.php
+++ /dev/null
@@ -1,103 +0,0 @@
-activeTimeMillis = $activeTimeMillis;
-  }
-  public function getActiveTimeMillis()
-  {
-    return $this->activeTimeMillis;
-  }
-  public function setActivityType($activityType)
-  {
-    $this->activityType = $activityType;
-  }
-  public function getActivityType()
-  {
-    return $this->activityType;
-  }
-  public function setApplication(Google_Service_Fitness_Application $application)
-  {
-    $this->application = $application;
-  }
-  public function getApplication()
-  {
-    return $this->application;
-  }
-  public function setDescription($description)
-  {
-    $this->description = $description;
-  }
-  public function getDescription()
-  {
-    return $this->description;
-  }
-  public function setEndTimeMillis($endTimeMillis)
-  {
-    $this->endTimeMillis = $endTimeMillis;
-  }
-  public function getEndTimeMillis()
-  {
-    return $this->endTimeMillis;
-  }
-  public function setId($id)
-  {
-    $this->id = $id;
-  }
-  public function getId()
-  {
-    return $this->id;
-  }
-  public function setModifiedTimeMillis($modifiedTimeMillis)
-  {
-    $this->modifiedTimeMillis = $modifiedTimeMillis;
-  }
-  public function getModifiedTimeMillis()
-  {
-    return $this->modifiedTimeMillis;
-  }
-  public function setName($name)
-  {
-    $this->name = $name;
-  }
-  public function getName()
-  {
-    return $this->name;
-  }
-  public function setStartTimeMillis($startTimeMillis)
-  {
-    $this->startTimeMillis = $startTimeMillis;
-  }
-  public function getStartTimeMillis()
-  {
-    return $this->startTimeMillis;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Fitness/Value.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Fitness/Value.php
deleted file mode 100644
index 273ed061..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Fitness/Value.php
+++ /dev/null
@@ -1,59 +0,0 @@
-fpVal = $fpVal;
-  }
-  public function getFpVal()
-  {
-    return $this->fpVal;
-  }
-  public function setIntVal($intVal)
-  {
-    $this->intVal = $intVal;
-  }
-  public function getIntVal()
-  {
-    return $this->intVal;
-  }
-  public function setMapVal($mapVal)
-  {
-    $this->mapVal = $mapVal;
-  }
-  public function getMapVal()
-  {
-    return $this->mapVal;
-  }
-  public function setStringVal($stringVal)
-  {
-    $this->stringVal = $stringVal;
-  }
-  public function getStringVal()
-  {
-    return $this->stringVal;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Fitness/ValueMapValEntry.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Fitness/ValueMapValEntry.php
deleted file mode 100644
index fb99ddfd..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Fitness/ValueMapValEntry.php
+++ /dev/null
@@ -1,40 +0,0 @@
-key = $key;
-  }
-  public function getKey()
-  {
-    return $this->key;
-  }
-  public function setValue(Google_Service_Fitness_MapValue $value)
-  {
-    $this->value = $value;
-  }
-  public function getValue()
-  {
-    return $this->value;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Freebase.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Freebase.php
deleted file mode 100644
index 2c0e9ca6..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Freebase.php
+++ /dev/null
@@ -1,258 +0,0 @@
-
- * Find Freebase entities using textual queries and other constraints.

- *
- * 

- * For more information about this service, see the API
- * Documentation
- * 

- *
- * @author Google, Inc.
- */
-class Google_Service_Freebase extends Google_Service
-{
-
-
-
-  private $base_methods;
-  /**
-   * Constructs the internal representation of the Freebase service.
-   *
-   * @param Google_Client $client
-   */
-  public function __construct(Google_Client $client)
-  {
-    parent::__construct($client);
-    $this->rootUrl = 'https://www.googleapis.com/';
-    $this->servicePath = 'freebase/v1/';
-    $this->version = 'v1';
-    $this->serviceName = 'freebase';
-
-    $this->base_methods = new Google_Service_Resource(
-        $this,
-        $this->serviceName,
-        '',
-        array(
-          'methods' => array(
-            'reconcile' => array(
-              'path' => 'reconcile',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'confidence' => array(
-                  'location' => 'query',
-                  'type' => 'number',
-                ),
-                'kind' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                  'repeated' => true,
-                ),
-                'lang' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                  'repeated' => true,
-                ),
-                'limit' => array(
-                  'location' => 'query',
-                  'type' => 'integer',
-                ),
-                'name' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'prop' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                  'repeated' => true,
-                ),
-              ),
-            ),'search' => array(
-              'path' => 'search',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'as_of_time' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'callback' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'cursor' => array(
-                  'location' => 'query',
-                  'type' => 'integer',
-                ),
-                'domain' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                  'repeated' => true,
-                ),
-                'encode' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'exact' => array(
-                  'location' => 'query',
-                  'type' => 'boolean',
-                ),
-                'filter' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                  'repeated' => true,
-                ),
-                'format' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'help' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'indent' => array(
-                  'location' => 'query',
-                  'type' => 'boolean',
-                ),
-                'lang' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                  'repeated' => true,
-                ),
-                'limit' => array(
-                  'location' => 'query',
-                  'type' => 'integer',
-                ),
-                'mid' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                  'repeated' => true,
-                ),
-                'mql_output' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'output' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'prefixed' => array(
-                  'location' => 'query',
-                  'type' => 'boolean',
-                ),
-                'query' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'scoring' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'spell' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'stemmed' => array(
-                  'location' => 'query',
-                  'type' => 'boolean',
-                ),
-                'type' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                  'repeated' => true,
-                ),
-                'with' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                  'repeated' => true,
-                ),
-                'without' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                  'repeated' => true,
-                ),
-              ),
-            ),
-          )
-        )
-    );
-  }
-  /**
-   * Reconcile entities to Freebase open data. (reconcile)
-   *
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param float confidence Required confidence for a candidate to match.
-   * Must be between .5 and 1.0
-   * @opt_param string kind Classifications of entity e.g. type, category, title.
-   * @opt_param string lang Languages for names and values. First language is used
-   * for display. Default is 'en'.
-   * @opt_param int limit Maximum number of candidates to return.
-   * @opt_param string name Name of entity.
-   * @opt_param string prop Property values for entity formatted as :
-   * @return Google_Service_Freebase_ReconcileGet
-   */
-  public function reconcile($optParams = array())
-  {
-    $params = array();
-    $params = array_merge($params, $optParams);
-    return $this->base_methods->call('reconcile', array($params), "Google_Service_Freebase_ReconcileGet");
-  }
-  /**
-   * Search Freebase open data. (search)
-   *
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param string as_of_time A mql as_of_time value to use with mql_output
-   * queries.
-   * @opt_param string callback JS method name for JSONP callbacks.
-   * @opt_param int cursor The cursor value to use for the next page of results.
-   * @opt_param string domain Restrict to topics with this Freebase domain id.
-   * @opt_param string encode The encoding of the response. You can use this
-   * parameter to enable html encoding.
-   * @opt_param bool exact Query on exact name and keys only.
-   * @opt_param string filter A filter to apply to the query.
-   * @opt_param string format Structural format of the json response.
-   * @opt_param string help The keyword to request help on.
-   * @opt_param bool indent Whether to indent the json results or not.
-   * @opt_param string lang The code of the language to run the query with.
-   * Default is 'en'.
-   * @opt_param int limit Maximum number of results to return.
-   * @opt_param string mid A mid to use instead of a query.
-   * @opt_param string mql_output The MQL query to run againist the results to
-   * extract more data.
-   * @opt_param string output An output expression to request data from matches.
-   * @opt_param bool prefixed Prefix match against names and aliases.
-   * @opt_param string query Query term to search for.
-   * @opt_param string scoring Relevance scoring algorithm to use.
-   * @opt_param string spell Request 'did you mean' suggestions
-   * @opt_param bool stemmed Query on stemmed names and aliases. May not be used
-   * with prefixed.
-   * @opt_param string type Restrict to topics with this Freebase type id.
-   * @opt_param string with A rule to match against.
-   * @opt_param string without A rule to not match against.
-   */
-  public function search($optParams = array())
-  {
-    $params = array();
-    $params = array_merge($params, $optParams);
-    return $this->base_methods->call('search', array($params));
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Freebase/ReconcileCandidate.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Freebase/ReconcileCandidate.php
deleted file mode 100644
index f642d16e..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Freebase/ReconcileCandidate.php
+++ /dev/null
@@ -1,67 +0,0 @@
-confidence = $confidence;
-  }
-  public function getConfidence()
-  {
-    return $this->confidence;
-  }
-  public function setLang($lang)
-  {
-    $this->lang = $lang;
-  }
-  public function getLang()
-  {
-    return $this->lang;
-  }
-  public function setMid($mid)
-  {
-    $this->mid = $mid;
-  }
-  public function getMid()
-  {
-    return $this->mid;
-  }
-  public function setName($name)
-  {
-    $this->name = $name;
-  }
-  public function getName()
-  {
-    return $this->name;
-  }
-  public function setNotable(Google_Service_Freebase_ReconcileCandidateNotable $notable)
-  {
-    $this->notable = $notable;
-  }
-  public function getNotable()
-  {
-    return $this->notable;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Freebase/ReconcileCandidateNotable.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Freebase/ReconcileCandidateNotable.php
deleted file mode 100644
index 4a75e047..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Freebase/ReconcileCandidateNotable.php
+++ /dev/null
@@ -1,39 +0,0 @@
-id = $id;
-  }
-  public function getId()
-  {
-    return $this->id;
-  }
-  public function setName($name)
-  {
-    $this->name = $name;
-  }
-  public function getName()
-  {
-    return $this->name;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Freebase/ReconcileGet.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Freebase/ReconcileGet.php
deleted file mode 100644
index 8abc62c3..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Freebase/ReconcileGet.php
+++ /dev/null
@@ -1,62 +0,0 @@
-candidate = $candidate;
-  }
-  public function getCandidate()
-  {
-    return $this->candidate;
-  }
-  public function setCosts(Google_Service_Freebase_ReconcileGetCosts $costs)
-  {
-    $this->costs = $costs;
-  }
-  public function getCosts()
-  {
-    return $this->costs;
-  }
-  public function setMatch(Google_Service_Freebase_ReconcileCandidate $match)
-  {
-    $this->match = $match;
-  }
-  public function getMatch()
-  {
-    return $this->match;
-  }
-  public function setWarning($warning)
-  {
-    $this->warning = $warning;
-  }
-  public function getWarning()
-  {
-    return $this->warning;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Freebase/ReconcileGetCosts.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Freebase/ReconcileGetCosts.php
deleted file mode 100644
index 9157995b..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Freebase/ReconcileGetCosts.php
+++ /dev/null
@@ -1,39 +0,0 @@
-hits = $hits;
-  }
-  public function getHits()
-  {
-    return $this->hits;
-  }
-  public function setMs($ms)
-  {
-    $this->ms = $ms;
-  }
-  public function getMs()
-  {
-    return $this->ms;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Freebase/ReconcileGetWarning.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Freebase/ReconcileGetWarning.php
deleted file mode 100644
index 7e5a9cec..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Freebase/ReconcileGetWarning.php
+++ /dev/null
@@ -1,48 +0,0 @@
-location = $location;
-  }
-  public function getLocation()
-  {
-    return $this->location;
-  }
-  public function setMessage($message)
-  {
-    $this->message = $message;
-  }
-  public function getMessage()
-  {
-    return $this->message;
-  }
-  public function setReason($reason)
-  {
-    $this->reason = $reason;
-  }
-  public function getReason()
-  {
-    return $this->reason;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Fusiontables.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Fusiontables.php
deleted file mode 100644
index 7c51871e..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Fusiontables.php
+++ /dev/null
@@ -1,630 +0,0 @@
-
- * API for working with Fusion Tables data.

- *
- * 

- * For more information about this service, see the API
- * Documentation
- * 

- *
- * @author Google, Inc.
- */
-class Google_Service_Fusiontables extends Google_Service
-{
-  /** Manage your Fusion Tables. */
-  const FUSIONTABLES =
-      "https://www.googleapis.com/auth/fusiontables";
-  /** View your Fusion Tables. */
-  const FUSIONTABLES_READONLY =
-      "https://www.googleapis.com/auth/fusiontables.readonly";
-
-  public $column;
-  public $query;
-  public $style;
-  public $table;
-  public $task;
-  public $template;
-  
-  /**
-   * Constructs the internal representation of the Fusiontables service.
-   *
-   * @param Google_Client $client
-   */
-  public function __construct(Google_Client $client)
-  {
-    parent::__construct($client);
-    $this->rootUrl = 'https://www.googleapis.com/';
-    $this->servicePath = 'fusiontables/v2/';
-    $this->version = 'v2';
-    $this->serviceName = 'fusiontables';
-
-    $this->column = new Google_Service_Fusiontables_Resource_Column(
-        $this,
-        $this->serviceName,
-        'column',
-        array(
-          'methods' => array(
-            'delete' => array(
-              'path' => 'tables/{tableId}/columns/{columnId}',
-              'httpMethod' => 'DELETE',
-              'parameters' => array(
-                'tableId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'columnId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'get' => array(
-              'path' => 'tables/{tableId}/columns/{columnId}',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'tableId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'columnId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'insert' => array(
-              'path' => 'tables/{tableId}/columns',
-              'httpMethod' => 'POST',
-              'parameters' => array(
-                'tableId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'list' => array(
-              'path' => 'tables/{tableId}/columns',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'tableId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'maxResults' => array(
-                  'location' => 'query',
-                  'type' => 'integer',
-                ),
-                'pageToken' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-              ),
-            ),'patch' => array(
-              'path' => 'tables/{tableId}/columns/{columnId}',
-              'httpMethod' => 'PATCH',
-              'parameters' => array(
-                'tableId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'columnId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'update' => array(
-              'path' => 'tables/{tableId}/columns/{columnId}',
-              'httpMethod' => 'PUT',
-              'parameters' => array(
-                'tableId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'columnId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),
-          )
-        )
-    );
-    $this->query = new Google_Service_Fusiontables_Resource_Query(
-        $this,
-        $this->serviceName,
-        'query',
-        array(
-          'methods' => array(
-            'sql' => array(
-              'path' => 'query',
-              'httpMethod' => 'POST',
-              'parameters' => array(
-                'sql' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'hdrs' => array(
-                  'location' => 'query',
-                  'type' => 'boolean',
-                ),
-                'typed' => array(
-                  'location' => 'query',
-                  'type' => 'boolean',
-                ),
-              ),
-            ),'sqlGet' => array(
-              'path' => 'query',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'sql' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'hdrs' => array(
-                  'location' => 'query',
-                  'type' => 'boolean',
-                ),
-                'typed' => array(
-                  'location' => 'query',
-                  'type' => 'boolean',
-                ),
-              ),
-            ),
-          )
-        )
-    );
-    $this->style = new Google_Service_Fusiontables_Resource_Style(
-        $this,
-        $this->serviceName,
-        'style',
-        array(
-          'methods' => array(
-            'delete' => array(
-              'path' => 'tables/{tableId}/styles/{styleId}',
-              'httpMethod' => 'DELETE',
-              'parameters' => array(
-                'tableId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'styleId' => array(
-                  'location' => 'path',
-                  'type' => 'integer',
-                  'required' => true,
-                ),
-              ),
-            ),'get' => array(
-              'path' => 'tables/{tableId}/styles/{styleId}',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'tableId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'styleId' => array(
-                  'location' => 'path',
-                  'type' => 'integer',
-                  'required' => true,
-                ),
-              ),
-            ),'insert' => array(
-              'path' => 'tables/{tableId}/styles',
-              'httpMethod' => 'POST',
-              'parameters' => array(
-                'tableId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'list' => array(
-              'path' => 'tables/{tableId}/styles',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'tableId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'maxResults' => array(
-                  'location' => 'query',
-                  'type' => 'integer',
-                ),
-                'pageToken' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-              ),
-            ),'patch' => array(
-              'path' => 'tables/{tableId}/styles/{styleId}',
-              'httpMethod' => 'PATCH',
-              'parameters' => array(
-                'tableId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'styleId' => array(
-                  'location' => 'path',
-                  'type' => 'integer',
-                  'required' => true,
-                ),
-              ),
-            ),'update' => array(
-              'path' => 'tables/{tableId}/styles/{styleId}',
-              'httpMethod' => 'PUT',
-              'parameters' => array(
-                'tableId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'styleId' => array(
-                  'location' => 'path',
-                  'type' => 'integer',
-                  'required' => true,
-                ),
-              ),
-            ),
-          )
-        )
-    );
-    $this->table = new Google_Service_Fusiontables_Resource_Table(
-        $this,
-        $this->serviceName,
-        'table',
-        array(
-          'methods' => array(
-            'copy' => array(
-              'path' => 'tables/{tableId}/copy',
-              'httpMethod' => 'POST',
-              'parameters' => array(
-                'tableId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'copyPresentation' => array(
-                  'location' => 'query',
-                  'type' => 'boolean',
-                ),
-              ),
-            ),'delete' => array(
-              'path' => 'tables/{tableId}',
-              'httpMethod' => 'DELETE',
-              'parameters' => array(
-                'tableId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'get' => array(
-              'path' => 'tables/{tableId}',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'tableId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'importRows' => array(
-              'path' => 'tables/{tableId}/import',
-              'httpMethod' => 'POST',
-              'parameters' => array(
-                'tableId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'delimiter' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'encoding' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'endLine' => array(
-                  'location' => 'query',
-                  'type' => 'integer',
-                ),
-                'isStrict' => array(
-                  'location' => 'query',
-                  'type' => 'boolean',
-                ),
-                'startLine' => array(
-                  'location' => 'query',
-                  'type' => 'integer',
-                ),
-              ),
-            ),'importTable' => array(
-              'path' => 'tables/import',
-              'httpMethod' => 'POST',
-              'parameters' => array(
-                'name' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'delimiter' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'encoding' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-              ),
-            ),'insert' => array(
-              'path' => 'tables',
-              'httpMethod' => 'POST',
-              'parameters' => array(),
-            ),'list' => array(
-              'path' => 'tables',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'maxResults' => array(
-                  'location' => 'query',
-                  'type' => 'integer',
-                ),
-                'pageToken' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-              ),
-            ),'patch' => array(
-              'path' => 'tables/{tableId}',
-              'httpMethod' => 'PATCH',
-              'parameters' => array(
-                'tableId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'replaceViewDefinition' => array(
-                  'location' => 'query',
-                  'type' => 'boolean',
-                ),
-              ),
-            ),'replaceRows' => array(
-              'path' => 'tables/{tableId}/replace',
-              'httpMethod' => 'POST',
-              'parameters' => array(
-                'tableId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'delimiter' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'encoding' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'endLine' => array(
-                  'location' => 'query',
-                  'type' => 'integer',
-                ),
-                'isStrict' => array(
-                  'location' => 'query',
-                  'type' => 'boolean',
-                ),
-                'startLine' => array(
-                  'location' => 'query',
-                  'type' => 'integer',
-                ),
-              ),
-            ),'update' => array(
-              'path' => 'tables/{tableId}',
-              'httpMethod' => 'PUT',
-              'parameters' => array(
-                'tableId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'replaceViewDefinition' => array(
-                  'location' => 'query',
-                  'type' => 'boolean',
-                ),
-              ),
-            ),
-          )
-        )
-    );
-    $this->task = new Google_Service_Fusiontables_Resource_Task(
-        $this,
-        $this->serviceName,
-        'task',
-        array(
-          'methods' => array(
-            'delete' => array(
-              'path' => 'tables/{tableId}/tasks/{taskId}',
-              'httpMethod' => 'DELETE',
-              'parameters' => array(
-                'tableId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'taskId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'get' => array(
-              'path' => 'tables/{tableId}/tasks/{taskId}',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'tableId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'taskId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'list' => array(
-              'path' => 'tables/{tableId}/tasks',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'tableId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'maxResults' => array(
-                  'location' => 'query',
-                  'type' => 'integer',
-                ),
-                'pageToken' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'startIndex' => array(
-                  'location' => 'query',
-                  'type' => 'integer',
-                ),
-              ),
-            ),
-          )
-        )
-    );
-    $this->template = new Google_Service_Fusiontables_Resource_Template(
-        $this,
-        $this->serviceName,
-        'template',
-        array(
-          'methods' => array(
-            'delete' => array(
-              'path' => 'tables/{tableId}/templates/{templateId}',
-              'httpMethod' => 'DELETE',
-              'parameters' => array(
-                'tableId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'templateId' => array(
-                  'location' => 'path',
-                  'type' => 'integer',
-                  'required' => true,
-                ),
-              ),
-            ),'get' => array(
-              'path' => 'tables/{tableId}/templates/{templateId}',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'tableId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'templateId' => array(
-                  'location' => 'path',
-                  'type' => 'integer',
-                  'required' => true,
-                ),
-              ),
-            ),'insert' => array(
-              'path' => 'tables/{tableId}/templates',
-              'httpMethod' => 'POST',
-              'parameters' => array(
-                'tableId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'list' => array(
-              'path' => 'tables/{tableId}/templates',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'tableId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'maxResults' => array(
-                  'location' => 'query',
-                  'type' => 'integer',
-                ),
-                'pageToken' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-              ),
-            ),'patch' => array(
-              'path' => 'tables/{tableId}/templates/{templateId}',
-              'httpMethod' => 'PATCH',
-              'parameters' => array(
-                'tableId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'templateId' => array(
-                  'location' => 'path',
-                  'type' => 'integer',
-                  'required' => true,
-                ),
-              ),
-            ),'update' => array(
-              'path' => 'tables/{tableId}/templates/{templateId}',
-              'httpMethod' => 'PUT',
-              'parameters' => array(
-                'tableId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'templateId' => array(
-                  'location' => 'path',
-                  'type' => 'integer',
-                  'required' => true,
-                ),
-              ),
-            ),
-          )
-        )
-    );
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Fusiontables/Bucket.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Fusiontables/Bucket.php
deleted file mode 100644
index b8d29340..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Fusiontables/Bucket.php
+++ /dev/null
@@ -1,75 +0,0 @@
-color = $color;
-  }
-  public function getColor()
-  {
-    return $this->color;
-  }
-  public function setIcon($icon)
-  {
-    $this->icon = $icon;
-  }
-  public function getIcon()
-  {
-    return $this->icon;
-  }
-  public function setMax($max)
-  {
-    $this->max = $max;
-  }
-  public function getMax()
-  {
-    return $this->max;
-  }
-  public function setMin($min)
-  {
-    $this->min = $min;
-  }
-  public function getMin()
-  {
-    return $this->min;
-  }
-  public function setOpacity($opacity)
-  {
-    $this->opacity = $opacity;
-  }
-  public function getOpacity()
-  {
-    return $this->opacity;
-  }
-  public function setWeight($weight)
-  {
-    $this->weight = $weight;
-  }
-  public function getWeight()
-  {
-    return $this->weight;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Fusiontables/Column.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Fusiontables/Column.php
deleted file mode 100644
index 6af64b21..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Fusiontables/Column.php
+++ /dev/null
@@ -1,131 +0,0 @@
-baseColumn = $baseColumn;
-  }
-  public function getBaseColumn()
-  {
-    return $this->baseColumn;
-  }
-  public function setColumnId($columnId)
-  {
-    $this->columnId = $columnId;
-  }
-  public function getColumnId()
-  {
-    return $this->columnId;
-  }
-  public function setColumnJsonSchema($columnJsonSchema)
-  {
-    $this->columnJsonSchema = $columnJsonSchema;
-  }
-  public function getColumnJsonSchema()
-  {
-    return $this->columnJsonSchema;
-  }
-  public function setColumnPropertiesJson($columnPropertiesJson)
-  {
-    $this->columnPropertiesJson = $columnPropertiesJson;
-  }
-  public function getColumnPropertiesJson()
-  {
-    return $this->columnPropertiesJson;
-  }
-  public function setDescription($description)
-  {
-    $this->description = $description;
-  }
-  public function getDescription()
-  {
-    return $this->description;
-  }
-  public function setFormatPattern($formatPattern)
-  {
-    $this->formatPattern = $formatPattern;
-  }
-  public function getFormatPattern()
-  {
-    return $this->formatPattern;
-  }
-  public function setGraphPredicate($graphPredicate)
-  {
-    $this->graphPredicate = $graphPredicate;
-  }
-  public function getGraphPredicate()
-  {
-    return $this->graphPredicate;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setName($name)
-  {
-    $this->name = $name;
-  }
-  public function getName()
-  {
-    return $this->name;
-  }
-  public function setType($type)
-  {
-    $this->type = $type;
-  }
-  public function getType()
-  {
-    return $this->type;
-  }
-  public function setValidValues($validValues)
-  {
-    $this->validValues = $validValues;
-  }
-  public function getValidValues()
-  {
-    return $this->validValues;
-  }
-  public function setValidateData($validateData)
-  {
-    $this->validateData = $validateData;
-  }
-  public function getValidateData()
-  {
-    return $this->validateData;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Fusiontables/ColumnBaseColumn.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Fusiontables/ColumnBaseColumn.php
deleted file mode 100644
index 0dcd6e52..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Fusiontables/ColumnBaseColumn.php
+++ /dev/null
@@ -1,39 +0,0 @@
-columnId = $columnId;
-  }
-  public function getColumnId()
-  {
-    return $this->columnId;
-  }
-  public function setTableIndex($tableIndex)
-  {
-    $this->tableIndex = $tableIndex;
-  }
-  public function getTableIndex()
-  {
-    return $this->tableIndex;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Fusiontables/ColumnList.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Fusiontables/ColumnList.php
deleted file mode 100644
index 2f04ef80..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Fusiontables/ColumnList.php
+++ /dev/null
@@ -1,59 +0,0 @@
-items = $items;
-  }
-  public function getItems()
-  {
-    return $this->items;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setNextPageToken($nextPageToken)
-  {
-    $this->nextPageToken = $nextPageToken;
-  }
-  public function getNextPageToken()
-  {
-    return $this->nextPageToken;
-  }
-  public function setTotalItems($totalItems)
-  {
-    $this->totalItems = $totalItems;
-  }
-  public function getTotalItems()
-  {
-    return $this->totalItems;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Fusiontables/Geometry.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Fusiontables/Geometry.php
deleted file mode 100644
index 9852b8b6..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Fusiontables/Geometry.php
+++ /dev/null
@@ -1,49 +0,0 @@
-geometries = $geometries;
-  }
-  public function getGeometries()
-  {
-    return $this->geometries;
-  }
-  public function setGeometry($geometry)
-  {
-    $this->geometry = $geometry;
-  }
-  public function getGeometry()
-  {
-    return $this->geometry;
-  }
-  public function setType($type)
-  {
-    $this->type = $type;
-  }
-  public function getType()
-  {
-    return $this->type;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Fusiontables/Import.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Fusiontables/Import.php
deleted file mode 100644
index 63dd9aaf..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Fusiontables/Import.php
+++ /dev/null
@@ -1,39 +0,0 @@
-kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setNumRowsReceived($numRowsReceived)
-  {
-    $this->numRowsReceived = $numRowsReceived;
-  }
-  public function getNumRowsReceived()
-  {
-    return $this->numRowsReceived;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Fusiontables/Line.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Fusiontables/Line.php
deleted file mode 100644
index ee490bd6..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Fusiontables/Line.php
+++ /dev/null
@@ -1,40 +0,0 @@
-coordinates = $coordinates;
-  }
-  public function getCoordinates()
-  {
-    return $this->coordinates;
-  }
-  public function setType($type)
-  {
-    $this->type = $type;
-  }
-  public function getType()
-  {
-    return $this->type;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Fusiontables/LineStyle.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Fusiontables/LineStyle.php
deleted file mode 100644
index ff7e78f2..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Fusiontables/LineStyle.php
+++ /dev/null
@@ -1,68 +0,0 @@
-strokeColor = $strokeColor;
-  }
-  public function getStrokeColor()
-  {
-    return $this->strokeColor;
-  }
-  public function setStrokeColorStyler(Google_Service_Fusiontables_StyleFunction $strokeColorStyler)
-  {
-    $this->strokeColorStyler = $strokeColorStyler;
-  }
-  public function getStrokeColorStyler()
-  {
-    return $this->strokeColorStyler;
-  }
-  public function setStrokeOpacity($strokeOpacity)
-  {
-    $this->strokeOpacity = $strokeOpacity;
-  }
-  public function getStrokeOpacity()
-  {
-    return $this->strokeOpacity;
-  }
-  public function setStrokeWeight($strokeWeight)
-  {
-    $this->strokeWeight = $strokeWeight;
-  }
-  public function getStrokeWeight()
-  {
-    return $this->strokeWeight;
-  }
-  public function setStrokeWeightStyler(Google_Service_Fusiontables_StyleFunction $strokeWeightStyler)
-  {
-    $this->strokeWeightStyler = $strokeWeightStyler;
-  }
-  public function getStrokeWeightStyler()
-  {
-    return $this->strokeWeightStyler;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Fusiontables/Point.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Fusiontables/Point.php
deleted file mode 100644
index bceb6895..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Fusiontables/Point.php
+++ /dev/null
@@ -1,40 +0,0 @@
-coordinates = $coordinates;
-  }
-  public function getCoordinates()
-  {
-    return $this->coordinates;
-  }
-  public function setType($type)
-  {
-    $this->type = $type;
-  }
-  public function getType()
-  {
-    return $this->type;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Fusiontables/PointStyle.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Fusiontables/PointStyle.php
deleted file mode 100644
index c00480d1..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Fusiontables/PointStyle.php
+++ /dev/null
@@ -1,40 +0,0 @@
-iconName = $iconName;
-  }
-  public function getIconName()
-  {
-    return $this->iconName;
-  }
-  public function setIconStyler(Google_Service_Fusiontables_StyleFunction $iconStyler)
-  {
-    $this->iconStyler = $iconStyler;
-  }
-  public function getIconStyler()
-  {
-    return $this->iconStyler;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Fusiontables/Polygon.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Fusiontables/Polygon.php
deleted file mode 100644
index 519bf8ce..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Fusiontables/Polygon.php
+++ /dev/null
@@ -1,40 +0,0 @@
-coordinates = $coordinates;
-  }
-  public function getCoordinates()
-  {
-    return $this->coordinates;
-  }
-  public function setType($type)
-  {
-    $this->type = $type;
-  }
-  public function getType()
-  {
-    return $this->type;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Fusiontables/PolygonStyle.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Fusiontables/PolygonStyle.php
deleted file mode 100644
index 14a3102e..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Fusiontables/PolygonStyle.php
+++ /dev/null
@@ -1,96 +0,0 @@
-fillColor = $fillColor;
-  }
-  public function getFillColor()
-  {
-    return $this->fillColor;
-  }
-  public function setFillColorStyler(Google_Service_Fusiontables_StyleFunction $fillColorStyler)
-  {
-    $this->fillColorStyler = $fillColorStyler;
-  }
-  public function getFillColorStyler()
-  {
-    return $this->fillColorStyler;
-  }
-  public function setFillOpacity($fillOpacity)
-  {
-    $this->fillOpacity = $fillOpacity;
-  }
-  public function getFillOpacity()
-  {
-    return $this->fillOpacity;
-  }
-  public function setStrokeColor($strokeColor)
-  {
-    $this->strokeColor = $strokeColor;
-  }
-  public function getStrokeColor()
-  {
-    return $this->strokeColor;
-  }
-  public function setStrokeColorStyler(Google_Service_Fusiontables_StyleFunction $strokeColorStyler)
-  {
-    $this->strokeColorStyler = $strokeColorStyler;
-  }
-  public function getStrokeColorStyler()
-  {
-    return $this->strokeColorStyler;
-  }
-  public function setStrokeOpacity($strokeOpacity)
-  {
-    $this->strokeOpacity = $strokeOpacity;
-  }
-  public function getStrokeOpacity()
-  {
-    return $this->strokeOpacity;
-  }
-  public function setStrokeWeight($strokeWeight)
-  {
-    $this->strokeWeight = $strokeWeight;
-  }
-  public function getStrokeWeight()
-  {
-    return $this->strokeWeight;
-  }
-  public function setStrokeWeightStyler(Google_Service_Fusiontables_StyleFunction $strokeWeightStyler)
-  {
-    $this->strokeWeightStyler = $strokeWeightStyler;
-  }
-  public function getStrokeWeightStyler()
-  {
-    return $this->strokeWeightStyler;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Fusiontables/Resource/Column.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Fusiontables/Resource/Column.php
deleted file mode 100644
index 6cbf88bb..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Fusiontables/Resource/Column.php
+++ /dev/null
@@ -1,121 +0,0 @@
-
- *   $fusiontablesService = new Google_Service_Fusiontables(...);
- *   $column = $fusiontablesService->column;
- *  
- */
-class Google_Service_Fusiontables_Resource_Column extends Google_Service_Resource
-{
-  /**
-   * Deletes the specified column. (column.delete)
-   *
-   * @param string $tableId Table from which the column is being deleted.
-   * @param string $columnId Name or identifier for the column being deleted.
-   * @param array $optParams Optional parameters.
-   */
-  public function delete($tableId, $columnId, $optParams = array())
-  {
-    $params = array('tableId' => $tableId, 'columnId' => $columnId);
-    $params = array_merge($params, $optParams);
-    return $this->call('delete', array($params));
-  }
-  /**
-   * Retrieves a specific column by its ID. (column.get)
-   *
-   * @param string $tableId Table to which the column belongs.
-   * @param string $columnId Name or identifier for the column that is being
-   * requested.
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Fusiontables_Column
-   */
-  public function get($tableId, $columnId, $optParams = array())
-  {
-    $params = array('tableId' => $tableId, 'columnId' => $columnId);
-    $params = array_merge($params, $optParams);
-    return $this->call('get', array($params), "Google_Service_Fusiontables_Column");
-  }
-  /**
-   * Adds a new column to the table. (column.insert)
-   *
-   * @param string $tableId Table for which a new column is being added.
-   * @param Google_Service_Fusiontables_Column $postBody
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Fusiontables_Column
-   */
-  public function insert($tableId, Google_Service_Fusiontables_Column $postBody, $optParams = array())
-  {
-    $params = array('tableId' => $tableId, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('insert', array($params), "Google_Service_Fusiontables_Column");
-  }
-  /**
-   * Retrieves a list of columns. (column.listColumn)
-   *
-   * @param string $tableId Table whose columns are being listed.
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param string maxResults Maximum number of columns to return. Default is
-   * 5.
-   * @opt_param string pageToken Continuation token specifying which result page
-   * to return.
-   * @return Google_Service_Fusiontables_ColumnList
-   */
-  public function listColumn($tableId, $optParams = array())
-  {
-    $params = array('tableId' => $tableId);
-    $params = array_merge($params, $optParams);
-    return $this->call('list', array($params), "Google_Service_Fusiontables_ColumnList");
-  }
-  /**
-   * Updates the name or type of an existing column. This method supports patch
-   * semantics. (column.patch)
-   *
-   * @param string $tableId Table for which the column is being updated.
-   * @param string $columnId Name or identifier for the column that is being
-   * updated.
-   * @param Google_Service_Fusiontables_Column $postBody
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Fusiontables_Column
-   */
-  public function patch($tableId, $columnId, Google_Service_Fusiontables_Column $postBody, $optParams = array())
-  {
-    $params = array('tableId' => $tableId, 'columnId' => $columnId, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('patch', array($params), "Google_Service_Fusiontables_Column");
-  }
-  /**
-   * Updates the name or type of an existing column. (column.update)
-   *
-   * @param string $tableId Table for which the column is being updated.
-   * @param string $columnId Name or identifier for the column that is being
-   * updated.
-   * @param Google_Service_Fusiontables_Column $postBody
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Fusiontables_Column
-   */
-  public function update($tableId, $columnId, Google_Service_Fusiontables_Column $postBody, $optParams = array())
-  {
-    $params = array('tableId' => $tableId, 'columnId' => $columnId, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('update', array($params), "Google_Service_Fusiontables_Column");
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Fusiontables/Resource/Query.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Fusiontables/Resource/Query.php
deleted file mode 100644
index f2fb6562..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Fusiontables/Resource/Query.php
+++ /dev/null
@@ -1,70 +0,0 @@
-
- *   $fusiontablesService = new Google_Service_Fusiontables(...);
- *   $query = $fusiontablesService->query;
- *  
- */
-class Google_Service_Fusiontables_Resource_Query extends Google_Service_Resource
-{
-  /**
-   * Executes a Fusion Tables SQL statement, which can be any of - SELECT - INSERT
-   * - UPDATE - DELETE - SHOW - DESCRIBE - CREATE statement. (query.sql)
-   *
-   * @param string $sql A Fusion Tables SQL statement, which can be any of -
-   * SELECT - INSERT - UPDATE - DELETE - SHOW - DESCRIBE - CREATE
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param bool hdrs Whether column names are included in the first row.
-   * Default is true.
-   * @opt_param bool typed Whether typed values are returned in the (JSON)
-   * response: numbers for numeric values and parsed geometries for KML values.
-   * Default is true.
-   * @return Google_Service_Fusiontables_Sqlresponse
-   */
-  public function sql($sql, $optParams = array())
-  {
-    $params = array('sql' => $sql);
-    $params = array_merge($params, $optParams);
-    return $this->call('sql', array($params), "Google_Service_Fusiontables_Sqlresponse");
-  }
-  /**
-   * Executes a SQL statement which can be any of - SELECT - SHOW - DESCRIBE
-   * (query.sqlGet)
-   *
-   * @param string $sql A SQL statement which can be any of - SELECT - SHOW -
-   * DESCRIBE
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param bool hdrs Whether column names are included (in the first row).
-   * Default is true.
-   * @opt_param bool typed Whether typed values are returned in the (JSON)
-   * response: numbers for numeric values and parsed geometries for KML values.
-   * Default is true.
-   * @return Google_Service_Fusiontables_Sqlresponse
-   */
-  public function sqlGet($sql, $optParams = array())
-  {
-    $params = array('sql' => $sql);
-    $params = array_merge($params, $optParams);
-    return $this->call('sqlGet', array($params), "Google_Service_Fusiontables_Sqlresponse");
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Fusiontables/Resource/Style.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Fusiontables/Resource/Style.php
deleted file mode 100644
index a4827806..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Fusiontables/Resource/Style.php
+++ /dev/null
@@ -1,118 +0,0 @@
-
- *   $fusiontablesService = new Google_Service_Fusiontables(...);
- *   $style = $fusiontablesService->style;
- *  
- */
-class Google_Service_Fusiontables_Resource_Style extends Google_Service_Resource
-{
-  /**
-   * Deletes a style. (style.delete)
-   *
-   * @param string $tableId Table from which the style is being deleted
-   * @param int $styleId Identifier (within a table) for the style being deleted
-   * @param array $optParams Optional parameters.
-   */
-  public function delete($tableId, $styleId, $optParams = array())
-  {
-    $params = array('tableId' => $tableId, 'styleId' => $styleId);
-    $params = array_merge($params, $optParams);
-    return $this->call('delete', array($params));
-  }
-  /**
-   * Gets a specific style. (style.get)
-   *
-   * @param string $tableId Table to which the requested style belongs
-   * @param int $styleId Identifier (integer) for a specific style in a table
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Fusiontables_StyleSetting
-   */
-  public function get($tableId, $styleId, $optParams = array())
-  {
-    $params = array('tableId' => $tableId, 'styleId' => $styleId);
-    $params = array_merge($params, $optParams);
-    return $this->call('get', array($params), "Google_Service_Fusiontables_StyleSetting");
-  }
-  /**
-   * Adds a new style for the table. (style.insert)
-   *
-   * @param string $tableId Table for which a new style is being added
-   * @param Google_Service_Fusiontables_StyleSetting $postBody
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Fusiontables_StyleSetting
-   */
-  public function insert($tableId, Google_Service_Fusiontables_StyleSetting $postBody, $optParams = array())
-  {
-    $params = array('tableId' => $tableId, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('insert', array($params), "Google_Service_Fusiontables_StyleSetting");
-  }
-  /**
-   * Retrieves a list of styles. (style.listStyle)
-   *
-   * @param string $tableId Table whose styles are being listed
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param string maxResults Maximum number of styles to return. Optional.
-   * Default is 5.
-   * @opt_param string pageToken Continuation token specifying which result page
-   * to return. Optional.
-   * @return Google_Service_Fusiontables_StyleSettingList
-   */
-  public function listStyle($tableId, $optParams = array())
-  {
-    $params = array('tableId' => $tableId);
-    $params = array_merge($params, $optParams);
-    return $this->call('list', array($params), "Google_Service_Fusiontables_StyleSettingList");
-  }
-  /**
-   * Updates an existing style. This method supports patch semantics.
-   * (style.patch)
-   *
-   * @param string $tableId Table whose style is being updated.
-   * @param int $styleId Identifier (within a table) for the style being updated.
-   * @param Google_Service_Fusiontables_StyleSetting $postBody
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Fusiontables_StyleSetting
-   */
-  public function patch($tableId, $styleId, Google_Service_Fusiontables_StyleSetting $postBody, $optParams = array())
-  {
-    $params = array('tableId' => $tableId, 'styleId' => $styleId, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('patch', array($params), "Google_Service_Fusiontables_StyleSetting");
-  }
-  /**
-   * Updates an existing style. (style.update)
-   *
-   * @param string $tableId Table whose style is being updated.
-   * @param int $styleId Identifier (within a table) for the style being updated.
-   * @param Google_Service_Fusiontables_StyleSetting $postBody
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Fusiontables_StyleSetting
-   */
-  public function update($tableId, $styleId, Google_Service_Fusiontables_StyleSetting $postBody, $optParams = array())
-  {
-    $params = array('tableId' => $tableId, 'styleId' => $styleId, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('update', array($params), "Google_Service_Fusiontables_StyleSetting");
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Fusiontables/Resource/Table.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Fusiontables/Resource/Table.php
deleted file mode 100644
index a556b0d5..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Fusiontables/Resource/Table.php
+++ /dev/null
@@ -1,212 +0,0 @@
-
- *   $fusiontablesService = new Google_Service_Fusiontables(...);
- *   $table = $fusiontablesService->table;
- *  
- */
-class Google_Service_Fusiontables_Resource_Table extends Google_Service_Resource
-{
-  /**
-   * Copies a table. (table.copy)
-   *
-   * @param string $tableId ID of the table that is being copied.
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param bool copyPresentation Whether to also copy tabs, styles, and
-   * templates. Default is false.
-   * @return Google_Service_Fusiontables_Table
-   */
-  public function copy($tableId, $optParams = array())
-  {
-    $params = array('tableId' => $tableId);
-    $params = array_merge($params, $optParams);
-    return $this->call('copy', array($params), "Google_Service_Fusiontables_Table");
-  }
-  /**
-   * Deletes a table. (table.delete)
-   *
-   * @param string $tableId ID of the table to be deleted.
-   * @param array $optParams Optional parameters.
-   */
-  public function delete($tableId, $optParams = array())
-  {
-    $params = array('tableId' => $tableId);
-    $params = array_merge($params, $optParams);
-    return $this->call('delete', array($params));
-  }
-  /**
-   * Retrieves a specific table by its ID. (table.get)
-   *
-   * @param string $tableId Identifier for the table being requested.
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Fusiontables_Table
-   */
-  public function get($tableId, $optParams = array())
-  {
-    $params = array('tableId' => $tableId);
-    $params = array_merge($params, $optParams);
-    return $this->call('get', array($params), "Google_Service_Fusiontables_Table");
-  }
-  /**
-   * Imports more rows into a table. (table.importRows)
-   *
-   * @param string $tableId The table into which new rows are being imported.
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param string delimiter The delimiter used to separate cell values. This
-   * can only consist of a single character. Default is ,.
-   * @opt_param string encoding The encoding of the content. Default is UTF-8. Use
-   * auto-detect if you are unsure of the encoding.
-   * @opt_param int endLine The index of the line up to which data will be
-   * imported. Default is to import the entire file. If endLine is negative, it is
-   * an offset from the end of the file; the imported content will exclude the
-   * last endLine lines.
-   * @opt_param bool isStrict Whether the imported CSV must have the same number
-   * of values for each row. If false, rows with fewer values will be padded with
-   * empty values. Default is true.
-   * @opt_param int startLine The index of the first line from which to start
-   * importing, inclusive. Default is 0.
-   * @return Google_Service_Fusiontables_Import
-   */
-  public function importRows($tableId, $optParams = array())
-  {
-    $params = array('tableId' => $tableId);
-    $params = array_merge($params, $optParams);
-    return $this->call('importRows', array($params), "Google_Service_Fusiontables_Import");
-  }
-  /**
-   * Imports a new table. (table.importTable)
-   *
-   * @param string $name The name to be assigned to the new table.
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param string delimiter The delimiter used to separate cell values. This
-   * can only consist of a single character. Default is ,.
-   * @opt_param string encoding The encoding of the content. Default is UTF-8. Use
-   * auto-detect if you are unsure of the encoding.
-   * @return Google_Service_Fusiontables_Table
-   */
-  public function importTable($name, $optParams = array())
-  {
-    $params = array('name' => $name);
-    $params = array_merge($params, $optParams);
-    return $this->call('importTable', array($params), "Google_Service_Fusiontables_Table");
-  }
-  /**
-   * Creates a new table. (table.insert)
-   *
-   * @param Google_Service_Fusiontables_Table $postBody
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Fusiontables_Table
-   */
-  public function insert(Google_Service_Fusiontables_Table $postBody, $optParams = array())
-  {
-    $params = array('postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('insert', array($params), "Google_Service_Fusiontables_Table");
-  }
-  /**
-   * Retrieves a list of tables a user owns. (table.listTable)
-   *
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param string maxResults Maximum number of tables to return. Default is
-   * 5.
-   * @opt_param string pageToken Continuation token specifying which result page
-   * to return.
-   * @return Google_Service_Fusiontables_TableList
-   */
-  public function listTable($optParams = array())
-  {
-    $params = array();
-    $params = array_merge($params, $optParams);
-    return $this->call('list', array($params), "Google_Service_Fusiontables_TableList");
-  }
-  /**
-   * Updates an existing table. Unless explicitly requested, only the name,
-   * description, and attribution will be updated. This method supports patch
-   * semantics. (table.patch)
-   *
-   * @param string $tableId ID of the table that is being updated.
-   * @param Google_Service_Fusiontables_Table $postBody
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param bool replaceViewDefinition Whether the view definition is also
-   * updated. The specified view definition replaces the existing one. Only a view
-   * can be updated with a new definition.
-   * @return Google_Service_Fusiontables_Table
-   */
-  public function patch($tableId, Google_Service_Fusiontables_Table $postBody, $optParams = array())
-  {
-    $params = array('tableId' => $tableId, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('patch', array($params), "Google_Service_Fusiontables_Table");
-  }
-  /**
-   * Replaces rows of an existing table. Current rows remain visible until all
-   * replacement rows are ready. (table.replaceRows)
-   *
-   * @param string $tableId Table whose rows will be replaced.
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param string delimiter The delimiter used to separate cell values. This
-   * can only consist of a single character. Default is ,.
-   * @opt_param string encoding The encoding of the content. Default is UTF-8. Use
-   * 'auto-detect' if you are unsure of the encoding.
-   * @opt_param int endLine The index of the line up to which data will be
-   * imported. Default is to import the entire file. If endLine is negative, it is
-   * an offset from the end of the file; the imported content will exclude the
-   * last endLine lines.
-   * @opt_param bool isStrict Whether the imported CSV must have the same number
-   * of column values for each row. If true, throws an exception if the CSV does
-   * not have the same number of columns. If false, rows with fewer column values
-   * will be padded with empty values. Default is true.
-   * @opt_param int startLine The index of the first line from which to start
-   * importing, inclusive. Default is 0.
-   * @return Google_Service_Fusiontables_Task
-   */
-  public function replaceRows($tableId, $optParams = array())
-  {
-    $params = array('tableId' => $tableId);
-    $params = array_merge($params, $optParams);
-    return $this->call('replaceRows', array($params), "Google_Service_Fusiontables_Task");
-  }
-  /**
-   * Updates an existing table. Unless explicitly requested, only the name,
-   * description, and attribution will be updated. (table.update)
-   *
-   * @param string $tableId ID of the table that is being updated.
-   * @param Google_Service_Fusiontables_Table $postBody
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param bool replaceViewDefinition Whether the view definition is also
-   * updated. The specified view definition replaces the existing one. Only a view
-   * can be updated with a new definition.
-   * @return Google_Service_Fusiontables_Table
-   */
-  public function update($tableId, Google_Service_Fusiontables_Table $postBody, $optParams = array())
-  {
-    $params = array('tableId' => $tableId, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('update', array($params), "Google_Service_Fusiontables_Table");
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Fusiontables/Resource/Task.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Fusiontables/Resource/Task.php
deleted file mode 100644
index 185552d1..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Fusiontables/Resource/Task.php
+++ /dev/null
@@ -1,75 +0,0 @@
-
- *   $fusiontablesService = new Google_Service_Fusiontables(...);
- *   $task = $fusiontablesService->task;
- *  
- */
-class Google_Service_Fusiontables_Resource_Task extends Google_Service_Resource
-{
-  /**
-   * Deletes a specific task by its ID, unless that task has already started
-   * running. (task.delete)
-   *
-   * @param string $tableId Table from which the task is being deleted.
-   * @param string $taskId The identifier of the task to delete.
-   * @param array $optParams Optional parameters.
-   */
-  public function delete($tableId, $taskId, $optParams = array())
-  {
-    $params = array('tableId' => $tableId, 'taskId' => $taskId);
-    $params = array_merge($params, $optParams);
-    return $this->call('delete', array($params));
-  }
-  /**
-   * Retrieves a specific task by its ID. (task.get)
-   *
-   * @param string $tableId Table to which the task belongs.
-   * @param string $taskId The identifier of the task to get.
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Fusiontables_Task
-   */
-  public function get($tableId, $taskId, $optParams = array())
-  {
-    $params = array('tableId' => $tableId, 'taskId' => $taskId);
-    $params = array_merge($params, $optParams);
-    return $this->call('get', array($params), "Google_Service_Fusiontables_Task");
-  }
-  /**
-   * Retrieves a list of tasks. (task.listTask)
-   *
-   * @param string $tableId Table whose tasks are being listed.
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param string maxResults Maximum number of tasks to return. Default is 5.
-   * @opt_param string pageToken Continuation token specifying which result page
-   * to return.
-   * @opt_param string startIndex Index of the first result returned in the
-   * current page.
-   * @return Google_Service_Fusiontables_TaskList
-   */
-  public function listTask($tableId, $optParams = array())
-  {
-    $params = array('tableId' => $tableId);
-    $params = array_merge($params, $optParams);
-    return $this->call('list', array($params), "Google_Service_Fusiontables_TaskList");
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Fusiontables/Resource/Template.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Fusiontables/Resource/Template.php
deleted file mode 100644
index fb0bdd7f..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Fusiontables/Resource/Template.php
+++ /dev/null
@@ -1,119 +0,0 @@
-
- *   $fusiontablesService = new Google_Service_Fusiontables(...);
- *   $template = $fusiontablesService->template;
- *  
- */
-class Google_Service_Fusiontables_Resource_Template extends Google_Service_Resource
-{
-  /**
-   * Deletes a template (template.delete)
-   *
-   * @param string $tableId Table from which the template is being deleted
-   * @param int $templateId Identifier for the template which is being deleted
-   * @param array $optParams Optional parameters.
-   */
-  public function delete($tableId, $templateId, $optParams = array())
-  {
-    $params = array('tableId' => $tableId, 'templateId' => $templateId);
-    $params = array_merge($params, $optParams);
-    return $this->call('delete', array($params));
-  }
-  /**
-   * Retrieves a specific template by its id (template.get)
-   *
-   * @param string $tableId Table to which the template belongs
-   * @param int $templateId Identifier for the template that is being requested
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Fusiontables_Template
-   */
-  public function get($tableId, $templateId, $optParams = array())
-  {
-    $params = array('tableId' => $tableId, 'templateId' => $templateId);
-    $params = array_merge($params, $optParams);
-    return $this->call('get', array($params), "Google_Service_Fusiontables_Template");
-  }
-  /**
-   * Creates a new template for the table. (template.insert)
-   *
-   * @param string $tableId Table for which a new template is being created
-   * @param Google_Service_Fusiontables_Template $postBody
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Fusiontables_Template
-   */
-  public function insert($tableId, Google_Service_Fusiontables_Template $postBody, $optParams = array())
-  {
-    $params = array('tableId' => $tableId, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('insert', array($params), "Google_Service_Fusiontables_Template");
-  }
-  /**
-   * Retrieves a list of templates. (template.listTemplate)
-   *
-   * @param string $tableId Identifier for the table whose templates are being
-   * requested
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param string maxResults Maximum number of templates to return. Optional.
-   * Default is 5.
-   * @opt_param string pageToken Continuation token specifying which results page
-   * to return. Optional.
-   * @return Google_Service_Fusiontables_TemplateList
-   */
-  public function listTemplate($tableId, $optParams = array())
-  {
-    $params = array('tableId' => $tableId);
-    $params = array_merge($params, $optParams);
-    return $this->call('list', array($params), "Google_Service_Fusiontables_TemplateList");
-  }
-  /**
-   * Updates an existing template. This method supports patch semantics.
-   * (template.patch)
-   *
-   * @param string $tableId Table to which the updated template belongs
-   * @param int $templateId Identifier for the template that is being updated
-   * @param Google_Service_Fusiontables_Template $postBody
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Fusiontables_Template
-   */
-  public function patch($tableId, $templateId, Google_Service_Fusiontables_Template $postBody, $optParams = array())
-  {
-    $params = array('tableId' => $tableId, 'templateId' => $templateId, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('patch', array($params), "Google_Service_Fusiontables_Template");
-  }
-  /**
-   * Updates an existing template (template.update)
-   *
-   * @param string $tableId Table to which the updated template belongs
-   * @param int $templateId Identifier for the template that is being updated
-   * @param Google_Service_Fusiontables_Template $postBody
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Fusiontables_Template
-   */
-  public function update($tableId, $templateId, Google_Service_Fusiontables_Template $postBody, $optParams = array())
-  {
-    $params = array('tableId' => $tableId, 'templateId' => $templateId, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('update', array($params), "Google_Service_Fusiontables_Template");
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Fusiontables/Sqlresponse.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Fusiontables/Sqlresponse.php
deleted file mode 100644
index 366a0099..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Fusiontables/Sqlresponse.php
+++ /dev/null
@@ -1,49 +0,0 @@
-columns = $columns;
-  }
-  public function getColumns()
-  {
-    return $this->columns;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setRows($rows)
-  {
-    $this->rows = $rows;
-  }
-  public function getRows()
-  {
-    return $this->rows;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Fusiontables/StyleFunction.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Fusiontables/StyleFunction.php
deleted file mode 100644
index 7e47ccac..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Fusiontables/StyleFunction.php
+++ /dev/null
@@ -1,60 +0,0 @@
-buckets = $buckets;
-  }
-  public function getBuckets()
-  {
-    return $this->buckets;
-  }
-  public function setColumnName($columnName)
-  {
-    $this->columnName = $columnName;
-  }
-  public function getColumnName()
-  {
-    return $this->columnName;
-  }
-  public function setGradient(Google_Service_Fusiontables_StyleFunctionGradient $gradient)
-  {
-    $this->gradient = $gradient;
-  }
-  public function getGradient()
-  {
-    return $this->gradient;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Fusiontables/StyleFunctionGradient.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Fusiontables/StyleFunctionGradient.php
deleted file mode 100644
index 5926684f..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Fusiontables/StyleFunctionGradient.php
+++ /dev/null
@@ -1,50 +0,0 @@
-colors = $colors;
-  }
-  public function getColors()
-  {
-    return $this->colors;
-  }
-  public function setMax($max)
-  {
-    $this->max = $max;
-  }
-  public function getMax()
-  {
-    return $this->max;
-  }
-  public function setMin($min)
-  {
-    $this->min = $min;
-  }
-  public function getMin()
-  {
-    return $this->min;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Fusiontables/StyleFunctionGradientColors.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Fusiontables/StyleFunctionGradientColors.php
deleted file mode 100644
index f0f5f3dc..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Fusiontables/StyleFunctionGradientColors.php
+++ /dev/null
@@ -1,39 +0,0 @@
-color = $color;
-  }
-  public function getColor()
-  {
-    return $this->color;
-  }
-  public function setOpacity($opacity)
-  {
-    $this->opacity = $opacity;
-  }
-  public function getOpacity()
-  {
-    return $this->opacity;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Fusiontables/StyleSetting.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Fusiontables/StyleSetting.php
deleted file mode 100644
index 3e0139da..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Fusiontables/StyleSetting.php
+++ /dev/null
@@ -1,87 +0,0 @@
-kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setMarkerOptions(Google_Service_Fusiontables_PointStyle $markerOptions)
-  {
-    $this->markerOptions = $markerOptions;
-  }
-  public function getMarkerOptions()
-  {
-    return $this->markerOptions;
-  }
-  public function setName($name)
-  {
-    $this->name = $name;
-  }
-  public function getName()
-  {
-    return $this->name;
-  }
-  public function setPolygonOptions(Google_Service_Fusiontables_PolygonStyle $polygonOptions)
-  {
-    $this->polygonOptions = $polygonOptions;
-  }
-  public function getPolygonOptions()
-  {
-    return $this->polygonOptions;
-  }
-  public function setPolylineOptions(Google_Service_Fusiontables_LineStyle $polylineOptions)
-  {
-    $this->polylineOptions = $polylineOptions;
-  }
-  public function getPolylineOptions()
-  {
-    return $this->polylineOptions;
-  }
-  public function setStyleId($styleId)
-  {
-    $this->styleId = $styleId;
-  }
-  public function getStyleId()
-  {
-    return $this->styleId;
-  }
-  public function setTableId($tableId)
-  {
-    $this->tableId = $tableId;
-  }
-  public function getTableId()
-  {
-    return $this->tableId;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Fusiontables/StyleSettingList.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Fusiontables/StyleSettingList.php
deleted file mode 100644
index 3dfa3e3a..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Fusiontables/StyleSettingList.php
+++ /dev/null
@@ -1,59 +0,0 @@
-items = $items;
-  }
-  public function getItems()
-  {
-    return $this->items;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setNextPageToken($nextPageToken)
-  {
-    $this->nextPageToken = $nextPageToken;
-  }
-  public function getNextPageToken()
-  {
-    return $this->nextPageToken;
-  }
-  public function setTotalItems($totalItems)
-  {
-    $this->totalItems = $totalItems;
-  }
-  public function getTotalItems()
-  {
-    return $this->totalItems;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Fusiontables/Table.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Fusiontables/Table.php
deleted file mode 100644
index 6de27fa1..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Fusiontables/Table.php
+++ /dev/null
@@ -1,140 +0,0 @@
-attribution = $attribution;
-  }
-  public function getAttribution()
-  {
-    return $this->attribution;
-  }
-  public function setAttributionLink($attributionLink)
-  {
-    $this->attributionLink = $attributionLink;
-  }
-  public function getAttributionLink()
-  {
-    return $this->attributionLink;
-  }
-  public function setBaseTableIds($baseTableIds)
-  {
-    $this->baseTableIds = $baseTableIds;
-  }
-  public function getBaseTableIds()
-  {
-    return $this->baseTableIds;
-  }
-  public function setColumnPropertiesJsonSchema($columnPropertiesJsonSchema)
-  {
-    $this->columnPropertiesJsonSchema = $columnPropertiesJsonSchema;
-  }
-  public function getColumnPropertiesJsonSchema()
-  {
-    return $this->columnPropertiesJsonSchema;
-  }
-  public function setColumns($columns)
-  {
-    $this->columns = $columns;
-  }
-  public function getColumns()
-  {
-    return $this->columns;
-  }
-  public function setDescription($description)
-  {
-    $this->description = $description;
-  }
-  public function getDescription()
-  {
-    return $this->description;
-  }
-  public function setIsExportable($isExportable)
-  {
-    $this->isExportable = $isExportable;
-  }
-  public function getIsExportable()
-  {
-    return $this->isExportable;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setName($name)
-  {
-    $this->name = $name;
-  }
-  public function getName()
-  {
-    return $this->name;
-  }
-  public function setSql($sql)
-  {
-    $this->sql = $sql;
-  }
-  public function getSql()
-  {
-    return $this->sql;
-  }
-  public function setTableId($tableId)
-  {
-    $this->tableId = $tableId;
-  }
-  public function getTableId()
-  {
-    return $this->tableId;
-  }
-  public function setTablePropertiesJson($tablePropertiesJson)
-  {
-    $this->tablePropertiesJson = $tablePropertiesJson;
-  }
-  public function getTablePropertiesJson()
-  {
-    return $this->tablePropertiesJson;
-  }
-  public function setTablePropertiesJsonSchema($tablePropertiesJsonSchema)
-  {
-    $this->tablePropertiesJsonSchema = $tablePropertiesJsonSchema;
-  }
-  public function getTablePropertiesJsonSchema()
-  {
-    return $this->tablePropertiesJsonSchema;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Fusiontables/TableList.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Fusiontables/TableList.php
deleted file mode 100644
index c384dfaf..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Fusiontables/TableList.php
+++ /dev/null
@@ -1,50 +0,0 @@
-items = $items;
-  }
-  public function getItems()
-  {
-    return $this->items;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setNextPageToken($nextPageToken)
-  {
-    $this->nextPageToken = $nextPageToken;
-  }
-  public function getNextPageToken()
-  {
-    return $this->nextPageToken;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Fusiontables/Task.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Fusiontables/Task.php
deleted file mode 100644
index 85a9a725..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Fusiontables/Task.php
+++ /dev/null
@@ -1,66 +0,0 @@
-kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setProgress($progress)
-  {
-    $this->progress = $progress;
-  }
-  public function getProgress()
-  {
-    return $this->progress;
-  }
-  public function setStarted($started)
-  {
-    $this->started = $started;
-  }
-  public function getStarted()
-  {
-    return $this->started;
-  }
-  public function setTaskId($taskId)
-  {
-    $this->taskId = $taskId;
-  }
-  public function getTaskId()
-  {
-    return $this->taskId;
-  }
-  public function setType($type)
-  {
-    $this->type = $type;
-  }
-  public function getType()
-  {
-    return $this->type;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Fusiontables/TaskList.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Fusiontables/TaskList.php
deleted file mode 100644
index 9d2fcf99..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Fusiontables/TaskList.php
+++ /dev/null
@@ -1,59 +0,0 @@
-items = $items;
-  }
-  public function getItems()
-  {
-    return $this->items;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setNextPageToken($nextPageToken)
-  {
-    $this->nextPageToken = $nextPageToken;
-  }
-  public function getNextPageToken()
-  {
-    return $this->nextPageToken;
-  }
-  public function setTotalItems($totalItems)
-  {
-    $this->totalItems = $totalItems;
-  }
-  public function getTotalItems()
-  {
-    return $this->totalItems;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Fusiontables/Template.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Fusiontables/Template.php
deleted file mode 100644
index 67ad2d58..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Fusiontables/Template.php
+++ /dev/null
@@ -1,76 +0,0 @@
-automaticColumnNames = $automaticColumnNames;
-  }
-  public function getAutomaticColumnNames()
-  {
-    return $this->automaticColumnNames;
-  }
-  public function setBody($body)
-  {
-    $this->body = $body;
-  }
-  public function getBody()
-  {
-    return $this->body;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setName($name)
-  {
-    $this->name = $name;
-  }
-  public function getName()
-  {
-    return $this->name;
-  }
-  public function setTableId($tableId)
-  {
-    $this->tableId = $tableId;
-  }
-  public function getTableId()
-  {
-    return $this->tableId;
-  }
-  public function setTemplateId($templateId)
-  {
-    $this->templateId = $templateId;
-  }
-  public function getTemplateId()
-  {
-    return $this->templateId;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Fusiontables/TemplateList.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Fusiontables/TemplateList.php
deleted file mode 100644
index 85ce5acc..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Fusiontables/TemplateList.php
+++ /dev/null
@@ -1,59 +0,0 @@
-items = $items;
-  }
-  public function getItems()
-  {
-    return $this->items;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setNextPageToken($nextPageToken)
-  {
-    $this->nextPageToken = $nextPageToken;
-  }
-  public function getNextPageToken()
-  {
-    return $this->nextPageToken;
-  }
-  public function setTotalItems($totalItems)
-  {
-    $this->totalItems = $totalItems;
-  }
-  public function getTotalItems()
-  {
-    return $this->totalItems;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Games.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Games.php
deleted file mode 100644
index 8bef6415..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Games.php
+++ /dev/null
@@ -1,1278 +0,0 @@
-
- * The API for Google Play Game Services.

- *
- * 

- * For more information about this service, see the API
- * Documentation
- * 

- *
- * @author Google, Inc.
- */
-class Google_Service_Games extends Google_Service
-{
-  /** View and manage its own configuration data in your Google Drive. */
-  const DRIVE_APPDATA =
-      "https://www.googleapis.com/auth/drive.appdata";
-  /** Share your Google+ profile information and view and manage your game activity. */
-  const GAMES =
-      "https://www.googleapis.com/auth/games";
-  /** Know the list of people in your circles, your age range, and language. */
-  const PLUS_LOGIN =
-      "https://www.googleapis.com/auth/plus.login";
-
-  public $achievementDefinitions;
-  public $achievements;
-  public $applications;
-  public $events;
-  public $leaderboards;
-  public $metagame;
-  public $players;
-  public $pushtokens;
-  public $questMilestones;
-  public $quests;
-  public $revisions;
-  public $rooms;
-  public $scores;
-  public $snapshots;
-  public $turnBasedMatches;
-  
-  /**
-   * Constructs the internal representation of the Games service.
-   *
-   * @param Google_Client $client
-   */
-  public function __construct(Google_Client $client)
-  {
-    parent::__construct($client);
-    $this->rootUrl = 'https://www.googleapis.com/';
-    $this->servicePath = 'games/v1/';
-    $this->version = 'v1';
-    $this->serviceName = 'games';
-
-    $this->achievementDefinitions = new Google_Service_Games_Resource_AchievementDefinitions(
-        $this,
-        $this->serviceName,
-        'achievementDefinitions',
-        array(
-          'methods' => array(
-            'list' => array(
-              'path' => 'achievements',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'consistencyToken' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'language' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'maxResults' => array(
-                  'location' => 'query',
-                  'type' => 'integer',
-                ),
-                'pageToken' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-              ),
-            ),
-          )
-        )
-    );
-    $this->achievements = new Google_Service_Games_Resource_Achievements(
-        $this,
-        $this->serviceName,
-        'achievements',
-        array(
-          'methods' => array(
-            'increment' => array(
-              'path' => 'achievements/{achievementId}/increment',
-              'httpMethod' => 'POST',
-              'parameters' => array(
-                'achievementId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'stepsToIncrement' => array(
-                  'location' => 'query',
-                  'type' => 'integer',
-                  'required' => true,
-                ),
-                'consistencyToken' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'requestId' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-              ),
-            ),'list' => array(
-              'path' => 'players/{playerId}/achievements',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'playerId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'consistencyToken' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'language' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'maxResults' => array(
-                  'location' => 'query',
-                  'type' => 'integer',
-                ),
-                'pageToken' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'state' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-              ),
-            ),'reveal' => array(
-              'path' => 'achievements/{achievementId}/reveal',
-              'httpMethod' => 'POST',
-              'parameters' => array(
-                'achievementId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'consistencyToken' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-              ),
-            ),'setStepsAtLeast' => array(
-              'path' => 'achievements/{achievementId}/setStepsAtLeast',
-              'httpMethod' => 'POST',
-              'parameters' => array(
-                'achievementId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'steps' => array(
-                  'location' => 'query',
-                  'type' => 'integer',
-                  'required' => true,
-                ),
-                'consistencyToken' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-              ),
-            ),'unlock' => array(
-              'path' => 'achievements/{achievementId}/unlock',
-              'httpMethod' => 'POST',
-              'parameters' => array(
-                'achievementId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'consistencyToken' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-              ),
-            ),'updateMultiple' => array(
-              'path' => 'achievements/updateMultiple',
-              'httpMethod' => 'POST',
-              'parameters' => array(
-                'consistencyToken' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-              ),
-            ),
-          )
-        )
-    );
-    $this->applications = new Google_Service_Games_Resource_Applications(
-        $this,
-        $this->serviceName,
-        'applications',
-        array(
-          'methods' => array(
-            'get' => array(
-              'path' => 'applications/{applicationId}',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'applicationId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'consistencyToken' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'language' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'platformType' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-              ),
-            ),'played' => array(
-              'path' => 'applications/played',
-              'httpMethod' => 'POST',
-              'parameters' => array(
-                'consistencyToken' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-              ),
-            ),'verify' => array(
-              'path' => 'applications/{applicationId}/verify',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'applicationId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'consistencyToken' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-              ),
-            ),
-          )
-        )
-    );
-    $this->events = new Google_Service_Games_Resource_Events(
-        $this,
-        $this->serviceName,
-        'events',
-        array(
-          'methods' => array(
-            'listByPlayer' => array(
-              'path' => 'events',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'consistencyToken' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'language' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'maxResults' => array(
-                  'location' => 'query',
-                  'type' => 'integer',
-                ),
-                'pageToken' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-              ),
-            ),'listDefinitions' => array(
-              'path' => 'eventDefinitions',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'consistencyToken' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'language' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'maxResults' => array(
-                  'location' => 'query',
-                  'type' => 'integer',
-                ),
-                'pageToken' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-              ),
-            ),'record' => array(
-              'path' => 'events',
-              'httpMethod' => 'POST',
-              'parameters' => array(
-                'consistencyToken' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'language' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-              ),
-            ),
-          )
-        )
-    );
-    $this->leaderboards = new Google_Service_Games_Resource_Leaderboards(
-        $this,
-        $this->serviceName,
-        'leaderboards',
-        array(
-          'methods' => array(
-            'get' => array(
-              'path' => 'leaderboards/{leaderboardId}',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'leaderboardId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'consistencyToken' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'language' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-              ),
-            ),'list' => array(
-              'path' => 'leaderboards',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'consistencyToken' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'language' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'maxResults' => array(
-                  'location' => 'query',
-                  'type' => 'integer',
-                ),
-                'pageToken' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-              ),
-            ),
-          )
-        )
-    );
-    $this->metagame = new Google_Service_Games_Resource_Metagame(
-        $this,
-        $this->serviceName,
-        'metagame',
-        array(
-          'methods' => array(
-            'getMetagameConfig' => array(
-              'path' => 'metagameConfig',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'consistencyToken' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-              ),
-            ),'listCategoriesByPlayer' => array(
-              'path' => 'players/{playerId}/categories/{collection}',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'playerId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'collection' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'consistencyToken' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'language' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'maxResults' => array(
-                  'location' => 'query',
-                  'type' => 'integer',
-                ),
-                'pageToken' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-              ),
-            ),
-          )
-        )
-    );
-    $this->players = new Google_Service_Games_Resource_Players(
-        $this,
-        $this->serviceName,
-        'players',
-        array(
-          'methods' => array(
-            'get' => array(
-              'path' => 'players/{playerId}',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'playerId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'consistencyToken' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'language' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-              ),
-            ),'list' => array(
-              'path' => 'players/me/players/{collection}',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'collection' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'consistencyToken' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'language' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'maxResults' => array(
-                  'location' => 'query',
-                  'type' => 'integer',
-                ),
-                'pageToken' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-              ),
-            ),
-          )
-        )
-    );
-    $this->pushtokens = new Google_Service_Games_Resource_Pushtokens(
-        $this,
-        $this->serviceName,
-        'pushtokens',
-        array(
-          'methods' => array(
-            'remove' => array(
-              'path' => 'pushtokens/remove',
-              'httpMethod' => 'POST',
-              'parameters' => array(
-                'consistencyToken' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-              ),
-            ),'update' => array(
-              'path' => 'pushtokens',
-              'httpMethod' => 'PUT',
-              'parameters' => array(
-                'consistencyToken' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-              ),
-            ),
-          )
-        )
-    );
-    $this->questMilestones = new Google_Service_Games_Resource_QuestMilestones(
-        $this,
-        $this->serviceName,
-        'questMilestones',
-        array(
-          'methods' => array(
-            'claim' => array(
-              'path' => 'quests/{questId}/milestones/{milestoneId}/claim',
-              'httpMethod' => 'PUT',
-              'parameters' => array(
-                'questId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'milestoneId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'requestId' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'consistencyToken' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-              ),
-            ),
-          )
-        )
-    );
-    $this->quests = new Google_Service_Games_Resource_Quests(
-        $this,
-        $this->serviceName,
-        'quests',
-        array(
-          'methods' => array(
-            'accept' => array(
-              'path' => 'quests/{questId}/accept',
-              'httpMethod' => 'POST',
-              'parameters' => array(
-                'questId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'consistencyToken' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'language' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-              ),
-            ),'list' => array(
-              'path' => 'players/{playerId}/quests',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'playerId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'consistencyToken' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'language' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'maxResults' => array(
-                  'location' => 'query',
-                  'type' => 'integer',
-                ),
-                'pageToken' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-              ),
-            ),
-          )
-        )
-    );
-    $this->revisions = new Google_Service_Games_Resource_Revisions(
-        $this,
-        $this->serviceName,
-        'revisions',
-        array(
-          'methods' => array(
-            'check' => array(
-              'path' => 'revisions/check',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'clientRevision' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'consistencyToken' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-              ),
-            ),
-          )
-        )
-    );
-    $this->rooms = new Google_Service_Games_Resource_Rooms(
-        $this,
-        $this->serviceName,
-        'rooms',
-        array(
-          'methods' => array(
-            'create' => array(
-              'path' => 'rooms/create',
-              'httpMethod' => 'POST',
-              'parameters' => array(
-                'consistencyToken' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'language' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-              ),
-            ),'decline' => array(
-              'path' => 'rooms/{roomId}/decline',
-              'httpMethod' => 'POST',
-              'parameters' => array(
-                'roomId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'consistencyToken' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'language' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-              ),
-            ),'dismiss' => array(
-              'path' => 'rooms/{roomId}/dismiss',
-              'httpMethod' => 'POST',
-              'parameters' => array(
-                'roomId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'consistencyToken' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-              ),
-            ),'get' => array(
-              'path' => 'rooms/{roomId}',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'roomId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'consistencyToken' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'language' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-              ),
-            ),'join' => array(
-              'path' => 'rooms/{roomId}/join',
-              'httpMethod' => 'POST',
-              'parameters' => array(
-                'roomId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'consistencyToken' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'language' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-              ),
-            ),'leave' => array(
-              'path' => 'rooms/{roomId}/leave',
-              'httpMethod' => 'POST',
-              'parameters' => array(
-                'roomId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'consistencyToken' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'language' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-              ),
-            ),'list' => array(
-              'path' => 'rooms',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'consistencyToken' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'language' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'maxResults' => array(
-                  'location' => 'query',
-                  'type' => 'integer',
-                ),
-                'pageToken' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-              ),
-            ),'reportStatus' => array(
-              'path' => 'rooms/{roomId}/reportstatus',
-              'httpMethod' => 'POST',
-              'parameters' => array(
-                'roomId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'consistencyToken' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'language' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-              ),
-            ),
-          )
-        )
-    );
-    $this->scores = new Google_Service_Games_Resource_Scores(
-        $this,
-        $this->serviceName,
-        'scores',
-        array(
-          'methods' => array(
-            'get' => array(
-              'path' => 'players/{playerId}/leaderboards/{leaderboardId}/scores/{timeSpan}',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'playerId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'leaderboardId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'timeSpan' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'consistencyToken' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'includeRankType' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'language' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'maxResults' => array(
-                  'location' => 'query',
-                  'type' => 'integer',
-                ),
-                'pageToken' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-              ),
-            ),'list' => array(
-              'path' => 'leaderboards/{leaderboardId}/scores/{collection}',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'leaderboardId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'collection' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'timeSpan' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'consistencyToken' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'language' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'maxResults' => array(
-                  'location' => 'query',
-                  'type' => 'integer',
-                ),
-                'pageToken' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-              ),
-            ),'listWindow' => array(
-              'path' => 'leaderboards/{leaderboardId}/window/{collection}',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'leaderboardId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'collection' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'timeSpan' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'consistencyToken' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'language' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'maxResults' => array(
-                  'location' => 'query',
-                  'type' => 'integer',
-                ),
-                'pageToken' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'resultsAbove' => array(
-                  'location' => 'query',
-                  'type' => 'integer',
-                ),
-                'returnTopIfAbsent' => array(
-                  'location' => 'query',
-                  'type' => 'boolean',
-                ),
-              ),
-            ),'submit' => array(
-              'path' => 'leaderboards/{leaderboardId}/scores',
-              'httpMethod' => 'POST',
-              'parameters' => array(
-                'leaderboardId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'score' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'consistencyToken' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'language' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'scoreTag' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-              ),
-            ),'submitMultiple' => array(
-              'path' => 'leaderboards/scores',
-              'httpMethod' => 'POST',
-              'parameters' => array(
-                'consistencyToken' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'language' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-              ),
-            ),
-          )
-        )
-    );
-    $this->snapshots = new Google_Service_Games_Resource_Snapshots(
-        $this,
-        $this->serviceName,
-        'snapshots',
-        array(
-          'methods' => array(
-            'get' => array(
-              'path' => 'snapshots/{snapshotId}',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'snapshotId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'consistencyToken' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'language' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-              ),
-            ),'list' => array(
-              'path' => 'players/{playerId}/snapshots',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'playerId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'consistencyToken' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'language' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'maxResults' => array(
-                  'location' => 'query',
-                  'type' => 'integer',
-                ),
-                'pageToken' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-              ),
-            ),
-          )
-        )
-    );
-    $this->turnBasedMatches = new Google_Service_Games_Resource_TurnBasedMatches(
-        $this,
-        $this->serviceName,
-        'turnBasedMatches',
-        array(
-          'methods' => array(
-            'cancel' => array(
-              'path' => 'turnbasedmatches/{matchId}/cancel',
-              'httpMethod' => 'PUT',
-              'parameters' => array(
-                'matchId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'consistencyToken' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-              ),
-            ),'create' => array(
-              'path' => 'turnbasedmatches/create',
-              'httpMethod' => 'POST',
-              'parameters' => array(
-                'consistencyToken' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'language' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-              ),
-            ),'decline' => array(
-              'path' => 'turnbasedmatches/{matchId}/decline',
-              'httpMethod' => 'PUT',
-              'parameters' => array(
-                'matchId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'consistencyToken' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'language' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-              ),
-            ),'dismiss' => array(
-              'path' => 'turnbasedmatches/{matchId}/dismiss',
-              'httpMethod' => 'PUT',
-              'parameters' => array(
-                'matchId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'consistencyToken' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-              ),
-            ),'finish' => array(
-              'path' => 'turnbasedmatches/{matchId}/finish',
-              'httpMethod' => 'PUT',
-              'parameters' => array(
-                'matchId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'consistencyToken' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'language' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-              ),
-            ),'get' => array(
-              'path' => 'turnbasedmatches/{matchId}',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'matchId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'consistencyToken' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'includeMatchData' => array(
-                  'location' => 'query',
-                  'type' => 'boolean',
-                ),
-                'language' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-              ),
-            ),'join' => array(
-              'path' => 'turnbasedmatches/{matchId}/join',
-              'httpMethod' => 'PUT',
-              'parameters' => array(
-                'matchId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'consistencyToken' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'language' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-              ),
-            ),'leave' => array(
-              'path' => 'turnbasedmatches/{matchId}/leave',
-              'httpMethod' => 'PUT',
-              'parameters' => array(
-                'matchId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'consistencyToken' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'language' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-              ),
-            ),'leaveTurn' => array(
-              'path' => 'turnbasedmatches/{matchId}/leaveTurn',
-              'httpMethod' => 'PUT',
-              'parameters' => array(
-                'matchId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'matchVersion' => array(
-                  'location' => 'query',
-                  'type' => 'integer',
-                  'required' => true,
-                ),
-                'consistencyToken' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'language' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'pendingParticipantId' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-              ),
-            ),'list' => array(
-              'path' => 'turnbasedmatches',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'consistencyToken' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'includeMatchData' => array(
-                  'location' => 'query',
-                  'type' => 'boolean',
-                ),
-                'language' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'maxCompletedMatches' => array(
-                  'location' => 'query',
-                  'type' => 'integer',
-                ),
-                'maxResults' => array(
-                  'location' => 'query',
-                  'type' => 'integer',
-                ),
-                'pageToken' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-              ),
-            ),'rematch' => array(
-              'path' => 'turnbasedmatches/{matchId}/rematch',
-              'httpMethod' => 'POST',
-              'parameters' => array(
-                'matchId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'consistencyToken' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'language' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'requestId' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-              ),
-            ),'sync' => array(
-              'path' => 'turnbasedmatches/sync',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'consistencyToken' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'includeMatchData' => array(
-                  'location' => 'query',
-                  'type' => 'boolean',
-                ),
-                'language' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'maxCompletedMatches' => array(
-                  'location' => 'query',
-                  'type' => 'integer',
-                ),
-                'maxResults' => array(
-                  'location' => 'query',
-                  'type' => 'integer',
-                ),
-                'pageToken' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-              ),
-            ),'takeTurn' => array(
-              'path' => 'turnbasedmatches/{matchId}/turn',
-              'httpMethod' => 'PUT',
-              'parameters' => array(
-                'matchId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'consistencyToken' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'language' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-              ),
-            ),
-          )
-        )
-    );
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Games/AchievementDefinition.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Games/AchievementDefinition.php
deleted file mode 100644
index b0744f35..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Games/AchievementDefinition.php
+++ /dev/null
@@ -1,138 +0,0 @@
-achievementType = $achievementType;
-  }
-  public function getAchievementType()
-  {
-    return $this->achievementType;
-  }
-  public function setDescription($description)
-  {
-    $this->description = $description;
-  }
-  public function getDescription()
-  {
-    return $this->description;
-  }
-  public function setExperiencePoints($experiencePoints)
-  {
-    $this->experiencePoints = $experiencePoints;
-  }
-  public function getExperiencePoints()
-  {
-    return $this->experiencePoints;
-  }
-  public function setFormattedTotalSteps($formattedTotalSteps)
-  {
-    $this->formattedTotalSteps = $formattedTotalSteps;
-  }
-  public function getFormattedTotalSteps()
-  {
-    return $this->formattedTotalSteps;
-  }
-  public function setId($id)
-  {
-    $this->id = $id;
-  }
-  public function getId()
-  {
-    return $this->id;
-  }
-  public function setInitialState($initialState)
-  {
-    $this->initialState = $initialState;
-  }
-  public function getInitialState()
-  {
-    return $this->initialState;
-  }
-  public function setIsRevealedIconUrlDefault($isRevealedIconUrlDefault)
-  {
-    $this->isRevealedIconUrlDefault = $isRevealedIconUrlDefault;
-  }
-  public function getIsRevealedIconUrlDefault()
-  {
-    return $this->isRevealedIconUrlDefault;
-  }
-  public function setIsUnlockedIconUrlDefault($isUnlockedIconUrlDefault)
-  {
-    $this->isUnlockedIconUrlDefault = $isUnlockedIconUrlDefault;
-  }
-  public function getIsUnlockedIconUrlDefault()
-  {
-    return $this->isUnlockedIconUrlDefault;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setName($name)
-  {
-    $this->name = $name;
-  }
-  public function getName()
-  {
-    return $this->name;
-  }
-  public function setRevealedIconUrl($revealedIconUrl)
-  {
-    $this->revealedIconUrl = $revealedIconUrl;
-  }
-  public function getRevealedIconUrl()
-  {
-    return $this->revealedIconUrl;
-  }
-  public function setTotalSteps($totalSteps)
-  {
-    $this->totalSteps = $totalSteps;
-  }
-  public function getTotalSteps()
-  {
-    return $this->totalSteps;
-  }
-  public function setUnlockedIconUrl($unlockedIconUrl)
-  {
-    $this->unlockedIconUrl = $unlockedIconUrl;
-  }
-  public function getUnlockedIconUrl()
-  {
-    return $this->unlockedIconUrl;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Games/AchievementDefinitionsListResponse.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Games/AchievementDefinitionsListResponse.php
deleted file mode 100644
index 40da8475..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Games/AchievementDefinitionsListResponse.php
+++ /dev/null
@@ -1,50 +0,0 @@
-items = $items;
-  }
-  public function getItems()
-  {
-    return $this->items;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setNextPageToken($nextPageToken)
-  {
-    $this->nextPageToken = $nextPageToken;
-  }
-  public function getNextPageToken()
-  {
-    return $this->nextPageToken;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Games/AchievementIncrementResponse.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Games/AchievementIncrementResponse.php
deleted file mode 100644
index 7ca6348f..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Games/AchievementIncrementResponse.php
+++ /dev/null
@@ -1,48 +0,0 @@
-currentSteps = $currentSteps;
-  }
-  public function getCurrentSteps()
-  {
-    return $this->currentSteps;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setNewlyUnlocked($newlyUnlocked)
-  {
-    $this->newlyUnlocked = $newlyUnlocked;
-  }
-  public function getNewlyUnlocked()
-  {
-    return $this->newlyUnlocked;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Games/AchievementRevealResponse.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Games/AchievementRevealResponse.php
deleted file mode 100644
index 27792cbb..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Games/AchievementRevealResponse.php
+++ /dev/null
@@ -1,39 +0,0 @@
-currentState = $currentState;
-  }
-  public function getCurrentState()
-  {
-    return $this->currentState;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Games/AchievementSetStepsAtLeastResponse.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Games/AchievementSetStepsAtLeastResponse.php
deleted file mode 100644
index 9662774b..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Games/AchievementSetStepsAtLeastResponse.php
+++ /dev/null
@@ -1,48 +0,0 @@
-currentSteps = $currentSteps;
-  }
-  public function getCurrentSteps()
-  {
-    return $this->currentSteps;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setNewlyUnlocked($newlyUnlocked)
-  {
-    $this->newlyUnlocked = $newlyUnlocked;
-  }
-  public function getNewlyUnlocked()
-  {
-    return $this->newlyUnlocked;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Games/AchievementUnlockResponse.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Games/AchievementUnlockResponse.php
deleted file mode 100644
index 70304cca..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Games/AchievementUnlockResponse.php
+++ /dev/null
@@ -1,39 +0,0 @@
-kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setNewlyUnlocked($newlyUnlocked)
-  {
-    $this->newlyUnlocked = $newlyUnlocked;
-  }
-  public function getNewlyUnlocked()
-  {
-    return $this->newlyUnlocked;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Games/AchievementUpdateMultipleRequest.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Games/AchievementUpdateMultipleRequest.php
deleted file mode 100644
index 3bf9259e..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Games/AchievementUpdateMultipleRequest.php
+++ /dev/null
@@ -1,41 +0,0 @@
-kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setUpdates($updates)
-  {
-    $this->updates = $updates;
-  }
-  public function getUpdates()
-  {
-    return $this->updates;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Games/AchievementUpdateMultipleResponse.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Games/AchievementUpdateMultipleResponse.php
deleted file mode 100644
index df19f29c..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Games/AchievementUpdateMultipleResponse.php
+++ /dev/null
@@ -1,41 +0,0 @@
-kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setUpdatedAchievements($updatedAchievements)
-  {
-    $this->updatedAchievements = $updatedAchievements;
-  }
-  public function getUpdatedAchievements()
-  {
-    return $this->updatedAchievements;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Games/AchievementUpdateRequest.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Games/AchievementUpdateRequest.php
deleted file mode 100644
index 1fb41a66..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Games/AchievementUpdateRequest.php
+++ /dev/null
@@ -1,68 +0,0 @@
-achievementId = $achievementId;
-  }
-  public function getAchievementId()
-  {
-    return $this->achievementId;
-  }
-  public function setIncrementPayload(Google_Service_Games_GamesAchievementIncrement $incrementPayload)
-  {
-    $this->incrementPayload = $incrementPayload;
-  }
-  public function getIncrementPayload()
-  {
-    return $this->incrementPayload;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setSetStepsAtLeastPayload(Google_Service_Games_GamesAchievementSetStepsAtLeast $setStepsAtLeastPayload)
-  {
-    $this->setStepsAtLeastPayload = $setStepsAtLeastPayload;
-  }
-  public function getSetStepsAtLeastPayload()
-  {
-    return $this->setStepsAtLeastPayload;
-  }
-  public function setUpdateType($updateType)
-  {
-    $this->updateType = $updateType;
-  }
-  public function getUpdateType()
-  {
-    return $this->updateType;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Games/AchievementUpdateResponse.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Games/AchievementUpdateResponse.php
deleted file mode 100644
index 6d2d9f9f..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Games/AchievementUpdateResponse.php
+++ /dev/null
@@ -1,75 +0,0 @@
-achievementId = $achievementId;
-  }
-  public function getAchievementId()
-  {
-    return $this->achievementId;
-  }
-  public function setCurrentState($currentState)
-  {
-    $this->currentState = $currentState;
-  }
-  public function getCurrentState()
-  {
-    return $this->currentState;
-  }
-  public function setCurrentSteps($currentSteps)
-  {
-    $this->currentSteps = $currentSteps;
-  }
-  public function getCurrentSteps()
-  {
-    return $this->currentSteps;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setNewlyUnlocked($newlyUnlocked)
-  {
-    $this->newlyUnlocked = $newlyUnlocked;
-  }
-  public function getNewlyUnlocked()
-  {
-    return $this->newlyUnlocked;
-  }
-  public function setUpdateOccurred($updateOccurred)
-  {
-    $this->updateOccurred = $updateOccurred;
-  }
-  public function getUpdateOccurred()
-  {
-    return $this->updateOccurred;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Games/AggregateStats.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Games/AggregateStats.php
deleted file mode 100644
index a8a00b57..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Games/AggregateStats.php
+++ /dev/null
@@ -1,66 +0,0 @@
-count = $count;
-  }
-  public function getCount()
-  {
-    return $this->count;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setMax($max)
-  {
-    $this->max = $max;
-  }
-  public function getMax()
-  {
-    return $this->max;
-  }
-  public function setMin($min)
-  {
-    $this->min = $min;
-  }
-  public function getMin()
-  {
-    return $this->min;
-  }
-  public function setSum($sum)
-  {
-    $this->sum = $sum;
-  }
-  public function getSum()
-  {
-    return $this->sum;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Games/AnonymousPlayer.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Games/AnonymousPlayer.php
deleted file mode 100644
index 7d1dac1f..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Games/AnonymousPlayer.php
+++ /dev/null
@@ -1,48 +0,0 @@
-avatarImageUrl = $avatarImageUrl;
-  }
-  public function getAvatarImageUrl()
-  {
-    return $this->avatarImageUrl;
-  }
-  public function setDisplayName($displayName)
-  {
-    $this->displayName = $displayName;
-  }
-  public function getDisplayName()
-  {
-    return $this->displayName;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Games/Application.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Games/Application.php
deleted file mode 100644
index 09248b96..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Games/Application.php
+++ /dev/null
@@ -1,146 +0,0 @@
- "achievement_count",
-        "leaderboardCount" => "leaderboard_count",
-  );
-  public $achievementCount;
-  protected $assetsType = 'Google_Service_Games_ImageAsset';
-  protected $assetsDataType = 'array';
-  public $author;
-  protected $categoryType = 'Google_Service_Games_ApplicationCategory';
-  protected $categoryDataType = '';
-  public $description;
-  public $enabledFeatures;
-  public $id;
-  protected $instancesType = 'Google_Service_Games_Instance';
-  protected $instancesDataType = 'array';
-  public $kind;
-  public $lastUpdatedTimestamp;
-  public $leaderboardCount;
-  public $name;
-  public $themeColor;
-
-  public function setAchievementCount($achievementCount)
-  {
-    $this->achievementCount = $achievementCount;
-  }
-  public function getAchievementCount()
-  {
-    return $this->achievementCount;
-  }
-  public function setAssets($assets)
-  {
-    $this->assets = $assets;
-  }
-  public function getAssets()
-  {
-    return $this->assets;
-  }
-  public function setAuthor($author)
-  {
-    $this->author = $author;
-  }
-  public function getAuthor()
-  {
-    return $this->author;
-  }
-  public function setCategory(Google_Service_Games_ApplicationCategory $category)
-  {
-    $this->category = $category;
-  }
-  public function getCategory()
-  {
-    return $this->category;
-  }
-  public function setDescription($description)
-  {
-    $this->description = $description;
-  }
-  public function getDescription()
-  {
-    return $this->description;
-  }
-  public function setEnabledFeatures($enabledFeatures)
-  {
-    $this->enabledFeatures = $enabledFeatures;
-  }
-  public function getEnabledFeatures()
-  {
-    return $this->enabledFeatures;
-  }
-  public function setId($id)
-  {
-    $this->id = $id;
-  }
-  public function getId()
-  {
-    return $this->id;
-  }
-  public function setInstances($instances)
-  {
-    $this->instances = $instances;
-  }
-  public function getInstances()
-  {
-    return $this->instances;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setLastUpdatedTimestamp($lastUpdatedTimestamp)
-  {
-    $this->lastUpdatedTimestamp = $lastUpdatedTimestamp;
-  }
-  public function getLastUpdatedTimestamp()
-  {
-    return $this->lastUpdatedTimestamp;
-  }
-  public function setLeaderboardCount($leaderboardCount)
-  {
-    $this->leaderboardCount = $leaderboardCount;
-  }
-  public function getLeaderboardCount()
-  {
-    return $this->leaderboardCount;
-  }
-  public function setName($name)
-  {
-    $this->name = $name;
-  }
-  public function getName()
-  {
-    return $this->name;
-  }
-  public function setThemeColor($themeColor)
-  {
-    $this->themeColor = $themeColor;
-  }
-  public function getThemeColor()
-  {
-    return $this->themeColor;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Games/ApplicationCategory.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Games/ApplicationCategory.php
deleted file mode 100644
index f267524b..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Games/ApplicationCategory.php
+++ /dev/null
@@ -1,48 +0,0 @@
-kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setPrimary($primary)
-  {
-    $this->primary = $primary;
-  }
-  public function getPrimary()
-  {
-    return $this->primary;
-  }
-  public function setSecondary($secondary)
-  {
-    $this->secondary = $secondary;
-  }
-  public function getSecondary()
-  {
-    return $this->secondary;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Games/ApplicationVerifyResponse.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Games/ApplicationVerifyResponse.php
deleted file mode 100644
index 6b51e4f6..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Games/ApplicationVerifyResponse.php
+++ /dev/null
@@ -1,52 +0,0 @@
- "alternate_player_id",
-        "playerId" => "player_id",
-  );
-  public $alternatePlayerId;
-  public $kind;
-  public $playerId;
-
-  public function setAlternatePlayerId($alternatePlayerId)
-  {
-    $this->alternatePlayerId = $alternatePlayerId;
-  }
-  public function getAlternatePlayerId()
-  {
-    return $this->alternatePlayerId;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setPlayerId($playerId)
-  {
-    $this->playerId = $playerId;
-  }
-  public function getPlayerId()
-  {
-    return $this->playerId;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Games/Category.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Games/Category.php
deleted file mode 100644
index 4f0a05f3..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Games/Category.php
+++ /dev/null
@@ -1,48 +0,0 @@
-category = $category;
-  }
-  public function getCategory()
-  {
-    return $this->category;
-  }
-  public function setExperiencePoints($experiencePoints)
-  {
-    $this->experiencePoints = $experiencePoints;
-  }
-  public function getExperiencePoints()
-  {
-    return $this->experiencePoints;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Games/CategoryListResponse.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Games/CategoryListResponse.php
deleted file mode 100644
index d70d0020..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Games/CategoryListResponse.php
+++ /dev/null
@@ -1,50 +0,0 @@
-items = $items;
-  }
-  public function getItems()
-  {
-    return $this->items;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setNextPageToken($nextPageToken)
-  {
-    $this->nextPageToken = $nextPageToken;
-  }
-  public function getNextPageToken()
-  {
-    return $this->nextPageToken;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Games/EventBatchRecordFailure.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Games/EventBatchRecordFailure.php
deleted file mode 100644
index 6b55ca36..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Games/EventBatchRecordFailure.php
+++ /dev/null
@@ -1,49 +0,0 @@
-failureCause = $failureCause;
-  }
-  public function getFailureCause()
-  {
-    return $this->failureCause;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setRange(Google_Service_Games_EventPeriodRange $range)
-  {
-    $this->range = $range;
-  }
-  public function getRange()
-  {
-    return $this->range;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Games/EventChild.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Games/EventChild.php
deleted file mode 100644
index 2ef59454..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Games/EventChild.php
+++ /dev/null
@@ -1,39 +0,0 @@
-childId = $childId;
-  }
-  public function getChildId()
-  {
-    return $this->childId;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Games/EventDefinition.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Games/EventDefinition.php
deleted file mode 100644
index 65c020d3..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Games/EventDefinition.php
+++ /dev/null
@@ -1,95 +0,0 @@
-childEvents = $childEvents;
-  }
-  public function getChildEvents()
-  {
-    return $this->childEvents;
-  }
-  public function setDescription($description)
-  {
-    $this->description = $description;
-  }
-  public function getDescription()
-  {
-    return $this->description;
-  }
-  public function setDisplayName($displayName)
-  {
-    $this->displayName = $displayName;
-  }
-  public function getDisplayName()
-  {
-    return $this->displayName;
-  }
-  public function setId($id)
-  {
-    $this->id = $id;
-  }
-  public function getId()
-  {
-    return $this->id;
-  }
-  public function setImageUrl($imageUrl)
-  {
-    $this->imageUrl = $imageUrl;
-  }
-  public function getImageUrl()
-  {
-    return $this->imageUrl;
-  }
-  public function setIsDefaultImageUrl($isDefaultImageUrl)
-  {
-    $this->isDefaultImageUrl = $isDefaultImageUrl;
-  }
-  public function getIsDefaultImageUrl()
-  {
-    return $this->isDefaultImageUrl;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setVisibility($visibility)
-  {
-    $this->visibility = $visibility;
-  }
-  public function getVisibility()
-  {
-    return $this->visibility;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Games/EventDefinitionListResponse.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Games/EventDefinitionListResponse.php
deleted file mode 100644
index 8eb3a1a0..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Games/EventDefinitionListResponse.php
+++ /dev/null
@@ -1,50 +0,0 @@
-items = $items;
-  }
-  public function getItems()
-  {
-    return $this->items;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setNextPageToken($nextPageToken)
-  {
-    $this->nextPageToken = $nextPageToken;
-  }
-  public function getNextPageToken()
-  {
-    return $this->nextPageToken;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Games/EventPeriodRange.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Games/EventPeriodRange.php
deleted file mode 100644
index a584711f..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Games/EventPeriodRange.php
+++ /dev/null
@@ -1,48 +0,0 @@
-kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setPeriodEndMillis($periodEndMillis)
-  {
-    $this->periodEndMillis = $periodEndMillis;
-  }
-  public function getPeriodEndMillis()
-  {
-    return $this->periodEndMillis;
-  }
-  public function setPeriodStartMillis($periodStartMillis)
-  {
-    $this->periodStartMillis = $periodStartMillis;
-  }
-  public function getPeriodStartMillis()
-  {
-    return $this->periodStartMillis;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Games/EventPeriodUpdate.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Games/EventPeriodUpdate.php
deleted file mode 100644
index 69e01175..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Games/EventPeriodUpdate.php
+++ /dev/null
@@ -1,51 +0,0 @@
-kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setTimePeriod(Google_Service_Games_EventPeriodRange $timePeriod)
-  {
-    $this->timePeriod = $timePeriod;
-  }
-  public function getTimePeriod()
-  {
-    return $this->timePeriod;
-  }
-  public function setUpdates($updates)
-  {
-    $this->updates = $updates;
-  }
-  public function getUpdates()
-  {
-    return $this->updates;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Games/EventRecordFailure.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Games/EventRecordFailure.php
deleted file mode 100644
index 35ac4eed..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Games/EventRecordFailure.php
+++ /dev/null
@@ -1,48 +0,0 @@
-eventId = $eventId;
-  }
-  public function getEventId()
-  {
-    return $this->eventId;
-  }
-  public function setFailureCause($failureCause)
-  {
-    $this->failureCause = $failureCause;
-  }
-  public function getFailureCause()
-  {
-    return $this->failureCause;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Games/EventRecordRequest.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Games/EventRecordRequest.php
deleted file mode 100644
index fd3da23b..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Games/EventRecordRequest.php
+++ /dev/null
@@ -1,59 +0,0 @@
-currentTimeMillis = $currentTimeMillis;
-  }
-  public function getCurrentTimeMillis()
-  {
-    return $this->currentTimeMillis;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setRequestId($requestId)
-  {
-    $this->requestId = $requestId;
-  }
-  public function getRequestId()
-  {
-    return $this->requestId;
-  }
-  public function setTimePeriods($timePeriods)
-  {
-    $this->timePeriods = $timePeriods;
-  }
-  public function getTimePeriods()
-  {
-    return $this->timePeriods;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Games/EventUpdateRequest.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Games/EventUpdateRequest.php
deleted file mode 100644
index 48314f70..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Games/EventUpdateRequest.php
+++ /dev/null
@@ -1,48 +0,0 @@
-definitionId = $definitionId;
-  }
-  public function getDefinitionId()
-  {
-    return $this->definitionId;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setUpdateCount($updateCount)
-  {
-    $this->updateCount = $updateCount;
-  }
-  public function getUpdateCount()
-  {
-    return $this->updateCount;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Games/EventUpdateResponse.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Games/EventUpdateResponse.php
deleted file mode 100644
index 9a180f33..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Games/EventUpdateResponse.php
+++ /dev/null
@@ -1,61 +0,0 @@
-batchFailures = $batchFailures;
-  }
-  public function getBatchFailures()
-  {
-    return $this->batchFailures;
-  }
-  public function setEventFailures($eventFailures)
-  {
-    $this->eventFailures = $eventFailures;
-  }
-  public function getEventFailures()
-  {
-    return $this->eventFailures;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setPlayerEvents($playerEvents)
-  {
-    $this->playerEvents = $playerEvents;
-  }
-  public function getPlayerEvents()
-  {
-    return $this->playerEvents;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Games/GamesAchievementIncrement.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Games/GamesAchievementIncrement.php
deleted file mode 100644
index 863cd06a..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Games/GamesAchievementIncrement.php
+++ /dev/null
@@ -1,48 +0,0 @@
-kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setRequestId($requestId)
-  {
-    $this->requestId = $requestId;
-  }
-  public function getRequestId()
-  {
-    return $this->requestId;
-  }
-  public function setSteps($steps)
-  {
-    $this->steps = $steps;
-  }
-  public function getSteps()
-  {
-    return $this->steps;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Games/GamesAchievementSetStepsAtLeast.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Games/GamesAchievementSetStepsAtLeast.php
deleted file mode 100644
index 121d0ec0..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Games/GamesAchievementSetStepsAtLeast.php
+++ /dev/null
@@ -1,39 +0,0 @@
-kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setSteps($steps)
-  {
-    $this->steps = $steps;
-  }
-  public function getSteps()
-  {
-    return $this->steps;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Games/ImageAsset.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Games/ImageAsset.php
deleted file mode 100644
index 2fbaff4f..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Games/ImageAsset.php
+++ /dev/null
@@ -1,66 +0,0 @@
-height = $height;
-  }
-  public function getHeight()
-  {
-    return $this->height;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setName($name)
-  {
-    $this->name = $name;
-  }
-  public function getName()
-  {
-    return $this->name;
-  }
-  public function setUrl($url)
-  {
-    $this->url = $url;
-  }
-  public function getUrl()
-  {
-    return $this->url;
-  }
-  public function setWidth($width)
-  {
-    $this->width = $width;
-  }
-  public function getWidth()
-  {
-    return $this->width;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Games/Instance.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Games/Instance.php
deleted file mode 100644
index d9b41555..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Games/Instance.php
+++ /dev/null
@@ -1,105 +0,0 @@
-acquisitionUri = $acquisitionUri;
-  }
-  public function getAcquisitionUri()
-  {
-    return $this->acquisitionUri;
-  }
-  public function setAndroidInstance(Google_Service_Games_InstanceAndroidDetails $androidInstance)
-  {
-    $this->androidInstance = $androidInstance;
-  }
-  public function getAndroidInstance()
-  {
-    return $this->androidInstance;
-  }
-  public function setIosInstance(Google_Service_Games_InstanceIosDetails $iosInstance)
-  {
-    $this->iosInstance = $iosInstance;
-  }
-  public function getIosInstance()
-  {
-    return $this->iosInstance;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setName($name)
-  {
-    $this->name = $name;
-  }
-  public function getName()
-  {
-    return $this->name;
-  }
-  public function setPlatformType($platformType)
-  {
-    $this->platformType = $platformType;
-  }
-  public function getPlatformType()
-  {
-    return $this->platformType;
-  }
-  public function setRealtimePlay($realtimePlay)
-  {
-    $this->realtimePlay = $realtimePlay;
-  }
-  public function getRealtimePlay()
-  {
-    return $this->realtimePlay;
-  }
-  public function setTurnBasedPlay($turnBasedPlay)
-  {
-    $this->turnBasedPlay = $turnBasedPlay;
-  }
-  public function getTurnBasedPlay()
-  {
-    return $this->turnBasedPlay;
-  }
-  public function setWebInstance(Google_Service_Games_InstanceWebDetails $webInstance)
-  {
-    $this->webInstance = $webInstance;
-  }
-  public function getWebInstance()
-  {
-    return $this->webInstance;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Games/InstanceAndroidDetails.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Games/InstanceAndroidDetails.php
deleted file mode 100644
index 9bd810fb..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Games/InstanceAndroidDetails.php
+++ /dev/null
@@ -1,57 +0,0 @@
-enablePiracyCheck = $enablePiracyCheck;
-  }
-  public function getEnablePiracyCheck()
-  {
-    return $this->enablePiracyCheck;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setPackageName($packageName)
-  {
-    $this->packageName = $packageName;
-  }
-  public function getPackageName()
-  {
-    return $this->packageName;
-  }
-  public function setPreferred($preferred)
-  {
-    $this->preferred = $preferred;
-  }
-  public function getPreferred()
-  {
-    return $this->preferred;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Games/InstanceIosDetails.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Games/InstanceIosDetails.php
deleted file mode 100644
index e82877cb..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Games/InstanceIosDetails.php
+++ /dev/null
@@ -1,84 +0,0 @@
-bundleIdentifier = $bundleIdentifier;
-  }
-  public function getBundleIdentifier()
-  {
-    return $this->bundleIdentifier;
-  }
-  public function setItunesAppId($itunesAppId)
-  {
-    $this->itunesAppId = $itunesAppId;
-  }
-  public function getItunesAppId()
-  {
-    return $this->itunesAppId;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setPreferredForIpad($preferredForIpad)
-  {
-    $this->preferredForIpad = $preferredForIpad;
-  }
-  public function getPreferredForIpad()
-  {
-    return $this->preferredForIpad;
-  }
-  public function setPreferredForIphone($preferredForIphone)
-  {
-    $this->preferredForIphone = $preferredForIphone;
-  }
-  public function getPreferredForIphone()
-  {
-    return $this->preferredForIphone;
-  }
-  public function setSupportIpad($supportIpad)
-  {
-    $this->supportIpad = $supportIpad;
-  }
-  public function getSupportIpad()
-  {
-    return $this->supportIpad;
-  }
-  public function setSupportIphone($supportIphone)
-  {
-    $this->supportIphone = $supportIphone;
-  }
-  public function getSupportIphone()
-  {
-    return $this->supportIphone;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Games/InstanceWebDetails.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Games/InstanceWebDetails.php
deleted file mode 100644
index 601cd4b7..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Games/InstanceWebDetails.php
+++ /dev/null
@@ -1,48 +0,0 @@
-kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setLaunchUrl($launchUrl)
-  {
-    $this->launchUrl = $launchUrl;
-  }
-  public function getLaunchUrl()
-  {
-    return $this->launchUrl;
-  }
-  public function setPreferred($preferred)
-  {
-    $this->preferred = $preferred;
-  }
-  public function getPreferred()
-  {
-    return $this->preferred;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Games/Leaderboard.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Games/Leaderboard.php
deleted file mode 100644
index 8d6bc438..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Games/Leaderboard.php
+++ /dev/null
@@ -1,75 +0,0 @@
-iconUrl = $iconUrl;
-  }
-  public function getIconUrl()
-  {
-    return $this->iconUrl;
-  }
-  public function setId($id)
-  {
-    $this->id = $id;
-  }
-  public function getId()
-  {
-    return $this->id;
-  }
-  public function setIsIconUrlDefault($isIconUrlDefault)
-  {
-    $this->isIconUrlDefault = $isIconUrlDefault;
-  }
-  public function getIsIconUrlDefault()
-  {
-    return $this->isIconUrlDefault;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setName($name)
-  {
-    $this->name = $name;
-  }
-  public function getName()
-  {
-    return $this->name;
-  }
-  public function setOrder($order)
-  {
-    $this->order = $order;
-  }
-  public function getOrder()
-  {
-    return $this->order;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Games/LeaderboardEntry.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Games/LeaderboardEntry.php
deleted file mode 100644
index 9d451a02..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Games/LeaderboardEntry.php
+++ /dev/null
@@ -1,103 +0,0 @@
-formattedScore = $formattedScore;
-  }
-  public function getFormattedScore()
-  {
-    return $this->formattedScore;
-  }
-  public function setFormattedScoreRank($formattedScoreRank)
-  {
-    $this->formattedScoreRank = $formattedScoreRank;
-  }
-  public function getFormattedScoreRank()
-  {
-    return $this->formattedScoreRank;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setPlayer(Google_Service_Games_Player $player)
-  {
-    $this->player = $player;
-  }
-  public function getPlayer()
-  {
-    return $this->player;
-  }
-  public function setScoreRank($scoreRank)
-  {
-    $this->scoreRank = $scoreRank;
-  }
-  public function getScoreRank()
-  {
-    return $this->scoreRank;
-  }
-  public function setScoreTag($scoreTag)
-  {
-    $this->scoreTag = $scoreTag;
-  }
-  public function getScoreTag()
-  {
-    return $this->scoreTag;
-  }
-  public function setScoreValue($scoreValue)
-  {
-    $this->scoreValue = $scoreValue;
-  }
-  public function getScoreValue()
-  {
-    return $this->scoreValue;
-  }
-  public function setTimeSpan($timeSpan)
-  {
-    $this->timeSpan = $timeSpan;
-  }
-  public function getTimeSpan()
-  {
-    return $this->timeSpan;
-  }
-  public function setWriteTimestampMillis($writeTimestampMillis)
-  {
-    $this->writeTimestampMillis = $writeTimestampMillis;
-  }
-  public function getWriteTimestampMillis()
-  {
-    return $this->writeTimestampMillis;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Games/LeaderboardListResponse.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Games/LeaderboardListResponse.php
deleted file mode 100644
index 21fdfa87..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Games/LeaderboardListResponse.php
+++ /dev/null
@@ -1,50 +0,0 @@
-items = $items;
-  }
-  public function getItems()
-  {
-    return $this->items;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setNextPageToken($nextPageToken)
-  {
-    $this->nextPageToken = $nextPageToken;
-  }
-  public function getNextPageToken()
-  {
-    return $this->nextPageToken;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Games/LeaderboardScoreRank.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Games/LeaderboardScoreRank.php
deleted file mode 100644
index 8127bfd5..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Games/LeaderboardScoreRank.php
+++ /dev/null
@@ -1,66 +0,0 @@
-formattedNumScores = $formattedNumScores;
-  }
-  public function getFormattedNumScores()
-  {
-    return $this->formattedNumScores;
-  }
-  public function setFormattedRank($formattedRank)
-  {
-    $this->formattedRank = $formattedRank;
-  }
-  public function getFormattedRank()
-  {
-    return $this->formattedRank;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setNumScores($numScores)
-  {
-    $this->numScores = $numScores;
-  }
-  public function getNumScores()
-  {
-    return $this->numScores;
-  }
-  public function setRank($rank)
-  {
-    $this->rank = $rank;
-  }
-  public function getRank()
-  {
-    return $this->rank;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Games/LeaderboardScores.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Games/LeaderboardScores.php
deleted file mode 100644
index 9381da02..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Games/LeaderboardScores.php
+++ /dev/null
@@ -1,78 +0,0 @@
-items = $items;
-  }
-  public function getItems()
-  {
-    return $this->items;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setNextPageToken($nextPageToken)
-  {
-    $this->nextPageToken = $nextPageToken;
-  }
-  public function getNextPageToken()
-  {
-    return $this->nextPageToken;
-  }
-  public function setNumScores($numScores)
-  {
-    $this->numScores = $numScores;
-  }
-  public function getNumScores()
-  {
-    return $this->numScores;
-  }
-  public function setPlayerScore(Google_Service_Games_LeaderboardEntry $playerScore)
-  {
-    $this->playerScore = $playerScore;
-  }
-  public function getPlayerScore()
-  {
-    return $this->playerScore;
-  }
-  public function setPrevPageToken($prevPageToken)
-  {
-    $this->prevPageToken = $prevPageToken;
-  }
-  public function getPrevPageToken()
-  {
-    return $this->prevPageToken;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Games/MetagameConfig.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Games/MetagameConfig.php
deleted file mode 100644
index cec0a436..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Games/MetagameConfig.php
+++ /dev/null
@@ -1,50 +0,0 @@
-currentVersion = $currentVersion;
-  }
-  public function getCurrentVersion()
-  {
-    return $this->currentVersion;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setPlayerLevels($playerLevels)
-  {
-    $this->playerLevels = $playerLevels;
-  }
-  public function getPlayerLevels()
-  {
-    return $this->playerLevels;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Games/NetworkDiagnostics.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Games/NetworkDiagnostics.php
deleted file mode 100644
index 5669dbf5..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Games/NetworkDiagnostics.php
+++ /dev/null
@@ -1,84 +0,0 @@
-androidNetworkSubtype = $androidNetworkSubtype;
-  }
-  public function getAndroidNetworkSubtype()
-  {
-    return $this->androidNetworkSubtype;
-  }
-  public function setAndroidNetworkType($androidNetworkType)
-  {
-    $this->androidNetworkType = $androidNetworkType;
-  }
-  public function getAndroidNetworkType()
-  {
-    return $this->androidNetworkType;
-  }
-  public function setIosNetworkType($iosNetworkType)
-  {
-    $this->iosNetworkType = $iosNetworkType;
-  }
-  public function getIosNetworkType()
-  {
-    return $this->iosNetworkType;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setNetworkOperatorCode($networkOperatorCode)
-  {
-    $this->networkOperatorCode = $networkOperatorCode;
-  }
-  public function getNetworkOperatorCode()
-  {
-    return $this->networkOperatorCode;
-  }
-  public function setNetworkOperatorName($networkOperatorName)
-  {
-    $this->networkOperatorName = $networkOperatorName;
-  }
-  public function getNetworkOperatorName()
-  {
-    return $this->networkOperatorName;
-  }
-  public function setRegistrationLatencyMillis($registrationLatencyMillis)
-  {
-    $this->registrationLatencyMillis = $registrationLatencyMillis;
-  }
-  public function getRegistrationLatencyMillis()
-  {
-    return $this->registrationLatencyMillis;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Games/ParticipantResult.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Games/ParticipantResult.php
deleted file mode 100644
index 8f856fbc..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Games/ParticipantResult.php
+++ /dev/null
@@ -1,57 +0,0 @@
-kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setParticipantId($participantId)
-  {
-    $this->participantId = $participantId;
-  }
-  public function getParticipantId()
-  {
-    return $this->participantId;
-  }
-  public function setPlacing($placing)
-  {
-    $this->placing = $placing;
-  }
-  public function getPlacing()
-  {
-    return $this->placing;
-  }
-  public function setResult($result)
-  {
-    $this->result = $result;
-  }
-  public function getResult()
-  {
-    return $this->result;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Games/PeerChannelDiagnostics.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Games/PeerChannelDiagnostics.php
deleted file mode 100644
index f5042111..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Games/PeerChannelDiagnostics.php
+++ /dev/null
@@ -1,96 +0,0 @@
-bytesReceived = $bytesReceived;
-  }
-  public function getBytesReceived()
-  {
-    return $this->bytesReceived;
-  }
-  public function setBytesSent(Google_Service_Games_AggregateStats $bytesSent)
-  {
-    $this->bytesSent = $bytesSent;
-  }
-  public function getBytesSent()
-  {
-    return $this->bytesSent;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setNumMessagesLost($numMessagesLost)
-  {
-    $this->numMessagesLost = $numMessagesLost;
-  }
-  public function getNumMessagesLost()
-  {
-    return $this->numMessagesLost;
-  }
-  public function setNumMessagesReceived($numMessagesReceived)
-  {
-    $this->numMessagesReceived = $numMessagesReceived;
-  }
-  public function getNumMessagesReceived()
-  {
-    return $this->numMessagesReceived;
-  }
-  public function setNumMessagesSent($numMessagesSent)
-  {
-    $this->numMessagesSent = $numMessagesSent;
-  }
-  public function getNumMessagesSent()
-  {
-    return $this->numMessagesSent;
-  }
-  public function setNumSendFailures($numSendFailures)
-  {
-    $this->numSendFailures = $numSendFailures;
-  }
-  public function getNumSendFailures()
-  {
-    return $this->numSendFailures;
-  }
-  public function setRoundtripLatencyMillis(Google_Service_Games_AggregateStats $roundtripLatencyMillis)
-  {
-    $this->roundtripLatencyMillis = $roundtripLatencyMillis;
-  }
-  public function getRoundtripLatencyMillis()
-  {
-    return $this->roundtripLatencyMillis;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Games/PeerSessionDiagnostics.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Games/PeerSessionDiagnostics.php
deleted file mode 100644
index cdd6b507..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Games/PeerSessionDiagnostics.php
+++ /dev/null
@@ -1,68 +0,0 @@
-connectedTimestampMillis = $connectedTimestampMillis;
-  }
-  public function getConnectedTimestampMillis()
-  {
-    return $this->connectedTimestampMillis;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setParticipantId($participantId)
-  {
-    $this->participantId = $participantId;
-  }
-  public function getParticipantId()
-  {
-    return $this->participantId;
-  }
-  public function setReliableChannel(Google_Service_Games_PeerChannelDiagnostics $reliableChannel)
-  {
-    $this->reliableChannel = $reliableChannel;
-  }
-  public function getReliableChannel()
-  {
-    return $this->reliableChannel;
-  }
-  public function setUnreliableChannel(Google_Service_Games_PeerChannelDiagnostics $unreliableChannel)
-  {
-    $this->unreliableChannel = $unreliableChannel;
-  }
-  public function getUnreliableChannel()
-  {
-    return $this->unreliableChannel;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Games/Played.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Games/Played.php
deleted file mode 100644
index eda3e5b4..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Games/Played.php
+++ /dev/null
@@ -1,48 +0,0 @@
-autoMatched = $autoMatched;
-  }
-  public function getAutoMatched()
-  {
-    return $this->autoMatched;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setTimeMillis($timeMillis)
-  {
-    $this->timeMillis = $timeMillis;
-  }
-  public function getTimeMillis()
-  {
-    return $this->timeMillis;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Games/Player.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Games/Player.php
deleted file mode 100644
index c5d0888b..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Games/Player.php
+++ /dev/null
@@ -1,133 +0,0 @@
-avatarImageUrl = $avatarImageUrl;
-  }
-  public function getAvatarImageUrl()
-  {
-    return $this->avatarImageUrl;
-  }
-  public function setBannerUrlLandscape($bannerUrlLandscape)
-  {
-    $this->bannerUrlLandscape = $bannerUrlLandscape;
-  }
-  public function getBannerUrlLandscape()
-  {
-    return $this->bannerUrlLandscape;
-  }
-  public function setBannerUrlPortrait($bannerUrlPortrait)
-  {
-    $this->bannerUrlPortrait = $bannerUrlPortrait;
-  }
-  public function getBannerUrlPortrait()
-  {
-    return $this->bannerUrlPortrait;
-  }
-  public function setDisplayName($displayName)
-  {
-    $this->displayName = $displayName;
-  }
-  public function getDisplayName()
-  {
-    return $this->displayName;
-  }
-  public function setExperienceInfo(Google_Service_Games_PlayerExperienceInfo $experienceInfo)
-  {
-    $this->experienceInfo = $experienceInfo;
-  }
-  public function getExperienceInfo()
-  {
-    return $this->experienceInfo;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setLastPlayedWith(Google_Service_Games_Played $lastPlayedWith)
-  {
-    $this->lastPlayedWith = $lastPlayedWith;
-  }
-  public function getLastPlayedWith()
-  {
-    return $this->lastPlayedWith;
-  }
-  public function setName(Google_Service_Games_PlayerName $name)
-  {
-    $this->name = $name;
-  }
-  public function getName()
-  {
-    return $this->name;
-  }
-  public function setOriginalPlayerId($originalPlayerId)
-  {
-    $this->originalPlayerId = $originalPlayerId;
-  }
-  public function getOriginalPlayerId()
-  {
-    return $this->originalPlayerId;
-  }
-  public function setPlayerId($playerId)
-  {
-    $this->playerId = $playerId;
-  }
-  public function getPlayerId()
-  {
-    return $this->playerId;
-  }
-  public function setProfileSettings(Google_Service_Games_ProfileSettings $profileSettings)
-  {
-    $this->profileSettings = $profileSettings;
-  }
-  public function getProfileSettings()
-  {
-    return $this->profileSettings;
-  }
-  public function setTitle($title)
-  {
-    $this->title = $title;
-  }
-  public function getTitle()
-  {
-    return $this->title;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Games/PlayerAchievement.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Games/PlayerAchievement.php
deleted file mode 100644
index 0c3403cf..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Games/PlayerAchievement.php
+++ /dev/null
@@ -1,84 +0,0 @@
-achievementState = $achievementState;
-  }
-  public function getAchievementState()
-  {
-    return $this->achievementState;
-  }
-  public function setCurrentSteps($currentSteps)
-  {
-    $this->currentSteps = $currentSteps;
-  }
-  public function getCurrentSteps()
-  {
-    return $this->currentSteps;
-  }
-  public function setExperiencePoints($experiencePoints)
-  {
-    $this->experiencePoints = $experiencePoints;
-  }
-  public function getExperiencePoints()
-  {
-    return $this->experiencePoints;
-  }
-  public function setFormattedCurrentStepsString($formattedCurrentStepsString)
-  {
-    $this->formattedCurrentStepsString = $formattedCurrentStepsString;
-  }
-  public function getFormattedCurrentStepsString()
-  {
-    return $this->formattedCurrentStepsString;
-  }
-  public function setId($id)
-  {
-    $this->id = $id;
-  }
-  public function getId()
-  {
-    return $this->id;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setLastUpdatedTimestamp($lastUpdatedTimestamp)
-  {
-    $this->lastUpdatedTimestamp = $lastUpdatedTimestamp;
-  }
-  public function getLastUpdatedTimestamp()
-  {
-    return $this->lastUpdatedTimestamp;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Games/PlayerAchievementListResponse.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Games/PlayerAchievementListResponse.php
deleted file mode 100644
index a4b73ef4..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Games/PlayerAchievementListResponse.php
+++ /dev/null
@@ -1,50 +0,0 @@
-items = $items;
-  }
-  public function getItems()
-  {
-    return $this->items;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setNextPageToken($nextPageToken)
-  {
-    $this->nextPageToken = $nextPageToken;
-  }
-  public function getNextPageToken()
-  {
-    return $this->nextPageToken;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Games/PlayerEvent.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Games/PlayerEvent.php
deleted file mode 100644
index fdffa96d..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Games/PlayerEvent.php
+++ /dev/null
@@ -1,66 +0,0 @@
-definitionId = $definitionId;
-  }
-  public function getDefinitionId()
-  {
-    return $this->definitionId;
-  }
-  public function setFormattedNumEvents($formattedNumEvents)
-  {
-    $this->formattedNumEvents = $formattedNumEvents;
-  }
-  public function getFormattedNumEvents()
-  {
-    return $this->formattedNumEvents;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setNumEvents($numEvents)
-  {
-    $this->numEvents = $numEvents;
-  }
-  public function getNumEvents()
-  {
-    return $this->numEvents;
-  }
-  public function setPlayerId($playerId)
-  {
-    $this->playerId = $playerId;
-  }
-  public function getPlayerId()
-  {
-    return $this->playerId;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Games/PlayerEventListResponse.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Games/PlayerEventListResponse.php
deleted file mode 100644
index f2ec3aec..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Games/PlayerEventListResponse.php
+++ /dev/null
@@ -1,50 +0,0 @@
-items = $items;
-  }
-  public function getItems()
-  {
-    return $this->items;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setNextPageToken($nextPageToken)
-  {
-    $this->nextPageToken = $nextPageToken;
-  }
-  public function getNextPageToken()
-  {
-    return $this->nextPageToken;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Games/PlayerExperienceInfo.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Games/PlayerExperienceInfo.php
deleted file mode 100644
index fa437ae3..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Games/PlayerExperienceInfo.php
+++ /dev/null
@@ -1,68 +0,0 @@
-currentExperiencePoints = $currentExperiencePoints;
-  }
-  public function getCurrentExperiencePoints()
-  {
-    return $this->currentExperiencePoints;
-  }
-  public function setCurrentLevel(Google_Service_Games_PlayerLevel $currentLevel)
-  {
-    $this->currentLevel = $currentLevel;
-  }
-  public function getCurrentLevel()
-  {
-    return $this->currentLevel;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setLastLevelUpTimestampMillis($lastLevelUpTimestampMillis)
-  {
-    $this->lastLevelUpTimestampMillis = $lastLevelUpTimestampMillis;
-  }
-  public function getLastLevelUpTimestampMillis()
-  {
-    return $this->lastLevelUpTimestampMillis;
-  }
-  public function setNextLevel(Google_Service_Games_PlayerLevel $nextLevel)
-  {
-    $this->nextLevel = $nextLevel;
-  }
-  public function getNextLevel()
-  {
-    return $this->nextLevel;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Games/PlayerLeaderboardScore.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Games/PlayerLeaderboardScore.php
deleted file mode 100644
index f3119ac0..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Games/PlayerLeaderboardScore.php
+++ /dev/null
@@ -1,107 +0,0 @@
- "leaderboard_id",
-  );
-  public $kind;
-  public $leaderboardId;
-  protected $publicRankType = 'Google_Service_Games_LeaderboardScoreRank';
-  protected $publicRankDataType = '';
-  public $scoreString;
-  public $scoreTag;
-  public $scoreValue;
-  protected $socialRankType = 'Google_Service_Games_LeaderboardScoreRank';
-  protected $socialRankDataType = '';
-  public $timeSpan;
-  public $writeTimestamp;
-
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setLeaderboardId($leaderboardId)
-  {
-    $this->leaderboardId = $leaderboardId;
-  }
-  public function getLeaderboardId()
-  {
-    return $this->leaderboardId;
-  }
-  public function setPublicRank(Google_Service_Games_LeaderboardScoreRank $publicRank)
-  {
-    $this->publicRank = $publicRank;
-  }
-  public function getPublicRank()
-  {
-    return $this->publicRank;
-  }
-  public function setScoreString($scoreString)
-  {
-    $this->scoreString = $scoreString;
-  }
-  public function getScoreString()
-  {
-    return $this->scoreString;
-  }
-  public function setScoreTag($scoreTag)
-  {
-    $this->scoreTag = $scoreTag;
-  }
-  public function getScoreTag()
-  {
-    return $this->scoreTag;
-  }
-  public function setScoreValue($scoreValue)
-  {
-    $this->scoreValue = $scoreValue;
-  }
-  public function getScoreValue()
-  {
-    return $this->scoreValue;
-  }
-  public function setSocialRank(Google_Service_Games_LeaderboardScoreRank $socialRank)
-  {
-    $this->socialRank = $socialRank;
-  }
-  public function getSocialRank()
-  {
-    return $this->socialRank;
-  }
-  public function setTimeSpan($timeSpan)
-  {
-    $this->timeSpan = $timeSpan;
-  }
-  public function getTimeSpan()
-  {
-    return $this->timeSpan;
-  }
-  public function setWriteTimestamp($writeTimestamp)
-  {
-    $this->writeTimestamp = $writeTimestamp;
-  }
-  public function getWriteTimestamp()
-  {
-    return $this->writeTimestamp;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Games/PlayerLeaderboardScoreListResponse.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Games/PlayerLeaderboardScoreListResponse.php
deleted file mode 100644
index 99bf0bc0..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Games/PlayerLeaderboardScoreListResponse.php
+++ /dev/null
@@ -1,60 +0,0 @@
-items = $items;
-  }
-  public function getItems()
-  {
-    return $this->items;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setNextPageToken($nextPageToken)
-  {
-    $this->nextPageToken = $nextPageToken;
-  }
-  public function getNextPageToken()
-  {
-    return $this->nextPageToken;
-  }
-  public function setPlayer(Google_Service_Games_Player $player)
-  {
-    $this->player = $player;
-  }
-  public function getPlayer()
-  {
-    return $this->player;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Games/PlayerLevel.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Games/PlayerLevel.php
deleted file mode 100644
index f10a55b1..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Games/PlayerLevel.php
+++ /dev/null
@@ -1,57 +0,0 @@
-kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setLevel($level)
-  {
-    $this->level = $level;
-  }
-  public function getLevel()
-  {
-    return $this->level;
-  }
-  public function setMaxExperiencePoints($maxExperiencePoints)
-  {
-    $this->maxExperiencePoints = $maxExperiencePoints;
-  }
-  public function getMaxExperiencePoints()
-  {
-    return $this->maxExperiencePoints;
-  }
-  public function setMinExperiencePoints($minExperiencePoints)
-  {
-    $this->minExperiencePoints = $minExperiencePoints;
-  }
-  public function getMinExperiencePoints()
-  {
-    return $this->minExperiencePoints;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Games/PlayerListResponse.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Games/PlayerListResponse.php
deleted file mode 100644
index 442910b0..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Games/PlayerListResponse.php
+++ /dev/null
@@ -1,50 +0,0 @@
-items = $items;
-  }
-  public function getItems()
-  {
-    return $this->items;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setNextPageToken($nextPageToken)
-  {
-    $this->nextPageToken = $nextPageToken;
-  }
-  public function getNextPageToken()
-  {
-    return $this->nextPageToken;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Games/PlayerName.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Games/PlayerName.php
deleted file mode 100644
index beadfaf1..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Games/PlayerName.php
+++ /dev/null
@@ -1,39 +0,0 @@
-familyName = $familyName;
-  }
-  public function getFamilyName()
-  {
-    return $this->familyName;
-  }
-  public function setGivenName($givenName)
-  {
-    $this->givenName = $givenName;
-  }
-  public function getGivenName()
-  {
-    return $this->givenName;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Games/PlayerScore.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Games/PlayerScore.php
deleted file mode 100644
index 418f80ff..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Games/PlayerScore.php
+++ /dev/null
@@ -1,66 +0,0 @@
-formattedScore = $formattedScore;
-  }
-  public function getFormattedScore()
-  {
-    return $this->formattedScore;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setScore($score)
-  {
-    $this->score = $score;
-  }
-  public function getScore()
-  {
-    return $this->score;
-  }
-  public function setScoreTag($scoreTag)
-  {
-    $this->scoreTag = $scoreTag;
-  }
-  public function getScoreTag()
-  {
-    return $this->scoreTag;
-  }
-  public function setTimeSpan($timeSpan)
-  {
-    $this->timeSpan = $timeSpan;
-  }
-  public function getTimeSpan()
-  {
-    return $this->timeSpan;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Games/PlayerScoreListResponse.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Games/PlayerScoreListResponse.php
deleted file mode 100644
index 1132c67d..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Games/PlayerScoreListResponse.php
+++ /dev/null
@@ -1,41 +0,0 @@
-kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setSubmittedScores($submittedScores)
-  {
-    $this->submittedScores = $submittedScores;
-  }
-  public function getSubmittedScores()
-  {
-    return $this->submittedScores;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Games/PlayerScoreResponse.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Games/PlayerScoreResponse.php
deleted file mode 100644
index 8d10ed55..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Games/PlayerScoreResponse.php
+++ /dev/null
@@ -1,77 +0,0 @@
-beatenScoreTimeSpans = $beatenScoreTimeSpans;
-  }
-  public function getBeatenScoreTimeSpans()
-  {
-    return $this->beatenScoreTimeSpans;
-  }
-  public function setFormattedScore($formattedScore)
-  {
-    $this->formattedScore = $formattedScore;
-  }
-  public function getFormattedScore()
-  {
-    return $this->formattedScore;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setLeaderboardId($leaderboardId)
-  {
-    $this->leaderboardId = $leaderboardId;
-  }
-  public function getLeaderboardId()
-  {
-    return $this->leaderboardId;
-  }
-  public function setScoreTag($scoreTag)
-  {
-    $this->scoreTag = $scoreTag;
-  }
-  public function getScoreTag()
-  {
-    return $this->scoreTag;
-  }
-  public function setUnbeatenScores($unbeatenScores)
-  {
-    $this->unbeatenScores = $unbeatenScores;
-  }
-  public function getUnbeatenScores()
-  {
-    return $this->unbeatenScores;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Games/PlayerScoreSubmissionList.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Games/PlayerScoreSubmissionList.php
deleted file mode 100644
index 509daeda..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Games/PlayerScoreSubmissionList.php
+++ /dev/null
@@ -1,41 +0,0 @@
-kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setScores($scores)
-  {
-    $this->scores = $scores;
-  }
-  public function getScores()
-  {
-    return $this->scores;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Games/ProfileSettings.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Games/ProfileSettings.php
deleted file mode 100644
index b59cd8fb..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Games/ProfileSettings.php
+++ /dev/null
@@ -1,39 +0,0 @@
-kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setProfileVisible($profileVisible)
-  {
-    $this->profileVisible = $profileVisible;
-  }
-  public function getProfileVisible()
-  {
-    return $this->profileVisible;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Games/PushToken.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Games/PushToken.php
deleted file mode 100644
index 3a26d18f..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Games/PushToken.php
+++ /dev/null
@@ -1,58 +0,0 @@
-clientRevision = $clientRevision;
-  }
-  public function getClientRevision()
-  {
-    return $this->clientRevision;
-  }
-  public function setId(Google_Service_Games_PushTokenId $id)
-  {
-    $this->id = $id;
-  }
-  public function getId()
-  {
-    return $this->id;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setLanguage($language)
-  {
-    $this->language = $language;
-  }
-  public function getLanguage()
-  {
-    return $this->language;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Games/PushTokenId.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Games/PushTokenId.php
deleted file mode 100644
index 5781564a..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Games/PushTokenId.php
+++ /dev/null
@@ -1,40 +0,0 @@
-ios = $ios;
-  }
-  public function getIos()
-  {
-    return $this->ios;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Games/PushTokenIdIos.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Games/PushTokenIdIos.php
deleted file mode 100644
index 7a7ebbe4..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Games/PushTokenIdIos.php
+++ /dev/null
@@ -1,43 +0,0 @@
- "apns_device_token",
-        "apnsEnvironment" => "apns_environment",
-  );
-  public $apnsDeviceToken;
-  public $apnsEnvironment;
-
-  public function setApnsDeviceToken($apnsDeviceToken)
-  {
-    $this->apnsDeviceToken = $apnsDeviceToken;
-  }
-  public function getApnsDeviceToken()
-  {
-    return $this->apnsDeviceToken;
-  }
-  public function setApnsEnvironment($apnsEnvironment)
-  {
-    $this->apnsEnvironment = $apnsEnvironment;
-  }
-  public function getApnsEnvironment()
-  {
-    return $this->apnsEnvironment;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Games/Quest.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Games/Quest.php
deleted file mode 100644
index 9c58dcfa..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Games/Quest.php
+++ /dev/null
@@ -1,167 +0,0 @@
-acceptedTimestampMillis = $acceptedTimestampMillis;
-  }
-  public function getAcceptedTimestampMillis()
-  {
-    return $this->acceptedTimestampMillis;
-  }
-  public function setApplicationId($applicationId)
-  {
-    $this->applicationId = $applicationId;
-  }
-  public function getApplicationId()
-  {
-    return $this->applicationId;
-  }
-  public function setBannerUrl($bannerUrl)
-  {
-    $this->bannerUrl = $bannerUrl;
-  }
-  public function getBannerUrl()
-  {
-    return $this->bannerUrl;
-  }
-  public function setDescription($description)
-  {
-    $this->description = $description;
-  }
-  public function getDescription()
-  {
-    return $this->description;
-  }
-  public function setEndTimestampMillis($endTimestampMillis)
-  {
-    $this->endTimestampMillis = $endTimestampMillis;
-  }
-  public function getEndTimestampMillis()
-  {
-    return $this->endTimestampMillis;
-  }
-  public function setIconUrl($iconUrl)
-  {
-    $this->iconUrl = $iconUrl;
-  }
-  public function getIconUrl()
-  {
-    return $this->iconUrl;
-  }
-  public function setId($id)
-  {
-    $this->id = $id;
-  }
-  public function getId()
-  {
-    return $this->id;
-  }
-  public function setIsDefaultBannerUrl($isDefaultBannerUrl)
-  {
-    $this->isDefaultBannerUrl = $isDefaultBannerUrl;
-  }
-  public function getIsDefaultBannerUrl()
-  {
-    return $this->isDefaultBannerUrl;
-  }
-  public function setIsDefaultIconUrl($isDefaultIconUrl)
-  {
-    $this->isDefaultIconUrl = $isDefaultIconUrl;
-  }
-  public function getIsDefaultIconUrl()
-  {
-    return $this->isDefaultIconUrl;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setLastUpdatedTimestampMillis($lastUpdatedTimestampMillis)
-  {
-    $this->lastUpdatedTimestampMillis = $lastUpdatedTimestampMillis;
-  }
-  public function getLastUpdatedTimestampMillis()
-  {
-    return $this->lastUpdatedTimestampMillis;
-  }
-  public function setMilestones($milestones)
-  {
-    $this->milestones = $milestones;
-  }
-  public function getMilestones()
-  {
-    return $this->milestones;
-  }
-  public function setName($name)
-  {
-    $this->name = $name;
-  }
-  public function getName()
-  {
-    return $this->name;
-  }
-  public function setNotifyTimestampMillis($notifyTimestampMillis)
-  {
-    $this->notifyTimestampMillis = $notifyTimestampMillis;
-  }
-  public function getNotifyTimestampMillis()
-  {
-    return $this->notifyTimestampMillis;
-  }
-  public function setStartTimestampMillis($startTimestampMillis)
-  {
-    $this->startTimestampMillis = $startTimestampMillis;
-  }
-  public function getStartTimestampMillis()
-  {
-    return $this->startTimestampMillis;
-  }
-  public function setState($state)
-  {
-    $this->state = $state;
-  }
-  public function getState()
-  {
-    return $this->state;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Games/QuestContribution.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Games/QuestContribution.php
deleted file mode 100644
index 357d66f7..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Games/QuestContribution.php
+++ /dev/null
@@ -1,48 +0,0 @@
-formattedValue = $formattedValue;
-  }
-  public function getFormattedValue()
-  {
-    return $this->formattedValue;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setValue($value)
-  {
-    $this->value = $value;
-  }
-  public function getValue()
-  {
-    return $this->value;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Games/QuestCriterion.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Games/QuestCriterion.php
deleted file mode 100644
index 925d59bc..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Games/QuestCriterion.php
+++ /dev/null
@@ -1,69 +0,0 @@
-completionContribution = $completionContribution;
-  }
-  public function getCompletionContribution()
-  {
-    return $this->completionContribution;
-  }
-  public function setCurrentContribution(Google_Service_Games_QuestContribution $currentContribution)
-  {
-    $this->currentContribution = $currentContribution;
-  }
-  public function getCurrentContribution()
-  {
-    return $this->currentContribution;
-  }
-  public function setEventId($eventId)
-  {
-    $this->eventId = $eventId;
-  }
-  public function getEventId()
-  {
-    return $this->eventId;
-  }
-  public function setInitialPlayerProgress(Google_Service_Games_QuestContribution $initialPlayerProgress)
-  {
-    $this->initialPlayerProgress = $initialPlayerProgress;
-  }
-  public function getInitialPlayerProgress()
-  {
-    return $this->initialPlayerProgress;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Games/QuestListResponse.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Games/QuestListResponse.php
deleted file mode 100644
index c683720f..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Games/QuestListResponse.php
+++ /dev/null
@@ -1,50 +0,0 @@
-items = $items;
-  }
-  public function getItems()
-  {
-    return $this->items;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setNextPageToken($nextPageToken)
-  {
-    $this->nextPageToken = $nextPageToken;
-  }
-  public function getNextPageToken()
-  {
-    return $this->nextPageToken;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Games/QuestMilestone.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Games/QuestMilestone.php
deleted file mode 100644
index 846f2ee3..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Games/QuestMilestone.php
+++ /dev/null
@@ -1,68 +0,0 @@
-completionRewardData = $completionRewardData;
-  }
-  public function getCompletionRewardData()
-  {
-    return $this->completionRewardData;
-  }
-  public function setCriteria($criteria)
-  {
-    $this->criteria = $criteria;
-  }
-  public function getCriteria()
-  {
-    return $this->criteria;
-  }
-  public function setId($id)
-  {
-    $this->id = $id;
-  }
-  public function getId()
-  {
-    return $this->id;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setState($state)
-  {
-    $this->state = $state;
-  }
-  public function getState()
-  {
-    return $this->state;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Games/Resource/AchievementDefinitions.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Games/Resource/AchievementDefinitions.php
deleted file mode 100644
index 3d4b8d87..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Games/Resource/AchievementDefinitions.php
+++ /dev/null
@@ -1,49 +0,0 @@
-
- *   $gamesService = new Google_Service_Games(...);
- *   $achievementDefinitions = $gamesService->achievementDefinitions;
- *  
- */
-class Google_Service_Games_Resource_AchievementDefinitions extends Google_Service_Resource
-{
-  /**
-   * Lists all the achievement definitions for your application.
-   * (achievementDefinitions.listAchievementDefinitions)
-   *
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param string consistencyToken The last-seen mutation timestamp.
-   * @opt_param string language The preferred language to use for strings returned
-   * by this method.
-   * @opt_param int maxResults The maximum number of achievement resources to
-   * return in the response, used for paging. For any response, the actual number
-   * of achievement resources returned may be less than the specified maxResults.
-   * @opt_param string pageToken The token returned by the previous request.
-   * @return Google_Service_Games_AchievementDefinitionsListResponse
-   */
-  public function listAchievementDefinitions($optParams = array())
-  {
-    $params = array();
-    $params = array_merge($params, $optParams);
-    return $this->call('list', array($params), "Google_Service_Games_AchievementDefinitionsListResponse");
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Games/Resource/Achievements.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Games/Resource/Achievements.php
deleted file mode 100644
index aa58c5ed..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Games/Resource/Achievements.php
+++ /dev/null
@@ -1,141 +0,0 @@
-
- *   $gamesService = new Google_Service_Games(...);
- *   $achievements = $gamesService->achievements;
- *  
- */
-class Google_Service_Games_Resource_Achievements extends Google_Service_Resource
-{
-  /**
-   * Increments the steps of the achievement with the given ID for the currently
-   * authenticated player. (achievements.increment)
-   *
-   * @param string $achievementId The ID of the achievement used by this method.
-   * @param int $stepsToIncrement The number of steps to increment.
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param string consistencyToken The last-seen mutation timestamp.
-   * @opt_param string requestId A randomly generated numeric ID for each request
-   * specified by the caller. This number is used at the server to ensure that the
-   * request is handled correctly across retries.
-   * @return Google_Service_Games_AchievementIncrementResponse
-   */
-  public function increment($achievementId, $stepsToIncrement, $optParams = array())
-  {
-    $params = array('achievementId' => $achievementId, 'stepsToIncrement' => $stepsToIncrement);
-    $params = array_merge($params, $optParams);
-    return $this->call('increment', array($params), "Google_Service_Games_AchievementIncrementResponse");
-  }
-  /**
-   * Lists the progress for all your application's achievements for the currently
-   * authenticated player. (achievements.listAchievements)
-   *
-   * @param string $playerId A player ID. A value of me may be used in place of
-   * the authenticated player's ID.
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param string consistencyToken The last-seen mutation timestamp.
-   * @opt_param string language The preferred language to use for strings returned
-   * by this method.
-   * @opt_param int maxResults The maximum number of achievement resources to
-   * return in the response, used for paging. For any response, the actual number
-   * of achievement resources returned may be less than the specified maxResults.
-   * @opt_param string pageToken The token returned by the previous request.
-   * @opt_param string state Tells the server to return only achievements with the
-   * specified state. If this parameter isn't specified, all achievements are
-   * returned.
-   * @return Google_Service_Games_PlayerAchievementListResponse
-   */
-  public function listAchievements($playerId, $optParams = array())
-  {
-    $params = array('playerId' => $playerId);
-    $params = array_merge($params, $optParams);
-    return $this->call('list', array($params), "Google_Service_Games_PlayerAchievementListResponse");
-  }
-  /**
-   * Sets the state of the achievement with the given ID to REVEALED for the
-   * currently authenticated player. (achievements.reveal)
-   *
-   * @param string $achievementId The ID of the achievement used by this method.
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param string consistencyToken The last-seen mutation timestamp.
-   * @return Google_Service_Games_AchievementRevealResponse
-   */
-  public function reveal($achievementId, $optParams = array())
-  {
-    $params = array('achievementId' => $achievementId);
-    $params = array_merge($params, $optParams);
-    return $this->call('reveal', array($params), "Google_Service_Games_AchievementRevealResponse");
-  }
-  /**
-   * Sets the steps for the currently authenticated player towards unlocking an
-   * achievement. If the steps parameter is less than the current number of steps
-   * that the player already gained for the achievement, the achievement is not
-   * modified. (achievements.setStepsAtLeast)
-   *
-   * @param string $achievementId The ID of the achievement used by this method.
-   * @param int $steps The minimum value to set the steps to.
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param string consistencyToken The last-seen mutation timestamp.
-   * @return Google_Service_Games_AchievementSetStepsAtLeastResponse
-   */
-  public function setStepsAtLeast($achievementId, $steps, $optParams = array())
-  {
-    $params = array('achievementId' => $achievementId, 'steps' => $steps);
-    $params = array_merge($params, $optParams);
-    return $this->call('setStepsAtLeast', array($params), "Google_Service_Games_AchievementSetStepsAtLeastResponse");
-  }
-  /**
-   * Unlocks this achievement for the currently authenticated player.
-   * (achievements.unlock)
-   *
-   * @param string $achievementId The ID of the achievement used by this method.
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param string consistencyToken The last-seen mutation timestamp.
-   * @return Google_Service_Games_AchievementUnlockResponse
-   */
-  public function unlock($achievementId, $optParams = array())
-  {
-    $params = array('achievementId' => $achievementId);
-    $params = array_merge($params, $optParams);
-    return $this->call('unlock', array($params), "Google_Service_Games_AchievementUnlockResponse");
-  }
-  /**
-   * Updates multiple achievements for the currently authenticated player.
-   * (achievements.updateMultiple)
-   *
-   * @param Google_Service_Games_AchievementUpdateMultipleRequest $postBody
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param string consistencyToken The last-seen mutation timestamp.
-   * @return Google_Service_Games_AchievementUpdateMultipleResponse
-   */
-  public function updateMultiple(Google_Service_Games_AchievementUpdateMultipleRequest $postBody, $optParams = array())
-  {
-    $params = array('postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('updateMultiple', array($params), "Google_Service_Games_AchievementUpdateMultipleResponse");
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Games/Resource/Applications.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Games/Resource/Applications.php
deleted file mode 100644
index f8acdb07..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Games/Resource/Applications.php
+++ /dev/null
@@ -1,82 +0,0 @@
-
- *   $gamesService = new Google_Service_Games(...);
- *   $applications = $gamesService->applications;
- *  
- */
-class Google_Service_Games_Resource_Applications extends Google_Service_Resource
-{
-  /**
-   * Retrieves the metadata of the application with the given ID. If the requested
-   * application is not available for the specified platformType, the returned
-   * response will not include any instance data. (applications.get)
-   *
-   * @param string $applicationId The application ID from the Google Play
-   * developer console.
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param string consistencyToken The last-seen mutation timestamp.
-   * @opt_param string language The preferred language to use for strings returned
-   * by this method.
-   * @opt_param string platformType Restrict application details returned to the
-   * specific platform.
-   * @return Google_Service_Games_Application
-   */
-  public function get($applicationId, $optParams = array())
-  {
-    $params = array('applicationId' => $applicationId);
-    $params = array_merge($params, $optParams);
-    return $this->call('get', array($params), "Google_Service_Games_Application");
-  }
-  /**
-   * Indicate that the the currently authenticated user is playing your
-   * application. (applications.played)
-   *
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param string consistencyToken The last-seen mutation timestamp.
-   */
-  public function played($optParams = array())
-  {
-    $params = array();
-    $params = array_merge($params, $optParams);
-    return $this->call('played', array($params));
-  }
-  /**
-   * Verifies the auth token provided with this request is for the application
-   * with the specified ID, and returns the ID of the player it was granted for.
-   * (applications.verify)
-   *
-   * @param string $applicationId The application ID from the Google Play
-   * developer console.
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param string consistencyToken The last-seen mutation timestamp.
-   * @return Google_Service_Games_ApplicationVerifyResponse
-   */
-  public function verify($applicationId, $optParams = array())
-  {
-    $params = array('applicationId' => $applicationId);
-    $params = array_merge($params, $optParams);
-    return $this->call('verify', array($params), "Google_Service_Games_ApplicationVerifyResponse");
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Games/Resource/Events.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Games/Resource/Events.php
deleted file mode 100644
index b72e0656..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Games/Resource/Events.php
+++ /dev/null
@@ -1,88 +0,0 @@
-
- *   $gamesService = new Google_Service_Games(...);
- *   $events = $gamesService->events;
- *  
- */
-class Google_Service_Games_Resource_Events extends Google_Service_Resource
-{
-  /**
-   * Returns a list showing the current progress on events in this application for
-   * the currently authenticated user. (events.listByPlayer)
-   *
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param string consistencyToken The last-seen mutation timestamp.
-   * @opt_param string language The preferred language to use for strings returned
-   * by this method.
-   * @opt_param int maxResults The maximum number of events to return in the
-   * response, used for paging. For any response, the actual number of events to
-   * return may be less than the specified maxResults.
-   * @opt_param string pageToken The token returned by the previous request.
-   * @return Google_Service_Games_PlayerEventListResponse
-   */
-  public function listByPlayer($optParams = array())
-  {
-    $params = array();
-    $params = array_merge($params, $optParams);
-    return $this->call('listByPlayer', array($params), "Google_Service_Games_PlayerEventListResponse");
-  }
-  /**
-   * Returns a list of the event definitions in this application.
-   * (events.listDefinitions)
-   *
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param string consistencyToken The last-seen mutation timestamp.
-   * @opt_param string language The preferred language to use for strings returned
-   * by this method.
-   * @opt_param int maxResults The maximum number of event definitions to return
-   * in the response, used for paging. For any response, the actual number of
-   * event definitions to return may be less than the specified maxResults.
-   * @opt_param string pageToken The token returned by the previous request.
-   * @return Google_Service_Games_EventDefinitionListResponse
-   */
-  public function listDefinitions($optParams = array())
-  {
-    $params = array();
-    $params = array_merge($params, $optParams);
-    return $this->call('listDefinitions', array($params), "Google_Service_Games_EventDefinitionListResponse");
-  }
-  /**
-   * Records a batch of changes to the number of times events have occurred for
-   * the currently authenticated user of this application. (events.record)
-   *
-   * @param Google_Service_Games_EventRecordRequest $postBody
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param string consistencyToken The last-seen mutation timestamp.
-   * @opt_param string language The preferred language to use for strings returned
-   * by this method.
-   * @return Google_Service_Games_EventUpdateResponse
-   */
-  public function record(Google_Service_Games_EventRecordRequest $postBody, $optParams = array())
-  {
-    $params = array('postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('record', array($params), "Google_Service_Games_EventUpdateResponse");
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Games/Resource/Leaderboards.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Games/Resource/Leaderboards.php
deleted file mode 100644
index 89e346c9..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Games/Resource/Leaderboards.php
+++ /dev/null
@@ -1,67 +0,0 @@
-
- *   $gamesService = new Google_Service_Games(...);
- *   $leaderboards = $gamesService->leaderboards;
- *  
- */
-class Google_Service_Games_Resource_Leaderboards extends Google_Service_Resource
-{
-  /**
-   * Retrieves the metadata of the leaderboard with the given ID.
-   * (leaderboards.get)
-   *
-   * @param string $leaderboardId The ID of the leaderboard.
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param string consistencyToken The last-seen mutation timestamp.
-   * @opt_param string language The preferred language to use for strings returned
-   * by this method.
-   * @return Google_Service_Games_Leaderboard
-   */
-  public function get($leaderboardId, $optParams = array())
-  {
-    $params = array('leaderboardId' => $leaderboardId);
-    $params = array_merge($params, $optParams);
-    return $this->call('get', array($params), "Google_Service_Games_Leaderboard");
-  }
-  /**
-   * Lists all the leaderboard metadata for your application.
-   * (leaderboards.listLeaderboards)
-   *
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param string consistencyToken The last-seen mutation timestamp.
-   * @opt_param string language The preferred language to use for strings returned
-   * by this method.
-   * @opt_param int maxResults The maximum number of leaderboards to return in the
-   * response. For any response, the actual number of leaderboards returned may be
-   * less than the specified maxResults.
-   * @opt_param string pageToken The token returned by the previous request.
-   * @return Google_Service_Games_LeaderboardListResponse
-   */
-  public function listLeaderboards($optParams = array())
-  {
-    $params = array();
-    $params = array_merge($params, $optParams);
-    return $this->call('list', array($params), "Google_Service_Games_LeaderboardListResponse");
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Games/Resource/Metagame.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Games/Resource/Metagame.php
deleted file mode 100644
index c89f6075..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Games/Resource/Metagame.php
+++ /dev/null
@@ -1,68 +0,0 @@
-
- *   $gamesService = new Google_Service_Games(...);
- *   $metagame = $gamesService->metagame;
- *  
- */
-class Google_Service_Games_Resource_Metagame extends Google_Service_Resource
-{
-  /**
-   * Return the metagame configuration data for the calling application.
-   * (metagame.getMetagameConfig)
-   *
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param string consistencyToken The last-seen mutation timestamp.
-   * @return Google_Service_Games_MetagameConfig
-   */
-  public function getMetagameConfig($optParams = array())
-  {
-    $params = array();
-    $params = array_merge($params, $optParams);
-    return $this->call('getMetagameConfig', array($params), "Google_Service_Games_MetagameConfig");
-  }
-  /**
-   * List play data aggregated per category for the player corresponding to
-   * playerId. (metagame.listCategoriesByPlayer)
-   *
-   * @param string $playerId A player ID. A value of me may be used in place of
-   * the authenticated player's ID.
-   * @param string $collection The collection of categories for which data will be
-   * returned.
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param string consistencyToken The last-seen mutation timestamp.
-   * @opt_param string language The preferred language to use for strings returned
-   * by this method.
-   * @opt_param int maxResults The maximum number of category resources to return
-   * in the response, used for paging. For any response, the actual number of
-   * category resources returned may be less than the specified maxResults.
-   * @opt_param string pageToken The token returned by the previous request.
-   * @return Google_Service_Games_CategoryListResponse
-   */
-  public function listCategoriesByPlayer($playerId, $collection, $optParams = array())
-  {
-    $params = array('playerId' => $playerId, 'collection' => $collection);
-    $params = array_merge($params, $optParams);
-    return $this->call('listCategoriesByPlayer', array($params), "Google_Service_Games_CategoryListResponse");
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Games/Resource/Players.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Games/Resource/Players.php
deleted file mode 100644
index 4ed67d25..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Games/Resource/Players.php
+++ /dev/null
@@ -1,69 +0,0 @@
-
- *   $gamesService = new Google_Service_Games(...);
- *   $players = $gamesService->players;
- *  
- */
-class Google_Service_Games_Resource_Players extends Google_Service_Resource
-{
-  /**
-   * Retrieves the Player resource with the given ID. To retrieve the player for
-   * the currently authenticated user, set playerId to me. (players.get)
-   *
-   * @param string $playerId A player ID. A value of me may be used in place of
-   * the authenticated player's ID.
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param string consistencyToken The last-seen mutation timestamp.
-   * @opt_param string language The preferred language to use for strings returned
-   * by this method.
-   * @return Google_Service_Games_Player
-   */
-  public function get($playerId, $optParams = array())
-  {
-    $params = array('playerId' => $playerId);
-    $params = array_merge($params, $optParams);
-    return $this->call('get', array($params), "Google_Service_Games_Player");
-  }
-  /**
-   * Get the collection of players for the currently authenticated user.
-   * (players.listPlayers)
-   *
-   * @param string $collection Collection of players being retrieved
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param string consistencyToken The last-seen mutation timestamp.
-   * @opt_param string language The preferred language to use for strings returned
-   * by this method.
-   * @opt_param int maxResults The maximum number of player resources to return in
-   * the response, used for paging. For any response, the actual number of player
-   * resources returned may be less than the specified maxResults.
-   * @opt_param string pageToken The token returned by the previous request.
-   * @return Google_Service_Games_PlayerListResponse
-   */
-  public function listPlayers($collection, $optParams = array())
-  {
-    $params = array('collection' => $collection);
-    $params = array_merge($params, $optParams);
-    return $this->call('list', array($params), "Google_Service_Games_PlayerListResponse");
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Games/Resource/Pushtokens.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Games/Resource/Pushtokens.php
deleted file mode 100644
index 052edf27..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Games/Resource/Pushtokens.php
+++ /dev/null
@@ -1,58 +0,0 @@
-
- *   $gamesService = new Google_Service_Games(...);
- *   $pushtokens = $gamesService->pushtokens;
- *  
- */
-class Google_Service_Games_Resource_Pushtokens extends Google_Service_Resource
-{
-  /**
-   * Removes a push token for the current user and application. Removing a non-
-   * existent push token will report success. (pushtokens.remove)
-   *
-   * @param Google_Service_Games_PushTokenId $postBody
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param string consistencyToken The last-seen mutation timestamp.
-   */
-  public function remove(Google_Service_Games_PushTokenId $postBody, $optParams = array())
-  {
-    $params = array('postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('remove', array($params));
-  }
-  /**
-   * Registers a push token for the current user and application.
-   * (pushtokens.update)
-   *
-   * @param Google_Service_Games_PushToken $postBody
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param string consistencyToken The last-seen mutation timestamp.
-   */
-  public function update(Google_Service_Games_PushToken $postBody, $optParams = array())
-  {
-    $params = array('postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('update', array($params));
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Games/Resource/QuestMilestones.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Games/Resource/QuestMilestones.php
deleted file mode 100644
index 5b2bcf4d..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Games/Resource/QuestMilestones.php
+++ /dev/null
@@ -1,48 +0,0 @@
-
- *   $gamesService = new Google_Service_Games(...);
- *   $questMilestones = $gamesService->questMilestones;
- *  
- */
-class Google_Service_Games_Resource_QuestMilestones extends Google_Service_Resource
-{
-  /**
-   * Report that a reward for the milestone corresponding to milestoneId for the
-   * quest corresponding to questId has been claimed by the currently authorized
-   * user. (questMilestones.claim)
-   *
-   * @param string $questId The ID of the quest.
-   * @param string $milestoneId The ID of the milestone.
-   * @param string $requestId A numeric ID to ensure that the request is handled
-   * correctly across retries. Your client application must generate this ID
-   * randomly.
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param string consistencyToken The last-seen mutation timestamp.
-   */
-  public function claim($questId, $milestoneId, $requestId, $optParams = array())
-  {
-    $params = array('questId' => $questId, 'milestoneId' => $milestoneId, 'requestId' => $requestId);
-    $params = array_merge($params, $optParams);
-    return $this->call('claim', array($params));
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Games/Resource/Quests.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Games/Resource/Quests.php
deleted file mode 100644
index 4ed8d679..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Games/Resource/Quests.php
+++ /dev/null
@@ -1,70 +0,0 @@
-
- *   $gamesService = new Google_Service_Games(...);
- *   $quests = $gamesService->quests;
- *  
- */
-class Google_Service_Games_Resource_Quests extends Google_Service_Resource
-{
-  /**
-   * Indicates that the currently authorized user will participate in the quest.
-   * (quests.accept)
-   *
-   * @param string $questId The ID of the quest.
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param string consistencyToken The last-seen mutation timestamp.
-   * @opt_param string language The preferred language to use for strings returned
-   * by this method.
-   * @return Google_Service_Games_Quest
-   */
-  public function accept($questId, $optParams = array())
-  {
-    $params = array('questId' => $questId);
-    $params = array_merge($params, $optParams);
-    return $this->call('accept', array($params), "Google_Service_Games_Quest");
-  }
-  /**
-   * Get a list of quests for your application and the currently authenticated
-   * player. (quests.listQuests)
-   *
-   * @param string $playerId A player ID. A value of me may be used in place of
-   * the authenticated player's ID.
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param string consistencyToken The last-seen mutation timestamp.
-   * @opt_param string language The preferred language to use for strings returned
-   * by this method.
-   * @opt_param int maxResults The maximum number of quest resources to return in
-   * the response, used for paging. For any response, the actual number of quest
-   * resources returned may be less than the specified maxResults. Acceptable
-   * values are 1 to 50, inclusive. (Default: 50).
-   * @opt_param string pageToken The token returned by the previous request.
-   * @return Google_Service_Games_QuestListResponse
-   */
-  public function listQuests($playerId, $optParams = array())
-  {
-    $params = array('playerId' => $playerId);
-    $params = array_merge($params, $optParams);
-    return $this->call('list', array($params), "Google_Service_Games_QuestListResponse");
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Games/Resource/Revisions.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Games/Resource/Revisions.php
deleted file mode 100644
index 5370204f..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Games/Resource/Revisions.php
+++ /dev/null
@@ -1,47 +0,0 @@
-
- *   $gamesService = new Google_Service_Games(...);
- *   $revisions = $gamesService->revisions;
- *  
- */
-class Google_Service_Games_Resource_Revisions extends Google_Service_Resource
-{
-  /**
-   * Checks whether the games client is out of date. (revisions.check)
-   *
-   * @param string $clientRevision The revision of the client SDK used by your
-   * application. Format: [PLATFORM_TYPE]:[VERSION_NUMBER]. Possible values of
-   * PLATFORM_TYPE are:   - "ANDROID" - Client is running the Android SDK.  -
-   * "IOS" - Client is running the iOS SDK.  - "WEB_APP" - Client is running as a
-   * Web App.
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param string consistencyToken The last-seen mutation timestamp.
-   * @return Google_Service_Games_RevisionCheckResponse
-   */
-  public function check($clientRevision, $optParams = array())
-  {
-    $params = array('clientRevision' => $clientRevision);
-    $params = array_merge($params, $optParams);
-    return $this->call('check', array($params), "Google_Service_Games_RevisionCheckResponse");
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Games/Resource/Rooms.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Games/Resource/Rooms.php
deleted file mode 100644
index cc863dfb..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Games/Resource/Rooms.php
+++ /dev/null
@@ -1,174 +0,0 @@
-
- *   $gamesService = new Google_Service_Games(...);
- *   $rooms = $gamesService->rooms;
- *  
- */
-class Google_Service_Games_Resource_Rooms extends Google_Service_Resource
-{
-  /**
-   * Create a room. For internal use by the Games SDK only. Calling this method
-   * directly is unsupported. (rooms.create)
-   *
-   * @param Google_Service_Games_RoomCreateRequest $postBody
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param string consistencyToken The last-seen mutation timestamp.
-   * @opt_param string language The preferred language to use for strings returned
-   * by this method.
-   * @return Google_Service_Games_Room
-   */
-  public function create(Google_Service_Games_RoomCreateRequest $postBody, $optParams = array())
-  {
-    $params = array('postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('create', array($params), "Google_Service_Games_Room");
-  }
-  /**
-   * Decline an invitation to join a room. For internal use by the Games SDK only.
-   * Calling this method directly is unsupported. (rooms.decline)
-   *
-   * @param string $roomId The ID of the room.
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param string consistencyToken The last-seen mutation timestamp.
-   * @opt_param string language The preferred language to use for strings returned
-   * by this method.
-   * @return Google_Service_Games_Room
-   */
-  public function decline($roomId, $optParams = array())
-  {
-    $params = array('roomId' => $roomId);
-    $params = array_merge($params, $optParams);
-    return $this->call('decline', array($params), "Google_Service_Games_Room");
-  }
-  /**
-   * Dismiss an invitation to join a room. For internal use by the Games SDK only.
-   * Calling this method directly is unsupported. (rooms.dismiss)
-   *
-   * @param string $roomId The ID of the room.
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param string consistencyToken The last-seen mutation timestamp.
-   */
-  public function dismiss($roomId, $optParams = array())
-  {
-    $params = array('roomId' => $roomId);
-    $params = array_merge($params, $optParams);
-    return $this->call('dismiss', array($params));
-  }
-  /**
-   * Get the data for a room. (rooms.get)
-   *
-   * @param string $roomId The ID of the room.
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param string consistencyToken The last-seen mutation timestamp.
-   * @opt_param string language The preferred language to use for strings returned
-   * by this method.
-   * @return Google_Service_Games_Room
-   */
-  public function get($roomId, $optParams = array())
-  {
-    $params = array('roomId' => $roomId);
-    $params = array_merge($params, $optParams);
-    return $this->call('get', array($params), "Google_Service_Games_Room");
-  }
-  /**
-   * Join a room. For internal use by the Games SDK only. Calling this method
-   * directly is unsupported. (rooms.join)
-   *
-   * @param string $roomId The ID of the room.
-   * @param Google_Service_Games_RoomJoinRequest $postBody
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param string consistencyToken The last-seen mutation timestamp.
-   * @opt_param string language The preferred language to use for strings returned
-   * by this method.
-   * @return Google_Service_Games_Room
-   */
-  public function join($roomId, Google_Service_Games_RoomJoinRequest $postBody, $optParams = array())
-  {
-    $params = array('roomId' => $roomId, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('join', array($params), "Google_Service_Games_Room");
-  }
-  /**
-   * Leave a room. For internal use by the Games SDK only. Calling this method
-   * directly is unsupported. (rooms.leave)
-   *
-   * @param string $roomId The ID of the room.
-   * @param Google_Service_Games_RoomLeaveRequest $postBody
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param string consistencyToken The last-seen mutation timestamp.
-   * @opt_param string language The preferred language to use for strings returned
-   * by this method.
-   * @return Google_Service_Games_Room
-   */
-  public function leave($roomId, Google_Service_Games_RoomLeaveRequest $postBody, $optParams = array())
-  {
-    $params = array('roomId' => $roomId, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('leave', array($params), "Google_Service_Games_Room");
-  }
-  /**
-   * Returns invitations to join rooms. (rooms.listRooms)
-   *
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param string consistencyToken The last-seen mutation timestamp.
-   * @opt_param string language The preferred language to use for strings returned
-   * by this method.
-   * @opt_param int maxResults The maximum number of rooms to return in the
-   * response, used for paging. For any response, the actual number of rooms to
-   * return may be less than the specified maxResults.
-   * @opt_param string pageToken The token returned by the previous request.
-   * @return Google_Service_Games_RoomList
-   */
-  public function listRooms($optParams = array())
-  {
-    $params = array();
-    $params = array_merge($params, $optParams);
-    return $this->call('list', array($params), "Google_Service_Games_RoomList");
-  }
-  /**
-   * Updates sent by a client reporting the status of peers in a room. For
-   * internal use by the Games SDK only. Calling this method directly is
-   * unsupported. (rooms.reportStatus)
-   *
-   * @param string $roomId The ID of the room.
-   * @param Google_Service_Games_RoomP2PStatuses $postBody
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param string consistencyToken The last-seen mutation timestamp.
-   * @opt_param string language The preferred language to use for strings returned
-   * by this method.
-   * @return Google_Service_Games_RoomStatus
-   */
-  public function reportStatus($roomId, Google_Service_Games_RoomP2PStatuses $postBody, $optParams = array())
-  {
-    $params = array('roomId' => $roomId, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('reportStatus', array($params), "Google_Service_Games_RoomStatus");
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Games/Resource/Scores.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Games/Resource/Scores.php
deleted file mode 100644
index a6ae8bda..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Games/Resource/Scores.php
+++ /dev/null
@@ -1,158 +0,0 @@
-
- *   $gamesService = new Google_Service_Games(...);
- *   $scores = $gamesService->scores;
- *  
- */
-class Google_Service_Games_Resource_Scores extends Google_Service_Resource
-{
-  /**
-   * Get high scores, and optionally ranks, in leaderboards for the currently
-   * authenticated player. For a specific time span, leaderboardId can be set to
-   * ALL to retrieve data for all leaderboards in a given time span. NOTE: You
-   * cannot ask for 'ALL' leaderboards and 'ALL' timeSpans in the same request;
-   * only one parameter may be set to 'ALL'. (scores.get)
-   *
-   * @param string $playerId A player ID. A value of me may be used in place of
-   * the authenticated player's ID.
-   * @param string $leaderboardId The ID of the leaderboard. Can be set to 'ALL'
-   * to retrieve data for all leaderboards for this application.
-   * @param string $timeSpan The time span for the scores and ranks you're
-   * requesting.
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param string consistencyToken The last-seen mutation timestamp.
-   * @opt_param string includeRankType The types of ranks to return. If the
-   * parameter is omitted, no ranks will be returned.
-   * @opt_param string language The preferred language to use for strings returned
-   * by this method.
-   * @opt_param int maxResults The maximum number of leaderboard scores to return
-   * in the response. For any response, the actual number of leaderboard scores
-   * returned may be less than the specified maxResults.
-   * @opt_param string pageToken The token returned by the previous request.
-   * @return Google_Service_Games_PlayerLeaderboardScoreListResponse
-   */
-  public function get($playerId, $leaderboardId, $timeSpan, $optParams = array())
-  {
-    $params = array('playerId' => $playerId, 'leaderboardId' => $leaderboardId, 'timeSpan' => $timeSpan);
-    $params = array_merge($params, $optParams);
-    return $this->call('get', array($params), "Google_Service_Games_PlayerLeaderboardScoreListResponse");
-  }
-  /**
-   * Lists the scores in a leaderboard, starting from the top. (scores.listScores)
-   *
-   * @param string $leaderboardId The ID of the leaderboard.
-   * @param string $collection The collection of scores you're requesting.
-   * @param string $timeSpan The time span for the scores and ranks you're
-   * requesting.
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param string consistencyToken The last-seen mutation timestamp.
-   * @opt_param string language The preferred language to use for strings returned
-   * by this method.
-   * @opt_param int maxResults The maximum number of leaderboard scores to return
-   * in the response. For any response, the actual number of leaderboard scores
-   * returned may be less than the specified maxResults.
-   * @opt_param string pageToken The token returned by the previous request.
-   * @return Google_Service_Games_LeaderboardScores
-   */
-  public function listScores($leaderboardId, $collection, $timeSpan, $optParams = array())
-  {
-    $params = array('leaderboardId' => $leaderboardId, 'collection' => $collection, 'timeSpan' => $timeSpan);
-    $params = array_merge($params, $optParams);
-    return $this->call('list', array($params), "Google_Service_Games_LeaderboardScores");
-  }
-  /**
-   * Lists the scores in a leaderboard around (and including) a player's score.
-   * (scores.listWindow)
-   *
-   * @param string $leaderboardId The ID of the leaderboard.
-   * @param string $collection The collection of scores you're requesting.
-   * @param string $timeSpan The time span for the scores and ranks you're
-   * requesting.
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param string consistencyToken The last-seen mutation timestamp.
-   * @opt_param string language The preferred language to use for strings returned
-   * by this method.
-   * @opt_param int maxResults The maximum number of leaderboard scores to return
-   * in the response. For any response, the actual number of leaderboard scores
-   * returned may be less than the specified maxResults.
-   * @opt_param string pageToken The token returned by the previous request.
-   * @opt_param int resultsAbove The preferred number of scores to return above
-   * the player's score. More scores may be returned if the player is at the
-   * bottom of the leaderboard; fewer may be returned if the player is at the top.
-   * Must be less than or equal to maxResults.
-   * @opt_param bool returnTopIfAbsent True if the top scores should be returned
-   * when the player is not in the leaderboard. Defaults to true.
-   * @return Google_Service_Games_LeaderboardScores
-   */
-  public function listWindow($leaderboardId, $collection, $timeSpan, $optParams = array())
-  {
-    $params = array('leaderboardId' => $leaderboardId, 'collection' => $collection, 'timeSpan' => $timeSpan);
-    $params = array_merge($params, $optParams);
-    return $this->call('listWindow', array($params), "Google_Service_Games_LeaderboardScores");
-  }
-  /**
-   * Submits a score to the specified leaderboard. (scores.submit)
-   *
-   * @param string $leaderboardId The ID of the leaderboard.
-   * @param string $score The score you're submitting. The submitted score is
-   * ignored if it is worse than a previously submitted score, where worse depends
-   * on the leaderboard sort order. The meaning of the score value depends on the
-   * leaderboard format type. For fixed-point, the score represents the raw value.
-   * For time, the score represents elapsed time in milliseconds. For currency,
-   * the score represents a value in micro units.
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param string consistencyToken The last-seen mutation timestamp.
-   * @opt_param string language The preferred language to use for strings returned
-   * by this method.
-   * @opt_param string scoreTag Additional information about the score you're
-   * submitting. Values must contain no more than 64 URI-safe characters as
-   * defined by section 2.3 of RFC 3986.
-   * @return Google_Service_Games_PlayerScoreResponse
-   */
-  public function submit($leaderboardId, $score, $optParams = array())
-  {
-    $params = array('leaderboardId' => $leaderboardId, 'score' => $score);
-    $params = array_merge($params, $optParams);
-    return $this->call('submit', array($params), "Google_Service_Games_PlayerScoreResponse");
-  }
-  /**
-   * Submits multiple scores to leaderboards. (scores.submitMultiple)
-   *
-   * @param Google_Service_Games_PlayerScoreSubmissionList $postBody
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param string consistencyToken The last-seen mutation timestamp.
-   * @opt_param string language The preferred language to use for strings returned
-   * by this method.
-   * @return Google_Service_Games_PlayerScoreListResponse
-   */
-  public function submitMultiple(Google_Service_Games_PlayerScoreSubmissionList $postBody, $optParams = array())
-  {
-    $params = array('postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('submitMultiple', array($params), "Google_Service_Games_PlayerScoreListResponse");
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Games/Resource/Snapshots.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Games/Resource/Snapshots.php
deleted file mode 100644
index 5655d985..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Games/Resource/Snapshots.php
+++ /dev/null
@@ -1,68 +0,0 @@
-
- *   $gamesService = new Google_Service_Games(...);
- *   $snapshots = $gamesService->snapshots;
- *  
- */
-class Google_Service_Games_Resource_Snapshots extends Google_Service_Resource
-{
-  /**
-   * Retrieves the metadata for a given snapshot ID. (snapshots.get)
-   *
-   * @param string $snapshotId The ID of the snapshot.
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param string consistencyToken The last-seen mutation timestamp.
-   * @opt_param string language The preferred language to use for strings returned
-   * by this method.
-   * @return Google_Service_Games_Snapshot
-   */
-  public function get($snapshotId, $optParams = array())
-  {
-    $params = array('snapshotId' => $snapshotId);
-    $params = array_merge($params, $optParams);
-    return $this->call('get', array($params), "Google_Service_Games_Snapshot");
-  }
-  /**
-   * Retrieves a list of snapshots created by your application for the player
-   * corresponding to the player ID. (snapshots.listSnapshots)
-   *
-   * @param string $playerId A player ID. A value of me may be used in place of
-   * the authenticated player's ID.
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param string consistencyToken The last-seen mutation timestamp.
-   * @opt_param string language The preferred language to use for strings returned
-   * by this method.
-   * @opt_param int maxResults The maximum number of snapshot resources to return
-   * in the response, used for paging. For any response, the actual number of
-   * snapshot resources returned may be less than the specified maxResults.
-   * @opt_param string pageToken The token returned by the previous request.
-   * @return Google_Service_Games_SnapshotListResponse
-   */
-  public function listSnapshots($playerId, $optParams = array())
-  {
-    $params = array('playerId' => $playerId);
-    $params = array_merge($params, $optParams);
-    return $this->call('list', array($params), "Google_Service_Games_SnapshotListResponse");
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Games/Resource/TurnBasedMatches.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Games/Resource/TurnBasedMatches.php
deleted file mode 100644
index e6c05a2b..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Games/Resource/TurnBasedMatches.php
+++ /dev/null
@@ -1,289 +0,0 @@
-
- *   $gamesService = new Google_Service_Games(...);
- *   $turnBasedMatches = $gamesService->turnBasedMatches;
- *  
- */
-class Google_Service_Games_Resource_TurnBasedMatches extends Google_Service_Resource
-{
-  /**
-   * Cancel a turn-based match. (turnBasedMatches.cancel)
-   *
-   * @param string $matchId The ID of the match.
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param string consistencyToken The last-seen mutation timestamp.
-   */
-  public function cancel($matchId, $optParams = array())
-  {
-    $params = array('matchId' => $matchId);
-    $params = array_merge($params, $optParams);
-    return $this->call('cancel', array($params));
-  }
-  /**
-   * Create a turn-based match. (turnBasedMatches.create)
-   *
-   * @param Google_Service_Games_TurnBasedMatchCreateRequest $postBody
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param string consistencyToken The last-seen mutation timestamp.
-   * @opt_param string language The preferred language to use for strings returned
-   * by this method.
-   * @return Google_Service_Games_TurnBasedMatch
-   */
-  public function create(Google_Service_Games_TurnBasedMatchCreateRequest $postBody, $optParams = array())
-  {
-    $params = array('postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('create', array($params), "Google_Service_Games_TurnBasedMatch");
-  }
-  /**
-   * Decline an invitation to play a turn-based match. (turnBasedMatches.decline)
-   *
-   * @param string $matchId The ID of the match.
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param string consistencyToken The last-seen mutation timestamp.
-   * @opt_param string language The preferred language to use for strings returned
-   * by this method.
-   * @return Google_Service_Games_TurnBasedMatch
-   */
-  public function decline($matchId, $optParams = array())
-  {
-    $params = array('matchId' => $matchId);
-    $params = array_merge($params, $optParams);
-    return $this->call('decline', array($params), "Google_Service_Games_TurnBasedMatch");
-  }
-  /**
-   * Dismiss a turn-based match from the match list. The match will no longer show
-   * up in the list and will not generate notifications.
-   * (turnBasedMatches.dismiss)
-   *
-   * @param string $matchId The ID of the match.
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param string consistencyToken The last-seen mutation timestamp.
-   */
-  public function dismiss($matchId, $optParams = array())
-  {
-    $params = array('matchId' => $matchId);
-    $params = array_merge($params, $optParams);
-    return $this->call('dismiss', array($params));
-  }
-  /**
-   * Finish a turn-based match. Each player should make this call once, after all
-   * results are in. Only the player whose turn it is may make the first call to
-   * Finish, and can pass in the final match state. (turnBasedMatches.finish)
-   *
-   * @param string $matchId The ID of the match.
-   * @param Google_Service_Games_TurnBasedMatchResults $postBody
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param string consistencyToken The last-seen mutation timestamp.
-   * @opt_param string language The preferred language to use for strings returned
-   * by this method.
-   * @return Google_Service_Games_TurnBasedMatch
-   */
-  public function finish($matchId, Google_Service_Games_TurnBasedMatchResults $postBody, $optParams = array())
-  {
-    $params = array('matchId' => $matchId, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('finish', array($params), "Google_Service_Games_TurnBasedMatch");
-  }
-  /**
-   * Get the data for a turn-based match. (turnBasedMatches.get)
-   *
-   * @param string $matchId The ID of the match.
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param string consistencyToken The last-seen mutation timestamp.
-   * @opt_param bool includeMatchData Get match data along with metadata.
-   * @opt_param string language The preferred language to use for strings returned
-   * by this method.
-   * @return Google_Service_Games_TurnBasedMatch
-   */
-  public function get($matchId, $optParams = array())
-  {
-    $params = array('matchId' => $matchId);
-    $params = array_merge($params, $optParams);
-    return $this->call('get', array($params), "Google_Service_Games_TurnBasedMatch");
-  }
-  /**
-   * Join a turn-based match. (turnBasedMatches.join)
-   *
-   * @param string $matchId The ID of the match.
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param string consistencyToken The last-seen mutation timestamp.
-   * @opt_param string language The preferred language to use for strings returned
-   * by this method.
-   * @return Google_Service_Games_TurnBasedMatch
-   */
-  public function join($matchId, $optParams = array())
-  {
-    $params = array('matchId' => $matchId);
-    $params = array_merge($params, $optParams);
-    return $this->call('join', array($params), "Google_Service_Games_TurnBasedMatch");
-  }
-  /**
-   * Leave a turn-based match when it is not the current player's turn, without
-   * canceling the match. (turnBasedMatches.leave)
-   *
-   * @param string $matchId The ID of the match.
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param string consistencyToken The last-seen mutation timestamp.
-   * @opt_param string language The preferred language to use for strings returned
-   * by this method.
-   * @return Google_Service_Games_TurnBasedMatch
-   */
-  public function leave($matchId, $optParams = array())
-  {
-    $params = array('matchId' => $matchId);
-    $params = array_merge($params, $optParams);
-    return $this->call('leave', array($params), "Google_Service_Games_TurnBasedMatch");
-  }
-  /**
-   * Leave a turn-based match during the current player's turn, without canceling
-   * the match. (turnBasedMatches.leaveTurn)
-   *
-   * @param string $matchId The ID of the match.
-   * @param int $matchVersion The version of the match being updated.
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param string consistencyToken The last-seen mutation timestamp.
-   * @opt_param string language The preferred language to use for strings returned
-   * by this method.
-   * @opt_param string pendingParticipantId The ID of another participant who
-   * should take their turn next. If not set, the match will wait for other
-   * player(s) to join via automatching; this is only valid if automatch criteria
-   * is set on the match with remaining slots for automatched players.
-   * @return Google_Service_Games_TurnBasedMatch
-   */
-  public function leaveTurn($matchId, $matchVersion, $optParams = array())
-  {
-    $params = array('matchId' => $matchId, 'matchVersion' => $matchVersion);
-    $params = array_merge($params, $optParams);
-    return $this->call('leaveTurn', array($params), "Google_Service_Games_TurnBasedMatch");
-  }
-  /**
-   * Returns turn-based matches the player is or was involved in.
-   * (turnBasedMatches.listTurnBasedMatches)
-   *
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param string consistencyToken The last-seen mutation timestamp.
-   * @opt_param bool includeMatchData True if match data should be returned in the
-   * response. Note that not all data will necessarily be returned if
-   * include_match_data is true; the server may decide to only return data for
-   * some of the matches to limit download size for the client. The remainder of
-   * the data for these matches will be retrievable on request.
-   * @opt_param string language The preferred language to use for strings returned
-   * by this method.
-   * @opt_param int maxCompletedMatches The maximum number of completed or
-   * canceled matches to return in the response. If not set, all matches returned
-   * could be completed or canceled.
-   * @opt_param int maxResults The maximum number of matches to return in the
-   * response, used for paging. For any response, the actual number of matches to
-   * return may be less than the specified maxResults.
-   * @opt_param string pageToken The token returned by the previous request.
-   * @return Google_Service_Games_TurnBasedMatchList
-   */
-  public function listTurnBasedMatches($optParams = array())
-  {
-    $params = array();
-    $params = array_merge($params, $optParams);
-    return $this->call('list', array($params), "Google_Service_Games_TurnBasedMatchList");
-  }
-  /**
-   * Create a rematch of a match that was previously completed, with the same
-   * participants. This can be called by only one player on a match still in their
-   * list; the player must have called Finish first. Returns the newly created
-   * match; it will be the caller's turn. (turnBasedMatches.rematch)
-   *
-   * @param string $matchId The ID of the match.
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param string consistencyToken The last-seen mutation timestamp.
-   * @opt_param string language The preferred language to use for strings returned
-   * by this method.
-   * @opt_param string requestId A randomly generated numeric ID for each request
-   * specified by the caller. This number is used at the server to ensure that the
-   * request is handled correctly across retries.
-   * @return Google_Service_Games_TurnBasedMatchRematch
-   */
-  public function rematch($matchId, $optParams = array())
-  {
-    $params = array('matchId' => $matchId);
-    $params = array_merge($params, $optParams);
-    return $this->call('rematch', array($params), "Google_Service_Games_TurnBasedMatchRematch");
-  }
-  /**
-   * Returns turn-based matches the player is or was involved in that changed
-   * since the last sync call, with the least recent changes coming first. Matches
-   * that should be removed from the local cache will have a status of
-   * MATCH_DELETED. (turnBasedMatches.sync)
-   *
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param string consistencyToken The last-seen mutation timestamp.
-   * @opt_param bool includeMatchData True if match data should be returned in the
-   * response. Note that not all data will necessarily be returned if
-   * include_match_data is true; the server may decide to only return data for
-   * some of the matches to limit download size for the client. The remainder of
-   * the data for these matches will be retrievable on request.
-   * @opt_param string language The preferred language to use for strings returned
-   * by this method.
-   * @opt_param int maxCompletedMatches The maximum number of completed or
-   * canceled matches to return in the response. If not set, all matches returned
-   * could be completed or canceled.
-   * @opt_param int maxResults The maximum number of matches to return in the
-   * response, used for paging. For any response, the actual number of matches to
-   * return may be less than the specified maxResults.
-   * @opt_param string pageToken The token returned by the previous request.
-   * @return Google_Service_Games_TurnBasedMatchSync
-   */
-  public function sync($optParams = array())
-  {
-    $params = array();
-    $params = array_merge($params, $optParams);
-    return $this->call('sync', array($params), "Google_Service_Games_TurnBasedMatchSync");
-  }
-  /**
-   * Commit the results of a player turn. (turnBasedMatches.takeTurn)
-   *
-   * @param string $matchId The ID of the match.
-   * @param Google_Service_Games_TurnBasedMatchTurn $postBody
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param string consistencyToken The last-seen mutation timestamp.
-   * @opt_param string language The preferred language to use for strings returned
-   * by this method.
-   * @return Google_Service_Games_TurnBasedMatch
-   */
-  public function takeTurn($matchId, Google_Service_Games_TurnBasedMatchTurn $postBody, $optParams = array())
-  {
-    $params = array('matchId' => $matchId, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('takeTurn', array($params), "Google_Service_Games_TurnBasedMatch");
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Games/RevisionCheckResponse.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Games/RevisionCheckResponse.php
deleted file mode 100644
index 98696cad..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Games/RevisionCheckResponse.php
+++ /dev/null
@@ -1,48 +0,0 @@
-apiVersion = $apiVersion;
-  }
-  public function getApiVersion()
-  {
-    return $this->apiVersion;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setRevisionStatus($revisionStatus)
-  {
-    $this->revisionStatus = $revisionStatus;
-  }
-  public function getRevisionStatus()
-  {
-    return $this->revisionStatus;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Games/Room.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Games/Room.php
deleted file mode 100644
index cf3501f5..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Games/Room.php
+++ /dev/null
@@ -1,144 +0,0 @@
-applicationId = $applicationId;
-  }
-  public function getApplicationId()
-  {
-    return $this->applicationId;
-  }
-  public function setAutoMatchingCriteria(Google_Service_Games_RoomAutoMatchingCriteria $autoMatchingCriteria)
-  {
-    $this->autoMatchingCriteria = $autoMatchingCriteria;
-  }
-  public function getAutoMatchingCriteria()
-  {
-    return $this->autoMatchingCriteria;
-  }
-  public function setAutoMatchingStatus(Google_Service_Games_RoomAutoMatchStatus $autoMatchingStatus)
-  {
-    $this->autoMatchingStatus = $autoMatchingStatus;
-  }
-  public function getAutoMatchingStatus()
-  {
-    return $this->autoMatchingStatus;
-  }
-  public function setCreationDetails(Google_Service_Games_RoomModification $creationDetails)
-  {
-    $this->creationDetails = $creationDetails;
-  }
-  public function getCreationDetails()
-  {
-    return $this->creationDetails;
-  }
-  public function setDescription($description)
-  {
-    $this->description = $description;
-  }
-  public function getDescription()
-  {
-    return $this->description;
-  }
-  public function setInviterId($inviterId)
-  {
-    $this->inviterId = $inviterId;
-  }
-  public function getInviterId()
-  {
-    return $this->inviterId;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setLastUpdateDetails(Google_Service_Games_RoomModification $lastUpdateDetails)
-  {
-    $this->lastUpdateDetails = $lastUpdateDetails;
-  }
-  public function getLastUpdateDetails()
-  {
-    return $this->lastUpdateDetails;
-  }
-  public function setParticipants($participants)
-  {
-    $this->participants = $participants;
-  }
-  public function getParticipants()
-  {
-    return $this->participants;
-  }
-  public function setRoomId($roomId)
-  {
-    $this->roomId = $roomId;
-  }
-  public function getRoomId()
-  {
-    return $this->roomId;
-  }
-  public function setRoomStatusVersion($roomStatusVersion)
-  {
-    $this->roomStatusVersion = $roomStatusVersion;
-  }
-  public function getRoomStatusVersion()
-  {
-    return $this->roomStatusVersion;
-  }
-  public function setStatus($status)
-  {
-    $this->status = $status;
-  }
-  public function getStatus()
-  {
-    return $this->status;
-  }
-  public function setVariant($variant)
-  {
-    $this->variant = $variant;
-  }
-  public function getVariant()
-  {
-    return $this->variant;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Games/RoomAutoMatchStatus.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Games/RoomAutoMatchStatus.php
deleted file mode 100644
index d8daffae..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Games/RoomAutoMatchStatus.php
+++ /dev/null
@@ -1,39 +0,0 @@
-kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setWaitEstimateSeconds($waitEstimateSeconds)
-  {
-    $this->waitEstimateSeconds = $waitEstimateSeconds;
-  }
-  public function getWaitEstimateSeconds()
-  {
-    return $this->waitEstimateSeconds;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Games/RoomAutoMatchingCriteria.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Games/RoomAutoMatchingCriteria.php
deleted file mode 100644
index 5107dfdc..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Games/RoomAutoMatchingCriteria.php
+++ /dev/null
@@ -1,57 +0,0 @@
-exclusiveBitmask = $exclusiveBitmask;
-  }
-  public function getExclusiveBitmask()
-  {
-    return $this->exclusiveBitmask;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setMaxAutoMatchingPlayers($maxAutoMatchingPlayers)
-  {
-    $this->maxAutoMatchingPlayers = $maxAutoMatchingPlayers;
-  }
-  public function getMaxAutoMatchingPlayers()
-  {
-    return $this->maxAutoMatchingPlayers;
-  }
-  public function setMinAutoMatchingPlayers($minAutoMatchingPlayers)
-  {
-    $this->minAutoMatchingPlayers = $minAutoMatchingPlayers;
-  }
-  public function getMinAutoMatchingPlayers()
-  {
-    return $this->minAutoMatchingPlayers;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Games/RoomClientAddress.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Games/RoomClientAddress.php
deleted file mode 100644
index b65ae8e6..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Games/RoomClientAddress.php
+++ /dev/null
@@ -1,39 +0,0 @@
-kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setXmppAddress($xmppAddress)
-  {
-    $this->xmppAddress = $xmppAddress;
-  }
-  public function getXmppAddress()
-  {
-    return $this->xmppAddress;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Games/RoomCreateRequest.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Games/RoomCreateRequest.php
deleted file mode 100644
index b6bea55d..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Games/RoomCreateRequest.php
+++ /dev/null
@@ -1,97 +0,0 @@
-autoMatchingCriteria = $autoMatchingCriteria;
-  }
-  public function getAutoMatchingCriteria()
-  {
-    return $this->autoMatchingCriteria;
-  }
-  public function setCapabilities($capabilities)
-  {
-    $this->capabilities = $capabilities;
-  }
-  public function getCapabilities()
-  {
-    return $this->capabilities;
-  }
-  public function setClientAddress(Google_Service_Games_RoomClientAddress $clientAddress)
-  {
-    $this->clientAddress = $clientAddress;
-  }
-  public function getClientAddress()
-  {
-    return $this->clientAddress;
-  }
-  public function setInvitedPlayerIds($invitedPlayerIds)
-  {
-    $this->invitedPlayerIds = $invitedPlayerIds;
-  }
-  public function getInvitedPlayerIds()
-  {
-    return $this->invitedPlayerIds;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setNetworkDiagnostics(Google_Service_Games_NetworkDiagnostics $networkDiagnostics)
-  {
-    $this->networkDiagnostics = $networkDiagnostics;
-  }
-  public function getNetworkDiagnostics()
-  {
-    return $this->networkDiagnostics;
-  }
-  public function setRequestId($requestId)
-  {
-    $this->requestId = $requestId;
-  }
-  public function getRequestId()
-  {
-    return $this->requestId;
-  }
-  public function setVariant($variant)
-  {
-    $this->variant = $variant;
-  }
-  public function getVariant()
-  {
-    return $this->variant;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Games/RoomJoinRequest.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Games/RoomJoinRequest.php
deleted file mode 100644
index 2f55f28e..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Games/RoomJoinRequest.php
+++ /dev/null
@@ -1,60 +0,0 @@
-capabilities = $capabilities;
-  }
-  public function getCapabilities()
-  {
-    return $this->capabilities;
-  }
-  public function setClientAddress(Google_Service_Games_RoomClientAddress $clientAddress)
-  {
-    $this->clientAddress = $clientAddress;
-  }
-  public function getClientAddress()
-  {
-    return $this->clientAddress;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setNetworkDiagnostics(Google_Service_Games_NetworkDiagnostics $networkDiagnostics)
-  {
-    $this->networkDiagnostics = $networkDiagnostics;
-  }
-  public function getNetworkDiagnostics()
-  {
-    return $this->networkDiagnostics;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Games/RoomLeaveDiagnostics.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Games/RoomLeaveDiagnostics.php
deleted file mode 100644
index f456e9b5..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Games/RoomLeaveDiagnostics.php
+++ /dev/null
@@ -1,95 +0,0 @@
-androidNetworkSubtype = $androidNetworkSubtype;
-  }
-  public function getAndroidNetworkSubtype()
-  {
-    return $this->androidNetworkSubtype;
-  }
-  public function setAndroidNetworkType($androidNetworkType)
-  {
-    $this->androidNetworkType = $androidNetworkType;
-  }
-  public function getAndroidNetworkType()
-  {
-    return $this->androidNetworkType;
-  }
-  public function setIosNetworkType($iosNetworkType)
-  {
-    $this->iosNetworkType = $iosNetworkType;
-  }
-  public function getIosNetworkType()
-  {
-    return $this->iosNetworkType;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setNetworkOperatorCode($networkOperatorCode)
-  {
-    $this->networkOperatorCode = $networkOperatorCode;
-  }
-  public function getNetworkOperatorCode()
-  {
-    return $this->networkOperatorCode;
-  }
-  public function setNetworkOperatorName($networkOperatorName)
-  {
-    $this->networkOperatorName = $networkOperatorName;
-  }
-  public function getNetworkOperatorName()
-  {
-    return $this->networkOperatorName;
-  }
-  public function setPeerSession($peerSession)
-  {
-    $this->peerSession = $peerSession;
-  }
-  public function getPeerSession()
-  {
-    return $this->peerSession;
-  }
-  public function setSocketsUsed($socketsUsed)
-  {
-    $this->socketsUsed = $socketsUsed;
-  }
-  public function getSocketsUsed()
-  {
-    return $this->socketsUsed;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Games/RoomLeaveRequest.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Games/RoomLeaveRequest.php
deleted file mode 100644
index d41eec03..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Games/RoomLeaveRequest.php
+++ /dev/null
@@ -1,49 +0,0 @@
-kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setLeaveDiagnostics(Google_Service_Games_RoomLeaveDiagnostics $leaveDiagnostics)
-  {
-    $this->leaveDiagnostics = $leaveDiagnostics;
-  }
-  public function getLeaveDiagnostics()
-  {
-    return $this->leaveDiagnostics;
-  }
-  public function setReason($reason)
-  {
-    $this->reason = $reason;
-  }
-  public function getReason()
-  {
-    return $this->reason;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Games/RoomList.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Games/RoomList.php
deleted file mode 100644
index 2807aa3f..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Games/RoomList.php
+++ /dev/null
@@ -1,50 +0,0 @@
-items = $items;
-  }
-  public function getItems()
-  {
-    return $this->items;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setNextPageToken($nextPageToken)
-  {
-    $this->nextPageToken = $nextPageToken;
-  }
-  public function getNextPageToken()
-  {
-    return $this->nextPageToken;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Games/RoomModification.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Games/RoomModification.php
deleted file mode 100644
index 43ed77d8..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Games/RoomModification.php
+++ /dev/null
@@ -1,48 +0,0 @@
-kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setModifiedTimestampMillis($modifiedTimestampMillis)
-  {
-    $this->modifiedTimestampMillis = $modifiedTimestampMillis;
-  }
-  public function getModifiedTimestampMillis()
-  {
-    return $this->modifiedTimestampMillis;
-  }
-  public function setParticipantId($participantId)
-  {
-    $this->participantId = $participantId;
-  }
-  public function getParticipantId()
-  {
-    return $this->participantId;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Games/RoomP2PStatus.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Games/RoomP2PStatus.php
deleted file mode 100644
index 96a16ac5..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Games/RoomP2PStatus.php
+++ /dev/null
@@ -1,87 +0,0 @@
- "error_reason",
-  );
-  public $connectionSetupLatencyMillis;
-  public $error;
-  public $errorReason;
-  public $kind;
-  public $participantId;
-  public $status;
-  public $unreliableRoundtripLatencyMillis;
-
-  public function setConnectionSetupLatencyMillis($connectionSetupLatencyMillis)
-  {
-    $this->connectionSetupLatencyMillis = $connectionSetupLatencyMillis;
-  }
-  public function getConnectionSetupLatencyMillis()
-  {
-    return $this->connectionSetupLatencyMillis;
-  }
-  public function setError($error)
-  {
-    $this->error = $error;
-  }
-  public function getError()
-  {
-    return $this->error;
-  }
-  public function setErrorReason($errorReason)
-  {
-    $this->errorReason = $errorReason;
-  }
-  public function getErrorReason()
-  {
-    return $this->errorReason;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setParticipantId($participantId)
-  {
-    $this->participantId = $participantId;
-  }
-  public function getParticipantId()
-  {
-    return $this->participantId;
-  }
-  public function setStatus($status)
-  {
-    $this->status = $status;
-  }
-  public function getStatus()
-  {
-    return $this->status;
-  }
-  public function setUnreliableRoundtripLatencyMillis($unreliableRoundtripLatencyMillis)
-  {
-    $this->unreliableRoundtripLatencyMillis = $unreliableRoundtripLatencyMillis;
-  }
-  public function getUnreliableRoundtripLatencyMillis()
-  {
-    return $this->unreliableRoundtripLatencyMillis;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Games/RoomP2PStatuses.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Games/RoomP2PStatuses.php
deleted file mode 100644
index fab0dca0..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Games/RoomP2PStatuses.php
+++ /dev/null
@@ -1,41 +0,0 @@
-kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setUpdates($updates)
-  {
-    $this->updates = $updates;
-  }
-  public function getUpdates()
-  {
-    return $this->updates;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Games/RoomParticipant.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Games/RoomParticipant.php
deleted file mode 100644
index 1f9bcd6a..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Games/RoomParticipant.php
+++ /dev/null
@@ -1,115 +0,0 @@
-autoMatched = $autoMatched;
-  }
-  public function getAutoMatched()
-  {
-    return $this->autoMatched;
-  }
-  public function setAutoMatchedPlayer(Google_Service_Games_AnonymousPlayer $autoMatchedPlayer)
-  {
-    $this->autoMatchedPlayer = $autoMatchedPlayer;
-  }
-  public function getAutoMatchedPlayer()
-  {
-    return $this->autoMatchedPlayer;
-  }
-  public function setCapabilities($capabilities)
-  {
-    $this->capabilities = $capabilities;
-  }
-  public function getCapabilities()
-  {
-    return $this->capabilities;
-  }
-  public function setClientAddress(Google_Service_Games_RoomClientAddress $clientAddress)
-  {
-    $this->clientAddress = $clientAddress;
-  }
-  public function getClientAddress()
-  {
-    return $this->clientAddress;
-  }
-  public function setConnected($connected)
-  {
-    $this->connected = $connected;
-  }
-  public function getConnected()
-  {
-    return $this->connected;
-  }
-  public function setId($id)
-  {
-    $this->id = $id;
-  }
-  public function getId()
-  {
-    return $this->id;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setLeaveReason($leaveReason)
-  {
-    $this->leaveReason = $leaveReason;
-  }
-  public function getLeaveReason()
-  {
-    return $this->leaveReason;
-  }
-  public function setPlayer(Google_Service_Games_Player $player)
-  {
-    $this->player = $player;
-  }
-  public function getPlayer()
-  {
-    return $this->player;
-  }
-  public function setStatus($status)
-  {
-    $this->status = $status;
-  }
-  public function getStatus()
-  {
-    return $this->status;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Games/RoomStatus.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Games/RoomStatus.php
deleted file mode 100644
index 706221eb..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Games/RoomStatus.php
+++ /dev/null
@@ -1,78 +0,0 @@
-autoMatchingStatus = $autoMatchingStatus;
-  }
-  public function getAutoMatchingStatus()
-  {
-    return $this->autoMatchingStatus;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setParticipants($participants)
-  {
-    $this->participants = $participants;
-  }
-  public function getParticipants()
-  {
-    return $this->participants;
-  }
-  public function setRoomId($roomId)
-  {
-    $this->roomId = $roomId;
-  }
-  public function getRoomId()
-  {
-    return $this->roomId;
-  }
-  public function setStatus($status)
-  {
-    $this->status = $status;
-  }
-  public function getStatus()
-  {
-    return $this->status;
-  }
-  public function setStatusVersion($statusVersion)
-  {
-    $this->statusVersion = $statusVersion;
-  }
-  public function getStatusVersion()
-  {
-    return $this->statusVersion;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Games/ScoreSubmission.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Games/ScoreSubmission.php
deleted file mode 100644
index 03c09cf9..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Games/ScoreSubmission.php
+++ /dev/null
@@ -1,66 +0,0 @@
-kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setLeaderboardId($leaderboardId)
-  {
-    $this->leaderboardId = $leaderboardId;
-  }
-  public function getLeaderboardId()
-  {
-    return $this->leaderboardId;
-  }
-  public function setScore($score)
-  {
-    $this->score = $score;
-  }
-  public function getScore()
-  {
-    return $this->score;
-  }
-  public function setScoreTag($scoreTag)
-  {
-    $this->scoreTag = $scoreTag;
-  }
-  public function getScoreTag()
-  {
-    return $this->scoreTag;
-  }
-  public function setSignature($signature)
-  {
-    $this->signature = $signature;
-  }
-  public function getSignature()
-  {
-    return $this->signature;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Games/Snapshot.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Games/Snapshot.php
deleted file mode 100644
index 2ec6ed07..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Games/Snapshot.php
+++ /dev/null
@@ -1,121 +0,0 @@
-coverImage = $coverImage;
-  }
-  public function getCoverImage()
-  {
-    return $this->coverImage;
-  }
-  public function setDescription($description)
-  {
-    $this->description = $description;
-  }
-  public function getDescription()
-  {
-    return $this->description;
-  }
-  public function setDriveId($driveId)
-  {
-    $this->driveId = $driveId;
-  }
-  public function getDriveId()
-  {
-    return $this->driveId;
-  }
-  public function setDurationMillis($durationMillis)
-  {
-    $this->durationMillis = $durationMillis;
-  }
-  public function getDurationMillis()
-  {
-    return $this->durationMillis;
-  }
-  public function setId($id)
-  {
-    $this->id = $id;
-  }
-  public function getId()
-  {
-    return $this->id;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setLastModifiedMillis($lastModifiedMillis)
-  {
-    $this->lastModifiedMillis = $lastModifiedMillis;
-  }
-  public function getLastModifiedMillis()
-  {
-    return $this->lastModifiedMillis;
-  }
-  public function setProgressValue($progressValue)
-  {
-    $this->progressValue = $progressValue;
-  }
-  public function getProgressValue()
-  {
-    return $this->progressValue;
-  }
-  public function setTitle($title)
-  {
-    $this->title = $title;
-  }
-  public function getTitle()
-  {
-    return $this->title;
-  }
-  public function setType($type)
-  {
-    $this->type = $type;
-  }
-  public function getType()
-  {
-    return $this->type;
-  }
-  public function setUniqueName($uniqueName)
-  {
-    $this->uniqueName = $uniqueName;
-  }
-  public function getUniqueName()
-  {
-    return $this->uniqueName;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Games/SnapshotImage.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Games/SnapshotImage.php
deleted file mode 100644
index 2755e987..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Games/SnapshotImage.php
+++ /dev/null
@@ -1,69 +0,0 @@
- "mime_type",
-  );
-  public $height;
-  public $kind;
-  public $mimeType;
-  public $url;
-  public $width;
-
-  public function setHeight($height)
-  {
-    $this->height = $height;
-  }
-  public function getHeight()
-  {
-    return $this->height;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setMimeType($mimeType)
-  {
-    $this->mimeType = $mimeType;
-  }
-  public function getMimeType()
-  {
-    return $this->mimeType;
-  }
-  public function setUrl($url)
-  {
-    $this->url = $url;
-  }
-  public function getUrl()
-  {
-    return $this->url;
-  }
-  public function setWidth($width)
-  {
-    $this->width = $width;
-  }
-  public function getWidth()
-  {
-    return $this->width;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Games/SnapshotListResponse.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Games/SnapshotListResponse.php
deleted file mode 100644
index a96009a4..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Games/SnapshotListResponse.php
+++ /dev/null
@@ -1,50 +0,0 @@
-items = $items;
-  }
-  public function getItems()
-  {
-    return $this->items;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setNextPageToken($nextPageToken)
-  {
-    $this->nextPageToken = $nextPageToken;
-  }
-  public function getNextPageToken()
-  {
-    return $this->nextPageToken;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Games/TurnBasedAutoMatchingCriteria.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Games/TurnBasedAutoMatchingCriteria.php
deleted file mode 100644
index 2895ae47..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Games/TurnBasedAutoMatchingCriteria.php
+++ /dev/null
@@ -1,57 +0,0 @@
-exclusiveBitmask = $exclusiveBitmask;
-  }
-  public function getExclusiveBitmask()
-  {
-    return $this->exclusiveBitmask;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setMaxAutoMatchingPlayers($maxAutoMatchingPlayers)
-  {
-    $this->maxAutoMatchingPlayers = $maxAutoMatchingPlayers;
-  }
-  public function getMaxAutoMatchingPlayers()
-  {
-    return $this->maxAutoMatchingPlayers;
-  }
-  public function setMinAutoMatchingPlayers($minAutoMatchingPlayers)
-  {
-    $this->minAutoMatchingPlayers = $minAutoMatchingPlayers;
-  }
-  public function getMinAutoMatchingPlayers()
-  {
-    return $this->minAutoMatchingPlayers;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Games/TurnBasedMatch.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Games/TurnBasedMatch.php
deleted file mode 100644
index 57b3588d..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Games/TurnBasedMatch.php
+++ /dev/null
@@ -1,209 +0,0 @@
-applicationId = $applicationId;
-  }
-  public function getApplicationId()
-  {
-    return $this->applicationId;
-  }
-  public function setAutoMatchingCriteria(Google_Service_Games_TurnBasedAutoMatchingCriteria $autoMatchingCriteria)
-  {
-    $this->autoMatchingCriteria = $autoMatchingCriteria;
-  }
-  public function getAutoMatchingCriteria()
-  {
-    return $this->autoMatchingCriteria;
-  }
-  public function setCreationDetails(Google_Service_Games_TurnBasedMatchModification $creationDetails)
-  {
-    $this->creationDetails = $creationDetails;
-  }
-  public function getCreationDetails()
-  {
-    return $this->creationDetails;
-  }
-  public function setData(Google_Service_Games_TurnBasedMatchData $data)
-  {
-    $this->data = $data;
-  }
-  public function getData()
-  {
-    return $this->data;
-  }
-  public function setDescription($description)
-  {
-    $this->description = $description;
-  }
-  public function getDescription()
-  {
-    return $this->description;
-  }
-  public function setInviterId($inviterId)
-  {
-    $this->inviterId = $inviterId;
-  }
-  public function getInviterId()
-  {
-    return $this->inviterId;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setLastUpdateDetails(Google_Service_Games_TurnBasedMatchModification $lastUpdateDetails)
-  {
-    $this->lastUpdateDetails = $lastUpdateDetails;
-  }
-  public function getLastUpdateDetails()
-  {
-    return $this->lastUpdateDetails;
-  }
-  public function setMatchId($matchId)
-  {
-    $this->matchId = $matchId;
-  }
-  public function getMatchId()
-  {
-    return $this->matchId;
-  }
-  public function setMatchNumber($matchNumber)
-  {
-    $this->matchNumber = $matchNumber;
-  }
-  public function getMatchNumber()
-  {
-    return $this->matchNumber;
-  }
-  public function setMatchVersion($matchVersion)
-  {
-    $this->matchVersion = $matchVersion;
-  }
-  public function getMatchVersion()
-  {
-    return $this->matchVersion;
-  }
-  public function setParticipants($participants)
-  {
-    $this->participants = $participants;
-  }
-  public function getParticipants()
-  {
-    return $this->participants;
-  }
-  public function setPendingParticipantId($pendingParticipantId)
-  {
-    $this->pendingParticipantId = $pendingParticipantId;
-  }
-  public function getPendingParticipantId()
-  {
-    return $this->pendingParticipantId;
-  }
-  public function setPreviousMatchData(Google_Service_Games_TurnBasedMatchData $previousMatchData)
-  {
-    $this->previousMatchData = $previousMatchData;
-  }
-  public function getPreviousMatchData()
-  {
-    return $this->previousMatchData;
-  }
-  public function setRematchId($rematchId)
-  {
-    $this->rematchId = $rematchId;
-  }
-  public function getRematchId()
-  {
-    return $this->rematchId;
-  }
-  public function setResults($results)
-  {
-    $this->results = $results;
-  }
-  public function getResults()
-  {
-    return $this->results;
-  }
-  public function setStatus($status)
-  {
-    $this->status = $status;
-  }
-  public function getStatus()
-  {
-    return $this->status;
-  }
-  public function setUserMatchStatus($userMatchStatus)
-  {
-    $this->userMatchStatus = $userMatchStatus;
-  }
-  public function getUserMatchStatus()
-  {
-    return $this->userMatchStatus;
-  }
-  public function setVariant($variant)
-  {
-    $this->variant = $variant;
-  }
-  public function getVariant()
-  {
-    return $this->variant;
-  }
-  public function setWithParticipantId($withParticipantId)
-  {
-    $this->withParticipantId = $withParticipantId;
-  }
-  public function getWithParticipantId()
-  {
-    return $this->withParticipantId;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Games/TurnBasedMatchCreateRequest.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Games/TurnBasedMatchCreateRequest.php
deleted file mode 100644
index 78b2f573..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Games/TurnBasedMatchCreateRequest.php
+++ /dev/null
@@ -1,68 +0,0 @@
-autoMatchingCriteria = $autoMatchingCriteria;
-  }
-  public function getAutoMatchingCriteria()
-  {
-    return $this->autoMatchingCriteria;
-  }
-  public function setInvitedPlayerIds($invitedPlayerIds)
-  {
-    $this->invitedPlayerIds = $invitedPlayerIds;
-  }
-  public function getInvitedPlayerIds()
-  {
-    return $this->invitedPlayerIds;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setRequestId($requestId)
-  {
-    $this->requestId = $requestId;
-  }
-  public function getRequestId()
-  {
-    return $this->requestId;
-  }
-  public function setVariant($variant)
-  {
-    $this->variant = $variant;
-  }
-  public function getVariant()
-  {
-    return $this->variant;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Games/TurnBasedMatchData.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Games/TurnBasedMatchData.php
deleted file mode 100644
index 862fcdf3..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Games/TurnBasedMatchData.php
+++ /dev/null
@@ -1,48 +0,0 @@
-data = $data;
-  }
-  public function getData()
-  {
-    return $this->data;
-  }
-  public function setDataAvailable($dataAvailable)
-  {
-    $this->dataAvailable = $dataAvailable;
-  }
-  public function getDataAvailable()
-  {
-    return $this->dataAvailable;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Games/TurnBasedMatchDataRequest.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Games/TurnBasedMatchDataRequest.php
deleted file mode 100644
index 2d814062..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Games/TurnBasedMatchDataRequest.php
+++ /dev/null
@@ -1,39 +0,0 @@
-data = $data;
-  }
-  public function getData()
-  {
-    return $this->data;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Games/TurnBasedMatchList.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Games/TurnBasedMatchList.php
deleted file mode 100644
index cbfa1dc1..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Games/TurnBasedMatchList.php
+++ /dev/null
@@ -1,50 +0,0 @@
-items = $items;
-  }
-  public function getItems()
-  {
-    return $this->items;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setNextPageToken($nextPageToken)
-  {
-    $this->nextPageToken = $nextPageToken;
-  }
-  public function getNextPageToken()
-  {
-    return $this->nextPageToken;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Games/TurnBasedMatchModification.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Games/TurnBasedMatchModification.php
deleted file mode 100644
index 91dcea69..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Games/TurnBasedMatchModification.php
+++ /dev/null
@@ -1,48 +0,0 @@
-kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setModifiedTimestampMillis($modifiedTimestampMillis)
-  {
-    $this->modifiedTimestampMillis = $modifiedTimestampMillis;
-  }
-  public function getModifiedTimestampMillis()
-  {
-    return $this->modifiedTimestampMillis;
-  }
-  public function setParticipantId($participantId)
-  {
-    $this->participantId = $participantId;
-  }
-  public function getParticipantId()
-  {
-    return $this->participantId;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Games/TurnBasedMatchParticipant.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Games/TurnBasedMatchParticipant.php
deleted file mode 100644
index 4bd859aa..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Games/TurnBasedMatchParticipant.php
+++ /dev/null
@@ -1,77 +0,0 @@
-autoMatched = $autoMatched;
-  }
-  public function getAutoMatched()
-  {
-    return $this->autoMatched;
-  }
-  public function setAutoMatchedPlayer(Google_Service_Games_AnonymousPlayer $autoMatchedPlayer)
-  {
-    $this->autoMatchedPlayer = $autoMatchedPlayer;
-  }
-  public function getAutoMatchedPlayer()
-  {
-    return $this->autoMatchedPlayer;
-  }
-  public function setId($id)
-  {
-    $this->id = $id;
-  }
-  public function getId()
-  {
-    return $this->id;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setPlayer(Google_Service_Games_Player $player)
-  {
-    $this->player = $player;
-  }
-  public function getPlayer()
-  {
-    return $this->player;
-  }
-  public function setStatus($status)
-  {
-    $this->status = $status;
-  }
-  public function getStatus()
-  {
-    return $this->status;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Games/TurnBasedMatchRematch.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Games/TurnBasedMatchRematch.php
deleted file mode 100644
index bae80ea7..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Games/TurnBasedMatchRematch.php
+++ /dev/null
@@ -1,50 +0,0 @@
-kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setPreviousMatch(Google_Service_Games_TurnBasedMatch $previousMatch)
-  {
-    $this->previousMatch = $previousMatch;
-  }
-  public function getPreviousMatch()
-  {
-    return $this->previousMatch;
-  }
-  public function setRematch(Google_Service_Games_TurnBasedMatch $rematch)
-  {
-    $this->rematch = $rematch;
-  }
-  public function getRematch()
-  {
-    return $this->rematch;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Games/TurnBasedMatchResults.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Games/TurnBasedMatchResults.php
deleted file mode 100644
index bc497bdd..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Games/TurnBasedMatchResults.php
+++ /dev/null
@@ -1,60 +0,0 @@
-data = $data;
-  }
-  public function getData()
-  {
-    return $this->data;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setMatchVersion($matchVersion)
-  {
-    $this->matchVersion = $matchVersion;
-  }
-  public function getMatchVersion()
-  {
-    return $this->matchVersion;
-  }
-  public function setResults($results)
-  {
-    $this->results = $results;
-  }
-  public function getResults()
-  {
-    return $this->results;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Games/TurnBasedMatchSync.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Games/TurnBasedMatchSync.php
deleted file mode 100644
index 466e036a..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Games/TurnBasedMatchSync.php
+++ /dev/null
@@ -1,59 +0,0 @@
-items = $items;
-  }
-  public function getItems()
-  {
-    return $this->items;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setMoreAvailable($moreAvailable)
-  {
-    $this->moreAvailable = $moreAvailable;
-  }
-  public function getMoreAvailable()
-  {
-    return $this->moreAvailable;
-  }
-  public function setNextPageToken($nextPageToken)
-  {
-    $this->nextPageToken = $nextPageToken;
-  }
-  public function getNextPageToken()
-  {
-    return $this->nextPageToken;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Games/TurnBasedMatchTurn.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Games/TurnBasedMatchTurn.php
deleted file mode 100644
index fcc0f31a..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Games/TurnBasedMatchTurn.php
+++ /dev/null
@@ -1,69 +0,0 @@
-data = $data;
-  }
-  public function getData()
-  {
-    return $this->data;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setMatchVersion($matchVersion)
-  {
-    $this->matchVersion = $matchVersion;
-  }
-  public function getMatchVersion()
-  {
-    return $this->matchVersion;
-  }
-  public function setPendingParticipantId($pendingParticipantId)
-  {
-    $this->pendingParticipantId = $pendingParticipantId;
-  }
-  public function getPendingParticipantId()
-  {
-    return $this->pendingParticipantId;
-  }
-  public function setResults($results)
-  {
-    $this->results = $results;
-  }
-  public function getResults()
-  {
-    return $this->results;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/GamesConfiguration.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/GamesConfiguration.php
deleted file mode 100644
index 178aac3a..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/GamesConfiguration.php
+++ /dev/null
@@ -1,236 +0,0 @@
-
- * The Publishing API for Google Play Game Services.

- *
- * 

- * For more information about this service, see the API
- * Documentation
- * 

- *
- * @author Google, Inc.
- */
-class Google_Service_GamesConfiguration extends Google_Service
-{
-  /** View and manage your Google Play Developer account. */
-  const ANDROIDPUBLISHER =
-      "https://www.googleapis.com/auth/androidpublisher";
-
-  public $achievementConfigurations;
-  public $imageConfigurations;
-  public $leaderboardConfigurations;
-  
-  /**
-   * Constructs the internal representation of the GamesConfiguration service.
-   *
-   * @param Google_Client $client
-   */
-  public function __construct(Google_Client $client)
-  {
-    parent::__construct($client);
-    $this->rootUrl = 'https://www.googleapis.com/';
-    $this->servicePath = 'games/v1configuration/';
-    $this->version = 'v1configuration';
-    $this->serviceName = 'gamesConfiguration';
-
-    $this->achievementConfigurations = new Google_Service_GamesConfiguration_Resource_AchievementConfigurations(
-        $this,
-        $this->serviceName,
-        'achievementConfigurations',
-        array(
-          'methods' => array(
-            'delete' => array(
-              'path' => 'achievements/{achievementId}',
-              'httpMethod' => 'DELETE',
-              'parameters' => array(
-                'achievementId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'get' => array(
-              'path' => 'achievements/{achievementId}',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'achievementId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'insert' => array(
-              'path' => 'applications/{applicationId}/achievements',
-              'httpMethod' => 'POST',
-              'parameters' => array(
-                'applicationId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'list' => array(
-              'path' => 'applications/{applicationId}/achievements',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'applicationId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'maxResults' => array(
-                  'location' => 'query',
-                  'type' => 'integer',
-                ),
-                'pageToken' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-              ),
-            ),'patch' => array(
-              'path' => 'achievements/{achievementId}',
-              'httpMethod' => 'PATCH',
-              'parameters' => array(
-                'achievementId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'update' => array(
-              'path' => 'achievements/{achievementId}',
-              'httpMethod' => 'PUT',
-              'parameters' => array(
-                'achievementId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),
-          )
-        )
-    );
-    $this->imageConfigurations = new Google_Service_GamesConfiguration_Resource_ImageConfigurations(
-        $this,
-        $this->serviceName,
-        'imageConfigurations',
-        array(
-          'methods' => array(
-            'upload' => array(
-              'path' => 'images/{resourceId}/imageType/{imageType}',
-              'httpMethod' => 'POST',
-              'parameters' => array(
-                'resourceId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'imageType' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),
-          )
-        )
-    );
-    $this->leaderboardConfigurations = new Google_Service_GamesConfiguration_Resource_LeaderboardConfigurations(
-        $this,
-        $this->serviceName,
-        'leaderboardConfigurations',
-        array(
-          'methods' => array(
-            'delete' => array(
-              'path' => 'leaderboards/{leaderboardId}',
-              'httpMethod' => 'DELETE',
-              'parameters' => array(
-                'leaderboardId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'get' => array(
-              'path' => 'leaderboards/{leaderboardId}',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'leaderboardId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'insert' => array(
-              'path' => 'applications/{applicationId}/leaderboards',
-              'httpMethod' => 'POST',
-              'parameters' => array(
-                'applicationId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'list' => array(
-              'path' => 'applications/{applicationId}/leaderboards',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'applicationId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'maxResults' => array(
-                  'location' => 'query',
-                  'type' => 'integer',
-                ),
-                'pageToken' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-              ),
-            ),'patch' => array(
-              'path' => 'leaderboards/{leaderboardId}',
-              'httpMethod' => 'PATCH',
-              'parameters' => array(
-                'leaderboardId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'update' => array(
-              'path' => 'leaderboards/{leaderboardId}',
-              'httpMethod' => 'PUT',
-              'parameters' => array(
-                'leaderboardId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),
-          )
-        )
-    );
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/GamesConfiguration/AchievementConfiguration.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/GamesConfiguration/AchievementConfiguration.php
deleted file mode 100644
index 4c5fb6b7..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/GamesConfiguration/AchievementConfiguration.php
+++ /dev/null
@@ -1,95 +0,0 @@
-achievementType = $achievementType;
-  }
-  public function getAchievementType()
-  {
-    return $this->achievementType;
-  }
-  public function setDraft(Google_Service_GamesConfiguration_AchievementConfigurationDetail $draft)
-  {
-    $this->draft = $draft;
-  }
-  public function getDraft()
-  {
-    return $this->draft;
-  }
-  public function setId($id)
-  {
-    $this->id = $id;
-  }
-  public function getId()
-  {
-    return $this->id;
-  }
-  public function setInitialState($initialState)
-  {
-    $this->initialState = $initialState;
-  }
-  public function getInitialState()
-  {
-    return $this->initialState;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setPublished(Google_Service_GamesConfiguration_AchievementConfigurationDetail $published)
-  {
-    $this->published = $published;
-  }
-  public function getPublished()
-  {
-    return $this->published;
-  }
-  public function setStepsToUnlock($stepsToUnlock)
-  {
-    $this->stepsToUnlock = $stepsToUnlock;
-  }
-  public function getStepsToUnlock()
-  {
-    return $this->stepsToUnlock;
-  }
-  public function setToken($token)
-  {
-    $this->token = $token;
-  }
-  public function getToken()
-  {
-    return $this->token;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/GamesConfiguration/AchievementConfigurationDetail.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/GamesConfiguration/AchievementConfigurationDetail.php
deleted file mode 100644
index ef8e09ae..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/GamesConfiguration/AchievementConfigurationDetail.php
+++ /dev/null
@@ -1,77 +0,0 @@
-description = $description;
-  }
-  public function getDescription()
-  {
-    return $this->description;
-  }
-  public function setIconUrl($iconUrl)
-  {
-    $this->iconUrl = $iconUrl;
-  }
-  public function getIconUrl()
-  {
-    return $this->iconUrl;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setName(Google_Service_GamesConfiguration_LocalizedStringBundle $name)
-  {
-    $this->name = $name;
-  }
-  public function getName()
-  {
-    return $this->name;
-  }
-  public function setPointValue($pointValue)
-  {
-    $this->pointValue = $pointValue;
-  }
-  public function getPointValue()
-  {
-    return $this->pointValue;
-  }
-  public function setSortRank($sortRank)
-  {
-    $this->sortRank = $sortRank;
-  }
-  public function getSortRank()
-  {
-    return $this->sortRank;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/GamesConfiguration/AchievementConfigurationListResponse.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/GamesConfiguration/AchievementConfigurationListResponse.php
deleted file mode 100644
index 75c92b97..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/GamesConfiguration/AchievementConfigurationListResponse.php
+++ /dev/null
@@ -1,50 +0,0 @@
-items = $items;
-  }
-  public function getItems()
-  {
-    return $this->items;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setNextPageToken($nextPageToken)
-  {
-    $this->nextPageToken = $nextPageToken;
-  }
-  public function getNextPageToken()
-  {
-    return $this->nextPageToken;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/GamesConfiguration/GamesNumberAffixConfiguration.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/GamesConfiguration/GamesNumberAffixConfiguration.php
deleted file mode 100644
index 8612a82f..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/GamesConfiguration/GamesNumberAffixConfiguration.php
+++ /dev/null
@@ -1,81 +0,0 @@
-few = $few;
-  }
-  public function getFew()
-  {
-    return $this->few;
-  }
-  public function setMany(Google_Service_GamesConfiguration_LocalizedStringBundle $many)
-  {
-    $this->many = $many;
-  }
-  public function getMany()
-  {
-    return $this->many;
-  }
-  public function setOne(Google_Service_GamesConfiguration_LocalizedStringBundle $one)
-  {
-    $this->one = $one;
-  }
-  public function getOne()
-  {
-    return $this->one;
-  }
-  public function setOther(Google_Service_GamesConfiguration_LocalizedStringBundle $other)
-  {
-    $this->other = $other;
-  }
-  public function getOther()
-  {
-    return $this->other;
-  }
-  public function setTwo(Google_Service_GamesConfiguration_LocalizedStringBundle $two)
-  {
-    $this->two = $two;
-  }
-  public function getTwo()
-  {
-    return $this->two;
-  }
-  public function setZero(Google_Service_GamesConfiguration_LocalizedStringBundle $zero)
-  {
-    $this->zero = $zero;
-  }
-  public function getZero()
-  {
-    return $this->zero;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/GamesConfiguration/GamesNumberFormatConfiguration.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/GamesConfiguration/GamesNumberFormatConfiguration.php
deleted file mode 100644
index fc047dec..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/GamesConfiguration/GamesNumberFormatConfiguration.php
+++ /dev/null
@@ -1,58 +0,0 @@
-currencyCode = $currencyCode;
-  }
-  public function getCurrencyCode()
-  {
-    return $this->currencyCode;
-  }
-  public function setNumDecimalPlaces($numDecimalPlaces)
-  {
-    $this->numDecimalPlaces = $numDecimalPlaces;
-  }
-  public function getNumDecimalPlaces()
-  {
-    return $this->numDecimalPlaces;
-  }
-  public function setNumberFormatType($numberFormatType)
-  {
-    $this->numberFormatType = $numberFormatType;
-  }
-  public function getNumberFormatType()
-  {
-    return $this->numberFormatType;
-  }
-  public function setSuffix(Google_Service_GamesConfiguration_GamesNumberAffixConfiguration $suffix)
-  {
-    $this->suffix = $suffix;
-  }
-  public function getSuffix()
-  {
-    return $this->suffix;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/GamesConfiguration/ImageConfiguration.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/GamesConfiguration/ImageConfiguration.php
deleted file mode 100644
index f2c7a72b..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/GamesConfiguration/ImageConfiguration.php
+++ /dev/null
@@ -1,57 +0,0 @@
-imageType = $imageType;
-  }
-  public function getImageType()
-  {
-    return $this->imageType;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setResourceId($resourceId)
-  {
-    $this->resourceId = $resourceId;
-  }
-  public function getResourceId()
-  {
-    return $this->resourceId;
-  }
-  public function setUrl($url)
-  {
-    $this->url = $url;
-  }
-  public function getUrl()
-  {
-    return $this->url;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/GamesConfiguration/LeaderboardConfiguration.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/GamesConfiguration/LeaderboardConfiguration.php
deleted file mode 100644
index 92a465d4..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/GamesConfiguration/LeaderboardConfiguration.php
+++ /dev/null
@@ -1,95 +0,0 @@
-draft = $draft;
-  }
-  public function getDraft()
-  {
-    return $this->draft;
-  }
-  public function setId($id)
-  {
-    $this->id = $id;
-  }
-  public function getId()
-  {
-    return $this->id;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setPublished(Google_Service_GamesConfiguration_LeaderboardConfigurationDetail $published)
-  {
-    $this->published = $published;
-  }
-  public function getPublished()
-  {
-    return $this->published;
-  }
-  public function setScoreMax($scoreMax)
-  {
-    $this->scoreMax = $scoreMax;
-  }
-  public function getScoreMax()
-  {
-    return $this->scoreMax;
-  }
-  public function setScoreMin($scoreMin)
-  {
-    $this->scoreMin = $scoreMin;
-  }
-  public function getScoreMin()
-  {
-    return $this->scoreMin;
-  }
-  public function setScoreOrder($scoreOrder)
-  {
-    $this->scoreOrder = $scoreOrder;
-  }
-  public function getScoreOrder()
-  {
-    return $this->scoreOrder;
-  }
-  public function setToken($token)
-  {
-    $this->token = $token;
-  }
-  public function getToken()
-  {
-    return $this->token;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/GamesConfiguration/LeaderboardConfigurationDetail.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/GamesConfiguration/LeaderboardConfigurationDetail.php
deleted file mode 100644
index 461aa34c..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/GamesConfiguration/LeaderboardConfigurationDetail.php
+++ /dev/null
@@ -1,68 +0,0 @@
-iconUrl = $iconUrl;
-  }
-  public function getIconUrl()
-  {
-    return $this->iconUrl;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setName(Google_Service_GamesConfiguration_LocalizedStringBundle $name)
-  {
-    $this->name = $name;
-  }
-  public function getName()
-  {
-    return $this->name;
-  }
-  public function setScoreFormat(Google_Service_GamesConfiguration_GamesNumberFormatConfiguration $scoreFormat)
-  {
-    $this->scoreFormat = $scoreFormat;
-  }
-  public function getScoreFormat()
-  {
-    return $this->scoreFormat;
-  }
-  public function setSortRank($sortRank)
-  {
-    $this->sortRank = $sortRank;
-  }
-  public function getSortRank()
-  {
-    return $this->sortRank;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/GamesConfiguration/LeaderboardConfigurationListResponse.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/GamesConfiguration/LeaderboardConfigurationListResponse.php
deleted file mode 100644
index 80f84741..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/GamesConfiguration/LeaderboardConfigurationListResponse.php
+++ /dev/null
@@ -1,50 +0,0 @@
-items = $items;
-  }
-  public function getItems()
-  {
-    return $this->items;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setNextPageToken($nextPageToken)
-  {
-    $this->nextPageToken = $nextPageToken;
-  }
-  public function getNextPageToken()
-  {
-    return $this->nextPageToken;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/GamesConfiguration/LocalizedString.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/GamesConfiguration/LocalizedString.php
deleted file mode 100644
index dae44eda..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/GamesConfiguration/LocalizedString.php
+++ /dev/null
@@ -1,48 +0,0 @@
-kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setLocale($locale)
-  {
-    $this->locale = $locale;
-  }
-  public function getLocale()
-  {
-    return $this->locale;
-  }
-  public function setValue($value)
-  {
-    $this->value = $value;
-  }
-  public function getValue()
-  {
-    return $this->value;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/GamesConfiguration/LocalizedStringBundle.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/GamesConfiguration/LocalizedStringBundle.php
deleted file mode 100644
index 25f5999e..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/GamesConfiguration/LocalizedStringBundle.php
+++ /dev/null
@@ -1,41 +0,0 @@
-kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setTranslations($translations)
-  {
-    $this->translations = $translations;
-  }
-  public function getTranslations()
-  {
-    return $this->translations;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/GamesConfiguration/Resource/AchievementConfigurations.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/GamesConfiguration/Resource/AchievementConfigurations.php
deleted file mode 100644
index 636dede6..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/GamesConfiguration/Resource/AchievementConfigurations.php
+++ /dev/null
@@ -1,121 +0,0 @@
-
- *   $gamesConfigurationService = new Google_Service_GamesConfiguration(...);
- *   $achievementConfigurations = $gamesConfigurationService->achievementConfigurations;
- *  
- */
-class Google_Service_GamesConfiguration_Resource_AchievementConfigurations extends Google_Service_Resource
-{
-  /**
-   * Delete the achievement configuration with the given ID.
-   * (achievementConfigurations.delete)
-   *
-   * @param string $achievementId The ID of the achievement used by this method.
-   * @param array $optParams Optional parameters.
-   */
-  public function delete($achievementId, $optParams = array())
-  {
-    $params = array('achievementId' => $achievementId);
-    $params = array_merge($params, $optParams);
-    return $this->call('delete', array($params));
-  }
-  /**
-   * Retrieves the metadata of the achievement configuration with the given ID.
-   * (achievementConfigurations.get)
-   *
-   * @param string $achievementId The ID of the achievement used by this method.
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_GamesConfiguration_AchievementConfiguration
-   */
-  public function get($achievementId, $optParams = array())
-  {
-    $params = array('achievementId' => $achievementId);
-    $params = array_merge($params, $optParams);
-    return $this->call('get', array($params), "Google_Service_GamesConfiguration_AchievementConfiguration");
-  }
-  /**
-   * Insert a new achievement configuration in this application.
-   * (achievementConfigurations.insert)
-   *
-   * @param string $applicationId The application ID from the Google Play
-   * developer console.
-   * @param Google_Service_GamesConfiguration_AchievementConfiguration $postBody
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_GamesConfiguration_AchievementConfiguration
-   */
-  public function insert($applicationId, Google_Service_GamesConfiguration_AchievementConfiguration $postBody, $optParams = array())
-  {
-    $params = array('applicationId' => $applicationId, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('insert', array($params), "Google_Service_GamesConfiguration_AchievementConfiguration");
-  }
-  /**
-   * Returns a list of the achievement configurations in this application.
-   * (achievementConfigurations.listAchievementConfigurations)
-   *
-   * @param string $applicationId The application ID from the Google Play
-   * developer console.
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param int maxResults The maximum number of resource configurations to
-   * return in the response, used for paging. For any response, the actual number
-   * of resources returned may be less than the specified maxResults.
-   * @opt_param string pageToken The token returned by the previous request.
-   * @return Google_Service_GamesConfiguration_AchievementConfigurationListResponse
-   */
-  public function listAchievementConfigurations($applicationId, $optParams = array())
-  {
-    $params = array('applicationId' => $applicationId);
-    $params = array_merge($params, $optParams);
-    return $this->call('list', array($params), "Google_Service_GamesConfiguration_AchievementConfigurationListResponse");
-  }
-  /**
-   * Update the metadata of the achievement configuration with the given ID. This
-   * method supports patch semantics. (achievementConfigurations.patch)
-   *
-   * @param string $achievementId The ID of the achievement used by this method.
-   * @param Google_Service_GamesConfiguration_AchievementConfiguration $postBody
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_GamesConfiguration_AchievementConfiguration
-   */
-  public function patch($achievementId, Google_Service_GamesConfiguration_AchievementConfiguration $postBody, $optParams = array())
-  {
-    $params = array('achievementId' => $achievementId, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('patch', array($params), "Google_Service_GamesConfiguration_AchievementConfiguration");
-  }
-  /**
-   * Update the metadata of the achievement configuration with the given ID.
-   * (achievementConfigurations.update)
-   *
-   * @param string $achievementId The ID of the achievement used by this method.
-   * @param Google_Service_GamesConfiguration_AchievementConfiguration $postBody
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_GamesConfiguration_AchievementConfiguration
-   */
-  public function update($achievementId, Google_Service_GamesConfiguration_AchievementConfiguration $postBody, $optParams = array())
-  {
-    $params = array('achievementId' => $achievementId, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('update', array($params), "Google_Service_GamesConfiguration_AchievementConfiguration");
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/GamesConfiguration/Resource/ImageConfigurations.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/GamesConfiguration/Resource/ImageConfigurations.php
deleted file mode 100644
index 832febab..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/GamesConfiguration/Resource/ImageConfigurations.php
+++ /dev/null
@@ -1,43 +0,0 @@
-
- *   $gamesConfigurationService = new Google_Service_GamesConfiguration(...);
- *   $imageConfigurations = $gamesConfigurationService->imageConfigurations;
- *  
- */
-class Google_Service_GamesConfiguration_Resource_ImageConfigurations extends Google_Service_Resource
-{
-  /**
-   * Uploads an image for a resource with the given ID and image type.
-   * (imageConfigurations.upload)
-   *
-   * @param string $resourceId The ID of the resource used by this method.
-   * @param string $imageType Selects which image in a resource for this method.
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_GamesConfiguration_ImageConfiguration
-   */
-  public function upload($resourceId, $imageType, $optParams = array())
-  {
-    $params = array('resourceId' => $resourceId, 'imageType' => $imageType);
-    $params = array_merge($params, $optParams);
-    return $this->call('upload', array($params), "Google_Service_GamesConfiguration_ImageConfiguration");
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/GamesConfiguration/Resource/LeaderboardConfigurations.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/GamesConfiguration/Resource/LeaderboardConfigurations.php
deleted file mode 100644
index 469f653e..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/GamesConfiguration/Resource/LeaderboardConfigurations.php
+++ /dev/null
@@ -1,121 +0,0 @@
-
- *   $gamesConfigurationService = new Google_Service_GamesConfiguration(...);
- *   $leaderboardConfigurations = $gamesConfigurationService->leaderboardConfigurations;
- *  
- */
-class Google_Service_GamesConfiguration_Resource_LeaderboardConfigurations extends Google_Service_Resource
-{
-  /**
-   * Delete the leaderboard configuration with the given ID.
-   * (leaderboardConfigurations.delete)
-   *
-   * @param string $leaderboardId The ID of the leaderboard.
-   * @param array $optParams Optional parameters.
-   */
-  public function delete($leaderboardId, $optParams = array())
-  {
-    $params = array('leaderboardId' => $leaderboardId);
-    $params = array_merge($params, $optParams);
-    return $this->call('delete', array($params));
-  }
-  /**
-   * Retrieves the metadata of the leaderboard configuration with the given ID.
-   * (leaderboardConfigurations.get)
-   *
-   * @param string $leaderboardId The ID of the leaderboard.
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_GamesConfiguration_LeaderboardConfiguration
-   */
-  public function get($leaderboardId, $optParams = array())
-  {
-    $params = array('leaderboardId' => $leaderboardId);
-    $params = array_merge($params, $optParams);
-    return $this->call('get', array($params), "Google_Service_GamesConfiguration_LeaderboardConfiguration");
-  }
-  /**
-   * Insert a new leaderboard configuration in this application.
-   * (leaderboardConfigurations.insert)
-   *
-   * @param string $applicationId The application ID from the Google Play
-   * developer console.
-   * @param Google_Service_GamesConfiguration_LeaderboardConfiguration $postBody
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_GamesConfiguration_LeaderboardConfiguration
-   */
-  public function insert($applicationId, Google_Service_GamesConfiguration_LeaderboardConfiguration $postBody, $optParams = array())
-  {
-    $params = array('applicationId' => $applicationId, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('insert', array($params), "Google_Service_GamesConfiguration_LeaderboardConfiguration");
-  }
-  /**
-   * Returns a list of the leaderboard configurations in this application.
-   * (leaderboardConfigurations.listLeaderboardConfigurations)
-   *
-   * @param string $applicationId The application ID from the Google Play
-   * developer console.
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param int maxResults The maximum number of resource configurations to
-   * return in the response, used for paging. For any response, the actual number
-   * of resources returned may be less than the specified maxResults.
-   * @opt_param string pageToken The token returned by the previous request.
-   * @return Google_Service_GamesConfiguration_LeaderboardConfigurationListResponse
-   */
-  public function listLeaderboardConfigurations($applicationId, $optParams = array())
-  {
-    $params = array('applicationId' => $applicationId);
-    $params = array_merge($params, $optParams);
-    return $this->call('list', array($params), "Google_Service_GamesConfiguration_LeaderboardConfigurationListResponse");
-  }
-  /**
-   * Update the metadata of the leaderboard configuration with the given ID. This
-   * method supports patch semantics. (leaderboardConfigurations.patch)
-   *
-   * @param string $leaderboardId The ID of the leaderboard.
-   * @param Google_Service_GamesConfiguration_LeaderboardConfiguration $postBody
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_GamesConfiguration_LeaderboardConfiguration
-   */
-  public function patch($leaderboardId, Google_Service_GamesConfiguration_LeaderboardConfiguration $postBody, $optParams = array())
-  {
-    $params = array('leaderboardId' => $leaderboardId, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('patch', array($params), "Google_Service_GamesConfiguration_LeaderboardConfiguration");
-  }
-  /**
-   * Update the metadata of the leaderboard configuration with the given ID.
-   * (leaderboardConfigurations.update)
-   *
-   * @param string $leaderboardId The ID of the leaderboard.
-   * @param Google_Service_GamesConfiguration_LeaderboardConfiguration $postBody
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_GamesConfiguration_LeaderboardConfiguration
-   */
-  public function update($leaderboardId, Google_Service_GamesConfiguration_LeaderboardConfiguration $postBody, $optParams = array())
-  {
-    $params = array('leaderboardId' => $leaderboardId, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('update', array($params), "Google_Service_GamesConfiguration_LeaderboardConfiguration");
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/GamesManagement.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/GamesManagement.php
deleted file mode 100644
index 404fe207..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/GamesManagement.php
+++ /dev/null
@@ -1,335 +0,0 @@
-
- * The Management API for Google Play Game Services.

- *
- * 

- * For more information about this service, see the API
- * Documentation
- * 

- *
- * @author Google, Inc.
- */
-class Google_Service_GamesManagement extends Google_Service
-{
-  /** Share your Google+ profile information and view and manage your game activity. */
-  const GAMES =
-      "https://www.googleapis.com/auth/games";
-  /** Know the list of people in your circles, your age range, and language. */
-  const PLUS_LOGIN =
-      "https://www.googleapis.com/auth/plus.login";
-
-  public $achievements;
-  public $applications;
-  public $events;
-  public $players;
-  public $quests;
-  public $rooms;
-  public $scores;
-  public $turnBasedMatches;
-  
-  /**
-   * Constructs the internal representation of the GamesManagement service.
-   *
-   * @param Google_Client $client
-   */
-  public function __construct(Google_Client $client)
-  {
-    parent::__construct($client);
-    $this->rootUrl = 'https://www.googleapis.com/';
-    $this->servicePath = 'games/v1management/';
-    $this->version = 'v1management';
-    $this->serviceName = 'gamesManagement';
-
-    $this->achievements = new Google_Service_GamesManagement_Resource_Achievements(
-        $this,
-        $this->serviceName,
-        'achievements',
-        array(
-          'methods' => array(
-            'reset' => array(
-              'path' => 'achievements/{achievementId}/reset',
-              'httpMethod' => 'POST',
-              'parameters' => array(
-                'achievementId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'resetAll' => array(
-              'path' => 'achievements/reset',
-              'httpMethod' => 'POST',
-              'parameters' => array(),
-            ),'resetAllForAllPlayers' => array(
-              'path' => 'achievements/resetAllForAllPlayers',
-              'httpMethod' => 'POST',
-              'parameters' => array(),
-            ),'resetForAllPlayers' => array(
-              'path' => 'achievements/{achievementId}/resetForAllPlayers',
-              'httpMethod' => 'POST',
-              'parameters' => array(
-                'achievementId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'resetMultipleForAllPlayers' => array(
-              'path' => 'achievements/resetMultipleForAllPlayers',
-              'httpMethod' => 'POST',
-              'parameters' => array(),
-            ),
-          )
-        )
-    );
-    $this->applications = new Google_Service_GamesManagement_Resource_Applications(
-        $this,
-        $this->serviceName,
-        'applications',
-        array(
-          'methods' => array(
-            'listHidden' => array(
-              'path' => 'applications/{applicationId}/players/hidden',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'applicationId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'maxResults' => array(
-                  'location' => 'query',
-                  'type' => 'integer',
-                ),
-                'pageToken' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-              ),
-            ),
-          )
-        )
-    );
-    $this->events = new Google_Service_GamesManagement_Resource_Events(
-        $this,
-        $this->serviceName,
-        'events',
-        array(
-          'methods' => array(
-            'reset' => array(
-              'path' => 'events/{eventId}/reset',
-              'httpMethod' => 'POST',
-              'parameters' => array(
-                'eventId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'resetAll' => array(
-              'path' => 'events/reset',
-              'httpMethod' => 'POST',
-              'parameters' => array(),
-            ),'resetAllForAllPlayers' => array(
-              'path' => 'events/resetAllForAllPlayers',
-              'httpMethod' => 'POST',
-              'parameters' => array(),
-            ),'resetForAllPlayers' => array(
-              'path' => 'events/{eventId}/resetForAllPlayers',
-              'httpMethod' => 'POST',
-              'parameters' => array(
-                'eventId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'resetMultipleForAllPlayers' => array(
-              'path' => 'events/resetMultipleForAllPlayers',
-              'httpMethod' => 'POST',
-              'parameters' => array(),
-            ),
-          )
-        )
-    );
-    $this->players = new Google_Service_GamesManagement_Resource_Players(
-        $this,
-        $this->serviceName,
-        'players',
-        array(
-          'methods' => array(
-            'hide' => array(
-              'path' => 'applications/{applicationId}/players/hidden/{playerId}',
-              'httpMethod' => 'POST',
-              'parameters' => array(
-                'applicationId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'playerId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'unhide' => array(
-              'path' => 'applications/{applicationId}/players/hidden/{playerId}',
-              'httpMethod' => 'DELETE',
-              'parameters' => array(
-                'applicationId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'playerId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),
-          )
-        )
-    );
-    $this->quests = new Google_Service_GamesManagement_Resource_Quests(
-        $this,
-        $this->serviceName,
-        'quests',
-        array(
-          'methods' => array(
-            'reset' => array(
-              'path' => 'quests/{questId}/reset',
-              'httpMethod' => 'POST',
-              'parameters' => array(
-                'questId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'resetAll' => array(
-              'path' => 'quests/reset',
-              'httpMethod' => 'POST',
-              'parameters' => array(),
-            ),'resetAllForAllPlayers' => array(
-              'path' => 'quests/resetAllForAllPlayers',
-              'httpMethod' => 'POST',
-              'parameters' => array(),
-            ),'resetForAllPlayers' => array(
-              'path' => 'quests/{questId}/resetForAllPlayers',
-              'httpMethod' => 'POST',
-              'parameters' => array(
-                'questId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'resetMultipleForAllPlayers' => array(
-              'path' => 'quests/resetMultipleForAllPlayers',
-              'httpMethod' => 'POST',
-              'parameters' => array(),
-            ),
-          )
-        )
-    );
-    $this->rooms = new Google_Service_GamesManagement_Resource_Rooms(
-        $this,
-        $this->serviceName,
-        'rooms',
-        array(
-          'methods' => array(
-            'reset' => array(
-              'path' => 'rooms/reset',
-              'httpMethod' => 'POST',
-              'parameters' => array(),
-            ),'resetForAllPlayers' => array(
-              'path' => 'rooms/resetForAllPlayers',
-              'httpMethod' => 'POST',
-              'parameters' => array(),
-            ),
-          )
-        )
-    );
-    $this->scores = new Google_Service_GamesManagement_Resource_Scores(
-        $this,
-        $this->serviceName,
-        'scores',
-        array(
-          'methods' => array(
-            'reset' => array(
-              'path' => 'leaderboards/{leaderboardId}/scores/reset',
-              'httpMethod' => 'POST',
-              'parameters' => array(
-                'leaderboardId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'resetAll' => array(
-              'path' => 'scores/reset',
-              'httpMethod' => 'POST',
-              'parameters' => array(),
-            ),'resetAllForAllPlayers' => array(
-              'path' => 'scores/resetAllForAllPlayers',
-              'httpMethod' => 'POST',
-              'parameters' => array(),
-            ),'resetForAllPlayers' => array(
-              'path' => 'leaderboards/{leaderboardId}/scores/resetForAllPlayers',
-              'httpMethod' => 'POST',
-              'parameters' => array(
-                'leaderboardId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'resetMultipleForAllPlayers' => array(
-              'path' => 'scores/resetMultipleForAllPlayers',
-              'httpMethod' => 'POST',
-              'parameters' => array(),
-            ),
-          )
-        )
-    );
-    $this->turnBasedMatches = new Google_Service_GamesManagement_Resource_TurnBasedMatches(
-        $this,
-        $this->serviceName,
-        'turnBasedMatches',
-        array(
-          'methods' => array(
-            'reset' => array(
-              'path' => 'turnbasedmatches/reset',
-              'httpMethod' => 'POST',
-              'parameters' => array(),
-            ),'resetForAllPlayers' => array(
-              'path' => 'turnbasedmatches/resetForAllPlayers',
-              'httpMethod' => 'POST',
-              'parameters' => array(),
-            ),
-          )
-        )
-    );
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/GamesManagement/AchievementResetAllResponse.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/GamesManagement/AchievementResetAllResponse.php
deleted file mode 100644
index d40fa941..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/GamesManagement/AchievementResetAllResponse.php
+++ /dev/null
@@ -1,41 +0,0 @@
-kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setResults($results)
-  {
-    $this->results = $results;
-  }
-  public function getResults()
-  {
-    return $this->results;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/GamesManagement/AchievementResetMultipleForAllRequest.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/GamesManagement/AchievementResetMultipleForAllRequest.php
deleted file mode 100644
index a34e9d5d..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/GamesManagement/AchievementResetMultipleForAllRequest.php
+++ /dev/null
@@ -1,43 +0,0 @@
- "achievement_ids",
-  );
-  public $achievementIds;
-  public $kind;
-
-  public function setAchievementIds($achievementIds)
-  {
-    $this->achievementIds = $achievementIds;
-  }
-  public function getAchievementIds()
-  {
-    return $this->achievementIds;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/GamesManagement/AchievementResetResponse.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/GamesManagement/AchievementResetResponse.php
deleted file mode 100644
index 492d45bf..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/GamesManagement/AchievementResetResponse.php
+++ /dev/null
@@ -1,57 +0,0 @@
-currentState = $currentState;
-  }
-  public function getCurrentState()
-  {
-    return $this->currentState;
-  }
-  public function setDefinitionId($definitionId)
-  {
-    $this->definitionId = $definitionId;
-  }
-  public function getDefinitionId()
-  {
-    return $this->definitionId;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setUpdateOccurred($updateOccurred)
-  {
-    $this->updateOccurred = $updateOccurred;
-  }
-  public function getUpdateOccurred()
-  {
-    return $this->updateOccurred;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/GamesManagement/EventsResetMultipleForAllRequest.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/GamesManagement/EventsResetMultipleForAllRequest.php
deleted file mode 100644
index 77f7b8c9..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/GamesManagement/EventsResetMultipleForAllRequest.php
+++ /dev/null
@@ -1,43 +0,0 @@
- "event_ids",
-  );
-  public $eventIds;
-  public $kind;
-
-  public function setEventIds($eventIds)
-  {
-    $this->eventIds = $eventIds;
-  }
-  public function getEventIds()
-  {
-    return $this->eventIds;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/GamesManagement/GamesPlayedResource.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/GamesManagement/GamesPlayedResource.php
deleted file mode 100644
index f2fadb36..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/GamesManagement/GamesPlayedResource.php
+++ /dev/null
@@ -1,39 +0,0 @@
-autoMatched = $autoMatched;
-  }
-  public function getAutoMatched()
-  {
-    return $this->autoMatched;
-  }
-  public function setTimeMillis($timeMillis)
-  {
-    $this->timeMillis = $timeMillis;
-  }
-  public function getTimeMillis()
-  {
-    return $this->timeMillis;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/GamesManagement/GamesPlayerExperienceInfoResource.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/GamesManagement/GamesPlayerExperienceInfoResource.php
deleted file mode 100644
index 1f5f367f..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/GamesManagement/GamesPlayerExperienceInfoResource.php
+++ /dev/null
@@ -1,59 +0,0 @@
-currentExperiencePoints = $currentExperiencePoints;
-  }
-  public function getCurrentExperiencePoints()
-  {
-    return $this->currentExperiencePoints;
-  }
-  public function setCurrentLevel(Google_Service_GamesManagement_GamesPlayerLevelResource $currentLevel)
-  {
-    $this->currentLevel = $currentLevel;
-  }
-  public function getCurrentLevel()
-  {
-    return $this->currentLevel;
-  }
-  public function setLastLevelUpTimestampMillis($lastLevelUpTimestampMillis)
-  {
-    $this->lastLevelUpTimestampMillis = $lastLevelUpTimestampMillis;
-  }
-  public function getLastLevelUpTimestampMillis()
-  {
-    return $this->lastLevelUpTimestampMillis;
-  }
-  public function setNextLevel(Google_Service_GamesManagement_GamesPlayerLevelResource $nextLevel)
-  {
-    $this->nextLevel = $nextLevel;
-  }
-  public function getNextLevel()
-  {
-    return $this->nextLevel;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/GamesManagement/GamesPlayerLevelResource.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/GamesManagement/GamesPlayerLevelResource.php
deleted file mode 100644
index 418fffe1..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/GamesManagement/GamesPlayerLevelResource.php
+++ /dev/null
@@ -1,48 +0,0 @@
-level = $level;
-  }
-  public function getLevel()
-  {
-    return $this->level;
-  }
-  public function setMaxExperiencePoints($maxExperiencePoints)
-  {
-    $this->maxExperiencePoints = $maxExperiencePoints;
-  }
-  public function getMaxExperiencePoints()
-  {
-    return $this->maxExperiencePoints;
-  }
-  public function setMinExperiencePoints($minExperiencePoints)
-  {
-    $this->minExperiencePoints = $minExperiencePoints;
-  }
-  public function getMinExperiencePoints()
-  {
-    return $this->minExperiencePoints;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/GamesManagement/HiddenPlayer.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/GamesManagement/HiddenPlayer.php
deleted file mode 100644
index aeb11414..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/GamesManagement/HiddenPlayer.php
+++ /dev/null
@@ -1,49 +0,0 @@
-hiddenTimeMillis = $hiddenTimeMillis;
-  }
-  public function getHiddenTimeMillis()
-  {
-    return $this->hiddenTimeMillis;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setPlayer(Google_Service_GamesManagement_Player $player)
-  {
-    $this->player = $player;
-  }
-  public function getPlayer()
-  {
-    return $this->player;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/GamesManagement/HiddenPlayerList.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/GamesManagement/HiddenPlayerList.php
deleted file mode 100644
index f765dee9..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/GamesManagement/HiddenPlayerList.php
+++ /dev/null
@@ -1,50 +0,0 @@
-items = $items;
-  }
-  public function getItems()
-  {
-    return $this->items;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setNextPageToken($nextPageToken)
-  {
-    $this->nextPageToken = $nextPageToken;
-  }
-  public function getNextPageToken()
-  {
-    return $this->nextPageToken;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/GamesManagement/Player.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/GamesManagement/Player.php
deleted file mode 100644
index d05586b3..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/GamesManagement/Player.php
+++ /dev/null
@@ -1,133 +0,0 @@
-avatarImageUrl = $avatarImageUrl;
-  }
-  public function getAvatarImageUrl()
-  {
-    return $this->avatarImageUrl;
-  }
-  public function setBannerUrlLandscape($bannerUrlLandscape)
-  {
-    $this->bannerUrlLandscape = $bannerUrlLandscape;
-  }
-  public function getBannerUrlLandscape()
-  {
-    return $this->bannerUrlLandscape;
-  }
-  public function setBannerUrlPortrait($bannerUrlPortrait)
-  {
-    $this->bannerUrlPortrait = $bannerUrlPortrait;
-  }
-  public function getBannerUrlPortrait()
-  {
-    return $this->bannerUrlPortrait;
-  }
-  public function setDisplayName($displayName)
-  {
-    $this->displayName = $displayName;
-  }
-  public function getDisplayName()
-  {
-    return $this->displayName;
-  }
-  public function setExperienceInfo(Google_Service_GamesManagement_GamesPlayerExperienceInfoResource $experienceInfo)
-  {
-    $this->experienceInfo = $experienceInfo;
-  }
-  public function getExperienceInfo()
-  {
-    return $this->experienceInfo;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setLastPlayedWith(Google_Service_GamesManagement_GamesPlayedResource $lastPlayedWith)
-  {
-    $this->lastPlayedWith = $lastPlayedWith;
-  }
-  public function getLastPlayedWith()
-  {
-    return $this->lastPlayedWith;
-  }
-  public function setName(Google_Service_GamesManagement_PlayerName $name)
-  {
-    $this->name = $name;
-  }
-  public function getName()
-  {
-    return $this->name;
-  }
-  public function setOriginalPlayerId($originalPlayerId)
-  {
-    $this->originalPlayerId = $originalPlayerId;
-  }
-  public function getOriginalPlayerId()
-  {
-    return $this->originalPlayerId;
-  }
-  public function setPlayerId($playerId)
-  {
-    $this->playerId = $playerId;
-  }
-  public function getPlayerId()
-  {
-    return $this->playerId;
-  }
-  public function setProfileSettings(Google_Service_GamesManagement_ProfileSettings $profileSettings)
-  {
-    $this->profileSettings = $profileSettings;
-  }
-  public function getProfileSettings()
-  {
-    return $this->profileSettings;
-  }
-  public function setTitle($title)
-  {
-    $this->title = $title;
-  }
-  public function getTitle()
-  {
-    return $this->title;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/GamesManagement/PlayerName.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/GamesManagement/PlayerName.php
deleted file mode 100644
index b7dd909c..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/GamesManagement/PlayerName.php
+++ /dev/null
@@ -1,39 +0,0 @@
-familyName = $familyName;
-  }
-  public function getFamilyName()
-  {
-    return $this->familyName;
-  }
-  public function setGivenName($givenName)
-  {
-    $this->givenName = $givenName;
-  }
-  public function getGivenName()
-  {
-    return $this->givenName;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/GamesManagement/PlayerScoreResetAllResponse.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/GamesManagement/PlayerScoreResetAllResponse.php
deleted file mode 100644
index f99b68b3..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/GamesManagement/PlayerScoreResetAllResponse.php
+++ /dev/null
@@ -1,41 +0,0 @@
-kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setResults($results)
-  {
-    $this->results = $results;
-  }
-  public function getResults()
-  {
-    return $this->results;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/GamesManagement/PlayerScoreResetResponse.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/GamesManagement/PlayerScoreResetResponse.php
deleted file mode 100644
index 270b3f72..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/GamesManagement/PlayerScoreResetResponse.php
+++ /dev/null
@@ -1,49 +0,0 @@
-definitionId = $definitionId;
-  }
-  public function getDefinitionId()
-  {
-    return $this->definitionId;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setResetScoreTimeSpans($resetScoreTimeSpans)
-  {
-    $this->resetScoreTimeSpans = $resetScoreTimeSpans;
-  }
-  public function getResetScoreTimeSpans()
-  {
-    return $this->resetScoreTimeSpans;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/GamesManagement/ProfileSettings.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/GamesManagement/ProfileSettings.php
deleted file mode 100644
index 4cfa2f5c..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/GamesManagement/ProfileSettings.php
+++ /dev/null
@@ -1,39 +0,0 @@
-kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setProfileVisible($profileVisible)
-  {
-    $this->profileVisible = $profileVisible;
-  }
-  public function getProfileVisible()
-  {
-    return $this->profileVisible;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/GamesManagement/QuestsResetMultipleForAllRequest.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/GamesManagement/QuestsResetMultipleForAllRequest.php
deleted file mode 100644
index 6a4fa81f..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/GamesManagement/QuestsResetMultipleForAllRequest.php
+++ /dev/null
@@ -1,43 +0,0 @@
- "quest_ids",
-  );
-  public $kind;
-  public $questIds;
-
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setQuestIds($questIds)
-  {
-    $this->questIds = $questIds;
-  }
-  public function getQuestIds()
-  {
-    return $this->questIds;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/GamesManagement/Resource/Achievements.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/GamesManagement/Resource/Achievements.php
deleted file mode 100644
index 70ac90ee..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/GamesManagement/Resource/Achievements.php
+++ /dev/null
@@ -1,98 +0,0 @@
-
- *   $gamesManagementService = new Google_Service_GamesManagement(...);
- *   $achievements = $gamesManagementService->achievements;
- *  
- */
-class Google_Service_GamesManagement_Resource_Achievements extends Google_Service_Resource
-{
-  /**
-   * Resets the achievement with the given ID for the currently authenticated
-   * player. This method is only accessible to whitelisted tester accounts for
-   * your application. (achievements.reset)
-   *
-   * @param string $achievementId The ID of the achievement used by this method.
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_GamesManagement_AchievementResetResponse
-   */
-  public function reset($achievementId, $optParams = array())
-  {
-    $params = array('achievementId' => $achievementId);
-    $params = array_merge($params, $optParams);
-    return $this->call('reset', array($params), "Google_Service_GamesManagement_AchievementResetResponse");
-  }
-  /**
-   * Resets all achievements for the currently authenticated player for your
-   * application. This method is only accessible to whitelisted tester accounts
-   * for your application. (achievements.resetAll)
-   *
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_GamesManagement_AchievementResetAllResponse
-   */
-  public function resetAll($optParams = array())
-  {
-    $params = array();
-    $params = array_merge($params, $optParams);
-    return $this->call('resetAll', array($params), "Google_Service_GamesManagement_AchievementResetAllResponse");
-  }
-  /**
-   * Resets all draft achievements for all players. This method is only available
-   * to user accounts for your developer console.
-   * (achievements.resetAllForAllPlayers)
-   *
-   * @param array $optParams Optional parameters.
-   */
-  public function resetAllForAllPlayers($optParams = array())
-  {
-    $params = array();
-    $params = array_merge($params, $optParams);
-    return $this->call('resetAllForAllPlayers', array($params));
-  }
-  /**
-   * Resets the achievement with the given ID for all players. This method is only
-   * available to user accounts for your developer console. Only draft
-   * achievements can be reset. (achievements.resetForAllPlayers)
-   *
-   * @param string $achievementId The ID of the achievement used by this method.
-   * @param array $optParams Optional parameters.
-   */
-  public function resetForAllPlayers($achievementId, $optParams = array())
-  {
-    $params = array('achievementId' => $achievementId);
-    $params = array_merge($params, $optParams);
-    return $this->call('resetForAllPlayers', array($params));
-  }
-  /**
-   * Resets achievements with the given IDs for all players. This method is only
-   * available to user accounts for your developer console. Only draft
-   * achievements may be reset. (achievements.resetMultipleForAllPlayers)
-   *
-   * @param Google_Service_GamesManagement_AchievementResetMultipleForAllRequest $postBody
-   * @param array $optParams Optional parameters.
-   */
-  public function resetMultipleForAllPlayers(Google_Service_GamesManagement_AchievementResetMultipleForAllRequest $postBody, $optParams = array())
-  {
-    $params = array('postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('resetMultipleForAllPlayers', array($params));
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/GamesManagement/Resource/Applications.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/GamesManagement/Resource/Applications.php
deleted file mode 100644
index 2f53a34e..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/GamesManagement/Resource/Applications.php
+++ /dev/null
@@ -1,49 +0,0 @@
-
- *   $gamesManagementService = new Google_Service_GamesManagement(...);
- *   $applications = $gamesManagementService->applications;
- *  
- */
-class Google_Service_GamesManagement_Resource_Applications extends Google_Service_Resource
-{
-  /**
-   * Get the list of players hidden from the given application. This method is
-   * only available to user accounts for your developer console.
-   * (applications.listHidden)
-   *
-   * @param string $applicationId The application ID from the Google Play
-   * developer console.
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param int maxResults The maximum number of player resources to return in
-   * the response, used for paging. For any response, the actual number of player
-   * resources returned may be less than the specified maxResults.
-   * @opt_param string pageToken The token returned by the previous request.
-   * @return Google_Service_GamesManagement_HiddenPlayerList
-   */
-  public function listHidden($applicationId, $optParams = array())
-  {
-    $params = array('applicationId' => $applicationId);
-    $params = array_merge($params, $optParams);
-    return $this->call('listHidden', array($params), "Google_Service_GamesManagement_HiddenPlayerList");
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/GamesManagement/Resource/Events.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/GamesManagement/Resource/Events.php
deleted file mode 100644
index aafa71b6..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/GamesManagement/Resource/Events.php
+++ /dev/null
@@ -1,100 +0,0 @@
-
- *   $gamesManagementService = new Google_Service_GamesManagement(...);
- *   $events = $gamesManagementService->events;
- *  
- */
-class Google_Service_GamesManagement_Resource_Events extends Google_Service_Resource
-{
-  /**
-   * Resets all player progress on the event with the given ID for the currently
-   * authenticated player. This method is only accessible to whitelisted tester
-   * accounts for your application. All quests for this player that use the event
-   * will also be reset. (events.reset)
-   *
-   * @param string $eventId The ID of the event.
-   * @param array $optParams Optional parameters.
-   */
-  public function reset($eventId, $optParams = array())
-  {
-    $params = array('eventId' => $eventId);
-    $params = array_merge($params, $optParams);
-    return $this->call('reset', array($params));
-  }
-  /**
-   * Resets all player progress on all events for the currently authenticated
-   * player. This method is only accessible to whitelisted tester accounts for
-   * your application. All quests for this player will also be reset.
-   * (events.resetAll)
-   *
-   * @param array $optParams Optional parameters.
-   */
-  public function resetAll($optParams = array())
-  {
-    $params = array();
-    $params = array_merge($params, $optParams);
-    return $this->call('resetAll', array($params));
-  }
-  /**
-   * Resets all draft events for all players. This method is only available to
-   * user accounts for your developer console. All quests that use any of these
-   * events will also be reset. (events.resetAllForAllPlayers)
-   *
-   * @param array $optParams Optional parameters.
-   */
-  public function resetAllForAllPlayers($optParams = array())
-  {
-    $params = array();
-    $params = array_merge($params, $optParams);
-    return $this->call('resetAllForAllPlayers', array($params));
-  }
-  /**
-   * Resets the event with the given ID for all players. This method is only
-   * available to user accounts for your developer console. Only draft events can
-   * be reset. All quests that use the event will also be reset.
-   * (events.resetForAllPlayers)
-   *
-   * @param string $eventId The ID of the event.
-   * @param array $optParams Optional parameters.
-   */
-  public function resetForAllPlayers($eventId, $optParams = array())
-  {
-    $params = array('eventId' => $eventId);
-    $params = array_merge($params, $optParams);
-    return $this->call('resetForAllPlayers', array($params));
-  }
-  /**
-   * Resets events with the given IDs for all players. This method is only
-   * available to user accounts for your developer console. Only draft events may
-   * be reset. All quests that use any of the events will also be reset.
-   * (events.resetMultipleForAllPlayers)
-   *
-   * @param Google_Service_GamesManagement_EventsResetMultipleForAllRequest $postBody
-   * @param array $optParams Optional parameters.
-   */
-  public function resetMultipleForAllPlayers(Google_Service_GamesManagement_EventsResetMultipleForAllRequest $postBody, $optParams = array())
-  {
-    $params = array('postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('resetMultipleForAllPlayers', array($params));
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/GamesManagement/Resource/Players.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/GamesManagement/Resource/Players.php
deleted file mode 100644
index fe9493ba..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/GamesManagement/Resource/Players.php
+++ /dev/null
@@ -1,62 +0,0 @@
-
- *   $gamesManagementService = new Google_Service_GamesManagement(...);
- *   $players = $gamesManagementService->players;
- *  
- */
-class Google_Service_GamesManagement_Resource_Players extends Google_Service_Resource
-{
-  /**
-   * Hide the given player's leaderboard scores from the given application. This
-   * method is only available to user accounts for your developer console.
-   * (players.hide)
-   *
-   * @param string $applicationId The application ID from the Google Play
-   * developer console.
-   * @param string $playerId A player ID. A value of me may be used in place of
-   * the authenticated player's ID.
-   * @param array $optParams Optional parameters.
-   */
-  public function hide($applicationId, $playerId, $optParams = array())
-  {
-    $params = array('applicationId' => $applicationId, 'playerId' => $playerId);
-    $params = array_merge($params, $optParams);
-    return $this->call('hide', array($params));
-  }
-  /**
-   * Unhide the given player's leaderboard scores from the given application. This
-   * method is only available to user accounts for your developer console.
-   * (players.unhide)
-   *
-   * @param string $applicationId The application ID from the Google Play
-   * developer console.
-   * @param string $playerId A player ID. A value of me may be used in place of
-   * the authenticated player's ID.
-   * @param array $optParams Optional parameters.
-   */
-  public function unhide($applicationId, $playerId, $optParams = array())
-  {
-    $params = array('applicationId' => $applicationId, 'playerId' => $playerId);
-    $params = array_merge($params, $optParams);
-    return $this->call('unhide', array($params));
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/GamesManagement/Resource/Quests.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/GamesManagement/Resource/Quests.php
deleted file mode 100644
index 7789daf6..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/GamesManagement/Resource/Quests.php
+++ /dev/null
@@ -1,95 +0,0 @@
-
- *   $gamesManagementService = new Google_Service_GamesManagement(...);
- *   $quests = $gamesManagementService->quests;
- *  
- */
-class Google_Service_GamesManagement_Resource_Quests extends Google_Service_Resource
-{
-  /**
-   * Resets all player progress on the quest with the given ID for the currently
-   * authenticated player. This method is only accessible to whitelisted tester
-   * accounts for your application. (quests.reset)
-   *
-   * @param string $questId The ID of the quest.
-   * @param array $optParams Optional parameters.
-   */
-  public function reset($questId, $optParams = array())
-  {
-    $params = array('questId' => $questId);
-    $params = array_merge($params, $optParams);
-    return $this->call('reset', array($params));
-  }
-  /**
-   * Resets all player progress on all quests for the currently authenticated
-   * player. This method is only accessible to whitelisted tester accounts for
-   * your application. (quests.resetAll)
-   *
-   * @param array $optParams Optional parameters.
-   */
-  public function resetAll($optParams = array())
-  {
-    $params = array();
-    $params = array_merge($params, $optParams);
-    return $this->call('resetAll', array($params));
-  }
-  /**
-   * Resets all draft quests for all players. This method is only available to
-   * user accounts for your developer console. (quests.resetAllForAllPlayers)
-   *
-   * @param array $optParams Optional parameters.
-   */
-  public function resetAllForAllPlayers($optParams = array())
-  {
-    $params = array();
-    $params = array_merge($params, $optParams);
-    return $this->call('resetAllForAllPlayers', array($params));
-  }
-  /**
-   * Resets all player progress on the quest with the given ID for all players.
-   * This method is only available to user accounts for your developer console.
-   * Only draft quests can be reset. (quests.resetForAllPlayers)
-   *
-   * @param string $questId The ID of the quest.
-   * @param array $optParams Optional parameters.
-   */
-  public function resetForAllPlayers($questId, $optParams = array())
-  {
-    $params = array('questId' => $questId);
-    $params = array_merge($params, $optParams);
-    return $this->call('resetForAllPlayers', array($params));
-  }
-  /**
-   * Resets quests with the given IDs for all players. This method is only
-   * available to user accounts for your developer console. Only draft quests may
-   * be reset. (quests.resetMultipleForAllPlayers)
-   *
-   * @param Google_Service_GamesManagement_QuestsResetMultipleForAllRequest $postBody
-   * @param array $optParams Optional parameters.
-   */
-  public function resetMultipleForAllPlayers(Google_Service_GamesManagement_QuestsResetMultipleForAllRequest $postBody, $optParams = array())
-  {
-    $params = array('postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('resetMultipleForAllPlayers', array($params));
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/GamesManagement/Resource/Rooms.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/GamesManagement/Resource/Rooms.php
deleted file mode 100644
index bb5f0c3f..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/GamesManagement/Resource/Rooms.php
+++ /dev/null
@@ -1,54 +0,0 @@
-
- *   $gamesManagementService = new Google_Service_GamesManagement(...);
- *   $rooms = $gamesManagementService->rooms;
- *  
- */
-class Google_Service_GamesManagement_Resource_Rooms extends Google_Service_Resource
-{
-  /**
-   * Reset all rooms for the currently authenticated player for your application.
-   * This method is only accessible to whitelisted tester accounts for your
-   * application. (rooms.reset)
-   *
-   * @param array $optParams Optional parameters.
-   */
-  public function reset($optParams = array())
-  {
-    $params = array();
-    $params = array_merge($params, $optParams);
-    return $this->call('reset', array($params));
-  }
-  /**
-   * Deletes rooms where the only room participants are from whitelisted tester
-   * accounts for your application. This method is only available to user accounts
-   * for your developer console. (rooms.resetForAllPlayers)
-   *
-   * @param array $optParams Optional parameters.
-   */
-  public function resetForAllPlayers($optParams = array())
-  {
-    $params = array();
-    $params = array_merge($params, $optParams);
-    return $this->call('resetForAllPlayers', array($params));
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/GamesManagement/Resource/Scores.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/GamesManagement/Resource/Scores.php
deleted file mode 100644
index caff3905..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/GamesManagement/Resource/Scores.php
+++ /dev/null
@@ -1,98 +0,0 @@
-
- *   $gamesManagementService = new Google_Service_GamesManagement(...);
- *   $scores = $gamesManagementService->scores;
- *  
- */
-class Google_Service_GamesManagement_Resource_Scores extends Google_Service_Resource
-{
-  /**
-   * Resets scores for the leaderboard with the given ID for the currently
-   * authenticated player. This method is only accessible to whitelisted tester
-   * accounts for your application. (scores.reset)
-   *
-   * @param string $leaderboardId The ID of the leaderboard.
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_GamesManagement_PlayerScoreResetResponse
-   */
-  public function reset($leaderboardId, $optParams = array())
-  {
-    $params = array('leaderboardId' => $leaderboardId);
-    $params = array_merge($params, $optParams);
-    return $this->call('reset', array($params), "Google_Service_GamesManagement_PlayerScoreResetResponse");
-  }
-  /**
-   * Resets all scores for all leaderboards for the currently authenticated
-   * players. This method is only accessible to whitelisted tester accounts for
-   * your application. (scores.resetAll)
-   *
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_GamesManagement_PlayerScoreResetAllResponse
-   */
-  public function resetAll($optParams = array())
-  {
-    $params = array();
-    $params = array_merge($params, $optParams);
-    return $this->call('resetAll', array($params), "Google_Service_GamesManagement_PlayerScoreResetAllResponse");
-  }
-  /**
-   * Resets scores for all draft leaderboards for all players. This method is only
-   * available to user accounts for your developer console.
-   * (scores.resetAllForAllPlayers)
-   *
-   * @param array $optParams Optional parameters.
-   */
-  public function resetAllForAllPlayers($optParams = array())
-  {
-    $params = array();
-    $params = array_merge($params, $optParams);
-    return $this->call('resetAllForAllPlayers', array($params));
-  }
-  /**
-   * Resets scores for the leaderboard with the given ID for all players. This
-   * method is only available to user accounts for your developer console. Only
-   * draft leaderboards can be reset. (scores.resetForAllPlayers)
-   *
-   * @param string $leaderboardId The ID of the leaderboard.
-   * @param array $optParams Optional parameters.
-   */
-  public function resetForAllPlayers($leaderboardId, $optParams = array())
-  {
-    $params = array('leaderboardId' => $leaderboardId);
-    $params = array_merge($params, $optParams);
-    return $this->call('resetForAllPlayers', array($params));
-  }
-  /**
-   * Resets scores for the leaderboards with the given IDs for all players. This
-   * method is only available to user accounts for your developer console. Only
-   * draft leaderboards may be reset. (scores.resetMultipleForAllPlayers)
-   *
-   * @param Google_Service_GamesManagement_ScoresResetMultipleForAllRequest $postBody
-   * @param array $optParams Optional parameters.
-   */
-  public function resetMultipleForAllPlayers(Google_Service_GamesManagement_ScoresResetMultipleForAllRequest $postBody, $optParams = array())
-  {
-    $params = array('postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('resetMultipleForAllPlayers', array($params));
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/GamesManagement/Resource/TurnBasedMatches.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/GamesManagement/Resource/TurnBasedMatches.php
deleted file mode 100644
index 62462f84..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/GamesManagement/Resource/TurnBasedMatches.php
+++ /dev/null
@@ -1,54 +0,0 @@
-
- *   $gamesManagementService = new Google_Service_GamesManagement(...);
- *   $turnBasedMatches = $gamesManagementService->turnBasedMatches;
- *  
- */
-class Google_Service_GamesManagement_Resource_TurnBasedMatches extends Google_Service_Resource
-{
-  /**
-   * Reset all turn-based match data for a user. This method is only accessible to
-   * whitelisted tester accounts for your application. (turnBasedMatches.reset)
-   *
-   * @param array $optParams Optional parameters.
-   */
-  public function reset($optParams = array())
-  {
-    $params = array();
-    $params = array_merge($params, $optParams);
-    return $this->call('reset', array($params));
-  }
-  /**
-   * Deletes turn-based matches where the only match participants are from
-   * whitelisted tester accounts for your application. This method is only
-   * available to user accounts for your developer console.
-   * (turnBasedMatches.resetForAllPlayers)
-   *
-   * @param array $optParams Optional parameters.
-   */
-  public function resetForAllPlayers($optParams = array())
-  {
-    $params = array();
-    $params = array_merge($params, $optParams);
-    return $this->call('resetForAllPlayers', array($params));
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/GamesManagement/ScoresResetMultipleForAllRequest.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/GamesManagement/ScoresResetMultipleForAllRequest.php
deleted file mode 100644
index 7a34ab9b..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/GamesManagement/ScoresResetMultipleForAllRequest.php
+++ /dev/null
@@ -1,43 +0,0 @@
- "leaderboard_ids",
-  );
-  public $kind;
-  public $leaderboardIds;
-
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setLeaderboardIds($leaderboardIds)
-  {
-    $this->leaderboardIds = $leaderboardIds;
-  }
-  public function getLeaderboardIds()
-  {
-    return $this->leaderboardIds;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Genomics.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Genomics.php
deleted file mode 100644
index 1a3a6cb1..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Genomics.php
+++ /dev/null
@@ -1,720 +0,0 @@
-
- * Upload, process, query, and search Genomics data in the cloud.

- *
- * 

- * For more information about this service, see the API
- * Documentation
- * 

- *
- * @author Google, Inc.
- */
-class Google_Service_Genomics extends Google_Service
-{
-  /** View and manage your data in Google BigQuery. */
-  const BIGQUERY =
-      "https://www.googleapis.com/auth/bigquery";
-  /** View and manage your data across Google Cloud Platform services. */
-  const CLOUD_PLATFORM =
-      "https://www.googleapis.com/auth/cloud-platform";
-  /** Manage your data in Google Cloud Storage. */
-  const DEVSTORAGE_READ_WRITE =
-      "https://www.googleapis.com/auth/devstorage.read_write";
-  /** View and manage Genomics data. */
-  const GENOMICS =
-      "https://www.googleapis.com/auth/genomics";
-  /** View Genomics data. */
-  const GENOMICS_READONLY =
-      "https://www.googleapis.com/auth/genomics.readonly";
-
-  public $annotations;
-  public $annotationsets;
-  public $callsets;
-  public $datasets;
-  public $operations;
-  public $readgroupsets;
-  public $readgroupsets_coveragebuckets;
-  public $reads;
-  public $references;
-  public $references_bases;
-  public $referencesets;
-  public $variants;
-  public $variantsets;
-  
-  /**
-   * Constructs the internal representation of the Genomics service.
-   *
-   * @param Google_Client $client
-   */
-  public function __construct(Google_Client $client)
-  {
-    parent::__construct($client);
-    $this->rootUrl = 'https://genomics.googleapis.com/';
-    $this->servicePath = '';
-    $this->version = 'v1';
-    $this->serviceName = 'genomics';
-
-    $this->annotations = new Google_Service_Genomics_Resource_Annotations(
-        $this,
-        $this->serviceName,
-        'annotations',
-        array(
-          'methods' => array(
-            'batchCreate' => array(
-              'path' => 'v1/annotations:batchCreate',
-              'httpMethod' => 'POST',
-              'parameters' => array(),
-            ),'create' => array(
-              'path' => 'v1/annotations',
-              'httpMethod' => 'POST',
-              'parameters' => array(),
-            ),'delete' => array(
-              'path' => 'v1/annotations/{annotationId}',
-              'httpMethod' => 'DELETE',
-              'parameters' => array(
-                'annotationId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'get' => array(
-              'path' => 'v1/annotations/{annotationId}',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'annotationId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'search' => array(
-              'path' => 'v1/annotations/search',
-              'httpMethod' => 'POST',
-              'parameters' => array(),
-            ),'update' => array(
-              'path' => 'v1/annotations/{annotationId}',
-              'httpMethod' => 'PUT',
-              'parameters' => array(
-                'annotationId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'updateMask' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-              ),
-            ),
-          )
-        )
-    );
-    $this->annotationsets = new Google_Service_Genomics_Resource_Annotationsets(
-        $this,
-        $this->serviceName,
-        'annotationsets',
-        array(
-          'methods' => array(
-            'create' => array(
-              'path' => 'v1/annotationsets',
-              'httpMethod' => 'POST',
-              'parameters' => array(),
-            ),'delete' => array(
-              'path' => 'v1/annotationsets/{annotationSetId}',
-              'httpMethod' => 'DELETE',
-              'parameters' => array(
-                'annotationSetId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'get' => array(
-              'path' => 'v1/annotationsets/{annotationSetId}',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'annotationSetId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'search' => array(
-              'path' => 'v1/annotationsets/search',
-              'httpMethod' => 'POST',
-              'parameters' => array(),
-            ),'update' => array(
-              'path' => 'v1/annotationsets/{annotationSetId}',
-              'httpMethod' => 'PUT',
-              'parameters' => array(
-                'annotationSetId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'updateMask' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-              ),
-            ),
-          )
-        )
-    );
-    $this->callsets = new Google_Service_Genomics_Resource_Callsets(
-        $this,
-        $this->serviceName,
-        'callsets',
-        array(
-          'methods' => array(
-            'create' => array(
-              'path' => 'v1/callsets',
-              'httpMethod' => 'POST',
-              'parameters' => array(),
-            ),'delete' => array(
-              'path' => 'v1/callsets/{callSetId}',
-              'httpMethod' => 'DELETE',
-              'parameters' => array(
-                'callSetId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'get' => array(
-              'path' => 'v1/callsets/{callSetId}',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'callSetId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'patch' => array(
-              'path' => 'v1/callsets/{callSetId}',
-              'httpMethod' => 'PATCH',
-              'parameters' => array(
-                'callSetId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'updateMask' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-              ),
-            ),'search' => array(
-              'path' => 'v1/callsets/search',
-              'httpMethod' => 'POST',
-              'parameters' => array(),
-            ),
-          )
-        )
-    );
-    $this->datasets = new Google_Service_Genomics_Resource_Datasets(
-        $this,
-        $this->serviceName,
-        'datasets',
-        array(
-          'methods' => array(
-            'create' => array(
-              'path' => 'v1/datasets',
-              'httpMethod' => 'POST',
-              'parameters' => array(),
-            ),'delete' => array(
-              'path' => 'v1/datasets/{datasetId}',
-              'httpMethod' => 'DELETE',
-              'parameters' => array(
-                'datasetId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'get' => array(
-              'path' => 'v1/datasets/{datasetId}',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'datasetId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'getIamPolicy' => array(
-              'path' => 'v1/{+resource}:getIamPolicy',
-              'httpMethod' => 'POST',
-              'parameters' => array(
-                'resource' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'list' => array(
-              'path' => 'v1/datasets',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'pageToken' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'pageSize' => array(
-                  'location' => 'query',
-                  'type' => 'integer',
-                ),
-                'projectId' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-              ),
-            ),'patch' => array(
-              'path' => 'v1/datasets/{datasetId}',
-              'httpMethod' => 'PATCH',
-              'parameters' => array(
-                'datasetId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'updateMask' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-              ),
-            ),'setIamPolicy' => array(
-              'path' => 'v1/{+resource}:setIamPolicy',
-              'httpMethod' => 'POST',
-              'parameters' => array(
-                'resource' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'testIamPermissions' => array(
-              'path' => 'v1/{+resource}:testIamPermissions',
-              'httpMethod' => 'POST',
-              'parameters' => array(
-                'resource' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'undelete' => array(
-              'path' => 'v1/datasets/{datasetId}:undelete',
-              'httpMethod' => 'POST',
-              'parameters' => array(
-                'datasetId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),
-          )
-        )
-    );
-    $this->operations = new Google_Service_Genomics_Resource_Operations(
-        $this,
-        $this->serviceName,
-        'operations',
-        array(
-          'methods' => array(
-            'cancel' => array(
-              'path' => 'v1/{+name}:cancel',
-              'httpMethod' => 'POST',
-              'parameters' => array(
-                'name' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'get' => array(
-              'path' => 'v1/{+name}',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'name' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'list' => array(
-              'path' => 'v1/{+name}',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'name' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'filter' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'pageToken' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'pageSize' => array(
-                  'location' => 'query',
-                  'type' => 'integer',
-                ),
-              ),
-            ),
-          )
-        )
-    );
-    $this->readgroupsets = new Google_Service_Genomics_Resource_Readgroupsets(
-        $this,
-        $this->serviceName,
-        'readgroupsets',
-        array(
-          'methods' => array(
-            'delete' => array(
-              'path' => 'v1/readgroupsets/{readGroupSetId}',
-              'httpMethod' => 'DELETE',
-              'parameters' => array(
-                'readGroupSetId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'export' => array(
-              'path' => 'v1/readgroupsets/{readGroupSetId}:export',
-              'httpMethod' => 'POST',
-              'parameters' => array(
-                'readGroupSetId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'get' => array(
-              'path' => 'v1/readgroupsets/{readGroupSetId}',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'readGroupSetId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'import' => array(
-              'path' => 'v1/readgroupsets:import',
-              'httpMethod' => 'POST',
-              'parameters' => array(),
-            ),'patch' => array(
-              'path' => 'v1/readgroupsets/{readGroupSetId}',
-              'httpMethod' => 'PATCH',
-              'parameters' => array(
-                'readGroupSetId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'updateMask' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-              ),
-            ),'search' => array(
-              'path' => 'v1/readgroupsets/search',
-              'httpMethod' => 'POST',
-              'parameters' => array(),
-            ),
-          )
-        )
-    );
-    $this->readgroupsets_coveragebuckets = new Google_Service_Genomics_Resource_ReadgroupsetsCoveragebuckets(
-        $this,
-        $this->serviceName,
-        'coveragebuckets',
-        array(
-          'methods' => array(
-            'list' => array(
-              'path' => 'v1/readgroupsets/{readGroupSetId}/coveragebuckets',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'readGroupSetId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'targetBucketWidth' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'referenceName' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'end' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'pageToken' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'pageSize' => array(
-                  'location' => 'query',
-                  'type' => 'integer',
-                ),
-                'start' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-              ),
-            ),
-          )
-        )
-    );
-    $this->reads = new Google_Service_Genomics_Resource_Reads(
-        $this,
-        $this->serviceName,
-        'reads',
-        array(
-          'methods' => array(
-            'search' => array(
-              'path' => 'v1/reads/search',
-              'httpMethod' => 'POST',
-              'parameters' => array(),
-            ),
-          )
-        )
-    );
-    $this->references = new Google_Service_Genomics_Resource_References(
-        $this,
-        $this->serviceName,
-        'references',
-        array(
-          'methods' => array(
-            'get' => array(
-              'path' => 'v1/references/{referenceId}',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'referenceId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'search' => array(
-              'path' => 'v1/references/search',
-              'httpMethod' => 'POST',
-              'parameters' => array(),
-            ),
-          )
-        )
-    );
-    $this->references_bases = new Google_Service_Genomics_Resource_ReferencesBases(
-        $this,
-        $this->serviceName,
-        'bases',
-        array(
-          'methods' => array(
-            'list' => array(
-              'path' => 'v1/references/{referenceId}/bases',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'referenceId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'pageToken' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'pageSize' => array(
-                  'location' => 'query',
-                  'type' => 'integer',
-                ),
-                'start' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'end' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-              ),
-            ),
-          )
-        )
-    );
-    $this->referencesets = new Google_Service_Genomics_Resource_Referencesets(
-        $this,
-        $this->serviceName,
-        'referencesets',
-        array(
-          'methods' => array(
-            'get' => array(
-              'path' => 'v1/referencesets/{referenceSetId}',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'referenceSetId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'search' => array(
-              'path' => 'v1/referencesets/search',
-              'httpMethod' => 'POST',
-              'parameters' => array(),
-            ),
-          )
-        )
-    );
-    $this->variants = new Google_Service_Genomics_Resource_Variants(
-        $this,
-        $this->serviceName,
-        'variants',
-        array(
-          'methods' => array(
-            'create' => array(
-              'path' => 'v1/variants',
-              'httpMethod' => 'POST',
-              'parameters' => array(),
-            ),'delete' => array(
-              'path' => 'v1/variants/{variantId}',
-              'httpMethod' => 'DELETE',
-              'parameters' => array(
-                'variantId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'get' => array(
-              'path' => 'v1/variants/{variantId}',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'variantId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'import' => array(
-              'path' => 'v1/variants:import',
-              'httpMethod' => 'POST',
-              'parameters' => array(),
-            ),'merge' => array(
-              'path' => 'v1/variants:merge',
-              'httpMethod' => 'POST',
-              'parameters' => array(),
-            ),'patch' => array(
-              'path' => 'v1/variants/{variantId}',
-              'httpMethod' => 'PATCH',
-              'parameters' => array(
-                'variantId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'updateMask' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-              ),
-            ),'search' => array(
-              'path' => 'v1/variants/search',
-              'httpMethod' => 'POST',
-              'parameters' => array(),
-            ),
-          )
-        )
-    );
-    $this->variantsets = new Google_Service_Genomics_Resource_Variantsets(
-        $this,
-        $this->serviceName,
-        'variantsets',
-        array(
-          'methods' => array(
-            'create' => array(
-              'path' => 'v1/variantsets',
-              'httpMethod' => 'POST',
-              'parameters' => array(),
-            ),'delete' => array(
-              'path' => 'v1/variantsets/{variantSetId}',
-              'httpMethod' => 'DELETE',
-              'parameters' => array(
-                'variantSetId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'export' => array(
-              'path' => 'v1/variantsets/{variantSetId}:export',
-              'httpMethod' => 'POST',
-              'parameters' => array(
-                'variantSetId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'get' => array(
-              'path' => 'v1/variantsets/{variantSetId}',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'variantSetId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'patch' => array(
-              'path' => 'v1/variantsets/{variantSetId}',
-              'httpMethod' => 'PATCH',
-              'parameters' => array(
-                'variantSetId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'updateMask' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-              ),
-            ),'search' => array(
-              'path' => 'v1/variantsets/search',
-              'httpMethod' => 'POST',
-              'parameters' => array(),
-            ),
-          )
-        )
-    );
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Genomics/Annotation.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Genomics/Annotation.php
deleted file mode 100644
index bcecbebc..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Genomics/Annotation.php
+++ /dev/null
@@ -1,131 +0,0 @@
-annotationSetId = $annotationSetId;
-  }
-  public function getAnnotationSetId()
-  {
-    return $this->annotationSetId;
-  }
-  public function setEnd($end)
-  {
-    $this->end = $end;
-  }
-  public function getEnd()
-  {
-    return $this->end;
-  }
-  public function setId($id)
-  {
-    $this->id = $id;
-  }
-  public function getId()
-  {
-    return $this->id;
-  }
-  public function setInfo($info)
-  {
-    $this->info = $info;
-  }
-  public function getInfo()
-  {
-    return $this->info;
-  }
-  public function setName($name)
-  {
-    $this->name = $name;
-  }
-  public function getName()
-  {
-    return $this->name;
-  }
-  public function setReferenceId($referenceId)
-  {
-    $this->referenceId = $referenceId;
-  }
-  public function getReferenceId()
-  {
-    return $this->referenceId;
-  }
-  public function setReferenceName($referenceName)
-  {
-    $this->referenceName = $referenceName;
-  }
-  public function getReferenceName()
-  {
-    return $this->referenceName;
-  }
-  public function setReverseStrand($reverseStrand)
-  {
-    $this->reverseStrand = $reverseStrand;
-  }
-  public function getReverseStrand()
-  {
-    return $this->reverseStrand;
-  }
-  public function setStart($start)
-  {
-    $this->start = $start;
-  }
-  public function getStart()
-  {
-    return $this->start;
-  }
-  public function setTranscript(Google_Service_Genomics_Transcript $transcript)
-  {
-    $this->transcript = $transcript;
-  }
-  public function getTranscript()
-  {
-    return $this->transcript;
-  }
-  public function setType($type)
-  {
-    $this->type = $type;
-  }
-  public function getType()
-  {
-    return $this->type;
-  }
-  public function setVariant(Google_Service_Genomics_VariantAnnotation $variant)
-  {
-    $this->variant = $variant;
-  }
-  public function getVariant()
-  {
-    return $this->variant;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Genomics/AnnotationSet.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Genomics/AnnotationSet.php
deleted file mode 100644
index 10ae1c86..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Genomics/AnnotationSet.php
+++ /dev/null
@@ -1,84 +0,0 @@
-datasetId = $datasetId;
-  }
-  public function getDatasetId()
-  {
-    return $this->datasetId;
-  }
-  public function setId($id)
-  {
-    $this->id = $id;
-  }
-  public function getId()
-  {
-    return $this->id;
-  }
-  public function setInfo($info)
-  {
-    $this->info = $info;
-  }
-  public function getInfo()
-  {
-    return $this->info;
-  }
-  public function setName($name)
-  {
-    $this->name = $name;
-  }
-  public function getName()
-  {
-    return $this->name;
-  }
-  public function setReferenceSetId($referenceSetId)
-  {
-    $this->referenceSetId = $referenceSetId;
-  }
-  public function getReferenceSetId()
-  {
-    return $this->referenceSetId;
-  }
-  public function setSourceUri($sourceUri)
-  {
-    $this->sourceUri = $sourceUri;
-  }
-  public function getSourceUri()
-  {
-    return $this->sourceUri;
-  }
-  public function setType($type)
-  {
-    $this->type = $type;
-  }
-  public function getType()
-  {
-    return $this->type;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Genomics/BatchCreateAnnotationsRequest.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Genomics/BatchCreateAnnotationsRequest.php
deleted file mode 100644
index 3fed6c6e..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Genomics/BatchCreateAnnotationsRequest.php
+++ /dev/null
@@ -1,41 +0,0 @@
-annotations = $annotations;
-  }
-  public function getAnnotations()
-  {
-    return $this->annotations;
-  }
-  public function setRequestId($requestId)
-  {
-    $this->requestId = $requestId;
-  }
-  public function getRequestId()
-  {
-    return $this->requestId;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Genomics/BatchCreateAnnotationsResponse.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Genomics/BatchCreateAnnotationsResponse.php
deleted file mode 100644
index 16ea7662..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Genomics/BatchCreateAnnotationsResponse.php
+++ /dev/null
@@ -1,32 +0,0 @@
-entries = $entries;
-  }
-  public function getEntries()
-  {
-    return $this->entries;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Genomics/Binding.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Genomics/Binding.php
deleted file mode 100644
index 02d17028..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Genomics/Binding.php
+++ /dev/null
@@ -1,40 +0,0 @@
-members = $members;
-  }
-  public function getMembers()
-  {
-    return $this->members;
-  }
-  public function setRole($role)
-  {
-    $this->role = $role;
-  }
-  public function getRole()
-  {
-    return $this->role;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Genomics/CallSet.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Genomics/CallSet.php
deleted file mode 100644
index db8abec6..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Genomics/CallSet.php
+++ /dev/null
@@ -1,76 +0,0 @@
-created = $created;
-  }
-  public function getCreated()
-  {
-    return $this->created;
-  }
-  public function setId($id)
-  {
-    $this->id = $id;
-  }
-  public function getId()
-  {
-    return $this->id;
-  }
-  public function setInfo($info)
-  {
-    $this->info = $info;
-  }
-  public function getInfo()
-  {
-    return $this->info;
-  }
-  public function setName($name)
-  {
-    $this->name = $name;
-  }
-  public function getName()
-  {
-    return $this->name;
-  }
-  public function setSampleId($sampleId)
-  {
-    $this->sampleId = $sampleId;
-  }
-  public function getSampleId()
-  {
-    return $this->sampleId;
-  }
-  public function setVariantSetIds($variantSetIds)
-  {
-    $this->variantSetIds = $variantSetIds;
-  }
-  public function getVariantSetIds()
-  {
-    return $this->variantSetIds;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Genomics/CancelOperationRequest.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Genomics/CancelOperationRequest.php
deleted file mode 100644
index 84f29698..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Genomics/CancelOperationRequest.php
+++ /dev/null
@@ -1,20 +0,0 @@
-operation = $operation;
-  }
-  public function getOperation()
-  {
-    return $this->operation;
-  }
-  public function setOperationLength($operationLength)
-  {
-    $this->operationLength = $operationLength;
-  }
-  public function getOperationLength()
-  {
-    return $this->operationLength;
-  }
-  public function setReferenceSequence($referenceSequence)
-  {
-    $this->referenceSequence = $referenceSequence;
-  }
-  public function getReferenceSequence()
-  {
-    return $this->referenceSequence;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Genomics/ClinicalCondition.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Genomics/ClinicalCondition.php
deleted file mode 100644
index 78387415..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Genomics/ClinicalCondition.php
+++ /dev/null
@@ -1,59 +0,0 @@
-conceptId = $conceptId;
-  }
-  public function getConceptId()
-  {
-    return $this->conceptId;
-  }
-  public function setExternalIds($externalIds)
-  {
-    $this->externalIds = $externalIds;
-  }
-  public function getExternalIds()
-  {
-    return $this->externalIds;
-  }
-  public function setNames($names)
-  {
-    $this->names = $names;
-  }
-  public function getNames()
-  {
-    return $this->names;
-  }
-  public function setOmimId($omimId)
-  {
-    $this->omimId = $omimId;
-  }
-  public function getOmimId()
-  {
-    return $this->omimId;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Genomics/CodingSequence.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Genomics/CodingSequence.php
deleted file mode 100644
index 38843a94..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Genomics/CodingSequence.php
+++ /dev/null
@@ -1,39 +0,0 @@
-end = $end;
-  }
-  public function getEnd()
-  {
-    return $this->end;
-  }
-  public function setStart($start)
-  {
-    $this->start = $start;
-  }
-  public function getStart()
-  {
-    return $this->start;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Genomics/ComputeEngine.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Genomics/ComputeEngine.php
deleted file mode 100644
index a398d2dc..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Genomics/ComputeEngine.php
+++ /dev/null
@@ -1,58 +0,0 @@
-diskNames = $diskNames;
-  }
-  public function getDiskNames()
-  {
-    return $this->diskNames;
-  }
-  public function setInstanceName($instanceName)
-  {
-    $this->instanceName = $instanceName;
-  }
-  public function getInstanceName()
-  {
-    return $this->instanceName;
-  }
-  public function setMachineType($machineType)
-  {
-    $this->machineType = $machineType;
-  }
-  public function getMachineType()
-  {
-    return $this->machineType;
-  }
-  public function setZone($zone)
-  {
-    $this->zone = $zone;
-  }
-  public function getZone()
-  {
-    return $this->zone;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Genomics/CoverageBucket.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Genomics/CoverageBucket.php
deleted file mode 100644
index 6486f45c..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Genomics/CoverageBucket.php
+++ /dev/null
@@ -1,40 +0,0 @@
-meanCoverage = $meanCoverage;
-  }
-  public function getMeanCoverage()
-  {
-    return $this->meanCoverage;
-  }
-  public function setRange(Google_Service_Genomics_Range $range)
-  {
-    $this->range = $range;
-  }
-  public function getRange()
-  {
-    return $this->range;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Genomics/Dataset.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Genomics/Dataset.php
deleted file mode 100644
index dee47e7f..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Genomics/Dataset.php
+++ /dev/null
@@ -1,57 +0,0 @@
-createTime = $createTime;
-  }
-  public function getCreateTime()
-  {
-    return $this->createTime;
-  }
-  public function setId($id)
-  {
-    $this->id = $id;
-  }
-  public function getId()
-  {
-    return $this->id;
-  }
-  public function setName($name)
-  {
-    $this->name = $name;
-  }
-  public function getName()
-  {
-    return $this->name;
-  }
-  public function setProjectId($projectId)
-  {
-    $this->projectId = $projectId;
-  }
-  public function getProjectId()
-  {
-    return $this->projectId;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Genomics/Entry.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Genomics/Entry.php
deleted file mode 100644
index 6556933e..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Genomics/Entry.php
+++ /dev/null
@@ -1,41 +0,0 @@
-annotation = $annotation;
-  }
-  public function getAnnotation()
-  {
-    return $this->annotation;
-  }
-  public function setStatus(Google_Service_Genomics_Status $status)
-  {
-    $this->status = $status;
-  }
-  public function getStatus()
-  {
-    return $this->status;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Genomics/Exon.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Genomics/Exon.php
deleted file mode 100644
index 29366c9d..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Genomics/Exon.php
+++ /dev/null
@@ -1,48 +0,0 @@
-end = $end;
-  }
-  public function getEnd()
-  {
-    return $this->end;
-  }
-  public function setFrame($frame)
-  {
-    $this->frame = $frame;
-  }
-  public function getFrame()
-  {
-    return $this->frame;
-  }
-  public function setStart($start)
-  {
-    $this->start = $start;
-  }
-  public function getStart()
-  {
-    return $this->start;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Genomics/Experiment.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Genomics/Experiment.php
deleted file mode 100644
index cf21926c..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Genomics/Experiment.php
+++ /dev/null
@@ -1,57 +0,0 @@
-instrumentModel = $instrumentModel;
-  }
-  public function getInstrumentModel()
-  {
-    return $this->instrumentModel;
-  }
-  public function setLibraryId($libraryId)
-  {
-    $this->libraryId = $libraryId;
-  }
-  public function getLibraryId()
-  {
-    return $this->libraryId;
-  }
-  public function setPlatformUnit($platformUnit)
-  {
-    $this->platformUnit = $platformUnit;
-  }
-  public function getPlatformUnit()
-  {
-    return $this->platformUnit;
-  }
-  public function setSequencingCenter($sequencingCenter)
-  {
-    $this->sequencingCenter = $sequencingCenter;
-  }
-  public function getSequencingCenter()
-  {
-    return $this->sequencingCenter;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Genomics/ExportReadGroupSetRequest.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Genomics/ExportReadGroupSetRequest.php
deleted file mode 100644
index 482a90e5..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Genomics/ExportReadGroupSetRequest.php
+++ /dev/null
@@ -1,49 +0,0 @@
-exportUri = $exportUri;
-  }
-  public function getExportUri()
-  {
-    return $this->exportUri;
-  }
-  public function setProjectId($projectId)
-  {
-    $this->projectId = $projectId;
-  }
-  public function getProjectId()
-  {
-    return $this->projectId;
-  }
-  public function setReferenceNames($referenceNames)
-  {
-    $this->referenceNames = $referenceNames;
-  }
-  public function getReferenceNames()
-  {
-    return $this->referenceNames;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Genomics/ExportVariantSetRequest.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Genomics/ExportVariantSetRequest.php
deleted file mode 100644
index 214738c5..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Genomics/ExportVariantSetRequest.php
+++ /dev/null
@@ -1,67 +0,0 @@
-bigqueryDataset = $bigqueryDataset;
-  }
-  public function getBigqueryDataset()
-  {
-    return $this->bigqueryDataset;
-  }
-  public function setBigqueryTable($bigqueryTable)
-  {
-    $this->bigqueryTable = $bigqueryTable;
-  }
-  public function getBigqueryTable()
-  {
-    return $this->bigqueryTable;
-  }
-  public function setCallSetIds($callSetIds)
-  {
-    $this->callSetIds = $callSetIds;
-  }
-  public function getCallSetIds()
-  {
-    return $this->callSetIds;
-  }
-  public function setFormat($format)
-  {
-    $this->format = $format;
-  }
-  public function getFormat()
-  {
-    return $this->format;
-  }
-  public function setProjectId($projectId)
-  {
-    $this->projectId = $projectId;
-  }
-  public function getProjectId()
-  {
-    return $this->projectId;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Genomics/ExternalId.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Genomics/ExternalId.php
deleted file mode 100644
index 5552e207..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Genomics/ExternalId.php
+++ /dev/null
@@ -1,39 +0,0 @@
-id = $id;
-  }
-  public function getId()
-  {
-    return $this->id;
-  }
-  public function setSourceName($sourceName)
-  {
-    $this->sourceName = $sourceName;
-  }
-  public function getSourceName()
-  {
-    return $this->sourceName;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Genomics/GenomicsEmpty.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Genomics/GenomicsEmpty.php
deleted file mode 100644
index 2bf2c603..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Genomics/GenomicsEmpty.php
+++ /dev/null
@@ -1,20 +0,0 @@
-datasetId = $datasetId;
-  }
-  public function getDatasetId()
-  {
-    return $this->datasetId;
-  }
-  public function setPartitionStrategy($partitionStrategy)
-  {
-    $this->partitionStrategy = $partitionStrategy;
-  }
-  public function getPartitionStrategy()
-  {
-    return $this->partitionStrategy;
-  }
-  public function setReferenceSetId($referenceSetId)
-  {
-    $this->referenceSetId = $referenceSetId;
-  }
-  public function getReferenceSetId()
-  {
-    return $this->referenceSetId;
-  }
-  public function setSourceUris($sourceUris)
-  {
-    $this->sourceUris = $sourceUris;
-  }
-  public function getSourceUris()
-  {
-    return $this->sourceUris;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Genomics/ImportReadGroupSetsResponse.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Genomics/ImportReadGroupSetsResponse.php
deleted file mode 100644
index 2ee6cf5d..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Genomics/ImportReadGroupSetsResponse.php
+++ /dev/null
@@ -1,31 +0,0 @@
-readGroupSetIds = $readGroupSetIds;
-  }
-  public function getReadGroupSetIds()
-  {
-    return $this->readGroupSetIds;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Genomics/ImportVariantsRequest.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Genomics/ImportVariantsRequest.php
deleted file mode 100644
index d799ce1f..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Genomics/ImportVariantsRequest.php
+++ /dev/null
@@ -1,67 +0,0 @@
-format = $format;
-  }
-  public function getFormat()
-  {
-    return $this->format;
-  }
-  public function setInfoMergeConfig($infoMergeConfig)
-  {
-    $this->infoMergeConfig = $infoMergeConfig;
-  }
-  public function getInfoMergeConfig()
-  {
-    return $this->infoMergeConfig;
-  }
-  public function setNormalizeReferenceNames($normalizeReferenceNames)
-  {
-    $this->normalizeReferenceNames = $normalizeReferenceNames;
-  }
-  public function getNormalizeReferenceNames()
-  {
-    return $this->normalizeReferenceNames;
-  }
-  public function setSourceUris($sourceUris)
-  {
-    $this->sourceUris = $sourceUris;
-  }
-  public function getSourceUris()
-  {
-    return $this->sourceUris;
-  }
-  public function setVariantSetId($variantSetId)
-  {
-    $this->variantSetId = $variantSetId;
-  }
-  public function getVariantSetId()
-  {
-    return $this->variantSetId;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Genomics/ImportVariantsResponse.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Genomics/ImportVariantsResponse.php
deleted file mode 100644
index 5ed64943..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Genomics/ImportVariantsResponse.php
+++ /dev/null
@@ -1,31 +0,0 @@
-callSetIds = $callSetIds;
-  }
-  public function getCallSetIds()
-  {
-    return $this->callSetIds;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Genomics/LinearAlignment.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Genomics/LinearAlignment.php
deleted file mode 100644
index a73aa5d7..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Genomics/LinearAlignment.php
+++ /dev/null
@@ -1,51 +0,0 @@
-cigar = $cigar;
-  }
-  public function getCigar()
-  {
-    return $this->cigar;
-  }
-  public function setMappingQuality($mappingQuality)
-  {
-    $this->mappingQuality = $mappingQuality;
-  }
-  public function getMappingQuality()
-  {
-    return $this->mappingQuality;
-  }
-  public function setPosition(Google_Service_Genomics_Position $position)
-  {
-    $this->position = $position;
-  }
-  public function getPosition()
-  {
-    return $this->position;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Genomics/ListBasesResponse.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Genomics/ListBasesResponse.php
deleted file mode 100644
index 5e6dda64..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Genomics/ListBasesResponse.php
+++ /dev/null
@@ -1,48 +0,0 @@
-nextPageToken = $nextPageToken;
-  }
-  public function getNextPageToken()
-  {
-    return $this->nextPageToken;
-  }
-  public function setOffset($offset)
-  {
-    $this->offset = $offset;
-  }
-  public function getOffset()
-  {
-    return $this->offset;
-  }
-  public function setSequence($sequence)
-  {
-    $this->sequence = $sequence;
-  }
-  public function getSequence()
-  {
-    return $this->sequence;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Genomics/ListCoverageBucketsResponse.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Genomics/ListCoverageBucketsResponse.php
deleted file mode 100644
index 2b98ca2e..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Genomics/ListCoverageBucketsResponse.php
+++ /dev/null
@@ -1,50 +0,0 @@
-bucketWidth = $bucketWidth;
-  }
-  public function getBucketWidth()
-  {
-    return $this->bucketWidth;
-  }
-  public function setCoverageBuckets($coverageBuckets)
-  {
-    $this->coverageBuckets = $coverageBuckets;
-  }
-  public function getCoverageBuckets()
-  {
-    return $this->coverageBuckets;
-  }
-  public function setNextPageToken($nextPageToken)
-  {
-    $this->nextPageToken = $nextPageToken;
-  }
-  public function getNextPageToken()
-  {
-    return $this->nextPageToken;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Genomics/ListDatasetsResponse.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Genomics/ListDatasetsResponse.php
deleted file mode 100644
index e4460911..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Genomics/ListDatasetsResponse.php
+++ /dev/null
@@ -1,41 +0,0 @@
-datasets = $datasets;
-  }
-  public function getDatasets()
-  {
-    return $this->datasets;
-  }
-  public function setNextPageToken($nextPageToken)
-  {
-    $this->nextPageToken = $nextPageToken;
-  }
-  public function getNextPageToken()
-  {
-    return $this->nextPageToken;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Genomics/ListOperationsResponse.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Genomics/ListOperationsResponse.php
deleted file mode 100644
index f96a1025..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Genomics/ListOperationsResponse.php
+++ /dev/null
@@ -1,41 +0,0 @@
-nextPageToken = $nextPageToken;
-  }
-  public function getNextPageToken()
-  {
-    return $this->nextPageToken;
-  }
-  public function setOperations($operations)
-  {
-    $this->operations = $operations;
-  }
-  public function getOperations()
-  {
-    return $this->operations;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Genomics/MergeVariantsRequest.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Genomics/MergeVariantsRequest.php
deleted file mode 100644
index 06dad4b0..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Genomics/MergeVariantsRequest.php
+++ /dev/null
@@ -1,50 +0,0 @@
-infoMergeConfig = $infoMergeConfig;
-  }
-  public function getInfoMergeConfig()
-  {
-    return $this->infoMergeConfig;
-  }
-  public function setVariantSetId($variantSetId)
-  {
-    $this->variantSetId = $variantSetId;
-  }
-  public function getVariantSetId()
-  {
-    return $this->variantSetId;
-  }
-  public function setVariants($variants)
-  {
-    $this->variants = $variants;
-  }
-  public function getVariants()
-  {
-    return $this->variants;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Genomics/Operation.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Genomics/Operation.php
deleted file mode 100644
index 1b28aa2c..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Genomics/Operation.php
+++ /dev/null
@@ -1,67 +0,0 @@
-done = $done;
-  }
-  public function getDone()
-  {
-    return $this->done;
-  }
-  public function setError(Google_Service_Genomics_Status $error)
-  {
-    $this->error = $error;
-  }
-  public function getError()
-  {
-    return $this->error;
-  }
-  public function setMetadata($metadata)
-  {
-    $this->metadata = $metadata;
-  }
-  public function getMetadata()
-  {
-    return $this->metadata;
-  }
-  public function setName($name)
-  {
-    $this->name = $name;
-  }
-  public function getName()
-  {
-    return $this->name;
-  }
-  public function setResponse($response)
-  {
-    $this->response = $response;
-  }
-  public function getResponse()
-  {
-    return $this->response;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Genomics/OperationEvent.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Genomics/OperationEvent.php
deleted file mode 100644
index 0c43648e..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Genomics/OperationEvent.php
+++ /dev/null
@@ -1,48 +0,0 @@
-description = $description;
-  }
-  public function getDescription()
-  {
-    return $this->description;
-  }
-  public function setEndTime($endTime)
-  {
-    $this->endTime = $endTime;
-  }
-  public function getEndTime()
-  {
-    return $this->endTime;
-  }
-  public function setStartTime($startTime)
-  {
-    $this->startTime = $startTime;
-  }
-  public function getStartTime()
-  {
-    return $this->startTime;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Genomics/OperationMetadata.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Genomics/OperationMetadata.php
deleted file mode 100644
index 04268ac8..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Genomics/OperationMetadata.php
+++ /dev/null
@@ -1,104 +0,0 @@
-clientId = $clientId;
-  }
-  public function getClientId()
-  {
-    return $this->clientId;
-  }
-  public function setCreateTime($createTime)
-  {
-    $this->createTime = $createTime;
-  }
-  public function getCreateTime()
-  {
-    return $this->createTime;
-  }
-  public function setEndTime($endTime)
-  {
-    $this->endTime = $endTime;
-  }
-  public function getEndTime()
-  {
-    return $this->endTime;
-  }
-  public function setEvents($events)
-  {
-    $this->events = $events;
-  }
-  public function getEvents()
-  {
-    return $this->events;
-  }
-  public function setLabels($labels)
-  {
-    $this->labels = $labels;
-  }
-  public function getLabels()
-  {
-    return $this->labels;
-  }
-  public function setProjectId($projectId)
-  {
-    $this->projectId = $projectId;
-  }
-  public function getProjectId()
-  {
-    return $this->projectId;
-  }
-  public function setRequest($request)
-  {
-    $this->request = $request;
-  }
-  public function getRequest()
-  {
-    return $this->request;
-  }
-  public function setRuntimeMetadata($runtimeMetadata)
-  {
-    $this->runtimeMetadata = $runtimeMetadata;
-  }
-  public function getRuntimeMetadata()
-  {
-    return $this->runtimeMetadata;
-  }
-  public function setStartTime($startTime)
-  {
-    $this->startTime = $startTime;
-  }
-  public function getStartTime()
-  {
-    return $this->startTime;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Genomics/Policy.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Genomics/Policy.php
deleted file mode 100644
index 7228e7bf..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Genomics/Policy.php
+++ /dev/null
@@ -1,50 +0,0 @@
-bindings = $bindings;
-  }
-  public function getBindings()
-  {
-    return $this->bindings;
-  }
-  public function setEtag($etag)
-  {
-    $this->etag = $etag;
-  }
-  public function getEtag()
-  {
-    return $this->etag;
-  }
-  public function setVersion($version)
-  {
-    $this->version = $version;
-  }
-  public function getVersion()
-  {
-    return $this->version;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Genomics/Position.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Genomics/Position.php
deleted file mode 100644
index 98be9f87..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Genomics/Position.php
+++ /dev/null
@@ -1,48 +0,0 @@
-position = $position;
-  }
-  public function getPosition()
-  {
-    return $this->position;
-  }
-  public function setReferenceName($referenceName)
-  {
-    $this->referenceName = $referenceName;
-  }
-  public function getReferenceName()
-  {
-    return $this->referenceName;
-  }
-  public function setReverseStrand($reverseStrand)
-  {
-    $this->reverseStrand = $reverseStrand;
-  }
-  public function getReverseStrand()
-  {
-    return $this->reverseStrand;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Genomics/Program.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Genomics/Program.php
deleted file mode 100644
index 94438673..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Genomics/Program.php
+++ /dev/null
@@ -1,66 +0,0 @@
-commandLine = $commandLine;
-  }
-  public function getCommandLine()
-  {
-    return $this->commandLine;
-  }
-  public function setId($id)
-  {
-    $this->id = $id;
-  }
-  public function getId()
-  {
-    return $this->id;
-  }
-  public function setName($name)
-  {
-    $this->name = $name;
-  }
-  public function getName()
-  {
-    return $this->name;
-  }
-  public function setPrevProgramId($prevProgramId)
-  {
-    $this->prevProgramId = $prevProgramId;
-  }
-  public function getPrevProgramId()
-  {
-    return $this->prevProgramId;
-  }
-  public function setVersion($version)
-  {
-    $this->version = $version;
-  }
-  public function getVersion()
-  {
-    return $this->version;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Genomics/Range.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Genomics/Range.php
deleted file mode 100644
index 04ca770b..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Genomics/Range.php
+++ /dev/null
@@ -1,48 +0,0 @@
-end = $end;
-  }
-  public function getEnd()
-  {
-    return $this->end;
-  }
-  public function setReferenceName($referenceName)
-  {
-    $this->referenceName = $referenceName;
-  }
-  public function getReferenceName()
-  {
-    return $this->referenceName;
-  }
-  public function setStart($start)
-  {
-    $this->start = $start;
-  }
-  public function getStart()
-  {
-    return $this->start;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Genomics/Read.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Genomics/Read.php
deleted file mode 100644
index 99aa8d60..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Genomics/Read.php
+++ /dev/null
@@ -1,177 +0,0 @@
-alignedQuality = $alignedQuality;
-  }
-  public function getAlignedQuality()
-  {
-    return $this->alignedQuality;
-  }
-  public function setAlignedSequence($alignedSequence)
-  {
-    $this->alignedSequence = $alignedSequence;
-  }
-  public function getAlignedSequence()
-  {
-    return $this->alignedSequence;
-  }
-  public function setAlignment(Google_Service_Genomics_LinearAlignment $alignment)
-  {
-    $this->alignment = $alignment;
-  }
-  public function getAlignment()
-  {
-    return $this->alignment;
-  }
-  public function setDuplicateFragment($duplicateFragment)
-  {
-    $this->duplicateFragment = $duplicateFragment;
-  }
-  public function getDuplicateFragment()
-  {
-    return $this->duplicateFragment;
-  }
-  public function setFailedVendorQualityChecks($failedVendorQualityChecks)
-  {
-    $this->failedVendorQualityChecks = $failedVendorQualityChecks;
-  }
-  public function getFailedVendorQualityChecks()
-  {
-    return $this->failedVendorQualityChecks;
-  }
-  public function setFragmentLength($fragmentLength)
-  {
-    $this->fragmentLength = $fragmentLength;
-  }
-  public function getFragmentLength()
-  {
-    return $this->fragmentLength;
-  }
-  public function setFragmentName($fragmentName)
-  {
-    $this->fragmentName = $fragmentName;
-  }
-  public function getFragmentName()
-  {
-    return $this->fragmentName;
-  }
-  public function setId($id)
-  {
-    $this->id = $id;
-  }
-  public function getId()
-  {
-    return $this->id;
-  }
-  public function setInfo($info)
-  {
-    $this->info = $info;
-  }
-  public function getInfo()
-  {
-    return $this->info;
-  }
-  public function setNextMatePosition(Google_Service_Genomics_Position $nextMatePosition)
-  {
-    $this->nextMatePosition = $nextMatePosition;
-  }
-  public function getNextMatePosition()
-  {
-    return $this->nextMatePosition;
-  }
-  public function setNumberReads($numberReads)
-  {
-    $this->numberReads = $numberReads;
-  }
-  public function getNumberReads()
-  {
-    return $this->numberReads;
-  }
-  public function setProperPlacement($properPlacement)
-  {
-    $this->properPlacement = $properPlacement;
-  }
-  public function getProperPlacement()
-  {
-    return $this->properPlacement;
-  }
-  public function setReadGroupId($readGroupId)
-  {
-    $this->readGroupId = $readGroupId;
-  }
-  public function getReadGroupId()
-  {
-    return $this->readGroupId;
-  }
-  public function setReadGroupSetId($readGroupSetId)
-  {
-    $this->readGroupSetId = $readGroupSetId;
-  }
-  public function getReadGroupSetId()
-  {
-    return $this->readGroupSetId;
-  }
-  public function setReadNumber($readNumber)
-  {
-    $this->readNumber = $readNumber;
-  }
-  public function getReadNumber()
-  {
-    return $this->readNumber;
-  }
-  public function setSecondaryAlignment($secondaryAlignment)
-  {
-    $this->secondaryAlignment = $secondaryAlignment;
-  }
-  public function getSecondaryAlignment()
-  {
-    return $this->secondaryAlignment;
-  }
-  public function setSupplementaryAlignment($supplementaryAlignment)
-  {
-    $this->supplementaryAlignment = $supplementaryAlignment;
-  }
-  public function getSupplementaryAlignment()
-  {
-    return $this->supplementaryAlignment;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Genomics/ReadGroup.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Genomics/ReadGroup.php
deleted file mode 100644
index aa63bd32..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Genomics/ReadGroup.php
+++ /dev/null
@@ -1,114 +0,0 @@
-datasetId = $datasetId;
-  }
-  public function getDatasetId()
-  {
-    return $this->datasetId;
-  }
-  public function setDescription($description)
-  {
-    $this->description = $description;
-  }
-  public function getDescription()
-  {
-    return $this->description;
-  }
-  public function setExperiment(Google_Service_Genomics_Experiment $experiment)
-  {
-    $this->experiment = $experiment;
-  }
-  public function getExperiment()
-  {
-    return $this->experiment;
-  }
-  public function setId($id)
-  {
-    $this->id = $id;
-  }
-  public function getId()
-  {
-    return $this->id;
-  }
-  public function setInfo($info)
-  {
-    $this->info = $info;
-  }
-  public function getInfo()
-  {
-    return $this->info;
-  }
-  public function setName($name)
-  {
-    $this->name = $name;
-  }
-  public function getName()
-  {
-    return $this->name;
-  }
-  public function setPredictedInsertSize($predictedInsertSize)
-  {
-    $this->predictedInsertSize = $predictedInsertSize;
-  }
-  public function getPredictedInsertSize()
-  {
-    return $this->predictedInsertSize;
-  }
-  public function setPrograms($programs)
-  {
-    $this->programs = $programs;
-  }
-  public function getPrograms()
-  {
-    return $this->programs;
-  }
-  public function setReferenceSetId($referenceSetId)
-  {
-    $this->referenceSetId = $referenceSetId;
-  }
-  public function getReferenceSetId()
-  {
-    return $this->referenceSetId;
-  }
-  public function setSampleId($sampleId)
-  {
-    $this->sampleId = $sampleId;
-  }
-  public function getSampleId()
-  {
-    return $this->sampleId;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Genomics/ReadGroupSet.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Genomics/ReadGroupSet.php
deleted file mode 100644
index 26d8871c..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Genomics/ReadGroupSet.php
+++ /dev/null
@@ -1,86 +0,0 @@
-datasetId = $datasetId;
-  }
-  public function getDatasetId()
-  {
-    return $this->datasetId;
-  }
-  public function setFilename($filename)
-  {
-    $this->filename = $filename;
-  }
-  public function getFilename()
-  {
-    return $this->filename;
-  }
-  public function setId($id)
-  {
-    $this->id = $id;
-  }
-  public function getId()
-  {
-    return $this->id;
-  }
-  public function setInfo($info)
-  {
-    $this->info = $info;
-  }
-  public function getInfo()
-  {
-    return $this->info;
-  }
-  public function setName($name)
-  {
-    $this->name = $name;
-  }
-  public function getName()
-  {
-    return $this->name;
-  }
-  public function setReadGroups($readGroups)
-  {
-    $this->readGroups = $readGroups;
-  }
-  public function getReadGroups()
-  {
-    return $this->readGroups;
-  }
-  public function setReferenceSetId($referenceSetId)
-  {
-    $this->referenceSetId = $referenceSetId;
-  }
-  public function getReferenceSetId()
-  {
-    return $this->referenceSetId;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Genomics/Reference.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Genomics/Reference.php
deleted file mode 100644
index c9184497..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Genomics/Reference.php
+++ /dev/null
@@ -1,85 +0,0 @@
-id = $id;
-  }
-  public function getId()
-  {
-    return $this->id;
-  }
-  public function setLength($length)
-  {
-    $this->length = $length;
-  }
-  public function getLength()
-  {
-    return $this->length;
-  }
-  public function setMd5checksum($md5checksum)
-  {
-    $this->md5checksum = $md5checksum;
-  }
-  public function getMd5checksum()
-  {
-    return $this->md5checksum;
-  }
-  public function setName($name)
-  {
-    $this->name = $name;
-  }
-  public function getName()
-  {
-    return $this->name;
-  }
-  public function setNcbiTaxonId($ncbiTaxonId)
-  {
-    $this->ncbiTaxonId = $ncbiTaxonId;
-  }
-  public function getNcbiTaxonId()
-  {
-    return $this->ncbiTaxonId;
-  }
-  public function setSourceAccessions($sourceAccessions)
-  {
-    $this->sourceAccessions = $sourceAccessions;
-  }
-  public function getSourceAccessions()
-  {
-    return $this->sourceAccessions;
-  }
-  public function setSourceUri($sourceUri)
-  {
-    $this->sourceUri = $sourceUri;
-  }
-  public function getSourceUri()
-  {
-    return $this->sourceUri;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Genomics/ReferenceBound.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Genomics/ReferenceBound.php
deleted file mode 100644
index 824d0c99..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Genomics/ReferenceBound.php
+++ /dev/null
@@ -1,39 +0,0 @@
-referenceName = $referenceName;
-  }
-  public function getReferenceName()
-  {
-    return $this->referenceName;
-  }
-  public function setUpperBound($upperBound)
-  {
-    $this->upperBound = $upperBound;
-  }
-  public function getUpperBound()
-  {
-    return $this->upperBound;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Genomics/ReferenceSet.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Genomics/ReferenceSet.php
deleted file mode 100644
index d52726f1..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Genomics/ReferenceSet.php
+++ /dev/null
@@ -1,94 +0,0 @@
-assemblyId = $assemblyId;
-  }
-  public function getAssemblyId()
-  {
-    return $this->assemblyId;
-  }
-  public function setDescription($description)
-  {
-    $this->description = $description;
-  }
-  public function getDescription()
-  {
-    return $this->description;
-  }
-  public function setId($id)
-  {
-    $this->id = $id;
-  }
-  public function getId()
-  {
-    return $this->id;
-  }
-  public function setMd5checksum($md5checksum)
-  {
-    $this->md5checksum = $md5checksum;
-  }
-  public function getMd5checksum()
-  {
-    return $this->md5checksum;
-  }
-  public function setNcbiTaxonId($ncbiTaxonId)
-  {
-    $this->ncbiTaxonId = $ncbiTaxonId;
-  }
-  public function getNcbiTaxonId()
-  {
-    return $this->ncbiTaxonId;
-  }
-  public function setReferenceIds($referenceIds)
-  {
-    $this->referenceIds = $referenceIds;
-  }
-  public function getReferenceIds()
-  {
-    return $this->referenceIds;
-  }
-  public function setSourceAccessions($sourceAccessions)
-  {
-    $this->sourceAccessions = $sourceAccessions;
-  }
-  public function getSourceAccessions()
-  {
-    return $this->sourceAccessions;
-  }
-  public function setSourceUri($sourceUri)
-  {
-    $this->sourceUri = $sourceUri;
-  }
-  public function getSourceUri()
-  {
-    return $this->sourceUri;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Genomics/Resource/Annotations.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Genomics/Resource/Annotations.php
deleted file mode 100644
index 04837db9..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Genomics/Resource/Annotations.php
+++ /dev/null
@@ -1,149 +0,0 @@
-
- *   $genomicsService = new Google_Service_Genomics(...);
- *   $annotations = $genomicsService->annotations;
- *  
- */
-class Google_Service_Genomics_Resource_Annotations extends Google_Service_Resource
-{
-  /**
-   * Creates one or more new annotations atomically. All annotations must belong
-   * to the same annotation set. Caller must have WRITE permission for this
-   * annotation set. For optimal performance, batch positionally adjacent
-   * annotations together.
-   *
-   * If the request has a systemic issue, such as an attempt to write to an
-   * inaccessible annotation set, the entire RPC will fail accordingly. For lesser
-   * data issues, when possible an error will be isolated to the corresponding
-   * batch entry in the response; the remaining well formed annotations will be
-   * created normally.
-   *
-   * For details on the requirements for each individual annotation resource, see
-   * CreateAnnotation. (annotations.batchCreate)
-   *
-   * @param Google_Service_Genomics_BatchCreateAnnotationsRequest $postBody
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Genomics_BatchCreateAnnotationsResponse
-   */
-  public function batchCreate(Google_Service_Genomics_BatchCreateAnnotationsRequest $postBody, $optParams = array())
-  {
-    $params = array('postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('batchCreate', array($params), "Google_Service_Genomics_BatchCreateAnnotationsResponse");
-  }
-  /**
-   * Creates a new annotation. Caller must have WRITE permission for the
-   * associated annotation set.
-   *
-   * The following fields are required:
-   *
-   * * annotationSetId * referenceName or   referenceId
-   *
-   * ### Transcripts
-   *
-   * For annotations of type TRANSCRIPT, the following fields of transcript must
-   * be provided:
-   *
-   * * exons.start * exons.end
-   *
-   * All other fields may be optionally specified, unless documented as being
-   * server-generated (for example, the `id` field). The annotated range must be
-   * no longer than 100Mbp (mega base pairs). See the Annotation resource for
-   * additional restrictions on each field. (annotations.create)
-   *
-   * @param Google_Service_Genomics_Annotation $postBody
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Genomics_Annotation
-   */
-  public function create(Google_Service_Genomics_Annotation $postBody, $optParams = array())
-  {
-    $params = array('postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('create', array($params), "Google_Service_Genomics_Annotation");
-  }
-  /**
-   * Deletes an annotation. Caller must have WRITE permission for the associated
-   * annotation set. (annotations.delete)
-   *
-   * @param string $annotationId The ID of the annotation to be deleted.
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Genomics_GenomicsEmpty
-   */
-  public function delete($annotationId, $optParams = array())
-  {
-    $params = array('annotationId' => $annotationId);
-    $params = array_merge($params, $optParams);
-    return $this->call('delete', array($params), "Google_Service_Genomics_GenomicsEmpty");
-  }
-  /**
-   * Gets an annotation. Caller must have READ permission for the associated
-   * annotation set. (annotations.get)
-   *
-   * @param string $annotationId The ID of the annotation to be retrieved.
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Genomics_Annotation
-   */
-  public function get($annotationId, $optParams = array())
-  {
-    $params = array('annotationId' => $annotationId);
-    $params = array_merge($params, $optParams);
-    return $this->call('get', array($params), "Google_Service_Genomics_Annotation");
-  }
-  /**
-   * Searches for annotations that match the given criteria. Results are ordered
-   * by genomic coordinate (by reference sequence, then position). Annotations
-   * with equivalent genomic coordinates are returned in an unspecified order.
-   * This order is consistent, such that two queries for the same content
-   * (regardless of page size) yield annotations in the same order across their
-   * respective streams of paginated responses. Caller must have READ permission
-   * for the queried annotation sets. (annotations.search)
-   *
-   * @param Google_Service_Genomics_SearchAnnotationsRequest $postBody
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Genomics_SearchAnnotationsResponse
-   */
-  public function search(Google_Service_Genomics_SearchAnnotationsRequest $postBody, $optParams = array())
-  {
-    $params = array('postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('search', array($params), "Google_Service_Genomics_SearchAnnotationsResponse");
-  }
-  /**
-   * Updates an annotation. Caller must have WRITE permission for the associated
-   * dataset. (annotations.update)
-   *
-   * @param string $annotationId The ID of the annotation to be updated.
-   * @param Google_Service_Genomics_Annotation $postBody
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param string updateMask An optional mask specifying which fields to
-   * update. Mutable fields are name, variant, transcript, and info. If
-   * unspecified, all mutable fields will be updated.
-   * @return Google_Service_Genomics_Annotation
-   */
-  public function update($annotationId, Google_Service_Genomics_Annotation $postBody, $optParams = array())
-  {
-    $params = array('annotationId' => $annotationId, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('update', array($params), "Google_Service_Genomics_Annotation");
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Genomics/Resource/Annotationsets.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Genomics/Resource/Annotationsets.php
deleted file mode 100644
index 662715ab..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Genomics/Resource/Annotationsets.php
+++ /dev/null
@@ -1,116 +0,0 @@
-
- *   $genomicsService = new Google_Service_Genomics(...);
- *   $annotationsets = $genomicsService->annotationsets;
- *  
- */
-class Google_Service_Genomics_Resource_Annotationsets extends Google_Service_Resource
-{
-  /**
-   * Creates a new annotation set. Caller must have WRITE permission for the
-   * associated dataset.
-   *
-   * The following fields are required:
-   *
-   *   * datasetId   * referenceSetId
-   *
-   * All other fields may be optionally specified, unless documented as being
-   * server-generated (for example, the `id` field). (annotationsets.create)
-   *
-   * @param Google_Service_Genomics_AnnotationSet $postBody
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Genomics_AnnotationSet
-   */
-  public function create(Google_Service_Genomics_AnnotationSet $postBody, $optParams = array())
-  {
-    $params = array('postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('create', array($params), "Google_Service_Genomics_AnnotationSet");
-  }
-  /**
-   * Deletes an annotation set. Caller must have WRITE permission for the
-   * associated annotation set. (annotationsets.delete)
-   *
-   * @param string $annotationSetId The ID of the annotation set to be deleted.
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Genomics_GenomicsEmpty
-   */
-  public function delete($annotationSetId, $optParams = array())
-  {
-    $params = array('annotationSetId' => $annotationSetId);
-    $params = array_merge($params, $optParams);
-    return $this->call('delete', array($params), "Google_Service_Genomics_GenomicsEmpty");
-  }
-  /**
-   * Gets an annotation set. Caller must have READ permission for the associated
-   * dataset. (annotationsets.get)
-   *
-   * @param string $annotationSetId The ID of the annotation set to be retrieved.
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Genomics_AnnotationSet
-   */
-  public function get($annotationSetId, $optParams = array())
-  {
-    $params = array('annotationSetId' => $annotationSetId);
-    $params = array_merge($params, $optParams);
-    return $this->call('get', array($params), "Google_Service_Genomics_AnnotationSet");
-  }
-  /**
-   * Searches for annotation sets that match the given criteria. Annotation sets
-   * are returned in an unspecified order. This order is consistent, such that two
-   * queries for the same content (regardless of page size) yield annotation sets
-   * in the same order across their respective streams of paginated responses.
-   * Caller must have READ permission for the queried datasets.
-   * (annotationsets.search)
-   *
-   * @param Google_Service_Genomics_SearchAnnotationSetsRequest $postBody
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Genomics_SearchAnnotationSetsResponse
-   */
-  public function search(Google_Service_Genomics_SearchAnnotationSetsRequest $postBody, $optParams = array())
-  {
-    $params = array('postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('search', array($params), "Google_Service_Genomics_SearchAnnotationSetsResponse");
-  }
-  /**
-   * Updates an annotation set. The update must respect all mutability
-   * restrictions and other invariants described on the annotation set resource.
-   * Caller must have WRITE permission for the associated dataset.
-   * (annotationsets.update)
-   *
-   * @param string $annotationSetId The ID of the annotation set to be updated.
-   * @param Google_Service_Genomics_AnnotationSet $postBody
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param string updateMask An optional mask specifying which fields to
-   * update. Mutable fields are name, source_uri, and info. If unspecified, all
-   * mutable fields will be updated.
-   * @return Google_Service_Genomics_AnnotationSet
-   */
-  public function update($annotationSetId, Google_Service_Genomics_AnnotationSet $postBody, $optParams = array())
-  {
-    $params = array('annotationSetId' => $annotationSetId, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('update', array($params), "Google_Service_Genomics_AnnotationSet");
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Genomics/Resource/Callsets.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Genomics/Resource/Callsets.php
deleted file mode 100644
index 5d406429..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Genomics/Resource/Callsets.php
+++ /dev/null
@@ -1,124 +0,0 @@
-
- *   $genomicsService = new Google_Service_Genomics(...);
- *   $callsets = $genomicsService->callsets;
- *  
- */
-class Google_Service_Genomics_Resource_Callsets extends Google_Service_Resource
-{
-  /**
-   * Creates a new call set.
-   *
-   * For the definitions of call sets and other genomics resources, see
-   * [Fundamentals of Google Genomics](https://cloud.google.com/genomics
-   * /fundamentals-of-google-genomics) (callsets.create)
-   *
-   * @param Google_Service_Genomics_CallSet $postBody
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Genomics_CallSet
-   */
-  public function create(Google_Service_Genomics_CallSet $postBody, $optParams = array())
-  {
-    $params = array('postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('create', array($params), "Google_Service_Genomics_CallSet");
-  }
-  /**
-   * Deletes a call set.
-   *
-   * For the definitions of call sets and other genomics resources, see
-   * [Fundamentals of Google Genomics](https://cloud.google.com/genomics
-   * /fundamentals-of-google-genomics) (callsets.delete)
-   *
-   * @param string $callSetId The ID of the call set to be deleted.
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Genomics_GenomicsEmpty
-   */
-  public function delete($callSetId, $optParams = array())
-  {
-    $params = array('callSetId' => $callSetId);
-    $params = array_merge($params, $optParams);
-    return $this->call('delete', array($params), "Google_Service_Genomics_GenomicsEmpty");
-  }
-  /**
-   * Gets a call set by ID.
-   *
-   * For the definitions of call sets and other genomics resources, see
-   * [Fundamentals of Google Genomics](https://cloud.google.com/genomics
-   * /fundamentals-of-google-genomics) (callsets.get)
-   *
-   * @param string $callSetId The ID of the call set.
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Genomics_CallSet
-   */
-  public function get($callSetId, $optParams = array())
-  {
-    $params = array('callSetId' => $callSetId);
-    $params = array_merge($params, $optParams);
-    return $this->call('get', array($params), "Google_Service_Genomics_CallSet");
-  }
-  /**
-   * Updates a call set.
-   *
-   * For the definitions of call sets and other genomics resources, see
-   * [Fundamentals of Google Genomics](https://cloud.google.com/genomics
-   * /fundamentals-of-google-genomics)
-   *
-   * This method supports patch semantics. (callsets.patch)
-   *
-   * @param string $callSetId The ID of the call set to be updated.
-   * @param Google_Service_Genomics_CallSet $postBody
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param string updateMask An optional mask specifying which fields to
-   * update. At this time, the only mutable field is name. The only acceptable
-   * value is "name". If unspecified, all mutable fields will be updated.
-   * @return Google_Service_Genomics_CallSet
-   */
-  public function patch($callSetId, Google_Service_Genomics_CallSet $postBody, $optParams = array())
-  {
-    $params = array('callSetId' => $callSetId, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('patch', array($params), "Google_Service_Genomics_CallSet");
-  }
-  /**
-   * Gets a list of call sets matching the criteria.
-   *
-   * For the definitions of call sets and other genomics resources, see
-   * [Fundamentals of Google Genomics](https://cloud.google.com/genomics
-   * /fundamentals-of-google-genomics)
-   *
-   * Implements [GlobalAllianceApi.searchCallSets](https://github.com/ga4gh/schema
-   * s/blob/v0.5.1/src/main/resources/avro/variantmethods.avdl#L178).
-   * (callsets.search)
-   *
-   * @param Google_Service_Genomics_SearchCallSetsRequest $postBody
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Genomics_SearchCallSetsResponse
-   */
-  public function search(Google_Service_Genomics_SearchCallSetsRequest $postBody, $optParams = array())
-  {
-    $params = array('postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('search', array($params), "Google_Service_Genomics_SearchCallSetsResponse");
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Genomics/Resource/Datasets.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Genomics/Resource/Datasets.php
deleted file mode 100644
index f989c1f0..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Genomics/Resource/Datasets.php
+++ /dev/null
@@ -1,214 +0,0 @@
-
- *   $genomicsService = new Google_Service_Genomics(...);
- *   $datasets = $genomicsService->datasets;
- *  
- */
-class Google_Service_Genomics_Resource_Datasets extends Google_Service_Resource
-{
-  /**
-   * Creates a new dataset.
-   *
-   * For the definitions of datasets and other genomics resources, see
-   * [Fundamentals of Google Genomics](https://cloud.google.com/genomics
-   * /fundamentals-of-google-genomics) (datasets.create)
-   *
-   * @param Google_Service_Genomics_Dataset $postBody
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Genomics_Dataset
-   */
-  public function create(Google_Service_Genomics_Dataset $postBody, $optParams = array())
-  {
-    $params = array('postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('create', array($params), "Google_Service_Genomics_Dataset");
-  }
-  /**
-   * Deletes a dataset and all of its contents (all read group sets, reference
-   * sets, variant sets, call sets, annotation sets, etc.) This is reversible (up
-   * to one week after the deletion) via the datasets.undelete operation.
-   *
-   * For the definitions of datasets and other genomics resources, see
-   * [Fundamentals of Google Genomics](https://cloud.google.com/genomics
-   * /fundamentals-of-google-genomics) (datasets.delete)
-   *
-   * @param string $datasetId The ID of the dataset to be deleted.
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Genomics_GenomicsEmpty
-   */
-  public function delete($datasetId, $optParams = array())
-  {
-    $params = array('datasetId' => $datasetId);
-    $params = array_merge($params, $optParams);
-    return $this->call('delete', array($params), "Google_Service_Genomics_GenomicsEmpty");
-  }
-  /**
-   * Gets a dataset by ID.
-   *
-   * For the definitions of datasets and other genomics resources, see
-   * [Fundamentals of Google Genomics](https://cloud.google.com/genomics
-   * /fundamentals-of-google-genomics) (datasets.get)
-   *
-   * @param string $datasetId The ID of the dataset.
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Genomics_Dataset
-   */
-  public function get($datasetId, $optParams = array())
-  {
-    $params = array('datasetId' => $datasetId);
-    $params = array_merge($params, $optParams);
-    return $this->call('get', array($params), "Google_Service_Genomics_Dataset");
-  }
-  /**
-   * Gets the access control policy for the dataset. This is empty if the policy
-   * or resource does not exist.
-   *
-   * See Getting a Policy for more information.
-   *
-   * For the definitions of datasets and other genomics resources, see
-   * [Fundamentals of Google Genomics](https://cloud.google.com/genomics
-   * /fundamentals-of-google-genomics) (datasets.getIamPolicy)
-   *
-   * @param string $resource REQUIRED: The resource for which policy is being
-   * specified. Format is `datasets/`.
-   * @param Google_Service_Genomics_GetIamPolicyRequest $postBody
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Genomics_Policy
-   */
-  public function getIamPolicy($resource, Google_Service_Genomics_GetIamPolicyRequest $postBody, $optParams = array())
-  {
-    $params = array('resource' => $resource, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('getIamPolicy', array($params), "Google_Service_Genomics_Policy");
-  }
-  /**
-   * Lists datasets within a project.
-   *
-   * For the definitions of datasets and other genomics resources, see
-   * [Fundamentals of Google Genomics](https://cloud.google.com/genomics
-   * /fundamentals-of-google-genomics) (datasets.listDatasets)
-   *
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param string pageToken The continuation token, which is used to page
-   * through large result sets. To get the next page of results, set this
-   * parameter to the value of `nextPageToken` from the previous response.
-   * @opt_param int pageSize The maximum number of results to return in a single
-   * page. If unspecified, defaults to 50. The maximum value is 1024.
-   * @opt_param string projectId Required. The Google Cloud project ID to list
-   * datasets for.
-   * @return Google_Service_Genomics_ListDatasetsResponse
-   */
-  public function listDatasets($optParams = array())
-  {
-    $params = array();
-    $params = array_merge($params, $optParams);
-    return $this->call('list', array($params), "Google_Service_Genomics_ListDatasetsResponse");
-  }
-  /**
-   * Updates a dataset.
-   *
-   * For the definitions of datasets and other genomics resources, see
-   * [Fundamentals of Google Genomics](https://cloud.google.com/genomics
-   * /fundamentals-of-google-genomics)
-   *
-   * This method supports patch semantics. (datasets.patch)
-   *
-   * @param string $datasetId The ID of the dataset to be updated.
-   * @param Google_Service_Genomics_Dataset $postBody
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param string updateMask An optional mask specifying which fields to
-   * update. At this time, the only mutable field is name. The only acceptable
-   * value is "name". If unspecified, all mutable fields will be updated.
-   * @return Google_Service_Genomics_Dataset
-   */
-  public function patch($datasetId, Google_Service_Genomics_Dataset $postBody, $optParams = array())
-  {
-    $params = array('datasetId' => $datasetId, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('patch', array($params), "Google_Service_Genomics_Dataset");
-  }
-  /**
-   * Sets the access control policy on the specified dataset. Replaces any
-   * existing policy.
-   *
-   * For the definitions of datasets and other genomics resources, see
-   * [Fundamentals of Google Genomics](https://cloud.google.com/genomics
-   * /fundamentals-of-google-genomics)
-   *
-   * See Setting a Policy for more information. (datasets.setIamPolicy)
-   *
-   * @param string $resource REQUIRED: The resource for which policy is being
-   * specified. Format is `datasets/`.
-   * @param Google_Service_Genomics_SetIamPolicyRequest $postBody
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Genomics_Policy
-   */
-  public function setIamPolicy($resource, Google_Service_Genomics_SetIamPolicyRequest $postBody, $optParams = array())
-  {
-    $params = array('resource' => $resource, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('setIamPolicy', array($params), "Google_Service_Genomics_Policy");
-  }
-  /**
-   * Returns permissions that a caller has on the specified resource. See Testing
-   * Permissions for more information.
-   *
-   * For the definitions of datasets and other genomics resources, see
-   * [Fundamentals of Google Genomics](https://cloud.google.com/genomics
-   * /fundamentals-of-google-genomics) (datasets.testIamPermissions)
-   *
-   * @param string $resource REQUIRED: The resource for which policy is being
-   * specified. Format is `datasets/`.
-   * @param Google_Service_Genomics_TestIamPermissionsRequest $postBody
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Genomics_TestIamPermissionsResponse
-   */
-  public function testIamPermissions($resource, Google_Service_Genomics_TestIamPermissionsRequest $postBody, $optParams = array())
-  {
-    $params = array('resource' => $resource, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('testIamPermissions', array($params), "Google_Service_Genomics_TestIamPermissionsResponse");
-  }
-  /**
-   * Undeletes a dataset by restoring a dataset which was deleted via this API.
-   *
-   * For the definitions of datasets and other genomics resources, see
-   * [Fundamentals of Google Genomics](https://cloud.google.com/genomics
-   * /fundamentals-of-google-genomics)
-   *
-   * This operation is only possible for a week after the deletion occurred.
-   * (datasets.undelete)
-   *
-   * @param string $datasetId The ID of the dataset to be undeleted.
-   * @param Google_Service_Genomics_UndeleteDatasetRequest $postBody
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Genomics_Dataset
-   */
-  public function undelete($datasetId, Google_Service_Genomics_UndeleteDatasetRequest $postBody, $optParams = array())
-  {
-    $params = array('datasetId' => $datasetId, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('undelete', array($params), "Google_Service_Genomics_Dataset");
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Genomics/Resource/Operations.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Genomics/Resource/Operations.php
deleted file mode 100644
index 982df693..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Genomics/Resource/Operations.php
+++ /dev/null
@@ -1,94 +0,0 @@
-
- *   $genomicsService = new Google_Service_Genomics(...);
- *   $operations = $genomicsService->operations;
- *  
- */
-class Google_Service_Genomics_Resource_Operations extends Google_Service_Resource
-{
-  /**
-   * Starts asynchronous cancellation on a long-running operation. The server
-   * makes a best effort to cancel the operation, but success is not guaranteed.
-   * Clients may use Operations.GetOperation or Operations.ListOperations to check
-   * whether the cancellation succeeded or the operation completed despite
-   * cancellation. (operations.cancel)
-   *
-   * @param string $name The name of the operation resource to be cancelled.
-   * @param Google_Service_Genomics_CancelOperationRequest $postBody
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Genomics_GenomicsEmpty
-   */
-  public function cancel($name, Google_Service_Genomics_CancelOperationRequest $postBody, $optParams = array())
-  {
-    $params = array('name' => $name, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('cancel', array($params), "Google_Service_Genomics_GenomicsEmpty");
-  }
-  /**
-   * Gets the latest state of a long-running operation.  Clients can use this
-   * method to poll the operation result at intervals as recommended by the API
-   * service. (operations.get)
-   *
-   * @param string $name The name of the operation resource.
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Genomics_Operation
-   */
-  public function get($name, $optParams = array())
-  {
-    $params = array('name' => $name);
-    $params = array_merge($params, $optParams);
-    return $this->call('get', array($params), "Google_Service_Genomics_Operation");
-  }
-  /**
-   * Lists operations that match the specified filter in the request.
-   * (operations.listOperations)
-   *
-   * @param string $name The name of the operation collection.
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param string filter A string for filtering Operations. The following
-   * filter fields are supported
-   *
-   * * projectId Required. Corresponds to   OperationMetadata.projectId. *
-   * createTime The time this job was created, in seconds from the
-   * [epoch](http://en.wikipedia.org/wiki/Unix_time). Can use `>=` and/or `<=`
-   * operators. * status Can be `RUNNING`, `SUCCESS`, `FAILURE`, or `CANCELED`.
-   * Only   one status may be specified. * labels.key where key is a label key.
-   *
-   * Examples
-   *
-   * * `projectId = my-project AND createTime >= 1432140000` * `projectId = my-
-   * project AND createTime >= 1432140000 AND createTime <= 1432150000 AND status
-   * = RUNNING` * `projectId = my-project AND labels.color = *` * `projectId = my-
-   * project AND labels.color = red`
-   * @opt_param string pageToken The standard list page token.
-   * @opt_param int pageSize The maximum number of results to return. If
-   * unspecified, defaults to 256. The maximum value is 2048.
-   * @return Google_Service_Genomics_ListOperationsResponse
-   */
-  public function listOperations($name, $optParams = array())
-  {
-    $params = array('name' => $name);
-    $params = array_merge($params, $optParams);
-    return $this->call('list', array($params), "Google_Service_Genomics_ListOperationsResponse");
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Genomics/Resource/Readgroupsets.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Genomics/Resource/Readgroupsets.php
deleted file mode 100644
index d8c1bf5e..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Genomics/Resource/Readgroupsets.php
+++ /dev/null
@@ -1,166 +0,0 @@
-
- *   $genomicsService = new Google_Service_Genomics(...);
- *   $readgroupsets = $genomicsService->readgroupsets;
- *  
- */
-class Google_Service_Genomics_Resource_Readgroupsets extends Google_Service_Resource
-{
-  /**
-   * Deletes a read group set.
-   *
-   * For the definitions of read group sets and other genomics resources, see
-   * [Fundamentals of Google Genomics](https://cloud.google.com/genomics
-   * /fundamentals-of-google-genomics) (readgroupsets.delete)
-   *
-   * @param string $readGroupSetId The ID of the read group set to be deleted. The
-   * caller must have WRITE permissions to the dataset associated with this read
-   * group set.
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Genomics_GenomicsEmpty
-   */
-  public function delete($readGroupSetId, $optParams = array())
-  {
-    $params = array('readGroupSetId' => $readGroupSetId);
-    $params = array_merge($params, $optParams);
-    return $this->call('delete', array($params), "Google_Service_Genomics_GenomicsEmpty");
-  }
-  /**
-   * Exports a read group set to a BAM file in Google Cloud Storage.
-   *
-   * For the definitions of read group sets and other genomics resources, see
-   * [Fundamentals of Google Genomics](https://cloud.google.com/genomics
-   * /fundamentals-of-google-genomics)
-   *
-   * Note that currently there may be some differences between exported BAM files
-   * and the original BAM file at the time of import. See ImportReadGroupSets for
-   * caveats. (readgroupsets.export)
-   *
-   * @param string $readGroupSetId Required. The ID of the read group set to
-   * export. The caller must have READ access to this read group set.
-   * @param Google_Service_Genomics_ExportReadGroupSetRequest $postBody
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Genomics_Operation
-   */
-  public function export($readGroupSetId, Google_Service_Genomics_ExportReadGroupSetRequest $postBody, $optParams = array())
-  {
-    $params = array('readGroupSetId' => $readGroupSetId, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('export', array($params), "Google_Service_Genomics_Operation");
-  }
-  /**
-   * Gets a read group set by ID.
-   *
-   * For the definitions of read group sets and other genomics resources, see
-   * [Fundamentals of Google Genomics](https://cloud.google.com/genomics
-   * /fundamentals-of-google-genomics) (readgroupsets.get)
-   *
-   * @param string $readGroupSetId The ID of the read group set.
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Genomics_ReadGroupSet
-   */
-  public function get($readGroupSetId, $optParams = array())
-  {
-    $params = array('readGroupSetId' => $readGroupSetId);
-    $params = array_merge($params, $optParams);
-    return $this->call('get', array($params), "Google_Service_Genomics_ReadGroupSet");
-  }
-  /**
-   * Creates read group sets by asynchronously importing the provided information.
-   *
-   * For the definitions of read group sets and other genomics resources, see
-   * [Fundamentals of Google Genomics](https://cloud.google.com/genomics
-   * /fundamentals-of-google-genomics)
-   *
-   * The caller must have WRITE permissions to the dataset.
-   *
-   * ## Notes on [BAM](https://samtools.github.io/hts-specs/SAMv1.pdf) import
-   *
-   * - Tags will be converted to strings - tag types are not preserved - Comments
-   * (`@CO`) in the input file header will not be preserved - Original header
-   * order of references (`@SQ`) will not be preserved - Any reverse stranded
-   * unmapped reads will be reverse complemented, and their qualities (also the
-   * "BQ" and "OQ" tags, if any) will be reversed - Unmapped reads will be
-   * stripped of positional information (reference name and position)
-   * (readgroupsets.import)
-   *
-   * @param Google_Service_Genomics_ImportReadGroupSetsRequest $postBody
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Genomics_Operation
-   */
-  public function import(Google_Service_Genomics_ImportReadGroupSetsRequest $postBody, $optParams = array())
-  {
-    $params = array('postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('import', array($params), "Google_Service_Genomics_Operation");
-  }
-  /**
-   * Updates a read group set.
-   *
-   * For the definitions of read group sets and other genomics resources, see
-   * [Fundamentals of Google Genomics](https://cloud.google.com/genomics
-   * /fundamentals-of-google-genomics)
-   *
-   * This method supports patch semantics. (readgroupsets.patch)
-   *
-   * @param string $readGroupSetId The ID of the read group set to be updated. The
-   * caller must have WRITE permissions to the dataset associated with this read
-   * group set.
-   * @param Google_Service_Genomics_ReadGroupSet $postBody
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param string updateMask An optional mask specifying which fields to
-   * update. Supported fields:
-   *
-   * * name. * referenceSetId.
-   *
-   * Leaving `updateMask` unset is equivalent to specifying all mutable fields.
-   * @return Google_Service_Genomics_ReadGroupSet
-   */
-  public function patch($readGroupSetId, Google_Service_Genomics_ReadGroupSet $postBody, $optParams = array())
-  {
-    $params = array('readGroupSetId' => $readGroupSetId, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('patch', array($params), "Google_Service_Genomics_ReadGroupSet");
-  }
-  /**
-   * Searches for read group sets matching the criteria.
-   *
-   * For the definitions of read group sets and other genomics resources, see
-   * [Fundamentals of Google Genomics](https://cloud.google.com/genomics
-   * /fundamentals-of-google-genomics)
-   *
-   * Implements [GlobalAllianceApi.searchReadGroupSets](https://github.com/ga4gh/s
-   * chemas/blob/v0.5.1/src/main/resources/avro/readmethods.avdl#L135).
-   * (readgroupsets.search)
-   *
-   * @param Google_Service_Genomics_SearchReadGroupSetsRequest $postBody
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Genomics_SearchReadGroupSetsResponse
-   */
-  public function search(Google_Service_Genomics_SearchReadGroupSetsRequest $postBody, $optParams = array())
-  {
-    $params = array('postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('search', array($params), "Google_Service_Genomics_SearchReadGroupSetsResponse");
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Genomics/Resource/ReadgroupsetsCoveragebuckets.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Genomics/Resource/ReadgroupsetsCoveragebuckets.php
deleted file mode 100644
index 6f17a4c0..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Genomics/Resource/ReadgroupsetsCoveragebuckets.php
+++ /dev/null
@@ -1,75 +0,0 @@
-
- *   $genomicsService = new Google_Service_Genomics(...);
- *   $coveragebuckets = $genomicsService->coveragebuckets;
- *  
- */
-class Google_Service_Genomics_Resource_ReadgroupsetsCoveragebuckets extends Google_Service_Resource
-{
-  /**
-   * Lists fixed width coverage buckets for a read group set, each of which
-   * correspond to a range of a reference sequence. Each bucket summarizes
-   * coverage information across its corresponding genomic range.
-   *
-   * For the definitions of read group sets and other genomics resources, see
-   * [Fundamentals of Google Genomics](https://cloud.google.com/genomics
-   * /fundamentals-of-google-genomics)
-   *
-   * Coverage is defined as the number of reads which are aligned to a given base
-   * in the reference sequence. Coverage buckets are available at several
-   * precomputed bucket widths, enabling retrieval of various coverage 'zoom
-   * levels'. The caller must have READ permissions for the target read group set.
-   * (coveragebuckets.listReadgroupsetsCoveragebuckets)
-   *
-   * @param string $readGroupSetId Required. The ID of the read group set over
-   * which coverage is requested.
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param string targetBucketWidth The desired width of each reported
-   * coverage bucket in base pairs. This will be rounded down to the nearest
-   * precomputed bucket width; the value of which is returned as `bucketWidth` in
-   * the response. Defaults to infinity (each bucket spans an entire reference
-   * sequence) or the length of the target range, if specified. The smallest
-   * precomputed `bucketWidth` is currently 2048 base pairs; this is subject to
-   * change.
-   * @opt_param string referenceName The name of the reference to query, within
-   * the reference set associated with this query. Optional.
-   * @opt_param string end The end position of the range on the reference, 0-based
-   * exclusive. If specified, `referenceName` must also be specified. If unset or
-   * 0, defaults to the length of the reference.
-   * @opt_param string pageToken The continuation token, which is used to page
-   * through large result sets. To get the next page of results, set this
-   * parameter to the value of `nextPageToken` from the previous response.
-   * @opt_param int pageSize The maximum number of results to return in a single
-   * page. If unspecified, defaults to 1024. The maximum value is 2048.
-   * @opt_param string start The start position of the range on the reference,
-   * 0-based inclusive. If specified, `referenceName` must also be specified.
-   * Defaults to 0.
-   * @return Google_Service_Genomics_ListCoverageBucketsResponse
-   */
-  public function listReadgroupsetsCoveragebuckets($readGroupSetId, $optParams = array())
-  {
-    $params = array('readGroupSetId' => $readGroupSetId);
-    $params = array_merge($params, $optParams);
-    return $this->call('list', array($params), "Google_Service_Genomics_ListCoverageBucketsResponse");
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Genomics/Resource/Reads.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Genomics/Resource/Reads.php
deleted file mode 100644
index a900fa94..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Genomics/Resource/Reads.php
+++ /dev/null
@@ -1,64 +0,0 @@
-
- *   $genomicsService = new Google_Service_Genomics(...);
- *   $reads = $genomicsService->reads;
- *  
- */
-class Google_Service_Genomics_Resource_Reads extends Google_Service_Resource
-{
-  /**
-   * Gets a list of reads for one or more read group sets.
-   *
-   * For the definitions of read group sets and other genomics resources, see
-   * [Fundamentals of Google Genomics](https://cloud.google.com/genomics
-   * /fundamentals-of-google-genomics)
-   *
-   * Reads search operates over a genomic coordinate space of reference sequence &
-   * position defined over the reference sequences to which the requested read
-   * group sets are aligned.
-   *
-   * If a target positional range is specified, search returns all reads whose
-   * alignment to the reference genome overlap the range. A query which specifies
-   * only read group set IDs yields all reads in those read group sets, including
-   * unmapped reads.
-   *
-   * All reads returned (including reads on subsequent pages) are ordered by
-   * genomic coordinate (by reference sequence, then position). Reads with
-   * equivalent genomic coordinates are returned in an unspecified order. This
-   * order is consistent, such that two queries for the same content (regardless
-   * of page size) yield reads in the same order across their respective streams
-   * of paginated responses.
-   *
-   * Implements [GlobalAllianceApi.searchReads](https://github.com/ga4gh/schemas/b
-   * lob/v0.5.1/src/main/resources/avro/readmethods.avdl#L85). (reads.search)
-   *
-   * @param Google_Service_Genomics_SearchReadsRequest $postBody
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Genomics_SearchReadsResponse
-   */
-  public function search(Google_Service_Genomics_SearchReadsRequest $postBody, $optParams = array())
-  {
-    $params = array('postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('search', array($params), "Google_Service_Genomics_SearchReadsResponse");
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Genomics/Resource/References.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Genomics/Resource/References.php
deleted file mode 100644
index f52fd8f8..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Genomics/Resource/References.php
+++ /dev/null
@@ -1,70 +0,0 @@
-
- *   $genomicsService = new Google_Service_Genomics(...);
- *   $references = $genomicsService->references;
- *  
- */
-class Google_Service_Genomics_Resource_References extends Google_Service_Resource
-{
-  /**
-   * Gets a reference.
-   *
-   * For the definitions of references and other genomics resources, see
-   * [Fundamentals of Google Genomics](https://cloud.google.com/genomics
-   * /fundamentals-of-google-genomics)
-   *
-   * Implements [GlobalAllianceApi.getReference](https://github.com/ga4gh/schemas/
-   * blob/v0.5.1/src/main/resources/avro/referencemethods.avdl#L158).
-   * (references.get)
-   *
-   * @param string $referenceId The ID of the reference.
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Genomics_Reference
-   */
-  public function get($referenceId, $optParams = array())
-  {
-    $params = array('referenceId' => $referenceId);
-    $params = array_merge($params, $optParams);
-    return $this->call('get', array($params), "Google_Service_Genomics_Reference");
-  }
-  /**
-   * Searches for references which match the given criteria.
-   *
-   * For the definitions of references and other genomics resources, see
-   * [Fundamentals of Google Genomics](https://cloud.google.com/genomics
-   * /fundamentals-of-google-genomics)
-   *
-   * Implements [GlobalAllianceApi.searchReferences](https://github.com/ga4gh/sche
-   * mas/blob/v0.5.1/src/main/resources/avro/referencemethods.avdl#L146).
-   * (references.search)
-   *
-   * @param Google_Service_Genomics_SearchReferencesRequest $postBody
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Genomics_SearchReferencesResponse
-   */
-  public function search(Google_Service_Genomics_SearchReferencesRequest $postBody, $optParams = array())
-  {
-    $params = array('postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('search', array($params), "Google_Service_Genomics_SearchReferencesResponse");
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Genomics/Resource/ReferencesBases.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Genomics/Resource/ReferencesBases.php
deleted file mode 100644
index 0e425078..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Genomics/Resource/ReferencesBases.php
+++ /dev/null
@@ -1,60 +0,0 @@
-
- *   $genomicsService = new Google_Service_Genomics(...);
- *   $bases = $genomicsService->bases;
- *  
- */
-class Google_Service_Genomics_Resource_ReferencesBases extends Google_Service_Resource
-{
-  /**
-   * Lists the bases in a reference, optionally restricted to a range.
-   *
-   * For the definitions of references and other genomics resources, see
-   * [Fundamentals of Google Genomics](https://cloud.google.com/genomics
-   * /fundamentals-of-google-genomics)
-   *
-   * Implements [GlobalAllianceApi.getReferenceBases](https://github.com/ga4gh/sch
-   * emas/blob/v0.5.1/src/main/resources/avro/referencemethods.avdl#L221).
-   * (bases.listReferencesBases)
-   *
-   * @param string $referenceId The ID of the reference.
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param string pageToken The continuation token, which is used to page
-   * through large result sets. To get the next page of results, set this
-   * parameter to the value of `nextPageToken` from the previous response.
-   * @opt_param int pageSize The maximum number of bases to return in a single
-   * page. If unspecified, defaults to 200Kbp (kilo base pairs). The maximum value
-   * is 10Mbp (mega base pairs).
-   * @opt_param string start The start position (0-based) of this query. Defaults
-   * to 0.
-   * @opt_param string end The end position (0-based, exclusive) of this query.
-   * Defaults to the length of this reference.
-   * @return Google_Service_Genomics_ListBasesResponse
-   */
-  public function listReferencesBases($referenceId, $optParams = array())
-  {
-    $params = array('referenceId' => $referenceId);
-    $params = array_merge($params, $optParams);
-    return $this->call('list', array($params), "Google_Service_Genomics_ListBasesResponse");
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Genomics/Resource/Referencesets.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Genomics/Resource/Referencesets.php
deleted file mode 100644
index 4b5df535..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Genomics/Resource/Referencesets.php
+++ /dev/null
@@ -1,70 +0,0 @@
-
- *   $genomicsService = new Google_Service_Genomics(...);
- *   $referencesets = $genomicsService->referencesets;
- *  
- */
-class Google_Service_Genomics_Resource_Referencesets extends Google_Service_Resource
-{
-  /**
-   * Gets a reference set.
-   *
-   * For the definitions of references and other genomics resources, see
-   * [Fundamentals of Google Genomics](https://cloud.google.com/genomics
-   * /fundamentals-of-google-genomics)
-   *
-   * Implements [GlobalAllianceApi.getReferenceSet](https://github.com/ga4gh/schem
-   * as/blob/v0.5.1/src/main/resources/avro/referencemethods.avdl#L83).
-   * (referencesets.get)
-   *
-   * @param string $referenceSetId The ID of the reference set.
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Genomics_ReferenceSet
-   */
-  public function get($referenceSetId, $optParams = array())
-  {
-    $params = array('referenceSetId' => $referenceSetId);
-    $params = array_merge($params, $optParams);
-    return $this->call('get', array($params), "Google_Service_Genomics_ReferenceSet");
-  }
-  /**
-   * Searches for reference sets which match the given criteria.
-   *
-   * For the definitions of references and other genomics resources, see
-   * [Fundamentals of Google Genomics](https://cloud.google.com/genomics
-   * /fundamentals-of-google-genomics)
-   *
-   * Implements [GlobalAllianceApi.searchReferenceSets](https://github.com/ga4gh/s
-   * chemas/blob/v0.5.1/src/main/resources/avro/referencemethods.avdl#L71)
-   * (referencesets.search)
-   *
-   * @param Google_Service_Genomics_SearchReferenceSetsRequest $postBody
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Genomics_SearchReferenceSetsResponse
-   */
-  public function search(Google_Service_Genomics_SearchReferenceSetsRequest $postBody, $optParams = array())
-  {
-    $params = array('postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('search', array($params), "Google_Service_Genomics_SearchReferenceSetsResponse");
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Genomics/Resource/Variants.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Genomics/Resource/Variants.php
deleted file mode 100644
index 6a13199b..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Genomics/Resource/Variants.php
+++ /dev/null
@@ -1,213 +0,0 @@
-
- *   $genomicsService = new Google_Service_Genomics(...);
- *   $variants = $genomicsService->variants;
- *  
- */
-class Google_Service_Genomics_Resource_Variants extends Google_Service_Resource
-{
-  /**
-   * Creates a new variant.
-   *
-   * For the definitions of variants and other genomics resources, see
-   * [Fundamentals of Google Genomics](https://cloud.google.com/genomics
-   * /fundamentals-of-google-genomics) (variants.create)
-   *
-   * @param Google_Service_Genomics_Variant $postBody
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Genomics_Variant
-   */
-  public function create(Google_Service_Genomics_Variant $postBody, $optParams = array())
-  {
-    $params = array('postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('create', array($params), "Google_Service_Genomics_Variant");
-  }
-  /**
-   * Deletes a variant.
-   *
-   * For the definitions of variants and other genomics resources, see
-   * [Fundamentals of Google Genomics](https://cloud.google.com/genomics
-   * /fundamentals-of-google-genomics) (variants.delete)
-   *
-   * @param string $variantId The ID of the variant to be deleted.
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Genomics_GenomicsEmpty
-   */
-  public function delete($variantId, $optParams = array())
-  {
-    $params = array('variantId' => $variantId);
-    $params = array_merge($params, $optParams);
-    return $this->call('delete', array($params), "Google_Service_Genomics_GenomicsEmpty");
-  }
-  /**
-   * Gets a variant by ID.
-   *
-   * For the definitions of variants and other genomics resources, see
-   * [Fundamentals of Google Genomics](https://cloud.google.com/genomics
-   * /fundamentals-of-google-genomics) (variants.get)
-   *
-   * @param string $variantId The ID of the variant.
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Genomics_Variant
-   */
-  public function get($variantId, $optParams = array())
-  {
-    $params = array('variantId' => $variantId);
-    $params = array_merge($params, $optParams);
-    return $this->call('get', array($params), "Google_Service_Genomics_Variant");
-  }
-  /**
-   * Creates variant data by asynchronously importing the provided information.
-   *
-   * For the definitions of variant sets and other genomics resources, see
-   * [Fundamentals of Google Genomics](https://cloud.google.com/genomics
-   * /fundamentals-of-google-genomics)
-   *
-   * The variants for import will be merged with any existing variant that matches
-   * its reference sequence, start, end, reference bases, and alternative bases.
-   * If no such variant exists, a new one will be created.
-   *
-   * When variants are merged, the call information from the new variant is added
-   * to the existing variant, and Variant info fields are merged as specified in
-   * infoMergeConfig. As a special case, for single-sample VCF files, QUAL and
-   * FILTER fields will be moved to the call level; these are sometimes
-   * interpreted in a call-specific context. Imported VCF headers are appended to
-   * the metadata already in a variant set. (variants.import)
-   *
-   * @param Google_Service_Genomics_ImportVariantsRequest $postBody
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Genomics_Operation
-   */
-  public function import(Google_Service_Genomics_ImportVariantsRequest $postBody, $optParams = array())
-  {
-    $params = array('postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('import', array($params), "Google_Service_Genomics_Operation");
-  }
-  /**
-   * Merges the given variants with existing variants.
-   *
-   * For the definitions of variants and other genomics resources, see
-   * [Fundamentals of Google Genomics](https://cloud.google.com/genomics
-   * /fundamentals-of-google-genomics)
-   *
-   * Each variant will be merged with an existing variant that matches its
-   * reference sequence, start, end, reference bases, and alternative bases. If no
-   * such variant exists, a new one will be created.
-   *
-   * When variants are merged, the call information from the new variant is added
-   * to the existing variant. Variant info fields are merged as specified in the
-   * infoMergeConfig field of the MergeVariantsRequest.
-   *
-   * Please exercise caution when using this method!  It is easy to introduce
-   * mistakes in existing variants and difficult to back out of them.  For
-   * example, suppose you were trying to merge a new variant with an existing one
-   * and both variants contain calls that belong to callsets with the same callset
-   * ID.
-   *
-   *     // Existing variant - irrelevant fields trimmed for clarity     {
-   * "variantSetId": "10473108253681171589",         "referenceName": "1",
-   * "start": "10582",         "referenceBases": "G",         "alternateBases": [
-   * "A"         ],         "calls": [             {                 "callSetId":
-   * "10473108253681171589-0",                 "callSetName": "CALLSET0",
-   * "genotype": [                     0,                     1                 ],
-   * }         ]     }
-   *
-   *     // New variant with conflicting call information     {
-   * "variantSetId": "10473108253681171589",         "referenceName": "1",
-   * "start": "10582",         "referenceBases": "G",         "alternateBases": [
-   * "A"         ],         "calls": [             {                 "callSetId":
-   * "10473108253681171589-0",                 "callSetName": "CALLSET0",
-   * "genotype": [                     1,                     1                 ],
-   * }         ]     }
-   *
-   * The resulting merged variant would overwrite the existing calls with those
-   * from the new variant:
-   *
-   *     {         "variantSetId": "10473108253681171589",
-   * "referenceName": "1",         "start": "10582",         "referenceBases":
-   * "G",         "alternateBases": [             "A"         ],         "calls":
-   * [             {                 "callSetId": "10473108253681171589-0",
-   * "callSetName": "CALLSET0",                 "genotype": [
-   * 1,                     1                 ],             }         ]     }
-   *
-   * This may be the desired outcome, but it is up to the user to determine if if
-   * that is indeed the case. (variants.merge)
-   *
-   * @param Google_Service_Genomics_MergeVariantsRequest $postBody
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Genomics_GenomicsEmpty
-   */
-  public function merge(Google_Service_Genomics_MergeVariantsRequest $postBody, $optParams = array())
-  {
-    $params = array('postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('merge', array($params), "Google_Service_Genomics_GenomicsEmpty");
-  }
-  /**
-   * Updates a variant.
-   *
-   * For the definitions of variants and other genomics resources, see
-   * [Fundamentals of Google Genomics](https://cloud.google.com/genomics
-   * /fundamentals-of-google-genomics)
-   *
-   * This method supports patch semantics. Returns the modified variant without
-   * its calls. (variants.patch)
-   *
-   * @param string $variantId The ID of the variant to be updated.
-   * @param Google_Service_Genomics_Variant $postBody
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param string updateMask An optional mask specifying which fields to
-   * update. At this time, mutable fields are names and info. Acceptable values
-   * are "names" and "info". If unspecified, all mutable fields will be updated.
-   * @return Google_Service_Genomics_Variant
-   */
-  public function patch($variantId, Google_Service_Genomics_Variant $postBody, $optParams = array())
-  {
-    $params = array('variantId' => $variantId, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('patch', array($params), "Google_Service_Genomics_Variant");
-  }
-  /**
-   * Gets a list of variants matching the criteria.
-   *
-   * For the definitions of variants and other genomics resources, see
-   * [Fundamentals of Google Genomics](https://cloud.google.com/genomics
-   * /fundamentals-of-google-genomics)
-   *
-   * Implements [GlobalAllianceApi.searchVariants](https://github.com/ga4gh/schema
-   * s/blob/v0.5.1/src/main/resources/avro/variantmethods.avdl#L126).
-   * (variants.search)
-   *
-   * @param Google_Service_Genomics_SearchVariantsRequest $postBody
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Genomics_SearchVariantsResponse
-   */
-  public function search(Google_Service_Genomics_SearchVariantsRequest $postBody, $optParams = array())
-  {
-    $params = array('postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('search', array($params), "Google_Service_Genomics_SearchVariantsResponse");
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Genomics/Resource/Variantsets.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Genomics/Resource/Variantsets.php
deleted file mode 100644
index 915be9bf..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Genomics/Resource/Variantsets.php
+++ /dev/null
@@ -1,151 +0,0 @@
-
- *   $genomicsService = new Google_Service_Genomics(...);
- *   $variantsets = $genomicsService->variantsets;
- *  
- */
-class Google_Service_Genomics_Resource_Variantsets extends Google_Service_Resource
-{
-  /**
-   * Creates a new variant set.
-   *
-   * For the definitions of variant sets and other genomics resources, see
-   * [Fundamentals of Google Genomics](https://cloud.google.com/genomics
-   * /fundamentals-of-google-genomics)
-   *
-   * The provided variant set must have a valid `datasetId` set - all other fields
-   * are optional. Note that the `id` field will be ignored, as this is assigned
-   * by the server. (variantsets.create)
-   *
-   * @param Google_Service_Genomics_VariantSet $postBody
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Genomics_VariantSet
-   */
-  public function create(Google_Service_Genomics_VariantSet $postBody, $optParams = array())
-  {
-    $params = array('postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('create', array($params), "Google_Service_Genomics_VariantSet");
-  }
-  /**
-   * Deletes a variant set including all variants, call sets, and calls within.
-   * This is not reversible.
-   *
-   * For the definitions of variant sets and other genomics resources, see
-   * [Fundamentals of Google Genomics](https://cloud.google.com/genomics
-   * /fundamentals-of-google-genomics) (variantsets.delete)
-   *
-   * @param string $variantSetId The ID of the variant set to be deleted.
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Genomics_GenomicsEmpty
-   */
-  public function delete($variantSetId, $optParams = array())
-  {
-    $params = array('variantSetId' => $variantSetId);
-    $params = array_merge($params, $optParams);
-    return $this->call('delete', array($params), "Google_Service_Genomics_GenomicsEmpty");
-  }
-  /**
-   * Exports variant set data to an external destination.
-   *
-   * For the definitions of variant sets and other genomics resources, see
-   * [Fundamentals of Google Genomics](https://cloud.google.com/genomics
-   * /fundamentals-of-google-genomics) (variantsets.export)
-   *
-   * @param string $variantSetId Required. The ID of the variant set that contains
-   * variant data which should be exported. The caller must have READ access to
-   * this variant set.
-   * @param Google_Service_Genomics_ExportVariantSetRequest $postBody
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Genomics_Operation
-   */
-  public function export($variantSetId, Google_Service_Genomics_ExportVariantSetRequest $postBody, $optParams = array())
-  {
-    $params = array('variantSetId' => $variantSetId, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('export', array($params), "Google_Service_Genomics_Operation");
-  }
-  /**
-   * Gets a variant set by ID.
-   *
-   * For the definitions of variant sets and other genomics resources, see
-   * [Fundamentals of Google Genomics](https://cloud.google.com/genomics
-   * /fundamentals-of-google-genomics) (variantsets.get)
-   *
-   * @param string $variantSetId Required. The ID of the variant set.
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Genomics_VariantSet
-   */
-  public function get($variantSetId, $optParams = array())
-  {
-    $params = array('variantSetId' => $variantSetId);
-    $params = array_merge($params, $optParams);
-    return $this->call('get', array($params), "Google_Service_Genomics_VariantSet");
-  }
-  /**
-   * Updates a variant set using patch semantics.
-   *
-   * For the definitions of variant sets and other genomics resources, see
-   * [Fundamentals of Google Genomics](https://cloud.google.com/genomics
-   * /fundamentals-of-google-genomics) (variantsets.patch)
-   *
-   * @param string $variantSetId The ID of the variant to be updated (must already
-   * exist).
-   * @param Google_Service_Genomics_VariantSet $postBody
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param string updateMask An optional mask specifying which fields to
-   * update. Supported fields:
-   *
-   * * metadata. * name. * description.
-   *
-   * Leaving `updateMask` unset is equivalent to specifying all mutable fields.
-   * @return Google_Service_Genomics_VariantSet
-   */
-  public function patch($variantSetId, Google_Service_Genomics_VariantSet $postBody, $optParams = array())
-  {
-    $params = array('variantSetId' => $variantSetId, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('patch', array($params), "Google_Service_Genomics_VariantSet");
-  }
-  /**
-   * Returns a list of all variant sets matching search criteria.
-   *
-   * For the definitions of variant sets and other genomics resources, see
-   * [Fundamentals of Google Genomics](https://cloud.google.com/genomics
-   * /fundamentals-of-google-genomics)
-   *
-   * Implements [GlobalAllianceApi.searchVariantSets](https://github.com/ga4gh/sch
-   * emas/blob/v0.5.1/src/main/resources/avro/variantmethods.avdl#L49).
-   * (variantsets.search)
-   *
-   * @param Google_Service_Genomics_SearchVariantSetsRequest $postBody
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Genomics_SearchVariantSetsResponse
-   */
-  public function search(Google_Service_Genomics_SearchVariantSetsRequest $postBody, $optParams = array())
-  {
-    $params = array('postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('search', array($params), "Google_Service_Genomics_SearchVariantSetsResponse");
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Genomics/RuntimeMetadata.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Genomics/RuntimeMetadata.php
deleted file mode 100644
index d23b4f60..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Genomics/RuntimeMetadata.php
+++ /dev/null
@@ -1,31 +0,0 @@
-computeEngine = $computeEngine;
-  }
-  public function getComputeEngine()
-  {
-    return $this->computeEngine;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Genomics/SearchAnnotationSetsRequest.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Genomics/SearchAnnotationSetsRequest.php
deleted file mode 100644
index 59198e4b..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Genomics/SearchAnnotationSetsRequest.php
+++ /dev/null
@@ -1,76 +0,0 @@
-datasetIds = $datasetIds;
-  }
-  public function getDatasetIds()
-  {
-    return $this->datasetIds;
-  }
-  public function setName($name)
-  {
-    $this->name = $name;
-  }
-  public function getName()
-  {
-    return $this->name;
-  }
-  public function setPageSize($pageSize)
-  {
-    $this->pageSize = $pageSize;
-  }
-  public function getPageSize()
-  {
-    return $this->pageSize;
-  }
-  public function setPageToken($pageToken)
-  {
-    $this->pageToken = $pageToken;
-  }
-  public function getPageToken()
-  {
-    return $this->pageToken;
-  }
-  public function setReferenceSetId($referenceSetId)
-  {
-    $this->referenceSetId = $referenceSetId;
-  }
-  public function getReferenceSetId()
-  {
-    return $this->referenceSetId;
-  }
-  public function setTypes($types)
-  {
-    $this->types = $types;
-  }
-  public function getTypes()
-  {
-    return $this->types;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Genomics/SearchAnnotationSetsResponse.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Genomics/SearchAnnotationSetsResponse.php
deleted file mode 100644
index 097be877..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Genomics/SearchAnnotationSetsResponse.php
+++ /dev/null
@@ -1,41 +0,0 @@
-annotationSets = $annotationSets;
-  }
-  public function getAnnotationSets()
-  {
-    return $this->annotationSets;
-  }
-  public function setNextPageToken($nextPageToken)
-  {
-    $this->nextPageToken = $nextPageToken;
-  }
-  public function getNextPageToken()
-  {
-    return $this->nextPageToken;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Genomics/SearchAnnotationsRequest.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Genomics/SearchAnnotationsRequest.php
deleted file mode 100644
index e7451bd0..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Genomics/SearchAnnotationsRequest.php
+++ /dev/null
@@ -1,85 +0,0 @@
-annotationSetIds = $annotationSetIds;
-  }
-  public function getAnnotationSetIds()
-  {
-    return $this->annotationSetIds;
-  }
-  public function setEnd($end)
-  {
-    $this->end = $end;
-  }
-  public function getEnd()
-  {
-    return $this->end;
-  }
-  public function setPageSize($pageSize)
-  {
-    $this->pageSize = $pageSize;
-  }
-  public function getPageSize()
-  {
-    return $this->pageSize;
-  }
-  public function setPageToken($pageToken)
-  {
-    $this->pageToken = $pageToken;
-  }
-  public function getPageToken()
-  {
-    return $this->pageToken;
-  }
-  public function setReferenceId($referenceId)
-  {
-    $this->referenceId = $referenceId;
-  }
-  public function getReferenceId()
-  {
-    return $this->referenceId;
-  }
-  public function setReferenceName($referenceName)
-  {
-    $this->referenceName = $referenceName;
-  }
-  public function getReferenceName()
-  {
-    return $this->referenceName;
-  }
-  public function setStart($start)
-  {
-    $this->start = $start;
-  }
-  public function getStart()
-  {
-    return $this->start;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Genomics/SearchAnnotationsResponse.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Genomics/SearchAnnotationsResponse.php
deleted file mode 100644
index 4b8d8021..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Genomics/SearchAnnotationsResponse.php
+++ /dev/null
@@ -1,41 +0,0 @@
-annotations = $annotations;
-  }
-  public function getAnnotations()
-  {
-    return $this->annotations;
-  }
-  public function setNextPageToken($nextPageToken)
-  {
-    $this->nextPageToken = $nextPageToken;
-  }
-  public function getNextPageToken()
-  {
-    return $this->nextPageToken;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Genomics/SearchCallSetsRequest.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Genomics/SearchCallSetsRequest.php
deleted file mode 100644
index 0ad65657..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Genomics/SearchCallSetsRequest.php
+++ /dev/null
@@ -1,58 +0,0 @@
-name = $name;
-  }
-  public function getName()
-  {
-    return $this->name;
-  }
-  public function setPageSize($pageSize)
-  {
-    $this->pageSize = $pageSize;
-  }
-  public function getPageSize()
-  {
-    return $this->pageSize;
-  }
-  public function setPageToken($pageToken)
-  {
-    $this->pageToken = $pageToken;
-  }
-  public function getPageToken()
-  {
-    return $this->pageToken;
-  }
-  public function setVariantSetIds($variantSetIds)
-  {
-    $this->variantSetIds = $variantSetIds;
-  }
-  public function getVariantSetIds()
-  {
-    return $this->variantSetIds;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Genomics/SearchCallSetsResponse.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Genomics/SearchCallSetsResponse.php
deleted file mode 100644
index 10ee9637..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Genomics/SearchCallSetsResponse.php
+++ /dev/null
@@ -1,41 +0,0 @@
-callSets = $callSets;
-  }
-  public function getCallSets()
-  {
-    return $this->callSets;
-  }
-  public function setNextPageToken($nextPageToken)
-  {
-    $this->nextPageToken = $nextPageToken;
-  }
-  public function getNextPageToken()
-  {
-    return $this->nextPageToken;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Genomics/SearchReadGroupSetsRequest.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Genomics/SearchReadGroupSetsRequest.php
deleted file mode 100644
index da351ed3..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Genomics/SearchReadGroupSetsRequest.php
+++ /dev/null
@@ -1,58 +0,0 @@
-datasetIds = $datasetIds;
-  }
-  public function getDatasetIds()
-  {
-    return $this->datasetIds;
-  }
-  public function setName($name)
-  {
-    $this->name = $name;
-  }
-  public function getName()
-  {
-    return $this->name;
-  }
-  public function setPageSize($pageSize)
-  {
-    $this->pageSize = $pageSize;
-  }
-  public function getPageSize()
-  {
-    return $this->pageSize;
-  }
-  public function setPageToken($pageToken)
-  {
-    $this->pageToken = $pageToken;
-  }
-  public function getPageToken()
-  {
-    return $this->pageToken;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Genomics/SearchReadGroupSetsResponse.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Genomics/SearchReadGroupSetsResponse.php
deleted file mode 100644
index 6251bb7f..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Genomics/SearchReadGroupSetsResponse.php
+++ /dev/null
@@ -1,41 +0,0 @@
-nextPageToken = $nextPageToken;
-  }
-  public function getNextPageToken()
-  {
-    return $this->nextPageToken;
-  }
-  public function setReadGroupSets($readGroupSets)
-  {
-    $this->readGroupSets = $readGroupSets;
-  }
-  public function getReadGroupSets()
-  {
-    return $this->readGroupSets;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Genomics/SearchReadsRequest.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Genomics/SearchReadsRequest.php
deleted file mode 100644
index a72a4ea7..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Genomics/SearchReadsRequest.php
+++ /dev/null
@@ -1,85 +0,0 @@
-end = $end;
-  }
-  public function getEnd()
-  {
-    return $this->end;
-  }
-  public function setPageSize($pageSize)
-  {
-    $this->pageSize = $pageSize;
-  }
-  public function getPageSize()
-  {
-    return $this->pageSize;
-  }
-  public function setPageToken($pageToken)
-  {
-    $this->pageToken = $pageToken;
-  }
-  public function getPageToken()
-  {
-    return $this->pageToken;
-  }
-  public function setReadGroupIds($readGroupIds)
-  {
-    $this->readGroupIds = $readGroupIds;
-  }
-  public function getReadGroupIds()
-  {
-    return $this->readGroupIds;
-  }
-  public function setReadGroupSetIds($readGroupSetIds)
-  {
-    $this->readGroupSetIds = $readGroupSetIds;
-  }
-  public function getReadGroupSetIds()
-  {
-    return $this->readGroupSetIds;
-  }
-  public function setReferenceName($referenceName)
-  {
-    $this->referenceName = $referenceName;
-  }
-  public function getReferenceName()
-  {
-    return $this->referenceName;
-  }
-  public function setStart($start)
-  {
-    $this->start = $start;
-  }
-  public function getStart()
-  {
-    return $this->start;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Genomics/SearchReadsResponse.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Genomics/SearchReadsResponse.php
deleted file mode 100644
index 841ffa57..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Genomics/SearchReadsResponse.php
+++ /dev/null
@@ -1,41 +0,0 @@
-alignments = $alignments;
-  }
-  public function getAlignments()
-  {
-    return $this->alignments;
-  }
-  public function setNextPageToken($nextPageToken)
-  {
-    $this->nextPageToken = $nextPageToken;
-  }
-  public function getNextPageToken()
-  {
-    return $this->nextPageToken;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Genomics/SearchReferenceSetsRequest.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Genomics/SearchReferenceSetsRequest.php
deleted file mode 100644
index 0d984611..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Genomics/SearchReferenceSetsRequest.php
+++ /dev/null
@@ -1,67 +0,0 @@
-accessions = $accessions;
-  }
-  public function getAccessions()
-  {
-    return $this->accessions;
-  }
-  public function setAssemblyId($assemblyId)
-  {
-    $this->assemblyId = $assemblyId;
-  }
-  public function getAssemblyId()
-  {
-    return $this->assemblyId;
-  }
-  public function setMd5checksums($md5checksums)
-  {
-    $this->md5checksums = $md5checksums;
-  }
-  public function getMd5checksums()
-  {
-    return $this->md5checksums;
-  }
-  public function setPageSize($pageSize)
-  {
-    $this->pageSize = $pageSize;
-  }
-  public function getPageSize()
-  {
-    return $this->pageSize;
-  }
-  public function setPageToken($pageToken)
-  {
-    $this->pageToken = $pageToken;
-  }
-  public function getPageToken()
-  {
-    return $this->pageToken;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Genomics/SearchReferenceSetsResponse.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Genomics/SearchReferenceSetsResponse.php
deleted file mode 100644
index efa61b36..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Genomics/SearchReferenceSetsResponse.php
+++ /dev/null
@@ -1,41 +0,0 @@
-nextPageToken = $nextPageToken;
-  }
-  public function getNextPageToken()
-  {
-    return $this->nextPageToken;
-  }
-  public function setReferenceSets($referenceSets)
-  {
-    $this->referenceSets = $referenceSets;
-  }
-  public function getReferenceSets()
-  {
-    return $this->referenceSets;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Genomics/SearchReferencesRequest.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Genomics/SearchReferencesRequest.php
deleted file mode 100644
index ae49629b..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Genomics/SearchReferencesRequest.php
+++ /dev/null
@@ -1,67 +0,0 @@
-accessions = $accessions;
-  }
-  public function getAccessions()
-  {
-    return $this->accessions;
-  }
-  public function setMd5checksums($md5checksums)
-  {
-    $this->md5checksums = $md5checksums;
-  }
-  public function getMd5checksums()
-  {
-    return $this->md5checksums;
-  }
-  public function setPageSize($pageSize)
-  {
-    $this->pageSize = $pageSize;
-  }
-  public function getPageSize()
-  {
-    return $this->pageSize;
-  }
-  public function setPageToken($pageToken)
-  {
-    $this->pageToken = $pageToken;
-  }
-  public function getPageToken()
-  {
-    return $this->pageToken;
-  }
-  public function setReferenceSetId($referenceSetId)
-  {
-    $this->referenceSetId = $referenceSetId;
-  }
-  public function getReferenceSetId()
-  {
-    return $this->referenceSetId;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Genomics/SearchReferencesResponse.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Genomics/SearchReferencesResponse.php
deleted file mode 100644
index 2d3e9603..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Genomics/SearchReferencesResponse.php
+++ /dev/null
@@ -1,41 +0,0 @@
-nextPageToken = $nextPageToken;
-  }
-  public function getNextPageToken()
-  {
-    return $this->nextPageToken;
-  }
-  public function setReferences($references)
-  {
-    $this->references = $references;
-  }
-  public function getReferences()
-  {
-    return $this->references;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Genomics/SearchVariantSetsRequest.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Genomics/SearchVariantSetsRequest.php
deleted file mode 100644
index f58dfd49..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Genomics/SearchVariantSetsRequest.php
+++ /dev/null
@@ -1,49 +0,0 @@
-datasetIds = $datasetIds;
-  }
-  public function getDatasetIds()
-  {
-    return $this->datasetIds;
-  }
-  public function setPageSize($pageSize)
-  {
-    $this->pageSize = $pageSize;
-  }
-  public function getPageSize()
-  {
-    return $this->pageSize;
-  }
-  public function setPageToken($pageToken)
-  {
-    $this->pageToken = $pageToken;
-  }
-  public function getPageToken()
-  {
-    return $this->pageToken;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Genomics/SearchVariantSetsResponse.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Genomics/SearchVariantSetsResponse.php
deleted file mode 100644
index 0636fc6f..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Genomics/SearchVariantSetsResponse.php
+++ /dev/null
@@ -1,41 +0,0 @@
-nextPageToken = $nextPageToken;
-  }
-  public function getNextPageToken()
-  {
-    return $this->nextPageToken;
-  }
-  public function setVariantSets($variantSets)
-  {
-    $this->variantSets = $variantSets;
-  }
-  public function getVariantSets()
-  {
-    return $this->variantSets;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Genomics/SearchVariantsRequest.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Genomics/SearchVariantsRequest.php
deleted file mode 100644
index bf278baa..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Genomics/SearchVariantsRequest.php
+++ /dev/null
@@ -1,103 +0,0 @@
-callSetIds = $callSetIds;
-  }
-  public function getCallSetIds()
-  {
-    return $this->callSetIds;
-  }
-  public function setEnd($end)
-  {
-    $this->end = $end;
-  }
-  public function getEnd()
-  {
-    return $this->end;
-  }
-  public function setMaxCalls($maxCalls)
-  {
-    $this->maxCalls = $maxCalls;
-  }
-  public function getMaxCalls()
-  {
-    return $this->maxCalls;
-  }
-  public function setPageSize($pageSize)
-  {
-    $this->pageSize = $pageSize;
-  }
-  public function getPageSize()
-  {
-    return $this->pageSize;
-  }
-  public function setPageToken($pageToken)
-  {
-    $this->pageToken = $pageToken;
-  }
-  public function getPageToken()
-  {
-    return $this->pageToken;
-  }
-  public function setReferenceName($referenceName)
-  {
-    $this->referenceName = $referenceName;
-  }
-  public function getReferenceName()
-  {
-    return $this->referenceName;
-  }
-  public function setStart($start)
-  {
-    $this->start = $start;
-  }
-  public function getStart()
-  {
-    return $this->start;
-  }
-  public function setVariantName($variantName)
-  {
-    $this->variantName = $variantName;
-  }
-  public function getVariantName()
-  {
-    return $this->variantName;
-  }
-  public function setVariantSetIds($variantSetIds)
-  {
-    $this->variantSetIds = $variantSetIds;
-  }
-  public function getVariantSetIds()
-  {
-    return $this->variantSetIds;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Genomics/SearchVariantsResponse.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Genomics/SearchVariantsResponse.php
deleted file mode 100644
index ec6f7fc3..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Genomics/SearchVariantsResponse.php
+++ /dev/null
@@ -1,41 +0,0 @@
-nextPageToken = $nextPageToken;
-  }
-  public function getNextPageToken()
-  {
-    return $this->nextPageToken;
-  }
-  public function setVariants($variants)
-  {
-    $this->variants = $variants;
-  }
-  public function getVariants()
-  {
-    return $this->variants;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Genomics/SetIamPolicyRequest.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Genomics/SetIamPolicyRequest.php
deleted file mode 100644
index e5196fd5..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Genomics/SetIamPolicyRequest.php
+++ /dev/null
@@ -1,31 +0,0 @@
-policy = $policy;
-  }
-  public function getPolicy()
-  {
-    return $this->policy;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Genomics/Status.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Genomics/Status.php
deleted file mode 100644
index 2d41b8ff..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Genomics/Status.php
+++ /dev/null
@@ -1,49 +0,0 @@
-code = $code;
-  }
-  public function getCode()
-  {
-    return $this->code;
-  }
-  public function setDetails($details)
-  {
-    $this->details = $details;
-  }
-  public function getDetails()
-  {
-    return $this->details;
-  }
-  public function setMessage($message)
-  {
-    $this->message = $message;
-  }
-  public function getMessage()
-  {
-    return $this->message;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Genomics/StreamReadsRequest.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Genomics/StreamReadsRequest.php
deleted file mode 100644
index 7b770127..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Genomics/StreamReadsRequest.php
+++ /dev/null
@@ -1,84 +0,0 @@
-end = $end;
-  }
-  public function getEnd()
-  {
-    return $this->end;
-  }
-  public function setProjectId($projectId)
-  {
-    $this->projectId = $projectId;
-  }
-  public function getProjectId()
-  {
-    return $this->projectId;
-  }
-  public function setReadGroupSetId($readGroupSetId)
-  {
-    $this->readGroupSetId = $readGroupSetId;
-  }
-  public function getReadGroupSetId()
-  {
-    return $this->readGroupSetId;
-  }
-  public function setReferenceName($referenceName)
-  {
-    $this->referenceName = $referenceName;
-  }
-  public function getReferenceName()
-  {
-    return $this->referenceName;
-  }
-  public function setShard($shard)
-  {
-    $this->shard = $shard;
-  }
-  public function getShard()
-  {
-    return $this->shard;
-  }
-  public function setStart($start)
-  {
-    $this->start = $start;
-  }
-  public function getStart()
-  {
-    return $this->start;
-  }
-  public function setTotalShards($totalShards)
-  {
-    $this->totalShards = $totalShards;
-  }
-  public function getTotalShards()
-  {
-    return $this->totalShards;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Genomics/StreamReadsResponse.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Genomics/StreamReadsResponse.php
deleted file mode 100644
index e970e0d7..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Genomics/StreamReadsResponse.php
+++ /dev/null
@@ -1,32 +0,0 @@
-alignments = $alignments;
-  }
-  public function getAlignments()
-  {
-    return $this->alignments;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Genomics/StreamVariantsRequest.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Genomics/StreamVariantsRequest.php
deleted file mode 100644
index b0671dd2..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Genomics/StreamVariantsRequest.php
+++ /dev/null
@@ -1,76 +0,0 @@
-callSetIds = $callSetIds;
-  }
-  public function getCallSetIds()
-  {
-    return $this->callSetIds;
-  }
-  public function setEnd($end)
-  {
-    $this->end = $end;
-  }
-  public function getEnd()
-  {
-    return $this->end;
-  }
-  public function setProjectId($projectId)
-  {
-    $this->projectId = $projectId;
-  }
-  public function getProjectId()
-  {
-    return $this->projectId;
-  }
-  public function setReferenceName($referenceName)
-  {
-    $this->referenceName = $referenceName;
-  }
-  public function getReferenceName()
-  {
-    return $this->referenceName;
-  }
-  public function setStart($start)
-  {
-    $this->start = $start;
-  }
-  public function getStart()
-  {
-    return $this->start;
-  }
-  public function setVariantSetId($variantSetId)
-  {
-    $this->variantSetId = $variantSetId;
-  }
-  public function getVariantSetId()
-  {
-    return $this->variantSetId;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Genomics/StreamVariantsResponse.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Genomics/StreamVariantsResponse.php
deleted file mode 100644
index 29e56448..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Genomics/StreamVariantsResponse.php
+++ /dev/null
@@ -1,32 +0,0 @@
-variants = $variants;
-  }
-  public function getVariants()
-  {
-    return $this->variants;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Genomics/TestIamPermissionsRequest.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Genomics/TestIamPermissionsRequest.php
deleted file mode 100644
index 0700c68c..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Genomics/TestIamPermissionsRequest.php
+++ /dev/null
@@ -1,31 +0,0 @@
-permissions = $permissions;
-  }
-  public function getPermissions()
-  {
-    return $this->permissions;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Genomics/TestIamPermissionsResponse.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Genomics/TestIamPermissionsResponse.php
deleted file mode 100644
index acb47ab5..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Genomics/TestIamPermissionsResponse.php
+++ /dev/null
@@ -1,31 +0,0 @@
-permissions = $permissions;
-  }
-  public function getPermissions()
-  {
-    return $this->permissions;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Genomics/Transcript.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Genomics/Transcript.php
deleted file mode 100644
index e82dfd28..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Genomics/Transcript.php
+++ /dev/null
@@ -1,51 +0,0 @@
-codingSequence = $codingSequence;
-  }
-  public function getCodingSequence()
-  {
-    return $this->codingSequence;
-  }
-  public function setExons($exons)
-  {
-    $this->exons = $exons;
-  }
-  public function getExons()
-  {
-    return $this->exons;
-  }
-  public function setGeneId($geneId)
-  {
-    $this->geneId = $geneId;
-  }
-  public function getGeneId()
-  {
-    return $this->geneId;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Genomics/UndeleteDatasetRequest.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Genomics/UndeleteDatasetRequest.php
deleted file mode 100644
index 4a19f383..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Genomics/UndeleteDatasetRequest.php
+++ /dev/null
@@ -1,20 +0,0 @@
-alternateBases = $alternateBases;
-  }
-  public function getAlternateBases()
-  {
-    return $this->alternateBases;
-  }
-  public function setCalls($calls)
-  {
-    $this->calls = $calls;
-  }
-  public function getCalls()
-  {
-    return $this->calls;
-  }
-  public function setCreated($created)
-  {
-    $this->created = $created;
-  }
-  public function getCreated()
-  {
-    return $this->created;
-  }
-  public function setEnd($end)
-  {
-    $this->end = $end;
-  }
-  public function getEnd()
-  {
-    return $this->end;
-  }
-  public function setFilter($filter)
-  {
-    $this->filter = $filter;
-  }
-  public function getFilter()
-  {
-    return $this->filter;
-  }
-  public function setId($id)
-  {
-    $this->id = $id;
-  }
-  public function getId()
-  {
-    return $this->id;
-  }
-  public function setInfo($info)
-  {
-    $this->info = $info;
-  }
-  public function getInfo()
-  {
-    return $this->info;
-  }
-  public function setNames($names)
-  {
-    $this->names = $names;
-  }
-  public function getNames()
-  {
-    return $this->names;
-  }
-  public function setQuality($quality)
-  {
-    $this->quality = $quality;
-  }
-  public function getQuality()
-  {
-    return $this->quality;
-  }
-  public function setReferenceBases($referenceBases)
-  {
-    $this->referenceBases = $referenceBases;
-  }
-  public function getReferenceBases()
-  {
-    return $this->referenceBases;
-  }
-  public function setReferenceName($referenceName)
-  {
-    $this->referenceName = $referenceName;
-  }
-  public function getReferenceName()
-  {
-    return $this->referenceName;
-  }
-  public function setStart($start)
-  {
-    $this->start = $start;
-  }
-  public function getStart()
-  {
-    return $this->start;
-  }
-  public function setVariantSetId($variantSetId)
-  {
-    $this->variantSetId = $variantSetId;
-  }
-  public function getVariantSetId()
-  {
-    return $this->variantSetId;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Genomics/VariantAnnotation.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Genomics/VariantAnnotation.php
deleted file mode 100644
index b82f7530..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Genomics/VariantAnnotation.php
+++ /dev/null
@@ -1,86 +0,0 @@
-alternateBases = $alternateBases;
-  }
-  public function getAlternateBases()
-  {
-    return $this->alternateBases;
-  }
-  public function setClinicalSignificance($clinicalSignificance)
-  {
-    $this->clinicalSignificance = $clinicalSignificance;
-  }
-  public function getClinicalSignificance()
-  {
-    return $this->clinicalSignificance;
-  }
-  public function setConditions($conditions)
-  {
-    $this->conditions = $conditions;
-  }
-  public function getConditions()
-  {
-    return $this->conditions;
-  }
-  public function setEffect($effect)
-  {
-    $this->effect = $effect;
-  }
-  public function getEffect()
-  {
-    return $this->effect;
-  }
-  public function setGeneId($geneId)
-  {
-    $this->geneId = $geneId;
-  }
-  public function getGeneId()
-  {
-    return $this->geneId;
-  }
-  public function setTranscriptIds($transcriptIds)
-  {
-    $this->transcriptIds = $transcriptIds;
-  }
-  public function getTranscriptIds()
-  {
-    return $this->transcriptIds;
-  }
-  public function setType($type)
-  {
-    $this->type = $type;
-  }
-  public function getType()
-  {
-    return $this->type;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Genomics/VariantCall.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Genomics/VariantCall.php
deleted file mode 100644
index c96a2d8f..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Genomics/VariantCall.php
+++ /dev/null
@@ -1,76 +0,0 @@
-callSetId = $callSetId;
-  }
-  public function getCallSetId()
-  {
-    return $this->callSetId;
-  }
-  public function setCallSetName($callSetName)
-  {
-    $this->callSetName = $callSetName;
-  }
-  public function getCallSetName()
-  {
-    return $this->callSetName;
-  }
-  public function setGenotype($genotype)
-  {
-    $this->genotype = $genotype;
-  }
-  public function getGenotype()
-  {
-    return $this->genotype;
-  }
-  public function setGenotypeLikelihood($genotypeLikelihood)
-  {
-    $this->genotypeLikelihood = $genotypeLikelihood;
-  }
-  public function getGenotypeLikelihood()
-  {
-    return $this->genotypeLikelihood;
-  }
-  public function setInfo($info)
-  {
-    $this->info = $info;
-  }
-  public function getInfo()
-  {
-    return $this->info;
-  }
-  public function setPhaseset($phaseset)
-  {
-    $this->phaseset = $phaseset;
-  }
-  public function getPhaseset()
-  {
-    return $this->phaseset;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Genomics/VariantSet.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Genomics/VariantSet.php
deleted file mode 100644
index 364a09f7..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Genomics/VariantSet.php
+++ /dev/null
@@ -1,87 +0,0 @@
-datasetId = $datasetId;
-  }
-  public function getDatasetId()
-  {
-    return $this->datasetId;
-  }
-  public function setDescription($description)
-  {
-    $this->description = $description;
-  }
-  public function getDescription()
-  {
-    return $this->description;
-  }
-  public function setId($id)
-  {
-    $this->id = $id;
-  }
-  public function getId()
-  {
-    return $this->id;
-  }
-  public function setMetadata($metadata)
-  {
-    $this->metadata = $metadata;
-  }
-  public function getMetadata()
-  {
-    return $this->metadata;
-  }
-  public function setName($name)
-  {
-    $this->name = $name;
-  }
-  public function getName()
-  {
-    return $this->name;
-  }
-  public function setReferenceBounds($referenceBounds)
-  {
-    $this->referenceBounds = $referenceBounds;
-  }
-  public function getReferenceBounds()
-  {
-    return $this->referenceBounds;
-  }
-  public function setReferenceSetId($referenceSetId)
-  {
-    $this->referenceSetId = $referenceSetId;
-  }
-  public function getReferenceSetId()
-  {
-    return $this->referenceSetId;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Genomics/VariantSetMetadata.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Genomics/VariantSetMetadata.php
deleted file mode 100644
index 826352f6..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Genomics/VariantSetMetadata.php
+++ /dev/null
@@ -1,84 +0,0 @@
-description = $description;
-  }
-  public function getDescription()
-  {
-    return $this->description;
-  }
-  public function setId($id)
-  {
-    $this->id = $id;
-  }
-  public function getId()
-  {
-    return $this->id;
-  }
-  public function setInfo($info)
-  {
-    $this->info = $info;
-  }
-  public function getInfo()
-  {
-    return $this->info;
-  }
-  public function setKey($key)
-  {
-    $this->key = $key;
-  }
-  public function getKey()
-  {
-    return $this->key;
-  }
-  public function setNumber($number)
-  {
-    $this->number = $number;
-  }
-  public function getNumber()
-  {
-    return $this->number;
-  }
-  public function setType($type)
-  {
-    $this->type = $type;
-  }
-  public function getType()
-  {
-    return $this->type;
-  }
-  public function setValue($value)
-  {
-    $this->value = $value;
-  }
-  public function getValue()
-  {
-    return $this->value;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Gmail.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Gmail.php
deleted file mode 100644
index dcb38f38..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Gmail.php
+++ /dev/null
@@ -1,1136 +0,0 @@
-
- * Access Gmail mailboxes including sending user email.

- *
- * 

- * For more information about this service, see the API
- * Documentation
- * 

- *
- * @author Google, Inc.
- */
-class Google_Service_Gmail extends Google_Service
-{
-  /** Read, send, delete, and manage your email. */
-  const MAIL_GOOGLE_COM =
-      "https://mail.google.com/";
-  /** Manage drafts and send emails. */
-  const GMAIL_COMPOSE =
-      "https://www.googleapis.com/auth/gmail.compose";
-  /** Insert mail into your mailbox. */
-  const GMAIL_INSERT =
-      "https://www.googleapis.com/auth/gmail.insert";
-  /** Manage mailbox labels. */
-  const GMAIL_LABELS =
-      "https://www.googleapis.com/auth/gmail.labels";
-  /** View your email message metadata such as labels and headers, but not the email body. */
-  const GMAIL_METADATA =
-      "https://www.googleapis.com/auth/gmail.metadata";
-  /** View and modify but not delete your email. */
-  const GMAIL_MODIFY =
-      "https://www.googleapis.com/auth/gmail.modify";
-  /** View your emails messages and settings. */
-  const GMAIL_READONLY =
-      "https://www.googleapis.com/auth/gmail.readonly";
-  /** Send email on your behalf. */
-  const GMAIL_SEND =
-      "https://www.googleapis.com/auth/gmail.send";
-  /** Manage your basic mail settings. */
-  const GMAIL_SETTINGS_BASIC =
-      "https://www.googleapis.com/auth/gmail.settings.basic";
-  /** Manage your sensitive mail settings, including who can manage your mail. */
-  const GMAIL_SETTINGS_SHARING =
-      "https://www.googleapis.com/auth/gmail.settings.sharing";
-
-  public $users;
-  public $users_drafts;
-  public $users_history;
-  public $users_labels;
-  public $users_messages;
-  public $users_messages_attachments;
-  public $users_settings;
-  public $users_settings_filters;
-  public $users_settings_forwardingAddresses;
-  public $users_settings_sendAs;
-  public $users_settings_sendAs_smimeInfo;
-  public $users_threads;
-  
-  /**
-   * Constructs the internal representation of the Gmail service.
-   *
-   * @param Google_Client $client
-   */
-  public function __construct(Google_Client $client)
-  {
-    parent::__construct($client);
-    $this->rootUrl = 'https://www.googleapis.com/';
-    $this->servicePath = 'gmail/v1/users/';
-    $this->version = 'v1';
-    $this->serviceName = 'gmail';
-
-    $this->users = new Google_Service_Gmail_Resource_Users(
-        $this,
-        $this->serviceName,
-        'users',
-        array(
-          'methods' => array(
-            'getProfile' => array(
-              'path' => '{userId}/profile',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'userId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'stop' => array(
-              'path' => '{userId}/stop',
-              'httpMethod' => 'POST',
-              'parameters' => array(
-                'userId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'watch' => array(
-              'path' => '{userId}/watch',
-              'httpMethod' => 'POST',
-              'parameters' => array(
-                'userId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),
-          )
-        )
-    );
-    $this->users_drafts = new Google_Service_Gmail_Resource_UsersDrafts(
-        $this,
-        $this->serviceName,
-        'drafts',
-        array(
-          'methods' => array(
-            'create' => array(
-              'path' => '{userId}/drafts',
-              'httpMethod' => 'POST',
-              'parameters' => array(
-                'userId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'delete' => array(
-              'path' => '{userId}/drafts/{id}',
-              'httpMethod' => 'DELETE',
-              'parameters' => array(
-                'userId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'id' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'get' => array(
-              'path' => '{userId}/drafts/{id}',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'userId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'id' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'format' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-              ),
-            ),'list' => array(
-              'path' => '{userId}/drafts',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'userId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'includeSpamTrash' => array(
-                  'location' => 'query',
-                  'type' => 'boolean',
-                ),
-                'maxResults' => array(
-                  'location' => 'query',
-                  'type' => 'integer',
-                ),
-                'pageToken' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'q' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-              ),
-            ),'send' => array(
-              'path' => '{userId}/drafts/send',
-              'httpMethod' => 'POST',
-              'parameters' => array(
-                'userId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'update' => array(
-              'path' => '{userId}/drafts/{id}',
-              'httpMethod' => 'PUT',
-              'parameters' => array(
-                'userId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'id' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),
-          )
-        )
-    );
-    $this->users_history = new Google_Service_Gmail_Resource_UsersHistory(
-        $this,
-        $this->serviceName,
-        'history',
-        array(
-          'methods' => array(
-            'list' => array(
-              'path' => '{userId}/history',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'userId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'historyTypes' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                  'repeated' => true,
-                ),
-                'labelId' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'maxResults' => array(
-                  'location' => 'query',
-                  'type' => 'integer',
-                ),
-                'pageToken' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'startHistoryId' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-              ),
-            ),
-          )
-        )
-    );
-    $this->users_labels = new Google_Service_Gmail_Resource_UsersLabels(
-        $this,
-        $this->serviceName,
-        'labels',
-        array(
-          'methods' => array(
-            'create' => array(
-              'path' => '{userId}/labels',
-              'httpMethod' => 'POST',
-              'parameters' => array(
-                'userId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'delete' => array(
-              'path' => '{userId}/labels/{id}',
-              'httpMethod' => 'DELETE',
-              'parameters' => array(
-                'userId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'id' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'get' => array(
-              'path' => '{userId}/labels/{id}',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'userId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'id' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'list' => array(
-              'path' => '{userId}/labels',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'userId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'patch' => array(
-              'path' => '{userId}/labels/{id}',
-              'httpMethod' => 'PATCH',
-              'parameters' => array(
-                'userId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'id' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'update' => array(
-              'path' => '{userId}/labels/{id}',
-              'httpMethod' => 'PUT',
-              'parameters' => array(
-                'userId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'id' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),
-          )
-        )
-    );
-    $this->users_messages = new Google_Service_Gmail_Resource_UsersMessages(
-        $this,
-        $this->serviceName,
-        'messages',
-        array(
-          'methods' => array(
-            'batchDelete' => array(
-              'path' => '{userId}/messages/batchDelete',
-              'httpMethod' => 'POST',
-              'parameters' => array(
-                'userId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'batchModify' => array(
-              'path' => '{userId}/messages/batchModify',
-              'httpMethod' => 'POST',
-              'parameters' => array(
-                'userId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'delete' => array(
-              'path' => '{userId}/messages/{id}',
-              'httpMethod' => 'DELETE',
-              'parameters' => array(
-                'userId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'id' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'get' => array(
-              'path' => '{userId}/messages/{id}',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'userId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'id' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'format' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'metadataHeaders' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                  'repeated' => true,
-                ),
-              ),
-            ),'import' => array(
-              'path' => '{userId}/messages/import',
-              'httpMethod' => 'POST',
-              'parameters' => array(
-                'userId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'deleted' => array(
-                  'location' => 'query',
-                  'type' => 'boolean',
-                ),
-                'internalDateSource' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'neverMarkSpam' => array(
-                  'location' => 'query',
-                  'type' => 'boolean',
-                ),
-                'processForCalendar' => array(
-                  'location' => 'query',
-                  'type' => 'boolean',
-                ),
-              ),
-            ),'insert' => array(
-              'path' => '{userId}/messages',
-              'httpMethod' => 'POST',
-              'parameters' => array(
-                'userId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'deleted' => array(
-                  'location' => 'query',
-                  'type' => 'boolean',
-                ),
-                'internalDateSource' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-              ),
-            ),'list' => array(
-              'path' => '{userId}/messages',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'userId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'includeSpamTrash' => array(
-                  'location' => 'query',
-                  'type' => 'boolean',
-                ),
-                'labelIds' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                  'repeated' => true,
-                ),
-                'maxResults' => array(
-                  'location' => 'query',
-                  'type' => 'integer',
-                ),
-                'pageToken' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'q' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-              ),
-            ),'modify' => array(
-              'path' => '{userId}/messages/{id}/modify',
-              'httpMethod' => 'POST',
-              'parameters' => array(
-                'userId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'id' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'send' => array(
-              'path' => '{userId}/messages/send',
-              'httpMethod' => 'POST',
-              'parameters' => array(
-                'userId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'trash' => array(
-              'path' => '{userId}/messages/{id}/trash',
-              'httpMethod' => 'POST',
-              'parameters' => array(
-                'userId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'id' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'untrash' => array(
-              'path' => '{userId}/messages/{id}/untrash',
-              'httpMethod' => 'POST',
-              'parameters' => array(
-                'userId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'id' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),
-          )
-        )
-    );
-    $this->users_messages_attachments = new Google_Service_Gmail_Resource_UsersMessagesAttachments(
-        $this,
-        $this->serviceName,
-        'attachments',
-        array(
-          'methods' => array(
-            'get' => array(
-              'path' => '{userId}/messages/{messageId}/attachments/{id}',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'userId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'messageId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'id' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),
-          )
-        )
-    );
-    $this->users_settings = new Google_Service_Gmail_Resource_UsersSettings(
-        $this,
-        $this->serviceName,
-        'settings',
-        array(
-          'methods' => array(
-            'getAutoForwarding' => array(
-              'path' => '{userId}/settings/autoForwarding',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'userId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'getImap' => array(
-              'path' => '{userId}/settings/imap',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'userId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'getPop' => array(
-              'path' => '{userId}/settings/pop',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'userId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'getVacation' => array(
-              'path' => '{userId}/settings/vacation',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'userId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'updateAutoForwarding' => array(
-              'path' => '{userId}/settings/autoForwarding',
-              'httpMethod' => 'PUT',
-              'parameters' => array(
-                'userId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'updateImap' => array(
-              'path' => '{userId}/settings/imap',
-              'httpMethod' => 'PUT',
-              'parameters' => array(
-                'userId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'updatePop' => array(
-              'path' => '{userId}/settings/pop',
-              'httpMethod' => 'PUT',
-              'parameters' => array(
-                'userId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'updateVacation' => array(
-              'path' => '{userId}/settings/vacation',
-              'httpMethod' => 'PUT',
-              'parameters' => array(
-                'userId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),
-          )
-        )
-    );
-    $this->users_settings_filters = new Google_Service_Gmail_Resource_UsersSettingsFilters(
-        $this,
-        $this->serviceName,
-        'filters',
-        array(
-          'methods' => array(
-            'create' => array(
-              'path' => '{userId}/settings/filters',
-              'httpMethod' => 'POST',
-              'parameters' => array(
-                'userId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'delete' => array(
-              'path' => '{userId}/settings/filters/{id}',
-              'httpMethod' => 'DELETE',
-              'parameters' => array(
-                'userId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'id' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'get' => array(
-              'path' => '{userId}/settings/filters/{id}',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'userId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'id' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'list' => array(
-              'path' => '{userId}/settings/filters',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'userId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),
-          )
-        )
-    );
-    $this->users_settings_forwardingAddresses = new Google_Service_Gmail_Resource_UsersSettingsForwardingAddresses(
-        $this,
-        $this->serviceName,
-        'forwardingAddresses',
-        array(
-          'methods' => array(
-            'create' => array(
-              'path' => '{userId}/settings/forwardingAddresses',
-              'httpMethod' => 'POST',
-              'parameters' => array(
-                'userId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'delete' => array(
-              'path' => '{userId}/settings/forwardingAddresses/{forwardingEmail}',
-              'httpMethod' => 'DELETE',
-              'parameters' => array(
-                'userId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'forwardingEmail' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'get' => array(
-              'path' => '{userId}/settings/forwardingAddresses/{forwardingEmail}',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'userId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'forwardingEmail' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'list' => array(
-              'path' => '{userId}/settings/forwardingAddresses',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'userId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),
-          )
-        )
-    );
-    $this->users_settings_sendAs = new Google_Service_Gmail_Resource_UsersSettingsSendAs(
-        $this,
-        $this->serviceName,
-        'sendAs',
-        array(
-          'methods' => array(
-            'create' => array(
-              'path' => '{userId}/settings/sendAs',
-              'httpMethod' => 'POST',
-              'parameters' => array(
-                'userId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'delete' => array(
-              'path' => '{userId}/settings/sendAs/{sendAsEmail}',
-              'httpMethod' => 'DELETE',
-              'parameters' => array(
-                'userId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'sendAsEmail' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'get' => array(
-              'path' => '{userId}/settings/sendAs/{sendAsEmail}',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'userId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'sendAsEmail' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'list' => array(
-              'path' => '{userId}/settings/sendAs',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'userId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'patch' => array(
-              'path' => '{userId}/settings/sendAs/{sendAsEmail}',
-              'httpMethod' => 'PATCH',
-              'parameters' => array(
-                'userId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'sendAsEmail' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'update' => array(
-              'path' => '{userId}/settings/sendAs/{sendAsEmail}',
-              'httpMethod' => 'PUT',
-              'parameters' => array(
-                'userId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'sendAsEmail' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'verify' => array(
-              'path' => '{userId}/settings/sendAs/{sendAsEmail}/verify',
-              'httpMethod' => 'POST',
-              'parameters' => array(
-                'userId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'sendAsEmail' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),
-          )
-        )
-    );
-    $this->users_settings_sendAs_smimeInfo = new Google_Service_Gmail_Resource_UsersSettingsSendAsSmimeInfo(
-        $this,
-        $this->serviceName,
-        'smimeInfo',
-        array(
-          'methods' => array(
-            'delete' => array(
-              'path' => '{userId}/settings/sendAs/{sendAsEmail}/smimeInfo/{id}',
-              'httpMethod' => 'DELETE',
-              'parameters' => array(
-                'userId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'sendAsEmail' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'id' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'get' => array(
-              'path' => '{userId}/settings/sendAs/{sendAsEmail}/smimeInfo/{id}',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'userId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'sendAsEmail' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'id' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'insert' => array(
-              'path' => '{userId}/settings/sendAs/{sendAsEmail}/smimeInfo',
-              'httpMethod' => 'POST',
-              'parameters' => array(
-                'userId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'sendAsEmail' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'list' => array(
-              'path' => '{userId}/settings/sendAs/{sendAsEmail}/smimeInfo',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'userId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'sendAsEmail' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'setDefault' => array(
-              'path' => '{userId}/settings/sendAs/{sendAsEmail}/smimeInfo/{id}/setDefault',
-              'httpMethod' => 'POST',
-              'parameters' => array(
-                'userId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'sendAsEmail' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'id' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),
-          )
-        )
-    );
-    $this->users_threads = new Google_Service_Gmail_Resource_UsersThreads(
-        $this,
-        $this->serviceName,
-        'threads',
-        array(
-          'methods' => array(
-            'delete' => array(
-              'path' => '{userId}/threads/{id}',
-              'httpMethod' => 'DELETE',
-              'parameters' => array(
-                'userId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'id' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'get' => array(
-              'path' => '{userId}/threads/{id}',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'userId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'id' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'format' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'metadataHeaders' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                  'repeated' => true,
-                ),
-              ),
-            ),'list' => array(
-              'path' => '{userId}/threads',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'userId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'includeSpamTrash' => array(
-                  'location' => 'query',
-                  'type' => 'boolean',
-                ),
-                'labelIds' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                  'repeated' => true,
-                ),
-                'maxResults' => array(
-                  'location' => 'query',
-                  'type' => 'integer',
-                ),
-                'pageToken' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'q' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-              ),
-            ),'modify' => array(
-              'path' => '{userId}/threads/{id}/modify',
-              'httpMethod' => 'POST',
-              'parameters' => array(
-                'userId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'id' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'trash' => array(
-              'path' => '{userId}/threads/{id}/trash',
-              'httpMethod' => 'POST',
-              'parameters' => array(
-                'userId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'id' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'untrash' => array(
-              'path' => '{userId}/threads/{id}/untrash',
-              'httpMethod' => 'POST',
-              'parameters' => array(
-                'userId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'id' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),
-          )
-        )
-    );
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Gmail/AutoForwarding.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Gmail/AutoForwarding.php
deleted file mode 100644
index ab1ea245..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Gmail/AutoForwarding.php
+++ /dev/null
@@ -1,48 +0,0 @@
-disposition = $disposition;
-  }
-  public function getDisposition()
-  {
-    return $this->disposition;
-  }
-  public function setEmailAddress($emailAddress)
-  {
-    $this->emailAddress = $emailAddress;
-  }
-  public function getEmailAddress()
-  {
-    return $this->emailAddress;
-  }
-  public function setEnabled($enabled)
-  {
-    $this->enabled = $enabled;
-  }
-  public function getEnabled()
-  {
-    return $this->enabled;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Gmail/BatchDeleteMessagesRequest.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Gmail/BatchDeleteMessagesRequest.php
deleted file mode 100644
index e8f0a8d9..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Gmail/BatchDeleteMessagesRequest.php
+++ /dev/null
@@ -1,31 +0,0 @@
-ids = $ids;
-  }
-  public function getIds()
-  {
-    return $this->ids;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Gmail/BatchModifyMessagesRequest.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Gmail/BatchModifyMessagesRequest.php
deleted file mode 100644
index ac6474c8..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Gmail/BatchModifyMessagesRequest.php
+++ /dev/null
@@ -1,49 +0,0 @@
-addLabelIds = $addLabelIds;
-  }
-  public function getAddLabelIds()
-  {
-    return $this->addLabelIds;
-  }
-  public function setIds($ids)
-  {
-    $this->ids = $ids;
-  }
-  public function getIds()
-  {
-    return $this->ids;
-  }
-  public function setRemoveLabelIds($removeLabelIds)
-  {
-    $this->removeLabelIds = $removeLabelIds;
-  }
-  public function getRemoveLabelIds()
-  {
-    return $this->removeLabelIds;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Gmail/Draft.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Gmail/Draft.php
deleted file mode 100644
index adcbce81..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Gmail/Draft.php
+++ /dev/null
@@ -1,40 +0,0 @@
-id = $id;
-  }
-  public function getId()
-  {
-    return $this->id;
-  }
-  public function setMessage(Google_Service_Gmail_Message $message)
-  {
-    $this->message = $message;
-  }
-  public function getMessage()
-  {
-    return $this->message;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Gmail/Filter.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Gmail/Filter.php
deleted file mode 100644
index c0fb8455..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Gmail/Filter.php
+++ /dev/null
@@ -1,50 +0,0 @@
-action = $action;
-  }
-  public function getAction()
-  {
-    return $this->action;
-  }
-  public function setCriteria(Google_Service_Gmail_FilterCriteria $criteria)
-  {
-    $this->criteria = $criteria;
-  }
-  public function getCriteria()
-  {
-    return $this->criteria;
-  }
-  public function setId($id)
-  {
-    $this->id = $id;
-  }
-  public function getId()
-  {
-    return $this->id;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Gmail/FilterAction.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Gmail/FilterAction.php
deleted file mode 100644
index 2c2f7137..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Gmail/FilterAction.php
+++ /dev/null
@@ -1,49 +0,0 @@
-addLabelIds = $addLabelIds;
-  }
-  public function getAddLabelIds()
-  {
-    return $this->addLabelIds;
-  }
-  public function setForward($forward)
-  {
-    $this->forward = $forward;
-  }
-  public function getForward()
-  {
-    return $this->forward;
-  }
-  public function setRemoveLabelIds($removeLabelIds)
-  {
-    $this->removeLabelIds = $removeLabelIds;
-  }
-  public function getRemoveLabelIds()
-  {
-    return $this->removeLabelIds;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Gmail/FilterCriteria.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Gmail/FilterCriteria.php
deleted file mode 100644
index fd8ea442..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Gmail/FilterCriteria.php
+++ /dev/null
@@ -1,102 +0,0 @@
-excludeChats = $excludeChats;
-  }
-  public function getExcludeChats()
-  {
-    return $this->excludeChats;
-  }
-  public function setFrom($from)
-  {
-    $this->from = $from;
-  }
-  public function getFrom()
-  {
-    return $this->from;
-  }
-  public function setHasAttachment($hasAttachment)
-  {
-    $this->hasAttachment = $hasAttachment;
-  }
-  public function getHasAttachment()
-  {
-    return $this->hasAttachment;
-  }
-  public function setNegatedQuery($negatedQuery)
-  {
-    $this->negatedQuery = $negatedQuery;
-  }
-  public function getNegatedQuery()
-  {
-    return $this->negatedQuery;
-  }
-  public function setQuery($query)
-  {
-    $this->query = $query;
-  }
-  public function getQuery()
-  {
-    return $this->query;
-  }
-  public function setSize($size)
-  {
-    $this->size = $size;
-  }
-  public function getSize()
-  {
-    return $this->size;
-  }
-  public function setSizeComparison($sizeComparison)
-  {
-    $this->sizeComparison = $sizeComparison;
-  }
-  public function getSizeComparison()
-  {
-    return $this->sizeComparison;
-  }
-  public function setSubject($subject)
-  {
-    $this->subject = $subject;
-  }
-  public function getSubject()
-  {
-    return $this->subject;
-  }
-  public function setTo($to)
-  {
-    $this->to = $to;
-  }
-  public function getTo()
-  {
-    return $this->to;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Gmail/ForwardingAddress.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Gmail/ForwardingAddress.php
deleted file mode 100644
index 30259a5b..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Gmail/ForwardingAddress.php
+++ /dev/null
@@ -1,39 +0,0 @@
-forwardingEmail = $forwardingEmail;
-  }
-  public function getForwardingEmail()
-  {
-    return $this->forwardingEmail;
-  }
-  public function setVerificationStatus($verificationStatus)
-  {
-    $this->verificationStatus = $verificationStatus;
-  }
-  public function getVerificationStatus()
-  {
-    return $this->verificationStatus;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Gmail/History.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Gmail/History.php
deleted file mode 100644
index c94fbacb..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Gmail/History.php
+++ /dev/null
@@ -1,81 +0,0 @@
-id = $id;
-  }
-  public function getId()
-  {
-    return $this->id;
-  }
-  public function setLabelsAdded($labelsAdded)
-  {
-    $this->labelsAdded = $labelsAdded;
-  }
-  public function getLabelsAdded()
-  {
-    return $this->labelsAdded;
-  }
-  public function setLabelsRemoved($labelsRemoved)
-  {
-    $this->labelsRemoved = $labelsRemoved;
-  }
-  public function getLabelsRemoved()
-  {
-    return $this->labelsRemoved;
-  }
-  public function setMessages($messages)
-  {
-    $this->messages = $messages;
-  }
-  public function getMessages()
-  {
-    return $this->messages;
-  }
-  public function setMessagesAdded($messagesAdded)
-  {
-    $this->messagesAdded = $messagesAdded;
-  }
-  public function getMessagesAdded()
-  {
-    return $this->messagesAdded;
-  }
-  public function setMessagesDeleted($messagesDeleted)
-  {
-    $this->messagesDeleted = $messagesDeleted;
-  }
-  public function getMessagesDeleted()
-  {
-    return $this->messagesDeleted;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Gmail/HistoryLabelAdded.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Gmail/HistoryLabelAdded.php
deleted file mode 100644
index 98af97c0..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Gmail/HistoryLabelAdded.php
+++ /dev/null
@@ -1,41 +0,0 @@
-labelIds = $labelIds;
-  }
-  public function getLabelIds()
-  {
-    return $this->labelIds;
-  }
-  public function setMessage(Google_Service_Gmail_Message $message)
-  {
-    $this->message = $message;
-  }
-  public function getMessage()
-  {
-    return $this->message;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Gmail/HistoryLabelRemoved.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Gmail/HistoryLabelRemoved.php
deleted file mode 100644
index 8bba31ea..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Gmail/HistoryLabelRemoved.php
+++ /dev/null
@@ -1,41 +0,0 @@
-labelIds = $labelIds;
-  }
-  public function getLabelIds()
-  {
-    return $this->labelIds;
-  }
-  public function setMessage(Google_Service_Gmail_Message $message)
-  {
-    $this->message = $message;
-  }
-  public function getMessage()
-  {
-    return $this->message;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Gmail/HistoryMessageAdded.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Gmail/HistoryMessageAdded.php
deleted file mode 100644
index 28e5aecc..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Gmail/HistoryMessageAdded.php
+++ /dev/null
@@ -1,31 +0,0 @@
-message = $message;
-  }
-  public function getMessage()
-  {
-    return $this->message;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Gmail/HistoryMessageDeleted.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Gmail/HistoryMessageDeleted.php
deleted file mode 100644
index d8ecf450..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Gmail/HistoryMessageDeleted.php
+++ /dev/null
@@ -1,31 +0,0 @@
-message = $message;
-  }
-  public function getMessage()
-  {
-    return $this->message;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Gmail/ImapSettings.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Gmail/ImapSettings.php
deleted file mode 100644
index 8f467f93..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Gmail/ImapSettings.php
+++ /dev/null
@@ -1,57 +0,0 @@
-autoExpunge = $autoExpunge;
-  }
-  public function getAutoExpunge()
-  {
-    return $this->autoExpunge;
-  }
-  public function setEnabled($enabled)
-  {
-    $this->enabled = $enabled;
-  }
-  public function getEnabled()
-  {
-    return $this->enabled;
-  }
-  public function setExpungeBehavior($expungeBehavior)
-  {
-    $this->expungeBehavior = $expungeBehavior;
-  }
-  public function getExpungeBehavior()
-  {
-    return $this->expungeBehavior;
-  }
-  public function setMaxFolderSize($maxFolderSize)
-  {
-    $this->maxFolderSize = $maxFolderSize;
-  }
-  public function getMaxFolderSize()
-  {
-    return $this->maxFolderSize;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Gmail/Label.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Gmail/Label.php
deleted file mode 100644
index 9595a0b5..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Gmail/Label.php
+++ /dev/null
@@ -1,102 +0,0 @@
-id = $id;
-  }
-  public function getId()
-  {
-    return $this->id;
-  }
-  public function setLabelListVisibility($labelListVisibility)
-  {
-    $this->labelListVisibility = $labelListVisibility;
-  }
-  public function getLabelListVisibility()
-  {
-    return $this->labelListVisibility;
-  }
-  public function setMessageListVisibility($messageListVisibility)
-  {
-    $this->messageListVisibility = $messageListVisibility;
-  }
-  public function getMessageListVisibility()
-  {
-    return $this->messageListVisibility;
-  }
-  public function setMessagesTotal($messagesTotal)
-  {
-    $this->messagesTotal = $messagesTotal;
-  }
-  public function getMessagesTotal()
-  {
-    return $this->messagesTotal;
-  }
-  public function setMessagesUnread($messagesUnread)
-  {
-    $this->messagesUnread = $messagesUnread;
-  }
-  public function getMessagesUnread()
-  {
-    return $this->messagesUnread;
-  }
-  public function setName($name)
-  {
-    $this->name = $name;
-  }
-  public function getName()
-  {
-    return $this->name;
-  }
-  public function setThreadsTotal($threadsTotal)
-  {
-    $this->threadsTotal = $threadsTotal;
-  }
-  public function getThreadsTotal()
-  {
-    return $this->threadsTotal;
-  }
-  public function setThreadsUnread($threadsUnread)
-  {
-    $this->threadsUnread = $threadsUnread;
-  }
-  public function getThreadsUnread()
-  {
-    return $this->threadsUnread;
-  }
-  public function setType($type)
-  {
-    $this->type = $type;
-  }
-  public function getType()
-  {
-    return $this->type;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Gmail/ListDraftsResponse.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Gmail/ListDraftsResponse.php
deleted file mode 100644
index 4c510e47..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Gmail/ListDraftsResponse.php
+++ /dev/null
@@ -1,50 +0,0 @@
-drafts = $drafts;
-  }
-  public function getDrafts()
-  {
-    return $this->drafts;
-  }
-  public function setNextPageToken($nextPageToken)
-  {
-    $this->nextPageToken = $nextPageToken;
-  }
-  public function getNextPageToken()
-  {
-    return $this->nextPageToken;
-  }
-  public function setResultSizeEstimate($resultSizeEstimate)
-  {
-    $this->resultSizeEstimate = $resultSizeEstimate;
-  }
-  public function getResultSizeEstimate()
-  {
-    return $this->resultSizeEstimate;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Gmail/ListFiltersResponse.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Gmail/ListFiltersResponse.php
deleted file mode 100644
index 20c14b19..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Gmail/ListFiltersResponse.php
+++ /dev/null
@@ -1,32 +0,0 @@
-filter = $filter;
-  }
-  public function getFilter()
-  {
-    return $this->filter;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Gmail/ListForwardingAddressesResponse.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Gmail/ListForwardingAddressesResponse.php
deleted file mode 100644
index f91c0f95..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Gmail/ListForwardingAddressesResponse.php
+++ /dev/null
@@ -1,32 +0,0 @@
-forwardingAddresses = $forwardingAddresses;
-  }
-  public function getForwardingAddresses()
-  {
-    return $this->forwardingAddresses;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Gmail/ListHistoryResponse.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Gmail/ListHistoryResponse.php
deleted file mode 100644
index b2a95741..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Gmail/ListHistoryResponse.php
+++ /dev/null
@@ -1,50 +0,0 @@
-history = $history;
-  }
-  public function getHistory()
-  {
-    return $this->history;
-  }
-  public function setHistoryId($historyId)
-  {
-    $this->historyId = $historyId;
-  }
-  public function getHistoryId()
-  {
-    return $this->historyId;
-  }
-  public function setNextPageToken($nextPageToken)
-  {
-    $this->nextPageToken = $nextPageToken;
-  }
-  public function getNextPageToken()
-  {
-    return $this->nextPageToken;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Gmail/ListLabelsResponse.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Gmail/ListLabelsResponse.php
deleted file mode 100644
index dcd09dbb..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Gmail/ListLabelsResponse.php
+++ /dev/null
@@ -1,32 +0,0 @@
-labels = $labels;
-  }
-  public function getLabels()
-  {
-    return $this->labels;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Gmail/ListMessagesResponse.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Gmail/ListMessagesResponse.php
deleted file mode 100644
index 18ab5603..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Gmail/ListMessagesResponse.php
+++ /dev/null
@@ -1,50 +0,0 @@
-messages = $messages;
-  }
-  public function getMessages()
-  {
-    return $this->messages;
-  }
-  public function setNextPageToken($nextPageToken)
-  {
-    $this->nextPageToken = $nextPageToken;
-  }
-  public function getNextPageToken()
-  {
-    return $this->nextPageToken;
-  }
-  public function setResultSizeEstimate($resultSizeEstimate)
-  {
-    $this->resultSizeEstimate = $resultSizeEstimate;
-  }
-  public function getResultSizeEstimate()
-  {
-    return $this->resultSizeEstimate;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Gmail/ListSendAsResponse.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Gmail/ListSendAsResponse.php
deleted file mode 100644
index 288d2f54..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Gmail/ListSendAsResponse.php
+++ /dev/null
@@ -1,32 +0,0 @@
-sendAs = $sendAs;
-  }
-  public function getSendAs()
-  {
-    return $this->sendAs;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Gmail/ListSmimeInfoResponse.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Gmail/ListSmimeInfoResponse.php
deleted file mode 100644
index e8bf165d..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Gmail/ListSmimeInfoResponse.php
+++ /dev/null
@@ -1,32 +0,0 @@
-smimeInfo = $smimeInfo;
-  }
-  public function getSmimeInfo()
-  {
-    return $this->smimeInfo;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Gmail/ListThreadsResponse.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Gmail/ListThreadsResponse.php
deleted file mode 100644
index 990f593d..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Gmail/ListThreadsResponse.php
+++ /dev/null
@@ -1,50 +0,0 @@
-nextPageToken = $nextPageToken;
-  }
-  public function getNextPageToken()
-  {
-    return $this->nextPageToken;
-  }
-  public function setResultSizeEstimate($resultSizeEstimate)
-  {
-    $this->resultSizeEstimate = $resultSizeEstimate;
-  }
-  public function getResultSizeEstimate()
-  {
-    return $this->resultSizeEstimate;
-  }
-  public function setThreads($threads)
-  {
-    $this->threads = $threads;
-  }
-  public function getThreads()
-  {
-    return $this->threads;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Gmail/Message.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Gmail/Message.php
deleted file mode 100644
index 95787880..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Gmail/Message.php
+++ /dev/null
@@ -1,104 +0,0 @@
-historyId = $historyId;
-  }
-  public function getHistoryId()
-  {
-    return $this->historyId;
-  }
-  public function setId($id)
-  {
-    $this->id = $id;
-  }
-  public function getId()
-  {
-    return $this->id;
-  }
-  public function setInternalDate($internalDate)
-  {
-    $this->internalDate = $internalDate;
-  }
-  public function getInternalDate()
-  {
-    return $this->internalDate;
-  }
-  public function setLabelIds($labelIds)
-  {
-    $this->labelIds = $labelIds;
-  }
-  public function getLabelIds()
-  {
-    return $this->labelIds;
-  }
-  public function setPayload(Google_Service_Gmail_MessagePart $payload)
-  {
-    $this->payload = $payload;
-  }
-  public function getPayload()
-  {
-    return $this->payload;
-  }
-  public function setRaw($raw)
-  {
-    $this->raw = $raw;
-  }
-  public function getRaw()
-  {
-    return $this->raw;
-  }
-  public function setSizeEstimate($sizeEstimate)
-  {
-    $this->sizeEstimate = $sizeEstimate;
-  }
-  public function getSizeEstimate()
-  {
-    return $this->sizeEstimate;
-  }
-  public function setSnippet($snippet)
-  {
-    $this->snippet = $snippet;
-  }
-  public function getSnippet()
-  {
-    return $this->snippet;
-  }
-  public function setThreadId($threadId)
-  {
-    $this->threadId = $threadId;
-  }
-  public function getThreadId()
-  {
-    return $this->threadId;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Gmail/MessagePart.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Gmail/MessagePart.php
deleted file mode 100644
index a53e1bad..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Gmail/MessagePart.php
+++ /dev/null
@@ -1,79 +0,0 @@
-body = $body;
-  }
-  public function getBody()
-  {
-    return $this->body;
-  }
-  public function setFilename($filename)
-  {
-    $this->filename = $filename;
-  }
-  public function getFilename()
-  {
-    return $this->filename;
-  }
-  public function setHeaders($headers)
-  {
-    $this->headers = $headers;
-  }
-  public function getHeaders()
-  {
-    return $this->headers;
-  }
-  public function setMimeType($mimeType)
-  {
-    $this->mimeType = $mimeType;
-  }
-  public function getMimeType()
-  {
-    return $this->mimeType;
-  }
-  public function setPartId($partId)
-  {
-    $this->partId = $partId;
-  }
-  public function getPartId()
-  {
-    return $this->partId;
-  }
-  public function setParts($parts)
-  {
-    $this->parts = $parts;
-  }
-  public function getParts()
-  {
-    return $this->parts;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Gmail/MessagePartBody.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Gmail/MessagePartBody.php
deleted file mode 100644
index d607b307..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Gmail/MessagePartBody.php
+++ /dev/null
@@ -1,48 +0,0 @@
-attachmentId = $attachmentId;
-  }
-  public function getAttachmentId()
-  {
-    return $this->attachmentId;
-  }
-  public function setData($data)
-  {
-    $this->data = $data;
-  }
-  public function getData()
-  {
-    return $this->data;
-  }
-  public function setSize($size)
-  {
-    $this->size = $size;
-  }
-  public function getSize()
-  {
-    return $this->size;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Gmail/MessagePartHeader.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Gmail/MessagePartHeader.php
deleted file mode 100644
index b76456f8..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Gmail/MessagePartHeader.php
+++ /dev/null
@@ -1,39 +0,0 @@
-name = $name;
-  }
-  public function getName()
-  {
-    return $this->name;
-  }
-  public function setValue($value)
-  {
-    $this->value = $value;
-  }
-  public function getValue()
-  {
-    return $this->value;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Gmail/ModifyMessageRequest.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Gmail/ModifyMessageRequest.php
deleted file mode 100644
index 96035fd5..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Gmail/ModifyMessageRequest.php
+++ /dev/null
@@ -1,40 +0,0 @@
-addLabelIds = $addLabelIds;
-  }
-  public function getAddLabelIds()
-  {
-    return $this->addLabelIds;
-  }
-  public function setRemoveLabelIds($removeLabelIds)
-  {
-    $this->removeLabelIds = $removeLabelIds;
-  }
-  public function getRemoveLabelIds()
-  {
-    return $this->removeLabelIds;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Gmail/ModifyThreadRequest.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Gmail/ModifyThreadRequest.php
deleted file mode 100644
index 9409d0d3..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Gmail/ModifyThreadRequest.php
+++ /dev/null
@@ -1,40 +0,0 @@
-addLabelIds = $addLabelIds;
-  }
-  public function getAddLabelIds()
-  {
-    return $this->addLabelIds;
-  }
-  public function setRemoveLabelIds($removeLabelIds)
-  {
-    $this->removeLabelIds = $removeLabelIds;
-  }
-  public function getRemoveLabelIds()
-  {
-    return $this->removeLabelIds;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Gmail/PopSettings.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Gmail/PopSettings.php
deleted file mode 100644
index dcc92546..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Gmail/PopSettings.php
+++ /dev/null
@@ -1,39 +0,0 @@
-accessWindow = $accessWindow;
-  }
-  public function getAccessWindow()
-  {
-    return $this->accessWindow;
-  }
-  public function setDisposition($disposition)
-  {
-    $this->disposition = $disposition;
-  }
-  public function getDisposition()
-  {
-    return $this->disposition;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Gmail/Profile.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Gmail/Profile.php
deleted file mode 100644
index 15fccdfc..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Gmail/Profile.php
+++ /dev/null
@@ -1,57 +0,0 @@
-emailAddress = $emailAddress;
-  }
-  public function getEmailAddress()
-  {
-    return $this->emailAddress;
-  }
-  public function setHistoryId($historyId)
-  {
-    $this->historyId = $historyId;
-  }
-  public function getHistoryId()
-  {
-    return $this->historyId;
-  }
-  public function setMessagesTotal($messagesTotal)
-  {
-    $this->messagesTotal = $messagesTotal;
-  }
-  public function getMessagesTotal()
-  {
-    return $this->messagesTotal;
-  }
-  public function setThreadsTotal($threadsTotal)
-  {
-    $this->threadsTotal = $threadsTotal;
-  }
-  public function getThreadsTotal()
-  {
-    return $this->threadsTotal;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Gmail/Resource/Users.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Gmail/Resource/Users.php
deleted file mode 100644
index a98be061..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Gmail/Resource/Users.php
+++ /dev/null
@@ -1,71 +0,0 @@
-
- *   $gmailService = new Google_Service_Gmail(...);
- *   $users = $gmailService->users;
- *  
- */
-class Google_Service_Gmail_Resource_Users extends Google_Service_Resource
-{
-  /**
-   * Gets the current user's Gmail profile. (users.getProfile)
-   *
-   * @param string $userId The user's email address. The special value me can be
-   * used to indicate the authenticated user.
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Gmail_Profile
-   */
-  public function getProfile($userId, $optParams = array())
-  {
-    $params = array('userId' => $userId);
-    $params = array_merge($params, $optParams);
-    return $this->call('getProfile', array($params), "Google_Service_Gmail_Profile");
-  }
-  /**
-   * Stop receiving push notifications for the given user mailbox. (users.stop)
-   *
-   * @param string $userId The user's email address. The special value me can be
-   * used to indicate the authenticated user.
-   * @param array $optParams Optional parameters.
-   */
-  public function stop($userId, $optParams = array())
-  {
-    $params = array('userId' => $userId);
-    $params = array_merge($params, $optParams);
-    return $this->call('stop', array($params));
-  }
-  /**
-   * Set up or update a push notification watch on the given user mailbox.
-   * (users.watch)
-   *
-   * @param string $userId The user's email address. The special value me can be
-   * used to indicate the authenticated user.
-   * @param Google_Service_Gmail_WatchRequest $postBody
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Gmail_WatchResponse
-   */
-  public function watch($userId, Google_Service_Gmail_WatchRequest $postBody, $optParams = array())
-  {
-    $params = array('userId' => $userId, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('watch', array($params), "Google_Service_Gmail_WatchResponse");
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Gmail/Resource/UsersDrafts.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Gmail/Resource/UsersDrafts.php
deleted file mode 100644
index af78f4b3..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Gmail/Resource/UsersDrafts.php
+++ /dev/null
@@ -1,130 +0,0 @@
-
- *   $gmailService = new Google_Service_Gmail(...);
- *   $drafts = $gmailService->drafts;
- *  
- */
-class Google_Service_Gmail_Resource_UsersDrafts extends Google_Service_Resource
-{
-  /**
-   * Creates a new draft with the DRAFT label. (drafts.create)
-   *
-   * @param string $userId The user's email address. The special value me can be
-   * used to indicate the authenticated user.
-   * @param Google_Service_Gmail_Draft $postBody
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Gmail_Draft
-   */
-  public function create($userId, Google_Service_Gmail_Draft $postBody, $optParams = array())
-  {
-    $params = array('userId' => $userId, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('create', array($params), "Google_Service_Gmail_Draft");
-  }
-  /**
-   * Immediately and permanently deletes the specified draft. Does not simply
-   * trash it. (drafts.delete)
-   *
-   * @param string $userId The user's email address. The special value me can be
-   * used to indicate the authenticated user.
-   * @param string $id The ID of the draft to delete.
-   * @param array $optParams Optional parameters.
-   */
-  public function delete($userId, $id, $optParams = array())
-  {
-    $params = array('userId' => $userId, 'id' => $id);
-    $params = array_merge($params, $optParams);
-    return $this->call('delete', array($params));
-  }
-  /**
-   * Gets the specified draft. (drafts.get)
-   *
-   * @param string $userId The user's email address. The special value me can be
-   * used to indicate the authenticated user.
-   * @param string $id The ID of the draft to retrieve.
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param string format The format to return the draft in.
-   * @return Google_Service_Gmail_Draft
-   */
-  public function get($userId, $id, $optParams = array())
-  {
-    $params = array('userId' => $userId, 'id' => $id);
-    $params = array_merge($params, $optParams);
-    return $this->call('get', array($params), "Google_Service_Gmail_Draft");
-  }
-  /**
-   * Lists the drafts in the user's mailbox. (drafts.listUsersDrafts)
-   *
-   * @param string $userId The user's email address. The special value me can be
-   * used to indicate the authenticated user.
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param bool includeSpamTrash Include drafts from SPAM and TRASH in the
-   * results.
-   * @opt_param string maxResults Maximum number of drafts to return.
-   * @opt_param string pageToken Page token to retrieve a specific page of results
-   * in the list.
-   * @opt_param string q Only return draft messages matching the specified query.
-   * Supports the same query format as the Gmail search box. For example,
-   * "from:someuser@example.com rfc822msgid: is:unread".
-   * @return Google_Service_Gmail_ListDraftsResponse
-   */
-  public function listUsersDrafts($userId, $optParams = array())
-  {
-    $params = array('userId' => $userId);
-    $params = array_merge($params, $optParams);
-    return $this->call('list', array($params), "Google_Service_Gmail_ListDraftsResponse");
-  }
-  /**
-   * Sends the specified, existing draft to the recipients in the To, Cc, and Bcc
-   * headers. (drafts.send)
-   *
-   * @param string $userId The user's email address. The special value me can be
-   * used to indicate the authenticated user.
-   * @param Google_Service_Gmail_Draft $postBody
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Gmail_Message
-   */
-  public function send($userId, Google_Service_Gmail_Draft $postBody, $optParams = array())
-  {
-    $params = array('userId' => $userId, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('send', array($params), "Google_Service_Gmail_Message");
-  }
-  /**
-   * Replaces a draft's content. (drafts.update)
-   *
-   * @param string $userId The user's email address. The special value me can be
-   * used to indicate the authenticated user.
-   * @param string $id The ID of the draft to update.
-   * @param Google_Service_Gmail_Draft $postBody
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Gmail_Draft
-   */
-  public function update($userId, $id, Google_Service_Gmail_Draft $postBody, $optParams = array())
-  {
-    $params = array('userId' => $userId, 'id' => $id, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('update', array($params), "Google_Service_Gmail_Draft");
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Gmail/Resource/UsersHistory.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Gmail/Resource/UsersHistory.php
deleted file mode 100644
index f04f7cf7..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Gmail/Resource/UsersHistory.php
+++ /dev/null
@@ -1,61 +0,0 @@
-
- *   $gmailService = new Google_Service_Gmail(...);
- *   $history = $gmailService->history;
- *  
- */
-class Google_Service_Gmail_Resource_UsersHistory extends Google_Service_Resource
-{
-  /**
-   * Lists the history of all changes to the given mailbox. History results are
-   * returned in chronological order (increasing historyId).
-   * (history.listUsersHistory)
-   *
-   * @param string $userId The user's email address. The special value me can be
-   * used to indicate the authenticated user.
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param string historyTypes History types to be returned by the function
-   * @opt_param string labelId Only return messages with a label matching the ID.
-   * @opt_param string maxResults The maximum number of history records to return.
-   * @opt_param string pageToken Page token to retrieve a specific page of results
-   * in the list.
-   * @opt_param string startHistoryId Required. Returns history records after the
-   * specified startHistoryId. The supplied startHistoryId should be obtained from
-   * the historyId of a message, thread, or previous list response. History IDs
-   * increase chronologically but are not contiguous with random gaps in between
-   * valid IDs. Supplying an invalid or out of date startHistoryId typically
-   * returns an HTTP 404 error code. A historyId is typically valid for at least a
-   * week, but in some rare circumstances may be valid for only a few hours. If
-   * you receive an HTTP 404 error response, your application should perform a
-   * full sync. If you receive no nextPageToken in the response, there are no
-   * updates to retrieve and you can store the returned historyId for a future
-   * request.
-   * @return Google_Service_Gmail_ListHistoryResponse
-   */
-  public function listUsersHistory($userId, $optParams = array())
-  {
-    $params = array('userId' => $userId);
-    $params = array_merge($params, $optParams);
-    return $this->call('list', array($params), "Google_Service_Gmail_ListHistoryResponse");
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Gmail/Resource/UsersLabels.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Gmail/Resource/UsersLabels.php
deleted file mode 100644
index f099e5b6..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Gmail/Resource/UsersLabels.php
+++ /dev/null
@@ -1,120 +0,0 @@
-
- *   $gmailService = new Google_Service_Gmail(...);
- *   $labels = $gmailService->labels;
- *  
- */
-class Google_Service_Gmail_Resource_UsersLabels extends Google_Service_Resource
-{
-  /**
-   * Creates a new label. (labels.create)
-   *
-   * @param string $userId The user's email address. The special value me can be
-   * used to indicate the authenticated user.
-   * @param Google_Service_Gmail_Label $postBody
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Gmail_Label
-   */
-  public function create($userId, Google_Service_Gmail_Label $postBody, $optParams = array())
-  {
-    $params = array('userId' => $userId, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('create', array($params), "Google_Service_Gmail_Label");
-  }
-  /**
-   * Immediately and permanently deletes the specified label and removes it from
-   * any messages and threads that it is applied to. (labels.delete)
-   *
-   * @param string $userId The user's email address. The special value me can be
-   * used to indicate the authenticated user.
-   * @param string $id The ID of the label to delete.
-   * @param array $optParams Optional parameters.
-   */
-  public function delete($userId, $id, $optParams = array())
-  {
-    $params = array('userId' => $userId, 'id' => $id);
-    $params = array_merge($params, $optParams);
-    return $this->call('delete', array($params));
-  }
-  /**
-   * Gets the specified label. (labels.get)
-   *
-   * @param string $userId The user's email address. The special value me can be
-   * used to indicate the authenticated user.
-   * @param string $id The ID of the label to retrieve.
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Gmail_Label
-   */
-  public function get($userId, $id, $optParams = array())
-  {
-    $params = array('userId' => $userId, 'id' => $id);
-    $params = array_merge($params, $optParams);
-    return $this->call('get', array($params), "Google_Service_Gmail_Label");
-  }
-  /**
-   * Lists all labels in the user's mailbox. (labels.listUsersLabels)
-   *
-   * @param string $userId The user's email address. The special value me can be
-   * used to indicate the authenticated user.
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Gmail_ListLabelsResponse
-   */
-  public function listUsersLabels($userId, $optParams = array())
-  {
-    $params = array('userId' => $userId);
-    $params = array_merge($params, $optParams);
-    return $this->call('list', array($params), "Google_Service_Gmail_ListLabelsResponse");
-  }
-  /**
-   * Updates the specified label. This method supports patch semantics.
-   * (labels.patch)
-   *
-   * @param string $userId The user's email address. The special value me can be
-   * used to indicate the authenticated user.
-   * @param string $id The ID of the label to update.
-   * @param Google_Service_Gmail_Label $postBody
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Gmail_Label
-   */
-  public function patch($userId, $id, Google_Service_Gmail_Label $postBody, $optParams = array())
-  {
-    $params = array('userId' => $userId, 'id' => $id, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('patch', array($params), "Google_Service_Gmail_Label");
-  }
-  /**
-   * Updates the specified label. (labels.update)
-   *
-   * @param string $userId The user's email address. The special value me can be
-   * used to indicate the authenticated user.
-   * @param string $id The ID of the label to update.
-   * @param Google_Service_Gmail_Label $postBody
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Gmail_Label
-   */
-  public function update($userId, $id, Google_Service_Gmail_Label $postBody, $optParams = array())
-  {
-    $params = array('userId' => $userId, 'id' => $id, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('update', array($params), "Google_Service_Gmail_Label");
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Gmail/Resource/UsersMessages.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Gmail/Resource/UsersMessages.php
deleted file mode 100644
index f8da91aa..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Gmail/Resource/UsersMessages.php
+++ /dev/null
@@ -1,229 +0,0 @@
-
- *   $gmailService = new Google_Service_Gmail(...);
- *   $messages = $gmailService->messages;
- *  
- */
-class Google_Service_Gmail_Resource_UsersMessages extends Google_Service_Resource
-{
-  /**
-   * Deletes many messages by message ID. Provides no guarantees that messages
-   * were not already deleted or even existed at all. (messages.batchDelete)
-   *
-   * @param string $userId The user's email address. The special value me can be
-   * used to indicate the authenticated user.
-   * @param Google_Service_Gmail_BatchDeleteMessagesRequest $postBody
-   * @param array $optParams Optional parameters.
-   */
-  public function batchDelete($userId, Google_Service_Gmail_BatchDeleteMessagesRequest $postBody, $optParams = array())
-  {
-    $params = array('userId' => $userId, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('batchDelete', array($params));
-  }
-  /**
-   * Modifies the labels on the specified messages. (messages.batchModify)
-   *
-   * @param string $userId The user's email address. The special value me can be
-   * used to indicate the authenticated user.
-   * @param Google_Service_Gmail_BatchModifyMessagesRequest $postBody
-   * @param array $optParams Optional parameters.
-   */
-  public function batchModify($userId, Google_Service_Gmail_BatchModifyMessagesRequest $postBody, $optParams = array())
-  {
-    $params = array('userId' => $userId, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('batchModify', array($params));
-  }
-  /**
-   * Immediately and permanently deletes the specified message. This operation
-   * cannot be undone. Prefer messages.trash instead. (messages.delete)
-   *
-   * @param string $userId The user's email address. The special value me can be
-   * used to indicate the authenticated user.
-   * @param string $id The ID of the message to delete.
-   * @param array $optParams Optional parameters.
-   */
-  public function delete($userId, $id, $optParams = array())
-  {
-    $params = array('userId' => $userId, 'id' => $id);
-    $params = array_merge($params, $optParams);
-    return $this->call('delete', array($params));
-  }
-  /**
-   * Gets the specified message. (messages.get)
-   *
-   * @param string $userId The user's email address. The special value me can be
-   * used to indicate the authenticated user.
-   * @param string $id The ID of the message to retrieve.
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param string format The format to return the message in.
-   * @opt_param string metadataHeaders When given and format is METADATA, only
-   * include headers specified.
-   * @return Google_Service_Gmail_Message
-   */
-  public function get($userId, $id, $optParams = array())
-  {
-    $params = array('userId' => $userId, 'id' => $id);
-    $params = array_merge($params, $optParams);
-    return $this->call('get', array($params), "Google_Service_Gmail_Message");
-  }
-  /**
-   * Imports a message into only this user's mailbox, with standard email delivery
-   * scanning and classification similar to receiving via SMTP. Does not send a
-   * message. (messages.import)
-   *
-   * @param string $userId The user's email address. The special value me can be
-   * used to indicate the authenticated user.
-   * @param Google_Service_Gmail_Message $postBody
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param bool deleted Mark the email as permanently deleted (not TRASH) and
-   * only visible in Google Vault to a Vault administrator. Only used for G Suite
-   * accounts.
-   * @opt_param string internalDateSource Source for Gmail's internal date of the
-   * message.
-   * @opt_param bool neverMarkSpam Ignore the Gmail spam classifier decision and
-   * never mark this email as SPAM in the mailbox.
-   * @opt_param bool processForCalendar Process calendar invites in the email and
-   * add any extracted meetings to the Google Calendar for this user.
-   * @return Google_Service_Gmail_Message
-   */
-  public function import($userId, Google_Service_Gmail_Message $postBody, $optParams = array())
-  {
-    $params = array('userId' => $userId, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('import', array($params), "Google_Service_Gmail_Message");
-  }
-  /**
-   * Directly inserts a message into only this user's mailbox similar to IMAP
-   * APPEND, bypassing most scanning and classification. Does not send a message.
-   * (messages.insert)
-   *
-   * @param string $userId The user's email address. The special value me can be
-   * used to indicate the authenticated user.
-   * @param Google_Service_Gmail_Message $postBody
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param bool deleted Mark the email as permanently deleted (not TRASH) and
-   * only visible in Google Vault to a Vault administrator. Only used for G Suite
-   * accounts.
-   * @opt_param string internalDateSource Source for Gmail's internal date of the
-   * message.
-   * @return Google_Service_Gmail_Message
-   */
-  public function insert($userId, Google_Service_Gmail_Message $postBody, $optParams = array())
-  {
-    $params = array('userId' => $userId, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('insert', array($params), "Google_Service_Gmail_Message");
-  }
-  /**
-   * Lists the messages in the user's mailbox. (messages.listUsersMessages)
-   *
-   * @param string $userId The user's email address. The special value me can be
-   * used to indicate the authenticated user.
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param bool includeSpamTrash Include messages from SPAM and TRASH in the
-   * results.
-   * @opt_param string labelIds Only return messages with labels that match all of
-   * the specified label IDs.
-   * @opt_param string maxResults Maximum number of messages to return.
-   * @opt_param string pageToken Page token to retrieve a specific page of results
-   * in the list.
-   * @opt_param string q Only return messages matching the specified query.
-   * Supports the same query format as the Gmail search box. For example,
-   * "from:someuser@example.com rfc822msgid: is:unread". Parameter cannot be used
-   * when accessing the api using the gmail.metadata scope.
-   * @return Google_Service_Gmail_ListMessagesResponse
-   */
-  public function listUsersMessages($userId, $optParams = array())
-  {
-    $params = array('userId' => $userId);
-    $params = array_merge($params, $optParams);
-    return $this->call('list', array($params), "Google_Service_Gmail_ListMessagesResponse");
-  }
-  /**
-   * Modifies the labels on the specified message. (messages.modify)
-   *
-   * @param string $userId The user's email address. The special value me can be
-   * used to indicate the authenticated user.
-   * @param string $id The ID of the message to modify.
-   * @param Google_Service_Gmail_ModifyMessageRequest $postBody
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Gmail_Message
-   */
-  public function modify($userId, $id, Google_Service_Gmail_ModifyMessageRequest $postBody, $optParams = array())
-  {
-    $params = array('userId' => $userId, 'id' => $id, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('modify', array($params), "Google_Service_Gmail_Message");
-  }
-  /**
-   * Sends the specified message to the recipients in the To, Cc, and Bcc headers.
-   * (messages.send)
-   *
-   * @param string $userId The user's email address. The special value me can be
-   * used to indicate the authenticated user.
-   * @param Google_Service_Gmail_Message $postBody
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Gmail_Message
-   */
-  public function send($userId, Google_Service_Gmail_Message $postBody, $optParams = array())
-  {
-    $params = array('userId' => $userId, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('send', array($params), "Google_Service_Gmail_Message");
-  }
-  /**
-   * Moves the specified message to the trash. (messages.trash)
-   *
-   * @param string $userId The user's email address. The special value me can be
-   * used to indicate the authenticated user.
-   * @param string $id The ID of the message to Trash.
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Gmail_Message
-   */
-  public function trash($userId, $id, $optParams = array())
-  {
-    $params = array('userId' => $userId, 'id' => $id);
-    $params = array_merge($params, $optParams);
-    return $this->call('trash', array($params), "Google_Service_Gmail_Message");
-  }
-  /**
-   * Removes the specified message from the trash. (messages.untrash)
-   *
-   * @param string $userId The user's email address. The special value me can be
-   * used to indicate the authenticated user.
-   * @param string $id The ID of the message to remove from Trash.
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Gmail_Message
-   */
-  public function untrash($userId, $id, $optParams = array())
-  {
-    $params = array('userId' => $userId, 'id' => $id);
-    $params = array_merge($params, $optParams);
-    return $this->call('untrash', array($params), "Google_Service_Gmail_Message");
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Gmail/Resource/UsersMessagesAttachments.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Gmail/Resource/UsersMessagesAttachments.php
deleted file mode 100644
index f3d1a784..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Gmail/Resource/UsersMessagesAttachments.php
+++ /dev/null
@@ -1,44 +0,0 @@
-
- *   $gmailService = new Google_Service_Gmail(...);
- *   $attachments = $gmailService->attachments;
- *  
- */
-class Google_Service_Gmail_Resource_UsersMessagesAttachments extends Google_Service_Resource
-{
-  /**
-   * Gets the specified message attachment. (attachments.get)
-   *
-   * @param string $userId The user's email address. The special value me can be
-   * used to indicate the authenticated user.
-   * @param string $messageId The ID of the message containing the attachment.
-   * @param string $id The ID of the attachment.
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Gmail_MessagePartBody
-   */
-  public function get($userId, $messageId, $id, $optParams = array())
-  {
-    $params = array('userId' => $userId, 'messageId' => $messageId, 'id' => $id);
-    $params = array_merge($params, $optParams);
-    return $this->call('get', array($params), "Google_Service_Gmail_MessagePartBody");
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Gmail/Resource/UsersSettings.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Gmail/Resource/UsersSettings.php
deleted file mode 100644
index 1f8bfa18..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Gmail/Resource/UsersSettings.php
+++ /dev/null
@@ -1,149 +0,0 @@
-
- *   $gmailService = new Google_Service_Gmail(...);
- *   $settings = $gmailService->settings;
- *  
- */
-class Google_Service_Gmail_Resource_UsersSettings extends Google_Service_Resource
-{
-  /**
-   * Gets the auto-forwarding setting for the specified account.
-   * (settings.getAutoForwarding)
-   *
-   * @param string $userId User's email address. The special value "me" can be
-   * used to indicate the authenticated user.
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Gmail_AutoForwarding
-   */
-  public function getAutoForwarding($userId, $optParams = array())
-  {
-    $params = array('userId' => $userId);
-    $params = array_merge($params, $optParams);
-    return $this->call('getAutoForwarding', array($params), "Google_Service_Gmail_AutoForwarding");
-  }
-  /**
-   * Gets IMAP settings. (settings.getImap)
-   *
-   * @param string $userId User's email address. The special value "me" can be
-   * used to indicate the authenticated user.
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Gmail_ImapSettings
-   */
-  public function getImap($userId, $optParams = array())
-  {
-    $params = array('userId' => $userId);
-    $params = array_merge($params, $optParams);
-    return $this->call('getImap', array($params), "Google_Service_Gmail_ImapSettings");
-  }
-  /**
-   * Gets POP settings. (settings.getPop)
-   *
-   * @param string $userId User's email address. The special value "me" can be
-   * used to indicate the authenticated user.
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Gmail_PopSettings
-   */
-  public function getPop($userId, $optParams = array())
-  {
-    $params = array('userId' => $userId);
-    $params = array_merge($params, $optParams);
-    return $this->call('getPop', array($params), "Google_Service_Gmail_PopSettings");
-  }
-  /**
-   * Gets vacation responder settings. (settings.getVacation)
-   *
-   * @param string $userId User's email address. The special value "me" can be
-   * used to indicate the authenticated user.
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Gmail_VacationSettings
-   */
-  public function getVacation($userId, $optParams = array())
-  {
-    $params = array('userId' => $userId);
-    $params = array_merge($params, $optParams);
-    return $this->call('getVacation', array($params), "Google_Service_Gmail_VacationSettings");
-  }
-  /**
-   * Updates the auto-forwarding setting for the specified account. A verified
-   * forwarding address must be specified when auto-forwarding is enabled.
-   *
-   * This method is only available to service account clients that have been
-   * delegated domain-wide authority. (settings.updateAutoForwarding)
-   *
-   * @param string $userId User's email address. The special value "me" can be
-   * used to indicate the authenticated user.
-   * @param Google_Service_Gmail_AutoForwarding $postBody
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Gmail_AutoForwarding
-   */
-  public function updateAutoForwarding($userId, Google_Service_Gmail_AutoForwarding $postBody, $optParams = array())
-  {
-    $params = array('userId' => $userId, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('updateAutoForwarding', array($params), "Google_Service_Gmail_AutoForwarding");
-  }
-  /**
-   * Updates IMAP settings. (settings.updateImap)
-   *
-   * @param string $userId User's email address. The special value "me" can be
-   * used to indicate the authenticated user.
-   * @param Google_Service_Gmail_ImapSettings $postBody
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Gmail_ImapSettings
-   */
-  public function updateImap($userId, Google_Service_Gmail_ImapSettings $postBody, $optParams = array())
-  {
-    $params = array('userId' => $userId, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('updateImap', array($params), "Google_Service_Gmail_ImapSettings");
-  }
-  /**
-   * Updates POP settings. (settings.updatePop)
-   *
-   * @param string $userId User's email address. The special value "me" can be
-   * used to indicate the authenticated user.
-   * @param Google_Service_Gmail_PopSettings $postBody
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Gmail_PopSettings
-   */
-  public function updatePop($userId, Google_Service_Gmail_PopSettings $postBody, $optParams = array())
-  {
-    $params = array('userId' => $userId, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('updatePop', array($params), "Google_Service_Gmail_PopSettings");
-  }
-  /**
-   * Updates vacation responder settings. (settings.updateVacation)
-   *
-   * @param string $userId User's email address. The special value "me" can be
-   * used to indicate the authenticated user.
-   * @param Google_Service_Gmail_VacationSettings $postBody
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Gmail_VacationSettings
-   */
-  public function updateVacation($userId, Google_Service_Gmail_VacationSettings $postBody, $optParams = array())
-  {
-    $params = array('userId' => $userId, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('updateVacation', array($params), "Google_Service_Gmail_VacationSettings");
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Gmail/Resource/UsersSettingsFilters.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Gmail/Resource/UsersSettingsFilters.php
deleted file mode 100644
index 79cc1b20..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Gmail/Resource/UsersSettingsFilters.php
+++ /dev/null
@@ -1,86 +0,0 @@
-
- *   $gmailService = new Google_Service_Gmail(...);
- *   $filters = $gmailService->filters;
- *  
- */
-class Google_Service_Gmail_Resource_UsersSettingsFilters extends Google_Service_Resource
-{
-  /**
-   * Creates a filter. (filters.create)
-   *
-   * @param string $userId User's email address. The special value "me" can be
-   * used to indicate the authenticated user.
-   * @param Google_Service_Gmail_Filter $postBody
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Gmail_Filter
-   */
-  public function create($userId, Google_Service_Gmail_Filter $postBody, $optParams = array())
-  {
-    $params = array('userId' => $userId, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('create', array($params), "Google_Service_Gmail_Filter");
-  }
-  /**
-   * Deletes a filter. (filters.delete)
-   *
-   * @param string $userId User's email address. The special value "me" can be
-   * used to indicate the authenticated user.
-   * @param string $id The ID of the filter to be deleted.
-   * @param array $optParams Optional parameters.
-   */
-  public function delete($userId, $id, $optParams = array())
-  {
-    $params = array('userId' => $userId, 'id' => $id);
-    $params = array_merge($params, $optParams);
-    return $this->call('delete', array($params));
-  }
-  /**
-   * Gets a filter. (filters.get)
-   *
-   * @param string $userId User's email address. The special value "me" can be
-   * used to indicate the authenticated user.
-   * @param string $id The ID of the filter to be fetched.
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Gmail_Filter
-   */
-  public function get($userId, $id, $optParams = array())
-  {
-    $params = array('userId' => $userId, 'id' => $id);
-    $params = array_merge($params, $optParams);
-    return $this->call('get', array($params), "Google_Service_Gmail_Filter");
-  }
-  /**
-   * Lists the message filters of a Gmail user. (filters.listUsersSettingsFilters)
-   *
-   * @param string $userId User's email address. The special value "me" can be
-   * used to indicate the authenticated user.
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Gmail_ListFiltersResponse
-   */
-  public function listUsersSettingsFilters($userId, $optParams = array())
-  {
-    $params = array('userId' => $userId);
-    $params = array_merge($params, $optParams);
-    return $this->call('list', array($params), "Google_Service_Gmail_ListFiltersResponse");
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Gmail/Resource/UsersSettingsForwardingAddresses.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Gmail/Resource/UsersSettingsForwardingAddresses.php
deleted file mode 100644
index 317383fa..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Gmail/Resource/UsersSettingsForwardingAddresses.php
+++ /dev/null
@@ -1,97 +0,0 @@
-
- *   $gmailService = new Google_Service_Gmail(...);
- *   $forwardingAddresses = $gmailService->forwardingAddresses;
- *  
- */
-class Google_Service_Gmail_Resource_UsersSettingsForwardingAddresses extends Google_Service_Resource
-{
-  /**
-   * Creates a forwarding address. If ownership verification is required, a
-   * message will be sent to the recipient and the resource's verification status
-   * will be set to pending; otherwise, the resource will be created with
-   * verification status set to accepted.
-   *
-   * This method is only available to service account clients that have been
-   * delegated domain-wide authority. (forwardingAddresses.create)
-   *
-   * @param string $userId User's email address. The special value "me" can be
-   * used to indicate the authenticated user.
-   * @param Google_Service_Gmail_ForwardingAddress $postBody
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Gmail_ForwardingAddress
-   */
-  public function create($userId, Google_Service_Gmail_ForwardingAddress $postBody, $optParams = array())
-  {
-    $params = array('userId' => $userId, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('create', array($params), "Google_Service_Gmail_ForwardingAddress");
-  }
-  /**
-   * Deletes the specified forwarding address and revokes any verification that
-   * may have been required.
-   *
-   * This method is only available to service account clients that have been
-   * delegated domain-wide authority. (forwardingAddresses.delete)
-   *
-   * @param string $userId User's email address. The special value "me" can be
-   * used to indicate the authenticated user.
-   * @param string $forwardingEmail The forwarding address to be deleted.
-   * @param array $optParams Optional parameters.
-   */
-  public function delete($userId, $forwardingEmail, $optParams = array())
-  {
-    $params = array('userId' => $userId, 'forwardingEmail' => $forwardingEmail);
-    $params = array_merge($params, $optParams);
-    return $this->call('delete', array($params));
-  }
-  /**
-   * Gets the specified forwarding address. (forwardingAddresses.get)
-   *
-   * @param string $userId User's email address. The special value "me" can be
-   * used to indicate the authenticated user.
-   * @param string $forwardingEmail The forwarding address to be retrieved.
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Gmail_ForwardingAddress
-   */
-  public function get($userId, $forwardingEmail, $optParams = array())
-  {
-    $params = array('userId' => $userId, 'forwardingEmail' => $forwardingEmail);
-    $params = array_merge($params, $optParams);
-    return $this->call('get', array($params), "Google_Service_Gmail_ForwardingAddress");
-  }
-  /**
-   * Lists the forwarding addresses for the specified account.
-   * (forwardingAddresses.listUsersSettingsForwardingAddresses)
-   *
-   * @param string $userId User's email address. The special value "me" can be
-   * used to indicate the authenticated user.
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Gmail_ListForwardingAddressesResponse
-   */
-  public function listUsersSettingsForwardingAddresses($userId, $optParams = array())
-  {
-    $params = array('userId' => $userId);
-    $params = array_merge($params, $optParams);
-    return $this->call('list', array($params), "Google_Service_Gmail_ListForwardingAddressesResponse");
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Gmail/Resource/UsersSettingsSendAs.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Gmail/Resource/UsersSettingsSendAs.php
deleted file mode 100644
index 7190aa43..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Gmail/Resource/UsersSettingsSendAs.php
+++ /dev/null
@@ -1,162 +0,0 @@
-
- *   $gmailService = new Google_Service_Gmail(...);
- *   $sendAs = $gmailService->sendAs;
- *  
- */
-class Google_Service_Gmail_Resource_UsersSettingsSendAs extends Google_Service_Resource
-{
-  /**
-   * Creates a custom "from" send-as alias. If an SMTP MSA is specified, Gmail
-   * will attempt to connect to the SMTP service to validate the configuration
-   * before creating the alias. If ownership verification is required for the
-   * alias, a message will be sent to the email address and the resource's
-   * verification status will be set to pending; otherwise, the resource will be
-   * created with verification status set to accepted. If a signature is provided,
-   * Gmail will sanitize the HTML before saving it with the alias.
-   *
-   * This method is only available to service account clients that have been
-   * delegated domain-wide authority. (sendAs.create)
-   *
-   * @param string $userId User's email address. The special value "me" can be
-   * used to indicate the authenticated user.
-   * @param Google_Service_Gmail_SendAs $postBody
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Gmail_SendAs
-   */
-  public function create($userId, Google_Service_Gmail_SendAs $postBody, $optParams = array())
-  {
-    $params = array('userId' => $userId, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('create', array($params), "Google_Service_Gmail_SendAs");
-  }
-  /**
-   * Deletes the specified send-as alias. Revokes any verification that may have
-   * been required for using it.
-   *
-   * This method is only available to service account clients that have been
-   * delegated domain-wide authority. (sendAs.delete)
-   *
-   * @param string $userId User's email address. The special value "me" can be
-   * used to indicate the authenticated user.
-   * @param string $sendAsEmail The send-as alias to be deleted.
-   * @param array $optParams Optional parameters.
-   */
-  public function delete($userId, $sendAsEmail, $optParams = array())
-  {
-    $params = array('userId' => $userId, 'sendAsEmail' => $sendAsEmail);
-    $params = array_merge($params, $optParams);
-    return $this->call('delete', array($params));
-  }
-  /**
-   * Gets the specified send-as alias. Fails with an HTTP 404 error if the
-   * specified address is not a member of the collection. (sendAs.get)
-   *
-   * @param string $userId User's email address. The special value "me" can be
-   * used to indicate the authenticated user.
-   * @param string $sendAsEmail The send-as alias to be retrieved.
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Gmail_SendAs
-   */
-  public function get($userId, $sendAsEmail, $optParams = array())
-  {
-    $params = array('userId' => $userId, 'sendAsEmail' => $sendAsEmail);
-    $params = array_merge($params, $optParams);
-    return $this->call('get', array($params), "Google_Service_Gmail_SendAs");
-  }
-  /**
-   * Lists the send-as aliases for the specified account. The result includes the
-   * primary send-as address associated with the account as well as any custom
-   * "from" aliases. (sendAs.listUsersSettingsSendAs)
-   *
-   * @param string $userId User's email address. The special value "me" can be
-   * used to indicate the authenticated user.
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Gmail_ListSendAsResponse
-   */
-  public function listUsersSettingsSendAs($userId, $optParams = array())
-  {
-    $params = array('userId' => $userId);
-    $params = array_merge($params, $optParams);
-    return $this->call('list', array($params), "Google_Service_Gmail_ListSendAsResponse");
-  }
-  /**
-   * Updates a send-as alias. If a signature is provided, Gmail will sanitize the
-   * HTML before saving it with the alias.
-   *
-   * Addresses other than the primary address for the account can only be updated
-   * by service account clients that have been delegated domain-wide authority.
-   * This method supports patch semantics. (sendAs.patch)
-   *
-   * @param string $userId User's email address. The special value "me" can be
-   * used to indicate the authenticated user.
-   * @param string $sendAsEmail The send-as alias to be updated.
-   * @param Google_Service_Gmail_SendAs $postBody
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Gmail_SendAs
-   */
-  public function patch($userId, $sendAsEmail, Google_Service_Gmail_SendAs $postBody, $optParams = array())
-  {
-    $params = array('userId' => $userId, 'sendAsEmail' => $sendAsEmail, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('patch', array($params), "Google_Service_Gmail_SendAs");
-  }
-  /**
-   * Updates a send-as alias. If a signature is provided, Gmail will sanitize the
-   * HTML before saving it with the alias.
-   *
-   * Addresses other than the primary address for the account can only be updated
-   * by service account clients that have been delegated domain-wide authority.
-   * (sendAs.update)
-   *
-   * @param string $userId User's email address. The special value "me" can be
-   * used to indicate the authenticated user.
-   * @param string $sendAsEmail The send-as alias to be updated.
-   * @param Google_Service_Gmail_SendAs $postBody
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Gmail_SendAs
-   */
-  public function update($userId, $sendAsEmail, Google_Service_Gmail_SendAs $postBody, $optParams = array())
-  {
-    $params = array('userId' => $userId, 'sendAsEmail' => $sendAsEmail, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('update', array($params), "Google_Service_Gmail_SendAs");
-  }
-  /**
-   * Sends a verification email to the specified send-as alias address. The
-   * verification status must be pending.
-   *
-   * This method is only available to service account clients that have been
-   * delegated domain-wide authority. (sendAs.verify)
-   *
-   * @param string $userId User's email address. The special value "me" can be
-   * used to indicate the authenticated user.
-   * @param string $sendAsEmail The send-as alias to be verified.
-   * @param array $optParams Optional parameters.
-   */
-  public function verify($userId, $sendAsEmail, $optParams = array())
-  {
-    $params = array('userId' => $userId, 'sendAsEmail' => $sendAsEmail);
-    $params = array_merge($params, $optParams);
-    return $this->call('verify', array($params));
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Gmail/Resource/UsersSettingsSendAsSmimeInfo.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Gmail/Resource/UsersSettingsSendAsSmimeInfo.php
deleted file mode 100644
index fe09c562..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Gmail/Resource/UsersSettingsSendAsSmimeInfo.php
+++ /dev/null
@@ -1,115 +0,0 @@
-
- *   $gmailService = new Google_Service_Gmail(...);
- *   $smimeInfo = $gmailService->smimeInfo;
- *  
- */
-class Google_Service_Gmail_Resource_UsersSettingsSendAsSmimeInfo extends Google_Service_Resource
-{
-  /**
-   * Deletes the specified S/MIME config for the specified send-as alias.
-   * (smimeInfo.delete)
-   *
-   * @param string $userId The user's email address. The special value me can be
-   * used to indicate the authenticated user.
-   * @param string $sendAsEmail The email address that appears in the "From:"
-   * header for mail sent using this alias.
-   * @param string $id The immutable ID for the SmimeInfo.
-   * @param array $optParams Optional parameters.
-   */
-  public function delete($userId, $sendAsEmail, $id, $optParams = array())
-  {
-    $params = array('userId' => $userId, 'sendAsEmail' => $sendAsEmail, 'id' => $id);
-    $params = array_merge($params, $optParams);
-    return $this->call('delete', array($params));
-  }
-  /**
-   * Gets the specified S/MIME config for the specified send-as alias.
-   * (smimeInfo.get)
-   *
-   * @param string $userId The user's email address. The special value me can be
-   * used to indicate the authenticated user.
-   * @param string $sendAsEmail The email address that appears in the "From:"
-   * header for mail sent using this alias.
-   * @param string $id The immutable ID for the SmimeInfo.
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Gmail_SmimeInfo
-   */
-  public function get($userId, $sendAsEmail, $id, $optParams = array())
-  {
-    $params = array('userId' => $userId, 'sendAsEmail' => $sendAsEmail, 'id' => $id);
-    $params = array_merge($params, $optParams);
-    return $this->call('get', array($params), "Google_Service_Gmail_SmimeInfo");
-  }
-  /**
-   * Insert (upload) the given S/MIME config for the specified send-as alias. Note
-   * that pkcs12 format is required for the key. (smimeInfo.insert)
-   *
-   * @param string $userId The user's email address. The special value me can be
-   * used to indicate the authenticated user.
-   * @param string $sendAsEmail The email address that appears in the "From:"
-   * header for mail sent using this alias.
-   * @param Google_Service_Gmail_SmimeInfo $postBody
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Gmail_SmimeInfo
-   */
-  public function insert($userId, $sendAsEmail, Google_Service_Gmail_SmimeInfo $postBody, $optParams = array())
-  {
-    $params = array('userId' => $userId, 'sendAsEmail' => $sendAsEmail, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('insert', array($params), "Google_Service_Gmail_SmimeInfo");
-  }
-  /**
-   * Lists S/MIME configs for the specified send-as alias.
-   * (smimeInfo.listUsersSettingsSendAsSmimeInfo)
-   *
-   * @param string $userId The user's email address. The special value me can be
-   * used to indicate the authenticated user.
-   * @param string $sendAsEmail The email address that appears in the "From:"
-   * header for mail sent using this alias.
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Gmail_ListSmimeInfoResponse
-   */
-  public function listUsersSettingsSendAsSmimeInfo($userId, $sendAsEmail, $optParams = array())
-  {
-    $params = array('userId' => $userId, 'sendAsEmail' => $sendAsEmail);
-    $params = array_merge($params, $optParams);
-    return $this->call('list', array($params), "Google_Service_Gmail_ListSmimeInfoResponse");
-  }
-  /**
-   * Sets the default S/MIME config for the specified send-as alias.
-   * (smimeInfo.setDefault)
-   *
-   * @param string $userId The user's email address. The special value me can be
-   * used to indicate the authenticated user.
-   * @param string $sendAsEmail The email address that appears in the "From:"
-   * header for mail sent using this alias.
-   * @param string $id The immutable ID for the SmimeInfo.
-   * @param array $optParams Optional parameters.
-   */
-  public function setDefault($userId, $sendAsEmail, $id, $optParams = array())
-  {
-    $params = array('userId' => $userId, 'sendAsEmail' => $sendAsEmail, 'id' => $id);
-    $params = array_merge($params, $optParams);
-    return $this->call('setDefault', array($params));
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Gmail/Resource/UsersThreads.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Gmail/Resource/UsersThreads.php
deleted file mode 100644
index a51e541c..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Gmail/Resource/UsersThreads.php
+++ /dev/null
@@ -1,135 +0,0 @@
-
- *   $gmailService = new Google_Service_Gmail(...);
- *   $threads = $gmailService->threads;
- *  
- */
-class Google_Service_Gmail_Resource_UsersThreads extends Google_Service_Resource
-{
-  /**
-   * Immediately and permanently deletes the specified thread. This operation
-   * cannot be undone. Prefer threads.trash instead. (threads.delete)
-   *
-   * @param string $userId The user's email address. The special value me can be
-   * used to indicate the authenticated user.
-   * @param string $id ID of the Thread to delete.
-   * @param array $optParams Optional parameters.
-   */
-  public function delete($userId, $id, $optParams = array())
-  {
-    $params = array('userId' => $userId, 'id' => $id);
-    $params = array_merge($params, $optParams);
-    return $this->call('delete', array($params));
-  }
-  /**
-   * Gets the specified thread. (threads.get)
-   *
-   * @param string $userId The user's email address. The special value me can be
-   * used to indicate the authenticated user.
-   * @param string $id The ID of the thread to retrieve.
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param string format The format to return the messages in.
-   * @opt_param string metadataHeaders When given and format is METADATA, only
-   * include headers specified.
-   * @return Google_Service_Gmail_Thread
-   */
-  public function get($userId, $id, $optParams = array())
-  {
-    $params = array('userId' => $userId, 'id' => $id);
-    $params = array_merge($params, $optParams);
-    return $this->call('get', array($params), "Google_Service_Gmail_Thread");
-  }
-  /**
-   * Lists the threads in the user's mailbox. (threads.listUsersThreads)
-   *
-   * @param string $userId The user's email address. The special value me can be
-   * used to indicate the authenticated user.
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param bool includeSpamTrash Include threads from SPAM and TRASH in the
-   * results.
-   * @opt_param string labelIds Only return threads with labels that match all of
-   * the specified label IDs.
-   * @opt_param string maxResults Maximum number of threads to return.
-   * @opt_param string pageToken Page token to retrieve a specific page of results
-   * in the list.
-   * @opt_param string q Only return threads matching the specified query.
-   * Supports the same query format as the Gmail search box. For example,
-   * "from:someuser@example.com rfc822msgid: is:unread". Parameter cannot be used
-   * when accessing the api using the gmail.metadata scope.
-   * @return Google_Service_Gmail_ListThreadsResponse
-   */
-  public function listUsersThreads($userId, $optParams = array())
-  {
-    $params = array('userId' => $userId);
-    $params = array_merge($params, $optParams);
-    return $this->call('list', array($params), "Google_Service_Gmail_ListThreadsResponse");
-  }
-  /**
-   * Modifies the labels applied to the thread. This applies to all messages in
-   * the thread. (threads.modify)
-   *
-   * @param string $userId The user's email address. The special value me can be
-   * used to indicate the authenticated user.
-   * @param string $id The ID of the thread to modify.
-   * @param Google_Service_Gmail_ModifyThreadRequest $postBody
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Gmail_Thread
-   */
-  public function modify($userId, $id, Google_Service_Gmail_ModifyThreadRequest $postBody, $optParams = array())
-  {
-    $params = array('userId' => $userId, 'id' => $id, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('modify', array($params), "Google_Service_Gmail_Thread");
-  }
-  /**
-   * Moves the specified thread to the trash. (threads.trash)
-   *
-   * @param string $userId The user's email address. The special value me can be
-   * used to indicate the authenticated user.
-   * @param string $id The ID of the thread to Trash.
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Gmail_Thread
-   */
-  public function trash($userId, $id, $optParams = array())
-  {
-    $params = array('userId' => $userId, 'id' => $id);
-    $params = array_merge($params, $optParams);
-    return $this->call('trash', array($params), "Google_Service_Gmail_Thread");
-  }
-  /**
-   * Removes the specified thread from the trash. (threads.untrash)
-   *
-   * @param string $userId The user's email address. The special value me can be
-   * used to indicate the authenticated user.
-   * @param string $id The ID of the thread to remove from Trash.
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Gmail_Thread
-   */
-  public function untrash($userId, $id, $optParams = array())
-  {
-    $params = array('userId' => $userId, 'id' => $id);
-    $params = array_merge($params, $optParams);
-    return $this->call('untrash', array($params), "Google_Service_Gmail_Thread");
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Gmail/SendAs.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Gmail/SendAs.php
deleted file mode 100644
index 7df3937c..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Gmail/SendAs.php
+++ /dev/null
@@ -1,103 +0,0 @@
-displayName = $displayName;
-  }
-  public function getDisplayName()
-  {
-    return $this->displayName;
-  }
-  public function setIsDefault($isDefault)
-  {
-    $this->isDefault = $isDefault;
-  }
-  public function getIsDefault()
-  {
-    return $this->isDefault;
-  }
-  public function setIsPrimary($isPrimary)
-  {
-    $this->isPrimary = $isPrimary;
-  }
-  public function getIsPrimary()
-  {
-    return $this->isPrimary;
-  }
-  public function setReplyToAddress($replyToAddress)
-  {
-    $this->replyToAddress = $replyToAddress;
-  }
-  public function getReplyToAddress()
-  {
-    return $this->replyToAddress;
-  }
-  public function setSendAsEmail($sendAsEmail)
-  {
-    $this->sendAsEmail = $sendAsEmail;
-  }
-  public function getSendAsEmail()
-  {
-    return $this->sendAsEmail;
-  }
-  public function setSignature($signature)
-  {
-    $this->signature = $signature;
-  }
-  public function getSignature()
-  {
-    return $this->signature;
-  }
-  public function setSmtpMsa(Google_Service_Gmail_SmtpMsa $smtpMsa)
-  {
-    $this->smtpMsa = $smtpMsa;
-  }
-  public function getSmtpMsa()
-  {
-    return $this->smtpMsa;
-  }
-  public function setTreatAsAlias($treatAsAlias)
-  {
-    $this->treatAsAlias = $treatAsAlias;
-  }
-  public function getTreatAsAlias()
-  {
-    return $this->treatAsAlias;
-  }
-  public function setVerificationStatus($verificationStatus)
-  {
-    $this->verificationStatus = $verificationStatus;
-  }
-  public function getVerificationStatus()
-  {
-    return $this->verificationStatus;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Gmail/SmimeInfo.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Gmail/SmimeInfo.php
deleted file mode 100644
index e8ef0792..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Gmail/SmimeInfo.php
+++ /dev/null
@@ -1,84 +0,0 @@
-encryptedKeyPassword = $encryptedKeyPassword;
-  }
-  public function getEncryptedKeyPassword()
-  {
-    return $this->encryptedKeyPassword;
-  }
-  public function setExpiration($expiration)
-  {
-    $this->expiration = $expiration;
-  }
-  public function getExpiration()
-  {
-    return $this->expiration;
-  }
-  public function setId($id)
-  {
-    $this->id = $id;
-  }
-  public function getId()
-  {
-    return $this->id;
-  }
-  public function setIsDefault($isDefault)
-  {
-    $this->isDefault = $isDefault;
-  }
-  public function getIsDefault()
-  {
-    return $this->isDefault;
-  }
-  public function setIssuerCn($issuerCn)
-  {
-    $this->issuerCn = $issuerCn;
-  }
-  public function getIssuerCn()
-  {
-    return $this->issuerCn;
-  }
-  public function setPem($pem)
-  {
-    $this->pem = $pem;
-  }
-  public function getPem()
-  {
-    return $this->pem;
-  }
-  public function setPkcs12($pkcs12)
-  {
-    $this->pkcs12 = $pkcs12;
-  }
-  public function getPkcs12()
-  {
-    return $this->pkcs12;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Gmail/SmtpMsa.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Gmail/SmtpMsa.php
deleted file mode 100644
index 5d3c9847..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Gmail/SmtpMsa.php
+++ /dev/null
@@ -1,66 +0,0 @@
-host = $host;
-  }
-  public function getHost()
-  {
-    return $this->host;
-  }
-  public function setPassword($password)
-  {
-    $this->password = $password;
-  }
-  public function getPassword()
-  {
-    return $this->password;
-  }
-  public function setPort($port)
-  {
-    $this->port = $port;
-  }
-  public function getPort()
-  {
-    return $this->port;
-  }
-  public function setSecurityMode($securityMode)
-  {
-    $this->securityMode = $securityMode;
-  }
-  public function getSecurityMode()
-  {
-    return $this->securityMode;
-  }
-  public function setUsername($username)
-  {
-    $this->username = $username;
-  }
-  public function getUsername()
-  {
-    return $this->username;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Gmail/Thread.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Gmail/Thread.php
deleted file mode 100644
index 585b562f..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Gmail/Thread.php
+++ /dev/null
@@ -1,59 +0,0 @@
-historyId = $historyId;
-  }
-  public function getHistoryId()
-  {
-    return $this->historyId;
-  }
-  public function setId($id)
-  {
-    $this->id = $id;
-  }
-  public function getId()
-  {
-    return $this->id;
-  }
-  public function setMessages($messages)
-  {
-    $this->messages = $messages;
-  }
-  public function getMessages()
-  {
-    return $this->messages;
-  }
-  public function setSnippet($snippet)
-  {
-    $this->snippet = $snippet;
-  }
-  public function getSnippet()
-  {
-    return $this->snippet;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Gmail/VacationSettings.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Gmail/VacationSettings.php
deleted file mode 100644
index 99985428..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Gmail/VacationSettings.php
+++ /dev/null
@@ -1,93 +0,0 @@
-enableAutoReply = $enableAutoReply;
-  }
-  public function getEnableAutoReply()
-  {
-    return $this->enableAutoReply;
-  }
-  public function setEndTime($endTime)
-  {
-    $this->endTime = $endTime;
-  }
-  public function getEndTime()
-  {
-    return $this->endTime;
-  }
-  public function setResponseBodyHtml($responseBodyHtml)
-  {
-    $this->responseBodyHtml = $responseBodyHtml;
-  }
-  public function getResponseBodyHtml()
-  {
-    return $this->responseBodyHtml;
-  }
-  public function setResponseBodyPlainText($responseBodyPlainText)
-  {
-    $this->responseBodyPlainText = $responseBodyPlainText;
-  }
-  public function getResponseBodyPlainText()
-  {
-    return $this->responseBodyPlainText;
-  }
-  public function setResponseSubject($responseSubject)
-  {
-    $this->responseSubject = $responseSubject;
-  }
-  public function getResponseSubject()
-  {
-    return $this->responseSubject;
-  }
-  public function setRestrictToContacts($restrictToContacts)
-  {
-    $this->restrictToContacts = $restrictToContacts;
-  }
-  public function getRestrictToContacts()
-  {
-    return $this->restrictToContacts;
-  }
-  public function setRestrictToDomain($restrictToDomain)
-  {
-    $this->restrictToDomain = $restrictToDomain;
-  }
-  public function getRestrictToDomain()
-  {
-    return $this->restrictToDomain;
-  }
-  public function setStartTime($startTime)
-  {
-    $this->startTime = $startTime;
-  }
-  public function getStartTime()
-  {
-    return $this->startTime;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Gmail/WatchRequest.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Gmail/WatchRequest.php
deleted file mode 100644
index 6be53b54..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Gmail/WatchRequest.php
+++ /dev/null
@@ -1,49 +0,0 @@
-labelFilterAction = $labelFilterAction;
-  }
-  public function getLabelFilterAction()
-  {
-    return $this->labelFilterAction;
-  }
-  public function setLabelIds($labelIds)
-  {
-    $this->labelIds = $labelIds;
-  }
-  public function getLabelIds()
-  {
-    return $this->labelIds;
-  }
-  public function setTopicName($topicName)
-  {
-    $this->topicName = $topicName;
-  }
-  public function getTopicName()
-  {
-    return $this->topicName;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Gmail/WatchResponse.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Gmail/WatchResponse.php
deleted file mode 100644
index bcebc35a..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Gmail/WatchResponse.php
+++ /dev/null
@@ -1,39 +0,0 @@
-expiration = $expiration;
-  }
-  public function getExpiration()
-  {
-    return $this->expiration;
-  }
-  public function setHistoryId($historyId)
-  {
-    $this->historyId = $historyId;
-  }
-  public function getHistoryId()
-  {
-    return $this->historyId;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/GroupsMigration.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/GroupsMigration.php
deleted file mode 100644
index 95eb6c8a..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/GroupsMigration.php
+++ /dev/null
@@ -1,73 +0,0 @@
-
- * Groups Migration Api.

- *
- * 

- * For more information about this service, see the API
- * Documentation
- * 

- *
- * @author Google, Inc.
- */
-class Google_Service_GroupsMigration extends Google_Service
-{
-  /** Manage messages in groups on your domain. */
-  const APPS_GROUPS_MIGRATION =
-      "https://www.googleapis.com/auth/apps.groups.migration";
-
-  public $archive;
-  
-  /**
-   * Constructs the internal representation of the GroupsMigration service.
-   *
-   * @param Google_Client $client
-   */
-  public function __construct(Google_Client $client)
-  {
-    parent::__construct($client);
-    $this->rootUrl = 'https://www.googleapis.com/';
-    $this->servicePath = 'groups/v1/groups/';
-    $this->version = 'v1';
-    $this->serviceName = 'groupsmigration';
-
-    $this->archive = new Google_Service_GroupsMigration_Resource_Archive(
-        $this,
-        $this->serviceName,
-        'archive',
-        array(
-          'methods' => array(
-            'insert' => array(
-              'path' => '{groupId}/archive',
-              'httpMethod' => 'POST',
-              'parameters' => array(
-                'groupId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),
-          )
-        )
-    );
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/GroupsMigration/Groups.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/GroupsMigration/Groups.php
deleted file mode 100644
index e57ec84d..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/GroupsMigration/Groups.php
+++ /dev/null
@@ -1,39 +0,0 @@
-kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setResponseCode($responseCode)
-  {
-    $this->responseCode = $responseCode;
-  }
-  public function getResponseCode()
-  {
-    return $this->responseCode;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/GroupsMigration/Resource/Archive.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/GroupsMigration/Resource/Archive.php
deleted file mode 100644
index 26227bab..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/GroupsMigration/Resource/Archive.php
+++ /dev/null
@@ -1,41 +0,0 @@
-
- *   $groupsmigrationService = new Google_Service_GroupsMigration(...);
- *   $archive = $groupsmigrationService->archive;
- *  
- */
-class Google_Service_GroupsMigration_Resource_Archive extends Google_Service_Resource
-{
-  /**
-   * Inserts a new mail into the archive of the Google group. (archive.insert)
-   *
-   * @param string $groupId The group ID
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_GroupsMigration_Groups
-   */
-  public function insert($groupId, $optParams = array())
-  {
-    $params = array('groupId' => $groupId);
-    $params = array_merge($params, $optParams);
-    return $this->call('insert', array($params), "Google_Service_GroupsMigration_Groups");
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Groupssettings.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Groupssettings.php
deleted file mode 100644
index 75f7e8ca..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Groupssettings.php
+++ /dev/null
@@ -1,93 +0,0 @@
-
- * Lets you manage permission levels and related settings of a group.

- *
- * 

- * For more information about this service, see the API
- * Documentation
- * 

- *
- * @author Google, Inc.
- */
-class Google_Service_Groupssettings extends Google_Service
-{
-  /** View and manage the settings of a G Suite group. */
-  const APPS_GROUPS_SETTINGS =
-      "https://www.googleapis.com/auth/apps.groups.settings";
-
-  public $groups;
-  
-  /**
-   * Constructs the internal representation of the Groupssettings service.
-   *
-   * @param Google_Client $client
-   */
-  public function __construct(Google_Client $client)
-  {
-    parent::__construct($client);
-    $this->rootUrl = 'https://www.googleapis.com/';
-    $this->servicePath = 'groups/v1/groups/';
-    $this->version = 'v1';
-    $this->serviceName = 'groupssettings';
-
-    $this->groups = new Google_Service_Groupssettings_Resource_Groups(
-        $this,
-        $this->serviceName,
-        'groups',
-        array(
-          'methods' => array(
-            'get' => array(
-              'path' => '{groupUniqueId}',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'groupUniqueId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'patch' => array(
-              'path' => '{groupUniqueId}',
-              'httpMethod' => 'PATCH',
-              'parameters' => array(
-                'groupUniqueId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'update' => array(
-              'path' => '{groupUniqueId}',
-              'httpMethod' => 'PUT',
-              'parameters' => array(
-                'groupUniqueId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),
-          )
-        )
-    );
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Groupssettings/Groups.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Groupssettings/Groups.php
deleted file mode 100644
index b83138b9..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Groupssettings/Groups.php
+++ /dev/null
@@ -1,300 +0,0 @@
-allowExternalMembers = $allowExternalMembers;
-  }
-  public function getAllowExternalMembers()
-  {
-    return $this->allowExternalMembers;
-  }
-  public function setAllowGoogleCommunication($allowGoogleCommunication)
-  {
-    $this->allowGoogleCommunication = $allowGoogleCommunication;
-  }
-  public function getAllowGoogleCommunication()
-  {
-    return $this->allowGoogleCommunication;
-  }
-  public function setAllowWebPosting($allowWebPosting)
-  {
-    $this->allowWebPosting = $allowWebPosting;
-  }
-  public function getAllowWebPosting()
-  {
-    return $this->allowWebPosting;
-  }
-  public function setArchiveOnly($archiveOnly)
-  {
-    $this->archiveOnly = $archiveOnly;
-  }
-  public function getArchiveOnly()
-  {
-    return $this->archiveOnly;
-  }
-  public function setCustomFooterText($customFooterText)
-  {
-    $this->customFooterText = $customFooterText;
-  }
-  public function getCustomFooterText()
-  {
-    return $this->customFooterText;
-  }
-  public function setCustomReplyTo($customReplyTo)
-  {
-    $this->customReplyTo = $customReplyTo;
-  }
-  public function getCustomReplyTo()
-  {
-    return $this->customReplyTo;
-  }
-  public function setDefaultMessageDenyNotificationText($defaultMessageDenyNotificationText)
-  {
-    $this->defaultMessageDenyNotificationText = $defaultMessageDenyNotificationText;
-  }
-  public function getDefaultMessageDenyNotificationText()
-  {
-    return $this->defaultMessageDenyNotificationText;
-  }
-  public function setDescription($description)
-  {
-    $this->description = $description;
-  }
-  public function getDescription()
-  {
-    return $this->description;
-  }
-  public function setEmail($email)
-  {
-    $this->email = $email;
-  }
-  public function getEmail()
-  {
-    return $this->email;
-  }
-  public function setIncludeCustomFooter($includeCustomFooter)
-  {
-    $this->includeCustomFooter = $includeCustomFooter;
-  }
-  public function getIncludeCustomFooter()
-  {
-    return $this->includeCustomFooter;
-  }
-  public function setIncludeInGlobalAddressList($includeInGlobalAddressList)
-  {
-    $this->includeInGlobalAddressList = $includeInGlobalAddressList;
-  }
-  public function getIncludeInGlobalAddressList()
-  {
-    return $this->includeInGlobalAddressList;
-  }
-  public function setIsArchived($isArchived)
-  {
-    $this->isArchived = $isArchived;
-  }
-  public function getIsArchived()
-  {
-    return $this->isArchived;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setMaxMessageBytes($maxMessageBytes)
-  {
-    $this->maxMessageBytes = $maxMessageBytes;
-  }
-  public function getMaxMessageBytes()
-  {
-    return $this->maxMessageBytes;
-  }
-  public function setMembersCanPostAsTheGroup($membersCanPostAsTheGroup)
-  {
-    $this->membersCanPostAsTheGroup = $membersCanPostAsTheGroup;
-  }
-  public function getMembersCanPostAsTheGroup()
-  {
-    return $this->membersCanPostAsTheGroup;
-  }
-  public function setMessageDisplayFont($messageDisplayFont)
-  {
-    $this->messageDisplayFont = $messageDisplayFont;
-  }
-  public function getMessageDisplayFont()
-  {
-    return $this->messageDisplayFont;
-  }
-  public function setMessageModerationLevel($messageModerationLevel)
-  {
-    $this->messageModerationLevel = $messageModerationLevel;
-  }
-  public function getMessageModerationLevel()
-  {
-    return $this->messageModerationLevel;
-  }
-  public function setName($name)
-  {
-    $this->name = $name;
-  }
-  public function getName()
-  {
-    return $this->name;
-  }
-  public function setPrimaryLanguage($primaryLanguage)
-  {
-    $this->primaryLanguage = $primaryLanguage;
-  }
-  public function getPrimaryLanguage()
-  {
-    return $this->primaryLanguage;
-  }
-  public function setReplyTo($replyTo)
-  {
-    $this->replyTo = $replyTo;
-  }
-  public function getReplyTo()
-  {
-    return $this->replyTo;
-  }
-  public function setSendMessageDenyNotification($sendMessageDenyNotification)
-  {
-    $this->sendMessageDenyNotification = $sendMessageDenyNotification;
-  }
-  public function getSendMessageDenyNotification()
-  {
-    return $this->sendMessageDenyNotification;
-  }
-  public function setShowInGroupDirectory($showInGroupDirectory)
-  {
-    $this->showInGroupDirectory = $showInGroupDirectory;
-  }
-  public function getShowInGroupDirectory()
-  {
-    return $this->showInGroupDirectory;
-  }
-  public function setSpamModerationLevel($spamModerationLevel)
-  {
-    $this->spamModerationLevel = $spamModerationLevel;
-  }
-  public function getSpamModerationLevel()
-  {
-    return $this->spamModerationLevel;
-  }
-  public function setWhoCanAdd($whoCanAdd)
-  {
-    $this->whoCanAdd = $whoCanAdd;
-  }
-  public function getWhoCanAdd()
-  {
-    return $this->whoCanAdd;
-  }
-  public function setWhoCanContactOwner($whoCanContactOwner)
-  {
-    $this->whoCanContactOwner = $whoCanContactOwner;
-  }
-  public function getWhoCanContactOwner()
-  {
-    return $this->whoCanContactOwner;
-  }
-  public function setWhoCanInvite($whoCanInvite)
-  {
-    $this->whoCanInvite = $whoCanInvite;
-  }
-  public function getWhoCanInvite()
-  {
-    return $this->whoCanInvite;
-  }
-  public function setWhoCanJoin($whoCanJoin)
-  {
-    $this->whoCanJoin = $whoCanJoin;
-  }
-  public function getWhoCanJoin()
-  {
-    return $this->whoCanJoin;
-  }
-  public function setWhoCanLeaveGroup($whoCanLeaveGroup)
-  {
-    $this->whoCanLeaveGroup = $whoCanLeaveGroup;
-  }
-  public function getWhoCanLeaveGroup()
-  {
-    return $this->whoCanLeaveGroup;
-  }
-  public function setWhoCanPostMessage($whoCanPostMessage)
-  {
-    $this->whoCanPostMessage = $whoCanPostMessage;
-  }
-  public function getWhoCanPostMessage()
-  {
-    return $this->whoCanPostMessage;
-  }
-  public function setWhoCanViewGroup($whoCanViewGroup)
-  {
-    $this->whoCanViewGroup = $whoCanViewGroup;
-  }
-  public function getWhoCanViewGroup()
-  {
-    return $this->whoCanViewGroup;
-  }
-  public function setWhoCanViewMembership($whoCanViewMembership)
-  {
-    $this->whoCanViewMembership = $whoCanViewMembership;
-  }
-  public function getWhoCanViewMembership()
-  {
-    return $this->whoCanViewMembership;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Groupssettings/Resource/Groups.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Groupssettings/Resource/Groups.php
deleted file mode 100644
index b706e219..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Groupssettings/Resource/Groups.php
+++ /dev/null
@@ -1,70 +0,0 @@
-
- *   $groupssettingsService = new Google_Service_Groupssettings(...);
- *   $groups = $groupssettingsService->groups;
- *  
- */
-class Google_Service_Groupssettings_Resource_Groups extends Google_Service_Resource
-{
-  /**
-   * Gets one resource by id. (groups.get)
-   *
-   * @param string $groupUniqueId The resource ID
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Groupssettings_Groups
-   */
-  public function get($groupUniqueId, $optParams = array())
-  {
-    $params = array('groupUniqueId' => $groupUniqueId);
-    $params = array_merge($params, $optParams);
-    return $this->call('get', array($params), "Google_Service_Groupssettings_Groups");
-  }
-  /**
-   * Updates an existing resource. This method supports patch semantics.
-   * (groups.patch)
-   *
-   * @param string $groupUniqueId The resource ID
-   * @param Google_Service_Groupssettings_Groups $postBody
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Groupssettings_Groups
-   */
-  public function patch($groupUniqueId, Google_Service_Groupssettings_Groups $postBody, $optParams = array())
-  {
-    $params = array('groupUniqueId' => $groupUniqueId, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('patch', array($params), "Google_Service_Groupssettings_Groups");
-  }
-  /**
-   * Updates an existing resource. (groups.update)
-   *
-   * @param string $groupUniqueId The resource ID
-   * @param Google_Service_Groupssettings_Groups $postBody
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Groupssettings_Groups
-   */
-  public function update($groupUniqueId, Google_Service_Groupssettings_Groups $postBody, $optParams = array())
-  {
-    $params = array('groupUniqueId' => $groupUniqueId, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('update', array($params), "Google_Service_Groupssettings_Groups");
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Iam.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Iam.php
deleted file mode 100644
index 9852bf2d..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Iam.php
+++ /dev/null
@@ -1,248 +0,0 @@
-
- * Manages identity and access control for Google Cloud Platform resources,
- * including the creation of service accounts, which you can use to authenticate
- * to Google and make API calls.

- *
- * 

- * For more information about this service, see the API
- * Documentation
- * 

- *
- * @author Google, Inc.
- */
-class Google_Service_Iam extends Google_Service
-{
-  /** View and manage your data across Google Cloud Platform services. */
-  const CLOUD_PLATFORM =
-      "https://www.googleapis.com/auth/cloud-platform";
-
-  public $projects_serviceAccounts;
-  public $projects_serviceAccounts_keys;
-  public $roles;
-  
-  /**
-   * Constructs the internal representation of the Iam service.
-   *
-   * @param Google_Client $client
-   */
-  public function __construct(Google_Client $client)
-  {
-    parent::__construct($client);
-    $this->rootUrl = 'https://iam.googleapis.com/';
-    $this->servicePath = '';
-    $this->version = 'v1';
-    $this->serviceName = 'iam';
-
-    $this->projects_serviceAccounts = new Google_Service_Iam_Resource_ProjectsServiceAccounts(
-        $this,
-        $this->serviceName,
-        'serviceAccounts',
-        array(
-          'methods' => array(
-            'create' => array(
-              'path' => 'v1/{+name}/serviceAccounts',
-              'httpMethod' => 'POST',
-              'parameters' => array(
-                'name' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'delete' => array(
-              'path' => 'v1/{+name}',
-              'httpMethod' => 'DELETE',
-              'parameters' => array(
-                'name' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'get' => array(
-              'path' => 'v1/{+name}',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'name' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'getIamPolicy' => array(
-              'path' => 'v1/{+resource}:getIamPolicy',
-              'httpMethod' => 'POST',
-              'parameters' => array(
-                'resource' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'list' => array(
-              'path' => 'v1/{+name}/serviceAccounts',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'name' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'pageToken' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'pageSize' => array(
-                  'location' => 'query',
-                  'type' => 'integer',
-                ),
-              ),
-            ),'setIamPolicy' => array(
-              'path' => 'v1/{+resource}:setIamPolicy',
-              'httpMethod' => 'POST',
-              'parameters' => array(
-                'resource' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'signBlob' => array(
-              'path' => 'v1/{+name}:signBlob',
-              'httpMethod' => 'POST',
-              'parameters' => array(
-                'name' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'signJwt' => array(
-              'path' => 'v1/{+name}:signJwt',
-              'httpMethod' => 'POST',
-              'parameters' => array(
-                'name' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'testIamPermissions' => array(
-              'path' => 'v1/{+resource}:testIamPermissions',
-              'httpMethod' => 'POST',
-              'parameters' => array(
-                'resource' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'update' => array(
-              'path' => 'v1/{+name}',
-              'httpMethod' => 'PUT',
-              'parameters' => array(
-                'name' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),
-          )
-        )
-    );
-    $this->projects_serviceAccounts_keys = new Google_Service_Iam_Resource_ProjectsServiceAccountsKeys(
-        $this,
-        $this->serviceName,
-        'keys',
-        array(
-          'methods' => array(
-            'create' => array(
-              'path' => 'v1/{+name}/keys',
-              'httpMethod' => 'POST',
-              'parameters' => array(
-                'name' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'delete' => array(
-              'path' => 'v1/{+name}',
-              'httpMethod' => 'DELETE',
-              'parameters' => array(
-                'name' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'get' => array(
-              'path' => 'v1/{+name}',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'name' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'publicKeyType' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-              ),
-            ),'list' => array(
-              'path' => 'v1/{+name}/keys',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'name' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'keyTypes' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                  'repeated' => true,
-                ),
-              ),
-            ),
-          )
-        )
-    );
-    $this->roles = new Google_Service_Iam_Resource_Roles(
-        $this,
-        $this->serviceName,
-        'roles',
-        array(
-          'methods' => array(
-            'queryGrantableRoles' => array(
-              'path' => 'v1/roles:queryGrantableRoles',
-              'httpMethod' => 'POST',
-              'parameters' => array(),
-            ),
-          )
-        )
-    );
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Iam/AuditData.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Iam/AuditData.php
deleted file mode 100644
index d64da48a..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Iam/AuditData.php
+++ /dev/null
@@ -1,31 +0,0 @@
-policyDelta = $policyDelta;
-  }
-  public function getPolicyDelta()
-  {
-    return $this->policyDelta;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Iam/Binding.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Iam/Binding.php
deleted file mode 100644
index 70c5c869..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Iam/Binding.php
+++ /dev/null
@@ -1,40 +0,0 @@
-members = $members;
-  }
-  public function getMembers()
-  {
-    return $this->members;
-  }
-  public function setRole($role)
-  {
-    $this->role = $role;
-  }
-  public function getRole()
-  {
-    return $this->role;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Iam/BindingDelta.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Iam/BindingDelta.php
deleted file mode 100644
index 55a93c74..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Iam/BindingDelta.php
+++ /dev/null
@@ -1,48 +0,0 @@
-action = $action;
-  }
-  public function getAction()
-  {
-    return $this->action;
-  }
-  public function setMember($member)
-  {
-    $this->member = $member;
-  }
-  public function getMember()
-  {
-    return $this->member;
-  }
-  public function setRole($role)
-  {
-    $this->role = $role;
-  }
-  public function getRole()
-  {
-    return $this->role;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Iam/CloudAuditOptions.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Iam/CloudAuditOptions.php
deleted file mode 100644
index 1e6436cc..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Iam/CloudAuditOptions.php
+++ /dev/null
@@ -1,20 +0,0 @@
-iam = $iam;
-  }
-  public function getIam()
-  {
-    return $this->iam;
-  }
-  public function setOp($op)
-  {
-    $this->op = $op;
-  }
-  public function getOp()
-  {
-    return $this->op;
-  }
-  public function setSvc($svc)
-  {
-    $this->svc = $svc;
-  }
-  public function getSvc()
-  {
-    return $this->svc;
-  }
-  public function setSys($sys)
-  {
-    $this->sys = $sys;
-  }
-  public function getSys()
-  {
-    return $this->sys;
-  }
-  public function setValue($value)
-  {
-    $this->value = $value;
-  }
-  public function getValue()
-  {
-    return $this->value;
-  }
-  public function setValues($values)
-  {
-    $this->values = $values;
-  }
-  public function getValues()
-  {
-    return $this->values;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Iam/CounterOptions.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Iam/CounterOptions.php
deleted file mode 100644
index 933b5cf4..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Iam/CounterOptions.php
+++ /dev/null
@@ -1,39 +0,0 @@
-field = $field;
-  }
-  public function getField()
-  {
-    return $this->field;
-  }
-  public function setMetric($metric)
-  {
-    $this->metric = $metric;
-  }
-  public function getMetric()
-  {
-    return $this->metric;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Iam/CreateServiceAccountKeyRequest.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Iam/CreateServiceAccountKeyRequest.php
deleted file mode 100644
index d85c9b32..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Iam/CreateServiceAccountKeyRequest.php
+++ /dev/null
@@ -1,39 +0,0 @@
-keyAlgorithm = $keyAlgorithm;
-  }
-  public function getKeyAlgorithm()
-  {
-    return $this->keyAlgorithm;
-  }
-  public function setPrivateKeyType($privateKeyType)
-  {
-    $this->privateKeyType = $privateKeyType;
-  }
-  public function getPrivateKeyType()
-  {
-    return $this->privateKeyType;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Iam/CreateServiceAccountRequest.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Iam/CreateServiceAccountRequest.php
deleted file mode 100644
index 1d0ad16a..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Iam/CreateServiceAccountRequest.php
+++ /dev/null
@@ -1,40 +0,0 @@
-accountId = $accountId;
-  }
-  public function getAccountId()
-  {
-    return $this->accountId;
-  }
-  public function setServiceAccount(Google_Service_Iam_ServiceAccount $serviceAccount)
-  {
-    $this->serviceAccount = $serviceAccount;
-  }
-  public function getServiceAccount()
-  {
-    return $this->serviceAccount;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Iam/DataAccessOptions.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Iam/DataAccessOptions.php
deleted file mode 100644
index 0e843bca..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Iam/DataAccessOptions.php
+++ /dev/null
@@ -1,20 +0,0 @@
-keys = $keys;
-  }
-  public function getKeys()
-  {
-    return $this->keys;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Iam/ListServiceAccountsResponse.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Iam/ListServiceAccountsResponse.php
deleted file mode 100644
index 93445ebb..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Iam/ListServiceAccountsResponse.php
+++ /dev/null
@@ -1,41 +0,0 @@
-accounts = $accounts;
-  }
-  public function getAccounts()
-  {
-    return $this->accounts;
-  }
-  public function setNextPageToken($nextPageToken)
-  {
-    $this->nextPageToken = $nextPageToken;
-  }
-  public function getNextPageToken()
-  {
-    return $this->nextPageToken;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Iam/LogConfig.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Iam/LogConfig.php
deleted file mode 100644
index b8d479ed..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Iam/LogConfig.php
+++ /dev/null
@@ -1,51 +0,0 @@
-cloudAudit = $cloudAudit;
-  }
-  public function getCloudAudit()
-  {
-    return $this->cloudAudit;
-  }
-  public function setCounter(Google_Service_Iam_CounterOptions $counter)
-  {
-    $this->counter = $counter;
-  }
-  public function getCounter()
-  {
-    return $this->counter;
-  }
-  public function setDataAccess(Google_Service_Iam_DataAccessOptions $dataAccess)
-  {
-    $this->dataAccess = $dataAccess;
-  }
-  public function getDataAccess()
-  {
-    return $this->dataAccess;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Iam/Policy.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Iam/Policy.php
deleted file mode 100644
index 7b8f0b5e..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Iam/Policy.php
+++ /dev/null
@@ -1,50 +0,0 @@
-bindings = $bindings;
-  }
-  public function getBindings()
-  {
-    return $this->bindings;
-  }
-  public function setEtag($etag)
-  {
-    $this->etag = $etag;
-  }
-  public function getEtag()
-  {
-    return $this->etag;
-  }
-  public function setVersion($version)
-  {
-    $this->version = $version;
-  }
-  public function getVersion()
-  {
-    return $this->version;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Iam/PolicyDelta.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Iam/PolicyDelta.php
deleted file mode 100644
index cf1ab25f..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Iam/PolicyDelta.php
+++ /dev/null
@@ -1,32 +0,0 @@
-bindingDeltas = $bindingDeltas;
-  }
-  public function getBindingDeltas()
-  {
-    return $this->bindingDeltas;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Iam/QueryGrantableRolesRequest.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Iam/QueryGrantableRolesRequest.php
deleted file mode 100644
index dd63cfcf..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Iam/QueryGrantableRolesRequest.php
+++ /dev/null
@@ -1,30 +0,0 @@
-fullResourceName = $fullResourceName;
-  }
-  public function getFullResourceName()
-  {
-    return $this->fullResourceName;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Iam/QueryGrantableRolesResponse.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Iam/QueryGrantableRolesResponse.php
deleted file mode 100644
index 759f85f8..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Iam/QueryGrantableRolesResponse.php
+++ /dev/null
@@ -1,32 +0,0 @@
-roles = $roles;
-  }
-  public function getRoles()
-  {
-    return $this->roles;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Iam/Resource/Projects.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Iam/Resource/Projects.php
deleted file mode 100644
index 5b51eb8a..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Iam/Resource/Projects.php
+++ /dev/null
@@ -1,28 +0,0 @@
-
- *   $iamService = new Google_Service_Iam(...);
- *   $projects = $iamService->projects;
- *  
- */
-class Google_Service_Iam_Resource_Projects extends Google_Service_Resource
-{
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Iam/Resource/ProjectsServiceAccounts.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Iam/Resource/ProjectsServiceAccounts.php
deleted file mode 100644
index 481454d0..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Iam/Resource/ProjectsServiceAccounts.php
+++ /dev/null
@@ -1,215 +0,0 @@
-
- *   $iamService = new Google_Service_Iam(...);
- *   $serviceAccounts = $iamService->serviceAccounts;
- *  
- */
-class Google_Service_Iam_Resource_ProjectsServiceAccounts extends Google_Service_Resource
-{
-  /**
-   * Creates a ServiceAccount and returns it. (serviceAccounts.create)
-   *
-   * @param string $name Required. The resource name of the project associated
-   * with the service accounts, such as `projects/my-project-123`.
-   * @param Google_Service_Iam_CreateServiceAccountRequest $postBody
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Iam_ServiceAccount
-   */
-  public function create($name, Google_Service_Iam_CreateServiceAccountRequest $postBody, $optParams = array())
-  {
-    $params = array('name' => $name, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('create', array($params), "Google_Service_Iam_ServiceAccount");
-  }
-  /**
-   * Deletes a ServiceAccount. (serviceAccounts.delete)
-   *
-   * @param string $name The resource name of the service account in the following
-   * format: `projects/{PROJECT_ID}/serviceAccounts/{SERVICE_ACCOUNT_EMAIL}`.
-   * Using `-` as a wildcard for the project will infer the project from the
-   * account. The `account` value can be the `email` address or the `unique_id` of
-   * the service account.
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Iam_IamEmpty
-   */
-  public function delete($name, $optParams = array())
-  {
-    $params = array('name' => $name);
-    $params = array_merge($params, $optParams);
-    return $this->call('delete', array($params), "Google_Service_Iam_IamEmpty");
-  }
-  /**
-   * Gets a ServiceAccount. (serviceAccounts.get)
-   *
-   * @param string $name The resource name of the service account in the following
-   * format: `projects/{PROJECT_ID}/serviceAccounts/{SERVICE_ACCOUNT_EMAIL}`.
-   * Using `-` as a wildcard for the project will infer the project from the
-   * account. The `account` value can be the `email` address or the `unique_id` of
-   * the service account.
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Iam_ServiceAccount
-   */
-  public function get($name, $optParams = array())
-  {
-    $params = array('name' => $name);
-    $params = array_merge($params, $optParams);
-    return $this->call('get', array($params), "Google_Service_Iam_ServiceAccount");
-  }
-  /**
-   * Returns the IAM access control policy for a ServiceAccount.
-   * (serviceAccounts.getIamPolicy)
-   *
-   * @param string $resource REQUIRED: The resource for which the policy is being
-   * requested. `resource` is usually specified as a path. For example, a Project
-   * resource is specified as `projects/{project}`.
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Iam_Policy
-   */
-  public function getIamPolicy($resource, $optParams = array())
-  {
-    $params = array('resource' => $resource);
-    $params = array_merge($params, $optParams);
-    return $this->call('getIamPolicy', array($params), "Google_Service_Iam_Policy");
-  }
-  /**
-   * Lists ServiceAccounts for a project.
-   * (serviceAccounts.listProjectsServiceAccounts)
-   *
-   * @param string $name Required. The resource name of the project associated
-   * with the service accounts, such as `projects/my-project-123`.
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param string pageToken Optional pagination token returned in an earlier
-   * ListServiceAccountsResponse.next_page_token.
-   * @opt_param int pageSize Optional limit on the number of service accounts to
-   * include in the response. Further accounts can subsequently be obtained by
-   * including the ListServiceAccountsResponse.next_page_token in a subsequent
-   * request.
-   * @return Google_Service_Iam_ListServiceAccountsResponse
-   */
-  public function listProjectsServiceAccounts($name, $optParams = array())
-  {
-    $params = array('name' => $name);
-    $params = array_merge($params, $optParams);
-    return $this->call('list', array($params), "Google_Service_Iam_ListServiceAccountsResponse");
-  }
-  /**
-   * Sets the IAM access control policy for a ServiceAccount.
-   * (serviceAccounts.setIamPolicy)
-   *
-   * @param string $resource REQUIRED: The resource for which the policy is being
-   * specified. `resource` is usually specified as a path. For example, a Project
-   * resource is specified as `projects/{project}`.
-   * @param Google_Service_Iam_SetIamPolicyRequest $postBody
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Iam_Policy
-   */
-  public function setIamPolicy($resource, Google_Service_Iam_SetIamPolicyRequest $postBody, $optParams = array())
-  {
-    $params = array('resource' => $resource, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('setIamPolicy', array($params), "Google_Service_Iam_Policy");
-  }
-  /**
-   * Signs a blob using a service account's system-managed private key.
-   * (serviceAccounts.signBlob)
-   *
-   * @param string $name The resource name of the service account in the following
-   * format: `projects/{PROJECT_ID}/serviceAccounts/{SERVICE_ACCOUNT_EMAIL}`.
-   * Using `-` as a wildcard for the project will infer the project from the
-   * account. The `account` value can be the `email` address or the `unique_id` of
-   * the service account.
-   * @param Google_Service_Iam_SignBlobRequest $postBody
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Iam_SignBlobResponse
-   */
-  public function signBlob($name, Google_Service_Iam_SignBlobRequest $postBody, $optParams = array())
-  {
-    $params = array('name' => $name, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('signBlob', array($params), "Google_Service_Iam_SignBlobResponse");
-  }
-  /**
-   * Signs a JWT using a service account's system-managed private key.
-   *
-   * If no expiry time (`exp`) is provided in the `SignJwtRequest`, IAM sets an an
-   * expiry time of one hour by default. If you request an expiry time of more
-   * than one hour, the request will fail. (serviceAccounts.signJwt)
-   *
-   * @param string $name The resource name of the service account in the following
-   * format: `projects/{PROJECT_ID}/serviceAccounts/{SERVICE_ACCOUNT_EMAIL}`.
-   * Using `-` as a wildcard for the project will infer the project from the
-   * account. The `account` value can be the `email` address or the `unique_id` of
-   * the service account.
-   * @param Google_Service_Iam_SignJwtRequest $postBody
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Iam_SignJwtResponse
-   */
-  public function signJwt($name, Google_Service_Iam_SignJwtRequest $postBody, $optParams = array())
-  {
-    $params = array('name' => $name, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('signJwt', array($params), "Google_Service_Iam_SignJwtResponse");
-  }
-  /**
-   * Tests the specified permissions against the IAM access control policy for a
-   * ServiceAccount. (serviceAccounts.testIamPermissions)
-   *
-   * @param string $resource REQUIRED: The resource for which the policy detail is
-   * being requested. `resource` is usually specified as a path. For example, a
-   * Project resource is specified as `projects/{project}`.
-   * @param Google_Service_Iam_TestIamPermissionsRequest $postBody
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Iam_TestIamPermissionsResponse
-   */
-  public function testIamPermissions($resource, Google_Service_Iam_TestIamPermissionsRequest $postBody, $optParams = array())
-  {
-    $params = array('resource' => $resource, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('testIamPermissions', array($params), "Google_Service_Iam_TestIamPermissionsResponse");
-  }
-  /**
-   * Updates a ServiceAccount.
-   *
-   * Currently, only the following fields are updatable: `display_name` . The
-   * `etag` is mandatory. (serviceAccounts.update)
-   *
-   * @param string $name The resource name of the service account in the following
-   * format: `projects/{PROJECT_ID}/serviceAccounts/{SERVICE_ACCOUNT_EMAIL}`.
-   *
-   * Requests using `-` as a wildcard for the project will infer the project from
-   * the `account` and the `account` value can be the `email` address or the
-   * `unique_id` of the service account.
-   *
-   * In responses the resource name will always be in the format
-   * `projects/{PROJECT_ID}/serviceAccounts/{SERVICE_ACCOUNT_EMAIL}`.
-   * @param Google_Service_Iam_ServiceAccount $postBody
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Iam_ServiceAccount
-   */
-  public function update($name, Google_Service_Iam_ServiceAccount $postBody, $optParams = array())
-  {
-    $params = array('name' => $name, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('update', array($params), "Google_Service_Iam_ServiceAccount");
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Iam/Resource/ProjectsServiceAccountsKeys.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Iam/Resource/ProjectsServiceAccountsKeys.php
deleted file mode 100644
index 3dcb5bcf..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Iam/Resource/ProjectsServiceAccountsKeys.php
+++ /dev/null
@@ -1,108 +0,0 @@
-
- *   $iamService = new Google_Service_Iam(...);
- *   $keys = $iamService->keys;
- *  
- */
-class Google_Service_Iam_Resource_ProjectsServiceAccountsKeys extends Google_Service_Resource
-{
-  /**
-   * Creates a ServiceAccountKey and returns it. (keys.create)
-   *
-   * @param string $name The resource name of the service account in the following
-   * format: `projects/{PROJECT_ID}/serviceAccounts/{SERVICE_ACCOUNT_EMAIL}`.
-   * Using `-` as a wildcard for the project will infer the project from the
-   * account. The `account` value can be the `email` address or the `unique_id` of
-   * the service account.
-   * @param Google_Service_Iam_CreateServiceAccountKeyRequest $postBody
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Iam_ServiceAccountKey
-   */
-  public function create($name, Google_Service_Iam_CreateServiceAccountKeyRequest $postBody, $optParams = array())
-  {
-    $params = array('name' => $name, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('create', array($params), "Google_Service_Iam_ServiceAccountKey");
-  }
-  /**
-   * Deletes a ServiceAccountKey. (keys.delete)
-   *
-   * @param string $name The resource name of the service account key in the
-   * following format:
-   * `projects/{PROJECT_ID}/serviceAccounts/{SERVICE_ACCOUNT_EMAIL}/keys/{key}`.
-   * Using `-` as a wildcard for the project will infer the project from the
-   * account. The `account` value can be the `email` address or the `unique_id` of
-   * the service account.
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Iam_IamEmpty
-   */
-  public function delete($name, $optParams = array())
-  {
-    $params = array('name' => $name);
-    $params = array_merge($params, $optParams);
-    return $this->call('delete', array($params), "Google_Service_Iam_IamEmpty");
-  }
-  /**
-   * Gets the ServiceAccountKey by key id. (keys.get)
-   *
-   * @param string $name The resource name of the service account key in the
-   * following format:
-   * `projects/{PROJECT_ID}/serviceAccounts/{SERVICE_ACCOUNT_EMAIL}/keys/{key}`.
-   *
-   * Using `-` as a wildcard for the project will infer the project from the
-   * account. The `account` value can be the `email` address or the `unique_id` of
-   * the service account.
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param string publicKeyType The output format of the public key
-   * requested. X509_PEM is the default output format.
-   * @return Google_Service_Iam_ServiceAccountKey
-   */
-  public function get($name, $optParams = array())
-  {
-    $params = array('name' => $name);
-    $params = array_merge($params, $optParams);
-    return $this->call('get', array($params), "Google_Service_Iam_ServiceAccountKey");
-  }
-  /**
-   * Lists ServiceAccountKeys. (keys.listProjectsServiceAccountsKeys)
-   *
-   * @param string $name The resource name of the service account in the following
-   * format: `projects/{PROJECT_ID}/serviceAccounts/{SERVICE_ACCOUNT_EMAIL}`.
-   *
-   * Using `-` as a wildcard for the project, will infer the project from the
-   * account. The `account` value can be the `email` address or the `unique_id` of
-   * the service account.
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param string keyTypes Filters the types of keys the user wants to
-   * include in the list response. Duplicate key types are not allowed. If no key
-   * type is provided, all keys are returned.
-   * @return Google_Service_Iam_ListServiceAccountKeysResponse
-   */
-  public function listProjectsServiceAccountsKeys($name, $optParams = array())
-  {
-    $params = array('name' => $name);
-    $params = array_merge($params, $optParams);
-    return $this->call('list', array($params), "Google_Service_Iam_ListServiceAccountKeysResponse");
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Iam/Resource/Roles.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Iam/Resource/Roles.php
deleted file mode 100644
index 51ab8e9c..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Iam/Resource/Roles.php
+++ /dev/null
@@ -1,43 +0,0 @@
-
- *   $iamService = new Google_Service_Iam(...);
- *   $roles = $iamService->roles;
- *  
- */
-class Google_Service_Iam_Resource_Roles extends Google_Service_Resource
-{
-  /**
-   * Queries roles that can be granted on a particular resource. A role is
-   * grantable if it can be used as the role in a binding for a policy for that
-   * resource. (roles.queryGrantableRoles)
-   *
-   * @param Google_Service_Iam_QueryGrantableRolesRequest $postBody
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Iam_QueryGrantableRolesResponse
-   */
-  public function queryGrantableRoles(Google_Service_Iam_QueryGrantableRolesRequest $postBody, $optParams = array())
-  {
-    $params = array('postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('queryGrantableRoles', array($params), "Google_Service_Iam_QueryGrantableRolesResponse");
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Iam/Role.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Iam/Role.php
deleted file mode 100644
index 07e3bcd1..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Iam/Role.php
+++ /dev/null
@@ -1,48 +0,0 @@
-description = $description;
-  }
-  public function getDescription()
-  {
-    return $this->description;
-  }
-  public function setName($name)
-  {
-    $this->name = $name;
-  }
-  public function getName()
-  {
-    return $this->name;
-  }
-  public function setTitle($title)
-  {
-    $this->title = $title;
-  }
-  public function getTitle()
-  {
-    return $this->title;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Iam/Rule.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Iam/Rule.php
deleted file mode 100644
index 46705c88..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Iam/Rule.php
+++ /dev/null
@@ -1,87 +0,0 @@
-action = $action;
-  }
-  public function getAction()
-  {
-    return $this->action;
-  }
-  public function setConditions($conditions)
-  {
-    $this->conditions = $conditions;
-  }
-  public function getConditions()
-  {
-    return $this->conditions;
-  }
-  public function setDescription($description)
-  {
-    $this->description = $description;
-  }
-  public function getDescription()
-  {
-    return $this->description;
-  }
-  public function setIn($in)
-  {
-    $this->in = $in;
-  }
-  public function getIn()
-  {
-    return $this->in;
-  }
-  public function setLogConfig($logConfig)
-  {
-    $this->logConfig = $logConfig;
-  }
-  public function getLogConfig()
-  {
-    return $this->logConfig;
-  }
-  public function setNotIn($notIn)
-  {
-    $this->notIn = $notIn;
-  }
-  public function getNotIn()
-  {
-    return $this->notIn;
-  }
-  public function setPermissions($permissions)
-  {
-    $this->permissions = $permissions;
-  }
-  public function getPermissions()
-  {
-    return $this->permissions;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Iam/ServiceAccount.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Iam/ServiceAccount.php
deleted file mode 100644
index 946dd856..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Iam/ServiceAccount.php
+++ /dev/null
@@ -1,84 +0,0 @@
-displayName = $displayName;
-  }
-  public function getDisplayName()
-  {
-    return $this->displayName;
-  }
-  public function setEmail($email)
-  {
-    $this->email = $email;
-  }
-  public function getEmail()
-  {
-    return $this->email;
-  }
-  public function setEtag($etag)
-  {
-    $this->etag = $etag;
-  }
-  public function getEtag()
-  {
-    return $this->etag;
-  }
-  public function setName($name)
-  {
-    $this->name = $name;
-  }
-  public function getName()
-  {
-    return $this->name;
-  }
-  public function setOauth2ClientId($oauth2ClientId)
-  {
-    $this->oauth2ClientId = $oauth2ClientId;
-  }
-  public function getOauth2ClientId()
-  {
-    return $this->oauth2ClientId;
-  }
-  public function setProjectId($projectId)
-  {
-    $this->projectId = $projectId;
-  }
-  public function getProjectId()
-  {
-    return $this->projectId;
-  }
-  public function setUniqueId($uniqueId)
-  {
-    $this->uniqueId = $uniqueId;
-  }
-  public function getUniqueId()
-  {
-    return $this->uniqueId;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Iam/ServiceAccountKey.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Iam/ServiceAccountKey.php
deleted file mode 100644
index a65024e7..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Iam/ServiceAccountKey.php
+++ /dev/null
@@ -1,84 +0,0 @@
-keyAlgorithm = $keyAlgorithm;
-  }
-  public function getKeyAlgorithm()
-  {
-    return $this->keyAlgorithm;
-  }
-  public function setName($name)
-  {
-    $this->name = $name;
-  }
-  public function getName()
-  {
-    return $this->name;
-  }
-  public function setPrivateKeyData($privateKeyData)
-  {
-    $this->privateKeyData = $privateKeyData;
-  }
-  public function getPrivateKeyData()
-  {
-    return $this->privateKeyData;
-  }
-  public function setPrivateKeyType($privateKeyType)
-  {
-    $this->privateKeyType = $privateKeyType;
-  }
-  public function getPrivateKeyType()
-  {
-    return $this->privateKeyType;
-  }
-  public function setPublicKeyData($publicKeyData)
-  {
-    $this->publicKeyData = $publicKeyData;
-  }
-  public function getPublicKeyData()
-  {
-    return $this->publicKeyData;
-  }
-  public function setValidAfterTime($validAfterTime)
-  {
-    $this->validAfterTime = $validAfterTime;
-  }
-  public function getValidAfterTime()
-  {
-    return $this->validAfterTime;
-  }
-  public function setValidBeforeTime($validBeforeTime)
-  {
-    $this->validBeforeTime = $validBeforeTime;
-  }
-  public function getValidBeforeTime()
-  {
-    return $this->validBeforeTime;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Iam/SetIamPolicyRequest.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Iam/SetIamPolicyRequest.php
deleted file mode 100644
index 179610b1..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Iam/SetIamPolicyRequest.php
+++ /dev/null
@@ -1,31 +0,0 @@
-policy = $policy;
-  }
-  public function getPolicy()
-  {
-    return $this->policy;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Iam/SignBlobRequest.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Iam/SignBlobRequest.php
deleted file mode 100644
index aa1b76c9..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Iam/SignBlobRequest.php
+++ /dev/null
@@ -1,30 +0,0 @@
-bytesToSign = $bytesToSign;
-  }
-  public function getBytesToSign()
-  {
-    return $this->bytesToSign;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Iam/SignBlobResponse.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Iam/SignBlobResponse.php
deleted file mode 100644
index 0ae14b09..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Iam/SignBlobResponse.php
+++ /dev/null
@@ -1,39 +0,0 @@
-keyId = $keyId;
-  }
-  public function getKeyId()
-  {
-    return $this->keyId;
-  }
-  public function setSignature($signature)
-  {
-    $this->signature = $signature;
-  }
-  public function getSignature()
-  {
-    return $this->signature;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Iam/SignJwtRequest.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Iam/SignJwtRequest.php
deleted file mode 100644
index 933e4d7c..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Iam/SignJwtRequest.php
+++ /dev/null
@@ -1,30 +0,0 @@
-payload = $payload;
-  }
-  public function getPayload()
-  {
-    return $this->payload;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Iam/SignJwtResponse.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Iam/SignJwtResponse.php
deleted file mode 100644
index 81452db4..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Iam/SignJwtResponse.php
+++ /dev/null
@@ -1,39 +0,0 @@
-keyId = $keyId;
-  }
-  public function getKeyId()
-  {
-    return $this->keyId;
-  }
-  public function setSignedJwt($signedJwt)
-  {
-    $this->signedJwt = $signedJwt;
-  }
-  public function getSignedJwt()
-  {
-    return $this->signedJwt;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Iam/TestIamPermissionsRequest.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Iam/TestIamPermissionsRequest.php
deleted file mode 100644
index 51680d13..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Iam/TestIamPermissionsRequest.php
+++ /dev/null
@@ -1,31 +0,0 @@
-permissions = $permissions;
-  }
-  public function getPermissions()
-  {
-    return $this->permissions;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Iam/TestIamPermissionsResponse.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Iam/TestIamPermissionsResponse.php
deleted file mode 100644
index fd56c51e..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Iam/TestIamPermissionsResponse.php
+++ /dev/null
@@ -1,31 +0,0 @@
-permissions = $permissions;
-  }
-  public function getPermissions()
-  {
-    return $this->permissions;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/IdentityToolkit.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/IdentityToolkit.php
deleted file mode 100644
index a1fb0a62..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/IdentityToolkit.php
+++ /dev/null
@@ -1,143 +0,0 @@
-
- * Help the third party sites to implement federated login.

- *
- * 

- * For more information about this service, see the API
- * Documentation
- * 

- *
- * @author Google, Inc.
- */
-class Google_Service_IdentityToolkit extends Google_Service
-{
-  /** View and manage your data across Google Cloud Platform services. */
-  const CLOUD_PLATFORM =
-      "https://www.googleapis.com/auth/cloud-platform";
-  /** View and administer all your Firebase data and settings. */
-  const FIREBASE =
-      "https://www.googleapis.com/auth/firebase";
-
-  public $relyingparty;
-  
-  /**
-   * Constructs the internal representation of the IdentityToolkit service.
-   *
-   * @param Google_Client $client
-   */
-  public function __construct(Google_Client $client)
-  {
-    parent::__construct($client);
-    $this->rootUrl = 'https://www.googleapis.com/';
-    $this->servicePath = 'identitytoolkit/v3/relyingparty/';
-    $this->version = 'v3';
-    $this->serviceName = 'identitytoolkit';
-
-    $this->relyingparty = new Google_Service_IdentityToolkit_Resource_Relyingparty(
-        $this,
-        $this->serviceName,
-        'relyingparty',
-        array(
-          'methods' => array(
-            'createAuthUri' => array(
-              'path' => 'createAuthUri',
-              'httpMethod' => 'POST',
-              'parameters' => array(),
-            ),'deleteAccount' => array(
-              'path' => 'deleteAccount',
-              'httpMethod' => 'POST',
-              'parameters' => array(),
-            ),'downloadAccount' => array(
-              'path' => 'downloadAccount',
-              'httpMethod' => 'POST',
-              'parameters' => array(),
-            ),'getAccountInfo' => array(
-              'path' => 'getAccountInfo',
-              'httpMethod' => 'POST',
-              'parameters' => array(),
-            ),'getOobConfirmationCode' => array(
-              'path' => 'getOobConfirmationCode',
-              'httpMethod' => 'POST',
-              'parameters' => array(),
-            ),'getProjectConfig' => array(
-              'path' => 'getProjectConfig',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'delegatedProjectNumber' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'projectNumber' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-              ),
-            ),'getPublicKeys' => array(
-              'path' => 'publicKeys',
-              'httpMethod' => 'GET',
-              'parameters' => array(),
-            ),'getRecaptchaParam' => array(
-              'path' => 'getRecaptchaParam',
-              'httpMethod' => 'GET',
-              'parameters' => array(),
-            ),'resetPassword' => array(
-              'path' => 'resetPassword',
-              'httpMethod' => 'POST',
-              'parameters' => array(),
-            ),'setAccountInfo' => array(
-              'path' => 'setAccountInfo',
-              'httpMethod' => 'POST',
-              'parameters' => array(),
-            ),'setProjectConfig' => array(
-              'path' => 'setProjectConfig',
-              'httpMethod' => 'POST',
-              'parameters' => array(),
-            ),'signOutUser' => array(
-              'path' => 'signOutUser',
-              'httpMethod' => 'POST',
-              'parameters' => array(),
-            ),'signupNewUser' => array(
-              'path' => 'signupNewUser',
-              'httpMethod' => 'POST',
-              'parameters' => array(),
-            ),'uploadAccount' => array(
-              'path' => 'uploadAccount',
-              'httpMethod' => 'POST',
-              'parameters' => array(),
-            ),'verifyAssertion' => array(
-              'path' => 'verifyAssertion',
-              'httpMethod' => 'POST',
-              'parameters' => array(),
-            ),'verifyCustomToken' => array(
-              'path' => 'verifyCustomToken',
-              'httpMethod' => 'POST',
-              'parameters' => array(),
-            ),'verifyPassword' => array(
-              'path' => 'verifyPassword',
-              'httpMethod' => 'POST',
-              'parameters' => array(),
-            ),
-          )
-        )
-    );
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/IdentityToolkit/CreateAuthUriResponse.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/IdentityToolkit/CreateAuthUriResponse.php
deleted file mode 100644
index 8cc940bc..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/IdentityToolkit/CreateAuthUriResponse.php
+++ /dev/null
@@ -1,94 +0,0 @@
-allProviders = $allProviders;
-  }
-  public function getAllProviders()
-  {
-    return $this->allProviders;
-  }
-  public function setAuthUri($authUri)
-  {
-    $this->authUri = $authUri;
-  }
-  public function getAuthUri()
-  {
-    return $this->authUri;
-  }
-  public function setCaptchaRequired($captchaRequired)
-  {
-    $this->captchaRequired = $captchaRequired;
-  }
-  public function getCaptchaRequired()
-  {
-    return $this->captchaRequired;
-  }
-  public function setForExistingProvider($forExistingProvider)
-  {
-    $this->forExistingProvider = $forExistingProvider;
-  }
-  public function getForExistingProvider()
-  {
-    return $this->forExistingProvider;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setProviderId($providerId)
-  {
-    $this->providerId = $providerId;
-  }
-  public function getProviderId()
-  {
-    return $this->providerId;
-  }
-  public function setRegistered($registered)
-  {
-    $this->registered = $registered;
-  }
-  public function getRegistered()
-  {
-    return $this->registered;
-  }
-  public function setSessionId($sessionId)
-  {
-    $this->sessionId = $sessionId;
-  }
-  public function getSessionId()
-  {
-    return $this->sessionId;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/IdentityToolkit/DeleteAccountResponse.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/IdentityToolkit/DeleteAccountResponse.php
deleted file mode 100644
index 62997d6f..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/IdentityToolkit/DeleteAccountResponse.php
+++ /dev/null
@@ -1,30 +0,0 @@
-kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/IdentityToolkit/DownloadAccountResponse.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/IdentityToolkit/DownloadAccountResponse.php
deleted file mode 100644
index 4ea793f6..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/IdentityToolkit/DownloadAccountResponse.php
+++ /dev/null
@@ -1,50 +0,0 @@
-kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setNextPageToken($nextPageToken)
-  {
-    $this->nextPageToken = $nextPageToken;
-  }
-  public function getNextPageToken()
-  {
-    return $this->nextPageToken;
-  }
-  public function setUsers($users)
-  {
-    $this->users = $users;
-  }
-  public function getUsers()
-  {
-    return $this->users;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/IdentityToolkit/EmailTemplate.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/IdentityToolkit/EmailTemplate.php
deleted file mode 100644
index bc5f9b73..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/IdentityToolkit/EmailTemplate.php
+++ /dev/null
@@ -1,75 +0,0 @@
-body = $body;
-  }
-  public function getBody()
-  {
-    return $this->body;
-  }
-  public function setFormat($format)
-  {
-    $this->format = $format;
-  }
-  public function getFormat()
-  {
-    return $this->format;
-  }
-  public function setFrom($from)
-  {
-    $this->from = $from;
-  }
-  public function getFrom()
-  {
-    return $this->from;
-  }
-  public function setFromDisplayName($fromDisplayName)
-  {
-    $this->fromDisplayName = $fromDisplayName;
-  }
-  public function getFromDisplayName()
-  {
-    return $this->fromDisplayName;
-  }
-  public function setReplyTo($replyTo)
-  {
-    $this->replyTo = $replyTo;
-  }
-  public function getReplyTo()
-  {
-    return $this->replyTo;
-  }
-  public function setSubject($subject)
-  {
-    $this->subject = $subject;
-  }
-  public function getSubject()
-  {
-    return $this->subject;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/IdentityToolkit/GetAccountInfoResponse.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/IdentityToolkit/GetAccountInfoResponse.php
deleted file mode 100644
index a9e647c2..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/IdentityToolkit/GetAccountInfoResponse.php
+++ /dev/null
@@ -1,41 +0,0 @@
-kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setUsers($users)
-  {
-    $this->users = $users;
-  }
-  public function getUsers()
-  {
-    return $this->users;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/IdentityToolkit/GetOobConfirmationCodeResponse.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/IdentityToolkit/GetOobConfirmationCodeResponse.php
deleted file mode 100644
index 1f5fc0f0..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/IdentityToolkit/GetOobConfirmationCodeResponse.php
+++ /dev/null
@@ -1,48 +0,0 @@
-email = $email;
-  }
-  public function getEmail()
-  {
-    return $this->email;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setOobCode($oobCode)
-  {
-    $this->oobCode = $oobCode;
-  }
-  public function getOobCode()
-  {
-    return $this->oobCode;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/IdentityToolkit/GetRecaptchaParamResponse.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/IdentityToolkit/GetRecaptchaParamResponse.php
deleted file mode 100644
index ae598afa..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/IdentityToolkit/GetRecaptchaParamResponse.php
+++ /dev/null
@@ -1,48 +0,0 @@
-kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setRecaptchaSiteKey($recaptchaSiteKey)
-  {
-    $this->recaptchaSiteKey = $recaptchaSiteKey;
-  }
-  public function getRecaptchaSiteKey()
-  {
-    return $this->recaptchaSiteKey;
-  }
-  public function setRecaptchaStoken($recaptchaStoken)
-  {
-    $this->recaptchaStoken = $recaptchaStoken;
-  }
-  public function getRecaptchaStoken()
-  {
-    return $this->recaptchaStoken;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/IdentityToolkit/IdentitytoolkitRelyingpartyCreateAuthUriRequest.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/IdentityToolkit/IdentitytoolkitRelyingpartyCreateAuthUriRequest.php
deleted file mode 100644
index 801d638f..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/IdentityToolkit/IdentitytoolkitRelyingpartyCreateAuthUriRequest.php
+++ /dev/null
@@ -1,147 +0,0 @@
-appId = $appId;
-  }
-  public function getAppId()
-  {
-    return $this->appId;
-  }
-  public function setAuthFlowType($authFlowType)
-  {
-    $this->authFlowType = $authFlowType;
-  }
-  public function getAuthFlowType()
-  {
-    return $this->authFlowType;
-  }
-  public function setClientId($clientId)
-  {
-    $this->clientId = $clientId;
-  }
-  public function getClientId()
-  {
-    return $this->clientId;
-  }
-  public function setContext($context)
-  {
-    $this->context = $context;
-  }
-  public function getContext()
-  {
-    return $this->context;
-  }
-  public function setContinueUri($continueUri)
-  {
-    $this->continueUri = $continueUri;
-  }
-  public function getContinueUri()
-  {
-    return $this->continueUri;
-  }
-  public function setCustomParameter($customParameter)
-  {
-    $this->customParameter = $customParameter;
-  }
-  public function getCustomParameter()
-  {
-    return $this->customParameter;
-  }
-  public function setHostedDomain($hostedDomain)
-  {
-    $this->hostedDomain = $hostedDomain;
-  }
-  public function getHostedDomain()
-  {
-    return $this->hostedDomain;
-  }
-  public function setIdentifier($identifier)
-  {
-    $this->identifier = $identifier;
-  }
-  public function getIdentifier()
-  {
-    return $this->identifier;
-  }
-  public function setOauthConsumerKey($oauthConsumerKey)
-  {
-    $this->oauthConsumerKey = $oauthConsumerKey;
-  }
-  public function getOauthConsumerKey()
-  {
-    return $this->oauthConsumerKey;
-  }
-  public function setOauthScope($oauthScope)
-  {
-    $this->oauthScope = $oauthScope;
-  }
-  public function getOauthScope()
-  {
-    return $this->oauthScope;
-  }
-  public function setOpenidRealm($openidRealm)
-  {
-    $this->openidRealm = $openidRealm;
-  }
-  public function getOpenidRealm()
-  {
-    return $this->openidRealm;
-  }
-  public function setOtaApp($otaApp)
-  {
-    $this->otaApp = $otaApp;
-  }
-  public function getOtaApp()
-  {
-    return $this->otaApp;
-  }
-  public function setProviderId($providerId)
-  {
-    $this->providerId = $providerId;
-  }
-  public function getProviderId()
-  {
-    return $this->providerId;
-  }
-  public function setSessionId($sessionId)
-  {
-    $this->sessionId = $sessionId;
-  }
-  public function getSessionId()
-  {
-    return $this->sessionId;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/IdentityToolkit/IdentitytoolkitRelyingpartyCreateAuthUriRequestCustomParameter.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/IdentityToolkit/IdentitytoolkitRelyingpartyCreateAuthUriRequestCustomParameter.php
deleted file mode 100644
index daf6a900..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/IdentityToolkit/IdentitytoolkitRelyingpartyCreateAuthUriRequestCustomParameter.php
+++ /dev/null
@@ -1,39 +0,0 @@
-key = $key;
-  }
-  public function getKey()
-  {
-    return $this->key;
-  }
-  public function setValue($value)
-  {
-    $this->value = $value;
-  }
-  public function getValue()
-  {
-    return $this->value;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/IdentityToolkit/IdentitytoolkitRelyingpartyDeleteAccountRequest.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/IdentityToolkit/IdentitytoolkitRelyingpartyDeleteAccountRequest.php
deleted file mode 100644
index 8a5cbc9a..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/IdentityToolkit/IdentitytoolkitRelyingpartyDeleteAccountRequest.php
+++ /dev/null
@@ -1,48 +0,0 @@
-delegatedProjectNumber = $delegatedProjectNumber;
-  }
-  public function getDelegatedProjectNumber()
-  {
-    return $this->delegatedProjectNumber;
-  }
-  public function setIdToken($idToken)
-  {
-    $this->idToken = $idToken;
-  }
-  public function getIdToken()
-  {
-    return $this->idToken;
-  }
-  public function setLocalId($localId)
-  {
-    $this->localId = $localId;
-  }
-  public function getLocalId()
-  {
-    return $this->localId;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/IdentityToolkit/IdentitytoolkitRelyingpartyDownloadAccountRequest.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/IdentityToolkit/IdentitytoolkitRelyingpartyDownloadAccountRequest.php
deleted file mode 100644
index 8f889d53..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/IdentityToolkit/IdentitytoolkitRelyingpartyDownloadAccountRequest.php
+++ /dev/null
@@ -1,57 +0,0 @@
-delegatedProjectNumber = $delegatedProjectNumber;
-  }
-  public function getDelegatedProjectNumber()
-  {
-    return $this->delegatedProjectNumber;
-  }
-  public function setMaxResults($maxResults)
-  {
-    $this->maxResults = $maxResults;
-  }
-  public function getMaxResults()
-  {
-    return $this->maxResults;
-  }
-  public function setNextPageToken($nextPageToken)
-  {
-    $this->nextPageToken = $nextPageToken;
-  }
-  public function getNextPageToken()
-  {
-    return $this->nextPageToken;
-  }
-  public function setTargetProjectId($targetProjectId)
-  {
-    $this->targetProjectId = $targetProjectId;
-  }
-  public function getTargetProjectId()
-  {
-    return $this->targetProjectId;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/IdentityToolkit/IdentitytoolkitRelyingpartyGetAccountInfoRequest.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/IdentityToolkit/IdentitytoolkitRelyingpartyGetAccountInfoRequest.php
deleted file mode 100644
index 30af08da..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/IdentityToolkit/IdentitytoolkitRelyingpartyGetAccountInfoRequest.php
+++ /dev/null
@@ -1,58 +0,0 @@
-delegatedProjectNumber = $delegatedProjectNumber;
-  }
-  public function getDelegatedProjectNumber()
-  {
-    return $this->delegatedProjectNumber;
-  }
-  public function setEmail($email)
-  {
-    $this->email = $email;
-  }
-  public function getEmail()
-  {
-    return $this->email;
-  }
-  public function setIdToken($idToken)
-  {
-    $this->idToken = $idToken;
-  }
-  public function getIdToken()
-  {
-    return $this->idToken;
-  }
-  public function setLocalId($localId)
-  {
-    $this->localId = $localId;
-  }
-  public function getLocalId()
-  {
-    return $this->localId;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/IdentityToolkit/IdentitytoolkitRelyingpartyGetProjectConfigResponse.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/IdentityToolkit/IdentitytoolkitRelyingpartyGetProjectConfigResponse.php
deleted file mode 100644
index be15bc3c..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/IdentityToolkit/IdentitytoolkitRelyingpartyGetProjectConfigResponse.php
+++ /dev/null
@@ -1,135 +0,0 @@
-allowPasswordUser = $allowPasswordUser;
-  }
-  public function getAllowPasswordUser()
-  {
-    return $this->allowPasswordUser;
-  }
-  public function setApiKey($apiKey)
-  {
-    $this->apiKey = $apiKey;
-  }
-  public function getApiKey()
-  {
-    return $this->apiKey;
-  }
-  public function setAuthorizedDomains($authorizedDomains)
-  {
-    $this->authorizedDomains = $authorizedDomains;
-  }
-  public function getAuthorizedDomains()
-  {
-    return $this->authorizedDomains;
-  }
-  public function setChangeEmailTemplate(Google_Service_IdentityToolkit_EmailTemplate $changeEmailTemplate)
-  {
-    $this->changeEmailTemplate = $changeEmailTemplate;
-  }
-  public function getChangeEmailTemplate()
-  {
-    return $this->changeEmailTemplate;
-  }
-  public function setDynamicLinksDomain($dynamicLinksDomain)
-  {
-    $this->dynamicLinksDomain = $dynamicLinksDomain;
-  }
-  public function getDynamicLinksDomain()
-  {
-    return $this->dynamicLinksDomain;
-  }
-  public function setEnableAnonymousUser($enableAnonymousUser)
-  {
-    $this->enableAnonymousUser = $enableAnonymousUser;
-  }
-  public function getEnableAnonymousUser()
-  {
-    return $this->enableAnonymousUser;
-  }
-  public function setIdpConfig($idpConfig)
-  {
-    $this->idpConfig = $idpConfig;
-  }
-  public function getIdpConfig()
-  {
-    return $this->idpConfig;
-  }
-  public function setLegacyResetPasswordTemplate(Google_Service_IdentityToolkit_EmailTemplate $legacyResetPasswordTemplate)
-  {
-    $this->legacyResetPasswordTemplate = $legacyResetPasswordTemplate;
-  }
-  public function getLegacyResetPasswordTemplate()
-  {
-    return $this->legacyResetPasswordTemplate;
-  }
-  public function setProjectId($projectId)
-  {
-    $this->projectId = $projectId;
-  }
-  public function getProjectId()
-  {
-    return $this->projectId;
-  }
-  public function setResetPasswordTemplate(Google_Service_IdentityToolkit_EmailTemplate $resetPasswordTemplate)
-  {
-    $this->resetPasswordTemplate = $resetPasswordTemplate;
-  }
-  public function getResetPasswordTemplate()
-  {
-    return $this->resetPasswordTemplate;
-  }
-  public function setUseEmailSending($useEmailSending)
-  {
-    $this->useEmailSending = $useEmailSending;
-  }
-  public function getUseEmailSending()
-  {
-    return $this->useEmailSending;
-  }
-  public function setVerifyEmailTemplate(Google_Service_IdentityToolkit_EmailTemplate $verifyEmailTemplate)
-  {
-    $this->verifyEmailTemplate = $verifyEmailTemplate;
-  }
-  public function getVerifyEmailTemplate()
-  {
-    return $this->verifyEmailTemplate;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/IdentityToolkit/IdentitytoolkitRelyingpartyResetPasswordRequest.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/IdentityToolkit/IdentitytoolkitRelyingpartyResetPasswordRequest.php
deleted file mode 100644
index e2a85f25..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/IdentityToolkit/IdentitytoolkitRelyingpartyResetPasswordRequest.php
+++ /dev/null
@@ -1,57 +0,0 @@
-email = $email;
-  }
-  public function getEmail()
-  {
-    return $this->email;
-  }
-  public function setNewPassword($newPassword)
-  {
-    $this->newPassword = $newPassword;
-  }
-  public function getNewPassword()
-  {
-    return $this->newPassword;
-  }
-  public function setOldPassword($oldPassword)
-  {
-    $this->oldPassword = $oldPassword;
-  }
-  public function getOldPassword()
-  {
-    return $this->oldPassword;
-  }
-  public function setOobCode($oobCode)
-  {
-    $this->oobCode = $oobCode;
-  }
-  public function getOobCode()
-  {
-    return $this->oobCode;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/IdentityToolkit/IdentitytoolkitRelyingpartySetAccountInfoRequest.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/IdentityToolkit/IdentitytoolkitRelyingpartySetAccountInfoRequest.php
deleted file mode 100644
index 45b0dcc7..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/IdentityToolkit/IdentitytoolkitRelyingpartySetAccountInfoRequest.php
+++ /dev/null
@@ -1,211 +0,0 @@
-captchaChallenge = $captchaChallenge;
-  }
-  public function getCaptchaChallenge()
-  {
-    return $this->captchaChallenge;
-  }
-  public function setCaptchaResponse($captchaResponse)
-  {
-    $this->captchaResponse = $captchaResponse;
-  }
-  public function getCaptchaResponse()
-  {
-    return $this->captchaResponse;
-  }
-  public function setCreatedAt($createdAt)
-  {
-    $this->createdAt = $createdAt;
-  }
-  public function getCreatedAt()
-  {
-    return $this->createdAt;
-  }
-  public function setDelegatedProjectNumber($delegatedProjectNumber)
-  {
-    $this->delegatedProjectNumber = $delegatedProjectNumber;
-  }
-  public function getDelegatedProjectNumber()
-  {
-    return $this->delegatedProjectNumber;
-  }
-  public function setDeleteAttribute($deleteAttribute)
-  {
-    $this->deleteAttribute = $deleteAttribute;
-  }
-  public function getDeleteAttribute()
-  {
-    return $this->deleteAttribute;
-  }
-  public function setDeleteProvider($deleteProvider)
-  {
-    $this->deleteProvider = $deleteProvider;
-  }
-  public function getDeleteProvider()
-  {
-    return $this->deleteProvider;
-  }
-  public function setDisableUser($disableUser)
-  {
-    $this->disableUser = $disableUser;
-  }
-  public function getDisableUser()
-  {
-    return $this->disableUser;
-  }
-  public function setDisplayName($displayName)
-  {
-    $this->displayName = $displayName;
-  }
-  public function getDisplayName()
-  {
-    return $this->displayName;
-  }
-  public function setEmail($email)
-  {
-    $this->email = $email;
-  }
-  public function getEmail()
-  {
-    return $this->email;
-  }
-  public function setEmailVerified($emailVerified)
-  {
-    $this->emailVerified = $emailVerified;
-  }
-  public function getEmailVerified()
-  {
-    return $this->emailVerified;
-  }
-  public function setIdToken($idToken)
-  {
-    $this->idToken = $idToken;
-  }
-  public function getIdToken()
-  {
-    return $this->idToken;
-  }
-  public function setInstanceId($instanceId)
-  {
-    $this->instanceId = $instanceId;
-  }
-  public function getInstanceId()
-  {
-    return $this->instanceId;
-  }
-  public function setLastLoginAt($lastLoginAt)
-  {
-    $this->lastLoginAt = $lastLoginAt;
-  }
-  public function getLastLoginAt()
-  {
-    return $this->lastLoginAt;
-  }
-  public function setLocalId($localId)
-  {
-    $this->localId = $localId;
-  }
-  public function getLocalId()
-  {
-    return $this->localId;
-  }
-  public function setOobCode($oobCode)
-  {
-    $this->oobCode = $oobCode;
-  }
-  public function getOobCode()
-  {
-    return $this->oobCode;
-  }
-  public function setPassword($password)
-  {
-    $this->password = $password;
-  }
-  public function getPassword()
-  {
-    return $this->password;
-  }
-  public function setPhotoUrl($photoUrl)
-  {
-    $this->photoUrl = $photoUrl;
-  }
-  public function getPhotoUrl()
-  {
-    return $this->photoUrl;
-  }
-  public function setProvider($provider)
-  {
-    $this->provider = $provider;
-  }
-  public function getProvider()
-  {
-    return $this->provider;
-  }
-  public function setReturnSecureToken($returnSecureToken)
-  {
-    $this->returnSecureToken = $returnSecureToken;
-  }
-  public function getReturnSecureToken()
-  {
-    return $this->returnSecureToken;
-  }
-  public function setUpgradeToFederatedLogin($upgradeToFederatedLogin)
-  {
-    $this->upgradeToFederatedLogin = $upgradeToFederatedLogin;
-  }
-  public function getUpgradeToFederatedLogin()
-  {
-    return $this->upgradeToFederatedLogin;
-  }
-  public function setValidSince($validSince)
-  {
-    $this->validSince = $validSince;
-  }
-  public function getValidSince()
-  {
-    return $this->validSince;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/IdentityToolkit/IdentitytoolkitRelyingpartySetProjectConfigRequest.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/IdentityToolkit/IdentitytoolkitRelyingpartySetProjectConfigRequest.php
deleted file mode 100644
index 9c004162..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/IdentityToolkit/IdentitytoolkitRelyingpartySetProjectConfigRequest.php
+++ /dev/null
@@ -1,126 +0,0 @@
-allowPasswordUser = $allowPasswordUser;
-  }
-  public function getAllowPasswordUser()
-  {
-    return $this->allowPasswordUser;
-  }
-  public function setApiKey($apiKey)
-  {
-    $this->apiKey = $apiKey;
-  }
-  public function getApiKey()
-  {
-    return $this->apiKey;
-  }
-  public function setAuthorizedDomains($authorizedDomains)
-  {
-    $this->authorizedDomains = $authorizedDomains;
-  }
-  public function getAuthorizedDomains()
-  {
-    return $this->authorizedDomains;
-  }
-  public function setChangeEmailTemplate(Google_Service_IdentityToolkit_EmailTemplate $changeEmailTemplate)
-  {
-    $this->changeEmailTemplate = $changeEmailTemplate;
-  }
-  public function getChangeEmailTemplate()
-  {
-    return $this->changeEmailTemplate;
-  }
-  public function setDelegatedProjectNumber($delegatedProjectNumber)
-  {
-    $this->delegatedProjectNumber = $delegatedProjectNumber;
-  }
-  public function getDelegatedProjectNumber()
-  {
-    return $this->delegatedProjectNumber;
-  }
-  public function setEnableAnonymousUser($enableAnonymousUser)
-  {
-    $this->enableAnonymousUser = $enableAnonymousUser;
-  }
-  public function getEnableAnonymousUser()
-  {
-    return $this->enableAnonymousUser;
-  }
-  public function setIdpConfig($idpConfig)
-  {
-    $this->idpConfig = $idpConfig;
-  }
-  public function getIdpConfig()
-  {
-    return $this->idpConfig;
-  }
-  public function setLegacyResetPasswordTemplate(Google_Service_IdentityToolkit_EmailTemplate $legacyResetPasswordTemplate)
-  {
-    $this->legacyResetPasswordTemplate = $legacyResetPasswordTemplate;
-  }
-  public function getLegacyResetPasswordTemplate()
-  {
-    return $this->legacyResetPasswordTemplate;
-  }
-  public function setResetPasswordTemplate(Google_Service_IdentityToolkit_EmailTemplate $resetPasswordTemplate)
-  {
-    $this->resetPasswordTemplate = $resetPasswordTemplate;
-  }
-  public function getResetPasswordTemplate()
-  {
-    return $this->resetPasswordTemplate;
-  }
-  public function setUseEmailSending($useEmailSending)
-  {
-    $this->useEmailSending = $useEmailSending;
-  }
-  public function getUseEmailSending()
-  {
-    return $this->useEmailSending;
-  }
-  public function setVerifyEmailTemplate(Google_Service_IdentityToolkit_EmailTemplate $verifyEmailTemplate)
-  {
-    $this->verifyEmailTemplate = $verifyEmailTemplate;
-  }
-  public function getVerifyEmailTemplate()
-  {
-    return $this->verifyEmailTemplate;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/IdentityToolkit/IdentitytoolkitRelyingpartySetProjectConfigResponse.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/IdentityToolkit/IdentitytoolkitRelyingpartySetProjectConfigResponse.php
deleted file mode 100644
index 484a135f..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/IdentityToolkit/IdentitytoolkitRelyingpartySetProjectConfigResponse.php
+++ /dev/null
@@ -1,30 +0,0 @@
-projectId = $projectId;
-  }
-  public function getProjectId()
-  {
-    return $this->projectId;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/IdentityToolkit/IdentitytoolkitRelyingpartySignOutUserRequest.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/IdentityToolkit/IdentitytoolkitRelyingpartySignOutUserRequest.php
deleted file mode 100644
index 815aab58..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/IdentityToolkit/IdentitytoolkitRelyingpartySignOutUserRequest.php
+++ /dev/null
@@ -1,39 +0,0 @@
-instanceId = $instanceId;
-  }
-  public function getInstanceId()
-  {
-    return $this->instanceId;
-  }
-  public function setLocalId($localId)
-  {
-    $this->localId = $localId;
-  }
-  public function getLocalId()
-  {
-    return $this->localId;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/IdentityToolkit/IdentitytoolkitRelyingpartySignOutUserResponse.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/IdentityToolkit/IdentitytoolkitRelyingpartySignOutUserResponse.php
deleted file mode 100644
index 28d32120..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/IdentityToolkit/IdentitytoolkitRelyingpartySignOutUserResponse.php
+++ /dev/null
@@ -1,30 +0,0 @@
-localId = $localId;
-  }
-  public function getLocalId()
-  {
-    return $this->localId;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/IdentityToolkit/IdentitytoolkitRelyingpartySignupNewUserRequest.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/IdentityToolkit/IdentitytoolkitRelyingpartySignupNewUserRequest.php
deleted file mode 100644
index 45534b57..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/IdentityToolkit/IdentitytoolkitRelyingpartySignupNewUserRequest.php
+++ /dev/null
@@ -1,120 +0,0 @@
-captchaChallenge = $captchaChallenge;
-  }
-  public function getCaptchaChallenge()
-  {
-    return $this->captchaChallenge;
-  }
-  public function setCaptchaResponse($captchaResponse)
-  {
-    $this->captchaResponse = $captchaResponse;
-  }
-  public function getCaptchaResponse()
-  {
-    return $this->captchaResponse;
-  }
-  public function setDisabled($disabled)
-  {
-    $this->disabled = $disabled;
-  }
-  public function getDisabled()
-  {
-    return $this->disabled;
-  }
-  public function setDisplayName($displayName)
-  {
-    $this->displayName = $displayName;
-  }
-  public function getDisplayName()
-  {
-    return $this->displayName;
-  }
-  public function setEmail($email)
-  {
-    $this->email = $email;
-  }
-  public function getEmail()
-  {
-    return $this->email;
-  }
-  public function setEmailVerified($emailVerified)
-  {
-    $this->emailVerified = $emailVerified;
-  }
-  public function getEmailVerified()
-  {
-    return $this->emailVerified;
-  }
-  public function setIdToken($idToken)
-  {
-    $this->idToken = $idToken;
-  }
-  public function getIdToken()
-  {
-    return $this->idToken;
-  }
-  public function setInstanceId($instanceId)
-  {
-    $this->instanceId = $instanceId;
-  }
-  public function getInstanceId()
-  {
-    return $this->instanceId;
-  }
-  public function setLocalId($localId)
-  {
-    $this->localId = $localId;
-  }
-  public function getLocalId()
-  {
-    return $this->localId;
-  }
-  public function setPassword($password)
-  {
-    $this->password = $password;
-  }
-  public function getPassword()
-  {
-    return $this->password;
-  }
-  public function setPhotoUrl($photoUrl)
-  {
-    $this->photoUrl = $photoUrl;
-  }
-  public function getPhotoUrl()
-  {
-    return $this->photoUrl;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/IdentityToolkit/IdentitytoolkitRelyingpartyUploadAccountRequest.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/IdentityToolkit/IdentitytoolkitRelyingpartyUploadAccountRequest.php
deleted file mode 100644
index de963cda..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/IdentityToolkit/IdentitytoolkitRelyingpartyUploadAccountRequest.php
+++ /dev/null
@@ -1,113 +0,0 @@
-allowOverwrite = $allowOverwrite;
-  }
-  public function getAllowOverwrite()
-  {
-    return $this->allowOverwrite;
-  }
-  public function setDelegatedProjectNumber($delegatedProjectNumber)
-  {
-    $this->delegatedProjectNumber = $delegatedProjectNumber;
-  }
-  public function getDelegatedProjectNumber()
-  {
-    return $this->delegatedProjectNumber;
-  }
-  public function setHashAlgorithm($hashAlgorithm)
-  {
-    $this->hashAlgorithm = $hashAlgorithm;
-  }
-  public function getHashAlgorithm()
-  {
-    return $this->hashAlgorithm;
-  }
-  public function setMemoryCost($memoryCost)
-  {
-    $this->memoryCost = $memoryCost;
-  }
-  public function getMemoryCost()
-  {
-    return $this->memoryCost;
-  }
-  public function setRounds($rounds)
-  {
-    $this->rounds = $rounds;
-  }
-  public function getRounds()
-  {
-    return $this->rounds;
-  }
-  public function setSaltSeparator($saltSeparator)
-  {
-    $this->saltSeparator = $saltSeparator;
-  }
-  public function getSaltSeparator()
-  {
-    return $this->saltSeparator;
-  }
-  public function setSanityCheck($sanityCheck)
-  {
-    $this->sanityCheck = $sanityCheck;
-  }
-  public function getSanityCheck()
-  {
-    return $this->sanityCheck;
-  }
-  public function setSignerKey($signerKey)
-  {
-    $this->signerKey = $signerKey;
-  }
-  public function getSignerKey()
-  {
-    return $this->signerKey;
-  }
-  public function setTargetProjectId($targetProjectId)
-  {
-    $this->targetProjectId = $targetProjectId;
-  }
-  public function getTargetProjectId()
-  {
-    return $this->targetProjectId;
-  }
-  public function setUsers($users)
-  {
-    $this->users = $users;
-  }
-  public function getUsers()
-  {
-    return $this->users;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/IdentityToolkit/IdentitytoolkitRelyingpartyVerifyAssertionRequest.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/IdentityToolkit/IdentitytoolkitRelyingpartyVerifyAssertionRequest.php
deleted file mode 100644
index d0841034..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/IdentityToolkit/IdentitytoolkitRelyingpartyVerifyAssertionRequest.php
+++ /dev/null
@@ -1,111 +0,0 @@
-delegatedProjectNumber = $delegatedProjectNumber;
-  }
-  public function getDelegatedProjectNumber()
-  {
-    return $this->delegatedProjectNumber;
-  }
-  public function setIdToken($idToken)
-  {
-    $this->idToken = $idToken;
-  }
-  public function getIdToken()
-  {
-    return $this->idToken;
-  }
-  public function setInstanceId($instanceId)
-  {
-    $this->instanceId = $instanceId;
-  }
-  public function getInstanceId()
-  {
-    return $this->instanceId;
-  }
-  public function setPendingIdToken($pendingIdToken)
-  {
-    $this->pendingIdToken = $pendingIdToken;
-  }
-  public function getPendingIdToken()
-  {
-    return $this->pendingIdToken;
-  }
-  public function setPostBody($postBody)
-  {
-    $this->postBody = $postBody;
-  }
-  public function getPostBody()
-  {
-    return $this->postBody;
-  }
-  public function setRequestUri($requestUri)
-  {
-    $this->requestUri = $requestUri;
-  }
-  public function getRequestUri()
-  {
-    return $this->requestUri;
-  }
-  public function setReturnIdpCredential($returnIdpCredential)
-  {
-    $this->returnIdpCredential = $returnIdpCredential;
-  }
-  public function getReturnIdpCredential()
-  {
-    return $this->returnIdpCredential;
-  }
-  public function setReturnRefreshToken($returnRefreshToken)
-  {
-    $this->returnRefreshToken = $returnRefreshToken;
-  }
-  public function getReturnRefreshToken()
-  {
-    return $this->returnRefreshToken;
-  }
-  public function setReturnSecureToken($returnSecureToken)
-  {
-    $this->returnSecureToken = $returnSecureToken;
-  }
-  public function getReturnSecureToken()
-  {
-    return $this->returnSecureToken;
-  }
-  public function setSessionId($sessionId)
-  {
-    $this->sessionId = $sessionId;
-  }
-  public function getSessionId()
-  {
-    return $this->sessionId;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/IdentityToolkit/IdentitytoolkitRelyingpartyVerifyCustomTokenRequest.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/IdentityToolkit/IdentitytoolkitRelyingpartyVerifyCustomTokenRequest.php
deleted file mode 100644
index f2fe712e..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/IdentityToolkit/IdentitytoolkitRelyingpartyVerifyCustomTokenRequest.php
+++ /dev/null
@@ -1,57 +0,0 @@
-delegatedProjectNumber = $delegatedProjectNumber;
-  }
-  public function getDelegatedProjectNumber()
-  {
-    return $this->delegatedProjectNumber;
-  }
-  public function setInstanceId($instanceId)
-  {
-    $this->instanceId = $instanceId;
-  }
-  public function getInstanceId()
-  {
-    return $this->instanceId;
-  }
-  public function setReturnSecureToken($returnSecureToken)
-  {
-    $this->returnSecureToken = $returnSecureToken;
-  }
-  public function getReturnSecureToken()
-  {
-    return $this->returnSecureToken;
-  }
-  public function setToken($token)
-  {
-    $this->token = $token;
-  }
-  public function getToken()
-  {
-    return $this->token;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/IdentityToolkit/IdentitytoolkitRelyingpartyVerifyPasswordRequest.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/IdentityToolkit/IdentitytoolkitRelyingpartyVerifyPasswordRequest.php
deleted file mode 100644
index 7115a251..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/IdentityToolkit/IdentitytoolkitRelyingpartyVerifyPasswordRequest.php
+++ /dev/null
@@ -1,102 +0,0 @@
-captchaChallenge = $captchaChallenge;
-  }
-  public function getCaptchaChallenge()
-  {
-    return $this->captchaChallenge;
-  }
-  public function setCaptchaResponse($captchaResponse)
-  {
-    $this->captchaResponse = $captchaResponse;
-  }
-  public function getCaptchaResponse()
-  {
-    return $this->captchaResponse;
-  }
-  public function setDelegatedProjectNumber($delegatedProjectNumber)
-  {
-    $this->delegatedProjectNumber = $delegatedProjectNumber;
-  }
-  public function getDelegatedProjectNumber()
-  {
-    return $this->delegatedProjectNumber;
-  }
-  public function setEmail($email)
-  {
-    $this->email = $email;
-  }
-  public function getEmail()
-  {
-    return $this->email;
-  }
-  public function setIdToken($idToken)
-  {
-    $this->idToken = $idToken;
-  }
-  public function getIdToken()
-  {
-    return $this->idToken;
-  }
-  public function setInstanceId($instanceId)
-  {
-    $this->instanceId = $instanceId;
-  }
-  public function getInstanceId()
-  {
-    return $this->instanceId;
-  }
-  public function setPassword($password)
-  {
-    $this->password = $password;
-  }
-  public function getPassword()
-  {
-    return $this->password;
-  }
-  public function setPendingIdToken($pendingIdToken)
-  {
-    $this->pendingIdToken = $pendingIdToken;
-  }
-  public function getPendingIdToken()
-  {
-    return $this->pendingIdToken;
-  }
-  public function setReturnSecureToken($returnSecureToken)
-  {
-    $this->returnSecureToken = $returnSecureToken;
-  }
-  public function getReturnSecureToken()
-  {
-    return $this->returnSecureToken;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/IdentityToolkit/IdpConfig.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/IdentityToolkit/IdpConfig.php
deleted file mode 100644
index ba4655af..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/IdentityToolkit/IdpConfig.php
+++ /dev/null
@@ -1,76 +0,0 @@
-clientId = $clientId;
-  }
-  public function getClientId()
-  {
-    return $this->clientId;
-  }
-  public function setEnabled($enabled)
-  {
-    $this->enabled = $enabled;
-  }
-  public function getEnabled()
-  {
-    return $this->enabled;
-  }
-  public function setExperimentPercent($experimentPercent)
-  {
-    $this->experimentPercent = $experimentPercent;
-  }
-  public function getExperimentPercent()
-  {
-    return $this->experimentPercent;
-  }
-  public function setProvider($provider)
-  {
-    $this->provider = $provider;
-  }
-  public function getProvider()
-  {
-    return $this->provider;
-  }
-  public function setSecret($secret)
-  {
-    $this->secret = $secret;
-  }
-  public function getSecret()
-  {
-    return $this->secret;
-  }
-  public function setWhitelistedAudiences($whitelistedAudiences)
-  {
-    $this->whitelistedAudiences = $whitelistedAudiences;
-  }
-  public function getWhitelistedAudiences()
-  {
-    return $this->whitelistedAudiences;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/IdentityToolkit/Relyingparty.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/IdentityToolkit/Relyingparty.php
deleted file mode 100644
index 19e2ecbb..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/IdentityToolkit/Relyingparty.php
+++ /dev/null
@@ -1,93 +0,0 @@
-captchaResp = $captchaResp;
-  }
-  public function getCaptchaResp()
-  {
-    return $this->captchaResp;
-  }
-  public function setChallenge($challenge)
-  {
-    $this->challenge = $challenge;
-  }
-  public function getChallenge()
-  {
-    return $this->challenge;
-  }
-  public function setEmail($email)
-  {
-    $this->email = $email;
-  }
-  public function getEmail()
-  {
-    return $this->email;
-  }
-  public function setIdToken($idToken)
-  {
-    $this->idToken = $idToken;
-  }
-  public function getIdToken()
-  {
-    return $this->idToken;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setNewEmail($newEmail)
-  {
-    $this->newEmail = $newEmail;
-  }
-  public function getNewEmail()
-  {
-    return $this->newEmail;
-  }
-  public function setRequestType($requestType)
-  {
-    $this->requestType = $requestType;
-  }
-  public function getRequestType()
-  {
-    return $this->requestType;
-  }
-  public function setUserIp($userIp)
-  {
-    $this->userIp = $userIp;
-  }
-  public function getUserIp()
-  {
-    return $this->userIp;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/IdentityToolkit/ResetPasswordResponse.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/IdentityToolkit/ResetPasswordResponse.php
deleted file mode 100644
index d2e30f0f..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/IdentityToolkit/ResetPasswordResponse.php
+++ /dev/null
@@ -1,57 +0,0 @@
-email = $email;
-  }
-  public function getEmail()
-  {
-    return $this->email;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setNewEmail($newEmail)
-  {
-    $this->newEmail = $newEmail;
-  }
-  public function getNewEmail()
-  {
-    return $this->newEmail;
-  }
-  public function setRequestType($requestType)
-  {
-    $this->requestType = $requestType;
-  }
-  public function getRequestType()
-  {
-    return $this->requestType;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/IdentityToolkit/Resource/Relyingparty.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/IdentityToolkit/Resource/Relyingparty.php
deleted file mode 100644
index c6cd74db..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/IdentityToolkit/Resource/Relyingparty.php
+++ /dev/null
@@ -1,252 +0,0 @@
-
- *   $identitytoolkitService = new Google_Service_IdentityToolkit(...);
- *   $relyingparty = $identitytoolkitService->relyingparty;
- *  
- */
-class Google_Service_IdentityToolkit_Resource_Relyingparty extends Google_Service_Resource
-{
-  /**
-   * Creates the URI used by the IdP to authenticate the user.
-   * (relyingparty.createAuthUri)
-   *
-   * @param Google_Service_IdentityToolkit_IdentitytoolkitRelyingpartyCreateAuthUriRequest $postBody
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_IdentityToolkit_CreateAuthUriResponse
-   */
-  public function createAuthUri(Google_Service_IdentityToolkit_IdentitytoolkitRelyingpartyCreateAuthUriRequest $postBody, $optParams = array())
-  {
-    $params = array('postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('createAuthUri', array($params), "Google_Service_IdentityToolkit_CreateAuthUriResponse");
-  }
-  /**
-   * Delete user account. (relyingparty.deleteAccount)
-   *
-   * @param Google_Service_IdentityToolkit_IdentitytoolkitRelyingpartyDeleteAccountRequest $postBody
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_IdentityToolkit_DeleteAccountResponse
-   */
-  public function deleteAccount(Google_Service_IdentityToolkit_IdentitytoolkitRelyingpartyDeleteAccountRequest $postBody, $optParams = array())
-  {
-    $params = array('postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('deleteAccount', array($params), "Google_Service_IdentityToolkit_DeleteAccountResponse");
-  }
-  /**
-   * Batch download user accounts. (relyingparty.downloadAccount)
-   *
-   * @param Google_Service_IdentityToolkit_IdentitytoolkitRelyingpartyDownloadAccountRequest $postBody
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_IdentityToolkit_DownloadAccountResponse
-   */
-  public function downloadAccount(Google_Service_IdentityToolkit_IdentitytoolkitRelyingpartyDownloadAccountRequest $postBody, $optParams = array())
-  {
-    $params = array('postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('downloadAccount', array($params), "Google_Service_IdentityToolkit_DownloadAccountResponse");
-  }
-  /**
-   * Returns the account info. (relyingparty.getAccountInfo)
-   *
-   * @param Google_Service_IdentityToolkit_IdentitytoolkitRelyingpartyGetAccountInfoRequest $postBody
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_IdentityToolkit_GetAccountInfoResponse
-   */
-  public function getAccountInfo(Google_Service_IdentityToolkit_IdentitytoolkitRelyingpartyGetAccountInfoRequest $postBody, $optParams = array())
-  {
-    $params = array('postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('getAccountInfo', array($params), "Google_Service_IdentityToolkit_GetAccountInfoResponse");
-  }
-  /**
-   * Get a code for user action confirmation.
-   * (relyingparty.getOobConfirmationCode)
-   *
-   * @param Google_Service_IdentityToolkit_Relyingparty $postBody
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_IdentityToolkit_GetOobConfirmationCodeResponse
-   */
-  public function getOobConfirmationCode(Google_Service_IdentityToolkit_Relyingparty $postBody, $optParams = array())
-  {
-    $params = array('postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('getOobConfirmationCode', array($params), "Google_Service_IdentityToolkit_GetOobConfirmationCodeResponse");
-  }
-  /**
-   * Get project configuration. (relyingparty.getProjectConfig)
-   *
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param string delegatedProjectNumber Delegated GCP project number of the
-   * request.
-   * @opt_param string projectNumber GCP project number of the request.
-   * @return Google_Service_IdentityToolkit_IdentitytoolkitRelyingpartyGetProjectConfigResponse
-   */
-  public function getProjectConfig($optParams = array())
-  {
-    $params = array();
-    $params = array_merge($params, $optParams);
-    return $this->call('getProjectConfig', array($params), "Google_Service_IdentityToolkit_IdentitytoolkitRelyingpartyGetProjectConfigResponse");
-  }
-  /**
-   * Get token signing public key. (relyingparty.getPublicKeys)
-   *
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_IdentityToolkit_IdentitytoolkitRelyingpartyGetPublicKeysResponse
-   */
-  public function getPublicKeys($optParams = array())
-  {
-    $params = array();
-    $params = array_merge($params, $optParams);
-    return $this->call('getPublicKeys', array($params), "Google_Service_IdentityToolkit_IdentitytoolkitRelyingpartyGetPublicKeysResponse");
-  }
-  /**
-   * Get recaptcha secure param. (relyingparty.getRecaptchaParam)
-   *
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_IdentityToolkit_GetRecaptchaParamResponse
-   */
-  public function getRecaptchaParam($optParams = array())
-  {
-    $params = array();
-    $params = array_merge($params, $optParams);
-    return $this->call('getRecaptchaParam', array($params), "Google_Service_IdentityToolkit_GetRecaptchaParamResponse");
-  }
-  /**
-   * Reset password for a user. (relyingparty.resetPassword)
-   *
-   * @param Google_Service_IdentityToolkit_IdentitytoolkitRelyingpartyResetPasswordRequest $postBody
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_IdentityToolkit_ResetPasswordResponse
-   */
-  public function resetPassword(Google_Service_IdentityToolkit_IdentitytoolkitRelyingpartyResetPasswordRequest $postBody, $optParams = array())
-  {
-    $params = array('postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('resetPassword', array($params), "Google_Service_IdentityToolkit_ResetPasswordResponse");
-  }
-  /**
-   * Set account info for a user. (relyingparty.setAccountInfo)
-   *
-   * @param Google_Service_IdentityToolkit_IdentitytoolkitRelyingpartySetAccountInfoRequest $postBody
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_IdentityToolkit_SetAccountInfoResponse
-   */
-  public function setAccountInfo(Google_Service_IdentityToolkit_IdentitytoolkitRelyingpartySetAccountInfoRequest $postBody, $optParams = array())
-  {
-    $params = array('postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('setAccountInfo', array($params), "Google_Service_IdentityToolkit_SetAccountInfoResponse");
-  }
-  /**
-   * Set project configuration. (relyingparty.setProjectConfig)
-   *
-   * @param Google_Service_IdentityToolkit_IdentitytoolkitRelyingpartySetProjectConfigRequest $postBody
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_IdentityToolkit_IdentitytoolkitRelyingpartySetProjectConfigResponse
-   */
-  public function setProjectConfig(Google_Service_IdentityToolkit_IdentitytoolkitRelyingpartySetProjectConfigRequest $postBody, $optParams = array())
-  {
-    $params = array('postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('setProjectConfig', array($params), "Google_Service_IdentityToolkit_IdentitytoolkitRelyingpartySetProjectConfigResponse");
-  }
-  /**
-   * Sign out user. (relyingparty.signOutUser)
-   *
-   * @param Google_Service_IdentityToolkit_IdentitytoolkitRelyingpartySignOutUserRequest $postBody
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_IdentityToolkit_IdentitytoolkitRelyingpartySignOutUserResponse
-   */
-  public function signOutUser(Google_Service_IdentityToolkit_IdentitytoolkitRelyingpartySignOutUserRequest $postBody, $optParams = array())
-  {
-    $params = array('postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('signOutUser', array($params), "Google_Service_IdentityToolkit_IdentitytoolkitRelyingpartySignOutUserResponse");
-  }
-  /**
-   * Signup new user. (relyingparty.signupNewUser)
-   *
-   * @param Google_Service_IdentityToolkit_IdentitytoolkitRelyingpartySignupNewUserRequest $postBody
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_IdentityToolkit_SignupNewUserResponse
-   */
-  public function signupNewUser(Google_Service_IdentityToolkit_IdentitytoolkitRelyingpartySignupNewUserRequest $postBody, $optParams = array())
-  {
-    $params = array('postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('signupNewUser', array($params), "Google_Service_IdentityToolkit_SignupNewUserResponse");
-  }
-  /**
-   * Batch upload existing user accounts. (relyingparty.uploadAccount)
-   *
-   * @param Google_Service_IdentityToolkit_IdentitytoolkitRelyingpartyUploadAccountRequest $postBody
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_IdentityToolkit_UploadAccountResponse
-   */
-  public function uploadAccount(Google_Service_IdentityToolkit_IdentitytoolkitRelyingpartyUploadAccountRequest $postBody, $optParams = array())
-  {
-    $params = array('postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('uploadAccount', array($params), "Google_Service_IdentityToolkit_UploadAccountResponse");
-  }
-  /**
-   * Verifies the assertion returned by the IdP. (relyingparty.verifyAssertion)
-   *
-   * @param Google_Service_IdentityToolkit_IdentitytoolkitRelyingpartyVerifyAssertionRequest $postBody
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_IdentityToolkit_VerifyAssertionResponse
-   */
-  public function verifyAssertion(Google_Service_IdentityToolkit_IdentitytoolkitRelyingpartyVerifyAssertionRequest $postBody, $optParams = array())
-  {
-    $params = array('postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('verifyAssertion', array($params), "Google_Service_IdentityToolkit_VerifyAssertionResponse");
-  }
-  /**
-   * Verifies the developer asserted ID token. (relyingparty.verifyCustomToken)
-   *
-   * @param Google_Service_IdentityToolkit_IdentitytoolkitRelyingpartyVerifyCustomTokenRequest $postBody
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_IdentityToolkit_VerifyCustomTokenResponse
-   */
-  public function verifyCustomToken(Google_Service_IdentityToolkit_IdentitytoolkitRelyingpartyVerifyCustomTokenRequest $postBody, $optParams = array())
-  {
-    $params = array('postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('verifyCustomToken', array($params), "Google_Service_IdentityToolkit_VerifyCustomTokenResponse");
-  }
-  /**
-   * Verifies the user entered password. (relyingparty.verifyPassword)
-   *
-   * @param Google_Service_IdentityToolkit_IdentitytoolkitRelyingpartyVerifyPasswordRequest $postBody
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_IdentityToolkit_VerifyPasswordResponse
-   */
-  public function verifyPassword(Google_Service_IdentityToolkit_IdentitytoolkitRelyingpartyVerifyPasswordRequest $postBody, $optParams = array())
-  {
-    $params = array('postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('verifyPassword', array($params), "Google_Service_IdentityToolkit_VerifyPasswordResponse");
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/IdentityToolkit/SetAccountInfoResponse.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/IdentityToolkit/SetAccountInfoResponse.php
deleted file mode 100644
index 3500c609..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/IdentityToolkit/SetAccountInfoResponse.php
+++ /dev/null
@@ -1,131 +0,0 @@
-displayName = $displayName;
-  }
-  public function getDisplayName()
-  {
-    return $this->displayName;
-  }
-  public function setEmail($email)
-  {
-    $this->email = $email;
-  }
-  public function getEmail()
-  {
-    return $this->email;
-  }
-  public function setEmailVerified($emailVerified)
-  {
-    $this->emailVerified = $emailVerified;
-  }
-  public function getEmailVerified()
-  {
-    return $this->emailVerified;
-  }
-  public function setExpiresIn($expiresIn)
-  {
-    $this->expiresIn = $expiresIn;
-  }
-  public function getExpiresIn()
-  {
-    return $this->expiresIn;
-  }
-  public function setIdToken($idToken)
-  {
-    $this->idToken = $idToken;
-  }
-  public function getIdToken()
-  {
-    return $this->idToken;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setLocalId($localId)
-  {
-    $this->localId = $localId;
-  }
-  public function getLocalId()
-  {
-    return $this->localId;
-  }
-  public function setNewEmail($newEmail)
-  {
-    $this->newEmail = $newEmail;
-  }
-  public function getNewEmail()
-  {
-    return $this->newEmail;
-  }
-  public function setPasswordHash($passwordHash)
-  {
-    $this->passwordHash = $passwordHash;
-  }
-  public function getPasswordHash()
-  {
-    return $this->passwordHash;
-  }
-  public function setPhotoUrl($photoUrl)
-  {
-    $this->photoUrl = $photoUrl;
-  }
-  public function getPhotoUrl()
-  {
-    return $this->photoUrl;
-  }
-  public function setProviderUserInfo($providerUserInfo)
-  {
-    $this->providerUserInfo = $providerUserInfo;
-  }
-  public function getProviderUserInfo()
-  {
-    return $this->providerUserInfo;
-  }
-  public function setRefreshToken($refreshToken)
-  {
-    $this->refreshToken = $refreshToken;
-  }
-  public function getRefreshToken()
-  {
-    return $this->refreshToken;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/IdentityToolkit/SetAccountInfoResponseProviderUserInfo.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/IdentityToolkit/SetAccountInfoResponseProviderUserInfo.php
deleted file mode 100644
index 9b4a7bd3..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/IdentityToolkit/SetAccountInfoResponseProviderUserInfo.php
+++ /dev/null
@@ -1,57 +0,0 @@
-displayName = $displayName;
-  }
-  public function getDisplayName()
-  {
-    return $this->displayName;
-  }
-  public function setFederatedId($federatedId)
-  {
-    $this->federatedId = $federatedId;
-  }
-  public function getFederatedId()
-  {
-    return $this->federatedId;
-  }
-  public function setPhotoUrl($photoUrl)
-  {
-    $this->photoUrl = $photoUrl;
-  }
-  public function getPhotoUrl()
-  {
-    return $this->photoUrl;
-  }
-  public function setProviderId($providerId)
-  {
-    $this->providerId = $providerId;
-  }
-  public function getProviderId()
-  {
-    return $this->providerId;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/IdentityToolkit/SignupNewUserResponse.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/IdentityToolkit/SignupNewUserResponse.php
deleted file mode 100644
index 8517a66a..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/IdentityToolkit/SignupNewUserResponse.php
+++ /dev/null
@@ -1,84 +0,0 @@
-displayName = $displayName;
-  }
-  public function getDisplayName()
-  {
-    return $this->displayName;
-  }
-  public function setEmail($email)
-  {
-    $this->email = $email;
-  }
-  public function getEmail()
-  {
-    return $this->email;
-  }
-  public function setExpiresIn($expiresIn)
-  {
-    $this->expiresIn = $expiresIn;
-  }
-  public function getExpiresIn()
-  {
-    return $this->expiresIn;
-  }
-  public function setIdToken($idToken)
-  {
-    $this->idToken = $idToken;
-  }
-  public function getIdToken()
-  {
-    return $this->idToken;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setLocalId($localId)
-  {
-    $this->localId = $localId;
-  }
-  public function getLocalId()
-  {
-    return $this->localId;
-  }
-  public function setRefreshToken($refreshToken)
-  {
-    $this->refreshToken = $refreshToken;
-  }
-  public function getRefreshToken()
-  {
-    return $this->refreshToken;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/IdentityToolkit/UploadAccountResponse.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/IdentityToolkit/UploadAccountResponse.php
deleted file mode 100644
index d125c05a..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/IdentityToolkit/UploadAccountResponse.php
+++ /dev/null
@@ -1,41 +0,0 @@
-error = $error;
-  }
-  public function getError()
-  {
-    return $this->error;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/IdentityToolkit/UploadAccountResponseError.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/IdentityToolkit/UploadAccountResponseError.php
deleted file mode 100644
index f3c4ed27..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/IdentityToolkit/UploadAccountResponseError.php
+++ /dev/null
@@ -1,39 +0,0 @@
-index = $index;
-  }
-  public function getIndex()
-  {
-    return $this->index;
-  }
-  public function setMessage($message)
-  {
-    $this->message = $message;
-  }
-  public function getMessage()
-  {
-    return $this->message;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/IdentityToolkit/UserInfo.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/IdentityToolkit/UserInfo.php
deleted file mode 100644
index 056ec9fb..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/IdentityToolkit/UserInfo.php
+++ /dev/null
@@ -1,176 +0,0 @@
-createdAt = $createdAt;
-  }
-  public function getCreatedAt()
-  {
-    return $this->createdAt;
-  }
-  public function setCustomAuth($customAuth)
-  {
-    $this->customAuth = $customAuth;
-  }
-  public function getCustomAuth()
-  {
-    return $this->customAuth;
-  }
-  public function setDisabled($disabled)
-  {
-    $this->disabled = $disabled;
-  }
-  public function getDisabled()
-  {
-    return $this->disabled;
-  }
-  public function setDisplayName($displayName)
-  {
-    $this->displayName = $displayName;
-  }
-  public function getDisplayName()
-  {
-    return $this->displayName;
-  }
-  public function setEmail($email)
-  {
-    $this->email = $email;
-  }
-  public function getEmail()
-  {
-    return $this->email;
-  }
-  public function setEmailVerified($emailVerified)
-  {
-    $this->emailVerified = $emailVerified;
-  }
-  public function getEmailVerified()
-  {
-    return $this->emailVerified;
-  }
-  public function setLastLoginAt($lastLoginAt)
-  {
-    $this->lastLoginAt = $lastLoginAt;
-  }
-  public function getLastLoginAt()
-  {
-    return $this->lastLoginAt;
-  }
-  public function setLocalId($localId)
-  {
-    $this->localId = $localId;
-  }
-  public function getLocalId()
-  {
-    return $this->localId;
-  }
-  public function setPasswordHash($passwordHash)
-  {
-    $this->passwordHash = $passwordHash;
-  }
-  public function getPasswordHash()
-  {
-    return $this->passwordHash;
-  }
-  public function setPasswordUpdatedAt($passwordUpdatedAt)
-  {
-    $this->passwordUpdatedAt = $passwordUpdatedAt;
-  }
-  public function getPasswordUpdatedAt()
-  {
-    return $this->passwordUpdatedAt;
-  }
-  public function setPhotoUrl($photoUrl)
-  {
-    $this->photoUrl = $photoUrl;
-  }
-  public function getPhotoUrl()
-  {
-    return $this->photoUrl;
-  }
-  public function setProviderUserInfo($providerUserInfo)
-  {
-    $this->providerUserInfo = $providerUserInfo;
-  }
-  public function getProviderUserInfo()
-  {
-    return $this->providerUserInfo;
-  }
-  public function setRawPassword($rawPassword)
-  {
-    $this->rawPassword = $rawPassword;
-  }
-  public function getRawPassword()
-  {
-    return $this->rawPassword;
-  }
-  public function setSalt($salt)
-  {
-    $this->salt = $salt;
-  }
-  public function getSalt()
-  {
-    return $this->salt;
-  }
-  public function setScreenName($screenName)
-  {
-    $this->screenName = $screenName;
-  }
-  public function getScreenName()
-  {
-    return $this->screenName;
-  }
-  public function setValidSince($validSince)
-  {
-    $this->validSince = $validSince;
-  }
-  public function getValidSince()
-  {
-    return $this->validSince;
-  }
-  public function setVersion($version)
-  {
-    $this->version = $version;
-  }
-  public function getVersion()
-  {
-    return $this->version;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/IdentityToolkit/UserInfoProviderUserInfo.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/IdentityToolkit/UserInfoProviderUserInfo.php
deleted file mode 100644
index cf333f8b..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/IdentityToolkit/UserInfoProviderUserInfo.php
+++ /dev/null
@@ -1,84 +0,0 @@
-displayName = $displayName;
-  }
-  public function getDisplayName()
-  {
-    return $this->displayName;
-  }
-  public function setEmail($email)
-  {
-    $this->email = $email;
-  }
-  public function getEmail()
-  {
-    return $this->email;
-  }
-  public function setFederatedId($federatedId)
-  {
-    $this->federatedId = $federatedId;
-  }
-  public function getFederatedId()
-  {
-    return $this->federatedId;
-  }
-  public function setPhotoUrl($photoUrl)
-  {
-    $this->photoUrl = $photoUrl;
-  }
-  public function getPhotoUrl()
-  {
-    return $this->photoUrl;
-  }
-  public function setProviderId($providerId)
-  {
-    $this->providerId = $providerId;
-  }
-  public function getProviderId()
-  {
-    return $this->providerId;
-  }
-  public function setRawId($rawId)
-  {
-    $this->rawId = $rawId;
-  }
-  public function getRawId()
-  {
-    return $this->rawId;
-  }
-  public function setScreenName($screenName)
-  {
-    $this->screenName = $screenName;
-  }
-  public function getScreenName()
-  {
-    return $this->screenName;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/IdentityToolkit/VerifyAssertionResponse.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/IdentityToolkit/VerifyAssertionResponse.php
deleted file mode 100644
index bb3fbfb3..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/IdentityToolkit/VerifyAssertionResponse.php
+++ /dev/null
@@ -1,373 +0,0 @@
-action = $action;
-  }
-  public function getAction()
-  {
-    return $this->action;
-  }
-  public function setAppInstallationUrl($appInstallationUrl)
-  {
-    $this->appInstallationUrl = $appInstallationUrl;
-  }
-  public function getAppInstallationUrl()
-  {
-    return $this->appInstallationUrl;
-  }
-  public function setAppScheme($appScheme)
-  {
-    $this->appScheme = $appScheme;
-  }
-  public function getAppScheme()
-  {
-    return $this->appScheme;
-  }
-  public function setContext($context)
-  {
-    $this->context = $context;
-  }
-  public function getContext()
-  {
-    return $this->context;
-  }
-  public function setDateOfBirth($dateOfBirth)
-  {
-    $this->dateOfBirth = $dateOfBirth;
-  }
-  public function getDateOfBirth()
-  {
-    return $this->dateOfBirth;
-  }
-  public function setDisplayName($displayName)
-  {
-    $this->displayName = $displayName;
-  }
-  public function getDisplayName()
-  {
-    return $this->displayName;
-  }
-  public function setEmail($email)
-  {
-    $this->email = $email;
-  }
-  public function getEmail()
-  {
-    return $this->email;
-  }
-  public function setEmailRecycled($emailRecycled)
-  {
-    $this->emailRecycled = $emailRecycled;
-  }
-  public function getEmailRecycled()
-  {
-    return $this->emailRecycled;
-  }
-  public function setEmailVerified($emailVerified)
-  {
-    $this->emailVerified = $emailVerified;
-  }
-  public function getEmailVerified()
-  {
-    return $this->emailVerified;
-  }
-  public function setErrorMessage($errorMessage)
-  {
-    $this->errorMessage = $errorMessage;
-  }
-  public function getErrorMessage()
-  {
-    return $this->errorMessage;
-  }
-  public function setExpiresIn($expiresIn)
-  {
-    $this->expiresIn = $expiresIn;
-  }
-  public function getExpiresIn()
-  {
-    return $this->expiresIn;
-  }
-  public function setFederatedId($federatedId)
-  {
-    $this->federatedId = $federatedId;
-  }
-  public function getFederatedId()
-  {
-    return $this->federatedId;
-  }
-  public function setFirstName($firstName)
-  {
-    $this->firstName = $firstName;
-  }
-  public function getFirstName()
-  {
-    return $this->firstName;
-  }
-  public function setFullName($fullName)
-  {
-    $this->fullName = $fullName;
-  }
-  public function getFullName()
-  {
-    return $this->fullName;
-  }
-  public function setIdToken($idToken)
-  {
-    $this->idToken = $idToken;
-  }
-  public function getIdToken()
-  {
-    return $this->idToken;
-  }
-  public function setInputEmail($inputEmail)
-  {
-    $this->inputEmail = $inputEmail;
-  }
-  public function getInputEmail()
-  {
-    return $this->inputEmail;
-  }
-  public function setIsNewUser($isNewUser)
-  {
-    $this->isNewUser = $isNewUser;
-  }
-  public function getIsNewUser()
-  {
-    return $this->isNewUser;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setLanguage($language)
-  {
-    $this->language = $language;
-  }
-  public function getLanguage()
-  {
-    return $this->language;
-  }
-  public function setLastName($lastName)
-  {
-    $this->lastName = $lastName;
-  }
-  public function getLastName()
-  {
-    return $this->lastName;
-  }
-  public function setLocalId($localId)
-  {
-    $this->localId = $localId;
-  }
-  public function getLocalId()
-  {
-    return $this->localId;
-  }
-  public function setNeedConfirmation($needConfirmation)
-  {
-    $this->needConfirmation = $needConfirmation;
-  }
-  public function getNeedConfirmation()
-  {
-    return $this->needConfirmation;
-  }
-  public function setNeedEmail($needEmail)
-  {
-    $this->needEmail = $needEmail;
-  }
-  public function getNeedEmail()
-  {
-    return $this->needEmail;
-  }
-  public function setNickName($nickName)
-  {
-    $this->nickName = $nickName;
-  }
-  public function getNickName()
-  {
-    return $this->nickName;
-  }
-  public function setOauthAccessToken($oauthAccessToken)
-  {
-    $this->oauthAccessToken = $oauthAccessToken;
-  }
-  public function getOauthAccessToken()
-  {
-    return $this->oauthAccessToken;
-  }
-  public function setOauthAuthorizationCode($oauthAuthorizationCode)
-  {
-    $this->oauthAuthorizationCode = $oauthAuthorizationCode;
-  }
-  public function getOauthAuthorizationCode()
-  {
-    return $this->oauthAuthorizationCode;
-  }
-  public function setOauthExpireIn($oauthExpireIn)
-  {
-    $this->oauthExpireIn = $oauthExpireIn;
-  }
-  public function getOauthExpireIn()
-  {
-    return $this->oauthExpireIn;
-  }
-  public function setOauthIdToken($oauthIdToken)
-  {
-    $this->oauthIdToken = $oauthIdToken;
-  }
-  public function getOauthIdToken()
-  {
-    return $this->oauthIdToken;
-  }
-  public function setOauthRequestToken($oauthRequestToken)
-  {
-    $this->oauthRequestToken = $oauthRequestToken;
-  }
-  public function getOauthRequestToken()
-  {
-    return $this->oauthRequestToken;
-  }
-  public function setOauthScope($oauthScope)
-  {
-    $this->oauthScope = $oauthScope;
-  }
-  public function getOauthScope()
-  {
-    return $this->oauthScope;
-  }
-  public function setOauthTokenSecret($oauthTokenSecret)
-  {
-    $this->oauthTokenSecret = $oauthTokenSecret;
-  }
-  public function getOauthTokenSecret()
-  {
-    return $this->oauthTokenSecret;
-  }
-  public function setOriginalEmail($originalEmail)
-  {
-    $this->originalEmail = $originalEmail;
-  }
-  public function getOriginalEmail()
-  {
-    return $this->originalEmail;
-  }
-  public function setPhotoUrl($photoUrl)
-  {
-    $this->photoUrl = $photoUrl;
-  }
-  public function getPhotoUrl()
-  {
-    return $this->photoUrl;
-  }
-  public function setProviderId($providerId)
-  {
-    $this->providerId = $providerId;
-  }
-  public function getProviderId()
-  {
-    return $this->providerId;
-  }
-  public function setRawUserInfo($rawUserInfo)
-  {
-    $this->rawUserInfo = $rawUserInfo;
-  }
-  public function getRawUserInfo()
-  {
-    return $this->rawUserInfo;
-  }
-  public function setRefreshToken($refreshToken)
-  {
-    $this->refreshToken = $refreshToken;
-  }
-  public function getRefreshToken()
-  {
-    return $this->refreshToken;
-  }
-  public function setScreenName($screenName)
-  {
-    $this->screenName = $screenName;
-  }
-  public function getScreenName()
-  {
-    return $this->screenName;
-  }
-  public function setTimeZone($timeZone)
-  {
-    $this->timeZone = $timeZone;
-  }
-  public function getTimeZone()
-  {
-    return $this->timeZone;
-  }
-  public function setVerifiedProvider($verifiedProvider)
-  {
-    $this->verifiedProvider = $verifiedProvider;
-  }
-  public function getVerifiedProvider()
-  {
-    return $this->verifiedProvider;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/IdentityToolkit/VerifyCustomTokenResponse.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/IdentityToolkit/VerifyCustomTokenResponse.php
deleted file mode 100644
index 046b1bae..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/IdentityToolkit/VerifyCustomTokenResponse.php
+++ /dev/null
@@ -1,57 +0,0 @@
-expiresIn = $expiresIn;
-  }
-  public function getExpiresIn()
-  {
-    return $this->expiresIn;
-  }
-  public function setIdToken($idToken)
-  {
-    $this->idToken = $idToken;
-  }
-  public function getIdToken()
-  {
-    return $this->idToken;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setRefreshToken($refreshToken)
-  {
-    $this->refreshToken = $refreshToken;
-  }
-  public function getRefreshToken()
-  {
-    return $this->refreshToken;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/IdentityToolkit/VerifyPasswordResponse.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/IdentityToolkit/VerifyPasswordResponse.php
deleted file mode 100644
index 852a0b94..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/IdentityToolkit/VerifyPasswordResponse.php
+++ /dev/null
@@ -1,129 +0,0 @@
-displayName = $displayName;
-  }
-  public function getDisplayName()
-  {
-    return $this->displayName;
-  }
-  public function setEmail($email)
-  {
-    $this->email = $email;
-  }
-  public function getEmail()
-  {
-    return $this->email;
-  }
-  public function setExpiresIn($expiresIn)
-  {
-    $this->expiresIn = $expiresIn;
-  }
-  public function getExpiresIn()
-  {
-    return $this->expiresIn;
-  }
-  public function setIdToken($idToken)
-  {
-    $this->idToken = $idToken;
-  }
-  public function getIdToken()
-  {
-    return $this->idToken;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setLocalId($localId)
-  {
-    $this->localId = $localId;
-  }
-  public function getLocalId()
-  {
-    return $this->localId;
-  }
-  public function setOauthAccessToken($oauthAccessToken)
-  {
-    $this->oauthAccessToken = $oauthAccessToken;
-  }
-  public function getOauthAccessToken()
-  {
-    return $this->oauthAccessToken;
-  }
-  public function setOauthAuthorizationCode($oauthAuthorizationCode)
-  {
-    $this->oauthAuthorizationCode = $oauthAuthorizationCode;
-  }
-  public function getOauthAuthorizationCode()
-  {
-    return $this->oauthAuthorizationCode;
-  }
-  public function setOauthExpireIn($oauthExpireIn)
-  {
-    $this->oauthExpireIn = $oauthExpireIn;
-  }
-  public function getOauthExpireIn()
-  {
-    return $this->oauthExpireIn;
-  }
-  public function setPhotoUrl($photoUrl)
-  {
-    $this->photoUrl = $photoUrl;
-  }
-  public function getPhotoUrl()
-  {
-    return $this->photoUrl;
-  }
-  public function setRefreshToken($refreshToken)
-  {
-    $this->refreshToken = $refreshToken;
-  }
-  public function getRefreshToken()
-  {
-    return $this->refreshToken;
-  }
-  public function setRegistered($registered)
-  {
-    $this->registered = $registered;
-  }
-  public function getRegistered()
-  {
-    return $this->registered;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Kgsearch.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Kgsearch.php
deleted file mode 100644
index 6234175a..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Kgsearch.php
+++ /dev/null
@@ -1,97 +0,0 @@
-
- * Searches the Google Knowledge Graph for entities.

- *
- * 

- * For more information about this service, see the API
- * Documentation
- * 

- *
- * @author Google, Inc.
- */
-class Google_Service_Kgsearch extends Google_Service
-{
-
-
-  public $entities;
-  
-  /**
-   * Constructs the internal representation of the Kgsearch service.
-   *
-   * @param Google_Client $client
-   */
-  public function __construct(Google_Client $client)
-  {
-    parent::__construct($client);
-    $this->rootUrl = 'https://kgsearch.googleapis.com/';
-    $this->servicePath = '';
-    $this->version = 'v1';
-    $this->serviceName = 'kgsearch';
-
-    $this->entities = new Google_Service_Kgsearch_Resource_Entities(
-        $this,
-        $this->serviceName,
-        'entities',
-        array(
-          'methods' => array(
-            'search' => array(
-              'path' => 'v1/entities:search',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'types' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                  'repeated' => true,
-                ),
-                'indent' => array(
-                  'location' => 'query',
-                  'type' => 'boolean',
-                ),
-                'languages' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                  'repeated' => true,
-                ),
-                'ids' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                  'repeated' => true,
-                ),
-                'limit' => array(
-                  'location' => 'query',
-                  'type' => 'integer',
-                ),
-                'prefix' => array(
-                  'location' => 'query',
-                  'type' => 'boolean',
-                ),
-                'query' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-              ),
-            ),
-          )
-        )
-    );
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Kgsearch/Resource/Entities.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Kgsearch/Resource/Entities.php
deleted file mode 100644
index f236faef..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Kgsearch/Resource/Entities.php
+++ /dev/null
@@ -1,56 +0,0 @@
-
- *   $kgsearchService = new Google_Service_Kgsearch(...);
- *   $entities = $kgsearchService->entities;
- *  
- */
-class Google_Service_Kgsearch_Resource_Entities extends Google_Service_Resource
-{
-  /**
-   * Searches Knowledge Graph for entities that match the constraints. A list of
-   * matched entities will be returned in response, which will be in JSON-LD
-   * format and compatible with http://schema.org (entities.search)
-   *
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param string types Restricts returned entities with these types, e.g.
-   * Person (as defined in http://schema.org/Person). If multiple types are
-   * specified, returned entities will contain one or more of these types.
-   * @opt_param bool indent Enables indenting of json results.
-   * @opt_param string languages The list of language codes (defined in ISO 693)
-   * to run the query with, e.g. 'en'.
-   * @opt_param string ids The list of entity id to be used for search instead of
-   * query string. To specify multiple ids in the HTTP request, repeat the
-   * parameter in the URL as in ...?ids=A=B
-   * @opt_param int limit Limits the number of entities to be returned.
-   * @opt_param bool prefix Enables prefix match against names and aliases of
-   * entities
-   * @opt_param string query The literal query string for search.
-   * @return Google_Service_Kgsearch_SearchResponse
-   */
-  public function search($optParams = array())
-  {
-    $params = array();
-    $params = array_merge($params, $optParams);
-    return $this->call('search', array($params), "Google_Service_Kgsearch_SearchResponse");
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Kgsearch/SearchResponse.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Kgsearch/SearchResponse.php
deleted file mode 100644
index 50df00da..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Kgsearch/SearchResponse.php
+++ /dev/null
@@ -1,53 +0,0 @@
- "@context",
-        "type" => "@type",
-  );
-  public $context;
-  public $type;
-  public $itemListElement;
-
-  public function setContext($context)
-  {
-    $this->context = $context;
-  }
-  public function getContext()
-  {
-    return $this->context;
-  }
-  public function setType($type)
-  {
-    $this->type = $type;
-  }
-  public function getType()
-  {
-    return $this->type;
-  }
-  public function setItemListElement($itemListElement)
-  {
-    $this->itemListElement = $itemListElement;
-  }
-  public function getItemListElement()
-  {
-    return $this->itemListElement;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Licensing.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Licensing.php
deleted file mode 100644
index 185d261a..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Licensing.php
+++ /dev/null
@@ -1,209 +0,0 @@
-
- * Views and manages licenses for your domain.

- *
- * 

- * For more information about this service, see the API
- * Documentation
- * 

- *
- * @author Google, Inc.
- */
-class Google_Service_Licensing extends Google_Service
-{
-  /** View and manage G Suite licenses for your domain. */
-  const APPS_LICENSING =
-      "https://www.googleapis.com/auth/apps.licensing";
-
-  public $licenseAssignments;
-  
-  /**
-   * Constructs the internal representation of the Licensing service.
-   *
-   * @param Google_Client $client
-   */
-  public function __construct(Google_Client $client)
-  {
-    parent::__construct($client);
-    $this->rootUrl = 'https://www.googleapis.com/';
-    $this->servicePath = 'apps/licensing/v1/product/';
-    $this->version = 'v1';
-    $this->serviceName = 'licensing';
-
-    $this->licenseAssignments = new Google_Service_Licensing_Resource_LicenseAssignments(
-        $this,
-        $this->serviceName,
-        'licenseAssignments',
-        array(
-          'methods' => array(
-            'delete' => array(
-              'path' => '{productId}/sku/{skuId}/user/{userId}',
-              'httpMethod' => 'DELETE',
-              'parameters' => array(
-                'productId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'skuId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'userId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'get' => array(
-              'path' => '{productId}/sku/{skuId}/user/{userId}',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'productId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'skuId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'userId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'insert' => array(
-              'path' => '{productId}/sku/{skuId}/user',
-              'httpMethod' => 'POST',
-              'parameters' => array(
-                'productId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'skuId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'listForProduct' => array(
-              'path' => '{productId}/users',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'productId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'customerId' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'maxResults' => array(
-                  'location' => 'query',
-                  'type' => 'integer',
-                ),
-                'pageToken' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-              ),
-            ),'listForProductAndSku' => array(
-              'path' => '{productId}/sku/{skuId}/users',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'productId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'skuId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'customerId' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'maxResults' => array(
-                  'location' => 'query',
-                  'type' => 'integer',
-                ),
-                'pageToken' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-              ),
-            ),'patch' => array(
-              'path' => '{productId}/sku/{skuId}/user/{userId}',
-              'httpMethod' => 'PATCH',
-              'parameters' => array(
-                'productId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'skuId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'userId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'update' => array(
-              'path' => '{productId}/sku/{skuId}/user/{userId}',
-              'httpMethod' => 'PUT',
-              'parameters' => array(
-                'productId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'skuId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'userId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),
-          )
-        )
-    );
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Licensing/LicenseAssignment.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Licensing/LicenseAssignment.php
deleted file mode 100644
index af379726..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Licensing/LicenseAssignment.php
+++ /dev/null
@@ -1,93 +0,0 @@
-etags = $etags;
-  }
-  public function getEtags()
-  {
-    return $this->etags;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setProductId($productId)
-  {
-    $this->productId = $productId;
-  }
-  public function getProductId()
-  {
-    return $this->productId;
-  }
-  public function setProductName($productName)
-  {
-    $this->productName = $productName;
-  }
-  public function getProductName()
-  {
-    return $this->productName;
-  }
-  public function setSelfLink($selfLink)
-  {
-    $this->selfLink = $selfLink;
-  }
-  public function getSelfLink()
-  {
-    return $this->selfLink;
-  }
-  public function setSkuId($skuId)
-  {
-    $this->skuId = $skuId;
-  }
-  public function getSkuId()
-  {
-    return $this->skuId;
-  }
-  public function setSkuName($skuName)
-  {
-    $this->skuName = $skuName;
-  }
-  public function getSkuName()
-  {
-    return $this->skuName;
-  }
-  public function setUserId($userId)
-  {
-    $this->userId = $userId;
-  }
-  public function getUserId()
-  {
-    return $this->userId;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Licensing/LicenseAssignmentInsert.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Licensing/LicenseAssignmentInsert.php
deleted file mode 100644
index cad54f06..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Licensing/LicenseAssignmentInsert.php
+++ /dev/null
@@ -1,30 +0,0 @@
-userId = $userId;
-  }
-  public function getUserId()
-  {
-    return $this->userId;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Licensing/LicenseAssignmentList.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Licensing/LicenseAssignmentList.php
deleted file mode 100644
index 5ba88e52..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Licensing/LicenseAssignmentList.php
+++ /dev/null
@@ -1,59 +0,0 @@
-etag = $etag;
-  }
-  public function getEtag()
-  {
-    return $this->etag;
-  }
-  public function setItems($items)
-  {
-    $this->items = $items;
-  }
-  public function getItems()
-  {
-    return $this->items;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setNextPageToken($nextPageToken)
-  {
-    $this->nextPageToken = $nextPageToken;
-  }
-  public function getNextPageToken()
-  {
-    return $this->nextPageToken;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Licensing/Resource/LicenseAssignments.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Licensing/Resource/LicenseAssignments.php
deleted file mode 100644
index 70350d7e..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Licensing/Resource/LicenseAssignments.php
+++ /dev/null
@@ -1,149 +0,0 @@
-
- *   $licensingService = new Google_Service_Licensing(...);
- *   $licenseAssignments = $licensingService->licenseAssignments;
- *  
- */
-class Google_Service_Licensing_Resource_LicenseAssignments extends Google_Service_Resource
-{
-  /**
-   * Revoke License. (licenseAssignments.delete)
-   *
-   * @param string $productId Name for product
-   * @param string $skuId Name for sku
-   * @param string $userId email id or unique Id of the user
-   * @param array $optParams Optional parameters.
-   */
-  public function delete($productId, $skuId, $userId, $optParams = array())
-  {
-    $params = array('productId' => $productId, 'skuId' => $skuId, 'userId' => $userId);
-    $params = array_merge($params, $optParams);
-    return $this->call('delete', array($params));
-  }
-  /**
-   * Get license assignment of a particular product and sku for a user
-   * (licenseAssignments.get)
-   *
-   * @param string $productId Name for product
-   * @param string $skuId Name for sku
-   * @param string $userId email id or unique Id of the user
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Licensing_LicenseAssignment
-   */
-  public function get($productId, $skuId, $userId, $optParams = array())
-  {
-    $params = array('productId' => $productId, 'skuId' => $skuId, 'userId' => $userId);
-    $params = array_merge($params, $optParams);
-    return $this->call('get', array($params), "Google_Service_Licensing_LicenseAssignment");
-  }
-  /**
-   * Assign License. (licenseAssignments.insert)
-   *
-   * @param string $productId Name for product
-   * @param string $skuId Name for sku
-   * @param Google_Service_Licensing_LicenseAssignmentInsert $postBody
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Licensing_LicenseAssignment
-   */
-  public function insert($productId, $skuId, Google_Service_Licensing_LicenseAssignmentInsert $postBody, $optParams = array())
-  {
-    $params = array('productId' => $productId, 'skuId' => $skuId, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('insert', array($params), "Google_Service_Licensing_LicenseAssignment");
-  }
-  /**
-   * List license assignments for given product of the customer.
-   * (licenseAssignments.listForProduct)
-   *
-   * @param string $productId Name for product
-   * @param string $customerId CustomerId represents the customer for whom
-   * licenseassignments are queried
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param string maxResults Maximum number of campaigns to return at one
-   * time. Must be positive. Optional. Default value is 100.
-   * @opt_param string pageToken Token to fetch the next page.Optional. By default
-   * server will return first page
-   * @return Google_Service_Licensing_LicenseAssignmentList
-   */
-  public function listForProduct($productId, $customerId, $optParams = array())
-  {
-    $params = array('productId' => $productId, 'customerId' => $customerId);
-    $params = array_merge($params, $optParams);
-    return $this->call('listForProduct', array($params), "Google_Service_Licensing_LicenseAssignmentList");
-  }
-  /**
-   * List license assignments for given product and sku of the customer.
-   * (licenseAssignments.listForProductAndSku)
-   *
-   * @param string $productId Name for product
-   * @param string $skuId Name for sku
-   * @param string $customerId CustomerId represents the customer for whom
-   * licenseassignments are queried
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param string maxResults Maximum number of campaigns to return at one
-   * time. Must be positive. Optional. Default value is 100.
-   * @opt_param string pageToken Token to fetch the next page.Optional. By default
-   * server will return first page
-   * @return Google_Service_Licensing_LicenseAssignmentList
-   */
-  public function listForProductAndSku($productId, $skuId, $customerId, $optParams = array())
-  {
-    $params = array('productId' => $productId, 'skuId' => $skuId, 'customerId' => $customerId);
-    $params = array_merge($params, $optParams);
-    return $this->call('listForProductAndSku', array($params), "Google_Service_Licensing_LicenseAssignmentList");
-  }
-  /**
-   * Assign License. This method supports patch semantics.
-   * (licenseAssignments.patch)
-   *
-   * @param string $productId Name for product
-   * @param string $skuId Name for sku for which license would be revoked
-   * @param string $userId email id or unique Id of the user
-   * @param Google_Service_Licensing_LicenseAssignment $postBody
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Licensing_LicenseAssignment
-   */
-  public function patch($productId, $skuId, $userId, Google_Service_Licensing_LicenseAssignment $postBody, $optParams = array())
-  {
-    $params = array('productId' => $productId, 'skuId' => $skuId, 'userId' => $userId, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('patch', array($params), "Google_Service_Licensing_LicenseAssignment");
-  }
-  /**
-   * Assign License. (licenseAssignments.update)
-   *
-   * @param string $productId Name for product
-   * @param string $skuId Name for sku for which license would be revoked
-   * @param string $userId email id or unique Id of the user
-   * @param Google_Service_Licensing_LicenseAssignment $postBody
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Licensing_LicenseAssignment
-   */
-  public function update($productId, $skuId, $userId, Google_Service_Licensing_LicenseAssignment $postBody, $optParams = array())
-  {
-    $params = array('productId' => $productId, 'skuId' => $skuId, 'userId' => $userId, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('update', array($params), "Google_Service_Licensing_LicenseAssignment");
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Logging.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Logging.php
deleted file mode 100644
index 92e9d14a..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Logging.php
+++ /dev/null
@@ -1,640 +0,0 @@
-
- * Writes log entries and manages your Stackdriver Logging configuration.

- *
- * 

- * For more information about this service, see the API
- * Documentation
- * 

- *
- * @author Google, Inc.
- */
-class Google_Service_Logging extends Google_Service
-{
-  /** View and manage your data across Google Cloud Platform services. */
-  const CLOUD_PLATFORM =
-      "https://www.googleapis.com/auth/cloud-platform";
-  /** View your data across Google Cloud Platform services. */
-  const CLOUD_PLATFORM_READ_ONLY =
-      "https://www.googleapis.com/auth/cloud-platform.read-only";
-  /** Administrate log data for your projects. */
-  const LOGGING_ADMIN =
-      "https://www.googleapis.com/auth/logging.admin";
-  /** View log data for your projects. */
-  const LOGGING_READ =
-      "https://www.googleapis.com/auth/logging.read";
-  /** Submit log data for your projects. */
-  const LOGGING_WRITE =
-      "https://www.googleapis.com/auth/logging.write";
-
-  public $billingAccounts_logs;
-  public $billingAccounts_sinks;
-  public $entries;
-  public $folders_logs;
-  public $folders_sinks;
-  public $monitoredResourceDescriptors;
-  public $organizations_logs;
-  public $organizations_sinks;
-  public $projects_logs;
-  public $projects_metrics;
-  public $projects_sinks;
-  
-  /**
-   * Constructs the internal representation of the Logging service.
-   *
-   * @param Google_Client $client
-   */
-  public function __construct(Google_Client $client)
-  {
-    parent::__construct($client);
-    $this->rootUrl = 'https://logging.googleapis.com/';
-    $this->servicePath = '';
-    $this->version = 'v2';
-    $this->serviceName = 'logging';
-
-    $this->billingAccounts_logs = new Google_Service_Logging_Resource_BillingAccountsLogs(
-        $this,
-        $this->serviceName,
-        'logs',
-        array(
-          'methods' => array(
-            'delete' => array(
-              'path' => 'v2/{+logName}',
-              'httpMethod' => 'DELETE',
-              'parameters' => array(
-                'logName' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'list' => array(
-              'path' => 'v2/{+parent}/logs',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'parent' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'pageToken' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'pageSize' => array(
-                  'location' => 'query',
-                  'type' => 'integer',
-                ),
-              ),
-            ),
-          )
-        )
-    );
-    $this->billingAccounts_sinks = new Google_Service_Logging_Resource_BillingAccountsSinks(
-        $this,
-        $this->serviceName,
-        'sinks',
-        array(
-          'methods' => array(
-            'create' => array(
-              'path' => 'v2/{+parent}/sinks',
-              'httpMethod' => 'POST',
-              'parameters' => array(
-                'parent' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'uniqueWriterIdentity' => array(
-                  'location' => 'query',
-                  'type' => 'boolean',
-                ),
-              ),
-            ),'delete' => array(
-              'path' => 'v2/{+sinkName}',
-              'httpMethod' => 'DELETE',
-              'parameters' => array(
-                'sinkName' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'get' => array(
-              'path' => 'v2/{+sinkName}',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'sinkName' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'list' => array(
-              'path' => 'v2/{+parent}/sinks',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'parent' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'pageToken' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'pageSize' => array(
-                  'location' => 'query',
-                  'type' => 'integer',
-                ),
-              ),
-            ),'update' => array(
-              'path' => 'v2/{+sinkName}',
-              'httpMethod' => 'PUT',
-              'parameters' => array(
-                'sinkName' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'uniqueWriterIdentity' => array(
-                  'location' => 'query',
-                  'type' => 'boolean',
-                ),
-              ),
-            ),
-          )
-        )
-    );
-    $this->entries = new Google_Service_Logging_Resource_Entries(
-        $this,
-        $this->serviceName,
-        'entries',
-        array(
-          'methods' => array(
-            'list' => array(
-              'path' => 'v2/entries:list',
-              'httpMethod' => 'POST',
-              'parameters' => array(),
-            ),'write' => array(
-              'path' => 'v2/entries:write',
-              'httpMethod' => 'POST',
-              'parameters' => array(),
-            ),
-          )
-        )
-    );
-    $this->folders_logs = new Google_Service_Logging_Resource_FoldersLogs(
-        $this,
-        $this->serviceName,
-        'logs',
-        array(
-          'methods' => array(
-            'delete' => array(
-              'path' => 'v2/{+logName}',
-              'httpMethod' => 'DELETE',
-              'parameters' => array(
-                'logName' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'list' => array(
-              'path' => 'v2/{+parent}/logs',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'parent' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'pageToken' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'pageSize' => array(
-                  'location' => 'query',
-                  'type' => 'integer',
-                ),
-              ),
-            ),
-          )
-        )
-    );
-    $this->folders_sinks = new Google_Service_Logging_Resource_FoldersSinks(
-        $this,
-        $this->serviceName,
-        'sinks',
-        array(
-          'methods' => array(
-            'create' => array(
-              'path' => 'v2/{+parent}/sinks',
-              'httpMethod' => 'POST',
-              'parameters' => array(
-                'parent' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'uniqueWriterIdentity' => array(
-                  'location' => 'query',
-                  'type' => 'boolean',
-                ),
-              ),
-            ),'delete' => array(
-              'path' => 'v2/{+sinkName}',
-              'httpMethod' => 'DELETE',
-              'parameters' => array(
-                'sinkName' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'get' => array(
-              'path' => 'v2/{+sinkName}',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'sinkName' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'list' => array(
-              'path' => 'v2/{+parent}/sinks',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'parent' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'pageToken' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'pageSize' => array(
-                  'location' => 'query',
-                  'type' => 'integer',
-                ),
-              ),
-            ),'update' => array(
-              'path' => 'v2/{+sinkName}',
-              'httpMethod' => 'PUT',
-              'parameters' => array(
-                'sinkName' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'uniqueWriterIdentity' => array(
-                  'location' => 'query',
-                  'type' => 'boolean',
-                ),
-              ),
-            ),
-          )
-        )
-    );
-    $this->monitoredResourceDescriptors = new Google_Service_Logging_Resource_MonitoredResourceDescriptors(
-        $this,
-        $this->serviceName,
-        'monitoredResourceDescriptors',
-        array(
-          'methods' => array(
-            'list' => array(
-              'path' => 'v2/monitoredResourceDescriptors',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'pageSize' => array(
-                  'location' => 'query',
-                  'type' => 'integer',
-                ),
-                'pageToken' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-              ),
-            ),
-          )
-        )
-    );
-    $this->organizations_logs = new Google_Service_Logging_Resource_OrganizationsLogs(
-        $this,
-        $this->serviceName,
-        'logs',
-        array(
-          'methods' => array(
-            'delete' => array(
-              'path' => 'v2/{+logName}',
-              'httpMethod' => 'DELETE',
-              'parameters' => array(
-                'logName' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'list' => array(
-              'path' => 'v2/{+parent}/logs',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'parent' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'pageToken' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'pageSize' => array(
-                  'location' => 'query',
-                  'type' => 'integer',
-                ),
-              ),
-            ),
-          )
-        )
-    );
-    $this->organizations_sinks = new Google_Service_Logging_Resource_OrganizationsSinks(
-        $this,
-        $this->serviceName,
-        'sinks',
-        array(
-          'methods' => array(
-            'create' => array(
-              'path' => 'v2/{+parent}/sinks',
-              'httpMethod' => 'POST',
-              'parameters' => array(
-                'parent' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'uniqueWriterIdentity' => array(
-                  'location' => 'query',
-                  'type' => 'boolean',
-                ),
-              ),
-            ),'delete' => array(
-              'path' => 'v2/{+sinkName}',
-              'httpMethod' => 'DELETE',
-              'parameters' => array(
-                'sinkName' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'get' => array(
-              'path' => 'v2/{+sinkName}',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'sinkName' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'list' => array(
-              'path' => 'v2/{+parent}/sinks',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'parent' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'pageToken' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'pageSize' => array(
-                  'location' => 'query',
-                  'type' => 'integer',
-                ),
-              ),
-            ),'update' => array(
-              'path' => 'v2/{+sinkName}',
-              'httpMethod' => 'PUT',
-              'parameters' => array(
-                'sinkName' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'uniqueWriterIdentity' => array(
-                  'location' => 'query',
-                  'type' => 'boolean',
-                ),
-              ),
-            ),
-          )
-        )
-    );
-    $this->projects_logs = new Google_Service_Logging_Resource_ProjectsLogs(
-        $this,
-        $this->serviceName,
-        'logs',
-        array(
-          'methods' => array(
-            'delete' => array(
-              'path' => 'v2/{+logName}',
-              'httpMethod' => 'DELETE',
-              'parameters' => array(
-                'logName' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'list' => array(
-              'path' => 'v2/{+parent}/logs',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'parent' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'pageSize' => array(
-                  'location' => 'query',
-                  'type' => 'integer',
-                ),
-                'pageToken' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-              ),
-            ),
-          )
-        )
-    );
-    $this->projects_metrics = new Google_Service_Logging_Resource_ProjectsMetrics(
-        $this,
-        $this->serviceName,
-        'metrics',
-        array(
-          'methods' => array(
-            'create' => array(
-              'path' => 'v2/{+parent}/metrics',
-              'httpMethod' => 'POST',
-              'parameters' => array(
-                'parent' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'delete' => array(
-              'path' => 'v2/{+metricName}',
-              'httpMethod' => 'DELETE',
-              'parameters' => array(
-                'metricName' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'get' => array(
-              'path' => 'v2/{+metricName}',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'metricName' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'list' => array(
-              'path' => 'v2/{+parent}/metrics',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'parent' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'pageToken' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'pageSize' => array(
-                  'location' => 'query',
-                  'type' => 'integer',
-                ),
-              ),
-            ),'update' => array(
-              'path' => 'v2/{+metricName}',
-              'httpMethod' => 'PUT',
-              'parameters' => array(
-                'metricName' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),
-          )
-        )
-    );
-    $this->projects_sinks = new Google_Service_Logging_Resource_ProjectsSinks(
-        $this,
-        $this->serviceName,
-        'sinks',
-        array(
-          'methods' => array(
-            'create' => array(
-              'path' => 'v2/{+parent}/sinks',
-              'httpMethod' => 'POST',
-              'parameters' => array(
-                'parent' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'uniqueWriterIdentity' => array(
-                  'location' => 'query',
-                  'type' => 'boolean',
-                ),
-              ),
-            ),'delete' => array(
-              'path' => 'v2/{+sinkName}',
-              'httpMethod' => 'DELETE',
-              'parameters' => array(
-                'sinkName' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'get' => array(
-              'path' => 'v2/{+sinkName}',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'sinkName' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'list' => array(
-              'path' => 'v2/{+parent}/sinks',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'parent' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'pageToken' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'pageSize' => array(
-                  'location' => 'query',
-                  'type' => 'integer',
-                ),
-              ),
-            ),'update' => array(
-              'path' => 'v2/{+sinkName}',
-              'httpMethod' => 'PUT',
-              'parameters' => array(
-                'sinkName' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'uniqueWriterIdentity' => array(
-                  'location' => 'query',
-                  'type' => 'boolean',
-                ),
-              ),
-            ),
-          )
-        )
-    );
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Logging/HttpRequest.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Logging/HttpRequest.php
deleted file mode 100644
index cb0962c7..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Logging/HttpRequest.php
+++ /dev/null
@@ -1,147 +0,0 @@
-cacheFillBytes = $cacheFillBytes;
-  }
-  public function getCacheFillBytes()
-  {
-    return $this->cacheFillBytes;
-  }
-  public function setCacheHit($cacheHit)
-  {
-    $this->cacheHit = $cacheHit;
-  }
-  public function getCacheHit()
-  {
-    return $this->cacheHit;
-  }
-  public function setCacheLookup($cacheLookup)
-  {
-    $this->cacheLookup = $cacheLookup;
-  }
-  public function getCacheLookup()
-  {
-    return $this->cacheLookup;
-  }
-  public function setCacheValidatedWithOriginServer($cacheValidatedWithOriginServer)
-  {
-    $this->cacheValidatedWithOriginServer = $cacheValidatedWithOriginServer;
-  }
-  public function getCacheValidatedWithOriginServer()
-  {
-    return $this->cacheValidatedWithOriginServer;
-  }
-  public function setLatency($latency)
-  {
-    $this->latency = $latency;
-  }
-  public function getLatency()
-  {
-    return $this->latency;
-  }
-  public function setReferer($referer)
-  {
-    $this->referer = $referer;
-  }
-  public function getReferer()
-  {
-    return $this->referer;
-  }
-  public function setRemoteIp($remoteIp)
-  {
-    $this->remoteIp = $remoteIp;
-  }
-  public function getRemoteIp()
-  {
-    return $this->remoteIp;
-  }
-  public function setRequestMethod($requestMethod)
-  {
-    $this->requestMethod = $requestMethod;
-  }
-  public function getRequestMethod()
-  {
-    return $this->requestMethod;
-  }
-  public function setRequestSize($requestSize)
-  {
-    $this->requestSize = $requestSize;
-  }
-  public function getRequestSize()
-  {
-    return $this->requestSize;
-  }
-  public function setRequestUrl($requestUrl)
-  {
-    $this->requestUrl = $requestUrl;
-  }
-  public function getRequestUrl()
-  {
-    return $this->requestUrl;
-  }
-  public function setResponseSize($responseSize)
-  {
-    $this->responseSize = $responseSize;
-  }
-  public function getResponseSize()
-  {
-    return $this->responseSize;
-  }
-  public function setServerIp($serverIp)
-  {
-    $this->serverIp = $serverIp;
-  }
-  public function getServerIp()
-  {
-    return $this->serverIp;
-  }
-  public function setStatus($status)
-  {
-    $this->status = $status;
-  }
-  public function getStatus()
-  {
-    return $this->status;
-  }
-  public function setUserAgent($userAgent)
-  {
-    $this->userAgent = $userAgent;
-  }
-  public function getUserAgent()
-  {
-    return $this->userAgent;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Logging/LabelDescriptor.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Logging/LabelDescriptor.php
deleted file mode 100644
index 0aa9de13..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Logging/LabelDescriptor.php
+++ /dev/null
@@ -1,48 +0,0 @@
-description = $description;
-  }
-  public function getDescription()
-  {
-    return $this->description;
-  }
-  public function setKey($key)
-  {
-    $this->key = $key;
-  }
-  public function getKey()
-  {
-    return $this->key;
-  }
-  public function setValueType($valueType)
-  {
-    $this->valueType = $valueType;
-  }
-  public function getValueType()
-  {
-    return $this->valueType;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Logging/ListLogEntriesRequest.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Logging/ListLogEntriesRequest.php
deleted file mode 100644
index 3cd2612d..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Logging/ListLogEntriesRequest.php
+++ /dev/null
@@ -1,76 +0,0 @@
-filter = $filter;
-  }
-  public function getFilter()
-  {
-    return $this->filter;
-  }
-  public function setOrderBy($orderBy)
-  {
-    $this->orderBy = $orderBy;
-  }
-  public function getOrderBy()
-  {
-    return $this->orderBy;
-  }
-  public function setPageSize($pageSize)
-  {
-    $this->pageSize = $pageSize;
-  }
-  public function getPageSize()
-  {
-    return $this->pageSize;
-  }
-  public function setPageToken($pageToken)
-  {
-    $this->pageToken = $pageToken;
-  }
-  public function getPageToken()
-  {
-    return $this->pageToken;
-  }
-  public function setProjectIds($projectIds)
-  {
-    $this->projectIds = $projectIds;
-  }
-  public function getProjectIds()
-  {
-    return $this->projectIds;
-  }
-  public function setResourceNames($resourceNames)
-  {
-    $this->resourceNames = $resourceNames;
-  }
-  public function getResourceNames()
-  {
-    return $this->resourceNames;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Logging/ListLogEntriesResponse.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Logging/ListLogEntriesResponse.php
deleted file mode 100644
index 15e9ff5a..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Logging/ListLogEntriesResponse.php
+++ /dev/null
@@ -1,41 +0,0 @@
-entries = $entries;
-  }
-  public function getEntries()
-  {
-    return $this->entries;
-  }
-  public function setNextPageToken($nextPageToken)
-  {
-    $this->nextPageToken = $nextPageToken;
-  }
-  public function getNextPageToken()
-  {
-    return $this->nextPageToken;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Logging/ListLogMetricsResponse.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Logging/ListLogMetricsResponse.php
deleted file mode 100644
index 44b32d47..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Logging/ListLogMetricsResponse.php
+++ /dev/null
@@ -1,41 +0,0 @@
-metrics = $metrics;
-  }
-  public function getMetrics()
-  {
-    return $this->metrics;
-  }
-  public function setNextPageToken($nextPageToken)
-  {
-    $this->nextPageToken = $nextPageToken;
-  }
-  public function getNextPageToken()
-  {
-    return $this->nextPageToken;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Logging/ListLogsResponse.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Logging/ListLogsResponse.php
deleted file mode 100644
index 13447c36..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Logging/ListLogsResponse.php
+++ /dev/null
@@ -1,40 +0,0 @@
-logNames = $logNames;
-  }
-  public function getLogNames()
-  {
-    return $this->logNames;
-  }
-  public function setNextPageToken($nextPageToken)
-  {
-    $this->nextPageToken = $nextPageToken;
-  }
-  public function getNextPageToken()
-  {
-    return $this->nextPageToken;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Logging/ListMonitoredResourceDescriptorsResponse.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Logging/ListMonitoredResourceDescriptorsResponse.php
deleted file mode 100644
index 0c542a22..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Logging/ListMonitoredResourceDescriptorsResponse.php
+++ /dev/null
@@ -1,41 +0,0 @@
-nextPageToken = $nextPageToken;
-  }
-  public function getNextPageToken()
-  {
-    return $this->nextPageToken;
-  }
-  public function setResourceDescriptors($resourceDescriptors)
-  {
-    $this->resourceDescriptors = $resourceDescriptors;
-  }
-  public function getResourceDescriptors()
-  {
-    return $this->resourceDescriptors;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Logging/ListSinksResponse.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Logging/ListSinksResponse.php
deleted file mode 100644
index 80d72d83..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Logging/ListSinksResponse.php
+++ /dev/null
@@ -1,41 +0,0 @@
-nextPageToken = $nextPageToken;
-  }
-  public function getNextPageToken()
-  {
-    return $this->nextPageToken;
-  }
-  public function setSinks($sinks)
-  {
-    $this->sinks = $sinks;
-  }
-  public function getSinks()
-  {
-    return $this->sinks;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Logging/LogEntry.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Logging/LogEntry.php
deleted file mode 100644
index 8d92b5ff..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Logging/LogEntry.php
+++ /dev/null
@@ -1,142 +0,0 @@
-httpRequest = $httpRequest;
-  }
-  public function getHttpRequest()
-  {
-    return $this->httpRequest;
-  }
-  public function setInsertId($insertId)
-  {
-    $this->insertId = $insertId;
-  }
-  public function getInsertId()
-  {
-    return $this->insertId;
-  }
-  public function setJsonPayload($jsonPayload)
-  {
-    $this->jsonPayload = $jsonPayload;
-  }
-  public function getJsonPayload()
-  {
-    return $this->jsonPayload;
-  }
-  public function setLabels($labels)
-  {
-    $this->labels = $labels;
-  }
-  public function getLabels()
-  {
-    return $this->labels;
-  }
-  public function setLogName($logName)
-  {
-    $this->logName = $logName;
-  }
-  public function getLogName()
-  {
-    return $this->logName;
-  }
-  public function setOperation(Google_Service_Logging_LogEntryOperation $operation)
-  {
-    $this->operation = $operation;
-  }
-  public function getOperation()
-  {
-    return $this->operation;
-  }
-  public function setProtoPayload($protoPayload)
-  {
-    $this->protoPayload = $protoPayload;
-  }
-  public function getProtoPayload()
-  {
-    return $this->protoPayload;
-  }
-  public function setResource(Google_Service_Logging_MonitoredResource $resource)
-  {
-    $this->resource = $resource;
-  }
-  public function getResource()
-  {
-    return $this->resource;
-  }
-  public function setSeverity($severity)
-  {
-    $this->severity = $severity;
-  }
-  public function getSeverity()
-  {
-    return $this->severity;
-  }
-  public function setSourceLocation(Google_Service_Logging_LogEntrySourceLocation $sourceLocation)
-  {
-    $this->sourceLocation = $sourceLocation;
-  }
-  public function getSourceLocation()
-  {
-    return $this->sourceLocation;
-  }
-  public function setTextPayload($textPayload)
-  {
-    $this->textPayload = $textPayload;
-  }
-  public function getTextPayload()
-  {
-    return $this->textPayload;
-  }
-  public function setTimestamp($timestamp)
-  {
-    $this->timestamp = $timestamp;
-  }
-  public function getTimestamp()
-  {
-    return $this->timestamp;
-  }
-  public function setTrace($trace)
-  {
-    $this->trace = $trace;
-  }
-  public function getTrace()
-  {
-    return $this->trace;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Logging/LogEntryOperation.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Logging/LogEntryOperation.php
deleted file mode 100644
index 53879c17..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Logging/LogEntryOperation.php
+++ /dev/null
@@ -1,57 +0,0 @@
-first = $first;
-  }
-  public function getFirst()
-  {
-    return $this->first;
-  }
-  public function setId($id)
-  {
-    $this->id = $id;
-  }
-  public function getId()
-  {
-    return $this->id;
-  }
-  public function setLast($last)
-  {
-    $this->last = $last;
-  }
-  public function getLast()
-  {
-    return $this->last;
-  }
-  public function setProducer($producer)
-  {
-    $this->producer = $producer;
-  }
-  public function getProducer()
-  {
-    return $this->producer;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Logging/LogEntrySourceLocation.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Logging/LogEntrySourceLocation.php
deleted file mode 100644
index fa8f01ce..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Logging/LogEntrySourceLocation.php
+++ /dev/null
@@ -1,48 +0,0 @@
-file = $file;
-  }
-  public function getFile()
-  {
-    return $this->file;
-  }
-  public function setFunction($function)
-  {
-    $this->function = $function;
-  }
-  public function getFunction()
-  {
-    return $this->function;
-  }
-  public function setLine($line)
-  {
-    $this->line = $line;
-  }
-  public function getLine()
-  {
-    return $this->line;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Logging/LogLine.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Logging/LogLine.php
deleted file mode 100644
index 3b37e402..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Logging/LogLine.php
+++ /dev/null
@@ -1,58 +0,0 @@
-logMessage = $logMessage;
-  }
-  public function getLogMessage()
-  {
-    return $this->logMessage;
-  }
-  public function setSeverity($severity)
-  {
-    $this->severity = $severity;
-  }
-  public function getSeverity()
-  {
-    return $this->severity;
-  }
-  public function setSourceLocation(Google_Service_Logging_SourceLocation $sourceLocation)
-  {
-    $this->sourceLocation = $sourceLocation;
-  }
-  public function getSourceLocation()
-  {
-    return $this->sourceLocation;
-  }
-  public function setTime($time)
-  {
-    $this->time = $time;
-  }
-  public function getTime()
-  {
-    return $this->time;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Logging/LogMetric.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Logging/LogMetric.php
deleted file mode 100644
index 42213432..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Logging/LogMetric.php
+++ /dev/null
@@ -1,57 +0,0 @@
-description = $description;
-  }
-  public function getDescription()
-  {
-    return $this->description;
-  }
-  public function setFilter($filter)
-  {
-    $this->filter = $filter;
-  }
-  public function getFilter()
-  {
-    return $this->filter;
-  }
-  public function setName($name)
-  {
-    $this->name = $name;
-  }
-  public function getName()
-  {
-    return $this->name;
-  }
-  public function setVersion($version)
-  {
-    $this->version = $version;
-  }
-  public function getVersion()
-  {
-    return $this->version;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Logging/LogSink.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Logging/LogSink.php
deleted file mode 100644
index 2beb19da..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Logging/LogSink.php
+++ /dev/null
@@ -1,84 +0,0 @@
-destination = $destination;
-  }
-  public function getDestination()
-  {
-    return $this->destination;
-  }
-  public function setEndTime($endTime)
-  {
-    $this->endTime = $endTime;
-  }
-  public function getEndTime()
-  {
-    return $this->endTime;
-  }
-  public function setFilter($filter)
-  {
-    $this->filter = $filter;
-  }
-  public function getFilter()
-  {
-    return $this->filter;
-  }
-  public function setName($name)
-  {
-    $this->name = $name;
-  }
-  public function getName()
-  {
-    return $this->name;
-  }
-  public function setOutputVersionFormat($outputVersionFormat)
-  {
-    $this->outputVersionFormat = $outputVersionFormat;
-  }
-  public function getOutputVersionFormat()
-  {
-    return $this->outputVersionFormat;
-  }
-  public function setStartTime($startTime)
-  {
-    $this->startTime = $startTime;
-  }
-  public function getStartTime()
-  {
-    return $this->startTime;
-  }
-  public function setWriterIdentity($writerIdentity)
-  {
-    $this->writerIdentity = $writerIdentity;
-  }
-  public function getWriterIdentity()
-  {
-    return $this->writerIdentity;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Logging/LoggingEmpty.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Logging/LoggingEmpty.php
deleted file mode 100644
index e74cf7f3..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Logging/LoggingEmpty.php
+++ /dev/null
@@ -1,20 +0,0 @@
-labels = $labels;
-  }
-  public function getLabels()
-  {
-    return $this->labels;
-  }
-  public function setType($type)
-  {
-    $this->type = $type;
-  }
-  public function getType()
-  {
-    return $this->type;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Logging/MonitoredResourceDescriptor.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Logging/MonitoredResourceDescriptor.php
deleted file mode 100644
index e3df9370..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Logging/MonitoredResourceDescriptor.php
+++ /dev/null
@@ -1,68 +0,0 @@
-description = $description;
-  }
-  public function getDescription()
-  {
-    return $this->description;
-  }
-  public function setDisplayName($displayName)
-  {
-    $this->displayName = $displayName;
-  }
-  public function getDisplayName()
-  {
-    return $this->displayName;
-  }
-  public function setLabels($labels)
-  {
-    $this->labels = $labels;
-  }
-  public function getLabels()
-  {
-    return $this->labels;
-  }
-  public function setName($name)
-  {
-    $this->name = $name;
-  }
-  public function getName()
-  {
-    return $this->name;
-  }
-  public function setType($type)
-  {
-    $this->type = $type;
-  }
-  public function getType()
-  {
-    return $this->type;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Logging/RequestLog.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Logging/RequestLog.php
deleted file mode 100644
index e9cbdd6a..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Logging/RequestLog.php
+++ /dev/null
@@ -1,312 +0,0 @@
-appEngineRelease = $appEngineRelease;
-  }
-  public function getAppEngineRelease()
-  {
-    return $this->appEngineRelease;
-  }
-  public function setAppId($appId)
-  {
-    $this->appId = $appId;
-  }
-  public function getAppId()
-  {
-    return $this->appId;
-  }
-  public function setCost($cost)
-  {
-    $this->cost = $cost;
-  }
-  public function getCost()
-  {
-    return $this->cost;
-  }
-  public function setEndTime($endTime)
-  {
-    $this->endTime = $endTime;
-  }
-  public function getEndTime()
-  {
-    return $this->endTime;
-  }
-  public function setFinished($finished)
-  {
-    $this->finished = $finished;
-  }
-  public function getFinished()
-  {
-    return $this->finished;
-  }
-  public function setFirst($first)
-  {
-    $this->first = $first;
-  }
-  public function getFirst()
-  {
-    return $this->first;
-  }
-  public function setHost($host)
-  {
-    $this->host = $host;
-  }
-  public function getHost()
-  {
-    return $this->host;
-  }
-  public function setHttpVersion($httpVersion)
-  {
-    $this->httpVersion = $httpVersion;
-  }
-  public function getHttpVersion()
-  {
-    return $this->httpVersion;
-  }
-  public function setInstanceId($instanceId)
-  {
-    $this->instanceId = $instanceId;
-  }
-  public function getInstanceId()
-  {
-    return $this->instanceId;
-  }
-  public function setInstanceIndex($instanceIndex)
-  {
-    $this->instanceIndex = $instanceIndex;
-  }
-  public function getInstanceIndex()
-  {
-    return $this->instanceIndex;
-  }
-  public function setIp($ip)
-  {
-    $this->ip = $ip;
-  }
-  public function getIp()
-  {
-    return $this->ip;
-  }
-  public function setLatency($latency)
-  {
-    $this->latency = $latency;
-  }
-  public function getLatency()
-  {
-    return $this->latency;
-  }
-  public function setLine($line)
-  {
-    $this->line = $line;
-  }
-  public function getLine()
-  {
-    return $this->line;
-  }
-  public function setMegaCycles($megaCycles)
-  {
-    $this->megaCycles = $megaCycles;
-  }
-  public function getMegaCycles()
-  {
-    return $this->megaCycles;
-  }
-  public function setMethod($method)
-  {
-    $this->method = $method;
-  }
-  public function getMethod()
-  {
-    return $this->method;
-  }
-  public function setModuleId($moduleId)
-  {
-    $this->moduleId = $moduleId;
-  }
-  public function getModuleId()
-  {
-    return $this->moduleId;
-  }
-  public function setNickname($nickname)
-  {
-    $this->nickname = $nickname;
-  }
-  public function getNickname()
-  {
-    return $this->nickname;
-  }
-  public function setPendingTime($pendingTime)
-  {
-    $this->pendingTime = $pendingTime;
-  }
-  public function getPendingTime()
-  {
-    return $this->pendingTime;
-  }
-  public function setReferrer($referrer)
-  {
-    $this->referrer = $referrer;
-  }
-  public function getReferrer()
-  {
-    return $this->referrer;
-  }
-  public function setRequestId($requestId)
-  {
-    $this->requestId = $requestId;
-  }
-  public function getRequestId()
-  {
-    return $this->requestId;
-  }
-  public function setResource($resource)
-  {
-    $this->resource = $resource;
-  }
-  public function getResource()
-  {
-    return $this->resource;
-  }
-  public function setResponseSize($responseSize)
-  {
-    $this->responseSize = $responseSize;
-  }
-  public function getResponseSize()
-  {
-    return $this->responseSize;
-  }
-  public function setSourceReference($sourceReference)
-  {
-    $this->sourceReference = $sourceReference;
-  }
-  public function getSourceReference()
-  {
-    return $this->sourceReference;
-  }
-  public function setStartTime($startTime)
-  {
-    $this->startTime = $startTime;
-  }
-  public function getStartTime()
-  {
-    return $this->startTime;
-  }
-  public function setStatus($status)
-  {
-    $this->status = $status;
-  }
-  public function getStatus()
-  {
-    return $this->status;
-  }
-  public function setTaskName($taskName)
-  {
-    $this->taskName = $taskName;
-  }
-  public function getTaskName()
-  {
-    return $this->taskName;
-  }
-  public function setTaskQueueName($taskQueueName)
-  {
-    $this->taskQueueName = $taskQueueName;
-  }
-  public function getTaskQueueName()
-  {
-    return $this->taskQueueName;
-  }
-  public function setTraceId($traceId)
-  {
-    $this->traceId = $traceId;
-  }
-  public function getTraceId()
-  {
-    return $this->traceId;
-  }
-  public function setUrlMapEntry($urlMapEntry)
-  {
-    $this->urlMapEntry = $urlMapEntry;
-  }
-  public function getUrlMapEntry()
-  {
-    return $this->urlMapEntry;
-  }
-  public function setUserAgent($userAgent)
-  {
-    $this->userAgent = $userAgent;
-  }
-  public function getUserAgent()
-  {
-    return $this->userAgent;
-  }
-  public function setVersionId($versionId)
-  {
-    $this->versionId = $versionId;
-  }
-  public function getVersionId()
-  {
-    return $this->versionId;
-  }
-  public function setWasLoadingRequest($wasLoadingRequest)
-  {
-    $this->wasLoadingRequest = $wasLoadingRequest;
-  }
-  public function getWasLoadingRequest()
-  {
-    return $this->wasLoadingRequest;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Logging/Resource/BillingAccounts.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Logging/Resource/BillingAccounts.php
deleted file mode 100644
index 9a3d49ec..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Logging/Resource/BillingAccounts.php
+++ /dev/null
@@ -1,28 +0,0 @@
-
- *   $loggingService = new Google_Service_Logging(...);
- *   $billingAccounts = $loggingService->billingAccounts;
- *  
- */
-class Google_Service_Logging_Resource_BillingAccounts extends Google_Service_Resource
-{
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Logging/Resource/BillingAccountsLogs.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Logging/Resource/BillingAccountsLogs.php
deleted file mode 100644
index 90105a79..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Logging/Resource/BillingAccountsLogs.php
+++ /dev/null
@@ -1,74 +0,0 @@
-
- *   $loggingService = new Google_Service_Logging(...);
- *   $logs = $loggingService->logs;
- *  
- */
-class Google_Service_Logging_Resource_BillingAccountsLogs extends Google_Service_Resource
-{
-  /**
-   * Deletes all the log entries in a log. The log reappears if it receives new
-   * entries. Log entries written shortly before the delete operation might not be
-   * deleted. (logs.delete)
-   *
-   * @param string $logName Required. The resource name of the log to delete:
-   * "projects/[PROJECT_ID]/logs/[LOG_ID]"
-   * "organizations/[ORGANIZATION_ID]/logs/[LOG_ID]"
-   * "billingAccounts/[BILLING_ACCOUNT_ID]/logs/[LOG_ID]"
-   * "folders/[FOLDER_ID]/logs/[LOG_ID]" [LOG_ID] must be URL-encoded. For
-   * example, "projects/my-project-id/logs/syslog", "organizations/1234567890/logs
-   * /cloudresourcemanager.googleapis.com%2Factivity". For more information about
-   * log names, see LogEntry.
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Logging_LoggingEmpty
-   */
-  public function delete($logName, $optParams = array())
-  {
-    $params = array('logName' => $logName);
-    $params = array_merge($params, $optParams);
-    return $this->call('delete', array($params), "Google_Service_Logging_LoggingEmpty");
-  }
-  /**
-   * Lists the logs in projects, organizations, folders, or billing accounts. Only
-   * logs that have entries are listed. (logs.listBillingAccountsLogs)
-   *
-   * @param string $parent Required. The resource name that owns the logs:
-   * "projects/[PROJECT_ID]" "organizations/[ORGANIZATION_ID]"
-   * "billingAccounts/[BILLING_ACCOUNT_ID]" "folders/[FOLDER_ID]"
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param string pageToken Optional. If present, then retrieve the next
-   * batch of results from the preceding call to this method. pageToken must be
-   * the value of nextPageToken from the previous response. The values of other
-   * method parameters should be identical to those in the previous call.
-   * @opt_param int pageSize Optional. The maximum number of results to return
-   * from this request. Non-positive values are ignored. The presence of
-   * nextPageToken in the response indicates that more results might be available.
-   * @return Google_Service_Logging_ListLogsResponse
-   */
-  public function listBillingAccountsLogs($parent, $optParams = array())
-  {
-    $params = array('parent' => $parent);
-    $params = array_merge($params, $optParams);
-    return $this->call('list', array($params), "Google_Service_Logging_ListLogsResponse");
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Logging/Resource/BillingAccountsSinks.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Logging/Resource/BillingAccountsSinks.php
deleted file mode 100644
index a2bf7980..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Logging/Resource/BillingAccountsSinks.php
+++ /dev/null
@@ -1,155 +0,0 @@
-
- *   $loggingService = new Google_Service_Logging(...);
- *   $sinks = $loggingService->sinks;
- *  
- */
-class Google_Service_Logging_Resource_BillingAccountsSinks extends Google_Service_Resource
-{
-  /**
-   * Creates a sink that exports specified log entries to a destination. The
-   * export of newly-ingested log entries begins immediately, unless the current
-   * time is outside the sink's start and end times or the sink's writer_identity
-   * is not permitted to write to the destination. A sink can export log entries
-   * only from the resource owning the sink. (sinks.create)
-   *
-   * @param string $parent Required. The resource in which to create the sink:
-   * "projects/[PROJECT_ID]" "organizations/[ORGANIZATION_ID]"
-   * "billingAccounts/[BILLING_ACCOUNT_ID]" "folders/[FOLDER_ID]" Examples:
-   * "projects/my-logging-project", "organizations/123456789".
-   * @param Google_Service_Logging_LogSink $postBody
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param bool uniqueWriterIdentity Optional. Determines the kind of IAM
-   * identity returned as writer_identity in the new sink. If this value is
-   * omitted or set to false, and if the sink's parent is a project, then the
-   * value returned as writer_identity is the same group or service account used
-   * by Stackdriver Logging before the addition of writer identities to this API.
-   * The sink's destination must be in the same project as the sink itself.If this
-   * field is set to true, or if the sink is owned by a non-project resource such
-   * as an organization, then the value of writer_identity will be a unique
-   * service account used only for exports from the new sink. For more
-   * information, see writer_identity in LogSink.
-   * @return Google_Service_Logging_LogSink
-   */
-  public function create($parent, Google_Service_Logging_LogSink $postBody, $optParams = array())
-  {
-    $params = array('parent' => $parent, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('create', array($params), "Google_Service_Logging_LogSink");
-  }
-  /**
-   * Deletes a sink. If the sink has a unique writer_identity, then that service
-   * account is also deleted. (sinks.delete)
-   *
-   * @param string $sinkName Required. The full resource name of the sink to
-   * delete, including the parent resource and the sink identifier:
-   * "projects/[PROJECT_ID]/sinks/[SINK_ID]"
-   * "organizations/[ORGANIZATION_ID]/sinks/[SINK_ID]"
-   * "billingAccounts/[BILLING_ACCOUNT_ID]/sinks/[SINK_ID]"
-   * "folders/[FOLDER_ID]/sinks/[SINK_ID]" Example: "projects/my-project-id/sinks
-   * /my-sink-id".
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Logging_LoggingEmpty
-   */
-  public function delete($sinkName, $optParams = array())
-  {
-    $params = array('sinkName' => $sinkName);
-    $params = array_merge($params, $optParams);
-    return $this->call('delete', array($params), "Google_Service_Logging_LoggingEmpty");
-  }
-  /**
-   * Gets a sink. (sinks.get)
-   *
-   * @param string $sinkName Required. The resource name of the sink:
-   * "projects/[PROJECT_ID]/sinks/[SINK_ID]"
-   * "organizations/[ORGANIZATION_ID]/sinks/[SINK_ID]"
-   * "billingAccounts/[BILLING_ACCOUNT_ID]/sinks/[SINK_ID]"
-   * "folders/[FOLDER_ID]/sinks/[SINK_ID]" Example: "projects/my-project-id/sinks
-   * /my-sink-id".
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Logging_LogSink
-   */
-  public function get($sinkName, $optParams = array())
-  {
-    $params = array('sinkName' => $sinkName);
-    $params = array_merge($params, $optParams);
-    return $this->call('get', array($params), "Google_Service_Logging_LogSink");
-  }
-  /**
-   * Lists sinks. (sinks.listBillingAccountsSinks)
-   *
-   * @param string $parent Required. The parent resource whose sinks are to be
-   * listed: "projects/[PROJECT_ID]" "organizations/[ORGANIZATION_ID]"
-   * "billingAccounts/[BILLING_ACCOUNT_ID]" "folders/[FOLDER_ID]"
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param string pageToken Optional. If present, then retrieve the next
-   * batch of results from the preceding call to this method. pageToken must be
-   * the value of nextPageToken from the previous response. The values of other
-   * method parameters should be identical to those in the previous call.
-   * @opt_param int pageSize Optional. The maximum number of results to return
-   * from this request. Non-positive values are ignored. The presence of
-   * nextPageToken in the response indicates that more results might be available.
-   * @return Google_Service_Logging_ListSinksResponse
-   */
-  public function listBillingAccountsSinks($parent, $optParams = array())
-  {
-    $params = array('parent' => $parent);
-    $params = array_merge($params, $optParams);
-    return $this->call('list', array($params), "Google_Service_Logging_ListSinksResponse");
-  }
-  /**
-   * Updates a sink. If the named sink doesn't exist, then this method is
-   * identical to sinks.create. If the named sink does exist, then this method
-   * replaces the following fields in the existing sink with values from the new
-   * sink: destination, filter, output_version_format, start_time, and end_time.
-   * The updated filter might also have a new writer_identity; see the
-   * unique_writer_identity field. (sinks.update)
-   *
-   * @param string $sinkName Required. The full resource name of the sink to
-   * update, including the parent resource and the sink identifier:
-   * "projects/[PROJECT_ID]/sinks/[SINK_ID]"
-   * "organizations/[ORGANIZATION_ID]/sinks/[SINK_ID]"
-   * "billingAccounts/[BILLING_ACCOUNT_ID]/sinks/[SINK_ID]"
-   * "folders/[FOLDER_ID]/sinks/[SINK_ID]" Example: "projects/my-project-id/sinks
-   * /my-sink-id".
-   * @param Google_Service_Logging_LogSink $postBody
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param bool uniqueWriterIdentity Optional. See sinks.create for a
-   * description of this field. When updating a sink, the effect of this field on
-   * the value of writer_identity in the updated sink depends on both the old and
-   * new values of this field: If the old and new values of this field are both
-   * false or both true, then there is no change to the sink's writer_identity. If
-   * the old value is false and the new value is true, then writer_identity is
-   * changed to a unique service account. It is an error if the old value is true
-   * and the new value is false.
-   * @return Google_Service_Logging_LogSink
-   */
-  public function update($sinkName, Google_Service_Logging_LogSink $postBody, $optParams = array())
-  {
-    $params = array('sinkName' => $sinkName, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('update', array($params), "Google_Service_Logging_LogSink");
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Logging/Resource/Entries.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Logging/Resource/Entries.php
deleted file mode 100644
index f7984800..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Logging/Resource/Entries.php
+++ /dev/null
@@ -1,56 +0,0 @@
-
- *   $loggingService = new Google_Service_Logging(...);
- *   $entries = $loggingService->entries;
- *  
- */
-class Google_Service_Logging_Resource_Entries extends Google_Service_Resource
-{
-  /**
-   * Lists log entries. Use this method to retrieve log entries from Stackdriver
-   * Logging. For ways to export log entries, see Exporting Logs.
-   * (entries.listEntries)
-   *
-   * @param Google_Service_Logging_ListLogEntriesRequest $postBody
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Logging_ListLogEntriesResponse
-   */
-  public function listEntries(Google_Service_Logging_ListLogEntriesRequest $postBody, $optParams = array())
-  {
-    $params = array('postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('list', array($params), "Google_Service_Logging_ListLogEntriesResponse");
-  }
-  /**
-   * Writes log entries to Stackdriver Logging. (entries.write)
-   *
-   * @param Google_Service_Logging_WriteLogEntriesRequest $postBody
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Logging_WriteLogEntriesResponse
-   */
-  public function write(Google_Service_Logging_WriteLogEntriesRequest $postBody, $optParams = array())
-  {
-    $params = array('postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('write', array($params), "Google_Service_Logging_WriteLogEntriesResponse");
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Logging/Resource/Folders.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Logging/Resource/Folders.php
deleted file mode 100644
index e0949582..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Logging/Resource/Folders.php
+++ /dev/null
@@ -1,28 +0,0 @@
-
- *   $loggingService = new Google_Service_Logging(...);
- *   $folders = $loggingService->folders;
- *  
- */
-class Google_Service_Logging_Resource_Folders extends Google_Service_Resource
-{
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Logging/Resource/FoldersLogs.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Logging/Resource/FoldersLogs.php
deleted file mode 100644
index 2687daba..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Logging/Resource/FoldersLogs.php
+++ /dev/null
@@ -1,74 +0,0 @@
-
- *   $loggingService = new Google_Service_Logging(...);
- *   $logs = $loggingService->logs;
- *  
- */
-class Google_Service_Logging_Resource_FoldersLogs extends Google_Service_Resource
-{
-  /**
-   * Deletes all the log entries in a log. The log reappears if it receives new
-   * entries. Log entries written shortly before the delete operation might not be
-   * deleted. (logs.delete)
-   *
-   * @param string $logName Required. The resource name of the log to delete:
-   * "projects/[PROJECT_ID]/logs/[LOG_ID]"
-   * "organizations/[ORGANIZATION_ID]/logs/[LOG_ID]"
-   * "billingAccounts/[BILLING_ACCOUNT_ID]/logs/[LOG_ID]"
-   * "folders/[FOLDER_ID]/logs/[LOG_ID]" [LOG_ID] must be URL-encoded. For
-   * example, "projects/my-project-id/logs/syslog", "organizations/1234567890/logs
-   * /cloudresourcemanager.googleapis.com%2Factivity". For more information about
-   * log names, see LogEntry.
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Logging_LoggingEmpty
-   */
-  public function delete($logName, $optParams = array())
-  {
-    $params = array('logName' => $logName);
-    $params = array_merge($params, $optParams);
-    return $this->call('delete', array($params), "Google_Service_Logging_LoggingEmpty");
-  }
-  /**
-   * Lists the logs in projects, organizations, folders, or billing accounts. Only
-   * logs that have entries are listed. (logs.listFoldersLogs)
-   *
-   * @param string $parent Required. The resource name that owns the logs:
-   * "projects/[PROJECT_ID]" "organizations/[ORGANIZATION_ID]"
-   * "billingAccounts/[BILLING_ACCOUNT_ID]" "folders/[FOLDER_ID]"
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param string pageToken Optional. If present, then retrieve the next
-   * batch of results from the preceding call to this method. pageToken must be
-   * the value of nextPageToken from the previous response. The values of other
-   * method parameters should be identical to those in the previous call.
-   * @opt_param int pageSize Optional. The maximum number of results to return
-   * from this request. Non-positive values are ignored. The presence of
-   * nextPageToken in the response indicates that more results might be available.
-   * @return Google_Service_Logging_ListLogsResponse
-   */
-  public function listFoldersLogs($parent, $optParams = array())
-  {
-    $params = array('parent' => $parent);
-    $params = array_merge($params, $optParams);
-    return $this->call('list', array($params), "Google_Service_Logging_ListLogsResponse");
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Logging/Resource/FoldersSinks.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Logging/Resource/FoldersSinks.php
deleted file mode 100644
index aec5f660..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Logging/Resource/FoldersSinks.php
+++ /dev/null
@@ -1,155 +0,0 @@
-
- *   $loggingService = new Google_Service_Logging(...);
- *   $sinks = $loggingService->sinks;
- *  
- */
-class Google_Service_Logging_Resource_FoldersSinks extends Google_Service_Resource
-{
-  /**
-   * Creates a sink that exports specified log entries to a destination. The
-   * export of newly-ingested log entries begins immediately, unless the current
-   * time is outside the sink's start and end times or the sink's writer_identity
-   * is not permitted to write to the destination. A sink can export log entries
-   * only from the resource owning the sink. (sinks.create)
-   *
-   * @param string $parent Required. The resource in which to create the sink:
-   * "projects/[PROJECT_ID]" "organizations/[ORGANIZATION_ID]"
-   * "billingAccounts/[BILLING_ACCOUNT_ID]" "folders/[FOLDER_ID]" Examples:
-   * "projects/my-logging-project", "organizations/123456789".
-   * @param Google_Service_Logging_LogSink $postBody
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param bool uniqueWriterIdentity Optional. Determines the kind of IAM
-   * identity returned as writer_identity in the new sink. If this value is
-   * omitted or set to false, and if the sink's parent is a project, then the
-   * value returned as writer_identity is the same group or service account used
-   * by Stackdriver Logging before the addition of writer identities to this API.
-   * The sink's destination must be in the same project as the sink itself.If this
-   * field is set to true, or if the sink is owned by a non-project resource such
-   * as an organization, then the value of writer_identity will be a unique
-   * service account used only for exports from the new sink. For more
-   * information, see writer_identity in LogSink.
-   * @return Google_Service_Logging_LogSink
-   */
-  public function create($parent, Google_Service_Logging_LogSink $postBody, $optParams = array())
-  {
-    $params = array('parent' => $parent, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('create', array($params), "Google_Service_Logging_LogSink");
-  }
-  /**
-   * Deletes a sink. If the sink has a unique writer_identity, then that service
-   * account is also deleted. (sinks.delete)
-   *
-   * @param string $sinkName Required. The full resource name of the sink to
-   * delete, including the parent resource and the sink identifier:
-   * "projects/[PROJECT_ID]/sinks/[SINK_ID]"
-   * "organizations/[ORGANIZATION_ID]/sinks/[SINK_ID]"
-   * "billingAccounts/[BILLING_ACCOUNT_ID]/sinks/[SINK_ID]"
-   * "folders/[FOLDER_ID]/sinks/[SINK_ID]" Example: "projects/my-project-id/sinks
-   * /my-sink-id".
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Logging_LoggingEmpty
-   */
-  public function delete($sinkName, $optParams = array())
-  {
-    $params = array('sinkName' => $sinkName);
-    $params = array_merge($params, $optParams);
-    return $this->call('delete', array($params), "Google_Service_Logging_LoggingEmpty");
-  }
-  /**
-   * Gets a sink. (sinks.get)
-   *
-   * @param string $sinkName Required. The resource name of the sink:
-   * "projects/[PROJECT_ID]/sinks/[SINK_ID]"
-   * "organizations/[ORGANIZATION_ID]/sinks/[SINK_ID]"
-   * "billingAccounts/[BILLING_ACCOUNT_ID]/sinks/[SINK_ID]"
-   * "folders/[FOLDER_ID]/sinks/[SINK_ID]" Example: "projects/my-project-id/sinks
-   * /my-sink-id".
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Logging_LogSink
-   */
-  public function get($sinkName, $optParams = array())
-  {
-    $params = array('sinkName' => $sinkName);
-    $params = array_merge($params, $optParams);
-    return $this->call('get', array($params), "Google_Service_Logging_LogSink");
-  }
-  /**
-   * Lists sinks. (sinks.listFoldersSinks)
-   *
-   * @param string $parent Required. The parent resource whose sinks are to be
-   * listed: "projects/[PROJECT_ID]" "organizations/[ORGANIZATION_ID]"
-   * "billingAccounts/[BILLING_ACCOUNT_ID]" "folders/[FOLDER_ID]"
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param string pageToken Optional. If present, then retrieve the next
-   * batch of results from the preceding call to this method. pageToken must be
-   * the value of nextPageToken from the previous response. The values of other
-   * method parameters should be identical to those in the previous call.
-   * @opt_param int pageSize Optional. The maximum number of results to return
-   * from this request. Non-positive values are ignored. The presence of
-   * nextPageToken in the response indicates that more results might be available.
-   * @return Google_Service_Logging_ListSinksResponse
-   */
-  public function listFoldersSinks($parent, $optParams = array())
-  {
-    $params = array('parent' => $parent);
-    $params = array_merge($params, $optParams);
-    return $this->call('list', array($params), "Google_Service_Logging_ListSinksResponse");
-  }
-  /**
-   * Updates a sink. If the named sink doesn't exist, then this method is
-   * identical to sinks.create. If the named sink does exist, then this method
-   * replaces the following fields in the existing sink with values from the new
-   * sink: destination, filter, output_version_format, start_time, and end_time.
-   * The updated filter might also have a new writer_identity; see the
-   * unique_writer_identity field. (sinks.update)
-   *
-   * @param string $sinkName Required. The full resource name of the sink to
-   * update, including the parent resource and the sink identifier:
-   * "projects/[PROJECT_ID]/sinks/[SINK_ID]"
-   * "organizations/[ORGANIZATION_ID]/sinks/[SINK_ID]"
-   * "billingAccounts/[BILLING_ACCOUNT_ID]/sinks/[SINK_ID]"
-   * "folders/[FOLDER_ID]/sinks/[SINK_ID]" Example: "projects/my-project-id/sinks
-   * /my-sink-id".
-   * @param Google_Service_Logging_LogSink $postBody
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param bool uniqueWriterIdentity Optional. See sinks.create for a
-   * description of this field. When updating a sink, the effect of this field on
-   * the value of writer_identity in the updated sink depends on both the old and
-   * new values of this field: If the old and new values of this field are both
-   * false or both true, then there is no change to the sink's writer_identity. If
-   * the old value is false and the new value is true, then writer_identity is
-   * changed to a unique service account. It is an error if the old value is true
-   * and the new value is false.
-   * @return Google_Service_Logging_LogSink
-   */
-  public function update($sinkName, Google_Service_Logging_LogSink $postBody, $optParams = array())
-  {
-    $params = array('sinkName' => $sinkName, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('update', array($params), "Google_Service_Logging_LogSink");
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Logging/Resource/MonitoredResourceDescriptors.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Logging/Resource/MonitoredResourceDescriptors.php
deleted file mode 100644
index 3cb8643a..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Logging/Resource/MonitoredResourceDescriptors.php
+++ /dev/null
@@ -1,49 +0,0 @@
-
- *   $loggingService = new Google_Service_Logging(...);
- *   $monitoredResourceDescriptors = $loggingService->monitoredResourceDescriptors;
- *  
- */
-class Google_Service_Logging_Resource_MonitoredResourceDescriptors extends Google_Service_Resource
-{
-  /**
-   * Lists the descriptors for monitored resource types used by Stackdriver
-   * Logging. (monitoredResourceDescriptors.listMonitoredResourceDescriptors)
-   *
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param int pageSize Optional. The maximum number of results to return
-   * from this request. Non-positive values are ignored. The presence of
-   * nextPageToken in the response indicates that more results might be available.
-   * @opt_param string pageToken Optional. If present, then retrieve the next
-   * batch of results from the preceding call to this method. pageToken must be
-   * the value of nextPageToken from the previous response. The values of other
-   * method parameters should be identical to those in the previous call.
-   * @return Google_Service_Logging_ListMonitoredResourceDescriptorsResponse
-   */
-  public function listMonitoredResourceDescriptors($optParams = array())
-  {
-    $params = array();
-    $params = array_merge($params, $optParams);
-    return $this->call('list', array($params), "Google_Service_Logging_ListMonitoredResourceDescriptorsResponse");
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Logging/Resource/Organizations.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Logging/Resource/Organizations.php
deleted file mode 100644
index 016ced47..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Logging/Resource/Organizations.php
+++ /dev/null
@@ -1,28 +0,0 @@
-
- *   $loggingService = new Google_Service_Logging(...);
- *   $organizations = $loggingService->organizations;
- *  
- */
-class Google_Service_Logging_Resource_Organizations extends Google_Service_Resource
-{
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Logging/Resource/OrganizationsLogs.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Logging/Resource/OrganizationsLogs.php
deleted file mode 100644
index f02191a2..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Logging/Resource/OrganizationsLogs.php
+++ /dev/null
@@ -1,74 +0,0 @@
-
- *   $loggingService = new Google_Service_Logging(...);
- *   $logs = $loggingService->logs;
- *  
- */
-class Google_Service_Logging_Resource_OrganizationsLogs extends Google_Service_Resource
-{
-  /**
-   * Deletes all the log entries in a log. The log reappears if it receives new
-   * entries. Log entries written shortly before the delete operation might not be
-   * deleted. (logs.delete)
-   *
-   * @param string $logName Required. The resource name of the log to delete:
-   * "projects/[PROJECT_ID]/logs/[LOG_ID]"
-   * "organizations/[ORGANIZATION_ID]/logs/[LOG_ID]"
-   * "billingAccounts/[BILLING_ACCOUNT_ID]/logs/[LOG_ID]"
-   * "folders/[FOLDER_ID]/logs/[LOG_ID]" [LOG_ID] must be URL-encoded. For
-   * example, "projects/my-project-id/logs/syslog", "organizations/1234567890/logs
-   * /cloudresourcemanager.googleapis.com%2Factivity". For more information about
-   * log names, see LogEntry.
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Logging_LoggingEmpty
-   */
-  public function delete($logName, $optParams = array())
-  {
-    $params = array('logName' => $logName);
-    $params = array_merge($params, $optParams);
-    return $this->call('delete', array($params), "Google_Service_Logging_LoggingEmpty");
-  }
-  /**
-   * Lists the logs in projects, organizations, folders, or billing accounts. Only
-   * logs that have entries are listed. (logs.listOrganizationsLogs)
-   *
-   * @param string $parent Required. The resource name that owns the logs:
-   * "projects/[PROJECT_ID]" "organizations/[ORGANIZATION_ID]"
-   * "billingAccounts/[BILLING_ACCOUNT_ID]" "folders/[FOLDER_ID]"
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param string pageToken Optional. If present, then retrieve the next
-   * batch of results from the preceding call to this method. pageToken must be
-   * the value of nextPageToken from the previous response. The values of other
-   * method parameters should be identical to those in the previous call.
-   * @opt_param int pageSize Optional. The maximum number of results to return
-   * from this request. Non-positive values are ignored. The presence of
-   * nextPageToken in the response indicates that more results might be available.
-   * @return Google_Service_Logging_ListLogsResponse
-   */
-  public function listOrganizationsLogs($parent, $optParams = array())
-  {
-    $params = array('parent' => $parent);
-    $params = array_merge($params, $optParams);
-    return $this->call('list', array($params), "Google_Service_Logging_ListLogsResponse");
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Logging/Resource/OrganizationsSinks.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Logging/Resource/OrganizationsSinks.php
deleted file mode 100644
index 352d2f74..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Logging/Resource/OrganizationsSinks.php
+++ /dev/null
@@ -1,155 +0,0 @@
-
- *   $loggingService = new Google_Service_Logging(...);
- *   $sinks = $loggingService->sinks;
- *  
- */
-class Google_Service_Logging_Resource_OrganizationsSinks extends Google_Service_Resource
-{
-  /**
-   * Creates a sink that exports specified log entries to a destination. The
-   * export of newly-ingested log entries begins immediately, unless the current
-   * time is outside the sink's start and end times or the sink's writer_identity
-   * is not permitted to write to the destination. A sink can export log entries
-   * only from the resource owning the sink. (sinks.create)
-   *
-   * @param string $parent Required. The resource in which to create the sink:
-   * "projects/[PROJECT_ID]" "organizations/[ORGANIZATION_ID]"
-   * "billingAccounts/[BILLING_ACCOUNT_ID]" "folders/[FOLDER_ID]" Examples:
-   * "projects/my-logging-project", "organizations/123456789".
-   * @param Google_Service_Logging_LogSink $postBody
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param bool uniqueWriterIdentity Optional. Determines the kind of IAM
-   * identity returned as writer_identity in the new sink. If this value is
-   * omitted or set to false, and if the sink's parent is a project, then the
-   * value returned as writer_identity is the same group or service account used
-   * by Stackdriver Logging before the addition of writer identities to this API.
-   * The sink's destination must be in the same project as the sink itself.If this
-   * field is set to true, or if the sink is owned by a non-project resource such
-   * as an organization, then the value of writer_identity will be a unique
-   * service account used only for exports from the new sink. For more
-   * information, see writer_identity in LogSink.
-   * @return Google_Service_Logging_LogSink
-   */
-  public function create($parent, Google_Service_Logging_LogSink $postBody, $optParams = array())
-  {
-    $params = array('parent' => $parent, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('create', array($params), "Google_Service_Logging_LogSink");
-  }
-  /**
-   * Deletes a sink. If the sink has a unique writer_identity, then that service
-   * account is also deleted. (sinks.delete)
-   *
-   * @param string $sinkName Required. The full resource name of the sink to
-   * delete, including the parent resource and the sink identifier:
-   * "projects/[PROJECT_ID]/sinks/[SINK_ID]"
-   * "organizations/[ORGANIZATION_ID]/sinks/[SINK_ID]"
-   * "billingAccounts/[BILLING_ACCOUNT_ID]/sinks/[SINK_ID]"
-   * "folders/[FOLDER_ID]/sinks/[SINK_ID]" Example: "projects/my-project-id/sinks
-   * /my-sink-id".
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Logging_LoggingEmpty
-   */
-  public function delete($sinkName, $optParams = array())
-  {
-    $params = array('sinkName' => $sinkName);
-    $params = array_merge($params, $optParams);
-    return $this->call('delete', array($params), "Google_Service_Logging_LoggingEmpty");
-  }
-  /**
-   * Gets a sink. (sinks.get)
-   *
-   * @param string $sinkName Required. The resource name of the sink:
-   * "projects/[PROJECT_ID]/sinks/[SINK_ID]"
-   * "organizations/[ORGANIZATION_ID]/sinks/[SINK_ID]"
-   * "billingAccounts/[BILLING_ACCOUNT_ID]/sinks/[SINK_ID]"
-   * "folders/[FOLDER_ID]/sinks/[SINK_ID]" Example: "projects/my-project-id/sinks
-   * /my-sink-id".
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Logging_LogSink
-   */
-  public function get($sinkName, $optParams = array())
-  {
-    $params = array('sinkName' => $sinkName);
-    $params = array_merge($params, $optParams);
-    return $this->call('get', array($params), "Google_Service_Logging_LogSink");
-  }
-  /**
-   * Lists sinks. (sinks.listOrganizationsSinks)
-   *
-   * @param string $parent Required. The parent resource whose sinks are to be
-   * listed: "projects/[PROJECT_ID]" "organizations/[ORGANIZATION_ID]"
-   * "billingAccounts/[BILLING_ACCOUNT_ID]" "folders/[FOLDER_ID]"
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param string pageToken Optional. If present, then retrieve the next
-   * batch of results from the preceding call to this method. pageToken must be
-   * the value of nextPageToken from the previous response. The values of other
-   * method parameters should be identical to those in the previous call.
-   * @opt_param int pageSize Optional. The maximum number of results to return
-   * from this request. Non-positive values are ignored. The presence of
-   * nextPageToken in the response indicates that more results might be available.
-   * @return Google_Service_Logging_ListSinksResponse
-   */
-  public function listOrganizationsSinks($parent, $optParams = array())
-  {
-    $params = array('parent' => $parent);
-    $params = array_merge($params, $optParams);
-    return $this->call('list', array($params), "Google_Service_Logging_ListSinksResponse");
-  }
-  /**
-   * Updates a sink. If the named sink doesn't exist, then this method is
-   * identical to sinks.create. If the named sink does exist, then this method
-   * replaces the following fields in the existing sink with values from the new
-   * sink: destination, filter, output_version_format, start_time, and end_time.
-   * The updated filter might also have a new writer_identity; see the
-   * unique_writer_identity field. (sinks.update)
-   *
-   * @param string $sinkName Required. The full resource name of the sink to
-   * update, including the parent resource and the sink identifier:
-   * "projects/[PROJECT_ID]/sinks/[SINK_ID]"
-   * "organizations/[ORGANIZATION_ID]/sinks/[SINK_ID]"
-   * "billingAccounts/[BILLING_ACCOUNT_ID]/sinks/[SINK_ID]"
-   * "folders/[FOLDER_ID]/sinks/[SINK_ID]" Example: "projects/my-project-id/sinks
-   * /my-sink-id".
-   * @param Google_Service_Logging_LogSink $postBody
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param bool uniqueWriterIdentity Optional. See sinks.create for a
-   * description of this field. When updating a sink, the effect of this field on
-   * the value of writer_identity in the updated sink depends on both the old and
-   * new values of this field: If the old and new values of this field are both
-   * false or both true, then there is no change to the sink's writer_identity. If
-   * the old value is false and the new value is true, then writer_identity is
-   * changed to a unique service account. It is an error if the old value is true
-   * and the new value is false.
-   * @return Google_Service_Logging_LogSink
-   */
-  public function update($sinkName, Google_Service_Logging_LogSink $postBody, $optParams = array())
-  {
-    $params = array('sinkName' => $sinkName, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('update', array($params), "Google_Service_Logging_LogSink");
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Logging/Resource/Projects.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Logging/Resource/Projects.php
deleted file mode 100644
index 22dae1b2..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Logging/Resource/Projects.php
+++ /dev/null
@@ -1,28 +0,0 @@
-
- *   $loggingService = new Google_Service_Logging(...);
- *   $projects = $loggingService->projects;
- *  
- */
-class Google_Service_Logging_Resource_Projects extends Google_Service_Resource
-{
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Logging/Resource/ProjectsLogs.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Logging/Resource/ProjectsLogs.php
deleted file mode 100644
index d1bd323d..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Logging/Resource/ProjectsLogs.php
+++ /dev/null
@@ -1,74 +0,0 @@
-
- *   $loggingService = new Google_Service_Logging(...);
- *   $logs = $loggingService->logs;
- *  
- */
-class Google_Service_Logging_Resource_ProjectsLogs extends Google_Service_Resource
-{
-  /**
-   * Deletes all the log entries in a log. The log reappears if it receives new
-   * entries. Log entries written shortly before the delete operation might not be
-   * deleted. (logs.delete)
-   *
-   * @param string $logName Required. The resource name of the log to delete:
-   * "projects/[PROJECT_ID]/logs/[LOG_ID]"
-   * "organizations/[ORGANIZATION_ID]/logs/[LOG_ID]"
-   * "billingAccounts/[BILLING_ACCOUNT_ID]/logs/[LOG_ID]"
-   * "folders/[FOLDER_ID]/logs/[LOG_ID]" [LOG_ID] must be URL-encoded. For
-   * example, "projects/my-project-id/logs/syslog", "organizations/1234567890/logs
-   * /cloudresourcemanager.googleapis.com%2Factivity". For more information about
-   * log names, see LogEntry.
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Logging_LoggingEmpty
-   */
-  public function delete($logName, $optParams = array())
-  {
-    $params = array('logName' => $logName);
-    $params = array_merge($params, $optParams);
-    return $this->call('delete', array($params), "Google_Service_Logging_LoggingEmpty");
-  }
-  /**
-   * Lists the logs in projects, organizations, folders, or billing accounts. Only
-   * logs that have entries are listed. (logs.listProjectsLogs)
-   *
-   * @param string $parent Required. The resource name that owns the logs:
-   * "projects/[PROJECT_ID]" "organizations/[ORGANIZATION_ID]"
-   * "billingAccounts/[BILLING_ACCOUNT_ID]" "folders/[FOLDER_ID]"
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param int pageSize Optional. The maximum number of results to return
-   * from this request. Non-positive values are ignored. The presence of
-   * nextPageToken in the response indicates that more results might be available.
-   * @opt_param string pageToken Optional. If present, then retrieve the next
-   * batch of results from the preceding call to this method. pageToken must be
-   * the value of nextPageToken from the previous response. The values of other
-   * method parameters should be identical to those in the previous call.
-   * @return Google_Service_Logging_ListLogsResponse
-   */
-  public function listProjectsLogs($parent, $optParams = array())
-  {
-    $params = array('parent' => $parent);
-    $params = array_merge($params, $optParams);
-    return $this->call('list', array($params), "Google_Service_Logging_ListLogsResponse");
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Logging/Resource/ProjectsMetrics.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Logging/Resource/ProjectsMetrics.php
deleted file mode 100644
index b0919d84..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Logging/Resource/ProjectsMetrics.php
+++ /dev/null
@@ -1,111 +0,0 @@
-
- *   $loggingService = new Google_Service_Logging(...);
- *   $metrics = $loggingService->metrics;
- *  
- */
-class Google_Service_Logging_Resource_ProjectsMetrics extends Google_Service_Resource
-{
-  /**
-   * Creates a logs-based metric. (metrics.create)
-   *
-   * @param string $parent The resource name of the project in which to create the
-   * metric: "projects/[PROJECT_ID]" The new metric must be provided in the
-   * request.
-   * @param Google_Service_Logging_LogMetric $postBody
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Logging_LogMetric
-   */
-  public function create($parent, Google_Service_Logging_LogMetric $postBody, $optParams = array())
-  {
-    $params = array('parent' => $parent, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('create', array($params), "Google_Service_Logging_LogMetric");
-  }
-  /**
-   * Deletes a logs-based metric. (metrics.delete)
-   *
-   * @param string $metricName The resource name of the metric to delete:
-   * "projects/[PROJECT_ID]/metrics/[METRIC_ID]"
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Logging_LoggingEmpty
-   */
-  public function delete($metricName, $optParams = array())
-  {
-    $params = array('metricName' => $metricName);
-    $params = array_merge($params, $optParams);
-    return $this->call('delete', array($params), "Google_Service_Logging_LoggingEmpty");
-  }
-  /**
-   * Gets a logs-based metric. (metrics.get)
-   *
-   * @param string $metricName The resource name of the desired metric:
-   * "projects/[PROJECT_ID]/metrics/[METRIC_ID]"
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Logging_LogMetric
-   */
-  public function get($metricName, $optParams = array())
-  {
-    $params = array('metricName' => $metricName);
-    $params = array_merge($params, $optParams);
-    return $this->call('get', array($params), "Google_Service_Logging_LogMetric");
-  }
-  /**
-   * Lists logs-based metrics. (metrics.listProjectsMetrics)
-   *
-   * @param string $parent Required. The name of the project containing the
-   * metrics: "projects/[PROJECT_ID]"
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param string pageToken Optional. If present, then retrieve the next
-   * batch of results from the preceding call to this method. pageToken must be
-   * the value of nextPageToken from the previous response. The values of other
-   * method parameters should be identical to those in the previous call.
-   * @opt_param int pageSize Optional. The maximum number of results to return
-   * from this request. Non-positive values are ignored. The presence of
-   * nextPageToken in the response indicates that more results might be available.
-   * @return Google_Service_Logging_ListLogMetricsResponse
-   */
-  public function listProjectsMetrics($parent, $optParams = array())
-  {
-    $params = array('parent' => $parent);
-    $params = array_merge($params, $optParams);
-    return $this->call('list', array($params), "Google_Service_Logging_ListLogMetricsResponse");
-  }
-  /**
-   * Creates or updates a logs-based metric. (metrics.update)
-   *
-   * @param string $metricName The resource name of the metric to update:
-   * "projects/[PROJECT_ID]/metrics/[METRIC_ID]" The updated metric must be
-   * provided in the request and it's name field must be the same as [METRIC_ID]
-   * If the metric does not exist in [PROJECT_ID], then a new metric is created.
-   * @param Google_Service_Logging_LogMetric $postBody
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Logging_LogMetric
-   */
-  public function update($metricName, Google_Service_Logging_LogMetric $postBody, $optParams = array())
-  {
-    $params = array('metricName' => $metricName, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('update', array($params), "Google_Service_Logging_LogMetric");
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Logging/Resource/ProjectsSinks.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Logging/Resource/ProjectsSinks.php
deleted file mode 100644
index 653c03ce..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Logging/Resource/ProjectsSinks.php
+++ /dev/null
@@ -1,155 +0,0 @@
-
- *   $loggingService = new Google_Service_Logging(...);
- *   $sinks = $loggingService->sinks;
- *  
- */
-class Google_Service_Logging_Resource_ProjectsSinks extends Google_Service_Resource
-{
-  /**
-   * Creates a sink that exports specified log entries to a destination. The
-   * export of newly-ingested log entries begins immediately, unless the current
-   * time is outside the sink's start and end times or the sink's writer_identity
-   * is not permitted to write to the destination. A sink can export log entries
-   * only from the resource owning the sink. (sinks.create)
-   *
-   * @param string $parent Required. The resource in which to create the sink:
-   * "projects/[PROJECT_ID]" "organizations/[ORGANIZATION_ID]"
-   * "billingAccounts/[BILLING_ACCOUNT_ID]" "folders/[FOLDER_ID]" Examples:
-   * "projects/my-logging-project", "organizations/123456789".
-   * @param Google_Service_Logging_LogSink $postBody
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param bool uniqueWriterIdentity Optional. Determines the kind of IAM
-   * identity returned as writer_identity in the new sink. If this value is
-   * omitted or set to false, and if the sink's parent is a project, then the
-   * value returned as writer_identity is the same group or service account used
-   * by Stackdriver Logging before the addition of writer identities to this API.
-   * The sink's destination must be in the same project as the sink itself.If this
-   * field is set to true, or if the sink is owned by a non-project resource such
-   * as an organization, then the value of writer_identity will be a unique
-   * service account used only for exports from the new sink. For more
-   * information, see writer_identity in LogSink.
-   * @return Google_Service_Logging_LogSink
-   */
-  public function create($parent, Google_Service_Logging_LogSink $postBody, $optParams = array())
-  {
-    $params = array('parent' => $parent, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('create', array($params), "Google_Service_Logging_LogSink");
-  }
-  /**
-   * Deletes a sink. If the sink has a unique writer_identity, then that service
-   * account is also deleted. (sinks.delete)
-   *
-   * @param string $sinkName Required. The full resource name of the sink to
-   * delete, including the parent resource and the sink identifier:
-   * "projects/[PROJECT_ID]/sinks/[SINK_ID]"
-   * "organizations/[ORGANIZATION_ID]/sinks/[SINK_ID]"
-   * "billingAccounts/[BILLING_ACCOUNT_ID]/sinks/[SINK_ID]"
-   * "folders/[FOLDER_ID]/sinks/[SINK_ID]" Example: "projects/my-project-id/sinks
-   * /my-sink-id".
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Logging_LoggingEmpty
-   */
-  public function delete($sinkName, $optParams = array())
-  {
-    $params = array('sinkName' => $sinkName);
-    $params = array_merge($params, $optParams);
-    return $this->call('delete', array($params), "Google_Service_Logging_LoggingEmpty");
-  }
-  /**
-   * Gets a sink. (sinks.get)
-   *
-   * @param string $sinkName Required. The resource name of the sink:
-   * "projects/[PROJECT_ID]/sinks/[SINK_ID]"
-   * "organizations/[ORGANIZATION_ID]/sinks/[SINK_ID]"
-   * "billingAccounts/[BILLING_ACCOUNT_ID]/sinks/[SINK_ID]"
-   * "folders/[FOLDER_ID]/sinks/[SINK_ID]" Example: "projects/my-project-id/sinks
-   * /my-sink-id".
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Logging_LogSink
-   */
-  public function get($sinkName, $optParams = array())
-  {
-    $params = array('sinkName' => $sinkName);
-    $params = array_merge($params, $optParams);
-    return $this->call('get', array($params), "Google_Service_Logging_LogSink");
-  }
-  /**
-   * Lists sinks. (sinks.listProjectsSinks)
-   *
-   * @param string $parent Required. The parent resource whose sinks are to be
-   * listed: "projects/[PROJECT_ID]" "organizations/[ORGANIZATION_ID]"
-   * "billingAccounts/[BILLING_ACCOUNT_ID]" "folders/[FOLDER_ID]"
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param string pageToken Optional. If present, then retrieve the next
-   * batch of results from the preceding call to this method. pageToken must be
-   * the value of nextPageToken from the previous response. The values of other
-   * method parameters should be identical to those in the previous call.
-   * @opt_param int pageSize Optional. The maximum number of results to return
-   * from this request. Non-positive values are ignored. The presence of
-   * nextPageToken in the response indicates that more results might be available.
-   * @return Google_Service_Logging_ListSinksResponse
-   */
-  public function listProjectsSinks($parent, $optParams = array())
-  {
-    $params = array('parent' => $parent);
-    $params = array_merge($params, $optParams);
-    return $this->call('list', array($params), "Google_Service_Logging_ListSinksResponse");
-  }
-  /**
-   * Updates a sink. If the named sink doesn't exist, then this method is
-   * identical to sinks.create. If the named sink does exist, then this method
-   * replaces the following fields in the existing sink with values from the new
-   * sink: destination, filter, output_version_format, start_time, and end_time.
-   * The updated filter might also have a new writer_identity; see the
-   * unique_writer_identity field. (sinks.update)
-   *
-   * @param string $sinkName Required. The full resource name of the sink to
-   * update, including the parent resource and the sink identifier:
-   * "projects/[PROJECT_ID]/sinks/[SINK_ID]"
-   * "organizations/[ORGANIZATION_ID]/sinks/[SINK_ID]"
-   * "billingAccounts/[BILLING_ACCOUNT_ID]/sinks/[SINK_ID]"
-   * "folders/[FOLDER_ID]/sinks/[SINK_ID]" Example: "projects/my-project-id/sinks
-   * /my-sink-id".
-   * @param Google_Service_Logging_LogSink $postBody
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param bool uniqueWriterIdentity Optional. See sinks.create for a
-   * description of this field. When updating a sink, the effect of this field on
-   * the value of writer_identity in the updated sink depends on both the old and
-   * new values of this field: If the old and new values of this field are both
-   * false or both true, then there is no change to the sink's writer_identity. If
-   * the old value is false and the new value is true, then writer_identity is
-   * changed to a unique service account. It is an error if the old value is true
-   * and the new value is false.
-   * @return Google_Service_Logging_LogSink
-   */
-  public function update($sinkName, Google_Service_Logging_LogSink $postBody, $optParams = array())
-  {
-    $params = array('sinkName' => $sinkName, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('update', array($params), "Google_Service_Logging_LogSink");
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Logging/SourceLocation.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Logging/SourceLocation.php
deleted file mode 100644
index 7a61f8e8..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Logging/SourceLocation.php
+++ /dev/null
@@ -1,48 +0,0 @@
-file = $file;
-  }
-  public function getFile()
-  {
-    return $this->file;
-  }
-  public function setFunctionName($functionName)
-  {
-    $this->functionName = $functionName;
-  }
-  public function getFunctionName()
-  {
-    return $this->functionName;
-  }
-  public function setLine($line)
-  {
-    $this->line = $line;
-  }
-  public function getLine()
-  {
-    return $this->line;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Logging/SourceReference.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Logging/SourceReference.php
deleted file mode 100644
index ec61ebb6..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Logging/SourceReference.php
+++ /dev/null
@@ -1,39 +0,0 @@
-repository = $repository;
-  }
-  public function getRepository()
-  {
-    return $this->repository;
-  }
-  public function setRevisionId($revisionId)
-  {
-    $this->revisionId = $revisionId;
-  }
-  public function getRevisionId()
-  {
-    return $this->revisionId;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Logging/Status.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Logging/Status.php
deleted file mode 100644
index 07f225a4..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Logging/Status.php
+++ /dev/null
@@ -1,49 +0,0 @@
-code = $code;
-  }
-  public function getCode()
-  {
-    return $this->code;
-  }
-  public function setDetails($details)
-  {
-    $this->details = $details;
-  }
-  public function getDetails()
-  {
-    return $this->details;
-  }
-  public function setMessage($message)
-  {
-    $this->message = $message;
-  }
-  public function getMessage()
-  {
-    return $this->message;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Logging/WriteLogEntriesRequest.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Logging/WriteLogEntriesRequest.php
deleted file mode 100644
index ca6a4000..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Logging/WriteLogEntriesRequest.php
+++ /dev/null
@@ -1,69 +0,0 @@
-entries = $entries;
-  }
-  public function getEntries()
-  {
-    return $this->entries;
-  }
-  public function setLabels($labels)
-  {
-    $this->labels = $labels;
-  }
-  public function getLabels()
-  {
-    return $this->labels;
-  }
-  public function setLogName($logName)
-  {
-    $this->logName = $logName;
-  }
-  public function getLogName()
-  {
-    return $this->logName;
-  }
-  public function setPartialSuccess($partialSuccess)
-  {
-    $this->partialSuccess = $partialSuccess;
-  }
-  public function getPartialSuccess()
-  {
-    return $this->partialSuccess;
-  }
-  public function setResource(Google_Service_Logging_MonitoredResource $resource)
-  {
-    $this->resource = $resource;
-  }
-  public function getResource()
-  {
-    return $this->resource;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Logging/WriteLogEntriesResponse.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Logging/WriteLogEntriesResponse.php
deleted file mode 100644
index 1cda65d9..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Logging/WriteLogEntriesResponse.php
+++ /dev/null
@@ -1,20 +0,0 @@
-
- * The Deployment Manager API allows users to declaratively configure, deploy
- * and run complex solutions on the Google Cloud Platform.

- *
- * 

- * For more information about this service, see the API
- * Documentation
- * 

- *
- * @author Google, Inc.
- */
-class Google_Service_Manager extends Google_Service
-{
-  /** View and manage your applications deployed on Google App Engine. */
-  const APPENGINE_ADMIN =
-      "https://www.googleapis.com/auth/appengine.admin";
-  /** View and manage your data across Google Cloud Platform services. */
-  const CLOUD_PLATFORM =
-      "https://www.googleapis.com/auth/cloud-platform";
-  /** View your data across Google Cloud Platform services. */
-  const CLOUD_PLATFORM_READ_ONLY =
-      "https://www.googleapis.com/auth/cloud-platform.read-only";
-  /** View and manage your Google Compute Engine resources. */
-  const COMPUTE =
-      "https://www.googleapis.com/auth/compute";
-  /** Manage your data in Google Cloud Storage. */
-  const DEVSTORAGE_READ_WRITE =
-      "https://www.googleapis.com/auth/devstorage.read_write";
-  /** View and manage your Google Cloud Platform management resources and deployment status information. */
-  const NDEV_CLOUDMAN =
-      "https://www.googleapis.com/auth/ndev.cloudman";
-  /** View your Google Cloud Platform management resources and deployment status information. */
-  const NDEV_CLOUDMAN_READONLY =
-      "https://www.googleapis.com/auth/ndev.cloudman.readonly";
-
-  public $deployments;
-  public $templates;
-  
-  /**
-   * Constructs the internal representation of the Manager service.
-   *
-   * @param Google_Client $client
-   */
-  public function __construct(Google_Client $client)
-  {
-    parent::__construct($client);
-    $this->rootUrl = 'https://www.googleapis.com/';
-    $this->servicePath = 'manager/v1beta2/projects/';
-    $this->version = 'v1beta2';
-    $this->serviceName = 'manager';
-
-    $this->deployments = new Google_Service_Manager_DeploymentsResource(
-        $this,
-        $this->serviceName,
-        'deployments',
-        array(
-          'methods' => array(
-            'delete' => array(
-              'path' => '{projectId}/regions/{region}/deployments/{deploymentName}',
-              'httpMethod' => 'DELETE',
-              'parameters' => array(
-                'projectId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'region' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'deploymentName' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'get' => array(
-              'path' => '{projectId}/regions/{region}/deployments/{deploymentName}',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'projectId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'region' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'deploymentName' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'insert' => array(
-              'path' => '{projectId}/regions/{region}/deployments',
-              'httpMethod' => 'POST',
-              'parameters' => array(
-                'projectId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'region' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'list' => array(
-              'path' => '{projectId}/regions/{region}/deployments',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'projectId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'region' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'maxResults' => array(
-                  'location' => 'query',
-                  'type' => 'integer',
-                ),
-                'pageToken' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-              ),
-            ),
-          )
-        )
-    );
-    $this->templates = new Google_Service_Manager_TemplatesResource(
-        $this,
-        $this->serviceName,
-        'templates',
-        array(
-          'methods' => array(
-            'delete' => array(
-              'path' => '{projectId}/templates/{templateName}',
-              'httpMethod' => 'DELETE',
-              'parameters' => array(
-                'projectId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'templateName' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'get' => array(
-              'path' => '{projectId}/templates/{templateName}',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'projectId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'templateName' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'insert' => array(
-              'path' => '{projectId}/templates',
-              'httpMethod' => 'POST',
-              'parameters' => array(
-                'projectId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'list' => array(
-              'path' => '{projectId}/templates',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'projectId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'maxResults' => array(
-                  'location' => 'query',
-                  'type' => 'integer',
-                ),
-                'pageToken' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-              ),
-            ),
-          )
-        )
-    );
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Manager/AccessConfig.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Manager/AccessConfig.php
deleted file mode 100644
index 23923afc..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Manager/AccessConfig.php
+++ /dev/null
@@ -1,48 +0,0 @@
-name = $name;
-  }
-  public function getName()
-  {
-    return $this->name;
-  }
-  public function setNatIp($natIp)
-  {
-    $this->natIp = $natIp;
-  }
-  public function getNatIp()
-  {
-    return $this->natIp;
-  }
-  public function setType($type)
-  {
-    $this->type = $type;
-  }
-  public function getType()
-  {
-    return $this->type;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Manager/Action.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Manager/Action.php
deleted file mode 100644
index 96ff2a02..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Manager/Action.php
+++ /dev/null
@@ -1,40 +0,0 @@
-commands = $commands;
-  }
-  public function getCommands()
-  {
-    return $this->commands;
-  }
-  public function setTimeoutMs($timeoutMs)
-  {
-    $this->timeoutMs = $timeoutMs;
-  }
-  public function getTimeoutMs()
-  {
-    return $this->timeoutMs;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Manager/AllowedRule.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Manager/AllowedRule.php
deleted file mode 100644
index 913a2dd8..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Manager/AllowedRule.php
+++ /dev/null
@@ -1,43 +0,0 @@
- "IPProtocol",
-  );
-  public $iPProtocol;
-  public $ports;
-
-  public function setIPProtocol($iPProtocol)
-  {
-    $this->iPProtocol = $iPProtocol;
-  }
-  public function getIPProtocol()
-  {
-    return $this->iPProtocol;
-  }
-  public function setPorts($ports)
-  {
-    $this->ports = $ports;
-  }
-  public function getPorts()
-  {
-    return $this->ports;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Manager/AutoscalingModule.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Manager/AutoscalingModule.php
deleted file mode 100644
index 2eb8df7b..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Manager/AutoscalingModule.php
+++ /dev/null
@@ -1,84 +0,0 @@
-coolDownPeriodSec = $coolDownPeriodSec;
-  }
-  public function getCoolDownPeriodSec()
-  {
-    return $this->coolDownPeriodSec;
-  }
-  public function setDescription($description)
-  {
-    $this->description = $description;
-  }
-  public function getDescription()
-  {
-    return $this->description;
-  }
-  public function setMaxNumReplicas($maxNumReplicas)
-  {
-    $this->maxNumReplicas = $maxNumReplicas;
-  }
-  public function getMaxNumReplicas()
-  {
-    return $this->maxNumReplicas;
-  }
-  public function setMinNumReplicas($minNumReplicas)
-  {
-    $this->minNumReplicas = $minNumReplicas;
-  }
-  public function getMinNumReplicas()
-  {
-    return $this->minNumReplicas;
-  }
-  public function setSignalType($signalType)
-  {
-    $this->signalType = $signalType;
-  }
-  public function getSignalType()
-  {
-    return $this->signalType;
-  }
-  public function setTargetModule($targetModule)
-  {
-    $this->targetModule = $targetModule;
-  }
-  public function getTargetModule()
-  {
-    return $this->targetModule;
-  }
-  public function setTargetUtilization($targetUtilization)
-  {
-    $this->targetUtilization = $targetUtilization;
-  }
-  public function getTargetUtilization()
-  {
-    return $this->targetUtilization;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Manager/AutoscalingModuleStatus.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Manager/AutoscalingModuleStatus.php
deleted file mode 100644
index 4c778240..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Manager/AutoscalingModuleStatus.php
+++ /dev/null
@@ -1,30 +0,0 @@
-autoscalingConfigUrl = $autoscalingConfigUrl;
-  }
-  public function getAutoscalingConfigUrl()
-  {
-    return $this->autoscalingConfigUrl;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Manager/DeployState.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Manager/DeployState.php
deleted file mode 100644
index abdc1837..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Manager/DeployState.php
+++ /dev/null
@@ -1,39 +0,0 @@
-details = $details;
-  }
-  public function getDetails()
-  {
-    return $this->details;
-  }
-  public function setStatus($status)
-  {
-    $this->status = $status;
-  }
-  public function getStatus()
-  {
-    return $this->status;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Manager/Deployment.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Manager/Deployment.php
deleted file mode 100644
index 88cff021..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Manager/Deployment.php
+++ /dev/null
@@ -1,88 +0,0 @@
-creationDate = $creationDate;
-  }
-  public function getCreationDate()
-  {
-    return $this->creationDate;
-  }
-  public function setDescription($description)
-  {
-    $this->description = $description;
-  }
-  public function getDescription()
-  {
-    return $this->description;
-  }
-  public function setModules($modules)
-  {
-    $this->modules = $modules;
-  }
-  public function getModules()
-  {
-    return $this->modules;
-  }
-  public function setName($name)
-  {
-    $this->name = $name;
-  }
-  public function getName()
-  {
-    return $this->name;
-  }
-  public function setOverrides($overrides)
-  {
-    $this->overrides = $overrides;
-  }
-  public function getOverrides()
-  {
-    return $this->overrides;
-  }
-  public function setState(Google_Service_Manager_DeployState $state)
-  {
-    $this->state = $state;
-  }
-  public function getState()
-  {
-    return $this->state;
-  }
-  public function setTemplateName($templateName)
-  {
-    $this->templateName = $templateName;
-  }
-  public function getTemplateName()
-  {
-    return $this->templateName;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Manager/DeploymentsListResponse.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Manager/DeploymentsListResponse.php
deleted file mode 100644
index bd16e823..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Manager/DeploymentsListResponse.php
+++ /dev/null
@@ -1,41 +0,0 @@
-nextPageToken = $nextPageToken;
-  }
-  public function getNextPageToken()
-  {
-    return $this->nextPageToken;
-  }
-  public function setResources($resources)
-  {
-    $this->resources = $resources;
-  }
-  public function getResources()
-  {
-    return $this->resources;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Manager/DeploymentsResource.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Manager/DeploymentsResource.php
deleted file mode 100644
index 7f9abcd0..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Manager/DeploymentsResource.php
+++ /dev/null
@@ -1,92 +0,0 @@
-
- *   $managerService = new Google_Service_Manager(...);
- *   $deployments = $managerService->deployments;
- *  
- */
-class Google_Service_Manager_DeploymentsResource extends Google_Service_Resource
-{
-  /**
-   * (deployments.delete)
-   *
-   * @param string $projectId
-   * @param string $region
-   * @param string $deploymentName
-   * @param array $optParams Optional parameters.
-   */
-  public function delete($projectId, $region, $deploymentName, $optParams = array())
-  {
-    $params = array('projectId' => $projectId, 'region' => $region, 'deploymentName' => $deploymentName);
-    $params = array_merge($params, $optParams);
-    return $this->call('delete', array($params));
-  }
-  /**
-   * (deployments.get)
-   *
-   * @param string $projectId
-   * @param string $region
-   * @param string $deploymentName
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Deployment
-   */
-  public function get($projectId, $region, $deploymentName, $optParams = array())
-  {
-    $params = array('projectId' => $projectId, 'region' => $region, 'deploymentName' => $deploymentName);
-    $params = array_merge($params, $optParams);
-    return $this->call('get', array($params), "Google_Service_Manager_Deployment");
-  }
-  /**
-   * (deployments.insert)
-   *
-   * @param string $projectId
-   * @param string $region
-   * @param Google_Deployment $postBody
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Deployment
-   */
-  public function insert($projectId, $region, Google_Service_Manager_Deployment $postBody, $optParams = array())
-  {
-    $params = array('projectId' => $projectId, 'region' => $region, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('insert', array($params), "Google_Service_Manager_Deployment");
-  }
-  /**
-   * (deployments.listDeployments)
-   *
-   * @param string $projectId
-   * @param string $region
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param int maxResults Maximum count of results to be returned. Acceptable
-   * values are 0 to 100, inclusive. (Default: 50)
-   * @opt_param string pageToken Specifies a nextPageToken returned by a previous
-   * list request. This token can be used to request the next page of results from
-   * a previous list request.
-   * @return Google_Service_DeploymentsListResponse
-   */
-  public function listDeployments($projectId, $region, $optParams = array())
-  {
-    $params = array('projectId' => $projectId, 'region' => $region);
-    $params = array_merge($params, $optParams);
-    return $this->call('list', array($params), "Google_Service_Manager_DeploymentsListResponse");
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Manager/DiskAttachment.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Manager/DiskAttachment.php
deleted file mode 100644
index 53f0fb20..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Manager/DiskAttachment.php
+++ /dev/null
@@ -1,39 +0,0 @@
-deviceName = $deviceName;
-  }
-  public function getDeviceName()
-  {
-    return $this->deviceName;
-  }
-  public function setIndex($index)
-  {
-    $this->index = $index;
-  }
-  public function getIndex()
-  {
-    return $this->index;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Manager/EnvVariable.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Manager/EnvVariable.php
deleted file mode 100644
index e14a4953..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Manager/EnvVariable.php
+++ /dev/null
@@ -1,39 +0,0 @@
-hidden = $hidden;
-  }
-  public function getHidden()
-  {
-    return $this->hidden;
-  }
-  public function setValue($value)
-  {
-    $this->value = $value;
-  }
-  public function getValue()
-  {
-    return $this->value;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Manager/ExistingDisk.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Manager/ExistingDisk.php
deleted file mode 100644
index ef06866d..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Manager/ExistingDisk.php
+++ /dev/null
@@ -1,40 +0,0 @@
-attachment = $attachment;
-  }
-  public function getAttachment()
-  {
-    return $this->attachment;
-  }
-  public function setSource($source)
-  {
-    $this->source = $source;
-  }
-  public function getSource()
-  {
-    return $this->source;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Manager/FirewallModule.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Manager/FirewallModule.php
deleted file mode 100644
index dd53903a..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Manager/FirewallModule.php
+++ /dev/null
@@ -1,77 +0,0 @@
-allowed = $allowed;
-  }
-  public function getAllowed()
-  {
-    return $this->allowed;
-  }
-  public function setDescription($description)
-  {
-    $this->description = $description;
-  }
-  public function getDescription()
-  {
-    return $this->description;
-  }
-  public function setNetwork($network)
-  {
-    $this->network = $network;
-  }
-  public function getNetwork()
-  {
-    return $this->network;
-  }
-  public function setSourceRanges($sourceRanges)
-  {
-    $this->sourceRanges = $sourceRanges;
-  }
-  public function getSourceRanges()
-  {
-    return $this->sourceRanges;
-  }
-  public function setSourceTags($sourceTags)
-  {
-    $this->sourceTags = $sourceTags;
-  }
-  public function getSourceTags()
-  {
-    return $this->sourceTags;
-  }
-  public function setTargetTags($targetTags)
-  {
-    $this->targetTags = $targetTags;
-  }
-  public function getTargetTags()
-  {
-    return $this->targetTags;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Manager/FirewallModuleStatus.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Manager/FirewallModuleStatus.php
deleted file mode 100644
index 2328cb89..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Manager/FirewallModuleStatus.php
+++ /dev/null
@@ -1,30 +0,0 @@
-firewallUrl = $firewallUrl;
-  }
-  public function getFirewallUrl()
-  {
-    return $this->firewallUrl;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Manager/HealthCheckModule.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Manager/HealthCheckModule.php
deleted file mode 100644
index 55821ac8..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Manager/HealthCheckModule.php
+++ /dev/null
@@ -1,93 +0,0 @@
-checkIntervalSec = $checkIntervalSec;
-  }
-  public function getCheckIntervalSec()
-  {
-    return $this->checkIntervalSec;
-  }
-  public function setDescription($description)
-  {
-    $this->description = $description;
-  }
-  public function getDescription()
-  {
-    return $this->description;
-  }
-  public function setHealthyThreshold($healthyThreshold)
-  {
-    $this->healthyThreshold = $healthyThreshold;
-  }
-  public function getHealthyThreshold()
-  {
-    return $this->healthyThreshold;
-  }
-  public function setHost($host)
-  {
-    $this->host = $host;
-  }
-  public function getHost()
-  {
-    return $this->host;
-  }
-  public function setPath($path)
-  {
-    $this->path = $path;
-  }
-  public function getPath()
-  {
-    return $this->path;
-  }
-  public function setPort($port)
-  {
-    $this->port = $port;
-  }
-  public function getPort()
-  {
-    return $this->port;
-  }
-  public function setTimeoutSec($timeoutSec)
-  {
-    $this->timeoutSec = $timeoutSec;
-  }
-  public function getTimeoutSec()
-  {
-    return $this->timeoutSec;
-  }
-  public function setUnhealthyThreshold($unhealthyThreshold)
-  {
-    $this->unhealthyThreshold = $unhealthyThreshold;
-  }
-  public function getUnhealthyThreshold()
-  {
-    return $this->unhealthyThreshold;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Manager/HealthCheckModuleStatus.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Manager/HealthCheckModuleStatus.php
deleted file mode 100644
index 7d2cbcf4..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Manager/HealthCheckModuleStatus.php
+++ /dev/null
@@ -1,30 +0,0 @@
-healthCheckUrl = $healthCheckUrl;
-  }
-  public function getHealthCheckUrl()
-  {
-    return $this->healthCheckUrl;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Manager/LbModule.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Manager/LbModule.php
deleted file mode 100644
index 0f7a4bc4..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Manager/LbModule.php
+++ /dev/null
@@ -1,85 +0,0 @@
-description = $description;
-  }
-  public function getDescription()
-  {
-    return $this->description;
-  }
-  public function setHealthChecks($healthChecks)
-  {
-    $this->healthChecks = $healthChecks;
-  }
-  public function getHealthChecks()
-  {
-    return $this->healthChecks;
-  }
-  public function setIpAddress($ipAddress)
-  {
-    $this->ipAddress = $ipAddress;
-  }
-  public function getIpAddress()
-  {
-    return $this->ipAddress;
-  }
-  public function setIpProtocol($ipProtocol)
-  {
-    $this->ipProtocol = $ipProtocol;
-  }
-  public function getIpProtocol()
-  {
-    return $this->ipProtocol;
-  }
-  public function setPortRange($portRange)
-  {
-    $this->portRange = $portRange;
-  }
-  public function getPortRange()
-  {
-    return $this->portRange;
-  }
-  public function setSessionAffinity($sessionAffinity)
-  {
-    $this->sessionAffinity = $sessionAffinity;
-  }
-  public function getSessionAffinity()
-  {
-    return $this->sessionAffinity;
-  }
-  public function setTargetModules($targetModules)
-  {
-    $this->targetModules = $targetModules;
-  }
-  public function getTargetModules()
-  {
-    return $this->targetModules;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Manager/LbModuleStatus.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Manager/LbModuleStatus.php
deleted file mode 100644
index 88a19148..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Manager/LbModuleStatus.php
+++ /dev/null
@@ -1,39 +0,0 @@
-forwardingRuleUrl = $forwardingRuleUrl;
-  }
-  public function getForwardingRuleUrl()
-  {
-    return $this->forwardingRuleUrl;
-  }
-  public function setTargetPoolUrl($targetPoolUrl)
-  {
-    $this->targetPoolUrl = $targetPoolUrl;
-  }
-  public function getTargetPoolUrl()
-  {
-    return $this->targetPoolUrl;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Manager/Metadata.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Manager/Metadata.php
deleted file mode 100644
index 9936e676..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Manager/Metadata.php
+++ /dev/null
@@ -1,41 +0,0 @@
-fingerPrint = $fingerPrint;
-  }
-  public function getFingerPrint()
-  {
-    return $this->fingerPrint;
-  }
-  public function setItems($items)
-  {
-    $this->items = $items;
-  }
-  public function getItems()
-  {
-    return $this->items;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Manager/MetadataItem.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Manager/MetadataItem.php
deleted file mode 100644
index 906f60d6..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Manager/MetadataItem.php
+++ /dev/null
@@ -1,39 +0,0 @@
-key = $key;
-  }
-  public function getKey()
-  {
-    return $this->key;
-  }
-  public function setValue($value)
-  {
-    $this->value = $value;
-  }
-  public function getValue()
-  {
-    return $this->value;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Manager/Module.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Manager/Module.php
deleted file mode 100644
index f8022151..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Manager/Module.php
+++ /dev/null
@@ -1,90 +0,0 @@
-autoscalingModule = $autoscalingModule;
-  }
-  public function getAutoscalingModule()
-  {
-    return $this->autoscalingModule;
-  }
-  public function setFirewallModule(Google_Service_Manager_FirewallModule $firewallModule)
-  {
-    $this->firewallModule = $firewallModule;
-  }
-  public function getFirewallModule()
-  {
-    return $this->firewallModule;
-  }
-  public function setHealthCheckModule(Google_Service_Manager_HealthCheckModule $healthCheckModule)
-  {
-    $this->healthCheckModule = $healthCheckModule;
-  }
-  public function getHealthCheckModule()
-  {
-    return $this->healthCheckModule;
-  }
-  public function setLbModule(Google_Service_Manager_LbModule $lbModule)
-  {
-    $this->lbModule = $lbModule;
-  }
-  public function getLbModule()
-  {
-    return $this->lbModule;
-  }
-  public function setNetworkModule(Google_Service_Manager_NetworkModule $networkModule)
-  {
-    $this->networkModule = $networkModule;
-  }
-  public function getNetworkModule()
-  {
-    return $this->networkModule;
-  }
-  public function setReplicaPoolModule(Google_Service_Manager_ReplicaPoolModule $replicaPoolModule)
-  {
-    $this->replicaPoolModule = $replicaPoolModule;
-  }
-  public function getReplicaPoolModule()
-  {
-    return $this->replicaPoolModule;
-  }
-  public function setType($type)
-  {
-    $this->type = $type;
-  }
-  public function getType()
-  {
-    return $this->type;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Manager/ModuleStatus.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Manager/ModuleStatus.php
deleted file mode 100644
index 145fb322..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Manager/ModuleStatus.php
+++ /dev/null
@@ -1,100 +0,0 @@
-autoscalingModuleStatus = $autoscalingModuleStatus;
-  }
-  public function getAutoscalingModuleStatus()
-  {
-    return $this->autoscalingModuleStatus;
-  }
-  public function setFirewallModuleStatus(Google_Service_Manager_FirewallModuleStatus $firewallModuleStatus)
-  {
-    $this->firewallModuleStatus = $firewallModuleStatus;
-  }
-  public function getFirewallModuleStatus()
-  {
-    return $this->firewallModuleStatus;
-  }
-  public function setHealthCheckModuleStatus(Google_Service_Manager_HealthCheckModuleStatus $healthCheckModuleStatus)
-  {
-    $this->healthCheckModuleStatus = $healthCheckModuleStatus;
-  }
-  public function getHealthCheckModuleStatus()
-  {
-    return $this->healthCheckModuleStatus;
-  }
-  public function setLbModuleStatus(Google_Service_Manager_LbModuleStatus $lbModuleStatus)
-  {
-    $this->lbModuleStatus = $lbModuleStatus;
-  }
-  public function getLbModuleStatus()
-  {
-    return $this->lbModuleStatus;
-  }
-  public function setNetworkModuleStatus(Google_Service_Manager_NetworkModuleStatus $networkModuleStatus)
-  {
-    $this->networkModuleStatus = $networkModuleStatus;
-  }
-  public function getNetworkModuleStatus()
-  {
-    return $this->networkModuleStatus;
-  }
-  public function setReplicaPoolModuleStatus(Google_Service_Manager_ReplicaPoolModuleStatus $replicaPoolModuleStatus)
-  {
-    $this->replicaPoolModuleStatus = $replicaPoolModuleStatus;
-  }
-  public function getReplicaPoolModuleStatus()
-  {
-    return $this->replicaPoolModuleStatus;
-  }
-  public function setState(Google_Service_Manager_DeployState $state)
-  {
-    $this->state = $state;
-  }
-  public function getState()
-  {
-    return $this->state;
-  }
-  public function setType($type)
-  {
-    $this->type = $type;
-  }
-  public function getType()
-  {
-    return $this->type;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Manager/NetworkInterface.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Manager/NetworkInterface.php
deleted file mode 100644
index 5fa0517e..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Manager/NetworkInterface.php
+++ /dev/null
@@ -1,59 +0,0 @@
-accessConfigs = $accessConfigs;
-  }
-  public function getAccessConfigs()
-  {
-    return $this->accessConfigs;
-  }
-  public function setName($name)
-  {
-    $this->name = $name;
-  }
-  public function getName()
-  {
-    return $this->name;
-  }
-  public function setNetwork($network)
-  {
-    $this->network = $network;
-  }
-  public function getNetwork()
-  {
-    return $this->network;
-  }
-  public function setNetworkIp($networkIp)
-  {
-    $this->networkIp = $networkIp;
-  }
-  public function getNetworkIp()
-  {
-    return $this->networkIp;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Manager/NetworkModule.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Manager/NetworkModule.php
deleted file mode 100644
index 816687d8..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Manager/NetworkModule.php
+++ /dev/null
@@ -1,51 +0,0 @@
- "IPv4Range",
-  );
-  public $iPv4Range;
-  public $description;
-  public $gatewayIPv4;
-
-  public function setIPv4Range($iPv4Range)
-  {
-    $this->iPv4Range = $iPv4Range;
-  }
-  public function getIPv4Range()
-  {
-    return $this->iPv4Range;
-  }
-  public function setDescription($description)
-  {
-    $this->description = $description;
-  }
-  public function getDescription()
-  {
-    return $this->description;
-  }
-  public function setGatewayIPv4($gatewayIPv4)
-  {
-    $this->gatewayIPv4 = $gatewayIPv4;
-  }
-  public function getGatewayIPv4()
-  {
-    return $this->gatewayIPv4;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Manager/NetworkModuleStatus.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Manager/NetworkModuleStatus.php
deleted file mode 100644
index 915c4f3c..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Manager/NetworkModuleStatus.php
+++ /dev/null
@@ -1,30 +0,0 @@
-networkUrl = $networkUrl;
-  }
-  public function getNetworkUrl()
-  {
-    return $this->networkUrl;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Manager/NewDisk.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Manager/NewDisk.php
deleted file mode 100644
index 42b14994..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Manager/NewDisk.php
+++ /dev/null
@@ -1,59 +0,0 @@
-attachment = $attachment;
-  }
-  public function getAttachment()
-  {
-    return $this->attachment;
-  }
-  public function setAutoDelete($autoDelete)
-  {
-    $this->autoDelete = $autoDelete;
-  }
-  public function getAutoDelete()
-  {
-    return $this->autoDelete;
-  }
-  public function setBoot($boot)
-  {
-    $this->boot = $boot;
-  }
-  public function getBoot()
-  {
-    return $this->boot;
-  }
-  public function setInitializeParams(Google_Service_Manager_NewDiskInitializeParams $initializeParams)
-  {
-    $this->initializeParams = $initializeParams;
-  }
-  public function getInitializeParams()
-  {
-    return $this->initializeParams;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Manager/NewDiskInitializeParams.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Manager/NewDiskInitializeParams.php
deleted file mode 100644
index 2246aa44..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Manager/NewDiskInitializeParams.php
+++ /dev/null
@@ -1,48 +0,0 @@
-diskSizeGb = $diskSizeGb;
-  }
-  public function getDiskSizeGb()
-  {
-    return $this->diskSizeGb;
-  }
-  public function setDiskType($diskType)
-  {
-    $this->diskType = $diskType;
-  }
-  public function getDiskType()
-  {
-    return $this->diskType;
-  }
-  public function setSourceImage($sourceImage)
-  {
-    $this->sourceImage = $sourceImage;
-  }
-  public function getSourceImage()
-  {
-    return $this->sourceImage;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Manager/ParamOverride.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Manager/ParamOverride.php
deleted file mode 100644
index 1c0193eb..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Manager/ParamOverride.php
+++ /dev/null
@@ -1,39 +0,0 @@
-path = $path;
-  }
-  public function getPath()
-  {
-    return $this->path;
-  }
-  public function setValue($value)
-  {
-    $this->value = $value;
-  }
-  public function getValue()
-  {
-    return $this->value;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Manager/ReplicaPoolModule.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Manager/ReplicaPoolModule.php
deleted file mode 100644
index fef7a06a..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Manager/ReplicaPoolModule.php
+++ /dev/null
@@ -1,69 +0,0 @@
-envVariables = $envVariables;
-  }
-  public function getEnvVariables()
-  {
-    return $this->envVariables;
-  }
-  public function setHealthChecks($healthChecks)
-  {
-    $this->healthChecks = $healthChecks;
-  }
-  public function getHealthChecks()
-  {
-    return $this->healthChecks;
-  }
-  public function setNumReplicas($numReplicas)
-  {
-    $this->numReplicas = $numReplicas;
-  }
-  public function getNumReplicas()
-  {
-    return $this->numReplicas;
-  }
-  public function setReplicaPoolParams(Google_Service_Manager_ReplicaPoolParams $replicaPoolParams)
-  {
-    $this->replicaPoolParams = $replicaPoolParams;
-  }
-  public function getReplicaPoolParams()
-  {
-    return $this->replicaPoolParams;
-  }
-  public function setResourceView($resourceView)
-  {
-    $this->resourceView = $resourceView;
-  }
-  public function getResourceView()
-  {
-    return $this->resourceView;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Manager/ReplicaPoolModuleStatus.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Manager/ReplicaPoolModuleStatus.php
deleted file mode 100644
index 3ff49116..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Manager/ReplicaPoolModuleStatus.php
+++ /dev/null
@@ -1,39 +0,0 @@
-replicaPoolUrl = $replicaPoolUrl;
-  }
-  public function getReplicaPoolUrl()
-  {
-    return $this->replicaPoolUrl;
-  }
-  public function setResourceViewUrl($resourceViewUrl)
-  {
-    $this->resourceViewUrl = $resourceViewUrl;
-  }
-  public function getResourceViewUrl()
-  {
-    return $this->resourceViewUrl;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Manager/ReplicaPoolParams.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Manager/ReplicaPoolParams.php
deleted file mode 100644
index 0e58275e..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Manager/ReplicaPoolParams.php
+++ /dev/null
@@ -1,31 +0,0 @@
-v1beta1 = $v1beta1;
-  }
-  public function getV1beta1()
-  {
-    return $this->v1beta1;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Manager/ReplicaPoolParamsV1Beta1.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Manager/ReplicaPoolParamsV1Beta1.php
deleted file mode 100644
index b20d58b3..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Manager/ReplicaPoolParamsV1Beta1.php
+++ /dev/null
@@ -1,154 +0,0 @@
-autoRestart = $autoRestart;
-  }
-  public function getAutoRestart()
-  {
-    return $this->autoRestart;
-  }
-  public function setBaseInstanceName($baseInstanceName)
-  {
-    $this->baseInstanceName = $baseInstanceName;
-  }
-  public function getBaseInstanceName()
-  {
-    return $this->baseInstanceName;
-  }
-  public function setCanIpForward($canIpForward)
-  {
-    $this->canIpForward = $canIpForward;
-  }
-  public function getCanIpForward()
-  {
-    return $this->canIpForward;
-  }
-  public function setDescription($description)
-  {
-    $this->description = $description;
-  }
-  public function getDescription()
-  {
-    return $this->description;
-  }
-  public function setDisksToAttach($disksToAttach)
-  {
-    $this->disksToAttach = $disksToAttach;
-  }
-  public function getDisksToAttach()
-  {
-    return $this->disksToAttach;
-  }
-  public function setDisksToCreate($disksToCreate)
-  {
-    $this->disksToCreate = $disksToCreate;
-  }
-  public function getDisksToCreate()
-  {
-    return $this->disksToCreate;
-  }
-  public function setInitAction($initAction)
-  {
-    $this->initAction = $initAction;
-  }
-  public function getInitAction()
-  {
-    return $this->initAction;
-  }
-  public function setMachineType($machineType)
-  {
-    $this->machineType = $machineType;
-  }
-  public function getMachineType()
-  {
-    return $this->machineType;
-  }
-  public function setMetadata(Google_Service_Manager_Metadata $metadata)
-  {
-    $this->metadata = $metadata;
-  }
-  public function getMetadata()
-  {
-    return $this->metadata;
-  }
-  public function setNetworkInterfaces($networkInterfaces)
-  {
-    $this->networkInterfaces = $networkInterfaces;
-  }
-  public function getNetworkInterfaces()
-  {
-    return $this->networkInterfaces;
-  }
-  public function setOnHostMaintenance($onHostMaintenance)
-  {
-    $this->onHostMaintenance = $onHostMaintenance;
-  }
-  public function getOnHostMaintenance()
-  {
-    return $this->onHostMaintenance;
-  }
-  public function setServiceAccounts($serviceAccounts)
-  {
-    $this->serviceAccounts = $serviceAccounts;
-  }
-  public function getServiceAccounts()
-  {
-    return $this->serviceAccounts;
-  }
-  public function setTags(Google_Service_Manager_Tag $tags)
-  {
-    $this->tags = $tags;
-  }
-  public function getTags()
-  {
-    return $this->tags;
-  }
-  public function setZone($zone)
-  {
-    $this->zone = $zone;
-  }
-  public function getZone()
-  {
-    return $this->zone;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Manager/ServiceAccount.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Manager/ServiceAccount.php
deleted file mode 100644
index 59aa96d1..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Manager/ServiceAccount.php
+++ /dev/null
@@ -1,40 +0,0 @@
-email = $email;
-  }
-  public function getEmail()
-  {
-    return $this->email;
-  }
-  public function setScopes($scopes)
-  {
-    $this->scopes = $scopes;
-  }
-  public function getScopes()
-  {
-    return $this->scopes;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Manager/Tag.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Manager/Tag.php
deleted file mode 100644
index 0fef4180..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Manager/Tag.php
+++ /dev/null
@@ -1,40 +0,0 @@
-fingerPrint = $fingerPrint;
-  }
-  public function getFingerPrint()
-  {
-    return $this->fingerPrint;
-  }
-  public function setItems($items)
-  {
-    $this->items = $items;
-  }
-  public function getItems()
-  {
-    return $this->items;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Manager/Template.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Manager/Template.php
deleted file mode 100644
index ad21dd9f..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Manager/Template.php
+++ /dev/null
@@ -1,59 +0,0 @@
-actions = $actions;
-  }
-  public function getActions()
-  {
-    return $this->actions;
-  }
-  public function setDescription($description)
-  {
-    $this->description = $description;
-  }
-  public function getDescription()
-  {
-    return $this->description;
-  }
-  public function setModules($modules)
-  {
-    $this->modules = $modules;
-  }
-  public function getModules()
-  {
-    return $this->modules;
-  }
-  public function setName($name)
-  {
-    $this->name = $name;
-  }
-  public function getName()
-  {
-    return $this->name;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Manager/TemplatesListResponse.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Manager/TemplatesListResponse.php
deleted file mode 100644
index 515f148d..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Manager/TemplatesListResponse.php
+++ /dev/null
@@ -1,41 +0,0 @@
-nextPageToken = $nextPageToken;
-  }
-  public function getNextPageToken()
-  {
-    return $this->nextPageToken;
-  }
-  public function setResources($resources)
-  {
-    $this->resources = $resources;
-  }
-  public function getResources()
-  {
-    return $this->resources;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Manager/TemplatesResource.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Manager/TemplatesResource.php
deleted file mode 100644
index b5b133a4..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Manager/TemplatesResource.php
+++ /dev/null
@@ -1,88 +0,0 @@
-
- *   $managerService = new Google_Service_Manager(...);
- *   $templates = $managerService->templates;
- *  
- */
-class Google_Service_Manager_TemplatesResource extends Google_Service_Resource
-{
-  /**
-   * (templates.delete)
-   *
-   * @param string $projectId
-   * @param string $templateName
-   * @param array $optParams Optional parameters.
-   */
-  public function delete($projectId, $templateName, $optParams = array())
-  {
-    $params = array('projectId' => $projectId, 'templateName' => $templateName);
-    $params = array_merge($params, $optParams);
-    return $this->call('delete', array($params));
-  }
-  /**
-   * (templates.get)
-   *
-   * @param string $projectId
-   * @param string $templateName
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Template
-   */
-  public function get($projectId, $templateName, $optParams = array())
-  {
-    $params = array('projectId' => $projectId, 'templateName' => $templateName);
-    $params = array_merge($params, $optParams);
-    return $this->call('get', array($params), "Google_Service_Manager_Template");
-  }
-  /**
-   * (templates.insert)
-   *
-   * @param string $projectId
-   * @param Google_Template $postBody
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Template
-   */
-  public function insert($projectId, Google_Service_Manager_Template $postBody, $optParams = array())
-  {
-    $params = array('projectId' => $projectId, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('insert', array($params), "Google_Service_Manager_Template");
-  }
-  /**
-   * (templates.listTemplates)
-   *
-   * @param string $projectId
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param int maxResults Maximum count of results to be returned. Acceptable
-   * values are 0 to 100, inclusive. (Default: 50)
-   * @opt_param string pageToken Specifies a nextPageToken returned by a previous
-   * list request. This token can be used to request the next page of results from
-   * a previous list request.
-   * @return Google_Service_TemplatesListResponse
-   */
-  public function listTemplates($projectId, $optParams = array())
-  {
-    $params = array('projectId' => $projectId);
-    $params = array_merge($params, $optParams);
-    return $this->call('list', array($params), "Google_Service_Manager_TemplatesListResponse");
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ManufacturerCenter.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ManufacturerCenter.php
deleted file mode 100644
index d3613abb..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ManufacturerCenter.php
+++ /dev/null
@@ -1,96 +0,0 @@
-
- * Public API for managing Manufacturer Center related data.

- *
- * 

- * For more information about this service, see the API
- * Documentation
- * 

- *
- * @author Google, Inc.
- */
-class Google_Service_ManufacturerCenter extends Google_Service
-{
-  /** Manage your product listings for Google Manufacturer Center. */
-  const MANUFACTURERCENTER =
-      "https://www.googleapis.com/auth/manufacturercenter";
-
-  public $accounts_products;
-  
-  /**
-   * Constructs the internal representation of the ManufacturerCenter service.
-   *
-   * @param Google_Client $client
-   */
-  public function __construct(Google_Client $client)
-  {
-    parent::__construct($client);
-    $this->rootUrl = 'https://manufacturers.googleapis.com/';
-    $this->servicePath = '';
-    $this->version = 'v1';
-    $this->serviceName = 'manufacturers';
-
-    $this->accounts_products = new Google_Service_ManufacturerCenter_Resource_AccountsProducts(
-        $this,
-        $this->serviceName,
-        'products',
-        array(
-          'methods' => array(
-            'get' => array(
-              'path' => 'v1/{+parent}/products/{+name}',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'parent' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'name' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'list' => array(
-              'path' => 'v1/{+parent}/products',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'parent' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'pageSize' => array(
-                  'location' => 'query',
-                  'type' => 'integer',
-                ),
-                'pageToken' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-              ),
-            ),
-          )
-        )
-    );
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ManufacturerCenter/Attributes.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ManufacturerCenter/Attributes.php
deleted file mode 100644
index 6e546d70..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ManufacturerCenter/Attributes.php
+++ /dev/null
@@ -1,94 +0,0 @@
-brand = $brand;
-  }
-  public function getBrand()
-  {
-    return $this->brand;
-  }
-  public function setGtin($gtin)
-  {
-    $this->gtin = $gtin;
-  }
-  public function getGtin()
-  {
-    return $this->gtin;
-  }
-  public function setMpn($mpn)
-  {
-    $this->mpn = $mpn;
-  }
-  public function getMpn()
-  {
-    return $this->mpn;
-  }
-  public function setProductLine($productLine)
-  {
-    $this->productLine = $productLine;
-  }
-  public function getProductLine()
-  {
-    return $this->productLine;
-  }
-  public function setProductName($productName)
-  {
-    $this->productName = $productName;
-  }
-  public function getProductName()
-  {
-    return $this->productName;
-  }
-  public function setProductPageUrl($productPageUrl)
-  {
-    $this->productPageUrl = $productPageUrl;
-  }
-  public function getProductPageUrl()
-  {
-    return $this->productPageUrl;
-  }
-  public function setProductType($productType)
-  {
-    $this->productType = $productType;
-  }
-  public function getProductType()
-  {
-    return $this->productType;
-  }
-  public function setTitle($title)
-  {
-    $this->title = $title;
-  }
-  public function getTitle()
-  {
-    return $this->title;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ManufacturerCenter/Issue.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ManufacturerCenter/Issue.php
deleted file mode 100644
index cf0c22c1..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ManufacturerCenter/Issue.php
+++ /dev/null
@@ -1,57 +0,0 @@
-attribute = $attribute;
-  }
-  public function getAttribute()
-  {
-    return $this->attribute;
-  }
-  public function setDescription($description)
-  {
-    $this->description = $description;
-  }
-  public function getDescription()
-  {
-    return $this->description;
-  }
-  public function setSeverity($severity)
-  {
-    $this->severity = $severity;
-  }
-  public function getSeverity()
-  {
-    return $this->severity;
-  }
-  public function setType($type)
-  {
-    $this->type = $type;
-  }
-  public function getType()
-  {
-    return $this->type;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ManufacturerCenter/ListProductsResponse.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ManufacturerCenter/ListProductsResponse.php
deleted file mode 100644
index 5f5452cc..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ManufacturerCenter/ListProductsResponse.php
+++ /dev/null
@@ -1,41 +0,0 @@
-nextPageToken = $nextPageToken;
-  }
-  public function getNextPageToken()
-  {
-    return $this->nextPageToken;
-  }
-  public function setProducts($products)
-  {
-    $this->products = $products;
-  }
-  public function getProducts()
-  {
-    return $this->products;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ManufacturerCenter/Product.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ManufacturerCenter/Product.php
deleted file mode 100644
index 8ba6e58b..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ManufacturerCenter/Product.php
+++ /dev/null
@@ -1,116 +0,0 @@
-contentLanguage = $contentLanguage;
-  }
-  public function getContentLanguage()
-  {
-    return $this->contentLanguage;
-  }
-  public function setFinalAttributes(Google_Service_ManufacturerCenter_Attributes $finalAttributes)
-  {
-    $this->finalAttributes = $finalAttributes;
-  }
-  public function getFinalAttributes()
-  {
-    return $this->finalAttributes;
-  }
-  public function setIssues($issues)
-  {
-    $this->issues = $issues;
-  }
-  public function getIssues()
-  {
-    return $this->issues;
-  }
-  public function setManuallyDeletedAttributes($manuallyDeletedAttributes)
-  {
-    $this->manuallyDeletedAttributes = $manuallyDeletedAttributes;
-  }
-  public function getManuallyDeletedAttributes()
-  {
-    return $this->manuallyDeletedAttributes;
-  }
-  public function setManuallyProvidedAttributes(Google_Service_ManufacturerCenter_Attributes $manuallyProvidedAttributes)
-  {
-    $this->manuallyProvidedAttributes = $manuallyProvidedAttributes;
-  }
-  public function getManuallyProvidedAttributes()
-  {
-    return $this->manuallyProvidedAttributes;
-  }
-  public function setName($name)
-  {
-    $this->name = $name;
-  }
-  public function getName()
-  {
-    return $this->name;
-  }
-  public function setParent($parent)
-  {
-    $this->parent = $parent;
-  }
-  public function getParent()
-  {
-    return $this->parent;
-  }
-  public function setProductId($productId)
-  {
-    $this->productId = $productId;
-  }
-  public function getProductId()
-  {
-    return $this->productId;
-  }
-  public function setTargetCountry($targetCountry)
-  {
-    $this->targetCountry = $targetCountry;
-  }
-  public function getTargetCountry()
-  {
-    return $this->targetCountry;
-  }
-  public function setUploadedAttributes(Google_Service_ManufacturerCenter_Attributes $uploadedAttributes)
-  {
-    $this->uploadedAttributes = $uploadedAttributes;
-  }
-  public function getUploadedAttributes()
-  {
-    return $this->uploadedAttributes;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ManufacturerCenter/Resource/Accounts.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ManufacturerCenter/Resource/Accounts.php
deleted file mode 100644
index 290a211f..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ManufacturerCenter/Resource/Accounts.php
+++ /dev/null
@@ -1,28 +0,0 @@
-
- *   $manufacturersService = new Google_Service_ManufacturerCenter(...);
- *   $accounts = $manufacturersService->accounts;
- *  
- */
-class Google_Service_ManufacturerCenter_Resource_Accounts extends Google_Service_Resource
-{
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ManufacturerCenter/Resource/AccountsProducts.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ManufacturerCenter/Resource/AccountsProducts.php
deleted file mode 100644
index 5b869d08..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ManufacturerCenter/Resource/AccountsProducts.php
+++ /dev/null
@@ -1,75 +0,0 @@
-
- *   $manufacturersService = new Google_Service_ManufacturerCenter(...);
- *   $products = $manufacturersService->products;
- *  
- */
-class Google_Service_ManufacturerCenter_Resource_AccountsProducts extends Google_Service_Resource
-{
-  /**
-   * Gets the product from a Manufacturer Center account, including product
-   * issues. (products.get)
-   *
-   * @param string $parent Parent ID in the format `accounts/{account_id}`.
-   *
-   * `account_id` - The ID of the Manufacturer Center account.
-   * @param string $name Name in the format
-   * `{target_country}:{content_language}:{product_id}`.
-   *
-   * `target_country`   - The target country of the product as a CLDR territory
-   * code (for example, US).
-   *
-   * `content_language` - The content language of the product as a two-letter
-   * ISO 639-1 language code (for example, en).
-   *
-   * `product_id`     -   The ID of the product. For more information, see
-   * https://support.google.com/manufacturers/answer/6124116#id.
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_ManufacturerCenter_Product
-   */
-  public function get($parent, $name, $optParams = array())
-  {
-    $params = array('parent' => $parent, 'name' => $name);
-    $params = array_merge($params, $optParams);
-    return $this->call('get', array($params), "Google_Service_ManufacturerCenter_Product");
-  }
-  /**
-   * Lists all the products in a Manufacturer Center account.
-   * (products.listAccountsProducts)
-   *
-   * @param string $parent Parent ID in the format `accounts/{account_id}`.
-   *
-   * `account_id` - The ID of the Manufacturer Center account.
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param int pageSize Maximum number of product statuses to return in the
-   * response, used for paging.
-   * @opt_param string pageToken The token returned by the previous request.
-   * @return Google_Service_ManufacturerCenter_ListProductsResponse
-   */
-  public function listAccountsProducts($parent, $optParams = array())
-  {
-    $params = array('parent' => $parent);
-    $params = array_merge($params, $optParams);
-    return $this->call('list', array($params), "Google_Service_ManufacturerCenter_ListProductsResponse");
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Mirror.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Mirror.php
deleted file mode 100644
index c9d86c8a..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Mirror.php
+++ /dev/null
@@ -1,379 +0,0 @@
-
- * Interacts with Glass users via the timeline.

- *
- * 

- * For more information about this service, see the API
- * Documentation
- * 

- *
- * @author Google, Inc.
- */
-class Google_Service_Mirror extends Google_Service
-{
-  /** View your location. */
-  const GLASS_LOCATION =
-      "https://www.googleapis.com/auth/glass.location";
-  /** View and manage your Glass timeline. */
-  const GLASS_TIMELINE =
-      "https://www.googleapis.com/auth/glass.timeline";
-
-  public $accounts;
-  public $contacts;
-  public $locations;
-  public $settings;
-  public $subscriptions;
-  public $timeline;
-  public $timeline_attachments;
-  
-  /**
-   * Constructs the internal representation of the Mirror service.
-   *
-   * @param Google_Client $client
-   */
-  public function __construct(Google_Client $client)
-  {
-    parent::__construct($client);
-    $this->rootUrl = 'https://www.googleapis.com/';
-    $this->servicePath = 'mirror/v1/';
-    $this->version = 'v1';
-    $this->serviceName = 'mirror';
-
-    $this->accounts = new Google_Service_Mirror_Resource_Accounts(
-        $this,
-        $this->serviceName,
-        'accounts',
-        array(
-          'methods' => array(
-            'insert' => array(
-              'path' => 'accounts/{userToken}/{accountType}/{accountName}',
-              'httpMethod' => 'POST',
-              'parameters' => array(
-                'userToken' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'accountType' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'accountName' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),
-          )
-        )
-    );
-    $this->contacts = new Google_Service_Mirror_Resource_Contacts(
-        $this,
-        $this->serviceName,
-        'contacts',
-        array(
-          'methods' => array(
-            'delete' => array(
-              'path' => 'contacts/{id}',
-              'httpMethod' => 'DELETE',
-              'parameters' => array(
-                'id' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'get' => array(
-              'path' => 'contacts/{id}',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'id' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'insert' => array(
-              'path' => 'contacts',
-              'httpMethod' => 'POST',
-              'parameters' => array(),
-            ),'list' => array(
-              'path' => 'contacts',
-              'httpMethod' => 'GET',
-              'parameters' => array(),
-            ),'patch' => array(
-              'path' => 'contacts/{id}',
-              'httpMethod' => 'PATCH',
-              'parameters' => array(
-                'id' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'update' => array(
-              'path' => 'contacts/{id}',
-              'httpMethod' => 'PUT',
-              'parameters' => array(
-                'id' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),
-          )
-        )
-    );
-    $this->locations = new Google_Service_Mirror_Resource_Locations(
-        $this,
-        $this->serviceName,
-        'locations',
-        array(
-          'methods' => array(
-            'get' => array(
-              'path' => 'locations/{id}',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'id' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'list' => array(
-              'path' => 'locations',
-              'httpMethod' => 'GET',
-              'parameters' => array(),
-            ),
-          )
-        )
-    );
-    $this->settings = new Google_Service_Mirror_Resource_Settings(
-        $this,
-        $this->serviceName,
-        'settings',
-        array(
-          'methods' => array(
-            'get' => array(
-              'path' => 'settings/{id}',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'id' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),
-          )
-        )
-    );
-    $this->subscriptions = new Google_Service_Mirror_Resource_Subscriptions(
-        $this,
-        $this->serviceName,
-        'subscriptions',
-        array(
-          'methods' => array(
-            'delete' => array(
-              'path' => 'subscriptions/{id}',
-              'httpMethod' => 'DELETE',
-              'parameters' => array(
-                'id' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'insert' => array(
-              'path' => 'subscriptions',
-              'httpMethod' => 'POST',
-              'parameters' => array(),
-            ),'list' => array(
-              'path' => 'subscriptions',
-              'httpMethod' => 'GET',
-              'parameters' => array(),
-            ),'update' => array(
-              'path' => 'subscriptions/{id}',
-              'httpMethod' => 'PUT',
-              'parameters' => array(
-                'id' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),
-          )
-        )
-    );
-    $this->timeline = new Google_Service_Mirror_Resource_Timeline(
-        $this,
-        $this->serviceName,
-        'timeline',
-        array(
-          'methods' => array(
-            'delete' => array(
-              'path' => 'timeline/{id}',
-              'httpMethod' => 'DELETE',
-              'parameters' => array(
-                'id' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'get' => array(
-              'path' => 'timeline/{id}',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'id' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'insert' => array(
-              'path' => 'timeline',
-              'httpMethod' => 'POST',
-              'parameters' => array(),
-            ),'list' => array(
-              'path' => 'timeline',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'bundleId' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'includeDeleted' => array(
-                  'location' => 'query',
-                  'type' => 'boolean',
-                ),
-                'maxResults' => array(
-                  'location' => 'query',
-                  'type' => 'integer',
-                ),
-                'orderBy' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'pageToken' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'pinnedOnly' => array(
-                  'location' => 'query',
-                  'type' => 'boolean',
-                ),
-                'sourceItemId' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-              ),
-            ),'patch' => array(
-              'path' => 'timeline/{id}',
-              'httpMethod' => 'PATCH',
-              'parameters' => array(
-                'id' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'update' => array(
-              'path' => 'timeline/{id}',
-              'httpMethod' => 'PUT',
-              'parameters' => array(
-                'id' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),
-          )
-        )
-    );
-    $this->timeline_attachments = new Google_Service_Mirror_Resource_TimelineAttachments(
-        $this,
-        $this->serviceName,
-        'attachments',
-        array(
-          'methods' => array(
-            'delete' => array(
-              'path' => 'timeline/{itemId}/attachments/{attachmentId}',
-              'httpMethod' => 'DELETE',
-              'parameters' => array(
-                'itemId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'attachmentId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'get' => array(
-              'path' => 'timeline/{itemId}/attachments/{attachmentId}',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'itemId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'attachmentId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'insert' => array(
-              'path' => 'timeline/{itemId}/attachments',
-              'httpMethod' => 'POST',
-              'parameters' => array(
-                'itemId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'list' => array(
-              'path' => 'timeline/{itemId}/attachments',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'itemId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),
-          )
-        )
-    );
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Mirror/Account.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Mirror/Account.php
deleted file mode 100644
index b65da44b..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Mirror/Account.php
+++ /dev/null
@@ -1,60 +0,0 @@
-authTokens = $authTokens;
-  }
-  public function getAuthTokens()
-  {
-    return $this->authTokens;
-  }
-  public function setFeatures($features)
-  {
-    $this->features = $features;
-  }
-  public function getFeatures()
-  {
-    return $this->features;
-  }
-  public function setPassword($password)
-  {
-    $this->password = $password;
-  }
-  public function getPassword()
-  {
-    return $this->password;
-  }
-  public function setUserData($userData)
-  {
-    $this->userData = $userData;
-  }
-  public function getUserData()
-  {
-    return $this->userData;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Mirror/Attachment.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Mirror/Attachment.php
deleted file mode 100644
index 558f7c01..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Mirror/Attachment.php
+++ /dev/null
@@ -1,57 +0,0 @@
-contentType = $contentType;
-  }
-  public function getContentType()
-  {
-    return $this->contentType;
-  }
-  public function setContentUrl($contentUrl)
-  {
-    $this->contentUrl = $contentUrl;
-  }
-  public function getContentUrl()
-  {
-    return $this->contentUrl;
-  }
-  public function setId($id)
-  {
-    $this->id = $id;
-  }
-  public function getId()
-  {
-    return $this->id;
-  }
-  public function setIsProcessingContent($isProcessingContent)
-  {
-    $this->isProcessingContent = $isProcessingContent;
-  }
-  public function getIsProcessingContent()
-  {
-    return $this->isProcessingContent;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Mirror/AttachmentsListResponse.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Mirror/AttachmentsListResponse.php
deleted file mode 100644
index e5d310c4..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Mirror/AttachmentsListResponse.php
+++ /dev/null
@@ -1,41 +0,0 @@
-items = $items;
-  }
-  public function getItems()
-  {
-    return $this->items;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Mirror/AuthToken.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Mirror/AuthToken.php
deleted file mode 100644
index fbc0107d..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Mirror/AuthToken.php
+++ /dev/null
@@ -1,39 +0,0 @@
-authToken = $authToken;
-  }
-  public function getAuthToken()
-  {
-    return $this->authToken;
-  }
-  public function setType($type)
-  {
-    $this->type = $type;
-  }
-  public function getType()
-  {
-    return $this->type;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Mirror/Command.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Mirror/Command.php
deleted file mode 100644
index f9bbc915..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Mirror/Command.php
+++ /dev/null
@@ -1,30 +0,0 @@
-type = $type;
-  }
-  public function getType()
-  {
-    return $this->type;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Mirror/Contact.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Mirror/Contact.php
deleted file mode 100644
index 6ae03289..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Mirror/Contact.php
+++ /dev/null
@@ -1,131 +0,0 @@
-acceptCommands = $acceptCommands;
-  }
-  public function getAcceptCommands()
-  {
-    return $this->acceptCommands;
-  }
-  public function setAcceptTypes($acceptTypes)
-  {
-    $this->acceptTypes = $acceptTypes;
-  }
-  public function getAcceptTypes()
-  {
-    return $this->acceptTypes;
-  }
-  public function setDisplayName($displayName)
-  {
-    $this->displayName = $displayName;
-  }
-  public function getDisplayName()
-  {
-    return $this->displayName;
-  }
-  public function setId($id)
-  {
-    $this->id = $id;
-  }
-  public function getId()
-  {
-    return $this->id;
-  }
-  public function setImageUrls($imageUrls)
-  {
-    $this->imageUrls = $imageUrls;
-  }
-  public function getImageUrls()
-  {
-    return $this->imageUrls;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setPhoneNumber($phoneNumber)
-  {
-    $this->phoneNumber = $phoneNumber;
-  }
-  public function getPhoneNumber()
-  {
-    return $this->phoneNumber;
-  }
-  public function setPriority($priority)
-  {
-    $this->priority = $priority;
-  }
-  public function getPriority()
-  {
-    return $this->priority;
-  }
-  public function setSharingFeatures($sharingFeatures)
-  {
-    $this->sharingFeatures = $sharingFeatures;
-  }
-  public function getSharingFeatures()
-  {
-    return $this->sharingFeatures;
-  }
-  public function setSource($source)
-  {
-    $this->source = $source;
-  }
-  public function getSource()
-  {
-    return $this->source;
-  }
-  public function setSpeakableName($speakableName)
-  {
-    $this->speakableName = $speakableName;
-  }
-  public function getSpeakableName()
-  {
-    return $this->speakableName;
-  }
-  public function setType($type)
-  {
-    $this->type = $type;
-  }
-  public function getType()
-  {
-    return $this->type;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Mirror/ContactsListResponse.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Mirror/ContactsListResponse.php
deleted file mode 100644
index fc5ed798..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Mirror/ContactsListResponse.php
+++ /dev/null
@@ -1,41 +0,0 @@
-items = $items;
-  }
-  public function getItems()
-  {
-    return $this->items;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Mirror/Location.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Mirror/Location.php
deleted file mode 100644
index 57070bbe..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Mirror/Location.php
+++ /dev/null
@@ -1,93 +0,0 @@
-accuracy = $accuracy;
-  }
-  public function getAccuracy()
-  {
-    return $this->accuracy;
-  }
-  public function setAddress($address)
-  {
-    $this->address = $address;
-  }
-  public function getAddress()
-  {
-    return $this->address;
-  }
-  public function setDisplayName($displayName)
-  {
-    $this->displayName = $displayName;
-  }
-  public function getDisplayName()
-  {
-    return $this->displayName;
-  }
-  public function setId($id)
-  {
-    $this->id = $id;
-  }
-  public function getId()
-  {
-    return $this->id;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setLatitude($latitude)
-  {
-    $this->latitude = $latitude;
-  }
-  public function getLatitude()
-  {
-    return $this->latitude;
-  }
-  public function setLongitude($longitude)
-  {
-    $this->longitude = $longitude;
-  }
-  public function getLongitude()
-  {
-    return $this->longitude;
-  }
-  public function setTimestamp($timestamp)
-  {
-    $this->timestamp = $timestamp;
-  }
-  public function getTimestamp()
-  {
-    return $this->timestamp;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Mirror/LocationsListResponse.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Mirror/LocationsListResponse.php
deleted file mode 100644
index d6a6f06b..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Mirror/LocationsListResponse.php
+++ /dev/null
@@ -1,41 +0,0 @@
-items = $items;
-  }
-  public function getItems()
-  {
-    return $this->items;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Mirror/MenuItem.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Mirror/MenuItem.php
deleted file mode 100644
index b7a79504..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Mirror/MenuItem.php
+++ /dev/null
@@ -1,80 +0,0 @@
- "contextual_command",
-  );
-  public $action;
-  public $contextualCommand;
-  public $id;
-  public $payload;
-  public $removeWhenSelected;
-  protected $valuesType = 'Google_Service_Mirror_MenuValue';
-  protected $valuesDataType = 'array';
-
-  public function setAction($action)
-  {
-    $this->action = $action;
-  }
-  public function getAction()
-  {
-    return $this->action;
-  }
-  public function setContextualCommand($contextualCommand)
-  {
-    $this->contextualCommand = $contextualCommand;
-  }
-  public function getContextualCommand()
-  {
-    return $this->contextualCommand;
-  }
-  public function setId($id)
-  {
-    $this->id = $id;
-  }
-  public function getId()
-  {
-    return $this->id;
-  }
-  public function setPayload($payload)
-  {
-    $this->payload = $payload;
-  }
-  public function getPayload()
-  {
-    return $this->payload;
-  }
-  public function setRemoveWhenSelected($removeWhenSelected)
-  {
-    $this->removeWhenSelected = $removeWhenSelected;
-  }
-  public function getRemoveWhenSelected()
-  {
-    return $this->removeWhenSelected;
-  }
-  public function setValues($values)
-  {
-    $this->values = $values;
-  }
-  public function getValues()
-  {
-    return $this->values;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Mirror/MenuValue.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Mirror/MenuValue.php
deleted file mode 100644
index f89880ae..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Mirror/MenuValue.php
+++ /dev/null
@@ -1,48 +0,0 @@
-displayName = $displayName;
-  }
-  public function getDisplayName()
-  {
-    return $this->displayName;
-  }
-  public function setIconUrl($iconUrl)
-  {
-    $this->iconUrl = $iconUrl;
-  }
-  public function getIconUrl()
-  {
-    return $this->iconUrl;
-  }
-  public function setState($state)
-  {
-    $this->state = $state;
-  }
-  public function getState()
-  {
-    return $this->state;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Mirror/Notification.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Mirror/Notification.php
deleted file mode 100644
index 12bb369f..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Mirror/Notification.php
+++ /dev/null
@@ -1,77 +0,0 @@
-collection = $collection;
-  }
-  public function getCollection()
-  {
-    return $this->collection;
-  }
-  public function setItemId($itemId)
-  {
-    $this->itemId = $itemId;
-  }
-  public function getItemId()
-  {
-    return $this->itemId;
-  }
-  public function setOperation($operation)
-  {
-    $this->operation = $operation;
-  }
-  public function getOperation()
-  {
-    return $this->operation;
-  }
-  public function setUserActions($userActions)
-  {
-    $this->userActions = $userActions;
-  }
-  public function getUserActions()
-  {
-    return $this->userActions;
-  }
-  public function setUserToken($userToken)
-  {
-    $this->userToken = $userToken;
-  }
-  public function getUserToken()
-  {
-    return $this->userToken;
-  }
-  public function setVerifyToken($verifyToken)
-  {
-    $this->verifyToken = $verifyToken;
-  }
-  public function getVerifyToken()
-  {
-    return $this->verifyToken;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Mirror/NotificationConfig.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Mirror/NotificationConfig.php
deleted file mode 100644
index 74c07e64..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Mirror/NotificationConfig.php
+++ /dev/null
@@ -1,39 +0,0 @@
-deliveryTime = $deliveryTime;
-  }
-  public function getDeliveryTime()
-  {
-    return $this->deliveryTime;
-  }
-  public function setLevel($level)
-  {
-    $this->level = $level;
-  }
-  public function getLevel()
-  {
-    return $this->level;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Mirror/Resource/Accounts.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Mirror/Resource/Accounts.php
deleted file mode 100644
index bc4c2256..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Mirror/Resource/Accounts.php
+++ /dev/null
@@ -1,46 +0,0 @@
-
- *   $mirrorService = new Google_Service_Mirror(...);
- *   $accounts = $mirrorService->accounts;
- *  
- */
-class Google_Service_Mirror_Resource_Accounts extends Google_Service_Resource
-{
-  /**
-   * Inserts a new account for a user (accounts.insert)
-   *
-   * @param string $userToken The ID for the user.
-   * @param string $accountType Account type to be passed to Android Account
-   * Manager.
-   * @param string $accountName The name of the account to be passed to the
-   * Android Account Manager.
-   * @param Google_Service_Mirror_Account $postBody
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Mirror_Account
-   */
-  public function insert($userToken, $accountType, $accountName, Google_Service_Mirror_Account $postBody, $optParams = array())
-  {
-    $params = array('userToken' => $userToken, 'accountType' => $accountType, 'accountName' => $accountName, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('insert', array($params), "Google_Service_Mirror_Account");
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Mirror/Resource/Contacts.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Mirror/Resource/Contacts.php
deleted file mode 100644
index ae3356aa..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Mirror/Resource/Contacts.php
+++ /dev/null
@@ -1,108 +0,0 @@
-
- *   $mirrorService = new Google_Service_Mirror(...);
- *   $contacts = $mirrorService->contacts;
- *  
- */
-class Google_Service_Mirror_Resource_Contacts extends Google_Service_Resource
-{
-  /**
-   * Deletes a contact. (contacts.delete)
-   *
-   * @param string $id The ID of the contact.
-   * @param array $optParams Optional parameters.
-   */
-  public function delete($id, $optParams = array())
-  {
-    $params = array('id' => $id);
-    $params = array_merge($params, $optParams);
-    return $this->call('delete', array($params));
-  }
-  /**
-   * Gets a single contact by ID. (contacts.get)
-   *
-   * @param string $id The ID of the contact.
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Mirror_Contact
-   */
-  public function get($id, $optParams = array())
-  {
-    $params = array('id' => $id);
-    $params = array_merge($params, $optParams);
-    return $this->call('get', array($params), "Google_Service_Mirror_Contact");
-  }
-  /**
-   * Inserts a new contact. (contacts.insert)
-   *
-   * @param Google_Service_Mirror_Contact $postBody
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Mirror_Contact
-   */
-  public function insert(Google_Service_Mirror_Contact $postBody, $optParams = array())
-  {
-    $params = array('postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('insert', array($params), "Google_Service_Mirror_Contact");
-  }
-  /**
-   * Retrieves a list of contacts for the authenticated user.
-   * (contacts.listContacts)
-   *
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Mirror_ContactsListResponse
-   */
-  public function listContacts($optParams = array())
-  {
-    $params = array();
-    $params = array_merge($params, $optParams);
-    return $this->call('list', array($params), "Google_Service_Mirror_ContactsListResponse");
-  }
-  /**
-   * Updates a contact in place. This method supports patch semantics.
-   * (contacts.patch)
-   *
-   * @param string $id The ID of the contact.
-   * @param Google_Service_Mirror_Contact $postBody
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Mirror_Contact
-   */
-  public function patch($id, Google_Service_Mirror_Contact $postBody, $optParams = array())
-  {
-    $params = array('id' => $id, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('patch', array($params), "Google_Service_Mirror_Contact");
-  }
-  /**
-   * Updates a contact in place. (contacts.update)
-   *
-   * @param string $id The ID of the contact.
-   * @param Google_Service_Mirror_Contact $postBody
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Mirror_Contact
-   */
-  public function update($id, Google_Service_Mirror_Contact $postBody, $optParams = array())
-  {
-    $params = array('id' => $id, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('update', array($params), "Google_Service_Mirror_Contact");
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Mirror/Resource/Locations.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Mirror/Resource/Locations.php
deleted file mode 100644
index f611eff4..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Mirror/Resource/Locations.php
+++ /dev/null
@@ -1,54 +0,0 @@
-
- *   $mirrorService = new Google_Service_Mirror(...);
- *   $locations = $mirrorService->locations;
- *  
- */
-class Google_Service_Mirror_Resource_Locations extends Google_Service_Resource
-{
-  /**
-   * Gets a single location by ID. (locations.get)
-   *
-   * @param string $id The ID of the location or latest for the last known
-   * location.
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Mirror_Location
-   */
-  public function get($id, $optParams = array())
-  {
-    $params = array('id' => $id);
-    $params = array_merge($params, $optParams);
-    return $this->call('get', array($params), "Google_Service_Mirror_Location");
-  }
-  /**
-   * Retrieves a list of locations for the user. (locations.listLocations)
-   *
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Mirror_LocationsListResponse
-   */
-  public function listLocations($optParams = array())
-  {
-    $params = array();
-    $params = array_merge($params, $optParams);
-    return $this->call('list', array($params), "Google_Service_Mirror_LocationsListResponse");
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Mirror/Resource/Settings.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Mirror/Resource/Settings.php
deleted file mode 100644
index 0927bd31..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Mirror/Resource/Settings.php
+++ /dev/null
@@ -1,45 +0,0 @@
-
- *   $mirrorService = new Google_Service_Mirror(...);
- *   $settings = $mirrorService->settings;
- *  
- */
-class Google_Service_Mirror_Resource_Settings extends Google_Service_Resource
-{
-  /**
-   * Gets a single setting by ID. (settings.get)
-   *
-   * @param string $id The ID of the setting. The following IDs are valid: -
-   * locale - The key to the user’s language/locale (BCP 47 identifier) that
-   * Glassware should use to render localized content.  - timezone - The key to
-   * the user’s current time zone region as defined in the tz database. Example:
-   * America/Los_Angeles.
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Mirror_Setting
-   */
-  public function get($id, $optParams = array())
-  {
-    $params = array('id' => $id);
-    $params = array_merge($params, $optParams);
-    return $this->call('get', array($params), "Google_Service_Mirror_Setting");
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Mirror/Resource/Subscriptions.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Mirror/Resource/Subscriptions.php
deleted file mode 100644
index 8e837bd5..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Mirror/Resource/Subscriptions.php
+++ /dev/null
@@ -1,80 +0,0 @@
-
- *   $mirrorService = new Google_Service_Mirror(...);
- *   $subscriptions = $mirrorService->subscriptions;
- *  
- */
-class Google_Service_Mirror_Resource_Subscriptions extends Google_Service_Resource
-{
-  /**
-   * Deletes a subscription. (subscriptions.delete)
-   *
-   * @param string $id The ID of the subscription.
-   * @param array $optParams Optional parameters.
-   */
-  public function delete($id, $optParams = array())
-  {
-    $params = array('id' => $id);
-    $params = array_merge($params, $optParams);
-    return $this->call('delete', array($params));
-  }
-  /**
-   * Creates a new subscription. (subscriptions.insert)
-   *
-   * @param Google_Service_Mirror_Subscription $postBody
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Mirror_Subscription
-   */
-  public function insert(Google_Service_Mirror_Subscription $postBody, $optParams = array())
-  {
-    $params = array('postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('insert', array($params), "Google_Service_Mirror_Subscription");
-  }
-  /**
-   * Retrieves a list of subscriptions for the authenticated user and service.
-   * (subscriptions.listSubscriptions)
-   *
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Mirror_SubscriptionsListResponse
-   */
-  public function listSubscriptions($optParams = array())
-  {
-    $params = array();
-    $params = array_merge($params, $optParams);
-    return $this->call('list', array($params), "Google_Service_Mirror_SubscriptionsListResponse");
-  }
-  /**
-   * Updates an existing subscription in place. (subscriptions.update)
-   *
-   * @param string $id The ID of the subscription.
-   * @param Google_Service_Mirror_Subscription $postBody
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Mirror_Subscription
-   */
-  public function update($id, Google_Service_Mirror_Subscription $postBody, $optParams = array())
-  {
-    $params = array('id' => $id, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('update', array($params), "Google_Service_Mirror_Subscription");
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Mirror/Resource/Timeline.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Mirror/Resource/Timeline.php
deleted file mode 100644
index b172dcd4..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Mirror/Resource/Timeline.php
+++ /dev/null
@@ -1,121 +0,0 @@
-
- *   $mirrorService = new Google_Service_Mirror(...);
- *   $timeline = $mirrorService->timeline;
- *  
- */
-class Google_Service_Mirror_Resource_Timeline extends Google_Service_Resource
-{
-  /**
-   * Deletes a timeline item. (timeline.delete)
-   *
-   * @param string $id The ID of the timeline item.
-   * @param array $optParams Optional parameters.
-   */
-  public function delete($id, $optParams = array())
-  {
-    $params = array('id' => $id);
-    $params = array_merge($params, $optParams);
-    return $this->call('delete', array($params));
-  }
-  /**
-   * Gets a single timeline item by ID. (timeline.get)
-   *
-   * @param string $id The ID of the timeline item.
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Mirror_TimelineItem
-   */
-  public function get($id, $optParams = array())
-  {
-    $params = array('id' => $id);
-    $params = array_merge($params, $optParams);
-    return $this->call('get', array($params), "Google_Service_Mirror_TimelineItem");
-  }
-  /**
-   * Inserts a new item into the timeline. (timeline.insert)
-   *
-   * @param Google_Service_Mirror_TimelineItem $postBody
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Mirror_TimelineItem
-   */
-  public function insert(Google_Service_Mirror_TimelineItem $postBody, $optParams = array())
-  {
-    $params = array('postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('insert', array($params), "Google_Service_Mirror_TimelineItem");
-  }
-  /**
-   * Retrieves a list of timeline items for the authenticated user.
-   * (timeline.listTimeline)
-   *
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param string bundleId If provided, only items with the given bundleId
-   * will be returned.
-   * @opt_param bool includeDeleted If true, tombstone records for deleted items
-   * will be returned.
-   * @opt_param string maxResults The maximum number of items to include in the
-   * response, used for paging.
-   * @opt_param string orderBy Controls the order in which timeline items are
-   * returned.
-   * @opt_param string pageToken Token for the page of results to return.
-   * @opt_param bool pinnedOnly If true, only pinned items will be returned.
-   * @opt_param string sourceItemId If provided, only items with the given
-   * sourceItemId will be returned.
-   * @return Google_Service_Mirror_TimelineListResponse
-   */
-  public function listTimeline($optParams = array())
-  {
-    $params = array();
-    $params = array_merge($params, $optParams);
-    return $this->call('list', array($params), "Google_Service_Mirror_TimelineListResponse");
-  }
-  /**
-   * Updates a timeline item in place. This method supports patch semantics.
-   * (timeline.patch)
-   *
-   * @param string $id The ID of the timeline item.
-   * @param Google_Service_Mirror_TimelineItem $postBody
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Mirror_TimelineItem
-   */
-  public function patch($id, Google_Service_Mirror_TimelineItem $postBody, $optParams = array())
-  {
-    $params = array('id' => $id, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('patch', array($params), "Google_Service_Mirror_TimelineItem");
-  }
-  /**
-   * Updates a timeline item in place. (timeline.update)
-   *
-   * @param string $id The ID of the timeline item.
-   * @param Google_Service_Mirror_TimelineItem $postBody
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Mirror_TimelineItem
-   */
-  public function update($id, Google_Service_Mirror_TimelineItem $postBody, $optParams = array())
-  {
-    $params = array('id' => $id, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('update', array($params), "Google_Service_Mirror_TimelineItem");
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Mirror/Resource/TimelineAttachments.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Mirror/Resource/TimelineAttachments.php
deleted file mode 100644
index 458179aa..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Mirror/Resource/TimelineAttachments.php
+++ /dev/null
@@ -1,84 +0,0 @@
-
- *   $mirrorService = new Google_Service_Mirror(...);
- *   $attachments = $mirrorService->attachments;
- *  
- */
-class Google_Service_Mirror_Resource_TimelineAttachments extends Google_Service_Resource
-{
-  /**
-   * Deletes an attachment from a timeline item. (attachments.delete)
-   *
-   * @param string $itemId The ID of the timeline item the attachment belongs to.
-   * @param string $attachmentId The ID of the attachment.
-   * @param array $optParams Optional parameters.
-   */
-  public function delete($itemId, $attachmentId, $optParams = array())
-  {
-    $params = array('itemId' => $itemId, 'attachmentId' => $attachmentId);
-    $params = array_merge($params, $optParams);
-    return $this->call('delete', array($params));
-  }
-  /**
-   * Retrieves an attachment on a timeline item by item ID and attachment ID.
-   * (attachments.get)
-   *
-   * @param string $itemId The ID of the timeline item the attachment belongs to.
-   * @param string $attachmentId The ID of the attachment.
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Mirror_Attachment
-   */
-  public function get($itemId, $attachmentId, $optParams = array())
-  {
-    $params = array('itemId' => $itemId, 'attachmentId' => $attachmentId);
-    $params = array_merge($params, $optParams);
-    return $this->call('get', array($params), "Google_Service_Mirror_Attachment");
-  }
-  /**
-   * Adds a new attachment to a timeline item. (attachments.insert)
-   *
-   * @param string $itemId The ID of the timeline item the attachment belongs to.
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Mirror_Attachment
-   */
-  public function insert($itemId, $optParams = array())
-  {
-    $params = array('itemId' => $itemId);
-    $params = array_merge($params, $optParams);
-    return $this->call('insert', array($params), "Google_Service_Mirror_Attachment");
-  }
-  /**
-   * Returns a list of attachments for a timeline item.
-   * (attachments.listTimelineAttachments)
-   *
-   * @param string $itemId The ID of the timeline item whose attachments should be
-   * listed.
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Mirror_AttachmentsListResponse
-   */
-  public function listTimelineAttachments($itemId, $optParams = array())
-  {
-    $params = array('itemId' => $itemId);
-    $params = array_merge($params, $optParams);
-    return $this->call('list', array($params), "Google_Service_Mirror_AttachmentsListResponse");
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Mirror/Setting.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Mirror/Setting.php
deleted file mode 100644
index eaeaf385..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Mirror/Setting.php
+++ /dev/null
@@ -1,48 +0,0 @@
-id = $id;
-  }
-  public function getId()
-  {
-    return $this->id;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setValue($value)
-  {
-    $this->value = $value;
-  }
-  public function getValue()
-  {
-    return $this->value;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Mirror/Subscription.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Mirror/Subscription.php
deleted file mode 100644
index c8887390..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Mirror/Subscription.php
+++ /dev/null
@@ -1,104 +0,0 @@
-callbackUrl = $callbackUrl;
-  }
-  public function getCallbackUrl()
-  {
-    return $this->callbackUrl;
-  }
-  public function setCollection($collection)
-  {
-    $this->collection = $collection;
-  }
-  public function getCollection()
-  {
-    return $this->collection;
-  }
-  public function setId($id)
-  {
-    $this->id = $id;
-  }
-  public function getId()
-  {
-    return $this->id;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setNotification(Google_Service_Mirror_Notification $notification)
-  {
-    $this->notification = $notification;
-  }
-  public function getNotification()
-  {
-    return $this->notification;
-  }
-  public function setOperation($operation)
-  {
-    $this->operation = $operation;
-  }
-  public function getOperation()
-  {
-    return $this->operation;
-  }
-  public function setUpdated($updated)
-  {
-    $this->updated = $updated;
-  }
-  public function getUpdated()
-  {
-    return $this->updated;
-  }
-  public function setUserToken($userToken)
-  {
-    $this->userToken = $userToken;
-  }
-  public function getUserToken()
-  {
-    return $this->userToken;
-  }
-  public function setVerifyToken($verifyToken)
-  {
-    $this->verifyToken = $verifyToken;
-  }
-  public function getVerifyToken()
-  {
-    return $this->verifyToken;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Mirror/SubscriptionsListResponse.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Mirror/SubscriptionsListResponse.php
deleted file mode 100644
index 35323f41..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Mirror/SubscriptionsListResponse.php
+++ /dev/null
@@ -1,41 +0,0 @@
-items = $items;
-  }
-  public function getItems()
-  {
-    return $this->items;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Mirror/TimelineItem.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Mirror/TimelineItem.php
deleted file mode 100644
index fcc9e115..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Mirror/TimelineItem.php
+++ /dev/null
@@ -1,262 +0,0 @@
-attachments = $attachments;
-  }
-  public function getAttachments()
-  {
-    return $this->attachments;
-  }
-  public function setBundleId($bundleId)
-  {
-    $this->bundleId = $bundleId;
-  }
-  public function getBundleId()
-  {
-    return $this->bundleId;
-  }
-  public function setCanonicalUrl($canonicalUrl)
-  {
-    $this->canonicalUrl = $canonicalUrl;
-  }
-  public function getCanonicalUrl()
-  {
-    return $this->canonicalUrl;
-  }
-  public function setCreated($created)
-  {
-    $this->created = $created;
-  }
-  public function getCreated()
-  {
-    return $this->created;
-  }
-  public function setCreator(Google_Service_Mirror_Contact $creator)
-  {
-    $this->creator = $creator;
-  }
-  public function getCreator()
-  {
-    return $this->creator;
-  }
-  public function setDisplayTime($displayTime)
-  {
-    $this->displayTime = $displayTime;
-  }
-  public function getDisplayTime()
-  {
-    return $this->displayTime;
-  }
-  public function setEtag($etag)
-  {
-    $this->etag = $etag;
-  }
-  public function getEtag()
-  {
-    return $this->etag;
-  }
-  public function setHtml($html)
-  {
-    $this->html = $html;
-  }
-  public function getHtml()
-  {
-    return $this->html;
-  }
-  public function setId($id)
-  {
-    $this->id = $id;
-  }
-  public function getId()
-  {
-    return $this->id;
-  }
-  public function setInReplyTo($inReplyTo)
-  {
-    $this->inReplyTo = $inReplyTo;
-  }
-  public function getInReplyTo()
-  {
-    return $this->inReplyTo;
-  }
-  public function setIsBundleCover($isBundleCover)
-  {
-    $this->isBundleCover = $isBundleCover;
-  }
-  public function getIsBundleCover()
-  {
-    return $this->isBundleCover;
-  }
-  public function setIsDeleted($isDeleted)
-  {
-    $this->isDeleted = $isDeleted;
-  }
-  public function getIsDeleted()
-  {
-    return $this->isDeleted;
-  }
-  public function setIsPinned($isPinned)
-  {
-    $this->isPinned = $isPinned;
-  }
-  public function getIsPinned()
-  {
-    return $this->isPinned;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setLocation(Google_Service_Mirror_Location $location)
-  {
-    $this->location = $location;
-  }
-  public function getLocation()
-  {
-    return $this->location;
-  }
-  public function setMenuItems($menuItems)
-  {
-    $this->menuItems = $menuItems;
-  }
-  public function getMenuItems()
-  {
-    return $this->menuItems;
-  }
-  public function setNotification(Google_Service_Mirror_NotificationConfig $notification)
-  {
-    $this->notification = $notification;
-  }
-  public function getNotification()
-  {
-    return $this->notification;
-  }
-  public function setPinScore($pinScore)
-  {
-    $this->pinScore = $pinScore;
-  }
-  public function getPinScore()
-  {
-    return $this->pinScore;
-  }
-  public function setRecipients($recipients)
-  {
-    $this->recipients = $recipients;
-  }
-  public function getRecipients()
-  {
-    return $this->recipients;
-  }
-  public function setSelfLink($selfLink)
-  {
-    $this->selfLink = $selfLink;
-  }
-  public function getSelfLink()
-  {
-    return $this->selfLink;
-  }
-  public function setSourceItemId($sourceItemId)
-  {
-    $this->sourceItemId = $sourceItemId;
-  }
-  public function getSourceItemId()
-  {
-    return $this->sourceItemId;
-  }
-  public function setSpeakableText($speakableText)
-  {
-    $this->speakableText = $speakableText;
-  }
-  public function getSpeakableText()
-  {
-    return $this->speakableText;
-  }
-  public function setSpeakableType($speakableType)
-  {
-    $this->speakableType = $speakableType;
-  }
-  public function getSpeakableType()
-  {
-    return $this->speakableType;
-  }
-  public function setText($text)
-  {
-    $this->text = $text;
-  }
-  public function getText()
-  {
-    return $this->text;
-  }
-  public function setTitle($title)
-  {
-    $this->title = $title;
-  }
-  public function getTitle()
-  {
-    return $this->title;
-  }
-  public function setUpdated($updated)
-  {
-    $this->updated = $updated;
-  }
-  public function getUpdated()
-  {
-    return $this->updated;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Mirror/TimelineListResponse.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Mirror/TimelineListResponse.php
deleted file mode 100644
index f19256c7..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Mirror/TimelineListResponse.php
+++ /dev/null
@@ -1,50 +0,0 @@
-items = $items;
-  }
-  public function getItems()
-  {
-    return $this->items;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setNextPageToken($nextPageToken)
-  {
-    $this->nextPageToken = $nextPageToken;
-  }
-  public function getNextPageToken()
-  {
-    return $this->nextPageToken;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Mirror/UserAction.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Mirror/UserAction.php
deleted file mode 100644
index e2f9ade5..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Mirror/UserAction.php
+++ /dev/null
@@ -1,39 +0,0 @@
-payload = $payload;
-  }
-  public function getPayload()
-  {
-    return $this->payload;
-  }
-  public function setType($type)
-  {
-    $this->type = $type;
-  }
-  public function getType()
-  {
-    return $this->type;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Mirror/UserData.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Mirror/UserData.php
deleted file mode 100644
index 83fc2a62..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Mirror/UserData.php
+++ /dev/null
@@ -1,39 +0,0 @@
-key = $key;
-  }
-  public function getKey()
-  {
-    return $this->key;
-  }
-  public function setValue($value)
-  {
-    $this->value = $value;
-  }
-  public function getValue()
-  {
-    return $this->value;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Monitoring.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Monitoring.php
deleted file mode 100644
index 69d784a4..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Monitoring.php
+++ /dev/null
@@ -1,396 +0,0 @@
-
- * Manages your Stackdriver Monitoring data and configurations. Most projects
- * must be associated with a Stackdriver account, with a few exceptions as noted
- * on the individual method pages.

- *
- * 

- * For more information about this service, see the API
- * Documentation
- * 

- *
- * @author Google, Inc.
- */
-class Google_Service_Monitoring extends Google_Service
-{
-  /** View and manage your data across Google Cloud Platform services. */
-  const CLOUD_PLATFORM =
-      "https://www.googleapis.com/auth/cloud-platform";
-  /** View and write monitoring data for all of your Google and third-party Cloud and API projects. */
-  const MONITORING =
-      "https://www.googleapis.com/auth/monitoring";
-  /** View monitoring data for all of your Google Cloud and third-party projects. */
-  const MONITORING_READ =
-      "https://www.googleapis.com/auth/monitoring.read";
-  /** Publish metric data to your Google Cloud projects. */
-  const MONITORING_WRITE =
-      "https://www.googleapis.com/auth/monitoring.write";
-
-  public $projects_collectdTimeSeries;
-  public $projects_groups;
-  public $projects_groups_members;
-  public $projects_metricDescriptors;
-  public $projects_monitoredResourceDescriptors;
-  public $projects_timeSeries;
-  
-  /**
-   * Constructs the internal representation of the Monitoring service.
-   *
-   * @param Google_Client $client
-   */
-  public function __construct(Google_Client $client)
-  {
-    parent::__construct($client);
-    $this->rootUrl = 'https://monitoring.googleapis.com/';
-    $this->servicePath = '';
-    $this->version = 'v3';
-    $this->serviceName = 'monitoring';
-
-    $this->projects_collectdTimeSeries = new Google_Service_Monitoring_Resource_ProjectsCollectdTimeSeries(
-        $this,
-        $this->serviceName,
-        'collectdTimeSeries',
-        array(
-          'methods' => array(
-            'create' => array(
-              'path' => 'v3/{+name}/collectdTimeSeries',
-              'httpMethod' => 'POST',
-              'parameters' => array(
-                'name' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),
-          )
-        )
-    );
-    $this->projects_groups = new Google_Service_Monitoring_Resource_ProjectsGroups(
-        $this,
-        $this->serviceName,
-        'groups',
-        array(
-          'methods' => array(
-            'create' => array(
-              'path' => 'v3/{+name}/groups',
-              'httpMethod' => 'POST',
-              'parameters' => array(
-                'name' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'validateOnly' => array(
-                  'location' => 'query',
-                  'type' => 'boolean',
-                ),
-              ),
-            ),'delete' => array(
-              'path' => 'v3/{+name}',
-              'httpMethod' => 'DELETE',
-              'parameters' => array(
-                'name' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'get' => array(
-              'path' => 'v3/{+name}',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'name' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'list' => array(
-              'path' => 'v3/{+name}/groups',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'name' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'childrenOfGroup' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'descendantsOfGroup' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'pageToken' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'pageSize' => array(
-                  'location' => 'query',
-                  'type' => 'integer',
-                ),
-                'ancestorsOfGroup' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-              ),
-            ),'update' => array(
-              'path' => 'v3/{+name}',
-              'httpMethod' => 'PUT',
-              'parameters' => array(
-                'name' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'validateOnly' => array(
-                  'location' => 'query',
-                  'type' => 'boolean',
-                ),
-              ),
-            ),
-          )
-        )
-    );
-    $this->projects_groups_members = new Google_Service_Monitoring_Resource_ProjectsGroupsMembers(
-        $this,
-        $this->serviceName,
-        'members',
-        array(
-          'methods' => array(
-            'list' => array(
-              'path' => 'v3/{+name}/members',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'name' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'interval.endTime' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'filter' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'pageToken' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'pageSize' => array(
-                  'location' => 'query',
-                  'type' => 'integer',
-                ),
-                'interval.startTime' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-              ),
-            ),
-          )
-        )
-    );
-    $this->projects_metricDescriptors = new Google_Service_Monitoring_Resource_ProjectsMetricDescriptors(
-        $this,
-        $this->serviceName,
-        'metricDescriptors',
-        array(
-          'methods' => array(
-            'create' => array(
-              'path' => 'v3/{+name}/metricDescriptors',
-              'httpMethod' => 'POST',
-              'parameters' => array(
-                'name' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'delete' => array(
-              'path' => 'v3/{+name}',
-              'httpMethod' => 'DELETE',
-              'parameters' => array(
-                'name' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'get' => array(
-              'path' => 'v3/{+name}',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'name' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'list' => array(
-              'path' => 'v3/{+name}/metricDescriptors',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'name' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'pageToken' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'pageSize' => array(
-                  'location' => 'query',
-                  'type' => 'integer',
-                ),
-                'filter' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-              ),
-            ),
-          )
-        )
-    );
-    $this->projects_monitoredResourceDescriptors = new Google_Service_Monitoring_Resource_ProjectsMonitoredResourceDescriptors(
-        $this,
-        $this->serviceName,
-        'monitoredResourceDescriptors',
-        array(
-          'methods' => array(
-            'get' => array(
-              'path' => 'v3/{+name}',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'name' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'list' => array(
-              'path' => 'v3/{+name}/monitoredResourceDescriptors',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'name' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'pageToken' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'pageSize' => array(
-                  'location' => 'query',
-                  'type' => 'integer',
-                ),
-                'filter' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-              ),
-            ),
-          )
-        )
-    );
-    $this->projects_timeSeries = new Google_Service_Monitoring_Resource_ProjectsTimeSeries(
-        $this,
-        $this->serviceName,
-        'timeSeries',
-        array(
-          'methods' => array(
-            'create' => array(
-              'path' => 'v3/{+name}/timeSeries',
-              'httpMethod' => 'POST',
-              'parameters' => array(
-                'name' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'list' => array(
-              'path' => 'v3/{+name}/timeSeries',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'name' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'aggregation.crossSeriesReducer' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'filter' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'aggregation.perSeriesAligner' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'pageToken' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'interval.startTime' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'view' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'aggregation.groupByFields' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                  'repeated' => true,
-                ),
-                'interval.endTime' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'aggregation.alignmentPeriod' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'pageSize' => array(
-                  'location' => 'query',
-                  'type' => 'integer',
-                ),
-                'orderBy' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-              ),
-            ),
-          )
-        )
-    );
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Monitoring/BucketOptions.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Monitoring/BucketOptions.php
deleted file mode 100644
index 15a2b9e5..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Monitoring/BucketOptions.php
+++ /dev/null
@@ -1,51 +0,0 @@
-explicitBuckets = $explicitBuckets;
-  }
-  public function getExplicitBuckets()
-  {
-    return $this->explicitBuckets;
-  }
-  public function setExponentialBuckets(Google_Service_Monitoring_Exponential $exponentialBuckets)
-  {
-    $this->exponentialBuckets = $exponentialBuckets;
-  }
-  public function getExponentialBuckets()
-  {
-    return $this->exponentialBuckets;
-  }
-  public function setLinearBuckets(Google_Service_Monitoring_Linear $linearBuckets)
-  {
-    $this->linearBuckets = $linearBuckets;
-  }
-  public function getLinearBuckets()
-  {
-    return $this->linearBuckets;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Monitoring/CollectdPayload.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Monitoring/CollectdPayload.php
deleted file mode 100644
index 42564424..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Monitoring/CollectdPayload.php
+++ /dev/null
@@ -1,96 +0,0 @@
-endTime = $endTime;
-  }
-  public function getEndTime()
-  {
-    return $this->endTime;
-  }
-  public function setMetadata($metadata)
-  {
-    $this->metadata = $metadata;
-  }
-  public function getMetadata()
-  {
-    return $this->metadata;
-  }
-  public function setPlugin($plugin)
-  {
-    $this->plugin = $plugin;
-  }
-  public function getPlugin()
-  {
-    return $this->plugin;
-  }
-  public function setPluginInstance($pluginInstance)
-  {
-    $this->pluginInstance = $pluginInstance;
-  }
-  public function getPluginInstance()
-  {
-    return $this->pluginInstance;
-  }
-  public function setStartTime($startTime)
-  {
-    $this->startTime = $startTime;
-  }
-  public function getStartTime()
-  {
-    return $this->startTime;
-  }
-  public function setType($type)
-  {
-    $this->type = $type;
-  }
-  public function getType()
-  {
-    return $this->type;
-  }
-  public function setTypeInstance($typeInstance)
-  {
-    $this->typeInstance = $typeInstance;
-  }
-  public function getTypeInstance()
-  {
-    return $this->typeInstance;
-  }
-  public function setValues($values)
-  {
-    $this->values = $values;
-  }
-  public function getValues()
-  {
-    return $this->values;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Monitoring/CollectdValue.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Monitoring/CollectdValue.php
deleted file mode 100644
index 5ce4cab8..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Monitoring/CollectdValue.php
+++ /dev/null
@@ -1,49 +0,0 @@
-dataSourceName = $dataSourceName;
-  }
-  public function getDataSourceName()
-  {
-    return $this->dataSourceName;
-  }
-  public function setDataSourceType($dataSourceType)
-  {
-    $this->dataSourceType = $dataSourceType;
-  }
-  public function getDataSourceType()
-  {
-    return $this->dataSourceType;
-  }
-  public function setValue(Google_Service_Monitoring_TypedValue $value)
-  {
-    $this->value = $value;
-  }
-  public function getValue()
-  {
-    return $this->value;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Monitoring/CreateCollectdTimeSeriesRequest.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Monitoring/CreateCollectdTimeSeriesRequest.php
deleted file mode 100644
index 9c461bf5..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Monitoring/CreateCollectdTimeSeriesRequest.php
+++ /dev/null
@@ -1,51 +0,0 @@
-collectdPayloads = $collectdPayloads;
-  }
-  public function getCollectdPayloads()
-  {
-    return $this->collectdPayloads;
-  }
-  public function setCollectdVersion($collectdVersion)
-  {
-    $this->collectdVersion = $collectdVersion;
-  }
-  public function getCollectdVersion()
-  {
-    return $this->collectdVersion;
-  }
-  public function setResource(Google_Service_Monitoring_MonitoredResource $resource)
-  {
-    $this->resource = $resource;
-  }
-  public function getResource()
-  {
-    return $this->resource;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Monitoring/CreateTimeSeriesRequest.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Monitoring/CreateTimeSeriesRequest.php
deleted file mode 100644
index 3199053d..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Monitoring/CreateTimeSeriesRequest.php
+++ /dev/null
@@ -1,32 +0,0 @@
-timeSeries = $timeSeries;
-  }
-  public function getTimeSeries()
-  {
-    return $this->timeSeries;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Monitoring/Distribution.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Monitoring/Distribution.php
deleted file mode 100644
index 42bdc3c4..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Monitoring/Distribution.php
+++ /dev/null
@@ -1,78 +0,0 @@
-bucketCounts = $bucketCounts;
-  }
-  public function getBucketCounts()
-  {
-    return $this->bucketCounts;
-  }
-  public function setBucketOptions(Google_Service_Monitoring_BucketOptions $bucketOptions)
-  {
-    $this->bucketOptions = $bucketOptions;
-  }
-  public function getBucketOptions()
-  {
-    return $this->bucketOptions;
-  }
-  public function setCount($count)
-  {
-    $this->count = $count;
-  }
-  public function getCount()
-  {
-    return $this->count;
-  }
-  public function setMean($mean)
-  {
-    $this->mean = $mean;
-  }
-  public function getMean()
-  {
-    return $this->mean;
-  }
-  public function setRange(Google_Service_Monitoring_Range $range)
-  {
-    $this->range = $range;
-  }
-  public function getRange()
-  {
-    return $this->range;
-  }
-  public function setSumOfSquaredDeviation($sumOfSquaredDeviation)
-  {
-    $this->sumOfSquaredDeviation = $sumOfSquaredDeviation;
-  }
-  public function getSumOfSquaredDeviation()
-  {
-    return $this->sumOfSquaredDeviation;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Monitoring/Explicit.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Monitoring/Explicit.php
deleted file mode 100644
index 7a65c161..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Monitoring/Explicit.php
+++ /dev/null
@@ -1,31 +0,0 @@
-bounds = $bounds;
-  }
-  public function getBounds()
-  {
-    return $this->bounds;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Monitoring/Exponential.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Monitoring/Exponential.php
deleted file mode 100644
index bec5db2f..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Monitoring/Exponential.php
+++ /dev/null
@@ -1,48 +0,0 @@
-growthFactor = $growthFactor;
-  }
-  public function getGrowthFactor()
-  {
-    return $this->growthFactor;
-  }
-  public function setNumFiniteBuckets($numFiniteBuckets)
-  {
-    $this->numFiniteBuckets = $numFiniteBuckets;
-  }
-  public function getNumFiniteBuckets()
-  {
-    return $this->numFiniteBuckets;
-  }
-  public function setScale($scale)
-  {
-    $this->scale = $scale;
-  }
-  public function getScale()
-  {
-    return $this->scale;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Monitoring/Field.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Monitoring/Field.php
deleted file mode 100644
index 8c777474..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Monitoring/Field.php
+++ /dev/null
@@ -1,113 +0,0 @@
-cardinality = $cardinality;
-  }
-  public function getCardinality()
-  {
-    return $this->cardinality;
-  }
-  public function setDefaultValue($defaultValue)
-  {
-    $this->defaultValue = $defaultValue;
-  }
-  public function getDefaultValue()
-  {
-    return $this->defaultValue;
-  }
-  public function setJsonName($jsonName)
-  {
-    $this->jsonName = $jsonName;
-  }
-  public function getJsonName()
-  {
-    return $this->jsonName;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setName($name)
-  {
-    $this->name = $name;
-  }
-  public function getName()
-  {
-    return $this->name;
-  }
-  public function setNumber($number)
-  {
-    $this->number = $number;
-  }
-  public function getNumber()
-  {
-    return $this->number;
-  }
-  public function setOneofIndex($oneofIndex)
-  {
-    $this->oneofIndex = $oneofIndex;
-  }
-  public function getOneofIndex()
-  {
-    return $this->oneofIndex;
-  }
-  public function setOptions($options)
-  {
-    $this->options = $options;
-  }
-  public function getOptions()
-  {
-    return $this->options;
-  }
-  public function setPacked($packed)
-  {
-    $this->packed = $packed;
-  }
-  public function getPacked()
-  {
-    return $this->packed;
-  }
-  public function setTypeUrl($typeUrl)
-  {
-    $this->typeUrl = $typeUrl;
-  }
-  public function getTypeUrl()
-  {
-    return $this->typeUrl;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Monitoring/Group.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Monitoring/Group.php
deleted file mode 100644
index daba3e52..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Monitoring/Group.php
+++ /dev/null
@@ -1,66 +0,0 @@
-displayName = $displayName;
-  }
-  public function getDisplayName()
-  {
-    return $this->displayName;
-  }
-  public function setFilter($filter)
-  {
-    $this->filter = $filter;
-  }
-  public function getFilter()
-  {
-    return $this->filter;
-  }
-  public function setIsCluster($isCluster)
-  {
-    $this->isCluster = $isCluster;
-  }
-  public function getIsCluster()
-  {
-    return $this->isCluster;
-  }
-  public function setName($name)
-  {
-    $this->name = $name;
-  }
-  public function getName()
-  {
-    return $this->name;
-  }
-  public function setParentName($parentName)
-  {
-    $this->parentName = $parentName;
-  }
-  public function getParentName()
-  {
-    return $this->parentName;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Monitoring/LabelDescriptor.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Monitoring/LabelDescriptor.php
deleted file mode 100644
index 1cdde867..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Monitoring/LabelDescriptor.php
+++ /dev/null
@@ -1,48 +0,0 @@
-description = $description;
-  }
-  public function getDescription()
-  {
-    return $this->description;
-  }
-  public function setKey($key)
-  {
-    $this->key = $key;
-  }
-  public function getKey()
-  {
-    return $this->key;
-  }
-  public function setValueType($valueType)
-  {
-    $this->valueType = $valueType;
-  }
-  public function getValueType()
-  {
-    return $this->valueType;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Monitoring/Linear.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Monitoring/Linear.php
deleted file mode 100644
index ccfc8fbc..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Monitoring/Linear.php
+++ /dev/null
@@ -1,48 +0,0 @@
-numFiniteBuckets = $numFiniteBuckets;
-  }
-  public function getNumFiniteBuckets()
-  {
-    return $this->numFiniteBuckets;
-  }
-  public function setOffset($offset)
-  {
-    $this->offset = $offset;
-  }
-  public function getOffset()
-  {
-    return $this->offset;
-  }
-  public function setWidth($width)
-  {
-    $this->width = $width;
-  }
-  public function getWidth()
-  {
-    return $this->width;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Monitoring/ListGroupMembersResponse.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Monitoring/ListGroupMembersResponse.php
deleted file mode 100644
index c48880a4..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Monitoring/ListGroupMembersResponse.php
+++ /dev/null
@@ -1,50 +0,0 @@
-members = $members;
-  }
-  public function getMembers()
-  {
-    return $this->members;
-  }
-  public function setNextPageToken($nextPageToken)
-  {
-    $this->nextPageToken = $nextPageToken;
-  }
-  public function getNextPageToken()
-  {
-    return $this->nextPageToken;
-  }
-  public function setTotalSize($totalSize)
-  {
-    $this->totalSize = $totalSize;
-  }
-  public function getTotalSize()
-  {
-    return $this->totalSize;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Monitoring/ListGroupsResponse.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Monitoring/ListGroupsResponse.php
deleted file mode 100644
index d5478fdf..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Monitoring/ListGroupsResponse.php
+++ /dev/null
@@ -1,41 +0,0 @@
-group = $group;
-  }
-  public function getGroup()
-  {
-    return $this->group;
-  }
-  public function setNextPageToken($nextPageToken)
-  {
-    $this->nextPageToken = $nextPageToken;
-  }
-  public function getNextPageToken()
-  {
-    return $this->nextPageToken;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Monitoring/ListMetricDescriptorsResponse.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Monitoring/ListMetricDescriptorsResponse.php
deleted file mode 100644
index 2c06e5ef..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Monitoring/ListMetricDescriptorsResponse.php
+++ /dev/null
@@ -1,41 +0,0 @@
-metricDescriptors = $metricDescriptors;
-  }
-  public function getMetricDescriptors()
-  {
-    return $this->metricDescriptors;
-  }
-  public function setNextPageToken($nextPageToken)
-  {
-    $this->nextPageToken = $nextPageToken;
-  }
-  public function getNextPageToken()
-  {
-    return $this->nextPageToken;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Monitoring/ListMonitoredResourceDescriptorsResponse.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Monitoring/ListMonitoredResourceDescriptorsResponse.php
deleted file mode 100644
index 358881f6..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Monitoring/ListMonitoredResourceDescriptorsResponse.php
+++ /dev/null
@@ -1,41 +0,0 @@
-nextPageToken = $nextPageToken;
-  }
-  public function getNextPageToken()
-  {
-    return $this->nextPageToken;
-  }
-  public function setResourceDescriptors($resourceDescriptors)
-  {
-    $this->resourceDescriptors = $resourceDescriptors;
-  }
-  public function getResourceDescriptors()
-  {
-    return $this->resourceDescriptors;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Monitoring/ListTimeSeriesResponse.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Monitoring/ListTimeSeriesResponse.php
deleted file mode 100644
index 8bbfcccd..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Monitoring/ListTimeSeriesResponse.php
+++ /dev/null
@@ -1,41 +0,0 @@
-nextPageToken = $nextPageToken;
-  }
-  public function getNextPageToken()
-  {
-    return $this->nextPageToken;
-  }
-  public function setTimeSeries($timeSeries)
-  {
-    $this->timeSeries = $timeSeries;
-  }
-  public function getTimeSeries()
-  {
-    return $this->timeSeries;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Monitoring/Metric.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Monitoring/Metric.php
deleted file mode 100644
index 01bc87ed..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Monitoring/Metric.php
+++ /dev/null
@@ -1,39 +0,0 @@
-labels = $labels;
-  }
-  public function getLabels()
-  {
-    return $this->labels;
-  }
-  public function setType($type)
-  {
-    $this->type = $type;
-  }
-  public function getType()
-  {
-    return $this->type;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Monitoring/MetricDescriptor.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Monitoring/MetricDescriptor.php
deleted file mode 100644
index ccb29198..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Monitoring/MetricDescriptor.php
+++ /dev/null
@@ -1,95 +0,0 @@
-description = $description;
-  }
-  public function getDescription()
-  {
-    return $this->description;
-  }
-  public function setDisplayName($displayName)
-  {
-    $this->displayName = $displayName;
-  }
-  public function getDisplayName()
-  {
-    return $this->displayName;
-  }
-  public function setLabels($labels)
-  {
-    $this->labels = $labels;
-  }
-  public function getLabels()
-  {
-    return $this->labels;
-  }
-  public function setMetricKind($metricKind)
-  {
-    $this->metricKind = $metricKind;
-  }
-  public function getMetricKind()
-  {
-    return $this->metricKind;
-  }
-  public function setName($name)
-  {
-    $this->name = $name;
-  }
-  public function getName()
-  {
-    return $this->name;
-  }
-  public function setType($type)
-  {
-    $this->type = $type;
-  }
-  public function getType()
-  {
-    return $this->type;
-  }
-  public function setUnit($unit)
-  {
-    $this->unit = $unit;
-  }
-  public function getUnit()
-  {
-    return $this->unit;
-  }
-  public function setValueType($valueType)
-  {
-    $this->valueType = $valueType;
-  }
-  public function getValueType()
-  {
-    return $this->valueType;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Monitoring/MonitoredResource.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Monitoring/MonitoredResource.php
deleted file mode 100644
index 7845d3dd..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Monitoring/MonitoredResource.php
+++ /dev/null
@@ -1,39 +0,0 @@
-labels = $labels;
-  }
-  public function getLabels()
-  {
-    return $this->labels;
-  }
-  public function setType($type)
-  {
-    $this->type = $type;
-  }
-  public function getType()
-  {
-    return $this->type;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Monitoring/MonitoredResourceDescriptor.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Monitoring/MonitoredResourceDescriptor.php
deleted file mode 100644
index c664f894..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Monitoring/MonitoredResourceDescriptor.php
+++ /dev/null
@@ -1,68 +0,0 @@
-description = $description;
-  }
-  public function getDescription()
-  {
-    return $this->description;
-  }
-  public function setDisplayName($displayName)
-  {
-    $this->displayName = $displayName;
-  }
-  public function getDisplayName()
-  {
-    return $this->displayName;
-  }
-  public function setLabels($labels)
-  {
-    $this->labels = $labels;
-  }
-  public function getLabels()
-  {
-    return $this->labels;
-  }
-  public function setName($name)
-  {
-    $this->name = $name;
-  }
-  public function getName()
-  {
-    return $this->name;
-  }
-  public function setType($type)
-  {
-    $this->type = $type;
-  }
-  public function getType()
-  {
-    return $this->type;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Monitoring/MonitoringEmpty.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Monitoring/MonitoringEmpty.php
deleted file mode 100644
index e6becdc2..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Monitoring/MonitoringEmpty.php
+++ /dev/null
@@ -1,20 +0,0 @@
-name = $name;
-  }
-  public function getName()
-  {
-    return $this->name;
-  }
-  public function setValue($value)
-  {
-    $this->value = $value;
-  }
-  public function getValue()
-  {
-    return $this->value;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Monitoring/Point.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Monitoring/Point.php
deleted file mode 100644
index b565897c..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Monitoring/Point.php
+++ /dev/null
@@ -1,41 +0,0 @@
-interval = $interval;
-  }
-  public function getInterval()
-  {
-    return $this->interval;
-  }
-  public function setValue(Google_Service_Monitoring_TypedValue $value)
-  {
-    $this->value = $value;
-  }
-  public function getValue()
-  {
-    return $this->value;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Monitoring/Range.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Monitoring/Range.php
deleted file mode 100644
index ca54281f..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Monitoring/Range.php
+++ /dev/null
@@ -1,39 +0,0 @@
-max = $max;
-  }
-  public function getMax()
-  {
-    return $this->max;
-  }
-  public function setMin($min)
-  {
-    $this->min = $min;
-  }
-  public function getMin()
-  {
-    return $this->min;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Monitoring/Resource/Projects.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Monitoring/Resource/Projects.php
deleted file mode 100644
index 92cf8f9c..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Monitoring/Resource/Projects.php
+++ /dev/null
@@ -1,28 +0,0 @@
-
- *   $monitoringService = new Google_Service_Monitoring(...);
- *   $projects = $monitoringService->projects;
- *  
- */
-class Google_Service_Monitoring_Resource_Projects extends Google_Service_Resource
-{
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Monitoring/Resource/ProjectsCollectdTimeSeries.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Monitoring/Resource/ProjectsCollectdTimeSeries.php
deleted file mode 100644
index da528965..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Monitoring/Resource/ProjectsCollectdTimeSeries.php
+++ /dev/null
@@ -1,45 +0,0 @@
-
- *   $monitoringService = new Google_Service_Monitoring(...);
- *   $collectdTimeSeries = $monitoringService->collectdTimeSeries;
- *  
- */
-class Google_Service_Monitoring_Resource_ProjectsCollectdTimeSeries extends Google_Service_Resource
-{
-  /**
-   * Stackdriver Monitoring Agent only: Creates a new time series.This method is
-   * only for use by the Stackdriver Monitoring Agent. Use
-   * projects.timeSeries.create instead. (collectdTimeSeries.create)
-   *
-   * @param string $name The project in which to create the time series. The
-   * format is "projects/PROJECT_ID_OR_NUMBER".
-   * @param Google_Service_Monitoring_CreateCollectdTimeSeriesRequest $postBody
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Monitoring_MonitoringEmpty
-   */
-  public function create($name, Google_Service_Monitoring_CreateCollectdTimeSeriesRequest $postBody, $optParams = array())
-  {
-    $params = array('name' => $name, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('create', array($params), "Google_Service_Monitoring_MonitoringEmpty");
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Monitoring/Resource/ProjectsGroups.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Monitoring/Resource/ProjectsGroups.php
deleted file mode 100644
index 75c24fd0..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Monitoring/Resource/ProjectsGroups.php
+++ /dev/null
@@ -1,130 +0,0 @@
-
- *   $monitoringService = new Google_Service_Monitoring(...);
- *   $groups = $monitoringService->groups;
- *  
- */
-class Google_Service_Monitoring_Resource_ProjectsGroups extends Google_Service_Resource
-{
-  /**
-   * Creates a new group. (groups.create)
-   *
-   * @param string $name The project in which to create the group. The format is
-   * "projects/{project_id_or_number}".
-   * @param Google_Service_Monitoring_Group $postBody
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param bool validateOnly If true, validate this request but do not create
-   * the group.
-   * @return Google_Service_Monitoring_Group
-   */
-  public function create($name, Google_Service_Monitoring_Group $postBody, $optParams = array())
-  {
-    $params = array('name' => $name, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('create', array($params), "Google_Service_Monitoring_Group");
-  }
-  /**
-   * Deletes an existing group. (groups.delete)
-   *
-   * @param string $name The group to delete. The format is
-   * "projects/{project_id_or_number}/groups/{group_id}".
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Monitoring_MonitoringEmpty
-   */
-  public function delete($name, $optParams = array())
-  {
-    $params = array('name' => $name);
-    $params = array_merge($params, $optParams);
-    return $this->call('delete', array($params), "Google_Service_Monitoring_MonitoringEmpty");
-  }
-  /**
-   * Gets a single group. (groups.get)
-   *
-   * @param string $name The group to retrieve. The format is
-   * "projects/{project_id_or_number}/groups/{group_id}".
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Monitoring_Group
-   */
-  public function get($name, $optParams = array())
-  {
-    $params = array('name' => $name);
-    $params = array_merge($params, $optParams);
-    return $this->call('get', array($params), "Google_Service_Monitoring_Group");
-  }
-  /**
-   * Lists the existing groups. (groups.listProjectsGroups)
-   *
-   * @param string $name The project whose groups are to be listed. The format is
-   * "projects/{project_id_or_number}".
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param string childrenOfGroup A group name:
-   * "projects/{project_id_or_number}/groups/{group_id}". Returns groups whose
-   * parentName field contains the group name. If no groups have this parent, the
-   * results are empty.
-   * @opt_param string descendantsOfGroup A group name:
-   * "projects/{project_id_or_number}/groups/{group_id}". Returns the descendants
-   * of the specified group. This is a superset of the results returned by the
-   * childrenOfGroup filter, and includes children-of-children, and so forth.
-   * @opt_param string pageToken If this field is not empty then it must contain
-   * the nextPageToken value returned by a previous call to this method. Using
-   * this field causes the method to return additional results from the previous
-   * method call.
-   * @opt_param int pageSize A positive number that is the maximum number of
-   * results to return.
-   * @opt_param string ancestorsOfGroup A group name:
-   * "projects/{project_id_or_number}/groups/{group_id}". Returns groups that are
-   * ancestors of the specified group. The groups are returned in order, starting
-   * with the immediate parent and ending with the most distant ancestor. If the
-   * specified group has no immediate parent, the results are empty.
-   * @return Google_Service_Monitoring_ListGroupsResponse
-   */
-  public function listProjectsGroups($name, $optParams = array())
-  {
-    $params = array('name' => $name);
-    $params = array_merge($params, $optParams);
-    return $this->call('list', array($params), "Google_Service_Monitoring_ListGroupsResponse");
-  }
-  /**
-   * Updates an existing group. You can change any group attributes except name.
-   * (groups.update)
-   *
-   * @param string $name Output only. The name of this group. The format is
-   * "projects/{project_id_or_number}/groups/{group_id}". When creating a group,
-   * this field is ignored and a new name is created consisting of the project
-   * specified in the call to CreateGroup and a unique {group_id} that is
-   * generated automatically.
-   * @param Google_Service_Monitoring_Group $postBody
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param bool validateOnly If true, validate this request but do not update
-   * the existing group.
-   * @return Google_Service_Monitoring_Group
-   */
-  public function update($name, Google_Service_Monitoring_Group $postBody, $optParams = array())
-  {
-    $params = array('name' => $name, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('update', array($params), "Google_Service_Monitoring_Group");
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Monitoring/Resource/ProjectsGroupsMembers.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Monitoring/Resource/ProjectsGroupsMembers.php
deleted file mode 100644
index a0325309..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Monitoring/Resource/ProjectsGroupsMembers.php
+++ /dev/null
@@ -1,59 +0,0 @@
-
- *   $monitoringService = new Google_Service_Monitoring(...);
- *   $members = $monitoringService->members;
- *  
- */
-class Google_Service_Monitoring_Resource_ProjectsGroupsMembers extends Google_Service_Resource
-{
-  /**
-   * Lists the monitored resources that are members of a group.
-   * (members.listProjectsGroupsMembers)
-   *
-   * @param string $name The group whose members are listed. The format is
-   * "projects/{project_id_or_number}/groups/{group_id}".
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param string interval.endTime Required. The end of the time interval.
-   * @opt_param string filter An optional list filter describing the members to be
-   * returned. The filter may reference the type, labels, and metadata of
-   * monitored resources that comprise the group. For example, to return only
-   * resources representing Compute Engine VM instances, use this filter:
-   * resource.type = "gce_instance"
-   * @opt_param string pageToken If this field is not empty then it must contain
-   * the nextPageToken value returned by a previous call to this method. Using
-   * this field causes the method to return additional results from the previous
-   * method call.
-   * @opt_param int pageSize A positive number that is the maximum number of
-   * results to return.
-   * @opt_param string interval.startTime Optional. The beginning of the time
-   * interval. The default value for the start time is the end time. The start
-   * time must not be later than the end time.
-   * @return Google_Service_Monitoring_ListGroupMembersResponse
-   */
-  public function listProjectsGroupsMembers($name, $optParams = array())
-  {
-    $params = array('name' => $name);
-    $params = array_merge($params, $optParams);
-    return $this->call('list', array($params), "Google_Service_Monitoring_ListGroupMembersResponse");
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Monitoring/Resource/ProjectsMetricDescriptors.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Monitoring/Resource/ProjectsMetricDescriptors.php
deleted file mode 100644
index a374b79e..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Monitoring/Resource/ProjectsMetricDescriptors.php
+++ /dev/null
@@ -1,106 +0,0 @@
-
- *   $monitoringService = new Google_Service_Monitoring(...);
- *   $metricDescriptors = $monitoringService->metricDescriptors;
- *  
- */
-class Google_Service_Monitoring_Resource_ProjectsMetricDescriptors extends Google_Service_Resource
-{
-  /**
-   * Creates a new metric descriptor. User-created metric descriptors define
-   * custom metrics. (metricDescriptors.create)
-   *
-   * @param string $name The project on which to execute the request. The format
-   * is "projects/{project_id_or_number}".
-   * @param Google_Service_Monitoring_MetricDescriptor $postBody
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Monitoring_MetricDescriptor
-   */
-  public function create($name, Google_Service_Monitoring_MetricDescriptor $postBody, $optParams = array())
-  {
-    $params = array('name' => $name, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('create', array($params), "Google_Service_Monitoring_MetricDescriptor");
-  }
-  /**
-   * Deletes a metric descriptor. Only user-created custom metrics can be deleted.
-   * (metricDescriptors.delete)
-   *
-   * @param string $name The metric descriptor on which to execute the request.
-   * The format is
-   * "projects/{project_id_or_number}/metricDescriptors/{metric_id}". An example
-   * of {metric_id} is: "custom.googleapis.com/my_test_metric".
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Monitoring_MonitoringEmpty
-   */
-  public function delete($name, $optParams = array())
-  {
-    $params = array('name' => $name);
-    $params = array_merge($params, $optParams);
-    return $this->call('delete', array($params), "Google_Service_Monitoring_MonitoringEmpty");
-  }
-  /**
-   * Gets a single metric descriptor. This method does not require a Stackdriver
-   * account. (metricDescriptors.get)
-   *
-   * @param string $name The metric descriptor on which to execute the request.
-   * The format is
-   * "projects/{project_id_or_number}/metricDescriptors/{metric_id}". An example
-   * value of {metric_id} is
-   * "compute.googleapis.com/instance/disk/read_bytes_count".
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Monitoring_MetricDescriptor
-   */
-  public function get($name, $optParams = array())
-  {
-    $params = array('name' => $name);
-    $params = array_merge($params, $optParams);
-    return $this->call('get', array($params), "Google_Service_Monitoring_MetricDescriptor");
-  }
-  /**
-   * Lists metric descriptors that match a filter. This method does not require a
-   * Stackdriver account. (metricDescriptors.listProjectsMetricDescriptors)
-   *
-   * @param string $name The project on which to execute the request. The format
-   * is "projects/{project_id_or_number}".
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param string pageToken If this field is not empty then it must contain
-   * the nextPageToken value returned by a previous call to this method. Using
-   * this field causes the method to return additional results from the previous
-   * method call.
-   * @opt_param int pageSize A positive number that is the maximum number of
-   * results to return.
-   * @opt_param string filter If this field is empty, all custom and system-
-   * defined metric descriptors are returned. Otherwise, the filter specifies
-   * which metric descriptors are to be returned. For example, the following
-   * filter matches all custom metrics: metric.type =
-   * starts_with("custom.googleapis.com/")
-   * @return Google_Service_Monitoring_ListMetricDescriptorsResponse
-   */
-  public function listProjectsMetricDescriptors($name, $optParams = array())
-  {
-    $params = array('name' => $name);
-    $params = array_merge($params, $optParams);
-    return $this->call('list', array($params), "Google_Service_Monitoring_ListMetricDescriptorsResponse");
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Monitoring/Resource/ProjectsMonitoredResourceDescriptors.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Monitoring/Resource/ProjectsMonitoredResourceDescriptors.php
deleted file mode 100644
index f0c6d3f1..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Monitoring/Resource/ProjectsMonitoredResourceDescriptors.php
+++ /dev/null
@@ -1,72 +0,0 @@
-
- *   $monitoringService = new Google_Service_Monitoring(...);
- *   $monitoredResourceDescriptors = $monitoringService->monitoredResourceDescriptors;
- *  
- */
-class Google_Service_Monitoring_Resource_ProjectsMonitoredResourceDescriptors extends Google_Service_Resource
-{
-  /**
-   * Gets a single monitored resource descriptor. This method does not require a
-   * Stackdriver account. (monitoredResourceDescriptors.get)
-   *
-   * @param string $name The monitored resource descriptor to get. The format is "
-   * projects/{project_id_or_number}/monitoredResourceDescriptors/{resource_type}"
-   * . The {resource_type} is a predefined type, such as cloudsql_database.
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Monitoring_MonitoredResourceDescriptor
-   */
-  public function get($name, $optParams = array())
-  {
-    $params = array('name' => $name);
-    $params = array_merge($params, $optParams);
-    return $this->call('get', array($params), "Google_Service_Monitoring_MonitoredResourceDescriptor");
-  }
-  /**
-   * Lists monitored resource descriptors that match a filter. This method does
-   * not require a Stackdriver account.
-   * (monitoredResourceDescriptors.listProjectsMonitoredResourceDescriptors)
-   *
-   * @param string $name The project on which to execute the request. The format
-   * is "projects/{project_id_or_number}".
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param string pageToken If this field is not empty then it must contain
-   * the nextPageToken value returned by a previous call to this method. Using
-   * this field causes the method to return additional results from the previous
-   * method call.
-   * @opt_param int pageSize A positive number that is the maximum number of
-   * results to return.
-   * @opt_param string filter An optional filter describing the descriptors to be
-   * returned. The filter can reference the descriptor's type and labels. For
-   * example, the following filter returns only Google Compute Engine descriptors
-   * that have an id label: resource.type = starts_with("gce_") AND
-   * resource.label:id
-   * @return Google_Service_Monitoring_ListMonitoredResourceDescriptorsResponse
-   */
-  public function listProjectsMonitoredResourceDescriptors($name, $optParams = array())
-  {
-    $params = array('name' => $name);
-    $params = array_merge($params, $optParams);
-    return $this->call('list', array($params), "Google_Service_Monitoring_ListMonitoredResourceDescriptorsResponse");
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Monitoring/Resource/ProjectsTimeSeries.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Monitoring/Resource/ProjectsTimeSeries.php
deleted file mode 100644
index 8a1252d1..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Monitoring/Resource/ProjectsTimeSeries.php
+++ /dev/null
@@ -1,119 +0,0 @@
-
- *   $monitoringService = new Google_Service_Monitoring(...);
- *   $timeSeries = $monitoringService->timeSeries;
- *  
- */
-class Google_Service_Monitoring_Resource_ProjectsTimeSeries extends Google_Service_Resource
-{
-  /**
-   * Creates or adds data to one or more time series. The response is empty if all
-   * time series in the request were written. If any time series could not be
-   * written, a corresponding failure message is included in the error response.
-   * (timeSeries.create)
-   *
-   * @param string $name The project on which to execute the request. The format
-   * is "projects/{project_id_or_number}".
-   * @param Google_Service_Monitoring_CreateTimeSeriesRequest $postBody
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Monitoring_MonitoringEmpty
-   */
-  public function create($name, Google_Service_Monitoring_CreateTimeSeriesRequest $postBody, $optParams = array())
-  {
-    $params = array('name' => $name, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('create', array($params), "Google_Service_Monitoring_MonitoringEmpty");
-  }
-  /**
-   * Lists time series that match a filter. This method does not require a
-   * Stackdriver account. (timeSeries.listProjectsTimeSeries)
-   *
-   * @param string $name The project on which to execute the request. The format
-   * is "projects/{project_id_or_number}".
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param string aggregation.crossSeriesReducer The approach to be used to
-   * combine time series. Not all reducer functions may be applied to all time
-   * series, depending on the metric type and the value type of the original time
-   * series. Reduction may change the metric type of value type of the time
-   * series.Time series data must be aligned in order to perform cross-time series
-   * reduction. If crossSeriesReducer is specified, then perSeriesAligner must be
-   * specified and not equal ALIGN_NONE and alignmentPeriod must be specified;
-   * otherwise, an error is returned.
-   * @opt_param string filter A monitoring filter that specifies which time series
-   * should be returned. The filter must specify a single metric type, and can
-   * additionally specify metric labels and other information. For example:
-   * metric.type = "compute.googleapis.com/instance/cpu/usage_time" AND
-   * metric.label.instance_name = "my-instance-name"
-   * @opt_param string aggregation.perSeriesAligner The approach to be used to
-   * align individual time series. Not all alignment functions may be applied to
-   * all time series, depending on the metric type and value type of the original
-   * time series. Alignment may change the metric type or the value type of the
-   * time series.Time series data must be aligned in order to perform cross-time
-   * series reduction. If crossSeriesReducer is specified, then perSeriesAligner
-   * must be specified and not equal ALIGN_NONE and alignmentPeriod must be
-   * specified; otherwise, an error is returned.
-   * @opt_param string pageToken If this field is not empty then it must contain
-   * the nextPageToken value returned by a previous call to this method. Using
-   * this field causes the method to return additional results from the previous
-   * method call.
-   * @opt_param string interval.startTime Optional. The beginning of the time
-   * interval. The default value for the start time is the end time. The start
-   * time must not be later than the end time.
-   * @opt_param string view Specifies which information is returned about the time
-   * series.
-   * @opt_param string aggregation.groupByFields The set of fields to preserve
-   * when crossSeriesReducer is specified. The groupByFields determine how the
-   * time series are partitioned into subsets prior to applying the aggregation
-   * function. Each subset contains time series that have the same value for each
-   * of the grouping fields. Each individual time series is a member of exactly
-   * one subset. The crossSeriesReducer is applied to each subset of time series.
-   * It is not possible to reduce across different resource types, so this field
-   * implicitly contains resource.type. Fields not specified in groupByFields are
-   * aggregated away. If groupByFields is not specified and all the time series
-   * have the same resource type, then the time series are aggregated into a
-   * single output time series. If crossSeriesReducer is not defined, this field
-   * is ignored.
-   * @opt_param string interval.endTime Required. The end of the time interval.
-   * @opt_param string aggregation.alignmentPeriod The alignment period for per-
-   * time series alignment. If present, alignmentPeriod must be at least 60
-   * seconds. After per-time series alignment, each time series will contain data
-   * points only on the period boundaries. If perSeriesAligner is not specified or
-   * equals ALIGN_NONE, then this field is ignored. If perSeriesAligner is
-   * specified and does not equal ALIGN_NONE, then this field must be defined;
-   * otherwise an error is returned.
-   * @opt_param int pageSize A positive number that is the maximum number of
-   * results to return. When view field sets to FULL, it limits the number of
-   * Points server will return; if view field is HEADERS, it limits the number of
-   * TimeSeries server will return.
-   * @opt_param string orderBy Specifies the order in which the points of the time
-   * series should be returned. By default, results are not ordered. Currently,
-   * this field must be left blank.
-   * @return Google_Service_Monitoring_ListTimeSeriesResponse
-   */
-  public function listProjectsTimeSeries($name, $optParams = array())
-  {
-    $params = array('name' => $name);
-    $params = array_merge($params, $optParams);
-    return $this->call('list', array($params), "Google_Service_Monitoring_ListTimeSeriesResponse");
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Monitoring/SourceContext.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Monitoring/SourceContext.php
deleted file mode 100644
index ecad7a77..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Monitoring/SourceContext.php
+++ /dev/null
@@ -1,30 +0,0 @@
-fileName = $fileName;
-  }
-  public function getFileName()
-  {
-    return $this->fileName;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Monitoring/TimeInterval.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Monitoring/TimeInterval.php
deleted file mode 100644
index 0c3305cb..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Monitoring/TimeInterval.php
+++ /dev/null
@@ -1,39 +0,0 @@
-endTime = $endTime;
-  }
-  public function getEndTime()
-  {
-    return $this->endTime;
-  }
-  public function setStartTime($startTime)
-  {
-    $this->startTime = $startTime;
-  }
-  public function getStartTime()
-  {
-    return $this->startTime;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Monitoring/TimeSeries.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Monitoring/TimeSeries.php
deleted file mode 100644
index 898a1dda..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Monitoring/TimeSeries.php
+++ /dev/null
@@ -1,70 +0,0 @@
-metric = $metric;
-  }
-  public function getMetric()
-  {
-    return $this->metric;
-  }
-  public function setMetricKind($metricKind)
-  {
-    $this->metricKind = $metricKind;
-  }
-  public function getMetricKind()
-  {
-    return $this->metricKind;
-  }
-  public function setPoints($points)
-  {
-    $this->points = $points;
-  }
-  public function getPoints()
-  {
-    return $this->points;
-  }
-  public function setResource(Google_Service_Monitoring_MonitoredResource $resource)
-  {
-    $this->resource = $resource;
-  }
-  public function getResource()
-  {
-    return $this->resource;
-  }
-  public function setValueType($valueType)
-  {
-    $this->valueType = $valueType;
-  }
-  public function getValueType()
-  {
-    return $this->valueType;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Monitoring/Type.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Monitoring/Type.php
deleted file mode 100644
index 79eda5e1..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Monitoring/Type.php
+++ /dev/null
@@ -1,79 +0,0 @@
-fields = $fields;
-  }
-  public function getFields()
-  {
-    return $this->fields;
-  }
-  public function setName($name)
-  {
-    $this->name = $name;
-  }
-  public function getName()
-  {
-    return $this->name;
-  }
-  public function setOneofs($oneofs)
-  {
-    $this->oneofs = $oneofs;
-  }
-  public function getOneofs()
-  {
-    return $this->oneofs;
-  }
-  public function setOptions($options)
-  {
-    $this->options = $options;
-  }
-  public function getOptions()
-  {
-    return $this->options;
-  }
-  public function setSourceContext(Google_Service_Monitoring_SourceContext $sourceContext)
-  {
-    $this->sourceContext = $sourceContext;
-  }
-  public function getSourceContext()
-  {
-    return $this->sourceContext;
-  }
-  public function setSyntax($syntax)
-  {
-    $this->syntax = $syntax;
-  }
-  public function getSyntax()
-  {
-    return $this->syntax;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Monitoring/TypedValue.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Monitoring/TypedValue.php
deleted file mode 100644
index 58f9edfa..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Monitoring/TypedValue.php
+++ /dev/null
@@ -1,67 +0,0 @@
-boolValue = $boolValue;
-  }
-  public function getBoolValue()
-  {
-    return $this->boolValue;
-  }
-  public function setDistributionValue(Google_Service_Monitoring_Distribution $distributionValue)
-  {
-    $this->distributionValue = $distributionValue;
-  }
-  public function getDistributionValue()
-  {
-    return $this->distributionValue;
-  }
-  public function setDoubleValue($doubleValue)
-  {
-    $this->doubleValue = $doubleValue;
-  }
-  public function getDoubleValue()
-  {
-    return $this->doubleValue;
-  }
-  public function setInt64Value($int64Value)
-  {
-    $this->int64Value = $int64Value;
-  }
-  public function getInt64Value()
-  {
-    return $this->int64Value;
-  }
-  public function setStringValue($stringValue)
-  {
-    $this->stringValue = $stringValue;
-  }
-  public function getStringValue()
-  {
-    return $this->stringValue;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Oauth2.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Oauth2.php
deleted file mode 100644
index 142f111e..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Oauth2.php
+++ /dev/null
@@ -1,150 +0,0 @@
-
- * Obtains end-user authorization grants for use with other Google APIs.

- *
- * 

- * For more information about this service, see the API
- * Documentation
- * 

- *
- * @author Google, Inc.
- */
-class Google_Service_Oauth2 extends Google_Service
-{
-  /** Know the list of people in your circles, your age range, and language. */
-  const PLUS_LOGIN =
-      "https://www.googleapis.com/auth/plus.login";
-  /** Know who you are on Google. */
-  const PLUS_ME =
-      "https://www.googleapis.com/auth/plus.me";
-  /** View your email address. */
-  const USERINFO_EMAIL =
-      "https://www.googleapis.com/auth/userinfo.email";
-  /** View your basic profile info. */
-  const USERINFO_PROFILE =
-      "https://www.googleapis.com/auth/userinfo.profile";
-
-  public $userinfo;
-  public $userinfo_v2_me;
-  private $base_methods;
-  /**
-   * Constructs the internal representation of the Oauth2 service.
-   *
-   * @param Google_Client $client
-   */
-  public function __construct(Google_Client $client)
-  {
-    parent::__construct($client);
-    $this->rootUrl = 'https://www.googleapis.com/';
-    $this->servicePath = '';
-    $this->version = 'v2';
-    $this->serviceName = 'oauth2';
-
-    $this->userinfo = new Google_Service_Oauth2_Resource_Userinfo(
-        $this,
-        $this->serviceName,
-        'userinfo',
-        array(
-          'methods' => array(
-            'get' => array(
-              'path' => 'oauth2/v2/userinfo',
-              'httpMethod' => 'GET',
-              'parameters' => array(),
-            ),
-          )
-        )
-    );
-    $this->userinfo_v2_me = new Google_Service_Oauth2_Resource_UserinfoV2Me(
-        $this,
-        $this->serviceName,
-        'me',
-        array(
-          'methods' => array(
-            'get' => array(
-              'path' => 'userinfo/v2/me',
-              'httpMethod' => 'GET',
-              'parameters' => array(),
-            ),
-          )
-        )
-    );
-    $this->base_methods = new Google_Service_Resource(
-        $this,
-        $this->serviceName,
-        '',
-        array(
-          'methods' => array(
-            'getCertForOpenIdConnect' => array(
-              'path' => 'oauth2/v2/certs',
-              'httpMethod' => 'GET',
-              'parameters' => array(),
-            ),'tokeninfo' => array(
-              'path' => 'oauth2/v2/tokeninfo',
-              'httpMethod' => 'POST',
-              'parameters' => array(
-                'access_token' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'id_token' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'token_handle' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-              ),
-            ),
-          )
-        )
-    );
-  }
-  /**
-   * (getCertForOpenIdConnect)
-   *
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Oauth2_Jwk
-   */
-  public function getCertForOpenIdConnect($optParams = array())
-  {
-    $params = array();
-    $params = array_merge($params, $optParams);
-    return $this->base_methods->call('getCertForOpenIdConnect', array($params), "Google_Service_Oauth2_Jwk");
-  }
-  /**
-   * (tokeninfo)
-   *
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param string access_token
-   * @opt_param string id_token
-   * @opt_param string token_handle
-   * @return Google_Service_Oauth2_Tokeninfo
-   */
-  public function tokeninfo($optParams = array())
-  {
-    $params = array();
-    $params = array_merge($params, $optParams);
-    return $this->base_methods->call('tokeninfo', array($params), "Google_Service_Oauth2_Tokeninfo");
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Oauth2/Jwk.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Oauth2/Jwk.php
deleted file mode 100644
index 18cf6e05..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Oauth2/Jwk.php
+++ /dev/null
@@ -1,32 +0,0 @@
-keys = $keys;
-  }
-  public function getKeys()
-  {
-    return $this->keys;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Oauth2/JwkKeys.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Oauth2/JwkKeys.php
deleted file mode 100644
index 1bfb5bd8..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Oauth2/JwkKeys.php
+++ /dev/null
@@ -1,75 +0,0 @@
-alg = $alg;
-  }
-  public function getAlg()
-  {
-    return $this->alg;
-  }
-  public function setE($e)
-  {
-    $this->e = $e;
-  }
-  public function getE()
-  {
-    return $this->e;
-  }
-  public function setKid($kid)
-  {
-    $this->kid = $kid;
-  }
-  public function getKid()
-  {
-    return $this->kid;
-  }
-  public function setKty($kty)
-  {
-    $this->kty = $kty;
-  }
-  public function getKty()
-  {
-    return $this->kty;
-  }
-  public function setN($n)
-  {
-    $this->n = $n;
-  }
-  public function getN()
-  {
-    return $this->n;
-  }
-  public function setUse($use)
-  {
-    $this->use = $use;
-  }
-  public function getUse()
-  {
-    return $this->use;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Oauth2/Resource/Userinfo.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Oauth2/Resource/Userinfo.php
deleted file mode 100644
index 6cba0256..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Oauth2/Resource/Userinfo.php
+++ /dev/null
@@ -1,40 +0,0 @@
-
- *   $oauth2Service = new Google_Service_Oauth2(...);
- *   $userinfo = $oauth2Service->userinfo;
- *  
- */
-class Google_Service_Oauth2_Resource_Userinfo extends Google_Service_Resource
-{
-  /**
-   * (userinfo.get)
-   *
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Oauth2_Userinfoplus
-   */
-  public function get($optParams = array())
-  {
-    $params = array();
-    $params = array_merge($params, $optParams);
-    return $this->call('get', array($params), "Google_Service_Oauth2_Userinfoplus");
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Oauth2/Resource/UserinfoV2.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Oauth2/Resource/UserinfoV2.php
deleted file mode 100644
index 1ca820ad..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Oauth2/Resource/UserinfoV2.php
+++ /dev/null
@@ -1,28 +0,0 @@
-
- *   $oauth2Service = new Google_Service_Oauth2(...);
- *   $v2 = $oauth2Service->v2;
- *  
- */
-class Google_Service_Oauth2_Resource_UserinfoV2 extends Google_Service_Resource
-{
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Oauth2/Resource/UserinfoV2Me.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Oauth2/Resource/UserinfoV2Me.php
deleted file mode 100644
index b73b78e6..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Oauth2/Resource/UserinfoV2Me.php
+++ /dev/null
@@ -1,40 +0,0 @@
-
- *   $oauth2Service = new Google_Service_Oauth2(...);
- *   $me = $oauth2Service->me;
- *  
- */
-class Google_Service_Oauth2_Resource_UserinfoV2Me extends Google_Service_Resource
-{
-  /**
-   * (me.get)
-   *
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Oauth2_Userinfoplus
-   */
-  public function get($optParams = array())
-  {
-    $params = array();
-    $params = array_merge($params, $optParams);
-    return $this->call('get', array($params), "Google_Service_Oauth2_Userinfoplus");
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Oauth2/Tokeninfo.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Oauth2/Tokeninfo.php
deleted file mode 100644
index 6632a24a..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Oauth2/Tokeninfo.php
+++ /dev/null
@@ -1,110 +0,0 @@
- "access_type",
-        "expiresIn" => "expires_in",
-        "issuedTo" => "issued_to",
-        "tokenHandle" => "token_handle",
-        "userId" => "user_id",
-        "verifiedEmail" => "verified_email",
-  );
-  public $accessType;
-  public $audience;
-  public $email;
-  public $expiresIn;
-  public $issuedTo;
-  public $scope;
-  public $tokenHandle;
-  public $userId;
-  public $verifiedEmail;
-
-  public function setAccessType($accessType)
-  {
-    $this->accessType = $accessType;
-  }
-  public function getAccessType()
-  {
-    return $this->accessType;
-  }
-  public function setAudience($audience)
-  {
-    $this->audience = $audience;
-  }
-  public function getAudience()
-  {
-    return $this->audience;
-  }
-  public function setEmail($email)
-  {
-    $this->email = $email;
-  }
-  public function getEmail()
-  {
-    return $this->email;
-  }
-  public function setExpiresIn($expiresIn)
-  {
-    $this->expiresIn = $expiresIn;
-  }
-  public function getExpiresIn()
-  {
-    return $this->expiresIn;
-  }
-  public function setIssuedTo($issuedTo)
-  {
-    $this->issuedTo = $issuedTo;
-  }
-  public function getIssuedTo()
-  {
-    return $this->issuedTo;
-  }
-  public function setScope($scope)
-  {
-    $this->scope = $scope;
-  }
-  public function getScope()
-  {
-    return $this->scope;
-  }
-  public function setTokenHandle($tokenHandle)
-  {
-    $this->tokenHandle = $tokenHandle;
-  }
-  public function getTokenHandle()
-  {
-    return $this->tokenHandle;
-  }
-  public function setUserId($userId)
-  {
-    $this->userId = $userId;
-  }
-  public function getUserId()
-  {
-    return $this->userId;
-  }
-  public function setVerifiedEmail($verifiedEmail)
-  {
-    $this->verifiedEmail = $verifiedEmail;
-  }
-  public function getVerifiedEmail()
-  {
-    return $this->verifiedEmail;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Oauth2/Userinfoplus.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Oauth2/Userinfoplus.php
deleted file mode 100644
index 1d76dfd9..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Oauth2/Userinfoplus.php
+++ /dev/null
@@ -1,125 +0,0 @@
- "family_name",
-        "givenName" => "given_name",
-        "verifiedEmail" => "verified_email",
-  );
-  public $email;
-  public $familyName;
-  public $gender;
-  public $givenName;
-  public $hd;
-  public $id;
-  public $link;
-  public $locale;
-  public $name;
-  public $picture;
-  public $verifiedEmail;
-
-  public function setEmail($email)
-  {
-    $this->email = $email;
-  }
-  public function getEmail()
-  {
-    return $this->email;
-  }
-  public function setFamilyName($familyName)
-  {
-    $this->familyName = $familyName;
-  }
-  public function getFamilyName()
-  {
-    return $this->familyName;
-  }
-  public function setGender($gender)
-  {
-    $this->gender = $gender;
-  }
-  public function getGender()
-  {
-    return $this->gender;
-  }
-  public function setGivenName($givenName)
-  {
-    $this->givenName = $givenName;
-  }
-  public function getGivenName()
-  {
-    return $this->givenName;
-  }
-  public function setHd($hd)
-  {
-    $this->hd = $hd;
-  }
-  public function getHd()
-  {
-    return $this->hd;
-  }
-  public function setId($id)
-  {
-    $this->id = $id;
-  }
-  public function getId()
-  {
-    return $this->id;
-  }
-  public function setLink($link)
-  {
-    $this->link = $link;
-  }
-  public function getLink()
-  {
-    return $this->link;
-  }
-  public function setLocale($locale)
-  {
-    $this->locale = $locale;
-  }
-  public function getLocale()
-  {
-    return $this->locale;
-  }
-  public function setName($name)
-  {
-    $this->name = $name;
-  }
-  public function getName()
-  {
-    return $this->name;
-  }
-  public function setPicture($picture)
-  {
-    $this->picture = $picture;
-  }
-  public function getPicture()
-  {
-    return $this->picture;
-  }
-  public function setVerifiedEmail($verifiedEmail)
-  {
-    $this->verifiedEmail = $verifiedEmail;
-  }
-  public function getVerifiedEmail()
-  {
-    return $this->verifiedEmail;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Pagespeedonline.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Pagespeedonline.php
deleted file mode 100644
index f3459b60..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Pagespeedonline.php
+++ /dev/null
@@ -1,93 +0,0 @@
-
- * Analyzes the performance of a web page and provides tailored suggestions to
- * make that page faster.

- *
- * 

- * For more information about this service, see the API
- * Documentation
- * 

- *
- * @author Google, Inc.
- */
-class Google_Service_Pagespeedonline extends Google_Service
-{
-
-
-  public $pagespeedapi;
-  
-  /**
-   * Constructs the internal representation of the Pagespeedonline service.
-   *
-   * @param Google_Client $client
-   */
-  public function __construct(Google_Client $client)
-  {
-    parent::__construct($client);
-    $this->rootUrl = 'https://www.googleapis.com/';
-    $this->servicePath = 'pagespeedonline/v2/';
-    $this->version = 'v2';
-    $this->serviceName = 'pagespeedonline';
-
-    $this->pagespeedapi = new Google_Service_Pagespeedonline_Resource_Pagespeedapi(
-        $this,
-        $this->serviceName,
-        'pagespeedapi',
-        array(
-          'methods' => array(
-            'runpagespeed' => array(
-              'path' => 'runPagespeed',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'url' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'filter_third_party_resources' => array(
-                  'location' => 'query',
-                  'type' => 'boolean',
-                ),
-                'locale' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'rule' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                  'repeated' => true,
-                ),
-                'screenshot' => array(
-                  'location' => 'query',
-                  'type' => 'boolean',
-                ),
-                'strategy' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-              ),
-            ),
-          )
-        )
-    );
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Pagespeedonline/PagespeedApiFormatStringV2.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Pagespeedonline/PagespeedApiFormatStringV2.php
deleted file mode 100644
index 2c375993..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Pagespeedonline/PagespeedApiFormatStringV2.php
+++ /dev/null
@@ -1,41 +0,0 @@
-args = $args;
-  }
-  public function getArgs()
-  {
-    return $this->args;
-  }
-  public function setFormat($format)
-  {
-    $this->format = $format;
-  }
-  public function getFormat()
-  {
-    return $this->format;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Pagespeedonline/PagespeedApiFormatStringV2Args.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Pagespeedonline/PagespeedApiFormatStringV2Args.php
deleted file mode 100644
index c1179e70..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Pagespeedonline/PagespeedApiFormatStringV2Args.php
+++ /dev/null
@@ -1,72 +0,0 @@
- "secondary_rects",
-  );
-  public $key;
-  protected $rectsType = 'Google_Service_Pagespeedonline_PagespeedApiFormatStringV2ArgsRects';
-  protected $rectsDataType = 'array';
-  protected $secondaryRectsType = 'Google_Service_Pagespeedonline_PagespeedApiFormatStringV2ArgsSecondaryRects';
-  protected $secondaryRectsDataType = 'array';
-  public $type;
-  public $value;
-
-  public function setKey($key)
-  {
-    $this->key = $key;
-  }
-  public function getKey()
-  {
-    return $this->key;
-  }
-  public function setRects($rects)
-  {
-    $this->rects = $rects;
-  }
-  public function getRects()
-  {
-    return $this->rects;
-  }
-  public function setSecondaryRects($secondaryRects)
-  {
-    $this->secondaryRects = $secondaryRects;
-  }
-  public function getSecondaryRects()
-  {
-    return $this->secondaryRects;
-  }
-  public function setType($type)
-  {
-    $this->type = $type;
-  }
-  public function getType()
-  {
-    return $this->type;
-  }
-  public function setValue($value)
-  {
-    $this->value = $value;
-  }
-  public function getValue()
-  {
-    return $this->value;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Pagespeedonline/PagespeedApiFormatStringV2ArgsRects.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Pagespeedonline/PagespeedApiFormatStringV2ArgsRects.php
deleted file mode 100644
index a11240cc..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Pagespeedonline/PagespeedApiFormatStringV2ArgsRects.php
+++ /dev/null
@@ -1,57 +0,0 @@
-height = $height;
-  }
-  public function getHeight()
-  {
-    return $this->height;
-  }
-  public function setLeft($left)
-  {
-    $this->left = $left;
-  }
-  public function getLeft()
-  {
-    return $this->left;
-  }
-  public function setTop($top)
-  {
-    $this->top = $top;
-  }
-  public function getTop()
-  {
-    return $this->top;
-  }
-  public function setWidth($width)
-  {
-    $this->width = $width;
-  }
-  public function getWidth()
-  {
-    return $this->width;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Pagespeedonline/PagespeedApiFormatStringV2ArgsSecondaryRects.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Pagespeedonline/PagespeedApiFormatStringV2ArgsSecondaryRects.php
deleted file mode 100644
index 556a5fdb..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Pagespeedonline/PagespeedApiFormatStringV2ArgsSecondaryRects.php
+++ /dev/null
@@ -1,57 +0,0 @@
-height = $height;
-  }
-  public function getHeight()
-  {
-    return $this->height;
-  }
-  public function setLeft($left)
-  {
-    $this->left = $left;
-  }
-  public function getLeft()
-  {
-    return $this->left;
-  }
-  public function setTop($top)
-  {
-    $this->top = $top;
-  }
-  public function getTop()
-  {
-    return $this->top;
-  }
-  public function setWidth($width)
-  {
-    $this->width = $width;
-  }
-  public function getWidth()
-  {
-    return $this->width;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Pagespeedonline/PagespeedApiImageV2.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Pagespeedonline/PagespeedApiImageV2.php
deleted file mode 100644
index 3768fb4a..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Pagespeedonline/PagespeedApiImageV2.php
+++ /dev/null
@@ -1,80 +0,0 @@
- "mime_type",
-        "pageRect" => "page_rect",
-  );
-  public $data;
-  public $height;
-  public $key;
-  public $mimeType;
-  protected $pageRectType = 'Google_Service_Pagespeedonline_PagespeedApiImageV2PageRect';
-  protected $pageRectDataType = '';
-  public $width;
-
-  public function setData($data)
-  {
-    $this->data = $data;
-  }
-  public function getData()
-  {
-    return $this->data;
-  }
-  public function setHeight($height)
-  {
-    $this->height = $height;
-  }
-  public function getHeight()
-  {
-    return $this->height;
-  }
-  public function setKey($key)
-  {
-    $this->key = $key;
-  }
-  public function getKey()
-  {
-    return $this->key;
-  }
-  public function setMimeType($mimeType)
-  {
-    $this->mimeType = $mimeType;
-  }
-  public function getMimeType()
-  {
-    return $this->mimeType;
-  }
-  public function setPageRect(Google_Service_Pagespeedonline_PagespeedApiImageV2PageRect $pageRect)
-  {
-    $this->pageRect = $pageRect;
-  }
-  public function getPageRect()
-  {
-    return $this->pageRect;
-  }
-  public function setWidth($width)
-  {
-    $this->width = $width;
-  }
-  public function getWidth()
-  {
-    return $this->width;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Pagespeedonline/PagespeedApiImageV2PageRect.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Pagespeedonline/PagespeedApiImageV2PageRect.php
deleted file mode 100644
index 4adc16bc..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Pagespeedonline/PagespeedApiImageV2PageRect.php
+++ /dev/null
@@ -1,57 +0,0 @@
-height = $height;
-  }
-  public function getHeight()
-  {
-    return $this->height;
-  }
-  public function setLeft($left)
-  {
-    $this->left = $left;
-  }
-  public function getLeft()
-  {
-    return $this->left;
-  }
-  public function setTop($top)
-  {
-    $this->top = $top;
-  }
-  public function getTop()
-  {
-    return $this->top;
-  }
-  public function setWidth($width)
-  {
-    $this->width = $width;
-  }
-  public function getWidth()
-  {
-    return $this->width;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Pagespeedonline/Resource/Pagespeedapi.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Pagespeedonline/Resource/Pagespeedapi.php
deleted file mode 100644
index bea52f24..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Pagespeedonline/Resource/Pagespeedapi.php
+++ /dev/null
@@ -1,52 +0,0 @@
-
- *   $pagespeedonlineService = new Google_Service_Pagespeedonline(...);
- *   $pagespeedapi = $pagespeedonlineService->pagespeedapi;
- *  
- */
-class Google_Service_Pagespeedonline_Resource_Pagespeedapi extends Google_Service_Resource
-{
-  /**
-   * Runs PageSpeed analysis on the page at the specified URL, and returns
-   * PageSpeed scores, a list of suggestions to make that page faster, and other
-   * information. (pagespeedapi.runpagespeed)
-   *
-   * @param string $url The URL to fetch and analyze
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param bool filter_third_party_resources Indicates if third party
-   * resources should be filtered out before PageSpeed analysis.
-   * @opt_param string locale The locale used to localize formatted results
-   * @opt_param string rule A PageSpeed rule to run; if none are given, all rules
-   * are run
-   * @opt_param bool screenshot Indicates if binary data containing a screenshot
-   * should be included
-   * @opt_param string strategy The analysis strategy to use
-   * @return Google_Service_Pagespeedonline_Result
-   */
-  public function runpagespeed($url, $optParams = array())
-  {
-    $params = array('url' => $url);
-    $params = array_merge($params, $optParams);
-    return $this->call('runpagespeed', array($params), "Google_Service_Pagespeedonline_Result");
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Pagespeedonline/Result.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Pagespeedonline/Result.php
deleted file mode 100644
index b9aa3342..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Pagespeedonline/Result.php
+++ /dev/null
@@ -1,117 +0,0 @@
-formattedResults = $formattedResults;
-  }
-  public function getFormattedResults()
-  {
-    return $this->formattedResults;
-  }
-  public function setId($id)
-  {
-    $this->id = $id;
-  }
-  public function getId()
-  {
-    return $this->id;
-  }
-  public function setInvalidRules($invalidRules)
-  {
-    $this->invalidRules = $invalidRules;
-  }
-  public function getInvalidRules()
-  {
-    return $this->invalidRules;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setPageStats(Google_Service_Pagespeedonline_ResultPageStats $pageStats)
-  {
-    $this->pageStats = $pageStats;
-  }
-  public function getPageStats()
-  {
-    return $this->pageStats;
-  }
-  public function setResponseCode($responseCode)
-  {
-    $this->responseCode = $responseCode;
-  }
-  public function getResponseCode()
-  {
-    return $this->responseCode;
-  }
-  public function setRuleGroups($ruleGroups)
-  {
-    $this->ruleGroups = $ruleGroups;
-  }
-  public function getRuleGroups()
-  {
-    return $this->ruleGroups;
-  }
-  public function setScreenshot(Google_Service_Pagespeedonline_PagespeedApiImageV2 $screenshot)
-  {
-    $this->screenshot = $screenshot;
-  }
-  public function getScreenshot()
-  {
-    return $this->screenshot;
-  }
-  public function setTitle($title)
-  {
-    $this->title = $title;
-  }
-  public function getTitle()
-  {
-    return $this->title;
-  }
-  public function setVersion(Google_Service_Pagespeedonline_ResultVersion $version)
-  {
-    $this->version = $version;
-  }
-  public function getVersion()
-  {
-    return $this->version;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Pagespeedonline/ResultFormattedResults.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Pagespeedonline/ResultFormattedResults.php
deleted file mode 100644
index bf4ef288..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Pagespeedonline/ResultFormattedResults.php
+++ /dev/null
@@ -1,40 +0,0 @@
-locale = $locale;
-  }
-  public function getLocale()
-  {
-    return $this->locale;
-  }
-  public function setRuleResults($ruleResults)
-  {
-    $this->ruleResults = $ruleResults;
-  }
-  public function getRuleResults()
-  {
-    return $this->ruleResults;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Pagespeedonline/ResultFormattedResultsRuleResultsElement.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Pagespeedonline/ResultFormattedResultsRuleResultsElement.php
deleted file mode 100644
index ef3d1874..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Pagespeedonline/ResultFormattedResultsRuleResultsElement.php
+++ /dev/null
@@ -1,69 +0,0 @@
-groups = $groups;
-  }
-  public function getGroups()
-  {
-    return $this->groups;
-  }
-  public function setLocalizedRuleName($localizedRuleName)
-  {
-    $this->localizedRuleName = $localizedRuleName;
-  }
-  public function getLocalizedRuleName()
-  {
-    return $this->localizedRuleName;
-  }
-  public function setRuleImpact($ruleImpact)
-  {
-    $this->ruleImpact = $ruleImpact;
-  }
-  public function getRuleImpact()
-  {
-    return $this->ruleImpact;
-  }
-  public function setSummary(Google_Service_Pagespeedonline_PagespeedApiFormatStringV2 $summary)
-  {
-    $this->summary = $summary;
-  }
-  public function getSummary()
-  {
-    return $this->summary;
-  }
-  public function setUrlBlocks($urlBlocks)
-  {
-    $this->urlBlocks = $urlBlocks;
-  }
-  public function getUrlBlocks()
-  {
-    return $this->urlBlocks;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Pagespeedonline/ResultFormattedResultsRuleResultsElementUrlBlocks.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Pagespeedonline/ResultFormattedResultsRuleResultsElementUrlBlocks.php
deleted file mode 100644
index d60e2f3f..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Pagespeedonline/ResultFormattedResultsRuleResultsElementUrlBlocks.php
+++ /dev/null
@@ -1,42 +0,0 @@
-header = $header;
-  }
-  public function getHeader()
-  {
-    return $this->header;
-  }
-  public function setUrls($urls)
-  {
-    $this->urls = $urls;
-  }
-  public function getUrls()
-  {
-    return $this->urls;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Pagespeedonline/ResultFormattedResultsRuleResultsElementUrlBlocksUrls.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Pagespeedonline/ResultFormattedResultsRuleResultsElementUrlBlocksUrls.php
deleted file mode 100644
index e6685217..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Pagespeedonline/ResultFormattedResultsRuleResultsElementUrlBlocksUrls.php
+++ /dev/null
@@ -1,42 +0,0 @@
-details = $details;
-  }
-  public function getDetails()
-  {
-    return $this->details;
-  }
-  public function setResult(Google_Service_Pagespeedonline_PagespeedApiFormatStringV2 $result)
-  {
-    $this->result = $result;
-  }
-  public function getResult()
-  {
-    return $this->result;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Pagespeedonline/ResultPageStats.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Pagespeedonline/ResultPageStats.php
deleted file mode 100644
index e1c152f3..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Pagespeedonline/ResultPageStats.php
+++ /dev/null
@@ -1,138 +0,0 @@
-cssResponseBytes = $cssResponseBytes;
-  }
-  public function getCssResponseBytes()
-  {
-    return $this->cssResponseBytes;
-  }
-  public function setFlashResponseBytes($flashResponseBytes)
-  {
-    $this->flashResponseBytes = $flashResponseBytes;
-  }
-  public function getFlashResponseBytes()
-  {
-    return $this->flashResponseBytes;
-  }
-  public function setHtmlResponseBytes($htmlResponseBytes)
-  {
-    $this->htmlResponseBytes = $htmlResponseBytes;
-  }
-  public function getHtmlResponseBytes()
-  {
-    return $this->htmlResponseBytes;
-  }
-  public function setImageResponseBytes($imageResponseBytes)
-  {
-    $this->imageResponseBytes = $imageResponseBytes;
-  }
-  public function getImageResponseBytes()
-  {
-    return $this->imageResponseBytes;
-  }
-  public function setJavascriptResponseBytes($javascriptResponseBytes)
-  {
-    $this->javascriptResponseBytes = $javascriptResponseBytes;
-  }
-  public function getJavascriptResponseBytes()
-  {
-    return $this->javascriptResponseBytes;
-  }
-  public function setNumberCssResources($numberCssResources)
-  {
-    $this->numberCssResources = $numberCssResources;
-  }
-  public function getNumberCssResources()
-  {
-    return $this->numberCssResources;
-  }
-  public function setNumberHosts($numberHosts)
-  {
-    $this->numberHosts = $numberHosts;
-  }
-  public function getNumberHosts()
-  {
-    return $this->numberHosts;
-  }
-  public function setNumberJsResources($numberJsResources)
-  {
-    $this->numberJsResources = $numberJsResources;
-  }
-  public function getNumberJsResources()
-  {
-    return $this->numberJsResources;
-  }
-  public function setNumberResources($numberResources)
-  {
-    $this->numberResources = $numberResources;
-  }
-  public function getNumberResources()
-  {
-    return $this->numberResources;
-  }
-  public function setNumberStaticResources($numberStaticResources)
-  {
-    $this->numberStaticResources = $numberStaticResources;
-  }
-  public function getNumberStaticResources()
-  {
-    return $this->numberStaticResources;
-  }
-  public function setOtherResponseBytes($otherResponseBytes)
-  {
-    $this->otherResponseBytes = $otherResponseBytes;
-  }
-  public function getOtherResponseBytes()
-  {
-    return $this->otherResponseBytes;
-  }
-  public function setTextResponseBytes($textResponseBytes)
-  {
-    $this->textResponseBytes = $textResponseBytes;
-  }
-  public function getTextResponseBytes()
-  {
-    return $this->textResponseBytes;
-  }
-  public function setTotalRequestBytes($totalRequestBytes)
-  {
-    $this->totalRequestBytes = $totalRequestBytes;
-  }
-  public function getTotalRequestBytes()
-  {
-    return $this->totalRequestBytes;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Pagespeedonline/ResultRuleGroupsElement.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Pagespeedonline/ResultRuleGroupsElement.php
deleted file mode 100644
index 6972a1c0..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Pagespeedonline/ResultRuleGroupsElement.php
+++ /dev/null
@@ -1,30 +0,0 @@
-score = $score;
-  }
-  public function getScore()
-  {
-    return $this->score;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Pagespeedonline/ResultVersion.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Pagespeedonline/ResultVersion.php
deleted file mode 100644
index b7fbee9e..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Pagespeedonline/ResultVersion.php
+++ /dev/null
@@ -1,39 +0,0 @@
-major = $major;
-  }
-  public function getMajor()
-  {
-    return $this->major;
-  }
-  public function setMinor($minor)
-  {
-    $this->minor = $minor;
-  }
-  public function getMinor()
-  {
-    return $this->minor;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Partners.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Partners.php
deleted file mode 100644
index d6f23312..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Partners.php
+++ /dev/null
@@ -1,877 +0,0 @@
-
- * Searches certified companies and creates contact leads with them, and also
- * audits the usage of clients.

- *
- * 

- * For more information about this service, see the API
- * Documentation
- * 

- *
- * @author Google, Inc.
- */
-class Google_Service_Partners extends Google_Service
-{
-
-
-  public $analytics;
-  public $clientMessages;
-  public $companies;
-  public $companies_leads;
-  public $exams;
-  public $leads;
-  public $offers;
-  public $offers_history;
-  public $userEvents;
-  public $userStates;
-  public $users;
-  public $v2;
-  
-  /**
-   * Constructs the internal representation of the Partners service.
-   *
-   * @param Google_Client $client
-   */
-  public function __construct(Google_Client $client)
-  {
-    parent::__construct($client);
-    $this->rootUrl = 'https://partners.googleapis.com/';
-    $this->servicePath = '';
-    $this->version = 'v2';
-    $this->serviceName = 'partners';
-
-    $this->analytics = new Google_Service_Partners_Resource_Analytics(
-        $this,
-        $this->serviceName,
-        'analytics',
-        array(
-          'methods' => array(
-            'list' => array(
-              'path' => 'v2/analytics',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'requestMetadata.trafficSource.trafficSubId' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'requestMetadata.userOverrides.userId' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'requestMetadata.partnersSessionId' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'pageToken' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'pageSize' => array(
-                  'location' => 'query',
-                  'type' => 'integer',
-                ),
-                'requestMetadata.trafficSource.trafficSourceId' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'requestMetadata.locale' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'requestMetadata.userOverrides.ipAddress' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'requestMetadata.experimentIds' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                  'repeated' => true,
-                ),
-              ),
-            ),
-          )
-        )
-    );
-    $this->clientMessages = new Google_Service_Partners_Resource_ClientMessages(
-        $this,
-        $this->serviceName,
-        'clientMessages',
-        array(
-          'methods' => array(
-            'log' => array(
-              'path' => 'v2/clientMessages:log',
-              'httpMethod' => 'POST',
-              'parameters' => array(),
-            ),
-          )
-        )
-    );
-    $this->companies = new Google_Service_Partners_Resource_Companies(
-        $this,
-        $this->serviceName,
-        'companies',
-        array(
-          'methods' => array(
-            'get' => array(
-              'path' => 'v2/companies/{companyId}',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'companyId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'requestMetadata.trafficSource.trafficSourceId' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'requestMetadata.userOverrides.ipAddress' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'requestMetadata.experimentIds' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                  'repeated' => true,
-                ),
-                'currencyCode' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'requestMetadata.trafficSource.trafficSubId' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'orderBy' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'requestMetadata.userOverrides.userId' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'requestMetadata.partnersSessionId' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'view' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'requestMetadata.locale' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'address' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-              ),
-            ),'list' => array(
-              'path' => 'v2/companies',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'requestMetadata.partnersSessionId' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'companyName' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'pageToken' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'industries' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                  'repeated' => true,
-                ),
-                'websiteUrl' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'gpsMotivations' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                  'repeated' => true,
-                ),
-                'languageCodes' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                  'repeated' => true,
-                ),
-                'pageSize' => array(
-                  'location' => 'query',
-                  'type' => 'integer',
-                ),
-                'requestMetadata.userOverrides.ipAddress' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'requestMetadata.experimentIds' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                  'repeated' => true,
-                ),
-                'orderBy' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'specializations' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                  'repeated' => true,
-                ),
-                'maxMonthlyBudget.currencyCode' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'requestMetadata.userOverrides.userId' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'minMonthlyBudget.currencyCode' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'view' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'address' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'requestMetadata.locale' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'minMonthlyBudget.units' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'maxMonthlyBudget.nanos' => array(
-                  'location' => 'query',
-                  'type' => 'integer',
-                ),
-                'services' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                  'repeated' => true,
-                ),
-                'maxMonthlyBudget.units' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'requestMetadata.trafficSource.trafficSourceId' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'minMonthlyBudget.nanos' => array(
-                  'location' => 'query',
-                  'type' => 'integer',
-                ),
-                'requestMetadata.trafficSource.trafficSubId' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-              ),
-            ),
-          )
-        )
-    );
-    $this->companies_leads = new Google_Service_Partners_Resource_CompaniesLeads(
-        $this,
-        $this->serviceName,
-        'leads',
-        array(
-          'methods' => array(
-            'create' => array(
-              'path' => 'v2/companies/{companyId}/leads',
-              'httpMethod' => 'POST',
-              'parameters' => array(
-                'companyId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),
-          )
-        )
-    );
-    $this->exams = new Google_Service_Partners_Resource_Exams(
-        $this,
-        $this->serviceName,
-        'exams',
-        array(
-          'methods' => array(
-            'getToken' => array(
-              'path' => 'v2/exams/{examType}/token',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'examType' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'requestMetadata.userOverrides.ipAddress' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'requestMetadata.experimentIds' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                  'repeated' => true,
-                ),
-                'requestMetadata.trafficSource.trafficSubId' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'requestMetadata.userOverrides.userId' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'requestMetadata.partnersSessionId' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'requestMetadata.trafficSource.trafficSourceId' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'requestMetadata.locale' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-              ),
-            ),
-          )
-        )
-    );
-    $this->leads = new Google_Service_Partners_Resource_Leads(
-        $this,
-        $this->serviceName,
-        'leads',
-        array(
-          'methods' => array(
-            'list' => array(
-              'path' => 'v2/leads',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'pageToken' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'pageSize' => array(
-                  'location' => 'query',
-                  'type' => 'integer',
-                ),
-                'requestMetadata.trafficSource.trafficSourceId' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'requestMetadata.locale' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'requestMetadata.userOverrides.ipAddress' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'requestMetadata.experimentIds' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                  'repeated' => true,
-                ),
-                'requestMetadata.trafficSource.trafficSubId' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'orderBy' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'requestMetadata.partnersSessionId' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'requestMetadata.userOverrides.userId' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-              ),
-            ),
-          )
-        )
-    );
-    $this->offers = new Google_Service_Partners_Resource_Offers(
-        $this,
-        $this->serviceName,
-        'offers',
-        array(
-          'methods' => array(
-            'list' => array(
-              'path' => 'v2/offers',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'requestMetadata.userOverrides.ipAddress' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'requestMetadata.experimentIds' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                  'repeated' => true,
-                ),
-                'requestMetadata.trafficSource.trafficSubId' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'requestMetadata.userOverrides.userId' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'requestMetadata.partnersSessionId' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'requestMetadata.trafficSource.trafficSourceId' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'requestMetadata.locale' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-              ),
-            ),
-          )
-        )
-    );
-    $this->offers_history = new Google_Service_Partners_Resource_OffersHistory(
-        $this,
-        $this->serviceName,
-        'history',
-        array(
-          'methods' => array(
-            'list' => array(
-              'path' => 'v2/offers/history',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'pageToken' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'pageSize' => array(
-                  'location' => 'query',
-                  'type' => 'integer',
-                ),
-                'requestMetadata.trafficSource.trafficSourceId' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'requestMetadata.locale' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'requestMetadata.userOverrides.ipAddress' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'requestMetadata.experimentIds' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                  'repeated' => true,
-                ),
-                'entireCompany' => array(
-                  'location' => 'query',
-                  'type' => 'boolean',
-                ),
-                'orderBy' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'requestMetadata.trafficSource.trafficSubId' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'requestMetadata.userOverrides.userId' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'requestMetadata.partnersSessionId' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-              ),
-            ),
-          )
-        )
-    );
-    $this->userEvents = new Google_Service_Partners_Resource_UserEvents(
-        $this,
-        $this->serviceName,
-        'userEvents',
-        array(
-          'methods' => array(
-            'log' => array(
-              'path' => 'v2/userEvents:log',
-              'httpMethod' => 'POST',
-              'parameters' => array(),
-            ),
-          )
-        )
-    );
-    $this->userStates = new Google_Service_Partners_Resource_UserStates(
-        $this,
-        $this->serviceName,
-        'userStates',
-        array(
-          'methods' => array(
-            'list' => array(
-              'path' => 'v2/userStates',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'requestMetadata.userOverrides.userId' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'requestMetadata.partnersSessionId' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'requestMetadata.trafficSource.trafficSourceId' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'requestMetadata.locale' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'requestMetadata.userOverrides.ipAddress' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'requestMetadata.experimentIds' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                  'repeated' => true,
-                ),
-                'requestMetadata.trafficSource.trafficSubId' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-              ),
-            ),
-          )
-        )
-    );
-    $this->users = new Google_Service_Partners_Resource_Users(
-        $this,
-        $this->serviceName,
-        'users',
-        array(
-          'methods' => array(
-            'createCompanyRelation' => array(
-              'path' => 'v2/users/{userId}/companyRelation',
-              'httpMethod' => 'PUT',
-              'parameters' => array(
-                'userId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'requestMetadata.userOverrides.userId' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'requestMetadata.partnersSessionId' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'requestMetadata.trafficSource.trafficSourceId' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'requestMetadata.locale' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'requestMetadata.userOverrides.ipAddress' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'requestMetadata.experimentIds' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                  'repeated' => true,
-                ),
-                'requestMetadata.trafficSource.trafficSubId' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-              ),
-            ),'deleteCompanyRelation' => array(
-              'path' => 'v2/users/{userId}/companyRelation',
-              'httpMethod' => 'DELETE',
-              'parameters' => array(
-                'userId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'requestMetadata.trafficSource.trafficSubId' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'requestMetadata.userOverrides.userId' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'requestMetadata.partnersSessionId' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'requestMetadata.trafficSource.trafficSourceId' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'requestMetadata.locale' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'requestMetadata.userOverrides.ipAddress' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'requestMetadata.experimentIds' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                  'repeated' => true,
-                ),
-              ),
-            ),'get' => array(
-              'path' => 'v2/users/{userId}',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'userId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'userView' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'requestMetadata.trafficSource.trafficSourceId' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'requestMetadata.locale' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'requestMetadata.userOverrides.ipAddress' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'requestMetadata.experimentIds' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                  'repeated' => true,
-                ),
-                'requestMetadata.trafficSource.trafficSubId' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'requestMetadata.partnersSessionId' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'requestMetadata.userOverrides.userId' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-              ),
-            ),'updateProfile' => array(
-              'path' => 'v2/users/profile',
-              'httpMethod' => 'PATCH',
-              'parameters' => array(
-                'requestMetadata.userOverrides.ipAddress' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'requestMetadata.experimentIds' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                  'repeated' => true,
-                ),
-                'requestMetadata.trafficSource.trafficSubId' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'requestMetadata.partnersSessionId' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'requestMetadata.userOverrides.userId' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'requestMetadata.trafficSource.trafficSourceId' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'requestMetadata.locale' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-              ),
-            ),
-          )
-        )
-    );
-    $this->v2 = new Google_Service_Partners_Resource_V2(
-        $this,
-        $this->serviceName,
-        'v2',
-        array(
-          'methods' => array(
-            'getPartnersstatus' => array(
-              'path' => 'v2/partnersstatus',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'requestMetadata.trafficSource.trafficSubId' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'requestMetadata.partnersSessionId' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'requestMetadata.userOverrides.userId' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'requestMetadata.trafficSource.trafficSourceId' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'requestMetadata.locale' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'requestMetadata.userOverrides.ipAddress' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'requestMetadata.experimentIds' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                  'repeated' => true,
-                ),
-              ),
-            ),'updateCompanies' => array(
-              'path' => 'v2/companies',
-              'httpMethod' => 'PATCH',
-              'parameters' => array(
-                'requestMetadata.userOverrides.ipAddress' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'updateMask' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'requestMetadata.experimentIds' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                  'repeated' => true,
-                ),
-                'requestMetadata.trafficSource.trafficSubId' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'requestMetadata.partnersSessionId' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'requestMetadata.userOverrides.userId' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'requestMetadata.trafficSource.trafficSourceId' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'requestMetadata.locale' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-              ),
-            ),'updateLeads' => array(
-              'path' => 'v2/leads',
-              'httpMethod' => 'PATCH',
-              'parameters' => array(
-                'requestMetadata.trafficSource.trafficSourceId' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'requestMetadata.locale' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'requestMetadata.userOverrides.ipAddress' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'updateMask' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'requestMetadata.experimentIds' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                  'repeated' => true,
-                ),
-                'requestMetadata.trafficSource.trafficSubId' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'requestMetadata.partnersSessionId' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'requestMetadata.userOverrides.userId' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-              ),
-            ),
-          )
-        )
-    );
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Partners/AdWordsManagerAccountInfo.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Partners/AdWordsManagerAccountInfo.php
deleted file mode 100644
index 2141b58f..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Partners/AdWordsManagerAccountInfo.php
+++ /dev/null
@@ -1,39 +0,0 @@
-customerName = $customerName;
-  }
-  public function getCustomerName()
-  {
-    return $this->customerName;
-  }
-  public function setId($id)
-  {
-    $this->id = $id;
-  }
-  public function getId()
-  {
-    return $this->id;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Partners/Analytics.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Partners/Analytics.php
deleted file mode 100644
index e2ba118f..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Partners/Analytics.php
+++ /dev/null
@@ -1,61 +0,0 @@
-contacts = $contacts;
-  }
-  public function getContacts()
-  {
-    return $this->contacts;
-  }
-  public function setEventDate(Google_Service_Partners_Date $eventDate)
-  {
-    $this->eventDate = $eventDate;
-  }
-  public function getEventDate()
-  {
-    return $this->eventDate;
-  }
-  public function setProfileViews(Google_Service_Partners_AnalyticsDataPoint $profileViews)
-  {
-    $this->profileViews = $profileViews;
-  }
-  public function getProfileViews()
-  {
-    return $this->profileViews;
-  }
-  public function setSearchViews(Google_Service_Partners_AnalyticsDataPoint $searchViews)
-  {
-    $this->searchViews = $searchViews;
-  }
-  public function getSearchViews()
-  {
-    return $this->searchViews;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Partners/AnalyticsDataPoint.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Partners/AnalyticsDataPoint.php
deleted file mode 100644
index f3bca347..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Partners/AnalyticsDataPoint.php
+++ /dev/null
@@ -1,41 +0,0 @@
-eventCount = $eventCount;
-  }
-  public function getEventCount()
-  {
-    return $this->eventCount;
-  }
-  public function setEventLocations($eventLocations)
-  {
-    $this->eventLocations = $eventLocations;
-  }
-  public function getEventLocations()
-  {
-    return $this->eventLocations;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Partners/AnalyticsSummary.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Partners/AnalyticsSummary.php
deleted file mode 100644
index 798a62b8..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Partners/AnalyticsSummary.php
+++ /dev/null
@@ -1,48 +0,0 @@
-contactsCount = $contactsCount;
-  }
-  public function getContactsCount()
-  {
-    return $this->contactsCount;
-  }
-  public function setProfileViewsCount($profileViewsCount)
-  {
-    $this->profileViewsCount = $profileViewsCount;
-  }
-  public function getProfileViewsCount()
-  {
-    return $this->profileViewsCount;
-  }
-  public function setSearchViewsCount($searchViewsCount)
-  {
-    $this->searchViewsCount = $searchViewsCount;
-  }
-  public function getSearchViewsCount()
-  {
-    return $this->searchViewsCount;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Partners/AvailableOffer.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Partners/AvailableOffer.php
deleted file mode 100644
index 257a83f5..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Partners/AvailableOffer.php
+++ /dev/null
@@ -1,132 +0,0 @@
-available = $available;
-  }
-  public function getAvailable()
-  {
-    return $this->available;
-  }
-  public function setCountryOfferInfos($countryOfferInfos)
-  {
-    $this->countryOfferInfos = $countryOfferInfos;
-  }
-  public function getCountryOfferInfos()
-  {
-    return $this->countryOfferInfos;
-  }
-  public function setDescription($description)
-  {
-    $this->description = $description;
-  }
-  public function getDescription()
-  {
-    return $this->description;
-  }
-  public function setId($id)
-  {
-    $this->id = $id;
-  }
-  public function getId()
-  {
-    return $this->id;
-  }
-  public function setMaxAccountAge($maxAccountAge)
-  {
-    $this->maxAccountAge = $maxAccountAge;
-  }
-  public function getMaxAccountAge()
-  {
-    return $this->maxAccountAge;
-  }
-  public function setName($name)
-  {
-    $this->name = $name;
-  }
-  public function getName()
-  {
-    return $this->name;
-  }
-  public function setOfferLevel($offerLevel)
-  {
-    $this->offerLevel = $offerLevel;
-  }
-  public function getOfferLevel()
-  {
-    return $this->offerLevel;
-  }
-  public function setOfferType($offerType)
-  {
-    $this->offerType = $offerType;
-  }
-  public function getOfferType()
-  {
-    return $this->offerType;
-  }
-  public function setQualifiedCustomer($qualifiedCustomer)
-  {
-    $this->qualifiedCustomer = $qualifiedCustomer;
-  }
-  public function getQualifiedCustomer()
-  {
-    return $this->qualifiedCustomer;
-  }
-  public function setQualifiedCustomersComplete($qualifiedCustomersComplete)
-  {
-    $this->qualifiedCustomersComplete = $qualifiedCustomersComplete;
-  }
-  public function getQualifiedCustomersComplete()
-  {
-    return $this->qualifiedCustomersComplete;
-  }
-  public function setShowSpecialOfferCopy($showSpecialOfferCopy)
-  {
-    $this->showSpecialOfferCopy = $showSpecialOfferCopy;
-  }
-  public function getShowSpecialOfferCopy()
-  {
-    return $this->showSpecialOfferCopy;
-  }
-  public function setTerms($terms)
-  {
-    $this->terms = $terms;
-  }
-  public function getTerms()
-  {
-    return $this->terms;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Partners/Certification.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Partners/Certification.php
deleted file mode 100644
index 0fb5a5f5..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Partners/Certification.php
+++ /dev/null
@@ -1,66 +0,0 @@
-achieved = $achieved;
-  }
-  public function getAchieved()
-  {
-    return $this->achieved;
-  }
-  public function setCertificationType($certificationType)
-  {
-    $this->certificationType = $certificationType;
-  }
-  public function getCertificationType()
-  {
-    return $this->certificationType;
-  }
-  public function setExpiration($expiration)
-  {
-    $this->expiration = $expiration;
-  }
-  public function getExpiration()
-  {
-    return $this->expiration;
-  }
-  public function setLastAchieved($lastAchieved)
-  {
-    $this->lastAchieved = $lastAchieved;
-  }
-  public function getLastAchieved()
-  {
-    return $this->lastAchieved;
-  }
-  public function setWarning($warning)
-  {
-    $this->warning = $warning;
-  }
-  public function getWarning()
-  {
-    return $this->warning;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Partners/CertificationExamStatus.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Partners/CertificationExamStatus.php
deleted file mode 100644
index fe7eb599..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Partners/CertificationExamStatus.php
+++ /dev/null
@@ -1,39 +0,0 @@
-numberUsersPass = $numberUsersPass;
-  }
-  public function getNumberUsersPass()
-  {
-    return $this->numberUsersPass;
-  }
-  public function setType($type)
-  {
-    $this->type = $type;
-  }
-  public function getType()
-  {
-    return $this->type;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Partners/CertificationStatus.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Partners/CertificationStatus.php
deleted file mode 100644
index 7cc575b1..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Partners/CertificationStatus.php
+++ /dev/null
@@ -1,59 +0,0 @@
-examStatuses = $examStatuses;
-  }
-  public function getExamStatuses()
-  {
-    return $this->examStatuses;
-  }
-  public function setIsCertified($isCertified)
-  {
-    $this->isCertified = $isCertified;
-  }
-  public function getIsCertified()
-  {
-    return $this->isCertified;
-  }
-  public function setType($type)
-  {
-    $this->type = $type;
-  }
-  public function getType()
-  {
-    return $this->type;
-  }
-  public function setUserCount($userCount)
-  {
-    $this->userCount = $userCount;
-  }
-  public function getUserCount()
-  {
-    return $this->userCount;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Partners/Company.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Partners/Company.php
deleted file mode 100644
index 8b276dc2..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Partners/Company.php
+++ /dev/null
@@ -1,220 +0,0 @@
-additionalWebsites = $additionalWebsites;
-  }
-  public function getAdditionalWebsites()
-  {
-    return $this->additionalWebsites;
-  }
-  public function setAutoApprovalEmailDomains($autoApprovalEmailDomains)
-  {
-    $this->autoApprovalEmailDomains = $autoApprovalEmailDomains;
-  }
-  public function getAutoApprovalEmailDomains()
-  {
-    return $this->autoApprovalEmailDomains;
-  }
-  public function setBadgeTier($badgeTier)
-  {
-    $this->badgeTier = $badgeTier;
-  }
-  public function getBadgeTier()
-  {
-    return $this->badgeTier;
-  }
-  public function setCertificationStatuses($certificationStatuses)
-  {
-    $this->certificationStatuses = $certificationStatuses;
-  }
-  public function getCertificationStatuses()
-  {
-    return $this->certificationStatuses;
-  }
-  public function setCompanyTypes($companyTypes)
-  {
-    $this->companyTypes = $companyTypes;
-  }
-  public function getCompanyTypes()
-  {
-    return $this->companyTypes;
-  }
-  public function setConvertedMinMonthlyBudget(Google_Service_Partners_Money $convertedMinMonthlyBudget)
-  {
-    $this->convertedMinMonthlyBudget = $convertedMinMonthlyBudget;
-  }
-  public function getConvertedMinMonthlyBudget()
-  {
-    return $this->convertedMinMonthlyBudget;
-  }
-  public function setId($id)
-  {
-    $this->id = $id;
-  }
-  public function getId()
-  {
-    return $this->id;
-  }
-  public function setIndustries($industries)
-  {
-    $this->industries = $industries;
-  }
-  public function getIndustries()
-  {
-    return $this->industries;
-  }
-  public function setLocalizedInfos($localizedInfos)
-  {
-    $this->localizedInfos = $localizedInfos;
-  }
-  public function getLocalizedInfos()
-  {
-    return $this->localizedInfos;
-  }
-  public function setLocations($locations)
-  {
-    $this->locations = $locations;
-  }
-  public function getLocations()
-  {
-    return $this->locations;
-  }
-  public function setName($name)
-  {
-    $this->name = $name;
-  }
-  public function getName()
-  {
-    return $this->name;
-  }
-  public function setOriginalMinMonthlyBudget(Google_Service_Partners_Money $originalMinMonthlyBudget)
-  {
-    $this->originalMinMonthlyBudget = $originalMinMonthlyBudget;
-  }
-  public function getOriginalMinMonthlyBudget()
-  {
-    return $this->originalMinMonthlyBudget;
-  }
-  public function setPrimaryAdwordsManagerAccountId($primaryAdwordsManagerAccountId)
-  {
-    $this->primaryAdwordsManagerAccountId = $primaryAdwordsManagerAccountId;
-  }
-  public function getPrimaryAdwordsManagerAccountId()
-  {
-    return $this->primaryAdwordsManagerAccountId;
-  }
-  public function setPrimaryLanguageCode($primaryLanguageCode)
-  {
-    $this->primaryLanguageCode = $primaryLanguageCode;
-  }
-  public function getPrimaryLanguageCode()
-  {
-    return $this->primaryLanguageCode;
-  }
-  public function setPrimaryLocation(Google_Service_Partners_Location $primaryLocation)
-  {
-    $this->primaryLocation = $primaryLocation;
-  }
-  public function getPrimaryLocation()
-  {
-    return $this->primaryLocation;
-  }
-  public function setProfileStatus($profileStatus)
-  {
-    $this->profileStatus = $profileStatus;
-  }
-  public function getProfileStatus()
-  {
-    return $this->profileStatus;
-  }
-  public function setPublicProfile(Google_Service_Partners_PublicProfile $publicProfile)
-  {
-    $this->publicProfile = $publicProfile;
-  }
-  public function getPublicProfile()
-  {
-    return $this->publicProfile;
-  }
-  public function setRanks($ranks)
-  {
-    $this->ranks = $ranks;
-  }
-  public function getRanks()
-  {
-    return $this->ranks;
-  }
-  public function setServices($services)
-  {
-    $this->services = $services;
-  }
-  public function getServices()
-  {
-    return $this->services;
-  }
-  public function setSpecializationStatus($specializationStatus)
-  {
-    $this->specializationStatus = $specializationStatus;
-  }
-  public function getSpecializationStatus()
-  {
-    return $this->specializationStatus;
-  }
-  public function setWebsiteUrl($websiteUrl)
-  {
-    $this->websiteUrl = $websiteUrl;
-  }
-  public function getWebsiteUrl()
-  {
-    return $this->websiteUrl;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Partners/CompanyRelation.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Partners/CompanyRelation.php
deleted file mode 100644
index abc07b63..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Partners/CompanyRelation.php
+++ /dev/null
@@ -1,158 +0,0 @@
-address = $address;
-  }
-  public function getAddress()
-  {
-    return $this->address;
-  }
-  public function setBadgeTier($badgeTier)
-  {
-    $this->badgeTier = $badgeTier;
-  }
-  public function getBadgeTier()
-  {
-    return $this->badgeTier;
-  }
-  public function setCompanyAdmin($companyAdmin)
-  {
-    $this->companyAdmin = $companyAdmin;
-  }
-  public function getCompanyAdmin()
-  {
-    return $this->companyAdmin;
-  }
-  public function setCompanyId($companyId)
-  {
-    $this->companyId = $companyId;
-  }
-  public function getCompanyId()
-  {
-    return $this->companyId;
-  }
-  public function setCreationTime($creationTime)
-  {
-    $this->creationTime = $creationTime;
-  }
-  public function getCreationTime()
-  {
-    return $this->creationTime;
-  }
-  public function setIsPending($isPending)
-  {
-    $this->isPending = $isPending;
-  }
-  public function getIsPending()
-  {
-    return $this->isPending;
-  }
-  public function setLogoUrl($logoUrl)
-  {
-    $this->logoUrl = $logoUrl;
-  }
-  public function getLogoUrl()
-  {
-    return $this->logoUrl;
-  }
-  public function setManagerAccount($managerAccount)
-  {
-    $this->managerAccount = $managerAccount;
-  }
-  public function getManagerAccount()
-  {
-    return $this->managerAccount;
-  }
-  public function setName($name)
-  {
-    $this->name = $name;
-  }
-  public function getName()
-  {
-    return $this->name;
-  }
-  public function setPhoneNumber($phoneNumber)
-  {
-    $this->phoneNumber = $phoneNumber;
-  }
-  public function getPhoneNumber()
-  {
-    return $this->phoneNumber;
-  }
-  public function setResolvedTimestamp($resolvedTimestamp)
-  {
-    $this->resolvedTimestamp = $resolvedTimestamp;
-  }
-  public function getResolvedTimestamp()
-  {
-    return $this->resolvedTimestamp;
-  }
-  public function setSegment($segment)
-  {
-    $this->segment = $segment;
-  }
-  public function getSegment()
-  {
-    return $this->segment;
-  }
-  public function setSpecializationStatus($specializationStatus)
-  {
-    $this->specializationStatus = $specializationStatus;
-  }
-  public function getSpecializationStatus()
-  {
-    return $this->specializationStatus;
-  }
-  public function setState($state)
-  {
-    $this->state = $state;
-  }
-  public function getState()
-  {
-    return $this->state;
-  }
-  public function setWebsite($website)
-  {
-    $this->website = $website;
-  }
-  public function getWebsite()
-  {
-    return $this->website;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Partners/CountryOfferInfo.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Partners/CountryOfferInfo.php
deleted file mode 100644
index 5707192e..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Partners/CountryOfferInfo.php
+++ /dev/null
@@ -1,57 +0,0 @@
-getYAmount = $getYAmount;
-  }
-  public function getGetYAmount()
-  {
-    return $this->getYAmount;
-  }
-  public function setOfferCountryCode($offerCountryCode)
-  {
-    $this->offerCountryCode = $offerCountryCode;
-  }
-  public function getOfferCountryCode()
-  {
-    return $this->offerCountryCode;
-  }
-  public function setOfferType($offerType)
-  {
-    $this->offerType = $offerType;
-  }
-  public function getOfferType()
-  {
-    return $this->offerType;
-  }
-  public function setSpendXAmount($spendXAmount)
-  {
-    $this->spendXAmount = $spendXAmount;
-  }
-  public function getSpendXAmount()
-  {
-    return $this->spendXAmount;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Partners/CreateLeadRequest.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Partners/CreateLeadRequest.php
deleted file mode 100644
index 8d500808..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Partners/CreateLeadRequest.php
+++ /dev/null
@@ -1,51 +0,0 @@
-lead = $lead;
-  }
-  public function getLead()
-  {
-    return $this->lead;
-  }
-  public function setRecaptchaChallenge(Google_Service_Partners_RecaptchaChallenge $recaptchaChallenge)
-  {
-    $this->recaptchaChallenge = $recaptchaChallenge;
-  }
-  public function getRecaptchaChallenge()
-  {
-    return $this->recaptchaChallenge;
-  }
-  public function setRequestMetadata(Google_Service_Partners_RequestMetadata $requestMetadata)
-  {
-    $this->requestMetadata = $requestMetadata;
-  }
-  public function getRequestMetadata()
-  {
-    return $this->requestMetadata;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Partners/CreateLeadResponse.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Partners/CreateLeadResponse.php
deleted file mode 100644
index 6a435771..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Partners/CreateLeadResponse.php
+++ /dev/null
@@ -1,50 +0,0 @@
-lead = $lead;
-  }
-  public function getLead()
-  {
-    return $this->lead;
-  }
-  public function setRecaptchaStatus($recaptchaStatus)
-  {
-    $this->recaptchaStatus = $recaptchaStatus;
-  }
-  public function getRecaptchaStatus()
-  {
-    return $this->recaptchaStatus;
-  }
-  public function setResponseMetadata(Google_Service_Partners_ResponseMetadata $responseMetadata)
-  {
-    $this->responseMetadata = $responseMetadata;
-  }
-  public function getResponseMetadata()
-  {
-    return $this->responseMetadata;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Partners/Date.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Partners/Date.php
deleted file mode 100644
index 3ad8c9db..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Partners/Date.php
+++ /dev/null
@@ -1,48 +0,0 @@
-day = $day;
-  }
-  public function getDay()
-  {
-    return $this->day;
-  }
-  public function setMonth($month)
-  {
-    $this->month = $month;
-  }
-  public function getMonth()
-  {
-    return $this->month;
-  }
-  public function setYear($year)
-  {
-    $this->year = $year;
-  }
-  public function getYear()
-  {
-    return $this->year;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Partners/DebugInfo.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Partners/DebugInfo.php
deleted file mode 100644
index 279e34a2..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Partners/DebugInfo.php
+++ /dev/null
@@ -1,48 +0,0 @@
-serverInfo = $serverInfo;
-  }
-  public function getServerInfo()
-  {
-    return $this->serverInfo;
-  }
-  public function setServerTraceInfo($serverTraceInfo)
-  {
-    $this->serverTraceInfo = $serverTraceInfo;
-  }
-  public function getServerTraceInfo()
-  {
-    return $this->serverTraceInfo;
-  }
-  public function setServiceUrl($serviceUrl)
-  {
-    $this->serviceUrl = $serviceUrl;
-  }
-  public function getServiceUrl()
-  {
-    return $this->serviceUrl;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Partners/EventData.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Partners/EventData.php
deleted file mode 100644
index 6acac885..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Partners/EventData.php
+++ /dev/null
@@ -1,40 +0,0 @@
-key = $key;
-  }
-  public function getKey()
-  {
-    return $this->key;
-  }
-  public function setValues($values)
-  {
-    $this->values = $values;
-  }
-  public function getValues()
-  {
-    return $this->values;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Partners/ExamStatus.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Partners/ExamStatus.php
deleted file mode 100644
index ddc524e6..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Partners/ExamStatus.php
+++ /dev/null
@@ -1,75 +0,0 @@
-examType = $examType;
-  }
-  public function getExamType()
-  {
-    return $this->examType;
-  }
-  public function setExpiration($expiration)
-  {
-    $this->expiration = $expiration;
-  }
-  public function getExpiration()
-  {
-    return $this->expiration;
-  }
-  public function setLastPassed($lastPassed)
-  {
-    $this->lastPassed = $lastPassed;
-  }
-  public function getLastPassed()
-  {
-    return $this->lastPassed;
-  }
-  public function setPassed($passed)
-  {
-    $this->passed = $passed;
-  }
-  public function getPassed()
-  {
-    return $this->passed;
-  }
-  public function setTaken($taken)
-  {
-    $this->taken = $taken;
-  }
-  public function getTaken()
-  {
-    return $this->taken;
-  }
-  public function setWarning($warning)
-  {
-    $this->warning = $warning;
-  }
-  public function getWarning()
-  {
-    return $this->warning;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Partners/ExamToken.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Partners/ExamToken.php
deleted file mode 100644
index 6f9e2b65..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Partners/ExamToken.php
+++ /dev/null
@@ -1,48 +0,0 @@
-examId = $examId;
-  }
-  public function getExamId()
-  {
-    return $this->examId;
-  }
-  public function setExamType($examType)
-  {
-    $this->examType = $examType;
-  }
-  public function getExamType()
-  {
-    return $this->examType;
-  }
-  public function setToken($token)
-  {
-    $this->token = $token;
-  }
-  public function getToken()
-  {
-    return $this->token;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Partners/GetCompanyResponse.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Partners/GetCompanyResponse.php
deleted file mode 100644
index d16fae2d..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Partners/GetCompanyResponse.php
+++ /dev/null
@@ -1,41 +0,0 @@
-company = $company;
-  }
-  public function getCompany()
-  {
-    return $this->company;
-  }
-  public function setResponseMetadata(Google_Service_Partners_ResponseMetadata $responseMetadata)
-  {
-    $this->responseMetadata = $responseMetadata;
-  }
-  public function getResponseMetadata()
-  {
-    return $this->responseMetadata;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Partners/GetPartnersStatusResponse.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Partners/GetPartnersStatusResponse.php
deleted file mode 100644
index c505c2e7..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Partners/GetPartnersStatusResponse.php
+++ /dev/null
@@ -1,31 +0,0 @@
-responseMetadata = $responseMetadata;
-  }
-  public function getResponseMetadata()
-  {
-    return $this->responseMetadata;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Partners/HistoricalOffer.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Partners/HistoricalOffer.php
deleted file mode 100644
index 652ba5bb..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Partners/HistoricalOffer.php
+++ /dev/null
@@ -1,129 +0,0 @@
-adwordsUrl = $adwordsUrl;
-  }
-  public function getAdwordsUrl()
-  {
-    return $this->adwordsUrl;
-  }
-  public function setClientEmail($clientEmail)
-  {
-    $this->clientEmail = $clientEmail;
-  }
-  public function getClientEmail()
-  {
-    return $this->clientEmail;
-  }
-  public function setClientId($clientId)
-  {
-    $this->clientId = $clientId;
-  }
-  public function getClientId()
-  {
-    return $this->clientId;
-  }
-  public function setClientName($clientName)
-  {
-    $this->clientName = $clientName;
-  }
-  public function getClientName()
-  {
-    return $this->clientName;
-  }
-  public function setCreationTime($creationTime)
-  {
-    $this->creationTime = $creationTime;
-  }
-  public function getCreationTime()
-  {
-    return $this->creationTime;
-  }
-  public function setExpirationTime($expirationTime)
-  {
-    $this->expirationTime = $expirationTime;
-  }
-  public function getExpirationTime()
-  {
-    return $this->expirationTime;
-  }
-  public function setLastModifiedTime($lastModifiedTime)
-  {
-    $this->lastModifiedTime = $lastModifiedTime;
-  }
-  public function getLastModifiedTime()
-  {
-    return $this->lastModifiedTime;
-  }
-  public function setOfferCode($offerCode)
-  {
-    $this->offerCode = $offerCode;
-  }
-  public function getOfferCode()
-  {
-    return $this->offerCode;
-  }
-  public function setOfferCountryCode($offerCountryCode)
-  {
-    $this->offerCountryCode = $offerCountryCode;
-  }
-  public function getOfferCountryCode()
-  {
-    return $this->offerCountryCode;
-  }
-  public function setOfferType($offerType)
-  {
-    $this->offerType = $offerType;
-  }
-  public function getOfferType()
-  {
-    return $this->offerType;
-  }
-  public function setSenderName($senderName)
-  {
-    $this->senderName = $senderName;
-  }
-  public function getSenderName()
-  {
-    return $this->senderName;
-  }
-  public function setStatus($status)
-  {
-    $this->status = $status;
-  }
-  public function getStatus()
-  {
-    return $this->status;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Partners/LatLng.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Partners/LatLng.php
deleted file mode 100644
index 70435aa1..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Partners/LatLng.php
+++ /dev/null
@@ -1,39 +0,0 @@
-latitude = $latitude;
-  }
-  public function getLatitude()
-  {
-    return $this->latitude;
-  }
-  public function setLongitude($longitude)
-  {
-    $this->longitude = $longitude;
-  }
-  public function getLongitude()
-  {
-    return $this->longitude;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Partners/Lead.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Partners/Lead.php
deleted file mode 100644
index ad72ed40..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Partners/Lead.php
+++ /dev/null
@@ -1,158 +0,0 @@
-adwordsCustomerId = $adwordsCustomerId;
-  }
-  public function getAdwordsCustomerId()
-  {
-    return $this->adwordsCustomerId;
-  }
-  public function setComments($comments)
-  {
-    $this->comments = $comments;
-  }
-  public function getComments()
-  {
-    return $this->comments;
-  }
-  public function setCreateTime($createTime)
-  {
-    $this->createTime = $createTime;
-  }
-  public function getCreateTime()
-  {
-    return $this->createTime;
-  }
-  public function setEmail($email)
-  {
-    $this->email = $email;
-  }
-  public function getEmail()
-  {
-    return $this->email;
-  }
-  public function setFamilyName($familyName)
-  {
-    $this->familyName = $familyName;
-  }
-  public function getFamilyName()
-  {
-    return $this->familyName;
-  }
-  public function setGivenName($givenName)
-  {
-    $this->givenName = $givenName;
-  }
-  public function getGivenName()
-  {
-    return $this->givenName;
-  }
-  public function setGpsMotivations($gpsMotivations)
-  {
-    $this->gpsMotivations = $gpsMotivations;
-  }
-  public function getGpsMotivations()
-  {
-    return $this->gpsMotivations;
-  }
-  public function setId($id)
-  {
-    $this->id = $id;
-  }
-  public function getId()
-  {
-    return $this->id;
-  }
-  public function setLanguageCode($languageCode)
-  {
-    $this->languageCode = $languageCode;
-  }
-  public function getLanguageCode()
-  {
-    return $this->languageCode;
-  }
-  public function setMarketingOptIn($marketingOptIn)
-  {
-    $this->marketingOptIn = $marketingOptIn;
-  }
-  public function getMarketingOptIn()
-  {
-    return $this->marketingOptIn;
-  }
-  public function setMinMonthlyBudget(Google_Service_Partners_Money $minMonthlyBudget)
-  {
-    $this->minMonthlyBudget = $minMonthlyBudget;
-  }
-  public function getMinMonthlyBudget()
-  {
-    return $this->minMonthlyBudget;
-  }
-  public function setPhoneNumber($phoneNumber)
-  {
-    $this->phoneNumber = $phoneNumber;
-  }
-  public function getPhoneNumber()
-  {
-    return $this->phoneNumber;
-  }
-  public function setState($state)
-  {
-    $this->state = $state;
-  }
-  public function getState()
-  {
-    return $this->state;
-  }
-  public function setType($type)
-  {
-    $this->type = $type;
-  }
-  public function getType()
-  {
-    return $this->type;
-  }
-  public function setWebsiteUrl($websiteUrl)
-  {
-    $this->websiteUrl = $websiteUrl;
-  }
-  public function getWebsiteUrl()
-  {
-    return $this->websiteUrl;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Partners/ListAnalyticsResponse.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Partners/ListAnalyticsResponse.php
deleted file mode 100644
index 4299a5de..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Partners/ListAnalyticsResponse.php
+++ /dev/null
@@ -1,61 +0,0 @@
-analytics = $analytics;
-  }
-  public function getAnalytics()
-  {
-    return $this->analytics;
-  }
-  public function setAnalyticsSummary(Google_Service_Partners_AnalyticsSummary $analyticsSummary)
-  {
-    $this->analyticsSummary = $analyticsSummary;
-  }
-  public function getAnalyticsSummary()
-  {
-    return $this->analyticsSummary;
-  }
-  public function setNextPageToken($nextPageToken)
-  {
-    $this->nextPageToken = $nextPageToken;
-  }
-  public function getNextPageToken()
-  {
-    return $this->nextPageToken;
-  }
-  public function setResponseMetadata(Google_Service_Partners_ResponseMetadata $responseMetadata)
-  {
-    $this->responseMetadata = $responseMetadata;
-  }
-  public function getResponseMetadata()
-  {
-    return $this->responseMetadata;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Partners/ListCompaniesResponse.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Partners/ListCompaniesResponse.php
deleted file mode 100644
index bed980c1..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Partners/ListCompaniesResponse.php
+++ /dev/null
@@ -1,51 +0,0 @@
-companies = $companies;
-  }
-  public function getCompanies()
-  {
-    return $this->companies;
-  }
-  public function setNextPageToken($nextPageToken)
-  {
-    $this->nextPageToken = $nextPageToken;
-  }
-  public function getNextPageToken()
-  {
-    return $this->nextPageToken;
-  }
-  public function setResponseMetadata(Google_Service_Partners_ResponseMetadata $responseMetadata)
-  {
-    $this->responseMetadata = $responseMetadata;
-  }
-  public function getResponseMetadata()
-  {
-    return $this->responseMetadata;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Partners/ListLeadsResponse.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Partners/ListLeadsResponse.php
deleted file mode 100644
index c48ea416..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Partners/ListLeadsResponse.php
+++ /dev/null
@@ -1,60 +0,0 @@
-leads = $leads;
-  }
-  public function getLeads()
-  {
-    return $this->leads;
-  }
-  public function setNextPageToken($nextPageToken)
-  {
-    $this->nextPageToken = $nextPageToken;
-  }
-  public function getNextPageToken()
-  {
-    return $this->nextPageToken;
-  }
-  public function setResponseMetadata(Google_Service_Partners_ResponseMetadata $responseMetadata)
-  {
-    $this->responseMetadata = $responseMetadata;
-  }
-  public function getResponseMetadata()
-  {
-    return $this->responseMetadata;
-  }
-  public function setTotalSize($totalSize)
-  {
-    $this->totalSize = $totalSize;
-  }
-  public function getTotalSize()
-  {
-    return $this->totalSize;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Partners/ListOffersHistoryResponse.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Partners/ListOffersHistoryResponse.php
deleted file mode 100644
index 382321ce..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Partners/ListOffersHistoryResponse.php
+++ /dev/null
@@ -1,78 +0,0 @@
-canShowEntireCompany = $canShowEntireCompany;
-  }
-  public function getCanShowEntireCompany()
-  {
-    return $this->canShowEntireCompany;
-  }
-  public function setNextPageToken($nextPageToken)
-  {
-    $this->nextPageToken = $nextPageToken;
-  }
-  public function getNextPageToken()
-  {
-    return $this->nextPageToken;
-  }
-  public function setOffers($offers)
-  {
-    $this->offers = $offers;
-  }
-  public function getOffers()
-  {
-    return $this->offers;
-  }
-  public function setResponseMetadata(Google_Service_Partners_ResponseMetadata $responseMetadata)
-  {
-    $this->responseMetadata = $responseMetadata;
-  }
-  public function getResponseMetadata()
-  {
-    return $this->responseMetadata;
-  }
-  public function setShowingEntireCompany($showingEntireCompany)
-  {
-    $this->showingEntireCompany = $showingEntireCompany;
-  }
-  public function getShowingEntireCompany()
-  {
-    return $this->showingEntireCompany;
-  }
-  public function setTotalResults($totalResults)
-  {
-    $this->totalResults = $totalResults;
-  }
-  public function getTotalResults()
-  {
-    return $this->totalResults;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Partners/ListOffersResponse.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Partners/ListOffersResponse.php
deleted file mode 100644
index b538076b..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Partners/ListOffersResponse.php
+++ /dev/null
@@ -1,51 +0,0 @@
-availableOffers = $availableOffers;
-  }
-  public function getAvailableOffers()
-  {
-    return $this->availableOffers;
-  }
-  public function setNoOfferReason($noOfferReason)
-  {
-    $this->noOfferReason = $noOfferReason;
-  }
-  public function getNoOfferReason()
-  {
-    return $this->noOfferReason;
-  }
-  public function setResponseMetadata(Google_Service_Partners_ResponseMetadata $responseMetadata)
-  {
-    $this->responseMetadata = $responseMetadata;
-  }
-  public function getResponseMetadata()
-  {
-    return $this->responseMetadata;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Partners/ListUserStatesResponse.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Partners/ListUserStatesResponse.php
deleted file mode 100644
index 18dda569..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Partners/ListUserStatesResponse.php
+++ /dev/null
@@ -1,41 +0,0 @@
-responseMetadata = $responseMetadata;
-  }
-  public function getResponseMetadata()
-  {
-    return $this->responseMetadata;
-  }
-  public function setUserStates($userStates)
-  {
-    $this->userStates = $userStates;
-  }
-  public function getUserStates()
-  {
-    return $this->userStates;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Partners/LocalizedCompanyInfo.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Partners/LocalizedCompanyInfo.php
deleted file mode 100644
index aad12cc3..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Partners/LocalizedCompanyInfo.php
+++ /dev/null
@@ -1,58 +0,0 @@
-countryCodes = $countryCodes;
-  }
-  public function getCountryCodes()
-  {
-    return $this->countryCodes;
-  }
-  public function setDisplayName($displayName)
-  {
-    $this->displayName = $displayName;
-  }
-  public function getDisplayName()
-  {
-    return $this->displayName;
-  }
-  public function setLanguageCode($languageCode)
-  {
-    $this->languageCode = $languageCode;
-  }
-  public function getLanguageCode()
-  {
-    return $this->languageCode;
-  }
-  public function setOverview($overview)
-  {
-    $this->overview = $overview;
-  }
-  public function getOverview()
-  {
-    return $this->overview;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Partners/Location.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Partners/Location.php
deleted file mode 100644
index 4acd0420..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Partners/Location.php
+++ /dev/null
@@ -1,113 +0,0 @@
-address = $address;
-  }
-  public function getAddress()
-  {
-    return $this->address;
-  }
-  public function setAddressLine($addressLine)
-  {
-    $this->addressLine = $addressLine;
-  }
-  public function getAddressLine()
-  {
-    return $this->addressLine;
-  }
-  public function setAdministrativeArea($administrativeArea)
-  {
-    $this->administrativeArea = $administrativeArea;
-  }
-  public function getAdministrativeArea()
-  {
-    return $this->administrativeArea;
-  }
-  public function setDependentLocality($dependentLocality)
-  {
-    $this->dependentLocality = $dependentLocality;
-  }
-  public function getDependentLocality()
-  {
-    return $this->dependentLocality;
-  }
-  public function setLanguageCode($languageCode)
-  {
-    $this->languageCode = $languageCode;
-  }
-  public function getLanguageCode()
-  {
-    return $this->languageCode;
-  }
-  public function setLatLng(Google_Service_Partners_LatLng $latLng)
-  {
-    $this->latLng = $latLng;
-  }
-  public function getLatLng()
-  {
-    return $this->latLng;
-  }
-  public function setLocality($locality)
-  {
-    $this->locality = $locality;
-  }
-  public function getLocality()
-  {
-    return $this->locality;
-  }
-  public function setPostalCode($postalCode)
-  {
-    $this->postalCode = $postalCode;
-  }
-  public function getPostalCode()
-  {
-    return $this->postalCode;
-  }
-  public function setRegionCode($regionCode)
-  {
-    $this->regionCode = $regionCode;
-  }
-  public function getRegionCode()
-  {
-    return $this->regionCode;
-  }
-  public function setSortingCode($sortingCode)
-  {
-    $this->sortingCode = $sortingCode;
-  }
-  public function getSortingCode()
-  {
-    return $this->sortingCode;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Partners/LogMessageRequest.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Partners/LogMessageRequest.php
deleted file mode 100644
index 19f76180..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Partners/LogMessageRequest.php
+++ /dev/null
@@ -1,58 +0,0 @@
-clientInfo = $clientInfo;
-  }
-  public function getClientInfo()
-  {
-    return $this->clientInfo;
-  }
-  public function setDetails($details)
-  {
-    $this->details = $details;
-  }
-  public function getDetails()
-  {
-    return $this->details;
-  }
-  public function setLevel($level)
-  {
-    $this->level = $level;
-  }
-  public function getLevel()
-  {
-    return $this->level;
-  }
-  public function setRequestMetadata(Google_Service_Partners_RequestMetadata $requestMetadata)
-  {
-    $this->requestMetadata = $requestMetadata;
-  }
-  public function getRequestMetadata()
-  {
-    return $this->requestMetadata;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Partners/LogMessageResponse.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Partners/LogMessageResponse.php
deleted file mode 100644
index e29a824b..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Partners/LogMessageResponse.php
+++ /dev/null
@@ -1,31 +0,0 @@
-responseMetadata = $responseMetadata;
-  }
-  public function getResponseMetadata()
-  {
-    return $this->responseMetadata;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Partners/LogUserEventRequest.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Partners/LogUserEventRequest.php
deleted file mode 100644
index c374c91a..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Partners/LogUserEventRequest.php
+++ /dev/null
@@ -1,88 +0,0 @@
-eventAction = $eventAction;
-  }
-  public function getEventAction()
-  {
-    return $this->eventAction;
-  }
-  public function setEventCategory($eventCategory)
-  {
-    $this->eventCategory = $eventCategory;
-  }
-  public function getEventCategory()
-  {
-    return $this->eventCategory;
-  }
-  public function setEventDatas($eventDatas)
-  {
-    $this->eventDatas = $eventDatas;
-  }
-  public function getEventDatas()
-  {
-    return $this->eventDatas;
-  }
-  public function setEventScope($eventScope)
-  {
-    $this->eventScope = $eventScope;
-  }
-  public function getEventScope()
-  {
-    return $this->eventScope;
-  }
-  public function setLead(Google_Service_Partners_Lead $lead)
-  {
-    $this->lead = $lead;
-  }
-  public function getLead()
-  {
-    return $this->lead;
-  }
-  public function setRequestMetadata(Google_Service_Partners_RequestMetadata $requestMetadata)
-  {
-    $this->requestMetadata = $requestMetadata;
-  }
-  public function getRequestMetadata()
-  {
-    return $this->requestMetadata;
-  }
-  public function setUrl($url)
-  {
-    $this->url = $url;
-  }
-  public function getUrl()
-  {
-    return $this->url;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Partners/LogUserEventResponse.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Partners/LogUserEventResponse.php
deleted file mode 100644
index 3584f2bf..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Partners/LogUserEventResponse.php
+++ /dev/null
@@ -1,31 +0,0 @@
-responseMetadata = $responseMetadata;
-  }
-  public function getResponseMetadata()
-  {
-    return $this->responseMetadata;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Partners/Money.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Partners/Money.php
deleted file mode 100644
index 60d94e63..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Partners/Money.php
+++ /dev/null
@@ -1,48 +0,0 @@
-currencyCode = $currencyCode;
-  }
-  public function getCurrencyCode()
-  {
-    return $this->currencyCode;
-  }
-  public function setNanos($nanos)
-  {
-    $this->nanos = $nanos;
-  }
-  public function getNanos()
-  {
-    return $this->nanos;
-  }
-  public function setUnits($units)
-  {
-    $this->units = $units;
-  }
-  public function getUnits()
-  {
-    return $this->units;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Partners/OfferCustomer.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Partners/OfferCustomer.php
deleted file mode 100644
index 29c52631..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Partners/OfferCustomer.php
+++ /dev/null
@@ -1,102 +0,0 @@
-adwordsUrl = $adwordsUrl;
-  }
-  public function getAdwordsUrl()
-  {
-    return $this->adwordsUrl;
-  }
-  public function setCountryCode($countryCode)
-  {
-    $this->countryCode = $countryCode;
-  }
-  public function getCountryCode()
-  {
-    return $this->countryCode;
-  }
-  public function setCreationTime($creationTime)
-  {
-    $this->creationTime = $creationTime;
-  }
-  public function getCreationTime()
-  {
-    return $this->creationTime;
-  }
-  public function setEligibilityDaysLeft($eligibilityDaysLeft)
-  {
-    $this->eligibilityDaysLeft = $eligibilityDaysLeft;
-  }
-  public function getEligibilityDaysLeft()
-  {
-    return $this->eligibilityDaysLeft;
-  }
-  public function setExternalCid($externalCid)
-  {
-    $this->externalCid = $externalCid;
-  }
-  public function getExternalCid()
-  {
-    return $this->externalCid;
-  }
-  public function setGetYAmount($getYAmount)
-  {
-    $this->getYAmount = $getYAmount;
-  }
-  public function getGetYAmount()
-  {
-    return $this->getYAmount;
-  }
-  public function setName($name)
-  {
-    $this->name = $name;
-  }
-  public function getName()
-  {
-    return $this->name;
-  }
-  public function setOfferType($offerType)
-  {
-    $this->offerType = $offerType;
-  }
-  public function getOfferType()
-  {
-    return $this->offerType;
-  }
-  public function setSpendXAmount($spendXAmount)
-  {
-    $this->spendXAmount = $spendXAmount;
-  }
-  public function getSpendXAmount()
-  {
-    return $this->spendXAmount;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Partners/OptIns.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Partners/OptIns.php
deleted file mode 100644
index 2553eb65..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Partners/OptIns.php
+++ /dev/null
@@ -1,66 +0,0 @@
-marketComm = $marketComm;
-  }
-  public function getMarketComm()
-  {
-    return $this->marketComm;
-  }
-  public function setPerformanceSuggestions($performanceSuggestions)
-  {
-    $this->performanceSuggestions = $performanceSuggestions;
-  }
-  public function getPerformanceSuggestions()
-  {
-    return $this->performanceSuggestions;
-  }
-  public function setPhoneContact($phoneContact)
-  {
-    $this->phoneContact = $phoneContact;
-  }
-  public function getPhoneContact()
-  {
-    return $this->phoneContact;
-  }
-  public function setPhysicalMail($physicalMail)
-  {
-    $this->physicalMail = $physicalMail;
-  }
-  public function getPhysicalMail()
-  {
-    return $this->physicalMail;
-  }
-  public function setSpecialOffers($specialOffers)
-  {
-    $this->specialOffers = $specialOffers;
-  }
-  public function getSpecialOffers()
-  {
-    return $this->specialOffers;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Partners/PartnersEmpty.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Partners/PartnersEmpty.php
deleted file mode 100644
index a960b04f..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Partners/PartnersEmpty.php
+++ /dev/null
@@ -1,20 +0,0 @@
-displayImageUrl = $displayImageUrl;
-  }
-  public function getDisplayImageUrl()
-  {
-    return $this->displayImageUrl;
-  }
-  public function setDisplayName($displayName)
-  {
-    $this->displayName = $displayName;
-  }
-  public function getDisplayName()
-  {
-    return $this->displayName;
-  }
-  public function setId($id)
-  {
-    $this->id = $id;
-  }
-  public function getId()
-  {
-    return $this->id;
-  }
-  public function setProfileImage($profileImage)
-  {
-    $this->profileImage = $profileImage;
-  }
-  public function getProfileImage()
-  {
-    return $this->profileImage;
-  }
-  public function setUrl($url)
-  {
-    $this->url = $url;
-  }
-  public function getUrl()
-  {
-    return $this->url;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Partners/Rank.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Partners/Rank.php
deleted file mode 100644
index c011abaa..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Partners/Rank.php
+++ /dev/null
@@ -1,39 +0,0 @@
-type = $type;
-  }
-  public function getType()
-  {
-    return $this->type;
-  }
-  public function setValue($value)
-  {
-    $this->value = $value;
-  }
-  public function getValue()
-  {
-    return $this->value;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Partners/RecaptchaChallenge.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Partners/RecaptchaChallenge.php
deleted file mode 100644
index f66445d6..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Partners/RecaptchaChallenge.php
+++ /dev/null
@@ -1,39 +0,0 @@
-id = $id;
-  }
-  public function getId()
-  {
-    return $this->id;
-  }
-  public function setResponse($response)
-  {
-    $this->response = $response;
-  }
-  public function getResponse()
-  {
-    return $this->response;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Partners/RequestMetadata.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Partners/RequestMetadata.php
deleted file mode 100644
index 9801c731..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Partners/RequestMetadata.php
+++ /dev/null
@@ -1,69 +0,0 @@
-experimentIds = $experimentIds;
-  }
-  public function getExperimentIds()
-  {
-    return $this->experimentIds;
-  }
-  public function setLocale($locale)
-  {
-    $this->locale = $locale;
-  }
-  public function getLocale()
-  {
-    return $this->locale;
-  }
-  public function setPartnersSessionId($partnersSessionId)
-  {
-    $this->partnersSessionId = $partnersSessionId;
-  }
-  public function getPartnersSessionId()
-  {
-    return $this->partnersSessionId;
-  }
-  public function setTrafficSource(Google_Service_Partners_TrafficSource $trafficSource)
-  {
-    $this->trafficSource = $trafficSource;
-  }
-  public function getTrafficSource()
-  {
-    return $this->trafficSource;
-  }
-  public function setUserOverrides(Google_Service_Partners_UserOverrides $userOverrides)
-  {
-    $this->userOverrides = $userOverrides;
-  }
-  public function getUserOverrides()
-  {
-    return $this->userOverrides;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Partners/Resource/Analytics.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Partners/Resource/Analytics.php
deleted file mode 100644
index f319c215..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Partners/Resource/Analytics.php
+++ /dev/null
@@ -1,70 +0,0 @@
-
- *   $partnersService = new Google_Service_Partners(...);
- *   $analytics = $partnersService->analytics;
- *  
- */
-class Google_Service_Partners_Resource_Analytics extends Google_Service_Resource
-{
-  /**
-   * Lists analytics data for a user's associated company. Should only be called
-   * within the context of an authorized logged in user. (analytics.listAnalytics)
-   *
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param string requestMetadata.trafficSource.trafficSubId Second level
-   * identifier to indicate where the traffic comes from. An identifier has
-   * multiple letters created by a team which redirected the traffic to us.
-   * @opt_param string requestMetadata.userOverrides.userId Logged-in user ID to
-   * impersonate instead of the user's ID.
-   * @opt_param string requestMetadata.partnersSessionId Google Partners session
-   * ID.
-   * @opt_param string pageToken A token identifying a page of results that the
-   * server returns. Typically, this is the value of
-   * `ListAnalyticsResponse.next_page_token` returned from the previous call to
-   * ListAnalytics. Will be a date string in `YYYY-MM-DD` format representing the
-   * end date of the date range of results to return. If unspecified or set to "",
-   * default value is the current date.
-   * @opt_param int pageSize Requested page size. Server may return fewer
-   * analytics than requested. If unspecified or set to 0, default value is 30.
-   * Specifies the number of days in the date range when querying analytics. The
-   * `page_token` represents the end date of the date range and the start date is
-   * calculated using the `page_size` as the number of days BEFORE the end date.
-   * Must be a non-negative integer.
-   * @opt_param string requestMetadata.trafficSource.trafficSourceId Identifier to
-   * indicate where the traffic comes from. An identifier has multiple letters
-   * created by a team which redirected the traffic to us.
-   * @opt_param string requestMetadata.locale Locale to use for the current
-   * request.
-   * @opt_param string requestMetadata.userOverrides.ipAddress IP address to use
-   * instead of the user's geo-located IP address.
-   * @opt_param string requestMetadata.experimentIds Experiment IDs the current
-   * request belongs to.
-   * @return Google_Service_Partners_ListAnalyticsResponse
-   */
-  public function listAnalytics($optParams = array())
-  {
-    $params = array();
-    $params = array_merge($params, $optParams);
-    return $this->call('list', array($params), "Google_Service_Partners_ListAnalyticsResponse");
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Partners/Resource/ClientMessages.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Partners/Resource/ClientMessages.php
deleted file mode 100644
index 22d6813f..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Partners/Resource/ClientMessages.php
+++ /dev/null
@@ -1,43 +0,0 @@
-
- *   $partnersService = new Google_Service_Partners(...);
- *   $clientMessages = $partnersService->clientMessages;
- *  
- */
-class Google_Service_Partners_Resource_ClientMessages extends Google_Service_Resource
-{
-  /**
-   * Logs a generic message from the client, such as `Failed to render component`,
-   * `Profile page is running slow`, `More than 500 users have accessed this
-   * result.`, etc. (clientMessages.log)
-   *
-   * @param Google_Service_Partners_LogMessageRequest $postBody
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Partners_LogMessageResponse
-   */
-  public function log(Google_Service_Partners_LogMessageRequest $postBody, $optParams = array())
-  {
-    $params = array('postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('log', array($params), "Google_Service_Partners_LogMessageResponse");
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Partners/Resource/Companies.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Partners/Resource/Companies.php
deleted file mode 100644
index 570eeb49..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Partners/Resource/Companies.php
+++ /dev/null
@@ -1,150 +0,0 @@
-
- *   $partnersService = new Google_Service_Partners(...);
- *   $companies = $partnersService->companies;
- *  
- */
-class Google_Service_Partners_Resource_Companies extends Google_Service_Resource
-{
-  /**
-   * Gets a company. (companies.get)
-   *
-   * @param string $companyId The ID of the company to retrieve.
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param string requestMetadata.trafficSource.trafficSourceId Identifier to
-   * indicate where the traffic comes from. An identifier has multiple letters
-   * created by a team which redirected the traffic to us.
-   * @opt_param string requestMetadata.userOverrides.ipAddress IP address to use
-   * instead of the user's geo-located IP address.
-   * @opt_param string requestMetadata.experimentIds Experiment IDs the current
-   * request belongs to.
-   * @opt_param string currencyCode If the company's budget is in a different
-   * currency code than this one, then the converted budget is converted to this
-   * currency code.
-   * @opt_param string requestMetadata.trafficSource.trafficSubId Second level
-   * identifier to indicate where the traffic comes from. An identifier has
-   * multiple letters created by a team which redirected the traffic to us.
-   * @opt_param string orderBy How to order addresses within the returned company.
-   * Currently, only `address` and `address desc` is supported which will sorted
-   * by closest to farthest in distance from given address and farthest to closest
-   * distance from given address respectively.
-   * @opt_param string requestMetadata.userOverrides.userId Logged-in user ID to
-   * impersonate instead of the user's ID.
-   * @opt_param string requestMetadata.partnersSessionId Google Partners session
-   * ID.
-   * @opt_param string view The view of `Company` resource to be returned. This
-   * must not be `COMPANY_VIEW_UNSPECIFIED`.
-   * @opt_param string requestMetadata.locale Locale to use for the current
-   * request.
-   * @opt_param string address The address to use for sorting the company's
-   * addresses by proximity. If not given, the geo-located address of the request
-   * is used. Used when order_by is set.
-   * @return Google_Service_Partners_GetCompanyResponse
-   */
-  public function get($companyId, $optParams = array())
-  {
-    $params = array('companyId' => $companyId);
-    $params = array_merge($params, $optParams);
-    return $this->call('get', array($params), "Google_Service_Partners_GetCompanyResponse");
-  }
-  /**
-   * Lists companies. (companies.listCompanies)
-   *
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param string requestMetadata.partnersSessionId Google Partners session
-   * ID.
-   * @opt_param string companyName Company name to search for.
-   * @opt_param string pageToken A token identifying a page of results that the
-   * server returns. Typically, this is the value of
-   * `ListCompaniesResponse.next_page_token` returned from the previous call to
-   * ListCompanies.
-   * @opt_param string industries List of industries the company can help with.
-   * @opt_param string websiteUrl Website URL that will help to find a better
-   * matched company. .
-   * @opt_param string gpsMotivations List of reasons for using Google Partner
-   * Search to get companies.
-   * @opt_param string languageCodes List of language codes that company can
-   * support. Only primary language subtags are accepted as defined by BCP 47
-   * (IETF BCP 47, "Tags for Identifying Languages").
-   * @opt_param int pageSize Requested page size. Server may return fewer
-   * companies than requested. If unspecified, server picks an appropriate
-   * default.
-   * @opt_param string requestMetadata.userOverrides.ipAddress IP address to use
-   * instead of the user's geo-located IP address.
-   * @opt_param string requestMetadata.experimentIds Experiment IDs the current
-   * request belongs to.
-   * @opt_param string orderBy How to order addresses within the returned
-   * companies. Currently, only `address` and `address desc` is supported which
-   * will sorted by closest to farthest in distance from given address and
-   * farthest to closest distance from given address respectively.
-   * @opt_param string specializations List of specializations that the returned
-   * agencies should provide. If this is not empty, any returned agency must have
-   * at least one of these specializations, or one of the services in the
-   * "services" field.
-   * @opt_param string maxMonthlyBudget.currencyCode The 3-letter currency code
-   * defined in ISO 4217.
-   * @opt_param string requestMetadata.userOverrides.userId Logged-in user ID to
-   * impersonate instead of the user's ID.
-   * @opt_param string minMonthlyBudget.currencyCode The 3-letter currency code
-   * defined in ISO 4217.
-   * @opt_param string view The view of the `Company` resource to be returned.
-   * This must not be `COMPANY_VIEW_UNSPECIFIED`.
-   * @opt_param string address The address to use when searching for companies. If
-   * not given, the geo-located address of the request is used.
-   * @opt_param string requestMetadata.locale Locale to use for the current
-   * request.
-   * @opt_param string minMonthlyBudget.units The whole units of the amount. For
-   * example if `currencyCode` is `"USD"`, then 1 unit is one US dollar.
-   * @opt_param int maxMonthlyBudget.nanos Number of nano (10^-9) units of the
-   * amount. The value must be between -999,999,999 and +999,999,999 inclusive. If
-   * `units` is positive, `nanos` must be positive or zero. If `units` is zero,
-   * `nanos` can be positive, zero, or negative. If `units` is negative, `nanos`
-   * must be negative or zero. For example $-1.75 is represented as `units`=-1 and
-   * `nanos`=-750,000,000.
-   * @opt_param string services List of services that the returned agencies should
-   * provide. If this is not empty, any returned agency must have at least one of
-   * these services, or one of the specializations in the "specializations" field.
-   * @opt_param string maxMonthlyBudget.units The whole units of the amount. For
-   * example if `currencyCode` is `"USD"`, then 1 unit is one US dollar.
-   * @opt_param string requestMetadata.trafficSource.trafficSourceId Identifier to
-   * indicate where the traffic comes from. An identifier has multiple letters
-   * created by a team which redirected the traffic to us.
-   * @opt_param int minMonthlyBudget.nanos Number of nano (10^-9) units of the
-   * amount. The value must be between -999,999,999 and +999,999,999 inclusive. If
-   * `units` is positive, `nanos` must be positive or zero. If `units` is zero,
-   * `nanos` can be positive, zero, or negative. If `units` is negative, `nanos`
-   * must be negative or zero. For example $-1.75 is represented as `units`=-1 and
-   * `nanos`=-750,000,000.
-   * @opt_param string requestMetadata.trafficSource.trafficSubId Second level
-   * identifier to indicate where the traffic comes from. An identifier has
-   * multiple letters created by a team which redirected the traffic to us.
-   * @return Google_Service_Partners_ListCompaniesResponse
-   */
-  public function listCompanies($optParams = array())
-  {
-    $params = array();
-    $params = array_merge($params, $optParams);
-    return $this->call('list', array($params), "Google_Service_Partners_ListCompaniesResponse");
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Partners/Resource/CompaniesLeads.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Partners/Resource/CompaniesLeads.php
deleted file mode 100644
index 50a36c22..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Partners/Resource/CompaniesLeads.php
+++ /dev/null
@@ -1,42 +0,0 @@
-
- *   $partnersService = new Google_Service_Partners(...);
- *   $leads = $partnersService->leads;
- *  
- */
-class Google_Service_Partners_Resource_CompaniesLeads extends Google_Service_Resource
-{
-  /**
-   * Creates an advertiser lead for the given company ID. (leads.create)
-   *
-   * @param string $companyId The ID of the company to contact.
-   * @param Google_Service_Partners_CreateLeadRequest $postBody
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Partners_CreateLeadResponse
-   */
-  public function create($companyId, Google_Service_Partners_CreateLeadRequest $postBody, $optParams = array())
-  {
-    $params = array('companyId' => $companyId, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('create', array($params), "Google_Service_Partners_CreateLeadResponse");
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Partners/Resource/Exams.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Partners/Resource/Exams.php
deleted file mode 100644
index 13536183..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Partners/Resource/Exams.php
+++ /dev/null
@@ -1,59 +0,0 @@
-
- *   $partnersService = new Google_Service_Partners(...);
- *   $exams = $partnersService->exams;
- *  
- */
-class Google_Service_Partners_Resource_Exams extends Google_Service_Resource
-{
-  /**
-   * Gets an Exam Token for a Partner's user to take an exam in the Exams System
-   * (exams.getToken)
-   *
-   * @param string $examType The exam type we are requesting a token for.
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param string requestMetadata.userOverrides.ipAddress IP address to use
-   * instead of the user's geo-located IP address.
-   * @opt_param string requestMetadata.experimentIds Experiment IDs the current
-   * request belongs to.
-   * @opt_param string requestMetadata.trafficSource.trafficSubId Second level
-   * identifier to indicate where the traffic comes from. An identifier has
-   * multiple letters created by a team which redirected the traffic to us.
-   * @opt_param string requestMetadata.userOverrides.userId Logged-in user ID to
-   * impersonate instead of the user's ID.
-   * @opt_param string requestMetadata.partnersSessionId Google Partners session
-   * ID.
-   * @opt_param string requestMetadata.trafficSource.trafficSourceId Identifier to
-   * indicate where the traffic comes from. An identifier has multiple letters
-   * created by a team which redirected the traffic to us.
-   * @opt_param string requestMetadata.locale Locale to use for the current
-   * request.
-   * @return Google_Service_Partners_ExamToken
-   */
-  public function getToken($examType, $optParams = array())
-  {
-    $params = array('examType' => $examType);
-    $params = array_merge($params, $optParams);
-    return $this->call('getToken', array($params), "Google_Service_Partners_ExamToken");
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Partners/Resource/Leads.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Partners/Resource/Leads.php
deleted file mode 100644
index 1ad2cf6a..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Partners/Resource/Leads.php
+++ /dev/null
@@ -1,66 +0,0 @@
-
- *   $partnersService = new Google_Service_Partners(...);
- *   $leads = $partnersService->leads;
- *  
- */
-class Google_Service_Partners_Resource_Leads extends Google_Service_Resource
-{
-  /**
-   * Lists advertiser leads for a user's associated company. Should only be called
-   * within the context of an authorized logged in user. (leads.listLeads)
-   *
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param string pageToken A token identifying a page of results that the
-   * server returns. Typically, this is the value of
-   * `ListLeadsResponse.next_page_token` returned from the previous call to
-   * ListLeads.
-   * @opt_param int pageSize Requested page size. Server may return fewer leads
-   * than requested. If unspecified, server picks an appropriate default.
-   * @opt_param string requestMetadata.trafficSource.trafficSourceId Identifier to
-   * indicate where the traffic comes from. An identifier has multiple letters
-   * created by a team which redirected the traffic to us.
-   * @opt_param string requestMetadata.locale Locale to use for the current
-   * request.
-   * @opt_param string requestMetadata.userOverrides.ipAddress IP address to use
-   * instead of the user's geo-located IP address.
-   * @opt_param string requestMetadata.experimentIds Experiment IDs the current
-   * request belongs to.
-   * @opt_param string requestMetadata.trafficSource.trafficSubId Second level
-   * identifier to indicate where the traffic comes from. An identifier has
-   * multiple letters created by a team which redirected the traffic to us.
-   * @opt_param string orderBy How to order Leads. Currently, only `create_time`
-   * and `create_time desc` are supported
-   * @opt_param string requestMetadata.partnersSessionId Google Partners session
-   * ID.
-   * @opt_param string requestMetadata.userOverrides.userId Logged-in user ID to
-   * impersonate instead of the user's ID.
-   * @return Google_Service_Partners_ListLeadsResponse
-   */
-  public function listLeads($optParams = array())
-  {
-    $params = array();
-    $params = array_merge($params, $optParams);
-    return $this->call('list', array($params), "Google_Service_Partners_ListLeadsResponse");
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Partners/Resource/Offers.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Partners/Resource/Offers.php
deleted file mode 100644
index cc2622c7..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Partners/Resource/Offers.php
+++ /dev/null
@@ -1,57 +0,0 @@
-
- *   $partnersService = new Google_Service_Partners(...);
- *   $offers = $partnersService->offers;
- *  
- */
-class Google_Service_Partners_Resource_Offers extends Google_Service_Resource
-{
-  /**
-   * Lists the Offers available for the current user (offers.listOffers)
-   *
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param string requestMetadata.userOverrides.ipAddress IP address to use
-   * instead of the user's geo-located IP address.
-   * @opt_param string requestMetadata.experimentIds Experiment IDs the current
-   * request belongs to.
-   * @opt_param string requestMetadata.trafficSource.trafficSubId Second level
-   * identifier to indicate where the traffic comes from. An identifier has
-   * multiple letters created by a team which redirected the traffic to us.
-   * @opt_param string requestMetadata.userOverrides.userId Logged-in user ID to
-   * impersonate instead of the user's ID.
-   * @opt_param string requestMetadata.partnersSessionId Google Partners session
-   * ID.
-   * @opt_param string requestMetadata.trafficSource.trafficSourceId Identifier to
-   * indicate where the traffic comes from. An identifier has multiple letters
-   * created by a team which redirected the traffic to us.
-   * @opt_param string requestMetadata.locale Locale to use for the current
-   * request.
-   * @return Google_Service_Partners_ListOffersResponse
-   */
-  public function listOffers($optParams = array())
-  {
-    $params = array();
-    $params = array_merge($params, $optParams);
-    return $this->call('list', array($params), "Google_Service_Partners_ListOffersResponse");
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Partners/Resource/OffersHistory.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Partners/Resource/OffersHistory.php
deleted file mode 100644
index 5cd7a8f4..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Partners/Resource/OffersHistory.php
+++ /dev/null
@@ -1,66 +0,0 @@
-
- *   $partnersService = new Google_Service_Partners(...);
- *   $history = $partnersService->history;
- *  
- */
-class Google_Service_Partners_Resource_OffersHistory extends Google_Service_Resource
-{
-  /**
-   * Lists the Historical Offers for the current user (or user's entire company)
-   * (history.listOffersHistory)
-   *
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param string pageToken Token to retrieve a specific page.
-   * @opt_param int pageSize Maximum number of rows to return per page.
-   * @opt_param string requestMetadata.trafficSource.trafficSourceId Identifier to
-   * indicate where the traffic comes from. An identifier has multiple letters
-   * created by a team which redirected the traffic to us.
-   * @opt_param string requestMetadata.locale Locale to use for the current
-   * request.
-   * @opt_param string requestMetadata.userOverrides.ipAddress IP address to use
-   * instead of the user's geo-located IP address.
-   * @opt_param string requestMetadata.experimentIds Experiment IDs the current
-   * request belongs to.
-   * @opt_param bool entireCompany if true, show history for the entire company.
-   * Requires user to be admin.
-   * @opt_param string orderBy Comma-separated list of fields to order by, e.g.:
-   * "foo,bar,baz". Use "foo desc" to sort descending. List of valid field names
-   * is: name, offer_code, expiration_time, status,     last_modified_time,
-   * sender_name, creation_time, country_code,     offer_type.
-   * @opt_param string requestMetadata.trafficSource.trafficSubId Second level
-   * identifier to indicate where the traffic comes from. An identifier has
-   * multiple letters created by a team which redirected the traffic to us.
-   * @opt_param string requestMetadata.userOverrides.userId Logged-in user ID to
-   * impersonate instead of the user's ID.
-   * @opt_param string requestMetadata.partnersSessionId Google Partners session
-   * ID.
-   * @return Google_Service_Partners_ListOffersHistoryResponse
-   */
-  public function listOffersHistory($optParams = array())
-  {
-    $params = array();
-    $params = array_merge($params, $optParams);
-    return $this->call('list', array($params), "Google_Service_Partners_ListOffersHistoryResponse");
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Partners/Resource/UserEvents.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Partners/Resource/UserEvents.php
deleted file mode 100644
index 552082ba..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Partners/Resource/UserEvents.php
+++ /dev/null
@@ -1,41 +0,0 @@
-
- *   $partnersService = new Google_Service_Partners(...);
- *   $userEvents = $partnersService->userEvents;
- *  
- */
-class Google_Service_Partners_Resource_UserEvents extends Google_Service_Resource
-{
-  /**
-   * Logs a user event. (userEvents.log)
-   *
-   * @param Google_Service_Partners_LogUserEventRequest $postBody
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Partners_LogUserEventResponse
-   */
-  public function log(Google_Service_Partners_LogUserEventRequest $postBody, $optParams = array())
-  {
-    $params = array('postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('log', array($params), "Google_Service_Partners_LogUserEventResponse");
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Partners/Resource/UserStates.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Partners/Resource/UserStates.php
deleted file mode 100644
index 6b1c2cf0..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Partners/Resource/UserStates.php
+++ /dev/null
@@ -1,57 +0,0 @@
-
- *   $partnersService = new Google_Service_Partners(...);
- *   $userStates = $partnersService->userStates;
- *  
- */
-class Google_Service_Partners_Resource_UserStates extends Google_Service_Resource
-{
-  /**
-   * Lists states for current user. (userStates.listUserStates)
-   *
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param string requestMetadata.userOverrides.userId Logged-in user ID to
-   * impersonate instead of the user's ID.
-   * @opt_param string requestMetadata.partnersSessionId Google Partners session
-   * ID.
-   * @opt_param string requestMetadata.trafficSource.trafficSourceId Identifier to
-   * indicate where the traffic comes from. An identifier has multiple letters
-   * created by a team which redirected the traffic to us.
-   * @opt_param string requestMetadata.locale Locale to use for the current
-   * request.
-   * @opt_param string requestMetadata.userOverrides.ipAddress IP address to use
-   * instead of the user's geo-located IP address.
-   * @opt_param string requestMetadata.experimentIds Experiment IDs the current
-   * request belongs to.
-   * @opt_param string requestMetadata.trafficSource.trafficSubId Second level
-   * identifier to indicate where the traffic comes from. An identifier has
-   * multiple letters created by a team which redirected the traffic to us.
-   * @return Google_Service_Partners_ListUserStatesResponse
-   */
-  public function listUserStates($optParams = array())
-  {
-    $params = array();
-    $params = array_merge($params, $optParams);
-    return $this->call('list', array($params), "Google_Service_Partners_ListUserStatesResponse");
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Partners/Resource/Users.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Partners/Resource/Users.php
deleted file mode 100644
index 11cd10e6..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Partners/Resource/Users.php
+++ /dev/null
@@ -1,157 +0,0 @@
-
- *   $partnersService = new Google_Service_Partners(...);
- *   $users = $partnersService->users;
- *  
- */
-class Google_Service_Partners_Resource_Users extends Google_Service_Resource
-{
-  /**
-   * Creates a user's company relation. Affiliates the user to a company.
-   * (users.createCompanyRelation)
-   *
-   * @param string $userId The ID of the user. Can be set to me to mean the
-   * currently authenticated user.
-   * @param Google_Service_Partners_CompanyRelation $postBody
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param string requestMetadata.userOverrides.userId Logged-in user ID to
-   * impersonate instead of the user's ID.
-   * @opt_param string requestMetadata.partnersSessionId Google Partners session
-   * ID.
-   * @opt_param string requestMetadata.trafficSource.trafficSourceId Identifier to
-   * indicate where the traffic comes from. An identifier has multiple letters
-   * created by a team which redirected the traffic to us.
-   * @opt_param string requestMetadata.locale Locale to use for the current
-   * request.
-   * @opt_param string requestMetadata.userOverrides.ipAddress IP address to use
-   * instead of the user's geo-located IP address.
-   * @opt_param string requestMetadata.experimentIds Experiment IDs the current
-   * request belongs to.
-   * @opt_param string requestMetadata.trafficSource.trafficSubId Second level
-   * identifier to indicate where the traffic comes from. An identifier has
-   * multiple letters created by a team which redirected the traffic to us.
-   * @return Google_Service_Partners_CompanyRelation
-   */
-  public function createCompanyRelation($userId, Google_Service_Partners_CompanyRelation $postBody, $optParams = array())
-  {
-    $params = array('userId' => $userId, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('createCompanyRelation', array($params), "Google_Service_Partners_CompanyRelation");
-  }
-  /**
-   * Deletes a user's company relation. Unaffiliaites the user from a company.
-   * (users.deleteCompanyRelation)
-   *
-   * @param string $userId The ID of the user. Can be set to me to mean the
-   * currently authenticated user.
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param string requestMetadata.trafficSource.trafficSubId Second level
-   * identifier to indicate where the traffic comes from. An identifier has
-   * multiple letters created by a team which redirected the traffic to us.
-   * @opt_param string requestMetadata.userOverrides.userId Logged-in user ID to
-   * impersonate instead of the user's ID.
-   * @opt_param string requestMetadata.partnersSessionId Google Partners session
-   * ID.
-   * @opt_param string requestMetadata.trafficSource.trafficSourceId Identifier to
-   * indicate where the traffic comes from. An identifier has multiple letters
-   * created by a team which redirected the traffic to us.
-   * @opt_param string requestMetadata.locale Locale to use for the current
-   * request.
-   * @opt_param string requestMetadata.userOverrides.ipAddress IP address to use
-   * instead of the user's geo-located IP address.
-   * @opt_param string requestMetadata.experimentIds Experiment IDs the current
-   * request belongs to.
-   * @return Google_Service_Partners_PartnersEmpty
-   */
-  public function deleteCompanyRelation($userId, $optParams = array())
-  {
-    $params = array('userId' => $userId);
-    $params = array_merge($params, $optParams);
-    return $this->call('deleteCompanyRelation', array($params), "Google_Service_Partners_PartnersEmpty");
-  }
-  /**
-   * Gets a user. (users.get)
-   *
-   * @param string $userId Identifier of the user. Can be set to me to mean the
-   * currently authenticated user.
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param string userView Specifies what parts of the user information to
-   * return.
-   * @opt_param string requestMetadata.trafficSource.trafficSourceId Identifier to
-   * indicate where the traffic comes from. An identifier has multiple letters
-   * created by a team which redirected the traffic to us.
-   * @opt_param string requestMetadata.locale Locale to use for the current
-   * request.
-   * @opt_param string requestMetadata.userOverrides.ipAddress IP address to use
-   * instead of the user's geo-located IP address.
-   * @opt_param string requestMetadata.experimentIds Experiment IDs the current
-   * request belongs to.
-   * @opt_param string requestMetadata.trafficSource.trafficSubId Second level
-   * identifier to indicate where the traffic comes from. An identifier has
-   * multiple letters created by a team which redirected the traffic to us.
-   * @opt_param string requestMetadata.partnersSessionId Google Partners session
-   * ID.
-   * @opt_param string requestMetadata.userOverrides.userId Logged-in user ID to
-   * impersonate instead of the user's ID.
-   * @return Google_Service_Partners_User
-   */
-  public function get($userId, $optParams = array())
-  {
-    $params = array('userId' => $userId);
-    $params = array_merge($params, $optParams);
-    return $this->call('get', array($params), "Google_Service_Partners_User");
-  }
-  /**
-   * Updates a user's profile. A user can only update their own profile and should
-   * only be called within the context of a logged in user. (users.updateProfile)
-   *
-   * @param Google_Service_Partners_UserProfile $postBody
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param string requestMetadata.userOverrides.ipAddress IP address to use
-   * instead of the user's geo-located IP address.
-   * @opt_param string requestMetadata.experimentIds Experiment IDs the current
-   * request belongs to.
-   * @opt_param string requestMetadata.trafficSource.trafficSubId Second level
-   * identifier to indicate where the traffic comes from. An identifier has
-   * multiple letters created by a team which redirected the traffic to us.
-   * @opt_param string requestMetadata.partnersSessionId Google Partners session
-   * ID.
-   * @opt_param string requestMetadata.userOverrides.userId Logged-in user ID to
-   * impersonate instead of the user's ID.
-   * @opt_param string requestMetadata.trafficSource.trafficSourceId Identifier to
-   * indicate where the traffic comes from. An identifier has multiple letters
-   * created by a team which redirected the traffic to us.
-   * @opt_param string requestMetadata.locale Locale to use for the current
-   * request.
-   * @return Google_Service_Partners_UserProfile
-   */
-  public function updateProfile(Google_Service_Partners_UserProfile $postBody, $optParams = array())
-  {
-    $params = array('postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('updateProfile', array($params), "Google_Service_Partners_UserProfile");
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Partners/Resource/V2.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Partners/Resource/V2.php
deleted file mode 100644
index 27d02f80..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Partners/Resource/V2.php
+++ /dev/null
@@ -1,124 +0,0 @@
-
- *   $partnersService = new Google_Service_Partners(...);
- *   $v2 = $partnersService->v2;
- *  
- */
-class Google_Service_Partners_Resource_V2 extends Google_Service_Resource
-{
-  /**
-   * Gets Partners Status of the logged in user's agency. Should only be called if
-   * the logged in user is the admin of the agency. (v2.getPartnersstatus)
-   *
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param string requestMetadata.trafficSource.trafficSubId Second level
-   * identifier to indicate where the traffic comes from. An identifier has
-   * multiple letters created by a team which redirected the traffic to us.
-   * @opt_param string requestMetadata.partnersSessionId Google Partners session
-   * ID.
-   * @opt_param string requestMetadata.userOverrides.userId Logged-in user ID to
-   * impersonate instead of the user's ID.
-   * @opt_param string requestMetadata.trafficSource.trafficSourceId Identifier to
-   * indicate where the traffic comes from. An identifier has multiple letters
-   * created by a team which redirected the traffic to us.
-   * @opt_param string requestMetadata.locale Locale to use for the current
-   * request.
-   * @opt_param string requestMetadata.userOverrides.ipAddress IP address to use
-   * instead of the user's geo-located IP address.
-   * @opt_param string requestMetadata.experimentIds Experiment IDs the current
-   * request belongs to.
-   * @return Google_Service_Partners_GetPartnersStatusResponse
-   */
-  public function getPartnersstatus($optParams = array())
-  {
-    $params = array();
-    $params = array_merge($params, $optParams);
-    return $this->call('getPartnersstatus', array($params), "Google_Service_Partners_GetPartnersStatusResponse");
-  }
-  /**
-   * Update company. Should only be called within the context of an authorized
-   * logged in user. (v2.updateCompanies)
-   *
-   * @param Google_Service_Partners_Company $postBody
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param string requestMetadata.userOverrides.ipAddress IP address to use
-   * instead of the user's geo-located IP address.
-   * @opt_param string updateMask Standard field mask for the set of fields to be
-   * updated. Required with at least 1 value in FieldMask's paths.
-   * @opt_param string requestMetadata.experimentIds Experiment IDs the current
-   * request belongs to.
-   * @opt_param string requestMetadata.trafficSource.trafficSubId Second level
-   * identifier to indicate where the traffic comes from. An identifier has
-   * multiple letters created by a team which redirected the traffic to us.
-   * @opt_param string requestMetadata.partnersSessionId Google Partners session
-   * ID.
-   * @opt_param string requestMetadata.userOverrides.userId Logged-in user ID to
-   * impersonate instead of the user's ID.
-   * @opt_param string requestMetadata.trafficSource.trafficSourceId Identifier to
-   * indicate where the traffic comes from. An identifier has multiple letters
-   * created by a team which redirected the traffic to us.
-   * @opt_param string requestMetadata.locale Locale to use for the current
-   * request.
-   * @return Google_Service_Partners_Company
-   */
-  public function updateCompanies(Google_Service_Partners_Company $postBody, $optParams = array())
-  {
-    $params = array('postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('updateCompanies', array($params), "Google_Service_Partners_Company");
-  }
-  /**
-   * Updates the specified lead. (v2.updateLeads)
-   *
-   * @param Google_Service_Partners_Lead $postBody
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param string requestMetadata.trafficSource.trafficSourceId Identifier to
-   * indicate where the traffic comes from. An identifier has multiple letters
-   * created by a team which redirected the traffic to us.
-   * @opt_param string requestMetadata.locale Locale to use for the current
-   * request.
-   * @opt_param string requestMetadata.userOverrides.ipAddress IP address to use
-   * instead of the user's geo-located IP address.
-   * @opt_param string updateMask Standard field mask for the set of fields to be
-   * updated. Required with at least 1 value in FieldMask's paths. Only `state`
-   * and `adwords_customer_id` are currently supported.
-   * @opt_param string requestMetadata.experimentIds Experiment IDs the current
-   * request belongs to.
-   * @opt_param string requestMetadata.trafficSource.trafficSubId Second level
-   * identifier to indicate where the traffic comes from. An identifier has
-   * multiple letters created by a team which redirected the traffic to us.
-   * @opt_param string requestMetadata.partnersSessionId Google Partners session
-   * ID.
-   * @opt_param string requestMetadata.userOverrides.userId Logged-in user ID to
-   * impersonate instead of the user's ID.
-   * @return Google_Service_Partners_Lead
-   */
-  public function updateLeads(Google_Service_Partners_Lead $postBody, $optParams = array())
-  {
-    $params = array('postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('updateLeads', array($params), "Google_Service_Partners_Lead");
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Partners/ResponseMetadata.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Partners/ResponseMetadata.php
deleted file mode 100644
index bc4f72e5..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Partners/ResponseMetadata.php
+++ /dev/null
@@ -1,31 +0,0 @@
-debugInfo = $debugInfo;
-  }
-  public function getDebugInfo()
-  {
-    return $this->debugInfo;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Partners/SpecializationStatus.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Partners/SpecializationStatus.php
deleted file mode 100644
index 234b1ef6..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Partners/SpecializationStatus.php
+++ /dev/null
@@ -1,39 +0,0 @@
-badgeSpecialization = $badgeSpecialization;
-  }
-  public function getBadgeSpecialization()
-  {
-    return $this->badgeSpecialization;
-  }
-  public function setBadgeSpecializationState($badgeSpecializationState)
-  {
-    $this->badgeSpecializationState = $badgeSpecializationState;
-  }
-  public function getBadgeSpecializationState()
-  {
-    return $this->badgeSpecializationState;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Partners/TrafficSource.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Partners/TrafficSource.php
deleted file mode 100644
index 14e34a59..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Partners/TrafficSource.php
+++ /dev/null
@@ -1,39 +0,0 @@
-trafficSourceId = $trafficSourceId;
-  }
-  public function getTrafficSourceId()
-  {
-    return $this->trafficSourceId;
-  }
-  public function setTrafficSubId($trafficSubId)
-  {
-    $this->trafficSubId = $trafficSubId;
-  }
-  public function getTrafficSubId()
-  {
-    return $this->trafficSubId;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Partners/User.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Partners/User.php
deleted file mode 100644
index 83dabff5..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Partners/User.php
+++ /dev/null
@@ -1,118 +0,0 @@
-availableAdwordsManagerAccounts = $availableAdwordsManagerAccounts;
-  }
-  public function getAvailableAdwordsManagerAccounts()
-  {
-    return $this->availableAdwordsManagerAccounts;
-  }
-  public function setCertificationStatus($certificationStatus)
-  {
-    $this->certificationStatus = $certificationStatus;
-  }
-  public function getCertificationStatus()
-  {
-    return $this->certificationStatus;
-  }
-  public function setCompany(Google_Service_Partners_CompanyRelation $company)
-  {
-    $this->company = $company;
-  }
-  public function getCompany()
-  {
-    return $this->company;
-  }
-  public function setCompanyVerificationEmail($companyVerificationEmail)
-  {
-    $this->companyVerificationEmail = $companyVerificationEmail;
-  }
-  public function getCompanyVerificationEmail()
-  {
-    return $this->companyVerificationEmail;
-  }
-  public function setExamStatus($examStatus)
-  {
-    $this->examStatus = $examStatus;
-  }
-  public function getExamStatus()
-  {
-    return $this->examStatus;
-  }
-  public function setId($id)
-  {
-    $this->id = $id;
-  }
-  public function getId()
-  {
-    return $this->id;
-  }
-  public function setLastAccessTime($lastAccessTime)
-  {
-    $this->lastAccessTime = $lastAccessTime;
-  }
-  public function getLastAccessTime()
-  {
-    return $this->lastAccessTime;
-  }
-  public function setPrimaryEmails($primaryEmails)
-  {
-    $this->primaryEmails = $primaryEmails;
-  }
-  public function getPrimaryEmails()
-  {
-    return $this->primaryEmails;
-  }
-  public function setProfile(Google_Service_Partners_UserProfile $profile)
-  {
-    $this->profile = $profile;
-  }
-  public function getProfile()
-  {
-    return $this->profile;
-  }
-  public function setPublicProfile(Google_Service_Partners_PublicProfile $publicProfile)
-  {
-    $this->publicProfile = $publicProfile;
-  }
-  public function getPublicProfile()
-  {
-    return $this->publicProfile;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Partners/UserOverrides.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Partners/UserOverrides.php
deleted file mode 100644
index 12c9e9e2..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Partners/UserOverrides.php
+++ /dev/null
@@ -1,39 +0,0 @@
-ipAddress = $ipAddress;
-  }
-  public function getIpAddress()
-  {
-    return $this->ipAddress;
-  }
-  public function setUserId($userId)
-  {
-    $this->userId = $userId;
-  }
-  public function getUserId()
-  {
-    return $this->userId;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Partners/UserProfile.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Partners/UserProfile.php
deleted file mode 100644
index bd23cb25..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Partners/UserProfile.php
+++ /dev/null
@@ -1,150 +0,0 @@
-address = $address;
-  }
-  public function getAddress()
-  {
-    return $this->address;
-  }
-  public function setAdwordsManagerAccount($adwordsManagerAccount)
-  {
-    $this->adwordsManagerAccount = $adwordsManagerAccount;
-  }
-  public function getAdwordsManagerAccount()
-  {
-    return $this->adwordsManagerAccount;
-  }
-  public function setChannels($channels)
-  {
-    $this->channels = $channels;
-  }
-  public function getChannels()
-  {
-    return $this->channels;
-  }
-  public function setEmailAddress($emailAddress)
-  {
-    $this->emailAddress = $emailAddress;
-  }
-  public function getEmailAddress()
-  {
-    return $this->emailAddress;
-  }
-  public function setEmailOptIns(Google_Service_Partners_OptIns $emailOptIns)
-  {
-    $this->emailOptIns = $emailOptIns;
-  }
-  public function getEmailOptIns()
-  {
-    return $this->emailOptIns;
-  }
-  public function setFamilyName($familyName)
-  {
-    $this->familyName = $familyName;
-  }
-  public function getFamilyName()
-  {
-    return $this->familyName;
-  }
-  public function setGivenName($givenName)
-  {
-    $this->givenName = $givenName;
-  }
-  public function getGivenName()
-  {
-    return $this->givenName;
-  }
-  public function setIndustries($industries)
-  {
-    $this->industries = $industries;
-  }
-  public function getIndustries()
-  {
-    return $this->industries;
-  }
-  public function setJobFunctions($jobFunctions)
-  {
-    $this->jobFunctions = $jobFunctions;
-  }
-  public function getJobFunctions()
-  {
-    return $this->jobFunctions;
-  }
-  public function setLanguages($languages)
-  {
-    $this->languages = $languages;
-  }
-  public function getLanguages()
-  {
-    return $this->languages;
-  }
-  public function setMarkets($markets)
-  {
-    $this->markets = $markets;
-  }
-  public function getMarkets()
-  {
-    return $this->markets;
-  }
-  public function setPhoneNumber($phoneNumber)
-  {
-    $this->phoneNumber = $phoneNumber;
-  }
-  public function getPhoneNumber()
-  {
-    return $this->phoneNumber;
-  }
-  public function setPrimaryCountryCode($primaryCountryCode)
-  {
-    $this->primaryCountryCode = $primaryCountryCode;
-  }
-  public function getPrimaryCountryCode()
-  {
-    return $this->primaryCountryCode;
-  }
-  public function setProfilePublic($profilePublic)
-  {
-    $this->profilePublic = $profilePublic;
-  }
-  public function getProfilePublic()
-  {
-    return $this->profilePublic;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/People.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/People.php
deleted file mode 100644
index 30c0f795..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/People.php
+++ /dev/null
@@ -1,160 +0,0 @@
-
- * Provides access to information about profiles and contacts.

- *
- * 

- * For more information about this service, see the API
- * Documentation
- * 

- *
- * @author Google, Inc.
- */
-class Google_Service_People extends Google_Service
-{
-  /** Manage your contacts. */
-  const CONTACTS =
-      "https://www.googleapis.com/auth/contacts";
-  /** View your contacts. */
-  const CONTACTS_READONLY =
-      "https://www.googleapis.com/auth/contacts.readonly";
-  /** Know the list of people in your circles, your age range, and language. */
-  const PLUS_LOGIN =
-      "https://www.googleapis.com/auth/plus.login";
-  /** View your street addresses. */
-  const USER_ADDRESSES_READ =
-      "https://www.googleapis.com/auth/user.addresses.read";
-  /** View your complete date of birth. */
-  const USER_BIRTHDAY_READ =
-      "https://www.googleapis.com/auth/user.birthday.read";
-  /** View your email addresses. */
-  const USER_EMAILS_READ =
-      "https://www.googleapis.com/auth/user.emails.read";
-  /** View your phone numbers. */
-  const USER_PHONENUMBERS_READ =
-      "https://www.googleapis.com/auth/user.phonenumbers.read";
-  /** View your email address. */
-  const USERINFO_EMAIL =
-      "https://www.googleapis.com/auth/userinfo.email";
-  /** View your basic profile info. */
-  const USERINFO_PROFILE =
-      "https://www.googleapis.com/auth/userinfo.profile";
-
-  public $people;
-  public $people_connections;
-  
-  /**
-   * Constructs the internal representation of the People service.
-   *
-   * @param Google_Client $client
-   */
-  public function __construct(Google_Client $client)
-  {
-    parent::__construct($client);
-    $this->rootUrl = 'https://people.googleapis.com/';
-    $this->servicePath = '';
-    $this->version = 'v1';
-    $this->serviceName = 'people';
-
-    $this->people = new Google_Service_People_Resource_People(
-        $this,
-        $this->serviceName,
-        'people',
-        array(
-          'methods' => array(
-            'get' => array(
-              'path' => 'v1/{+resourceName}',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'resourceName' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'requestMask.includeField' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-              ),
-            ),'getBatchGet' => array(
-              'path' => 'v1/people:batchGet',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'requestMask.includeField' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'resourceNames' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                  'repeated' => true,
-                ),
-              ),
-            ),
-          )
-        )
-    );
-    $this->people_connections = new Google_Service_People_Resource_PeopleConnections(
-        $this,
-        $this->serviceName,
-        'connections',
-        array(
-          'methods' => array(
-            'list' => array(
-              'path' => 'v1/{+resourceName}/connections',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'resourceName' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'requestSyncToken' => array(
-                  'location' => 'query',
-                  'type' => 'boolean',
-                ),
-                'pageToken' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'requestMask.includeField' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'pageSize' => array(
-                  'location' => 'query',
-                  'type' => 'integer',
-                ),
-                'syncToken' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'sortOrder' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-              ),
-            ),
-          )
-        )
-    );
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/People/Address.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/People/Address.php
deleted file mode 100644
index 2c0569df..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/People/Address.php
+++ /dev/null
@@ -1,130 +0,0 @@
-city = $city;
-  }
-  public function getCity()
-  {
-    return $this->city;
-  }
-  public function setCountry($country)
-  {
-    $this->country = $country;
-  }
-  public function getCountry()
-  {
-    return $this->country;
-  }
-  public function setCountryCode($countryCode)
-  {
-    $this->countryCode = $countryCode;
-  }
-  public function getCountryCode()
-  {
-    return $this->countryCode;
-  }
-  public function setExtendedAddress($extendedAddress)
-  {
-    $this->extendedAddress = $extendedAddress;
-  }
-  public function getExtendedAddress()
-  {
-    return $this->extendedAddress;
-  }
-  public function setFormattedType($formattedType)
-  {
-    $this->formattedType = $formattedType;
-  }
-  public function getFormattedType()
-  {
-    return $this->formattedType;
-  }
-  public function setFormattedValue($formattedValue)
-  {
-    $this->formattedValue = $formattedValue;
-  }
-  public function getFormattedValue()
-  {
-    return $this->formattedValue;
-  }
-  public function setMetadata(Google_Service_People_FieldMetadata $metadata)
-  {
-    $this->metadata = $metadata;
-  }
-  public function getMetadata()
-  {
-    return $this->metadata;
-  }
-  public function setPoBox($poBox)
-  {
-    $this->poBox = $poBox;
-  }
-  public function getPoBox()
-  {
-    return $this->poBox;
-  }
-  public function setPostalCode($postalCode)
-  {
-    $this->postalCode = $postalCode;
-  }
-  public function getPostalCode()
-  {
-    return $this->postalCode;
-  }
-  public function setRegion($region)
-  {
-    $this->region = $region;
-  }
-  public function getRegion()
-  {
-    return $this->region;
-  }
-  public function setStreetAddress($streetAddress)
-  {
-    $this->streetAddress = $streetAddress;
-  }
-  public function getStreetAddress()
-  {
-    return $this->streetAddress;
-  }
-  public function setType($type)
-  {
-    $this->type = $type;
-  }
-  public function getType()
-  {
-    return $this->type;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/People/AgeRangeType.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/People/AgeRangeType.php
deleted file mode 100644
index 96ed2b8b..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/People/AgeRangeType.php
+++ /dev/null
@@ -1,40 +0,0 @@
-ageRange = $ageRange;
-  }
-  public function getAgeRange()
-  {
-    return $this->ageRange;
-  }
-  public function setMetadata(Google_Service_People_FieldMetadata $metadata)
-  {
-    $this->metadata = $metadata;
-  }
-  public function getMetadata()
-  {
-    return $this->metadata;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/People/Biography.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/People/Biography.php
deleted file mode 100644
index 5b1676a7..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/People/Biography.php
+++ /dev/null
@@ -1,49 +0,0 @@
-contentType = $contentType;
-  }
-  public function getContentType()
-  {
-    return $this->contentType;
-  }
-  public function setMetadata(Google_Service_People_FieldMetadata $metadata)
-  {
-    $this->metadata = $metadata;
-  }
-  public function getMetadata()
-  {
-    return $this->metadata;
-  }
-  public function setValue($value)
-  {
-    $this->value = $value;
-  }
-  public function getValue()
-  {
-    return $this->value;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/People/Birthday.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/People/Birthday.php
deleted file mode 100644
index f00a7b1b..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/People/Birthday.php
+++ /dev/null
@@ -1,50 +0,0 @@
-date = $date;
-  }
-  public function getDate()
-  {
-    return $this->date;
-  }
-  public function setMetadata(Google_Service_People_FieldMetadata $metadata)
-  {
-    $this->metadata = $metadata;
-  }
-  public function getMetadata()
-  {
-    return $this->metadata;
-  }
-  public function setText($text)
-  {
-    $this->text = $text;
-  }
-  public function getText()
-  {
-    return $this->text;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/People/BraggingRights.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/People/BraggingRights.php
deleted file mode 100644
index 45f4668f..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/People/BraggingRights.php
+++ /dev/null
@@ -1,40 +0,0 @@
-metadata = $metadata;
-  }
-  public function getMetadata()
-  {
-    return $this->metadata;
-  }
-  public function setValue($value)
-  {
-    $this->value = $value;
-  }
-  public function getValue()
-  {
-    return $this->value;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/People/ContactGroupMembership.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/People/ContactGroupMembership.php
deleted file mode 100644
index 79e27575..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/People/ContactGroupMembership.php
+++ /dev/null
@@ -1,30 +0,0 @@
-contactGroupId = $contactGroupId;
-  }
-  public function getContactGroupId()
-  {
-    return $this->contactGroupId;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/People/CoverPhoto.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/People/CoverPhoto.php
deleted file mode 100644
index b48da3ff..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/People/CoverPhoto.php
+++ /dev/null
@@ -1,49 +0,0 @@
-default = $default;
-  }
-  public function getDefault()
-  {
-    return $this->default;
-  }
-  public function setMetadata(Google_Service_People_FieldMetadata $metadata)
-  {
-    $this->metadata = $metadata;
-  }
-  public function getMetadata()
-  {
-    return $this->metadata;
-  }
-  public function setUrl($url)
-  {
-    $this->url = $url;
-  }
-  public function getUrl()
-  {
-    return $this->url;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/People/Date.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/People/Date.php
deleted file mode 100644
index 247bdf02..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/People/Date.php
+++ /dev/null
@@ -1,48 +0,0 @@
-day = $day;
-  }
-  public function getDay()
-  {
-    return $this->day;
-  }
-  public function setMonth($month)
-  {
-    $this->month = $month;
-  }
-  public function getMonth()
-  {
-    return $this->month;
-  }
-  public function setYear($year)
-  {
-    $this->year = $year;
-  }
-  public function getYear()
-  {
-    return $this->year;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/People/DomainMembership.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/People/DomainMembership.php
deleted file mode 100644
index 8956e35e..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/People/DomainMembership.php
+++ /dev/null
@@ -1,30 +0,0 @@
-inViewerDomain = $inViewerDomain;
-  }
-  public function getInViewerDomain()
-  {
-    return $this->inViewerDomain;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/People/EmailAddress.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/People/EmailAddress.php
deleted file mode 100644
index ea3bbe40..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/People/EmailAddress.php
+++ /dev/null
@@ -1,67 +0,0 @@
-displayName = $displayName;
-  }
-  public function getDisplayName()
-  {
-    return $this->displayName;
-  }
-  public function setFormattedType($formattedType)
-  {
-    $this->formattedType = $formattedType;
-  }
-  public function getFormattedType()
-  {
-    return $this->formattedType;
-  }
-  public function setMetadata(Google_Service_People_FieldMetadata $metadata)
-  {
-    $this->metadata = $metadata;
-  }
-  public function getMetadata()
-  {
-    return $this->metadata;
-  }
-  public function setType($type)
-  {
-    $this->type = $type;
-  }
-  public function getType()
-  {
-    return $this->type;
-  }
-  public function setValue($value)
-  {
-    $this->value = $value;
-  }
-  public function getValue()
-  {
-    return $this->value;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/People/Event.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/People/Event.php
deleted file mode 100644
index 2b6311bc..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/People/Event.php
+++ /dev/null
@@ -1,59 +0,0 @@
-date = $date;
-  }
-  public function getDate()
-  {
-    return $this->date;
-  }
-  public function setFormattedType($formattedType)
-  {
-    $this->formattedType = $formattedType;
-  }
-  public function getFormattedType()
-  {
-    return $this->formattedType;
-  }
-  public function setMetadata(Google_Service_People_FieldMetadata $metadata)
-  {
-    $this->metadata = $metadata;
-  }
-  public function getMetadata()
-  {
-    return $this->metadata;
-  }
-  public function setType($type)
-  {
-    $this->type = $type;
-  }
-  public function getType()
-  {
-    return $this->type;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/People/FieldMetadata.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/People/FieldMetadata.php
deleted file mode 100644
index 752c9f12..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/People/FieldMetadata.php
+++ /dev/null
@@ -1,49 +0,0 @@
-primary = $primary;
-  }
-  public function getPrimary()
-  {
-    return $this->primary;
-  }
-  public function setSource(Google_Service_People_Source $source)
-  {
-    $this->source = $source;
-  }
-  public function getSource()
-  {
-    return $this->source;
-  }
-  public function setVerified($verified)
-  {
-    $this->verified = $verified;
-  }
-  public function getVerified()
-  {
-    return $this->verified;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/People/Gender.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/People/Gender.php
deleted file mode 100644
index 6dc82630..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/People/Gender.php
+++ /dev/null
@@ -1,49 +0,0 @@
-formattedValue = $formattedValue;
-  }
-  public function getFormattedValue()
-  {
-    return $this->formattedValue;
-  }
-  public function setMetadata(Google_Service_People_FieldMetadata $metadata)
-  {
-    $this->metadata = $metadata;
-  }
-  public function getMetadata()
-  {
-    return $this->metadata;
-  }
-  public function setValue($value)
-  {
-    $this->value = $value;
-  }
-  public function getValue()
-  {
-    return $this->value;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/People/GetPeopleResponse.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/People/GetPeopleResponse.php
deleted file mode 100644
index 9c6a16fe..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/People/GetPeopleResponse.php
+++ /dev/null
@@ -1,32 +0,0 @@
-responses = $responses;
-  }
-  public function getResponses()
-  {
-    return $this->responses;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/People/ImClient.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/People/ImClient.php
deleted file mode 100644
index cad9a438..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/People/ImClient.php
+++ /dev/null
@@ -1,76 +0,0 @@
-formattedProtocol = $formattedProtocol;
-  }
-  public function getFormattedProtocol()
-  {
-    return $this->formattedProtocol;
-  }
-  public function setFormattedType($formattedType)
-  {
-    $this->formattedType = $formattedType;
-  }
-  public function getFormattedType()
-  {
-    return $this->formattedType;
-  }
-  public function setMetadata(Google_Service_People_FieldMetadata $metadata)
-  {
-    $this->metadata = $metadata;
-  }
-  public function getMetadata()
-  {
-    return $this->metadata;
-  }
-  public function setProtocol($protocol)
-  {
-    $this->protocol = $protocol;
-  }
-  public function getProtocol()
-  {
-    return $this->protocol;
-  }
-  public function setType($type)
-  {
-    $this->type = $type;
-  }
-  public function getType()
-  {
-    return $this->type;
-  }
-  public function setUsername($username)
-  {
-    $this->username = $username;
-  }
-  public function getUsername()
-  {
-    return $this->username;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/People/Interest.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/People/Interest.php
deleted file mode 100644
index 2cfa15f3..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/People/Interest.php
+++ /dev/null
@@ -1,40 +0,0 @@
-metadata = $metadata;
-  }
-  public function getMetadata()
-  {
-    return $this->metadata;
-  }
-  public function setValue($value)
-  {
-    $this->value = $value;
-  }
-  public function getValue()
-  {
-    return $this->value;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/People/ListConnectionsResponse.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/People/ListConnectionsResponse.php
deleted file mode 100644
index c94f140b..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/People/ListConnectionsResponse.php
+++ /dev/null
@@ -1,50 +0,0 @@
-connections = $connections;
-  }
-  public function getConnections()
-  {
-    return $this->connections;
-  }
-  public function setNextPageToken($nextPageToken)
-  {
-    $this->nextPageToken = $nextPageToken;
-  }
-  public function getNextPageToken()
-  {
-    return $this->nextPageToken;
-  }
-  public function setNextSyncToken($nextSyncToken)
-  {
-    $this->nextSyncToken = $nextSyncToken;
-  }
-  public function getNextSyncToken()
-  {
-    return $this->nextSyncToken;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/People/Locale.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/People/Locale.php
deleted file mode 100644
index ace1c251..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/People/Locale.php
+++ /dev/null
@@ -1,40 +0,0 @@
-metadata = $metadata;
-  }
-  public function getMetadata()
-  {
-    return $this->metadata;
-  }
-  public function setValue($value)
-  {
-    $this->value = $value;
-  }
-  public function getValue()
-  {
-    return $this->value;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/People/Membership.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/People/Membership.php
deleted file mode 100644
index dcba8d52..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/People/Membership.php
+++ /dev/null
@@ -1,51 +0,0 @@
-contactGroupMembership = $contactGroupMembership;
-  }
-  public function getContactGroupMembership()
-  {
-    return $this->contactGroupMembership;
-  }
-  public function setDomainMembership(Google_Service_People_DomainMembership $domainMembership)
-  {
-    $this->domainMembership = $domainMembership;
-  }
-  public function getDomainMembership()
-  {
-    return $this->domainMembership;
-  }
-  public function setMetadata(Google_Service_People_FieldMetadata $metadata)
-  {
-    $this->metadata = $metadata;
-  }
-  public function getMetadata()
-  {
-    return $this->metadata;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/People/Name.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/People/Name.php
deleted file mode 100644
index 76f2f80a..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/People/Name.php
+++ /dev/null
@@ -1,148 +0,0 @@
-displayName = $displayName;
-  }
-  public function getDisplayName()
-  {
-    return $this->displayName;
-  }
-  public function setDisplayNameLastFirst($displayNameLastFirst)
-  {
-    $this->displayNameLastFirst = $displayNameLastFirst;
-  }
-  public function getDisplayNameLastFirst()
-  {
-    return $this->displayNameLastFirst;
-  }
-  public function setFamilyName($familyName)
-  {
-    $this->familyName = $familyName;
-  }
-  public function getFamilyName()
-  {
-    return $this->familyName;
-  }
-  public function setGivenName($givenName)
-  {
-    $this->givenName = $givenName;
-  }
-  public function getGivenName()
-  {
-    return $this->givenName;
-  }
-  public function setHonorificPrefix($honorificPrefix)
-  {
-    $this->honorificPrefix = $honorificPrefix;
-  }
-  public function getHonorificPrefix()
-  {
-    return $this->honorificPrefix;
-  }
-  public function setHonorificSuffix($honorificSuffix)
-  {
-    $this->honorificSuffix = $honorificSuffix;
-  }
-  public function getHonorificSuffix()
-  {
-    return $this->honorificSuffix;
-  }
-  public function setMetadata(Google_Service_People_FieldMetadata $metadata)
-  {
-    $this->metadata = $metadata;
-  }
-  public function getMetadata()
-  {
-    return $this->metadata;
-  }
-  public function setMiddleName($middleName)
-  {
-    $this->middleName = $middleName;
-  }
-  public function getMiddleName()
-  {
-    return $this->middleName;
-  }
-  public function setPhoneticFamilyName($phoneticFamilyName)
-  {
-    $this->phoneticFamilyName = $phoneticFamilyName;
-  }
-  public function getPhoneticFamilyName()
-  {
-    return $this->phoneticFamilyName;
-  }
-  public function setPhoneticFullName($phoneticFullName)
-  {
-    $this->phoneticFullName = $phoneticFullName;
-  }
-  public function getPhoneticFullName()
-  {
-    return $this->phoneticFullName;
-  }
-  public function setPhoneticGivenName($phoneticGivenName)
-  {
-    $this->phoneticGivenName = $phoneticGivenName;
-  }
-  public function getPhoneticGivenName()
-  {
-    return $this->phoneticGivenName;
-  }
-  public function setPhoneticHonorificPrefix($phoneticHonorificPrefix)
-  {
-    $this->phoneticHonorificPrefix = $phoneticHonorificPrefix;
-  }
-  public function getPhoneticHonorificPrefix()
-  {
-    return $this->phoneticHonorificPrefix;
-  }
-  public function setPhoneticHonorificSuffix($phoneticHonorificSuffix)
-  {
-    $this->phoneticHonorificSuffix = $phoneticHonorificSuffix;
-  }
-  public function getPhoneticHonorificSuffix()
-  {
-    return $this->phoneticHonorificSuffix;
-  }
-  public function setPhoneticMiddleName($phoneticMiddleName)
-  {
-    $this->phoneticMiddleName = $phoneticMiddleName;
-  }
-  public function getPhoneticMiddleName()
-  {
-    return $this->phoneticMiddleName;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/People/Nickname.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/People/Nickname.php
deleted file mode 100644
index dd152314..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/People/Nickname.php
+++ /dev/null
@@ -1,49 +0,0 @@
-metadata = $metadata;
-  }
-  public function getMetadata()
-  {
-    return $this->metadata;
-  }
-  public function setType($type)
-  {
-    $this->type = $type;
-  }
-  public function getType()
-  {
-    return $this->type;
-  }
-  public function setValue($value)
-  {
-    $this->value = $value;
-  }
-  public function getValue()
-  {
-    return $this->value;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/People/Occupation.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/People/Occupation.php
deleted file mode 100644
index 0bb869ba..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/People/Occupation.php
+++ /dev/null
@@ -1,40 +0,0 @@
-metadata = $metadata;
-  }
-  public function getMetadata()
-  {
-    return $this->metadata;
-  }
-  public function setValue($value)
-  {
-    $this->value = $value;
-  }
-  public function getValue()
-  {
-    return $this->value;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/People/Organization.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/People/Organization.php
deleted file mode 100644
index aa507534..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/People/Organization.php
+++ /dev/null
@@ -1,150 +0,0 @@
-current = $current;
-  }
-  public function getCurrent()
-  {
-    return $this->current;
-  }
-  public function setDepartment($department)
-  {
-    $this->department = $department;
-  }
-  public function getDepartment()
-  {
-    return $this->department;
-  }
-  public function setDomain($domain)
-  {
-    $this->domain = $domain;
-  }
-  public function getDomain()
-  {
-    return $this->domain;
-  }
-  public function setEndDate(Google_Service_People_Date $endDate)
-  {
-    $this->endDate = $endDate;
-  }
-  public function getEndDate()
-  {
-    return $this->endDate;
-  }
-  public function setFormattedType($formattedType)
-  {
-    $this->formattedType = $formattedType;
-  }
-  public function getFormattedType()
-  {
-    return $this->formattedType;
-  }
-  public function setJobDescription($jobDescription)
-  {
-    $this->jobDescription = $jobDescription;
-  }
-  public function getJobDescription()
-  {
-    return $this->jobDescription;
-  }
-  public function setLocation($location)
-  {
-    $this->location = $location;
-  }
-  public function getLocation()
-  {
-    return $this->location;
-  }
-  public function setMetadata(Google_Service_People_FieldMetadata $metadata)
-  {
-    $this->metadata = $metadata;
-  }
-  public function getMetadata()
-  {
-    return $this->metadata;
-  }
-  public function setName($name)
-  {
-    $this->name = $name;
-  }
-  public function getName()
-  {
-    return $this->name;
-  }
-  public function setPhoneticName($phoneticName)
-  {
-    $this->phoneticName = $phoneticName;
-  }
-  public function getPhoneticName()
-  {
-    return $this->phoneticName;
-  }
-  public function setStartDate(Google_Service_People_Date $startDate)
-  {
-    $this->startDate = $startDate;
-  }
-  public function getStartDate()
-  {
-    return $this->startDate;
-  }
-  public function setSymbol($symbol)
-  {
-    $this->symbol = $symbol;
-  }
-  public function getSymbol()
-  {
-    return $this->symbol;
-  }
-  public function setTitle($title)
-  {
-    $this->title = $title;
-  }
-  public function getTitle()
-  {
-    return $this->title;
-  }
-  public function setType($type)
-  {
-    $this->type = $type;
-  }
-  public function getType()
-  {
-    return $this->type;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/People/Person.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/People/Person.php
deleted file mode 100644
index 206e5280..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/People/Person.php
+++ /dev/null
@@ -1,319 +0,0 @@
-addresses = $addresses;
-  }
-  public function getAddresses()
-  {
-    return $this->addresses;
-  }
-  public function setAgeRange($ageRange)
-  {
-    $this->ageRange = $ageRange;
-  }
-  public function getAgeRange()
-  {
-    return $this->ageRange;
-  }
-  public function setAgeRanges($ageRanges)
-  {
-    $this->ageRanges = $ageRanges;
-  }
-  public function getAgeRanges()
-  {
-    return $this->ageRanges;
-  }
-  public function setBiographies($biographies)
-  {
-    $this->biographies = $biographies;
-  }
-  public function getBiographies()
-  {
-    return $this->biographies;
-  }
-  public function setBirthdays($birthdays)
-  {
-    $this->birthdays = $birthdays;
-  }
-  public function getBirthdays()
-  {
-    return $this->birthdays;
-  }
-  public function setBraggingRights($braggingRights)
-  {
-    $this->braggingRights = $braggingRights;
-  }
-  public function getBraggingRights()
-  {
-    return $this->braggingRights;
-  }
-  public function setCoverPhotos($coverPhotos)
-  {
-    $this->coverPhotos = $coverPhotos;
-  }
-  public function getCoverPhotos()
-  {
-    return $this->coverPhotos;
-  }
-  public function setEmailAddresses($emailAddresses)
-  {
-    $this->emailAddresses = $emailAddresses;
-  }
-  public function getEmailAddresses()
-  {
-    return $this->emailAddresses;
-  }
-  public function setEtag($etag)
-  {
-    $this->etag = $etag;
-  }
-  public function getEtag()
-  {
-    return $this->etag;
-  }
-  public function setEvents($events)
-  {
-    $this->events = $events;
-  }
-  public function getEvents()
-  {
-    return $this->events;
-  }
-  public function setGenders($genders)
-  {
-    $this->genders = $genders;
-  }
-  public function getGenders()
-  {
-    return $this->genders;
-  }
-  public function setImClients($imClients)
-  {
-    $this->imClients = $imClients;
-  }
-  public function getImClients()
-  {
-    return $this->imClients;
-  }
-  public function setInterests($interests)
-  {
-    $this->interests = $interests;
-  }
-  public function getInterests()
-  {
-    return $this->interests;
-  }
-  public function setLocales($locales)
-  {
-    $this->locales = $locales;
-  }
-  public function getLocales()
-  {
-    return $this->locales;
-  }
-  public function setMemberships($memberships)
-  {
-    $this->memberships = $memberships;
-  }
-  public function getMemberships()
-  {
-    return $this->memberships;
-  }
-  public function setMetadata(Google_Service_People_PersonMetadata $metadata)
-  {
-    $this->metadata = $metadata;
-  }
-  public function getMetadata()
-  {
-    return $this->metadata;
-  }
-  public function setNames($names)
-  {
-    $this->names = $names;
-  }
-  public function getNames()
-  {
-    return $this->names;
-  }
-  public function setNicknames($nicknames)
-  {
-    $this->nicknames = $nicknames;
-  }
-  public function getNicknames()
-  {
-    return $this->nicknames;
-  }
-  public function setOccupations($occupations)
-  {
-    $this->occupations = $occupations;
-  }
-  public function getOccupations()
-  {
-    return $this->occupations;
-  }
-  public function setOrganizations($organizations)
-  {
-    $this->organizations = $organizations;
-  }
-  public function getOrganizations()
-  {
-    return $this->organizations;
-  }
-  public function setPhoneNumbers($phoneNumbers)
-  {
-    $this->phoneNumbers = $phoneNumbers;
-  }
-  public function getPhoneNumbers()
-  {
-    return $this->phoneNumbers;
-  }
-  public function setPhotos($photos)
-  {
-    $this->photos = $photos;
-  }
-  public function getPhotos()
-  {
-    return $this->photos;
-  }
-  public function setRelations($relations)
-  {
-    $this->relations = $relations;
-  }
-  public function getRelations()
-  {
-    return $this->relations;
-  }
-  public function setRelationshipInterests($relationshipInterests)
-  {
-    $this->relationshipInterests = $relationshipInterests;
-  }
-  public function getRelationshipInterests()
-  {
-    return $this->relationshipInterests;
-  }
-  public function setRelationshipStatuses($relationshipStatuses)
-  {
-    $this->relationshipStatuses = $relationshipStatuses;
-  }
-  public function getRelationshipStatuses()
-  {
-    return $this->relationshipStatuses;
-  }
-  public function setResidences($residences)
-  {
-    $this->residences = $residences;
-  }
-  public function getResidences()
-  {
-    return $this->residences;
-  }
-  public function setResourceName($resourceName)
-  {
-    $this->resourceName = $resourceName;
-  }
-  public function getResourceName()
-  {
-    return $this->resourceName;
-  }
-  public function setSkills($skills)
-  {
-    $this->skills = $skills;
-  }
-  public function getSkills()
-  {
-    return $this->skills;
-  }
-  public function setTaglines($taglines)
-  {
-    $this->taglines = $taglines;
-  }
-  public function getTaglines()
-  {
-    return $this->taglines;
-  }
-  public function setUrls($urls)
-  {
-    $this->urls = $urls;
-  }
-  public function getUrls()
-  {
-    return $this->urls;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/People/PersonMetadata.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/People/PersonMetadata.php
deleted file mode 100644
index 013d40bb..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/People/PersonMetadata.php
+++ /dev/null
@@ -1,68 +0,0 @@
-deleted = $deleted;
-  }
-  public function getDeleted()
-  {
-    return $this->deleted;
-  }
-  public function setLinkedPeopleResourceNames($linkedPeopleResourceNames)
-  {
-    $this->linkedPeopleResourceNames = $linkedPeopleResourceNames;
-  }
-  public function getLinkedPeopleResourceNames()
-  {
-    return $this->linkedPeopleResourceNames;
-  }
-  public function setObjectType($objectType)
-  {
-    $this->objectType = $objectType;
-  }
-  public function getObjectType()
-  {
-    return $this->objectType;
-  }
-  public function setPreviousResourceNames($previousResourceNames)
-  {
-    $this->previousResourceNames = $previousResourceNames;
-  }
-  public function getPreviousResourceNames()
-  {
-    return $this->previousResourceNames;
-  }
-  public function setSources($sources)
-  {
-    $this->sources = $sources;
-  }
-  public function getSources()
-  {
-    return $this->sources;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/People/PersonResponse.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/People/PersonResponse.php
deleted file mode 100644
index 98f6bb54..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/People/PersonResponse.php
+++ /dev/null
@@ -1,49 +0,0 @@
-httpStatusCode = $httpStatusCode;
-  }
-  public function getHttpStatusCode()
-  {
-    return $this->httpStatusCode;
-  }
-  public function setPerson(Google_Service_People_Person $person)
-  {
-    $this->person = $person;
-  }
-  public function getPerson()
-  {
-    return $this->person;
-  }
-  public function setRequestedResourceName($requestedResourceName)
-  {
-    $this->requestedResourceName = $requestedResourceName;
-  }
-  public function getRequestedResourceName()
-  {
-    return $this->requestedResourceName;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/People/PhoneNumber.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/People/PhoneNumber.php
deleted file mode 100644
index c71b0541..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/People/PhoneNumber.php
+++ /dev/null
@@ -1,67 +0,0 @@
-canonicalForm = $canonicalForm;
-  }
-  public function getCanonicalForm()
-  {
-    return $this->canonicalForm;
-  }
-  public function setFormattedType($formattedType)
-  {
-    $this->formattedType = $formattedType;
-  }
-  public function getFormattedType()
-  {
-    return $this->formattedType;
-  }
-  public function setMetadata(Google_Service_People_FieldMetadata $metadata)
-  {
-    $this->metadata = $metadata;
-  }
-  public function getMetadata()
-  {
-    return $this->metadata;
-  }
-  public function setType($type)
-  {
-    $this->type = $type;
-  }
-  public function getType()
-  {
-    return $this->type;
-  }
-  public function setValue($value)
-  {
-    $this->value = $value;
-  }
-  public function getValue()
-  {
-    return $this->value;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/People/Photo.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/People/Photo.php
deleted file mode 100644
index 749ab890..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/People/Photo.php
+++ /dev/null
@@ -1,40 +0,0 @@
-metadata = $metadata;
-  }
-  public function getMetadata()
-  {
-    return $this->metadata;
-  }
-  public function setUrl($url)
-  {
-    $this->url = $url;
-  }
-  public function getUrl()
-  {
-    return $this->url;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/People/ProfileMetadata.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/People/ProfileMetadata.php
deleted file mode 100644
index 9421febf..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/People/ProfileMetadata.php
+++ /dev/null
@@ -1,30 +0,0 @@
-objectType = $objectType;
-  }
-  public function getObjectType()
-  {
-    return $this->objectType;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/People/Relation.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/People/Relation.php
deleted file mode 100644
index 406ec117..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/People/Relation.php
+++ /dev/null
@@ -1,58 +0,0 @@
-formattedType = $formattedType;
-  }
-  public function getFormattedType()
-  {
-    return $this->formattedType;
-  }
-  public function setMetadata(Google_Service_People_FieldMetadata $metadata)
-  {
-    $this->metadata = $metadata;
-  }
-  public function getMetadata()
-  {
-    return $this->metadata;
-  }
-  public function setPerson($person)
-  {
-    $this->person = $person;
-  }
-  public function getPerson()
-  {
-    return $this->person;
-  }
-  public function setType($type)
-  {
-    $this->type = $type;
-  }
-  public function getType()
-  {
-    return $this->type;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/People/RelationshipInterest.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/People/RelationshipInterest.php
deleted file mode 100644
index c8f2551b..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/People/RelationshipInterest.php
+++ /dev/null
@@ -1,49 +0,0 @@
-formattedValue = $formattedValue;
-  }
-  public function getFormattedValue()
-  {
-    return $this->formattedValue;
-  }
-  public function setMetadata(Google_Service_People_FieldMetadata $metadata)
-  {
-    $this->metadata = $metadata;
-  }
-  public function getMetadata()
-  {
-    return $this->metadata;
-  }
-  public function setValue($value)
-  {
-    $this->value = $value;
-  }
-  public function getValue()
-  {
-    return $this->value;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/People/RelationshipStatus.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/People/RelationshipStatus.php
deleted file mode 100644
index bb81e569..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/People/RelationshipStatus.php
+++ /dev/null
@@ -1,49 +0,0 @@
-formattedValue = $formattedValue;
-  }
-  public function getFormattedValue()
-  {
-    return $this->formattedValue;
-  }
-  public function setMetadata(Google_Service_People_FieldMetadata $metadata)
-  {
-    $this->metadata = $metadata;
-  }
-  public function getMetadata()
-  {
-    return $this->metadata;
-  }
-  public function setValue($value)
-  {
-    $this->value = $value;
-  }
-  public function getValue()
-  {
-    return $this->value;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/People/Residence.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/People/Residence.php
deleted file mode 100644
index 8a056f7b..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/People/Residence.php
+++ /dev/null
@@ -1,49 +0,0 @@
-current = $current;
-  }
-  public function getCurrent()
-  {
-    return $this->current;
-  }
-  public function setMetadata(Google_Service_People_FieldMetadata $metadata)
-  {
-    $this->metadata = $metadata;
-  }
-  public function getMetadata()
-  {
-    return $this->metadata;
-  }
-  public function setValue($value)
-  {
-    $this->value = $value;
-  }
-  public function getValue()
-  {
-    return $this->value;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/People/Resource/People.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/People/Resource/People.php
deleted file mode 100644
index 201b8ec6..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/People/Resource/People.php
+++ /dev/null
@@ -1,78 +0,0 @@
-
- *   $peopleService = new Google_Service_People(...);
- *   $people = $peopleService->people;
- *  
- */
-class Google_Service_People_Resource_People extends Google_Service_Resource
-{
-  /**
-   * Provides information about a person resource for a resource name. Use
-   * `people/me` to indicate the authenticated user. (people.get)
-   *
-   * @param string $resourceName The resource name of the person to provide
-   * information about.
-   *
-   * - To get information about the authenticated user, specify `people/me`. - To
-   * get information about any user, specify the resource name that   identifies
-   * the user, such as the resource names returned by
-   * [`people.connections.list`](/people/api/rest/v1/people.connections/list).
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param string requestMask.includeField Comma-separated list of fields to
-   * be included in the response. Omitting this field will include all fields
-   * except for connections.list requests, which have a default mask that includes
-   * common fields like metadata, name, photo, and profile url. Each path should
-   * start with `person.`: for example, `person.names` or `person.photos`.
-   * @return Google_Service_People_Person
-   */
-  public function get($resourceName, $optParams = array())
-  {
-    $params = array('resourceName' => $resourceName);
-    $params = array_merge($params, $optParams);
-    return $this->call('get', array($params), "Google_Service_People_Person");
-  }
-  /**
-   * Provides information about a list of specific people by specifying a list of
-   * requested resource names. Use `people/me` to indicate the authenticated user.
-   * (people.getBatchGet)
-   *
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param string requestMask.includeField Comma-separated list of fields to
-   * be included in the response. Omitting this field will include all fields
-   * except for connections.list requests, which have a default mask that includes
-   * common fields like metadata, name, photo, and profile url. Each path should
-   * start with `person.`: for example, `person.names` or `person.photos`.
-   * @opt_param string resourceNames The resource name, such as one returned by
-   * [`people.connections.list`](/people/api/rest/v1/people.connections/list), of
-   * one of the people to provide information about. You can include this
-   * parameter up to 50 times in one request.
-   * @return Google_Service_People_GetPeopleResponse
-   */
-  public function getBatchGet($optParams = array())
-  {
-    $params = array();
-    $params = array_merge($params, $optParams);
-    return $this->call('getBatchGet', array($params), "Google_Service_People_GetPeopleResponse");
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/People/Resource/PeopleConnections.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/People/Resource/PeopleConnections.php
deleted file mode 100644
index 447af7c9..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/People/Resource/PeopleConnections.php
+++ /dev/null
@@ -1,59 +0,0 @@
-
- *   $peopleService = new Google_Service_People(...);
- *   $connections = $peopleService->connections;
- *  
- */
-class Google_Service_People_Resource_PeopleConnections extends Google_Service_Resource
-{
-  /**
-   * Provides a list of the authenticated user's contacts merged with any linked
-   * profiles. (connections.listPeopleConnections)
-   *
-   * @param string $resourceName The resource name to return connections for. Only
-   * `people/me` is valid.
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param bool requestSyncToken Whether the response should include a sync
-   * token, which can be used to get all changes since the last request.
-   * @opt_param string pageToken The token of the page to be returned.
-   * @opt_param string requestMask.includeField Comma-separated list of fields to
-   * be included in the response. Omitting this field will include all fields
-   * except for connections.list requests, which have a default mask that includes
-   * common fields like metadata, name, photo, and profile url. Each path should
-   * start with `person.`: for example, `person.names` or `person.photos`.
-   * @opt_param int pageSize The number of connections to include in the response.
-   * Valid values are between 1 and 500, inclusive. Defaults to 100.
-   * @opt_param string syncToken A sync token, returned by a previous call to
-   * `people.connections.list`. Only resources changed since the sync token was
-   * created will be returned.
-   * @opt_param string sortOrder The order in which the connections should be
-   * sorted. Defaults to `LAST_MODIFIED_ASCENDING`.
-   * @return Google_Service_People_ListConnectionsResponse
-   */
-  public function listPeopleConnections($resourceName, $optParams = array())
-  {
-    $params = array('resourceName' => $resourceName);
-    $params = array_merge($params, $optParams);
-    return $this->call('list', array($params), "Google_Service_People_ListConnectionsResponse");
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/People/Skill.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/People/Skill.php
deleted file mode 100644
index a54584d8..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/People/Skill.php
+++ /dev/null
@@ -1,40 +0,0 @@
-metadata = $metadata;
-  }
-  public function getMetadata()
-  {
-    return $this->metadata;
-  }
-  public function setValue($value)
-  {
-    $this->value = $value;
-  }
-  public function getValue()
-  {
-    return $this->value;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/People/Source.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/People/Source.php
deleted file mode 100644
index 190b0fc2..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/People/Source.php
+++ /dev/null
@@ -1,58 +0,0 @@
-etag = $etag;
-  }
-  public function getEtag()
-  {
-    return $this->etag;
-  }
-  public function setId($id)
-  {
-    $this->id = $id;
-  }
-  public function getId()
-  {
-    return $this->id;
-  }
-  public function setProfileMetadata(Google_Service_People_ProfileMetadata $profileMetadata)
-  {
-    $this->profileMetadata = $profileMetadata;
-  }
-  public function getProfileMetadata()
-  {
-    return $this->profileMetadata;
-  }
-  public function setType($type)
-  {
-    $this->type = $type;
-  }
-  public function getType()
-  {
-    return $this->type;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/People/Tagline.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/People/Tagline.php
deleted file mode 100644
index f17c7e39..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/People/Tagline.php
+++ /dev/null
@@ -1,40 +0,0 @@
-metadata = $metadata;
-  }
-  public function getMetadata()
-  {
-    return $this->metadata;
-  }
-  public function setValue($value)
-  {
-    $this->value = $value;
-  }
-  public function getValue()
-  {
-    return $this->value;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/People/Url.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/People/Url.php
deleted file mode 100644
index fb42d674..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/People/Url.php
+++ /dev/null
@@ -1,58 +0,0 @@
-formattedType = $formattedType;
-  }
-  public function getFormattedType()
-  {
-    return $this->formattedType;
-  }
-  public function setMetadata(Google_Service_People_FieldMetadata $metadata)
-  {
-    $this->metadata = $metadata;
-  }
-  public function getMetadata()
-  {
-    return $this->metadata;
-  }
-  public function setType($type)
-  {
-    $this->type = $type;
-  }
-  public function getType()
-  {
-    return $this->type;
-  }
-  public function setValue($value)
-  {
-    $this->value = $value;
-  }
-  public function getValue()
-  {
-    return $this->value;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/PlayMovies.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/PlayMovies.php
deleted file mode 100644
index b6632567..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/PlayMovies.php
+++ /dev/null
@@ -1,299 +0,0 @@
-
- * Gets the delivery status of titles for Google Play Movies Partners.

- *
- * 

- * For more information about this service, see the API
- * Documentation
- * 

- *
- * @author Google, Inc.
- */
-class Google_Service_PlayMovies extends Google_Service
-{
-  /** View the digital assets you publish on Google Play Movies and TV. */
-  const PLAYMOVIES_PARTNER_READONLY =
-      "https://www.googleapis.com/auth/playmovies_partner.readonly";
-
-  public $accounts_avails;
-  public $accounts_orders;
-  public $accounts_storeInfos;
-  public $accounts_storeInfos_country;
-  
-  /**
-   * Constructs the internal representation of the PlayMovies service.
-   *
-   * @param Google_Client $client
-   */
-  public function __construct(Google_Client $client)
-  {
-    parent::__construct($client);
-    $this->rootUrl = 'https://playmoviespartner.googleapis.com/';
-    $this->servicePath = '';
-    $this->version = 'v1';
-    $this->serviceName = 'playmoviespartner';
-
-    $this->accounts_avails = new Google_Service_PlayMovies_Resource_AccountsAvails(
-        $this,
-        $this->serviceName,
-        'avails',
-        array(
-          'methods' => array(
-            'get' => array(
-              'path' => 'v1/accounts/{accountId}/avails/{availId}',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'accountId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'availId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'list' => array(
-              'path' => 'v1/accounts/{accountId}/avails',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'accountId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'title' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'pageToken' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'videoIds' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                  'repeated' => true,
-                ),
-                'pageSize' => array(
-                  'location' => 'query',
-                  'type' => 'integer',
-                ),
-                'altIds' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                  'repeated' => true,
-                ),
-                'pphNames' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                  'repeated' => true,
-                ),
-                'altId' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'studioNames' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                  'repeated' => true,
-                ),
-                'territories' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                  'repeated' => true,
-                ),
-              ),
-            ),
-          )
-        )
-    );
-    $this->accounts_orders = new Google_Service_PlayMovies_Resource_AccountsOrders(
-        $this,
-        $this->serviceName,
-        'orders',
-        array(
-          'methods' => array(
-            'get' => array(
-              'path' => 'v1/accounts/{accountId}/orders/{orderId}',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'accountId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'orderId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'list' => array(
-              'path' => 'v1/accounts/{accountId}/orders',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'accountId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'pageToken' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'videoIds' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                  'repeated' => true,
-                ),
-                'customId' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'pageSize' => array(
-                  'location' => 'query',
-                  'type' => 'integer',
-                ),
-                'pphNames' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                  'repeated' => true,
-                ),
-                'status' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                  'repeated' => true,
-                ),
-                'name' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'studioNames' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                  'repeated' => true,
-                ),
-              ),
-            ),
-          )
-        )
-    );
-    $this->accounts_storeInfos = new Google_Service_PlayMovies_Resource_AccountsStoreInfos(
-        $this,
-        $this->serviceName,
-        'storeInfos',
-        array(
-          'methods' => array(
-            'list' => array(
-              'path' => 'v1/accounts/{accountId}/storeInfos',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'accountId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'name' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'studioNames' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                  'repeated' => true,
-                ),
-                'seasonIds' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                  'repeated' => true,
-                ),
-                'pageToken' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'videoId' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'videoIds' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                  'repeated' => true,
-                ),
-                'pageSize' => array(
-                  'location' => 'query',
-                  'type' => 'integer',
-                ),
-                'mids' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                  'repeated' => true,
-                ),
-                'pphNames' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                  'repeated' => true,
-                ),
-                'countries' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                  'repeated' => true,
-                ),
-              ),
-            ),
-          )
-        )
-    );
-    $this->accounts_storeInfos_country = new Google_Service_PlayMovies_Resource_AccountsStoreInfosCountry(
-        $this,
-        $this->serviceName,
-        'country',
-        array(
-          'methods' => array(
-            'get' => array(
-              'path' => 'v1/accounts/{accountId}/storeInfos/{videoId}/country/{country}',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'accountId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'videoId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'country' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),
-          )
-        )
-    );
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/PlayMovies/Avail.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/PlayMovies/Avail.php
deleted file mode 100644
index 2486e4e2..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/PlayMovies/Avail.php
+++ /dev/null
@@ -1,319 +0,0 @@
-altId = $altId;
-  }
-  public function getAltId()
-  {
-    return $this->altId;
-  }
-  public function setAvailId($availId)
-  {
-    $this->availId = $availId;
-  }
-  public function getAvailId()
-  {
-    return $this->availId;
-  }
-  public function setCaptionExemption($captionExemption)
-  {
-    $this->captionExemption = $captionExemption;
-  }
-  public function getCaptionExemption()
-  {
-    return $this->captionExemption;
-  }
-  public function setCaptionIncluded($captionIncluded)
-  {
-    $this->captionIncluded = $captionIncluded;
-  }
-  public function getCaptionIncluded()
-  {
-    return $this->captionIncluded;
-  }
-  public function setContentId($contentId)
-  {
-    $this->contentId = $contentId;
-  }
-  public function getContentId()
-  {
-    return $this->contentId;
-  }
-  public function setDisplayName($displayName)
-  {
-    $this->displayName = $displayName;
-  }
-  public function getDisplayName()
-  {
-    return $this->displayName;
-  }
-  public function setEncodeId($encodeId)
-  {
-    $this->encodeId = $encodeId;
-  }
-  public function getEncodeId()
-  {
-    return $this->encodeId;
-  }
-  public function setEnd($end)
-  {
-    $this->end = $end;
-  }
-  public function getEnd()
-  {
-    return $this->end;
-  }
-  public function setEpisodeAltId($episodeAltId)
-  {
-    $this->episodeAltId = $episodeAltId;
-  }
-  public function getEpisodeAltId()
-  {
-    return $this->episodeAltId;
-  }
-  public function setEpisodeNumber($episodeNumber)
-  {
-    $this->episodeNumber = $episodeNumber;
-  }
-  public function getEpisodeNumber()
-  {
-    return $this->episodeNumber;
-  }
-  public function setEpisodeTitleInternalAlias($episodeTitleInternalAlias)
-  {
-    $this->episodeTitleInternalAlias = $episodeTitleInternalAlias;
-  }
-  public function getEpisodeTitleInternalAlias()
-  {
-    return $this->episodeTitleInternalAlias;
-  }
-  public function setFormatProfile($formatProfile)
-  {
-    $this->formatProfile = $formatProfile;
-  }
-  public function getFormatProfile()
-  {
-    return $this->formatProfile;
-  }
-  public function setLicenseType($licenseType)
-  {
-    $this->licenseType = $licenseType;
-  }
-  public function getLicenseType()
-  {
-    return $this->licenseType;
-  }
-  public function setPphNames($pphNames)
-  {
-    $this->pphNames = $pphNames;
-  }
-  public function getPphNames()
-  {
-    return $this->pphNames;
-  }
-  public function setPriceType($priceType)
-  {
-    $this->priceType = $priceType;
-  }
-  public function getPriceType()
-  {
-    return $this->priceType;
-  }
-  public function setPriceValue($priceValue)
-  {
-    $this->priceValue = $priceValue;
-  }
-  public function getPriceValue()
-  {
-    return $this->priceValue;
-  }
-  public function setProductId($productId)
-  {
-    $this->productId = $productId;
-  }
-  public function getProductId()
-  {
-    return $this->productId;
-  }
-  public function setRatingReason($ratingReason)
-  {
-    $this->ratingReason = $ratingReason;
-  }
-  public function getRatingReason()
-  {
-    return $this->ratingReason;
-  }
-  public function setRatingSystem($ratingSystem)
-  {
-    $this->ratingSystem = $ratingSystem;
-  }
-  public function getRatingSystem()
-  {
-    return $this->ratingSystem;
-  }
-  public function setRatingValue($ratingValue)
-  {
-    $this->ratingValue = $ratingValue;
-  }
-  public function getRatingValue()
-  {
-    return $this->ratingValue;
-  }
-  public function setReleaseDate($releaseDate)
-  {
-    $this->releaseDate = $releaseDate;
-  }
-  public function getReleaseDate()
-  {
-    return $this->releaseDate;
-  }
-  public function setSeasonAltId($seasonAltId)
-  {
-    $this->seasonAltId = $seasonAltId;
-  }
-  public function getSeasonAltId()
-  {
-    return $this->seasonAltId;
-  }
-  public function setSeasonNumber($seasonNumber)
-  {
-    $this->seasonNumber = $seasonNumber;
-  }
-  public function getSeasonNumber()
-  {
-    return $this->seasonNumber;
-  }
-  public function setSeasonTitleInternalAlias($seasonTitleInternalAlias)
-  {
-    $this->seasonTitleInternalAlias = $seasonTitleInternalAlias;
-  }
-  public function getSeasonTitleInternalAlias()
-  {
-    return $this->seasonTitleInternalAlias;
-  }
-  public function setSeriesAltId($seriesAltId)
-  {
-    $this->seriesAltId = $seriesAltId;
-  }
-  public function getSeriesAltId()
-  {
-    return $this->seriesAltId;
-  }
-  public function setSeriesTitleInternalAlias($seriesTitleInternalAlias)
-  {
-    $this->seriesTitleInternalAlias = $seriesTitleInternalAlias;
-  }
-  public function getSeriesTitleInternalAlias()
-  {
-    return $this->seriesTitleInternalAlias;
-  }
-  public function setStart($start)
-  {
-    $this->start = $start;
-  }
-  public function getStart()
-  {
-    return $this->start;
-  }
-  public function setStoreLanguage($storeLanguage)
-  {
-    $this->storeLanguage = $storeLanguage;
-  }
-  public function getStoreLanguage()
-  {
-    return $this->storeLanguage;
-  }
-  public function setSuppressionLiftDate($suppressionLiftDate)
-  {
-    $this->suppressionLiftDate = $suppressionLiftDate;
-  }
-  public function getSuppressionLiftDate()
-  {
-    return $this->suppressionLiftDate;
-  }
-  public function setTerritory($territory)
-  {
-    $this->territory = $territory;
-  }
-  public function getTerritory()
-  {
-    return $this->territory;
-  }
-  public function setTitleInternalAlias($titleInternalAlias)
-  {
-    $this->titleInternalAlias = $titleInternalAlias;
-  }
-  public function getTitleInternalAlias()
-  {
-    return $this->titleInternalAlias;
-  }
-  public function setVideoId($videoId)
-  {
-    $this->videoId = $videoId;
-  }
-  public function getVideoId()
-  {
-    return $this->videoId;
-  }
-  public function setWorkType($workType)
-  {
-    $this->workType = $workType;
-  }
-  public function getWorkType()
-  {
-    return $this->workType;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/PlayMovies/Component.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/PlayMovies/Component.php
deleted file mode 100644
index 18254d25..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/PlayMovies/Component.php
+++ /dev/null
@@ -1,220 +0,0 @@
-altCutIds = $altCutIds;
-  }
-  public function getAltCutIds()
-  {
-    return $this->altCutIds;
-  }
-  public function setApprovedTime($approvedTime)
-  {
-    $this->approvedTime = $approvedTime;
-  }
-  public function getApprovedTime()
-  {
-    return $this->approvedTime;
-  }
-  public function setComponentDetailType($componentDetailType)
-  {
-    $this->componentDetailType = $componentDetailType;
-  }
-  public function getComponentDetailType()
-  {
-    return $this->componentDetailType;
-  }
-  public function setComponentId($componentId)
-  {
-    $this->componentId = $componentId;
-  }
-  public function getComponentId()
-  {
-    return $this->componentId;
-  }
-  public function setCustomIds($customIds)
-  {
-    $this->customIds = $customIds;
-  }
-  public function getCustomIds()
-  {
-    return $this->customIds;
-  }
-  public function setEditLevelEidrs($editLevelEidrs)
-  {
-    $this->editLevelEidrs = $editLevelEidrs;
-  }
-  public function getEditLevelEidrs()
-  {
-    return $this->editLevelEidrs;
-  }
-  public function setElIds($elIds)
-  {
-    $this->elIds = $elIds;
-  }
-  public function getElIds()
-  {
-    return $this->elIds;
-  }
-  public function setFilename($filename)
-  {
-    $this->filename = $filename;
-  }
-  public function getFilename()
-  {
-    return $this->filename;
-  }
-  public function setLanguage($language)
-  {
-    $this->language = $language;
-  }
-  public function getLanguage()
-  {
-    return $this->language;
-  }
-  public function setName($name)
-  {
-    $this->name = $name;
-  }
-  public function getName()
-  {
-    return $this->name;
-  }
-  public function setNormalizedPriority($normalizedPriority)
-  {
-    $this->normalizedPriority = $normalizedPriority;
-  }
-  public function getNormalizedPriority()
-  {
-    return $this->normalizedPriority;
-  }
-  public function setPlayableUnitType($playableUnitType)
-  {
-    $this->playableUnitType = $playableUnitType;
-  }
-  public function getPlayableUnitType()
-  {
-    return $this->playableUnitType;
-  }
-  public function setPphName($pphName)
-  {
-    $this->pphName = $pphName;
-  }
-  public function getPphName()
-  {
-    return $this->pphName;
-  }
-  public function setPriority($priority)
-  {
-    $this->priority = $priority;
-  }
-  public function getPriority()
-  {
-    return $this->priority;
-  }
-  public function setProcessingErrors($processingErrors)
-  {
-    $this->processingErrors = $processingErrors;
-  }
-  public function getProcessingErrors()
-  {
-    return $this->processingErrors;
-  }
-  public function setReceivedTime($receivedTime)
-  {
-    $this->receivedTime = $receivedTime;
-  }
-  public function getReceivedTime()
-  {
-    return $this->receivedTime;
-  }
-  public function setRejectionNote($rejectionNote)
-  {
-    $this->rejectionNote = $rejectionNote;
-  }
-  public function getRejectionNote()
-  {
-    return $this->rejectionNote;
-  }
-  public function setStatus($status)
-  {
-    $this->status = $status;
-  }
-  public function getStatus()
-  {
-    return $this->status;
-  }
-  public function setStatusDetail($statusDetail)
-  {
-    $this->statusDetail = $statusDetail;
-  }
-  public function getStatusDetail()
-  {
-    return $this->statusDetail;
-  }
-  public function setStudioName($studioName)
-  {
-    $this->studioName = $studioName;
-  }
-  public function getStudioName()
-  {
-    return $this->studioName;
-  }
-  public function setTitleLevelEidrs($titleLevelEidrs)
-  {
-    $this->titleLevelEidrs = $titleLevelEidrs;
-  }
-  public function getTitleLevelEidrs()
-  {
-    return $this->titleLevelEidrs;
-  }
-  public function setType($type)
-  {
-    $this->type = $type;
-  }
-  public function getType()
-  {
-    return $this->type;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/PlayMovies/ExperienceLocale.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/PlayMovies/ExperienceLocale.php
deleted file mode 100644
index 5be5eb00..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/PlayMovies/ExperienceLocale.php
+++ /dev/null
@@ -1,229 +0,0 @@
-altCutId = $altCutId;
-  }
-  public function getAltCutId()
-  {
-    return $this->altCutId;
-  }
-  public function setApprovedTime($approvedTime)
-  {
-    $this->approvedTime = $approvedTime;
-  }
-  public function getApprovedTime()
-  {
-    return $this->approvedTime;
-  }
-  public function setChannelId($channelId)
-  {
-    $this->channelId = $channelId;
-  }
-  public function getChannelId()
-  {
-    return $this->channelId;
-  }
-  public function setCountry($country)
-  {
-    $this->country = $country;
-  }
-  public function getCountry()
-  {
-    return $this->country;
-  }
-  public function setCreatedTime($createdTime)
-  {
-    $this->createdTime = $createdTime;
-  }
-  public function getCreatedTime()
-  {
-    return $this->createdTime;
-  }
-  public function setCustomIds($customIds)
-  {
-    $this->customIds = $customIds;
-  }
-  public function getCustomIds()
-  {
-    return $this->customIds;
-  }
-  public function setEarliestAvailStartTime($earliestAvailStartTime)
-  {
-    $this->earliestAvailStartTime = $earliestAvailStartTime;
-  }
-  public function getEarliestAvailStartTime()
-  {
-    return $this->earliestAvailStartTime;
-  }
-  public function setEditLevelEidr($editLevelEidr)
-  {
-    $this->editLevelEidr = $editLevelEidr;
-  }
-  public function getEditLevelEidr()
-  {
-    return $this->editLevelEidr;
-  }
-  public function setElId($elId)
-  {
-    $this->elId = $elId;
-  }
-  public function getElId()
-  {
-    return $this->elId;
-  }
-  public function setInventoryId($inventoryId)
-  {
-    $this->inventoryId = $inventoryId;
-  }
-  public function getInventoryId()
-  {
-    return $this->inventoryId;
-  }
-  public function setLanguage($language)
-  {
-    $this->language = $language;
-  }
-  public function getLanguage()
-  {
-    return $this->language;
-  }
-  public function setName($name)
-  {
-    $this->name = $name;
-  }
-  public function getName()
-  {
-    return $this->name;
-  }
-  public function setNormalizedPriority($normalizedPriority)
-  {
-    $this->normalizedPriority = $normalizedPriority;
-  }
-  public function getNormalizedPriority()
-  {
-    return $this->normalizedPriority;
-  }
-  public function setPlayableSequenceId($playableSequenceId)
-  {
-    $this->playableSequenceId = $playableSequenceId;
-  }
-  public function getPlayableSequenceId()
-  {
-    return $this->playableSequenceId;
-  }
-  public function setPphNames($pphNames)
-  {
-    $this->pphNames = $pphNames;
-  }
-  public function getPphNames()
-  {
-    return $this->pphNames;
-  }
-  public function setPresentationId($presentationId)
-  {
-    $this->presentationId = $presentationId;
-  }
-  public function getPresentationId()
-  {
-    return $this->presentationId;
-  }
-  public function setPriority($priority)
-  {
-    $this->priority = $priority;
-  }
-  public function getPriority()
-  {
-    return $this->priority;
-  }
-  public function setStatus($status)
-  {
-    $this->status = $status;
-  }
-  public function getStatus()
-  {
-    return $this->status;
-  }
-  public function setStudioName($studioName)
-  {
-    $this->studioName = $studioName;
-  }
-  public function getStudioName()
-  {
-    return $this->studioName;
-  }
-  public function setTitleLevelEidr($titleLevelEidr)
-  {
-    $this->titleLevelEidr = $titleLevelEidr;
-  }
-  public function getTitleLevelEidr()
-  {
-    return $this->titleLevelEidr;
-  }
-  public function setTrailerId($trailerId)
-  {
-    $this->trailerId = $trailerId;
-  }
-  public function getTrailerId()
-  {
-    return $this->trailerId;
-  }
-  public function setType($type)
-  {
-    $this->type = $type;
-  }
-  public function getType()
-  {
-    return $this->type;
-  }
-  public function setVideoId($videoId)
-  {
-    $this->videoId = $videoId;
-  }
-  public function getVideoId()
-  {
-    return $this->videoId;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/PlayMovies/ListAvailsResponse.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/PlayMovies/ListAvailsResponse.php
deleted file mode 100644
index d9d0b024..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/PlayMovies/ListAvailsResponse.php
+++ /dev/null
@@ -1,50 +0,0 @@
-avails = $avails;
-  }
-  public function getAvails()
-  {
-    return $this->avails;
-  }
-  public function setNextPageToken($nextPageToken)
-  {
-    $this->nextPageToken = $nextPageToken;
-  }
-  public function getNextPageToken()
-  {
-    return $this->nextPageToken;
-  }
-  public function setTotalSize($totalSize)
-  {
-    $this->totalSize = $totalSize;
-  }
-  public function getTotalSize()
-  {
-    return $this->totalSize;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/PlayMovies/ListComponentsResponse.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/PlayMovies/ListComponentsResponse.php
deleted file mode 100644
index 0b7d6d1d..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/PlayMovies/ListComponentsResponse.php
+++ /dev/null
@@ -1,50 +0,0 @@
-components = $components;
-  }
-  public function getComponents()
-  {
-    return $this->components;
-  }
-  public function setNextPageToken($nextPageToken)
-  {
-    $this->nextPageToken = $nextPageToken;
-  }
-  public function getNextPageToken()
-  {
-    return $this->nextPageToken;
-  }
-  public function setTotalSize($totalSize)
-  {
-    $this->totalSize = $totalSize;
-  }
-  public function getTotalSize()
-  {
-    return $this->totalSize;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/PlayMovies/ListExperienceLocalesResponse.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/PlayMovies/ListExperienceLocalesResponse.php
deleted file mode 100644
index 759d168a..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/PlayMovies/ListExperienceLocalesResponse.php
+++ /dev/null
@@ -1,50 +0,0 @@
-experienceLocales = $experienceLocales;
-  }
-  public function getExperienceLocales()
-  {
-    return $this->experienceLocales;
-  }
-  public function setNextPageToken($nextPageToken)
-  {
-    $this->nextPageToken = $nextPageToken;
-  }
-  public function getNextPageToken()
-  {
-    return $this->nextPageToken;
-  }
-  public function setTotalSize($totalSize)
-  {
-    $this->totalSize = $totalSize;
-  }
-  public function getTotalSize()
-  {
-    return $this->totalSize;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/PlayMovies/ListOrdersResponse.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/PlayMovies/ListOrdersResponse.php
deleted file mode 100644
index 4310ffa8..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/PlayMovies/ListOrdersResponse.php
+++ /dev/null
@@ -1,50 +0,0 @@
-nextPageToken = $nextPageToken;
-  }
-  public function getNextPageToken()
-  {
-    return $this->nextPageToken;
-  }
-  public function setOrders($orders)
-  {
-    $this->orders = $orders;
-  }
-  public function getOrders()
-  {
-    return $this->orders;
-  }
-  public function setTotalSize($totalSize)
-  {
-    $this->totalSize = $totalSize;
-  }
-  public function getTotalSize()
-  {
-    return $this->totalSize;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/PlayMovies/ListStoreInfosResponse.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/PlayMovies/ListStoreInfosResponse.php
deleted file mode 100644
index cf6ee714..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/PlayMovies/ListStoreInfosResponse.php
+++ /dev/null
@@ -1,50 +0,0 @@
-nextPageToken = $nextPageToken;
-  }
-  public function getNextPageToken()
-  {
-    return $this->nextPageToken;
-  }
-  public function setStoreInfos($storeInfos)
-  {
-    $this->storeInfos = $storeInfos;
-  }
-  public function getStoreInfos()
-  {
-    return $this->storeInfos;
-  }
-  public function setTotalSize($totalSize)
-  {
-    $this->totalSize = $totalSize;
-  }
-  public function getTotalSize()
-  {
-    return $this->totalSize;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/PlayMovies/Order.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/PlayMovies/Order.php
deleted file mode 100644
index 9566397d..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/PlayMovies/Order.php
+++ /dev/null
@@ -1,229 +0,0 @@
-approvedTime = $approvedTime;
-  }
-  public function getApprovedTime()
-  {
-    return $this->approvedTime;
-  }
-  public function setChannelId($channelId)
-  {
-    $this->channelId = $channelId;
-  }
-  public function getChannelId()
-  {
-    return $this->channelId;
-  }
-  public function setChannelName($channelName)
-  {
-    $this->channelName = $channelName;
-  }
-  public function getChannelName()
-  {
-    return $this->channelName;
-  }
-  public function setCountries($countries)
-  {
-    $this->countries = $countries;
-  }
-  public function getCountries()
-  {
-    return $this->countries;
-  }
-  public function setCustomId($customId)
-  {
-    $this->customId = $customId;
-  }
-  public function getCustomId()
-  {
-    return $this->customId;
-  }
-  public function setEarliestAvailStartTime($earliestAvailStartTime)
-  {
-    $this->earliestAvailStartTime = $earliestAvailStartTime;
-  }
-  public function getEarliestAvailStartTime()
-  {
-    return $this->earliestAvailStartTime;
-  }
-  public function setEpisodeName($episodeName)
-  {
-    $this->episodeName = $episodeName;
-  }
-  public function getEpisodeName()
-  {
-    return $this->episodeName;
-  }
-  public function setLegacyPriority($legacyPriority)
-  {
-    $this->legacyPriority = $legacyPriority;
-  }
-  public function getLegacyPriority()
-  {
-    return $this->legacyPriority;
-  }
-  public function setName($name)
-  {
-    $this->name = $name;
-  }
-  public function getName()
-  {
-    return $this->name;
-  }
-  public function setNormalizedPriority($normalizedPriority)
-  {
-    $this->normalizedPriority = $normalizedPriority;
-  }
-  public function getNormalizedPriority()
-  {
-    return $this->normalizedPriority;
-  }
-  public function setOrderId($orderId)
-  {
-    $this->orderId = $orderId;
-  }
-  public function getOrderId()
-  {
-    return $this->orderId;
-  }
-  public function setOrderedTime($orderedTime)
-  {
-    $this->orderedTime = $orderedTime;
-  }
-  public function getOrderedTime()
-  {
-    return $this->orderedTime;
-  }
-  public function setPphName($pphName)
-  {
-    $this->pphName = $pphName;
-  }
-  public function getPphName()
-  {
-    return $this->pphName;
-  }
-  public function setPriority($priority)
-  {
-    $this->priority = $priority;
-  }
-  public function getPriority()
-  {
-    return $this->priority;
-  }
-  public function setReceivedTime($receivedTime)
-  {
-    $this->receivedTime = $receivedTime;
-  }
-  public function getReceivedTime()
-  {
-    return $this->receivedTime;
-  }
-  public function setRejectionNote($rejectionNote)
-  {
-    $this->rejectionNote = $rejectionNote;
-  }
-  public function getRejectionNote()
-  {
-    return $this->rejectionNote;
-  }
-  public function setSeasonName($seasonName)
-  {
-    $this->seasonName = $seasonName;
-  }
-  public function getSeasonName()
-  {
-    return $this->seasonName;
-  }
-  public function setShowName($showName)
-  {
-    $this->showName = $showName;
-  }
-  public function getShowName()
-  {
-    return $this->showName;
-  }
-  public function setStatus($status)
-  {
-    $this->status = $status;
-  }
-  public function getStatus()
-  {
-    return $this->status;
-  }
-  public function setStatusDetail($statusDetail)
-  {
-    $this->statusDetail = $statusDetail;
-  }
-  public function getStatusDetail()
-  {
-    return $this->statusDetail;
-  }
-  public function setStudioName($studioName)
-  {
-    $this->studioName = $studioName;
-  }
-  public function getStudioName()
-  {
-    return $this->studioName;
-  }
-  public function setType($type)
-  {
-    $this->type = $type;
-  }
-  public function getType()
-  {
-    return $this->type;
-  }
-  public function setVideoId($videoId)
-  {
-    $this->videoId = $videoId;
-  }
-  public function getVideoId()
-  {
-    return $this->videoId;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/PlayMovies/Resource/Accounts.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/PlayMovies/Resource/Accounts.php
deleted file mode 100644
index cdae3bf1..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/PlayMovies/Resource/Accounts.php
+++ /dev/null
@@ -1,28 +0,0 @@
-
- *   $playmoviespartnerService = new Google_Service_PlayMovies(...);
- *   $accounts = $playmoviespartnerService->accounts;
- *  
- */
-class Google_Service_PlayMovies_Resource_Accounts extends Google_Service_Resource
-{
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/PlayMovies/Resource/AccountsAvails.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/PlayMovies/Resource/AccountsAvails.php
deleted file mode 100644
index 36e258c1..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/PlayMovies/Resource/AccountsAvails.php
+++ /dev/null
@@ -1,82 +0,0 @@
-
- *   $playmoviespartnerService = new Google_Service_PlayMovies(...);
- *   $avails = $playmoviespartnerService->avails;
- *  
- */
-class Google_Service_PlayMovies_Resource_AccountsAvails extends Google_Service_Resource
-{
-  /**
-   * Get an Avail given its avail group id and avail id. (avails.get)
-   *
-   * @param string $accountId REQUIRED. See _General rules_ for more information
-   * about this field.
-   * @param string $availId REQUIRED. Avail ID.
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_PlayMovies_Avail
-   */
-  public function get($accountId, $availId, $optParams = array())
-  {
-    $params = array('accountId' => $accountId, 'availId' => $availId);
-    $params = array_merge($params, $optParams);
-    return $this->call('get', array($params), "Google_Service_PlayMovies_Avail");
-  }
-  /**
-   * List Avails owned or managed by the partner.
-   *
-   * See _Authentication and Authorization rules_ and _List methods rules_ for
-   * more information about this method. (avails.listAccountsAvails)
-   *
-   * @param string $accountId REQUIRED. See _General rules_ for more information
-   * about this field.
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param string title Filter that matches Avails with a
-   * `title_internal_alias`, `series_title_internal_alias`,
-   * `season_title_internal_alias`, or `episode_title_internal_alias` that
-   * contains the given case-insensitive title.
-   * @opt_param string pageToken See _List methods rules_ for info about this
-   * field.
-   * @opt_param string videoIds Filter Avails that match any of the given
-   * `video_id`s.
-   * @opt_param int pageSize See _List methods rules_ for info about this field.
-   * @opt_param string altIds Filter Avails that match (case-insensitive) any of
-   * the given partner-specific custom ids.
-   * @opt_param string pphNames See _List methods rules_ for info about this
-   * field.
-   * @opt_param string altId Filter Avails that match a case-insensitive, partner-
-   * specific custom id. NOTE: this field is deprecated and will be removed on V2;
-   * `alt_ids` should be used instead.
-   * @opt_param string studioNames See _List methods rules_ for info about this
-   * field.
-   * @opt_param string territories Filter Avails that match (case-insensitive) any
-   * of the given country codes, using the "ISO 3166-1 alpha-2" format (examples:
-   * "US", "us", "Us").
-   * @return Google_Service_PlayMovies_ListAvailsResponse
-   */
-  public function listAccountsAvails($accountId, $optParams = array())
-  {
-    $params = array('accountId' => $accountId);
-    $params = array_merge($params, $optParams);
-    return $this->call('list', array($params), "Google_Service_PlayMovies_ListAvailsResponse");
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/PlayMovies/Resource/AccountsComponents.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/PlayMovies/Resource/AccountsComponents.php
deleted file mode 100644
index 1dcd25fb..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/PlayMovies/Resource/AccountsComponents.php
+++ /dev/null
@@ -1,69 +0,0 @@
-
- *   $playmoviespartnerService = new Google_Service_PlayMovies(...);
- *   $components = $playmoviespartnerService->components;
- *  
- */
-class Google_Service_PlayMovies_Resource_AccountsComponents extends Google_Service_Resource
-{
-  /**
-   * List Components owned or managed by the partner. See _Authentication and
-   * Authorization rules_ and _List methods rules_ for more information about this
-   * method. (components.listAccountsComponents)
-   *
-   * @param string $accountId REQUIRED. See _General rules_ for more information
-   * about this field.
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param int pageSize See _List methods rules_ for info about this field.
-   * @opt_param string pageToken See _List methods rules_ for info about this
-   * field.
-   * @opt_param string pphNames See _List methods rules_ for info about this
-   * field.
-   * @opt_param string studioNames See _List methods rules_ for info about this
-   * field.
-   * @opt_param string titleLevelEidr Filter Components that match a given title-
-   * level EIDR.
-   * @opt_param string editLevelEidr Filter Components that match a given edit-
-   * level EIDR.
-   * @opt_param string status Filter Components that match one of the given
-   * status.
-   * @opt_param string customId Filter Components that match a case-insensitive
-   * partner-specific custom id.
-   * @opt_param string inventoryId InventoryID available in Common Manifest.
-   * @opt_param string presentationId PresentationID available in Common Manifest.
-   * @opt_param string playableSequenceId PlayableSequenceID available in Common
-   * Manifest.
-   * @opt_param string elId Experience ID, as defined by Google.
-   * @opt_param string altCutId Filter Components that match a case-insensitive,
-   * partner-specific Alternative Cut ID.
-   * @opt_param string filename Filter Components that match a case-insensitive
-   * substring of the physical name of the delivered file.
-   * @return Google_Service_PlayMovies_ListComponentsResponse
-   */
-  public function listAccountsComponents($accountId, $optParams = array())
-  {
-    $params = array('accountId' => $accountId);
-    $params = array_merge($params, $optParams);
-    return $this->call('list', array($params), "Google_Service_PlayMovies_ListComponentsResponse");
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/PlayMovies/Resource/AccountsComponentsType.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/PlayMovies/Resource/AccountsComponentsType.php
deleted file mode 100644
index e19aa37d..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/PlayMovies/Resource/AccountsComponentsType.php
+++ /dev/null
@@ -1,44 +0,0 @@
-
- *   $playmoviespartnerService = new Google_Service_PlayMovies(...);
- *   $type = $playmoviespartnerService->type;
- *  
- */
-class Google_Service_PlayMovies_Resource_AccountsComponentsType extends Google_Service_Resource
-{
-  /**
-   * Get a Component given its id. (type.get)
-   *
-   * @param string $accountId REQUIRED. See _General rules_ for more information
-   * about this field.
-   * @param string $componentId REQUIRED. Component ID.
-   * @param string $type REQUIRED. Component Type.
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_PlayMovies_Component
-   */
-  public function get($accountId, $componentId, $type, $optParams = array())
-  {
-    $params = array('accountId' => $accountId, 'componentId' => $componentId, 'type' => $type);
-    $params = array_merge($params, $optParams);
-    return $this->call('get', array($params), "Google_Service_PlayMovies_Component");
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/PlayMovies/Resource/AccountsExperienceLocales.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/PlayMovies/Resource/AccountsExperienceLocales.php
deleted file mode 100644
index 5100b158..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/PlayMovies/Resource/AccountsExperienceLocales.php
+++ /dev/null
@@ -1,79 +0,0 @@
-
- *   $playmoviespartnerService = new Google_Service_PlayMovies(...);
- *   $experienceLocales = $playmoviespartnerService->experienceLocales;
- *  
- */
-class Google_Service_PlayMovies_Resource_AccountsExperienceLocales extends Google_Service_Resource
-{
-  /**
-   * Get an ExperienceLocale given its id. See _Authentication and Authorization
-   * rules_ and _Get methods rules_ for more information about this method.
-   * (experienceLocales.get)
-   *
-   * @param string $accountId REQUIRED. See _General rules_ for more information
-   * about this field.
-   * @param string $elId REQUIRED. ExperienceLocale ID, as defined by Google.
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_PlayMovies_ExperienceLocale
-   */
-  public function get($accountId, $elId, $optParams = array())
-  {
-    $params = array('accountId' => $accountId, 'elId' => $elId);
-    $params = array_merge($params, $optParams);
-    return $this->call('get', array($params), "Google_Service_PlayMovies_ExperienceLocale");
-  }
-  /**
-   * List ExperienceLocales owned or managed by the partner. See _Authentication
-   * and Authorization rules_ and _List methods rules_ for more information about
-   * this method. (experienceLocales.listAccountsExperienceLocales)
-   *
-   * @param string $accountId REQUIRED. See _General rules_ for more information
-   * about this field.
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param int pageSize See _List methods rules_ for info about this field.
-   * @opt_param string pageToken See _List methods rules_ for info about this
-   * field.
-   * @opt_param string pphNames See _List methods rules_ for info about this
-   * field.
-   * @opt_param string studioNames See _List methods rules_ for info about this
-   * field.
-   * @opt_param string titleLevelEidr Filter ExperienceLocales that match a given
-   * title-level EIDR.
-   * @opt_param string editLevelEidr Filter ExperienceLocales that match a given
-   * edit-level EIDR.
-   * @opt_param string status Filter ExperienceLocales that match one of the given
-   * status.
-   * @opt_param string customId Filter ExperienceLocales that match a case-
-   * insensitive, partner-specific custom id.
-   * @opt_param string altCutId Filter ExperienceLocales that match a case-
-   * insensitive, partner-specific Alternative Cut ID.
-   * @return Google_Service_PlayMovies_ListExperienceLocalesResponse
-   */
-  public function listAccountsExperienceLocales($accountId, $optParams = array())
-  {
-    $params = array('accountId' => $accountId);
-    $params = array_merge($params, $optParams);
-    return $this->call('list', array($params), "Google_Service_PlayMovies_ListExperienceLocalesResponse");
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/PlayMovies/Resource/AccountsOrders.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/PlayMovies/Resource/AccountsOrders.php
deleted file mode 100644
index 0909ddd3..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/PlayMovies/Resource/AccountsOrders.php
+++ /dev/null
@@ -1,78 +0,0 @@
-
- *   $playmoviespartnerService = new Google_Service_PlayMovies(...);
- *   $orders = $playmoviespartnerService->orders;
- *  
- */
-class Google_Service_PlayMovies_Resource_AccountsOrders extends Google_Service_Resource
-{
-  /**
-   * Get an Order given its id.
-   *
-   * See _Authentication and Authorization rules_ and _Get methods rules_ for more
-   * information about this method. (orders.get)
-   *
-   * @param string $accountId REQUIRED. See _General rules_ for more information
-   * about this field.
-   * @param string $orderId REQUIRED. Order ID.
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_PlayMovies_Order
-   */
-  public function get($accountId, $orderId, $optParams = array())
-  {
-    $params = array('accountId' => $accountId, 'orderId' => $orderId);
-    $params = array_merge($params, $optParams);
-    return $this->call('get', array($params), "Google_Service_PlayMovies_Order");
-  }
-  /**
-   * List Orders owned or managed by the partner.
-   *
-   * See _Authentication and Authorization rules_ and _List methods rules_ for
-   * more information about this method. (orders.listAccountsOrders)
-   *
-   * @param string $accountId REQUIRED. See _General rules_ for more information
-   * about this field.
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param string pageToken See _List methods rules_ for info about this
-   * field.
-   * @opt_param string videoIds Filter Orders that match any of the given
-   * `video_id`s.
-   * @opt_param string customId Filter Orders that match a case-insensitive,
-   * partner-specific custom id.
-   * @opt_param int pageSize See _List methods rules_ for info about this field.
-   * @opt_param string pphNames See _List methods rules_ for info about this
-   * field.
-   * @opt_param string status Filter Orders that match one of the given status.
-   * @opt_param string name Filter that matches Orders with a `name`, `show`,
-   * `season` or `episode` that contains the given case-insensitive name.
-   * @opt_param string studioNames See _List methods rules_ for info about this
-   * field.
-   * @return Google_Service_PlayMovies_ListOrdersResponse
-   */
-  public function listAccountsOrders($accountId, $optParams = array())
-  {
-    $params = array('accountId' => $accountId);
-    $params = array_merge($params, $optParams);
-    return $this->call('list', array($params), "Google_Service_PlayMovies_ListOrdersResponse");
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/PlayMovies/Resource/AccountsStoreInfos.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/PlayMovies/Resource/AccountsStoreInfos.php
deleted file mode 100644
index 69754099..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/PlayMovies/Resource/AccountsStoreInfos.php
+++ /dev/null
@@ -1,66 +0,0 @@
-
- *   $playmoviespartnerService = new Google_Service_PlayMovies(...);
- *   $storeInfos = $playmoviespartnerService->storeInfos;
- *  
- */
-class Google_Service_PlayMovies_Resource_AccountsStoreInfos extends Google_Service_Resource
-{
-  /**
-   * List StoreInfos owned or managed by the partner.
-   *
-   * See _Authentication and Authorization rules_ and _List methods rules_ for
-   * more information about this method. (storeInfos.listAccountsStoreInfos)
-   *
-   * @param string $accountId REQUIRED. See _General rules_ for more information
-   * about this field.
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param string name Filter that matches StoreInfos with a `name` or
-   * `show_name` that contains the given case-insensitive name.
-   * @opt_param string studioNames See _List methods rules_ for info about this
-   * field.
-   * @opt_param string seasonIds Filter StoreInfos that match any of the given
-   * `season_id`s.
-   * @opt_param string pageToken See _List methods rules_ for info about this
-   * field.
-   * @opt_param string videoId Filter StoreInfos that match a given `video_id`.
-   * NOTE: this field is deprecated and will be removed on V2; `video_ids` should
-   * be used instead.
-   * @opt_param string videoIds Filter StoreInfos that match any of the given
-   * `video_id`s.
-   * @opt_param int pageSize See _List methods rules_ for info about this field.
-   * @opt_param string mids Filter StoreInfos that match any of the given `mid`s.
-   * @opt_param string pphNames See _List methods rules_ for info about this
-   * field.
-   * @opt_param string countries Filter StoreInfos that match (case-insensitive)
-   * any of the given country codes, using the "ISO 3166-1 alpha-2" format
-   * (examples: "US", "us", "Us").
-   * @return Google_Service_PlayMovies_ListStoreInfosResponse
-   */
-  public function listAccountsStoreInfos($accountId, $optParams = array())
-  {
-    $params = array('accountId' => $accountId);
-    $params = array_merge($params, $optParams);
-    return $this->call('list', array($params), "Google_Service_PlayMovies_ListStoreInfosResponse");
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/PlayMovies/Resource/AccountsStoreInfosCountry.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/PlayMovies/Resource/AccountsStoreInfosCountry.php
deleted file mode 100644
index 9d1c8686..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/PlayMovies/Resource/AccountsStoreInfosCountry.php
+++ /dev/null
@@ -1,47 +0,0 @@
-
- *   $playmoviespartnerService = new Google_Service_PlayMovies(...);
- *   $country = $playmoviespartnerService->country;
- *  
- */
-class Google_Service_PlayMovies_Resource_AccountsStoreInfosCountry extends Google_Service_Resource
-{
-  /**
-   * Get a StoreInfo given its video id and country.
-   *
-   * See _Authentication and Authorization rules_ and _Get methods rules_ for more
-   * information about this method. (country.get)
-   *
-   * @param string $accountId REQUIRED. See _General rules_ for more information
-   * about this field.
-   * @param string $videoId REQUIRED. Video ID.
-   * @param string $country REQUIRED. Edit country.
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_PlayMovies_StoreInfo
-   */
-  public function get($accountId, $videoId, $country, $optParams = array())
-  {
-    $params = array('accountId' => $accountId, 'videoId' => $videoId, 'country' => $country);
-    $params = array_merge($params, $optParams);
-    return $this->call('get', array($params), "Google_Service_PlayMovies_StoreInfo");
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/PlayMovies/StoreInfo.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/PlayMovies/StoreInfo.php
deleted file mode 100644
index 2f254506..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/PlayMovies/StoreInfo.php
+++ /dev/null
@@ -1,247 +0,0 @@
-audioTracks = $audioTracks;
-  }
-  public function getAudioTracks()
-  {
-    return $this->audioTracks;
-  }
-  public function setCountry($country)
-  {
-    $this->country = $country;
-  }
-  public function getCountry()
-  {
-    return $this->country;
-  }
-  public function setEditLevelEidr($editLevelEidr)
-  {
-    $this->editLevelEidr = $editLevelEidr;
-  }
-  public function getEditLevelEidr()
-  {
-    return $this->editLevelEidr;
-  }
-  public function setEpisodeNumber($episodeNumber)
-  {
-    $this->episodeNumber = $episodeNumber;
-  }
-  public function getEpisodeNumber()
-  {
-    return $this->episodeNumber;
-  }
-  public function setHasAudio51($hasAudio51)
-  {
-    $this->hasAudio51 = $hasAudio51;
-  }
-  public function getHasAudio51()
-  {
-    return $this->hasAudio51;
-  }
-  public function setHasEstOffer($hasEstOffer)
-  {
-    $this->hasEstOffer = $hasEstOffer;
-  }
-  public function getHasEstOffer()
-  {
-    return $this->hasEstOffer;
-  }
-  public function setHasHdOffer($hasHdOffer)
-  {
-    $this->hasHdOffer = $hasHdOffer;
-  }
-  public function getHasHdOffer()
-  {
-    return $this->hasHdOffer;
-  }
-  public function setHasInfoCards($hasInfoCards)
-  {
-    $this->hasInfoCards = $hasInfoCards;
-  }
-  public function getHasInfoCards()
-  {
-    return $this->hasInfoCards;
-  }
-  public function setHasSdOffer($hasSdOffer)
-  {
-    $this->hasSdOffer = $hasSdOffer;
-  }
-  public function getHasSdOffer()
-  {
-    return $this->hasSdOffer;
-  }
-  public function setHasVodOffer($hasVodOffer)
-  {
-    $this->hasVodOffer = $hasVodOffer;
-  }
-  public function getHasVodOffer()
-  {
-    return $this->hasVodOffer;
-  }
-  public function setLiveTime($liveTime)
-  {
-    $this->liveTime = $liveTime;
-  }
-  public function getLiveTime()
-  {
-    return $this->liveTime;
-  }
-  public function setMid($mid)
-  {
-    $this->mid = $mid;
-  }
-  public function getMid()
-  {
-    return $this->mid;
-  }
-  public function setName($name)
-  {
-    $this->name = $name;
-  }
-  public function getName()
-  {
-    return $this->name;
-  }
-  public function setPphNames($pphNames)
-  {
-    $this->pphNames = $pphNames;
-  }
-  public function getPphNames()
-  {
-    return $this->pphNames;
-  }
-  public function setSeasonId($seasonId)
-  {
-    $this->seasonId = $seasonId;
-  }
-  public function getSeasonId()
-  {
-    return $this->seasonId;
-  }
-  public function setSeasonName($seasonName)
-  {
-    $this->seasonName = $seasonName;
-  }
-  public function getSeasonName()
-  {
-    return $this->seasonName;
-  }
-  public function setSeasonNumber($seasonNumber)
-  {
-    $this->seasonNumber = $seasonNumber;
-  }
-  public function getSeasonNumber()
-  {
-    return $this->seasonNumber;
-  }
-  public function setShowId($showId)
-  {
-    $this->showId = $showId;
-  }
-  public function getShowId()
-  {
-    return $this->showId;
-  }
-  public function setShowName($showName)
-  {
-    $this->showName = $showName;
-  }
-  public function getShowName()
-  {
-    return $this->showName;
-  }
-  public function setStudioName($studioName)
-  {
-    $this->studioName = $studioName;
-  }
-  public function getStudioName()
-  {
-    return $this->studioName;
-  }
-  public function setSubtitles($subtitles)
-  {
-    $this->subtitles = $subtitles;
-  }
-  public function getSubtitles()
-  {
-    return $this->subtitles;
-  }
-  public function setTitleLevelEidr($titleLevelEidr)
-  {
-    $this->titleLevelEidr = $titleLevelEidr;
-  }
-  public function getTitleLevelEidr()
-  {
-    return $this->titleLevelEidr;
-  }
-  public function setTrailerId($trailerId)
-  {
-    $this->trailerId = $trailerId;
-  }
-  public function getTrailerId()
-  {
-    return $this->trailerId;
-  }
-  public function setType($type)
-  {
-    $this->type = $type;
-  }
-  public function getType()
-  {
-    return $this->type;
-  }
-  public function setVideoId($videoId)
-  {
-    $this->videoId = $videoId;
-  }
-  public function getVideoId()
-  {
-    return $this->videoId;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Playmoviespartner.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Playmoviespartner.php
deleted file mode 100644
index d86c8263..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Playmoviespartner.php
+++ /dev/null
@@ -1,339 +0,0 @@
-
- * Lets Google Play Movies Partners get the delivery status of their titles.

- *
- * 

- * For more information about this service, see the API
- * Documentation
- * 

- *
- * @author Google, Inc.
- */
-class Google_Service_Playmoviespartner extends Google_Service
-{
-  /** View the digital assets you publish on Google Play Movies and TV. */
-  const PLAYMOVIES_PARTNER_READONLY =
-      "https://www.googleapis.com/auth/playmovies_partner.readonly";
-
-  public $accounts_avails;
-  public $accounts_experienceLocales;
-  public $accounts_orders;
-  public $accounts_storeInfos;
-  public $accounts_storeInfos_country;
-  
-  /**
-   * Constructs the internal representation of the Playmoviespartner service.
-   *
-   * @param Google_Client $client
-   */
-  public function __construct(Google_Client $client)
-  {
-    parent::__construct($client);
-    $this->rootUrl = 'https://playmoviespartner.googleapis.com/';
-    $this->servicePath = '';
-    $this->version = 'v1';
-    $this->serviceName = 'playmoviespartner';
-
-    $this->accounts_avails = new Google_Service_Playmoviespartner_AccountsAvailsResource(
-        $this,
-        $this->serviceName,
-        'avails',
-        array(
-          'methods' => array(
-            'list' => array(
-              'path' => 'v1/accounts/{accountId}/avails',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'accountId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'pageSize' => array(
-                  'location' => 'query',
-                  'type' => 'integer',
-                ),
-                'pageToken' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'pphNames' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                  'repeated' => true,
-                ),
-                'studioNames' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                  'repeated' => true,
-                ),
-                'title' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'territories' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                  'repeated' => true,
-                ),
-                'altId' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'videoIds' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                  'repeated' => true,
-                ),
-              ),
-            ),
-          )
-        )
-    );
-    $this->accounts_experienceLocales = new Google_Service_Playmoviespartner_AccountsExperienceLocalesResource(
-        $this,
-        $this->serviceName,
-        'experienceLocales',
-        array(
-          'methods' => array(
-            'get' => array(
-              'path' => 'v1/accounts/{accountId}/experienceLocales/{elId}',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'accountId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'elId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'list' => array(
-              'path' => 'v1/accounts/{accountId}/experienceLocales',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'accountId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'pageSize' => array(
-                  'location' => 'query',
-                  'type' => 'integer',
-                ),
-                'pageToken' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'pphNames' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                  'repeated' => true,
-                ),
-                'studioNames' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                  'repeated' => true,
-                ),
-                'titleLevelEidr' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'editLevelEidr' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'status' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                  'repeated' => true,
-                ),
-                'customId' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'altCutId' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-              ),
-            ),
-          )
-        )
-    );
-    $this->accounts_orders = new Google_Service_Playmoviespartner_AccountsOrdersResource(
-        $this,
-        $this->serviceName,
-        'orders',
-        array(
-          'methods' => array(
-            'get' => array(
-              'path' => 'v1/accounts/{accountId}/orders/{orderId}',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'accountId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'orderId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'list' => array(
-              'path' => 'v1/accounts/{accountId}/orders',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'accountId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'pageSize' => array(
-                  'location' => 'query',
-                  'type' => 'integer',
-                ),
-                'pageToken' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'pphNames' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                  'repeated' => true,
-                ),
-                'studioNames' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                  'repeated' => true,
-                ),
-                'name' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'status' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                  'repeated' => true,
-                ),
-                'customId' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-              ),
-            ),
-          )
-        )
-    );
-    $this->accounts_storeInfos = new Google_Service_Playmoviespartner_AccountsStoreInfosResource(
-        $this,
-        $this->serviceName,
-        'storeInfos',
-        array(
-          'methods' => array(
-            'list' => array(
-              'path' => 'v1/accounts/{accountId}/storeInfos',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'accountId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'pageSize' => array(
-                  'location' => 'query',
-                  'type' => 'integer',
-                ),
-                'pageToken' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'pphNames' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                  'repeated' => true,
-                ),
-                'studioNames' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                  'repeated' => true,
-                ),
-                'videoId' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'countries' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                  'repeated' => true,
-                ),
-                'name' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'videoIds' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                  'repeated' => true,
-                ),
-              ),
-            ),
-          )
-        )
-    );
-    $this->accounts_storeInfos_country = new Google_Service_Playmoviespartner_AccountsStoreInfosCountryResource(
-        $this,
-        $this->serviceName,
-        'country',
-        array(
-          'methods' => array(
-            'get' => array(
-              'path' => 'v1/accounts/{accountId}/storeInfos/{videoId}/country/{country}',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'accountId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'videoId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'country' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),
-          )
-        )
-    );
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Playmoviespartner/AccountsAvailsResource.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Playmoviespartner/AccountsAvailsResource.php
deleted file mode 100644
index 24be08df..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Playmoviespartner/AccountsAvailsResource.php
+++ /dev/null
@@ -1,61 +0,0 @@
-
- *   $playmoviespartnerService = new Google_Service_Playmoviespartner(...);
- *   $avails = $playmoviespartnerService->avails;
- *  
- */
-class Google_Service_Playmoviespartner_AccountsAvailsResource extends Google_Service_Resource
-{
-  /**
-   * List Avails owned or managed by the partner. See _Authentication and
-   * Authorization rules_ and _List methods rules_ for more information about this
-   * method. (avails.listAccountsAvails)
-   *
-   * @param string $accountId REQUIRED. See _General rules_ for more information
-   * about this field.
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param int pageSize See _List methods rules_ for info about this field.
-   * @opt_param string pageToken See _List methods rules_ for info about this
-   * field.
-   * @opt_param string pphNames See _List methods rules_ for info about this
-   * field.
-   * @opt_param string studioNames See _List methods rules_ for info about this
-   * field.
-   * @opt_param string title Filter Avails that match a case-insensitive substring
-   * of the default Title name.
-   * @opt_param string territories Filter Avails that match (case-insensitive) any
-   * of the given country codes, using the "ISO 3166-1 alpha-2" format (examples:
-   * "US", "us", "Us").
-   * @opt_param string altId Filter Avails that match a case-insensitive, partner-
-   * specific custom id.
-   * @opt_param string videoIds Filter Avails that match any of the given
-   * `video_id`s.
-   * @return Google_Service_Playmoviespartner_ListAvailsResponse
-   */
-  public function listAccountsAvails($accountId, $optParams = array())
-  {
-    $params = array('accountId' => $accountId);
-    $params = array_merge($params, $optParams);
-    return $this->call('list', array($params), "Google_Service_Playmoviespartner_ListAvailsResponse");
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Playmoviespartner/AccountsExperienceLocalesResource.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Playmoviespartner/AccountsExperienceLocalesResource.php
deleted file mode 100644
index 8173afa1..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Playmoviespartner/AccountsExperienceLocalesResource.php
+++ /dev/null
@@ -1,79 +0,0 @@
-
- *   $playmoviespartnerService = new Google_Service_Playmoviespartner(...);
- *   $experienceLocales = $playmoviespartnerService->experienceLocales;
- *  
- */
-class Google_Service_Playmoviespartner_AccountsExperienceLocalesResource extends Google_Service_Resource
-{
-  /**
-   * Get an ExperienceLocale given its id. See _Authentication and Authorization
-   * rules_ and _Get methods rules_ for more information about this method.
-   * (experienceLocales.get)
-   *
-   * @param string $accountId REQUIRED. See _General rules_ for more information
-   * about this field.
-   * @param string $elId REQUIRED. ExperienceLocale ID, as defined by Google.
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Playmoviespartner_ExperienceLocale
-   */
-  public function get($accountId, $elId, $optParams = array())
-  {
-    $params = array('accountId' => $accountId, 'elId' => $elId);
-    $params = array_merge($params, $optParams);
-    return $this->call('get', array($params), "Google_Service_Playmoviespartner_ExperienceLocale");
-  }
-  /**
-   * List ExperienceLocales owned or managed by the partner. See _Authentication
-   * and Authorization rules_ and _List methods rules_ for more information about
-   * this method. (experienceLocales.listAccountsExperienceLocales)
-   *
-   * @param string $accountId REQUIRED. See _General rules_ for more information
-   * about this field.
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param int pageSize See _List methods rules_ for info about this field.
-   * @opt_param string pageToken See _List methods rules_ for info about this
-   * field.
-   * @opt_param string pphNames See _List methods rules_ for info about this
-   * field.
-   * @opt_param string studioNames See _List methods rules_ for info about this
-   * field.
-   * @opt_param string titleLevelEidr Filter ExperienceLocales that match a given
-   * title-level EIDR.
-   * @opt_param string editLevelEidr Filter ExperienceLocales that match a given
-   * edit-level EIDR.
-   * @opt_param string status Filter ExperienceLocales that match one of the given
-   * status.
-   * @opt_param string customId Filter ExperienceLocales that match a case-
-   * insensitive, partner-specific custom id.
-   * @opt_param string altCutId Filter ExperienceLocales that match a case-
-   * insensitive, partner-specific Alternative Cut ID.
-   * @return Google_Service_Playmoviespartner_ListExperienceLocalesResponse
-   */
-  public function listAccountsExperienceLocales($accountId, $optParams = array())
-  {
-    $params = array('accountId' => $accountId);
-    $params = array_merge($params, $optParams);
-    return $this->call('list', array($params), "Google_Service_Playmoviespartner_ListExperienceLocalesResponse");
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Playmoviespartner/AccountsOrdersResource.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Playmoviespartner/AccountsOrdersResource.php
deleted file mode 100644
index b1012d14..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Playmoviespartner/AccountsOrdersResource.php
+++ /dev/null
@@ -1,73 +0,0 @@
-
- *   $playmoviespartnerService = new Google_Service_Playmoviespartner(...);
- *   $orders = $playmoviespartnerService->orders;
- *  
- */
-class Google_Service_Playmoviespartner_AccountsOrdersResource extends Google_Service_Resource
-{
-  /**
-   * Get an Order given its id. See _Authentication and Authorization rules_ and
-   * _Get methods rules_ for more information about this method. (orders.get)
-   *
-   * @param string $accountId REQUIRED. See _General rules_ for more information
-   * about this field.
-   * @param string $orderId REQUIRED. Order ID.
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Playmoviespartner_Order
-   */
-  public function get($accountId, $orderId, $optParams = array())
-  {
-    $params = array('accountId' => $accountId, 'orderId' => $orderId);
-    $params = array_merge($params, $optParams);
-    return $this->call('get', array($params), "Google_Service_Playmoviespartner_Order");
-  }
-  /**
-   * List Orders owned or managed by the partner. See _Authentication and
-   * Authorization rules_ and _List methods rules_ for more information about this
-   * method. (orders.listAccountsOrders)
-   *
-   * @param string $accountId REQUIRED. See _General rules_ for more information
-   * about this field.
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param int pageSize See _List methods rules_ for info about this field.
-   * @opt_param string pageToken See _List methods rules_ for info about this
-   * field.
-   * @opt_param string pphNames See _List methods rules_ for info about this
-   * field.
-   * @opt_param string studioNames See _List methods rules_ for info about this
-   * field.
-   * @opt_param string name Filter Orders that match a title name (case-
-   * insensitive, sub-string match).
-   * @opt_param string status Filter Orders that match one of the given status.
-   * @opt_param string customId Filter Orders that match a case-insensitive,
-   * partner-specific custom id.
-   * @return Google_Service_Playmoviespartner_ListOrdersResponse
-   */
-  public function listAccountsOrders($accountId, $optParams = array())
-  {
-    $params = array('accountId' => $accountId);
-    $params = array_merge($params, $optParams);
-    return $this->call('list', array($params), "Google_Service_Playmoviespartner_ListOrdersResponse");
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Playmoviespartner/AccountsResource.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Playmoviespartner/AccountsResource.php
deleted file mode 100644
index 36f65d25..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Playmoviespartner/AccountsResource.php
+++ /dev/null
@@ -1,28 +0,0 @@
-
- *   $playmoviespartnerService = new Google_Service_Playmoviespartner(...);
- *   $accounts = $playmoviespartnerService->accounts;
- *  
- */
-class Google_Service_Playmoviespartner_AccountsResource extends Google_Service_Resource
-{
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Playmoviespartner/AccountsStoreInfosCountryResource.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Playmoviespartner/AccountsStoreInfosCountryResource.php
deleted file mode 100644
index f49667a0..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Playmoviespartner/AccountsStoreInfosCountryResource.php
+++ /dev/null
@@ -1,46 +0,0 @@
-
- *   $playmoviespartnerService = new Google_Service_Playmoviespartner(...);
- *   $country = $playmoviespartnerService->country;
- *  
- */
-class Google_Service_Playmoviespartner_AccountsStoreInfosCountryResource extends Google_Service_Resource
-{
-  /**
-   * Get a StoreInfo given its video id and country. See _Authentication and
-   * Authorization rules_ and _Get methods rules_ for more information about this
-   * method. (country.get)
-   *
-   * @param string $accountId REQUIRED. See _General rules_ for more information
-   * about this field.
-   * @param string $videoId REQUIRED. Video ID.
-   * @param string $country REQUIRED. Edit country.
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Playmoviespartner_StoreInfo
-   */
-  public function get($accountId, $videoId, $country, $optParams = array())
-  {
-    $params = array('accountId' => $accountId, 'videoId' => $videoId, 'country' => $country);
-    $params = array_merge($params, $optParams);
-    return $this->call('get', array($params), "Google_Service_Playmoviespartner_StoreInfo");
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Playmoviespartner/AccountsStoreInfosResource.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Playmoviespartner/AccountsStoreInfosResource.php
deleted file mode 100644
index 2cb9fcd1..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Playmoviespartner/AccountsStoreInfosResource.php
+++ /dev/null
@@ -1,62 +0,0 @@
-
- *   $playmoviespartnerService = new Google_Service_Playmoviespartner(...);
- *   $storeInfos = $playmoviespartnerService->storeInfos;
- *  
- */
-class Google_Service_Playmoviespartner_AccountsStoreInfosResource extends Google_Service_Resource
-{
-  /**
-   * List StoreInfos owned or managed by the partner. See _Authentication and
-   * Authorization rules_ and _List methods rules_ for more information about this
-   * method. (storeInfos.listAccountsStoreInfos)
-   *
-   * @param string $accountId REQUIRED. See _General rules_ for more information
-   * about this field.
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param int pageSize See _List methods rules_ for info about this field.
-   * @opt_param string pageToken See _List methods rules_ for info about this
-   * field.
-   * @opt_param string pphNames See _List methods rules_ for info about this
-   * field.
-   * @opt_param string studioNames See _List methods rules_ for info about this
-   * field.
-   * @opt_param string videoId Filter StoreInfos that match a given `video_id`.
-   * NOTE: this field is deprecated and will be removed on V2; `video_ids` should
-   * be used instead.
-   * @opt_param string countries Filter StoreInfos that match (case-insensitive)
-   * any of the given country codes, using the "ISO 3166-1 alpha-2" format
-   * (examples: "US", "us", "Us").
-   * @opt_param string name Filter StoreInfos that match a case-insensitive
-   * substring of the default name.
-   * @opt_param string videoIds Filter StoreInfos that match any of the given
-   * `video_id`s.
-   * @return Google_Service_Playmoviespartner_ListStoreInfosResponse
-   */
-  public function listAccountsStoreInfos($accountId, $optParams = array())
-  {
-    $params = array('accountId' => $accountId);
-    $params = array_merge($params, $optParams);
-    return $this->call('list', array($params), "Google_Service_Playmoviespartner_ListStoreInfosResponse");
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Playmoviespartner/Avail.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Playmoviespartner/Avail.php
deleted file mode 100644
index b17a5623..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Playmoviespartner/Avail.php
+++ /dev/null
@@ -1,310 +0,0 @@
-altId = $altId;
-  }
-  public function getAltId()
-  {
-    return $this->altId;
-  }
-  public function setCaptionExemption($captionExemption)
-  {
-    $this->captionExemption = $captionExemption;
-  }
-  public function getCaptionExemption()
-  {
-    return $this->captionExemption;
-  }
-  public function setCaptionIncluded($captionIncluded)
-  {
-    $this->captionIncluded = $captionIncluded;
-  }
-  public function getCaptionIncluded()
-  {
-    return $this->captionIncluded;
-  }
-  public function setContentId($contentId)
-  {
-    $this->contentId = $contentId;
-  }
-  public function getContentId()
-  {
-    return $this->contentId;
-  }
-  public function setDisplayName($displayName)
-  {
-    $this->displayName = $displayName;
-  }
-  public function getDisplayName()
-  {
-    return $this->displayName;
-  }
-  public function setEncodeId($encodeId)
-  {
-    $this->encodeId = $encodeId;
-  }
-  public function getEncodeId()
-  {
-    return $this->encodeId;
-  }
-  public function setEnd($end)
-  {
-    $this->end = $end;
-  }
-  public function getEnd()
-  {
-    return $this->end;
-  }
-  public function setEpisodeAltId($episodeAltId)
-  {
-    $this->episodeAltId = $episodeAltId;
-  }
-  public function getEpisodeAltId()
-  {
-    return $this->episodeAltId;
-  }
-  public function setEpisodeNumber($episodeNumber)
-  {
-    $this->episodeNumber = $episodeNumber;
-  }
-  public function getEpisodeNumber()
-  {
-    return $this->episodeNumber;
-  }
-  public function setEpisodeTitleInternalAlias($episodeTitleInternalAlias)
-  {
-    $this->episodeTitleInternalAlias = $episodeTitleInternalAlias;
-  }
-  public function getEpisodeTitleInternalAlias()
-  {
-    return $this->episodeTitleInternalAlias;
-  }
-  public function setFormatProfile($formatProfile)
-  {
-    $this->formatProfile = $formatProfile;
-  }
-  public function getFormatProfile()
-  {
-    return $this->formatProfile;
-  }
-  public function setLicenseType($licenseType)
-  {
-    $this->licenseType = $licenseType;
-  }
-  public function getLicenseType()
-  {
-    return $this->licenseType;
-  }
-  public function setPphNames($pphNames)
-  {
-    $this->pphNames = $pphNames;
-  }
-  public function getPphNames()
-  {
-    return $this->pphNames;
-  }
-  public function setPriceType($priceType)
-  {
-    $this->priceType = $priceType;
-  }
-  public function getPriceType()
-  {
-    return $this->priceType;
-  }
-  public function setPriceValue($priceValue)
-  {
-    $this->priceValue = $priceValue;
-  }
-  public function getPriceValue()
-  {
-    return $this->priceValue;
-  }
-  public function setProductId($productId)
-  {
-    $this->productId = $productId;
-  }
-  public function getProductId()
-  {
-    return $this->productId;
-  }
-  public function setRatingReason($ratingReason)
-  {
-    $this->ratingReason = $ratingReason;
-  }
-  public function getRatingReason()
-  {
-    return $this->ratingReason;
-  }
-  public function setRatingSystem($ratingSystem)
-  {
-    $this->ratingSystem = $ratingSystem;
-  }
-  public function getRatingSystem()
-  {
-    return $this->ratingSystem;
-  }
-  public function setRatingValue($ratingValue)
-  {
-    $this->ratingValue = $ratingValue;
-  }
-  public function getRatingValue()
-  {
-    return $this->ratingValue;
-  }
-  public function setReleaseDate($releaseDate)
-  {
-    $this->releaseDate = $releaseDate;
-  }
-  public function getReleaseDate()
-  {
-    return $this->releaseDate;
-  }
-  public function setSeasonAltId($seasonAltId)
-  {
-    $this->seasonAltId = $seasonAltId;
-  }
-  public function getSeasonAltId()
-  {
-    return $this->seasonAltId;
-  }
-  public function setSeasonNumber($seasonNumber)
-  {
-    $this->seasonNumber = $seasonNumber;
-  }
-  public function getSeasonNumber()
-  {
-    return $this->seasonNumber;
-  }
-  public function setSeasonTitleInternalAlias($seasonTitleInternalAlias)
-  {
-    $this->seasonTitleInternalAlias = $seasonTitleInternalAlias;
-  }
-  public function getSeasonTitleInternalAlias()
-  {
-    return $this->seasonTitleInternalAlias;
-  }
-  public function setSeriesAltId($seriesAltId)
-  {
-    $this->seriesAltId = $seriesAltId;
-  }
-  public function getSeriesAltId()
-  {
-    return $this->seriesAltId;
-  }
-  public function setSeriesTitleInternalAlias($seriesTitleInternalAlias)
-  {
-    $this->seriesTitleInternalAlias = $seriesTitleInternalAlias;
-  }
-  public function getSeriesTitleInternalAlias()
-  {
-    return $this->seriesTitleInternalAlias;
-  }
-  public function setStart($start)
-  {
-    $this->start = $start;
-  }
-  public function getStart()
-  {
-    return $this->start;
-  }
-  public function setStoreLanguage($storeLanguage)
-  {
-    $this->storeLanguage = $storeLanguage;
-  }
-  public function getStoreLanguage()
-  {
-    return $this->storeLanguage;
-  }
-  public function setSuppressionLiftDate($suppressionLiftDate)
-  {
-    $this->suppressionLiftDate = $suppressionLiftDate;
-  }
-  public function getSuppressionLiftDate()
-  {
-    return $this->suppressionLiftDate;
-  }
-  public function setTerritory($territory)
-  {
-    $this->territory = $territory;
-  }
-  public function getTerritory()
-  {
-    return $this->territory;
-  }
-  public function setTitleInternalAlias($titleInternalAlias)
-  {
-    $this->titleInternalAlias = $titleInternalAlias;
-  }
-  public function getTitleInternalAlias()
-  {
-    return $this->titleInternalAlias;
-  }
-  public function setVideoId($videoId)
-  {
-    $this->videoId = $videoId;
-  }
-  public function getVideoId()
-  {
-    return $this->videoId;
-  }
-  public function setWorkType($workType)
-  {
-    $this->workType = $workType;
-  }
-  public function getWorkType()
-  {
-    return $this->workType;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Playmoviespartner/ExperienceLocale.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Playmoviespartner/ExperienceLocale.php
deleted file mode 100644
index d9219b51..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Playmoviespartner/ExperienceLocale.php
+++ /dev/null
@@ -1,229 +0,0 @@
-altCutId = $altCutId;
-  }
-  public function getAltCutId()
-  {
-    return $this->altCutId;
-  }
-  public function setApprovedTime($approvedTime)
-  {
-    $this->approvedTime = $approvedTime;
-  }
-  public function getApprovedTime()
-  {
-    return $this->approvedTime;
-  }
-  public function setChannelId($channelId)
-  {
-    $this->channelId = $channelId;
-  }
-  public function getChannelId()
-  {
-    return $this->channelId;
-  }
-  public function setCountry($country)
-  {
-    $this->country = $country;
-  }
-  public function getCountry()
-  {
-    return $this->country;
-  }
-  public function setCreatedTime($createdTime)
-  {
-    $this->createdTime = $createdTime;
-  }
-  public function getCreatedTime()
-  {
-    return $this->createdTime;
-  }
-  public function setCustomIds($customIds)
-  {
-    $this->customIds = $customIds;
-  }
-  public function getCustomIds()
-  {
-    return $this->customIds;
-  }
-  public function setEarliestAvailStartTime($earliestAvailStartTime)
-  {
-    $this->earliestAvailStartTime = $earliestAvailStartTime;
-  }
-  public function getEarliestAvailStartTime()
-  {
-    return $this->earliestAvailStartTime;
-  }
-  public function setEditLevelEidr($editLevelEidr)
-  {
-    $this->editLevelEidr = $editLevelEidr;
-  }
-  public function getEditLevelEidr()
-  {
-    return $this->editLevelEidr;
-  }
-  public function setElId($elId)
-  {
-    $this->elId = $elId;
-  }
-  public function getElId()
-  {
-    return $this->elId;
-  }
-  public function setInventoryId($inventoryId)
-  {
-    $this->inventoryId = $inventoryId;
-  }
-  public function getInventoryId()
-  {
-    return $this->inventoryId;
-  }
-  public function setLanguage($language)
-  {
-    $this->language = $language;
-  }
-  public function getLanguage()
-  {
-    return $this->language;
-  }
-  public function setName($name)
-  {
-    $this->name = $name;
-  }
-  public function getName()
-  {
-    return $this->name;
-  }
-  public function setNormalizedPriority($normalizedPriority)
-  {
-    $this->normalizedPriority = $normalizedPriority;
-  }
-  public function getNormalizedPriority()
-  {
-    return $this->normalizedPriority;
-  }
-  public function setPlayableSequenceId($playableSequenceId)
-  {
-    $this->playableSequenceId = $playableSequenceId;
-  }
-  public function getPlayableSequenceId()
-  {
-    return $this->playableSequenceId;
-  }
-  public function setPphNames($pphNames)
-  {
-    $this->pphNames = $pphNames;
-  }
-  public function getPphNames()
-  {
-    return $this->pphNames;
-  }
-  public function setPresentationId($presentationId)
-  {
-    $this->presentationId = $presentationId;
-  }
-  public function getPresentationId()
-  {
-    return $this->presentationId;
-  }
-  public function setPriority($priority)
-  {
-    $this->priority = $priority;
-  }
-  public function getPriority()
-  {
-    return $this->priority;
-  }
-  public function setStatus($status)
-  {
-    $this->status = $status;
-  }
-  public function getStatus()
-  {
-    return $this->status;
-  }
-  public function setStudioName($studioName)
-  {
-    $this->studioName = $studioName;
-  }
-  public function getStudioName()
-  {
-    return $this->studioName;
-  }
-  public function setTitleLevelEidr($titleLevelEidr)
-  {
-    $this->titleLevelEidr = $titleLevelEidr;
-  }
-  public function getTitleLevelEidr()
-  {
-    return $this->titleLevelEidr;
-  }
-  public function setTrailerId($trailerId)
-  {
-    $this->trailerId = $trailerId;
-  }
-  public function getTrailerId()
-  {
-    return $this->trailerId;
-  }
-  public function setType($type)
-  {
-    $this->type = $type;
-  }
-  public function getType()
-  {
-    return $this->type;
-  }
-  public function setVideoId($videoId)
-  {
-    $this->videoId = $videoId;
-  }
-  public function getVideoId()
-  {
-    return $this->videoId;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Playmoviespartner/ListAvailsResponse.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Playmoviespartner/ListAvailsResponse.php
deleted file mode 100644
index a20847e5..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Playmoviespartner/ListAvailsResponse.php
+++ /dev/null
@@ -1,41 +0,0 @@
-avails = $avails;
-  }
-  public function getAvails()
-  {
-    return $this->avails;
-  }
-  public function setNextPageToken($nextPageToken)
-  {
-    $this->nextPageToken = $nextPageToken;
-  }
-  public function getNextPageToken()
-  {
-    return $this->nextPageToken;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Playmoviespartner/ListExperienceLocalesResponse.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Playmoviespartner/ListExperienceLocalesResponse.php
deleted file mode 100644
index 3c3a475c..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Playmoviespartner/ListExperienceLocalesResponse.php
+++ /dev/null
@@ -1,41 +0,0 @@
-experienceLocales = $experienceLocales;
-  }
-  public function getExperienceLocales()
-  {
-    return $this->experienceLocales;
-  }
-  public function setNextPageToken($nextPageToken)
-  {
-    $this->nextPageToken = $nextPageToken;
-  }
-  public function getNextPageToken()
-  {
-    return $this->nextPageToken;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Playmoviespartner/ListOrdersResponse.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Playmoviespartner/ListOrdersResponse.php
deleted file mode 100644
index dc39cb36..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Playmoviespartner/ListOrdersResponse.php
+++ /dev/null
@@ -1,41 +0,0 @@
-nextPageToken = $nextPageToken;
-  }
-  public function getNextPageToken()
-  {
-    return $this->nextPageToken;
-  }
-  public function setOrders($orders)
-  {
-    $this->orders = $orders;
-  }
-  public function getOrders()
-  {
-    return $this->orders;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Playmoviespartner/ListStoreInfosResponse.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Playmoviespartner/ListStoreInfosResponse.php
deleted file mode 100644
index bc953255..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Playmoviespartner/ListStoreInfosResponse.php
+++ /dev/null
@@ -1,41 +0,0 @@
-nextPageToken = $nextPageToken;
-  }
-  public function getNextPageToken()
-  {
-    return $this->nextPageToken;
-  }
-  public function setStoreInfos($storeInfos)
-  {
-    $this->storeInfos = $storeInfos;
-  }
-  public function getStoreInfos()
-  {
-    return $this->storeInfos;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Playmoviespartner/Order.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Playmoviespartner/Order.php
deleted file mode 100644
index 44664f20..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Playmoviespartner/Order.php
+++ /dev/null
@@ -1,229 +0,0 @@
-approvedTime = $approvedTime;
-  }
-  public function getApprovedTime()
-  {
-    return $this->approvedTime;
-  }
-  public function setChannelId($channelId)
-  {
-    $this->channelId = $channelId;
-  }
-  public function getChannelId()
-  {
-    return $this->channelId;
-  }
-  public function setChannelName($channelName)
-  {
-    $this->channelName = $channelName;
-  }
-  public function getChannelName()
-  {
-    return $this->channelName;
-  }
-  public function setCountries($countries)
-  {
-    $this->countries = $countries;
-  }
-  public function getCountries()
-  {
-    return $this->countries;
-  }
-  public function setCustomId($customId)
-  {
-    $this->customId = $customId;
-  }
-  public function getCustomId()
-  {
-    return $this->customId;
-  }
-  public function setEarliestAvailStartTime($earliestAvailStartTime)
-  {
-    $this->earliestAvailStartTime = $earliestAvailStartTime;
-  }
-  public function getEarliestAvailStartTime()
-  {
-    return $this->earliestAvailStartTime;
-  }
-  public function setEpisodeName($episodeName)
-  {
-    $this->episodeName = $episodeName;
-  }
-  public function getEpisodeName()
-  {
-    return $this->episodeName;
-  }
-  public function setLegacyPriority($legacyPriority)
-  {
-    $this->legacyPriority = $legacyPriority;
-  }
-  public function getLegacyPriority()
-  {
-    return $this->legacyPriority;
-  }
-  public function setName($name)
-  {
-    $this->name = $name;
-  }
-  public function getName()
-  {
-    return $this->name;
-  }
-  public function setNormalizedPriority($normalizedPriority)
-  {
-    $this->normalizedPriority = $normalizedPriority;
-  }
-  public function getNormalizedPriority()
-  {
-    return $this->normalizedPriority;
-  }
-  public function setOrderId($orderId)
-  {
-    $this->orderId = $orderId;
-  }
-  public function getOrderId()
-  {
-    return $this->orderId;
-  }
-  public function setOrderedTime($orderedTime)
-  {
-    $this->orderedTime = $orderedTime;
-  }
-  public function getOrderedTime()
-  {
-    return $this->orderedTime;
-  }
-  public function setPphName($pphName)
-  {
-    $this->pphName = $pphName;
-  }
-  public function getPphName()
-  {
-    return $this->pphName;
-  }
-  public function setPriority($priority)
-  {
-    $this->priority = $priority;
-  }
-  public function getPriority()
-  {
-    return $this->priority;
-  }
-  public function setReceivedTime($receivedTime)
-  {
-    $this->receivedTime = $receivedTime;
-  }
-  public function getReceivedTime()
-  {
-    return $this->receivedTime;
-  }
-  public function setRejectionNote($rejectionNote)
-  {
-    $this->rejectionNote = $rejectionNote;
-  }
-  public function getRejectionNote()
-  {
-    return $this->rejectionNote;
-  }
-  public function setSeasonName($seasonName)
-  {
-    $this->seasonName = $seasonName;
-  }
-  public function getSeasonName()
-  {
-    return $this->seasonName;
-  }
-  public function setShowName($showName)
-  {
-    $this->showName = $showName;
-  }
-  public function getShowName()
-  {
-    return $this->showName;
-  }
-  public function setStatus($status)
-  {
-    $this->status = $status;
-  }
-  public function getStatus()
-  {
-    return $this->status;
-  }
-  public function setStatusDetail($statusDetail)
-  {
-    $this->statusDetail = $statusDetail;
-  }
-  public function getStatusDetail()
-  {
-    return $this->statusDetail;
-  }
-  public function setStudioName($studioName)
-  {
-    $this->studioName = $studioName;
-  }
-  public function getStudioName()
-  {
-    return $this->studioName;
-  }
-  public function setType($type)
-  {
-    $this->type = $type;
-  }
-  public function getType()
-  {
-    return $this->type;
-  }
-  public function setVideoId($videoId)
-  {
-    $this->videoId = $videoId;
-  }
-  public function getVideoId()
-  {
-    return $this->videoId;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Playmoviespartner/StoreInfo.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Playmoviespartner/StoreInfo.php
deleted file mode 100644
index ac24337b..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Playmoviespartner/StoreInfo.php
+++ /dev/null
@@ -1,247 +0,0 @@
-audioTracks = $audioTracks;
-  }
-  public function getAudioTracks()
-  {
-    return $this->audioTracks;
-  }
-  public function setCountry($country)
-  {
-    $this->country = $country;
-  }
-  public function getCountry()
-  {
-    return $this->country;
-  }
-  public function setEditLevelEidr($editLevelEidr)
-  {
-    $this->editLevelEidr = $editLevelEidr;
-  }
-  public function getEditLevelEidr()
-  {
-    return $this->editLevelEidr;
-  }
-  public function setEpisodeNumber($episodeNumber)
-  {
-    $this->episodeNumber = $episodeNumber;
-  }
-  public function getEpisodeNumber()
-  {
-    return $this->episodeNumber;
-  }
-  public function setHasAudio51($hasAudio51)
-  {
-    $this->hasAudio51 = $hasAudio51;
-  }
-  public function getHasAudio51()
-  {
-    return $this->hasAudio51;
-  }
-  public function setHasEstOffer($hasEstOffer)
-  {
-    $this->hasEstOffer = $hasEstOffer;
-  }
-  public function getHasEstOffer()
-  {
-    return $this->hasEstOffer;
-  }
-  public function setHasHdOffer($hasHdOffer)
-  {
-    $this->hasHdOffer = $hasHdOffer;
-  }
-  public function getHasHdOffer()
-  {
-    return $this->hasHdOffer;
-  }
-  public function setHasInfoCards($hasInfoCards)
-  {
-    $this->hasInfoCards = $hasInfoCards;
-  }
-  public function getHasInfoCards()
-  {
-    return $this->hasInfoCards;
-  }
-  public function setHasSdOffer($hasSdOffer)
-  {
-    $this->hasSdOffer = $hasSdOffer;
-  }
-  public function getHasSdOffer()
-  {
-    return $this->hasSdOffer;
-  }
-  public function setHasVodOffer($hasVodOffer)
-  {
-    $this->hasVodOffer = $hasVodOffer;
-  }
-  public function getHasVodOffer()
-  {
-    return $this->hasVodOffer;
-  }
-  public function setLiveTime($liveTime)
-  {
-    $this->liveTime = $liveTime;
-  }
-  public function getLiveTime()
-  {
-    return $this->liveTime;
-  }
-  public function setMid($mid)
-  {
-    $this->mid = $mid;
-  }
-  public function getMid()
-  {
-    return $this->mid;
-  }
-  public function setName($name)
-  {
-    $this->name = $name;
-  }
-  public function getName()
-  {
-    return $this->name;
-  }
-  public function setPphNames($pphNames)
-  {
-    $this->pphNames = $pphNames;
-  }
-  public function getPphNames()
-  {
-    return $this->pphNames;
-  }
-  public function setSeasonId($seasonId)
-  {
-    $this->seasonId = $seasonId;
-  }
-  public function getSeasonId()
-  {
-    return $this->seasonId;
-  }
-  public function setSeasonName($seasonName)
-  {
-    $this->seasonName = $seasonName;
-  }
-  public function getSeasonName()
-  {
-    return $this->seasonName;
-  }
-  public function setSeasonNumber($seasonNumber)
-  {
-    $this->seasonNumber = $seasonNumber;
-  }
-  public function getSeasonNumber()
-  {
-    return $this->seasonNumber;
-  }
-  public function setShowId($showId)
-  {
-    $this->showId = $showId;
-  }
-  public function getShowId()
-  {
-    return $this->showId;
-  }
-  public function setShowName($showName)
-  {
-    $this->showName = $showName;
-  }
-  public function getShowName()
-  {
-    return $this->showName;
-  }
-  public function setStudioName($studioName)
-  {
-    $this->studioName = $studioName;
-  }
-  public function getStudioName()
-  {
-    return $this->studioName;
-  }
-  public function setSubtitles($subtitles)
-  {
-    $this->subtitles = $subtitles;
-  }
-  public function getSubtitles()
-  {
-    return $this->subtitles;
-  }
-  public function setTitleLevelEidr($titleLevelEidr)
-  {
-    $this->titleLevelEidr = $titleLevelEidr;
-  }
-  public function getTitleLevelEidr()
-  {
-    return $this->titleLevelEidr;
-  }
-  public function setTrailerId($trailerId)
-  {
-    $this->trailerId = $trailerId;
-  }
-  public function getTrailerId()
-  {
-    return $this->trailerId;
-  }
-  public function setType($type)
-  {
-    $this->type = $type;
-  }
-  public function getType()
-  {
-    return $this->type;
-  }
-  public function setVideoId($videoId)
-  {
-    $this->videoId = $videoId;
-  }
-  public function getVideoId()
-  {
-    return $this->videoId;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Plus.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Plus.php
deleted file mode 100644
index df3e8029..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Plus.php
+++ /dev/null
@@ -1,267 +0,0 @@
-
- * Builds on top of the Google+ platform.

- *
- * 

- * For more information about this service, see the API
- * Documentation
- * 

- *
- * @author Google, Inc.
- */
-class Google_Service_Plus extends Google_Service
-{
-  /** Know the list of people in your circles, your age range, and language. */
-  const PLUS_LOGIN =
-      "https://www.googleapis.com/auth/plus.login";
-  /** Know who you are on Google. */
-  const PLUS_ME =
-      "https://www.googleapis.com/auth/plus.me";
-  /** View your email address. */
-  const USERINFO_EMAIL =
-      "https://www.googleapis.com/auth/userinfo.email";
-  /** View your basic profile info. */
-  const USERINFO_PROFILE =
-      "https://www.googleapis.com/auth/userinfo.profile";
-
-  public $activities;
-  public $comments;
-  public $people;
-  
-  /**
-   * Constructs the internal representation of the Plus service.
-   *
-   * @param Google_Client $client
-   */
-  public function __construct(Google_Client $client)
-  {
-    parent::__construct($client);
-    $this->rootUrl = 'https://www.googleapis.com/';
-    $this->servicePath = 'plus/v1/';
-    $this->version = 'v1';
-    $this->serviceName = 'plus';
-
-    $this->activities = new Google_Service_Plus_Resource_Activities(
-        $this,
-        $this->serviceName,
-        'activities',
-        array(
-          'methods' => array(
-            'get' => array(
-              'path' => 'activities/{activityId}',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'activityId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'list' => array(
-              'path' => 'people/{userId}/activities/{collection}',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'userId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'collection' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'maxResults' => array(
-                  'location' => 'query',
-                  'type' => 'integer',
-                ),
-                'pageToken' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-              ),
-            ),'search' => array(
-              'path' => 'activities',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'query' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'language' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'maxResults' => array(
-                  'location' => 'query',
-                  'type' => 'integer',
-                ),
-                'orderBy' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'pageToken' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-              ),
-            ),
-          )
-        )
-    );
-    $this->comments = new Google_Service_Plus_Resource_Comments(
-        $this,
-        $this->serviceName,
-        'comments',
-        array(
-          'methods' => array(
-            'get' => array(
-              'path' => 'comments/{commentId}',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'commentId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'list' => array(
-              'path' => 'activities/{activityId}/comments',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'activityId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'maxResults' => array(
-                  'location' => 'query',
-                  'type' => 'integer',
-                ),
-                'pageToken' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'sortOrder' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-              ),
-            ),
-          )
-        )
-    );
-    $this->people = new Google_Service_Plus_Resource_People(
-        $this,
-        $this->serviceName,
-        'people',
-        array(
-          'methods' => array(
-            'get' => array(
-              'path' => 'people/{userId}',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'userId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'list' => array(
-              'path' => 'people/{userId}/people/{collection}',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'userId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'collection' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'maxResults' => array(
-                  'location' => 'query',
-                  'type' => 'integer',
-                ),
-                'orderBy' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'pageToken' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-              ),
-            ),'listByActivity' => array(
-              'path' => 'activities/{activityId}/people/{collection}',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'activityId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'collection' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'maxResults' => array(
-                  'location' => 'query',
-                  'type' => 'integer',
-                ),
-                'pageToken' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-              ),
-            ),'search' => array(
-              'path' => 'people',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'query' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'language' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'maxResults' => array(
-                  'location' => 'query',
-                  'type' => 'integer',
-                ),
-                'pageToken' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-              ),
-            ),
-          )
-        )
-    );
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Plus/Acl.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Plus/Acl.php
deleted file mode 100644
index 642ecf05..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Plus/Acl.php
+++ /dev/null
@@ -1,50 +0,0 @@
-description = $description;
-  }
-  public function getDescription()
-  {
-    return $this->description;
-  }
-  public function setItems($items)
-  {
-    $this->items = $items;
-  }
-  public function getItems()
-  {
-    return $this->items;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Plus/Activity.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Plus/Activity.php
deleted file mode 100644
index c375517b..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Plus/Activity.php
+++ /dev/null
@@ -1,206 +0,0 @@
-access = $access;
-  }
-  public function getAccess()
-  {
-    return $this->access;
-  }
-  public function setActor(Google_Service_Plus_ActivityActor $actor)
-  {
-    $this->actor = $actor;
-  }
-  public function getActor()
-  {
-    return $this->actor;
-  }
-  public function setAddress($address)
-  {
-    $this->address = $address;
-  }
-  public function getAddress()
-  {
-    return $this->address;
-  }
-  public function setAnnotation($annotation)
-  {
-    $this->annotation = $annotation;
-  }
-  public function getAnnotation()
-  {
-    return $this->annotation;
-  }
-  public function setCrosspostSource($crosspostSource)
-  {
-    $this->crosspostSource = $crosspostSource;
-  }
-  public function getCrosspostSource()
-  {
-    return $this->crosspostSource;
-  }
-  public function setEtag($etag)
-  {
-    $this->etag = $etag;
-  }
-  public function getEtag()
-  {
-    return $this->etag;
-  }
-  public function setGeocode($geocode)
-  {
-    $this->geocode = $geocode;
-  }
-  public function getGeocode()
-  {
-    return $this->geocode;
-  }
-  public function setId($id)
-  {
-    $this->id = $id;
-  }
-  public function getId()
-  {
-    return $this->id;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setLocation(Google_Service_Plus_Place $location)
-  {
-    $this->location = $location;
-  }
-  public function getLocation()
-  {
-    return $this->location;
-  }
-  public function setObject(Google_Service_Plus_ActivityObject $object)
-  {
-    $this->object = $object;
-  }
-  public function getObject()
-  {
-    return $this->object;
-  }
-  public function setPlaceId($placeId)
-  {
-    $this->placeId = $placeId;
-  }
-  public function getPlaceId()
-  {
-    return $this->placeId;
-  }
-  public function setPlaceName($placeName)
-  {
-    $this->placeName = $placeName;
-  }
-  public function getPlaceName()
-  {
-    return $this->placeName;
-  }
-  public function setProvider(Google_Service_Plus_ActivityProvider $provider)
-  {
-    $this->provider = $provider;
-  }
-  public function getProvider()
-  {
-    return $this->provider;
-  }
-  public function setPublished($published)
-  {
-    $this->published = $published;
-  }
-  public function getPublished()
-  {
-    return $this->published;
-  }
-  public function setRadius($radius)
-  {
-    $this->radius = $radius;
-  }
-  public function getRadius()
-  {
-    return $this->radius;
-  }
-  public function setTitle($title)
-  {
-    $this->title = $title;
-  }
-  public function getTitle()
-  {
-    return $this->title;
-  }
-  public function setUpdated($updated)
-  {
-    $this->updated = $updated;
-  }
-  public function getUpdated()
-  {
-    return $this->updated;
-  }
-  public function setUrl($url)
-  {
-    $this->url = $url;
-  }
-  public function getUrl()
-  {
-    return $this->url;
-  }
-  public function setVerb($verb)
-  {
-    $this->verb = $verb;
-  }
-  public function getVerb()
-  {
-    return $this->verb;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Plus/ActivityActor.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Plus/ActivityActor.php
deleted file mode 100644
index 68514e9c..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Plus/ActivityActor.php
+++ /dev/null
@@ -1,88 +0,0 @@
-clientSpecificActorInfo = $clientSpecificActorInfo;
-  }
-  public function getClientSpecificActorInfo()
-  {
-    return $this->clientSpecificActorInfo;
-  }
-  public function setDisplayName($displayName)
-  {
-    $this->displayName = $displayName;
-  }
-  public function getDisplayName()
-  {
-    return $this->displayName;
-  }
-  public function setId($id)
-  {
-    $this->id = $id;
-  }
-  public function getId()
-  {
-    return $this->id;
-  }
-  public function setImage(Google_Service_Plus_ActivityActorImage $image)
-  {
-    $this->image = $image;
-  }
-  public function getImage()
-  {
-    return $this->image;
-  }
-  public function setName(Google_Service_Plus_ActivityActorName $name)
-  {
-    $this->name = $name;
-  }
-  public function getName()
-  {
-    return $this->name;
-  }
-  public function setUrl($url)
-  {
-    $this->url = $url;
-  }
-  public function getUrl()
-  {
-    return $this->url;
-  }
-  public function setVerification(Google_Service_Plus_ActivityActorVerification $verification)
-  {
-    $this->verification = $verification;
-  }
-  public function getVerification()
-  {
-    return $this->verification;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Plus/ActivityActorClientSpecificActorInfo.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Plus/ActivityActorClientSpecificActorInfo.php
deleted file mode 100644
index 22c5caa1..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Plus/ActivityActorClientSpecificActorInfo.php
+++ /dev/null
@@ -1,31 +0,0 @@
-youtubeActorInfo = $youtubeActorInfo;
-  }
-  public function getYoutubeActorInfo()
-  {
-    return $this->youtubeActorInfo;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Plus/ActivityActorClientSpecificActorInfoYoutubeActorInfo.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Plus/ActivityActorClientSpecificActorInfoYoutubeActorInfo.php
deleted file mode 100644
index 0de9b6f5..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Plus/ActivityActorClientSpecificActorInfoYoutubeActorInfo.php
+++ /dev/null
@@ -1,30 +0,0 @@
-channelId = $channelId;
-  }
-  public function getChannelId()
-  {
-    return $this->channelId;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Plus/ActivityActorImage.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Plus/ActivityActorImage.php
deleted file mode 100644
index ace967fd..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Plus/ActivityActorImage.php
+++ /dev/null
@@ -1,30 +0,0 @@
-url = $url;
-  }
-  public function getUrl()
-  {
-    return $this->url;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Plus/ActivityActorName.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Plus/ActivityActorName.php
deleted file mode 100644
index d589ea52..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Plus/ActivityActorName.php
+++ /dev/null
@@ -1,39 +0,0 @@
-familyName = $familyName;
-  }
-  public function getFamilyName()
-  {
-    return $this->familyName;
-  }
-  public function setGivenName($givenName)
-  {
-    $this->givenName = $givenName;
-  }
-  public function getGivenName()
-  {
-    return $this->givenName;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Plus/ActivityActorVerification.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Plus/ActivityActorVerification.php
deleted file mode 100644
index 72226325..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Plus/ActivityActorVerification.php
+++ /dev/null
@@ -1,30 +0,0 @@
-adHocVerified = $adHocVerified;
-  }
-  public function getAdHocVerified()
-  {
-    return $this->adHocVerified;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Plus/ActivityFeed.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Plus/ActivityFeed.php
deleted file mode 100644
index 81bf62e6..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Plus/ActivityFeed.php
+++ /dev/null
@@ -1,104 +0,0 @@
-etag = $etag;
-  }
-  public function getEtag()
-  {
-    return $this->etag;
-  }
-  public function setId($id)
-  {
-    $this->id = $id;
-  }
-  public function getId()
-  {
-    return $this->id;
-  }
-  public function setItems($items)
-  {
-    $this->items = $items;
-  }
-  public function getItems()
-  {
-    return $this->items;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setNextLink($nextLink)
-  {
-    $this->nextLink = $nextLink;
-  }
-  public function getNextLink()
-  {
-    return $this->nextLink;
-  }
-  public function setNextPageToken($nextPageToken)
-  {
-    $this->nextPageToken = $nextPageToken;
-  }
-  public function getNextPageToken()
-  {
-    return $this->nextPageToken;
-  }
-  public function setSelfLink($selfLink)
-  {
-    $this->selfLink = $selfLink;
-  }
-  public function getSelfLink()
-  {
-    return $this->selfLink;
-  }
-  public function setTitle($title)
-  {
-    $this->title = $title;
-  }
-  public function getTitle()
-  {
-    return $this->title;
-  }
-  public function setUpdated($updated)
-  {
-    $this->updated = $updated;
-  }
-  public function getUpdated()
-  {
-    return $this->updated;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Plus/ActivityObject.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Plus/ActivityObject.php
deleted file mode 100644
index aa682d09..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Plus/ActivityObject.php
+++ /dev/null
@@ -1,117 +0,0 @@
-actor = $actor;
-  }
-  public function getActor()
-  {
-    return $this->actor;
-  }
-  public function setAttachments($attachments)
-  {
-    $this->attachments = $attachments;
-  }
-  public function getAttachments()
-  {
-    return $this->attachments;
-  }
-  public function setContent($content)
-  {
-    $this->content = $content;
-  }
-  public function getContent()
-  {
-    return $this->content;
-  }
-  public function setId($id)
-  {
-    $this->id = $id;
-  }
-  public function getId()
-  {
-    return $this->id;
-  }
-  public function setObjectType($objectType)
-  {
-    $this->objectType = $objectType;
-  }
-  public function getObjectType()
-  {
-    return $this->objectType;
-  }
-  public function setOriginalContent($originalContent)
-  {
-    $this->originalContent = $originalContent;
-  }
-  public function getOriginalContent()
-  {
-    return $this->originalContent;
-  }
-  public function setPlusoners(Google_Service_Plus_ActivityObjectPlusoners $plusoners)
-  {
-    $this->plusoners = $plusoners;
-  }
-  public function getPlusoners()
-  {
-    return $this->plusoners;
-  }
-  public function setReplies(Google_Service_Plus_ActivityObjectReplies $replies)
-  {
-    $this->replies = $replies;
-  }
-  public function getReplies()
-  {
-    return $this->replies;
-  }
-  public function setResharers(Google_Service_Plus_ActivityObjectResharers $resharers)
-  {
-    $this->resharers = $resharers;
-  }
-  public function getResharers()
-  {
-    return $this->resharers;
-  }
-  public function setUrl($url)
-  {
-    $this->url = $url;
-  }
-  public function getUrl()
-  {
-    return $this->url;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Plus/ActivityObjectActor.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Plus/ActivityObjectActor.php
deleted file mode 100644
index 786d35d0..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Plus/ActivityObjectActor.php
+++ /dev/null
@@ -1,78 +0,0 @@
-clientSpecificActorInfo = $clientSpecificActorInfo;
-  }
-  public function getClientSpecificActorInfo()
-  {
-    return $this->clientSpecificActorInfo;
-  }
-  public function setDisplayName($displayName)
-  {
-    $this->displayName = $displayName;
-  }
-  public function getDisplayName()
-  {
-    return $this->displayName;
-  }
-  public function setId($id)
-  {
-    $this->id = $id;
-  }
-  public function getId()
-  {
-    return $this->id;
-  }
-  public function setImage(Google_Service_Plus_ActivityObjectActorImage $image)
-  {
-    $this->image = $image;
-  }
-  public function getImage()
-  {
-    return $this->image;
-  }
-  public function setUrl($url)
-  {
-    $this->url = $url;
-  }
-  public function getUrl()
-  {
-    return $this->url;
-  }
-  public function setVerification(Google_Service_Plus_ActivityObjectActorVerification $verification)
-  {
-    $this->verification = $verification;
-  }
-  public function getVerification()
-  {
-    return $this->verification;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Plus/ActivityObjectActorClientSpecificActorInfo.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Plus/ActivityObjectActorClientSpecificActorInfo.php
deleted file mode 100644
index 0c8c8069..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Plus/ActivityObjectActorClientSpecificActorInfo.php
+++ /dev/null
@@ -1,31 +0,0 @@
-youtubeActorInfo = $youtubeActorInfo;
-  }
-  public function getYoutubeActorInfo()
-  {
-    return $this->youtubeActorInfo;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Plus/ActivityObjectActorClientSpecificActorInfoYoutubeActorInfo.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Plus/ActivityObjectActorClientSpecificActorInfoYoutubeActorInfo.php
deleted file mode 100644
index 991c6d73..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Plus/ActivityObjectActorClientSpecificActorInfoYoutubeActorInfo.php
+++ /dev/null
@@ -1,30 +0,0 @@
-channelId = $channelId;
-  }
-  public function getChannelId()
-  {
-    return $this->channelId;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Plus/ActivityObjectActorImage.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Plus/ActivityObjectActorImage.php
deleted file mode 100644
index bf949aad..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Plus/ActivityObjectActorImage.php
+++ /dev/null
@@ -1,30 +0,0 @@
-url = $url;
-  }
-  public function getUrl()
-  {
-    return $this->url;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Plus/ActivityObjectActorVerification.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Plus/ActivityObjectActorVerification.php
deleted file mode 100644
index fe27d647..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Plus/ActivityObjectActorVerification.php
+++ /dev/null
@@ -1,30 +0,0 @@
-adHocVerified = $adHocVerified;
-  }
-  public function getAdHocVerified()
-  {
-    return $this->adHocVerified;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Plus/ActivityObjectAttachments.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Plus/ActivityObjectAttachments.php
deleted file mode 100644
index 2e284160..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Plus/ActivityObjectAttachments.php
+++ /dev/null
@@ -1,107 +0,0 @@
-content = $content;
-  }
-  public function getContent()
-  {
-    return $this->content;
-  }
-  public function setDisplayName($displayName)
-  {
-    $this->displayName = $displayName;
-  }
-  public function getDisplayName()
-  {
-    return $this->displayName;
-  }
-  public function setEmbed(Google_Service_Plus_ActivityObjectAttachmentsEmbed $embed)
-  {
-    $this->embed = $embed;
-  }
-  public function getEmbed()
-  {
-    return $this->embed;
-  }
-  public function setFullImage(Google_Service_Plus_ActivityObjectAttachmentsFullImage $fullImage)
-  {
-    $this->fullImage = $fullImage;
-  }
-  public function getFullImage()
-  {
-    return $this->fullImage;
-  }
-  public function setId($id)
-  {
-    $this->id = $id;
-  }
-  public function getId()
-  {
-    return $this->id;
-  }
-  public function setImage(Google_Service_Plus_ActivityObjectAttachmentsImage $image)
-  {
-    $this->image = $image;
-  }
-  public function getImage()
-  {
-    return $this->image;
-  }
-  public function setObjectType($objectType)
-  {
-    $this->objectType = $objectType;
-  }
-  public function getObjectType()
-  {
-    return $this->objectType;
-  }
-  public function setThumbnails($thumbnails)
-  {
-    $this->thumbnails = $thumbnails;
-  }
-  public function getThumbnails()
-  {
-    return $this->thumbnails;
-  }
-  public function setUrl($url)
-  {
-    $this->url = $url;
-  }
-  public function getUrl()
-  {
-    return $this->url;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Plus/ActivityObjectAttachmentsEmbed.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Plus/ActivityObjectAttachmentsEmbed.php
deleted file mode 100644
index 56317771..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Plus/ActivityObjectAttachmentsEmbed.php
+++ /dev/null
@@ -1,39 +0,0 @@
-type = $type;
-  }
-  public function getType()
-  {
-    return $this->type;
-  }
-  public function setUrl($url)
-  {
-    $this->url = $url;
-  }
-  public function getUrl()
-  {
-    return $this->url;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Plus/ActivityObjectAttachmentsFullImage.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Plus/ActivityObjectAttachmentsFullImage.php
deleted file mode 100644
index b7fb28f7..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Plus/ActivityObjectAttachmentsFullImage.php
+++ /dev/null
@@ -1,57 +0,0 @@
-height = $height;
-  }
-  public function getHeight()
-  {
-    return $this->height;
-  }
-  public function setType($type)
-  {
-    $this->type = $type;
-  }
-  public function getType()
-  {
-    return $this->type;
-  }
-  public function setUrl($url)
-  {
-    $this->url = $url;
-  }
-  public function getUrl()
-  {
-    return $this->url;
-  }
-  public function setWidth($width)
-  {
-    $this->width = $width;
-  }
-  public function getWidth()
-  {
-    return $this->width;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Plus/ActivityObjectAttachmentsImage.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Plus/ActivityObjectAttachmentsImage.php
deleted file mode 100644
index 728c15df..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Plus/ActivityObjectAttachmentsImage.php
+++ /dev/null
@@ -1,57 +0,0 @@
-height = $height;
-  }
-  public function getHeight()
-  {
-    return $this->height;
-  }
-  public function setType($type)
-  {
-    $this->type = $type;
-  }
-  public function getType()
-  {
-    return $this->type;
-  }
-  public function setUrl($url)
-  {
-    $this->url = $url;
-  }
-  public function getUrl()
-  {
-    return $this->url;
-  }
-  public function setWidth($width)
-  {
-    $this->width = $width;
-  }
-  public function getWidth()
-  {
-    return $this->width;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Plus/ActivityObjectAttachmentsThumbnails.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Plus/ActivityObjectAttachmentsThumbnails.php
deleted file mode 100644
index b0024f02..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Plus/ActivityObjectAttachmentsThumbnails.php
+++ /dev/null
@@ -1,49 +0,0 @@
-description = $description;
-  }
-  public function getDescription()
-  {
-    return $this->description;
-  }
-  public function setImage(Google_Service_Plus_ActivityObjectAttachmentsThumbnailsImage $image)
-  {
-    $this->image = $image;
-  }
-  public function getImage()
-  {
-    return $this->image;
-  }
-  public function setUrl($url)
-  {
-    $this->url = $url;
-  }
-  public function getUrl()
-  {
-    return $this->url;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Plus/ActivityObjectAttachmentsThumbnailsImage.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Plus/ActivityObjectAttachmentsThumbnailsImage.php
deleted file mode 100644
index b2355287..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Plus/ActivityObjectAttachmentsThumbnailsImage.php
+++ /dev/null
@@ -1,57 +0,0 @@
-height = $height;
-  }
-  public function getHeight()
-  {
-    return $this->height;
-  }
-  public function setType($type)
-  {
-    $this->type = $type;
-  }
-  public function getType()
-  {
-    return $this->type;
-  }
-  public function setUrl($url)
-  {
-    $this->url = $url;
-  }
-  public function getUrl()
-  {
-    return $this->url;
-  }
-  public function setWidth($width)
-  {
-    $this->width = $width;
-  }
-  public function getWidth()
-  {
-    return $this->width;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Plus/ActivityObjectPlusoners.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Plus/ActivityObjectPlusoners.php
deleted file mode 100644
index 9f6dae2f..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Plus/ActivityObjectPlusoners.php
+++ /dev/null
@@ -1,39 +0,0 @@
-selfLink = $selfLink;
-  }
-  public function getSelfLink()
-  {
-    return $this->selfLink;
-  }
-  public function setTotalItems($totalItems)
-  {
-    $this->totalItems = $totalItems;
-  }
-  public function getTotalItems()
-  {
-    return $this->totalItems;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Plus/ActivityObjectReplies.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Plus/ActivityObjectReplies.php
deleted file mode 100644
index 9c85fdd1..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Plus/ActivityObjectReplies.php
+++ /dev/null
@@ -1,39 +0,0 @@
-selfLink = $selfLink;
-  }
-  public function getSelfLink()
-  {
-    return $this->selfLink;
-  }
-  public function setTotalItems($totalItems)
-  {
-    $this->totalItems = $totalItems;
-  }
-  public function getTotalItems()
-  {
-    return $this->totalItems;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Plus/ActivityObjectResharers.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Plus/ActivityObjectResharers.php
deleted file mode 100644
index 1f87e81b..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Plus/ActivityObjectResharers.php
+++ /dev/null
@@ -1,39 +0,0 @@
-selfLink = $selfLink;
-  }
-  public function getSelfLink()
-  {
-    return $this->selfLink;
-  }
-  public function setTotalItems($totalItems)
-  {
-    $this->totalItems = $totalItems;
-  }
-  public function getTotalItems()
-  {
-    return $this->totalItems;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Plus/ActivityProvider.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Plus/ActivityProvider.php
deleted file mode 100644
index cf192a33..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Plus/ActivityProvider.php
+++ /dev/null
@@ -1,30 +0,0 @@
-title = $title;
-  }
-  public function getTitle()
-  {
-    return $this->title;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Plus/Comment.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Plus/Comment.php
deleted file mode 100644
index fa5c0f1c..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Plus/Comment.php
+++ /dev/null
@@ -1,125 +0,0 @@
-actor = $actor;
-  }
-  public function getActor()
-  {
-    return $this->actor;
-  }
-  public function setEtag($etag)
-  {
-    $this->etag = $etag;
-  }
-  public function getEtag()
-  {
-    return $this->etag;
-  }
-  public function setId($id)
-  {
-    $this->id = $id;
-  }
-  public function getId()
-  {
-    return $this->id;
-  }
-  public function setInReplyTo($inReplyTo)
-  {
-    $this->inReplyTo = $inReplyTo;
-  }
-  public function getInReplyTo()
-  {
-    return $this->inReplyTo;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setObject(Google_Service_Plus_CommentObject $object)
-  {
-    $this->object = $object;
-  }
-  public function getObject()
-  {
-    return $this->object;
-  }
-  public function setPlusoners(Google_Service_Plus_CommentPlusoners $plusoners)
-  {
-    $this->plusoners = $plusoners;
-  }
-  public function getPlusoners()
-  {
-    return $this->plusoners;
-  }
-  public function setPublished($published)
-  {
-    $this->published = $published;
-  }
-  public function getPublished()
-  {
-    return $this->published;
-  }
-  public function setSelfLink($selfLink)
-  {
-    $this->selfLink = $selfLink;
-  }
-  public function getSelfLink()
-  {
-    return $this->selfLink;
-  }
-  public function setUpdated($updated)
-  {
-    $this->updated = $updated;
-  }
-  public function getUpdated()
-  {
-    return $this->updated;
-  }
-  public function setVerb($verb)
-  {
-    $this->verb = $verb;
-  }
-  public function getVerb()
-  {
-    return $this->verb;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Plus/CommentActor.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Plus/CommentActor.php
deleted file mode 100644
index e73f3bf3..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Plus/CommentActor.php
+++ /dev/null
@@ -1,78 +0,0 @@
-clientSpecificActorInfo = $clientSpecificActorInfo;
-  }
-  public function getClientSpecificActorInfo()
-  {
-    return $this->clientSpecificActorInfo;
-  }
-  public function setDisplayName($displayName)
-  {
-    $this->displayName = $displayName;
-  }
-  public function getDisplayName()
-  {
-    return $this->displayName;
-  }
-  public function setId($id)
-  {
-    $this->id = $id;
-  }
-  public function getId()
-  {
-    return $this->id;
-  }
-  public function setImage(Google_Service_Plus_CommentActorImage $image)
-  {
-    $this->image = $image;
-  }
-  public function getImage()
-  {
-    return $this->image;
-  }
-  public function setUrl($url)
-  {
-    $this->url = $url;
-  }
-  public function getUrl()
-  {
-    return $this->url;
-  }
-  public function setVerification(Google_Service_Plus_CommentActorVerification $verification)
-  {
-    $this->verification = $verification;
-  }
-  public function getVerification()
-  {
-    return $this->verification;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Plus/CommentActorClientSpecificActorInfo.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Plus/CommentActorClientSpecificActorInfo.php
deleted file mode 100644
index 836950ff..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Plus/CommentActorClientSpecificActorInfo.php
+++ /dev/null
@@ -1,31 +0,0 @@
-youtubeActorInfo = $youtubeActorInfo;
-  }
-  public function getYoutubeActorInfo()
-  {
-    return $this->youtubeActorInfo;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Plus/CommentActorClientSpecificActorInfoYoutubeActorInfo.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Plus/CommentActorClientSpecificActorInfoYoutubeActorInfo.php
deleted file mode 100644
index bd055736..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Plus/CommentActorClientSpecificActorInfoYoutubeActorInfo.php
+++ /dev/null
@@ -1,30 +0,0 @@
-channelId = $channelId;
-  }
-  public function getChannelId()
-  {
-    return $this->channelId;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Plus/CommentActorImage.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Plus/CommentActorImage.php
deleted file mode 100644
index 484506cc..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Plus/CommentActorImage.php
+++ /dev/null
@@ -1,30 +0,0 @@
-url = $url;
-  }
-  public function getUrl()
-  {
-    return $this->url;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Plus/CommentActorVerification.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Plus/CommentActorVerification.php
deleted file mode 100644
index 43436d9f..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Plus/CommentActorVerification.php
+++ /dev/null
@@ -1,30 +0,0 @@
-adHocVerified = $adHocVerified;
-  }
-  public function getAdHocVerified()
-  {
-    return $this->adHocVerified;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Plus/CommentFeed.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Plus/CommentFeed.php
deleted file mode 100644
index e5a94f51..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Plus/CommentFeed.php
+++ /dev/null
@@ -1,95 +0,0 @@
-etag = $etag;
-  }
-  public function getEtag()
-  {
-    return $this->etag;
-  }
-  public function setId($id)
-  {
-    $this->id = $id;
-  }
-  public function getId()
-  {
-    return $this->id;
-  }
-  public function setItems($items)
-  {
-    $this->items = $items;
-  }
-  public function getItems()
-  {
-    return $this->items;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setNextLink($nextLink)
-  {
-    $this->nextLink = $nextLink;
-  }
-  public function getNextLink()
-  {
-    return $this->nextLink;
-  }
-  public function setNextPageToken($nextPageToken)
-  {
-    $this->nextPageToken = $nextPageToken;
-  }
-  public function getNextPageToken()
-  {
-    return $this->nextPageToken;
-  }
-  public function setTitle($title)
-  {
-    $this->title = $title;
-  }
-  public function getTitle()
-  {
-    return $this->title;
-  }
-  public function setUpdated($updated)
-  {
-    $this->updated = $updated;
-  }
-  public function getUpdated()
-  {
-    return $this->updated;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Plus/CommentInReplyTo.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Plus/CommentInReplyTo.php
deleted file mode 100644
index 8181cdf6..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Plus/CommentInReplyTo.php
+++ /dev/null
@@ -1,39 +0,0 @@
-id = $id;
-  }
-  public function getId()
-  {
-    return $this->id;
-  }
-  public function setUrl($url)
-  {
-    $this->url = $url;
-  }
-  public function getUrl()
-  {
-    return $this->url;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Plus/CommentObject.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Plus/CommentObject.php
deleted file mode 100644
index 89773d4b..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Plus/CommentObject.php
+++ /dev/null
@@ -1,48 +0,0 @@
-content = $content;
-  }
-  public function getContent()
-  {
-    return $this->content;
-  }
-  public function setObjectType($objectType)
-  {
-    $this->objectType = $objectType;
-  }
-  public function getObjectType()
-  {
-    return $this->objectType;
-  }
-  public function setOriginalContent($originalContent)
-  {
-    $this->originalContent = $originalContent;
-  }
-  public function getOriginalContent()
-  {
-    return $this->originalContent;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Plus/CommentPlusoners.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Plus/CommentPlusoners.php
deleted file mode 100644
index 2ab1ded9..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Plus/CommentPlusoners.php
+++ /dev/null
@@ -1,30 +0,0 @@
-totalItems = $totalItems;
-  }
-  public function getTotalItems()
-  {
-    return $this->totalItems;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Plus/PeopleFeed.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Plus/PeopleFeed.php
deleted file mode 100644
index dcf19fc6..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Plus/PeopleFeed.php
+++ /dev/null
@@ -1,86 +0,0 @@
-etag = $etag;
-  }
-  public function getEtag()
-  {
-    return $this->etag;
-  }
-  public function setItems($items)
-  {
-    $this->items = $items;
-  }
-  public function getItems()
-  {
-    return $this->items;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setNextPageToken($nextPageToken)
-  {
-    $this->nextPageToken = $nextPageToken;
-  }
-  public function getNextPageToken()
-  {
-    return $this->nextPageToken;
-  }
-  public function setSelfLink($selfLink)
-  {
-    $this->selfLink = $selfLink;
-  }
-  public function getSelfLink()
-  {
-    return $this->selfLink;
-  }
-  public function setTitle($title)
-  {
-    $this->title = $title;
-  }
-  public function getTitle()
-  {
-    return $this->title;
-  }
-  public function setTotalItems($totalItems)
-  {
-    $this->totalItems = $totalItems;
-  }
-  public function getTotalItems()
-  {
-    return $this->totalItems;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Plus/Person.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Plus/Person.php
deleted file mode 100644
index 32592e12..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Plus/Person.php
+++ /dev/null
@@ -1,300 +0,0 @@
-aboutMe = $aboutMe;
-  }
-  public function getAboutMe()
-  {
-    return $this->aboutMe;
-  }
-  public function setAgeRange(Google_Service_Plus_PersonAgeRange $ageRange)
-  {
-    $this->ageRange = $ageRange;
-  }
-  public function getAgeRange()
-  {
-    return $this->ageRange;
-  }
-  public function setBirthday($birthday)
-  {
-    $this->birthday = $birthday;
-  }
-  public function getBirthday()
-  {
-    return $this->birthday;
-  }
-  public function setBraggingRights($braggingRights)
-  {
-    $this->braggingRights = $braggingRights;
-  }
-  public function getBraggingRights()
-  {
-    return $this->braggingRights;
-  }
-  public function setCircledByCount($circledByCount)
-  {
-    $this->circledByCount = $circledByCount;
-  }
-  public function getCircledByCount()
-  {
-    return $this->circledByCount;
-  }
-  public function setCover(Google_Service_Plus_PersonCover $cover)
-  {
-    $this->cover = $cover;
-  }
-  public function getCover()
-  {
-    return $this->cover;
-  }
-  public function setCurrentLocation($currentLocation)
-  {
-    $this->currentLocation = $currentLocation;
-  }
-  public function getCurrentLocation()
-  {
-    return $this->currentLocation;
-  }
-  public function setDisplayName($displayName)
-  {
-    $this->displayName = $displayName;
-  }
-  public function getDisplayName()
-  {
-    return $this->displayName;
-  }
-  public function setDomain($domain)
-  {
-    $this->domain = $domain;
-  }
-  public function getDomain()
-  {
-    return $this->domain;
-  }
-  public function setEmails($emails)
-  {
-    $this->emails = $emails;
-  }
-  public function getEmails()
-  {
-    return $this->emails;
-  }
-  public function setEtag($etag)
-  {
-    $this->etag = $etag;
-  }
-  public function getEtag()
-  {
-    return $this->etag;
-  }
-  public function setGender($gender)
-  {
-    $this->gender = $gender;
-  }
-  public function getGender()
-  {
-    return $this->gender;
-  }
-  public function setId($id)
-  {
-    $this->id = $id;
-  }
-  public function getId()
-  {
-    return $this->id;
-  }
-  public function setImage(Google_Service_Plus_PersonImage $image)
-  {
-    $this->image = $image;
-  }
-  public function getImage()
-  {
-    return $this->image;
-  }
-  public function setIsPlusUser($isPlusUser)
-  {
-    $this->isPlusUser = $isPlusUser;
-  }
-  public function getIsPlusUser()
-  {
-    return $this->isPlusUser;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setLanguage($language)
-  {
-    $this->language = $language;
-  }
-  public function getLanguage()
-  {
-    return $this->language;
-  }
-  public function setName(Google_Service_Plus_PersonName $name)
-  {
-    $this->name = $name;
-  }
-  public function getName()
-  {
-    return $this->name;
-  }
-  public function setNickname($nickname)
-  {
-    $this->nickname = $nickname;
-  }
-  public function getNickname()
-  {
-    return $this->nickname;
-  }
-  public function setObjectType($objectType)
-  {
-    $this->objectType = $objectType;
-  }
-  public function getObjectType()
-  {
-    return $this->objectType;
-  }
-  public function setOccupation($occupation)
-  {
-    $this->occupation = $occupation;
-  }
-  public function getOccupation()
-  {
-    return $this->occupation;
-  }
-  public function setOrganizations($organizations)
-  {
-    $this->organizations = $organizations;
-  }
-  public function getOrganizations()
-  {
-    return $this->organizations;
-  }
-  public function setPlacesLived($placesLived)
-  {
-    $this->placesLived = $placesLived;
-  }
-  public function getPlacesLived()
-  {
-    return $this->placesLived;
-  }
-  public function setPlusOneCount($plusOneCount)
-  {
-    $this->plusOneCount = $plusOneCount;
-  }
-  public function getPlusOneCount()
-  {
-    return $this->plusOneCount;
-  }
-  public function setRelationshipStatus($relationshipStatus)
-  {
-    $this->relationshipStatus = $relationshipStatus;
-  }
-  public function getRelationshipStatus()
-  {
-    return $this->relationshipStatus;
-  }
-  public function setSkills($skills)
-  {
-    $this->skills = $skills;
-  }
-  public function getSkills()
-  {
-    return $this->skills;
-  }
-  public function setTagline($tagline)
-  {
-    $this->tagline = $tagline;
-  }
-  public function getTagline()
-  {
-    return $this->tagline;
-  }
-  public function setUrl($url)
-  {
-    $this->url = $url;
-  }
-  public function getUrl()
-  {
-    return $this->url;
-  }
-  public function setUrls($urls)
-  {
-    $this->urls = $urls;
-  }
-  public function getUrls()
-  {
-    return $this->urls;
-  }
-  public function setVerified($verified)
-  {
-    $this->verified = $verified;
-  }
-  public function getVerified()
-  {
-    return $this->verified;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Plus/PersonAgeRange.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Plus/PersonAgeRange.php
deleted file mode 100644
index e4a00a23..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Plus/PersonAgeRange.php
+++ /dev/null
@@ -1,39 +0,0 @@
-max = $max;
-  }
-  public function getMax()
-  {
-    return $this->max;
-  }
-  public function setMin($min)
-  {
-    $this->min = $min;
-  }
-  public function getMin()
-  {
-    return $this->min;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Plus/PersonCover.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Plus/PersonCover.php
deleted file mode 100644
index c8a53e7f..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Plus/PersonCover.php
+++ /dev/null
@@ -1,50 +0,0 @@
-coverInfo = $coverInfo;
-  }
-  public function getCoverInfo()
-  {
-    return $this->coverInfo;
-  }
-  public function setCoverPhoto(Google_Service_Plus_PersonCoverCoverPhoto $coverPhoto)
-  {
-    $this->coverPhoto = $coverPhoto;
-  }
-  public function getCoverPhoto()
-  {
-    return $this->coverPhoto;
-  }
-  public function setLayout($layout)
-  {
-    $this->layout = $layout;
-  }
-  public function getLayout()
-  {
-    return $this->layout;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Plus/PersonCoverCoverInfo.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Plus/PersonCoverCoverInfo.php
deleted file mode 100644
index d5b55da1..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Plus/PersonCoverCoverInfo.php
+++ /dev/null
@@ -1,39 +0,0 @@
-leftImageOffset = $leftImageOffset;
-  }
-  public function getLeftImageOffset()
-  {
-    return $this->leftImageOffset;
-  }
-  public function setTopImageOffset($topImageOffset)
-  {
-    $this->topImageOffset = $topImageOffset;
-  }
-  public function getTopImageOffset()
-  {
-    return $this->topImageOffset;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Plus/PersonCoverCoverPhoto.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Plus/PersonCoverCoverPhoto.php
deleted file mode 100644
index b22a93d3..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Plus/PersonCoverCoverPhoto.php
+++ /dev/null
@@ -1,48 +0,0 @@
-height = $height;
-  }
-  public function getHeight()
-  {
-    return $this->height;
-  }
-  public function setUrl($url)
-  {
-    $this->url = $url;
-  }
-  public function getUrl()
-  {
-    return $this->url;
-  }
-  public function setWidth($width)
-  {
-    $this->width = $width;
-  }
-  public function getWidth()
-  {
-    return $this->width;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Plus/PersonEmails.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Plus/PersonEmails.php
deleted file mode 100644
index b1141224..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Plus/PersonEmails.php
+++ /dev/null
@@ -1,39 +0,0 @@
-type = $type;
-  }
-  public function getType()
-  {
-    return $this->type;
-  }
-  public function setValue($value)
-  {
-    $this->value = $value;
-  }
-  public function getValue()
-  {
-    return $this->value;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Plus/PersonImage.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Plus/PersonImage.php
deleted file mode 100644
index cf086abe..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Plus/PersonImage.php
+++ /dev/null
@@ -1,39 +0,0 @@
-isDefault = $isDefault;
-  }
-  public function getIsDefault()
-  {
-    return $this->isDefault;
-  }
-  public function setUrl($url)
-  {
-    $this->url = $url;
-  }
-  public function getUrl()
-  {
-    return $this->url;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Plus/PersonName.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Plus/PersonName.php
deleted file mode 100644
index a8a4067d..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Plus/PersonName.php
+++ /dev/null
@@ -1,75 +0,0 @@
-familyName = $familyName;
-  }
-  public function getFamilyName()
-  {
-    return $this->familyName;
-  }
-  public function setFormatted($formatted)
-  {
-    $this->formatted = $formatted;
-  }
-  public function getFormatted()
-  {
-    return $this->formatted;
-  }
-  public function setGivenName($givenName)
-  {
-    $this->givenName = $givenName;
-  }
-  public function getGivenName()
-  {
-    return $this->givenName;
-  }
-  public function setHonorificPrefix($honorificPrefix)
-  {
-    $this->honorificPrefix = $honorificPrefix;
-  }
-  public function getHonorificPrefix()
-  {
-    return $this->honorificPrefix;
-  }
-  public function setHonorificSuffix($honorificSuffix)
-  {
-    $this->honorificSuffix = $honorificSuffix;
-  }
-  public function getHonorificSuffix()
-  {
-    return $this->honorificSuffix;
-  }
-  public function setMiddleName($middleName)
-  {
-    $this->middleName = $middleName;
-  }
-  public function getMiddleName()
-  {
-    return $this->middleName;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Plus/PersonOrganizations.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Plus/PersonOrganizations.php
deleted file mode 100644
index a0a6f12c..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Plus/PersonOrganizations.php
+++ /dev/null
@@ -1,102 +0,0 @@
-department = $department;
-  }
-  public function getDepartment()
-  {
-    return $this->department;
-  }
-  public function setDescription($description)
-  {
-    $this->description = $description;
-  }
-  public function getDescription()
-  {
-    return $this->description;
-  }
-  public function setEndDate($endDate)
-  {
-    $this->endDate = $endDate;
-  }
-  public function getEndDate()
-  {
-    return $this->endDate;
-  }
-  public function setLocation($location)
-  {
-    $this->location = $location;
-  }
-  public function getLocation()
-  {
-    return $this->location;
-  }
-  public function setName($name)
-  {
-    $this->name = $name;
-  }
-  public function getName()
-  {
-    return $this->name;
-  }
-  public function setPrimary($primary)
-  {
-    $this->primary = $primary;
-  }
-  public function getPrimary()
-  {
-    return $this->primary;
-  }
-  public function setStartDate($startDate)
-  {
-    $this->startDate = $startDate;
-  }
-  public function getStartDate()
-  {
-    return $this->startDate;
-  }
-  public function setTitle($title)
-  {
-    $this->title = $title;
-  }
-  public function getTitle()
-  {
-    return $this->title;
-  }
-  public function setType($type)
-  {
-    $this->type = $type;
-  }
-  public function getType()
-  {
-    return $this->type;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Plus/PersonPlacesLived.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Plus/PersonPlacesLived.php
deleted file mode 100644
index 1055e4c2..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Plus/PersonPlacesLived.php
+++ /dev/null
@@ -1,39 +0,0 @@
-primary = $primary;
-  }
-  public function getPrimary()
-  {
-    return $this->primary;
-  }
-  public function setValue($value)
-  {
-    $this->value = $value;
-  }
-  public function getValue()
-  {
-    return $this->value;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Plus/PersonUrls.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Plus/PersonUrls.php
deleted file mode 100644
index aa028e79..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Plus/PersonUrls.php
+++ /dev/null
@@ -1,48 +0,0 @@
-label = $label;
-  }
-  public function getLabel()
-  {
-    return $this->label;
-  }
-  public function setType($type)
-  {
-    $this->type = $type;
-  }
-  public function getType()
-  {
-    return $this->type;
-  }
-  public function setValue($value)
-  {
-    $this->value = $value;
-  }
-  public function getValue()
-  {
-    return $this->value;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Plus/Place.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Plus/Place.php
deleted file mode 100644
index 978bc414..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Plus/Place.php
+++ /dev/null
@@ -1,68 +0,0 @@
-address = $address;
-  }
-  public function getAddress()
-  {
-    return $this->address;
-  }
-  public function setDisplayName($displayName)
-  {
-    $this->displayName = $displayName;
-  }
-  public function getDisplayName()
-  {
-    return $this->displayName;
-  }
-  public function setId($id)
-  {
-    $this->id = $id;
-  }
-  public function getId()
-  {
-    return $this->id;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setPosition(Google_Service_Plus_PlacePosition $position)
-  {
-    $this->position = $position;
-  }
-  public function getPosition()
-  {
-    return $this->position;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Plus/PlaceAddress.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Plus/PlaceAddress.php
deleted file mode 100644
index 78c4beac..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Plus/PlaceAddress.php
+++ /dev/null
@@ -1,30 +0,0 @@
-formatted = $formatted;
-  }
-  public function getFormatted()
-  {
-    return $this->formatted;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Plus/PlacePosition.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Plus/PlacePosition.php
deleted file mode 100644
index 29ef840e..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Plus/PlacePosition.php
+++ /dev/null
@@ -1,39 +0,0 @@
-latitude = $latitude;
-  }
-  public function getLatitude()
-  {
-    return $this->latitude;
-  }
-  public function setLongitude($longitude)
-  {
-    $this->longitude = $longitude;
-  }
-  public function getLongitude()
-  {
-    return $this->longitude;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Plus/PlusAclentryResource.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Plus/PlusAclentryResource.php
deleted file mode 100644
index 40c07d21..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Plus/PlusAclentryResource.php
+++ /dev/null
@@ -1,48 +0,0 @@
-displayName = $displayName;
-  }
-  public function getDisplayName()
-  {
-    return $this->displayName;
-  }
-  public function setId($id)
-  {
-    $this->id = $id;
-  }
-  public function getId()
-  {
-    return $this->id;
-  }
-  public function setType($type)
-  {
-    $this->type = $type;
-  }
-  public function getType()
-  {
-    return $this->type;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Plus/Resource/Activities.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Plus/Resource/Activities.php
deleted file mode 100644
index db22c401..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Plus/Resource/Activities.php
+++ /dev/null
@@ -1,88 +0,0 @@
-
- *   $plusService = new Google_Service_Plus(...);
- *   $activities = $plusService->activities;
- *  
- */
-class Google_Service_Plus_Resource_Activities extends Google_Service_Resource
-{
-  /**
-   * Get an activity. (activities.get)
-   *
-   * @param string $activityId The ID of the activity to get.
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Plus_Activity
-   */
-  public function get($activityId, $optParams = array())
-  {
-    $params = array('activityId' => $activityId);
-    $params = array_merge($params, $optParams);
-    return $this->call('get', array($params), "Google_Service_Plus_Activity");
-  }
-  /**
-   * List all of the activities in the specified collection for a particular user.
-   * (activities.listActivities)
-   *
-   * @param string $userId The ID of the user to get activities for. The special
-   * value "me" can be used to indicate the authenticated user.
-   * @param string $collection The collection of activities to list.
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param string maxResults The maximum number of activities to include in
-   * the response, which is used for paging. For any response, the actual number
-   * returned might be less than the specified maxResults.
-   * @opt_param string pageToken The continuation token, which is used to page
-   * through large result sets. To get the next page of results, set this
-   * parameter to the value of "nextPageToken" from the previous response.
-   * @return Google_Service_Plus_ActivityFeed
-   */
-  public function listActivities($userId, $collection, $optParams = array())
-  {
-    $params = array('userId' => $userId, 'collection' => $collection);
-    $params = array_merge($params, $optParams);
-    return $this->call('list', array($params), "Google_Service_Plus_ActivityFeed");
-  }
-  /**
-   * Search public activities. (activities.search)
-   *
-   * @param string $query Full-text search query string.
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param string language Specify the preferred language to search with. See
-   * search language codes for available values.
-   * @opt_param string maxResults The maximum number of activities to include in
-   * the response, which is used for paging. For any response, the actual number
-   * returned might be less than the specified maxResults.
-   * @opt_param string orderBy Specifies how to order search results.
-   * @opt_param string pageToken The continuation token, which is used to page
-   * through large result sets. To get the next page of results, set this
-   * parameter to the value of "nextPageToken" from the previous response. This
-   * token can be of any length.
-   * @return Google_Service_Plus_ActivityFeed
-   */
-  public function search($query, $optParams = array())
-  {
-    $params = array('query' => $query);
-    $params = array_merge($params, $optParams);
-    return $this->call('search', array($params), "Google_Service_Plus_ActivityFeed");
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Plus/Resource/Comments.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Plus/Resource/Comments.php
deleted file mode 100644
index ca93d62a..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Plus/Resource/Comments.php
+++ /dev/null
@@ -1,62 +0,0 @@
-
- *   $plusService = new Google_Service_Plus(...);
- *   $comments = $plusService->comments;
- *  
- */
-class Google_Service_Plus_Resource_Comments extends Google_Service_Resource
-{
-  /**
-   * Get a comment. (comments.get)
-   *
-   * @param string $commentId The ID of the comment to get.
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Plus_Comment
-   */
-  public function get($commentId, $optParams = array())
-  {
-    $params = array('commentId' => $commentId);
-    $params = array_merge($params, $optParams);
-    return $this->call('get', array($params), "Google_Service_Plus_Comment");
-  }
-  /**
-   * List all of the comments for an activity. (comments.listComments)
-   *
-   * @param string $activityId The ID of the activity to get comments for.
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param string maxResults The maximum number of comments to include in the
-   * response, which is used for paging. For any response, the actual number
-   * returned might be less than the specified maxResults.
-   * @opt_param string pageToken The continuation token, which is used to page
-   * through large result sets. To get the next page of results, set this
-   * parameter to the value of "nextPageToken" from the previous response.
-   * @opt_param string sortOrder The order in which to sort the list of comments.
-   * @return Google_Service_Plus_CommentFeed
-   */
-  public function listComments($activityId, $optParams = array())
-  {
-    $params = array('activityId' => $activityId);
-    $params = array_merge($params, $optParams);
-    return $this->call('list', array($params), "Google_Service_Plus_CommentFeed");
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Plus/Resource/People.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Plus/Resource/People.php
deleted file mode 100644
index 0874bb8a..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Plus/Resource/People.php
+++ /dev/null
@@ -1,114 +0,0 @@
-
- *   $plusService = new Google_Service_Plus(...);
- *   $people = $plusService->people;
- *  
- */
-class Google_Service_Plus_Resource_People extends Google_Service_Resource
-{
-  /**
-   * Get a person's profile. If your app uses scope
-   * https://www.googleapis.com/auth/plus.login, this method is guaranteed to
-   * return ageRange and language. (people.get)
-   *
-   * @param string $userId The ID of the person to get the profile for. The
-   * special value "me" can be used to indicate the authenticated user.
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Plus_Person
-   */
-  public function get($userId, $optParams = array())
-  {
-    $params = array('userId' => $userId);
-    $params = array_merge($params, $optParams);
-    return $this->call('get', array($params), "Google_Service_Plus_Person");
-  }
-  /**
-   * List all of the people in the specified collection. (people.listPeople)
-   *
-   * @param string $userId Get the collection of people for the person identified.
-   * Use "me" to indicate the authenticated user.
-   * @param string $collection The collection of people to list.
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param string maxResults The maximum number of people to include in the
-   * response, which is used for paging. For any response, the actual number
-   * returned might be less than the specified maxResults.
-   * @opt_param string orderBy The order to return people in.
-   * @opt_param string pageToken The continuation token, which is used to page
-   * through large result sets. To get the next page of results, set this
-   * parameter to the value of "nextPageToken" from the previous response.
-   * @return Google_Service_Plus_PeopleFeed
-   */
-  public function listPeople($userId, $collection, $optParams = array())
-  {
-    $params = array('userId' => $userId, 'collection' => $collection);
-    $params = array_merge($params, $optParams);
-    return $this->call('list', array($params), "Google_Service_Plus_PeopleFeed");
-  }
-  /**
-   * List all of the people in the specified collection for a particular activity.
-   * (people.listByActivity)
-   *
-   * @param string $activityId The ID of the activity to get the list of people
-   * for.
-   * @param string $collection The collection of people to list.
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param string maxResults The maximum number of people to include in the
-   * response, which is used for paging. For any response, the actual number
-   * returned might be less than the specified maxResults.
-   * @opt_param string pageToken The continuation token, which is used to page
-   * through large result sets. To get the next page of results, set this
-   * parameter to the value of "nextPageToken" from the previous response.
-   * @return Google_Service_Plus_PeopleFeed
-   */
-  public function listByActivity($activityId, $collection, $optParams = array())
-  {
-    $params = array('activityId' => $activityId, 'collection' => $collection);
-    $params = array_merge($params, $optParams);
-    return $this->call('listByActivity', array($params), "Google_Service_Plus_PeopleFeed");
-  }
-  /**
-   * Search all public profiles. (people.search)
-   *
-   * @param string $query Specify a query string for full text search of public
-   * text in all profiles.
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param string language Specify the preferred language to search with. See
-   * search language codes for available values.
-   * @opt_param string maxResults The maximum number of people to include in the
-   * response, which is used for paging. For any response, the actual number
-   * returned might be less than the specified maxResults.
-   * @opt_param string pageToken The continuation token, which is used to page
-   * through large result sets. To get the next page of results, set this
-   * parameter to the value of "nextPageToken" from the previous response. This
-   * token can be of any length.
-   * @return Google_Service_Plus_PeopleFeed
-   */
-  public function search($query, $optParams = array())
-  {
-    $params = array('query' => $query);
-    $params = array_merge($params, $optParams);
-    return $this->call('search', array($params), "Google_Service_Plus_PeopleFeed");
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/PlusDomains.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/PlusDomains.php
deleted file mode 100644
index 0b7ed0bb..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/PlusDomains.php
+++ /dev/null
@@ -1,453 +0,0 @@
-
- * Builds on top of the Google+ platform for Google Apps Domains.

- *
- * 

- * For more information about this service, see the API
- * Documentation
- * 

- *
- * @author Google, Inc.
- */
-class Google_Service_PlusDomains extends Google_Service
-{
-  /** View your circles and the people and pages in them. */
-  const PLUS_CIRCLES_READ =
-      "https://www.googleapis.com/auth/plus.circles.read";
-  /** Manage your circles and add people and pages. People and pages you add to your circles will be notified. Others may see this information publicly. People you add to circles can use Hangouts with you.. */
-  const PLUS_CIRCLES_WRITE =
-      "https://www.googleapis.com/auth/plus.circles.write";
-  /** Know the list of people in your circles, your age range, and language. */
-  const PLUS_LOGIN =
-      "https://www.googleapis.com/auth/plus.login";
-  /** Know who you are on Google. */
-  const PLUS_ME =
-      "https://www.googleapis.com/auth/plus.me";
-  /** Send your photos and videos to Google+. */
-  const PLUS_MEDIA_UPLOAD =
-      "https://www.googleapis.com/auth/plus.media.upload";
-  /** View your own Google+ profile and profiles visible to you. */
-  const PLUS_PROFILES_READ =
-      "https://www.googleapis.com/auth/plus.profiles.read";
-  /** View your Google+ posts, comments, and stream. */
-  const PLUS_STREAM_READ =
-      "https://www.googleapis.com/auth/plus.stream.read";
-  /** Manage your Google+ posts, comments, and stream. */
-  const PLUS_STREAM_WRITE =
-      "https://www.googleapis.com/auth/plus.stream.write";
-  /** View your email address. */
-  const USERINFO_EMAIL =
-      "https://www.googleapis.com/auth/userinfo.email";
-  /** View your basic profile info. */
-  const USERINFO_PROFILE =
-      "https://www.googleapis.com/auth/userinfo.profile";
-
-  public $activities;
-  public $audiences;
-  public $circles;
-  public $comments;
-  public $media;
-  public $people;
-  
-  /**
-   * Constructs the internal representation of the PlusDomains service.
-   *
-   * @param Google_Client $client
-   */
-  public function __construct(Google_Client $client)
-  {
-    parent::__construct($client);
-    $this->rootUrl = 'https://www.googleapis.com/';
-    $this->servicePath = 'plusDomains/v1/';
-    $this->version = 'v1';
-    $this->serviceName = 'plusDomains';
-
-    $this->activities = new Google_Service_PlusDomains_Resource_Activities(
-        $this,
-        $this->serviceName,
-        'activities',
-        array(
-          'methods' => array(
-            'get' => array(
-              'path' => 'activities/{activityId}',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'activityId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'insert' => array(
-              'path' => 'people/{userId}/activities',
-              'httpMethod' => 'POST',
-              'parameters' => array(
-                'userId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'preview' => array(
-                  'location' => 'query',
-                  'type' => 'boolean',
-                ),
-              ),
-            ),'list' => array(
-              'path' => 'people/{userId}/activities/{collection}',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'userId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'collection' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'maxResults' => array(
-                  'location' => 'query',
-                  'type' => 'integer',
-                ),
-                'pageToken' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-              ),
-            ),
-          )
-        )
-    );
-    $this->audiences = new Google_Service_PlusDomains_Resource_Audiences(
-        $this,
-        $this->serviceName,
-        'audiences',
-        array(
-          'methods' => array(
-            'list' => array(
-              'path' => 'people/{userId}/audiences',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'userId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'maxResults' => array(
-                  'location' => 'query',
-                  'type' => 'integer',
-                ),
-                'pageToken' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-              ),
-            ),
-          )
-        )
-    );
-    $this->circles = new Google_Service_PlusDomains_Resource_Circles(
-        $this,
-        $this->serviceName,
-        'circles',
-        array(
-          'methods' => array(
-            'addPeople' => array(
-              'path' => 'circles/{circleId}/people',
-              'httpMethod' => 'PUT',
-              'parameters' => array(
-                'circleId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'email' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                  'repeated' => true,
-                ),
-                'userId' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                  'repeated' => true,
-                ),
-              ),
-            ),'get' => array(
-              'path' => 'circles/{circleId}',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'circleId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'insert' => array(
-              'path' => 'people/{userId}/circles',
-              'httpMethod' => 'POST',
-              'parameters' => array(
-                'userId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'list' => array(
-              'path' => 'people/{userId}/circles',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'userId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'maxResults' => array(
-                  'location' => 'query',
-                  'type' => 'integer',
-                ),
-                'pageToken' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-              ),
-            ),'patch' => array(
-              'path' => 'circles/{circleId}',
-              'httpMethod' => 'PATCH',
-              'parameters' => array(
-                'circleId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'remove' => array(
-              'path' => 'circles/{circleId}',
-              'httpMethod' => 'DELETE',
-              'parameters' => array(
-                'circleId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'removePeople' => array(
-              'path' => 'circles/{circleId}/people',
-              'httpMethod' => 'DELETE',
-              'parameters' => array(
-                'circleId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'email' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                  'repeated' => true,
-                ),
-                'userId' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                  'repeated' => true,
-                ),
-              ),
-            ),'update' => array(
-              'path' => 'circles/{circleId}',
-              'httpMethod' => 'PUT',
-              'parameters' => array(
-                'circleId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),
-          )
-        )
-    );
-    $this->comments = new Google_Service_PlusDomains_Resource_Comments(
-        $this,
-        $this->serviceName,
-        'comments',
-        array(
-          'methods' => array(
-            'get' => array(
-              'path' => 'comments/{commentId}',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'commentId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'insert' => array(
-              'path' => 'activities/{activityId}/comments',
-              'httpMethod' => 'POST',
-              'parameters' => array(
-                'activityId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'list' => array(
-              'path' => 'activities/{activityId}/comments',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'activityId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'maxResults' => array(
-                  'location' => 'query',
-                  'type' => 'integer',
-                ),
-                'pageToken' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'sortOrder' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-              ),
-            ),
-          )
-        )
-    );
-    $this->media = new Google_Service_PlusDomains_Resource_Media(
-        $this,
-        $this->serviceName,
-        'media',
-        array(
-          'methods' => array(
-            'insert' => array(
-              'path' => 'people/{userId}/media/{collection}',
-              'httpMethod' => 'POST',
-              'parameters' => array(
-                'userId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'collection' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),
-          )
-        )
-    );
-    $this->people = new Google_Service_PlusDomains_Resource_People(
-        $this,
-        $this->serviceName,
-        'people',
-        array(
-          'methods' => array(
-            'get' => array(
-              'path' => 'people/{userId}',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'userId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'list' => array(
-              'path' => 'people/{userId}/people/{collection}',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'userId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'collection' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'maxResults' => array(
-                  'location' => 'query',
-                  'type' => 'integer',
-                ),
-                'orderBy' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'pageToken' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-              ),
-            ),'listByActivity' => array(
-              'path' => 'activities/{activityId}/people/{collection}',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'activityId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'collection' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'maxResults' => array(
-                  'location' => 'query',
-                  'type' => 'integer',
-                ),
-                'pageToken' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-              ),
-            ),'listByCircle' => array(
-              'path' => 'circles/{circleId}/people',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'circleId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'maxResults' => array(
-                  'location' => 'query',
-                  'type' => 'integer',
-                ),
-                'pageToken' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-              ),
-            ),
-          )
-        )
-    );
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/PlusDomains/Acl.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/PlusDomains/Acl.php
deleted file mode 100644
index b60f0c80..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/PlusDomains/Acl.php
+++ /dev/null
@@ -1,59 +0,0 @@
-description = $description;
-  }
-  public function getDescription()
-  {
-    return $this->description;
-  }
-  public function setDomainRestricted($domainRestricted)
-  {
-    $this->domainRestricted = $domainRestricted;
-  }
-  public function getDomainRestricted()
-  {
-    return $this->domainRestricted;
-  }
-  public function setItems($items)
-  {
-    $this->items = $items;
-  }
-  public function getItems()
-  {
-    return $this->items;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/PlusDomains/Activity.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/PlusDomains/Activity.php
deleted file mode 100644
index 1f2df37e..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/PlusDomains/Activity.php
+++ /dev/null
@@ -1,206 +0,0 @@
-access = $access;
-  }
-  public function getAccess()
-  {
-    return $this->access;
-  }
-  public function setActor(Google_Service_PlusDomains_ActivityActor $actor)
-  {
-    $this->actor = $actor;
-  }
-  public function getActor()
-  {
-    return $this->actor;
-  }
-  public function setAddress($address)
-  {
-    $this->address = $address;
-  }
-  public function getAddress()
-  {
-    return $this->address;
-  }
-  public function setAnnotation($annotation)
-  {
-    $this->annotation = $annotation;
-  }
-  public function getAnnotation()
-  {
-    return $this->annotation;
-  }
-  public function setCrosspostSource($crosspostSource)
-  {
-    $this->crosspostSource = $crosspostSource;
-  }
-  public function getCrosspostSource()
-  {
-    return $this->crosspostSource;
-  }
-  public function setEtag($etag)
-  {
-    $this->etag = $etag;
-  }
-  public function getEtag()
-  {
-    return $this->etag;
-  }
-  public function setGeocode($geocode)
-  {
-    $this->geocode = $geocode;
-  }
-  public function getGeocode()
-  {
-    return $this->geocode;
-  }
-  public function setId($id)
-  {
-    $this->id = $id;
-  }
-  public function getId()
-  {
-    return $this->id;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setLocation(Google_Service_PlusDomains_Place $location)
-  {
-    $this->location = $location;
-  }
-  public function getLocation()
-  {
-    return $this->location;
-  }
-  public function setObject(Google_Service_PlusDomains_ActivityObject $object)
-  {
-    $this->object = $object;
-  }
-  public function getObject()
-  {
-    return $this->object;
-  }
-  public function setPlaceId($placeId)
-  {
-    $this->placeId = $placeId;
-  }
-  public function getPlaceId()
-  {
-    return $this->placeId;
-  }
-  public function setPlaceName($placeName)
-  {
-    $this->placeName = $placeName;
-  }
-  public function getPlaceName()
-  {
-    return $this->placeName;
-  }
-  public function setProvider(Google_Service_PlusDomains_ActivityProvider $provider)
-  {
-    $this->provider = $provider;
-  }
-  public function getProvider()
-  {
-    return $this->provider;
-  }
-  public function setPublished($published)
-  {
-    $this->published = $published;
-  }
-  public function getPublished()
-  {
-    return $this->published;
-  }
-  public function setRadius($radius)
-  {
-    $this->radius = $radius;
-  }
-  public function getRadius()
-  {
-    return $this->radius;
-  }
-  public function setTitle($title)
-  {
-    $this->title = $title;
-  }
-  public function getTitle()
-  {
-    return $this->title;
-  }
-  public function setUpdated($updated)
-  {
-    $this->updated = $updated;
-  }
-  public function getUpdated()
-  {
-    return $this->updated;
-  }
-  public function setUrl($url)
-  {
-    $this->url = $url;
-  }
-  public function getUrl()
-  {
-    return $this->url;
-  }
-  public function setVerb($verb)
-  {
-    $this->verb = $verb;
-  }
-  public function getVerb()
-  {
-    return $this->verb;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/PlusDomains/ActivityActor.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/PlusDomains/ActivityActor.php
deleted file mode 100644
index 97e58265..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/PlusDomains/ActivityActor.php
+++ /dev/null
@@ -1,88 +0,0 @@
-clientSpecificActorInfo = $clientSpecificActorInfo;
-  }
-  public function getClientSpecificActorInfo()
-  {
-    return $this->clientSpecificActorInfo;
-  }
-  public function setDisplayName($displayName)
-  {
-    $this->displayName = $displayName;
-  }
-  public function getDisplayName()
-  {
-    return $this->displayName;
-  }
-  public function setId($id)
-  {
-    $this->id = $id;
-  }
-  public function getId()
-  {
-    return $this->id;
-  }
-  public function setImage(Google_Service_PlusDomains_ActivityActorImage $image)
-  {
-    $this->image = $image;
-  }
-  public function getImage()
-  {
-    return $this->image;
-  }
-  public function setName(Google_Service_PlusDomains_ActivityActorName $name)
-  {
-    $this->name = $name;
-  }
-  public function getName()
-  {
-    return $this->name;
-  }
-  public function setUrl($url)
-  {
-    $this->url = $url;
-  }
-  public function getUrl()
-  {
-    return $this->url;
-  }
-  public function setVerification(Google_Service_PlusDomains_ActivityActorVerification $verification)
-  {
-    $this->verification = $verification;
-  }
-  public function getVerification()
-  {
-    return $this->verification;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/PlusDomains/ActivityActorClientSpecificActorInfo.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/PlusDomains/ActivityActorClientSpecificActorInfo.php
deleted file mode 100644
index bba5a0dc..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/PlusDomains/ActivityActorClientSpecificActorInfo.php
+++ /dev/null
@@ -1,31 +0,0 @@
-youtubeActorInfo = $youtubeActorInfo;
-  }
-  public function getYoutubeActorInfo()
-  {
-    return $this->youtubeActorInfo;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/PlusDomains/ActivityActorClientSpecificActorInfoYoutubeActorInfo.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/PlusDomains/ActivityActorClientSpecificActorInfoYoutubeActorInfo.php
deleted file mode 100644
index 1d255ac4..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/PlusDomains/ActivityActorClientSpecificActorInfoYoutubeActorInfo.php
+++ /dev/null
@@ -1,30 +0,0 @@
-channelId = $channelId;
-  }
-  public function getChannelId()
-  {
-    return $this->channelId;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/PlusDomains/ActivityActorImage.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/PlusDomains/ActivityActorImage.php
deleted file mode 100644
index a752b05d..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/PlusDomains/ActivityActorImage.php
+++ /dev/null
@@ -1,30 +0,0 @@
-url = $url;
-  }
-  public function getUrl()
-  {
-    return $this->url;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/PlusDomains/ActivityActorName.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/PlusDomains/ActivityActorName.php
deleted file mode 100644
index ed035fea..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/PlusDomains/ActivityActorName.php
+++ /dev/null
@@ -1,39 +0,0 @@
-familyName = $familyName;
-  }
-  public function getFamilyName()
-  {
-    return $this->familyName;
-  }
-  public function setGivenName($givenName)
-  {
-    $this->givenName = $givenName;
-  }
-  public function getGivenName()
-  {
-    return $this->givenName;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/PlusDomains/ActivityActorVerification.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/PlusDomains/ActivityActorVerification.php
deleted file mode 100644
index db86d0b2..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/PlusDomains/ActivityActorVerification.php
+++ /dev/null
@@ -1,30 +0,0 @@
-adHocVerified = $adHocVerified;
-  }
-  public function getAdHocVerified()
-  {
-    return $this->adHocVerified;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/PlusDomains/ActivityFeed.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/PlusDomains/ActivityFeed.php
deleted file mode 100644
index 9b163b44..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/PlusDomains/ActivityFeed.php
+++ /dev/null
@@ -1,104 +0,0 @@
-etag = $etag;
-  }
-  public function getEtag()
-  {
-    return $this->etag;
-  }
-  public function setId($id)
-  {
-    $this->id = $id;
-  }
-  public function getId()
-  {
-    return $this->id;
-  }
-  public function setItems($items)
-  {
-    $this->items = $items;
-  }
-  public function getItems()
-  {
-    return $this->items;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setNextLink($nextLink)
-  {
-    $this->nextLink = $nextLink;
-  }
-  public function getNextLink()
-  {
-    return $this->nextLink;
-  }
-  public function setNextPageToken($nextPageToken)
-  {
-    $this->nextPageToken = $nextPageToken;
-  }
-  public function getNextPageToken()
-  {
-    return $this->nextPageToken;
-  }
-  public function setSelfLink($selfLink)
-  {
-    $this->selfLink = $selfLink;
-  }
-  public function getSelfLink()
-  {
-    return $this->selfLink;
-  }
-  public function setTitle($title)
-  {
-    $this->title = $title;
-  }
-  public function getTitle()
-  {
-    return $this->title;
-  }
-  public function setUpdated($updated)
-  {
-    $this->updated = $updated;
-  }
-  public function getUpdated()
-  {
-    return $this->updated;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/PlusDomains/ActivityObject.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/PlusDomains/ActivityObject.php
deleted file mode 100644
index a8bc9b86..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/PlusDomains/ActivityObject.php
+++ /dev/null
@@ -1,127 +0,0 @@
-actor = $actor;
-  }
-  public function getActor()
-  {
-    return $this->actor;
-  }
-  public function setAttachments($attachments)
-  {
-    $this->attachments = $attachments;
-  }
-  public function getAttachments()
-  {
-    return $this->attachments;
-  }
-  public function setContent($content)
-  {
-    $this->content = $content;
-  }
-  public function getContent()
-  {
-    return $this->content;
-  }
-  public function setId($id)
-  {
-    $this->id = $id;
-  }
-  public function getId()
-  {
-    return $this->id;
-  }
-  public function setObjectType($objectType)
-  {
-    $this->objectType = $objectType;
-  }
-  public function getObjectType()
-  {
-    return $this->objectType;
-  }
-  public function setOriginalContent($originalContent)
-  {
-    $this->originalContent = $originalContent;
-  }
-  public function getOriginalContent()
-  {
-    return $this->originalContent;
-  }
-  public function setPlusoners(Google_Service_PlusDomains_ActivityObjectPlusoners $plusoners)
-  {
-    $this->plusoners = $plusoners;
-  }
-  public function getPlusoners()
-  {
-    return $this->plusoners;
-  }
-  public function setReplies(Google_Service_PlusDomains_ActivityObjectReplies $replies)
-  {
-    $this->replies = $replies;
-  }
-  public function getReplies()
-  {
-    return $this->replies;
-  }
-  public function setResharers(Google_Service_PlusDomains_ActivityObjectResharers $resharers)
-  {
-    $this->resharers = $resharers;
-  }
-  public function getResharers()
-  {
-    return $this->resharers;
-  }
-  public function setStatusForViewer(Google_Service_PlusDomains_ActivityObjectStatusForViewer $statusForViewer)
-  {
-    $this->statusForViewer = $statusForViewer;
-  }
-  public function getStatusForViewer()
-  {
-    return $this->statusForViewer;
-  }
-  public function setUrl($url)
-  {
-    $this->url = $url;
-  }
-  public function getUrl()
-  {
-    return $this->url;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/PlusDomains/ActivityObjectActor.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/PlusDomains/ActivityObjectActor.php
deleted file mode 100644
index 9376ad40..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/PlusDomains/ActivityObjectActor.php
+++ /dev/null
@@ -1,78 +0,0 @@
-clientSpecificActorInfo = $clientSpecificActorInfo;
-  }
-  public function getClientSpecificActorInfo()
-  {
-    return $this->clientSpecificActorInfo;
-  }
-  public function setDisplayName($displayName)
-  {
-    $this->displayName = $displayName;
-  }
-  public function getDisplayName()
-  {
-    return $this->displayName;
-  }
-  public function setId($id)
-  {
-    $this->id = $id;
-  }
-  public function getId()
-  {
-    return $this->id;
-  }
-  public function setImage(Google_Service_PlusDomains_ActivityObjectActorImage $image)
-  {
-    $this->image = $image;
-  }
-  public function getImage()
-  {
-    return $this->image;
-  }
-  public function setUrl($url)
-  {
-    $this->url = $url;
-  }
-  public function getUrl()
-  {
-    return $this->url;
-  }
-  public function setVerification(Google_Service_PlusDomains_ActivityObjectActorVerification $verification)
-  {
-    $this->verification = $verification;
-  }
-  public function getVerification()
-  {
-    return $this->verification;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/PlusDomains/ActivityObjectActorClientSpecificActorInfo.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/PlusDomains/ActivityObjectActorClientSpecificActorInfo.php
deleted file mode 100644
index 0188e502..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/PlusDomains/ActivityObjectActorClientSpecificActorInfo.php
+++ /dev/null
@@ -1,31 +0,0 @@
-youtubeActorInfo = $youtubeActorInfo;
-  }
-  public function getYoutubeActorInfo()
-  {
-    return $this->youtubeActorInfo;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/PlusDomains/ActivityObjectActorClientSpecificActorInfoYoutubeActorInfo.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/PlusDomains/ActivityObjectActorClientSpecificActorInfoYoutubeActorInfo.php
deleted file mode 100644
index 1105e125..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/PlusDomains/ActivityObjectActorClientSpecificActorInfoYoutubeActorInfo.php
+++ /dev/null
@@ -1,30 +0,0 @@
-channelId = $channelId;
-  }
-  public function getChannelId()
-  {
-    return $this->channelId;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/PlusDomains/ActivityObjectActorImage.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/PlusDomains/ActivityObjectActorImage.php
deleted file mode 100644
index f0ff502c..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/PlusDomains/ActivityObjectActorImage.php
+++ /dev/null
@@ -1,30 +0,0 @@
-url = $url;
-  }
-  public function getUrl()
-  {
-    return $this->url;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/PlusDomains/ActivityObjectActorVerification.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/PlusDomains/ActivityObjectActorVerification.php
deleted file mode 100644
index e1586982..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/PlusDomains/ActivityObjectActorVerification.php
+++ /dev/null
@@ -1,30 +0,0 @@
-adHocVerified = $adHocVerified;
-  }
-  public function getAdHocVerified()
-  {
-    return $this->adHocVerified;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/PlusDomains/ActivityObjectAttachments.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/PlusDomains/ActivityObjectAttachments.php
deleted file mode 100644
index 3a0e9ebd..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/PlusDomains/ActivityObjectAttachments.php
+++ /dev/null
@@ -1,117 +0,0 @@
-content = $content;
-  }
-  public function getContent()
-  {
-    return $this->content;
-  }
-  public function setDisplayName($displayName)
-  {
-    $this->displayName = $displayName;
-  }
-  public function getDisplayName()
-  {
-    return $this->displayName;
-  }
-  public function setEmbed(Google_Service_PlusDomains_ActivityObjectAttachmentsEmbed $embed)
-  {
-    $this->embed = $embed;
-  }
-  public function getEmbed()
-  {
-    return $this->embed;
-  }
-  public function setFullImage(Google_Service_PlusDomains_ActivityObjectAttachmentsFullImage $fullImage)
-  {
-    $this->fullImage = $fullImage;
-  }
-  public function getFullImage()
-  {
-    return $this->fullImage;
-  }
-  public function setId($id)
-  {
-    $this->id = $id;
-  }
-  public function getId()
-  {
-    return $this->id;
-  }
-  public function setImage(Google_Service_PlusDomains_ActivityObjectAttachmentsImage $image)
-  {
-    $this->image = $image;
-  }
-  public function getImage()
-  {
-    return $this->image;
-  }
-  public function setObjectType($objectType)
-  {
-    $this->objectType = $objectType;
-  }
-  public function getObjectType()
-  {
-    return $this->objectType;
-  }
-  public function setPreviewThumbnails($previewThumbnails)
-  {
-    $this->previewThumbnails = $previewThumbnails;
-  }
-  public function getPreviewThumbnails()
-  {
-    return $this->previewThumbnails;
-  }
-  public function setThumbnails($thumbnails)
-  {
-    $this->thumbnails = $thumbnails;
-  }
-  public function getThumbnails()
-  {
-    return $this->thumbnails;
-  }
-  public function setUrl($url)
-  {
-    $this->url = $url;
-  }
-  public function getUrl()
-  {
-    return $this->url;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/PlusDomains/ActivityObjectAttachmentsEmbed.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/PlusDomains/ActivityObjectAttachmentsEmbed.php
deleted file mode 100644
index c2c0c591..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/PlusDomains/ActivityObjectAttachmentsEmbed.php
+++ /dev/null
@@ -1,39 +0,0 @@
-type = $type;
-  }
-  public function getType()
-  {
-    return $this->type;
-  }
-  public function setUrl($url)
-  {
-    $this->url = $url;
-  }
-  public function getUrl()
-  {
-    return $this->url;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/PlusDomains/ActivityObjectAttachmentsFullImage.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/PlusDomains/ActivityObjectAttachmentsFullImage.php
deleted file mode 100644
index f06394f8..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/PlusDomains/ActivityObjectAttachmentsFullImage.php
+++ /dev/null
@@ -1,57 +0,0 @@
-height = $height;
-  }
-  public function getHeight()
-  {
-    return $this->height;
-  }
-  public function setType($type)
-  {
-    $this->type = $type;
-  }
-  public function getType()
-  {
-    return $this->type;
-  }
-  public function setUrl($url)
-  {
-    $this->url = $url;
-  }
-  public function getUrl()
-  {
-    return $this->url;
-  }
-  public function setWidth($width)
-  {
-    $this->width = $width;
-  }
-  public function getWidth()
-  {
-    return $this->width;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/PlusDomains/ActivityObjectAttachmentsImage.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/PlusDomains/ActivityObjectAttachmentsImage.php
deleted file mode 100644
index 60ece099..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/PlusDomains/ActivityObjectAttachmentsImage.php
+++ /dev/null
@@ -1,57 +0,0 @@
-height = $height;
-  }
-  public function getHeight()
-  {
-    return $this->height;
-  }
-  public function setType($type)
-  {
-    $this->type = $type;
-  }
-  public function getType()
-  {
-    return $this->type;
-  }
-  public function setUrl($url)
-  {
-    $this->url = $url;
-  }
-  public function getUrl()
-  {
-    return $this->url;
-  }
-  public function setWidth($width)
-  {
-    $this->width = $width;
-  }
-  public function getWidth()
-  {
-    return $this->width;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/PlusDomains/ActivityObjectAttachmentsPreviewThumbnails.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/PlusDomains/ActivityObjectAttachmentsPreviewThumbnails.php
deleted file mode 100644
index f67f0f5b..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/PlusDomains/ActivityObjectAttachmentsPreviewThumbnails.php
+++ /dev/null
@@ -1,30 +0,0 @@
-url = $url;
-  }
-  public function getUrl()
-  {
-    return $this->url;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/PlusDomains/ActivityObjectAttachmentsThumbnails.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/PlusDomains/ActivityObjectAttachmentsThumbnails.php
deleted file mode 100644
index 3196e4d9..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/PlusDomains/ActivityObjectAttachmentsThumbnails.php
+++ /dev/null
@@ -1,49 +0,0 @@
-description = $description;
-  }
-  public function getDescription()
-  {
-    return $this->description;
-  }
-  public function setImage(Google_Service_PlusDomains_ActivityObjectAttachmentsThumbnailsImage $image)
-  {
-    $this->image = $image;
-  }
-  public function getImage()
-  {
-    return $this->image;
-  }
-  public function setUrl($url)
-  {
-    $this->url = $url;
-  }
-  public function getUrl()
-  {
-    return $this->url;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/PlusDomains/ActivityObjectAttachmentsThumbnailsImage.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/PlusDomains/ActivityObjectAttachmentsThumbnailsImage.php
deleted file mode 100644
index 70e1c5de..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/PlusDomains/ActivityObjectAttachmentsThumbnailsImage.php
+++ /dev/null
@@ -1,57 +0,0 @@
-height = $height;
-  }
-  public function getHeight()
-  {
-    return $this->height;
-  }
-  public function setType($type)
-  {
-    $this->type = $type;
-  }
-  public function getType()
-  {
-    return $this->type;
-  }
-  public function setUrl($url)
-  {
-    $this->url = $url;
-  }
-  public function getUrl()
-  {
-    return $this->url;
-  }
-  public function setWidth($width)
-  {
-    $this->width = $width;
-  }
-  public function getWidth()
-  {
-    return $this->width;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/PlusDomains/ActivityObjectPlusoners.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/PlusDomains/ActivityObjectPlusoners.php
deleted file mode 100644
index 62b2ebfd..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/PlusDomains/ActivityObjectPlusoners.php
+++ /dev/null
@@ -1,39 +0,0 @@
-selfLink = $selfLink;
-  }
-  public function getSelfLink()
-  {
-    return $this->selfLink;
-  }
-  public function setTotalItems($totalItems)
-  {
-    $this->totalItems = $totalItems;
-  }
-  public function getTotalItems()
-  {
-    return $this->totalItems;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/PlusDomains/ActivityObjectReplies.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/PlusDomains/ActivityObjectReplies.php
deleted file mode 100644
index d4cbbe49..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/PlusDomains/ActivityObjectReplies.php
+++ /dev/null
@@ -1,39 +0,0 @@
-selfLink = $selfLink;
-  }
-  public function getSelfLink()
-  {
-    return $this->selfLink;
-  }
-  public function setTotalItems($totalItems)
-  {
-    $this->totalItems = $totalItems;
-  }
-  public function getTotalItems()
-  {
-    return $this->totalItems;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/PlusDomains/ActivityObjectResharers.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/PlusDomains/ActivityObjectResharers.php
deleted file mode 100644
index afc2a9e3..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/PlusDomains/ActivityObjectResharers.php
+++ /dev/null
@@ -1,39 +0,0 @@
-selfLink = $selfLink;
-  }
-  public function getSelfLink()
-  {
-    return $this->selfLink;
-  }
-  public function setTotalItems($totalItems)
-  {
-    $this->totalItems = $totalItems;
-  }
-  public function getTotalItems()
-  {
-    return $this->totalItems;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/PlusDomains/ActivityObjectStatusForViewer.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/PlusDomains/ActivityObjectStatusForViewer.php
deleted file mode 100644
index 8401d62b..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/PlusDomains/ActivityObjectStatusForViewer.php
+++ /dev/null
@@ -1,66 +0,0 @@
-canComment = $canComment;
-  }
-  public function getCanComment()
-  {
-    return $this->canComment;
-  }
-  public function setCanPlusone($canPlusone)
-  {
-    $this->canPlusone = $canPlusone;
-  }
-  public function getCanPlusone()
-  {
-    return $this->canPlusone;
-  }
-  public function setCanUpdate($canUpdate)
-  {
-    $this->canUpdate = $canUpdate;
-  }
-  public function getCanUpdate()
-  {
-    return $this->canUpdate;
-  }
-  public function setIsPlusOned($isPlusOned)
-  {
-    $this->isPlusOned = $isPlusOned;
-  }
-  public function getIsPlusOned()
-  {
-    return $this->isPlusOned;
-  }
-  public function setResharingDisabled($resharingDisabled)
-  {
-    $this->resharingDisabled = $resharingDisabled;
-  }
-  public function getResharingDisabled()
-  {
-    return $this->resharingDisabled;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/PlusDomains/ActivityProvider.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/PlusDomains/ActivityProvider.php
deleted file mode 100644
index bab95e6a..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/PlusDomains/ActivityProvider.php
+++ /dev/null
@@ -1,30 +0,0 @@
-title = $title;
-  }
-  public function getTitle()
-  {
-    return $this->title;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/PlusDomains/Audience.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/PlusDomains/Audience.php
deleted file mode 100644
index 7298be84..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/PlusDomains/Audience.php
+++ /dev/null
@@ -1,67 +0,0 @@
-etag = $etag;
-  }
-  public function getEtag()
-  {
-    return $this->etag;
-  }
-  public function setItem(Google_Service_PlusDomains_PlusDomainsAclentryResource $item)
-  {
-    $this->item = $item;
-  }
-  public function getItem()
-  {
-    return $this->item;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setMemberCount($memberCount)
-  {
-    $this->memberCount = $memberCount;
-  }
-  public function getMemberCount()
-  {
-    return $this->memberCount;
-  }
-  public function setVisibility($visibility)
-  {
-    $this->visibility = $visibility;
-  }
-  public function getVisibility()
-  {
-    return $this->visibility;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/PlusDomains/AudiencesFeed.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/PlusDomains/AudiencesFeed.php
deleted file mode 100644
index 65a3ec45..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/PlusDomains/AudiencesFeed.php
+++ /dev/null
@@ -1,68 +0,0 @@
-etag = $etag;
-  }
-  public function getEtag()
-  {
-    return $this->etag;
-  }
-  public function setItems($items)
-  {
-    $this->items = $items;
-  }
-  public function getItems()
-  {
-    return $this->items;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setNextPageToken($nextPageToken)
-  {
-    $this->nextPageToken = $nextPageToken;
-  }
-  public function getNextPageToken()
-  {
-    return $this->nextPageToken;
-  }
-  public function setTotalItems($totalItems)
-  {
-    $this->totalItems = $totalItems;
-  }
-  public function getTotalItems()
-  {
-    return $this->totalItems;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/PlusDomains/Circle.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/PlusDomains/Circle.php
deleted file mode 100644
index c21061aa..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/PlusDomains/Circle.php
+++ /dev/null
@@ -1,85 +0,0 @@
-description = $description;
-  }
-  public function getDescription()
-  {
-    return $this->description;
-  }
-  public function setDisplayName($displayName)
-  {
-    $this->displayName = $displayName;
-  }
-  public function getDisplayName()
-  {
-    return $this->displayName;
-  }
-  public function setEtag($etag)
-  {
-    $this->etag = $etag;
-  }
-  public function getEtag()
-  {
-    return $this->etag;
-  }
-  public function setId($id)
-  {
-    $this->id = $id;
-  }
-  public function getId()
-  {
-    return $this->id;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setPeople(Google_Service_PlusDomains_CirclePeople $people)
-  {
-    $this->people = $people;
-  }
-  public function getPeople()
-  {
-    return $this->people;
-  }
-  public function setSelfLink($selfLink)
-  {
-    $this->selfLink = $selfLink;
-  }
-  public function getSelfLink()
-  {
-    return $this->selfLink;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/PlusDomains/CircleFeed.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/PlusDomains/CircleFeed.php
deleted file mode 100644
index 78eb2af4..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/PlusDomains/CircleFeed.php
+++ /dev/null
@@ -1,95 +0,0 @@
-etag = $etag;
-  }
-  public function getEtag()
-  {
-    return $this->etag;
-  }
-  public function setItems($items)
-  {
-    $this->items = $items;
-  }
-  public function getItems()
-  {
-    return $this->items;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setNextLink($nextLink)
-  {
-    $this->nextLink = $nextLink;
-  }
-  public function getNextLink()
-  {
-    return $this->nextLink;
-  }
-  public function setNextPageToken($nextPageToken)
-  {
-    $this->nextPageToken = $nextPageToken;
-  }
-  public function getNextPageToken()
-  {
-    return $this->nextPageToken;
-  }
-  public function setSelfLink($selfLink)
-  {
-    $this->selfLink = $selfLink;
-  }
-  public function getSelfLink()
-  {
-    return $this->selfLink;
-  }
-  public function setTitle($title)
-  {
-    $this->title = $title;
-  }
-  public function getTitle()
-  {
-    return $this->title;
-  }
-  public function setTotalItems($totalItems)
-  {
-    $this->totalItems = $totalItems;
-  }
-  public function getTotalItems()
-  {
-    return $this->totalItems;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/PlusDomains/CirclePeople.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/PlusDomains/CirclePeople.php
deleted file mode 100644
index 1d3c63c6..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/PlusDomains/CirclePeople.php
+++ /dev/null
@@ -1,30 +0,0 @@
-totalItems = $totalItems;
-  }
-  public function getTotalItems()
-  {
-    return $this->totalItems;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/PlusDomains/Comment.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/PlusDomains/Comment.php
deleted file mode 100644
index 8795db8c..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/PlusDomains/Comment.php
+++ /dev/null
@@ -1,125 +0,0 @@
-actor = $actor;
-  }
-  public function getActor()
-  {
-    return $this->actor;
-  }
-  public function setEtag($etag)
-  {
-    $this->etag = $etag;
-  }
-  public function getEtag()
-  {
-    return $this->etag;
-  }
-  public function setId($id)
-  {
-    $this->id = $id;
-  }
-  public function getId()
-  {
-    return $this->id;
-  }
-  public function setInReplyTo($inReplyTo)
-  {
-    $this->inReplyTo = $inReplyTo;
-  }
-  public function getInReplyTo()
-  {
-    return $this->inReplyTo;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setObject(Google_Service_PlusDomains_CommentObject $object)
-  {
-    $this->object = $object;
-  }
-  public function getObject()
-  {
-    return $this->object;
-  }
-  public function setPlusoners(Google_Service_PlusDomains_CommentPlusoners $plusoners)
-  {
-    $this->plusoners = $plusoners;
-  }
-  public function getPlusoners()
-  {
-    return $this->plusoners;
-  }
-  public function setPublished($published)
-  {
-    $this->published = $published;
-  }
-  public function getPublished()
-  {
-    return $this->published;
-  }
-  public function setSelfLink($selfLink)
-  {
-    $this->selfLink = $selfLink;
-  }
-  public function getSelfLink()
-  {
-    return $this->selfLink;
-  }
-  public function setUpdated($updated)
-  {
-    $this->updated = $updated;
-  }
-  public function getUpdated()
-  {
-    return $this->updated;
-  }
-  public function setVerb($verb)
-  {
-    $this->verb = $verb;
-  }
-  public function getVerb()
-  {
-    return $this->verb;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/PlusDomains/CommentActor.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/PlusDomains/CommentActor.php
deleted file mode 100644
index 3477f1f0..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/PlusDomains/CommentActor.php
+++ /dev/null
@@ -1,78 +0,0 @@
-clientSpecificActorInfo = $clientSpecificActorInfo;
-  }
-  public function getClientSpecificActorInfo()
-  {
-    return $this->clientSpecificActorInfo;
-  }
-  public function setDisplayName($displayName)
-  {
-    $this->displayName = $displayName;
-  }
-  public function getDisplayName()
-  {
-    return $this->displayName;
-  }
-  public function setId($id)
-  {
-    $this->id = $id;
-  }
-  public function getId()
-  {
-    return $this->id;
-  }
-  public function setImage(Google_Service_PlusDomains_CommentActorImage $image)
-  {
-    $this->image = $image;
-  }
-  public function getImage()
-  {
-    return $this->image;
-  }
-  public function setUrl($url)
-  {
-    $this->url = $url;
-  }
-  public function getUrl()
-  {
-    return $this->url;
-  }
-  public function setVerification(Google_Service_PlusDomains_CommentActorVerification $verification)
-  {
-    $this->verification = $verification;
-  }
-  public function getVerification()
-  {
-    return $this->verification;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/PlusDomains/CommentActorClientSpecificActorInfo.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/PlusDomains/CommentActorClientSpecificActorInfo.php
deleted file mode 100644
index b09cab3c..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/PlusDomains/CommentActorClientSpecificActorInfo.php
+++ /dev/null
@@ -1,31 +0,0 @@
-youtubeActorInfo = $youtubeActorInfo;
-  }
-  public function getYoutubeActorInfo()
-  {
-    return $this->youtubeActorInfo;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/PlusDomains/CommentActorClientSpecificActorInfoYoutubeActorInfo.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/PlusDomains/CommentActorClientSpecificActorInfoYoutubeActorInfo.php
deleted file mode 100644
index 6e1652e5..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/PlusDomains/CommentActorClientSpecificActorInfoYoutubeActorInfo.php
+++ /dev/null
@@ -1,30 +0,0 @@
-channelId = $channelId;
-  }
-  public function getChannelId()
-  {
-    return $this->channelId;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/PlusDomains/CommentActorImage.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/PlusDomains/CommentActorImage.php
deleted file mode 100644
index 478f9d4c..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/PlusDomains/CommentActorImage.php
+++ /dev/null
@@ -1,30 +0,0 @@
-url = $url;
-  }
-  public function getUrl()
-  {
-    return $this->url;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/PlusDomains/CommentActorVerification.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/PlusDomains/CommentActorVerification.php
deleted file mode 100644
index ebd23118..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/PlusDomains/CommentActorVerification.php
+++ /dev/null
@@ -1,30 +0,0 @@
-adHocVerified = $adHocVerified;
-  }
-  public function getAdHocVerified()
-  {
-    return $this->adHocVerified;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/PlusDomains/CommentFeed.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/PlusDomains/CommentFeed.php
deleted file mode 100644
index 2ca7cf06..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/PlusDomains/CommentFeed.php
+++ /dev/null
@@ -1,95 +0,0 @@
-etag = $etag;
-  }
-  public function getEtag()
-  {
-    return $this->etag;
-  }
-  public function setId($id)
-  {
-    $this->id = $id;
-  }
-  public function getId()
-  {
-    return $this->id;
-  }
-  public function setItems($items)
-  {
-    $this->items = $items;
-  }
-  public function getItems()
-  {
-    return $this->items;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setNextLink($nextLink)
-  {
-    $this->nextLink = $nextLink;
-  }
-  public function getNextLink()
-  {
-    return $this->nextLink;
-  }
-  public function setNextPageToken($nextPageToken)
-  {
-    $this->nextPageToken = $nextPageToken;
-  }
-  public function getNextPageToken()
-  {
-    return $this->nextPageToken;
-  }
-  public function setTitle($title)
-  {
-    $this->title = $title;
-  }
-  public function getTitle()
-  {
-    return $this->title;
-  }
-  public function setUpdated($updated)
-  {
-    $this->updated = $updated;
-  }
-  public function getUpdated()
-  {
-    return $this->updated;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/PlusDomains/CommentInReplyTo.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/PlusDomains/CommentInReplyTo.php
deleted file mode 100644
index 5d37cbeb..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/PlusDomains/CommentInReplyTo.php
+++ /dev/null
@@ -1,39 +0,0 @@
-id = $id;
-  }
-  public function getId()
-  {
-    return $this->id;
-  }
-  public function setUrl($url)
-  {
-    $this->url = $url;
-  }
-  public function getUrl()
-  {
-    return $this->url;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/PlusDomains/CommentObject.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/PlusDomains/CommentObject.php
deleted file mode 100644
index dc3b3e48..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/PlusDomains/CommentObject.php
+++ /dev/null
@@ -1,48 +0,0 @@
-content = $content;
-  }
-  public function getContent()
-  {
-    return $this->content;
-  }
-  public function setObjectType($objectType)
-  {
-    $this->objectType = $objectType;
-  }
-  public function getObjectType()
-  {
-    return $this->objectType;
-  }
-  public function setOriginalContent($originalContent)
-  {
-    $this->originalContent = $originalContent;
-  }
-  public function getOriginalContent()
-  {
-    return $this->originalContent;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/PlusDomains/CommentPlusoners.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/PlusDomains/CommentPlusoners.php
deleted file mode 100644
index e428e5d6..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/PlusDomains/CommentPlusoners.php
+++ /dev/null
@@ -1,30 +0,0 @@
-totalItems = $totalItems;
-  }
-  public function getTotalItems()
-  {
-    return $this->totalItems;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/PlusDomains/Media.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/PlusDomains/Media.php
deleted file mode 100644
index f4ba8f9f..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/PlusDomains/Media.php
+++ /dev/null
@@ -1,187 +0,0 @@
-author = $author;
-  }
-  public function getAuthor()
-  {
-    return $this->author;
-  }
-  public function setDisplayName($displayName)
-  {
-    $this->displayName = $displayName;
-  }
-  public function getDisplayName()
-  {
-    return $this->displayName;
-  }
-  public function setEtag($etag)
-  {
-    $this->etag = $etag;
-  }
-  public function getEtag()
-  {
-    return $this->etag;
-  }
-  public function setExif(Google_Service_PlusDomains_MediaExif $exif)
-  {
-    $this->exif = $exif;
-  }
-  public function getExif()
-  {
-    return $this->exif;
-  }
-  public function setHeight($height)
-  {
-    $this->height = $height;
-  }
-  public function getHeight()
-  {
-    return $this->height;
-  }
-  public function setId($id)
-  {
-    $this->id = $id;
-  }
-  public function getId()
-  {
-    return $this->id;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setMediaCreatedTime($mediaCreatedTime)
-  {
-    $this->mediaCreatedTime = $mediaCreatedTime;
-  }
-  public function getMediaCreatedTime()
-  {
-    return $this->mediaCreatedTime;
-  }
-  public function setMediaUrl($mediaUrl)
-  {
-    $this->mediaUrl = $mediaUrl;
-  }
-  public function getMediaUrl()
-  {
-    return $this->mediaUrl;
-  }
-  public function setPublished($published)
-  {
-    $this->published = $published;
-  }
-  public function getPublished()
-  {
-    return $this->published;
-  }
-  public function setSizeBytes($sizeBytes)
-  {
-    $this->sizeBytes = $sizeBytes;
-  }
-  public function getSizeBytes()
-  {
-    return $this->sizeBytes;
-  }
-  public function setStreams($streams)
-  {
-    $this->streams = $streams;
-  }
-  public function getStreams()
-  {
-    return $this->streams;
-  }
-  public function setSummary($summary)
-  {
-    $this->summary = $summary;
-  }
-  public function getSummary()
-  {
-    return $this->summary;
-  }
-  public function setUpdated($updated)
-  {
-    $this->updated = $updated;
-  }
-  public function getUpdated()
-  {
-    return $this->updated;
-  }
-  public function setUrl($url)
-  {
-    $this->url = $url;
-  }
-  public function getUrl()
-  {
-    return $this->url;
-  }
-  public function setVideoDuration($videoDuration)
-  {
-    $this->videoDuration = $videoDuration;
-  }
-  public function getVideoDuration()
-  {
-    return $this->videoDuration;
-  }
-  public function setVideoStatus($videoStatus)
-  {
-    $this->videoStatus = $videoStatus;
-  }
-  public function getVideoStatus()
-  {
-    return $this->videoStatus;
-  }
-  public function setWidth($width)
-  {
-    $this->width = $width;
-  }
-  public function getWidth()
-  {
-    return $this->width;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/PlusDomains/MediaAuthor.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/PlusDomains/MediaAuthor.php
deleted file mode 100644
index 26edbf06..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/PlusDomains/MediaAuthor.php
+++ /dev/null
@@ -1,58 +0,0 @@
-displayName = $displayName;
-  }
-  public function getDisplayName()
-  {
-    return $this->displayName;
-  }
-  public function setId($id)
-  {
-    $this->id = $id;
-  }
-  public function getId()
-  {
-    return $this->id;
-  }
-  public function setImage(Google_Service_PlusDomains_MediaAuthorImage $image)
-  {
-    $this->image = $image;
-  }
-  public function getImage()
-  {
-    return $this->image;
-  }
-  public function setUrl($url)
-  {
-    $this->url = $url;
-  }
-  public function getUrl()
-  {
-    return $this->url;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/PlusDomains/MediaAuthorImage.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/PlusDomains/MediaAuthorImage.php
deleted file mode 100644
index 03ee3257..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/PlusDomains/MediaAuthorImage.php
+++ /dev/null
@@ -1,30 +0,0 @@
-url = $url;
-  }
-  public function getUrl()
-  {
-    return $this->url;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/PlusDomains/MediaExif.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/PlusDomains/MediaExif.php
deleted file mode 100644
index 71480985..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/PlusDomains/MediaExif.php
+++ /dev/null
@@ -1,30 +0,0 @@
-time = $time;
-  }
-  public function getTime()
-  {
-    return $this->time;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/PlusDomains/PeopleFeed.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/PlusDomains/PeopleFeed.php
deleted file mode 100644
index f944a30e..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/PlusDomains/PeopleFeed.php
+++ /dev/null
@@ -1,86 +0,0 @@
-etag = $etag;
-  }
-  public function getEtag()
-  {
-    return $this->etag;
-  }
-  public function setItems($items)
-  {
-    $this->items = $items;
-  }
-  public function getItems()
-  {
-    return $this->items;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setNextPageToken($nextPageToken)
-  {
-    $this->nextPageToken = $nextPageToken;
-  }
-  public function getNextPageToken()
-  {
-    return $this->nextPageToken;
-  }
-  public function setSelfLink($selfLink)
-  {
-    $this->selfLink = $selfLink;
-  }
-  public function getSelfLink()
-  {
-    return $this->selfLink;
-  }
-  public function setTitle($title)
-  {
-    $this->title = $title;
-  }
-  public function getTitle()
-  {
-    return $this->title;
-  }
-  public function setTotalItems($totalItems)
-  {
-    $this->totalItems = $totalItems;
-  }
-  public function getTotalItems()
-  {
-    return $this->totalItems;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/PlusDomains/Person.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/PlusDomains/Person.php
deleted file mode 100644
index f1f0fa78..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/PlusDomains/Person.php
+++ /dev/null
@@ -1,281 +0,0 @@
-aboutMe = $aboutMe;
-  }
-  public function getAboutMe()
-  {
-    return $this->aboutMe;
-  }
-  public function setBirthday($birthday)
-  {
-    $this->birthday = $birthday;
-  }
-  public function getBirthday()
-  {
-    return $this->birthday;
-  }
-  public function setBraggingRights($braggingRights)
-  {
-    $this->braggingRights = $braggingRights;
-  }
-  public function getBraggingRights()
-  {
-    return $this->braggingRights;
-  }
-  public function setCircledByCount($circledByCount)
-  {
-    $this->circledByCount = $circledByCount;
-  }
-  public function getCircledByCount()
-  {
-    return $this->circledByCount;
-  }
-  public function setCover(Google_Service_PlusDomains_PersonCover $cover)
-  {
-    $this->cover = $cover;
-  }
-  public function getCover()
-  {
-    return $this->cover;
-  }
-  public function setCurrentLocation($currentLocation)
-  {
-    $this->currentLocation = $currentLocation;
-  }
-  public function getCurrentLocation()
-  {
-    return $this->currentLocation;
-  }
-  public function setDisplayName($displayName)
-  {
-    $this->displayName = $displayName;
-  }
-  public function getDisplayName()
-  {
-    return $this->displayName;
-  }
-  public function setDomain($domain)
-  {
-    $this->domain = $domain;
-  }
-  public function getDomain()
-  {
-    return $this->domain;
-  }
-  public function setEmails($emails)
-  {
-    $this->emails = $emails;
-  }
-  public function getEmails()
-  {
-    return $this->emails;
-  }
-  public function setEtag($etag)
-  {
-    $this->etag = $etag;
-  }
-  public function getEtag()
-  {
-    return $this->etag;
-  }
-  public function setGender($gender)
-  {
-    $this->gender = $gender;
-  }
-  public function getGender()
-  {
-    return $this->gender;
-  }
-  public function setId($id)
-  {
-    $this->id = $id;
-  }
-  public function getId()
-  {
-    return $this->id;
-  }
-  public function setImage(Google_Service_PlusDomains_PersonImage $image)
-  {
-    $this->image = $image;
-  }
-  public function getImage()
-  {
-    return $this->image;
-  }
-  public function setIsPlusUser($isPlusUser)
-  {
-    $this->isPlusUser = $isPlusUser;
-  }
-  public function getIsPlusUser()
-  {
-    return $this->isPlusUser;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setName(Google_Service_PlusDomains_PersonName $name)
-  {
-    $this->name = $name;
-  }
-  public function getName()
-  {
-    return $this->name;
-  }
-  public function setNickname($nickname)
-  {
-    $this->nickname = $nickname;
-  }
-  public function getNickname()
-  {
-    return $this->nickname;
-  }
-  public function setObjectType($objectType)
-  {
-    $this->objectType = $objectType;
-  }
-  public function getObjectType()
-  {
-    return $this->objectType;
-  }
-  public function setOccupation($occupation)
-  {
-    $this->occupation = $occupation;
-  }
-  public function getOccupation()
-  {
-    return $this->occupation;
-  }
-  public function setOrganizations($organizations)
-  {
-    $this->organizations = $organizations;
-  }
-  public function getOrganizations()
-  {
-    return $this->organizations;
-  }
-  public function setPlacesLived($placesLived)
-  {
-    $this->placesLived = $placesLived;
-  }
-  public function getPlacesLived()
-  {
-    return $this->placesLived;
-  }
-  public function setPlusOneCount($plusOneCount)
-  {
-    $this->plusOneCount = $plusOneCount;
-  }
-  public function getPlusOneCount()
-  {
-    return $this->plusOneCount;
-  }
-  public function setRelationshipStatus($relationshipStatus)
-  {
-    $this->relationshipStatus = $relationshipStatus;
-  }
-  public function getRelationshipStatus()
-  {
-    return $this->relationshipStatus;
-  }
-  public function setSkills($skills)
-  {
-    $this->skills = $skills;
-  }
-  public function getSkills()
-  {
-    return $this->skills;
-  }
-  public function setTagline($tagline)
-  {
-    $this->tagline = $tagline;
-  }
-  public function getTagline()
-  {
-    return $this->tagline;
-  }
-  public function setUrl($url)
-  {
-    $this->url = $url;
-  }
-  public function getUrl()
-  {
-    return $this->url;
-  }
-  public function setUrls($urls)
-  {
-    $this->urls = $urls;
-  }
-  public function getUrls()
-  {
-    return $this->urls;
-  }
-  public function setVerified($verified)
-  {
-    $this->verified = $verified;
-  }
-  public function getVerified()
-  {
-    return $this->verified;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/PlusDomains/PersonCover.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/PlusDomains/PersonCover.php
deleted file mode 100644
index a309e77b..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/PlusDomains/PersonCover.php
+++ /dev/null
@@ -1,50 +0,0 @@
-coverInfo = $coverInfo;
-  }
-  public function getCoverInfo()
-  {
-    return $this->coverInfo;
-  }
-  public function setCoverPhoto(Google_Service_PlusDomains_PersonCoverCoverPhoto $coverPhoto)
-  {
-    $this->coverPhoto = $coverPhoto;
-  }
-  public function getCoverPhoto()
-  {
-    return $this->coverPhoto;
-  }
-  public function setLayout($layout)
-  {
-    $this->layout = $layout;
-  }
-  public function getLayout()
-  {
-    return $this->layout;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/PlusDomains/PersonCoverCoverInfo.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/PlusDomains/PersonCoverCoverInfo.php
deleted file mode 100644
index f034e41e..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/PlusDomains/PersonCoverCoverInfo.php
+++ /dev/null
@@ -1,39 +0,0 @@
-leftImageOffset = $leftImageOffset;
-  }
-  public function getLeftImageOffset()
-  {
-    return $this->leftImageOffset;
-  }
-  public function setTopImageOffset($topImageOffset)
-  {
-    $this->topImageOffset = $topImageOffset;
-  }
-  public function getTopImageOffset()
-  {
-    return $this->topImageOffset;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/PlusDomains/PersonCoverCoverPhoto.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/PlusDomains/PersonCoverCoverPhoto.php
deleted file mode 100644
index 28cf9f63..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/PlusDomains/PersonCoverCoverPhoto.php
+++ /dev/null
@@ -1,48 +0,0 @@
-height = $height;
-  }
-  public function getHeight()
-  {
-    return $this->height;
-  }
-  public function setUrl($url)
-  {
-    $this->url = $url;
-  }
-  public function getUrl()
-  {
-    return $this->url;
-  }
-  public function setWidth($width)
-  {
-    $this->width = $width;
-  }
-  public function getWidth()
-  {
-    return $this->width;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/PlusDomains/PersonEmails.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/PlusDomains/PersonEmails.php
deleted file mode 100644
index b399be36..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/PlusDomains/PersonEmails.php
+++ /dev/null
@@ -1,39 +0,0 @@
-type = $type;
-  }
-  public function getType()
-  {
-    return $this->type;
-  }
-  public function setValue($value)
-  {
-    $this->value = $value;
-  }
-  public function getValue()
-  {
-    return $this->value;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/PlusDomains/PersonImage.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/PlusDomains/PersonImage.php
deleted file mode 100644
index fa6e6924..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/PlusDomains/PersonImage.php
+++ /dev/null
@@ -1,39 +0,0 @@
-isDefault = $isDefault;
-  }
-  public function getIsDefault()
-  {
-    return $this->isDefault;
-  }
-  public function setUrl($url)
-  {
-    $this->url = $url;
-  }
-  public function getUrl()
-  {
-    return $this->url;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/PlusDomains/PersonName.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/PlusDomains/PersonName.php
deleted file mode 100644
index 8878b219..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/PlusDomains/PersonName.php
+++ /dev/null
@@ -1,75 +0,0 @@
-familyName = $familyName;
-  }
-  public function getFamilyName()
-  {
-    return $this->familyName;
-  }
-  public function setFormatted($formatted)
-  {
-    $this->formatted = $formatted;
-  }
-  public function getFormatted()
-  {
-    return $this->formatted;
-  }
-  public function setGivenName($givenName)
-  {
-    $this->givenName = $givenName;
-  }
-  public function getGivenName()
-  {
-    return $this->givenName;
-  }
-  public function setHonorificPrefix($honorificPrefix)
-  {
-    $this->honorificPrefix = $honorificPrefix;
-  }
-  public function getHonorificPrefix()
-  {
-    return $this->honorificPrefix;
-  }
-  public function setHonorificSuffix($honorificSuffix)
-  {
-    $this->honorificSuffix = $honorificSuffix;
-  }
-  public function getHonorificSuffix()
-  {
-    return $this->honorificSuffix;
-  }
-  public function setMiddleName($middleName)
-  {
-    $this->middleName = $middleName;
-  }
-  public function getMiddleName()
-  {
-    return $this->middleName;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/PlusDomains/PersonOrganizations.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/PlusDomains/PersonOrganizations.php
deleted file mode 100644
index 29273b0a..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/PlusDomains/PersonOrganizations.php
+++ /dev/null
@@ -1,102 +0,0 @@
-department = $department;
-  }
-  public function getDepartment()
-  {
-    return $this->department;
-  }
-  public function setDescription($description)
-  {
-    $this->description = $description;
-  }
-  public function getDescription()
-  {
-    return $this->description;
-  }
-  public function setEndDate($endDate)
-  {
-    $this->endDate = $endDate;
-  }
-  public function getEndDate()
-  {
-    return $this->endDate;
-  }
-  public function setLocation($location)
-  {
-    $this->location = $location;
-  }
-  public function getLocation()
-  {
-    return $this->location;
-  }
-  public function setName($name)
-  {
-    $this->name = $name;
-  }
-  public function getName()
-  {
-    return $this->name;
-  }
-  public function setPrimary($primary)
-  {
-    $this->primary = $primary;
-  }
-  public function getPrimary()
-  {
-    return $this->primary;
-  }
-  public function setStartDate($startDate)
-  {
-    $this->startDate = $startDate;
-  }
-  public function getStartDate()
-  {
-    return $this->startDate;
-  }
-  public function setTitle($title)
-  {
-    $this->title = $title;
-  }
-  public function getTitle()
-  {
-    return $this->title;
-  }
-  public function setType($type)
-  {
-    $this->type = $type;
-  }
-  public function getType()
-  {
-    return $this->type;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/PlusDomains/PersonPlacesLived.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/PlusDomains/PersonPlacesLived.php
deleted file mode 100644
index fbebea3e..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/PlusDomains/PersonPlacesLived.php
+++ /dev/null
@@ -1,39 +0,0 @@
-primary = $primary;
-  }
-  public function getPrimary()
-  {
-    return $this->primary;
-  }
-  public function setValue($value)
-  {
-    $this->value = $value;
-  }
-  public function getValue()
-  {
-    return $this->value;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/PlusDomains/PersonUrls.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/PlusDomains/PersonUrls.php
deleted file mode 100644
index 8956a68f..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/PlusDomains/PersonUrls.php
+++ /dev/null
@@ -1,48 +0,0 @@
-label = $label;
-  }
-  public function getLabel()
-  {
-    return $this->label;
-  }
-  public function setType($type)
-  {
-    $this->type = $type;
-  }
-  public function getType()
-  {
-    return $this->type;
-  }
-  public function setValue($value)
-  {
-    $this->value = $value;
-  }
-  public function getValue()
-  {
-    return $this->value;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/PlusDomains/Place.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/PlusDomains/Place.php
deleted file mode 100644
index 3fba69fc..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/PlusDomains/Place.php
+++ /dev/null
@@ -1,68 +0,0 @@
-address = $address;
-  }
-  public function getAddress()
-  {
-    return $this->address;
-  }
-  public function setDisplayName($displayName)
-  {
-    $this->displayName = $displayName;
-  }
-  public function getDisplayName()
-  {
-    return $this->displayName;
-  }
-  public function setId($id)
-  {
-    $this->id = $id;
-  }
-  public function getId()
-  {
-    return $this->id;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setPosition(Google_Service_PlusDomains_PlacePosition $position)
-  {
-    $this->position = $position;
-  }
-  public function getPosition()
-  {
-    return $this->position;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/PlusDomains/PlaceAddress.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/PlusDomains/PlaceAddress.php
deleted file mode 100644
index e5cff510..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/PlusDomains/PlaceAddress.php
+++ /dev/null
@@ -1,30 +0,0 @@
-formatted = $formatted;
-  }
-  public function getFormatted()
-  {
-    return $this->formatted;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/PlusDomains/PlacePosition.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/PlusDomains/PlacePosition.php
deleted file mode 100644
index d7136cb4..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/PlusDomains/PlacePosition.php
+++ /dev/null
@@ -1,39 +0,0 @@
-latitude = $latitude;
-  }
-  public function getLatitude()
-  {
-    return $this->latitude;
-  }
-  public function setLongitude($longitude)
-  {
-    $this->longitude = $longitude;
-  }
-  public function getLongitude()
-  {
-    return $this->longitude;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/PlusDomains/PlusDomainsAclentryResource.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/PlusDomains/PlusDomainsAclentryResource.php
deleted file mode 100644
index 81f48db6..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/PlusDomains/PlusDomainsAclentryResource.php
+++ /dev/null
@@ -1,48 +0,0 @@
-displayName = $displayName;
-  }
-  public function getDisplayName()
-  {
-    return $this->displayName;
-  }
-  public function setId($id)
-  {
-    $this->id = $id;
-  }
-  public function getId()
-  {
-    return $this->id;
-  }
-  public function setType($type)
-  {
-    $this->type = $type;
-  }
-  public function getType()
-  {
-    return $this->type;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/PlusDomains/Resource/Activities.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/PlusDomains/Resource/Activities.php
deleted file mode 100644
index 59205632..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/PlusDomains/Resource/Activities.php
+++ /dev/null
@@ -1,83 +0,0 @@
-
- *   $plusDomainsService = new Google_Service_PlusDomains(...);
- *   $activities = $plusDomainsService->activities;
- *  
- */
-class Google_Service_PlusDomains_Resource_Activities extends Google_Service_Resource
-{
-  /**
-   * Get an activity. (activities.get)
-   *
-   * @param string $activityId The ID of the activity to get.
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_PlusDomains_Activity
-   */
-  public function get($activityId, $optParams = array())
-  {
-    $params = array('activityId' => $activityId);
-    $params = array_merge($params, $optParams);
-    return $this->call('get', array($params), "Google_Service_PlusDomains_Activity");
-  }
-  /**
-   * Create a new activity for the authenticated user. (activities.insert)
-   *
-   * @param string $userId The ID of the user to create the activity on behalf of.
-   * Its value should be "me", to indicate the authenticated user.
-   * @param Google_Service_PlusDomains_Activity $postBody
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param bool preview If "true", extract the potential media attachments
-   * for a URL. The response will include all possible attachments for a URL,
-   * including video, photos, and articles based on the content of the page.
-   * @return Google_Service_PlusDomains_Activity
-   */
-  public function insert($userId, Google_Service_PlusDomains_Activity $postBody, $optParams = array())
-  {
-    $params = array('userId' => $userId, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('insert', array($params), "Google_Service_PlusDomains_Activity");
-  }
-  /**
-   * List all of the activities in the specified collection for a particular user.
-   * (activities.listActivities)
-   *
-   * @param string $userId The ID of the user to get activities for. The special
-   * value "me" can be used to indicate the authenticated user.
-   * @param string $collection The collection of activities to list.
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param string maxResults The maximum number of activities to include in
-   * the response, which is used for paging. For any response, the actual number
-   * returned might be less than the specified maxResults.
-   * @opt_param string pageToken The continuation token, which is used to page
-   * through large result sets. To get the next page of results, set this
-   * parameter to the value of "nextPageToken" from the previous response.
-   * @return Google_Service_PlusDomains_ActivityFeed
-   */
-  public function listActivities($userId, $collection, $optParams = array())
-  {
-    $params = array('userId' => $userId, 'collection' => $collection);
-    $params = array_merge($params, $optParams);
-    return $this->call('list', array($params), "Google_Service_PlusDomains_ActivityFeed");
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/PlusDomains/Resource/Audiences.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/PlusDomains/Resource/Audiences.php
deleted file mode 100644
index 39f164f6..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/PlusDomains/Resource/Audiences.php
+++ /dev/null
@@ -1,50 +0,0 @@
-
- *   $plusDomainsService = new Google_Service_PlusDomains(...);
- *   $audiences = $plusDomainsService->audiences;
- *  
- */
-class Google_Service_PlusDomains_Resource_Audiences extends Google_Service_Resource
-{
-  /**
-   * List all of the audiences to which a user can share.
-   * (audiences.listAudiences)
-   *
-   * @param string $userId The ID of the user to get audiences for. The special
-   * value "me" can be used to indicate the authenticated user.
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param string maxResults The maximum number of circles to include in the
-   * response, which is used for paging. For any response, the actual number
-   * returned might be less than the specified maxResults.
-   * @opt_param string pageToken The continuation token, which is used to page
-   * through large result sets. To get the next page of results, set this
-   * parameter to the value of "nextPageToken" from the previous response.
-   * @return Google_Service_PlusDomains_AudiencesFeed
-   */
-  public function listAudiences($userId, $optParams = array())
-  {
-    $params = array('userId' => $userId);
-    $params = array_merge($params, $optParams);
-    return $this->call('list', array($params), "Google_Service_PlusDomains_AudiencesFeed");
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/PlusDomains/Resource/Circles.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/PlusDomains/Resource/Circles.php
deleted file mode 100644
index 2272cb01..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/PlusDomains/Resource/Circles.php
+++ /dev/null
@@ -1,154 +0,0 @@
-
- *   $plusDomainsService = new Google_Service_PlusDomains(...);
- *   $circles = $plusDomainsService->circles;
- *  
- */
-class Google_Service_PlusDomains_Resource_Circles extends Google_Service_Resource
-{
-  /**
-   * Add a person to a circle. Google+ limits certain circle operations, including
-   * the number of circle adds. Learn More. (circles.addPeople)
-   *
-   * @param string $circleId The ID of the circle to add the person to.
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param string email Email of the people to add to the circle. Optional,
-   * can be repeated.
-   * @opt_param string userId IDs of the people to add to the circle. Optional,
-   * can be repeated.
-   * @return Google_Service_PlusDomains_Circle
-   */
-  public function addPeople($circleId, $optParams = array())
-  {
-    $params = array('circleId' => $circleId);
-    $params = array_merge($params, $optParams);
-    return $this->call('addPeople', array($params), "Google_Service_PlusDomains_Circle");
-  }
-  /**
-   * Get a circle. (circles.get)
-   *
-   * @param string $circleId The ID of the circle to get.
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_PlusDomains_Circle
-   */
-  public function get($circleId, $optParams = array())
-  {
-    $params = array('circleId' => $circleId);
-    $params = array_merge($params, $optParams);
-    return $this->call('get', array($params), "Google_Service_PlusDomains_Circle");
-  }
-  /**
-   * Create a new circle for the authenticated user. (circles.insert)
-   *
-   * @param string $userId The ID of the user to create the circle on behalf of.
-   * The value "me" can be used to indicate the authenticated user.
-   * @param Google_Service_PlusDomains_Circle $postBody
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_PlusDomains_Circle
-   */
-  public function insert($userId, Google_Service_PlusDomains_Circle $postBody, $optParams = array())
-  {
-    $params = array('userId' => $userId, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('insert', array($params), "Google_Service_PlusDomains_Circle");
-  }
-  /**
-   * List all of the circles for a user. (circles.listCircles)
-   *
-   * @param string $userId The ID of the user to get circles for. The special
-   * value "me" can be used to indicate the authenticated user.
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param string maxResults The maximum number of circles to include in the
-   * response, which is used for paging. For any response, the actual number
-   * returned might be less than the specified maxResults.
-   * @opt_param string pageToken The continuation token, which is used to page
-   * through large result sets. To get the next page of results, set this
-   * parameter to the value of "nextPageToken" from the previous response.
-   * @return Google_Service_PlusDomains_CircleFeed
-   */
-  public function listCircles($userId, $optParams = array())
-  {
-    $params = array('userId' => $userId);
-    $params = array_merge($params, $optParams);
-    return $this->call('list', array($params), "Google_Service_PlusDomains_CircleFeed");
-  }
-  /**
-   * Update a circle's description. This method supports patch semantics.
-   * (circles.patch)
-   *
-   * @param string $circleId The ID of the circle to update.
-   * @param Google_Service_PlusDomains_Circle $postBody
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_PlusDomains_Circle
-   */
-  public function patch($circleId, Google_Service_PlusDomains_Circle $postBody, $optParams = array())
-  {
-    $params = array('circleId' => $circleId, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('patch', array($params), "Google_Service_PlusDomains_Circle");
-  }
-  /**
-   * Delete a circle. (circles.remove)
-   *
-   * @param string $circleId The ID of the circle to delete.
-   * @param array $optParams Optional parameters.
-   */
-  public function remove($circleId, $optParams = array())
-  {
-    $params = array('circleId' => $circleId);
-    $params = array_merge($params, $optParams);
-    return $this->call('remove', array($params));
-  }
-  /**
-   * Remove a person from a circle. (circles.removePeople)
-   *
-   * @param string $circleId The ID of the circle to remove the person from.
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param string email Email of the people to add to the circle. Optional,
-   * can be repeated.
-   * @opt_param string userId IDs of the people to remove from the circle.
-   * Optional, can be repeated.
-   */
-  public function removePeople($circleId, $optParams = array())
-  {
-    $params = array('circleId' => $circleId);
-    $params = array_merge($params, $optParams);
-    return $this->call('removePeople', array($params));
-  }
-  /**
-   * Update a circle's description. (circles.update)
-   *
-   * @param string $circleId The ID of the circle to update.
-   * @param Google_Service_PlusDomains_Circle $postBody
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_PlusDomains_Circle
-   */
-  public function update($circleId, Google_Service_PlusDomains_Circle $postBody, $optParams = array())
-  {
-    $params = array('circleId' => $circleId, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('update', array($params), "Google_Service_PlusDomains_Circle");
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/PlusDomains/Resource/Comments.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/PlusDomains/Resource/Comments.php
deleted file mode 100644
index 0ef70efb..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/PlusDomains/Resource/Comments.php
+++ /dev/null
@@ -1,76 +0,0 @@
-
- *   $plusDomainsService = new Google_Service_PlusDomains(...);
- *   $comments = $plusDomainsService->comments;
- *  
- */
-class Google_Service_PlusDomains_Resource_Comments extends Google_Service_Resource
-{
-  /**
-   * Get a comment. (comments.get)
-   *
-   * @param string $commentId The ID of the comment to get.
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_PlusDomains_Comment
-   */
-  public function get($commentId, $optParams = array())
-  {
-    $params = array('commentId' => $commentId);
-    $params = array_merge($params, $optParams);
-    return $this->call('get', array($params), "Google_Service_PlusDomains_Comment");
-  }
-  /**
-   * Create a new comment in reply to an activity. (comments.insert)
-   *
-   * @param string $activityId The ID of the activity to reply to.
-   * @param Google_Service_PlusDomains_Comment $postBody
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_PlusDomains_Comment
-   */
-  public function insert($activityId, Google_Service_PlusDomains_Comment $postBody, $optParams = array())
-  {
-    $params = array('activityId' => $activityId, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('insert', array($params), "Google_Service_PlusDomains_Comment");
-  }
-  /**
-   * List all of the comments for an activity. (comments.listComments)
-   *
-   * @param string $activityId The ID of the activity to get comments for.
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param string maxResults The maximum number of comments to include in the
-   * response, which is used for paging. For any response, the actual number
-   * returned might be less than the specified maxResults.
-   * @opt_param string pageToken The continuation token, which is used to page
-   * through large result sets. To get the next page of results, set this
-   * parameter to the value of "nextPageToken" from the previous response.
-   * @opt_param string sortOrder The order in which to sort the list of comments.
-   * @return Google_Service_PlusDomains_CommentFeed
-   */
-  public function listComments($activityId, $optParams = array())
-  {
-    $params = array('activityId' => $activityId);
-    $params = array_merge($params, $optParams);
-    return $this->call('list', array($params), "Google_Service_PlusDomains_CommentFeed");
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/PlusDomains/Resource/Media.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/PlusDomains/Resource/Media.php
deleted file mode 100644
index 1cf7b0a8..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/PlusDomains/Resource/Media.php
+++ /dev/null
@@ -1,46 +0,0 @@
-
- *   $plusDomainsService = new Google_Service_PlusDomains(...);
- *   $media = $plusDomainsService->media;
- *  
- */
-class Google_Service_PlusDomains_Resource_Media extends Google_Service_Resource
-{
-  /**
-   * Add a new media item to an album. The current upload size limitations are
-   * 36MB for a photo and 1GB for a video. Uploads do not count against quota if
-   * photos are less than 2048 pixels on their longest side or videos are less
-   * than 15 minutes in length. (media.insert)
-   *
-   * @param string $userId The ID of the user to create the activity on behalf of.
-   * @param string $collection
-   * @param Google_Service_PlusDomains_Media $postBody
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_PlusDomains_Media
-   */
-  public function insert($userId, $collection, Google_Service_PlusDomains_Media $postBody, $optParams = array())
-  {
-    $params = array('userId' => $userId, 'collection' => $collection, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('insert', array($params), "Google_Service_PlusDomains_Media");
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/PlusDomains/Resource/People.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/PlusDomains/Resource/People.php
deleted file mode 100644
index d58575c4..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/PlusDomains/Resource/People.php
+++ /dev/null
@@ -1,108 +0,0 @@
-
- *   $plusDomainsService = new Google_Service_PlusDomains(...);
- *   $people = $plusDomainsService->people;
- *  
- */
-class Google_Service_PlusDomains_Resource_People extends Google_Service_Resource
-{
-  /**
-   * Get a person's profile. (people.get)
-   *
-   * @param string $userId The ID of the person to get the profile for. The
-   * special value "me" can be used to indicate the authenticated user.
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_PlusDomains_Person
-   */
-  public function get($userId, $optParams = array())
-  {
-    $params = array('userId' => $userId);
-    $params = array_merge($params, $optParams);
-    return $this->call('get', array($params), "Google_Service_PlusDomains_Person");
-  }
-  /**
-   * List all of the people in the specified collection. (people.listPeople)
-   *
-   * @param string $userId Get the collection of people for the person identified.
-   * Use "me" to indicate the authenticated user.
-   * @param string $collection The collection of people to list.
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param string maxResults The maximum number of people to include in the
-   * response, which is used for paging. For any response, the actual number
-   * returned might be less than the specified maxResults.
-   * @opt_param string orderBy The order to return people in.
-   * @opt_param string pageToken The continuation token, which is used to page
-   * through large result sets. To get the next page of results, set this
-   * parameter to the value of "nextPageToken" from the previous response.
-   * @return Google_Service_PlusDomains_PeopleFeed
-   */
-  public function listPeople($userId, $collection, $optParams = array())
-  {
-    $params = array('userId' => $userId, 'collection' => $collection);
-    $params = array_merge($params, $optParams);
-    return $this->call('list', array($params), "Google_Service_PlusDomains_PeopleFeed");
-  }
-  /**
-   * List all of the people in the specified collection for a particular activity.
-   * (people.listByActivity)
-   *
-   * @param string $activityId The ID of the activity to get the list of people
-   * for.
-   * @param string $collection The collection of people to list.
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param string maxResults The maximum number of people to include in the
-   * response, which is used for paging. For any response, the actual number
-   * returned might be less than the specified maxResults.
-   * @opt_param string pageToken The continuation token, which is used to page
-   * through large result sets. To get the next page of results, set this
-   * parameter to the value of "nextPageToken" from the previous response.
-   * @return Google_Service_PlusDomains_PeopleFeed
-   */
-  public function listByActivity($activityId, $collection, $optParams = array())
-  {
-    $params = array('activityId' => $activityId, 'collection' => $collection);
-    $params = array_merge($params, $optParams);
-    return $this->call('listByActivity', array($params), "Google_Service_PlusDomains_PeopleFeed");
-  }
-  /**
-   * List all of the people who are members of a circle. (people.listByCircle)
-   *
-   * @param string $circleId The ID of the circle to get the members of.
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param string maxResults The maximum number of people to include in the
-   * response, which is used for paging. For any response, the actual number
-   * returned might be less than the specified maxResults.
-   * @opt_param string pageToken The continuation token, which is used to page
-   * through large result sets. To get the next page of results, set this
-   * parameter to the value of "nextPageToken" from the previous response.
-   * @return Google_Service_PlusDomains_PeopleFeed
-   */
-  public function listByCircle($circleId, $optParams = array())
-  {
-    $params = array('circleId' => $circleId);
-    $params = array_merge($params, $optParams);
-    return $this->call('listByCircle', array($params), "Google_Service_PlusDomains_PeopleFeed");
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/PlusDomains/Videostream.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/PlusDomains/Videostream.php
deleted file mode 100644
index e618d7c3..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/PlusDomains/Videostream.php
+++ /dev/null
@@ -1,57 +0,0 @@
-height = $height;
-  }
-  public function getHeight()
-  {
-    return $this->height;
-  }
-  public function setType($type)
-  {
-    $this->type = $type;
-  }
-  public function getType()
-  {
-    return $this->type;
-  }
-  public function setUrl($url)
-  {
-    $this->url = $url;
-  }
-  public function getUrl()
-  {
-    return $this->url;
-  }
-  public function setWidth($width)
-  {
-    $this->width = $width;
-  }
-  public function getWidth()
-  {
-    return $this->width;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Prediction.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Prediction.php
deleted file mode 100644
index 871465d2..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Prediction.php
+++ /dev/null
@@ -1,205 +0,0 @@
-
- * Lets you access a cloud hosted machine learning service that makes it easy to
- * build smart apps

- *
- * 

- * For more information about this service, see the API
- * Documentation
- * 

- *
- * @author Google, Inc.
- */
-class Google_Service_Prediction extends Google_Service
-{
-  /** View and manage your data across Google Cloud Platform services. */
-  const CLOUD_PLATFORM =
-      "https://www.googleapis.com/auth/cloud-platform";
-  /** Manage your data and permissions in Google Cloud Storage. */
-  const DEVSTORAGE_FULL_CONTROL =
-      "https://www.googleapis.com/auth/devstorage.full_control";
-  /** View your data in Google Cloud Storage. */
-  const DEVSTORAGE_READ_ONLY =
-      "https://www.googleapis.com/auth/devstorage.read_only";
-  /** Manage your data in Google Cloud Storage. */
-  const DEVSTORAGE_READ_WRITE =
-      "https://www.googleapis.com/auth/devstorage.read_write";
-  /** Manage your data in the Google Prediction API. */
-  const PREDICTION =
-      "https://www.googleapis.com/auth/prediction";
-
-  public $hostedmodels;
-  public $trainedmodels;
-  
-  /**
-   * Constructs the internal representation of the Prediction service.
-   *
-   * @param Google_Client $client
-   */
-  public function __construct(Google_Client $client)
-  {
-    parent::__construct($client);
-    $this->rootUrl = 'https://www.googleapis.com/';
-    $this->servicePath = 'prediction/v1.6/projects/';
-    $this->version = 'v1.6';
-    $this->serviceName = 'prediction';
-
-    $this->hostedmodels = new Google_Service_Prediction_Resource_Hostedmodels(
-        $this,
-        $this->serviceName,
-        'hostedmodels',
-        array(
-          'methods' => array(
-            'predict' => array(
-              'path' => '{project}/hostedmodels/{hostedModelName}/predict',
-              'httpMethod' => 'POST',
-              'parameters' => array(
-                'project' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'hostedModelName' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),
-          )
-        )
-    );
-    $this->trainedmodels = new Google_Service_Prediction_Resource_Trainedmodels(
-        $this,
-        $this->serviceName,
-        'trainedmodels',
-        array(
-          'methods' => array(
-            'analyze' => array(
-              'path' => '{project}/trainedmodels/{id}/analyze',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'project' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'id' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'delete' => array(
-              'path' => '{project}/trainedmodels/{id}',
-              'httpMethod' => 'DELETE',
-              'parameters' => array(
-                'project' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'id' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'get' => array(
-              'path' => '{project}/trainedmodels/{id}',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'project' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'id' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'insert' => array(
-              'path' => '{project}/trainedmodels',
-              'httpMethod' => 'POST',
-              'parameters' => array(
-                'project' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'list' => array(
-              'path' => '{project}/trainedmodels/list',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'project' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'maxResults' => array(
-                  'location' => 'query',
-                  'type' => 'integer',
-                ),
-                'pageToken' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-              ),
-            ),'predict' => array(
-              'path' => '{project}/trainedmodels/{id}/predict',
-              'httpMethod' => 'POST',
-              'parameters' => array(
-                'project' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'id' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'update' => array(
-              'path' => '{project}/trainedmodels/{id}',
-              'httpMethod' => 'PUT',
-              'parameters' => array(
-                'project' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'id' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),
-          )
-        )
-    );
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Prediction/Analyze.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Prediction/Analyze.php
deleted file mode 100644
index 42bb79b7..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Prediction/Analyze.php
+++ /dev/null
@@ -1,78 +0,0 @@
-dataDescription = $dataDescription;
-  }
-  public function getDataDescription()
-  {
-    return $this->dataDescription;
-  }
-  public function setErrors($errors)
-  {
-    $this->errors = $errors;
-  }
-  public function getErrors()
-  {
-    return $this->errors;
-  }
-  public function setId($id)
-  {
-    $this->id = $id;
-  }
-  public function getId()
-  {
-    return $this->id;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setModelDescription(Google_Service_Prediction_AnalyzeModelDescription $modelDescription)
-  {
-    $this->modelDescription = $modelDescription;
-  }
-  public function getModelDescription()
-  {
-    return $this->modelDescription;
-  }
-  public function setSelfLink($selfLink)
-  {
-    $this->selfLink = $selfLink;
-  }
-  public function getSelfLink()
-  {
-    return $this->selfLink;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Prediction/AnalyzeDataDescription.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Prediction/AnalyzeDataDescription.php
deleted file mode 100644
index 85d3265e..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Prediction/AnalyzeDataDescription.php
+++ /dev/null
@@ -1,42 +0,0 @@
-features = $features;
-  }
-  public function getFeatures()
-  {
-    return $this->features;
-  }
-  public function setOutputFeature(Google_Service_Prediction_AnalyzeDataDescriptionOutputFeature $outputFeature)
-  {
-    $this->outputFeature = $outputFeature;
-  }
-  public function getOutputFeature()
-  {
-    return $this->outputFeature;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Prediction/AnalyzeDataDescriptionFeatures.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Prediction/AnalyzeDataDescriptionFeatures.php
deleted file mode 100644
index 046c980b..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Prediction/AnalyzeDataDescriptionFeatures.php
+++ /dev/null
@@ -1,60 +0,0 @@
-categorical = $categorical;
-  }
-  public function getCategorical()
-  {
-    return $this->categorical;
-  }
-  public function setIndex($index)
-  {
-    $this->index = $index;
-  }
-  public function getIndex()
-  {
-    return $this->index;
-  }
-  public function setNumeric(Google_Service_Prediction_AnalyzeDataDescriptionFeaturesNumeric $numeric)
-  {
-    $this->numeric = $numeric;
-  }
-  public function getNumeric()
-  {
-    return $this->numeric;
-  }
-  public function setText(Google_Service_Prediction_AnalyzeDataDescriptionFeaturesText $text)
-  {
-    $this->text = $text;
-  }
-  public function getText()
-  {
-    return $this->text;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Prediction/AnalyzeDataDescriptionFeaturesCategorical.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Prediction/AnalyzeDataDescriptionFeaturesCategorical.php
deleted file mode 100644
index e8f738cd..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Prediction/AnalyzeDataDescriptionFeaturesCategorical.php
+++ /dev/null
@@ -1,41 +0,0 @@
-count = $count;
-  }
-  public function getCount()
-  {
-    return $this->count;
-  }
-  public function setValues($values)
-  {
-    $this->values = $values;
-  }
-  public function getValues()
-  {
-    return $this->values;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Prediction/AnalyzeDataDescriptionFeaturesCategoricalValues.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Prediction/AnalyzeDataDescriptionFeaturesCategoricalValues.php
deleted file mode 100644
index d3ba6872..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Prediction/AnalyzeDataDescriptionFeaturesCategoricalValues.php
+++ /dev/null
@@ -1,39 +0,0 @@
-count = $count;
-  }
-  public function getCount()
-  {
-    return $this->count;
-  }
-  public function setValue($value)
-  {
-    $this->value = $value;
-  }
-  public function getValue()
-  {
-    return $this->value;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Prediction/AnalyzeDataDescriptionFeaturesNumeric.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Prediction/AnalyzeDataDescriptionFeaturesNumeric.php
deleted file mode 100644
index a2448a81..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Prediction/AnalyzeDataDescriptionFeaturesNumeric.php
+++ /dev/null
@@ -1,48 +0,0 @@
-count = $count;
-  }
-  public function getCount()
-  {
-    return $this->count;
-  }
-  public function setMean($mean)
-  {
-    $this->mean = $mean;
-  }
-  public function getMean()
-  {
-    return $this->mean;
-  }
-  public function setVariance($variance)
-  {
-    $this->variance = $variance;
-  }
-  public function getVariance()
-  {
-    return $this->variance;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Prediction/AnalyzeDataDescriptionFeaturesText.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Prediction/AnalyzeDataDescriptionFeaturesText.php
deleted file mode 100644
index bb594ac5..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Prediction/AnalyzeDataDescriptionFeaturesText.php
+++ /dev/null
@@ -1,30 +0,0 @@
-count = $count;
-  }
-  public function getCount()
-  {
-    return $this->count;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Prediction/AnalyzeDataDescriptionOutputFeature.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Prediction/AnalyzeDataDescriptionOutputFeature.php
deleted file mode 100644
index b048fa2f..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Prediction/AnalyzeDataDescriptionOutputFeature.php
+++ /dev/null
@@ -1,42 +0,0 @@
-numeric = $numeric;
-  }
-  public function getNumeric()
-  {
-    return $this->numeric;
-  }
-  public function setText($text)
-  {
-    $this->text = $text;
-  }
-  public function getText()
-  {
-    return $this->text;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Prediction/AnalyzeDataDescriptionOutputFeatureNumeric.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Prediction/AnalyzeDataDescriptionOutputFeatureNumeric.php
deleted file mode 100644
index 9d9859c0..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Prediction/AnalyzeDataDescriptionOutputFeatureNumeric.php
+++ /dev/null
@@ -1,48 +0,0 @@
-count = $count;
-  }
-  public function getCount()
-  {
-    return $this->count;
-  }
-  public function setMean($mean)
-  {
-    $this->mean = $mean;
-  }
-  public function getMean()
-  {
-    return $this->mean;
-  }
-  public function setVariance($variance)
-  {
-    $this->variance = $variance;
-  }
-  public function getVariance()
-  {
-    return $this->variance;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Prediction/AnalyzeDataDescriptionOutputFeatureText.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Prediction/AnalyzeDataDescriptionOutputFeatureText.php
deleted file mode 100644
index 19db685b..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Prediction/AnalyzeDataDescriptionOutputFeatureText.php
+++ /dev/null
@@ -1,39 +0,0 @@
-count = $count;
-  }
-  public function getCount()
-  {
-    return $this->count;
-  }
-  public function setValue($value)
-  {
-    $this->value = $value;
-  }
-  public function getValue()
-  {
-    return $this->value;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Prediction/AnalyzeModelDescription.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Prediction/AnalyzeModelDescription.php
deleted file mode 100644
index fbce5f6b..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Prediction/AnalyzeModelDescription.php
+++ /dev/null
@@ -1,49 +0,0 @@
-confusionMatrix = $confusionMatrix;
-  }
-  public function getConfusionMatrix()
-  {
-    return $this->confusionMatrix;
-  }
-  public function setConfusionMatrixRowTotals($confusionMatrixRowTotals)
-  {
-    $this->confusionMatrixRowTotals = $confusionMatrixRowTotals;
-  }
-  public function getConfusionMatrixRowTotals()
-  {
-    return $this->confusionMatrixRowTotals;
-  }
-  public function setModelinfo(Google_Service_Prediction_Insert2 $modelinfo)
-  {
-    $this->modelinfo = $modelinfo;
-  }
-  public function getModelinfo()
-  {
-    return $this->modelinfo;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Prediction/Input.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Prediction/Input.php
deleted file mode 100644
index ee7e6293..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Prediction/Input.php
+++ /dev/null
@@ -1,31 +0,0 @@
-input = $input;
-  }
-  public function getInput()
-  {
-    return $this->input;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Prediction/InputInput.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Prediction/InputInput.php
deleted file mode 100644
index e4235be7..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Prediction/InputInput.php
+++ /dev/null
@@ -1,31 +0,0 @@
-csvInstance = $csvInstance;
-  }
-  public function getCsvInstance()
-  {
-    return $this->csvInstance;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Prediction/Insert.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Prediction/Insert.php
deleted file mode 100644
index fdf985d6..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Prediction/Insert.php
+++ /dev/null
@@ -1,95 +0,0 @@
-id = $id;
-  }
-  public function getId()
-  {
-    return $this->id;
-  }
-  public function setModelType($modelType)
-  {
-    $this->modelType = $modelType;
-  }
-  public function getModelType()
-  {
-    return $this->modelType;
-  }
-  public function setSourceModel($sourceModel)
-  {
-    $this->sourceModel = $sourceModel;
-  }
-  public function getSourceModel()
-  {
-    return $this->sourceModel;
-  }
-  public function setStorageDataLocation($storageDataLocation)
-  {
-    $this->storageDataLocation = $storageDataLocation;
-  }
-  public function getStorageDataLocation()
-  {
-    return $this->storageDataLocation;
-  }
-  public function setStoragePMMLLocation($storagePMMLLocation)
-  {
-    $this->storagePMMLLocation = $storagePMMLLocation;
-  }
-  public function getStoragePMMLLocation()
-  {
-    return $this->storagePMMLLocation;
-  }
-  public function setStoragePMMLModelLocation($storagePMMLModelLocation)
-  {
-    $this->storagePMMLModelLocation = $storagePMMLModelLocation;
-  }
-  public function getStoragePMMLModelLocation()
-  {
-    return $this->storagePMMLModelLocation;
-  }
-  public function setTrainingInstances($trainingInstances)
-  {
-    $this->trainingInstances = $trainingInstances;
-  }
-  public function getTrainingInstances()
-  {
-    return $this->trainingInstances;
-  }
-  public function setUtility($utility)
-  {
-    $this->utility = $utility;
-  }
-  public function getUtility()
-  {
-    return $this->utility;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Prediction/Insert2.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Prediction/Insert2.php
deleted file mode 100644
index 8bc3b4d1..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Prediction/Insert2.php
+++ /dev/null
@@ -1,121 +0,0 @@
-created = $created;
-  }
-  public function getCreated()
-  {
-    return $this->created;
-  }
-  public function setId($id)
-  {
-    $this->id = $id;
-  }
-  public function getId()
-  {
-    return $this->id;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setModelInfo(Google_Service_Prediction_Insert2ModelInfo $modelInfo)
-  {
-    $this->modelInfo = $modelInfo;
-  }
-  public function getModelInfo()
-  {
-    return $this->modelInfo;
-  }
-  public function setModelType($modelType)
-  {
-    $this->modelType = $modelType;
-  }
-  public function getModelType()
-  {
-    return $this->modelType;
-  }
-  public function setSelfLink($selfLink)
-  {
-    $this->selfLink = $selfLink;
-  }
-  public function getSelfLink()
-  {
-    return $this->selfLink;
-  }
-  public function setStorageDataLocation($storageDataLocation)
-  {
-    $this->storageDataLocation = $storageDataLocation;
-  }
-  public function getStorageDataLocation()
-  {
-    return $this->storageDataLocation;
-  }
-  public function setStoragePMMLLocation($storagePMMLLocation)
-  {
-    $this->storagePMMLLocation = $storagePMMLLocation;
-  }
-  public function getStoragePMMLLocation()
-  {
-    return $this->storagePMMLLocation;
-  }
-  public function setStoragePMMLModelLocation($storagePMMLModelLocation)
-  {
-    $this->storagePMMLModelLocation = $storagePMMLModelLocation;
-  }
-  public function getStoragePMMLModelLocation()
-  {
-    return $this->storagePMMLModelLocation;
-  }
-  public function setTrainingComplete($trainingComplete)
-  {
-    $this->trainingComplete = $trainingComplete;
-  }
-  public function getTrainingComplete()
-  {
-    return $this->trainingComplete;
-  }
-  public function setTrainingStatus($trainingStatus)
-  {
-    $this->trainingStatus = $trainingStatus;
-  }
-  public function getTrainingStatus()
-  {
-    return $this->trainingStatus;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Prediction/Insert2ModelInfo.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Prediction/Insert2ModelInfo.php
deleted file mode 100644
index 38651648..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Prediction/Insert2ModelInfo.php
+++ /dev/null
@@ -1,75 +0,0 @@
-classWeightedAccuracy = $classWeightedAccuracy;
-  }
-  public function getClassWeightedAccuracy()
-  {
-    return $this->classWeightedAccuracy;
-  }
-  public function setClassificationAccuracy($classificationAccuracy)
-  {
-    $this->classificationAccuracy = $classificationAccuracy;
-  }
-  public function getClassificationAccuracy()
-  {
-    return $this->classificationAccuracy;
-  }
-  public function setMeanSquaredError($meanSquaredError)
-  {
-    $this->meanSquaredError = $meanSquaredError;
-  }
-  public function getMeanSquaredError()
-  {
-    return $this->meanSquaredError;
-  }
-  public function setModelType($modelType)
-  {
-    $this->modelType = $modelType;
-  }
-  public function getModelType()
-  {
-    return $this->modelType;
-  }
-  public function setNumberInstances($numberInstances)
-  {
-    $this->numberInstances = $numberInstances;
-  }
-  public function getNumberInstances()
-  {
-    return $this->numberInstances;
-  }
-  public function setNumberLabels($numberLabels)
-  {
-    $this->numberLabels = $numberLabels;
-  }
-  public function getNumberLabels()
-  {
-    return $this->numberLabels;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Prediction/InsertTrainingInstances.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Prediction/InsertTrainingInstances.php
deleted file mode 100644
index 98b46c50..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Prediction/InsertTrainingInstances.php
+++ /dev/null
@@ -1,40 +0,0 @@
-csvInstance = $csvInstance;
-  }
-  public function getCsvInstance()
-  {
-    return $this->csvInstance;
-  }
-  public function setOutput($output)
-  {
-    $this->output = $output;
-  }
-  public function getOutput()
-  {
-    return $this->output;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Prediction/Output.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Prediction/Output.php
deleted file mode 100644
index caf2136b..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Prediction/Output.php
+++ /dev/null
@@ -1,77 +0,0 @@
-id = $id;
-  }
-  public function getId()
-  {
-    return $this->id;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setOutputLabel($outputLabel)
-  {
-    $this->outputLabel = $outputLabel;
-  }
-  public function getOutputLabel()
-  {
-    return $this->outputLabel;
-  }
-  public function setOutputMulti($outputMulti)
-  {
-    $this->outputMulti = $outputMulti;
-  }
-  public function getOutputMulti()
-  {
-    return $this->outputMulti;
-  }
-  public function setOutputValue($outputValue)
-  {
-    $this->outputValue = $outputValue;
-  }
-  public function getOutputValue()
-  {
-    return $this->outputValue;
-  }
-  public function setSelfLink($selfLink)
-  {
-    $this->selfLink = $selfLink;
-  }
-  public function getSelfLink()
-  {
-    return $this->selfLink;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Prediction/OutputOutputMulti.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Prediction/OutputOutputMulti.php
deleted file mode 100644
index cbeee94d..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Prediction/OutputOutputMulti.php
+++ /dev/null
@@ -1,39 +0,0 @@
-label = $label;
-  }
-  public function getLabel()
-  {
-    return $this->label;
-  }
-  public function setScore($score)
-  {
-    $this->score = $score;
-  }
-  public function getScore()
-  {
-    return $this->score;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Prediction/PredictionList.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Prediction/PredictionList.php
deleted file mode 100644
index 177cb7d9..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Prediction/PredictionList.php
+++ /dev/null
@@ -1,59 +0,0 @@
-items = $items;
-  }
-  public function getItems()
-  {
-    return $this->items;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setNextPageToken($nextPageToken)
-  {
-    $this->nextPageToken = $nextPageToken;
-  }
-  public function getNextPageToken()
-  {
-    return $this->nextPageToken;
-  }
-  public function setSelfLink($selfLink)
-  {
-    $this->selfLink = $selfLink;
-  }
-  public function getSelfLink()
-  {
-    return $this->selfLink;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Prediction/Resource/Hostedmodels.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Prediction/Resource/Hostedmodels.php
deleted file mode 100644
index 57ce7fae..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Prediction/Resource/Hostedmodels.php
+++ /dev/null
@@ -1,44 +0,0 @@
-
- *   $predictionService = new Google_Service_Prediction(...);
- *   $hostedmodels = $predictionService->hostedmodels;
- *  
- */
-class Google_Service_Prediction_Resource_Hostedmodels extends Google_Service_Resource
-{
-  /**
-   * Submit input and request an output against a hosted model.
-   * (hostedmodels.predict)
-   *
-   * @param string $project The project associated with the model.
-   * @param string $hostedModelName The name of a hosted model.
-   * @param Google_Service_Prediction_Input $postBody
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Prediction_Output
-   */
-  public function predict($project, $hostedModelName, Google_Service_Prediction_Input $postBody, $optParams = array())
-  {
-    $params = array('project' => $project, 'hostedModelName' => $hostedModelName, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('predict', array($params), "Google_Service_Prediction_Output");
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Prediction/Resource/Trainedmodels.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Prediction/Resource/Trainedmodels.php
deleted file mode 100644
index a7de1b7c..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Prediction/Resource/Trainedmodels.php
+++ /dev/null
@@ -1,130 +0,0 @@
-
- *   $predictionService = new Google_Service_Prediction(...);
- *   $trainedmodels = $predictionService->trainedmodels;
- *  
- */
-class Google_Service_Prediction_Resource_Trainedmodels extends Google_Service_Resource
-{
-  /**
-   * Get analysis of the model and the data the model was trained on.
-   * (trainedmodels.analyze)
-   *
-   * @param string $project The project associated with the model.
-   * @param string $id The unique name for the predictive model.
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Prediction_Analyze
-   */
-  public function analyze($project, $id, $optParams = array())
-  {
-    $params = array('project' => $project, 'id' => $id);
-    $params = array_merge($params, $optParams);
-    return $this->call('analyze', array($params), "Google_Service_Prediction_Analyze");
-  }
-  /**
-   * Delete a trained model. (trainedmodels.delete)
-   *
-   * @param string $project The project associated with the model.
-   * @param string $id The unique name for the predictive model.
-   * @param array $optParams Optional parameters.
-   */
-  public function delete($project, $id, $optParams = array())
-  {
-    $params = array('project' => $project, 'id' => $id);
-    $params = array_merge($params, $optParams);
-    return $this->call('delete', array($params));
-  }
-  /**
-   * Check training status of your model. (trainedmodels.get)
-   *
-   * @param string $project The project associated with the model.
-   * @param string $id The unique name for the predictive model.
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Prediction_Insert2
-   */
-  public function get($project, $id, $optParams = array())
-  {
-    $params = array('project' => $project, 'id' => $id);
-    $params = array_merge($params, $optParams);
-    return $this->call('get', array($params), "Google_Service_Prediction_Insert2");
-  }
-  /**
-   * Train a Prediction API model. (trainedmodels.insert)
-   *
-   * @param string $project The project associated with the model.
-   * @param Google_Service_Prediction_Insert $postBody
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Prediction_Insert2
-   */
-  public function insert($project, Google_Service_Prediction_Insert $postBody, $optParams = array())
-  {
-    $params = array('project' => $project, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('insert', array($params), "Google_Service_Prediction_Insert2");
-  }
-  /**
-   * List available models. (trainedmodels.listTrainedmodels)
-   *
-   * @param string $project The project associated with the model.
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param string maxResults Maximum number of results to return.
-   * @opt_param string pageToken Pagination token.
-   * @return Google_Service_Prediction_PredictionList
-   */
-  public function listTrainedmodels($project, $optParams = array())
-  {
-    $params = array('project' => $project);
-    $params = array_merge($params, $optParams);
-    return $this->call('list', array($params), "Google_Service_Prediction_PredictionList");
-  }
-  /**
-   * Submit model id and request a prediction. (trainedmodels.predict)
-   *
-   * @param string $project The project associated with the model.
-   * @param string $id The unique name for the predictive model.
-   * @param Google_Service_Prediction_Input $postBody
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Prediction_Output
-   */
-  public function predict($project, $id, Google_Service_Prediction_Input $postBody, $optParams = array())
-  {
-    $params = array('project' => $project, 'id' => $id, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('predict', array($params), "Google_Service_Prediction_Output");
-  }
-  /**
-   * Add new data to a trained model. (trainedmodels.update)
-   *
-   * @param string $project The project associated with the model.
-   * @param string $id The unique name for the predictive model.
-   * @param Google_Service_Prediction_Update $postBody
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Prediction_Insert2
-   */
-  public function update($project, $id, Google_Service_Prediction_Update $postBody, $optParams = array())
-  {
-    $params = array('project' => $project, 'id' => $id, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('update', array($params), "Google_Service_Prediction_Insert2");
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Prediction/Update.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Prediction/Update.php
deleted file mode 100644
index db3f867e..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Prediction/Update.php
+++ /dev/null
@@ -1,40 +0,0 @@
-csvInstance = $csvInstance;
-  }
-  public function getCsvInstance()
-  {
-    return $this->csvInstance;
-  }
-  public function setOutput($output)
-  {
-    $this->output = $output;
-  }
-  public function getOutput()
-  {
-    return $this->output;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Proximitybeacon.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Proximitybeacon.php
deleted file mode 100644
index 81638c22..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Proximitybeacon.php
+++ /dev/null
@@ -1,353 +0,0 @@
-
- * Registers, manages, indexes, and searches beacons.

- *
- * 

- * For more information about this service, see the API
- * Documentation
- * 

- *
- * @author Google, Inc.
- */
-class Google_Service_Proximitybeacon extends Google_Service
-{
-  /** View and modify your beacons. */
-  const USERLOCATION_BEACON_REGISTRY =
-      "https://www.googleapis.com/auth/userlocation.beacon.registry";
-
-  public $beaconinfo;
-  public $beacons;
-  public $beacons_attachments;
-  public $beacons_diagnostics;
-  public $namespaces;
-  public $v1beta1;
-  
-  /**
-   * Constructs the internal representation of the Proximitybeacon service.
-   *
-   * @param Google_Client $client
-   */
-  public function __construct(Google_Client $client)
-  {
-    parent::__construct($client);
-    $this->rootUrl = 'https://proximitybeacon.googleapis.com/';
-    $this->servicePath = '';
-    $this->version = 'v1beta1';
-    $this->serviceName = 'proximitybeacon';
-
-    $this->beaconinfo = new Google_Service_Proximitybeacon_Resource_Beaconinfo(
-        $this,
-        $this->serviceName,
-        'beaconinfo',
-        array(
-          'methods' => array(
-            'getforobserved' => array(
-              'path' => 'v1beta1/beaconinfo:getforobserved',
-              'httpMethod' => 'POST',
-              'parameters' => array(),
-            ),
-          )
-        )
-    );
-    $this->beacons = new Google_Service_Proximitybeacon_Resource_Beacons(
-        $this,
-        $this->serviceName,
-        'beacons',
-        array(
-          'methods' => array(
-            'activate' => array(
-              'path' => 'v1beta1/{+beaconName}:activate',
-              'httpMethod' => 'POST',
-              'parameters' => array(
-                'beaconName' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'projectId' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-              ),
-            ),'deactivate' => array(
-              'path' => 'v1beta1/{+beaconName}:deactivate',
-              'httpMethod' => 'POST',
-              'parameters' => array(
-                'beaconName' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'projectId' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-              ),
-            ),'decommission' => array(
-              'path' => 'v1beta1/{+beaconName}:decommission',
-              'httpMethod' => 'POST',
-              'parameters' => array(
-                'beaconName' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'projectId' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-              ),
-            ),'delete' => array(
-              'path' => 'v1beta1/{+beaconName}',
-              'httpMethod' => 'DELETE',
-              'parameters' => array(
-                'beaconName' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'projectId' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-              ),
-            ),'get' => array(
-              'path' => 'v1beta1/{+beaconName}',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'beaconName' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'projectId' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-              ),
-            ),'list' => array(
-              'path' => 'v1beta1/beacons',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'q' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'pageSize' => array(
-                  'location' => 'query',
-                  'type' => 'integer',
-                ),
-                'pageToken' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'projectId' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-              ),
-            ),'register' => array(
-              'path' => 'v1beta1/beacons:register',
-              'httpMethod' => 'POST',
-              'parameters' => array(
-                'projectId' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-              ),
-            ),'update' => array(
-              'path' => 'v1beta1/{+beaconName}',
-              'httpMethod' => 'PUT',
-              'parameters' => array(
-                'beaconName' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'projectId' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-              ),
-            ),
-          )
-        )
-    );
-    $this->beacons_attachments = new Google_Service_Proximitybeacon_Resource_BeaconsAttachments(
-        $this,
-        $this->serviceName,
-        'attachments',
-        array(
-          'methods' => array(
-            'batchDelete' => array(
-              'path' => 'v1beta1/{+beaconName}/attachments:batchDelete',
-              'httpMethod' => 'POST',
-              'parameters' => array(
-                'beaconName' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'namespacedType' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'projectId' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-              ),
-            ),'create' => array(
-              'path' => 'v1beta1/{+beaconName}/attachments',
-              'httpMethod' => 'POST',
-              'parameters' => array(
-                'beaconName' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'projectId' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-              ),
-            ),'delete' => array(
-              'path' => 'v1beta1/{+attachmentName}',
-              'httpMethod' => 'DELETE',
-              'parameters' => array(
-                'attachmentName' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'projectId' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-              ),
-            ),'list' => array(
-              'path' => 'v1beta1/{+beaconName}/attachments',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'beaconName' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'namespacedType' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'projectId' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-              ),
-            ),
-          )
-        )
-    );
-    $this->beacons_diagnostics = new Google_Service_Proximitybeacon_Resource_BeaconsDiagnostics(
-        $this,
-        $this->serviceName,
-        'diagnostics',
-        array(
-          'methods' => array(
-            'list' => array(
-              'path' => 'v1beta1/{+beaconName}/diagnostics',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'beaconName' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'pageSize' => array(
-                  'location' => 'query',
-                  'type' => 'integer',
-                ),
-                'alertFilter' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'pageToken' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'projectId' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-              ),
-            ),
-          )
-        )
-    );
-    $this->namespaces = new Google_Service_Proximitybeacon_Resource_Namespaces(
-        $this,
-        $this->serviceName,
-        'namespaces',
-        array(
-          'methods' => array(
-            'list' => array(
-              'path' => 'v1beta1/namespaces',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'projectId' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-              ),
-            ),'update' => array(
-              'path' => 'v1beta1/{+namespaceName}',
-              'httpMethod' => 'PUT',
-              'parameters' => array(
-                'namespaceName' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'projectId' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-              ),
-            ),
-          )
-        )
-    );
-    $this->v1beta1 = new Google_Service_Proximitybeacon_Resource_V1beta1(
-        $this,
-        $this->serviceName,
-        'v1beta1',
-        array(
-          'methods' => array(
-            'getEidparams' => array(
-              'path' => 'v1beta1/eidparams',
-              'httpMethod' => 'GET',
-              'parameters' => array(),
-            ),
-          )
-        )
-    );
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Proximitybeacon/AdvertisedId.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Proximitybeacon/AdvertisedId.php
deleted file mode 100644
index de73fa61..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Proximitybeacon/AdvertisedId.php
+++ /dev/null
@@ -1,39 +0,0 @@
-id = $id;
-  }
-  public function getId()
-  {
-    return $this->id;
-  }
-  public function setType($type)
-  {
-    $this->type = $type;
-  }
-  public function getType()
-  {
-    return $this->type;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Proximitybeacon/AttachmentInfo.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Proximitybeacon/AttachmentInfo.php
deleted file mode 100644
index 88213c41..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Proximitybeacon/AttachmentInfo.php
+++ /dev/null
@@ -1,39 +0,0 @@
-data = $data;
-  }
-  public function getData()
-  {
-    return $this->data;
-  }
-  public function setNamespacedType($namespacedType)
-  {
-    $this->namespacedType = $namespacedType;
-  }
-  public function getNamespacedType()
-  {
-    return $this->namespacedType;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Proximitybeacon/Beacon.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Proximitybeacon/Beacon.php
deleted file mode 100644
index e2713f2e..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Proximitybeacon/Beacon.php
+++ /dev/null
@@ -1,124 +0,0 @@
-advertisedId = $advertisedId;
-  }
-  public function getAdvertisedId()
-  {
-    return $this->advertisedId;
-  }
-  public function setBeaconName($beaconName)
-  {
-    $this->beaconName = $beaconName;
-  }
-  public function getBeaconName()
-  {
-    return $this->beaconName;
-  }
-  public function setDescription($description)
-  {
-    $this->description = $description;
-  }
-  public function getDescription()
-  {
-    return $this->description;
-  }
-  public function setEphemeralIdRegistration(Google_Service_Proximitybeacon_EphemeralIdRegistration $ephemeralIdRegistration)
-  {
-    $this->ephemeralIdRegistration = $ephemeralIdRegistration;
-  }
-  public function getEphemeralIdRegistration()
-  {
-    return $this->ephemeralIdRegistration;
-  }
-  public function setExpectedStability($expectedStability)
-  {
-    $this->expectedStability = $expectedStability;
-  }
-  public function getExpectedStability()
-  {
-    return $this->expectedStability;
-  }
-  public function setIndoorLevel(Google_Service_Proximitybeacon_IndoorLevel $indoorLevel)
-  {
-    $this->indoorLevel = $indoorLevel;
-  }
-  public function getIndoorLevel()
-  {
-    return $this->indoorLevel;
-  }
-  public function setLatLng(Google_Service_Proximitybeacon_LatLng $latLng)
-  {
-    $this->latLng = $latLng;
-  }
-  public function getLatLng()
-  {
-    return $this->latLng;
-  }
-  public function setPlaceId($placeId)
-  {
-    $this->placeId = $placeId;
-  }
-  public function getPlaceId()
-  {
-    return $this->placeId;
-  }
-  public function setProperties($properties)
-  {
-    $this->properties = $properties;
-  }
-  public function getProperties()
-  {
-    return $this->properties;
-  }
-  public function setProvisioningKey($provisioningKey)
-  {
-    $this->provisioningKey = $provisioningKey;
-  }
-  public function getProvisioningKey()
-  {
-    return $this->provisioningKey;
-  }
-  public function setStatus($status)
-  {
-    $this->status = $status;
-  }
-  public function getStatus()
-  {
-    return $this->status;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Proximitybeacon/BeaconAttachment.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Proximitybeacon/BeaconAttachment.php
deleted file mode 100644
index 05d76e8c..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Proximitybeacon/BeaconAttachment.php
+++ /dev/null
@@ -1,57 +0,0 @@
-attachmentName = $attachmentName;
-  }
-  public function getAttachmentName()
-  {
-    return $this->attachmentName;
-  }
-  public function setCreationTimeMs($creationTimeMs)
-  {
-    $this->creationTimeMs = $creationTimeMs;
-  }
-  public function getCreationTimeMs()
-  {
-    return $this->creationTimeMs;
-  }
-  public function setData($data)
-  {
-    $this->data = $data;
-  }
-  public function getData()
-  {
-    return $this->data;
-  }
-  public function setNamespacedType($namespacedType)
-  {
-    $this->namespacedType = $namespacedType;
-  }
-  public function getNamespacedType()
-  {
-    return $this->namespacedType;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Proximitybeacon/BeaconInfo.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Proximitybeacon/BeaconInfo.php
deleted file mode 100644
index cd360398..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Proximitybeacon/BeaconInfo.php
+++ /dev/null
@@ -1,51 +0,0 @@
-advertisedId = $advertisedId;
-  }
-  public function getAdvertisedId()
-  {
-    return $this->advertisedId;
-  }
-  public function setAttachments($attachments)
-  {
-    $this->attachments = $attachments;
-  }
-  public function getAttachments()
-  {
-    return $this->attachments;
-  }
-  public function setBeaconName($beaconName)
-  {
-    $this->beaconName = $beaconName;
-  }
-  public function getBeaconName()
-  {
-    return $this->beaconName;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Proximitybeacon/Date.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Proximitybeacon/Date.php
deleted file mode 100644
index 14b2ebbc..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Proximitybeacon/Date.php
+++ /dev/null
@@ -1,48 +0,0 @@
-day = $day;
-  }
-  public function getDay()
-  {
-    return $this->day;
-  }
-  public function setMonth($month)
-  {
-    $this->month = $month;
-  }
-  public function getMonth()
-  {
-    return $this->month;
-  }
-  public function setYear($year)
-  {
-    $this->year = $year;
-  }
-  public function getYear()
-  {
-    return $this->year;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Proximitybeacon/DeleteAttachmentsResponse.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Proximitybeacon/DeleteAttachmentsResponse.php
deleted file mode 100644
index edccbfbd..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Proximitybeacon/DeleteAttachmentsResponse.php
+++ /dev/null
@@ -1,30 +0,0 @@
-numDeleted = $numDeleted;
-  }
-  public function getNumDeleted()
-  {
-    return $this->numDeleted;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Proximitybeacon/Diagnostics.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Proximitybeacon/Diagnostics.php
deleted file mode 100644
index 6294b534..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Proximitybeacon/Diagnostics.php
+++ /dev/null
@@ -1,50 +0,0 @@
-alerts = $alerts;
-  }
-  public function getAlerts()
-  {
-    return $this->alerts;
-  }
-  public function setBeaconName($beaconName)
-  {
-    $this->beaconName = $beaconName;
-  }
-  public function getBeaconName()
-  {
-    return $this->beaconName;
-  }
-  public function setEstimatedLowBatteryDate(Google_Service_Proximitybeacon_Date $estimatedLowBatteryDate)
-  {
-    $this->estimatedLowBatteryDate = $estimatedLowBatteryDate;
-  }
-  public function getEstimatedLowBatteryDate()
-  {
-    return $this->estimatedLowBatteryDate;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Proximitybeacon/EphemeralIdRegistration.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Proximitybeacon/EphemeralIdRegistration.php
deleted file mode 100644
index 0859c14b..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Proximitybeacon/EphemeralIdRegistration.php
+++ /dev/null
@@ -1,75 +0,0 @@
-beaconEcdhPublicKey = $beaconEcdhPublicKey;
-  }
-  public function getBeaconEcdhPublicKey()
-  {
-    return $this->beaconEcdhPublicKey;
-  }
-  public function setBeaconIdentityKey($beaconIdentityKey)
-  {
-    $this->beaconIdentityKey = $beaconIdentityKey;
-  }
-  public function getBeaconIdentityKey()
-  {
-    return $this->beaconIdentityKey;
-  }
-  public function setInitialClockValue($initialClockValue)
-  {
-    $this->initialClockValue = $initialClockValue;
-  }
-  public function getInitialClockValue()
-  {
-    return $this->initialClockValue;
-  }
-  public function setInitialEid($initialEid)
-  {
-    $this->initialEid = $initialEid;
-  }
-  public function getInitialEid()
-  {
-    return $this->initialEid;
-  }
-  public function setRotationPeriodExponent($rotationPeriodExponent)
-  {
-    $this->rotationPeriodExponent = $rotationPeriodExponent;
-  }
-  public function getRotationPeriodExponent()
-  {
-    return $this->rotationPeriodExponent;
-  }
-  public function setServiceEcdhPublicKey($serviceEcdhPublicKey)
-  {
-    $this->serviceEcdhPublicKey = $serviceEcdhPublicKey;
-  }
-  public function getServiceEcdhPublicKey()
-  {
-    return $this->serviceEcdhPublicKey;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Proximitybeacon/EphemeralIdRegistrationParams.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Proximitybeacon/EphemeralIdRegistrationParams.php
deleted file mode 100644
index 38577f17..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Proximitybeacon/EphemeralIdRegistrationParams.php
+++ /dev/null
@@ -1,48 +0,0 @@
-maxRotationPeriodExponent = $maxRotationPeriodExponent;
-  }
-  public function getMaxRotationPeriodExponent()
-  {
-    return $this->maxRotationPeriodExponent;
-  }
-  public function setMinRotationPeriodExponent($minRotationPeriodExponent)
-  {
-    $this->minRotationPeriodExponent = $minRotationPeriodExponent;
-  }
-  public function getMinRotationPeriodExponent()
-  {
-    return $this->minRotationPeriodExponent;
-  }
-  public function setServiceEcdhPublicKey($serviceEcdhPublicKey)
-  {
-    $this->serviceEcdhPublicKey = $serviceEcdhPublicKey;
-  }
-  public function getServiceEcdhPublicKey()
-  {
-    return $this->serviceEcdhPublicKey;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Proximitybeacon/GetInfoForObservedBeaconsRequest.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Proximitybeacon/GetInfoForObservedBeaconsRequest.php
deleted file mode 100644
index e530615a..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Proximitybeacon/GetInfoForObservedBeaconsRequest.php
+++ /dev/null
@@ -1,41 +0,0 @@
-namespacedTypes = $namespacedTypes;
-  }
-  public function getNamespacedTypes()
-  {
-    return $this->namespacedTypes;
-  }
-  public function setObservations($observations)
-  {
-    $this->observations = $observations;
-  }
-  public function getObservations()
-  {
-    return $this->observations;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Proximitybeacon/GetInfoForObservedBeaconsResponse.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Proximitybeacon/GetInfoForObservedBeaconsResponse.php
deleted file mode 100644
index 8522a546..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Proximitybeacon/GetInfoForObservedBeaconsResponse.php
+++ /dev/null
@@ -1,32 +0,0 @@
-beacons = $beacons;
-  }
-  public function getBeacons()
-  {
-    return $this->beacons;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Proximitybeacon/IndoorLevel.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Proximitybeacon/IndoorLevel.php
deleted file mode 100644
index a2506345..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Proximitybeacon/IndoorLevel.php
+++ /dev/null
@@ -1,30 +0,0 @@
-name = $name;
-  }
-  public function getName()
-  {
-    return $this->name;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Proximitybeacon/LatLng.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Proximitybeacon/LatLng.php
deleted file mode 100644
index e79bdeb5..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Proximitybeacon/LatLng.php
+++ /dev/null
@@ -1,39 +0,0 @@
-latitude = $latitude;
-  }
-  public function getLatitude()
-  {
-    return $this->latitude;
-  }
-  public function setLongitude($longitude)
-  {
-    $this->longitude = $longitude;
-  }
-  public function getLongitude()
-  {
-    return $this->longitude;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Proximitybeacon/ListBeaconAttachmentsResponse.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Proximitybeacon/ListBeaconAttachmentsResponse.php
deleted file mode 100644
index bd04678e..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Proximitybeacon/ListBeaconAttachmentsResponse.php
+++ /dev/null
@@ -1,32 +0,0 @@
-attachments = $attachments;
-  }
-  public function getAttachments()
-  {
-    return $this->attachments;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Proximitybeacon/ListBeaconsResponse.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Proximitybeacon/ListBeaconsResponse.php
deleted file mode 100644
index 3a9d6eaf..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Proximitybeacon/ListBeaconsResponse.php
+++ /dev/null
@@ -1,50 +0,0 @@
-beacons = $beacons;
-  }
-  public function getBeacons()
-  {
-    return $this->beacons;
-  }
-  public function setNextPageToken($nextPageToken)
-  {
-    $this->nextPageToken = $nextPageToken;
-  }
-  public function getNextPageToken()
-  {
-    return $this->nextPageToken;
-  }
-  public function setTotalCount($totalCount)
-  {
-    $this->totalCount = $totalCount;
-  }
-  public function getTotalCount()
-  {
-    return $this->totalCount;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Proximitybeacon/ListDiagnosticsResponse.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Proximitybeacon/ListDiagnosticsResponse.php
deleted file mode 100644
index e60e49f7..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Proximitybeacon/ListDiagnosticsResponse.php
+++ /dev/null
@@ -1,41 +0,0 @@
-diagnostics = $diagnostics;
-  }
-  public function getDiagnostics()
-  {
-    return $this->diagnostics;
-  }
-  public function setNextPageToken($nextPageToken)
-  {
-    $this->nextPageToken = $nextPageToken;
-  }
-  public function getNextPageToken()
-  {
-    return $this->nextPageToken;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Proximitybeacon/ListNamespacesResponse.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Proximitybeacon/ListNamespacesResponse.php
deleted file mode 100644
index 2fc56989..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Proximitybeacon/ListNamespacesResponse.php
+++ /dev/null
@@ -1,32 +0,0 @@
-namespaces = $namespaces;
-  }
-  public function getNamespaces()
-  {
-    return $this->namespaces;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Proximitybeacon/Observation.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Proximitybeacon/Observation.php
deleted file mode 100644
index d8095521..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Proximitybeacon/Observation.php
+++ /dev/null
@@ -1,49 +0,0 @@
-advertisedId = $advertisedId;
-  }
-  public function getAdvertisedId()
-  {
-    return $this->advertisedId;
-  }
-  public function setTelemetry($telemetry)
-  {
-    $this->telemetry = $telemetry;
-  }
-  public function getTelemetry()
-  {
-    return $this->telemetry;
-  }
-  public function setTimestampMs($timestampMs)
-  {
-    $this->timestampMs = $timestampMs;
-  }
-  public function getTimestampMs()
-  {
-    return $this->timestampMs;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Proximitybeacon/ProximitybeaconEmpty.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Proximitybeacon/ProximitybeaconEmpty.php
deleted file mode 100644
index 5bcf3afb..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Proximitybeacon/ProximitybeaconEmpty.php
+++ /dev/null
@@ -1,20 +0,0 @@
-namespaceName = $namespaceName;
-  }
-  public function getNamespaceName()
-  {
-    return $this->namespaceName;
-  }
-  public function setServingVisibility($servingVisibility)
-  {
-    $this->servingVisibility = $servingVisibility;
-  }
-  public function getServingVisibility()
-  {
-    return $this->servingVisibility;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Proximitybeacon/Resource/Beaconinfo.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Proximitybeacon/Resource/Beaconinfo.php
deleted file mode 100644
index 0208cc15..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Proximitybeacon/Resource/Beaconinfo.php
+++ /dev/null
@@ -1,44 +0,0 @@
-
- *   $proximitybeaconService = new Google_Service_Proximitybeacon(...);
- *   $beaconinfo = $proximitybeaconService->beaconinfo;
- *  
- */
-class Google_Service_Proximitybeacon_Resource_Beaconinfo extends Google_Service_Resource
-{
-  /**
-   * Given one or more beacon observations, returns any beacon information and
-   * attachments accessible to your application. Authorize by using the [API
-   * key](https://developers.google.com/beacons/proximity/how-
-   * tos/authorizing#APIKey) for the application. (beaconinfo.getforobserved)
-   *
-   * @param Google_Service_Proximitybeacon_GetInfoForObservedBeaconsRequest $postBody
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Proximitybeacon_GetInfoForObservedBeaconsResponse
-   */
-  public function getforobserved(Google_Service_Proximitybeacon_GetInfoForObservedBeaconsRequest $postBody, $optParams = array())
-  {
-    $params = array('postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('getforobserved', array($params), "Google_Service_Proximitybeacon_GetInfoForObservedBeaconsResponse");
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Proximitybeacon/Resource/Beacons.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Proximitybeacon/Resource/Beacons.php
deleted file mode 100644
index 1600280c..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Proximitybeacon/Resource/Beacons.php
+++ /dev/null
@@ -1,316 +0,0 @@
-
- *   $proximitybeaconService = new Google_Service_Proximitybeacon(...);
- *   $beacons = $proximitybeaconService->beacons;
- *  
- */
-class Google_Service_Proximitybeacon_Resource_Beacons extends Google_Service_Resource
-{
-  /**
-   * Activates a beacon. A beacon that is active will return information and
-   * attachment data when queried via `beaconinfo.getforobserved`. Calling this
-   * method on an already active beacon will do nothing (but will return a
-   * successful response code).
-   *
-   * Authenticate using an [OAuth access
-   * token](https://developers.google.com/identity/protocols/OAuth2) from a
-   * signed-in user with **Is owner** or **Can edit** permissions in the Google
-   * Developers Console project. (beacons.activate)
-   *
-   * @param string $beaconName Beacon that should be activated. A beacon name has
-   * the format "beacons/N!beaconId" where the beaconId is the base16 ID broadcast
-   * by the beacon and N is a code for the beacon's type. Possible values are `3`
-   * for Eddystone-UID, `4` for Eddystone-EID, `1` for iBeacon, or `5` for
-   * AltBeacon. For Eddystone-EID beacons, you may use either the current EID or
-   * the beacon's "stable" UID. Required.
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param string projectId The project id of the beacon to activate. If the
-   * project id is not specified then the project making the request is used. The
-   * project id must match the project that owns the beacon. Optional.
-   * @return Google_Service_Proximitybeacon_ProximitybeaconEmpty
-   */
-  public function activate($beaconName, $optParams = array())
-  {
-    $params = array('beaconName' => $beaconName);
-    $params = array_merge($params, $optParams);
-    return $this->call('activate', array($params), "Google_Service_Proximitybeacon_ProximitybeaconEmpty");
-  }
-  /**
-   * Deactivates a beacon. Once deactivated, the API will not return information
-   * nor attachment data for the beacon when queried via
-   * `beaconinfo.getforobserved`. Calling this method on an already inactive
-   * beacon will do nothing (but will return a successful response code).
-   *
-   * Authenticate using an [OAuth access
-   * token](https://developers.google.com/identity/protocols/OAuth2) from a
-   * signed-in user with **Is owner** or **Can edit** permissions in the Google
-   * Developers Console project. (beacons.deactivate)
-   *
-   * @param string $beaconName Beacon that should be deactivated. A beacon name
-   * has the format "beacons/N!beaconId" where the beaconId is the base16 ID
-   * broadcast by the beacon and N is a code for the beacon's type. Possible
-   * values are `3` for Eddystone-UID, `4` for Eddystone-EID, `1` for iBeacon, or
-   * `5` for AltBeacon. For Eddystone-EID beacons, you may use either the current
-   * EID or the beacon's "stable" UID. Required.
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param string projectId The project id of the beacon to deactivate. If
-   * the project id is not specified then the project making the request is used.
-   * The project id must match the project that owns the beacon. Optional.
-   * @return Google_Service_Proximitybeacon_ProximitybeaconEmpty
-   */
-  public function deactivate($beaconName, $optParams = array())
-  {
-    $params = array('beaconName' => $beaconName);
-    $params = array_merge($params, $optParams);
-    return $this->call('deactivate', array($params), "Google_Service_Proximitybeacon_ProximitybeaconEmpty");
-  }
-  /**
-   * Decommissions the specified beacon in the service. This beacon will no longer
-   * be returned from `beaconinfo.getforobserved`. This operation is permanent --
-   * you will not be able to re-register a beacon with this ID again.
-   *
-   * Authenticate using an [OAuth access
-   * token](https://developers.google.com/identity/protocols/OAuth2) from a
-   * signed-in user with **Is owner** or **Can edit** permissions in the Google
-   * Developers Console project. (beacons.decommission)
-   *
-   * @param string $beaconName Beacon that should be decommissioned. A beacon name
-   * has the format "beacons/N!beaconId" where the beaconId is the base16 ID
-   * broadcast by the beacon and N is a code for the beacon's type. Possible
-   * values are `3` for Eddystone-UID, `4` for Eddystone-EID, `1` for iBeacon, or
-   * `5` for AltBeacon. For Eddystone-EID beacons, you may use either the current
-   * EID of the beacon's "stable" UID. Required.
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param string projectId The project id of the beacon to decommission. If
-   * the project id is not specified then the project making the request is used.
-   * The project id must match the project that owns the beacon. Optional.
-   * @return Google_Service_Proximitybeacon_ProximitybeaconEmpty
-   */
-  public function decommission($beaconName, $optParams = array())
-  {
-    $params = array('beaconName' => $beaconName);
-    $params = array_merge($params, $optParams);
-    return $this->call('decommission', array($params), "Google_Service_Proximitybeacon_ProximitybeaconEmpty");
-  }
-  /**
-   * Deletes the specified beacon including all diagnostics data for the beacon as
-   * well as any attachments on the beacon (including those belonging to other
-   * projects). This operation cannot be undone.
-   *
-   * Authenticate using an [OAuth access
-   * token](https://developers.google.com/identity/protocols/OAuth2) from a
-   * signed-in user with **Is owner** or **Can edit** permissions in the Google
-   * Developers Console project. (beacons.delete)
-   *
-   * @param string $beaconName Beacon that should be deleted. A beacon name has
-   * the format "beacons/N!beaconId" where the beaconId is the base16 ID broadcast
-   * by the beacon and N is a code for the beacon's type. Possible values are `3`
-   * for Eddystone-UID, `4` for Eddystone-EID, `1` for iBeacon, or `5` for
-   * AltBeacon. For Eddystone-EID beacons, you may use either the current EID or
-   * the beacon's "stable" UID. Required.
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param string projectId The project id of the beacon to delete. If not
-   * provided, the project that is making the request is used. Optional.
-   * @return Google_Service_Proximitybeacon_ProximitybeaconEmpty
-   */
-  public function delete($beaconName, $optParams = array())
-  {
-    $params = array('beaconName' => $beaconName);
-    $params = array_merge($params, $optParams);
-    return $this->call('delete', array($params), "Google_Service_Proximitybeacon_ProximitybeaconEmpty");
-  }
-  /**
-   * Returns detailed information about the specified beacon.
-   *
-   * Authenticate using an [OAuth access
-   * token](https://developers.google.com/identity/protocols/OAuth2) from a
-   * signed-in user with **viewer**, **Is owner** or **Can edit** permissions in
-   * the Google Developers Console project.
-   *
-   * Requests may supply an Eddystone-EID beacon name in the form:
-   * `beacons/4!beaconId` where the `beaconId` is the base16 ephemeral ID
-   * broadcast by the beacon. The returned `Beacon` object will contain the
-   * beacon's stable Eddystone-UID. Clients not authorized to resolve the beacon's
-   * ephemeral Eddystone-EID broadcast will receive an error. (beacons.get)
-   *
-   * @param string $beaconName Resource name of this beacon. A beacon name has the
-   * format "beacons/N!beaconId" where the beaconId is the base16 ID broadcast by
-   * the beacon and N is a code for the beacon's type. Possible values are `3` for
-   * Eddystone-UID, `4` for Eddystone-EID, `1` for iBeacon, or `5` for AltBeacon.
-   * For Eddystone-EID beacons, you may use either the current EID or the beacon's
-   * "stable" UID. Required.
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param string projectId The project id of the beacon to request. If the
-   * project id is not specified then the project making the request is used. The
-   * project id must match the project that owns the beacon. Optional.
-   * @return Google_Service_Proximitybeacon_Beacon
-   */
-  public function get($beaconName, $optParams = array())
-  {
-    $params = array('beaconName' => $beaconName);
-    $params = array_merge($params, $optParams);
-    return $this->call('get', array($params), "Google_Service_Proximitybeacon_Beacon");
-  }
-  /**
-   * Searches the beacon registry for beacons that match the given search
-   * criteria. Only those beacons that the client has permission to list will be
-   * returned.
-   *
-   * Authenticate using an [OAuth access
-   * token](https://developers.google.com/identity/protocols/OAuth2) from a
-   * signed-in user with **viewer**, **Is owner** or **Can edit** permissions in
-   * the Google Developers Console project. (beacons.listBeacons)
-   *
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param string q Filter query string that supports the following field
-   * filters:
-   *
-   * * **description:`""`**   For example: **description:"Room 3"**   Returns
-   * beacons whose description matches tokens in the string "Room 3"   (not
-   * necessarily that exact string).   The string must be double-quoted. *
-   * **status:``**   For example: **status:active**   Returns beacons whose status
-   * matches the given value. Values must be   one of the Beacon.Status enum
-   * values (case insensitive). Accepts   multiple filters which will be combined
-   * with OR logic. * **stability:``**   For example: **stability:mobile**
-   * Returns beacons whose expected stability matches the given value.   Values
-   * must be one of the Beacon.Stability enum values (case   insensitive). Accepts
-   * multiple filters which will be combined with   OR logic. * **place\_id:`""`**
-   * For example: **place\_id:"ChIJVSZzVR8FdkgRXGmmm6SslKw="**   Returns beacons
-   * explicitly registered at the given place, expressed as   a Place ID obtained
-   * from [Google Places API](/places/place-id). Does not   match places inside
-   * the given place. Does not consider the beacon's   actual location (which may
-   * be different from its registered place).   Accepts multiple filters that will
-   * be combined with OR logic. The place   ID must be double-quoted. *
-   * **registration\_time`[<|>|<=|>=]`**   For example:
-   * **registration\_time>=1433116800**   Returns beacons whose registration time
-   * matches the given filter.   Supports the operators: <, >, <=, and >=.
-   * Timestamp must be expressed as   an integer number of seconds since midnight
-   * January 1, 1970 UTC. Accepts   at most two filters that will be combined with
-   * AND logic, to support   "between" semantics. If more than two are supplied,
-   * the latter ones are   ignored. * **lat:` lng: radius:`**   For example:
-   * **lat:51.1232343 lng:-1.093852 radius:1000**   Returns beacons whose
-   * registered location is within the given circle.   When any of these fields
-   * are given, all are required. Latitude and   longitude must be decimal degrees
-   * between -90.0 and 90.0 and between   -180.0 and 180.0 respectively. Radius
-   * must be an integer number of   meters between 10 and 1,000,000 (1000 km). *
-   * **property:`"="`**   For example: **property:"battery-type=CR2032"**
-   * Returns beacons which have a property of the given name and value.   Supports
-   * multiple filters which will be combined with OR logic.   The entire
-   * name=value string must be double-quoted as one string. *
-   * **attachment\_type:`""`**   For example: **attachment_type:"my-namespace/my-
-   * type"**   Returns beacons having at least one attachment of the given
-   * namespaced   type. Supports "any within this namespace" via the partial
-   * wildcard   syntax: "my-namespace". Supports multiple filters which will be
-   * combined with OR logic. The string must be double-quoted. *
-   * **indoor\_level:`""`**   For example: **indoor\_level:"1"**   Returns beacons
-   * which are located on the given indoor level. Accepts   multiple filters that
-   * will be combined with OR logic.
-   *
-   * Multiple filters on the same field are combined with OR logic (except
-   * registration_time which is combined with AND logic). Multiple filters on
-   * different fields are combined with AND logic. Filters should be separated by
-   * spaces.
-   *
-   * As with any HTTP query string parameter, the whole filter expression must be
-   * URL-encoded.
-   *
-   * Example REST request: `GET
-   * /v1beta1/beacons?q=status:active%20lat:51.123%20lng:-1.095%20radius:1000`
-   * @opt_param int pageSize The maximum number of records to return for this
-   * request, up to a server-defined upper limit.
-   * @opt_param string pageToken A pagination token obtained from a previous
-   * request to list beacons.
-   * @opt_param string projectId The project id to list beacons under. If not
-   * present then the project credential that made the request is used as the
-   * project. Optional.
-   * @return Google_Service_Proximitybeacon_ListBeaconsResponse
-   */
-  public function listBeacons($optParams = array())
-  {
-    $params = array();
-    $params = array_merge($params, $optParams);
-    return $this->call('list', array($params), "Google_Service_Proximitybeacon_ListBeaconsResponse");
-  }
-  /**
-   * Registers a previously unregistered beacon given its `advertisedId`. These
-   * IDs are unique within the system. An ID can be registered only once.
-   *
-   * Authenticate using an [OAuth access
-   * token](https://developers.google.com/identity/protocols/OAuth2) from a
-   * signed-in user with **Is owner** or **Can edit** permissions in the Google
-   * Developers Console project. (beacons.register)
-   *
-   * @param Google_Service_Proximitybeacon_Beacon $postBody
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param string projectId The project id of the project the beacon will be
-   * registered to. If the project id is not specified then the project making the
-   * request is used. Optional.
-   * @return Google_Service_Proximitybeacon_Beacon
-   */
-  public function register(Google_Service_Proximitybeacon_Beacon $postBody, $optParams = array())
-  {
-    $params = array('postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('register', array($params), "Google_Service_Proximitybeacon_Beacon");
-  }
-  /**
-   * Updates the information about the specified beacon. **Any field that you do
-   * not populate in the submitted beacon will be permanently erased**, so you
-   * should follow the "read, modify, write" pattern to avoid inadvertently
-   * destroying data.
-   *
-   * Changes to the beacon status via this method will be  silently ignored. To
-   * update beacon status, use the separate methods on this API for activation,
-   * deactivation, and decommissioning. Authenticate using an [OAuth access
-   * token](https://developers.google.com/identity/protocols/OAuth2) from a
-   * signed-in user with **Is owner** or **Can edit** permissions in the Google
-   * Developers Console project. (beacons.update)
-   *
-   * @param string $beaconName Resource name of this beacon. A beacon name has the
-   * format "beacons/N!beaconId" where the beaconId is the base16 ID broadcast by
-   * the beacon and N is a code for the beacon's type. Possible values are `3` for
-   * Eddystone, `1` for iBeacon, or `5` for AltBeacon.
-   *
-   * This field must be left empty when registering. After reading a beacon,
-   * clients can use the name for future operations.
-   * @param Google_Service_Proximitybeacon_Beacon $postBody
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param string projectId The project id of the beacon to update. If the
-   * project id is not specified then the project making the request is used. The
-   * project id must match the project that owns the beacon. Optional.
-   * @return Google_Service_Proximitybeacon_Beacon
-   */
-  public function update($beaconName, Google_Service_Proximitybeacon_Beacon $postBody, $optParams = array())
-  {
-    $params = array('beaconName' => $beaconName, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('update', array($params), "Google_Service_Proximitybeacon_Beacon");
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Proximitybeacon/Resource/BeaconsAttachments.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Proximitybeacon/Resource/BeaconsAttachments.php
deleted file mode 100644
index 694d74d6..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Proximitybeacon/Resource/BeaconsAttachments.php
+++ /dev/null
@@ -1,170 +0,0 @@
-
- *   $proximitybeaconService = new Google_Service_Proximitybeacon(...);
- *   $attachments = $proximitybeaconService->attachments;
- *  
- */
-class Google_Service_Proximitybeacon_Resource_BeaconsAttachments extends Google_Service_Resource
-{
-  /**
-   * Deletes multiple attachments on a given beacon. This operation is permanent
-   * and cannot be undone.
-   *
-   * You can optionally specify `namespacedType` to choose which attachments
-   * should be deleted. If you do not specify `namespacedType`,  all your
-   * attachments on the given beacon will be deleted. You also may explicitly
-   * specify `*` to delete all.
-   *
-   * Authenticate using an [OAuth access
-   * token](https://developers.google.com/identity/protocols/OAuth2) from a
-   * signed-in user with **Is owner** or **Can edit** permissions in the Google
-   * Developers Console project. (attachments.batchDelete)
-   *
-   * @param string $beaconName The beacon whose attachments should be deleted. A
-   * beacon name has the format "beacons/N!beaconId" where the beaconId is the
-   * base16 ID broadcast by the beacon and N is a code for the beacon's type.
-   * Possible values are `3` for Eddystone-UID, `4` for Eddystone-EID, `1` for
-   * iBeacon, or `5` for AltBeacon. For Eddystone-EID beacons, you may use either
-   * the current EID or the beacon's "stable" UID. Required.
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param string namespacedType Specifies the namespace and type of
-   * attachments to delete in `namespace/type` format. Accepts `*` to specify "all
-   * types in all namespaces". Optional.
-   * @opt_param string projectId The project id to delete beacon attachments
-   * under. This field can be used when "*" is specified to mean all attachment
-   * namespaces. Projects may have multiple attachments with multiple namespaces.
-   * If "*" is specified and the projectId string is empty, then the project
-   * making the request is used. Optional.
-   * @return Google_Service_Proximitybeacon_DeleteAttachmentsResponse
-   */
-  public function batchDelete($beaconName, $optParams = array())
-  {
-    $params = array('beaconName' => $beaconName);
-    $params = array_merge($params, $optParams);
-    return $this->call('batchDelete', array($params), "Google_Service_Proximitybeacon_DeleteAttachmentsResponse");
-  }
-  /**
-   * Associates the given data with the specified beacon. Attachment data must
-   * contain two parts:
-   *
-   * A namespaced type. The actual attachment data itself.
-   *
-   * The namespaced type consists of two parts, the namespace and the type. The
-   * namespace must be one of the values returned by the `namespaces` endpoint,
-   * while the type can be a string of any characters except for the forward slash
-   * (`/`) up to 100 characters in length.
-   *
-   * Attachment data can be up to 1024 bytes long.
-   *
-   * Authenticate using an [OAuth access
-   * token](https://developers.google.com/identity/protocols/OAuth2) from a
-   * signed-in user with **Is owner** or **Can edit** permissions in the Google
-   * Developers Console project. (attachments.create)
-   *
-   * @param string $beaconName Beacon on which the attachment should be created. A
-   * beacon name has the format "beacons/N!beaconId" where the beaconId is the
-   * base16 ID broadcast by the beacon and N is a code for the beacon's type.
-   * Possible values are `3` for Eddystone-UID, `4` for Eddystone-EID, `1` for
-   * iBeacon, or `5` for AltBeacon. For Eddystone-EID beacons, you may use either
-   * the current EID or the beacon's "stable" UID. Required.
-   * @param Google_Service_Proximitybeacon_BeaconAttachment $postBody
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param string projectId The project id of the project the attachment will
-   * belong to. If the project id is not specified then the project making the
-   * request is used. Optional.
-   * @return Google_Service_Proximitybeacon_BeaconAttachment
-   */
-  public function create($beaconName, Google_Service_Proximitybeacon_BeaconAttachment $postBody, $optParams = array())
-  {
-    $params = array('beaconName' => $beaconName, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('create', array($params), "Google_Service_Proximitybeacon_BeaconAttachment");
-  }
-  /**
-   * Deletes the specified attachment for the given beacon. Each attachment has a
-   * unique attachment name (`attachmentName`) which is returned when you fetch
-   * the attachment data via this API. You specify this with the delete request to
-   * control which attachment is removed. This operation cannot be undone.
-   *
-   * Authenticate using an [OAuth access
-   * token](https://developers.google.com/identity/protocols/OAuth2) from a
-   * signed-in user with **Is owner** or **Can edit** permissions in the Google
-   * Developers Console project. (attachments.delete)
-   *
-   * @param string $attachmentName The attachment name (`attachmentName`) of the
-   * attachment to remove. For example:
-   * `beacons/3!893737abc9/attachments/c5e937-af0-494-959-ec49d12738`. For
-   * Eddystone-EID beacons, the beacon ID portion (`3!893737abc9`) may be the
-   * beacon's current EID, or its "stable" Eddystone-UID. Required.
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param string projectId The project id of the attachment to delete. If
-   * not provided, the project that is making the request is used. Optional.
-   * @return Google_Service_Proximitybeacon_ProximitybeaconEmpty
-   */
-  public function delete($attachmentName, $optParams = array())
-  {
-    $params = array('attachmentName' => $attachmentName);
-    $params = array_merge($params, $optParams);
-    return $this->call('delete', array($params), "Google_Service_Proximitybeacon_ProximitybeaconEmpty");
-  }
-  /**
-   * Returns the attachments for the specified beacon that match the specified
-   * namespaced-type pattern.
-   *
-   * To control which namespaced types are returned, you add the `namespacedType`
-   * query parameter to the request. You must either use `*`, to return all
-   * attachments, or the namespace must be one of the ones returned from the
-   * `namespaces` endpoint.
-   *
-   * Authenticate using an [OAuth access
-   * token](https://developers.google.com/identity/protocols/OAuth2) from a
-   * signed-in user with **viewer**, **Is owner** or **Can edit** permissions in
-   * the Google Developers Console project. (attachments.listBeaconsAttachments)
-   *
-   * @param string $beaconName Beacon whose attachments should be fetched. A
-   * beacon name has the format "beacons/N!beaconId" where the beaconId is the
-   * base16 ID broadcast by the beacon and N is a code for the beacon's type.
-   * Possible values are `3` for Eddystone-UID, `4` for Eddystone-EID, `1` for
-   * iBeacon, or `5` for AltBeacon. For Eddystone-EID beacons, you may use either
-   * the current EID or the beacon's "stable" UID. Required.
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param string namespacedType Specifies the namespace and type of
-   * attachment to include in response in namespace/type format. Accepts `*` to
-   * specify "all types in all namespaces".
-   * @opt_param string projectId The project id to list beacon attachments under.
-   * This field can be used when "*" is specified to mean all attachment
-   * namespaces. Projects may have multiple attachments with multiple namespaces.
-   * If "*" is specified and the projectId string is empty, then the project
-   * making the request is used. Optional.
-   * @return Google_Service_Proximitybeacon_ListBeaconAttachmentsResponse
-   */
-  public function listBeaconsAttachments($beaconName, $optParams = array())
-  {
-    $params = array('beaconName' => $beaconName);
-    $params = array_merge($params, $optParams);
-    return $this->call('list', array($params), "Google_Service_Proximitybeacon_ListBeaconAttachmentsResponse");
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Proximitybeacon/Resource/BeaconsDiagnostics.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Proximitybeacon/Resource/BeaconsDiagnostics.php
deleted file mode 100644
index de301528..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Proximitybeacon/Resource/BeaconsDiagnostics.php
+++ /dev/null
@@ -1,59 +0,0 @@
-
- *   $proximitybeaconService = new Google_Service_Proximitybeacon(...);
- *   $diagnostics = $proximitybeaconService->diagnostics;
- *  
- */
-class Google_Service_Proximitybeacon_Resource_BeaconsDiagnostics extends Google_Service_Resource
-{
-  /**
-   * List the diagnostics for a single beacon. You can also list diagnostics for
-   * all the beacons owned by your Google Developers Console project by using the
-   * beacon name `beacons/-`.
-   *
-   * Authenticate using an [OAuth access
-   * token](https://developers.google.com/identity/protocols/OAuth2) from a
-   * signed-in user with **viewer**, **Is owner** or **Can edit** permissions in
-   * the Google Developers Console project. (diagnostics.listBeaconsDiagnostics)
-   *
-   * @param string $beaconName Beacon that the diagnostics are for.
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param int pageSize Specifies the maximum number of results to return.
-   * Defaults to 10. Maximum 1000. Optional.
-   * @opt_param string alertFilter Requests only beacons that have the given
-   * alert. For example, to find beacons that have low batteries use
-   * `alert_filter=LOW_BATTERY`.
-   * @opt_param string pageToken Requests results that occur after the
-   * `page_token`, obtained from the response to a previous request. Optional.
-   * @opt_param string projectId Requests only diagnostic records for the given
-   * project id. If not set, then the project making the request will be used for
-   * looking up diagnostic records. Optional.
-   * @return Google_Service_Proximitybeacon_ListDiagnosticsResponse
-   */
-  public function listBeaconsDiagnostics($beaconName, $optParams = array())
-  {
-    $params = array('beaconName' => $beaconName);
-    $params = array_merge($params, $optParams);
-    return $this->call('list', array($params), "Google_Service_Proximitybeacon_ListDiagnosticsResponse");
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Proximitybeacon/Resource/Namespaces.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Proximitybeacon/Resource/Namespaces.php
deleted file mode 100644
index 545a574d..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Proximitybeacon/Resource/Namespaces.php
+++ /dev/null
@@ -1,70 +0,0 @@
-
- *   $proximitybeaconService = new Google_Service_Proximitybeacon(...);
- *   $namespaces = $proximitybeaconService->namespaces;
- *  
- */
-class Google_Service_Proximitybeacon_Resource_Namespaces extends Google_Service_Resource
-{
-  /**
-   * Lists all attachment namespaces owned by your Google Developers Console
-   * project. Attachment data associated with a beacon must include a namespaced
-   * type, and the namespace must be owned by your project.
-   *
-   * Authenticate using an [OAuth access
-   * token](https://developers.google.com/identity/protocols/OAuth2) from a
-   * signed-in user with **viewer**, **Is owner** or **Can edit** permissions in
-   * the Google Developers Console project. (namespaces.listNamespaces)
-   *
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param string projectId The project id to list namespaces under.
-   * Optional.
-   * @return Google_Service_Proximitybeacon_ListNamespacesResponse
-   */
-  public function listNamespaces($optParams = array())
-  {
-    $params = array();
-    $params = array_merge($params, $optParams);
-    return $this->call('list', array($params), "Google_Service_Proximitybeacon_ListNamespacesResponse");
-  }
-  /**
-   * Updates the information about the specified namespace. Only the namespace
-   * visibility can be updated. (namespaces.update)
-   *
-   * @param string $namespaceName Resource name of this namespace. Namespaces
-   * names have the format: namespaces/namespace.
-   * @param Google_Service_Proximitybeacon_ProximitybeaconNamespace $postBody
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param string projectId The project id of the namespace to update. If the
-   * project id is not specified then the project making the request is used. The
-   * project id must match the project that owns the beacon. Optional.
-   * @return Google_Service_Proximitybeacon_ProximitybeaconNamespace
-   */
-  public function update($namespaceName, Google_Service_Proximitybeacon_ProximitybeaconNamespace $postBody, $optParams = array())
-  {
-    $params = array('namespaceName' => $namespaceName, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('update', array($params), "Google_Service_Proximitybeacon_ProximitybeaconNamespace");
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Proximitybeacon/Resource/V1beta1.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Proximitybeacon/Resource/V1beta1.php
deleted file mode 100644
index 2d1b40be..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Proximitybeacon/Resource/V1beta1.php
+++ /dev/null
@@ -1,46 +0,0 @@
-
- *   $proximitybeaconService = new Google_Service_Proximitybeacon(...);
- *   $v1beta1 = $proximitybeaconService->v1beta1;
- *  
- */
-class Google_Service_Proximitybeacon_Resource_V1beta1 extends Google_Service_Resource
-{
-  /**
-   * Gets the Proximity Beacon API's current public key and associated parameters
-   * used to initiate the Diffie-Hellman key exchange required to register a
-   * beacon that broadcasts the Eddystone-EID format. This key changes
-   * periodically; clients may cache it and re-use the same public key to
-   * provision and register multiple beacons. However, clients should be prepared
-   * to refresh this key when they encounter an error registering an Eddystone-EID
-   * beacon. (v1beta1.getEidparams)
-   *
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Proximitybeacon_EphemeralIdRegistrationParams
-   */
-  public function getEidparams($optParams = array())
-  {
-    $params = array();
-    $params = array_merge($params, $optParams);
-    return $this->call('getEidparams', array($params), "Google_Service_Proximitybeacon_EphemeralIdRegistrationParams");
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Pubsub.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Pubsub.php
deleted file mode 100644
index d6b15be1..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Pubsub.php
+++ /dev/null
@@ -1,353 +0,0 @@
-
- * Provides reliable, many-to-many, asynchronous messaging between applications.

- *
- * 

- * For more information about this service, see the API
- * Documentation
- * 

- *
- * @author Google, Inc.
- */
-class Google_Service_Pubsub extends Google_Service
-{
-  /** View and manage your data across Google Cloud Platform services. */
-  const CLOUD_PLATFORM =
-      "https://www.googleapis.com/auth/cloud-platform";
-  /** View and manage Pub/Sub topics and subscriptions. */
-  const PUBSUB =
-      "https://www.googleapis.com/auth/pubsub";
-
-  public $projects_snapshots;
-  public $projects_subscriptions;
-  public $projects_topics;
-  public $projects_topics_subscriptions;
-  
-  /**
-   * Constructs the internal representation of the Pubsub service.
-   *
-   * @param Google_Client $client
-   */
-  public function __construct(Google_Client $client)
-  {
-    parent::__construct($client);
-    $this->rootUrl = 'https://pubsub.googleapis.com/';
-    $this->servicePath = '';
-    $this->version = 'v1';
-    $this->serviceName = 'pubsub';
-
-    $this->projects_snapshots = new Google_Service_Pubsub_Resource_ProjectsSnapshots(
-        $this,
-        $this->serviceName,
-        'snapshots',
-        array(
-          'methods' => array(
-            'getIamPolicy' => array(
-              'path' => 'v1/{+resource}:getIamPolicy',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'resource' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'setIamPolicy' => array(
-              'path' => 'v1/{+resource}:setIamPolicy',
-              'httpMethod' => 'POST',
-              'parameters' => array(
-                'resource' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'testIamPermissions' => array(
-              'path' => 'v1/{+resource}:testIamPermissions',
-              'httpMethod' => 'POST',
-              'parameters' => array(
-                'resource' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),
-          )
-        )
-    );
-    $this->projects_subscriptions = new Google_Service_Pubsub_Resource_ProjectsSubscriptions(
-        $this,
-        $this->serviceName,
-        'subscriptions',
-        array(
-          'methods' => array(
-            'acknowledge' => array(
-              'path' => 'v1/{+subscription}:acknowledge',
-              'httpMethod' => 'POST',
-              'parameters' => array(
-                'subscription' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'create' => array(
-              'path' => 'v1/{+name}',
-              'httpMethod' => 'PUT',
-              'parameters' => array(
-                'name' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'delete' => array(
-              'path' => 'v1/{+subscription}',
-              'httpMethod' => 'DELETE',
-              'parameters' => array(
-                'subscription' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'get' => array(
-              'path' => 'v1/{+subscription}',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'subscription' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'getIamPolicy' => array(
-              'path' => 'v1/{+resource}:getIamPolicy',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'resource' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'list' => array(
-              'path' => 'v1/{+project}/subscriptions',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'project' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'pageToken' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'pageSize' => array(
-                  'location' => 'query',
-                  'type' => 'integer',
-                ),
-              ),
-            ),'modifyAckDeadline' => array(
-              'path' => 'v1/{+subscription}:modifyAckDeadline',
-              'httpMethod' => 'POST',
-              'parameters' => array(
-                'subscription' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'modifyPushConfig' => array(
-              'path' => 'v1/{+subscription}:modifyPushConfig',
-              'httpMethod' => 'POST',
-              'parameters' => array(
-                'subscription' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'pull' => array(
-              'path' => 'v1/{+subscription}:pull',
-              'httpMethod' => 'POST',
-              'parameters' => array(
-                'subscription' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'setIamPolicy' => array(
-              'path' => 'v1/{+resource}:setIamPolicy',
-              'httpMethod' => 'POST',
-              'parameters' => array(
-                'resource' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'testIamPermissions' => array(
-              'path' => 'v1/{+resource}:testIamPermissions',
-              'httpMethod' => 'POST',
-              'parameters' => array(
-                'resource' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),
-          )
-        )
-    );
-    $this->projects_topics = new Google_Service_Pubsub_Resource_ProjectsTopics(
-        $this,
-        $this->serviceName,
-        'topics',
-        array(
-          'methods' => array(
-            'create' => array(
-              'path' => 'v1/{+name}',
-              'httpMethod' => 'PUT',
-              'parameters' => array(
-                'name' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'delete' => array(
-              'path' => 'v1/{+topic}',
-              'httpMethod' => 'DELETE',
-              'parameters' => array(
-                'topic' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'get' => array(
-              'path' => 'v1/{+topic}',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'topic' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'getIamPolicy' => array(
-              'path' => 'v1/{+resource}:getIamPolicy',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'resource' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'list' => array(
-              'path' => 'v1/{+project}/topics',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'project' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'pageSize' => array(
-                  'location' => 'query',
-                  'type' => 'integer',
-                ),
-                'pageToken' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-              ),
-            ),'publish' => array(
-              'path' => 'v1/{+topic}:publish',
-              'httpMethod' => 'POST',
-              'parameters' => array(
-                'topic' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'setIamPolicy' => array(
-              'path' => 'v1/{+resource}:setIamPolicy',
-              'httpMethod' => 'POST',
-              'parameters' => array(
-                'resource' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'testIamPermissions' => array(
-              'path' => 'v1/{+resource}:testIamPermissions',
-              'httpMethod' => 'POST',
-              'parameters' => array(
-                'resource' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),
-          )
-        )
-    );
-    $this->projects_topics_subscriptions = new Google_Service_Pubsub_Resource_ProjectsTopicsSubscriptions(
-        $this,
-        $this->serviceName,
-        'subscriptions',
-        array(
-          'methods' => array(
-            'list' => array(
-              'path' => 'v1/{+topic}/subscriptions',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'topic' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'pageToken' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'pageSize' => array(
-                  'location' => 'query',
-                  'type' => 'integer',
-                ),
-              ),
-            ),
-          )
-        )
-    );
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Pubsub/AcknowledgeRequest.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Pubsub/AcknowledgeRequest.php
deleted file mode 100644
index 7b00a19f..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Pubsub/AcknowledgeRequest.php
+++ /dev/null
@@ -1,31 +0,0 @@
-ackIds = $ackIds;
-  }
-  public function getAckIds()
-  {
-    return $this->ackIds;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Pubsub/Binding.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Pubsub/Binding.php
deleted file mode 100644
index 4d35ba89..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Pubsub/Binding.php
+++ /dev/null
@@ -1,40 +0,0 @@
-members = $members;
-  }
-  public function getMembers()
-  {
-    return $this->members;
-  }
-  public function setRole($role)
-  {
-    $this->role = $role;
-  }
-  public function getRole()
-  {
-    return $this->role;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Pubsub/ListSubscriptionsResponse.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Pubsub/ListSubscriptionsResponse.php
deleted file mode 100644
index 278c9796..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Pubsub/ListSubscriptionsResponse.php
+++ /dev/null
@@ -1,41 +0,0 @@
-nextPageToken = $nextPageToken;
-  }
-  public function getNextPageToken()
-  {
-    return $this->nextPageToken;
-  }
-  public function setSubscriptions($subscriptions)
-  {
-    $this->subscriptions = $subscriptions;
-  }
-  public function getSubscriptions()
-  {
-    return $this->subscriptions;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Pubsub/ListTopicSubscriptionsResponse.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Pubsub/ListTopicSubscriptionsResponse.php
deleted file mode 100644
index d600e582..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Pubsub/ListTopicSubscriptionsResponse.php
+++ /dev/null
@@ -1,40 +0,0 @@
-nextPageToken = $nextPageToken;
-  }
-  public function getNextPageToken()
-  {
-    return $this->nextPageToken;
-  }
-  public function setSubscriptions($subscriptions)
-  {
-    $this->subscriptions = $subscriptions;
-  }
-  public function getSubscriptions()
-  {
-    return $this->subscriptions;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Pubsub/ListTopicsResponse.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Pubsub/ListTopicsResponse.php
deleted file mode 100644
index a39b544f..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Pubsub/ListTopicsResponse.php
+++ /dev/null
@@ -1,41 +0,0 @@
-nextPageToken = $nextPageToken;
-  }
-  public function getNextPageToken()
-  {
-    return $this->nextPageToken;
-  }
-  public function setTopics($topics)
-  {
-    $this->topics = $topics;
-  }
-  public function getTopics()
-  {
-    return $this->topics;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Pubsub/ModifyAckDeadlineRequest.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Pubsub/ModifyAckDeadlineRequest.php
deleted file mode 100644
index 05277801..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Pubsub/ModifyAckDeadlineRequest.php
+++ /dev/null
@@ -1,40 +0,0 @@
-ackDeadlineSeconds = $ackDeadlineSeconds;
-  }
-  public function getAckDeadlineSeconds()
-  {
-    return $this->ackDeadlineSeconds;
-  }
-  public function setAckIds($ackIds)
-  {
-    $this->ackIds = $ackIds;
-  }
-  public function getAckIds()
-  {
-    return $this->ackIds;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Pubsub/ModifyPushConfigRequest.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Pubsub/ModifyPushConfigRequest.php
deleted file mode 100644
index 738bf73c..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Pubsub/ModifyPushConfigRequest.php
+++ /dev/null
@@ -1,31 +0,0 @@
-pushConfig = $pushConfig;
-  }
-  public function getPushConfig()
-  {
-    return $this->pushConfig;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Pubsub/Policy.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Pubsub/Policy.php
deleted file mode 100644
index 556af7b9..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Pubsub/Policy.php
+++ /dev/null
@@ -1,50 +0,0 @@
-bindings = $bindings;
-  }
-  public function getBindings()
-  {
-    return $this->bindings;
-  }
-  public function setEtag($etag)
-  {
-    $this->etag = $etag;
-  }
-  public function getEtag()
-  {
-    return $this->etag;
-  }
-  public function setVersion($version)
-  {
-    $this->version = $version;
-  }
-  public function getVersion()
-  {
-    return $this->version;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Pubsub/PublishRequest.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Pubsub/PublishRequest.php
deleted file mode 100644
index a3a8db7f..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Pubsub/PublishRequest.php
+++ /dev/null
@@ -1,32 +0,0 @@
-messages = $messages;
-  }
-  public function getMessages()
-  {
-    return $this->messages;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Pubsub/PublishResponse.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Pubsub/PublishResponse.php
deleted file mode 100644
index c639c407..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Pubsub/PublishResponse.php
+++ /dev/null
@@ -1,31 +0,0 @@
-messageIds = $messageIds;
-  }
-  public function getMessageIds()
-  {
-    return $this->messageIds;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Pubsub/PubsubEmpty.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Pubsub/PubsubEmpty.php
deleted file mode 100644
index 07f94691..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Pubsub/PubsubEmpty.php
+++ /dev/null
@@ -1,20 +0,0 @@
-attributes = $attributes;
-  }
-  public function getAttributes()
-  {
-    return $this->attributes;
-  }
-  public function setData($data)
-  {
-    $this->data = $data;
-  }
-  public function getData()
-  {
-    return $this->data;
-  }
-  public function setMessageId($messageId)
-  {
-    $this->messageId = $messageId;
-  }
-  public function getMessageId()
-  {
-    return $this->messageId;
-  }
-  public function setPublishTime($publishTime)
-  {
-    $this->publishTime = $publishTime;
-  }
-  public function getPublishTime()
-  {
-    return $this->publishTime;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Pubsub/PullRequest.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Pubsub/PullRequest.php
deleted file mode 100644
index 9d2e7afd..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Pubsub/PullRequest.php
+++ /dev/null
@@ -1,39 +0,0 @@
-maxMessages = $maxMessages;
-  }
-  public function getMaxMessages()
-  {
-    return $this->maxMessages;
-  }
-  public function setReturnImmediately($returnImmediately)
-  {
-    $this->returnImmediately = $returnImmediately;
-  }
-  public function getReturnImmediately()
-  {
-    return $this->returnImmediately;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Pubsub/PullResponse.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Pubsub/PullResponse.php
deleted file mode 100644
index c7476cde..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Pubsub/PullResponse.php
+++ /dev/null
@@ -1,32 +0,0 @@
-receivedMessages = $receivedMessages;
-  }
-  public function getReceivedMessages()
-  {
-    return $this->receivedMessages;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Pubsub/PushConfig.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Pubsub/PushConfig.php
deleted file mode 100644
index 80c68a02..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Pubsub/PushConfig.php
+++ /dev/null
@@ -1,39 +0,0 @@
-attributes = $attributes;
-  }
-  public function getAttributes()
-  {
-    return $this->attributes;
-  }
-  public function setPushEndpoint($pushEndpoint)
-  {
-    $this->pushEndpoint = $pushEndpoint;
-  }
-  public function getPushEndpoint()
-  {
-    return $this->pushEndpoint;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Pubsub/ReceivedMessage.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Pubsub/ReceivedMessage.php
deleted file mode 100644
index cd3dc87f..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Pubsub/ReceivedMessage.php
+++ /dev/null
@@ -1,40 +0,0 @@
-ackId = $ackId;
-  }
-  public function getAckId()
-  {
-    return $this->ackId;
-  }
-  public function setMessage(Google_Service_Pubsub_PubsubMessage $message)
-  {
-    $this->message = $message;
-  }
-  public function getMessage()
-  {
-    return $this->message;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Pubsub/Resource/Projects.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Pubsub/Resource/Projects.php
deleted file mode 100644
index 6b637693..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Pubsub/Resource/Projects.php
+++ /dev/null
@@ -1,28 +0,0 @@
-
- *   $pubsubService = new Google_Service_Pubsub(...);
- *   $projects = $pubsubService->projects;
- *  
- */
-class Google_Service_Pubsub_Resource_Projects extends Google_Service_Resource
-{
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Pubsub/Resource/ProjectsSnapshots.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Pubsub/Resource/ProjectsSnapshots.php
deleted file mode 100644
index 738b18c7..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Pubsub/Resource/ProjectsSnapshots.php
+++ /dev/null
@@ -1,83 +0,0 @@
-
- *   $pubsubService = new Google_Service_Pubsub(...);
- *   $snapshots = $pubsubService->snapshots;
- *  
- */
-class Google_Service_Pubsub_Resource_ProjectsSnapshots extends Google_Service_Resource
-{
-  /**
-   * Gets the access control policy for a resource. Returns an empty policy if the
-   * resource exists and does not have a policy set. (snapshots.getIamPolicy)
-   *
-   * @param string $resource REQUIRED: The resource for which the policy is being
-   * requested. `resource` is usually specified as a path. For example, a Project
-   * resource is specified as `projects/{project}`.
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Pubsub_Policy
-   */
-  public function getIamPolicy($resource, $optParams = array())
-  {
-    $params = array('resource' => $resource);
-    $params = array_merge($params, $optParams);
-    return $this->call('getIamPolicy', array($params), "Google_Service_Pubsub_Policy");
-  }
-  /**
-   * Sets the access control policy on the specified resource. Replaces any
-   * existing policy. (snapshots.setIamPolicy)
-   *
-   * @param string $resource REQUIRED: The resource for which the policy is being
-   * specified. `resource` is usually specified as a path. For example, a Project
-   * resource is specified as `projects/{project}`.
-   * @param Google_Service_Pubsub_SetIamPolicyRequest $postBody
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Pubsub_Policy
-   */
-  public function setIamPolicy($resource, Google_Service_Pubsub_SetIamPolicyRequest $postBody, $optParams = array())
-  {
-    $params = array('resource' => $resource, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('setIamPolicy', array($params), "Google_Service_Pubsub_Policy");
-  }
-  /**
-   * Returns permissions that a caller has on the specified resource. If the
-   * resource does not exist, this will return an empty set of permissions, not a
-   * NOT_FOUND error.
-   *
-   * Note: This operation is designed to be used for building permission-aware UIs
-   * and command-line tools, not for authorization checking. This operation may
-   * "fail open" without warning. (snapshots.testIamPermissions)
-   *
-   * @param string $resource REQUIRED: The resource for which the policy detail is
-   * being requested. `resource` is usually specified as a path. For example, a
-   * Project resource is specified as `projects/{project}`.
-   * @param Google_Service_Pubsub_TestIamPermissionsRequest $postBody
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Pubsub_TestIamPermissionsResponse
-   */
-  public function testIamPermissions($resource, Google_Service_Pubsub_TestIamPermissionsRequest $postBody, $optParams = array())
-  {
-    $params = array('resource' => $resource, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('testIamPermissions', array($params), "Google_Service_Pubsub_TestIamPermissionsResponse");
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Pubsub/Resource/ProjectsSubscriptions.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Pubsub/Resource/ProjectsSubscriptions.php
deleted file mode 100644
index f649aecc..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Pubsub/Resource/ProjectsSubscriptions.php
+++ /dev/null
@@ -1,243 +0,0 @@
-
- *   $pubsubService = new Google_Service_Pubsub(...);
- *   $subscriptions = $pubsubService->subscriptions;
- *  
- */
-class Google_Service_Pubsub_Resource_ProjectsSubscriptions extends Google_Service_Resource
-{
-  /**
-   * Acknowledges the messages associated with the `ack_ids` in the
-   * `AcknowledgeRequest`. The Pub/Sub system can remove the relevant messages
-   * from the subscription.
-   *
-   * Acknowledging a message whose ack deadline has expired may succeed, but such
-   * a message may be redelivered later. Acknowledging a message more than once
-   * will not result in an error. (subscriptions.acknowledge)
-   *
-   * @param string $subscription The subscription whose message is being
-   * acknowledged. Format is `projects/{project}/subscriptions/{sub}`.
-   * @param Google_Service_Pubsub_AcknowledgeRequest $postBody
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Pubsub_PubsubEmpty
-   */
-  public function acknowledge($subscription, Google_Service_Pubsub_AcknowledgeRequest $postBody, $optParams = array())
-  {
-    $params = array('subscription' => $subscription, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('acknowledge', array($params), "Google_Service_Pubsub_PubsubEmpty");
-  }
-  /**
-   * Creates a subscription to a given topic. If the subscription already exists,
-   * returns `ALREADY_EXISTS`. If the corresponding topic doesn't exist, returns
-   * `NOT_FOUND`.
-   *
-   * If the name is not provided in the request, the server will assign a random
-   * name for this subscription on the same project as the topic, conforming to
-   * the [resource name
-   * format](https://cloud.google.com/pubsub/docs/overview#names). The generated
-   * name is populated in the returned Subscription object. Note that for REST API
-   * requests, you must specify a name in the request. (subscriptions.create)
-   *
-   * @param string $name The name of the subscription. It must have the format
-   * `"projects/{project}/subscriptions/{subscription}"`. `{subscription}` must
-   * start with a letter, and contain only letters (`[A-Za-z]`), numbers
-   * (`[0-9]`), dashes (`-`), underscores (`_`), periods (`.`), tildes (`~`), plus
-   * (`+`) or percent signs (`%`). It must be between 3 and 255 characters in
-   * length, and it must not start with `"goog"`.
-   * @param Google_Service_Pubsub_Subscription $postBody
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Pubsub_Subscription
-   */
-  public function create($name, Google_Service_Pubsub_Subscription $postBody, $optParams = array())
-  {
-    $params = array('name' => $name, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('create', array($params), "Google_Service_Pubsub_Subscription");
-  }
-  /**
-   * Deletes an existing subscription. All messages retained in the subscription
-   * are immediately dropped. Calls to `Pull` after deletion will return
-   * `NOT_FOUND`. After a subscription is deleted, a new one may be created with
-   * the same name, but the new one has no association with the old subscription
-   * or its topic unless the same topic is specified. (subscriptions.delete)
-   *
-   * @param string $subscription The subscription to delete. Format is
-   * `projects/{project}/subscriptions/{sub}`.
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Pubsub_PubsubEmpty
-   */
-  public function delete($subscription, $optParams = array())
-  {
-    $params = array('subscription' => $subscription);
-    $params = array_merge($params, $optParams);
-    return $this->call('delete', array($params), "Google_Service_Pubsub_PubsubEmpty");
-  }
-  /**
-   * Gets the configuration details of a subscription. (subscriptions.get)
-   *
-   * @param string $subscription The name of the subscription to get. Format is
-   * `projects/{project}/subscriptions/{sub}`.
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Pubsub_Subscription
-   */
-  public function get($subscription, $optParams = array())
-  {
-    $params = array('subscription' => $subscription);
-    $params = array_merge($params, $optParams);
-    return $this->call('get', array($params), "Google_Service_Pubsub_Subscription");
-  }
-  /**
-   * Gets the access control policy for a resource. Returns an empty policy if the
-   * resource exists and does not have a policy set. (subscriptions.getIamPolicy)
-   *
-   * @param string $resource REQUIRED: The resource for which the policy is being
-   * requested. `resource` is usually specified as a path. For example, a Project
-   * resource is specified as `projects/{project}`.
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Pubsub_Policy
-   */
-  public function getIamPolicy($resource, $optParams = array())
-  {
-    $params = array('resource' => $resource);
-    $params = array_merge($params, $optParams);
-    return $this->call('getIamPolicy', array($params), "Google_Service_Pubsub_Policy");
-  }
-  /**
-   * Lists matching subscriptions. (subscriptions.listProjectsSubscriptions)
-   *
-   * @param string $project The name of the cloud project that subscriptions
-   * belong to. Format is `projects/{project}`.
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param string pageToken The value returned by the last
-   * `ListSubscriptionsResponse`; indicates that this is a continuation of a prior
-   * `ListSubscriptions` call, and that the system should return the next page of
-   * data.
-   * @opt_param int pageSize Maximum number of subscriptions to return.
-   * @return Google_Service_Pubsub_ListSubscriptionsResponse
-   */
-  public function listProjectsSubscriptions($project, $optParams = array())
-  {
-    $params = array('project' => $project);
-    $params = array_merge($params, $optParams);
-    return $this->call('list', array($params), "Google_Service_Pubsub_ListSubscriptionsResponse");
-  }
-  /**
-   * Modifies the ack deadline for a specific message. This method is useful to
-   * indicate that more time is needed to process a message by the subscriber, or
-   * to make the message available for redelivery if the processing was
-   * interrupted. Note that this does not modify the subscription-level
-   * `ackDeadlineSeconds` used for subsequent messages.
-   * (subscriptions.modifyAckDeadline)
-   *
-   * @param string $subscription The name of the subscription. Format is
-   * `projects/{project}/subscriptions/{sub}`.
-   * @param Google_Service_Pubsub_ModifyAckDeadlineRequest $postBody
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Pubsub_PubsubEmpty
-   */
-  public function modifyAckDeadline($subscription, Google_Service_Pubsub_ModifyAckDeadlineRequest $postBody, $optParams = array())
-  {
-    $params = array('subscription' => $subscription, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('modifyAckDeadline', array($params), "Google_Service_Pubsub_PubsubEmpty");
-  }
-  /**
-   * Modifies the `PushConfig` for a specified subscription.
-   *
-   * This may be used to change a push subscription to a pull one (signified by an
-   * empty `PushConfig`) or vice versa, or change the endpoint URL and other
-   * attributes of a push subscription. Messages will accumulate for delivery
-   * continuously through the call regardless of changes to the `PushConfig`.
-   * (subscriptions.modifyPushConfig)
-   *
-   * @param string $subscription The name of the subscription. Format is
-   * `projects/{project}/subscriptions/{sub}`.
-   * @param Google_Service_Pubsub_ModifyPushConfigRequest $postBody
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Pubsub_PubsubEmpty
-   */
-  public function modifyPushConfig($subscription, Google_Service_Pubsub_ModifyPushConfigRequest $postBody, $optParams = array())
-  {
-    $params = array('subscription' => $subscription, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('modifyPushConfig', array($params), "Google_Service_Pubsub_PubsubEmpty");
-  }
-  /**
-   * Pulls messages from the server. Returns an empty list if there are no
-   * messages available in the backlog. The server may return `UNAVAILABLE` if
-   * there are too many concurrent pull requests pending for the given
-   * subscription. (subscriptions.pull)
-   *
-   * @param string $subscription The subscription from which messages should be
-   * pulled. Format is `projects/{project}/subscriptions/{sub}`.
-   * @param Google_Service_Pubsub_PullRequest $postBody
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Pubsub_PullResponse
-   */
-  public function pull($subscription, Google_Service_Pubsub_PullRequest $postBody, $optParams = array())
-  {
-    $params = array('subscription' => $subscription, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('pull', array($params), "Google_Service_Pubsub_PullResponse");
-  }
-  /**
-   * Sets the access control policy on the specified resource. Replaces any
-   * existing policy. (subscriptions.setIamPolicy)
-   *
-   * @param string $resource REQUIRED: The resource for which the policy is being
-   * specified. `resource` is usually specified as a path. For example, a Project
-   * resource is specified as `projects/{project}`.
-   * @param Google_Service_Pubsub_SetIamPolicyRequest $postBody
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Pubsub_Policy
-   */
-  public function setIamPolicy($resource, Google_Service_Pubsub_SetIamPolicyRequest $postBody, $optParams = array())
-  {
-    $params = array('resource' => $resource, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('setIamPolicy', array($params), "Google_Service_Pubsub_Policy");
-  }
-  /**
-   * Returns permissions that a caller has on the specified resource. If the
-   * resource does not exist, this will return an empty set of permissions, not a
-   * NOT_FOUND error.
-   *
-   * Note: This operation is designed to be used for building permission-aware UIs
-   * and command-line tools, not for authorization checking. This operation may
-   * "fail open" without warning. (subscriptions.testIamPermissions)
-   *
-   * @param string $resource REQUIRED: The resource for which the policy detail is
-   * being requested. `resource` is usually specified as a path. For example, a
-   * Project resource is specified as `projects/{project}`.
-   * @param Google_Service_Pubsub_TestIamPermissionsRequest $postBody
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Pubsub_TestIamPermissionsResponse
-   */
-  public function testIamPermissions($resource, Google_Service_Pubsub_TestIamPermissionsRequest $postBody, $optParams = array())
-  {
-    $params = array('resource' => $resource, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('testIamPermissions', array($params), "Google_Service_Pubsub_TestIamPermissionsResponse");
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Pubsub/Resource/ProjectsTopics.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Pubsub/Resource/ProjectsTopics.php
deleted file mode 100644
index 66c123ad..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Pubsub/Resource/ProjectsTopics.php
+++ /dev/null
@@ -1,170 +0,0 @@
-
- *   $pubsubService = new Google_Service_Pubsub(...);
- *   $topics = $pubsubService->topics;
- *  
- */
-class Google_Service_Pubsub_Resource_ProjectsTopics extends Google_Service_Resource
-{
-  /**
-   * Creates the given topic with the given name. (topics.create)
-   *
-   * @param string $name The name of the topic. It must have the format
-   * `"projects/{project}/topics/{topic}"`. `{topic}` must start with a letter,
-   * and contain only letters (`[A-Za-z]`), numbers (`[0-9]`), dashes (`-`),
-   * underscores (`_`), periods (`.`), tildes (`~`), plus (`+`) or percent signs
-   * (`%`). It must be between 3 and 255 characters in length, and it must not
-   * start with `"goog"`.
-   * @param Google_Service_Pubsub_Topic $postBody
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Pubsub_Topic
-   */
-  public function create($name, Google_Service_Pubsub_Topic $postBody, $optParams = array())
-  {
-    $params = array('name' => $name, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('create', array($params), "Google_Service_Pubsub_Topic");
-  }
-  /**
-   * Deletes the topic with the given name. Returns `NOT_FOUND` if the topic does
-   * not exist. After a topic is deleted, a new topic may be created with the same
-   * name; this is an entirely new topic with none of the old configuration or
-   * subscriptions. Existing subscriptions to this topic are not deleted, but
-   * their `topic` field is set to `_deleted-topic_`. (topics.delete)
-   *
-   * @param string $topic Name of the topic to delete. Format is
-   * `projects/{project}/topics/{topic}`.
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Pubsub_PubsubEmpty
-   */
-  public function delete($topic, $optParams = array())
-  {
-    $params = array('topic' => $topic);
-    $params = array_merge($params, $optParams);
-    return $this->call('delete', array($params), "Google_Service_Pubsub_PubsubEmpty");
-  }
-  /**
-   * Gets the configuration of a topic. (topics.get)
-   *
-   * @param string $topic The name of the topic to get. Format is
-   * `projects/{project}/topics/{topic}`.
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Pubsub_Topic
-   */
-  public function get($topic, $optParams = array())
-  {
-    $params = array('topic' => $topic);
-    $params = array_merge($params, $optParams);
-    return $this->call('get', array($params), "Google_Service_Pubsub_Topic");
-  }
-  /**
-   * Gets the access control policy for a resource. Returns an empty policy if the
-   * resource exists and does not have a policy set. (topics.getIamPolicy)
-   *
-   * @param string $resource REQUIRED: The resource for which the policy is being
-   * requested. `resource` is usually specified as a path. For example, a Project
-   * resource is specified as `projects/{project}`.
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Pubsub_Policy
-   */
-  public function getIamPolicy($resource, $optParams = array())
-  {
-    $params = array('resource' => $resource);
-    $params = array_merge($params, $optParams);
-    return $this->call('getIamPolicy', array($params), "Google_Service_Pubsub_Policy");
-  }
-  /**
-   * Lists matching topics. (topics.listProjectsTopics)
-   *
-   * @param string $project The name of the cloud project that topics belong to.
-   * Format is `projects/{project}`.
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param int pageSize Maximum number of topics to return.
-   * @opt_param string pageToken The value returned by the last
-   * `ListTopicsResponse`; indicates that this is a continuation of a prior
-   * `ListTopics` call, and that the system should return the next page of data.
-   * @return Google_Service_Pubsub_ListTopicsResponse
-   */
-  public function listProjectsTopics($project, $optParams = array())
-  {
-    $params = array('project' => $project);
-    $params = array_merge($params, $optParams);
-    return $this->call('list', array($params), "Google_Service_Pubsub_ListTopicsResponse");
-  }
-  /**
-   * Adds one or more messages to the topic. Returns `NOT_FOUND` if the topic does
-   * not exist. The message payload must not be empty; it must contain  either a
-   * non-empty data field, or at least one attribute. (topics.publish)
-   *
-   * @param string $topic The messages in the request will be published on this
-   * topic. Format is `projects/{project}/topics/{topic}`.
-   * @param Google_Service_Pubsub_PublishRequest $postBody
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Pubsub_PublishResponse
-   */
-  public function publish($topic, Google_Service_Pubsub_PublishRequest $postBody, $optParams = array())
-  {
-    $params = array('topic' => $topic, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('publish', array($params), "Google_Service_Pubsub_PublishResponse");
-  }
-  /**
-   * Sets the access control policy on the specified resource. Replaces any
-   * existing policy. (topics.setIamPolicy)
-   *
-   * @param string $resource REQUIRED: The resource for which the policy is being
-   * specified. `resource` is usually specified as a path. For example, a Project
-   * resource is specified as `projects/{project}`.
-   * @param Google_Service_Pubsub_SetIamPolicyRequest $postBody
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Pubsub_Policy
-   */
-  public function setIamPolicy($resource, Google_Service_Pubsub_SetIamPolicyRequest $postBody, $optParams = array())
-  {
-    $params = array('resource' => $resource, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('setIamPolicy', array($params), "Google_Service_Pubsub_Policy");
-  }
-  /**
-   * Returns permissions that a caller has on the specified resource. If the
-   * resource does not exist, this will return an empty set of permissions, not a
-   * NOT_FOUND error.
-   *
-   * Note: This operation is designed to be used for building permission-aware UIs
-   * and command-line tools, not for authorization checking. This operation may
-   * "fail open" without warning. (topics.testIamPermissions)
-   *
-   * @param string $resource REQUIRED: The resource for which the policy detail is
-   * being requested. `resource` is usually specified as a path. For example, a
-   * Project resource is specified as `projects/{project}`.
-   * @param Google_Service_Pubsub_TestIamPermissionsRequest $postBody
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Pubsub_TestIamPermissionsResponse
-   */
-  public function testIamPermissions($resource, Google_Service_Pubsub_TestIamPermissionsRequest $postBody, $optParams = array())
-  {
-    $params = array('resource' => $resource, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('testIamPermissions', array($params), "Google_Service_Pubsub_TestIamPermissionsResponse");
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Pubsub/Resource/ProjectsTopicsSubscriptions.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Pubsub/Resource/ProjectsTopicsSubscriptions.php
deleted file mode 100644
index 6a1e5cc4..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Pubsub/Resource/ProjectsTopicsSubscriptions.php
+++ /dev/null
@@ -1,49 +0,0 @@
-
- *   $pubsubService = new Google_Service_Pubsub(...);
- *   $subscriptions = $pubsubService->subscriptions;
- *  
- */
-class Google_Service_Pubsub_Resource_ProjectsTopicsSubscriptions extends Google_Service_Resource
-{
-  /**
-   * Lists the name of the subscriptions for this topic.
-   * (subscriptions.listProjectsTopicsSubscriptions)
-   *
-   * @param string $topic The name of the topic that subscriptions are attached
-   * to. Format is `projects/{project}/topics/{topic}`.
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param string pageToken The value returned by the last
-   * `ListTopicSubscriptionsResponse`; indicates that this is a continuation of a
-   * prior `ListTopicSubscriptions` call, and that the system should return the
-   * next page of data.
-   * @opt_param int pageSize Maximum number of subscription names to return.
-   * @return Google_Service_Pubsub_ListTopicSubscriptionsResponse
-   */
-  public function listProjectsTopicsSubscriptions($topic, $optParams = array())
-  {
-    $params = array('topic' => $topic);
-    $params = array_merge($params, $optParams);
-    return $this->call('list', array($params), "Google_Service_Pubsub_ListTopicSubscriptionsResponse");
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Pubsub/SetIamPolicyRequest.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Pubsub/SetIamPolicyRequest.php
deleted file mode 100644
index 3c577a95..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Pubsub/SetIamPolicyRequest.php
+++ /dev/null
@@ -1,31 +0,0 @@
-policy = $policy;
-  }
-  public function getPolicy()
-  {
-    return $this->policy;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Pubsub/Subscription.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Pubsub/Subscription.php
deleted file mode 100644
index 78a3681b..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Pubsub/Subscription.php
+++ /dev/null
@@ -1,58 +0,0 @@
-ackDeadlineSeconds = $ackDeadlineSeconds;
-  }
-  public function getAckDeadlineSeconds()
-  {
-    return $this->ackDeadlineSeconds;
-  }
-  public function setName($name)
-  {
-    $this->name = $name;
-  }
-  public function getName()
-  {
-    return $this->name;
-  }
-  public function setPushConfig(Google_Service_Pubsub_PushConfig $pushConfig)
-  {
-    $this->pushConfig = $pushConfig;
-  }
-  public function getPushConfig()
-  {
-    return $this->pushConfig;
-  }
-  public function setTopic($topic)
-  {
-    $this->topic = $topic;
-  }
-  public function getTopic()
-  {
-    return $this->topic;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Pubsub/TestIamPermissionsRequest.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Pubsub/TestIamPermissionsRequest.php
deleted file mode 100644
index 10bd3323..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Pubsub/TestIamPermissionsRequest.php
+++ /dev/null
@@ -1,31 +0,0 @@
-permissions = $permissions;
-  }
-  public function getPermissions()
-  {
-    return $this->permissions;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Pubsub/TestIamPermissionsResponse.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Pubsub/TestIamPermissionsResponse.php
deleted file mode 100644
index f9a096a9..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Pubsub/TestIamPermissionsResponse.php
+++ /dev/null
@@ -1,31 +0,0 @@
-permissions = $permissions;
-  }
-  public function getPermissions()
-  {
-    return $this->permissions;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Pubsub/Topic.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Pubsub/Topic.php
deleted file mode 100644
index 14b6f60b..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Pubsub/Topic.php
+++ /dev/null
@@ -1,30 +0,0 @@
-name = $name;
-  }
-  public function getName()
-  {
-    return $this->name;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/QPXExpress.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/QPXExpress.php
deleted file mode 100644
index 7ab9a25e..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/QPXExpress.php
+++ /dev/null
@@ -1,65 +0,0 @@
-
- * Finds the least expensive flights between an origin and a destination.

- *
- * 

- * For more information about this service, see the API
- * Documentation
- * 

- *
- * @author Google, Inc.
- */
-class Google_Service_QPXExpress extends Google_Service
-{
-
-
-  public $trips;
-  
-  /**
-   * Constructs the internal representation of the QPXExpress service.
-   *
-   * @param Google_Client $client
-   */
-  public function __construct(Google_Client $client)
-  {
-    parent::__construct($client);
-    $this->rootUrl = 'https://www.googleapis.com/';
-    $this->servicePath = 'qpxExpress/v1/trips/';
-    $this->version = 'v1';
-    $this->serviceName = 'qpxExpress';
-
-    $this->trips = new Google_Service_QPXExpress_Resource_Trips(
-        $this,
-        $this->serviceName,
-        'trips',
-        array(
-          'methods' => array(
-            'search' => array(
-              'path' => 'search',
-              'httpMethod' => 'POST',
-              'parameters' => array(),
-            ),
-          )
-        )
-    );
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/QPXExpress/AircraftData.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/QPXExpress/AircraftData.php
deleted file mode 100644
index 1e554287..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/QPXExpress/AircraftData.php
+++ /dev/null
@@ -1,48 +0,0 @@
-code = $code;
-  }
-  public function getCode()
-  {
-    return $this->code;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setName($name)
-  {
-    $this->name = $name;
-  }
-  public function getName()
-  {
-    return $this->name;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/QPXExpress/AirportData.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/QPXExpress/AirportData.php
deleted file mode 100644
index 1c7cf3f4..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/QPXExpress/AirportData.php
+++ /dev/null
@@ -1,57 +0,0 @@
-city = $city;
-  }
-  public function getCity()
-  {
-    return $this->city;
-  }
-  public function setCode($code)
-  {
-    $this->code = $code;
-  }
-  public function getCode()
-  {
-    return $this->code;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setName($name)
-  {
-    $this->name = $name;
-  }
-  public function getName()
-  {
-    return $this->name;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/QPXExpress/BagDescriptor.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/QPXExpress/BagDescriptor.php
deleted file mode 100644
index b5b72b09..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/QPXExpress/BagDescriptor.php
+++ /dev/null
@@ -1,67 +0,0 @@
-commercialName = $commercialName;
-  }
-  public function getCommercialName()
-  {
-    return $this->commercialName;
-  }
-  public function setCount($count)
-  {
-    $this->count = $count;
-  }
-  public function getCount()
-  {
-    return $this->count;
-  }
-  public function setDescription($description)
-  {
-    $this->description = $description;
-  }
-  public function getDescription()
-  {
-    return $this->description;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setSubcode($subcode)
-  {
-    $this->subcode = $subcode;
-  }
-  public function getSubcode()
-  {
-    return $this->subcode;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/QPXExpress/CarrierData.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/QPXExpress/CarrierData.php
deleted file mode 100644
index 42b54f7b..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/QPXExpress/CarrierData.php
+++ /dev/null
@@ -1,48 +0,0 @@
-code = $code;
-  }
-  public function getCode()
-  {
-    return $this->code;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setName($name)
-  {
-    $this->name = $name;
-  }
-  public function getName()
-  {
-    return $this->name;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/QPXExpress/CityData.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/QPXExpress/CityData.php
deleted file mode 100644
index 131cf424..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/QPXExpress/CityData.php
+++ /dev/null
@@ -1,57 +0,0 @@
-code = $code;
-  }
-  public function getCode()
-  {
-    return $this->code;
-  }
-  public function setCountry($country)
-  {
-    $this->country = $country;
-  }
-  public function getCountry()
-  {
-    return $this->country;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setName($name)
-  {
-    $this->name = $name;
-  }
-  public function getName()
-  {
-    return $this->name;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/QPXExpress/Data.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/QPXExpress/Data.php
deleted file mode 100644
index a707205a..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/QPXExpress/Data.php
+++ /dev/null
@@ -1,81 +0,0 @@
-aircraft = $aircraft;
-  }
-  public function getAircraft()
-  {
-    return $this->aircraft;
-  }
-  public function setAirport($airport)
-  {
-    $this->airport = $airport;
-  }
-  public function getAirport()
-  {
-    return $this->airport;
-  }
-  public function setCarrier($carrier)
-  {
-    $this->carrier = $carrier;
-  }
-  public function getCarrier()
-  {
-    return $this->carrier;
-  }
-  public function setCity($city)
-  {
-    $this->city = $city;
-  }
-  public function getCity()
-  {
-    return $this->city;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setTax($tax)
-  {
-    $this->tax = $tax;
-  }
-  public function getTax()
-  {
-    return $this->tax;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/QPXExpress/FareInfo.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/QPXExpress/FareInfo.php
deleted file mode 100644
index 169cef34..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/QPXExpress/FareInfo.php
+++ /dev/null
@@ -1,84 +0,0 @@
-basisCode = $basisCode;
-  }
-  public function getBasisCode()
-  {
-    return $this->basisCode;
-  }
-  public function setCarrier($carrier)
-  {
-    $this->carrier = $carrier;
-  }
-  public function getCarrier()
-  {
-    return $this->carrier;
-  }
-  public function setDestination($destination)
-  {
-    $this->destination = $destination;
-  }
-  public function getDestination()
-  {
-    return $this->destination;
-  }
-  public function setId($id)
-  {
-    $this->id = $id;
-  }
-  public function getId()
-  {
-    return $this->id;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setOrigin($origin)
-  {
-    $this->origin = $origin;
-  }
-  public function getOrigin()
-  {
-    return $this->origin;
-  }
-  public function setPrivate($private)
-  {
-    $this->private = $private;
-  }
-  public function getPrivate()
-  {
-    return $this->private;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/QPXExpress/FlightInfo.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/QPXExpress/FlightInfo.php
deleted file mode 100644
index 9406e4a2..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/QPXExpress/FlightInfo.php
+++ /dev/null
@@ -1,39 +0,0 @@
-carrier = $carrier;
-  }
-  public function getCarrier()
-  {
-    return $this->carrier;
-  }
-  public function setNumber($number)
-  {
-    $this->number = $number;
-  }
-  public function getNumber()
-  {
-    return $this->number;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/QPXExpress/FreeBaggageAllowance.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/QPXExpress/FreeBaggageAllowance.php
deleted file mode 100644
index 937192cb..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/QPXExpress/FreeBaggageAllowance.php
+++ /dev/null
@@ -1,77 +0,0 @@
-bagDescriptor = $bagDescriptor;
-  }
-  public function getBagDescriptor()
-  {
-    return $this->bagDescriptor;
-  }
-  public function setKilos($kilos)
-  {
-    $this->kilos = $kilos;
-  }
-  public function getKilos()
-  {
-    return $this->kilos;
-  }
-  public function setKilosPerPiece($kilosPerPiece)
-  {
-    $this->kilosPerPiece = $kilosPerPiece;
-  }
-  public function getKilosPerPiece()
-  {
-    return $this->kilosPerPiece;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setPieces($pieces)
-  {
-    $this->pieces = $pieces;
-  }
-  public function getPieces()
-  {
-    return $this->pieces;
-  }
-  public function setPounds($pounds)
-  {
-    $this->pounds = $pounds;
-  }
-  public function getPounds()
-  {
-    return $this->pounds;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/QPXExpress/LegInfo.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/QPXExpress/LegInfo.php
deleted file mode 100644
index 5236889a..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/QPXExpress/LegInfo.php
+++ /dev/null
@@ -1,174 +0,0 @@
-aircraft = $aircraft;
-  }
-  public function getAircraft()
-  {
-    return $this->aircraft;
-  }
-  public function setArrivalTime($arrivalTime)
-  {
-    $this->arrivalTime = $arrivalTime;
-  }
-  public function getArrivalTime()
-  {
-    return $this->arrivalTime;
-  }
-  public function setChangePlane($changePlane)
-  {
-    $this->changePlane = $changePlane;
-  }
-  public function getChangePlane()
-  {
-    return $this->changePlane;
-  }
-  public function setConnectionDuration($connectionDuration)
-  {
-    $this->connectionDuration = $connectionDuration;
-  }
-  public function getConnectionDuration()
-  {
-    return $this->connectionDuration;
-  }
-  public function setDepartureTime($departureTime)
-  {
-    $this->departureTime = $departureTime;
-  }
-  public function getDepartureTime()
-  {
-    return $this->departureTime;
-  }
-  public function setDestination($destination)
-  {
-    $this->destination = $destination;
-  }
-  public function getDestination()
-  {
-    return $this->destination;
-  }
-  public function setDestinationTerminal($destinationTerminal)
-  {
-    $this->destinationTerminal = $destinationTerminal;
-  }
-  public function getDestinationTerminal()
-  {
-    return $this->destinationTerminal;
-  }
-  public function setDuration($duration)
-  {
-    $this->duration = $duration;
-  }
-  public function getDuration()
-  {
-    return $this->duration;
-  }
-  public function setId($id)
-  {
-    $this->id = $id;
-  }
-  public function getId()
-  {
-    return $this->id;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setMeal($meal)
-  {
-    $this->meal = $meal;
-  }
-  public function getMeal()
-  {
-    return $this->meal;
-  }
-  public function setMileage($mileage)
-  {
-    $this->mileage = $mileage;
-  }
-  public function getMileage()
-  {
-    return $this->mileage;
-  }
-  public function setOnTimePerformance($onTimePerformance)
-  {
-    $this->onTimePerformance = $onTimePerformance;
-  }
-  public function getOnTimePerformance()
-  {
-    return $this->onTimePerformance;
-  }
-  public function setOperatingDisclosure($operatingDisclosure)
-  {
-    $this->operatingDisclosure = $operatingDisclosure;
-  }
-  public function getOperatingDisclosure()
-  {
-    return $this->operatingDisclosure;
-  }
-  public function setOrigin($origin)
-  {
-    $this->origin = $origin;
-  }
-  public function getOrigin()
-  {
-    return $this->origin;
-  }
-  public function setOriginTerminal($originTerminal)
-  {
-    $this->originTerminal = $originTerminal;
-  }
-  public function getOriginTerminal()
-  {
-    return $this->originTerminal;
-  }
-  public function setSecure($secure)
-  {
-    $this->secure = $secure;
-  }
-  public function getSecure()
-  {
-    return $this->secure;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/QPXExpress/PassengerCounts.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/QPXExpress/PassengerCounts.php
deleted file mode 100644
index 02cc8a83..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/QPXExpress/PassengerCounts.php
+++ /dev/null
@@ -1,75 +0,0 @@
-adultCount = $adultCount;
-  }
-  public function getAdultCount()
-  {
-    return $this->adultCount;
-  }
-  public function setChildCount($childCount)
-  {
-    $this->childCount = $childCount;
-  }
-  public function getChildCount()
-  {
-    return $this->childCount;
-  }
-  public function setInfantInLapCount($infantInLapCount)
-  {
-    $this->infantInLapCount = $infantInLapCount;
-  }
-  public function getInfantInLapCount()
-  {
-    return $this->infantInLapCount;
-  }
-  public function setInfantInSeatCount($infantInSeatCount)
-  {
-    $this->infantInSeatCount = $infantInSeatCount;
-  }
-  public function getInfantInSeatCount()
-  {
-    return $this->infantInSeatCount;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setSeniorCount($seniorCount)
-  {
-    $this->seniorCount = $seniorCount;
-  }
-  public function getSeniorCount()
-  {
-    return $this->seniorCount;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/QPXExpress/PricingInfo.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/QPXExpress/PricingInfo.php
deleted file mode 100644
index 2f2aed3b..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/QPXExpress/PricingInfo.php
+++ /dev/null
@@ -1,143 +0,0 @@
-baseFareTotal = $baseFareTotal;
-  }
-  public function getBaseFareTotal()
-  {
-    return $this->baseFareTotal;
-  }
-  public function setFare($fare)
-  {
-    $this->fare = $fare;
-  }
-  public function getFare()
-  {
-    return $this->fare;
-  }
-  public function setFareCalculation($fareCalculation)
-  {
-    $this->fareCalculation = $fareCalculation;
-  }
-  public function getFareCalculation()
-  {
-    return $this->fareCalculation;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setLatestTicketingTime($latestTicketingTime)
-  {
-    $this->latestTicketingTime = $latestTicketingTime;
-  }
-  public function getLatestTicketingTime()
-  {
-    return $this->latestTicketingTime;
-  }
-  public function setPassengers(Google_Service_QPXExpress_PassengerCounts $passengers)
-  {
-    $this->passengers = $passengers;
-  }
-  public function getPassengers()
-  {
-    return $this->passengers;
-  }
-  public function setPtc($ptc)
-  {
-    $this->ptc = $ptc;
-  }
-  public function getPtc()
-  {
-    return $this->ptc;
-  }
-  public function setRefundable($refundable)
-  {
-    $this->refundable = $refundable;
-  }
-  public function getRefundable()
-  {
-    return $this->refundable;
-  }
-  public function setSaleFareTotal($saleFareTotal)
-  {
-    $this->saleFareTotal = $saleFareTotal;
-  }
-  public function getSaleFareTotal()
-  {
-    return $this->saleFareTotal;
-  }
-  public function setSaleTaxTotal($saleTaxTotal)
-  {
-    $this->saleTaxTotal = $saleTaxTotal;
-  }
-  public function getSaleTaxTotal()
-  {
-    return $this->saleTaxTotal;
-  }
-  public function setSaleTotal($saleTotal)
-  {
-    $this->saleTotal = $saleTotal;
-  }
-  public function getSaleTotal()
-  {
-    return $this->saleTotal;
-  }
-  public function setSegmentPricing($segmentPricing)
-  {
-    $this->segmentPricing = $segmentPricing;
-  }
-  public function getSegmentPricing()
-  {
-    return $this->segmentPricing;
-  }
-  public function setTax($tax)
-  {
-    $this->tax = $tax;
-  }
-  public function getTax()
-  {
-    return $this->tax;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/QPXExpress/Resource/Trips.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/QPXExpress/Resource/Trips.php
deleted file mode 100644
index ad988c59..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/QPXExpress/Resource/Trips.php
+++ /dev/null
@@ -1,41 +0,0 @@
-
- *   $qpxExpressService = new Google_Service_QPXExpress(...);
- *   $trips = $qpxExpressService->trips;
- *  
- */
-class Google_Service_QPXExpress_Resource_Trips extends Google_Service_Resource
-{
-  /**
-   * Returns a list of flights. (trips.search)
-   *
-   * @param Google_Service_QPXExpress_TripsSearchRequest $postBody
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_QPXExpress_TripsSearchResponse
-   */
-  public function search(Google_Service_QPXExpress_TripsSearchRequest $postBody, $optParams = array())
-  {
-    $params = array('postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('search', array($params), "Google_Service_QPXExpress_TripsSearchResponse");
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/QPXExpress/SegmentInfo.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/QPXExpress/SegmentInfo.php
deleted file mode 100644
index e27a7af6..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/QPXExpress/SegmentInfo.php
+++ /dev/null
@@ -1,123 +0,0 @@
-bookingCode = $bookingCode;
-  }
-  public function getBookingCode()
-  {
-    return $this->bookingCode;
-  }
-  public function setBookingCodeCount($bookingCodeCount)
-  {
-    $this->bookingCodeCount = $bookingCodeCount;
-  }
-  public function getBookingCodeCount()
-  {
-    return $this->bookingCodeCount;
-  }
-  public function setCabin($cabin)
-  {
-    $this->cabin = $cabin;
-  }
-  public function getCabin()
-  {
-    return $this->cabin;
-  }
-  public function setConnectionDuration($connectionDuration)
-  {
-    $this->connectionDuration = $connectionDuration;
-  }
-  public function getConnectionDuration()
-  {
-    return $this->connectionDuration;
-  }
-  public function setDuration($duration)
-  {
-    $this->duration = $duration;
-  }
-  public function getDuration()
-  {
-    return $this->duration;
-  }
-  public function setFlight(Google_Service_QPXExpress_FlightInfo $flight)
-  {
-    $this->flight = $flight;
-  }
-  public function getFlight()
-  {
-    return $this->flight;
-  }
-  public function setId($id)
-  {
-    $this->id = $id;
-  }
-  public function getId()
-  {
-    return $this->id;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setLeg($leg)
-  {
-    $this->leg = $leg;
-  }
-  public function getLeg()
-  {
-    return $this->leg;
-  }
-  public function setMarriedSegmentGroup($marriedSegmentGroup)
-  {
-    $this->marriedSegmentGroup = $marriedSegmentGroup;
-  }
-  public function getMarriedSegmentGroup()
-  {
-    return $this->marriedSegmentGroup;
-  }
-  public function setSubjectToGovernmentApproval($subjectToGovernmentApproval)
-  {
-    $this->subjectToGovernmentApproval = $subjectToGovernmentApproval;
-  }
-  public function getSubjectToGovernmentApproval()
-  {
-    return $this->subjectToGovernmentApproval;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/QPXExpress/SegmentPricing.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/QPXExpress/SegmentPricing.php
deleted file mode 100644
index 5c9e3a1f..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/QPXExpress/SegmentPricing.php
+++ /dev/null
@@ -1,59 +0,0 @@
-fareId = $fareId;
-  }
-  public function getFareId()
-  {
-    return $this->fareId;
-  }
-  public function setFreeBaggageOption($freeBaggageOption)
-  {
-    $this->freeBaggageOption = $freeBaggageOption;
-  }
-  public function getFreeBaggageOption()
-  {
-    return $this->freeBaggageOption;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setSegmentId($segmentId)
-  {
-    $this->segmentId = $segmentId;
-  }
-  public function getSegmentId()
-  {
-    return $this->segmentId;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/QPXExpress/SliceInfo.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/QPXExpress/SliceInfo.php
deleted file mode 100644
index ea1ebe76..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/QPXExpress/SliceInfo.php
+++ /dev/null
@@ -1,50 +0,0 @@
-duration = $duration;
-  }
-  public function getDuration()
-  {
-    return $this->duration;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setSegment($segment)
-  {
-    $this->segment = $segment;
-  }
-  public function getSegment()
-  {
-    return $this->segment;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/QPXExpress/SliceInput.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/QPXExpress/SliceInput.php
deleted file mode 100644
index ec918b4a..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/QPXExpress/SliceInput.php
+++ /dev/null
@@ -1,122 +0,0 @@
-alliance = $alliance;
-  }
-  public function getAlliance()
-  {
-    return $this->alliance;
-  }
-  public function setDate($date)
-  {
-    $this->date = $date;
-  }
-  public function getDate()
-  {
-    return $this->date;
-  }
-  public function setDestination($destination)
-  {
-    $this->destination = $destination;
-  }
-  public function getDestination()
-  {
-    return $this->destination;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setMaxConnectionDuration($maxConnectionDuration)
-  {
-    $this->maxConnectionDuration = $maxConnectionDuration;
-  }
-  public function getMaxConnectionDuration()
-  {
-    return $this->maxConnectionDuration;
-  }
-  public function setMaxStops($maxStops)
-  {
-    $this->maxStops = $maxStops;
-  }
-  public function getMaxStops()
-  {
-    return $this->maxStops;
-  }
-  public function setOrigin($origin)
-  {
-    $this->origin = $origin;
-  }
-  public function getOrigin()
-  {
-    return $this->origin;
-  }
-  public function setPermittedCarrier($permittedCarrier)
-  {
-    $this->permittedCarrier = $permittedCarrier;
-  }
-  public function getPermittedCarrier()
-  {
-    return $this->permittedCarrier;
-  }
-  public function setPermittedDepartureTime(Google_Service_QPXExpress_TimeOfDayRange $permittedDepartureTime)
-  {
-    $this->permittedDepartureTime = $permittedDepartureTime;
-  }
-  public function getPermittedDepartureTime()
-  {
-    return $this->permittedDepartureTime;
-  }
-  public function setPreferredCabin($preferredCabin)
-  {
-    $this->preferredCabin = $preferredCabin;
-  }
-  public function getPreferredCabin()
-  {
-    return $this->preferredCabin;
-  }
-  public function setProhibitedCarrier($prohibitedCarrier)
-  {
-    $this->prohibitedCarrier = $prohibitedCarrier;
-  }
-  public function getProhibitedCarrier()
-  {
-    return $this->prohibitedCarrier;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/QPXExpress/TaxData.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/QPXExpress/TaxData.php
deleted file mode 100644
index dfcf9af2..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/QPXExpress/TaxData.php
+++ /dev/null
@@ -1,48 +0,0 @@
-id = $id;
-  }
-  public function getId()
-  {
-    return $this->id;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setName($name)
-  {
-    $this->name = $name;
-  }
-  public function getName()
-  {
-    return $this->name;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/QPXExpress/TaxInfo.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/QPXExpress/TaxInfo.php
deleted file mode 100644
index c030e34e..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/QPXExpress/TaxInfo.php
+++ /dev/null
@@ -1,75 +0,0 @@
-chargeType = $chargeType;
-  }
-  public function getChargeType()
-  {
-    return $this->chargeType;
-  }
-  public function setCode($code)
-  {
-    $this->code = $code;
-  }
-  public function getCode()
-  {
-    return $this->code;
-  }
-  public function setCountry($country)
-  {
-    $this->country = $country;
-  }
-  public function getCountry()
-  {
-    return $this->country;
-  }
-  public function setId($id)
-  {
-    $this->id = $id;
-  }
-  public function getId()
-  {
-    return $this->id;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setSalePrice($salePrice)
-  {
-    $this->salePrice = $salePrice;
-  }
-  public function getSalePrice()
-  {
-    return $this->salePrice;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/QPXExpress/TimeOfDayRange.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/QPXExpress/TimeOfDayRange.php
deleted file mode 100644
index 1b802bbc..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/QPXExpress/TimeOfDayRange.php
+++ /dev/null
@@ -1,48 +0,0 @@
-earliestTime = $earliestTime;
-  }
-  public function getEarliestTime()
-  {
-    return $this->earliestTime;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setLatestTime($latestTime)
-  {
-    $this->latestTime = $latestTime;
-  }
-  public function getLatestTime()
-  {
-    return $this->latestTime;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/QPXExpress/TripOption.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/QPXExpress/TripOption.php
deleted file mode 100644
index 2e70e788..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/QPXExpress/TripOption.php
+++ /dev/null
@@ -1,69 +0,0 @@
-id = $id;
-  }
-  public function getId()
-  {
-    return $this->id;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setPricing($pricing)
-  {
-    $this->pricing = $pricing;
-  }
-  public function getPricing()
-  {
-    return $this->pricing;
-  }
-  public function setSaleTotal($saleTotal)
-  {
-    $this->saleTotal = $saleTotal;
-  }
-  public function getSaleTotal()
-  {
-    return $this->saleTotal;
-  }
-  public function setSlice($slice)
-  {
-    $this->slice = $slice;
-  }
-  public function getSlice()
-  {
-    return $this->slice;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/QPXExpress/TripOptionsRequest.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/QPXExpress/TripOptionsRequest.php
deleted file mode 100644
index efdd2f6c..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/QPXExpress/TripOptionsRequest.php
+++ /dev/null
@@ -1,87 +0,0 @@
-maxPrice = $maxPrice;
-  }
-  public function getMaxPrice()
-  {
-    return $this->maxPrice;
-  }
-  public function setPassengers(Google_Service_QPXExpress_PassengerCounts $passengers)
-  {
-    $this->passengers = $passengers;
-  }
-  public function getPassengers()
-  {
-    return $this->passengers;
-  }
-  public function setRefundable($refundable)
-  {
-    $this->refundable = $refundable;
-  }
-  public function getRefundable()
-  {
-    return $this->refundable;
-  }
-  public function setSaleCountry($saleCountry)
-  {
-    $this->saleCountry = $saleCountry;
-  }
-  public function getSaleCountry()
-  {
-    return $this->saleCountry;
-  }
-  public function setSlice($slice)
-  {
-    $this->slice = $slice;
-  }
-  public function getSlice()
-  {
-    return $this->slice;
-  }
-  public function setSolutions($solutions)
-  {
-    $this->solutions = $solutions;
-  }
-  public function getSolutions()
-  {
-    return $this->solutions;
-  }
-  public function setTicketingCountry($ticketingCountry)
-  {
-    $this->ticketingCountry = $ticketingCountry;
-  }
-  public function getTicketingCountry()
-  {
-    return $this->ticketingCountry;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/QPXExpress/TripOptionsResponse.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/QPXExpress/TripOptionsResponse.php
deleted file mode 100644
index aec30743..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/QPXExpress/TripOptionsResponse.php
+++ /dev/null
@@ -1,60 +0,0 @@
-data = $data;
-  }
-  public function getData()
-  {
-    return $this->data;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setRequestId($requestId)
-  {
-    $this->requestId = $requestId;
-  }
-  public function getRequestId()
-  {
-    return $this->requestId;
-  }
-  public function setTripOption($tripOption)
-  {
-    $this->tripOption = $tripOption;
-  }
-  public function getTripOption()
-  {
-    return $this->tripOption;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/QPXExpress/TripsSearchRequest.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/QPXExpress/TripsSearchRequest.php
deleted file mode 100644
index c6cdd3ff..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/QPXExpress/TripsSearchRequest.php
+++ /dev/null
@@ -1,31 +0,0 @@
-request = $request;
-  }
-  public function getRequest()
-  {
-    return $this->request;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/QPXExpress/TripsSearchResponse.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/QPXExpress/TripsSearchResponse.php
deleted file mode 100644
index 43f2fcce..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/QPXExpress/TripsSearchResponse.php
+++ /dev/null
@@ -1,40 +0,0 @@
-kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setTrips(Google_Service_QPXExpress_TripOptionsResponse $trips)
-  {
-    $this->trips = $trips;
-  }
-  public function getTrips()
-  {
-    return $this->trips;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Replicapool.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Replicapool.php
deleted file mode 100644
index 866b294d..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Replicapool.php
+++ /dev/null
@@ -1,343 +0,0 @@
-
- * [Deprecated. Please use Instance Group Manager in Compute API] Provides
- * groups of homogenous Compute Engine instances.

- *
- * 

- * For more information about this service, see the API
- * Documentation
- * 

- *
- * @author Google, Inc.
- */
-class Google_Service_Replicapool extends Google_Service
-{
-  /** View and manage your data across Google Cloud Platform services. */
-  const CLOUD_PLATFORM =
-      "https://www.googleapis.com/auth/cloud-platform";
-  /** View your data across Google Cloud Platform services. */
-  const CLOUD_PLATFORM_READ_ONLY =
-      "https://www.googleapis.com/auth/cloud-platform.read-only";
-  /** View and manage your Google Compute Engine resources. */
-  const COMPUTE =
-      "https://www.googleapis.com/auth/compute";
-  /** View your Google Compute Engine resources. */
-  const COMPUTE_READONLY =
-      "https://www.googleapis.com/auth/compute.readonly";
-
-  public $instanceGroupManagers;
-  public $zoneOperations;
-  
-  /**
-   * Constructs the internal representation of the Replicapool service.
-   *
-   * @param Google_Client $client
-   */
-  public function __construct(Google_Client $client)
-  {
-    parent::__construct($client);
-    $this->rootUrl = 'https://www.googleapis.com/';
-    $this->servicePath = 'replicapool/v1beta2/projects/';
-    $this->version = 'v1beta2';
-    $this->serviceName = 'replicapool';
-
-    $this->instanceGroupManagers = new Google_Service_Replicapool_Resource_InstanceGroupManagers(
-        $this,
-        $this->serviceName,
-        'instanceGroupManagers',
-        array(
-          'methods' => array(
-            'abandonInstances' => array(
-              'path' => '{project}/zones/{zone}/instanceGroupManagers/{instanceGroupManager}/abandonInstances',
-              'httpMethod' => 'POST',
-              'parameters' => array(
-                'project' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'zone' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'instanceGroupManager' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'delete' => array(
-              'path' => '{project}/zones/{zone}/instanceGroupManagers/{instanceGroupManager}',
-              'httpMethod' => 'DELETE',
-              'parameters' => array(
-                'project' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'zone' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'instanceGroupManager' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'deleteInstances' => array(
-              'path' => '{project}/zones/{zone}/instanceGroupManagers/{instanceGroupManager}/deleteInstances',
-              'httpMethod' => 'POST',
-              'parameters' => array(
-                'project' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'zone' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'instanceGroupManager' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'get' => array(
-              'path' => '{project}/zones/{zone}/instanceGroupManagers/{instanceGroupManager}',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'project' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'zone' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'instanceGroupManager' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'insert' => array(
-              'path' => '{project}/zones/{zone}/instanceGroupManagers',
-              'httpMethod' => 'POST',
-              'parameters' => array(
-                'project' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'zone' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'size' => array(
-                  'location' => 'query',
-                  'type' => 'integer',
-                  'required' => true,
-                ),
-              ),
-            ),'list' => array(
-              'path' => '{project}/zones/{zone}/instanceGroupManagers',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'project' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'zone' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'filter' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'maxResults' => array(
-                  'location' => 'query',
-                  'type' => 'integer',
-                ),
-                'pageToken' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-              ),
-            ),'recreateInstances' => array(
-              'path' => '{project}/zones/{zone}/instanceGroupManagers/{instanceGroupManager}/recreateInstances',
-              'httpMethod' => 'POST',
-              'parameters' => array(
-                'project' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'zone' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'instanceGroupManager' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'resize' => array(
-              'path' => '{project}/zones/{zone}/instanceGroupManagers/{instanceGroupManager}/resize',
-              'httpMethod' => 'POST',
-              'parameters' => array(
-                'project' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'zone' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'instanceGroupManager' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'size' => array(
-                  'location' => 'query',
-                  'type' => 'integer',
-                  'required' => true,
-                ),
-              ),
-            ),'setInstanceTemplate' => array(
-              'path' => '{project}/zones/{zone}/instanceGroupManagers/{instanceGroupManager}/setInstanceTemplate',
-              'httpMethod' => 'POST',
-              'parameters' => array(
-                'project' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'zone' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'instanceGroupManager' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'setTargetPools' => array(
-              'path' => '{project}/zones/{zone}/instanceGroupManagers/{instanceGroupManager}/setTargetPools',
-              'httpMethod' => 'POST',
-              'parameters' => array(
-                'project' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'zone' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'instanceGroupManager' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),
-          )
-        )
-    );
-    $this->zoneOperations = new Google_Service_Replicapool_Resource_ZoneOperations(
-        $this,
-        $this->serviceName,
-        'zoneOperations',
-        array(
-          'methods' => array(
-            'get' => array(
-              'path' => '{project}/zones/{zone}/operations/{operation}',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'project' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'zone' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'operation' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'list' => array(
-              'path' => '{project}/zones/{zone}/operations',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'project' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'zone' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'filter' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'maxResults' => array(
-                  'location' => 'query',
-                  'type' => 'integer',
-                ),
-                'pageToken' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-              ),
-            ),
-          )
-        )
-    );
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Replicapool/InstanceGroupManager.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Replicapool/InstanceGroupManager.php
deleted file mode 100644
index b7b2c01e..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Replicapool/InstanceGroupManager.php
+++ /dev/null
@@ -1,149 +0,0 @@
-autoHealingPolicies = $autoHealingPolicies;
-  }
-  public function getAutoHealingPolicies()
-  {
-    return $this->autoHealingPolicies;
-  }
-  public function setBaseInstanceName($baseInstanceName)
-  {
-    $this->baseInstanceName = $baseInstanceName;
-  }
-  public function getBaseInstanceName()
-  {
-    return $this->baseInstanceName;
-  }
-  public function setCreationTimestamp($creationTimestamp)
-  {
-    $this->creationTimestamp = $creationTimestamp;
-  }
-  public function getCreationTimestamp()
-  {
-    return $this->creationTimestamp;
-  }
-  public function setCurrentSize($currentSize)
-  {
-    $this->currentSize = $currentSize;
-  }
-  public function getCurrentSize()
-  {
-    return $this->currentSize;
-  }
-  public function setDescription($description)
-  {
-    $this->description = $description;
-  }
-  public function getDescription()
-  {
-    return $this->description;
-  }
-  public function setFingerprint($fingerprint)
-  {
-    $this->fingerprint = $fingerprint;
-  }
-  public function getFingerprint()
-  {
-    return $this->fingerprint;
-  }
-  public function setGroup($group)
-  {
-    $this->group = $group;
-  }
-  public function getGroup()
-  {
-    return $this->group;
-  }
-  public function setId($id)
-  {
-    $this->id = $id;
-  }
-  public function getId()
-  {
-    return $this->id;
-  }
-  public function setInstanceTemplate($instanceTemplate)
-  {
-    $this->instanceTemplate = $instanceTemplate;
-  }
-  public function getInstanceTemplate()
-  {
-    return $this->instanceTemplate;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setName($name)
-  {
-    $this->name = $name;
-  }
-  public function getName()
-  {
-    return $this->name;
-  }
-  public function setSelfLink($selfLink)
-  {
-    $this->selfLink = $selfLink;
-  }
-  public function getSelfLink()
-  {
-    return $this->selfLink;
-  }
-  public function setTargetPools($targetPools)
-  {
-    $this->targetPools = $targetPools;
-  }
-  public function getTargetPools()
-  {
-    return $this->targetPools;
-  }
-  public function setTargetSize($targetSize)
-  {
-    $this->targetSize = $targetSize;
-  }
-  public function getTargetSize()
-  {
-    return $this->targetSize;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Replicapool/InstanceGroupManagerList.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Replicapool/InstanceGroupManagerList.php
deleted file mode 100644
index bfeb29da..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Replicapool/InstanceGroupManagerList.php
+++ /dev/null
@@ -1,68 +0,0 @@
-id = $id;
-  }
-  public function getId()
-  {
-    return $this->id;
-  }
-  public function setItems($items)
-  {
-    $this->items = $items;
-  }
-  public function getItems()
-  {
-    return $this->items;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setNextPageToken($nextPageToken)
-  {
-    $this->nextPageToken = $nextPageToken;
-  }
-  public function getNextPageToken()
-  {
-    return $this->nextPageToken;
-  }
-  public function setSelfLink($selfLink)
-  {
-    $this->selfLink = $selfLink;
-  }
-  public function getSelfLink()
-  {
-    return $this->selfLink;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Replicapool/InstanceGroupManagersAbandonInstancesRequest.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Replicapool/InstanceGroupManagersAbandonInstancesRequest.php
deleted file mode 100644
index 92679f67..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Replicapool/InstanceGroupManagersAbandonInstancesRequest.php
+++ /dev/null
@@ -1,31 +0,0 @@
-instances = $instances;
-  }
-  public function getInstances()
-  {
-    return $this->instances;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Replicapool/InstanceGroupManagersDeleteInstancesRequest.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Replicapool/InstanceGroupManagersDeleteInstancesRequest.php
deleted file mode 100644
index d5433358..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Replicapool/InstanceGroupManagersDeleteInstancesRequest.php
+++ /dev/null
@@ -1,31 +0,0 @@
-instances = $instances;
-  }
-  public function getInstances()
-  {
-    return $this->instances;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Replicapool/InstanceGroupManagersRecreateInstancesRequest.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Replicapool/InstanceGroupManagersRecreateInstancesRequest.php
deleted file mode 100644
index 9df7b3e0..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Replicapool/InstanceGroupManagersRecreateInstancesRequest.php
+++ /dev/null
@@ -1,31 +0,0 @@
-instances = $instances;
-  }
-  public function getInstances()
-  {
-    return $this->instances;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Replicapool/InstanceGroupManagersSetInstanceTemplateRequest.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Replicapool/InstanceGroupManagersSetInstanceTemplateRequest.php
deleted file mode 100644
index 84e88d8e..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Replicapool/InstanceGroupManagersSetInstanceTemplateRequest.php
+++ /dev/null
@@ -1,30 +0,0 @@
-instanceTemplate = $instanceTemplate;
-  }
-  public function getInstanceTemplate()
-  {
-    return $this->instanceTemplate;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Replicapool/InstanceGroupManagersSetTargetPoolsRequest.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Replicapool/InstanceGroupManagersSetTargetPoolsRequest.php
deleted file mode 100644
index c17e5fc0..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Replicapool/InstanceGroupManagersSetTargetPoolsRequest.php
+++ /dev/null
@@ -1,40 +0,0 @@
-fingerprint = $fingerprint;
-  }
-  public function getFingerprint()
-  {
-    return $this->fingerprint;
-  }
-  public function setTargetPools($targetPools)
-  {
-    $this->targetPools = $targetPools;
-  }
-  public function getTargetPools()
-  {
-    return $this->targetPools;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Replicapool/Operation.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Replicapool/Operation.php
deleted file mode 100644
index ba8bb13e..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Replicapool/Operation.php
+++ /dev/null
@@ -1,222 +0,0 @@
-clientOperationId = $clientOperationId;
-  }
-  public function getClientOperationId()
-  {
-    return $this->clientOperationId;
-  }
-  public function setCreationTimestamp($creationTimestamp)
-  {
-    $this->creationTimestamp = $creationTimestamp;
-  }
-  public function getCreationTimestamp()
-  {
-    return $this->creationTimestamp;
-  }
-  public function setEndTime($endTime)
-  {
-    $this->endTime = $endTime;
-  }
-  public function getEndTime()
-  {
-    return $this->endTime;
-  }
-  public function setError(Google_Service_Replicapool_OperationError $error)
-  {
-    $this->error = $error;
-  }
-  public function getError()
-  {
-    return $this->error;
-  }
-  public function setHttpErrorMessage($httpErrorMessage)
-  {
-    $this->httpErrorMessage = $httpErrorMessage;
-  }
-  public function getHttpErrorMessage()
-  {
-    return $this->httpErrorMessage;
-  }
-  public function setHttpErrorStatusCode($httpErrorStatusCode)
-  {
-    $this->httpErrorStatusCode = $httpErrorStatusCode;
-  }
-  public function getHttpErrorStatusCode()
-  {
-    return $this->httpErrorStatusCode;
-  }
-  public function setId($id)
-  {
-    $this->id = $id;
-  }
-  public function getId()
-  {
-    return $this->id;
-  }
-  public function setInsertTime($insertTime)
-  {
-    $this->insertTime = $insertTime;
-  }
-  public function getInsertTime()
-  {
-    return $this->insertTime;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setName($name)
-  {
-    $this->name = $name;
-  }
-  public function getName()
-  {
-    return $this->name;
-  }
-  public function setOperationType($operationType)
-  {
-    $this->operationType = $operationType;
-  }
-  public function getOperationType()
-  {
-    return $this->operationType;
-  }
-  public function setProgress($progress)
-  {
-    $this->progress = $progress;
-  }
-  public function getProgress()
-  {
-    return $this->progress;
-  }
-  public function setRegion($region)
-  {
-    $this->region = $region;
-  }
-  public function getRegion()
-  {
-    return $this->region;
-  }
-  public function setSelfLink($selfLink)
-  {
-    $this->selfLink = $selfLink;
-  }
-  public function getSelfLink()
-  {
-    return $this->selfLink;
-  }
-  public function setStartTime($startTime)
-  {
-    $this->startTime = $startTime;
-  }
-  public function getStartTime()
-  {
-    return $this->startTime;
-  }
-  public function setStatus($status)
-  {
-    $this->status = $status;
-  }
-  public function getStatus()
-  {
-    return $this->status;
-  }
-  public function setStatusMessage($statusMessage)
-  {
-    $this->statusMessage = $statusMessage;
-  }
-  public function getStatusMessage()
-  {
-    return $this->statusMessage;
-  }
-  public function setTargetId($targetId)
-  {
-    $this->targetId = $targetId;
-  }
-  public function getTargetId()
-  {
-    return $this->targetId;
-  }
-  public function setTargetLink($targetLink)
-  {
-    $this->targetLink = $targetLink;
-  }
-  public function getTargetLink()
-  {
-    return $this->targetLink;
-  }
-  public function setUser($user)
-  {
-    $this->user = $user;
-  }
-  public function getUser()
-  {
-    return $this->user;
-  }
-  public function setWarnings($warnings)
-  {
-    $this->warnings = $warnings;
-  }
-  public function getWarnings()
-  {
-    return $this->warnings;
-  }
-  public function setZone($zone)
-  {
-    $this->zone = $zone;
-  }
-  public function getZone()
-  {
-    return $this->zone;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Replicapool/OperationError.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Replicapool/OperationError.php
deleted file mode 100644
index e7445cc3..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Replicapool/OperationError.php
+++ /dev/null
@@ -1,32 +0,0 @@
-errors = $errors;
-  }
-  public function getErrors()
-  {
-    return $this->errors;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Replicapool/OperationErrorErrors.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Replicapool/OperationErrorErrors.php
deleted file mode 100644
index 8827f7a5..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Replicapool/OperationErrorErrors.php
+++ /dev/null
@@ -1,48 +0,0 @@
-code = $code;
-  }
-  public function getCode()
-  {
-    return $this->code;
-  }
-  public function setLocation($location)
-  {
-    $this->location = $location;
-  }
-  public function getLocation()
-  {
-    return $this->location;
-  }
-  public function setMessage($message)
-  {
-    $this->message = $message;
-  }
-  public function getMessage()
-  {
-    return $this->message;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Replicapool/OperationList.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Replicapool/OperationList.php
deleted file mode 100644
index 79651b5c..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Replicapool/OperationList.php
+++ /dev/null
@@ -1,68 +0,0 @@
-id = $id;
-  }
-  public function getId()
-  {
-    return $this->id;
-  }
-  public function setItems($items)
-  {
-    $this->items = $items;
-  }
-  public function getItems()
-  {
-    return $this->items;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setNextPageToken($nextPageToken)
-  {
-    $this->nextPageToken = $nextPageToken;
-  }
-  public function getNextPageToken()
-  {
-    return $this->nextPageToken;
-  }
-  public function setSelfLink($selfLink)
-  {
-    $this->selfLink = $selfLink;
-  }
-  public function getSelfLink()
-  {
-    return $this->selfLink;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Replicapool/OperationWarnings.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Replicapool/OperationWarnings.php
deleted file mode 100644
index 251dd0be..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Replicapool/OperationWarnings.php
+++ /dev/null
@@ -1,50 +0,0 @@
-code = $code;
-  }
-  public function getCode()
-  {
-    return $this->code;
-  }
-  public function setData($data)
-  {
-    $this->data = $data;
-  }
-  public function getData()
-  {
-    return $this->data;
-  }
-  public function setMessage($message)
-  {
-    $this->message = $message;
-  }
-  public function getMessage()
-  {
-    return $this->message;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Replicapool/OperationWarningsData.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Replicapool/OperationWarningsData.php
deleted file mode 100644
index 1f9d0913..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Replicapool/OperationWarningsData.php
+++ /dev/null
@@ -1,39 +0,0 @@
-key = $key;
-  }
-  public function getKey()
-  {
-    return $this->key;
-  }
-  public function setValue($value)
-  {
-    $this->value = $value;
-  }
-  public function getValue()
-  {
-    return $this->value;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Replicapool/ReplicaPoolAutoHealingPolicy.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Replicapool/ReplicaPoolAutoHealingPolicy.php
deleted file mode 100644
index c21ebf01..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Replicapool/ReplicaPoolAutoHealingPolicy.php
+++ /dev/null
@@ -1,39 +0,0 @@
-actionType = $actionType;
-  }
-  public function getActionType()
-  {
-    return $this->actionType;
-  }
-  public function setHealthCheck($healthCheck)
-  {
-    $this->healthCheck = $healthCheck;
-  }
-  public function getHealthCheck()
-  {
-    return $this->healthCheck;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Replicapool/Resource/InstanceGroupManagers.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Replicapool/Resource/InstanceGroupManagers.php
deleted file mode 100644
index de735d41..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Replicapool/Resource/InstanceGroupManagers.php
+++ /dev/null
@@ -1,223 +0,0 @@
-
- *   $replicapoolService = new Google_Service_Replicapool(...);
- *   $instanceGroupManagers = $replicapoolService->instanceGroupManagers;
- *  
- */
-class Google_Service_Replicapool_Resource_InstanceGroupManagers extends Google_Service_Resource
-{
-  /**
-   * Removes the specified instances from the managed instance group, and from any
-   * target pools of which they were members, without deleting the instances.
-   * (instanceGroupManagers.abandonInstances)
-   *
-   * @param string $project The Google Developers Console project name.
-   * @param string $zone The name of the zone in which the instance group manager
-   * resides.
-   * @param string $instanceGroupManager The name of the instance group manager.
-   * @param Google_Service_Replicapool_InstanceGroupManagersAbandonInstancesRequest $postBody
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Replicapool_Operation
-   */
-  public function abandonInstances($project, $zone, $instanceGroupManager, Google_Service_Replicapool_InstanceGroupManagersAbandonInstancesRequest $postBody, $optParams = array())
-  {
-    $params = array('project' => $project, 'zone' => $zone, 'instanceGroupManager' => $instanceGroupManager, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('abandonInstances', array($params), "Google_Service_Replicapool_Operation");
-  }
-  /**
-   * Deletes the instance group manager and all instances contained within. If
-   * you'd like to delete the manager without deleting the instances, you must
-   * first abandon the instances to remove them from the group.
-   * (instanceGroupManagers.delete)
-   *
-   * @param string $project The Google Developers Console project name.
-   * @param string $zone The name of the zone in which the instance group manager
-   * resides.
-   * @param string $instanceGroupManager Name of the Instance Group Manager
-   * resource to delete.
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Replicapool_Operation
-   */
-  public function delete($project, $zone, $instanceGroupManager, $optParams = array())
-  {
-    $params = array('project' => $project, 'zone' => $zone, 'instanceGroupManager' => $instanceGroupManager);
-    $params = array_merge($params, $optParams);
-    return $this->call('delete', array($params), "Google_Service_Replicapool_Operation");
-  }
-  /**
-   * Deletes the specified instances. The instances are deleted, then removed from
-   * the instance group and any target pools of which they were a member. The
-   * targetSize of the instance group manager is reduced by the number of
-   * instances deleted. (instanceGroupManagers.deleteInstances)
-   *
-   * @param string $project The Google Developers Console project name.
-   * @param string $zone The name of the zone in which the instance group manager
-   * resides.
-   * @param string $instanceGroupManager The name of the instance group manager.
-   * @param Google_Service_Replicapool_InstanceGroupManagersDeleteInstancesRequest $postBody
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Replicapool_Operation
-   */
-  public function deleteInstances($project, $zone, $instanceGroupManager, Google_Service_Replicapool_InstanceGroupManagersDeleteInstancesRequest $postBody, $optParams = array())
-  {
-    $params = array('project' => $project, 'zone' => $zone, 'instanceGroupManager' => $instanceGroupManager, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('deleteInstances', array($params), "Google_Service_Replicapool_Operation");
-  }
-  /**
-   * Returns the specified Instance Group Manager resource.
-   * (instanceGroupManagers.get)
-   *
-   * @param string $project The Google Developers Console project name.
-   * @param string $zone The name of the zone in which the instance group manager
-   * resides.
-   * @param string $instanceGroupManager Name of the instance resource to return.
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Replicapool_InstanceGroupManager
-   */
-  public function get($project, $zone, $instanceGroupManager, $optParams = array())
-  {
-    $params = array('project' => $project, 'zone' => $zone, 'instanceGroupManager' => $instanceGroupManager);
-    $params = array_merge($params, $optParams);
-    return $this->call('get', array($params), "Google_Service_Replicapool_InstanceGroupManager");
-  }
-  /**
-   * Creates an instance group manager, as well as the instance group and the
-   * specified number of instances. (instanceGroupManagers.insert)
-   *
-   * @param string $project The Google Developers Console project name.
-   * @param string $zone The name of the zone in which the instance group manager
-   * resides.
-   * @param int $size Number of instances that should exist.
-   * @param Google_Service_Replicapool_InstanceGroupManager $postBody
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Replicapool_Operation
-   */
-  public function insert($project, $zone, $size, Google_Service_Replicapool_InstanceGroupManager $postBody, $optParams = array())
-  {
-    $params = array('project' => $project, 'zone' => $zone, 'size' => $size, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('insert', array($params), "Google_Service_Replicapool_Operation");
-  }
-  /**
-   * Retrieves the list of Instance Group Manager resources contained within the
-   * specified zone. (instanceGroupManagers.listInstanceGroupManagers)
-   *
-   * @param string $project The Google Developers Console project name.
-   * @param string $zone The name of the zone in which the instance group manager
-   * resides.
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param string filter Optional. Filter expression for filtering listed
-   * resources.
-   * @opt_param string maxResults Optional. Maximum count of results to be
-   * returned. Maximum value is 500 and default value is 500.
-   * @opt_param string pageToken Optional. Tag returned by a previous list request
-   * truncated by maxResults. Used to continue a previous list request.
-   * @return Google_Service_Replicapool_InstanceGroupManagerList
-   */
-  public function listInstanceGroupManagers($project, $zone, $optParams = array())
-  {
-    $params = array('project' => $project, 'zone' => $zone);
-    $params = array_merge($params, $optParams);
-    return $this->call('list', array($params), "Google_Service_Replicapool_InstanceGroupManagerList");
-  }
-  /**
-   * Recreates the specified instances. The instances are deleted, then recreated
-   * using the instance group manager's current instance template.
-   * (instanceGroupManagers.recreateInstances)
-   *
-   * @param string $project The Google Developers Console project name.
-   * @param string $zone The name of the zone in which the instance group manager
-   * resides.
-   * @param string $instanceGroupManager The name of the instance group manager.
-   * @param Google_Service_Replicapool_InstanceGroupManagersRecreateInstancesRequest $postBody
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Replicapool_Operation
-   */
-  public function recreateInstances($project, $zone, $instanceGroupManager, Google_Service_Replicapool_InstanceGroupManagersRecreateInstancesRequest $postBody, $optParams = array())
-  {
-    $params = array('project' => $project, 'zone' => $zone, 'instanceGroupManager' => $instanceGroupManager, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('recreateInstances', array($params), "Google_Service_Replicapool_Operation");
-  }
-  /**
-   * Resizes the managed instance group up or down. If resized up, new instances
-   * are created using the current instance template. If resized down, instances
-   * are removed in the order outlined in Resizing a managed instance group.
-   * (instanceGroupManagers.resize)
-   *
-   * @param string $project The Google Developers Console project name.
-   * @param string $zone The name of the zone in which the instance group manager
-   * resides.
-   * @param string $instanceGroupManager The name of the instance group manager.
-   * @param int $size Number of instances that should exist in this Instance Group
-   * Manager.
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Replicapool_Operation
-   */
-  public function resize($project, $zone, $instanceGroupManager, $size, $optParams = array())
-  {
-    $params = array('project' => $project, 'zone' => $zone, 'instanceGroupManager' => $instanceGroupManager, 'size' => $size);
-    $params = array_merge($params, $optParams);
-    return $this->call('resize', array($params), "Google_Service_Replicapool_Operation");
-  }
-  /**
-   * Sets the instance template to use when creating new instances in this group.
-   * Existing instances are not affected.
-   * (instanceGroupManagers.setInstanceTemplate)
-   *
-   * @param string $project The Google Developers Console project name.
-   * @param string $zone The name of the zone in which the instance group manager
-   * resides.
-   * @param string $instanceGroupManager The name of the instance group manager.
-   * @param Google_Service_Replicapool_InstanceGroupManagersSetInstanceTemplateRequest $postBody
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Replicapool_Operation
-   */
-  public function setInstanceTemplate($project, $zone, $instanceGroupManager, Google_Service_Replicapool_InstanceGroupManagersSetInstanceTemplateRequest $postBody, $optParams = array())
-  {
-    $params = array('project' => $project, 'zone' => $zone, 'instanceGroupManager' => $instanceGroupManager, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('setInstanceTemplate', array($params), "Google_Service_Replicapool_Operation");
-  }
-  /**
-   * Modifies the target pools to which all new instances in this group are
-   * assigned. Existing instances in the group are not affected.
-   * (instanceGroupManagers.setTargetPools)
-   *
-   * @param string $project The Google Developers Console project name.
-   * @param string $zone The name of the zone in which the instance group manager
-   * resides.
-   * @param string $instanceGroupManager The name of the instance group manager.
-   * @param Google_Service_Replicapool_InstanceGroupManagersSetTargetPoolsRequest $postBody
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Replicapool_Operation
-   */
-  public function setTargetPools($project, $zone, $instanceGroupManager, Google_Service_Replicapool_InstanceGroupManagersSetTargetPoolsRequest $postBody, $optParams = array())
-  {
-    $params = array('project' => $project, 'zone' => $zone, 'instanceGroupManager' => $instanceGroupManager, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('setTargetPools', array($params), "Google_Service_Replicapool_Operation");
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Replicapool/Resource/ZoneOperations.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Replicapool/Resource/ZoneOperations.php
deleted file mode 100644
index 8f13f026..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Replicapool/Resource/ZoneOperations.php
+++ /dev/null
@@ -1,66 +0,0 @@
-
- *   $replicapoolService = new Google_Service_Replicapool(...);
- *   $zoneOperations = $replicapoolService->zoneOperations;
- *  
- */
-class Google_Service_Replicapool_Resource_ZoneOperations extends Google_Service_Resource
-{
-  /**
-   * Retrieves the specified zone-specific operation resource.
-   * (zoneOperations.get)
-   *
-   * @param string $project Name of the project scoping this request.
-   * @param string $zone Name of the zone scoping this request.
-   * @param string $operation Name of the operation resource to return.
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Replicapool_Operation
-   */
-  public function get($project, $zone, $operation, $optParams = array())
-  {
-    $params = array('project' => $project, 'zone' => $zone, 'operation' => $operation);
-    $params = array_merge($params, $optParams);
-    return $this->call('get', array($params), "Google_Service_Replicapool_Operation");
-  }
-  /**
-   * Retrieves the list of operation resources contained within the specified
-   * zone. (zoneOperations.listZoneOperations)
-   *
-   * @param string $project Name of the project scoping this request.
-   * @param string $zone Name of the zone scoping this request.
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param string filter Optional. Filter expression for filtering listed
-   * resources.
-   * @opt_param string maxResults Optional. Maximum count of results to be
-   * returned. Maximum value is 500 and default value is 500.
-   * @opt_param string pageToken Optional. Tag returned by a previous list request
-   * truncated by maxResults. Used to continue a previous list request.
-   * @return Google_Service_Replicapool_OperationList
-   */
-  public function listZoneOperations($project, $zone, $optParams = array())
-  {
-    $params = array('project' => $project, 'zone' => $zone);
-    $params = array_merge($params, $optParams);
-    return $this->call('list', array($params), "Google_Service_Replicapool_OperationList");
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Replicapoolupdater.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Replicapoolupdater.php
deleted file mode 100644
index 909d9a8d..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Replicapoolupdater.php
+++ /dev/null
@@ -1,306 +0,0 @@
-
- * [Deprecated. Please use compute.instanceGroupManagers.update method.
- * replicapoolupdater API will be disabled after December 30th, 2016] Updates
- * groups of Compute Engine instances.

- *
- * 

- * For more information about this service, see the API
- * Documentation
- * 

- *
- * @author Google, Inc.
- */
-class Google_Service_Replicapoolupdater extends Google_Service
-{
-  /** View and manage your data across Google Cloud Platform services. */
-  const CLOUD_PLATFORM =
-      "https://www.googleapis.com/auth/cloud-platform";
-  /** View your data across Google Cloud Platform services. */
-  const CLOUD_PLATFORM_READ_ONLY =
-      "https://www.googleapis.com/auth/cloud-platform.read-only";
-  /** View and manage replica pools. */
-  const REPLICAPOOL =
-      "https://www.googleapis.com/auth/replicapool";
-  /** View replica pools. */
-  const REPLICAPOOL_READONLY =
-      "https://www.googleapis.com/auth/replicapool.readonly";
-
-  public $rollingUpdates;
-  public $zoneOperations;
-  
-  /**
-   * Constructs the internal representation of the Replicapoolupdater service.
-   *
-   * @param Google_Client $client
-   */
-  public function __construct(Google_Client $client)
-  {
-    parent::__construct($client);
-    $this->rootUrl = 'https://www.googleapis.com/';
-    $this->servicePath = 'replicapoolupdater/v1beta1/projects/';
-    $this->version = 'v1beta1';
-    $this->serviceName = 'replicapoolupdater';
-
-    $this->rollingUpdates = new Google_Service_Replicapoolupdater_Resource_RollingUpdates(
-        $this,
-        $this->serviceName,
-        'rollingUpdates',
-        array(
-          'methods' => array(
-            'cancel' => array(
-              'path' => '{project}/zones/{zone}/rollingUpdates/{rollingUpdate}/cancel',
-              'httpMethod' => 'POST',
-              'parameters' => array(
-                'project' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'zone' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'rollingUpdate' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'get' => array(
-              'path' => '{project}/zones/{zone}/rollingUpdates/{rollingUpdate}',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'project' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'zone' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'rollingUpdate' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'insert' => array(
-              'path' => '{project}/zones/{zone}/rollingUpdates',
-              'httpMethod' => 'POST',
-              'parameters' => array(
-                'project' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'zone' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'list' => array(
-              'path' => '{project}/zones/{zone}/rollingUpdates',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'project' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'zone' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'filter' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'maxResults' => array(
-                  'location' => 'query',
-                  'type' => 'integer',
-                ),
-                'pageToken' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-              ),
-            ),'listInstanceUpdates' => array(
-              'path' => '{project}/zones/{zone}/rollingUpdates/{rollingUpdate}/instanceUpdates',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'project' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'zone' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'rollingUpdate' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'filter' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'maxResults' => array(
-                  'location' => 'query',
-                  'type' => 'integer',
-                ),
-                'pageToken' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-              ),
-            ),'pause' => array(
-              'path' => '{project}/zones/{zone}/rollingUpdates/{rollingUpdate}/pause',
-              'httpMethod' => 'POST',
-              'parameters' => array(
-                'project' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'zone' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'rollingUpdate' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'resume' => array(
-              'path' => '{project}/zones/{zone}/rollingUpdates/{rollingUpdate}/resume',
-              'httpMethod' => 'POST',
-              'parameters' => array(
-                'project' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'zone' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'rollingUpdate' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'rollback' => array(
-              'path' => '{project}/zones/{zone}/rollingUpdates/{rollingUpdate}/rollback',
-              'httpMethod' => 'POST',
-              'parameters' => array(
-                'project' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'zone' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'rollingUpdate' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),
-          )
-        )
-    );
-    $this->zoneOperations = new Google_Service_Replicapoolupdater_Resource_ZoneOperations(
-        $this,
-        $this->serviceName,
-        'zoneOperations',
-        array(
-          'methods' => array(
-            'get' => array(
-              'path' => '{project}/zones/{zone}/operations/{operation}',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'project' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'zone' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'operation' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'list' => array(
-              'path' => '{project}/zones/{zone}/operations',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'project' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'zone' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'filter' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'maxResults' => array(
-                  'location' => 'query',
-                  'type' => 'integer',
-                ),
-                'pageToken' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-              ),
-            ),
-          )
-        )
-    );
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Replicapoolupdater/InstanceUpdate.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Replicapoolupdater/InstanceUpdate.php
deleted file mode 100644
index bd05a8b1..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Replicapoolupdater/InstanceUpdate.php
+++ /dev/null
@@ -1,49 +0,0 @@
-error = $error;
-  }
-  public function getError()
-  {
-    return $this->error;
-  }
-  public function setInstance($instance)
-  {
-    $this->instance = $instance;
-  }
-  public function getInstance()
-  {
-    return $this->instance;
-  }
-  public function setStatus($status)
-  {
-    $this->status = $status;
-  }
-  public function getStatus()
-  {
-    return $this->status;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Replicapoolupdater/InstanceUpdateError.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Replicapoolupdater/InstanceUpdateError.php
deleted file mode 100644
index 22184541..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Replicapoolupdater/InstanceUpdateError.php
+++ /dev/null
@@ -1,32 +0,0 @@
-errors = $errors;
-  }
-  public function getErrors()
-  {
-    return $this->errors;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Replicapoolupdater/InstanceUpdateErrorErrors.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Replicapoolupdater/InstanceUpdateErrorErrors.php
deleted file mode 100644
index f2ab73f9..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Replicapoolupdater/InstanceUpdateErrorErrors.php
+++ /dev/null
@@ -1,48 +0,0 @@
-code = $code;
-  }
-  public function getCode()
-  {
-    return $this->code;
-  }
-  public function setLocation($location)
-  {
-    $this->location = $location;
-  }
-  public function getLocation()
-  {
-    return $this->location;
-  }
-  public function setMessage($message)
-  {
-    $this->message = $message;
-  }
-  public function getMessage()
-  {
-    return $this->message;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Replicapoolupdater/InstanceUpdateList.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Replicapoolupdater/InstanceUpdateList.php
deleted file mode 100644
index 15e0df5b..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Replicapoolupdater/InstanceUpdateList.php
+++ /dev/null
@@ -1,59 +0,0 @@
-items = $items;
-  }
-  public function getItems()
-  {
-    return $this->items;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setNextPageToken($nextPageToken)
-  {
-    $this->nextPageToken = $nextPageToken;
-  }
-  public function getNextPageToken()
-  {
-    return $this->nextPageToken;
-  }
-  public function setSelfLink($selfLink)
-  {
-    $this->selfLink = $selfLink;
-  }
-  public function getSelfLink()
-  {
-    return $this->selfLink;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Replicapoolupdater/Operation.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Replicapoolupdater/Operation.php
deleted file mode 100644
index 5db33d80..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Replicapoolupdater/Operation.php
+++ /dev/null
@@ -1,222 +0,0 @@
-clientOperationId = $clientOperationId;
-  }
-  public function getClientOperationId()
-  {
-    return $this->clientOperationId;
-  }
-  public function setCreationTimestamp($creationTimestamp)
-  {
-    $this->creationTimestamp = $creationTimestamp;
-  }
-  public function getCreationTimestamp()
-  {
-    return $this->creationTimestamp;
-  }
-  public function setEndTime($endTime)
-  {
-    $this->endTime = $endTime;
-  }
-  public function getEndTime()
-  {
-    return $this->endTime;
-  }
-  public function setError(Google_Service_Replicapoolupdater_OperationError $error)
-  {
-    $this->error = $error;
-  }
-  public function getError()
-  {
-    return $this->error;
-  }
-  public function setHttpErrorMessage($httpErrorMessage)
-  {
-    $this->httpErrorMessage = $httpErrorMessage;
-  }
-  public function getHttpErrorMessage()
-  {
-    return $this->httpErrorMessage;
-  }
-  public function setHttpErrorStatusCode($httpErrorStatusCode)
-  {
-    $this->httpErrorStatusCode = $httpErrorStatusCode;
-  }
-  public function getHttpErrorStatusCode()
-  {
-    return $this->httpErrorStatusCode;
-  }
-  public function setId($id)
-  {
-    $this->id = $id;
-  }
-  public function getId()
-  {
-    return $this->id;
-  }
-  public function setInsertTime($insertTime)
-  {
-    $this->insertTime = $insertTime;
-  }
-  public function getInsertTime()
-  {
-    return $this->insertTime;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setName($name)
-  {
-    $this->name = $name;
-  }
-  public function getName()
-  {
-    return $this->name;
-  }
-  public function setOperationType($operationType)
-  {
-    $this->operationType = $operationType;
-  }
-  public function getOperationType()
-  {
-    return $this->operationType;
-  }
-  public function setProgress($progress)
-  {
-    $this->progress = $progress;
-  }
-  public function getProgress()
-  {
-    return $this->progress;
-  }
-  public function setRegion($region)
-  {
-    $this->region = $region;
-  }
-  public function getRegion()
-  {
-    return $this->region;
-  }
-  public function setSelfLink($selfLink)
-  {
-    $this->selfLink = $selfLink;
-  }
-  public function getSelfLink()
-  {
-    return $this->selfLink;
-  }
-  public function setStartTime($startTime)
-  {
-    $this->startTime = $startTime;
-  }
-  public function getStartTime()
-  {
-    return $this->startTime;
-  }
-  public function setStatus($status)
-  {
-    $this->status = $status;
-  }
-  public function getStatus()
-  {
-    return $this->status;
-  }
-  public function setStatusMessage($statusMessage)
-  {
-    $this->statusMessage = $statusMessage;
-  }
-  public function getStatusMessage()
-  {
-    return $this->statusMessage;
-  }
-  public function setTargetId($targetId)
-  {
-    $this->targetId = $targetId;
-  }
-  public function getTargetId()
-  {
-    return $this->targetId;
-  }
-  public function setTargetLink($targetLink)
-  {
-    $this->targetLink = $targetLink;
-  }
-  public function getTargetLink()
-  {
-    return $this->targetLink;
-  }
-  public function setUser($user)
-  {
-    $this->user = $user;
-  }
-  public function getUser()
-  {
-    return $this->user;
-  }
-  public function setWarnings($warnings)
-  {
-    $this->warnings = $warnings;
-  }
-  public function getWarnings()
-  {
-    return $this->warnings;
-  }
-  public function setZone($zone)
-  {
-    $this->zone = $zone;
-  }
-  public function getZone()
-  {
-    return $this->zone;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Replicapoolupdater/OperationError.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Replicapoolupdater/OperationError.php
deleted file mode 100644
index b22a03f0..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Replicapoolupdater/OperationError.php
+++ /dev/null
@@ -1,32 +0,0 @@
-errors = $errors;
-  }
-  public function getErrors()
-  {
-    return $this->errors;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Replicapoolupdater/OperationErrorErrors.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Replicapoolupdater/OperationErrorErrors.php
deleted file mode 100644
index 3f2719f8..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Replicapoolupdater/OperationErrorErrors.php
+++ /dev/null
@@ -1,48 +0,0 @@
-code = $code;
-  }
-  public function getCode()
-  {
-    return $this->code;
-  }
-  public function setLocation($location)
-  {
-    $this->location = $location;
-  }
-  public function getLocation()
-  {
-    return $this->location;
-  }
-  public function setMessage($message)
-  {
-    $this->message = $message;
-  }
-  public function getMessage()
-  {
-    return $this->message;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Replicapoolupdater/OperationList.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Replicapoolupdater/OperationList.php
deleted file mode 100644
index 3383b680..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Replicapoolupdater/OperationList.php
+++ /dev/null
@@ -1,68 +0,0 @@
-id = $id;
-  }
-  public function getId()
-  {
-    return $this->id;
-  }
-  public function setItems($items)
-  {
-    $this->items = $items;
-  }
-  public function getItems()
-  {
-    return $this->items;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setNextPageToken($nextPageToken)
-  {
-    $this->nextPageToken = $nextPageToken;
-  }
-  public function getNextPageToken()
-  {
-    return $this->nextPageToken;
-  }
-  public function setSelfLink($selfLink)
-  {
-    $this->selfLink = $selfLink;
-  }
-  public function getSelfLink()
-  {
-    return $this->selfLink;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Replicapoolupdater/OperationWarnings.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Replicapoolupdater/OperationWarnings.php
deleted file mode 100644
index 20745152..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Replicapoolupdater/OperationWarnings.php
+++ /dev/null
@@ -1,50 +0,0 @@
-code = $code;
-  }
-  public function getCode()
-  {
-    return $this->code;
-  }
-  public function setData($data)
-  {
-    $this->data = $data;
-  }
-  public function getData()
-  {
-    return $this->data;
-  }
-  public function setMessage($message)
-  {
-    $this->message = $message;
-  }
-  public function getMessage()
-  {
-    return $this->message;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Replicapoolupdater/OperationWarningsData.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Replicapoolupdater/OperationWarningsData.php
deleted file mode 100644
index b5dd229a..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Replicapoolupdater/OperationWarningsData.php
+++ /dev/null
@@ -1,39 +0,0 @@
-key = $key;
-  }
-  public function getKey()
-  {
-    return $this->key;
-  }
-  public function setValue($value)
-  {
-    $this->value = $value;
-  }
-  public function getValue()
-  {
-    return $this->value;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Replicapoolupdater/Resource/RollingUpdates.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Replicapoolupdater/Resource/RollingUpdates.php
deleted file mode 100644
index 2899ab75..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Replicapoolupdater/Resource/RollingUpdates.php
+++ /dev/null
@@ -1,177 +0,0 @@
-
- *   $replicapoolupdaterService = new Google_Service_Replicapoolupdater(...);
- *   $rollingUpdates = $replicapoolupdaterService->rollingUpdates;
- *  
- */
-class Google_Service_Replicapoolupdater_Resource_RollingUpdates extends Google_Service_Resource
-{
-  /**
-   * Cancels an update. The update must be PAUSED before it can be cancelled. This
-   * has no effect if the update is already CANCELLED. (rollingUpdates.cancel)
-   *
-   * @param string $project The Google Developers Console project name.
-   * @param string $zone The name of the zone in which the update's target
-   * resides.
-   * @param string $rollingUpdate The name of the update.
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Replicapoolupdater_Operation
-   */
-  public function cancel($project, $zone, $rollingUpdate, $optParams = array())
-  {
-    $params = array('project' => $project, 'zone' => $zone, 'rollingUpdate' => $rollingUpdate);
-    $params = array_merge($params, $optParams);
-    return $this->call('cancel', array($params), "Google_Service_Replicapoolupdater_Operation");
-  }
-  /**
-   * Returns information about an update. (rollingUpdates.get)
-   *
-   * @param string $project The Google Developers Console project name.
-   * @param string $zone The name of the zone in which the update's target
-   * resides.
-   * @param string $rollingUpdate The name of the update.
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Replicapoolupdater_RollingUpdate
-   */
-  public function get($project, $zone, $rollingUpdate, $optParams = array())
-  {
-    $params = array('project' => $project, 'zone' => $zone, 'rollingUpdate' => $rollingUpdate);
-    $params = array_merge($params, $optParams);
-    return $this->call('get', array($params), "Google_Service_Replicapoolupdater_RollingUpdate");
-  }
-  /**
-   * Inserts and starts a new update. (rollingUpdates.insert)
-   *
-   * @param string $project The Google Developers Console project name.
-   * @param string $zone The name of the zone in which the update's target
-   * resides.
-   * @param Google_Service_Replicapoolupdater_RollingUpdate $postBody
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Replicapoolupdater_Operation
-   */
-  public function insert($project, $zone, Google_Service_Replicapoolupdater_RollingUpdate $postBody, $optParams = array())
-  {
-    $params = array('project' => $project, 'zone' => $zone, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('insert', array($params), "Google_Service_Replicapoolupdater_Operation");
-  }
-  /**
-   * Lists recent updates for a given managed instance group, in reverse
-   * chronological order and paginated format. (rollingUpdates.listRollingUpdates)
-   *
-   * @param string $project The Google Developers Console project name.
-   * @param string $zone The name of the zone in which the update's target
-   * resides.
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param string filter Optional. Filter expression for filtering listed
-   * resources.
-   * @opt_param string maxResults Optional. Maximum count of results to be
-   * returned. Maximum value is 500 and default value is 500.
-   * @opt_param string pageToken Optional. Tag returned by a previous list request
-   * truncated by maxResults. Used to continue a previous list request.
-   * @return Google_Service_Replicapoolupdater_RollingUpdateList
-   */
-  public function listRollingUpdates($project, $zone, $optParams = array())
-  {
-    $params = array('project' => $project, 'zone' => $zone);
-    $params = array_merge($params, $optParams);
-    return $this->call('list', array($params), "Google_Service_Replicapoolupdater_RollingUpdateList");
-  }
-  /**
-   * Lists the current status for each instance within a given update.
-   * (rollingUpdates.listInstanceUpdates)
-   *
-   * @param string $project The Google Developers Console project name.
-   * @param string $zone The name of the zone in which the update's target
-   * resides.
-   * @param string $rollingUpdate The name of the update.
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param string filter Optional. Filter expression for filtering listed
-   * resources.
-   * @opt_param string maxResults Optional. Maximum count of results to be
-   * returned. Maximum value is 500 and default value is 500.
-   * @opt_param string pageToken Optional. Tag returned by a previous list request
-   * truncated by maxResults. Used to continue a previous list request.
-   * @return Google_Service_Replicapoolupdater_InstanceUpdateList
-   */
-  public function listInstanceUpdates($project, $zone, $rollingUpdate, $optParams = array())
-  {
-    $params = array('project' => $project, 'zone' => $zone, 'rollingUpdate' => $rollingUpdate);
-    $params = array_merge($params, $optParams);
-    return $this->call('listInstanceUpdates', array($params), "Google_Service_Replicapoolupdater_InstanceUpdateList");
-  }
-  /**
-   * Pauses the update in state from ROLLING_FORWARD or ROLLING_BACK. Has no
-   * effect if invoked when the state of the update is PAUSED.
-   * (rollingUpdates.pause)
-   *
-   * @param string $project The Google Developers Console project name.
-   * @param string $zone The name of the zone in which the update's target
-   * resides.
-   * @param string $rollingUpdate The name of the update.
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Replicapoolupdater_Operation
-   */
-  public function pause($project, $zone, $rollingUpdate, $optParams = array())
-  {
-    $params = array('project' => $project, 'zone' => $zone, 'rollingUpdate' => $rollingUpdate);
-    $params = array_merge($params, $optParams);
-    return $this->call('pause', array($params), "Google_Service_Replicapoolupdater_Operation");
-  }
-  /**
-   * Continues an update in PAUSED state. Has no effect if invoked when the state
-   * of the update is ROLLED_OUT. (rollingUpdates.resume)
-   *
-   * @param string $project The Google Developers Console project name.
-   * @param string $zone The name of the zone in which the update's target
-   * resides.
-   * @param string $rollingUpdate The name of the update.
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Replicapoolupdater_Operation
-   */
-  public function resume($project, $zone, $rollingUpdate, $optParams = array())
-  {
-    $params = array('project' => $project, 'zone' => $zone, 'rollingUpdate' => $rollingUpdate);
-    $params = array_merge($params, $optParams);
-    return $this->call('resume', array($params), "Google_Service_Replicapoolupdater_Operation");
-  }
-  /**
-   * Rolls back the update in state from ROLLING_FORWARD or PAUSED. Has no effect
-   * if invoked when the state of the update is ROLLED_BACK.
-   * (rollingUpdates.rollback)
-   *
-   * @param string $project The Google Developers Console project name.
-   * @param string $zone The name of the zone in which the update's target
-   * resides.
-   * @param string $rollingUpdate The name of the update.
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Replicapoolupdater_Operation
-   */
-  public function rollback($project, $zone, $rollingUpdate, $optParams = array())
-  {
-    $params = array('project' => $project, 'zone' => $zone, 'rollingUpdate' => $rollingUpdate);
-    $params = array_merge($params, $optParams);
-    return $this->call('rollback', array($params), "Google_Service_Replicapoolupdater_Operation");
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Replicapoolupdater/Resource/ZoneOperations.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Replicapoolupdater/Resource/ZoneOperations.php
deleted file mode 100644
index 5f8a13fb..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Replicapoolupdater/Resource/ZoneOperations.php
+++ /dev/null
@@ -1,66 +0,0 @@
-
- *   $replicapoolupdaterService = new Google_Service_Replicapoolupdater(...);
- *   $zoneOperations = $replicapoolupdaterService->zoneOperations;
- *  
- */
-class Google_Service_Replicapoolupdater_Resource_ZoneOperations extends Google_Service_Resource
-{
-  /**
-   * Retrieves the specified zone-specific operation resource.
-   * (zoneOperations.get)
-   *
-   * @param string $project Name of the project scoping this request.
-   * @param string $zone Name of the zone scoping this request.
-   * @param string $operation Name of the operation resource to return.
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Replicapoolupdater_Operation
-   */
-  public function get($project, $zone, $operation, $optParams = array())
-  {
-    $params = array('project' => $project, 'zone' => $zone, 'operation' => $operation);
-    $params = array_merge($params, $optParams);
-    return $this->call('get', array($params), "Google_Service_Replicapoolupdater_Operation");
-  }
-  /**
-   * Retrieves the list of Operation resources contained within the specified
-   * zone. (zoneOperations.listZoneOperations)
-   *
-   * @param string $project Name of the project scoping this request.
-   * @param string $zone Name of the zone scoping this request.
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param string filter Optional. Filter expression for filtering listed
-   * resources.
-   * @opt_param string maxResults Optional. Maximum count of results to be
-   * returned. Maximum value is 500 and default value is 500.
-   * @opt_param string pageToken Optional. Tag returned by a previous list request
-   * truncated by maxResults. Used to continue a previous list request.
-   * @return Google_Service_Replicapoolupdater_OperationList
-   */
-  public function listZoneOperations($project, $zone, $optParams = array())
-  {
-    $params = array('project' => $project, 'zone' => $zone);
-    $params = array_merge($params, $optParams);
-    return $this->call('list', array($params), "Google_Service_Replicapoolupdater_OperationList");
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Replicapoolupdater/RollingUpdate.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Replicapoolupdater/RollingUpdate.php
deleted file mode 100644
index ad7ca9d1..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Replicapoolupdater/RollingUpdate.php
+++ /dev/null
@@ -1,167 +0,0 @@
-actionType = $actionType;
-  }
-  public function getActionType()
-  {
-    return $this->actionType;
-  }
-  public function setCreationTimestamp($creationTimestamp)
-  {
-    $this->creationTimestamp = $creationTimestamp;
-  }
-  public function getCreationTimestamp()
-  {
-    return $this->creationTimestamp;
-  }
-  public function setDescription($description)
-  {
-    $this->description = $description;
-  }
-  public function getDescription()
-  {
-    return $this->description;
-  }
-  public function setError(Google_Service_Replicapoolupdater_RollingUpdateError $error)
-  {
-    $this->error = $error;
-  }
-  public function getError()
-  {
-    return $this->error;
-  }
-  public function setId($id)
-  {
-    $this->id = $id;
-  }
-  public function getId()
-  {
-    return $this->id;
-  }
-  public function setInstanceGroup($instanceGroup)
-  {
-    $this->instanceGroup = $instanceGroup;
-  }
-  public function getInstanceGroup()
-  {
-    return $this->instanceGroup;
-  }
-  public function setInstanceGroupManager($instanceGroupManager)
-  {
-    $this->instanceGroupManager = $instanceGroupManager;
-  }
-  public function getInstanceGroupManager()
-  {
-    return $this->instanceGroupManager;
-  }
-  public function setInstanceTemplate($instanceTemplate)
-  {
-    $this->instanceTemplate = $instanceTemplate;
-  }
-  public function getInstanceTemplate()
-  {
-    return $this->instanceTemplate;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setOldInstanceTemplate($oldInstanceTemplate)
-  {
-    $this->oldInstanceTemplate = $oldInstanceTemplate;
-  }
-  public function getOldInstanceTemplate()
-  {
-    return $this->oldInstanceTemplate;
-  }
-  public function setPolicy(Google_Service_Replicapoolupdater_RollingUpdatePolicy $policy)
-  {
-    $this->policy = $policy;
-  }
-  public function getPolicy()
-  {
-    return $this->policy;
-  }
-  public function setProgress($progress)
-  {
-    $this->progress = $progress;
-  }
-  public function getProgress()
-  {
-    return $this->progress;
-  }
-  public function setSelfLink($selfLink)
-  {
-    $this->selfLink = $selfLink;
-  }
-  public function getSelfLink()
-  {
-    return $this->selfLink;
-  }
-  public function setStatus($status)
-  {
-    $this->status = $status;
-  }
-  public function getStatus()
-  {
-    return $this->status;
-  }
-  public function setStatusMessage($statusMessage)
-  {
-    $this->statusMessage = $statusMessage;
-  }
-  public function getStatusMessage()
-  {
-    return $this->statusMessage;
-  }
-  public function setUser($user)
-  {
-    $this->user = $user;
-  }
-  public function getUser()
-  {
-    return $this->user;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Replicapoolupdater/RollingUpdateError.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Replicapoolupdater/RollingUpdateError.php
deleted file mode 100644
index 9138b3ca..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Replicapoolupdater/RollingUpdateError.php
+++ /dev/null
@@ -1,32 +0,0 @@
-errors = $errors;
-  }
-  public function getErrors()
-  {
-    return $this->errors;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Replicapoolupdater/RollingUpdateErrorErrors.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Replicapoolupdater/RollingUpdateErrorErrors.php
deleted file mode 100644
index 7763a026..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Replicapoolupdater/RollingUpdateErrorErrors.php
+++ /dev/null
@@ -1,48 +0,0 @@
-code = $code;
-  }
-  public function getCode()
-  {
-    return $this->code;
-  }
-  public function setLocation($location)
-  {
-    $this->location = $location;
-  }
-  public function getLocation()
-  {
-    return $this->location;
-  }
-  public function setMessage($message)
-  {
-    $this->message = $message;
-  }
-  public function getMessage()
-  {
-    return $this->message;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Replicapoolupdater/RollingUpdateList.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Replicapoolupdater/RollingUpdateList.php
deleted file mode 100644
index e16cb6d7..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Replicapoolupdater/RollingUpdateList.php
+++ /dev/null
@@ -1,59 +0,0 @@
-items = $items;
-  }
-  public function getItems()
-  {
-    return $this->items;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setNextPageToken($nextPageToken)
-  {
-    $this->nextPageToken = $nextPageToken;
-  }
-  public function getNextPageToken()
-  {
-    return $this->nextPageToken;
-  }
-  public function setSelfLink($selfLink)
-  {
-    $this->selfLink = $selfLink;
-  }
-  public function getSelfLink()
-  {
-    return $this->selfLink;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Replicapoolupdater/RollingUpdatePolicy.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Replicapoolupdater/RollingUpdatePolicy.php
deleted file mode 100644
index 257cd67d..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Replicapoolupdater/RollingUpdatePolicy.php
+++ /dev/null
@@ -1,66 +0,0 @@
-autoPauseAfterInstances = $autoPauseAfterInstances;
-  }
-  public function getAutoPauseAfterInstances()
-  {
-    return $this->autoPauseAfterInstances;
-  }
-  public function setInstanceStartupTimeoutSec($instanceStartupTimeoutSec)
-  {
-    $this->instanceStartupTimeoutSec = $instanceStartupTimeoutSec;
-  }
-  public function getInstanceStartupTimeoutSec()
-  {
-    return $this->instanceStartupTimeoutSec;
-  }
-  public function setMaxNumConcurrentInstances($maxNumConcurrentInstances)
-  {
-    $this->maxNumConcurrentInstances = $maxNumConcurrentInstances;
-  }
-  public function getMaxNumConcurrentInstances()
-  {
-    return $this->maxNumConcurrentInstances;
-  }
-  public function setMaxNumFailedInstances($maxNumFailedInstances)
-  {
-    $this->maxNumFailedInstances = $maxNumFailedInstances;
-  }
-  public function getMaxNumFailedInstances()
-  {
-    return $this->maxNumFailedInstances;
-  }
-  public function setMinInstanceUpdateTimeSec($minInstanceUpdateTimeSec)
-  {
-    $this->minInstanceUpdateTimeSec = $minInstanceUpdateTimeSec;
-  }
-  public function getMinInstanceUpdateTimeSec()
-  {
-    return $this->minInstanceUpdateTimeSec;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Reports.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Reports.php
deleted file mode 100644
index f068d386..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Reports.php
+++ /dev/null
@@ -1,255 +0,0 @@
-
- * Fetches reports for the administrators of Google Apps customers about the
- * usage, collaboration, security, and risk for their users.

- *
- * 

- * For more information about this service, see the API
- * Documentation
- * 

- *
- * @author Google, Inc.
- */
-class Google_Service_Reports extends Google_Service
-{
-  /** View audit reports for your G Suite domain. */
-  const ADMIN_REPORTS_AUDIT_READONLY =
-      "https://www.googleapis.com/auth/admin.reports.audit.readonly";
-  /** View usage reports for your G Suite domain. */
-  const ADMIN_REPORTS_USAGE_READONLY =
-      "https://www.googleapis.com/auth/admin.reports.usage.readonly";
-
-  public $activities;
-  public $channels;
-  public $customerUsageReports;
-  public $userUsageReport;
-  
-  /**
-   * Constructs the internal representation of the Reports service.
-   *
-   * @param Google_Client $client
-   */
-  public function __construct(Google_Client $client)
-  {
-    parent::__construct($client);
-    $this->rootUrl = 'https://www.googleapis.com/';
-    $this->servicePath = 'admin/reports/v1/';
-    $this->version = 'reports_v1';
-    $this->serviceName = 'admin';
-
-    $this->activities = new Google_Service_Reports_Resource_Activities(
-        $this,
-        $this->serviceName,
-        'activities',
-        array(
-          'methods' => array(
-            'list' => array(
-              'path' => 'activity/users/{userKey}/applications/{applicationName}',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'userKey' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'applicationName' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'actorIpAddress' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'customerId' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'endTime' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'eventName' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'filters' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'maxResults' => array(
-                  'location' => 'query',
-                  'type' => 'integer',
-                ),
-                'pageToken' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'startTime' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-              ),
-            ),'watch' => array(
-              'path' => 'activity/users/{userKey}/applications/{applicationName}/watch',
-              'httpMethod' => 'POST',
-              'parameters' => array(
-                'userKey' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'applicationName' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'actorIpAddress' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'customerId' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'endTime' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'eventName' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'filters' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'maxResults' => array(
-                  'location' => 'query',
-                  'type' => 'integer',
-                ),
-                'pageToken' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'startTime' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-              ),
-            ),
-          )
-        )
-    );
-    $this->channels = new Google_Service_Reports_Resource_Channels(
-        $this,
-        $this->serviceName,
-        'channels',
-        array(
-          'methods' => array(
-            'stop' => array(
-              'path' => '/admin/reports_v1/channels/stop',
-              'httpMethod' => 'POST',
-              'parameters' => array(),
-            ),
-          )
-        )
-    );
-    $this->customerUsageReports = new Google_Service_Reports_Resource_CustomerUsageReports(
-        $this,
-        $this->serviceName,
-        'customerUsageReports',
-        array(
-          'methods' => array(
-            'get' => array(
-              'path' => 'usage/dates/{date}',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'date' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'customerId' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'pageToken' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'parameters' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-              ),
-            ),
-          )
-        )
-    );
-    $this->userUsageReport = new Google_Service_Reports_Resource_UserUsageReport(
-        $this,
-        $this->serviceName,
-        'userUsageReport',
-        array(
-          'methods' => array(
-            'get' => array(
-              'path' => 'usage/users/{userKey}/dates/{date}',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'userKey' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'date' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'customerId' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'filters' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'maxResults' => array(
-                  'location' => 'query',
-                  'type' => 'integer',
-                ),
-                'pageToken' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'parameters' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-              ),
-            ),
-          )
-        )
-    );
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Reports/Activities.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Reports/Activities.php
deleted file mode 100644
index fd2ec9f0..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Reports/Activities.php
+++ /dev/null
@@ -1,59 +0,0 @@
-etag = $etag;
-  }
-  public function getEtag()
-  {
-    return $this->etag;
-  }
-  public function setItems($items)
-  {
-    $this->items = $items;
-  }
-  public function getItems()
-  {
-    return $this->items;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setNextPageToken($nextPageToken)
-  {
-    $this->nextPageToken = $nextPageToken;
-  }
-  public function getNextPageToken()
-  {
-    return $this->nextPageToken;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Reports/Activity.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Reports/Activity.php
deleted file mode 100644
index 608bc02d..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Reports/Activity.php
+++ /dev/null
@@ -1,88 +0,0 @@
-actor = $actor;
-  }
-  public function getActor()
-  {
-    return $this->actor;
-  }
-  public function setEtag($etag)
-  {
-    $this->etag = $etag;
-  }
-  public function getEtag()
-  {
-    return $this->etag;
-  }
-  public function setEvents($events)
-  {
-    $this->events = $events;
-  }
-  public function getEvents()
-  {
-    return $this->events;
-  }
-  public function setId(Google_Service_Reports_ActivityId $id)
-  {
-    $this->id = $id;
-  }
-  public function getId()
-  {
-    return $this->id;
-  }
-  public function setIpAddress($ipAddress)
-  {
-    $this->ipAddress = $ipAddress;
-  }
-  public function getIpAddress()
-  {
-    return $this->ipAddress;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setOwnerDomain($ownerDomain)
-  {
-    $this->ownerDomain = $ownerDomain;
-  }
-  public function getOwnerDomain()
-  {
-    return $this->ownerDomain;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Reports/ActivityActor.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Reports/ActivityActor.php
deleted file mode 100644
index 311fc13f..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Reports/ActivityActor.php
+++ /dev/null
@@ -1,57 +0,0 @@
-callerType = $callerType;
-  }
-  public function getCallerType()
-  {
-    return $this->callerType;
-  }
-  public function setEmail($email)
-  {
-    $this->email = $email;
-  }
-  public function getEmail()
-  {
-    return $this->email;
-  }
-  public function setKey($key)
-  {
-    $this->key = $key;
-  }
-  public function getKey()
-  {
-    return $this->key;
-  }
-  public function setProfileId($profileId)
-  {
-    $this->profileId = $profileId;
-  }
-  public function getProfileId()
-  {
-    return $this->profileId;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Reports/ActivityEvents.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Reports/ActivityEvents.php
deleted file mode 100644
index 93e9be92..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Reports/ActivityEvents.php
+++ /dev/null
@@ -1,50 +0,0 @@
-name = $name;
-  }
-  public function getName()
-  {
-    return $this->name;
-  }
-  public function setParameters($parameters)
-  {
-    $this->parameters = $parameters;
-  }
-  public function getParameters()
-  {
-    return $this->parameters;
-  }
-  public function setType($type)
-  {
-    $this->type = $type;
-  }
-  public function getType()
-  {
-    return $this->type;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Reports/ActivityEventsParameters.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Reports/ActivityEventsParameters.php
deleted file mode 100644
index 33ff073f..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Reports/ActivityEventsParameters.php
+++ /dev/null
@@ -1,76 +0,0 @@
-boolValue = $boolValue;
-  }
-  public function getBoolValue()
-  {
-    return $this->boolValue;
-  }
-  public function setIntValue($intValue)
-  {
-    $this->intValue = $intValue;
-  }
-  public function getIntValue()
-  {
-    return $this->intValue;
-  }
-  public function setMultiIntValue($multiIntValue)
-  {
-    $this->multiIntValue = $multiIntValue;
-  }
-  public function getMultiIntValue()
-  {
-    return $this->multiIntValue;
-  }
-  public function setMultiValue($multiValue)
-  {
-    $this->multiValue = $multiValue;
-  }
-  public function getMultiValue()
-  {
-    return $this->multiValue;
-  }
-  public function setName($name)
-  {
-    $this->name = $name;
-  }
-  public function getName()
-  {
-    return $this->name;
-  }
-  public function setValue($value)
-  {
-    $this->value = $value;
-  }
-  public function getValue()
-  {
-    return $this->value;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Reports/ActivityId.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Reports/ActivityId.php
deleted file mode 100644
index 5db0ed64..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Reports/ActivityId.php
+++ /dev/null
@@ -1,57 +0,0 @@
-applicationName = $applicationName;
-  }
-  public function getApplicationName()
-  {
-    return $this->applicationName;
-  }
-  public function setCustomerId($customerId)
-  {
-    $this->customerId = $customerId;
-  }
-  public function getCustomerId()
-  {
-    return $this->customerId;
-  }
-  public function setTime($time)
-  {
-    $this->time = $time;
-  }
-  public function getTime()
-  {
-    return $this->time;
-  }
-  public function setUniqueQualifier($uniqueQualifier)
-  {
-    $this->uniqueQualifier = $uniqueQualifier;
-  }
-  public function getUniqueQualifier()
-  {
-    return $this->uniqueQualifier;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Reports/Channel.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Reports/Channel.php
deleted file mode 100644
index 96c0702e..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Reports/Channel.php
+++ /dev/null
@@ -1,111 +0,0 @@
-address = $address;
-  }
-  public function getAddress()
-  {
-    return $this->address;
-  }
-  public function setExpiration($expiration)
-  {
-    $this->expiration = $expiration;
-  }
-  public function getExpiration()
-  {
-    return $this->expiration;
-  }
-  public function setId($id)
-  {
-    $this->id = $id;
-  }
-  public function getId()
-  {
-    return $this->id;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setParams($params)
-  {
-    $this->params = $params;
-  }
-  public function getParams()
-  {
-    return $this->params;
-  }
-  public function setPayload($payload)
-  {
-    $this->payload = $payload;
-  }
-  public function getPayload()
-  {
-    return $this->payload;
-  }
-  public function setResourceId($resourceId)
-  {
-    $this->resourceId = $resourceId;
-  }
-  public function getResourceId()
-  {
-    return $this->resourceId;
-  }
-  public function setResourceUri($resourceUri)
-  {
-    $this->resourceUri = $resourceUri;
-  }
-  public function getResourceUri()
-  {
-    return $this->resourceUri;
-  }
-  public function setToken($token)
-  {
-    $this->token = $token;
-  }
-  public function getToken()
-  {
-    return $this->token;
-  }
-  public function setType($type)
-  {
-    $this->type = $type;
-  }
-  public function getType()
-  {
-    return $this->type;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Reports/Resource/Activities.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Reports/Resource/Activities.php
deleted file mode 100644
index f87b1e4b..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Reports/Resource/Activities.php
+++ /dev/null
@@ -1,94 +0,0 @@
-
- *   $adminService = new Google_Service_Reports(...);
- *   $activities = $adminService->activities;
- *  
- */
-class Google_Service_Reports_Resource_Activities extends Google_Service_Resource
-{
-  /**
-   * Retrieves a list of activities for a specific customer and application.
-   * (activities.listActivities)
-   *
-   * @param string $userKey Represents the profile id or the user email for which
-   * the data should be filtered. When 'all' is specified as the userKey, it
-   * returns usageReports for all users.
-   * @param string $applicationName Application name for which the events are to
-   * be retrieved.
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param string actorIpAddress IP Address of host where the event was
-   * performed. Supports both IPv4 and IPv6 addresses.
-   * @opt_param string customerId Represents the customer for which the data is to
-   * be fetched.
-   * @opt_param string endTime Return events which occured at or before this time.
-   * @opt_param string eventName Name of the event being queried.
-   * @opt_param string filters Event parameters in the form [parameter1
-   * name][operator][parameter1 value],[parameter2 name][operator][parameter2
-   * value],...
-   * @opt_param int maxResults Number of activity records to be shown in each
-   * page.
-   * @opt_param string pageToken Token to specify next page.
-   * @opt_param string startTime Return events which occured at or after this
-   * time.
-   * @return Google_Service_Reports_Activities
-   */
-  public function listActivities($userKey, $applicationName, $optParams = array())
-  {
-    $params = array('userKey' => $userKey, 'applicationName' => $applicationName);
-    $params = array_merge($params, $optParams);
-    return $this->call('list', array($params), "Google_Service_Reports_Activities");
-  }
-  /**
-   * Push changes to activities (activities.watch)
-   *
-   * @param string $userKey Represents the profile id or the user email for which
-   * the data should be filtered. When 'all' is specified as the userKey, it
-   * returns usageReports for all users.
-   * @param string $applicationName Application name for which the events are to
-   * be retrieved.
-   * @param Google_Service_Reports_Channel $postBody
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param string actorIpAddress IP Address of host where the event was
-   * performed. Supports both IPv4 and IPv6 addresses.
-   * @opt_param string customerId Represents the customer for which the data is to
-   * be fetched.
-   * @opt_param string endTime Return events which occured at or before this time.
-   * @opt_param string eventName Name of the event being queried.
-   * @opt_param string filters Event parameters in the form [parameter1
-   * name][operator][parameter1 value],[parameter2 name][operator][parameter2
-   * value],...
-   * @opt_param int maxResults Number of activity records to be shown in each
-   * page.
-   * @opt_param string pageToken Token to specify next page.
-   * @opt_param string startTime Return events which occured at or after this
-   * time.
-   * @return Google_Service_Reports_Channel
-   */
-  public function watch($userKey, $applicationName, Google_Service_Reports_Channel $postBody, $optParams = array())
-  {
-    $params = array('userKey' => $userKey, 'applicationName' => $applicationName, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('watch', array($params), "Google_Service_Reports_Channel");
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Reports/Resource/Channels.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Reports/Resource/Channels.php
deleted file mode 100644
index 819cb561..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Reports/Resource/Channels.php
+++ /dev/null
@@ -1,40 +0,0 @@
-
- *   $adminService = new Google_Service_Reports(...);
- *   $channels = $adminService->channels;
- *  
- */
-class Google_Service_Reports_Resource_Channels extends Google_Service_Resource
-{
-  /**
-   * Stop watching resources through this channel (channels.stop)
-   *
-   * @param Google_Service_Reports_Channel $postBody
-   * @param array $optParams Optional parameters.
-   */
-  public function stop(Google_Service_Reports_Channel $postBody, $optParams = array())
-  {
-    $params = array('postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('stop', array($params));
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Reports/Resource/CustomerUsageReports.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Reports/Resource/CustomerUsageReports.php
deleted file mode 100644
index f8b8959d..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Reports/Resource/CustomerUsageReports.php
+++ /dev/null
@@ -1,49 +0,0 @@
-
- *   $adminService = new Google_Service_Reports(...);
- *   $customerUsageReports = $adminService->customerUsageReports;
- *  
- */
-class Google_Service_Reports_Resource_CustomerUsageReports extends Google_Service_Resource
-{
-  /**
-   * Retrieves a report which is a collection of properties / statistics for a
-   * specific customer. (customerUsageReports.get)
-   *
-   * @param string $date Represents the date in yyyy-mm-dd format for which the
-   * data is to be fetched.
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param string customerId Represents the customer for which the data is to
-   * be fetched.
-   * @opt_param string pageToken Token to specify next page.
-   * @opt_param string parameters Represents the application name, parameter name
-   * pairs to fetch in csv as app_name1:param_name1, app_name2:param_name2.
-   * @return Google_Service_Reports_UsageReports
-   */
-  public function get($date, $optParams = array())
-  {
-    $params = array('date' => $date);
-    $params = array_merge($params, $optParams);
-    return $this->call('get', array($params), "Google_Service_Reports_UsageReports");
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Reports/Resource/UserUsageReport.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Reports/Resource/UserUsageReport.php
deleted file mode 100644
index 1ec4ab96..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Reports/Resource/UserUsageReport.php
+++ /dev/null
@@ -1,55 +0,0 @@
-
- *   $adminService = new Google_Service_Reports(...);
- *   $userUsageReport = $adminService->userUsageReport;
- *  
- */
-class Google_Service_Reports_Resource_UserUsageReport extends Google_Service_Resource
-{
-  /**
-   * Retrieves a report which is a collection of properties / statistics for a set
-   * of users. (userUsageReport.get)
-   *
-   * @param string $userKey Represents the profile id or the user email for which
-   * the data should be filtered.
-   * @param string $date Represents the date in yyyy-mm-dd format for which the
-   * data is to be fetched.
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param string customerId Represents the customer for which the data is to
-   * be fetched.
-   * @opt_param string filters Represents the set of filters including parameter
-   * operator value.
-   * @opt_param string maxResults Maximum number of results to return. Maximum
-   * allowed is 1000
-   * @opt_param string pageToken Token to specify next page.
-   * @opt_param string parameters Represents the application name, parameter name
-   * pairs to fetch in csv as app_name1:param_name1, app_name2:param_name2.
-   * @return Google_Service_Reports_UsageReports
-   */
-  public function get($userKey, $date, $optParams = array())
-  {
-    $params = array('userKey' => $userKey, 'date' => $date);
-    $params = array_merge($params, $optParams);
-    return $this->call('get', array($params), "Google_Service_Reports_UsageReports");
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Reports/UsageReport.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Reports/UsageReport.php
deleted file mode 100644
index 69971b6d..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Reports/UsageReport.php
+++ /dev/null
@@ -1,69 +0,0 @@
-date = $date;
-  }
-  public function getDate()
-  {
-    return $this->date;
-  }
-  public function setEntity(Google_Service_Reports_UsageReportEntity $entity)
-  {
-    $this->entity = $entity;
-  }
-  public function getEntity()
-  {
-    return $this->entity;
-  }
-  public function setEtag($etag)
-  {
-    $this->etag = $etag;
-  }
-  public function getEtag()
-  {
-    return $this->etag;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setParameters($parameters)
-  {
-    $this->parameters = $parameters;
-  }
-  public function getParameters()
-  {
-    return $this->parameters;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Reports/UsageReportEntity.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Reports/UsageReportEntity.php
deleted file mode 100644
index ee9299cb..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Reports/UsageReportEntity.php
+++ /dev/null
@@ -1,57 +0,0 @@
-customerId = $customerId;
-  }
-  public function getCustomerId()
-  {
-    return $this->customerId;
-  }
-  public function setProfileId($profileId)
-  {
-    $this->profileId = $profileId;
-  }
-  public function getProfileId()
-  {
-    return $this->profileId;
-  }
-  public function setType($type)
-  {
-    $this->type = $type;
-  }
-  public function getType()
-  {
-    return $this->type;
-  }
-  public function setUserEmail($userEmail)
-  {
-    $this->userEmail = $userEmail;
-  }
-  public function getUserEmail()
-  {
-    return $this->userEmail;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Reports/UsageReportParameters.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Reports/UsageReportParameters.php
deleted file mode 100644
index 81b85c15..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Reports/UsageReportParameters.php
+++ /dev/null
@@ -1,76 +0,0 @@
-boolValue = $boolValue;
-  }
-  public function getBoolValue()
-  {
-    return $this->boolValue;
-  }
-  public function setDatetimeValue($datetimeValue)
-  {
-    $this->datetimeValue = $datetimeValue;
-  }
-  public function getDatetimeValue()
-  {
-    return $this->datetimeValue;
-  }
-  public function setIntValue($intValue)
-  {
-    $this->intValue = $intValue;
-  }
-  public function getIntValue()
-  {
-    return $this->intValue;
-  }
-  public function setMsgValue($msgValue)
-  {
-    $this->msgValue = $msgValue;
-  }
-  public function getMsgValue()
-  {
-    return $this->msgValue;
-  }
-  public function setName($name)
-  {
-    $this->name = $name;
-  }
-  public function getName()
-  {
-    return $this->name;
-  }
-  public function setStringValue($stringValue)
-  {
-    $this->stringValue = $stringValue;
-  }
-  public function getStringValue()
-  {
-    return $this->stringValue;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Reports/UsageReports.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Reports/UsageReports.php
deleted file mode 100644
index bd19a0c8..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Reports/UsageReports.php
+++ /dev/null
@@ -1,69 +0,0 @@
-etag = $etag;
-  }
-  public function getEtag()
-  {
-    return $this->etag;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setNextPageToken($nextPageToken)
-  {
-    $this->nextPageToken = $nextPageToken;
-  }
-  public function getNextPageToken()
-  {
-    return $this->nextPageToken;
-  }
-  public function setUsageReports($usageReports)
-  {
-    $this->usageReports = $usageReports;
-  }
-  public function getUsageReports()
-  {
-    return $this->usageReports;
-  }
-  public function setWarnings($warnings)
-  {
-    $this->warnings = $warnings;
-  }
-  public function getWarnings()
-  {
-    return $this->warnings;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Reports/UsageReportsWarnings.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Reports/UsageReportsWarnings.php
deleted file mode 100644
index 397f357a..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Reports/UsageReportsWarnings.php
+++ /dev/null
@@ -1,50 +0,0 @@
-code = $code;
-  }
-  public function getCode()
-  {
-    return $this->code;
-  }
-  public function setData($data)
-  {
-    $this->data = $data;
-  }
-  public function getData()
-  {
-    return $this->data;
-  }
-  public function setMessage($message)
-  {
-    $this->message = $message;
-  }
-  public function getMessage()
-  {
-    return $this->message;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Reports/UsageReportsWarningsData.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Reports/UsageReportsWarningsData.php
deleted file mode 100644
index 2db80258..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Reports/UsageReportsWarningsData.php
+++ /dev/null
@@ -1,39 +0,0 @@
-key = $key;
-  }
-  public function getKey()
-  {
-    return $this->key;
-  }
-  public function setValue($value)
-  {
-    $this->value = $value;
-  }
-  public function getValue()
-  {
-    return $this->value;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Reseller.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Reseller.php
deleted file mode 100644
index 66a94051..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Reseller.php
+++ /dev/null
@@ -1,313 +0,0 @@
-
- * Creates and manages your customers and their subscriptions.

- *
- * 

- * For more information about this service, see the API
- * Documentation
- * 

- *
- * @author Google, Inc.
- */
-class Google_Service_Reseller extends Google_Service
-{
-  /** Manage users on your domain. */
-  const APPS_ORDER =
-      "https://www.googleapis.com/auth/apps.order";
-  /** Manage users on your domain. */
-  const APPS_ORDER_READONLY =
-      "https://www.googleapis.com/auth/apps.order.readonly";
-
-  public $customers;
-  public $resellernotify;
-  public $subscriptions;
-  
-  /**
-   * Constructs the internal representation of the Reseller service.
-   *
-   * @param Google_Client $client
-   */
-  public function __construct(Google_Client $client)
-  {
-    parent::__construct($client);
-    $this->rootUrl = 'https://www.googleapis.com/';
-    $this->servicePath = 'apps/reseller/v1/';
-    $this->version = 'v1';
-    $this->serviceName = 'reseller';
-
-    $this->customers = new Google_Service_Reseller_Resource_Customers(
-        $this,
-        $this->serviceName,
-        'customers',
-        array(
-          'methods' => array(
-            'get' => array(
-              'path' => 'customers/{customerId}',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'customerId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'insert' => array(
-              'path' => 'customers',
-              'httpMethod' => 'POST',
-              'parameters' => array(
-                'customerAuthToken' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-              ),
-            ),'patch' => array(
-              'path' => 'customers/{customerId}',
-              'httpMethod' => 'PATCH',
-              'parameters' => array(
-                'customerId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'update' => array(
-              'path' => 'customers/{customerId}',
-              'httpMethod' => 'PUT',
-              'parameters' => array(
-                'customerId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),
-          )
-        )
-    );
-    $this->resellernotify = new Google_Service_Reseller_Resource_Resellernotify(
-        $this,
-        $this->serviceName,
-        'resellernotify',
-        array(
-          'methods' => array(
-            'getwatchdetails' => array(
-              'path' => 'resellernotify/getwatchdetails',
-              'httpMethod' => 'GET',
-              'parameters' => array(),
-            ),'register' => array(
-              'path' => 'resellernotify/register',
-              'httpMethod' => 'POST',
-              'parameters' => array(
-                'serviceAccountEmailAddress' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-              ),
-            ),'unregister' => array(
-              'path' => 'resellernotify/unregister',
-              'httpMethod' => 'POST',
-              'parameters' => array(
-                'serviceAccountEmailAddress' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-              ),
-            ),
-          )
-        )
-    );
-    $this->subscriptions = new Google_Service_Reseller_Resource_Subscriptions(
-        $this,
-        $this->serviceName,
-        'subscriptions',
-        array(
-          'methods' => array(
-            'activate' => array(
-              'path' => 'customers/{customerId}/subscriptions/{subscriptionId}/activate',
-              'httpMethod' => 'POST',
-              'parameters' => array(
-                'customerId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'subscriptionId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'changePlan' => array(
-              'path' => 'customers/{customerId}/subscriptions/{subscriptionId}/changePlan',
-              'httpMethod' => 'POST',
-              'parameters' => array(
-                'customerId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'subscriptionId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'changeRenewalSettings' => array(
-              'path' => 'customers/{customerId}/subscriptions/{subscriptionId}/changeRenewalSettings',
-              'httpMethod' => 'POST',
-              'parameters' => array(
-                'customerId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'subscriptionId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'changeSeats' => array(
-              'path' => 'customers/{customerId}/subscriptions/{subscriptionId}/changeSeats',
-              'httpMethod' => 'POST',
-              'parameters' => array(
-                'customerId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'subscriptionId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'delete' => array(
-              'path' => 'customers/{customerId}/subscriptions/{subscriptionId}',
-              'httpMethod' => 'DELETE',
-              'parameters' => array(
-                'customerId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'subscriptionId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'deletionType' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'get' => array(
-              'path' => 'customers/{customerId}/subscriptions/{subscriptionId}',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'customerId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'subscriptionId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'insert' => array(
-              'path' => 'customers/{customerId}/subscriptions',
-              'httpMethod' => 'POST',
-              'parameters' => array(
-                'customerId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'customerAuthToken' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-              ),
-            ),'list' => array(
-              'path' => 'subscriptions',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'customerAuthToken' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'customerId' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'customerNamePrefix' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'maxResults' => array(
-                  'location' => 'query',
-                  'type' => 'integer',
-                ),
-                'pageToken' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-              ),
-            ),'startPaidService' => array(
-              'path' => 'customers/{customerId}/subscriptions/{subscriptionId}/startPaidService',
-              'httpMethod' => 'POST',
-              'parameters' => array(
-                'customerId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'subscriptionId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'suspend' => array(
-              'path' => 'customers/{customerId}/subscriptions/{subscriptionId}/suspend',
-              'httpMethod' => 'POST',
-              'parameters' => array(
-                'customerId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'subscriptionId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),
-          )
-        )
-    );
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Reseller/Address.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Reseller/Address.php
deleted file mode 100644
index 47d9a7d8..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Reseller/Address.php
+++ /dev/null
@@ -1,111 +0,0 @@
-addressLine1 = $addressLine1;
-  }
-  public function getAddressLine1()
-  {
-    return $this->addressLine1;
-  }
-  public function setAddressLine2($addressLine2)
-  {
-    $this->addressLine2 = $addressLine2;
-  }
-  public function getAddressLine2()
-  {
-    return $this->addressLine2;
-  }
-  public function setAddressLine3($addressLine3)
-  {
-    $this->addressLine3 = $addressLine3;
-  }
-  public function getAddressLine3()
-  {
-    return $this->addressLine3;
-  }
-  public function setContactName($contactName)
-  {
-    $this->contactName = $contactName;
-  }
-  public function getContactName()
-  {
-    return $this->contactName;
-  }
-  public function setCountryCode($countryCode)
-  {
-    $this->countryCode = $countryCode;
-  }
-  public function getCountryCode()
-  {
-    return $this->countryCode;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setLocality($locality)
-  {
-    $this->locality = $locality;
-  }
-  public function getLocality()
-  {
-    return $this->locality;
-  }
-  public function setOrganizationName($organizationName)
-  {
-    $this->organizationName = $organizationName;
-  }
-  public function getOrganizationName()
-  {
-    return $this->organizationName;
-  }
-  public function setPostalCode($postalCode)
-  {
-    $this->postalCode = $postalCode;
-  }
-  public function getPostalCode()
-  {
-    return $this->postalCode;
-  }
-  public function setRegion($region)
-  {
-    $this->region = $region;
-  }
-  public function getRegion()
-  {
-    return $this->region;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Reseller/ChangePlanRequest.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Reseller/ChangePlanRequest.php
deleted file mode 100644
index f757f0ba..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Reseller/ChangePlanRequest.php
+++ /dev/null
@@ -1,67 +0,0 @@
-dealCode = $dealCode;
-  }
-  public function getDealCode()
-  {
-    return $this->dealCode;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setPlanName($planName)
-  {
-    $this->planName = $planName;
-  }
-  public function getPlanName()
-  {
-    return $this->planName;
-  }
-  public function setPurchaseOrderId($purchaseOrderId)
-  {
-    $this->purchaseOrderId = $purchaseOrderId;
-  }
-  public function getPurchaseOrderId()
-  {
-    return $this->purchaseOrderId;
-  }
-  public function setSeats(Google_Service_Reseller_Seats $seats)
-  {
-    $this->seats = $seats;
-  }
-  public function getSeats()
-  {
-    return $this->seats;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Reseller/Customer.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Reseller/Customer.php
deleted file mode 100644
index 7328be2d..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Reseller/Customer.php
+++ /dev/null
@@ -1,94 +0,0 @@
-alternateEmail = $alternateEmail;
-  }
-  public function getAlternateEmail()
-  {
-    return $this->alternateEmail;
-  }
-  public function setCustomerDomain($customerDomain)
-  {
-    $this->customerDomain = $customerDomain;
-  }
-  public function getCustomerDomain()
-  {
-    return $this->customerDomain;
-  }
-  public function setCustomerDomainVerified($customerDomainVerified)
-  {
-    $this->customerDomainVerified = $customerDomainVerified;
-  }
-  public function getCustomerDomainVerified()
-  {
-    return $this->customerDomainVerified;
-  }
-  public function setCustomerId($customerId)
-  {
-    $this->customerId = $customerId;
-  }
-  public function getCustomerId()
-  {
-    return $this->customerId;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setPhoneNumber($phoneNumber)
-  {
-    $this->phoneNumber = $phoneNumber;
-  }
-  public function getPhoneNumber()
-  {
-    return $this->phoneNumber;
-  }
-  public function setPostalAddress(Google_Service_Reseller_Address $postalAddress)
-  {
-    $this->postalAddress = $postalAddress;
-  }
-  public function getPostalAddress()
-  {
-    return $this->postalAddress;
-  }
-  public function setResourceUiUrl($resourceUiUrl)
-  {
-    $this->resourceUiUrl = $resourceUiUrl;
-  }
-  public function getResourceUiUrl()
-  {
-    return $this->resourceUiUrl;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Reseller/RenewalSettings.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Reseller/RenewalSettings.php
deleted file mode 100644
index 2e820233..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Reseller/RenewalSettings.php
+++ /dev/null
@@ -1,39 +0,0 @@
-kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setRenewalType($renewalType)
-  {
-    $this->renewalType = $renewalType;
-  }
-  public function getRenewalType()
-  {
-    return $this->renewalType;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Reseller/ResellernotifyGetwatchdetailsResponse.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Reseller/ResellernotifyGetwatchdetailsResponse.php
deleted file mode 100644
index d617842e..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Reseller/ResellernotifyGetwatchdetailsResponse.php
+++ /dev/null
@@ -1,40 +0,0 @@
-serviceAccountEmailAddresses = $serviceAccountEmailAddresses;
-  }
-  public function getServiceAccountEmailAddresses()
-  {
-    return $this->serviceAccountEmailAddresses;
-  }
-  public function setTopicName($topicName)
-  {
-    $this->topicName = $topicName;
-  }
-  public function getTopicName()
-  {
-    return $this->topicName;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Reseller/ResellernotifyResource.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Reseller/ResellernotifyResource.php
deleted file mode 100644
index 5124167e..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Reseller/ResellernotifyResource.php
+++ /dev/null
@@ -1,30 +0,0 @@
-topicName = $topicName;
-  }
-  public function getTopicName()
-  {
-    return $this->topicName;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Reseller/Resource/Customers.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Reseller/Resource/Customers.php
deleted file mode 100644
index 2d87a3b4..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Reseller/Resource/Customers.php
+++ /dev/null
@@ -1,99 +0,0 @@
-
- *   $resellerService = new Google_Service_Reseller(...);
- *   $customers = $resellerService->customers;
- *  
- */
-class Google_Service_Reseller_Resource_Customers extends Google_Service_Resource
-{
-  /**
-   * Get a customer account. (customers.get)
-   *
-   * @param string $customerId Either the customer's primary domain name or the
-   * customer's unique identifier. If using the domain name, we do not recommend
-   * using a customerId as a key for persistent data. If the domain name for a
-   * customerId is changed, the Google system automatically updates.
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Reseller_Customer
-   */
-  public function get($customerId, $optParams = array())
-  {
-    $params = array('customerId' => $customerId);
-    $params = array_merge($params, $optParams);
-    return $this->call('get', array($params), "Google_Service_Reseller_Customer");
-  }
-  /**
-   * Order a new customer's account. (customers.insert)
-   *
-   * @param Google_Service_Reseller_Customer $postBody
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param string customerAuthToken The customerAuthToken query string is
-   * required when creating a resold account that transfers a direct customer's
-   * subscription or transfers another reseller customer's subscription to your
-   * reseller management. This is a hexadecimal authentication token needed to
-   * complete the subscription transfer. For more information, see the
-   * administrator help center.
-   * @return Google_Service_Reseller_Customer
-   */
-  public function insert(Google_Service_Reseller_Customer $postBody, $optParams = array())
-  {
-    $params = array('postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('insert', array($params), "Google_Service_Reseller_Customer");
-  }
-  /**
-   * Update a customer account's settings. This method supports patch semantics.
-   * (customers.patch)
-   *
-   * @param string $customerId Either the customer's primary domain name or the
-   * customer's unique identifier. If using the domain name, we do not recommend
-   * using a customerId as a key for persistent data. If the domain name for a
-   * customerId is changed, the Google system automatically updates.
-   * @param Google_Service_Reseller_Customer $postBody
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Reseller_Customer
-   */
-  public function patch($customerId, Google_Service_Reseller_Customer $postBody, $optParams = array())
-  {
-    $params = array('customerId' => $customerId, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('patch', array($params), "Google_Service_Reseller_Customer");
-  }
-  /**
-   * Update a customer account's settings. (customers.update)
-   *
-   * @param string $customerId Either the customer's primary domain name or the
-   * customer's unique identifier. If using the domain name, we do not recommend
-   * using a customerId as a key for persistent data. If the domain name for a
-   * customerId is changed, the Google system automatically updates.
-   * @param Google_Service_Reseller_Customer $postBody
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Reseller_Customer
-   */
-  public function update($customerId, Google_Service_Reseller_Customer $postBody, $optParams = array())
-  {
-    $params = array('customerId' => $customerId, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('update', array($params), "Google_Service_Reseller_Customer");
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Reseller/Resource/Resellernotify.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Reseller/Resource/Resellernotify.php
deleted file mode 100644
index 6bfc10fa..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Reseller/Resource/Resellernotify.php
+++ /dev/null
@@ -1,72 +0,0 @@
-
- *   $resellerService = new Google_Service_Reseller(...);
- *   $resellernotify = $resellerService->resellernotify;
- *  
- */
-class Google_Service_Reseller_Resource_Resellernotify extends Google_Service_Resource
-{
-  /**
-   * Returns all the details of the watch corresponding to the reseller.
-   * (resellernotify.getwatchdetails)
-   *
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Reseller_ResellernotifyGetwatchdetailsResponse
-   */
-  public function getwatchdetails($optParams = array())
-  {
-    $params = array();
-    $params = array_merge($params, $optParams);
-    return $this->call('getwatchdetails', array($params), "Google_Service_Reseller_ResellernotifyGetwatchdetailsResponse");
-  }
-  /**
-   * Registers a Reseller for receiving notifications. (resellernotify.register)
-   *
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param string serviceAccountEmailAddress The service account which will
-   * own the created Cloud-PubSub topic.
-   * @return Google_Service_Reseller_ResellernotifyResource
-   */
-  public function register($optParams = array())
-  {
-    $params = array();
-    $params = array_merge($params, $optParams);
-    return $this->call('register', array($params), "Google_Service_Reseller_ResellernotifyResource");
-  }
-  /**
-   * Unregisters a Reseller for receiving notifications.
-   * (resellernotify.unregister)
-   *
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param string serviceAccountEmailAddress The service account which owns
-   * the Cloud-PubSub topic.
-   * @return Google_Service_Reseller_ResellernotifyResource
-   */
-  public function unregister($optParams = array())
-  {
-    $params = array();
-    $params = array_merge($params, $optParams);
-    return $this->call('unregister', array($params), "Google_Service_Reseller_ResellernotifyResource");
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Reseller/Resource/Subscriptions.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Reseller/Resource/Subscriptions.php
deleted file mode 100644
index 3a8b81fc..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Reseller/Resource/Subscriptions.php
+++ /dev/null
@@ -1,265 +0,0 @@
-
- *   $resellerService = new Google_Service_Reseller(...);
- *   $subscriptions = $resellerService->subscriptions;
- *  
- */
-class Google_Service_Reseller_Resource_Subscriptions extends Google_Service_Resource
-{
-  /**
-   * Activates a subscription previously suspended by the reseller
-   * (subscriptions.activate)
-   *
-   * @param string $customerId Either the customer's primary domain name or the
-   * customer's unique identifier. If using the domain name, we do not recommend
-   * using a customerId as a key for persistent data. If the domain name for a
-   * customerId is changed, the Google system automatically updates.
-   * @param string $subscriptionId This is a required property. The subscriptionId
-   * is the subscription identifier and is unique for each customer. Since a
-   * subscriptionId changes when a subscription is updated, we recommend to not
-   * use this ID as a key for persistent data. And the subscriptionId can be found
-   * using the retrieve all reseller subscriptions method.
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Reseller_Subscription
-   */
-  public function activate($customerId, $subscriptionId, $optParams = array())
-  {
-    $params = array('customerId' => $customerId, 'subscriptionId' => $subscriptionId);
-    $params = array_merge($params, $optParams);
-    return $this->call('activate', array($params), "Google_Service_Reseller_Subscription");
-  }
-  /**
-   * Update a subscription plan. Use this method to update a plan for a 30-day
-   * trial or a flexible plan subscription to an annual commitment plan with
-   * monthly or yearly payments. (subscriptions.changePlan)
-   *
-   * @param string $customerId Either the customer's primary domain name or the
-   * customer's unique identifier. If using the domain name, we do not recommend
-   * using a customerId as a key for persistent data. If the domain name for a
-   * customerId is changed, the Google system automatically updates.
-   * @param string $subscriptionId This is a required property. The subscriptionId
-   * is the subscription identifier and is unique for each customer. Since a
-   * subscriptionId changes when a subscription is updated, we recommend to not
-   * use this ID as a key for persistent data. And the subscriptionId can be found
-   * using the retrieve all reseller subscriptions method.
-   * @param Google_Service_Reseller_ChangePlanRequest $postBody
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Reseller_Subscription
-   */
-  public function changePlan($customerId, $subscriptionId, Google_Service_Reseller_ChangePlanRequest $postBody, $optParams = array())
-  {
-    $params = array('customerId' => $customerId, 'subscriptionId' => $subscriptionId, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('changePlan', array($params), "Google_Service_Reseller_Subscription");
-  }
-  /**
-   * Update a user license's renewal settings. This is applicable for accounts
-   * with annual commitment plans only. (subscriptions.changeRenewalSettings)
-   *
-   * @param string $customerId Either the customer's primary domain name or the
-   * customer's unique identifier. If using the domain name, we do not recommend
-   * using a customerId as a key for persistent data. If the domain name for a
-   * customerId is changed, the Google system automatically updates.
-   * @param string $subscriptionId This is a required property. The subscriptionId
-   * is the subscription identifier and is unique for each customer. Since a
-   * subscriptionId changes when a subscription is updated, we recommend to not
-   * use this ID as a key for persistent data. And the subscriptionId can be found
-   * using the retrieve all reseller subscriptions method.
-   * @param Google_Service_Reseller_RenewalSettings $postBody
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Reseller_Subscription
-   */
-  public function changeRenewalSettings($customerId, $subscriptionId, Google_Service_Reseller_RenewalSettings $postBody, $optParams = array())
-  {
-    $params = array('customerId' => $customerId, 'subscriptionId' => $subscriptionId, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('changeRenewalSettings', array($params), "Google_Service_Reseller_Subscription");
-  }
-  /**
-   * Update a subscription's user license settings. (subscriptions.changeSeats)
-   *
-   * @param string $customerId Either the customer's primary domain name or the
-   * customer's unique identifier. If using the domain name, we do not recommend
-   * using a customerId as a key for persistent data. If the domain name for a
-   * customerId is changed, the Google system automatically updates.
-   * @param string $subscriptionId This is a required property. The subscriptionId
-   * is the subscription identifier and is unique for each customer. Since a
-   * subscriptionId changes when a subscription is updated, we recommend to not
-   * use this ID as a key for persistent data. And the subscriptionId can be found
-   * using the retrieve all reseller subscriptions method.
-   * @param Google_Service_Reseller_Seats $postBody
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Reseller_Subscription
-   */
-  public function changeSeats($customerId, $subscriptionId, Google_Service_Reseller_Seats $postBody, $optParams = array())
-  {
-    $params = array('customerId' => $customerId, 'subscriptionId' => $subscriptionId, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('changeSeats', array($params), "Google_Service_Reseller_Subscription");
-  }
-  /**
-   * Cancel, suspend or transfer a subscription to direct. (subscriptions.delete)
-   *
-   * @param string $customerId Either the customer's primary domain name or the
-   * customer's unique identifier. If using the domain name, we do not recommend
-   * using a customerId as a key for persistent data. If the domain name for a
-   * customerId is changed, the Google system automatically updates.
-   * @param string $subscriptionId This is a required property. The subscriptionId
-   * is the subscription identifier and is unique for each customer. Since a
-   * subscriptionId changes when a subscription is updated, we recommend to not
-   * use this ID as a key for persistent data. And the subscriptionId can be found
-   * using the retrieve all reseller subscriptions method.
-   * @param string $deletionType The deletionType query string enables the
-   * cancellation, downgrade, or suspension of a subscription.
-   * @param array $optParams Optional parameters.
-   */
-  public function delete($customerId, $subscriptionId, $deletionType, $optParams = array())
-  {
-    $params = array('customerId' => $customerId, 'subscriptionId' => $subscriptionId, 'deletionType' => $deletionType);
-    $params = array_merge($params, $optParams);
-    return $this->call('delete', array($params));
-  }
-  /**
-   * Get a specific subscription. (subscriptions.get)
-   *
-   * @param string $customerId Either the customer's primary domain name or the
-   * customer's unique identifier. If using the domain name, we do not recommend
-   * using a customerId as a key for persistent data. If the domain name for a
-   * customerId is changed, the Google system automatically updates.
-   * @param string $subscriptionId This is a required property. The subscriptionId
-   * is the subscription identifier and is unique for each customer. Since a
-   * subscriptionId changes when a subscription is updated, we recommend to not
-   * use this ID as a key for persistent data. And the subscriptionId can be found
-   * using the retrieve all reseller subscriptions method.
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Reseller_Subscription
-   */
-  public function get($customerId, $subscriptionId, $optParams = array())
-  {
-    $params = array('customerId' => $customerId, 'subscriptionId' => $subscriptionId);
-    $params = array_merge($params, $optParams);
-    return $this->call('get', array($params), "Google_Service_Reseller_Subscription");
-  }
-  /**
-   * Create or transfer a subscription. (subscriptions.insert)
-   *
-   * @param string $customerId Either the customer's primary domain name or the
-   * customer's unique identifier. If using the domain name, we do not recommend
-   * using a customerId as a key for persistent data. If the domain name for a
-   * customerId is changed, the Google system automatically updates.
-   * @param Google_Service_Reseller_Subscription $postBody
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param string customerAuthToken The customerAuthToken query string is
-   * required when creating a resold account that transfers a direct customer's
-   * subscription or transfers another reseller customer's subscription to your
-   * reseller management. This is a hexadecimal authentication token needed to
-   * complete the subscription transfer. For more information, see the
-   * administrator help center.
-   * @return Google_Service_Reseller_Subscription
-   */
-  public function insert($customerId, Google_Service_Reseller_Subscription $postBody, $optParams = array())
-  {
-    $params = array('customerId' => $customerId, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('insert', array($params), "Google_Service_Reseller_Subscription");
-  }
-  /**
-   * List of subscriptions managed by the reseller. The list can be all
-   * subscriptions, all of a customer's subscriptions, or all of a customer's
-   * transferable subscriptions. (subscriptions.listSubscriptions)
-   *
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param string customerAuthToken The customerAuthToken query string is
-   * required when creating a resold account that transfers a direct customer's
-   * subscription or transfers another reseller customer's subscription to your
-   * reseller management. This is a hexadecimal authentication token needed to
-   * complete the subscription transfer. For more information, see the
-   * administrator help center.
-   * @opt_param string customerId Either the customer's primary domain name or the
-   * customer's unique identifier. If using the domain name, we do not recommend
-   * using a customerId as a key for persistent data. If the domain name for a
-   * customerId is changed, the Google system automatically updates.
-   * @opt_param string customerNamePrefix When retrieving all of your
-   * subscriptions and filtering for specific customers, you can enter a prefix
-   * for a customer name. Using an example customer group that includes exam.com,
-   * example20.com and example.com: - exa -- Returns all customer names that start
-   * with 'exa' which could include exam.com, example20.com, and example.com. A
-   * name prefix is similar to using a regular expression's asterisk, exa*.  -
-   * example -- Returns example20.com and example.com.
-   * @opt_param string maxResults When retrieving a large list, the maxResults is
-   * the maximum number of results per page. The nextPageToken value takes you to
-   * the next page. The default is 20.
-   * @opt_param string pageToken Token to specify next page in the list
-   * @return Google_Service_Reseller_Subscriptions
-   */
-  public function listSubscriptions($optParams = array())
-  {
-    $params = array();
-    $params = array_merge($params, $optParams);
-    return $this->call('list', array($params), "Google_Service_Reseller_Subscriptions");
-  }
-  /**
-   * Immediately move a 30-day free trial subscription to a paid service
-   * subscription. (subscriptions.startPaidService)
-   *
-   * @param string $customerId Either the customer's primary domain name or the
-   * customer's unique identifier. If using the domain name, we do not recommend
-   * using a customerId as a key for persistent data. If the domain name for a
-   * customerId is changed, the Google system automatically updates.
-   * @param string $subscriptionId This is a required property. The subscriptionId
-   * is the subscription identifier and is unique for each customer. Since a
-   * subscriptionId changes when a subscription is updated, we recommend to not
-   * use this ID as a key for persistent data. And the subscriptionId can be found
-   * using the retrieve all reseller subscriptions method.
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Reseller_Subscription
-   */
-  public function startPaidService($customerId, $subscriptionId, $optParams = array())
-  {
-    $params = array('customerId' => $customerId, 'subscriptionId' => $subscriptionId);
-    $params = array_merge($params, $optParams);
-    return $this->call('startPaidService', array($params), "Google_Service_Reseller_Subscription");
-  }
-  /**
-   * Suspends an active subscription. (subscriptions.suspend)
-   *
-   * @param string $customerId Either the customer's primary domain name or the
-   * customer's unique identifier. If using the domain name, we do not recommend
-   * using a customerId as a key for persistent data. If the domain name for a
-   * customerId is changed, the Google system automatically updates.
-   * @param string $subscriptionId This is a required property. The subscriptionId
-   * is the subscription identifier and is unique for each customer. Since a
-   * subscriptionId changes when a subscription is updated, we recommend to not
-   * use this ID as a key for persistent data. And the subscriptionId can be found
-   * using the retrieve all reseller subscriptions method.
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Reseller_Subscription
-   */
-  public function suspend($customerId, $subscriptionId, $optParams = array())
-  {
-    $params = array('customerId' => $customerId, 'subscriptionId' => $subscriptionId);
-    $params = array_merge($params, $optParams);
-    return $this->call('suspend', array($params), "Google_Service_Reseller_Subscription");
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Reseller/Seats.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Reseller/Seats.php
deleted file mode 100644
index 5847a2ab..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Reseller/Seats.php
+++ /dev/null
@@ -1,57 +0,0 @@
-kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setLicensedNumberOfSeats($licensedNumberOfSeats)
-  {
-    $this->licensedNumberOfSeats = $licensedNumberOfSeats;
-  }
-  public function getLicensedNumberOfSeats()
-  {
-    return $this->licensedNumberOfSeats;
-  }
-  public function setMaximumNumberOfSeats($maximumNumberOfSeats)
-  {
-    $this->maximumNumberOfSeats = $maximumNumberOfSeats;
-  }
-  public function getMaximumNumberOfSeats()
-  {
-    return $this->maximumNumberOfSeats;
-  }
-  public function setNumberOfSeats($numberOfSeats)
-  {
-    $this->numberOfSeats = $numberOfSeats;
-  }
-  public function getNumberOfSeats()
-  {
-    return $this->numberOfSeats;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Reseller/Subscription.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Reseller/Subscription.php
deleted file mode 100644
index ab62a7ef..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Reseller/Subscription.php
+++ /dev/null
@@ -1,189 +0,0 @@
-billingMethod = $billingMethod;
-  }
-  public function getBillingMethod()
-  {
-    return $this->billingMethod;
-  }
-  public function setCreationTime($creationTime)
-  {
-    $this->creationTime = $creationTime;
-  }
-  public function getCreationTime()
-  {
-    return $this->creationTime;
-  }
-  public function setCustomerDomain($customerDomain)
-  {
-    $this->customerDomain = $customerDomain;
-  }
-  public function getCustomerDomain()
-  {
-    return $this->customerDomain;
-  }
-  public function setCustomerId($customerId)
-  {
-    $this->customerId = $customerId;
-  }
-  public function getCustomerId()
-  {
-    return $this->customerId;
-  }
-  public function setDealCode($dealCode)
-  {
-    $this->dealCode = $dealCode;
-  }
-  public function getDealCode()
-  {
-    return $this->dealCode;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setPlan(Google_Service_Reseller_SubscriptionPlan $plan)
-  {
-    $this->plan = $plan;
-  }
-  public function getPlan()
-  {
-    return $this->plan;
-  }
-  public function setPurchaseOrderId($purchaseOrderId)
-  {
-    $this->purchaseOrderId = $purchaseOrderId;
-  }
-  public function getPurchaseOrderId()
-  {
-    return $this->purchaseOrderId;
-  }
-  public function setRenewalSettings(Google_Service_Reseller_RenewalSettings $renewalSettings)
-  {
-    $this->renewalSettings = $renewalSettings;
-  }
-  public function getRenewalSettings()
-  {
-    return $this->renewalSettings;
-  }
-  public function setResourceUiUrl($resourceUiUrl)
-  {
-    $this->resourceUiUrl = $resourceUiUrl;
-  }
-  public function getResourceUiUrl()
-  {
-    return $this->resourceUiUrl;
-  }
-  public function setSeats(Google_Service_Reseller_Seats $seats)
-  {
-    $this->seats = $seats;
-  }
-  public function getSeats()
-  {
-    return $this->seats;
-  }
-  public function setSkuId($skuId)
-  {
-    $this->skuId = $skuId;
-  }
-  public function getSkuId()
-  {
-    return $this->skuId;
-  }
-  public function setSkuName($skuName)
-  {
-    $this->skuName = $skuName;
-  }
-  public function getSkuName()
-  {
-    return $this->skuName;
-  }
-  public function setStatus($status)
-  {
-    $this->status = $status;
-  }
-  public function getStatus()
-  {
-    return $this->status;
-  }
-  public function setSubscriptionId($subscriptionId)
-  {
-    $this->subscriptionId = $subscriptionId;
-  }
-  public function getSubscriptionId()
-  {
-    return $this->subscriptionId;
-  }
-  public function setSuspensionReasons($suspensionReasons)
-  {
-    $this->suspensionReasons = $suspensionReasons;
-  }
-  public function getSuspensionReasons()
-  {
-    return $this->suspensionReasons;
-  }
-  public function setTransferInfo(Google_Service_Reseller_SubscriptionTransferInfo $transferInfo)
-  {
-    $this->transferInfo = $transferInfo;
-  }
-  public function getTransferInfo()
-  {
-    return $this->transferInfo;
-  }
-  public function setTrialSettings(Google_Service_Reseller_SubscriptionTrialSettings $trialSettings)
-  {
-    $this->trialSettings = $trialSettings;
-  }
-  public function getTrialSettings()
-  {
-    return $this->trialSettings;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Reseller/SubscriptionPlan.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Reseller/SubscriptionPlan.php
deleted file mode 100644
index e3ee1d79..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Reseller/SubscriptionPlan.php
+++ /dev/null
@@ -1,49 +0,0 @@
-commitmentInterval = $commitmentInterval;
-  }
-  public function getCommitmentInterval()
-  {
-    return $this->commitmentInterval;
-  }
-  public function setIsCommitmentPlan($isCommitmentPlan)
-  {
-    $this->isCommitmentPlan = $isCommitmentPlan;
-  }
-  public function getIsCommitmentPlan()
-  {
-    return $this->isCommitmentPlan;
-  }
-  public function setPlanName($planName)
-  {
-    $this->planName = $planName;
-  }
-  public function getPlanName()
-  {
-    return $this->planName;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Reseller/SubscriptionPlanCommitmentInterval.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Reseller/SubscriptionPlanCommitmentInterval.php
deleted file mode 100644
index 69f2bccd..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Reseller/SubscriptionPlanCommitmentInterval.php
+++ /dev/null
@@ -1,39 +0,0 @@
-endTime = $endTime;
-  }
-  public function getEndTime()
-  {
-    return $this->endTime;
-  }
-  public function setStartTime($startTime)
-  {
-    $this->startTime = $startTime;
-  }
-  public function getStartTime()
-  {
-    return $this->startTime;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Reseller/SubscriptionTransferInfo.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Reseller/SubscriptionTransferInfo.php
deleted file mode 100644
index 75f6cfb3..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Reseller/SubscriptionTransferInfo.php
+++ /dev/null
@@ -1,39 +0,0 @@
-minimumTransferableSeats = $minimumTransferableSeats;
-  }
-  public function getMinimumTransferableSeats()
-  {
-    return $this->minimumTransferableSeats;
-  }
-  public function setTransferabilityExpirationTime($transferabilityExpirationTime)
-  {
-    $this->transferabilityExpirationTime = $transferabilityExpirationTime;
-  }
-  public function getTransferabilityExpirationTime()
-  {
-    return $this->transferabilityExpirationTime;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Reseller/SubscriptionTrialSettings.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Reseller/SubscriptionTrialSettings.php
deleted file mode 100644
index a16afb49..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Reseller/SubscriptionTrialSettings.php
+++ /dev/null
@@ -1,39 +0,0 @@
-isInTrial = $isInTrial;
-  }
-  public function getIsInTrial()
-  {
-    return $this->isInTrial;
-  }
-  public function setTrialEndTime($trialEndTime)
-  {
-    $this->trialEndTime = $trialEndTime;
-  }
-  public function getTrialEndTime()
-  {
-    return $this->trialEndTime;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Reseller/Subscriptions.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Reseller/Subscriptions.php
deleted file mode 100644
index 708fb5ab..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Reseller/Subscriptions.php
+++ /dev/null
@@ -1,50 +0,0 @@
-kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setNextPageToken($nextPageToken)
-  {
-    $this->nextPageToken = $nextPageToken;
-  }
-  public function getNextPageToken()
-  {
-    return $this->nextPageToken;
-  }
-  public function setSubscriptions($subscriptions)
-  {
-    $this->subscriptions = $subscriptions;
-  }
-  public function getSubscriptions()
-  {
-    return $this->subscriptions;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Resourceviews.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Resourceviews.php
deleted file mode 100644
index 80d3bd3e..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Resourceviews.php
+++ /dev/null
@@ -1,339 +0,0 @@
-
- * The Resource View API allows users to create and manage logical sets of
- * Google Compute Engine instances.

- *
- * 

- * For more information about this service, see the API
- * Documentation
- * 

- *
- * @author Google, Inc.
- */
-class Google_Service_Resourceviews extends Google_Service
-{
-  /** View and manage your data across Google Cloud Platform services. */
-  const CLOUD_PLATFORM =
-      "https://www.googleapis.com/auth/cloud-platform";
-  /** View your data across Google Cloud Platform services. */
-  const CLOUD_PLATFORM_READ_ONLY =
-      "https://www.googleapis.com/auth/cloud-platform.read-only";
-  /** View and manage your Google Compute Engine resources. */
-  const COMPUTE =
-      "https://www.googleapis.com/auth/compute";
-  /** View your Google Compute Engine resources. */
-  const COMPUTE_READONLY =
-      "https://www.googleapis.com/auth/compute.readonly";
-  /** View and manage your Google Cloud Platform management resources and deployment status information. */
-  const NDEV_CLOUDMAN =
-      "https://www.googleapis.com/auth/ndev.cloudman";
-  /** View your Google Cloud Platform management resources and deployment status information. */
-  const NDEV_CLOUDMAN_READONLY =
-      "https://www.googleapis.com/auth/ndev.cloudman.readonly";
-
-  public $zoneOperations;
-  public $zoneViews;
-  
-  /**
-   * Constructs the internal representation of the Resourceviews service.
-   *
-   * @param Google_Client $client
-   */
-  public function __construct(Google_Client $client)
-  {
-    parent::__construct($client);
-    $this->rootUrl = 'https://www.googleapis.com/';
-    $this->servicePath = 'resourceviews/v1beta2/projects/';
-    $this->version = 'v1beta2';
-    $this->serviceName = 'resourceviews';
-
-    $this->zoneOperations = new Google_Service_Resourceviews_Resource_ZoneOperations(
-        $this,
-        $this->serviceName,
-        'zoneOperations',
-        array(
-          'methods' => array(
-            'get' => array(
-              'path' => '{project}/zones/{zone}/operations/{operation}',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'project' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'zone' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'operation' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'list' => array(
-              'path' => '{project}/zones/{zone}/operations',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'project' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'zone' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'filter' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'maxResults' => array(
-                  'location' => 'query',
-                  'type' => 'integer',
-                ),
-                'pageToken' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-              ),
-            ),
-          )
-        )
-    );
-    $this->zoneViews = new Google_Service_Resourceviews_Resource_ZoneViews(
-        $this,
-        $this->serviceName,
-        'zoneViews',
-        array(
-          'methods' => array(
-            'addResources' => array(
-              'path' => '{project}/zones/{zone}/resourceViews/{resourceView}/addResources',
-              'httpMethod' => 'POST',
-              'parameters' => array(
-                'project' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'zone' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'resourceView' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'delete' => array(
-              'path' => '{project}/zones/{zone}/resourceViews/{resourceView}',
-              'httpMethod' => 'DELETE',
-              'parameters' => array(
-                'project' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'zone' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'resourceView' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'get' => array(
-              'path' => '{project}/zones/{zone}/resourceViews/{resourceView}',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'project' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'zone' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'resourceView' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'getService' => array(
-              'path' => '{project}/zones/{zone}/resourceViews/{resourceView}/getService',
-              'httpMethod' => 'POST',
-              'parameters' => array(
-                'project' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'zone' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'resourceView' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'resourceName' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-              ),
-            ),'insert' => array(
-              'path' => '{project}/zones/{zone}/resourceViews',
-              'httpMethod' => 'POST',
-              'parameters' => array(
-                'project' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'zone' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'list' => array(
-              'path' => '{project}/zones/{zone}/resourceViews',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'project' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'zone' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'maxResults' => array(
-                  'location' => 'query',
-                  'type' => 'integer',
-                ),
-                'pageToken' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-              ),
-            ),'listResources' => array(
-              'path' => '{project}/zones/{zone}/resourceViews/{resourceView}/resources',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'project' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'zone' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'resourceView' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'format' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'listState' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'maxResults' => array(
-                  'location' => 'query',
-                  'type' => 'integer',
-                ),
-                'pageToken' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'serviceName' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-              ),
-            ),'removeResources' => array(
-              'path' => '{project}/zones/{zone}/resourceViews/{resourceView}/removeResources',
-              'httpMethod' => 'POST',
-              'parameters' => array(
-                'project' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'zone' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'resourceView' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'setService' => array(
-              'path' => '{project}/zones/{zone}/resourceViews/{resourceView}/setService',
-              'httpMethod' => 'POST',
-              'parameters' => array(
-                'project' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'zone' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'resourceView' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),
-          )
-        )
-    );
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Resourceviews/Label.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Resourceviews/Label.php
deleted file mode 100644
index a6fdc018..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Resourceviews/Label.php
+++ /dev/null
@@ -1,39 +0,0 @@
-key = $key;
-  }
-  public function getKey()
-  {
-    return $this->key;
-  }
-  public function setValue($value)
-  {
-    $this->value = $value;
-  }
-  public function getValue()
-  {
-    return $this->value;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Resourceviews/ListResourceResponseItem.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Resourceviews/ListResourceResponseItem.php
deleted file mode 100644
index 6a6ad8ee..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Resourceviews/ListResourceResponseItem.php
+++ /dev/null
@@ -1,39 +0,0 @@
-endpoints = $endpoints;
-  }
-  public function getEndpoints()
-  {
-    return $this->endpoints;
-  }
-  public function setResource($resource)
-  {
-    $this->resource = $resource;
-  }
-  public function getResource()
-  {
-    return $this->resource;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Resourceviews/Operation.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Resourceviews/Operation.php
deleted file mode 100644
index 78207f62..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Resourceviews/Operation.php
+++ /dev/null
@@ -1,222 +0,0 @@
-clientOperationId = $clientOperationId;
-  }
-  public function getClientOperationId()
-  {
-    return $this->clientOperationId;
-  }
-  public function setCreationTimestamp($creationTimestamp)
-  {
-    $this->creationTimestamp = $creationTimestamp;
-  }
-  public function getCreationTimestamp()
-  {
-    return $this->creationTimestamp;
-  }
-  public function setEndTime($endTime)
-  {
-    $this->endTime = $endTime;
-  }
-  public function getEndTime()
-  {
-    return $this->endTime;
-  }
-  public function setError(Google_Service_Resourceviews_OperationError $error)
-  {
-    $this->error = $error;
-  }
-  public function getError()
-  {
-    return $this->error;
-  }
-  public function setHttpErrorMessage($httpErrorMessage)
-  {
-    $this->httpErrorMessage = $httpErrorMessage;
-  }
-  public function getHttpErrorMessage()
-  {
-    return $this->httpErrorMessage;
-  }
-  public function setHttpErrorStatusCode($httpErrorStatusCode)
-  {
-    $this->httpErrorStatusCode = $httpErrorStatusCode;
-  }
-  public function getHttpErrorStatusCode()
-  {
-    return $this->httpErrorStatusCode;
-  }
-  public function setId($id)
-  {
-    $this->id = $id;
-  }
-  public function getId()
-  {
-    return $this->id;
-  }
-  public function setInsertTime($insertTime)
-  {
-    $this->insertTime = $insertTime;
-  }
-  public function getInsertTime()
-  {
-    return $this->insertTime;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setName($name)
-  {
-    $this->name = $name;
-  }
-  public function getName()
-  {
-    return $this->name;
-  }
-  public function setOperationType($operationType)
-  {
-    $this->operationType = $operationType;
-  }
-  public function getOperationType()
-  {
-    return $this->operationType;
-  }
-  public function setProgress($progress)
-  {
-    $this->progress = $progress;
-  }
-  public function getProgress()
-  {
-    return $this->progress;
-  }
-  public function setRegion($region)
-  {
-    $this->region = $region;
-  }
-  public function getRegion()
-  {
-    return $this->region;
-  }
-  public function setSelfLink($selfLink)
-  {
-    $this->selfLink = $selfLink;
-  }
-  public function getSelfLink()
-  {
-    return $this->selfLink;
-  }
-  public function setStartTime($startTime)
-  {
-    $this->startTime = $startTime;
-  }
-  public function getStartTime()
-  {
-    return $this->startTime;
-  }
-  public function setStatus($status)
-  {
-    $this->status = $status;
-  }
-  public function getStatus()
-  {
-    return $this->status;
-  }
-  public function setStatusMessage($statusMessage)
-  {
-    $this->statusMessage = $statusMessage;
-  }
-  public function getStatusMessage()
-  {
-    return $this->statusMessage;
-  }
-  public function setTargetId($targetId)
-  {
-    $this->targetId = $targetId;
-  }
-  public function getTargetId()
-  {
-    return $this->targetId;
-  }
-  public function setTargetLink($targetLink)
-  {
-    $this->targetLink = $targetLink;
-  }
-  public function getTargetLink()
-  {
-    return $this->targetLink;
-  }
-  public function setUser($user)
-  {
-    $this->user = $user;
-  }
-  public function getUser()
-  {
-    return $this->user;
-  }
-  public function setWarnings($warnings)
-  {
-    $this->warnings = $warnings;
-  }
-  public function getWarnings()
-  {
-    return $this->warnings;
-  }
-  public function setZone($zone)
-  {
-    $this->zone = $zone;
-  }
-  public function getZone()
-  {
-    return $this->zone;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Resourceviews/OperationError.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Resourceviews/OperationError.php
deleted file mode 100644
index 5aea2113..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Resourceviews/OperationError.php
+++ /dev/null
@@ -1,32 +0,0 @@
-errors = $errors;
-  }
-  public function getErrors()
-  {
-    return $this->errors;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Resourceviews/OperationErrorErrors.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Resourceviews/OperationErrorErrors.php
deleted file mode 100644
index bcbc36ed..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Resourceviews/OperationErrorErrors.php
+++ /dev/null
@@ -1,48 +0,0 @@
-code = $code;
-  }
-  public function getCode()
-  {
-    return $this->code;
-  }
-  public function setLocation($location)
-  {
-    $this->location = $location;
-  }
-  public function getLocation()
-  {
-    return $this->location;
-  }
-  public function setMessage($message)
-  {
-    $this->message = $message;
-  }
-  public function getMessage()
-  {
-    return $this->message;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Resourceviews/OperationList.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Resourceviews/OperationList.php
deleted file mode 100644
index e1bc4b6e..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Resourceviews/OperationList.php
+++ /dev/null
@@ -1,68 +0,0 @@
-id = $id;
-  }
-  public function getId()
-  {
-    return $this->id;
-  }
-  public function setItems($items)
-  {
-    $this->items = $items;
-  }
-  public function getItems()
-  {
-    return $this->items;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setNextPageToken($nextPageToken)
-  {
-    $this->nextPageToken = $nextPageToken;
-  }
-  public function getNextPageToken()
-  {
-    return $this->nextPageToken;
-  }
-  public function setSelfLink($selfLink)
-  {
-    $this->selfLink = $selfLink;
-  }
-  public function getSelfLink()
-  {
-    return $this->selfLink;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Resourceviews/OperationWarnings.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Resourceviews/OperationWarnings.php
deleted file mode 100644
index 0ba5ef48..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Resourceviews/OperationWarnings.php
+++ /dev/null
@@ -1,50 +0,0 @@
-code = $code;
-  }
-  public function getCode()
-  {
-    return $this->code;
-  }
-  public function setData($data)
-  {
-    $this->data = $data;
-  }
-  public function getData()
-  {
-    return $this->data;
-  }
-  public function setMessage($message)
-  {
-    $this->message = $message;
-  }
-  public function getMessage()
-  {
-    return $this->message;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Resourceviews/OperationWarningsData.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Resourceviews/OperationWarningsData.php
deleted file mode 100644
index 0c5fd964..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Resourceviews/OperationWarningsData.php
+++ /dev/null
@@ -1,39 +0,0 @@
-key = $key;
-  }
-  public function getKey()
-  {
-    return $this->key;
-  }
-  public function setValue($value)
-  {
-    $this->value = $value;
-  }
-  public function getValue()
-  {
-    return $this->value;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Resourceviews/Resource/ZoneOperations.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Resourceviews/Resource/ZoneOperations.php
deleted file mode 100644
index 7bc6bb65..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Resourceviews/Resource/ZoneOperations.php
+++ /dev/null
@@ -1,66 +0,0 @@
-
- *   $resourceviewsService = new Google_Service_Resourceviews(...);
- *   $zoneOperations = $resourceviewsService->zoneOperations;
- *  
- */
-class Google_Service_Resourceviews_Resource_ZoneOperations extends Google_Service_Resource
-{
-  /**
-   * Retrieves the specified zone-specific operation resource.
-   * (zoneOperations.get)
-   *
-   * @param string $project Name of the project scoping this request.
-   * @param string $zone Name of the zone scoping this request.
-   * @param string $operation Name of the operation resource to return.
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Resourceviews_Operation
-   */
-  public function get($project, $zone, $operation, $optParams = array())
-  {
-    $params = array('project' => $project, 'zone' => $zone, 'operation' => $operation);
-    $params = array_merge($params, $optParams);
-    return $this->call('get', array($params), "Google_Service_Resourceviews_Operation");
-  }
-  /**
-   * Retrieves the list of operation resources contained within the specified
-   * zone. (zoneOperations.listZoneOperations)
-   *
-   * @param string $project Name of the project scoping this request.
-   * @param string $zone Name of the zone scoping this request.
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param string filter Optional. Filter expression for filtering listed
-   * resources.
-   * @opt_param string maxResults Optional. Maximum count of results to be
-   * returned. Maximum value is 500 and default value is 500.
-   * @opt_param string pageToken Optional. Tag returned by a previous list request
-   * truncated by maxResults. Used to continue a previous list request.
-   * @return Google_Service_Resourceviews_OperationList
-   */
-  public function listZoneOperations($project, $zone, $optParams = array())
-  {
-    $params = array('project' => $project, 'zone' => $zone);
-    $params = array_merge($params, $optParams);
-    return $this->call('list', array($params), "Google_Service_Resourceviews_OperationList");
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Resourceviews/Resource/ZoneViews.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Resourceviews/Resource/ZoneViews.php
deleted file mode 100644
index fc4aeade..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Resourceviews/Resource/ZoneViews.php
+++ /dev/null
@@ -1,190 +0,0 @@
-
- *   $resourceviewsService = new Google_Service_Resourceviews(...);
- *   $zoneViews = $resourceviewsService->zoneViews;
- *  
- */
-class Google_Service_Resourceviews_Resource_ZoneViews extends Google_Service_Resource
-{
-  /**
-   * Add resources to the view. (zoneViews.addResources)
-   *
-   * @param string $project The project name of the resource view.
-   * @param string $zone The zone name of the resource view.
-   * @param string $resourceView The name of the resource view.
-   * @param Google_Service_Resourceviews_ZoneViewsAddResourcesRequest $postBody
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Resourceviews_Operation
-   */
-  public function addResources($project, $zone, $resourceView, Google_Service_Resourceviews_ZoneViewsAddResourcesRequest $postBody, $optParams = array())
-  {
-    $params = array('project' => $project, 'zone' => $zone, 'resourceView' => $resourceView, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('addResources', array($params), "Google_Service_Resourceviews_Operation");
-  }
-  /**
-   * Delete a resource view. (zoneViews.delete)
-   *
-   * @param string $project The project name of the resource view.
-   * @param string $zone The zone name of the resource view.
-   * @param string $resourceView The name of the resource view.
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Resourceviews_Operation
-   */
-  public function delete($project, $zone, $resourceView, $optParams = array())
-  {
-    $params = array('project' => $project, 'zone' => $zone, 'resourceView' => $resourceView);
-    $params = array_merge($params, $optParams);
-    return $this->call('delete', array($params), "Google_Service_Resourceviews_Operation");
-  }
-  /**
-   * Get the information of a zonal resource view. (zoneViews.get)
-   *
-   * @param string $project The project name of the resource view.
-   * @param string $zone The zone name of the resource view.
-   * @param string $resourceView The name of the resource view.
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Resourceviews_ResourceView
-   */
-  public function get($project, $zone, $resourceView, $optParams = array())
-  {
-    $params = array('project' => $project, 'zone' => $zone, 'resourceView' => $resourceView);
-    $params = array_merge($params, $optParams);
-    return $this->call('get', array($params), "Google_Service_Resourceviews_ResourceView");
-  }
-  /**
-   * Get the service information of a resource view or a resource.
-   * (zoneViews.getService)
-   *
-   * @param string $project The project name of the resource view.
-   * @param string $zone The zone name of the resource view.
-   * @param string $resourceView The name of the resource view.
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param string resourceName The name of the resource if user wants to get
-   * the service information of the resource.
-   * @return Google_Service_Resourceviews_ZoneViewsGetServiceResponse
-   */
-  public function getService($project, $zone, $resourceView, $optParams = array())
-  {
-    $params = array('project' => $project, 'zone' => $zone, 'resourceView' => $resourceView);
-    $params = array_merge($params, $optParams);
-    return $this->call('getService', array($params), "Google_Service_Resourceviews_ZoneViewsGetServiceResponse");
-  }
-  /**
-   * Create a resource view. (zoneViews.insert)
-   *
-   * @param string $project The project name of the resource view.
-   * @param string $zone The zone name of the resource view.
-   * @param Google_Service_Resourceviews_ResourceView $postBody
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Resourceviews_Operation
-   */
-  public function insert($project, $zone, Google_Service_Resourceviews_ResourceView $postBody, $optParams = array())
-  {
-    $params = array('project' => $project, 'zone' => $zone, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('insert', array($params), "Google_Service_Resourceviews_Operation");
-  }
-  /**
-   * List resource views. (zoneViews.listZoneViews)
-   *
-   * @param string $project The project name of the resource view.
-   * @param string $zone The zone name of the resource view.
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param int maxResults Maximum count of results to be returned. Acceptable
-   * values are 0 to 5000, inclusive. (Default: 5000)
-   * @opt_param string pageToken Specifies a nextPageToken returned by a previous
-   * list request. This token can be used to request the next page of results from
-   * a previous list request.
-   * @return Google_Service_Resourceviews_ZoneViewsList
-   */
-  public function listZoneViews($project, $zone, $optParams = array())
-  {
-    $params = array('project' => $project, 'zone' => $zone);
-    $params = array_merge($params, $optParams);
-    return $this->call('list', array($params), "Google_Service_Resourceviews_ZoneViewsList");
-  }
-  /**
-   * List the resources of the resource view. (zoneViews.listResources)
-   *
-   * @param string $project The project name of the resource view.
-   * @param string $zone The zone name of the resource view.
-   * @param string $resourceView The name of the resource view.
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param string format The requested format of the return value. It can be
-   * URL or URL_PORT. A JSON object will be included in the response based on the
-   * format. The default format is NONE, which results in no JSON in the response.
-   * @opt_param string listState The state of the instance to list. By default, it
-   * lists all instances.
-   * @opt_param int maxResults Maximum count of results to be returned. Acceptable
-   * values are 0 to 5000, inclusive. (Default: 5000)
-   * @opt_param string pageToken Specifies a nextPageToken returned by a previous
-   * list request. This token can be used to request the next page of results from
-   * a previous list request.
-   * @opt_param string serviceName The service name to return in the response. It
-   * is optional and if it is not set, all the service end points will be
-   * returned.
-   * @return Google_Service_Resourceviews_ZoneViewsListResourcesResponse
-   */
-  public function listResources($project, $zone, $resourceView, $optParams = array())
-  {
-    $params = array('project' => $project, 'zone' => $zone, 'resourceView' => $resourceView);
-    $params = array_merge($params, $optParams);
-    return $this->call('listResources', array($params), "Google_Service_Resourceviews_ZoneViewsListResourcesResponse");
-  }
-  /**
-   * Remove resources from the view. (zoneViews.removeResources)
-   *
-   * @param string $project The project name of the resource view.
-   * @param string $zone The zone name of the resource view.
-   * @param string $resourceView The name of the resource view.
-   * @param Google_Service_Resourceviews_ZoneViewsRemoveResourcesRequest $postBody
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Resourceviews_Operation
-   */
-  public function removeResources($project, $zone, $resourceView, Google_Service_Resourceviews_ZoneViewsRemoveResourcesRequest $postBody, $optParams = array())
-  {
-    $params = array('project' => $project, 'zone' => $zone, 'resourceView' => $resourceView, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('removeResources', array($params), "Google_Service_Resourceviews_Operation");
-  }
-  /**
-   * Update the service information of a resource view or a resource.
-   * (zoneViews.setService)
-   *
-   * @param string $project The project name of the resource view.
-   * @param string $zone The zone name of the resource view.
-   * @param string $resourceView The name of the resource view.
-   * @param Google_Service_Resourceviews_ZoneViewsSetServiceRequest $postBody
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Resourceviews_Operation
-   */
-  public function setService($project, $zone, $resourceView, Google_Service_Resourceviews_ZoneViewsSetServiceRequest $postBody, $optParams = array())
-  {
-    $params = array('project' => $project, 'zone' => $zone, 'resourceView' => $resourceView, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('setService', array($params), "Google_Service_Resourceviews_Operation");
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Resourceviews/ResourceView.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Resourceviews/ResourceView.php
deleted file mode 100644
index d0767580..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Resourceviews/ResourceView.php
+++ /dev/null
@@ -1,132 +0,0 @@
-creationTimestamp = $creationTimestamp;
-  }
-  public function getCreationTimestamp()
-  {
-    return $this->creationTimestamp;
-  }
-  public function setDescription($description)
-  {
-    $this->description = $description;
-  }
-  public function getDescription()
-  {
-    return $this->description;
-  }
-  public function setEndpoints($endpoints)
-  {
-    $this->endpoints = $endpoints;
-  }
-  public function getEndpoints()
-  {
-    return $this->endpoints;
-  }
-  public function setFingerprint($fingerprint)
-  {
-    $this->fingerprint = $fingerprint;
-  }
-  public function getFingerprint()
-  {
-    return $this->fingerprint;
-  }
-  public function setId($id)
-  {
-    $this->id = $id;
-  }
-  public function getId()
-  {
-    return $this->id;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setLabels($labels)
-  {
-    $this->labels = $labels;
-  }
-  public function getLabels()
-  {
-    return $this->labels;
-  }
-  public function setName($name)
-  {
-    $this->name = $name;
-  }
-  public function getName()
-  {
-    return $this->name;
-  }
-  public function setNetwork($network)
-  {
-    $this->network = $network;
-  }
-  public function getNetwork()
-  {
-    return $this->network;
-  }
-  public function setResources($resources)
-  {
-    $this->resources = $resources;
-  }
-  public function getResources()
-  {
-    return $this->resources;
-  }
-  public function setSelfLink($selfLink)
-  {
-    $this->selfLink = $selfLink;
-  }
-  public function getSelfLink()
-  {
-    return $this->selfLink;
-  }
-  public function setSize($size)
-  {
-    $this->size = $size;
-  }
-  public function getSize()
-  {
-    return $this->size;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Resourceviews/ServiceEndpoint.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Resourceviews/ServiceEndpoint.php
deleted file mode 100644
index 8c8aeabb..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Resourceviews/ServiceEndpoint.php
+++ /dev/null
@@ -1,39 +0,0 @@
-name = $name;
-  }
-  public function getName()
-  {
-    return $this->name;
-  }
-  public function setPort($port)
-  {
-    $this->port = $port;
-  }
-  public function getPort()
-  {
-    return $this->port;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Resourceviews/ZoneViewsAddResourcesRequest.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Resourceviews/ZoneViewsAddResourcesRequest.php
deleted file mode 100644
index 20e615e8..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Resourceviews/ZoneViewsAddResourcesRequest.php
+++ /dev/null
@@ -1,31 +0,0 @@
-resources = $resources;
-  }
-  public function getResources()
-  {
-    return $this->resources;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Resourceviews/ZoneViewsGetServiceResponse.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Resourceviews/ZoneViewsGetServiceResponse.php
deleted file mode 100644
index b5a61984..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Resourceviews/ZoneViewsGetServiceResponse.php
+++ /dev/null
@@ -1,41 +0,0 @@
-endpoints = $endpoints;
-  }
-  public function getEndpoints()
-  {
-    return $this->endpoints;
-  }
-  public function setFingerprint($fingerprint)
-  {
-    $this->fingerprint = $fingerprint;
-  }
-  public function getFingerprint()
-  {
-    return $this->fingerprint;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Resourceviews/ZoneViewsList.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Resourceviews/ZoneViewsList.php
deleted file mode 100644
index c2a62314..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Resourceviews/ZoneViewsList.php
+++ /dev/null
@@ -1,59 +0,0 @@
-items = $items;
-  }
-  public function getItems()
-  {
-    return $this->items;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setNextPageToken($nextPageToken)
-  {
-    $this->nextPageToken = $nextPageToken;
-  }
-  public function getNextPageToken()
-  {
-    return $this->nextPageToken;
-  }
-  public function setSelfLink($selfLink)
-  {
-    $this->selfLink = $selfLink;
-  }
-  public function getSelfLink()
-  {
-    return $this->selfLink;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Resourceviews/ZoneViewsListResourcesResponse.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Resourceviews/ZoneViewsListResourcesResponse.php
deleted file mode 100644
index 299c85ae..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Resourceviews/ZoneViewsListResourcesResponse.php
+++ /dev/null
@@ -1,50 +0,0 @@
-items = $items;
-  }
-  public function getItems()
-  {
-    return $this->items;
-  }
-  public function setNetwork($network)
-  {
-    $this->network = $network;
-  }
-  public function getNetwork()
-  {
-    return $this->network;
-  }
-  public function setNextPageToken($nextPageToken)
-  {
-    $this->nextPageToken = $nextPageToken;
-  }
-  public function getNextPageToken()
-  {
-    return $this->nextPageToken;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Resourceviews/ZoneViewsRemoveResourcesRequest.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Resourceviews/ZoneViewsRemoveResourcesRequest.php
deleted file mode 100644
index ccaa19bb..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Resourceviews/ZoneViewsRemoveResourcesRequest.php
+++ /dev/null
@@ -1,31 +0,0 @@
-resources = $resources;
-  }
-  public function getResources()
-  {
-    return $this->resources;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Resourceviews/ZoneViewsSetServiceRequest.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Resourceviews/ZoneViewsSetServiceRequest.php
deleted file mode 100644
index 184c8170..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Resourceviews/ZoneViewsSetServiceRequest.php
+++ /dev/null
@@ -1,50 +0,0 @@
-endpoints = $endpoints;
-  }
-  public function getEndpoints()
-  {
-    return $this->endpoints;
-  }
-  public function setFingerprint($fingerprint)
-  {
-    $this->fingerprint = $fingerprint;
-  }
-  public function getFingerprint()
-  {
-    return $this->fingerprint;
-  }
-  public function setResourceName($resourceName)
-  {
-    $this->resourceName = $resourceName;
-  }
-  public function getResourceName()
-  {
-    return $this->resourceName;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/SQLAdmin.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/SQLAdmin.php
deleted file mode 100644
index a70911dd..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/SQLAdmin.php
+++ /dev/null
@@ -1,811 +0,0 @@
-
- * Creates and configures Cloud SQL instances, which provide fully-managed MySQL
- * databases.

- *
- * 

- * For more information about this service, see the API
- * Documentation
- * 

- *
- * @author Google, Inc.
- */
-class Google_Service_SQLAdmin extends Google_Service
-{
-  /** View and manage your data across Google Cloud Platform services. */
-  const CLOUD_PLATFORM =
-      "https://www.googleapis.com/auth/cloud-platform";
-  /** Manage your Google SQL Service instances. */
-  const SQLSERVICE_ADMIN =
-      "https://www.googleapis.com/auth/sqlservice.admin";
-
-  public $backupRuns;
-  public $databases;
-  public $flags;
-  public $instances;
-  public $operations;
-  public $sslCerts;
-  public $tiers;
-  public $users;
-  
-  /**
-   * Constructs the internal representation of the SQLAdmin service.
-   *
-   * @param Google_Client $client
-   */
-  public function __construct(Google_Client $client)
-  {
-    parent::__construct($client);
-    $this->rootUrl = 'https://www.googleapis.com/';
-    $this->servicePath = 'sql/v1beta4/';
-    $this->version = 'v1beta4';
-    $this->serviceName = 'sqladmin';
-
-    $this->backupRuns = new Google_Service_SQLAdmin_Resource_BackupRuns(
-        $this,
-        $this->serviceName,
-        'backupRuns',
-        array(
-          'methods' => array(
-            'delete' => array(
-              'path' => 'projects/{project}/instances/{instance}/backupRuns/{id}',
-              'httpMethod' => 'DELETE',
-              'parameters' => array(
-                'project' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'instance' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'id' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'get' => array(
-              'path' => 'projects/{project}/instances/{instance}/backupRuns/{id}',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'project' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'instance' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'id' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'insert' => array(
-              'path' => 'projects/{project}/instances/{instance}/backupRuns',
-              'httpMethod' => 'POST',
-              'parameters' => array(
-                'project' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'instance' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'list' => array(
-              'path' => 'projects/{project}/instances/{instance}/backupRuns',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'project' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'instance' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'maxResults' => array(
-                  'location' => 'query',
-                  'type' => 'integer',
-                ),
-                'pageToken' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-              ),
-            ),
-          )
-        )
-    );
-    $this->databases = new Google_Service_SQLAdmin_Resource_Databases(
-        $this,
-        $this->serviceName,
-        'databases',
-        array(
-          'methods' => array(
-            'delete' => array(
-              'path' => 'projects/{project}/instances/{instance}/databases/{database}',
-              'httpMethod' => 'DELETE',
-              'parameters' => array(
-                'project' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'instance' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'database' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'get' => array(
-              'path' => 'projects/{project}/instances/{instance}/databases/{database}',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'project' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'instance' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'database' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'insert' => array(
-              'path' => 'projects/{project}/instances/{instance}/databases',
-              'httpMethod' => 'POST',
-              'parameters' => array(
-                'project' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'instance' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'list' => array(
-              'path' => 'projects/{project}/instances/{instance}/databases',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'project' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'instance' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'patch' => array(
-              'path' => 'projects/{project}/instances/{instance}/databases/{database}',
-              'httpMethod' => 'PATCH',
-              'parameters' => array(
-                'project' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'instance' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'database' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'update' => array(
-              'path' => 'projects/{project}/instances/{instance}/databases/{database}',
-              'httpMethod' => 'PUT',
-              'parameters' => array(
-                'project' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'instance' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'database' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),
-          )
-        )
-    );
-    $this->flags = new Google_Service_SQLAdmin_Resource_Flags(
-        $this,
-        $this->serviceName,
-        'flags',
-        array(
-          'methods' => array(
-            'list' => array(
-              'path' => 'flags',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'databaseVersion' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-              ),
-            ),
-          )
-        )
-    );
-    $this->instances = new Google_Service_SQLAdmin_Resource_Instances(
-        $this,
-        $this->serviceName,
-        'instances',
-        array(
-          'methods' => array(
-            'clone' => array(
-              'path' => 'projects/{project}/instances/{instance}/clone',
-              'httpMethod' => 'POST',
-              'parameters' => array(
-                'project' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'instance' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'delete' => array(
-              'path' => 'projects/{project}/instances/{instance}',
-              'httpMethod' => 'DELETE',
-              'parameters' => array(
-                'project' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'instance' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'export' => array(
-              'path' => 'projects/{project}/instances/{instance}/export',
-              'httpMethod' => 'POST',
-              'parameters' => array(
-                'project' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'instance' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'failover' => array(
-              'path' => 'projects/{project}/instances/{instance}/failover',
-              'httpMethod' => 'POST',
-              'parameters' => array(
-                'project' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'instance' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'get' => array(
-              'path' => 'projects/{project}/instances/{instance}',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'project' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'instance' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'import' => array(
-              'path' => 'projects/{project}/instances/{instance}/import',
-              'httpMethod' => 'POST',
-              'parameters' => array(
-                'project' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'instance' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'insert' => array(
-              'path' => 'projects/{project}/instances',
-              'httpMethod' => 'POST',
-              'parameters' => array(
-                'project' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'list' => array(
-              'path' => 'projects/{project}/instances',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'project' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'filter' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'maxResults' => array(
-                  'location' => 'query',
-                  'type' => 'integer',
-                ),
-                'pageToken' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-              ),
-            ),'patch' => array(
-              'path' => 'projects/{project}/instances/{instance}',
-              'httpMethod' => 'PATCH',
-              'parameters' => array(
-                'project' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'instance' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'promoteReplica' => array(
-              'path' => 'projects/{project}/instances/{instance}/promoteReplica',
-              'httpMethod' => 'POST',
-              'parameters' => array(
-                'project' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'instance' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'resetSslConfig' => array(
-              'path' => 'projects/{project}/instances/{instance}/resetSslConfig',
-              'httpMethod' => 'POST',
-              'parameters' => array(
-                'project' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'instance' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'restart' => array(
-              'path' => 'projects/{project}/instances/{instance}/restart',
-              'httpMethod' => 'POST',
-              'parameters' => array(
-                'project' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'instance' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'restoreBackup' => array(
-              'path' => 'projects/{project}/instances/{instance}/restoreBackup',
-              'httpMethod' => 'POST',
-              'parameters' => array(
-                'project' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'instance' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'startReplica' => array(
-              'path' => 'projects/{project}/instances/{instance}/startReplica',
-              'httpMethod' => 'POST',
-              'parameters' => array(
-                'project' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'instance' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'stopReplica' => array(
-              'path' => 'projects/{project}/instances/{instance}/stopReplica',
-              'httpMethod' => 'POST',
-              'parameters' => array(
-                'project' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'instance' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'truncateLog' => array(
-              'path' => 'projects/{project}/instances/{instance}/truncateLog',
-              'httpMethod' => 'POST',
-              'parameters' => array(
-                'project' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'instance' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'update' => array(
-              'path' => 'projects/{project}/instances/{instance}',
-              'httpMethod' => 'PUT',
-              'parameters' => array(
-                'project' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'instance' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),
-          )
-        )
-    );
-    $this->operations = new Google_Service_SQLAdmin_Resource_Operations(
-        $this,
-        $this->serviceName,
-        'operations',
-        array(
-          'methods' => array(
-            'get' => array(
-              'path' => 'projects/{project}/operations/{operation}',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'project' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'operation' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'list' => array(
-              'path' => 'projects/{project}/operations',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'project' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'instance' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'maxResults' => array(
-                  'location' => 'query',
-                  'type' => 'integer',
-                ),
-                'pageToken' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-              ),
-            ),
-          )
-        )
-    );
-    $this->sslCerts = new Google_Service_SQLAdmin_Resource_SslCerts(
-        $this,
-        $this->serviceName,
-        'sslCerts',
-        array(
-          'methods' => array(
-            'createEphemeral' => array(
-              'path' => 'projects/{project}/instances/{instance}/createEphemeral',
-              'httpMethod' => 'POST',
-              'parameters' => array(
-                'project' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'instance' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'delete' => array(
-              'path' => 'projects/{project}/instances/{instance}/sslCerts/{sha1Fingerprint}',
-              'httpMethod' => 'DELETE',
-              'parameters' => array(
-                'project' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'instance' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'sha1Fingerprint' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'get' => array(
-              'path' => 'projects/{project}/instances/{instance}/sslCerts/{sha1Fingerprint}',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'project' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'instance' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'sha1Fingerprint' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'insert' => array(
-              'path' => 'projects/{project}/instances/{instance}/sslCerts',
-              'httpMethod' => 'POST',
-              'parameters' => array(
-                'project' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'instance' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'list' => array(
-              'path' => 'projects/{project}/instances/{instance}/sslCerts',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'project' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'instance' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),
-          )
-        )
-    );
-    $this->tiers = new Google_Service_SQLAdmin_Resource_Tiers(
-        $this,
-        $this->serviceName,
-        'tiers',
-        array(
-          'methods' => array(
-            'list' => array(
-              'path' => 'projects/{project}/tiers',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'project' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),
-          )
-        )
-    );
-    $this->users = new Google_Service_SQLAdmin_Resource_Users(
-        $this,
-        $this->serviceName,
-        'users',
-        array(
-          'methods' => array(
-            'delete' => array(
-              'path' => 'projects/{project}/instances/{instance}/users',
-              'httpMethod' => 'DELETE',
-              'parameters' => array(
-                'project' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'instance' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'host' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'name' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'insert' => array(
-              'path' => 'projects/{project}/instances/{instance}/users',
-              'httpMethod' => 'POST',
-              'parameters' => array(
-                'project' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'instance' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'list' => array(
-              'path' => 'projects/{project}/instances/{instance}/users',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'project' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'instance' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'update' => array(
-              'path' => 'projects/{project}/instances/{instance}/users',
-              'httpMethod' => 'PUT',
-              'parameters' => array(
-                'project' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'instance' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'host' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'name' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),
-          )
-        )
-    );
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/SQLAdmin/AclEntry.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/SQLAdmin/AclEntry.php
deleted file mode 100644
index 33dbb082..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/SQLAdmin/AclEntry.php
+++ /dev/null
@@ -1,57 +0,0 @@
-expirationTime = $expirationTime;
-  }
-  public function getExpirationTime()
-  {
-    return $this->expirationTime;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setName($name)
-  {
-    $this->name = $name;
-  }
-  public function getName()
-  {
-    return $this->name;
-  }
-  public function setValue($value)
-  {
-    $this->value = $value;
-  }
-  public function getValue()
-  {
-    return $this->value;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/SQLAdmin/BackupConfiguration.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/SQLAdmin/BackupConfiguration.php
deleted file mode 100644
index 0b53bd18..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/SQLAdmin/BackupConfiguration.php
+++ /dev/null
@@ -1,57 +0,0 @@
-binaryLogEnabled = $binaryLogEnabled;
-  }
-  public function getBinaryLogEnabled()
-  {
-    return $this->binaryLogEnabled;
-  }
-  public function setEnabled($enabled)
-  {
-    $this->enabled = $enabled;
-  }
-  public function getEnabled()
-  {
-    return $this->enabled;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setStartTime($startTime)
-  {
-    $this->startTime = $startTime;
-  }
-  public function getStartTime()
-  {
-    return $this->startTime;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/SQLAdmin/BackupRun.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/SQLAdmin/BackupRun.php
deleted file mode 100644
index 86ab90cd..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/SQLAdmin/BackupRun.php
+++ /dev/null
@@ -1,130 +0,0 @@
-description = $description;
-  }
-  public function getDescription()
-  {
-    return $this->description;
-  }
-  public function setEndTime($endTime)
-  {
-    $this->endTime = $endTime;
-  }
-  public function getEndTime()
-  {
-    return $this->endTime;
-  }
-  public function setEnqueuedTime($enqueuedTime)
-  {
-    $this->enqueuedTime = $enqueuedTime;
-  }
-  public function getEnqueuedTime()
-  {
-    return $this->enqueuedTime;
-  }
-  public function setError(Google_Service_SQLAdmin_OperationError $error)
-  {
-    $this->error = $error;
-  }
-  public function getError()
-  {
-    return $this->error;
-  }
-  public function setId($id)
-  {
-    $this->id = $id;
-  }
-  public function getId()
-  {
-    return $this->id;
-  }
-  public function setInstance($instance)
-  {
-    $this->instance = $instance;
-  }
-  public function getInstance()
-  {
-    return $this->instance;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setSelfLink($selfLink)
-  {
-    $this->selfLink = $selfLink;
-  }
-  public function getSelfLink()
-  {
-    return $this->selfLink;
-  }
-  public function setStartTime($startTime)
-  {
-    $this->startTime = $startTime;
-  }
-  public function getStartTime()
-  {
-    return $this->startTime;
-  }
-  public function setStatus($status)
-  {
-    $this->status = $status;
-  }
-  public function getStatus()
-  {
-    return $this->status;
-  }
-  public function setType($type)
-  {
-    $this->type = $type;
-  }
-  public function getType()
-  {
-    return $this->type;
-  }
-  public function setWindowStartTime($windowStartTime)
-  {
-    $this->windowStartTime = $windowStartTime;
-  }
-  public function getWindowStartTime()
-  {
-    return $this->windowStartTime;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/SQLAdmin/BackupRunsListResponse.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/SQLAdmin/BackupRunsListResponse.php
deleted file mode 100644
index 7e71cd40..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/SQLAdmin/BackupRunsListResponse.php
+++ /dev/null
@@ -1,50 +0,0 @@
-items = $items;
-  }
-  public function getItems()
-  {
-    return $this->items;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setNextPageToken($nextPageToken)
-  {
-    $this->nextPageToken = $nextPageToken;
-  }
-  public function getNextPageToken()
-  {
-    return $this->nextPageToken;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/SQLAdmin/BinLogCoordinates.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/SQLAdmin/BinLogCoordinates.php
deleted file mode 100644
index e6d92e32..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/SQLAdmin/BinLogCoordinates.php
+++ /dev/null
@@ -1,48 +0,0 @@
-binLogFileName = $binLogFileName;
-  }
-  public function getBinLogFileName()
-  {
-    return $this->binLogFileName;
-  }
-  public function setBinLogPosition($binLogPosition)
-  {
-    $this->binLogPosition = $binLogPosition;
-  }
-  public function getBinLogPosition()
-  {
-    return $this->binLogPosition;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/SQLAdmin/CloneContext.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/SQLAdmin/CloneContext.php
deleted file mode 100644
index d2f6ddc0..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/SQLAdmin/CloneContext.php
+++ /dev/null
@@ -1,49 +0,0 @@
-binLogCoordinates = $binLogCoordinates;
-  }
-  public function getBinLogCoordinates()
-  {
-    return $this->binLogCoordinates;
-  }
-  public function setDestinationInstanceName($destinationInstanceName)
-  {
-    $this->destinationInstanceName = $destinationInstanceName;
-  }
-  public function getDestinationInstanceName()
-  {
-    return $this->destinationInstanceName;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/SQLAdmin/Database.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/SQLAdmin/Database.php
deleted file mode 100644
index d9d0070b..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/SQLAdmin/Database.php
+++ /dev/null
@@ -1,93 +0,0 @@
-charset = $charset;
-  }
-  public function getCharset()
-  {
-    return $this->charset;
-  }
-  public function setCollation($collation)
-  {
-    $this->collation = $collation;
-  }
-  public function getCollation()
-  {
-    return $this->collation;
-  }
-  public function setEtag($etag)
-  {
-    $this->etag = $etag;
-  }
-  public function getEtag()
-  {
-    return $this->etag;
-  }
-  public function setInstance($instance)
-  {
-    $this->instance = $instance;
-  }
-  public function getInstance()
-  {
-    return $this->instance;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setName($name)
-  {
-    $this->name = $name;
-  }
-  public function getName()
-  {
-    return $this->name;
-  }
-  public function setProject($project)
-  {
-    $this->project = $project;
-  }
-  public function getProject()
-  {
-    return $this->project;
-  }
-  public function setSelfLink($selfLink)
-  {
-    $this->selfLink = $selfLink;
-  }
-  public function getSelfLink()
-  {
-    return $this->selfLink;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/SQLAdmin/DatabaseFlags.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/SQLAdmin/DatabaseFlags.php
deleted file mode 100644
index f56052f5..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/SQLAdmin/DatabaseFlags.php
+++ /dev/null
@@ -1,39 +0,0 @@
-name = $name;
-  }
-  public function getName()
-  {
-    return $this->name;
-  }
-  public function setValue($value)
-  {
-    $this->value = $value;
-  }
-  public function getValue()
-  {
-    return $this->value;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/SQLAdmin/DatabaseInstance.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/SQLAdmin/DatabaseInstance.php
deleted file mode 100644
index 292b7229..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/SQLAdmin/DatabaseInstance.php
+++ /dev/null
@@ -1,244 +0,0 @@
-backendType = $backendType;
-  }
-  public function getBackendType()
-  {
-    return $this->backendType;
-  }
-  public function setConnectionName($connectionName)
-  {
-    $this->connectionName = $connectionName;
-  }
-  public function getConnectionName()
-  {
-    return $this->connectionName;
-  }
-  public function setCurrentDiskSize($currentDiskSize)
-  {
-    $this->currentDiskSize = $currentDiskSize;
-  }
-  public function getCurrentDiskSize()
-  {
-    return $this->currentDiskSize;
-  }
-  public function setDatabaseVersion($databaseVersion)
-  {
-    $this->databaseVersion = $databaseVersion;
-  }
-  public function getDatabaseVersion()
-  {
-    return $this->databaseVersion;
-  }
-  public function setEtag($etag)
-  {
-    $this->etag = $etag;
-  }
-  public function getEtag()
-  {
-    return $this->etag;
-  }
-  public function setFailoverReplica(Google_Service_SQLAdmin_DatabaseInstanceFailoverReplica $failoverReplica)
-  {
-    $this->failoverReplica = $failoverReplica;
-  }
-  public function getFailoverReplica()
-  {
-    return $this->failoverReplica;
-  }
-  public function setInstanceType($instanceType)
-  {
-    $this->instanceType = $instanceType;
-  }
-  public function getInstanceType()
-  {
-    return $this->instanceType;
-  }
-  public function setIpAddresses($ipAddresses)
-  {
-    $this->ipAddresses = $ipAddresses;
-  }
-  public function getIpAddresses()
-  {
-    return $this->ipAddresses;
-  }
-  public function setIpv6Address($ipv6Address)
-  {
-    $this->ipv6Address = $ipv6Address;
-  }
-  public function getIpv6Address()
-  {
-    return $this->ipv6Address;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setMasterInstanceName($masterInstanceName)
-  {
-    $this->masterInstanceName = $masterInstanceName;
-  }
-  public function getMasterInstanceName()
-  {
-    return $this->masterInstanceName;
-  }
-  public function setMaxDiskSize($maxDiskSize)
-  {
-    $this->maxDiskSize = $maxDiskSize;
-  }
-  public function getMaxDiskSize()
-  {
-    return $this->maxDiskSize;
-  }
-  public function setName($name)
-  {
-    $this->name = $name;
-  }
-  public function getName()
-  {
-    return $this->name;
-  }
-  public function setOnPremisesConfiguration(Google_Service_SQLAdmin_OnPremisesConfiguration $onPremisesConfiguration)
-  {
-    $this->onPremisesConfiguration = $onPremisesConfiguration;
-  }
-  public function getOnPremisesConfiguration()
-  {
-    return $this->onPremisesConfiguration;
-  }
-  public function setProject($project)
-  {
-    $this->project = $project;
-  }
-  public function getProject()
-  {
-    return $this->project;
-  }
-  public function setRegion($region)
-  {
-    $this->region = $region;
-  }
-  public function getRegion()
-  {
-    return $this->region;
-  }
-  public function setReplicaConfiguration(Google_Service_SQLAdmin_ReplicaConfiguration $replicaConfiguration)
-  {
-    $this->replicaConfiguration = $replicaConfiguration;
-  }
-  public function getReplicaConfiguration()
-  {
-    return $this->replicaConfiguration;
-  }
-  public function setReplicaNames($replicaNames)
-  {
-    $this->replicaNames = $replicaNames;
-  }
-  public function getReplicaNames()
-  {
-    return $this->replicaNames;
-  }
-  public function setSelfLink($selfLink)
-  {
-    $this->selfLink = $selfLink;
-  }
-  public function getSelfLink()
-  {
-    return $this->selfLink;
-  }
-  public function setServerCaCert(Google_Service_SQLAdmin_SslCert $serverCaCert)
-  {
-    $this->serverCaCert = $serverCaCert;
-  }
-  public function getServerCaCert()
-  {
-    return $this->serverCaCert;
-  }
-  public function setServiceAccountEmailAddress($serviceAccountEmailAddress)
-  {
-    $this->serviceAccountEmailAddress = $serviceAccountEmailAddress;
-  }
-  public function getServiceAccountEmailAddress()
-  {
-    return $this->serviceAccountEmailAddress;
-  }
-  public function setSettings(Google_Service_SQLAdmin_Settings $settings)
-  {
-    $this->settings = $settings;
-  }
-  public function getSettings()
-  {
-    return $this->settings;
-  }
-  public function setState($state)
-  {
-    $this->state = $state;
-  }
-  public function getState()
-  {
-    return $this->state;
-  }
-  public function setSuspensionReason($suspensionReason)
-  {
-    $this->suspensionReason = $suspensionReason;
-  }
-  public function getSuspensionReason()
-  {
-    return $this->suspensionReason;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/SQLAdmin/DatabaseInstanceFailoverReplica.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/SQLAdmin/DatabaseInstanceFailoverReplica.php
deleted file mode 100644
index f9a22dc0..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/SQLAdmin/DatabaseInstanceFailoverReplica.php
+++ /dev/null
@@ -1,39 +0,0 @@
-available = $available;
-  }
-  public function getAvailable()
-  {
-    return $this->available;
-  }
-  public function setName($name)
-  {
-    $this->name = $name;
-  }
-  public function getName()
-  {
-    return $this->name;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/SQLAdmin/DatabasesListResponse.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/SQLAdmin/DatabasesListResponse.php
deleted file mode 100644
index b74a7010..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/SQLAdmin/DatabasesListResponse.php
+++ /dev/null
@@ -1,41 +0,0 @@
-items = $items;
-  }
-  public function getItems()
-  {
-    return $this->items;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/SQLAdmin/ExportContext.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/SQLAdmin/ExportContext.php
deleted file mode 100644
index fd64961d..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/SQLAdmin/ExportContext.php
+++ /dev/null
@@ -1,78 +0,0 @@
-csvExportOptions = $csvExportOptions;
-  }
-  public function getCsvExportOptions()
-  {
-    return $this->csvExportOptions;
-  }
-  public function setDatabases($databases)
-  {
-    $this->databases = $databases;
-  }
-  public function getDatabases()
-  {
-    return $this->databases;
-  }
-  public function setFileType($fileType)
-  {
-    $this->fileType = $fileType;
-  }
-  public function getFileType()
-  {
-    return $this->fileType;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setSqlExportOptions(Google_Service_SQLAdmin_ExportContextSqlExportOptions $sqlExportOptions)
-  {
-    $this->sqlExportOptions = $sqlExportOptions;
-  }
-  public function getSqlExportOptions()
-  {
-    return $this->sqlExportOptions;
-  }
-  public function setUri($uri)
-  {
-    $this->uri = $uri;
-  }
-  public function getUri()
-  {
-    return $this->uri;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/SQLAdmin/ExportContextCsvExportOptions.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/SQLAdmin/ExportContextCsvExportOptions.php
deleted file mode 100644
index 0e4a21ba..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/SQLAdmin/ExportContextCsvExportOptions.php
+++ /dev/null
@@ -1,30 +0,0 @@
-selectQuery = $selectQuery;
-  }
-  public function getSelectQuery()
-  {
-    return $this->selectQuery;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/SQLAdmin/ExportContextSqlExportOptions.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/SQLAdmin/ExportContextSqlExportOptions.php
deleted file mode 100644
index 8b78affe..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/SQLAdmin/ExportContextSqlExportOptions.php
+++ /dev/null
@@ -1,40 +0,0 @@
-schemaOnly = $schemaOnly;
-  }
-  public function getSchemaOnly()
-  {
-    return $this->schemaOnly;
-  }
-  public function setTables($tables)
-  {
-    $this->tables = $tables;
-  }
-  public function getTables()
-  {
-    return $this->tables;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/SQLAdmin/FailoverContext.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/SQLAdmin/FailoverContext.php
deleted file mode 100644
index 07de18a7..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/SQLAdmin/FailoverContext.php
+++ /dev/null
@@ -1,39 +0,0 @@
-kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setSettingsVersion($settingsVersion)
-  {
-    $this->settingsVersion = $settingsVersion;
-  }
-  public function getSettingsVersion()
-  {
-    return $this->settingsVersion;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/SQLAdmin/Flag.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/SQLAdmin/Flag.php
deleted file mode 100644
index ebe43c2f..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/SQLAdmin/Flag.php
+++ /dev/null
@@ -1,94 +0,0 @@
-allowedStringValues = $allowedStringValues;
-  }
-  public function getAllowedStringValues()
-  {
-    return $this->allowedStringValues;
-  }
-  public function setAppliesTo($appliesTo)
-  {
-    $this->appliesTo = $appliesTo;
-  }
-  public function getAppliesTo()
-  {
-    return $this->appliesTo;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setMaxValue($maxValue)
-  {
-    $this->maxValue = $maxValue;
-  }
-  public function getMaxValue()
-  {
-    return $this->maxValue;
-  }
-  public function setMinValue($minValue)
-  {
-    $this->minValue = $minValue;
-  }
-  public function getMinValue()
-  {
-    return $this->minValue;
-  }
-  public function setName($name)
-  {
-    $this->name = $name;
-  }
-  public function getName()
-  {
-    return $this->name;
-  }
-  public function setRequiresRestart($requiresRestart)
-  {
-    $this->requiresRestart = $requiresRestart;
-  }
-  public function getRequiresRestart()
-  {
-    return $this->requiresRestart;
-  }
-  public function setType($type)
-  {
-    $this->type = $type;
-  }
-  public function getType()
-  {
-    return $this->type;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/SQLAdmin/FlagsListResponse.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/SQLAdmin/FlagsListResponse.php
deleted file mode 100644
index c5616917..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/SQLAdmin/FlagsListResponse.php
+++ /dev/null
@@ -1,41 +0,0 @@
-items = $items;
-  }
-  public function getItems()
-  {
-    return $this->items;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/SQLAdmin/ImportContext.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/SQLAdmin/ImportContext.php
deleted file mode 100644
index a81111c4..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/SQLAdmin/ImportContext.php
+++ /dev/null
@@ -1,67 +0,0 @@
-csvImportOptions = $csvImportOptions;
-  }
-  public function getCsvImportOptions()
-  {
-    return $this->csvImportOptions;
-  }
-  public function setDatabase($database)
-  {
-    $this->database = $database;
-  }
-  public function getDatabase()
-  {
-    return $this->database;
-  }
-  public function setFileType($fileType)
-  {
-    $this->fileType = $fileType;
-  }
-  public function getFileType()
-  {
-    return $this->fileType;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setUri($uri)
-  {
-    $this->uri = $uri;
-  }
-  public function getUri()
-  {
-    return $this->uri;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/SQLAdmin/ImportContextCsvImportOptions.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/SQLAdmin/ImportContextCsvImportOptions.php
deleted file mode 100644
index e0bfd089..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/SQLAdmin/ImportContextCsvImportOptions.php
+++ /dev/null
@@ -1,40 +0,0 @@
-columns = $columns;
-  }
-  public function getColumns()
-  {
-    return $this->columns;
-  }
-  public function setTable($table)
-  {
-    $this->table = $table;
-  }
-  public function getTable()
-  {
-    return $this->table;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/SQLAdmin/InstancesCloneRequest.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/SQLAdmin/InstancesCloneRequest.php
deleted file mode 100644
index 8a8e5754..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/SQLAdmin/InstancesCloneRequest.php
+++ /dev/null
@@ -1,31 +0,0 @@
-cloneContext = $cloneContext;
-  }
-  public function getCloneContext()
-  {
-    return $this->cloneContext;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/SQLAdmin/InstancesExportRequest.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/SQLAdmin/InstancesExportRequest.php
deleted file mode 100644
index 0b00dda6..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/SQLAdmin/InstancesExportRequest.php
+++ /dev/null
@@ -1,31 +0,0 @@
-exportContext = $exportContext;
-  }
-  public function getExportContext()
-  {
-    return $this->exportContext;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/SQLAdmin/InstancesFailoverRequest.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/SQLAdmin/InstancesFailoverRequest.php
deleted file mode 100644
index c003108a..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/SQLAdmin/InstancesFailoverRequest.php
+++ /dev/null
@@ -1,31 +0,0 @@
-failoverContext = $failoverContext;
-  }
-  public function getFailoverContext()
-  {
-    return $this->failoverContext;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/SQLAdmin/InstancesImportRequest.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/SQLAdmin/InstancesImportRequest.php
deleted file mode 100644
index cdbf3d39..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/SQLAdmin/InstancesImportRequest.php
+++ /dev/null
@@ -1,31 +0,0 @@
-importContext = $importContext;
-  }
-  public function getImportContext()
-  {
-    return $this->importContext;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/SQLAdmin/InstancesListResponse.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/SQLAdmin/InstancesListResponse.php
deleted file mode 100644
index 31fbb1ec..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/SQLAdmin/InstancesListResponse.php
+++ /dev/null
@@ -1,50 +0,0 @@
-items = $items;
-  }
-  public function getItems()
-  {
-    return $this->items;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setNextPageToken($nextPageToken)
-  {
-    $this->nextPageToken = $nextPageToken;
-  }
-  public function getNextPageToken()
-  {
-    return $this->nextPageToken;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/SQLAdmin/InstancesRestoreBackupRequest.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/SQLAdmin/InstancesRestoreBackupRequest.php
deleted file mode 100644
index 23cbfd5f..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/SQLAdmin/InstancesRestoreBackupRequest.php
+++ /dev/null
@@ -1,31 +0,0 @@
-restoreBackupContext = $restoreBackupContext;
-  }
-  public function getRestoreBackupContext()
-  {
-    return $this->restoreBackupContext;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/SQLAdmin/InstancesTruncateLogRequest.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/SQLAdmin/InstancesTruncateLogRequest.php
deleted file mode 100644
index fb5e9910..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/SQLAdmin/InstancesTruncateLogRequest.php
+++ /dev/null
@@ -1,31 +0,0 @@
-truncateLogContext = $truncateLogContext;
-  }
-  public function getTruncateLogContext()
-  {
-    return $this->truncateLogContext;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/SQLAdmin/IpConfiguration.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/SQLAdmin/IpConfiguration.php
deleted file mode 100644
index bf6dcdac..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/SQLAdmin/IpConfiguration.php
+++ /dev/null
@@ -1,50 +0,0 @@
-authorizedNetworks = $authorizedNetworks;
-  }
-  public function getAuthorizedNetworks()
-  {
-    return $this->authorizedNetworks;
-  }
-  public function setIpv4Enabled($ipv4Enabled)
-  {
-    $this->ipv4Enabled = $ipv4Enabled;
-  }
-  public function getIpv4Enabled()
-  {
-    return $this->ipv4Enabled;
-  }
-  public function setRequireSsl($requireSsl)
-  {
-    $this->requireSsl = $requireSsl;
-  }
-  public function getRequireSsl()
-  {
-    return $this->requireSsl;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/SQLAdmin/IpMapping.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/SQLAdmin/IpMapping.php
deleted file mode 100644
index e63e278a..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/SQLAdmin/IpMapping.php
+++ /dev/null
@@ -1,48 +0,0 @@
-ipAddress = $ipAddress;
-  }
-  public function getIpAddress()
-  {
-    return $this->ipAddress;
-  }
-  public function setTimeToRetire($timeToRetire)
-  {
-    $this->timeToRetire = $timeToRetire;
-  }
-  public function getTimeToRetire()
-  {
-    return $this->timeToRetire;
-  }
-  public function setType($type)
-  {
-    $this->type = $type;
-  }
-  public function getType()
-  {
-    return $this->type;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/SQLAdmin/Labels.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/SQLAdmin/Labels.php
deleted file mode 100644
index b3653abb..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/SQLAdmin/Labels.php
+++ /dev/null
@@ -1,39 +0,0 @@
-key = $key;
-  }
-  public function getKey()
-  {
-    return $this->key;
-  }
-  public function setValue($value)
-  {
-    $this->value = $value;
-  }
-  public function getValue()
-  {
-    return $this->value;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/SQLAdmin/LocationPreference.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/SQLAdmin/LocationPreference.php
deleted file mode 100644
index 9a81e1d0..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/SQLAdmin/LocationPreference.php
+++ /dev/null
@@ -1,48 +0,0 @@
-followGaeApplication = $followGaeApplication;
-  }
-  public function getFollowGaeApplication()
-  {
-    return $this->followGaeApplication;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setZone($zone)
-  {
-    $this->zone = $zone;
-  }
-  public function getZone()
-  {
-    return $this->zone;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/SQLAdmin/MaintenanceWindow.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/SQLAdmin/MaintenanceWindow.php
deleted file mode 100644
index 970da198..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/SQLAdmin/MaintenanceWindow.php
+++ /dev/null
@@ -1,57 +0,0 @@
-day = $day;
-  }
-  public function getDay()
-  {
-    return $this->day;
-  }
-  public function setHour($hour)
-  {
-    $this->hour = $hour;
-  }
-  public function getHour()
-  {
-    return $this->hour;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setUpdateTrack($updateTrack)
-  {
-    $this->updateTrack = $updateTrack;
-  }
-  public function getUpdateTrack()
-  {
-    return $this->updateTrack;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/SQLAdmin/MySqlReplicaConfiguration.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/SQLAdmin/MySqlReplicaConfiguration.php
deleted file mode 100644
index f4a1e515..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/SQLAdmin/MySqlReplicaConfiguration.php
+++ /dev/null
@@ -1,120 +0,0 @@
-caCertificate = $caCertificate;
-  }
-  public function getCaCertificate()
-  {
-    return $this->caCertificate;
-  }
-  public function setClientCertificate($clientCertificate)
-  {
-    $this->clientCertificate = $clientCertificate;
-  }
-  public function getClientCertificate()
-  {
-    return $this->clientCertificate;
-  }
-  public function setClientKey($clientKey)
-  {
-    $this->clientKey = $clientKey;
-  }
-  public function getClientKey()
-  {
-    return $this->clientKey;
-  }
-  public function setConnectRetryInterval($connectRetryInterval)
-  {
-    $this->connectRetryInterval = $connectRetryInterval;
-  }
-  public function getConnectRetryInterval()
-  {
-    return $this->connectRetryInterval;
-  }
-  public function setDumpFilePath($dumpFilePath)
-  {
-    $this->dumpFilePath = $dumpFilePath;
-  }
-  public function getDumpFilePath()
-  {
-    return $this->dumpFilePath;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setMasterHeartbeatPeriod($masterHeartbeatPeriod)
-  {
-    $this->masterHeartbeatPeriod = $masterHeartbeatPeriod;
-  }
-  public function getMasterHeartbeatPeriod()
-  {
-    return $this->masterHeartbeatPeriod;
-  }
-  public function setPassword($password)
-  {
-    $this->password = $password;
-  }
-  public function getPassword()
-  {
-    return $this->password;
-  }
-  public function setSslCipher($sslCipher)
-  {
-    $this->sslCipher = $sslCipher;
-  }
-  public function getSslCipher()
-  {
-    return $this->sslCipher;
-  }
-  public function setUsername($username)
-  {
-    $this->username = $username;
-  }
-  public function getUsername()
-  {
-    return $this->username;
-  }
-  public function setVerifyServerCertificate($verifyServerCertificate)
-  {
-    $this->verifyServerCertificate = $verifyServerCertificate;
-  }
-  public function getVerifyServerCertificate()
-  {
-    return $this->verifyServerCertificate;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/SQLAdmin/OnPremisesConfiguration.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/SQLAdmin/OnPremisesConfiguration.php
deleted file mode 100644
index 962c8ba2..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/SQLAdmin/OnPremisesConfiguration.php
+++ /dev/null
@@ -1,39 +0,0 @@
-hostPort = $hostPort;
-  }
-  public function getHostPort()
-  {
-    return $this->hostPort;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/SQLAdmin/Operation.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/SQLAdmin/Operation.php
deleted file mode 100644
index ab7797db..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/SQLAdmin/Operation.php
+++ /dev/null
@@ -1,159 +0,0 @@
-endTime = $endTime;
-  }
-  public function getEndTime()
-  {
-    return $this->endTime;
-  }
-  public function setError(Google_Service_SQLAdmin_OperationErrors $error)
-  {
-    $this->error = $error;
-  }
-  public function getError()
-  {
-    return $this->error;
-  }
-  public function setExportContext(Google_Service_SQLAdmin_ExportContext $exportContext)
-  {
-    $this->exportContext = $exportContext;
-  }
-  public function getExportContext()
-  {
-    return $this->exportContext;
-  }
-  public function setImportContext(Google_Service_SQLAdmin_ImportContext $importContext)
-  {
-    $this->importContext = $importContext;
-  }
-  public function getImportContext()
-  {
-    return $this->importContext;
-  }
-  public function setInsertTime($insertTime)
-  {
-    $this->insertTime = $insertTime;
-  }
-  public function getInsertTime()
-  {
-    return $this->insertTime;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setName($name)
-  {
-    $this->name = $name;
-  }
-  public function getName()
-  {
-    return $this->name;
-  }
-  public function setOperationType($operationType)
-  {
-    $this->operationType = $operationType;
-  }
-  public function getOperationType()
-  {
-    return $this->operationType;
-  }
-  public function setSelfLink($selfLink)
-  {
-    $this->selfLink = $selfLink;
-  }
-  public function getSelfLink()
-  {
-    return $this->selfLink;
-  }
-  public function setStartTime($startTime)
-  {
-    $this->startTime = $startTime;
-  }
-  public function getStartTime()
-  {
-    return $this->startTime;
-  }
-  public function setStatus($status)
-  {
-    $this->status = $status;
-  }
-  public function getStatus()
-  {
-    return $this->status;
-  }
-  public function setTargetId($targetId)
-  {
-    $this->targetId = $targetId;
-  }
-  public function getTargetId()
-  {
-    return $this->targetId;
-  }
-  public function setTargetLink($targetLink)
-  {
-    $this->targetLink = $targetLink;
-  }
-  public function getTargetLink()
-  {
-    return $this->targetLink;
-  }
-  public function setTargetProject($targetProject)
-  {
-    $this->targetProject = $targetProject;
-  }
-  public function getTargetProject()
-  {
-    return $this->targetProject;
-  }
-  public function setUser($user)
-  {
-    $this->user = $user;
-  }
-  public function getUser()
-  {
-    return $this->user;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/SQLAdmin/OperationError.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/SQLAdmin/OperationError.php
deleted file mode 100644
index 431da35b..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/SQLAdmin/OperationError.php
+++ /dev/null
@@ -1,48 +0,0 @@
-code = $code;
-  }
-  public function getCode()
-  {
-    return $this->code;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setMessage($message)
-  {
-    $this->message = $message;
-  }
-  public function getMessage()
-  {
-    return $this->message;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/SQLAdmin/OperationErrors.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/SQLAdmin/OperationErrors.php
deleted file mode 100644
index 8bcbec4a..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/SQLAdmin/OperationErrors.php
+++ /dev/null
@@ -1,41 +0,0 @@
-errors = $errors;
-  }
-  public function getErrors()
-  {
-    return $this->errors;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/SQLAdmin/OperationsListResponse.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/SQLAdmin/OperationsListResponse.php
deleted file mode 100644
index d8d9eed6..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/SQLAdmin/OperationsListResponse.php
+++ /dev/null
@@ -1,50 +0,0 @@
-items = $items;
-  }
-  public function getItems()
-  {
-    return $this->items;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setNextPageToken($nextPageToken)
-  {
-    $this->nextPageToken = $nextPageToken;
-  }
-  public function getNextPageToken()
-  {
-    return $this->nextPageToken;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/SQLAdmin/ReplicaConfiguration.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/SQLAdmin/ReplicaConfiguration.php
deleted file mode 100644
index 105758b9..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/SQLAdmin/ReplicaConfiguration.php
+++ /dev/null
@@ -1,49 +0,0 @@
-failoverTarget = $failoverTarget;
-  }
-  public function getFailoverTarget()
-  {
-    return $this->failoverTarget;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setMysqlReplicaConfiguration(Google_Service_SQLAdmin_MySqlReplicaConfiguration $mysqlReplicaConfiguration)
-  {
-    $this->mysqlReplicaConfiguration = $mysqlReplicaConfiguration;
-  }
-  public function getMysqlReplicaConfiguration()
-  {
-    return $this->mysqlReplicaConfiguration;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/SQLAdmin/Resource/BackupRuns.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/SQLAdmin/Resource/BackupRuns.php
deleted file mode 100644
index f6a5fb17..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/SQLAdmin/Resource/BackupRuns.php
+++ /dev/null
@@ -1,100 +0,0 @@
-
- *   $sqladminService = new Google_Service_SQLAdmin(...);
- *   $backupRuns = $sqladminService->backupRuns;
- *  
- */
-class Google_Service_SQLAdmin_Resource_BackupRuns extends Google_Service_Resource
-{
-  /**
-   * Deletes the backup taken by a backup run. (backupRuns.delete)
-   *
-   * @param string $project Project ID of the project that contains the instance.
-   * @param string $instance Cloud SQL instance ID. This does not include the
-   * project ID.
-   * @param string $id The ID of the Backup Run to delete. To find a Backup Run
-   * ID, use the list method.
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_SQLAdmin_Operation
-   */
-  public function delete($project, $instance, $id, $optParams = array())
-  {
-    $params = array('project' => $project, 'instance' => $instance, 'id' => $id);
-    $params = array_merge($params, $optParams);
-    return $this->call('delete', array($params), "Google_Service_SQLAdmin_Operation");
-  }
-  /**
-   * Retrieves a resource containing information about a backup run.
-   * (backupRuns.get)
-   *
-   * @param string $project Project ID of the project that contains the instance.
-   * @param string $instance Cloud SQL instance ID. This does not include the
-   * project ID.
-   * @param string $id The ID of this Backup Run.
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_SQLAdmin_BackupRun
-   */
-  public function get($project, $instance, $id, $optParams = array())
-  {
-    $params = array('project' => $project, 'instance' => $instance, 'id' => $id);
-    $params = array_merge($params, $optParams);
-    return $this->call('get', array($params), "Google_Service_SQLAdmin_BackupRun");
-  }
-  /**
-   * Creates a new backup run on demand. This method is applicable only to Second
-   * Generation instances. (backupRuns.insert)
-   *
-   * @param string $project Project ID of the project that contains the instance.
-   * @param string $instance Cloud SQL instance ID. This does not include the
-   * project ID.
-   * @param Google_Service_SQLAdmin_BackupRun $postBody
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_SQLAdmin_Operation
-   */
-  public function insert($project, $instance, Google_Service_SQLAdmin_BackupRun $postBody, $optParams = array())
-  {
-    $params = array('project' => $project, 'instance' => $instance, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('insert', array($params), "Google_Service_SQLAdmin_Operation");
-  }
-  /**
-   * Lists all backup runs associated with a given instance and configuration in
-   * the reverse chronological order of the enqueued time.
-   * (backupRuns.listBackupRuns)
-   *
-   * @param string $project Project ID of the project that contains the instance.
-   * @param string $instance Cloud SQL instance ID. This does not include the
-   * project ID.
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param int maxResults Maximum number of backup runs per response.
-   * @opt_param string pageToken A previously-returned page token representing
-   * part of the larger set of results to view.
-   * @return Google_Service_SQLAdmin_BackupRunsListResponse
-   */
-  public function listBackupRuns($project, $instance, $optParams = array())
-  {
-    $params = array('project' => $project, 'instance' => $instance);
-    $params = array_merge($params, $optParams);
-    return $this->call('list', array($params), "Google_Service_SQLAdmin_BackupRunsListResponse");
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/SQLAdmin/Resource/Databases.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/SQLAdmin/Resource/Databases.php
deleted file mode 100644
index 3893b526..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/SQLAdmin/Resource/Databases.php
+++ /dev/null
@@ -1,131 +0,0 @@
-
- *   $sqladminService = new Google_Service_SQLAdmin(...);
- *   $databases = $sqladminService->databases;
- *  
- */
-class Google_Service_SQLAdmin_Resource_Databases extends Google_Service_Resource
-{
-  /**
-   * Deletes a database from a Cloud SQL instance. (databases.delete)
-   *
-   * @param string $project Project ID of the project that contains the instance.
-   * @param string $instance Database instance ID. This does not include the
-   * project ID.
-   * @param string $database Name of the database to be deleted in the instance.
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_SQLAdmin_Operation
-   */
-  public function delete($project, $instance, $database, $optParams = array())
-  {
-    $params = array('project' => $project, 'instance' => $instance, 'database' => $database);
-    $params = array_merge($params, $optParams);
-    return $this->call('delete', array($params), "Google_Service_SQLAdmin_Operation");
-  }
-  /**
-   * Retrieves a resource containing information about a database inside a Cloud
-   * SQL instance. (databases.get)
-   *
-   * @param string $project Project ID of the project that contains the instance.
-   * @param string $instance Database instance ID. This does not include the
-   * project ID.
-   * @param string $database Name of the database in the instance.
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_SQLAdmin_Database
-   */
-  public function get($project, $instance, $database, $optParams = array())
-  {
-    $params = array('project' => $project, 'instance' => $instance, 'database' => $database);
-    $params = array_merge($params, $optParams);
-    return $this->call('get', array($params), "Google_Service_SQLAdmin_Database");
-  }
-  /**
-   * Inserts a resource containing information about a database inside a Cloud SQL
-   * instance. (databases.insert)
-   *
-   * @param string $project Project ID of the project that contains the instance.
-   * @param string $instance Database instance ID. This does not include the
-   * project ID.
-   * @param Google_Service_SQLAdmin_Database $postBody
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_SQLAdmin_Operation
-   */
-  public function insert($project, $instance, Google_Service_SQLAdmin_Database $postBody, $optParams = array())
-  {
-    $params = array('project' => $project, 'instance' => $instance, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('insert', array($params), "Google_Service_SQLAdmin_Operation");
-  }
-  /**
-   * Lists databases in the specified Cloud SQL instance.
-   * (databases.listDatabases)
-   *
-   * @param string $project Project ID of the project for which to list Cloud SQL
-   * instances.
-   * @param string $instance Cloud SQL instance ID. This does not include the
-   * project ID.
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_SQLAdmin_DatabasesListResponse
-   */
-  public function listDatabases($project, $instance, $optParams = array())
-  {
-    $params = array('project' => $project, 'instance' => $instance);
-    $params = array_merge($params, $optParams);
-    return $this->call('list', array($params), "Google_Service_SQLAdmin_DatabasesListResponse");
-  }
-  /**
-   * Updates a resource containing information about a database inside a Cloud SQL
-   * instance. This method supports patch semantics. (databases.patch)
-   *
-   * @param string $project Project ID of the project that contains the instance.
-   * @param string $instance Database instance ID. This does not include the
-   * project ID.
-   * @param string $database Name of the database to be updated in the instance.
-   * @param Google_Service_SQLAdmin_Database $postBody
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_SQLAdmin_Operation
-   */
-  public function patch($project, $instance, $database, Google_Service_SQLAdmin_Database $postBody, $optParams = array())
-  {
-    $params = array('project' => $project, 'instance' => $instance, 'database' => $database, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('patch', array($params), "Google_Service_SQLAdmin_Operation");
-  }
-  /**
-   * Updates a resource containing information about a database inside a Cloud SQL
-   * instance. (databases.update)
-   *
-   * @param string $project Project ID of the project that contains the instance.
-   * @param string $instance Database instance ID. This does not include the
-   * project ID.
-   * @param string $database Name of the database to be updated in the instance.
-   * @param Google_Service_SQLAdmin_Database $postBody
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_SQLAdmin_Operation
-   */
-  public function update($project, $instance, $database, Google_Service_SQLAdmin_Database $postBody, $optParams = array())
-  {
-    $params = array('project' => $project, 'instance' => $instance, 'database' => $database, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('update', array($params), "Google_Service_SQLAdmin_Operation");
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/SQLAdmin/Resource/Flags.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/SQLAdmin/Resource/Flags.php
deleted file mode 100644
index c1a886e5..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/SQLAdmin/Resource/Flags.php
+++ /dev/null
@@ -1,44 +0,0 @@
-
- *   $sqladminService = new Google_Service_SQLAdmin(...);
- *   $flags = $sqladminService->flags;
- *  
- */
-class Google_Service_SQLAdmin_Resource_Flags extends Google_Service_Resource
-{
-  /**
-   * List all available database flags for Google Cloud SQL instances.
-   * (flags.listFlags)
-   *
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param string databaseVersion Database version for flag retrieval. Flags
-   * are specific to the database version.
-   * @return Google_Service_SQLAdmin_FlagsListResponse
-   */
-  public function listFlags($optParams = array())
-  {
-    $params = array();
-    $params = array_merge($params, $optParams);
-    return $this->call('list', array($params), "Google_Service_SQLAdmin_FlagsListResponse");
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/SQLAdmin/Resource/Instances.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/SQLAdmin/Resource/Instances.php
deleted file mode 100644
index 4aa20919..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/SQLAdmin/Resource/Instances.php
+++ /dev/null
@@ -1,311 +0,0 @@
-
- *   $sqladminService = new Google_Service_SQLAdmin(...);
- *   $instances = $sqladminService->instances;
- *  
- */
-class Google_Service_SQLAdmin_Resource_Instances extends Google_Service_Resource
-{
-  /**
-   * Creates a Cloud SQL instance as a clone of the source instance. The API is
-   * not ready for Second Generation instances yet. (instances.cloneInstances)
-   *
-   * @param string $project Project ID of the source as well as the clone Cloud
-   * SQL instance.
-   * @param string $instance The ID of the Cloud SQL instance to be cloned
-   * (source). This does not include the project ID.
-   * @param Google_Service_SQLAdmin_InstancesCloneRequest $postBody
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_SQLAdmin_Operation
-   */
-  public function cloneInstances($project, $instance, Google_Service_SQLAdmin_InstancesCloneRequest $postBody, $optParams = array())
-  {
-    $params = array('project' => $project, 'instance' => $instance, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('clone', array($params), "Google_Service_SQLAdmin_Operation");
-  }
-  /**
-   * Deletes a Cloud SQL instance. (instances.delete)
-   *
-   * @param string $project Project ID of the project that contains the instance
-   * to be deleted.
-   * @param string $instance Cloud SQL instance ID. This does not include the
-   * project ID.
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_SQLAdmin_Operation
-   */
-  public function delete($project, $instance, $optParams = array())
-  {
-    $params = array('project' => $project, 'instance' => $instance);
-    $params = array_merge($params, $optParams);
-    return $this->call('delete', array($params), "Google_Service_SQLAdmin_Operation");
-  }
-  /**
-   * Exports data from a Cloud SQL instance to a Google Cloud Storage bucket as a
-   * MySQL dump file. (instances.export)
-   *
-   * @param string $project Project ID of the project that contains the instance
-   * to be exported.
-   * @param string $instance Cloud SQL instance ID. This does not include the
-   * project ID.
-   * @param Google_Service_SQLAdmin_InstancesExportRequest $postBody
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_SQLAdmin_Operation
-   */
-  public function export($project, $instance, Google_Service_SQLAdmin_InstancesExportRequest $postBody, $optParams = array())
-  {
-    $params = array('project' => $project, 'instance' => $instance, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('export', array($params), "Google_Service_SQLAdmin_Operation");
-  }
-  /**
-   * Failover the instance to its failover replica instance. (instances.failover)
-   *
-   * @param string $project ID of the project that contains the read replica.
-   * @param string $instance Cloud SQL instance ID. This does not include the
-   * project ID.
-   * @param Google_Service_SQLAdmin_InstancesFailoverRequest $postBody
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_SQLAdmin_Operation
-   */
-  public function failover($project, $instance, Google_Service_SQLAdmin_InstancesFailoverRequest $postBody, $optParams = array())
-  {
-    $params = array('project' => $project, 'instance' => $instance, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('failover', array($params), "Google_Service_SQLAdmin_Operation");
-  }
-  /**
-   * Retrieves a resource containing information about a Cloud SQL instance.
-   * (instances.get)
-   *
-   * @param string $project Project ID of the project that contains the instance.
-   * @param string $instance Database instance ID. This does not include the
-   * project ID.
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_SQLAdmin_DatabaseInstance
-   */
-  public function get($project, $instance, $optParams = array())
-  {
-    $params = array('project' => $project, 'instance' => $instance);
-    $params = array_merge($params, $optParams);
-    return $this->call('get', array($params), "Google_Service_SQLAdmin_DatabaseInstance");
-  }
-  /**
-   * Imports data into a Cloud SQL instance from a MySQL dump file in Google Cloud
-   * Storage. (instances.import)
-   *
-   * @param string $project Project ID of the project that contains the instance.
-   * @param string $instance Cloud SQL instance ID. This does not include the
-   * project ID.
-   * @param Google_Service_SQLAdmin_InstancesImportRequest $postBody
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_SQLAdmin_Operation
-   */
-  public function import($project, $instance, Google_Service_SQLAdmin_InstancesImportRequest $postBody, $optParams = array())
-  {
-    $params = array('project' => $project, 'instance' => $instance, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('import', array($params), "Google_Service_SQLAdmin_Operation");
-  }
-  /**
-   * Creates a new Cloud SQL instance. (instances.insert)
-   *
-   * @param string $project Project ID of the project to which the newly created
-   * Cloud SQL instances should belong.
-   * @param Google_Service_SQLAdmin_DatabaseInstance $postBody
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_SQLAdmin_Operation
-   */
-  public function insert($project, Google_Service_SQLAdmin_DatabaseInstance $postBody, $optParams = array())
-  {
-    $params = array('project' => $project, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('insert', array($params), "Google_Service_SQLAdmin_Operation");
-  }
-  /**
-   * Lists instances under a given project in the alphabetical order of the
-   * instance name. (instances.listInstances)
-   *
-   * @param string $project Project ID of the project for which to list Cloud SQL
-   * instances.
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param string filter A filter expression for filtering listed instances.
-   * @opt_param string maxResults The maximum number of results to return per
-   * response.
-   * @opt_param string pageToken A previously-returned page token representing
-   * part of the larger set of results to view.
-   * @return Google_Service_SQLAdmin_InstancesListResponse
-   */
-  public function listInstances($project, $optParams = array())
-  {
-    $params = array('project' => $project);
-    $params = array_merge($params, $optParams);
-    return $this->call('list', array($params), "Google_Service_SQLAdmin_InstancesListResponse");
-  }
-  /**
-   * Updates settings of a Cloud SQL instance. Caution: This is not a partial
-   * update, so you must include values for all the settings that you want to
-   * retain. For partial updates, use patch.. This method supports patch
-   * semantics. (instances.patch)
-   *
-   * @param string $project Project ID of the project that contains the instance.
-   * @param string $instance Cloud SQL instance ID. This does not include the
-   * project ID.
-   * @param Google_Service_SQLAdmin_DatabaseInstance $postBody
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_SQLAdmin_Operation
-   */
-  public function patch($project, $instance, Google_Service_SQLAdmin_DatabaseInstance $postBody, $optParams = array())
-  {
-    $params = array('project' => $project, 'instance' => $instance, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('patch', array($params), "Google_Service_SQLAdmin_Operation");
-  }
-  /**
-   * Promotes the read replica instance to be a stand-alone Cloud SQL instance.
-   * (instances.promoteReplica)
-   *
-   * @param string $project ID of the project that contains the read replica.
-   * @param string $instance Cloud SQL read replica instance name.
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_SQLAdmin_Operation
-   */
-  public function promoteReplica($project, $instance, $optParams = array())
-  {
-    $params = array('project' => $project, 'instance' => $instance);
-    $params = array_merge($params, $optParams);
-    return $this->call('promoteReplica', array($params), "Google_Service_SQLAdmin_Operation");
-  }
-  /**
-   * Deletes all client certificates and generates a new server SSL certificate
-   * for the instance. The changes will not take effect until the instance is
-   * restarted. Existing instances without a server certificate will need to call
-   * this once to set a server certificate. (instances.resetSslConfig)
-   *
-   * @param string $project Project ID of the project that contains the instance.
-   * @param string $instance Cloud SQL instance ID. This does not include the
-   * project ID.
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_SQLAdmin_Operation
-   */
-  public function resetSslConfig($project, $instance, $optParams = array())
-  {
-    $params = array('project' => $project, 'instance' => $instance);
-    $params = array_merge($params, $optParams);
-    return $this->call('resetSslConfig', array($params), "Google_Service_SQLAdmin_Operation");
-  }
-  /**
-   * Restarts a Cloud SQL instance. (instances.restart)
-   *
-   * @param string $project Project ID of the project that contains the instance
-   * to be restarted.
-   * @param string $instance Cloud SQL instance ID. This does not include the
-   * project ID.
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_SQLAdmin_Operation
-   */
-  public function restart($project, $instance, $optParams = array())
-  {
-    $params = array('project' => $project, 'instance' => $instance);
-    $params = array_merge($params, $optParams);
-    return $this->call('restart', array($params), "Google_Service_SQLAdmin_Operation");
-  }
-  /**
-   * Restores a backup of a Cloud SQL instance. (instances.restoreBackup)
-   *
-   * @param string $project Project ID of the project that contains the instance.
-   * @param string $instance Cloud SQL instance ID. This does not include the
-   * project ID.
-   * @param Google_Service_SQLAdmin_InstancesRestoreBackupRequest $postBody
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_SQLAdmin_Operation
-   */
-  public function restoreBackup($project, $instance, Google_Service_SQLAdmin_InstancesRestoreBackupRequest $postBody, $optParams = array())
-  {
-    $params = array('project' => $project, 'instance' => $instance, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('restoreBackup', array($params), "Google_Service_SQLAdmin_Operation");
-  }
-  /**
-   * Starts the replication in the read replica instance. (instances.startReplica)
-   *
-   * @param string $project ID of the project that contains the read replica.
-   * @param string $instance Cloud SQL read replica instance name.
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_SQLAdmin_Operation
-   */
-  public function startReplica($project, $instance, $optParams = array())
-  {
-    $params = array('project' => $project, 'instance' => $instance);
-    $params = array_merge($params, $optParams);
-    return $this->call('startReplica', array($params), "Google_Service_SQLAdmin_Operation");
-  }
-  /**
-   * Stops the replication in the read replica instance. (instances.stopReplica)
-   *
-   * @param string $project ID of the project that contains the read replica.
-   * @param string $instance Cloud SQL read replica instance name.
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_SQLAdmin_Operation
-   */
-  public function stopReplica($project, $instance, $optParams = array())
-  {
-    $params = array('project' => $project, 'instance' => $instance);
-    $params = array_merge($params, $optParams);
-    return $this->call('stopReplica', array($params), "Google_Service_SQLAdmin_Operation");
-  }
-  /**
-   * Truncate MySQL general and slow query log tables (instances.truncateLog)
-   *
-   * @param string $project Project ID of the Cloud SQL project.
-   * @param string $instance Cloud SQL instance ID. This does not include the
-   * project ID.
-   * @param Google_Service_SQLAdmin_InstancesTruncateLogRequest $postBody
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_SQLAdmin_Operation
-   */
-  public function truncateLog($project, $instance, Google_Service_SQLAdmin_InstancesTruncateLogRequest $postBody, $optParams = array())
-  {
-    $params = array('project' => $project, 'instance' => $instance, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('truncateLog', array($params), "Google_Service_SQLAdmin_Operation");
-  }
-  /**
-   * Updates settings of a Cloud SQL instance. Caution: This is not a partial
-   * update, so you must include values for all the settings that you want to
-   * retain. For partial updates, use patch. (instances.update)
-   *
-   * @param string $project Project ID of the project that contains the instance.
-   * @param string $instance Cloud SQL instance ID. This does not include the
-   * project ID.
-   * @param Google_Service_SQLAdmin_DatabaseInstance $postBody
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_SQLAdmin_Operation
-   */
-  public function update($project, $instance, Google_Service_SQLAdmin_DatabaseInstance $postBody, $optParams = array())
-  {
-    $params = array('project' => $project, 'instance' => $instance, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('update', array($params), "Google_Service_SQLAdmin_Operation");
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/SQLAdmin/Resource/Operations.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/SQLAdmin/Resource/Operations.php
deleted file mode 100644
index e7f9684a..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/SQLAdmin/Resource/Operations.php
+++ /dev/null
@@ -1,64 +0,0 @@
-
- *   $sqladminService = new Google_Service_SQLAdmin(...);
- *   $operations = $sqladminService->operations;
- *  
- */
-class Google_Service_SQLAdmin_Resource_Operations extends Google_Service_Resource
-{
-  /**
-   * Retrieves an instance operation that has been performed on an instance.
-   * (operations.get)
-   *
-   * @param string $project Project ID of the project that contains the instance.
-   * @param string $operation Instance operation ID.
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_SQLAdmin_Operation
-   */
-  public function get($project, $operation, $optParams = array())
-  {
-    $params = array('project' => $project, 'operation' => $operation);
-    $params = array_merge($params, $optParams);
-    return $this->call('get', array($params), "Google_Service_SQLAdmin_Operation");
-  }
-  /**
-   * Lists all instance operations that have been performed on the given Cloud SQL
-   * instance in the reverse chronological order of the start time.
-   * (operations.listOperations)
-   *
-   * @param string $project Project ID of the project that contains the instance.
-   * @param string $instance Cloud SQL instance ID. This does not include the
-   * project ID.
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param string maxResults Maximum number of operations per response.
-   * @opt_param string pageToken A previously-returned page token representing
-   * part of the larger set of results to view.
-   * @return Google_Service_SQLAdmin_OperationsListResponse
-   */
-  public function listOperations($project, $instance, $optParams = array())
-  {
-    $params = array('project' => $project, 'instance' => $instance);
-    $params = array_merge($params, $optParams);
-    return $this->call('list', array($params), "Google_Service_SQLAdmin_OperationsListResponse");
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/SQLAdmin/Resource/SslCerts.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/SQLAdmin/Resource/SslCerts.php
deleted file mode 100644
index be44ef8b..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/SQLAdmin/Resource/SslCerts.php
+++ /dev/null
@@ -1,119 +0,0 @@
-
- *   $sqladminService = new Google_Service_SQLAdmin(...);
- *   $sslCerts = $sqladminService->sslCerts;
- *  
- */
-class Google_Service_SQLAdmin_Resource_SslCerts extends Google_Service_Resource
-{
-  /**
-   * Generates a short-lived X509 certificate containing the provided public key
-   * and signed by a private key specific to the target instance. Users may use
-   * the certificate to authenticate as themselves when connecting to the
-   * database. (sslCerts.createEphemeral)
-   *
-   * @param string $project Project ID of the Cloud SQL project.
-   * @param string $instance Cloud SQL instance ID. This does not include the
-   * project ID.
-   * @param Google_Service_SQLAdmin_SslCertsCreateEphemeralRequest $postBody
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_SQLAdmin_SslCert
-   */
-  public function createEphemeral($project, $instance, Google_Service_SQLAdmin_SslCertsCreateEphemeralRequest $postBody, $optParams = array())
-  {
-    $params = array('project' => $project, 'instance' => $instance, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('createEphemeral', array($params), "Google_Service_SQLAdmin_SslCert");
-  }
-  /**
-   * Deletes the SSL certificate. The change will not take effect until the
-   * instance is restarted. (sslCerts.delete)
-   *
-   * @param string $project Project ID of the project that contains the instance
-   * to be deleted.
-   * @param string $instance Cloud SQL instance ID. This does not include the
-   * project ID.
-   * @param string $sha1Fingerprint Sha1 FingerPrint.
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_SQLAdmin_Operation
-   */
-  public function delete($project, $instance, $sha1Fingerprint, $optParams = array())
-  {
-    $params = array('project' => $project, 'instance' => $instance, 'sha1Fingerprint' => $sha1Fingerprint);
-    $params = array_merge($params, $optParams);
-    return $this->call('delete', array($params), "Google_Service_SQLAdmin_Operation");
-  }
-  /**
-   * Retrieves a particular SSL certificate. Does not include the private key
-   * (required for usage). The private key must be saved from the response to
-   * initial creation. (sslCerts.get)
-   *
-   * @param string $project Project ID of the project that contains the instance.
-   * @param string $instance Cloud SQL instance ID. This does not include the
-   * project ID.
-   * @param string $sha1Fingerprint Sha1 FingerPrint.
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_SQLAdmin_SslCert
-   */
-  public function get($project, $instance, $sha1Fingerprint, $optParams = array())
-  {
-    $params = array('project' => $project, 'instance' => $instance, 'sha1Fingerprint' => $sha1Fingerprint);
-    $params = array_merge($params, $optParams);
-    return $this->call('get', array($params), "Google_Service_SQLAdmin_SslCert");
-  }
-  /**
-   * Creates an SSL certificate and returns it along with the private key and
-   * server certificate authority. The new certificate will not be usable until
-   * the instance is restarted. (sslCerts.insert)
-   *
-   * @param string $project Project ID of the project to which the newly created
-   * Cloud SQL instances should belong.
-   * @param string $instance Cloud SQL instance ID. This does not include the
-   * project ID.
-   * @param Google_Service_SQLAdmin_SslCertsInsertRequest $postBody
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_SQLAdmin_SslCertsInsertResponse
-   */
-  public function insert($project, $instance, Google_Service_SQLAdmin_SslCertsInsertRequest $postBody, $optParams = array())
-  {
-    $params = array('project' => $project, 'instance' => $instance, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('insert', array($params), "Google_Service_SQLAdmin_SslCertsInsertResponse");
-  }
-  /**
-   * Lists all of the current SSL certificates for the instance.
-   * (sslCerts.listSslCerts)
-   *
-   * @param string $project Project ID of the project for which to list Cloud SQL
-   * instances.
-   * @param string $instance Cloud SQL instance ID. This does not include the
-   * project ID.
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_SQLAdmin_SslCertsListResponse
-   */
-  public function listSslCerts($project, $instance, $optParams = array())
-  {
-    $params = array('project' => $project, 'instance' => $instance);
-    $params = array_merge($params, $optParams);
-    return $this->call('list', array($params), "Google_Service_SQLAdmin_SslCertsListResponse");
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/SQLAdmin/Resource/Tiers.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/SQLAdmin/Resource/Tiers.php
deleted file mode 100644
index fa3d4bd3..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/SQLAdmin/Resource/Tiers.php
+++ /dev/null
@@ -1,42 +0,0 @@
-
- *   $sqladminService = new Google_Service_SQLAdmin(...);
- *   $tiers = $sqladminService->tiers;
- *  
- */
-class Google_Service_SQLAdmin_Resource_Tiers extends Google_Service_Resource
-{
-  /**
-   * Lists all available service tiers for Google Cloud SQL, for example D1, D2.
-   * For related information, see Pricing. (tiers.listTiers)
-   *
-   * @param string $project Project ID of the project for which to list tiers.
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_SQLAdmin_TiersListResponse
-   */
-  public function listTiers($project, $optParams = array())
-  {
-    $params = array('project' => $project);
-    $params = array_merge($params, $optParams);
-    return $this->call('list', array($params), "Google_Service_SQLAdmin_TiersListResponse");
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/SQLAdmin/Resource/Users.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/SQLAdmin/Resource/Users.php
deleted file mode 100644
index 29ce3af0..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/SQLAdmin/Resource/Users.php
+++ /dev/null
@@ -1,94 +0,0 @@
-
- *   $sqladminService = new Google_Service_SQLAdmin(...);
- *   $users = $sqladminService->users;
- *  
- */
-class Google_Service_SQLAdmin_Resource_Users extends Google_Service_Resource
-{
-  /**
-   * Deletes a user from a Cloud SQL instance. (users.delete)
-   *
-   * @param string $project Project ID of the project that contains the instance.
-   * @param string $instance Database instance ID. This does not include the
-   * project ID.
-   * @param string $host Host of the user in the instance.
-   * @param string $name Name of the user in the instance.
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_SQLAdmin_Operation
-   */
-  public function delete($project, $instance, $host, $name, $optParams = array())
-  {
-    $params = array('project' => $project, 'instance' => $instance, 'host' => $host, 'name' => $name);
-    $params = array_merge($params, $optParams);
-    return $this->call('delete', array($params), "Google_Service_SQLAdmin_Operation");
-  }
-  /**
-   * Creates a new user in a Cloud SQL instance. (users.insert)
-   *
-   * @param string $project Project ID of the project that contains the instance.
-   * @param string $instance Database instance ID. This does not include the
-   * project ID.
-   * @param Google_Service_SQLAdmin_User $postBody
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_SQLAdmin_Operation
-   */
-  public function insert($project, $instance, Google_Service_SQLAdmin_User $postBody, $optParams = array())
-  {
-    $params = array('project' => $project, 'instance' => $instance, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('insert', array($params), "Google_Service_SQLAdmin_Operation");
-  }
-  /**
-   * Lists users in the specified Cloud SQL instance. (users.listUsers)
-   *
-   * @param string $project Project ID of the project that contains the instance.
-   * @param string $instance Database instance ID. This does not include the
-   * project ID.
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_SQLAdmin_UsersListResponse
-   */
-  public function listUsers($project, $instance, $optParams = array())
-  {
-    $params = array('project' => $project, 'instance' => $instance);
-    $params = array_merge($params, $optParams);
-    return $this->call('list', array($params), "Google_Service_SQLAdmin_UsersListResponse");
-  }
-  /**
-   * Updates an existing user in a Cloud SQL instance. (users.update)
-   *
-   * @param string $project Project ID of the project that contains the instance.
-   * @param string $instance Database instance ID. This does not include the
-   * project ID.
-   * @param string $host Host of the user in the instance.
-   * @param string $name Name of the user in the instance.
-   * @param Google_Service_SQLAdmin_User $postBody
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_SQLAdmin_Operation
-   */
-  public function update($project, $instance, $host, $name, Google_Service_SQLAdmin_User $postBody, $optParams = array())
-  {
-    $params = array('project' => $project, 'instance' => $instance, 'host' => $host, 'name' => $name, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('update', array($params), "Google_Service_SQLAdmin_Operation");
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/SQLAdmin/RestoreBackupContext.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/SQLAdmin/RestoreBackupContext.php
deleted file mode 100644
index 01c25d7a..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/SQLAdmin/RestoreBackupContext.php
+++ /dev/null
@@ -1,48 +0,0 @@
-backupRunId = $backupRunId;
-  }
-  public function getBackupRunId()
-  {
-    return $this->backupRunId;
-  }
-  public function setInstanceId($instanceId)
-  {
-    $this->instanceId = $instanceId;
-  }
-  public function getInstanceId()
-  {
-    return $this->instanceId;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/SQLAdmin/Settings.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/SQLAdmin/Settings.php
deleted file mode 100644
index 6dd5b864..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/SQLAdmin/Settings.php
+++ /dev/null
@@ -1,208 +0,0 @@
-activationPolicy = $activationPolicy;
-  }
-  public function getActivationPolicy()
-  {
-    return $this->activationPolicy;
-  }
-  public function setAuthorizedGaeApplications($authorizedGaeApplications)
-  {
-    $this->authorizedGaeApplications = $authorizedGaeApplications;
-  }
-  public function getAuthorizedGaeApplications()
-  {
-    return $this->authorizedGaeApplications;
-  }
-  public function setAvailabilityType($availabilityType)
-  {
-    $this->availabilityType = $availabilityType;
-  }
-  public function getAvailabilityType()
-  {
-    return $this->availabilityType;
-  }
-  public function setBackupConfiguration(Google_Service_SQLAdmin_BackupConfiguration $backupConfiguration)
-  {
-    $this->backupConfiguration = $backupConfiguration;
-  }
-  public function getBackupConfiguration()
-  {
-    return $this->backupConfiguration;
-  }
-  public function setCrashSafeReplicationEnabled($crashSafeReplicationEnabled)
-  {
-    $this->crashSafeReplicationEnabled = $crashSafeReplicationEnabled;
-  }
-  public function getCrashSafeReplicationEnabled()
-  {
-    return $this->crashSafeReplicationEnabled;
-  }
-  public function setDataDiskSizeGb($dataDiskSizeGb)
-  {
-    $this->dataDiskSizeGb = $dataDiskSizeGb;
-  }
-  public function getDataDiskSizeGb()
-  {
-    return $this->dataDiskSizeGb;
-  }
-  public function setDataDiskType($dataDiskType)
-  {
-    $this->dataDiskType = $dataDiskType;
-  }
-  public function getDataDiskType()
-  {
-    return $this->dataDiskType;
-  }
-  public function setDatabaseFlags($databaseFlags)
-  {
-    $this->databaseFlags = $databaseFlags;
-  }
-  public function getDatabaseFlags()
-  {
-    return $this->databaseFlags;
-  }
-  public function setDatabaseReplicationEnabled($databaseReplicationEnabled)
-  {
-    $this->databaseReplicationEnabled = $databaseReplicationEnabled;
-  }
-  public function getDatabaseReplicationEnabled()
-  {
-    return $this->databaseReplicationEnabled;
-  }
-  public function setIpConfiguration(Google_Service_SQLAdmin_IpConfiguration $ipConfiguration)
-  {
-    $this->ipConfiguration = $ipConfiguration;
-  }
-  public function getIpConfiguration()
-  {
-    return $this->ipConfiguration;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setLabels($labels)
-  {
-    $this->labels = $labels;
-  }
-  public function getLabels()
-  {
-    return $this->labels;
-  }
-  public function setLocationPreference(Google_Service_SQLAdmin_LocationPreference $locationPreference)
-  {
-    $this->locationPreference = $locationPreference;
-  }
-  public function getLocationPreference()
-  {
-    return $this->locationPreference;
-  }
-  public function setMaintenanceWindow(Google_Service_SQLAdmin_MaintenanceWindow $maintenanceWindow)
-  {
-    $this->maintenanceWindow = $maintenanceWindow;
-  }
-  public function getMaintenanceWindow()
-  {
-    return $this->maintenanceWindow;
-  }
-  public function setPricingPlan($pricingPlan)
-  {
-    $this->pricingPlan = $pricingPlan;
-  }
-  public function getPricingPlan()
-  {
-    return $this->pricingPlan;
-  }
-  public function setReplicationType($replicationType)
-  {
-    $this->replicationType = $replicationType;
-  }
-  public function getReplicationType()
-  {
-    return $this->replicationType;
-  }
-  public function setSettingsVersion($settingsVersion)
-  {
-    $this->settingsVersion = $settingsVersion;
-  }
-  public function getSettingsVersion()
-  {
-    return $this->settingsVersion;
-  }
-  public function setStorageAutoResize($storageAutoResize)
-  {
-    $this->storageAutoResize = $storageAutoResize;
-  }
-  public function getStorageAutoResize()
-  {
-    return $this->storageAutoResize;
-  }
-  public function setStorageAutoResizeLimit($storageAutoResizeLimit)
-  {
-    $this->storageAutoResizeLimit = $storageAutoResizeLimit;
-  }
-  public function getStorageAutoResizeLimit()
-  {
-    return $this->storageAutoResizeLimit;
-  }
-  public function setTier($tier)
-  {
-    $this->tier = $tier;
-  }
-  public function getTier()
-  {
-    return $this->tier;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/SQLAdmin/SslCert.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/SQLAdmin/SslCert.php
deleted file mode 100644
index bfe016b6..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/SQLAdmin/SslCert.php
+++ /dev/null
@@ -1,102 +0,0 @@
-cert = $cert;
-  }
-  public function getCert()
-  {
-    return $this->cert;
-  }
-  public function setCertSerialNumber($certSerialNumber)
-  {
-    $this->certSerialNumber = $certSerialNumber;
-  }
-  public function getCertSerialNumber()
-  {
-    return $this->certSerialNumber;
-  }
-  public function setCommonName($commonName)
-  {
-    $this->commonName = $commonName;
-  }
-  public function getCommonName()
-  {
-    return $this->commonName;
-  }
-  public function setCreateTime($createTime)
-  {
-    $this->createTime = $createTime;
-  }
-  public function getCreateTime()
-  {
-    return $this->createTime;
-  }
-  public function setExpirationTime($expirationTime)
-  {
-    $this->expirationTime = $expirationTime;
-  }
-  public function getExpirationTime()
-  {
-    return $this->expirationTime;
-  }
-  public function setInstance($instance)
-  {
-    $this->instance = $instance;
-  }
-  public function getInstance()
-  {
-    return $this->instance;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setSelfLink($selfLink)
-  {
-    $this->selfLink = $selfLink;
-  }
-  public function getSelfLink()
-  {
-    return $this->selfLink;
-  }
-  public function setSha1Fingerprint($sha1Fingerprint)
-  {
-    $this->sha1Fingerprint = $sha1Fingerprint;
-  }
-  public function getSha1Fingerprint()
-  {
-    return $this->sha1Fingerprint;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/SQLAdmin/SslCertDetail.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/SQLAdmin/SslCertDetail.php
deleted file mode 100644
index 8b6caa14..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/SQLAdmin/SslCertDetail.php
+++ /dev/null
@@ -1,40 +0,0 @@
-certInfo = $certInfo;
-  }
-  public function getCertInfo()
-  {
-    return $this->certInfo;
-  }
-  public function setCertPrivateKey($certPrivateKey)
-  {
-    $this->certPrivateKey = $certPrivateKey;
-  }
-  public function getCertPrivateKey()
-  {
-    return $this->certPrivateKey;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/SQLAdmin/SslCertsCreateEphemeralRequest.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/SQLAdmin/SslCertsCreateEphemeralRequest.php
deleted file mode 100644
index b649ea1b..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/SQLAdmin/SslCertsCreateEphemeralRequest.php
+++ /dev/null
@@ -1,33 +0,0 @@
- "public_key",
-  );
-  public $publicKey;
-
-  public function setPublicKey($publicKey)
-  {
-    $this->publicKey = $publicKey;
-  }
-  public function getPublicKey()
-  {
-    return $this->publicKey;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/SQLAdmin/SslCertsInsertRequest.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/SQLAdmin/SslCertsInsertRequest.php
deleted file mode 100644
index d3ba4771..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/SQLAdmin/SslCertsInsertRequest.php
+++ /dev/null
@@ -1,30 +0,0 @@
-commonName = $commonName;
-  }
-  public function getCommonName()
-  {
-    return $this->commonName;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/SQLAdmin/SslCertsInsertResponse.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/SQLAdmin/SslCertsInsertResponse.php
deleted file mode 100644
index 023a85a1..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/SQLAdmin/SslCertsInsertResponse.php
+++ /dev/null
@@ -1,60 +0,0 @@
-clientCert = $clientCert;
-  }
-  public function getClientCert()
-  {
-    return $this->clientCert;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setOperation(Google_Service_SQLAdmin_Operation $operation)
-  {
-    $this->operation = $operation;
-  }
-  public function getOperation()
-  {
-    return $this->operation;
-  }
-  public function setServerCaCert(Google_Service_SQLAdmin_SslCert $serverCaCert)
-  {
-    $this->serverCaCert = $serverCaCert;
-  }
-  public function getServerCaCert()
-  {
-    return $this->serverCaCert;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/SQLAdmin/SslCertsListResponse.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/SQLAdmin/SslCertsListResponse.php
deleted file mode 100644
index e5102c1a..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/SQLAdmin/SslCertsListResponse.php
+++ /dev/null
@@ -1,41 +0,0 @@
-items = $items;
-  }
-  public function getItems()
-  {
-    return $this->items;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/SQLAdmin/Tier.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/SQLAdmin/Tier.php
deleted file mode 100644
index c21d761e..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/SQLAdmin/Tier.php
+++ /dev/null
@@ -1,71 +0,0 @@
- "DiskQuota",
-        "rAM" => "RAM",
-  );
-  public $diskQuota;
-  public $rAM;
-  public $kind;
-  public $region;
-  public $tier;
-
-  public function setDiskQuota($diskQuota)
-  {
-    $this->diskQuota = $diskQuota;
-  }
-  public function getDiskQuota()
-  {
-    return $this->diskQuota;
-  }
-  public function setRAM($rAM)
-  {
-    $this->rAM = $rAM;
-  }
-  public function getRAM()
-  {
-    return $this->rAM;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setRegion($region)
-  {
-    $this->region = $region;
-  }
-  public function getRegion()
-  {
-    return $this->region;
-  }
-  public function setTier($tier)
-  {
-    $this->tier = $tier;
-  }
-  public function getTier()
-  {
-    return $this->tier;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/SQLAdmin/TiersListResponse.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/SQLAdmin/TiersListResponse.php
deleted file mode 100644
index eea0512a..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/SQLAdmin/TiersListResponse.php
+++ /dev/null
@@ -1,41 +0,0 @@
-items = $items;
-  }
-  public function getItems()
-  {
-    return $this->items;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/SQLAdmin/TruncateLogContext.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/SQLAdmin/TruncateLogContext.php
deleted file mode 100644
index c90d8f89..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/SQLAdmin/TruncateLogContext.php
+++ /dev/null
@@ -1,39 +0,0 @@
-kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setLogType($logType)
-  {
-    $this->logType = $logType;
-  }
-  public function getLogType()
-  {
-    return $this->logType;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/SQLAdmin/User.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/SQLAdmin/User.php
deleted file mode 100644
index 90f36436..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/SQLAdmin/User.php
+++ /dev/null
@@ -1,84 +0,0 @@
-etag = $etag;
-  }
-  public function getEtag()
-  {
-    return $this->etag;
-  }
-  public function setHost($host)
-  {
-    $this->host = $host;
-  }
-  public function getHost()
-  {
-    return $this->host;
-  }
-  public function setInstance($instance)
-  {
-    $this->instance = $instance;
-  }
-  public function getInstance()
-  {
-    return $this->instance;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setName($name)
-  {
-    $this->name = $name;
-  }
-  public function getName()
-  {
-    return $this->name;
-  }
-  public function setPassword($password)
-  {
-    $this->password = $password;
-  }
-  public function getPassword()
-  {
-    return $this->password;
-  }
-  public function setProject($project)
-  {
-    $this->project = $project;
-  }
-  public function getProject()
-  {
-    return $this->project;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/SQLAdmin/UsersListResponse.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/SQLAdmin/UsersListResponse.php
deleted file mode 100644
index d5ec5772..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/SQLAdmin/UsersListResponse.php
+++ /dev/null
@@ -1,50 +0,0 @@
-items = $items;
-  }
-  public function getItems()
-  {
-    return $this->items;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setNextPageToken($nextPageToken)
-  {
-    $this->nextPageToken = $nextPageToken;
-  }
-  public function getNextPageToken()
-  {
-    return $this->nextPageToken;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Safebrowsing.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Safebrowsing.php
deleted file mode 100644
index d4bc5055..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Safebrowsing.php
+++ /dev/null
@@ -1,171 +0,0 @@
-
- * The Safe Browsing API is an experimental API that allows client applications
- * to check URLs against Google's constantly-updated blacklists of suspected
- * phishing and malware pages. Your client application can use the API to
- * download an encrypted table for local, client-side lookups of URLs.

- *
- * 

- * For more information about this service, see the API
- * Documentation
- * 

- *
- * @author Google, Inc.
- */
-class Google_Service_Safebrowsing extends Google_Service
-{
-
-
-  public $encodedFullHashes;
-  public $encodedUpdates;
-  public $fullHashes;
-  public $threatListUpdates;
-  public $threatLists;
-  public $threatMatches;
-  
-  /**
-   * Constructs the internal representation of the Safebrowsing service.
-   *
-   * @param Google_Client $client
-   */
-  public function __construct(Google_Client $client)
-  {
-    parent::__construct($client);
-    $this->rootUrl = 'https://safebrowsing.googleapis.com/';
-    $this->servicePath = '';
-    $this->version = 'v4';
-    $this->serviceName = 'safebrowsing';
-
-    $this->encodedFullHashes = new Google_Service_Safebrowsing_Resource_EncodedFullHashes(
-        $this,
-        $this->serviceName,
-        'encodedFullHashes',
-        array(
-          'methods' => array(
-            'get' => array(
-              'path' => 'v4/encodedFullHashes/{encodedRequest}',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'encodedRequest' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'clientId' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'clientVersion' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-              ),
-            ),
-          )
-        )
-    );
-    $this->encodedUpdates = new Google_Service_Safebrowsing_Resource_EncodedUpdates(
-        $this,
-        $this->serviceName,
-        'encodedUpdates',
-        array(
-          'methods' => array(
-            'get' => array(
-              'path' => 'v4/encodedUpdates/{encodedRequest}',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'encodedRequest' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'clientId' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'clientVersion' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-              ),
-            ),
-          )
-        )
-    );
-    $this->fullHashes = new Google_Service_Safebrowsing_Resource_FullHashes(
-        $this,
-        $this->serviceName,
-        'fullHashes',
-        array(
-          'methods' => array(
-            'find' => array(
-              'path' => 'v4/fullHashes:find',
-              'httpMethod' => 'POST',
-              'parameters' => array(),
-            ),
-          )
-        )
-    );
-    $this->threatListUpdates = new Google_Service_Safebrowsing_Resource_ThreatListUpdates(
-        $this,
-        $this->serviceName,
-        'threatListUpdates',
-        array(
-          'methods' => array(
-            'fetch' => array(
-              'path' => 'v4/threatListUpdates:fetch',
-              'httpMethod' => 'POST',
-              'parameters' => array(),
-            ),
-          )
-        )
-    );
-    $this->threatLists = new Google_Service_Safebrowsing_Resource_ThreatLists(
-        $this,
-        $this->serviceName,
-        'threatLists',
-        array(
-          'methods' => array(
-            'list' => array(
-              'path' => 'v4/threatLists',
-              'httpMethod' => 'GET',
-              'parameters' => array(),
-            ),
-          )
-        )
-    );
-    $this->threatMatches = new Google_Service_Safebrowsing_Resource_ThreatMatches(
-        $this,
-        $this->serviceName,
-        'threatMatches',
-        array(
-          'methods' => array(
-            'find' => array(
-              'path' => 'v4/threatMatches:find',
-              'httpMethod' => 'POST',
-              'parameters' => array(),
-            ),
-          )
-        )
-    );
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Safebrowsing/Checksum.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Safebrowsing/Checksum.php
deleted file mode 100644
index 476ec48e..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Safebrowsing/Checksum.php
+++ /dev/null
@@ -1,30 +0,0 @@
-sha256 = $sha256;
-  }
-  public function getSha256()
-  {
-    return $this->sha256;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Safebrowsing/ClientInfo.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Safebrowsing/ClientInfo.php
deleted file mode 100644
index 55e0eb7d..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Safebrowsing/ClientInfo.php
+++ /dev/null
@@ -1,39 +0,0 @@
-clientId = $clientId;
-  }
-  public function getClientId()
-  {
-    return $this->clientId;
-  }
-  public function setClientVersion($clientVersion)
-  {
-    $this->clientVersion = $clientVersion;
-  }
-  public function getClientVersion()
-  {
-    return $this->clientVersion;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Safebrowsing/Constraints.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Safebrowsing/Constraints.php
deleted file mode 100644
index e4846bc5..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Safebrowsing/Constraints.php
+++ /dev/null
@@ -1,58 +0,0 @@
-maxDatabaseEntries = $maxDatabaseEntries;
-  }
-  public function getMaxDatabaseEntries()
-  {
-    return $this->maxDatabaseEntries;
-  }
-  public function setMaxUpdateEntries($maxUpdateEntries)
-  {
-    $this->maxUpdateEntries = $maxUpdateEntries;
-  }
-  public function getMaxUpdateEntries()
-  {
-    return $this->maxUpdateEntries;
-  }
-  public function setRegion($region)
-  {
-    $this->region = $region;
-  }
-  public function getRegion()
-  {
-    return $this->region;
-  }
-  public function setSupportedCompressions($supportedCompressions)
-  {
-    $this->supportedCompressions = $supportedCompressions;
-  }
-  public function getSupportedCompressions()
-  {
-    return $this->supportedCompressions;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Safebrowsing/FetchThreatListUpdatesRequest.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Safebrowsing/FetchThreatListUpdatesRequest.php
deleted file mode 100644
index b414786d..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Safebrowsing/FetchThreatListUpdatesRequest.php
+++ /dev/null
@@ -1,42 +0,0 @@
-client = $client;
-  }
-  public function getClient()
-  {
-    return $this->client;
-  }
-  public function setListUpdateRequests($listUpdateRequests)
-  {
-    $this->listUpdateRequests = $listUpdateRequests;
-  }
-  public function getListUpdateRequests()
-  {
-    return $this->listUpdateRequests;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Safebrowsing/FetchThreatListUpdatesResponse.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Safebrowsing/FetchThreatListUpdatesResponse.php
deleted file mode 100644
index 67db90a6..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Safebrowsing/FetchThreatListUpdatesResponse.php
+++ /dev/null
@@ -1,41 +0,0 @@
-listUpdateResponses = $listUpdateResponses;
-  }
-  public function getListUpdateResponses()
-  {
-    return $this->listUpdateResponses;
-  }
-  public function setMinimumWaitDuration($minimumWaitDuration)
-  {
-    $this->minimumWaitDuration = $minimumWaitDuration;
-  }
-  public function getMinimumWaitDuration()
-  {
-    return $this->minimumWaitDuration;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Safebrowsing/FindFullHashesRequest.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Safebrowsing/FindFullHashesRequest.php
deleted file mode 100644
index 11f4226c..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Safebrowsing/FindFullHashesRequest.php
+++ /dev/null
@@ -1,61 +0,0 @@
-apiClient = $apiClient;
-  }
-  public function getApiClient()
-  {
-    return $this->apiClient;
-  }
-  public function setClient(Google_Service_Safebrowsing_ClientInfo $client)
-  {
-    $this->client = $client;
-  }
-  public function getClient()
-  {
-    return $this->client;
-  }
-  public function setClientStates($clientStates)
-  {
-    $this->clientStates = $clientStates;
-  }
-  public function getClientStates()
-  {
-    return $this->clientStates;
-  }
-  public function setThreatInfo(Google_Service_Safebrowsing_ThreatInfo $threatInfo)
-  {
-    $this->threatInfo = $threatInfo;
-  }
-  public function getThreatInfo()
-  {
-    return $this->threatInfo;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Safebrowsing/FindFullHashesResponse.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Safebrowsing/FindFullHashesResponse.php
deleted file mode 100644
index e226d21a..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Safebrowsing/FindFullHashesResponse.php
+++ /dev/null
@@ -1,50 +0,0 @@
-matches = $matches;
-  }
-  public function getMatches()
-  {
-    return $this->matches;
-  }
-  public function setMinimumWaitDuration($minimumWaitDuration)
-  {
-    $this->minimumWaitDuration = $minimumWaitDuration;
-  }
-  public function getMinimumWaitDuration()
-  {
-    return $this->minimumWaitDuration;
-  }
-  public function setNegativeCacheDuration($negativeCacheDuration)
-  {
-    $this->negativeCacheDuration = $negativeCacheDuration;
-  }
-  public function getNegativeCacheDuration()
-  {
-    return $this->negativeCacheDuration;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Safebrowsing/FindThreatMatchesRequest.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Safebrowsing/FindThreatMatchesRequest.php
deleted file mode 100644
index 30a1a2d1..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Safebrowsing/FindThreatMatchesRequest.php
+++ /dev/null
@@ -1,41 +0,0 @@
-client = $client;
-  }
-  public function getClient()
-  {
-    return $this->client;
-  }
-  public function setThreatInfo(Google_Service_Safebrowsing_ThreatInfo $threatInfo)
-  {
-    $this->threatInfo = $threatInfo;
-  }
-  public function getThreatInfo()
-  {
-    return $this->threatInfo;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Safebrowsing/FindThreatMatchesResponse.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Safebrowsing/FindThreatMatchesResponse.php
deleted file mode 100644
index 276bdbdd..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Safebrowsing/FindThreatMatchesResponse.php
+++ /dev/null
@@ -1,32 +0,0 @@
-matches = $matches;
-  }
-  public function getMatches()
-  {
-    return $this->matches;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Safebrowsing/ListThreatListsResponse.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Safebrowsing/ListThreatListsResponse.php
deleted file mode 100644
index 4a3d3f52..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Safebrowsing/ListThreatListsResponse.php
+++ /dev/null
@@ -1,32 +0,0 @@
-threatLists = $threatLists;
-  }
-  public function getThreatLists()
-  {
-    return $this->threatLists;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Safebrowsing/ListUpdateRequest.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Safebrowsing/ListUpdateRequest.php
deleted file mode 100644
index 3d390075..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Safebrowsing/ListUpdateRequest.php
+++ /dev/null
@@ -1,67 +0,0 @@
-constraints = $constraints;
-  }
-  public function getConstraints()
-  {
-    return $this->constraints;
-  }
-  public function setPlatformType($platformType)
-  {
-    $this->platformType = $platformType;
-  }
-  public function getPlatformType()
-  {
-    return $this->platformType;
-  }
-  public function setState($state)
-  {
-    $this->state = $state;
-  }
-  public function getState()
-  {
-    return $this->state;
-  }
-  public function setThreatEntryType($threatEntryType)
-  {
-    $this->threatEntryType = $threatEntryType;
-  }
-  public function getThreatEntryType()
-  {
-    return $this->threatEntryType;
-  }
-  public function setThreatType($threatType)
-  {
-    $this->threatType = $threatType;
-  }
-  public function getThreatType()
-  {
-    return $this->threatType;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Safebrowsing/ListUpdateResponse.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Safebrowsing/ListUpdateResponse.php
deleted file mode 100644
index 9c313bc2..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Safebrowsing/ListUpdateResponse.php
+++ /dev/null
@@ -1,97 +0,0 @@
-additions = $additions;
-  }
-  public function getAdditions()
-  {
-    return $this->additions;
-  }
-  public function setChecksum(Google_Service_Safebrowsing_Checksum $checksum)
-  {
-    $this->checksum = $checksum;
-  }
-  public function getChecksum()
-  {
-    return $this->checksum;
-  }
-  public function setNewClientState($newClientState)
-  {
-    $this->newClientState = $newClientState;
-  }
-  public function getNewClientState()
-  {
-    return $this->newClientState;
-  }
-  public function setPlatformType($platformType)
-  {
-    $this->platformType = $platformType;
-  }
-  public function getPlatformType()
-  {
-    return $this->platformType;
-  }
-  public function setRemovals($removals)
-  {
-    $this->removals = $removals;
-  }
-  public function getRemovals()
-  {
-    return $this->removals;
-  }
-  public function setResponseType($responseType)
-  {
-    $this->responseType = $responseType;
-  }
-  public function getResponseType()
-  {
-    return $this->responseType;
-  }
-  public function setThreatEntryType($threatEntryType)
-  {
-    $this->threatEntryType = $threatEntryType;
-  }
-  public function getThreatEntryType()
-  {
-    return $this->threatEntryType;
-  }
-  public function setThreatType($threatType)
-  {
-    $this->threatType = $threatType;
-  }
-  public function getThreatType()
-  {
-    return $this->threatType;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Safebrowsing/MetadataEntry.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Safebrowsing/MetadataEntry.php
deleted file mode 100644
index 1fbfbcd4..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Safebrowsing/MetadataEntry.php
+++ /dev/null
@@ -1,39 +0,0 @@
-key = $key;
-  }
-  public function getKey()
-  {
-    return $this->key;
-  }
-  public function setValue($value)
-  {
-    $this->value = $value;
-  }
-  public function getValue()
-  {
-    return $this->value;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Safebrowsing/RawHashes.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Safebrowsing/RawHashes.php
deleted file mode 100644
index 27e50f65..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Safebrowsing/RawHashes.php
+++ /dev/null
@@ -1,39 +0,0 @@
-prefixSize = $prefixSize;
-  }
-  public function getPrefixSize()
-  {
-    return $this->prefixSize;
-  }
-  public function setRawHashes($rawHashes)
-  {
-    $this->rawHashes = $rawHashes;
-  }
-  public function getRawHashes()
-  {
-    return $this->rawHashes;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Safebrowsing/RawIndices.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Safebrowsing/RawIndices.php
deleted file mode 100644
index 6254eedd..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Safebrowsing/RawIndices.php
+++ /dev/null
@@ -1,31 +0,0 @@
-indices = $indices;
-  }
-  public function getIndices()
-  {
-    return $this->indices;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Safebrowsing/Resource/EncodedFullHashes.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Safebrowsing/Resource/EncodedFullHashes.php
deleted file mode 100644
index 39c514c7..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Safebrowsing/Resource/EncodedFullHashes.php
+++ /dev/null
@@ -1,45 +0,0 @@
-
- *   $safebrowsingService = new Google_Service_Safebrowsing(...);
- *   $encodedFullHashes = $safebrowsingService->encodedFullHashes;
- *  
- */
-class Google_Service_Safebrowsing_Resource_EncodedFullHashes extends Google_Service_Resource
-{
-  /**
-   * (encodedFullHashes.get)
-   *
-   * @param string $encodedRequest A serialized FindFullHashesRequest proto.
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param string clientId A client ID that (hopefully) uniquely identifies
-   * the client implementation of the Safe Browsing API.
-   * @opt_param string clientVersion The version of the client implementation.
-   * @return Google_Service_Safebrowsing_FindFullHashesResponse
-   */
-  public function get($encodedRequest, $optParams = array())
-  {
-    $params = array('encodedRequest' => $encodedRequest);
-    $params = array_merge($params, $optParams);
-    return $this->call('get', array($params), "Google_Service_Safebrowsing_FindFullHashesResponse");
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Safebrowsing/Resource/EncodedUpdates.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Safebrowsing/Resource/EncodedUpdates.php
deleted file mode 100644
index 4e6e5b74..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Safebrowsing/Resource/EncodedUpdates.php
+++ /dev/null
@@ -1,46 +0,0 @@
-
- *   $safebrowsingService = new Google_Service_Safebrowsing(...);
- *   $encodedUpdates = $safebrowsingService->encodedUpdates;
- *  
- */
-class Google_Service_Safebrowsing_Resource_EncodedUpdates extends Google_Service_Resource
-{
-  /**
-   * (encodedUpdates.get)
-   *
-   * @param string $encodedRequest A serialized FetchThreatListUpdatesRequest
-   * proto.
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param string clientId A client ID that uniquely identifies the client
-   * implementation of the Safe Browsing API.
-   * @opt_param string clientVersion The version of the client implementation.
-   * @return Google_Service_Safebrowsing_FetchThreatListUpdatesResponse
-   */
-  public function get($encodedRequest, $optParams = array())
-  {
-    $params = array('encodedRequest' => $encodedRequest);
-    $params = array_merge($params, $optParams);
-    return $this->call('get', array($params), "Google_Service_Safebrowsing_FetchThreatListUpdatesResponse");
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Safebrowsing/Resource/FullHashes.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Safebrowsing/Resource/FullHashes.php
deleted file mode 100644
index e50cd33f..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Safebrowsing/Resource/FullHashes.php
+++ /dev/null
@@ -1,42 +0,0 @@
-
- *   $safebrowsingService = new Google_Service_Safebrowsing(...);
- *   $fullHashes = $safebrowsingService->fullHashes;
- *  
- */
-class Google_Service_Safebrowsing_Resource_FullHashes extends Google_Service_Resource
-{
-  /**
-   * Finds the full hashes that match the requested hash prefixes.
-   * (fullHashes.find)
-   *
-   * @param Google_Service_Safebrowsing_FindFullHashesRequest $postBody
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Safebrowsing_FindFullHashesResponse
-   */
-  public function find(Google_Service_Safebrowsing_FindFullHashesRequest $postBody, $optParams = array())
-  {
-    $params = array('postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('find', array($params), "Google_Service_Safebrowsing_FindFullHashesResponse");
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Safebrowsing/Resource/ThreatListUpdates.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Safebrowsing/Resource/ThreatListUpdates.php
deleted file mode 100644
index 3fcfac7c..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Safebrowsing/Resource/ThreatListUpdates.php
+++ /dev/null
@@ -1,42 +0,0 @@
-
- *   $safebrowsingService = new Google_Service_Safebrowsing(...);
- *   $threatListUpdates = $safebrowsingService->threatListUpdates;
- *  
- */
-class Google_Service_Safebrowsing_Resource_ThreatListUpdates extends Google_Service_Resource
-{
-  /**
-   * Fetches the most recent threat list updates. A client can request updates for
-   * multiple lists at once. (threatListUpdates.fetch)
-   *
-   * @param Google_Service_Safebrowsing_FetchThreatListUpdatesRequest $postBody
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Safebrowsing_FetchThreatListUpdatesResponse
-   */
-  public function fetch(Google_Service_Safebrowsing_FetchThreatListUpdatesRequest $postBody, $optParams = array())
-  {
-    $params = array('postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('fetch', array($params), "Google_Service_Safebrowsing_FetchThreatListUpdatesResponse");
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Safebrowsing/Resource/ThreatLists.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Safebrowsing/Resource/ThreatLists.php
deleted file mode 100644
index 68315a23..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Safebrowsing/Resource/ThreatLists.php
+++ /dev/null
@@ -1,41 +0,0 @@
-
- *   $safebrowsingService = new Google_Service_Safebrowsing(...);
- *   $threatLists = $safebrowsingService->threatLists;
- *  
- */
-class Google_Service_Safebrowsing_Resource_ThreatLists extends Google_Service_Resource
-{
-  /**
-   * Lists the Safe Browsing threat lists available for download.
-   * (threatLists.listThreatLists)
-   *
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Safebrowsing_ListThreatListsResponse
-   */
-  public function listThreatLists($optParams = array())
-  {
-    $params = array();
-    $params = array_merge($params, $optParams);
-    return $this->call('list', array($params), "Google_Service_Safebrowsing_ListThreatListsResponse");
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Safebrowsing/Resource/ThreatMatches.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Safebrowsing/Resource/ThreatMatches.php
deleted file mode 100644
index 13654410..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Safebrowsing/Resource/ThreatMatches.php
+++ /dev/null
@@ -1,42 +0,0 @@
-
- *   $safebrowsingService = new Google_Service_Safebrowsing(...);
- *   $threatMatches = $safebrowsingService->threatMatches;
- *  
- */
-class Google_Service_Safebrowsing_Resource_ThreatMatches extends Google_Service_Resource
-{
-  /**
-   * Finds the threat entries that match the Safe Browsing lists.
-   * (threatMatches.find)
-   *
-   * @param Google_Service_Safebrowsing_FindThreatMatchesRequest $postBody
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Safebrowsing_FindThreatMatchesResponse
-   */
-  public function find(Google_Service_Safebrowsing_FindThreatMatchesRequest $postBody, $optParams = array())
-  {
-    $params = array('postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('find', array($params), "Google_Service_Safebrowsing_FindThreatMatchesResponse");
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Safebrowsing/RiceDeltaEncoding.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Safebrowsing/RiceDeltaEncoding.php
deleted file mode 100644
index 43ebb382..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Safebrowsing/RiceDeltaEncoding.php
+++ /dev/null
@@ -1,57 +0,0 @@
-encodedData = $encodedData;
-  }
-  public function getEncodedData()
-  {
-    return $this->encodedData;
-  }
-  public function setFirstValue($firstValue)
-  {
-    $this->firstValue = $firstValue;
-  }
-  public function getFirstValue()
-  {
-    return $this->firstValue;
-  }
-  public function setNumEntries($numEntries)
-  {
-    $this->numEntries = $numEntries;
-  }
-  public function getNumEntries()
-  {
-    return $this->numEntries;
-  }
-  public function setRiceParameter($riceParameter)
-  {
-    $this->riceParameter = $riceParameter;
-  }
-  public function getRiceParameter()
-  {
-    return $this->riceParameter;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Safebrowsing/ThreatEntry.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Safebrowsing/ThreatEntry.php
deleted file mode 100644
index 200b81c7..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Safebrowsing/ThreatEntry.php
+++ /dev/null
@@ -1,48 +0,0 @@
-digest = $digest;
-  }
-  public function getDigest()
-  {
-    return $this->digest;
-  }
-  public function setHash($hash)
-  {
-    $this->hash = $hash;
-  }
-  public function getHash()
-  {
-    return $this->hash;
-  }
-  public function setUrl($url)
-  {
-    $this->url = $url;
-  }
-  public function getUrl()
-  {
-    return $this->url;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Safebrowsing/ThreatEntryMetadata.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Safebrowsing/ThreatEntryMetadata.php
deleted file mode 100644
index 280e245f..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Safebrowsing/ThreatEntryMetadata.php
+++ /dev/null
@@ -1,32 +0,0 @@
-entries = $entries;
-  }
-  public function getEntries()
-  {
-    return $this->entries;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Safebrowsing/ThreatEntrySet.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Safebrowsing/ThreatEntrySet.php
deleted file mode 100644
index a791aee5..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Safebrowsing/ThreatEntrySet.php
+++ /dev/null
@@ -1,70 +0,0 @@
-compressionType = $compressionType;
-  }
-  public function getCompressionType()
-  {
-    return $this->compressionType;
-  }
-  public function setRawHashes(Google_Service_Safebrowsing_RawHashes $rawHashes)
-  {
-    $this->rawHashes = $rawHashes;
-  }
-  public function getRawHashes()
-  {
-    return $this->rawHashes;
-  }
-  public function setRawIndices(Google_Service_Safebrowsing_RawIndices $rawIndices)
-  {
-    $this->rawIndices = $rawIndices;
-  }
-  public function getRawIndices()
-  {
-    return $this->rawIndices;
-  }
-  public function setRiceHashes(Google_Service_Safebrowsing_RiceDeltaEncoding $riceHashes)
-  {
-    $this->riceHashes = $riceHashes;
-  }
-  public function getRiceHashes()
-  {
-    return $this->riceHashes;
-  }
-  public function setRiceIndices(Google_Service_Safebrowsing_RiceDeltaEncoding $riceIndices)
-  {
-    $this->riceIndices = $riceIndices;
-  }
-  public function getRiceIndices()
-  {
-    return $this->riceIndices;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Safebrowsing/ThreatInfo.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Safebrowsing/ThreatInfo.php
deleted file mode 100644
index c570c941..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Safebrowsing/ThreatInfo.php
+++ /dev/null
@@ -1,59 +0,0 @@
-platformTypes = $platformTypes;
-  }
-  public function getPlatformTypes()
-  {
-    return $this->platformTypes;
-  }
-  public function setThreatEntries($threatEntries)
-  {
-    $this->threatEntries = $threatEntries;
-  }
-  public function getThreatEntries()
-  {
-    return $this->threatEntries;
-  }
-  public function setThreatEntryTypes($threatEntryTypes)
-  {
-    $this->threatEntryTypes = $threatEntryTypes;
-  }
-  public function getThreatEntryTypes()
-  {
-    return $this->threatEntryTypes;
-  }
-  public function setThreatTypes($threatTypes)
-  {
-    $this->threatTypes = $threatTypes;
-  }
-  public function getThreatTypes()
-  {
-    return $this->threatTypes;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Safebrowsing/ThreatListDescriptor.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Safebrowsing/ThreatListDescriptor.php
deleted file mode 100644
index eb62254d..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Safebrowsing/ThreatListDescriptor.php
+++ /dev/null
@@ -1,48 +0,0 @@
-platformType = $platformType;
-  }
-  public function getPlatformType()
-  {
-    return $this->platformType;
-  }
-  public function setThreatEntryType($threatEntryType)
-  {
-    $this->threatEntryType = $threatEntryType;
-  }
-  public function getThreatEntryType()
-  {
-    return $this->threatEntryType;
-  }
-  public function setThreatType($threatType)
-  {
-    $this->threatType = $threatType;
-  }
-  public function getThreatType()
-  {
-    return $this->threatType;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Safebrowsing/ThreatMatch.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Safebrowsing/ThreatMatch.php
deleted file mode 100644
index 344f1511..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Safebrowsing/ThreatMatch.php
+++ /dev/null
@@ -1,76 +0,0 @@
-cacheDuration = $cacheDuration;
-  }
-  public function getCacheDuration()
-  {
-    return $this->cacheDuration;
-  }
-  public function setPlatformType($platformType)
-  {
-    $this->platformType = $platformType;
-  }
-  public function getPlatformType()
-  {
-    return $this->platformType;
-  }
-  public function setThreat(Google_Service_Safebrowsing_ThreatEntry $threat)
-  {
-    $this->threat = $threat;
-  }
-  public function getThreat()
-  {
-    return $this->threat;
-  }
-  public function setThreatEntryMetadata(Google_Service_Safebrowsing_ThreatEntryMetadata $threatEntryMetadata)
-  {
-    $this->threatEntryMetadata = $threatEntryMetadata;
-  }
-  public function getThreatEntryMetadata()
-  {
-    return $this->threatEntryMetadata;
-  }
-  public function setThreatEntryType($threatEntryType)
-  {
-    $this->threatEntryType = $threatEntryType;
-  }
-  public function getThreatEntryType()
-  {
-    return $this->threatEntryType;
-  }
-  public function setThreatType($threatType)
-  {
-    $this->threatType = $threatType;
-  }
-  public function getThreatType()
-  {
-    return $this->threatType;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Script.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Script.php
deleted file mode 100644
index f231790e..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Script.php
+++ /dev/null
@@ -1,103 +0,0 @@
-
- * Executes Google Apps Script projects.

- *
- * 

- * For more information about this service, see the API
- * Documentation
- * 

- *
- * @author Google, Inc.
- */
-class Google_Service_Script extends Google_Service
-{
-  /** Read, send, delete, and manage your email. */
-  const MAIL_GOOGLE_COM =
-      "https://mail.google.com/";
-  /** Manage your calendars. */
-  const WWW_GOOGLE_COM_CALENDAR_FEEDS =
-      "https://www.google.com/calendar/feeds";
-  /** Manage your contacts. */
-  const WWW_GOOGLE_COM_M8_FEEDS =
-      "https://www.google.com/m8/feeds";
-  /** View and manage the provisioning of groups on your domain. */
-  const ADMIN_DIRECTORY_GROUP =
-      "https://www.googleapis.com/auth/admin.directory.group";
-  /** View and manage the provisioning of users on your domain. */
-  const ADMIN_DIRECTORY_USER =
-      "https://www.googleapis.com/auth/admin.directory.user";
-  /** View and manage the files in your Google Drive. */
-  const DRIVE =
-      "https://www.googleapis.com/auth/drive";
-  /** View and manage your forms in Google Drive. */
-  const FORMS =
-      "https://www.googleapis.com/auth/forms";
-  /** View and manage forms that this application has been installed in. */
-  const FORMS_CURRENTONLY =
-      "https://www.googleapis.com/auth/forms.currentonly";
-  /** View and manage your Google Groups. */
-  const GROUPS =
-      "https://www.googleapis.com/auth/groups";
-  /** View and manage your spreadsheets in Google Drive. */
-  const SPREADSHEETS =
-      "https://www.googleapis.com/auth/spreadsheets";
-  /** View your email address. */
-  const USERINFO_EMAIL =
-      "https://www.googleapis.com/auth/userinfo.email";
-
-  public $scripts;
-  
-  /**
-   * Constructs the internal representation of the Script service.
-   *
-   * @param Google_Client $client
-   */
-  public function __construct(Google_Client $client)
-  {
-    parent::__construct($client);
-    $this->rootUrl = 'https://script.googleapis.com/';
-    $this->servicePath = '';
-    $this->version = 'v1';
-    $this->serviceName = 'script';
-
-    $this->scripts = new Google_Service_Script_Resource_Scripts(
-        $this,
-        $this->serviceName,
-        'scripts',
-        array(
-          'methods' => array(
-            'run' => array(
-              'path' => 'v1/scripts/{scriptId}:run',
-              'httpMethod' => 'POST',
-              'parameters' => array(
-                'scriptId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),
-          )
-        )
-    );
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Script/ExecutionError.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Script/ExecutionError.php
deleted file mode 100644
index a2c9f400..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Script/ExecutionError.php
+++ /dev/null
@@ -1,50 +0,0 @@
-errorMessage = $errorMessage;
-  }
-  public function getErrorMessage()
-  {
-    return $this->errorMessage;
-  }
-  public function setErrorType($errorType)
-  {
-    $this->errorType = $errorType;
-  }
-  public function getErrorType()
-  {
-    return $this->errorType;
-  }
-  public function setScriptStackTraceElements($scriptStackTraceElements)
-  {
-    $this->scriptStackTraceElements = $scriptStackTraceElements;
-  }
-  public function getScriptStackTraceElements()
-  {
-    return $this->scriptStackTraceElements;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Script/ExecutionRequest.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Script/ExecutionRequest.php
deleted file mode 100644
index 8f08f9b1..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Script/ExecutionRequest.php
+++ /dev/null
@@ -1,58 +0,0 @@
-devMode = $devMode;
-  }
-  public function getDevMode()
-  {
-    return $this->devMode;
-  }
-  public function setFunction($function)
-  {
-    $this->function = $function;
-  }
-  public function getFunction()
-  {
-    return $this->function;
-  }
-  public function setParameters($parameters)
-  {
-    $this->parameters = $parameters;
-  }
-  public function getParameters()
-  {
-    return $this->parameters;
-  }
-  public function setSessionState($sessionState)
-  {
-    $this->sessionState = $sessionState;
-  }
-  public function getSessionState()
-  {
-    return $this->sessionState;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Script/ExecutionResponse.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Script/ExecutionResponse.php
deleted file mode 100644
index bdc12a90..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Script/ExecutionResponse.php
+++ /dev/null
@@ -1,30 +0,0 @@
-result = $result;
-  }
-  public function getResult()
-  {
-    return $this->result;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Script/Operation.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Script/Operation.php
deleted file mode 100644
index b818bc11..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Script/Operation.php
+++ /dev/null
@@ -1,67 +0,0 @@
-done = $done;
-  }
-  public function getDone()
-  {
-    return $this->done;
-  }
-  public function setError(Google_Service_Script_Status $error)
-  {
-    $this->error = $error;
-  }
-  public function getError()
-  {
-    return $this->error;
-  }
-  public function setMetadata($metadata)
-  {
-    $this->metadata = $metadata;
-  }
-  public function getMetadata()
-  {
-    return $this->metadata;
-  }
-  public function setName($name)
-  {
-    $this->name = $name;
-  }
-  public function getName()
-  {
-    return $this->name;
-  }
-  public function setResponse($response)
-  {
-    $this->response = $response;
-  }
-  public function getResponse()
-  {
-    return $this->response;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Script/Resource/Scripts.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Script/Resource/Scripts.php
deleted file mode 100644
index 80cac1bc..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Script/Resource/Scripts.php
+++ /dev/null
@@ -1,52 +0,0 @@
-
- *   $scriptService = new Google_Service_Script(...);
- *   $scripts = $scriptService->scripts;
- *  
- */
-class Google_Service_Script_Resource_Scripts extends Google_Service_Resource
-{
-  /**
-   * Runs a function in an Apps Script project. The project must be deployed for
-   * use with the Apps Script Execution API.
-   *
-   * This method requires authorization with an OAuth 2.0 token that includes at
-   * least one of the scopes listed in the [Authorization](#authorization)
-   * section; script projects that do not require authorization cannot be executed
-   * through this API. To find the correct scopes to include in the authentication
-   * token, open the project in the script editor, then select **File > Project
-   * properties** and click the **Scopes** tab. (scripts.run)
-   *
-   * @param string $scriptId The project key of the script to be executed. To find
-   * the project key, open the project in the script editor and select **File >
-   * Project properties**.
-   * @param Google_Service_Script_ExecutionRequest $postBody
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Script_Operation
-   */
-  public function run($scriptId, Google_Service_Script_ExecutionRequest $postBody, $optParams = array())
-  {
-    $params = array('scriptId' => $scriptId, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('run', array($params), "Google_Service_Script_Operation");
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Script/ScriptStackTraceElement.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Script/ScriptStackTraceElement.php
deleted file mode 100644
index e2043612..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Script/ScriptStackTraceElement.php
+++ /dev/null
@@ -1,39 +0,0 @@
-function = $function;
-  }
-  public function getFunction()
-  {
-    return $this->function;
-  }
-  public function setLineNumber($lineNumber)
-  {
-    $this->lineNumber = $lineNumber;
-  }
-  public function getLineNumber()
-  {
-    return $this->lineNumber;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Script/Status.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Script/Status.php
deleted file mode 100644
index 12bd8803..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Script/Status.php
+++ /dev/null
@@ -1,49 +0,0 @@
-code = $code;
-  }
-  public function getCode()
-  {
-    return $this->code;
-  }
-  public function setDetails($details)
-  {
-    $this->details = $details;
-  }
-  public function getDetails()
-  {
-    return $this->details;
-  }
-  public function setMessage($message)
-  {
-    $this->message = $message;
-  }
-  public function getMessage()
-  {
-    return $this->message;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/SearchConsole.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/SearchConsole.php
deleted file mode 100644
index 560a2fed..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/SearchConsole.php
+++ /dev/null
@@ -1,65 +0,0 @@
-
- * Provides tools for running validation tests against single URLs

- *
- * 

- * For more information about this service, see the API
- * Documentation
- * 

- *
- * @author Google, Inc.
- */
-class Google_Service_SearchConsole extends Google_Service
-{
-
-
-  public $urlTestingTools_mobileFriendlyTest;
-  
-  /**
-   * Constructs the internal representation of the SearchConsole service.
-   *
-   * @param Google_Client $client
-   */
-  public function __construct(Google_Client $client)
-  {
-    parent::__construct($client);
-    $this->rootUrl = 'https://searchconsole.googleapis.com/';
-    $this->servicePath = '';
-    $this->version = 'v1';
-    $this->serviceName = 'searchconsole';
-
-    $this->urlTestingTools_mobileFriendlyTest = new Google_Service_SearchConsole_Resource_UrlTestingToolsMobileFriendlyTest(
-        $this,
-        $this->serviceName,
-        'mobileFriendlyTest',
-        array(
-          'methods' => array(
-            'run' => array(
-              'path' => 'v1/urlTestingTools/mobileFriendlyTest:run',
-              'httpMethod' => 'POST',
-              'parameters' => array(),
-            ),
-          )
-        )
-    );
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/SearchConsole/BlockedResource.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/SearchConsole/BlockedResource.php
deleted file mode 100644
index bbc71cf7..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/SearchConsole/BlockedResource.php
+++ /dev/null
@@ -1,30 +0,0 @@
-url = $url;
-  }
-  public function getUrl()
-  {
-    return $this->url;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/SearchConsole/Image.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/SearchConsole/Image.php
deleted file mode 100644
index 16601977..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/SearchConsole/Image.php
+++ /dev/null
@@ -1,39 +0,0 @@
-data = $data;
-  }
-  public function getData()
-  {
-    return $this->data;
-  }
-  public function setMimeType($mimeType)
-  {
-    $this->mimeType = $mimeType;
-  }
-  public function getMimeType()
-  {
-    return $this->mimeType;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/SearchConsole/MobileFriendlyIssue.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/SearchConsole/MobileFriendlyIssue.php
deleted file mode 100644
index 34df5fad..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/SearchConsole/MobileFriendlyIssue.php
+++ /dev/null
@@ -1,30 +0,0 @@
-rule = $rule;
-  }
-  public function getRule()
-  {
-    return $this->rule;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/SearchConsole/Resource/UrlTestingTools.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/SearchConsole/Resource/UrlTestingTools.php
deleted file mode 100644
index 3508d9db..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/SearchConsole/Resource/UrlTestingTools.php
+++ /dev/null
@@ -1,28 +0,0 @@
-
- *   $searchconsoleService = new Google_Service_SearchConsole(...);
- *   $urlTestingTools = $searchconsoleService->urlTestingTools;
- *  
- */
-class Google_Service_SearchConsole_Resource_UrlTestingTools extends Google_Service_Resource
-{
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/SearchConsole/Resource/UrlTestingToolsMobileFriendlyTest.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/SearchConsole/Resource/UrlTestingToolsMobileFriendlyTest.php
deleted file mode 100644
index 26544134..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/SearchConsole/Resource/UrlTestingToolsMobileFriendlyTest.php
+++ /dev/null
@@ -1,41 +0,0 @@
-
- *   $searchconsoleService = new Google_Service_SearchConsole(...);
- *   $mobileFriendlyTest = $searchconsoleService->mobileFriendlyTest;
- *  
- */
-class Google_Service_SearchConsole_Resource_UrlTestingToolsMobileFriendlyTest extends Google_Service_Resource
-{
-  /**
-   * Runs Mobile-Friendly Test for a given URL. (mobileFriendlyTest.run)
-   *
-   * @param Google_Service_SearchConsole_RunMobileFriendlyTestRequest $postBody
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_SearchConsole_RunMobileFriendlyTestResponse
-   */
-  public function run(Google_Service_SearchConsole_RunMobileFriendlyTestRequest $postBody, $optParams = array())
-  {
-    $params = array('postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('run', array($params), "Google_Service_SearchConsole_RunMobileFriendlyTestResponse");
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/SearchConsole/ResourceIssue.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/SearchConsole/ResourceIssue.php
deleted file mode 100644
index e52db726..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/SearchConsole/ResourceIssue.php
+++ /dev/null
@@ -1,31 +0,0 @@
-blockedResource = $blockedResource;
-  }
-  public function getBlockedResource()
-  {
-    return $this->blockedResource;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/SearchConsole/RunMobileFriendlyTestRequest.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/SearchConsole/RunMobileFriendlyTestRequest.php
deleted file mode 100644
index 53cfff68..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/SearchConsole/RunMobileFriendlyTestRequest.php
+++ /dev/null
@@ -1,39 +0,0 @@
-requestScreenshot = $requestScreenshot;
-  }
-  public function getRequestScreenshot()
-  {
-    return $this->requestScreenshot;
-  }
-  public function setUrl($url)
-  {
-    $this->url = $url;
-  }
-  public function getUrl()
-  {
-    return $this->url;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/SearchConsole/RunMobileFriendlyTestResponse.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/SearchConsole/RunMobileFriendlyTestResponse.php
deleted file mode 100644
index 95f64b3c..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/SearchConsole/RunMobileFriendlyTestResponse.php
+++ /dev/null
@@ -1,71 +0,0 @@
-mobileFriendliness = $mobileFriendliness;
-  }
-  public function getMobileFriendliness()
-  {
-    return $this->mobileFriendliness;
-  }
-  public function setMobileFriendlyIssues($mobileFriendlyIssues)
-  {
-    $this->mobileFriendlyIssues = $mobileFriendlyIssues;
-  }
-  public function getMobileFriendlyIssues()
-  {
-    return $this->mobileFriendlyIssues;
-  }
-  public function setResourceIssues($resourceIssues)
-  {
-    $this->resourceIssues = $resourceIssues;
-  }
-  public function getResourceIssues()
-  {
-    return $this->resourceIssues;
-  }
-  public function setScreenshot(Google_Service_SearchConsole_Image $screenshot)
-  {
-    $this->screenshot = $screenshot;
-  }
-  public function getScreenshot()
-  {
-    return $this->screenshot;
-  }
-  public function setTestStatus(Google_Service_SearchConsole_TestStatus $testStatus)
-  {
-    $this->testStatus = $testStatus;
-  }
-  public function getTestStatus()
-  {
-    return $this->testStatus;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/SearchConsole/TestStatus.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/SearchConsole/TestStatus.php
deleted file mode 100644
index 9212ac66..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/SearchConsole/TestStatus.php
+++ /dev/null
@@ -1,39 +0,0 @@
-details = $details;
-  }
-  public function getDetails()
-  {
-    return $this->details;
-  }
-  public function setStatus($status)
-  {
-    $this->status = $status;
-  }
-  public function getStatus()
-  {
-    return $this->status;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ServiceControl.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ServiceControl.php
deleted file mode 100644
index 8ab8fc6a..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ServiceControl.php
+++ /dev/null
@@ -1,127 +0,0 @@
-
- * Google Service Control provides control plane functionality to managed
- * services, such as logging, monitoring, and status checks.

- *
- * 

- * For more information about this service, see the API
- * Documentation
- * 

- *
- * @author Google, Inc.
- */
-class Google_Service_ServiceControl extends Google_Service
-{
-  /** View and manage your data across Google Cloud Platform services. */
-  const CLOUD_PLATFORM =
-      "https://www.googleapis.com/auth/cloud-platform";
-  /** Manage your Google Service Control data. */
-  const SERVICECONTROL =
-      "https://www.googleapis.com/auth/servicecontrol";
-
-  public $services;
-  
-  /**
-   * Constructs the internal representation of the ServiceControl service.
-   *
-   * @param Google_Client $client
-   */
-  public function __construct(Google_Client $client)
-  {
-    parent::__construct($client);
-    $this->rootUrl = 'https://servicecontrol.googleapis.com/';
-    $this->servicePath = '';
-    $this->version = 'v1';
-    $this->serviceName = 'servicecontrol';
-
-    $this->services = new Google_Service_ServiceControl_Resource_Services(
-        $this,
-        $this->serviceName,
-        'services',
-        array(
-          'methods' => array(
-            'allocateQuota' => array(
-              'path' => 'v1/services/{serviceName}:allocateQuota',
-              'httpMethod' => 'POST',
-              'parameters' => array(
-                'serviceName' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'check' => array(
-              'path' => 'v1/services/{serviceName}:check',
-              'httpMethod' => 'POST',
-              'parameters' => array(
-                'serviceName' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'endReconciliation' => array(
-              'path' => 'v1/services/{serviceName}:endReconciliation',
-              'httpMethod' => 'POST',
-              'parameters' => array(
-                'serviceName' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'releaseQuota' => array(
-              'path' => 'v1/services/{serviceName}:releaseQuota',
-              'httpMethod' => 'POST',
-              'parameters' => array(
-                'serviceName' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'report' => array(
-              'path' => 'v1/services/{serviceName}:report',
-              'httpMethod' => 'POST',
-              'parameters' => array(
-                'serviceName' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'startReconciliation' => array(
-              'path' => 'v1/services/{serviceName}:startReconciliation',
-              'httpMethod' => 'POST',
-              'parameters' => array(
-                'serviceName' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),
-          )
-        )
-    );
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ServiceControl/AllocateQuotaRequest.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ServiceControl/AllocateQuotaRequest.php
deleted file mode 100644
index 407662e8..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ServiceControl/AllocateQuotaRequest.php
+++ /dev/null
@@ -1,49 +0,0 @@
-allocateOperation = $allocateOperation;
-  }
-  public function getAllocateOperation()
-  {
-    return $this->allocateOperation;
-  }
-  public function setAllocationMode($allocationMode)
-  {
-    $this->allocationMode = $allocationMode;
-  }
-  public function getAllocationMode()
-  {
-    return $this->allocationMode;
-  }
-  public function setServiceConfigId($serviceConfigId)
-  {
-    $this->serviceConfigId = $serviceConfigId;
-  }
-  public function getServiceConfigId()
-  {
-    return $this->serviceConfigId;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ServiceControl/AllocateQuotaResponse.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ServiceControl/AllocateQuotaResponse.php
deleted file mode 100644
index 5bd7f566..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ServiceControl/AllocateQuotaResponse.php
+++ /dev/null
@@ -1,60 +0,0 @@
-allocateErrors = $allocateErrors;
-  }
-  public function getAllocateErrors()
-  {
-    return $this->allocateErrors;
-  }
-  public function setOperationId($operationId)
-  {
-    $this->operationId = $operationId;
-  }
-  public function getOperationId()
-  {
-    return $this->operationId;
-  }
-  public function setQuotaMetrics($quotaMetrics)
-  {
-    $this->quotaMetrics = $quotaMetrics;
-  }
-  public function getQuotaMetrics()
-  {
-    return $this->quotaMetrics;
-  }
-  public function setServiceConfigId($serviceConfigId)
-  {
-    $this->serviceConfigId = $serviceConfigId;
-  }
-  public function getServiceConfigId()
-  {
-    return $this->serviceConfigId;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ServiceControl/AuditLog.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ServiceControl/AuditLog.php
deleted file mode 100644
index c6c25dd1..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ServiceControl/AuditLog.php
+++ /dev/null
@@ -1,125 +0,0 @@
-authenticationInfo = $authenticationInfo;
-  }
-  public function getAuthenticationInfo()
-  {
-    return $this->authenticationInfo;
-  }
-  public function setAuthorizationInfo($authorizationInfo)
-  {
-    $this->authorizationInfo = $authorizationInfo;
-  }
-  public function getAuthorizationInfo()
-  {
-    return $this->authorizationInfo;
-  }
-  public function setMethodName($methodName)
-  {
-    $this->methodName = $methodName;
-  }
-  public function getMethodName()
-  {
-    return $this->methodName;
-  }
-  public function setNumResponseItems($numResponseItems)
-  {
-    $this->numResponseItems = $numResponseItems;
-  }
-  public function getNumResponseItems()
-  {
-    return $this->numResponseItems;
-  }
-  public function setRequest($request)
-  {
-    $this->request = $request;
-  }
-  public function getRequest()
-  {
-    return $this->request;
-  }
-  public function setRequestMetadata(Google_Service_ServiceControl_RequestMetadata $requestMetadata)
-  {
-    $this->requestMetadata = $requestMetadata;
-  }
-  public function getRequestMetadata()
-  {
-    return $this->requestMetadata;
-  }
-  public function setResourceName($resourceName)
-  {
-    $this->resourceName = $resourceName;
-  }
-  public function getResourceName()
-  {
-    return $this->resourceName;
-  }
-  public function setResponse($response)
-  {
-    $this->response = $response;
-  }
-  public function getResponse()
-  {
-    return $this->response;
-  }
-  public function setServiceData($serviceData)
-  {
-    $this->serviceData = $serviceData;
-  }
-  public function getServiceData()
-  {
-    return $this->serviceData;
-  }
-  public function setServiceName($serviceName)
-  {
-    $this->serviceName = $serviceName;
-  }
-  public function getServiceName()
-  {
-    return $this->serviceName;
-  }
-  public function setStatus(Google_Service_ServiceControl_Status $status)
-  {
-    $this->status = $status;
-  }
-  public function getStatus()
-  {
-    return $this->status;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ServiceControl/AuthenticationInfo.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ServiceControl/AuthenticationInfo.php
deleted file mode 100644
index d253b170..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ServiceControl/AuthenticationInfo.php
+++ /dev/null
@@ -1,39 +0,0 @@
-authoritySelector = $authoritySelector;
-  }
-  public function getAuthoritySelector()
-  {
-    return $this->authoritySelector;
-  }
-  public function setPrincipalEmail($principalEmail)
-  {
-    $this->principalEmail = $principalEmail;
-  }
-  public function getPrincipalEmail()
-  {
-    return $this->principalEmail;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ServiceControl/AuthorizationInfo.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ServiceControl/AuthorizationInfo.php
deleted file mode 100644
index 91777eff..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ServiceControl/AuthorizationInfo.php
+++ /dev/null
@@ -1,48 +0,0 @@
-granted = $granted;
-  }
-  public function getGranted()
-  {
-    return $this->granted;
-  }
-  public function setPermission($permission)
-  {
-    $this->permission = $permission;
-  }
-  public function getPermission()
-  {
-    return $this->permission;
-  }
-  public function setResource($resource)
-  {
-    $this->resource = $resource;
-  }
-  public function getResource()
-  {
-    return $this->resource;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ServiceControl/CheckError.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ServiceControl/CheckError.php
deleted file mode 100644
index a2382bb5..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ServiceControl/CheckError.php
+++ /dev/null
@@ -1,39 +0,0 @@
-code = $code;
-  }
-  public function getCode()
-  {
-    return $this->code;
-  }
-  public function setDetail($detail)
-  {
-    $this->detail = $detail;
-  }
-  public function getDetail()
-  {
-    return $this->detail;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ServiceControl/CheckInfo.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ServiceControl/CheckInfo.php
deleted file mode 100644
index d9f18c8f..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ServiceControl/CheckInfo.php
+++ /dev/null
@@ -1,31 +0,0 @@
-unusedArguments = $unusedArguments;
-  }
-  public function getUnusedArguments()
-  {
-    return $this->unusedArguments;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ServiceControl/CheckRequest.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ServiceControl/CheckRequest.php
deleted file mode 100644
index 597e6de7..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ServiceControl/CheckRequest.php
+++ /dev/null
@@ -1,58 +0,0 @@
-operation = $operation;
-  }
-  public function getOperation()
-  {
-    return $this->operation;
-  }
-  public function setRequestProjectSettings($requestProjectSettings)
-  {
-    $this->requestProjectSettings = $requestProjectSettings;
-  }
-  public function getRequestProjectSettings()
-  {
-    return $this->requestProjectSettings;
-  }
-  public function setServiceConfigId($serviceConfigId)
-  {
-    $this->serviceConfigId = $serviceConfigId;
-  }
-  public function getServiceConfigId()
-  {
-    return $this->serviceConfigId;
-  }
-  public function setSkipActivationCheck($skipActivationCheck)
-  {
-    $this->skipActivationCheck = $skipActivationCheck;
-  }
-  public function getSkipActivationCheck()
-  {
-    return $this->skipActivationCheck;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ServiceControl/CheckResponse.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ServiceControl/CheckResponse.php
deleted file mode 100644
index c3e496cb..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ServiceControl/CheckResponse.php
+++ /dev/null
@@ -1,70 +0,0 @@
-checkErrors = $checkErrors;
-  }
-  public function getCheckErrors()
-  {
-    return $this->checkErrors;
-  }
-  public function setCheckInfo(Google_Service_ServiceControl_CheckInfo $checkInfo)
-  {
-    $this->checkInfo = $checkInfo;
-  }
-  public function getCheckInfo()
-  {
-    return $this->checkInfo;
-  }
-  public function setOperationId($operationId)
-  {
-    $this->operationId = $operationId;
-  }
-  public function getOperationId()
-  {
-    return $this->operationId;
-  }
-  public function setQuotaInfo(Google_Service_ServiceControl_QuotaInfo $quotaInfo)
-  {
-    $this->quotaInfo = $quotaInfo;
-  }
-  public function getQuotaInfo()
-  {
-    return $this->quotaInfo;
-  }
-  public function setServiceConfigId($serviceConfigId)
-  {
-    $this->serviceConfigId = $serviceConfigId;
-  }
-  public function getServiceConfigId()
-  {
-    return $this->serviceConfigId;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ServiceControl/Distribution.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ServiceControl/Distribution.php
deleted file mode 100644
index 99f45e46..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ServiceControl/Distribution.php
+++ /dev/null
@@ -1,106 +0,0 @@
-bucketCounts = $bucketCounts;
-  }
-  public function getBucketCounts()
-  {
-    return $this->bucketCounts;
-  }
-  public function setCount($count)
-  {
-    $this->count = $count;
-  }
-  public function getCount()
-  {
-    return $this->count;
-  }
-  public function setExplicitBuckets(Google_Service_ServiceControl_ExplicitBuckets $explicitBuckets)
-  {
-    $this->explicitBuckets = $explicitBuckets;
-  }
-  public function getExplicitBuckets()
-  {
-    return $this->explicitBuckets;
-  }
-  public function setExponentialBuckets(Google_Service_ServiceControl_ExponentialBuckets $exponentialBuckets)
-  {
-    $this->exponentialBuckets = $exponentialBuckets;
-  }
-  public function getExponentialBuckets()
-  {
-    return $this->exponentialBuckets;
-  }
-  public function setLinearBuckets(Google_Service_ServiceControl_LinearBuckets $linearBuckets)
-  {
-    $this->linearBuckets = $linearBuckets;
-  }
-  public function getLinearBuckets()
-  {
-    return $this->linearBuckets;
-  }
-  public function setMaximum($maximum)
-  {
-    $this->maximum = $maximum;
-  }
-  public function getMaximum()
-  {
-    return $this->maximum;
-  }
-  public function setMean($mean)
-  {
-    $this->mean = $mean;
-  }
-  public function getMean()
-  {
-    return $this->mean;
-  }
-  public function setMinimum($minimum)
-  {
-    $this->minimum = $minimum;
-  }
-  public function getMinimum()
-  {
-    return $this->minimum;
-  }
-  public function setSumOfSquaredDeviation($sumOfSquaredDeviation)
-  {
-    $this->sumOfSquaredDeviation = $sumOfSquaredDeviation;
-  }
-  public function getSumOfSquaredDeviation()
-  {
-    return $this->sumOfSquaredDeviation;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ServiceControl/EndReconciliationRequest.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ServiceControl/EndReconciliationRequest.php
deleted file mode 100644
index 30e3bd3d..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ServiceControl/EndReconciliationRequest.php
+++ /dev/null
@@ -1,40 +0,0 @@
-reconciliationOperation = $reconciliationOperation;
-  }
-  public function getReconciliationOperation()
-  {
-    return $this->reconciliationOperation;
-  }
-  public function setServiceConfigId($serviceConfigId)
-  {
-    $this->serviceConfigId = $serviceConfigId;
-  }
-  public function getServiceConfigId()
-  {
-    return $this->serviceConfigId;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ServiceControl/EndReconciliationResponse.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ServiceControl/EndReconciliationResponse.php
deleted file mode 100644
index 23145bad..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ServiceControl/EndReconciliationResponse.php
+++ /dev/null
@@ -1,60 +0,0 @@
-operationId = $operationId;
-  }
-  public function getOperationId()
-  {
-    return $this->operationId;
-  }
-  public function setQuotaMetrics($quotaMetrics)
-  {
-    $this->quotaMetrics = $quotaMetrics;
-  }
-  public function getQuotaMetrics()
-  {
-    return $this->quotaMetrics;
-  }
-  public function setReconciliationErrors($reconciliationErrors)
-  {
-    $this->reconciliationErrors = $reconciliationErrors;
-  }
-  public function getReconciliationErrors()
-  {
-    return $this->reconciliationErrors;
-  }
-  public function setServiceConfigId($serviceConfigId)
-  {
-    $this->serviceConfigId = $serviceConfigId;
-  }
-  public function getServiceConfigId()
-  {
-    return $this->serviceConfigId;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ServiceControl/ExplicitBuckets.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ServiceControl/ExplicitBuckets.php
deleted file mode 100644
index aad45478..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ServiceControl/ExplicitBuckets.php
+++ /dev/null
@@ -1,31 +0,0 @@
-bounds = $bounds;
-  }
-  public function getBounds()
-  {
-    return $this->bounds;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ServiceControl/ExponentialBuckets.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ServiceControl/ExponentialBuckets.php
deleted file mode 100644
index 7872fac7..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ServiceControl/ExponentialBuckets.php
+++ /dev/null
@@ -1,48 +0,0 @@
-growthFactor = $growthFactor;
-  }
-  public function getGrowthFactor()
-  {
-    return $this->growthFactor;
-  }
-  public function setNumFiniteBuckets($numFiniteBuckets)
-  {
-    $this->numFiniteBuckets = $numFiniteBuckets;
-  }
-  public function getNumFiniteBuckets()
-  {
-    return $this->numFiniteBuckets;
-  }
-  public function setScale($scale)
-  {
-    $this->scale = $scale;
-  }
-  public function getScale()
-  {
-    return $this->scale;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ServiceControl/LinearBuckets.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ServiceControl/LinearBuckets.php
deleted file mode 100644
index 8ae7ecd8..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ServiceControl/LinearBuckets.php
+++ /dev/null
@@ -1,48 +0,0 @@
-numFiniteBuckets = $numFiniteBuckets;
-  }
-  public function getNumFiniteBuckets()
-  {
-    return $this->numFiniteBuckets;
-  }
-  public function setOffset($offset)
-  {
-    $this->offset = $offset;
-  }
-  public function getOffset()
-  {
-    return $this->offset;
-  }
-  public function setWidth($width)
-  {
-    $this->width = $width;
-  }
-  public function getWidth()
-  {
-    return $this->width;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ServiceControl/LogEntry.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ServiceControl/LogEntry.php
deleted file mode 100644
index 84a8c511..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ServiceControl/LogEntry.php
+++ /dev/null
@@ -1,93 +0,0 @@
-insertId = $insertId;
-  }
-  public function getInsertId()
-  {
-    return $this->insertId;
-  }
-  public function setLabels($labels)
-  {
-    $this->labels = $labels;
-  }
-  public function getLabels()
-  {
-    return $this->labels;
-  }
-  public function setName($name)
-  {
-    $this->name = $name;
-  }
-  public function getName()
-  {
-    return $this->name;
-  }
-  public function setProtoPayload($protoPayload)
-  {
-    $this->protoPayload = $protoPayload;
-  }
-  public function getProtoPayload()
-  {
-    return $this->protoPayload;
-  }
-  public function setSeverity($severity)
-  {
-    $this->severity = $severity;
-  }
-  public function getSeverity()
-  {
-    return $this->severity;
-  }
-  public function setStructPayload($structPayload)
-  {
-    $this->structPayload = $structPayload;
-  }
-  public function getStructPayload()
-  {
-    return $this->structPayload;
-  }
-  public function setTextPayload($textPayload)
-  {
-    $this->textPayload = $textPayload;
-  }
-  public function getTextPayload()
-  {
-    return $this->textPayload;
-  }
-  public function setTimestamp($timestamp)
-  {
-    $this->timestamp = $timestamp;
-  }
-  public function getTimestamp()
-  {
-    return $this->timestamp;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ServiceControl/MetricValue.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ServiceControl/MetricValue.php
deleted file mode 100644
index a71b8be3..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ServiceControl/MetricValue.php
+++ /dev/null
@@ -1,104 +0,0 @@
-boolValue = $boolValue;
-  }
-  public function getBoolValue()
-  {
-    return $this->boolValue;
-  }
-  public function setDistributionValue(Google_Service_ServiceControl_Distribution $distributionValue)
-  {
-    $this->distributionValue = $distributionValue;
-  }
-  public function getDistributionValue()
-  {
-    return $this->distributionValue;
-  }
-  public function setDoubleValue($doubleValue)
-  {
-    $this->doubleValue = $doubleValue;
-  }
-  public function getDoubleValue()
-  {
-    return $this->doubleValue;
-  }
-  public function setEndTime($endTime)
-  {
-    $this->endTime = $endTime;
-  }
-  public function getEndTime()
-  {
-    return $this->endTime;
-  }
-  public function setInt64Value($int64Value)
-  {
-    $this->int64Value = $int64Value;
-  }
-  public function getInt64Value()
-  {
-    return $this->int64Value;
-  }
-  public function setLabels($labels)
-  {
-    $this->labels = $labels;
-  }
-  public function getLabels()
-  {
-    return $this->labels;
-  }
-  public function setMoneyValue(Google_Service_ServiceControl_Money $moneyValue)
-  {
-    $this->moneyValue = $moneyValue;
-  }
-  public function getMoneyValue()
-  {
-    return $this->moneyValue;
-  }
-  public function setStartTime($startTime)
-  {
-    $this->startTime = $startTime;
-  }
-  public function getStartTime()
-  {
-    return $this->startTime;
-  }
-  public function setStringValue($stringValue)
-  {
-    $this->stringValue = $stringValue;
-  }
-  public function getStringValue()
-  {
-    return $this->stringValue;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ServiceControl/MetricValueSet.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ServiceControl/MetricValueSet.php
deleted file mode 100644
index 7164abf3..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ServiceControl/MetricValueSet.php
+++ /dev/null
@@ -1,41 +0,0 @@
-metricName = $metricName;
-  }
-  public function getMetricName()
-  {
-    return $this->metricName;
-  }
-  public function setMetricValues($metricValues)
-  {
-    $this->metricValues = $metricValues;
-  }
-  public function getMetricValues()
-  {
-    return $this->metricValues;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ServiceControl/Money.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ServiceControl/Money.php
deleted file mode 100644
index 55b7874e..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ServiceControl/Money.php
+++ /dev/null
@@ -1,48 +0,0 @@
-currencyCode = $currencyCode;
-  }
-  public function getCurrencyCode()
-  {
-    return $this->currencyCode;
-  }
-  public function setNanos($nanos)
-  {
-    $this->nanos = $nanos;
-  }
-  public function getNanos()
-  {
-    return $this->nanos;
-  }
-  public function setUnits($units)
-  {
-    $this->units = $units;
-  }
-  public function getUnits()
-  {
-    return $this->units;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ServiceControl/Operation.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ServiceControl/Operation.php
deleted file mode 100644
index d58e975a..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ServiceControl/Operation.php
+++ /dev/null
@@ -1,133 +0,0 @@
-consumerId = $consumerId;
-  }
-  public function getConsumerId()
-  {
-    return $this->consumerId;
-  }
-  public function setEndTime($endTime)
-  {
-    $this->endTime = $endTime;
-  }
-  public function getEndTime()
-  {
-    return $this->endTime;
-  }
-  public function setImportance($importance)
-  {
-    $this->importance = $importance;
-  }
-  public function getImportance()
-  {
-    return $this->importance;
-  }
-  public function setLabels($labels)
-  {
-    $this->labels = $labels;
-  }
-  public function getLabels()
-  {
-    return $this->labels;
-  }
-  public function setLogEntries($logEntries)
-  {
-    $this->logEntries = $logEntries;
-  }
-  public function getLogEntries()
-  {
-    return $this->logEntries;
-  }
-  public function setMetricValueSets($metricValueSets)
-  {
-    $this->metricValueSets = $metricValueSets;
-  }
-  public function getMetricValueSets()
-  {
-    return $this->metricValueSets;
-  }
-  public function setOperationId($operationId)
-  {
-    $this->operationId = $operationId;
-  }
-  public function getOperationId()
-  {
-    return $this->operationId;
-  }
-  public function setOperationName($operationName)
-  {
-    $this->operationName = $operationName;
-  }
-  public function getOperationName()
-  {
-    return $this->operationName;
-  }
-  public function setQuotaProperties(Google_Service_ServiceControl_QuotaProperties $quotaProperties)
-  {
-    $this->quotaProperties = $quotaProperties;
-  }
-  public function getQuotaProperties()
-  {
-    return $this->quotaProperties;
-  }
-  public function setResourceContainer($resourceContainer)
-  {
-    $this->resourceContainer = $resourceContainer;
-  }
-  public function getResourceContainer()
-  {
-    return $this->resourceContainer;
-  }
-  public function setStartTime($startTime)
-  {
-    $this->startTime = $startTime;
-  }
-  public function getStartTime()
-  {
-    return $this->startTime;
-  }
-  public function setUserLabels($userLabels)
-  {
-    $this->userLabels = $userLabels;
-  }
-  public function getUserLabels()
-  {
-    return $this->userLabels;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ServiceControl/QuotaError.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ServiceControl/QuotaError.php
deleted file mode 100644
index 3ab44fb5..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ServiceControl/QuotaError.php
+++ /dev/null
@@ -1,48 +0,0 @@
-code = $code;
-  }
-  public function getCode()
-  {
-    return $this->code;
-  }
-  public function setDescription($description)
-  {
-    $this->description = $description;
-  }
-  public function getDescription()
-  {
-    return $this->description;
-  }
-  public function setSubject($subject)
-  {
-    $this->subject = $subject;
-  }
-  public function getSubject()
-  {
-    return $this->subject;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ServiceControl/QuotaInfo.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ServiceControl/QuotaInfo.php
deleted file mode 100644
index 748c2bf9..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ServiceControl/QuotaInfo.php
+++ /dev/null
@@ -1,50 +0,0 @@
-limitExceeded = $limitExceeded;
-  }
-  public function getLimitExceeded()
-  {
-    return $this->limitExceeded;
-  }
-  public function setQuotaConsumed($quotaConsumed)
-  {
-    $this->quotaConsumed = $quotaConsumed;
-  }
-  public function getQuotaConsumed()
-  {
-    return $this->quotaConsumed;
-  }
-  public function setQuotaMetrics($quotaMetrics)
-  {
-    $this->quotaMetrics = $quotaMetrics;
-  }
-  public function getQuotaMetrics()
-  {
-    return $this->quotaMetrics;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ServiceControl/QuotaOperation.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ServiceControl/QuotaOperation.php
deleted file mode 100644
index 37b4144d..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ServiceControl/QuotaOperation.php
+++ /dev/null
@@ -1,77 +0,0 @@
-consumerId = $consumerId;
-  }
-  public function getConsumerId()
-  {
-    return $this->consumerId;
-  }
-  public function setLabels($labels)
-  {
-    $this->labels = $labels;
-  }
-  public function getLabels()
-  {
-    return $this->labels;
-  }
-  public function setMethodName($methodName)
-  {
-    $this->methodName = $methodName;
-  }
-  public function getMethodName()
-  {
-    return $this->methodName;
-  }
-  public function setOperationId($operationId)
-  {
-    $this->operationId = $operationId;
-  }
-  public function getOperationId()
-  {
-    return $this->operationId;
-  }
-  public function setQuotaMetrics($quotaMetrics)
-  {
-    $this->quotaMetrics = $quotaMetrics;
-  }
-  public function getQuotaMetrics()
-  {
-    return $this->quotaMetrics;
-  }
-  public function setQuotaMode($quotaMode)
-  {
-    $this->quotaMode = $quotaMode;
-  }
-  public function getQuotaMode()
-  {
-    return $this->quotaMode;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ServiceControl/QuotaProperties.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ServiceControl/QuotaProperties.php
deleted file mode 100644
index b8bb2ef2..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ServiceControl/QuotaProperties.php
+++ /dev/null
@@ -1,39 +0,0 @@
-limitByIds = $limitByIds;
-  }
-  public function getLimitByIds()
-  {
-    return $this->limitByIds;
-  }
-  public function setQuotaMode($quotaMode)
-  {
-    $this->quotaMode = $quotaMode;
-  }
-  public function getQuotaMode()
-  {
-    return $this->quotaMode;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ServiceControl/ReleaseQuotaRequest.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ServiceControl/ReleaseQuotaRequest.php
deleted file mode 100644
index d6dd8fa0..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ServiceControl/ReleaseQuotaRequest.php
+++ /dev/null
@@ -1,40 +0,0 @@
-releaseOperation = $releaseOperation;
-  }
-  public function getReleaseOperation()
-  {
-    return $this->releaseOperation;
-  }
-  public function setServiceConfigId($serviceConfigId)
-  {
-    $this->serviceConfigId = $serviceConfigId;
-  }
-  public function getServiceConfigId()
-  {
-    return $this->serviceConfigId;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ServiceControl/ReleaseQuotaResponse.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ServiceControl/ReleaseQuotaResponse.php
deleted file mode 100644
index e78b09d0..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ServiceControl/ReleaseQuotaResponse.php
+++ /dev/null
@@ -1,60 +0,0 @@
-operationId = $operationId;
-  }
-  public function getOperationId()
-  {
-    return $this->operationId;
-  }
-  public function setQuotaMetrics($quotaMetrics)
-  {
-    $this->quotaMetrics = $quotaMetrics;
-  }
-  public function getQuotaMetrics()
-  {
-    return $this->quotaMetrics;
-  }
-  public function setReleaseErrors($releaseErrors)
-  {
-    $this->releaseErrors = $releaseErrors;
-  }
-  public function getReleaseErrors()
-  {
-    return $this->releaseErrors;
-  }
-  public function setServiceConfigId($serviceConfigId)
-  {
-    $this->serviceConfigId = $serviceConfigId;
-  }
-  public function getServiceConfigId()
-  {
-    return $this->serviceConfigId;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ServiceControl/ReportError.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ServiceControl/ReportError.php
deleted file mode 100644
index d5db0b9f..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ServiceControl/ReportError.php
+++ /dev/null
@@ -1,40 +0,0 @@
-operationId = $operationId;
-  }
-  public function getOperationId()
-  {
-    return $this->operationId;
-  }
-  public function setStatus(Google_Service_ServiceControl_Status $status)
-  {
-    $this->status = $status;
-  }
-  public function getStatus()
-  {
-    return $this->status;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ServiceControl/ReportInfo.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ServiceControl/ReportInfo.php
deleted file mode 100644
index 3ff863df..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ServiceControl/ReportInfo.php
+++ /dev/null
@@ -1,40 +0,0 @@
-operationId = $operationId;
-  }
-  public function getOperationId()
-  {
-    return $this->operationId;
-  }
-  public function setQuotaInfo(Google_Service_ServiceControl_QuotaInfo $quotaInfo)
-  {
-    $this->quotaInfo = $quotaInfo;
-  }
-  public function getQuotaInfo()
-  {
-    return $this->quotaInfo;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ServiceControl/ReportRequest.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ServiceControl/ReportRequest.php
deleted file mode 100644
index 5fa09d42..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ServiceControl/ReportRequest.php
+++ /dev/null
@@ -1,41 +0,0 @@
-operations = $operations;
-  }
-  public function getOperations()
-  {
-    return $this->operations;
-  }
-  public function setServiceConfigId($serviceConfigId)
-  {
-    $this->serviceConfigId = $serviceConfigId;
-  }
-  public function getServiceConfigId()
-  {
-    return $this->serviceConfigId;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ServiceControl/ReportResponse.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ServiceControl/ReportResponse.php
deleted file mode 100644
index a32a1ef9..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ServiceControl/ReportResponse.php
+++ /dev/null
@@ -1,51 +0,0 @@
-reportErrors = $reportErrors;
-  }
-  public function getReportErrors()
-  {
-    return $this->reportErrors;
-  }
-  public function setReportInfos($reportInfos)
-  {
-    $this->reportInfos = $reportInfos;
-  }
-  public function getReportInfos()
-  {
-    return $this->reportInfos;
-  }
-  public function setServiceConfigId($serviceConfigId)
-  {
-    $this->serviceConfigId = $serviceConfigId;
-  }
-  public function getServiceConfigId()
-  {
-    return $this->serviceConfigId;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ServiceControl/RequestMetadata.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ServiceControl/RequestMetadata.php
deleted file mode 100644
index 3eac6ed8..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ServiceControl/RequestMetadata.php
+++ /dev/null
@@ -1,39 +0,0 @@
-callerIp = $callerIp;
-  }
-  public function getCallerIp()
-  {
-    return $this->callerIp;
-  }
-  public function setCallerSuppliedUserAgent($callerSuppliedUserAgent)
-  {
-    $this->callerSuppliedUserAgent = $callerSuppliedUserAgent;
-  }
-  public function getCallerSuppliedUserAgent()
-  {
-    return $this->callerSuppliedUserAgent;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ServiceControl/Resource/Services.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ServiceControl/Resource/Services.php
deleted file mode 100644
index f88318cd..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ServiceControl/Resource/Services.php
+++ /dev/null
@@ -1,191 +0,0 @@
-
- *   $servicecontrolService = new Google_Service_ServiceControl(...);
- *   $services = $servicecontrolService->services;
- *  
- */
-class Google_Service_ServiceControl_Resource_Services extends Google_Service_Resource
-{
-  /**
-   * Attempts to allocate quota for the specified consumer. It should be called
-   * before the operation is executed.
-   *
-   * This method requires the `servicemanagement.services.quota` permission on the
-   * specified service. For more information, see [Google Cloud
-   * IAM](https://cloud.google.com/iam). (services.allocateQuota)
-   *
-   * @param string $serviceName Name of the service as specified in the service
-   * configuration. For example, `"pubsub.googleapis.com"`.
-   *
-   * See google.api.Service for the definition of a service name.
-   * @param Google_Service_ServiceControl_AllocateQuotaRequest $postBody
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_ServiceControl_AllocateQuotaResponse
-   */
-  public function allocateQuota($serviceName, Google_Service_ServiceControl_AllocateQuotaRequest $postBody, $optParams = array())
-  {
-    $params = array('serviceName' => $serviceName, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('allocateQuota', array($params), "Google_Service_ServiceControl_AllocateQuotaResponse");
-  }
-  /**
-   * Checks an operation with Google Service Control to decide whether the given
-   * operation should proceed. It should be called before the operation is
-   * executed.
-   *
-   * If feasible, the client should cache the check results and reuse them for 60
-   * seconds. In case of server errors, the client can rely on the cached results
-   * for longer time.
-   *
-   * NOTE: the `CheckRequest` has the size limit of 64KB.
-   *
-   * This method requires the `servicemanagement.services.check` permission on the
-   * specified service. For more information, see [Google Cloud
-   * IAM](https://cloud.google.com/iam). (services.check)
-   *
-   * @param string $serviceName The service name as specified in its service
-   * configuration. For example, `"pubsub.googleapis.com"`.
-   *
-   * See google.api.Service for the definition of a service name.
-   * @param Google_Service_ServiceControl_CheckRequest $postBody
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_ServiceControl_CheckResponse
-   */
-  public function check($serviceName, Google_Service_ServiceControl_CheckRequest $postBody, $optParams = array())
-  {
-    $params = array('serviceName' => $serviceName, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('check', array($params), "Google_Service_ServiceControl_CheckResponse");
-  }
-  /**
-   * Signals the quota controller that service ends the ongoing usage
-   * reconciliation.
-   *
-   * This method requires the `servicemanagement.services.quota` permission on the
-   * specified service. For more information, see [Google Cloud
-   * IAM](https://cloud.google.com/iam). (services.endReconciliation)
-   *
-   * @param string $serviceName Name of the service as specified in the service
-   * configuration. For example, `"pubsub.googleapis.com"`.
-   *
-   * See google.api.Service for the definition of a service name.
-   * @param Google_Service_ServiceControl_EndReconciliationRequest $postBody
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_ServiceControl_EndReconciliationResponse
-   */
-  public function endReconciliation($serviceName, Google_Service_ServiceControl_EndReconciliationRequest $postBody, $optParams = array())
-  {
-    $params = array('serviceName' => $serviceName, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('endReconciliation', array($params), "Google_Service_ServiceControl_EndReconciliationResponse");
-  }
-  /**
-   * Releases previously allocated quota done through AllocateQuota method.
-   *
-   * This method requires the `servicemanagement.services.quota` permission on the
-   * specified service. For more information, see [Google Cloud
-   * IAM](https://cloud.google.com/iam). (services.releaseQuota)
-   *
-   * @param string $serviceName Name of the service as specified in the service
-   * configuration. For example, `"pubsub.googleapis.com"`.
-   *
-   * See google.api.Service for the definition of a service name.
-   * @param Google_Service_ServiceControl_ReleaseQuotaRequest $postBody
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_ServiceControl_ReleaseQuotaResponse
-   */
-  public function releaseQuota($serviceName, Google_Service_ServiceControl_ReleaseQuotaRequest $postBody, $optParams = array())
-  {
-    $params = array('serviceName' => $serviceName, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('releaseQuota', array($params), "Google_Service_ServiceControl_ReleaseQuotaResponse");
-  }
-  /**
-   * Reports operation results to Google Service Control, such as logs and
-   * metrics. It should be called after an operation is completed.
-   *
-   * If feasible, the client should aggregate reporting data for up to 5 seconds
-   * to reduce API traffic. Limiting aggregation to 5 seconds is to reduce data
-   * loss during client crashes. Clients should carefully choose the aggregation
-   * time window to avoid data loss risk more than 0.01% for business and
-   * compliance reasons.
-   *
-   * NOTE: the `ReportRequest` has the size limit of 1MB.
-   *
-   * This method requires the `servicemanagement.services.report` permission on
-   * the specified service. For more information, see [Google Cloud
-   * IAM](https://cloud.google.com/iam). (services.report)
-   *
-   * @param string $serviceName The service name as specified in its service
-   * configuration. For example, `"pubsub.googleapis.com"`.
-   *
-   * See google.api.Service for the definition of a service name.
-   * @param Google_Service_ServiceControl_ReportRequest $postBody
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_ServiceControl_ReportResponse
-   */
-  public function report($serviceName, Google_Service_ServiceControl_ReportRequest $postBody, $optParams = array())
-  {
-    $params = array('serviceName' => $serviceName, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('report', array($params), "Google_Service_ServiceControl_ReportResponse");
-  }
-  /**
-   * Unlike rate quota, allocation quota does not get refilled periodically. So,
-   * it is possible that the quota usage as seen by the service differs from what
-   * the One Platform considers the usage is. This is expected to happen only
-   * rarely, but over time this can accumulate. Services can invoke
-   * StartReconciliation and EndReconciliation to correct this usage drift, as
-   * described below: 1. Service sends StartReconciliation with a timestamp in
-   * future for each    metric that needs to be reconciled. The timestamp being in
-   * future allows    to account for in-flight AllocateQuota and ReleaseQuota
-   * requests for the    same metric. 2. One Platform records this timestamp and
-   * starts tracking subsequent    AllocateQuota and ReleaseQuota requests until
-   * EndReconciliation is    called. 3. At or after the time specified in the
-   * StartReconciliation, service    sends EndReconciliation with the usage that
-   * needs to be reconciled to. 4. One Platform adjusts its own record of usage
-   * for that metric to the    value specified in EndReconciliation by taking in
-   * to account any    allocation or release between StartReconciliation and
-   * EndReconciliation.
-   *
-   * Signals the quota controller that the service wants to perform a usage
-   * reconciliation as specified in the request.
-   *
-   * This method requires the `servicemanagement.services.quota` permission on the
-   * specified service. For more information, see [Google Cloud
-   * IAM](https://cloud.google.com/iam). (services.startReconciliation)
-   *
-   * @param string $serviceName Name of the service as specified in the service
-   * configuration. For example, `"pubsub.googleapis.com"`.
-   *
-   * See google.api.Service for the definition of a service name.
-   * @param Google_Service_ServiceControl_StartReconciliationRequest $postBody
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_ServiceControl_StartReconciliationResponse
-   */
-  public function startReconciliation($serviceName, Google_Service_ServiceControl_StartReconciliationRequest $postBody, $optParams = array())
-  {
-    $params = array('serviceName' => $serviceName, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('startReconciliation', array($params), "Google_Service_ServiceControl_StartReconciliationResponse");
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ServiceControl/StartReconciliationRequest.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ServiceControl/StartReconciliationRequest.php
deleted file mode 100644
index 1bcb79af..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ServiceControl/StartReconciliationRequest.php
+++ /dev/null
@@ -1,40 +0,0 @@
-reconciliationOperation = $reconciliationOperation;
-  }
-  public function getReconciliationOperation()
-  {
-    return $this->reconciliationOperation;
-  }
-  public function setServiceConfigId($serviceConfigId)
-  {
-    $this->serviceConfigId = $serviceConfigId;
-  }
-  public function getServiceConfigId()
-  {
-    return $this->serviceConfigId;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ServiceControl/StartReconciliationResponse.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ServiceControl/StartReconciliationResponse.php
deleted file mode 100644
index 5c153fd3..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ServiceControl/StartReconciliationResponse.php
+++ /dev/null
@@ -1,60 +0,0 @@
-operationId = $operationId;
-  }
-  public function getOperationId()
-  {
-    return $this->operationId;
-  }
-  public function setQuotaMetrics($quotaMetrics)
-  {
-    $this->quotaMetrics = $quotaMetrics;
-  }
-  public function getQuotaMetrics()
-  {
-    return $this->quotaMetrics;
-  }
-  public function setReconciliationErrors($reconciliationErrors)
-  {
-    $this->reconciliationErrors = $reconciliationErrors;
-  }
-  public function getReconciliationErrors()
-  {
-    return $this->reconciliationErrors;
-  }
-  public function setServiceConfigId($serviceConfigId)
-  {
-    $this->serviceConfigId = $serviceConfigId;
-  }
-  public function getServiceConfigId()
-  {
-    return $this->serviceConfigId;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ServiceControl/Status.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ServiceControl/Status.php
deleted file mode 100644
index 98bf6b0c..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ServiceControl/Status.php
+++ /dev/null
@@ -1,49 +0,0 @@
-code = $code;
-  }
-  public function getCode()
-  {
-    return $this->code;
-  }
-  public function setDetails($details)
-  {
-    $this->details = $details;
-  }
-  public function getDetails()
-  {
-    return $this->details;
-  }
-  public function setMessage($message)
-  {
-    $this->message = $message;
-  }
-  public function getMessage()
-  {
-    return $this->message;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ServiceManagement.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ServiceManagement.php
deleted file mode 100644
index e87d359f..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ServiceManagement.php
+++ /dev/null
@@ -1,366 +0,0 @@
-
- * Google Service Management allows service producers to publish their services
- * on Google Cloud Platform so that they can be discovered and used by service
- * consumers.

- *
- * 

- * For more information about this service, see the API
- * Documentation
- * 

- *
- * @author Google, Inc.
- */
-class Google_Service_ServiceManagement extends Google_Service
-{
-  /** View and manage your data across Google Cloud Platform services. */
-  const CLOUD_PLATFORM =
-      "https://www.googleapis.com/auth/cloud-platform";
-  /** View your data across Google Cloud Platform services. */
-  const CLOUD_PLATFORM_READ_ONLY =
-      "https://www.googleapis.com/auth/cloud-platform.read-only";
-  /** Manage your Google API service configuration. */
-  const SERVICE_MANAGEMENT =
-      "https://www.googleapis.com/auth/service.management";
-  /** View your Google API service configuration. */
-  const SERVICE_MANAGEMENT_READONLY =
-      "https://www.googleapis.com/auth/service.management.readonly";
-
-  public $operations;
-  public $services;
-  public $services_configs;
-  public $services_rollouts;
-  
-  /**
-   * Constructs the internal representation of the ServiceManagement service.
-   *
-   * @param Google_Client $client
-   */
-  public function __construct(Google_Client $client)
-  {
-    parent::__construct($client);
-    $this->rootUrl = 'https://servicemanagement.googleapis.com/';
-    $this->servicePath = '';
-    $this->version = 'v1';
-    $this->serviceName = 'servicemanagement';
-
-    $this->operations = new Google_Service_ServiceManagement_Resource_Operations(
-        $this,
-        $this->serviceName,
-        'operations',
-        array(
-          'methods' => array(
-            'get' => array(
-              'path' => 'v1/{+name}',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'name' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'list' => array(
-              'path' => 'v1/{+name}',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'name' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'filter' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'pageToken' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'pageSize' => array(
-                  'location' => 'query',
-                  'type' => 'integer',
-                ),
-              ),
-            ),
-          )
-        )
-    );
-    $this->services = new Google_Service_ServiceManagement_Resource_Services(
-        $this,
-        $this->serviceName,
-        'services',
-        array(
-          'methods' => array(
-            'create' => array(
-              'path' => 'v1/services',
-              'httpMethod' => 'POST',
-              'parameters' => array(),
-            ),'delete' => array(
-              'path' => 'v1/services/{serviceName}',
-              'httpMethod' => 'DELETE',
-              'parameters' => array(
-                'serviceName' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'disable' => array(
-              'path' => 'v1/services/{serviceName}:disable',
-              'httpMethod' => 'POST',
-              'parameters' => array(
-                'serviceName' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'enable' => array(
-              'path' => 'v1/services/{serviceName}:enable',
-              'httpMethod' => 'POST',
-              'parameters' => array(
-                'serviceName' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'generateConfigReport' => array(
-              'path' => 'v1/services:generateConfigReport',
-              'httpMethod' => 'POST',
-              'parameters' => array(),
-            ),'get' => array(
-              'path' => 'v1/services/{serviceName}',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'serviceName' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'getConfig' => array(
-              'path' => 'v1/services/{serviceName}/config',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'serviceName' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'configId' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'view' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-              ),
-            ),'getIamPolicy' => array(
-              'path' => 'v1/{+resource}:getIamPolicy',
-              'httpMethod' => 'POST',
-              'parameters' => array(
-                'resource' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'list' => array(
-              'path' => 'v1/services',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'consumerId' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'pageToken' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'pageSize' => array(
-                  'location' => 'query',
-                  'type' => 'integer',
-                ),
-                'producerProjectId' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-              ),
-            ),'setIamPolicy' => array(
-              'path' => 'v1/{+resource}:setIamPolicy',
-              'httpMethod' => 'POST',
-              'parameters' => array(
-                'resource' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'testIamPermissions' => array(
-              'path' => 'v1/{+resource}:testIamPermissions',
-              'httpMethod' => 'POST',
-              'parameters' => array(
-                'resource' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'undelete' => array(
-              'path' => 'v1/services/{serviceName}:undelete',
-              'httpMethod' => 'POST',
-              'parameters' => array(
-                'serviceName' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),
-          )
-        )
-    );
-    $this->services_configs = new Google_Service_ServiceManagement_Resource_ServicesConfigs(
-        $this,
-        $this->serviceName,
-        'configs',
-        array(
-          'methods' => array(
-            'create' => array(
-              'path' => 'v1/services/{serviceName}/configs',
-              'httpMethod' => 'POST',
-              'parameters' => array(
-                'serviceName' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'get' => array(
-              'path' => 'v1/services/{serviceName}/configs/{configId}',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'serviceName' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'configId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'view' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-              ),
-            ),'list' => array(
-              'path' => 'v1/services/{serviceName}/configs',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'serviceName' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'pageToken' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'pageSize' => array(
-                  'location' => 'query',
-                  'type' => 'integer',
-                ),
-              ),
-            ),'submit' => array(
-              'path' => 'v1/services/{serviceName}/configs:submit',
-              'httpMethod' => 'POST',
-              'parameters' => array(
-                'serviceName' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),
-          )
-        )
-    );
-    $this->services_rollouts = new Google_Service_ServiceManagement_Resource_ServicesRollouts(
-        $this,
-        $this->serviceName,
-        'rollouts',
-        array(
-          'methods' => array(
-            'create' => array(
-              'path' => 'v1/services/{serviceName}/rollouts',
-              'httpMethod' => 'POST',
-              'parameters' => array(
-                'serviceName' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'get' => array(
-              'path' => 'v1/services/{serviceName}/rollouts/{rolloutId}',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'serviceName' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'rolloutId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'list' => array(
-              'path' => 'v1/services/{serviceName}/rollouts',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'serviceName' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'pageToken' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'pageSize' => array(
-                  'location' => 'query',
-                  'type' => 'integer',
-                ),
-              ),
-            ),
-          )
-        )
-    );
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ServiceManagement/Advice.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ServiceManagement/Advice.php
deleted file mode 100644
index ea85b5d4..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ServiceManagement/Advice.php
+++ /dev/null
@@ -1,30 +0,0 @@
-description = $description;
-  }
-  public function getDescription()
-  {
-    return $this->description;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ServiceManagement/Analytics.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ServiceManagement/Analytics.php
deleted file mode 100644
index c1f6fd09..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ServiceManagement/Analytics.php
+++ /dev/null
@@ -1,32 +0,0 @@
-producerDestinations = $producerDestinations;
-  }
-  public function getProducerDestinations()
-  {
-    return $this->producerDestinations;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ServiceManagement/AnalyticsDestination.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ServiceManagement/AnalyticsDestination.php
deleted file mode 100644
index 75172d5c..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ServiceManagement/AnalyticsDestination.php
+++ /dev/null
@@ -1,40 +0,0 @@
-metrics = $metrics;
-  }
-  public function getMetrics()
-  {
-    return $this->metrics;
-  }
-  public function setMonitoredResource($monitoredResource)
-  {
-    $this->monitoredResource = $monitoredResource;
-  }
-  public function getMonitoredResource()
-  {
-    return $this->monitoredResource;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ServiceManagement/Api.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ServiceManagement/Api.php
deleted file mode 100644
index 029bc79a..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ServiceManagement/Api.php
+++ /dev/null
@@ -1,89 +0,0 @@
-methods = $methods;
-  }
-  public function getMethods()
-  {
-    return $this->methods;
-  }
-  public function setMixins($mixins)
-  {
-    $this->mixins = $mixins;
-  }
-  public function getMixins()
-  {
-    return $this->mixins;
-  }
-  public function setName($name)
-  {
-    $this->name = $name;
-  }
-  public function getName()
-  {
-    return $this->name;
-  }
-  public function setOptions($options)
-  {
-    $this->options = $options;
-  }
-  public function getOptions()
-  {
-    return $this->options;
-  }
-  public function setSourceContext(Google_Service_ServiceManagement_SourceContext $sourceContext)
-  {
-    $this->sourceContext = $sourceContext;
-  }
-  public function getSourceContext()
-  {
-    return $this->sourceContext;
-  }
-  public function setSyntax($syntax)
-  {
-    $this->syntax = $syntax;
-  }
-  public function getSyntax()
-  {
-    return $this->syntax;
-  }
-  public function setVersion($version)
-  {
-    $this->version = $version;
-  }
-  public function getVersion()
-  {
-    return $this->version;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ServiceManagement/AuditConfig.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ServiceManagement/AuditConfig.php
deleted file mode 100644
index 4b118b43..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ServiceManagement/AuditConfig.php
+++ /dev/null
@@ -1,50 +0,0 @@
-auditLogConfigs = $auditLogConfigs;
-  }
-  public function getAuditLogConfigs()
-  {
-    return $this->auditLogConfigs;
-  }
-  public function setExemptedMembers($exemptedMembers)
-  {
-    $this->exemptedMembers = $exemptedMembers;
-  }
-  public function getExemptedMembers()
-  {
-    return $this->exemptedMembers;
-  }
-  public function setService($service)
-  {
-    $this->service = $service;
-  }
-  public function getService()
-  {
-    return $this->service;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ServiceManagement/AuditLogConfig.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ServiceManagement/AuditLogConfig.php
deleted file mode 100644
index 7c83ca3a..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ServiceManagement/AuditLogConfig.php
+++ /dev/null
@@ -1,40 +0,0 @@
-exemptedMembers = $exemptedMembers;
-  }
-  public function getExemptedMembers()
-  {
-    return $this->exemptedMembers;
-  }
-  public function setLogType($logType)
-  {
-    $this->logType = $logType;
-  }
-  public function getLogType()
-  {
-    return $this->logType;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ServiceManagement/AuthProvider.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ServiceManagement/AuthProvider.php
deleted file mode 100644
index c88ac099..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ServiceManagement/AuthProvider.php
+++ /dev/null
@@ -1,57 +0,0 @@
-audiences = $audiences;
-  }
-  public function getAudiences()
-  {
-    return $this->audiences;
-  }
-  public function setId($id)
-  {
-    $this->id = $id;
-  }
-  public function getId()
-  {
-    return $this->id;
-  }
-  public function setIssuer($issuer)
-  {
-    $this->issuer = $issuer;
-  }
-  public function getIssuer()
-  {
-    return $this->issuer;
-  }
-  public function setJwksUri($jwksUri)
-  {
-    $this->jwksUri = $jwksUri;
-  }
-  public function getJwksUri()
-  {
-    return $this->jwksUri;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ServiceManagement/AuthRequirement.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ServiceManagement/AuthRequirement.php
deleted file mode 100644
index 6ab3b963..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ServiceManagement/AuthRequirement.php
+++ /dev/null
@@ -1,39 +0,0 @@
-audiences = $audiences;
-  }
-  public function getAudiences()
-  {
-    return $this->audiences;
-  }
-  public function setProviderId($providerId)
-  {
-    $this->providerId = $providerId;
-  }
-  public function getProviderId()
-  {
-    return $this->providerId;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ServiceManagement/Authentication.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ServiceManagement/Authentication.php
deleted file mode 100644
index 01962ef2..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ServiceManagement/Authentication.php
+++ /dev/null
@@ -1,42 +0,0 @@
-providers = $providers;
-  }
-  public function getProviders()
-  {
-    return $this->providers;
-  }
-  public function setRules($rules)
-  {
-    $this->rules = $rules;
-  }
-  public function getRules()
-  {
-    return $this->rules;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ServiceManagement/AuthenticationRule.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ServiceManagement/AuthenticationRule.php
deleted file mode 100644
index f24ae16d..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ServiceManagement/AuthenticationRule.php
+++ /dev/null
@@ -1,60 +0,0 @@
-allowWithoutCredential = $allowWithoutCredential;
-  }
-  public function getAllowWithoutCredential()
-  {
-    return $this->allowWithoutCredential;
-  }
-  public function setOauth(Google_Service_ServiceManagement_OAuthRequirements $oauth)
-  {
-    $this->oauth = $oauth;
-  }
-  public function getOauth()
-  {
-    return $this->oauth;
-  }
-  public function setRequirements($requirements)
-  {
-    $this->requirements = $requirements;
-  }
-  public function getRequirements()
-  {
-    return $this->requirements;
-  }
-  public function setSelector($selector)
-  {
-    $this->selector = $selector;
-  }
-  public function getSelector()
-  {
-    return $this->selector;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ServiceManagement/AuthorizationConfig.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ServiceManagement/AuthorizationConfig.php
deleted file mode 100644
index e565cdb9..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ServiceManagement/AuthorizationConfig.php
+++ /dev/null
@@ -1,30 +0,0 @@
-provider = $provider;
-  }
-  public function getProvider()
-  {
-    return $this->provider;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ServiceManagement/Backend.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ServiceManagement/Backend.php
deleted file mode 100644
index f472c079..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ServiceManagement/Backend.php
+++ /dev/null
@@ -1,32 +0,0 @@
-rules = $rules;
-  }
-  public function getRules()
-  {
-    return $this->rules;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ServiceManagement/BackendRule.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ServiceManagement/BackendRule.php
deleted file mode 100644
index 02b0c65c..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ServiceManagement/BackendRule.php
+++ /dev/null
@@ -1,48 +0,0 @@
-address = $address;
-  }
-  public function getAddress()
-  {
-    return $this->address;
-  }
-  public function setDeadline($deadline)
-  {
-    $this->deadline = $deadline;
-  }
-  public function getDeadline()
-  {
-    return $this->deadline;
-  }
-  public function setSelector($selector)
-  {
-    $this->selector = $selector;
-  }
-  public function getSelector()
-  {
-    return $this->selector;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ServiceManagement/Binding.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ServiceManagement/Binding.php
deleted file mode 100644
index 653a8442..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ServiceManagement/Binding.php
+++ /dev/null
@@ -1,40 +0,0 @@
-members = $members;
-  }
-  public function getMembers()
-  {
-    return $this->members;
-  }
-  public function setRole($role)
-  {
-    $this->role = $role;
-  }
-  public function getRole()
-  {
-    return $this->role;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ServiceManagement/ChangeReport.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ServiceManagement/ChangeReport.php
deleted file mode 100644
index 356d282c..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ServiceManagement/ChangeReport.php
+++ /dev/null
@@ -1,32 +0,0 @@
-configChanges = $configChanges;
-  }
-  public function getConfigChanges()
-  {
-    return $this->configChanges;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ServiceManagement/CloudAuditOptions.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ServiceManagement/CloudAuditOptions.php
deleted file mode 100644
index 348d6b83..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ServiceManagement/CloudAuditOptions.php
+++ /dev/null
@@ -1,20 +0,0 @@
-iam = $iam;
-  }
-  public function getIam()
-  {
-    return $this->iam;
-  }
-  public function setOp($op)
-  {
-    $this->op = $op;
-  }
-  public function getOp()
-  {
-    return $this->op;
-  }
-  public function setSvc($svc)
-  {
-    $this->svc = $svc;
-  }
-  public function getSvc()
-  {
-    return $this->svc;
-  }
-  public function setSys($sys)
-  {
-    $this->sys = $sys;
-  }
-  public function getSys()
-  {
-    return $this->sys;
-  }
-  public function setValue($value)
-  {
-    $this->value = $value;
-  }
-  public function getValue()
-  {
-    return $this->value;
-  }
-  public function setValues($values)
-  {
-    $this->values = $values;
-  }
-  public function getValues()
-  {
-    return $this->values;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ServiceManagement/ConfigChange.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ServiceManagement/ConfigChange.php
deleted file mode 100644
index e360f097..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ServiceManagement/ConfigChange.php
+++ /dev/null
@@ -1,68 +0,0 @@
-advices = $advices;
-  }
-  public function getAdvices()
-  {
-    return $this->advices;
-  }
-  public function setChangeType($changeType)
-  {
-    $this->changeType = $changeType;
-  }
-  public function getChangeType()
-  {
-    return $this->changeType;
-  }
-  public function setElement($element)
-  {
-    $this->element = $element;
-  }
-  public function getElement()
-  {
-    return $this->element;
-  }
-  public function setNewValue($newValue)
-  {
-    $this->newValue = $newValue;
-  }
-  public function getNewValue()
-  {
-    return $this->newValue;
-  }
-  public function setOldValue($oldValue)
-  {
-    $this->oldValue = $oldValue;
-  }
-  public function getOldValue()
-  {
-    return $this->oldValue;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ServiceManagement/ConfigFile.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ServiceManagement/ConfigFile.php
deleted file mode 100644
index b34518cd..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ServiceManagement/ConfigFile.php
+++ /dev/null
@@ -1,48 +0,0 @@
-fileContents = $fileContents;
-  }
-  public function getFileContents()
-  {
-    return $this->fileContents;
-  }
-  public function setFilePath($filePath)
-  {
-    $this->filePath = $filePath;
-  }
-  public function getFilePath()
-  {
-    return $this->filePath;
-  }
-  public function setFileType($fileType)
-  {
-    $this->fileType = $fileType;
-  }
-  public function getFileType()
-  {
-    return $this->fileType;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ServiceManagement/ConfigOptions.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ServiceManagement/ConfigOptions.php
deleted file mode 100644
index 53a13c72..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ServiceManagement/ConfigOptions.php
+++ /dev/null
@@ -1,20 +0,0 @@
-name = $name;
-  }
-  public function getName()
-  {
-    return $this->name;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ServiceManagement/ConfigSource.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ServiceManagement/ConfigSource.php
deleted file mode 100644
index 312da61d..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ServiceManagement/ConfigSource.php
+++ /dev/null
@@ -1,41 +0,0 @@
-files = $files;
-  }
-  public function getFiles()
-  {
-    return $this->files;
-  }
-  public function setId($id)
-  {
-    $this->id = $id;
-  }
-  public function getId()
-  {
-    return $this->id;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ServiceManagement/Context.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ServiceManagement/Context.php
deleted file mode 100644
index d0fb9e36..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ServiceManagement/Context.php
+++ /dev/null
@@ -1,32 +0,0 @@
-rules = $rules;
-  }
-  public function getRules()
-  {
-    return $this->rules;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ServiceManagement/ContextRule.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ServiceManagement/ContextRule.php
deleted file mode 100644
index 3d58609d..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ServiceManagement/ContextRule.php
+++ /dev/null
@@ -1,49 +0,0 @@
-provided = $provided;
-  }
-  public function getProvided()
-  {
-    return $this->provided;
-  }
-  public function setRequested($requested)
-  {
-    $this->requested = $requested;
-  }
-  public function getRequested()
-  {
-    return $this->requested;
-  }
-  public function setSelector($selector)
-  {
-    $this->selector = $selector;
-  }
-  public function getSelector()
-  {
-    return $this->selector;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ServiceManagement/Control.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ServiceManagement/Control.php
deleted file mode 100644
index cd384856..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ServiceManagement/Control.php
+++ /dev/null
@@ -1,30 +0,0 @@
-environment = $environment;
-  }
-  public function getEnvironment()
-  {
-    return $this->environment;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ServiceManagement/CounterOptions.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ServiceManagement/CounterOptions.php
deleted file mode 100644
index e9887b08..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ServiceManagement/CounterOptions.php
+++ /dev/null
@@ -1,39 +0,0 @@
-field = $field;
-  }
-  public function getField()
-  {
-    return $this->field;
-  }
-  public function setMetric($metric)
-  {
-    $this->metric = $metric;
-  }
-  public function getMetric()
-  {
-    return $this->metric;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ServiceManagement/CustomError.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ServiceManagement/CustomError.php
deleted file mode 100644
index 3cdf5f1b..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ServiceManagement/CustomError.php
+++ /dev/null
@@ -1,41 +0,0 @@
-rules = $rules;
-  }
-  public function getRules()
-  {
-    return $this->rules;
-  }
-  public function setTypes($types)
-  {
-    $this->types = $types;
-  }
-  public function getTypes()
-  {
-    return $this->types;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ServiceManagement/CustomErrorRule.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ServiceManagement/CustomErrorRule.php
deleted file mode 100644
index 4335060c..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ServiceManagement/CustomErrorRule.php
+++ /dev/null
@@ -1,39 +0,0 @@
-isErrorType = $isErrorType;
-  }
-  public function getIsErrorType()
-  {
-    return $this->isErrorType;
-  }
-  public function setSelector($selector)
-  {
-    $this->selector = $selector;
-  }
-  public function getSelector()
-  {
-    return $this->selector;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ServiceManagement/CustomHttpPattern.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ServiceManagement/CustomHttpPattern.php
deleted file mode 100644
index 864728cf..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ServiceManagement/CustomHttpPattern.php
+++ /dev/null
@@ -1,39 +0,0 @@
-kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setPath($path)
-  {
-    $this->path = $path;
-  }
-  public function getPath()
-  {
-    return $this->path;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ServiceManagement/DataAccessOptions.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ServiceManagement/DataAccessOptions.php
deleted file mode 100644
index e3255d92..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ServiceManagement/DataAccessOptions.php
+++ /dev/null
@@ -1,20 +0,0 @@
-kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setLocation($location)
-  {
-    $this->location = $location;
-  }
-  public function getLocation()
-  {
-    return $this->location;
-  }
-  public function setMessage($message)
-  {
-    $this->message = $message;
-  }
-  public function getMessage()
-  {
-    return $this->message;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ServiceManagement/DisableServiceRequest.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ServiceManagement/DisableServiceRequest.php
deleted file mode 100644
index 642c07dd..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ServiceManagement/DisableServiceRequest.php
+++ /dev/null
@@ -1,30 +0,0 @@
-consumerId = $consumerId;
-  }
-  public function getConsumerId()
-  {
-    return $this->consumerId;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ServiceManagement/Documentation.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ServiceManagement/Documentation.php
deleted file mode 100644
index 0815b6b0..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ServiceManagement/Documentation.php
+++ /dev/null
@@ -1,69 +0,0 @@
-documentationRootUrl = $documentationRootUrl;
-  }
-  public function getDocumentationRootUrl()
-  {
-    return $this->documentationRootUrl;
-  }
-  public function setOverview($overview)
-  {
-    $this->overview = $overview;
-  }
-  public function getOverview()
-  {
-    return $this->overview;
-  }
-  public function setPages($pages)
-  {
-    $this->pages = $pages;
-  }
-  public function getPages()
-  {
-    return $this->pages;
-  }
-  public function setRules($rules)
-  {
-    $this->rules = $rules;
-  }
-  public function getRules()
-  {
-    return $this->rules;
-  }
-  public function setSummary($summary)
-  {
-    $this->summary = $summary;
-  }
-  public function getSummary()
-  {
-    return $this->summary;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ServiceManagement/DocumentationRule.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ServiceManagement/DocumentationRule.php
deleted file mode 100644
index be1dddb4..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ServiceManagement/DocumentationRule.php
+++ /dev/null
@@ -1,48 +0,0 @@
-deprecationDescription = $deprecationDescription;
-  }
-  public function getDeprecationDescription()
-  {
-    return $this->deprecationDescription;
-  }
-  public function setDescription($description)
-  {
-    $this->description = $description;
-  }
-  public function getDescription()
-  {
-    return $this->description;
-  }
-  public function setSelector($selector)
-  {
-    $this->selector = $selector;
-  }
-  public function getSelector()
-  {
-    return $this->selector;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ServiceManagement/EnableServiceRequest.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ServiceManagement/EnableServiceRequest.php
deleted file mode 100644
index a220199a..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ServiceManagement/EnableServiceRequest.php
+++ /dev/null
@@ -1,30 +0,0 @@
-consumerId = $consumerId;
-  }
-  public function getConsumerId()
-  {
-    return $this->consumerId;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ServiceManagement/Endpoint.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ServiceManagement/Endpoint.php
deleted file mode 100644
index 428b6e1b..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ServiceManagement/Endpoint.php
+++ /dev/null
@@ -1,67 +0,0 @@
-aliases = $aliases;
-  }
-  public function getAliases()
-  {
-    return $this->aliases;
-  }
-  public function setAllowCors($allowCors)
-  {
-    $this->allowCors = $allowCors;
-  }
-  public function getAllowCors()
-  {
-    return $this->allowCors;
-  }
-  public function setApis($apis)
-  {
-    $this->apis = $apis;
-  }
-  public function getApis()
-  {
-    return $this->apis;
-  }
-  public function setFeatures($features)
-  {
-    $this->features = $features;
-  }
-  public function getFeatures()
-  {
-    return $this->features;
-  }
-  public function setName($name)
-  {
-    $this->name = $name;
-  }
-  public function getName()
-  {
-    return $this->name;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ServiceManagement/Enum.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ServiceManagement/Enum.php
deleted file mode 100644
index 2791e8f0..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ServiceManagement/Enum.php
+++ /dev/null
@@ -1,70 +0,0 @@
-enumvalue = $enumvalue;
-  }
-  public function getEnumvalue()
-  {
-    return $this->enumvalue;
-  }
-  public function setName($name)
-  {
-    $this->name = $name;
-  }
-  public function getName()
-  {
-    return $this->name;
-  }
-  public function setOptions($options)
-  {
-    $this->options = $options;
-  }
-  public function getOptions()
-  {
-    return $this->options;
-  }
-  public function setSourceContext(Google_Service_ServiceManagement_SourceContext $sourceContext)
-  {
-    $this->sourceContext = $sourceContext;
-  }
-  public function getSourceContext()
-  {
-    return $this->sourceContext;
-  }
-  public function setSyntax($syntax)
-  {
-    $this->syntax = $syntax;
-  }
-  public function getSyntax()
-  {
-    return $this->syntax;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ServiceManagement/EnumValue.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ServiceManagement/EnumValue.php
deleted file mode 100644
index 50d5d481..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ServiceManagement/EnumValue.php
+++ /dev/null
@@ -1,50 +0,0 @@
-name = $name;
-  }
-  public function getName()
-  {
-    return $this->name;
-  }
-  public function setNumber($number)
-  {
-    $this->number = $number;
-  }
-  public function getNumber()
-  {
-    return $this->number;
-  }
-  public function setOptions($options)
-  {
-    $this->options = $options;
-  }
-  public function getOptions()
-  {
-    return $this->options;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ServiceManagement/Experimental.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ServiceManagement/Experimental.php
deleted file mode 100644
index cd26e618..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ServiceManagement/Experimental.php
+++ /dev/null
@@ -1,31 +0,0 @@
-authorization = $authorization;
-  }
-  public function getAuthorization()
-  {
-    return $this->authorization;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ServiceManagement/Field.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ServiceManagement/Field.php
deleted file mode 100644
index bb7ba6fc..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ServiceManagement/Field.php
+++ /dev/null
@@ -1,113 +0,0 @@
-cardinality = $cardinality;
-  }
-  public function getCardinality()
-  {
-    return $this->cardinality;
-  }
-  public function setDefaultValue($defaultValue)
-  {
-    $this->defaultValue = $defaultValue;
-  }
-  public function getDefaultValue()
-  {
-    return $this->defaultValue;
-  }
-  public function setJsonName($jsonName)
-  {
-    $this->jsonName = $jsonName;
-  }
-  public function getJsonName()
-  {
-    return $this->jsonName;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setName($name)
-  {
-    $this->name = $name;
-  }
-  public function getName()
-  {
-    return $this->name;
-  }
-  public function setNumber($number)
-  {
-    $this->number = $number;
-  }
-  public function getNumber()
-  {
-    return $this->number;
-  }
-  public function setOneofIndex($oneofIndex)
-  {
-    $this->oneofIndex = $oneofIndex;
-  }
-  public function getOneofIndex()
-  {
-    return $this->oneofIndex;
-  }
-  public function setOptions($options)
-  {
-    $this->options = $options;
-  }
-  public function getOptions()
-  {
-    return $this->options;
-  }
-  public function setPacked($packed)
-  {
-    $this->packed = $packed;
-  }
-  public function getPacked()
-  {
-    return $this->packed;
-  }
-  public function setTypeUrl($typeUrl)
-  {
-    $this->typeUrl = $typeUrl;
-  }
-  public function getTypeUrl()
-  {
-    return $this->typeUrl;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ServiceManagement/GenerateConfigReportRequest.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ServiceManagement/GenerateConfigReportRequest.php
deleted file mode 100644
index 69b2b040..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ServiceManagement/GenerateConfigReportRequest.php
+++ /dev/null
@@ -1,39 +0,0 @@
-newConfig = $newConfig;
-  }
-  public function getNewConfig()
-  {
-    return $this->newConfig;
-  }
-  public function setOldConfig($oldConfig)
-  {
-    $this->oldConfig = $oldConfig;
-  }
-  public function getOldConfig()
-  {
-    return $this->oldConfig;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ServiceManagement/GenerateConfigReportResponse.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ServiceManagement/GenerateConfigReportResponse.php
deleted file mode 100644
index 29f74874..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ServiceManagement/GenerateConfigReportResponse.php
+++ /dev/null
@@ -1,60 +0,0 @@
-changeReports = $changeReports;
-  }
-  public function getChangeReports()
-  {
-    return $this->changeReports;
-  }
-  public function setDiagnostics($diagnostics)
-  {
-    $this->diagnostics = $diagnostics;
-  }
-  public function getDiagnostics()
-  {
-    return $this->diagnostics;
-  }
-  public function setId($id)
-  {
-    $this->id = $id;
-  }
-  public function getId()
-  {
-    return $this->id;
-  }
-  public function setServiceName($serviceName)
-  {
-    $this->serviceName = $serviceName;
-  }
-  public function getServiceName()
-  {
-    return $this->serviceName;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ServiceManagement/GetIamPolicyRequest.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ServiceManagement/GetIamPolicyRequest.php
deleted file mode 100644
index 9424ea28..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ServiceManagement/GetIamPolicyRequest.php
+++ /dev/null
@@ -1,20 +0,0 @@
-rules = $rules;
-  }
-  public function getRules()
-  {
-    return $this->rules;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ServiceManagement/HttpRule.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ServiceManagement/HttpRule.php
deleted file mode 100644
index f020e39c..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ServiceManagement/HttpRule.php
+++ /dev/null
@@ -1,134 +0,0 @@
-additionalBindings = $additionalBindings;
-  }
-  public function getAdditionalBindings()
-  {
-    return $this->additionalBindings;
-  }
-  public function setBody($body)
-  {
-    $this->body = $body;
-  }
-  public function getBody()
-  {
-    return $this->body;
-  }
-  public function setCustom(Google_Service_ServiceManagement_CustomHttpPattern $custom)
-  {
-    $this->custom = $custom;
-  }
-  public function getCustom()
-  {
-    return $this->custom;
-  }
-  public function setDelete($delete)
-  {
-    $this->delete = $delete;
-  }
-  public function getDelete()
-  {
-    return $this->delete;
-  }
-  public function setGet($get)
-  {
-    $this->get = $get;
-  }
-  public function getGet()
-  {
-    return $this->get;
-  }
-  public function setMediaDownload(Google_Service_ServiceManagement_MediaDownload $mediaDownload)
-  {
-    $this->mediaDownload = $mediaDownload;
-  }
-  public function getMediaDownload()
-  {
-    return $this->mediaDownload;
-  }
-  public function setMediaUpload(Google_Service_ServiceManagement_MediaUpload $mediaUpload)
-  {
-    $this->mediaUpload = $mediaUpload;
-  }
-  public function getMediaUpload()
-  {
-    return $this->mediaUpload;
-  }
-  public function setPatch($patch)
-  {
-    $this->patch = $patch;
-  }
-  public function getPatch()
-  {
-    return $this->patch;
-  }
-  public function setPost($post)
-  {
-    $this->post = $post;
-  }
-  public function getPost()
-  {
-    return $this->post;
-  }
-  public function setPut($put)
-  {
-    $this->put = $put;
-  }
-  public function getPut()
-  {
-    return $this->put;
-  }
-  public function setResponseBody($responseBody)
-  {
-    $this->responseBody = $responseBody;
-  }
-  public function getResponseBody()
-  {
-    return $this->responseBody;
-  }
-  public function setSelector($selector)
-  {
-    $this->selector = $selector;
-  }
-  public function getSelector()
-  {
-    return $this->selector;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ServiceManagement/LabelDescriptor.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ServiceManagement/LabelDescriptor.php
deleted file mode 100644
index 82d3f600..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ServiceManagement/LabelDescriptor.php
+++ /dev/null
@@ -1,48 +0,0 @@
-description = $description;
-  }
-  public function getDescription()
-  {
-    return $this->description;
-  }
-  public function setKey($key)
-  {
-    $this->key = $key;
-  }
-  public function getKey()
-  {
-    return $this->key;
-  }
-  public function setValueType($valueType)
-  {
-    $this->valueType = $valueType;
-  }
-  public function getValueType()
-  {
-    return $this->valueType;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ServiceManagement/ListOperationsResponse.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ServiceManagement/ListOperationsResponse.php
deleted file mode 100644
index 0065fb0b..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ServiceManagement/ListOperationsResponse.php
+++ /dev/null
@@ -1,41 +0,0 @@
-nextPageToken = $nextPageToken;
-  }
-  public function getNextPageToken()
-  {
-    return $this->nextPageToken;
-  }
-  public function setOperations($operations)
-  {
-    $this->operations = $operations;
-  }
-  public function getOperations()
-  {
-    return $this->operations;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ServiceManagement/ListServiceConfigsResponse.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ServiceManagement/ListServiceConfigsResponse.php
deleted file mode 100644
index cb40067c..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ServiceManagement/ListServiceConfigsResponse.php
+++ /dev/null
@@ -1,41 +0,0 @@
-nextPageToken = $nextPageToken;
-  }
-  public function getNextPageToken()
-  {
-    return $this->nextPageToken;
-  }
-  public function setServiceConfigs($serviceConfigs)
-  {
-    $this->serviceConfigs = $serviceConfigs;
-  }
-  public function getServiceConfigs()
-  {
-    return $this->serviceConfigs;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ServiceManagement/ListServiceRolloutsResponse.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ServiceManagement/ListServiceRolloutsResponse.php
deleted file mode 100644
index f3362657..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ServiceManagement/ListServiceRolloutsResponse.php
+++ /dev/null
@@ -1,41 +0,0 @@
-nextPageToken = $nextPageToken;
-  }
-  public function getNextPageToken()
-  {
-    return $this->nextPageToken;
-  }
-  public function setRollouts($rollouts)
-  {
-    $this->rollouts = $rollouts;
-  }
-  public function getRollouts()
-  {
-    return $this->rollouts;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ServiceManagement/ListServicesResponse.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ServiceManagement/ListServicesResponse.php
deleted file mode 100644
index d71d5236..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ServiceManagement/ListServicesResponse.php
+++ /dev/null
@@ -1,41 +0,0 @@
-nextPageToken = $nextPageToken;
-  }
-  public function getNextPageToken()
-  {
-    return $this->nextPageToken;
-  }
-  public function setServices($services)
-  {
-    $this->services = $services;
-  }
-  public function getServices()
-  {
-    return $this->services;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ServiceManagement/LogConfig.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ServiceManagement/LogConfig.php
deleted file mode 100644
index e56803a8..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ServiceManagement/LogConfig.php
+++ /dev/null
@@ -1,51 +0,0 @@
-cloudAudit = $cloudAudit;
-  }
-  public function getCloudAudit()
-  {
-    return $this->cloudAudit;
-  }
-  public function setCounter(Google_Service_ServiceManagement_CounterOptions $counter)
-  {
-    $this->counter = $counter;
-  }
-  public function getCounter()
-  {
-    return $this->counter;
-  }
-  public function setDataAccess(Google_Service_ServiceManagement_DataAccessOptions $dataAccess)
-  {
-    $this->dataAccess = $dataAccess;
-  }
-  public function getDataAccess()
-  {
-    return $this->dataAccess;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ServiceManagement/LogDescriptor.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ServiceManagement/LogDescriptor.php
deleted file mode 100644
index 6c1f9bac..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ServiceManagement/LogDescriptor.php
+++ /dev/null
@@ -1,59 +0,0 @@
-description = $description;
-  }
-  public function getDescription()
-  {
-    return $this->description;
-  }
-  public function setDisplayName($displayName)
-  {
-    $this->displayName = $displayName;
-  }
-  public function getDisplayName()
-  {
-    return $this->displayName;
-  }
-  public function setLabels($labels)
-  {
-    $this->labels = $labels;
-  }
-  public function getLabels()
-  {
-    return $this->labels;
-  }
-  public function setName($name)
-  {
-    $this->name = $name;
-  }
-  public function getName()
-  {
-    return $this->name;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ServiceManagement/Logging.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ServiceManagement/Logging.php
deleted file mode 100644
index 6fb5798a..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ServiceManagement/Logging.php
+++ /dev/null
@@ -1,42 +0,0 @@
-consumerDestinations = $consumerDestinations;
-  }
-  public function getConsumerDestinations()
-  {
-    return $this->consumerDestinations;
-  }
-  public function setProducerDestinations($producerDestinations)
-  {
-    $this->producerDestinations = $producerDestinations;
-  }
-  public function getProducerDestinations()
-  {
-    return $this->producerDestinations;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ServiceManagement/LoggingDestination.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ServiceManagement/LoggingDestination.php
deleted file mode 100644
index 9a2138c8..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ServiceManagement/LoggingDestination.php
+++ /dev/null
@@ -1,40 +0,0 @@
-logs = $logs;
-  }
-  public function getLogs()
-  {
-    return $this->logs;
-  }
-  public function setMonitoredResource($monitoredResource)
-  {
-    $this->monitoredResource = $monitoredResource;
-  }
-  public function getMonitoredResource()
-  {
-    return $this->monitoredResource;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ServiceManagement/ManagedService.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ServiceManagement/ManagedService.php
deleted file mode 100644
index 4f15460e..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ServiceManagement/ManagedService.php
+++ /dev/null
@@ -1,39 +0,0 @@
-producerProjectId = $producerProjectId;
-  }
-  public function getProducerProjectId()
-  {
-    return $this->producerProjectId;
-  }
-  public function setServiceName($serviceName)
-  {
-    $this->serviceName = $serviceName;
-  }
-  public function getServiceName()
-  {
-    return $this->serviceName;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ServiceManagement/MediaDownload.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ServiceManagement/MediaDownload.php
deleted file mode 100644
index 864a9a78..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ServiceManagement/MediaDownload.php
+++ /dev/null
@@ -1,39 +0,0 @@
-downloadService = $downloadService;
-  }
-  public function getDownloadService()
-  {
-    return $this->downloadService;
-  }
-  public function setEnabled($enabled)
-  {
-    $this->enabled = $enabled;
-  }
-  public function getEnabled()
-  {
-    return $this->enabled;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ServiceManagement/MediaUpload.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ServiceManagement/MediaUpload.php
deleted file mode 100644
index 467cabef..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ServiceManagement/MediaUpload.php
+++ /dev/null
@@ -1,39 +0,0 @@
-enabled = $enabled;
-  }
-  public function getEnabled()
-  {
-    return $this->enabled;
-  }
-  public function setUploadService($uploadService)
-  {
-    $this->uploadService = $uploadService;
-  }
-  public function getUploadService()
-  {
-    return $this->uploadService;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ServiceManagement/Method.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ServiceManagement/Method.php
deleted file mode 100644
index c1e6a66f..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ServiceManagement/Method.php
+++ /dev/null
@@ -1,86 +0,0 @@
-name = $name;
-  }
-  public function getName()
-  {
-    return $this->name;
-  }
-  public function setOptions($options)
-  {
-    $this->options = $options;
-  }
-  public function getOptions()
-  {
-    return $this->options;
-  }
-  public function setRequestStreaming($requestStreaming)
-  {
-    $this->requestStreaming = $requestStreaming;
-  }
-  public function getRequestStreaming()
-  {
-    return $this->requestStreaming;
-  }
-  public function setRequestTypeUrl($requestTypeUrl)
-  {
-    $this->requestTypeUrl = $requestTypeUrl;
-  }
-  public function getRequestTypeUrl()
-  {
-    return $this->requestTypeUrl;
-  }
-  public function setResponseStreaming($responseStreaming)
-  {
-    $this->responseStreaming = $responseStreaming;
-  }
-  public function getResponseStreaming()
-  {
-    return $this->responseStreaming;
-  }
-  public function setResponseTypeUrl($responseTypeUrl)
-  {
-    $this->responseTypeUrl = $responseTypeUrl;
-  }
-  public function getResponseTypeUrl()
-  {
-    return $this->responseTypeUrl;
-  }
-  public function setSyntax($syntax)
-  {
-    $this->syntax = $syntax;
-  }
-  public function getSyntax()
-  {
-    return $this->syntax;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ServiceManagement/MetricDescriptor.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ServiceManagement/MetricDescriptor.php
deleted file mode 100644
index c269d902..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ServiceManagement/MetricDescriptor.php
+++ /dev/null
@@ -1,95 +0,0 @@
-description = $description;
-  }
-  public function getDescription()
-  {
-    return $this->description;
-  }
-  public function setDisplayName($displayName)
-  {
-    $this->displayName = $displayName;
-  }
-  public function getDisplayName()
-  {
-    return $this->displayName;
-  }
-  public function setLabels($labels)
-  {
-    $this->labels = $labels;
-  }
-  public function getLabels()
-  {
-    return $this->labels;
-  }
-  public function setMetricKind($metricKind)
-  {
-    $this->metricKind = $metricKind;
-  }
-  public function getMetricKind()
-  {
-    return $this->metricKind;
-  }
-  public function setName($name)
-  {
-    $this->name = $name;
-  }
-  public function getName()
-  {
-    return $this->name;
-  }
-  public function setType($type)
-  {
-    $this->type = $type;
-  }
-  public function getType()
-  {
-    return $this->type;
-  }
-  public function setUnit($unit)
-  {
-    $this->unit = $unit;
-  }
-  public function getUnit()
-  {
-    return $this->unit;
-  }
-  public function setValueType($valueType)
-  {
-    $this->valueType = $valueType;
-  }
-  public function getValueType()
-  {
-    return $this->valueType;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ServiceManagement/Mixin.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ServiceManagement/Mixin.php
deleted file mode 100644
index fd3ed06d..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ServiceManagement/Mixin.php
+++ /dev/null
@@ -1,39 +0,0 @@
-name = $name;
-  }
-  public function getName()
-  {
-    return $this->name;
-  }
-  public function setRoot($root)
-  {
-    $this->root = $root;
-  }
-  public function getRoot()
-  {
-    return $this->root;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ServiceManagement/MonitoredResourceDescriptor.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ServiceManagement/MonitoredResourceDescriptor.php
deleted file mode 100644
index 8852c0ae..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ServiceManagement/MonitoredResourceDescriptor.php
+++ /dev/null
@@ -1,68 +0,0 @@
-description = $description;
-  }
-  public function getDescription()
-  {
-    return $this->description;
-  }
-  public function setDisplayName($displayName)
-  {
-    $this->displayName = $displayName;
-  }
-  public function getDisplayName()
-  {
-    return $this->displayName;
-  }
-  public function setLabels($labels)
-  {
-    $this->labels = $labels;
-  }
-  public function getLabels()
-  {
-    return $this->labels;
-  }
-  public function setName($name)
-  {
-    $this->name = $name;
-  }
-  public function getName()
-  {
-    return $this->name;
-  }
-  public function setType($type)
-  {
-    $this->type = $type;
-  }
-  public function getType()
-  {
-    return $this->type;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ServiceManagement/Monitoring.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ServiceManagement/Monitoring.php
deleted file mode 100644
index fab80287..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ServiceManagement/Monitoring.php
+++ /dev/null
@@ -1,42 +0,0 @@
-consumerDestinations = $consumerDestinations;
-  }
-  public function getConsumerDestinations()
-  {
-    return $this->consumerDestinations;
-  }
-  public function setProducerDestinations($producerDestinations)
-  {
-    $this->producerDestinations = $producerDestinations;
-  }
-  public function getProducerDestinations()
-  {
-    return $this->producerDestinations;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ServiceManagement/MonitoringDestination.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ServiceManagement/MonitoringDestination.php
deleted file mode 100644
index 06ee909d..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ServiceManagement/MonitoringDestination.php
+++ /dev/null
@@ -1,40 +0,0 @@
-metrics = $metrics;
-  }
-  public function getMetrics()
-  {
-    return $this->metrics;
-  }
-  public function setMonitoredResource($monitoredResource)
-  {
-    $this->monitoredResource = $monitoredResource;
-  }
-  public function getMonitoredResource()
-  {
-    return $this->monitoredResource;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ServiceManagement/OAuthRequirements.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ServiceManagement/OAuthRequirements.php
deleted file mode 100644
index 1d75e701..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ServiceManagement/OAuthRequirements.php
+++ /dev/null
@@ -1,30 +0,0 @@
-canonicalScopes = $canonicalScopes;
-  }
-  public function getCanonicalScopes()
-  {
-    return $this->canonicalScopes;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ServiceManagement/Operation.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ServiceManagement/Operation.php
deleted file mode 100644
index c1e9a914..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ServiceManagement/Operation.php
+++ /dev/null
@@ -1,67 +0,0 @@
-done = $done;
-  }
-  public function getDone()
-  {
-    return $this->done;
-  }
-  public function setError(Google_Service_ServiceManagement_Status $error)
-  {
-    $this->error = $error;
-  }
-  public function getError()
-  {
-    return $this->error;
-  }
-  public function setMetadata($metadata)
-  {
-    $this->metadata = $metadata;
-  }
-  public function getMetadata()
-  {
-    return $this->metadata;
-  }
-  public function setName($name)
-  {
-    $this->name = $name;
-  }
-  public function getName()
-  {
-    return $this->name;
-  }
-  public function setResponse($response)
-  {
-    $this->response = $response;
-  }
-  public function getResponse()
-  {
-    return $this->response;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ServiceManagement/OperationMetadata.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ServiceManagement/OperationMetadata.php
deleted file mode 100644
index d77bd9de..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ServiceManagement/OperationMetadata.php
+++ /dev/null
@@ -1,59 +0,0 @@
-progressPercentage = $progressPercentage;
-  }
-  public function getProgressPercentage()
-  {
-    return $this->progressPercentage;
-  }
-  public function setResourceNames($resourceNames)
-  {
-    $this->resourceNames = $resourceNames;
-  }
-  public function getResourceNames()
-  {
-    return $this->resourceNames;
-  }
-  public function setStartTime($startTime)
-  {
-    $this->startTime = $startTime;
-  }
-  public function getStartTime()
-  {
-    return $this->startTime;
-  }
-  public function setSteps($steps)
-  {
-    $this->steps = $steps;
-  }
-  public function getSteps()
-  {
-    return $this->steps;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ServiceManagement/Option.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ServiceManagement/Option.php
deleted file mode 100644
index 00ad2eb5..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ServiceManagement/Option.php
+++ /dev/null
@@ -1,39 +0,0 @@
-name = $name;
-  }
-  public function getName()
-  {
-    return $this->name;
-  }
-  public function setValue($value)
-  {
-    $this->value = $value;
-  }
-  public function getValue()
-  {
-    return $this->value;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ServiceManagement/Page.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ServiceManagement/Page.php
deleted file mode 100644
index ab37f03c..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ServiceManagement/Page.php
+++ /dev/null
@@ -1,50 +0,0 @@
-content = $content;
-  }
-  public function getContent()
-  {
-    return $this->content;
-  }
-  public function setName($name)
-  {
-    $this->name = $name;
-  }
-  public function getName()
-  {
-    return $this->name;
-  }
-  public function setSubpages($subpages)
-  {
-    $this->subpages = $subpages;
-  }
-  public function getSubpages()
-  {
-    return $this->subpages;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ServiceManagement/Policy.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ServiceManagement/Policy.php
deleted file mode 100644
index 5890f138..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ServiceManagement/Policy.php
+++ /dev/null
@@ -1,79 +0,0 @@
-auditConfigs = $auditConfigs;
-  }
-  public function getAuditConfigs()
-  {
-    return $this->auditConfigs;
-  }
-  public function setBindings($bindings)
-  {
-    $this->bindings = $bindings;
-  }
-  public function getBindings()
-  {
-    return $this->bindings;
-  }
-  public function setEtag($etag)
-  {
-    $this->etag = $etag;
-  }
-  public function getEtag()
-  {
-    return $this->etag;
-  }
-  public function setIamOwned($iamOwned)
-  {
-    $this->iamOwned = $iamOwned;
-  }
-  public function getIamOwned()
-  {
-    return $this->iamOwned;
-  }
-  public function setRules($rules)
-  {
-    $this->rules = $rules;
-  }
-  public function getRules()
-  {
-    return $this->rules;
-  }
-  public function setVersion($version)
-  {
-    $this->version = $version;
-  }
-  public function getVersion()
-  {
-    return $this->version;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ServiceManagement/Resource/Operations.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ServiceManagement/Resource/Operations.php
deleted file mode 100644
index 0ea5492e..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ServiceManagement/Resource/Operations.php
+++ /dev/null
@@ -1,65 +0,0 @@
-
- *   $servicemanagementService = new Google_Service_ServiceManagement(...);
- *   $operations = $servicemanagementService->operations;
- *  
- */
-class Google_Service_ServiceManagement_Resource_Operations extends Google_Service_Resource
-{
-  /**
-   * Gets the latest state of a long-running operation.  Clients can use this
-   * method to poll the operation result at intervals as recommended by the API
-   * service. (operations.get)
-   *
-   * @param string $name The name of the operation resource.
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_ServiceManagement_Operation
-   */
-  public function get($name, $optParams = array())
-  {
-    $params = array('name' => $name);
-    $params = array_merge($params, $optParams);
-    return $this->call('get', array($params), "Google_Service_ServiceManagement_Operation");
-  }
-  /**
-   * Lists operations that match the specified filter in the request. If the
-   * server doesn't support this method, it returns `UNIMPLEMENTED`.
-   *
-   * NOTE: the `name` binding below allows API services to override the binding to
-   * use different resource name schemes, such as `users/operations`.
-   * (operations.listOperations)
-   *
-   * @param string $name The name of the operation collection.
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param string filter The standard list filter.
-   * @opt_param string pageToken The standard list page token.
-   * @opt_param int pageSize The standard list page size.
-   * @return Google_Service_ServiceManagement_ListOperationsResponse
-   */
-  public function listOperations($name, $optParams = array())
-  {
-    $params = array('name' => $name);
-    $params = array_merge($params, $optParams);
-    return $this->call('list', array($params), "Google_Service_ServiceManagement_ListOperationsResponse");
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ServiceManagement/Resource/Services.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ServiceManagement/Resource/Services.php
deleted file mode 100644
index 374aeceb..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ServiceManagement/Resource/Services.php
+++ /dev/null
@@ -1,265 +0,0 @@
-
- *   $servicemanagementService = new Google_Service_ServiceManagement(...);
- *   $services = $servicemanagementService->services;
- *  
- */
-class Google_Service_ServiceManagement_Resource_Services extends Google_Service_Resource
-{
-  /**
-   * Creates a new managed service. Please note one producer project can own no
-   * more than 20 services.
-   *
-   * Operation (services.create)
-   *
-   * @param Google_Service_ServiceManagement_ManagedService $postBody
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_ServiceManagement_Operation
-   */
-  public function create(Google_Service_ServiceManagement_ManagedService $postBody, $optParams = array())
-  {
-    $params = array('postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('create', array($params), "Google_Service_ServiceManagement_Operation");
-  }
-  /**
-   * Deletes a managed service. This method will change the service to the `Soft-
-   * Delete` state for 30 days. Within this period, service producers may call
-   * UndeleteService to restore the service. After 30 days, the service will be
-   * permanently deleted.
-   *
-   * Operation (services.delete)
-   *
-   * @param string $serviceName The name of the service.  See the [overview
-   * ](/service-management/overview) for naming requirements.  For example:
-   * `example.googleapis.com`.
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_ServiceManagement_Operation
-   */
-  public function delete($serviceName, $optParams = array())
-  {
-    $params = array('serviceName' => $serviceName);
-    $params = array_merge($params, $optParams);
-    return $this->call('delete', array($params), "Google_Service_ServiceManagement_Operation");
-  }
-  /**
-   * Disables a service for a project, so it can no longer be be used for the
-   * project. It prevents accidental usage that may cause unexpected billing
-   * charges or security leaks.
-   *
-   * Operation (services.disable)
-   *
-   * @param string $serviceName Name of the service to disable. Specifying an
-   * unknown service name will cause the request to fail.
-   * @param Google_Service_ServiceManagement_DisableServiceRequest $postBody
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_ServiceManagement_Operation
-   */
-  public function disable($serviceName, Google_Service_ServiceManagement_DisableServiceRequest $postBody, $optParams = array())
-  {
-    $params = array('serviceName' => $serviceName, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('disable', array($params), "Google_Service_ServiceManagement_Operation");
-  }
-  /**
-   * Enables a service for a project, so it can be used for the project. See
-   * [Cloud Auth Guide](https://cloud.google.com/docs/authentication) for more
-   * information.
-   *
-   * Operation (services.enable)
-   *
-   * @param string $serviceName Name of the service to enable. Specifying an
-   * unknown service name will cause the request to fail.
-   * @param Google_Service_ServiceManagement_EnableServiceRequest $postBody
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_ServiceManagement_Operation
-   */
-  public function enable($serviceName, Google_Service_ServiceManagement_EnableServiceRequest $postBody, $optParams = array())
-  {
-    $params = array('serviceName' => $serviceName, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('enable', array($params), "Google_Service_ServiceManagement_Operation");
-  }
-  /**
-   * Generates and returns a report (errors, warnings and changes from existing
-   * configurations) associated with GenerateConfigReportRequest.new_value
-   *
-   * If GenerateConfigReportRequest.old_value is specified,
-   * GenerateConfigReportRequest will contain a single ChangeReport based on the
-   * comparison between GenerateConfigReportRequest.new_value and
-   * GenerateConfigReportRequest.old_value. If
-   * GenerateConfigReportRequest.old_value is not specified, this method will
-   * compare GenerateConfigReportRequest.new_value with the last pushed service
-   * configuration. (services.generateConfigReport)
-   *
-   * @param Google_Service_ServiceManagement_GenerateConfigReportRequest $postBody
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_ServiceManagement_GenerateConfigReportResponse
-   */
-  public function generateConfigReport(Google_Service_ServiceManagement_GenerateConfigReportRequest $postBody, $optParams = array())
-  {
-    $params = array('postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('generateConfigReport', array($params), "Google_Service_ServiceManagement_GenerateConfigReportResponse");
-  }
-  /**
-   * Gets a managed service. Authentication is required unless the service is
-   * public. (services.get)
-   *
-   * @param string $serviceName The name of the service.  See the `ServiceManager`
-   * overview for naming requirements.  For example: `example.googleapis.com`.
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_ServiceManagement_ManagedService
-   */
-  public function get($serviceName, $optParams = array())
-  {
-    $params = array('serviceName' => $serviceName);
-    $params = array_merge($params, $optParams);
-    return $this->call('get', array($params), "Google_Service_ServiceManagement_ManagedService");
-  }
-  /**
-   * Gets a service configuration (version) for a managed service.
-   * (services.getConfig)
-   *
-   * @param string $serviceName The name of the service.  See the [overview
-   * ](/service-management/overview) for naming requirements.  For example:
-   * `example.googleapis.com`.
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param string configId The id of the service configuration resource.
-   * @opt_param string view Specifies which parts of the Service Config should be
-   * returned in the response.
-   * @return Google_Service_ServiceManagement_Service
-   */
-  public function getConfig($serviceName, $optParams = array())
-  {
-    $params = array('serviceName' => $serviceName);
-    $params = array_merge($params, $optParams);
-    return $this->call('getConfig', array($params), "Google_Service_ServiceManagement_Service");
-  }
-  /**
-   * Gets the access control policy for a resource. Returns an empty policy if the
-   * resource exists and does not have a policy set. (services.getIamPolicy)
-   *
-   * @param string $resource REQUIRED: The resource for which the policy is being
-   * requested. See the operation documentation for the appropriate value for this
-   * field.
-   * @param Google_Service_ServiceManagement_GetIamPolicyRequest $postBody
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_ServiceManagement_Policy
-   */
-  public function getIamPolicy($resource, Google_Service_ServiceManagement_GetIamPolicyRequest $postBody, $optParams = array())
-  {
-    $params = array('resource' => $resource, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('getIamPolicy', array($params), "Google_Service_ServiceManagement_Policy");
-  }
-  /**
-   * Lists managed services.
-   *
-   * Returns all public services. For authenticated users, also returns all
-   * services the calling user has "servicemanagement.services.get" permission
-   * for.
-   *
-   * **BETA:** If the caller specifies the `consumer_id`, it returns only the
-   * services enabled on the consumer. The `consumer_id` must have the format of
-   * "project:{PROJECT-ID}". (services.listServices)
-   *
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param string consumerId Include services consumed by the specified
-   * consumer.
-   *
-   * The Google Service Management implementation accepts the following forms: -
-   * project:
-   * @opt_param string pageToken Token identifying which result to start with;
-   * returned by a previous list call.
-   * @opt_param int pageSize Requested size of the next page of data.
-   * @opt_param string producerProjectId Include services produced by the
-   * specified project.
-   * @return Google_Service_ServiceManagement_ListServicesResponse
-   */
-  public function listServices($optParams = array())
-  {
-    $params = array();
-    $params = array_merge($params, $optParams);
-    return $this->call('list', array($params), "Google_Service_ServiceManagement_ListServicesResponse");
-  }
-  /**
-   * Sets the access control policy on the specified resource. Replaces any
-   * existing policy. (services.setIamPolicy)
-   *
-   * @param string $resource REQUIRED: The resource for which the policy is being
-   * specified. See the operation documentation for the appropriate value for this
-   * field.
-   * @param Google_Service_ServiceManagement_SetIamPolicyRequest $postBody
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_ServiceManagement_Policy
-   */
-  public function setIamPolicy($resource, Google_Service_ServiceManagement_SetIamPolicyRequest $postBody, $optParams = array())
-  {
-    $params = array('resource' => $resource, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('setIamPolicy', array($params), "Google_Service_ServiceManagement_Policy");
-  }
-  /**
-   * Returns permissions that a caller has on the specified resource. If the
-   * resource does not exist, this will return an empty set of permissions, not a
-   * NOT_FOUND error.
-   *
-   * Note: This operation is designed to be used for building permission-aware UIs
-   * and command-line tools, not for authorization checking. This operation may
-   * "fail open" without warning. (services.testIamPermissions)
-   *
-   * @param string $resource REQUIRED: The resource for which the policy detail is
-   * being requested. See the operation documentation for the appropriate value
-   * for this field.
-   * @param Google_Service_ServiceManagement_TestIamPermissionsRequest $postBody
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_ServiceManagement_TestIamPermissionsResponse
-   */
-  public function testIamPermissions($resource, Google_Service_ServiceManagement_TestIamPermissionsRequest $postBody, $optParams = array())
-  {
-    $params = array('resource' => $resource, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('testIamPermissions', array($params), "Google_Service_ServiceManagement_TestIamPermissionsResponse");
-  }
-  /**
-   * Revives a previously deleted managed service. The method restores the service
-   * using the configuration at the time the service was deleted. The target
-   * service must exist and must have been deleted within the last 30 days.
-   *
-   * Operation (services.undelete)
-   *
-   * @param string $serviceName The name of the service. See the [overview
-   * ](/service-management/overview) for naming requirements. For example:
-   * `example.googleapis.com`.
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_ServiceManagement_Operation
-   */
-  public function undelete($serviceName, $optParams = array())
-  {
-    $params = array('serviceName' => $serviceName);
-    $params = array_merge($params, $optParams);
-    return $this->call('undelete', array($params), "Google_Service_ServiceManagement_Operation");
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ServiceManagement/Resource/ServicesConfigs.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ServiceManagement/Resource/ServicesConfigs.php
deleted file mode 100644
index 0dac08dd..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ServiceManagement/Resource/ServicesConfigs.php
+++ /dev/null
@@ -1,108 +0,0 @@
-
- *   $servicemanagementService = new Google_Service_ServiceManagement(...);
- *   $configs = $servicemanagementService->configs;
- *  
- */
-class Google_Service_ServiceManagement_Resource_ServicesConfigs extends Google_Service_Resource
-{
-  /**
-   * Creates a new service configuration (version) for a managed service. This
-   * method only stores the service configuration. To roll out the service
-   * configuration to backend systems please call CreateServiceRollout.
-   * (configs.create)
-   *
-   * @param string $serviceName The name of the service.  See the [overview
-   * ](/service-management/overview) for naming requirements.  For example:
-   * `example.googleapis.com`.
-   * @param Google_Service_ServiceManagement_Service $postBody
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_ServiceManagement_Service
-   */
-  public function create($serviceName, Google_Service_ServiceManagement_Service $postBody, $optParams = array())
-  {
-    $params = array('serviceName' => $serviceName, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('create', array($params), "Google_Service_ServiceManagement_Service");
-  }
-  /**
-   * Gets a service configuration (version) for a managed service. (configs.get)
-   *
-   * @param string $serviceName The name of the service.  See the [overview
-   * ](/service-management/overview) for naming requirements.  For example:
-   * `example.googleapis.com`.
-   * @param string $configId The id of the service configuration resource.
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param string view Specifies which parts of the Service Config should be
-   * returned in the response.
-   * @return Google_Service_ServiceManagement_Service
-   */
-  public function get($serviceName, $configId, $optParams = array())
-  {
-    $params = array('serviceName' => $serviceName, 'configId' => $configId);
-    $params = array_merge($params, $optParams);
-    return $this->call('get', array($params), "Google_Service_ServiceManagement_Service");
-  }
-  /**
-   * Lists the history of the service configuration for a managed service, from
-   * the newest to the oldest. (configs.listServicesConfigs)
-   *
-   * @param string $serviceName The name of the service.  See the [overview
-   * ](/service-management/overview) for naming requirements.  For example:
-   * `example.googleapis.com`.
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param string pageToken The token of the page to retrieve.
-   * @opt_param int pageSize The max number of items to include in the response
-   * list.
-   * @return Google_Service_ServiceManagement_ListServiceConfigsResponse
-   */
-  public function listServicesConfigs($serviceName, $optParams = array())
-  {
-    $params = array('serviceName' => $serviceName);
-    $params = array_merge($params, $optParams);
-    return $this->call('list', array($params), "Google_Service_ServiceManagement_ListServiceConfigsResponse");
-  }
-  /**
-   * Creates a new service configuration (version) for a managed service based on
-   * user-supplied configuration source files (for example: OpenAPI
-   * Specification). This method stores the source configurations as well as the
-   * generated service configuration. To rollout the service configuration to
-   * other services, please call CreateServiceRollout.
-   *
-   * Operation (configs.submit)
-   *
-   * @param string $serviceName The name of the service.  See the [overview
-   * ](/service-management/overview) for naming requirements.  For example:
-   * `example.googleapis.com`.
-   * @param Google_Service_ServiceManagement_SubmitConfigSourceRequest $postBody
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_ServiceManagement_Operation
-   */
-  public function submit($serviceName, Google_Service_ServiceManagement_SubmitConfigSourceRequest $postBody, $optParams = array())
-  {
-    $params = array('serviceName' => $serviceName, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('submit', array($params), "Google_Service_ServiceManagement_Operation");
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ServiceManagement/Resource/ServicesRollouts.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ServiceManagement/Resource/ServicesRollouts.php
deleted file mode 100644
index c15475d2..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ServiceManagement/Resource/ServicesRollouts.php
+++ /dev/null
@@ -1,89 +0,0 @@
-
- *   $servicemanagementService = new Google_Service_ServiceManagement(...);
- *   $rollouts = $servicemanagementService->rollouts;
- *  
- */
-class Google_Service_ServiceManagement_Resource_ServicesRollouts extends Google_Service_Resource
-{
-  /**
-   * Creates a new service configuration rollout. Based on rollout, the Google
-   * Service Management will roll out the service configurations to different
-   * backend services. For example, the logging configuration will be pushed to
-   * Google Cloud Logging.
-   *
-   * Please note that any previous pending and running Rollouts and associated
-   * Operations will be automatically cancelled so that the latest Rollout will
-   * not be blocked by previous Rollouts.
-   *
-   * Operation (rollouts.create)
-   *
-   * @param string $serviceName The name of the service.  See the [overview
-   * ](/service-management/overview) for naming requirements.  For example:
-   * `example.googleapis.com`.
-   * @param Google_Service_ServiceManagement_Rollout $postBody
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_ServiceManagement_Operation
-   */
-  public function create($serviceName, Google_Service_ServiceManagement_Rollout $postBody, $optParams = array())
-  {
-    $params = array('serviceName' => $serviceName, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('create', array($params), "Google_Service_ServiceManagement_Operation");
-  }
-  /**
-   * Gets a service configuration rollout. (rollouts.get)
-   *
-   * @param string $serviceName The name of the service.  See the [overview
-   * ](/service-management/overview) for naming requirements.  For example:
-   * `example.googleapis.com`.
-   * @param string $rolloutId The id of the rollout resource.
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_ServiceManagement_Rollout
-   */
-  public function get($serviceName, $rolloutId, $optParams = array())
-  {
-    $params = array('serviceName' => $serviceName, 'rolloutId' => $rolloutId);
-    $params = array_merge($params, $optParams);
-    return $this->call('get', array($params), "Google_Service_ServiceManagement_Rollout");
-  }
-  /**
-   * Lists the history of the service configuration rollouts for a managed
-   * service, from the newest to the oldest. (rollouts.listServicesRollouts)
-   *
-   * @param string $serviceName The name of the service.  See the [overview
-   * ](/service-management/overview) for naming requirements.  For example:
-   * `example.googleapis.com`.
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param string pageToken The token of the page to retrieve.
-   * @opt_param int pageSize The max number of items to include in the response
-   * list.
-   * @return Google_Service_ServiceManagement_ListServiceRolloutsResponse
-   */
-  public function listServicesRollouts($serviceName, $optParams = array())
-  {
-    $params = array('serviceName' => $serviceName);
-    $params = array_merge($params, $optParams);
-    return $this->call('list', array($params), "Google_Service_ServiceManagement_ListServiceRolloutsResponse");
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ServiceManagement/Rollout.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ServiceManagement/Rollout.php
deleted file mode 100644
index cd465993..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ServiceManagement/Rollout.php
+++ /dev/null
@@ -1,86 +0,0 @@
-createTime = $createTime;
-  }
-  public function getCreateTime()
-  {
-    return $this->createTime;
-  }
-  public function setCreatedBy($createdBy)
-  {
-    $this->createdBy = $createdBy;
-  }
-  public function getCreatedBy()
-  {
-    return $this->createdBy;
-  }
-  public function setDeleteServiceStrategy(Google_Service_ServiceManagement_DeleteServiceStrategy $deleteServiceStrategy)
-  {
-    $this->deleteServiceStrategy = $deleteServiceStrategy;
-  }
-  public function getDeleteServiceStrategy()
-  {
-    return $this->deleteServiceStrategy;
-  }
-  public function setRolloutId($rolloutId)
-  {
-    $this->rolloutId = $rolloutId;
-  }
-  public function getRolloutId()
-  {
-    return $this->rolloutId;
-  }
-  public function setServiceName($serviceName)
-  {
-    $this->serviceName = $serviceName;
-  }
-  public function getServiceName()
-  {
-    return $this->serviceName;
-  }
-  public function setStatus($status)
-  {
-    $this->status = $status;
-  }
-  public function getStatus()
-  {
-    return $this->status;
-  }
-  public function setTrafficPercentStrategy(Google_Service_ServiceManagement_TrafficPercentStrategy $trafficPercentStrategy)
-  {
-    $this->trafficPercentStrategy = $trafficPercentStrategy;
-  }
-  public function getTrafficPercentStrategy()
-  {
-    return $this->trafficPercentStrategy;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ServiceManagement/Rule.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ServiceManagement/Rule.php
deleted file mode 100644
index e31e5b43..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ServiceManagement/Rule.php
+++ /dev/null
@@ -1,87 +0,0 @@
-action = $action;
-  }
-  public function getAction()
-  {
-    return $this->action;
-  }
-  public function setConditions($conditions)
-  {
-    $this->conditions = $conditions;
-  }
-  public function getConditions()
-  {
-    return $this->conditions;
-  }
-  public function setDescription($description)
-  {
-    $this->description = $description;
-  }
-  public function getDescription()
-  {
-    return $this->description;
-  }
-  public function setIn($in)
-  {
-    $this->in = $in;
-  }
-  public function getIn()
-  {
-    return $this->in;
-  }
-  public function setLogConfig($logConfig)
-  {
-    $this->logConfig = $logConfig;
-  }
-  public function getLogConfig()
-  {
-    return $this->logConfig;
-  }
-  public function setNotIn($notIn)
-  {
-    $this->notIn = $notIn;
-  }
-  public function getNotIn()
-  {
-    return $this->notIn;
-  }
-  public function setPermissions($permissions)
-  {
-    $this->permissions = $permissions;
-  }
-  public function getPermissions()
-  {
-    return $this->permissions;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ServiceManagement/Service.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ServiceManagement/Service.php
deleted file mode 100644
index ee4dfa99..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ServiceManagement/Service.php
+++ /dev/null
@@ -1,287 +0,0 @@
-apis = $apis;
-  }
-  public function getApis()
-  {
-    return $this->apis;
-  }
-  public function setAuthentication(Google_Service_ServiceManagement_Authentication $authentication)
-  {
-    $this->authentication = $authentication;
-  }
-  public function getAuthentication()
-  {
-    return $this->authentication;
-  }
-  public function setBackend(Google_Service_ServiceManagement_Backend $backend)
-  {
-    $this->backend = $backend;
-  }
-  public function getBackend()
-  {
-    return $this->backend;
-  }
-  public function setConfigVersion($configVersion)
-  {
-    $this->configVersion = $configVersion;
-  }
-  public function getConfigVersion()
-  {
-    return $this->configVersion;
-  }
-  public function setContext(Google_Service_ServiceManagement_Context $context)
-  {
-    $this->context = $context;
-  }
-  public function getContext()
-  {
-    return $this->context;
-  }
-  public function setControl(Google_Service_ServiceManagement_Control $control)
-  {
-    $this->control = $control;
-  }
-  public function getControl()
-  {
-    return $this->control;
-  }
-  public function setCustomError(Google_Service_ServiceManagement_CustomError $customError)
-  {
-    $this->customError = $customError;
-  }
-  public function getCustomError()
-  {
-    return $this->customError;
-  }
-  public function setDocumentation(Google_Service_ServiceManagement_Documentation $documentation)
-  {
-    $this->documentation = $documentation;
-  }
-  public function getDocumentation()
-  {
-    return $this->documentation;
-  }
-  public function setEndpoints($endpoints)
-  {
-    $this->endpoints = $endpoints;
-  }
-  public function getEndpoints()
-  {
-    return $this->endpoints;
-  }
-  public function setEnums($enums)
-  {
-    $this->enums = $enums;
-  }
-  public function getEnums()
-  {
-    return $this->enums;
-  }
-  public function setExperimental(Google_Service_ServiceManagement_Experimental $experimental)
-  {
-    $this->experimental = $experimental;
-  }
-  public function getExperimental()
-  {
-    return $this->experimental;
-  }
-  public function setHttp(Google_Service_ServiceManagement_Http $http)
-  {
-    $this->http = $http;
-  }
-  public function getHttp()
-  {
-    return $this->http;
-  }
-  public function setId($id)
-  {
-    $this->id = $id;
-  }
-  public function getId()
-  {
-    return $this->id;
-  }
-  public function setLogging(Google_Service_ServiceManagement_Logging $logging)
-  {
-    $this->logging = $logging;
-  }
-  public function getLogging()
-  {
-    return $this->logging;
-  }
-  public function setLogs($logs)
-  {
-    $this->logs = $logs;
-  }
-  public function getLogs()
-  {
-    return $this->logs;
-  }
-  public function setMetrics($metrics)
-  {
-    $this->metrics = $metrics;
-  }
-  public function getMetrics()
-  {
-    return $this->metrics;
-  }
-  public function setMonitoredResources($monitoredResources)
-  {
-    $this->monitoredResources = $monitoredResources;
-  }
-  public function getMonitoredResources()
-  {
-    return $this->monitoredResources;
-  }
-  public function setMonitoring(Google_Service_ServiceManagement_Monitoring $monitoring)
-  {
-    $this->monitoring = $monitoring;
-  }
-  public function getMonitoring()
-  {
-    return $this->monitoring;
-  }
-  public function setName($name)
-  {
-    $this->name = $name;
-  }
-  public function getName()
-  {
-    return $this->name;
-  }
-  public function setProducerProjectId($producerProjectId)
-  {
-    $this->producerProjectId = $producerProjectId;
-  }
-  public function getProducerProjectId()
-  {
-    return $this->producerProjectId;
-  }
-  public function setSourceInfo(Google_Service_ServiceManagement_SourceInfo $sourceInfo)
-  {
-    $this->sourceInfo = $sourceInfo;
-  }
-  public function getSourceInfo()
-  {
-    return $this->sourceInfo;
-  }
-  public function setSystemParameters(Google_Service_ServiceManagement_SystemParameters $systemParameters)
-  {
-    $this->systemParameters = $systemParameters;
-  }
-  public function getSystemParameters()
-  {
-    return $this->systemParameters;
-  }
-  public function setSystemTypes($systemTypes)
-  {
-    $this->systemTypes = $systemTypes;
-  }
-  public function getSystemTypes()
-  {
-    return $this->systemTypes;
-  }
-  public function setTitle($title)
-  {
-    $this->title = $title;
-  }
-  public function getTitle()
-  {
-    return $this->title;
-  }
-  public function setTypes($types)
-  {
-    $this->types = $types;
-  }
-  public function getTypes()
-  {
-    return $this->types;
-  }
-  public function setUsage(Google_Service_ServiceManagement_Usage $usage)
-  {
-    $this->usage = $usage;
-  }
-  public function getUsage()
-  {
-    return $this->usage;
-  }
-  public function setVisibility(Google_Service_ServiceManagement_Visibility $visibility)
-  {
-    $this->visibility = $visibility;
-  }
-  public function getVisibility()
-  {
-    return $this->visibility;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ServiceManagement/SetIamPolicyRequest.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ServiceManagement/SetIamPolicyRequest.php
deleted file mode 100644
index fba45ae7..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ServiceManagement/SetIamPolicyRequest.php
+++ /dev/null
@@ -1,40 +0,0 @@
-policy = $policy;
-  }
-  public function getPolicy()
-  {
-    return $this->policy;
-  }
-  public function setUpdateMask($updateMask)
-  {
-    $this->updateMask = $updateMask;
-  }
-  public function getUpdateMask()
-  {
-    return $this->updateMask;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ServiceManagement/SourceContext.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ServiceManagement/SourceContext.php
deleted file mode 100644
index 523a21c8..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ServiceManagement/SourceContext.php
+++ /dev/null
@@ -1,30 +0,0 @@
-fileName = $fileName;
-  }
-  public function getFileName()
-  {
-    return $this->fileName;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ServiceManagement/SourceInfo.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ServiceManagement/SourceInfo.php
deleted file mode 100644
index 8432cf17..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ServiceManagement/SourceInfo.php
+++ /dev/null
@@ -1,31 +0,0 @@
-sourceFiles = $sourceFiles;
-  }
-  public function getSourceFiles()
-  {
-    return $this->sourceFiles;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ServiceManagement/Status.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ServiceManagement/Status.php
deleted file mode 100644
index 11e63b3c..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ServiceManagement/Status.php
+++ /dev/null
@@ -1,49 +0,0 @@
-code = $code;
-  }
-  public function getCode()
-  {
-    return $this->code;
-  }
-  public function setDetails($details)
-  {
-    $this->details = $details;
-  }
-  public function getDetails()
-  {
-    return $this->details;
-  }
-  public function setMessage($message)
-  {
-    $this->message = $message;
-  }
-  public function getMessage()
-  {
-    return $this->message;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ServiceManagement/Step.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ServiceManagement/Step.php
deleted file mode 100644
index 18687c7e..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ServiceManagement/Step.php
+++ /dev/null
@@ -1,39 +0,0 @@
-description = $description;
-  }
-  public function getDescription()
-  {
-    return $this->description;
-  }
-  public function setStatus($status)
-  {
-    $this->status = $status;
-  }
-  public function getStatus()
-  {
-    return $this->status;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ServiceManagement/SubmitConfigSourceRequest.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ServiceManagement/SubmitConfigSourceRequest.php
deleted file mode 100644
index e8069c5e..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ServiceManagement/SubmitConfigSourceRequest.php
+++ /dev/null
@@ -1,40 +0,0 @@
-configSource = $configSource;
-  }
-  public function getConfigSource()
-  {
-    return $this->configSource;
-  }
-  public function setValidateOnly($validateOnly)
-  {
-    $this->validateOnly = $validateOnly;
-  }
-  public function getValidateOnly()
-  {
-    return $this->validateOnly;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ServiceManagement/SubmitConfigSourceResponse.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ServiceManagement/SubmitConfigSourceResponse.php
deleted file mode 100644
index 8b89f21f..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ServiceManagement/SubmitConfigSourceResponse.php
+++ /dev/null
@@ -1,31 +0,0 @@
-serviceConfig = $serviceConfig;
-  }
-  public function getServiceConfig()
-  {
-    return $this->serviceConfig;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ServiceManagement/SystemParameter.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ServiceManagement/SystemParameter.php
deleted file mode 100644
index 0c5421c6..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ServiceManagement/SystemParameter.php
+++ /dev/null
@@ -1,48 +0,0 @@
-httpHeader = $httpHeader;
-  }
-  public function getHttpHeader()
-  {
-    return $this->httpHeader;
-  }
-  public function setName($name)
-  {
-    $this->name = $name;
-  }
-  public function getName()
-  {
-    return $this->name;
-  }
-  public function setUrlQueryParameter($urlQueryParameter)
-  {
-    $this->urlQueryParameter = $urlQueryParameter;
-  }
-  public function getUrlQueryParameter()
-  {
-    return $this->urlQueryParameter;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ServiceManagement/SystemParameterRule.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ServiceManagement/SystemParameterRule.php
deleted file mode 100644
index 7d8b879c..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ServiceManagement/SystemParameterRule.php
+++ /dev/null
@@ -1,41 +0,0 @@
-parameters = $parameters;
-  }
-  public function getParameters()
-  {
-    return $this->parameters;
-  }
-  public function setSelector($selector)
-  {
-    $this->selector = $selector;
-  }
-  public function getSelector()
-  {
-    return $this->selector;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ServiceManagement/SystemParameters.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ServiceManagement/SystemParameters.php
deleted file mode 100644
index 9e4a8b02..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ServiceManagement/SystemParameters.php
+++ /dev/null
@@ -1,32 +0,0 @@
-rules = $rules;
-  }
-  public function getRules()
-  {
-    return $this->rules;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ServiceManagement/TestIamPermissionsRequest.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ServiceManagement/TestIamPermissionsRequest.php
deleted file mode 100644
index c98630ac..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ServiceManagement/TestIamPermissionsRequest.php
+++ /dev/null
@@ -1,31 +0,0 @@
-permissions = $permissions;
-  }
-  public function getPermissions()
-  {
-    return $this->permissions;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ServiceManagement/TestIamPermissionsResponse.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ServiceManagement/TestIamPermissionsResponse.php
deleted file mode 100644
index 26dabfb9..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ServiceManagement/TestIamPermissionsResponse.php
+++ /dev/null
@@ -1,31 +0,0 @@
-permissions = $permissions;
-  }
-  public function getPermissions()
-  {
-    return $this->permissions;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ServiceManagement/TrafficPercentStrategy.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ServiceManagement/TrafficPercentStrategy.php
deleted file mode 100644
index 8dd7f83d..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ServiceManagement/TrafficPercentStrategy.php
+++ /dev/null
@@ -1,30 +0,0 @@
-percentages = $percentages;
-  }
-  public function getPercentages()
-  {
-    return $this->percentages;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ServiceManagement/Type.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ServiceManagement/Type.php
deleted file mode 100644
index 7174f5fa..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ServiceManagement/Type.php
+++ /dev/null
@@ -1,79 +0,0 @@
-fields = $fields;
-  }
-  public function getFields()
-  {
-    return $this->fields;
-  }
-  public function setName($name)
-  {
-    $this->name = $name;
-  }
-  public function getName()
-  {
-    return $this->name;
-  }
-  public function setOneofs($oneofs)
-  {
-    $this->oneofs = $oneofs;
-  }
-  public function getOneofs()
-  {
-    return $this->oneofs;
-  }
-  public function setOptions($options)
-  {
-    $this->options = $options;
-  }
-  public function getOptions()
-  {
-    return $this->options;
-  }
-  public function setSourceContext(Google_Service_ServiceManagement_SourceContext $sourceContext)
-  {
-    $this->sourceContext = $sourceContext;
-  }
-  public function getSourceContext()
-  {
-    return $this->sourceContext;
-  }
-  public function setSyntax($syntax)
-  {
-    $this->syntax = $syntax;
-  }
-  public function getSyntax()
-  {
-    return $this->syntax;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ServiceManagement/UndeleteServiceResponse.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ServiceManagement/UndeleteServiceResponse.php
deleted file mode 100644
index 2344c234..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ServiceManagement/UndeleteServiceResponse.php
+++ /dev/null
@@ -1,31 +0,0 @@
-service = $service;
-  }
-  public function getService()
-  {
-    return $this->service;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ServiceManagement/Usage.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ServiceManagement/Usage.php
deleted file mode 100644
index e2de7ab8..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ServiceManagement/Usage.php
+++ /dev/null
@@ -1,50 +0,0 @@
-producerNotificationChannel = $producerNotificationChannel;
-  }
-  public function getProducerNotificationChannel()
-  {
-    return $this->producerNotificationChannel;
-  }
-  public function setRequirements($requirements)
-  {
-    $this->requirements = $requirements;
-  }
-  public function getRequirements()
-  {
-    return $this->requirements;
-  }
-  public function setRules($rules)
-  {
-    $this->rules = $rules;
-  }
-  public function getRules()
-  {
-    return $this->rules;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ServiceManagement/UsageRule.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ServiceManagement/UsageRule.php
deleted file mode 100644
index e87e18bd..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ServiceManagement/UsageRule.php
+++ /dev/null
@@ -1,39 +0,0 @@
-allowUnregisteredCalls = $allowUnregisteredCalls;
-  }
-  public function getAllowUnregisteredCalls()
-  {
-    return $this->allowUnregisteredCalls;
-  }
-  public function setSelector($selector)
-  {
-    $this->selector = $selector;
-  }
-  public function getSelector()
-  {
-    return $this->selector;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ServiceManagement/Visibility.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ServiceManagement/Visibility.php
deleted file mode 100644
index 1f34a01b..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ServiceManagement/Visibility.php
+++ /dev/null
@@ -1,32 +0,0 @@
-rules = $rules;
-  }
-  public function getRules()
-  {
-    return $this->rules;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ServiceManagement/VisibilityRule.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ServiceManagement/VisibilityRule.php
deleted file mode 100644
index a3838e74..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ServiceManagement/VisibilityRule.php
+++ /dev/null
@@ -1,39 +0,0 @@
-restriction = $restriction;
-  }
-  public function getRestriction()
-  {
-    return $this->restriction;
-  }
-  public function setSelector($selector)
-  {
-    $this->selector = $selector;
-  }
-  public function getSelector()
-  {
-    return $this->selector;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ServiceRegistry.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ServiceRegistry.php
deleted file mode 100644
index 9bd67083..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ServiceRegistry.php
+++ /dev/null
@@ -1,221 +0,0 @@
-
- * Manages service endpoints in Service Registry and provides integration with
- * DNS for service discovery and name resolution.

- *
- * 

- * For more information about this service, see the API
- * Documentation
- * 

- *
- * @author Google, Inc.
- */
-class Google_Service_ServiceRegistry extends Google_Service
-{
-  /** View and manage your data across Google Cloud Platform services. */
-  const CLOUD_PLATFORM =
-      "https://www.googleapis.com/auth/cloud-platform";
-  /** View your data across Google Cloud Platform services. */
-  const CLOUD_PLATFORM_READ_ONLY =
-      "https://www.googleapis.com/auth/cloud-platform.read-only";
-  /** View and manage your Google Cloud Platform management resources and deployment status information. */
-  const NDEV_CLOUDMAN =
-      "https://www.googleapis.com/auth/ndev.cloudman";
-  /** View your Google Cloud Platform management resources and deployment status information. */
-  const NDEV_CLOUDMAN_READONLY =
-      "https://www.googleapis.com/auth/ndev.cloudman.readonly";
-
-  public $endpoints;
-  public $operations;
-  
-  /**
-   * Constructs the internal representation of the ServiceRegistry service.
-   *
-   * @param Google_Client $client
-   */
-  public function __construct(Google_Client $client)
-  {
-    parent::__construct($client);
-    $this->rootUrl = 'https://www.googleapis.com/';
-    $this->servicePath = 'serviceregistry/alpha/projects/';
-    $this->version = 'alpha';
-    $this->serviceName = 'serviceregistry';
-
-    $this->endpoints = new Google_Service_ServiceRegistry_Resource_Endpoints(
-        $this,
-        $this->serviceName,
-        'endpoints',
-        array(
-          'methods' => array(
-            'delete' => array(
-              'path' => '{project}/global/endpoints/{endpoint}',
-              'httpMethod' => 'DELETE',
-              'parameters' => array(
-                'project' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'endpoint' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'get' => array(
-              'path' => '{project}/global/endpoints/{endpoint}',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'project' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'endpoint' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'insert' => array(
-              'path' => '{project}/global/endpoints',
-              'httpMethod' => 'POST',
-              'parameters' => array(
-                'project' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'list' => array(
-              'path' => '{project}/global/endpoints',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'project' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'filter' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'maxResults' => array(
-                  'location' => 'query',
-                  'type' => 'integer',
-                ),
-                'orderBy' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'pageToken' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-              ),
-            ),'patch' => array(
-              'path' => '{project}/global/endpoints/{endpoint}',
-              'httpMethod' => 'PATCH',
-              'parameters' => array(
-                'project' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'endpoint' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'update' => array(
-              'path' => '{project}/global/endpoints/{endpoint}',
-              'httpMethod' => 'PUT',
-              'parameters' => array(
-                'project' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'endpoint' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),
-          )
-        )
-    );
-    $this->operations = new Google_Service_ServiceRegistry_Resource_Operations(
-        $this,
-        $this->serviceName,
-        'operations',
-        array(
-          'methods' => array(
-            'get' => array(
-              'path' => '{project}/global/operations/{operation}',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'project' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'operation' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'list' => array(
-              'path' => '{project}/global/operations',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'project' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'filter' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'maxResults' => array(
-                  'location' => 'query',
-                  'type' => 'integer',
-                ),
-                'orderBy' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'pageToken' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-              ),
-            ),
-          )
-        )
-    );
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ServiceRegistry/Endpoint.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ServiceRegistry/Endpoint.php
deleted file mode 100644
index 48ebee2c..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ServiceRegistry/Endpoint.php
+++ /dev/null
@@ -1,112 +0,0 @@
-address = $address;
-  }
-  public function getAddress()
-  {
-    return $this->address;
-  }
-  public function setCreationTimestamp($creationTimestamp)
-  {
-    $this->creationTimestamp = $creationTimestamp;
-  }
-  public function getCreationTimestamp()
-  {
-    return $this->creationTimestamp;
-  }
-  public function setDescription($description)
-  {
-    $this->description = $description;
-  }
-  public function getDescription()
-  {
-    return $this->description;
-  }
-  public function setFingerprint($fingerprint)
-  {
-    $this->fingerprint = $fingerprint;
-  }
-  public function getFingerprint()
-  {
-    return $this->fingerprint;
-  }
-  public function setId($id)
-  {
-    $this->id = $id;
-  }
-  public function getId()
-  {
-    return $this->id;
-  }
-  public function setName($name)
-  {
-    $this->name = $name;
-  }
-  public function getName()
-  {
-    return $this->name;
-  }
-  public function setPort($port)
-  {
-    $this->port = $port;
-  }
-  public function getPort()
-  {
-    return $this->port;
-  }
-  public function setSelfLink($selfLink)
-  {
-    $this->selfLink = $selfLink;
-  }
-  public function getSelfLink()
-  {
-    return $this->selfLink;
-  }
-  public function setState($state)
-  {
-    $this->state = $state;
-  }
-  public function getState()
-  {
-    return $this->state;
-  }
-  public function setVisibility(Google_Service_ServiceRegistry_EndpointEndpointVisibility $visibility)
-  {
-    $this->visibility = $visibility;
-  }
-  public function getVisibility()
-  {
-    return $this->visibility;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ServiceRegistry/EndpointEndpointVisibility.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ServiceRegistry/EndpointEndpointVisibility.php
deleted file mode 100644
index 50460aba..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ServiceRegistry/EndpointEndpointVisibility.php
+++ /dev/null
@@ -1,40 +0,0 @@
-internalDnsName = $internalDnsName;
-  }
-  public function getInternalDnsName()
-  {
-    return $this->internalDnsName;
-  }
-  public function setNetworks($networks)
-  {
-    $this->networks = $networks;
-  }
-  public function getNetworks()
-  {
-    return $this->networks;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ServiceRegistry/EndpointsListResponse.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ServiceRegistry/EndpointsListResponse.php
deleted file mode 100644
index c4e2e9d9..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ServiceRegistry/EndpointsListResponse.php
+++ /dev/null
@@ -1,41 +0,0 @@
-endpoints = $endpoints;
-  }
-  public function getEndpoints()
-  {
-    return $this->endpoints;
-  }
-  public function setNextPageToken($nextPageToken)
-  {
-    $this->nextPageToken = $nextPageToken;
-  }
-  public function getNextPageToken()
-  {
-    return $this->nextPageToken;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ServiceRegistry/Operation.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ServiceRegistry/Operation.php
deleted file mode 100644
index 3548e6e0..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ServiceRegistry/Operation.php
+++ /dev/null
@@ -1,231 +0,0 @@
-clientOperationId = $clientOperationId;
-  }
-  public function getClientOperationId()
-  {
-    return $this->clientOperationId;
-  }
-  public function setCreationTimestamp($creationTimestamp)
-  {
-    $this->creationTimestamp = $creationTimestamp;
-  }
-  public function getCreationTimestamp()
-  {
-    return $this->creationTimestamp;
-  }
-  public function setDescription($description)
-  {
-    $this->description = $description;
-  }
-  public function getDescription()
-  {
-    return $this->description;
-  }
-  public function setEndTime($endTime)
-  {
-    $this->endTime = $endTime;
-  }
-  public function getEndTime()
-  {
-    return $this->endTime;
-  }
-  public function setError(Google_Service_ServiceRegistry_OperationError $error)
-  {
-    $this->error = $error;
-  }
-  public function getError()
-  {
-    return $this->error;
-  }
-  public function setHttpErrorMessage($httpErrorMessage)
-  {
-    $this->httpErrorMessage = $httpErrorMessage;
-  }
-  public function getHttpErrorMessage()
-  {
-    return $this->httpErrorMessage;
-  }
-  public function setHttpErrorStatusCode($httpErrorStatusCode)
-  {
-    $this->httpErrorStatusCode = $httpErrorStatusCode;
-  }
-  public function getHttpErrorStatusCode()
-  {
-    return $this->httpErrorStatusCode;
-  }
-  public function setId($id)
-  {
-    $this->id = $id;
-  }
-  public function getId()
-  {
-    return $this->id;
-  }
-  public function setInsertTime($insertTime)
-  {
-    $this->insertTime = $insertTime;
-  }
-  public function getInsertTime()
-  {
-    return $this->insertTime;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setName($name)
-  {
-    $this->name = $name;
-  }
-  public function getName()
-  {
-    return $this->name;
-  }
-  public function setOperationType($operationType)
-  {
-    $this->operationType = $operationType;
-  }
-  public function getOperationType()
-  {
-    return $this->operationType;
-  }
-  public function setProgress($progress)
-  {
-    $this->progress = $progress;
-  }
-  public function getProgress()
-  {
-    return $this->progress;
-  }
-  public function setRegion($region)
-  {
-    $this->region = $region;
-  }
-  public function getRegion()
-  {
-    return $this->region;
-  }
-  public function setSelfLink($selfLink)
-  {
-    $this->selfLink = $selfLink;
-  }
-  public function getSelfLink()
-  {
-    return $this->selfLink;
-  }
-  public function setStartTime($startTime)
-  {
-    $this->startTime = $startTime;
-  }
-  public function getStartTime()
-  {
-    return $this->startTime;
-  }
-  public function setStatus($status)
-  {
-    $this->status = $status;
-  }
-  public function getStatus()
-  {
-    return $this->status;
-  }
-  public function setStatusMessage($statusMessage)
-  {
-    $this->statusMessage = $statusMessage;
-  }
-  public function getStatusMessage()
-  {
-    return $this->statusMessage;
-  }
-  public function setTargetId($targetId)
-  {
-    $this->targetId = $targetId;
-  }
-  public function getTargetId()
-  {
-    return $this->targetId;
-  }
-  public function setTargetLink($targetLink)
-  {
-    $this->targetLink = $targetLink;
-  }
-  public function getTargetLink()
-  {
-    return $this->targetLink;
-  }
-  public function setUser($user)
-  {
-    $this->user = $user;
-  }
-  public function getUser()
-  {
-    return $this->user;
-  }
-  public function setWarnings($warnings)
-  {
-    $this->warnings = $warnings;
-  }
-  public function getWarnings()
-  {
-    return $this->warnings;
-  }
-  public function setZone($zone)
-  {
-    $this->zone = $zone;
-  }
-  public function getZone()
-  {
-    return $this->zone;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ServiceRegistry/OperationError.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ServiceRegistry/OperationError.php
deleted file mode 100644
index 6c39ebeb..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ServiceRegistry/OperationError.php
+++ /dev/null
@@ -1,32 +0,0 @@
-errors = $errors;
-  }
-  public function getErrors()
-  {
-    return $this->errors;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ServiceRegistry/OperationErrorErrors.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ServiceRegistry/OperationErrorErrors.php
deleted file mode 100644
index d4108f12..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ServiceRegistry/OperationErrorErrors.php
+++ /dev/null
@@ -1,48 +0,0 @@
-code = $code;
-  }
-  public function getCode()
-  {
-    return $this->code;
-  }
-  public function setLocation($location)
-  {
-    $this->location = $location;
-  }
-  public function getLocation()
-  {
-    return $this->location;
-  }
-  public function setMessage($message)
-  {
-    $this->message = $message;
-  }
-  public function getMessage()
-  {
-    return $this->message;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ServiceRegistry/OperationWarnings.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ServiceRegistry/OperationWarnings.php
deleted file mode 100644
index d377edde..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ServiceRegistry/OperationWarnings.php
+++ /dev/null
@@ -1,50 +0,0 @@
-code = $code;
-  }
-  public function getCode()
-  {
-    return $this->code;
-  }
-  public function setData($data)
-  {
-    $this->data = $data;
-  }
-  public function getData()
-  {
-    return $this->data;
-  }
-  public function setMessage($message)
-  {
-    $this->message = $message;
-  }
-  public function getMessage()
-  {
-    return $this->message;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ServiceRegistry/OperationWarningsData.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ServiceRegistry/OperationWarningsData.php
deleted file mode 100644
index 24bf06a2..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ServiceRegistry/OperationWarningsData.php
+++ /dev/null
@@ -1,39 +0,0 @@
-key = $key;
-  }
-  public function getKey()
-  {
-    return $this->key;
-  }
-  public function setValue($value)
-  {
-    $this->value = $value;
-  }
-  public function getValue()
-  {
-    return $this->value;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ServiceRegistry/OperationsListResponse.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ServiceRegistry/OperationsListResponse.php
deleted file mode 100644
index 26e3a5f3..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ServiceRegistry/OperationsListResponse.php
+++ /dev/null
@@ -1,41 +0,0 @@
-nextPageToken = $nextPageToken;
-  }
-  public function getNextPageToken()
-  {
-    return $this->nextPageToken;
-  }
-  public function setOperations($operations)
-  {
-    $this->operations = $operations;
-  }
-  public function getOperations()
-  {
-    return $this->operations;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ServiceRegistry/Resource/Endpoints.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ServiceRegistry/Resource/Endpoints.php
deleted file mode 100644
index c5569668..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ServiceRegistry/Resource/Endpoints.php
+++ /dev/null
@@ -1,157 +0,0 @@
-
- *   $serviceregistryService = new Google_Service_ServiceRegistry(...);
- *   $endpoints = $serviceregistryService->endpoints;
- *  
- */
-class Google_Service_ServiceRegistry_Resource_Endpoints extends Google_Service_Resource
-{
-  /**
-   * Deletes an endpoint. (endpoints.delete)
-   *
-   * @param string $project The project ID for this request.
-   * @param string $endpoint The name of the endpoint for this request.
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_ServiceRegistry_Operation
-   */
-  public function delete($project, $endpoint, $optParams = array())
-  {
-    $params = array('project' => $project, 'endpoint' => $endpoint);
-    $params = array_merge($params, $optParams);
-    return $this->call('delete', array($params), "Google_Service_ServiceRegistry_Operation");
-  }
-  /**
-   * Gets an endpoint. (endpoints.get)
-   *
-   * @param string $project The project ID for this request.
-   * @param string $endpoint The name of the endpoint for this request.
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_ServiceRegistry_Endpoint
-   */
-  public function get($project, $endpoint, $optParams = array())
-  {
-    $params = array('project' => $project, 'endpoint' => $endpoint);
-    $params = array_merge($params, $optParams);
-    return $this->call('get', array($params), "Google_Service_ServiceRegistry_Endpoint");
-  }
-  /**
-   * Creates an endpoint. (endpoints.insert)
-   *
-   * @param string $project The project ID for this request.
-   * @param Google_Service_ServiceRegistry_Endpoint $postBody
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_ServiceRegistry_Operation
-   */
-  public function insert($project, Google_Service_ServiceRegistry_Endpoint $postBody, $optParams = array())
-  {
-    $params = array('project' => $project, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('insert', array($params), "Google_Service_ServiceRegistry_Operation");
-  }
-  /**
-   * Lists endpoints for a project. (endpoints.listEndpoints)
-   *
-   * @param string $project The project ID for this request.
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param string filter Sets a filter expression for filtering listed
-   * resources, in the form filter={expression}. Your {expression} must be in the
-   * format: field_name comparison_string literal_string.
-   *
-   * The field_name is the name of the field you want to compare. Only atomic
-   * field types are supported (string, number, boolean). The comparison_string
-   * must be either eq (equals) or ne (not equals). The literal_string is the
-   * string value to filter to. The literal value must be valid for the type of
-   * field you are filtering by (string, number, boolean). For string fields, the
-   * literal value is interpreted as a regular expression using RE2 syntax. The
-   * literal value must match the entire field.
-   *
-   * For example, to filter for instances that do not have a name of example-
-   * instance, you would use filter=name ne example-instance.
-   *
-   * Compute Engine Beta API Only: When filtering in the Beta API, you can also
-   * filter on nested fields. For example, you could filter on instances that have
-   * set the scheduling.automaticRestart field to true. Use filtering on nested
-   * fields to take advantage of labels to organize and search for results based
-   * on label values.
-   *
-   * The Beta API also supports filtering on multiple expressions by providing
-   * each separate expression within parentheses. For example,
-   * (scheduling.automaticRestart eq true) (zone eq us-central1-f). Multiple
-   * expressions are treated as AND expressions, meaning that resources must match
-   * all expressions to pass the filters.
-   * @opt_param string maxResults The maximum number of results per page that
-   * should be returned. If the number of available results is larger than
-   * maxResults, Compute Engine returns a nextPageToken that can be used to get
-   * the next page of results in subsequent list requests.
-   * @opt_param string orderBy Sorts list results by a certain order. By default,
-   * results are returned in alphanumerical order based on the resource name.
-   *
-   * You can also sort results in descending order based on the creation timestamp
-   * using orderBy="creationTimestamp desc". This sorts results based on the
-   * creationTimestamp field in reverse chronological order (newest result first).
-   * Use this to sort resources like operations so that the newest operation is
-   * returned first.
-   *
-   * Currently, only sorting by name or creationTimestamp desc is supported.
-   * @opt_param string pageToken Specifies a page token to use. Set pageToken to
-   * the nextPageToken returned by a previous list request to get the next page of
-   * results.
-   * @return Google_Service_ServiceRegistry_EndpointsListResponse
-   */
-  public function listEndpoints($project, $optParams = array())
-  {
-    $params = array('project' => $project);
-    $params = array_merge($params, $optParams);
-    return $this->call('list', array($params), "Google_Service_ServiceRegistry_EndpointsListResponse");
-  }
-  /**
-   * Updates an endpoint. This method supports patch semantics. (endpoints.patch)
-   *
-   * @param string $project The project ID for this request.
-   * @param string $endpoint The name of the endpoint for this request.
-   * @param Google_Service_ServiceRegistry_Endpoint $postBody
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_ServiceRegistry_Operation
-   */
-  public function patch($project, $endpoint, Google_Service_ServiceRegistry_Endpoint $postBody, $optParams = array())
-  {
-    $params = array('project' => $project, 'endpoint' => $endpoint, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('patch', array($params), "Google_Service_ServiceRegistry_Operation");
-  }
-  /**
-   * Updates an endpoint. (endpoints.update)
-   *
-   * @param string $project The project ID for this request.
-   * @param string $endpoint The name of the endpoint for this request.
-   * @param Google_Service_ServiceRegistry_Endpoint $postBody
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_ServiceRegistry_Operation
-   */
-  public function update($project, $endpoint, Google_Service_ServiceRegistry_Endpoint $postBody, $optParams = array())
-  {
-    $params = array('project' => $project, 'endpoint' => $endpoint, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('update', array($params), "Google_Service_ServiceRegistry_Operation");
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ServiceRegistry/Resource/Operations.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ServiceRegistry/Resource/Operations.php
deleted file mode 100644
index 17467cfa..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ServiceRegistry/Resource/Operations.php
+++ /dev/null
@@ -1,99 +0,0 @@
-
- *   $serviceregistryService = new Google_Service_ServiceRegistry(...);
- *   $operations = $serviceregistryService->operations;
- *  
- */
-class Google_Service_ServiceRegistry_Resource_Operations extends Google_Service_Resource
-{
-  /**
-   * Gets information about a specific operation. (operations.get)
-   *
-   * @param string $project The project ID for this request.
-   * @param string $operation The name of the operation for this request.
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_ServiceRegistry_Operation
-   */
-  public function get($project, $operation, $optParams = array())
-  {
-    $params = array('project' => $project, 'operation' => $operation);
-    $params = array_merge($params, $optParams);
-    return $this->call('get', array($params), "Google_Service_ServiceRegistry_Operation");
-  }
-  /**
-   * Lists all operations for a project. (operations.listOperations)
-   *
-   * @param string $project The project ID for this request.
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param string filter Sets a filter expression for filtering listed
-   * resources, in the form filter={expression}. Your {expression} must be in the
-   * format: field_name comparison_string literal_string.
-   *
-   * The field_name is the name of the field you want to compare. Only atomic
-   * field types are supported (string, number, boolean). The comparison_string
-   * must be either eq (equals) or ne (not equals). The literal_string is the
-   * string value to filter to. The literal value must be valid for the type of
-   * field you are filtering by (string, number, boolean). For string fields, the
-   * literal value is interpreted as a regular expression using RE2 syntax. The
-   * literal value must match the entire field.
-   *
-   * For example, to filter for instances that do not have a name of example-
-   * instance, you would use filter=name ne example-instance.
-   *
-   * Compute Engine Beta API Only: When filtering in the Beta API, you can also
-   * filter on nested fields. For example, you could filter on instances that have
-   * set the scheduling.automaticRestart field to true. Use filtering on nested
-   * fields to take advantage of labels to organize and search for results based
-   * on label values.
-   *
-   * The Beta API also supports filtering on multiple expressions by providing
-   * each separate expression within parentheses. For example,
-   * (scheduling.automaticRestart eq true) (zone eq us-central1-f). Multiple
-   * expressions are treated as AND expressions, meaning that resources must match
-   * all expressions to pass the filters.
-   * @opt_param string maxResults The maximum number of results per page that
-   * should be returned. If the number of available results is larger than
-   * maxResults, Compute Engine returns a nextPageToken that can be used to get
-   * the next page of results in subsequent list requests.
-   * @opt_param string orderBy Sorts list results by a certain order. By default,
-   * results are returned in alphanumerical order based on the resource name.
-   *
-   * You can also sort results in descending order based on the creation timestamp
-   * using orderBy="creationTimestamp desc". This sorts results based on the
-   * creationTimestamp field in reverse chronological order (newest result first).
-   * Use this to sort resources like operations so that the newest operation is
-   * returned first.
-   *
-   * Currently, only sorting by name or creationTimestamp desc is supported.
-   * @opt_param string pageToken Specifies a page token to use. Set pageToken to
-   * the nextPageToken returned by a previous list request to get the next page of
-   * results.
-   * @return Google_Service_ServiceRegistry_OperationsListResponse
-   */
-  public function listOperations($project, $optParams = array())
-  {
-    $params = array('project' => $project);
-    $params = array_merge($params, $optParams);
-    return $this->call('list', array($params), "Google_Service_ServiceRegistry_OperationsListResponse");
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ServiceUser.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ServiceUser.php
deleted file mode 100644
index cf28a691..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ServiceUser.php
+++ /dev/null
@@ -1,133 +0,0 @@
-
- * Enables services that service consumers want to use on Google Cloud Platform,
- * lists the available or enabled services, or disables services that service
- * consumers no longer use.

- *
- * 

- * For more information about this service, see the API
- * Documentation
- * 

- *
- * @author Google, Inc.
- */
-class Google_Service_ServiceUser extends Google_Service
-{
-  /** View and manage your data across Google Cloud Platform services. */
-  const CLOUD_PLATFORM =
-      "https://www.googleapis.com/auth/cloud-platform";
-  /** View your data across Google Cloud Platform services. */
-  const CLOUD_PLATFORM_READ_ONLY =
-      "https://www.googleapis.com/auth/cloud-platform.read-only";
-  /** Manage your Google API service configuration. */
-  const SERVICE_MANAGEMENT =
-      "https://www.googleapis.com/auth/service.management";
-
-  public $projects_services;
-  public $services;
-  
-  /**
-   * Constructs the internal representation of the ServiceUser service.
-   *
-   * @param Google_Client $client
-   */
-  public function __construct(Google_Client $client)
-  {
-    parent::__construct($client);
-    $this->rootUrl = 'https://serviceuser.googleapis.com/';
-    $this->servicePath = '';
-    $this->version = 'v1';
-    $this->serviceName = 'serviceuser';
-
-    $this->projects_services = new Google_Service_ServiceUser_Resource_ProjectsServices(
-        $this,
-        $this->serviceName,
-        'services',
-        array(
-          'methods' => array(
-            'disable' => array(
-              'path' => 'v1/{+name}:disable',
-              'httpMethod' => 'POST',
-              'parameters' => array(
-                'name' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'enable' => array(
-              'path' => 'v1/{+name}:enable',
-              'httpMethod' => 'POST',
-              'parameters' => array(
-                'name' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'list' => array(
-              'path' => 'v1/{+parent}/services',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'parent' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'pageToken' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'pageSize' => array(
-                  'location' => 'query',
-                  'type' => 'integer',
-                ),
-              ),
-            ),
-          )
-        )
-    );
-    $this->services = new Google_Service_ServiceUser_Resource_Services(
-        $this,
-        $this->serviceName,
-        'services',
-        array(
-          'methods' => array(
-            'search' => array(
-              'path' => 'v1/services:search',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'pageToken' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'pageSize' => array(
-                  'location' => 'query',
-                  'type' => 'integer',
-                ),
-              ),
-            ),
-          )
-        )
-    );
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ServiceUser/Api.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ServiceUser/Api.php
deleted file mode 100644
index efd6c8af..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ServiceUser/Api.php
+++ /dev/null
@@ -1,89 +0,0 @@
-methods = $methods;
-  }
-  public function getMethods()
-  {
-    return $this->methods;
-  }
-  public function setMixins($mixins)
-  {
-    $this->mixins = $mixins;
-  }
-  public function getMixins()
-  {
-    return $this->mixins;
-  }
-  public function setName($name)
-  {
-    $this->name = $name;
-  }
-  public function getName()
-  {
-    return $this->name;
-  }
-  public function setOptions($options)
-  {
-    $this->options = $options;
-  }
-  public function getOptions()
-  {
-    return $this->options;
-  }
-  public function setSourceContext(Google_Service_ServiceUser_SourceContext $sourceContext)
-  {
-    $this->sourceContext = $sourceContext;
-  }
-  public function getSourceContext()
-  {
-    return $this->sourceContext;
-  }
-  public function setSyntax($syntax)
-  {
-    $this->syntax = $syntax;
-  }
-  public function getSyntax()
-  {
-    return $this->syntax;
-  }
-  public function setVersion($version)
-  {
-    $this->version = $version;
-  }
-  public function getVersion()
-  {
-    return $this->version;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ServiceUser/AuthProvider.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ServiceUser/AuthProvider.php
deleted file mode 100644
index 75c6e24e..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ServiceUser/AuthProvider.php
+++ /dev/null
@@ -1,57 +0,0 @@
-audiences = $audiences;
-  }
-  public function getAudiences()
-  {
-    return $this->audiences;
-  }
-  public function setId($id)
-  {
-    $this->id = $id;
-  }
-  public function getId()
-  {
-    return $this->id;
-  }
-  public function setIssuer($issuer)
-  {
-    $this->issuer = $issuer;
-  }
-  public function getIssuer()
-  {
-    return $this->issuer;
-  }
-  public function setJwksUri($jwksUri)
-  {
-    $this->jwksUri = $jwksUri;
-  }
-  public function getJwksUri()
-  {
-    return $this->jwksUri;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ServiceUser/AuthRequirement.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ServiceUser/AuthRequirement.php
deleted file mode 100644
index 761a094b..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ServiceUser/AuthRequirement.php
+++ /dev/null
@@ -1,39 +0,0 @@
-audiences = $audiences;
-  }
-  public function getAudiences()
-  {
-    return $this->audiences;
-  }
-  public function setProviderId($providerId)
-  {
-    $this->providerId = $providerId;
-  }
-  public function getProviderId()
-  {
-    return $this->providerId;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ServiceUser/Authentication.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ServiceUser/Authentication.php
deleted file mode 100644
index 67d4481e..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ServiceUser/Authentication.php
+++ /dev/null
@@ -1,42 +0,0 @@
-providers = $providers;
-  }
-  public function getProviders()
-  {
-    return $this->providers;
-  }
-  public function setRules($rules)
-  {
-    $this->rules = $rules;
-  }
-  public function getRules()
-  {
-    return $this->rules;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ServiceUser/AuthenticationRule.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ServiceUser/AuthenticationRule.php
deleted file mode 100644
index c0dc5942..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ServiceUser/AuthenticationRule.php
+++ /dev/null
@@ -1,60 +0,0 @@
-allowWithoutCredential = $allowWithoutCredential;
-  }
-  public function getAllowWithoutCredential()
-  {
-    return $this->allowWithoutCredential;
-  }
-  public function setOauth(Google_Service_ServiceUser_OAuthRequirements $oauth)
-  {
-    $this->oauth = $oauth;
-  }
-  public function getOauth()
-  {
-    return $this->oauth;
-  }
-  public function setRequirements($requirements)
-  {
-    $this->requirements = $requirements;
-  }
-  public function getRequirements()
-  {
-    return $this->requirements;
-  }
-  public function setSelector($selector)
-  {
-    $this->selector = $selector;
-  }
-  public function getSelector()
-  {
-    return $this->selector;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ServiceUser/AuthorizationConfig.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ServiceUser/AuthorizationConfig.php
deleted file mode 100644
index 35f15a00..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ServiceUser/AuthorizationConfig.php
+++ /dev/null
@@ -1,30 +0,0 @@
-provider = $provider;
-  }
-  public function getProvider()
-  {
-    return $this->provider;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ServiceUser/Backend.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ServiceUser/Backend.php
deleted file mode 100644
index b42a27ea..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ServiceUser/Backend.php
+++ /dev/null
@@ -1,32 +0,0 @@
-rules = $rules;
-  }
-  public function getRules()
-  {
-    return $this->rules;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ServiceUser/BackendRule.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ServiceUser/BackendRule.php
deleted file mode 100644
index ce56a4e6..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ServiceUser/BackendRule.php
+++ /dev/null
@@ -1,48 +0,0 @@
-address = $address;
-  }
-  public function getAddress()
-  {
-    return $this->address;
-  }
-  public function setDeadline($deadline)
-  {
-    $this->deadline = $deadline;
-  }
-  public function getDeadline()
-  {
-    return $this->deadline;
-  }
-  public function setSelector($selector)
-  {
-    $this->selector = $selector;
-  }
-  public function getSelector()
-  {
-    return $this->selector;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ServiceUser/Context.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ServiceUser/Context.php
deleted file mode 100644
index 76023810..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ServiceUser/Context.php
+++ /dev/null
@@ -1,32 +0,0 @@
-rules = $rules;
-  }
-  public function getRules()
-  {
-    return $this->rules;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ServiceUser/ContextRule.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ServiceUser/ContextRule.php
deleted file mode 100644
index e6161dae..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ServiceUser/ContextRule.php
+++ /dev/null
@@ -1,49 +0,0 @@
-provided = $provided;
-  }
-  public function getProvided()
-  {
-    return $this->provided;
-  }
-  public function setRequested($requested)
-  {
-    $this->requested = $requested;
-  }
-  public function getRequested()
-  {
-    return $this->requested;
-  }
-  public function setSelector($selector)
-  {
-    $this->selector = $selector;
-  }
-  public function getSelector()
-  {
-    return $this->selector;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ServiceUser/Control.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ServiceUser/Control.php
deleted file mode 100644
index dd4c3583..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ServiceUser/Control.php
+++ /dev/null
@@ -1,30 +0,0 @@
-environment = $environment;
-  }
-  public function getEnvironment()
-  {
-    return $this->environment;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ServiceUser/CustomError.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ServiceUser/CustomError.php
deleted file mode 100644
index 17c90f0a..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ServiceUser/CustomError.php
+++ /dev/null
@@ -1,41 +0,0 @@
-rules = $rules;
-  }
-  public function getRules()
-  {
-    return $this->rules;
-  }
-  public function setTypes($types)
-  {
-    $this->types = $types;
-  }
-  public function getTypes()
-  {
-    return $this->types;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ServiceUser/CustomErrorRule.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ServiceUser/CustomErrorRule.php
deleted file mode 100644
index ff562edb..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ServiceUser/CustomErrorRule.php
+++ /dev/null
@@ -1,39 +0,0 @@
-isErrorType = $isErrorType;
-  }
-  public function getIsErrorType()
-  {
-    return $this->isErrorType;
-  }
-  public function setSelector($selector)
-  {
-    $this->selector = $selector;
-  }
-  public function getSelector()
-  {
-    return $this->selector;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ServiceUser/CustomHttpPattern.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ServiceUser/CustomHttpPattern.php
deleted file mode 100644
index dc223c90..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ServiceUser/CustomHttpPattern.php
+++ /dev/null
@@ -1,39 +0,0 @@
-kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setPath($path)
-  {
-    $this->path = $path;
-  }
-  public function getPath()
-  {
-    return $this->path;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ServiceUser/DisableServiceRequest.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ServiceUser/DisableServiceRequest.php
deleted file mode 100644
index 51d8f336..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ServiceUser/DisableServiceRequest.php
+++ /dev/null
@@ -1,20 +0,0 @@
-documentationRootUrl = $documentationRootUrl;
-  }
-  public function getDocumentationRootUrl()
-  {
-    return $this->documentationRootUrl;
-  }
-  public function setOverview($overview)
-  {
-    $this->overview = $overview;
-  }
-  public function getOverview()
-  {
-    return $this->overview;
-  }
-  public function setPages($pages)
-  {
-    $this->pages = $pages;
-  }
-  public function getPages()
-  {
-    return $this->pages;
-  }
-  public function setRules($rules)
-  {
-    $this->rules = $rules;
-  }
-  public function getRules()
-  {
-    return $this->rules;
-  }
-  public function setSummary($summary)
-  {
-    $this->summary = $summary;
-  }
-  public function getSummary()
-  {
-    return $this->summary;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ServiceUser/DocumentationRule.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ServiceUser/DocumentationRule.php
deleted file mode 100644
index de4c1a34..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ServiceUser/DocumentationRule.php
+++ /dev/null
@@ -1,48 +0,0 @@
-deprecationDescription = $deprecationDescription;
-  }
-  public function getDeprecationDescription()
-  {
-    return $this->deprecationDescription;
-  }
-  public function setDescription($description)
-  {
-    $this->description = $description;
-  }
-  public function getDescription()
-  {
-    return $this->description;
-  }
-  public function setSelector($selector)
-  {
-    $this->selector = $selector;
-  }
-  public function getSelector()
-  {
-    return $this->selector;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ServiceUser/EnableServiceRequest.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ServiceUser/EnableServiceRequest.php
deleted file mode 100644
index cfdab0d4..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ServiceUser/EnableServiceRequest.php
+++ /dev/null
@@ -1,20 +0,0 @@
-aliases = $aliases;
-  }
-  public function getAliases()
-  {
-    return $this->aliases;
-  }
-  public function setAllowCors($allowCors)
-  {
-    $this->allowCors = $allowCors;
-  }
-  public function getAllowCors()
-  {
-    return $this->allowCors;
-  }
-  public function setApis($apis)
-  {
-    $this->apis = $apis;
-  }
-  public function getApis()
-  {
-    return $this->apis;
-  }
-  public function setFeatures($features)
-  {
-    $this->features = $features;
-  }
-  public function getFeatures()
-  {
-    return $this->features;
-  }
-  public function setName($name)
-  {
-    $this->name = $name;
-  }
-  public function getName()
-  {
-    return $this->name;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ServiceUser/Enum.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ServiceUser/Enum.php
deleted file mode 100644
index 4d89024d..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ServiceUser/Enum.php
+++ /dev/null
@@ -1,70 +0,0 @@
-enumvalue = $enumvalue;
-  }
-  public function getEnumvalue()
-  {
-    return $this->enumvalue;
-  }
-  public function setName($name)
-  {
-    $this->name = $name;
-  }
-  public function getName()
-  {
-    return $this->name;
-  }
-  public function setOptions($options)
-  {
-    $this->options = $options;
-  }
-  public function getOptions()
-  {
-    return $this->options;
-  }
-  public function setSourceContext(Google_Service_ServiceUser_SourceContext $sourceContext)
-  {
-    $this->sourceContext = $sourceContext;
-  }
-  public function getSourceContext()
-  {
-    return $this->sourceContext;
-  }
-  public function setSyntax($syntax)
-  {
-    $this->syntax = $syntax;
-  }
-  public function getSyntax()
-  {
-    return $this->syntax;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ServiceUser/EnumValue.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ServiceUser/EnumValue.php
deleted file mode 100644
index 9c9ad449..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ServiceUser/EnumValue.php
+++ /dev/null
@@ -1,50 +0,0 @@
-name = $name;
-  }
-  public function getName()
-  {
-    return $this->name;
-  }
-  public function setNumber($number)
-  {
-    $this->number = $number;
-  }
-  public function getNumber()
-  {
-    return $this->number;
-  }
-  public function setOptions($options)
-  {
-    $this->options = $options;
-  }
-  public function getOptions()
-  {
-    return $this->options;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ServiceUser/Experimental.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ServiceUser/Experimental.php
deleted file mode 100644
index 93c30ec4..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ServiceUser/Experimental.php
+++ /dev/null
@@ -1,31 +0,0 @@
-authorization = $authorization;
-  }
-  public function getAuthorization()
-  {
-    return $this->authorization;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ServiceUser/Field.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ServiceUser/Field.php
deleted file mode 100644
index 6c65173f..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ServiceUser/Field.php
+++ /dev/null
@@ -1,113 +0,0 @@
-cardinality = $cardinality;
-  }
-  public function getCardinality()
-  {
-    return $this->cardinality;
-  }
-  public function setDefaultValue($defaultValue)
-  {
-    $this->defaultValue = $defaultValue;
-  }
-  public function getDefaultValue()
-  {
-    return $this->defaultValue;
-  }
-  public function setJsonName($jsonName)
-  {
-    $this->jsonName = $jsonName;
-  }
-  public function getJsonName()
-  {
-    return $this->jsonName;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setName($name)
-  {
-    $this->name = $name;
-  }
-  public function getName()
-  {
-    return $this->name;
-  }
-  public function setNumber($number)
-  {
-    $this->number = $number;
-  }
-  public function getNumber()
-  {
-    return $this->number;
-  }
-  public function setOneofIndex($oneofIndex)
-  {
-    $this->oneofIndex = $oneofIndex;
-  }
-  public function getOneofIndex()
-  {
-    return $this->oneofIndex;
-  }
-  public function setOptions($options)
-  {
-    $this->options = $options;
-  }
-  public function getOptions()
-  {
-    return $this->options;
-  }
-  public function setPacked($packed)
-  {
-    $this->packed = $packed;
-  }
-  public function getPacked()
-  {
-    return $this->packed;
-  }
-  public function setTypeUrl($typeUrl)
-  {
-    $this->typeUrl = $typeUrl;
-  }
-  public function getTypeUrl()
-  {
-    return $this->typeUrl;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ServiceUser/Http.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ServiceUser/Http.php
deleted file mode 100644
index 462d638d..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ServiceUser/Http.php
+++ /dev/null
@@ -1,32 +0,0 @@
-rules = $rules;
-  }
-  public function getRules()
-  {
-    return $this->rules;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ServiceUser/HttpRule.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ServiceUser/HttpRule.php
deleted file mode 100644
index c2355e8f..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ServiceUser/HttpRule.php
+++ /dev/null
@@ -1,134 +0,0 @@
-additionalBindings = $additionalBindings;
-  }
-  public function getAdditionalBindings()
-  {
-    return $this->additionalBindings;
-  }
-  public function setBody($body)
-  {
-    $this->body = $body;
-  }
-  public function getBody()
-  {
-    return $this->body;
-  }
-  public function setCustom(Google_Service_ServiceUser_CustomHttpPattern $custom)
-  {
-    $this->custom = $custom;
-  }
-  public function getCustom()
-  {
-    return $this->custom;
-  }
-  public function setDelete($delete)
-  {
-    $this->delete = $delete;
-  }
-  public function getDelete()
-  {
-    return $this->delete;
-  }
-  public function setGet($get)
-  {
-    $this->get = $get;
-  }
-  public function getGet()
-  {
-    return $this->get;
-  }
-  public function setMediaDownload(Google_Service_ServiceUser_MediaDownload $mediaDownload)
-  {
-    $this->mediaDownload = $mediaDownload;
-  }
-  public function getMediaDownload()
-  {
-    return $this->mediaDownload;
-  }
-  public function setMediaUpload(Google_Service_ServiceUser_MediaUpload $mediaUpload)
-  {
-    $this->mediaUpload = $mediaUpload;
-  }
-  public function getMediaUpload()
-  {
-    return $this->mediaUpload;
-  }
-  public function setPatch($patch)
-  {
-    $this->patch = $patch;
-  }
-  public function getPatch()
-  {
-    return $this->patch;
-  }
-  public function setPost($post)
-  {
-    $this->post = $post;
-  }
-  public function getPost()
-  {
-    return $this->post;
-  }
-  public function setPut($put)
-  {
-    $this->put = $put;
-  }
-  public function getPut()
-  {
-    return $this->put;
-  }
-  public function setResponseBody($responseBody)
-  {
-    $this->responseBody = $responseBody;
-  }
-  public function getResponseBody()
-  {
-    return $this->responseBody;
-  }
-  public function setSelector($selector)
-  {
-    $this->selector = $selector;
-  }
-  public function getSelector()
-  {
-    return $this->selector;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ServiceUser/LabelDescriptor.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ServiceUser/LabelDescriptor.php
deleted file mode 100644
index f23ef890..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ServiceUser/LabelDescriptor.php
+++ /dev/null
@@ -1,48 +0,0 @@
-description = $description;
-  }
-  public function getDescription()
-  {
-    return $this->description;
-  }
-  public function setKey($key)
-  {
-    $this->key = $key;
-  }
-  public function getKey()
-  {
-    return $this->key;
-  }
-  public function setValueType($valueType)
-  {
-    $this->valueType = $valueType;
-  }
-  public function getValueType()
-  {
-    return $this->valueType;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ServiceUser/ListEnabledServicesResponse.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ServiceUser/ListEnabledServicesResponse.php
deleted file mode 100644
index 4cc52d91..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ServiceUser/ListEnabledServicesResponse.php
+++ /dev/null
@@ -1,41 +0,0 @@
-nextPageToken = $nextPageToken;
-  }
-  public function getNextPageToken()
-  {
-    return $this->nextPageToken;
-  }
-  public function setServices($services)
-  {
-    $this->services = $services;
-  }
-  public function getServices()
-  {
-    return $this->services;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ServiceUser/LogDescriptor.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ServiceUser/LogDescriptor.php
deleted file mode 100644
index 1d8fdf4c..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ServiceUser/LogDescriptor.php
+++ /dev/null
@@ -1,59 +0,0 @@
-description = $description;
-  }
-  public function getDescription()
-  {
-    return $this->description;
-  }
-  public function setDisplayName($displayName)
-  {
-    $this->displayName = $displayName;
-  }
-  public function getDisplayName()
-  {
-    return $this->displayName;
-  }
-  public function setLabels($labels)
-  {
-    $this->labels = $labels;
-  }
-  public function getLabels()
-  {
-    return $this->labels;
-  }
-  public function setName($name)
-  {
-    $this->name = $name;
-  }
-  public function getName()
-  {
-    return $this->name;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ServiceUser/Logging.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ServiceUser/Logging.php
deleted file mode 100644
index ff37b8b9..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ServiceUser/Logging.php
+++ /dev/null
@@ -1,42 +0,0 @@
-consumerDestinations = $consumerDestinations;
-  }
-  public function getConsumerDestinations()
-  {
-    return $this->consumerDestinations;
-  }
-  public function setProducerDestinations($producerDestinations)
-  {
-    $this->producerDestinations = $producerDestinations;
-  }
-  public function getProducerDestinations()
-  {
-    return $this->producerDestinations;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ServiceUser/LoggingDestination.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ServiceUser/LoggingDestination.php
deleted file mode 100644
index c2361a14..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ServiceUser/LoggingDestination.php
+++ /dev/null
@@ -1,40 +0,0 @@
-logs = $logs;
-  }
-  public function getLogs()
-  {
-    return $this->logs;
-  }
-  public function setMonitoredResource($monitoredResource)
-  {
-    $this->monitoredResource = $monitoredResource;
-  }
-  public function getMonitoredResource()
-  {
-    return $this->monitoredResource;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ServiceUser/MediaDownload.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ServiceUser/MediaDownload.php
deleted file mode 100644
index bb320f02..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ServiceUser/MediaDownload.php
+++ /dev/null
@@ -1,39 +0,0 @@
-downloadService = $downloadService;
-  }
-  public function getDownloadService()
-  {
-    return $this->downloadService;
-  }
-  public function setEnabled($enabled)
-  {
-    $this->enabled = $enabled;
-  }
-  public function getEnabled()
-  {
-    return $this->enabled;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ServiceUser/MediaUpload.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ServiceUser/MediaUpload.php
deleted file mode 100644
index e6a58c91..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ServiceUser/MediaUpload.php
+++ /dev/null
@@ -1,39 +0,0 @@
-enabled = $enabled;
-  }
-  public function getEnabled()
-  {
-    return $this->enabled;
-  }
-  public function setUploadService($uploadService)
-  {
-    $this->uploadService = $uploadService;
-  }
-  public function getUploadService()
-  {
-    return $this->uploadService;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ServiceUser/Method.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ServiceUser/Method.php
deleted file mode 100644
index dbc2dea2..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ServiceUser/Method.php
+++ /dev/null
@@ -1,86 +0,0 @@
-name = $name;
-  }
-  public function getName()
-  {
-    return $this->name;
-  }
-  public function setOptions($options)
-  {
-    $this->options = $options;
-  }
-  public function getOptions()
-  {
-    return $this->options;
-  }
-  public function setRequestStreaming($requestStreaming)
-  {
-    $this->requestStreaming = $requestStreaming;
-  }
-  public function getRequestStreaming()
-  {
-    return $this->requestStreaming;
-  }
-  public function setRequestTypeUrl($requestTypeUrl)
-  {
-    $this->requestTypeUrl = $requestTypeUrl;
-  }
-  public function getRequestTypeUrl()
-  {
-    return $this->requestTypeUrl;
-  }
-  public function setResponseStreaming($responseStreaming)
-  {
-    $this->responseStreaming = $responseStreaming;
-  }
-  public function getResponseStreaming()
-  {
-    return $this->responseStreaming;
-  }
-  public function setResponseTypeUrl($responseTypeUrl)
-  {
-    $this->responseTypeUrl = $responseTypeUrl;
-  }
-  public function getResponseTypeUrl()
-  {
-    return $this->responseTypeUrl;
-  }
-  public function setSyntax($syntax)
-  {
-    $this->syntax = $syntax;
-  }
-  public function getSyntax()
-  {
-    return $this->syntax;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ServiceUser/MetricDescriptor.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ServiceUser/MetricDescriptor.php
deleted file mode 100644
index 7a7e33f4..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ServiceUser/MetricDescriptor.php
+++ /dev/null
@@ -1,95 +0,0 @@
-description = $description;
-  }
-  public function getDescription()
-  {
-    return $this->description;
-  }
-  public function setDisplayName($displayName)
-  {
-    $this->displayName = $displayName;
-  }
-  public function getDisplayName()
-  {
-    return $this->displayName;
-  }
-  public function setLabels($labels)
-  {
-    $this->labels = $labels;
-  }
-  public function getLabels()
-  {
-    return $this->labels;
-  }
-  public function setMetricKind($metricKind)
-  {
-    $this->metricKind = $metricKind;
-  }
-  public function getMetricKind()
-  {
-    return $this->metricKind;
-  }
-  public function setName($name)
-  {
-    $this->name = $name;
-  }
-  public function getName()
-  {
-    return $this->name;
-  }
-  public function setType($type)
-  {
-    $this->type = $type;
-  }
-  public function getType()
-  {
-    return $this->type;
-  }
-  public function setUnit($unit)
-  {
-    $this->unit = $unit;
-  }
-  public function getUnit()
-  {
-    return $this->unit;
-  }
-  public function setValueType($valueType)
-  {
-    $this->valueType = $valueType;
-  }
-  public function getValueType()
-  {
-    return $this->valueType;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ServiceUser/Mixin.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ServiceUser/Mixin.php
deleted file mode 100644
index 0489f985..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ServiceUser/Mixin.php
+++ /dev/null
@@ -1,39 +0,0 @@
-name = $name;
-  }
-  public function getName()
-  {
-    return $this->name;
-  }
-  public function setRoot($root)
-  {
-    $this->root = $root;
-  }
-  public function getRoot()
-  {
-    return $this->root;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ServiceUser/MonitoredResourceDescriptor.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ServiceUser/MonitoredResourceDescriptor.php
deleted file mode 100644
index fca17b93..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ServiceUser/MonitoredResourceDescriptor.php
+++ /dev/null
@@ -1,68 +0,0 @@
-description = $description;
-  }
-  public function getDescription()
-  {
-    return $this->description;
-  }
-  public function setDisplayName($displayName)
-  {
-    $this->displayName = $displayName;
-  }
-  public function getDisplayName()
-  {
-    return $this->displayName;
-  }
-  public function setLabels($labels)
-  {
-    $this->labels = $labels;
-  }
-  public function getLabels()
-  {
-    return $this->labels;
-  }
-  public function setName($name)
-  {
-    $this->name = $name;
-  }
-  public function getName()
-  {
-    return $this->name;
-  }
-  public function setType($type)
-  {
-    $this->type = $type;
-  }
-  public function getType()
-  {
-    return $this->type;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ServiceUser/Monitoring.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ServiceUser/Monitoring.php
deleted file mode 100644
index 37c2c670..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ServiceUser/Monitoring.php
+++ /dev/null
@@ -1,42 +0,0 @@
-consumerDestinations = $consumerDestinations;
-  }
-  public function getConsumerDestinations()
-  {
-    return $this->consumerDestinations;
-  }
-  public function setProducerDestinations($producerDestinations)
-  {
-    $this->producerDestinations = $producerDestinations;
-  }
-  public function getProducerDestinations()
-  {
-    return $this->producerDestinations;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ServiceUser/MonitoringDestination.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ServiceUser/MonitoringDestination.php
deleted file mode 100644
index b149e4cd..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ServiceUser/MonitoringDestination.php
+++ /dev/null
@@ -1,40 +0,0 @@
-metrics = $metrics;
-  }
-  public function getMetrics()
-  {
-    return $this->metrics;
-  }
-  public function setMonitoredResource($monitoredResource)
-  {
-    $this->monitoredResource = $monitoredResource;
-  }
-  public function getMonitoredResource()
-  {
-    return $this->monitoredResource;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ServiceUser/OAuthRequirements.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ServiceUser/OAuthRequirements.php
deleted file mode 100644
index ce523d55..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ServiceUser/OAuthRequirements.php
+++ /dev/null
@@ -1,30 +0,0 @@
-canonicalScopes = $canonicalScopes;
-  }
-  public function getCanonicalScopes()
-  {
-    return $this->canonicalScopes;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ServiceUser/Operation.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ServiceUser/Operation.php
deleted file mode 100644
index 67ef77b7..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ServiceUser/Operation.php
+++ /dev/null
@@ -1,67 +0,0 @@
-done = $done;
-  }
-  public function getDone()
-  {
-    return $this->done;
-  }
-  public function setError(Google_Service_ServiceUser_Status $error)
-  {
-    $this->error = $error;
-  }
-  public function getError()
-  {
-    return $this->error;
-  }
-  public function setMetadata($metadata)
-  {
-    $this->metadata = $metadata;
-  }
-  public function getMetadata()
-  {
-    return $this->metadata;
-  }
-  public function setName($name)
-  {
-    $this->name = $name;
-  }
-  public function getName()
-  {
-    return $this->name;
-  }
-  public function setResponse($response)
-  {
-    $this->response = $response;
-  }
-  public function getResponse()
-  {
-    return $this->response;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ServiceUser/OperationMetadata.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ServiceUser/OperationMetadata.php
deleted file mode 100644
index fd5081d1..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ServiceUser/OperationMetadata.php
+++ /dev/null
@@ -1,59 +0,0 @@
-progressPercentage = $progressPercentage;
-  }
-  public function getProgressPercentage()
-  {
-    return $this->progressPercentage;
-  }
-  public function setResourceNames($resourceNames)
-  {
-    $this->resourceNames = $resourceNames;
-  }
-  public function getResourceNames()
-  {
-    return $this->resourceNames;
-  }
-  public function setStartTime($startTime)
-  {
-    $this->startTime = $startTime;
-  }
-  public function getStartTime()
-  {
-    return $this->startTime;
-  }
-  public function setSteps($steps)
-  {
-    $this->steps = $steps;
-  }
-  public function getSteps()
-  {
-    return $this->steps;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ServiceUser/Option.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ServiceUser/Option.php
deleted file mode 100644
index f6b448d4..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ServiceUser/Option.php
+++ /dev/null
@@ -1,39 +0,0 @@
-name = $name;
-  }
-  public function getName()
-  {
-    return $this->name;
-  }
-  public function setValue($value)
-  {
-    $this->value = $value;
-  }
-  public function getValue()
-  {
-    return $this->value;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ServiceUser/Page.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ServiceUser/Page.php
deleted file mode 100644
index 2b060a36..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ServiceUser/Page.php
+++ /dev/null
@@ -1,50 +0,0 @@
-content = $content;
-  }
-  public function getContent()
-  {
-    return $this->content;
-  }
-  public function setName($name)
-  {
-    $this->name = $name;
-  }
-  public function getName()
-  {
-    return $this->name;
-  }
-  public function setSubpages($subpages)
-  {
-    $this->subpages = $subpages;
-  }
-  public function getSubpages()
-  {
-    return $this->subpages;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ServiceUser/PublishedService.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ServiceUser/PublishedService.php
deleted file mode 100644
index 04e4c4f0..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ServiceUser/PublishedService.php
+++ /dev/null
@@ -1,40 +0,0 @@
-name = $name;
-  }
-  public function getName()
-  {
-    return $this->name;
-  }
-  public function setService(Google_Service_ServiceUser_Service $service)
-  {
-    $this->service = $service;
-  }
-  public function getService()
-  {
-    return $this->service;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ServiceUser/Resource/Projects.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ServiceUser/Resource/Projects.php
deleted file mode 100644
index b8cd2398..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ServiceUser/Resource/Projects.php
+++ /dev/null
@@ -1,28 +0,0 @@
-
- *   $serviceuserService = new Google_Service_ServiceUser(...);
- *   $projects = $serviceuserService->projects;
- *  
- */
-class Google_Service_ServiceUser_Resource_Projects extends Google_Service_Resource
-{
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ServiceUser/Resource/ProjectsServices.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ServiceUser/Resource/ProjectsServices.php
deleted file mode 100644
index df3ce1c9..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ServiceUser/Resource/ProjectsServices.php
+++ /dev/null
@@ -1,93 +0,0 @@
-
- *   $serviceuserService = new Google_Service_ServiceUser(...);
- *   $services = $serviceuserService->services;
- *  
- */
-class Google_Service_ServiceUser_Resource_ProjectsServices extends Google_Service_Resource
-{
-  /**
-   * Disable a service so it can no longer be used with a project. This prevents
-   * unintended usage that may cause unexpected billing charges or security leaks.
-   *
-   * Operation (services.disable)
-   *
-   * @param string $name Name of the consumer and the service to disable for that
-   * consumer.
-   *
-   * The Service User implementation accepts the following forms for consumer: -
-   * "project:"
-   *
-   * A valid path would be: - /v1/projects/my-
-   * project/services/servicemanagement.googleapis.com:disable
-   * @param Google_Service_ServiceUser_DisableServiceRequest $postBody
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_ServiceUser_Operation
-   */
-  public function disable($name, Google_Service_ServiceUser_DisableServiceRequest $postBody, $optParams = array())
-  {
-    $params = array('name' => $name, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('disable', array($params), "Google_Service_ServiceUser_Operation");
-  }
-  /**
-   * Enable a service so it can be used with a project. See [Cloud Auth
-   * Guide](https://cloud.google.com/docs/authentication) for more information.
-   *
-   * Operation (services.enable)
-   *
-   * @param string $name Name of the consumer and the service to enable for that
-   * consumer.
-   *
-   * A valid path would be: - /v1/projects/my-
-   * project/services/servicemanagement.googleapis.com:enable
-   * @param Google_Service_ServiceUser_EnableServiceRequest $postBody
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_ServiceUser_Operation
-   */
-  public function enable($name, Google_Service_ServiceUser_EnableServiceRequest $postBody, $optParams = array())
-  {
-    $params = array('name' => $name, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('enable', array($params), "Google_Service_ServiceUser_Operation");
-  }
-  /**
-   * List enabled services for the specified consumer.
-   * (services.listProjectsServices)
-   *
-   * @param string $parent List enabled services for the specified parent.
-   *
-   * An example valid parent would be: - projects/my-project
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param string pageToken Token identifying which result to start with;
-   * returned by a previous list call.
-   * @opt_param int pageSize Requested size of the next page of data.
-   * @return Google_Service_ServiceUser_ListEnabledServicesResponse
-   */
-  public function listProjectsServices($parent, $optParams = array())
-  {
-    $params = array('parent' => $parent);
-    $params = array_merge($params, $optParams);
-    return $this->call('list', array($params), "Google_Service_ServiceUser_ListEnabledServicesResponse");
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ServiceUser/Resource/Services.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ServiceUser/Resource/Services.php
deleted file mode 100644
index c3db071f..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ServiceUser/Resource/Services.php
+++ /dev/null
@@ -1,48 +0,0 @@
-
- *   $serviceuserService = new Google_Service_ServiceUser(...);
- *   $services = $serviceuserService->services;
- *  
- */
-class Google_Service_ServiceUser_Resource_Services extends Google_Service_Resource
-{
-  /**
-   * Search available services.
-   *
-   * When no filter is specified, returns all accessible services. For
-   * authenticated users, also returns all services the calling user has
-   * "servicemanagement.services.bind" permission for. (services.search)
-   *
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param string pageToken Token identifying which result to start with;
-   * returned by a previous list call.
-   * @opt_param int pageSize Requested size of the next page of data.
-   * @return Google_Service_ServiceUser_SearchServicesResponse
-   */
-  public function search($optParams = array())
-  {
-    $params = array();
-    $params = array_merge($params, $optParams);
-    return $this->call('search', array($params), "Google_Service_ServiceUser_SearchServicesResponse");
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ServiceUser/SearchServicesResponse.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ServiceUser/SearchServicesResponse.php
deleted file mode 100644
index 4ce9ad9f..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ServiceUser/SearchServicesResponse.php
+++ /dev/null
@@ -1,41 +0,0 @@
-nextPageToken = $nextPageToken;
-  }
-  public function getNextPageToken()
-  {
-    return $this->nextPageToken;
-  }
-  public function setServices($services)
-  {
-    $this->services = $services;
-  }
-  public function getServices()
-  {
-    return $this->services;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ServiceUser/Service.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ServiceUser/Service.php
deleted file mode 100644
index 1fcc527e..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ServiceUser/Service.php
+++ /dev/null
@@ -1,287 +0,0 @@
-apis = $apis;
-  }
-  public function getApis()
-  {
-    return $this->apis;
-  }
-  public function setAuthentication(Google_Service_ServiceUser_Authentication $authentication)
-  {
-    $this->authentication = $authentication;
-  }
-  public function getAuthentication()
-  {
-    return $this->authentication;
-  }
-  public function setBackend(Google_Service_ServiceUser_Backend $backend)
-  {
-    $this->backend = $backend;
-  }
-  public function getBackend()
-  {
-    return $this->backend;
-  }
-  public function setConfigVersion($configVersion)
-  {
-    $this->configVersion = $configVersion;
-  }
-  public function getConfigVersion()
-  {
-    return $this->configVersion;
-  }
-  public function setContext(Google_Service_ServiceUser_Context $context)
-  {
-    $this->context = $context;
-  }
-  public function getContext()
-  {
-    return $this->context;
-  }
-  public function setControl(Google_Service_ServiceUser_Control $control)
-  {
-    $this->control = $control;
-  }
-  public function getControl()
-  {
-    return $this->control;
-  }
-  public function setCustomError(Google_Service_ServiceUser_CustomError $customError)
-  {
-    $this->customError = $customError;
-  }
-  public function getCustomError()
-  {
-    return $this->customError;
-  }
-  public function setDocumentation(Google_Service_ServiceUser_Documentation $documentation)
-  {
-    $this->documentation = $documentation;
-  }
-  public function getDocumentation()
-  {
-    return $this->documentation;
-  }
-  public function setEndpoints($endpoints)
-  {
-    $this->endpoints = $endpoints;
-  }
-  public function getEndpoints()
-  {
-    return $this->endpoints;
-  }
-  public function setEnums($enums)
-  {
-    $this->enums = $enums;
-  }
-  public function getEnums()
-  {
-    return $this->enums;
-  }
-  public function setExperimental(Google_Service_ServiceUser_Experimental $experimental)
-  {
-    $this->experimental = $experimental;
-  }
-  public function getExperimental()
-  {
-    return $this->experimental;
-  }
-  public function setHttp(Google_Service_ServiceUser_Http $http)
-  {
-    $this->http = $http;
-  }
-  public function getHttp()
-  {
-    return $this->http;
-  }
-  public function setId($id)
-  {
-    $this->id = $id;
-  }
-  public function getId()
-  {
-    return $this->id;
-  }
-  public function setLogging(Google_Service_ServiceUser_Logging $logging)
-  {
-    $this->logging = $logging;
-  }
-  public function getLogging()
-  {
-    return $this->logging;
-  }
-  public function setLogs($logs)
-  {
-    $this->logs = $logs;
-  }
-  public function getLogs()
-  {
-    return $this->logs;
-  }
-  public function setMetrics($metrics)
-  {
-    $this->metrics = $metrics;
-  }
-  public function getMetrics()
-  {
-    return $this->metrics;
-  }
-  public function setMonitoredResources($monitoredResources)
-  {
-    $this->monitoredResources = $monitoredResources;
-  }
-  public function getMonitoredResources()
-  {
-    return $this->monitoredResources;
-  }
-  public function setMonitoring(Google_Service_ServiceUser_Monitoring $monitoring)
-  {
-    $this->monitoring = $monitoring;
-  }
-  public function getMonitoring()
-  {
-    return $this->monitoring;
-  }
-  public function setName($name)
-  {
-    $this->name = $name;
-  }
-  public function getName()
-  {
-    return $this->name;
-  }
-  public function setProducerProjectId($producerProjectId)
-  {
-    $this->producerProjectId = $producerProjectId;
-  }
-  public function getProducerProjectId()
-  {
-    return $this->producerProjectId;
-  }
-  public function setSourceInfo(Google_Service_ServiceUser_SourceInfo $sourceInfo)
-  {
-    $this->sourceInfo = $sourceInfo;
-  }
-  public function getSourceInfo()
-  {
-    return $this->sourceInfo;
-  }
-  public function setSystemParameters(Google_Service_ServiceUser_SystemParameters $systemParameters)
-  {
-    $this->systemParameters = $systemParameters;
-  }
-  public function getSystemParameters()
-  {
-    return $this->systemParameters;
-  }
-  public function setSystemTypes($systemTypes)
-  {
-    $this->systemTypes = $systemTypes;
-  }
-  public function getSystemTypes()
-  {
-    return $this->systemTypes;
-  }
-  public function setTitle($title)
-  {
-    $this->title = $title;
-  }
-  public function getTitle()
-  {
-    return $this->title;
-  }
-  public function setTypes($types)
-  {
-    $this->types = $types;
-  }
-  public function getTypes()
-  {
-    return $this->types;
-  }
-  public function setUsage(Google_Service_ServiceUser_Usage $usage)
-  {
-    $this->usage = $usage;
-  }
-  public function getUsage()
-  {
-    return $this->usage;
-  }
-  public function setVisibility(Google_Service_ServiceUser_Visibility $visibility)
-  {
-    $this->visibility = $visibility;
-  }
-  public function getVisibility()
-  {
-    return $this->visibility;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ServiceUser/SourceContext.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ServiceUser/SourceContext.php
deleted file mode 100644
index fb1f7993..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ServiceUser/SourceContext.php
+++ /dev/null
@@ -1,30 +0,0 @@
-fileName = $fileName;
-  }
-  public function getFileName()
-  {
-    return $this->fileName;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ServiceUser/SourceInfo.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ServiceUser/SourceInfo.php
deleted file mode 100644
index 7d77d9e2..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ServiceUser/SourceInfo.php
+++ /dev/null
@@ -1,31 +0,0 @@
-sourceFiles = $sourceFiles;
-  }
-  public function getSourceFiles()
-  {
-    return $this->sourceFiles;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ServiceUser/Status.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ServiceUser/Status.php
deleted file mode 100644
index 2e0b2697..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ServiceUser/Status.php
+++ /dev/null
@@ -1,49 +0,0 @@
-code = $code;
-  }
-  public function getCode()
-  {
-    return $this->code;
-  }
-  public function setDetails($details)
-  {
-    $this->details = $details;
-  }
-  public function getDetails()
-  {
-    return $this->details;
-  }
-  public function setMessage($message)
-  {
-    $this->message = $message;
-  }
-  public function getMessage()
-  {
-    return $this->message;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ServiceUser/Step.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ServiceUser/Step.php
deleted file mode 100644
index 186d1769..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ServiceUser/Step.php
+++ /dev/null
@@ -1,39 +0,0 @@
-description = $description;
-  }
-  public function getDescription()
-  {
-    return $this->description;
-  }
-  public function setStatus($status)
-  {
-    $this->status = $status;
-  }
-  public function getStatus()
-  {
-    return $this->status;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ServiceUser/SystemParameter.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ServiceUser/SystemParameter.php
deleted file mode 100644
index 80357ba6..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ServiceUser/SystemParameter.php
+++ /dev/null
@@ -1,48 +0,0 @@
-httpHeader = $httpHeader;
-  }
-  public function getHttpHeader()
-  {
-    return $this->httpHeader;
-  }
-  public function setName($name)
-  {
-    $this->name = $name;
-  }
-  public function getName()
-  {
-    return $this->name;
-  }
-  public function setUrlQueryParameter($urlQueryParameter)
-  {
-    $this->urlQueryParameter = $urlQueryParameter;
-  }
-  public function getUrlQueryParameter()
-  {
-    return $this->urlQueryParameter;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ServiceUser/SystemParameterRule.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ServiceUser/SystemParameterRule.php
deleted file mode 100644
index 90eeea36..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ServiceUser/SystemParameterRule.php
+++ /dev/null
@@ -1,41 +0,0 @@
-parameters = $parameters;
-  }
-  public function getParameters()
-  {
-    return $this->parameters;
-  }
-  public function setSelector($selector)
-  {
-    $this->selector = $selector;
-  }
-  public function getSelector()
-  {
-    return $this->selector;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ServiceUser/SystemParameters.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ServiceUser/SystemParameters.php
deleted file mode 100644
index 4a7ee021..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ServiceUser/SystemParameters.php
+++ /dev/null
@@ -1,32 +0,0 @@
-rules = $rules;
-  }
-  public function getRules()
-  {
-    return $this->rules;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ServiceUser/Type.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ServiceUser/Type.php
deleted file mode 100644
index b5b6c763..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ServiceUser/Type.php
+++ /dev/null
@@ -1,79 +0,0 @@
-fields = $fields;
-  }
-  public function getFields()
-  {
-    return $this->fields;
-  }
-  public function setName($name)
-  {
-    $this->name = $name;
-  }
-  public function getName()
-  {
-    return $this->name;
-  }
-  public function setOneofs($oneofs)
-  {
-    $this->oneofs = $oneofs;
-  }
-  public function getOneofs()
-  {
-    return $this->oneofs;
-  }
-  public function setOptions($options)
-  {
-    $this->options = $options;
-  }
-  public function getOptions()
-  {
-    return $this->options;
-  }
-  public function setSourceContext(Google_Service_ServiceUser_SourceContext $sourceContext)
-  {
-    $this->sourceContext = $sourceContext;
-  }
-  public function getSourceContext()
-  {
-    return $this->sourceContext;
-  }
-  public function setSyntax($syntax)
-  {
-    $this->syntax = $syntax;
-  }
-  public function getSyntax()
-  {
-    return $this->syntax;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ServiceUser/Usage.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ServiceUser/Usage.php
deleted file mode 100644
index edbba99a..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ServiceUser/Usage.php
+++ /dev/null
@@ -1,50 +0,0 @@
-producerNotificationChannel = $producerNotificationChannel;
-  }
-  public function getProducerNotificationChannel()
-  {
-    return $this->producerNotificationChannel;
-  }
-  public function setRequirements($requirements)
-  {
-    $this->requirements = $requirements;
-  }
-  public function getRequirements()
-  {
-    return $this->requirements;
-  }
-  public function setRules($rules)
-  {
-    $this->rules = $rules;
-  }
-  public function getRules()
-  {
-    return $this->rules;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ServiceUser/UsageRule.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ServiceUser/UsageRule.php
deleted file mode 100644
index 488211d7..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ServiceUser/UsageRule.php
+++ /dev/null
@@ -1,39 +0,0 @@
-allowUnregisteredCalls = $allowUnregisteredCalls;
-  }
-  public function getAllowUnregisteredCalls()
-  {
-    return $this->allowUnregisteredCalls;
-  }
-  public function setSelector($selector)
-  {
-    $this->selector = $selector;
-  }
-  public function getSelector()
-  {
-    return $this->selector;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ServiceUser/Visibility.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ServiceUser/Visibility.php
deleted file mode 100644
index 02bbd8a7..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ServiceUser/Visibility.php
+++ /dev/null
@@ -1,32 +0,0 @@
-rules = $rules;
-  }
-  public function getRules()
-  {
-    return $this->rules;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ServiceUser/VisibilityRule.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ServiceUser/VisibilityRule.php
deleted file mode 100644
index 89c9a4c9..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ServiceUser/VisibilityRule.php
+++ /dev/null
@@ -1,39 +0,0 @@
-restriction = $restriction;
-  }
-  public function getRestriction()
-  {
-    return $this->restriction;
-  }
-  public function setSelector($selector)
-  {
-    $this->selector = $selector;
-  }
-  public function getSelector()
-  {
-    return $this->selector;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Sheets.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Sheets.php
deleted file mode 100644
index 61bd238d..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Sheets.php
+++ /dev/null
@@ -1,297 +0,0 @@
-
- * Reads and writes Google Sheets.

- *
- * 

- * For more information about this service, see the API
- * Documentation
- * 

- *
- * @author Google, Inc.
- */
-class Google_Service_Sheets extends Google_Service
-{
-  /** View and manage the files in your Google Drive. */
-  const DRIVE =
-      "https://www.googleapis.com/auth/drive";
-  /** View the files in your Google Drive. */
-  const DRIVE_READONLY =
-      "https://www.googleapis.com/auth/drive.readonly";
-  /** View and manage your spreadsheets in Google Drive. */
-  const SPREADSHEETS =
-      "https://www.googleapis.com/auth/spreadsheets";
-  /** View your Google Spreadsheets. */
-  const SPREADSHEETS_READONLY =
-      "https://www.googleapis.com/auth/spreadsheets.readonly";
-
-  public $spreadsheets;
-  public $spreadsheets_sheets;
-  public $spreadsheets_values;
-  
-  /**
-   * Constructs the internal representation of the Sheets service.
-   *
-   * @param Google_Client $client
-   */
-  public function __construct(Google_Client $client)
-  {
-    parent::__construct($client);
-    $this->rootUrl = 'https://sheets.googleapis.com/';
-    $this->servicePath = '';
-    $this->version = 'v4';
-    $this->serviceName = 'sheets';
-
-    $this->spreadsheets = new Google_Service_Sheets_Resource_Spreadsheets(
-        $this,
-        $this->serviceName,
-        'spreadsheets',
-        array(
-          'methods' => array(
-            'batchUpdate' => array(
-              'path' => 'v4/spreadsheets/{spreadsheetId}:batchUpdate',
-              'httpMethod' => 'POST',
-              'parameters' => array(
-                'spreadsheetId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'create' => array(
-              'path' => 'v4/spreadsheets',
-              'httpMethod' => 'POST',
-              'parameters' => array(),
-            ),'get' => array(
-              'path' => 'v4/spreadsheets/{spreadsheetId}',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'spreadsheetId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'ranges' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                  'repeated' => true,
-                ),
-                'includeGridData' => array(
-                  'location' => 'query',
-                  'type' => 'boolean',
-                ),
-              ),
-            ),
-          )
-        )
-    );
-    $this->spreadsheets_sheets = new Google_Service_Sheets_Resource_SpreadsheetsSheets(
-        $this,
-        $this->serviceName,
-        'sheets',
-        array(
-          'methods' => array(
-            'copyTo' => array(
-              'path' => 'v4/spreadsheets/{spreadsheetId}/sheets/{sheetId}:copyTo',
-              'httpMethod' => 'POST',
-              'parameters' => array(
-                'spreadsheetId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'sheetId' => array(
-                  'location' => 'path',
-                  'type' => 'integer',
-                  'required' => true,
-                ),
-              ),
-            ),
-          )
-        )
-    );
-    $this->spreadsheets_values = new Google_Service_Sheets_Resource_SpreadsheetsValues(
-        $this,
-        $this->serviceName,
-        'values',
-        array(
-          'methods' => array(
-            'append' => array(
-              'path' => 'v4/spreadsheets/{spreadsheetId}/values/{range}:append',
-              'httpMethod' => 'POST',
-              'parameters' => array(
-                'spreadsheetId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'range' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'includeValuesInResponse' => array(
-                  'location' => 'query',
-                  'type' => 'boolean',
-                ),
-                'responseValueRenderOption' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'insertDataOption' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'valueInputOption' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'responseDateTimeRenderOption' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-              ),
-            ),'batchClear' => array(
-              'path' => 'v4/spreadsheets/{spreadsheetId}/values:batchClear',
-              'httpMethod' => 'POST',
-              'parameters' => array(
-                'spreadsheetId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'batchGet' => array(
-              'path' => 'v4/spreadsheets/{spreadsheetId}/values:batchGet',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'spreadsheetId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'valueRenderOption' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'dateTimeRenderOption' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'ranges' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                  'repeated' => true,
-                ),
-                'majorDimension' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-              ),
-            ),'batchUpdate' => array(
-              'path' => 'v4/spreadsheets/{spreadsheetId}/values:batchUpdate',
-              'httpMethod' => 'POST',
-              'parameters' => array(
-                'spreadsheetId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'clear' => array(
-              'path' => 'v4/spreadsheets/{spreadsheetId}/values/{range}:clear',
-              'httpMethod' => 'POST',
-              'parameters' => array(
-                'spreadsheetId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'range' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'get' => array(
-              'path' => 'v4/spreadsheets/{spreadsheetId}/values/{range}',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'spreadsheetId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'range' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'valueRenderOption' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'dateTimeRenderOption' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'majorDimension' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-              ),
-            ),'update' => array(
-              'path' => 'v4/spreadsheets/{spreadsheetId}/values/{range}',
-              'httpMethod' => 'PUT',
-              'parameters' => array(
-                'spreadsheetId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'range' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'responseValueRenderOption' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'valueInputOption' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'responseDateTimeRenderOption' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'includeValuesInResponse' => array(
-                  'location' => 'query',
-                  'type' => 'boolean',
-                ),
-              ),
-            ),
-          )
-        )
-    );
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Sheets/AddBandingRequest.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Sheets/AddBandingRequest.php
deleted file mode 100644
index 37ebaab0..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Sheets/AddBandingRequest.php
+++ /dev/null
@@ -1,31 +0,0 @@
-bandedRange = $bandedRange;
-  }
-  public function getBandedRange()
-  {
-    return $this->bandedRange;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Sheets/AddBandingResponse.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Sheets/AddBandingResponse.php
deleted file mode 100644
index 113cf126..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Sheets/AddBandingResponse.php
+++ /dev/null
@@ -1,31 +0,0 @@
-bandedRange = $bandedRange;
-  }
-  public function getBandedRange()
-  {
-    return $this->bandedRange;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Sheets/AddChartRequest.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Sheets/AddChartRequest.php
deleted file mode 100644
index 2bfa3275..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Sheets/AddChartRequest.php
+++ /dev/null
@@ -1,31 +0,0 @@
-chart = $chart;
-  }
-  public function getChart()
-  {
-    return $this->chart;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Sheets/AddChartResponse.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Sheets/AddChartResponse.php
deleted file mode 100644
index 9d3f1302..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Sheets/AddChartResponse.php
+++ /dev/null
@@ -1,31 +0,0 @@
-chart = $chart;
-  }
-  public function getChart()
-  {
-    return $this->chart;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Sheets/AddConditionalFormatRuleRequest.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Sheets/AddConditionalFormatRuleRequest.php
deleted file mode 100644
index 3a182df3..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Sheets/AddConditionalFormatRuleRequest.php
+++ /dev/null
@@ -1,40 +0,0 @@
-index = $index;
-  }
-  public function getIndex()
-  {
-    return $this->index;
-  }
-  public function setRule(Google_Service_Sheets_ConditionalFormatRule $rule)
-  {
-    $this->rule = $rule;
-  }
-  public function getRule()
-  {
-    return $this->rule;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Sheets/AddFilterViewRequest.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Sheets/AddFilterViewRequest.php
deleted file mode 100644
index 6128be09..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Sheets/AddFilterViewRequest.php
+++ /dev/null
@@ -1,31 +0,0 @@
-filter = $filter;
-  }
-  public function getFilter()
-  {
-    return $this->filter;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Sheets/AddFilterViewResponse.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Sheets/AddFilterViewResponse.php
deleted file mode 100644
index 590570c9..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Sheets/AddFilterViewResponse.php
+++ /dev/null
@@ -1,31 +0,0 @@
-filter = $filter;
-  }
-  public function getFilter()
-  {
-    return $this->filter;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Sheets/AddNamedRangeRequest.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Sheets/AddNamedRangeRequest.php
deleted file mode 100644
index b13259d7..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Sheets/AddNamedRangeRequest.php
+++ /dev/null
@@ -1,31 +0,0 @@
-namedRange = $namedRange;
-  }
-  public function getNamedRange()
-  {
-    return $this->namedRange;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Sheets/AddNamedRangeResponse.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Sheets/AddNamedRangeResponse.php
deleted file mode 100644
index 67899f1e..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Sheets/AddNamedRangeResponse.php
+++ /dev/null
@@ -1,31 +0,0 @@
-namedRange = $namedRange;
-  }
-  public function getNamedRange()
-  {
-    return $this->namedRange;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Sheets/AddProtectedRangeRequest.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Sheets/AddProtectedRangeRequest.php
deleted file mode 100644
index 09d71864..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Sheets/AddProtectedRangeRequest.php
+++ /dev/null
@@ -1,31 +0,0 @@
-protectedRange = $protectedRange;
-  }
-  public function getProtectedRange()
-  {
-    return $this->protectedRange;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Sheets/AddProtectedRangeResponse.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Sheets/AddProtectedRangeResponse.php
deleted file mode 100644
index 9cae479a..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Sheets/AddProtectedRangeResponse.php
+++ /dev/null
@@ -1,31 +0,0 @@
-protectedRange = $protectedRange;
-  }
-  public function getProtectedRange()
-  {
-    return $this->protectedRange;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Sheets/AddSheetRequest.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Sheets/AddSheetRequest.php
deleted file mode 100644
index fafb3a6c..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Sheets/AddSheetRequest.php
+++ /dev/null
@@ -1,31 +0,0 @@
-properties = $properties;
-  }
-  public function getProperties()
-  {
-    return $this->properties;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Sheets/AddSheetResponse.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Sheets/AddSheetResponse.php
deleted file mode 100644
index bf097025..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Sheets/AddSheetResponse.php
+++ /dev/null
@@ -1,31 +0,0 @@
-properties = $properties;
-  }
-  public function getProperties()
-  {
-    return $this->properties;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Sheets/AppendCellsRequest.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Sheets/AppendCellsRequest.php
deleted file mode 100644
index b4d917a7..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Sheets/AppendCellsRequest.php
+++ /dev/null
@@ -1,50 +0,0 @@
-fields = $fields;
-  }
-  public function getFields()
-  {
-    return $this->fields;
-  }
-  public function setRows($rows)
-  {
-    $this->rows = $rows;
-  }
-  public function getRows()
-  {
-    return $this->rows;
-  }
-  public function setSheetId($sheetId)
-  {
-    $this->sheetId = $sheetId;
-  }
-  public function getSheetId()
-  {
-    return $this->sheetId;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Sheets/AppendDimensionRequest.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Sheets/AppendDimensionRequest.php
deleted file mode 100644
index 0fcf960c..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Sheets/AppendDimensionRequest.php
+++ /dev/null
@@ -1,48 +0,0 @@
-dimension = $dimension;
-  }
-  public function getDimension()
-  {
-    return $this->dimension;
-  }
-  public function setLength($length)
-  {
-    $this->length = $length;
-  }
-  public function getLength()
-  {
-    return $this->length;
-  }
-  public function setSheetId($sheetId)
-  {
-    $this->sheetId = $sheetId;
-  }
-  public function getSheetId()
-  {
-    return $this->sheetId;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Sheets/AppendValuesResponse.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Sheets/AppendValuesResponse.php
deleted file mode 100644
index 8c88ac22..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Sheets/AppendValuesResponse.php
+++ /dev/null
@@ -1,49 +0,0 @@
-spreadsheetId = $spreadsheetId;
-  }
-  public function getSpreadsheetId()
-  {
-    return $this->spreadsheetId;
-  }
-  public function setTableRange($tableRange)
-  {
-    $this->tableRange = $tableRange;
-  }
-  public function getTableRange()
-  {
-    return $this->tableRange;
-  }
-  public function setUpdates(Google_Service_Sheets_UpdateValuesResponse $updates)
-  {
-    $this->updates = $updates;
-  }
-  public function getUpdates()
-  {
-    return $this->updates;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Sheets/AutoFillRequest.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Sheets/AutoFillRequest.php
deleted file mode 100644
index ef69a642..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Sheets/AutoFillRequest.php
+++ /dev/null
@@ -1,50 +0,0 @@
-range = $range;
-  }
-  public function getRange()
-  {
-    return $this->range;
-  }
-  public function setSourceAndDestination(Google_Service_Sheets_SourceAndDestination $sourceAndDestination)
-  {
-    $this->sourceAndDestination = $sourceAndDestination;
-  }
-  public function getSourceAndDestination()
-  {
-    return $this->sourceAndDestination;
-  }
-  public function setUseAlternateSeries($useAlternateSeries)
-  {
-    $this->useAlternateSeries = $useAlternateSeries;
-  }
-  public function getUseAlternateSeries()
-  {
-    return $this->useAlternateSeries;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Sheets/AutoResizeDimensionsRequest.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Sheets/AutoResizeDimensionsRequest.php
deleted file mode 100644
index acd9caec..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Sheets/AutoResizeDimensionsRequest.php
+++ /dev/null
@@ -1,31 +0,0 @@
-dimensions = $dimensions;
-  }
-  public function getDimensions()
-  {
-    return $this->dimensions;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Sheets/BandedRange.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Sheets/BandedRange.php
deleted file mode 100644
index c3dfb2f9..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Sheets/BandedRange.php
+++ /dev/null
@@ -1,60 +0,0 @@
-bandedRangeId = $bandedRangeId;
-  }
-  public function getBandedRangeId()
-  {
-    return $this->bandedRangeId;
-  }
-  public function setColumnProperties(Google_Service_Sheets_BandingProperties $columnProperties)
-  {
-    $this->columnProperties = $columnProperties;
-  }
-  public function getColumnProperties()
-  {
-    return $this->columnProperties;
-  }
-  public function setRange(Google_Service_Sheets_GridRange $range)
-  {
-    $this->range = $range;
-  }
-  public function getRange()
-  {
-    return $this->range;
-  }
-  public function setRowProperties(Google_Service_Sheets_BandingProperties $rowProperties)
-  {
-    $this->rowProperties = $rowProperties;
-  }
-  public function getRowProperties()
-  {
-    return $this->rowProperties;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Sheets/BandingProperties.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Sheets/BandingProperties.php
deleted file mode 100644
index e146ffcb..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Sheets/BandingProperties.php
+++ /dev/null
@@ -1,61 +0,0 @@
-firstBandColor = $firstBandColor;
-  }
-  public function getFirstBandColor()
-  {
-    return $this->firstBandColor;
-  }
-  public function setFooterColor(Google_Service_Sheets_Color $footerColor)
-  {
-    $this->footerColor = $footerColor;
-  }
-  public function getFooterColor()
-  {
-    return $this->footerColor;
-  }
-  public function setHeaderColor(Google_Service_Sheets_Color $headerColor)
-  {
-    $this->headerColor = $headerColor;
-  }
-  public function getHeaderColor()
-  {
-    return $this->headerColor;
-  }
-  public function setSecondBandColor(Google_Service_Sheets_Color $secondBandColor)
-  {
-    $this->secondBandColor = $secondBandColor;
-  }
-  public function getSecondBandColor()
-  {
-    return $this->secondBandColor;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Sheets/BasicChartAxis.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Sheets/BasicChartAxis.php
deleted file mode 100644
index 2c2482a0..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Sheets/BasicChartAxis.php
+++ /dev/null
@@ -1,49 +0,0 @@
-format = $format;
-  }
-  public function getFormat()
-  {
-    return $this->format;
-  }
-  public function setPosition($position)
-  {
-    $this->position = $position;
-  }
-  public function getPosition()
-  {
-    return $this->position;
-  }
-  public function setTitle($title)
-  {
-    $this->title = $title;
-  }
-  public function getTitle()
-  {
-    return $this->title;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Sheets/BasicChartDomain.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Sheets/BasicChartDomain.php
deleted file mode 100644
index 4a770999..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Sheets/BasicChartDomain.php
+++ /dev/null
@@ -1,31 +0,0 @@
-domain = $domain;
-  }
-  public function getDomain()
-  {
-    return $this->domain;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Sheets/BasicChartSeries.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Sheets/BasicChartSeries.php
deleted file mode 100644
index 02080351..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Sheets/BasicChartSeries.php
+++ /dev/null
@@ -1,49 +0,0 @@
-series = $series;
-  }
-  public function getSeries()
-  {
-    return $this->series;
-  }
-  public function setTargetAxis($targetAxis)
-  {
-    $this->targetAxis = $targetAxis;
-  }
-  public function getTargetAxis()
-  {
-    return $this->targetAxis;
-  }
-  public function setType($type)
-  {
-    $this->type = $type;
-  }
-  public function getType()
-  {
-    return $this->type;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Sheets/BasicChartSpec.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Sheets/BasicChartSpec.php
deleted file mode 100644
index e54738ca..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Sheets/BasicChartSpec.php
+++ /dev/null
@@ -1,79 +0,0 @@
-axis = $axis;
-  }
-  public function getAxis()
-  {
-    return $this->axis;
-  }
-  public function setChartType($chartType)
-  {
-    $this->chartType = $chartType;
-  }
-  public function getChartType()
-  {
-    return $this->chartType;
-  }
-  public function setDomains($domains)
-  {
-    $this->domains = $domains;
-  }
-  public function getDomains()
-  {
-    return $this->domains;
-  }
-  public function setHeaderCount($headerCount)
-  {
-    $this->headerCount = $headerCount;
-  }
-  public function getHeaderCount()
-  {
-    return $this->headerCount;
-  }
-  public function setLegendPosition($legendPosition)
-  {
-    $this->legendPosition = $legendPosition;
-  }
-  public function getLegendPosition()
-  {
-    return $this->legendPosition;
-  }
-  public function setSeries($series)
-  {
-    $this->series = $series;
-  }
-  public function getSeries()
-  {
-    return $this->series;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Sheets/BasicFilter.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Sheets/BasicFilter.php
deleted file mode 100644
index b6f46494..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Sheets/BasicFilter.php
+++ /dev/null
@@ -1,52 +0,0 @@
-criteria = $criteria;
-  }
-  public function getCriteria()
-  {
-    return $this->criteria;
-  }
-  public function setRange(Google_Service_Sheets_GridRange $range)
-  {
-    $this->range = $range;
-  }
-  public function getRange()
-  {
-    return $this->range;
-  }
-  public function setSortSpecs($sortSpecs)
-  {
-    $this->sortSpecs = $sortSpecs;
-  }
-  public function getSortSpecs()
-  {
-    return $this->sortSpecs;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Sheets/BatchClearValuesRequest.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Sheets/BatchClearValuesRequest.php
deleted file mode 100644
index aa48408b..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Sheets/BatchClearValuesRequest.php
+++ /dev/null
@@ -1,31 +0,0 @@
-ranges = $ranges;
-  }
-  public function getRanges()
-  {
-    return $this->ranges;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Sheets/BatchClearValuesResponse.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Sheets/BatchClearValuesResponse.php
deleted file mode 100644
index f3d5c571..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Sheets/BatchClearValuesResponse.php
+++ /dev/null
@@ -1,40 +0,0 @@
-clearedRanges = $clearedRanges;
-  }
-  public function getClearedRanges()
-  {
-    return $this->clearedRanges;
-  }
-  public function setSpreadsheetId($spreadsheetId)
-  {
-    $this->spreadsheetId = $spreadsheetId;
-  }
-  public function getSpreadsheetId()
-  {
-    return $this->spreadsheetId;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Sheets/BatchGetValuesResponse.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Sheets/BatchGetValuesResponse.php
deleted file mode 100644
index 70da92cc..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Sheets/BatchGetValuesResponse.php
+++ /dev/null
@@ -1,41 +0,0 @@
-spreadsheetId = $spreadsheetId;
-  }
-  public function getSpreadsheetId()
-  {
-    return $this->spreadsheetId;
-  }
-  public function setValueRanges($valueRanges)
-  {
-    $this->valueRanges = $valueRanges;
-  }
-  public function getValueRanges()
-  {
-    return $this->valueRanges;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Sheets/BatchUpdateSpreadsheetRequest.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Sheets/BatchUpdateSpreadsheetRequest.php
deleted file mode 100644
index a8547419..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Sheets/BatchUpdateSpreadsheetRequest.php
+++ /dev/null
@@ -1,59 +0,0 @@
-includeSpreadsheetInResponse = $includeSpreadsheetInResponse;
-  }
-  public function getIncludeSpreadsheetInResponse()
-  {
-    return $this->includeSpreadsheetInResponse;
-  }
-  public function setRequests($requests)
-  {
-    $this->requests = $requests;
-  }
-  public function getRequests()
-  {
-    return $this->requests;
-  }
-  public function setResponseIncludeGridData($responseIncludeGridData)
-  {
-    $this->responseIncludeGridData = $responseIncludeGridData;
-  }
-  public function getResponseIncludeGridData()
-  {
-    return $this->responseIncludeGridData;
-  }
-  public function setResponseRanges($responseRanges)
-  {
-    $this->responseRanges = $responseRanges;
-  }
-  public function getResponseRanges()
-  {
-    return $this->responseRanges;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Sheets/BatchUpdateSpreadsheetResponse.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Sheets/BatchUpdateSpreadsheetResponse.php
deleted file mode 100644
index adc77749..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Sheets/BatchUpdateSpreadsheetResponse.php
+++ /dev/null
@@ -1,51 +0,0 @@
-replies = $replies;
-  }
-  public function getReplies()
-  {
-    return $this->replies;
-  }
-  public function setSpreadsheetId($spreadsheetId)
-  {
-    $this->spreadsheetId = $spreadsheetId;
-  }
-  public function getSpreadsheetId()
-  {
-    return $this->spreadsheetId;
-  }
-  public function setUpdatedSpreadsheet(Google_Service_Sheets_Spreadsheet $updatedSpreadsheet)
-  {
-    $this->updatedSpreadsheet = $updatedSpreadsheet;
-  }
-  public function getUpdatedSpreadsheet()
-  {
-    return $this->updatedSpreadsheet;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Sheets/BatchUpdateValuesRequest.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Sheets/BatchUpdateValuesRequest.php
deleted file mode 100644
index e7052497..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Sheets/BatchUpdateValuesRequest.php
+++ /dev/null
@@ -1,68 +0,0 @@
-data = $data;
-  }
-  public function getData()
-  {
-    return $this->data;
-  }
-  public function setIncludeValuesInResponse($includeValuesInResponse)
-  {
-    $this->includeValuesInResponse = $includeValuesInResponse;
-  }
-  public function getIncludeValuesInResponse()
-  {
-    return $this->includeValuesInResponse;
-  }
-  public function setResponseDateTimeRenderOption($responseDateTimeRenderOption)
-  {
-    $this->responseDateTimeRenderOption = $responseDateTimeRenderOption;
-  }
-  public function getResponseDateTimeRenderOption()
-  {
-    return $this->responseDateTimeRenderOption;
-  }
-  public function setResponseValueRenderOption($responseValueRenderOption)
-  {
-    $this->responseValueRenderOption = $responseValueRenderOption;
-  }
-  public function getResponseValueRenderOption()
-  {
-    return $this->responseValueRenderOption;
-  }
-  public function setValueInputOption($valueInputOption)
-  {
-    $this->valueInputOption = $valueInputOption;
-  }
-  public function getValueInputOption()
-  {
-    return $this->valueInputOption;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Sheets/BatchUpdateValuesResponse.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Sheets/BatchUpdateValuesResponse.php
deleted file mode 100644
index 3d9364b4..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Sheets/BatchUpdateValuesResponse.php
+++ /dev/null
@@ -1,77 +0,0 @@
-responses = $responses;
-  }
-  public function getResponses()
-  {
-    return $this->responses;
-  }
-  public function setSpreadsheetId($spreadsheetId)
-  {
-    $this->spreadsheetId = $spreadsheetId;
-  }
-  public function getSpreadsheetId()
-  {
-    return $this->spreadsheetId;
-  }
-  public function setTotalUpdatedCells($totalUpdatedCells)
-  {
-    $this->totalUpdatedCells = $totalUpdatedCells;
-  }
-  public function getTotalUpdatedCells()
-  {
-    return $this->totalUpdatedCells;
-  }
-  public function setTotalUpdatedColumns($totalUpdatedColumns)
-  {
-    $this->totalUpdatedColumns = $totalUpdatedColumns;
-  }
-  public function getTotalUpdatedColumns()
-  {
-    return $this->totalUpdatedColumns;
-  }
-  public function setTotalUpdatedRows($totalUpdatedRows)
-  {
-    $this->totalUpdatedRows = $totalUpdatedRows;
-  }
-  public function getTotalUpdatedRows()
-  {
-    return $this->totalUpdatedRows;
-  }
-  public function setTotalUpdatedSheets($totalUpdatedSheets)
-  {
-    $this->totalUpdatedSheets = $totalUpdatedSheets;
-  }
-  public function getTotalUpdatedSheets()
-  {
-    return $this->totalUpdatedSheets;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Sheets/BooleanCondition.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Sheets/BooleanCondition.php
deleted file mode 100644
index d180587f..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Sheets/BooleanCondition.php
+++ /dev/null
@@ -1,41 +0,0 @@
-type = $type;
-  }
-  public function getType()
-  {
-    return $this->type;
-  }
-  public function setValues($values)
-  {
-    $this->values = $values;
-  }
-  public function getValues()
-  {
-    return $this->values;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Sheets/BooleanRule.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Sheets/BooleanRule.php
deleted file mode 100644
index d24200bb..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Sheets/BooleanRule.php
+++ /dev/null
@@ -1,41 +0,0 @@
-condition = $condition;
-  }
-  public function getCondition()
-  {
-    return $this->condition;
-  }
-  public function setFormat(Google_Service_Sheets_CellFormat $format)
-  {
-    $this->format = $format;
-  }
-  public function getFormat()
-  {
-    return $this->format;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Sheets/Border.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Sheets/Border.php
deleted file mode 100644
index 9ddbfc0e..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Sheets/Border.php
+++ /dev/null
@@ -1,49 +0,0 @@
-color = $color;
-  }
-  public function getColor()
-  {
-    return $this->color;
-  }
-  public function setStyle($style)
-  {
-    $this->style = $style;
-  }
-  public function getStyle()
-  {
-    return $this->style;
-  }
-  public function setWidth($width)
-  {
-    $this->width = $width;
-  }
-  public function getWidth()
-  {
-    return $this->width;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Sheets/Borders.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Sheets/Borders.php
deleted file mode 100644
index 46308e90..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Sheets/Borders.php
+++ /dev/null
@@ -1,61 +0,0 @@
-bottom = $bottom;
-  }
-  public function getBottom()
-  {
-    return $this->bottom;
-  }
-  public function setLeft(Google_Service_Sheets_Border $left)
-  {
-    $this->left = $left;
-  }
-  public function getLeft()
-  {
-    return $this->left;
-  }
-  public function setRight(Google_Service_Sheets_Border $right)
-  {
-    $this->right = $right;
-  }
-  public function getRight()
-  {
-    return $this->right;
-  }
-  public function setTop(Google_Service_Sheets_Border $top)
-  {
-    $this->top = $top;
-  }
-  public function getTop()
-  {
-    return $this->top;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Sheets/CellData.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Sheets/CellData.php
deleted file mode 100644
index 737155c9..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Sheets/CellData.php
+++ /dev/null
@@ -1,119 +0,0 @@
-dataValidation = $dataValidation;
-  }
-  public function getDataValidation()
-  {
-    return $this->dataValidation;
-  }
-  public function setEffectiveFormat(Google_Service_Sheets_CellFormat $effectiveFormat)
-  {
-    $this->effectiveFormat = $effectiveFormat;
-  }
-  public function getEffectiveFormat()
-  {
-    return $this->effectiveFormat;
-  }
-  public function setEffectiveValue(Google_Service_Sheets_ExtendedValue $effectiveValue)
-  {
-    $this->effectiveValue = $effectiveValue;
-  }
-  public function getEffectiveValue()
-  {
-    return $this->effectiveValue;
-  }
-  public function setFormattedValue($formattedValue)
-  {
-    $this->formattedValue = $formattedValue;
-  }
-  public function getFormattedValue()
-  {
-    return $this->formattedValue;
-  }
-  public function setHyperlink($hyperlink)
-  {
-    $this->hyperlink = $hyperlink;
-  }
-  public function getHyperlink()
-  {
-    return $this->hyperlink;
-  }
-  public function setNote($note)
-  {
-    $this->note = $note;
-  }
-  public function getNote()
-  {
-    return $this->note;
-  }
-  public function setPivotTable(Google_Service_Sheets_PivotTable $pivotTable)
-  {
-    $this->pivotTable = $pivotTable;
-  }
-  public function getPivotTable()
-  {
-    return $this->pivotTable;
-  }
-  public function setTextFormatRuns($textFormatRuns)
-  {
-    $this->textFormatRuns = $textFormatRuns;
-  }
-  public function getTextFormatRuns()
-  {
-    return $this->textFormatRuns;
-  }
-  public function setUserEnteredFormat(Google_Service_Sheets_CellFormat $userEnteredFormat)
-  {
-    $this->userEnteredFormat = $userEnteredFormat;
-  }
-  public function getUserEnteredFormat()
-  {
-    return $this->userEnteredFormat;
-  }
-  public function setUserEnteredValue(Google_Service_Sheets_ExtendedValue $userEnteredValue)
-  {
-    $this->userEnteredValue = $userEnteredValue;
-  }
-  public function getUserEnteredValue()
-  {
-    return $this->userEnteredValue;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Sheets/CellFormat.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Sheets/CellFormat.php
deleted file mode 100644
index 395fb851..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Sheets/CellFormat.php
+++ /dev/null
@@ -1,126 +0,0 @@
-backgroundColor = $backgroundColor;
-  }
-  public function getBackgroundColor()
-  {
-    return $this->backgroundColor;
-  }
-  public function setBorders(Google_Service_Sheets_Borders $borders)
-  {
-    $this->borders = $borders;
-  }
-  public function getBorders()
-  {
-    return $this->borders;
-  }
-  public function setHorizontalAlignment($horizontalAlignment)
-  {
-    $this->horizontalAlignment = $horizontalAlignment;
-  }
-  public function getHorizontalAlignment()
-  {
-    return $this->horizontalAlignment;
-  }
-  public function setHyperlinkDisplayType($hyperlinkDisplayType)
-  {
-    $this->hyperlinkDisplayType = $hyperlinkDisplayType;
-  }
-  public function getHyperlinkDisplayType()
-  {
-    return $this->hyperlinkDisplayType;
-  }
-  public function setNumberFormat(Google_Service_Sheets_NumberFormat $numberFormat)
-  {
-    $this->numberFormat = $numberFormat;
-  }
-  public function getNumberFormat()
-  {
-    return $this->numberFormat;
-  }
-  public function setPadding(Google_Service_Sheets_Padding $padding)
-  {
-    $this->padding = $padding;
-  }
-  public function getPadding()
-  {
-    return $this->padding;
-  }
-  public function setTextDirection($textDirection)
-  {
-    $this->textDirection = $textDirection;
-  }
-  public function getTextDirection()
-  {
-    return $this->textDirection;
-  }
-  public function setTextFormat(Google_Service_Sheets_TextFormat $textFormat)
-  {
-    $this->textFormat = $textFormat;
-  }
-  public function getTextFormat()
-  {
-    return $this->textFormat;
-  }
-  public function setTextRotation(Google_Service_Sheets_TextRotation $textRotation)
-  {
-    $this->textRotation = $textRotation;
-  }
-  public function getTextRotation()
-  {
-    return $this->textRotation;
-  }
-  public function setVerticalAlignment($verticalAlignment)
-  {
-    $this->verticalAlignment = $verticalAlignment;
-  }
-  public function getVerticalAlignment()
-  {
-    return $this->verticalAlignment;
-  }
-  public function setWrapStrategy($wrapStrategy)
-  {
-    $this->wrapStrategy = $wrapStrategy;
-  }
-  public function getWrapStrategy()
-  {
-    return $this->wrapStrategy;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Sheets/ChartData.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Sheets/ChartData.php
deleted file mode 100644
index c9e96f12..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Sheets/ChartData.php
+++ /dev/null
@@ -1,31 +0,0 @@
-sourceRange = $sourceRange;
-  }
-  public function getSourceRange()
-  {
-    return $this->sourceRange;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Sheets/ChartSourceRange.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Sheets/ChartSourceRange.php
deleted file mode 100644
index b8be07ea..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Sheets/ChartSourceRange.php
+++ /dev/null
@@ -1,32 +0,0 @@
-sources = $sources;
-  }
-  public function getSources()
-  {
-    return $this->sources;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Sheets/ChartSpec.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Sheets/ChartSpec.php
deleted file mode 100644
index 44e0e944..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Sheets/ChartSpec.php
+++ /dev/null
@@ -1,59 +0,0 @@
-basicChart = $basicChart;
-  }
-  public function getBasicChart()
-  {
-    return $this->basicChart;
-  }
-  public function setHiddenDimensionStrategy($hiddenDimensionStrategy)
-  {
-    $this->hiddenDimensionStrategy = $hiddenDimensionStrategy;
-  }
-  public function getHiddenDimensionStrategy()
-  {
-    return $this->hiddenDimensionStrategy;
-  }
-  public function setPieChart(Google_Service_Sheets_PieChartSpec $pieChart)
-  {
-    $this->pieChart = $pieChart;
-  }
-  public function getPieChart()
-  {
-    return $this->pieChart;
-  }
-  public function setTitle($title)
-  {
-    $this->title = $title;
-  }
-  public function getTitle()
-  {
-    return $this->title;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Sheets/ClearBasicFilterRequest.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Sheets/ClearBasicFilterRequest.php
deleted file mode 100644
index e76fd116..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Sheets/ClearBasicFilterRequest.php
+++ /dev/null
@@ -1,30 +0,0 @@
-sheetId = $sheetId;
-  }
-  public function getSheetId()
-  {
-    return $this->sheetId;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Sheets/ClearValuesRequest.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Sheets/ClearValuesRequest.php
deleted file mode 100644
index f0d93815..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Sheets/ClearValuesRequest.php
+++ /dev/null
@@ -1,20 +0,0 @@
-clearedRange = $clearedRange;
-  }
-  public function getClearedRange()
-  {
-    return $this->clearedRange;
-  }
-  public function setSpreadsheetId($spreadsheetId)
-  {
-    $this->spreadsheetId = $spreadsheetId;
-  }
-  public function getSpreadsheetId()
-  {
-    return $this->spreadsheetId;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Sheets/Color.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Sheets/Color.php
deleted file mode 100644
index bd8732a1..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Sheets/Color.php
+++ /dev/null
@@ -1,57 +0,0 @@
-alpha = $alpha;
-  }
-  public function getAlpha()
-  {
-    return $this->alpha;
-  }
-  public function setBlue($blue)
-  {
-    $this->blue = $blue;
-  }
-  public function getBlue()
-  {
-    return $this->blue;
-  }
-  public function setGreen($green)
-  {
-    $this->green = $green;
-  }
-  public function getGreen()
-  {
-    return $this->green;
-  }
-  public function setRed($red)
-  {
-    $this->red = $red;
-  }
-  public function getRed()
-  {
-    return $this->red;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Sheets/ConditionValue.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Sheets/ConditionValue.php
deleted file mode 100644
index 6979ec2b..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Sheets/ConditionValue.php
+++ /dev/null
@@ -1,39 +0,0 @@
-relativeDate = $relativeDate;
-  }
-  public function getRelativeDate()
-  {
-    return $this->relativeDate;
-  }
-  public function setUserEnteredValue($userEnteredValue)
-  {
-    $this->userEnteredValue = $userEnteredValue;
-  }
-  public function getUserEnteredValue()
-  {
-    return $this->userEnteredValue;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Sheets/ConditionalFormatRule.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Sheets/ConditionalFormatRule.php
deleted file mode 100644
index 965429d9..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Sheets/ConditionalFormatRule.php
+++ /dev/null
@@ -1,52 +0,0 @@
-booleanRule = $booleanRule;
-  }
-  public function getBooleanRule()
-  {
-    return $this->booleanRule;
-  }
-  public function setGradientRule(Google_Service_Sheets_GradientRule $gradientRule)
-  {
-    $this->gradientRule = $gradientRule;
-  }
-  public function getGradientRule()
-  {
-    return $this->gradientRule;
-  }
-  public function setRanges($ranges)
-  {
-    $this->ranges = $ranges;
-  }
-  public function getRanges()
-  {
-    return $this->ranges;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Sheets/CopyPasteRequest.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Sheets/CopyPasteRequest.php
deleted file mode 100644
index a0a890ef..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Sheets/CopyPasteRequest.php
+++ /dev/null
@@ -1,59 +0,0 @@
-destination = $destination;
-  }
-  public function getDestination()
-  {
-    return $this->destination;
-  }
-  public function setPasteOrientation($pasteOrientation)
-  {
-    $this->pasteOrientation = $pasteOrientation;
-  }
-  public function getPasteOrientation()
-  {
-    return $this->pasteOrientation;
-  }
-  public function setPasteType($pasteType)
-  {
-    $this->pasteType = $pasteType;
-  }
-  public function getPasteType()
-  {
-    return $this->pasteType;
-  }
-  public function setSource(Google_Service_Sheets_GridRange $source)
-  {
-    $this->source = $source;
-  }
-  public function getSource()
-  {
-    return $this->source;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Sheets/CopySheetToAnotherSpreadsheetRequest.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Sheets/CopySheetToAnotherSpreadsheetRequest.php
deleted file mode 100644
index 13a56b1a..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Sheets/CopySheetToAnotherSpreadsheetRequest.php
+++ /dev/null
@@ -1,30 +0,0 @@
-destinationSpreadsheetId = $destinationSpreadsheetId;
-  }
-  public function getDestinationSpreadsheetId()
-  {
-    return $this->destinationSpreadsheetId;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Sheets/CutPasteRequest.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Sheets/CutPasteRequest.php
deleted file mode 100644
index 8e3a2e05..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Sheets/CutPasteRequest.php
+++ /dev/null
@@ -1,50 +0,0 @@
-destination = $destination;
-  }
-  public function getDestination()
-  {
-    return $this->destination;
-  }
-  public function setPasteType($pasteType)
-  {
-    $this->pasteType = $pasteType;
-  }
-  public function getPasteType()
-  {
-    return $this->pasteType;
-  }
-  public function setSource(Google_Service_Sheets_GridRange $source)
-  {
-    $this->source = $source;
-  }
-  public function getSource()
-  {
-    return $this->source;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Sheets/DataValidationRule.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Sheets/DataValidationRule.php
deleted file mode 100644
index 35aba97d..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Sheets/DataValidationRule.php
+++ /dev/null
@@ -1,58 +0,0 @@
-condition = $condition;
-  }
-  public function getCondition()
-  {
-    return $this->condition;
-  }
-  public function setInputMessage($inputMessage)
-  {
-    $this->inputMessage = $inputMessage;
-  }
-  public function getInputMessage()
-  {
-    return $this->inputMessage;
-  }
-  public function setShowCustomUi($showCustomUi)
-  {
-    $this->showCustomUi = $showCustomUi;
-  }
-  public function getShowCustomUi()
-  {
-    return $this->showCustomUi;
-  }
-  public function setStrict($strict)
-  {
-    $this->strict = $strict;
-  }
-  public function getStrict()
-  {
-    return $this->strict;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Sheets/DeleteBandingRequest.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Sheets/DeleteBandingRequest.php
deleted file mode 100644
index 71463ac3..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Sheets/DeleteBandingRequest.php
+++ /dev/null
@@ -1,30 +0,0 @@
-bandedRangeId = $bandedRangeId;
-  }
-  public function getBandedRangeId()
-  {
-    return $this->bandedRangeId;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Sheets/DeleteConditionalFormatRuleRequest.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Sheets/DeleteConditionalFormatRuleRequest.php
deleted file mode 100644
index 971327a5..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Sheets/DeleteConditionalFormatRuleRequest.php
+++ /dev/null
@@ -1,39 +0,0 @@
-index = $index;
-  }
-  public function getIndex()
-  {
-    return $this->index;
-  }
-  public function setSheetId($sheetId)
-  {
-    $this->sheetId = $sheetId;
-  }
-  public function getSheetId()
-  {
-    return $this->sheetId;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Sheets/DeleteConditionalFormatRuleResponse.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Sheets/DeleteConditionalFormatRuleResponse.php
deleted file mode 100644
index 414f9c9a..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Sheets/DeleteConditionalFormatRuleResponse.php
+++ /dev/null
@@ -1,31 +0,0 @@
-rule = $rule;
-  }
-  public function getRule()
-  {
-    return $this->rule;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Sheets/DeleteDimensionRequest.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Sheets/DeleteDimensionRequest.php
deleted file mode 100644
index e0c79491..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Sheets/DeleteDimensionRequest.php
+++ /dev/null
@@ -1,31 +0,0 @@
-range = $range;
-  }
-  public function getRange()
-  {
-    return $this->range;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Sheets/DeleteEmbeddedObjectRequest.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Sheets/DeleteEmbeddedObjectRequest.php
deleted file mode 100644
index 9a056420..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Sheets/DeleteEmbeddedObjectRequest.php
+++ /dev/null
@@ -1,30 +0,0 @@
-objectId = $objectId;
-  }
-  public function getObjectId()
-  {
-    return $this->objectId;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Sheets/DeleteFilterViewRequest.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Sheets/DeleteFilterViewRequest.php
deleted file mode 100644
index 0be66871..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Sheets/DeleteFilterViewRequest.php
+++ /dev/null
@@ -1,30 +0,0 @@
-filterId = $filterId;
-  }
-  public function getFilterId()
-  {
-    return $this->filterId;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Sheets/DeleteNamedRangeRequest.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Sheets/DeleteNamedRangeRequest.php
deleted file mode 100644
index 1296fbce..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Sheets/DeleteNamedRangeRequest.php
+++ /dev/null
@@ -1,30 +0,0 @@
-namedRangeId = $namedRangeId;
-  }
-  public function getNamedRangeId()
-  {
-    return $this->namedRangeId;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Sheets/DeleteProtectedRangeRequest.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Sheets/DeleteProtectedRangeRequest.php
deleted file mode 100644
index cf375b7c..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Sheets/DeleteProtectedRangeRequest.php
+++ /dev/null
@@ -1,30 +0,0 @@
-protectedRangeId = $protectedRangeId;
-  }
-  public function getProtectedRangeId()
-  {
-    return $this->protectedRangeId;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Sheets/DeleteRangeRequest.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Sheets/DeleteRangeRequest.php
deleted file mode 100644
index d90b01da..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Sheets/DeleteRangeRequest.php
+++ /dev/null
@@ -1,40 +0,0 @@
-range = $range;
-  }
-  public function getRange()
-  {
-    return $this->range;
-  }
-  public function setShiftDimension($shiftDimension)
-  {
-    $this->shiftDimension = $shiftDimension;
-  }
-  public function getShiftDimension()
-  {
-    return $this->shiftDimension;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Sheets/DeleteSheetRequest.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Sheets/DeleteSheetRequest.php
deleted file mode 100644
index 3ac8ffac..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Sheets/DeleteSheetRequest.php
+++ /dev/null
@@ -1,30 +0,0 @@
-sheetId = $sheetId;
-  }
-  public function getSheetId()
-  {
-    return $this->sheetId;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Sheets/DimensionProperties.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Sheets/DimensionProperties.php
deleted file mode 100644
index 154eb12e..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Sheets/DimensionProperties.php
+++ /dev/null
@@ -1,48 +0,0 @@
-hiddenByFilter = $hiddenByFilter;
-  }
-  public function getHiddenByFilter()
-  {
-    return $this->hiddenByFilter;
-  }
-  public function setHiddenByUser($hiddenByUser)
-  {
-    $this->hiddenByUser = $hiddenByUser;
-  }
-  public function getHiddenByUser()
-  {
-    return $this->hiddenByUser;
-  }
-  public function setPixelSize($pixelSize)
-  {
-    $this->pixelSize = $pixelSize;
-  }
-  public function getPixelSize()
-  {
-    return $this->pixelSize;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Sheets/DimensionRange.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Sheets/DimensionRange.php
deleted file mode 100644
index b21351a4..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Sheets/DimensionRange.php
+++ /dev/null
@@ -1,57 +0,0 @@
-dimension = $dimension;
-  }
-  public function getDimension()
-  {
-    return $this->dimension;
-  }
-  public function setEndIndex($endIndex)
-  {
-    $this->endIndex = $endIndex;
-  }
-  public function getEndIndex()
-  {
-    return $this->endIndex;
-  }
-  public function setSheetId($sheetId)
-  {
-    $this->sheetId = $sheetId;
-  }
-  public function getSheetId()
-  {
-    return $this->sheetId;
-  }
-  public function setStartIndex($startIndex)
-  {
-    $this->startIndex = $startIndex;
-  }
-  public function getStartIndex()
-  {
-    return $this->startIndex;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Sheets/DuplicateFilterViewRequest.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Sheets/DuplicateFilterViewRequest.php
deleted file mode 100644
index c9c1366d..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Sheets/DuplicateFilterViewRequest.php
+++ /dev/null
@@ -1,30 +0,0 @@
-filterId = $filterId;
-  }
-  public function getFilterId()
-  {
-    return $this->filterId;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Sheets/DuplicateFilterViewResponse.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Sheets/DuplicateFilterViewResponse.php
deleted file mode 100644
index d220cfa7..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Sheets/DuplicateFilterViewResponse.php
+++ /dev/null
@@ -1,31 +0,0 @@
-filter = $filter;
-  }
-  public function getFilter()
-  {
-    return $this->filter;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Sheets/DuplicateSheetRequest.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Sheets/DuplicateSheetRequest.php
deleted file mode 100644
index 80af6214..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Sheets/DuplicateSheetRequest.php
+++ /dev/null
@@ -1,57 +0,0 @@
-insertSheetIndex = $insertSheetIndex;
-  }
-  public function getInsertSheetIndex()
-  {
-    return $this->insertSheetIndex;
-  }
-  public function setNewSheetId($newSheetId)
-  {
-    $this->newSheetId = $newSheetId;
-  }
-  public function getNewSheetId()
-  {
-    return $this->newSheetId;
-  }
-  public function setNewSheetName($newSheetName)
-  {
-    $this->newSheetName = $newSheetName;
-  }
-  public function getNewSheetName()
-  {
-    return $this->newSheetName;
-  }
-  public function setSourceSheetId($sourceSheetId)
-  {
-    $this->sourceSheetId = $sourceSheetId;
-  }
-  public function getSourceSheetId()
-  {
-    return $this->sourceSheetId;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Sheets/DuplicateSheetResponse.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Sheets/DuplicateSheetResponse.php
deleted file mode 100644
index 0080c3b2..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Sheets/DuplicateSheetResponse.php
+++ /dev/null
@@ -1,31 +0,0 @@
-properties = $properties;
-  }
-  public function getProperties()
-  {
-    return $this->properties;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Sheets/Editors.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Sheets/Editors.php
deleted file mode 100644
index 0fd13e5c..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Sheets/Editors.php
+++ /dev/null
@@ -1,49 +0,0 @@
-domainUsersCanEdit = $domainUsersCanEdit;
-  }
-  public function getDomainUsersCanEdit()
-  {
-    return $this->domainUsersCanEdit;
-  }
-  public function setGroups($groups)
-  {
-    $this->groups = $groups;
-  }
-  public function getGroups()
-  {
-    return $this->groups;
-  }
-  public function setUsers($users)
-  {
-    $this->users = $users;
-  }
-  public function getUsers()
-  {
-    return $this->users;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Sheets/EmbeddedChart.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Sheets/EmbeddedChart.php
deleted file mode 100644
index e727fb51..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Sheets/EmbeddedChart.php
+++ /dev/null
@@ -1,50 +0,0 @@
-chartId = $chartId;
-  }
-  public function getChartId()
-  {
-    return $this->chartId;
-  }
-  public function setPosition(Google_Service_Sheets_EmbeddedObjectPosition $position)
-  {
-    $this->position = $position;
-  }
-  public function getPosition()
-  {
-    return $this->position;
-  }
-  public function setSpec(Google_Service_Sheets_ChartSpec $spec)
-  {
-    $this->spec = $spec;
-  }
-  public function getSpec()
-  {
-    return $this->spec;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Sheets/EmbeddedObjectPosition.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Sheets/EmbeddedObjectPosition.php
deleted file mode 100644
index 96363fd1..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Sheets/EmbeddedObjectPosition.php
+++ /dev/null
@@ -1,49 +0,0 @@
-newSheet = $newSheet;
-  }
-  public function getNewSheet()
-  {
-    return $this->newSheet;
-  }
-  public function setOverlayPosition(Google_Service_Sheets_OverlayPosition $overlayPosition)
-  {
-    $this->overlayPosition = $overlayPosition;
-  }
-  public function getOverlayPosition()
-  {
-    return $this->overlayPosition;
-  }
-  public function setSheetId($sheetId)
-  {
-    $this->sheetId = $sheetId;
-  }
-  public function getSheetId()
-  {
-    return $this->sheetId;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Sheets/ErrorValue.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Sheets/ErrorValue.php
deleted file mode 100644
index 0686b232..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Sheets/ErrorValue.php
+++ /dev/null
@@ -1,39 +0,0 @@
-message = $message;
-  }
-  public function getMessage()
-  {
-    return $this->message;
-  }
-  public function setType($type)
-  {
-    $this->type = $type;
-  }
-  public function getType()
-  {
-    return $this->type;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Sheets/ExtendedValue.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Sheets/ExtendedValue.php
deleted file mode 100644
index 96423d65..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Sheets/ExtendedValue.php
+++ /dev/null
@@ -1,67 +0,0 @@
-boolValue = $boolValue;
-  }
-  public function getBoolValue()
-  {
-    return $this->boolValue;
-  }
-  public function setErrorValue(Google_Service_Sheets_ErrorValue $errorValue)
-  {
-    $this->errorValue = $errorValue;
-  }
-  public function getErrorValue()
-  {
-    return $this->errorValue;
-  }
-  public function setFormulaValue($formulaValue)
-  {
-    $this->formulaValue = $formulaValue;
-  }
-  public function getFormulaValue()
-  {
-    return $this->formulaValue;
-  }
-  public function setNumberValue($numberValue)
-  {
-    $this->numberValue = $numberValue;
-  }
-  public function getNumberValue()
-  {
-    return $this->numberValue;
-  }
-  public function setStringValue($stringValue)
-  {
-    $this->stringValue = $stringValue;
-  }
-  public function getStringValue()
-  {
-    return $this->stringValue;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Sheets/FilterCriteria.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Sheets/FilterCriteria.php
deleted file mode 100644
index 2760f2b9..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Sheets/FilterCriteria.php
+++ /dev/null
@@ -1,41 +0,0 @@
-condition = $condition;
-  }
-  public function getCondition()
-  {
-    return $this->condition;
-  }
-  public function setHiddenValues($hiddenValues)
-  {
-    $this->hiddenValues = $hiddenValues;
-  }
-  public function getHiddenValues()
-  {
-    return $this->hiddenValues;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Sheets/FilterView.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Sheets/FilterView.php
deleted file mode 100644
index 0a498f75..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Sheets/FilterView.php
+++ /dev/null
@@ -1,79 +0,0 @@
-criteria = $criteria;
-  }
-  public function getCriteria()
-  {
-    return $this->criteria;
-  }
-  public function setFilterViewId($filterViewId)
-  {
-    $this->filterViewId = $filterViewId;
-  }
-  public function getFilterViewId()
-  {
-    return $this->filterViewId;
-  }
-  public function setNamedRangeId($namedRangeId)
-  {
-    $this->namedRangeId = $namedRangeId;
-  }
-  public function getNamedRangeId()
-  {
-    return $this->namedRangeId;
-  }
-  public function setRange(Google_Service_Sheets_GridRange $range)
-  {
-    $this->range = $range;
-  }
-  public function getRange()
-  {
-    return $this->range;
-  }
-  public function setSortSpecs($sortSpecs)
-  {
-    $this->sortSpecs = $sortSpecs;
-  }
-  public function getSortSpecs()
-  {
-    return $this->sortSpecs;
-  }
-  public function setTitle($title)
-  {
-    $this->title = $title;
-  }
-  public function getTitle()
-  {
-    return $this->title;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Sheets/FindReplaceRequest.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Sheets/FindReplaceRequest.php
deleted file mode 100644
index 73202ce6..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Sheets/FindReplaceRequest.php
+++ /dev/null
@@ -1,103 +0,0 @@
-allSheets = $allSheets;
-  }
-  public function getAllSheets()
-  {
-    return $this->allSheets;
-  }
-  public function setFind($find)
-  {
-    $this->find = $find;
-  }
-  public function getFind()
-  {
-    return $this->find;
-  }
-  public function setIncludeFormulas($includeFormulas)
-  {
-    $this->includeFormulas = $includeFormulas;
-  }
-  public function getIncludeFormulas()
-  {
-    return $this->includeFormulas;
-  }
-  public function setMatchCase($matchCase)
-  {
-    $this->matchCase = $matchCase;
-  }
-  public function getMatchCase()
-  {
-    return $this->matchCase;
-  }
-  public function setMatchEntireCell($matchEntireCell)
-  {
-    $this->matchEntireCell = $matchEntireCell;
-  }
-  public function getMatchEntireCell()
-  {
-    return $this->matchEntireCell;
-  }
-  public function setRange(Google_Service_Sheets_GridRange $range)
-  {
-    $this->range = $range;
-  }
-  public function getRange()
-  {
-    return $this->range;
-  }
-  public function setReplacement($replacement)
-  {
-    $this->replacement = $replacement;
-  }
-  public function getReplacement()
-  {
-    return $this->replacement;
-  }
-  public function setSearchByRegex($searchByRegex)
-  {
-    $this->searchByRegex = $searchByRegex;
-  }
-  public function getSearchByRegex()
-  {
-    return $this->searchByRegex;
-  }
-  public function setSheetId($sheetId)
-  {
-    $this->sheetId = $sheetId;
-  }
-  public function getSheetId()
-  {
-    return $this->sheetId;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Sheets/FindReplaceResponse.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Sheets/FindReplaceResponse.php
deleted file mode 100644
index 119767fc..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Sheets/FindReplaceResponse.php
+++ /dev/null
@@ -1,66 +0,0 @@
-formulasChanged = $formulasChanged;
-  }
-  public function getFormulasChanged()
-  {
-    return $this->formulasChanged;
-  }
-  public function setOccurrencesChanged($occurrencesChanged)
-  {
-    $this->occurrencesChanged = $occurrencesChanged;
-  }
-  public function getOccurrencesChanged()
-  {
-    return $this->occurrencesChanged;
-  }
-  public function setRowsChanged($rowsChanged)
-  {
-    $this->rowsChanged = $rowsChanged;
-  }
-  public function getRowsChanged()
-  {
-    return $this->rowsChanged;
-  }
-  public function setSheetsChanged($sheetsChanged)
-  {
-    $this->sheetsChanged = $sheetsChanged;
-  }
-  public function getSheetsChanged()
-  {
-    return $this->sheetsChanged;
-  }
-  public function setValuesChanged($valuesChanged)
-  {
-    $this->valuesChanged = $valuesChanged;
-  }
-  public function getValuesChanged()
-  {
-    return $this->valuesChanged;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Sheets/GradientRule.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Sheets/GradientRule.php
deleted file mode 100644
index f06f9cc6..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Sheets/GradientRule.php
+++ /dev/null
@@ -1,51 +0,0 @@
-maxpoint = $maxpoint;
-  }
-  public function getMaxpoint()
-  {
-    return $this->maxpoint;
-  }
-  public function setMidpoint(Google_Service_Sheets_InterpolationPoint $midpoint)
-  {
-    $this->midpoint = $midpoint;
-  }
-  public function getMidpoint()
-  {
-    return $this->midpoint;
-  }
-  public function setMinpoint(Google_Service_Sheets_InterpolationPoint $minpoint)
-  {
-    $this->minpoint = $minpoint;
-  }
-  public function getMinpoint()
-  {
-    return $this->minpoint;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Sheets/GridCoordinate.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Sheets/GridCoordinate.php
deleted file mode 100644
index c92c07bc..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Sheets/GridCoordinate.php
+++ /dev/null
@@ -1,48 +0,0 @@
-columnIndex = $columnIndex;
-  }
-  public function getColumnIndex()
-  {
-    return $this->columnIndex;
-  }
-  public function setRowIndex($rowIndex)
-  {
-    $this->rowIndex = $rowIndex;
-  }
-  public function getRowIndex()
-  {
-    return $this->rowIndex;
-  }
-  public function setSheetId($sheetId)
-  {
-    $this->sheetId = $sheetId;
-  }
-  public function getSheetId()
-  {
-    return $this->sheetId;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Sheets/GridData.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Sheets/GridData.php
deleted file mode 100644
index dcf624de..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Sheets/GridData.php
+++ /dev/null
@@ -1,70 +0,0 @@
-columnMetadata = $columnMetadata;
-  }
-  public function getColumnMetadata()
-  {
-    return $this->columnMetadata;
-  }
-  public function setRowData($rowData)
-  {
-    $this->rowData = $rowData;
-  }
-  public function getRowData()
-  {
-    return $this->rowData;
-  }
-  public function setRowMetadata($rowMetadata)
-  {
-    $this->rowMetadata = $rowMetadata;
-  }
-  public function getRowMetadata()
-  {
-    return $this->rowMetadata;
-  }
-  public function setStartColumn($startColumn)
-  {
-    $this->startColumn = $startColumn;
-  }
-  public function getStartColumn()
-  {
-    return $this->startColumn;
-  }
-  public function setStartRow($startRow)
-  {
-    $this->startRow = $startRow;
-  }
-  public function getStartRow()
-  {
-    return $this->startRow;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Sheets/GridProperties.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Sheets/GridProperties.php
deleted file mode 100644
index b6692ba8..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Sheets/GridProperties.php
+++ /dev/null
@@ -1,66 +0,0 @@
-columnCount = $columnCount;
-  }
-  public function getColumnCount()
-  {
-    return $this->columnCount;
-  }
-  public function setFrozenColumnCount($frozenColumnCount)
-  {
-    $this->frozenColumnCount = $frozenColumnCount;
-  }
-  public function getFrozenColumnCount()
-  {
-    return $this->frozenColumnCount;
-  }
-  public function setFrozenRowCount($frozenRowCount)
-  {
-    $this->frozenRowCount = $frozenRowCount;
-  }
-  public function getFrozenRowCount()
-  {
-    return $this->frozenRowCount;
-  }
-  public function setHideGridlines($hideGridlines)
-  {
-    $this->hideGridlines = $hideGridlines;
-  }
-  public function getHideGridlines()
-  {
-    return $this->hideGridlines;
-  }
-  public function setRowCount($rowCount)
-  {
-    $this->rowCount = $rowCount;
-  }
-  public function getRowCount()
-  {
-    return $this->rowCount;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Sheets/GridRange.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Sheets/GridRange.php
deleted file mode 100644
index 26c47b5c..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Sheets/GridRange.php
+++ /dev/null
@@ -1,66 +0,0 @@
-endColumnIndex = $endColumnIndex;
-  }
-  public function getEndColumnIndex()
-  {
-    return $this->endColumnIndex;
-  }
-  public function setEndRowIndex($endRowIndex)
-  {
-    $this->endRowIndex = $endRowIndex;
-  }
-  public function getEndRowIndex()
-  {
-    return $this->endRowIndex;
-  }
-  public function setSheetId($sheetId)
-  {
-    $this->sheetId = $sheetId;
-  }
-  public function getSheetId()
-  {
-    return $this->sheetId;
-  }
-  public function setStartColumnIndex($startColumnIndex)
-  {
-    $this->startColumnIndex = $startColumnIndex;
-  }
-  public function getStartColumnIndex()
-  {
-    return $this->startColumnIndex;
-  }
-  public function setStartRowIndex($startRowIndex)
-  {
-    $this->startRowIndex = $startRowIndex;
-  }
-  public function getStartRowIndex()
-  {
-    return $this->startRowIndex;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Sheets/InsertDimensionRequest.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Sheets/InsertDimensionRequest.php
deleted file mode 100644
index d8c4fb78..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Sheets/InsertDimensionRequest.php
+++ /dev/null
@@ -1,40 +0,0 @@
-inheritFromBefore = $inheritFromBefore;
-  }
-  public function getInheritFromBefore()
-  {
-    return $this->inheritFromBefore;
-  }
-  public function setRange(Google_Service_Sheets_DimensionRange $range)
-  {
-    $this->range = $range;
-  }
-  public function getRange()
-  {
-    return $this->range;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Sheets/InsertRangeRequest.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Sheets/InsertRangeRequest.php
deleted file mode 100644
index 4dace9db..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Sheets/InsertRangeRequest.php
+++ /dev/null
@@ -1,40 +0,0 @@
-range = $range;
-  }
-  public function getRange()
-  {
-    return $this->range;
-  }
-  public function setShiftDimension($shiftDimension)
-  {
-    $this->shiftDimension = $shiftDimension;
-  }
-  public function getShiftDimension()
-  {
-    return $this->shiftDimension;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Sheets/InterpolationPoint.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Sheets/InterpolationPoint.php
deleted file mode 100644
index 8468334f..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Sheets/InterpolationPoint.php
+++ /dev/null
@@ -1,49 +0,0 @@
-color = $color;
-  }
-  public function getColor()
-  {
-    return $this->color;
-  }
-  public function setType($type)
-  {
-    $this->type = $type;
-  }
-  public function getType()
-  {
-    return $this->type;
-  }
-  public function setValue($value)
-  {
-    $this->value = $value;
-  }
-  public function getValue()
-  {
-    return $this->value;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Sheets/IterativeCalculationSettings.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Sheets/IterativeCalculationSettings.php
deleted file mode 100644
index 297a42e7..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Sheets/IterativeCalculationSettings.php
+++ /dev/null
@@ -1,39 +0,0 @@
-convergenceThreshold = $convergenceThreshold;
-  }
-  public function getConvergenceThreshold()
-  {
-    return $this->convergenceThreshold;
-  }
-  public function setMaxIterations($maxIterations)
-  {
-    $this->maxIterations = $maxIterations;
-  }
-  public function getMaxIterations()
-  {
-    return $this->maxIterations;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Sheets/MergeCellsRequest.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Sheets/MergeCellsRequest.php
deleted file mode 100644
index 53a18342..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Sheets/MergeCellsRequest.php
+++ /dev/null
@@ -1,40 +0,0 @@
-mergeType = $mergeType;
-  }
-  public function getMergeType()
-  {
-    return $this->mergeType;
-  }
-  public function setRange(Google_Service_Sheets_GridRange $range)
-  {
-    $this->range = $range;
-  }
-  public function getRange()
-  {
-    return $this->range;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Sheets/MoveDimensionRequest.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Sheets/MoveDimensionRequest.php
deleted file mode 100644
index 21b409fe..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Sheets/MoveDimensionRequest.php
+++ /dev/null
@@ -1,40 +0,0 @@
-destinationIndex = $destinationIndex;
-  }
-  public function getDestinationIndex()
-  {
-    return $this->destinationIndex;
-  }
-  public function setSource(Google_Service_Sheets_DimensionRange $source)
-  {
-    $this->source = $source;
-  }
-  public function getSource()
-  {
-    return $this->source;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Sheets/NamedRange.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Sheets/NamedRange.php
deleted file mode 100644
index 5239c68f..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Sheets/NamedRange.php
+++ /dev/null
@@ -1,49 +0,0 @@
-name = $name;
-  }
-  public function getName()
-  {
-    return $this->name;
-  }
-  public function setNamedRangeId($namedRangeId)
-  {
-    $this->namedRangeId = $namedRangeId;
-  }
-  public function getNamedRangeId()
-  {
-    return $this->namedRangeId;
-  }
-  public function setRange(Google_Service_Sheets_GridRange $range)
-  {
-    $this->range = $range;
-  }
-  public function getRange()
-  {
-    return $this->range;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Sheets/NumberFormat.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Sheets/NumberFormat.php
deleted file mode 100644
index 52fcbc96..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Sheets/NumberFormat.php
+++ /dev/null
@@ -1,39 +0,0 @@
-pattern = $pattern;
-  }
-  public function getPattern()
-  {
-    return $this->pattern;
-  }
-  public function setType($type)
-  {
-    $this->type = $type;
-  }
-  public function getType()
-  {
-    return $this->type;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Sheets/OverlayPosition.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Sheets/OverlayPosition.php
deleted file mode 100644
index a7916097..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Sheets/OverlayPosition.php
+++ /dev/null
@@ -1,67 +0,0 @@
-anchorCell = $anchorCell;
-  }
-  public function getAnchorCell()
-  {
-    return $this->anchorCell;
-  }
-  public function setHeightPixels($heightPixels)
-  {
-    $this->heightPixels = $heightPixels;
-  }
-  public function getHeightPixels()
-  {
-    return $this->heightPixels;
-  }
-  public function setOffsetXPixels($offsetXPixels)
-  {
-    $this->offsetXPixels = $offsetXPixels;
-  }
-  public function getOffsetXPixels()
-  {
-    return $this->offsetXPixels;
-  }
-  public function setOffsetYPixels($offsetYPixels)
-  {
-    $this->offsetYPixels = $offsetYPixels;
-  }
-  public function getOffsetYPixels()
-  {
-    return $this->offsetYPixels;
-  }
-  public function setWidthPixels($widthPixels)
-  {
-    $this->widthPixels = $widthPixels;
-  }
-  public function getWidthPixels()
-  {
-    return $this->widthPixels;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Sheets/Padding.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Sheets/Padding.php
deleted file mode 100644
index 336a105e..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Sheets/Padding.php
+++ /dev/null
@@ -1,57 +0,0 @@
-bottom = $bottom;
-  }
-  public function getBottom()
-  {
-    return $this->bottom;
-  }
-  public function setLeft($left)
-  {
-    $this->left = $left;
-  }
-  public function getLeft()
-  {
-    return $this->left;
-  }
-  public function setRight($right)
-  {
-    $this->right = $right;
-  }
-  public function getRight()
-  {
-    return $this->right;
-  }
-  public function setTop($top)
-  {
-    $this->top = $top;
-  }
-  public function getTop()
-  {
-    return $this->top;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Sheets/PasteDataRequest.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Sheets/PasteDataRequest.php
deleted file mode 100644
index 877e6d30..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Sheets/PasteDataRequest.php
+++ /dev/null
@@ -1,67 +0,0 @@
-coordinate = $coordinate;
-  }
-  public function getCoordinate()
-  {
-    return $this->coordinate;
-  }
-  public function setData($data)
-  {
-    $this->data = $data;
-  }
-  public function getData()
-  {
-    return $this->data;
-  }
-  public function setDelimiter($delimiter)
-  {
-    $this->delimiter = $delimiter;
-  }
-  public function getDelimiter()
-  {
-    return $this->delimiter;
-  }
-  public function setHtml($html)
-  {
-    $this->html = $html;
-  }
-  public function getHtml()
-  {
-    return $this->html;
-  }
-  public function setType($type)
-  {
-    $this->type = $type;
-  }
-  public function getType()
-  {
-    return $this->type;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Sheets/PieChartSpec.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Sheets/PieChartSpec.php
deleted file mode 100644
index bca13294..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Sheets/PieChartSpec.php
+++ /dev/null
@@ -1,68 +0,0 @@
-domain = $domain;
-  }
-  public function getDomain()
-  {
-    return $this->domain;
-  }
-  public function setLegendPosition($legendPosition)
-  {
-    $this->legendPosition = $legendPosition;
-  }
-  public function getLegendPosition()
-  {
-    return $this->legendPosition;
-  }
-  public function setPieHole($pieHole)
-  {
-    $this->pieHole = $pieHole;
-  }
-  public function getPieHole()
-  {
-    return $this->pieHole;
-  }
-  public function setSeries(Google_Service_Sheets_ChartData $series)
-  {
-    $this->series = $series;
-  }
-  public function getSeries()
-  {
-    return $this->series;
-  }
-  public function setThreeDimensional($threeDimensional)
-  {
-    $this->threeDimensional = $threeDimensional;
-  }
-  public function getThreeDimensional()
-  {
-    return $this->threeDimensional;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Sheets/PivotFilterCriteria.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Sheets/PivotFilterCriteria.php
deleted file mode 100644
index 9d5aa1ee..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Sheets/PivotFilterCriteria.php
+++ /dev/null
@@ -1,31 +0,0 @@
-visibleValues = $visibleValues;
-  }
-  public function getVisibleValues()
-  {
-    return $this->visibleValues;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Sheets/PivotGroup.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Sheets/PivotGroup.php
deleted file mode 100644
index 9f50fa5e..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Sheets/PivotGroup.php
+++ /dev/null
@@ -1,69 +0,0 @@
-showTotals = $showTotals;
-  }
-  public function getShowTotals()
-  {
-    return $this->showTotals;
-  }
-  public function setSortOrder($sortOrder)
-  {
-    $this->sortOrder = $sortOrder;
-  }
-  public function getSortOrder()
-  {
-    return $this->sortOrder;
-  }
-  public function setSourceColumnOffset($sourceColumnOffset)
-  {
-    $this->sourceColumnOffset = $sourceColumnOffset;
-  }
-  public function getSourceColumnOffset()
-  {
-    return $this->sourceColumnOffset;
-  }
-  public function setValueBucket(Google_Service_Sheets_PivotGroupSortValueBucket $valueBucket)
-  {
-    $this->valueBucket = $valueBucket;
-  }
-  public function getValueBucket()
-  {
-    return $this->valueBucket;
-  }
-  public function setValueMetadata($valueMetadata)
-  {
-    $this->valueMetadata = $valueMetadata;
-  }
-  public function getValueMetadata()
-  {
-    return $this->valueMetadata;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Sheets/PivotGroupSortValueBucket.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Sheets/PivotGroupSortValueBucket.php
deleted file mode 100644
index 9d3457e6..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Sheets/PivotGroupSortValueBucket.php
+++ /dev/null
@@ -1,41 +0,0 @@
-buckets = $buckets;
-  }
-  public function getBuckets()
-  {
-    return $this->buckets;
-  }
-  public function setValuesIndex($valuesIndex)
-  {
-    $this->valuesIndex = $valuesIndex;
-  }
-  public function getValuesIndex()
-  {
-    return $this->valuesIndex;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Sheets/PivotGroupValueMetadata.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Sheets/PivotGroupValueMetadata.php
deleted file mode 100644
index 5b314d29..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Sheets/PivotGroupValueMetadata.php
+++ /dev/null
@@ -1,40 +0,0 @@
-collapsed = $collapsed;
-  }
-  public function getCollapsed()
-  {
-    return $this->collapsed;
-  }
-  public function setValue(Google_Service_Sheets_ExtendedValue $value)
-  {
-    $this->value = $value;
-  }
-  public function getValue()
-  {
-    return $this->value;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Sheets/PivotTable.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Sheets/PivotTable.php
deleted file mode 100644
index 3e45f9d1..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Sheets/PivotTable.php
+++ /dev/null
@@ -1,81 +0,0 @@
-columns = $columns;
-  }
-  public function getColumns()
-  {
-    return $this->columns;
-  }
-  public function setCriteria($criteria)
-  {
-    $this->criteria = $criteria;
-  }
-  public function getCriteria()
-  {
-    return $this->criteria;
-  }
-  public function setRows($rows)
-  {
-    $this->rows = $rows;
-  }
-  public function getRows()
-  {
-    return $this->rows;
-  }
-  public function setSource(Google_Service_Sheets_GridRange $source)
-  {
-    $this->source = $source;
-  }
-  public function getSource()
-  {
-    return $this->source;
-  }
-  public function setValueLayout($valueLayout)
-  {
-    $this->valueLayout = $valueLayout;
-  }
-  public function getValueLayout()
-  {
-    return $this->valueLayout;
-  }
-  public function setValues($values)
-  {
-    $this->values = $values;
-  }
-  public function getValues()
-  {
-    return $this->values;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Sheets/PivotValue.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Sheets/PivotValue.php
deleted file mode 100644
index 2e3312be..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Sheets/PivotValue.php
+++ /dev/null
@@ -1,57 +0,0 @@
-formula = $formula;
-  }
-  public function getFormula()
-  {
-    return $this->formula;
-  }
-  public function setName($name)
-  {
-    $this->name = $name;
-  }
-  public function getName()
-  {
-    return $this->name;
-  }
-  public function setSourceColumnOffset($sourceColumnOffset)
-  {
-    $this->sourceColumnOffset = $sourceColumnOffset;
-  }
-  public function getSourceColumnOffset()
-  {
-    return $this->sourceColumnOffset;
-  }
-  public function setSummarizeFunction($summarizeFunction)
-  {
-    $this->summarizeFunction = $summarizeFunction;
-  }
-  public function getSummarizeFunction()
-  {
-    return $this->summarizeFunction;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Sheets/ProtectedRange.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Sheets/ProtectedRange.php
deleted file mode 100644
index 4f3a364f..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Sheets/ProtectedRange.php
+++ /dev/null
@@ -1,97 +0,0 @@
-description = $description;
-  }
-  public function getDescription()
-  {
-    return $this->description;
-  }
-  public function setEditors(Google_Service_Sheets_Editors $editors)
-  {
-    $this->editors = $editors;
-  }
-  public function getEditors()
-  {
-    return $this->editors;
-  }
-  public function setNamedRangeId($namedRangeId)
-  {
-    $this->namedRangeId = $namedRangeId;
-  }
-  public function getNamedRangeId()
-  {
-    return $this->namedRangeId;
-  }
-  public function setProtectedRangeId($protectedRangeId)
-  {
-    $this->protectedRangeId = $protectedRangeId;
-  }
-  public function getProtectedRangeId()
-  {
-    return $this->protectedRangeId;
-  }
-  public function setRange(Google_Service_Sheets_GridRange $range)
-  {
-    $this->range = $range;
-  }
-  public function getRange()
-  {
-    return $this->range;
-  }
-  public function setRequestingUserCanEdit($requestingUserCanEdit)
-  {
-    $this->requestingUserCanEdit = $requestingUserCanEdit;
-  }
-  public function getRequestingUserCanEdit()
-  {
-    return $this->requestingUserCanEdit;
-  }
-  public function setUnprotectedRanges($unprotectedRanges)
-  {
-    $this->unprotectedRanges = $unprotectedRanges;
-  }
-  public function getUnprotectedRanges()
-  {
-    return $this->unprotectedRanges;
-  }
-  public function setWarningOnly($warningOnly)
-  {
-    $this->warningOnly = $warningOnly;
-  }
-  public function getWarningOnly()
-  {
-    return $this->warningOnly;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Sheets/RepeatCellRequest.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Sheets/RepeatCellRequest.php
deleted file mode 100644
index 9552256b..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Sheets/RepeatCellRequest.php
+++ /dev/null
@@ -1,50 +0,0 @@
-cell = $cell;
-  }
-  public function getCell()
-  {
-    return $this->cell;
-  }
-  public function setFields($fields)
-  {
-    $this->fields = $fields;
-  }
-  public function getFields()
-  {
-    return $this->fields;
-  }
-  public function setRange(Google_Service_Sheets_GridRange $range)
-  {
-    $this->range = $range;
-  }
-  public function getRange()
-  {
-    return $this->range;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Sheets/Request.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Sheets/Request.php
deleted file mode 100644
index 2165967f..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Sheets/Request.php
+++ /dev/null
@@ -1,511 +0,0 @@
-addBanding = $addBanding;
-  }
-  public function getAddBanding()
-  {
-    return $this->addBanding;
-  }
-  public function setAddChart(Google_Service_Sheets_AddChartRequest $addChart)
-  {
-    $this->addChart = $addChart;
-  }
-  public function getAddChart()
-  {
-    return $this->addChart;
-  }
-  public function setAddConditionalFormatRule(Google_Service_Sheets_AddConditionalFormatRuleRequest $addConditionalFormatRule)
-  {
-    $this->addConditionalFormatRule = $addConditionalFormatRule;
-  }
-  public function getAddConditionalFormatRule()
-  {
-    return $this->addConditionalFormatRule;
-  }
-  public function setAddFilterView(Google_Service_Sheets_AddFilterViewRequest $addFilterView)
-  {
-    $this->addFilterView = $addFilterView;
-  }
-  public function getAddFilterView()
-  {
-    return $this->addFilterView;
-  }
-  public function setAddNamedRange(Google_Service_Sheets_AddNamedRangeRequest $addNamedRange)
-  {
-    $this->addNamedRange = $addNamedRange;
-  }
-  public function getAddNamedRange()
-  {
-    return $this->addNamedRange;
-  }
-  public function setAddProtectedRange(Google_Service_Sheets_AddProtectedRangeRequest $addProtectedRange)
-  {
-    $this->addProtectedRange = $addProtectedRange;
-  }
-  public function getAddProtectedRange()
-  {
-    return $this->addProtectedRange;
-  }
-  public function setAddSheet(Google_Service_Sheets_AddSheetRequest $addSheet)
-  {
-    $this->addSheet = $addSheet;
-  }
-  public function getAddSheet()
-  {
-    return $this->addSheet;
-  }
-  public function setAppendCells(Google_Service_Sheets_AppendCellsRequest $appendCells)
-  {
-    $this->appendCells = $appendCells;
-  }
-  public function getAppendCells()
-  {
-    return $this->appendCells;
-  }
-  public function setAppendDimension(Google_Service_Sheets_AppendDimensionRequest $appendDimension)
-  {
-    $this->appendDimension = $appendDimension;
-  }
-  public function getAppendDimension()
-  {
-    return $this->appendDimension;
-  }
-  public function setAutoFill(Google_Service_Sheets_AutoFillRequest $autoFill)
-  {
-    $this->autoFill = $autoFill;
-  }
-  public function getAutoFill()
-  {
-    return $this->autoFill;
-  }
-  public function setAutoResizeDimensions(Google_Service_Sheets_AutoResizeDimensionsRequest $autoResizeDimensions)
-  {
-    $this->autoResizeDimensions = $autoResizeDimensions;
-  }
-  public function getAutoResizeDimensions()
-  {
-    return $this->autoResizeDimensions;
-  }
-  public function setClearBasicFilter(Google_Service_Sheets_ClearBasicFilterRequest $clearBasicFilter)
-  {
-    $this->clearBasicFilter = $clearBasicFilter;
-  }
-  public function getClearBasicFilter()
-  {
-    return $this->clearBasicFilter;
-  }
-  public function setCopyPaste(Google_Service_Sheets_CopyPasteRequest $copyPaste)
-  {
-    $this->copyPaste = $copyPaste;
-  }
-  public function getCopyPaste()
-  {
-    return $this->copyPaste;
-  }
-  public function setCutPaste(Google_Service_Sheets_CutPasteRequest $cutPaste)
-  {
-    $this->cutPaste = $cutPaste;
-  }
-  public function getCutPaste()
-  {
-    return $this->cutPaste;
-  }
-  public function setDeleteBanding(Google_Service_Sheets_DeleteBandingRequest $deleteBanding)
-  {
-    $this->deleteBanding = $deleteBanding;
-  }
-  public function getDeleteBanding()
-  {
-    return $this->deleteBanding;
-  }
-  public function setDeleteConditionalFormatRule(Google_Service_Sheets_DeleteConditionalFormatRuleRequest $deleteConditionalFormatRule)
-  {
-    $this->deleteConditionalFormatRule = $deleteConditionalFormatRule;
-  }
-  public function getDeleteConditionalFormatRule()
-  {
-    return $this->deleteConditionalFormatRule;
-  }
-  public function setDeleteDimension(Google_Service_Sheets_DeleteDimensionRequest $deleteDimension)
-  {
-    $this->deleteDimension = $deleteDimension;
-  }
-  public function getDeleteDimension()
-  {
-    return $this->deleteDimension;
-  }
-  public function setDeleteEmbeddedObject(Google_Service_Sheets_DeleteEmbeddedObjectRequest $deleteEmbeddedObject)
-  {
-    $this->deleteEmbeddedObject = $deleteEmbeddedObject;
-  }
-  public function getDeleteEmbeddedObject()
-  {
-    return $this->deleteEmbeddedObject;
-  }
-  public function setDeleteFilterView(Google_Service_Sheets_DeleteFilterViewRequest $deleteFilterView)
-  {
-    $this->deleteFilterView = $deleteFilterView;
-  }
-  public function getDeleteFilterView()
-  {
-    return $this->deleteFilterView;
-  }
-  public function setDeleteNamedRange(Google_Service_Sheets_DeleteNamedRangeRequest $deleteNamedRange)
-  {
-    $this->deleteNamedRange = $deleteNamedRange;
-  }
-  public function getDeleteNamedRange()
-  {
-    return $this->deleteNamedRange;
-  }
-  public function setDeleteProtectedRange(Google_Service_Sheets_DeleteProtectedRangeRequest $deleteProtectedRange)
-  {
-    $this->deleteProtectedRange = $deleteProtectedRange;
-  }
-  public function getDeleteProtectedRange()
-  {
-    return $this->deleteProtectedRange;
-  }
-  public function setDeleteRange(Google_Service_Sheets_DeleteRangeRequest $deleteRange)
-  {
-    $this->deleteRange = $deleteRange;
-  }
-  public function getDeleteRange()
-  {
-    return $this->deleteRange;
-  }
-  public function setDeleteSheet(Google_Service_Sheets_DeleteSheetRequest $deleteSheet)
-  {
-    $this->deleteSheet = $deleteSheet;
-  }
-  public function getDeleteSheet()
-  {
-    return $this->deleteSheet;
-  }
-  public function setDuplicateFilterView(Google_Service_Sheets_DuplicateFilterViewRequest $duplicateFilterView)
-  {
-    $this->duplicateFilterView = $duplicateFilterView;
-  }
-  public function getDuplicateFilterView()
-  {
-    return $this->duplicateFilterView;
-  }
-  public function setDuplicateSheet(Google_Service_Sheets_DuplicateSheetRequest $duplicateSheet)
-  {
-    $this->duplicateSheet = $duplicateSheet;
-  }
-  public function getDuplicateSheet()
-  {
-    return $this->duplicateSheet;
-  }
-  public function setFindReplace(Google_Service_Sheets_FindReplaceRequest $findReplace)
-  {
-    $this->findReplace = $findReplace;
-  }
-  public function getFindReplace()
-  {
-    return $this->findReplace;
-  }
-  public function setInsertDimension(Google_Service_Sheets_InsertDimensionRequest $insertDimension)
-  {
-    $this->insertDimension = $insertDimension;
-  }
-  public function getInsertDimension()
-  {
-    return $this->insertDimension;
-  }
-  public function setInsertRange(Google_Service_Sheets_InsertRangeRequest $insertRange)
-  {
-    $this->insertRange = $insertRange;
-  }
-  public function getInsertRange()
-  {
-    return $this->insertRange;
-  }
-  public function setMergeCells(Google_Service_Sheets_MergeCellsRequest $mergeCells)
-  {
-    $this->mergeCells = $mergeCells;
-  }
-  public function getMergeCells()
-  {
-    return $this->mergeCells;
-  }
-  public function setMoveDimension(Google_Service_Sheets_MoveDimensionRequest $moveDimension)
-  {
-    $this->moveDimension = $moveDimension;
-  }
-  public function getMoveDimension()
-  {
-    return $this->moveDimension;
-  }
-  public function setPasteData(Google_Service_Sheets_PasteDataRequest $pasteData)
-  {
-    $this->pasteData = $pasteData;
-  }
-  public function getPasteData()
-  {
-    return $this->pasteData;
-  }
-  public function setRepeatCell(Google_Service_Sheets_RepeatCellRequest $repeatCell)
-  {
-    $this->repeatCell = $repeatCell;
-  }
-  public function getRepeatCell()
-  {
-    return $this->repeatCell;
-  }
-  public function setSetBasicFilter(Google_Service_Sheets_SetBasicFilterRequest $setBasicFilter)
-  {
-    $this->setBasicFilter = $setBasicFilter;
-  }
-  public function getSetBasicFilter()
-  {
-    return $this->setBasicFilter;
-  }
-  public function setSetDataValidation(Google_Service_Sheets_SetDataValidationRequest $setDataValidation)
-  {
-    $this->setDataValidation = $setDataValidation;
-  }
-  public function getSetDataValidation()
-  {
-    return $this->setDataValidation;
-  }
-  public function setSortRange(Google_Service_Sheets_SortRangeRequest $sortRange)
-  {
-    $this->sortRange = $sortRange;
-  }
-  public function getSortRange()
-  {
-    return $this->sortRange;
-  }
-  public function setTextToColumns(Google_Service_Sheets_TextToColumnsRequest $textToColumns)
-  {
-    $this->textToColumns = $textToColumns;
-  }
-  public function getTextToColumns()
-  {
-    return $this->textToColumns;
-  }
-  public function setUnmergeCells(Google_Service_Sheets_UnmergeCellsRequest $unmergeCells)
-  {
-    $this->unmergeCells = $unmergeCells;
-  }
-  public function getUnmergeCells()
-  {
-    return $this->unmergeCells;
-  }
-  public function setUpdateBanding(Google_Service_Sheets_UpdateBandingRequest $updateBanding)
-  {
-    $this->updateBanding = $updateBanding;
-  }
-  public function getUpdateBanding()
-  {
-    return $this->updateBanding;
-  }
-  public function setUpdateBorders(Google_Service_Sheets_UpdateBordersRequest $updateBorders)
-  {
-    $this->updateBorders = $updateBorders;
-  }
-  public function getUpdateBorders()
-  {
-    return $this->updateBorders;
-  }
-  public function setUpdateCells(Google_Service_Sheets_UpdateCellsRequest $updateCells)
-  {
-    $this->updateCells = $updateCells;
-  }
-  public function getUpdateCells()
-  {
-    return $this->updateCells;
-  }
-  public function setUpdateChartSpec(Google_Service_Sheets_UpdateChartSpecRequest $updateChartSpec)
-  {
-    $this->updateChartSpec = $updateChartSpec;
-  }
-  public function getUpdateChartSpec()
-  {
-    return $this->updateChartSpec;
-  }
-  public function setUpdateConditionalFormatRule(Google_Service_Sheets_UpdateConditionalFormatRuleRequest $updateConditionalFormatRule)
-  {
-    $this->updateConditionalFormatRule = $updateConditionalFormatRule;
-  }
-  public function getUpdateConditionalFormatRule()
-  {
-    return $this->updateConditionalFormatRule;
-  }
-  public function setUpdateDimensionProperties(Google_Service_Sheets_UpdateDimensionPropertiesRequest $updateDimensionProperties)
-  {
-    $this->updateDimensionProperties = $updateDimensionProperties;
-  }
-  public function getUpdateDimensionProperties()
-  {
-    return $this->updateDimensionProperties;
-  }
-  public function setUpdateEmbeddedObjectPosition(Google_Service_Sheets_UpdateEmbeddedObjectPositionRequest $updateEmbeddedObjectPosition)
-  {
-    $this->updateEmbeddedObjectPosition = $updateEmbeddedObjectPosition;
-  }
-  public function getUpdateEmbeddedObjectPosition()
-  {
-    return $this->updateEmbeddedObjectPosition;
-  }
-  public function setUpdateFilterView(Google_Service_Sheets_UpdateFilterViewRequest $updateFilterView)
-  {
-    $this->updateFilterView = $updateFilterView;
-  }
-  public function getUpdateFilterView()
-  {
-    return $this->updateFilterView;
-  }
-  public function setUpdateNamedRange(Google_Service_Sheets_UpdateNamedRangeRequest $updateNamedRange)
-  {
-    $this->updateNamedRange = $updateNamedRange;
-  }
-  public function getUpdateNamedRange()
-  {
-    return $this->updateNamedRange;
-  }
-  public function setUpdateProtectedRange(Google_Service_Sheets_UpdateProtectedRangeRequest $updateProtectedRange)
-  {
-    $this->updateProtectedRange = $updateProtectedRange;
-  }
-  public function getUpdateProtectedRange()
-  {
-    return $this->updateProtectedRange;
-  }
-  public function setUpdateSheetProperties(Google_Service_Sheets_UpdateSheetPropertiesRequest $updateSheetProperties)
-  {
-    $this->updateSheetProperties = $updateSheetProperties;
-  }
-  public function getUpdateSheetProperties()
-  {
-    return $this->updateSheetProperties;
-  }
-  public function setUpdateSpreadsheetProperties(Google_Service_Sheets_UpdateSpreadsheetPropertiesRequest $updateSpreadsheetProperties)
-  {
-    $this->updateSpreadsheetProperties = $updateSpreadsheetProperties;
-  }
-  public function getUpdateSpreadsheetProperties()
-  {
-    return $this->updateSpreadsheetProperties;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Sheets/Resource/Spreadsheets.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Sheets/Resource/Spreadsheets.php
deleted file mode 100644
index 178f97ec..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Sheets/Resource/Spreadsheets.php
+++ /dev/null
@@ -1,106 +0,0 @@
-
- *   $sheetsService = new Google_Service_Sheets(...);
- *   $spreadsheets = $sheetsService->spreadsheets;
- *  
- */
-class Google_Service_Sheets_Resource_Spreadsheets extends Google_Service_Resource
-{
-  /**
-   * Applies one or more updates to the spreadsheet.
-   *
-   * Each request is validated before being applied. If any request is not valid
-   * then the entire request will fail and nothing will be applied.
-   *
-   * Some requests have replies to give you some information about how they are
-   * applied. The replies will mirror the requests.  For example, if you applied 4
-   * updates and the 3rd one had a reply, then the response will have 2 empty
-   * replies, the actual reply, and another empty reply, in that order.
-   *
-   * Due to the collaborative nature of spreadsheets, it is not guaranteed that
-   * the spreadsheet will reflect exactly your changes after this completes,
-   * however it is guaranteed that the updates in the request will be applied
-   * together atomically. Your changes may be altered with respect to collaborator
-   * changes. If there are no collaborators, the spreadsheet should reflect your
-   * changes. (spreadsheets.batchUpdate)
-   *
-   * @param string $spreadsheetId The spreadsheet to apply the updates to.
-   * @param Google_Service_Sheets_BatchUpdateSpreadsheetRequest $postBody
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Sheets_BatchUpdateSpreadsheetResponse
-   */
-  public function batchUpdate($spreadsheetId, Google_Service_Sheets_BatchUpdateSpreadsheetRequest $postBody, $optParams = array())
-  {
-    $params = array('spreadsheetId' => $spreadsheetId, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('batchUpdate', array($params), "Google_Service_Sheets_BatchUpdateSpreadsheetResponse");
-  }
-  /**
-   * Creates a spreadsheet, returning the newly created spreadsheet.
-   * (spreadsheets.create)
-   *
-   * @param Google_Service_Sheets_Spreadsheet $postBody
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Sheets_Spreadsheet
-   */
-  public function create(Google_Service_Sheets_Spreadsheet $postBody, $optParams = array())
-  {
-    $params = array('postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('create', array($params), "Google_Service_Sheets_Spreadsheet");
-  }
-  /**
-   * Returns the spreadsheet at the given ID. The caller must specify the
-   * spreadsheet ID.
-   *
-   * By default, data within grids will not be returned. You can include grid data
-   * one of two ways:
-   *
-   * * Specify a field mask listing your desired fields using the `fields` URL
-   * parameter in HTTP
-   *
-   * * Set the includeGridData URL parameter to true.  If a field mask is set, the
-   * `includeGridData` parameter is ignored
-   *
-   * For large spreadsheets, it is recommended to retrieve only the specific
-   * fields of the spreadsheet that you want.
-   *
-   * To retrieve only subsets of the spreadsheet, use the ranges URL parameter.
-   * Multiple ranges can be specified.  Limiting the range will return only the
-   * portions of the spreadsheet that intersect the requested ranges. Ranges are
-   * specified using A1 notation. (spreadsheets.get)
-   *
-   * @param string $spreadsheetId The spreadsheet to request.
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param string ranges The ranges to retrieve from the spreadsheet.
-   * @opt_param bool includeGridData True if grid data should be returned. This
-   * parameter is ignored if a field mask was set in the request.
-   * @return Google_Service_Sheets_Spreadsheet
-   */
-  public function get($spreadsheetId, $optParams = array())
-  {
-    $params = array('spreadsheetId' => $spreadsheetId);
-    $params = array_merge($params, $optParams);
-    return $this->call('get', array($params), "Google_Service_Sheets_Spreadsheet");
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Sheets/Resource/SpreadsheetsSheets.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Sheets/Resource/SpreadsheetsSheets.php
deleted file mode 100644
index 5714ae58..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Sheets/Resource/SpreadsheetsSheets.php
+++ /dev/null
@@ -1,45 +0,0 @@
-
- *   $sheetsService = new Google_Service_Sheets(...);
- *   $sheets = $sheetsService->sheets;
- *  
- */
-class Google_Service_Sheets_Resource_SpreadsheetsSheets extends Google_Service_Resource
-{
-  /**
-   * Copies a single sheet from a spreadsheet to another spreadsheet. Returns the
-   * properties of the newly created sheet. (sheets.copyTo)
-   *
-   * @param string $spreadsheetId The ID of the spreadsheet containing the sheet
-   * to copy.
-   * @param int $sheetId The ID of the sheet to copy.
-   * @param Google_Service_Sheets_CopySheetToAnotherSpreadsheetRequest $postBody
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Sheets_SheetProperties
-   */
-  public function copyTo($spreadsheetId, $sheetId, Google_Service_Sheets_CopySheetToAnotherSpreadsheetRequest $postBody, $optParams = array())
-  {
-    $params = array('spreadsheetId' => $spreadsheetId, 'sheetId' => $sheetId, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('copyTo', array($params), "Google_Service_Sheets_SheetProperties");
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Sheets/Resource/SpreadsheetsValues.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Sheets/Resource/SpreadsheetsValues.php
deleted file mode 100644
index c3482dd1..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Sheets/Resource/SpreadsheetsValues.php
+++ /dev/null
@@ -1,203 +0,0 @@
-
- *   $sheetsService = new Google_Service_Sheets(...);
- *   $values = $sheetsService->values;
- *  
- */
-class Google_Service_Sheets_Resource_SpreadsheetsValues extends Google_Service_Resource
-{
-  /**
-   * Appends values to a spreadsheet. The input range is used to search for
-   * existing data and find a "table" within that range. Values will be appended
-   * to the next row of the table, starting with the first column of the table.
-   * See the [guide](/sheets/api/guides/values#appending_values) and [sample
-   * code](/sheets/api/samples/writing#append_values) for specific details of how
-   * tables are detected and data is appended.
-   *
-   * The caller must specify the spreadsheet ID, range, and a valueInputOption.
-   * The `valueInputOption` only controls how the input data will be added to the
-   * sheet (column-wise or row-wise), it does not influence what cell the data
-   * starts being written to. (values.append)
-   *
-   * @param string $spreadsheetId The ID of the spreadsheet to update.
-   * @param string $range The A1 notation of a range to search for a logical table
-   * of data. Values will be appended after the last row of the table.
-   * @param Google_Service_Sheets_ValueRange $postBody
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param bool includeValuesInResponse Determines if the update response
-   * should include the values of the cells that were appended. By default,
-   * responses do not include the updated values.
-   * @opt_param string responseValueRenderOption Determines how values in the
-   * response should be rendered. The default render option is
-   * ValueRenderOption.FORMATTED_VALUE.
-   * @opt_param string insertDataOption How the input data should be inserted.
-   * @opt_param string valueInputOption How the input data should be interpreted.
-   * @opt_param string responseDateTimeRenderOption Determines how dates, times,
-   * and durations in the response should be rendered. This is ignored if
-   * response_value_render_option is FORMATTED_VALUE. The default dateTime render
-   * option is [DateTimeRenderOption.SERIAL_NUMBER].
-   * @return Google_Service_Sheets_AppendValuesResponse
-   */
-  public function append($spreadsheetId, $range, Google_Service_Sheets_ValueRange $postBody, $optParams = array())
-  {
-    $params = array('spreadsheetId' => $spreadsheetId, 'range' => $range, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('append', array($params), "Google_Service_Sheets_AppendValuesResponse");
-  }
-  /**
-   * Clears one or more ranges of values from a spreadsheet. The caller must
-   * specify the spreadsheet ID and one or more ranges. Only values are cleared --
-   * all other properties of the cell (such as formatting, data validation, etc..)
-   * are kept. (values.batchClear)
-   *
-   * @param string $spreadsheetId The ID of the spreadsheet to update.
-   * @param Google_Service_Sheets_BatchClearValuesRequest $postBody
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Sheets_BatchClearValuesResponse
-   */
-  public function batchClear($spreadsheetId, Google_Service_Sheets_BatchClearValuesRequest $postBody, $optParams = array())
-  {
-    $params = array('spreadsheetId' => $spreadsheetId, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('batchClear', array($params), "Google_Service_Sheets_BatchClearValuesResponse");
-  }
-  /**
-   * Returns one or more ranges of values from a spreadsheet. The caller must
-   * specify the spreadsheet ID and one or more ranges. (values.batchGet)
-   *
-   * @param string $spreadsheetId The ID of the spreadsheet to retrieve data from.
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param string valueRenderOption How values should be represented in the
-   * output. The default render option is ValueRenderOption.FORMATTED_VALUE.
-   * @opt_param string dateTimeRenderOption How dates, times, and durations should
-   * be represented in the output. This is ignored if value_render_option is
-   * FORMATTED_VALUE. The default dateTime render option is
-   * [DateTimeRenderOption.SERIAL_NUMBER].
-   * @opt_param string ranges The A1 notation of the values to retrieve.
-   * @opt_param string majorDimension The major dimension that results should use.
-   *
-   * For example, if the spreadsheet data is: `A1=1,B1=2,A2=3,B2=4`, then
-   * requesting `range=A1:B2,majorDimension=ROWS` will return `[[1,2],[3,4]]`,
-   * whereas requesting `range=A1:B2,majorDimension=COLUMNS` will return
-   * `[[1,3],[2,4]]`.
-   * @return Google_Service_Sheets_BatchGetValuesResponse
-   */
-  public function batchGet($spreadsheetId, $optParams = array())
-  {
-    $params = array('spreadsheetId' => $spreadsheetId);
-    $params = array_merge($params, $optParams);
-    return $this->call('batchGet', array($params), "Google_Service_Sheets_BatchGetValuesResponse");
-  }
-  /**
-   * Sets values in one or more ranges of a spreadsheet. The caller must specify
-   * the spreadsheet ID, a valueInputOption, and one or more ValueRanges.
-   * (values.batchUpdate)
-   *
-   * @param string $spreadsheetId The ID of the spreadsheet to update.
-   * @param Google_Service_Sheets_BatchUpdateValuesRequest $postBody
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Sheets_BatchUpdateValuesResponse
-   */
-  public function batchUpdate($spreadsheetId, Google_Service_Sheets_BatchUpdateValuesRequest $postBody, $optParams = array())
-  {
-    $params = array('spreadsheetId' => $spreadsheetId, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('batchUpdate', array($params), "Google_Service_Sheets_BatchUpdateValuesResponse");
-  }
-  /**
-   * Clears values from a spreadsheet. The caller must specify the spreadsheet ID
-   * and range. Only values are cleared -- all other properties of the cell (such
-   * as formatting, data validation, etc..) are kept. (values.clear)
-   *
-   * @param string $spreadsheetId The ID of the spreadsheet to update.
-   * @param string $range The A1 notation of the values to clear.
-   * @param Google_Service_Sheets_ClearValuesRequest $postBody
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Sheets_ClearValuesResponse
-   */
-  public function clear($spreadsheetId, $range, Google_Service_Sheets_ClearValuesRequest $postBody, $optParams = array())
-  {
-    $params = array('spreadsheetId' => $spreadsheetId, 'range' => $range, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('clear', array($params), "Google_Service_Sheets_ClearValuesResponse");
-  }
-  /**
-   * Returns a range of values from a spreadsheet. The caller must specify the
-   * spreadsheet ID and a range. (values.get)
-   *
-   * @param string $spreadsheetId The ID of the spreadsheet to retrieve data from.
-   * @param string $range The A1 notation of the values to retrieve.
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param string valueRenderOption How values should be represented in the
-   * output. The default render option is ValueRenderOption.FORMATTED_VALUE.
-   * @opt_param string dateTimeRenderOption How dates, times, and durations should
-   * be represented in the output. This is ignored if value_render_option is
-   * FORMATTED_VALUE. The default dateTime render option is
-   * [DateTimeRenderOption.SERIAL_NUMBER].
-   * @opt_param string majorDimension The major dimension that results should use.
-   *
-   * For example, if the spreadsheet data is: `A1=1,B1=2,A2=3,B2=4`, then
-   * requesting `range=A1:B2,majorDimension=ROWS` will return `[[1,2],[3,4]]`,
-   * whereas requesting `range=A1:B2,majorDimension=COLUMNS` will return
-   * `[[1,3],[2,4]]`.
-   * @return Google_Service_Sheets_ValueRange
-   */
-  public function get($spreadsheetId, $range, $optParams = array())
-  {
-    $params = array('spreadsheetId' => $spreadsheetId, 'range' => $range);
-    $params = array_merge($params, $optParams);
-    return $this->call('get', array($params), "Google_Service_Sheets_ValueRange");
-  }
-  /**
-   * Sets values in a range of a spreadsheet. The caller must specify the
-   * spreadsheet ID, range, and a valueInputOption. (values.update)
-   *
-   * @param string $spreadsheetId The ID of the spreadsheet to update.
-   * @param string $range The A1 notation of the values to update.
-   * @param Google_Service_Sheets_ValueRange $postBody
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param string responseValueRenderOption Determines how values in the
-   * response should be rendered. The default render option is
-   * ValueRenderOption.FORMATTED_VALUE.
-   * @opt_param string valueInputOption How the input data should be interpreted.
-   * @opt_param string responseDateTimeRenderOption Determines how dates, times,
-   * and durations in the response should be rendered. This is ignored if
-   * response_value_render_option is FORMATTED_VALUE. The default dateTime render
-   * option is [DateTimeRenderOption.SERIAL_NUMBER].
-   * @opt_param bool includeValuesInResponse Determines if the update response
-   * should include the values of the cells that were updated. By default,
-   * responses do not include the updated values. If the range to write was larger
-   * than than the range actually written, the response will include all values in
-   * the requested range (excluding trailing empty rows and columns).
-   * @return Google_Service_Sheets_UpdateValuesResponse
-   */
-  public function update($spreadsheetId, $range, Google_Service_Sheets_ValueRange $postBody, $optParams = array())
-  {
-    $params = array('spreadsheetId' => $spreadsheetId, 'range' => $range, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('update', array($params), "Google_Service_Sheets_UpdateValuesResponse");
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Sheets/Response.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Sheets/Response.php
deleted file mode 100644
index 2b0e0733..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Sheets/Response.php
+++ /dev/null
@@ -1,141 +0,0 @@
-addBanding = $addBanding;
-  }
-  public function getAddBanding()
-  {
-    return $this->addBanding;
-  }
-  public function setAddChart(Google_Service_Sheets_AddChartResponse $addChart)
-  {
-    $this->addChart = $addChart;
-  }
-  public function getAddChart()
-  {
-    return $this->addChart;
-  }
-  public function setAddFilterView(Google_Service_Sheets_AddFilterViewResponse $addFilterView)
-  {
-    $this->addFilterView = $addFilterView;
-  }
-  public function getAddFilterView()
-  {
-    return $this->addFilterView;
-  }
-  public function setAddNamedRange(Google_Service_Sheets_AddNamedRangeResponse $addNamedRange)
-  {
-    $this->addNamedRange = $addNamedRange;
-  }
-  public function getAddNamedRange()
-  {
-    return $this->addNamedRange;
-  }
-  public function setAddProtectedRange(Google_Service_Sheets_AddProtectedRangeResponse $addProtectedRange)
-  {
-    $this->addProtectedRange = $addProtectedRange;
-  }
-  public function getAddProtectedRange()
-  {
-    return $this->addProtectedRange;
-  }
-  public function setAddSheet(Google_Service_Sheets_AddSheetResponse $addSheet)
-  {
-    $this->addSheet = $addSheet;
-  }
-  public function getAddSheet()
-  {
-    return $this->addSheet;
-  }
-  public function setDeleteConditionalFormatRule(Google_Service_Sheets_DeleteConditionalFormatRuleResponse $deleteConditionalFormatRule)
-  {
-    $this->deleteConditionalFormatRule = $deleteConditionalFormatRule;
-  }
-  public function getDeleteConditionalFormatRule()
-  {
-    return $this->deleteConditionalFormatRule;
-  }
-  public function setDuplicateFilterView(Google_Service_Sheets_DuplicateFilterViewResponse $duplicateFilterView)
-  {
-    $this->duplicateFilterView = $duplicateFilterView;
-  }
-  public function getDuplicateFilterView()
-  {
-    return $this->duplicateFilterView;
-  }
-  public function setDuplicateSheet(Google_Service_Sheets_DuplicateSheetResponse $duplicateSheet)
-  {
-    $this->duplicateSheet = $duplicateSheet;
-  }
-  public function getDuplicateSheet()
-  {
-    return $this->duplicateSheet;
-  }
-  public function setFindReplace(Google_Service_Sheets_FindReplaceResponse $findReplace)
-  {
-    $this->findReplace = $findReplace;
-  }
-  public function getFindReplace()
-  {
-    return $this->findReplace;
-  }
-  public function setUpdateConditionalFormatRule(Google_Service_Sheets_UpdateConditionalFormatRuleResponse $updateConditionalFormatRule)
-  {
-    $this->updateConditionalFormatRule = $updateConditionalFormatRule;
-  }
-  public function getUpdateConditionalFormatRule()
-  {
-    return $this->updateConditionalFormatRule;
-  }
-  public function setUpdateEmbeddedObjectPosition(Google_Service_Sheets_UpdateEmbeddedObjectPositionResponse $updateEmbeddedObjectPosition)
-  {
-    $this->updateEmbeddedObjectPosition = $updateEmbeddedObjectPosition;
-  }
-  public function getUpdateEmbeddedObjectPosition()
-  {
-    return $this->updateEmbeddedObjectPosition;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Sheets/RowData.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Sheets/RowData.php
deleted file mode 100644
index 63a44c67..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Sheets/RowData.php
+++ /dev/null
@@ -1,32 +0,0 @@
-values = $values;
-  }
-  public function getValues()
-  {
-    return $this->values;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Sheets/SetBasicFilterRequest.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Sheets/SetBasicFilterRequest.php
deleted file mode 100644
index 86178726..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Sheets/SetBasicFilterRequest.php
+++ /dev/null
@@ -1,31 +0,0 @@
-filter = $filter;
-  }
-  public function getFilter()
-  {
-    return $this->filter;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Sheets/SetDataValidationRequest.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Sheets/SetDataValidationRequest.php
deleted file mode 100644
index d1264bcc..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Sheets/SetDataValidationRequest.php
+++ /dev/null
@@ -1,41 +0,0 @@
-range = $range;
-  }
-  public function getRange()
-  {
-    return $this->range;
-  }
-  public function setRule(Google_Service_Sheets_DataValidationRule $rule)
-  {
-    $this->rule = $rule;
-  }
-  public function getRule()
-  {
-    return $this->rule;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Sheets/Sheet.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Sheets/Sheet.php
deleted file mode 100644
index 8f6c92a1..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Sheets/Sheet.php
+++ /dev/null
@@ -1,112 +0,0 @@
-bandedRanges = $bandedRanges;
-  }
-  public function getBandedRanges()
-  {
-    return $this->bandedRanges;
-  }
-  public function setBasicFilter(Google_Service_Sheets_BasicFilter $basicFilter)
-  {
-    $this->basicFilter = $basicFilter;
-  }
-  public function getBasicFilter()
-  {
-    return $this->basicFilter;
-  }
-  public function setCharts($charts)
-  {
-    $this->charts = $charts;
-  }
-  public function getCharts()
-  {
-    return $this->charts;
-  }
-  public function setConditionalFormats($conditionalFormats)
-  {
-    $this->conditionalFormats = $conditionalFormats;
-  }
-  public function getConditionalFormats()
-  {
-    return $this->conditionalFormats;
-  }
-  public function setData($data)
-  {
-    $this->data = $data;
-  }
-  public function getData()
-  {
-    return $this->data;
-  }
-  public function setFilterViews($filterViews)
-  {
-    $this->filterViews = $filterViews;
-  }
-  public function getFilterViews()
-  {
-    return $this->filterViews;
-  }
-  public function setMerges($merges)
-  {
-    $this->merges = $merges;
-  }
-  public function getMerges()
-  {
-    return $this->merges;
-  }
-  public function setProperties(Google_Service_Sheets_SheetProperties $properties)
-  {
-    $this->properties = $properties;
-  }
-  public function getProperties()
-  {
-    return $this->properties;
-  }
-  public function setProtectedRanges($protectedRanges)
-  {
-    $this->protectedRanges = $protectedRanges;
-  }
-  public function getProtectedRanges()
-  {
-    return $this->protectedRanges;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Sheets/SheetProperties.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Sheets/SheetProperties.php
deleted file mode 100644
index e885b969..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Sheets/SheetProperties.php
+++ /dev/null
@@ -1,95 +0,0 @@
-gridProperties = $gridProperties;
-  }
-  public function getGridProperties()
-  {
-    return $this->gridProperties;
-  }
-  public function setHidden($hidden)
-  {
-    $this->hidden = $hidden;
-  }
-  public function getHidden()
-  {
-    return $this->hidden;
-  }
-  public function setIndex($index)
-  {
-    $this->index = $index;
-  }
-  public function getIndex()
-  {
-    return $this->index;
-  }
-  public function setRightToLeft($rightToLeft)
-  {
-    $this->rightToLeft = $rightToLeft;
-  }
-  public function getRightToLeft()
-  {
-    return $this->rightToLeft;
-  }
-  public function setSheetId($sheetId)
-  {
-    $this->sheetId = $sheetId;
-  }
-  public function getSheetId()
-  {
-    return $this->sheetId;
-  }
-  public function setSheetType($sheetType)
-  {
-    $this->sheetType = $sheetType;
-  }
-  public function getSheetType()
-  {
-    return $this->sheetType;
-  }
-  public function setTabColor(Google_Service_Sheets_Color $tabColor)
-  {
-    $this->tabColor = $tabColor;
-  }
-  public function getTabColor()
-  {
-    return $this->tabColor;
-  }
-  public function setTitle($title)
-  {
-    $this->title = $title;
-  }
-  public function getTitle()
-  {
-    return $this->title;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Sheets/SortRangeRequest.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Sheets/SortRangeRequest.php
deleted file mode 100644
index 672ac463..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Sheets/SortRangeRequest.php
+++ /dev/null
@@ -1,42 +0,0 @@
-range = $range;
-  }
-  public function getRange()
-  {
-    return $this->range;
-  }
-  public function setSortSpecs($sortSpecs)
-  {
-    $this->sortSpecs = $sortSpecs;
-  }
-  public function getSortSpecs()
-  {
-    return $this->sortSpecs;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Sheets/SortSpec.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Sheets/SortSpec.php
deleted file mode 100644
index 23ca6643..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Sheets/SortSpec.php
+++ /dev/null
@@ -1,39 +0,0 @@
-dimensionIndex = $dimensionIndex;
-  }
-  public function getDimensionIndex()
-  {
-    return $this->dimensionIndex;
-  }
-  public function setSortOrder($sortOrder)
-  {
-    $this->sortOrder = $sortOrder;
-  }
-  public function getSortOrder()
-  {
-    return $this->sortOrder;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Sheets/SourceAndDestination.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Sheets/SourceAndDestination.php
deleted file mode 100644
index cc8ba7cc..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Sheets/SourceAndDestination.php
+++ /dev/null
@@ -1,49 +0,0 @@
-dimension = $dimension;
-  }
-  public function getDimension()
-  {
-    return $this->dimension;
-  }
-  public function setFillLength($fillLength)
-  {
-    $this->fillLength = $fillLength;
-  }
-  public function getFillLength()
-  {
-    return $this->fillLength;
-  }
-  public function setSource(Google_Service_Sheets_GridRange $source)
-  {
-    $this->source = $source;
-  }
-  public function getSource()
-  {
-    return $this->source;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Sheets/Spreadsheet.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Sheets/Spreadsheet.php
deleted file mode 100644
index deb06fce..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Sheets/Spreadsheet.php
+++ /dev/null
@@ -1,70 +0,0 @@
-namedRanges = $namedRanges;
-  }
-  public function getNamedRanges()
-  {
-    return $this->namedRanges;
-  }
-  public function setProperties(Google_Service_Sheets_SpreadsheetProperties $properties)
-  {
-    $this->properties = $properties;
-  }
-  public function getProperties()
-  {
-    return $this->properties;
-  }
-  public function setSheets($sheets)
-  {
-    $this->sheets = $sheets;
-  }
-  public function getSheets()
-  {
-    return $this->sheets;
-  }
-  public function setSpreadsheetId($spreadsheetId)
-  {
-    $this->spreadsheetId = $spreadsheetId;
-  }
-  public function getSpreadsheetId()
-  {
-    return $this->spreadsheetId;
-  }
-  public function setSpreadsheetUrl($spreadsheetUrl)
-  {
-    $this->spreadsheetUrl = $spreadsheetUrl;
-  }
-  public function getSpreadsheetUrl()
-  {
-    return $this->spreadsheetUrl;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Sheets/SpreadsheetProperties.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Sheets/SpreadsheetProperties.php
deleted file mode 100644
index 2b33c488..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Sheets/SpreadsheetProperties.php
+++ /dev/null
@@ -1,77 +0,0 @@
-autoRecalc = $autoRecalc;
-  }
-  public function getAutoRecalc()
-  {
-    return $this->autoRecalc;
-  }
-  public function setDefaultFormat(Google_Service_Sheets_CellFormat $defaultFormat)
-  {
-    $this->defaultFormat = $defaultFormat;
-  }
-  public function getDefaultFormat()
-  {
-    return $this->defaultFormat;
-  }
-  public function setIterativeCalculationSettings(Google_Service_Sheets_IterativeCalculationSettings $iterativeCalculationSettings)
-  {
-    $this->iterativeCalculationSettings = $iterativeCalculationSettings;
-  }
-  public function getIterativeCalculationSettings()
-  {
-    return $this->iterativeCalculationSettings;
-  }
-  public function setLocale($locale)
-  {
-    $this->locale = $locale;
-  }
-  public function getLocale()
-  {
-    return $this->locale;
-  }
-  public function setTimeZone($timeZone)
-  {
-    $this->timeZone = $timeZone;
-  }
-  public function getTimeZone()
-  {
-    return $this->timeZone;
-  }
-  public function setTitle($title)
-  {
-    $this->title = $title;
-  }
-  public function getTitle()
-  {
-    return $this->title;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Sheets/TextFormat.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Sheets/TextFormat.php
deleted file mode 100644
index c51a1828..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Sheets/TextFormat.php
+++ /dev/null
@@ -1,85 +0,0 @@
-bold = $bold;
-  }
-  public function getBold()
-  {
-    return $this->bold;
-  }
-  public function setFontFamily($fontFamily)
-  {
-    $this->fontFamily = $fontFamily;
-  }
-  public function getFontFamily()
-  {
-    return $this->fontFamily;
-  }
-  public function setFontSize($fontSize)
-  {
-    $this->fontSize = $fontSize;
-  }
-  public function getFontSize()
-  {
-    return $this->fontSize;
-  }
-  public function setForegroundColor(Google_Service_Sheets_Color $foregroundColor)
-  {
-    $this->foregroundColor = $foregroundColor;
-  }
-  public function getForegroundColor()
-  {
-    return $this->foregroundColor;
-  }
-  public function setItalic($italic)
-  {
-    $this->italic = $italic;
-  }
-  public function getItalic()
-  {
-    return $this->italic;
-  }
-  public function setStrikethrough($strikethrough)
-  {
-    $this->strikethrough = $strikethrough;
-  }
-  public function getStrikethrough()
-  {
-    return $this->strikethrough;
-  }
-  public function setUnderline($underline)
-  {
-    $this->underline = $underline;
-  }
-  public function getUnderline()
-  {
-    return $this->underline;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Sheets/TextFormatRun.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Sheets/TextFormatRun.php
deleted file mode 100644
index 7ee1c236..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Sheets/TextFormatRun.php
+++ /dev/null
@@ -1,40 +0,0 @@
-format = $format;
-  }
-  public function getFormat()
-  {
-    return $this->format;
-  }
-  public function setStartIndex($startIndex)
-  {
-    $this->startIndex = $startIndex;
-  }
-  public function getStartIndex()
-  {
-    return $this->startIndex;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Sheets/TextRotation.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Sheets/TextRotation.php
deleted file mode 100644
index 55f8902f..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Sheets/TextRotation.php
+++ /dev/null
@@ -1,39 +0,0 @@
-angle = $angle;
-  }
-  public function getAngle()
-  {
-    return $this->angle;
-  }
-  public function setVertical($vertical)
-  {
-    $this->vertical = $vertical;
-  }
-  public function getVertical()
-  {
-    return $this->vertical;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Sheets/TextToColumnsRequest.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Sheets/TextToColumnsRequest.php
deleted file mode 100644
index 4229cdc3..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Sheets/TextToColumnsRequest.php
+++ /dev/null
@@ -1,49 +0,0 @@
-delimiter = $delimiter;
-  }
-  public function getDelimiter()
-  {
-    return $this->delimiter;
-  }
-  public function setDelimiterType($delimiterType)
-  {
-    $this->delimiterType = $delimiterType;
-  }
-  public function getDelimiterType()
-  {
-    return $this->delimiterType;
-  }
-  public function setSource(Google_Service_Sheets_GridRange $source)
-  {
-    $this->source = $source;
-  }
-  public function getSource()
-  {
-    return $this->source;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Sheets/UnmergeCellsRequest.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Sheets/UnmergeCellsRequest.php
deleted file mode 100644
index c83ddb28..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Sheets/UnmergeCellsRequest.php
+++ /dev/null
@@ -1,31 +0,0 @@
-range = $range;
-  }
-  public function getRange()
-  {
-    return $this->range;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Sheets/UpdateBandingRequest.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Sheets/UpdateBandingRequest.php
deleted file mode 100644
index f4cea769..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Sheets/UpdateBandingRequest.php
+++ /dev/null
@@ -1,40 +0,0 @@
-bandedRange = $bandedRange;
-  }
-  public function getBandedRange()
-  {
-    return $this->bandedRange;
-  }
-  public function setFields($fields)
-  {
-    $this->fields = $fields;
-  }
-  public function getFields()
-  {
-    return $this->fields;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Sheets/UpdateBordersRequest.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Sheets/UpdateBordersRequest.php
deleted file mode 100644
index 18b53b3e..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Sheets/UpdateBordersRequest.php
+++ /dev/null
@@ -1,91 +0,0 @@
-bottom = $bottom;
-  }
-  public function getBottom()
-  {
-    return $this->bottom;
-  }
-  public function setInnerHorizontal(Google_Service_Sheets_Border $innerHorizontal)
-  {
-    $this->innerHorizontal = $innerHorizontal;
-  }
-  public function getInnerHorizontal()
-  {
-    return $this->innerHorizontal;
-  }
-  public function setInnerVertical(Google_Service_Sheets_Border $innerVertical)
-  {
-    $this->innerVertical = $innerVertical;
-  }
-  public function getInnerVertical()
-  {
-    return $this->innerVertical;
-  }
-  public function setLeft(Google_Service_Sheets_Border $left)
-  {
-    $this->left = $left;
-  }
-  public function getLeft()
-  {
-    return $this->left;
-  }
-  public function setRange(Google_Service_Sheets_GridRange $range)
-  {
-    $this->range = $range;
-  }
-  public function getRange()
-  {
-    return $this->range;
-  }
-  public function setRight(Google_Service_Sheets_Border $right)
-  {
-    $this->right = $right;
-  }
-  public function getRight()
-  {
-    return $this->right;
-  }
-  public function setTop(Google_Service_Sheets_Border $top)
-  {
-    $this->top = $top;
-  }
-  public function getTop()
-  {
-    return $this->top;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Sheets/UpdateCellsRequest.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Sheets/UpdateCellsRequest.php
deleted file mode 100644
index 6d629d30..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Sheets/UpdateCellsRequest.php
+++ /dev/null
@@ -1,61 +0,0 @@
-fields = $fields;
-  }
-  public function getFields()
-  {
-    return $this->fields;
-  }
-  public function setRange(Google_Service_Sheets_GridRange $range)
-  {
-    $this->range = $range;
-  }
-  public function getRange()
-  {
-    return $this->range;
-  }
-  public function setRows($rows)
-  {
-    $this->rows = $rows;
-  }
-  public function getRows()
-  {
-    return $this->rows;
-  }
-  public function setStart(Google_Service_Sheets_GridCoordinate $start)
-  {
-    $this->start = $start;
-  }
-  public function getStart()
-  {
-    return $this->start;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Sheets/UpdateChartSpecRequest.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Sheets/UpdateChartSpecRequest.php
deleted file mode 100644
index c40fd3fe..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Sheets/UpdateChartSpecRequest.php
+++ /dev/null
@@ -1,40 +0,0 @@
-chartId = $chartId;
-  }
-  public function getChartId()
-  {
-    return $this->chartId;
-  }
-  public function setSpec(Google_Service_Sheets_ChartSpec $spec)
-  {
-    $this->spec = $spec;
-  }
-  public function getSpec()
-  {
-    return $this->spec;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Sheets/UpdateConditionalFormatRuleRequest.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Sheets/UpdateConditionalFormatRuleRequest.php
deleted file mode 100644
index 10aefd7b..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Sheets/UpdateConditionalFormatRuleRequest.php
+++ /dev/null
@@ -1,58 +0,0 @@
-index = $index;
-  }
-  public function getIndex()
-  {
-    return $this->index;
-  }
-  public function setNewIndex($newIndex)
-  {
-    $this->newIndex = $newIndex;
-  }
-  public function getNewIndex()
-  {
-    return $this->newIndex;
-  }
-  public function setRule(Google_Service_Sheets_ConditionalFormatRule $rule)
-  {
-    $this->rule = $rule;
-  }
-  public function getRule()
-  {
-    return $this->rule;
-  }
-  public function setSheetId($sheetId)
-  {
-    $this->sheetId = $sheetId;
-  }
-  public function getSheetId()
-  {
-    return $this->sheetId;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Sheets/UpdateConditionalFormatRuleResponse.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Sheets/UpdateConditionalFormatRuleResponse.php
deleted file mode 100644
index 3313cdc2..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Sheets/UpdateConditionalFormatRuleResponse.php
+++ /dev/null
@@ -1,59 +0,0 @@
-newIndex = $newIndex;
-  }
-  public function getNewIndex()
-  {
-    return $this->newIndex;
-  }
-  public function setNewRule(Google_Service_Sheets_ConditionalFormatRule $newRule)
-  {
-    $this->newRule = $newRule;
-  }
-  public function getNewRule()
-  {
-    return $this->newRule;
-  }
-  public function setOldIndex($oldIndex)
-  {
-    $this->oldIndex = $oldIndex;
-  }
-  public function getOldIndex()
-  {
-    return $this->oldIndex;
-  }
-  public function setOldRule(Google_Service_Sheets_ConditionalFormatRule $oldRule)
-  {
-    $this->oldRule = $oldRule;
-  }
-  public function getOldRule()
-  {
-    return $this->oldRule;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Sheets/UpdateDimensionPropertiesRequest.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Sheets/UpdateDimensionPropertiesRequest.php
deleted file mode 100644
index b96c8ff0..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Sheets/UpdateDimensionPropertiesRequest.php
+++ /dev/null
@@ -1,50 +0,0 @@
-fields = $fields;
-  }
-  public function getFields()
-  {
-    return $this->fields;
-  }
-  public function setProperties(Google_Service_Sheets_DimensionProperties $properties)
-  {
-    $this->properties = $properties;
-  }
-  public function getProperties()
-  {
-    return $this->properties;
-  }
-  public function setRange(Google_Service_Sheets_DimensionRange $range)
-  {
-    $this->range = $range;
-  }
-  public function getRange()
-  {
-    return $this->range;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Sheets/UpdateEmbeddedObjectPositionRequest.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Sheets/UpdateEmbeddedObjectPositionRequest.php
deleted file mode 100644
index 153dccec..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Sheets/UpdateEmbeddedObjectPositionRequest.php
+++ /dev/null
@@ -1,49 +0,0 @@
-fields = $fields;
-  }
-  public function getFields()
-  {
-    return $this->fields;
-  }
-  public function setNewPosition(Google_Service_Sheets_EmbeddedObjectPosition $newPosition)
-  {
-    $this->newPosition = $newPosition;
-  }
-  public function getNewPosition()
-  {
-    return $this->newPosition;
-  }
-  public function setObjectId($objectId)
-  {
-    $this->objectId = $objectId;
-  }
-  public function getObjectId()
-  {
-    return $this->objectId;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Sheets/UpdateEmbeddedObjectPositionResponse.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Sheets/UpdateEmbeddedObjectPositionResponse.php
deleted file mode 100644
index e5bbd48d..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Sheets/UpdateEmbeddedObjectPositionResponse.php
+++ /dev/null
@@ -1,31 +0,0 @@
-position = $position;
-  }
-  public function getPosition()
-  {
-    return $this->position;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Sheets/UpdateFilterViewRequest.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Sheets/UpdateFilterViewRequest.php
deleted file mode 100644
index 7fe57b56..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Sheets/UpdateFilterViewRequest.php
+++ /dev/null
@@ -1,40 +0,0 @@
-fields = $fields;
-  }
-  public function getFields()
-  {
-    return $this->fields;
-  }
-  public function setFilter(Google_Service_Sheets_FilterView $filter)
-  {
-    $this->filter = $filter;
-  }
-  public function getFilter()
-  {
-    return $this->filter;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Sheets/UpdateNamedRangeRequest.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Sheets/UpdateNamedRangeRequest.php
deleted file mode 100644
index 7d9d8890..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Sheets/UpdateNamedRangeRequest.php
+++ /dev/null
@@ -1,40 +0,0 @@
-fields = $fields;
-  }
-  public function getFields()
-  {
-    return $this->fields;
-  }
-  public function setNamedRange(Google_Service_Sheets_NamedRange $namedRange)
-  {
-    $this->namedRange = $namedRange;
-  }
-  public function getNamedRange()
-  {
-    return $this->namedRange;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Sheets/UpdateProtectedRangeRequest.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Sheets/UpdateProtectedRangeRequest.php
deleted file mode 100644
index 6f5b8327..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Sheets/UpdateProtectedRangeRequest.php
+++ /dev/null
@@ -1,40 +0,0 @@
-fields = $fields;
-  }
-  public function getFields()
-  {
-    return $this->fields;
-  }
-  public function setProtectedRange(Google_Service_Sheets_ProtectedRange $protectedRange)
-  {
-    $this->protectedRange = $protectedRange;
-  }
-  public function getProtectedRange()
-  {
-    return $this->protectedRange;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Sheets/UpdateSheetPropertiesRequest.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Sheets/UpdateSheetPropertiesRequest.php
deleted file mode 100644
index c14acfc1..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Sheets/UpdateSheetPropertiesRequest.php
+++ /dev/null
@@ -1,40 +0,0 @@
-fields = $fields;
-  }
-  public function getFields()
-  {
-    return $this->fields;
-  }
-  public function setProperties(Google_Service_Sheets_SheetProperties $properties)
-  {
-    $this->properties = $properties;
-  }
-  public function getProperties()
-  {
-    return $this->properties;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Sheets/UpdateSpreadsheetPropertiesRequest.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Sheets/UpdateSpreadsheetPropertiesRequest.php
deleted file mode 100644
index 1bcea29e..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Sheets/UpdateSpreadsheetPropertiesRequest.php
+++ /dev/null
@@ -1,40 +0,0 @@
-fields = $fields;
-  }
-  public function getFields()
-  {
-    return $this->fields;
-  }
-  public function setProperties(Google_Service_Sheets_SpreadsheetProperties $properties)
-  {
-    $this->properties = $properties;
-  }
-  public function getProperties()
-  {
-    return $this->properties;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Sheets/UpdateValuesResponse.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Sheets/UpdateValuesResponse.php
deleted file mode 100644
index 46dc85f2..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Sheets/UpdateValuesResponse.php
+++ /dev/null
@@ -1,76 +0,0 @@
-spreadsheetId = $spreadsheetId;
-  }
-  public function getSpreadsheetId()
-  {
-    return $this->spreadsheetId;
-  }
-  public function setUpdatedCells($updatedCells)
-  {
-    $this->updatedCells = $updatedCells;
-  }
-  public function getUpdatedCells()
-  {
-    return $this->updatedCells;
-  }
-  public function setUpdatedColumns($updatedColumns)
-  {
-    $this->updatedColumns = $updatedColumns;
-  }
-  public function getUpdatedColumns()
-  {
-    return $this->updatedColumns;
-  }
-  public function setUpdatedData(Google_Service_Sheets_ValueRange $updatedData)
-  {
-    $this->updatedData = $updatedData;
-  }
-  public function getUpdatedData()
-  {
-    return $this->updatedData;
-  }
-  public function setUpdatedRange($updatedRange)
-  {
-    $this->updatedRange = $updatedRange;
-  }
-  public function getUpdatedRange()
-  {
-    return $this->updatedRange;
-  }
-  public function setUpdatedRows($updatedRows)
-  {
-    $this->updatedRows = $updatedRows;
-  }
-  public function getUpdatedRows()
-  {
-    return $this->updatedRows;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Sheets/ValueRange.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Sheets/ValueRange.php
deleted file mode 100644
index 3bc7a4b3..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Sheets/ValueRange.php
+++ /dev/null
@@ -1,49 +0,0 @@
-majorDimension = $majorDimension;
-  }
-  public function getMajorDimension()
-  {
-    return $this->majorDimension;
-  }
-  public function setRange($range)
-  {
-    $this->range = $range;
-  }
-  public function getRange()
-  {
-    return $this->range;
-  }
-  public function setValues($values)
-  {
-    $this->values = $values;
-  }
-  public function getValues()
-  {
-    return $this->values;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ShoppingContent.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ShoppingContent.php
deleted file mode 100644
index 16f60c56..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ShoppingContent.php
+++ /dev/null
@@ -1,1114 +0,0 @@
-
- * Manages product items, inventory, and Merchant Center accounts for Google
- * Shopping.

- *
- * 

- * For more information about this service, see the API
- * Documentation
- * 

- *
- * @author Google, Inc.
- */
-class Google_Service_ShoppingContent extends Google_Service
-{
-  /** Manage your product listings and accounts for Google Shopping. */
-  const CONTENT =
-      "https://www.googleapis.com/auth/content";
-
-  public $accounts;
-  public $accountshipping;
-  public $accountstatuses;
-  public $accounttax;
-  public $datafeeds;
-  public $datafeedstatuses;
-  public $inventory;
-  public $orders;
-  public $products;
-  public $productstatuses;
-  public $shippingsettings;
-  
-  /**
-   * Constructs the internal representation of the ShoppingContent service.
-   *
-   * @param Google_Client $client
-   */
-  public function __construct(Google_Client $client)
-  {
-    parent::__construct($client);
-    $this->rootUrl = 'https://www.googleapis.com/';
-    $this->servicePath = 'content/v2/';
-    $this->version = 'v2';
-    $this->serviceName = 'content';
-
-    $this->accounts = new Google_Service_ShoppingContent_Resource_Accounts(
-        $this,
-        $this->serviceName,
-        'accounts',
-        array(
-          'methods' => array(
-            'authinfo' => array(
-              'path' => 'accounts/authinfo',
-              'httpMethod' => 'GET',
-              'parameters' => array(),
-            ),'custombatch' => array(
-              'path' => 'accounts/batch',
-              'httpMethod' => 'POST',
-              'parameters' => array(
-                'dryRun' => array(
-                  'location' => 'query',
-                  'type' => 'boolean',
-                ),
-              ),
-            ),'delete' => array(
-              'path' => '{merchantId}/accounts/{accountId}',
-              'httpMethod' => 'DELETE',
-              'parameters' => array(
-                'merchantId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'accountId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'dryRun' => array(
-                  'location' => 'query',
-                  'type' => 'boolean',
-                ),
-              ),
-            ),'get' => array(
-              'path' => '{merchantId}/accounts/{accountId}',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'merchantId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'accountId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'insert' => array(
-              'path' => '{merchantId}/accounts',
-              'httpMethod' => 'POST',
-              'parameters' => array(
-                'merchantId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'dryRun' => array(
-                  'location' => 'query',
-                  'type' => 'boolean',
-                ),
-              ),
-            ),'list' => array(
-              'path' => '{merchantId}/accounts',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'merchantId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'maxResults' => array(
-                  'location' => 'query',
-                  'type' => 'integer',
-                ),
-                'pageToken' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-              ),
-            ),'patch' => array(
-              'path' => '{merchantId}/accounts/{accountId}',
-              'httpMethod' => 'PATCH',
-              'parameters' => array(
-                'merchantId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'accountId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'dryRun' => array(
-                  'location' => 'query',
-                  'type' => 'boolean',
-                ),
-              ),
-            ),'update' => array(
-              'path' => '{merchantId}/accounts/{accountId}',
-              'httpMethod' => 'PUT',
-              'parameters' => array(
-                'merchantId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'accountId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'dryRun' => array(
-                  'location' => 'query',
-                  'type' => 'boolean',
-                ),
-              ),
-            ),
-          )
-        )
-    );
-    $this->accountshipping = new Google_Service_ShoppingContent_Resource_Accountshipping(
-        $this,
-        $this->serviceName,
-        'accountshipping',
-        array(
-          'methods' => array(
-            'custombatch' => array(
-              'path' => 'accountshipping/batch',
-              'httpMethod' => 'POST',
-              'parameters' => array(
-                'dryRun' => array(
-                  'location' => 'query',
-                  'type' => 'boolean',
-                ),
-              ),
-            ),'get' => array(
-              'path' => '{merchantId}/accountshipping/{accountId}',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'merchantId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'accountId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'list' => array(
-              'path' => '{merchantId}/accountshipping',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'merchantId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'maxResults' => array(
-                  'location' => 'query',
-                  'type' => 'integer',
-                ),
-                'pageToken' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-              ),
-            ),'patch' => array(
-              'path' => '{merchantId}/accountshipping/{accountId}',
-              'httpMethod' => 'PATCH',
-              'parameters' => array(
-                'merchantId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'accountId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'dryRun' => array(
-                  'location' => 'query',
-                  'type' => 'boolean',
-                ),
-              ),
-            ),'update' => array(
-              'path' => '{merchantId}/accountshipping/{accountId}',
-              'httpMethod' => 'PUT',
-              'parameters' => array(
-                'merchantId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'accountId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'dryRun' => array(
-                  'location' => 'query',
-                  'type' => 'boolean',
-                ),
-              ),
-            ),
-          )
-        )
-    );
-    $this->accountstatuses = new Google_Service_ShoppingContent_Resource_Accountstatuses(
-        $this,
-        $this->serviceName,
-        'accountstatuses',
-        array(
-          'methods' => array(
-            'custombatch' => array(
-              'path' => 'accountstatuses/batch',
-              'httpMethod' => 'POST',
-              'parameters' => array(),
-            ),'get' => array(
-              'path' => '{merchantId}/accountstatuses/{accountId}',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'merchantId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'accountId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'list' => array(
-              'path' => '{merchantId}/accountstatuses',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'merchantId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'maxResults' => array(
-                  'location' => 'query',
-                  'type' => 'integer',
-                ),
-                'pageToken' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-              ),
-            ),
-          )
-        )
-    );
-    $this->accounttax = new Google_Service_ShoppingContent_Resource_Accounttax(
-        $this,
-        $this->serviceName,
-        'accounttax',
-        array(
-          'methods' => array(
-            'custombatch' => array(
-              'path' => 'accounttax/batch',
-              'httpMethod' => 'POST',
-              'parameters' => array(
-                'dryRun' => array(
-                  'location' => 'query',
-                  'type' => 'boolean',
-                ),
-              ),
-            ),'get' => array(
-              'path' => '{merchantId}/accounttax/{accountId}',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'merchantId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'accountId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'list' => array(
-              'path' => '{merchantId}/accounttax',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'merchantId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'maxResults' => array(
-                  'location' => 'query',
-                  'type' => 'integer',
-                ),
-                'pageToken' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-              ),
-            ),'patch' => array(
-              'path' => '{merchantId}/accounttax/{accountId}',
-              'httpMethod' => 'PATCH',
-              'parameters' => array(
-                'merchantId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'accountId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'dryRun' => array(
-                  'location' => 'query',
-                  'type' => 'boolean',
-                ),
-              ),
-            ),'update' => array(
-              'path' => '{merchantId}/accounttax/{accountId}',
-              'httpMethod' => 'PUT',
-              'parameters' => array(
-                'merchantId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'accountId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'dryRun' => array(
-                  'location' => 'query',
-                  'type' => 'boolean',
-                ),
-              ),
-            ),
-          )
-        )
-    );
-    $this->datafeeds = new Google_Service_ShoppingContent_Resource_Datafeeds(
-        $this,
-        $this->serviceName,
-        'datafeeds',
-        array(
-          'methods' => array(
-            'custombatch' => array(
-              'path' => 'datafeeds/batch',
-              'httpMethod' => 'POST',
-              'parameters' => array(
-                'dryRun' => array(
-                  'location' => 'query',
-                  'type' => 'boolean',
-                ),
-              ),
-            ),'delete' => array(
-              'path' => '{merchantId}/datafeeds/{datafeedId}',
-              'httpMethod' => 'DELETE',
-              'parameters' => array(
-                'merchantId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'datafeedId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'dryRun' => array(
-                  'location' => 'query',
-                  'type' => 'boolean',
-                ),
-              ),
-            ),'get' => array(
-              'path' => '{merchantId}/datafeeds/{datafeedId}',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'merchantId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'datafeedId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'insert' => array(
-              'path' => '{merchantId}/datafeeds',
-              'httpMethod' => 'POST',
-              'parameters' => array(
-                'merchantId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'dryRun' => array(
-                  'location' => 'query',
-                  'type' => 'boolean',
-                ),
-              ),
-            ),'list' => array(
-              'path' => '{merchantId}/datafeeds',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'merchantId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'maxResults' => array(
-                  'location' => 'query',
-                  'type' => 'integer',
-                ),
-                'pageToken' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-              ),
-            ),'patch' => array(
-              'path' => '{merchantId}/datafeeds/{datafeedId}',
-              'httpMethod' => 'PATCH',
-              'parameters' => array(
-                'merchantId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'datafeedId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'dryRun' => array(
-                  'location' => 'query',
-                  'type' => 'boolean',
-                ),
-              ),
-            ),'update' => array(
-              'path' => '{merchantId}/datafeeds/{datafeedId}',
-              'httpMethod' => 'PUT',
-              'parameters' => array(
-                'merchantId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'datafeedId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'dryRun' => array(
-                  'location' => 'query',
-                  'type' => 'boolean',
-                ),
-              ),
-            ),
-          )
-        )
-    );
-    $this->datafeedstatuses = new Google_Service_ShoppingContent_Resource_Datafeedstatuses(
-        $this,
-        $this->serviceName,
-        'datafeedstatuses',
-        array(
-          'methods' => array(
-            'custombatch' => array(
-              'path' => 'datafeedstatuses/batch',
-              'httpMethod' => 'POST',
-              'parameters' => array(),
-            ),'get' => array(
-              'path' => '{merchantId}/datafeedstatuses/{datafeedId}',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'merchantId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'datafeedId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'list' => array(
-              'path' => '{merchantId}/datafeedstatuses',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'merchantId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'maxResults' => array(
-                  'location' => 'query',
-                  'type' => 'integer',
-                ),
-                'pageToken' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-              ),
-            ),
-          )
-        )
-    );
-    $this->inventory = new Google_Service_ShoppingContent_Resource_Inventory(
-        $this,
-        $this->serviceName,
-        'inventory',
-        array(
-          'methods' => array(
-            'custombatch' => array(
-              'path' => 'inventory/batch',
-              'httpMethod' => 'POST',
-              'parameters' => array(
-                'dryRun' => array(
-                  'location' => 'query',
-                  'type' => 'boolean',
-                ),
-              ),
-            ),'set' => array(
-              'path' => '{merchantId}/inventory/{storeCode}/products/{productId}',
-              'httpMethod' => 'POST',
-              'parameters' => array(
-                'merchantId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'storeCode' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'productId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'dryRun' => array(
-                  'location' => 'query',
-                  'type' => 'boolean',
-                ),
-              ),
-            ),
-          )
-        )
-    );
-    $this->orders = new Google_Service_ShoppingContent_Resource_Orders(
-        $this,
-        $this->serviceName,
-        'orders',
-        array(
-          'methods' => array(
-            'acknowledge' => array(
-              'path' => '{merchantId}/orders/{orderId}/acknowledge',
-              'httpMethod' => 'POST',
-              'parameters' => array(
-                'merchantId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'orderId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'advancetestorder' => array(
-              'path' => '{merchantId}/testorders/{orderId}/advance',
-              'httpMethod' => 'POST',
-              'parameters' => array(
-                'merchantId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'orderId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'cancel' => array(
-              'path' => '{merchantId}/orders/{orderId}/cancel',
-              'httpMethod' => 'POST',
-              'parameters' => array(
-                'merchantId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'orderId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'cancellineitem' => array(
-              'path' => '{merchantId}/orders/{orderId}/cancelLineItem',
-              'httpMethod' => 'POST',
-              'parameters' => array(
-                'merchantId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'orderId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'createtestorder' => array(
-              'path' => '{merchantId}/testorders',
-              'httpMethod' => 'POST',
-              'parameters' => array(
-                'merchantId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'custombatch' => array(
-              'path' => 'orders/batch',
-              'httpMethod' => 'POST',
-              'parameters' => array(),
-            ),'get' => array(
-              'path' => '{merchantId}/orders/{orderId}',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'merchantId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'orderId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'getbymerchantorderid' => array(
-              'path' => '{merchantId}/ordersbymerchantid/{merchantOrderId}',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'merchantId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'merchantOrderId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'gettestordertemplate' => array(
-              'path' => '{merchantId}/testordertemplates/{templateName}',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'merchantId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'templateName' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'list' => array(
-              'path' => '{merchantId}/orders',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'merchantId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'acknowledged' => array(
-                  'location' => 'query',
-                  'type' => 'boolean',
-                ),
-                'maxResults' => array(
-                  'location' => 'query',
-                  'type' => 'integer',
-                ),
-                'orderBy' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'pageToken' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'placedDateEnd' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'placedDateStart' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'statuses' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                  'repeated' => true,
-                ),
-              ),
-            ),'refund' => array(
-              'path' => '{merchantId}/orders/{orderId}/refund',
-              'httpMethod' => 'POST',
-              'parameters' => array(
-                'merchantId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'orderId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'returnlineitem' => array(
-              'path' => '{merchantId}/orders/{orderId}/returnLineItem',
-              'httpMethod' => 'POST',
-              'parameters' => array(
-                'merchantId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'orderId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'shiplineitems' => array(
-              'path' => '{merchantId}/orders/{orderId}/shipLineItems',
-              'httpMethod' => 'POST',
-              'parameters' => array(
-                'merchantId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'orderId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'updatemerchantorderid' => array(
-              'path' => '{merchantId}/orders/{orderId}/updateMerchantOrderId',
-              'httpMethod' => 'POST',
-              'parameters' => array(
-                'merchantId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'orderId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'updateshipment' => array(
-              'path' => '{merchantId}/orders/{orderId}/updateShipment',
-              'httpMethod' => 'POST',
-              'parameters' => array(
-                'merchantId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'orderId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),
-          )
-        )
-    );
-    $this->products = new Google_Service_ShoppingContent_Resource_Products(
-        $this,
-        $this->serviceName,
-        'products',
-        array(
-          'methods' => array(
-            'custombatch' => array(
-              'path' => 'products/batch',
-              'httpMethod' => 'POST',
-              'parameters' => array(
-                'dryRun' => array(
-                  'location' => 'query',
-                  'type' => 'boolean',
-                ),
-              ),
-            ),'delete' => array(
-              'path' => '{merchantId}/products/{productId}',
-              'httpMethod' => 'DELETE',
-              'parameters' => array(
-                'merchantId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'productId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'dryRun' => array(
-                  'location' => 'query',
-                  'type' => 'boolean',
-                ),
-              ),
-            ),'get' => array(
-              'path' => '{merchantId}/products/{productId}',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'merchantId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'productId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'insert' => array(
-              'path' => '{merchantId}/products',
-              'httpMethod' => 'POST',
-              'parameters' => array(
-                'merchantId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'dryRun' => array(
-                  'location' => 'query',
-                  'type' => 'boolean',
-                ),
-              ),
-            ),'list' => array(
-              'path' => '{merchantId}/products',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'merchantId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'includeInvalidInsertedItems' => array(
-                  'location' => 'query',
-                  'type' => 'boolean',
-                ),
-                'maxResults' => array(
-                  'location' => 'query',
-                  'type' => 'integer',
-                ),
-                'pageToken' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-              ),
-            ),
-          )
-        )
-    );
-    $this->productstatuses = new Google_Service_ShoppingContent_Resource_Productstatuses(
-        $this,
-        $this->serviceName,
-        'productstatuses',
-        array(
-          'methods' => array(
-            'custombatch' => array(
-              'path' => 'productstatuses/batch',
-              'httpMethod' => 'POST',
-              'parameters' => array(),
-            ),'get' => array(
-              'path' => '{merchantId}/productstatuses/{productId}',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'merchantId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'productId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'list' => array(
-              'path' => '{merchantId}/productstatuses',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'merchantId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'includeInvalidInsertedItems' => array(
-                  'location' => 'query',
-                  'type' => 'boolean',
-                ),
-                'maxResults' => array(
-                  'location' => 'query',
-                  'type' => 'integer',
-                ),
-                'pageToken' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-              ),
-            ),
-          )
-        )
-    );
-    $this->shippingsettings = new Google_Service_ShoppingContent_Resource_Shippingsettings(
-        $this,
-        $this->serviceName,
-        'shippingsettings',
-        array(
-          'methods' => array(
-            'custombatch' => array(
-              'path' => 'shippingsettings/batch',
-              'httpMethod' => 'POST',
-              'parameters' => array(
-                'dryRun' => array(
-                  'location' => 'query',
-                  'type' => 'boolean',
-                ),
-              ),
-            ),'get' => array(
-              'path' => '{merchantId}/shippingsettings/{accountId}',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'merchantId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'accountId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'getsupportedcarriers' => array(
-              'path' => '{merchantId}/supportedCarriers',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'merchantId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'list' => array(
-              'path' => '{merchantId}/shippingsettings',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'merchantId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'maxResults' => array(
-                  'location' => 'query',
-                  'type' => 'integer',
-                ),
-                'pageToken' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-              ),
-            ),'patch' => array(
-              'path' => '{merchantId}/shippingsettings/{accountId}',
-              'httpMethod' => 'PATCH',
-              'parameters' => array(
-                'merchantId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'accountId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'dryRun' => array(
-                  'location' => 'query',
-                  'type' => 'boolean',
-                ),
-              ),
-            ),'update' => array(
-              'path' => '{merchantId}/shippingsettings/{accountId}',
-              'httpMethod' => 'PUT',
-              'parameters' => array(
-                'merchantId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'accountId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'dryRun' => array(
-                  'location' => 'query',
-                  'type' => 'boolean',
-                ),
-              ),
-            ),
-          )
-        )
-    );
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ShoppingContent/Account.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ShoppingContent/Account.php
deleted file mode 100644
index 818b624f..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ShoppingContent/Account.php
+++ /dev/null
@@ -1,105 +0,0 @@
-adultContent = $adultContent;
-  }
-  public function getAdultContent()
-  {
-    return $this->adultContent;
-  }
-  public function setAdwordsLinks($adwordsLinks)
-  {
-    $this->adwordsLinks = $adwordsLinks;
-  }
-  public function getAdwordsLinks()
-  {
-    return $this->adwordsLinks;
-  }
-  public function setId($id)
-  {
-    $this->id = $id;
-  }
-  public function getId()
-  {
-    return $this->id;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setName($name)
-  {
-    $this->name = $name;
-  }
-  public function getName()
-  {
-    return $this->name;
-  }
-  public function setReviewsUrl($reviewsUrl)
-  {
-    $this->reviewsUrl = $reviewsUrl;
-  }
-  public function getReviewsUrl()
-  {
-    return $this->reviewsUrl;
-  }
-  public function setSellerId($sellerId)
-  {
-    $this->sellerId = $sellerId;
-  }
-  public function getSellerId()
-  {
-    return $this->sellerId;
-  }
-  public function setUsers($users)
-  {
-    $this->users = $users;
-  }
-  public function getUsers()
-  {
-    return $this->users;
-  }
-  public function setWebsiteUrl($websiteUrl)
-  {
-    $this->websiteUrl = $websiteUrl;
-  }
-  public function getWebsiteUrl()
-  {
-    return $this->websiteUrl;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ShoppingContent/AccountAdwordsLink.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ShoppingContent/AccountAdwordsLink.php
deleted file mode 100644
index 7545618e..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ShoppingContent/AccountAdwordsLink.php
+++ /dev/null
@@ -1,39 +0,0 @@
-adwordsId = $adwordsId;
-  }
-  public function getAdwordsId()
-  {
-    return $this->adwordsId;
-  }
-  public function setStatus($status)
-  {
-    $this->status = $status;
-  }
-  public function getStatus()
-  {
-    return $this->status;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ShoppingContent/AccountIdentifier.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ShoppingContent/AccountIdentifier.php
deleted file mode 100644
index 79b5ecfb..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ShoppingContent/AccountIdentifier.php
+++ /dev/null
@@ -1,39 +0,0 @@
-aggregatorId = $aggregatorId;
-  }
-  public function getAggregatorId()
-  {
-    return $this->aggregatorId;
-  }
-  public function setMerchantId($merchantId)
-  {
-    $this->merchantId = $merchantId;
-  }
-  public function getMerchantId()
-  {
-    return $this->merchantId;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ShoppingContent/AccountShipping.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ShoppingContent/AccountShipping.php
deleted file mode 100644
index bd5cceb3..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ShoppingContent/AccountShipping.php
+++ /dev/null
@@ -1,80 +0,0 @@
-accountId = $accountId;
-  }
-  public function getAccountId()
-  {
-    return $this->accountId;
-  }
-  public function setCarrierRates($carrierRates)
-  {
-    $this->carrierRates = $carrierRates;
-  }
-  public function getCarrierRates()
-  {
-    return $this->carrierRates;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setLocationGroups($locationGroups)
-  {
-    $this->locationGroups = $locationGroups;
-  }
-  public function getLocationGroups()
-  {
-    return $this->locationGroups;
-  }
-  public function setRateTables($rateTables)
-  {
-    $this->rateTables = $rateTables;
-  }
-  public function getRateTables()
-  {
-    return $this->rateTables;
-  }
-  public function setServices($services)
-  {
-    $this->services = $services;
-  }
-  public function getServices()
-  {
-    return $this->services;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ShoppingContent/AccountShippingCarrierRate.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ShoppingContent/AccountShippingCarrierRate.php
deleted file mode 100644
index e3019122..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ShoppingContent/AccountShippingCarrierRate.php
+++ /dev/null
@@ -1,85 +0,0 @@
-carrier = $carrier;
-  }
-  public function getCarrier()
-  {
-    return $this->carrier;
-  }
-  public function setCarrierService($carrierService)
-  {
-    $this->carrierService = $carrierService;
-  }
-  public function getCarrierService()
-  {
-    return $this->carrierService;
-  }
-  public function setModifierFlatRate(Google_Service_ShoppingContent_Price $modifierFlatRate)
-  {
-    $this->modifierFlatRate = $modifierFlatRate;
-  }
-  public function getModifierFlatRate()
-  {
-    return $this->modifierFlatRate;
-  }
-  public function setModifierPercent($modifierPercent)
-  {
-    $this->modifierPercent = $modifierPercent;
-  }
-  public function getModifierPercent()
-  {
-    return $this->modifierPercent;
-  }
-  public function setName($name)
-  {
-    $this->name = $name;
-  }
-  public function getName()
-  {
-    return $this->name;
-  }
-  public function setSaleCountry($saleCountry)
-  {
-    $this->saleCountry = $saleCountry;
-  }
-  public function getSaleCountry()
-  {
-    return $this->saleCountry;
-  }
-  public function setShippingOrigin($shippingOrigin)
-  {
-    $this->shippingOrigin = $shippingOrigin;
-  }
-  public function getShippingOrigin()
-  {
-    return $this->shippingOrigin;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ShoppingContent/AccountShippingCondition.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ShoppingContent/AccountShippingCondition.php
deleted file mode 100644
index 9bd68b91..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ShoppingContent/AccountShippingCondition.php
+++ /dev/null
@@ -1,87 +0,0 @@
-deliveryLocationGroup = $deliveryLocationGroup;
-  }
-  public function getDeliveryLocationGroup()
-  {
-    return $this->deliveryLocationGroup;
-  }
-  public function setDeliveryLocationId($deliveryLocationId)
-  {
-    $this->deliveryLocationId = $deliveryLocationId;
-  }
-  public function getDeliveryLocationId()
-  {
-    return $this->deliveryLocationId;
-  }
-  public function setDeliveryPostalCode($deliveryPostalCode)
-  {
-    $this->deliveryPostalCode = $deliveryPostalCode;
-  }
-  public function getDeliveryPostalCode()
-  {
-    return $this->deliveryPostalCode;
-  }
-  public function setDeliveryPostalCodeRange(Google_Service_ShoppingContent_AccountShippingPostalCodeRange $deliveryPostalCodeRange)
-  {
-    $this->deliveryPostalCodeRange = $deliveryPostalCodeRange;
-  }
-  public function getDeliveryPostalCodeRange()
-  {
-    return $this->deliveryPostalCodeRange;
-  }
-  public function setPriceMax(Google_Service_ShoppingContent_Price $priceMax)
-  {
-    $this->priceMax = $priceMax;
-  }
-  public function getPriceMax()
-  {
-    return $this->priceMax;
-  }
-  public function setShippingLabel($shippingLabel)
-  {
-    $this->shippingLabel = $shippingLabel;
-  }
-  public function getShippingLabel()
-  {
-    return $this->shippingLabel;
-  }
-  public function setWeightMax(Google_Service_ShoppingContent_Weight $weightMax)
-  {
-    $this->weightMax = $weightMax;
-  }
-  public function getWeightMax()
-  {
-    return $this->weightMax;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ShoppingContent/AccountShippingLocationGroup.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ShoppingContent/AccountShippingLocationGroup.php
deleted file mode 100644
index 5e0ca75f..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ShoppingContent/AccountShippingLocationGroup.php
+++ /dev/null
@@ -1,68 +0,0 @@
-country = $country;
-  }
-  public function getCountry()
-  {
-    return $this->country;
-  }
-  public function setLocationIds($locationIds)
-  {
-    $this->locationIds = $locationIds;
-  }
-  public function getLocationIds()
-  {
-    return $this->locationIds;
-  }
-  public function setName($name)
-  {
-    $this->name = $name;
-  }
-  public function getName()
-  {
-    return $this->name;
-  }
-  public function setPostalCodeRanges($postalCodeRanges)
-  {
-    $this->postalCodeRanges = $postalCodeRanges;
-  }
-  public function getPostalCodeRanges()
-  {
-    return $this->postalCodeRanges;
-  }
-  public function setPostalCodes($postalCodes)
-  {
-    $this->postalCodes = $postalCodes;
-  }
-  public function getPostalCodes()
-  {
-    return $this->postalCodes;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ShoppingContent/AccountShippingPostalCodeRange.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ShoppingContent/AccountShippingPostalCodeRange.php
deleted file mode 100644
index d2151ace..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ShoppingContent/AccountShippingPostalCodeRange.php
+++ /dev/null
@@ -1,39 +0,0 @@
-end = $end;
-  }
-  public function getEnd()
-  {
-    return $this->end;
-  }
-  public function setStart($start)
-  {
-    $this->start = $start;
-  }
-  public function getStart()
-  {
-    return $this->start;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ShoppingContent/AccountShippingRateTable.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ShoppingContent/AccountShippingRateTable.php
deleted file mode 100644
index c8b0e177..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ShoppingContent/AccountShippingRateTable.php
+++ /dev/null
@@ -1,50 +0,0 @@
-content = $content;
-  }
-  public function getContent()
-  {
-    return $this->content;
-  }
-  public function setName($name)
-  {
-    $this->name = $name;
-  }
-  public function getName()
-  {
-    return $this->name;
-  }
-  public function setSaleCountry($saleCountry)
-  {
-    $this->saleCountry = $saleCountry;
-  }
-  public function getSaleCountry()
-  {
-    return $this->saleCountry;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ShoppingContent/AccountShippingRateTableCell.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ShoppingContent/AccountShippingRateTableCell.php
deleted file mode 100644
index 543395d1..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ShoppingContent/AccountShippingRateTableCell.php
+++ /dev/null
@@ -1,41 +0,0 @@
-condition = $condition;
-  }
-  public function getCondition()
-  {
-    return $this->condition;
-  }
-  public function setRate(Google_Service_ShoppingContent_Price $rate)
-  {
-    $this->rate = $rate;
-  }
-  public function getRate()
-  {
-    return $this->rate;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ShoppingContent/AccountShippingShippingService.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ShoppingContent/AccountShippingShippingService.php
deleted file mode 100644
index 555ef16e..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ShoppingContent/AccountShippingShippingService.php
+++ /dev/null
@@ -1,86 +0,0 @@
-active = $active;
-  }
-  public function getActive()
-  {
-    return $this->active;
-  }
-  public function setCalculationMethod(Google_Service_ShoppingContent_AccountShippingShippingServiceCalculationMethod $calculationMethod)
-  {
-    $this->calculationMethod = $calculationMethod;
-  }
-  public function getCalculationMethod()
-  {
-    return $this->calculationMethod;
-  }
-  public function setCostRuleTree(Google_Service_ShoppingContent_AccountShippingShippingServiceCostRule $costRuleTree)
-  {
-    $this->costRuleTree = $costRuleTree;
-  }
-  public function getCostRuleTree()
-  {
-    return $this->costRuleTree;
-  }
-  public function setMaxDaysInTransit($maxDaysInTransit)
-  {
-    $this->maxDaysInTransit = $maxDaysInTransit;
-  }
-  public function getMaxDaysInTransit()
-  {
-    return $this->maxDaysInTransit;
-  }
-  public function setMinDaysInTransit($minDaysInTransit)
-  {
-    $this->minDaysInTransit = $minDaysInTransit;
-  }
-  public function getMinDaysInTransit()
-  {
-    return $this->minDaysInTransit;
-  }
-  public function setName($name)
-  {
-    $this->name = $name;
-  }
-  public function getName()
-  {
-    return $this->name;
-  }
-  public function setSaleCountry($saleCountry)
-  {
-    $this->saleCountry = $saleCountry;
-  }
-  public function getSaleCountry()
-  {
-    return $this->saleCountry;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ShoppingContent/AccountShippingShippingServiceCalculationMethod.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ShoppingContent/AccountShippingShippingServiceCalculationMethod.php
deleted file mode 100644
index 3540f418..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ShoppingContent/AccountShippingShippingServiceCalculationMethod.php
+++ /dev/null
@@ -1,67 +0,0 @@
-carrierRate = $carrierRate;
-  }
-  public function getCarrierRate()
-  {
-    return $this->carrierRate;
-  }
-  public function setExcluded($excluded)
-  {
-    $this->excluded = $excluded;
-  }
-  public function getExcluded()
-  {
-    return $this->excluded;
-  }
-  public function setFlatRate(Google_Service_ShoppingContent_Price $flatRate)
-  {
-    $this->flatRate = $flatRate;
-  }
-  public function getFlatRate()
-  {
-    return $this->flatRate;
-  }
-  public function setPercentageRate($percentageRate)
-  {
-    $this->percentageRate = $percentageRate;
-  }
-  public function getPercentageRate()
-  {
-    return $this->percentageRate;
-  }
-  public function setRateTable($rateTable)
-  {
-    $this->rateTable = $rateTable;
-  }
-  public function getRateTable()
-  {
-    return $this->rateTable;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ShoppingContent/AccountShippingShippingServiceCostRule.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ShoppingContent/AccountShippingShippingServiceCostRule.php
deleted file mode 100644
index cef52308..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ShoppingContent/AccountShippingShippingServiceCostRule.php
+++ /dev/null
@@ -1,52 +0,0 @@
-calculationMethod = $calculationMethod;
-  }
-  public function getCalculationMethod()
-  {
-    return $this->calculationMethod;
-  }
-  public function setChildren($children)
-  {
-    $this->children = $children;
-  }
-  public function getChildren()
-  {
-    return $this->children;
-  }
-  public function setCondition(Google_Service_ShoppingContent_AccountShippingCondition $condition)
-  {
-    $this->condition = $condition;
-  }
-  public function getCondition()
-  {
-    return $this->condition;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ShoppingContent/AccountStatus.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ShoppingContent/AccountStatus.php
deleted file mode 100644
index 36fbb5d5..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ShoppingContent/AccountStatus.php
+++ /dev/null
@@ -1,50 +0,0 @@
-accountId = $accountId;
-  }
-  public function getAccountId()
-  {
-    return $this->accountId;
-  }
-  public function setDataQualityIssues($dataQualityIssues)
-  {
-    $this->dataQualityIssues = $dataQualityIssues;
-  }
-  public function getDataQualityIssues()
-  {
-    return $this->dataQualityIssues;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ShoppingContent/AccountStatusDataQualityIssue.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ShoppingContent/AccountStatusDataQualityIssue.php
deleted file mode 100644
index 300fd262..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ShoppingContent/AccountStatusDataQualityIssue.php
+++ /dev/null
@@ -1,113 +0,0 @@
-country = $country;
-  }
-  public function getCountry()
-  {
-    return $this->country;
-  }
-  public function setDetail($detail)
-  {
-    $this->detail = $detail;
-  }
-  public function getDetail()
-  {
-    return $this->detail;
-  }
-  public function setDisplayedValue($displayedValue)
-  {
-    $this->displayedValue = $displayedValue;
-  }
-  public function getDisplayedValue()
-  {
-    return $this->displayedValue;
-  }
-  public function setExampleItems($exampleItems)
-  {
-    $this->exampleItems = $exampleItems;
-  }
-  public function getExampleItems()
-  {
-    return $this->exampleItems;
-  }
-  public function setId($id)
-  {
-    $this->id = $id;
-  }
-  public function getId()
-  {
-    return $this->id;
-  }
-  public function setLastChecked($lastChecked)
-  {
-    $this->lastChecked = $lastChecked;
-  }
-  public function getLastChecked()
-  {
-    return $this->lastChecked;
-  }
-  public function setLocation($location)
-  {
-    $this->location = $location;
-  }
-  public function getLocation()
-  {
-    return $this->location;
-  }
-  public function setNumItems($numItems)
-  {
-    $this->numItems = $numItems;
-  }
-  public function getNumItems()
-  {
-    return $this->numItems;
-  }
-  public function setSeverity($severity)
-  {
-    $this->severity = $severity;
-  }
-  public function getSeverity()
-  {
-    return $this->severity;
-  }
-  public function setSubmittedValue($submittedValue)
-  {
-    $this->submittedValue = $submittedValue;
-  }
-  public function getSubmittedValue()
-  {
-    return $this->submittedValue;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ShoppingContent/AccountStatusExampleItem.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ShoppingContent/AccountStatusExampleItem.php
deleted file mode 100644
index f8a5b560..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ShoppingContent/AccountStatusExampleItem.php
+++ /dev/null
@@ -1,66 +0,0 @@
-itemId = $itemId;
-  }
-  public function getItemId()
-  {
-    return $this->itemId;
-  }
-  public function setLink($link)
-  {
-    $this->link = $link;
-  }
-  public function getLink()
-  {
-    return $this->link;
-  }
-  public function setSubmittedValue($submittedValue)
-  {
-    $this->submittedValue = $submittedValue;
-  }
-  public function getSubmittedValue()
-  {
-    return $this->submittedValue;
-  }
-  public function setTitle($title)
-  {
-    $this->title = $title;
-  }
-  public function getTitle()
-  {
-    return $this->title;
-  }
-  public function setValueOnLandingPage($valueOnLandingPage)
-  {
-    $this->valueOnLandingPage = $valueOnLandingPage;
-  }
-  public function getValueOnLandingPage()
-  {
-    return $this->valueOnLandingPage;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ShoppingContent/AccountTax.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ShoppingContent/AccountTax.php
deleted file mode 100644
index a1fd005c..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ShoppingContent/AccountTax.php
+++ /dev/null
@@ -1,50 +0,0 @@
-accountId = $accountId;
-  }
-  public function getAccountId()
-  {
-    return $this->accountId;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setRules($rules)
-  {
-    $this->rules = $rules;
-  }
-  public function getRules()
-  {
-    return $this->rules;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ShoppingContent/AccountTaxTaxRule.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ShoppingContent/AccountTaxTaxRule.php
deleted file mode 100644
index 96392bc5..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ShoppingContent/AccountTaxTaxRule.php
+++ /dev/null
@@ -1,66 +0,0 @@
-country = $country;
-  }
-  public function getCountry()
-  {
-    return $this->country;
-  }
-  public function setLocationId($locationId)
-  {
-    $this->locationId = $locationId;
-  }
-  public function getLocationId()
-  {
-    return $this->locationId;
-  }
-  public function setRatePercent($ratePercent)
-  {
-    $this->ratePercent = $ratePercent;
-  }
-  public function getRatePercent()
-  {
-    return $this->ratePercent;
-  }
-  public function setShippingTaxed($shippingTaxed)
-  {
-    $this->shippingTaxed = $shippingTaxed;
-  }
-  public function getShippingTaxed()
-  {
-    return $this->shippingTaxed;
-  }
-  public function setUseGlobalRate($useGlobalRate)
-  {
-    $this->useGlobalRate = $useGlobalRate;
-  }
-  public function getUseGlobalRate()
-  {
-    return $this->useGlobalRate;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ShoppingContent/AccountUser.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ShoppingContent/AccountUser.php
deleted file mode 100644
index 362063b5..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ShoppingContent/AccountUser.php
+++ /dev/null
@@ -1,39 +0,0 @@
-admin = $admin;
-  }
-  public function getAdmin()
-  {
-    return $this->admin;
-  }
-  public function setEmailAddress($emailAddress)
-  {
-    $this->emailAddress = $emailAddress;
-  }
-  public function getEmailAddress()
-  {
-    return $this->emailAddress;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ShoppingContent/AccountsAuthInfoResponse.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ShoppingContent/AccountsAuthInfoResponse.php
deleted file mode 100644
index e3584f51..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ShoppingContent/AccountsAuthInfoResponse.php
+++ /dev/null
@@ -1,41 +0,0 @@
-accountIdentifiers = $accountIdentifiers;
-  }
-  public function getAccountIdentifiers()
-  {
-    return $this->accountIdentifiers;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ShoppingContent/AccountsCustomBatchRequest.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ShoppingContent/AccountsCustomBatchRequest.php
deleted file mode 100644
index ab20c936..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ShoppingContent/AccountsCustomBatchRequest.php
+++ /dev/null
@@ -1,32 +0,0 @@
-entries = $entries;
-  }
-  public function getEntries()
-  {
-    return $this->entries;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ShoppingContent/AccountsCustomBatchRequestEntry.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ShoppingContent/AccountsCustomBatchRequestEntry.php
deleted file mode 100644
index 3dc1d680..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ShoppingContent/AccountsCustomBatchRequestEntry.php
+++ /dev/null
@@ -1,67 +0,0 @@
-account = $account;
-  }
-  public function getAccount()
-  {
-    return $this->account;
-  }
-  public function setAccountId($accountId)
-  {
-    $this->accountId = $accountId;
-  }
-  public function getAccountId()
-  {
-    return $this->accountId;
-  }
-  public function setBatchId($batchId)
-  {
-    $this->batchId = $batchId;
-  }
-  public function getBatchId()
-  {
-    return $this->batchId;
-  }
-  public function setMerchantId($merchantId)
-  {
-    $this->merchantId = $merchantId;
-  }
-  public function getMerchantId()
-  {
-    return $this->merchantId;
-  }
-  public function setMethod($method)
-  {
-    $this->method = $method;
-  }
-  public function getMethod()
-  {
-    return $this->method;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ShoppingContent/AccountsCustomBatchResponse.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ShoppingContent/AccountsCustomBatchResponse.php
deleted file mode 100644
index 80a842b1..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ShoppingContent/AccountsCustomBatchResponse.php
+++ /dev/null
@@ -1,41 +0,0 @@
-entries = $entries;
-  }
-  public function getEntries()
-  {
-    return $this->entries;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ShoppingContent/AccountsCustomBatchResponseEntry.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ShoppingContent/AccountsCustomBatchResponseEntry.php
deleted file mode 100644
index 13bf5d7c..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ShoppingContent/AccountsCustomBatchResponseEntry.php
+++ /dev/null
@@ -1,59 +0,0 @@
-account = $account;
-  }
-  public function getAccount()
-  {
-    return $this->account;
-  }
-  public function setBatchId($batchId)
-  {
-    $this->batchId = $batchId;
-  }
-  public function getBatchId()
-  {
-    return $this->batchId;
-  }
-  public function setErrors(Google_Service_ShoppingContent_Errors $errors)
-  {
-    $this->errors = $errors;
-  }
-  public function getErrors()
-  {
-    return $this->errors;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ShoppingContent/AccountsListResponse.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ShoppingContent/AccountsListResponse.php
deleted file mode 100644
index bdc618f0..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ShoppingContent/AccountsListResponse.php
+++ /dev/null
@@ -1,50 +0,0 @@
-kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setNextPageToken($nextPageToken)
-  {
-    $this->nextPageToken = $nextPageToken;
-  }
-  public function getNextPageToken()
-  {
-    return $this->nextPageToken;
-  }
-  public function setResources($resources)
-  {
-    $this->resources = $resources;
-  }
-  public function getResources()
-  {
-    return $this->resources;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ShoppingContent/AccountshippingCustomBatchRequest.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ShoppingContent/AccountshippingCustomBatchRequest.php
deleted file mode 100644
index 41af4e86..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ShoppingContent/AccountshippingCustomBatchRequest.php
+++ /dev/null
@@ -1,32 +0,0 @@
-entries = $entries;
-  }
-  public function getEntries()
-  {
-    return $this->entries;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ShoppingContent/AccountshippingCustomBatchRequestEntry.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ShoppingContent/AccountshippingCustomBatchRequestEntry.php
deleted file mode 100644
index c0848ec0..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ShoppingContent/AccountshippingCustomBatchRequestEntry.php
+++ /dev/null
@@ -1,67 +0,0 @@
-accountId = $accountId;
-  }
-  public function getAccountId()
-  {
-    return $this->accountId;
-  }
-  public function setAccountShipping(Google_Service_ShoppingContent_AccountShipping $accountShipping)
-  {
-    $this->accountShipping = $accountShipping;
-  }
-  public function getAccountShipping()
-  {
-    return $this->accountShipping;
-  }
-  public function setBatchId($batchId)
-  {
-    $this->batchId = $batchId;
-  }
-  public function getBatchId()
-  {
-    return $this->batchId;
-  }
-  public function setMerchantId($merchantId)
-  {
-    $this->merchantId = $merchantId;
-  }
-  public function getMerchantId()
-  {
-    return $this->merchantId;
-  }
-  public function setMethod($method)
-  {
-    $this->method = $method;
-  }
-  public function getMethod()
-  {
-    return $this->method;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ShoppingContent/AccountshippingCustomBatchResponse.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ShoppingContent/AccountshippingCustomBatchResponse.php
deleted file mode 100644
index 62d66179..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ShoppingContent/AccountshippingCustomBatchResponse.php
+++ /dev/null
@@ -1,41 +0,0 @@
-entries = $entries;
-  }
-  public function getEntries()
-  {
-    return $this->entries;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ShoppingContent/AccountshippingCustomBatchResponseEntry.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ShoppingContent/AccountshippingCustomBatchResponseEntry.php
deleted file mode 100644
index b0528ddf..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ShoppingContent/AccountshippingCustomBatchResponseEntry.php
+++ /dev/null
@@ -1,59 +0,0 @@
-accountShipping = $accountShipping;
-  }
-  public function getAccountShipping()
-  {
-    return $this->accountShipping;
-  }
-  public function setBatchId($batchId)
-  {
-    $this->batchId = $batchId;
-  }
-  public function getBatchId()
-  {
-    return $this->batchId;
-  }
-  public function setErrors(Google_Service_ShoppingContent_Errors $errors)
-  {
-    $this->errors = $errors;
-  }
-  public function getErrors()
-  {
-    return $this->errors;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ShoppingContent/AccountshippingListResponse.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ShoppingContent/AccountshippingListResponse.php
deleted file mode 100644
index bb9a7bf0..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ShoppingContent/AccountshippingListResponse.php
+++ /dev/null
@@ -1,50 +0,0 @@
-kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setNextPageToken($nextPageToken)
-  {
-    $this->nextPageToken = $nextPageToken;
-  }
-  public function getNextPageToken()
-  {
-    return $this->nextPageToken;
-  }
-  public function setResources($resources)
-  {
-    $this->resources = $resources;
-  }
-  public function getResources()
-  {
-    return $this->resources;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ShoppingContent/AccountstatusesCustomBatchRequest.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ShoppingContent/AccountstatusesCustomBatchRequest.php
deleted file mode 100644
index 543f2a22..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ShoppingContent/AccountstatusesCustomBatchRequest.php
+++ /dev/null
@@ -1,32 +0,0 @@
-entries = $entries;
-  }
-  public function getEntries()
-  {
-    return $this->entries;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ShoppingContent/AccountstatusesCustomBatchRequestEntry.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ShoppingContent/AccountstatusesCustomBatchRequestEntry.php
deleted file mode 100644
index 5d81ce10..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ShoppingContent/AccountstatusesCustomBatchRequestEntry.php
+++ /dev/null
@@ -1,57 +0,0 @@
-accountId = $accountId;
-  }
-  public function getAccountId()
-  {
-    return $this->accountId;
-  }
-  public function setBatchId($batchId)
-  {
-    $this->batchId = $batchId;
-  }
-  public function getBatchId()
-  {
-    return $this->batchId;
-  }
-  public function setMerchantId($merchantId)
-  {
-    $this->merchantId = $merchantId;
-  }
-  public function getMerchantId()
-  {
-    return $this->merchantId;
-  }
-  public function setMethod($method)
-  {
-    $this->method = $method;
-  }
-  public function getMethod()
-  {
-    return $this->method;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ShoppingContent/AccountstatusesCustomBatchResponse.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ShoppingContent/AccountstatusesCustomBatchResponse.php
deleted file mode 100644
index 122ad14c..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ShoppingContent/AccountstatusesCustomBatchResponse.php
+++ /dev/null
@@ -1,41 +0,0 @@
-entries = $entries;
-  }
-  public function getEntries()
-  {
-    return $this->entries;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ShoppingContent/AccountstatusesCustomBatchResponseEntry.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ShoppingContent/AccountstatusesCustomBatchResponseEntry.php
deleted file mode 100644
index 9b9b81d9..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ShoppingContent/AccountstatusesCustomBatchResponseEntry.php
+++ /dev/null
@@ -1,50 +0,0 @@
-accountStatus = $accountStatus;
-  }
-  public function getAccountStatus()
-  {
-    return $this->accountStatus;
-  }
-  public function setBatchId($batchId)
-  {
-    $this->batchId = $batchId;
-  }
-  public function getBatchId()
-  {
-    return $this->batchId;
-  }
-  public function setErrors(Google_Service_ShoppingContent_Errors $errors)
-  {
-    $this->errors = $errors;
-  }
-  public function getErrors()
-  {
-    return $this->errors;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ShoppingContent/AccountstatusesListResponse.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ShoppingContent/AccountstatusesListResponse.php
deleted file mode 100644
index 2ee02e44..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ShoppingContent/AccountstatusesListResponse.php
+++ /dev/null
@@ -1,50 +0,0 @@
-kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setNextPageToken($nextPageToken)
-  {
-    $this->nextPageToken = $nextPageToken;
-  }
-  public function getNextPageToken()
-  {
-    return $this->nextPageToken;
-  }
-  public function setResources($resources)
-  {
-    $this->resources = $resources;
-  }
-  public function getResources()
-  {
-    return $this->resources;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ShoppingContent/AccounttaxCustomBatchRequest.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ShoppingContent/AccounttaxCustomBatchRequest.php
deleted file mode 100644
index 74d5621f..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ShoppingContent/AccounttaxCustomBatchRequest.php
+++ /dev/null
@@ -1,32 +0,0 @@
-entries = $entries;
-  }
-  public function getEntries()
-  {
-    return $this->entries;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ShoppingContent/AccounttaxCustomBatchRequestEntry.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ShoppingContent/AccounttaxCustomBatchRequestEntry.php
deleted file mode 100644
index 4daddcf6..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ShoppingContent/AccounttaxCustomBatchRequestEntry.php
+++ /dev/null
@@ -1,67 +0,0 @@
-accountId = $accountId;
-  }
-  public function getAccountId()
-  {
-    return $this->accountId;
-  }
-  public function setAccountTax(Google_Service_ShoppingContent_AccountTax $accountTax)
-  {
-    $this->accountTax = $accountTax;
-  }
-  public function getAccountTax()
-  {
-    return $this->accountTax;
-  }
-  public function setBatchId($batchId)
-  {
-    $this->batchId = $batchId;
-  }
-  public function getBatchId()
-  {
-    return $this->batchId;
-  }
-  public function setMerchantId($merchantId)
-  {
-    $this->merchantId = $merchantId;
-  }
-  public function getMerchantId()
-  {
-    return $this->merchantId;
-  }
-  public function setMethod($method)
-  {
-    $this->method = $method;
-  }
-  public function getMethod()
-  {
-    return $this->method;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ShoppingContent/AccounttaxCustomBatchResponse.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ShoppingContent/AccounttaxCustomBatchResponse.php
deleted file mode 100644
index af6cf096..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ShoppingContent/AccounttaxCustomBatchResponse.php
+++ /dev/null
@@ -1,41 +0,0 @@
-entries = $entries;
-  }
-  public function getEntries()
-  {
-    return $this->entries;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ShoppingContent/AccounttaxCustomBatchResponseEntry.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ShoppingContent/AccounttaxCustomBatchResponseEntry.php
deleted file mode 100644
index 47fde886..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ShoppingContent/AccounttaxCustomBatchResponseEntry.php
+++ /dev/null
@@ -1,59 +0,0 @@
-accountTax = $accountTax;
-  }
-  public function getAccountTax()
-  {
-    return $this->accountTax;
-  }
-  public function setBatchId($batchId)
-  {
-    $this->batchId = $batchId;
-  }
-  public function getBatchId()
-  {
-    return $this->batchId;
-  }
-  public function setErrors(Google_Service_ShoppingContent_Errors $errors)
-  {
-    $this->errors = $errors;
-  }
-  public function getErrors()
-  {
-    return $this->errors;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ShoppingContent/AccounttaxListResponse.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ShoppingContent/AccounttaxListResponse.php
deleted file mode 100644
index e066451e..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ShoppingContent/AccounttaxListResponse.php
+++ /dev/null
@@ -1,50 +0,0 @@
-kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setNextPageToken($nextPageToken)
-  {
-    $this->nextPageToken = $nextPageToken;
-  }
-  public function getNextPageToken()
-  {
-    return $this->nextPageToken;
-  }
-  public function setResources($resources)
-  {
-    $this->resources = $resources;
-  }
-  public function getResources()
-  {
-    return $this->resources;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ShoppingContent/CarrierRate.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ShoppingContent/CarrierRate.php
deleted file mode 100644
index fdcd0ba2..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ShoppingContent/CarrierRate.php
+++ /dev/null
@@ -1,76 +0,0 @@
-carrierName = $carrierName;
-  }
-  public function getCarrierName()
-  {
-    return $this->carrierName;
-  }
-  public function setCarrierService($carrierService)
-  {
-    $this->carrierService = $carrierService;
-  }
-  public function getCarrierService()
-  {
-    return $this->carrierService;
-  }
-  public function setFlatAdjustment(Google_Service_ShoppingContent_Price $flatAdjustment)
-  {
-    $this->flatAdjustment = $flatAdjustment;
-  }
-  public function getFlatAdjustment()
-  {
-    return $this->flatAdjustment;
-  }
-  public function setName($name)
-  {
-    $this->name = $name;
-  }
-  public function getName()
-  {
-    return $this->name;
-  }
-  public function setOriginPostalCode($originPostalCode)
-  {
-    $this->originPostalCode = $originPostalCode;
-  }
-  public function getOriginPostalCode()
-  {
-    return $this->originPostalCode;
-  }
-  public function setPercentageAdjustment($percentageAdjustment)
-  {
-    $this->percentageAdjustment = $percentageAdjustment;
-  }
-  public function getPercentageAdjustment()
-  {
-    return $this->percentageAdjustment;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ShoppingContent/CarriersCarrier.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ShoppingContent/CarriersCarrier.php
deleted file mode 100644
index 1bcec7f0..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ShoppingContent/CarriersCarrier.php
+++ /dev/null
@@ -1,49 +0,0 @@
-country = $country;
-  }
-  public function getCountry()
-  {
-    return $this->country;
-  }
-  public function setName($name)
-  {
-    $this->name = $name;
-  }
-  public function getName()
-  {
-    return $this->name;
-  }
-  public function setServices($services)
-  {
-    $this->services = $services;
-  }
-  public function getServices()
-  {
-    return $this->services;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ShoppingContent/Datafeed.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ShoppingContent/Datafeed.php
deleted file mode 100644
index 0666c0d1..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ShoppingContent/Datafeed.php
+++ /dev/null
@@ -1,123 +0,0 @@
-attributeLanguage = $attributeLanguage;
-  }
-  public function getAttributeLanguage()
-  {
-    return $this->attributeLanguage;
-  }
-  public function setContentLanguage($contentLanguage)
-  {
-    $this->contentLanguage = $contentLanguage;
-  }
-  public function getContentLanguage()
-  {
-    return $this->contentLanguage;
-  }
-  public function setContentType($contentType)
-  {
-    $this->contentType = $contentType;
-  }
-  public function getContentType()
-  {
-    return $this->contentType;
-  }
-  public function setFetchSchedule(Google_Service_ShoppingContent_DatafeedFetchSchedule $fetchSchedule)
-  {
-    $this->fetchSchedule = $fetchSchedule;
-  }
-  public function getFetchSchedule()
-  {
-    return $this->fetchSchedule;
-  }
-  public function setFileName($fileName)
-  {
-    $this->fileName = $fileName;
-  }
-  public function getFileName()
-  {
-    return $this->fileName;
-  }
-  public function setFormat(Google_Service_ShoppingContent_DatafeedFormat $format)
-  {
-    $this->format = $format;
-  }
-  public function getFormat()
-  {
-    return $this->format;
-  }
-  public function setId($id)
-  {
-    $this->id = $id;
-  }
-  public function getId()
-  {
-    return $this->id;
-  }
-  public function setIntendedDestinations($intendedDestinations)
-  {
-    $this->intendedDestinations = $intendedDestinations;
-  }
-  public function getIntendedDestinations()
-  {
-    return $this->intendedDestinations;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setName($name)
-  {
-    $this->name = $name;
-  }
-  public function getName()
-  {
-    return $this->name;
-  }
-  public function setTargetCountry($targetCountry)
-  {
-    $this->targetCountry = $targetCountry;
-  }
-  public function getTargetCountry()
-  {
-    return $this->targetCountry;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ShoppingContent/DatafeedFetchSchedule.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ShoppingContent/DatafeedFetchSchedule.php
deleted file mode 100644
index 289db369..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ShoppingContent/DatafeedFetchSchedule.php
+++ /dev/null
@@ -1,93 +0,0 @@
-dayOfMonth = $dayOfMonth;
-  }
-  public function getDayOfMonth()
-  {
-    return $this->dayOfMonth;
-  }
-  public function setFetchUrl($fetchUrl)
-  {
-    $this->fetchUrl = $fetchUrl;
-  }
-  public function getFetchUrl()
-  {
-    return $this->fetchUrl;
-  }
-  public function setHour($hour)
-  {
-    $this->hour = $hour;
-  }
-  public function getHour()
-  {
-    return $this->hour;
-  }
-  public function setMinuteOfHour($minuteOfHour)
-  {
-    $this->minuteOfHour = $minuteOfHour;
-  }
-  public function getMinuteOfHour()
-  {
-    return $this->minuteOfHour;
-  }
-  public function setPassword($password)
-  {
-    $this->password = $password;
-  }
-  public function getPassword()
-  {
-    return $this->password;
-  }
-  public function setTimeZone($timeZone)
-  {
-    $this->timeZone = $timeZone;
-  }
-  public function getTimeZone()
-  {
-    return $this->timeZone;
-  }
-  public function setUsername($username)
-  {
-    $this->username = $username;
-  }
-  public function getUsername()
-  {
-    return $this->username;
-  }
-  public function setWeekday($weekday)
-  {
-    $this->weekday = $weekday;
-  }
-  public function getWeekday()
-  {
-    return $this->weekday;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ShoppingContent/DatafeedFormat.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ShoppingContent/DatafeedFormat.php
deleted file mode 100644
index e3f55163..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ShoppingContent/DatafeedFormat.php
+++ /dev/null
@@ -1,48 +0,0 @@
-columnDelimiter = $columnDelimiter;
-  }
-  public function getColumnDelimiter()
-  {
-    return $this->columnDelimiter;
-  }
-  public function setFileEncoding($fileEncoding)
-  {
-    $this->fileEncoding = $fileEncoding;
-  }
-  public function getFileEncoding()
-  {
-    return $this->fileEncoding;
-  }
-  public function setQuotingMode($quotingMode)
-  {
-    $this->quotingMode = $quotingMode;
-  }
-  public function getQuotingMode()
-  {
-    return $this->quotingMode;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ShoppingContent/DatafeedStatus.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ShoppingContent/DatafeedStatus.php
deleted file mode 100644
index c563297e..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ShoppingContent/DatafeedStatus.php
+++ /dev/null
@@ -1,96 +0,0 @@
-datafeedId = $datafeedId;
-  }
-  public function getDatafeedId()
-  {
-    return $this->datafeedId;
-  }
-  public function setErrors($errors)
-  {
-    $this->errors = $errors;
-  }
-  public function getErrors()
-  {
-    return $this->errors;
-  }
-  public function setItemsTotal($itemsTotal)
-  {
-    $this->itemsTotal = $itemsTotal;
-  }
-  public function getItemsTotal()
-  {
-    return $this->itemsTotal;
-  }
-  public function setItemsValid($itemsValid)
-  {
-    $this->itemsValid = $itemsValid;
-  }
-  public function getItemsValid()
-  {
-    return $this->itemsValid;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setLastUploadDate($lastUploadDate)
-  {
-    $this->lastUploadDate = $lastUploadDate;
-  }
-  public function getLastUploadDate()
-  {
-    return $this->lastUploadDate;
-  }
-  public function setProcessingStatus($processingStatus)
-  {
-    $this->processingStatus = $processingStatus;
-  }
-  public function getProcessingStatus()
-  {
-    return $this->processingStatus;
-  }
-  public function setWarnings($warnings)
-  {
-    $this->warnings = $warnings;
-  }
-  public function getWarnings()
-  {
-    return $this->warnings;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ShoppingContent/DatafeedStatusError.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ShoppingContent/DatafeedStatusError.php
deleted file mode 100644
index 3f276d27..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ShoppingContent/DatafeedStatusError.php
+++ /dev/null
@@ -1,59 +0,0 @@
-code = $code;
-  }
-  public function getCode()
-  {
-    return $this->code;
-  }
-  public function setCount($count)
-  {
-    $this->count = $count;
-  }
-  public function getCount()
-  {
-    return $this->count;
-  }
-  public function setExamples($examples)
-  {
-    $this->examples = $examples;
-  }
-  public function getExamples()
-  {
-    return $this->examples;
-  }
-  public function setMessage($message)
-  {
-    $this->message = $message;
-  }
-  public function getMessage()
-  {
-    return $this->message;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ShoppingContent/DatafeedStatusExample.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ShoppingContent/DatafeedStatusExample.php
deleted file mode 100644
index cfbeb268..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ShoppingContent/DatafeedStatusExample.php
+++ /dev/null
@@ -1,48 +0,0 @@
-itemId = $itemId;
-  }
-  public function getItemId()
-  {
-    return $this->itemId;
-  }
-  public function setLineNumber($lineNumber)
-  {
-    $this->lineNumber = $lineNumber;
-  }
-  public function getLineNumber()
-  {
-    return $this->lineNumber;
-  }
-  public function setValue($value)
-  {
-    $this->value = $value;
-  }
-  public function getValue()
-  {
-    return $this->value;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ShoppingContent/DatafeedsCustomBatchRequest.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ShoppingContent/DatafeedsCustomBatchRequest.php
deleted file mode 100644
index d0432f0d..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ShoppingContent/DatafeedsCustomBatchRequest.php
+++ /dev/null
@@ -1,32 +0,0 @@
-entries = $entries;
-  }
-  public function getEntries()
-  {
-    return $this->entries;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ShoppingContent/DatafeedsCustomBatchRequestEntry.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ShoppingContent/DatafeedsCustomBatchRequestEntry.php
deleted file mode 100644
index 8d537c30..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ShoppingContent/DatafeedsCustomBatchRequestEntry.php
+++ /dev/null
@@ -1,67 +0,0 @@
-batchId = $batchId;
-  }
-  public function getBatchId()
-  {
-    return $this->batchId;
-  }
-  public function setDatafeed(Google_Service_ShoppingContent_Datafeed $datafeed)
-  {
-    $this->datafeed = $datafeed;
-  }
-  public function getDatafeed()
-  {
-    return $this->datafeed;
-  }
-  public function setDatafeedId($datafeedId)
-  {
-    $this->datafeedId = $datafeedId;
-  }
-  public function getDatafeedId()
-  {
-    return $this->datafeedId;
-  }
-  public function setMerchantId($merchantId)
-  {
-    $this->merchantId = $merchantId;
-  }
-  public function getMerchantId()
-  {
-    return $this->merchantId;
-  }
-  public function setMethod($method)
-  {
-    $this->method = $method;
-  }
-  public function getMethod()
-  {
-    return $this->method;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ShoppingContent/DatafeedsCustomBatchResponse.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ShoppingContent/DatafeedsCustomBatchResponse.php
deleted file mode 100644
index 85898c9a..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ShoppingContent/DatafeedsCustomBatchResponse.php
+++ /dev/null
@@ -1,41 +0,0 @@
-entries = $entries;
-  }
-  public function getEntries()
-  {
-    return $this->entries;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ShoppingContent/DatafeedsCustomBatchResponseEntry.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ShoppingContent/DatafeedsCustomBatchResponseEntry.php
deleted file mode 100644
index 42e0b206..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ShoppingContent/DatafeedsCustomBatchResponseEntry.php
+++ /dev/null
@@ -1,50 +0,0 @@
-batchId = $batchId;
-  }
-  public function getBatchId()
-  {
-    return $this->batchId;
-  }
-  public function setDatafeed(Google_Service_ShoppingContent_Datafeed $datafeed)
-  {
-    $this->datafeed = $datafeed;
-  }
-  public function getDatafeed()
-  {
-    return $this->datafeed;
-  }
-  public function setErrors(Google_Service_ShoppingContent_Errors $errors)
-  {
-    $this->errors = $errors;
-  }
-  public function getErrors()
-  {
-    return $this->errors;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ShoppingContent/DatafeedsListResponse.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ShoppingContent/DatafeedsListResponse.php
deleted file mode 100644
index 0092ece7..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ShoppingContent/DatafeedsListResponse.php
+++ /dev/null
@@ -1,50 +0,0 @@
-kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setNextPageToken($nextPageToken)
-  {
-    $this->nextPageToken = $nextPageToken;
-  }
-  public function getNextPageToken()
-  {
-    return $this->nextPageToken;
-  }
-  public function setResources($resources)
-  {
-    $this->resources = $resources;
-  }
-  public function getResources()
-  {
-    return $this->resources;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ShoppingContent/DatafeedstatusesCustomBatchRequest.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ShoppingContent/DatafeedstatusesCustomBatchRequest.php
deleted file mode 100644
index 808ad5a5..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ShoppingContent/DatafeedstatusesCustomBatchRequest.php
+++ /dev/null
@@ -1,32 +0,0 @@
-entries = $entries;
-  }
-  public function getEntries()
-  {
-    return $this->entries;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ShoppingContent/DatafeedstatusesCustomBatchRequestEntry.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ShoppingContent/DatafeedstatusesCustomBatchRequestEntry.php
deleted file mode 100644
index 58457c5d..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ShoppingContent/DatafeedstatusesCustomBatchRequestEntry.php
+++ /dev/null
@@ -1,57 +0,0 @@
-batchId = $batchId;
-  }
-  public function getBatchId()
-  {
-    return $this->batchId;
-  }
-  public function setDatafeedId($datafeedId)
-  {
-    $this->datafeedId = $datafeedId;
-  }
-  public function getDatafeedId()
-  {
-    return $this->datafeedId;
-  }
-  public function setMerchantId($merchantId)
-  {
-    $this->merchantId = $merchantId;
-  }
-  public function getMerchantId()
-  {
-    return $this->merchantId;
-  }
-  public function setMethod($method)
-  {
-    $this->method = $method;
-  }
-  public function getMethod()
-  {
-    return $this->method;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ShoppingContent/DatafeedstatusesCustomBatchResponse.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ShoppingContent/DatafeedstatusesCustomBatchResponse.php
deleted file mode 100644
index b85a0bc3..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ShoppingContent/DatafeedstatusesCustomBatchResponse.php
+++ /dev/null
@@ -1,41 +0,0 @@
-entries = $entries;
-  }
-  public function getEntries()
-  {
-    return $this->entries;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ShoppingContent/DatafeedstatusesCustomBatchResponseEntry.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ShoppingContent/DatafeedstatusesCustomBatchResponseEntry.php
deleted file mode 100644
index 7244943a..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ShoppingContent/DatafeedstatusesCustomBatchResponseEntry.php
+++ /dev/null
@@ -1,50 +0,0 @@
-batchId = $batchId;
-  }
-  public function getBatchId()
-  {
-    return $this->batchId;
-  }
-  public function setDatafeedStatus(Google_Service_ShoppingContent_DatafeedStatus $datafeedStatus)
-  {
-    $this->datafeedStatus = $datafeedStatus;
-  }
-  public function getDatafeedStatus()
-  {
-    return $this->datafeedStatus;
-  }
-  public function setErrors(Google_Service_ShoppingContent_Errors $errors)
-  {
-    $this->errors = $errors;
-  }
-  public function getErrors()
-  {
-    return $this->errors;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ShoppingContent/DatafeedstatusesListResponse.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ShoppingContent/DatafeedstatusesListResponse.php
deleted file mode 100644
index 0f272931..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ShoppingContent/DatafeedstatusesListResponse.php
+++ /dev/null
@@ -1,50 +0,0 @@
-kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setNextPageToken($nextPageToken)
-  {
-    $this->nextPageToken = $nextPageToken;
-  }
-  public function getNextPageToken()
-  {
-    return $this->nextPageToken;
-  }
-  public function setResources($resources)
-  {
-    $this->resources = $resources;
-  }
-  public function getResources()
-  {
-    return $this->resources;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ShoppingContent/DeliveryTime.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ShoppingContent/DeliveryTime.php
deleted file mode 100644
index fd69f4bb..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ShoppingContent/DeliveryTime.php
+++ /dev/null
@@ -1,39 +0,0 @@
-maxTransitTimeInDays = $maxTransitTimeInDays;
-  }
-  public function getMaxTransitTimeInDays()
-  {
-    return $this->maxTransitTimeInDays;
-  }
-  public function setMinTransitTimeInDays($minTransitTimeInDays)
-  {
-    $this->minTransitTimeInDays = $minTransitTimeInDays;
-  }
-  public function getMinTransitTimeInDays()
-  {
-    return $this->minTransitTimeInDays;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ShoppingContent/Error.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ShoppingContent/Error.php
deleted file mode 100644
index 0166ea57..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ShoppingContent/Error.php
+++ /dev/null
@@ -1,48 +0,0 @@
-domain = $domain;
-  }
-  public function getDomain()
-  {
-    return $this->domain;
-  }
-  public function setMessage($message)
-  {
-    $this->message = $message;
-  }
-  public function getMessage()
-  {
-    return $this->message;
-  }
-  public function setReason($reason)
-  {
-    $this->reason = $reason;
-  }
-  public function getReason()
-  {
-    return $this->reason;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ShoppingContent/Errors.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ShoppingContent/Errors.php
deleted file mode 100644
index 751c741e..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ShoppingContent/Errors.php
+++ /dev/null
@@ -1,50 +0,0 @@
-code = $code;
-  }
-  public function getCode()
-  {
-    return $this->code;
-  }
-  public function setErrors($errors)
-  {
-    $this->errors = $errors;
-  }
-  public function getErrors()
-  {
-    return $this->errors;
-  }
-  public function setMessage($message)
-  {
-    $this->message = $message;
-  }
-  public function getMessage()
-  {
-    return $this->message;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ShoppingContent/Headers.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ShoppingContent/Headers.php
deleted file mode 100644
index 8d41b365..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ShoppingContent/Headers.php
+++ /dev/null
@@ -1,70 +0,0 @@
-locations = $locations;
-  }
-  public function getLocations()
-  {
-    return $this->locations;
-  }
-  public function setNumberOfItems($numberOfItems)
-  {
-    $this->numberOfItems = $numberOfItems;
-  }
-  public function getNumberOfItems()
-  {
-    return $this->numberOfItems;
-  }
-  public function setPostalCodeGroupNames($postalCodeGroupNames)
-  {
-    $this->postalCodeGroupNames = $postalCodeGroupNames;
-  }
-  public function getPostalCodeGroupNames()
-  {
-    return $this->postalCodeGroupNames;
-  }
-  public function setPrices($prices)
-  {
-    $this->prices = $prices;
-  }
-  public function getPrices()
-  {
-    return $this->prices;
-  }
-  public function setWeights($weights)
-  {
-    $this->weights = $weights;
-  }
-  public function getWeights()
-  {
-    return $this->weights;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ShoppingContent/Installment.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ShoppingContent/Installment.php
deleted file mode 100644
index 8444cb75..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ShoppingContent/Installment.php
+++ /dev/null
@@ -1,40 +0,0 @@
-amount = $amount;
-  }
-  public function getAmount()
-  {
-    return $this->amount;
-  }
-  public function setMonths($months)
-  {
-    $this->months = $months;
-  }
-  public function getMonths()
-  {
-    return $this->months;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ShoppingContent/Inventory.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ShoppingContent/Inventory.php
deleted file mode 100644
index 026be0d9..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ShoppingContent/Inventory.php
+++ /dev/null
@@ -1,116 +0,0 @@
-availability = $availability;
-  }
-  public function getAvailability()
-  {
-    return $this->availability;
-  }
-  public function setInstallment(Google_Service_ShoppingContent_Installment $installment)
-  {
-    $this->installment = $installment;
-  }
-  public function getInstallment()
-  {
-    return $this->installment;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setLoyaltyPoints(Google_Service_ShoppingContent_LoyaltyPoints $loyaltyPoints)
-  {
-    $this->loyaltyPoints = $loyaltyPoints;
-  }
-  public function getLoyaltyPoints()
-  {
-    return $this->loyaltyPoints;
-  }
-  public function setPickup(Google_Service_ShoppingContent_InventoryPickup $pickup)
-  {
-    $this->pickup = $pickup;
-  }
-  public function getPickup()
-  {
-    return $this->pickup;
-  }
-  public function setPrice(Google_Service_ShoppingContent_Price $price)
-  {
-    $this->price = $price;
-  }
-  public function getPrice()
-  {
-    return $this->price;
-  }
-  public function setQuantity($quantity)
-  {
-    $this->quantity = $quantity;
-  }
-  public function getQuantity()
-  {
-    return $this->quantity;
-  }
-  public function setSalePrice(Google_Service_ShoppingContent_Price $salePrice)
-  {
-    $this->salePrice = $salePrice;
-  }
-  public function getSalePrice()
-  {
-    return $this->salePrice;
-  }
-  public function setSalePriceEffectiveDate($salePriceEffectiveDate)
-  {
-    $this->salePriceEffectiveDate = $salePriceEffectiveDate;
-  }
-  public function getSalePriceEffectiveDate()
-  {
-    return $this->salePriceEffectiveDate;
-  }
-  public function setSellOnGoogleQuantity($sellOnGoogleQuantity)
-  {
-    $this->sellOnGoogleQuantity = $sellOnGoogleQuantity;
-  }
-  public function getSellOnGoogleQuantity()
-  {
-    return $this->sellOnGoogleQuantity;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ShoppingContent/InventoryCustomBatchRequest.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ShoppingContent/InventoryCustomBatchRequest.php
deleted file mode 100644
index 301966b2..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ShoppingContent/InventoryCustomBatchRequest.php
+++ /dev/null
@@ -1,32 +0,0 @@
-entries = $entries;
-  }
-  public function getEntries()
-  {
-    return $this->entries;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ShoppingContent/InventoryCustomBatchRequestEntry.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ShoppingContent/InventoryCustomBatchRequestEntry.php
deleted file mode 100644
index 672359fb..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ShoppingContent/InventoryCustomBatchRequestEntry.php
+++ /dev/null
@@ -1,67 +0,0 @@
-batchId = $batchId;
-  }
-  public function getBatchId()
-  {
-    return $this->batchId;
-  }
-  public function setInventory(Google_Service_ShoppingContent_Inventory $inventory)
-  {
-    $this->inventory = $inventory;
-  }
-  public function getInventory()
-  {
-    return $this->inventory;
-  }
-  public function setMerchantId($merchantId)
-  {
-    $this->merchantId = $merchantId;
-  }
-  public function getMerchantId()
-  {
-    return $this->merchantId;
-  }
-  public function setProductId($productId)
-  {
-    $this->productId = $productId;
-  }
-  public function getProductId()
-  {
-    return $this->productId;
-  }
-  public function setStoreCode($storeCode)
-  {
-    $this->storeCode = $storeCode;
-  }
-  public function getStoreCode()
-  {
-    return $this->storeCode;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ShoppingContent/InventoryCustomBatchResponse.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ShoppingContent/InventoryCustomBatchResponse.php
deleted file mode 100644
index be3550cb..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ShoppingContent/InventoryCustomBatchResponse.php
+++ /dev/null
@@ -1,41 +0,0 @@
-entries = $entries;
-  }
-  public function getEntries()
-  {
-    return $this->entries;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ShoppingContent/InventoryCustomBatchResponseEntry.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ShoppingContent/InventoryCustomBatchResponseEntry.php
deleted file mode 100644
index 4daae555..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ShoppingContent/InventoryCustomBatchResponseEntry.php
+++ /dev/null
@@ -1,49 +0,0 @@
-batchId = $batchId;
-  }
-  public function getBatchId()
-  {
-    return $this->batchId;
-  }
-  public function setErrors(Google_Service_ShoppingContent_Errors $errors)
-  {
-    $this->errors = $errors;
-  }
-  public function getErrors()
-  {
-    return $this->errors;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ShoppingContent/InventoryPickup.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ShoppingContent/InventoryPickup.php
deleted file mode 100644
index 18ef3b0c..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ShoppingContent/InventoryPickup.php
+++ /dev/null
@@ -1,39 +0,0 @@
-pickupMethod = $pickupMethod;
-  }
-  public function getPickupMethod()
-  {
-    return $this->pickupMethod;
-  }
-  public function setPickupSla($pickupSla)
-  {
-    $this->pickupSla = $pickupSla;
-  }
-  public function getPickupSla()
-  {
-    return $this->pickupSla;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ShoppingContent/InventorySetRequest.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ShoppingContent/InventorySetRequest.php
deleted file mode 100644
index 2f178e29..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ShoppingContent/InventorySetRequest.php
+++ /dev/null
@@ -1,107 +0,0 @@
-availability = $availability;
-  }
-  public function getAvailability()
-  {
-    return $this->availability;
-  }
-  public function setInstallment(Google_Service_ShoppingContent_Installment $installment)
-  {
-    $this->installment = $installment;
-  }
-  public function getInstallment()
-  {
-    return $this->installment;
-  }
-  public function setLoyaltyPoints(Google_Service_ShoppingContent_LoyaltyPoints $loyaltyPoints)
-  {
-    $this->loyaltyPoints = $loyaltyPoints;
-  }
-  public function getLoyaltyPoints()
-  {
-    return $this->loyaltyPoints;
-  }
-  public function setPickup(Google_Service_ShoppingContent_InventoryPickup $pickup)
-  {
-    $this->pickup = $pickup;
-  }
-  public function getPickup()
-  {
-    return $this->pickup;
-  }
-  public function setPrice(Google_Service_ShoppingContent_Price $price)
-  {
-    $this->price = $price;
-  }
-  public function getPrice()
-  {
-    return $this->price;
-  }
-  public function setQuantity($quantity)
-  {
-    $this->quantity = $quantity;
-  }
-  public function getQuantity()
-  {
-    return $this->quantity;
-  }
-  public function setSalePrice(Google_Service_ShoppingContent_Price $salePrice)
-  {
-    $this->salePrice = $salePrice;
-  }
-  public function getSalePrice()
-  {
-    return $this->salePrice;
-  }
-  public function setSalePriceEffectiveDate($salePriceEffectiveDate)
-  {
-    $this->salePriceEffectiveDate = $salePriceEffectiveDate;
-  }
-  public function getSalePriceEffectiveDate()
-  {
-    return $this->salePriceEffectiveDate;
-  }
-  public function setSellOnGoogleQuantity($sellOnGoogleQuantity)
-  {
-    $this->sellOnGoogleQuantity = $sellOnGoogleQuantity;
-  }
-  public function getSellOnGoogleQuantity()
-  {
-    return $this->sellOnGoogleQuantity;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ShoppingContent/InventorySetResponse.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ShoppingContent/InventorySetResponse.php
deleted file mode 100644
index d96ea0d3..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ShoppingContent/InventorySetResponse.php
+++ /dev/null
@@ -1,30 +0,0 @@
-kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ShoppingContent/LocationIdSet.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ShoppingContent/LocationIdSet.php
deleted file mode 100644
index b4e5fd8c..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ShoppingContent/LocationIdSet.php
+++ /dev/null
@@ -1,31 +0,0 @@
-locationIds = $locationIds;
-  }
-  public function getLocationIds()
-  {
-    return $this->locationIds;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ShoppingContent/LoyaltyPoints.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ShoppingContent/LoyaltyPoints.php
deleted file mode 100644
index 4a7efdda..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ShoppingContent/LoyaltyPoints.php
+++ /dev/null
@@ -1,48 +0,0 @@
-name = $name;
-  }
-  public function getName()
-  {
-    return $this->name;
-  }
-  public function setPointsValue($pointsValue)
-  {
-    $this->pointsValue = $pointsValue;
-  }
-  public function getPointsValue()
-  {
-    return $this->pointsValue;
-  }
-  public function setRatio($ratio)
-  {
-    $this->ratio = $ratio;
-  }
-  public function getRatio()
-  {
-    return $this->ratio;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ShoppingContent/Order.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ShoppingContent/Order.php
deleted file mode 100644
index d728d6c8..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ShoppingContent/Order.php
+++ /dev/null
@@ -1,212 +0,0 @@
-acknowledged = $acknowledged;
-  }
-  public function getAcknowledged()
-  {
-    return $this->acknowledged;
-  }
-  public function setChannelType($channelType)
-  {
-    $this->channelType = $channelType;
-  }
-  public function getChannelType()
-  {
-    return $this->channelType;
-  }
-  public function setCustomer(Google_Service_ShoppingContent_OrderCustomer $customer)
-  {
-    $this->customer = $customer;
-  }
-  public function getCustomer()
-  {
-    return $this->customer;
-  }
-  public function setDeliveryDetails(Google_Service_ShoppingContent_OrderDeliveryDetails $deliveryDetails)
-  {
-    $this->deliveryDetails = $deliveryDetails;
-  }
-  public function getDeliveryDetails()
-  {
-    return $this->deliveryDetails;
-  }
-  public function setId($id)
-  {
-    $this->id = $id;
-  }
-  public function getId()
-  {
-    return $this->id;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setLineItems($lineItems)
-  {
-    $this->lineItems = $lineItems;
-  }
-  public function getLineItems()
-  {
-    return $this->lineItems;
-  }
-  public function setMerchantId($merchantId)
-  {
-    $this->merchantId = $merchantId;
-  }
-  public function getMerchantId()
-  {
-    return $this->merchantId;
-  }
-  public function setMerchantOrderId($merchantOrderId)
-  {
-    $this->merchantOrderId = $merchantOrderId;
-  }
-  public function getMerchantOrderId()
-  {
-    return $this->merchantOrderId;
-  }
-  public function setNetAmount(Google_Service_ShoppingContent_Price $netAmount)
-  {
-    $this->netAmount = $netAmount;
-  }
-  public function getNetAmount()
-  {
-    return $this->netAmount;
-  }
-  public function setPaymentMethod(Google_Service_ShoppingContent_OrderPaymentMethod $paymentMethod)
-  {
-    $this->paymentMethod = $paymentMethod;
-  }
-  public function getPaymentMethod()
-  {
-    return $this->paymentMethod;
-  }
-  public function setPaymentStatus($paymentStatus)
-  {
-    $this->paymentStatus = $paymentStatus;
-  }
-  public function getPaymentStatus()
-  {
-    return $this->paymentStatus;
-  }
-  public function setPlacedDate($placedDate)
-  {
-    $this->placedDate = $placedDate;
-  }
-  public function getPlacedDate()
-  {
-    return $this->placedDate;
-  }
-  public function setPromotions($promotions)
-  {
-    $this->promotions = $promotions;
-  }
-  public function getPromotions()
-  {
-    return $this->promotions;
-  }
-  public function setRefunds($refunds)
-  {
-    $this->refunds = $refunds;
-  }
-  public function getRefunds()
-  {
-    return $this->refunds;
-  }
-  public function setShipments($shipments)
-  {
-    $this->shipments = $shipments;
-  }
-  public function getShipments()
-  {
-    return $this->shipments;
-  }
-  public function setShippingCost(Google_Service_ShoppingContent_Price $shippingCost)
-  {
-    $this->shippingCost = $shippingCost;
-  }
-  public function getShippingCost()
-  {
-    return $this->shippingCost;
-  }
-  public function setShippingCostTax(Google_Service_ShoppingContent_Price $shippingCostTax)
-  {
-    $this->shippingCostTax = $shippingCostTax;
-  }
-  public function getShippingCostTax()
-  {
-    return $this->shippingCostTax;
-  }
-  public function setShippingOption($shippingOption)
-  {
-    $this->shippingOption = $shippingOption;
-  }
-  public function getShippingOption()
-  {
-    return $this->shippingOption;
-  }
-  public function setStatus($status)
-  {
-    $this->status = $status;
-  }
-  public function getStatus()
-  {
-    return $this->status;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ShoppingContent/OrderAddress.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ShoppingContent/OrderAddress.php
deleted file mode 100644
index f563025a..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ShoppingContent/OrderAddress.php
+++ /dev/null
@@ -1,94 +0,0 @@
-country = $country;
-  }
-  public function getCountry()
-  {
-    return $this->country;
-  }
-  public function setFullAddress($fullAddress)
-  {
-    $this->fullAddress = $fullAddress;
-  }
-  public function getFullAddress()
-  {
-    return $this->fullAddress;
-  }
-  public function setIsPostOfficeBox($isPostOfficeBox)
-  {
-    $this->isPostOfficeBox = $isPostOfficeBox;
-  }
-  public function getIsPostOfficeBox()
-  {
-    return $this->isPostOfficeBox;
-  }
-  public function setLocality($locality)
-  {
-    $this->locality = $locality;
-  }
-  public function getLocality()
-  {
-    return $this->locality;
-  }
-  public function setPostalCode($postalCode)
-  {
-    $this->postalCode = $postalCode;
-  }
-  public function getPostalCode()
-  {
-    return $this->postalCode;
-  }
-  public function setRecipientName($recipientName)
-  {
-    $this->recipientName = $recipientName;
-  }
-  public function getRecipientName()
-  {
-    return $this->recipientName;
-  }
-  public function setRegion($region)
-  {
-    $this->region = $region;
-  }
-  public function getRegion()
-  {
-    return $this->region;
-  }
-  public function setStreetAddress($streetAddress)
-  {
-    $this->streetAddress = $streetAddress;
-  }
-  public function getStreetAddress()
-  {
-    return $this->streetAddress;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ShoppingContent/OrderCancellation.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ShoppingContent/OrderCancellation.php
deleted file mode 100644
index 7811b102..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ShoppingContent/OrderCancellation.php
+++ /dev/null
@@ -1,66 +0,0 @@
-actor = $actor;
-  }
-  public function getActor()
-  {
-    return $this->actor;
-  }
-  public function setCreationDate($creationDate)
-  {
-    $this->creationDate = $creationDate;
-  }
-  public function getCreationDate()
-  {
-    return $this->creationDate;
-  }
-  public function setQuantity($quantity)
-  {
-    $this->quantity = $quantity;
-  }
-  public function getQuantity()
-  {
-    return $this->quantity;
-  }
-  public function setReason($reason)
-  {
-    $this->reason = $reason;
-  }
-  public function getReason()
-  {
-    return $this->reason;
-  }
-  public function setReasonText($reasonText)
-  {
-    $this->reasonText = $reasonText;
-  }
-  public function getReasonText()
-  {
-    return $this->reasonText;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ShoppingContent/OrderCustomer.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ShoppingContent/OrderCustomer.php
deleted file mode 100644
index 08bf0aa9..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ShoppingContent/OrderCustomer.php
+++ /dev/null
@@ -1,48 +0,0 @@
-email = $email;
-  }
-  public function getEmail()
-  {
-    return $this->email;
-  }
-  public function setExplicitMarketingPreference($explicitMarketingPreference)
-  {
-    $this->explicitMarketingPreference = $explicitMarketingPreference;
-  }
-  public function getExplicitMarketingPreference()
-  {
-    return $this->explicitMarketingPreference;
-  }
-  public function setFullName($fullName)
-  {
-    $this->fullName = $fullName;
-  }
-  public function getFullName()
-  {
-    return $this->fullName;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ShoppingContent/OrderDeliveryDetails.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ShoppingContent/OrderDeliveryDetails.php
deleted file mode 100644
index 0952f787..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ShoppingContent/OrderDeliveryDetails.php
+++ /dev/null
@@ -1,40 +0,0 @@
-address = $address;
-  }
-  public function getAddress()
-  {
-    return $this->address;
-  }
-  public function setPhoneNumber($phoneNumber)
-  {
-    $this->phoneNumber = $phoneNumber;
-  }
-  public function getPhoneNumber()
-  {
-    return $this->phoneNumber;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ShoppingContent/OrderLineItem.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ShoppingContent/OrderLineItem.php
deleted file mode 100644
index 1e71e8a7..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ShoppingContent/OrderLineItem.php
+++ /dev/null
@@ -1,155 +0,0 @@
-cancellations = $cancellations;
-  }
-  public function getCancellations()
-  {
-    return $this->cancellations;
-  }
-  public function setId($id)
-  {
-    $this->id = $id;
-  }
-  public function getId()
-  {
-    return $this->id;
-  }
-  public function setPrice(Google_Service_ShoppingContent_Price $price)
-  {
-    $this->price = $price;
-  }
-  public function getPrice()
-  {
-    return $this->price;
-  }
-  public function setProduct(Google_Service_ShoppingContent_OrderLineItemProduct $product)
-  {
-    $this->product = $product;
-  }
-  public function getProduct()
-  {
-    return $this->product;
-  }
-  public function setQuantityCanceled($quantityCanceled)
-  {
-    $this->quantityCanceled = $quantityCanceled;
-  }
-  public function getQuantityCanceled()
-  {
-    return $this->quantityCanceled;
-  }
-  public function setQuantityDelivered($quantityDelivered)
-  {
-    $this->quantityDelivered = $quantityDelivered;
-  }
-  public function getQuantityDelivered()
-  {
-    return $this->quantityDelivered;
-  }
-  public function setQuantityOrdered($quantityOrdered)
-  {
-    $this->quantityOrdered = $quantityOrdered;
-  }
-  public function getQuantityOrdered()
-  {
-    return $this->quantityOrdered;
-  }
-  public function setQuantityPending($quantityPending)
-  {
-    $this->quantityPending = $quantityPending;
-  }
-  public function getQuantityPending()
-  {
-    return $this->quantityPending;
-  }
-  public function setQuantityReturned($quantityReturned)
-  {
-    $this->quantityReturned = $quantityReturned;
-  }
-  public function getQuantityReturned()
-  {
-    return $this->quantityReturned;
-  }
-  public function setQuantityShipped($quantityShipped)
-  {
-    $this->quantityShipped = $quantityShipped;
-  }
-  public function getQuantityShipped()
-  {
-    return $this->quantityShipped;
-  }
-  public function setReturnInfo(Google_Service_ShoppingContent_OrderLineItemReturnInfo $returnInfo)
-  {
-    $this->returnInfo = $returnInfo;
-  }
-  public function getReturnInfo()
-  {
-    return $this->returnInfo;
-  }
-  public function setReturns($returns)
-  {
-    $this->returns = $returns;
-  }
-  public function getReturns()
-  {
-    return $this->returns;
-  }
-  public function setShippingDetails(Google_Service_ShoppingContent_OrderLineItemShippingDetails $shippingDetails)
-  {
-    $this->shippingDetails = $shippingDetails;
-  }
-  public function getShippingDetails()
-  {
-    return $this->shippingDetails;
-  }
-  public function setTax(Google_Service_ShoppingContent_Price $tax)
-  {
-    $this->tax = $tax;
-  }
-  public function getTax()
-  {
-    return $this->tax;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ShoppingContent/OrderLineItemProduct.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ShoppingContent/OrderLineItemProduct.php
deleted file mode 100644
index bcea3e5d..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ShoppingContent/OrderLineItemProduct.php
+++ /dev/null
@@ -1,159 +0,0 @@
-brand = $brand;
-  }
-  public function getBrand()
-  {
-    return $this->brand;
-  }
-  public function setChannel($channel)
-  {
-    $this->channel = $channel;
-  }
-  public function getChannel()
-  {
-    return $this->channel;
-  }
-  public function setCondition($condition)
-  {
-    $this->condition = $condition;
-  }
-  public function getCondition()
-  {
-    return $this->condition;
-  }
-  public function setContentLanguage($contentLanguage)
-  {
-    $this->contentLanguage = $contentLanguage;
-  }
-  public function getContentLanguage()
-  {
-    return $this->contentLanguage;
-  }
-  public function setGtin($gtin)
-  {
-    $this->gtin = $gtin;
-  }
-  public function getGtin()
-  {
-    return $this->gtin;
-  }
-  public function setId($id)
-  {
-    $this->id = $id;
-  }
-  public function getId()
-  {
-    return $this->id;
-  }
-  public function setImageLink($imageLink)
-  {
-    $this->imageLink = $imageLink;
-  }
-  public function getImageLink()
-  {
-    return $this->imageLink;
-  }
-  public function setItemGroupId($itemGroupId)
-  {
-    $this->itemGroupId = $itemGroupId;
-  }
-  public function getItemGroupId()
-  {
-    return $this->itemGroupId;
-  }
-  public function setMpn($mpn)
-  {
-    $this->mpn = $mpn;
-  }
-  public function getMpn()
-  {
-    return $this->mpn;
-  }
-  public function setOfferId($offerId)
-  {
-    $this->offerId = $offerId;
-  }
-  public function getOfferId()
-  {
-    return $this->offerId;
-  }
-  public function setPrice(Google_Service_ShoppingContent_Price $price)
-  {
-    $this->price = $price;
-  }
-  public function getPrice()
-  {
-    return $this->price;
-  }
-  public function setShownImage($shownImage)
-  {
-    $this->shownImage = $shownImage;
-  }
-  public function getShownImage()
-  {
-    return $this->shownImage;
-  }
-  public function setTargetCountry($targetCountry)
-  {
-    $this->targetCountry = $targetCountry;
-  }
-  public function getTargetCountry()
-  {
-    return $this->targetCountry;
-  }
-  public function setTitle($title)
-  {
-    $this->title = $title;
-  }
-  public function getTitle()
-  {
-    return $this->title;
-  }
-  public function setVariantAttributes($variantAttributes)
-  {
-    $this->variantAttributes = $variantAttributes;
-  }
-  public function getVariantAttributes()
-  {
-    return $this->variantAttributes;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ShoppingContent/OrderLineItemProductVariantAttribute.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ShoppingContent/OrderLineItemProductVariantAttribute.php
deleted file mode 100644
index 683abc5a..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ShoppingContent/OrderLineItemProductVariantAttribute.php
+++ /dev/null
@@ -1,39 +0,0 @@
-dimension = $dimension;
-  }
-  public function getDimension()
-  {
-    return $this->dimension;
-  }
-  public function setValue($value)
-  {
-    $this->value = $value;
-  }
-  public function getValue()
-  {
-    return $this->value;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ShoppingContent/OrderLineItemReturnInfo.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ShoppingContent/OrderLineItemReturnInfo.php
deleted file mode 100644
index 9a6751be..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ShoppingContent/OrderLineItemReturnInfo.php
+++ /dev/null
@@ -1,48 +0,0 @@
-daysToReturn = $daysToReturn;
-  }
-  public function getDaysToReturn()
-  {
-    return $this->daysToReturn;
-  }
-  public function setIsReturnable($isReturnable)
-  {
-    $this->isReturnable = $isReturnable;
-  }
-  public function getIsReturnable()
-  {
-    return $this->isReturnable;
-  }
-  public function setPolicyUrl($policyUrl)
-  {
-    $this->policyUrl = $policyUrl;
-  }
-  public function getPolicyUrl()
-  {
-    return $this->policyUrl;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ShoppingContent/OrderLineItemShippingDetails.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ShoppingContent/OrderLineItemShippingDetails.php
deleted file mode 100644
index 06835aae..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ShoppingContent/OrderLineItemShippingDetails.php
+++ /dev/null
@@ -1,49 +0,0 @@
-deliverByDate = $deliverByDate;
-  }
-  public function getDeliverByDate()
-  {
-    return $this->deliverByDate;
-  }
-  public function setMethod(Google_Service_ShoppingContent_OrderLineItemShippingDetailsMethod $method)
-  {
-    $this->method = $method;
-  }
-  public function getMethod()
-  {
-    return $this->method;
-  }
-  public function setShipByDate($shipByDate)
-  {
-    $this->shipByDate = $shipByDate;
-  }
-  public function getShipByDate()
-  {
-    return $this->shipByDate;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ShoppingContent/OrderLineItemShippingDetailsMethod.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ShoppingContent/OrderLineItemShippingDetailsMethod.php
deleted file mode 100644
index d118b871..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ShoppingContent/OrderLineItemShippingDetailsMethod.php
+++ /dev/null
@@ -1,57 +0,0 @@
-carrier = $carrier;
-  }
-  public function getCarrier()
-  {
-    return $this->carrier;
-  }
-  public function setMaxDaysInTransit($maxDaysInTransit)
-  {
-    $this->maxDaysInTransit = $maxDaysInTransit;
-  }
-  public function getMaxDaysInTransit()
-  {
-    return $this->maxDaysInTransit;
-  }
-  public function setMethodName($methodName)
-  {
-    $this->methodName = $methodName;
-  }
-  public function getMethodName()
-  {
-    return $this->methodName;
-  }
-  public function setMinDaysInTransit($minDaysInTransit)
-  {
-    $this->minDaysInTransit = $minDaysInTransit;
-  }
-  public function getMinDaysInTransit()
-  {
-    return $this->minDaysInTransit;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ShoppingContent/OrderPaymentMethod.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ShoppingContent/OrderPaymentMethod.php
deleted file mode 100644
index cdcc1a33..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ShoppingContent/OrderPaymentMethod.php
+++ /dev/null
@@ -1,76 +0,0 @@
-billingAddress = $billingAddress;
-  }
-  public function getBillingAddress()
-  {
-    return $this->billingAddress;
-  }
-  public function setExpirationMonth($expirationMonth)
-  {
-    $this->expirationMonth = $expirationMonth;
-  }
-  public function getExpirationMonth()
-  {
-    return $this->expirationMonth;
-  }
-  public function setExpirationYear($expirationYear)
-  {
-    $this->expirationYear = $expirationYear;
-  }
-  public function getExpirationYear()
-  {
-    return $this->expirationYear;
-  }
-  public function setLastFourDigits($lastFourDigits)
-  {
-    $this->lastFourDigits = $lastFourDigits;
-  }
-  public function getLastFourDigits()
-  {
-    return $this->lastFourDigits;
-  }
-  public function setPhoneNumber($phoneNumber)
-  {
-    $this->phoneNumber = $phoneNumber;
-  }
-  public function getPhoneNumber()
-  {
-    return $this->phoneNumber;
-  }
-  public function setType($type)
-  {
-    $this->type = $type;
-  }
-  public function getType()
-  {
-    return $this->type;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ShoppingContent/OrderPromotion.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ShoppingContent/OrderPromotion.php
deleted file mode 100644
index f694ac57..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ShoppingContent/OrderPromotion.php
+++ /dev/null
@@ -1,86 +0,0 @@
-benefits = $benefits;
-  }
-  public function getBenefits()
-  {
-    return $this->benefits;
-  }
-  public function setEffectiveDates($effectiveDates)
-  {
-    $this->effectiveDates = $effectiveDates;
-  }
-  public function getEffectiveDates()
-  {
-    return $this->effectiveDates;
-  }
-  public function setGenericRedemptionCode($genericRedemptionCode)
-  {
-    $this->genericRedemptionCode = $genericRedemptionCode;
-  }
-  public function getGenericRedemptionCode()
-  {
-    return $this->genericRedemptionCode;
-  }
-  public function setId($id)
-  {
-    $this->id = $id;
-  }
-  public function getId()
-  {
-    return $this->id;
-  }
-  public function setLongTitle($longTitle)
-  {
-    $this->longTitle = $longTitle;
-  }
-  public function getLongTitle()
-  {
-    return $this->longTitle;
-  }
-  public function setProductApplicability($productApplicability)
-  {
-    $this->productApplicability = $productApplicability;
-  }
-  public function getProductApplicability()
-  {
-    return $this->productApplicability;
-  }
-  public function setRedemptionChannel($redemptionChannel)
-  {
-    $this->redemptionChannel = $redemptionChannel;
-  }
-  public function getRedemptionChannel()
-  {
-    return $this->redemptionChannel;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ShoppingContent/OrderPromotionBenefit.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ShoppingContent/OrderPromotionBenefit.php
deleted file mode 100644
index 285932e5..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ShoppingContent/OrderPromotionBenefit.php
+++ /dev/null
@@ -1,69 +0,0 @@
-discount = $discount;
-  }
-  public function getDiscount()
-  {
-    return $this->discount;
-  }
-  public function setOfferIds($offerIds)
-  {
-    $this->offerIds = $offerIds;
-  }
-  public function getOfferIds()
-  {
-    return $this->offerIds;
-  }
-  public function setSubType($subType)
-  {
-    $this->subType = $subType;
-  }
-  public function getSubType()
-  {
-    return $this->subType;
-  }
-  public function setTaxImpact(Google_Service_ShoppingContent_Price $taxImpact)
-  {
-    $this->taxImpact = $taxImpact;
-  }
-  public function getTaxImpact()
-  {
-    return $this->taxImpact;
-  }
-  public function setType($type)
-  {
-    $this->type = $type;
-  }
-  public function getType()
-  {
-    return $this->type;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ShoppingContent/OrderRefund.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ShoppingContent/OrderRefund.php
deleted file mode 100644
index b277b5d7..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ShoppingContent/OrderRefund.php
+++ /dev/null
@@ -1,67 +0,0 @@
-actor = $actor;
-  }
-  public function getActor()
-  {
-    return $this->actor;
-  }
-  public function setAmount(Google_Service_ShoppingContent_Price $amount)
-  {
-    $this->amount = $amount;
-  }
-  public function getAmount()
-  {
-    return $this->amount;
-  }
-  public function setCreationDate($creationDate)
-  {
-    $this->creationDate = $creationDate;
-  }
-  public function getCreationDate()
-  {
-    return $this->creationDate;
-  }
-  public function setReason($reason)
-  {
-    $this->reason = $reason;
-  }
-  public function getReason()
-  {
-    return $this->reason;
-  }
-  public function setReasonText($reasonText)
-  {
-    $this->reasonText = $reasonText;
-  }
-  public function getReasonText()
-  {
-    return $this->reasonText;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ShoppingContent/OrderReturn.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ShoppingContent/OrderReturn.php
deleted file mode 100644
index 7af5e517..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ShoppingContent/OrderReturn.php
+++ /dev/null
@@ -1,66 +0,0 @@
-actor = $actor;
-  }
-  public function getActor()
-  {
-    return $this->actor;
-  }
-  public function setCreationDate($creationDate)
-  {
-    $this->creationDate = $creationDate;
-  }
-  public function getCreationDate()
-  {
-    return $this->creationDate;
-  }
-  public function setQuantity($quantity)
-  {
-    $this->quantity = $quantity;
-  }
-  public function getQuantity()
-  {
-    return $this->quantity;
-  }
-  public function setReason($reason)
-  {
-    $this->reason = $reason;
-  }
-  public function getReason()
-  {
-    return $this->reason;
-  }
-  public function setReasonText($reasonText)
-  {
-    $this->reasonText = $reasonText;
-  }
-  public function getReasonText()
-  {
-    return $this->reasonText;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ShoppingContent/OrderShipment.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ShoppingContent/OrderShipment.php
deleted file mode 100644
index 0b2aab78..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ShoppingContent/OrderShipment.php
+++ /dev/null
@@ -1,86 +0,0 @@
-carrier = $carrier;
-  }
-  public function getCarrier()
-  {
-    return $this->carrier;
-  }
-  public function setCreationDate($creationDate)
-  {
-    $this->creationDate = $creationDate;
-  }
-  public function getCreationDate()
-  {
-    return $this->creationDate;
-  }
-  public function setDeliveryDate($deliveryDate)
-  {
-    $this->deliveryDate = $deliveryDate;
-  }
-  public function getDeliveryDate()
-  {
-    return $this->deliveryDate;
-  }
-  public function setId($id)
-  {
-    $this->id = $id;
-  }
-  public function getId()
-  {
-    return $this->id;
-  }
-  public function setLineItems($lineItems)
-  {
-    $this->lineItems = $lineItems;
-  }
-  public function getLineItems()
-  {
-    return $this->lineItems;
-  }
-  public function setStatus($status)
-  {
-    $this->status = $status;
-  }
-  public function getStatus()
-  {
-    return $this->status;
-  }
-  public function setTrackingId($trackingId)
-  {
-    $this->trackingId = $trackingId;
-  }
-  public function getTrackingId()
-  {
-    return $this->trackingId;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ShoppingContent/OrderShipmentLineItemShipment.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ShoppingContent/OrderShipmentLineItemShipment.php
deleted file mode 100644
index 7173efc2..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ShoppingContent/OrderShipmentLineItemShipment.php
+++ /dev/null
@@ -1,39 +0,0 @@
-lineItemId = $lineItemId;
-  }
-  public function getLineItemId()
-  {
-    return $this->lineItemId;
-  }
-  public function setQuantity($quantity)
-  {
-    $this->quantity = $quantity;
-  }
-  public function getQuantity()
-  {
-    return $this->quantity;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ShoppingContent/OrdersAcknowledgeRequest.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ShoppingContent/OrdersAcknowledgeRequest.php
deleted file mode 100644
index ccbae30c..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ShoppingContent/OrdersAcknowledgeRequest.php
+++ /dev/null
@@ -1,30 +0,0 @@
-operationId = $operationId;
-  }
-  public function getOperationId()
-  {
-    return $this->operationId;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ShoppingContent/OrdersAcknowledgeResponse.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ShoppingContent/OrdersAcknowledgeResponse.php
deleted file mode 100644
index 2d586e78..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ShoppingContent/OrdersAcknowledgeResponse.php
+++ /dev/null
@@ -1,39 +0,0 @@
-executionStatus = $executionStatus;
-  }
-  public function getExecutionStatus()
-  {
-    return $this->executionStatus;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ShoppingContent/OrdersAdvanceTestOrderResponse.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ShoppingContent/OrdersAdvanceTestOrderResponse.php
deleted file mode 100644
index b430fd5d..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ShoppingContent/OrdersAdvanceTestOrderResponse.php
+++ /dev/null
@@ -1,30 +0,0 @@
-kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ShoppingContent/OrdersCancelLineItemRequest.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ShoppingContent/OrdersCancelLineItemRequest.php
deleted file mode 100644
index 489b773f..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ShoppingContent/OrdersCancelLineItemRequest.php
+++ /dev/null
@@ -1,76 +0,0 @@
-amount = $amount;
-  }
-  public function getAmount()
-  {
-    return $this->amount;
-  }
-  public function setLineItemId($lineItemId)
-  {
-    $this->lineItemId = $lineItemId;
-  }
-  public function getLineItemId()
-  {
-    return $this->lineItemId;
-  }
-  public function setOperationId($operationId)
-  {
-    $this->operationId = $operationId;
-  }
-  public function getOperationId()
-  {
-    return $this->operationId;
-  }
-  public function setQuantity($quantity)
-  {
-    $this->quantity = $quantity;
-  }
-  public function getQuantity()
-  {
-    return $this->quantity;
-  }
-  public function setReason($reason)
-  {
-    $this->reason = $reason;
-  }
-  public function getReason()
-  {
-    return $this->reason;
-  }
-  public function setReasonText($reasonText)
-  {
-    $this->reasonText = $reasonText;
-  }
-  public function getReasonText()
-  {
-    return $this->reasonText;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ShoppingContent/OrdersCancelLineItemResponse.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ShoppingContent/OrdersCancelLineItemResponse.php
deleted file mode 100644
index 30842da8..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ShoppingContent/OrdersCancelLineItemResponse.php
+++ /dev/null
@@ -1,39 +0,0 @@
-executionStatus = $executionStatus;
-  }
-  public function getExecutionStatus()
-  {
-    return $this->executionStatus;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ShoppingContent/OrdersCancelRequest.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ShoppingContent/OrdersCancelRequest.php
deleted file mode 100644
index 13dce6d5..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ShoppingContent/OrdersCancelRequest.php
+++ /dev/null
@@ -1,48 +0,0 @@
-operationId = $operationId;
-  }
-  public function getOperationId()
-  {
-    return $this->operationId;
-  }
-  public function setReason($reason)
-  {
-    $this->reason = $reason;
-  }
-  public function getReason()
-  {
-    return $this->reason;
-  }
-  public function setReasonText($reasonText)
-  {
-    $this->reasonText = $reasonText;
-  }
-  public function getReasonText()
-  {
-    return $this->reasonText;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ShoppingContent/OrdersCancelResponse.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ShoppingContent/OrdersCancelResponse.php
deleted file mode 100644
index 125b5247..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ShoppingContent/OrdersCancelResponse.php
+++ /dev/null
@@ -1,39 +0,0 @@
-executionStatus = $executionStatus;
-  }
-  public function getExecutionStatus()
-  {
-    return $this->executionStatus;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ShoppingContent/OrdersCreateTestOrderRequest.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ShoppingContent/OrdersCreateTestOrderRequest.php
deleted file mode 100644
index 318781df..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ShoppingContent/OrdersCreateTestOrderRequest.php
+++ /dev/null
@@ -1,40 +0,0 @@
-templateName = $templateName;
-  }
-  public function getTemplateName()
-  {
-    return $this->templateName;
-  }
-  public function setTestOrder(Google_Service_ShoppingContent_TestOrder $testOrder)
-  {
-    $this->testOrder = $testOrder;
-  }
-  public function getTestOrder()
-  {
-    return $this->testOrder;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ShoppingContent/OrdersCreateTestOrderResponse.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ShoppingContent/OrdersCreateTestOrderResponse.php
deleted file mode 100644
index 87d8ac84..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ShoppingContent/OrdersCreateTestOrderResponse.php
+++ /dev/null
@@ -1,39 +0,0 @@
-kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setOrderId($orderId)
-  {
-    $this->orderId = $orderId;
-  }
-  public function getOrderId()
-  {
-    return $this->orderId;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ShoppingContent/OrdersCustomBatchRequest.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ShoppingContent/OrdersCustomBatchRequest.php
deleted file mode 100644
index 2af01536..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ShoppingContent/OrdersCustomBatchRequest.php
+++ /dev/null
@@ -1,32 +0,0 @@
-entries = $entries;
-  }
-  public function getEntries()
-  {
-    return $this->entries;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ShoppingContent/OrdersCustomBatchRequestEntry.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ShoppingContent/OrdersCustomBatchRequestEntry.php
deleted file mode 100644
index 6b6e91bb..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ShoppingContent/OrdersCustomBatchRequestEntry.php
+++ /dev/null
@@ -1,135 +0,0 @@
-batchId = $batchId;
-  }
-  public function getBatchId()
-  {
-    return $this->batchId;
-  }
-  public function setCancel(Google_Service_ShoppingContent_OrdersCustomBatchRequestEntryCancel $cancel)
-  {
-    $this->cancel = $cancel;
-  }
-  public function getCancel()
-  {
-    return $this->cancel;
-  }
-  public function setCancelLineItem(Google_Service_ShoppingContent_OrdersCustomBatchRequestEntryCancelLineItem $cancelLineItem)
-  {
-    $this->cancelLineItem = $cancelLineItem;
-  }
-  public function getCancelLineItem()
-  {
-    return $this->cancelLineItem;
-  }
-  public function setMerchantId($merchantId)
-  {
-    $this->merchantId = $merchantId;
-  }
-  public function getMerchantId()
-  {
-    return $this->merchantId;
-  }
-  public function setMerchantOrderId($merchantOrderId)
-  {
-    $this->merchantOrderId = $merchantOrderId;
-  }
-  public function getMerchantOrderId()
-  {
-    return $this->merchantOrderId;
-  }
-  public function setMethod($method)
-  {
-    $this->method = $method;
-  }
-  public function getMethod()
-  {
-    return $this->method;
-  }
-  public function setOperationId($operationId)
-  {
-    $this->operationId = $operationId;
-  }
-  public function getOperationId()
-  {
-    return $this->operationId;
-  }
-  public function setOrderId($orderId)
-  {
-    $this->orderId = $orderId;
-  }
-  public function getOrderId()
-  {
-    return $this->orderId;
-  }
-  public function setRefund(Google_Service_ShoppingContent_OrdersCustomBatchRequestEntryRefund $refund)
-  {
-    $this->refund = $refund;
-  }
-  public function getRefund()
-  {
-    return $this->refund;
-  }
-  public function setReturnLineItem(Google_Service_ShoppingContent_OrdersCustomBatchRequestEntryReturnLineItem $returnLineItem)
-  {
-    $this->returnLineItem = $returnLineItem;
-  }
-  public function getReturnLineItem()
-  {
-    return $this->returnLineItem;
-  }
-  public function setShipLineItems(Google_Service_ShoppingContent_OrdersCustomBatchRequestEntryShipLineItems $shipLineItems)
-  {
-    $this->shipLineItems = $shipLineItems;
-  }
-  public function getShipLineItems()
-  {
-    return $this->shipLineItems;
-  }
-  public function setUpdateShipment(Google_Service_ShoppingContent_OrdersCustomBatchRequestEntryUpdateShipment $updateShipment)
-  {
-    $this->updateShipment = $updateShipment;
-  }
-  public function getUpdateShipment()
-  {
-    return $this->updateShipment;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ShoppingContent/OrdersCustomBatchRequestEntryCancel.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ShoppingContent/OrdersCustomBatchRequestEntryCancel.php
deleted file mode 100644
index 742b2ab8..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ShoppingContent/OrdersCustomBatchRequestEntryCancel.php
+++ /dev/null
@@ -1,39 +0,0 @@
-reason = $reason;
-  }
-  public function getReason()
-  {
-    return $this->reason;
-  }
-  public function setReasonText($reasonText)
-  {
-    $this->reasonText = $reasonText;
-  }
-  public function getReasonText()
-  {
-    return $this->reasonText;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ShoppingContent/OrdersCustomBatchRequestEntryCancelLineItem.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ShoppingContent/OrdersCustomBatchRequestEntryCancelLineItem.php
deleted file mode 100644
index 09d00aca..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ShoppingContent/OrdersCustomBatchRequestEntryCancelLineItem.php
+++ /dev/null
@@ -1,67 +0,0 @@
-amount = $amount;
-  }
-  public function getAmount()
-  {
-    return $this->amount;
-  }
-  public function setLineItemId($lineItemId)
-  {
-    $this->lineItemId = $lineItemId;
-  }
-  public function getLineItemId()
-  {
-    return $this->lineItemId;
-  }
-  public function setQuantity($quantity)
-  {
-    $this->quantity = $quantity;
-  }
-  public function getQuantity()
-  {
-    return $this->quantity;
-  }
-  public function setReason($reason)
-  {
-    $this->reason = $reason;
-  }
-  public function getReason()
-  {
-    return $this->reason;
-  }
-  public function setReasonText($reasonText)
-  {
-    $this->reasonText = $reasonText;
-  }
-  public function getReasonText()
-  {
-    return $this->reasonText;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ShoppingContent/OrdersCustomBatchRequestEntryRefund.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ShoppingContent/OrdersCustomBatchRequestEntryRefund.php
deleted file mode 100644
index 5ba294a9..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ShoppingContent/OrdersCustomBatchRequestEntryRefund.php
+++ /dev/null
@@ -1,49 +0,0 @@
-amount = $amount;
-  }
-  public function getAmount()
-  {
-    return $this->amount;
-  }
-  public function setReason($reason)
-  {
-    $this->reason = $reason;
-  }
-  public function getReason()
-  {
-    return $this->reason;
-  }
-  public function setReasonText($reasonText)
-  {
-    $this->reasonText = $reasonText;
-  }
-  public function getReasonText()
-  {
-    return $this->reasonText;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ShoppingContent/OrdersCustomBatchRequestEntryReturnLineItem.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ShoppingContent/OrdersCustomBatchRequestEntryReturnLineItem.php
deleted file mode 100644
index 81051113..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ShoppingContent/OrdersCustomBatchRequestEntryReturnLineItem.php
+++ /dev/null
@@ -1,57 +0,0 @@
-lineItemId = $lineItemId;
-  }
-  public function getLineItemId()
-  {
-    return $this->lineItemId;
-  }
-  public function setQuantity($quantity)
-  {
-    $this->quantity = $quantity;
-  }
-  public function getQuantity()
-  {
-    return $this->quantity;
-  }
-  public function setReason($reason)
-  {
-    $this->reason = $reason;
-  }
-  public function getReason()
-  {
-    return $this->reason;
-  }
-  public function setReasonText($reasonText)
-  {
-    $this->reasonText = $reasonText;
-  }
-  public function getReasonText()
-  {
-    return $this->reasonText;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ShoppingContent/OrdersCustomBatchRequestEntryShipLineItems.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ShoppingContent/OrdersCustomBatchRequestEntryShipLineItems.php
deleted file mode 100644
index 70078c3d..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ShoppingContent/OrdersCustomBatchRequestEntryShipLineItems.php
+++ /dev/null
@@ -1,59 +0,0 @@
-carrier = $carrier;
-  }
-  public function getCarrier()
-  {
-    return $this->carrier;
-  }
-  public function setLineItems($lineItems)
-  {
-    $this->lineItems = $lineItems;
-  }
-  public function getLineItems()
-  {
-    return $this->lineItems;
-  }
-  public function setShipmentId($shipmentId)
-  {
-    $this->shipmentId = $shipmentId;
-  }
-  public function getShipmentId()
-  {
-    return $this->shipmentId;
-  }
-  public function setTrackingId($trackingId)
-  {
-    $this->trackingId = $trackingId;
-  }
-  public function getTrackingId()
-  {
-    return $this->trackingId;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ShoppingContent/OrdersCustomBatchRequestEntryUpdateShipment.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ShoppingContent/OrdersCustomBatchRequestEntryUpdateShipment.php
deleted file mode 100644
index 5e60cda8..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ShoppingContent/OrdersCustomBatchRequestEntryUpdateShipment.php
+++ /dev/null
@@ -1,57 +0,0 @@
-carrier = $carrier;
-  }
-  public function getCarrier()
-  {
-    return $this->carrier;
-  }
-  public function setShipmentId($shipmentId)
-  {
-    $this->shipmentId = $shipmentId;
-  }
-  public function getShipmentId()
-  {
-    return $this->shipmentId;
-  }
-  public function setStatus($status)
-  {
-    $this->status = $status;
-  }
-  public function getStatus()
-  {
-    return $this->status;
-  }
-  public function setTrackingId($trackingId)
-  {
-    $this->trackingId = $trackingId;
-  }
-  public function getTrackingId()
-  {
-    return $this->trackingId;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ShoppingContent/OrdersCustomBatchResponse.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ShoppingContent/OrdersCustomBatchResponse.php
deleted file mode 100644
index 14ce89c1..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ShoppingContent/OrdersCustomBatchResponse.php
+++ /dev/null
@@ -1,41 +0,0 @@
-entries = $entries;
-  }
-  public function getEntries()
-  {
-    return $this->entries;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ShoppingContent/OrdersCustomBatchResponseEntry.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ShoppingContent/OrdersCustomBatchResponseEntry.php
deleted file mode 100644
index 789f6fdd..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ShoppingContent/OrdersCustomBatchResponseEntry.php
+++ /dev/null
@@ -1,68 +0,0 @@
-batchId = $batchId;
-  }
-  public function getBatchId()
-  {
-    return $this->batchId;
-  }
-  public function setErrors(Google_Service_ShoppingContent_Errors $errors)
-  {
-    $this->errors = $errors;
-  }
-  public function getErrors()
-  {
-    return $this->errors;
-  }
-  public function setExecutionStatus($executionStatus)
-  {
-    $this->executionStatus = $executionStatus;
-  }
-  public function getExecutionStatus()
-  {
-    return $this->executionStatus;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setOrder(Google_Service_ShoppingContent_Order $order)
-  {
-    $this->order = $order;
-  }
-  public function getOrder()
-  {
-    return $this->order;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ShoppingContent/OrdersGetByMerchantOrderIdResponse.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ShoppingContent/OrdersGetByMerchantOrderIdResponse.php
deleted file mode 100644
index b0259ccb..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ShoppingContent/OrdersGetByMerchantOrderIdResponse.php
+++ /dev/null
@@ -1,40 +0,0 @@
-kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setOrder(Google_Service_ShoppingContent_Order $order)
-  {
-    $this->order = $order;
-  }
-  public function getOrder()
-  {
-    return $this->order;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ShoppingContent/OrdersGetTestOrderTemplateResponse.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ShoppingContent/OrdersGetTestOrderTemplateResponse.php
deleted file mode 100644
index a4f79521..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ShoppingContent/OrdersGetTestOrderTemplateResponse.php
+++ /dev/null
@@ -1,40 +0,0 @@
-kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setTemplate(Google_Service_ShoppingContent_TestOrder $template)
-  {
-    $this->template = $template;
-  }
-  public function getTemplate()
-  {
-    return $this->template;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ShoppingContent/OrdersListResponse.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ShoppingContent/OrdersListResponse.php
deleted file mode 100644
index 37d40dec..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ShoppingContent/OrdersListResponse.php
+++ /dev/null
@@ -1,50 +0,0 @@
-kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setNextPageToken($nextPageToken)
-  {
-    $this->nextPageToken = $nextPageToken;
-  }
-  public function getNextPageToken()
-  {
-    return $this->nextPageToken;
-  }
-  public function setResources($resources)
-  {
-    $this->resources = $resources;
-  }
-  public function getResources()
-  {
-    return $this->resources;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ShoppingContent/OrdersRefundRequest.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ShoppingContent/OrdersRefundRequest.php
deleted file mode 100644
index cc240840..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ShoppingContent/OrdersRefundRequest.php
+++ /dev/null
@@ -1,58 +0,0 @@
-amount = $amount;
-  }
-  public function getAmount()
-  {
-    return $this->amount;
-  }
-  public function setOperationId($operationId)
-  {
-    $this->operationId = $operationId;
-  }
-  public function getOperationId()
-  {
-    return $this->operationId;
-  }
-  public function setReason($reason)
-  {
-    $this->reason = $reason;
-  }
-  public function getReason()
-  {
-    return $this->reason;
-  }
-  public function setReasonText($reasonText)
-  {
-    $this->reasonText = $reasonText;
-  }
-  public function getReasonText()
-  {
-    return $this->reasonText;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ShoppingContent/OrdersRefundResponse.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ShoppingContent/OrdersRefundResponse.php
deleted file mode 100644
index 8c961600..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ShoppingContent/OrdersRefundResponse.php
+++ /dev/null
@@ -1,39 +0,0 @@
-executionStatus = $executionStatus;
-  }
-  public function getExecutionStatus()
-  {
-    return $this->executionStatus;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ShoppingContent/OrdersReturnLineItemRequest.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ShoppingContent/OrdersReturnLineItemRequest.php
deleted file mode 100644
index 27ed6e67..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ShoppingContent/OrdersReturnLineItemRequest.php
+++ /dev/null
@@ -1,66 +0,0 @@
-lineItemId = $lineItemId;
-  }
-  public function getLineItemId()
-  {
-    return $this->lineItemId;
-  }
-  public function setOperationId($operationId)
-  {
-    $this->operationId = $operationId;
-  }
-  public function getOperationId()
-  {
-    return $this->operationId;
-  }
-  public function setQuantity($quantity)
-  {
-    $this->quantity = $quantity;
-  }
-  public function getQuantity()
-  {
-    return $this->quantity;
-  }
-  public function setReason($reason)
-  {
-    $this->reason = $reason;
-  }
-  public function getReason()
-  {
-    return $this->reason;
-  }
-  public function setReasonText($reasonText)
-  {
-    $this->reasonText = $reasonText;
-  }
-  public function getReasonText()
-  {
-    return $this->reasonText;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ShoppingContent/OrdersReturnLineItemResponse.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ShoppingContent/OrdersReturnLineItemResponse.php
deleted file mode 100644
index 4178a38f..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ShoppingContent/OrdersReturnLineItemResponse.php
+++ /dev/null
@@ -1,39 +0,0 @@
-executionStatus = $executionStatus;
-  }
-  public function getExecutionStatus()
-  {
-    return $this->executionStatus;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ShoppingContent/OrdersShipLineItemsRequest.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ShoppingContent/OrdersShipLineItemsRequest.php
deleted file mode 100644
index 287aa028..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ShoppingContent/OrdersShipLineItemsRequest.php
+++ /dev/null
@@ -1,68 +0,0 @@
-carrier = $carrier;
-  }
-  public function getCarrier()
-  {
-    return $this->carrier;
-  }
-  public function setLineItems($lineItems)
-  {
-    $this->lineItems = $lineItems;
-  }
-  public function getLineItems()
-  {
-    return $this->lineItems;
-  }
-  public function setOperationId($operationId)
-  {
-    $this->operationId = $operationId;
-  }
-  public function getOperationId()
-  {
-    return $this->operationId;
-  }
-  public function setShipmentId($shipmentId)
-  {
-    $this->shipmentId = $shipmentId;
-  }
-  public function getShipmentId()
-  {
-    return $this->shipmentId;
-  }
-  public function setTrackingId($trackingId)
-  {
-    $this->trackingId = $trackingId;
-  }
-  public function getTrackingId()
-  {
-    return $this->trackingId;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ShoppingContent/OrdersShipLineItemsResponse.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ShoppingContent/OrdersShipLineItemsResponse.php
deleted file mode 100644
index a5240168..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ShoppingContent/OrdersShipLineItemsResponse.php
+++ /dev/null
@@ -1,39 +0,0 @@
-executionStatus = $executionStatus;
-  }
-  public function getExecutionStatus()
-  {
-    return $this->executionStatus;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ShoppingContent/OrdersUpdateMerchantOrderIdRequest.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ShoppingContent/OrdersUpdateMerchantOrderIdRequest.php
deleted file mode 100644
index b2d27871..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ShoppingContent/OrdersUpdateMerchantOrderIdRequest.php
+++ /dev/null
@@ -1,39 +0,0 @@
-merchantOrderId = $merchantOrderId;
-  }
-  public function getMerchantOrderId()
-  {
-    return $this->merchantOrderId;
-  }
-  public function setOperationId($operationId)
-  {
-    $this->operationId = $operationId;
-  }
-  public function getOperationId()
-  {
-    return $this->operationId;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ShoppingContent/OrdersUpdateMerchantOrderIdResponse.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ShoppingContent/OrdersUpdateMerchantOrderIdResponse.php
deleted file mode 100644
index 56e0290b..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ShoppingContent/OrdersUpdateMerchantOrderIdResponse.php
+++ /dev/null
@@ -1,39 +0,0 @@
-executionStatus = $executionStatus;
-  }
-  public function getExecutionStatus()
-  {
-    return $this->executionStatus;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ShoppingContent/OrdersUpdateShipmentRequest.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ShoppingContent/OrdersUpdateShipmentRequest.php
deleted file mode 100644
index 07359f4a..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ShoppingContent/OrdersUpdateShipmentRequest.php
+++ /dev/null
@@ -1,66 +0,0 @@
-carrier = $carrier;
-  }
-  public function getCarrier()
-  {
-    return $this->carrier;
-  }
-  public function setOperationId($operationId)
-  {
-    $this->operationId = $operationId;
-  }
-  public function getOperationId()
-  {
-    return $this->operationId;
-  }
-  public function setShipmentId($shipmentId)
-  {
-    $this->shipmentId = $shipmentId;
-  }
-  public function getShipmentId()
-  {
-    return $this->shipmentId;
-  }
-  public function setStatus($status)
-  {
-    $this->status = $status;
-  }
-  public function getStatus()
-  {
-    return $this->status;
-  }
-  public function setTrackingId($trackingId)
-  {
-    $this->trackingId = $trackingId;
-  }
-  public function getTrackingId()
-  {
-    return $this->trackingId;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ShoppingContent/OrdersUpdateShipmentResponse.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ShoppingContent/OrdersUpdateShipmentResponse.php
deleted file mode 100644
index 871098e1..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ShoppingContent/OrdersUpdateShipmentResponse.php
+++ /dev/null
@@ -1,39 +0,0 @@
-executionStatus = $executionStatus;
-  }
-  public function getExecutionStatus()
-  {
-    return $this->executionStatus;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ShoppingContent/PostalCodeGroup.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ShoppingContent/PostalCodeGroup.php
deleted file mode 100644
index e5497fc8..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ShoppingContent/PostalCodeGroup.php
+++ /dev/null
@@ -1,50 +0,0 @@
-country = $country;
-  }
-  public function getCountry()
-  {
-    return $this->country;
-  }
-  public function setName($name)
-  {
-    $this->name = $name;
-  }
-  public function getName()
-  {
-    return $this->name;
-  }
-  public function setPostalCodeRanges($postalCodeRanges)
-  {
-    $this->postalCodeRanges = $postalCodeRanges;
-  }
-  public function getPostalCodeRanges()
-  {
-    return $this->postalCodeRanges;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ShoppingContent/PostalCodeRange.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ShoppingContent/PostalCodeRange.php
deleted file mode 100644
index 70692f31..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ShoppingContent/PostalCodeRange.php
+++ /dev/null
@@ -1,39 +0,0 @@
-postalCodeRangeBegin = $postalCodeRangeBegin;
-  }
-  public function getPostalCodeRangeBegin()
-  {
-    return $this->postalCodeRangeBegin;
-  }
-  public function setPostalCodeRangeEnd($postalCodeRangeEnd)
-  {
-    $this->postalCodeRangeEnd = $postalCodeRangeEnd;
-  }
-  public function getPostalCodeRangeEnd()
-  {
-    return $this->postalCodeRangeEnd;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ShoppingContent/Price.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ShoppingContent/Price.php
deleted file mode 100644
index 8132f85c..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ShoppingContent/Price.php
+++ /dev/null
@@ -1,39 +0,0 @@
-currency = $currency;
-  }
-  public function getCurrency()
-  {
-    return $this->currency;
-  }
-  public function setValue($value)
-  {
-    $this->value = $value;
-  }
-  public function getValue()
-  {
-    return $this->value;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ShoppingContent/Product.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ShoppingContent/Product.php
deleted file mode 100644
index f2dd0c92..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ShoppingContent/Product.php
+++ /dev/null
@@ -1,687 +0,0 @@
-additionalImageLinks = $additionalImageLinks;
-  }
-  public function getAdditionalImageLinks()
-  {
-    return $this->additionalImageLinks;
-  }
-  public function setAdditionalProductTypes($additionalProductTypes)
-  {
-    $this->additionalProductTypes = $additionalProductTypes;
-  }
-  public function getAdditionalProductTypes()
-  {
-    return $this->additionalProductTypes;
-  }
-  public function setAdult($adult)
-  {
-    $this->adult = $adult;
-  }
-  public function getAdult()
-  {
-    return $this->adult;
-  }
-  public function setAdwordsGrouping($adwordsGrouping)
-  {
-    $this->adwordsGrouping = $adwordsGrouping;
-  }
-  public function getAdwordsGrouping()
-  {
-    return $this->adwordsGrouping;
-  }
-  public function setAdwordsLabels($adwordsLabels)
-  {
-    $this->adwordsLabels = $adwordsLabels;
-  }
-  public function getAdwordsLabels()
-  {
-    return $this->adwordsLabels;
-  }
-  public function setAdwordsRedirect($adwordsRedirect)
-  {
-    $this->adwordsRedirect = $adwordsRedirect;
-  }
-  public function getAdwordsRedirect()
-  {
-    return $this->adwordsRedirect;
-  }
-  public function setAgeGroup($ageGroup)
-  {
-    $this->ageGroup = $ageGroup;
-  }
-  public function getAgeGroup()
-  {
-    return $this->ageGroup;
-  }
-  public function setAspects($aspects)
-  {
-    $this->aspects = $aspects;
-  }
-  public function getAspects()
-  {
-    return $this->aspects;
-  }
-  public function setAvailability($availability)
-  {
-    $this->availability = $availability;
-  }
-  public function getAvailability()
-  {
-    return $this->availability;
-  }
-  public function setAvailabilityDate($availabilityDate)
-  {
-    $this->availabilityDate = $availabilityDate;
-  }
-  public function getAvailabilityDate()
-  {
-    return $this->availabilityDate;
-  }
-  public function setBrand($brand)
-  {
-    $this->brand = $brand;
-  }
-  public function getBrand()
-  {
-    return $this->brand;
-  }
-  public function setChannel($channel)
-  {
-    $this->channel = $channel;
-  }
-  public function getChannel()
-  {
-    return $this->channel;
-  }
-  public function setColor($color)
-  {
-    $this->color = $color;
-  }
-  public function getColor()
-  {
-    return $this->color;
-  }
-  public function setCondition($condition)
-  {
-    $this->condition = $condition;
-  }
-  public function getCondition()
-  {
-    return $this->condition;
-  }
-  public function setContentLanguage($contentLanguage)
-  {
-    $this->contentLanguage = $contentLanguage;
-  }
-  public function getContentLanguage()
-  {
-    return $this->contentLanguage;
-  }
-  public function setCustomAttributes($customAttributes)
-  {
-    $this->customAttributes = $customAttributes;
-  }
-  public function getCustomAttributes()
-  {
-    return $this->customAttributes;
-  }
-  public function setCustomGroups($customGroups)
-  {
-    $this->customGroups = $customGroups;
-  }
-  public function getCustomGroups()
-  {
-    return $this->customGroups;
-  }
-  public function setCustomLabel0($customLabel0)
-  {
-    $this->customLabel0 = $customLabel0;
-  }
-  public function getCustomLabel0()
-  {
-    return $this->customLabel0;
-  }
-  public function setCustomLabel1($customLabel1)
-  {
-    $this->customLabel1 = $customLabel1;
-  }
-  public function getCustomLabel1()
-  {
-    return $this->customLabel1;
-  }
-  public function setCustomLabel2($customLabel2)
-  {
-    $this->customLabel2 = $customLabel2;
-  }
-  public function getCustomLabel2()
-  {
-    return $this->customLabel2;
-  }
-  public function setCustomLabel3($customLabel3)
-  {
-    $this->customLabel3 = $customLabel3;
-  }
-  public function getCustomLabel3()
-  {
-    return $this->customLabel3;
-  }
-  public function setCustomLabel4($customLabel4)
-  {
-    $this->customLabel4 = $customLabel4;
-  }
-  public function getCustomLabel4()
-  {
-    return $this->customLabel4;
-  }
-  public function setDescription($description)
-  {
-    $this->description = $description;
-  }
-  public function getDescription()
-  {
-    return $this->description;
-  }
-  public function setDestinations($destinations)
-  {
-    $this->destinations = $destinations;
-  }
-  public function getDestinations()
-  {
-    return $this->destinations;
-  }
-  public function setDisplayAdsId($displayAdsId)
-  {
-    $this->displayAdsId = $displayAdsId;
-  }
-  public function getDisplayAdsId()
-  {
-    return $this->displayAdsId;
-  }
-  public function setDisplayAdsLink($displayAdsLink)
-  {
-    $this->displayAdsLink = $displayAdsLink;
-  }
-  public function getDisplayAdsLink()
-  {
-    return $this->displayAdsLink;
-  }
-  public function setDisplayAdsSimilarIds($displayAdsSimilarIds)
-  {
-    $this->displayAdsSimilarIds = $displayAdsSimilarIds;
-  }
-  public function getDisplayAdsSimilarIds()
-  {
-    return $this->displayAdsSimilarIds;
-  }
-  public function setDisplayAdsTitle($displayAdsTitle)
-  {
-    $this->displayAdsTitle = $displayAdsTitle;
-  }
-  public function getDisplayAdsTitle()
-  {
-    return $this->displayAdsTitle;
-  }
-  public function setDisplayAdsValue($displayAdsValue)
-  {
-    $this->displayAdsValue = $displayAdsValue;
-  }
-  public function getDisplayAdsValue()
-  {
-    return $this->displayAdsValue;
-  }
-  public function setEnergyEfficiencyClass($energyEfficiencyClass)
-  {
-    $this->energyEfficiencyClass = $energyEfficiencyClass;
-  }
-  public function getEnergyEfficiencyClass()
-  {
-    return $this->energyEfficiencyClass;
-  }
-  public function setExpirationDate($expirationDate)
-  {
-    $this->expirationDate = $expirationDate;
-  }
-  public function getExpirationDate()
-  {
-    return $this->expirationDate;
-  }
-  public function setGender($gender)
-  {
-    $this->gender = $gender;
-  }
-  public function getGender()
-  {
-    return $this->gender;
-  }
-  public function setGoogleProductCategory($googleProductCategory)
-  {
-    $this->googleProductCategory = $googleProductCategory;
-  }
-  public function getGoogleProductCategory()
-  {
-    return $this->googleProductCategory;
-  }
-  public function setGtin($gtin)
-  {
-    $this->gtin = $gtin;
-  }
-  public function getGtin()
-  {
-    return $this->gtin;
-  }
-  public function setId($id)
-  {
-    $this->id = $id;
-  }
-  public function getId()
-  {
-    return $this->id;
-  }
-  public function setIdentifierExists($identifierExists)
-  {
-    $this->identifierExists = $identifierExists;
-  }
-  public function getIdentifierExists()
-  {
-    return $this->identifierExists;
-  }
-  public function setImageLink($imageLink)
-  {
-    $this->imageLink = $imageLink;
-  }
-  public function getImageLink()
-  {
-    return $this->imageLink;
-  }
-  public function setInstallment(Google_Service_ShoppingContent_Installment $installment)
-  {
-    $this->installment = $installment;
-  }
-  public function getInstallment()
-  {
-    return $this->installment;
-  }
-  public function setIsBundle($isBundle)
-  {
-    $this->isBundle = $isBundle;
-  }
-  public function getIsBundle()
-  {
-    return $this->isBundle;
-  }
-  public function setItemGroupId($itemGroupId)
-  {
-    $this->itemGroupId = $itemGroupId;
-  }
-  public function getItemGroupId()
-  {
-    return $this->itemGroupId;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setLink($link)
-  {
-    $this->link = $link;
-  }
-  public function getLink()
-  {
-    return $this->link;
-  }
-  public function setLoyaltyPoints(Google_Service_ShoppingContent_LoyaltyPoints $loyaltyPoints)
-  {
-    $this->loyaltyPoints = $loyaltyPoints;
-  }
-  public function getLoyaltyPoints()
-  {
-    return $this->loyaltyPoints;
-  }
-  public function setMaterial($material)
-  {
-    $this->material = $material;
-  }
-  public function getMaterial()
-  {
-    return $this->material;
-  }
-  public function setMobileLink($mobileLink)
-  {
-    $this->mobileLink = $mobileLink;
-  }
-  public function getMobileLink()
-  {
-    return $this->mobileLink;
-  }
-  public function setMpn($mpn)
-  {
-    $this->mpn = $mpn;
-  }
-  public function getMpn()
-  {
-    return $this->mpn;
-  }
-  public function setMultipack($multipack)
-  {
-    $this->multipack = $multipack;
-  }
-  public function getMultipack()
-  {
-    return $this->multipack;
-  }
-  public function setOfferId($offerId)
-  {
-    $this->offerId = $offerId;
-  }
-  public function getOfferId()
-  {
-    return $this->offerId;
-  }
-  public function setOnlineOnly($onlineOnly)
-  {
-    $this->onlineOnly = $onlineOnly;
-  }
-  public function getOnlineOnly()
-  {
-    return $this->onlineOnly;
-  }
-  public function setPattern($pattern)
-  {
-    $this->pattern = $pattern;
-  }
-  public function getPattern()
-  {
-    return $this->pattern;
-  }
-  public function setPrice(Google_Service_ShoppingContent_Price $price)
-  {
-    $this->price = $price;
-  }
-  public function getPrice()
-  {
-    return $this->price;
-  }
-  public function setProductType($productType)
-  {
-    $this->productType = $productType;
-  }
-  public function getProductType()
-  {
-    return $this->productType;
-  }
-  public function setPromotionIds($promotionIds)
-  {
-    $this->promotionIds = $promotionIds;
-  }
-  public function getPromotionIds()
-  {
-    return $this->promotionIds;
-  }
-  public function setSalePrice(Google_Service_ShoppingContent_Price $salePrice)
-  {
-    $this->salePrice = $salePrice;
-  }
-  public function getSalePrice()
-  {
-    return $this->salePrice;
-  }
-  public function setSalePriceEffectiveDate($salePriceEffectiveDate)
-  {
-    $this->salePriceEffectiveDate = $salePriceEffectiveDate;
-  }
-  public function getSalePriceEffectiveDate()
-  {
-    return $this->salePriceEffectiveDate;
-  }
-  public function setSellOnGoogleQuantity($sellOnGoogleQuantity)
-  {
-    $this->sellOnGoogleQuantity = $sellOnGoogleQuantity;
-  }
-  public function getSellOnGoogleQuantity()
-  {
-    return $this->sellOnGoogleQuantity;
-  }
-  public function setShipping($shipping)
-  {
-    $this->shipping = $shipping;
-  }
-  public function getShipping()
-  {
-    return $this->shipping;
-  }
-  public function setShippingHeight(Google_Service_ShoppingContent_ProductShippingDimension $shippingHeight)
-  {
-    $this->shippingHeight = $shippingHeight;
-  }
-  public function getShippingHeight()
-  {
-    return $this->shippingHeight;
-  }
-  public function setShippingLabel($shippingLabel)
-  {
-    $this->shippingLabel = $shippingLabel;
-  }
-  public function getShippingLabel()
-  {
-    return $this->shippingLabel;
-  }
-  public function setShippingLength(Google_Service_ShoppingContent_ProductShippingDimension $shippingLength)
-  {
-    $this->shippingLength = $shippingLength;
-  }
-  public function getShippingLength()
-  {
-    return $this->shippingLength;
-  }
-  public function setShippingWeight(Google_Service_ShoppingContent_ProductShippingWeight $shippingWeight)
-  {
-    $this->shippingWeight = $shippingWeight;
-  }
-  public function getShippingWeight()
-  {
-    return $this->shippingWeight;
-  }
-  public function setShippingWidth(Google_Service_ShoppingContent_ProductShippingDimension $shippingWidth)
-  {
-    $this->shippingWidth = $shippingWidth;
-  }
-  public function getShippingWidth()
-  {
-    return $this->shippingWidth;
-  }
-  public function setSizeSystem($sizeSystem)
-  {
-    $this->sizeSystem = $sizeSystem;
-  }
-  public function getSizeSystem()
-  {
-    return $this->sizeSystem;
-  }
-  public function setSizeType($sizeType)
-  {
-    $this->sizeType = $sizeType;
-  }
-  public function getSizeType()
-  {
-    return $this->sizeType;
-  }
-  public function setSizes($sizes)
-  {
-    $this->sizes = $sizes;
-  }
-  public function getSizes()
-  {
-    return $this->sizes;
-  }
-  public function setTargetCountry($targetCountry)
-  {
-    $this->targetCountry = $targetCountry;
-  }
-  public function getTargetCountry()
-  {
-    return $this->targetCountry;
-  }
-  public function setTaxes($taxes)
-  {
-    $this->taxes = $taxes;
-  }
-  public function getTaxes()
-  {
-    return $this->taxes;
-  }
-  public function setTitle($title)
-  {
-    $this->title = $title;
-  }
-  public function getTitle()
-  {
-    return $this->title;
-  }
-  public function setUnitPricingBaseMeasure(Google_Service_ShoppingContent_ProductUnitPricingBaseMeasure $unitPricingBaseMeasure)
-  {
-    $this->unitPricingBaseMeasure = $unitPricingBaseMeasure;
-  }
-  public function getUnitPricingBaseMeasure()
-  {
-    return $this->unitPricingBaseMeasure;
-  }
-  public function setUnitPricingMeasure(Google_Service_ShoppingContent_ProductUnitPricingMeasure $unitPricingMeasure)
-  {
-    $this->unitPricingMeasure = $unitPricingMeasure;
-  }
-  public function getUnitPricingMeasure()
-  {
-    return $this->unitPricingMeasure;
-  }
-  public function setValidatedDestinations($validatedDestinations)
-  {
-    $this->validatedDestinations = $validatedDestinations;
-  }
-  public function getValidatedDestinations()
-  {
-    return $this->validatedDestinations;
-  }
-  public function setWarnings($warnings)
-  {
-    $this->warnings = $warnings;
-  }
-  public function getWarnings()
-  {
-    return $this->warnings;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ShoppingContent/ProductAspect.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ShoppingContent/ProductAspect.php
deleted file mode 100644
index 6f1f84ea..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ShoppingContent/ProductAspect.php
+++ /dev/null
@@ -1,48 +0,0 @@
-aspectName = $aspectName;
-  }
-  public function getAspectName()
-  {
-    return $this->aspectName;
-  }
-  public function setDestinationName($destinationName)
-  {
-    $this->destinationName = $destinationName;
-  }
-  public function getDestinationName()
-  {
-    return $this->destinationName;
-  }
-  public function setIntention($intention)
-  {
-    $this->intention = $intention;
-  }
-  public function getIntention()
-  {
-    return $this->intention;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ShoppingContent/ProductCustomAttribute.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ShoppingContent/ProductCustomAttribute.php
deleted file mode 100644
index f7e46d66..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ShoppingContent/ProductCustomAttribute.php
+++ /dev/null
@@ -1,57 +0,0 @@
-name = $name;
-  }
-  public function getName()
-  {
-    return $this->name;
-  }
-  public function setType($type)
-  {
-    $this->type = $type;
-  }
-  public function getType()
-  {
-    return $this->type;
-  }
-  public function setUnit($unit)
-  {
-    $this->unit = $unit;
-  }
-  public function getUnit()
-  {
-    return $this->unit;
-  }
-  public function setValue($value)
-  {
-    $this->value = $value;
-  }
-  public function getValue()
-  {
-    return $this->value;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ShoppingContent/ProductCustomGroup.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ShoppingContent/ProductCustomGroup.php
deleted file mode 100644
index f8e683c3..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ShoppingContent/ProductCustomGroup.php
+++ /dev/null
@@ -1,41 +0,0 @@
-attributes = $attributes;
-  }
-  public function getAttributes()
-  {
-    return $this->attributes;
-  }
-  public function setName($name)
-  {
-    $this->name = $name;
-  }
-  public function getName()
-  {
-    return $this->name;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ShoppingContent/ProductDestination.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ShoppingContent/ProductDestination.php
deleted file mode 100644
index 82394cac..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ShoppingContent/ProductDestination.php
+++ /dev/null
@@ -1,39 +0,0 @@
-destinationName = $destinationName;
-  }
-  public function getDestinationName()
-  {
-    return $this->destinationName;
-  }
-  public function setIntention($intention)
-  {
-    $this->intention = $intention;
-  }
-  public function getIntention()
-  {
-    return $this->intention;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ShoppingContent/ProductShipping.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ShoppingContent/ProductShipping.php
deleted file mode 100644
index 9dfe3259..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ShoppingContent/ProductShipping.php
+++ /dev/null
@@ -1,85 +0,0 @@
-country = $country;
-  }
-  public function getCountry()
-  {
-    return $this->country;
-  }
-  public function setLocationGroupName($locationGroupName)
-  {
-    $this->locationGroupName = $locationGroupName;
-  }
-  public function getLocationGroupName()
-  {
-    return $this->locationGroupName;
-  }
-  public function setLocationId($locationId)
-  {
-    $this->locationId = $locationId;
-  }
-  public function getLocationId()
-  {
-    return $this->locationId;
-  }
-  public function setPostalCode($postalCode)
-  {
-    $this->postalCode = $postalCode;
-  }
-  public function getPostalCode()
-  {
-    return $this->postalCode;
-  }
-  public function setPrice(Google_Service_ShoppingContent_Price $price)
-  {
-    $this->price = $price;
-  }
-  public function getPrice()
-  {
-    return $this->price;
-  }
-  public function setRegion($region)
-  {
-    $this->region = $region;
-  }
-  public function getRegion()
-  {
-    return $this->region;
-  }
-  public function setService($service)
-  {
-    $this->service = $service;
-  }
-  public function getService()
-  {
-    return $this->service;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ShoppingContent/ProductShippingDimension.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ShoppingContent/ProductShippingDimension.php
deleted file mode 100644
index 5800f56d..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ShoppingContent/ProductShippingDimension.php
+++ /dev/null
@@ -1,39 +0,0 @@
-unit = $unit;
-  }
-  public function getUnit()
-  {
-    return $this->unit;
-  }
-  public function setValue($value)
-  {
-    $this->value = $value;
-  }
-  public function getValue()
-  {
-    return $this->value;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ShoppingContent/ProductShippingWeight.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ShoppingContent/ProductShippingWeight.php
deleted file mode 100644
index 843311e8..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ShoppingContent/ProductShippingWeight.php
+++ /dev/null
@@ -1,39 +0,0 @@
-unit = $unit;
-  }
-  public function getUnit()
-  {
-    return $this->unit;
-  }
-  public function setValue($value)
-  {
-    $this->value = $value;
-  }
-  public function getValue()
-  {
-    return $this->value;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ShoppingContent/ProductStatus.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ShoppingContent/ProductStatus.php
deleted file mode 100644
index fffe96bf..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ShoppingContent/ProductStatus.php
+++ /dev/null
@@ -1,105 +0,0 @@
-creationDate = $creationDate;
-  }
-  public function getCreationDate()
-  {
-    return $this->creationDate;
-  }
-  public function setDataQualityIssues($dataQualityIssues)
-  {
-    $this->dataQualityIssues = $dataQualityIssues;
-  }
-  public function getDataQualityIssues()
-  {
-    return $this->dataQualityIssues;
-  }
-  public function setDestinationStatuses($destinationStatuses)
-  {
-    $this->destinationStatuses = $destinationStatuses;
-  }
-  public function getDestinationStatuses()
-  {
-    return $this->destinationStatuses;
-  }
-  public function setGoogleExpirationDate($googleExpirationDate)
-  {
-    $this->googleExpirationDate = $googleExpirationDate;
-  }
-  public function getGoogleExpirationDate()
-  {
-    return $this->googleExpirationDate;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setLastUpdateDate($lastUpdateDate)
-  {
-    $this->lastUpdateDate = $lastUpdateDate;
-  }
-  public function getLastUpdateDate()
-  {
-    return $this->lastUpdateDate;
-  }
-  public function setLink($link)
-  {
-    $this->link = $link;
-  }
-  public function getLink()
-  {
-    return $this->link;
-  }
-  public function setProductId($productId)
-  {
-    $this->productId = $productId;
-  }
-  public function getProductId()
-  {
-    return $this->productId;
-  }
-  public function setTitle($title)
-  {
-    $this->title = $title;
-  }
-  public function getTitle()
-  {
-    return $this->title;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ShoppingContent/ProductStatusDataQualityIssue.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ShoppingContent/ProductStatusDataQualityIssue.php
deleted file mode 100644
index 9ed656ea..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ShoppingContent/ProductStatusDataQualityIssue.php
+++ /dev/null
@@ -1,93 +0,0 @@
-detail = $detail;
-  }
-  public function getDetail()
-  {
-    return $this->detail;
-  }
-  public function setFetchStatus($fetchStatus)
-  {
-    $this->fetchStatus = $fetchStatus;
-  }
-  public function getFetchStatus()
-  {
-    return $this->fetchStatus;
-  }
-  public function setId($id)
-  {
-    $this->id = $id;
-  }
-  public function getId()
-  {
-    return $this->id;
-  }
-  public function setLocation($location)
-  {
-    $this->location = $location;
-  }
-  public function getLocation()
-  {
-    return $this->location;
-  }
-  public function setSeverity($severity)
-  {
-    $this->severity = $severity;
-  }
-  public function getSeverity()
-  {
-    return $this->severity;
-  }
-  public function setTimestamp($timestamp)
-  {
-    $this->timestamp = $timestamp;
-  }
-  public function getTimestamp()
-  {
-    return $this->timestamp;
-  }
-  public function setValueOnLandingPage($valueOnLandingPage)
-  {
-    $this->valueOnLandingPage = $valueOnLandingPage;
-  }
-  public function getValueOnLandingPage()
-  {
-    return $this->valueOnLandingPage;
-  }
-  public function setValueProvided($valueProvided)
-  {
-    $this->valueProvided = $valueProvided;
-  }
-  public function getValueProvided()
-  {
-    return $this->valueProvided;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ShoppingContent/ProductStatusDestinationStatus.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ShoppingContent/ProductStatusDestinationStatus.php
deleted file mode 100644
index bf226817..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ShoppingContent/ProductStatusDestinationStatus.php
+++ /dev/null
@@ -1,48 +0,0 @@
-approvalStatus = $approvalStatus;
-  }
-  public function getApprovalStatus()
-  {
-    return $this->approvalStatus;
-  }
-  public function setDestination($destination)
-  {
-    $this->destination = $destination;
-  }
-  public function getDestination()
-  {
-    return $this->destination;
-  }
-  public function setIntention($intention)
-  {
-    $this->intention = $intention;
-  }
-  public function getIntention()
-  {
-    return $this->intention;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ShoppingContent/ProductTax.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ShoppingContent/ProductTax.php
deleted file mode 100644
index 9fc29aa8..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ShoppingContent/ProductTax.php
+++ /dev/null
@@ -1,75 +0,0 @@
-country = $country;
-  }
-  public function getCountry()
-  {
-    return $this->country;
-  }
-  public function setLocationId($locationId)
-  {
-    $this->locationId = $locationId;
-  }
-  public function getLocationId()
-  {
-    return $this->locationId;
-  }
-  public function setPostalCode($postalCode)
-  {
-    $this->postalCode = $postalCode;
-  }
-  public function getPostalCode()
-  {
-    return $this->postalCode;
-  }
-  public function setRate($rate)
-  {
-    $this->rate = $rate;
-  }
-  public function getRate()
-  {
-    return $this->rate;
-  }
-  public function setRegion($region)
-  {
-    $this->region = $region;
-  }
-  public function getRegion()
-  {
-    return $this->region;
-  }
-  public function setTaxShip($taxShip)
-  {
-    $this->taxShip = $taxShip;
-  }
-  public function getTaxShip()
-  {
-    return $this->taxShip;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ShoppingContent/ProductUnitPricingBaseMeasure.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ShoppingContent/ProductUnitPricingBaseMeasure.php
deleted file mode 100644
index dc01d044..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ShoppingContent/ProductUnitPricingBaseMeasure.php
+++ /dev/null
@@ -1,39 +0,0 @@
-unit = $unit;
-  }
-  public function getUnit()
-  {
-    return $this->unit;
-  }
-  public function setValue($value)
-  {
-    $this->value = $value;
-  }
-  public function getValue()
-  {
-    return $this->value;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ShoppingContent/ProductUnitPricingMeasure.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ShoppingContent/ProductUnitPricingMeasure.php
deleted file mode 100644
index b0ec16cc..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ShoppingContent/ProductUnitPricingMeasure.php
+++ /dev/null
@@ -1,39 +0,0 @@
-unit = $unit;
-  }
-  public function getUnit()
-  {
-    return $this->unit;
-  }
-  public function setValue($value)
-  {
-    $this->value = $value;
-  }
-  public function getValue()
-  {
-    return $this->value;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ShoppingContent/ProductsCustomBatchRequest.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ShoppingContent/ProductsCustomBatchRequest.php
deleted file mode 100644
index f165a303..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ShoppingContent/ProductsCustomBatchRequest.php
+++ /dev/null
@@ -1,32 +0,0 @@
-entries = $entries;
-  }
-  public function getEntries()
-  {
-    return $this->entries;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ShoppingContent/ProductsCustomBatchRequestEntry.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ShoppingContent/ProductsCustomBatchRequestEntry.php
deleted file mode 100644
index 958cefed..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ShoppingContent/ProductsCustomBatchRequestEntry.php
+++ /dev/null
@@ -1,67 +0,0 @@
-batchId = $batchId;
-  }
-  public function getBatchId()
-  {
-    return $this->batchId;
-  }
-  public function setMerchantId($merchantId)
-  {
-    $this->merchantId = $merchantId;
-  }
-  public function getMerchantId()
-  {
-    return $this->merchantId;
-  }
-  public function setMethod($method)
-  {
-    $this->method = $method;
-  }
-  public function getMethod()
-  {
-    return $this->method;
-  }
-  public function setProduct(Google_Service_ShoppingContent_Product $product)
-  {
-    $this->product = $product;
-  }
-  public function getProduct()
-  {
-    return $this->product;
-  }
-  public function setProductId($productId)
-  {
-    $this->productId = $productId;
-  }
-  public function getProductId()
-  {
-    return $this->productId;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ShoppingContent/ProductsCustomBatchResponse.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ShoppingContent/ProductsCustomBatchResponse.php
deleted file mode 100644
index 163b8781..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ShoppingContent/ProductsCustomBatchResponse.php
+++ /dev/null
@@ -1,41 +0,0 @@
-entries = $entries;
-  }
-  public function getEntries()
-  {
-    return $this->entries;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ShoppingContent/ProductsCustomBatchResponseEntry.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ShoppingContent/ProductsCustomBatchResponseEntry.php
deleted file mode 100644
index 728e45fd..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ShoppingContent/ProductsCustomBatchResponseEntry.php
+++ /dev/null
@@ -1,59 +0,0 @@
-batchId = $batchId;
-  }
-  public function getBatchId()
-  {
-    return $this->batchId;
-  }
-  public function setErrors(Google_Service_ShoppingContent_Errors $errors)
-  {
-    $this->errors = $errors;
-  }
-  public function getErrors()
-  {
-    return $this->errors;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setProduct(Google_Service_ShoppingContent_Product $product)
-  {
-    $this->product = $product;
-  }
-  public function getProduct()
-  {
-    return $this->product;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ShoppingContent/ProductsListResponse.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ShoppingContent/ProductsListResponse.php
deleted file mode 100644
index e8d91dbf..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ShoppingContent/ProductsListResponse.php
+++ /dev/null
@@ -1,50 +0,0 @@
-kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setNextPageToken($nextPageToken)
-  {
-    $this->nextPageToken = $nextPageToken;
-  }
-  public function getNextPageToken()
-  {
-    return $this->nextPageToken;
-  }
-  public function setResources($resources)
-  {
-    $this->resources = $resources;
-  }
-  public function getResources()
-  {
-    return $this->resources;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ShoppingContent/ProductstatusesCustomBatchRequest.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ShoppingContent/ProductstatusesCustomBatchRequest.php
deleted file mode 100644
index 8be0fb9c..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ShoppingContent/ProductstatusesCustomBatchRequest.php
+++ /dev/null
@@ -1,32 +0,0 @@
-entries = $entries;
-  }
-  public function getEntries()
-  {
-    return $this->entries;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ShoppingContent/ProductstatusesCustomBatchRequestEntry.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ShoppingContent/ProductstatusesCustomBatchRequestEntry.php
deleted file mode 100644
index 5ae900a0..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ShoppingContent/ProductstatusesCustomBatchRequestEntry.php
+++ /dev/null
@@ -1,57 +0,0 @@
-batchId = $batchId;
-  }
-  public function getBatchId()
-  {
-    return $this->batchId;
-  }
-  public function setMerchantId($merchantId)
-  {
-    $this->merchantId = $merchantId;
-  }
-  public function getMerchantId()
-  {
-    return $this->merchantId;
-  }
-  public function setMethod($method)
-  {
-    $this->method = $method;
-  }
-  public function getMethod()
-  {
-    return $this->method;
-  }
-  public function setProductId($productId)
-  {
-    $this->productId = $productId;
-  }
-  public function getProductId()
-  {
-    return $this->productId;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ShoppingContent/ProductstatusesCustomBatchResponse.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ShoppingContent/ProductstatusesCustomBatchResponse.php
deleted file mode 100644
index 869f3f80..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ShoppingContent/ProductstatusesCustomBatchResponse.php
+++ /dev/null
@@ -1,41 +0,0 @@
-entries = $entries;
-  }
-  public function getEntries()
-  {
-    return $this->entries;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ShoppingContent/ProductstatusesCustomBatchResponseEntry.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ShoppingContent/ProductstatusesCustomBatchResponseEntry.php
deleted file mode 100644
index 0e0f46fc..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ShoppingContent/ProductstatusesCustomBatchResponseEntry.php
+++ /dev/null
@@ -1,59 +0,0 @@
-batchId = $batchId;
-  }
-  public function getBatchId()
-  {
-    return $this->batchId;
-  }
-  public function setErrors(Google_Service_ShoppingContent_Errors $errors)
-  {
-    $this->errors = $errors;
-  }
-  public function getErrors()
-  {
-    return $this->errors;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setProductStatus(Google_Service_ShoppingContent_ProductStatus $productStatus)
-  {
-    $this->productStatus = $productStatus;
-  }
-  public function getProductStatus()
-  {
-    return $this->productStatus;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ShoppingContent/ProductstatusesListResponse.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ShoppingContent/ProductstatusesListResponse.php
deleted file mode 100644
index 0461a4bf..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ShoppingContent/ProductstatusesListResponse.php
+++ /dev/null
@@ -1,50 +0,0 @@
-kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setNextPageToken($nextPageToken)
-  {
-    $this->nextPageToken = $nextPageToken;
-  }
-  public function getNextPageToken()
-  {
-    return $this->nextPageToken;
-  }
-  public function setResources($resources)
-  {
-    $this->resources = $resources;
-  }
-  public function getResources()
-  {
-    return $this->resources;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ShoppingContent/RateGroup.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ShoppingContent/RateGroup.php
deleted file mode 100644
index ff8e04c6..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ShoppingContent/RateGroup.php
+++ /dev/null
@@ -1,71 +0,0 @@
-applicableShippingLabels = $applicableShippingLabels;
-  }
-  public function getApplicableShippingLabels()
-  {
-    return $this->applicableShippingLabels;
-  }
-  public function setCarrierRates($carrierRates)
-  {
-    $this->carrierRates = $carrierRates;
-  }
-  public function getCarrierRates()
-  {
-    return $this->carrierRates;
-  }
-  public function setMainTable(Google_Service_ShoppingContent_Table $mainTable)
-  {
-    $this->mainTable = $mainTable;
-  }
-  public function getMainTable()
-  {
-    return $this->mainTable;
-  }
-  public function setSingleValue(Google_Service_ShoppingContent_Value $singleValue)
-  {
-    $this->singleValue = $singleValue;
-  }
-  public function getSingleValue()
-  {
-    return $this->singleValue;
-  }
-  public function setSubtables($subtables)
-  {
-    $this->subtables = $subtables;
-  }
-  public function getSubtables()
-  {
-    return $this->subtables;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ShoppingContent/Resource/Accounts.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ShoppingContent/Resource/Accounts.php
deleted file mode 100644
index 65ef757b..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ShoppingContent/Resource/Accounts.php
+++ /dev/null
@@ -1,164 +0,0 @@
-
- *   $contentService = new Google_Service_ShoppingContent(...);
- *   $accounts = $contentService->accounts;
- *  
- */
-class Google_Service_ShoppingContent_Resource_Accounts extends Google_Service_Resource
-{
-  /**
-   * Returns information about the authenticated user. (accounts.authinfo)
-   *
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_ShoppingContent_AccountsAuthInfoResponse
-   */
-  public function authinfo($optParams = array())
-  {
-    $params = array();
-    $params = array_merge($params, $optParams);
-    return $this->call('authinfo', array($params), "Google_Service_ShoppingContent_AccountsAuthInfoResponse");
-  }
-  /**
-   * Retrieves, inserts, updates, and deletes multiple Merchant Center
-   * (sub-)accounts in a single request. (accounts.custombatch)
-   *
-   * @param Google_Service_ShoppingContent_AccountsCustomBatchRequest $postBody
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param bool dryRun Flag to run the request in dry-run mode.
-   * @return Google_Service_ShoppingContent_AccountsCustomBatchResponse
-   */
-  public function custombatch(Google_Service_ShoppingContent_AccountsCustomBatchRequest $postBody, $optParams = array())
-  {
-    $params = array('postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('custombatch', array($params), "Google_Service_ShoppingContent_AccountsCustomBatchResponse");
-  }
-  /**
-   * Deletes a Merchant Center sub-account. This method can only be called for
-   * multi-client accounts. (accounts.delete)
-   *
-   * @param string $merchantId The ID of the managing account.
-   * @param string $accountId The ID of the account.
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param bool dryRun Flag to run the request in dry-run mode.
-   */
-  public function delete($merchantId, $accountId, $optParams = array())
-  {
-    $params = array('merchantId' => $merchantId, 'accountId' => $accountId);
-    $params = array_merge($params, $optParams);
-    return $this->call('delete', array($params));
-  }
-  /**
-   * Retrieves a Merchant Center account. This method can only be called for
-   * accounts to which the managing account has access: either the managing
-   * account itself or sub-accounts if the managing account is a multi-client
-   * account. (accounts.get)
-   *
-   * @param string $merchantId The ID of the managing account.
-   * @param string $accountId The ID of the account.
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_ShoppingContent_Account
-   */
-  public function get($merchantId, $accountId, $optParams = array())
-  {
-    $params = array('merchantId' => $merchantId, 'accountId' => $accountId);
-    $params = array_merge($params, $optParams);
-    return $this->call('get', array($params), "Google_Service_ShoppingContent_Account");
-  }
-  /**
-   * Creates a Merchant Center sub-account. This method can only be called for
-   * multi-client accounts. (accounts.insert)
-   *
-   * @param string $merchantId The ID of the managing account.
-   * @param Google_Service_ShoppingContent_Account $postBody
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param bool dryRun Flag to run the request in dry-run mode.
-   * @return Google_Service_ShoppingContent_Account
-   */
-  public function insert($merchantId, Google_Service_ShoppingContent_Account $postBody, $optParams = array())
-  {
-    $params = array('merchantId' => $merchantId, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('insert', array($params), "Google_Service_ShoppingContent_Account");
-  }
-  /**
-   * Lists the sub-accounts in your Merchant Center account. This method can only
-   * be called for multi-client accounts. (accounts.listAccounts)
-   *
-   * @param string $merchantId The ID of the managing account.
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param string maxResults The maximum number of accounts to return in the
-   * response, used for paging.
-   * @opt_param string pageToken The token returned by the previous request.
-   * @return Google_Service_ShoppingContent_AccountsListResponse
-   */
-  public function listAccounts($merchantId, $optParams = array())
-  {
-    $params = array('merchantId' => $merchantId);
-    $params = array_merge($params, $optParams);
-    return $this->call('list', array($params), "Google_Service_ShoppingContent_AccountsListResponse");
-  }
-  /**
-   * Updates a Merchant Center account. This method can only be called for
-   * accounts to which the managing account has access: either the managing
-   * account itself or sub-accounts if the managing account is a multi-client
-   * account. This method supports patch semantics. (accounts.patch)
-   *
-   * @param string $merchantId The ID of the managing account.
-   * @param string $accountId The ID of the account.
-   * @param Google_Service_ShoppingContent_Account $postBody
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param bool dryRun Flag to run the request in dry-run mode.
-   * @return Google_Service_ShoppingContent_Account
-   */
-  public function patch($merchantId, $accountId, Google_Service_ShoppingContent_Account $postBody, $optParams = array())
-  {
-    $params = array('merchantId' => $merchantId, 'accountId' => $accountId, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('patch', array($params), "Google_Service_ShoppingContent_Account");
-  }
-  /**
-   * Updates a Merchant Center account. This method can only be called for
-   * accounts to which the managing account has access: either the managing
-   * account itself or sub-accounts if the managing account is a multi-client
-   * account. (accounts.update)
-   *
-   * @param string $merchantId The ID of the managing account.
-   * @param string $accountId The ID of the account.
-   * @param Google_Service_ShoppingContent_Account $postBody
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param bool dryRun Flag to run the request in dry-run mode.
-   * @return Google_Service_ShoppingContent_Account
-   */
-  public function update($merchantId, $accountId, Google_Service_ShoppingContent_Account $postBody, $optParams = array())
-  {
-    $params = array('merchantId' => $merchantId, 'accountId' => $accountId, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('update', array($params), "Google_Service_ShoppingContent_Account");
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ShoppingContent/Resource/Accountshipping.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ShoppingContent/Resource/Accountshipping.php
deleted file mode 100644
index a28f530a..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ShoppingContent/Resource/Accountshipping.php
+++ /dev/null
@@ -1,123 +0,0 @@
-
- *   $contentService = new Google_Service_ShoppingContent(...);
- *   $accountshipping = $contentService->accountshipping;
- *  
- */
-class Google_Service_ShoppingContent_Resource_Accountshipping extends Google_Service_Resource
-{
-  /**
-   * Retrieves and updates the shipping settings of multiple accounts in a single
-   * request. (accountshipping.custombatch)
-   *
-   * @param Google_Service_ShoppingContent_AccountshippingCustomBatchRequest $postBody
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param bool dryRun Flag to run the request in dry-run mode.
-   * @return Google_Service_ShoppingContent_AccountshippingCustomBatchResponse
-   */
-  public function custombatch(Google_Service_ShoppingContent_AccountshippingCustomBatchRequest $postBody, $optParams = array())
-  {
-    $params = array('postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('custombatch', array($params), "Google_Service_ShoppingContent_AccountshippingCustomBatchResponse");
-  }
-  /**
-   * Retrieves the shipping settings of the account. This method can only be
-   * called for accounts to which the managing account has access: either the
-   * managing account itself or sub-accounts if the managing account is a multi-
-   * client account. (accountshipping.get)
-   *
-   * @param string $merchantId The ID of the managing account.
-   * @param string $accountId The ID of the account for which to get/update
-   * account shipping settings.
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_ShoppingContent_AccountShipping
-   */
-  public function get($merchantId, $accountId, $optParams = array())
-  {
-    $params = array('merchantId' => $merchantId, 'accountId' => $accountId);
-    $params = array_merge($params, $optParams);
-    return $this->call('get', array($params), "Google_Service_ShoppingContent_AccountShipping");
-  }
-  /**
-   * Lists the shipping settings of the sub-accounts in your Merchant Center
-   * account. This method can only be called for multi-client accounts.
-   * (accountshipping.listAccountshipping)
-   *
-   * @param string $merchantId The ID of the managing account.
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param string maxResults The maximum number of shipping settings to
-   * return in the response, used for paging.
-   * @opt_param string pageToken The token returned by the previous request.
-   * @return Google_Service_ShoppingContent_AccountshippingListResponse
-   */
-  public function listAccountshipping($merchantId, $optParams = array())
-  {
-    $params = array('merchantId' => $merchantId);
-    $params = array_merge($params, $optParams);
-    return $this->call('list', array($params), "Google_Service_ShoppingContent_AccountshippingListResponse");
-  }
-  /**
-   * Updates the shipping settings of the account. This method can only be called
-   * for accounts to which the managing account has access: either the managing
-   * account itself or sub-accounts if the managing account is a multi-client
-   * account. This method supports patch semantics. (accountshipping.patch)
-   *
-   * @param string $merchantId The ID of the managing account.
-   * @param string $accountId The ID of the account for which to get/update
-   * account shipping settings.
-   * @param Google_Service_ShoppingContent_AccountShipping $postBody
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param bool dryRun Flag to run the request in dry-run mode.
-   * @return Google_Service_ShoppingContent_AccountShipping
-   */
-  public function patch($merchantId, $accountId, Google_Service_ShoppingContent_AccountShipping $postBody, $optParams = array())
-  {
-    $params = array('merchantId' => $merchantId, 'accountId' => $accountId, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('patch', array($params), "Google_Service_ShoppingContent_AccountShipping");
-  }
-  /**
-   * Updates the shipping settings of the account. This method can only be called
-   * for accounts to which the managing account has access: either the managing
-   * account itself or sub-accounts if the managing account is a multi-client
-   * account. (accountshipping.update)
-   *
-   * @param string $merchantId The ID of the managing account.
-   * @param string $accountId The ID of the account for which to get/update
-   * account shipping settings.
-   * @param Google_Service_ShoppingContent_AccountShipping $postBody
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param bool dryRun Flag to run the request in dry-run mode.
-   * @return Google_Service_ShoppingContent_AccountShipping
-   */
-  public function update($merchantId, $accountId, Google_Service_ShoppingContent_AccountShipping $postBody, $optParams = array())
-  {
-    $params = array('merchantId' => $merchantId, 'accountId' => $accountId, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('update', array($params), "Google_Service_ShoppingContent_AccountShipping");
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ShoppingContent/Resource/Accountstatuses.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ShoppingContent/Resource/Accountstatuses.php
deleted file mode 100644
index 2abf0d9a..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ShoppingContent/Resource/Accountstatuses.php
+++ /dev/null
@@ -1,77 +0,0 @@
-
- *   $contentService = new Google_Service_ShoppingContent(...);
- *   $accountstatuses = $contentService->accountstatuses;
- *  
- */
-class Google_Service_ShoppingContent_Resource_Accountstatuses extends Google_Service_Resource
-{
-  /**
-   * (accountstatuses.custombatch)
-   *
-   * @param Google_Service_ShoppingContent_AccountstatusesCustomBatchRequest $postBody
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_ShoppingContent_AccountstatusesCustomBatchResponse
-   */
-  public function custombatch(Google_Service_ShoppingContent_AccountstatusesCustomBatchRequest $postBody, $optParams = array())
-  {
-    $params = array('postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('custombatch', array($params), "Google_Service_ShoppingContent_AccountstatusesCustomBatchResponse");
-  }
-  /**
-   * Retrieves the status of a Merchant Center account. This method can only be
-   * called for accounts to which the managing account has access: either the
-   * managing account itself or sub-accounts if the managing account is a multi-
-   * client account. (accountstatuses.get)
-   *
-   * @param string $merchantId The ID of the managing account.
-   * @param string $accountId The ID of the account.
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_ShoppingContent_AccountStatus
-   */
-  public function get($merchantId, $accountId, $optParams = array())
-  {
-    $params = array('merchantId' => $merchantId, 'accountId' => $accountId);
-    $params = array_merge($params, $optParams);
-    return $this->call('get', array($params), "Google_Service_ShoppingContent_AccountStatus");
-  }
-  /**
-   * Lists the statuses of the sub-accounts in your Merchant Center account. This
-   * method can only be called for multi-client accounts.
-   * (accountstatuses.listAccountstatuses)
-   *
-   * @param string $merchantId The ID of the managing account.
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param string maxResults The maximum number of account statuses to return
-   * in the response, used for paging.
-   * @opt_param string pageToken The token returned by the previous request.
-   * @return Google_Service_ShoppingContent_AccountstatusesListResponse
-   */
-  public function listAccountstatuses($merchantId, $optParams = array())
-  {
-    $params = array('merchantId' => $merchantId);
-    $params = array_merge($params, $optParams);
-    return $this->call('list', array($params), "Google_Service_ShoppingContent_AccountstatusesListResponse");
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ShoppingContent/Resource/Accounttax.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ShoppingContent/Resource/Accounttax.php
deleted file mode 100644
index 79ee23e1..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ShoppingContent/Resource/Accounttax.php
+++ /dev/null
@@ -1,123 +0,0 @@
-
- *   $contentService = new Google_Service_ShoppingContent(...);
- *   $accounttax = $contentService->accounttax;
- *  
- */
-class Google_Service_ShoppingContent_Resource_Accounttax extends Google_Service_Resource
-{
-  /**
-   * Retrieves and updates tax settings of multiple accounts in a single request.
-   * (accounttax.custombatch)
-   *
-   * @param Google_Service_ShoppingContent_AccounttaxCustomBatchRequest $postBody
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param bool dryRun Flag to run the request in dry-run mode.
-   * @return Google_Service_ShoppingContent_AccounttaxCustomBatchResponse
-   */
-  public function custombatch(Google_Service_ShoppingContent_AccounttaxCustomBatchRequest $postBody, $optParams = array())
-  {
-    $params = array('postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('custombatch', array($params), "Google_Service_ShoppingContent_AccounttaxCustomBatchResponse");
-  }
-  /**
-   * Retrieves the tax settings of the account. This method can only be called for
-   * accounts to which the managing account has access: either the managing
-   * account itself or sub-accounts if the managing account is a multi-client
-   * account. (accounttax.get)
-   *
-   * @param string $merchantId The ID of the managing account.
-   * @param string $accountId The ID of the account for which to get/update
-   * account tax settings.
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_ShoppingContent_AccountTax
-   */
-  public function get($merchantId, $accountId, $optParams = array())
-  {
-    $params = array('merchantId' => $merchantId, 'accountId' => $accountId);
-    $params = array_merge($params, $optParams);
-    return $this->call('get', array($params), "Google_Service_ShoppingContent_AccountTax");
-  }
-  /**
-   * Lists the tax settings of the sub-accounts in your Merchant Center account.
-   * This method can only be called for multi-client accounts.
-   * (accounttax.listAccounttax)
-   *
-   * @param string $merchantId The ID of the managing account.
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param string maxResults The maximum number of tax settings to return in
-   * the response, used for paging.
-   * @opt_param string pageToken The token returned by the previous request.
-   * @return Google_Service_ShoppingContent_AccounttaxListResponse
-   */
-  public function listAccounttax($merchantId, $optParams = array())
-  {
-    $params = array('merchantId' => $merchantId);
-    $params = array_merge($params, $optParams);
-    return $this->call('list', array($params), "Google_Service_ShoppingContent_AccounttaxListResponse");
-  }
-  /**
-   * Updates the tax settings of the account. This method can only be called for
-   * accounts to which the managing account has access: either the managing
-   * account itself or sub-accounts if the managing account is a multi-client
-   * account. This method supports patch semantics. (accounttax.patch)
-   *
-   * @param string $merchantId The ID of the managing account.
-   * @param string $accountId The ID of the account for which to get/update
-   * account tax settings.
-   * @param Google_Service_ShoppingContent_AccountTax $postBody
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param bool dryRun Flag to run the request in dry-run mode.
-   * @return Google_Service_ShoppingContent_AccountTax
-   */
-  public function patch($merchantId, $accountId, Google_Service_ShoppingContent_AccountTax $postBody, $optParams = array())
-  {
-    $params = array('merchantId' => $merchantId, 'accountId' => $accountId, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('patch', array($params), "Google_Service_ShoppingContent_AccountTax");
-  }
-  /**
-   * Updates the tax settings of the account. This method can only be called for
-   * accounts to which the managing account has access: either the managing
-   * account itself or sub-accounts if the managing account is a multi-client
-   * account. (accounttax.update)
-   *
-   * @param string $merchantId The ID of the managing account.
-   * @param string $accountId The ID of the account for which to get/update
-   * account tax settings.
-   * @param Google_Service_ShoppingContent_AccountTax $postBody
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param bool dryRun Flag to run the request in dry-run mode.
-   * @return Google_Service_ShoppingContent_AccountTax
-   */
-  public function update($merchantId, $accountId, Google_Service_ShoppingContent_AccountTax $postBody, $optParams = array())
-  {
-    $params = array('merchantId' => $merchantId, 'accountId' => $accountId, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('update', array($params), "Google_Service_ShoppingContent_AccountTax");
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ShoppingContent/Resource/Datafeeds.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ShoppingContent/Resource/Datafeeds.php
deleted file mode 100644
index 4f1c058b..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ShoppingContent/Resource/Datafeeds.php
+++ /dev/null
@@ -1,146 +0,0 @@
-
- *   $contentService = new Google_Service_ShoppingContent(...);
- *   $datafeeds = $contentService->datafeeds;
- *  
- */
-class Google_Service_ShoppingContent_Resource_Datafeeds extends Google_Service_Resource
-{
-  /**
-   * (datafeeds.custombatch)
-   *
-   * @param Google_Service_ShoppingContent_DatafeedsCustomBatchRequest $postBody
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param bool dryRun Flag to run the request in dry-run mode.
-   * @return Google_Service_ShoppingContent_DatafeedsCustomBatchResponse
-   */
-  public function custombatch(Google_Service_ShoppingContent_DatafeedsCustomBatchRequest $postBody, $optParams = array())
-  {
-    $params = array('postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('custombatch', array($params), "Google_Service_ShoppingContent_DatafeedsCustomBatchResponse");
-  }
-  /**
-   * Deletes a datafeed from your Merchant Center account. This method can only be
-   * called for non-multi-client accounts. (datafeeds.delete)
-   *
-   * @param string $merchantId
-   * @param string $datafeedId
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param bool dryRun Flag to run the request in dry-run mode.
-   */
-  public function delete($merchantId, $datafeedId, $optParams = array())
-  {
-    $params = array('merchantId' => $merchantId, 'datafeedId' => $datafeedId);
-    $params = array_merge($params, $optParams);
-    return $this->call('delete', array($params));
-  }
-  /**
-   * Retrieves a datafeed from your Merchant Center account. This method can only
-   * be called for non-multi-client accounts. (datafeeds.get)
-   *
-   * @param string $merchantId
-   * @param string $datafeedId
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_ShoppingContent_Datafeed
-   */
-  public function get($merchantId, $datafeedId, $optParams = array())
-  {
-    $params = array('merchantId' => $merchantId, 'datafeedId' => $datafeedId);
-    $params = array_merge($params, $optParams);
-    return $this->call('get', array($params), "Google_Service_ShoppingContent_Datafeed");
-  }
-  /**
-   * Registers a datafeed with your Merchant Center account. This method can only
-   * be called for non-multi-client accounts. (datafeeds.insert)
-   *
-   * @param string $merchantId
-   * @param Google_Service_ShoppingContent_Datafeed $postBody
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param bool dryRun Flag to run the request in dry-run mode.
-   * @return Google_Service_ShoppingContent_Datafeed
-   */
-  public function insert($merchantId, Google_Service_ShoppingContent_Datafeed $postBody, $optParams = array())
-  {
-    $params = array('merchantId' => $merchantId, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('insert', array($params), "Google_Service_ShoppingContent_Datafeed");
-  }
-  /**
-   * Lists the datafeeds in your Merchant Center account. This method can only be
-   * called for non-multi-client accounts. (datafeeds.listDatafeeds)
-   *
-   * @param string $merchantId The ID of the managing account.
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param string maxResults The maximum number of products to return in the
-   * response, used for paging.
-   * @opt_param string pageToken The token returned by the previous request.
-   * @return Google_Service_ShoppingContent_DatafeedsListResponse
-   */
-  public function listDatafeeds($merchantId, $optParams = array())
-  {
-    $params = array('merchantId' => $merchantId);
-    $params = array_merge($params, $optParams);
-    return $this->call('list', array($params), "Google_Service_ShoppingContent_DatafeedsListResponse");
-  }
-  /**
-   * Updates a datafeed of your Merchant Center account. This method can only be
-   * called for non-multi-client accounts. This method supports patch semantics.
-   * (datafeeds.patch)
-   *
-   * @param string $merchantId
-   * @param string $datafeedId
-   * @param Google_Service_ShoppingContent_Datafeed $postBody
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param bool dryRun Flag to run the request in dry-run mode.
-   * @return Google_Service_ShoppingContent_Datafeed
-   */
-  public function patch($merchantId, $datafeedId, Google_Service_ShoppingContent_Datafeed $postBody, $optParams = array())
-  {
-    $params = array('merchantId' => $merchantId, 'datafeedId' => $datafeedId, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('patch', array($params), "Google_Service_ShoppingContent_Datafeed");
-  }
-  /**
-   * Updates a datafeed of your Merchant Center account. This method can only be
-   * called for non-multi-client accounts. (datafeeds.update)
-   *
-   * @param string $merchantId
-   * @param string $datafeedId
-   * @param Google_Service_ShoppingContent_Datafeed $postBody
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param bool dryRun Flag to run the request in dry-run mode.
-   * @return Google_Service_ShoppingContent_Datafeed
-   */
-  public function update($merchantId, $datafeedId, Google_Service_ShoppingContent_Datafeed $postBody, $optParams = array())
-  {
-    $params = array('merchantId' => $merchantId, 'datafeedId' => $datafeedId, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('update', array($params), "Google_Service_ShoppingContent_Datafeed");
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ShoppingContent/Resource/Datafeedstatuses.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ShoppingContent/Resource/Datafeedstatuses.php
deleted file mode 100644
index 520fc0fa..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ShoppingContent/Resource/Datafeedstatuses.php
+++ /dev/null
@@ -1,76 +0,0 @@
-
- *   $contentService = new Google_Service_ShoppingContent(...);
- *   $datafeedstatuses = $contentService->datafeedstatuses;
- *  
- */
-class Google_Service_ShoppingContent_Resource_Datafeedstatuses extends Google_Service_Resource
-{
-  /**
-   * (datafeedstatuses.custombatch)
-   *
-   * @param Google_Service_ShoppingContent_DatafeedstatusesCustomBatchRequest $postBody
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_ShoppingContent_DatafeedstatusesCustomBatchResponse
-   */
-  public function custombatch(Google_Service_ShoppingContent_DatafeedstatusesCustomBatchRequest $postBody, $optParams = array())
-  {
-    $params = array('postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('custombatch', array($params), "Google_Service_ShoppingContent_DatafeedstatusesCustomBatchResponse");
-  }
-  /**
-   * Retrieves the status of a datafeed from your Merchant Center account. This
-   * method can only be called for non-multi-client accounts.
-   * (datafeedstatuses.get)
-   *
-   * @param string $merchantId
-   * @param string $datafeedId
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_ShoppingContent_DatafeedStatus
-   */
-  public function get($merchantId, $datafeedId, $optParams = array())
-  {
-    $params = array('merchantId' => $merchantId, 'datafeedId' => $datafeedId);
-    $params = array_merge($params, $optParams);
-    return $this->call('get', array($params), "Google_Service_ShoppingContent_DatafeedStatus");
-  }
-  /**
-   * Lists the statuses of the datafeeds in your Merchant Center account. This
-   * method can only be called for non-multi-client accounts.
-   * (datafeedstatuses.listDatafeedstatuses)
-   *
-   * @param string $merchantId The ID of the managing account.
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param string maxResults The maximum number of products to return in the
-   * response, used for paging.
-   * @opt_param string pageToken The token returned by the previous request.
-   * @return Google_Service_ShoppingContent_DatafeedstatusesListResponse
-   */
-  public function listDatafeedstatuses($merchantId, $optParams = array())
-  {
-    $params = array('merchantId' => $merchantId);
-    $params = array_merge($params, $optParams);
-    return $this->call('list', array($params), "Google_Service_ShoppingContent_DatafeedstatusesListResponse");
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ShoppingContent/Resource/Inventory.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ShoppingContent/Resource/Inventory.php
deleted file mode 100644
index 1b5e80cd..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ShoppingContent/Resource/Inventory.php
+++ /dev/null
@@ -1,69 +0,0 @@
-
- *   $contentService = new Google_Service_ShoppingContent(...);
- *   $inventory = $contentService->inventory;
- *  
- */
-class Google_Service_ShoppingContent_Resource_Inventory extends Google_Service_Resource
-{
-  /**
-   * Updates price and availability for multiple products or stores in a single
-   * request. This operation does not update the expiration date of the products.
-   * This method can only be called for non-multi-client accounts.
-   * (inventory.custombatch)
-   *
-   * @param Google_Service_ShoppingContent_InventoryCustomBatchRequest $postBody
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param bool dryRun Flag to run the request in dry-run mode.
-   * @return Google_Service_ShoppingContent_InventoryCustomBatchResponse
-   */
-  public function custombatch(Google_Service_ShoppingContent_InventoryCustomBatchRequest $postBody, $optParams = array())
-  {
-    $params = array('postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('custombatch', array($params), "Google_Service_ShoppingContent_InventoryCustomBatchResponse");
-  }
-  /**
-   * Updates price and availability of a product in your Merchant Center account.
-   * This operation does not update the expiration date of the product. This
-   * method can only be called for non-multi-client accounts. (inventory.set)
-   *
-   * @param string $merchantId The ID of the managing account.
-   * @param string $storeCode The code of the store for which to update price and
-   * availability. Use online to update price and availability of an online
-   * product.
-   * @param string $productId The ID of the product for which to update price and
-   * availability.
-   * @param Google_Service_ShoppingContent_InventorySetRequest $postBody
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param bool dryRun Flag to run the request in dry-run mode.
-   * @return Google_Service_ShoppingContent_InventorySetResponse
-   */
-  public function set($merchantId, $storeCode, $productId, Google_Service_ShoppingContent_InventorySetRequest $postBody, $optParams = array())
-  {
-    $params = array('merchantId' => $merchantId, 'storeCode' => $storeCode, 'productId' => $productId, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('set', array($params), "Google_Service_ShoppingContent_InventorySetResponse");
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ShoppingContent/Resource/Orders.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ShoppingContent/Resource/Orders.php
deleted file mode 100644
index 962c1646..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ShoppingContent/Resource/Orders.php
+++ /dev/null
@@ -1,287 +0,0 @@
-
- *   $contentService = new Google_Service_ShoppingContent(...);
- *   $orders = $contentService->orders;
- *  
- */
-class Google_Service_ShoppingContent_Resource_Orders extends Google_Service_Resource
-{
-  /**
-   * Marks an order as acknowledged. This method can only be called for non-multi-
-   * client accounts. (orders.acknowledge)
-   *
-   * @param string $merchantId The ID of the managing account.
-   * @param string $orderId The ID of the order.
-   * @param Google_Service_ShoppingContent_OrdersAcknowledgeRequest $postBody
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_ShoppingContent_OrdersAcknowledgeResponse
-   */
-  public function acknowledge($merchantId, $orderId, Google_Service_ShoppingContent_OrdersAcknowledgeRequest $postBody, $optParams = array())
-  {
-    $params = array('merchantId' => $merchantId, 'orderId' => $orderId, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('acknowledge', array($params), "Google_Service_ShoppingContent_OrdersAcknowledgeResponse");
-  }
-  /**
-   * Sandbox only. Moves a test order from state "inProgress" to state
-   * "pendingShipment". This method can only be called for non-multi-client
-   * accounts. (orders.advancetestorder)
-   *
-   * @param string $merchantId The ID of the managing account.
-   * @param string $orderId The ID of the test order to modify.
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_ShoppingContent_OrdersAdvanceTestOrderResponse
-   */
-  public function advancetestorder($merchantId, $orderId, $optParams = array())
-  {
-    $params = array('merchantId' => $merchantId, 'orderId' => $orderId);
-    $params = array_merge($params, $optParams);
-    return $this->call('advancetestorder', array($params), "Google_Service_ShoppingContent_OrdersAdvanceTestOrderResponse");
-  }
-  /**
-   * Cancels all line items in an order. This method can only be called for non-
-   * multi-client accounts. (orders.cancel)
-   *
-   * @param string $merchantId The ID of the managing account.
-   * @param string $orderId The ID of the order to cancel.
-   * @param Google_Service_ShoppingContent_OrdersCancelRequest $postBody
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_ShoppingContent_OrdersCancelResponse
-   */
-  public function cancel($merchantId, $orderId, Google_Service_ShoppingContent_OrdersCancelRequest $postBody, $optParams = array())
-  {
-    $params = array('merchantId' => $merchantId, 'orderId' => $orderId, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('cancel', array($params), "Google_Service_ShoppingContent_OrdersCancelResponse");
-  }
-  /**
-   * Cancels a line item. This method can only be called for non-multi-client
-   * accounts. (orders.cancellineitem)
-   *
-   * @param string $merchantId The ID of the managing account.
-   * @param string $orderId The ID of the order.
-   * @param Google_Service_ShoppingContent_OrdersCancelLineItemRequest $postBody
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_ShoppingContent_OrdersCancelLineItemResponse
-   */
-  public function cancellineitem($merchantId, $orderId, Google_Service_ShoppingContent_OrdersCancelLineItemRequest $postBody, $optParams = array())
-  {
-    $params = array('merchantId' => $merchantId, 'orderId' => $orderId, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('cancellineitem', array($params), "Google_Service_ShoppingContent_OrdersCancelLineItemResponse");
-  }
-  /**
-   * Sandbox only. Creates a test order. This method can only be called for non-
-   * multi-client accounts. (orders.createtestorder)
-   *
-   * @param string $merchantId The ID of the managing account.
-   * @param Google_Service_ShoppingContent_OrdersCreateTestOrderRequest $postBody
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_ShoppingContent_OrdersCreateTestOrderResponse
-   */
-  public function createtestorder($merchantId, Google_Service_ShoppingContent_OrdersCreateTestOrderRequest $postBody, $optParams = array())
-  {
-    $params = array('merchantId' => $merchantId, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('createtestorder', array($params), "Google_Service_ShoppingContent_OrdersCreateTestOrderResponse");
-  }
-  /**
-   * Retrieves or modifies multiple orders in a single request. This method can
-   * only be called for non-multi-client accounts. (orders.custombatch)
-   *
-   * @param Google_Service_ShoppingContent_OrdersCustomBatchRequest $postBody
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_ShoppingContent_OrdersCustomBatchResponse
-   */
-  public function custombatch(Google_Service_ShoppingContent_OrdersCustomBatchRequest $postBody, $optParams = array())
-  {
-    $params = array('postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('custombatch', array($params), "Google_Service_ShoppingContent_OrdersCustomBatchResponse");
-  }
-  /**
-   * Retrieves an order from your Merchant Center account. This method can only be
-   * called for non-multi-client accounts. (orders.get)
-   *
-   * @param string $merchantId The ID of the managing account.
-   * @param string $orderId The ID of the order.
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_ShoppingContent_Order
-   */
-  public function get($merchantId, $orderId, $optParams = array())
-  {
-    $params = array('merchantId' => $merchantId, 'orderId' => $orderId);
-    $params = array_merge($params, $optParams);
-    return $this->call('get', array($params), "Google_Service_ShoppingContent_Order");
-  }
-  /**
-   * Retrieves an order using merchant order id. This method can only be called
-   * for non-multi-client accounts. (orders.getbymerchantorderid)
-   *
-   * @param string $merchantId The ID of the managing account.
-   * @param string $merchantOrderId The merchant order id to be looked for.
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_ShoppingContent_OrdersGetByMerchantOrderIdResponse
-   */
-  public function getbymerchantorderid($merchantId, $merchantOrderId, $optParams = array())
-  {
-    $params = array('merchantId' => $merchantId, 'merchantOrderId' => $merchantOrderId);
-    $params = array_merge($params, $optParams);
-    return $this->call('getbymerchantorderid', array($params), "Google_Service_ShoppingContent_OrdersGetByMerchantOrderIdResponse");
-  }
-  /**
-   * Sandbox only. Retrieves an order template that can be used to quickly create
-   * a new order in sandbox. This method can only be called for non-multi-client
-   * accounts. (orders.gettestordertemplate)
-   *
-   * @param string $merchantId The ID of the managing account.
-   * @param string $templateName The name of the template to retrieve.
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_ShoppingContent_OrdersGetTestOrderTemplateResponse
-   */
-  public function gettestordertemplate($merchantId, $templateName, $optParams = array())
-  {
-    $params = array('merchantId' => $merchantId, 'templateName' => $templateName);
-    $params = array_merge($params, $optParams);
-    return $this->call('gettestordertemplate', array($params), "Google_Service_ShoppingContent_OrdersGetTestOrderTemplateResponse");
-  }
-  /**
-   * Lists the orders in your Merchant Center account. This method can only be
-   * called for non-multi-client accounts. (orders.listOrders)
-   *
-   * @param string $merchantId The ID of the managing account.
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param bool acknowledged Obtains orders that match the acknowledgement
-   * status. When set to true, obtains orders that have been acknowledged. When
-   * false, obtains orders that have not been acknowledged. We recommend using
-   * this filter set to false, in conjunction with the acknowledge call, such that
-   * only un-acknowledged orders are returned.
-   * @opt_param string maxResults The maximum number of orders to return in the
-   * response, used for paging. The default value is 25 orders per page, and the
-   * maximum allowed value is 250 orders per page. Known issue: All List calls
-   * will return all Orders without limit regardless of the value of this field.
-   * @opt_param string orderBy The ordering of the returned list. The only
-   * supported value are placedDate desc and placedDate asc for now, which returns
-   * orders sorted by placement date. "placedDate desc" stands for listing orders
-   * by placement date, from oldest to most recent. "placedDate asc" stands for
-   * listing orders by placement date, from most recent to oldest. In future
-   * releases we'll support other sorting criteria.
-   * @opt_param string pageToken The token returned by the previous request.
-   * @opt_param string placedDateEnd Obtains orders placed before this date
-   * (exclusively), in ISO 8601 format.
-   * @opt_param string placedDateStart Obtains orders placed after this date
-   * (inclusively), in ISO 8601 format.
-   * @opt_param string statuses Obtains orders that match any of the specified
-   * statuses. Multiple values can be specified with comma separation.
-   * Additionally, please note that active is a shortcut for pendingShipment and
-   * partiallyShipped, and completed is a shortcut for shipped ,
-   * partiallyDelivered, delivered, partiallyReturned, returned, and canceled.
-   * @return Google_Service_ShoppingContent_OrdersListResponse
-   */
-  public function listOrders($merchantId, $optParams = array())
-  {
-    $params = array('merchantId' => $merchantId);
-    $params = array_merge($params, $optParams);
-    return $this->call('list', array($params), "Google_Service_ShoppingContent_OrdersListResponse");
-  }
-  /**
-   * Refund a portion of the order, up to the full amount paid. This method can
-   * only be called for non-multi-client accounts. (orders.refund)
-   *
-   * @param string $merchantId The ID of the managing account.
-   * @param string $orderId The ID of the order to refund.
-   * @param Google_Service_ShoppingContent_OrdersRefundRequest $postBody
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_ShoppingContent_OrdersRefundResponse
-   */
-  public function refund($merchantId, $orderId, Google_Service_ShoppingContent_OrdersRefundRequest $postBody, $optParams = array())
-  {
-    $params = array('merchantId' => $merchantId, 'orderId' => $orderId, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('refund', array($params), "Google_Service_ShoppingContent_OrdersRefundResponse");
-  }
-  /**
-   * Returns a line item. This method can only be called for non-multi-client
-   * accounts. (orders.returnlineitem)
-   *
-   * @param string $merchantId The ID of the managing account.
-   * @param string $orderId The ID of the order.
-   * @param Google_Service_ShoppingContent_OrdersReturnLineItemRequest $postBody
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_ShoppingContent_OrdersReturnLineItemResponse
-   */
-  public function returnlineitem($merchantId, $orderId, Google_Service_ShoppingContent_OrdersReturnLineItemRequest $postBody, $optParams = array())
-  {
-    $params = array('merchantId' => $merchantId, 'orderId' => $orderId, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('returnlineitem', array($params), "Google_Service_ShoppingContent_OrdersReturnLineItemResponse");
-  }
-  /**
-   * Marks line item(s) as shipped. This method can only be called for non-multi-
-   * client accounts. (orders.shiplineitems)
-   *
-   * @param string $merchantId The ID of the managing account.
-   * @param string $orderId The ID of the order.
-   * @param Google_Service_ShoppingContent_OrdersShipLineItemsRequest $postBody
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_ShoppingContent_OrdersShipLineItemsResponse
-   */
-  public function shiplineitems($merchantId, $orderId, Google_Service_ShoppingContent_OrdersShipLineItemsRequest $postBody, $optParams = array())
-  {
-    $params = array('merchantId' => $merchantId, 'orderId' => $orderId, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('shiplineitems', array($params), "Google_Service_ShoppingContent_OrdersShipLineItemsResponse");
-  }
-  /**
-   * Updates the merchant order ID for a given order. This method can only be
-   * called for non-multi-client accounts. (orders.updatemerchantorderid)
-   *
-   * @param string $merchantId The ID of the managing account.
-   * @param string $orderId The ID of the order.
-   * @param Google_Service_ShoppingContent_OrdersUpdateMerchantOrderIdRequest $postBody
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_ShoppingContent_OrdersUpdateMerchantOrderIdResponse
-   */
-  public function updatemerchantorderid($merchantId, $orderId, Google_Service_ShoppingContent_OrdersUpdateMerchantOrderIdRequest $postBody, $optParams = array())
-  {
-    $params = array('merchantId' => $merchantId, 'orderId' => $orderId, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('updatemerchantorderid', array($params), "Google_Service_ShoppingContent_OrdersUpdateMerchantOrderIdResponse");
-  }
-  /**
-   * Updates a shipment's status, carrier, and/or tracking ID. This method can
-   * only be called for non-multi-client accounts. (orders.updateshipment)
-   *
-   * @param string $merchantId The ID of the managing account.
-   * @param string $orderId The ID of the order.
-   * @param Google_Service_ShoppingContent_OrdersUpdateShipmentRequest $postBody
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_ShoppingContent_OrdersUpdateShipmentResponse
-   */
-  public function updateshipment($merchantId, $orderId, Google_Service_ShoppingContent_OrdersUpdateShipmentRequest $postBody, $optParams = array())
-  {
-    $params = array('merchantId' => $merchantId, 'orderId' => $orderId, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('updateshipment', array($params), "Google_Service_ShoppingContent_OrdersUpdateShipmentResponse");
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ShoppingContent/Resource/Products.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ShoppingContent/Resource/Products.php
deleted file mode 100644
index 1ff1e43c..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ShoppingContent/Resource/Products.php
+++ /dev/null
@@ -1,116 +0,0 @@
-
- *   $contentService = new Google_Service_ShoppingContent(...);
- *   $products = $contentService->products;
- *  
- */
-class Google_Service_ShoppingContent_Resource_Products extends Google_Service_Resource
-{
-  /**
-   * Retrieves, inserts, and deletes multiple products in a single request. This
-   * method can only be called for non-multi-client accounts.
-   * (products.custombatch)
-   *
-   * @param Google_Service_ShoppingContent_ProductsCustomBatchRequest $postBody
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param bool dryRun Flag to run the request in dry-run mode.
-   * @return Google_Service_ShoppingContent_ProductsCustomBatchResponse
-   */
-  public function custombatch(Google_Service_ShoppingContent_ProductsCustomBatchRequest $postBody, $optParams = array())
-  {
-    $params = array('postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('custombatch', array($params), "Google_Service_ShoppingContent_ProductsCustomBatchResponse");
-  }
-  /**
-   * Deletes a product from your Merchant Center account. This method can only be
-   * called for non-multi-client accounts. (products.delete)
-   *
-   * @param string $merchantId The ID of the managing account.
-   * @param string $productId The ID of the product.
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param bool dryRun Flag to run the request in dry-run mode.
-   */
-  public function delete($merchantId, $productId, $optParams = array())
-  {
-    $params = array('merchantId' => $merchantId, 'productId' => $productId);
-    $params = array_merge($params, $optParams);
-    return $this->call('delete', array($params));
-  }
-  /**
-   * Retrieves a product from your Merchant Center account. This method can only
-   * be called for non-multi-client accounts. (products.get)
-   *
-   * @param string $merchantId The ID of the managing account.
-   * @param string $productId The ID of the product.
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_ShoppingContent_Product
-   */
-  public function get($merchantId, $productId, $optParams = array())
-  {
-    $params = array('merchantId' => $merchantId, 'productId' => $productId);
-    $params = array_merge($params, $optParams);
-    return $this->call('get', array($params), "Google_Service_ShoppingContent_Product");
-  }
-  /**
-   * Uploads a product to your Merchant Center account. If an item with the same
-   * channel, contentLanguage, offerId, and targetCountry already exists, this
-   * method updates that entry. This method can only be called for non-multi-
-   * client accounts. (products.insert)
-   *
-   * @param string $merchantId The ID of the managing account.
-   * @param Google_Service_ShoppingContent_Product $postBody
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param bool dryRun Flag to run the request in dry-run mode.
-   * @return Google_Service_ShoppingContent_Product
-   */
-  public function insert($merchantId, Google_Service_ShoppingContent_Product $postBody, $optParams = array())
-  {
-    $params = array('merchantId' => $merchantId, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('insert', array($params), "Google_Service_ShoppingContent_Product");
-  }
-  /**
-   * Lists the products in your Merchant Center account. This method can only be
-   * called for non-multi-client accounts. (products.listProducts)
-   *
-   * @param string $merchantId The ID of the managing account.
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param bool includeInvalidInsertedItems Flag to include the invalid
-   * inserted items in the result of the list request. By default the invalid
-   * items are not shown (the default value is false).
-   * @opt_param string maxResults The maximum number of products to return in the
-   * response, used for paging.
-   * @opt_param string pageToken The token returned by the previous request.
-   * @return Google_Service_ShoppingContent_ProductsListResponse
-   */
-  public function listProducts($merchantId, $optParams = array())
-  {
-    $params = array('merchantId' => $merchantId);
-    $params = array_merge($params, $optParams);
-    return $this->call('list', array($params), "Google_Service_ShoppingContent_ProductsListResponse");
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ShoppingContent/Resource/Productstatuses.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ShoppingContent/Resource/Productstatuses.php
deleted file mode 100644
index 5e1ab09e..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ShoppingContent/Resource/Productstatuses.php
+++ /dev/null
@@ -1,79 +0,0 @@
-
- *   $contentService = new Google_Service_ShoppingContent(...);
- *   $productstatuses = $contentService->productstatuses;
- *  
- */
-class Google_Service_ShoppingContent_Resource_Productstatuses extends Google_Service_Resource
-{
-  /**
-   * Gets the statuses of multiple products in a single request. This method can
-   * only be called for non-multi-client accounts. (productstatuses.custombatch)
-   *
-   * @param Google_Service_ShoppingContent_ProductstatusesCustomBatchRequest $postBody
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_ShoppingContent_ProductstatusesCustomBatchResponse
-   */
-  public function custombatch(Google_Service_ShoppingContent_ProductstatusesCustomBatchRequest $postBody, $optParams = array())
-  {
-    $params = array('postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('custombatch', array($params), "Google_Service_ShoppingContent_ProductstatusesCustomBatchResponse");
-  }
-  /**
-   * Gets the status of a product from your Merchant Center account. This method
-   * can only be called for non-multi-client accounts. (productstatuses.get)
-   *
-   * @param string $merchantId The ID of the managing account.
-   * @param string $productId The ID of the product.
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_ShoppingContent_ProductStatus
-   */
-  public function get($merchantId, $productId, $optParams = array())
-  {
-    $params = array('merchantId' => $merchantId, 'productId' => $productId);
-    $params = array_merge($params, $optParams);
-    return $this->call('get', array($params), "Google_Service_ShoppingContent_ProductStatus");
-  }
-  /**
-   * Lists the statuses of the products in your Merchant Center account. This
-   * method can only be called for non-multi-client accounts.
-   * (productstatuses.listProductstatuses)
-   *
-   * @param string $merchantId The ID of the managing account.
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param bool includeInvalidInsertedItems Flag to include the invalid
-   * inserted items in the result of the list request. By default the invalid
-   * items are not shown (the default value is false).
-   * @opt_param string maxResults The maximum number of product statuses to return
-   * in the response, used for paging.
-   * @opt_param string pageToken The token returned by the previous request.
-   * @return Google_Service_ShoppingContent_ProductstatusesListResponse
-   */
-  public function listProductstatuses($merchantId, $optParams = array())
-  {
-    $params = array('merchantId' => $merchantId);
-    $params = array_merge($params, $optParams);
-    return $this->call('list', array($params), "Google_Service_ShoppingContent_ProductstatusesListResponse");
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ShoppingContent/Resource/Shippingsettings.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ShoppingContent/Resource/Shippingsettings.php
deleted file mode 100644
index 5bb94aa9..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ShoppingContent/Resource/Shippingsettings.php
+++ /dev/null
@@ -1,138 +0,0 @@
-
- *   $contentService = new Google_Service_ShoppingContent(...);
- *   $shippingsettings = $contentService->shippingsettings;
- *  
- */
-class Google_Service_ShoppingContent_Resource_Shippingsettings extends Google_Service_Resource
-{
-  /**
-   * Retrieves and updates the shipping settings of multiple accounts in a single
-   * request. (shippingsettings.custombatch)
-   *
-   * @param Google_Service_ShoppingContent_ShippingsettingsCustomBatchRequest $postBody
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param bool dryRun Flag to run the request in dry-run mode.
-   * @return Google_Service_ShoppingContent_ShippingsettingsCustomBatchResponse
-   */
-  public function custombatch(Google_Service_ShoppingContent_ShippingsettingsCustomBatchRequest $postBody, $optParams = array())
-  {
-    $params = array('postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('custombatch', array($params), "Google_Service_ShoppingContent_ShippingsettingsCustomBatchResponse");
-  }
-  /**
-   * Retrieves the shipping settings of the account. This method can only be
-   * called for accounts to which the managing account has access: either the
-   * managing account itself or sub-accounts if the managing account is a multi-
-   * client account. (shippingsettings.get)
-   *
-   * @param string $merchantId The ID of the managing account.
-   * @param string $accountId The ID of the account for which to get/update
-   * shipping settings.
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_ShoppingContent_ShippingSettings
-   */
-  public function get($merchantId, $accountId, $optParams = array())
-  {
-    $params = array('merchantId' => $merchantId, 'accountId' => $accountId);
-    $params = array_merge($params, $optParams);
-    return $this->call('get', array($params), "Google_Service_ShoppingContent_ShippingSettings");
-  }
-  /**
-   * Retrieves supported carriers and carrier services for an account.
-   * (shippingsettings.getsupportedcarriers)
-   *
-   * @param string $merchantId The ID of the account for which to retrieve the
-   * supported carriers.
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_ShoppingContent_ShippingsettingsGetSupportedCarriersResponse
-   */
-  public function getsupportedcarriers($merchantId, $optParams = array())
-  {
-    $params = array('merchantId' => $merchantId);
-    $params = array_merge($params, $optParams);
-    return $this->call('getsupportedcarriers', array($params), "Google_Service_ShoppingContent_ShippingsettingsGetSupportedCarriersResponse");
-  }
-  /**
-   * Lists the shipping settings of the sub-accounts in your Merchant Center
-   * account. This method can only be called for multi-client accounts.
-   * (shippingsettings.listShippingsettings)
-   *
-   * @param string $merchantId The ID of the managing account.
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param string maxResults The maximum number of shipping settings to
-   * return in the response, used for paging.
-   * @opt_param string pageToken The token returned by the previous request.
-   * @return Google_Service_ShoppingContent_ShippingsettingsListResponse
-   */
-  public function listShippingsettings($merchantId, $optParams = array())
-  {
-    $params = array('merchantId' => $merchantId);
-    $params = array_merge($params, $optParams);
-    return $this->call('list', array($params), "Google_Service_ShoppingContent_ShippingsettingsListResponse");
-  }
-  /**
-   * Updates the shipping settings of the account. This method can only be called
-   * for accounts to which the managing account has access: either the managing
-   * account itself or sub-accounts if the managing account is a multi-client
-   * account. This method supports patch semantics. (shippingsettings.patch)
-   *
-   * @param string $merchantId The ID of the managing account.
-   * @param string $accountId The ID of the account for which to get/update
-   * shipping settings.
-   * @param Google_Service_ShoppingContent_ShippingSettings $postBody
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param bool dryRun Flag to run the request in dry-run mode.
-   * @return Google_Service_ShoppingContent_ShippingSettings
-   */
-  public function patch($merchantId, $accountId, Google_Service_ShoppingContent_ShippingSettings $postBody, $optParams = array())
-  {
-    $params = array('merchantId' => $merchantId, 'accountId' => $accountId, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('patch', array($params), "Google_Service_ShoppingContent_ShippingSettings");
-  }
-  /**
-   * Updates the shipping settings of the account. This method can only be called
-   * for accounts to which the managing account has access: either the managing
-   * account itself or sub-accounts if the managing account is a multi-client
-   * account. (shippingsettings.update)
-   *
-   * @param string $merchantId The ID of the managing account.
-   * @param string $accountId The ID of the account for which to get/update
-   * shipping settings.
-   * @param Google_Service_ShoppingContent_ShippingSettings $postBody
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param bool dryRun Flag to run the request in dry-run mode.
-   * @return Google_Service_ShoppingContent_ShippingSettings
-   */
-  public function update($merchantId, $accountId, Google_Service_ShoppingContent_ShippingSettings $postBody, $optParams = array())
-  {
-    $params = array('merchantId' => $merchantId, 'accountId' => $accountId, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('update', array($params), "Google_Service_ShoppingContent_ShippingSettings");
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ShoppingContent/Row.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ShoppingContent/Row.php
deleted file mode 100644
index 911cc870..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ShoppingContent/Row.php
+++ /dev/null
@@ -1,32 +0,0 @@
-cells = $cells;
-  }
-  public function getCells()
-  {
-    return $this->cells;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ShoppingContent/Service.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ShoppingContent/Service.php
deleted file mode 100644
index ba428e9e..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ShoppingContent/Service.php
+++ /dev/null
@@ -1,78 +0,0 @@
-active = $active;
-  }
-  public function getActive()
-  {
-    return $this->active;
-  }
-  public function setCurrency($currency)
-  {
-    $this->currency = $currency;
-  }
-  public function getCurrency()
-  {
-    return $this->currency;
-  }
-  public function setDeliveryCountry($deliveryCountry)
-  {
-    $this->deliveryCountry = $deliveryCountry;
-  }
-  public function getDeliveryCountry()
-  {
-    return $this->deliveryCountry;
-  }
-  public function setDeliveryTime(Google_Service_ShoppingContent_DeliveryTime $deliveryTime)
-  {
-    $this->deliveryTime = $deliveryTime;
-  }
-  public function getDeliveryTime()
-  {
-    return $this->deliveryTime;
-  }
-  public function setName($name)
-  {
-    $this->name = $name;
-  }
-  public function getName()
-  {
-    return $this->name;
-  }
-  public function setRateGroups($rateGroups)
-  {
-    $this->rateGroups = $rateGroups;
-  }
-  public function getRateGroups()
-  {
-    return $this->rateGroups;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ShoppingContent/ShippingSettings.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ShoppingContent/ShippingSettings.php
deleted file mode 100644
index 8e63dfa0..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ShoppingContent/ShippingSettings.php
+++ /dev/null
@@ -1,51 +0,0 @@
-accountId = $accountId;
-  }
-  public function getAccountId()
-  {
-    return $this->accountId;
-  }
-  public function setPostalCodeGroups($postalCodeGroups)
-  {
-    $this->postalCodeGroups = $postalCodeGroups;
-  }
-  public function getPostalCodeGroups()
-  {
-    return $this->postalCodeGroups;
-  }
-  public function setServices($services)
-  {
-    $this->services = $services;
-  }
-  public function getServices()
-  {
-    return $this->services;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ShoppingContent/ShippingsettingsCustomBatchRequest.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ShoppingContent/ShippingsettingsCustomBatchRequest.php
deleted file mode 100644
index e77b003b..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ShoppingContent/ShippingsettingsCustomBatchRequest.php
+++ /dev/null
@@ -1,32 +0,0 @@
-entries = $entries;
-  }
-  public function getEntries()
-  {
-    return $this->entries;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ShoppingContent/ShippingsettingsCustomBatchRequestEntry.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ShoppingContent/ShippingsettingsCustomBatchRequestEntry.php
deleted file mode 100644
index b27d568a..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ShoppingContent/ShippingsettingsCustomBatchRequestEntry.php
+++ /dev/null
@@ -1,67 +0,0 @@
-accountId = $accountId;
-  }
-  public function getAccountId()
-  {
-    return $this->accountId;
-  }
-  public function setBatchId($batchId)
-  {
-    $this->batchId = $batchId;
-  }
-  public function getBatchId()
-  {
-    return $this->batchId;
-  }
-  public function setMerchantId($merchantId)
-  {
-    $this->merchantId = $merchantId;
-  }
-  public function getMerchantId()
-  {
-    return $this->merchantId;
-  }
-  public function setMethod($method)
-  {
-    $this->method = $method;
-  }
-  public function getMethod()
-  {
-    return $this->method;
-  }
-  public function setShippingSettings(Google_Service_ShoppingContent_ShippingSettings $shippingSettings)
-  {
-    $this->shippingSettings = $shippingSettings;
-  }
-  public function getShippingSettings()
-  {
-    return $this->shippingSettings;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ShoppingContent/ShippingsettingsCustomBatchResponse.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ShoppingContent/ShippingsettingsCustomBatchResponse.php
deleted file mode 100644
index 97ef6d22..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ShoppingContent/ShippingsettingsCustomBatchResponse.php
+++ /dev/null
@@ -1,41 +0,0 @@
-entries = $entries;
-  }
-  public function getEntries()
-  {
-    return $this->entries;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ShoppingContent/ShippingsettingsCustomBatchResponseEntry.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ShoppingContent/ShippingsettingsCustomBatchResponseEntry.php
deleted file mode 100644
index b9690e96..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ShoppingContent/ShippingsettingsCustomBatchResponseEntry.php
+++ /dev/null
@@ -1,59 +0,0 @@
-batchId = $batchId;
-  }
-  public function getBatchId()
-  {
-    return $this->batchId;
-  }
-  public function setErrors(Google_Service_ShoppingContent_Errors $errors)
-  {
-    $this->errors = $errors;
-  }
-  public function getErrors()
-  {
-    return $this->errors;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setShippingSettings(Google_Service_ShoppingContent_ShippingSettings $shippingSettings)
-  {
-    $this->shippingSettings = $shippingSettings;
-  }
-  public function getShippingSettings()
-  {
-    return $this->shippingSettings;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ShoppingContent/ShippingsettingsGetSupportedCarriersResponse.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ShoppingContent/ShippingsettingsGetSupportedCarriersResponse.php
deleted file mode 100644
index 470c0e5d..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ShoppingContent/ShippingsettingsGetSupportedCarriersResponse.php
+++ /dev/null
@@ -1,41 +0,0 @@
-carriers = $carriers;
-  }
-  public function getCarriers()
-  {
-    return $this->carriers;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ShoppingContent/ShippingsettingsListResponse.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ShoppingContent/ShippingsettingsListResponse.php
deleted file mode 100644
index 0f09f051..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ShoppingContent/ShippingsettingsListResponse.php
+++ /dev/null
@@ -1,50 +0,0 @@
-kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setNextPageToken($nextPageToken)
-  {
-    $this->nextPageToken = $nextPageToken;
-  }
-  public function getNextPageToken()
-  {
-    return $this->nextPageToken;
-  }
-  public function setResources($resources)
-  {
-    $this->resources = $resources;
-  }
-  public function getResources()
-  {
-    return $this->resources;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ShoppingContent/Table.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ShoppingContent/Table.php
deleted file mode 100644
index ef4a1114..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ShoppingContent/Table.php
+++ /dev/null
@@ -1,61 +0,0 @@
-columnHeaders = $columnHeaders;
-  }
-  public function getColumnHeaders()
-  {
-    return $this->columnHeaders;
-  }
-  public function setName($name)
-  {
-    $this->name = $name;
-  }
-  public function getName()
-  {
-    return $this->name;
-  }
-  public function setRowHeaders(Google_Service_ShoppingContent_Headers $rowHeaders)
-  {
-    $this->rowHeaders = $rowHeaders;
-  }
-  public function getRowHeaders()
-  {
-    return $this->rowHeaders;
-  }
-  public function setRows($rows)
-  {
-    $this->rows = $rows;
-  }
-  public function getRows()
-  {
-    return $this->rows;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ShoppingContent/TestOrder.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ShoppingContent/TestOrder.php
deleted file mode 100644
index cb4ff108..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ShoppingContent/TestOrder.php
+++ /dev/null
@@ -1,109 +0,0 @@
-customer = $customer;
-  }
-  public function getCustomer()
-  {
-    return $this->customer;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setLineItems($lineItems)
-  {
-    $this->lineItems = $lineItems;
-  }
-  public function getLineItems()
-  {
-    return $this->lineItems;
-  }
-  public function setPaymentMethod(Google_Service_ShoppingContent_TestOrderPaymentMethod $paymentMethod)
-  {
-    $this->paymentMethod = $paymentMethod;
-  }
-  public function getPaymentMethod()
-  {
-    return $this->paymentMethod;
-  }
-  public function setPredefinedDeliveryAddress($predefinedDeliveryAddress)
-  {
-    $this->predefinedDeliveryAddress = $predefinedDeliveryAddress;
-  }
-  public function getPredefinedDeliveryAddress()
-  {
-    return $this->predefinedDeliveryAddress;
-  }
-  public function setPromotions($promotions)
-  {
-    $this->promotions = $promotions;
-  }
-  public function getPromotions()
-  {
-    return $this->promotions;
-  }
-  public function setShippingCost(Google_Service_ShoppingContent_Price $shippingCost)
-  {
-    $this->shippingCost = $shippingCost;
-  }
-  public function getShippingCost()
-  {
-    return $this->shippingCost;
-  }
-  public function setShippingCostTax(Google_Service_ShoppingContent_Price $shippingCostTax)
-  {
-    $this->shippingCostTax = $shippingCostTax;
-  }
-  public function getShippingCostTax()
-  {
-    return $this->shippingCostTax;
-  }
-  public function setShippingOption($shippingOption)
-  {
-    $this->shippingOption = $shippingOption;
-  }
-  public function getShippingOption()
-  {
-    return $this->shippingOption;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ShoppingContent/TestOrderCustomer.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ShoppingContent/TestOrderCustomer.php
deleted file mode 100644
index 23a1bae8..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ShoppingContent/TestOrderCustomer.php
+++ /dev/null
@@ -1,48 +0,0 @@
-email = $email;
-  }
-  public function getEmail()
-  {
-    return $this->email;
-  }
-  public function setExplicitMarketingPreference($explicitMarketingPreference)
-  {
-    $this->explicitMarketingPreference = $explicitMarketingPreference;
-  }
-  public function getExplicitMarketingPreference()
-  {
-    return $this->explicitMarketingPreference;
-  }
-  public function setFullName($fullName)
-  {
-    $this->fullName = $fullName;
-  }
-  public function getFullName()
-  {
-    return $this->fullName;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ShoppingContent/TestOrderLineItem.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ShoppingContent/TestOrderLineItem.php
deleted file mode 100644
index cacf4f6a..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ShoppingContent/TestOrderLineItem.php
+++ /dev/null
@@ -1,70 +0,0 @@
-product = $product;
-  }
-  public function getProduct()
-  {
-    return $this->product;
-  }
-  public function setQuantityOrdered($quantityOrdered)
-  {
-    $this->quantityOrdered = $quantityOrdered;
-  }
-  public function getQuantityOrdered()
-  {
-    return $this->quantityOrdered;
-  }
-  public function setReturnInfo(Google_Service_ShoppingContent_OrderLineItemReturnInfo $returnInfo)
-  {
-    $this->returnInfo = $returnInfo;
-  }
-  public function getReturnInfo()
-  {
-    return $this->returnInfo;
-  }
-  public function setShippingDetails(Google_Service_ShoppingContent_OrderLineItemShippingDetails $shippingDetails)
-  {
-    $this->shippingDetails = $shippingDetails;
-  }
-  public function getShippingDetails()
-  {
-    return $this->shippingDetails;
-  }
-  public function setUnitTax(Google_Service_ShoppingContent_Price $unitTax)
-  {
-    $this->unitTax = $unitTax;
-  }
-  public function getUnitTax()
-  {
-    return $this->unitTax;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ShoppingContent/TestOrderLineItemProduct.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ShoppingContent/TestOrderLineItemProduct.php
deleted file mode 100644
index ed3d0cbb..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ShoppingContent/TestOrderLineItemProduct.php
+++ /dev/null
@@ -1,141 +0,0 @@
-brand = $brand;
-  }
-  public function getBrand()
-  {
-    return $this->brand;
-  }
-  public function setChannel($channel)
-  {
-    $this->channel = $channel;
-  }
-  public function getChannel()
-  {
-    return $this->channel;
-  }
-  public function setCondition($condition)
-  {
-    $this->condition = $condition;
-  }
-  public function getCondition()
-  {
-    return $this->condition;
-  }
-  public function setContentLanguage($contentLanguage)
-  {
-    $this->contentLanguage = $contentLanguage;
-  }
-  public function getContentLanguage()
-  {
-    return $this->contentLanguage;
-  }
-  public function setGtin($gtin)
-  {
-    $this->gtin = $gtin;
-  }
-  public function getGtin()
-  {
-    return $this->gtin;
-  }
-  public function setImageLink($imageLink)
-  {
-    $this->imageLink = $imageLink;
-  }
-  public function getImageLink()
-  {
-    return $this->imageLink;
-  }
-  public function setItemGroupId($itemGroupId)
-  {
-    $this->itemGroupId = $itemGroupId;
-  }
-  public function getItemGroupId()
-  {
-    return $this->itemGroupId;
-  }
-  public function setMpn($mpn)
-  {
-    $this->mpn = $mpn;
-  }
-  public function getMpn()
-  {
-    return $this->mpn;
-  }
-  public function setOfferId($offerId)
-  {
-    $this->offerId = $offerId;
-  }
-  public function getOfferId()
-  {
-    return $this->offerId;
-  }
-  public function setPrice(Google_Service_ShoppingContent_Price $price)
-  {
-    $this->price = $price;
-  }
-  public function getPrice()
-  {
-    return $this->price;
-  }
-  public function setTargetCountry($targetCountry)
-  {
-    $this->targetCountry = $targetCountry;
-  }
-  public function getTargetCountry()
-  {
-    return $this->targetCountry;
-  }
-  public function setTitle($title)
-  {
-    $this->title = $title;
-  }
-  public function getTitle()
-  {
-    return $this->title;
-  }
-  public function setVariantAttributes($variantAttributes)
-  {
-    $this->variantAttributes = $variantAttributes;
-  }
-  public function getVariantAttributes()
-  {
-    return $this->variantAttributes;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ShoppingContent/TestOrderPaymentMethod.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ShoppingContent/TestOrderPaymentMethod.php
deleted file mode 100644
index e63041f1..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ShoppingContent/TestOrderPaymentMethod.php
+++ /dev/null
@@ -1,66 +0,0 @@
-expirationMonth = $expirationMonth;
-  }
-  public function getExpirationMonth()
-  {
-    return $this->expirationMonth;
-  }
-  public function setExpirationYear($expirationYear)
-  {
-    $this->expirationYear = $expirationYear;
-  }
-  public function getExpirationYear()
-  {
-    return $this->expirationYear;
-  }
-  public function setLastFourDigits($lastFourDigits)
-  {
-    $this->lastFourDigits = $lastFourDigits;
-  }
-  public function getLastFourDigits()
-  {
-    return $this->lastFourDigits;
-  }
-  public function setPredefinedBillingAddress($predefinedBillingAddress)
-  {
-    $this->predefinedBillingAddress = $predefinedBillingAddress;
-  }
-  public function getPredefinedBillingAddress()
-  {
-    return $this->predefinedBillingAddress;
-  }
-  public function setType($type)
-  {
-    $this->type = $type;
-  }
-  public function getType()
-  {
-    return $this->type;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ShoppingContent/Value.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ShoppingContent/Value.php
deleted file mode 100644
index a3f550d0..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ShoppingContent/Value.php
+++ /dev/null
@@ -1,67 +0,0 @@
-carrierRateName = $carrierRateName;
-  }
-  public function getCarrierRateName()
-  {
-    return $this->carrierRateName;
-  }
-  public function setFlatRate(Google_Service_ShoppingContent_Price $flatRate)
-  {
-    $this->flatRate = $flatRate;
-  }
-  public function getFlatRate()
-  {
-    return $this->flatRate;
-  }
-  public function setNoShipping($noShipping)
-  {
-    $this->noShipping = $noShipping;
-  }
-  public function getNoShipping()
-  {
-    return $this->noShipping;
-  }
-  public function setPricePercentage($pricePercentage)
-  {
-    $this->pricePercentage = $pricePercentage;
-  }
-  public function getPricePercentage()
-  {
-    return $this->pricePercentage;
-  }
-  public function setSubtableName($subtableName)
-  {
-    $this->subtableName = $subtableName;
-  }
-  public function getSubtableName()
-  {
-    return $this->subtableName;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ShoppingContent/Weight.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ShoppingContent/Weight.php
deleted file mode 100644
index 16ef3e6d..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ShoppingContent/Weight.php
+++ /dev/null
@@ -1,39 +0,0 @@
-unit = $unit;
-  }
-  public function getUnit()
-  {
-    return $this->unit;
-  }
-  public function setValue($value)
-  {
-    $this->value = $value;
-  }
-  public function getValue()
-  {
-    return $this->value;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/SiteVerification.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/SiteVerification.php
deleted file mode 100644
index f9c0fac0..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/SiteVerification.php
+++ /dev/null
@@ -1,124 +0,0 @@
-
- * Verifies ownership of websites or domains with Google.

- *
- * 

- * For more information about this service, see the API
- * Documentation
- * 

- *
- * @author Google, Inc.
- */
-class Google_Service_SiteVerification extends Google_Service
-{
-  /** Manage the list of sites and domains you control. */
-  const SITEVERIFICATION =
-      "https://www.googleapis.com/auth/siteverification";
-  /** Manage your new site verifications with Google. */
-  const SITEVERIFICATION_VERIFY_ONLY =
-      "https://www.googleapis.com/auth/siteverification.verify_only";
-
-  public $webResource;
-  
-  /**
-   * Constructs the internal representation of the SiteVerification service.
-   *
-   * @param Google_Client $client
-   */
-  public function __construct(Google_Client $client)
-  {
-    parent::__construct($client);
-    $this->rootUrl = 'https://www.googleapis.com/';
-    $this->servicePath = 'siteVerification/v1/';
-    $this->version = 'v1';
-    $this->serviceName = 'siteVerification';
-
-    $this->webResource = new Google_Service_SiteVerification_Resource_WebResource(
-        $this,
-        $this->serviceName,
-        'webResource',
-        array(
-          'methods' => array(
-            'delete' => array(
-              'path' => 'webResource/{id}',
-              'httpMethod' => 'DELETE',
-              'parameters' => array(
-                'id' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'get' => array(
-              'path' => 'webResource/{id}',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'id' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'getToken' => array(
-              'path' => 'token',
-              'httpMethod' => 'POST',
-              'parameters' => array(),
-            ),'insert' => array(
-              'path' => 'webResource',
-              'httpMethod' => 'POST',
-              'parameters' => array(
-                'verificationMethod' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'list' => array(
-              'path' => 'webResource',
-              'httpMethod' => 'GET',
-              'parameters' => array(),
-            ),'patch' => array(
-              'path' => 'webResource/{id}',
-              'httpMethod' => 'PATCH',
-              'parameters' => array(
-                'id' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'update' => array(
-              'path' => 'webResource/{id}',
-              'httpMethod' => 'PUT',
-              'parameters' => array(
-                'id' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),
-          )
-        )
-    );
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/SiteVerification/Resource/WebResource.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/SiteVerification/Resource/WebResource.php
deleted file mode 100644
index f931e68f..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/SiteVerification/Resource/WebResource.php
+++ /dev/null
@@ -1,124 +0,0 @@
-
- *   $siteVerificationService = new Google_Service_SiteVerification(...);
- *   $webResource = $siteVerificationService->webResource;
- *  
- */
-class Google_Service_SiteVerification_Resource_WebResource extends Google_Service_Resource
-{
-  /**
-   * Relinquish ownership of a website or domain. (webResource.delete)
-   *
-   * @param string $id The id of a verified site or domain.
-   * @param array $optParams Optional parameters.
-   */
-  public function delete($id, $optParams = array())
-  {
-    $params = array('id' => $id);
-    $params = array_merge($params, $optParams);
-    return $this->call('delete', array($params));
-  }
-  /**
-   * Get the most current data for a website or domain. (webResource.get)
-   *
-   * @param string $id The id of a verified site or domain.
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_SiteVerification_SiteVerificationWebResourceResource
-   */
-  public function get($id, $optParams = array())
-  {
-    $params = array('id' => $id);
-    $params = array_merge($params, $optParams);
-    return $this->call('get', array($params), "Google_Service_SiteVerification_SiteVerificationWebResourceResource");
-  }
-  /**
-   * Get a verification token for placing on a website or domain.
-   * (webResource.getToken)
-   *
-   * @param Google_Service_SiteVerification_SiteVerificationWebResourceGettokenRequest $postBody
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_SiteVerification_SiteVerificationWebResourceGettokenResponse
-   */
-  public function getToken(Google_Service_SiteVerification_SiteVerificationWebResourceGettokenRequest $postBody, $optParams = array())
-  {
-    $params = array('postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('getToken', array($params), "Google_Service_SiteVerification_SiteVerificationWebResourceGettokenResponse");
-  }
-  /**
-   * Attempt verification of a website or domain. (webResource.insert)
-   *
-   * @param string $verificationMethod The method to use for verifying a site or
-   * domain.
-   * @param Google_Service_SiteVerification_SiteVerificationWebResourceResource $postBody
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_SiteVerification_SiteVerificationWebResourceResource
-   */
-  public function insert($verificationMethod, Google_Service_SiteVerification_SiteVerificationWebResourceResource $postBody, $optParams = array())
-  {
-    $params = array('verificationMethod' => $verificationMethod, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('insert', array($params), "Google_Service_SiteVerification_SiteVerificationWebResourceResource");
-  }
-  /**
-   * Get the list of your verified websites and domains.
-   * (webResource.listWebResource)
-   *
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_SiteVerification_SiteVerificationWebResourceListResponse
-   */
-  public function listWebResource($optParams = array())
-  {
-    $params = array();
-    $params = array_merge($params, $optParams);
-    return $this->call('list', array($params), "Google_Service_SiteVerification_SiteVerificationWebResourceListResponse");
-  }
-  /**
-   * Modify the list of owners for your website or domain. This method supports
-   * patch semantics. (webResource.patch)
-   *
-   * @param string $id The id of a verified site or domain.
-   * @param Google_Service_SiteVerification_SiteVerificationWebResourceResource $postBody
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_SiteVerification_SiteVerificationWebResourceResource
-   */
-  public function patch($id, Google_Service_SiteVerification_SiteVerificationWebResourceResource $postBody, $optParams = array())
-  {
-    $params = array('id' => $id, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('patch', array($params), "Google_Service_SiteVerification_SiteVerificationWebResourceResource");
-  }
-  /**
-   * Modify the list of owners for your website or domain. (webResource.update)
-   *
-   * @param string $id The id of a verified site or domain.
-   * @param Google_Service_SiteVerification_SiteVerificationWebResourceResource $postBody
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_SiteVerification_SiteVerificationWebResourceResource
-   */
-  public function update($id, Google_Service_SiteVerification_SiteVerificationWebResourceResource $postBody, $optParams = array())
-  {
-    $params = array('id' => $id, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('update', array($params), "Google_Service_SiteVerification_SiteVerificationWebResourceResource");
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/SiteVerification/SiteVerificationWebResourceGettokenRequest.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/SiteVerification/SiteVerificationWebResourceGettokenRequest.php
deleted file mode 100644
index 3c3f8f1e..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/SiteVerification/SiteVerificationWebResourceGettokenRequest.php
+++ /dev/null
@@ -1,40 +0,0 @@
-site = $site;
-  }
-  public function getSite()
-  {
-    return $this->site;
-  }
-  public function setVerificationMethod($verificationMethod)
-  {
-    $this->verificationMethod = $verificationMethod;
-  }
-  public function getVerificationMethod()
-  {
-    return $this->verificationMethod;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/SiteVerification/SiteVerificationWebResourceGettokenRequestSite.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/SiteVerification/SiteVerificationWebResourceGettokenRequestSite.php
deleted file mode 100644
index 2f6a965c..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/SiteVerification/SiteVerificationWebResourceGettokenRequestSite.php
+++ /dev/null
@@ -1,39 +0,0 @@
-identifier = $identifier;
-  }
-  public function getIdentifier()
-  {
-    return $this->identifier;
-  }
-  public function setType($type)
-  {
-    $this->type = $type;
-  }
-  public function getType()
-  {
-    return $this->type;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/SiteVerification/SiteVerificationWebResourceGettokenResponse.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/SiteVerification/SiteVerificationWebResourceGettokenResponse.php
deleted file mode 100644
index 10f7f616..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/SiteVerification/SiteVerificationWebResourceGettokenResponse.php
+++ /dev/null
@@ -1,39 +0,0 @@
-method = $method;
-  }
-  public function getMethod()
-  {
-    return $this->method;
-  }
-  public function setToken($token)
-  {
-    $this->token = $token;
-  }
-  public function getToken()
-  {
-    return $this->token;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/SiteVerification/SiteVerificationWebResourceListResponse.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/SiteVerification/SiteVerificationWebResourceListResponse.php
deleted file mode 100644
index 437c6dcb..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/SiteVerification/SiteVerificationWebResourceListResponse.php
+++ /dev/null
@@ -1,32 +0,0 @@
-items = $items;
-  }
-  public function getItems()
-  {
-    return $this->items;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/SiteVerification/SiteVerificationWebResourceResource.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/SiteVerification/SiteVerificationWebResourceResource.php
deleted file mode 100644
index 431bc171..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/SiteVerification/SiteVerificationWebResourceResource.php
+++ /dev/null
@@ -1,50 +0,0 @@
-id = $id;
-  }
-  public function getId()
-  {
-    return $this->id;
-  }
-  public function setOwners($owners)
-  {
-    $this->owners = $owners;
-  }
-  public function getOwners()
-  {
-    return $this->owners;
-  }
-  public function setSite(Google_Service_SiteVerification_SiteVerificationWebResourceResourceSite $site)
-  {
-    $this->site = $site;
-  }
-  public function getSite()
-  {
-    return $this->site;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/SiteVerification/SiteVerificationWebResourceResourceSite.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/SiteVerification/SiteVerificationWebResourceResourceSite.php
deleted file mode 100644
index 12cd103f..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/SiteVerification/SiteVerificationWebResourceResourceSite.php
+++ /dev/null
@@ -1,39 +0,0 @@
-identifier = $identifier;
-  }
-  public function getIdentifier()
-  {
-    return $this->identifier;
-  }
-  public function setType($type)
-  {
-    $this->type = $type;
-  }
-  public function getType()
-  {
-    return $this->type;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Slides.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Slides.php
deleted file mode 100644
index 4b3b3eb7..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Slides.php
+++ /dev/null
@@ -1,128 +0,0 @@
-
- * An API for creating and editing Google Slides presentations.

- *
- * 

- * For more information about this service, see the API
- * Documentation
- * 

- *
- * @author Google, Inc.
- */
-class Google_Service_Slides extends Google_Service
-{
-  /** View and manage the files in your Google Drive. */
-  const DRIVE =
-      "https://www.googleapis.com/auth/drive";
-  /** View the files in your Google Drive. */
-  const DRIVE_READONLY =
-      "https://www.googleapis.com/auth/drive.readonly";
-  /** View and manage your Google Slides presentations. */
-  const PRESENTATIONS =
-      "https://www.googleapis.com/auth/presentations";
-  /** View your Google Slides presentations. */
-  const PRESENTATIONS_READONLY =
-      "https://www.googleapis.com/auth/presentations.readonly";
-  /** View and manage your spreadsheets in Google Drive. */
-  const SPREADSHEETS =
-      "https://www.googleapis.com/auth/spreadsheets";
-  /** View your Google Spreadsheets. */
-  const SPREADSHEETS_READONLY =
-      "https://www.googleapis.com/auth/spreadsheets.readonly";
-
-  public $presentations;
-  public $presentations_pages;
-  
-  /**
-   * Constructs the internal representation of the Slides service.
-   *
-   * @param Google_Client $client
-   */
-  public function __construct(Google_Client $client)
-  {
-    parent::__construct($client);
-    $this->rootUrl = 'https://slides.googleapis.com/';
-    $this->servicePath = '';
-    $this->version = 'v1';
-    $this->serviceName = 'slides';
-
-    $this->presentations = new Google_Service_Slides_Resource_Presentations(
-        $this,
-        $this->serviceName,
-        'presentations',
-        array(
-          'methods' => array(
-            'batchUpdate' => array(
-              'path' => 'v1/presentations/{presentationId}:batchUpdate',
-              'httpMethod' => 'POST',
-              'parameters' => array(
-                'presentationId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'create' => array(
-              'path' => 'v1/presentations',
-              'httpMethod' => 'POST',
-              'parameters' => array(),
-            ),'get' => array(
-              'path' => 'v1/presentations/{+presentationId}',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'presentationId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),
-          )
-        )
-    );
-    $this->presentations_pages = new Google_Service_Slides_Resource_PresentationsPages(
-        $this,
-        $this->serviceName,
-        'pages',
-        array(
-          'methods' => array(
-            'get' => array(
-              'path' => 'v1/presentations/{presentationId}/pages/{pageObjectId}',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'presentationId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'pageObjectId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),
-          )
-        )
-    );
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Slides/AffineTransform.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Slides/AffineTransform.php
deleted file mode 100644
index 519770d4..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Slides/AffineTransform.php
+++ /dev/null
@@ -1,84 +0,0 @@
-scaleX = $scaleX;
-  }
-  public function getScaleX()
-  {
-    return $this->scaleX;
-  }
-  public function setScaleY($scaleY)
-  {
-    $this->scaleY = $scaleY;
-  }
-  public function getScaleY()
-  {
-    return $this->scaleY;
-  }
-  public function setShearX($shearX)
-  {
-    $this->shearX = $shearX;
-  }
-  public function getShearX()
-  {
-    return $this->shearX;
-  }
-  public function setShearY($shearY)
-  {
-    $this->shearY = $shearY;
-  }
-  public function getShearY()
-  {
-    return $this->shearY;
-  }
-  public function setTranslateX($translateX)
-  {
-    $this->translateX = $translateX;
-  }
-  public function getTranslateX()
-  {
-    return $this->translateX;
-  }
-  public function setTranslateY($translateY)
-  {
-    $this->translateY = $translateY;
-  }
-  public function getTranslateY()
-  {
-    return $this->translateY;
-  }
-  public function setUnit($unit)
-  {
-    $this->unit = $unit;
-  }
-  public function getUnit()
-  {
-    return $this->unit;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Slides/AutoText.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Slides/AutoText.php
deleted file mode 100644
index c27ca0d5..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Slides/AutoText.php
+++ /dev/null
@@ -1,49 +0,0 @@
-content = $content;
-  }
-  public function getContent()
-  {
-    return $this->content;
-  }
-  public function setStyle(Google_Service_Slides_TextStyle $style)
-  {
-    $this->style = $style;
-  }
-  public function getStyle()
-  {
-    return $this->style;
-  }
-  public function setType($type)
-  {
-    $this->type = $type;
-  }
-  public function getType()
-  {
-    return $this->type;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Slides/BatchUpdatePresentationRequest.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Slides/BatchUpdatePresentationRequest.php
deleted file mode 100644
index cc885add..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Slides/BatchUpdatePresentationRequest.php
+++ /dev/null
@@ -1,42 +0,0 @@
-requests = $requests;
-  }
-  public function getRequests()
-  {
-    return $this->requests;
-  }
-  public function setWriteControl(Google_Service_Slides_WriteControl $writeControl)
-  {
-    $this->writeControl = $writeControl;
-  }
-  public function getWriteControl()
-  {
-    return $this->writeControl;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Slides/BatchUpdatePresentationResponse.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Slides/BatchUpdatePresentationResponse.php
deleted file mode 100644
index 08185adf..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Slides/BatchUpdatePresentationResponse.php
+++ /dev/null
@@ -1,41 +0,0 @@
-presentationId = $presentationId;
-  }
-  public function getPresentationId()
-  {
-    return $this->presentationId;
-  }
-  public function setReplies($replies)
-  {
-    $this->replies = $replies;
-  }
-  public function getReplies()
-  {
-    return $this->replies;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Slides/Bullet.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Slides/Bullet.php
deleted file mode 100644
index b7464996..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Slides/Bullet.php
+++ /dev/null
@@ -1,58 +0,0 @@
-bulletStyle = $bulletStyle;
-  }
-  public function getBulletStyle()
-  {
-    return $this->bulletStyle;
-  }
-  public function setGlyph($glyph)
-  {
-    $this->glyph = $glyph;
-  }
-  public function getGlyph()
-  {
-    return $this->glyph;
-  }
-  public function setListId($listId)
-  {
-    $this->listId = $listId;
-  }
-  public function getListId()
-  {
-    return $this->listId;
-  }
-  public function setNestingLevel($nestingLevel)
-  {
-    $this->nestingLevel = $nestingLevel;
-  }
-  public function getNestingLevel()
-  {
-    return $this->nestingLevel;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Slides/ColorScheme.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Slides/ColorScheme.php
deleted file mode 100644
index 85e2c00f..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Slides/ColorScheme.php
+++ /dev/null
@@ -1,32 +0,0 @@
-colors = $colors;
-  }
-  public function getColors()
-  {
-    return $this->colors;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Slides/ColorStop.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Slides/ColorStop.php
deleted file mode 100644
index fe032c79..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Slides/ColorStop.php
+++ /dev/null
@@ -1,49 +0,0 @@
-alpha = $alpha;
-  }
-  public function getAlpha()
-  {
-    return $this->alpha;
-  }
-  public function setColor(Google_Service_Slides_OpaqueColor $color)
-  {
-    $this->color = $color;
-  }
-  public function getColor()
-  {
-    return $this->color;
-  }
-  public function setPosition($position)
-  {
-    $this->position = $position;
-  }
-  public function getPosition()
-  {
-    return $this->position;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Slides/CreateImageRequest.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Slides/CreateImageRequest.php
deleted file mode 100644
index d582ce7f..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Slides/CreateImageRequest.php
+++ /dev/null
@@ -1,49 +0,0 @@
-elementProperties = $elementProperties;
-  }
-  public function getElementProperties()
-  {
-    return $this->elementProperties;
-  }
-  public function setObjectId($objectId)
-  {
-    $this->objectId = $objectId;
-  }
-  public function getObjectId()
-  {
-    return $this->objectId;
-  }
-  public function setUrl($url)
-  {
-    $this->url = $url;
-  }
-  public function getUrl()
-  {
-    return $this->url;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Slides/CreateImageResponse.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Slides/CreateImageResponse.php
deleted file mode 100644
index 90db1eb7..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Slides/CreateImageResponse.php
+++ /dev/null
@@ -1,30 +0,0 @@
-objectId = $objectId;
-  }
-  public function getObjectId()
-  {
-    return $this->objectId;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Slides/CreateLineRequest.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Slides/CreateLineRequest.php
deleted file mode 100644
index 67a88d06..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Slides/CreateLineRequest.php
+++ /dev/null
@@ -1,49 +0,0 @@
-elementProperties = $elementProperties;
-  }
-  public function getElementProperties()
-  {
-    return $this->elementProperties;
-  }
-  public function setLineCategory($lineCategory)
-  {
-    $this->lineCategory = $lineCategory;
-  }
-  public function getLineCategory()
-  {
-    return $this->lineCategory;
-  }
-  public function setObjectId($objectId)
-  {
-    $this->objectId = $objectId;
-  }
-  public function getObjectId()
-  {
-    return $this->objectId;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Slides/CreateLineResponse.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Slides/CreateLineResponse.php
deleted file mode 100644
index 8083b38a..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Slides/CreateLineResponse.php
+++ /dev/null
@@ -1,30 +0,0 @@
-objectId = $objectId;
-  }
-  public function getObjectId()
-  {
-    return $this->objectId;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Slides/CreateParagraphBulletsRequest.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Slides/CreateParagraphBulletsRequest.php
deleted file mode 100644
index cc6654cf..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Slides/CreateParagraphBulletsRequest.php
+++ /dev/null
@@ -1,59 +0,0 @@
-bulletPreset = $bulletPreset;
-  }
-  public function getBulletPreset()
-  {
-    return $this->bulletPreset;
-  }
-  public function setCellLocation(Google_Service_Slides_TableCellLocation $cellLocation)
-  {
-    $this->cellLocation = $cellLocation;
-  }
-  public function getCellLocation()
-  {
-    return $this->cellLocation;
-  }
-  public function setObjectId($objectId)
-  {
-    $this->objectId = $objectId;
-  }
-  public function getObjectId()
-  {
-    return $this->objectId;
-  }
-  public function setTextRange(Google_Service_Slides_Range $textRange)
-  {
-    $this->textRange = $textRange;
-  }
-  public function getTextRange()
-  {
-    return $this->textRange;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Slides/CreateShapeRequest.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Slides/CreateShapeRequest.php
deleted file mode 100644
index 099a48b9..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Slides/CreateShapeRequest.php
+++ /dev/null
@@ -1,49 +0,0 @@
-elementProperties = $elementProperties;
-  }
-  public function getElementProperties()
-  {
-    return $this->elementProperties;
-  }
-  public function setObjectId($objectId)
-  {
-    $this->objectId = $objectId;
-  }
-  public function getObjectId()
-  {
-    return $this->objectId;
-  }
-  public function setShapeType($shapeType)
-  {
-    $this->shapeType = $shapeType;
-  }
-  public function getShapeType()
-  {
-    return $this->shapeType;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Slides/CreateShapeResponse.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Slides/CreateShapeResponse.php
deleted file mode 100644
index 7f4d17d9..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Slides/CreateShapeResponse.php
+++ /dev/null
@@ -1,30 +0,0 @@
-objectId = $objectId;
-  }
-  public function getObjectId()
-  {
-    return $this->objectId;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Slides/CreateSheetsChartRequest.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Slides/CreateSheetsChartRequest.php
deleted file mode 100644
index 1bdf5b74..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Slides/CreateSheetsChartRequest.php
+++ /dev/null
@@ -1,67 +0,0 @@
-chartId = $chartId;
-  }
-  public function getChartId()
-  {
-    return $this->chartId;
-  }
-  public function setElementProperties(Google_Service_Slides_PageElementProperties $elementProperties)
-  {
-    $this->elementProperties = $elementProperties;
-  }
-  public function getElementProperties()
-  {
-    return $this->elementProperties;
-  }
-  public function setLinkingMode($linkingMode)
-  {
-    $this->linkingMode = $linkingMode;
-  }
-  public function getLinkingMode()
-  {
-    return $this->linkingMode;
-  }
-  public function setObjectId($objectId)
-  {
-    $this->objectId = $objectId;
-  }
-  public function getObjectId()
-  {
-    return $this->objectId;
-  }
-  public function setSpreadsheetId($spreadsheetId)
-  {
-    $this->spreadsheetId = $spreadsheetId;
-  }
-  public function getSpreadsheetId()
-  {
-    return $this->spreadsheetId;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Slides/CreateSheetsChartResponse.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Slides/CreateSheetsChartResponse.php
deleted file mode 100644
index 5397c6cb..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Slides/CreateSheetsChartResponse.php
+++ /dev/null
@@ -1,30 +0,0 @@
-objectId = $objectId;
-  }
-  public function getObjectId()
-  {
-    return $this->objectId;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Slides/CreateSlideRequest.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Slides/CreateSlideRequest.php
deleted file mode 100644
index a494cdc5..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Slides/CreateSlideRequest.php
+++ /dev/null
@@ -1,60 +0,0 @@
-insertionIndex = $insertionIndex;
-  }
-  public function getInsertionIndex()
-  {
-    return $this->insertionIndex;
-  }
-  public function setObjectId($objectId)
-  {
-    $this->objectId = $objectId;
-  }
-  public function getObjectId()
-  {
-    return $this->objectId;
-  }
-  public function setPlaceholderIdMappings($placeholderIdMappings)
-  {
-    $this->placeholderIdMappings = $placeholderIdMappings;
-  }
-  public function getPlaceholderIdMappings()
-  {
-    return $this->placeholderIdMappings;
-  }
-  public function setSlideLayoutReference(Google_Service_Slides_LayoutReference $slideLayoutReference)
-  {
-    $this->slideLayoutReference = $slideLayoutReference;
-  }
-  public function getSlideLayoutReference()
-  {
-    return $this->slideLayoutReference;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Slides/CreateSlideResponse.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Slides/CreateSlideResponse.php
deleted file mode 100644
index b307975b..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Slides/CreateSlideResponse.php
+++ /dev/null
@@ -1,30 +0,0 @@
-objectId = $objectId;
-  }
-  public function getObjectId()
-  {
-    return $this->objectId;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Slides/CreateTableRequest.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Slides/CreateTableRequest.php
deleted file mode 100644
index 4136352e..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Slides/CreateTableRequest.php
+++ /dev/null
@@ -1,58 +0,0 @@
-columns = $columns;
-  }
-  public function getColumns()
-  {
-    return $this->columns;
-  }
-  public function setElementProperties(Google_Service_Slides_PageElementProperties $elementProperties)
-  {
-    $this->elementProperties = $elementProperties;
-  }
-  public function getElementProperties()
-  {
-    return $this->elementProperties;
-  }
-  public function setObjectId($objectId)
-  {
-    $this->objectId = $objectId;
-  }
-  public function getObjectId()
-  {
-    return $this->objectId;
-  }
-  public function setRows($rows)
-  {
-    $this->rows = $rows;
-  }
-  public function getRows()
-  {
-    return $this->rows;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Slides/CreateTableResponse.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Slides/CreateTableResponse.php
deleted file mode 100644
index b5d4f977..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Slides/CreateTableResponse.php
+++ /dev/null
@@ -1,30 +0,0 @@
-objectId = $objectId;
-  }
-  public function getObjectId()
-  {
-    return $this->objectId;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Slides/CreateVideoRequest.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Slides/CreateVideoRequest.php
deleted file mode 100644
index 9a417d9e..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Slides/CreateVideoRequest.php
+++ /dev/null
@@ -1,58 +0,0 @@
-elementProperties = $elementProperties;
-  }
-  public function getElementProperties()
-  {
-    return $this->elementProperties;
-  }
-  public function setId($id)
-  {
-    $this->id = $id;
-  }
-  public function getId()
-  {
-    return $this->id;
-  }
-  public function setObjectId($objectId)
-  {
-    $this->objectId = $objectId;
-  }
-  public function getObjectId()
-  {
-    return $this->objectId;
-  }
-  public function setSource($source)
-  {
-    $this->source = $source;
-  }
-  public function getSource()
-  {
-    return $this->source;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Slides/CreateVideoResponse.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Slides/CreateVideoResponse.php
deleted file mode 100644
index d8b3ada6..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Slides/CreateVideoResponse.php
+++ /dev/null
@@ -1,30 +0,0 @@
-objectId = $objectId;
-  }
-  public function getObjectId()
-  {
-    return $this->objectId;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Slides/CropProperties.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Slides/CropProperties.php
deleted file mode 100644
index 4a403a2a..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Slides/CropProperties.php
+++ /dev/null
@@ -1,66 +0,0 @@
-angle = $angle;
-  }
-  public function getAngle()
-  {
-    return $this->angle;
-  }
-  public function setBottomOffset($bottomOffset)
-  {
-    $this->bottomOffset = $bottomOffset;
-  }
-  public function getBottomOffset()
-  {
-    return $this->bottomOffset;
-  }
-  public function setLeftOffset($leftOffset)
-  {
-    $this->leftOffset = $leftOffset;
-  }
-  public function getLeftOffset()
-  {
-    return $this->leftOffset;
-  }
-  public function setRightOffset($rightOffset)
-  {
-    $this->rightOffset = $rightOffset;
-  }
-  public function getRightOffset()
-  {
-    return $this->rightOffset;
-  }
-  public function setTopOffset($topOffset)
-  {
-    $this->topOffset = $topOffset;
-  }
-  public function getTopOffset()
-  {
-    return $this->topOffset;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Slides/DeleteObjectRequest.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Slides/DeleteObjectRequest.php
deleted file mode 100644
index 2a738e5c..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Slides/DeleteObjectRequest.php
+++ /dev/null
@@ -1,30 +0,0 @@
-objectId = $objectId;
-  }
-  public function getObjectId()
-  {
-    return $this->objectId;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Slides/DeleteParagraphBulletsRequest.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Slides/DeleteParagraphBulletsRequest.php
deleted file mode 100644
index 66e8adbb..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Slides/DeleteParagraphBulletsRequest.php
+++ /dev/null
@@ -1,50 +0,0 @@
-cellLocation = $cellLocation;
-  }
-  public function getCellLocation()
-  {
-    return $this->cellLocation;
-  }
-  public function setObjectId($objectId)
-  {
-    $this->objectId = $objectId;
-  }
-  public function getObjectId()
-  {
-    return $this->objectId;
-  }
-  public function setTextRange(Google_Service_Slides_Range $textRange)
-  {
-    $this->textRange = $textRange;
-  }
-  public function getTextRange()
-  {
-    return $this->textRange;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Slides/DeleteTableColumnRequest.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Slides/DeleteTableColumnRequest.php
deleted file mode 100644
index d9486046..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Slides/DeleteTableColumnRequest.php
+++ /dev/null
@@ -1,40 +0,0 @@
-cellLocation = $cellLocation;
-  }
-  public function getCellLocation()
-  {
-    return $this->cellLocation;
-  }
-  public function setTableObjectId($tableObjectId)
-  {
-    $this->tableObjectId = $tableObjectId;
-  }
-  public function getTableObjectId()
-  {
-    return $this->tableObjectId;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Slides/DeleteTableRowRequest.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Slides/DeleteTableRowRequest.php
deleted file mode 100644
index da99eee1..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Slides/DeleteTableRowRequest.php
+++ /dev/null
@@ -1,40 +0,0 @@
-cellLocation = $cellLocation;
-  }
-  public function getCellLocation()
-  {
-    return $this->cellLocation;
-  }
-  public function setTableObjectId($tableObjectId)
-  {
-    $this->tableObjectId = $tableObjectId;
-  }
-  public function getTableObjectId()
-  {
-    return $this->tableObjectId;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Slides/DeleteTextRequest.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Slides/DeleteTextRequest.php
deleted file mode 100644
index 3c3cce85..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Slides/DeleteTextRequest.php
+++ /dev/null
@@ -1,50 +0,0 @@
-cellLocation = $cellLocation;
-  }
-  public function getCellLocation()
-  {
-    return $this->cellLocation;
-  }
-  public function setObjectId($objectId)
-  {
-    $this->objectId = $objectId;
-  }
-  public function getObjectId()
-  {
-    return $this->objectId;
-  }
-  public function setTextRange(Google_Service_Slides_Range $textRange)
-  {
-    $this->textRange = $textRange;
-  }
-  public function getTextRange()
-  {
-    return $this->textRange;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Slides/Dimension.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Slides/Dimension.php
deleted file mode 100644
index 255e1c33..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Slides/Dimension.php
+++ /dev/null
@@ -1,39 +0,0 @@
-magnitude = $magnitude;
-  }
-  public function getMagnitude()
-  {
-    return $this->magnitude;
-  }
-  public function setUnit($unit)
-  {
-    $this->unit = $unit;
-  }
-  public function getUnit()
-  {
-    return $this->unit;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Slides/DuplicateObjectRequest.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Slides/DuplicateObjectRequest.php
deleted file mode 100644
index 0b40d75a..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Slides/DuplicateObjectRequest.php
+++ /dev/null
@@ -1,39 +0,0 @@
-objectId = $objectId;
-  }
-  public function getObjectId()
-  {
-    return $this->objectId;
-  }
-  public function setObjectIds($objectIds)
-  {
-    $this->objectIds = $objectIds;
-  }
-  public function getObjectIds()
-  {
-    return $this->objectIds;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Slides/DuplicateObjectResponse.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Slides/DuplicateObjectResponse.php
deleted file mode 100644
index 8088d345..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Slides/DuplicateObjectResponse.php
+++ /dev/null
@@ -1,30 +0,0 @@
-objectId = $objectId;
-  }
-  public function getObjectId()
-  {
-    return $this->objectId;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Slides/Group.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Slides/Group.php
deleted file mode 100644
index 3e304f09..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Slides/Group.php
+++ /dev/null
@@ -1,32 +0,0 @@
-children = $children;
-  }
-  public function getChildren()
-  {
-    return $this->children;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Slides/Image.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Slides/Image.php
deleted file mode 100644
index a6bef02e..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Slides/Image.php
+++ /dev/null
@@ -1,40 +0,0 @@
-contentUrl = $contentUrl;
-  }
-  public function getContentUrl()
-  {
-    return $this->contentUrl;
-  }
-  public function setImageProperties(Google_Service_Slides_ImageProperties $imageProperties)
-  {
-    $this->imageProperties = $imageProperties;
-  }
-  public function getImageProperties()
-  {
-    return $this->imageProperties;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Slides/ImageProperties.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Slides/ImageProperties.php
deleted file mode 100644
index a4e58c21..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Slides/ImageProperties.php
+++ /dev/null
@@ -1,98 +0,0 @@
-brightness = $brightness;
-  }
-  public function getBrightness()
-  {
-    return $this->brightness;
-  }
-  public function setContrast($contrast)
-  {
-    $this->contrast = $contrast;
-  }
-  public function getContrast()
-  {
-    return $this->contrast;
-  }
-  public function setCropProperties(Google_Service_Slides_CropProperties $cropProperties)
-  {
-    $this->cropProperties = $cropProperties;
-  }
-  public function getCropProperties()
-  {
-    return $this->cropProperties;
-  }
-  public function setLink(Google_Service_Slides_Link $link)
-  {
-    $this->link = $link;
-  }
-  public function getLink()
-  {
-    return $this->link;
-  }
-  public function setOutline(Google_Service_Slides_Outline $outline)
-  {
-    $this->outline = $outline;
-  }
-  public function getOutline()
-  {
-    return $this->outline;
-  }
-  public function setRecolor(Google_Service_Slides_Recolor $recolor)
-  {
-    $this->recolor = $recolor;
-  }
-  public function getRecolor()
-  {
-    return $this->recolor;
-  }
-  public function setShadow(Google_Service_Slides_Shadow $shadow)
-  {
-    $this->shadow = $shadow;
-  }
-  public function getShadow()
-  {
-    return $this->shadow;
-  }
-  public function setTransparency($transparency)
-  {
-    $this->transparency = $transparency;
-  }
-  public function getTransparency()
-  {
-    return $this->transparency;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Slides/InsertTableColumnsRequest.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Slides/InsertTableColumnsRequest.php
deleted file mode 100644
index d4203744..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Slides/InsertTableColumnsRequest.php
+++ /dev/null
@@ -1,58 +0,0 @@
-cellLocation = $cellLocation;
-  }
-  public function getCellLocation()
-  {
-    return $this->cellLocation;
-  }
-  public function setInsertRight($insertRight)
-  {
-    $this->insertRight = $insertRight;
-  }
-  public function getInsertRight()
-  {
-    return $this->insertRight;
-  }
-  public function setNumber($number)
-  {
-    $this->number = $number;
-  }
-  public function getNumber()
-  {
-    return $this->number;
-  }
-  public function setTableObjectId($tableObjectId)
-  {
-    $this->tableObjectId = $tableObjectId;
-  }
-  public function getTableObjectId()
-  {
-    return $this->tableObjectId;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Slides/InsertTableRowsRequest.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Slides/InsertTableRowsRequest.php
deleted file mode 100644
index 2926ed4d..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Slides/InsertTableRowsRequest.php
+++ /dev/null
@@ -1,58 +0,0 @@
-cellLocation = $cellLocation;
-  }
-  public function getCellLocation()
-  {
-    return $this->cellLocation;
-  }
-  public function setInsertBelow($insertBelow)
-  {
-    $this->insertBelow = $insertBelow;
-  }
-  public function getInsertBelow()
-  {
-    return $this->insertBelow;
-  }
-  public function setNumber($number)
-  {
-    $this->number = $number;
-  }
-  public function getNumber()
-  {
-    return $this->number;
-  }
-  public function setTableObjectId($tableObjectId)
-  {
-    $this->tableObjectId = $tableObjectId;
-  }
-  public function getTableObjectId()
-  {
-    return $this->tableObjectId;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Slides/InsertTextRequest.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Slides/InsertTextRequest.php
deleted file mode 100644
index c5722029..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Slides/InsertTextRequest.php
+++ /dev/null
@@ -1,58 +0,0 @@
-cellLocation = $cellLocation;
-  }
-  public function getCellLocation()
-  {
-    return $this->cellLocation;
-  }
-  public function setInsertionIndex($insertionIndex)
-  {
-    $this->insertionIndex = $insertionIndex;
-  }
-  public function getInsertionIndex()
-  {
-    return $this->insertionIndex;
-  }
-  public function setObjectId($objectId)
-  {
-    $this->objectId = $objectId;
-  }
-  public function getObjectId()
-  {
-    return $this->objectId;
-  }
-  public function setText($text)
-  {
-    $this->text = $text;
-  }
-  public function getText()
-  {
-    return $this->text;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Slides/LayoutPlaceholderIdMapping.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Slides/LayoutPlaceholderIdMapping.php
deleted file mode 100644
index 454f305b..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Slides/LayoutPlaceholderIdMapping.php
+++ /dev/null
@@ -1,49 +0,0 @@
-layoutPlaceholder = $layoutPlaceholder;
-  }
-  public function getLayoutPlaceholder()
-  {
-    return $this->layoutPlaceholder;
-  }
-  public function setLayoutPlaceholderObjectId($layoutPlaceholderObjectId)
-  {
-    $this->layoutPlaceholderObjectId = $layoutPlaceholderObjectId;
-  }
-  public function getLayoutPlaceholderObjectId()
-  {
-    return $this->layoutPlaceholderObjectId;
-  }
-  public function setObjectId($objectId)
-  {
-    $this->objectId = $objectId;
-  }
-  public function getObjectId()
-  {
-    return $this->objectId;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Slides/LayoutProperties.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Slides/LayoutProperties.php
deleted file mode 100644
index 92a9dcae..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Slides/LayoutProperties.php
+++ /dev/null
@@ -1,48 +0,0 @@
-displayName = $displayName;
-  }
-  public function getDisplayName()
-  {
-    return $this->displayName;
-  }
-  public function setMasterObjectId($masterObjectId)
-  {
-    $this->masterObjectId = $masterObjectId;
-  }
-  public function getMasterObjectId()
-  {
-    return $this->masterObjectId;
-  }
-  public function setName($name)
-  {
-    $this->name = $name;
-  }
-  public function getName()
-  {
-    return $this->name;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Slides/LayoutReference.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Slides/LayoutReference.php
deleted file mode 100644
index f616d7f4..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Slides/LayoutReference.php
+++ /dev/null
@@ -1,39 +0,0 @@
-layoutId = $layoutId;
-  }
-  public function getLayoutId()
-  {
-    return $this->layoutId;
-  }
-  public function setPredefinedLayout($predefinedLayout)
-  {
-    $this->predefinedLayout = $predefinedLayout;
-  }
-  public function getPredefinedLayout()
-  {
-    return $this->predefinedLayout;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Slides/Line.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Slides/Line.php
deleted file mode 100644
index 4f97653f..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Slides/Line.php
+++ /dev/null
@@ -1,40 +0,0 @@
-lineProperties = $lineProperties;
-  }
-  public function getLineProperties()
-  {
-    return $this->lineProperties;
-  }
-  public function setLineType($lineType)
-  {
-    $this->lineType = $lineType;
-  }
-  public function getLineType()
-  {
-    return $this->lineType;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Slides/LineFill.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Slides/LineFill.php
deleted file mode 100644
index 5095de44..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Slides/LineFill.php
+++ /dev/null
@@ -1,31 +0,0 @@
-solidFill = $solidFill;
-  }
-  public function getSolidFill()
-  {
-    return $this->solidFill;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Slides/LineProperties.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Slides/LineProperties.php
deleted file mode 100644
index e9f2fdd3..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Slides/LineProperties.php
+++ /dev/null
@@ -1,78 +0,0 @@
-dashStyle = $dashStyle;
-  }
-  public function getDashStyle()
-  {
-    return $this->dashStyle;
-  }
-  public function setEndArrow($endArrow)
-  {
-    $this->endArrow = $endArrow;
-  }
-  public function getEndArrow()
-  {
-    return $this->endArrow;
-  }
-  public function setLineFill(Google_Service_Slides_LineFill $lineFill)
-  {
-    $this->lineFill = $lineFill;
-  }
-  public function getLineFill()
-  {
-    return $this->lineFill;
-  }
-  public function setLink(Google_Service_Slides_Link $link)
-  {
-    $this->link = $link;
-  }
-  public function getLink()
-  {
-    return $this->link;
-  }
-  public function setStartArrow($startArrow)
-  {
-    $this->startArrow = $startArrow;
-  }
-  public function getStartArrow()
-  {
-    return $this->startArrow;
-  }
-  public function setWeight(Google_Service_Slides_Dimension $weight)
-  {
-    $this->weight = $weight;
-  }
-  public function getWeight()
-  {
-    return $this->weight;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Slides/Link.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Slides/Link.php
deleted file mode 100644
index 18aab419..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Slides/Link.php
+++ /dev/null
@@ -1,57 +0,0 @@
-pageObjectId = $pageObjectId;
-  }
-  public function getPageObjectId()
-  {
-    return $this->pageObjectId;
-  }
-  public function setRelativeLink($relativeLink)
-  {
-    $this->relativeLink = $relativeLink;
-  }
-  public function getRelativeLink()
-  {
-    return $this->relativeLink;
-  }
-  public function setSlideIndex($slideIndex)
-  {
-    $this->slideIndex = $slideIndex;
-  }
-  public function getSlideIndex()
-  {
-    return $this->slideIndex;
-  }
-  public function setUrl($url)
-  {
-    $this->url = $url;
-  }
-  public function getUrl()
-  {
-    return $this->url;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Slides/NestingLevel.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Slides/NestingLevel.php
deleted file mode 100644
index 01d97773..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Slides/NestingLevel.php
+++ /dev/null
@@ -1,31 +0,0 @@
-bulletStyle = $bulletStyle;
-  }
-  public function getBulletStyle()
-  {
-    return $this->bulletStyle;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Slides/NotesProperties.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Slides/NotesProperties.php
deleted file mode 100644
index 60fa69df..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Slides/NotesProperties.php
+++ /dev/null
@@ -1,30 +0,0 @@
-speakerNotesObjectId = $speakerNotesObjectId;
-  }
-  public function getSpeakerNotesObjectId()
-  {
-    return $this->speakerNotesObjectId;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Slides/OpaqueColor.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Slides/OpaqueColor.php
deleted file mode 100644
index f24dda55..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Slides/OpaqueColor.php
+++ /dev/null
@@ -1,40 +0,0 @@
-rgbColor = $rgbColor;
-  }
-  public function getRgbColor()
-  {
-    return $this->rgbColor;
-  }
-  public function setThemeColor($themeColor)
-  {
-    $this->themeColor = $themeColor;
-  }
-  public function getThemeColor()
-  {
-    return $this->themeColor;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Slides/OptionalColor.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Slides/OptionalColor.php
deleted file mode 100644
index 2be9bdfc..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Slides/OptionalColor.php
+++ /dev/null
@@ -1,31 +0,0 @@
-opaqueColor = $opaqueColor;
-  }
-  public function getOpaqueColor()
-  {
-    return $this->opaqueColor;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Slides/Outline.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Slides/Outline.php
deleted file mode 100644
index b8c1bb6d..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Slides/Outline.php
+++ /dev/null
@@ -1,59 +0,0 @@
-dashStyle = $dashStyle;
-  }
-  public function getDashStyle()
-  {
-    return $this->dashStyle;
-  }
-  public function setOutlineFill(Google_Service_Slides_OutlineFill $outlineFill)
-  {
-    $this->outlineFill = $outlineFill;
-  }
-  public function getOutlineFill()
-  {
-    return $this->outlineFill;
-  }
-  public function setPropertyState($propertyState)
-  {
-    $this->propertyState = $propertyState;
-  }
-  public function getPropertyState()
-  {
-    return $this->propertyState;
-  }
-  public function setWeight(Google_Service_Slides_Dimension $weight)
-  {
-    $this->weight = $weight;
-  }
-  public function getWeight()
-  {
-    return $this->weight;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Slides/OutlineFill.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Slides/OutlineFill.php
deleted file mode 100644
index f881e82b..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Slides/OutlineFill.php
+++ /dev/null
@@ -1,31 +0,0 @@
-solidFill = $solidFill;
-  }
-  public function getSolidFill()
-  {
-    return $this->solidFill;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Slides/Page.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Slides/Page.php
deleted file mode 100644
index bf060dca..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Slides/Page.php
+++ /dev/null
@@ -1,99 +0,0 @@
-layoutProperties = $layoutProperties;
-  }
-  public function getLayoutProperties()
-  {
-    return $this->layoutProperties;
-  }
-  public function setNotesProperties(Google_Service_Slides_NotesProperties $notesProperties)
-  {
-    $this->notesProperties = $notesProperties;
-  }
-  public function getNotesProperties()
-  {
-    return $this->notesProperties;
-  }
-  public function setObjectId($objectId)
-  {
-    $this->objectId = $objectId;
-  }
-  public function getObjectId()
-  {
-    return $this->objectId;
-  }
-  public function setPageElements($pageElements)
-  {
-    $this->pageElements = $pageElements;
-  }
-  public function getPageElements()
-  {
-    return $this->pageElements;
-  }
-  public function setPageProperties(Google_Service_Slides_PageProperties $pageProperties)
-  {
-    $this->pageProperties = $pageProperties;
-  }
-  public function getPageProperties()
-  {
-    return $this->pageProperties;
-  }
-  public function setPageType($pageType)
-  {
-    $this->pageType = $pageType;
-  }
-  public function getPageType()
-  {
-    return $this->pageType;
-  }
-  public function setRevisionId($revisionId)
-  {
-    $this->revisionId = $revisionId;
-  }
-  public function getRevisionId()
-  {
-    return $this->revisionId;
-  }
-  public function setSlideProperties(Google_Service_Slides_SlideProperties $slideProperties)
-  {
-    $this->slideProperties = $slideProperties;
-  }
-  public function getSlideProperties()
-  {
-    return $this->slideProperties;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Slides/PageBackgroundFill.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Slides/PageBackgroundFill.php
deleted file mode 100644
index 83ea0530..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Slides/PageBackgroundFill.php
+++ /dev/null
@@ -1,50 +0,0 @@
-propertyState = $propertyState;
-  }
-  public function getPropertyState()
-  {
-    return $this->propertyState;
-  }
-  public function setSolidFill(Google_Service_Slides_SolidFill $solidFill)
-  {
-    $this->solidFill = $solidFill;
-  }
-  public function getSolidFill()
-  {
-    return $this->solidFill;
-  }
-  public function setStretchedPictureFill(Google_Service_Slides_StretchedPictureFill $stretchedPictureFill)
-  {
-    $this->stretchedPictureFill = $stretchedPictureFill;
-  }
-  public function getStretchedPictureFill()
-  {
-    return $this->stretchedPictureFill;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Slides/PageElement.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Slides/PageElement.php
deleted file mode 100644
index de293ebc..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Slides/PageElement.php
+++ /dev/null
@@ -1,148 +0,0 @@
-description = $description;
-  }
-  public function getDescription()
-  {
-    return $this->description;
-  }
-  public function setElementGroup(Google_Service_Slides_Group $elementGroup)
-  {
-    $this->elementGroup = $elementGroup;
-  }
-  public function getElementGroup()
-  {
-    return $this->elementGroup;
-  }
-  public function setImage(Google_Service_Slides_Image $image)
-  {
-    $this->image = $image;
-  }
-  public function getImage()
-  {
-    return $this->image;
-  }
-  public function setLine(Google_Service_Slides_Line $line)
-  {
-    $this->line = $line;
-  }
-  public function getLine()
-  {
-    return $this->line;
-  }
-  public function setObjectId($objectId)
-  {
-    $this->objectId = $objectId;
-  }
-  public function getObjectId()
-  {
-    return $this->objectId;
-  }
-  public function setShape(Google_Service_Slides_Shape $shape)
-  {
-    $this->shape = $shape;
-  }
-  public function getShape()
-  {
-    return $this->shape;
-  }
-  public function setSheetsChart(Google_Service_Slides_SheetsChart $sheetsChart)
-  {
-    $this->sheetsChart = $sheetsChart;
-  }
-  public function getSheetsChart()
-  {
-    return $this->sheetsChart;
-  }
-  public function setSize(Google_Service_Slides_Size $size)
-  {
-    $this->size = $size;
-  }
-  public function getSize()
-  {
-    return $this->size;
-  }
-  public function setTable(Google_Service_Slides_Table $table)
-  {
-    $this->table = $table;
-  }
-  public function getTable()
-  {
-    return $this->table;
-  }
-  public function setTitle($title)
-  {
-    $this->title = $title;
-  }
-  public function getTitle()
-  {
-    return $this->title;
-  }
-  public function setTransform(Google_Service_Slides_AffineTransform $transform)
-  {
-    $this->transform = $transform;
-  }
-  public function getTransform()
-  {
-    return $this->transform;
-  }
-  public function setVideo(Google_Service_Slides_Video $video)
-  {
-    $this->video = $video;
-  }
-  public function getVideo()
-  {
-    return $this->video;
-  }
-  public function setWordArt(Google_Service_Slides_WordArt $wordArt)
-  {
-    $this->wordArt = $wordArt;
-  }
-  public function getWordArt()
-  {
-    return $this->wordArt;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Slides/PageElementProperties.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Slides/PageElementProperties.php
deleted file mode 100644
index 4cc2b53b..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Slides/PageElementProperties.php
+++ /dev/null
@@ -1,50 +0,0 @@
-pageObjectId = $pageObjectId;
-  }
-  public function getPageObjectId()
-  {
-    return $this->pageObjectId;
-  }
-  public function setSize(Google_Service_Slides_Size $size)
-  {
-    $this->size = $size;
-  }
-  public function getSize()
-  {
-    return $this->size;
-  }
-  public function setTransform(Google_Service_Slides_AffineTransform $transform)
-  {
-    $this->transform = $transform;
-  }
-  public function getTransform()
-  {
-    return $this->transform;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Slides/PageProperties.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Slides/PageProperties.php
deleted file mode 100644
index 944402ce..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Slides/PageProperties.php
+++ /dev/null
@@ -1,41 +0,0 @@
-colorScheme = $colorScheme;
-  }
-  public function getColorScheme()
-  {
-    return $this->colorScheme;
-  }
-  public function setPageBackgroundFill(Google_Service_Slides_PageBackgroundFill $pageBackgroundFill)
-  {
-    $this->pageBackgroundFill = $pageBackgroundFill;
-  }
-  public function getPageBackgroundFill()
-  {
-    return $this->pageBackgroundFill;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Slides/ParagraphMarker.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Slides/ParagraphMarker.php
deleted file mode 100644
index 4076c623..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Slides/ParagraphMarker.php
+++ /dev/null
@@ -1,41 +0,0 @@
-bullet = $bullet;
-  }
-  public function getBullet()
-  {
-    return $this->bullet;
-  }
-  public function setStyle(Google_Service_Slides_ParagraphStyle $style)
-  {
-    $this->style = $style;
-  }
-  public function getStyle()
-  {
-    return $this->style;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Slides/ParagraphStyle.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Slides/ParagraphStyle.php
deleted file mode 100644
index b34c6fc2..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Slides/ParagraphStyle.php
+++ /dev/null
@@ -1,107 +0,0 @@
-alignment = $alignment;
-  }
-  public function getAlignment()
-  {
-    return $this->alignment;
-  }
-  public function setDirection($direction)
-  {
-    $this->direction = $direction;
-  }
-  public function getDirection()
-  {
-    return $this->direction;
-  }
-  public function setIndentEnd(Google_Service_Slides_Dimension $indentEnd)
-  {
-    $this->indentEnd = $indentEnd;
-  }
-  public function getIndentEnd()
-  {
-    return $this->indentEnd;
-  }
-  public function setIndentFirstLine(Google_Service_Slides_Dimension $indentFirstLine)
-  {
-    $this->indentFirstLine = $indentFirstLine;
-  }
-  public function getIndentFirstLine()
-  {
-    return $this->indentFirstLine;
-  }
-  public function setIndentStart(Google_Service_Slides_Dimension $indentStart)
-  {
-    $this->indentStart = $indentStart;
-  }
-  public function getIndentStart()
-  {
-    return $this->indentStart;
-  }
-  public function setLineSpacing($lineSpacing)
-  {
-    $this->lineSpacing = $lineSpacing;
-  }
-  public function getLineSpacing()
-  {
-    return $this->lineSpacing;
-  }
-  public function setSpaceAbove(Google_Service_Slides_Dimension $spaceAbove)
-  {
-    $this->spaceAbove = $spaceAbove;
-  }
-  public function getSpaceAbove()
-  {
-    return $this->spaceAbove;
-  }
-  public function setSpaceBelow(Google_Service_Slides_Dimension $spaceBelow)
-  {
-    $this->spaceBelow = $spaceBelow;
-  }
-  public function getSpaceBelow()
-  {
-    return $this->spaceBelow;
-  }
-  public function setSpacingMode($spacingMode)
-  {
-    $this->spacingMode = $spacingMode;
-  }
-  public function getSpacingMode()
-  {
-    return $this->spacingMode;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Slides/Placeholder.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Slides/Placeholder.php
deleted file mode 100644
index e11f04aa..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Slides/Placeholder.php
+++ /dev/null
@@ -1,48 +0,0 @@
-index = $index;
-  }
-  public function getIndex()
-  {
-    return $this->index;
-  }
-  public function setParentObjectId($parentObjectId)
-  {
-    $this->parentObjectId = $parentObjectId;
-  }
-  public function getParentObjectId()
-  {
-    return $this->parentObjectId;
-  }
-  public function setType($type)
-  {
-    $this->type = $type;
-  }
-  public function getType()
-  {
-    return $this->type;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Slides/Presentation.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Slides/Presentation.php
deleted file mode 100644
index 186fe3b3..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Slides/Presentation.php
+++ /dev/null
@@ -1,108 +0,0 @@
-layouts = $layouts;
-  }
-  public function getLayouts()
-  {
-    return $this->layouts;
-  }
-  public function setLocale($locale)
-  {
-    $this->locale = $locale;
-  }
-  public function getLocale()
-  {
-    return $this->locale;
-  }
-  public function setMasters($masters)
-  {
-    $this->masters = $masters;
-  }
-  public function getMasters()
-  {
-    return $this->masters;
-  }
-  public function setNotesMaster(Google_Service_Slides_Page $notesMaster)
-  {
-    $this->notesMaster = $notesMaster;
-  }
-  public function getNotesMaster()
-  {
-    return $this->notesMaster;
-  }
-  public function setPageSize(Google_Service_Slides_Size $pageSize)
-  {
-    $this->pageSize = $pageSize;
-  }
-  public function getPageSize()
-  {
-    return $this->pageSize;
-  }
-  public function setPresentationId($presentationId)
-  {
-    $this->presentationId = $presentationId;
-  }
-  public function getPresentationId()
-  {
-    return $this->presentationId;
-  }
-  public function setRevisionId($revisionId)
-  {
-    $this->revisionId = $revisionId;
-  }
-  public function getRevisionId()
-  {
-    return $this->revisionId;
-  }
-  public function setSlides($slides)
-  {
-    $this->slides = $slides;
-  }
-  public function getSlides()
-  {
-    return $this->slides;
-  }
-  public function setTitle($title)
-  {
-    $this->title = $title;
-  }
-  public function getTitle()
-  {
-    return $this->title;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Slides/Range.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Slides/Range.php
deleted file mode 100644
index 8c12ca83..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Slides/Range.php
+++ /dev/null
@@ -1,48 +0,0 @@
-endIndex = $endIndex;
-  }
-  public function getEndIndex()
-  {
-    return $this->endIndex;
-  }
-  public function setStartIndex($startIndex)
-  {
-    $this->startIndex = $startIndex;
-  }
-  public function getStartIndex()
-  {
-    return $this->startIndex;
-  }
-  public function setType($type)
-  {
-    $this->type = $type;
-  }
-  public function getType()
-  {
-    return $this->type;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Slides/Recolor.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Slides/Recolor.php
deleted file mode 100644
index d824fd01..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Slides/Recolor.php
+++ /dev/null
@@ -1,41 +0,0 @@
-name = $name;
-  }
-  public function getName()
-  {
-    return $this->name;
-  }
-  public function setRecolorStops($recolorStops)
-  {
-    $this->recolorStops = $recolorStops;
-  }
-  public function getRecolorStops()
-  {
-    return $this->recolorStops;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Slides/RefreshSheetsChartRequest.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Slides/RefreshSheetsChartRequest.php
deleted file mode 100644
index 5fba9e4b..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Slides/RefreshSheetsChartRequest.php
+++ /dev/null
@@ -1,30 +0,0 @@
-objectId = $objectId;
-  }
-  public function getObjectId()
-  {
-    return $this->objectId;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Slides/ReplaceAllShapesWithImageRequest.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Slides/ReplaceAllShapesWithImageRequest.php
deleted file mode 100644
index 4ef20027..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Slides/ReplaceAllShapesWithImageRequest.php
+++ /dev/null
@@ -1,49 +0,0 @@
-containsText = $containsText;
-  }
-  public function getContainsText()
-  {
-    return $this->containsText;
-  }
-  public function setImageUrl($imageUrl)
-  {
-    $this->imageUrl = $imageUrl;
-  }
-  public function getImageUrl()
-  {
-    return $this->imageUrl;
-  }
-  public function setReplaceMethod($replaceMethod)
-  {
-    $this->replaceMethod = $replaceMethod;
-  }
-  public function getReplaceMethod()
-  {
-    return $this->replaceMethod;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Slides/ReplaceAllShapesWithImageResponse.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Slides/ReplaceAllShapesWithImageResponse.php
deleted file mode 100644
index 78a538ce..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Slides/ReplaceAllShapesWithImageResponse.php
+++ /dev/null
@@ -1,30 +0,0 @@
-occurrencesChanged = $occurrencesChanged;
-  }
-  public function getOccurrencesChanged()
-  {
-    return $this->occurrencesChanged;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Slides/ReplaceAllShapesWithSheetsChartRequest.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Slides/ReplaceAllShapesWithSheetsChartRequest.php
deleted file mode 100644
index 4cef0ae4..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Slides/ReplaceAllShapesWithSheetsChartRequest.php
+++ /dev/null
@@ -1,58 +0,0 @@
-chartId = $chartId;
-  }
-  public function getChartId()
-  {
-    return $this->chartId;
-  }
-  public function setContainsText(Google_Service_Slides_SubstringMatchCriteria $containsText)
-  {
-    $this->containsText = $containsText;
-  }
-  public function getContainsText()
-  {
-    return $this->containsText;
-  }
-  public function setLinkingMode($linkingMode)
-  {
-    $this->linkingMode = $linkingMode;
-  }
-  public function getLinkingMode()
-  {
-    return $this->linkingMode;
-  }
-  public function setSpreadsheetId($spreadsheetId)
-  {
-    $this->spreadsheetId = $spreadsheetId;
-  }
-  public function getSpreadsheetId()
-  {
-    return $this->spreadsheetId;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Slides/ReplaceAllShapesWithSheetsChartResponse.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Slides/ReplaceAllShapesWithSheetsChartResponse.php
deleted file mode 100644
index 2a0add5d..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Slides/ReplaceAllShapesWithSheetsChartResponse.php
+++ /dev/null
@@ -1,30 +0,0 @@
-occurrencesChanged = $occurrencesChanged;
-  }
-  public function getOccurrencesChanged()
-  {
-    return $this->occurrencesChanged;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Slides/ReplaceAllTextRequest.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Slides/ReplaceAllTextRequest.php
deleted file mode 100644
index 76e3819f..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Slides/ReplaceAllTextRequest.php
+++ /dev/null
@@ -1,40 +0,0 @@
-containsText = $containsText;
-  }
-  public function getContainsText()
-  {
-    return $this->containsText;
-  }
-  public function setReplaceText($replaceText)
-  {
-    $this->replaceText = $replaceText;
-  }
-  public function getReplaceText()
-  {
-    return $this->replaceText;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Slides/ReplaceAllTextResponse.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Slides/ReplaceAllTextResponse.php
deleted file mode 100644
index fa431f9d..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Slides/ReplaceAllTextResponse.php
+++ /dev/null
@@ -1,30 +0,0 @@
-occurrencesChanged = $occurrencesChanged;
-  }
-  public function getOccurrencesChanged()
-  {
-    return $this->occurrencesChanged;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Slides/Request.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Slides/Request.php
deleted file mode 100644
index caa28e2d..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Slides/Request.php
+++ /dev/null
@@ -1,331 +0,0 @@
-createImage = $createImage;
-  }
-  public function getCreateImage()
-  {
-    return $this->createImage;
-  }
-  public function setCreateLine(Google_Service_Slides_CreateLineRequest $createLine)
-  {
-    $this->createLine = $createLine;
-  }
-  public function getCreateLine()
-  {
-    return $this->createLine;
-  }
-  public function setCreateParagraphBullets(Google_Service_Slides_CreateParagraphBulletsRequest $createParagraphBullets)
-  {
-    $this->createParagraphBullets = $createParagraphBullets;
-  }
-  public function getCreateParagraphBullets()
-  {
-    return $this->createParagraphBullets;
-  }
-  public function setCreateShape(Google_Service_Slides_CreateShapeRequest $createShape)
-  {
-    $this->createShape = $createShape;
-  }
-  public function getCreateShape()
-  {
-    return $this->createShape;
-  }
-  public function setCreateSheetsChart(Google_Service_Slides_CreateSheetsChartRequest $createSheetsChart)
-  {
-    $this->createSheetsChart = $createSheetsChart;
-  }
-  public function getCreateSheetsChart()
-  {
-    return $this->createSheetsChart;
-  }
-  public function setCreateSlide(Google_Service_Slides_CreateSlideRequest $createSlide)
-  {
-    $this->createSlide = $createSlide;
-  }
-  public function getCreateSlide()
-  {
-    return $this->createSlide;
-  }
-  public function setCreateTable(Google_Service_Slides_CreateTableRequest $createTable)
-  {
-    $this->createTable = $createTable;
-  }
-  public function getCreateTable()
-  {
-    return $this->createTable;
-  }
-  public function setCreateVideo(Google_Service_Slides_CreateVideoRequest $createVideo)
-  {
-    $this->createVideo = $createVideo;
-  }
-  public function getCreateVideo()
-  {
-    return $this->createVideo;
-  }
-  public function setDeleteObject(Google_Service_Slides_DeleteObjectRequest $deleteObject)
-  {
-    $this->deleteObject = $deleteObject;
-  }
-  public function getDeleteObject()
-  {
-    return $this->deleteObject;
-  }
-  public function setDeleteParagraphBullets(Google_Service_Slides_DeleteParagraphBulletsRequest $deleteParagraphBullets)
-  {
-    $this->deleteParagraphBullets = $deleteParagraphBullets;
-  }
-  public function getDeleteParagraphBullets()
-  {
-    return $this->deleteParagraphBullets;
-  }
-  public function setDeleteTableColumn(Google_Service_Slides_DeleteTableColumnRequest $deleteTableColumn)
-  {
-    $this->deleteTableColumn = $deleteTableColumn;
-  }
-  public function getDeleteTableColumn()
-  {
-    return $this->deleteTableColumn;
-  }
-  public function setDeleteTableRow(Google_Service_Slides_DeleteTableRowRequest $deleteTableRow)
-  {
-    $this->deleteTableRow = $deleteTableRow;
-  }
-  public function getDeleteTableRow()
-  {
-    return $this->deleteTableRow;
-  }
-  public function setDeleteText(Google_Service_Slides_DeleteTextRequest $deleteText)
-  {
-    $this->deleteText = $deleteText;
-  }
-  public function getDeleteText()
-  {
-    return $this->deleteText;
-  }
-  public function setDuplicateObject(Google_Service_Slides_DuplicateObjectRequest $duplicateObject)
-  {
-    $this->duplicateObject = $duplicateObject;
-  }
-  public function getDuplicateObject()
-  {
-    return $this->duplicateObject;
-  }
-  public function setInsertTableColumns(Google_Service_Slides_InsertTableColumnsRequest $insertTableColumns)
-  {
-    $this->insertTableColumns = $insertTableColumns;
-  }
-  public function getInsertTableColumns()
-  {
-    return $this->insertTableColumns;
-  }
-  public function setInsertTableRows(Google_Service_Slides_InsertTableRowsRequest $insertTableRows)
-  {
-    $this->insertTableRows = $insertTableRows;
-  }
-  public function getInsertTableRows()
-  {
-    return $this->insertTableRows;
-  }
-  public function setInsertText(Google_Service_Slides_InsertTextRequest $insertText)
-  {
-    $this->insertText = $insertText;
-  }
-  public function getInsertText()
-  {
-    return $this->insertText;
-  }
-  public function setRefreshSheetsChart(Google_Service_Slides_RefreshSheetsChartRequest $refreshSheetsChart)
-  {
-    $this->refreshSheetsChart = $refreshSheetsChart;
-  }
-  public function getRefreshSheetsChart()
-  {
-    return $this->refreshSheetsChart;
-  }
-  public function setReplaceAllShapesWithImage(Google_Service_Slides_ReplaceAllShapesWithImageRequest $replaceAllShapesWithImage)
-  {
-    $this->replaceAllShapesWithImage = $replaceAllShapesWithImage;
-  }
-  public function getReplaceAllShapesWithImage()
-  {
-    return $this->replaceAllShapesWithImage;
-  }
-  public function setReplaceAllShapesWithSheetsChart(Google_Service_Slides_ReplaceAllShapesWithSheetsChartRequest $replaceAllShapesWithSheetsChart)
-  {
-    $this->replaceAllShapesWithSheetsChart = $replaceAllShapesWithSheetsChart;
-  }
-  public function getReplaceAllShapesWithSheetsChart()
-  {
-    return $this->replaceAllShapesWithSheetsChart;
-  }
-  public function setReplaceAllText(Google_Service_Slides_ReplaceAllTextRequest $replaceAllText)
-  {
-    $this->replaceAllText = $replaceAllText;
-  }
-  public function getReplaceAllText()
-  {
-    return $this->replaceAllText;
-  }
-  public function setUpdateImageProperties(Google_Service_Slides_UpdateImagePropertiesRequest $updateImageProperties)
-  {
-    $this->updateImageProperties = $updateImageProperties;
-  }
-  public function getUpdateImageProperties()
-  {
-    return $this->updateImageProperties;
-  }
-  public function setUpdateLineProperties(Google_Service_Slides_UpdateLinePropertiesRequest $updateLineProperties)
-  {
-    $this->updateLineProperties = $updateLineProperties;
-  }
-  public function getUpdateLineProperties()
-  {
-    return $this->updateLineProperties;
-  }
-  public function setUpdatePageElementTransform(Google_Service_Slides_UpdatePageElementTransformRequest $updatePageElementTransform)
-  {
-    $this->updatePageElementTransform = $updatePageElementTransform;
-  }
-  public function getUpdatePageElementTransform()
-  {
-    return $this->updatePageElementTransform;
-  }
-  public function setUpdatePageProperties(Google_Service_Slides_UpdatePagePropertiesRequest $updatePageProperties)
-  {
-    $this->updatePageProperties = $updatePageProperties;
-  }
-  public function getUpdatePageProperties()
-  {
-    return $this->updatePageProperties;
-  }
-  public function setUpdateParagraphStyle(Google_Service_Slides_UpdateParagraphStyleRequest $updateParagraphStyle)
-  {
-    $this->updateParagraphStyle = $updateParagraphStyle;
-  }
-  public function getUpdateParagraphStyle()
-  {
-    return $this->updateParagraphStyle;
-  }
-  public function setUpdateShapeProperties(Google_Service_Slides_UpdateShapePropertiesRequest $updateShapeProperties)
-  {
-    $this->updateShapeProperties = $updateShapeProperties;
-  }
-  public function getUpdateShapeProperties()
-  {
-    return $this->updateShapeProperties;
-  }
-  public function setUpdateSlidesPosition(Google_Service_Slides_UpdateSlidesPositionRequest $updateSlidesPosition)
-  {
-    $this->updateSlidesPosition = $updateSlidesPosition;
-  }
-  public function getUpdateSlidesPosition()
-  {
-    return $this->updateSlidesPosition;
-  }
-  public function setUpdateTableCellProperties(Google_Service_Slides_UpdateTableCellPropertiesRequest $updateTableCellProperties)
-  {
-    $this->updateTableCellProperties = $updateTableCellProperties;
-  }
-  public function getUpdateTableCellProperties()
-  {
-    return $this->updateTableCellProperties;
-  }
-  public function setUpdateTextStyle(Google_Service_Slides_UpdateTextStyleRequest $updateTextStyle)
-  {
-    $this->updateTextStyle = $updateTextStyle;
-  }
-  public function getUpdateTextStyle()
-  {
-    return $this->updateTextStyle;
-  }
-  public function setUpdateVideoProperties(Google_Service_Slides_UpdateVideoPropertiesRequest $updateVideoProperties)
-  {
-    $this->updateVideoProperties = $updateVideoProperties;
-  }
-  public function getUpdateVideoProperties()
-  {
-    return $this->updateVideoProperties;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Slides/Resource/Presentations.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Slides/Resource/Presentations.php
deleted file mode 100644
index 4aea9973..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Slides/Resource/Presentations.php
+++ /dev/null
@@ -1,87 +0,0 @@
-
- *   $slidesService = new Google_Service_Slides(...);
- *   $presentations = $slidesService->presentations;
- *  
- */
-class Google_Service_Slides_Resource_Presentations extends Google_Service_Resource
-{
-  /**
-   * Applies one or more updates to the presentation.
-   *
-   * Each request is validated before being applied. If any request is not valid,
-   * then the entire request will fail and nothing will be applied.
-   *
-   * Some requests have replies to give you some information about how they are
-   * applied. Other requests do not need to return information; these each return
-   * an empty reply. The order of replies matches that of the requests.
-   *
-   * For example, suppose you call batchUpdate with four updates, and only the
-   * third one returns information. The response would have two empty replies: the
-   * reply to the third request, and another empty reply, in that order.
-   *
-   * Because other users may be editing the presentation, the presentation might
-   * not exactly reflect your changes: your changes may be altered with respect to
-   * collaborator changes. If there are no collaborators, the presentation should
-   * reflect your changes. In any case, the updates in your request are guaranteed
-   * to be applied together atomically. (presentations.batchUpdate)
-   *
-   * @param string $presentationId The presentation to apply the updates to.
-   * @param Google_Service_Slides_BatchUpdatePresentationRequest $postBody
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Slides_BatchUpdatePresentationResponse
-   */
-  public function batchUpdate($presentationId, Google_Service_Slides_BatchUpdatePresentationRequest $postBody, $optParams = array())
-  {
-    $params = array('presentationId' => $presentationId, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('batchUpdate', array($params), "Google_Service_Slides_BatchUpdatePresentationResponse");
-  }
-  /**
-   * Creates a new presentation using the title given in the request. Other fields
-   * in the request are ignored. Returns the created presentation.
-   * (presentations.create)
-   *
-   * @param Google_Service_Slides_Presentation $postBody
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Slides_Presentation
-   */
-  public function create(Google_Service_Slides_Presentation $postBody, $optParams = array())
-  {
-    $params = array('postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('create', array($params), "Google_Service_Slides_Presentation");
-  }
-  /**
-   * Gets the latest version of the specified presentation. (presentations.get)
-   *
-   * @param string $presentationId The ID of the presentation to retrieve.
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Slides_Presentation
-   */
-  public function get($presentationId, $optParams = array())
-  {
-    $params = array('presentationId' => $presentationId);
-    $params = array_merge($params, $optParams);
-    return $this->call('get', array($params), "Google_Service_Slides_Presentation");
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Slides/Resource/PresentationsPages.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Slides/Resource/PresentationsPages.php
deleted file mode 100644
index 8e54b516..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Slides/Resource/PresentationsPages.php
+++ /dev/null
@@ -1,43 +0,0 @@
-
- *   $slidesService = new Google_Service_Slides(...);
- *   $pages = $slidesService->pages;
- *  
- */
-class Google_Service_Slides_Resource_PresentationsPages extends Google_Service_Resource
-{
-  /**
-   * Gets the latest version of the specified page in the presentation.
-   * (pages.get)
-   *
-   * @param string $presentationId The ID of the presentation to retrieve.
-   * @param string $pageObjectId The object ID of the page to retrieve.
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Slides_Page
-   */
-  public function get($presentationId, $pageObjectId, $optParams = array())
-  {
-    $params = array('presentationId' => $presentationId, 'pageObjectId' => $pageObjectId);
-    $params = array_merge($params, $optParams);
-    return $this->call('get', array($params), "Google_Service_Slides_Page");
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Slides/Response.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Slides/Response.php
deleted file mode 100644
index eea62550..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Slides/Response.php
+++ /dev/null
@@ -1,131 +0,0 @@
-createImage = $createImage;
-  }
-  public function getCreateImage()
-  {
-    return $this->createImage;
-  }
-  public function setCreateLine(Google_Service_Slides_CreateLineResponse $createLine)
-  {
-    $this->createLine = $createLine;
-  }
-  public function getCreateLine()
-  {
-    return $this->createLine;
-  }
-  public function setCreateShape(Google_Service_Slides_CreateShapeResponse $createShape)
-  {
-    $this->createShape = $createShape;
-  }
-  public function getCreateShape()
-  {
-    return $this->createShape;
-  }
-  public function setCreateSheetsChart(Google_Service_Slides_CreateSheetsChartResponse $createSheetsChart)
-  {
-    $this->createSheetsChart = $createSheetsChart;
-  }
-  public function getCreateSheetsChart()
-  {
-    return $this->createSheetsChart;
-  }
-  public function setCreateSlide(Google_Service_Slides_CreateSlideResponse $createSlide)
-  {
-    $this->createSlide = $createSlide;
-  }
-  public function getCreateSlide()
-  {
-    return $this->createSlide;
-  }
-  public function setCreateTable(Google_Service_Slides_CreateTableResponse $createTable)
-  {
-    $this->createTable = $createTable;
-  }
-  public function getCreateTable()
-  {
-    return $this->createTable;
-  }
-  public function setCreateVideo(Google_Service_Slides_CreateVideoResponse $createVideo)
-  {
-    $this->createVideo = $createVideo;
-  }
-  public function getCreateVideo()
-  {
-    return $this->createVideo;
-  }
-  public function setDuplicateObject(Google_Service_Slides_DuplicateObjectResponse $duplicateObject)
-  {
-    $this->duplicateObject = $duplicateObject;
-  }
-  public function getDuplicateObject()
-  {
-    return $this->duplicateObject;
-  }
-  public function setReplaceAllShapesWithImage(Google_Service_Slides_ReplaceAllShapesWithImageResponse $replaceAllShapesWithImage)
-  {
-    $this->replaceAllShapesWithImage = $replaceAllShapesWithImage;
-  }
-  public function getReplaceAllShapesWithImage()
-  {
-    return $this->replaceAllShapesWithImage;
-  }
-  public function setReplaceAllShapesWithSheetsChart(Google_Service_Slides_ReplaceAllShapesWithSheetsChartResponse $replaceAllShapesWithSheetsChart)
-  {
-    $this->replaceAllShapesWithSheetsChart = $replaceAllShapesWithSheetsChart;
-  }
-  public function getReplaceAllShapesWithSheetsChart()
-  {
-    return $this->replaceAllShapesWithSheetsChart;
-  }
-  public function setReplaceAllText(Google_Service_Slides_ReplaceAllTextResponse $replaceAllText)
-  {
-    $this->replaceAllText = $replaceAllText;
-  }
-  public function getReplaceAllText()
-  {
-    return $this->replaceAllText;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Slides/RgbColor.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Slides/RgbColor.php
deleted file mode 100644
index 80d7d24b..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Slides/RgbColor.php
+++ /dev/null
@@ -1,48 +0,0 @@
-blue = $blue;
-  }
-  public function getBlue()
-  {
-    return $this->blue;
-  }
-  public function setGreen($green)
-  {
-    $this->green = $green;
-  }
-  public function getGreen()
-  {
-    return $this->green;
-  }
-  public function setRed($red)
-  {
-    $this->red = $red;
-  }
-  public function getRed()
-  {
-    return $this->red;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Slides/Shadow.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Slides/Shadow.php
deleted file mode 100644
index 2d0aa486..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Slides/Shadow.php
+++ /dev/null
@@ -1,96 +0,0 @@
-alignment = $alignment;
-  }
-  public function getAlignment()
-  {
-    return $this->alignment;
-  }
-  public function setAlpha($alpha)
-  {
-    $this->alpha = $alpha;
-  }
-  public function getAlpha()
-  {
-    return $this->alpha;
-  }
-  public function setBlurRadius(Google_Service_Slides_Dimension $blurRadius)
-  {
-    $this->blurRadius = $blurRadius;
-  }
-  public function getBlurRadius()
-  {
-    return $this->blurRadius;
-  }
-  public function setColor(Google_Service_Slides_OpaqueColor $color)
-  {
-    $this->color = $color;
-  }
-  public function getColor()
-  {
-    return $this->color;
-  }
-  public function setPropertyState($propertyState)
-  {
-    $this->propertyState = $propertyState;
-  }
-  public function getPropertyState()
-  {
-    return $this->propertyState;
-  }
-  public function setRotateWithShape($rotateWithShape)
-  {
-    $this->rotateWithShape = $rotateWithShape;
-  }
-  public function getRotateWithShape()
-  {
-    return $this->rotateWithShape;
-  }
-  public function setTransform(Google_Service_Slides_AffineTransform $transform)
-  {
-    $this->transform = $transform;
-  }
-  public function getTransform()
-  {
-    return $this->transform;
-  }
-  public function setType($type)
-  {
-    $this->type = $type;
-  }
-  public function getType()
-  {
-    return $this->type;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Slides/Shape.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Slides/Shape.php
deleted file mode 100644
index 46ed9fa9..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Slides/Shape.php
+++ /dev/null
@@ -1,60 +0,0 @@
-placeholder = $placeholder;
-  }
-  public function getPlaceholder()
-  {
-    return $this->placeholder;
-  }
-  public function setShapeProperties(Google_Service_Slides_ShapeProperties $shapeProperties)
-  {
-    $this->shapeProperties = $shapeProperties;
-  }
-  public function getShapeProperties()
-  {
-    return $this->shapeProperties;
-  }
-  public function setShapeType($shapeType)
-  {
-    $this->shapeType = $shapeType;
-  }
-  public function getShapeType()
-  {
-    return $this->shapeType;
-  }
-  public function setText(Google_Service_Slides_TextContent $text)
-  {
-    $this->text = $text;
-  }
-  public function getText()
-  {
-    return $this->text;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Slides/ShapeBackgroundFill.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Slides/ShapeBackgroundFill.php
deleted file mode 100644
index a40878c4..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Slides/ShapeBackgroundFill.php
+++ /dev/null
@@ -1,40 +0,0 @@
-propertyState = $propertyState;
-  }
-  public function getPropertyState()
-  {
-    return $this->propertyState;
-  }
-  public function setSolidFill(Google_Service_Slides_SolidFill $solidFill)
-  {
-    $this->solidFill = $solidFill;
-  }
-  public function getSolidFill()
-  {
-    return $this->solidFill;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Slides/ShapeProperties.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Slides/ShapeProperties.php
deleted file mode 100644
index 6eeaf915..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Slides/ShapeProperties.php
+++ /dev/null
@@ -1,61 +0,0 @@
-link = $link;
-  }
-  public function getLink()
-  {
-    return $this->link;
-  }
-  public function setOutline(Google_Service_Slides_Outline $outline)
-  {
-    $this->outline = $outline;
-  }
-  public function getOutline()
-  {
-    return $this->outline;
-  }
-  public function setShadow(Google_Service_Slides_Shadow $shadow)
-  {
-    $this->shadow = $shadow;
-  }
-  public function getShadow()
-  {
-    return $this->shadow;
-  }
-  public function setShapeBackgroundFill(Google_Service_Slides_ShapeBackgroundFill $shapeBackgroundFill)
-  {
-    $this->shapeBackgroundFill = $shapeBackgroundFill;
-  }
-  public function getShapeBackgroundFill()
-  {
-    return $this->shapeBackgroundFill;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Slides/SheetsChart.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Slides/SheetsChart.php
deleted file mode 100644
index 9117844e..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Slides/SheetsChart.php
+++ /dev/null
@@ -1,58 +0,0 @@
-chartId = $chartId;
-  }
-  public function getChartId()
-  {
-    return $this->chartId;
-  }
-  public function setContentUrl($contentUrl)
-  {
-    $this->contentUrl = $contentUrl;
-  }
-  public function getContentUrl()
-  {
-    return $this->contentUrl;
-  }
-  public function setSheetsChartProperties(Google_Service_Slides_SheetsChartProperties $sheetsChartProperties)
-  {
-    $this->sheetsChartProperties = $sheetsChartProperties;
-  }
-  public function getSheetsChartProperties()
-  {
-    return $this->sheetsChartProperties;
-  }
-  public function setSpreadsheetId($spreadsheetId)
-  {
-    $this->spreadsheetId = $spreadsheetId;
-  }
-  public function getSpreadsheetId()
-  {
-    return $this->spreadsheetId;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Slides/SheetsChartProperties.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Slides/SheetsChartProperties.php
deleted file mode 100644
index 3953ab5e..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Slides/SheetsChartProperties.php
+++ /dev/null
@@ -1,31 +0,0 @@
-chartImageProperties = $chartImageProperties;
-  }
-  public function getChartImageProperties()
-  {
-    return $this->chartImageProperties;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Slides/Size.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Slides/Size.php
deleted file mode 100644
index baba3854..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Slides/Size.php
+++ /dev/null
@@ -1,41 +0,0 @@
-height = $height;
-  }
-  public function getHeight()
-  {
-    return $this->height;
-  }
-  public function setWidth(Google_Service_Slides_Dimension $width)
-  {
-    $this->width = $width;
-  }
-  public function getWidth()
-  {
-    return $this->width;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Slides/SlideProperties.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Slides/SlideProperties.php
deleted file mode 100644
index dc9b5986..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Slides/SlideProperties.php
+++ /dev/null
@@ -1,49 +0,0 @@
-layoutObjectId = $layoutObjectId;
-  }
-  public function getLayoutObjectId()
-  {
-    return $this->layoutObjectId;
-  }
-  public function setMasterObjectId($masterObjectId)
-  {
-    $this->masterObjectId = $masterObjectId;
-  }
-  public function getMasterObjectId()
-  {
-    return $this->masterObjectId;
-  }
-  public function setNotesPage(Google_Service_Slides_Page $notesPage)
-  {
-    $this->notesPage = $notesPage;
-  }
-  public function getNotesPage()
-  {
-    return $this->notesPage;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Slides/SlidesList.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Slides/SlidesList.php
deleted file mode 100644
index cf360406..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Slides/SlidesList.php
+++ /dev/null
@@ -1,40 +0,0 @@
-listId = $listId;
-  }
-  public function getListId()
-  {
-    return $this->listId;
-  }
-  public function setNestingLevel($nestingLevel)
-  {
-    $this->nestingLevel = $nestingLevel;
-  }
-  public function getNestingLevel()
-  {
-    return $this->nestingLevel;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Slides/SolidFill.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Slides/SolidFill.php
deleted file mode 100644
index beaff228..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Slides/SolidFill.php
+++ /dev/null
@@ -1,40 +0,0 @@
-alpha = $alpha;
-  }
-  public function getAlpha()
-  {
-    return $this->alpha;
-  }
-  public function setColor(Google_Service_Slides_OpaqueColor $color)
-  {
-    $this->color = $color;
-  }
-  public function getColor()
-  {
-    return $this->color;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Slides/StretchedPictureFill.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Slides/StretchedPictureFill.php
deleted file mode 100644
index a85cda4d..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Slides/StretchedPictureFill.php
+++ /dev/null
@@ -1,40 +0,0 @@
-contentUrl = $contentUrl;
-  }
-  public function getContentUrl()
-  {
-    return $this->contentUrl;
-  }
-  public function setSize(Google_Service_Slides_Size $size)
-  {
-    $this->size = $size;
-  }
-  public function getSize()
-  {
-    return $this->size;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Slides/SubstringMatchCriteria.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Slides/SubstringMatchCriteria.php
deleted file mode 100644
index 7afce04f..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Slides/SubstringMatchCriteria.php
+++ /dev/null
@@ -1,39 +0,0 @@
-matchCase = $matchCase;
-  }
-  public function getMatchCase()
-  {
-    return $this->matchCase;
-  }
-  public function setText($text)
-  {
-    $this->text = $text;
-  }
-  public function getText()
-  {
-    return $this->text;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Slides/Table.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Slides/Table.php
deleted file mode 100644
index fd3d7cd4..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Slides/Table.php
+++ /dev/null
@@ -1,60 +0,0 @@
-columns = $columns;
-  }
-  public function getColumns()
-  {
-    return $this->columns;
-  }
-  public function setRows($rows)
-  {
-    $this->rows = $rows;
-  }
-  public function getRows()
-  {
-    return $this->rows;
-  }
-  public function setTableColumns($tableColumns)
-  {
-    $this->tableColumns = $tableColumns;
-  }
-  public function getTableColumns()
-  {
-    return $this->tableColumns;
-  }
-  public function setTableRows($tableRows)
-  {
-    $this->tableRows = $tableRows;
-  }
-  public function getTableRows()
-  {
-    return $this->tableRows;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Slides/TableCell.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Slides/TableCell.php
deleted file mode 100644
index 69a431c6..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Slides/TableCell.php
+++ /dev/null
@@ -1,69 +0,0 @@
-columnSpan = $columnSpan;
-  }
-  public function getColumnSpan()
-  {
-    return $this->columnSpan;
-  }
-  public function setLocation(Google_Service_Slides_TableCellLocation $location)
-  {
-    $this->location = $location;
-  }
-  public function getLocation()
-  {
-    return $this->location;
-  }
-  public function setRowSpan($rowSpan)
-  {
-    $this->rowSpan = $rowSpan;
-  }
-  public function getRowSpan()
-  {
-    return $this->rowSpan;
-  }
-  public function setTableCellProperties(Google_Service_Slides_TableCellProperties $tableCellProperties)
-  {
-    $this->tableCellProperties = $tableCellProperties;
-  }
-  public function getTableCellProperties()
-  {
-    return $this->tableCellProperties;
-  }
-  public function setText(Google_Service_Slides_TextContent $text)
-  {
-    $this->text = $text;
-  }
-  public function getText()
-  {
-    return $this->text;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Slides/TableCellBackgroundFill.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Slides/TableCellBackgroundFill.php
deleted file mode 100644
index 38ec818b..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Slides/TableCellBackgroundFill.php
+++ /dev/null
@@ -1,40 +0,0 @@
-propertyState = $propertyState;
-  }
-  public function getPropertyState()
-  {
-    return $this->propertyState;
-  }
-  public function setSolidFill(Google_Service_Slides_SolidFill $solidFill)
-  {
-    $this->solidFill = $solidFill;
-  }
-  public function getSolidFill()
-  {
-    return $this->solidFill;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Slides/TableCellLocation.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Slides/TableCellLocation.php
deleted file mode 100644
index fd111081..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Slides/TableCellLocation.php
+++ /dev/null
@@ -1,39 +0,0 @@
-columnIndex = $columnIndex;
-  }
-  public function getColumnIndex()
-  {
-    return $this->columnIndex;
-  }
-  public function setRowIndex($rowIndex)
-  {
-    $this->rowIndex = $rowIndex;
-  }
-  public function getRowIndex()
-  {
-    return $this->rowIndex;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Slides/TableCellProperties.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Slides/TableCellProperties.php
deleted file mode 100644
index 59e6e639..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Slides/TableCellProperties.php
+++ /dev/null
@@ -1,31 +0,0 @@
-tableCellBackgroundFill = $tableCellBackgroundFill;
-  }
-  public function getTableCellBackgroundFill()
-  {
-    return $this->tableCellBackgroundFill;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Slides/TableColumnProperties.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Slides/TableColumnProperties.php
deleted file mode 100644
index 99d2f10c..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Slides/TableColumnProperties.php
+++ /dev/null
@@ -1,31 +0,0 @@
-columnWidth = $columnWidth;
-  }
-  public function getColumnWidth()
-  {
-    return $this->columnWidth;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Slides/TableRange.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Slides/TableRange.php
deleted file mode 100644
index bc451847..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Slides/TableRange.php
+++ /dev/null
@@ -1,49 +0,0 @@
-columnSpan = $columnSpan;
-  }
-  public function getColumnSpan()
-  {
-    return $this->columnSpan;
-  }
-  public function setLocation(Google_Service_Slides_TableCellLocation $location)
-  {
-    $this->location = $location;
-  }
-  public function getLocation()
-  {
-    return $this->location;
-  }
-  public function setRowSpan($rowSpan)
-  {
-    $this->rowSpan = $rowSpan;
-  }
-  public function getRowSpan()
-  {
-    return $this->rowSpan;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Slides/TableRow.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Slides/TableRow.php
deleted file mode 100644
index 41bce0f4..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Slides/TableRow.php
+++ /dev/null
@@ -1,42 +0,0 @@
-rowHeight = $rowHeight;
-  }
-  public function getRowHeight()
-  {
-    return $this->rowHeight;
-  }
-  public function setTableCells($tableCells)
-  {
-    $this->tableCells = $tableCells;
-  }
-  public function getTableCells()
-  {
-    return $this->tableCells;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Slides/TextContent.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Slides/TextContent.php
deleted file mode 100644
index e4ec285d..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Slides/TextContent.php
+++ /dev/null
@@ -1,42 +0,0 @@
-lists = $lists;
-  }
-  public function getLists()
-  {
-    return $this->lists;
-  }
-  public function setTextElements($textElements)
-  {
-    $this->textElements = $textElements;
-  }
-  public function getTextElements()
-  {
-    return $this->textElements;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Slides/TextElement.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Slides/TextElement.php
deleted file mode 100644
index 30b5c9bb..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Slides/TextElement.php
+++ /dev/null
@@ -1,69 +0,0 @@
-autoText = $autoText;
-  }
-  public function getAutoText()
-  {
-    return $this->autoText;
-  }
-  public function setEndIndex($endIndex)
-  {
-    $this->endIndex = $endIndex;
-  }
-  public function getEndIndex()
-  {
-    return $this->endIndex;
-  }
-  public function setParagraphMarker(Google_Service_Slides_ParagraphMarker $paragraphMarker)
-  {
-    $this->paragraphMarker = $paragraphMarker;
-  }
-  public function getParagraphMarker()
-  {
-    return $this->paragraphMarker;
-  }
-  public function setStartIndex($startIndex)
-  {
-    $this->startIndex = $startIndex;
-  }
-  public function getStartIndex()
-  {
-    return $this->startIndex;
-  }
-  public function setTextRun(Google_Service_Slides_TextRun $textRun)
-  {
-    $this->textRun = $textRun;
-  }
-  public function getTextRun()
-  {
-    return $this->textRun;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Slides/TextRun.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Slides/TextRun.php
deleted file mode 100644
index 979318fe..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Slides/TextRun.php
+++ /dev/null
@@ -1,40 +0,0 @@
-content = $content;
-  }
-  public function getContent()
-  {
-    return $this->content;
-  }
-  public function setStyle(Google_Service_Slides_TextStyle $style)
-  {
-    $this->style = $style;
-  }
-  public function getStyle()
-  {
-    return $this->style;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Slides/TextStyle.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Slides/TextStyle.php
deleted file mode 100644
index 407fe489..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Slides/TextStyle.php
+++ /dev/null
@@ -1,134 +0,0 @@
-backgroundColor = $backgroundColor;
-  }
-  public function getBackgroundColor()
-  {
-    return $this->backgroundColor;
-  }
-  public function setBaselineOffset($baselineOffset)
-  {
-    $this->baselineOffset = $baselineOffset;
-  }
-  public function getBaselineOffset()
-  {
-    return $this->baselineOffset;
-  }
-  public function setBold($bold)
-  {
-    $this->bold = $bold;
-  }
-  public function getBold()
-  {
-    return $this->bold;
-  }
-  public function setFontFamily($fontFamily)
-  {
-    $this->fontFamily = $fontFamily;
-  }
-  public function getFontFamily()
-  {
-    return $this->fontFamily;
-  }
-  public function setFontSize(Google_Service_Slides_Dimension $fontSize)
-  {
-    $this->fontSize = $fontSize;
-  }
-  public function getFontSize()
-  {
-    return $this->fontSize;
-  }
-  public function setForegroundColor(Google_Service_Slides_OptionalColor $foregroundColor)
-  {
-    $this->foregroundColor = $foregroundColor;
-  }
-  public function getForegroundColor()
-  {
-    return $this->foregroundColor;
-  }
-  public function setItalic($italic)
-  {
-    $this->italic = $italic;
-  }
-  public function getItalic()
-  {
-    return $this->italic;
-  }
-  public function setLink(Google_Service_Slides_Link $link)
-  {
-    $this->link = $link;
-  }
-  public function getLink()
-  {
-    return $this->link;
-  }
-  public function setSmallCaps($smallCaps)
-  {
-    $this->smallCaps = $smallCaps;
-  }
-  public function getSmallCaps()
-  {
-    return $this->smallCaps;
-  }
-  public function setStrikethrough($strikethrough)
-  {
-    $this->strikethrough = $strikethrough;
-  }
-  public function getStrikethrough()
-  {
-    return $this->strikethrough;
-  }
-  public function setUnderline($underline)
-  {
-    $this->underline = $underline;
-  }
-  public function getUnderline()
-  {
-    return $this->underline;
-  }
-  public function setWeightedFontFamily(Google_Service_Slides_WeightedFontFamily $weightedFontFamily)
-  {
-    $this->weightedFontFamily = $weightedFontFamily;
-  }
-  public function getWeightedFontFamily()
-  {
-    return $this->weightedFontFamily;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Slides/ThemeColorPair.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Slides/ThemeColorPair.php
deleted file mode 100644
index 8424997a..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Slides/ThemeColorPair.php
+++ /dev/null
@@ -1,40 +0,0 @@
-color = $color;
-  }
-  public function getColor()
-  {
-    return $this->color;
-  }
-  public function setType($type)
-  {
-    $this->type = $type;
-  }
-  public function getType()
-  {
-    return $this->type;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Slides/UpdateImagePropertiesRequest.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Slides/UpdateImagePropertiesRequest.php
deleted file mode 100644
index d4fc99d6..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Slides/UpdateImagePropertiesRequest.php
+++ /dev/null
@@ -1,49 +0,0 @@
-fields = $fields;
-  }
-  public function getFields()
-  {
-    return $this->fields;
-  }
-  public function setImageProperties(Google_Service_Slides_ImageProperties $imageProperties)
-  {
-    $this->imageProperties = $imageProperties;
-  }
-  public function getImageProperties()
-  {
-    return $this->imageProperties;
-  }
-  public function setObjectId($objectId)
-  {
-    $this->objectId = $objectId;
-  }
-  public function getObjectId()
-  {
-    return $this->objectId;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Slides/UpdateLinePropertiesRequest.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Slides/UpdateLinePropertiesRequest.php
deleted file mode 100644
index 92c56e2c..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Slides/UpdateLinePropertiesRequest.php
+++ /dev/null
@@ -1,49 +0,0 @@
-fields = $fields;
-  }
-  public function getFields()
-  {
-    return $this->fields;
-  }
-  public function setLineProperties(Google_Service_Slides_LineProperties $lineProperties)
-  {
-    $this->lineProperties = $lineProperties;
-  }
-  public function getLineProperties()
-  {
-    return $this->lineProperties;
-  }
-  public function setObjectId($objectId)
-  {
-    $this->objectId = $objectId;
-  }
-  public function getObjectId()
-  {
-    return $this->objectId;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Slides/UpdatePageElementTransformRequest.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Slides/UpdatePageElementTransformRequest.php
deleted file mode 100644
index b4ec320e..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Slides/UpdatePageElementTransformRequest.php
+++ /dev/null
@@ -1,49 +0,0 @@
-applyMode = $applyMode;
-  }
-  public function getApplyMode()
-  {
-    return $this->applyMode;
-  }
-  public function setObjectId($objectId)
-  {
-    $this->objectId = $objectId;
-  }
-  public function getObjectId()
-  {
-    return $this->objectId;
-  }
-  public function setTransform(Google_Service_Slides_AffineTransform $transform)
-  {
-    $this->transform = $transform;
-  }
-  public function getTransform()
-  {
-    return $this->transform;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Slides/UpdatePagePropertiesRequest.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Slides/UpdatePagePropertiesRequest.php
deleted file mode 100644
index a4c33639..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Slides/UpdatePagePropertiesRequest.php
+++ /dev/null
@@ -1,49 +0,0 @@
-fields = $fields;
-  }
-  public function getFields()
-  {
-    return $this->fields;
-  }
-  public function setObjectId($objectId)
-  {
-    $this->objectId = $objectId;
-  }
-  public function getObjectId()
-  {
-    return $this->objectId;
-  }
-  public function setPageProperties(Google_Service_Slides_PageProperties $pageProperties)
-  {
-    $this->pageProperties = $pageProperties;
-  }
-  public function getPageProperties()
-  {
-    return $this->pageProperties;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Slides/UpdateParagraphStyleRequest.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Slides/UpdateParagraphStyleRequest.php
deleted file mode 100644
index b0720d00..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Slides/UpdateParagraphStyleRequest.php
+++ /dev/null
@@ -1,69 +0,0 @@
-cellLocation = $cellLocation;
-  }
-  public function getCellLocation()
-  {
-    return $this->cellLocation;
-  }
-  public function setFields($fields)
-  {
-    $this->fields = $fields;
-  }
-  public function getFields()
-  {
-    return $this->fields;
-  }
-  public function setObjectId($objectId)
-  {
-    $this->objectId = $objectId;
-  }
-  public function getObjectId()
-  {
-    return $this->objectId;
-  }
-  public function setStyle(Google_Service_Slides_ParagraphStyle $style)
-  {
-    $this->style = $style;
-  }
-  public function getStyle()
-  {
-    return $this->style;
-  }
-  public function setTextRange(Google_Service_Slides_Range $textRange)
-  {
-    $this->textRange = $textRange;
-  }
-  public function getTextRange()
-  {
-    return $this->textRange;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Slides/UpdateShapePropertiesRequest.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Slides/UpdateShapePropertiesRequest.php
deleted file mode 100644
index bb3a3af5..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Slides/UpdateShapePropertiesRequest.php
+++ /dev/null
@@ -1,49 +0,0 @@
-fields = $fields;
-  }
-  public function getFields()
-  {
-    return $this->fields;
-  }
-  public function setObjectId($objectId)
-  {
-    $this->objectId = $objectId;
-  }
-  public function getObjectId()
-  {
-    return $this->objectId;
-  }
-  public function setShapeProperties(Google_Service_Slides_ShapeProperties $shapeProperties)
-  {
-    $this->shapeProperties = $shapeProperties;
-  }
-  public function getShapeProperties()
-  {
-    return $this->shapeProperties;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Slides/UpdateSlidesPositionRequest.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Slides/UpdateSlidesPositionRequest.php
deleted file mode 100644
index b0f278d6..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Slides/UpdateSlidesPositionRequest.php
+++ /dev/null
@@ -1,40 +0,0 @@
-insertionIndex = $insertionIndex;
-  }
-  public function getInsertionIndex()
-  {
-    return $this->insertionIndex;
-  }
-  public function setSlideObjectIds($slideObjectIds)
-  {
-    $this->slideObjectIds = $slideObjectIds;
-  }
-  public function getSlideObjectIds()
-  {
-    return $this->slideObjectIds;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Slides/UpdateTableCellPropertiesRequest.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Slides/UpdateTableCellPropertiesRequest.php
deleted file mode 100644
index bf5d71fd..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Slides/UpdateTableCellPropertiesRequest.php
+++ /dev/null
@@ -1,59 +0,0 @@
-fields = $fields;
-  }
-  public function getFields()
-  {
-    return $this->fields;
-  }
-  public function setObjectId($objectId)
-  {
-    $this->objectId = $objectId;
-  }
-  public function getObjectId()
-  {
-    return $this->objectId;
-  }
-  public function setTableCellProperties(Google_Service_Slides_TableCellProperties $tableCellProperties)
-  {
-    $this->tableCellProperties = $tableCellProperties;
-  }
-  public function getTableCellProperties()
-  {
-    return $this->tableCellProperties;
-  }
-  public function setTableRange(Google_Service_Slides_TableRange $tableRange)
-  {
-    $this->tableRange = $tableRange;
-  }
-  public function getTableRange()
-  {
-    return $this->tableRange;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Slides/UpdateTextStyleRequest.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Slides/UpdateTextStyleRequest.php
deleted file mode 100644
index fb1995d3..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Slides/UpdateTextStyleRequest.php
+++ /dev/null
@@ -1,69 +0,0 @@
-cellLocation = $cellLocation;
-  }
-  public function getCellLocation()
-  {
-    return $this->cellLocation;
-  }
-  public function setFields($fields)
-  {
-    $this->fields = $fields;
-  }
-  public function getFields()
-  {
-    return $this->fields;
-  }
-  public function setObjectId($objectId)
-  {
-    $this->objectId = $objectId;
-  }
-  public function getObjectId()
-  {
-    return $this->objectId;
-  }
-  public function setStyle(Google_Service_Slides_TextStyle $style)
-  {
-    $this->style = $style;
-  }
-  public function getStyle()
-  {
-    return $this->style;
-  }
-  public function setTextRange(Google_Service_Slides_Range $textRange)
-  {
-    $this->textRange = $textRange;
-  }
-  public function getTextRange()
-  {
-    return $this->textRange;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Slides/UpdateVideoPropertiesRequest.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Slides/UpdateVideoPropertiesRequest.php
deleted file mode 100644
index 3a0199b5..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Slides/UpdateVideoPropertiesRequest.php
+++ /dev/null
@@ -1,49 +0,0 @@
-fields = $fields;
-  }
-  public function getFields()
-  {
-    return $this->fields;
-  }
-  public function setObjectId($objectId)
-  {
-    $this->objectId = $objectId;
-  }
-  public function getObjectId()
-  {
-    return $this->objectId;
-  }
-  public function setVideoProperties(Google_Service_Slides_VideoProperties $videoProperties)
-  {
-    $this->videoProperties = $videoProperties;
-  }
-  public function getVideoProperties()
-  {
-    return $this->videoProperties;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Slides/Video.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Slides/Video.php
deleted file mode 100644
index 66d976c1..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Slides/Video.php
+++ /dev/null
@@ -1,58 +0,0 @@
-id = $id;
-  }
-  public function getId()
-  {
-    return $this->id;
-  }
-  public function setSource($source)
-  {
-    $this->source = $source;
-  }
-  public function getSource()
-  {
-    return $this->source;
-  }
-  public function setUrl($url)
-  {
-    $this->url = $url;
-  }
-  public function getUrl()
-  {
-    return $this->url;
-  }
-  public function setVideoProperties(Google_Service_Slides_VideoProperties $videoProperties)
-  {
-    $this->videoProperties = $videoProperties;
-  }
-  public function getVideoProperties()
-  {
-    return $this->videoProperties;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Slides/VideoProperties.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Slides/VideoProperties.php
deleted file mode 100644
index 9f75bcba..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Slides/VideoProperties.php
+++ /dev/null
@@ -1,31 +0,0 @@
-outline = $outline;
-  }
-  public function getOutline()
-  {
-    return $this->outline;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Slides/WeightedFontFamily.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Slides/WeightedFontFamily.php
deleted file mode 100644
index 324142ed..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Slides/WeightedFontFamily.php
+++ /dev/null
@@ -1,39 +0,0 @@
-fontFamily = $fontFamily;
-  }
-  public function getFontFamily()
-  {
-    return $this->fontFamily;
-  }
-  public function setWeight($weight)
-  {
-    $this->weight = $weight;
-  }
-  public function getWeight()
-  {
-    return $this->weight;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Slides/WordArt.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Slides/WordArt.php
deleted file mode 100644
index 52f84ddb..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Slides/WordArt.php
+++ /dev/null
@@ -1,30 +0,0 @@
-renderedText = $renderedText;
-  }
-  public function getRenderedText()
-  {
-    return $this->renderedText;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Slides/WriteControl.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Slides/WriteControl.php
deleted file mode 100644
index f3d55588..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Slides/WriteControl.php
+++ /dev/null
@@ -1,30 +0,0 @@
-requiredRevisionId = $requiredRevisionId;
-  }
-  public function getRequiredRevisionId()
-  {
-    return $this->requiredRevisionId;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Spanner.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Spanner.php
deleted file mode 100644
index 66750806..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Spanner.php
+++ /dev/null
@@ -1,541 +0,0 @@
-
- * Cloud Spanner is a managed, mission-critical, globally consistent and
- * scalable relational database service.

- *
- * 

- * For more information about this service, see the API
- * Documentation
- * 

- *
- * @author Google, Inc.
- */
-class Google_Service_Spanner extends Google_Service
-{
-  /** View and manage your data across Google Cloud Platform services. */
-  const CLOUD_PLATFORM =
-      "https://www.googleapis.com/auth/cloud-platform";
-
-  public $projects_instanceConfigs;
-  public $projects_instances;
-  public $projects_instances_databases;
-  public $projects_instances_databases_operations;
-  public $projects_instances_databases_sessions;
-  public $projects_instances_operations;
-  
-  /**
-   * Constructs the internal representation of the Spanner service.
-   *
-   * @param Google_Client $client
-   */
-  public function __construct(Google_Client $client)
-  {
-    parent::__construct($client);
-    $this->rootUrl = 'https://spanner.googleapis.com/';
-    $this->servicePath = '';
-    $this->version = 'v1';
-    $this->serviceName = 'spanner';
-
-    $this->projects_instanceConfigs = new Google_Service_Spanner_Resource_ProjectsInstanceConfigs(
-        $this,
-        $this->serviceName,
-        'instanceConfigs',
-        array(
-          'methods' => array(
-            'get' => array(
-              'path' => 'v1/{+name}',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'name' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'list' => array(
-              'path' => 'v1/{+parent}/instanceConfigs',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'parent' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'pageToken' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'pageSize' => array(
-                  'location' => 'query',
-                  'type' => 'integer',
-                ),
-              ),
-            ),
-          )
-        )
-    );
-    $this->projects_instances = new Google_Service_Spanner_Resource_ProjectsInstances(
-        $this,
-        $this->serviceName,
-        'instances',
-        array(
-          'methods' => array(
-            'create' => array(
-              'path' => 'v1/{+parent}/instances',
-              'httpMethod' => 'POST',
-              'parameters' => array(
-                'parent' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'delete' => array(
-              'path' => 'v1/{+name}',
-              'httpMethod' => 'DELETE',
-              'parameters' => array(
-                'name' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'get' => array(
-              'path' => 'v1/{+name}',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'name' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'getIamPolicy' => array(
-              'path' => 'v1/{+resource}:getIamPolicy',
-              'httpMethod' => 'POST',
-              'parameters' => array(
-                'resource' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'list' => array(
-              'path' => 'v1/{+parent}/instances',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'parent' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'pageToken' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'pageSize' => array(
-                  'location' => 'query',
-                  'type' => 'integer',
-                ),
-                'filter' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-              ),
-            ),'patch' => array(
-              'path' => 'v1/{+name}',
-              'httpMethod' => 'PATCH',
-              'parameters' => array(
-                'name' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'setIamPolicy' => array(
-              'path' => 'v1/{+resource}:setIamPolicy',
-              'httpMethod' => 'POST',
-              'parameters' => array(
-                'resource' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'testIamPermissions' => array(
-              'path' => 'v1/{+resource}:testIamPermissions',
-              'httpMethod' => 'POST',
-              'parameters' => array(
-                'resource' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),
-          )
-        )
-    );
-    $this->projects_instances_databases = new Google_Service_Spanner_Resource_ProjectsInstancesDatabases(
-        $this,
-        $this->serviceName,
-        'databases',
-        array(
-          'methods' => array(
-            'create' => array(
-              'path' => 'v1/{+parent}/databases',
-              'httpMethod' => 'POST',
-              'parameters' => array(
-                'parent' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'dropDatabase' => array(
-              'path' => 'v1/{+database}',
-              'httpMethod' => 'DELETE',
-              'parameters' => array(
-                'database' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'get' => array(
-              'path' => 'v1/{+name}',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'name' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'getDdl' => array(
-              'path' => 'v1/{+database}/ddl',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'database' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'getIamPolicy' => array(
-              'path' => 'v1/{+resource}:getIamPolicy',
-              'httpMethod' => 'POST',
-              'parameters' => array(
-                'resource' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'list' => array(
-              'path' => 'v1/{+parent}/databases',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'parent' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'pageToken' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'pageSize' => array(
-                  'location' => 'query',
-                  'type' => 'integer',
-                ),
-              ),
-            ),'setIamPolicy' => array(
-              'path' => 'v1/{+resource}:setIamPolicy',
-              'httpMethod' => 'POST',
-              'parameters' => array(
-                'resource' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'testIamPermissions' => array(
-              'path' => 'v1/{+resource}:testIamPermissions',
-              'httpMethod' => 'POST',
-              'parameters' => array(
-                'resource' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'updateDdl' => array(
-              'path' => 'v1/{+database}/ddl',
-              'httpMethod' => 'PATCH',
-              'parameters' => array(
-                'database' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),
-          )
-        )
-    );
-    $this->projects_instances_databases_operations = new Google_Service_Spanner_Resource_ProjectsInstancesDatabasesOperations(
-        $this,
-        $this->serviceName,
-        'operations',
-        array(
-          'methods' => array(
-            'cancel' => array(
-              'path' => 'v1/{+name}:cancel',
-              'httpMethod' => 'POST',
-              'parameters' => array(
-                'name' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'delete' => array(
-              'path' => 'v1/{+name}',
-              'httpMethod' => 'DELETE',
-              'parameters' => array(
-                'name' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'get' => array(
-              'path' => 'v1/{+name}',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'name' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'list' => array(
-              'path' => 'v1/{+name}',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'name' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'pageSize' => array(
-                  'location' => 'query',
-                  'type' => 'integer',
-                ),
-                'filter' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'pageToken' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-              ),
-            ),
-          )
-        )
-    );
-    $this->projects_instances_databases_sessions = new Google_Service_Spanner_Resource_ProjectsInstancesDatabasesSessions(
-        $this,
-        $this->serviceName,
-        'sessions',
-        array(
-          'methods' => array(
-            'beginTransaction' => array(
-              'path' => 'v1/{+session}:beginTransaction',
-              'httpMethod' => 'POST',
-              'parameters' => array(
-                'session' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'commit' => array(
-              'path' => 'v1/{+session}:commit',
-              'httpMethod' => 'POST',
-              'parameters' => array(
-                'session' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'create' => array(
-              'path' => 'v1/{+database}/sessions',
-              'httpMethod' => 'POST',
-              'parameters' => array(
-                'database' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'delete' => array(
-              'path' => 'v1/{+name}',
-              'httpMethod' => 'DELETE',
-              'parameters' => array(
-                'name' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'executeSql' => array(
-              'path' => 'v1/{+session}:executeSql',
-              'httpMethod' => 'POST',
-              'parameters' => array(
-                'session' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'executeStreamingSql' => array(
-              'path' => 'v1/{+session}:executeStreamingSql',
-              'httpMethod' => 'POST',
-              'parameters' => array(
-                'session' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'get' => array(
-              'path' => 'v1/{+name}',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'name' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'read' => array(
-              'path' => 'v1/{+session}:read',
-              'httpMethod' => 'POST',
-              'parameters' => array(
-                'session' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'rollback' => array(
-              'path' => 'v1/{+session}:rollback',
-              'httpMethod' => 'POST',
-              'parameters' => array(
-                'session' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'streamingRead' => array(
-              'path' => 'v1/{+session}:streamingRead',
-              'httpMethod' => 'POST',
-              'parameters' => array(
-                'session' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),
-          )
-        )
-    );
-    $this->projects_instances_operations = new Google_Service_Spanner_Resource_ProjectsInstancesOperations(
-        $this,
-        $this->serviceName,
-        'operations',
-        array(
-          'methods' => array(
-            'cancel' => array(
-              'path' => 'v1/{+name}:cancel',
-              'httpMethod' => 'POST',
-              'parameters' => array(
-                'name' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'delete' => array(
-              'path' => 'v1/{+name}',
-              'httpMethod' => 'DELETE',
-              'parameters' => array(
-                'name' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'get' => array(
-              'path' => 'v1/{+name}',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'name' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'list' => array(
-              'path' => 'v1/{+name}',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'name' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'filter' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'pageToken' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'pageSize' => array(
-                  'location' => 'query',
-                  'type' => 'integer',
-                ),
-              ),
-            ),
-          )
-        )
-    );
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Spanner/AuditConfig.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Spanner/AuditConfig.php
deleted file mode 100644
index ce1f192d..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Spanner/AuditConfig.php
+++ /dev/null
@@ -1,50 +0,0 @@
-auditLogConfigs = $auditLogConfigs;
-  }
-  public function getAuditLogConfigs()
-  {
-    return $this->auditLogConfigs;
-  }
-  public function setExemptedMembers($exemptedMembers)
-  {
-    $this->exemptedMembers = $exemptedMembers;
-  }
-  public function getExemptedMembers()
-  {
-    return $this->exemptedMembers;
-  }
-  public function setService($service)
-  {
-    $this->service = $service;
-  }
-  public function getService()
-  {
-    return $this->service;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Spanner/AuditLogConfig.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Spanner/AuditLogConfig.php
deleted file mode 100644
index 78d7a059..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Spanner/AuditLogConfig.php
+++ /dev/null
@@ -1,40 +0,0 @@
-exemptedMembers = $exemptedMembers;
-  }
-  public function getExemptedMembers()
-  {
-    return $this->exemptedMembers;
-  }
-  public function setLogType($logType)
-  {
-    $this->logType = $logType;
-  }
-  public function getLogType()
-  {
-    return $this->logType;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Spanner/BeginTransactionRequest.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Spanner/BeginTransactionRequest.php
deleted file mode 100644
index ceb465a4..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Spanner/BeginTransactionRequest.php
+++ /dev/null
@@ -1,31 +0,0 @@
-options = $options;
-  }
-  public function getOptions()
-  {
-    return $this->options;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Spanner/Binding.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Spanner/Binding.php
deleted file mode 100644
index ad108a2b..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Spanner/Binding.php
+++ /dev/null
@@ -1,40 +0,0 @@
-members = $members;
-  }
-  public function getMembers()
-  {
-    return $this->members;
-  }
-  public function setRole($role)
-  {
-    $this->role = $role;
-  }
-  public function getRole()
-  {
-    return $this->role;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Spanner/ChildLink.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Spanner/ChildLink.php
deleted file mode 100644
index 5a9025c8..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Spanner/ChildLink.php
+++ /dev/null
@@ -1,48 +0,0 @@
-childIndex = $childIndex;
-  }
-  public function getChildIndex()
-  {
-    return $this->childIndex;
-  }
-  public function setType($type)
-  {
-    $this->type = $type;
-  }
-  public function getType()
-  {
-    return $this->type;
-  }
-  public function setVariable($variable)
-  {
-    $this->variable = $variable;
-  }
-  public function getVariable()
-  {
-    return $this->variable;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Spanner/CloudAuditOptions.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Spanner/CloudAuditOptions.php
deleted file mode 100644
index b68c441a..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Spanner/CloudAuditOptions.php
+++ /dev/null
@@ -1,20 +0,0 @@
-mutations = $mutations;
-  }
-  public function getMutations()
-  {
-    return $this->mutations;
-  }
-  public function setSingleUseTransaction(Google_Service_Spanner_TransactionOptions $singleUseTransaction)
-  {
-    $this->singleUseTransaction = $singleUseTransaction;
-  }
-  public function getSingleUseTransaction()
-  {
-    return $this->singleUseTransaction;
-  }
-  public function setTransactionId($transactionId)
-  {
-    $this->transactionId = $transactionId;
-  }
-  public function getTransactionId()
-  {
-    return $this->transactionId;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Spanner/CommitResponse.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Spanner/CommitResponse.php
deleted file mode 100644
index 43b27026..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Spanner/CommitResponse.php
+++ /dev/null
@@ -1,30 +0,0 @@
-commitTimestamp = $commitTimestamp;
-  }
-  public function getCommitTimestamp()
-  {
-    return $this->commitTimestamp;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Spanner/Condition.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Spanner/Condition.php
deleted file mode 100644
index a191309b..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Spanner/Condition.php
+++ /dev/null
@@ -1,76 +0,0 @@
-iam = $iam;
-  }
-  public function getIam()
-  {
-    return $this->iam;
-  }
-  public function setOp($op)
-  {
-    $this->op = $op;
-  }
-  public function getOp()
-  {
-    return $this->op;
-  }
-  public function setSvc($svc)
-  {
-    $this->svc = $svc;
-  }
-  public function getSvc()
-  {
-    return $this->svc;
-  }
-  public function setSys($sys)
-  {
-    $this->sys = $sys;
-  }
-  public function getSys()
-  {
-    return $this->sys;
-  }
-  public function setValue($value)
-  {
-    $this->value = $value;
-  }
-  public function getValue()
-  {
-    return $this->value;
-  }
-  public function setValues($values)
-  {
-    $this->values = $values;
-  }
-  public function getValues()
-  {
-    return $this->values;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Spanner/CounterOptions.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Spanner/CounterOptions.php
deleted file mode 100644
index 8a66d6de..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Spanner/CounterOptions.php
+++ /dev/null
@@ -1,39 +0,0 @@
-field = $field;
-  }
-  public function getField()
-  {
-    return $this->field;
-  }
-  public function setMetric($metric)
-  {
-    $this->metric = $metric;
-  }
-  public function getMetric()
-  {
-    return $this->metric;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Spanner/CreateDatabaseMetadata.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Spanner/CreateDatabaseMetadata.php
deleted file mode 100644
index 8d2b3796..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Spanner/CreateDatabaseMetadata.php
+++ /dev/null
@@ -1,30 +0,0 @@
-database = $database;
-  }
-  public function getDatabase()
-  {
-    return $this->database;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Spanner/CreateDatabaseRequest.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Spanner/CreateDatabaseRequest.php
deleted file mode 100644
index 829a77a9..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Spanner/CreateDatabaseRequest.php
+++ /dev/null
@@ -1,40 +0,0 @@
-createStatement = $createStatement;
-  }
-  public function getCreateStatement()
-  {
-    return $this->createStatement;
-  }
-  public function setExtraStatements($extraStatements)
-  {
-    $this->extraStatements = $extraStatements;
-  }
-  public function getExtraStatements()
-  {
-    return $this->extraStatements;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Spanner/CreateInstanceMetadata.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Spanner/CreateInstanceMetadata.php
deleted file mode 100644
index 85aa65c1..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Spanner/CreateInstanceMetadata.php
+++ /dev/null
@@ -1,58 +0,0 @@
-cancelTime = $cancelTime;
-  }
-  public function getCancelTime()
-  {
-    return $this->cancelTime;
-  }
-  public function setEndTime($endTime)
-  {
-    $this->endTime = $endTime;
-  }
-  public function getEndTime()
-  {
-    return $this->endTime;
-  }
-  public function setInstance(Google_Service_Spanner_Instance $instance)
-  {
-    $this->instance = $instance;
-  }
-  public function getInstance()
-  {
-    return $this->instance;
-  }
-  public function setStartTime($startTime)
-  {
-    $this->startTime = $startTime;
-  }
-  public function getStartTime()
-  {
-    return $this->startTime;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Spanner/CreateInstanceRequest.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Spanner/CreateInstanceRequest.php
deleted file mode 100644
index 5d4ea1bf..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Spanner/CreateInstanceRequest.php
+++ /dev/null
@@ -1,40 +0,0 @@
-instance = $instance;
-  }
-  public function getInstance()
-  {
-    return $this->instance;
-  }
-  public function setInstanceId($instanceId)
-  {
-    $this->instanceId = $instanceId;
-  }
-  public function getInstanceId()
-  {
-    return $this->instanceId;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Spanner/DataAccessOptions.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Spanner/DataAccessOptions.php
deleted file mode 100644
index a5d279c9..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Spanner/DataAccessOptions.php
+++ /dev/null
@@ -1,20 +0,0 @@
-name = $name;
-  }
-  public function getName()
-  {
-    return $this->name;
-  }
-  public function setState($state)
-  {
-    $this->state = $state;
-  }
-  public function getState()
-  {
-    return $this->state;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Spanner/Delete.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Spanner/Delete.php
deleted file mode 100644
index be3a760c..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Spanner/Delete.php
+++ /dev/null
@@ -1,40 +0,0 @@
-keySet = $keySet;
-  }
-  public function getKeySet()
-  {
-    return $this->keySet;
-  }
-  public function setTable($table)
-  {
-    $this->table = $table;
-  }
-  public function getTable()
-  {
-    return $this->table;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Spanner/ExecuteSqlRequest.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Spanner/ExecuteSqlRequest.php
deleted file mode 100644
index c3840061..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Spanner/ExecuteSqlRequest.php
+++ /dev/null
@@ -1,77 +0,0 @@
-paramTypes = $paramTypes;
-  }
-  public function getParamTypes()
-  {
-    return $this->paramTypes;
-  }
-  public function setParams($params)
-  {
-    $this->params = $params;
-  }
-  public function getParams()
-  {
-    return $this->params;
-  }
-  public function setQueryMode($queryMode)
-  {
-    $this->queryMode = $queryMode;
-  }
-  public function getQueryMode()
-  {
-    return $this->queryMode;
-  }
-  public function setResumeToken($resumeToken)
-  {
-    $this->resumeToken = $resumeToken;
-  }
-  public function getResumeToken()
-  {
-    return $this->resumeToken;
-  }
-  public function setSql($sql)
-  {
-    $this->sql = $sql;
-  }
-  public function getSql()
-  {
-    return $this->sql;
-  }
-  public function setTransaction(Google_Service_Spanner_TransactionSelector $transaction)
-  {
-    $this->transaction = $transaction;
-  }
-  public function getTransaction()
-  {
-    return $this->transaction;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Spanner/Field.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Spanner/Field.php
deleted file mode 100644
index 5e45b3c5..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Spanner/Field.php
+++ /dev/null
@@ -1,40 +0,0 @@
-name = $name;
-  }
-  public function getName()
-  {
-    return $this->name;
-  }
-  public function setType(Google_Service_Spanner_Type $type)
-  {
-    $this->type = $type;
-  }
-  public function getType()
-  {
-    return $this->type;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Spanner/GetDatabaseDdlResponse.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Spanner/GetDatabaseDdlResponse.php
deleted file mode 100644
index 1870d1f0..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Spanner/GetDatabaseDdlResponse.php
+++ /dev/null
@@ -1,31 +0,0 @@
-statements = $statements;
-  }
-  public function getStatements()
-  {
-    return $this->statements;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Spanner/GetIamPolicyRequest.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Spanner/GetIamPolicyRequest.php
deleted file mode 100644
index f8dbbcc8..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Spanner/GetIamPolicyRequest.php
+++ /dev/null
@@ -1,20 +0,0 @@
-config = $config;
-  }
-  public function getConfig()
-  {
-    return $this->config;
-  }
-  public function setDisplayName($displayName)
-  {
-    $this->displayName = $displayName;
-  }
-  public function getDisplayName()
-  {
-    return $this->displayName;
-  }
-  public function setLabels($labels)
-  {
-    $this->labels = $labels;
-  }
-  public function getLabels()
-  {
-    return $this->labels;
-  }
-  public function setName($name)
-  {
-    $this->name = $name;
-  }
-  public function getName()
-  {
-    return $this->name;
-  }
-  public function setNodeCount($nodeCount)
-  {
-    $this->nodeCount = $nodeCount;
-  }
-  public function getNodeCount()
-  {
-    return $this->nodeCount;
-  }
-  public function setState($state)
-  {
-    $this->state = $state;
-  }
-  public function getState()
-  {
-    return $this->state;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Spanner/InstanceConfig.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Spanner/InstanceConfig.php
deleted file mode 100644
index 38c5d9e1..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Spanner/InstanceConfig.php
+++ /dev/null
@@ -1,39 +0,0 @@
-displayName = $displayName;
-  }
-  public function getDisplayName()
-  {
-    return $this->displayName;
-  }
-  public function setName($name)
-  {
-    $this->name = $name;
-  }
-  public function getName()
-  {
-    return $this->name;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Spanner/KeyRange.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Spanner/KeyRange.php
deleted file mode 100644
index 6b74eee7..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Spanner/KeyRange.php
+++ /dev/null
@@ -1,58 +0,0 @@
-endClosed = $endClosed;
-  }
-  public function getEndClosed()
-  {
-    return $this->endClosed;
-  }
-  public function setEndOpen($endOpen)
-  {
-    $this->endOpen = $endOpen;
-  }
-  public function getEndOpen()
-  {
-    return $this->endOpen;
-  }
-  public function setStartClosed($startClosed)
-  {
-    $this->startClosed = $startClosed;
-  }
-  public function getStartClosed()
-  {
-    return $this->startClosed;
-  }
-  public function setStartOpen($startOpen)
-  {
-    $this->startOpen = $startOpen;
-  }
-  public function getStartOpen()
-  {
-    return $this->startOpen;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Spanner/KeySet.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Spanner/KeySet.php
deleted file mode 100644
index 9970900a..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Spanner/KeySet.php
+++ /dev/null
@@ -1,50 +0,0 @@
-all = $all;
-  }
-  public function getAll()
-  {
-    return $this->all;
-  }
-  public function setKeys($keys)
-  {
-    $this->keys = $keys;
-  }
-  public function getKeys()
-  {
-    return $this->keys;
-  }
-  public function setRanges($ranges)
-  {
-    $this->ranges = $ranges;
-  }
-  public function getRanges()
-  {
-    return $this->ranges;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Spanner/ListDatabasesResponse.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Spanner/ListDatabasesResponse.php
deleted file mode 100644
index fc955dac..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Spanner/ListDatabasesResponse.php
+++ /dev/null
@@ -1,41 +0,0 @@
-databases = $databases;
-  }
-  public function getDatabases()
-  {
-    return $this->databases;
-  }
-  public function setNextPageToken($nextPageToken)
-  {
-    $this->nextPageToken = $nextPageToken;
-  }
-  public function getNextPageToken()
-  {
-    return $this->nextPageToken;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Spanner/ListInstanceConfigsResponse.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Spanner/ListInstanceConfigsResponse.php
deleted file mode 100644
index 6900bb7b..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Spanner/ListInstanceConfigsResponse.php
+++ /dev/null
@@ -1,41 +0,0 @@
-instanceConfigs = $instanceConfigs;
-  }
-  public function getInstanceConfigs()
-  {
-    return $this->instanceConfigs;
-  }
-  public function setNextPageToken($nextPageToken)
-  {
-    $this->nextPageToken = $nextPageToken;
-  }
-  public function getNextPageToken()
-  {
-    return $this->nextPageToken;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Spanner/ListInstancesResponse.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Spanner/ListInstancesResponse.php
deleted file mode 100644
index 89771c18..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Spanner/ListInstancesResponse.php
+++ /dev/null
@@ -1,41 +0,0 @@
-instances = $instances;
-  }
-  public function getInstances()
-  {
-    return $this->instances;
-  }
-  public function setNextPageToken($nextPageToken)
-  {
-    $this->nextPageToken = $nextPageToken;
-  }
-  public function getNextPageToken()
-  {
-    return $this->nextPageToken;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Spanner/ListOperationsResponse.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Spanner/ListOperationsResponse.php
deleted file mode 100644
index 60967570..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Spanner/ListOperationsResponse.php
+++ /dev/null
@@ -1,41 +0,0 @@
-nextPageToken = $nextPageToken;
-  }
-  public function getNextPageToken()
-  {
-    return $this->nextPageToken;
-  }
-  public function setOperations($operations)
-  {
-    $this->operations = $operations;
-  }
-  public function getOperations()
-  {
-    return $this->operations;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Spanner/LogConfig.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Spanner/LogConfig.php
deleted file mode 100644
index cef56047..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Spanner/LogConfig.php
+++ /dev/null
@@ -1,51 +0,0 @@
-cloudAudit = $cloudAudit;
-  }
-  public function getCloudAudit()
-  {
-    return $this->cloudAudit;
-  }
-  public function setCounter(Google_Service_Spanner_CounterOptions $counter)
-  {
-    $this->counter = $counter;
-  }
-  public function getCounter()
-  {
-    return $this->counter;
-  }
-  public function setDataAccess(Google_Service_Spanner_DataAccessOptions $dataAccess)
-  {
-    $this->dataAccess = $dataAccess;
-  }
-  public function getDataAccess()
-  {
-    return $this->dataAccess;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Spanner/Mutation.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Spanner/Mutation.php
deleted file mode 100644
index 41c618c3..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Spanner/Mutation.php
+++ /dev/null
@@ -1,71 +0,0 @@
-delete = $delete;
-  }
-  public function getDelete()
-  {
-    return $this->delete;
-  }
-  public function setInsert(Google_Service_Spanner_Write $insert)
-  {
-    $this->insert = $insert;
-  }
-  public function getInsert()
-  {
-    return $this->insert;
-  }
-  public function setInsertOrUpdate(Google_Service_Spanner_Write $insertOrUpdate)
-  {
-    $this->insertOrUpdate = $insertOrUpdate;
-  }
-  public function getInsertOrUpdate()
-  {
-    return $this->insertOrUpdate;
-  }
-  public function setReplace(Google_Service_Spanner_Write $replace)
-  {
-    $this->replace = $replace;
-  }
-  public function getReplace()
-  {
-    return $this->replace;
-  }
-  public function setUpdate(Google_Service_Spanner_Write $update)
-  {
-    $this->update = $update;
-  }
-  public function getUpdate()
-  {
-    return $this->update;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Spanner/Operation.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Spanner/Operation.php
deleted file mode 100644
index fb5b8812..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Spanner/Operation.php
+++ /dev/null
@@ -1,67 +0,0 @@
-done = $done;
-  }
-  public function getDone()
-  {
-    return $this->done;
-  }
-  public function setError(Google_Service_Spanner_Status $error)
-  {
-    $this->error = $error;
-  }
-  public function getError()
-  {
-    return $this->error;
-  }
-  public function setMetadata($metadata)
-  {
-    $this->metadata = $metadata;
-  }
-  public function getMetadata()
-  {
-    return $this->metadata;
-  }
-  public function setName($name)
-  {
-    $this->name = $name;
-  }
-  public function getName()
-  {
-    return $this->name;
-  }
-  public function setResponse($response)
-  {
-    $this->response = $response;
-  }
-  public function getResponse()
-  {
-    return $this->response;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Spanner/PartialResultSet.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Spanner/PartialResultSet.php
deleted file mode 100644
index 61904c58..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Spanner/PartialResultSet.php
+++ /dev/null
@@ -1,69 +0,0 @@
-chunkedValue = $chunkedValue;
-  }
-  public function getChunkedValue()
-  {
-    return $this->chunkedValue;
-  }
-  public function setMetadata(Google_Service_Spanner_ResultSetMetadata $metadata)
-  {
-    $this->metadata = $metadata;
-  }
-  public function getMetadata()
-  {
-    return $this->metadata;
-  }
-  public function setResumeToken($resumeToken)
-  {
-    $this->resumeToken = $resumeToken;
-  }
-  public function getResumeToken()
-  {
-    return $this->resumeToken;
-  }
-  public function setStats(Google_Service_Spanner_ResultSetStats $stats)
-  {
-    $this->stats = $stats;
-  }
-  public function getStats()
-  {
-    return $this->stats;
-  }
-  public function setValues($values)
-  {
-    $this->values = $values;
-  }
-  public function getValues()
-  {
-    return $this->values;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Spanner/PlanNode.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Spanner/PlanNode.php
deleted file mode 100644
index a4d08dd2..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Spanner/PlanNode.php
+++ /dev/null
@@ -1,87 +0,0 @@
-childLinks = $childLinks;
-  }
-  public function getChildLinks()
-  {
-    return $this->childLinks;
-  }
-  public function setDisplayName($displayName)
-  {
-    $this->displayName = $displayName;
-  }
-  public function getDisplayName()
-  {
-    return $this->displayName;
-  }
-  public function setExecutionStats($executionStats)
-  {
-    $this->executionStats = $executionStats;
-  }
-  public function getExecutionStats()
-  {
-    return $this->executionStats;
-  }
-  public function setIndex($index)
-  {
-    $this->index = $index;
-  }
-  public function getIndex()
-  {
-    return $this->index;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setMetadata($metadata)
-  {
-    $this->metadata = $metadata;
-  }
-  public function getMetadata()
-  {
-    return $this->metadata;
-  }
-  public function setShortRepresentation(Google_Service_Spanner_ShortRepresentation $shortRepresentation)
-  {
-    $this->shortRepresentation = $shortRepresentation;
-  }
-  public function getShortRepresentation()
-  {
-    return $this->shortRepresentation;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Spanner/Policy.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Spanner/Policy.php
deleted file mode 100644
index 4e851430..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Spanner/Policy.php
+++ /dev/null
@@ -1,79 +0,0 @@
-auditConfigs = $auditConfigs;
-  }
-  public function getAuditConfigs()
-  {
-    return $this->auditConfigs;
-  }
-  public function setBindings($bindings)
-  {
-    $this->bindings = $bindings;
-  }
-  public function getBindings()
-  {
-    return $this->bindings;
-  }
-  public function setEtag($etag)
-  {
-    $this->etag = $etag;
-  }
-  public function getEtag()
-  {
-    return $this->etag;
-  }
-  public function setIamOwned($iamOwned)
-  {
-    $this->iamOwned = $iamOwned;
-  }
-  public function getIamOwned()
-  {
-    return $this->iamOwned;
-  }
-  public function setRules($rules)
-  {
-    $this->rules = $rules;
-  }
-  public function getRules()
-  {
-    return $this->rules;
-  }
-  public function setVersion($version)
-  {
-    $this->version = $version;
-  }
-  public function getVersion()
-  {
-    return $this->version;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Spanner/QueryPlan.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Spanner/QueryPlan.php
deleted file mode 100644
index 4f6868ce..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Spanner/QueryPlan.php
+++ /dev/null
@@ -1,32 +0,0 @@
-planNodes = $planNodes;
-  }
-  public function getPlanNodes()
-  {
-    return $this->planNodes;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Spanner/ReadOnly.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Spanner/ReadOnly.php
deleted file mode 100644
index 1e770c88..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Spanner/ReadOnly.php
+++ /dev/null
@@ -1,75 +0,0 @@
-exactStaleness = $exactStaleness;
-  }
-  public function getExactStaleness()
-  {
-    return $this->exactStaleness;
-  }
-  public function setMaxStaleness($maxStaleness)
-  {
-    $this->maxStaleness = $maxStaleness;
-  }
-  public function getMaxStaleness()
-  {
-    return $this->maxStaleness;
-  }
-  public function setMinReadTimestamp($minReadTimestamp)
-  {
-    $this->minReadTimestamp = $minReadTimestamp;
-  }
-  public function getMinReadTimestamp()
-  {
-    return $this->minReadTimestamp;
-  }
-  public function setReadTimestamp($readTimestamp)
-  {
-    $this->readTimestamp = $readTimestamp;
-  }
-  public function getReadTimestamp()
-  {
-    return $this->readTimestamp;
-  }
-  public function setReturnReadTimestamp($returnReadTimestamp)
-  {
-    $this->returnReadTimestamp = $returnReadTimestamp;
-  }
-  public function getReturnReadTimestamp()
-  {
-    return $this->returnReadTimestamp;
-  }
-  public function setStrong($strong)
-  {
-    $this->strong = $strong;
-  }
-  public function getStrong()
-  {
-    return $this->strong;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Spanner/ReadRequest.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Spanner/ReadRequest.php
deleted file mode 100644
index a79cb037..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Spanner/ReadRequest.php
+++ /dev/null
@@ -1,87 +0,0 @@
-columns = $columns;
-  }
-  public function getColumns()
-  {
-    return $this->columns;
-  }
-  public function setIndex($index)
-  {
-    $this->index = $index;
-  }
-  public function getIndex()
-  {
-    return $this->index;
-  }
-  public function setKeySet(Google_Service_Spanner_KeySet $keySet)
-  {
-    $this->keySet = $keySet;
-  }
-  public function getKeySet()
-  {
-    return $this->keySet;
-  }
-  public function setLimit($limit)
-  {
-    $this->limit = $limit;
-  }
-  public function getLimit()
-  {
-    return $this->limit;
-  }
-  public function setResumeToken($resumeToken)
-  {
-    $this->resumeToken = $resumeToken;
-  }
-  public function getResumeToken()
-  {
-    return $this->resumeToken;
-  }
-  public function setTable($table)
-  {
-    $this->table = $table;
-  }
-  public function getTable()
-  {
-    return $this->table;
-  }
-  public function setTransaction(Google_Service_Spanner_TransactionSelector $transaction)
-  {
-    $this->transaction = $transaction;
-  }
-  public function getTransaction()
-  {
-    return $this->transaction;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Spanner/ReadWrite.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Spanner/ReadWrite.php
deleted file mode 100644
index f051fa5f..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Spanner/ReadWrite.php
+++ /dev/null
@@ -1,20 +0,0 @@
-
- *   $spannerService = new Google_Service_Spanner(...);
- *   $projects = $spannerService->projects;
- *  
- */
-class Google_Service_Spanner_Resource_Projects extends Google_Service_Resource
-{
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Spanner/Resource/ProjectsInstanceConfigs.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Spanner/Resource/ProjectsInstanceConfigs.php
deleted file mode 100644
index f385289d..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Spanner/Resource/ProjectsInstanceConfigs.php
+++ /dev/null
@@ -1,65 +0,0 @@
-
- *   $spannerService = new Google_Service_Spanner(...);
- *   $instanceConfigs = $spannerService->instanceConfigs;
- *  
- */
-class Google_Service_Spanner_Resource_ProjectsInstanceConfigs extends Google_Service_Resource
-{
-  /**
-   * Gets information about a particular instance configuration.
-   * (instanceConfigs.get)
-   *
-   * @param string $name Required. The name of the requested instance
-   * configuration. Values are of the form `projects//instanceConfigs/`.
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Spanner_InstanceConfig
-   */
-  public function get($name, $optParams = array())
-  {
-    $params = array('name' => $name);
-    $params = array_merge($params, $optParams);
-    return $this->call('get', array($params), "Google_Service_Spanner_InstanceConfig");
-  }
-  /**
-   * Lists the supported instance configurations for a given project.
-   * (instanceConfigs.listProjectsInstanceConfigs)
-   *
-   * @param string $parent Required. The name of the project for which a list of
-   * supported instance configurations is requested. Values are of the form
-   * `projects/`.
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param string pageToken If non-empty, `page_token` should contain a
-   * next_page_token from a previous ListInstanceConfigsResponse.
-   * @opt_param int pageSize Number of instance configurations to be returned in
-   * the response. If 0 or less, defaults to the server's maximum allowed page
-   * size.
-   * @return Google_Service_Spanner_ListInstanceConfigsResponse
-   */
-  public function listProjectsInstanceConfigs($parent, $optParams = array())
-  {
-    $params = array('parent' => $parent);
-    $params = array_merge($params, $optParams);
-    return $this->call('list', array($params), "Google_Service_Spanner_ListInstanceConfigsResponse");
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Spanner/Resource/ProjectsInstances.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Spanner/Resource/ProjectsInstances.php
deleted file mode 100644
index 6e11f52a..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Spanner/Resource/ProjectsInstances.php
+++ /dev/null
@@ -1,253 +0,0 @@
-
- *   $spannerService = new Google_Service_Spanner(...);
- *   $instances = $spannerService->instances;
- *  
- */
-class Google_Service_Spanner_Resource_ProjectsInstances extends Google_Service_Resource
-{
-  /**
-   * Creates an instance and begins preparing it to begin serving. The returned
-   * long-running operation can be used to track the progress of preparing the new
-   * instance. The instance name is assigned by the caller. If the named instance
-   * already exists, `CreateInstance` returns `ALREADY_EXISTS`.
-   *
-   * Immediately upon completion of this request:
-   *
-   *   * The instance is readable via the API, with all requested attributes
-   * but no allocated resources. Its state is `CREATING`.
-   *
-   * Until completion of the returned operation:
-   *
-   *   * Cancelling the operation renders the instance immediately unreadable
-   * via the API.   * The instance can be deleted.   * All other attempts to
-   * modify the instance are rejected.
-   *
-   * Upon completion of the returned operation:
-   *
-   *   * Billing for all successfully-allocated resources begins (some types
-   * may have lower than the requested levels).   * Databases can be created in
-   * the instance.   * The instance's allocated resource levels are readable via
-   * the API.   * The instance's state becomes `READY`.
-   *
-   * The returned long-running operation will have a name of the format
-   * `/operations/` and can be used to track creation of the instance.  The
-   * metadata field type is CreateInstanceMetadata. The response field type is
-   * Instance, if successful. (instances.create)
-   *
-   * @param string $parent Required. The name of the project in which to create
-   * the instance. Values are of the form `projects/`.
-   * @param Google_Service_Spanner_CreateInstanceRequest $postBody
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Spanner_Operation
-   */
-  public function create($parent, Google_Service_Spanner_CreateInstanceRequest $postBody, $optParams = array())
-  {
-    $params = array('parent' => $parent, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('create', array($params), "Google_Service_Spanner_Operation");
-  }
-  /**
-   * Deletes an instance.
-   *
-   * Immediately upon completion of the request:
-   *
-   *   * Billing ceases for all of the instance's reserved resources.
-   *
-   * Soon afterward:
-   *
-   *   * The instance and *all of its databases* immediately and     irrevocably
-   * disappear from the API. All data in the databases     is permanently deleted.
-   * (instances.delete)
-   *
-   * @param string $name Required. The name of the instance to be deleted. Values
-   * are of the form `projects//instances/`
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Spanner_SpannerEmpty
-   */
-  public function delete($name, $optParams = array())
-  {
-    $params = array('name' => $name);
-    $params = array_merge($params, $optParams);
-    return $this->call('delete', array($params), "Google_Service_Spanner_SpannerEmpty");
-  }
-  /**
-   * Gets information about a particular instance. (instances.get)
-   *
-   * @param string $name Required. The name of the requested instance. Values are
-   * of the form `projects//instances/`.
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Spanner_Instance
-   */
-  public function get($name, $optParams = array())
-  {
-    $params = array('name' => $name);
-    $params = array_merge($params, $optParams);
-    return $this->call('get', array($params), "Google_Service_Spanner_Instance");
-  }
-  /**
-   * Gets the access control policy for an instance resource. Returns an empty
-   * policy if an instance exists but does not have a policy set.
-   *
-   * Authorization requires `spanner.instances.getIamPolicy` on resource.
-   * (instances.getIamPolicy)
-   *
-   * @param string $resource REQUIRED: The Cloud Spanner resource for which the
-   * policy is being retrieved. The format is `projects//instances/` for instance
-   * resources and `projects//instances//databases/` for database resources.
-   * @param Google_Service_Spanner_GetIamPolicyRequest $postBody
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Spanner_Policy
-   */
-  public function getIamPolicy($resource, Google_Service_Spanner_GetIamPolicyRequest $postBody, $optParams = array())
-  {
-    $params = array('resource' => $resource, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('getIamPolicy', array($params), "Google_Service_Spanner_Policy");
-  }
-  /**
-   * Lists all instances in the given project. (instances.listProjectsInstances)
-   *
-   * @param string $parent Required. The name of the project for which a list of
-   * instances is requested. Values are of the form `projects/`.
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param string pageToken If non-empty, `page_token` should contain a
-   * next_page_token from a previous ListInstancesResponse.
-   * @opt_param int pageSize Number of instances to be returned in the response.
-   * If 0 or less, defaults to the server's maximum allowed page size.
-   * @opt_param string filter An expression for filtering the results of the
-   * request. Filter rules are case insensitive. The fields eligible for filtering
-   * are:
-   *
-   *   * name   * display_name   * labels.key where key is the name of a label
-   *
-   * Some examples of using filters are:
-   *
-   *   * name:* --> The instance has a name.   * name:Howl --> The instance's name
-   * contains the string "howl".   * name:HOWL --> Equivalent to above.   *
-   * NAME:howl --> Equivalent to above.   * labels.env:* --> The instance has the
-   * label "env".   * labels.env:dev --> The instance has the label "env" and the
-   * value of                        the label contains the string "dev".   *
-   * name:howl labels.env:dev --> The instance's name contains "howl" and
-   * it has the label "env" with its value
-   * containing "dev".
-   * @return Google_Service_Spanner_ListInstancesResponse
-   */
-  public function listProjectsInstances($parent, $optParams = array())
-  {
-    $params = array('parent' => $parent);
-    $params = array_merge($params, $optParams);
-    return $this->call('list', array($params), "Google_Service_Spanner_ListInstancesResponse");
-  }
-  /**
-   * Updates an instance, and begins allocating or releasing resources as
-   * requested. The returned long-running operation can be used to track the
-   * progress of updating the instance. If the named instance does not exist,
-   * returns `NOT_FOUND`.
-   *
-   * Immediately upon completion of this request:
-   *
-   *   * For resource types for which a decrease in the instance's allocation
-   * has been requested, billing is based on the newly-requested level.
-   *
-   * Until completion of the returned operation:
-   *
-   *   * Cancelling the operation sets its metadata's     cancel_time, and begins
-   * restoring resources to their pre-request values. The operation     is
-   * guaranteed to succeed at undoing all resource changes,     after which point
-   * it terminates with a `CANCELLED` status.   * All other attempts to modify the
-   * instance are rejected.   * Reading the instance via the API continues to give
-   * the pre-request     resource levels.
-   *
-   * Upon completion of the returned operation:
-   *
-   *   * Billing begins for all successfully-allocated resources (some types
-   * may have lower than the requested levels).   * All newly-reserved resources
-   * are available for serving the instance's     tables.   * The instance's new
-   * resource levels are readable via the API.
-   *
-   * The returned long-running operation will have a name of the format
-   * `/operations/` and can be used to track the instance modification.  The
-   * metadata field type is UpdateInstanceMetadata. The response field type is
-   * Instance, if successful.
-   *
-   * Authorization requires `spanner.instances.update` permission on resource
-   * name. (instances.patch)
-   *
-   * @param string $name Required. A unique identifier for the instance, which
-   * cannot be changed after the instance is created. Values are of the form
-   * `projects//instances/a-z*[a-z0-9]`. The final segment of the name must be
-   * between 6 and 30 characters in length.
-   * @param Google_Service_Spanner_UpdateInstanceRequest $postBody
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Spanner_Operation
-   */
-  public function patch($name, Google_Service_Spanner_UpdateInstanceRequest $postBody, $optParams = array())
-  {
-    $params = array('name' => $name, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('patch', array($params), "Google_Service_Spanner_Operation");
-  }
-  /**
-   * Sets the access control policy on an instance resource. Replaces any existing
-   * policy.
-   *
-   * Authorization requires `spanner.instances.setIamPolicy` on resource.
-   * (instances.setIamPolicy)
-   *
-   * @param string $resource REQUIRED: The Cloud Spanner resource for which the
-   * policy is being set. The format is `projects//instances/` for instance
-   * resources and `projects//instances//databases/` for databases resources.
-   * @param Google_Service_Spanner_SetIamPolicyRequest $postBody
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Spanner_Policy
-   */
-  public function setIamPolicy($resource, Google_Service_Spanner_SetIamPolicyRequest $postBody, $optParams = array())
-  {
-    $params = array('resource' => $resource, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('setIamPolicy', array($params), "Google_Service_Spanner_Policy");
-  }
-  /**
-   * Returns permissions that the caller has on the specified instance resource.
-   *
-   * Attempting this RPC on a non-existent Cloud Spanner instance resource will
-   * result in a NOT_FOUND error if the user has `spanner.instances.list`
-   * permission on the containing Google Cloud Project. Otherwise returns an empty
-   * set of permissions. (instances.testIamPermissions)
-   *
-   * @param string $resource REQUIRED: The Cloud Spanner resource for which
-   * permissions are being tested. The format is `projects//instances/` for
-   * instance resources and `projects//instances//databases/` for database
-   * resources.
-   * @param Google_Service_Spanner_TestIamPermissionsRequest $postBody
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Spanner_TestIamPermissionsResponse
-   */
-  public function testIamPermissions($resource, Google_Service_Spanner_TestIamPermissionsRequest $postBody, $optParams = array())
-  {
-    $params = array('resource' => $resource, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('testIamPermissions', array($params), "Google_Service_Spanner_TestIamPermissionsResponse");
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Spanner/Resource/ProjectsInstancesDatabases.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Spanner/Resource/ProjectsInstancesDatabases.php
deleted file mode 100644
index c74a4fe4..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Spanner/Resource/ProjectsInstancesDatabases.php
+++ /dev/null
@@ -1,188 +0,0 @@
-
- *   $spannerService = new Google_Service_Spanner(...);
- *   $databases = $spannerService->databases;
- *  
- */
-class Google_Service_Spanner_Resource_ProjectsInstancesDatabases extends Google_Service_Resource
-{
-  /**
-   * Creates a new Cloud Spanner database and starts to prepare it for serving.
-   * The returned long-running operation will have a name of the format
-   * `/operations/` and can be used to track preparation of the database. The
-   * metadata field type is CreateDatabaseMetadata. The response field type is
-   * Database, if successful. (databases.create)
-   *
-   * @param string $parent Required. The name of the instance that will serve the
-   * new database. Values are of the form `projects//instances/`.
-   * @param Google_Service_Spanner_CreateDatabaseRequest $postBody
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Spanner_Operation
-   */
-  public function create($parent, Google_Service_Spanner_CreateDatabaseRequest $postBody, $optParams = array())
-  {
-    $params = array('parent' => $parent, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('create', array($params), "Google_Service_Spanner_Operation");
-  }
-  /**
-   * Drops (aka deletes) a Cloud Spanner database. (databases.dropDatabase)
-   *
-   * @param string $database Required. The database to be dropped.
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Spanner_SpannerEmpty
-   */
-  public function dropDatabase($database, $optParams = array())
-  {
-    $params = array('database' => $database);
-    $params = array_merge($params, $optParams);
-    return $this->call('dropDatabase', array($params), "Google_Service_Spanner_SpannerEmpty");
-  }
-  /**
-   * Gets the state of a Cloud Spanner database. (databases.get)
-   *
-   * @param string $name Required. The name of the requested database. Values are
-   * of the form `projects//instances//databases/`.
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Spanner_Database
-   */
-  public function get($name, $optParams = array())
-  {
-    $params = array('name' => $name);
-    $params = array_merge($params, $optParams);
-    return $this->call('get', array($params), "Google_Service_Spanner_Database");
-  }
-  /**
-   * Returns the schema of a Cloud Spanner database as a list of formatted DDL
-   * statements. This method does not show pending schema updates, those may be
-   * queried using the Operations API. (databases.getDdl)
-   *
-   * @param string $database Required. The database whose schema we wish to get.
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Spanner_GetDatabaseDdlResponse
-   */
-  public function getDdl($database, $optParams = array())
-  {
-    $params = array('database' => $database);
-    $params = array_merge($params, $optParams);
-    return $this->call('getDdl', array($params), "Google_Service_Spanner_GetDatabaseDdlResponse");
-  }
-  /**
-   * Gets the access control policy for a database resource. Returns an empty
-   * policy if a database exists but does not have a policy set.
-   *
-   * Authorization requires `spanner.databases.getIamPolicy` permission on
-   * resource. (databases.getIamPolicy)
-   *
-   * @param string $resource REQUIRED: The Cloud Spanner resource for which the
-   * policy is being retrieved. The format is `projects//instances/` for instance
-   * resources and `projects//instances//databases/` for database resources.
-   * @param Google_Service_Spanner_GetIamPolicyRequest $postBody
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Spanner_Policy
-   */
-  public function getIamPolicy($resource, Google_Service_Spanner_GetIamPolicyRequest $postBody, $optParams = array())
-  {
-    $params = array('resource' => $resource, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('getIamPolicy', array($params), "Google_Service_Spanner_Policy");
-  }
-  /**
-   * Lists Cloud Spanner databases. (databases.listProjectsInstancesDatabases)
-   *
-   * @param string $parent Required. The instance whose databases should be
-   * listed. Values are of the form `projects//instances/`.
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param string pageToken If non-empty, `page_token` should contain a
-   * next_page_token from a previous ListDatabasesResponse.
-   * @opt_param int pageSize Number of databases to be returned in the response.
-   * If 0 or less, defaults to the server's maximum allowed page size.
-   * @return Google_Service_Spanner_ListDatabasesResponse
-   */
-  public function listProjectsInstancesDatabases($parent, $optParams = array())
-  {
-    $params = array('parent' => $parent);
-    $params = array_merge($params, $optParams);
-    return $this->call('list', array($params), "Google_Service_Spanner_ListDatabasesResponse");
-  }
-  /**
-   * Sets the access control policy on a database resource. Replaces any existing
-   * policy.
-   *
-   * Authorization requires `spanner.databases.setIamPolicy` permission on
-   * resource. (databases.setIamPolicy)
-   *
-   * @param string $resource REQUIRED: The Cloud Spanner resource for which the
-   * policy is being set. The format is `projects//instances/` for instance
-   * resources and `projects//instances//databases/` for databases resources.
-   * @param Google_Service_Spanner_SetIamPolicyRequest $postBody
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Spanner_Policy
-   */
-  public function setIamPolicy($resource, Google_Service_Spanner_SetIamPolicyRequest $postBody, $optParams = array())
-  {
-    $params = array('resource' => $resource, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('setIamPolicy', array($params), "Google_Service_Spanner_Policy");
-  }
-  /**
-   * Returns permissions that the caller has on the specified database resource.
-   *
-   * Attempting this RPC on a non-existent Cloud Spanner database will result in a
-   * NOT_FOUND error if the user has `spanner.databases.list` permission on the
-   * containing Cloud Spanner instance. Otherwise returns an empty set of
-   * permissions. (databases.testIamPermissions)
-   *
-   * @param string $resource REQUIRED: The Cloud Spanner resource for which
-   * permissions are being tested. The format is `projects//instances/` for
-   * instance resources and `projects//instances//databases/` for database
-   * resources.
-   * @param Google_Service_Spanner_TestIamPermissionsRequest $postBody
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Spanner_TestIamPermissionsResponse
-   */
-  public function testIamPermissions($resource, Google_Service_Spanner_TestIamPermissionsRequest $postBody, $optParams = array())
-  {
-    $params = array('resource' => $resource, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('testIamPermissions', array($params), "Google_Service_Spanner_TestIamPermissionsResponse");
-  }
-  /**
-   * Updates the schema of a Cloud Spanner database by creating/altering/dropping
-   * tables, columns, indexes, etc. The returned long-running operation will have
-   * a name of the format `/operations/` and can be used to track execution of the
-   * schema change(s). The metadata field type is UpdateDatabaseDdlMetadata.  The
-   * operation has no response. (databases.updateDdl)
-   *
-   * @param string $database Required. The database to update.
-   * @param Google_Service_Spanner_UpdateDatabaseDdlRequest $postBody
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Spanner_Operation
-   */
-  public function updateDdl($database, Google_Service_Spanner_UpdateDatabaseDdlRequest $postBody, $optParams = array())
-  {
-    $params = array('database' => $database, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('updateDdl', array($params), "Google_Service_Spanner_Operation");
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Spanner/Resource/ProjectsInstancesDatabasesOperations.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Spanner/Resource/ProjectsInstancesDatabasesOperations.php
deleted file mode 100644
index 1e4b6955..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Spanner/Resource/ProjectsInstancesDatabasesOperations.php
+++ /dev/null
@@ -1,102 +0,0 @@
-
- *   $spannerService = new Google_Service_Spanner(...);
- *   $operations = $spannerService->operations;
- *  
- */
-class Google_Service_Spanner_Resource_ProjectsInstancesDatabasesOperations extends Google_Service_Resource
-{
-  /**
-   * Starts asynchronous cancellation on a long-running operation.  The server
-   * makes a best effort to cancel the operation, but success is not guaranteed.
-   * If the server doesn't support this method, it returns
-   * `google.rpc.Code.UNIMPLEMENTED`.  Clients can use Operations.GetOperation or
-   * other methods to check whether the cancellation succeeded or whether the
-   * operation completed despite cancellation. On successful cancellation, the
-   * operation is not deleted; instead, it becomes an operation with an
-   * Operation.error value with a google.rpc.Status.code of 1, corresponding to
-   * `Code.CANCELLED`. (operations.cancel)
-   *
-   * @param string $name The name of the operation resource to be cancelled.
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Spanner_SpannerEmpty
-   */
-  public function cancel($name, $optParams = array())
-  {
-    $params = array('name' => $name);
-    $params = array_merge($params, $optParams);
-    return $this->call('cancel', array($params), "Google_Service_Spanner_SpannerEmpty");
-  }
-  /**
-   * Deletes a long-running operation. This method indicates that the client is no
-   * longer interested in the operation result. It does not cancel the operation.
-   * If the server doesn't support this method, it returns
-   * `google.rpc.Code.UNIMPLEMENTED`. (operations.delete)
-   *
-   * @param string $name The name of the operation resource to be deleted.
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Spanner_SpannerEmpty
-   */
-  public function delete($name, $optParams = array())
-  {
-    $params = array('name' => $name);
-    $params = array_merge($params, $optParams);
-    return $this->call('delete', array($params), "Google_Service_Spanner_SpannerEmpty");
-  }
-  /**
-   * Gets the latest state of a long-running operation.  Clients can use this
-   * method to poll the operation result at intervals as recommended by the API
-   * service. (operations.get)
-   *
-   * @param string $name The name of the operation resource.
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Spanner_Operation
-   */
-  public function get($name, $optParams = array())
-  {
-    $params = array('name' => $name);
-    $params = array_merge($params, $optParams);
-    return $this->call('get', array($params), "Google_Service_Spanner_Operation");
-  }
-  /**
-   * Lists operations that match the specified filter in the request. If the
-   * server doesn't support this method, it returns `UNIMPLEMENTED`.
-   *
-   * NOTE: the `name` binding below allows API services to override the binding to
-   * use different resource name schemes, such as `users/operations`.
-   * (operations.listProjectsInstancesDatabasesOperations)
-   *
-   * @param string $name The name of the operation collection.
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param int pageSize The standard list page size.
-   * @opt_param string filter The standard list filter.
-   * @opt_param string pageToken The standard list page token.
-   * @return Google_Service_Spanner_ListOperationsResponse
-   */
-  public function listProjectsInstancesDatabasesOperations($name, $optParams = array())
-  {
-    $params = array('name' => $name);
-    $params = array_merge($params, $optParams);
-    return $this->call('list', array($params), "Google_Service_Spanner_ListOperationsResponse");
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Spanner/Resource/ProjectsInstancesDatabasesSessions.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Spanner/Resource/ProjectsInstancesDatabasesSessions.php
deleted file mode 100644
index 67959e0a..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Spanner/Resource/ProjectsInstancesDatabasesSessions.php
+++ /dev/null
@@ -1,231 +0,0 @@
-
- *   $spannerService = new Google_Service_Spanner(...);
- *   $sessions = $spannerService->sessions;
- *  
- */
-class Google_Service_Spanner_Resource_ProjectsInstancesDatabasesSessions extends Google_Service_Resource
-{
-  /**
-   * Begins a new transaction. This step can often be skipped: Read, ExecuteSql
-   * and Commit can begin a new transaction as a side-effect.
-   * (sessions.beginTransaction)
-   *
-   * @param string $session Required. The session in which the transaction runs.
-   * @param Google_Service_Spanner_BeginTransactionRequest $postBody
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Spanner_Transaction
-   */
-  public function beginTransaction($session, Google_Service_Spanner_BeginTransactionRequest $postBody, $optParams = array())
-  {
-    $params = array('session' => $session, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('beginTransaction', array($params), "Google_Service_Spanner_Transaction");
-  }
-  /**
-   * Commits a transaction. The request includes the mutations to be applied to
-   * rows in the database.
-   *
-   * `Commit` might return an `ABORTED` error. This can occur at any time;
-   * commonly, the cause is conflicts with concurrent transactions. However, it
-   * can also happen for a variety of other reasons. If `Commit` returns
-   * `ABORTED`, the caller should re-attempt the transaction from the beginning,
-   * re-using the same session. (sessions.commit)
-   *
-   * @param string $session Required. The session in which the transaction to be
-   * committed is running.
-   * @param Google_Service_Spanner_CommitRequest $postBody
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Spanner_CommitResponse
-   */
-  public function commit($session, Google_Service_Spanner_CommitRequest $postBody, $optParams = array())
-  {
-    $params = array('session' => $session, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('commit', array($params), "Google_Service_Spanner_CommitResponse");
-  }
-  /**
-   * Creates a new session. A session can be used to perform transactions that
-   * read and/or modify data in a Cloud Spanner database. Sessions are meant to be
-   * reused for many consecutive transactions.
-   *
-   * Sessions can only execute one transaction at a time. To execute multiple
-   * concurrent read-write/write-only transactions, create multiple sessions. Note
-   * that standalone reads and queries use a transaction internally, and count
-   * toward the one transaction limit.
-   *
-   * Cloud Spanner limits the number of sessions that can exist at any given time;
-   * thus, it is a good idea to delete idle and/or unneeded sessions. Aside from
-   * explicit deletes, Cloud Spanner can delete sessions for which no operations
-   * are sent for more than an hour, or due to internal errors. If a session is
-   * deleted, requests to it return `NOT_FOUND`.
-   *
-   * Idle sessions can be kept alive by sending a trivial SQL query periodically,
-   * e.g., `"SELECT 1"`. (sessions.create)
-   *
-   * @param string $database Required. The database in which the new session is
-   * created.
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Spanner_Session
-   */
-  public function create($database, $optParams = array())
-  {
-    $params = array('database' => $database);
-    $params = array_merge($params, $optParams);
-    return $this->call('create', array($params), "Google_Service_Spanner_Session");
-  }
-  /**
-   * Ends a session, releasing server resources associated with it.
-   * (sessions.delete)
-   *
-   * @param string $name Required. The name of the session to delete.
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Spanner_SpannerEmpty
-   */
-  public function delete($name, $optParams = array())
-  {
-    $params = array('name' => $name);
-    $params = array_merge($params, $optParams);
-    return $this->call('delete', array($params), "Google_Service_Spanner_SpannerEmpty");
-  }
-  /**
-   * Executes an SQL query, returning all rows in a single reply. This method
-   * cannot be used to return a result set larger than 10 MiB; if the query yields
-   * more data than that, the query fails with a `FAILED_PRECONDITION` error.
-   *
-   * Queries inside read-write transactions might return `ABORTED`. If this
-   * occurs, the application should restart the transaction from the beginning.
-   * See Transaction for more details.
-   *
-   * Larger result sets can be fetched in streaming fashion by calling
-   * ExecuteStreamingSql instead. (sessions.executeSql)
-   *
-   * @param string $session Required. The session in which the SQL query should be
-   * performed.
-   * @param Google_Service_Spanner_ExecuteSqlRequest $postBody
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Spanner_ResultSet
-   */
-  public function executeSql($session, Google_Service_Spanner_ExecuteSqlRequest $postBody, $optParams = array())
-  {
-    $params = array('session' => $session, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('executeSql', array($params), "Google_Service_Spanner_ResultSet");
-  }
-  /**
-   * Like ExecuteSql, except returns the result set as a stream. Unlike
-   * ExecuteSql, there is no limit on the size of the returned result set.
-   * However, no individual row in the result set can exceed 100 MiB, and no
-   * column value can exceed 10 MiB. (sessions.executeStreamingSql)
-   *
-   * @param string $session Required. The session in which the SQL query should be
-   * performed.
-   * @param Google_Service_Spanner_ExecuteSqlRequest $postBody
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Spanner_PartialResultSet
-   */
-  public function executeStreamingSql($session, Google_Service_Spanner_ExecuteSqlRequest $postBody, $optParams = array())
-  {
-    $params = array('session' => $session, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('executeStreamingSql', array($params), "Google_Service_Spanner_PartialResultSet");
-  }
-  /**
-   * Gets a session. Returns `NOT_FOUND` if the session does not exist. This is
-   * mainly useful for determining whether a session is still alive.
-   * (sessions.get)
-   *
-   * @param string $name Required. The name of the session to retrieve.
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Spanner_Session
-   */
-  public function get($name, $optParams = array())
-  {
-    $params = array('name' => $name);
-    $params = array_merge($params, $optParams);
-    return $this->call('get', array($params), "Google_Service_Spanner_Session");
-  }
-  /**
-   * Reads rows from the database using key lookups and scans, as a simple
-   * key/value style alternative to ExecuteSql.  This method cannot be used to
-   * return a result set larger than 10 MiB; if the read matches more data than
-   * that, the read fails with a `FAILED_PRECONDITION` error.
-   *
-   * Reads inside read-write transactions might return `ABORTED`. If this occurs,
-   * the application should restart the transaction from the beginning. See
-   * Transaction for more details.
-   *
-   * Larger result sets can be yielded in streaming fashion by calling
-   * StreamingRead instead. (sessions.read)
-   *
-   * @param string $session Required. The session in which the read should be
-   * performed.
-   * @param Google_Service_Spanner_ReadRequest $postBody
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Spanner_ResultSet
-   */
-  public function read($session, Google_Service_Spanner_ReadRequest $postBody, $optParams = array())
-  {
-    $params = array('session' => $session, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('read', array($params), "Google_Service_Spanner_ResultSet");
-  }
-  /**
-   * Rolls back a transaction, releasing any locks it holds. It is a good idea to
-   * call this for any transaction that includes one or more Read or ExecuteSql
-   * requests and ultimately decides not to commit.
-   *
-   * `Rollback` returns `OK` if it successfully aborts the transaction, the
-   * transaction was already aborted, or the transaction is not found. `Rollback`
-   * never returns `ABORTED`. (sessions.rollback)
-   *
-   * @param string $session Required. The session in which the transaction to roll
-   * back is running.
-   * @param Google_Service_Spanner_RollbackRequest $postBody
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Spanner_SpannerEmpty
-   */
-  public function rollback($session, Google_Service_Spanner_RollbackRequest $postBody, $optParams = array())
-  {
-    $params = array('session' => $session, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('rollback', array($params), "Google_Service_Spanner_SpannerEmpty");
-  }
-  /**
-   * Like Read, except returns the result set as a stream. Unlike Read, there is
-   * no limit on the size of the returned result set. However, no individual row
-   * in the result set can exceed 100 MiB, and no column value can exceed 10 MiB.
-   * (sessions.streamingRead)
-   *
-   * @param string $session Required. The session in which the read should be
-   * performed.
-   * @param Google_Service_Spanner_ReadRequest $postBody
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Spanner_PartialResultSet
-   */
-  public function streamingRead($session, Google_Service_Spanner_ReadRequest $postBody, $optParams = array())
-  {
-    $params = array('session' => $session, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('streamingRead', array($params), "Google_Service_Spanner_PartialResultSet");
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Spanner/Resource/ProjectsInstancesOperations.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Spanner/Resource/ProjectsInstancesOperations.php
deleted file mode 100644
index 420aff65..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Spanner/Resource/ProjectsInstancesOperations.php
+++ /dev/null
@@ -1,102 +0,0 @@
-
- *   $spannerService = new Google_Service_Spanner(...);
- *   $operations = $spannerService->operations;
- *  
- */
-class Google_Service_Spanner_Resource_ProjectsInstancesOperations extends Google_Service_Resource
-{
-  /**
-   * Starts asynchronous cancellation on a long-running operation.  The server
-   * makes a best effort to cancel the operation, but success is not guaranteed.
-   * If the server doesn't support this method, it returns
-   * `google.rpc.Code.UNIMPLEMENTED`.  Clients can use Operations.GetOperation or
-   * other methods to check whether the cancellation succeeded or whether the
-   * operation completed despite cancellation. On successful cancellation, the
-   * operation is not deleted; instead, it becomes an operation with an
-   * Operation.error value with a google.rpc.Status.code of 1, corresponding to
-   * `Code.CANCELLED`. (operations.cancel)
-   *
-   * @param string $name The name of the operation resource to be cancelled.
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Spanner_SpannerEmpty
-   */
-  public function cancel($name, $optParams = array())
-  {
-    $params = array('name' => $name);
-    $params = array_merge($params, $optParams);
-    return $this->call('cancel', array($params), "Google_Service_Spanner_SpannerEmpty");
-  }
-  /**
-   * Deletes a long-running operation. This method indicates that the client is no
-   * longer interested in the operation result. It does not cancel the operation.
-   * If the server doesn't support this method, it returns
-   * `google.rpc.Code.UNIMPLEMENTED`. (operations.delete)
-   *
-   * @param string $name The name of the operation resource to be deleted.
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Spanner_SpannerEmpty
-   */
-  public function delete($name, $optParams = array())
-  {
-    $params = array('name' => $name);
-    $params = array_merge($params, $optParams);
-    return $this->call('delete', array($params), "Google_Service_Spanner_SpannerEmpty");
-  }
-  /**
-   * Gets the latest state of a long-running operation.  Clients can use this
-   * method to poll the operation result at intervals as recommended by the API
-   * service. (operations.get)
-   *
-   * @param string $name The name of the operation resource.
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Spanner_Operation
-   */
-  public function get($name, $optParams = array())
-  {
-    $params = array('name' => $name);
-    $params = array_merge($params, $optParams);
-    return $this->call('get', array($params), "Google_Service_Spanner_Operation");
-  }
-  /**
-   * Lists operations that match the specified filter in the request. If the
-   * server doesn't support this method, it returns `UNIMPLEMENTED`.
-   *
-   * NOTE: the `name` binding below allows API services to override the binding to
-   * use different resource name schemes, such as `users/operations`.
-   * (operations.listProjectsInstancesOperations)
-   *
-   * @param string $name The name of the operation collection.
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param string filter The standard list filter.
-   * @opt_param string pageToken The standard list page token.
-   * @opt_param int pageSize The standard list page size.
-   * @return Google_Service_Spanner_ListOperationsResponse
-   */
-  public function listProjectsInstancesOperations($name, $optParams = array())
-  {
-    $params = array('name' => $name);
-    $params = array_merge($params, $optParams);
-    return $this->call('list', array($params), "Google_Service_Spanner_ListOperationsResponse");
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Spanner/ResultSet.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Spanner/ResultSet.php
deleted file mode 100644
index 3a9b8f5a..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Spanner/ResultSet.php
+++ /dev/null
@@ -1,51 +0,0 @@
-metadata = $metadata;
-  }
-  public function getMetadata()
-  {
-    return $this->metadata;
-  }
-  public function setRows($rows)
-  {
-    $this->rows = $rows;
-  }
-  public function getRows()
-  {
-    return $this->rows;
-  }
-  public function setStats(Google_Service_Spanner_ResultSetStats $stats)
-  {
-    $this->stats = $stats;
-  }
-  public function getStats()
-  {
-    return $this->stats;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Spanner/ResultSetMetadata.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Spanner/ResultSetMetadata.php
deleted file mode 100644
index 11420c85..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Spanner/ResultSetMetadata.php
+++ /dev/null
@@ -1,41 +0,0 @@
-rowType = $rowType;
-  }
-  public function getRowType()
-  {
-    return $this->rowType;
-  }
-  public function setTransaction(Google_Service_Spanner_Transaction $transaction)
-  {
-    $this->transaction = $transaction;
-  }
-  public function getTransaction()
-  {
-    return $this->transaction;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Spanner/ResultSetStats.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Spanner/ResultSetStats.php
deleted file mode 100644
index a73f1f74..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Spanner/ResultSetStats.php
+++ /dev/null
@@ -1,40 +0,0 @@
-queryPlan = $queryPlan;
-  }
-  public function getQueryPlan()
-  {
-    return $this->queryPlan;
-  }
-  public function setQueryStats($queryStats)
-  {
-    $this->queryStats = $queryStats;
-  }
-  public function getQueryStats()
-  {
-    return $this->queryStats;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Spanner/RollbackRequest.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Spanner/RollbackRequest.php
deleted file mode 100644
index 0be0fb94..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Spanner/RollbackRequest.php
+++ /dev/null
@@ -1,30 +0,0 @@
-transactionId = $transactionId;
-  }
-  public function getTransactionId()
-  {
-    return $this->transactionId;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Spanner/Rule.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Spanner/Rule.php
deleted file mode 100644
index f18b4535..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Spanner/Rule.php
+++ /dev/null
@@ -1,87 +0,0 @@
-action = $action;
-  }
-  public function getAction()
-  {
-    return $this->action;
-  }
-  public function setConditions($conditions)
-  {
-    $this->conditions = $conditions;
-  }
-  public function getConditions()
-  {
-    return $this->conditions;
-  }
-  public function setDescription($description)
-  {
-    $this->description = $description;
-  }
-  public function getDescription()
-  {
-    return $this->description;
-  }
-  public function setIn($in)
-  {
-    $this->in = $in;
-  }
-  public function getIn()
-  {
-    return $this->in;
-  }
-  public function setLogConfig($logConfig)
-  {
-    $this->logConfig = $logConfig;
-  }
-  public function getLogConfig()
-  {
-    return $this->logConfig;
-  }
-  public function setNotIn($notIn)
-  {
-    $this->notIn = $notIn;
-  }
-  public function getNotIn()
-  {
-    return $this->notIn;
-  }
-  public function setPermissions($permissions)
-  {
-    $this->permissions = $permissions;
-  }
-  public function getPermissions()
-  {
-    return $this->permissions;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Spanner/Session.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Spanner/Session.php
deleted file mode 100644
index db026987..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Spanner/Session.php
+++ /dev/null
@@ -1,30 +0,0 @@
-name = $name;
-  }
-  public function getName()
-  {
-    return $this->name;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Spanner/SetIamPolicyRequest.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Spanner/SetIamPolicyRequest.php
deleted file mode 100644
index 81e0e7d6..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Spanner/SetIamPolicyRequest.php
+++ /dev/null
@@ -1,40 +0,0 @@
-policy = $policy;
-  }
-  public function getPolicy()
-  {
-    return $this->policy;
-  }
-  public function setUpdateMask($updateMask)
-  {
-    $this->updateMask = $updateMask;
-  }
-  public function getUpdateMask()
-  {
-    return $this->updateMask;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Spanner/ShortRepresentation.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Spanner/ShortRepresentation.php
deleted file mode 100644
index 7237aa9a..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Spanner/ShortRepresentation.php
+++ /dev/null
@@ -1,39 +0,0 @@
-description = $description;
-  }
-  public function getDescription()
-  {
-    return $this->description;
-  }
-  public function setSubqueries($subqueries)
-  {
-    $this->subqueries = $subqueries;
-  }
-  public function getSubqueries()
-  {
-    return $this->subqueries;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Spanner/SpannerEmpty.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Spanner/SpannerEmpty.php
deleted file mode 100644
index 5971dd81..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Spanner/SpannerEmpty.php
+++ /dev/null
@@ -1,20 +0,0 @@
-code = $code;
-  }
-  public function getCode()
-  {
-    return $this->code;
-  }
-  public function setDetails($details)
-  {
-    $this->details = $details;
-  }
-  public function getDetails()
-  {
-    return $this->details;
-  }
-  public function setMessage($message)
-  {
-    $this->message = $message;
-  }
-  public function getMessage()
-  {
-    return $this->message;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Spanner/StructType.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Spanner/StructType.php
deleted file mode 100644
index 23b6ba38..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Spanner/StructType.php
+++ /dev/null
@@ -1,32 +0,0 @@
-fields = $fields;
-  }
-  public function getFields()
-  {
-    return $this->fields;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Spanner/TestIamPermissionsRequest.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Spanner/TestIamPermissionsRequest.php
deleted file mode 100644
index c2e7ecf0..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Spanner/TestIamPermissionsRequest.php
+++ /dev/null
@@ -1,31 +0,0 @@
-permissions = $permissions;
-  }
-  public function getPermissions()
-  {
-    return $this->permissions;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Spanner/TestIamPermissionsResponse.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Spanner/TestIamPermissionsResponse.php
deleted file mode 100644
index c8448717..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Spanner/TestIamPermissionsResponse.php
+++ /dev/null
@@ -1,31 +0,0 @@
-permissions = $permissions;
-  }
-  public function getPermissions()
-  {
-    return $this->permissions;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Spanner/Transaction.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Spanner/Transaction.php
deleted file mode 100644
index 3b099486..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Spanner/Transaction.php
+++ /dev/null
@@ -1,39 +0,0 @@
-id = $id;
-  }
-  public function getId()
-  {
-    return $this->id;
-  }
-  public function setReadTimestamp($readTimestamp)
-  {
-    $this->readTimestamp = $readTimestamp;
-  }
-  public function getReadTimestamp()
-  {
-    return $this->readTimestamp;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Spanner/TransactionOptions.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Spanner/TransactionOptions.php
deleted file mode 100644
index 67996659..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Spanner/TransactionOptions.php
+++ /dev/null
@@ -1,41 +0,0 @@
-readOnly = $readOnly;
-  }
-  public function getReadOnly()
-  {
-    return $this->readOnly;
-  }
-  public function setReadWrite(Google_Service_Spanner_ReadWrite $readWrite)
-  {
-    $this->readWrite = $readWrite;
-  }
-  public function getReadWrite()
-  {
-    return $this->readWrite;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Spanner/TransactionSelector.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Spanner/TransactionSelector.php
deleted file mode 100644
index 17021fce..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Spanner/TransactionSelector.php
+++ /dev/null
@@ -1,50 +0,0 @@
-begin = $begin;
-  }
-  public function getBegin()
-  {
-    return $this->begin;
-  }
-  public function setId($id)
-  {
-    $this->id = $id;
-  }
-  public function getId()
-  {
-    return $this->id;
-  }
-  public function setSingleUse(Google_Service_Spanner_TransactionOptions $singleUse)
-  {
-    $this->singleUse = $singleUse;
-  }
-  public function getSingleUse()
-  {
-    return $this->singleUse;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Spanner/Type.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Spanner/Type.php
deleted file mode 100644
index 92ae0313..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Spanner/Type.php
+++ /dev/null
@@ -1,50 +0,0 @@
-arrayElementType = $arrayElementType;
-  }
-  public function getArrayElementType()
-  {
-    return $this->arrayElementType;
-  }
-  public function setCode($code)
-  {
-    $this->code = $code;
-  }
-  public function getCode()
-  {
-    return $this->code;
-  }
-  public function setStructType(Google_Service_Spanner_StructType $structType)
-  {
-    $this->structType = $structType;
-  }
-  public function getStructType()
-  {
-    return $this->structType;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Spanner/UpdateDatabaseDdlMetadata.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Spanner/UpdateDatabaseDdlMetadata.php
deleted file mode 100644
index 0c848dbe..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Spanner/UpdateDatabaseDdlMetadata.php
+++ /dev/null
@@ -1,49 +0,0 @@
-commitTimestamps = $commitTimestamps;
-  }
-  public function getCommitTimestamps()
-  {
-    return $this->commitTimestamps;
-  }
-  public function setDatabase($database)
-  {
-    $this->database = $database;
-  }
-  public function getDatabase()
-  {
-    return $this->database;
-  }
-  public function setStatements($statements)
-  {
-    $this->statements = $statements;
-  }
-  public function getStatements()
-  {
-    return $this->statements;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Spanner/UpdateDatabaseDdlRequest.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Spanner/UpdateDatabaseDdlRequest.php
deleted file mode 100644
index 9bbe073f..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Spanner/UpdateDatabaseDdlRequest.php
+++ /dev/null
@@ -1,40 +0,0 @@
-operationId = $operationId;
-  }
-  public function getOperationId()
-  {
-    return $this->operationId;
-  }
-  public function setStatements($statements)
-  {
-    $this->statements = $statements;
-  }
-  public function getStatements()
-  {
-    return $this->statements;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Spanner/UpdateInstanceMetadata.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Spanner/UpdateInstanceMetadata.php
deleted file mode 100644
index 6a909d33..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Spanner/UpdateInstanceMetadata.php
+++ /dev/null
@@ -1,58 +0,0 @@
-cancelTime = $cancelTime;
-  }
-  public function getCancelTime()
-  {
-    return $this->cancelTime;
-  }
-  public function setEndTime($endTime)
-  {
-    $this->endTime = $endTime;
-  }
-  public function getEndTime()
-  {
-    return $this->endTime;
-  }
-  public function setInstance(Google_Service_Spanner_Instance $instance)
-  {
-    $this->instance = $instance;
-  }
-  public function getInstance()
-  {
-    return $this->instance;
-  }
-  public function setStartTime($startTime)
-  {
-    $this->startTime = $startTime;
-  }
-  public function getStartTime()
-  {
-    return $this->startTime;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Spanner/UpdateInstanceRequest.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Spanner/UpdateInstanceRequest.php
deleted file mode 100644
index d3dc0068..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Spanner/UpdateInstanceRequest.php
+++ /dev/null
@@ -1,40 +0,0 @@
-fieldMask = $fieldMask;
-  }
-  public function getFieldMask()
-  {
-    return $this->fieldMask;
-  }
-  public function setInstance(Google_Service_Spanner_Instance $instance)
-  {
-    $this->instance = $instance;
-  }
-  public function getInstance()
-  {
-    return $this->instance;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Spanner/Write.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Spanner/Write.php
deleted file mode 100644
index c4fcfe07..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Spanner/Write.php
+++ /dev/null
@@ -1,49 +0,0 @@
-columns = $columns;
-  }
-  public function getColumns()
-  {
-    return $this->columns;
-  }
-  public function setTable($table)
-  {
-    $this->table = $table;
-  }
-  public function getTable()
-  {
-    return $this->table;
-  }
-  public function setValues($values)
-  {
-    $this->values = $values;
-  }
-  public function getValues()
-  {
-    return $this->values;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Spectrum.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Spectrum.php
deleted file mode 100644
index 7109a61b..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Spectrum.php
+++ /dev/null
@@ -1,85 +0,0 @@
-
- * API for spectrum-management functions.

- *
- * 

- * For more information about this service, see the API
- * Documentation
- * 

- *
- * @author Google, Inc.
- */
-class Google_Service_Spectrum extends Google_Service
-{
-
-
-  public $paws;
-  
-  /**
-   * Constructs the internal representation of the Spectrum service.
-   *
-   * @param Google_Client $client
-   */
-  public function __construct(Google_Client $client)
-  {
-    parent::__construct($client);
-    $this->rootUrl = 'https://www.googleapis.com/';
-    $this->servicePath = 'spectrum/v1explorer/paws/';
-    $this->version = 'v1explorer';
-    $this->serviceName = 'spectrum';
-
-    $this->paws = new Google_Service_Spectrum_Resource_Paws(
-        $this,
-        $this->serviceName,
-        'paws',
-        array(
-          'methods' => array(
-            'getSpectrum' => array(
-              'path' => 'getSpectrum',
-              'httpMethod' => 'POST',
-              'parameters' => array(),
-            ),'getSpectrumBatch' => array(
-              'path' => 'getSpectrumBatch',
-              'httpMethod' => 'POST',
-              'parameters' => array(),
-            ),'init' => array(
-              'path' => 'init',
-              'httpMethod' => 'POST',
-              'parameters' => array(),
-            ),'notifySpectrumUse' => array(
-              'path' => 'notifySpectrumUse',
-              'httpMethod' => 'POST',
-              'parameters' => array(),
-            ),'register' => array(
-              'path' => 'register',
-              'httpMethod' => 'POST',
-              'parameters' => array(),
-            ),'verifyDevice' => array(
-              'path' => 'verifyDevice',
-              'httpMethod' => 'POST',
-              'parameters' => array(),
-            ),
-          )
-        )
-    );
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Spectrum/AntennaCharacteristics.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Spectrum/AntennaCharacteristics.php
deleted file mode 100644
index ac4f9651..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Spectrum/AntennaCharacteristics.php
+++ /dev/null
@@ -1,48 +0,0 @@
-height = $height;
-  }
-  public function getHeight()
-  {
-    return $this->height;
-  }
-  public function setHeightType($heightType)
-  {
-    $this->heightType = $heightType;
-  }
-  public function getHeightType()
-  {
-    return $this->heightType;
-  }
-  public function setHeightUncertainty($heightUncertainty)
-  {
-    $this->heightUncertainty = $heightUncertainty;
-  }
-  public function getHeightUncertainty()
-  {
-    return $this->heightUncertainty;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Spectrum/DatabaseSpec.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Spectrum/DatabaseSpec.php
deleted file mode 100644
index eaead15d..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Spectrum/DatabaseSpec.php
+++ /dev/null
@@ -1,39 +0,0 @@
-name = $name;
-  }
-  public function getName()
-  {
-    return $this->name;
-  }
-  public function setUri($uri)
-  {
-    $this->uri = $uri;
-  }
-  public function getUri()
-  {
-    return $this->uri;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Spectrum/DbUpdateSpec.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Spectrum/DbUpdateSpec.php
deleted file mode 100644
index 7252bc2a..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Spectrum/DbUpdateSpec.php
+++ /dev/null
@@ -1,32 +0,0 @@
-databases = $databases;
-  }
-  public function getDatabases()
-  {
-    return $this->databases;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Spectrum/DeviceCapabilities.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Spectrum/DeviceCapabilities.php
deleted file mode 100644
index 3039fc9a..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Spectrum/DeviceCapabilities.php
+++ /dev/null
@@ -1,32 +0,0 @@
-frequencyRanges = $frequencyRanges;
-  }
-  public function getFrequencyRanges()
-  {
-    return $this->frequencyRanges;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Spectrum/DeviceDescriptor.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Spectrum/DeviceDescriptor.php
deleted file mode 100644
index 555d9df1..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Spectrum/DeviceDescriptor.php
+++ /dev/null
@@ -1,112 +0,0 @@
-etsiEnDeviceCategory = $etsiEnDeviceCategory;
-  }
-  public function getEtsiEnDeviceCategory()
-  {
-    return $this->etsiEnDeviceCategory;
-  }
-  public function setEtsiEnDeviceEmissionsClass($etsiEnDeviceEmissionsClass)
-  {
-    $this->etsiEnDeviceEmissionsClass = $etsiEnDeviceEmissionsClass;
-  }
-  public function getEtsiEnDeviceEmissionsClass()
-  {
-    return $this->etsiEnDeviceEmissionsClass;
-  }
-  public function setEtsiEnDeviceType($etsiEnDeviceType)
-  {
-    $this->etsiEnDeviceType = $etsiEnDeviceType;
-  }
-  public function getEtsiEnDeviceType()
-  {
-    return $this->etsiEnDeviceType;
-  }
-  public function setEtsiEnTechnologyId($etsiEnTechnologyId)
-  {
-    $this->etsiEnTechnologyId = $etsiEnTechnologyId;
-  }
-  public function getEtsiEnTechnologyId()
-  {
-    return $this->etsiEnTechnologyId;
-  }
-  public function setFccId($fccId)
-  {
-    $this->fccId = $fccId;
-  }
-  public function getFccId()
-  {
-    return $this->fccId;
-  }
-  public function setFccTvbdDeviceType($fccTvbdDeviceType)
-  {
-    $this->fccTvbdDeviceType = $fccTvbdDeviceType;
-  }
-  public function getFccTvbdDeviceType()
-  {
-    return $this->fccTvbdDeviceType;
-  }
-  public function setManufacturerId($manufacturerId)
-  {
-    $this->manufacturerId = $manufacturerId;
-  }
-  public function getManufacturerId()
-  {
-    return $this->manufacturerId;
-  }
-  public function setModelId($modelId)
-  {
-    $this->modelId = $modelId;
-  }
-  public function getModelId()
-  {
-    return $this->modelId;
-  }
-  public function setRulesetIds($rulesetIds)
-  {
-    $this->rulesetIds = $rulesetIds;
-  }
-  public function getRulesetIds()
-  {
-    return $this->rulesetIds;
-  }
-  public function setSerialNumber($serialNumber)
-  {
-    $this->serialNumber = $serialNumber;
-  }
-  public function getSerialNumber()
-  {
-    return $this->serialNumber;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Spectrum/DeviceOwner.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Spectrum/DeviceOwner.php
deleted file mode 100644
index 9e15e502..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Spectrum/DeviceOwner.php
+++ /dev/null
@@ -1,41 +0,0 @@
-operator = $operator;
-  }
-  public function getOperator()
-  {
-    return $this->operator;
-  }
-  public function setOwner(Google_Service_Spectrum_Vcard $owner)
-  {
-    $this->owner = $owner;
-  }
-  public function getOwner()
-  {
-    return $this->owner;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Spectrum/DeviceValidity.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Spectrum/DeviceValidity.php
deleted file mode 100644
index 763d9b27..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Spectrum/DeviceValidity.php
+++ /dev/null
@@ -1,49 +0,0 @@
-deviceDesc = $deviceDesc;
-  }
-  public function getDeviceDesc()
-  {
-    return $this->deviceDesc;
-  }
-  public function setIsValid($isValid)
-  {
-    $this->isValid = $isValid;
-  }
-  public function getIsValid()
-  {
-    return $this->isValid;
-  }
-  public function setReason($reason)
-  {
-    $this->reason = $reason;
-  }
-  public function getReason()
-  {
-    return $this->reason;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Spectrum/EventTime.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Spectrum/EventTime.php
deleted file mode 100644
index 16835fb3..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Spectrum/EventTime.php
+++ /dev/null
@@ -1,39 +0,0 @@
-startTime = $startTime;
-  }
-  public function getStartTime()
-  {
-    return $this->startTime;
-  }
-  public function setStopTime($stopTime)
-  {
-    $this->stopTime = $stopTime;
-  }
-  public function getStopTime()
-  {
-    return $this->stopTime;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Spectrum/FrequencyRange.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Spectrum/FrequencyRange.php
deleted file mode 100644
index 1c92156f..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Spectrum/FrequencyRange.php
+++ /dev/null
@@ -1,57 +0,0 @@
-channelId = $channelId;
-  }
-  public function getChannelId()
-  {
-    return $this->channelId;
-  }
-  public function setMaxPowerDBm($maxPowerDBm)
-  {
-    $this->maxPowerDBm = $maxPowerDBm;
-  }
-  public function getMaxPowerDBm()
-  {
-    return $this->maxPowerDBm;
-  }
-  public function setStartHz($startHz)
-  {
-    $this->startHz = $startHz;
-  }
-  public function getStartHz()
-  {
-    return $this->startHz;
-  }
-  public function setStopHz($stopHz)
-  {
-    $this->stopHz = $stopHz;
-  }
-  public function getStopHz()
-  {
-    return $this->stopHz;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Spectrum/GeoLocation.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Spectrum/GeoLocation.php
deleted file mode 100644
index 4b6d0026..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Spectrum/GeoLocation.php
+++ /dev/null
@@ -1,50 +0,0 @@
-confidence = $confidence;
-  }
-  public function getConfidence()
-  {
-    return $this->confidence;
-  }
-  public function setPoint(Google_Service_Spectrum_GeoLocationEllipse $point)
-  {
-    $this->point = $point;
-  }
-  public function getPoint()
-  {
-    return $this->point;
-  }
-  public function setRegion(Google_Service_Spectrum_GeoLocationPolygon $region)
-  {
-    $this->region = $region;
-  }
-  public function getRegion()
-  {
-    return $this->region;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Spectrum/GeoLocationEllipse.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Spectrum/GeoLocationEllipse.php
deleted file mode 100644
index ab7f4346..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Spectrum/GeoLocationEllipse.php
+++ /dev/null
@@ -1,58 +0,0 @@
-center = $center;
-  }
-  public function getCenter()
-  {
-    return $this->center;
-  }
-  public function setOrientation($orientation)
-  {
-    $this->orientation = $orientation;
-  }
-  public function getOrientation()
-  {
-    return $this->orientation;
-  }
-  public function setSemiMajorAxis($semiMajorAxis)
-  {
-    $this->semiMajorAxis = $semiMajorAxis;
-  }
-  public function getSemiMajorAxis()
-  {
-    return $this->semiMajorAxis;
-  }
-  public function setSemiMinorAxis($semiMinorAxis)
-  {
-    $this->semiMinorAxis = $semiMinorAxis;
-  }
-  public function getSemiMinorAxis()
-  {
-    return $this->semiMinorAxis;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Spectrum/GeoLocationPoint.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Spectrum/GeoLocationPoint.php
deleted file mode 100644
index 3d87cf7c..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Spectrum/GeoLocationPoint.php
+++ /dev/null
@@ -1,39 +0,0 @@
-latitude = $latitude;
-  }
-  public function getLatitude()
-  {
-    return $this->latitude;
-  }
-  public function setLongitude($longitude)
-  {
-    $this->longitude = $longitude;
-  }
-  public function getLongitude()
-  {
-    return $this->longitude;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Spectrum/GeoLocationPolygon.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Spectrum/GeoLocationPolygon.php
deleted file mode 100644
index 01c3e30c..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Spectrum/GeoLocationPolygon.php
+++ /dev/null
@@ -1,32 +0,0 @@
-exterior = $exterior;
-  }
-  public function getExterior()
-  {
-    return $this->exterior;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Spectrum/GeoSpectrumSchedule.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Spectrum/GeoSpectrumSchedule.php
deleted file mode 100644
index b8babd80..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Spectrum/GeoSpectrumSchedule.php
+++ /dev/null
@@ -1,42 +0,0 @@
-location = $location;
-  }
-  public function getLocation()
-  {
-    return $this->location;
-  }
-  public function setSpectrumSchedules($spectrumSchedules)
-  {
-    $this->spectrumSchedules = $spectrumSchedules;
-  }
-  public function getSpectrumSchedules()
-  {
-    return $this->spectrumSchedules;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Spectrum/PawsGetSpectrumBatchRequest.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Spectrum/PawsGetSpectrumBatchRequest.php
deleted file mode 100644
index ca0529f6..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Spectrum/PawsGetSpectrumBatchRequest.php
+++ /dev/null
@@ -1,109 +0,0 @@
-antenna = $antenna;
-  }
-  public function getAntenna()
-  {
-    return $this->antenna;
-  }
-  public function setCapabilities(Google_Service_Spectrum_DeviceCapabilities $capabilities)
-  {
-    $this->capabilities = $capabilities;
-  }
-  public function getCapabilities()
-  {
-    return $this->capabilities;
-  }
-  public function setDeviceDesc(Google_Service_Spectrum_DeviceDescriptor $deviceDesc)
-  {
-    $this->deviceDesc = $deviceDesc;
-  }
-  public function getDeviceDesc()
-  {
-    return $this->deviceDesc;
-  }
-  public function setLocations($locations)
-  {
-    $this->locations = $locations;
-  }
-  public function getLocations()
-  {
-    return $this->locations;
-  }
-  public function setMasterDeviceDesc(Google_Service_Spectrum_DeviceDescriptor $masterDeviceDesc)
-  {
-    $this->masterDeviceDesc = $masterDeviceDesc;
-  }
-  public function getMasterDeviceDesc()
-  {
-    return $this->masterDeviceDesc;
-  }
-  public function setOwner(Google_Service_Spectrum_DeviceOwner $owner)
-  {
-    $this->owner = $owner;
-  }
-  public function getOwner()
-  {
-    return $this->owner;
-  }
-  public function setRequestType($requestType)
-  {
-    $this->requestType = $requestType;
-  }
-  public function getRequestType()
-  {
-    return $this->requestType;
-  }
-  public function setType($type)
-  {
-    $this->type = $type;
-  }
-  public function getType()
-  {
-    return $this->type;
-  }
-  public function setVersion($version)
-  {
-    $this->version = $version;
-  }
-  public function getVersion()
-  {
-    return $this->version;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Spectrum/PawsGetSpectrumBatchResponse.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Spectrum/PawsGetSpectrumBatchResponse.php
deleted file mode 100644
index b0215fc9..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Spectrum/PawsGetSpectrumBatchResponse.php
+++ /dev/null
@@ -1,125 +0,0 @@
-databaseChange = $databaseChange;
-  }
-  public function getDatabaseChange()
-  {
-    return $this->databaseChange;
-  }
-  public function setDeviceDesc(Google_Service_Spectrum_DeviceDescriptor $deviceDesc)
-  {
-    $this->deviceDesc = $deviceDesc;
-  }
-  public function getDeviceDesc()
-  {
-    return $this->deviceDesc;
-  }
-  public function setGeoSpectrumSchedules($geoSpectrumSchedules)
-  {
-    $this->geoSpectrumSchedules = $geoSpectrumSchedules;
-  }
-  public function getGeoSpectrumSchedules()
-  {
-    return $this->geoSpectrumSchedules;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setMaxContiguousBwHz($maxContiguousBwHz)
-  {
-    $this->maxContiguousBwHz = $maxContiguousBwHz;
-  }
-  public function getMaxContiguousBwHz()
-  {
-    return $this->maxContiguousBwHz;
-  }
-  public function setMaxTotalBwHz($maxTotalBwHz)
-  {
-    $this->maxTotalBwHz = $maxTotalBwHz;
-  }
-  public function getMaxTotalBwHz()
-  {
-    return $this->maxTotalBwHz;
-  }
-  public function setNeedsSpectrumReport($needsSpectrumReport)
-  {
-    $this->needsSpectrumReport = $needsSpectrumReport;
-  }
-  public function getNeedsSpectrumReport()
-  {
-    return $this->needsSpectrumReport;
-  }
-  public function setRulesetInfo(Google_Service_Spectrum_RulesetInfo $rulesetInfo)
-  {
-    $this->rulesetInfo = $rulesetInfo;
-  }
-  public function getRulesetInfo()
-  {
-    return $this->rulesetInfo;
-  }
-  public function setTimestamp($timestamp)
-  {
-    $this->timestamp = $timestamp;
-  }
-  public function getTimestamp()
-  {
-    return $this->timestamp;
-  }
-  public function setType($type)
-  {
-    $this->type = $type;
-  }
-  public function getType()
-  {
-    return $this->type;
-  }
-  public function setVersion($version)
-  {
-    $this->version = $version;
-  }
-  public function getVersion()
-  {
-    return $this->version;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Spectrum/PawsGetSpectrumRequest.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Spectrum/PawsGetSpectrumRequest.php
deleted file mode 100644
index 5c12166d..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Spectrum/PawsGetSpectrumRequest.php
+++ /dev/null
@@ -1,108 +0,0 @@
-antenna = $antenna;
-  }
-  public function getAntenna()
-  {
-    return $this->antenna;
-  }
-  public function setCapabilities(Google_Service_Spectrum_DeviceCapabilities $capabilities)
-  {
-    $this->capabilities = $capabilities;
-  }
-  public function getCapabilities()
-  {
-    return $this->capabilities;
-  }
-  public function setDeviceDesc(Google_Service_Spectrum_DeviceDescriptor $deviceDesc)
-  {
-    $this->deviceDesc = $deviceDesc;
-  }
-  public function getDeviceDesc()
-  {
-    return $this->deviceDesc;
-  }
-  public function setLocation(Google_Service_Spectrum_GeoLocation $location)
-  {
-    $this->location = $location;
-  }
-  public function getLocation()
-  {
-    return $this->location;
-  }
-  public function setMasterDeviceDesc(Google_Service_Spectrum_DeviceDescriptor $masterDeviceDesc)
-  {
-    $this->masterDeviceDesc = $masterDeviceDesc;
-  }
-  public function getMasterDeviceDesc()
-  {
-    return $this->masterDeviceDesc;
-  }
-  public function setOwner(Google_Service_Spectrum_DeviceOwner $owner)
-  {
-    $this->owner = $owner;
-  }
-  public function getOwner()
-  {
-    return $this->owner;
-  }
-  public function setRequestType($requestType)
-  {
-    $this->requestType = $requestType;
-  }
-  public function getRequestType()
-  {
-    return $this->requestType;
-  }
-  public function setType($type)
-  {
-    $this->type = $type;
-  }
-  public function getType()
-  {
-    return $this->type;
-  }
-  public function setVersion($version)
-  {
-    $this->version = $version;
-  }
-  public function getVersion()
-  {
-    return $this->version;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Spectrum/PawsGetSpectrumResponse.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Spectrum/PawsGetSpectrumResponse.php
deleted file mode 100644
index a8ee0869..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Spectrum/PawsGetSpectrumResponse.php
+++ /dev/null
@@ -1,125 +0,0 @@
-databaseChange = $databaseChange;
-  }
-  public function getDatabaseChange()
-  {
-    return $this->databaseChange;
-  }
-  public function setDeviceDesc(Google_Service_Spectrum_DeviceDescriptor $deviceDesc)
-  {
-    $this->deviceDesc = $deviceDesc;
-  }
-  public function getDeviceDesc()
-  {
-    return $this->deviceDesc;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setMaxContiguousBwHz($maxContiguousBwHz)
-  {
-    $this->maxContiguousBwHz = $maxContiguousBwHz;
-  }
-  public function getMaxContiguousBwHz()
-  {
-    return $this->maxContiguousBwHz;
-  }
-  public function setMaxTotalBwHz($maxTotalBwHz)
-  {
-    $this->maxTotalBwHz = $maxTotalBwHz;
-  }
-  public function getMaxTotalBwHz()
-  {
-    return $this->maxTotalBwHz;
-  }
-  public function setNeedsSpectrumReport($needsSpectrumReport)
-  {
-    $this->needsSpectrumReport = $needsSpectrumReport;
-  }
-  public function getNeedsSpectrumReport()
-  {
-    return $this->needsSpectrumReport;
-  }
-  public function setRulesetInfo(Google_Service_Spectrum_RulesetInfo $rulesetInfo)
-  {
-    $this->rulesetInfo = $rulesetInfo;
-  }
-  public function getRulesetInfo()
-  {
-    return $this->rulesetInfo;
-  }
-  public function setSpectrumSchedules($spectrumSchedules)
-  {
-    $this->spectrumSchedules = $spectrumSchedules;
-  }
-  public function getSpectrumSchedules()
-  {
-    return $this->spectrumSchedules;
-  }
-  public function setTimestamp($timestamp)
-  {
-    $this->timestamp = $timestamp;
-  }
-  public function getTimestamp()
-  {
-    return $this->timestamp;
-  }
-  public function setType($type)
-  {
-    $this->type = $type;
-  }
-  public function getType()
-  {
-    return $this->type;
-  }
-  public function setVersion($version)
-  {
-    $this->version = $version;
-  }
-  public function getVersion()
-  {
-    return $this->version;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Spectrum/PawsInitRequest.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Spectrum/PawsInitRequest.php
deleted file mode 100644
index ceb20f80..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Spectrum/PawsInitRequest.php
+++ /dev/null
@@ -1,59 +0,0 @@
-deviceDesc = $deviceDesc;
-  }
-  public function getDeviceDesc()
-  {
-    return $this->deviceDesc;
-  }
-  public function setLocation(Google_Service_Spectrum_GeoLocation $location)
-  {
-    $this->location = $location;
-  }
-  public function getLocation()
-  {
-    return $this->location;
-  }
-  public function setType($type)
-  {
-    $this->type = $type;
-  }
-  public function getType()
-  {
-    return $this->type;
-  }
-  public function setVersion($version)
-  {
-    $this->version = $version;
-  }
-  public function getVersion()
-  {
-    return $this->version;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Spectrum/PawsInitResponse.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Spectrum/PawsInitResponse.php
deleted file mode 100644
index 444b11ea..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Spectrum/PawsInitResponse.php
+++ /dev/null
@@ -1,68 +0,0 @@
-databaseChange = $databaseChange;
-  }
-  public function getDatabaseChange()
-  {
-    return $this->databaseChange;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setRulesetInfo(Google_Service_Spectrum_RulesetInfo $rulesetInfo)
-  {
-    $this->rulesetInfo = $rulesetInfo;
-  }
-  public function getRulesetInfo()
-  {
-    return $this->rulesetInfo;
-  }
-  public function setType($type)
-  {
-    $this->type = $type;
-  }
-  public function getType()
-  {
-    return $this->type;
-  }
-  public function setVersion($version)
-  {
-    $this->version = $version;
-  }
-  public function getVersion()
-  {
-    return $this->version;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Spectrum/PawsNotifySpectrumUseRequest.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Spectrum/PawsNotifySpectrumUseRequest.php
deleted file mode 100644
index 5d3dcf15..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Spectrum/PawsNotifySpectrumUseRequest.php
+++ /dev/null
@@ -1,70 +0,0 @@
-deviceDesc = $deviceDesc;
-  }
-  public function getDeviceDesc()
-  {
-    return $this->deviceDesc;
-  }
-  public function setLocation(Google_Service_Spectrum_GeoLocation $location)
-  {
-    $this->location = $location;
-  }
-  public function getLocation()
-  {
-    return $this->location;
-  }
-  public function setSpectra($spectra)
-  {
-    $this->spectra = $spectra;
-  }
-  public function getSpectra()
-  {
-    return $this->spectra;
-  }
-  public function setType($type)
-  {
-    $this->type = $type;
-  }
-  public function getType()
-  {
-    return $this->type;
-  }
-  public function setVersion($version)
-  {
-    $this->version = $version;
-  }
-  public function getVersion()
-  {
-    return $this->version;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Spectrum/PawsNotifySpectrumUseResponse.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Spectrum/PawsNotifySpectrumUseResponse.php
deleted file mode 100644
index e4480b4d..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Spectrum/PawsNotifySpectrumUseResponse.php
+++ /dev/null
@@ -1,48 +0,0 @@
-kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setType($type)
-  {
-    $this->type = $type;
-  }
-  public function getType()
-  {
-    return $this->type;
-  }
-  public function setVersion($version)
-  {
-    $this->version = $version;
-  }
-  public function getVersion()
-  {
-    return $this->version;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Spectrum/PawsRegisterRequest.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Spectrum/PawsRegisterRequest.php
deleted file mode 100644
index b6a1f9d6..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Spectrum/PawsRegisterRequest.php
+++ /dev/null
@@ -1,79 +0,0 @@
-antenna = $antenna;
-  }
-  public function getAntenna()
-  {
-    return $this->antenna;
-  }
-  public function setDeviceDesc(Google_Service_Spectrum_DeviceDescriptor $deviceDesc)
-  {
-    $this->deviceDesc = $deviceDesc;
-  }
-  public function getDeviceDesc()
-  {
-    return $this->deviceDesc;
-  }
-  public function setDeviceOwner(Google_Service_Spectrum_DeviceOwner $deviceOwner)
-  {
-    $this->deviceOwner = $deviceOwner;
-  }
-  public function getDeviceOwner()
-  {
-    return $this->deviceOwner;
-  }
-  public function setLocation(Google_Service_Spectrum_GeoLocation $location)
-  {
-    $this->location = $location;
-  }
-  public function getLocation()
-  {
-    return $this->location;
-  }
-  public function setType($type)
-  {
-    $this->type = $type;
-  }
-  public function getType()
-  {
-    return $this->type;
-  }
-  public function setVersion($version)
-  {
-    $this->version = $version;
-  }
-  public function getVersion()
-  {
-    return $this->version;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Spectrum/PawsRegisterResponse.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Spectrum/PawsRegisterResponse.php
deleted file mode 100644
index 99e8d08c..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Spectrum/PawsRegisterResponse.php
+++ /dev/null
@@ -1,58 +0,0 @@
-databaseChange = $databaseChange;
-  }
-  public function getDatabaseChange()
-  {
-    return $this->databaseChange;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setType($type)
-  {
-    $this->type = $type;
-  }
-  public function getType()
-  {
-    return $this->type;
-  }
-  public function setVersion($version)
-  {
-    $this->version = $version;
-  }
-  public function getVersion()
-  {
-    return $this->version;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Spectrum/PawsVerifyDeviceRequest.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Spectrum/PawsVerifyDeviceRequest.php
deleted file mode 100644
index 93d1ef35..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Spectrum/PawsVerifyDeviceRequest.php
+++ /dev/null
@@ -1,50 +0,0 @@
-deviceDescs = $deviceDescs;
-  }
-  public function getDeviceDescs()
-  {
-    return $this->deviceDescs;
-  }
-  public function setType($type)
-  {
-    $this->type = $type;
-  }
-  public function getType()
-  {
-    return $this->type;
-  }
-  public function setVersion($version)
-  {
-    $this->version = $version;
-  }
-  public function getVersion()
-  {
-    return $this->version;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Spectrum/PawsVerifyDeviceResponse.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Spectrum/PawsVerifyDeviceResponse.php
deleted file mode 100644
index 2ad6777e..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Spectrum/PawsVerifyDeviceResponse.php
+++ /dev/null
@@ -1,69 +0,0 @@
-databaseChange = $databaseChange;
-  }
-  public function getDatabaseChange()
-  {
-    return $this->databaseChange;
-  }
-  public function setDeviceValidities($deviceValidities)
-  {
-    $this->deviceValidities = $deviceValidities;
-  }
-  public function getDeviceValidities()
-  {
-    return $this->deviceValidities;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setType($type)
-  {
-    $this->type = $type;
-  }
-  public function getType()
-  {
-    return $this->type;
-  }
-  public function setVersion($version)
-  {
-    $this->version = $version;
-  }
-  public function getVersion()
-  {
-    return $this->version;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Spectrum/Resource/Paws.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Spectrum/Resource/Paws.php
deleted file mode 100644
index f7e30223..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Spectrum/Resource/Paws.php
+++ /dev/null
@@ -1,117 +0,0 @@
-
- *   $spectrumService = new Google_Service_Spectrum(...);
- *   $paws = $spectrumService->paws;
- *  
- */
-class Google_Service_Spectrum_Resource_Paws extends Google_Service_Resource
-{
-  /**
-   * Requests information about the available spectrum for a device at a location.
-   * Requests from a fixed-mode device must include owner information so the
-   * device can be registered with the database. (paws.getSpectrum)
-   *
-   * @param Google_Service_Spectrum_PawsGetSpectrumRequest $postBody
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Spectrum_PawsGetSpectrumResponse
-   */
-  public function getSpectrum(Google_Service_Spectrum_PawsGetSpectrumRequest $postBody, $optParams = array())
-  {
-    $params = array('postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('getSpectrum', array($params), "Google_Service_Spectrum_PawsGetSpectrumResponse");
-  }
-  /**
-   * The Google Spectrum Database does not support batch requests, so this method
-   * always yields an UNIMPLEMENTED error. (paws.getSpectrumBatch)
-   *
-   * @param Google_Service_Spectrum_PawsGetSpectrumBatchRequest $postBody
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Spectrum_PawsGetSpectrumBatchResponse
-   */
-  public function getSpectrumBatch(Google_Service_Spectrum_PawsGetSpectrumBatchRequest $postBody, $optParams = array())
-  {
-    $params = array('postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('getSpectrumBatch', array($params), "Google_Service_Spectrum_PawsGetSpectrumBatchResponse");
-  }
-  /**
-   * Initializes the connection between a white space device and the database.
-   * (paws.init)
-   *
-   * @param Google_Service_Spectrum_PawsInitRequest $postBody
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Spectrum_PawsInitResponse
-   */
-  public function init(Google_Service_Spectrum_PawsInitRequest $postBody, $optParams = array())
-  {
-    $params = array('postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('init', array($params), "Google_Service_Spectrum_PawsInitResponse");
-  }
-  /**
-   * Notifies the database that the device has selected certain frequency ranges
-   * for transmission. Only to be invoked when required by the regulator. The
-   * Google Spectrum Database does not operate in domains that require
-   * notification, so this always yields an UNIMPLEMENTED error.
-   * (paws.notifySpectrumUse)
-   *
-   * @param Google_Service_Spectrum_PawsNotifySpectrumUseRequest $postBody
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Spectrum_PawsNotifySpectrumUseResponse
-   */
-  public function notifySpectrumUse(Google_Service_Spectrum_PawsNotifySpectrumUseRequest $postBody, $optParams = array())
-  {
-    $params = array('postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('notifySpectrumUse', array($params), "Google_Service_Spectrum_PawsNotifySpectrumUseResponse");
-  }
-  /**
-   * The Google Spectrum Database implements registration in the getSpectrum
-   * method. As such this always returns an UNIMPLEMENTED error. (paws.register)
-   *
-   * @param Google_Service_Spectrum_PawsRegisterRequest $postBody
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Spectrum_PawsRegisterResponse
-   */
-  public function register(Google_Service_Spectrum_PawsRegisterRequest $postBody, $optParams = array())
-  {
-    $params = array('postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('register', array($params), "Google_Service_Spectrum_PawsRegisterResponse");
-  }
-  /**
-   * Validates a device for white space use in accordance with regulatory rules.
-   * The Google Spectrum Database does not support master/slave configurations, so
-   * this always yields an UNIMPLEMENTED error. (paws.verifyDevice)
-   *
-   * @param Google_Service_Spectrum_PawsVerifyDeviceRequest $postBody
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Spectrum_PawsVerifyDeviceResponse
-   */
-  public function verifyDevice(Google_Service_Spectrum_PawsVerifyDeviceRequest $postBody, $optParams = array())
-  {
-    $params = array('postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('verifyDevice', array($params), "Google_Service_Spectrum_PawsVerifyDeviceResponse");
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Spectrum/RulesetInfo.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Spectrum/RulesetInfo.php
deleted file mode 100644
index 89f01215..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Spectrum/RulesetInfo.php
+++ /dev/null
@@ -1,58 +0,0 @@
-authority = $authority;
-  }
-  public function getAuthority()
-  {
-    return $this->authority;
-  }
-  public function setMaxLocationChange($maxLocationChange)
-  {
-    $this->maxLocationChange = $maxLocationChange;
-  }
-  public function getMaxLocationChange()
-  {
-    return $this->maxLocationChange;
-  }
-  public function setMaxPollingSecs($maxPollingSecs)
-  {
-    $this->maxPollingSecs = $maxPollingSecs;
-  }
-  public function getMaxPollingSecs()
-  {
-    return $this->maxPollingSecs;
-  }
-  public function setRulesetIds($rulesetIds)
-  {
-    $this->rulesetIds = $rulesetIds;
-  }
-  public function getRulesetIds()
-  {
-    return $this->rulesetIds;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Spectrum/SpectrumMessage.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Spectrum/SpectrumMessage.php
deleted file mode 100644
index a1cb27b7..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Spectrum/SpectrumMessage.php
+++ /dev/null
@@ -1,41 +0,0 @@
-bandwidth = $bandwidth;
-  }
-  public function getBandwidth()
-  {
-    return $this->bandwidth;
-  }
-  public function setFrequencyRanges($frequencyRanges)
-  {
-    $this->frequencyRanges = $frequencyRanges;
-  }
-  public function getFrequencyRanges()
-  {
-    return $this->frequencyRanges;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Spectrum/SpectrumSchedule.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Spectrum/SpectrumSchedule.php
deleted file mode 100644
index f8085aba..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Spectrum/SpectrumSchedule.php
+++ /dev/null
@@ -1,42 +0,0 @@
-eventTime = $eventTime;
-  }
-  public function getEventTime()
-  {
-    return $this->eventTime;
-  }
-  public function setSpectra($spectra)
-  {
-    $this->spectra = $spectra;
-  }
-  public function getSpectra()
-  {
-    return $this->spectra;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Spectrum/Vcard.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Spectrum/Vcard.php
deleted file mode 100644
index 896bebc1..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Spectrum/Vcard.php
+++ /dev/null
@@ -1,70 +0,0 @@
-adr = $adr;
-  }
-  public function getAdr()
-  {
-    return $this->adr;
-  }
-  public function setEmail(Google_Service_Spectrum_VcardTypedText $email)
-  {
-    $this->email = $email;
-  }
-  public function getEmail()
-  {
-    return $this->email;
-  }
-  public function setFn($fn)
-  {
-    $this->fn = $fn;
-  }
-  public function getFn()
-  {
-    return $this->fn;
-  }
-  public function setOrg(Google_Service_Spectrum_VcardTypedText $org)
-  {
-    $this->org = $org;
-  }
-  public function getOrg()
-  {
-    return $this->org;
-  }
-  public function setTel(Google_Service_Spectrum_VcardTelephone $tel)
-  {
-    $this->tel = $tel;
-  }
-  public function getTel()
-  {
-    return $this->tel;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Spectrum/VcardAddress.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Spectrum/VcardAddress.php
deleted file mode 100644
index fde77cc2..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Spectrum/VcardAddress.php
+++ /dev/null
@@ -1,75 +0,0 @@
-code = $code;
-  }
-  public function getCode()
-  {
-    return $this->code;
-  }
-  public function setCountry($country)
-  {
-    $this->country = $country;
-  }
-  public function getCountry()
-  {
-    return $this->country;
-  }
-  public function setLocality($locality)
-  {
-    $this->locality = $locality;
-  }
-  public function getLocality()
-  {
-    return $this->locality;
-  }
-  public function setPobox($pobox)
-  {
-    $this->pobox = $pobox;
-  }
-  public function getPobox()
-  {
-    return $this->pobox;
-  }
-  public function setRegion($region)
-  {
-    $this->region = $region;
-  }
-  public function getRegion()
-  {
-    return $this->region;
-  }
-  public function setStreet($street)
-  {
-    $this->street = $street;
-  }
-  public function getStreet()
-  {
-    return $this->street;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Spectrum/VcardTelephone.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Spectrum/VcardTelephone.php
deleted file mode 100644
index afe4b5c9..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Spectrum/VcardTelephone.php
+++ /dev/null
@@ -1,30 +0,0 @@
-uri = $uri;
-  }
-  public function getUri()
-  {
-    return $this->uri;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Spectrum/VcardTypedText.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Spectrum/VcardTypedText.php
deleted file mode 100644
index f21f0a29..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Spectrum/VcardTypedText.php
+++ /dev/null
@@ -1,30 +0,0 @@
-text = $text;
-  }
-  public function getText()
-  {
-    return $this->text;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Speech.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Speech.php
deleted file mode 100644
index ce174d0d..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Speech.php
+++ /dev/null
@@ -1,133 +0,0 @@
-
- * Google Cloud Speech API.

- *
- * 

- * For more information about this service, see the API
- * Documentation
- * 

- *
- * @author Google, Inc.
- */
-class Google_Service_Speech extends Google_Service
-{
-  /** View and manage your data across Google Cloud Platform services. */
-  const CLOUD_PLATFORM =
-      "https://www.googleapis.com/auth/cloud-platform";
-
-  public $operations;
-  public $speech;
-  
-  /**
-   * Constructs the internal representation of the Speech service.
-   *
-   * @param Google_Client $client
-   */
-  public function __construct(Google_Client $client)
-  {
-    parent::__construct($client);
-    $this->rootUrl = 'https://speech.googleapis.com/';
-    $this->servicePath = '';
-    $this->version = 'v1beta1';
-    $this->serviceName = 'speech';
-
-    $this->operations = new Google_Service_Speech_Resource_Operations(
-        $this,
-        $this->serviceName,
-        'operations',
-        array(
-          'methods' => array(
-            'cancel' => array(
-              'path' => 'v1beta1/operations/{+name}:cancel',
-              'httpMethod' => 'POST',
-              'parameters' => array(
-                'name' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'delete' => array(
-              'path' => 'v1beta1/operations/{+name}',
-              'httpMethod' => 'DELETE',
-              'parameters' => array(
-                'name' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'get' => array(
-              'path' => 'v1beta1/operations/{+name}',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'name' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'list' => array(
-              'path' => 'v1beta1/operations',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'filter' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'name' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'pageToken' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'pageSize' => array(
-                  'location' => 'query',
-                  'type' => 'integer',
-                ),
-              ),
-            ),
-          )
-        )
-    );
-    $this->speech = new Google_Service_Speech_Resource_Speech(
-        $this,
-        $this->serviceName,
-        'speech',
-        array(
-          'methods' => array(
-            'asyncrecognize' => array(
-              'path' => 'v1beta1/speech:asyncrecognize',
-              'httpMethod' => 'POST',
-              'parameters' => array(),
-            ),'syncrecognize' => array(
-              'path' => 'v1beta1/speech:syncrecognize',
-              'httpMethod' => 'POST',
-              'parameters' => array(),
-            ),
-          )
-        )
-    );
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Speech/AsyncRecognizeRequest.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Speech/AsyncRecognizeRequest.php
deleted file mode 100644
index cdbfae6f..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Speech/AsyncRecognizeRequest.php
+++ /dev/null
@@ -1,41 +0,0 @@
-audio = $audio;
-  }
-  public function getAudio()
-  {
-    return $this->audio;
-  }
-  public function setConfig(Google_Service_Speech_RecognitionConfig $config)
-  {
-    $this->config = $config;
-  }
-  public function getConfig()
-  {
-    return $this->config;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Speech/CancelOperationRequest.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Speech/CancelOperationRequest.php
deleted file mode 100644
index f4692945..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Speech/CancelOperationRequest.php
+++ /dev/null
@@ -1,20 +0,0 @@
-nextPageToken = $nextPageToken;
-  }
-  public function getNextPageToken()
-  {
-    return $this->nextPageToken;
-  }
-  public function setOperations($operations)
-  {
-    $this->operations = $operations;
-  }
-  public function getOperations()
-  {
-    return $this->operations;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Speech/Operation.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Speech/Operation.php
deleted file mode 100644
index f413dadd..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Speech/Operation.php
+++ /dev/null
@@ -1,67 +0,0 @@
-done = $done;
-  }
-  public function getDone()
-  {
-    return $this->done;
-  }
-  public function setError(Google_Service_Speech_Status $error)
-  {
-    $this->error = $error;
-  }
-  public function getError()
-  {
-    return $this->error;
-  }
-  public function setMetadata($metadata)
-  {
-    $this->metadata = $metadata;
-  }
-  public function getMetadata()
-  {
-    return $this->metadata;
-  }
-  public function setName($name)
-  {
-    $this->name = $name;
-  }
-  public function getName()
-  {
-    return $this->name;
-  }
-  public function setResponse($response)
-  {
-    $this->response = $response;
-  }
-  public function getResponse()
-  {
-    return $this->response;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Speech/RecognitionAudio.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Speech/RecognitionAudio.php
deleted file mode 100644
index 511a2425..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Speech/RecognitionAudio.php
+++ /dev/null
@@ -1,39 +0,0 @@
-content = $content;
-  }
-  public function getContent()
-  {
-    return $this->content;
-  }
-  public function setUri($uri)
-  {
-    $this->uri = $uri;
-  }
-  public function getUri()
-  {
-    return $this->uri;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Speech/RecognitionConfig.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Speech/RecognitionConfig.php
deleted file mode 100644
index 03faa829..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Speech/RecognitionConfig.php
+++ /dev/null
@@ -1,76 +0,0 @@
-encoding = $encoding;
-  }
-  public function getEncoding()
-  {
-    return $this->encoding;
-  }
-  public function setLanguageCode($languageCode)
-  {
-    $this->languageCode = $languageCode;
-  }
-  public function getLanguageCode()
-  {
-    return $this->languageCode;
-  }
-  public function setMaxAlternatives($maxAlternatives)
-  {
-    $this->maxAlternatives = $maxAlternatives;
-  }
-  public function getMaxAlternatives()
-  {
-    return $this->maxAlternatives;
-  }
-  public function setProfanityFilter($profanityFilter)
-  {
-    $this->profanityFilter = $profanityFilter;
-  }
-  public function getProfanityFilter()
-  {
-    return $this->profanityFilter;
-  }
-  public function setSampleRate($sampleRate)
-  {
-    $this->sampleRate = $sampleRate;
-  }
-  public function getSampleRate()
-  {
-    return $this->sampleRate;
-  }
-  public function setSpeechContext(Google_Service_Speech_SpeechContext $speechContext)
-  {
-    $this->speechContext = $speechContext;
-  }
-  public function getSpeechContext()
-  {
-    return $this->speechContext;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Speech/Resource/Operations.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Speech/Resource/Operations.php
deleted file mode 100644
index b8adab7b..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Speech/Resource/Operations.php
+++ /dev/null
@@ -1,102 +0,0 @@
-
- *   $speechService = new Google_Service_Speech(...);
- *   $operations = $speechService->operations;
- *  
- */
-class Google_Service_Speech_Resource_Operations extends Google_Service_Resource
-{
-  /**
-   * Starts asynchronous cancellation on a long-running operation.  The server
-   * makes a best effort to cancel the operation, but success is not guaranteed.
-   * If the server doesn't support this method, it returns
-   * `google.rpc.Code.UNIMPLEMENTED`.  Clients can use Operations.GetOperation or
-   * other methods to check whether the cancellation succeeded or whether the
-   * operation completed despite cancellation. On successful cancellation, the
-   * operation is not deleted; instead, it becomes an operation with an
-   * Operation.error value with a google.rpc.Status.code of 1, corresponding to
-   * `Code.CANCELLED`. (operations.cancel)
-   *
-   * @param string $name The name of the operation resource to be cancelled.
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Speech_SpeechEmpty
-   */
-  public function cancel($name, $optParams = array())
-  {
-    $params = array('name' => $name);
-    $params = array_merge($params, $optParams);
-    return $this->call('cancel', array($params), "Google_Service_Speech_SpeechEmpty");
-  }
-  /**
-   * Deletes a long-running operation. This method indicates that the client is no
-   * longer interested in the operation result. It does not cancel the operation.
-   * If the server doesn't support this method, it returns
-   * `google.rpc.Code.UNIMPLEMENTED`. (operations.delete)
-   *
-   * @param string $name The name of the operation resource to be deleted.
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Speech_SpeechEmpty
-   */
-  public function delete($name, $optParams = array())
-  {
-    $params = array('name' => $name);
-    $params = array_merge($params, $optParams);
-    return $this->call('delete', array($params), "Google_Service_Speech_SpeechEmpty");
-  }
-  /**
-   * Gets the latest state of a long-running operation.  Clients can use this
-   * method to poll the operation result at intervals as recommended by the API
-   * service. (operations.get)
-   *
-   * @param string $name The name of the operation resource.
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Speech_Operation
-   */
-  public function get($name, $optParams = array())
-  {
-    $params = array('name' => $name);
-    $params = array_merge($params, $optParams);
-    return $this->call('get', array($params), "Google_Service_Speech_Operation");
-  }
-  /**
-   * Lists operations that match the specified filter in the request. If the
-   * server doesn't support this method, it returns `UNIMPLEMENTED`.
-   *
-   * NOTE: the `name` binding below allows API services to override the binding to
-   * use different resource name schemes, such as `users/operations`.
-   * (operations.listOperations)
-   *
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param string filter The standard list filter.
-   * @opt_param string name The name of the operation collection.
-   * @opt_param string pageToken The standard list page token.
-   * @opt_param int pageSize The standard list page size.
-   * @return Google_Service_Speech_ListOperationsResponse
-   */
-  public function listOperations($optParams = array())
-  {
-    $params = array();
-    $params = array_merge($params, $optParams);
-    return $this->call('list', array($params), "Google_Service_Speech_ListOperationsResponse");
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Speech/Resource/Speech.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Speech/Resource/Speech.php
deleted file mode 100644
index 17ebda33..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Speech/Resource/Speech.php
+++ /dev/null
@@ -1,59 +0,0 @@
-
- *   $speechService = new Google_Service_Speech(...);
- *   $speech = $speechService->speech;
- *  
- */
-class Google_Service_Speech_Resource_Speech extends Google_Service_Resource
-{
-  /**
-   * Performs asynchronous speech recognition: receive results via the
-   * [google.longrunning.Operations]
-   * (/speech/reference/rest/v1beta1/operations#Operation) interface. Returns
-   * either an `Operation.error` or an `Operation.response` which contains an
-   * `AsyncRecognizeResponse` message. (speech.asyncrecognize)
-   *
-   * @param Google_Service_Speech_AsyncRecognizeRequest $postBody
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Speech_Operation
-   */
-  public function asyncrecognize(Google_Service_Speech_AsyncRecognizeRequest $postBody, $optParams = array())
-  {
-    $params = array('postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('asyncrecognize', array($params), "Google_Service_Speech_Operation");
-  }
-  /**
-   * Performs synchronous speech recognition: receive results after all audio has
-   * been sent and processed. (speech.syncrecognize)
-   *
-   * @param Google_Service_Speech_SyncRecognizeRequest $postBody
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Speech_SyncRecognizeResponse
-   */
-  public function syncrecognize(Google_Service_Speech_SyncRecognizeRequest $postBody, $optParams = array())
-  {
-    $params = array('postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('syncrecognize', array($params), "Google_Service_Speech_SyncRecognizeResponse");
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Speech/SpeechContext.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Speech/SpeechContext.php
deleted file mode 100644
index 3069cfc7..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Speech/SpeechContext.php
+++ /dev/null
@@ -1,31 +0,0 @@
-phrases = $phrases;
-  }
-  public function getPhrases()
-  {
-    return $this->phrases;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Speech/SpeechEmpty.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Speech/SpeechEmpty.php
deleted file mode 100644
index 53008888..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Speech/SpeechEmpty.php
+++ /dev/null
@@ -1,20 +0,0 @@
-confidence = $confidence;
-  }
-  public function getConfidence()
-  {
-    return $this->confidence;
-  }
-  public function setTranscript($transcript)
-  {
-    $this->transcript = $transcript;
-  }
-  public function getTranscript()
-  {
-    return $this->transcript;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Speech/SpeechRecognitionResult.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Speech/SpeechRecognitionResult.php
deleted file mode 100644
index 28e9723f..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Speech/SpeechRecognitionResult.php
+++ /dev/null
@@ -1,32 +0,0 @@
-alternatives = $alternatives;
-  }
-  public function getAlternatives()
-  {
-    return $this->alternatives;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Speech/Status.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Speech/Status.php
deleted file mode 100644
index af62f982..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Speech/Status.php
+++ /dev/null
@@ -1,49 +0,0 @@
-code = $code;
-  }
-  public function getCode()
-  {
-    return $this->code;
-  }
-  public function setDetails($details)
-  {
-    $this->details = $details;
-  }
-  public function getDetails()
-  {
-    return $this->details;
-  }
-  public function setMessage($message)
-  {
-    $this->message = $message;
-  }
-  public function getMessage()
-  {
-    return $this->message;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Speech/SyncRecognizeRequest.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Speech/SyncRecognizeRequest.php
deleted file mode 100644
index e88be3e7..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Speech/SyncRecognizeRequest.php
+++ /dev/null
@@ -1,41 +0,0 @@
-audio = $audio;
-  }
-  public function getAudio()
-  {
-    return $this->audio;
-  }
-  public function setConfig(Google_Service_Speech_RecognitionConfig $config)
-  {
-    $this->config = $config;
-  }
-  public function getConfig()
-  {
-    return $this->config;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Speech/SyncRecognizeResponse.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Speech/SyncRecognizeResponse.php
deleted file mode 100644
index 9a6c348a..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Speech/SyncRecognizeResponse.php
+++ /dev/null
@@ -1,32 +0,0 @@
-results = $results;
-  }
-  public function getResults()
-  {
-    return $this->results;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Storage.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Storage.php
deleted file mode 100644
index 9e5c8349..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Storage.php
+++ /dev/null
@@ -1,1126 +0,0 @@
-
- * Stores and retrieves potentially large, immutable data objects.

- *
- * 

- * For more information about this service, see the API
- * Documentation
- * 

- *
- * @author Google, Inc.
- */
-class Google_Service_Storage extends Google_Service
-{
-  /** View and manage your data across Google Cloud Platform services. */
-  const CLOUD_PLATFORM =
-      "https://www.googleapis.com/auth/cloud-platform";
-  /** View your data across Google Cloud Platform services. */
-  const CLOUD_PLATFORM_READ_ONLY =
-      "https://www.googleapis.com/auth/cloud-platform.read-only";
-  /** Manage your data and permissions in Google Cloud Storage. */
-  const DEVSTORAGE_FULL_CONTROL =
-      "https://www.googleapis.com/auth/devstorage.full_control";
-  /** View your data in Google Cloud Storage. */
-  const DEVSTORAGE_READ_ONLY =
-      "https://www.googleapis.com/auth/devstorage.read_only";
-  /** Manage your data in Google Cloud Storage. */
-  const DEVSTORAGE_READ_WRITE =
-      "https://www.googleapis.com/auth/devstorage.read_write";
-
-  public $bucketAccessControls;
-  public $buckets;
-  public $channels;
-  public $defaultObjectAccessControls;
-  public $objectAccessControls;
-  public $objects;
-  
-  /**
-   * Constructs the internal representation of the Storage service.
-   *
-   * @param Google_Client $client
-   */
-  public function __construct(Google_Client $client)
-  {
-    parent::__construct($client);
-    $this->rootUrl = 'https://www.googleapis.com/';
-    $this->servicePath = 'storage/v1/';
-    $this->version = 'v1';
-    $this->serviceName = 'storage';
-
-    $this->bucketAccessControls = new Google_Service_Storage_Resource_BucketAccessControls(
-        $this,
-        $this->serviceName,
-        'bucketAccessControls',
-        array(
-          'methods' => array(
-            'delete' => array(
-              'path' => 'b/{bucket}/acl/{entity}',
-              'httpMethod' => 'DELETE',
-              'parameters' => array(
-                'bucket' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'entity' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'get' => array(
-              'path' => 'b/{bucket}/acl/{entity}',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'bucket' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'entity' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'insert' => array(
-              'path' => 'b/{bucket}/acl',
-              'httpMethod' => 'POST',
-              'parameters' => array(
-                'bucket' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'list' => array(
-              'path' => 'b/{bucket}/acl',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'bucket' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'patch' => array(
-              'path' => 'b/{bucket}/acl/{entity}',
-              'httpMethod' => 'PATCH',
-              'parameters' => array(
-                'bucket' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'entity' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'update' => array(
-              'path' => 'b/{bucket}/acl/{entity}',
-              'httpMethod' => 'PUT',
-              'parameters' => array(
-                'bucket' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'entity' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),
-          )
-        )
-    );
-    $this->buckets = new Google_Service_Storage_Resource_Buckets(
-        $this,
-        $this->serviceName,
-        'buckets',
-        array(
-          'methods' => array(
-            'delete' => array(
-              'path' => 'b/{bucket}',
-              'httpMethod' => 'DELETE',
-              'parameters' => array(
-                'bucket' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'ifMetagenerationMatch' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'ifMetagenerationNotMatch' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-              ),
-            ),'get' => array(
-              'path' => 'b/{bucket}',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'bucket' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'ifMetagenerationMatch' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'ifMetagenerationNotMatch' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'projection' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-              ),
-            ),'getIamPolicy' => array(
-              'path' => 'b/{bucket}/iam',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'bucket' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'insert' => array(
-              'path' => 'b',
-              'httpMethod' => 'POST',
-              'parameters' => array(
-                'project' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'predefinedAcl' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'predefinedDefaultObjectAcl' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'projection' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-              ),
-            ),'list' => array(
-              'path' => 'b',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'project' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'maxResults' => array(
-                  'location' => 'query',
-                  'type' => 'integer',
-                ),
-                'pageToken' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'prefix' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'projection' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-              ),
-            ),'patch' => array(
-              'path' => 'b/{bucket}',
-              'httpMethod' => 'PATCH',
-              'parameters' => array(
-                'bucket' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'ifMetagenerationMatch' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'ifMetagenerationNotMatch' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'predefinedAcl' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'predefinedDefaultObjectAcl' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'projection' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-              ),
-            ),'setIamPolicy' => array(
-              'path' => 'b/{bucket}/iam',
-              'httpMethod' => 'PUT',
-              'parameters' => array(
-                'bucket' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'testIamPermissions' => array(
-              'path' => 'b/{bucket}/iam/testPermissions',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'bucket' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'permissions' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                  'repeated' => true,
-                  'required' => true,
-                ),
-              ),
-            ),'update' => array(
-              'path' => 'b/{bucket}',
-              'httpMethod' => 'PUT',
-              'parameters' => array(
-                'bucket' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'ifMetagenerationMatch' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'ifMetagenerationNotMatch' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'predefinedAcl' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'predefinedDefaultObjectAcl' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'projection' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-              ),
-            ),
-          )
-        )
-    );
-    $this->channels = new Google_Service_Storage_Resource_Channels(
-        $this,
-        $this->serviceName,
-        'channels',
-        array(
-          'methods' => array(
-            'stop' => array(
-              'path' => 'channels/stop',
-              'httpMethod' => 'POST',
-              'parameters' => array(),
-            ),
-          )
-        )
-    );
-    $this->defaultObjectAccessControls = new Google_Service_Storage_Resource_DefaultObjectAccessControls(
-        $this,
-        $this->serviceName,
-        'defaultObjectAccessControls',
-        array(
-          'methods' => array(
-            'delete' => array(
-              'path' => 'b/{bucket}/defaultObjectAcl/{entity}',
-              'httpMethod' => 'DELETE',
-              'parameters' => array(
-                'bucket' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'entity' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'get' => array(
-              'path' => 'b/{bucket}/defaultObjectAcl/{entity}',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'bucket' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'entity' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'insert' => array(
-              'path' => 'b/{bucket}/defaultObjectAcl',
-              'httpMethod' => 'POST',
-              'parameters' => array(
-                'bucket' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'list' => array(
-              'path' => 'b/{bucket}/defaultObjectAcl',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'bucket' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'ifMetagenerationMatch' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'ifMetagenerationNotMatch' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-              ),
-            ),'patch' => array(
-              'path' => 'b/{bucket}/defaultObjectAcl/{entity}',
-              'httpMethod' => 'PATCH',
-              'parameters' => array(
-                'bucket' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'entity' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'update' => array(
-              'path' => 'b/{bucket}/defaultObjectAcl/{entity}',
-              'httpMethod' => 'PUT',
-              'parameters' => array(
-                'bucket' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'entity' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),
-          )
-        )
-    );
-    $this->objectAccessControls = new Google_Service_Storage_Resource_ObjectAccessControls(
-        $this,
-        $this->serviceName,
-        'objectAccessControls',
-        array(
-          'methods' => array(
-            'delete' => array(
-              'path' => 'b/{bucket}/o/{object}/acl/{entity}',
-              'httpMethod' => 'DELETE',
-              'parameters' => array(
-                'bucket' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'object' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'entity' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'generation' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-              ),
-            ),'get' => array(
-              'path' => 'b/{bucket}/o/{object}/acl/{entity}',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'bucket' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'object' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'entity' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'generation' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-              ),
-            ),'insert' => array(
-              'path' => 'b/{bucket}/o/{object}/acl',
-              'httpMethod' => 'POST',
-              'parameters' => array(
-                'bucket' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'object' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'generation' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-              ),
-            ),'list' => array(
-              'path' => 'b/{bucket}/o/{object}/acl',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'bucket' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'object' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'generation' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-              ),
-            ),'patch' => array(
-              'path' => 'b/{bucket}/o/{object}/acl/{entity}',
-              'httpMethod' => 'PATCH',
-              'parameters' => array(
-                'bucket' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'object' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'entity' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'generation' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-              ),
-            ),'update' => array(
-              'path' => 'b/{bucket}/o/{object}/acl/{entity}',
-              'httpMethod' => 'PUT',
-              'parameters' => array(
-                'bucket' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'object' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'entity' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'generation' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-              ),
-            ),
-          )
-        )
-    );
-    $this->objects = new Google_Service_Storage_Resource_Objects(
-        $this,
-        $this->serviceName,
-        'objects',
-        array(
-          'methods' => array(
-            'compose' => array(
-              'path' => 'b/{destinationBucket}/o/{destinationObject}/compose',
-              'httpMethod' => 'POST',
-              'parameters' => array(
-                'destinationBucket' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'destinationObject' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'destinationPredefinedAcl' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'ifGenerationMatch' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'ifMetagenerationMatch' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-              ),
-            ),'copy' => array(
-              'path' => 'b/{sourceBucket}/o/{sourceObject}/copyTo/b/{destinationBucket}/o/{destinationObject}',
-              'httpMethod' => 'POST',
-              'parameters' => array(
-                'sourceBucket' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'sourceObject' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'destinationBucket' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'destinationObject' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'destinationPredefinedAcl' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'ifGenerationMatch' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'ifGenerationNotMatch' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'ifMetagenerationMatch' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'ifMetagenerationNotMatch' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'ifSourceGenerationMatch' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'ifSourceGenerationNotMatch' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'ifSourceMetagenerationMatch' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'ifSourceMetagenerationNotMatch' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'projection' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'sourceGeneration' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-              ),
-            ),'delete' => array(
-              'path' => 'b/{bucket}/o/{object}',
-              'httpMethod' => 'DELETE',
-              'parameters' => array(
-                'bucket' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'object' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'generation' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'ifGenerationMatch' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'ifGenerationNotMatch' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'ifMetagenerationMatch' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'ifMetagenerationNotMatch' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-              ),
-            ),'get' => array(
-              'path' => 'b/{bucket}/o/{object}',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'bucket' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'object' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'generation' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'ifGenerationMatch' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'ifGenerationNotMatch' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'ifMetagenerationMatch' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'ifMetagenerationNotMatch' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'projection' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-              ),
-            ),'getIamPolicy' => array(
-              'path' => 'b/{bucket}/o/{object}/iam',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'bucket' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'object' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'generation' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-              ),
-            ),'insert' => array(
-              'path' => 'b/{bucket}/o',
-              'httpMethod' => 'POST',
-              'parameters' => array(
-                'bucket' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'contentEncoding' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'ifGenerationMatch' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'ifGenerationNotMatch' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'ifMetagenerationMatch' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'ifMetagenerationNotMatch' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'name' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'predefinedAcl' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'projection' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-              ),
-            ),'list' => array(
-              'path' => 'b/{bucket}/o',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'bucket' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'delimiter' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'maxResults' => array(
-                  'location' => 'query',
-                  'type' => 'integer',
-                ),
-                'pageToken' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'prefix' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'projection' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'versions' => array(
-                  'location' => 'query',
-                  'type' => 'boolean',
-                ),
-              ),
-            ),'patch' => array(
-              'path' => 'b/{bucket}/o/{object}',
-              'httpMethod' => 'PATCH',
-              'parameters' => array(
-                'bucket' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'object' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'generation' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'ifGenerationMatch' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'ifGenerationNotMatch' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'ifMetagenerationMatch' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'ifMetagenerationNotMatch' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'predefinedAcl' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'projection' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-              ),
-            ),'rewrite' => array(
-              'path' => 'b/{sourceBucket}/o/{sourceObject}/rewriteTo/b/{destinationBucket}/o/{destinationObject}',
-              'httpMethod' => 'POST',
-              'parameters' => array(
-                'sourceBucket' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'sourceObject' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'destinationBucket' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'destinationObject' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'destinationPredefinedAcl' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'ifGenerationMatch' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'ifGenerationNotMatch' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'ifMetagenerationMatch' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'ifMetagenerationNotMatch' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'ifSourceGenerationMatch' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'ifSourceGenerationNotMatch' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'ifSourceMetagenerationMatch' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'ifSourceMetagenerationNotMatch' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'maxBytesRewrittenPerCall' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'projection' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'rewriteToken' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'sourceGeneration' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-              ),
-            ),'setIamPolicy' => array(
-              'path' => 'b/{bucket}/o/{object}/iam',
-              'httpMethod' => 'PUT',
-              'parameters' => array(
-                'bucket' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'object' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'generation' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-              ),
-            ),'testIamPermissions' => array(
-              'path' => 'b/{bucket}/o/{object}/iam/testPermissions',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'bucket' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'object' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'permissions' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                  'repeated' => true,
-                  'required' => true,
-                ),
-                'generation' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-              ),
-            ),'update' => array(
-              'path' => 'b/{bucket}/o/{object}',
-              'httpMethod' => 'PUT',
-              'parameters' => array(
-                'bucket' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'object' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'generation' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'ifGenerationMatch' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'ifGenerationNotMatch' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'ifMetagenerationMatch' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'ifMetagenerationNotMatch' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'predefinedAcl' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'projection' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-              ),
-            ),'watchAll' => array(
-              'path' => 'b/{bucket}/o/watch',
-              'httpMethod' => 'POST',
-              'parameters' => array(
-                'bucket' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'delimiter' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'maxResults' => array(
-                  'location' => 'query',
-                  'type' => 'integer',
-                ),
-                'pageToken' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'prefix' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'projection' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'versions' => array(
-                  'location' => 'query',
-                  'type' => 'boolean',
-                ),
-              ),
-            ),
-          )
-        )
-    );
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Storage/Bucket.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Storage/Bucket.php
deleted file mode 100644
index 3aa7a99a..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Storage/Bucket.php
+++ /dev/null
@@ -1,201 +0,0 @@
-acl = $acl;
-  }
-  public function getAcl()
-  {
-    return $this->acl;
-  }
-  public function setCors($cors)
-  {
-    $this->cors = $cors;
-  }
-  public function getCors()
-  {
-    return $this->cors;
-  }
-  public function setDefaultObjectAcl($defaultObjectAcl)
-  {
-    $this->defaultObjectAcl = $defaultObjectAcl;
-  }
-  public function getDefaultObjectAcl()
-  {
-    return $this->defaultObjectAcl;
-  }
-  public function setEtag($etag)
-  {
-    $this->etag = $etag;
-  }
-  public function getEtag()
-  {
-    return $this->etag;
-  }
-  public function setId($id)
-  {
-    $this->id = $id;
-  }
-  public function getId()
-  {
-    return $this->id;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setLifecycle(Google_Service_Storage_BucketLifecycle $lifecycle)
-  {
-    $this->lifecycle = $lifecycle;
-  }
-  public function getLifecycle()
-  {
-    return $this->lifecycle;
-  }
-  public function setLocation($location)
-  {
-    $this->location = $location;
-  }
-  public function getLocation()
-  {
-    return $this->location;
-  }
-  public function setLogging(Google_Service_Storage_BucketLogging $logging)
-  {
-    $this->logging = $logging;
-  }
-  public function getLogging()
-  {
-    return $this->logging;
-  }
-  public function setMetageneration($metageneration)
-  {
-    $this->metageneration = $metageneration;
-  }
-  public function getMetageneration()
-  {
-    return $this->metageneration;
-  }
-  public function setName($name)
-  {
-    $this->name = $name;
-  }
-  public function getName()
-  {
-    return $this->name;
-  }
-  public function setOwner(Google_Service_Storage_BucketOwner $owner)
-  {
-    $this->owner = $owner;
-  }
-  public function getOwner()
-  {
-    return $this->owner;
-  }
-  public function setProjectNumber($projectNumber)
-  {
-    $this->projectNumber = $projectNumber;
-  }
-  public function getProjectNumber()
-  {
-    return $this->projectNumber;
-  }
-  public function setSelfLink($selfLink)
-  {
-    $this->selfLink = $selfLink;
-  }
-  public function getSelfLink()
-  {
-    return $this->selfLink;
-  }
-  public function setStorageClass($storageClass)
-  {
-    $this->storageClass = $storageClass;
-  }
-  public function getStorageClass()
-  {
-    return $this->storageClass;
-  }
-  public function setTimeCreated($timeCreated)
-  {
-    $this->timeCreated = $timeCreated;
-  }
-  public function getTimeCreated()
-  {
-    return $this->timeCreated;
-  }
-  public function setUpdated($updated)
-  {
-    $this->updated = $updated;
-  }
-  public function getUpdated()
-  {
-    return $this->updated;
-  }
-  public function setVersioning(Google_Service_Storage_BucketVersioning $versioning)
-  {
-    $this->versioning = $versioning;
-  }
-  public function getVersioning()
-  {
-    return $this->versioning;
-  }
-  public function setWebsite(Google_Service_Storage_BucketWebsite $website)
-  {
-    $this->website = $website;
-  }
-  public function getWebsite()
-  {
-    return $this->website;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Storage/BucketAccessControl.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Storage/BucketAccessControl.php
deleted file mode 100644
index ead69b1f..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Storage/BucketAccessControl.php
+++ /dev/null
@@ -1,121 +0,0 @@
-bucket = $bucket;
-  }
-  public function getBucket()
-  {
-    return $this->bucket;
-  }
-  public function setDomain($domain)
-  {
-    $this->domain = $domain;
-  }
-  public function getDomain()
-  {
-    return $this->domain;
-  }
-  public function setEmail($email)
-  {
-    $this->email = $email;
-  }
-  public function getEmail()
-  {
-    return $this->email;
-  }
-  public function setEntity($entity)
-  {
-    $this->entity = $entity;
-  }
-  public function getEntity()
-  {
-    return $this->entity;
-  }
-  public function setEntityId($entityId)
-  {
-    $this->entityId = $entityId;
-  }
-  public function getEntityId()
-  {
-    return $this->entityId;
-  }
-  public function setEtag($etag)
-  {
-    $this->etag = $etag;
-  }
-  public function getEtag()
-  {
-    return $this->etag;
-  }
-  public function setId($id)
-  {
-    $this->id = $id;
-  }
-  public function getId()
-  {
-    return $this->id;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setProjectTeam(Google_Service_Storage_BucketAccessControlProjectTeam $projectTeam)
-  {
-    $this->projectTeam = $projectTeam;
-  }
-  public function getProjectTeam()
-  {
-    return $this->projectTeam;
-  }
-  public function setRole($role)
-  {
-    $this->role = $role;
-  }
-  public function getRole()
-  {
-    return $this->role;
-  }
-  public function setSelfLink($selfLink)
-  {
-    $this->selfLink = $selfLink;
-  }
-  public function getSelfLink()
-  {
-    return $this->selfLink;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Storage/BucketAccessControlProjectTeam.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Storage/BucketAccessControlProjectTeam.php
deleted file mode 100644
index bc2c9a81..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Storage/BucketAccessControlProjectTeam.php
+++ /dev/null
@@ -1,39 +0,0 @@
-projectNumber = $projectNumber;
-  }
-  public function getProjectNumber()
-  {
-    return $this->projectNumber;
-  }
-  public function setTeam($team)
-  {
-    $this->team = $team;
-  }
-  public function getTeam()
-  {
-    return $this->team;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Storage/BucketAccessControls.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Storage/BucketAccessControls.php
deleted file mode 100644
index 108c4b6d..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Storage/BucketAccessControls.php
+++ /dev/null
@@ -1,41 +0,0 @@
-items = $items;
-  }
-  public function getItems()
-  {
-    return $this->items;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Storage/BucketCors.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Storage/BucketCors.php
deleted file mode 100644
index f63800e8..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Storage/BucketCors.php
+++ /dev/null
@@ -1,58 +0,0 @@
-maxAgeSeconds = $maxAgeSeconds;
-  }
-  public function getMaxAgeSeconds()
-  {
-    return $this->maxAgeSeconds;
-  }
-  public function setMethod($method)
-  {
-    $this->method = $method;
-  }
-  public function getMethod()
-  {
-    return $this->method;
-  }
-  public function setOrigin($origin)
-  {
-    $this->origin = $origin;
-  }
-  public function getOrigin()
-  {
-    return $this->origin;
-  }
-  public function setResponseHeader($responseHeader)
-  {
-    $this->responseHeader = $responseHeader;
-  }
-  public function getResponseHeader()
-  {
-    return $this->responseHeader;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Storage/BucketEncryption.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Storage/BucketEncryption.php
deleted file mode 100644
index dd0cba3d..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Storage/BucketEncryption.php
+++ /dev/null
@@ -1,33 +0,0 @@
- "default_kms_key_name",
-  );
-  public $defaultKmsKeyName;
-
-  public function setDefaultKmsKeyName($defaultKmsKeyName)
-  {
-    $this->defaultKmsKeyName = $defaultKmsKeyName;
-  }
-  public function getDefaultKmsKeyName()
-  {
-    return $this->defaultKmsKeyName;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Storage/BucketLifecycle.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Storage/BucketLifecycle.php
deleted file mode 100644
index 1958f36b..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Storage/BucketLifecycle.php
+++ /dev/null
@@ -1,32 +0,0 @@
-rule = $rule;
-  }
-  public function getRule()
-  {
-    return $this->rule;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Storage/BucketLifecycleRule.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Storage/BucketLifecycleRule.php
deleted file mode 100644
index d983ddfb..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Storage/BucketLifecycleRule.php
+++ /dev/null
@@ -1,41 +0,0 @@
-action = $action;
-  }
-  public function getAction()
-  {
-    return $this->action;
-  }
-  public function setCondition(Google_Service_Storage_BucketLifecycleRuleCondition $condition)
-  {
-    $this->condition = $condition;
-  }
-  public function getCondition()
-  {
-    return $this->condition;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Storage/BucketLifecycleRuleAction.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Storage/BucketLifecycleRuleAction.php
deleted file mode 100644
index 869a756d..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Storage/BucketLifecycleRuleAction.php
+++ /dev/null
@@ -1,39 +0,0 @@
-storageClass = $storageClass;
-  }
-  public function getStorageClass()
-  {
-    return $this->storageClass;
-  }
-  public function setType($type)
-  {
-    $this->type = $type;
-  }
-  public function getType()
-  {
-    return $this->type;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Storage/BucketLifecycleRuleCondition.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Storage/BucketLifecycleRuleCondition.php
deleted file mode 100644
index 90de2837..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Storage/BucketLifecycleRuleCondition.php
+++ /dev/null
@@ -1,67 +0,0 @@
-age = $age;
-  }
-  public function getAge()
-  {
-    return $this->age;
-  }
-  public function setCreatedBefore($createdBefore)
-  {
-    $this->createdBefore = $createdBefore;
-  }
-  public function getCreatedBefore()
-  {
-    return $this->createdBefore;
-  }
-  public function setIsLive($isLive)
-  {
-    $this->isLive = $isLive;
-  }
-  public function getIsLive()
-  {
-    return $this->isLive;
-  }
-  public function setMatchesStorageClass($matchesStorageClass)
-  {
-    $this->matchesStorageClass = $matchesStorageClass;
-  }
-  public function getMatchesStorageClass()
-  {
-    return $this->matchesStorageClass;
-  }
-  public function setNumNewerVersions($numNewerVersions)
-  {
-    $this->numNewerVersions = $numNewerVersions;
-  }
-  public function getNumNewerVersions()
-  {
-    return $this->numNewerVersions;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Storage/BucketLogging.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Storage/BucketLogging.php
deleted file mode 100644
index 0bda63e9..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Storage/BucketLogging.php
+++ /dev/null
@@ -1,39 +0,0 @@
-logBucket = $logBucket;
-  }
-  public function getLogBucket()
-  {
-    return $this->logBucket;
-  }
-  public function setLogObjectPrefix($logObjectPrefix)
-  {
-    $this->logObjectPrefix = $logObjectPrefix;
-  }
-  public function getLogObjectPrefix()
-  {
-    return $this->logObjectPrefix;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Storage/BucketOwner.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Storage/BucketOwner.php
deleted file mode 100644
index c5bfd88c..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Storage/BucketOwner.php
+++ /dev/null
@@ -1,39 +0,0 @@
-entity = $entity;
-  }
-  public function getEntity()
-  {
-    return $this->entity;
-  }
-  public function setEntityId($entityId)
-  {
-    $this->entityId = $entityId;
-  }
-  public function getEntityId()
-  {
-    return $this->entityId;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Storage/BucketVersioning.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Storage/BucketVersioning.php
deleted file mode 100644
index 10aeb47e..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Storage/BucketVersioning.php
+++ /dev/null
@@ -1,30 +0,0 @@
-enabled = $enabled;
-  }
-  public function getEnabled()
-  {
-    return $this->enabled;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Storage/BucketWebsite.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Storage/BucketWebsite.php
deleted file mode 100644
index 02db8c92..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Storage/BucketWebsite.php
+++ /dev/null
@@ -1,39 +0,0 @@
-mainPageSuffix = $mainPageSuffix;
-  }
-  public function getMainPageSuffix()
-  {
-    return $this->mainPageSuffix;
-  }
-  public function setNotFoundPage($notFoundPage)
-  {
-    $this->notFoundPage = $notFoundPage;
-  }
-  public function getNotFoundPage()
-  {
-    return $this->notFoundPage;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Storage/Buckets.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Storage/Buckets.php
deleted file mode 100644
index ff4f4054..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Storage/Buckets.php
+++ /dev/null
@@ -1,50 +0,0 @@
-items = $items;
-  }
-  public function getItems()
-  {
-    return $this->items;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setNextPageToken($nextPageToken)
-  {
-    $this->nextPageToken = $nextPageToken;
-  }
-  public function getNextPageToken()
-  {
-    return $this->nextPageToken;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Storage/Channel.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Storage/Channel.php
deleted file mode 100644
index 1efb8034..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Storage/Channel.php
+++ /dev/null
@@ -1,111 +0,0 @@
-address = $address;
-  }
-  public function getAddress()
-  {
-    return $this->address;
-  }
-  public function setExpiration($expiration)
-  {
-    $this->expiration = $expiration;
-  }
-  public function getExpiration()
-  {
-    return $this->expiration;
-  }
-  public function setId($id)
-  {
-    $this->id = $id;
-  }
-  public function getId()
-  {
-    return $this->id;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setParams($params)
-  {
-    $this->params = $params;
-  }
-  public function getParams()
-  {
-    return $this->params;
-  }
-  public function setPayload($payload)
-  {
-    $this->payload = $payload;
-  }
-  public function getPayload()
-  {
-    return $this->payload;
-  }
-  public function setResourceId($resourceId)
-  {
-    $this->resourceId = $resourceId;
-  }
-  public function getResourceId()
-  {
-    return $this->resourceId;
-  }
-  public function setResourceUri($resourceUri)
-  {
-    $this->resourceUri = $resourceUri;
-  }
-  public function getResourceUri()
-  {
-    return $this->resourceUri;
-  }
-  public function setToken($token)
-  {
-    $this->token = $token;
-  }
-  public function getToken()
-  {
-    return $this->token;
-  }
-  public function setType($type)
-  {
-    $this->type = $type;
-  }
-  public function getType()
-  {
-    return $this->type;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Storage/ComposeRequest.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Storage/ComposeRequest.php
deleted file mode 100644
index 2564af36..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Storage/ComposeRequest.php
+++ /dev/null
@@ -1,51 +0,0 @@
-destination = $destination;
-  }
-  public function getDestination()
-  {
-    return $this->destination;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setSourceObjects($sourceObjects)
-  {
-    $this->sourceObjects = $sourceObjects;
-  }
-  public function getSourceObjects()
-  {
-    return $this->sourceObjects;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Storage/ComposeRequestSourceObjects.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Storage/ComposeRequestSourceObjects.php
deleted file mode 100644
index c9ced2ef..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Storage/ComposeRequestSourceObjects.php
+++ /dev/null
@@ -1,49 +0,0 @@
-generation = $generation;
-  }
-  public function getGeneration()
-  {
-    return $this->generation;
-  }
-  public function setName($name)
-  {
-    $this->name = $name;
-  }
-  public function getName()
-  {
-    return $this->name;
-  }
-  public function setObjectPreconditions(Google_Service_Storage_ComposeRequestSourceObjectsObjectPreconditions $objectPreconditions)
-  {
-    $this->objectPreconditions = $objectPreconditions;
-  }
-  public function getObjectPreconditions()
-  {
-    return $this->objectPreconditions;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Storage/ComposeRequestSourceObjectsObjectPreconditions.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Storage/ComposeRequestSourceObjectsObjectPreconditions.php
deleted file mode 100644
index a471179f..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Storage/ComposeRequestSourceObjectsObjectPreconditions.php
+++ /dev/null
@@ -1,30 +0,0 @@
-ifGenerationMatch = $ifGenerationMatch;
-  }
-  public function getIfGenerationMatch()
-  {
-    return $this->ifGenerationMatch;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Storage/ObjectAccessControl.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Storage/ObjectAccessControl.php
deleted file mode 100644
index 3dcf3072..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Storage/ObjectAccessControl.php
+++ /dev/null
@@ -1,139 +0,0 @@
-bucket = $bucket;
-  }
-  public function getBucket()
-  {
-    return $this->bucket;
-  }
-  public function setDomain($domain)
-  {
-    $this->domain = $domain;
-  }
-  public function getDomain()
-  {
-    return $this->domain;
-  }
-  public function setEmail($email)
-  {
-    $this->email = $email;
-  }
-  public function getEmail()
-  {
-    return $this->email;
-  }
-  public function setEntity($entity)
-  {
-    $this->entity = $entity;
-  }
-  public function getEntity()
-  {
-    return $this->entity;
-  }
-  public function setEntityId($entityId)
-  {
-    $this->entityId = $entityId;
-  }
-  public function getEntityId()
-  {
-    return $this->entityId;
-  }
-  public function setEtag($etag)
-  {
-    $this->etag = $etag;
-  }
-  public function getEtag()
-  {
-    return $this->etag;
-  }
-  public function setGeneration($generation)
-  {
-    $this->generation = $generation;
-  }
-  public function getGeneration()
-  {
-    return $this->generation;
-  }
-  public function setId($id)
-  {
-    $this->id = $id;
-  }
-  public function getId()
-  {
-    return $this->id;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setObject($object)
-  {
-    $this->object = $object;
-  }
-  public function getObject()
-  {
-    return $this->object;
-  }
-  public function setProjectTeam(Google_Service_Storage_ObjectAccessControlProjectTeam $projectTeam)
-  {
-    $this->projectTeam = $projectTeam;
-  }
-  public function getProjectTeam()
-  {
-    return $this->projectTeam;
-  }
-  public function setRole($role)
-  {
-    $this->role = $role;
-  }
-  public function getRole()
-  {
-    return $this->role;
-  }
-  public function setSelfLink($selfLink)
-  {
-    $this->selfLink = $selfLink;
-  }
-  public function getSelfLink()
-  {
-    return $this->selfLink;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Storage/ObjectAccessControlProjectTeam.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Storage/ObjectAccessControlProjectTeam.php
deleted file mode 100644
index a4dff126..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Storage/ObjectAccessControlProjectTeam.php
+++ /dev/null
@@ -1,39 +0,0 @@
-projectNumber = $projectNumber;
-  }
-  public function getProjectNumber()
-  {
-    return $this->projectNumber;
-  }
-  public function setTeam($team)
-  {
-    $this->team = $team;
-  }
-  public function getTeam()
-  {
-    return $this->team;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Storage/ObjectAccessControls.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Storage/ObjectAccessControls.php
deleted file mode 100644
index 4007cb35..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Storage/ObjectAccessControls.php
+++ /dev/null
@@ -1,41 +0,0 @@
-items = $items;
-  }
-  public function getItems()
-  {
-    return $this->items;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Storage/Objects.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Storage/Objects.php
deleted file mode 100644
index e086c248..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Storage/Objects.php
+++ /dev/null
@@ -1,59 +0,0 @@
-items = $items;
-  }
-  public function getItems()
-  {
-    return $this->items;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setNextPageToken($nextPageToken)
-  {
-    $this->nextPageToken = $nextPageToken;
-  }
-  public function getNextPageToken()
-  {
-    return $this->nextPageToken;
-  }
-  public function setPrefixes($prefixes)
-  {
-    $this->prefixes = $prefixes;
-  }
-  public function getPrefixes()
-  {
-    return $this->prefixes;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Storage/Policy.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Storage/Policy.php
deleted file mode 100644
index b03c7190..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Storage/Policy.php
+++ /dev/null
@@ -1,59 +0,0 @@
-bindings = $bindings;
-  }
-  public function getBindings()
-  {
-    return $this->bindings;
-  }
-  public function setEtag($etag)
-  {
-    $this->etag = $etag;
-  }
-  public function getEtag()
-  {
-    return $this->etag;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setResourceId($resourceId)
-  {
-    $this->resourceId = $resourceId;
-  }
-  public function getResourceId()
-  {
-    return $this->resourceId;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Storage/PolicyBindings.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Storage/PolicyBindings.php
deleted file mode 100644
index 158c6bf9..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Storage/PolicyBindings.php
+++ /dev/null
@@ -1,40 +0,0 @@
-members = $members;
-  }
-  public function getMembers()
-  {
-    return $this->members;
-  }
-  public function setRole($role)
-  {
-    $this->role = $role;
-  }
-  public function getRole()
-  {
-    return $this->role;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Storage/Resource/BucketAccessControls.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Storage/Resource/BucketAccessControls.php
deleted file mode 100644
index 3475dbb0..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Storage/Resource/BucketAccessControls.php
+++ /dev/null
@@ -1,125 +0,0 @@
-
- *   $storageService = new Google_Service_Storage(...);
- *   $bucketAccessControls = $storageService->bucketAccessControls;
- *  
- */
-class Google_Service_Storage_Resource_BucketAccessControls extends Google_Service_Resource
-{
-  /**
-   * Permanently deletes the ACL entry for the specified entity on the specified
-   * bucket. (bucketAccessControls.delete)
-   *
-   * @param string $bucket Name of a bucket.
-   * @param string $entity The entity holding the permission. Can be user-userId,
-   * user-emailAddress, group-groupId, group-emailAddress, allUsers, or
-   * allAuthenticatedUsers.
-   * @param array $optParams Optional parameters.
-   */
-  public function delete($bucket, $entity, $optParams = array())
-  {
-    $params = array('bucket' => $bucket, 'entity' => $entity);
-    $params = array_merge($params, $optParams);
-    return $this->call('delete', array($params));
-  }
-  /**
-   * Returns the ACL entry for the specified entity on the specified bucket.
-   * (bucketAccessControls.get)
-   *
-   * @param string $bucket Name of a bucket.
-   * @param string $entity The entity holding the permission. Can be user-userId,
-   * user-emailAddress, group-groupId, group-emailAddress, allUsers, or
-   * allAuthenticatedUsers.
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Storage_BucketAccessControl
-   */
-  public function get($bucket, $entity, $optParams = array())
-  {
-    $params = array('bucket' => $bucket, 'entity' => $entity);
-    $params = array_merge($params, $optParams);
-    return $this->call('get', array($params), "Google_Service_Storage_BucketAccessControl");
-  }
-  /**
-   * Creates a new ACL entry on the specified bucket.
-   * (bucketAccessControls.insert)
-   *
-   * @param string $bucket Name of a bucket.
-   * @param Google_Service_Storage_BucketAccessControl $postBody
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Storage_BucketAccessControl
-   */
-  public function insert($bucket, Google_Service_Storage_BucketAccessControl $postBody, $optParams = array())
-  {
-    $params = array('bucket' => $bucket, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('insert', array($params), "Google_Service_Storage_BucketAccessControl");
-  }
-  /**
-   * Retrieves ACL entries on the specified bucket.
-   * (bucketAccessControls.listBucketAccessControls)
-   *
-   * @param string $bucket Name of a bucket.
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Storage_BucketAccessControls
-   */
-  public function listBucketAccessControls($bucket, $optParams = array())
-  {
-    $params = array('bucket' => $bucket);
-    $params = array_merge($params, $optParams);
-    return $this->call('list', array($params), "Google_Service_Storage_BucketAccessControls");
-  }
-  /**
-   * Updates an ACL entry on the specified bucket. This method supports patch
-   * semantics. (bucketAccessControls.patch)
-   *
-   * @param string $bucket Name of a bucket.
-   * @param string $entity The entity holding the permission. Can be user-userId,
-   * user-emailAddress, group-groupId, group-emailAddress, allUsers, or
-   * allAuthenticatedUsers.
-   * @param Google_Service_Storage_BucketAccessControl $postBody
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Storage_BucketAccessControl
-   */
-  public function patch($bucket, $entity, Google_Service_Storage_BucketAccessControl $postBody, $optParams = array())
-  {
-    $params = array('bucket' => $bucket, 'entity' => $entity, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('patch', array($params), "Google_Service_Storage_BucketAccessControl");
-  }
-  /**
-   * Updates an ACL entry on the specified bucket. (bucketAccessControls.update)
-   *
-   * @param string $bucket Name of a bucket.
-   * @param string $entity The entity holding the permission. Can be user-userId,
-   * user-emailAddress, group-groupId, group-emailAddress, allUsers, or
-   * allAuthenticatedUsers.
-   * @param Google_Service_Storage_BucketAccessControl $postBody
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Storage_BucketAccessControl
-   */
-  public function update($bucket, $entity, Google_Service_Storage_BucketAccessControl $postBody, $optParams = array())
-  {
-    $params = array('bucket' => $bucket, 'entity' => $entity, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('update', array($params), "Google_Service_Storage_BucketAccessControl");
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Storage/Resource/Buckets.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Storage/Resource/Buckets.php
deleted file mode 100644
index facfb352..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Storage/Resource/Buckets.php
+++ /dev/null
@@ -1,208 +0,0 @@
-
- *   $storageService = new Google_Service_Storage(...);
- *   $buckets = $storageService->buckets;
- *  
- */
-class Google_Service_Storage_Resource_Buckets extends Google_Service_Resource
-{
-  /**
-   * Permanently deletes an empty bucket. (buckets.delete)
-   *
-   * @param string $bucket Name of a bucket.
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param string ifMetagenerationMatch If set, only deletes the bucket if
-   * its metageneration matches this value.
-   * @opt_param string ifMetagenerationNotMatch If set, only deletes the bucket if
-   * its metageneration does not match this value.
-   */
-  public function delete($bucket, $optParams = array())
-  {
-    $params = array('bucket' => $bucket);
-    $params = array_merge($params, $optParams);
-    return $this->call('delete', array($params));
-  }
-  /**
-   * Returns metadata for the specified bucket. (buckets.get)
-   *
-   * @param string $bucket Name of a bucket.
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param string ifMetagenerationMatch Makes the return of the bucket
-   * metadata conditional on whether the bucket's current metageneration matches
-   * the given value.
-   * @opt_param string ifMetagenerationNotMatch Makes the return of the bucket
-   * metadata conditional on whether the bucket's current metageneration does not
-   * match the given value.
-   * @opt_param string projection Set of properties to return. Defaults to noAcl.
-   * @return Google_Service_Storage_Bucket
-   */
-  public function get($bucket, $optParams = array())
-  {
-    $params = array('bucket' => $bucket);
-    $params = array_merge($params, $optParams);
-    return $this->call('get', array($params), "Google_Service_Storage_Bucket");
-  }
-  /**
-   * Returns an IAM policy for the specified bucket. (buckets.getIamPolicy)
-   *
-   * @param string $bucket Name of a bucket.
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Storage_Policy
-   */
-  public function getIamPolicy($bucket, $optParams = array())
-  {
-    $params = array('bucket' => $bucket);
-    $params = array_merge($params, $optParams);
-    return $this->call('getIamPolicy', array($params), "Google_Service_Storage_Policy");
-  }
-  /**
-   * Creates a new bucket. (buckets.insert)
-   *
-   * @param string $project A valid API project identifier.
-   * @param Google_Service_Storage_Bucket $postBody
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param string predefinedAcl Apply a predefined set of access controls to
-   * this bucket.
-   * @opt_param string predefinedDefaultObjectAcl Apply a predefined set of
-   * default object access controls to this bucket.
-   * @opt_param string projection Set of properties to return. Defaults to noAcl,
-   * unless the bucket resource specifies acl or defaultObjectAcl properties, when
-   * it defaults to full.
-   * @return Google_Service_Storage_Bucket
-   */
-  public function insert($project, Google_Service_Storage_Bucket $postBody, $optParams = array())
-  {
-    $params = array('project' => $project, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('insert', array($params), "Google_Service_Storage_Bucket");
-  }
-  /**
-   * Retrieves a list of buckets for a given project. (buckets.listBuckets)
-   *
-   * @param string $project A valid API project identifier.
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param string maxResults Maximum number of buckets to return in a single
-   * response. The service will use this parameter or 1,000 items, whichever is
-   * smaller.
-   * @opt_param string pageToken A previously-returned page token representing
-   * part of the larger set of results to view.
-   * @opt_param string prefix Filter results to buckets whose names begin with
-   * this prefix.
-   * @opt_param string projection Set of properties to return. Defaults to noAcl.
-   * @return Google_Service_Storage_Buckets
-   */
-  public function listBuckets($project, $optParams = array())
-  {
-    $params = array('project' => $project);
-    $params = array_merge($params, $optParams);
-    return $this->call('list', array($params), "Google_Service_Storage_Buckets");
-  }
-  /**
-   * Updates a bucket. Changes to the bucket will be readable immediately after
-   * writing, but configuration changes may take time to propagate. This method
-   * supports patch semantics. (buckets.patch)
-   *
-   * @param string $bucket Name of a bucket.
-   * @param Google_Service_Storage_Bucket $postBody
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param string ifMetagenerationMatch Makes the return of the bucket
-   * metadata conditional on whether the bucket's current metageneration matches
-   * the given value.
-   * @opt_param string ifMetagenerationNotMatch Makes the return of the bucket
-   * metadata conditional on whether the bucket's current metageneration does not
-   * match the given value.
-   * @opt_param string predefinedAcl Apply a predefined set of access controls to
-   * this bucket.
-   * @opt_param string predefinedDefaultObjectAcl Apply a predefined set of
-   * default object access controls to this bucket.
-   * @opt_param string projection Set of properties to return. Defaults to full.
-   * @return Google_Service_Storage_Bucket
-   */
-  public function patch($bucket, Google_Service_Storage_Bucket $postBody, $optParams = array())
-  {
-    $params = array('bucket' => $bucket, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('patch', array($params), "Google_Service_Storage_Bucket");
-  }
-  /**
-   * Updates an IAM policy for the specified bucket. (buckets.setIamPolicy)
-   *
-   * @param string $bucket Name of a bucket.
-   * @param Google_Service_Storage_Policy $postBody
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Storage_Policy
-   */
-  public function setIamPolicy($bucket, Google_Service_Storage_Policy $postBody, $optParams = array())
-  {
-    $params = array('bucket' => $bucket, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('setIamPolicy', array($params), "Google_Service_Storage_Policy");
-  }
-  /**
-   * Tests a set of permissions on the given bucket to see which, if any, are held
-   * by the caller. (buckets.testIamPermissions)
-   *
-   * @param string $bucket Name of a bucket.
-   * @param string|array $permissions Permissions to test.
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Storage_TestIamPermissionsResponse
-   */
-  public function testIamPermissions($bucket, $permissions, $optParams = array())
-  {
-    $params = array('bucket' => $bucket, 'permissions' => $permissions);
-    $params = array_merge($params, $optParams);
-    return $this->call('testIamPermissions', array($params), "Google_Service_Storage_TestIamPermissionsResponse");
-  }
-  /**
-   * Updates a bucket. Changes to the bucket will be readable immediately after
-   * writing, but configuration changes may take time to propagate.
-   * (buckets.update)
-   *
-   * @param string $bucket Name of a bucket.
-   * @param Google_Service_Storage_Bucket $postBody
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param string ifMetagenerationMatch Makes the return of the bucket
-   * metadata conditional on whether the bucket's current metageneration matches
-   * the given value.
-   * @opt_param string ifMetagenerationNotMatch Makes the return of the bucket
-   * metadata conditional on whether the bucket's current metageneration does not
-   * match the given value.
-   * @opt_param string predefinedAcl Apply a predefined set of access controls to
-   * this bucket.
-   * @opt_param string predefinedDefaultObjectAcl Apply a predefined set of
-   * default object access controls to this bucket.
-   * @opt_param string projection Set of properties to return. Defaults to full.
-   * @return Google_Service_Storage_Bucket
-   */
-  public function update($bucket, Google_Service_Storage_Bucket $postBody, $optParams = array())
-  {
-    $params = array('bucket' => $bucket, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('update', array($params), "Google_Service_Storage_Bucket");
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Storage/Resource/Channels.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Storage/Resource/Channels.php
deleted file mode 100644
index 8c5a1dc6..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Storage/Resource/Channels.php
+++ /dev/null
@@ -1,40 +0,0 @@
-
- *   $storageService = new Google_Service_Storage(...);
- *   $channels = $storageService->channels;
- *  
- */
-class Google_Service_Storage_Resource_Channels extends Google_Service_Resource
-{
-  /**
-   * Stop watching resources through this channel (channels.stop)
-   *
-   * @param Google_Service_Storage_Channel $postBody
-   * @param array $optParams Optional parameters.
-   */
-  public function stop(Google_Service_Storage_Channel $postBody, $optParams = array())
-  {
-    $params = array('postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('stop', array($params));
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Storage/Resource/DefaultObjectAccessControls.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Storage/Resource/DefaultObjectAccessControls.php
deleted file mode 100644
index 83c6c9ea..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Storage/Resource/DefaultObjectAccessControls.php
+++ /dev/null
@@ -1,132 +0,0 @@
-
- *   $storageService = new Google_Service_Storage(...);
- *   $defaultObjectAccessControls = $storageService->defaultObjectAccessControls;
- *  
- */
-class Google_Service_Storage_Resource_DefaultObjectAccessControls extends Google_Service_Resource
-{
-  /**
-   * Permanently deletes the default object ACL entry for the specified entity on
-   * the specified bucket. (defaultObjectAccessControls.delete)
-   *
-   * @param string $bucket Name of a bucket.
-   * @param string $entity The entity holding the permission. Can be user-userId,
-   * user-emailAddress, group-groupId, group-emailAddress, allUsers, or
-   * allAuthenticatedUsers.
-   * @param array $optParams Optional parameters.
-   */
-  public function delete($bucket, $entity, $optParams = array())
-  {
-    $params = array('bucket' => $bucket, 'entity' => $entity);
-    $params = array_merge($params, $optParams);
-    return $this->call('delete', array($params));
-  }
-  /**
-   * Returns the default object ACL entry for the specified entity on the
-   * specified bucket. (defaultObjectAccessControls.get)
-   *
-   * @param string $bucket Name of a bucket.
-   * @param string $entity The entity holding the permission. Can be user-userId,
-   * user-emailAddress, group-groupId, group-emailAddress, allUsers, or
-   * allAuthenticatedUsers.
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Storage_ObjectAccessControl
-   */
-  public function get($bucket, $entity, $optParams = array())
-  {
-    $params = array('bucket' => $bucket, 'entity' => $entity);
-    $params = array_merge($params, $optParams);
-    return $this->call('get', array($params), "Google_Service_Storage_ObjectAccessControl");
-  }
-  /**
-   * Creates a new default object ACL entry on the specified bucket.
-   * (defaultObjectAccessControls.insert)
-   *
-   * @param string $bucket Name of a bucket.
-   * @param Google_Service_Storage_ObjectAccessControl $postBody
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Storage_ObjectAccessControl
-   */
-  public function insert($bucket, Google_Service_Storage_ObjectAccessControl $postBody, $optParams = array())
-  {
-    $params = array('bucket' => $bucket, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('insert', array($params), "Google_Service_Storage_ObjectAccessControl");
-  }
-  /**
-   * Retrieves default object ACL entries on the specified bucket.
-   * (defaultObjectAccessControls.listDefaultObjectAccessControls)
-   *
-   * @param string $bucket Name of a bucket.
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param string ifMetagenerationMatch If present, only return default ACL
-   * listing if the bucket's current metageneration matches this value.
-   * @opt_param string ifMetagenerationNotMatch If present, only return default
-   * ACL listing if the bucket's current metageneration does not match the given
-   * value.
-   * @return Google_Service_Storage_ObjectAccessControls
-   */
-  public function listDefaultObjectAccessControls($bucket, $optParams = array())
-  {
-    $params = array('bucket' => $bucket);
-    $params = array_merge($params, $optParams);
-    return $this->call('list', array($params), "Google_Service_Storage_ObjectAccessControls");
-  }
-  /**
-   * Updates a default object ACL entry on the specified bucket. This method
-   * supports patch semantics. (defaultObjectAccessControls.patch)
-   *
-   * @param string $bucket Name of a bucket.
-   * @param string $entity The entity holding the permission. Can be user-userId,
-   * user-emailAddress, group-groupId, group-emailAddress, allUsers, or
-   * allAuthenticatedUsers.
-   * @param Google_Service_Storage_ObjectAccessControl $postBody
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Storage_ObjectAccessControl
-   */
-  public function patch($bucket, $entity, Google_Service_Storage_ObjectAccessControl $postBody, $optParams = array())
-  {
-    $params = array('bucket' => $bucket, 'entity' => $entity, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('patch', array($params), "Google_Service_Storage_ObjectAccessControl");
-  }
-  /**
-   * Updates a default object ACL entry on the specified bucket.
-   * (defaultObjectAccessControls.update)
-   *
-   * @param string $bucket Name of a bucket.
-   * @param string $entity The entity holding the permission. Can be user-userId,
-   * user-emailAddress, group-groupId, group-emailAddress, allUsers, or
-   * allAuthenticatedUsers.
-   * @param Google_Service_Storage_ObjectAccessControl $postBody
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Storage_ObjectAccessControl
-   */
-  public function update($bucket, $entity, Google_Service_Storage_ObjectAccessControl $postBody, $optParams = array())
-  {
-    $params = array('bucket' => $bucket, 'entity' => $entity, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('update', array($params), "Google_Service_Storage_ObjectAccessControl");
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Storage/Resource/ObjectAccessControls.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Storage/Resource/ObjectAccessControls.php
deleted file mode 100644
index 04734a83..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Storage/Resource/ObjectAccessControls.php
+++ /dev/null
@@ -1,155 +0,0 @@
-
- *   $storageService = new Google_Service_Storage(...);
- *   $objectAccessControls = $storageService->objectAccessControls;
- *  
- */
-class Google_Service_Storage_Resource_ObjectAccessControls extends Google_Service_Resource
-{
-  /**
-   * Permanently deletes the ACL entry for the specified entity on the specified
-   * object. (objectAccessControls.delete)
-   *
-   * @param string $bucket Name of a bucket.
-   * @param string $object Name of the object. For information about how to URL
-   * encode object names to be path safe, see Encoding URI Path Parts.
-   * @param string $entity The entity holding the permission. Can be user-userId,
-   * user-emailAddress, group-groupId, group-emailAddress, allUsers, or
-   * allAuthenticatedUsers.
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param string generation If present, selects a specific revision of this
-   * object (as opposed to the latest version, the default).
-   */
-  public function delete($bucket, $object, $entity, $optParams = array())
-  {
-    $params = array('bucket' => $bucket, 'object' => $object, 'entity' => $entity);
-    $params = array_merge($params, $optParams);
-    return $this->call('delete', array($params));
-  }
-  /**
-   * Returns the ACL entry for the specified entity on the specified object.
-   * (objectAccessControls.get)
-   *
-   * @param string $bucket Name of a bucket.
-   * @param string $object Name of the object. For information about how to URL
-   * encode object names to be path safe, see Encoding URI Path Parts.
-   * @param string $entity The entity holding the permission. Can be user-userId,
-   * user-emailAddress, group-groupId, group-emailAddress, allUsers, or
-   * allAuthenticatedUsers.
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param string generation If present, selects a specific revision of this
-   * object (as opposed to the latest version, the default).
-   * @return Google_Service_Storage_ObjectAccessControl
-   */
-  public function get($bucket, $object, $entity, $optParams = array())
-  {
-    $params = array('bucket' => $bucket, 'object' => $object, 'entity' => $entity);
-    $params = array_merge($params, $optParams);
-    return $this->call('get', array($params), "Google_Service_Storage_ObjectAccessControl");
-  }
-  /**
-   * Creates a new ACL entry on the specified object.
-   * (objectAccessControls.insert)
-   *
-   * @param string $bucket Name of a bucket.
-   * @param string $object Name of the object. For information about how to URL
-   * encode object names to be path safe, see Encoding URI Path Parts.
-   * @param Google_Service_Storage_ObjectAccessControl $postBody
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param string generation If present, selects a specific revision of this
-   * object (as opposed to the latest version, the default).
-   * @return Google_Service_Storage_ObjectAccessControl
-   */
-  public function insert($bucket, $object, Google_Service_Storage_ObjectAccessControl $postBody, $optParams = array())
-  {
-    $params = array('bucket' => $bucket, 'object' => $object, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('insert', array($params), "Google_Service_Storage_ObjectAccessControl");
-  }
-  /**
-   * Retrieves ACL entries on the specified object.
-   * (objectAccessControls.listObjectAccessControls)
-   *
-   * @param string $bucket Name of a bucket.
-   * @param string $object Name of the object. For information about how to URL
-   * encode object names to be path safe, see Encoding URI Path Parts.
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param string generation If present, selects a specific revision of this
-   * object (as opposed to the latest version, the default).
-   * @return Google_Service_Storage_ObjectAccessControls
-   */
-  public function listObjectAccessControls($bucket, $object, $optParams = array())
-  {
-    $params = array('bucket' => $bucket, 'object' => $object);
-    $params = array_merge($params, $optParams);
-    return $this->call('list', array($params), "Google_Service_Storage_ObjectAccessControls");
-  }
-  /**
-   * Updates an ACL entry on the specified object. This method supports patch
-   * semantics. (objectAccessControls.patch)
-   *
-   * @param string $bucket Name of a bucket.
-   * @param string $object Name of the object. For information about how to URL
-   * encode object names to be path safe, see Encoding URI Path Parts.
-   * @param string $entity The entity holding the permission. Can be user-userId,
-   * user-emailAddress, group-groupId, group-emailAddress, allUsers, or
-   * allAuthenticatedUsers.
-   * @param Google_Service_Storage_ObjectAccessControl $postBody
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param string generation If present, selects a specific revision of this
-   * object (as opposed to the latest version, the default).
-   * @return Google_Service_Storage_ObjectAccessControl
-   */
-  public function patch($bucket, $object, $entity, Google_Service_Storage_ObjectAccessControl $postBody, $optParams = array())
-  {
-    $params = array('bucket' => $bucket, 'object' => $object, 'entity' => $entity, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('patch', array($params), "Google_Service_Storage_ObjectAccessControl");
-  }
-  /**
-   * Updates an ACL entry on the specified object. (objectAccessControls.update)
-   *
-   * @param string $bucket Name of a bucket.
-   * @param string $object Name of the object. For information about how to URL
-   * encode object names to be path safe, see Encoding URI Path Parts.
-   * @param string $entity The entity holding the permission. Can be user-userId,
-   * user-emailAddress, group-groupId, group-emailAddress, allUsers, or
-   * allAuthenticatedUsers.
-   * @param Google_Service_Storage_ObjectAccessControl $postBody
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param string generation If present, selects a specific revision of this
-   * object (as opposed to the latest version, the default).
-   * @return Google_Service_Storage_ObjectAccessControl
-   */
-  public function update($bucket, $object, $entity, Google_Service_Storage_ObjectAccessControl $postBody, $optParams = array())
-  {
-    $params = array('bucket' => $bucket, 'object' => $object, 'entity' => $entity, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('update', array($params), "Google_Service_Storage_ObjectAccessControl");
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Storage/Resource/Objects.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Storage/Resource/Objects.php
deleted file mode 100644
index 98155f25..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Storage/Resource/Objects.php
+++ /dev/null
@@ -1,444 +0,0 @@
-
- *   $storageService = new Google_Service_Storage(...);
- *   $objects = $storageService->objects;
- *  
- */
-class Google_Service_Storage_Resource_Objects extends Google_Service_Resource
-{
-  /**
-   * Concatenates a list of existing objects into a new object in the same bucket.
-   * (objects.compose)
-   *
-   * @param string $destinationBucket Name of the bucket in which to store the new
-   * object.
-   * @param string $destinationObject Name of the new object. For information
-   * about how to URL encode object names to be path safe, see Encoding URI Path
-   * Parts.
-   * @param Google_Service_Storage_ComposeRequest $postBody
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param string destinationPredefinedAcl Apply a predefined set of access
-   * controls to the destination object.
-   * @opt_param string ifGenerationMatch Makes the operation conditional on
-   * whether the object's current generation matches the given value.
-   * @opt_param string ifMetagenerationMatch Makes the operation conditional on
-   * whether the object's current metageneration matches the given value.
-   * @return Google_Service_Storage_StorageObject
-   */
-  public function compose($destinationBucket, $destinationObject, Google_Service_Storage_ComposeRequest $postBody, $optParams = array())
-  {
-    $params = array('destinationBucket' => $destinationBucket, 'destinationObject' => $destinationObject, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('compose', array($params), "Google_Service_Storage_StorageObject");
-  }
-  /**
-   * Copies a source object to a destination object. Optionally overrides
-   * metadata. (objects.copy)
-   *
-   * @param string $sourceBucket Name of the bucket in which to find the source
-   * object.
-   * @param string $sourceObject Name of the source object. For information about
-   * how to URL encode object names to be path safe, see Encoding URI Path Parts.
-   * @param string $destinationBucket Name of the bucket in which to store the new
-   * object. Overrides the provided object metadata's bucket value, if any.For
-   * information about how to URL encode object names to be path safe, see
-   * Encoding URI Path Parts.
-   * @param string $destinationObject Name of the new object. Required when the
-   * object metadata is not otherwise provided. Overrides the object metadata's
-   * name value, if any.
-   * @param Google_Service_Storage_StorageObject $postBody
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param string destinationPredefinedAcl Apply a predefined set of access
-   * controls to the destination object.
-   * @opt_param string ifGenerationMatch Makes the operation conditional on
-   * whether the destination object's current generation matches the given value.
-   * @opt_param string ifGenerationNotMatch Makes the operation conditional on
-   * whether the destination object's current generation does not match the given
-   * value.
-   * @opt_param string ifMetagenerationMatch Makes the operation conditional on
-   * whether the destination object's current metageneration matches the given
-   * value.
-   * @opt_param string ifMetagenerationNotMatch Makes the operation conditional on
-   * whether the destination object's current metageneration does not match the
-   * given value.
-   * @opt_param string ifSourceGenerationMatch Makes the operation conditional on
-   * whether the source object's generation matches the given value.
-   * @opt_param string ifSourceGenerationNotMatch Makes the operation conditional
-   * on whether the source object's generation does not match the given value.
-   * @opt_param string ifSourceMetagenerationMatch Makes the operation conditional
-   * on whether the source object's current metageneration matches the given
-   * value.
-   * @opt_param string ifSourceMetagenerationNotMatch Makes the operation
-   * conditional on whether the source object's current metageneration does not
-   * match the given value.
-   * @opt_param string projection Set of properties to return. Defaults to noAcl,
-   * unless the object resource specifies the acl property, when it defaults to
-   * full.
-   * @opt_param string sourceGeneration If present, selects a specific revision of
-   * the source object (as opposed to the latest version, the default).
-   * @return Google_Service_Storage_StorageObject
-   */
-  public function copy($sourceBucket, $sourceObject, $destinationBucket, $destinationObject, Google_Service_Storage_StorageObject $postBody, $optParams = array())
-  {
-    $params = array('sourceBucket' => $sourceBucket, 'sourceObject' => $sourceObject, 'destinationBucket' => $destinationBucket, 'destinationObject' => $destinationObject, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('copy', array($params), "Google_Service_Storage_StorageObject");
-  }
-  /**
-   * Deletes an object and its metadata. Deletions are permanent if versioning is
-   * not enabled for the bucket, or if the generation parameter is used.
-   * (objects.delete)
-   *
-   * @param string $bucket Name of the bucket in which the object resides.
-   * @param string $object Name of the object. For information about how to URL
-   * encode object names to be path safe, see Encoding URI Path Parts.
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param string generation If present, permanently deletes a specific
-   * revision of this object (as opposed to the latest version, the default).
-   * @opt_param string ifGenerationMatch Makes the operation conditional on
-   * whether the object's current generation matches the given value.
-   * @opt_param string ifGenerationNotMatch Makes the operation conditional on
-   * whether the object's current generation does not match the given value.
-   * @opt_param string ifMetagenerationMatch Makes the operation conditional on
-   * whether the object's current metageneration matches the given value.
-   * @opt_param string ifMetagenerationNotMatch Makes the operation conditional on
-   * whether the object's current metageneration does not match the given value.
-   */
-  public function delete($bucket, $object, $optParams = array())
-  {
-    $params = array('bucket' => $bucket, 'object' => $object);
-    $params = array_merge($params, $optParams);
-    return $this->call('delete', array($params));
-  }
-  /**
-   * Retrieves an object or its metadata. (objects.get)
-   *
-   * @param string $bucket Name of the bucket in which the object resides.
-   * @param string $object Name of the object. For information about how to URL
-   * encode object names to be path safe, see Encoding URI Path Parts.
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param string generation If present, selects a specific revision of this
-   * object (as opposed to the latest version, the default).
-   * @opt_param string ifGenerationMatch Makes the operation conditional on
-   * whether the object's generation matches the given value.
-   * @opt_param string ifGenerationNotMatch Makes the operation conditional on
-   * whether the object's generation does not match the given value.
-   * @opt_param string ifMetagenerationMatch Makes the operation conditional on
-   * whether the object's current metageneration matches the given value.
-   * @opt_param string ifMetagenerationNotMatch Makes the operation conditional on
-   * whether the object's current metageneration does not match the given value.
-   * @opt_param string projection Set of properties to return. Defaults to noAcl.
-   * @return Google_Service_Storage_StorageObject
-   */
-  public function get($bucket, $object, $optParams = array())
-  {
-    $params = array('bucket' => $bucket, 'object' => $object);
-    $params = array_merge($params, $optParams);
-    return $this->call('get', array($params), "Google_Service_Storage_StorageObject");
-  }
-  /**
-   * Returns an IAM policy for the specified object. (objects.getIamPolicy)
-   *
-   * @param string $bucket Name of the bucket in which the object resides.
-   * @param string $object Name of the object. For information about how to URL
-   * encode object names to be path safe, see Encoding URI Path Parts.
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param string generation If present, selects a specific revision of this
-   * object (as opposed to the latest version, the default).
-   * @return Google_Service_Storage_Policy
-   */
-  public function getIamPolicy($bucket, $object, $optParams = array())
-  {
-    $params = array('bucket' => $bucket, 'object' => $object);
-    $params = array_merge($params, $optParams);
-    return $this->call('getIamPolicy', array($params), "Google_Service_Storage_Policy");
-  }
-  /**
-   * Stores a new object and metadata. (objects.insert)
-   *
-   * @param string $bucket Name of the bucket in which to store the new object.
-   * Overrides the provided object metadata's bucket value, if any.
-   * @param Google_Service_Storage_StorageObject $postBody
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param string contentEncoding If set, sets the contentEncoding property
-   * of the final object to this value. Setting this parameter is equivalent to
-   * setting the contentEncoding metadata property. This can be useful when
-   * uploading an object with uploadType=media to indicate the encoding of the
-   * content being uploaded.
-   * @opt_param string ifGenerationMatch Makes the operation conditional on
-   * whether the object's current generation matches the given value.
-   * @opt_param string ifGenerationNotMatch Makes the operation conditional on
-   * whether the object's current generation does not match the given value.
-   * @opt_param string ifMetagenerationMatch Makes the operation conditional on
-   * whether the object's current metageneration matches the given value.
-   * @opt_param string ifMetagenerationNotMatch Makes the operation conditional on
-   * whether the object's current metageneration does not match the given value.
-   * @opt_param string name Name of the object. Required when the object metadata
-   * is not otherwise provided. Overrides the object metadata's name value, if
-   * any. For information about how to URL encode object names to be path safe,
-   * see Encoding URI Path Parts.
-   * @opt_param string predefinedAcl Apply a predefined set of access controls to
-   * this object.
-   * @opt_param string projection Set of properties to return. Defaults to noAcl,
-   * unless the object resource specifies the acl property, when it defaults to
-   * full.
-   * @return Google_Service_Storage_StorageObject
-   */
-  public function insert($bucket, Google_Service_Storage_StorageObject $postBody, $optParams = array())
-  {
-    $params = array('bucket' => $bucket, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('insert', array($params), "Google_Service_Storage_StorageObject");
-  }
-  /**
-   * Retrieves a list of objects matching the criteria. (objects.listObjects)
-   *
-   * @param string $bucket Name of the bucket in which to look for objects.
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param string delimiter Returns results in a directory-like mode. items
-   * will contain only objects whose names, aside from the prefix, do not contain
-   * delimiter. Objects whose names, aside from the prefix, contain delimiter will
-   * have their name, truncated after the delimiter, returned in prefixes.
-   * Duplicate prefixes are omitted.
-   * @opt_param string maxResults Maximum number of items plus prefixes to return
-   * in a single page of responses. As duplicate prefixes are omitted, fewer total
-   * results may be returned than requested. The service will use this parameter
-   * or 1,000 items, whichever is smaller.
-   * @opt_param string pageToken A previously-returned page token representing
-   * part of the larger set of results to view.
-   * @opt_param string prefix Filter results to objects whose names begin with
-   * this prefix.
-   * @opt_param string projection Set of properties to return. Defaults to noAcl.
-   * @opt_param bool versions If true, lists all versions of an object as distinct
-   * results. The default is false. For more information, see Object Versioning.
-   * @return Google_Service_Storage_Objects
-   */
-  public function listObjects($bucket, $optParams = array())
-  {
-    $params = array('bucket' => $bucket);
-    $params = array_merge($params, $optParams);
-    return $this->call('list', array($params), "Google_Service_Storage_Objects");
-  }
-  /**
-   * Updates an object's metadata. This method supports patch semantics.
-   * (objects.patch)
-   *
-   * @param string $bucket Name of the bucket in which the object resides.
-   * @param string $object Name of the object. For information about how to URL
-   * encode object names to be path safe, see Encoding URI Path Parts.
-   * @param Google_Service_Storage_StorageObject $postBody
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param string generation If present, selects a specific revision of this
-   * object (as opposed to the latest version, the default).
-   * @opt_param string ifGenerationMatch Makes the operation conditional on
-   * whether the object's current generation matches the given value.
-   * @opt_param string ifGenerationNotMatch Makes the operation conditional on
-   * whether the object's current generation does not match the given value.
-   * @opt_param string ifMetagenerationMatch Makes the operation conditional on
-   * whether the object's current metageneration matches the given value.
-   * @opt_param string ifMetagenerationNotMatch Makes the operation conditional on
-   * whether the object's current metageneration does not match the given value.
-   * @opt_param string predefinedAcl Apply a predefined set of access controls to
-   * this object.
-   * @opt_param string projection Set of properties to return. Defaults to full.
-   * @return Google_Service_Storage_StorageObject
-   */
-  public function patch($bucket, $object, Google_Service_Storage_StorageObject $postBody, $optParams = array())
-  {
-    $params = array('bucket' => $bucket, 'object' => $object, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('patch', array($params), "Google_Service_Storage_StorageObject");
-  }
-  /**
-   * Rewrites a source object to a destination object. Optionally overrides
-   * metadata. (objects.rewrite)
-   *
-   * @param string $sourceBucket Name of the bucket in which to find the source
-   * object.
-   * @param string $sourceObject Name of the source object. For information about
-   * how to URL encode object names to be path safe, see Encoding URI Path Parts.
-   * @param string $destinationBucket Name of the bucket in which to store the new
-   * object. Overrides the provided object metadata's bucket value, if any.
-   * @param string $destinationObject Name of the new object. Required when the
-   * object metadata is not otherwise provided. Overrides the object metadata's
-   * name value, if any. For information about how to URL encode object names to
-   * be path safe, see Encoding URI Path Parts.
-   * @param Google_Service_Storage_StorageObject $postBody
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param string destinationPredefinedAcl Apply a predefined set of access
-   * controls to the destination object.
-   * @opt_param string ifGenerationMatch Makes the operation conditional on
-   * whether the destination object's current generation matches the given value.
-   * @opt_param string ifGenerationNotMatch Makes the operation conditional on
-   * whether the destination object's current generation does not match the given
-   * value.
-   * @opt_param string ifMetagenerationMatch Makes the operation conditional on
-   * whether the destination object's current metageneration matches the given
-   * value.
-   * @opt_param string ifMetagenerationNotMatch Makes the operation conditional on
-   * whether the destination object's current metageneration does not match the
-   * given value.
-   * @opt_param string ifSourceGenerationMatch Makes the operation conditional on
-   * whether the source object's generation matches the given value.
-   * @opt_param string ifSourceGenerationNotMatch Makes the operation conditional
-   * on whether the source object's generation does not match the given value.
-   * @opt_param string ifSourceMetagenerationMatch Makes the operation conditional
-   * on whether the source object's current metageneration matches the given
-   * value.
-   * @opt_param string ifSourceMetagenerationNotMatch Makes the operation
-   * conditional on whether the source object's current metageneration does not
-   * match the given value.
-   * @opt_param string maxBytesRewrittenPerCall The maximum number of bytes that
-   * will be rewritten per rewrite request. Most callers shouldn't need to specify
-   * this parameter - it is primarily in place to support testing. If specified
-   * the value must be an integral multiple of 1 MiB (1048576). Also, this only
-   * applies to requests where the source and destination span locations and/or
-   * storage classes. Finally, this value must not change across rewrite calls
-   * else you'll get an error that the rewriteToken is invalid.
-   * @opt_param string projection Set of properties to return. Defaults to noAcl,
-   * unless the object resource specifies the acl property, when it defaults to
-   * full.
-   * @opt_param string rewriteToken Include this field (from the previous rewrite
-   * response) on each rewrite request after the first one, until the rewrite
-   * response 'done' flag is true. Calls that provide a rewriteToken can omit all
-   * other request fields, but if included those fields must match the values
-   * provided in the first rewrite request.
-   * @opt_param string sourceGeneration If present, selects a specific revision of
-   * the source object (as opposed to the latest version, the default).
-   * @return Google_Service_Storage_RewriteResponse
-   */
-  public function rewrite($sourceBucket, $sourceObject, $destinationBucket, $destinationObject, Google_Service_Storage_StorageObject $postBody, $optParams = array())
-  {
-    $params = array('sourceBucket' => $sourceBucket, 'sourceObject' => $sourceObject, 'destinationBucket' => $destinationBucket, 'destinationObject' => $destinationObject, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('rewrite', array($params), "Google_Service_Storage_RewriteResponse");
-  }
-  /**
-   * Updates an IAM policy for the specified object. (objects.setIamPolicy)
-   *
-   * @param string $bucket Name of the bucket in which the object resides.
-   * @param string $object Name of the object. For information about how to URL
-   * encode object names to be path safe, see Encoding URI Path Parts.
-   * @param Google_Service_Storage_Policy $postBody
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param string generation If present, selects a specific revision of this
-   * object (as opposed to the latest version, the default).
-   * @return Google_Service_Storage_Policy
-   */
-  public function setIamPolicy($bucket, $object, Google_Service_Storage_Policy $postBody, $optParams = array())
-  {
-    $params = array('bucket' => $bucket, 'object' => $object, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('setIamPolicy', array($params), "Google_Service_Storage_Policy");
-  }
-  /**
-   * Tests a set of permissions on the given object to see which, if any, are held
-   * by the caller. (objects.testIamPermissions)
-   *
-   * @param string $bucket Name of the bucket in which the object resides.
-   * @param string $object Name of the object. For information about how to URL
-   * encode object names to be path safe, see Encoding URI Path Parts.
-   * @param string|array $permissions Permissions to test.
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param string generation If present, selects a specific revision of this
-   * object (as opposed to the latest version, the default).
-   * @return Google_Service_Storage_TestIamPermissionsResponse
-   */
-  public function testIamPermissions($bucket, $object, $permissions, $optParams = array())
-  {
-    $params = array('bucket' => $bucket, 'object' => $object, 'permissions' => $permissions);
-    $params = array_merge($params, $optParams);
-    return $this->call('testIamPermissions', array($params), "Google_Service_Storage_TestIamPermissionsResponse");
-  }
-  /**
-   * Updates an object's metadata. (objects.update)
-   *
-   * @param string $bucket Name of the bucket in which the object resides.
-   * @param string $object Name of the object. For information about how to URL
-   * encode object names to be path safe, see Encoding URI Path Parts.
-   * @param Google_Service_Storage_StorageObject $postBody
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param string generation If present, selects a specific revision of this
-   * object (as opposed to the latest version, the default).
-   * @opt_param string ifGenerationMatch Makes the operation conditional on
-   * whether the object's current generation matches the given value.
-   * @opt_param string ifGenerationNotMatch Makes the operation conditional on
-   * whether the object's current generation does not match the given value.
-   * @opt_param string ifMetagenerationMatch Makes the operation conditional on
-   * whether the object's current metageneration matches the given value.
-   * @opt_param string ifMetagenerationNotMatch Makes the operation conditional on
-   * whether the object's current metageneration does not match the given value.
-   * @opt_param string predefinedAcl Apply a predefined set of access controls to
-   * this object.
-   * @opt_param string projection Set of properties to return. Defaults to full.
-   * @return Google_Service_Storage_StorageObject
-   */
-  public function update($bucket, $object, Google_Service_Storage_StorageObject $postBody, $optParams = array())
-  {
-    $params = array('bucket' => $bucket, 'object' => $object, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('update', array($params), "Google_Service_Storage_StorageObject");
-  }
-  /**
-   * Watch for changes on all objects in a bucket. (objects.watchAll)
-   *
-   * @param string $bucket Name of the bucket in which to look for objects.
-   * @param Google_Service_Storage_Channel $postBody
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param string delimiter Returns results in a directory-like mode. items
-   * will contain only objects whose names, aside from the prefix, do not contain
-   * delimiter. Objects whose names, aside from the prefix, contain delimiter will
-   * have their name, truncated after the delimiter, returned in prefixes.
-   * Duplicate prefixes are omitted.
-   * @opt_param string maxResults Maximum number of items plus prefixes to return
-   * in a single page of responses. As duplicate prefixes are omitted, fewer total
-   * results may be returned than requested. The service will use this parameter
-   * or 1,000 items, whichever is smaller.
-   * @opt_param string pageToken A previously-returned page token representing
-   * part of the larger set of results to view.
-   * @opt_param string prefix Filter results to objects whose names begin with
-   * this prefix.
-   * @opt_param string projection Set of properties to return. Defaults to noAcl.
-   * @opt_param bool versions If true, lists all versions of an object as distinct
-   * results. The default is false. For more information, see Object Versioning.
-   * @return Google_Service_Storage_Channel
-   */
-  public function watchAll($bucket, Google_Service_Storage_Channel $postBody, $optParams = array())
-  {
-    $params = array('bucket' => $bucket, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('watchAll', array($params), "Google_Service_Storage_Channel");
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Storage/RewriteResponse.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Storage/RewriteResponse.php
deleted file mode 100644
index aa8f1c65..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Storage/RewriteResponse.php
+++ /dev/null
@@ -1,76 +0,0 @@
-done = $done;
-  }
-  public function getDone()
-  {
-    return $this->done;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setObjectSize($objectSize)
-  {
-    $this->objectSize = $objectSize;
-  }
-  public function getObjectSize()
-  {
-    return $this->objectSize;
-  }
-  public function setResource(Google_Service_Storage_StorageObject $resource)
-  {
-    $this->resource = $resource;
-  }
-  public function getResource()
-  {
-    return $this->resource;
-  }
-  public function setRewriteToken($rewriteToken)
-  {
-    $this->rewriteToken = $rewriteToken;
-  }
-  public function getRewriteToken()
-  {
-    return $this->rewriteToken;
-  }
-  public function setTotalBytesRewritten($totalBytesRewritten)
-  {
-    $this->totalBytesRewritten = $totalBytesRewritten;
-  }
-  public function getTotalBytesRewritten()
-  {
-    return $this->totalBytesRewritten;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Storage/StorageObject.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Storage/StorageObject.php
deleted file mode 100644
index 4cfb91ba..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Storage/StorageObject.php
+++ /dev/null
@@ -1,268 +0,0 @@
-acl = $acl;
-  }
-  public function getAcl()
-  {
-    return $this->acl;
-  }
-  public function setBucket($bucket)
-  {
-    $this->bucket = $bucket;
-  }
-  public function getBucket()
-  {
-    return $this->bucket;
-  }
-  public function setCacheControl($cacheControl)
-  {
-    $this->cacheControl = $cacheControl;
-  }
-  public function getCacheControl()
-  {
-    return $this->cacheControl;
-  }
-  public function setComponentCount($componentCount)
-  {
-    $this->componentCount = $componentCount;
-  }
-  public function getComponentCount()
-  {
-    return $this->componentCount;
-  }
-  public function setContentDisposition($contentDisposition)
-  {
-    $this->contentDisposition = $contentDisposition;
-  }
-  public function getContentDisposition()
-  {
-    return $this->contentDisposition;
-  }
-  public function setContentEncoding($contentEncoding)
-  {
-    $this->contentEncoding = $contentEncoding;
-  }
-  public function getContentEncoding()
-  {
-    return $this->contentEncoding;
-  }
-  public function setContentLanguage($contentLanguage)
-  {
-    $this->contentLanguage = $contentLanguage;
-  }
-  public function getContentLanguage()
-  {
-    return $this->contentLanguage;
-  }
-  public function setContentType($contentType)
-  {
-    $this->contentType = $contentType;
-  }
-  public function getContentType()
-  {
-    return $this->contentType;
-  }
-  public function setCrc32c($crc32c)
-  {
-    $this->crc32c = $crc32c;
-  }
-  public function getCrc32c()
-  {
-    return $this->crc32c;
-  }
-  public function setCustomerEncryption(Google_Service_Storage_StorageObjectCustomerEncryption $customerEncryption)
-  {
-    $this->customerEncryption = $customerEncryption;
-  }
-  public function getCustomerEncryption()
-  {
-    return $this->customerEncryption;
-  }
-  public function setEtag($etag)
-  {
-    $this->etag = $etag;
-  }
-  public function getEtag()
-  {
-    return $this->etag;
-  }
-  public function setGeneration($generation)
-  {
-    $this->generation = $generation;
-  }
-  public function getGeneration()
-  {
-    return $this->generation;
-  }
-  public function setId($id)
-  {
-    $this->id = $id;
-  }
-  public function getId()
-  {
-    return $this->id;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setMd5Hash($md5Hash)
-  {
-    $this->md5Hash = $md5Hash;
-  }
-  public function getMd5Hash()
-  {
-    return $this->md5Hash;
-  }
-  public function setMediaLink($mediaLink)
-  {
-    $this->mediaLink = $mediaLink;
-  }
-  public function getMediaLink()
-  {
-    return $this->mediaLink;
-  }
-  public function setMetadata($metadata)
-  {
-    $this->metadata = $metadata;
-  }
-  public function getMetadata()
-  {
-    return $this->metadata;
-  }
-  public function setMetageneration($metageneration)
-  {
-    $this->metageneration = $metageneration;
-  }
-  public function getMetageneration()
-  {
-    return $this->metageneration;
-  }
-  public function setName($name)
-  {
-    $this->name = $name;
-  }
-  public function getName()
-  {
-    return $this->name;
-  }
-  public function setOwner(Google_Service_Storage_StorageObjectOwner $owner)
-  {
-    $this->owner = $owner;
-  }
-  public function getOwner()
-  {
-    return $this->owner;
-  }
-  public function setSelfLink($selfLink)
-  {
-    $this->selfLink = $selfLink;
-  }
-  public function getSelfLink()
-  {
-    return $this->selfLink;
-  }
-  public function setSize($size)
-  {
-    $this->size = $size;
-  }
-  public function getSize()
-  {
-    return $this->size;
-  }
-  public function setStorageClass($storageClass)
-  {
-    $this->storageClass = $storageClass;
-  }
-  public function getStorageClass()
-  {
-    return $this->storageClass;
-  }
-  public function setTimeCreated($timeCreated)
-  {
-    $this->timeCreated = $timeCreated;
-  }
-  public function getTimeCreated()
-  {
-    return $this->timeCreated;
-  }
-  public function setTimeDeleted($timeDeleted)
-  {
-    $this->timeDeleted = $timeDeleted;
-  }
-  public function getTimeDeleted()
-  {
-    return $this->timeDeleted;
-  }
-  public function setTimeStorageClassUpdated($timeStorageClassUpdated)
-  {
-    $this->timeStorageClassUpdated = $timeStorageClassUpdated;
-  }
-  public function getTimeStorageClassUpdated()
-  {
-    return $this->timeStorageClassUpdated;
-  }
-  public function setUpdated($updated)
-  {
-    $this->updated = $updated;
-  }
-  public function getUpdated()
-  {
-    return $this->updated;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Storage/StorageObjectCustomerEncryption.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Storage/StorageObjectCustomerEncryption.php
deleted file mode 100644
index 8dc403cc..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Storage/StorageObjectCustomerEncryption.php
+++ /dev/null
@@ -1,39 +0,0 @@
-encryptionAlgorithm = $encryptionAlgorithm;
-  }
-  public function getEncryptionAlgorithm()
-  {
-    return $this->encryptionAlgorithm;
-  }
-  public function setKeySha256($keySha256)
-  {
-    $this->keySha256 = $keySha256;
-  }
-  public function getKeySha256()
-  {
-    return $this->keySha256;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Storage/StorageObjectOwner.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Storage/StorageObjectOwner.php
deleted file mode 100644
index f2bddfab..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Storage/StorageObjectOwner.php
+++ /dev/null
@@ -1,39 +0,0 @@
-entity = $entity;
-  }
-  public function getEntity()
-  {
-    return $this->entity;
-  }
-  public function setEntityId($entityId)
-  {
-    $this->entityId = $entityId;
-  }
-  public function getEntityId()
-  {
-    return $this->entityId;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Storage/TestIamPermissionsResponse.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Storage/TestIamPermissionsResponse.php
deleted file mode 100644
index 54b16af6..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Storage/TestIamPermissionsResponse.php
+++ /dev/null
@@ -1,40 +0,0 @@
-kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setPermissions($permissions)
-  {
-    $this->permissions = $permissions;
-  }
-  public function getPermissions()
-  {
-    return $this->permissions;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Storagetransfer.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Storagetransfer.php
deleted file mode 100644
index 9c16b470..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Storagetransfer.php
+++ /dev/null
@@ -1,233 +0,0 @@
-
- * Transfers data from external data sources to a Google Cloud Storage bucket or
- * between Google Cloud Storage buckets.

- *
- * 

- * For more information about this service, see the API
- * Documentation
- * 

- *
- * @author Google, Inc.
- */
-class Google_Service_Storagetransfer extends Google_Service
-{
-  /** View and manage your data across Google Cloud Platform services. */
-  const CLOUD_PLATFORM =
-      "https://www.googleapis.com/auth/cloud-platform";
-
-  public $googleServiceAccounts;
-  public $transferJobs;
-  public $transferOperations;
-  public $v1;
-  
-  /**
-   * Constructs the internal representation of the Storagetransfer service.
-   *
-   * @param Google_Client $client
-   */
-  public function __construct(Google_Client $client)
-  {
-    parent::__construct($client);
-    $this->rootUrl = 'https://storagetransfer.googleapis.com/';
-    $this->servicePath = '';
-    $this->version = 'v1';
-    $this->serviceName = 'storagetransfer';
-
-    $this->googleServiceAccounts = new Google_Service_Storagetransfer_Resource_GoogleServiceAccounts(
-        $this,
-        $this->serviceName,
-        'googleServiceAccounts',
-        array(
-          'methods' => array(
-            'get' => array(
-              'path' => 'v1/googleServiceAccounts/{projectId}',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'projectId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),
-          )
-        )
-    );
-    $this->transferJobs = new Google_Service_Storagetransfer_Resource_TransferJobs(
-        $this,
-        $this->serviceName,
-        'transferJobs',
-        array(
-          'methods' => array(
-            'create' => array(
-              'path' => 'v1/transferJobs',
-              'httpMethod' => 'POST',
-              'parameters' => array(),
-            ),'get' => array(
-              'path' => 'v1/{+jobName}',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'jobName' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'projectId' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-              ),
-            ),'list' => array(
-              'path' => 'v1/transferJobs',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'filter' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'pageSize' => array(
-                  'location' => 'query',
-                  'type' => 'integer',
-                ),
-                'pageToken' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-              ),
-            ),'patch' => array(
-              'path' => 'v1/{+jobName}',
-              'httpMethod' => 'PATCH',
-              'parameters' => array(
-                'jobName' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),
-          )
-        )
-    );
-    $this->transferOperations = new Google_Service_Storagetransfer_Resource_TransferOperations(
-        $this,
-        $this->serviceName,
-        'transferOperations',
-        array(
-          'methods' => array(
-            'cancel' => array(
-              'path' => 'v1/{+name}:cancel',
-              'httpMethod' => 'POST',
-              'parameters' => array(
-                'name' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'delete' => array(
-              'path' => 'v1/{+name}',
-              'httpMethod' => 'DELETE',
-              'parameters' => array(
-                'name' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'get' => array(
-              'path' => 'v1/{+name}',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'name' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'list' => array(
-              'path' => 'v1/{+name}',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'name' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'filter' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'pageSize' => array(
-                  'location' => 'query',
-                  'type' => 'integer',
-                ),
-                'pageToken' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-              ),
-            ),'pause' => array(
-              'path' => 'v1/{+name}:pause',
-              'httpMethod' => 'POST',
-              'parameters' => array(
-                'name' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'resume' => array(
-              'path' => 'v1/{+name}:resume',
-              'httpMethod' => 'POST',
-              'parameters' => array(
-                'name' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),
-          )
-        )
-    );
-    $this->v1 = new Google_Service_Storagetransfer_Resource_V1(
-        $this,
-        $this->serviceName,
-        'v1',
-        array(
-          'methods' => array(
-            'getGoogleServiceAccount' => array(
-              'path' => 'v1:getGoogleServiceAccount',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'projectId' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-              ),
-            ),
-          )
-        )
-    );
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Storagetransfer/AwsAccessKey.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Storagetransfer/AwsAccessKey.php
deleted file mode 100644
index f04f3abe..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Storagetransfer/AwsAccessKey.php
+++ /dev/null
@@ -1,39 +0,0 @@
-accessKeyId = $accessKeyId;
-  }
-  public function getAccessKeyId()
-  {
-    return $this->accessKeyId;
-  }
-  public function setSecretAccessKey($secretAccessKey)
-  {
-    $this->secretAccessKey = $secretAccessKey;
-  }
-  public function getSecretAccessKey()
-  {
-    return $this->secretAccessKey;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Storagetransfer/AwsS3Data.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Storagetransfer/AwsS3Data.php
deleted file mode 100644
index 8fa56645..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Storagetransfer/AwsS3Data.php
+++ /dev/null
@@ -1,40 +0,0 @@
-awsAccessKey = $awsAccessKey;
-  }
-  public function getAwsAccessKey()
-  {
-    return $this->awsAccessKey;
-  }
-  public function setBucketName($bucketName)
-  {
-    $this->bucketName = $bucketName;
-  }
-  public function getBucketName()
-  {
-    return $this->bucketName;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Storagetransfer/Date.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Storagetransfer/Date.php
deleted file mode 100644
index dd664def..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Storagetransfer/Date.php
+++ /dev/null
@@ -1,48 +0,0 @@
-day = $day;
-  }
-  public function getDay()
-  {
-    return $this->day;
-  }
-  public function setMonth($month)
-  {
-    $this->month = $month;
-  }
-  public function getMonth()
-  {
-    return $this->month;
-  }
-  public function setYear($year)
-  {
-    $this->year = $year;
-  }
-  public function getYear()
-  {
-    return $this->year;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Storagetransfer/ErrorLogEntry.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Storagetransfer/ErrorLogEntry.php
deleted file mode 100644
index ceb040c2..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Storagetransfer/ErrorLogEntry.php
+++ /dev/null
@@ -1,40 +0,0 @@
-errorDetails = $errorDetails;
-  }
-  public function getErrorDetails()
-  {
-    return $this->errorDetails;
-  }
-  public function setUrl($url)
-  {
-    $this->url = $url;
-  }
-  public function getUrl()
-  {
-    return $this->url;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Storagetransfer/ErrorSummary.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Storagetransfer/ErrorSummary.php
deleted file mode 100644
index 2f35fa3e..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Storagetransfer/ErrorSummary.php
+++ /dev/null
@@ -1,50 +0,0 @@
-errorCode = $errorCode;
-  }
-  public function getErrorCode()
-  {
-    return $this->errorCode;
-  }
-  public function setErrorCount($errorCount)
-  {
-    $this->errorCount = $errorCount;
-  }
-  public function getErrorCount()
-  {
-    return $this->errorCount;
-  }
-  public function setErrorLogEntries($errorLogEntries)
-  {
-    $this->errorLogEntries = $errorLogEntries;
-  }
-  public function getErrorLogEntries()
-  {
-    return $this->errorLogEntries;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Storagetransfer/GcsData.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Storagetransfer/GcsData.php
deleted file mode 100644
index 66c336a3..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Storagetransfer/GcsData.php
+++ /dev/null
@@ -1,30 +0,0 @@
-bucketName = $bucketName;
-  }
-  public function getBucketName()
-  {
-    return $this->bucketName;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Storagetransfer/GoogleServiceAccount.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Storagetransfer/GoogleServiceAccount.php
deleted file mode 100644
index 8bd338f4..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Storagetransfer/GoogleServiceAccount.php
+++ /dev/null
@@ -1,30 +0,0 @@
-accountEmail = $accountEmail;
-  }
-  public function getAccountEmail()
-  {
-    return $this->accountEmail;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Storagetransfer/HttpData.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Storagetransfer/HttpData.php
deleted file mode 100644
index 13b56c59..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Storagetransfer/HttpData.php
+++ /dev/null
@@ -1,30 +0,0 @@
-listUrl = $listUrl;
-  }
-  public function getListUrl()
-  {
-    return $this->listUrl;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Storagetransfer/ListOperationsResponse.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Storagetransfer/ListOperationsResponse.php
deleted file mode 100644
index fa0562bc..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Storagetransfer/ListOperationsResponse.php
+++ /dev/null
@@ -1,41 +0,0 @@
-nextPageToken = $nextPageToken;
-  }
-  public function getNextPageToken()
-  {
-    return $this->nextPageToken;
-  }
-  public function setOperations($operations)
-  {
-    $this->operations = $operations;
-  }
-  public function getOperations()
-  {
-    return $this->operations;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Storagetransfer/ListTransferJobsResponse.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Storagetransfer/ListTransferJobsResponse.php
deleted file mode 100644
index 48a95f7b..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Storagetransfer/ListTransferJobsResponse.php
+++ /dev/null
@@ -1,41 +0,0 @@
-nextPageToken = $nextPageToken;
-  }
-  public function getNextPageToken()
-  {
-    return $this->nextPageToken;
-  }
-  public function setTransferJobs($transferJobs)
-  {
-    $this->transferJobs = $transferJobs;
-  }
-  public function getTransferJobs()
-  {
-    return $this->transferJobs;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Storagetransfer/ObjectConditions.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Storagetransfer/ObjectConditions.php
deleted file mode 100644
index 37bee489..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Storagetransfer/ObjectConditions.php
+++ /dev/null
@@ -1,58 +0,0 @@
-excludePrefixes = $excludePrefixes;
-  }
-  public function getExcludePrefixes()
-  {
-    return $this->excludePrefixes;
-  }
-  public function setIncludePrefixes($includePrefixes)
-  {
-    $this->includePrefixes = $includePrefixes;
-  }
-  public function getIncludePrefixes()
-  {
-    return $this->includePrefixes;
-  }
-  public function setMaxTimeElapsedSinceLastModification($maxTimeElapsedSinceLastModification)
-  {
-    $this->maxTimeElapsedSinceLastModification = $maxTimeElapsedSinceLastModification;
-  }
-  public function getMaxTimeElapsedSinceLastModification()
-  {
-    return $this->maxTimeElapsedSinceLastModification;
-  }
-  public function setMinTimeElapsedSinceLastModification($minTimeElapsedSinceLastModification)
-  {
-    $this->minTimeElapsedSinceLastModification = $minTimeElapsedSinceLastModification;
-  }
-  public function getMinTimeElapsedSinceLastModification()
-  {
-    return $this->minTimeElapsedSinceLastModification;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Storagetransfer/Operation.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Storagetransfer/Operation.php
deleted file mode 100644
index f80fb2a3..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Storagetransfer/Operation.php
+++ /dev/null
@@ -1,67 +0,0 @@
-done = $done;
-  }
-  public function getDone()
-  {
-    return $this->done;
-  }
-  public function setError(Google_Service_Storagetransfer_Status $error)
-  {
-    $this->error = $error;
-  }
-  public function getError()
-  {
-    return $this->error;
-  }
-  public function setMetadata($metadata)
-  {
-    $this->metadata = $metadata;
-  }
-  public function getMetadata()
-  {
-    return $this->metadata;
-  }
-  public function setName($name)
-  {
-    $this->name = $name;
-  }
-  public function getName()
-  {
-    return $this->name;
-  }
-  public function setResponse($response)
-  {
-    $this->response = $response;
-  }
-  public function getResponse()
-  {
-    return $this->response;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Storagetransfer/PauseTransferOperationRequest.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Storagetransfer/PauseTransferOperationRequest.php
deleted file mode 100644
index f466122e..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Storagetransfer/PauseTransferOperationRequest.php
+++ /dev/null
@@ -1,20 +0,0 @@
-
- *   $storagetransferService = new Google_Service_Storagetransfer(...);
- *   $googleServiceAccounts = $storagetransferService->googleServiceAccounts;
- *  
- */
-class Google_Service_Storagetransfer_Resource_GoogleServiceAccounts extends Google_Service_Resource
-{
-  /**
-   * Returns the Google service account that is used by Storage Transfer Service
-   * to access buckets in the project where transfers run or in other projects.
-   * Each Google service account is associated with one Google Developers Console
-   * project. Users should add this service account to the Google Cloud Storage
-   * bucket ACLs to grant access to Storage Transfer Service. This service account
-   * is created and owned by Storage Transfer Service and can only be used by
-   * Storage Transfer Service. (googleServiceAccounts.get)
-   *
-   * @param string $projectId The ID of the Google Developers Console project that
-   * the Google service account is associated with. Required.
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Storagetransfer_GoogleServiceAccount
-   */
-  public function get($projectId, $optParams = array())
-  {
-    $params = array('projectId' => $projectId);
-    $params = array_merge($params, $optParams);
-    return $this->call('get', array($params), "Google_Service_Storagetransfer_GoogleServiceAccount");
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Storagetransfer/Resource/TransferJobs.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Storagetransfer/Resource/TransferJobs.php
deleted file mode 100644
index 6e910a4a..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Storagetransfer/Resource/TransferJobs.php
+++ /dev/null
@@ -1,96 +0,0 @@
-
- *   $storagetransferService = new Google_Service_Storagetransfer(...);
- *   $transferJobs = $storagetransferService->transferJobs;
- *  
- */
-class Google_Service_Storagetransfer_Resource_TransferJobs extends Google_Service_Resource
-{
-  /**
-   * Creates a transfer job that runs periodically. (transferJobs.create)
-   *
-   * @param Google_Service_Storagetransfer_TransferJob $postBody
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Storagetransfer_TransferJob
-   */
-  public function create(Google_Service_Storagetransfer_TransferJob $postBody, $optParams = array())
-  {
-    $params = array('postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('create', array($params), "Google_Service_Storagetransfer_TransferJob");
-  }
-  /**
-   * Gets a transfer job. (transferJobs.get)
-   *
-   * @param string $jobName The job to get. Required.
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param string projectId The ID of the Google Developers Console project
-   * that owns the job. Required.
-   * @return Google_Service_Storagetransfer_TransferJob
-   */
-  public function get($jobName, $optParams = array())
-  {
-    $params = array('jobName' => $jobName);
-    $params = array_merge($params, $optParams);
-    return $this->call('get', array($params), "Google_Service_Storagetransfer_TransferJob");
-  }
-  /**
-   * Lists transfer jobs. (transferJobs.listTransferJobs)
-   *
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param string filter A list of query parameters specified as JSON text in
-   * the form of {"`project_id`":"my_project_id",
-   * "`job_names`":["jobid1","jobid2",...],
-   * "`job_statuses`":["status1","status2",...]}. Since `job_names` and
-   * `job_statuses` support multiple values, their values must be specified with
-   * array notation. `project_id` is required. `job_names` and `job_statuses` are
-   * optional. The valid values for `job_statuses` are case-insensitive:
-   * `ENABLED`, `DISABLED`, and `DELETED`.
-   * @opt_param int pageSize The list page size. The max allowed value is 256.
-   * @opt_param string pageToken The list page token.
-   * @return Google_Service_Storagetransfer_ListTransferJobsResponse
-   */
-  public function listTransferJobs($optParams = array())
-  {
-    $params = array();
-    $params = array_merge($params, $optParams);
-    return $this->call('list', array($params), "Google_Service_Storagetransfer_ListTransferJobsResponse");
-  }
-  /**
-   * Updates a transfer job. Updating a job's transfer spec does not affect
-   * transfer operations that are running already. Updating the scheduling of a
-   * job is not allowed. (transferJobs.patch)
-   *
-   * @param string $jobName The name of job to update. Required.
-   * @param Google_Service_Storagetransfer_UpdateTransferJobRequest $postBody
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Storagetransfer_TransferJob
-   */
-  public function patch($jobName, Google_Service_Storagetransfer_UpdateTransferJobRequest $postBody, $optParams = array())
-  {
-    $params = array('jobName' => $jobName, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('patch', array($params), "Google_Service_Storagetransfer_TransferJob");
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Storagetransfer/Resource/TransferOperations.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Storagetransfer/Resource/TransferOperations.php
deleted file mode 100644
index f1c9cfbd..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Storagetransfer/Resource/TransferOperations.php
+++ /dev/null
@@ -1,121 +0,0 @@
-
- *   $storagetransferService = new Google_Service_Storagetransfer(...);
- *   $transferOperations = $storagetransferService->transferOperations;
- *  
- */
-class Google_Service_Storagetransfer_Resource_TransferOperations extends Google_Service_Resource
-{
-  /**
-   * Cancels a transfer. Use the get method to check whether the cancellation
-   * succeeded or whether the operation completed despite cancellation.
-   * (transferOperations.cancel)
-   *
-   * @param string $name The name of the operation resource to be cancelled.
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Storagetransfer_StoragetransferEmpty
-   */
-  public function cancel($name, $optParams = array())
-  {
-    $params = array('name' => $name);
-    $params = array_merge($params, $optParams);
-    return $this->call('cancel', array($params), "Google_Service_Storagetransfer_StoragetransferEmpty");
-  }
-  /**
-   * This method is not supported and the server returns `UNIMPLEMENTED`.
-   * (transferOperations.delete)
-   *
-   * @param string $name The name of the operation resource to be deleted.
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Storagetransfer_StoragetransferEmpty
-   */
-  public function delete($name, $optParams = array())
-  {
-    $params = array('name' => $name);
-    $params = array_merge($params, $optParams);
-    return $this->call('delete', array($params), "Google_Service_Storagetransfer_StoragetransferEmpty");
-  }
-  /**
-   * Gets the latest state of a long-running operation. Clients can use this
-   * method to poll the operation result at intervals as recommended by the API
-   * service. (transferOperations.get)
-   *
-   * @param string $name The name of the operation resource.
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Storagetransfer_Operation
-   */
-  public function get($name, $optParams = array())
-  {
-    $params = array('name' => $name);
-    $params = array_merge($params, $optParams);
-    return $this->call('get', array($params), "Google_Service_Storagetransfer_Operation");
-  }
-  /**
-   * Lists operations that match the specified filter in the request. If the
-   * server doesn't support this method, it returns `UNIMPLEMENTED`. NOTE: the
-   * `name` binding below allows API services to override the binding to use
-   * different resource name schemes, such as `users/operations`.
-   * (transferOperations.listTransferOperations)
-   *
-   * @param string $name The value `transferOperations`.
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param string filter The standard list filter.
-   * @opt_param int pageSize The standard list page size.
-   * @opt_param string pageToken The standard list page token.
-   * @return Google_Service_Storagetransfer_ListOperationsResponse
-   */
-  public function listTransferOperations($name, $optParams = array())
-  {
-    $params = array('name' => $name);
-    $params = array_merge($params, $optParams);
-    return $this->call('list', array($params), "Google_Service_Storagetransfer_ListOperationsResponse");
-  }
-  /**
-   * Pauses a transfer operation. (transferOperations.pause)
-   *
-   * @param string $name The name of the transfer operation. Required.
-   * @param Google_Service_Storagetransfer_PauseTransferOperationRequest $postBody
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Storagetransfer_StoragetransferEmpty
-   */
-  public function pause($name, Google_Service_Storagetransfer_PauseTransferOperationRequest $postBody, $optParams = array())
-  {
-    $params = array('name' => $name, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('pause', array($params), "Google_Service_Storagetransfer_StoragetransferEmpty");
-  }
-  /**
-   * Resumes a transfer operation that is paused. (transferOperations.resume)
-   *
-   * @param string $name The name of the transfer operation. Required.
-   * @param Google_Service_Storagetransfer_ResumeTransferOperationRequest $postBody
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Storagetransfer_StoragetransferEmpty
-   */
-  public function resume($name, Google_Service_Storagetransfer_ResumeTransferOperationRequest $postBody, $optParams = array())
-  {
-    $params = array('name' => $name, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('resume', array($params), "Google_Service_Storagetransfer_StoragetransferEmpty");
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Storagetransfer/Resource/V1.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Storagetransfer/Resource/V1.php
deleted file mode 100644
index 9e9a7106..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Storagetransfer/Resource/V1.php
+++ /dev/null
@@ -1,49 +0,0 @@
-
- *   $storagetransferService = new Google_Service_Storagetransfer(...);
- *   $v1 = $storagetransferService->v1;
- *  
- */
-class Google_Service_Storagetransfer_Resource_V1 extends Google_Service_Resource
-{
-  /**
-   * Returns the Google service account that is used by Storage Transfer Service
-   * to access buckets in the project where transfers run or in other projects.
-   * Each Google service account is associated with one Google Developers Console
-   * project. Users should add this service account to the Google Cloud Storage
-   * bucket ACLs to grant access to Storage Transfer Service. This service account
-   * is created and owned by Storage Transfer Service and can only be used by
-   * Storage Transfer Service. (v1.getGoogleServiceAccount)
-   *
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param string projectId The ID of the Google Developers Console project
-   * that the Google service account is associated with. Required.
-   * @return Google_Service_Storagetransfer_GoogleServiceAccount
-   */
-  public function getGoogleServiceAccount($optParams = array())
-  {
-    $params = array();
-    $params = array_merge($params, $optParams);
-    return $this->call('getGoogleServiceAccount', array($params), "Google_Service_Storagetransfer_GoogleServiceAccount");
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Storagetransfer/ResumeTransferOperationRequest.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Storagetransfer/ResumeTransferOperationRequest.php
deleted file mode 100644
index 517b12bf..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Storagetransfer/ResumeTransferOperationRequest.php
+++ /dev/null
@@ -1,20 +0,0 @@
-scheduleEndDate = $scheduleEndDate;
-  }
-  public function getScheduleEndDate()
-  {
-    return $this->scheduleEndDate;
-  }
-  public function setScheduleStartDate(Google_Service_Storagetransfer_Date $scheduleStartDate)
-  {
-    $this->scheduleStartDate = $scheduleStartDate;
-  }
-  public function getScheduleStartDate()
-  {
-    return $this->scheduleStartDate;
-  }
-  public function setStartTimeOfDay(Google_Service_Storagetransfer_TimeOfDay $startTimeOfDay)
-  {
-    $this->startTimeOfDay = $startTimeOfDay;
-  }
-  public function getStartTimeOfDay()
-  {
-    return $this->startTimeOfDay;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Storagetransfer/Status.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Storagetransfer/Status.php
deleted file mode 100644
index fd4e4ba4..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Storagetransfer/Status.php
+++ /dev/null
@@ -1,49 +0,0 @@
-code = $code;
-  }
-  public function getCode()
-  {
-    return $this->code;
-  }
-  public function setDetails($details)
-  {
-    $this->details = $details;
-  }
-  public function getDetails()
-  {
-    return $this->details;
-  }
-  public function setMessage($message)
-  {
-    $this->message = $message;
-  }
-  public function getMessage()
-  {
-    return $this->message;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Storagetransfer/StoragetransferEmpty.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Storagetransfer/StoragetransferEmpty.php
deleted file mode 100644
index f69378d3..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Storagetransfer/StoragetransferEmpty.php
+++ /dev/null
@@ -1,20 +0,0 @@
-hours = $hours;
-  }
-  public function getHours()
-  {
-    return $this->hours;
-  }
-  public function setMinutes($minutes)
-  {
-    $this->minutes = $minutes;
-  }
-  public function getMinutes()
-  {
-    return $this->minutes;
-  }
-  public function setNanos($nanos)
-  {
-    $this->nanos = $nanos;
-  }
-  public function getNanos()
-  {
-    return $this->nanos;
-  }
-  public function setSeconds($seconds)
-  {
-    $this->seconds = $seconds;
-  }
-  public function getSeconds()
-  {
-    return $this->seconds;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Storagetransfer/TransferCounters.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Storagetransfer/TransferCounters.php
deleted file mode 100644
index a948b81b..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Storagetransfer/TransferCounters.php
+++ /dev/null
@@ -1,165 +0,0 @@
-bytesCopiedToSink = $bytesCopiedToSink;
-  }
-  public function getBytesCopiedToSink()
-  {
-    return $this->bytesCopiedToSink;
-  }
-  public function setBytesDeletedFromSink($bytesDeletedFromSink)
-  {
-    $this->bytesDeletedFromSink = $bytesDeletedFromSink;
-  }
-  public function getBytesDeletedFromSink()
-  {
-    return $this->bytesDeletedFromSink;
-  }
-  public function setBytesDeletedFromSource($bytesDeletedFromSource)
-  {
-    $this->bytesDeletedFromSource = $bytesDeletedFromSource;
-  }
-  public function getBytesDeletedFromSource()
-  {
-    return $this->bytesDeletedFromSource;
-  }
-  public function setBytesFailedToDeleteFromSink($bytesFailedToDeleteFromSink)
-  {
-    $this->bytesFailedToDeleteFromSink = $bytesFailedToDeleteFromSink;
-  }
-  public function getBytesFailedToDeleteFromSink()
-  {
-    return $this->bytesFailedToDeleteFromSink;
-  }
-  public function setBytesFoundFromSource($bytesFoundFromSource)
-  {
-    $this->bytesFoundFromSource = $bytesFoundFromSource;
-  }
-  public function getBytesFoundFromSource()
-  {
-    return $this->bytesFoundFromSource;
-  }
-  public function setBytesFoundOnlyFromSink($bytesFoundOnlyFromSink)
-  {
-    $this->bytesFoundOnlyFromSink = $bytesFoundOnlyFromSink;
-  }
-  public function getBytesFoundOnlyFromSink()
-  {
-    return $this->bytesFoundOnlyFromSink;
-  }
-  public function setBytesFromSourceFailed($bytesFromSourceFailed)
-  {
-    $this->bytesFromSourceFailed = $bytesFromSourceFailed;
-  }
-  public function getBytesFromSourceFailed()
-  {
-    return $this->bytesFromSourceFailed;
-  }
-  public function setBytesFromSourceSkippedBySync($bytesFromSourceSkippedBySync)
-  {
-    $this->bytesFromSourceSkippedBySync = $bytesFromSourceSkippedBySync;
-  }
-  public function getBytesFromSourceSkippedBySync()
-  {
-    return $this->bytesFromSourceSkippedBySync;
-  }
-  public function setObjectsCopiedToSink($objectsCopiedToSink)
-  {
-    $this->objectsCopiedToSink = $objectsCopiedToSink;
-  }
-  public function getObjectsCopiedToSink()
-  {
-    return $this->objectsCopiedToSink;
-  }
-  public function setObjectsDeletedFromSink($objectsDeletedFromSink)
-  {
-    $this->objectsDeletedFromSink = $objectsDeletedFromSink;
-  }
-  public function getObjectsDeletedFromSink()
-  {
-    return $this->objectsDeletedFromSink;
-  }
-  public function setObjectsDeletedFromSource($objectsDeletedFromSource)
-  {
-    $this->objectsDeletedFromSource = $objectsDeletedFromSource;
-  }
-  public function getObjectsDeletedFromSource()
-  {
-    return $this->objectsDeletedFromSource;
-  }
-  public function setObjectsFailedToDeleteFromSink($objectsFailedToDeleteFromSink)
-  {
-    $this->objectsFailedToDeleteFromSink = $objectsFailedToDeleteFromSink;
-  }
-  public function getObjectsFailedToDeleteFromSink()
-  {
-    return $this->objectsFailedToDeleteFromSink;
-  }
-  public function setObjectsFoundFromSource($objectsFoundFromSource)
-  {
-    $this->objectsFoundFromSource = $objectsFoundFromSource;
-  }
-  public function getObjectsFoundFromSource()
-  {
-    return $this->objectsFoundFromSource;
-  }
-  public function setObjectsFoundOnlyFromSink($objectsFoundOnlyFromSink)
-  {
-    $this->objectsFoundOnlyFromSink = $objectsFoundOnlyFromSink;
-  }
-  public function getObjectsFoundOnlyFromSink()
-  {
-    return $this->objectsFoundOnlyFromSink;
-  }
-  public function setObjectsFromSourceFailed($objectsFromSourceFailed)
-  {
-    $this->objectsFromSourceFailed = $objectsFromSourceFailed;
-  }
-  public function getObjectsFromSourceFailed()
-  {
-    return $this->objectsFromSourceFailed;
-  }
-  public function setObjectsFromSourceSkippedBySync($objectsFromSourceSkippedBySync)
-  {
-    $this->objectsFromSourceSkippedBySync = $objectsFromSourceSkippedBySync;
-  }
-  public function getObjectsFromSourceSkippedBySync()
-  {
-    return $this->objectsFromSourceSkippedBySync;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Storagetransfer/TransferJob.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Storagetransfer/TransferJob.php
deleted file mode 100644
index e362fe93..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Storagetransfer/TransferJob.php
+++ /dev/null
@@ -1,104 +0,0 @@
-creationTime = $creationTime;
-  }
-  public function getCreationTime()
-  {
-    return $this->creationTime;
-  }
-  public function setDeletionTime($deletionTime)
-  {
-    $this->deletionTime = $deletionTime;
-  }
-  public function getDeletionTime()
-  {
-    return $this->deletionTime;
-  }
-  public function setDescription($description)
-  {
-    $this->description = $description;
-  }
-  public function getDescription()
-  {
-    return $this->description;
-  }
-  public function setLastModificationTime($lastModificationTime)
-  {
-    $this->lastModificationTime = $lastModificationTime;
-  }
-  public function getLastModificationTime()
-  {
-    return $this->lastModificationTime;
-  }
-  public function setName($name)
-  {
-    $this->name = $name;
-  }
-  public function getName()
-  {
-    return $this->name;
-  }
-  public function setProjectId($projectId)
-  {
-    $this->projectId = $projectId;
-  }
-  public function getProjectId()
-  {
-    return $this->projectId;
-  }
-  public function setSchedule(Google_Service_Storagetransfer_Schedule $schedule)
-  {
-    $this->schedule = $schedule;
-  }
-  public function getSchedule()
-  {
-    return $this->schedule;
-  }
-  public function setStatus($status)
-  {
-    $this->status = $status;
-  }
-  public function getStatus()
-  {
-    return $this->status;
-  }
-  public function setTransferSpec(Google_Service_Storagetransfer_TransferSpec $transferSpec)
-  {
-    $this->transferSpec = $transferSpec;
-  }
-  public function getTransferSpec()
-  {
-    return $this->transferSpec;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Storagetransfer/TransferOperation.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Storagetransfer/TransferOperation.php
deleted file mode 100644
index 7a93c26b..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Storagetransfer/TransferOperation.php
+++ /dev/null
@@ -1,106 +0,0 @@
-counters = $counters;
-  }
-  public function getCounters()
-  {
-    return $this->counters;
-  }
-  public function setEndTime($endTime)
-  {
-    $this->endTime = $endTime;
-  }
-  public function getEndTime()
-  {
-    return $this->endTime;
-  }
-  public function setErrorBreakdowns($errorBreakdowns)
-  {
-    $this->errorBreakdowns = $errorBreakdowns;
-  }
-  public function getErrorBreakdowns()
-  {
-    return $this->errorBreakdowns;
-  }
-  public function setName($name)
-  {
-    $this->name = $name;
-  }
-  public function getName()
-  {
-    return $this->name;
-  }
-  public function setProjectId($projectId)
-  {
-    $this->projectId = $projectId;
-  }
-  public function getProjectId()
-  {
-    return $this->projectId;
-  }
-  public function setStartTime($startTime)
-  {
-    $this->startTime = $startTime;
-  }
-  public function getStartTime()
-  {
-    return $this->startTime;
-  }
-  public function setStatus($status)
-  {
-    $this->status = $status;
-  }
-  public function getStatus()
-  {
-    return $this->status;
-  }
-  public function setTransferJobName($transferJobName)
-  {
-    $this->transferJobName = $transferJobName;
-  }
-  public function getTransferJobName()
-  {
-    return $this->transferJobName;
-  }
-  public function setTransferSpec(Google_Service_Storagetransfer_TransferSpec $transferSpec)
-  {
-    $this->transferSpec = $transferSpec;
-  }
-  public function getTransferSpec()
-  {
-    return $this->transferSpec;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Storagetransfer/TransferOptions.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Storagetransfer/TransferOptions.php
deleted file mode 100644
index da15ff71..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Storagetransfer/TransferOptions.php
+++ /dev/null
@@ -1,48 +0,0 @@
-deleteObjectsFromSourceAfterTransfer = $deleteObjectsFromSourceAfterTransfer;
-  }
-  public function getDeleteObjectsFromSourceAfterTransfer()
-  {
-    return $this->deleteObjectsFromSourceAfterTransfer;
-  }
-  public function setDeleteObjectsUniqueInSink($deleteObjectsUniqueInSink)
-  {
-    $this->deleteObjectsUniqueInSink = $deleteObjectsUniqueInSink;
-  }
-  public function getDeleteObjectsUniqueInSink()
-  {
-    return $this->deleteObjectsUniqueInSink;
-  }
-  public function setOverwriteObjectsAlreadyExistingInSink($overwriteObjectsAlreadyExistingInSink)
-  {
-    $this->overwriteObjectsAlreadyExistingInSink = $overwriteObjectsAlreadyExistingInSink;
-  }
-  public function getOverwriteObjectsAlreadyExistingInSink()
-  {
-    return $this->overwriteObjectsAlreadyExistingInSink;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Storagetransfer/TransferSpec.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Storagetransfer/TransferSpec.php
deleted file mode 100644
index 1d9ea626..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Storagetransfer/TransferSpec.php
+++ /dev/null
@@ -1,81 +0,0 @@
-awsS3DataSource = $awsS3DataSource;
-  }
-  public function getAwsS3DataSource()
-  {
-    return $this->awsS3DataSource;
-  }
-  public function setGcsDataSink(Google_Service_Storagetransfer_GcsData $gcsDataSink)
-  {
-    $this->gcsDataSink = $gcsDataSink;
-  }
-  public function getGcsDataSink()
-  {
-    return $this->gcsDataSink;
-  }
-  public function setGcsDataSource(Google_Service_Storagetransfer_GcsData $gcsDataSource)
-  {
-    $this->gcsDataSource = $gcsDataSource;
-  }
-  public function getGcsDataSource()
-  {
-    return $this->gcsDataSource;
-  }
-  public function setHttpDataSource(Google_Service_Storagetransfer_HttpData $httpDataSource)
-  {
-    $this->httpDataSource = $httpDataSource;
-  }
-  public function getHttpDataSource()
-  {
-    return $this->httpDataSource;
-  }
-  public function setObjectConditions(Google_Service_Storagetransfer_ObjectConditions $objectConditions)
-  {
-    $this->objectConditions = $objectConditions;
-  }
-  public function getObjectConditions()
-  {
-    return $this->objectConditions;
-  }
-  public function setTransferOptions(Google_Service_Storagetransfer_TransferOptions $transferOptions)
-  {
-    $this->transferOptions = $transferOptions;
-  }
-  public function getTransferOptions()
-  {
-    return $this->transferOptions;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Storagetransfer/UpdateTransferJobRequest.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Storagetransfer/UpdateTransferJobRequest.php
deleted file mode 100644
index 335e299d..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Storagetransfer/UpdateTransferJobRequest.php
+++ /dev/null
@@ -1,49 +0,0 @@
-projectId = $projectId;
-  }
-  public function getProjectId()
-  {
-    return $this->projectId;
-  }
-  public function setTransferJob(Google_Service_Storagetransfer_TransferJob $transferJob)
-  {
-    $this->transferJob = $transferJob;
-  }
-  public function getTransferJob()
-  {
-    return $this->transferJob;
-  }
-  public function setUpdateTransferJobFieldMask($updateTransferJobFieldMask)
-  {
-    $this->updateTransferJobFieldMask = $updateTransferJobFieldMask;
-  }
-  public function getUpdateTransferJobFieldMask()
-  {
-    return $this->updateTransferJobFieldMask;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Surveys.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Surveys.php
deleted file mode 100644
index 330337be..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Surveys.php
+++ /dev/null
@@ -1,210 +0,0 @@
-
- * Creates and conducts surveys, lists the surveys that an authenticated user
- * owns, and retrieves survey results and information about specified surveys.

- *
- * 

- * For more information about this service, see the API
- * Documentation
- * 

- *
- * @author Google, Inc.
- */
-class Google_Service_Surveys extends Google_Service
-{
-  /** View and manage your surveys and results. */
-  const SURVEYS =
-      "https://www.googleapis.com/auth/surveys";
-  /** View your surveys and survey results. */
-  const SURVEYS_READONLY =
-      "https://www.googleapis.com/auth/surveys.readonly";
-  /** View your email address. */
-  const USERINFO_EMAIL =
-      "https://www.googleapis.com/auth/userinfo.email";
-
-  public $mobileapppanels;
-  public $results;
-  public $surveys;
-  
-  /**
-   * Constructs the internal representation of the Surveys service.
-   *
-   * @param Google_Client $client
-   */
-  public function __construct(Google_Client $client)
-  {
-    parent::__construct($client);
-    $this->rootUrl = 'https://www.googleapis.com/';
-    $this->servicePath = 'surveys/v2/';
-    $this->version = 'v2';
-    $this->serviceName = 'surveys';
-
-    $this->mobileapppanels = new Google_Service_Surveys_Resource_Mobileapppanels(
-        $this,
-        $this->serviceName,
-        'mobileapppanels',
-        array(
-          'methods' => array(
-            'get' => array(
-              'path' => 'mobileAppPanels/{panelId}',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'panelId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'list' => array(
-              'path' => 'mobileAppPanels',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'maxResults' => array(
-                  'location' => 'query',
-                  'type' => 'integer',
-                ),
-                'startIndex' => array(
-                  'location' => 'query',
-                  'type' => 'integer',
-                ),
-                'token' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-              ),
-            ),'update' => array(
-              'path' => 'mobileAppPanels/{panelId}',
-              'httpMethod' => 'PUT',
-              'parameters' => array(
-                'panelId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),
-          )
-        )
-    );
-    $this->results = new Google_Service_Surveys_Resource_Results(
-        $this,
-        $this->serviceName,
-        'results',
-        array(
-          'methods' => array(
-            'get' => array(
-              'path' => 'surveys/{surveyUrlId}/results',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'surveyUrlId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),
-          )
-        )
-    );
-    $this->surveys = new Google_Service_Surveys_Resource_Surveys(
-        $this,
-        $this->serviceName,
-        'surveys',
-        array(
-          'methods' => array(
-            'delete' => array(
-              'path' => 'surveys/{surveyUrlId}',
-              'httpMethod' => 'DELETE',
-              'parameters' => array(
-                'surveyUrlId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'get' => array(
-              'path' => 'surveys/{surveyUrlId}',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'surveyUrlId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'insert' => array(
-              'path' => 'surveys',
-              'httpMethod' => 'POST',
-              'parameters' => array(),
-            ),'list' => array(
-              'path' => 'surveys',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'maxResults' => array(
-                  'location' => 'query',
-                  'type' => 'integer',
-                ),
-                'startIndex' => array(
-                  'location' => 'query',
-                  'type' => 'integer',
-                ),
-                'token' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-              ),
-            ),'start' => array(
-              'path' => 'surveys/{resourceId}/start',
-              'httpMethod' => 'POST',
-              'parameters' => array(
-                'resourceId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'stop' => array(
-              'path' => 'surveys/{resourceId}/stop',
-              'httpMethod' => 'POST',
-              'parameters' => array(
-                'resourceId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'update' => array(
-              'path' => 'surveys/{surveyUrlId}',
-              'httpMethod' => 'PUT',
-              'parameters' => array(
-                'surveyUrlId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),
-          )
-        )
-    );
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Surveys/FieldMask.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Surveys/FieldMask.php
deleted file mode 100644
index 76062663..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Surveys/FieldMask.php
+++ /dev/null
@@ -1,41 +0,0 @@
-fields = $fields;
-  }
-  public function getFields()
-  {
-    return $this->fields;
-  }
-  public function setId($id)
-  {
-    $this->id = $id;
-  }
-  public function getId()
-  {
-    return $this->id;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Surveys/MobileAppPanel.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Surveys/MobileAppPanel.php
deleted file mode 100644
index a85b1ed7..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Surveys/MobileAppPanel.php
+++ /dev/null
@@ -1,76 +0,0 @@
-country = $country;
-  }
-  public function getCountry()
-  {
-    return $this->country;
-  }
-  public function setIsPublicPanel($isPublicPanel)
-  {
-    $this->isPublicPanel = $isPublicPanel;
-  }
-  public function getIsPublicPanel()
-  {
-    return $this->isPublicPanel;
-  }
-  public function setLanguage($language)
-  {
-    $this->language = $language;
-  }
-  public function getLanguage()
-  {
-    return $this->language;
-  }
-  public function setMobileAppPanelId($mobileAppPanelId)
-  {
-    $this->mobileAppPanelId = $mobileAppPanelId;
-  }
-  public function getMobileAppPanelId()
-  {
-    return $this->mobileAppPanelId;
-  }
-  public function setName($name)
-  {
-    $this->name = $name;
-  }
-  public function getName()
-  {
-    return $this->name;
-  }
-  public function setOwners($owners)
-  {
-    $this->owners = $owners;
-  }
-  public function getOwners()
-  {
-    return $this->owners;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Surveys/MobileAppPanelsListResponse.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Surveys/MobileAppPanelsListResponse.php
deleted file mode 100644
index 942bf858..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Surveys/MobileAppPanelsListResponse.php
+++ /dev/null
@@ -1,61 +0,0 @@
-pageInfo = $pageInfo;
-  }
-  public function getPageInfo()
-  {
-    return $this->pageInfo;
-  }
-  public function setRequestId($requestId)
-  {
-    $this->requestId = $requestId;
-  }
-  public function getRequestId()
-  {
-    return $this->requestId;
-  }
-  public function setResources($resources)
-  {
-    $this->resources = $resources;
-  }
-  public function getResources()
-  {
-    return $this->resources;
-  }
-  public function setTokenPagination(Google_Service_Surveys_TokenPagination $tokenPagination)
-  {
-    $this->tokenPagination = $tokenPagination;
-  }
-  public function getTokenPagination()
-  {
-    return $this->tokenPagination;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Surveys/PageInfo.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Surveys/PageInfo.php
deleted file mode 100644
index bd07806c..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Surveys/PageInfo.php
+++ /dev/null
@@ -1,48 +0,0 @@
-resultPerPage = $resultPerPage;
-  }
-  public function getResultPerPage()
-  {
-    return $this->resultPerPage;
-  }
-  public function setStartIndex($startIndex)
-  {
-    $this->startIndex = $startIndex;
-  }
-  public function getStartIndex()
-  {
-    return $this->startIndex;
-  }
-  public function setTotalResults($totalResults)
-  {
-    $this->totalResults = $totalResults;
-  }
-  public function getTotalResults()
-  {
-    return $this->totalResults;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Surveys/Resource/Mobileapppanels.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Surveys/Resource/Mobileapppanels.php
deleted file mode 100644
index 6e3265d9..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Surveys/Resource/Mobileapppanels.php
+++ /dev/null
@@ -1,74 +0,0 @@
-
- *   $surveysService = new Google_Service_Surveys(...);
- *   $mobileapppanels = $surveysService->mobileapppanels;
- *  
- */
-class Google_Service_Surveys_Resource_Mobileapppanels extends Google_Service_Resource
-{
-  /**
-   * Retrieves a MobileAppPanel that is available to the authenticated user.
-   * (mobileapppanels.get)
-   *
-   * @param string $panelId External URL ID for the panel.
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Surveys_MobileAppPanel
-   */
-  public function get($panelId, $optParams = array())
-  {
-    $params = array('panelId' => $panelId);
-    $params = array_merge($params, $optParams);
-    return $this->call('get', array($params), "Google_Service_Surveys_MobileAppPanel");
-  }
-  /**
-   * Lists the MobileAppPanels available to the authenticated user.
-   * (mobileapppanels.listMobileapppanels)
-   *
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param string maxResults
-   * @opt_param string startIndex
-   * @opt_param string token
-   * @return Google_Service_Surveys_MobileAppPanelsListResponse
-   */
-  public function listMobileapppanels($optParams = array())
-  {
-    $params = array();
-    $params = array_merge($params, $optParams);
-    return $this->call('list', array($params), "Google_Service_Surveys_MobileAppPanelsListResponse");
-  }
-  /**
-   * Updates a MobileAppPanel. Currently the only property that can be updated is
-   * the owners property. (mobileapppanels.update)
-   *
-   * @param string $panelId External URL ID for the panel.
-   * @param Google_Service_Surveys_MobileAppPanel $postBody
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Surveys_MobileAppPanel
-   */
-  public function update($panelId, Google_Service_Surveys_MobileAppPanel $postBody, $optParams = array())
-  {
-    $params = array('panelId' => $panelId, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('update', array($params), "Google_Service_Surveys_MobileAppPanel");
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Surveys/Resource/Results.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Surveys/Resource/Results.php
deleted file mode 100644
index ec6346dd..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Surveys/Resource/Results.php
+++ /dev/null
@@ -1,43 +0,0 @@
-
- *   $surveysService = new Google_Service_Surveys(...);
- *   $results = $surveysService->results;
- *  
- */
-class Google_Service_Surveys_Resource_Results extends Google_Service_Resource
-{
-  /**
-   * Retrieves any survey results that have been produced so far. Results are
-   * formatted as an Excel file. You must add "?alt=media" to the URL as an
-   * argument to get results. (results.get)
-   *
-   * @param string $surveyUrlId External URL ID for the survey.
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Surveys_SurveyResults
-   */
-  public function get($surveyUrlId, $optParams = array())
-  {
-    $params = array('surveyUrlId' => $surveyUrlId);
-    $params = array_merge($params, $optParams);
-    return $this->call('get', array($params), "Google_Service_Surveys_SurveyResults");
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Surveys/Resource/Surveys.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Surveys/Resource/Surveys.php
deleted file mode 100644
index 86765b01..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Surveys/Resource/Surveys.php
+++ /dev/null
@@ -1,125 +0,0 @@
-
- *   $surveysService = new Google_Service_Surveys(...);
- *   $surveys = $surveysService->surveys;
- *  
- */
-class Google_Service_Surveys_Resource_Surveys extends Google_Service_Resource
-{
-  /**
-   * Removes a survey from view in all user GET requests. (surveys.delete)
-   *
-   * @param string $surveyUrlId External URL ID for the survey.
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Surveys_SurveysDeleteResponse
-   */
-  public function delete($surveyUrlId, $optParams = array())
-  {
-    $params = array('surveyUrlId' => $surveyUrlId);
-    $params = array_merge($params, $optParams);
-    return $this->call('delete', array($params), "Google_Service_Surveys_SurveysDeleteResponse");
-  }
-  /**
-   * Retrieves information about the specified survey. (surveys.get)
-   *
-   * @param string $surveyUrlId External URL ID for the survey.
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Surveys_Survey
-   */
-  public function get($surveyUrlId, $optParams = array())
-  {
-    $params = array('surveyUrlId' => $surveyUrlId);
-    $params = array_merge($params, $optParams);
-    return $this->call('get', array($params), "Google_Service_Surveys_Survey");
-  }
-  /**
-   * Creates a survey. (surveys.insert)
-   *
-   * @param Google_Service_Surveys_Survey $postBody
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Surveys_Survey
-   */
-  public function insert(Google_Service_Surveys_Survey $postBody, $optParams = array())
-  {
-    $params = array('postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('insert', array($params), "Google_Service_Surveys_Survey");
-  }
-  /**
-   * Lists the surveys owned by the authenticated user. (surveys.listSurveys)
-   *
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param string maxResults
-   * @opt_param string startIndex
-   * @opt_param string token
-   * @return Google_Service_Surveys_SurveysListResponse
-   */
-  public function listSurveys($optParams = array())
-  {
-    $params = array();
-    $params = array_merge($params, $optParams);
-    return $this->call('list', array($params), "Google_Service_Surveys_SurveysListResponse");
-  }
-  /**
-   * Begins running a survey. (surveys.start)
-   *
-   * @param string $resourceId
-   * @param Google_Service_Surveys_SurveysStartRequest $postBody
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Surveys_SurveysStartResponse
-   */
-  public function start($resourceId, Google_Service_Surveys_SurveysStartRequest $postBody, $optParams = array())
-  {
-    $params = array('resourceId' => $resourceId, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('start', array($params), "Google_Service_Surveys_SurveysStartResponse");
-  }
-  /**
-   * Stops a running survey. (surveys.stop)
-   *
-   * @param string $resourceId
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Surveys_SurveysStopResponse
-   */
-  public function stop($resourceId, $optParams = array())
-  {
-    $params = array('resourceId' => $resourceId);
-    $params = array_merge($params, $optParams);
-    return $this->call('stop', array($params), "Google_Service_Surveys_SurveysStopResponse");
-  }
-  /**
-   * Updates a survey. Currently the only property that can be updated is the
-   * owners property. (surveys.update)
-   *
-   * @param string $surveyUrlId External URL ID for the survey.
-   * @param Google_Service_Surveys_Survey $postBody
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Surveys_Survey
-   */
-  public function update($surveyUrlId, Google_Service_Surveys_Survey $postBody, $optParams = array())
-  {
-    $params = array('surveyUrlId' => $surveyUrlId, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('update', array($params), "Google_Service_Surveys_Survey");
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Surveys/ResultsGetRequest.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Surveys/ResultsGetRequest.php
deleted file mode 100644
index 3d8324e9..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Surveys/ResultsGetRequest.php
+++ /dev/null
@@ -1,31 +0,0 @@
-resultMask = $resultMask;
-  }
-  public function getResultMask()
-  {
-    return $this->resultMask;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Surveys/ResultsMask.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Surveys/ResultsMask.php
deleted file mode 100644
index 594b86a3..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Surveys/ResultsMask.php
+++ /dev/null
@@ -1,41 +0,0 @@
-fields = $fields;
-  }
-  public function getFields()
-  {
-    return $this->fields;
-  }
-  public function setProjection($projection)
-  {
-    $this->projection = $projection;
-  }
-  public function getProjection()
-  {
-    return $this->projection;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Surveys/Survey.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Surveys/Survey.php
deleted file mode 100644
index 481abf86..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Surveys/Survey.php
+++ /dev/null
@@ -1,125 +0,0 @@
-audience = $audience;
-  }
-  public function getAudience()
-  {
-    return $this->audience;
-  }
-  public function setCost(Google_Service_Surveys_SurveyCost $cost)
-  {
-    $this->cost = $cost;
-  }
-  public function getCost()
-  {
-    return $this->cost;
-  }
-  public function setCustomerData($customerData)
-  {
-    $this->customerData = $customerData;
-  }
-  public function getCustomerData()
-  {
-    return $this->customerData;
-  }
-  public function setDescription($description)
-  {
-    $this->description = $description;
-  }
-  public function getDescription()
-  {
-    return $this->description;
-  }
-  public function setOwners($owners)
-  {
-    $this->owners = $owners;
-  }
-  public function getOwners()
-  {
-    return $this->owners;
-  }
-  public function setQuestions($questions)
-  {
-    $this->questions = $questions;
-  }
-  public function getQuestions()
-  {
-    return $this->questions;
-  }
-  public function setRejectionReason(Google_Service_Surveys_SurveyRejection $rejectionReason)
-  {
-    $this->rejectionReason = $rejectionReason;
-  }
-  public function getRejectionReason()
-  {
-    return $this->rejectionReason;
-  }
-  public function setState($state)
-  {
-    $this->state = $state;
-  }
-  public function getState()
-  {
-    return $this->state;
-  }
-  public function setSurveyUrlId($surveyUrlId)
-  {
-    $this->surveyUrlId = $surveyUrlId;
-  }
-  public function getSurveyUrlId()
-  {
-    return $this->surveyUrlId;
-  }
-  public function setTitle($title)
-  {
-    $this->title = $title;
-  }
-  public function getTitle()
-  {
-    return $this->title;
-  }
-  public function setWantedResponseCount($wantedResponseCount)
-  {
-    $this->wantedResponseCount = $wantedResponseCount;
-  }
-  public function getWantedResponseCount()
-  {
-    return $this->wantedResponseCount;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Surveys/SurveyAudience.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Surveys/SurveyAudience.php
deleted file mode 100644
index b37f43bd..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Surveys/SurveyAudience.php
+++ /dev/null
@@ -1,85 +0,0 @@
-ages = $ages;
-  }
-  public function getAges()
-  {
-    return $this->ages;
-  }
-  public function setCountry($country)
-  {
-    $this->country = $country;
-  }
-  public function getCountry()
-  {
-    return $this->country;
-  }
-  public function setCountrySubdivision($countrySubdivision)
-  {
-    $this->countrySubdivision = $countrySubdivision;
-  }
-  public function getCountrySubdivision()
-  {
-    return $this->countrySubdivision;
-  }
-  public function setGender($gender)
-  {
-    $this->gender = $gender;
-  }
-  public function getGender()
-  {
-    return $this->gender;
-  }
-  public function setLanguages($languages)
-  {
-    $this->languages = $languages;
-  }
-  public function getLanguages()
-  {
-    return $this->languages;
-  }
-  public function setMobileAppPanelId($mobileAppPanelId)
-  {
-    $this->mobileAppPanelId = $mobileAppPanelId;
-  }
-  public function getMobileAppPanelId()
-  {
-    return $this->mobileAppPanelId;
-  }
-  public function setPopulationSource($populationSource)
-  {
-    $this->populationSource = $populationSource;
-  }
-  public function getPopulationSource()
-  {
-    return $this->populationSource;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Surveys/SurveyCost.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Surveys/SurveyCost.php
deleted file mode 100644
index bdbd1d71..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Surveys/SurveyCost.php
+++ /dev/null
@@ -1,57 +0,0 @@
-costPerResponseNanos = $costPerResponseNanos;
-  }
-  public function getCostPerResponseNanos()
-  {
-    return $this->costPerResponseNanos;
-  }
-  public function setCurrencyCode($currencyCode)
-  {
-    $this->currencyCode = $currencyCode;
-  }
-  public function getCurrencyCode()
-  {
-    return $this->currencyCode;
-  }
-  public function setMaxCostPerResponseNanos($maxCostPerResponseNanos)
-  {
-    $this->maxCostPerResponseNanos = $maxCostPerResponseNanos;
-  }
-  public function getMaxCostPerResponseNanos()
-  {
-    return $this->maxCostPerResponseNanos;
-  }
-  public function setNanos($nanos)
-  {
-    $this->nanos = $nanos;
-  }
-  public function getNanos()
-  {
-    return $this->nanos;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Surveys/SurveyQuestion.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Surveys/SurveyQuestion.php
deleted file mode 100644
index c7f60c8a..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Surveys/SurveyQuestion.php
+++ /dev/null
@@ -1,185 +0,0 @@
-answerOrder = $answerOrder;
-  }
-  public function getAnswerOrder()
-  {
-    return $this->answerOrder;
-  }
-  public function setAnswers($answers)
-  {
-    $this->answers = $answers;
-  }
-  public function getAnswers()
-  {
-    return $this->answers;
-  }
-  public function setHasOther($hasOther)
-  {
-    $this->hasOther = $hasOther;
-  }
-  public function getHasOther()
-  {
-    return $this->hasOther;
-  }
-  public function setHighValueLabel($highValueLabel)
-  {
-    $this->highValueLabel = $highValueLabel;
-  }
-  public function getHighValueLabel()
-  {
-    return $this->highValueLabel;
-  }
-  public function setImages($images)
-  {
-    $this->images = $images;
-  }
-  public function getImages()
-  {
-    return $this->images;
-  }
-  public function setLastAnswerPositionPinned($lastAnswerPositionPinned)
-  {
-    $this->lastAnswerPositionPinned = $lastAnswerPositionPinned;
-  }
-  public function getLastAnswerPositionPinned()
-  {
-    return $this->lastAnswerPositionPinned;
-  }
-  public function setLowValueLabel($lowValueLabel)
-  {
-    $this->lowValueLabel = $lowValueLabel;
-  }
-  public function getLowValueLabel()
-  {
-    return $this->lowValueLabel;
-  }
-  public function setMustPickSuggestion($mustPickSuggestion)
-  {
-    $this->mustPickSuggestion = $mustPickSuggestion;
-  }
-  public function getMustPickSuggestion()
-  {
-    return $this->mustPickSuggestion;
-  }
-  public function setNumStars($numStars)
-  {
-    $this->numStars = $numStars;
-  }
-  public function getNumStars()
-  {
-    return $this->numStars;
-  }
-  public function setOpenTextPlaceholder($openTextPlaceholder)
-  {
-    $this->openTextPlaceholder = $openTextPlaceholder;
-  }
-  public function getOpenTextPlaceholder()
-  {
-    return $this->openTextPlaceholder;
-  }
-  public function setOpenTextSuggestions($openTextSuggestions)
-  {
-    $this->openTextSuggestions = $openTextSuggestions;
-  }
-  public function getOpenTextSuggestions()
-  {
-    return $this->openTextSuggestions;
-  }
-  public function setQuestion($question)
-  {
-    $this->question = $question;
-  }
-  public function getQuestion()
-  {
-    return $this->question;
-  }
-  public function setSentimentText($sentimentText)
-  {
-    $this->sentimentText = $sentimentText;
-  }
-  public function getSentimentText()
-  {
-    return $this->sentimentText;
-  }
-  public function setSingleLineResponse($singleLineResponse)
-  {
-    $this->singleLineResponse = $singleLineResponse;
-  }
-  public function getSingleLineResponse()
-  {
-    return $this->singleLineResponse;
-  }
-  public function setThresholdAnswers($thresholdAnswers)
-  {
-    $this->thresholdAnswers = $thresholdAnswers;
-  }
-  public function getThresholdAnswers()
-  {
-    return $this->thresholdAnswers;
-  }
-  public function setType($type)
-  {
-    $this->type = $type;
-  }
-  public function getType()
-  {
-    return $this->type;
-  }
-  public function setUnitOfMeasurementLabel($unitOfMeasurementLabel)
-  {
-    $this->unitOfMeasurementLabel = $unitOfMeasurementLabel;
-  }
-  public function getUnitOfMeasurementLabel()
-  {
-    return $this->unitOfMeasurementLabel;
-  }
-  public function setVideoId($videoId)
-  {
-    $this->videoId = $videoId;
-  }
-  public function getVideoId()
-  {
-    return $this->videoId;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Surveys/SurveyQuestionImage.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Surveys/SurveyQuestionImage.php
deleted file mode 100644
index 5249a2f3..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Surveys/SurveyQuestionImage.php
+++ /dev/null
@@ -1,48 +0,0 @@
-altText = $altText;
-  }
-  public function getAltText()
-  {
-    return $this->altText;
-  }
-  public function setData($data)
-  {
-    $this->data = $data;
-  }
-  public function getData()
-  {
-    return $this->data;
-  }
-  public function setUrl($url)
-  {
-    $this->url = $url;
-  }
-  public function getUrl()
-  {
-    return $this->url;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Surveys/SurveyRejection.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Surveys/SurveyRejection.php
deleted file mode 100644
index 62efd4cd..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Surveys/SurveyRejection.php
+++ /dev/null
@@ -1,39 +0,0 @@
-explanation = $explanation;
-  }
-  public function getExplanation()
-  {
-    return $this->explanation;
-  }
-  public function setType($type)
-  {
-    $this->type = $type;
-  }
-  public function getType()
-  {
-    return $this->type;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Surveys/SurveyResults.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Surveys/SurveyResults.php
deleted file mode 100644
index 8a03734e..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Surveys/SurveyResults.php
+++ /dev/null
@@ -1,39 +0,0 @@
-status = $status;
-  }
-  public function getStatus()
-  {
-    return $this->status;
-  }
-  public function setSurveyUrlId($surveyUrlId)
-  {
-    $this->surveyUrlId = $surveyUrlId;
-  }
-  public function getSurveyUrlId()
-  {
-    return $this->surveyUrlId;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Surveys/SurveysDeleteResponse.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Surveys/SurveysDeleteResponse.php
deleted file mode 100644
index 66a41e9c..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Surveys/SurveysDeleteResponse.php
+++ /dev/null
@@ -1,30 +0,0 @@
-requestId = $requestId;
-  }
-  public function getRequestId()
-  {
-    return $this->requestId;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Surveys/SurveysListResponse.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Surveys/SurveysListResponse.php
deleted file mode 100644
index a1958989..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Surveys/SurveysListResponse.php
+++ /dev/null
@@ -1,61 +0,0 @@
-pageInfo = $pageInfo;
-  }
-  public function getPageInfo()
-  {
-    return $this->pageInfo;
-  }
-  public function setRequestId($requestId)
-  {
-    $this->requestId = $requestId;
-  }
-  public function getRequestId()
-  {
-    return $this->requestId;
-  }
-  public function setResources($resources)
-  {
-    $this->resources = $resources;
-  }
-  public function getResources()
-  {
-    return $this->resources;
-  }
-  public function setTokenPagination(Google_Service_Surveys_TokenPagination $tokenPagination)
-  {
-    $this->tokenPagination = $tokenPagination;
-  }
-  public function getTokenPagination()
-  {
-    return $this->tokenPagination;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Surveys/SurveysStartRequest.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Surveys/SurveysStartRequest.php
deleted file mode 100644
index 963512ab..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Surveys/SurveysStartRequest.php
+++ /dev/null
@@ -1,30 +0,0 @@
-maxCostPerResponseNanos = $maxCostPerResponseNanos;
-  }
-  public function getMaxCostPerResponseNanos()
-  {
-    return $this->maxCostPerResponseNanos;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Surveys/SurveysStartResponse.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Surveys/SurveysStartResponse.php
deleted file mode 100644
index 623c0e4a..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Surveys/SurveysStartResponse.php
+++ /dev/null
@@ -1,40 +0,0 @@
-requestId = $requestId;
-  }
-  public function getRequestId()
-  {
-    return $this->requestId;
-  }
-  public function setResource(Google_Service_Surveys_Survey $resource)
-  {
-    $this->resource = $resource;
-  }
-  public function getResource()
-  {
-    return $this->resource;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Surveys/SurveysStopResponse.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Surveys/SurveysStopResponse.php
deleted file mode 100644
index 502cf1c9..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Surveys/SurveysStopResponse.php
+++ /dev/null
@@ -1,40 +0,0 @@
-requestId = $requestId;
-  }
-  public function getRequestId()
-  {
-    return $this->requestId;
-  }
-  public function setResource(Google_Service_Surveys_Survey $resource)
-  {
-    $this->resource = $resource;
-  }
-  public function getResource()
-  {
-    return $this->resource;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Surveys/TokenPagination.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Surveys/TokenPagination.php
deleted file mode 100644
index 74208738..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Surveys/TokenPagination.php
+++ /dev/null
@@ -1,39 +0,0 @@
-nextPageToken = $nextPageToken;
-  }
-  public function getNextPageToken()
-  {
-    return $this->nextPageToken;
-  }
-  public function setPreviousPageToken($previousPageToken)
-  {
-    $this->previousPageToken = $previousPageToken;
-  }
-  public function getPreviousPageToken()
-  {
-    return $this->previousPageToken;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/TagManager.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/TagManager.php
deleted file mode 100644
index 7e03dd5d..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/TagManager.php
+++ /dev/null
@@ -1,1099 +0,0 @@
-
- * Accesses Tag Manager accounts and containers.

- *
- * 

- * For more information about this service, see the API
- * Documentation
- * 

- *
- * @author Google, Inc.
- */
-class Google_Service_TagManager extends Google_Service
-{
-  /** Delete your Google Tag Manager containers. */
-  const TAGMANAGER_DELETE_CONTAINERS =
-      "https://www.googleapis.com/auth/tagmanager.delete.containers";
-  /** Manage your Google Tag Manager container and its subcomponents, excluding versioning and publishing. */
-  const TAGMANAGER_EDIT_CONTAINERS =
-      "https://www.googleapis.com/auth/tagmanager.edit.containers";
-  /** Manage your Google Tag Manager container versions. */
-  const TAGMANAGER_EDIT_CONTAINERVERSIONS =
-      "https://www.googleapis.com/auth/tagmanager.edit.containerversions";
-  /** View and manage your Google Tag Manager accounts. */
-  const TAGMANAGER_MANAGE_ACCOUNTS =
-      "https://www.googleapis.com/auth/tagmanager.manage.accounts";
-  /** Manage user permissions of your Google Tag Manager account and container. */
-  const TAGMANAGER_MANAGE_USERS =
-      "https://www.googleapis.com/auth/tagmanager.manage.users";
-  /** Publish your Google Tag Manager container versions. */
-  const TAGMANAGER_PUBLISH =
-      "https://www.googleapis.com/auth/tagmanager.publish";
-  /** View your Google Tag Manager container and its subcomponents. */
-  const TAGMANAGER_READONLY =
-      "https://www.googleapis.com/auth/tagmanager.readonly";
-
-  public $accounts;
-  public $accounts_containers;
-  public $accounts_containers_environments;
-  public $accounts_containers_folders;
-  public $accounts_containers_folders_entities;
-  public $accounts_containers_move_folders;
-  public $accounts_containers_reauthorize_environments;
-  public $accounts_containers_tags;
-  public $accounts_containers_triggers;
-  public $accounts_containers_variables;
-  public $accounts_containers_versions;
-  public $accounts_permissions;
-  
-  /**
-   * Constructs the internal representation of the TagManager service.
-   *
-   * @param Google_Client $client
-   */
-  public function __construct(Google_Client $client)
-  {
-    parent::__construct($client);
-    $this->rootUrl = 'https://www.googleapis.com/';
-    $this->servicePath = 'tagmanager/v1/';
-    $this->version = 'v1';
-    $this->serviceName = 'tagmanager';
-
-    $this->accounts = new Google_Service_TagManager_Resource_Accounts(
-        $this,
-        $this->serviceName,
-        'accounts',
-        array(
-          'methods' => array(
-            'get' => array(
-              'path' => 'accounts/{accountId}',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'accountId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'list' => array(
-              'path' => 'accounts',
-              'httpMethod' => 'GET',
-              'parameters' => array(),
-            ),'update' => array(
-              'path' => 'accounts/{accountId}',
-              'httpMethod' => 'PUT',
-              'parameters' => array(
-                'accountId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'fingerprint' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-              ),
-            ),
-          )
-        )
-    );
-    $this->accounts_containers = new Google_Service_TagManager_Resource_AccountsContainers(
-        $this,
-        $this->serviceName,
-        'containers',
-        array(
-          'methods' => array(
-            'create' => array(
-              'path' => 'accounts/{accountId}/containers',
-              'httpMethod' => 'POST',
-              'parameters' => array(
-                'accountId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'delete' => array(
-              'path' => 'accounts/{accountId}/containers/{containerId}',
-              'httpMethod' => 'DELETE',
-              'parameters' => array(
-                'accountId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'containerId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'get' => array(
-              'path' => 'accounts/{accountId}/containers/{containerId}',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'accountId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'containerId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'list' => array(
-              'path' => 'accounts/{accountId}/containers',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'accountId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'update' => array(
-              'path' => 'accounts/{accountId}/containers/{containerId}',
-              'httpMethod' => 'PUT',
-              'parameters' => array(
-                'accountId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'containerId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'fingerprint' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-              ),
-            ),
-          )
-        )
-    );
-    $this->accounts_containers_environments = new Google_Service_TagManager_Resource_AccountsContainersEnvironments(
-        $this,
-        $this->serviceName,
-        'environments',
-        array(
-          'methods' => array(
-            'create' => array(
-              'path' => 'accounts/{accountId}/containers/{containerId}/environments',
-              'httpMethod' => 'POST',
-              'parameters' => array(
-                'accountId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'containerId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'delete' => array(
-              'path' => 'accounts/{accountId}/containers/{containerId}/environments/{environmentId}',
-              'httpMethod' => 'DELETE',
-              'parameters' => array(
-                'accountId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'containerId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'environmentId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'get' => array(
-              'path' => 'accounts/{accountId}/containers/{containerId}/environments/{environmentId}',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'accountId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'containerId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'environmentId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'list' => array(
-              'path' => 'accounts/{accountId}/containers/{containerId}/environments',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'accountId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'containerId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'patch' => array(
-              'path' => 'accounts/{accountId}/containers/{containerId}/environments/{environmentId}',
-              'httpMethod' => 'PATCH',
-              'parameters' => array(
-                'accountId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'containerId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'environmentId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'fingerprint' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-              ),
-            ),'update' => array(
-              'path' => 'accounts/{accountId}/containers/{containerId}/environments/{environmentId}',
-              'httpMethod' => 'PUT',
-              'parameters' => array(
-                'accountId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'containerId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'environmentId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'fingerprint' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-              ),
-            ),
-          )
-        )
-    );
-    $this->accounts_containers_folders = new Google_Service_TagManager_Resource_AccountsContainersFolders(
-        $this,
-        $this->serviceName,
-        'folders',
-        array(
-          'methods' => array(
-            'create' => array(
-              'path' => 'accounts/{accountId}/containers/{containerId}/folders',
-              'httpMethod' => 'POST',
-              'parameters' => array(
-                'accountId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'containerId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'delete' => array(
-              'path' => 'accounts/{accountId}/containers/{containerId}/folders/{folderId}',
-              'httpMethod' => 'DELETE',
-              'parameters' => array(
-                'accountId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'containerId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'folderId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'get' => array(
-              'path' => 'accounts/{accountId}/containers/{containerId}/folders/{folderId}',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'accountId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'containerId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'folderId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'list' => array(
-              'path' => 'accounts/{accountId}/containers/{containerId}/folders',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'accountId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'containerId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'update' => array(
-              'path' => 'accounts/{accountId}/containers/{containerId}/folders/{folderId}',
-              'httpMethod' => 'PUT',
-              'parameters' => array(
-                'accountId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'containerId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'folderId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'fingerprint' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-              ),
-            ),
-          )
-        )
-    );
-    $this->accounts_containers_folders_entities = new Google_Service_TagManager_Resource_AccountsContainersFoldersEntities(
-        $this,
-        $this->serviceName,
-        'entities',
-        array(
-          'methods' => array(
-            'list' => array(
-              'path' => 'accounts/{accountId}/containers/{containerId}/folders/{folderId}/entities',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'accountId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'containerId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'folderId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),
-          )
-        )
-    );
-    $this->accounts_containers_move_folders = new Google_Service_TagManager_Resource_AccountsContainersMoveFolders(
-        $this,
-        $this->serviceName,
-        'move_folders',
-        array(
-          'methods' => array(
-            'update' => array(
-              'path' => 'accounts/{accountId}/containers/{containerId}/move_folders/{folderId}',
-              'httpMethod' => 'PUT',
-              'parameters' => array(
-                'accountId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'containerId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'folderId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'tagId' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                  'repeated' => true,
-                ),
-                'triggerId' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                  'repeated' => true,
-                ),
-                'variableId' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                  'repeated' => true,
-                ),
-              ),
-            ),
-          )
-        )
-    );
-    $this->accounts_containers_reauthorize_environments = new Google_Service_TagManager_Resource_AccountsContainersReauthorizeEnvironments(
-        $this,
-        $this->serviceName,
-        'reauthorize_environments',
-        array(
-          'methods' => array(
-            'update' => array(
-              'path' => 'accounts/{accountId}/containers/{containerId}/reauthorize_environments/{environmentId}',
-              'httpMethod' => 'PUT',
-              'parameters' => array(
-                'accountId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'containerId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'environmentId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),
-          )
-        )
-    );
-    $this->accounts_containers_tags = new Google_Service_TagManager_Resource_AccountsContainersTags(
-        $this,
-        $this->serviceName,
-        'tags',
-        array(
-          'methods' => array(
-            'create' => array(
-              'path' => 'accounts/{accountId}/containers/{containerId}/tags',
-              'httpMethod' => 'POST',
-              'parameters' => array(
-                'accountId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'containerId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'delete' => array(
-              'path' => 'accounts/{accountId}/containers/{containerId}/tags/{tagId}',
-              'httpMethod' => 'DELETE',
-              'parameters' => array(
-                'accountId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'containerId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'tagId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'get' => array(
-              'path' => 'accounts/{accountId}/containers/{containerId}/tags/{tagId}',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'accountId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'containerId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'tagId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'list' => array(
-              'path' => 'accounts/{accountId}/containers/{containerId}/tags',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'accountId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'containerId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'update' => array(
-              'path' => 'accounts/{accountId}/containers/{containerId}/tags/{tagId}',
-              'httpMethod' => 'PUT',
-              'parameters' => array(
-                'accountId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'containerId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'tagId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'fingerprint' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-              ),
-            ),
-          )
-        )
-    );
-    $this->accounts_containers_triggers = new Google_Service_TagManager_Resource_AccountsContainersTriggers(
-        $this,
-        $this->serviceName,
-        'triggers',
-        array(
-          'methods' => array(
-            'create' => array(
-              'path' => 'accounts/{accountId}/containers/{containerId}/triggers',
-              'httpMethod' => 'POST',
-              'parameters' => array(
-                'accountId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'containerId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'delete' => array(
-              'path' => 'accounts/{accountId}/containers/{containerId}/triggers/{triggerId}',
-              'httpMethod' => 'DELETE',
-              'parameters' => array(
-                'accountId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'containerId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'triggerId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'get' => array(
-              'path' => 'accounts/{accountId}/containers/{containerId}/triggers/{triggerId}',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'accountId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'containerId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'triggerId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'list' => array(
-              'path' => 'accounts/{accountId}/containers/{containerId}/triggers',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'accountId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'containerId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'update' => array(
-              'path' => 'accounts/{accountId}/containers/{containerId}/triggers/{triggerId}',
-              'httpMethod' => 'PUT',
-              'parameters' => array(
-                'accountId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'containerId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'triggerId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'fingerprint' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-              ),
-            ),
-          )
-        )
-    );
-    $this->accounts_containers_variables = new Google_Service_TagManager_Resource_AccountsContainersVariables(
-        $this,
-        $this->serviceName,
-        'variables',
-        array(
-          'methods' => array(
-            'create' => array(
-              'path' => 'accounts/{accountId}/containers/{containerId}/variables',
-              'httpMethod' => 'POST',
-              'parameters' => array(
-                'accountId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'containerId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'delete' => array(
-              'path' => 'accounts/{accountId}/containers/{containerId}/variables/{variableId}',
-              'httpMethod' => 'DELETE',
-              'parameters' => array(
-                'accountId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'containerId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'variableId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'get' => array(
-              'path' => 'accounts/{accountId}/containers/{containerId}/variables/{variableId}',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'accountId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'containerId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'variableId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'list' => array(
-              'path' => 'accounts/{accountId}/containers/{containerId}/variables',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'accountId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'containerId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'update' => array(
-              'path' => 'accounts/{accountId}/containers/{containerId}/variables/{variableId}',
-              'httpMethod' => 'PUT',
-              'parameters' => array(
-                'accountId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'containerId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'variableId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'fingerprint' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-              ),
-            ),
-          )
-        )
-    );
-    $this->accounts_containers_versions = new Google_Service_TagManager_Resource_AccountsContainersVersions(
-        $this,
-        $this->serviceName,
-        'versions',
-        array(
-          'methods' => array(
-            'create' => array(
-              'path' => 'accounts/{accountId}/containers/{containerId}/versions',
-              'httpMethod' => 'POST',
-              'parameters' => array(
-                'accountId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'containerId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'delete' => array(
-              'path' => 'accounts/{accountId}/containers/{containerId}/versions/{containerVersionId}',
-              'httpMethod' => 'DELETE',
-              'parameters' => array(
-                'accountId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'containerId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'containerVersionId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'get' => array(
-              'path' => 'accounts/{accountId}/containers/{containerId}/versions/{containerVersionId}',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'accountId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'containerId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'containerVersionId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'list' => array(
-              'path' => 'accounts/{accountId}/containers/{containerId}/versions',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'accountId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'containerId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'headers' => array(
-                  'location' => 'query',
-                  'type' => 'boolean',
-                ),
-                'includeDeleted' => array(
-                  'location' => 'query',
-                  'type' => 'boolean',
-                ),
-              ),
-            ),'publish' => array(
-              'path' => 'accounts/{accountId}/containers/{containerId}/versions/{containerVersionId}/publish',
-              'httpMethod' => 'POST',
-              'parameters' => array(
-                'accountId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'containerId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'containerVersionId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'fingerprint' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-              ),
-            ),'restore' => array(
-              'path' => 'accounts/{accountId}/containers/{containerId}/versions/{containerVersionId}/restore',
-              'httpMethod' => 'POST',
-              'parameters' => array(
-                'accountId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'containerId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'containerVersionId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'undelete' => array(
-              'path' => 'accounts/{accountId}/containers/{containerId}/versions/{containerVersionId}/undelete',
-              'httpMethod' => 'POST',
-              'parameters' => array(
-                'accountId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'containerId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'containerVersionId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'update' => array(
-              'path' => 'accounts/{accountId}/containers/{containerId}/versions/{containerVersionId}',
-              'httpMethod' => 'PUT',
-              'parameters' => array(
-                'accountId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'containerId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'containerVersionId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'fingerprint' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-              ),
-            ),
-          )
-        )
-    );
-    $this->accounts_permissions = new Google_Service_TagManager_Resource_AccountsPermissions(
-        $this,
-        $this->serviceName,
-        'permissions',
-        array(
-          'methods' => array(
-            'create' => array(
-              'path' => 'accounts/{accountId}/permissions',
-              'httpMethod' => 'POST',
-              'parameters' => array(
-                'accountId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'delete' => array(
-              'path' => 'accounts/{accountId}/permissions/{permissionId}',
-              'httpMethod' => 'DELETE',
-              'parameters' => array(
-                'accountId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'permissionId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'get' => array(
-              'path' => 'accounts/{accountId}/permissions/{permissionId}',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'accountId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'permissionId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'list' => array(
-              'path' => 'accounts/{accountId}/permissions',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'accountId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'update' => array(
-              'path' => 'accounts/{accountId}/permissions/{permissionId}',
-              'httpMethod' => 'PUT',
-              'parameters' => array(
-                'accountId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'permissionId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),
-          )
-        )
-    );
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/TagManager/Account.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/TagManager/Account.php
deleted file mode 100644
index 7f55dd39..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/TagManager/Account.php
+++ /dev/null
@@ -1,57 +0,0 @@
-accountId = $accountId;
-  }
-  public function getAccountId()
-  {
-    return $this->accountId;
-  }
-  public function setFingerprint($fingerprint)
-  {
-    $this->fingerprint = $fingerprint;
-  }
-  public function getFingerprint()
-  {
-    return $this->fingerprint;
-  }
-  public function setName($name)
-  {
-    $this->name = $name;
-  }
-  public function getName()
-  {
-    return $this->name;
-  }
-  public function setShareData($shareData)
-  {
-    $this->shareData = $shareData;
-  }
-  public function getShareData()
-  {
-    return $this->shareData;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/TagManager/AccountAccess.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/TagManager/AccountAccess.php
deleted file mode 100644
index 7f331b38..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/TagManager/AccountAccess.php
+++ /dev/null
@@ -1,31 +0,0 @@
-permission = $permission;
-  }
-  public function getPermission()
-  {
-    return $this->permission;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/TagManager/Condition.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/TagManager/Condition.php
deleted file mode 100644
index ae346be9..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/TagManager/Condition.php
+++ /dev/null
@@ -1,41 +0,0 @@
-parameter = $parameter;
-  }
-  public function getParameter()
-  {
-    return $this->parameter;
-  }
-  public function setType($type)
-  {
-    $this->type = $type;
-  }
-  public function getType()
-  {
-    return $this->type;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/TagManager/Container.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/TagManager/Container.php
deleted file mode 100644
index 1b0eac31..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/TagManager/Container.php
+++ /dev/null
@@ -1,121 +0,0 @@
-accountId = $accountId;
-  }
-  public function getAccountId()
-  {
-    return $this->accountId;
-  }
-  public function setContainerId($containerId)
-  {
-    $this->containerId = $containerId;
-  }
-  public function getContainerId()
-  {
-    return $this->containerId;
-  }
-  public function setDomainName($domainName)
-  {
-    $this->domainName = $domainName;
-  }
-  public function getDomainName()
-  {
-    return $this->domainName;
-  }
-  public function setEnabledBuiltInVariable($enabledBuiltInVariable)
-  {
-    $this->enabledBuiltInVariable = $enabledBuiltInVariable;
-  }
-  public function getEnabledBuiltInVariable()
-  {
-    return $this->enabledBuiltInVariable;
-  }
-  public function setFingerprint($fingerprint)
-  {
-    $this->fingerprint = $fingerprint;
-  }
-  public function getFingerprint()
-  {
-    return $this->fingerprint;
-  }
-  public function setName($name)
-  {
-    $this->name = $name;
-  }
-  public function getName()
-  {
-    return $this->name;
-  }
-  public function setNotes($notes)
-  {
-    $this->notes = $notes;
-  }
-  public function getNotes()
-  {
-    return $this->notes;
-  }
-  public function setPublicId($publicId)
-  {
-    $this->publicId = $publicId;
-  }
-  public function getPublicId()
-  {
-    return $this->publicId;
-  }
-  public function setTimeZoneCountryId($timeZoneCountryId)
-  {
-    $this->timeZoneCountryId = $timeZoneCountryId;
-  }
-  public function getTimeZoneCountryId()
-  {
-    return $this->timeZoneCountryId;
-  }
-  public function setTimeZoneId($timeZoneId)
-  {
-    $this->timeZoneId = $timeZoneId;
-  }
-  public function getTimeZoneId()
-  {
-    return $this->timeZoneId;
-  }
-  public function setUsageContext($usageContext)
-  {
-    $this->usageContext = $usageContext;
-  }
-  public function getUsageContext()
-  {
-    return $this->usageContext;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/TagManager/ContainerAccess.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/TagManager/ContainerAccess.php
deleted file mode 100644
index 14dffc35..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/TagManager/ContainerAccess.php
+++ /dev/null
@@ -1,40 +0,0 @@
-containerId = $containerId;
-  }
-  public function getContainerId()
-  {
-    return $this->containerId;
-  }
-  public function setPermission($permission)
-  {
-    $this->permission = $permission;
-  }
-  public function getPermission()
-  {
-    return $this->permission;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/TagManager/ContainerVersion.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/TagManager/ContainerVersion.php
deleted file mode 100644
index ea14afd3..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/TagManager/ContainerVersion.php
+++ /dev/null
@@ -1,155 +0,0 @@
-accountId = $accountId;
-  }
-  public function getAccountId()
-  {
-    return $this->accountId;
-  }
-  public function setContainer(Google_Service_TagManager_Container $container)
-  {
-    $this->container = $container;
-  }
-  public function getContainer()
-  {
-    return $this->container;
-  }
-  public function setContainerId($containerId)
-  {
-    $this->containerId = $containerId;
-  }
-  public function getContainerId()
-  {
-    return $this->containerId;
-  }
-  public function setContainerVersionId($containerVersionId)
-  {
-    $this->containerVersionId = $containerVersionId;
-  }
-  public function getContainerVersionId()
-  {
-    return $this->containerVersionId;
-  }
-  public function setDeleted($deleted)
-  {
-    $this->deleted = $deleted;
-  }
-  public function getDeleted()
-  {
-    return $this->deleted;
-  }
-  public function setFingerprint($fingerprint)
-  {
-    $this->fingerprint = $fingerprint;
-  }
-  public function getFingerprint()
-  {
-    return $this->fingerprint;
-  }
-  public function setFolder($folder)
-  {
-    $this->folder = $folder;
-  }
-  public function getFolder()
-  {
-    return $this->folder;
-  }
-  public function setMacro($macro)
-  {
-    $this->macro = $macro;
-  }
-  public function getMacro()
-  {
-    return $this->macro;
-  }
-  public function setName($name)
-  {
-    $this->name = $name;
-  }
-  public function getName()
-  {
-    return $this->name;
-  }
-  public function setNotes($notes)
-  {
-    $this->notes = $notes;
-  }
-  public function getNotes()
-  {
-    return $this->notes;
-  }
-  public function setRule($rule)
-  {
-    $this->rule = $rule;
-  }
-  public function getRule()
-  {
-    return $this->rule;
-  }
-  public function setTag($tag)
-  {
-    $this->tag = $tag;
-  }
-  public function getTag()
-  {
-    return $this->tag;
-  }
-  public function setTrigger($trigger)
-  {
-    $this->trigger = $trigger;
-  }
-  public function getTrigger()
-  {
-    return $this->trigger;
-  }
-  public function setVariable($variable)
-  {
-    $this->variable = $variable;
-  }
-  public function getVariable()
-  {
-    return $this->variable;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/TagManager/ContainerVersionHeader.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/TagManager/ContainerVersionHeader.php
deleted file mode 100644
index 44105c90..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/TagManager/ContainerVersionHeader.php
+++ /dev/null
@@ -1,111 +0,0 @@
-accountId = $accountId;
-  }
-  public function getAccountId()
-  {
-    return $this->accountId;
-  }
-  public function setContainerId($containerId)
-  {
-    $this->containerId = $containerId;
-  }
-  public function getContainerId()
-  {
-    return $this->containerId;
-  }
-  public function setContainerVersionId($containerVersionId)
-  {
-    $this->containerVersionId = $containerVersionId;
-  }
-  public function getContainerVersionId()
-  {
-    return $this->containerVersionId;
-  }
-  public function setDeleted($deleted)
-  {
-    $this->deleted = $deleted;
-  }
-  public function getDeleted()
-  {
-    return $this->deleted;
-  }
-  public function setName($name)
-  {
-    $this->name = $name;
-  }
-  public function getName()
-  {
-    return $this->name;
-  }
-  public function setNumMacros($numMacros)
-  {
-    $this->numMacros = $numMacros;
-  }
-  public function getNumMacros()
-  {
-    return $this->numMacros;
-  }
-  public function setNumRules($numRules)
-  {
-    $this->numRules = $numRules;
-  }
-  public function getNumRules()
-  {
-    return $this->numRules;
-  }
-  public function setNumTags($numTags)
-  {
-    $this->numTags = $numTags;
-  }
-  public function getNumTags()
-  {
-    return $this->numTags;
-  }
-  public function setNumTriggers($numTriggers)
-  {
-    $this->numTriggers = $numTriggers;
-  }
-  public function getNumTriggers()
-  {
-    return $this->numTriggers;
-  }
-  public function setNumVariables($numVariables)
-  {
-    $this->numVariables = $numVariables;
-  }
-  public function getNumVariables()
-  {
-    return $this->numVariables;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/TagManager/CreateContainerVersionRequestVersionOptions.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/TagManager/CreateContainerVersionRequestVersionOptions.php
deleted file mode 100644
index 46f73525..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/TagManager/CreateContainerVersionRequestVersionOptions.php
+++ /dev/null
@@ -1,48 +0,0 @@
-name = $name;
-  }
-  public function getName()
-  {
-    return $this->name;
-  }
-  public function setNotes($notes)
-  {
-    $this->notes = $notes;
-  }
-  public function getNotes()
-  {
-    return $this->notes;
-  }
-  public function setQuickPreview($quickPreview)
-  {
-    $this->quickPreview = $quickPreview;
-  }
-  public function getQuickPreview()
-  {
-    return $this->quickPreview;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/TagManager/CreateContainerVersionResponse.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/TagManager/CreateContainerVersionResponse.php
deleted file mode 100644
index 754eed54..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/TagManager/CreateContainerVersionResponse.php
+++ /dev/null
@@ -1,40 +0,0 @@
-compilerError = $compilerError;
-  }
-  public function getCompilerError()
-  {
-    return $this->compilerError;
-  }
-  public function setContainerVersion(Google_Service_TagManager_ContainerVersion $containerVersion)
-  {
-    $this->containerVersion = $containerVersion;
-  }
-  public function getContainerVersion()
-  {
-    return $this->containerVersion;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/TagManager/Environment.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/TagManager/Environment.php
deleted file mode 100644
index b4368183..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/TagManager/Environment.php
+++ /dev/null
@@ -1,129 +0,0 @@
-accountId = $accountId;
-  }
-  public function getAccountId()
-  {
-    return $this->accountId;
-  }
-  public function setAuthorizationCode($authorizationCode)
-  {
-    $this->authorizationCode = $authorizationCode;
-  }
-  public function getAuthorizationCode()
-  {
-    return $this->authorizationCode;
-  }
-  public function setAuthorizationTimestampMs($authorizationTimestampMs)
-  {
-    $this->authorizationTimestampMs = $authorizationTimestampMs;
-  }
-  public function getAuthorizationTimestampMs()
-  {
-    return $this->authorizationTimestampMs;
-  }
-  public function setContainerId($containerId)
-  {
-    $this->containerId = $containerId;
-  }
-  public function getContainerId()
-  {
-    return $this->containerId;
-  }
-  public function setContainerVersionId($containerVersionId)
-  {
-    $this->containerVersionId = $containerVersionId;
-  }
-  public function getContainerVersionId()
-  {
-    return $this->containerVersionId;
-  }
-  public function setDescription($description)
-  {
-    $this->description = $description;
-  }
-  public function getDescription()
-  {
-    return $this->description;
-  }
-  public function setEnableDebug($enableDebug)
-  {
-    $this->enableDebug = $enableDebug;
-  }
-  public function getEnableDebug()
-  {
-    return $this->enableDebug;
-  }
-  public function setEnvironmentId($environmentId)
-  {
-    $this->environmentId = $environmentId;
-  }
-  public function getEnvironmentId()
-  {
-    return $this->environmentId;
-  }
-  public function setFingerprint($fingerprint)
-  {
-    $this->fingerprint = $fingerprint;
-  }
-  public function getFingerprint()
-  {
-    return $this->fingerprint;
-  }
-  public function setName($name)
-  {
-    $this->name = $name;
-  }
-  public function getName()
-  {
-    return $this->name;
-  }
-  public function setType($type)
-  {
-    $this->type = $type;
-  }
-  public function getType()
-  {
-    return $this->type;
-  }
-  public function setUrl($url)
-  {
-    $this->url = $url;
-  }
-  public function getUrl()
-  {
-    return $this->url;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/TagManager/Folder.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/TagManager/Folder.php
deleted file mode 100644
index c7de2387..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/TagManager/Folder.php
+++ /dev/null
@@ -1,66 +0,0 @@
-accountId = $accountId;
-  }
-  public function getAccountId()
-  {
-    return $this->accountId;
-  }
-  public function setContainerId($containerId)
-  {
-    $this->containerId = $containerId;
-  }
-  public function getContainerId()
-  {
-    return $this->containerId;
-  }
-  public function setFingerprint($fingerprint)
-  {
-    $this->fingerprint = $fingerprint;
-  }
-  public function getFingerprint()
-  {
-    return $this->fingerprint;
-  }
-  public function setFolderId($folderId)
-  {
-    $this->folderId = $folderId;
-  }
-  public function getFolderId()
-  {
-    return $this->folderId;
-  }
-  public function setName($name)
-  {
-    $this->name = $name;
-  }
-  public function getName()
-  {
-    return $this->name;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/TagManager/FolderEntities.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/TagManager/FolderEntities.php
deleted file mode 100644
index e13ba62e..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/TagManager/FolderEntities.php
+++ /dev/null
@@ -1,52 +0,0 @@
-tag = $tag;
-  }
-  public function getTag()
-  {
-    return $this->tag;
-  }
-  public function setTrigger($trigger)
-  {
-    $this->trigger = $trigger;
-  }
-  public function getTrigger()
-  {
-    return $this->trigger;
-  }
-  public function setVariable($variable)
-  {
-    $this->variable = $variable;
-  }
-  public function getVariable()
-  {
-    return $this->variable;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/TagManager/ListAccountUsersResponse.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/TagManager/ListAccountUsersResponse.php
deleted file mode 100644
index ea3637ca..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/TagManager/ListAccountUsersResponse.php
+++ /dev/null
@@ -1,32 +0,0 @@
-userAccess = $userAccess;
-  }
-  public function getUserAccess()
-  {
-    return $this->userAccess;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/TagManager/ListAccountsResponse.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/TagManager/ListAccountsResponse.php
deleted file mode 100644
index 0b533124..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/TagManager/ListAccountsResponse.php
+++ /dev/null
@@ -1,32 +0,0 @@
-accounts = $accounts;
-  }
-  public function getAccounts()
-  {
-    return $this->accounts;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/TagManager/ListContainerVersionsResponse.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/TagManager/ListContainerVersionsResponse.php
deleted file mode 100644
index 278de0b8..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/TagManager/ListContainerVersionsResponse.php
+++ /dev/null
@@ -1,42 +0,0 @@
-containerVersion = $containerVersion;
-  }
-  public function getContainerVersion()
-  {
-    return $this->containerVersion;
-  }
-  public function setContainerVersionHeader($containerVersionHeader)
-  {
-    $this->containerVersionHeader = $containerVersionHeader;
-  }
-  public function getContainerVersionHeader()
-  {
-    return $this->containerVersionHeader;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/TagManager/ListContainersResponse.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/TagManager/ListContainersResponse.php
deleted file mode 100644
index 7b4f449a..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/TagManager/ListContainersResponse.php
+++ /dev/null
@@ -1,32 +0,0 @@
-containers = $containers;
-  }
-  public function getContainers()
-  {
-    return $this->containers;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/TagManager/ListEnvironmentsResponse.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/TagManager/ListEnvironmentsResponse.php
deleted file mode 100644
index 581c1892..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/TagManager/ListEnvironmentsResponse.php
+++ /dev/null
@@ -1,32 +0,0 @@
-environments = $environments;
-  }
-  public function getEnvironments()
-  {
-    return $this->environments;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/TagManager/ListFoldersResponse.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/TagManager/ListFoldersResponse.php
deleted file mode 100644
index 8b830d6e..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/TagManager/ListFoldersResponse.php
+++ /dev/null
@@ -1,32 +0,0 @@
-folders = $folders;
-  }
-  public function getFolders()
-  {
-    return $this->folders;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/TagManager/ListTagsResponse.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/TagManager/ListTagsResponse.php
deleted file mode 100644
index 95f29bd2..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/TagManager/ListTagsResponse.php
+++ /dev/null
@@ -1,32 +0,0 @@
-tags = $tags;
-  }
-  public function getTags()
-  {
-    return $this->tags;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/TagManager/ListTriggersResponse.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/TagManager/ListTriggersResponse.php
deleted file mode 100644
index fa744c81..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/TagManager/ListTriggersResponse.php
+++ /dev/null
@@ -1,32 +0,0 @@
-triggers = $triggers;
-  }
-  public function getTriggers()
-  {
-    return $this->triggers;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/TagManager/ListVariablesResponse.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/TagManager/ListVariablesResponse.php
deleted file mode 100644
index e72c1f53..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/TagManager/ListVariablesResponse.php
+++ /dev/null
@@ -1,32 +0,0 @@
-variables = $variables;
-  }
-  public function getVariables()
-  {
-    return $this->variables;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/TagManager/Macro.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/TagManager/Macro.php
deleted file mode 100644
index b04c2e45..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/TagManager/Macro.php
+++ /dev/null
@@ -1,140 +0,0 @@
-accountId = $accountId;
-  }
-  public function getAccountId()
-  {
-    return $this->accountId;
-  }
-  public function setContainerId($containerId)
-  {
-    $this->containerId = $containerId;
-  }
-  public function getContainerId()
-  {
-    return $this->containerId;
-  }
-  public function setDisablingRuleId($disablingRuleId)
-  {
-    $this->disablingRuleId = $disablingRuleId;
-  }
-  public function getDisablingRuleId()
-  {
-    return $this->disablingRuleId;
-  }
-  public function setEnablingRuleId($enablingRuleId)
-  {
-    $this->enablingRuleId = $enablingRuleId;
-  }
-  public function getEnablingRuleId()
-  {
-    return $this->enablingRuleId;
-  }
-  public function setFingerprint($fingerprint)
-  {
-    $this->fingerprint = $fingerprint;
-  }
-  public function getFingerprint()
-  {
-    return $this->fingerprint;
-  }
-  public function setMacroId($macroId)
-  {
-    $this->macroId = $macroId;
-  }
-  public function getMacroId()
-  {
-    return $this->macroId;
-  }
-  public function setName($name)
-  {
-    $this->name = $name;
-  }
-  public function getName()
-  {
-    return $this->name;
-  }
-  public function setNotes($notes)
-  {
-    $this->notes = $notes;
-  }
-  public function getNotes()
-  {
-    return $this->notes;
-  }
-  public function setParameter($parameter)
-  {
-    $this->parameter = $parameter;
-  }
-  public function getParameter()
-  {
-    return $this->parameter;
-  }
-  public function setParentFolderId($parentFolderId)
-  {
-    $this->parentFolderId = $parentFolderId;
-  }
-  public function getParentFolderId()
-  {
-    return $this->parentFolderId;
-  }
-  public function setScheduleEndMs($scheduleEndMs)
-  {
-    $this->scheduleEndMs = $scheduleEndMs;
-  }
-  public function getScheduleEndMs()
-  {
-    return $this->scheduleEndMs;
-  }
-  public function setScheduleStartMs($scheduleStartMs)
-  {
-    $this->scheduleStartMs = $scheduleStartMs;
-  }
-  public function getScheduleStartMs()
-  {
-    return $this->scheduleStartMs;
-  }
-  public function setType($type)
-  {
-    $this->type = $type;
-  }
-  public function getType()
-  {
-    return $this->type;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/TagManager/Parameter.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/TagManager/Parameter.php
deleted file mode 100644
index 6bb3be77..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/TagManager/Parameter.php
+++ /dev/null
@@ -1,69 +0,0 @@
-key = $key;
-  }
-  public function getKey()
-  {
-    return $this->key;
-  }
-  public function setList($list)
-  {
-    $this->list = $list;
-  }
-  public function getList()
-  {
-    return $this->list;
-  }
-  public function setMap($map)
-  {
-    $this->map = $map;
-  }
-  public function getMap()
-  {
-    return $this->map;
-  }
-  public function setType($type)
-  {
-    $this->type = $type;
-  }
-  public function getType()
-  {
-    return $this->type;
-  }
-  public function setValue($value)
-  {
-    $this->value = $value;
-  }
-  public function getValue()
-  {
-    return $this->value;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/TagManager/PublishContainerVersionResponse.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/TagManager/PublishContainerVersionResponse.php
deleted file mode 100644
index 673ea70c..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/TagManager/PublishContainerVersionResponse.php
+++ /dev/null
@@ -1,40 +0,0 @@
-compilerError = $compilerError;
-  }
-  public function getCompilerError()
-  {
-    return $this->compilerError;
-  }
-  public function setContainerVersion(Google_Service_TagManager_ContainerVersion $containerVersion)
-  {
-    $this->containerVersion = $containerVersion;
-  }
-  public function getContainerVersion()
-  {
-    return $this->containerVersion;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/TagManager/Resource/Accounts.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/TagManager/Resource/Accounts.php
deleted file mode 100644
index 1a649394..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/TagManager/Resource/Accounts.php
+++ /dev/null
@@ -1,70 +0,0 @@
-
- *   $tagmanagerService = new Google_Service_TagManager(...);
- *   $accounts = $tagmanagerService->accounts;
- *  
- */
-class Google_Service_TagManager_Resource_Accounts extends Google_Service_Resource
-{
-  /**
-   * Gets a GTM Account. (accounts.get)
-   *
-   * @param string $accountId The GTM Account ID.
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_TagManager_Account
-   */
-  public function get($accountId, $optParams = array())
-  {
-    $params = array('accountId' => $accountId);
-    $params = array_merge($params, $optParams);
-    return $this->call('get', array($params), "Google_Service_TagManager_Account");
-  }
-  /**
-   * Lists all GTM Accounts that a user has access to. (accounts.listAccounts)
-   *
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_TagManager_ListAccountsResponse
-   */
-  public function listAccounts($optParams = array())
-  {
-    $params = array();
-    $params = array_merge($params, $optParams);
-    return $this->call('list', array($params), "Google_Service_TagManager_ListAccountsResponse");
-  }
-  /**
-   * Updates a GTM Account. (accounts.update)
-   *
-   * @param string $accountId The GTM Account ID.
-   * @param Google_Service_TagManager_Account $postBody
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param string fingerprint When provided, this fingerprint must match the
-   * fingerprint of the account in storage.
-   * @return Google_Service_TagManager_Account
-   */
-  public function update($accountId, Google_Service_TagManager_Account $postBody, $optParams = array())
-  {
-    $params = array('accountId' => $accountId, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('update', array($params), "Google_Service_TagManager_Account");
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/TagManager/Resource/AccountsContainers.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/TagManager/Resource/AccountsContainers.php
deleted file mode 100644
index 9da840ac..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/TagManager/Resource/AccountsContainers.php
+++ /dev/null
@@ -1,101 +0,0 @@
-
- *   $tagmanagerService = new Google_Service_TagManager(...);
- *   $containers = $tagmanagerService->containers;
- *  
- */
-class Google_Service_TagManager_Resource_AccountsContainers extends Google_Service_Resource
-{
-  /**
-   * Creates a Container. (containers.create)
-   *
-   * @param string $accountId The GTM Account ID.
-   * @param Google_Service_TagManager_Container $postBody
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_TagManager_Container
-   */
-  public function create($accountId, Google_Service_TagManager_Container $postBody, $optParams = array())
-  {
-    $params = array('accountId' => $accountId, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('create', array($params), "Google_Service_TagManager_Container");
-  }
-  /**
-   * Deletes a Container. (containers.delete)
-   *
-   * @param string $accountId The GTM Account ID.
-   * @param string $containerId The GTM Container ID.
-   * @param array $optParams Optional parameters.
-   */
-  public function delete($accountId, $containerId, $optParams = array())
-  {
-    $params = array('accountId' => $accountId, 'containerId' => $containerId);
-    $params = array_merge($params, $optParams);
-    return $this->call('delete', array($params));
-  }
-  /**
-   * Gets a Container. (containers.get)
-   *
-   * @param string $accountId The GTM Account ID.
-   * @param string $containerId The GTM Container ID.
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_TagManager_Container
-   */
-  public function get($accountId, $containerId, $optParams = array())
-  {
-    $params = array('accountId' => $accountId, 'containerId' => $containerId);
-    $params = array_merge($params, $optParams);
-    return $this->call('get', array($params), "Google_Service_TagManager_Container");
-  }
-  /**
-   * Lists all Containers that belongs to a GTM Account.
-   * (containers.listAccountsContainers)
-   *
-   * @param string $accountId The GTM Account ID.
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_TagManager_ListContainersResponse
-   */
-  public function listAccountsContainers($accountId, $optParams = array())
-  {
-    $params = array('accountId' => $accountId);
-    $params = array_merge($params, $optParams);
-    return $this->call('list', array($params), "Google_Service_TagManager_ListContainersResponse");
-  }
-  /**
-   * Updates a Container. (containers.update)
-   *
-   * @param string $accountId The GTM Account ID.
-   * @param string $containerId The GTM Container ID.
-   * @param Google_Service_TagManager_Container $postBody
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param string fingerprint When provided, this fingerprint must match the
-   * fingerprint of the container in storage.
-   * @return Google_Service_TagManager_Container
-   */
-  public function update($accountId, $containerId, Google_Service_TagManager_Container $postBody, $optParams = array())
-  {
-    $params = array('accountId' => $accountId, 'containerId' => $containerId, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('update', array($params), "Google_Service_TagManager_Container");
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/TagManager/Resource/AccountsContainersEnvironments.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/TagManager/Resource/AccountsContainersEnvironments.php
deleted file mode 100644
index 368f8a2e..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/TagManager/Resource/AccountsContainersEnvironments.php
+++ /dev/null
@@ -1,126 +0,0 @@
-
- *   $tagmanagerService = new Google_Service_TagManager(...);
- *   $environments = $tagmanagerService->environments;
- *  
- */
-class Google_Service_TagManager_Resource_AccountsContainersEnvironments extends Google_Service_Resource
-{
-  /**
-   * Creates a GTM Environment. (environments.create)
-   *
-   * @param string $accountId The GTM Account ID.
-   * @param string $containerId The GTM Container ID.
-   * @param Google_Service_TagManager_Environment $postBody
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_TagManager_Environment
-   */
-  public function create($accountId, $containerId, Google_Service_TagManager_Environment $postBody, $optParams = array())
-  {
-    $params = array('accountId' => $accountId, 'containerId' => $containerId, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('create', array($params), "Google_Service_TagManager_Environment");
-  }
-  /**
-   * Deletes a GTM Environment. (environments.delete)
-   *
-   * @param string $accountId The GTM Account ID.
-   * @param string $containerId The GTM Container ID.
-   * @param string $environmentId The GTM Environment ID.
-   * @param array $optParams Optional parameters.
-   */
-  public function delete($accountId, $containerId, $environmentId, $optParams = array())
-  {
-    $params = array('accountId' => $accountId, 'containerId' => $containerId, 'environmentId' => $environmentId);
-    $params = array_merge($params, $optParams);
-    return $this->call('delete', array($params));
-  }
-  /**
-   * Gets a GTM Environment. (environments.get)
-   *
-   * @param string $accountId The GTM Account ID.
-   * @param string $containerId The GTM Container ID.
-   * @param string $environmentId The GTM Environment ID.
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_TagManager_Environment
-   */
-  public function get($accountId, $containerId, $environmentId, $optParams = array())
-  {
-    $params = array('accountId' => $accountId, 'containerId' => $containerId, 'environmentId' => $environmentId);
-    $params = array_merge($params, $optParams);
-    return $this->call('get', array($params), "Google_Service_TagManager_Environment");
-  }
-  /**
-   * Lists all GTM Environments of a GTM Container.
-   * (environments.listAccountsContainersEnvironments)
-   *
-   * @param string $accountId The GTM Account ID.
-   * @param string $containerId The GTM Container ID.
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_TagManager_ListEnvironmentsResponse
-   */
-  public function listAccountsContainersEnvironments($accountId, $containerId, $optParams = array())
-  {
-    $params = array('accountId' => $accountId, 'containerId' => $containerId);
-    $params = array_merge($params, $optParams);
-    return $this->call('list', array($params), "Google_Service_TagManager_ListEnvironmentsResponse");
-  }
-  /**
-   * Updates a GTM Environment. This method supports patch semantics.
-   * (environments.patch)
-   *
-   * @param string $accountId The GTM Account ID.
-   * @param string $containerId The GTM Container ID.
-   * @param string $environmentId The GTM Environment ID.
-   * @param Google_Service_TagManager_Environment $postBody
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param string fingerprint When provided, this fingerprint must match the
-   * fingerprint of the environment in storage.
-   * @return Google_Service_TagManager_Environment
-   */
-  public function patch($accountId, $containerId, $environmentId, Google_Service_TagManager_Environment $postBody, $optParams = array())
-  {
-    $params = array('accountId' => $accountId, 'containerId' => $containerId, 'environmentId' => $environmentId, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('patch', array($params), "Google_Service_TagManager_Environment");
-  }
-  /**
-   * Updates a GTM Environment. (environments.update)
-   *
-   * @param string $accountId The GTM Account ID.
-   * @param string $containerId The GTM Container ID.
-   * @param string $environmentId The GTM Environment ID.
-   * @param Google_Service_TagManager_Environment $postBody
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param string fingerprint When provided, this fingerprint must match the
-   * fingerprint of the environment in storage.
-   * @return Google_Service_TagManager_Environment
-   */
-  public function update($accountId, $containerId, $environmentId, Google_Service_TagManager_Environment $postBody, $optParams = array())
-  {
-    $params = array('accountId' => $accountId, 'containerId' => $containerId, 'environmentId' => $environmentId, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('update', array($params), "Google_Service_TagManager_Environment");
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/TagManager/Resource/AccountsContainersFolders.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/TagManager/Resource/AccountsContainersFolders.php
deleted file mode 100644
index 14dc80ca..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/TagManager/Resource/AccountsContainersFolders.php
+++ /dev/null
@@ -1,105 +0,0 @@
-
- *   $tagmanagerService = new Google_Service_TagManager(...);
- *   $folders = $tagmanagerService->folders;
- *  
- */
-class Google_Service_TagManager_Resource_AccountsContainersFolders extends Google_Service_Resource
-{
-  /**
-   * Creates a GTM Folder. (folders.create)
-   *
-   * @param string $accountId The GTM Account ID.
-   * @param string $containerId The GTM Container ID.
-   * @param Google_Service_TagManager_Folder $postBody
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_TagManager_Folder
-   */
-  public function create($accountId, $containerId, Google_Service_TagManager_Folder $postBody, $optParams = array())
-  {
-    $params = array('accountId' => $accountId, 'containerId' => $containerId, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('create', array($params), "Google_Service_TagManager_Folder");
-  }
-  /**
-   * Deletes a GTM Folder. (folders.delete)
-   *
-   * @param string $accountId The GTM Account ID.
-   * @param string $containerId The GTM Container ID.
-   * @param string $folderId The GTM Folder ID.
-   * @param array $optParams Optional parameters.
-   */
-  public function delete($accountId, $containerId, $folderId, $optParams = array())
-  {
-    $params = array('accountId' => $accountId, 'containerId' => $containerId, 'folderId' => $folderId);
-    $params = array_merge($params, $optParams);
-    return $this->call('delete', array($params));
-  }
-  /**
-   * Gets a GTM Folder. (folders.get)
-   *
-   * @param string $accountId The GTM Account ID.
-   * @param string $containerId The GTM Container ID.
-   * @param string $folderId The GTM Folder ID.
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_TagManager_Folder
-   */
-  public function get($accountId, $containerId, $folderId, $optParams = array())
-  {
-    $params = array('accountId' => $accountId, 'containerId' => $containerId, 'folderId' => $folderId);
-    $params = array_merge($params, $optParams);
-    return $this->call('get', array($params), "Google_Service_TagManager_Folder");
-  }
-  /**
-   * Lists all GTM Folders of a Container. (folders.listAccountsContainersFolders)
-   *
-   * @param string $accountId The GTM Account ID.
-   * @param string $containerId The GTM Container ID.
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_TagManager_ListFoldersResponse
-   */
-  public function listAccountsContainersFolders($accountId, $containerId, $optParams = array())
-  {
-    $params = array('accountId' => $accountId, 'containerId' => $containerId);
-    $params = array_merge($params, $optParams);
-    return $this->call('list', array($params), "Google_Service_TagManager_ListFoldersResponse");
-  }
-  /**
-   * Updates a GTM Folder. (folders.update)
-   *
-   * @param string $accountId The GTM Account ID.
-   * @param string $containerId The GTM Container ID.
-   * @param string $folderId The GTM Folder ID.
-   * @param Google_Service_TagManager_Folder $postBody
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param string fingerprint When provided, this fingerprint must match the
-   * fingerprint of the folder in storage.
-   * @return Google_Service_TagManager_Folder
-   */
-  public function update($accountId, $containerId, $folderId, Google_Service_TagManager_Folder $postBody, $optParams = array())
-  {
-    $params = array('accountId' => $accountId, 'containerId' => $containerId, 'folderId' => $folderId, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('update', array($params), "Google_Service_TagManager_Folder");
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/TagManager/Resource/AccountsContainersFoldersEntities.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/TagManager/Resource/AccountsContainersFoldersEntities.php
deleted file mode 100644
index cc587718..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/TagManager/Resource/AccountsContainersFoldersEntities.php
+++ /dev/null
@@ -1,44 +0,0 @@
-
- *   $tagmanagerService = new Google_Service_TagManager(...);
- *   $entities = $tagmanagerService->entities;
- *  
- */
-class Google_Service_TagManager_Resource_AccountsContainersFoldersEntities extends Google_Service_Resource
-{
-  /**
-   * List all entities in a GTM Folder.
-   * (entities.listAccountsContainersFoldersEntities)
-   *
-   * @param string $accountId The GTM Account ID.
-   * @param string $containerId The GTM Container ID.
-   * @param string $folderId The GTM Folder ID.
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_TagManager_FolderEntities
-   */
-  public function listAccountsContainersFoldersEntities($accountId, $containerId, $folderId, $optParams = array())
-  {
-    $params = array('accountId' => $accountId, 'containerId' => $containerId, 'folderId' => $folderId);
-    $params = array_merge($params, $optParams);
-    return $this->call('list', array($params), "Google_Service_TagManager_FolderEntities");
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/TagManager/Resource/AccountsContainersMoveFolders.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/TagManager/Resource/AccountsContainersMoveFolders.php
deleted file mode 100644
index 7e18b61c..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/TagManager/Resource/AccountsContainersMoveFolders.php
+++ /dev/null
@@ -1,47 +0,0 @@
-
- *   $tagmanagerService = new Google_Service_TagManager(...);
- *   $move_folders = $tagmanagerService->move_folders;
- *  
- */
-class Google_Service_TagManager_Resource_AccountsContainersMoveFolders extends Google_Service_Resource
-{
-  /**
-   * Moves entities to a GTM Folder. (move_folders.update)
-   *
-   * @param string $accountId The GTM Account ID.
-   * @param string $containerId The GTM Container ID.
-   * @param string $folderId The GTM Folder ID.
-   * @param Google_Service_TagManager_Folder $postBody
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param string tagId The tags to be moved to the folder.
-   * @opt_param string triggerId The triggers to be moved to the folder.
-   * @opt_param string variableId The variables to be moved to the folder.
-   */
-  public function update($accountId, $containerId, $folderId, Google_Service_TagManager_Folder $postBody, $optParams = array())
-  {
-    $params = array('accountId' => $accountId, 'containerId' => $containerId, 'folderId' => $folderId, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('update', array($params));
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/TagManager/Resource/AccountsContainersReauthorizeEnvironments.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/TagManager/Resource/AccountsContainersReauthorizeEnvironments.php
deleted file mode 100644
index 7d7be2a1..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/TagManager/Resource/AccountsContainersReauthorizeEnvironments.php
+++ /dev/null
@@ -1,45 +0,0 @@
-
- *   $tagmanagerService = new Google_Service_TagManager(...);
- *   $reauthorize_environments = $tagmanagerService->reauthorize_environments;
- *  
- */
-class Google_Service_TagManager_Resource_AccountsContainersReauthorizeEnvironments extends Google_Service_Resource
-{
-  /**
-   * Re-generates the authorization code for a GTM Environment.
-   * (reauthorize_environments.update)
-   *
-   * @param string $accountId The GTM Account ID.
-   * @param string $containerId The GTM Container ID.
-   * @param string $environmentId The GTM Environment ID.
-   * @param Google_Service_TagManager_Environment $postBody
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_TagManager_Environment
-   */
-  public function update($accountId, $containerId, $environmentId, Google_Service_TagManager_Environment $postBody, $optParams = array())
-  {
-    $params = array('accountId' => $accountId, 'containerId' => $containerId, 'environmentId' => $environmentId, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('update', array($params), "Google_Service_TagManager_Environment");
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/TagManager/Resource/AccountsContainersTags.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/TagManager/Resource/AccountsContainersTags.php
deleted file mode 100644
index f1ca469e..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/TagManager/Resource/AccountsContainersTags.php
+++ /dev/null
@@ -1,105 +0,0 @@
-
- *   $tagmanagerService = new Google_Service_TagManager(...);
- *   $tags = $tagmanagerService->tags;
- *  
- */
-class Google_Service_TagManager_Resource_AccountsContainersTags extends Google_Service_Resource
-{
-  /**
-   * Creates a GTM Tag. (tags.create)
-   *
-   * @param string $accountId The GTM Account ID.
-   * @param string $containerId The GTM Container ID.
-   * @param Google_Service_TagManager_Tag $postBody
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_TagManager_Tag
-   */
-  public function create($accountId, $containerId, Google_Service_TagManager_Tag $postBody, $optParams = array())
-  {
-    $params = array('accountId' => $accountId, 'containerId' => $containerId, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('create', array($params), "Google_Service_TagManager_Tag");
-  }
-  /**
-   * Deletes a GTM Tag. (tags.delete)
-   *
-   * @param string $accountId The GTM Account ID.
-   * @param string $containerId The GTM Container ID.
-   * @param string $tagId The GTM Tag ID.
-   * @param array $optParams Optional parameters.
-   */
-  public function delete($accountId, $containerId, $tagId, $optParams = array())
-  {
-    $params = array('accountId' => $accountId, 'containerId' => $containerId, 'tagId' => $tagId);
-    $params = array_merge($params, $optParams);
-    return $this->call('delete', array($params));
-  }
-  /**
-   * Gets a GTM Tag. (tags.get)
-   *
-   * @param string $accountId The GTM Account ID.
-   * @param string $containerId The GTM Container ID.
-   * @param string $tagId The GTM Tag ID.
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_TagManager_Tag
-   */
-  public function get($accountId, $containerId, $tagId, $optParams = array())
-  {
-    $params = array('accountId' => $accountId, 'containerId' => $containerId, 'tagId' => $tagId);
-    $params = array_merge($params, $optParams);
-    return $this->call('get', array($params), "Google_Service_TagManager_Tag");
-  }
-  /**
-   * Lists all GTM Tags of a Container. (tags.listAccountsContainersTags)
-   *
-   * @param string $accountId The GTM Account ID.
-   * @param string $containerId The GTM Container ID.
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_TagManager_ListTagsResponse
-   */
-  public function listAccountsContainersTags($accountId, $containerId, $optParams = array())
-  {
-    $params = array('accountId' => $accountId, 'containerId' => $containerId);
-    $params = array_merge($params, $optParams);
-    return $this->call('list', array($params), "Google_Service_TagManager_ListTagsResponse");
-  }
-  /**
-   * Updates a GTM Tag. (tags.update)
-   *
-   * @param string $accountId The GTM Account ID.
-   * @param string $containerId The GTM Container ID.
-   * @param string $tagId The GTM Tag ID.
-   * @param Google_Service_TagManager_Tag $postBody
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param string fingerprint When provided, this fingerprint must match the
-   * fingerprint of the tag in storage.
-   * @return Google_Service_TagManager_Tag
-   */
-  public function update($accountId, $containerId, $tagId, Google_Service_TagManager_Tag $postBody, $optParams = array())
-  {
-    $params = array('accountId' => $accountId, 'containerId' => $containerId, 'tagId' => $tagId, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('update', array($params), "Google_Service_TagManager_Tag");
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/TagManager/Resource/AccountsContainersTriggers.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/TagManager/Resource/AccountsContainersTriggers.php
deleted file mode 100644
index bcd55b2d..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/TagManager/Resource/AccountsContainersTriggers.php
+++ /dev/null
@@ -1,106 +0,0 @@
-
- *   $tagmanagerService = new Google_Service_TagManager(...);
- *   $triggers = $tagmanagerService->triggers;
- *  
- */
-class Google_Service_TagManager_Resource_AccountsContainersTriggers extends Google_Service_Resource
-{
-  /**
-   * Creates a GTM Trigger. (triggers.create)
-   *
-   * @param string $accountId The GTM Account ID.
-   * @param string $containerId The GTM Container ID.
-   * @param Google_Service_TagManager_Trigger $postBody
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_TagManager_Trigger
-   */
-  public function create($accountId, $containerId, Google_Service_TagManager_Trigger $postBody, $optParams = array())
-  {
-    $params = array('accountId' => $accountId, 'containerId' => $containerId, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('create', array($params), "Google_Service_TagManager_Trigger");
-  }
-  /**
-   * Deletes a GTM Trigger. (triggers.delete)
-   *
-   * @param string $accountId The GTM Account ID.
-   * @param string $containerId The GTM Container ID.
-   * @param string $triggerId The GTM Trigger ID.
-   * @param array $optParams Optional parameters.
-   */
-  public function delete($accountId, $containerId, $triggerId, $optParams = array())
-  {
-    $params = array('accountId' => $accountId, 'containerId' => $containerId, 'triggerId' => $triggerId);
-    $params = array_merge($params, $optParams);
-    return $this->call('delete', array($params));
-  }
-  /**
-   * Gets a GTM Trigger. (triggers.get)
-   *
-   * @param string $accountId The GTM Account ID.
-   * @param string $containerId The GTM Container ID.
-   * @param string $triggerId The GTM Trigger ID.
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_TagManager_Trigger
-   */
-  public function get($accountId, $containerId, $triggerId, $optParams = array())
-  {
-    $params = array('accountId' => $accountId, 'containerId' => $containerId, 'triggerId' => $triggerId);
-    $params = array_merge($params, $optParams);
-    return $this->call('get', array($params), "Google_Service_TagManager_Trigger");
-  }
-  /**
-   * Lists all GTM Triggers of a Container.
-   * (triggers.listAccountsContainersTriggers)
-   *
-   * @param string $accountId The GTM Account ID.
-   * @param string $containerId The GTM Container ID.
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_TagManager_ListTriggersResponse
-   */
-  public function listAccountsContainersTriggers($accountId, $containerId, $optParams = array())
-  {
-    $params = array('accountId' => $accountId, 'containerId' => $containerId);
-    $params = array_merge($params, $optParams);
-    return $this->call('list', array($params), "Google_Service_TagManager_ListTriggersResponse");
-  }
-  /**
-   * Updates a GTM Trigger. (triggers.update)
-   *
-   * @param string $accountId The GTM Account ID.
-   * @param string $containerId The GTM Container ID.
-   * @param string $triggerId The GTM Trigger ID.
-   * @param Google_Service_TagManager_Trigger $postBody
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param string fingerprint When provided, this fingerprint must match the
-   * fingerprint of the trigger in storage.
-   * @return Google_Service_TagManager_Trigger
-   */
-  public function update($accountId, $containerId, $triggerId, Google_Service_TagManager_Trigger $postBody, $optParams = array())
-  {
-    $params = array('accountId' => $accountId, 'containerId' => $containerId, 'triggerId' => $triggerId, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('update', array($params), "Google_Service_TagManager_Trigger");
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/TagManager/Resource/AccountsContainersVariables.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/TagManager/Resource/AccountsContainersVariables.php
deleted file mode 100644
index 52a8da84..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/TagManager/Resource/AccountsContainersVariables.php
+++ /dev/null
@@ -1,106 +0,0 @@
-
- *   $tagmanagerService = new Google_Service_TagManager(...);
- *   $variables = $tagmanagerService->variables;
- *  
- */
-class Google_Service_TagManager_Resource_AccountsContainersVariables extends Google_Service_Resource
-{
-  /**
-   * Creates a GTM Variable. (variables.create)
-   *
-   * @param string $accountId The GTM Account ID.
-   * @param string $containerId The GTM Container ID.
-   * @param Google_Service_TagManager_Variable $postBody
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_TagManager_Variable
-   */
-  public function create($accountId, $containerId, Google_Service_TagManager_Variable $postBody, $optParams = array())
-  {
-    $params = array('accountId' => $accountId, 'containerId' => $containerId, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('create', array($params), "Google_Service_TagManager_Variable");
-  }
-  /**
-   * Deletes a GTM Variable. (variables.delete)
-   *
-   * @param string $accountId The GTM Account ID.
-   * @param string $containerId The GTM Container ID.
-   * @param string $variableId The GTM Variable ID.
-   * @param array $optParams Optional parameters.
-   */
-  public function delete($accountId, $containerId, $variableId, $optParams = array())
-  {
-    $params = array('accountId' => $accountId, 'containerId' => $containerId, 'variableId' => $variableId);
-    $params = array_merge($params, $optParams);
-    return $this->call('delete', array($params));
-  }
-  /**
-   * Gets a GTM Variable. (variables.get)
-   *
-   * @param string $accountId The GTM Account ID.
-   * @param string $containerId The GTM Container ID.
-   * @param string $variableId The GTM Variable ID.
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_TagManager_Variable
-   */
-  public function get($accountId, $containerId, $variableId, $optParams = array())
-  {
-    $params = array('accountId' => $accountId, 'containerId' => $containerId, 'variableId' => $variableId);
-    $params = array_merge($params, $optParams);
-    return $this->call('get', array($params), "Google_Service_TagManager_Variable");
-  }
-  /**
-   * Lists all GTM Variables of a Container.
-   * (variables.listAccountsContainersVariables)
-   *
-   * @param string $accountId The GTM Account ID.
-   * @param string $containerId The GTM Container ID.
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_TagManager_ListVariablesResponse
-   */
-  public function listAccountsContainersVariables($accountId, $containerId, $optParams = array())
-  {
-    $params = array('accountId' => $accountId, 'containerId' => $containerId);
-    $params = array_merge($params, $optParams);
-    return $this->call('list', array($params), "Google_Service_TagManager_ListVariablesResponse");
-  }
-  /**
-   * Updates a GTM Variable. (variables.update)
-   *
-   * @param string $accountId The GTM Account ID.
-   * @param string $containerId The GTM Container ID.
-   * @param string $variableId The GTM Variable ID.
-   * @param Google_Service_TagManager_Variable $postBody
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param string fingerprint When provided, this fingerprint must match the
-   * fingerprint of the variable in storage.
-   * @return Google_Service_TagManager_Variable
-   */
-  public function update($accountId, $containerId, $variableId, Google_Service_TagManager_Variable $postBody, $optParams = array())
-  {
-    $params = array('accountId' => $accountId, 'containerId' => $containerId, 'variableId' => $variableId, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('update', array($params), "Google_Service_TagManager_Variable");
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/TagManager/Resource/AccountsContainersVersions.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/TagManager/Resource/AccountsContainersVersions.php
deleted file mode 100644
index 3ed0e924..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/TagManager/Resource/AccountsContainersVersions.php
+++ /dev/null
@@ -1,162 +0,0 @@
-
- *   $tagmanagerService = new Google_Service_TagManager(...);
- *   $versions = $tagmanagerService->versions;
- *  
- */
-class Google_Service_TagManager_Resource_AccountsContainersVersions extends Google_Service_Resource
-{
-  /**
-   * Creates a Container Version. (versions.create)
-   *
-   * @param string $accountId The GTM Account ID.
-   * @param string $containerId The GTM Container ID.
-   * @param Google_Service_TagManager_CreateContainerVersionRequestVersionOptions $postBody
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_TagManager_CreateContainerVersionResponse
-   */
-  public function create($accountId, $containerId, Google_Service_TagManager_CreateContainerVersionRequestVersionOptions $postBody, $optParams = array())
-  {
-    $params = array('accountId' => $accountId, 'containerId' => $containerId, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('create', array($params), "Google_Service_TagManager_CreateContainerVersionResponse");
-  }
-  /**
-   * Deletes a Container Version. (versions.delete)
-   *
-   * @param string $accountId The GTM Account ID.
-   * @param string $containerId The GTM Container ID.
-   * @param string $containerVersionId The GTM Container Version ID.
-   * @param array $optParams Optional parameters.
-   */
-  public function delete($accountId, $containerId, $containerVersionId, $optParams = array())
-  {
-    $params = array('accountId' => $accountId, 'containerId' => $containerId, 'containerVersionId' => $containerVersionId);
-    $params = array_merge($params, $optParams);
-    return $this->call('delete', array($params));
-  }
-  /**
-   * Gets a Container Version. (versions.get)
-   *
-   * @param string $accountId The GTM Account ID.
-   * @param string $containerId The GTM Container ID.
-   * @param string $containerVersionId The GTM Container Version ID. Specify
-   * published to retrieve the currently published version.
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_TagManager_ContainerVersion
-   */
-  public function get($accountId, $containerId, $containerVersionId, $optParams = array())
-  {
-    $params = array('accountId' => $accountId, 'containerId' => $containerId, 'containerVersionId' => $containerVersionId);
-    $params = array_merge($params, $optParams);
-    return $this->call('get', array($params), "Google_Service_TagManager_ContainerVersion");
-  }
-  /**
-   * Lists all Container Versions of a GTM Container.
-   * (versions.listAccountsContainersVersions)
-   *
-   * @param string $accountId The GTM Account ID.
-   * @param string $containerId The GTM Container ID.
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param bool headers Retrieve headers only when true.
-   * @opt_param bool includeDeleted Also retrieve deleted (archived) versions when
-   * true.
-   * @return Google_Service_TagManager_ListContainerVersionsResponse
-   */
-  public function listAccountsContainersVersions($accountId, $containerId, $optParams = array())
-  {
-    $params = array('accountId' => $accountId, 'containerId' => $containerId);
-    $params = array_merge($params, $optParams);
-    return $this->call('list', array($params), "Google_Service_TagManager_ListContainerVersionsResponse");
-  }
-  /**
-   * Publishes a Container Version. (versions.publish)
-   *
-   * @param string $accountId The GTM Account ID.
-   * @param string $containerId The GTM Container ID.
-   * @param string $containerVersionId The GTM Container Version ID.
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param string fingerprint When provided, this fingerprint must match the
-   * fingerprint of the container version in storage.
-   * @return Google_Service_TagManager_PublishContainerVersionResponse
-   */
-  public function publish($accountId, $containerId, $containerVersionId, $optParams = array())
-  {
-    $params = array('accountId' => $accountId, 'containerId' => $containerId, 'containerVersionId' => $containerVersionId);
-    $params = array_merge($params, $optParams);
-    return $this->call('publish', array($params), "Google_Service_TagManager_PublishContainerVersionResponse");
-  }
-  /**
-   * Restores a Container Version. This will overwrite the container's current
-   * configuration (including its variables, triggers and tags). The operation
-   * will not have any effect on the version that is being served (i.e. the
-   * published version). (versions.restore)
-   *
-   * @param string $accountId The GTM Account ID.
-   * @param string $containerId The GTM Container ID.
-   * @param string $containerVersionId The GTM Container Version ID.
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_TagManager_ContainerVersion
-   */
-  public function restore($accountId, $containerId, $containerVersionId, $optParams = array())
-  {
-    $params = array('accountId' => $accountId, 'containerId' => $containerId, 'containerVersionId' => $containerVersionId);
-    $params = array_merge($params, $optParams);
-    return $this->call('restore', array($params), "Google_Service_TagManager_ContainerVersion");
-  }
-  /**
-   * Undeletes a Container Version. (versions.undelete)
-   *
-   * @param string $accountId The GTM Account ID.
-   * @param string $containerId The GTM Container ID.
-   * @param string $containerVersionId The GTM Container Version ID.
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_TagManager_ContainerVersion
-   */
-  public function undelete($accountId, $containerId, $containerVersionId, $optParams = array())
-  {
-    $params = array('accountId' => $accountId, 'containerId' => $containerId, 'containerVersionId' => $containerVersionId);
-    $params = array_merge($params, $optParams);
-    return $this->call('undelete', array($params), "Google_Service_TagManager_ContainerVersion");
-  }
-  /**
-   * Updates a Container Version. (versions.update)
-   *
-   * @param string $accountId The GTM Account ID.
-   * @param string $containerId The GTM Container ID.
-   * @param string $containerVersionId The GTM Container Version ID.
-   * @param Google_Service_TagManager_ContainerVersion $postBody
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param string fingerprint When provided, this fingerprint must match the
-   * fingerprint of the container version in storage.
-   * @return Google_Service_TagManager_ContainerVersion
-   */
-  public function update($accountId, $containerId, $containerVersionId, Google_Service_TagManager_ContainerVersion $postBody, $optParams = array())
-  {
-    $params = array('accountId' => $accountId, 'containerId' => $containerId, 'containerVersionId' => $containerVersionId, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('update', array($params), "Google_Service_TagManager_ContainerVersion");
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/TagManager/Resource/AccountsPermissions.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/TagManager/Resource/AccountsPermissions.php
deleted file mode 100644
index 009a2d65..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/TagManager/Resource/AccountsPermissions.php
+++ /dev/null
@@ -1,101 +0,0 @@
-
- *   $tagmanagerService = new Google_Service_TagManager(...);
- *   $permissions = $tagmanagerService->permissions;
- *  
- */
-class Google_Service_TagManager_Resource_AccountsPermissions extends Google_Service_Resource
-{
-  /**
-   * Creates a user's Account & Container Permissions. (permissions.create)
-   *
-   * @param string $accountId The GTM Account ID.
-   * @param Google_Service_TagManager_UserAccess $postBody
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_TagManager_UserAccess
-   */
-  public function create($accountId, Google_Service_TagManager_UserAccess $postBody, $optParams = array())
-  {
-    $params = array('accountId' => $accountId, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('create', array($params), "Google_Service_TagManager_UserAccess");
-  }
-  /**
-   * Removes a user from the account, revoking access to it and all of its
-   * containers. (permissions.delete)
-   *
-   * @param string $accountId The GTM Account ID.
-   * @param string $permissionId The GTM User ID.
-   * @param array $optParams Optional parameters.
-   */
-  public function delete($accountId, $permissionId, $optParams = array())
-  {
-    $params = array('accountId' => $accountId, 'permissionId' => $permissionId);
-    $params = array_merge($params, $optParams);
-    return $this->call('delete', array($params));
-  }
-  /**
-   * Gets a user's Account & Container Permissions. (permissions.get)
-   *
-   * @param string $accountId The GTM Account ID.
-   * @param string $permissionId The GTM User ID.
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_TagManager_UserAccess
-   */
-  public function get($accountId, $permissionId, $optParams = array())
-  {
-    $params = array('accountId' => $accountId, 'permissionId' => $permissionId);
-    $params = array_merge($params, $optParams);
-    return $this->call('get', array($params), "Google_Service_TagManager_UserAccess");
-  }
-  /**
-   * List all users that have access to the account along with Account and
-   * Container Permissions granted to each of them.
-   * (permissions.listAccountsPermissions)
-   *
-   * @param string $accountId The GTM Account ID. @required
-   * tagmanager.accounts.permissions.list
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_TagManager_ListAccountUsersResponse
-   */
-  public function listAccountsPermissions($accountId, $optParams = array())
-  {
-    $params = array('accountId' => $accountId);
-    $params = array_merge($params, $optParams);
-    return $this->call('list', array($params), "Google_Service_TagManager_ListAccountUsersResponse");
-  }
-  /**
-   * Updates a user's Account & Container Permissions. (permissions.update)
-   *
-   * @param string $accountId The GTM Account ID.
-   * @param string $permissionId The GTM User ID.
-   * @param Google_Service_TagManager_UserAccess $postBody
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_TagManager_UserAccess
-   */
-  public function update($accountId, $permissionId, Google_Service_TagManager_UserAccess $postBody, $optParams = array())
-  {
-    $params = array('accountId' => $accountId, 'permissionId' => $permissionId, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('update', array($params), "Google_Service_TagManager_UserAccess");
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/TagManager/Rule.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/TagManager/Rule.php
deleted file mode 100644
index ef38ca26..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/TagManager/Rule.php
+++ /dev/null
@@ -1,86 +0,0 @@
-accountId = $accountId;
-  }
-  public function getAccountId()
-  {
-    return $this->accountId;
-  }
-  public function setCondition($condition)
-  {
-    $this->condition = $condition;
-  }
-  public function getCondition()
-  {
-    return $this->condition;
-  }
-  public function setContainerId($containerId)
-  {
-    $this->containerId = $containerId;
-  }
-  public function getContainerId()
-  {
-    return $this->containerId;
-  }
-  public function setFingerprint($fingerprint)
-  {
-    $this->fingerprint = $fingerprint;
-  }
-  public function getFingerprint()
-  {
-    return $this->fingerprint;
-  }
-  public function setName($name)
-  {
-    $this->name = $name;
-  }
-  public function getName()
-  {
-    return $this->name;
-  }
-  public function setNotes($notes)
-  {
-    $this->notes = $notes;
-  }
-  public function getNotes()
-  {
-    return $this->notes;
-  }
-  public function setRuleId($ruleId)
-  {
-    $this->ruleId = $ruleId;
-  }
-  public function getRuleId()
-  {
-    return $this->ruleId;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/TagManager/SetupTag.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/TagManager/SetupTag.php
deleted file mode 100644
index 98c24d66..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/TagManager/SetupTag.php
+++ /dev/null
@@ -1,39 +0,0 @@
-stopOnSetupFailure = $stopOnSetupFailure;
-  }
-  public function getStopOnSetupFailure()
-  {
-    return $this->stopOnSetupFailure;
-  }
-  public function setTagName($tagName)
-  {
-    $this->tagName = $tagName;
-  }
-  public function getTagName()
-  {
-    return $this->tagName;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/TagManager/Tag.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/TagManager/Tag.php
deleted file mode 100644
index 92a18b72..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/TagManager/Tag.php
+++ /dev/null
@@ -1,206 +0,0 @@
-accountId = $accountId;
-  }
-  public function getAccountId()
-  {
-    return $this->accountId;
-  }
-  public function setBlockingRuleId($blockingRuleId)
-  {
-    $this->blockingRuleId = $blockingRuleId;
-  }
-  public function getBlockingRuleId()
-  {
-    return $this->blockingRuleId;
-  }
-  public function setBlockingTriggerId($blockingTriggerId)
-  {
-    $this->blockingTriggerId = $blockingTriggerId;
-  }
-  public function getBlockingTriggerId()
-  {
-    return $this->blockingTriggerId;
-  }
-  public function setContainerId($containerId)
-  {
-    $this->containerId = $containerId;
-  }
-  public function getContainerId()
-  {
-    return $this->containerId;
-  }
-  public function setFingerprint($fingerprint)
-  {
-    $this->fingerprint = $fingerprint;
-  }
-  public function getFingerprint()
-  {
-    return $this->fingerprint;
-  }
-  public function setFiringRuleId($firingRuleId)
-  {
-    $this->firingRuleId = $firingRuleId;
-  }
-  public function getFiringRuleId()
-  {
-    return $this->firingRuleId;
-  }
-  public function setFiringTriggerId($firingTriggerId)
-  {
-    $this->firingTriggerId = $firingTriggerId;
-  }
-  public function getFiringTriggerId()
-  {
-    return $this->firingTriggerId;
-  }
-  public function setLiveOnly($liveOnly)
-  {
-    $this->liveOnly = $liveOnly;
-  }
-  public function getLiveOnly()
-  {
-    return $this->liveOnly;
-  }
-  public function setName($name)
-  {
-    $this->name = $name;
-  }
-  public function getName()
-  {
-    return $this->name;
-  }
-  public function setNotes($notes)
-  {
-    $this->notes = $notes;
-  }
-  public function getNotes()
-  {
-    return $this->notes;
-  }
-  public function setParameter($parameter)
-  {
-    $this->parameter = $parameter;
-  }
-  public function getParameter()
-  {
-    return $this->parameter;
-  }
-  public function setParentFolderId($parentFolderId)
-  {
-    $this->parentFolderId = $parentFolderId;
-  }
-  public function getParentFolderId()
-  {
-    return $this->parentFolderId;
-  }
-  public function setPriority(Google_Service_TagManager_Parameter $priority)
-  {
-    $this->priority = $priority;
-  }
-  public function getPriority()
-  {
-    return $this->priority;
-  }
-  public function setScheduleEndMs($scheduleEndMs)
-  {
-    $this->scheduleEndMs = $scheduleEndMs;
-  }
-  public function getScheduleEndMs()
-  {
-    return $this->scheduleEndMs;
-  }
-  public function setScheduleStartMs($scheduleStartMs)
-  {
-    $this->scheduleStartMs = $scheduleStartMs;
-  }
-  public function getScheduleStartMs()
-  {
-    return $this->scheduleStartMs;
-  }
-  public function setSetupTag($setupTag)
-  {
-    $this->setupTag = $setupTag;
-  }
-  public function getSetupTag()
-  {
-    return $this->setupTag;
-  }
-  public function setTagFiringOption($tagFiringOption)
-  {
-    $this->tagFiringOption = $tagFiringOption;
-  }
-  public function getTagFiringOption()
-  {
-    return $this->tagFiringOption;
-  }
-  public function setTagId($tagId)
-  {
-    $this->tagId = $tagId;
-  }
-  public function getTagId()
-  {
-    return $this->tagId;
-  }
-  public function setTeardownTag($teardownTag)
-  {
-    $this->teardownTag = $teardownTag;
-  }
-  public function getTeardownTag()
-  {
-    return $this->teardownTag;
-  }
-  public function setType($type)
-  {
-    $this->type = $type;
-  }
-  public function getType()
-  {
-    return $this->type;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/TagManager/TeardownTag.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/TagManager/TeardownTag.php
deleted file mode 100644
index f0a8e3c2..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/TagManager/TeardownTag.php
+++ /dev/null
@@ -1,39 +0,0 @@
-stopTeardownOnFailure = $stopTeardownOnFailure;
-  }
-  public function getStopTeardownOnFailure()
-  {
-    return $this->stopTeardownOnFailure;
-  }
-  public function setTagName($tagName)
-  {
-    $this->tagName = $tagName;
-  }
-  public function getTagName()
-  {
-    return $this->tagName;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/TagManager/Trigger.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/TagManager/Trigger.php
deleted file mode 100644
index 5f8391a8..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/TagManager/Trigger.php
+++ /dev/null
@@ -1,205 +0,0 @@
-accountId = $accountId;
-  }
-  public function getAccountId()
-  {
-    return $this->accountId;
-  }
-  public function setAutoEventFilter($autoEventFilter)
-  {
-    $this->autoEventFilter = $autoEventFilter;
-  }
-  public function getAutoEventFilter()
-  {
-    return $this->autoEventFilter;
-  }
-  public function setCheckValidation(Google_Service_TagManager_Parameter $checkValidation)
-  {
-    $this->checkValidation = $checkValidation;
-  }
-  public function getCheckValidation()
-  {
-    return $this->checkValidation;
-  }
-  public function setContainerId($containerId)
-  {
-    $this->containerId = $containerId;
-  }
-  public function getContainerId()
-  {
-    return $this->containerId;
-  }
-  public function setCustomEventFilter($customEventFilter)
-  {
-    $this->customEventFilter = $customEventFilter;
-  }
-  public function getCustomEventFilter()
-  {
-    return $this->customEventFilter;
-  }
-  public function setEnableAllVideos(Google_Service_TagManager_Parameter $enableAllVideos)
-  {
-    $this->enableAllVideos = $enableAllVideos;
-  }
-  public function getEnableAllVideos()
-  {
-    return $this->enableAllVideos;
-  }
-  public function setEventName(Google_Service_TagManager_Parameter $eventName)
-  {
-    $this->eventName = $eventName;
-  }
-  public function getEventName()
-  {
-    return $this->eventName;
-  }
-  public function setFilter($filter)
-  {
-    $this->filter = $filter;
-  }
-  public function getFilter()
-  {
-    return $this->filter;
-  }
-  public function setFingerprint($fingerprint)
-  {
-    $this->fingerprint = $fingerprint;
-  }
-  public function getFingerprint()
-  {
-    return $this->fingerprint;
-  }
-  public function setInterval(Google_Service_TagManager_Parameter $interval)
-  {
-    $this->interval = $interval;
-  }
-  public function getInterval()
-  {
-    return $this->interval;
-  }
-  public function setLimit(Google_Service_TagManager_Parameter $limit)
-  {
-    $this->limit = $limit;
-  }
-  public function getLimit()
-  {
-    return $this->limit;
-  }
-  public function setName($name)
-  {
-    $this->name = $name;
-  }
-  public function getName()
-  {
-    return $this->name;
-  }
-  public function setParentFolderId($parentFolderId)
-  {
-    $this->parentFolderId = $parentFolderId;
-  }
-  public function getParentFolderId()
-  {
-    return $this->parentFolderId;
-  }
-  public function setTriggerId($triggerId)
-  {
-    $this->triggerId = $triggerId;
-  }
-  public function getTriggerId()
-  {
-    return $this->triggerId;
-  }
-  public function setType($type)
-  {
-    $this->type = $type;
-  }
-  public function getType()
-  {
-    return $this->type;
-  }
-  public function setUniqueTriggerId(Google_Service_TagManager_Parameter $uniqueTriggerId)
-  {
-    $this->uniqueTriggerId = $uniqueTriggerId;
-  }
-  public function getUniqueTriggerId()
-  {
-    return $this->uniqueTriggerId;
-  }
-  public function setVideoPercentageList(Google_Service_TagManager_Parameter $videoPercentageList)
-  {
-    $this->videoPercentageList = $videoPercentageList;
-  }
-  public function getVideoPercentageList()
-  {
-    return $this->videoPercentageList;
-  }
-  public function setWaitForTags(Google_Service_TagManager_Parameter $waitForTags)
-  {
-    $this->waitForTags = $waitForTags;
-  }
-  public function getWaitForTags()
-  {
-    return $this->waitForTags;
-  }
-  public function setWaitForTagsTimeout(Google_Service_TagManager_Parameter $waitForTagsTimeout)
-  {
-    $this->waitForTagsTimeout = $waitForTagsTimeout;
-  }
-  public function getWaitForTagsTimeout()
-  {
-    return $this->waitForTagsTimeout;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/TagManager/UserAccess.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/TagManager/UserAccess.php
deleted file mode 100644
index 267eefeb..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/TagManager/UserAccess.php
+++ /dev/null
@@ -1,69 +0,0 @@
-accountAccess = $accountAccess;
-  }
-  public function getAccountAccess()
-  {
-    return $this->accountAccess;
-  }
-  public function setAccountId($accountId)
-  {
-    $this->accountId = $accountId;
-  }
-  public function getAccountId()
-  {
-    return $this->accountId;
-  }
-  public function setContainerAccess($containerAccess)
-  {
-    $this->containerAccess = $containerAccess;
-  }
-  public function getContainerAccess()
-  {
-    return $this->containerAccess;
-  }
-  public function setEmailAddress($emailAddress)
-  {
-    $this->emailAddress = $emailAddress;
-  }
-  public function getEmailAddress()
-  {
-    return $this->emailAddress;
-  }
-  public function setPermissionId($permissionId)
-  {
-    $this->permissionId = $permissionId;
-  }
-  public function getPermissionId()
-  {
-    return $this->permissionId;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/TagManager/Variable.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/TagManager/Variable.php
deleted file mode 100644
index 31558978..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/TagManager/Variable.php
+++ /dev/null
@@ -1,140 +0,0 @@
-accountId = $accountId;
-  }
-  public function getAccountId()
-  {
-    return $this->accountId;
-  }
-  public function setContainerId($containerId)
-  {
-    $this->containerId = $containerId;
-  }
-  public function getContainerId()
-  {
-    return $this->containerId;
-  }
-  public function setDisablingTriggerId($disablingTriggerId)
-  {
-    $this->disablingTriggerId = $disablingTriggerId;
-  }
-  public function getDisablingTriggerId()
-  {
-    return $this->disablingTriggerId;
-  }
-  public function setEnablingTriggerId($enablingTriggerId)
-  {
-    $this->enablingTriggerId = $enablingTriggerId;
-  }
-  public function getEnablingTriggerId()
-  {
-    return $this->enablingTriggerId;
-  }
-  public function setFingerprint($fingerprint)
-  {
-    $this->fingerprint = $fingerprint;
-  }
-  public function getFingerprint()
-  {
-    return $this->fingerprint;
-  }
-  public function setName($name)
-  {
-    $this->name = $name;
-  }
-  public function getName()
-  {
-    return $this->name;
-  }
-  public function setNotes($notes)
-  {
-    $this->notes = $notes;
-  }
-  public function getNotes()
-  {
-    return $this->notes;
-  }
-  public function setParameter($parameter)
-  {
-    $this->parameter = $parameter;
-  }
-  public function getParameter()
-  {
-    return $this->parameter;
-  }
-  public function setParentFolderId($parentFolderId)
-  {
-    $this->parentFolderId = $parentFolderId;
-  }
-  public function getParentFolderId()
-  {
-    return $this->parentFolderId;
-  }
-  public function setScheduleEndMs($scheduleEndMs)
-  {
-    $this->scheduleEndMs = $scheduleEndMs;
-  }
-  public function getScheduleEndMs()
-  {
-    return $this->scheduleEndMs;
-  }
-  public function setScheduleStartMs($scheduleStartMs)
-  {
-    $this->scheduleStartMs = $scheduleStartMs;
-  }
-  public function getScheduleStartMs()
-  {
-    return $this->scheduleStartMs;
-  }
-  public function setType($type)
-  {
-    $this->type = $type;
-  }
-  public function getType()
-  {
-    return $this->type;
-  }
-  public function setVariableId($variableId)
-  {
-    $this->variableId = $variableId;
-  }
-  public function getVariableId()
-  {
-    return $this->variableId;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Taskqueue.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Taskqueue.php
deleted file mode 100644
index 7f3221d1..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Taskqueue.php
+++ /dev/null
@@ -1,249 +0,0 @@
-
- * Accesses a Google App Engine Pull Task Queue over REST.

- *
- * 

- * For more information about this service, see the API
- * Documentation
- * 

- *
- * @author Google, Inc.
- */
-class Google_Service_Taskqueue extends Google_Service
-{
-  /** Manage your Tasks and Taskqueues. */
-  const TASKQUEUE =
-      "https://www.googleapis.com/auth/taskqueue";
-  /** Consume Tasks from your Taskqueues. */
-  const TASKQUEUE_CONSUMER =
-      "https://www.googleapis.com/auth/taskqueue.consumer";
-
-  public $taskqueues;
-  public $tasks;
-  
-  /**
-   * Constructs the internal representation of the Taskqueue service.
-   *
-   * @param Google_Client $client
-   */
-  public function __construct(Google_Client $client)
-  {
-    parent::__construct($client);
-    $this->rootUrl = 'https://www.googleapis.com/';
-    $this->servicePath = 'taskqueue/v1beta2/projects/';
-    $this->version = 'v1beta2';
-    $this->serviceName = 'taskqueue';
-
-    $this->taskqueues = new Google_Service_Taskqueue_Resource_Taskqueues(
-        $this,
-        $this->serviceName,
-        'taskqueues',
-        array(
-          'methods' => array(
-            'get' => array(
-              'path' => '{project}/taskqueues/{taskqueue}',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'project' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'taskqueue' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'getStats' => array(
-                  'location' => 'query',
-                  'type' => 'boolean',
-                ),
-              ),
-            ),
-          )
-        )
-    );
-    $this->tasks = new Google_Service_Taskqueue_Resource_Tasks(
-        $this,
-        $this->serviceName,
-        'tasks',
-        array(
-          'methods' => array(
-            'delete' => array(
-              'path' => '{project}/taskqueues/{taskqueue}/tasks/{task}',
-              'httpMethod' => 'DELETE',
-              'parameters' => array(
-                'project' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'taskqueue' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'task' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'get' => array(
-              'path' => '{project}/taskqueues/{taskqueue}/tasks/{task}',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'project' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'taskqueue' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'task' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'insert' => array(
-              'path' => '{project}/taskqueues/{taskqueue}/tasks',
-              'httpMethod' => 'POST',
-              'parameters' => array(
-                'project' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'taskqueue' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'lease' => array(
-              'path' => '{project}/taskqueues/{taskqueue}/tasks/lease',
-              'httpMethod' => 'POST',
-              'parameters' => array(
-                'project' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'taskqueue' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'numTasks' => array(
-                  'location' => 'query',
-                  'type' => 'integer',
-                  'required' => true,
-                ),
-                'leaseSecs' => array(
-                  'location' => 'query',
-                  'type' => 'integer',
-                  'required' => true,
-                ),
-                'groupByTag' => array(
-                  'location' => 'query',
-                  'type' => 'boolean',
-                ),
-                'tag' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-              ),
-            ),'list' => array(
-              'path' => '{project}/taskqueues/{taskqueue}/tasks',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'project' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'taskqueue' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'patch' => array(
-              'path' => '{project}/taskqueues/{taskqueue}/tasks/{task}',
-              'httpMethod' => 'PATCH',
-              'parameters' => array(
-                'project' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'taskqueue' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'task' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'newLeaseSeconds' => array(
-                  'location' => 'query',
-                  'type' => 'integer',
-                  'required' => true,
-                ),
-              ),
-            ),'update' => array(
-              'path' => '{project}/taskqueues/{taskqueue}/tasks/{task}',
-              'httpMethod' => 'POST',
-              'parameters' => array(
-                'project' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'taskqueue' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'task' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'newLeaseSeconds' => array(
-                  'location' => 'query',
-                  'type' => 'integer',
-                  'required' => true,
-                ),
-              ),
-            ),
-          )
-        )
-    );
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Taskqueue/Resource/Taskqueues.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Taskqueue/Resource/Taskqueues.php
deleted file mode 100644
index 75e6c36f..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Taskqueue/Resource/Taskqueues.php
+++ /dev/null
@@ -1,44 +0,0 @@
-
- *   $taskqueueService = new Google_Service_Taskqueue(...);
- *   $taskqueues = $taskqueueService->taskqueues;
- *  
- */
-class Google_Service_Taskqueue_Resource_Taskqueues extends Google_Service_Resource
-{
-  /**
-   * Get detailed information about a TaskQueue. (taskqueues.get)
-   *
-   * @param string $project The project under which the queue lies.
-   * @param string $taskqueue The id of the taskqueue to get the properties of.
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param bool getStats Whether to get stats. Optional.
-   * @return Google_Service_Taskqueue_TaskQueue
-   */
-  public function get($project, $taskqueue, $optParams = array())
-  {
-    $params = array('project' => $project, 'taskqueue' => $taskqueue);
-    $params = array_merge($params, $optParams);
-    return $this->call('get', array($params), "Google_Service_Taskqueue_TaskQueue");
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Taskqueue/Resource/Tasks.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Taskqueue/Resource/Tasks.php
deleted file mode 100644
index 79afd4ce..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Taskqueue/Resource/Tasks.php
+++ /dev/null
@@ -1,144 +0,0 @@
-
- *   $taskqueueService = new Google_Service_Taskqueue(...);
- *   $tasks = $taskqueueService->tasks;
- *  
- */
-class Google_Service_Taskqueue_Resource_Tasks extends Google_Service_Resource
-{
-  /**
-   * Delete a task from a TaskQueue. (tasks.delete)
-   *
-   * @param string $project The project under which the queue lies.
-   * @param string $taskqueue The taskqueue to delete a task from.
-   * @param string $task The id of the task to delete.
-   * @param array $optParams Optional parameters.
-   */
-  public function delete($project, $taskqueue, $task, $optParams = array())
-  {
-    $params = array('project' => $project, 'taskqueue' => $taskqueue, 'task' => $task);
-    $params = array_merge($params, $optParams);
-    return $this->call('delete', array($params));
-  }
-  /**
-   * Get a particular task from a TaskQueue. (tasks.get)
-   *
-   * @param string $project The project under which the queue lies.
-   * @param string $taskqueue The taskqueue in which the task belongs.
-   * @param string $task The task to get properties of.
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Taskqueue_Task
-   */
-  public function get($project, $taskqueue, $task, $optParams = array())
-  {
-    $params = array('project' => $project, 'taskqueue' => $taskqueue, 'task' => $task);
-    $params = array_merge($params, $optParams);
-    return $this->call('get', array($params), "Google_Service_Taskqueue_Task");
-  }
-  /**
-   * Insert a new task in a TaskQueue (tasks.insert)
-   *
-   * @param string $project The project under which the queue lies
-   * @param string $taskqueue The taskqueue to insert the task into
-   * @param Google_Service_Taskqueue_Task $postBody
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Taskqueue_Task
-   */
-  public function insert($project, $taskqueue, Google_Service_Taskqueue_Task $postBody, $optParams = array())
-  {
-    $params = array('project' => $project, 'taskqueue' => $taskqueue, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('insert', array($params), "Google_Service_Taskqueue_Task");
-  }
-  /**
-   * Lease 1 or more tasks from a TaskQueue. (tasks.lease)
-   *
-   * @param string $project The project under which the queue lies.
-   * @param string $taskqueue The taskqueue to lease a task from.
-   * @param int $numTasks The number of tasks to lease.
-   * @param int $leaseSecs The lease in seconds.
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param bool groupByTag When true, all returned tasks will have the same
-   * tag
-   * @opt_param string tag The tag allowed for tasks in the response. Must only be
-   * specified if group_by_tag is true. If group_by_tag is true and tag is not
-   * specified the tag will be that of the oldest task by eta, i.e. the first
-   * available tag
-   * @return Google_Service_Taskqueue_Tasks
-   */
-  public function lease($project, $taskqueue, $numTasks, $leaseSecs, $optParams = array())
-  {
-    $params = array('project' => $project, 'taskqueue' => $taskqueue, 'numTasks' => $numTasks, 'leaseSecs' => $leaseSecs);
-    $params = array_merge($params, $optParams);
-    return $this->call('lease', array($params), "Google_Service_Taskqueue_Tasks");
-  }
-  /**
-   * List Tasks in a TaskQueue (tasks.listTasks)
-   *
-   * @param string $project The project under which the queue lies.
-   * @param string $taskqueue The id of the taskqueue to list tasks from.
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Taskqueue_Tasks2
-   */
-  public function listTasks($project, $taskqueue, $optParams = array())
-  {
-    $params = array('project' => $project, 'taskqueue' => $taskqueue);
-    $params = array_merge($params, $optParams);
-    return $this->call('list', array($params), "Google_Service_Taskqueue_Tasks2");
-  }
-  /**
-   * Update tasks that are leased out of a TaskQueue. This method supports patch
-   * semantics. (tasks.patch)
-   *
-   * @param string $project The project under which the queue lies.
-   * @param string $taskqueue
-   * @param string $task
-   * @param int $newLeaseSeconds The new lease in seconds.
-   * @param Google_Service_Taskqueue_Task $postBody
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Taskqueue_Task
-   */
-  public function patch($project, $taskqueue, $task, $newLeaseSeconds, Google_Service_Taskqueue_Task $postBody, $optParams = array())
-  {
-    $params = array('project' => $project, 'taskqueue' => $taskqueue, 'task' => $task, 'newLeaseSeconds' => $newLeaseSeconds, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('patch', array($params), "Google_Service_Taskqueue_Task");
-  }
-  /**
-   * Update tasks that are leased out of a TaskQueue. (tasks.update)
-   *
-   * @param string $project The project under which the queue lies.
-   * @param string $taskqueue
-   * @param string $task
-   * @param int $newLeaseSeconds The new lease in seconds.
-   * @param Google_Service_Taskqueue_Task $postBody
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Taskqueue_Task
-   */
-  public function update($project, $taskqueue, $task, $newLeaseSeconds, Google_Service_Taskqueue_Task $postBody, $optParams = array())
-  {
-    $params = array('project' => $project, 'taskqueue' => $taskqueue, 'task' => $task, 'newLeaseSeconds' => $newLeaseSeconds, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('update', array($params), "Google_Service_Taskqueue_Task");
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Taskqueue/Task.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Taskqueue/Task.php
deleted file mode 100644
index 3807b721..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Taskqueue/Task.php
+++ /dev/null
@@ -1,96 +0,0 @@
- "retry_count",
-  );
-  public $enqueueTimestamp;
-  public $id;
-  public $kind;
-  public $leaseTimestamp;
-  public $payloadBase64;
-  public $queueName;
-  public $retryCount;
-  public $tag;
-
-  public function setEnqueueTimestamp($enqueueTimestamp)
-  {
-    $this->enqueueTimestamp = $enqueueTimestamp;
-  }
-  public function getEnqueueTimestamp()
-  {
-    return $this->enqueueTimestamp;
-  }
-  public function setId($id)
-  {
-    $this->id = $id;
-  }
-  public function getId()
-  {
-    return $this->id;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setLeaseTimestamp($leaseTimestamp)
-  {
-    $this->leaseTimestamp = $leaseTimestamp;
-  }
-  public function getLeaseTimestamp()
-  {
-    return $this->leaseTimestamp;
-  }
-  public function setPayloadBase64($payloadBase64)
-  {
-    $this->payloadBase64 = $payloadBase64;
-  }
-  public function getPayloadBase64()
-  {
-    return $this->payloadBase64;
-  }
-  public function setQueueName($queueName)
-  {
-    $this->queueName = $queueName;
-  }
-  public function getQueueName()
-  {
-    return $this->queueName;
-  }
-  public function setRetryCount($retryCount)
-  {
-    $this->retryCount = $retryCount;
-  }
-  public function getRetryCount()
-  {
-    return $this->retryCount;
-  }
-  public function setTag($tag)
-  {
-    $this->tag = $tag;
-  }
-  public function getTag()
-  {
-    return $this->tag;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Taskqueue/TaskQueue.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Taskqueue/TaskQueue.php
deleted file mode 100644
index dc3ea493..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Taskqueue/TaskQueue.php
+++ /dev/null
@@ -1,68 +0,0 @@
-acl = $acl;
-  }
-  public function getAcl()
-  {
-    return $this->acl;
-  }
-  public function setId($id)
-  {
-    $this->id = $id;
-  }
-  public function getId()
-  {
-    return $this->id;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setMaxLeases($maxLeases)
-  {
-    $this->maxLeases = $maxLeases;
-  }
-  public function getMaxLeases()
-  {
-    return $this->maxLeases;
-  }
-  public function setStats(Google_Service_Taskqueue_TaskQueueStats $stats)
-  {
-    $this->stats = $stats;
-  }
-  public function getStats()
-  {
-    return $this->stats;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Taskqueue/TaskQueueAcl.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Taskqueue/TaskQueueAcl.php
deleted file mode 100644
index afbfd590..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Taskqueue/TaskQueueAcl.php
+++ /dev/null
@@ -1,49 +0,0 @@
-adminEmails = $adminEmails;
-  }
-  public function getAdminEmails()
-  {
-    return $this->adminEmails;
-  }
-  public function setConsumerEmails($consumerEmails)
-  {
-    $this->consumerEmails = $consumerEmails;
-  }
-  public function getConsumerEmails()
-  {
-    return $this->consumerEmails;
-  }
-  public function setProducerEmails($producerEmails)
-  {
-    $this->producerEmails = $producerEmails;
-  }
-  public function getProducerEmails()
-  {
-    return $this->producerEmails;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Taskqueue/TaskQueueStats.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Taskqueue/TaskQueueStats.php
deleted file mode 100644
index dfba1306..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Taskqueue/TaskQueueStats.php
+++ /dev/null
@@ -1,57 +0,0 @@
-leasedLastHour = $leasedLastHour;
-  }
-  public function getLeasedLastHour()
-  {
-    return $this->leasedLastHour;
-  }
-  public function setLeasedLastMinute($leasedLastMinute)
-  {
-    $this->leasedLastMinute = $leasedLastMinute;
-  }
-  public function getLeasedLastMinute()
-  {
-    return $this->leasedLastMinute;
-  }
-  public function setOldestTask($oldestTask)
-  {
-    $this->oldestTask = $oldestTask;
-  }
-  public function getOldestTask()
-  {
-    return $this->oldestTask;
-  }
-  public function setTotalTasks($totalTasks)
-  {
-    $this->totalTasks = $totalTasks;
-  }
-  public function getTotalTasks()
-  {
-    return $this->totalTasks;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Taskqueue/Tasks.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Taskqueue/Tasks.php
deleted file mode 100644
index 837377e3..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Taskqueue/Tasks.php
+++ /dev/null
@@ -1,41 +0,0 @@
-items = $items;
-  }
-  public function getItems()
-  {
-    return $this->items;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Taskqueue/Tasks2.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Taskqueue/Tasks2.php
deleted file mode 100644
index 52843027..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Taskqueue/Tasks2.php
+++ /dev/null
@@ -1,41 +0,0 @@
-items = $items;
-  }
-  public function getItems()
-  {
-    return $this->items;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Tasks.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Tasks.php
deleted file mode 100644
index 23380b73..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Tasks.php
+++ /dev/null
@@ -1,295 +0,0 @@
-
- * Lets you manage your tasks and task lists.

- *
- * 

- * For more information about this service, see the API
- * Documentation
- * 

- *
- * @author Google, Inc.
- */
-class Google_Service_Tasks extends Google_Service
-{
-  /** Manage your tasks. */
-  const TASKS =
-      "https://www.googleapis.com/auth/tasks";
-  /** View your tasks. */
-  const TASKS_READONLY =
-      "https://www.googleapis.com/auth/tasks.readonly";
-
-  public $tasklists;
-  public $tasks;
-  
-  /**
-   * Constructs the internal representation of the Tasks service.
-   *
-   * @param Google_Client $client
-   */
-  public function __construct(Google_Client $client)
-  {
-    parent::__construct($client);
-    $this->rootUrl = 'https://www.googleapis.com/';
-    $this->servicePath = 'tasks/v1/';
-    $this->version = 'v1';
-    $this->serviceName = 'tasks';
-
-    $this->tasklists = new Google_Service_Tasks_Resource_Tasklists(
-        $this,
-        $this->serviceName,
-        'tasklists',
-        array(
-          'methods' => array(
-            'delete' => array(
-              'path' => 'users/@me/lists/{tasklist}',
-              'httpMethod' => 'DELETE',
-              'parameters' => array(
-                'tasklist' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'get' => array(
-              'path' => 'users/@me/lists/{tasklist}',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'tasklist' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'insert' => array(
-              'path' => 'users/@me/lists',
-              'httpMethod' => 'POST',
-              'parameters' => array(),
-            ),'list' => array(
-              'path' => 'users/@me/lists',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'maxResults' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'pageToken' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-              ),
-            ),'patch' => array(
-              'path' => 'users/@me/lists/{tasklist}',
-              'httpMethod' => 'PATCH',
-              'parameters' => array(
-                'tasklist' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'update' => array(
-              'path' => 'users/@me/lists/{tasklist}',
-              'httpMethod' => 'PUT',
-              'parameters' => array(
-                'tasklist' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),
-          )
-        )
-    );
-    $this->tasks = new Google_Service_Tasks_Resource_Tasks(
-        $this,
-        $this->serviceName,
-        'tasks',
-        array(
-          'methods' => array(
-            'clear' => array(
-              'path' => 'lists/{tasklist}/clear',
-              'httpMethod' => 'POST',
-              'parameters' => array(
-                'tasklist' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'delete' => array(
-              'path' => 'lists/{tasklist}/tasks/{task}',
-              'httpMethod' => 'DELETE',
-              'parameters' => array(
-                'tasklist' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'task' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'get' => array(
-              'path' => 'lists/{tasklist}/tasks/{task}',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'tasklist' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'task' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'insert' => array(
-              'path' => 'lists/{tasklist}/tasks',
-              'httpMethod' => 'POST',
-              'parameters' => array(
-                'tasklist' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'parent' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'previous' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-              ),
-            ),'list' => array(
-              'path' => 'lists/{tasklist}/tasks',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'tasklist' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'completedMax' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'completedMin' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'dueMax' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'dueMin' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'maxResults' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'pageToken' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'showCompleted' => array(
-                  'location' => 'query',
-                  'type' => 'boolean',
-                ),
-                'showDeleted' => array(
-                  'location' => 'query',
-                  'type' => 'boolean',
-                ),
-                'showHidden' => array(
-                  'location' => 'query',
-                  'type' => 'boolean',
-                ),
-                'updatedMin' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-              ),
-            ),'move' => array(
-              'path' => 'lists/{tasklist}/tasks/{task}/move',
-              'httpMethod' => 'POST',
-              'parameters' => array(
-                'tasklist' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'task' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'parent' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'previous' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-              ),
-            ),'patch' => array(
-              'path' => 'lists/{tasklist}/tasks/{task}',
-              'httpMethod' => 'PATCH',
-              'parameters' => array(
-                'tasklist' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'task' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'update' => array(
-              'path' => 'lists/{tasklist}/tasks/{task}',
-              'httpMethod' => 'PUT',
-              'parameters' => array(
-                'tasklist' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'task' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),
-          )
-        )
-    );
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Tasks/Resource/Tasklists.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Tasks/Resource/Tasklists.php
deleted file mode 100644
index 20d4696a..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Tasks/Resource/Tasklists.php
+++ /dev/null
@@ -1,113 +0,0 @@
-
- *   $tasksService = new Google_Service_Tasks(...);
- *   $tasklists = $tasksService->tasklists;
- *  
- */
-class Google_Service_Tasks_Resource_Tasklists extends Google_Service_Resource
-{
-  /**
-   * Deletes the authenticated user's specified task list. (tasklists.delete)
-   *
-   * @param string $tasklist Task list identifier.
-   * @param array $optParams Optional parameters.
-   */
-  public function delete($tasklist, $optParams = array())
-  {
-    $params = array('tasklist' => $tasklist);
-    $params = array_merge($params, $optParams);
-    return $this->call('delete', array($params));
-  }
-  /**
-   * Returns the authenticated user's specified task list. (tasklists.get)
-   *
-   * @param string $tasklist Task list identifier.
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Tasks_TaskList
-   */
-  public function get($tasklist, $optParams = array())
-  {
-    $params = array('tasklist' => $tasklist);
-    $params = array_merge($params, $optParams);
-    return $this->call('get', array($params), "Google_Service_Tasks_TaskList");
-  }
-  /**
-   * Creates a new task list and adds it to the authenticated user's task lists.
-   * (tasklists.insert)
-   *
-   * @param Google_Service_Tasks_TaskList $postBody
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Tasks_TaskList
-   */
-  public function insert(Google_Service_Tasks_TaskList $postBody, $optParams = array())
-  {
-    $params = array('postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('insert', array($params), "Google_Service_Tasks_TaskList");
-  }
-  /**
-   * Returns all the authenticated user's task lists. (tasklists.listTasklists)
-   *
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param string maxResults Maximum number of task lists returned on one
-   * page. Optional. The default is 100.
-   * @opt_param string pageToken Token specifying the result page to return.
-   * Optional.
-   * @return Google_Service_Tasks_TaskLists
-   */
-  public function listTasklists($optParams = array())
-  {
-    $params = array();
-    $params = array_merge($params, $optParams);
-    return $this->call('list', array($params), "Google_Service_Tasks_TaskLists");
-  }
-  /**
-   * Updates the authenticated user's specified task list. This method supports
-   * patch semantics. (tasklists.patch)
-   *
-   * @param string $tasklist Task list identifier.
-   * @param Google_Service_Tasks_TaskList $postBody
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Tasks_TaskList
-   */
-  public function patch($tasklist, Google_Service_Tasks_TaskList $postBody, $optParams = array())
-  {
-    $params = array('tasklist' => $tasklist, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('patch', array($params), "Google_Service_Tasks_TaskList");
-  }
-  /**
-   * Updates the authenticated user's specified task list. (tasklists.update)
-   *
-   * @param string $tasklist Task list identifier.
-   * @param Google_Service_Tasks_TaskList $postBody
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Tasks_TaskList
-   */
-  public function update($tasklist, Google_Service_Tasks_TaskList $postBody, $optParams = array())
-  {
-    $params = array('tasklist' => $tasklist, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('update', array($params), "Google_Service_Tasks_TaskList");
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Tasks/Resource/Tasks.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Tasks/Resource/Tasks.php
deleted file mode 100644
index d6217020..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Tasks/Resource/Tasks.php
+++ /dev/null
@@ -1,179 +0,0 @@
-
- *   $tasksService = new Google_Service_Tasks(...);
- *   $tasks = $tasksService->tasks;
- *  
- */
-class Google_Service_Tasks_Resource_Tasks extends Google_Service_Resource
-{
-  /**
-   * Clears all completed tasks from the specified task list. The affected tasks
-   * will be marked as 'hidden' and no longer be returned by default when
-   * retrieving all tasks for a task list. (tasks.clear)
-   *
-   * @param string $tasklist Task list identifier.
-   * @param array $optParams Optional parameters.
-   */
-  public function clear($tasklist, $optParams = array())
-  {
-    $params = array('tasklist' => $tasklist);
-    $params = array_merge($params, $optParams);
-    return $this->call('clear', array($params));
-  }
-  /**
-   * Deletes the specified task from the task list. (tasks.delete)
-   *
-   * @param string $tasklist Task list identifier.
-   * @param string $task Task identifier.
-   * @param array $optParams Optional parameters.
-   */
-  public function delete($tasklist, $task, $optParams = array())
-  {
-    $params = array('tasklist' => $tasklist, 'task' => $task);
-    $params = array_merge($params, $optParams);
-    return $this->call('delete', array($params));
-  }
-  /**
-   * Returns the specified task. (tasks.get)
-   *
-   * @param string $tasklist Task list identifier.
-   * @param string $task Task identifier.
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Tasks_Task
-   */
-  public function get($tasklist, $task, $optParams = array())
-  {
-    $params = array('tasklist' => $tasklist, 'task' => $task);
-    $params = array_merge($params, $optParams);
-    return $this->call('get', array($params), "Google_Service_Tasks_Task");
-  }
-  /**
-   * Creates a new task on the specified task list. (tasks.insert)
-   *
-   * @param string $tasklist Task list identifier.
-   * @param Google_Service_Tasks_Task $postBody
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param string parent Parent task identifier. If the task is created at
-   * the top level, this parameter is omitted. Optional.
-   * @opt_param string previous Previous sibling task identifier. If the task is
-   * created at the first position among its siblings, this parameter is omitted.
-   * Optional.
-   * @return Google_Service_Tasks_Task
-   */
-  public function insert($tasklist, Google_Service_Tasks_Task $postBody, $optParams = array())
-  {
-    $params = array('tasklist' => $tasklist, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('insert', array($params), "Google_Service_Tasks_Task");
-  }
-  /**
-   * Returns all tasks in the specified task list. (tasks.listTasks)
-   *
-   * @param string $tasklist Task list identifier.
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param string completedMax Upper bound for a task's completion date (as a
-   * RFC 3339 timestamp) to filter by. Optional. The default is not to filter by
-   * completion date.
-   * @opt_param string completedMin Lower bound for a task's completion date (as a
-   * RFC 3339 timestamp) to filter by. Optional. The default is not to filter by
-   * completion date.
-   * @opt_param string dueMax Upper bound for a task's due date (as a RFC 3339
-   * timestamp) to filter by. Optional. The default is not to filter by due date.
-   * @opt_param string dueMin Lower bound for a task's due date (as a RFC 3339
-   * timestamp) to filter by. Optional. The default is not to filter by due date.
-   * @opt_param string maxResults Maximum number of task lists returned on one
-   * page. Optional. The default is 100.
-   * @opt_param string pageToken Token specifying the result page to return.
-   * Optional.
-   * @opt_param bool showCompleted Flag indicating whether completed tasks are
-   * returned in the result. Optional. The default is True.
-   * @opt_param bool showDeleted Flag indicating whether deleted tasks are
-   * returned in the result. Optional. The default is False.
-   * @opt_param bool showHidden Flag indicating whether hidden tasks are returned
-   * in the result. Optional. The default is False.
-   * @opt_param string updatedMin Lower bound for a task's last modification time
-   * (as a RFC 3339 timestamp) to filter by. Optional. The default is not to
-   * filter by last modification time.
-   * @return Google_Service_Tasks_Tasks
-   */
-  public function listTasks($tasklist, $optParams = array())
-  {
-    $params = array('tasklist' => $tasklist);
-    $params = array_merge($params, $optParams);
-    return $this->call('list', array($params), "Google_Service_Tasks_Tasks");
-  }
-  /**
-   * Moves the specified task to another position in the task list. This can
-   * include putting it as a child task under a new parent and/or move it to a
-   * different position among its sibling tasks. (tasks.move)
-   *
-   * @param string $tasklist Task list identifier.
-   * @param string $task Task identifier.
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param string parent New parent task identifier. If the task is moved to
-   * the top level, this parameter is omitted. Optional.
-   * @opt_param string previous New previous sibling task identifier. If the task
-   * is moved to the first position among its siblings, this parameter is omitted.
-   * Optional.
-   * @return Google_Service_Tasks_Task
-   */
-  public function move($tasklist, $task, $optParams = array())
-  {
-    $params = array('tasklist' => $tasklist, 'task' => $task);
-    $params = array_merge($params, $optParams);
-    return $this->call('move', array($params), "Google_Service_Tasks_Task");
-  }
-  /**
-   * Updates the specified task. This method supports patch semantics.
-   * (tasks.patch)
-   *
-   * @param string $tasklist Task list identifier.
-   * @param string $task Task identifier.
-   * @param Google_Service_Tasks_Task $postBody
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Tasks_Task
-   */
-  public function patch($tasklist, $task, Google_Service_Tasks_Task $postBody, $optParams = array())
-  {
-    $params = array('tasklist' => $tasklist, 'task' => $task, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('patch', array($params), "Google_Service_Tasks_Task");
-  }
-  /**
-   * Updates the specified task. (tasks.update)
-   *
-   * @param string $tasklist Task list identifier.
-   * @param string $task Task identifier.
-   * @param Google_Service_Tasks_Task $postBody
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Tasks_Task
-   */
-  public function update($tasklist, $task, Google_Service_Tasks_Task $postBody, $optParams = array())
-  {
-    $params = array('tasklist' => $tasklist, 'task' => $task, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('update', array($params), "Google_Service_Tasks_Task");
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Tasks/Task.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Tasks/Task.php
deleted file mode 100644
index 9f4742ab..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Tasks/Task.php
+++ /dev/null
@@ -1,158 +0,0 @@
-completed = $completed;
-  }
-  public function getCompleted()
-  {
-    return $this->completed;
-  }
-  public function setDeleted($deleted)
-  {
-    $this->deleted = $deleted;
-  }
-  public function getDeleted()
-  {
-    return $this->deleted;
-  }
-  public function setDue($due)
-  {
-    $this->due = $due;
-  }
-  public function getDue()
-  {
-    return $this->due;
-  }
-  public function setEtag($etag)
-  {
-    $this->etag = $etag;
-  }
-  public function getEtag()
-  {
-    return $this->etag;
-  }
-  public function setHidden($hidden)
-  {
-    $this->hidden = $hidden;
-  }
-  public function getHidden()
-  {
-    return $this->hidden;
-  }
-  public function setId($id)
-  {
-    $this->id = $id;
-  }
-  public function getId()
-  {
-    return $this->id;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setLinks($links)
-  {
-    $this->links = $links;
-  }
-  public function getLinks()
-  {
-    return $this->links;
-  }
-  public function setNotes($notes)
-  {
-    $this->notes = $notes;
-  }
-  public function getNotes()
-  {
-    return $this->notes;
-  }
-  public function setParent($parent)
-  {
-    $this->parent = $parent;
-  }
-  public function getParent()
-  {
-    return $this->parent;
-  }
-  public function setPosition($position)
-  {
-    $this->position = $position;
-  }
-  public function getPosition()
-  {
-    return $this->position;
-  }
-  public function setSelfLink($selfLink)
-  {
-    $this->selfLink = $selfLink;
-  }
-  public function getSelfLink()
-  {
-    return $this->selfLink;
-  }
-  public function setStatus($status)
-  {
-    $this->status = $status;
-  }
-  public function getStatus()
-  {
-    return $this->status;
-  }
-  public function setTitle($title)
-  {
-    $this->title = $title;
-  }
-  public function getTitle()
-  {
-    return $this->title;
-  }
-  public function setUpdated($updated)
-  {
-    $this->updated = $updated;
-  }
-  public function getUpdated()
-  {
-    return $this->updated;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Tasks/TaskLinks.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Tasks/TaskLinks.php
deleted file mode 100644
index 78cffe6a..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Tasks/TaskLinks.php
+++ /dev/null
@@ -1,48 +0,0 @@
-description = $description;
-  }
-  public function getDescription()
-  {
-    return $this->description;
-  }
-  public function setLink($link)
-  {
-    $this->link = $link;
-  }
-  public function getLink()
-  {
-    return $this->link;
-  }
-  public function setType($type)
-  {
-    $this->type = $type;
-  }
-  public function getType()
-  {
-    return $this->type;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Tasks/TaskList.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Tasks/TaskList.php
deleted file mode 100644
index 6eef024b..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Tasks/TaskList.php
+++ /dev/null
@@ -1,75 +0,0 @@
-etag = $etag;
-  }
-  public function getEtag()
-  {
-    return $this->etag;
-  }
-  public function setId($id)
-  {
-    $this->id = $id;
-  }
-  public function getId()
-  {
-    return $this->id;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setSelfLink($selfLink)
-  {
-    $this->selfLink = $selfLink;
-  }
-  public function getSelfLink()
-  {
-    return $this->selfLink;
-  }
-  public function setTitle($title)
-  {
-    $this->title = $title;
-  }
-  public function getTitle()
-  {
-    return $this->title;
-  }
-  public function setUpdated($updated)
-  {
-    $this->updated = $updated;
-  }
-  public function getUpdated()
-  {
-    return $this->updated;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Tasks/TaskLists.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Tasks/TaskLists.php
deleted file mode 100644
index 64e24a36..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Tasks/TaskLists.php
+++ /dev/null
@@ -1,59 +0,0 @@
-etag = $etag;
-  }
-  public function getEtag()
-  {
-    return $this->etag;
-  }
-  public function setItems($items)
-  {
-    $this->items = $items;
-  }
-  public function getItems()
-  {
-    return $this->items;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setNextPageToken($nextPageToken)
-  {
-    $this->nextPageToken = $nextPageToken;
-  }
-  public function getNextPageToken()
-  {
-    return $this->nextPageToken;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Tasks/Tasks.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Tasks/Tasks.php
deleted file mode 100644
index 01b5bb79..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Tasks/Tasks.php
+++ /dev/null
@@ -1,59 +0,0 @@
-etag = $etag;
-  }
-  public function getEtag()
-  {
-    return $this->etag;
-  }
-  public function setItems($items)
-  {
-    $this->items = $items;
-  }
-  public function getItems()
-  {
-    return $this->items;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setNextPageToken($nextPageToken)
-  {
-    $this->nextPageToken = $nextPageToken;
-  }
-  public function getNextPageToken()
-  {
-    return $this->nextPageToken;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ToolResults.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ToolResults.php
deleted file mode 100644
index 3f51b3ca..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ToolResults.php
+++ /dev/null
@@ -1,664 +0,0 @@
-
- * Reads and publishes results from Firebase Test Lab.

- *
- * 

- * For more information about this service, see the API
- * Documentation
- * 

- *
- * @author Google, Inc.
- */
-class Google_Service_ToolResults extends Google_Service
-{
-  /** View and manage your data across Google Cloud Platform services. */
-  const CLOUD_PLATFORM =
-      "https://www.googleapis.com/auth/cloud-platform";
-
-  public $projects;
-  public $projects_histories;
-  public $projects_histories_executions;
-  public $projects_histories_executions_steps;
-  public $projects_histories_executions_steps_perfMetricsSummary;
-  public $projects_histories_executions_steps_perfSampleSeries;
-  public $projects_histories_executions_steps_perfSampleSeries_samples;
-  public $projects_histories_executions_steps_thumbnails;
-  
-  /**
-   * Constructs the internal representation of the ToolResults service.
-   *
-   * @param Google_Client $client
-   */
-  public function __construct(Google_Client $client)
-  {
-    parent::__construct($client);
-    $this->rootUrl = 'https://www.googleapis.com/';
-    $this->servicePath = 'toolresults/v1beta3/projects/';
-    $this->version = 'v1beta3';
-    $this->serviceName = 'toolresults';
-
-    $this->projects = new Google_Service_ToolResults_Resource_Projects(
-        $this,
-        $this->serviceName,
-        'projects',
-        array(
-          'methods' => array(
-            'getSettings' => array(
-              'path' => '{projectId}/settings',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'projectId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'initializeSettings' => array(
-              'path' => '{projectId}:initializeSettings',
-              'httpMethod' => 'POST',
-              'parameters' => array(
-                'projectId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),
-          )
-        )
-    );
-    $this->projects_histories = new Google_Service_ToolResults_Resource_ProjectsHistories(
-        $this,
-        $this->serviceName,
-        'histories',
-        array(
-          'methods' => array(
-            'create' => array(
-              'path' => '{projectId}/histories',
-              'httpMethod' => 'POST',
-              'parameters' => array(
-                'projectId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'requestId' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-              ),
-            ),'get' => array(
-              'path' => '{projectId}/histories/{historyId}',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'projectId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'historyId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'list' => array(
-              'path' => '{projectId}/histories',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'projectId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'filterByName' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'pageSize' => array(
-                  'location' => 'query',
-                  'type' => 'integer',
-                ),
-                'pageToken' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-              ),
-            ),
-          )
-        )
-    );
-    $this->projects_histories_executions = new Google_Service_ToolResults_Resource_ProjectsHistoriesExecutions(
-        $this,
-        $this->serviceName,
-        'executions',
-        array(
-          'methods' => array(
-            'create' => array(
-              'path' => '{projectId}/histories/{historyId}/executions',
-              'httpMethod' => 'POST',
-              'parameters' => array(
-                'projectId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'historyId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'requestId' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-              ),
-            ),'get' => array(
-              'path' => '{projectId}/histories/{historyId}/executions/{executionId}',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'projectId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'historyId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'executionId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'list' => array(
-              'path' => '{projectId}/histories/{historyId}/executions',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'projectId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'historyId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'pageSize' => array(
-                  'location' => 'query',
-                  'type' => 'integer',
-                ),
-                'pageToken' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-              ),
-            ),'patch' => array(
-              'path' => '{projectId}/histories/{historyId}/executions/{executionId}',
-              'httpMethod' => 'PATCH',
-              'parameters' => array(
-                'projectId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'historyId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'executionId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'requestId' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-              ),
-            ),
-          )
-        )
-    );
-    $this->projects_histories_executions_steps = new Google_Service_ToolResults_Resource_ProjectsHistoriesExecutionsSteps(
-        $this,
-        $this->serviceName,
-        'steps',
-        array(
-          'methods' => array(
-            'create' => array(
-              'path' => '{projectId}/histories/{historyId}/executions/{executionId}/steps',
-              'httpMethod' => 'POST',
-              'parameters' => array(
-                'projectId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'historyId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'executionId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'requestId' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-              ),
-            ),'get' => array(
-              'path' => '{projectId}/histories/{historyId}/executions/{executionId}/steps/{stepId}',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'projectId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'historyId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'executionId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'stepId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'getPerfMetricsSummary' => array(
-              'path' => '{projectId}/histories/{historyId}/executions/{executionId}/steps/{stepId}/perfMetricsSummary',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'projectId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'historyId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'executionId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'stepId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'list' => array(
-              'path' => '{projectId}/histories/{historyId}/executions/{executionId}/steps',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'projectId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'historyId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'executionId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'pageSize' => array(
-                  'location' => 'query',
-                  'type' => 'integer',
-                ),
-                'pageToken' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-              ),
-            ),'patch' => array(
-              'path' => '{projectId}/histories/{historyId}/executions/{executionId}/steps/{stepId}',
-              'httpMethod' => 'PATCH',
-              'parameters' => array(
-                'projectId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'historyId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'executionId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'stepId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'requestId' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-              ),
-            ),'publishXunitXmlFiles' => array(
-              'path' => '{projectId}/histories/{historyId}/executions/{executionId}/steps/{stepId}:publishXunitXmlFiles',
-              'httpMethod' => 'POST',
-              'parameters' => array(
-                'projectId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'historyId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'executionId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'stepId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),
-          )
-        )
-    );
-    $this->projects_histories_executions_steps_perfMetricsSummary = new Google_Service_ToolResults_Resource_ProjectsHistoriesExecutionsStepsPerfMetricsSummary(
-        $this,
-        $this->serviceName,
-        'perfMetricsSummary',
-        array(
-          'methods' => array(
-            'create' => array(
-              'path' => '{projectId}/histories/{historyId}/executions/{executionId}/steps/{stepId}/perfMetricsSummary',
-              'httpMethod' => 'POST',
-              'parameters' => array(
-                'projectId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'historyId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'executionId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'stepId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),
-          )
-        )
-    );
-    $this->projects_histories_executions_steps_perfSampleSeries = new Google_Service_ToolResults_Resource_ProjectsHistoriesExecutionsStepsPerfSampleSeries(
-        $this,
-        $this->serviceName,
-        'perfSampleSeries',
-        array(
-          'methods' => array(
-            'create' => array(
-              'path' => '{projectId}/histories/{historyId}/executions/{executionId}/steps/{stepId}/perfSampleSeries',
-              'httpMethod' => 'POST',
-              'parameters' => array(
-                'projectId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'historyId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'executionId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'stepId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'get' => array(
-              'path' => '{projectId}/histories/{historyId}/executions/{executionId}/steps/{stepId}/perfSampleSeries/{sampleSeriesId}',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'projectId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'historyId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'executionId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'stepId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'sampleSeriesId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'list' => array(
-              'path' => '{projectId}/histories/{historyId}/executions/{executionId}/steps/{stepId}/perfSampleSeries',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'projectId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'historyId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'executionId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'stepId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'filter' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                  'repeated' => true,
-                ),
-              ),
-            ),
-          )
-        )
-    );
-    $this->projects_histories_executions_steps_perfSampleSeries_samples = new Google_Service_ToolResults_Resource_ProjectsHistoriesExecutionsStepsPerfSampleSeriesSamples(
-        $this,
-        $this->serviceName,
-        'samples',
-        array(
-          'methods' => array(
-            'batchCreate' => array(
-              'path' => '{projectId}/histories/{historyId}/executions/{executionId}/steps/{stepId}/perfSampleSeries/{sampleSeriesId}/samples:batchCreate',
-              'httpMethod' => 'POST',
-              'parameters' => array(
-                'projectId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'historyId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'executionId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'stepId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'sampleSeriesId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'list' => array(
-              'path' => '{projectId}/histories/{historyId}/executions/{executionId}/steps/{stepId}/perfSampleSeries/{sampleSeriesId}/samples',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'projectId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'historyId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'executionId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'stepId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'sampleSeriesId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'pageSize' => array(
-                  'location' => 'query',
-                  'type' => 'integer',
-                ),
-                'pageToken' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-              ),
-            ),
-          )
-        )
-    );
-    $this->projects_histories_executions_steps_thumbnails = new Google_Service_ToolResults_Resource_ProjectsHistoriesExecutionsStepsThumbnails(
-        $this,
-        $this->serviceName,
-        'thumbnails',
-        array(
-          'methods' => array(
-            'list' => array(
-              'path' => '{projectId}/histories/{historyId}/executions/{executionId}/steps/{stepId}/thumbnails',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'projectId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'historyId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'executionId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'stepId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'pageSize' => array(
-                  'location' => 'query',
-                  'type' => 'integer',
-                ),
-                'pageToken' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-              ),
-            ),
-          )
-        )
-    );
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ToolResults/Any.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ToolResults/Any.php
deleted file mode 100644
index 1e9ea9d7..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ToolResults/Any.php
+++ /dev/null
@@ -1,39 +0,0 @@
-typeUrl = $typeUrl;
-  }
-  public function getTypeUrl()
-  {
-    return $this->typeUrl;
-  }
-  public function setValue($value)
-  {
-    $this->value = $value;
-  }
-  public function getValue()
-  {
-    return $this->value;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ToolResults/BasicPerfSampleSeries.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ToolResults/BasicPerfSampleSeries.php
deleted file mode 100644
index 74053423..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ToolResults/BasicPerfSampleSeries.php
+++ /dev/null
@@ -1,48 +0,0 @@
-perfMetricType = $perfMetricType;
-  }
-  public function getPerfMetricType()
-  {
-    return $this->perfMetricType;
-  }
-  public function setPerfUnit($perfUnit)
-  {
-    $this->perfUnit = $perfUnit;
-  }
-  public function getPerfUnit()
-  {
-    return $this->perfUnit;
-  }
-  public function setSampleSeriesLabel($sampleSeriesLabel)
-  {
-    $this->sampleSeriesLabel = $sampleSeriesLabel;
-  }
-  public function getSampleSeriesLabel()
-  {
-    return $this->sampleSeriesLabel;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ToolResults/BatchCreatePerfSamplesRequest.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ToolResults/BatchCreatePerfSamplesRequest.php
deleted file mode 100644
index ecb60fc1..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ToolResults/BatchCreatePerfSamplesRequest.php
+++ /dev/null
@@ -1,32 +0,0 @@
-perfSamples = $perfSamples;
-  }
-  public function getPerfSamples()
-  {
-    return $this->perfSamples;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ToolResults/BatchCreatePerfSamplesResponse.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ToolResults/BatchCreatePerfSamplesResponse.php
deleted file mode 100644
index cc61e10d..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ToolResults/BatchCreatePerfSamplesResponse.php
+++ /dev/null
@@ -1,32 +0,0 @@
-perfSamples = $perfSamples;
-  }
-  public function getPerfSamples()
-  {
-    return $this->perfSamples;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ToolResults/CPUInfo.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ToolResults/CPUInfo.php
deleted file mode 100644
index 430d7907..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ToolResults/CPUInfo.php
+++ /dev/null
@@ -1,48 +0,0 @@
-cpuProcessor = $cpuProcessor;
-  }
-  public function getCpuProcessor()
-  {
-    return $this->cpuProcessor;
-  }
-  public function setCpuSpeedInGhz($cpuSpeedInGhz)
-  {
-    $this->cpuSpeedInGhz = $cpuSpeedInGhz;
-  }
-  public function getCpuSpeedInGhz()
-  {
-    return $this->cpuSpeedInGhz;
-  }
-  public function setNumberOfCores($numberOfCores)
-  {
-    $this->numberOfCores = $numberOfCores;
-  }
-  public function getNumberOfCores()
-  {
-    return $this->numberOfCores;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ToolResults/Duration.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ToolResults/Duration.php
deleted file mode 100644
index d6baa1f8..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ToolResults/Duration.php
+++ /dev/null
@@ -1,39 +0,0 @@
-nanos = $nanos;
-  }
-  public function getNanos()
-  {
-    return $this->nanos;
-  }
-  public function setSeconds($seconds)
-  {
-    $this->seconds = $seconds;
-  }
-  public function getSeconds()
-  {
-    return $this->seconds;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ToolResults/Execution.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ToolResults/Execution.php
deleted file mode 100644
index 69ebbdd0..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ToolResults/Execution.php
+++ /dev/null
@@ -1,78 +0,0 @@
-completionTime = $completionTime;
-  }
-  public function getCompletionTime()
-  {
-    return $this->completionTime;
-  }
-  public function setCreationTime(Google_Service_ToolResults_Timestamp $creationTime)
-  {
-    $this->creationTime = $creationTime;
-  }
-  public function getCreationTime()
-  {
-    return $this->creationTime;
-  }
-  public function setExecutionId($executionId)
-  {
-    $this->executionId = $executionId;
-  }
-  public function getExecutionId()
-  {
-    return $this->executionId;
-  }
-  public function setOutcome(Google_Service_ToolResults_Outcome $outcome)
-  {
-    $this->outcome = $outcome;
-  }
-  public function getOutcome()
-  {
-    return $this->outcome;
-  }
-  public function setState($state)
-  {
-    $this->state = $state;
-  }
-  public function getState()
-  {
-    return $this->state;
-  }
-  public function setTestExecutionMatrixId($testExecutionMatrixId)
-  {
-    $this->testExecutionMatrixId = $testExecutionMatrixId;
-  }
-  public function getTestExecutionMatrixId()
-  {
-    return $this->testExecutionMatrixId;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ToolResults/FailureDetail.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ToolResults/FailureDetail.php
deleted file mode 100644
index 959f860d..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ToolResults/FailureDetail.php
+++ /dev/null
@@ -1,66 +0,0 @@
-crashed = $crashed;
-  }
-  public function getCrashed()
-  {
-    return $this->crashed;
-  }
-  public function setNotInstalled($notInstalled)
-  {
-    $this->notInstalled = $notInstalled;
-  }
-  public function getNotInstalled()
-  {
-    return $this->notInstalled;
-  }
-  public function setOtherNativeCrash($otherNativeCrash)
-  {
-    $this->otherNativeCrash = $otherNativeCrash;
-  }
-  public function getOtherNativeCrash()
-  {
-    return $this->otherNativeCrash;
-  }
-  public function setTimedOut($timedOut)
-  {
-    $this->timedOut = $timedOut;
-  }
-  public function getTimedOut()
-  {
-    return $this->timedOut;
-  }
-  public function setUnableToCrawl($unableToCrawl)
-  {
-    $this->unableToCrawl = $unableToCrawl;
-  }
-  public function getUnableToCrawl()
-  {
-    return $this->unableToCrawl;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ToolResults/FileReference.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ToolResults/FileReference.php
deleted file mode 100644
index f54ea1e9..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ToolResults/FileReference.php
+++ /dev/null
@@ -1,30 +0,0 @@
-fileUri = $fileUri;
-  }
-  public function getFileUri()
-  {
-    return $this->fileUri;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ToolResults/History.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ToolResults/History.php
deleted file mode 100644
index 54df1ed0..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ToolResults/History.php
+++ /dev/null
@@ -1,48 +0,0 @@
-displayName = $displayName;
-  }
-  public function getDisplayName()
-  {
-    return $this->displayName;
-  }
-  public function setHistoryId($historyId)
-  {
-    $this->historyId = $historyId;
-  }
-  public function getHistoryId()
-  {
-    return $this->historyId;
-  }
-  public function setName($name)
-  {
-    $this->name = $name;
-  }
-  public function getName()
-  {
-    return $this->name;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ToolResults/Image.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ToolResults/Image.php
deleted file mode 100644
index 4d35ed25..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ToolResults/Image.php
+++ /dev/null
@@ -1,60 +0,0 @@
-error = $error;
-  }
-  public function getError()
-  {
-    return $this->error;
-  }
-  public function setSourceImage(Google_Service_ToolResults_ToolOutputReference $sourceImage)
-  {
-    $this->sourceImage = $sourceImage;
-  }
-  public function getSourceImage()
-  {
-    return $this->sourceImage;
-  }
-  public function setStepId($stepId)
-  {
-    $this->stepId = $stepId;
-  }
-  public function getStepId()
-  {
-    return $this->stepId;
-  }
-  public function setThumbnail(Google_Service_ToolResults_Thumbnail $thumbnail)
-  {
-    $this->thumbnail = $thumbnail;
-  }
-  public function getThumbnail()
-  {
-    return $this->thumbnail;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ToolResults/InconclusiveDetail.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ToolResults/InconclusiveDetail.php
deleted file mode 100644
index b5e888a0..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ToolResults/InconclusiveDetail.php
+++ /dev/null
@@ -1,39 +0,0 @@
-abortedByUser = $abortedByUser;
-  }
-  public function getAbortedByUser()
-  {
-    return $this->abortedByUser;
-  }
-  public function setInfrastructureFailure($infrastructureFailure)
-  {
-    $this->infrastructureFailure = $infrastructureFailure;
-  }
-  public function getInfrastructureFailure()
-  {
-    return $this->infrastructureFailure;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ToolResults/ListExecutionsResponse.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ToolResults/ListExecutionsResponse.php
deleted file mode 100644
index 479b644f..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ToolResults/ListExecutionsResponse.php
+++ /dev/null
@@ -1,41 +0,0 @@
-executions = $executions;
-  }
-  public function getExecutions()
-  {
-    return $this->executions;
-  }
-  public function setNextPageToken($nextPageToken)
-  {
-    $this->nextPageToken = $nextPageToken;
-  }
-  public function getNextPageToken()
-  {
-    return $this->nextPageToken;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ToolResults/ListHistoriesResponse.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ToolResults/ListHistoriesResponse.php
deleted file mode 100644
index b4c5b5a7..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ToolResults/ListHistoriesResponse.php
+++ /dev/null
@@ -1,41 +0,0 @@
-histories = $histories;
-  }
-  public function getHistories()
-  {
-    return $this->histories;
-  }
-  public function setNextPageToken($nextPageToken)
-  {
-    $this->nextPageToken = $nextPageToken;
-  }
-  public function getNextPageToken()
-  {
-    return $this->nextPageToken;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ToolResults/ListPerfSampleSeriesResponse.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ToolResults/ListPerfSampleSeriesResponse.php
deleted file mode 100644
index 360b07a7..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ToolResults/ListPerfSampleSeriesResponse.php
+++ /dev/null
@@ -1,32 +0,0 @@
-perfSampleSeries = $perfSampleSeries;
-  }
-  public function getPerfSampleSeries()
-  {
-    return $this->perfSampleSeries;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ToolResults/ListPerfSamplesResponse.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ToolResults/ListPerfSamplesResponse.php
deleted file mode 100644
index e6670e1b..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ToolResults/ListPerfSamplesResponse.php
+++ /dev/null
@@ -1,41 +0,0 @@
-nextPageToken = $nextPageToken;
-  }
-  public function getNextPageToken()
-  {
-    return $this->nextPageToken;
-  }
-  public function setPerfSamples($perfSamples)
-  {
-    $this->perfSamples = $perfSamples;
-  }
-  public function getPerfSamples()
-  {
-    return $this->perfSamples;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ToolResults/ListStepThumbnailsResponse.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ToolResults/ListStepThumbnailsResponse.php
deleted file mode 100644
index 9ed07d75..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ToolResults/ListStepThumbnailsResponse.php
+++ /dev/null
@@ -1,41 +0,0 @@
-nextPageToken = $nextPageToken;
-  }
-  public function getNextPageToken()
-  {
-    return $this->nextPageToken;
-  }
-  public function setThumbnails($thumbnails)
-  {
-    $this->thumbnails = $thumbnails;
-  }
-  public function getThumbnails()
-  {
-    return $this->thumbnails;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ToolResults/ListStepsResponse.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ToolResults/ListStepsResponse.php
deleted file mode 100644
index 96fe5e76..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ToolResults/ListStepsResponse.php
+++ /dev/null
@@ -1,41 +0,0 @@
-nextPageToken = $nextPageToken;
-  }
-  public function getNextPageToken()
-  {
-    return $this->nextPageToken;
-  }
-  public function setSteps($steps)
-  {
-    $this->steps = $steps;
-  }
-  public function getSteps()
-  {
-    return $this->steps;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ToolResults/MemoryInfo.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ToolResults/MemoryInfo.php
deleted file mode 100644
index e445bdb4..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ToolResults/MemoryInfo.php
+++ /dev/null
@@ -1,39 +0,0 @@
-memoryCapInKibibyte = $memoryCapInKibibyte;
-  }
-  public function getMemoryCapInKibibyte()
-  {
-    return $this->memoryCapInKibibyte;
-  }
-  public function setMemoryTotalInKibibyte($memoryTotalInKibibyte)
-  {
-    $this->memoryTotalInKibibyte = $memoryTotalInKibibyte;
-  }
-  public function getMemoryTotalInKibibyte()
-  {
-    return $this->memoryTotalInKibibyte;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ToolResults/Outcome.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ToolResults/Outcome.php
deleted file mode 100644
index f7bada97..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ToolResults/Outcome.php
+++ /dev/null
@@ -1,70 +0,0 @@
-failureDetail = $failureDetail;
-  }
-  public function getFailureDetail()
-  {
-    return $this->failureDetail;
-  }
-  public function setInconclusiveDetail(Google_Service_ToolResults_InconclusiveDetail $inconclusiveDetail)
-  {
-    $this->inconclusiveDetail = $inconclusiveDetail;
-  }
-  public function getInconclusiveDetail()
-  {
-    return $this->inconclusiveDetail;
-  }
-  public function setSkippedDetail(Google_Service_ToolResults_SkippedDetail $skippedDetail)
-  {
-    $this->skippedDetail = $skippedDetail;
-  }
-  public function getSkippedDetail()
-  {
-    return $this->skippedDetail;
-  }
-  public function setSuccessDetail(Google_Service_ToolResults_SuccessDetail $successDetail)
-  {
-    $this->successDetail = $successDetail;
-  }
-  public function getSuccessDetail()
-  {
-    return $this->successDetail;
-  }
-  public function setSummary($summary)
-  {
-    $this->summary = $summary;
-  }
-  public function getSummary()
-  {
-    return $this->summary;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ToolResults/PerfEnvironment.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ToolResults/PerfEnvironment.php
deleted file mode 100644
index 2b5672aa..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ToolResults/PerfEnvironment.php
+++ /dev/null
@@ -1,41 +0,0 @@
-cpuInfo = $cpuInfo;
-  }
-  public function getCpuInfo()
-  {
-    return $this->cpuInfo;
-  }
-  public function setMemoryInfo(Google_Service_ToolResults_MemoryInfo $memoryInfo)
-  {
-    $this->memoryInfo = $memoryInfo;
-  }
-  public function getMemoryInfo()
-  {
-    return $this->memoryInfo;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ToolResults/PerfMetricsSummary.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ToolResults/PerfMetricsSummary.php
deleted file mode 100644
index 03bc72a5..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ToolResults/PerfMetricsSummary.php
+++ /dev/null
@@ -1,77 +0,0 @@
-executionId = $executionId;
-  }
-  public function getExecutionId()
-  {
-    return $this->executionId;
-  }
-  public function setHistoryId($historyId)
-  {
-    $this->historyId = $historyId;
-  }
-  public function getHistoryId()
-  {
-    return $this->historyId;
-  }
-  public function setPerfEnvironment(Google_Service_ToolResults_PerfEnvironment $perfEnvironment)
-  {
-    $this->perfEnvironment = $perfEnvironment;
-  }
-  public function getPerfEnvironment()
-  {
-    return $this->perfEnvironment;
-  }
-  public function setPerfMetrics($perfMetrics)
-  {
-    $this->perfMetrics = $perfMetrics;
-  }
-  public function getPerfMetrics()
-  {
-    return $this->perfMetrics;
-  }
-  public function setProjectId($projectId)
-  {
-    $this->projectId = $projectId;
-  }
-  public function getProjectId()
-  {
-    return $this->projectId;
-  }
-  public function setStepId($stepId)
-  {
-    $this->stepId = $stepId;
-  }
-  public function getStepId()
-  {
-    return $this->stepId;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ToolResults/PerfSample.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ToolResults/PerfSample.php
deleted file mode 100644
index c1ddf723..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ToolResults/PerfSample.php
+++ /dev/null
@@ -1,40 +0,0 @@
-sampleTime = $sampleTime;
-  }
-  public function getSampleTime()
-  {
-    return $this->sampleTime;
-  }
-  public function setValue($value)
-  {
-    $this->value = $value;
-  }
-  public function getValue()
-  {
-    return $this->value;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ToolResults/PerfSampleSeries.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ToolResults/PerfSampleSeries.php
deleted file mode 100644
index 79e0364f..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ToolResults/PerfSampleSeries.php
+++ /dev/null
@@ -1,76 +0,0 @@
-basicPerfSampleSeries = $basicPerfSampleSeries;
-  }
-  public function getBasicPerfSampleSeries()
-  {
-    return $this->basicPerfSampleSeries;
-  }
-  public function setExecutionId($executionId)
-  {
-    $this->executionId = $executionId;
-  }
-  public function getExecutionId()
-  {
-    return $this->executionId;
-  }
-  public function setHistoryId($historyId)
-  {
-    $this->historyId = $historyId;
-  }
-  public function getHistoryId()
-  {
-    return $this->historyId;
-  }
-  public function setProjectId($projectId)
-  {
-    $this->projectId = $projectId;
-  }
-  public function getProjectId()
-  {
-    return $this->projectId;
-  }
-  public function setSampleSeriesId($sampleSeriesId)
-  {
-    $this->sampleSeriesId = $sampleSeriesId;
-  }
-  public function getSampleSeriesId()
-  {
-    return $this->sampleSeriesId;
-  }
-  public function setStepId($stepId)
-  {
-    $this->stepId = $stepId;
-  }
-  public function getStepId()
-  {
-    return $this->stepId;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ToolResults/ProjectSettings.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ToolResults/ProjectSettings.php
deleted file mode 100644
index c1edd51a..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ToolResults/ProjectSettings.php
+++ /dev/null
@@ -1,39 +0,0 @@
-defaultBucket = $defaultBucket;
-  }
-  public function getDefaultBucket()
-  {
-    return $this->defaultBucket;
-  }
-  public function setName($name)
-  {
-    $this->name = $name;
-  }
-  public function getName()
-  {
-    return $this->name;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ToolResults/PublishXunitXmlFilesRequest.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ToolResults/PublishXunitXmlFilesRequest.php
deleted file mode 100644
index c9480516..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ToolResults/PublishXunitXmlFilesRequest.php
+++ /dev/null
@@ -1,32 +0,0 @@
-xunitXmlFiles = $xunitXmlFiles;
-  }
-  public function getXunitXmlFiles()
-  {
-    return $this->xunitXmlFiles;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ToolResults/Resource/Projects.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ToolResults/Resource/Projects.php
deleted file mode 100644
index 506811c5..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ToolResults/Resource/Projects.php
+++ /dev/null
@@ -1,86 +0,0 @@
-
- *   $toolresultsService = new Google_Service_ToolResults(...);
- *   $projects = $toolresultsService->projects;
- *  
- */
-class Google_Service_ToolResults_Resource_Projects extends Google_Service_Resource
-{
-  /**
-   * Gets the Tool Results settings for a project.
-   *
-   * May return any of the following canonical error codes:
-   *
-   * - PERMISSION_DENIED - if the user is not authorized to read from project
-   * (projects.getSettings)
-   *
-   * @param string $projectId A Project id.
-   *
-   * Required.
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_ToolResults_ProjectSettings
-   */
-  public function getSettings($projectId, $optParams = array())
-  {
-    $params = array('projectId' => $projectId);
-    $params = array_merge($params, $optParams);
-    return $this->call('getSettings', array($params), "Google_Service_ToolResults_ProjectSettings");
-  }
-  /**
-   * Creates resources for settings which have not yet been set.
-   *
-   * Currently, this creates a single resource: a Google Cloud Storage bucket, to
-   * be used as the default bucket for this project. The bucket is created in the
-   * name of the user calling. Except in rare cases, calling this method in
-   * parallel from multiple clients will only create a single bucket. In order to
-   * avoid unnecessary storage charges, the bucket is configured to automatically
-   * delete objects older than 90 days.
-   *
-   * The bucket is created with the project-private ACL: All project team members
-   * are given permissions to the bucket and objects created within it according
-   * to their roles. Project owners have owners rights, and so on. The default ACL
-   * on objects created in the bucket is project-private as well. See Google Cloud
-   * Storage documentation for more details.
-   *
-   * If there is already a default bucket set and the project can access the
-   * bucket, this call does nothing. However, if the project doesn't have the
-   * permission to access the bucket or the bucket is deteleted, a new bucket will
-   * be created.
-   *
-   * May return any canonical error codes, including the following:
-   *
-   * - PERMISSION_DENIED - if the user is not authorized to write to project - Any
-   * error code raised by Google Cloud Storage (projects.initializeSettings)
-   *
-   * @param string $projectId A Project id.
-   *
-   * Required.
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_ToolResults_ProjectSettings
-   */
-  public function initializeSettings($projectId, $optParams = array())
-  {
-    $params = array('projectId' => $projectId);
-    $params = array_merge($params, $optParams);
-    return $this->call('initializeSettings', array($params), "Google_Service_ToolResults_ProjectSettings");
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ToolResults/Resource/ProjectsHistories.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ToolResults/Resource/ProjectsHistories.php
deleted file mode 100644
index 801a938a..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ToolResults/Resource/ProjectsHistories.php
+++ /dev/null
@@ -1,121 +0,0 @@
-
- *   $toolresultsService = new Google_Service_ToolResults(...);
- *   $histories = $toolresultsService->histories;
- *  
- */
-class Google_Service_ToolResults_Resource_ProjectsHistories extends Google_Service_Resource
-{
-  /**
-   * Creates a History.
-   *
-   * The returned History will have the id set.
-   *
-   * May return any of the following canonical error codes:
-   *
-   * - PERMISSION_DENIED - if the user is not authorized to write to project -
-   * INVALID_ARGUMENT - if the request is malformed - NOT_FOUND - if the
-   * containing project does not exist (histories.create)
-   *
-   * @param string $projectId A Project id.
-   *
-   * Required.
-   * @param Google_Service_ToolResults_History $postBody
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param string requestId A unique request ID for server to detect
-   * duplicated requests. For example, a UUID.
-   *
-   * Optional, but strongly recommended.
-   * @return Google_Service_ToolResults_History
-   */
-  public function create($projectId, Google_Service_ToolResults_History $postBody, $optParams = array())
-  {
-    $params = array('projectId' => $projectId, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('create', array($params), "Google_Service_ToolResults_History");
-  }
-  /**
-   * Gets a History.
-   *
-   * May return any of the following canonical error codes:
-   *
-   * - PERMISSION_DENIED - if the user is not authorized to read project -
-   * INVALID_ARGUMENT - if the request is malformed - NOT_FOUND - if the History
-   * does not exist (histories.get)
-   *
-   * @param string $projectId A Project id.
-   *
-   * Required.
-   * @param string $historyId A History id.
-   *
-   * Required.
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_ToolResults_History
-   */
-  public function get($projectId, $historyId, $optParams = array())
-  {
-    $params = array('projectId' => $projectId, 'historyId' => $historyId);
-    $params = array_merge($params, $optParams);
-    return $this->call('get', array($params), "Google_Service_ToolResults_History");
-  }
-  /**
-   * Lists Histories for a given Project.
-   *
-   * The histories are sorted by modification time in descending order. The
-   * history_id key will be used to order the history with the same modification
-   * time.
-   *
-   * May return any of the following canonical error codes:
-   *
-   * - PERMISSION_DENIED - if the user is not authorized to read project -
-   * INVALID_ARGUMENT - if the request is malformed - NOT_FOUND - if the History
-   * does not exist (histories.listProjectsHistories)
-   *
-   * @param string $projectId A Project id.
-   *
-   * Required.
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param string filterByName If set, only return histories with the given
-   * name.
-   *
-   * Optional.
-   * @opt_param int pageSize The maximum number of Histories to fetch.
-   *
-   * Default value: 20. The server will use this default if the field is not set
-   * or has a value of 0. Any value greater than 100 will be treated as 100.
-   *
-   * Optional.
-   * @opt_param string pageToken A continuation token to resume the query at the
-   * next item.
-   *
-   * Optional.
-   * @return Google_Service_ToolResults_ListHistoriesResponse
-   */
-  public function listProjectsHistories($projectId, $optParams = array())
-  {
-    $params = array('projectId' => $projectId);
-    $params = array_merge($params, $optParams);
-    return $this->call('list', array($params), "Google_Service_ToolResults_ListHistoriesResponse");
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ToolResults/Resource/ProjectsHistoriesExecutions.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ToolResults/Resource/ProjectsHistoriesExecutions.php
deleted file mode 100644
index b1641597..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ToolResults/Resource/ProjectsHistoriesExecutions.php
+++ /dev/null
@@ -1,155 +0,0 @@
-
- *   $toolresultsService = new Google_Service_ToolResults(...);
- *   $executions = $toolresultsService->executions;
- *  
- */
-class Google_Service_ToolResults_Resource_ProjectsHistoriesExecutions extends Google_Service_Resource
-{
-  /**
-   * Creates an Execution.
-   *
-   * The returned Execution will have the id set.
-   *
-   * May return any of the following canonical error codes:
-   *
-   * - PERMISSION_DENIED - if the user is not authorized to write to project -
-   * INVALID_ARGUMENT - if the request is malformed - NOT_FOUND - if the
-   * containing History does not exist (executions.create)
-   *
-   * @param string $projectId A Project id.
-   *
-   * Required.
-   * @param string $historyId A History id.
-   *
-   * Required.
-   * @param Google_Service_ToolResults_Execution $postBody
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param string requestId A unique request ID for server to detect
-   * duplicated requests. For example, a UUID.
-   *
-   * Optional, but strongly recommended.
-   * @return Google_Service_ToolResults_Execution
-   */
-  public function create($projectId, $historyId, Google_Service_ToolResults_Execution $postBody, $optParams = array())
-  {
-    $params = array('projectId' => $projectId, 'historyId' => $historyId, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('create', array($params), "Google_Service_ToolResults_Execution");
-  }
-  /**
-   * Gets an Execution.
-   *
-   * May return any of the following canonical error codes:
-   *
-   * - PERMISSION_DENIED - if the user is not authorized to write to project -
-   * INVALID_ARGUMENT - if the request is malformed - NOT_FOUND - if the Execution
-   * does not exist (executions.get)
-   *
-   * @param string $projectId A Project id.
-   *
-   * Required.
-   * @param string $historyId A History id.
-   *
-   * Required.
-   * @param string $executionId An Execution id.
-   *
-   * Required.
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_ToolResults_Execution
-   */
-  public function get($projectId, $historyId, $executionId, $optParams = array())
-  {
-    $params = array('projectId' => $projectId, 'historyId' => $historyId, 'executionId' => $executionId);
-    $params = array_merge($params, $optParams);
-    return $this->call('get', array($params), "Google_Service_ToolResults_Execution");
-  }
-  /**
-   * Lists Histories for a given Project.
-   *
-   * The executions are sorted by creation_time in descending order. The
-   * execution_id key will be used to order the executions with the same
-   * creation_time.
-   *
-   * May return any of the following canonical error codes:
-   *
-   * - PERMISSION_DENIED - if the user is not authorized to read project -
-   * INVALID_ARGUMENT - if the request is malformed - NOT_FOUND - if the
-   * containing History does not exist
-   * (executions.listProjectsHistoriesExecutions)
-   *
-   * @param string $projectId A Project id.
-   *
-   * Required.
-   * @param string $historyId A History id.
-   *
-   * Required.
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param int pageSize The maximum number of Executions to fetch.
-   *
-   * Default value: 25. The server will use this default if the field is not set
-   * or has a value of 0.
-   *
-   * Optional.
-   * @opt_param string pageToken A continuation token to resume the query at the
-   * next item.
-   *
-   * Optional.
-   * @return Google_Service_ToolResults_ListExecutionsResponse
-   */
-  public function listProjectsHistoriesExecutions($projectId, $historyId, $optParams = array())
-  {
-    $params = array('projectId' => $projectId, 'historyId' => $historyId);
-    $params = array_merge($params, $optParams);
-    return $this->call('list', array($params), "Google_Service_ToolResults_ListExecutionsResponse");
-  }
-  /**
-   * Updates an existing Execution with the supplied partial entity.
-   *
-   * May return any of the following canonical error codes:
-   *
-   * - PERMISSION_DENIED - if the user is not authorized to write to project -
-   * INVALID_ARGUMENT - if the request is malformed - FAILED_PRECONDITION - if the
-   * requested state transition is illegal - NOT_FOUND - if the containing History
-   * does not exist (executions.patch)
-   *
-   * @param string $projectId A Project id. Required.
-   * @param string $historyId Required.
-   * @param string $executionId Required.
-   * @param Google_Service_ToolResults_Execution $postBody
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param string requestId A unique request ID for server to detect
-   * duplicated requests. For example, a UUID.
-   *
-   * Optional, but strongly recommended.
-   * @return Google_Service_ToolResults_Execution
-   */
-  public function patch($projectId, $historyId, $executionId, Google_Service_ToolResults_Execution $postBody, $optParams = array())
-  {
-    $params = array('projectId' => $projectId, 'historyId' => $historyId, 'executionId' => $executionId, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('patch', array($params), "Google_Service_ToolResults_Execution");
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ToolResults/Resource/ProjectsHistoriesExecutionsSteps.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ToolResults/Resource/ProjectsHistoriesExecutionsSteps.php
deleted file mode 100644
index b7e11095..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ToolResults/Resource/ProjectsHistoriesExecutionsSteps.php
+++ /dev/null
@@ -1,228 +0,0 @@
-
- *   $toolresultsService = new Google_Service_ToolResults(...);
- *   $steps = $toolresultsService->steps;
- *  
- */
-class Google_Service_ToolResults_Resource_ProjectsHistoriesExecutionsSteps extends Google_Service_Resource
-{
-  /**
-   * Creates a Step.
-   *
-   * The returned Step will have the id set.
-   *
-   * May return any of the following canonical error codes:
-   *
-   * - PERMISSION_DENIED - if the user is not authorized to write to project -
-   * INVALID_ARGUMENT - if the request is malformed - FAILED_PRECONDITION - if the
-   * step is too large (more than 10Mib) - NOT_FOUND - if the containing Execution
-   * does not exist (steps.create)
-   *
-   * @param string $projectId A Project id.
-   *
-   * Required.
-   * @param string $historyId A History id.
-   *
-   * Required.
-   * @param string $executionId A Execution id.
-   *
-   * Required.
-   * @param Google_Service_ToolResults_Step $postBody
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param string requestId A unique request ID for server to detect
-   * duplicated requests. For example, a UUID.
-   *
-   * Optional, but strongly recommended.
-   * @return Google_Service_ToolResults_Step
-   */
-  public function create($projectId, $historyId, $executionId, Google_Service_ToolResults_Step $postBody, $optParams = array())
-  {
-    $params = array('projectId' => $projectId, 'historyId' => $historyId, 'executionId' => $executionId, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('create', array($params), "Google_Service_ToolResults_Step");
-  }
-  /**
-   * Gets a Step.
-   *
-   * May return any of the following canonical error codes:
-   *
-   * - PERMISSION_DENIED - if the user is not authorized to read project -
-   * INVALID_ARGUMENT - if the request is malformed - NOT_FOUND - if the Step does
-   * not exist (steps.get)
-   *
-   * @param string $projectId A Project id.
-   *
-   * Required.
-   * @param string $historyId A History id.
-   *
-   * Required.
-   * @param string $executionId A Execution id.
-   *
-   * Required.
-   * @param string $stepId A Step id.
-   *
-   * Required.
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_ToolResults_Step
-   */
-  public function get($projectId, $historyId, $executionId, $stepId, $optParams = array())
-  {
-    $params = array('projectId' => $projectId, 'historyId' => $historyId, 'executionId' => $executionId, 'stepId' => $stepId);
-    $params = array_merge($params, $optParams);
-    return $this->call('get', array($params), "Google_Service_ToolResults_Step");
-  }
-  /**
-   * Retrieves a PerfMetricsSummary.
-   *
-   * May return any of the following error code(s): - NOT_FOUND - The specified
-   * PerfMetricsSummary does not exist (steps.getPerfMetricsSummary)
-   *
-   * @param string $projectId The cloud project
-   * @param string $historyId A tool results history ID.
-   * @param string $executionId A tool results execution ID.
-   * @param string $stepId A tool results step ID.
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_ToolResults_PerfMetricsSummary
-   */
-  public function getPerfMetricsSummary($projectId, $historyId, $executionId, $stepId, $optParams = array())
-  {
-    $params = array('projectId' => $projectId, 'historyId' => $historyId, 'executionId' => $executionId, 'stepId' => $stepId);
-    $params = array_merge($params, $optParams);
-    return $this->call('getPerfMetricsSummary', array($params), "Google_Service_ToolResults_PerfMetricsSummary");
-  }
-  /**
-   * Lists Steps for a given Execution.
-   *
-   * The steps are sorted by creation_time in descending order. The step_id key
-   * will be used to order the steps with the same creation_time.
-   *
-   * May return any of the following canonical error codes:
-   *
-   * - PERMISSION_DENIED - if the user is not authorized to read project -
-   * INVALID_ARGUMENT - if the request is malformed - FAILED_PRECONDITION - if an
-   * argument in the request happens to be invalid; e.g. if an attempt is made to
-   * list the children of a nonexistent Step - NOT_FOUND - if the containing
-   * Execution does not exist (steps.listProjectsHistoriesExecutionsSteps)
-   *
-   * @param string $projectId A Project id.
-   *
-   * Required.
-   * @param string $historyId A History id.
-   *
-   * Required.
-   * @param string $executionId A Execution id.
-   *
-   * Required.
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param int pageSize The maximum number of Steps to fetch.
-   *
-   * Default value: 25. The server will use this default if the field is not set
-   * or has a value of 0.
-   *
-   * Optional.
-   * @opt_param string pageToken A continuation token to resume the query at the
-   * next item.
-   *
-   * Optional.
-   * @return Google_Service_ToolResults_ListStepsResponse
-   */
-  public function listProjectsHistoriesExecutionsSteps($projectId, $historyId, $executionId, $optParams = array())
-  {
-    $params = array('projectId' => $projectId, 'historyId' => $historyId, 'executionId' => $executionId);
-    $params = array_merge($params, $optParams);
-    return $this->call('list', array($params), "Google_Service_ToolResults_ListStepsResponse");
-  }
-  /**
-   * Updates an existing Step with the supplied partial entity.
-   *
-   * May return any of the following canonical error codes:
-   *
-   * - PERMISSION_DENIED - if the user is not authorized to write project -
-   * INVALID_ARGUMENT - if the request is malformed - FAILED_PRECONDITION - if the
-   * requested state transition is illegal (e.g try to upload a duplicate xml
-   * file), if the updated step is too large (more than 10Mib) - NOT_FOUND - if
-   * the containing Execution does not exist (steps.patch)
-   *
-   * @param string $projectId A Project id.
-   *
-   * Required.
-   * @param string $historyId A History id.
-   *
-   * Required.
-   * @param string $executionId A Execution id.
-   *
-   * Required.
-   * @param string $stepId A Step id.
-   *
-   * Required.
-   * @param Google_Service_ToolResults_Step $postBody
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param string requestId A unique request ID for server to detect
-   * duplicated requests. For example, a UUID.
-   *
-   * Optional, but strongly recommended.
-   * @return Google_Service_ToolResults_Step
-   */
-  public function patch($projectId, $historyId, $executionId, $stepId, Google_Service_ToolResults_Step $postBody, $optParams = array())
-  {
-    $params = array('projectId' => $projectId, 'historyId' => $historyId, 'executionId' => $executionId, 'stepId' => $stepId, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('patch', array($params), "Google_Service_ToolResults_Step");
-  }
-  /**
-   * Publish xml files to an existing Step.
-   *
-   * May return any of the following canonical error codes:
-   *
-   * - PERMISSION_DENIED - if the user is not authorized to write project -
-   * INVALID_ARGUMENT - if the request is malformed - FAILED_PRECONDITION - if the
-   * requested state transition is illegal, e.g try to upload a duplicate xml file
-   * or a file too large. - NOT_FOUND - if the containing Execution does not exist
-   * (steps.publishXunitXmlFiles)
-   *
-   * @param string $projectId A Project id.
-   *
-   * Required.
-   * @param string $historyId A History id.
-   *
-   * Required.
-   * @param string $executionId A Execution id.
-   *
-   * Required.
-   * @param string $stepId A Step id. Note: This step must include a
-   * TestExecutionStep.
-   *
-   * Required.
-   * @param Google_Service_ToolResults_PublishXunitXmlFilesRequest $postBody
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_ToolResults_Step
-   */
-  public function publishXunitXmlFiles($projectId, $historyId, $executionId, $stepId, Google_Service_ToolResults_PublishXunitXmlFilesRequest $postBody, $optParams = array())
-  {
-    $params = array('projectId' => $projectId, 'historyId' => $historyId, 'executionId' => $executionId, 'stepId' => $stepId, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('publishXunitXmlFiles', array($params), "Google_Service_ToolResults_Step");
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ToolResults/Resource/ProjectsHistoriesExecutionsStepsPerfMetricsSummary.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ToolResults/Resource/ProjectsHistoriesExecutionsStepsPerfMetricsSummary.php
deleted file mode 100644
index dbde0b5e..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ToolResults/Resource/ProjectsHistoriesExecutionsStepsPerfMetricsSummary.php
+++ /dev/null
@@ -1,49 +0,0 @@
-
- *   $toolresultsService = new Google_Service_ToolResults(...);
- *   $perfMetricsSummary = $toolresultsService->perfMetricsSummary;
- *  
- */
-class Google_Service_ToolResults_Resource_ProjectsHistoriesExecutionsStepsPerfMetricsSummary extends Google_Service_Resource
-{
-  /**
-   * Creates a PerfMetricsSummary resource.
-   *
-   * May return any of the following error code(s): - ALREADY_EXISTS - A
-   * PerfMetricSummary already exists for the given Step - NOT_FOUND - The
-   * containing Step does not exist (perfMetricsSummary.create)
-   *
-   * @param string $projectId The cloud project
-   * @param string $historyId A tool results history ID.
-   * @param string $executionId A tool results execution ID.
-   * @param string $stepId A tool results step ID.
-   * @param Google_Service_ToolResults_PerfMetricsSummary $postBody
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_ToolResults_PerfMetricsSummary
-   */
-  public function create($projectId, $historyId, $executionId, $stepId, Google_Service_ToolResults_PerfMetricsSummary $postBody, $optParams = array())
-  {
-    $params = array('projectId' => $projectId, 'historyId' => $historyId, 'executionId' => $executionId, 'stepId' => $stepId, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('create', array($params), "Google_Service_ToolResults_PerfMetricsSummary");
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ToolResults/Resource/ProjectsHistoriesExecutionsStepsPerfSampleSeries.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ToolResults/Resource/ProjectsHistoriesExecutionsStepsPerfSampleSeries.php
deleted file mode 100644
index 84779a15..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ToolResults/Resource/ProjectsHistoriesExecutionsStepsPerfSampleSeries.php
+++ /dev/null
@@ -1,96 +0,0 @@
-
- *   $toolresultsService = new Google_Service_ToolResults(...);
- *   $perfSampleSeries = $toolresultsService->perfSampleSeries;
- *  
- */
-class Google_Service_ToolResults_Resource_ProjectsHistoriesExecutionsStepsPerfSampleSeries extends Google_Service_Resource
-{
-  /**
-   * Creates a PerfSampleSeries.
-   *
-   * May return any of the following error code(s): - ALREADY_EXISTS -
-   * PerfMetricSummary already exists for the given Step - NOT_FOUND - The
-   * containing Step does not exist (perfSampleSeries.create)
-   *
-   * @param string $projectId The cloud project
-   * @param string $historyId A tool results history ID.
-   * @param string $executionId A tool results execution ID.
-   * @param string $stepId A tool results step ID.
-   * @param Google_Service_ToolResults_PerfSampleSeries $postBody
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_ToolResults_PerfSampleSeries
-   */
-  public function create($projectId, $historyId, $executionId, $stepId, Google_Service_ToolResults_PerfSampleSeries $postBody, $optParams = array())
-  {
-    $params = array('projectId' => $projectId, 'historyId' => $historyId, 'executionId' => $executionId, 'stepId' => $stepId, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('create', array($params), "Google_Service_ToolResults_PerfSampleSeries");
-  }
-  /**
-   * Gets a PerfSampleSeries.
-   *
-   * May return any of the following error code(s): - NOT_FOUND - The specified
-   * PerfSampleSeries does not exist (perfSampleSeries.get)
-   *
-   * @param string $projectId The cloud project
-   * @param string $historyId A tool results history ID.
-   * @param string $executionId A tool results execution ID.
-   * @param string $stepId A tool results step ID.
-   * @param string $sampleSeriesId A sample series id
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_ToolResults_PerfSampleSeries
-   */
-  public function get($projectId, $historyId, $executionId, $stepId, $sampleSeriesId, $optParams = array())
-  {
-    $params = array('projectId' => $projectId, 'historyId' => $historyId, 'executionId' => $executionId, 'stepId' => $stepId, 'sampleSeriesId' => $sampleSeriesId);
-    $params = array_merge($params, $optParams);
-    return $this->call('get', array($params), "Google_Service_ToolResults_PerfSampleSeries");
-  }
-  /**
-   * Lists PerfSampleSeries for a given Step.
-   *
-   * The request provides an optional filter which specifies one or more
-   * PerfMetricsType to include in the result; if none returns all. The resulting
-   * PerfSampleSeries are sorted by ids.
-   *
-   * May return any of the following canonical error codes: - NOT_FOUND - The
-   * containing Step does not exist
-   * (perfSampleSeries.listProjectsHistoriesExecutionsStepsPerfSampleSeries)
-   *
-   * @param string $projectId The cloud project
-   * @param string $historyId A tool results history ID.
-   * @param string $executionId A tool results execution ID.
-   * @param string $stepId A tool results step ID.
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param string filter Specify one or more PerfMetricType values such as
-   * CPU to filter the result
-   * @return Google_Service_ToolResults_ListPerfSampleSeriesResponse
-   */
-  public function listProjectsHistoriesExecutionsStepsPerfSampleSeries($projectId, $historyId, $executionId, $stepId, $optParams = array())
-  {
-    $params = array('projectId' => $projectId, 'historyId' => $historyId, 'executionId' => $executionId, 'stepId' => $stepId);
-    $params = array_merge($params, $optParams);
-    return $this->call('list', array($params), "Google_Service_ToolResults_ListPerfSampleSeriesResponse");
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ToolResults/Resource/ProjectsHistoriesExecutionsStepsPerfSampleSeriesSamples.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ToolResults/Resource/ProjectsHistoriesExecutionsStepsPerfSampleSeriesSamples.php
deleted file mode 100644
index 1c4a55b7..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ToolResults/Resource/ProjectsHistoriesExecutionsStepsPerfSampleSeriesSamples.php
+++ /dev/null
@@ -1,87 +0,0 @@
-
- *   $toolresultsService = new Google_Service_ToolResults(...);
- *   $samples = $toolresultsService->samples;
- *  
- */
-class Google_Service_ToolResults_Resource_ProjectsHistoriesExecutionsStepsPerfSampleSeriesSamples extends Google_Service_Resource
-{
-  /**
-   * Creates a batch of PerfSamples - a client can submit multiple batches of Perf
-   * Samples through repeated calls to this method in order to split up a large
-   * request payload - duplicates and existing timestamp entries will be ignored.
-   * - the batch operation may partially succeed - the set of elements
-   * successfully inserted is returned in the response (omits items which already
-   * existed in the database).
-   *
-   * May return any of the following canonical error codes: - NOT_FOUND - The
-   * containing PerfSampleSeries does not exist (samples.batchCreate)
-   *
-   * @param string $projectId The cloud project
-   * @param string $historyId A tool results history ID.
-   * @param string $executionId A tool results execution ID.
-   * @param string $stepId A tool results step ID.
-   * @param string $sampleSeriesId A sample series id
-   * @param Google_Service_ToolResults_BatchCreatePerfSamplesRequest $postBody
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_ToolResults_BatchCreatePerfSamplesResponse
-   */
-  public function batchCreate($projectId, $historyId, $executionId, $stepId, $sampleSeriesId, Google_Service_ToolResults_BatchCreatePerfSamplesRequest $postBody, $optParams = array())
-  {
-    $params = array('projectId' => $projectId, 'historyId' => $historyId, 'executionId' => $executionId, 'stepId' => $stepId, 'sampleSeriesId' => $sampleSeriesId, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('batchCreate', array($params), "Google_Service_ToolResults_BatchCreatePerfSamplesResponse");
-  }
-  /**
-   * Lists the Performance Samples of a given Sample Series - The list results are
-   * sorted by timestamps ascending - The default page size is 500 samples; and
-   * maximum size allowed 5000 - The response token indicates the last returned
-   * PerfSample timestamp - When the results size exceeds the page size, submit a
-   * subsequent request including the page token to return the rest of the samples
-   * up to the page limit
-   *
-   * May return any of the following canonical error codes: - OUT_OF_RANGE - The
-   * specified request page_token is out of valid range - NOT_FOUND - The
-   * containing PerfSampleSeries does not exist
-   * (samples.listProjectsHistoriesExecutionsStepsPerfSampleSeriesSamples)
-   *
-   * @param string $projectId The cloud project
-   * @param string $historyId A tool results history ID.
-   * @param string $executionId A tool results execution ID.
-   * @param string $stepId A tool results step ID.
-   * @param string $sampleSeriesId A sample series id
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param int pageSize The default page size is 500 samples, and the maximum
-   * size is 5000. If the page_size is greater than 5000, the effective page size
-   * will be 5000
-   * @opt_param string pageToken Optional, the next_page_token returned in the
-   * previous response
-   * @return Google_Service_ToolResults_ListPerfSamplesResponse
-   */
-  public function listProjectsHistoriesExecutionsStepsPerfSampleSeriesSamples($projectId, $historyId, $executionId, $stepId, $sampleSeriesId, $optParams = array())
-  {
-    $params = array('projectId' => $projectId, 'historyId' => $historyId, 'executionId' => $executionId, 'stepId' => $stepId, 'sampleSeriesId' => $sampleSeriesId);
-    $params = array_merge($params, $optParams);
-    return $this->call('list', array($params), "Google_Service_ToolResults_ListPerfSamplesResponse");
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ToolResults/Resource/ProjectsHistoriesExecutionsStepsThumbnails.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ToolResults/Resource/ProjectsHistoriesExecutionsStepsThumbnails.php
deleted file mode 100644
index c4fdfd74..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ToolResults/Resource/ProjectsHistoriesExecutionsStepsThumbnails.php
+++ /dev/null
@@ -1,69 +0,0 @@
-
- *   $toolresultsService = new Google_Service_ToolResults(...);
- *   $thumbnails = $toolresultsService->thumbnails;
- *  
- */
-class Google_Service_ToolResults_Resource_ProjectsHistoriesExecutionsStepsThumbnails extends Google_Service_Resource
-{
-  /**
-   * Lists thumbnails of images attached to a step.
-   *
-   * May return any of the following canonical error codes: - PERMISSION_DENIED -
-   * if the user is not authorized to read from the project, or from any of the
-   * images - INVALID_ARGUMENT - if the request is malformed - NOT_FOUND - if the
-   * step does not exist, or if any of the images do not exist
-   * (thumbnails.listProjectsHistoriesExecutionsStepsThumbnails)
-   *
-   * @param string $projectId A Project id.
-   *
-   * Required.
-   * @param string $historyId A History id.
-   *
-   * Required.
-   * @param string $executionId An Execution id.
-   *
-   * Required.
-   * @param string $stepId A Step id.
-   *
-   * Required.
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param int pageSize The maximum number of thumbnails to fetch.
-   *
-   * Default value: 50. The server will use this default if the field is not set
-   * or has a value of 0.
-   *
-   * Optional.
-   * @opt_param string pageToken A continuation token to resume the query at the
-   * next item.
-   *
-   * Optional.
-   * @return Google_Service_ToolResults_ListStepThumbnailsResponse
-   */
-  public function listProjectsHistoriesExecutionsStepsThumbnails($projectId, $historyId, $executionId, $stepId, $optParams = array())
-  {
-    $params = array('projectId' => $projectId, 'historyId' => $historyId, 'executionId' => $executionId, 'stepId' => $stepId);
-    $params = array_merge($params, $optParams);
-    return $this->call('list', array($params), "Google_Service_ToolResults_ListStepThumbnailsResponse");
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ToolResults/SkippedDetail.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ToolResults/SkippedDetail.php
deleted file mode 100644
index eceaab36..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ToolResults/SkippedDetail.php
+++ /dev/null
@@ -1,48 +0,0 @@
-incompatibleAppVersion = $incompatibleAppVersion;
-  }
-  public function getIncompatibleAppVersion()
-  {
-    return $this->incompatibleAppVersion;
-  }
-  public function setIncompatibleArchitecture($incompatibleArchitecture)
-  {
-    $this->incompatibleArchitecture = $incompatibleArchitecture;
-  }
-  public function getIncompatibleArchitecture()
-  {
-    return $this->incompatibleArchitecture;
-  }
-  public function setIncompatibleDevice($incompatibleDevice)
-  {
-    $this->incompatibleDevice = $incompatibleDevice;
-  }
-  public function getIncompatibleDevice()
-  {
-    return $this->incompatibleDevice;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ToolResults/StackTrace.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ToolResults/StackTrace.php
deleted file mode 100644
index 7a86b325..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ToolResults/StackTrace.php
+++ /dev/null
@@ -1,30 +0,0 @@
-exception = $exception;
-  }
-  public function getException()
-  {
-    return $this->exception;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ToolResults/Status.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ToolResults/Status.php
deleted file mode 100644
index 679c1001..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ToolResults/Status.php
+++ /dev/null
@@ -1,50 +0,0 @@
-code = $code;
-  }
-  public function getCode()
-  {
-    return $this->code;
-  }
-  public function setDetails($details)
-  {
-    $this->details = $details;
-  }
-  public function getDetails()
-  {
-    return $this->details;
-  }
-  public function setMessage($message)
-  {
-    $this->message = $message;
-  }
-  public function getMessage()
-  {
-    return $this->message;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ToolResults/Step.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ToolResults/Step.php
deleted file mode 100644
index 34cf165b..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ToolResults/Step.php
+++ /dev/null
@@ -1,157 +0,0 @@
-completionTime = $completionTime;
-  }
-  public function getCompletionTime()
-  {
-    return $this->completionTime;
-  }
-  public function setCreationTime(Google_Service_ToolResults_Timestamp $creationTime)
-  {
-    $this->creationTime = $creationTime;
-  }
-  public function getCreationTime()
-  {
-    return $this->creationTime;
-  }
-  public function setDescription($description)
-  {
-    $this->description = $description;
-  }
-  public function getDescription()
-  {
-    return $this->description;
-  }
-  public function setDeviceUsageDuration(Google_Service_ToolResults_Duration $deviceUsageDuration)
-  {
-    $this->deviceUsageDuration = $deviceUsageDuration;
-  }
-  public function getDeviceUsageDuration()
-  {
-    return $this->deviceUsageDuration;
-  }
-  public function setDimensionValue($dimensionValue)
-  {
-    $this->dimensionValue = $dimensionValue;
-  }
-  public function getDimensionValue()
-  {
-    return $this->dimensionValue;
-  }
-  public function setHasImages($hasImages)
-  {
-    $this->hasImages = $hasImages;
-  }
-  public function getHasImages()
-  {
-    return $this->hasImages;
-  }
-  public function setLabels($labels)
-  {
-    $this->labels = $labels;
-  }
-  public function getLabels()
-  {
-    return $this->labels;
-  }
-  public function setName($name)
-  {
-    $this->name = $name;
-  }
-  public function getName()
-  {
-    return $this->name;
-  }
-  public function setOutcome(Google_Service_ToolResults_Outcome $outcome)
-  {
-    $this->outcome = $outcome;
-  }
-  public function getOutcome()
-  {
-    return $this->outcome;
-  }
-  public function setRunDuration(Google_Service_ToolResults_Duration $runDuration)
-  {
-    $this->runDuration = $runDuration;
-  }
-  public function getRunDuration()
-  {
-    return $this->runDuration;
-  }
-  public function setState($state)
-  {
-    $this->state = $state;
-  }
-  public function getState()
-  {
-    return $this->state;
-  }
-  public function setStepId($stepId)
-  {
-    $this->stepId = $stepId;
-  }
-  public function getStepId()
-  {
-    return $this->stepId;
-  }
-  public function setTestExecutionStep(Google_Service_ToolResults_TestExecutionStep $testExecutionStep)
-  {
-    $this->testExecutionStep = $testExecutionStep;
-  }
-  public function getTestExecutionStep()
-  {
-    return $this->testExecutionStep;
-  }
-  public function setToolExecutionStep(Google_Service_ToolResults_ToolExecutionStep $toolExecutionStep)
-  {
-    $this->toolExecutionStep = $toolExecutionStep;
-  }
-  public function getToolExecutionStep()
-  {
-    return $this->toolExecutionStep;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ToolResults/StepDimensionValueEntry.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ToolResults/StepDimensionValueEntry.php
deleted file mode 100644
index ea9eaafa..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ToolResults/StepDimensionValueEntry.php
+++ /dev/null
@@ -1,39 +0,0 @@
-key = $key;
-  }
-  public function getKey()
-  {
-    return $this->key;
-  }
-  public function setValue($value)
-  {
-    $this->value = $value;
-  }
-  public function getValue()
-  {
-    return $this->value;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ToolResults/StepLabelsEntry.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ToolResults/StepLabelsEntry.php
deleted file mode 100644
index 465e82de..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ToolResults/StepLabelsEntry.php
+++ /dev/null
@@ -1,39 +0,0 @@
-key = $key;
-  }
-  public function getKey()
-  {
-    return $this->key;
-  }
-  public function setValue($value)
-  {
-    $this->value = $value;
-  }
-  public function getValue()
-  {
-    return $this->value;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ToolResults/SuccessDetail.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ToolResults/SuccessDetail.php
deleted file mode 100644
index 40ecfdec..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ToolResults/SuccessDetail.php
+++ /dev/null
@@ -1,30 +0,0 @@
-otherNativeCrash = $otherNativeCrash;
-  }
-  public function getOtherNativeCrash()
-  {
-    return $this->otherNativeCrash;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ToolResults/TestCaseReference.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ToolResults/TestCaseReference.php
deleted file mode 100644
index 09a02a5a..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ToolResults/TestCaseReference.php
+++ /dev/null
@@ -1,48 +0,0 @@
-className = $className;
-  }
-  public function getClassName()
-  {
-    return $this->className;
-  }
-  public function setName($name)
-  {
-    $this->name = $name;
-  }
-  public function getName()
-  {
-    return $this->name;
-  }
-  public function setTestSuiteName($testSuiteName)
-  {
-    $this->testSuiteName = $testSuiteName;
-  }
-  public function getTestSuiteName()
-  {
-    return $this->testSuiteName;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ToolResults/TestExecutionStep.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ToolResults/TestExecutionStep.php
deleted file mode 100644
index 905c89ee..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ToolResults/TestExecutionStep.php
+++ /dev/null
@@ -1,62 +0,0 @@
-testIssues = $testIssues;
-  }
-  public function getTestIssues()
-  {
-    return $this->testIssues;
-  }
-  public function setTestSuiteOverviews($testSuiteOverviews)
-  {
-    $this->testSuiteOverviews = $testSuiteOverviews;
-  }
-  public function getTestSuiteOverviews()
-  {
-    return $this->testSuiteOverviews;
-  }
-  public function setTestTiming(Google_Service_ToolResults_TestTiming $testTiming)
-  {
-    $this->testTiming = $testTiming;
-  }
-  public function getTestTiming()
-  {
-    return $this->testTiming;
-  }
-  public function setToolExecution(Google_Service_ToolResults_ToolExecution $toolExecution)
-  {
-    $this->toolExecution = $toolExecution;
-  }
-  public function getToolExecution()
-  {
-    return $this->toolExecution;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ToolResults/TestIssue.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ToolResults/TestIssue.php
deleted file mode 100644
index 249b1401..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ToolResults/TestIssue.php
+++ /dev/null
@@ -1,40 +0,0 @@
-errorMessage = $errorMessage;
-  }
-  public function getErrorMessage()
-  {
-    return $this->errorMessage;
-  }
-  public function setStackTrace(Google_Service_ToolResults_StackTrace $stackTrace)
-  {
-    $this->stackTrace = $stackTrace;
-  }
-  public function getStackTrace()
-  {
-    return $this->stackTrace;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ToolResults/TestSuiteOverview.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ToolResults/TestSuiteOverview.php
deleted file mode 100644
index 1d414d48..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ToolResults/TestSuiteOverview.php
+++ /dev/null
@@ -1,76 +0,0 @@
-errorCount = $errorCount;
-  }
-  public function getErrorCount()
-  {
-    return $this->errorCount;
-  }
-  public function setFailureCount($failureCount)
-  {
-    $this->failureCount = $failureCount;
-  }
-  public function getFailureCount()
-  {
-    return $this->failureCount;
-  }
-  public function setName($name)
-  {
-    $this->name = $name;
-  }
-  public function getName()
-  {
-    return $this->name;
-  }
-  public function setSkippedCount($skippedCount)
-  {
-    $this->skippedCount = $skippedCount;
-  }
-  public function getSkippedCount()
-  {
-    return $this->skippedCount;
-  }
-  public function setTotalCount($totalCount)
-  {
-    $this->totalCount = $totalCount;
-  }
-  public function getTotalCount()
-  {
-    return $this->totalCount;
-  }
-  public function setXmlSource(Google_Service_ToolResults_FileReference $xmlSource)
-  {
-    $this->xmlSource = $xmlSource;
-  }
-  public function getXmlSource()
-  {
-    return $this->xmlSource;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ToolResults/TestTiming.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ToolResults/TestTiming.php
deleted file mode 100644
index c423ad0b..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ToolResults/TestTiming.php
+++ /dev/null
@@ -1,31 +0,0 @@
-testProcessDuration = $testProcessDuration;
-  }
-  public function getTestProcessDuration()
-  {
-    return $this->testProcessDuration;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ToolResults/Thumbnail.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ToolResults/Thumbnail.php
deleted file mode 100644
index d25ce8a4..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ToolResults/Thumbnail.php
+++ /dev/null
@@ -1,57 +0,0 @@
-contentType = $contentType;
-  }
-  public function getContentType()
-  {
-    return $this->contentType;
-  }
-  public function setData($data)
-  {
-    $this->data = $data;
-  }
-  public function getData()
-  {
-    return $this->data;
-  }
-  public function setHeightPx($heightPx)
-  {
-    $this->heightPx = $heightPx;
-  }
-  public function getHeightPx()
-  {
-    return $this->heightPx;
-  }
-  public function setWidthPx($widthPx)
-  {
-    $this->widthPx = $widthPx;
-  }
-  public function getWidthPx()
-  {
-    return $this->widthPx;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ToolResults/Timestamp.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ToolResults/Timestamp.php
deleted file mode 100644
index 4e329bfe..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ToolResults/Timestamp.php
+++ /dev/null
@@ -1,39 +0,0 @@
-nanos = $nanos;
-  }
-  public function getNanos()
-  {
-    return $this->nanos;
-  }
-  public function setSeconds($seconds)
-  {
-    $this->seconds = $seconds;
-  }
-  public function getSeconds()
-  {
-    return $this->seconds;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ToolResults/ToolExecution.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ToolResults/ToolExecution.php
deleted file mode 100644
index f462f129..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ToolResults/ToolExecution.php
+++ /dev/null
@@ -1,61 +0,0 @@
-commandLineArguments = $commandLineArguments;
-  }
-  public function getCommandLineArguments()
-  {
-    return $this->commandLineArguments;
-  }
-  public function setExitCode(Google_Service_ToolResults_ToolExitCode $exitCode)
-  {
-    $this->exitCode = $exitCode;
-  }
-  public function getExitCode()
-  {
-    return $this->exitCode;
-  }
-  public function setToolLogs($toolLogs)
-  {
-    $this->toolLogs = $toolLogs;
-  }
-  public function getToolLogs()
-  {
-    return $this->toolLogs;
-  }
-  public function setToolOutputs($toolOutputs)
-  {
-    $this->toolOutputs = $toolOutputs;
-  }
-  public function getToolOutputs()
-  {
-    return $this->toolOutputs;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ToolResults/ToolExecutionStep.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ToolResults/ToolExecutionStep.php
deleted file mode 100644
index 32a0e013..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ToolResults/ToolExecutionStep.php
+++ /dev/null
@@ -1,31 +0,0 @@
-toolExecution = $toolExecution;
-  }
-  public function getToolExecution()
-  {
-    return $this->toolExecution;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ToolResults/ToolExitCode.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ToolResults/ToolExitCode.php
deleted file mode 100644
index 8d25d55e..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ToolResults/ToolExitCode.php
+++ /dev/null
@@ -1,30 +0,0 @@
-number = $number;
-  }
-  public function getNumber()
-  {
-    return $this->number;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ToolResults/ToolOutputReference.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ToolResults/ToolOutputReference.php
deleted file mode 100644
index 4d2f255d..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/ToolResults/ToolOutputReference.php
+++ /dev/null
@@ -1,51 +0,0 @@
-creationTime = $creationTime;
-  }
-  public function getCreationTime()
-  {
-    return $this->creationTime;
-  }
-  public function setOutput(Google_Service_ToolResults_FileReference $output)
-  {
-    $this->output = $output;
-  }
-  public function getOutput()
-  {
-    return $this->output;
-  }
-  public function setTestCase(Google_Service_ToolResults_TestCaseReference $testCase)
-  {
-    $this->testCase = $testCase;
-  }
-  public function getTestCase()
-  {
-    return $this->testCase;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Tracing.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Tracing.php
deleted file mode 100644
index 75dc0e22..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Tracing.php
+++ /dev/null
@@ -1,137 +0,0 @@
-
- * Send and retrieve trace data from Google Stackdriver Trace.

- *
- * 

- * For more information about this service, see the API
- * Documentation
- * 

- *
- * @author Google, Inc.
- */
-class Google_Service_Tracing extends Google_Service
-{
-  /** View and manage your data across Google Cloud Platform services. */
-  const CLOUD_PLATFORM =
-      "https://www.googleapis.com/auth/cloud-platform";
-  /** Write Trace data for a project or application. */
-  const TRACE_APPEND =
-      "https://www.googleapis.com/auth/trace.append";
-  /** Read Trace data for a project or application. */
-  const TRACE_READONLY =
-      "https://www.googleapis.com/auth/trace.readonly";
-
-  public $projects_traces;
-  
-  /**
-   * Constructs the internal representation of the Tracing service.
-   *
-   * @param Google_Client $client
-   */
-  public function __construct(Google_Client $client)
-  {
-    parent::__construct($client);
-    $this->rootUrl = 'https://tracing.googleapis.com/';
-    $this->servicePath = '';
-    $this->version = 'v1';
-    $this->serviceName = 'tracing';
-
-    $this->projects_traces = new Google_Service_Tracing_Resource_ProjectsTraces(
-        $this,
-        $this->serviceName,
-        'traces',
-        array(
-          'methods' => array(
-            'batchUpdate' => array(
-              'path' => 'v1/{+parent}/traces:batchUpdate',
-              'httpMethod' => 'POST',
-              'parameters' => array(
-                'parent' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'get' => array(
-              'path' => 'v1/{+name}',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'name' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'list' => array(
-              'path' => 'v1/{+parent}/traces',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'parent' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'filter' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'endTime' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'pageToken' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'startTime' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'pageSize' => array(
-                  'location' => 'query',
-                  'type' => 'integer',
-                ),
-                'orderBy' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-              ),
-            ),'listSpans' => array(
-              'path' => 'v1/{+name}:listSpans',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'name' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'pageToken' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-              ),
-            ),
-          )
-        )
-    );
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Tracing/Annotation.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Tracing/Annotation.php
deleted file mode 100644
index 7f13a0fc..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Tracing/Annotation.php
+++ /dev/null
@@ -1,40 +0,0 @@
-attributes = $attributes;
-  }
-  public function getAttributes()
-  {
-    return $this->attributes;
-  }
-  public function setDescription($description)
-  {
-    $this->description = $description;
-  }
-  public function getDescription()
-  {
-    return $this->description;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Tracing/AttributeValue.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Tracing/AttributeValue.php
deleted file mode 100644
index 4f106b2a..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Tracing/AttributeValue.php
+++ /dev/null
@@ -1,48 +0,0 @@
-boolValue = $boolValue;
-  }
-  public function getBoolValue()
-  {
-    return $this->boolValue;
-  }
-  public function setIntValue($intValue)
-  {
-    $this->intValue = $intValue;
-  }
-  public function getIntValue()
-  {
-    return $this->intValue;
-  }
-  public function setStringValue($stringValue)
-  {
-    $this->stringValue = $stringValue;
-  }
-  public function getStringValue()
-  {
-    return $this->stringValue;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Tracing/BatchUpdateSpansRequest.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Tracing/BatchUpdateSpansRequest.php
deleted file mode 100644
index 35b349f4..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Tracing/BatchUpdateSpansRequest.php
+++ /dev/null
@@ -1,31 +0,0 @@
-spanUpdates = $spanUpdates;
-  }
-  public function getSpanUpdates()
-  {
-    return $this->spanUpdates;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Tracing/Link.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Tracing/Link.php
deleted file mode 100644
index 0eaad74a..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Tracing/Link.php
+++ /dev/null
@@ -1,48 +0,0 @@
-spanId = $spanId;
-  }
-  public function getSpanId()
-  {
-    return $this->spanId;
-  }
-  public function setTraceId($traceId)
-  {
-    $this->traceId = $traceId;
-  }
-  public function getTraceId()
-  {
-    return $this->traceId;
-  }
-  public function setType($type)
-  {
-    $this->type = $type;
-  }
-  public function getType()
-  {
-    return $this->type;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Tracing/ListSpansResponse.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Tracing/ListSpansResponse.php
deleted file mode 100644
index 70903e55..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Tracing/ListSpansResponse.php
+++ /dev/null
@@ -1,41 +0,0 @@
-nextPageToken = $nextPageToken;
-  }
-  public function getNextPageToken()
-  {
-    return $this->nextPageToken;
-  }
-  public function setSpans($spans)
-  {
-    $this->spans = $spans;
-  }
-  public function getSpans()
-  {
-    return $this->spans;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Tracing/ListTracesResponse.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Tracing/ListTracesResponse.php
deleted file mode 100644
index 82b58491..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Tracing/ListTracesResponse.php
+++ /dev/null
@@ -1,41 +0,0 @@
-nextPageToken = $nextPageToken;
-  }
-  public function getNextPageToken()
-  {
-    return $this->nextPageToken;
-  }
-  public function setTraces($traces)
-  {
-    $this->traces = $traces;
-  }
-  public function getTraces()
-  {
-    return $this->traces;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Tracing/Module.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Tracing/Module.php
deleted file mode 100644
index 88d87b88..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Tracing/Module.php
+++ /dev/null
@@ -1,39 +0,0 @@
-buildId = $buildId;
-  }
-  public function getBuildId()
-  {
-    return $this->buildId;
-  }
-  public function setModule($module)
-  {
-    $this->module = $module;
-  }
-  public function getModule()
-  {
-    return $this->module;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Tracing/NetworkEvent.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Tracing/NetworkEvent.php
deleted file mode 100644
index 4c71f090..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Tracing/NetworkEvent.php
+++ /dev/null
@@ -1,57 +0,0 @@
-kernelTime = $kernelTime;
-  }
-  public function getKernelTime()
-  {
-    return $this->kernelTime;
-  }
-  public function setMessageId($messageId)
-  {
-    $this->messageId = $messageId;
-  }
-  public function getMessageId()
-  {
-    return $this->messageId;
-  }
-  public function setMessageSize($messageSize)
-  {
-    $this->messageSize = $messageSize;
-  }
-  public function getMessageSize()
-  {
-    return $this->messageSize;
-  }
-  public function setType($type)
-  {
-    $this->type = $type;
-  }
-  public function getType()
-  {
-    return $this->type;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Tracing/Resource/Projects.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Tracing/Resource/Projects.php
deleted file mode 100644
index 40f60eaa..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Tracing/Resource/Projects.php
+++ /dev/null
@@ -1,28 +0,0 @@
-
- *   $tracingService = new Google_Service_Tracing(...);
- *   $projects = $tracingService->projects;
- *  
- */
-class Google_Service_Tracing_Resource_Projects extends Google_Service_Resource
-{
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Tracing/Resource/ProjectsTraces.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Tracing/Resource/ProjectsTraces.php
deleted file mode 100644
index b92f2420..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Tracing/Resource/ProjectsTraces.php
+++ /dev/null
@@ -1,116 +0,0 @@
-
- *   $tracingService = new Google_Service_Tracing(...);
- *   $traces = $tracingService->traces;
- *  
- */
-class Google_Service_Tracing_Resource_ProjectsTraces extends Google_Service_Resource
-{
-  /**
-   * Sends new spans to Stackdriver Trace or updates existing spans. If the name
-   * of a trace that you send matches that of an existing trace, any fields in the
-   * existing trace and its spans are overwritten by the provided values, and any
-   * new fields provided are merged with the existing trace data. If the name does
-   * not match, a new trace is created with given set of spans.
-   * (traces.batchUpdate)
-   *
-   * @param string $parent ID of the Cloud project where the trace data is stored.
-   * @param Google_Service_Tracing_BatchUpdateSpansRequest $postBody
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Tracing_TracingEmpty
-   */
-  public function batchUpdate($parent, Google_Service_Tracing_BatchUpdateSpansRequest $postBody, $optParams = array())
-  {
-    $params = array('parent' => $parent, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('batchUpdate', array($params), "Google_Service_Tracing_TracingEmpty");
-  }
-  /**
-   * Returns a specific trace. (traces.get)
-   *
-   * @param string $name ID of the trace which is "projects//traces/".
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Tracing_Trace
-   */
-  public function get($name, $optParams = array())
-  {
-    $params = array('name' => $name);
-    $params = array_merge($params, $optParams);
-    return $this->call('get', array($params), "Google_Service_Tracing_Trace");
-  }
-  /**
-   * Returns of a list of traces that match the specified filter conditions.
-   * (traces.listProjectsTraces)
-   *
-   * @param string $parent ID of the Cloud project where the trace data is stored.
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param string filter An optional filter for the request. Example:
-   * "version_label_key:a some_label:some_label_key" returns traces from version a
-   * and has some_label with some_label_key.
-   * @opt_param string endTime End of the time interval (inclusive) during which
-   * the trace data was collected from the application.
-   * @opt_param string pageToken Token identifying the page of results to return.
-   * If provided, use the value of the `next_page_token` field from a previous
-   * request. Optional.
-   * @opt_param string startTime Start of the time interval (inclusive) during
-   * which the trace data was collected from the application.
-   * @opt_param int pageSize Maximum number of traces to return. If not specified
-   * or <= 0, the implementation selects a reasonable value.  The implementation
-   * may return fewer traces than the requested page size. Optional.
-   * @opt_param string orderBy Field used to sort the returned traces. Optional.
-   * Can be one of the following:
-   *
-   * *   `trace_id` *   `name` (`name` field of root span in the trace) *
-   * `duration` (difference between `end_time` and `start_time` fields of      the
-   * root span) *   `start` (`start_time` field of the root span)
-   *
-   * Descending order can be specified by appending `desc` to the sort field (for
-   * example, `name desc`).
-   *
-   * Only one sort field is permitted.
-   * @return Google_Service_Tracing_ListTracesResponse
-   */
-  public function listProjectsTraces($parent, $optParams = array())
-  {
-    $params = array('parent' => $parent);
-    $params = array_merge($params, $optParams);
-    return $this->call('list', array($params), "Google_Service_Tracing_ListTracesResponse");
-  }
-  /**
-   * Returns a list of spans within a trace. (traces.listSpans)
-   *
-   * @param string $name ID of the span set where is "projects//traces/".
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param string pageToken Token identifying the page of results to return.
-   * If provided, use the value of the `page_token` field from a previous request.
-   * Optional.
-   * @return Google_Service_Tracing_ListSpansResponse
-   */
-  public function listSpans($name, $optParams = array())
-  {
-    $params = array('name' => $name);
-    $params = array_merge($params, $optParams);
-    return $this->call('listSpans', array($params), "Google_Service_Tracing_ListSpansResponse");
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Tracing/Span.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Tracing/Span.php
deleted file mode 100644
index f10fb7ce..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Tracing/Span.php
+++ /dev/null
@@ -1,126 +0,0 @@
-attributes = $attributes;
-  }
-  public function getAttributes()
-  {
-    return $this->attributes;
-  }
-  public function setHasRemoteParent($hasRemoteParent)
-  {
-    $this->hasRemoteParent = $hasRemoteParent;
-  }
-  public function getHasRemoteParent()
-  {
-    return $this->hasRemoteParent;
-  }
-  public function setId($id)
-  {
-    $this->id = $id;
-  }
-  public function getId()
-  {
-    return $this->id;
-  }
-  public function setLinks($links)
-  {
-    $this->links = $links;
-  }
-  public function getLinks()
-  {
-    return $this->links;
-  }
-  public function setLocalEndTime($localEndTime)
-  {
-    $this->localEndTime = $localEndTime;
-  }
-  public function getLocalEndTime()
-  {
-    return $this->localEndTime;
-  }
-  public function setLocalStartTime($localStartTime)
-  {
-    $this->localStartTime = $localStartTime;
-  }
-  public function getLocalStartTime()
-  {
-    return $this->localStartTime;
-  }
-  public function setName($name)
-  {
-    $this->name = $name;
-  }
-  public function getName()
-  {
-    return $this->name;
-  }
-  public function setParentId($parentId)
-  {
-    $this->parentId = $parentId;
-  }
-  public function getParentId()
-  {
-    return $this->parentId;
-  }
-  public function setStackTrace(Google_Service_Tracing_StackTrace $stackTrace)
-  {
-    $this->stackTrace = $stackTrace;
-  }
-  public function getStackTrace()
-  {
-    return $this->stackTrace;
-  }
-  public function setStatus(Google_Service_Tracing_Status $status)
-  {
-    $this->status = $status;
-  }
-  public function getStatus()
-  {
-    return $this->status;
-  }
-  public function setTimeEvents($timeEvents)
-  {
-    $this->timeEvents = $timeEvents;
-  }
-  public function getTimeEvents()
-  {
-    return $this->timeEvents;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Tracing/SpanUpdates.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Tracing/SpanUpdates.php
deleted file mode 100644
index 189adbca..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Tracing/SpanUpdates.php
+++ /dev/null
@@ -1,32 +0,0 @@
-spans = $spans;
-  }
-  public function getSpans()
-  {
-    return $this->spans;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Tracing/StackFrame.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Tracing/StackFrame.php
deleted file mode 100644
index c415bd26..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Tracing/StackFrame.php
+++ /dev/null
@@ -1,85 +0,0 @@
-columnNumber = $columnNumber;
-  }
-  public function getColumnNumber()
-  {
-    return $this->columnNumber;
-  }
-  public function setFileName($fileName)
-  {
-    $this->fileName = $fileName;
-  }
-  public function getFileName()
-  {
-    return $this->fileName;
-  }
-  public function setFunctionName($functionName)
-  {
-    $this->functionName = $functionName;
-  }
-  public function getFunctionName()
-  {
-    return $this->functionName;
-  }
-  public function setLineNumber($lineNumber)
-  {
-    $this->lineNumber = $lineNumber;
-  }
-  public function getLineNumber()
-  {
-    return $this->lineNumber;
-  }
-  public function setLoadModule(Google_Service_Tracing_Module $loadModule)
-  {
-    $this->loadModule = $loadModule;
-  }
-  public function getLoadModule()
-  {
-    return $this->loadModule;
-  }
-  public function setOriginalFunctionName($originalFunctionName)
-  {
-    $this->originalFunctionName = $originalFunctionName;
-  }
-  public function getOriginalFunctionName()
-  {
-    return $this->originalFunctionName;
-  }
-  public function setSourceVersion($sourceVersion)
-  {
-    $this->sourceVersion = $sourceVersion;
-  }
-  public function getSourceVersion()
-  {
-    return $this->sourceVersion;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Tracing/StackTrace.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Tracing/StackTrace.php
deleted file mode 100644
index 83e70068..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Tracing/StackTrace.php
+++ /dev/null
@@ -1,41 +0,0 @@
-stackFrame = $stackFrame;
-  }
-  public function getStackFrame()
-  {
-    return $this->stackFrame;
-  }
-  public function setStackTraceHashId($stackTraceHashId)
-  {
-    $this->stackTraceHashId = $stackTraceHashId;
-  }
-  public function getStackTraceHashId()
-  {
-    return $this->stackTraceHashId;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Tracing/Status.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Tracing/Status.php
deleted file mode 100644
index 37d913d1..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Tracing/Status.php
+++ /dev/null
@@ -1,49 +0,0 @@
-code = $code;
-  }
-  public function getCode()
-  {
-    return $this->code;
-  }
-  public function setDetails($details)
-  {
-    $this->details = $details;
-  }
-  public function getDetails()
-  {
-    return $this->details;
-  }
-  public function setMessage($message)
-  {
-    $this->message = $message;
-  }
-  public function getMessage()
-  {
-    return $this->message;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Tracing/TimeEvent.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Tracing/TimeEvent.php
deleted file mode 100644
index 21c9b2c3..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Tracing/TimeEvent.php
+++ /dev/null
@@ -1,50 +0,0 @@
-annotation = $annotation;
-  }
-  public function getAnnotation()
-  {
-    return $this->annotation;
-  }
-  public function setLocalTime($localTime)
-  {
-    $this->localTime = $localTime;
-  }
-  public function getLocalTime()
-  {
-    return $this->localTime;
-  }
-  public function setNetworkEvent(Google_Service_Tracing_NetworkEvent $networkEvent)
-  {
-    $this->networkEvent = $networkEvent;
-  }
-  public function getNetworkEvent()
-  {
-    return $this->networkEvent;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Tracing/Trace.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Tracing/Trace.php
deleted file mode 100644
index 732912c5..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Tracing/Trace.php
+++ /dev/null
@@ -1,30 +0,0 @@
-name = $name;
-  }
-  public function getName()
-  {
-    return $this->name;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Tracing/TracingEmpty.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Tracing/TracingEmpty.php
deleted file mode 100644
index 21a5e473..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Tracing/TracingEmpty.php
+++ /dev/null
@@ -1,20 +0,0 @@
-
- * Translates text from one language to another.

- *
- * 

- * For more information about this service, see the API
- * Documentation
- * 

- *
- * @author Google, Inc.
- */
-class Google_Service_Translate extends Google_Service
-{
-
-
-  public $detections;
-  public $languages;
-  public $translations;
-  
-  /**
-   * Constructs the internal representation of the Translate service.
-   *
-   * @param Google_Client $client
-   */
-  public function __construct(Google_Client $client)
-  {
-    parent::__construct($client);
-    $this->rootUrl = 'https://www.googleapis.com/';
-    $this->servicePath = 'language/translate/';
-    $this->version = 'v2';
-    $this->serviceName = 'translate';
-
-    $this->detections = new Google_Service_Translate_Resource_Detections(
-        $this,
-        $this->serviceName,
-        'detections',
-        array(
-          'methods' => array(
-            'list' => array(
-              'path' => 'v2/detect',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'q' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                  'repeated' => true,
-                  'required' => true,
-                ),
-              ),
-            ),
-          )
-        )
-    );
-    $this->languages = new Google_Service_Translate_Resource_Languages(
-        $this,
-        $this->serviceName,
-        'languages',
-        array(
-          'methods' => array(
-            'list' => array(
-              'path' => 'v2/languages',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'target' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-              ),
-            ),
-          )
-        )
-    );
-    $this->translations = new Google_Service_Translate_Resource_Translations(
-        $this,
-        $this->serviceName,
-        'translations',
-        array(
-          'methods' => array(
-            'list' => array(
-              'path' => 'v2',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'q' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                  'repeated' => true,
-                  'required' => true,
-                ),
-                'target' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'cid' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                  'repeated' => true,
-                ),
-                'format' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'source' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-              ),
-            ),
-          )
-        )
-    );
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Translate/DetectionsListResponse.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Translate/DetectionsListResponse.php
deleted file mode 100644
index c336dd68..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Translate/DetectionsListResponse.php
+++ /dev/null
@@ -1,32 +0,0 @@
-detections = $detections;
-  }
-  public function getDetections()
-  {
-    return $this->detections;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Translate/DetectionsResourceItems.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Translate/DetectionsResourceItems.php
deleted file mode 100644
index c36f65d6..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Translate/DetectionsResourceItems.php
+++ /dev/null
@@ -1,48 +0,0 @@
-confidence = $confidence;
-  }
-  public function getConfidence()
-  {
-    return $this->confidence;
-  }
-  public function setIsReliable($isReliable)
-  {
-    $this->isReliable = $isReliable;
-  }
-  public function getIsReliable()
-  {
-    return $this->isReliable;
-  }
-  public function setLanguage($language)
-  {
-    $this->language = $language;
-  }
-  public function getLanguage()
-  {
-    return $this->language;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Translate/LanguagesListResponse.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Translate/LanguagesListResponse.php
deleted file mode 100644
index d884671a..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Translate/LanguagesListResponse.php
+++ /dev/null
@@ -1,32 +0,0 @@
-languages = $languages;
-  }
-  public function getLanguages()
-  {
-    return $this->languages;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Translate/LanguagesResource.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Translate/LanguagesResource.php
deleted file mode 100644
index 1b711286..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Translate/LanguagesResource.php
+++ /dev/null
@@ -1,39 +0,0 @@
-language = $language;
-  }
-  public function getLanguage()
-  {
-    return $this->language;
-  }
-  public function setName($name)
-  {
-    $this->name = $name;
-  }
-  public function getName()
-  {
-    return $this->name;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Translate/Resource/Detections.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Translate/Resource/Detections.php
deleted file mode 100644
index 9c534293..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Translate/Resource/Detections.php
+++ /dev/null
@@ -1,41 +0,0 @@
-
- *   $translateService = new Google_Service_Translate(...);
- *   $detections = $translateService->detections;
- *  
- */
-class Google_Service_Translate_Resource_Detections extends Google_Service_Resource
-{
-  /**
-   * Detect the language of text. (detections.listDetections)
-   *
-   * @param string|array $q The text to detect
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Translate_DetectionsListResponse
-   */
-  public function listDetections($q, $optParams = array())
-  {
-    $params = array('q' => $q);
-    $params = array_merge($params, $optParams);
-    return $this->call('list', array($params), "Google_Service_Translate_DetectionsListResponse");
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Translate/Resource/Languages.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Translate/Resource/Languages.php
deleted file mode 100644
index f1ee702a..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Translate/Resource/Languages.php
+++ /dev/null
@@ -1,44 +0,0 @@
-
- *   $translateService = new Google_Service_Translate(...);
- *   $languages = $translateService->languages;
- *  
- */
-class Google_Service_Translate_Resource_Languages extends Google_Service_Resource
-{
-  /**
-   * List the source/target languages supported by the API
-   * (languages.listLanguages)
-   *
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param string target the language and collation in which the localized
-   * results should be returned
-   * @return Google_Service_Translate_LanguagesListResponse
-   */
-  public function listLanguages($optParams = array())
-  {
-    $params = array();
-    $params = array_merge($params, $optParams);
-    return $this->call('list', array($params), "Google_Service_Translate_LanguagesListResponse");
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Translate/Resource/Translations.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Translate/Resource/Translations.php
deleted file mode 100644
index 771d576e..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Translate/Resource/Translations.php
+++ /dev/null
@@ -1,48 +0,0 @@
-
- *   $translateService = new Google_Service_Translate(...);
- *   $translations = $translateService->translations;
- *  
- */
-class Google_Service_Translate_Resource_Translations extends Google_Service_Resource
-{
-  /**
-   * Returns text translations from one language to another.
-   * (translations.listTranslations)
-   *
-   * @param string|array $q The text to translate
-   * @param string $target The target language into which the text should be
-   * translated
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param string cid The customization id for translate
-   * @opt_param string format The format of the text
-   * @opt_param string source The source language of the text
-   * @return Google_Service_Translate_TranslationsListResponse
-   */
-  public function listTranslations($q, $target, $optParams = array())
-  {
-    $params = array('q' => $q, 'target' => $target);
-    $params = array_merge($params, $optParams);
-    return $this->call('list', array($params), "Google_Service_Translate_TranslationsListResponse");
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Translate/TranslationsListResponse.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Translate/TranslationsListResponse.php
deleted file mode 100644
index 0a402cc3..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Translate/TranslationsListResponse.php
+++ /dev/null
@@ -1,32 +0,0 @@
-translations = $translations;
-  }
-  public function getTranslations()
-  {
-    return $this->translations;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Translate/TranslationsResource.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Translate/TranslationsResource.php
deleted file mode 100644
index f68731f9..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Translate/TranslationsResource.php
+++ /dev/null
@@ -1,39 +0,0 @@
-detectedSourceLanguage = $detectedSourceLanguage;
-  }
-  public function getDetectedSourceLanguage()
-  {
-    return $this->detectedSourceLanguage;
-  }
-  public function setTranslatedText($translatedText)
-  {
-    $this->translatedText = $translatedText;
-  }
-  public function getTranslatedText()
-  {
-    return $this->translatedText;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Urlshortener.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Urlshortener.php
deleted file mode 100644
index 9780c28d..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Urlshortener.php
+++ /dev/null
@@ -1,94 +0,0 @@
-
- * Lets you create, inspect, and manage goo.gl short URLs

- *
- * 

- * For more information about this service, see the API
- * Documentation
- * 

- *
- * @author Google, Inc.
- */
-class Google_Service_Urlshortener extends Google_Service
-{
-  /** Manage your goo.gl short URLs. */
-  const URLSHORTENER =
-      "https://www.googleapis.com/auth/urlshortener";
-
-  public $url;
-  
-  /**
-   * Constructs the internal representation of the Urlshortener service.
-   *
-   * @param Google_Client $client
-   */
-  public function __construct(Google_Client $client)
-  {
-    parent::__construct($client);
-    $this->rootUrl = 'https://www.googleapis.com/';
-    $this->servicePath = 'urlshortener/v1/';
-    $this->version = 'v1';
-    $this->serviceName = 'urlshortener';
-
-    $this->url = new Google_Service_Urlshortener_Resource_Url(
-        $this,
-        $this->serviceName,
-        'url',
-        array(
-          'methods' => array(
-            'get' => array(
-              'path' => 'url',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'shortUrl' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'projection' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-              ),
-            ),'insert' => array(
-              'path' => 'url',
-              'httpMethod' => 'POST',
-              'parameters' => array(),
-            ),'list' => array(
-              'path' => 'url/history',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'projection' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'start-token' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-              ),
-            ),
-          )
-        )
-    );
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Urlshortener/AnalyticsSnapshot.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Urlshortener/AnalyticsSnapshot.php
deleted file mode 100644
index fcfa736c..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Urlshortener/AnalyticsSnapshot.php
+++ /dev/null
@@ -1,80 +0,0 @@
-browsers = $browsers;
-  }
-  public function getBrowsers()
-  {
-    return $this->browsers;
-  }
-  public function setCountries($countries)
-  {
-    $this->countries = $countries;
-  }
-  public function getCountries()
-  {
-    return $this->countries;
-  }
-  public function setLongUrlClicks($longUrlClicks)
-  {
-    $this->longUrlClicks = $longUrlClicks;
-  }
-  public function getLongUrlClicks()
-  {
-    return $this->longUrlClicks;
-  }
-  public function setPlatforms($platforms)
-  {
-    $this->platforms = $platforms;
-  }
-  public function getPlatforms()
-  {
-    return $this->platforms;
-  }
-  public function setReferrers($referrers)
-  {
-    $this->referrers = $referrers;
-  }
-  public function getReferrers()
-  {
-    return $this->referrers;
-  }
-  public function setShortUrlClicks($shortUrlClicks)
-  {
-    $this->shortUrlClicks = $shortUrlClicks;
-  }
-  public function getShortUrlClicks()
-  {
-    return $this->shortUrlClicks;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Urlshortener/AnalyticsSummary.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Urlshortener/AnalyticsSummary.php
deleted file mode 100644
index 308ba121..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Urlshortener/AnalyticsSummary.php
+++ /dev/null
@@ -1,71 +0,0 @@
-allTime = $allTime;
-  }
-  public function getAllTime()
-  {
-    return $this->allTime;
-  }
-  public function setDay(Google_Service_Urlshortener_AnalyticsSnapshot $day)
-  {
-    $this->day = $day;
-  }
-  public function getDay()
-  {
-    return $this->day;
-  }
-  public function setMonth(Google_Service_Urlshortener_AnalyticsSnapshot $month)
-  {
-    $this->month = $month;
-  }
-  public function getMonth()
-  {
-    return $this->month;
-  }
-  public function setTwoHours(Google_Service_Urlshortener_AnalyticsSnapshot $twoHours)
-  {
-    $this->twoHours = $twoHours;
-  }
-  public function getTwoHours()
-  {
-    return $this->twoHours;
-  }
-  public function setWeek(Google_Service_Urlshortener_AnalyticsSnapshot $week)
-  {
-    $this->week = $week;
-  }
-  public function getWeek()
-  {
-    return $this->week;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Urlshortener/Resource/Url.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Urlshortener/Resource/Url.php
deleted file mode 100644
index f016a7c9..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Urlshortener/Resource/Url.php
+++ /dev/null
@@ -1,72 +0,0 @@
-
- *   $urlshortenerService = new Google_Service_Urlshortener(...);
- *   $url = $urlshortenerService->url;
- *  
- */
-class Google_Service_Urlshortener_Resource_Url extends Google_Service_Resource
-{
-  /**
-   * Expands a short URL or gets creation time and analytics. (url.get)
-   *
-   * @param string $shortUrl The short URL, including the protocol.
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param string projection Additional information to return.
-   * @return Google_Service_Urlshortener_Url
-   */
-  public function get($shortUrl, $optParams = array())
-  {
-    $params = array('shortUrl' => $shortUrl);
-    $params = array_merge($params, $optParams);
-    return $this->call('get', array($params), "Google_Service_Urlshortener_Url");
-  }
-  /**
-   * Creates a new short URL. (url.insert)
-   *
-   * @param Google_Service_Urlshortener_Url $postBody
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Urlshortener_Url
-   */
-  public function insert(Google_Service_Urlshortener_Url $postBody, $optParams = array())
-  {
-    $params = array('postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('insert', array($params), "Google_Service_Urlshortener_Url");
-  }
-  /**
-   * Retrieves a list of URLs shortened by a user. (url.listUrl)
-   *
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param string projection Additional information to return.
-   * @opt_param string start-token Token for requesting successive pages of
-   * results.
-   * @return Google_Service_Urlshortener_UrlHistory
-   */
-  public function listUrl($optParams = array())
-  {
-    $params = array();
-    $params = array_merge($params, $optParams);
-    return $this->call('list', array($params), "Google_Service_Urlshortener_UrlHistory");
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Urlshortener/StringCount.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Urlshortener/StringCount.php
deleted file mode 100644
index c6284d1b..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Urlshortener/StringCount.php
+++ /dev/null
@@ -1,39 +0,0 @@
-count = $count;
-  }
-  public function getCount()
-  {
-    return $this->count;
-  }
-  public function setId($id)
-  {
-    $this->id = $id;
-  }
-  public function getId()
-  {
-    return $this->id;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Urlshortener/Url.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Urlshortener/Url.php
deleted file mode 100644
index c70d4972..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Urlshortener/Url.php
+++ /dev/null
@@ -1,76 +0,0 @@
-analytics = $analytics;
-  }
-  public function getAnalytics()
-  {
-    return $this->analytics;
-  }
-  public function setCreated($created)
-  {
-    $this->created = $created;
-  }
-  public function getCreated()
-  {
-    return $this->created;
-  }
-  public function setId($id)
-  {
-    $this->id = $id;
-  }
-  public function getId()
-  {
-    return $this->id;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setLongUrl($longUrl)
-  {
-    $this->longUrl = $longUrl;
-  }
-  public function getLongUrl()
-  {
-    return $this->longUrl;
-  }
-  public function setStatus($status)
-  {
-    $this->status = $status;
-  }
-  public function getStatus()
-  {
-    return $this->status;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Urlshortener/UrlHistory.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Urlshortener/UrlHistory.php
deleted file mode 100644
index e406d4a6..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Urlshortener/UrlHistory.php
+++ /dev/null
@@ -1,68 +0,0 @@
-items = $items;
-  }
-  public function getItems()
-  {
-    return $this->items;
-  }
-  public function setItemsPerPage($itemsPerPage)
-  {
-    $this->itemsPerPage = $itemsPerPage;
-  }
-  public function getItemsPerPage()
-  {
-    return $this->itemsPerPage;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setNextPageToken($nextPageToken)
-  {
-    $this->nextPageToken = $nextPageToken;
-  }
-  public function getNextPageToken()
-  {
-    return $this->nextPageToken;
-  }
-  public function setTotalItems($totalItems)
-  {
-    $this->totalItems = $totalItems;
-  }
-  public function getTotalItems()
-  {
-    return $this->totalItems;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Vision.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Vision.php
deleted file mode 100644
index 23613136..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Vision.php
+++ /dev/null
@@ -1,69 +0,0 @@
-
- * Integrates Google Vision features, including image labeling, face, logo, and
- * landmark detection, optical character recognition (OCR), and detection of
- * explicit content, into applications.

- *
- * 

- * For more information about this service, see the API
- * Documentation
- * 

- *
- * @author Google, Inc.
- */
-class Google_Service_Vision extends Google_Service
-{
-  /** View and manage your data across Google Cloud Platform services. */
-  const CLOUD_PLATFORM =
-      "https://www.googleapis.com/auth/cloud-platform";
-
-  public $images;
-  
-  /**
-   * Constructs the internal representation of the Vision service.
-   *
-   * @param Google_Client $client
-   */
-  public function __construct(Google_Client $client)
-  {
-    parent::__construct($client);
-    $this->rootUrl = 'https://vision.googleapis.com/';
-    $this->servicePath = '';
-    $this->version = 'v1';
-    $this->serviceName = 'vision';
-
-    $this->images = new Google_Service_Vision_Resource_Images(
-        $this,
-        $this->serviceName,
-        'images',
-        array(
-          'methods' => array(
-            'annotate' => array(
-              'path' => 'v1/images:annotate',
-              'httpMethod' => 'POST',
-              'parameters' => array(),
-            ),
-          )
-        )
-    );
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Vision/AnnotateImageRequest.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Vision/AnnotateImageRequest.php
deleted file mode 100644
index 06d8673a..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Vision/AnnotateImageRequest.php
+++ /dev/null
@@ -1,52 +0,0 @@
-features = $features;
-  }
-  public function getFeatures()
-  {
-    return $this->features;
-  }
-  public function setImage(Google_Service_Vision_Image $image)
-  {
-    $this->image = $image;
-  }
-  public function getImage()
-  {
-    return $this->image;
-  }
-  public function setImageContext(Google_Service_Vision_ImageContext $imageContext)
-  {
-    $this->imageContext = $imageContext;
-  }
-  public function getImageContext()
-  {
-    return $this->imageContext;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Vision/AnnotateImageResponse.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Vision/AnnotateImageResponse.php
deleted file mode 100644
index 6c9aa54c..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Vision/AnnotateImageResponse.php
+++ /dev/null
@@ -1,132 +0,0 @@
-cropHintsAnnotation = $cropHintsAnnotation;
-  }
-  public function getCropHintsAnnotation()
-  {
-    return $this->cropHintsAnnotation;
-  }
-  public function setError(Google_Service_Vision_Status $error)
-  {
-    $this->error = $error;
-  }
-  public function getError()
-  {
-    return $this->error;
-  }
-  public function setFaceAnnotations($faceAnnotations)
-  {
-    $this->faceAnnotations = $faceAnnotations;
-  }
-  public function getFaceAnnotations()
-  {
-    return $this->faceAnnotations;
-  }
-  public function setFullTextAnnotation(Google_Service_Vision_TextAnnotation $fullTextAnnotation)
-  {
-    $this->fullTextAnnotation = $fullTextAnnotation;
-  }
-  public function getFullTextAnnotation()
-  {
-    return $this->fullTextAnnotation;
-  }
-  public function setImagePropertiesAnnotation(Google_Service_Vision_ImageProperties $imagePropertiesAnnotation)
-  {
-    $this->imagePropertiesAnnotation = $imagePropertiesAnnotation;
-  }
-  public function getImagePropertiesAnnotation()
-  {
-    return $this->imagePropertiesAnnotation;
-  }
-  public function setLabelAnnotations($labelAnnotations)
-  {
-    $this->labelAnnotations = $labelAnnotations;
-  }
-  public function getLabelAnnotations()
-  {
-    return $this->labelAnnotations;
-  }
-  public function setLandmarkAnnotations($landmarkAnnotations)
-  {
-    $this->landmarkAnnotations = $landmarkAnnotations;
-  }
-  public function getLandmarkAnnotations()
-  {
-    return $this->landmarkAnnotations;
-  }
-  public function setLogoAnnotations($logoAnnotations)
-  {
-    $this->logoAnnotations = $logoAnnotations;
-  }
-  public function getLogoAnnotations()
-  {
-    return $this->logoAnnotations;
-  }
-  public function setSafeSearchAnnotation(Google_Service_Vision_SafeSearchAnnotation $safeSearchAnnotation)
-  {
-    $this->safeSearchAnnotation = $safeSearchAnnotation;
-  }
-  public function getSafeSearchAnnotation()
-  {
-    return $this->safeSearchAnnotation;
-  }
-  public function setTextAnnotations($textAnnotations)
-  {
-    $this->textAnnotations = $textAnnotations;
-  }
-  public function getTextAnnotations()
-  {
-    return $this->textAnnotations;
-  }
-  public function setWebDetection(Google_Service_Vision_WebDetection $webDetection)
-  {
-    $this->webDetection = $webDetection;
-  }
-  public function getWebDetection()
-  {
-    return $this->webDetection;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Vision/BatchAnnotateImagesRequest.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Vision/BatchAnnotateImagesRequest.php
deleted file mode 100644
index 2ad78a61..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Vision/BatchAnnotateImagesRequest.php
+++ /dev/null
@@ -1,32 +0,0 @@
-requests = $requests;
-  }
-  public function getRequests()
-  {
-    return $this->requests;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Vision/BatchAnnotateImagesResponse.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Vision/BatchAnnotateImagesResponse.php
deleted file mode 100644
index 4a7f0222..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Vision/BatchAnnotateImagesResponse.php
+++ /dev/null
@@ -1,32 +0,0 @@
-responses = $responses;
-  }
-  public function getResponses()
-  {
-    return $this->responses;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Vision/Block.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Vision/Block.php
deleted file mode 100644
index 1935aac9..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Vision/Block.php
+++ /dev/null
@@ -1,61 +0,0 @@
-blockType = $blockType;
-  }
-  public function getBlockType()
-  {
-    return $this->blockType;
-  }
-  public function setBoundingBox(Google_Service_Vision_BoundingPoly $boundingBox)
-  {
-    $this->boundingBox = $boundingBox;
-  }
-  public function getBoundingBox()
-  {
-    return $this->boundingBox;
-  }
-  public function setParagraphs($paragraphs)
-  {
-    $this->paragraphs = $paragraphs;
-  }
-  public function getParagraphs()
-  {
-    return $this->paragraphs;
-  }
-  public function setProperty(Google_Service_Vision_TextProperty $property)
-  {
-    $this->property = $property;
-  }
-  public function getProperty()
-  {
-    return $this->property;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Vision/BoundingPoly.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Vision/BoundingPoly.php
deleted file mode 100644
index d987d617..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Vision/BoundingPoly.php
+++ /dev/null
@@ -1,32 +0,0 @@
-vertices = $vertices;
-  }
-  public function getVertices()
-  {
-    return $this->vertices;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Vision/Color.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Vision/Color.php
deleted file mode 100644
index b65813bf..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Vision/Color.php
+++ /dev/null
@@ -1,57 +0,0 @@
-alpha = $alpha;
-  }
-  public function getAlpha()
-  {
-    return $this->alpha;
-  }
-  public function setBlue($blue)
-  {
-    $this->blue = $blue;
-  }
-  public function getBlue()
-  {
-    return $this->blue;
-  }
-  public function setGreen($green)
-  {
-    $this->green = $green;
-  }
-  public function getGreen()
-  {
-    return $this->green;
-  }
-  public function setRed($red)
-  {
-    $this->red = $red;
-  }
-  public function getRed()
-  {
-    return $this->red;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Vision/ColorInfo.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Vision/ColorInfo.php
deleted file mode 100644
index 7add72d8..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Vision/ColorInfo.php
+++ /dev/null
@@ -1,49 +0,0 @@
-color = $color;
-  }
-  public function getColor()
-  {
-    return $this->color;
-  }
-  public function setPixelFraction($pixelFraction)
-  {
-    $this->pixelFraction = $pixelFraction;
-  }
-  public function getPixelFraction()
-  {
-    return $this->pixelFraction;
-  }
-  public function setScore($score)
-  {
-    $this->score = $score;
-  }
-  public function getScore()
-  {
-    return $this->score;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Vision/CropHint.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Vision/CropHint.php
deleted file mode 100644
index 39bf9f09..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Vision/CropHint.php
+++ /dev/null
@@ -1,49 +0,0 @@
-boundingPoly = $boundingPoly;
-  }
-  public function getBoundingPoly()
-  {
-    return $this->boundingPoly;
-  }
-  public function setConfidence($confidence)
-  {
-    $this->confidence = $confidence;
-  }
-  public function getConfidence()
-  {
-    return $this->confidence;
-  }
-  public function setImportanceFraction($importanceFraction)
-  {
-    $this->importanceFraction = $importanceFraction;
-  }
-  public function getImportanceFraction()
-  {
-    return $this->importanceFraction;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Vision/CropHintsAnnotation.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Vision/CropHintsAnnotation.php
deleted file mode 100644
index 2d3167b9..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Vision/CropHintsAnnotation.php
+++ /dev/null
@@ -1,32 +0,0 @@
-cropHints = $cropHints;
-  }
-  public function getCropHints()
-  {
-    return $this->cropHints;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Vision/CropHintsParams.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Vision/CropHintsParams.php
deleted file mode 100644
index 92844265..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Vision/CropHintsParams.php
+++ /dev/null
@@ -1,31 +0,0 @@
-aspectRatios = $aspectRatios;
-  }
-  public function getAspectRatios()
-  {
-    return $this->aspectRatios;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Vision/DetectedBreak.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Vision/DetectedBreak.php
deleted file mode 100644
index 8dae7df7..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Vision/DetectedBreak.php
+++ /dev/null
@@ -1,39 +0,0 @@
-isPrefix = $isPrefix;
-  }
-  public function getIsPrefix()
-  {
-    return $this->isPrefix;
-  }
-  public function setType($type)
-  {
-    $this->type = $type;
-  }
-  public function getType()
-  {
-    return $this->type;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Vision/DetectedLanguage.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Vision/DetectedLanguage.php
deleted file mode 100644
index 024ed967..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Vision/DetectedLanguage.php
+++ /dev/null
@@ -1,39 +0,0 @@
-confidence = $confidence;
-  }
-  public function getConfidence()
-  {
-    return $this->confidence;
-  }
-  public function setLanguageCode($languageCode)
-  {
-    $this->languageCode = $languageCode;
-  }
-  public function getLanguageCode()
-  {
-    return $this->languageCode;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Vision/DominantColorsAnnotation.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Vision/DominantColorsAnnotation.php
deleted file mode 100644
index 6e7d803b..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Vision/DominantColorsAnnotation.php
+++ /dev/null
@@ -1,32 +0,0 @@
-colors = $colors;
-  }
-  public function getColors()
-  {
-    return $this->colors;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Vision/EntityAnnotation.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Vision/EntityAnnotation.php
deleted file mode 100644
index 19512918..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Vision/EntityAnnotation.php
+++ /dev/null
@@ -1,106 +0,0 @@
-boundingPoly = $boundingPoly;
-  }
-  public function getBoundingPoly()
-  {
-    return $this->boundingPoly;
-  }
-  public function setConfidence($confidence)
-  {
-    $this->confidence = $confidence;
-  }
-  public function getConfidence()
-  {
-    return $this->confidence;
-  }
-  public function setDescription($description)
-  {
-    $this->description = $description;
-  }
-  public function getDescription()
-  {
-    return $this->description;
-  }
-  public function setLocale($locale)
-  {
-    $this->locale = $locale;
-  }
-  public function getLocale()
-  {
-    return $this->locale;
-  }
-  public function setLocations($locations)
-  {
-    $this->locations = $locations;
-  }
-  public function getLocations()
-  {
-    return $this->locations;
-  }
-  public function setMid($mid)
-  {
-    $this->mid = $mid;
-  }
-  public function getMid()
-  {
-    return $this->mid;
-  }
-  public function setProperties($properties)
-  {
-    $this->properties = $properties;
-  }
-  public function getProperties()
-  {
-    return $this->properties;
-  }
-  public function setScore($score)
-  {
-    $this->score = $score;
-  }
-  public function getScore()
-  {
-    return $this->score;
-  }
-  public function setTopicality($topicality)
-  {
-    $this->topicality = $topicality;
-  }
-  public function getTopicality()
-  {
-    return $this->topicality;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Vision/FaceAnnotation.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Vision/FaceAnnotation.php
deleted file mode 100644
index 7a28066b..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Vision/FaceAnnotation.php
+++ /dev/null
@@ -1,160 +0,0 @@
-angerLikelihood = $angerLikelihood;
-  }
-  public function getAngerLikelihood()
-  {
-    return $this->angerLikelihood;
-  }
-  public function setBlurredLikelihood($blurredLikelihood)
-  {
-    $this->blurredLikelihood = $blurredLikelihood;
-  }
-  public function getBlurredLikelihood()
-  {
-    return $this->blurredLikelihood;
-  }
-  public function setBoundingPoly(Google_Service_Vision_BoundingPoly $boundingPoly)
-  {
-    $this->boundingPoly = $boundingPoly;
-  }
-  public function getBoundingPoly()
-  {
-    return $this->boundingPoly;
-  }
-  public function setDetectionConfidence($detectionConfidence)
-  {
-    $this->detectionConfidence = $detectionConfidence;
-  }
-  public function getDetectionConfidence()
-  {
-    return $this->detectionConfidence;
-  }
-  public function setFdBoundingPoly(Google_Service_Vision_BoundingPoly $fdBoundingPoly)
-  {
-    $this->fdBoundingPoly = $fdBoundingPoly;
-  }
-  public function getFdBoundingPoly()
-  {
-    return $this->fdBoundingPoly;
-  }
-  public function setHeadwearLikelihood($headwearLikelihood)
-  {
-    $this->headwearLikelihood = $headwearLikelihood;
-  }
-  public function getHeadwearLikelihood()
-  {
-    return $this->headwearLikelihood;
-  }
-  public function setJoyLikelihood($joyLikelihood)
-  {
-    $this->joyLikelihood = $joyLikelihood;
-  }
-  public function getJoyLikelihood()
-  {
-    return $this->joyLikelihood;
-  }
-  public function setLandmarkingConfidence($landmarkingConfidence)
-  {
-    $this->landmarkingConfidence = $landmarkingConfidence;
-  }
-  public function getLandmarkingConfidence()
-  {
-    return $this->landmarkingConfidence;
-  }
-  public function setLandmarks($landmarks)
-  {
-    $this->landmarks = $landmarks;
-  }
-  public function getLandmarks()
-  {
-    return $this->landmarks;
-  }
-  public function setPanAngle($panAngle)
-  {
-    $this->panAngle = $panAngle;
-  }
-  public function getPanAngle()
-  {
-    return $this->panAngle;
-  }
-  public function setRollAngle($rollAngle)
-  {
-    $this->rollAngle = $rollAngle;
-  }
-  public function getRollAngle()
-  {
-    return $this->rollAngle;
-  }
-  public function setSorrowLikelihood($sorrowLikelihood)
-  {
-    $this->sorrowLikelihood = $sorrowLikelihood;
-  }
-  public function getSorrowLikelihood()
-  {
-    return $this->sorrowLikelihood;
-  }
-  public function setSurpriseLikelihood($surpriseLikelihood)
-  {
-    $this->surpriseLikelihood = $surpriseLikelihood;
-  }
-  public function getSurpriseLikelihood()
-  {
-    return $this->surpriseLikelihood;
-  }
-  public function setTiltAngle($tiltAngle)
-  {
-    $this->tiltAngle = $tiltAngle;
-  }
-  public function getTiltAngle()
-  {
-    return $this->tiltAngle;
-  }
-  public function setUnderExposedLikelihood($underExposedLikelihood)
-  {
-    $this->underExposedLikelihood = $underExposedLikelihood;
-  }
-  public function getUnderExposedLikelihood()
-  {
-    return $this->underExposedLikelihood;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Vision/Feature.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Vision/Feature.php
deleted file mode 100644
index 5e65b0fb..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Vision/Feature.php
+++ /dev/null
@@ -1,39 +0,0 @@
-maxResults = $maxResults;
-  }
-  public function getMaxResults()
-  {
-    return $this->maxResults;
-  }
-  public function setType($type)
-  {
-    $this->type = $type;
-  }
-  public function getType()
-  {
-    return $this->type;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Vision/Image.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Vision/Image.php
deleted file mode 100644
index 60ed158a..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Vision/Image.php
+++ /dev/null
@@ -1,40 +0,0 @@
-content = $content;
-  }
-  public function getContent()
-  {
-    return $this->content;
-  }
-  public function setSource(Google_Service_Vision_ImageSource $source)
-  {
-    $this->source = $source;
-  }
-  public function getSource()
-  {
-    return $this->source;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Vision/ImageContext.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Vision/ImageContext.php
deleted file mode 100644
index 1949b904..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Vision/ImageContext.php
+++ /dev/null
@@ -1,51 +0,0 @@
-cropHintsParams = $cropHintsParams;
-  }
-  public function getCropHintsParams()
-  {
-    return $this->cropHintsParams;
-  }
-  public function setLanguageHints($languageHints)
-  {
-    $this->languageHints = $languageHints;
-  }
-  public function getLanguageHints()
-  {
-    return $this->languageHints;
-  }
-  public function setLatLongRect(Google_Service_Vision_LatLongRect $latLongRect)
-  {
-    $this->latLongRect = $latLongRect;
-  }
-  public function getLatLongRect()
-  {
-    return $this->latLongRect;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Vision/ImageProperties.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Vision/ImageProperties.php
deleted file mode 100644
index 9b6f1ba2..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Vision/ImageProperties.php
+++ /dev/null
@@ -1,31 +0,0 @@
-dominantColors = $dominantColors;
-  }
-  public function getDominantColors()
-  {
-    return $this->dominantColors;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Vision/ImageSource.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Vision/ImageSource.php
deleted file mode 100644
index 5d9de3c3..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Vision/ImageSource.php
+++ /dev/null
@@ -1,39 +0,0 @@
-gcsImageUri = $gcsImageUri;
-  }
-  public function getGcsImageUri()
-  {
-    return $this->gcsImageUri;
-  }
-  public function setImageUri($imageUri)
-  {
-    $this->imageUri = $imageUri;
-  }
-  public function getImageUri()
-  {
-    return $this->imageUri;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Vision/Landmark.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Vision/Landmark.php
deleted file mode 100644
index b16eb51b..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Vision/Landmark.php
+++ /dev/null
@@ -1,40 +0,0 @@
-position = $position;
-  }
-  public function getPosition()
-  {
-    return $this->position;
-  }
-  public function setType($type)
-  {
-    $this->type = $type;
-  }
-  public function getType()
-  {
-    return $this->type;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Vision/LatLng.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Vision/LatLng.php
deleted file mode 100644
index 06911233..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Vision/LatLng.php
+++ /dev/null
@@ -1,39 +0,0 @@
-latitude = $latitude;
-  }
-  public function getLatitude()
-  {
-    return $this->latitude;
-  }
-  public function setLongitude($longitude)
-  {
-    $this->longitude = $longitude;
-  }
-  public function getLongitude()
-  {
-    return $this->longitude;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Vision/LatLongRect.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Vision/LatLongRect.php
deleted file mode 100644
index f9544a85..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Vision/LatLongRect.php
+++ /dev/null
@@ -1,41 +0,0 @@
-maxLatLng = $maxLatLng;
-  }
-  public function getMaxLatLng()
-  {
-    return $this->maxLatLng;
-  }
-  public function setMinLatLng(Google_Service_Vision_LatLng $minLatLng)
-  {
-    $this->minLatLng = $minLatLng;
-  }
-  public function getMinLatLng()
-  {
-    return $this->minLatLng;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Vision/LocationInfo.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Vision/LocationInfo.php
deleted file mode 100644
index 1fb3fca9..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Vision/LocationInfo.php
+++ /dev/null
@@ -1,31 +0,0 @@
-latLng = $latLng;
-  }
-  public function getLatLng()
-  {
-    return $this->latLng;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Vision/Page.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Vision/Page.php
deleted file mode 100644
index ccb0c2f4..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Vision/Page.php
+++ /dev/null
@@ -1,60 +0,0 @@
-blocks = $blocks;
-  }
-  public function getBlocks()
-  {
-    return $this->blocks;
-  }
-  public function setHeight($height)
-  {
-    $this->height = $height;
-  }
-  public function getHeight()
-  {
-    return $this->height;
-  }
-  public function setProperty(Google_Service_Vision_TextProperty $property)
-  {
-    $this->property = $property;
-  }
-  public function getProperty()
-  {
-    return $this->property;
-  }
-  public function setWidth($width)
-  {
-    $this->width = $width;
-  }
-  public function getWidth()
-  {
-    return $this->width;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Vision/Paragraph.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Vision/Paragraph.php
deleted file mode 100644
index e045ebf6..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Vision/Paragraph.php
+++ /dev/null
@@ -1,52 +0,0 @@
-boundingBox = $boundingBox;
-  }
-  public function getBoundingBox()
-  {
-    return $this->boundingBox;
-  }
-  public function setProperty(Google_Service_Vision_TextProperty $property)
-  {
-    $this->property = $property;
-  }
-  public function getProperty()
-  {
-    return $this->property;
-  }
-  public function setWords($words)
-  {
-    $this->words = $words;
-  }
-  public function getWords()
-  {
-    return $this->words;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Vision/Position.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Vision/Position.php
deleted file mode 100644
index c362b1e7..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Vision/Position.php
+++ /dev/null
@@ -1,48 +0,0 @@
-x = $x;
-  }
-  public function getX()
-  {
-    return $this->x;
-  }
-  public function setY($y)
-  {
-    $this->y = $y;
-  }
-  public function getY()
-  {
-    return $this->y;
-  }
-  public function setZ($z)
-  {
-    $this->z = $z;
-  }
-  public function getZ()
-  {
-    return $this->z;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Vision/Property.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Vision/Property.php
deleted file mode 100644
index 074a7051..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Vision/Property.php
+++ /dev/null
@@ -1,48 +0,0 @@
-name = $name;
-  }
-  public function getName()
-  {
-    return $this->name;
-  }
-  public function setUint64Value($uint64Value)
-  {
-    $this->uint64Value = $uint64Value;
-  }
-  public function getUint64Value()
-  {
-    return $this->uint64Value;
-  }
-  public function setValue($value)
-  {
-    $this->value = $value;
-  }
-  public function getValue()
-  {
-    return $this->value;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Vision/Resource/Images.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Vision/Resource/Images.php
deleted file mode 100644
index 0da6915e..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Vision/Resource/Images.php
+++ /dev/null
@@ -1,41 +0,0 @@
-
- *   $visionService = new Google_Service_Vision(...);
- *   $images = $visionService->images;
- *  
- */
-class Google_Service_Vision_Resource_Images extends Google_Service_Resource
-{
-  /**
-   * Run image detection and annotation for a batch of images. (images.annotate)
-   *
-   * @param Google_Service_Vision_BatchAnnotateImagesRequest $postBody
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Vision_BatchAnnotateImagesResponse
-   */
-  public function annotate(Google_Service_Vision_BatchAnnotateImagesRequest $postBody, $optParams = array())
-  {
-    $params = array('postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('annotate', array($params), "Google_Service_Vision_BatchAnnotateImagesResponse");
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Vision/SafeSearchAnnotation.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Vision/SafeSearchAnnotation.php
deleted file mode 100644
index f945252a..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Vision/SafeSearchAnnotation.php
+++ /dev/null
@@ -1,57 +0,0 @@
-adult = $adult;
-  }
-  public function getAdult()
-  {
-    return $this->adult;
-  }
-  public function setMedical($medical)
-  {
-    $this->medical = $medical;
-  }
-  public function getMedical()
-  {
-    return $this->medical;
-  }
-  public function setSpoof($spoof)
-  {
-    $this->spoof = $spoof;
-  }
-  public function getSpoof()
-  {
-    return $this->spoof;
-  }
-  public function setViolence($violence)
-  {
-    $this->violence = $violence;
-  }
-  public function getViolence()
-  {
-    return $this->violence;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Vision/Status.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Vision/Status.php
deleted file mode 100644
index d82689fd..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Vision/Status.php
+++ /dev/null
@@ -1,49 +0,0 @@
-code = $code;
-  }
-  public function getCode()
-  {
-    return $this->code;
-  }
-  public function setDetails($details)
-  {
-    $this->details = $details;
-  }
-  public function getDetails()
-  {
-    return $this->details;
-  }
-  public function setMessage($message)
-  {
-    $this->message = $message;
-  }
-  public function getMessage()
-  {
-    return $this->message;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Vision/Symbol.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Vision/Symbol.php
deleted file mode 100644
index 0f455035..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Vision/Symbol.php
+++ /dev/null
@@ -1,50 +0,0 @@
-boundingBox = $boundingBox;
-  }
-  public function getBoundingBox()
-  {
-    return $this->boundingBox;
-  }
-  public function setProperty(Google_Service_Vision_TextProperty $property)
-  {
-    $this->property = $property;
-  }
-  public function getProperty()
-  {
-    return $this->property;
-  }
-  public function setText($text)
-  {
-    $this->text = $text;
-  }
-  public function getText()
-  {
-    return $this->text;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Vision/TextAnnotation.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Vision/TextAnnotation.php
deleted file mode 100644
index 4e8fc461..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Vision/TextAnnotation.php
+++ /dev/null
@@ -1,41 +0,0 @@
-pages = $pages;
-  }
-  public function getPages()
-  {
-    return $this->pages;
-  }
-  public function setText($text)
-  {
-    $this->text = $text;
-  }
-  public function getText()
-  {
-    return $this->text;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Vision/TextProperty.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Vision/TextProperty.php
deleted file mode 100644
index 0e259339..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Vision/TextProperty.php
+++ /dev/null
@@ -1,42 +0,0 @@
-detectedBreak = $detectedBreak;
-  }
-  public function getDetectedBreak()
-  {
-    return $this->detectedBreak;
-  }
-  public function setDetectedLanguages($detectedLanguages)
-  {
-    $this->detectedLanguages = $detectedLanguages;
-  }
-  public function getDetectedLanguages()
-  {
-    return $this->detectedLanguages;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Vision/Vertex.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Vision/Vertex.php
deleted file mode 100644
index 3c03e088..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Vision/Vertex.php
+++ /dev/null
@@ -1,39 +0,0 @@
-x = $x;
-  }
-  public function getX()
-  {
-    return $this->x;
-  }
-  public function setY($y)
-  {
-    $this->y = $y;
-  }
-  public function getY()
-  {
-    return $this->y;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Vision/WebDetection.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Vision/WebDetection.php
deleted file mode 100644
index 326c040f..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Vision/WebDetection.php
+++ /dev/null
@@ -1,62 +0,0 @@
-fullMatchingImages = $fullMatchingImages;
-  }
-  public function getFullMatchingImages()
-  {
-    return $this->fullMatchingImages;
-  }
-  public function setPagesWithMatchingImages($pagesWithMatchingImages)
-  {
-    $this->pagesWithMatchingImages = $pagesWithMatchingImages;
-  }
-  public function getPagesWithMatchingImages()
-  {
-    return $this->pagesWithMatchingImages;
-  }
-  public function setPartialMatchingImages($partialMatchingImages)
-  {
-    $this->partialMatchingImages = $partialMatchingImages;
-  }
-  public function getPartialMatchingImages()
-  {
-    return $this->partialMatchingImages;
-  }
-  public function setWebEntities($webEntities)
-  {
-    $this->webEntities = $webEntities;
-  }
-  public function getWebEntities()
-  {
-    return $this->webEntities;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Vision/WebEntity.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Vision/WebEntity.php
deleted file mode 100644
index fa425fdb..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Vision/WebEntity.php
+++ /dev/null
@@ -1,48 +0,0 @@
-description = $description;
-  }
-  public function getDescription()
-  {
-    return $this->description;
-  }
-  public function setEntityId($entityId)
-  {
-    $this->entityId = $entityId;
-  }
-  public function getEntityId()
-  {
-    return $this->entityId;
-  }
-  public function setScore($score)
-  {
-    $this->score = $score;
-  }
-  public function getScore()
-  {
-    return $this->score;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Vision/WebImage.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Vision/WebImage.php
deleted file mode 100644
index a5d06e2c..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Vision/WebImage.php
+++ /dev/null
@@ -1,39 +0,0 @@
-score = $score;
-  }
-  public function getScore()
-  {
-    return $this->score;
-  }
-  public function setUrl($url)
-  {
-    $this->url = $url;
-  }
-  public function getUrl()
-  {
-    return $this->url;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Vision/WebPage.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Vision/WebPage.php
deleted file mode 100644
index 7187e0d0..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Vision/WebPage.php
+++ /dev/null
@@ -1,39 +0,0 @@
-score = $score;
-  }
-  public function getScore()
-  {
-    return $this->score;
-  }
-  public function setUrl($url)
-  {
-    $this->url = $url;
-  }
-  public function getUrl()
-  {
-    return $this->url;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Vision/Word.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Vision/Word.php
deleted file mode 100644
index e688655f..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Vision/Word.php
+++ /dev/null
@@ -1,52 +0,0 @@
-boundingBox = $boundingBox;
-  }
-  public function getBoundingBox()
-  {
-    return $this->boundingBox;
-  }
-  public function setProperty(Google_Service_Vision_TextProperty $property)
-  {
-    $this->property = $property;
-  }
-  public function getProperty()
-  {
-    return $this->property;
-  }
-  public function setSymbols($symbols)
-  {
-    $this->symbols = $symbols;
-  }
-  public function getSymbols()
-  {
-    return $this->symbols;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Webfonts.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Webfonts.php
deleted file mode 100644
index 282c9ace..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Webfonts.php
+++ /dev/null
@@ -1,72 +0,0 @@
-
- * Accesses the metadata for all families served by Google Fonts, providing a
- * list of families currently available (including available styles and a list
- * of supported script subsets).

- *
- * 

- * For more information about this service, see the API
- * Documentation
- * 

- *
- * @author Google, Inc.
- */
-class Google_Service_Webfonts extends Google_Service
-{
-
-
-  public $webfonts;
-  
-  /**
-   * Constructs the internal representation of the Webfonts service.
-   *
-   * @param Google_Client $client
-   */
-  public function __construct(Google_Client $client)
-  {
-    parent::__construct($client);
-    $this->rootUrl = 'https://www.googleapis.com/';
-    $this->servicePath = 'webfonts/v1/';
-    $this->version = 'v1';
-    $this->serviceName = 'webfonts';
-
-    $this->webfonts = new Google_Service_Webfonts_Resource_Webfonts(
-        $this,
-        $this->serviceName,
-        'webfonts',
-        array(
-          'methods' => array(
-            'list' => array(
-              'path' => 'webfonts',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'sort' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-              ),
-            ),
-          )
-        )
-    );
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Webfonts/Resource/Webfonts.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Webfonts/Resource/Webfonts.php
deleted file mode 100644
index e13afa3f..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Webfonts/Resource/Webfonts.php
+++ /dev/null
@@ -1,43 +0,0 @@
-
- *   $webfontsService = new Google_Service_Webfonts(...);
- *   $webfonts = $webfontsService->webfonts;
- *  
- */
-class Google_Service_Webfonts_Resource_Webfonts extends Google_Service_Resource
-{
-  /**
-   * Retrieves the list of fonts currently served by the Google Fonts Developer
-   * API (webfonts.listWebfonts)
-   *
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param string sort Enables sorting of the list
-   * @return Google_Service_Webfonts_WebfontList
-   */
-  public function listWebfonts($optParams = array())
-  {
-    $params = array();
-    $params = array_merge($params, $optParams);
-    return $this->call('list', array($params), "Google_Service_Webfonts_WebfontList");
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Webfonts/Webfont.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Webfonts/Webfont.php
deleted file mode 100644
index 3168302b..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Webfonts/Webfont.php
+++ /dev/null
@@ -1,94 +0,0 @@
-category = $category;
-  }
-  public function getCategory()
-  {
-    return $this->category;
-  }
-  public function setFamily($family)
-  {
-    $this->family = $family;
-  }
-  public function getFamily()
-  {
-    return $this->family;
-  }
-  public function setFiles($files)
-  {
-    $this->files = $files;
-  }
-  public function getFiles()
-  {
-    return $this->files;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setLastModified($lastModified)
-  {
-    $this->lastModified = $lastModified;
-  }
-  public function getLastModified()
-  {
-    return $this->lastModified;
-  }
-  public function setSubsets($subsets)
-  {
-    $this->subsets = $subsets;
-  }
-  public function getSubsets()
-  {
-    return $this->subsets;
-  }
-  public function setVariants($variants)
-  {
-    $this->variants = $variants;
-  }
-  public function getVariants()
-  {
-    return $this->variants;
-  }
-  public function setVersion($version)
-  {
-    $this->version = $version;
-  }
-  public function getVersion()
-  {
-    return $this->version;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Webfonts/WebfontList.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Webfonts/WebfontList.php
deleted file mode 100644
index 59e5b684..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Webfonts/WebfontList.php
+++ /dev/null
@@ -1,41 +0,0 @@
-items = $items;
-  }
-  public function getItems()
-  {
-    return $this->items;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Webmasters.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Webmasters.php
deleted file mode 100644
index 936b48a0..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Webmasters.php
+++ /dev/null
@@ -1,305 +0,0 @@
-
- * View Google Search Console data for your verified sites.

- *
- * 

- * For more information about this service, see the API
- * Documentation
- * 

- *
- * @author Google, Inc.
- */
-class Google_Service_Webmasters extends Google_Service
-{
-  /** View and manage Search Console data for your verified sites. */
-  const WEBMASTERS =
-      "https://www.googleapis.com/auth/webmasters";
-  /** View Search Console data for your verified sites. */
-  const WEBMASTERS_READONLY =
-      "https://www.googleapis.com/auth/webmasters.readonly";
-
-  public $searchanalytics;
-  public $sitemaps;
-  public $sites;
-  public $urlcrawlerrorscounts;
-  public $urlcrawlerrorssamples;
-  
-  /**
-   * Constructs the internal representation of the Webmasters service.
-   *
-   * @param Google_Client $client
-   */
-  public function __construct(Google_Client $client)
-  {
-    parent::__construct($client);
-    $this->rootUrl = 'https://www.googleapis.com/';
-    $this->servicePath = 'webmasters/v3/';
-    $this->version = 'v3';
-    $this->serviceName = 'webmasters';
-
-    $this->searchanalytics = new Google_Service_Webmasters_Resource_Searchanalytics(
-        $this,
-        $this->serviceName,
-        'searchanalytics',
-        array(
-          'methods' => array(
-            'query' => array(
-              'path' => 'sites/{siteUrl}/searchAnalytics/query',
-              'httpMethod' => 'POST',
-              'parameters' => array(
-                'siteUrl' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),
-          )
-        )
-    );
-    $this->sitemaps = new Google_Service_Webmasters_Resource_Sitemaps(
-        $this,
-        $this->serviceName,
-        'sitemaps',
-        array(
-          'methods' => array(
-            'delete' => array(
-              'path' => 'sites/{siteUrl}/sitemaps/{feedpath}',
-              'httpMethod' => 'DELETE',
-              'parameters' => array(
-                'siteUrl' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'feedpath' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'get' => array(
-              'path' => 'sites/{siteUrl}/sitemaps/{feedpath}',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'siteUrl' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'feedpath' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'list' => array(
-              'path' => 'sites/{siteUrl}/sitemaps',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'siteUrl' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'sitemapIndex' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-              ),
-            ),'submit' => array(
-              'path' => 'sites/{siteUrl}/sitemaps/{feedpath}',
-              'httpMethod' => 'PUT',
-              'parameters' => array(
-                'siteUrl' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'feedpath' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),
-          )
-        )
-    );
-    $this->sites = new Google_Service_Webmasters_Resource_Sites(
-        $this,
-        $this->serviceName,
-        'sites',
-        array(
-          'methods' => array(
-            'add' => array(
-              'path' => 'sites/{siteUrl}',
-              'httpMethod' => 'PUT',
-              'parameters' => array(
-                'siteUrl' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'delete' => array(
-              'path' => 'sites/{siteUrl}',
-              'httpMethod' => 'DELETE',
-              'parameters' => array(
-                'siteUrl' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'get' => array(
-              'path' => 'sites/{siteUrl}',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'siteUrl' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'list' => array(
-              'path' => 'sites',
-              'httpMethod' => 'GET',
-              'parameters' => array(),
-            ),
-          )
-        )
-    );
-    $this->urlcrawlerrorscounts = new Google_Service_Webmasters_Resource_Urlcrawlerrorscounts(
-        $this,
-        $this->serviceName,
-        'urlcrawlerrorscounts',
-        array(
-          'methods' => array(
-            'query' => array(
-              'path' => 'sites/{siteUrl}/urlCrawlErrorsCounts/query',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'siteUrl' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'category' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'latestCountsOnly' => array(
-                  'location' => 'query',
-                  'type' => 'boolean',
-                ),
-                'platform' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-              ),
-            ),
-          )
-        )
-    );
-    $this->urlcrawlerrorssamples = new Google_Service_Webmasters_Resource_Urlcrawlerrorssamples(
-        $this,
-        $this->serviceName,
-        'urlcrawlerrorssamples',
-        array(
-          'methods' => array(
-            'get' => array(
-              'path' => 'sites/{siteUrl}/urlCrawlErrorsSamples/{url}',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'siteUrl' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'url' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'category' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'platform' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'list' => array(
-              'path' => 'sites/{siteUrl}/urlCrawlErrorsSamples',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'siteUrl' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'category' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'platform' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'markAsFixed' => array(
-              'path' => 'sites/{siteUrl}/urlCrawlErrorsSamples/{url}',
-              'httpMethod' => 'DELETE',
-              'parameters' => array(
-                'siteUrl' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'url' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'category' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'platform' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),
-          )
-        )
-    );
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Webmasters/ApiDataRow.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Webmasters/ApiDataRow.php
deleted file mode 100644
index 869b76c7..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Webmasters/ApiDataRow.php
+++ /dev/null
@@ -1,67 +0,0 @@
-clicks = $clicks;
-  }
-  public function getClicks()
-  {
-    return $this->clicks;
-  }
-  public function setCtr($ctr)
-  {
-    $this->ctr = $ctr;
-  }
-  public function getCtr()
-  {
-    return $this->ctr;
-  }
-  public function setImpressions($impressions)
-  {
-    $this->impressions = $impressions;
-  }
-  public function getImpressions()
-  {
-    return $this->impressions;
-  }
-  public function setKeys($keys)
-  {
-    $this->keys = $keys;
-  }
-  public function getKeys()
-  {
-    return $this->keys;
-  }
-  public function setPosition($position)
-  {
-    $this->position = $position;
-  }
-  public function getPosition()
-  {
-    return $this->position;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Webmasters/ApiDimensionFilter.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Webmasters/ApiDimensionFilter.php
deleted file mode 100644
index 49e83645..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Webmasters/ApiDimensionFilter.php
+++ /dev/null
@@ -1,48 +0,0 @@
-dimension = $dimension;
-  }
-  public function getDimension()
-  {
-    return $this->dimension;
-  }
-  public function setExpression($expression)
-  {
-    $this->expression = $expression;
-  }
-  public function getExpression()
-  {
-    return $this->expression;
-  }
-  public function setOperator($operator)
-  {
-    $this->operator = $operator;
-  }
-  public function getOperator()
-  {
-    return $this->operator;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Webmasters/ApiDimensionFilterGroup.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Webmasters/ApiDimensionFilterGroup.php
deleted file mode 100644
index 1b18a888..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Webmasters/ApiDimensionFilterGroup.php
+++ /dev/null
@@ -1,41 +0,0 @@
-filters = $filters;
-  }
-  public function getFilters()
-  {
-    return $this->filters;
-  }
-  public function setGroupType($groupType)
-  {
-    $this->groupType = $groupType;
-  }
-  public function getGroupType()
-  {
-    return $this->groupType;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Webmasters/Resource/Searchanalytics.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Webmasters/Resource/Searchanalytics.php
deleted file mode 100644
index 865a404a..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Webmasters/Resource/Searchanalytics.php
+++ /dev/null
@@ -1,50 +0,0 @@
-
- *   $webmastersService = new Google_Service_Webmasters(...);
- *   $searchanalytics = $webmastersService->searchanalytics;
- *  
- */
-class Google_Service_Webmasters_Resource_Searchanalytics extends Google_Service_Resource
-{
-  /**
-   * Query your data with filters and parameters that you define. Returns zero or
-   * more rows grouped by the row keys that you define. You must define a date
-   * range of one or more days.
-   *
-   * When date is one of the group by values, any days without data are omitted
-   * from the result list. If you need to know which days have data, issue a broad
-   * date range query grouped by date for any metric, and see which day rows are
-   * returned. (searchanalytics.query)
-   *
-   * @param string $siteUrl The site's URL, including protocol. For example:
-   * http://www.example.com/
-   * @param Google_Service_Webmasters_SearchAnalyticsQueryRequest $postBody
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Webmasters_SearchAnalyticsQueryResponse
-   */
-  public function query($siteUrl, Google_Service_Webmasters_SearchAnalyticsQueryRequest $postBody, $optParams = array())
-  {
-    $params = array('siteUrl' => $siteUrl, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('query', array($params), "Google_Service_Webmasters_SearchAnalyticsQueryResponse");
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Webmasters/Resource/Sitemaps.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Webmasters/Resource/Sitemaps.php
deleted file mode 100644
index b0e69fdf..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Webmasters/Resource/Sitemaps.php
+++ /dev/null
@@ -1,93 +0,0 @@
-
- *   $webmastersService = new Google_Service_Webmasters(...);
- *   $sitemaps = $webmastersService->sitemaps;
- *  
- */
-class Google_Service_Webmasters_Resource_Sitemaps extends Google_Service_Resource
-{
-  /**
-   * Deletes a sitemap from this site. (sitemaps.delete)
-   *
-   * @param string $siteUrl The site's URL, including protocol. For example:
-   * http://www.example.com/
-   * @param string $feedpath The URL of the actual sitemap. For example:
-   * http://www.example.com/sitemap.xml
-   * @param array $optParams Optional parameters.
-   */
-  public function delete($siteUrl, $feedpath, $optParams = array())
-  {
-    $params = array('siteUrl' => $siteUrl, 'feedpath' => $feedpath);
-    $params = array_merge($params, $optParams);
-    return $this->call('delete', array($params));
-  }
-  /**
-   * Retrieves information about a specific sitemap. (sitemaps.get)
-   *
-   * @param string $siteUrl The site's URL, including protocol. For example:
-   * http://www.example.com/
-   * @param string $feedpath The URL of the actual sitemap. For example:
-   * http://www.example.com/sitemap.xml
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Webmasters_WmxSitemap
-   */
-  public function get($siteUrl, $feedpath, $optParams = array())
-  {
-    $params = array('siteUrl' => $siteUrl, 'feedpath' => $feedpath);
-    $params = array_merge($params, $optParams);
-    return $this->call('get', array($params), "Google_Service_Webmasters_WmxSitemap");
-  }
-  /**
-   * Lists the sitemaps-entries submitted for this site, or included in the
-   * sitemap index file (if sitemapIndex is specified in the request).
-   * (sitemaps.listSitemaps)
-   *
-   * @param string $siteUrl The site's URL, including protocol. For example:
-   * http://www.example.com/
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param string sitemapIndex A URL of a site's sitemap index. For example:
-   * http://www.example.com/sitemapindex.xml
-   * @return Google_Service_Webmasters_SitemapsListResponse
-   */
-  public function listSitemaps($siteUrl, $optParams = array())
-  {
-    $params = array('siteUrl' => $siteUrl);
-    $params = array_merge($params, $optParams);
-    return $this->call('list', array($params), "Google_Service_Webmasters_SitemapsListResponse");
-  }
-  /**
-   * Submits a sitemap for a site. (sitemaps.submit)
-   *
-   * @param string $siteUrl The site's URL, including protocol. For example:
-   * http://www.example.com/
-   * @param string $feedpath The URL of the sitemap to add. For example:
-   * http://www.example.com/sitemap.xml
-   * @param array $optParams Optional parameters.
-   */
-  public function submit($siteUrl, $feedpath, $optParams = array())
-  {
-    $params = array('siteUrl' => $siteUrl, 'feedpath' => $feedpath);
-    $params = array_merge($params, $optParams);
-    return $this->call('submit', array($params));
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Webmasters/Resource/Sites.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Webmasters/Resource/Sites.php
deleted file mode 100644
index 7af6cc72..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Webmasters/Resource/Sites.php
+++ /dev/null
@@ -1,80 +0,0 @@
-
- *   $webmastersService = new Google_Service_Webmasters(...);
- *   $sites = $webmastersService->sites;
- *  
- */
-class Google_Service_Webmasters_Resource_Sites extends Google_Service_Resource
-{
-  /**
-   * Adds a site to the set of the user's sites in Search Console. (sites.add)
-   *
-   * @param string $siteUrl The URL of the site to add.
-   * @param array $optParams Optional parameters.
-   */
-  public function add($siteUrl, $optParams = array())
-  {
-    $params = array('siteUrl' => $siteUrl);
-    $params = array_merge($params, $optParams);
-    return $this->call('add', array($params));
-  }
-  /**
-   * Removes a site from the set of the user's Search Console sites.
-   * (sites.delete)
-   *
-   * @param string $siteUrl The URI of the property as defined in Search Console.
-   * Examples: http://www.example.com/ or android-app://com.example/
-   * @param array $optParams Optional parameters.
-   */
-  public function delete($siteUrl, $optParams = array())
-  {
-    $params = array('siteUrl' => $siteUrl);
-    $params = array_merge($params, $optParams);
-    return $this->call('delete', array($params));
-  }
-  /**
-   * Retrieves information about specific site. (sites.get)
-   *
-   * @param string $siteUrl The URI of the property as defined in Search Console.
-   * Examples: http://www.example.com/ or android-app://com.example/
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Webmasters_WmxSite
-   */
-  public function get($siteUrl, $optParams = array())
-  {
-    $params = array('siteUrl' => $siteUrl);
-    $params = array_merge($params, $optParams);
-    return $this->call('get', array($params), "Google_Service_Webmasters_WmxSite");
-  }
-  /**
-   * Lists the user's Search Console sites. (sites.listSites)
-   *
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Webmasters_SitesListResponse
-   */
-  public function listSites($optParams = array())
-  {
-    $params = array();
-    $params = array_merge($params, $optParams);
-    return $this->call('list', array($params), "Google_Service_Webmasters_SitesListResponse");
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Webmasters/Resource/Urlcrawlerrorscounts.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Webmasters/Resource/Urlcrawlerrorscounts.php
deleted file mode 100644
index c86bd72d..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Webmasters/Resource/Urlcrawlerrorscounts.php
+++ /dev/null
@@ -1,51 +0,0 @@
-
- *   $webmastersService = new Google_Service_Webmasters(...);
- *   $urlcrawlerrorscounts = $webmastersService->urlcrawlerrorscounts;
- *  
- */
-class Google_Service_Webmasters_Resource_Urlcrawlerrorscounts extends Google_Service_Resource
-{
-  /**
-   * Retrieves a time series of the number of URL crawl errors per error category
-   * and platform. (urlcrawlerrorscounts.query)
-   *
-   * @param string $siteUrl The site's URL, including protocol. For example:
-   * http://www.example.com/
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param string category The crawl error category. For example:
-   * serverError. If not specified, returns results for all categories.
-   * @opt_param bool latestCountsOnly If true, returns only the latest crawl error
-   * counts.
-   * @opt_param string platform The user agent type (platform) that made the
-   * request. For example: web. If not specified, returns results for all
-   * platforms.
-   * @return Google_Service_Webmasters_UrlCrawlErrorsCountsQueryResponse
-   */
-  public function query($siteUrl, $optParams = array())
-  {
-    $params = array('siteUrl' => $siteUrl);
-    $params = array_merge($params, $optParams);
-    return $this->call('query', array($params), "Google_Service_Webmasters_UrlCrawlErrorsCountsQueryResponse");
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Webmasters/Resource/Urlcrawlerrorssamples.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Webmasters/Resource/Urlcrawlerrorssamples.php
deleted file mode 100644
index 647656d7..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Webmasters/Resource/Urlcrawlerrorssamples.php
+++ /dev/null
@@ -1,92 +0,0 @@
-
- *   $webmastersService = new Google_Service_Webmasters(...);
- *   $urlcrawlerrorssamples = $webmastersService->urlcrawlerrorssamples;
- *  
- */
-class Google_Service_Webmasters_Resource_Urlcrawlerrorssamples extends Google_Service_Resource
-{
-  /**
-   * Retrieves details about crawl errors for a site's sample URL.
-   * (urlcrawlerrorssamples.get)
-   *
-   * @param string $siteUrl The site's URL, including protocol. For example:
-   * http://www.example.com/
-   * @param string $url The relative path (without the site) of the sample URL. It
-   * must be one of the URLs returned by list(). For example, for the URL
-   * https://www.example.com/pagename on the site https://www.example.com/, the
-   * url value is pagename
-   * @param string $category The crawl error category. For example:
-   * authPermissions
-   * @param string $platform The user agent type (platform) that made the request.
-   * For example: web
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Webmasters_UrlCrawlErrorsSample
-   */
-  public function get($siteUrl, $url, $category, $platform, $optParams = array())
-  {
-    $params = array('siteUrl' => $siteUrl, 'url' => $url, 'category' => $category, 'platform' => $platform);
-    $params = array_merge($params, $optParams);
-    return $this->call('get', array($params), "Google_Service_Webmasters_UrlCrawlErrorsSample");
-  }
-  /**
-   * Lists a site's sample URLs for the specified crawl error category and
-   * platform. (urlcrawlerrorssamples.listUrlcrawlerrorssamples)
-   *
-   * @param string $siteUrl The site's URL, including protocol. For example:
-   * http://www.example.com/
-   * @param string $category The crawl error category. For example:
-   * authPermissions
-   * @param string $platform The user agent type (platform) that made the request.
-   * For example: web
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_Webmasters_UrlCrawlErrorsSamplesListResponse
-   */
-  public function listUrlcrawlerrorssamples($siteUrl, $category, $platform, $optParams = array())
-  {
-    $params = array('siteUrl' => $siteUrl, 'category' => $category, 'platform' => $platform);
-    $params = array_merge($params, $optParams);
-    return $this->call('list', array($params), "Google_Service_Webmasters_UrlCrawlErrorsSamplesListResponse");
-  }
-  /**
-   * Marks the provided site's sample URL as fixed, and removes it from the
-   * samples list. (urlcrawlerrorssamples.markAsFixed)
-   *
-   * @param string $siteUrl The site's URL, including protocol. For example:
-   * http://www.example.com/
-   * @param string $url The relative path (without the site) of the sample URL. It
-   * must be one of the URLs returned by list(). For example, for the URL
-   * https://www.example.com/pagename on the site https://www.example.com/, the
-   * url value is pagename
-   * @param string $category The crawl error category. For example:
-   * authPermissions
-   * @param string $platform The user agent type (platform) that made the request.
-   * For example: web
-   * @param array $optParams Optional parameters.
-   */
-  public function markAsFixed($siteUrl, $url, $category, $platform, $optParams = array())
-  {
-    $params = array('siteUrl' => $siteUrl, 'url' => $url, 'category' => $category, 'platform' => $platform);
-    $params = array_merge($params, $optParams);
-    return $this->call('markAsFixed', array($params));
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Webmasters/SearchAnalyticsQueryRequest.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Webmasters/SearchAnalyticsQueryRequest.php
deleted file mode 100644
index 2f12765a..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Webmasters/SearchAnalyticsQueryRequest.php
+++ /dev/null
@@ -1,95 +0,0 @@
-aggregationType = $aggregationType;
-  }
-  public function getAggregationType()
-  {
-    return $this->aggregationType;
-  }
-  public function setDimensionFilterGroups($dimensionFilterGroups)
-  {
-    $this->dimensionFilterGroups = $dimensionFilterGroups;
-  }
-  public function getDimensionFilterGroups()
-  {
-    return $this->dimensionFilterGroups;
-  }
-  public function setDimensions($dimensions)
-  {
-    $this->dimensions = $dimensions;
-  }
-  public function getDimensions()
-  {
-    return $this->dimensions;
-  }
-  public function setEndDate($endDate)
-  {
-    $this->endDate = $endDate;
-  }
-  public function getEndDate()
-  {
-    return $this->endDate;
-  }
-  public function setRowLimit($rowLimit)
-  {
-    $this->rowLimit = $rowLimit;
-  }
-  public function getRowLimit()
-  {
-    return $this->rowLimit;
-  }
-  public function setSearchType($searchType)
-  {
-    $this->searchType = $searchType;
-  }
-  public function getSearchType()
-  {
-    return $this->searchType;
-  }
-  public function setStartDate($startDate)
-  {
-    $this->startDate = $startDate;
-  }
-  public function getStartDate()
-  {
-    return $this->startDate;
-  }
-  public function setStartRow($startRow)
-  {
-    $this->startRow = $startRow;
-  }
-  public function getStartRow()
-  {
-    return $this->startRow;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Webmasters/SearchAnalyticsQueryResponse.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Webmasters/SearchAnalyticsQueryResponse.php
deleted file mode 100644
index 1674d175..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Webmasters/SearchAnalyticsQueryResponse.php
+++ /dev/null
@@ -1,41 +0,0 @@
-responseAggregationType = $responseAggregationType;
-  }
-  public function getResponseAggregationType()
-  {
-    return $this->responseAggregationType;
-  }
-  public function setRows($rows)
-  {
-    $this->rows = $rows;
-  }
-  public function getRows()
-  {
-    return $this->rows;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Webmasters/SitemapsListResponse.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Webmasters/SitemapsListResponse.php
deleted file mode 100644
index c458f576..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Webmasters/SitemapsListResponse.php
+++ /dev/null
@@ -1,32 +0,0 @@
-sitemap = $sitemap;
-  }
-  public function getSitemap()
-  {
-    return $this->sitemap;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Webmasters/SitesListResponse.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Webmasters/SitesListResponse.php
deleted file mode 100644
index 52fdc667..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Webmasters/SitesListResponse.php
+++ /dev/null
@@ -1,32 +0,0 @@
-siteEntry = $siteEntry;
-  }
-  public function getSiteEntry()
-  {
-    return $this->siteEntry;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Webmasters/UrlCrawlErrorCount.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Webmasters/UrlCrawlErrorCount.php
deleted file mode 100644
index fd128f94..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Webmasters/UrlCrawlErrorCount.php
+++ /dev/null
@@ -1,39 +0,0 @@
-count = $count;
-  }
-  public function getCount()
-  {
-    return $this->count;
-  }
-  public function setTimestamp($timestamp)
-  {
-    $this->timestamp = $timestamp;
-  }
-  public function getTimestamp()
-  {
-    return $this->timestamp;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Webmasters/UrlCrawlErrorCountsPerType.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Webmasters/UrlCrawlErrorCountsPerType.php
deleted file mode 100644
index 57e3e2ed..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Webmasters/UrlCrawlErrorCountsPerType.php
+++ /dev/null
@@ -1,50 +0,0 @@
-category = $category;
-  }
-  public function getCategory()
-  {
-    return $this->category;
-  }
-  public function setEntries($entries)
-  {
-    $this->entries = $entries;
-  }
-  public function getEntries()
-  {
-    return $this->entries;
-  }
-  public function setPlatform($platform)
-  {
-    $this->platform = $platform;
-  }
-  public function getPlatform()
-  {
-    return $this->platform;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Webmasters/UrlCrawlErrorsCountsQueryResponse.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Webmasters/UrlCrawlErrorsCountsQueryResponse.php
deleted file mode 100644
index 40590d75..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Webmasters/UrlCrawlErrorsCountsQueryResponse.php
+++ /dev/null
@@ -1,32 +0,0 @@
-countPerTypes = $countPerTypes;
-  }
-  public function getCountPerTypes()
-  {
-    return $this->countPerTypes;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Webmasters/UrlCrawlErrorsSample.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Webmasters/UrlCrawlErrorsSample.php
deleted file mode 100644
index 5291a57d..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Webmasters/UrlCrawlErrorsSample.php
+++ /dev/null
@@ -1,71 +0,0 @@
- "first_detected",
-        "lastCrawled" => "last_crawled",
-  );
-  public $firstDetected;
-  public $lastCrawled;
-  public $pageUrl;
-  public $responseCode;
-  protected $urlDetailsType = 'Google_Service_Webmasters_UrlSampleDetails';
-  protected $urlDetailsDataType = '';
-
-  public function setFirstDetected($firstDetected)
-  {
-    $this->firstDetected = $firstDetected;
-  }
-  public function getFirstDetected()
-  {
-    return $this->firstDetected;
-  }
-  public function setLastCrawled($lastCrawled)
-  {
-    $this->lastCrawled = $lastCrawled;
-  }
-  public function getLastCrawled()
-  {
-    return $this->lastCrawled;
-  }
-  public function setPageUrl($pageUrl)
-  {
-    $this->pageUrl = $pageUrl;
-  }
-  public function getPageUrl()
-  {
-    return $this->pageUrl;
-  }
-  public function setResponseCode($responseCode)
-  {
-    $this->responseCode = $responseCode;
-  }
-  public function getResponseCode()
-  {
-    return $this->responseCode;
-  }
-  public function setUrlDetails(Google_Service_Webmasters_UrlSampleDetails $urlDetails)
-  {
-    $this->urlDetails = $urlDetails;
-  }
-  public function getUrlDetails()
-  {
-    return $this->urlDetails;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Webmasters/UrlCrawlErrorsSamplesListResponse.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Webmasters/UrlCrawlErrorsSamplesListResponse.php
deleted file mode 100644
index 5835d3f1..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Webmasters/UrlCrawlErrorsSamplesListResponse.php
+++ /dev/null
@@ -1,32 +0,0 @@
-urlCrawlErrorSample = $urlCrawlErrorSample;
-  }
-  public function getUrlCrawlErrorSample()
-  {
-    return $this->urlCrawlErrorSample;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Webmasters/UrlSampleDetails.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Webmasters/UrlSampleDetails.php
deleted file mode 100644
index 3d50187b..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Webmasters/UrlSampleDetails.php
+++ /dev/null
@@ -1,40 +0,0 @@
-containingSitemaps = $containingSitemaps;
-  }
-  public function getContainingSitemaps()
-  {
-    return $this->containingSitemaps;
-  }
-  public function setLinkedFromUrls($linkedFromUrls)
-  {
-    $this->linkedFromUrls = $linkedFromUrls;
-  }
-  public function getLinkedFromUrls()
-  {
-    return $this->linkedFromUrls;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Webmasters/WmxSite.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Webmasters/WmxSite.php
deleted file mode 100644
index 6d0dc5f5..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Webmasters/WmxSite.php
+++ /dev/null
@@ -1,39 +0,0 @@
-permissionLevel = $permissionLevel;
-  }
-  public function getPermissionLevel()
-  {
-    return $this->permissionLevel;
-  }
-  public function setSiteUrl($siteUrl)
-  {
-    $this->siteUrl = $siteUrl;
-  }
-  public function getSiteUrl()
-  {
-    return $this->siteUrl;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Webmasters/WmxSitemap.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Webmasters/WmxSitemap.php
deleted file mode 100644
index 493bd27c..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Webmasters/WmxSitemap.php
+++ /dev/null
@@ -1,104 +0,0 @@
-contents = $contents;
-  }
-  public function getContents()
-  {
-    return $this->contents;
-  }
-  public function setErrors($errors)
-  {
-    $this->errors = $errors;
-  }
-  public function getErrors()
-  {
-    return $this->errors;
-  }
-  public function setIsPending($isPending)
-  {
-    $this->isPending = $isPending;
-  }
-  public function getIsPending()
-  {
-    return $this->isPending;
-  }
-  public function setIsSitemapsIndex($isSitemapsIndex)
-  {
-    $this->isSitemapsIndex = $isSitemapsIndex;
-  }
-  public function getIsSitemapsIndex()
-  {
-    return $this->isSitemapsIndex;
-  }
-  public function setLastDownloaded($lastDownloaded)
-  {
-    $this->lastDownloaded = $lastDownloaded;
-  }
-  public function getLastDownloaded()
-  {
-    return $this->lastDownloaded;
-  }
-  public function setLastSubmitted($lastSubmitted)
-  {
-    $this->lastSubmitted = $lastSubmitted;
-  }
-  public function getLastSubmitted()
-  {
-    return $this->lastSubmitted;
-  }
-  public function setPath($path)
-  {
-    $this->path = $path;
-  }
-  public function getPath()
-  {
-    return $this->path;
-  }
-  public function setType($type)
-  {
-    $this->type = $type;
-  }
-  public function getType()
-  {
-    return $this->type;
-  }
-  public function setWarnings($warnings)
-  {
-    $this->warnings = $warnings;
-  }
-  public function getWarnings()
-  {
-    return $this->warnings;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Webmasters/WmxSitemapContent.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Webmasters/WmxSitemapContent.php
deleted file mode 100644
index 904a377c..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/Webmasters/WmxSitemapContent.php
+++ /dev/null
@@ -1,48 +0,0 @@
-indexed = $indexed;
-  }
-  public function getIndexed()
-  {
-    return $this->indexed;
-  }
-  public function setSubmitted($submitted)
-  {
-    $this->submitted = $submitted;
-  }
-  public function getSubmitted()
-  {
-    return $this->submitted;
-  }
-  public function setType($type)
-  {
-    $this->type = $type;
-  }
-  public function getType()
-  {
-    return $this->type;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTube.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTube.php
deleted file mode 100644
index 17a45cfd..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTube.php
+++ /dev/null
@@ -1,1944 +0,0 @@
-
- * Supports core YouTube features, such as uploading videos, creating and
- * managing playlists, searching for content, and much more.

- *
- * 

- * For more information about this service, see the API
- * Documentation
- * 

- *
- * @author Google, Inc.
- */
-class Google_Service_YouTube extends Google_Service
-{
-  /** Manage your YouTube account. */
-  const YOUTUBE =
-      "https://www.googleapis.com/auth/youtube";
-  /** Manage your YouTube account. */
-  const YOUTUBE_FORCE_SSL =
-      "https://www.googleapis.com/auth/youtube.force-ssl";
-  /** View your YouTube account. */
-  const YOUTUBE_READONLY =
-      "https://www.googleapis.com/auth/youtube.readonly";
-  /** Manage your YouTube videos. */
-  const YOUTUBE_UPLOAD =
-      "https://www.googleapis.com/auth/youtube.upload";
-  /** View and manage your assets and associated content on YouTube. */
-  const YOUTUBEPARTNER =
-      "https://www.googleapis.com/auth/youtubepartner";
-  /** View private information of your YouTube channel relevant during the audit process with a YouTube partner. */
-  const YOUTUBEPARTNER_CHANNEL_AUDIT =
-      "https://www.googleapis.com/auth/youtubepartner-channel-audit";
-
-  public $activities;
-  public $captions;
-  public $channelBanners;
-  public $channelSections;
-  public $channels;
-  public $commentThreads;
-  public $comments;
-  public $fanFundingEvents;
-  public $guideCategories;
-  public $i18nLanguages;
-  public $i18nRegions;
-  public $liveBroadcasts;
-  public $liveChatBans;
-  public $liveChatMessages;
-  public $liveChatModerators;
-  public $liveStreams;
-  public $playlistItems;
-  public $playlists;
-  public $search;
-  public $sponsors;
-  public $subscriptions;
-  public $superChatEvents;
-  public $thumbnails;
-  public $videoAbuseReportReasons;
-  public $videoCategories;
-  public $videos;
-  public $watermarks;
-  
-  /**
-   * Constructs the internal representation of the YouTube service.
-   *
-   * @param Google_Client $client
-   */
-  public function __construct(Google_Client $client)
-  {
-    parent::__construct($client);
-    $this->rootUrl = 'https://www.googleapis.com/';
-    $this->servicePath = 'youtube/v3/';
-    $this->version = 'v3';
-    $this->serviceName = 'youtube';
-
-    $this->activities = new Google_Service_YouTube_Resource_Activities(
-        $this,
-        $this->serviceName,
-        'activities',
-        array(
-          'methods' => array(
-            'insert' => array(
-              'path' => 'activities',
-              'httpMethod' => 'POST',
-              'parameters' => array(
-                'part' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'list' => array(
-              'path' => 'activities',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'part' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'channelId' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'home' => array(
-                  'location' => 'query',
-                  'type' => 'boolean',
-                ),
-                'maxResults' => array(
-                  'location' => 'query',
-                  'type' => 'integer',
-                ),
-                'mine' => array(
-                  'location' => 'query',
-                  'type' => 'boolean',
-                ),
-                'pageToken' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'publishedAfter' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'publishedBefore' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'regionCode' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-              ),
-            ),
-          )
-        )
-    );
-    $this->captions = new Google_Service_YouTube_Resource_Captions(
-        $this,
-        $this->serviceName,
-        'captions',
-        array(
-          'methods' => array(
-            'delete' => array(
-              'path' => 'captions',
-              'httpMethod' => 'DELETE',
-              'parameters' => array(
-                'id' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'onBehalfOf' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'onBehalfOfContentOwner' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-              ),
-            ),'download' => array(
-              'path' => 'captions/{id}',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'id' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'onBehalfOf' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'onBehalfOfContentOwner' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'tfmt' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'tlang' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-              ),
-            ),'insert' => array(
-              'path' => 'captions',
-              'httpMethod' => 'POST',
-              'parameters' => array(
-                'part' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'onBehalfOf' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'onBehalfOfContentOwner' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'sync' => array(
-                  'location' => 'query',
-                  'type' => 'boolean',
-                ),
-              ),
-            ),'list' => array(
-              'path' => 'captions',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'part' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'videoId' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'id' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'onBehalfOf' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'onBehalfOfContentOwner' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-              ),
-            ),'update' => array(
-              'path' => 'captions',
-              'httpMethod' => 'PUT',
-              'parameters' => array(
-                'part' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'onBehalfOf' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'onBehalfOfContentOwner' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'sync' => array(
-                  'location' => 'query',
-                  'type' => 'boolean',
-                ),
-              ),
-            ),
-          )
-        )
-    );
-    $this->channelBanners = new Google_Service_YouTube_Resource_ChannelBanners(
-        $this,
-        $this->serviceName,
-        'channelBanners',
-        array(
-          'methods' => array(
-            'insert' => array(
-              'path' => 'channelBanners/insert',
-              'httpMethod' => 'POST',
-              'parameters' => array(
-                'onBehalfOfContentOwner' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-              ),
-            ),
-          )
-        )
-    );
-    $this->channelSections = new Google_Service_YouTube_Resource_ChannelSections(
-        $this,
-        $this->serviceName,
-        'channelSections',
-        array(
-          'methods' => array(
-            'delete' => array(
-              'path' => 'channelSections',
-              'httpMethod' => 'DELETE',
-              'parameters' => array(
-                'id' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'onBehalfOfContentOwner' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-              ),
-            ),'insert' => array(
-              'path' => 'channelSections',
-              'httpMethod' => 'POST',
-              'parameters' => array(
-                'part' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'onBehalfOfContentOwner' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'onBehalfOfContentOwnerChannel' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-              ),
-            ),'list' => array(
-              'path' => 'channelSections',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'part' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'channelId' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'hl' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'id' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'mine' => array(
-                  'location' => 'query',
-                  'type' => 'boolean',
-                ),
-                'onBehalfOfContentOwner' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-              ),
-            ),'update' => array(
-              'path' => 'channelSections',
-              'httpMethod' => 'PUT',
-              'parameters' => array(
-                'part' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'onBehalfOfContentOwner' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-              ),
-            ),
-          )
-        )
-    );
-    $this->channels = new Google_Service_YouTube_Resource_Channels(
-        $this,
-        $this->serviceName,
-        'channels',
-        array(
-          'methods' => array(
-            'list' => array(
-              'path' => 'channels',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'part' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'categoryId' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'forUsername' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'hl' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'id' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'managedByMe' => array(
-                  'location' => 'query',
-                  'type' => 'boolean',
-                ),
-                'maxResults' => array(
-                  'location' => 'query',
-                  'type' => 'integer',
-                ),
-                'mine' => array(
-                  'location' => 'query',
-                  'type' => 'boolean',
-                ),
-                'mySubscribers' => array(
-                  'location' => 'query',
-                  'type' => 'boolean',
-                ),
-                'onBehalfOfContentOwner' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'pageToken' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-              ),
-            ),'update' => array(
-              'path' => 'channels',
-              'httpMethod' => 'PUT',
-              'parameters' => array(
-                'part' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'onBehalfOfContentOwner' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-              ),
-            ),
-          )
-        )
-    );
-    $this->commentThreads = new Google_Service_YouTube_Resource_CommentThreads(
-        $this,
-        $this->serviceName,
-        'commentThreads',
-        array(
-          'methods' => array(
-            'insert' => array(
-              'path' => 'commentThreads',
-              'httpMethod' => 'POST',
-              'parameters' => array(
-                'part' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'list' => array(
-              'path' => 'commentThreads',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'part' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'allThreadsRelatedToChannelId' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'channelId' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'id' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'maxResults' => array(
-                  'location' => 'query',
-                  'type' => 'integer',
-                ),
-                'moderationStatus' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'order' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'pageToken' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'searchTerms' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'textFormat' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'videoId' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-              ),
-            ),'update' => array(
-              'path' => 'commentThreads',
-              'httpMethod' => 'PUT',
-              'parameters' => array(
-                'part' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),
-          )
-        )
-    );
-    $this->comments = new Google_Service_YouTube_Resource_Comments(
-        $this,
-        $this->serviceName,
-        'comments',
-        array(
-          'methods' => array(
-            'delete' => array(
-              'path' => 'comments',
-              'httpMethod' => 'DELETE',
-              'parameters' => array(
-                'id' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'insert' => array(
-              'path' => 'comments',
-              'httpMethod' => 'POST',
-              'parameters' => array(
-                'part' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'list' => array(
-              'path' => 'comments',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'part' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'id' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'maxResults' => array(
-                  'location' => 'query',
-                  'type' => 'integer',
-                ),
-                'pageToken' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'parentId' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'textFormat' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-              ),
-            ),'markAsSpam' => array(
-              'path' => 'comments/markAsSpam',
-              'httpMethod' => 'POST',
-              'parameters' => array(
-                'id' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'setModerationStatus' => array(
-              'path' => 'comments/setModerationStatus',
-              'httpMethod' => 'POST',
-              'parameters' => array(
-                'id' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'moderationStatus' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'banAuthor' => array(
-                  'location' => 'query',
-                  'type' => 'boolean',
-                ),
-              ),
-            ),'update' => array(
-              'path' => 'comments',
-              'httpMethod' => 'PUT',
-              'parameters' => array(
-                'part' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),
-          )
-        )
-    );
-    $this->fanFundingEvents = new Google_Service_YouTube_Resource_FanFundingEvents(
-        $this,
-        $this->serviceName,
-        'fanFundingEvents',
-        array(
-          'methods' => array(
-            'list' => array(
-              'path' => 'fanFundingEvents',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'part' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'hl' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'maxResults' => array(
-                  'location' => 'query',
-                  'type' => 'integer',
-                ),
-                'pageToken' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-              ),
-            ),
-          )
-        )
-    );
-    $this->guideCategories = new Google_Service_YouTube_Resource_GuideCategories(
-        $this,
-        $this->serviceName,
-        'guideCategories',
-        array(
-          'methods' => array(
-            'list' => array(
-              'path' => 'guideCategories',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'part' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'hl' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'id' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'regionCode' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-              ),
-            ),
-          )
-        )
-    );
-    $this->i18nLanguages = new Google_Service_YouTube_Resource_I18nLanguages(
-        $this,
-        $this->serviceName,
-        'i18nLanguages',
-        array(
-          'methods' => array(
-            'list' => array(
-              'path' => 'i18nLanguages',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'part' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'hl' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-              ),
-            ),
-          )
-        )
-    );
-    $this->i18nRegions = new Google_Service_YouTube_Resource_I18nRegions(
-        $this,
-        $this->serviceName,
-        'i18nRegions',
-        array(
-          'methods' => array(
-            'list' => array(
-              'path' => 'i18nRegions',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'part' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'hl' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-              ),
-            ),
-          )
-        )
-    );
-    $this->liveBroadcasts = new Google_Service_YouTube_Resource_LiveBroadcasts(
-        $this,
-        $this->serviceName,
-        'liveBroadcasts',
-        array(
-          'methods' => array(
-            'bind' => array(
-              'path' => 'liveBroadcasts/bind',
-              'httpMethod' => 'POST',
-              'parameters' => array(
-                'id' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'part' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'onBehalfOfContentOwner' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'onBehalfOfContentOwnerChannel' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'streamId' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-              ),
-            ),'control' => array(
-              'path' => 'liveBroadcasts/control',
-              'httpMethod' => 'POST',
-              'parameters' => array(
-                'id' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'part' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'displaySlate' => array(
-                  'location' => 'query',
-                  'type' => 'boolean',
-                ),
-                'offsetTimeMs' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'onBehalfOfContentOwner' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'onBehalfOfContentOwnerChannel' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'walltime' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-              ),
-            ),'delete' => array(
-              'path' => 'liveBroadcasts',
-              'httpMethod' => 'DELETE',
-              'parameters' => array(
-                'id' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'onBehalfOfContentOwner' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'onBehalfOfContentOwnerChannel' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-              ),
-            ),'insert' => array(
-              'path' => 'liveBroadcasts',
-              'httpMethod' => 'POST',
-              'parameters' => array(
-                'part' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'onBehalfOfContentOwner' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'onBehalfOfContentOwnerChannel' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-              ),
-            ),'list' => array(
-              'path' => 'liveBroadcasts',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'part' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'broadcastStatus' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'broadcastType' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'id' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'maxResults' => array(
-                  'location' => 'query',
-                  'type' => 'integer',
-                ),
-                'mine' => array(
-                  'location' => 'query',
-                  'type' => 'boolean',
-                ),
-                'onBehalfOfContentOwner' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'onBehalfOfContentOwnerChannel' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'pageToken' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-              ),
-            ),'transition' => array(
-              'path' => 'liveBroadcasts/transition',
-              'httpMethod' => 'POST',
-              'parameters' => array(
-                'broadcastStatus' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'id' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'part' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'onBehalfOfContentOwner' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'onBehalfOfContentOwnerChannel' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-              ),
-            ),'update' => array(
-              'path' => 'liveBroadcasts',
-              'httpMethod' => 'PUT',
-              'parameters' => array(
-                'part' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'onBehalfOfContentOwner' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'onBehalfOfContentOwnerChannel' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-              ),
-            ),
-          )
-        )
-    );
-    $this->liveChatBans = new Google_Service_YouTube_Resource_LiveChatBans(
-        $this,
-        $this->serviceName,
-        'liveChatBans',
-        array(
-          'methods' => array(
-            'delete' => array(
-              'path' => 'liveChat/bans',
-              'httpMethod' => 'DELETE',
-              'parameters' => array(
-                'id' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'insert' => array(
-              'path' => 'liveChat/bans',
-              'httpMethod' => 'POST',
-              'parameters' => array(
-                'part' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),
-          )
-        )
-    );
-    $this->liveChatMessages = new Google_Service_YouTube_Resource_LiveChatMessages(
-        $this,
-        $this->serviceName,
-        'liveChatMessages',
-        array(
-          'methods' => array(
-            'delete' => array(
-              'path' => 'liveChat/messages',
-              'httpMethod' => 'DELETE',
-              'parameters' => array(
-                'id' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'insert' => array(
-              'path' => 'liveChat/messages',
-              'httpMethod' => 'POST',
-              'parameters' => array(
-                'part' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'list' => array(
-              'path' => 'liveChat/messages',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'liveChatId' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'part' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'hl' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'maxResults' => array(
-                  'location' => 'query',
-                  'type' => 'integer',
-                ),
-                'pageToken' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'profileImageSize' => array(
-                  'location' => 'query',
-                  'type' => 'integer',
-                ),
-              ),
-            ),
-          )
-        )
-    );
-    $this->liveChatModerators = new Google_Service_YouTube_Resource_LiveChatModerators(
-        $this,
-        $this->serviceName,
-        'liveChatModerators',
-        array(
-          'methods' => array(
-            'delete' => array(
-              'path' => 'liveChat/moderators',
-              'httpMethod' => 'DELETE',
-              'parameters' => array(
-                'id' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'insert' => array(
-              'path' => 'liveChat/moderators',
-              'httpMethod' => 'POST',
-              'parameters' => array(
-                'part' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'list' => array(
-              'path' => 'liveChat/moderators',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'liveChatId' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'part' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'maxResults' => array(
-                  'location' => 'query',
-                  'type' => 'integer',
-                ),
-                'pageToken' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-              ),
-            ),
-          )
-        )
-    );
-    $this->liveStreams = new Google_Service_YouTube_Resource_LiveStreams(
-        $this,
-        $this->serviceName,
-        'liveStreams',
-        array(
-          'methods' => array(
-            'delete' => array(
-              'path' => 'liveStreams',
-              'httpMethod' => 'DELETE',
-              'parameters' => array(
-                'id' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'onBehalfOfContentOwner' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'onBehalfOfContentOwnerChannel' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-              ),
-            ),'insert' => array(
-              'path' => 'liveStreams',
-              'httpMethod' => 'POST',
-              'parameters' => array(
-                'part' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'onBehalfOfContentOwner' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'onBehalfOfContentOwnerChannel' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-              ),
-            ),'list' => array(
-              'path' => 'liveStreams',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'part' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'id' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'maxResults' => array(
-                  'location' => 'query',
-                  'type' => 'integer',
-                ),
-                'mine' => array(
-                  'location' => 'query',
-                  'type' => 'boolean',
-                ),
-                'onBehalfOfContentOwner' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'onBehalfOfContentOwnerChannel' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'pageToken' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-              ),
-            ),'update' => array(
-              'path' => 'liveStreams',
-              'httpMethod' => 'PUT',
-              'parameters' => array(
-                'part' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'onBehalfOfContentOwner' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'onBehalfOfContentOwnerChannel' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-              ),
-            ),
-          )
-        )
-    );
-    $this->playlistItems = new Google_Service_YouTube_Resource_PlaylistItems(
-        $this,
-        $this->serviceName,
-        'playlistItems',
-        array(
-          'methods' => array(
-            'delete' => array(
-              'path' => 'playlistItems',
-              'httpMethod' => 'DELETE',
-              'parameters' => array(
-                'id' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'onBehalfOfContentOwner' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-              ),
-            ),'insert' => array(
-              'path' => 'playlistItems',
-              'httpMethod' => 'POST',
-              'parameters' => array(
-                'part' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'onBehalfOfContentOwner' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-              ),
-            ),'list' => array(
-              'path' => 'playlistItems',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'part' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'id' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'maxResults' => array(
-                  'location' => 'query',
-                  'type' => 'integer',
-                ),
-                'onBehalfOfContentOwner' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'pageToken' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'playlistId' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'videoId' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-              ),
-            ),'update' => array(
-              'path' => 'playlistItems',
-              'httpMethod' => 'PUT',
-              'parameters' => array(
-                'part' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'onBehalfOfContentOwner' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-              ),
-            ),
-          )
-        )
-    );
-    $this->playlists = new Google_Service_YouTube_Resource_Playlists(
-        $this,
-        $this->serviceName,
-        'playlists',
-        array(
-          'methods' => array(
-            'delete' => array(
-              'path' => 'playlists',
-              'httpMethod' => 'DELETE',
-              'parameters' => array(
-                'id' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'onBehalfOfContentOwner' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-              ),
-            ),'insert' => array(
-              'path' => 'playlists',
-              'httpMethod' => 'POST',
-              'parameters' => array(
-                'part' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'onBehalfOfContentOwner' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'onBehalfOfContentOwnerChannel' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-              ),
-            ),'list' => array(
-              'path' => 'playlists',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'part' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'channelId' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'hl' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'id' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'maxResults' => array(
-                  'location' => 'query',
-                  'type' => 'integer',
-                ),
-                'mine' => array(
-                  'location' => 'query',
-                  'type' => 'boolean',
-                ),
-                'onBehalfOfContentOwner' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'onBehalfOfContentOwnerChannel' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'pageToken' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-              ),
-            ),'update' => array(
-              'path' => 'playlists',
-              'httpMethod' => 'PUT',
-              'parameters' => array(
-                'part' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'onBehalfOfContentOwner' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-              ),
-            ),
-          )
-        )
-    );
-    $this->search = new Google_Service_YouTube_Resource_Search(
-        $this,
-        $this->serviceName,
-        'search',
-        array(
-          'methods' => array(
-            'list' => array(
-              'path' => 'search',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'part' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'channelId' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'channelType' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'eventType' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'forContentOwner' => array(
-                  'location' => 'query',
-                  'type' => 'boolean',
-                ),
-                'forDeveloper' => array(
-                  'location' => 'query',
-                  'type' => 'boolean',
-                ),
-                'forMine' => array(
-                  'location' => 'query',
-                  'type' => 'boolean',
-                ),
-                'location' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'locationRadius' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'maxResults' => array(
-                  'location' => 'query',
-                  'type' => 'integer',
-                ),
-                'onBehalfOfContentOwner' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'order' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'pageToken' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'publishedAfter' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'publishedBefore' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'q' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'regionCode' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'relatedToVideoId' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'relevanceLanguage' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'safeSearch' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'topicId' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'type' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'videoCaption' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'videoCategoryId' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'videoDefinition' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'videoDimension' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'videoDuration' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'videoEmbeddable' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'videoLicense' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'videoSyndicated' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'videoType' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-              ),
-            ),
-          )
-        )
-    );
-    $this->sponsors = new Google_Service_YouTube_Resource_Sponsors(
-        $this,
-        $this->serviceName,
-        'sponsors',
-        array(
-          'methods' => array(
-            'list' => array(
-              'path' => 'sponsors',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'part' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'filter' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'maxResults' => array(
-                  'location' => 'query',
-                  'type' => 'integer',
-                ),
-                'pageToken' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-              ),
-            ),
-          )
-        )
-    );
-    $this->subscriptions = new Google_Service_YouTube_Resource_Subscriptions(
-        $this,
-        $this->serviceName,
-        'subscriptions',
-        array(
-          'methods' => array(
-            'delete' => array(
-              'path' => 'subscriptions',
-              'httpMethod' => 'DELETE',
-              'parameters' => array(
-                'id' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'insert' => array(
-              'path' => 'subscriptions',
-              'httpMethod' => 'POST',
-              'parameters' => array(
-                'part' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'list' => array(
-              'path' => 'subscriptions',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'part' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'channelId' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'forChannelId' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'id' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'maxResults' => array(
-                  'location' => 'query',
-                  'type' => 'integer',
-                ),
-                'mine' => array(
-                  'location' => 'query',
-                  'type' => 'boolean',
-                ),
-                'myRecentSubscribers' => array(
-                  'location' => 'query',
-                  'type' => 'boolean',
-                ),
-                'mySubscribers' => array(
-                  'location' => 'query',
-                  'type' => 'boolean',
-                ),
-                'onBehalfOfContentOwner' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'onBehalfOfContentOwnerChannel' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'order' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'pageToken' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-              ),
-            ),
-          )
-        )
-    );
-    $this->superChatEvents = new Google_Service_YouTube_Resource_SuperChatEvents(
-        $this,
-        $this->serviceName,
-        'superChatEvents',
-        array(
-          'methods' => array(
-            'list' => array(
-              'path' => 'superChatEvents',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'part' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'hl' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'maxResults' => array(
-                  'location' => 'query',
-                  'type' => 'integer',
-                ),
-                'pageToken' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-              ),
-            ),
-          )
-        )
-    );
-    $this->thumbnails = new Google_Service_YouTube_Resource_Thumbnails(
-        $this,
-        $this->serviceName,
-        'thumbnails',
-        array(
-          'methods' => array(
-            'set' => array(
-              'path' => 'thumbnails/set',
-              'httpMethod' => 'POST',
-              'parameters' => array(
-                'videoId' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'onBehalfOfContentOwner' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-              ),
-            ),
-          )
-        )
-    );
-    $this->videoAbuseReportReasons = new Google_Service_YouTube_Resource_VideoAbuseReportReasons(
-        $this,
-        $this->serviceName,
-        'videoAbuseReportReasons',
-        array(
-          'methods' => array(
-            'list' => array(
-              'path' => 'videoAbuseReportReasons',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'part' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'hl' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-              ),
-            ),
-          )
-        )
-    );
-    $this->videoCategories = new Google_Service_YouTube_Resource_VideoCategories(
-        $this,
-        $this->serviceName,
-        'videoCategories',
-        array(
-          'methods' => array(
-            'list' => array(
-              'path' => 'videoCategories',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'part' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'hl' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'id' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'regionCode' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-              ),
-            ),
-          )
-        )
-    );
-    $this->videos = new Google_Service_YouTube_Resource_Videos(
-        $this,
-        $this->serviceName,
-        'videos',
-        array(
-          'methods' => array(
-            'delete' => array(
-              'path' => 'videos',
-              'httpMethod' => 'DELETE',
-              'parameters' => array(
-                'id' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'onBehalfOfContentOwner' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-              ),
-            ),'getRating' => array(
-              'path' => 'videos/getRating',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'id' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'onBehalfOfContentOwner' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-              ),
-            ),'insert' => array(
-              'path' => 'videos',
-              'httpMethod' => 'POST',
-              'parameters' => array(
-                'part' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'autoLevels' => array(
-                  'location' => 'query',
-                  'type' => 'boolean',
-                ),
-                'notifySubscribers' => array(
-                  'location' => 'query',
-                  'type' => 'boolean',
-                ),
-                'onBehalfOfContentOwner' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'onBehalfOfContentOwnerChannel' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'stabilize' => array(
-                  'location' => 'query',
-                  'type' => 'boolean',
-                ),
-              ),
-            ),'list' => array(
-              'path' => 'videos',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'part' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'chart' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'hl' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'id' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'locale' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'maxHeight' => array(
-                  'location' => 'query',
-                  'type' => 'integer',
-                ),
-                'maxResults' => array(
-                  'location' => 'query',
-                  'type' => 'integer',
-                ),
-                'maxWidth' => array(
-                  'location' => 'query',
-                  'type' => 'integer',
-                ),
-                'myRating' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'onBehalfOfContentOwner' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'pageToken' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'regionCode' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'videoCategoryId' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-              ),
-            ),'rate' => array(
-              'path' => 'videos/rate',
-              'httpMethod' => 'POST',
-              'parameters' => array(
-                'id' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'rating' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'reportAbuse' => array(
-              'path' => 'videos/reportAbuse',
-              'httpMethod' => 'POST',
-              'parameters' => array(
-                'onBehalfOfContentOwner' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-              ),
-            ),'update' => array(
-              'path' => 'videos',
-              'httpMethod' => 'PUT',
-              'parameters' => array(
-                'part' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'onBehalfOfContentOwner' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-              ),
-            ),
-          )
-        )
-    );
-    $this->watermarks = new Google_Service_YouTube_Resource_Watermarks(
-        $this,
-        $this->serviceName,
-        'watermarks',
-        array(
-          'methods' => array(
-            'set' => array(
-              'path' => 'watermarks/set',
-              'httpMethod' => 'POST',
-              'parameters' => array(
-                'channelId' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'onBehalfOfContentOwner' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-              ),
-            ),'unset' => array(
-              'path' => 'watermarks/unset',
-              'httpMethod' => 'POST',
-              'parameters' => array(
-                'channelId' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'onBehalfOfContentOwner' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-              ),
-            ),
-          )
-        )
-    );
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTube/AccessPolicy.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTube/AccessPolicy.php
deleted file mode 100644
index 0d0dd350..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTube/AccessPolicy.php
+++ /dev/null
@@ -1,40 +0,0 @@
-allowed = $allowed;
-  }
-  public function getAllowed()
-  {
-    return $this->allowed;
-  }
-  public function setException($exception)
-  {
-    $this->exception = $exception;
-  }
-  public function getException()
-  {
-    return $this->exception;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTube/Activity.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTube/Activity.php
deleted file mode 100644
index 6fe1f6dc..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTube/Activity.php
+++ /dev/null
@@ -1,68 +0,0 @@
-contentDetails = $contentDetails;
-  }
-  public function getContentDetails()
-  {
-    return $this->contentDetails;
-  }
-  public function setEtag($etag)
-  {
-    $this->etag = $etag;
-  }
-  public function getEtag()
-  {
-    return $this->etag;
-  }
-  public function setId($id)
-  {
-    $this->id = $id;
-  }
-  public function getId()
-  {
-    return $this->id;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setSnippet(Google_Service_YouTube_ActivitySnippet $snippet)
-  {
-    $this->snippet = $snippet;
-  }
-  public function getSnippet()
-  {
-    return $this->snippet;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTube/ActivityContentDetails.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTube/ActivityContentDetails.php
deleted file mode 100644
index 58fe8e34..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTube/ActivityContentDetails.php
+++ /dev/null
@@ -1,131 +0,0 @@
-bulletin = $bulletin;
-  }
-  public function getBulletin()
-  {
-    return $this->bulletin;
-  }
-  public function setChannelItem(Google_Service_YouTube_ActivityContentDetailsChannelItem $channelItem)
-  {
-    $this->channelItem = $channelItem;
-  }
-  public function getChannelItem()
-  {
-    return $this->channelItem;
-  }
-  public function setComment(Google_Service_YouTube_ActivityContentDetailsComment $comment)
-  {
-    $this->comment = $comment;
-  }
-  public function getComment()
-  {
-    return $this->comment;
-  }
-  public function setFavorite(Google_Service_YouTube_ActivityContentDetailsFavorite $favorite)
-  {
-    $this->favorite = $favorite;
-  }
-  public function getFavorite()
-  {
-    return $this->favorite;
-  }
-  public function setLike(Google_Service_YouTube_ActivityContentDetailsLike $like)
-  {
-    $this->like = $like;
-  }
-  public function getLike()
-  {
-    return $this->like;
-  }
-  public function setPlaylistItem(Google_Service_YouTube_ActivityContentDetailsPlaylistItem $playlistItem)
-  {
-    $this->playlistItem = $playlistItem;
-  }
-  public function getPlaylistItem()
-  {
-    return $this->playlistItem;
-  }
-  public function setPromotedItem(Google_Service_YouTube_ActivityContentDetailsPromotedItem $promotedItem)
-  {
-    $this->promotedItem = $promotedItem;
-  }
-  public function getPromotedItem()
-  {
-    return $this->promotedItem;
-  }
-  public function setRecommendation(Google_Service_YouTube_ActivityContentDetailsRecommendation $recommendation)
-  {
-    $this->recommendation = $recommendation;
-  }
-  public function getRecommendation()
-  {
-    return $this->recommendation;
-  }
-  public function setSocial(Google_Service_YouTube_ActivityContentDetailsSocial $social)
-  {
-    $this->social = $social;
-  }
-  public function getSocial()
-  {
-    return $this->social;
-  }
-  public function setSubscription(Google_Service_YouTube_ActivityContentDetailsSubscription $subscription)
-  {
-    $this->subscription = $subscription;
-  }
-  public function getSubscription()
-  {
-    return $this->subscription;
-  }
-  public function setUpload(Google_Service_YouTube_ActivityContentDetailsUpload $upload)
-  {
-    $this->upload = $upload;
-  }
-  public function getUpload()
-  {
-    return $this->upload;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTube/ActivityContentDetailsBulletin.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTube/ActivityContentDetailsBulletin.php
deleted file mode 100644
index 781ac027..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTube/ActivityContentDetailsBulletin.php
+++ /dev/null
@@ -1,31 +0,0 @@
-resourceId = $resourceId;
-  }
-  public function getResourceId()
-  {
-    return $this->resourceId;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTube/ActivityContentDetailsChannelItem.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTube/ActivityContentDetailsChannelItem.php
deleted file mode 100644
index 4880bd12..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTube/ActivityContentDetailsChannelItem.php
+++ /dev/null
@@ -1,31 +0,0 @@
-resourceId = $resourceId;
-  }
-  public function getResourceId()
-  {
-    return $this->resourceId;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTube/ActivityContentDetailsComment.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTube/ActivityContentDetailsComment.php
deleted file mode 100644
index 5d3c0f76..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTube/ActivityContentDetailsComment.php
+++ /dev/null
@@ -1,31 +0,0 @@
-resourceId = $resourceId;
-  }
-  public function getResourceId()
-  {
-    return $this->resourceId;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTube/ActivityContentDetailsFavorite.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTube/ActivityContentDetailsFavorite.php
deleted file mode 100644
index 3a20df97..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTube/ActivityContentDetailsFavorite.php
+++ /dev/null
@@ -1,31 +0,0 @@
-resourceId = $resourceId;
-  }
-  public function getResourceId()
-  {
-    return $this->resourceId;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTube/ActivityContentDetailsLike.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTube/ActivityContentDetailsLike.php
deleted file mode 100644
index 565f74a3..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTube/ActivityContentDetailsLike.php
+++ /dev/null
@@ -1,31 +0,0 @@
-resourceId = $resourceId;
-  }
-  public function getResourceId()
-  {
-    return $this->resourceId;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTube/ActivityContentDetailsPlaylistItem.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTube/ActivityContentDetailsPlaylistItem.php
deleted file mode 100644
index ab73188e..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTube/ActivityContentDetailsPlaylistItem.php
+++ /dev/null
@@ -1,49 +0,0 @@
-playlistId = $playlistId;
-  }
-  public function getPlaylistId()
-  {
-    return $this->playlistId;
-  }
-  public function setPlaylistItemId($playlistItemId)
-  {
-    $this->playlistItemId = $playlistItemId;
-  }
-  public function getPlaylistItemId()
-  {
-    return $this->playlistItemId;
-  }
-  public function setResourceId(Google_Service_YouTube_ResourceId $resourceId)
-  {
-    $this->resourceId = $resourceId;
-  }
-  public function getResourceId()
-  {
-    return $this->resourceId;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTube/ActivityContentDetailsPromotedItem.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTube/ActivityContentDetailsPromotedItem.php
deleted file mode 100644
index 4c385b8b..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTube/ActivityContentDetailsPromotedItem.php
+++ /dev/null
@@ -1,112 +0,0 @@
-adTag = $adTag;
-  }
-  public function getAdTag()
-  {
-    return $this->adTag;
-  }
-  public function setClickTrackingUrl($clickTrackingUrl)
-  {
-    $this->clickTrackingUrl = $clickTrackingUrl;
-  }
-  public function getClickTrackingUrl()
-  {
-    return $this->clickTrackingUrl;
-  }
-  public function setCreativeViewUrl($creativeViewUrl)
-  {
-    $this->creativeViewUrl = $creativeViewUrl;
-  }
-  public function getCreativeViewUrl()
-  {
-    return $this->creativeViewUrl;
-  }
-  public function setCtaType($ctaType)
-  {
-    $this->ctaType = $ctaType;
-  }
-  public function getCtaType()
-  {
-    return $this->ctaType;
-  }
-  public function setCustomCtaButtonText($customCtaButtonText)
-  {
-    $this->customCtaButtonText = $customCtaButtonText;
-  }
-  public function getCustomCtaButtonText()
-  {
-    return $this->customCtaButtonText;
-  }
-  public function setDescriptionText($descriptionText)
-  {
-    $this->descriptionText = $descriptionText;
-  }
-  public function getDescriptionText()
-  {
-    return $this->descriptionText;
-  }
-  public function setDestinationUrl($destinationUrl)
-  {
-    $this->destinationUrl = $destinationUrl;
-  }
-  public function getDestinationUrl()
-  {
-    return $this->destinationUrl;
-  }
-  public function setForecastingUrl($forecastingUrl)
-  {
-    $this->forecastingUrl = $forecastingUrl;
-  }
-  public function getForecastingUrl()
-  {
-    return $this->forecastingUrl;
-  }
-  public function setImpressionUrl($impressionUrl)
-  {
-    $this->impressionUrl = $impressionUrl;
-  }
-  public function getImpressionUrl()
-  {
-    return $this->impressionUrl;
-  }
-  public function setVideoId($videoId)
-  {
-    $this->videoId = $videoId;
-  }
-  public function getVideoId()
-  {
-    return $this->videoId;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTube/ActivityContentDetailsRecommendation.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTube/ActivityContentDetailsRecommendation.php
deleted file mode 100644
index db75327c..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTube/ActivityContentDetailsRecommendation.php
+++ /dev/null
@@ -1,50 +0,0 @@
-reason = $reason;
-  }
-  public function getReason()
-  {
-    return $this->reason;
-  }
-  public function setResourceId(Google_Service_YouTube_ResourceId $resourceId)
-  {
-    $this->resourceId = $resourceId;
-  }
-  public function getResourceId()
-  {
-    return $this->resourceId;
-  }
-  public function setSeedResourceId(Google_Service_YouTube_ResourceId $seedResourceId)
-  {
-    $this->seedResourceId = $seedResourceId;
-  }
-  public function getSeedResourceId()
-  {
-    return $this->seedResourceId;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTube/ActivityContentDetailsSocial.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTube/ActivityContentDetailsSocial.php
deleted file mode 100644
index c2aeb6dd..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTube/ActivityContentDetailsSocial.php
+++ /dev/null
@@ -1,67 +0,0 @@
-author = $author;
-  }
-  public function getAuthor()
-  {
-    return $this->author;
-  }
-  public function setImageUrl($imageUrl)
-  {
-    $this->imageUrl = $imageUrl;
-  }
-  public function getImageUrl()
-  {
-    return $this->imageUrl;
-  }
-  public function setReferenceUrl($referenceUrl)
-  {
-    $this->referenceUrl = $referenceUrl;
-  }
-  public function getReferenceUrl()
-  {
-    return $this->referenceUrl;
-  }
-  public function setResourceId(Google_Service_YouTube_ResourceId $resourceId)
-  {
-    $this->resourceId = $resourceId;
-  }
-  public function getResourceId()
-  {
-    return $this->resourceId;
-  }
-  public function setType($type)
-  {
-    $this->type = $type;
-  }
-  public function getType()
-  {
-    return $this->type;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTube/ActivityContentDetailsSubscription.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTube/ActivityContentDetailsSubscription.php
deleted file mode 100644
index d394ef33..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTube/ActivityContentDetailsSubscription.php
+++ /dev/null
@@ -1,31 +0,0 @@
-resourceId = $resourceId;
-  }
-  public function getResourceId()
-  {
-    return $this->resourceId;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTube/ActivityContentDetailsUpload.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTube/ActivityContentDetailsUpload.php
deleted file mode 100644
index c642753d..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTube/ActivityContentDetailsUpload.php
+++ /dev/null
@@ -1,30 +0,0 @@
-videoId = $videoId;
-  }
-  public function getVideoId()
-  {
-    return $this->videoId;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTube/ActivityListResponse.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTube/ActivityListResponse.php
deleted file mode 100644
index 4c8f1db2..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTube/ActivityListResponse.php
+++ /dev/null
@@ -1,106 +0,0 @@
-etag = $etag;
-  }
-  public function getEtag()
-  {
-    return $this->etag;
-  }
-  public function setEventId($eventId)
-  {
-    $this->eventId = $eventId;
-  }
-  public function getEventId()
-  {
-    return $this->eventId;
-  }
-  public function setItems($items)
-  {
-    $this->items = $items;
-  }
-  public function getItems()
-  {
-    return $this->items;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setNextPageToken($nextPageToken)
-  {
-    $this->nextPageToken = $nextPageToken;
-  }
-  public function getNextPageToken()
-  {
-    return $this->nextPageToken;
-  }
-  public function setPageInfo(Google_Service_YouTube_PageInfo $pageInfo)
-  {
-    $this->pageInfo = $pageInfo;
-  }
-  public function getPageInfo()
-  {
-    return $this->pageInfo;
-  }
-  public function setPrevPageToken($prevPageToken)
-  {
-    $this->prevPageToken = $prevPageToken;
-  }
-  public function getPrevPageToken()
-  {
-    return $this->prevPageToken;
-  }
-  public function setTokenPagination(Google_Service_YouTube_TokenPagination $tokenPagination)
-  {
-    $this->tokenPagination = $tokenPagination;
-  }
-  public function getTokenPagination()
-  {
-    return $this->tokenPagination;
-  }
-  public function setVisitorId($visitorId)
-  {
-    $this->visitorId = $visitorId;
-  }
-  public function getVisitorId()
-  {
-    return $this->visitorId;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTube/ActivitySnippet.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTube/ActivitySnippet.php
deleted file mode 100644
index 5e67c25e..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTube/ActivitySnippet.php
+++ /dev/null
@@ -1,94 +0,0 @@
-channelId = $channelId;
-  }
-  public function getChannelId()
-  {
-    return $this->channelId;
-  }
-  public function setChannelTitle($channelTitle)
-  {
-    $this->channelTitle = $channelTitle;
-  }
-  public function getChannelTitle()
-  {
-    return $this->channelTitle;
-  }
-  public function setDescription($description)
-  {
-    $this->description = $description;
-  }
-  public function getDescription()
-  {
-    return $this->description;
-  }
-  public function setGroupId($groupId)
-  {
-    $this->groupId = $groupId;
-  }
-  public function getGroupId()
-  {
-    return $this->groupId;
-  }
-  public function setPublishedAt($publishedAt)
-  {
-    $this->publishedAt = $publishedAt;
-  }
-  public function getPublishedAt()
-  {
-    return $this->publishedAt;
-  }
-  public function setThumbnails(Google_Service_YouTube_ThumbnailDetails $thumbnails)
-  {
-    $this->thumbnails = $thumbnails;
-  }
-  public function getThumbnails()
-  {
-    return $this->thumbnails;
-  }
-  public function setTitle($title)
-  {
-    $this->title = $title;
-  }
-  public function getTitle()
-  {
-    return $this->title;
-  }
-  public function setType($type)
-  {
-    $this->type = $type;
-  }
-  public function getType()
-  {
-    return $this->type;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTube/Caption.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTube/Caption.php
deleted file mode 100644
index 9fe9edaa..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTube/Caption.php
+++ /dev/null
@@ -1,58 +0,0 @@
-etag = $etag;
-  }
-  public function getEtag()
-  {
-    return $this->etag;
-  }
-  public function setId($id)
-  {
-    $this->id = $id;
-  }
-  public function getId()
-  {
-    return $this->id;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setSnippet(Google_Service_YouTube_CaptionSnippet $snippet)
-  {
-    $this->snippet = $snippet;
-  }
-  public function getSnippet()
-  {
-    return $this->snippet;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTube/CaptionListResponse.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTube/CaptionListResponse.php
deleted file mode 100644
index 6d1eba6a..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTube/CaptionListResponse.php
+++ /dev/null
@@ -1,68 +0,0 @@
-etag = $etag;
-  }
-  public function getEtag()
-  {
-    return $this->etag;
-  }
-  public function setEventId($eventId)
-  {
-    $this->eventId = $eventId;
-  }
-  public function getEventId()
-  {
-    return $this->eventId;
-  }
-  public function setItems($items)
-  {
-    $this->items = $items;
-  }
-  public function getItems()
-  {
-    return $this->items;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setVisitorId($visitorId)
-  {
-    $this->visitorId = $visitorId;
-  }
-  public function getVisitorId()
-  {
-    return $this->visitorId;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTube/CaptionSnippet.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTube/CaptionSnippet.php
deleted file mode 100644
index c37ce942..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTube/CaptionSnippet.php
+++ /dev/null
@@ -1,138 +0,0 @@
-audioTrackType = $audioTrackType;
-  }
-  public function getAudioTrackType()
-  {
-    return $this->audioTrackType;
-  }
-  public function setFailureReason($failureReason)
-  {
-    $this->failureReason = $failureReason;
-  }
-  public function getFailureReason()
-  {
-    return $this->failureReason;
-  }
-  public function setIsAutoSynced($isAutoSynced)
-  {
-    $this->isAutoSynced = $isAutoSynced;
-  }
-  public function getIsAutoSynced()
-  {
-    return $this->isAutoSynced;
-  }
-  public function setIsCC($isCC)
-  {
-    $this->isCC = $isCC;
-  }
-  public function getIsCC()
-  {
-    return $this->isCC;
-  }
-  public function setIsDraft($isDraft)
-  {
-    $this->isDraft = $isDraft;
-  }
-  public function getIsDraft()
-  {
-    return $this->isDraft;
-  }
-  public function setIsEasyReader($isEasyReader)
-  {
-    $this->isEasyReader = $isEasyReader;
-  }
-  public function getIsEasyReader()
-  {
-    return $this->isEasyReader;
-  }
-  public function setIsLarge($isLarge)
-  {
-    $this->isLarge = $isLarge;
-  }
-  public function getIsLarge()
-  {
-    return $this->isLarge;
-  }
-  public function setLanguage($language)
-  {
-    $this->language = $language;
-  }
-  public function getLanguage()
-  {
-    return $this->language;
-  }
-  public function setLastUpdated($lastUpdated)
-  {
-    $this->lastUpdated = $lastUpdated;
-  }
-  public function getLastUpdated()
-  {
-    return $this->lastUpdated;
-  }
-  public function setName($name)
-  {
-    $this->name = $name;
-  }
-  public function getName()
-  {
-    return $this->name;
-  }
-  public function setStatus($status)
-  {
-    $this->status = $status;
-  }
-  public function getStatus()
-  {
-    return $this->status;
-  }
-  public function setTrackKind($trackKind)
-  {
-    $this->trackKind = $trackKind;
-  }
-  public function getTrackKind()
-  {
-    return $this->trackKind;
-  }
-  public function setVideoId($videoId)
-  {
-    $this->videoId = $videoId;
-  }
-  public function getVideoId()
-  {
-    return $this->videoId;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTube/CdnSettings.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTube/CdnSettings.php
deleted file mode 100644
index 4c334b35..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTube/CdnSettings.php
+++ /dev/null
@@ -1,67 +0,0 @@
-format = $format;
-  }
-  public function getFormat()
-  {
-    return $this->format;
-  }
-  public function setFrameRate($frameRate)
-  {
-    $this->frameRate = $frameRate;
-  }
-  public function getFrameRate()
-  {
-    return $this->frameRate;
-  }
-  public function setIngestionInfo(Google_Service_YouTube_IngestionInfo $ingestionInfo)
-  {
-    $this->ingestionInfo = $ingestionInfo;
-  }
-  public function getIngestionInfo()
-  {
-    return $this->ingestionInfo;
-  }
-  public function setIngestionType($ingestionType)
-  {
-    $this->ingestionType = $ingestionType;
-  }
-  public function getIngestionType()
-  {
-    return $this->ingestionType;
-  }
-  public function setResolution($resolution)
-  {
-    $this->resolution = $resolution;
-  }
-  public function getResolution()
-  {
-    return $this->resolution;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTube/Channel.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTube/Channel.php
deleted file mode 100644
index 9800cd59..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTube/Channel.php
+++ /dev/null
@@ -1,158 +0,0 @@
-auditDetails = $auditDetails;
-  }
-  public function getAuditDetails()
-  {
-    return $this->auditDetails;
-  }
-  public function setBrandingSettings(Google_Service_YouTube_ChannelBrandingSettings $brandingSettings)
-  {
-    $this->brandingSettings = $brandingSettings;
-  }
-  public function getBrandingSettings()
-  {
-    return $this->brandingSettings;
-  }
-  public function setContentDetails(Google_Service_YouTube_ChannelContentDetails $contentDetails)
-  {
-    $this->contentDetails = $contentDetails;
-  }
-  public function getContentDetails()
-  {
-    return $this->contentDetails;
-  }
-  public function setContentOwnerDetails(Google_Service_YouTube_ChannelContentOwnerDetails $contentOwnerDetails)
-  {
-    $this->contentOwnerDetails = $contentOwnerDetails;
-  }
-  public function getContentOwnerDetails()
-  {
-    return $this->contentOwnerDetails;
-  }
-  public function setConversionPings(Google_Service_YouTube_ChannelConversionPings $conversionPings)
-  {
-    $this->conversionPings = $conversionPings;
-  }
-  public function getConversionPings()
-  {
-    return $this->conversionPings;
-  }
-  public function setEtag($etag)
-  {
-    $this->etag = $etag;
-  }
-  public function getEtag()
-  {
-    return $this->etag;
-  }
-  public function setId($id)
-  {
-    $this->id = $id;
-  }
-  public function getId()
-  {
-    return $this->id;
-  }
-  public function setInvideoPromotion(Google_Service_YouTube_InvideoPromotion $invideoPromotion)
-  {
-    $this->invideoPromotion = $invideoPromotion;
-  }
-  public function getInvideoPromotion()
-  {
-    return $this->invideoPromotion;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setLocalizations($localizations)
-  {
-    $this->localizations = $localizations;
-  }
-  public function getLocalizations()
-  {
-    return $this->localizations;
-  }
-  public function setSnippet(Google_Service_YouTube_ChannelSnippet $snippet)
-  {
-    $this->snippet = $snippet;
-  }
-  public function getSnippet()
-  {
-    return $this->snippet;
-  }
-  public function setStatistics(Google_Service_YouTube_ChannelStatistics $statistics)
-  {
-    $this->statistics = $statistics;
-  }
-  public function getStatistics()
-  {
-    return $this->statistics;
-  }
-  public function setStatus(Google_Service_YouTube_ChannelStatus $status)
-  {
-    $this->status = $status;
-  }
-  public function getStatus()
-  {
-    return $this->status;
-  }
-  public function setTopicDetails(Google_Service_YouTube_ChannelTopicDetails $topicDetails)
-  {
-    $this->topicDetails = $topicDetails;
-  }
-  public function getTopicDetails()
-  {
-    return $this->topicDetails;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTube/ChannelAuditDetails.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTube/ChannelAuditDetails.php
deleted file mode 100644
index 2a6907cd..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTube/ChannelAuditDetails.php
+++ /dev/null
@@ -1,57 +0,0 @@
-communityGuidelinesGoodStanding = $communityGuidelinesGoodStanding;
-  }
-  public function getCommunityGuidelinesGoodStanding()
-  {
-    return $this->communityGuidelinesGoodStanding;
-  }
-  public function setContentIdClaimsGoodStanding($contentIdClaimsGoodStanding)
-  {
-    $this->contentIdClaimsGoodStanding = $contentIdClaimsGoodStanding;
-  }
-  public function getContentIdClaimsGoodStanding()
-  {
-    return $this->contentIdClaimsGoodStanding;
-  }
-  public function setCopyrightStrikesGoodStanding($copyrightStrikesGoodStanding)
-  {
-    $this->copyrightStrikesGoodStanding = $copyrightStrikesGoodStanding;
-  }
-  public function getCopyrightStrikesGoodStanding()
-  {
-    return $this->copyrightStrikesGoodStanding;
-  }
-  public function setOverallGoodStanding($overallGoodStanding)
-  {
-    $this->overallGoodStanding = $overallGoodStanding;
-  }
-  public function getOverallGoodStanding()
-  {
-    return $this->overallGoodStanding;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTube/ChannelBannerResource.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTube/ChannelBannerResource.php
deleted file mode 100644
index 58f48d58..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTube/ChannelBannerResource.php
+++ /dev/null
@@ -1,48 +0,0 @@
-etag = $etag;
-  }
-  public function getEtag()
-  {
-    return $this->etag;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setUrl($url)
-  {
-    $this->url = $url;
-  }
-  public function getUrl()
-  {
-    return $this->url;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTube/ChannelBrandingSettings.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTube/ChannelBrandingSettings.php
deleted file mode 100644
index e2d4a935..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTube/ChannelBrandingSettings.php
+++ /dev/null
@@ -1,62 +0,0 @@
-channel = $channel;
-  }
-  public function getChannel()
-  {
-    return $this->channel;
-  }
-  public function setHints($hints)
-  {
-    $this->hints = $hints;
-  }
-  public function getHints()
-  {
-    return $this->hints;
-  }
-  public function setImage(Google_Service_YouTube_ImageSettings $image)
-  {
-    $this->image = $image;
-  }
-  public function getImage()
-  {
-    return $this->image;
-  }
-  public function setWatch(Google_Service_YouTube_WatchSettings $watch)
-  {
-    $this->watch = $watch;
-  }
-  public function getWatch()
-  {
-    return $this->watch;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTube/ChannelContentDetails.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTube/ChannelContentDetails.php
deleted file mode 100644
index d397e718..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTube/ChannelContentDetails.php
+++ /dev/null
@@ -1,31 +0,0 @@
-relatedPlaylists = $relatedPlaylists;
-  }
-  public function getRelatedPlaylists()
-  {
-    return $this->relatedPlaylists;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTube/ChannelContentDetailsRelatedPlaylists.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTube/ChannelContentDetailsRelatedPlaylists.php
deleted file mode 100644
index efb14984..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTube/ChannelContentDetailsRelatedPlaylists.php
+++ /dev/null
@@ -1,66 +0,0 @@
-favorites = $favorites;
-  }
-  public function getFavorites()
-  {
-    return $this->favorites;
-  }
-  public function setLikes($likes)
-  {
-    $this->likes = $likes;
-  }
-  public function getLikes()
-  {
-    return $this->likes;
-  }
-  public function setUploads($uploads)
-  {
-    $this->uploads = $uploads;
-  }
-  public function getUploads()
-  {
-    return $this->uploads;
-  }
-  public function setWatchHistory($watchHistory)
-  {
-    $this->watchHistory = $watchHistory;
-  }
-  public function getWatchHistory()
-  {
-    return $this->watchHistory;
-  }
-  public function setWatchLater($watchLater)
-  {
-    $this->watchLater = $watchLater;
-  }
-  public function getWatchLater()
-  {
-    return $this->watchLater;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTube/ChannelContentOwnerDetails.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTube/ChannelContentOwnerDetails.php
deleted file mode 100644
index 0a0bfaf4..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTube/ChannelContentOwnerDetails.php
+++ /dev/null
@@ -1,39 +0,0 @@
-contentOwner = $contentOwner;
-  }
-  public function getContentOwner()
-  {
-    return $this->contentOwner;
-  }
-  public function setTimeLinked($timeLinked)
-  {
-    $this->timeLinked = $timeLinked;
-  }
-  public function getTimeLinked()
-  {
-    return $this->timeLinked;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTube/ChannelConversionPing.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTube/ChannelConversionPing.php
deleted file mode 100644
index 16cd26a8..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTube/ChannelConversionPing.php
+++ /dev/null
@@ -1,39 +0,0 @@
-context = $context;
-  }
-  public function getContext()
-  {
-    return $this->context;
-  }
-  public function setConversionUrl($conversionUrl)
-  {
-    $this->conversionUrl = $conversionUrl;
-  }
-  public function getConversionUrl()
-  {
-    return $this->conversionUrl;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTube/ChannelConversionPings.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTube/ChannelConversionPings.php
deleted file mode 100644
index 801e11bf..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTube/ChannelConversionPings.php
+++ /dev/null
@@ -1,32 +0,0 @@
-pings = $pings;
-  }
-  public function getPings()
-  {
-    return $this->pings;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTube/ChannelListResponse.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTube/ChannelListResponse.php
deleted file mode 100644
index 89f9d08d..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTube/ChannelListResponse.php
+++ /dev/null
@@ -1,106 +0,0 @@
-etag = $etag;
-  }
-  public function getEtag()
-  {
-    return $this->etag;
-  }
-  public function setEventId($eventId)
-  {
-    $this->eventId = $eventId;
-  }
-  public function getEventId()
-  {
-    return $this->eventId;
-  }
-  public function setItems($items)
-  {
-    $this->items = $items;
-  }
-  public function getItems()
-  {
-    return $this->items;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setNextPageToken($nextPageToken)
-  {
-    $this->nextPageToken = $nextPageToken;
-  }
-  public function getNextPageToken()
-  {
-    return $this->nextPageToken;
-  }
-  public function setPageInfo(Google_Service_YouTube_PageInfo $pageInfo)
-  {
-    $this->pageInfo = $pageInfo;
-  }
-  public function getPageInfo()
-  {
-    return $this->pageInfo;
-  }
-  public function setPrevPageToken($prevPageToken)
-  {
-    $this->prevPageToken = $prevPageToken;
-  }
-  public function getPrevPageToken()
-  {
-    return $this->prevPageToken;
-  }
-  public function setTokenPagination(Google_Service_YouTube_TokenPagination $tokenPagination)
-  {
-    $this->tokenPagination = $tokenPagination;
-  }
-  public function getTokenPagination()
-  {
-    return $this->tokenPagination;
-  }
-  public function setVisitorId($visitorId)
-  {
-    $this->visitorId = $visitorId;
-  }
-  public function getVisitorId()
-  {
-    return $this->visitorId;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTube/ChannelLocalization.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTube/ChannelLocalization.php
deleted file mode 100644
index 388ed7d6..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTube/ChannelLocalization.php
+++ /dev/null
@@ -1,39 +0,0 @@
-description = $description;
-  }
-  public function getDescription()
-  {
-    return $this->description;
-  }
-  public function setTitle($title)
-  {
-    $this->title = $title;
-  }
-  public function getTitle()
-  {
-    return $this->title;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTube/ChannelProfileDetails.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTube/ChannelProfileDetails.php
deleted file mode 100644
index ec10ae72..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTube/ChannelProfileDetails.php
+++ /dev/null
@@ -1,57 +0,0 @@
-channelId = $channelId;
-  }
-  public function getChannelId()
-  {
-    return $this->channelId;
-  }
-  public function setChannelUrl($channelUrl)
-  {
-    $this->channelUrl = $channelUrl;
-  }
-  public function getChannelUrl()
-  {
-    return $this->channelUrl;
-  }
-  public function setDisplayName($displayName)
-  {
-    $this->displayName = $displayName;
-  }
-  public function getDisplayName()
-  {
-    return $this->displayName;
-  }
-  public function setProfileImageUrl($profileImageUrl)
-  {
-    $this->profileImageUrl = $profileImageUrl;
-  }
-  public function getProfileImageUrl()
-  {
-    return $this->profileImageUrl;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTube/ChannelSection.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTube/ChannelSection.php
deleted file mode 100644
index 83218e96..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTube/ChannelSection.php
+++ /dev/null
@@ -1,88 +0,0 @@
-contentDetails = $contentDetails;
-  }
-  public function getContentDetails()
-  {
-    return $this->contentDetails;
-  }
-  public function setEtag($etag)
-  {
-    $this->etag = $etag;
-  }
-  public function getEtag()
-  {
-    return $this->etag;
-  }
-  public function setId($id)
-  {
-    $this->id = $id;
-  }
-  public function getId()
-  {
-    return $this->id;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setLocalizations($localizations)
-  {
-    $this->localizations = $localizations;
-  }
-  public function getLocalizations()
-  {
-    return $this->localizations;
-  }
-  public function setSnippet(Google_Service_YouTube_ChannelSectionSnippet $snippet)
-  {
-    $this->snippet = $snippet;
-  }
-  public function getSnippet()
-  {
-    return $this->snippet;
-  }
-  public function setTargeting(Google_Service_YouTube_ChannelSectionTargeting $targeting)
-  {
-    $this->targeting = $targeting;
-  }
-  public function getTargeting()
-  {
-    return $this->targeting;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTube/ChannelSectionContentDetails.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTube/ChannelSectionContentDetails.php
deleted file mode 100644
index 8bcb8e98..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTube/ChannelSectionContentDetails.php
+++ /dev/null
@@ -1,40 +0,0 @@
-channels = $channels;
-  }
-  public function getChannels()
-  {
-    return $this->channels;
-  }
-  public function setPlaylists($playlists)
-  {
-    $this->playlists = $playlists;
-  }
-  public function getPlaylists()
-  {
-    return $this->playlists;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTube/ChannelSectionListResponse.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTube/ChannelSectionListResponse.php
deleted file mode 100644
index eccac741..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTube/ChannelSectionListResponse.php
+++ /dev/null
@@ -1,68 +0,0 @@
-etag = $etag;
-  }
-  public function getEtag()
-  {
-    return $this->etag;
-  }
-  public function setEventId($eventId)
-  {
-    $this->eventId = $eventId;
-  }
-  public function getEventId()
-  {
-    return $this->eventId;
-  }
-  public function setItems($items)
-  {
-    $this->items = $items;
-  }
-  public function getItems()
-  {
-    return $this->items;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setVisitorId($visitorId)
-  {
-    $this->visitorId = $visitorId;
-  }
-  public function getVisitorId()
-  {
-    return $this->visitorId;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTube/ChannelSectionLocalization.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTube/ChannelSectionLocalization.php
deleted file mode 100644
index 6fb5e23a..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTube/ChannelSectionLocalization.php
+++ /dev/null
@@ -1,30 +0,0 @@
-title = $title;
-  }
-  public function getTitle()
-  {
-    return $this->title;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTube/ChannelSectionSnippet.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTube/ChannelSectionSnippet.php
deleted file mode 100644
index 3209a4c6..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTube/ChannelSectionSnippet.php
+++ /dev/null
@@ -1,85 +0,0 @@
-channelId = $channelId;
-  }
-  public function getChannelId()
-  {
-    return $this->channelId;
-  }
-  public function setDefaultLanguage($defaultLanguage)
-  {
-    $this->defaultLanguage = $defaultLanguage;
-  }
-  public function getDefaultLanguage()
-  {
-    return $this->defaultLanguage;
-  }
-  public function setLocalized(Google_Service_YouTube_ChannelSectionLocalization $localized)
-  {
-    $this->localized = $localized;
-  }
-  public function getLocalized()
-  {
-    return $this->localized;
-  }
-  public function setPosition($position)
-  {
-    $this->position = $position;
-  }
-  public function getPosition()
-  {
-    return $this->position;
-  }
-  public function setStyle($style)
-  {
-    $this->style = $style;
-  }
-  public function getStyle()
-  {
-    return $this->style;
-  }
-  public function setTitle($title)
-  {
-    $this->title = $title;
-  }
-  public function getTitle()
-  {
-    return $this->title;
-  }
-  public function setType($type)
-  {
-    $this->type = $type;
-  }
-  public function getType()
-  {
-    return $this->type;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTube/ChannelSectionTargeting.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTube/ChannelSectionTargeting.php
deleted file mode 100644
index f72036bf..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTube/ChannelSectionTargeting.php
+++ /dev/null
@@ -1,49 +0,0 @@
-countries = $countries;
-  }
-  public function getCountries()
-  {
-    return $this->countries;
-  }
-  public function setLanguages($languages)
-  {
-    $this->languages = $languages;
-  }
-  public function getLanguages()
-  {
-    return $this->languages;
-  }
-  public function setRegions($regions)
-  {
-    $this->regions = $regions;
-  }
-  public function getRegions()
-  {
-    return $this->regions;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTube/ChannelSettings.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTube/ChannelSettings.php
deleted file mode 100644
index 24669344..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTube/ChannelSettings.php
+++ /dev/null
@@ -1,148 +0,0 @@
-country = $country;
-  }
-  public function getCountry()
-  {
-    return $this->country;
-  }
-  public function setDefaultLanguage($defaultLanguage)
-  {
-    $this->defaultLanguage = $defaultLanguage;
-  }
-  public function getDefaultLanguage()
-  {
-    return $this->defaultLanguage;
-  }
-  public function setDefaultTab($defaultTab)
-  {
-    $this->defaultTab = $defaultTab;
-  }
-  public function getDefaultTab()
-  {
-    return $this->defaultTab;
-  }
-  public function setDescription($description)
-  {
-    $this->description = $description;
-  }
-  public function getDescription()
-  {
-    return $this->description;
-  }
-  public function setFeaturedChannelsTitle($featuredChannelsTitle)
-  {
-    $this->featuredChannelsTitle = $featuredChannelsTitle;
-  }
-  public function getFeaturedChannelsTitle()
-  {
-    return $this->featuredChannelsTitle;
-  }
-  public function setFeaturedChannelsUrls($featuredChannelsUrls)
-  {
-    $this->featuredChannelsUrls = $featuredChannelsUrls;
-  }
-  public function getFeaturedChannelsUrls()
-  {
-    return $this->featuredChannelsUrls;
-  }
-  public function setKeywords($keywords)
-  {
-    $this->keywords = $keywords;
-  }
-  public function getKeywords()
-  {
-    return $this->keywords;
-  }
-  public function setModerateComments($moderateComments)
-  {
-    $this->moderateComments = $moderateComments;
-  }
-  public function getModerateComments()
-  {
-    return $this->moderateComments;
-  }
-  public function setProfileColor($profileColor)
-  {
-    $this->profileColor = $profileColor;
-  }
-  public function getProfileColor()
-  {
-    return $this->profileColor;
-  }
-  public function setShowBrowseView($showBrowseView)
-  {
-    $this->showBrowseView = $showBrowseView;
-  }
-  public function getShowBrowseView()
-  {
-    return $this->showBrowseView;
-  }
-  public function setShowRelatedChannels($showRelatedChannels)
-  {
-    $this->showRelatedChannels = $showRelatedChannels;
-  }
-  public function getShowRelatedChannels()
-  {
-    return $this->showRelatedChannels;
-  }
-  public function setTitle($title)
-  {
-    $this->title = $title;
-  }
-  public function getTitle()
-  {
-    return $this->title;
-  }
-  public function setTrackingAnalyticsAccountId($trackingAnalyticsAccountId)
-  {
-    $this->trackingAnalyticsAccountId = $trackingAnalyticsAccountId;
-  }
-  public function getTrackingAnalyticsAccountId()
-  {
-    return $this->trackingAnalyticsAccountId;
-  }
-  public function setUnsubscribedTrailer($unsubscribedTrailer)
-  {
-    $this->unsubscribedTrailer = $unsubscribedTrailer;
-  }
-  public function getUnsubscribedTrailer()
-  {
-    return $this->unsubscribedTrailer;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTube/ChannelSnippet.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTube/ChannelSnippet.php
deleted file mode 100644
index 318d3b45..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTube/ChannelSnippet.php
+++ /dev/null
@@ -1,95 +0,0 @@
-country = $country;
-  }
-  public function getCountry()
-  {
-    return $this->country;
-  }
-  public function setCustomUrl($customUrl)
-  {
-    $this->customUrl = $customUrl;
-  }
-  public function getCustomUrl()
-  {
-    return $this->customUrl;
-  }
-  public function setDefaultLanguage($defaultLanguage)
-  {
-    $this->defaultLanguage = $defaultLanguage;
-  }
-  public function getDefaultLanguage()
-  {
-    return $this->defaultLanguage;
-  }
-  public function setDescription($description)
-  {
-    $this->description = $description;
-  }
-  public function getDescription()
-  {
-    return $this->description;
-  }
-  public function setLocalized(Google_Service_YouTube_ChannelLocalization $localized)
-  {
-    $this->localized = $localized;
-  }
-  public function getLocalized()
-  {
-    return $this->localized;
-  }
-  public function setPublishedAt($publishedAt)
-  {
-    $this->publishedAt = $publishedAt;
-  }
-  public function getPublishedAt()
-  {
-    return $this->publishedAt;
-  }
-  public function setThumbnails(Google_Service_YouTube_ThumbnailDetails $thumbnails)
-  {
-    $this->thumbnails = $thumbnails;
-  }
-  public function getThumbnails()
-  {
-    return $this->thumbnails;
-  }
-  public function setTitle($title)
-  {
-    $this->title = $title;
-  }
-  public function getTitle()
-  {
-    return $this->title;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTube/ChannelStatistics.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTube/ChannelStatistics.php
deleted file mode 100644
index f5c07786..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTube/ChannelStatistics.php
+++ /dev/null
@@ -1,66 +0,0 @@
-commentCount = $commentCount;
-  }
-  public function getCommentCount()
-  {
-    return $this->commentCount;
-  }
-  public function setHiddenSubscriberCount($hiddenSubscriberCount)
-  {
-    $this->hiddenSubscriberCount = $hiddenSubscriberCount;
-  }
-  public function getHiddenSubscriberCount()
-  {
-    return $this->hiddenSubscriberCount;
-  }
-  public function setSubscriberCount($subscriberCount)
-  {
-    $this->subscriberCount = $subscriberCount;
-  }
-  public function getSubscriberCount()
-  {
-    return $this->subscriberCount;
-  }
-  public function setVideoCount($videoCount)
-  {
-    $this->videoCount = $videoCount;
-  }
-  public function getVideoCount()
-  {
-    return $this->videoCount;
-  }
-  public function setViewCount($viewCount)
-  {
-    $this->viewCount = $viewCount;
-  }
-  public function getViewCount()
-  {
-    return $this->viewCount;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTube/ChannelStatus.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTube/ChannelStatus.php
deleted file mode 100644
index ff4bcaaf..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTube/ChannelStatus.php
+++ /dev/null
@@ -1,48 +0,0 @@
-isLinked = $isLinked;
-  }
-  public function getIsLinked()
-  {
-    return $this->isLinked;
-  }
-  public function setLongUploadsStatus($longUploadsStatus)
-  {
-    $this->longUploadsStatus = $longUploadsStatus;
-  }
-  public function getLongUploadsStatus()
-  {
-    return $this->longUploadsStatus;
-  }
-  public function setPrivacyStatus($privacyStatus)
-  {
-    $this->privacyStatus = $privacyStatus;
-  }
-  public function getPrivacyStatus()
-  {
-    return $this->privacyStatus;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTube/ChannelTopicDetails.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTube/ChannelTopicDetails.php
deleted file mode 100644
index 8c2b336c..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTube/ChannelTopicDetails.php
+++ /dev/null
@@ -1,40 +0,0 @@
-topicCategories = $topicCategories;
-  }
-  public function getTopicCategories()
-  {
-    return $this->topicCategories;
-  }
-  public function setTopicIds($topicIds)
-  {
-    $this->topicIds = $topicIds;
-  }
-  public function getTopicIds()
-  {
-    return $this->topicIds;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTube/Comment.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTube/Comment.php
deleted file mode 100644
index f0bc3332..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTube/Comment.php
+++ /dev/null
@@ -1,58 +0,0 @@
-etag = $etag;
-  }
-  public function getEtag()
-  {
-    return $this->etag;
-  }
-  public function setId($id)
-  {
-    $this->id = $id;
-  }
-  public function getId()
-  {
-    return $this->id;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setSnippet(Google_Service_YouTube_CommentSnippet $snippet)
-  {
-    $this->snippet = $snippet;
-  }
-  public function getSnippet()
-  {
-    return $this->snippet;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTube/CommentListResponse.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTube/CommentListResponse.php
deleted file mode 100644
index 710a32e5..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTube/CommentListResponse.php
+++ /dev/null
@@ -1,97 +0,0 @@
-etag = $etag;
-  }
-  public function getEtag()
-  {
-    return $this->etag;
-  }
-  public function setEventId($eventId)
-  {
-    $this->eventId = $eventId;
-  }
-  public function getEventId()
-  {
-    return $this->eventId;
-  }
-  public function setItems($items)
-  {
-    $this->items = $items;
-  }
-  public function getItems()
-  {
-    return $this->items;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setNextPageToken($nextPageToken)
-  {
-    $this->nextPageToken = $nextPageToken;
-  }
-  public function getNextPageToken()
-  {
-    return $this->nextPageToken;
-  }
-  public function setPageInfo(Google_Service_YouTube_PageInfo $pageInfo)
-  {
-    $this->pageInfo = $pageInfo;
-  }
-  public function getPageInfo()
-  {
-    return $this->pageInfo;
-  }
-  public function setTokenPagination(Google_Service_YouTube_TokenPagination $tokenPagination)
-  {
-    $this->tokenPagination = $tokenPagination;
-  }
-  public function getTokenPagination()
-  {
-    return $this->tokenPagination;
-  }
-  public function setVisitorId($visitorId)
-  {
-    $this->visitorId = $visitorId;
-  }
-  public function getVisitorId()
-  {
-    return $this->visitorId;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTube/CommentSnippet.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTube/CommentSnippet.php
deleted file mode 100644
index 8f44790a..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTube/CommentSnippet.php
+++ /dev/null
@@ -1,156 +0,0 @@
-authorChannelId = $authorChannelId;
-  }
-  public function getAuthorChannelId()
-  {
-    return $this->authorChannelId;
-  }
-  public function setAuthorChannelUrl($authorChannelUrl)
-  {
-    $this->authorChannelUrl = $authorChannelUrl;
-  }
-  public function getAuthorChannelUrl()
-  {
-    return $this->authorChannelUrl;
-  }
-  public function setAuthorDisplayName($authorDisplayName)
-  {
-    $this->authorDisplayName = $authorDisplayName;
-  }
-  public function getAuthorDisplayName()
-  {
-    return $this->authorDisplayName;
-  }
-  public function setAuthorProfileImageUrl($authorProfileImageUrl)
-  {
-    $this->authorProfileImageUrl = $authorProfileImageUrl;
-  }
-  public function getAuthorProfileImageUrl()
-  {
-    return $this->authorProfileImageUrl;
-  }
-  public function setCanRate($canRate)
-  {
-    $this->canRate = $canRate;
-  }
-  public function getCanRate()
-  {
-    return $this->canRate;
-  }
-  public function setChannelId($channelId)
-  {
-    $this->channelId = $channelId;
-  }
-  public function getChannelId()
-  {
-    return $this->channelId;
-  }
-  public function setLikeCount($likeCount)
-  {
-    $this->likeCount = $likeCount;
-  }
-  public function getLikeCount()
-  {
-    return $this->likeCount;
-  }
-  public function setModerationStatus($moderationStatus)
-  {
-    $this->moderationStatus = $moderationStatus;
-  }
-  public function getModerationStatus()
-  {
-    return $this->moderationStatus;
-  }
-  public function setParentId($parentId)
-  {
-    $this->parentId = $parentId;
-  }
-  public function getParentId()
-  {
-    return $this->parentId;
-  }
-  public function setPublishedAt($publishedAt)
-  {
-    $this->publishedAt = $publishedAt;
-  }
-  public function getPublishedAt()
-  {
-    return $this->publishedAt;
-  }
-  public function setTextDisplay($textDisplay)
-  {
-    $this->textDisplay = $textDisplay;
-  }
-  public function getTextDisplay()
-  {
-    return $this->textDisplay;
-  }
-  public function setTextOriginal($textOriginal)
-  {
-    $this->textOriginal = $textOriginal;
-  }
-  public function getTextOriginal()
-  {
-    return $this->textOriginal;
-  }
-  public function setUpdatedAt($updatedAt)
-  {
-    $this->updatedAt = $updatedAt;
-  }
-  public function getUpdatedAt()
-  {
-    return $this->updatedAt;
-  }
-  public function setVideoId($videoId)
-  {
-    $this->videoId = $videoId;
-  }
-  public function getVideoId()
-  {
-    return $this->videoId;
-  }
-  public function setViewerRating($viewerRating)
-  {
-    $this->viewerRating = $viewerRating;
-  }
-  public function getViewerRating()
-  {
-    return $this->viewerRating;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTube/CommentThread.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTube/CommentThread.php
deleted file mode 100644
index f5e85fae..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTube/CommentThread.php
+++ /dev/null
@@ -1,68 +0,0 @@
-etag = $etag;
-  }
-  public function getEtag()
-  {
-    return $this->etag;
-  }
-  public function setId($id)
-  {
-    $this->id = $id;
-  }
-  public function getId()
-  {
-    return $this->id;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setReplies(Google_Service_YouTube_CommentThreadReplies $replies)
-  {
-    $this->replies = $replies;
-  }
-  public function getReplies()
-  {
-    return $this->replies;
-  }
-  public function setSnippet(Google_Service_YouTube_CommentThreadSnippet $snippet)
-  {
-    $this->snippet = $snippet;
-  }
-  public function getSnippet()
-  {
-    return $this->snippet;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTube/CommentThreadListResponse.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTube/CommentThreadListResponse.php
deleted file mode 100644
index eeab0f03..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTube/CommentThreadListResponse.php
+++ /dev/null
@@ -1,97 +0,0 @@
-etag = $etag;
-  }
-  public function getEtag()
-  {
-    return $this->etag;
-  }
-  public function setEventId($eventId)
-  {
-    $this->eventId = $eventId;
-  }
-  public function getEventId()
-  {
-    return $this->eventId;
-  }
-  public function setItems($items)
-  {
-    $this->items = $items;
-  }
-  public function getItems()
-  {
-    return $this->items;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setNextPageToken($nextPageToken)
-  {
-    $this->nextPageToken = $nextPageToken;
-  }
-  public function getNextPageToken()
-  {
-    return $this->nextPageToken;
-  }
-  public function setPageInfo(Google_Service_YouTube_PageInfo $pageInfo)
-  {
-    $this->pageInfo = $pageInfo;
-  }
-  public function getPageInfo()
-  {
-    return $this->pageInfo;
-  }
-  public function setTokenPagination(Google_Service_YouTube_TokenPagination $tokenPagination)
-  {
-    $this->tokenPagination = $tokenPagination;
-  }
-  public function getTokenPagination()
-  {
-    return $this->tokenPagination;
-  }
-  public function setVisitorId($visitorId)
-  {
-    $this->visitorId = $visitorId;
-  }
-  public function getVisitorId()
-  {
-    return $this->visitorId;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTube/CommentThreadReplies.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTube/CommentThreadReplies.php
deleted file mode 100644
index 1077c6b3..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTube/CommentThreadReplies.php
+++ /dev/null
@@ -1,32 +0,0 @@
-comments = $comments;
-  }
-  public function getComments()
-  {
-    return $this->comments;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTube/CommentThreadSnippet.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTube/CommentThreadSnippet.php
deleted file mode 100644
index 21f22ade..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTube/CommentThreadSnippet.php
+++ /dev/null
@@ -1,76 +0,0 @@
-canReply = $canReply;
-  }
-  public function getCanReply()
-  {
-    return $this->canReply;
-  }
-  public function setChannelId($channelId)
-  {
-    $this->channelId = $channelId;
-  }
-  public function getChannelId()
-  {
-    return $this->channelId;
-  }
-  public function setIsPublic($isPublic)
-  {
-    $this->isPublic = $isPublic;
-  }
-  public function getIsPublic()
-  {
-    return $this->isPublic;
-  }
-  public function setTopLevelComment(Google_Service_YouTube_Comment $topLevelComment)
-  {
-    $this->topLevelComment = $topLevelComment;
-  }
-  public function getTopLevelComment()
-  {
-    return $this->topLevelComment;
-  }
-  public function setTotalReplyCount($totalReplyCount)
-  {
-    $this->totalReplyCount = $totalReplyCount;
-  }
-  public function getTotalReplyCount()
-  {
-    return $this->totalReplyCount;
-  }
-  public function setVideoId($videoId)
-  {
-    $this->videoId = $videoId;
-  }
-  public function getVideoId()
-  {
-    return $this->videoId;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTube/ContentRating.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTube/ContentRating.php
deleted file mode 100644
index 77652392..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTube/ContentRating.php
+++ /dev/null
@@ -1,634 +0,0 @@
-acbRating = $acbRating;
-  }
-  public function getAcbRating()
-  {
-    return $this->acbRating;
-  }
-  public function setAgcomRating($agcomRating)
-  {
-    $this->agcomRating = $agcomRating;
-  }
-  public function getAgcomRating()
-  {
-    return $this->agcomRating;
-  }
-  public function setAnatelRating($anatelRating)
-  {
-    $this->anatelRating = $anatelRating;
-  }
-  public function getAnatelRating()
-  {
-    return $this->anatelRating;
-  }
-  public function setBbfcRating($bbfcRating)
-  {
-    $this->bbfcRating = $bbfcRating;
-  }
-  public function getBbfcRating()
-  {
-    return $this->bbfcRating;
-  }
-  public function setBfvcRating($bfvcRating)
-  {
-    $this->bfvcRating = $bfvcRating;
-  }
-  public function getBfvcRating()
-  {
-    return $this->bfvcRating;
-  }
-  public function setBmukkRating($bmukkRating)
-  {
-    $this->bmukkRating = $bmukkRating;
-  }
-  public function getBmukkRating()
-  {
-    return $this->bmukkRating;
-  }
-  public function setCatvRating($catvRating)
-  {
-    $this->catvRating = $catvRating;
-  }
-  public function getCatvRating()
-  {
-    return $this->catvRating;
-  }
-  public function setCatvfrRating($catvfrRating)
-  {
-    $this->catvfrRating = $catvfrRating;
-  }
-  public function getCatvfrRating()
-  {
-    return $this->catvfrRating;
-  }
-  public function setCbfcRating($cbfcRating)
-  {
-    $this->cbfcRating = $cbfcRating;
-  }
-  public function getCbfcRating()
-  {
-    return $this->cbfcRating;
-  }
-  public function setCccRating($cccRating)
-  {
-    $this->cccRating = $cccRating;
-  }
-  public function getCccRating()
-  {
-    return $this->cccRating;
-  }
-  public function setCceRating($cceRating)
-  {
-    $this->cceRating = $cceRating;
-  }
-  public function getCceRating()
-  {
-    return $this->cceRating;
-  }
-  public function setChfilmRating($chfilmRating)
-  {
-    $this->chfilmRating = $chfilmRating;
-  }
-  public function getChfilmRating()
-  {
-    return $this->chfilmRating;
-  }
-  public function setChvrsRating($chvrsRating)
-  {
-    $this->chvrsRating = $chvrsRating;
-  }
-  public function getChvrsRating()
-  {
-    return $this->chvrsRating;
-  }
-  public function setCicfRating($cicfRating)
-  {
-    $this->cicfRating = $cicfRating;
-  }
-  public function getCicfRating()
-  {
-    return $this->cicfRating;
-  }
-  public function setCnaRating($cnaRating)
-  {
-    $this->cnaRating = $cnaRating;
-  }
-  public function getCnaRating()
-  {
-    return $this->cnaRating;
-  }
-  public function setCncRating($cncRating)
-  {
-    $this->cncRating = $cncRating;
-  }
-  public function getCncRating()
-  {
-    return $this->cncRating;
-  }
-  public function setCsaRating($csaRating)
-  {
-    $this->csaRating = $csaRating;
-  }
-  public function getCsaRating()
-  {
-    return $this->csaRating;
-  }
-  public function setCscfRating($cscfRating)
-  {
-    $this->cscfRating = $cscfRating;
-  }
-  public function getCscfRating()
-  {
-    return $this->cscfRating;
-  }
-  public function setCzfilmRating($czfilmRating)
-  {
-    $this->czfilmRating = $czfilmRating;
-  }
-  public function getCzfilmRating()
-  {
-    return $this->czfilmRating;
-  }
-  public function setDjctqRating($djctqRating)
-  {
-    $this->djctqRating = $djctqRating;
-  }
-  public function getDjctqRating()
-  {
-    return $this->djctqRating;
-  }
-  public function setDjctqRatingReasons($djctqRatingReasons)
-  {
-    $this->djctqRatingReasons = $djctqRatingReasons;
-  }
-  public function getDjctqRatingReasons()
-  {
-    return $this->djctqRatingReasons;
-  }
-  public function setEcbmctRating($ecbmctRating)
-  {
-    $this->ecbmctRating = $ecbmctRating;
-  }
-  public function getEcbmctRating()
-  {
-    return $this->ecbmctRating;
-  }
-  public function setEefilmRating($eefilmRating)
-  {
-    $this->eefilmRating = $eefilmRating;
-  }
-  public function getEefilmRating()
-  {
-    return $this->eefilmRating;
-  }
-  public function setEgfilmRating($egfilmRating)
-  {
-    $this->egfilmRating = $egfilmRating;
-  }
-  public function getEgfilmRating()
-  {
-    return $this->egfilmRating;
-  }
-  public function setEirinRating($eirinRating)
-  {
-    $this->eirinRating = $eirinRating;
-  }
-  public function getEirinRating()
-  {
-    return $this->eirinRating;
-  }
-  public function setFcbmRating($fcbmRating)
-  {
-    $this->fcbmRating = $fcbmRating;
-  }
-  public function getFcbmRating()
-  {
-    return $this->fcbmRating;
-  }
-  public function setFcoRating($fcoRating)
-  {
-    $this->fcoRating = $fcoRating;
-  }
-  public function getFcoRating()
-  {
-    return $this->fcoRating;
-  }
-  public function setFmocRating($fmocRating)
-  {
-    $this->fmocRating = $fmocRating;
-  }
-  public function getFmocRating()
-  {
-    return $this->fmocRating;
-  }
-  public function setFpbRating($fpbRating)
-  {
-    $this->fpbRating = $fpbRating;
-  }
-  public function getFpbRating()
-  {
-    return $this->fpbRating;
-  }
-  public function setFpbRatingReasons($fpbRatingReasons)
-  {
-    $this->fpbRatingReasons = $fpbRatingReasons;
-  }
-  public function getFpbRatingReasons()
-  {
-    return $this->fpbRatingReasons;
-  }
-  public function setFskRating($fskRating)
-  {
-    $this->fskRating = $fskRating;
-  }
-  public function getFskRating()
-  {
-    return $this->fskRating;
-  }
-  public function setGrfilmRating($grfilmRating)
-  {
-    $this->grfilmRating = $grfilmRating;
-  }
-  public function getGrfilmRating()
-  {
-    return $this->grfilmRating;
-  }
-  public function setIcaaRating($icaaRating)
-  {
-    $this->icaaRating = $icaaRating;
-  }
-  public function getIcaaRating()
-  {
-    return $this->icaaRating;
-  }
-  public function setIfcoRating($ifcoRating)
-  {
-    $this->ifcoRating = $ifcoRating;
-  }
-  public function getIfcoRating()
-  {
-    return $this->ifcoRating;
-  }
-  public function setIlfilmRating($ilfilmRating)
-  {
-    $this->ilfilmRating = $ilfilmRating;
-  }
-  public function getIlfilmRating()
-  {
-    return $this->ilfilmRating;
-  }
-  public function setIncaaRating($incaaRating)
-  {
-    $this->incaaRating = $incaaRating;
-  }
-  public function getIncaaRating()
-  {
-    return $this->incaaRating;
-  }
-  public function setKfcbRating($kfcbRating)
-  {
-    $this->kfcbRating = $kfcbRating;
-  }
-  public function getKfcbRating()
-  {
-    return $this->kfcbRating;
-  }
-  public function setKijkwijzerRating($kijkwijzerRating)
-  {
-    $this->kijkwijzerRating = $kijkwijzerRating;
-  }
-  public function getKijkwijzerRating()
-  {
-    return $this->kijkwijzerRating;
-  }
-  public function setKmrbRating($kmrbRating)
-  {
-    $this->kmrbRating = $kmrbRating;
-  }
-  public function getKmrbRating()
-  {
-    return $this->kmrbRating;
-  }
-  public function setLsfRating($lsfRating)
-  {
-    $this->lsfRating = $lsfRating;
-  }
-  public function getLsfRating()
-  {
-    return $this->lsfRating;
-  }
-  public function setMccaaRating($mccaaRating)
-  {
-    $this->mccaaRating = $mccaaRating;
-  }
-  public function getMccaaRating()
-  {
-    return $this->mccaaRating;
-  }
-  public function setMccypRating($mccypRating)
-  {
-    $this->mccypRating = $mccypRating;
-  }
-  public function getMccypRating()
-  {
-    return $this->mccypRating;
-  }
-  public function setMcstRating($mcstRating)
-  {
-    $this->mcstRating = $mcstRating;
-  }
-  public function getMcstRating()
-  {
-    return $this->mcstRating;
-  }
-  public function setMdaRating($mdaRating)
-  {
-    $this->mdaRating = $mdaRating;
-  }
-  public function getMdaRating()
-  {
-    return $this->mdaRating;
-  }
-  public function setMedietilsynetRating($medietilsynetRating)
-  {
-    $this->medietilsynetRating = $medietilsynetRating;
-  }
-  public function getMedietilsynetRating()
-  {
-    return $this->medietilsynetRating;
-  }
-  public function setMekuRating($mekuRating)
-  {
-    $this->mekuRating = $mekuRating;
-  }
-  public function getMekuRating()
-  {
-    return $this->mekuRating;
-  }
-  public function setMibacRating($mibacRating)
-  {
-    $this->mibacRating = $mibacRating;
-  }
-  public function getMibacRating()
-  {
-    return $this->mibacRating;
-  }
-  public function setMocRating($mocRating)
-  {
-    $this->mocRating = $mocRating;
-  }
-  public function getMocRating()
-  {
-    return $this->mocRating;
-  }
-  public function setMoctwRating($moctwRating)
-  {
-    $this->moctwRating = $moctwRating;
-  }
-  public function getMoctwRating()
-  {
-    return $this->moctwRating;
-  }
-  public function setMpaaRating($mpaaRating)
-  {
-    $this->mpaaRating = $mpaaRating;
-  }
-  public function getMpaaRating()
-  {
-    return $this->mpaaRating;
-  }
-  public function setMtrcbRating($mtrcbRating)
-  {
-    $this->mtrcbRating = $mtrcbRating;
-  }
-  public function getMtrcbRating()
-  {
-    return $this->mtrcbRating;
-  }
-  public function setNbcRating($nbcRating)
-  {
-    $this->nbcRating = $nbcRating;
-  }
-  public function getNbcRating()
-  {
-    return $this->nbcRating;
-  }
-  public function setNbcplRating($nbcplRating)
-  {
-    $this->nbcplRating = $nbcplRating;
-  }
-  public function getNbcplRating()
-  {
-    return $this->nbcplRating;
-  }
-  public function setNfrcRating($nfrcRating)
-  {
-    $this->nfrcRating = $nfrcRating;
-  }
-  public function getNfrcRating()
-  {
-    return $this->nfrcRating;
-  }
-  public function setNfvcbRating($nfvcbRating)
-  {
-    $this->nfvcbRating = $nfvcbRating;
-  }
-  public function getNfvcbRating()
-  {
-    return $this->nfvcbRating;
-  }
-  public function setNkclvRating($nkclvRating)
-  {
-    $this->nkclvRating = $nkclvRating;
-  }
-  public function getNkclvRating()
-  {
-    return $this->nkclvRating;
-  }
-  public function setOflcRating($oflcRating)
-  {
-    $this->oflcRating = $oflcRating;
-  }
-  public function getOflcRating()
-  {
-    return $this->oflcRating;
-  }
-  public function setPefilmRating($pefilmRating)
-  {
-    $this->pefilmRating = $pefilmRating;
-  }
-  public function getPefilmRating()
-  {
-    return $this->pefilmRating;
-  }
-  public function setRcnofRating($rcnofRating)
-  {
-    $this->rcnofRating = $rcnofRating;
-  }
-  public function getRcnofRating()
-  {
-    return $this->rcnofRating;
-  }
-  public function setResorteviolenciaRating($resorteviolenciaRating)
-  {
-    $this->resorteviolenciaRating = $resorteviolenciaRating;
-  }
-  public function getResorteviolenciaRating()
-  {
-    return $this->resorteviolenciaRating;
-  }
-  public function setRtcRating($rtcRating)
-  {
-    $this->rtcRating = $rtcRating;
-  }
-  public function getRtcRating()
-  {
-    return $this->rtcRating;
-  }
-  public function setRteRating($rteRating)
-  {
-    $this->rteRating = $rteRating;
-  }
-  public function getRteRating()
-  {
-    return $this->rteRating;
-  }
-  public function setRussiaRating($russiaRating)
-  {
-    $this->russiaRating = $russiaRating;
-  }
-  public function getRussiaRating()
-  {
-    return $this->russiaRating;
-  }
-  public function setSkfilmRating($skfilmRating)
-  {
-    $this->skfilmRating = $skfilmRating;
-  }
-  public function getSkfilmRating()
-  {
-    return $this->skfilmRating;
-  }
-  public function setSmaisRating($smaisRating)
-  {
-    $this->smaisRating = $smaisRating;
-  }
-  public function getSmaisRating()
-  {
-    return $this->smaisRating;
-  }
-  public function setSmsaRating($smsaRating)
-  {
-    $this->smsaRating = $smsaRating;
-  }
-  public function getSmsaRating()
-  {
-    return $this->smsaRating;
-  }
-  public function setTvpgRating($tvpgRating)
-  {
-    $this->tvpgRating = $tvpgRating;
-  }
-  public function getTvpgRating()
-  {
-    return $this->tvpgRating;
-  }
-  public function setYtRating($ytRating)
-  {
-    $this->ytRating = $ytRating;
-  }
-  public function getYtRating()
-  {
-    return $this->ytRating;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTube/FanFundingEvent.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTube/FanFundingEvent.php
deleted file mode 100644
index 77d04b03..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTube/FanFundingEvent.php
+++ /dev/null
@@ -1,58 +0,0 @@
-etag = $etag;
-  }
-  public function getEtag()
-  {
-    return $this->etag;
-  }
-  public function setId($id)
-  {
-    $this->id = $id;
-  }
-  public function getId()
-  {
-    return $this->id;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setSnippet(Google_Service_YouTube_FanFundingEventSnippet $snippet)
-  {
-    $this->snippet = $snippet;
-  }
-  public function getSnippet()
-  {
-    return $this->snippet;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTube/FanFundingEventListResponse.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTube/FanFundingEventListResponse.php
deleted file mode 100644
index 46ddef64..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTube/FanFundingEventListResponse.php
+++ /dev/null
@@ -1,97 +0,0 @@
-etag = $etag;
-  }
-  public function getEtag()
-  {
-    return $this->etag;
-  }
-  public function setEventId($eventId)
-  {
-    $this->eventId = $eventId;
-  }
-  public function getEventId()
-  {
-    return $this->eventId;
-  }
-  public function setItems($items)
-  {
-    $this->items = $items;
-  }
-  public function getItems()
-  {
-    return $this->items;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setNextPageToken($nextPageToken)
-  {
-    $this->nextPageToken = $nextPageToken;
-  }
-  public function getNextPageToken()
-  {
-    return $this->nextPageToken;
-  }
-  public function setPageInfo(Google_Service_YouTube_PageInfo $pageInfo)
-  {
-    $this->pageInfo = $pageInfo;
-  }
-  public function getPageInfo()
-  {
-    return $this->pageInfo;
-  }
-  public function setTokenPagination(Google_Service_YouTube_TokenPagination $tokenPagination)
-  {
-    $this->tokenPagination = $tokenPagination;
-  }
-  public function getTokenPagination()
-  {
-    return $this->tokenPagination;
-  }
-  public function setVisitorId($visitorId)
-  {
-    $this->visitorId = $visitorId;
-  }
-  public function getVisitorId()
-  {
-    return $this->visitorId;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTube/FanFundingEventSnippet.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTube/FanFundingEventSnippet.php
deleted file mode 100644
index 4006cd74..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTube/FanFundingEventSnippet.php
+++ /dev/null
@@ -1,85 +0,0 @@
-amountMicros = $amountMicros;
-  }
-  public function getAmountMicros()
-  {
-    return $this->amountMicros;
-  }
-  public function setChannelId($channelId)
-  {
-    $this->channelId = $channelId;
-  }
-  public function getChannelId()
-  {
-    return $this->channelId;
-  }
-  public function setCommentText($commentText)
-  {
-    $this->commentText = $commentText;
-  }
-  public function getCommentText()
-  {
-    return $this->commentText;
-  }
-  public function setCreatedAt($createdAt)
-  {
-    $this->createdAt = $createdAt;
-  }
-  public function getCreatedAt()
-  {
-    return $this->createdAt;
-  }
-  public function setCurrency($currency)
-  {
-    $this->currency = $currency;
-  }
-  public function getCurrency()
-  {
-    return $this->currency;
-  }
-  public function setDisplayString($displayString)
-  {
-    $this->displayString = $displayString;
-  }
-  public function getDisplayString()
-  {
-    return $this->displayString;
-  }
-  public function setSupporterDetails(Google_Service_YouTube_ChannelProfileDetails $supporterDetails)
-  {
-    $this->supporterDetails = $supporterDetails;
-  }
-  public function getSupporterDetails()
-  {
-    return $this->supporterDetails;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTube/GeoPoint.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTube/GeoPoint.php
deleted file mode 100644
index b80b0367..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTube/GeoPoint.php
+++ /dev/null
@@ -1,48 +0,0 @@
-altitude = $altitude;
-  }
-  public function getAltitude()
-  {
-    return $this->altitude;
-  }
-  public function setLatitude($latitude)
-  {
-    $this->latitude = $latitude;
-  }
-  public function getLatitude()
-  {
-    return $this->latitude;
-  }
-  public function setLongitude($longitude)
-  {
-    $this->longitude = $longitude;
-  }
-  public function getLongitude()
-  {
-    return $this->longitude;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTube/GuideCategory.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTube/GuideCategory.php
deleted file mode 100644
index e5ab0fa0..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTube/GuideCategory.php
+++ /dev/null
@@ -1,58 +0,0 @@
-etag = $etag;
-  }
-  public function getEtag()
-  {
-    return $this->etag;
-  }
-  public function setId($id)
-  {
-    $this->id = $id;
-  }
-  public function getId()
-  {
-    return $this->id;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setSnippet(Google_Service_YouTube_GuideCategorySnippet $snippet)
-  {
-    $this->snippet = $snippet;
-  }
-  public function getSnippet()
-  {
-    return $this->snippet;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTube/GuideCategoryListResponse.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTube/GuideCategoryListResponse.php
deleted file mode 100644
index 74b7c53a..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTube/GuideCategoryListResponse.php
+++ /dev/null
@@ -1,106 +0,0 @@
-etag = $etag;
-  }
-  public function getEtag()
-  {
-    return $this->etag;
-  }
-  public function setEventId($eventId)
-  {
-    $this->eventId = $eventId;
-  }
-  public function getEventId()
-  {
-    return $this->eventId;
-  }
-  public function setItems($items)
-  {
-    $this->items = $items;
-  }
-  public function getItems()
-  {
-    return $this->items;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setNextPageToken($nextPageToken)
-  {
-    $this->nextPageToken = $nextPageToken;
-  }
-  public function getNextPageToken()
-  {
-    return $this->nextPageToken;
-  }
-  public function setPageInfo(Google_Service_YouTube_PageInfo $pageInfo)
-  {
-    $this->pageInfo = $pageInfo;
-  }
-  public function getPageInfo()
-  {
-    return $this->pageInfo;
-  }
-  public function setPrevPageToken($prevPageToken)
-  {
-    $this->prevPageToken = $prevPageToken;
-  }
-  public function getPrevPageToken()
-  {
-    return $this->prevPageToken;
-  }
-  public function setTokenPagination(Google_Service_YouTube_TokenPagination $tokenPagination)
-  {
-    $this->tokenPagination = $tokenPagination;
-  }
-  public function getTokenPagination()
-  {
-    return $this->tokenPagination;
-  }
-  public function setVisitorId($visitorId)
-  {
-    $this->visitorId = $visitorId;
-  }
-  public function getVisitorId()
-  {
-    return $this->visitorId;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTube/GuideCategorySnippet.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTube/GuideCategorySnippet.php
deleted file mode 100644
index 10faecaf..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTube/GuideCategorySnippet.php
+++ /dev/null
@@ -1,39 +0,0 @@
-channelId = $channelId;
-  }
-  public function getChannelId()
-  {
-    return $this->channelId;
-  }
-  public function setTitle($title)
-  {
-    $this->title = $title;
-  }
-  public function getTitle()
-  {
-    return $this->title;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTube/I18nLanguage.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTube/I18nLanguage.php
deleted file mode 100644
index 35d1f4e7..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTube/I18nLanguage.php
+++ /dev/null
@@ -1,58 +0,0 @@
-etag = $etag;
-  }
-  public function getEtag()
-  {
-    return $this->etag;
-  }
-  public function setId($id)
-  {
-    $this->id = $id;
-  }
-  public function getId()
-  {
-    return $this->id;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setSnippet(Google_Service_YouTube_I18nLanguageSnippet $snippet)
-  {
-    $this->snippet = $snippet;
-  }
-  public function getSnippet()
-  {
-    return $this->snippet;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTube/I18nLanguageListResponse.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTube/I18nLanguageListResponse.php
deleted file mode 100644
index e6dbeee4..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTube/I18nLanguageListResponse.php
+++ /dev/null
@@ -1,68 +0,0 @@
-etag = $etag;
-  }
-  public function getEtag()
-  {
-    return $this->etag;
-  }
-  public function setEventId($eventId)
-  {
-    $this->eventId = $eventId;
-  }
-  public function getEventId()
-  {
-    return $this->eventId;
-  }
-  public function setItems($items)
-  {
-    $this->items = $items;
-  }
-  public function getItems()
-  {
-    return $this->items;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setVisitorId($visitorId)
-  {
-    $this->visitorId = $visitorId;
-  }
-  public function getVisitorId()
-  {
-    return $this->visitorId;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTube/I18nLanguageSnippet.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTube/I18nLanguageSnippet.php
deleted file mode 100644
index c3800383..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTube/I18nLanguageSnippet.php
+++ /dev/null
@@ -1,39 +0,0 @@
-hl = $hl;
-  }
-  public function getHl()
-  {
-    return $this->hl;
-  }
-  public function setName($name)
-  {
-    $this->name = $name;
-  }
-  public function getName()
-  {
-    return $this->name;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTube/I18nRegion.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTube/I18nRegion.php
deleted file mode 100644
index 752e4654..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTube/I18nRegion.php
+++ /dev/null
@@ -1,58 +0,0 @@
-etag = $etag;
-  }
-  public function getEtag()
-  {
-    return $this->etag;
-  }
-  public function setId($id)
-  {
-    $this->id = $id;
-  }
-  public function getId()
-  {
-    return $this->id;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setSnippet(Google_Service_YouTube_I18nRegionSnippet $snippet)
-  {
-    $this->snippet = $snippet;
-  }
-  public function getSnippet()
-  {
-    return $this->snippet;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTube/I18nRegionListResponse.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTube/I18nRegionListResponse.php
deleted file mode 100644
index 6803eed9..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTube/I18nRegionListResponse.php
+++ /dev/null
@@ -1,68 +0,0 @@
-etag = $etag;
-  }
-  public function getEtag()
-  {
-    return $this->etag;
-  }
-  public function setEventId($eventId)
-  {
-    $this->eventId = $eventId;
-  }
-  public function getEventId()
-  {
-    return $this->eventId;
-  }
-  public function setItems($items)
-  {
-    $this->items = $items;
-  }
-  public function getItems()
-  {
-    return $this->items;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setVisitorId($visitorId)
-  {
-    $this->visitorId = $visitorId;
-  }
-  public function getVisitorId()
-  {
-    return $this->visitorId;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTube/I18nRegionSnippet.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTube/I18nRegionSnippet.php
deleted file mode 100644
index 8170918e..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTube/I18nRegionSnippet.php
+++ /dev/null
@@ -1,39 +0,0 @@
-gl = $gl;
-  }
-  public function getGl()
-  {
-    return $this->gl;
-  }
-  public function setName($name)
-  {
-    $this->name = $name;
-  }
-  public function getName()
-  {
-    return $this->name;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTube/ImageSettings.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTube/ImageSettings.php
deleted file mode 100644
index c2bfc9c0..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTube/ImageSettings.php
+++ /dev/null
@@ -1,224 +0,0 @@
-backgroundImageUrl = $backgroundImageUrl;
-  }
-  public function getBackgroundImageUrl()
-  {
-    return $this->backgroundImageUrl;
-  }
-  public function setBannerExternalUrl($bannerExternalUrl)
-  {
-    $this->bannerExternalUrl = $bannerExternalUrl;
-  }
-  public function getBannerExternalUrl()
-  {
-    return $this->bannerExternalUrl;
-  }
-  public function setBannerImageUrl($bannerImageUrl)
-  {
-    $this->bannerImageUrl = $bannerImageUrl;
-  }
-  public function getBannerImageUrl()
-  {
-    return $this->bannerImageUrl;
-  }
-  public function setBannerMobileExtraHdImageUrl($bannerMobileExtraHdImageUrl)
-  {
-    $this->bannerMobileExtraHdImageUrl = $bannerMobileExtraHdImageUrl;
-  }
-  public function getBannerMobileExtraHdImageUrl()
-  {
-    return $this->bannerMobileExtraHdImageUrl;
-  }
-  public function setBannerMobileHdImageUrl($bannerMobileHdImageUrl)
-  {
-    $this->bannerMobileHdImageUrl = $bannerMobileHdImageUrl;
-  }
-  public function getBannerMobileHdImageUrl()
-  {
-    return $this->bannerMobileHdImageUrl;
-  }
-  public function setBannerMobileImageUrl($bannerMobileImageUrl)
-  {
-    $this->bannerMobileImageUrl = $bannerMobileImageUrl;
-  }
-  public function getBannerMobileImageUrl()
-  {
-    return $this->bannerMobileImageUrl;
-  }
-  public function setBannerMobileLowImageUrl($bannerMobileLowImageUrl)
-  {
-    $this->bannerMobileLowImageUrl = $bannerMobileLowImageUrl;
-  }
-  public function getBannerMobileLowImageUrl()
-  {
-    return $this->bannerMobileLowImageUrl;
-  }
-  public function setBannerMobileMediumHdImageUrl($bannerMobileMediumHdImageUrl)
-  {
-    $this->bannerMobileMediumHdImageUrl = $bannerMobileMediumHdImageUrl;
-  }
-  public function getBannerMobileMediumHdImageUrl()
-  {
-    return $this->bannerMobileMediumHdImageUrl;
-  }
-  public function setBannerTabletExtraHdImageUrl($bannerTabletExtraHdImageUrl)
-  {
-    $this->bannerTabletExtraHdImageUrl = $bannerTabletExtraHdImageUrl;
-  }
-  public function getBannerTabletExtraHdImageUrl()
-  {
-    return $this->bannerTabletExtraHdImageUrl;
-  }
-  public function setBannerTabletHdImageUrl($bannerTabletHdImageUrl)
-  {
-    $this->bannerTabletHdImageUrl = $bannerTabletHdImageUrl;
-  }
-  public function getBannerTabletHdImageUrl()
-  {
-    return $this->bannerTabletHdImageUrl;
-  }
-  public function setBannerTabletImageUrl($bannerTabletImageUrl)
-  {
-    $this->bannerTabletImageUrl = $bannerTabletImageUrl;
-  }
-  public function getBannerTabletImageUrl()
-  {
-    return $this->bannerTabletImageUrl;
-  }
-  public function setBannerTabletLowImageUrl($bannerTabletLowImageUrl)
-  {
-    $this->bannerTabletLowImageUrl = $bannerTabletLowImageUrl;
-  }
-  public function getBannerTabletLowImageUrl()
-  {
-    return $this->bannerTabletLowImageUrl;
-  }
-  public function setBannerTvHighImageUrl($bannerTvHighImageUrl)
-  {
-    $this->bannerTvHighImageUrl = $bannerTvHighImageUrl;
-  }
-  public function getBannerTvHighImageUrl()
-  {
-    return $this->bannerTvHighImageUrl;
-  }
-  public function setBannerTvImageUrl($bannerTvImageUrl)
-  {
-    $this->bannerTvImageUrl = $bannerTvImageUrl;
-  }
-  public function getBannerTvImageUrl()
-  {
-    return $this->bannerTvImageUrl;
-  }
-  public function setBannerTvLowImageUrl($bannerTvLowImageUrl)
-  {
-    $this->bannerTvLowImageUrl = $bannerTvLowImageUrl;
-  }
-  public function getBannerTvLowImageUrl()
-  {
-    return $this->bannerTvLowImageUrl;
-  }
-  public function setBannerTvMediumImageUrl($bannerTvMediumImageUrl)
-  {
-    $this->bannerTvMediumImageUrl = $bannerTvMediumImageUrl;
-  }
-  public function getBannerTvMediumImageUrl()
-  {
-    return $this->bannerTvMediumImageUrl;
-  }
-  public function setLargeBrandedBannerImageImapScript(Google_Service_YouTube_LocalizedProperty $largeBrandedBannerImageImapScript)
-  {
-    $this->largeBrandedBannerImageImapScript = $largeBrandedBannerImageImapScript;
-  }
-  public function getLargeBrandedBannerImageImapScript()
-  {
-    return $this->largeBrandedBannerImageImapScript;
-  }
-  public function setLargeBrandedBannerImageUrl(Google_Service_YouTube_LocalizedProperty $largeBrandedBannerImageUrl)
-  {
-    $this->largeBrandedBannerImageUrl = $largeBrandedBannerImageUrl;
-  }
-  public function getLargeBrandedBannerImageUrl()
-  {
-    return $this->largeBrandedBannerImageUrl;
-  }
-  public function setSmallBrandedBannerImageImapScript(Google_Service_YouTube_LocalizedProperty $smallBrandedBannerImageImapScript)
-  {
-    $this->smallBrandedBannerImageImapScript = $smallBrandedBannerImageImapScript;
-  }
-  public function getSmallBrandedBannerImageImapScript()
-  {
-    return $this->smallBrandedBannerImageImapScript;
-  }
-  public function setSmallBrandedBannerImageUrl(Google_Service_YouTube_LocalizedProperty $smallBrandedBannerImageUrl)
-  {
-    $this->smallBrandedBannerImageUrl = $smallBrandedBannerImageUrl;
-  }
-  public function getSmallBrandedBannerImageUrl()
-  {
-    return $this->smallBrandedBannerImageUrl;
-  }
-  public function setTrackingImageUrl($trackingImageUrl)
-  {
-    $this->trackingImageUrl = $trackingImageUrl;
-  }
-  public function getTrackingImageUrl()
-  {
-    return $this->trackingImageUrl;
-  }
-  public function setWatchIconImageUrl($watchIconImageUrl)
-  {
-    $this->watchIconImageUrl = $watchIconImageUrl;
-  }
-  public function getWatchIconImageUrl()
-  {
-    return $this->watchIconImageUrl;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTube/IngestionInfo.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTube/IngestionInfo.php
deleted file mode 100644
index aaac80c9..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTube/IngestionInfo.php
+++ /dev/null
@@ -1,48 +0,0 @@
-backupIngestionAddress = $backupIngestionAddress;
-  }
-  public function getBackupIngestionAddress()
-  {
-    return $this->backupIngestionAddress;
-  }
-  public function setIngestionAddress($ingestionAddress)
-  {
-    $this->ingestionAddress = $ingestionAddress;
-  }
-  public function getIngestionAddress()
-  {
-    return $this->ingestionAddress;
-  }
-  public function setStreamName($streamName)
-  {
-    $this->streamName = $streamName;
-  }
-  public function getStreamName()
-  {
-    return $this->streamName;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTube/InvideoBranding.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTube/InvideoBranding.php
deleted file mode 100644
index 1fc32ae8..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTube/InvideoBranding.php
+++ /dev/null
@@ -1,68 +0,0 @@
-imageBytes = $imageBytes;
-  }
-  public function getImageBytes()
-  {
-    return $this->imageBytes;
-  }
-  public function setImageUrl($imageUrl)
-  {
-    $this->imageUrl = $imageUrl;
-  }
-  public function getImageUrl()
-  {
-    return $this->imageUrl;
-  }
-  public function setPosition(Google_Service_YouTube_InvideoPosition $position)
-  {
-    $this->position = $position;
-  }
-  public function getPosition()
-  {
-    return $this->position;
-  }
-  public function setTargetChannelId($targetChannelId)
-  {
-    $this->targetChannelId = $targetChannelId;
-  }
-  public function getTargetChannelId()
-  {
-    return $this->targetChannelId;
-  }
-  public function setTiming(Google_Service_YouTube_InvideoTiming $timing)
-  {
-    $this->timing = $timing;
-  }
-  public function getTiming()
-  {
-    return $this->timing;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTube/InvideoPosition.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTube/InvideoPosition.php
deleted file mode 100644
index 8ebf440c..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTube/InvideoPosition.php
+++ /dev/null
@@ -1,39 +0,0 @@
-cornerPosition = $cornerPosition;
-  }
-  public function getCornerPosition()
-  {
-    return $this->cornerPosition;
-  }
-  public function setType($type)
-  {
-    $this->type = $type;
-  }
-  public function getType()
-  {
-    return $this->type;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTube/InvideoPromotion.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTube/InvideoPromotion.php
deleted file mode 100644
index 451634d0..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTube/InvideoPromotion.php
+++ /dev/null
@@ -1,61 +0,0 @@
-defaultTiming = $defaultTiming;
-  }
-  public function getDefaultTiming()
-  {
-    return $this->defaultTiming;
-  }
-  public function setItems($items)
-  {
-    $this->items = $items;
-  }
-  public function getItems()
-  {
-    return $this->items;
-  }
-  public function setPosition(Google_Service_YouTube_InvideoPosition $position)
-  {
-    $this->position = $position;
-  }
-  public function getPosition()
-  {
-    return $this->position;
-  }
-  public function setUseSmartTiming($useSmartTiming)
-  {
-    $this->useSmartTiming = $useSmartTiming;
-  }
-  public function getUseSmartTiming()
-  {
-    return $this->useSmartTiming;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTube/InvideoTiming.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTube/InvideoTiming.php
deleted file mode 100644
index d6d99ea9..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTube/InvideoTiming.php
+++ /dev/null
@@ -1,48 +0,0 @@
-durationMs = $durationMs;
-  }
-  public function getDurationMs()
-  {
-    return $this->durationMs;
-  }
-  public function setOffsetMs($offsetMs)
-  {
-    $this->offsetMs = $offsetMs;
-  }
-  public function getOffsetMs()
-  {
-    return $this->offsetMs;
-  }
-  public function setType($type)
-  {
-    $this->type = $type;
-  }
-  public function getType()
-  {
-    return $this->type;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTube/LanguageTag.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTube/LanguageTag.php
deleted file mode 100644
index 8f033e3b..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTube/LanguageTag.php
+++ /dev/null
@@ -1,30 +0,0 @@
-value = $value;
-  }
-  public function getValue()
-  {
-    return $this->value;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTube/LiveBroadcast.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTube/LiveBroadcast.php
deleted file mode 100644
index c87763d9..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTube/LiveBroadcast.php
+++ /dev/null
@@ -1,98 +0,0 @@
-contentDetails = $contentDetails;
-  }
-  public function getContentDetails()
-  {
-    return $this->contentDetails;
-  }
-  public function setEtag($etag)
-  {
-    $this->etag = $etag;
-  }
-  public function getEtag()
-  {
-    return $this->etag;
-  }
-  public function setId($id)
-  {
-    $this->id = $id;
-  }
-  public function getId()
-  {
-    return $this->id;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setSnippet(Google_Service_YouTube_LiveBroadcastSnippet $snippet)
-  {
-    $this->snippet = $snippet;
-  }
-  public function getSnippet()
-  {
-    return $this->snippet;
-  }
-  public function setStatistics(Google_Service_YouTube_LiveBroadcastStatistics $statistics)
-  {
-    $this->statistics = $statistics;
-  }
-  public function getStatistics()
-  {
-    return $this->statistics;
-  }
-  public function setStatus(Google_Service_YouTube_LiveBroadcastStatus $status)
-  {
-    $this->status = $status;
-  }
-  public function getStatus()
-  {
-    return $this->status;
-  }
-  public function setTopicDetails(Google_Service_YouTube_LiveBroadcastTopicDetails $topicDetails)
-  {
-    $this->topicDetails = $topicDetails;
-  }
-  public function getTopicDetails()
-  {
-    return $this->topicDetails;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTube/LiveBroadcastContentDetails.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTube/LiveBroadcastContentDetails.php
deleted file mode 100644
index ea790e0d..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTube/LiveBroadcastContentDetails.php
+++ /dev/null
@@ -1,130 +0,0 @@
-boundStreamId = $boundStreamId;
-  }
-  public function getBoundStreamId()
-  {
-    return $this->boundStreamId;
-  }
-  public function setBoundStreamLastUpdateTimeMs($boundStreamLastUpdateTimeMs)
-  {
-    $this->boundStreamLastUpdateTimeMs = $boundStreamLastUpdateTimeMs;
-  }
-  public function getBoundStreamLastUpdateTimeMs()
-  {
-    return $this->boundStreamLastUpdateTimeMs;
-  }
-  public function setClosedCaptionsType($closedCaptionsType)
-  {
-    $this->closedCaptionsType = $closedCaptionsType;
-  }
-  public function getClosedCaptionsType()
-  {
-    return $this->closedCaptionsType;
-  }
-  public function setEnableClosedCaptions($enableClosedCaptions)
-  {
-    $this->enableClosedCaptions = $enableClosedCaptions;
-  }
-  public function getEnableClosedCaptions()
-  {
-    return $this->enableClosedCaptions;
-  }
-  public function setEnableContentEncryption($enableContentEncryption)
-  {
-    $this->enableContentEncryption = $enableContentEncryption;
-  }
-  public function getEnableContentEncryption()
-  {
-    return $this->enableContentEncryption;
-  }
-  public function setEnableDvr($enableDvr)
-  {
-    $this->enableDvr = $enableDvr;
-  }
-  public function getEnableDvr()
-  {
-    return $this->enableDvr;
-  }
-  public function setEnableEmbed($enableEmbed)
-  {
-    $this->enableEmbed = $enableEmbed;
-  }
-  public function getEnableEmbed()
-  {
-    return $this->enableEmbed;
-  }
-  public function setEnableLowLatency($enableLowLatency)
-  {
-    $this->enableLowLatency = $enableLowLatency;
-  }
-  public function getEnableLowLatency()
-  {
-    return $this->enableLowLatency;
-  }
-  public function setMonitorStream(Google_Service_YouTube_MonitorStreamInfo $monitorStream)
-  {
-    $this->monitorStream = $monitorStream;
-  }
-  public function getMonitorStream()
-  {
-    return $this->monitorStream;
-  }
-  public function setProjection($projection)
-  {
-    $this->projection = $projection;
-  }
-  public function getProjection()
-  {
-    return $this->projection;
-  }
-  public function setRecordFromStart($recordFromStart)
-  {
-    $this->recordFromStart = $recordFromStart;
-  }
-  public function getRecordFromStart()
-  {
-    return $this->recordFromStart;
-  }
-  public function setStartWithSlate($startWithSlate)
-  {
-    $this->startWithSlate = $startWithSlate;
-  }
-  public function getStartWithSlate()
-  {
-    return $this->startWithSlate;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTube/LiveBroadcastListResponse.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTube/LiveBroadcastListResponse.php
deleted file mode 100644
index f3a9725e..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTube/LiveBroadcastListResponse.php
+++ /dev/null
@@ -1,106 +0,0 @@
-etag = $etag;
-  }
-  public function getEtag()
-  {
-    return $this->etag;
-  }
-  public function setEventId($eventId)
-  {
-    $this->eventId = $eventId;
-  }
-  public function getEventId()
-  {
-    return $this->eventId;
-  }
-  public function setItems($items)
-  {
-    $this->items = $items;
-  }
-  public function getItems()
-  {
-    return $this->items;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setNextPageToken($nextPageToken)
-  {
-    $this->nextPageToken = $nextPageToken;
-  }
-  public function getNextPageToken()
-  {
-    return $this->nextPageToken;
-  }
-  public function setPageInfo(Google_Service_YouTube_PageInfo $pageInfo)
-  {
-    $this->pageInfo = $pageInfo;
-  }
-  public function getPageInfo()
-  {
-    return $this->pageInfo;
-  }
-  public function setPrevPageToken($prevPageToken)
-  {
-    $this->prevPageToken = $prevPageToken;
-  }
-  public function getPrevPageToken()
-  {
-    return $this->prevPageToken;
-  }
-  public function setTokenPagination(Google_Service_YouTube_TokenPagination $tokenPagination)
-  {
-    $this->tokenPagination = $tokenPagination;
-  }
-  public function getTokenPagination()
-  {
-    return $this->tokenPagination;
-  }
-  public function setVisitorId($visitorId)
-  {
-    $this->visitorId = $visitorId;
-  }
-  public function getVisitorId()
-  {
-    return $this->visitorId;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTube/LiveBroadcastSnippet.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTube/LiveBroadcastSnippet.php
deleted file mode 100644
index 950e7776..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTube/LiveBroadcastSnippet.php
+++ /dev/null
@@ -1,121 +0,0 @@
-actualEndTime = $actualEndTime;
-  }
-  public function getActualEndTime()
-  {
-    return $this->actualEndTime;
-  }
-  public function setActualStartTime($actualStartTime)
-  {
-    $this->actualStartTime = $actualStartTime;
-  }
-  public function getActualStartTime()
-  {
-    return $this->actualStartTime;
-  }
-  public function setChannelId($channelId)
-  {
-    $this->channelId = $channelId;
-  }
-  public function getChannelId()
-  {
-    return $this->channelId;
-  }
-  public function setDescription($description)
-  {
-    $this->description = $description;
-  }
-  public function getDescription()
-  {
-    return $this->description;
-  }
-  public function setIsDefaultBroadcast($isDefaultBroadcast)
-  {
-    $this->isDefaultBroadcast = $isDefaultBroadcast;
-  }
-  public function getIsDefaultBroadcast()
-  {
-    return $this->isDefaultBroadcast;
-  }
-  public function setLiveChatId($liveChatId)
-  {
-    $this->liveChatId = $liveChatId;
-  }
-  public function getLiveChatId()
-  {
-    return $this->liveChatId;
-  }
-  public function setPublishedAt($publishedAt)
-  {
-    $this->publishedAt = $publishedAt;
-  }
-  public function getPublishedAt()
-  {
-    return $this->publishedAt;
-  }
-  public function setScheduledEndTime($scheduledEndTime)
-  {
-    $this->scheduledEndTime = $scheduledEndTime;
-  }
-  public function getScheduledEndTime()
-  {
-    return $this->scheduledEndTime;
-  }
-  public function setScheduledStartTime($scheduledStartTime)
-  {
-    $this->scheduledStartTime = $scheduledStartTime;
-  }
-  public function getScheduledStartTime()
-  {
-    return $this->scheduledStartTime;
-  }
-  public function setThumbnails(Google_Service_YouTube_ThumbnailDetails $thumbnails)
-  {
-    $this->thumbnails = $thumbnails;
-  }
-  public function getThumbnails()
-  {
-    return $this->thumbnails;
-  }
-  public function setTitle($title)
-  {
-    $this->title = $title;
-  }
-  public function getTitle()
-  {
-    return $this->title;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTube/LiveBroadcastStatistics.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTube/LiveBroadcastStatistics.php
deleted file mode 100644
index 6a4f8f3d..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTube/LiveBroadcastStatistics.php
+++ /dev/null
@@ -1,39 +0,0 @@
-concurrentViewers = $concurrentViewers;
-  }
-  public function getConcurrentViewers()
-  {
-    return $this->concurrentViewers;
-  }
-  public function setTotalChatCount($totalChatCount)
-  {
-    $this->totalChatCount = $totalChatCount;
-  }
-  public function getTotalChatCount()
-  {
-    return $this->totalChatCount;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTube/LiveBroadcastStatus.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTube/LiveBroadcastStatus.php
deleted file mode 100644
index 74e17468..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTube/LiveBroadcastStatus.php
+++ /dev/null
@@ -1,57 +0,0 @@
-lifeCycleStatus = $lifeCycleStatus;
-  }
-  public function getLifeCycleStatus()
-  {
-    return $this->lifeCycleStatus;
-  }
-  public function setLiveBroadcastPriority($liveBroadcastPriority)
-  {
-    $this->liveBroadcastPriority = $liveBroadcastPriority;
-  }
-  public function getLiveBroadcastPriority()
-  {
-    return $this->liveBroadcastPriority;
-  }
-  public function setPrivacyStatus($privacyStatus)
-  {
-    $this->privacyStatus = $privacyStatus;
-  }
-  public function getPrivacyStatus()
-  {
-    return $this->privacyStatus;
-  }
-  public function setRecordingStatus($recordingStatus)
-  {
-    $this->recordingStatus = $recordingStatus;
-  }
-  public function getRecordingStatus()
-  {
-    return $this->recordingStatus;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTube/LiveBroadcastTopic.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTube/LiveBroadcastTopic.php
deleted file mode 100644
index 247b433f..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTube/LiveBroadcastTopic.php
+++ /dev/null
@@ -1,49 +0,0 @@
-snippet = $snippet;
-  }
-  public function getSnippet()
-  {
-    return $this->snippet;
-  }
-  public function setType($type)
-  {
-    $this->type = $type;
-  }
-  public function getType()
-  {
-    return $this->type;
-  }
-  public function setUnmatched($unmatched)
-  {
-    $this->unmatched = $unmatched;
-  }
-  public function getUnmatched()
-  {
-    return $this->unmatched;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTube/LiveBroadcastTopicDetails.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTube/LiveBroadcastTopicDetails.php
deleted file mode 100644
index 8cc4578e..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTube/LiveBroadcastTopicDetails.php
+++ /dev/null
@@ -1,32 +0,0 @@
-topics = $topics;
-  }
-  public function getTopics()
-  {
-    return $this->topics;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTube/LiveBroadcastTopicSnippet.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTube/LiveBroadcastTopicSnippet.php
deleted file mode 100644
index ad6724ee..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTube/LiveBroadcastTopicSnippet.php
+++ /dev/null
@@ -1,39 +0,0 @@
-name = $name;
-  }
-  public function getName()
-  {
-    return $this->name;
-  }
-  public function setReleaseDate($releaseDate)
-  {
-    $this->releaseDate = $releaseDate;
-  }
-  public function getReleaseDate()
-  {
-    return $this->releaseDate;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTube/LiveChatBan.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTube/LiveChatBan.php
deleted file mode 100644
index d835437d..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTube/LiveChatBan.php
+++ /dev/null
@@ -1,58 +0,0 @@
-etag = $etag;
-  }
-  public function getEtag()
-  {
-    return $this->etag;
-  }
-  public function setId($id)
-  {
-    $this->id = $id;
-  }
-  public function getId()
-  {
-    return $this->id;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setSnippet(Google_Service_YouTube_LiveChatBanSnippet $snippet)
-  {
-    $this->snippet = $snippet;
-  }
-  public function getSnippet()
-  {
-    return $this->snippet;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTube/LiveChatBanSnippet.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTube/LiveChatBanSnippet.php
deleted file mode 100644
index cc595994..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTube/LiveChatBanSnippet.php
+++ /dev/null
@@ -1,58 +0,0 @@
-banDurationSeconds = $banDurationSeconds;
-  }
-  public function getBanDurationSeconds()
-  {
-    return $this->banDurationSeconds;
-  }
-  public function setBannedUserDetails(Google_Service_YouTube_ChannelProfileDetails $bannedUserDetails)
-  {
-    $this->bannedUserDetails = $bannedUserDetails;
-  }
-  public function getBannedUserDetails()
-  {
-    return $this->bannedUserDetails;
-  }
-  public function setLiveChatId($liveChatId)
-  {
-    $this->liveChatId = $liveChatId;
-  }
-  public function getLiveChatId()
-  {
-    return $this->liveChatId;
-  }
-  public function setType($type)
-  {
-    $this->type = $type;
-  }
-  public function getType()
-  {
-    return $this->type;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTube/LiveChatFanFundingEventDetails.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTube/LiveChatFanFundingEventDetails.php
deleted file mode 100644
index b7f316d1..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTube/LiveChatFanFundingEventDetails.php
+++ /dev/null
@@ -1,57 +0,0 @@
-amountDisplayString = $amountDisplayString;
-  }
-  public function getAmountDisplayString()
-  {
-    return $this->amountDisplayString;
-  }
-  public function setAmountMicros($amountMicros)
-  {
-    $this->amountMicros = $amountMicros;
-  }
-  public function getAmountMicros()
-  {
-    return $this->amountMicros;
-  }
-  public function setCurrency($currency)
-  {
-    $this->currency = $currency;
-  }
-  public function getCurrency()
-  {
-    return $this->currency;
-  }
-  public function setUserComment($userComment)
-  {
-    $this->userComment = $userComment;
-  }
-  public function getUserComment()
-  {
-    return $this->userComment;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTube/LiveChatMessage.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTube/LiveChatMessage.php
deleted file mode 100644
index 01bf15c7..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTube/LiveChatMessage.php
+++ /dev/null
@@ -1,68 +0,0 @@
-authorDetails = $authorDetails;
-  }
-  public function getAuthorDetails()
-  {
-    return $this->authorDetails;
-  }
-  public function setEtag($etag)
-  {
-    $this->etag = $etag;
-  }
-  public function getEtag()
-  {
-    return $this->etag;
-  }
-  public function setId($id)
-  {
-    $this->id = $id;
-  }
-  public function getId()
-  {
-    return $this->id;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setSnippet(Google_Service_YouTube_LiveChatMessageSnippet $snippet)
-  {
-    $this->snippet = $snippet;
-  }
-  public function getSnippet()
-  {
-    return $this->snippet;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTube/LiveChatMessageAuthorDetails.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTube/LiveChatMessageAuthorDetails.php
deleted file mode 100644
index 0f77bf66..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTube/LiveChatMessageAuthorDetails.php
+++ /dev/null
@@ -1,93 +0,0 @@
-channelId = $channelId;
-  }
-  public function getChannelId()
-  {
-    return $this->channelId;
-  }
-  public function setChannelUrl($channelUrl)
-  {
-    $this->channelUrl = $channelUrl;
-  }
-  public function getChannelUrl()
-  {
-    return $this->channelUrl;
-  }
-  public function setDisplayName($displayName)
-  {
-    $this->displayName = $displayName;
-  }
-  public function getDisplayName()
-  {
-    return $this->displayName;
-  }
-  public function setIsChatModerator($isChatModerator)
-  {
-    $this->isChatModerator = $isChatModerator;
-  }
-  public function getIsChatModerator()
-  {
-    return $this->isChatModerator;
-  }
-  public function setIsChatOwner($isChatOwner)
-  {
-    $this->isChatOwner = $isChatOwner;
-  }
-  public function getIsChatOwner()
-  {
-    return $this->isChatOwner;
-  }
-  public function setIsChatSponsor($isChatSponsor)
-  {
-    $this->isChatSponsor = $isChatSponsor;
-  }
-  public function getIsChatSponsor()
-  {
-    return $this->isChatSponsor;
-  }
-  public function setIsVerified($isVerified)
-  {
-    $this->isVerified = $isVerified;
-  }
-  public function getIsVerified()
-  {
-    return $this->isVerified;
-  }
-  public function setProfileImageUrl($profileImageUrl)
-  {
-    $this->profileImageUrl = $profileImageUrl;
-  }
-  public function getProfileImageUrl()
-  {
-    return $this->profileImageUrl;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTube/LiveChatMessageDeletedDetails.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTube/LiveChatMessageDeletedDetails.php
deleted file mode 100644
index 8d5b7ecb..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTube/LiveChatMessageDeletedDetails.php
+++ /dev/null
@@ -1,30 +0,0 @@
-deletedMessageId = $deletedMessageId;
-  }
-  public function getDeletedMessageId()
-  {
-    return $this->deletedMessageId;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTube/LiveChatMessageListResponse.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTube/LiveChatMessageListResponse.php
deleted file mode 100644
index c3e5b326..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTube/LiveChatMessageListResponse.php
+++ /dev/null
@@ -1,115 +0,0 @@
-etag = $etag;
-  }
-  public function getEtag()
-  {
-    return $this->etag;
-  }
-  public function setEventId($eventId)
-  {
-    $this->eventId = $eventId;
-  }
-  public function getEventId()
-  {
-    return $this->eventId;
-  }
-  public function setItems($items)
-  {
-    $this->items = $items;
-  }
-  public function getItems()
-  {
-    return $this->items;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setNextPageToken($nextPageToken)
-  {
-    $this->nextPageToken = $nextPageToken;
-  }
-  public function getNextPageToken()
-  {
-    return $this->nextPageToken;
-  }
-  public function setOfflineAt($offlineAt)
-  {
-    $this->offlineAt = $offlineAt;
-  }
-  public function getOfflineAt()
-  {
-    return $this->offlineAt;
-  }
-  public function setPageInfo(Google_Service_YouTube_PageInfo $pageInfo)
-  {
-    $this->pageInfo = $pageInfo;
-  }
-  public function getPageInfo()
-  {
-    return $this->pageInfo;
-  }
-  public function setPollingIntervalMillis($pollingIntervalMillis)
-  {
-    $this->pollingIntervalMillis = $pollingIntervalMillis;
-  }
-  public function getPollingIntervalMillis()
-  {
-    return $this->pollingIntervalMillis;
-  }
-  public function setTokenPagination(Google_Service_YouTube_TokenPagination $tokenPagination)
-  {
-    $this->tokenPagination = $tokenPagination;
-  }
-  public function getTokenPagination()
-  {
-    return $this->tokenPagination;
-  }
-  public function setVisitorId($visitorId)
-  {
-    $this->visitorId = $visitorId;
-  }
-  public function getVisitorId()
-  {
-    return $this->visitorId;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTube/LiveChatMessageRetractedDetails.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTube/LiveChatMessageRetractedDetails.php
deleted file mode 100644
index 9a84f4f2..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTube/LiveChatMessageRetractedDetails.php
+++ /dev/null
@@ -1,30 +0,0 @@
-retractedMessageId = $retractedMessageId;
-  }
-  public function getRetractedMessageId()
-  {
-    return $this->retractedMessageId;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTube/LiveChatMessageSnippet.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTube/LiveChatMessageSnippet.php
deleted file mode 100644
index b7f6250b..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTube/LiveChatMessageSnippet.php
+++ /dev/null
@@ -1,175 +0,0 @@
-authorChannelId = $authorChannelId;
-  }
-  public function getAuthorChannelId()
-  {
-    return $this->authorChannelId;
-  }
-  public function setDisplayMessage($displayMessage)
-  {
-    $this->displayMessage = $displayMessage;
-  }
-  public function getDisplayMessage()
-  {
-    return $this->displayMessage;
-  }
-  public function setFanFundingEventDetails(Google_Service_YouTube_LiveChatFanFundingEventDetails $fanFundingEventDetails)
-  {
-    $this->fanFundingEventDetails = $fanFundingEventDetails;
-  }
-  public function getFanFundingEventDetails()
-  {
-    return $this->fanFundingEventDetails;
-  }
-  public function setHasDisplayContent($hasDisplayContent)
-  {
-    $this->hasDisplayContent = $hasDisplayContent;
-  }
-  public function getHasDisplayContent()
-  {
-    return $this->hasDisplayContent;
-  }
-  public function setLiveChatId($liveChatId)
-  {
-    $this->liveChatId = $liveChatId;
-  }
-  public function getLiveChatId()
-  {
-    return $this->liveChatId;
-  }
-  public function setMessageDeletedDetails(Google_Service_YouTube_LiveChatMessageDeletedDetails $messageDeletedDetails)
-  {
-    $this->messageDeletedDetails = $messageDeletedDetails;
-  }
-  public function getMessageDeletedDetails()
-  {
-    return $this->messageDeletedDetails;
-  }
-  public function setMessageRetractedDetails(Google_Service_YouTube_LiveChatMessageRetractedDetails $messageRetractedDetails)
-  {
-    $this->messageRetractedDetails = $messageRetractedDetails;
-  }
-  public function getMessageRetractedDetails()
-  {
-    return $this->messageRetractedDetails;
-  }
-  public function setPollClosedDetails(Google_Service_YouTube_LiveChatPollClosedDetails $pollClosedDetails)
-  {
-    $this->pollClosedDetails = $pollClosedDetails;
-  }
-  public function getPollClosedDetails()
-  {
-    return $this->pollClosedDetails;
-  }
-  public function setPollEditedDetails(Google_Service_YouTube_LiveChatPollEditedDetails $pollEditedDetails)
-  {
-    $this->pollEditedDetails = $pollEditedDetails;
-  }
-  public function getPollEditedDetails()
-  {
-    return $this->pollEditedDetails;
-  }
-  public function setPollOpenedDetails(Google_Service_YouTube_LiveChatPollOpenedDetails $pollOpenedDetails)
-  {
-    $this->pollOpenedDetails = $pollOpenedDetails;
-  }
-  public function getPollOpenedDetails()
-  {
-    return $this->pollOpenedDetails;
-  }
-  public function setPollVotedDetails(Google_Service_YouTube_LiveChatPollVotedDetails $pollVotedDetails)
-  {
-    $this->pollVotedDetails = $pollVotedDetails;
-  }
-  public function getPollVotedDetails()
-  {
-    return $this->pollVotedDetails;
-  }
-  public function setPublishedAt($publishedAt)
-  {
-    $this->publishedAt = $publishedAt;
-  }
-  public function getPublishedAt()
-  {
-    return $this->publishedAt;
-  }
-  public function setSuperChatDetails(Google_Service_YouTube_LiveChatSuperChatDetails $superChatDetails)
-  {
-    $this->superChatDetails = $superChatDetails;
-  }
-  public function getSuperChatDetails()
-  {
-    return $this->superChatDetails;
-  }
-  public function setTextMessageDetails(Google_Service_YouTube_LiveChatTextMessageDetails $textMessageDetails)
-  {
-    $this->textMessageDetails = $textMessageDetails;
-  }
-  public function getTextMessageDetails()
-  {
-    return $this->textMessageDetails;
-  }
-  public function setType($type)
-  {
-    $this->type = $type;
-  }
-  public function getType()
-  {
-    return $this->type;
-  }
-  public function setUserBannedDetails(Google_Service_YouTube_LiveChatUserBannedMessageDetails $userBannedDetails)
-  {
-    $this->userBannedDetails = $userBannedDetails;
-  }
-  public function getUserBannedDetails()
-  {
-    return $this->userBannedDetails;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTube/LiveChatModerator.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTube/LiveChatModerator.php
deleted file mode 100644
index 29b77e03..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTube/LiveChatModerator.php
+++ /dev/null
@@ -1,58 +0,0 @@
-etag = $etag;
-  }
-  public function getEtag()
-  {
-    return $this->etag;
-  }
-  public function setId($id)
-  {
-    $this->id = $id;
-  }
-  public function getId()
-  {
-    return $this->id;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setSnippet(Google_Service_YouTube_LiveChatModeratorSnippet $snippet)
-  {
-    $this->snippet = $snippet;
-  }
-  public function getSnippet()
-  {
-    return $this->snippet;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTube/LiveChatModeratorListResponse.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTube/LiveChatModeratorListResponse.php
deleted file mode 100644
index 7655eb94..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTube/LiveChatModeratorListResponse.php
+++ /dev/null
@@ -1,106 +0,0 @@
-etag = $etag;
-  }
-  public function getEtag()
-  {
-    return $this->etag;
-  }
-  public function setEventId($eventId)
-  {
-    $this->eventId = $eventId;
-  }
-  public function getEventId()
-  {
-    return $this->eventId;
-  }
-  public function setItems($items)
-  {
-    $this->items = $items;
-  }
-  public function getItems()
-  {
-    return $this->items;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setNextPageToken($nextPageToken)
-  {
-    $this->nextPageToken = $nextPageToken;
-  }
-  public function getNextPageToken()
-  {
-    return $this->nextPageToken;
-  }
-  public function setPageInfo(Google_Service_YouTube_PageInfo $pageInfo)
-  {
-    $this->pageInfo = $pageInfo;
-  }
-  public function getPageInfo()
-  {
-    return $this->pageInfo;
-  }
-  public function setPrevPageToken($prevPageToken)
-  {
-    $this->prevPageToken = $prevPageToken;
-  }
-  public function getPrevPageToken()
-  {
-    return $this->prevPageToken;
-  }
-  public function setTokenPagination(Google_Service_YouTube_TokenPagination $tokenPagination)
-  {
-    $this->tokenPagination = $tokenPagination;
-  }
-  public function getTokenPagination()
-  {
-    return $this->tokenPagination;
-  }
-  public function setVisitorId($visitorId)
-  {
-    $this->visitorId = $visitorId;
-  }
-  public function getVisitorId()
-  {
-    return $this->visitorId;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTube/LiveChatModeratorSnippet.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTube/LiveChatModeratorSnippet.php
deleted file mode 100644
index b3581c77..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTube/LiveChatModeratorSnippet.php
+++ /dev/null
@@ -1,40 +0,0 @@
-liveChatId = $liveChatId;
-  }
-  public function getLiveChatId()
-  {
-    return $this->liveChatId;
-  }
-  public function setModeratorDetails(Google_Service_YouTube_ChannelProfileDetails $moderatorDetails)
-  {
-    $this->moderatorDetails = $moderatorDetails;
-  }
-  public function getModeratorDetails()
-  {
-    return $this->moderatorDetails;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTube/LiveChatPollClosedDetails.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTube/LiveChatPollClosedDetails.php
deleted file mode 100644
index a720614b..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTube/LiveChatPollClosedDetails.php
+++ /dev/null
@@ -1,30 +0,0 @@
-pollId = $pollId;
-  }
-  public function getPollId()
-  {
-    return $this->pollId;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTube/LiveChatPollEditedDetails.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTube/LiveChatPollEditedDetails.php
deleted file mode 100644
index d34084fa..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTube/LiveChatPollEditedDetails.php
+++ /dev/null
@@ -1,50 +0,0 @@
-id = $id;
-  }
-  public function getId()
-  {
-    return $this->id;
-  }
-  public function setItems($items)
-  {
-    $this->items = $items;
-  }
-  public function getItems()
-  {
-    return $this->items;
-  }
-  public function setPrompt($prompt)
-  {
-    $this->prompt = $prompt;
-  }
-  public function getPrompt()
-  {
-    return $this->prompt;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTube/LiveChatPollItem.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTube/LiveChatPollItem.php
deleted file mode 100644
index cfc23838..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTube/LiveChatPollItem.php
+++ /dev/null
@@ -1,39 +0,0 @@
-description = $description;
-  }
-  public function getDescription()
-  {
-    return $this->description;
-  }
-  public function setItemId($itemId)
-  {
-    $this->itemId = $itemId;
-  }
-  public function getItemId()
-  {
-    return $this->itemId;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTube/LiveChatPollOpenedDetails.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTube/LiveChatPollOpenedDetails.php
deleted file mode 100644
index b63881d9..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTube/LiveChatPollOpenedDetails.php
+++ /dev/null
@@ -1,50 +0,0 @@
-id = $id;
-  }
-  public function getId()
-  {
-    return $this->id;
-  }
-  public function setItems($items)
-  {
-    $this->items = $items;
-  }
-  public function getItems()
-  {
-    return $this->items;
-  }
-  public function setPrompt($prompt)
-  {
-    $this->prompt = $prompt;
-  }
-  public function getPrompt()
-  {
-    return $this->prompt;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTube/LiveChatPollVotedDetails.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTube/LiveChatPollVotedDetails.php
deleted file mode 100644
index 5ffc4229..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTube/LiveChatPollVotedDetails.php
+++ /dev/null
@@ -1,39 +0,0 @@
-itemId = $itemId;
-  }
-  public function getItemId()
-  {
-    return $this->itemId;
-  }
-  public function setPollId($pollId)
-  {
-    $this->pollId = $pollId;
-  }
-  public function getPollId()
-  {
-    return $this->pollId;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTube/LiveChatSuperChatDetails.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTube/LiveChatSuperChatDetails.php
deleted file mode 100644
index 0d66d058..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTube/LiveChatSuperChatDetails.php
+++ /dev/null
@@ -1,66 +0,0 @@
-amountDisplayString = $amountDisplayString;
-  }
-  public function getAmountDisplayString()
-  {
-    return $this->amountDisplayString;
-  }
-  public function setAmountMicros($amountMicros)
-  {
-    $this->amountMicros = $amountMicros;
-  }
-  public function getAmountMicros()
-  {
-    return $this->amountMicros;
-  }
-  public function setCurrency($currency)
-  {
-    $this->currency = $currency;
-  }
-  public function getCurrency()
-  {
-    return $this->currency;
-  }
-  public function setTier($tier)
-  {
-    $this->tier = $tier;
-  }
-  public function getTier()
-  {
-    return $this->tier;
-  }
-  public function setUserComment($userComment)
-  {
-    $this->userComment = $userComment;
-  }
-  public function getUserComment()
-  {
-    return $this->userComment;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTube/LiveChatTextMessageDetails.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTube/LiveChatTextMessageDetails.php
deleted file mode 100644
index c3708022..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTube/LiveChatTextMessageDetails.php
+++ /dev/null
@@ -1,30 +0,0 @@
-messageText = $messageText;
-  }
-  public function getMessageText()
-  {
-    return $this->messageText;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTube/LiveChatUserBannedMessageDetails.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTube/LiveChatUserBannedMessageDetails.php
deleted file mode 100644
index 317bcea2..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTube/LiveChatUserBannedMessageDetails.php
+++ /dev/null
@@ -1,49 +0,0 @@
-banDurationSeconds = $banDurationSeconds;
-  }
-  public function getBanDurationSeconds()
-  {
-    return $this->banDurationSeconds;
-  }
-  public function setBanType($banType)
-  {
-    $this->banType = $banType;
-  }
-  public function getBanType()
-  {
-    return $this->banType;
-  }
-  public function setBannedUserDetails(Google_Service_YouTube_ChannelProfileDetails $bannedUserDetails)
-  {
-    $this->bannedUserDetails = $bannedUserDetails;
-  }
-  public function getBannedUserDetails()
-  {
-    return $this->bannedUserDetails;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTube/LiveStream.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTube/LiveStream.php
deleted file mode 100644
index a768fa85..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTube/LiveStream.php
+++ /dev/null
@@ -1,88 +0,0 @@
-cdn = $cdn;
-  }
-  public function getCdn()
-  {
-    return $this->cdn;
-  }
-  public function setContentDetails(Google_Service_YouTube_LiveStreamContentDetails $contentDetails)
-  {
-    $this->contentDetails = $contentDetails;
-  }
-  public function getContentDetails()
-  {
-    return $this->contentDetails;
-  }
-  public function setEtag($etag)
-  {
-    $this->etag = $etag;
-  }
-  public function getEtag()
-  {
-    return $this->etag;
-  }
-  public function setId($id)
-  {
-    $this->id = $id;
-  }
-  public function getId()
-  {
-    return $this->id;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setSnippet(Google_Service_YouTube_LiveStreamSnippet $snippet)
-  {
-    $this->snippet = $snippet;
-  }
-  public function getSnippet()
-  {
-    return $this->snippet;
-  }
-  public function setStatus(Google_Service_YouTube_LiveStreamStatus $status)
-  {
-    $this->status = $status;
-  }
-  public function getStatus()
-  {
-    return $this->status;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTube/LiveStreamConfigurationIssue.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTube/LiveStreamConfigurationIssue.php
deleted file mode 100644
index dc8e55aa..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTube/LiveStreamConfigurationIssue.php
+++ /dev/null
@@ -1,57 +0,0 @@
-description = $description;
-  }
-  public function getDescription()
-  {
-    return $this->description;
-  }
-  public function setReason($reason)
-  {
-    $this->reason = $reason;
-  }
-  public function getReason()
-  {
-    return $this->reason;
-  }
-  public function setSeverity($severity)
-  {
-    $this->severity = $severity;
-  }
-  public function getSeverity()
-  {
-    return $this->severity;
-  }
-  public function setType($type)
-  {
-    $this->type = $type;
-  }
-  public function getType()
-  {
-    return $this->type;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTube/LiveStreamContentDetails.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTube/LiveStreamContentDetails.php
deleted file mode 100644
index d6ad34e1..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTube/LiveStreamContentDetails.php
+++ /dev/null
@@ -1,39 +0,0 @@
-closedCaptionsIngestionUrl = $closedCaptionsIngestionUrl;
-  }
-  public function getClosedCaptionsIngestionUrl()
-  {
-    return $this->closedCaptionsIngestionUrl;
-  }
-  public function setIsReusable($isReusable)
-  {
-    $this->isReusable = $isReusable;
-  }
-  public function getIsReusable()
-  {
-    return $this->isReusable;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTube/LiveStreamHealthStatus.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTube/LiveStreamHealthStatus.php
deleted file mode 100644
index 5d1f3ae4..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTube/LiveStreamHealthStatus.php
+++ /dev/null
@@ -1,50 +0,0 @@
-configurationIssues = $configurationIssues;
-  }
-  public function getConfigurationIssues()
-  {
-    return $this->configurationIssues;
-  }
-  public function setLastUpdateTimeSeconds($lastUpdateTimeSeconds)
-  {
-    $this->lastUpdateTimeSeconds = $lastUpdateTimeSeconds;
-  }
-  public function getLastUpdateTimeSeconds()
-  {
-    return $this->lastUpdateTimeSeconds;
-  }
-  public function setStatus($status)
-  {
-    $this->status = $status;
-  }
-  public function getStatus()
-  {
-    return $this->status;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTube/LiveStreamListResponse.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTube/LiveStreamListResponse.php
deleted file mode 100644
index d6b312b5..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTube/LiveStreamListResponse.php
+++ /dev/null
@@ -1,106 +0,0 @@
-etag = $etag;
-  }
-  public function getEtag()
-  {
-    return $this->etag;
-  }
-  public function setEventId($eventId)
-  {
-    $this->eventId = $eventId;
-  }
-  public function getEventId()
-  {
-    return $this->eventId;
-  }
-  public function setItems($items)
-  {
-    $this->items = $items;
-  }
-  public function getItems()
-  {
-    return $this->items;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setNextPageToken($nextPageToken)
-  {
-    $this->nextPageToken = $nextPageToken;
-  }
-  public function getNextPageToken()
-  {
-    return $this->nextPageToken;
-  }
-  public function setPageInfo(Google_Service_YouTube_PageInfo $pageInfo)
-  {
-    $this->pageInfo = $pageInfo;
-  }
-  public function getPageInfo()
-  {
-    return $this->pageInfo;
-  }
-  public function setPrevPageToken($prevPageToken)
-  {
-    $this->prevPageToken = $prevPageToken;
-  }
-  public function getPrevPageToken()
-  {
-    return $this->prevPageToken;
-  }
-  public function setTokenPagination(Google_Service_YouTube_TokenPagination $tokenPagination)
-  {
-    $this->tokenPagination = $tokenPagination;
-  }
-  public function getTokenPagination()
-  {
-    return $this->tokenPagination;
-  }
-  public function setVisitorId($visitorId)
-  {
-    $this->visitorId = $visitorId;
-  }
-  public function getVisitorId()
-  {
-    return $this->visitorId;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTube/LiveStreamSnippet.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTube/LiveStreamSnippet.php
deleted file mode 100644
index 8b2a2ba0..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTube/LiveStreamSnippet.php
+++ /dev/null
@@ -1,66 +0,0 @@
-channelId = $channelId;
-  }
-  public function getChannelId()
-  {
-    return $this->channelId;
-  }
-  public function setDescription($description)
-  {
-    $this->description = $description;
-  }
-  public function getDescription()
-  {
-    return $this->description;
-  }
-  public function setIsDefaultStream($isDefaultStream)
-  {
-    $this->isDefaultStream = $isDefaultStream;
-  }
-  public function getIsDefaultStream()
-  {
-    return $this->isDefaultStream;
-  }
-  public function setPublishedAt($publishedAt)
-  {
-    $this->publishedAt = $publishedAt;
-  }
-  public function getPublishedAt()
-  {
-    return $this->publishedAt;
-  }
-  public function setTitle($title)
-  {
-    $this->title = $title;
-  }
-  public function getTitle()
-  {
-    return $this->title;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTube/LiveStreamStatus.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTube/LiveStreamStatus.php
deleted file mode 100644
index fe1084a1..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTube/LiveStreamStatus.php
+++ /dev/null
@@ -1,40 +0,0 @@
-healthStatus = $healthStatus;
-  }
-  public function getHealthStatus()
-  {
-    return $this->healthStatus;
-  }
-  public function setStreamStatus($streamStatus)
-  {
-    $this->streamStatus = $streamStatus;
-  }
-  public function getStreamStatus()
-  {
-    return $this->streamStatus;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTube/LocalizedProperty.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTube/LocalizedProperty.php
deleted file mode 100644
index fd69cd81..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTube/LocalizedProperty.php
+++ /dev/null
@@ -1,51 +0,0 @@
-default = $default;
-  }
-  public function getDefault()
-  {
-    return $this->default;
-  }
-  public function setDefaultLanguage(Google_Service_YouTube_LanguageTag $defaultLanguage)
-  {
-    $this->defaultLanguage = $defaultLanguage;
-  }
-  public function getDefaultLanguage()
-  {
-    return $this->defaultLanguage;
-  }
-  public function setLocalized($localized)
-  {
-    $this->localized = $localized;
-  }
-  public function getLocalized()
-  {
-    return $this->localized;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTube/LocalizedString.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTube/LocalizedString.php
deleted file mode 100644
index 49c26622..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTube/LocalizedString.php
+++ /dev/null
@@ -1,39 +0,0 @@
-language = $language;
-  }
-  public function getLanguage()
-  {
-    return $this->language;
-  }
-  public function setValue($value)
-  {
-    $this->value = $value;
-  }
-  public function getValue()
-  {
-    return $this->value;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTube/MonitorStreamInfo.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTube/MonitorStreamInfo.php
deleted file mode 100644
index abaf875f..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTube/MonitorStreamInfo.php
+++ /dev/null
@@ -1,48 +0,0 @@
-broadcastStreamDelayMs = $broadcastStreamDelayMs;
-  }
-  public function getBroadcastStreamDelayMs()
-  {
-    return $this->broadcastStreamDelayMs;
-  }
-  public function setEmbedHtml($embedHtml)
-  {
-    $this->embedHtml = $embedHtml;
-  }
-  public function getEmbedHtml()
-  {
-    return $this->embedHtml;
-  }
-  public function setEnableMonitorStream($enableMonitorStream)
-  {
-    $this->enableMonitorStream = $enableMonitorStream;
-  }
-  public function getEnableMonitorStream()
-  {
-    return $this->enableMonitorStream;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTube/PageInfo.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTube/PageInfo.php
deleted file mode 100644
index 186195dd..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTube/PageInfo.php
+++ /dev/null
@@ -1,39 +0,0 @@
-resultsPerPage = $resultsPerPage;
-  }
-  public function getResultsPerPage()
-  {
-    return $this->resultsPerPage;
-  }
-  public function setTotalResults($totalResults)
-  {
-    $this->totalResults = $totalResults;
-  }
-  public function getTotalResults()
-  {
-    return $this->totalResults;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTube/Playlist.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTube/Playlist.php
deleted file mode 100644
index ae07be22..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTube/Playlist.php
+++ /dev/null
@@ -1,98 +0,0 @@
-contentDetails = $contentDetails;
-  }
-  public function getContentDetails()
-  {
-    return $this->contentDetails;
-  }
-  public function setEtag($etag)
-  {
-    $this->etag = $etag;
-  }
-  public function getEtag()
-  {
-    return $this->etag;
-  }
-  public function setId($id)
-  {
-    $this->id = $id;
-  }
-  public function getId()
-  {
-    return $this->id;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setLocalizations($localizations)
-  {
-    $this->localizations = $localizations;
-  }
-  public function getLocalizations()
-  {
-    return $this->localizations;
-  }
-  public function setPlayer(Google_Service_YouTube_PlaylistPlayer $player)
-  {
-    $this->player = $player;
-  }
-  public function getPlayer()
-  {
-    return $this->player;
-  }
-  public function setSnippet(Google_Service_YouTube_PlaylistSnippet $snippet)
-  {
-    $this->snippet = $snippet;
-  }
-  public function getSnippet()
-  {
-    return $this->snippet;
-  }
-  public function setStatus(Google_Service_YouTube_PlaylistStatus $status)
-  {
-    $this->status = $status;
-  }
-  public function getStatus()
-  {
-    return $this->status;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTube/PlaylistContentDetails.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTube/PlaylistContentDetails.php
deleted file mode 100644
index bd6ba396..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTube/PlaylistContentDetails.php
+++ /dev/null
@@ -1,30 +0,0 @@
-itemCount = $itemCount;
-  }
-  public function getItemCount()
-  {
-    return $this->itemCount;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTube/PlaylistItem.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTube/PlaylistItem.php
deleted file mode 100644
index 04682ef9..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTube/PlaylistItem.php
+++ /dev/null
@@ -1,78 +0,0 @@
-contentDetails = $contentDetails;
-  }
-  public function getContentDetails()
-  {
-    return $this->contentDetails;
-  }
-  public function setEtag($etag)
-  {
-    $this->etag = $etag;
-  }
-  public function getEtag()
-  {
-    return $this->etag;
-  }
-  public function setId($id)
-  {
-    $this->id = $id;
-  }
-  public function getId()
-  {
-    return $this->id;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setSnippet(Google_Service_YouTube_PlaylistItemSnippet $snippet)
-  {
-    $this->snippet = $snippet;
-  }
-  public function getSnippet()
-  {
-    return $this->snippet;
-  }
-  public function setStatus(Google_Service_YouTube_PlaylistItemStatus $status)
-  {
-    $this->status = $status;
-  }
-  public function getStatus()
-  {
-    return $this->status;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTube/PlaylistItemContentDetails.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTube/PlaylistItemContentDetails.php
deleted file mode 100644
index 2799050d..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTube/PlaylistItemContentDetails.php
+++ /dev/null
@@ -1,66 +0,0 @@
-endAt = $endAt;
-  }
-  public function getEndAt()
-  {
-    return $this->endAt;
-  }
-  public function setNote($note)
-  {
-    $this->note = $note;
-  }
-  public function getNote()
-  {
-    return $this->note;
-  }
-  public function setStartAt($startAt)
-  {
-    $this->startAt = $startAt;
-  }
-  public function getStartAt()
-  {
-    return $this->startAt;
-  }
-  public function setVideoId($videoId)
-  {
-    $this->videoId = $videoId;
-  }
-  public function getVideoId()
-  {
-    return $this->videoId;
-  }
-  public function setVideoPublishedAt($videoPublishedAt)
-  {
-    $this->videoPublishedAt = $videoPublishedAt;
-  }
-  public function getVideoPublishedAt()
-  {
-    return $this->videoPublishedAt;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTube/PlaylistItemListResponse.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTube/PlaylistItemListResponse.php
deleted file mode 100644
index ae601848..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTube/PlaylistItemListResponse.php
+++ /dev/null
@@ -1,106 +0,0 @@
-etag = $etag;
-  }
-  public function getEtag()
-  {
-    return $this->etag;
-  }
-  public function setEventId($eventId)
-  {
-    $this->eventId = $eventId;
-  }
-  public function getEventId()
-  {
-    return $this->eventId;
-  }
-  public function setItems($items)
-  {
-    $this->items = $items;
-  }
-  public function getItems()
-  {
-    return $this->items;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setNextPageToken($nextPageToken)
-  {
-    $this->nextPageToken = $nextPageToken;
-  }
-  public function getNextPageToken()
-  {
-    return $this->nextPageToken;
-  }
-  public function setPageInfo(Google_Service_YouTube_PageInfo $pageInfo)
-  {
-    $this->pageInfo = $pageInfo;
-  }
-  public function getPageInfo()
-  {
-    return $this->pageInfo;
-  }
-  public function setPrevPageToken($prevPageToken)
-  {
-    $this->prevPageToken = $prevPageToken;
-  }
-  public function getPrevPageToken()
-  {
-    return $this->prevPageToken;
-  }
-  public function setTokenPagination(Google_Service_YouTube_TokenPagination $tokenPagination)
-  {
-    $this->tokenPagination = $tokenPagination;
-  }
-  public function getTokenPagination()
-  {
-    return $this->tokenPagination;
-  }
-  public function setVisitorId($visitorId)
-  {
-    $this->visitorId = $visitorId;
-  }
-  public function getVisitorId()
-  {
-    return $this->visitorId;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTube/PlaylistItemSnippet.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTube/PlaylistItemSnippet.php
deleted file mode 100644
index c837145f..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTube/PlaylistItemSnippet.php
+++ /dev/null
@@ -1,104 +0,0 @@
-channelId = $channelId;
-  }
-  public function getChannelId()
-  {
-    return $this->channelId;
-  }
-  public function setChannelTitle($channelTitle)
-  {
-    $this->channelTitle = $channelTitle;
-  }
-  public function getChannelTitle()
-  {
-    return $this->channelTitle;
-  }
-  public function setDescription($description)
-  {
-    $this->description = $description;
-  }
-  public function getDescription()
-  {
-    return $this->description;
-  }
-  public function setPlaylistId($playlistId)
-  {
-    $this->playlistId = $playlistId;
-  }
-  public function getPlaylistId()
-  {
-    return $this->playlistId;
-  }
-  public function setPosition($position)
-  {
-    $this->position = $position;
-  }
-  public function getPosition()
-  {
-    return $this->position;
-  }
-  public function setPublishedAt($publishedAt)
-  {
-    $this->publishedAt = $publishedAt;
-  }
-  public function getPublishedAt()
-  {
-    return $this->publishedAt;
-  }
-  public function setResourceId(Google_Service_YouTube_ResourceId $resourceId)
-  {
-    $this->resourceId = $resourceId;
-  }
-  public function getResourceId()
-  {
-    return $this->resourceId;
-  }
-  public function setThumbnails(Google_Service_YouTube_ThumbnailDetails $thumbnails)
-  {
-    $this->thumbnails = $thumbnails;
-  }
-  public function getThumbnails()
-  {
-    return $this->thumbnails;
-  }
-  public function setTitle($title)
-  {
-    $this->title = $title;
-  }
-  public function getTitle()
-  {
-    return $this->title;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTube/PlaylistItemStatus.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTube/PlaylistItemStatus.php
deleted file mode 100644
index 369bea1c..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTube/PlaylistItemStatus.php
+++ /dev/null
@@ -1,30 +0,0 @@
-privacyStatus = $privacyStatus;
-  }
-  public function getPrivacyStatus()
-  {
-    return $this->privacyStatus;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTube/PlaylistListResponse.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTube/PlaylistListResponse.php
deleted file mode 100644
index 1728d214..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTube/PlaylistListResponse.php
+++ /dev/null
@@ -1,106 +0,0 @@
-etag = $etag;
-  }
-  public function getEtag()
-  {
-    return $this->etag;
-  }
-  public function setEventId($eventId)
-  {
-    $this->eventId = $eventId;
-  }
-  public function getEventId()
-  {
-    return $this->eventId;
-  }
-  public function setItems($items)
-  {
-    $this->items = $items;
-  }
-  public function getItems()
-  {
-    return $this->items;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setNextPageToken($nextPageToken)
-  {
-    $this->nextPageToken = $nextPageToken;
-  }
-  public function getNextPageToken()
-  {
-    return $this->nextPageToken;
-  }
-  public function setPageInfo(Google_Service_YouTube_PageInfo $pageInfo)
-  {
-    $this->pageInfo = $pageInfo;
-  }
-  public function getPageInfo()
-  {
-    return $this->pageInfo;
-  }
-  public function setPrevPageToken($prevPageToken)
-  {
-    $this->prevPageToken = $prevPageToken;
-  }
-  public function getPrevPageToken()
-  {
-    return $this->prevPageToken;
-  }
-  public function setTokenPagination(Google_Service_YouTube_TokenPagination $tokenPagination)
-  {
-    $this->tokenPagination = $tokenPagination;
-  }
-  public function getTokenPagination()
-  {
-    return $this->tokenPagination;
-  }
-  public function setVisitorId($visitorId)
-  {
-    $this->visitorId = $visitorId;
-  }
-  public function getVisitorId()
-  {
-    return $this->visitorId;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTube/PlaylistLocalization.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTube/PlaylistLocalization.php
deleted file mode 100644
index 15dc4243..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTube/PlaylistLocalization.php
+++ /dev/null
@@ -1,39 +0,0 @@
-description = $description;
-  }
-  public function getDescription()
-  {
-    return $this->description;
-  }
-  public function setTitle($title)
-  {
-    $this->title = $title;
-  }
-  public function getTitle()
-  {
-    return $this->title;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTube/PlaylistPlayer.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTube/PlaylistPlayer.php
deleted file mode 100644
index 2689dc13..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTube/PlaylistPlayer.php
+++ /dev/null
@@ -1,30 +0,0 @@
-embedHtml = $embedHtml;
-  }
-  public function getEmbedHtml()
-  {
-    return $this->embedHtml;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTube/PlaylistSnippet.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTube/PlaylistSnippet.php
deleted file mode 100644
index 89e191cf..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTube/PlaylistSnippet.php
+++ /dev/null
@@ -1,105 +0,0 @@
-channelId = $channelId;
-  }
-  public function getChannelId()
-  {
-    return $this->channelId;
-  }
-  public function setChannelTitle($channelTitle)
-  {
-    $this->channelTitle = $channelTitle;
-  }
-  public function getChannelTitle()
-  {
-    return $this->channelTitle;
-  }
-  public function setDefaultLanguage($defaultLanguage)
-  {
-    $this->defaultLanguage = $defaultLanguage;
-  }
-  public function getDefaultLanguage()
-  {
-    return $this->defaultLanguage;
-  }
-  public function setDescription($description)
-  {
-    $this->description = $description;
-  }
-  public function getDescription()
-  {
-    return $this->description;
-  }
-  public function setLocalized(Google_Service_YouTube_PlaylistLocalization $localized)
-  {
-    $this->localized = $localized;
-  }
-  public function getLocalized()
-  {
-    return $this->localized;
-  }
-  public function setPublishedAt($publishedAt)
-  {
-    $this->publishedAt = $publishedAt;
-  }
-  public function getPublishedAt()
-  {
-    return $this->publishedAt;
-  }
-  public function setTags($tags)
-  {
-    $this->tags = $tags;
-  }
-  public function getTags()
-  {
-    return $this->tags;
-  }
-  public function setThumbnails(Google_Service_YouTube_ThumbnailDetails $thumbnails)
-  {
-    $this->thumbnails = $thumbnails;
-  }
-  public function getThumbnails()
-  {
-    return $this->thumbnails;
-  }
-  public function setTitle($title)
-  {
-    $this->title = $title;
-  }
-  public function getTitle()
-  {
-    return $this->title;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTube/PlaylistStatus.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTube/PlaylistStatus.php
deleted file mode 100644
index 3d9ddb5f..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTube/PlaylistStatus.php
+++ /dev/null
@@ -1,30 +0,0 @@
-privacyStatus = $privacyStatus;
-  }
-  public function getPrivacyStatus()
-  {
-    return $this->privacyStatus;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTube/PromotedItem.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTube/PromotedItem.php
deleted file mode 100644
index 7d39b65d..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTube/PromotedItem.php
+++ /dev/null
@@ -1,59 +0,0 @@
-customMessage = $customMessage;
-  }
-  public function getCustomMessage()
-  {
-    return $this->customMessage;
-  }
-  public function setId(Google_Service_YouTube_PromotedItemId $id)
-  {
-    $this->id = $id;
-  }
-  public function getId()
-  {
-    return $this->id;
-  }
-  public function setPromotedByContentOwner($promotedByContentOwner)
-  {
-    $this->promotedByContentOwner = $promotedByContentOwner;
-  }
-  public function getPromotedByContentOwner()
-  {
-    return $this->promotedByContentOwner;
-  }
-  public function setTiming(Google_Service_YouTube_InvideoTiming $timing)
-  {
-    $this->timing = $timing;
-  }
-  public function getTiming()
-  {
-    return $this->timing;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTube/PromotedItemId.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTube/PromotedItemId.php
deleted file mode 100644
index 64f3b33c..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTube/PromotedItemId.php
+++ /dev/null
@@ -1,57 +0,0 @@
-recentlyUploadedBy = $recentlyUploadedBy;
-  }
-  public function getRecentlyUploadedBy()
-  {
-    return $this->recentlyUploadedBy;
-  }
-  public function setType($type)
-  {
-    $this->type = $type;
-  }
-  public function getType()
-  {
-    return $this->type;
-  }
-  public function setVideoId($videoId)
-  {
-    $this->videoId = $videoId;
-  }
-  public function getVideoId()
-  {
-    return $this->videoId;
-  }
-  public function setWebsiteUrl($websiteUrl)
-  {
-    $this->websiteUrl = $websiteUrl;
-  }
-  public function getWebsiteUrl()
-  {
-    return $this->websiteUrl;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTube/PropertyValue.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTube/PropertyValue.php
deleted file mode 100644
index 23e2a2bd..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTube/PropertyValue.php
+++ /dev/null
@@ -1,39 +0,0 @@
-property = $property;
-  }
-  public function getProperty()
-  {
-    return $this->property;
-  }
-  public function setValue($value)
-  {
-    $this->value = $value;
-  }
-  public function getValue()
-  {
-    return $this->value;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTube/Resource/Activities.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTube/Resource/Activities.php
deleted file mode 100644
index eb30ba16..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTube/Resource/Activities.php
+++ /dev/null
@@ -1,109 +0,0 @@
-
- *   $youtubeService = new Google_Service_YouTube(...);
- *   $activities = $youtubeService->activities;
- *  
- */
-class Google_Service_YouTube_Resource_Activities extends Google_Service_Resource
-{
-  /**
-   * Posts a bulletin for a specific channel. (The user submitting the request
-   * must be authorized to act on the channel's behalf.)
-   *
-   * Note: Even though an activity resource can contain information about actions
-   * like a user rating a video or marking a video as a favorite, you need to use
-   * other API methods to generate those activity resources. For example, you
-   * would use the API's videos.rate() method to rate a video and the
-   * playlistItems.insert() method to mark a video as a favorite.
-   * (activities.insert)
-   *
-   * @param string $part The part parameter serves two purposes in this operation.
-   * It identifies the properties that the write operation will set as well as the
-   * properties that the API response will include.
-   * @param Google_Service_YouTube_Activity $postBody
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_YouTube_Activity
-   */
-  public function insert($part, Google_Service_YouTube_Activity $postBody, $optParams = array())
-  {
-    $params = array('part' => $part, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('insert', array($params), "Google_Service_YouTube_Activity");
-  }
-  /**
-   * Returns a list of channel activity events that match the request criteria.
-   * For example, you can retrieve events associated with a particular channel,
-   * events associated with the user's subscriptions and Google+ friends, or the
-   * YouTube home page feed, which is customized for each user.
-   * (activities.listActivities)
-   *
-   * @param string $part The part parameter specifies a comma-separated list of
-   * one or more activity resource properties that the API response will include.
-   *
-   * If the parameter identifies a property that contains child properties, the
-   * child properties will be included in the response. For example, in an
-   * activity resource, the snippet property contains other properties that
-   * identify the type of activity, a display title for the activity, and so
-   * forth. If you set part=snippet, the API response will also contain all of
-   * those nested properties.
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param string channelId The channelId parameter specifies a unique
-   * YouTube channel ID. The API will then return a list of that channel's
-   * activities.
-   * @opt_param bool home Set this parameter's value to true to retrieve the
-   * activity feed that displays on the YouTube home page for the currently
-   * authenticated user.
-   * @opt_param string maxResults The maxResults parameter specifies the maximum
-   * number of items that should be returned in the result set.
-   * @opt_param bool mine Set this parameter's value to true to retrieve a feed of
-   * the authenticated user's activities.
-   * @opt_param string pageToken The pageToken parameter identifies a specific
-   * page in the result set that should be returned. In an API response, the
-   * nextPageToken and prevPageToken properties identify other pages that could be
-   * retrieved.
-   * @opt_param string publishedAfter The publishedAfter parameter specifies the
-   * earliest date and time that an activity could have occurred for that activity
-   * to be included in the API response. If the parameter value specifies a day,
-   * but not a time, then any activities that occurred that day will be included
-   * in the result set. The value is specified in ISO 8601 (YYYY-MM-
-   * DDThh:mm:ss.sZ) format.
-   * @opt_param string publishedBefore The publishedBefore parameter specifies the
-   * date and time before which an activity must have occurred for that activity
-   * to be included in the API response. If the parameter value specifies a day,
-   * but not a time, then any activities that occurred that day will be excluded
-   * from the result set. The value is specified in ISO 8601 (YYYY-MM-
-   * DDThh:mm:ss.sZ) format.
-   * @opt_param string regionCode The regionCode parameter instructs the API to
-   * return results for the specified country. The parameter value is an ISO
-   * 3166-1 alpha-2 country code. YouTube uses this value when the authorized
-   * user's previous activity on YouTube does not provide enough information to
-   * generate the activity feed.
-   * @return Google_Service_YouTube_ActivityListResponse
-   */
-  public function listActivities($part, $optParams = array())
-  {
-    $params = array('part' => $part);
-    $params = array_merge($params, $optParams);
-    return $this->call('list', array($params), "Google_Service_YouTube_ActivityListResponse");
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTube/Resource/Captions.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTube/Resource/Captions.php
deleted file mode 100644
index 3335b6ac..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTube/Resource/Captions.php
+++ /dev/null
@@ -1,215 +0,0 @@
-
- *   $youtubeService = new Google_Service_YouTube(...);
- *   $captions = $youtubeService->captions;
- *  
- */
-class Google_Service_YouTube_Resource_Captions extends Google_Service_Resource
-{
-  /**
-   * Deletes a specified caption track. (captions.delete)
-   *
-   * @param string $id The id parameter identifies the caption track that is being
-   * deleted. The value is a caption track ID as identified by the id property in
-   * a caption resource.
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param string onBehalfOf ID of the Google+ Page for the channel that the
-   * request is be on behalf of
-   * @opt_param string onBehalfOfContentOwner Note: This parameter is intended
-   * exclusively for YouTube content partners.
-   *
-   * The onBehalfOfContentOwner parameter indicates that the request's
-   * authorization credentials identify a YouTube CMS user who is acting on behalf
-   * of the content owner specified in the parameter value. This parameter is
-   * intended for YouTube content partners that own and manage many different
-   * YouTube channels. It allows content owners to authenticate once and get
-   * access to all their video and channel data, without having to provide
-   * authentication credentials for each individual channel. The actual CMS
-   * account that the user authenticates with must be linked to the specified
-   * YouTube content owner.
-   */
-  public function delete($id, $optParams = array())
-  {
-    $params = array('id' => $id);
-    $params = array_merge($params, $optParams);
-    return $this->call('delete', array($params));
-  }
-  /**
-   * Downloads a caption track. The caption track is returned in its original
-   * format unless the request specifies a value for the tfmt parameter and in its
-   * original language unless the request specifies a value for the tlang
-   * parameter. (captions.download)
-   *
-   * @param string $id The id parameter identifies the caption track that is being
-   * retrieved. The value is a caption track ID as identified by the id property
-   * in a caption resource.
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param string onBehalfOf ID of the Google+ Page for the channel that the
-   * request is be on behalf of
-   * @opt_param string onBehalfOfContentOwner Note: This parameter is intended
-   * exclusively for YouTube content partners.
-   *
-   * The onBehalfOfContentOwner parameter indicates that the request's
-   * authorization credentials identify a YouTube CMS user who is acting on behalf
-   * of the content owner specified in the parameter value. This parameter is
-   * intended for YouTube content partners that own and manage many different
-   * YouTube channels. It allows content owners to authenticate once and get
-   * access to all their video and channel data, without having to provide
-   * authentication credentials for each individual channel. The actual CMS
-   * account that the user authenticates with must be linked to the specified
-   * YouTube content owner.
-   * @opt_param string tfmt The tfmt parameter specifies that the caption track
-   * should be returned in a specific format. If the parameter is not included in
-   * the request, the track is returned in its original format.
-   * @opt_param string tlang The tlang parameter specifies that the API response
-   * should return a translation of the specified caption track. The parameter
-   * value is an ISO 639-1 two-letter language code that identifies the desired
-   * caption language. The translation is generated by using machine translation,
-   * such as Google Translate.
-   */
-  public function download($id, $optParams = array())
-  {
-    $params = array('id' => $id);
-    $params = array_merge($params, $optParams);
-    return $this->call('download', array($params));
-  }
-  /**
-   * Uploads a caption track. (captions.insert)
-   *
-   * @param string $part The part parameter specifies the caption resource parts
-   * that the API response will include. Set the parameter value to snippet.
-   * @param Google_Service_YouTube_Caption $postBody
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param string onBehalfOf ID of the Google+ Page for the channel that the
-   * request is be on behalf of
-   * @opt_param string onBehalfOfContentOwner Note: This parameter is intended
-   * exclusively for YouTube content partners.
-   *
-   * The onBehalfOfContentOwner parameter indicates that the request's
-   * authorization credentials identify a YouTube CMS user who is acting on behalf
-   * of the content owner specified in the parameter value. This parameter is
-   * intended for YouTube content partners that own and manage many different
-   * YouTube channels. It allows content owners to authenticate once and get
-   * access to all their video and channel data, without having to provide
-   * authentication credentials for each individual channel. The actual CMS
-   * account that the user authenticates with must be linked to the specified
-   * YouTube content owner.
-   * @opt_param bool sync The sync parameter indicates whether YouTube should
-   * automatically synchronize the caption file with the audio track of the video.
-   * If you set the value to true, YouTube will disregard any time codes that are
-   * in the uploaded caption file and generate new time codes for the captions.
-   *
-   * You should set the sync parameter to true if you are uploading a transcript,
-   * which has no time codes, or if you suspect the time codes in your file are
-   * incorrect and want YouTube to try to fix them.
-   * @return Google_Service_YouTube_Caption
-   */
-  public function insert($part, Google_Service_YouTube_Caption $postBody, $optParams = array())
-  {
-    $params = array('part' => $part, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('insert', array($params), "Google_Service_YouTube_Caption");
-  }
-  /**
-   * Returns a list of caption tracks that are associated with a specified video.
-   * Note that the API response does not contain the actual captions and that the
-   * captions.download method provides the ability to retrieve a caption track.
-   * (captions.listCaptions)
-   *
-   * @param string $part The part parameter specifies a comma-separated list of
-   * one or more caption resource parts that the API response will include. The
-   * part names that you can include in the parameter value are id and snippet.
-   * @param string $videoId The videoId parameter specifies the YouTube video ID
-   * of the video for which the API should return caption tracks.
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param string id The id parameter specifies a comma-separated list of IDs
-   * that identify the caption resources that should be retrieved. Each ID must
-   * identify a caption track associated with the specified video.
-   * @opt_param string onBehalfOf ID of the Google+ Page for the channel that the
-   * request is on behalf of.
-   * @opt_param string onBehalfOfContentOwner Note: This parameter is intended
-   * exclusively for YouTube content partners.
-   *
-   * The onBehalfOfContentOwner parameter indicates that the request's
-   * authorization credentials identify a YouTube CMS user who is acting on behalf
-   * of the content owner specified in the parameter value. This parameter is
-   * intended for YouTube content partners that own and manage many different
-   * YouTube channels. It allows content owners to authenticate once and get
-   * access to all their video and channel data, without having to provide
-   * authentication credentials for each individual channel. The actual CMS
-   * account that the user authenticates with must be linked to the specified
-   * YouTube content owner.
-   * @return Google_Service_YouTube_CaptionListResponse
-   */
-  public function listCaptions($part, $videoId, $optParams = array())
-  {
-    $params = array('part' => $part, 'videoId' => $videoId);
-    $params = array_merge($params, $optParams);
-    return $this->call('list', array($params), "Google_Service_YouTube_CaptionListResponse");
-  }
-  /**
-   * Updates a caption track. When updating a caption track, you can change the
-   * track's draft status, upload a new caption file for the track, or both.
-   * (captions.update)
-   *
-   * @param string $part The part parameter serves two purposes in this operation.
-   * It identifies the properties that the write operation will set as well as the
-   * properties that the API response will include. Set the property value to
-   * snippet if you are updating the track's draft status. Otherwise, set the
-   * property value to id.
-   * @param Google_Service_YouTube_Caption $postBody
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param string onBehalfOf ID of the Google+ Page for the channel that the
-   * request is be on behalf of
-   * @opt_param string onBehalfOfContentOwner Note: This parameter is intended
-   * exclusively for YouTube content partners.
-   *
-   * The onBehalfOfContentOwner parameter indicates that the request's
-   * authorization credentials identify a YouTube CMS user who is acting on behalf
-   * of the content owner specified in the parameter value. This parameter is
-   * intended for YouTube content partners that own and manage many different
-   * YouTube channels. It allows content owners to authenticate once and get
-   * access to all their video and channel data, without having to provide
-   * authentication credentials for each individual channel. The actual CMS
-   * account that the user authenticates with must be linked to the specified
-   * YouTube content owner.
-   * @opt_param bool sync Note: The API server only processes the parameter value
-   * if the request contains an updated caption file.
-   *
-   * The sync parameter indicates whether YouTube should automatically synchronize
-   * the caption file with the audio track of the video. If you set the value to
-   * true, YouTube will automatically synchronize the caption track with the audio
-   * track.
-   * @return Google_Service_YouTube_Caption
-   */
-  public function update($part, Google_Service_YouTube_Caption $postBody, $optParams = array())
-  {
-    $params = array('part' => $part, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('update', array($params), "Google_Service_YouTube_Caption");
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTube/Resource/ChannelBanners.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTube/Resource/ChannelBanners.php
deleted file mode 100644
index c03b33d0..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTube/Resource/ChannelBanners.php
+++ /dev/null
@@ -1,62 +0,0 @@
-
- *   $youtubeService = new Google_Service_YouTube(...);
- *   $channelBanners = $youtubeService->channelBanners;
- *  
- */
-class Google_Service_YouTube_Resource_ChannelBanners extends Google_Service_Resource
-{
-  /**
-   * Uploads a channel banner image to YouTube. This method represents the first
-   * two steps in a three-step process to update the banner image for a channel:
-   *
-   * - Call the channelBanners.insert method to upload the binary image data to
-   * YouTube. The image must have a 16:9 aspect ratio and be at least 2120x1192
-   * pixels. - Extract the url property's value from the response that the API
-   * returns for step 1. - Call the channels.update method to update the channel's
-   * branding settings. Set the brandingSettings.image.bannerExternalUrl
-   * property's value to the URL obtained in step 2. (channelBanners.insert)
-   *
-   * @param Google_Service_YouTube_ChannelBannerResource $postBody
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param string onBehalfOfContentOwner Note: This parameter is intended
-   * exclusively for YouTube content partners.
-   *
-   * The onBehalfOfContentOwner parameter indicates that the request's
-   * authorization credentials identify a YouTube CMS user who is acting on behalf
-   * of the content owner specified in the parameter value. This parameter is
-   * intended for YouTube content partners that own and manage many different
-   * YouTube channels. It allows content owners to authenticate once and get
-   * access to all their video and channel data, without having to provide
-   * authentication credentials for each individual channel. The CMS account that
-   * the user authenticates with must be linked to the specified YouTube content
-   * owner.
-   * @return Google_Service_YouTube_ChannelBannerResource
-   */
-  public function insert(Google_Service_YouTube_ChannelBannerResource $postBody, $optParams = array())
-  {
-    $params = array('postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('insert', array($params), "Google_Service_YouTube_ChannelBannerResource");
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTube/Resource/ChannelSections.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTube/Resource/ChannelSections.php
deleted file mode 100644
index 2ad138f8..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTube/Resource/ChannelSections.php
+++ /dev/null
@@ -1,190 +0,0 @@
-
- *   $youtubeService = new Google_Service_YouTube(...);
- *   $channelSections = $youtubeService->channelSections;
- *  
- */
-class Google_Service_YouTube_Resource_ChannelSections extends Google_Service_Resource
-{
-  /**
-   * Deletes a channelSection. (channelSections.delete)
-   *
-   * @param string $id The id parameter specifies the YouTube channelSection ID
-   * for the resource that is being deleted. In a channelSection resource, the id
-   * property specifies the YouTube channelSection ID.
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param string onBehalfOfContentOwner Note: This parameter is intended
-   * exclusively for YouTube content partners.
-   *
-   * The onBehalfOfContentOwner parameter indicates that the request's
-   * authorization credentials identify a YouTube CMS user who is acting on behalf
-   * of the content owner specified in the parameter value. This parameter is
-   * intended for YouTube content partners that own and manage many different
-   * YouTube channels. It allows content owners to authenticate once and get
-   * access to all their video and channel data, without having to provide
-   * authentication credentials for each individual channel. The CMS account that
-   * the user authenticates with must be linked to the specified YouTube content
-   * owner.
-   */
-  public function delete($id, $optParams = array())
-  {
-    $params = array('id' => $id);
-    $params = array_merge($params, $optParams);
-    return $this->call('delete', array($params));
-  }
-  /**
-   * Adds a channelSection for the authenticated user's channel.
-   * (channelSections.insert)
-   *
-   * @param string $part The part parameter serves two purposes in this operation.
-   * It identifies the properties that the write operation will set as well as the
-   * properties that the API response will include.
-   *
-   * The part names that you can include in the parameter value are snippet and
-   * contentDetails.
-   * @param Google_Service_YouTube_ChannelSection $postBody
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param string onBehalfOfContentOwner Note: This parameter is intended
-   * exclusively for YouTube content partners.
-   *
-   * The onBehalfOfContentOwner parameter indicates that the request's
-   * authorization credentials identify a YouTube CMS user who is acting on behalf
-   * of the content owner specified in the parameter value. This parameter is
-   * intended for YouTube content partners that own and manage many different
-   * YouTube channels. It allows content owners to authenticate once and get
-   * access to all their video and channel data, without having to provide
-   * authentication credentials for each individual channel. The CMS account that
-   * the user authenticates with must be linked to the specified YouTube content
-   * owner.
-   * @opt_param string onBehalfOfContentOwnerChannel This parameter can only be
-   * used in a properly authorized request. Note: This parameter is intended
-   * exclusively for YouTube content partners.
-   *
-   * The onBehalfOfContentOwnerChannel parameter specifies the YouTube channel ID
-   * of the channel to which a video is being added. This parameter is required
-   * when a request specifies a value for the onBehalfOfContentOwner parameter,
-   * and it can only be used in conjunction with that parameter. In addition, the
-   * request must be authorized using a CMS account that is linked to the content
-   * owner that the onBehalfOfContentOwner parameter specifies. Finally, the
-   * channel that the onBehalfOfContentOwnerChannel parameter value specifies must
-   * be linked to the content owner that the onBehalfOfContentOwner parameter
-   * specifies.
-   *
-   * This parameter is intended for YouTube content partners that own and manage
-   * many different YouTube channels. It allows content owners to authenticate
-   * once and perform actions on behalf of the channel specified in the parameter
-   * value, without having to provide authentication credentials for each separate
-   * channel.
-   * @return Google_Service_YouTube_ChannelSection
-   */
-  public function insert($part, Google_Service_YouTube_ChannelSection $postBody, $optParams = array())
-  {
-    $params = array('part' => $part, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('insert', array($params), "Google_Service_YouTube_ChannelSection");
-  }
-  /**
-   * Returns channelSection resources that match the API request criteria.
-   * (channelSections.listChannelSections)
-   *
-   * @param string $part The part parameter specifies a comma-separated list of
-   * one or more channelSection resource properties that the API response will
-   * include. The part names that you can include in the parameter value are id,
-   * snippet, and contentDetails.
-   *
-   * If the parameter identifies a property that contains child properties, the
-   * child properties will be included in the response. For example, in a
-   * channelSection resource, the snippet property contains other properties, such
-   * as a display title for the channelSection. If you set part=snippet, the API
-   * response will also contain all of those nested properties.
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param string channelId The channelId parameter specifies a YouTube
-   * channel ID. The API will only return that channel's channelSections.
-   * @opt_param string hl The hl parameter indicates that the snippet.localized
-   * property values in the returned channelSection resources should be in the
-   * specified language if localized values for that language are available. For
-   * example, if the API request specifies hl=de, the snippet.localized properties
-   * in the API response will contain German titles if German titles are
-   * available. Channel owners can provide localized channel section titles using
-   * either the channelSections.insert or channelSections.update method.
-   * @opt_param string id The id parameter specifies a comma-separated list of the
-   * YouTube channelSection ID(s) for the resource(s) that are being retrieved. In
-   * a channelSection resource, the id property specifies the YouTube
-   * channelSection ID.
-   * @opt_param bool mine Set this parameter's value to true to retrieve a feed of
-   * the authenticated user's channelSections.
-   * @opt_param string onBehalfOfContentOwner Note: This parameter is intended
-   * exclusively for YouTube content partners.
-   *
-   * The onBehalfOfContentOwner parameter indicates that the request's
-   * authorization credentials identify a YouTube CMS user who is acting on behalf
-   * of the content owner specified in the parameter value. This parameter is
-   * intended for YouTube content partners that own and manage many different
-   * YouTube channels. It allows content owners to authenticate once and get
-   * access to all their video and channel data, without having to provide
-   * authentication credentials for each individual channel. The CMS account that
-   * the user authenticates with must be linked to the specified YouTube content
-   * owner.
-   * @return Google_Service_YouTube_ChannelSectionListResponse
-   */
-  public function listChannelSections($part, $optParams = array())
-  {
-    $params = array('part' => $part);
-    $params = array_merge($params, $optParams);
-    return $this->call('list', array($params), "Google_Service_YouTube_ChannelSectionListResponse");
-  }
-  /**
-   * Update a channelSection. (channelSections.update)
-   *
-   * @param string $part The part parameter serves two purposes in this operation.
-   * It identifies the properties that the write operation will set as well as the
-   * properties that the API response will include.
-   *
-   * The part names that you can include in the parameter value are snippet and
-   * contentDetails.
-   * @param Google_Service_YouTube_ChannelSection $postBody
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param string onBehalfOfContentOwner Note: This parameter is intended
-   * exclusively for YouTube content partners.
-   *
-   * The onBehalfOfContentOwner parameter indicates that the request's
-   * authorization credentials identify a YouTube CMS user who is acting on behalf
-   * of the content owner specified in the parameter value. This parameter is
-   * intended for YouTube content partners that own and manage many different
-   * YouTube channels. It allows content owners to authenticate once and get
-   * access to all their video and channel data, without having to provide
-   * authentication credentials for each individual channel. The CMS account that
-   * the user authenticates with must be linked to the specified YouTube content
-   * owner.
-   * @return Google_Service_YouTube_ChannelSection
-   */
-  public function update($part, Google_Service_YouTube_ChannelSection $postBody, $optParams = array())
-  {
-    $params = array('part' => $part, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('update', array($params), "Google_Service_YouTube_ChannelSection");
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTube/Resource/Channels.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTube/Resource/Channels.php
deleted file mode 100644
index cc79713c..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTube/Resource/Channels.php
+++ /dev/null
@@ -1,126 +0,0 @@
-
- *   $youtubeService = new Google_Service_YouTube(...);
- *   $channels = $youtubeService->channels;
- *  
- */
-class Google_Service_YouTube_Resource_Channels extends Google_Service_Resource
-{
-  /**
-   * Returns a collection of zero or more channel resources that match the request
-   * criteria. (channels.listChannels)
-   *
-   * @param string $part The part parameter specifies a comma-separated list of
-   * one or more channel resource properties that the API response will include.
-   *
-   * If the parameter identifies a property that contains child properties, the
-   * child properties will be included in the response. For example, in a channel
-   * resource, the contentDetails property contains other properties, such as the
-   * uploads properties. As such, if you set part=contentDetails, the API response
-   * will also contain all of those nested properties.
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param string categoryId The categoryId parameter specifies a YouTube
-   * guide category, thereby requesting YouTube channels associated with that
-   * category.
-   * @opt_param string forUsername The forUsername parameter specifies a YouTube
-   * username, thereby requesting the channel associated with that username.
-   * @opt_param string hl The hl parameter should be used for filter out the
-   * properties that are not in the given language. Used for the brandingSettings
-   * part.
-   * @opt_param string id The id parameter specifies a comma-separated list of the
-   * YouTube channel ID(s) for the resource(s) that are being retrieved. In a
-   * channel resource, the id property specifies the channel's YouTube channel ID.
-   * @opt_param bool managedByMe Note: This parameter is intended exclusively for
-   * YouTube content partners.
-   *
-   * Set this parameter's value to true to instruct the API to only return
-   * channels managed by the content owner that the onBehalfOfContentOwner
-   * parameter specifies. The user must be authenticated as a CMS account linked
-   * to the specified content owner and onBehalfOfContentOwner must be provided.
-   * @opt_param string maxResults The maxResults parameter specifies the maximum
-   * number of items that should be returned in the result set.
-   * @opt_param bool mine Set this parameter's value to true to instruct the API
-   * to only return channels owned by the authenticated user.
-   * @opt_param bool mySubscribers Use the subscriptions.list method and its
-   * mySubscribers parameter to retrieve a list of subscribers to the
-   * authenticated user's channel.
-   * @opt_param string onBehalfOfContentOwner Note: This parameter is intended
-   * exclusively for YouTube content partners.
-   *
-   * The onBehalfOfContentOwner parameter indicates that the request's
-   * authorization credentials identify a YouTube CMS user who is acting on behalf
-   * of the content owner specified in the parameter value. This parameter is
-   * intended for YouTube content partners that own and manage many different
-   * YouTube channels. It allows content owners to authenticate once and get
-   * access to all their video and channel data, without having to provide
-   * authentication credentials for each individual channel. The CMS account that
-   * the user authenticates with must be linked to the specified YouTube content
-   * owner.
-   * @opt_param string pageToken The pageToken parameter identifies a specific
-   * page in the result set that should be returned. In an API response, the
-   * nextPageToken and prevPageToken properties identify other pages that could be
-   * retrieved.
-   * @return Google_Service_YouTube_ChannelListResponse
-   */
-  public function listChannels($part, $optParams = array())
-  {
-    $params = array('part' => $part);
-    $params = array_merge($params, $optParams);
-    return $this->call('list', array($params), "Google_Service_YouTube_ChannelListResponse");
-  }
-  /**
-   * Updates a channel's metadata. Note that this method currently only supports
-   * updates to the channel resource's brandingSettings and invideoPromotion
-   * objects and their child properties. (channels.update)
-   *
-   * @param string $part The part parameter serves two purposes in this operation.
-   * It identifies the properties that the write operation will set as well as the
-   * properties that the API response will include.
-   *
-   * The API currently only allows the parameter value to be set to either
-   * brandingSettings or invideoPromotion. (You cannot update both of those parts
-   * with a single request.)
-   *
-   * Note that this method overrides the existing values for all of the mutable
-   * properties that are contained in any parts that the parameter value
-   * specifies.
-   * @param Google_Service_YouTube_Channel $postBody
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param string onBehalfOfContentOwner The onBehalfOfContentOwner parameter
-   * indicates that the authenticated user is acting on behalf of the content
-   * owner specified in the parameter value. This parameter is intended for
-   * YouTube content partners that own and manage many different YouTube channels.
-   * It allows content owners to authenticate once and get access to all their
-   * video and channel data, without having to provide authentication credentials
-   * for each individual channel. The actual CMS account that the user
-   * authenticates with needs to be linked to the specified YouTube content owner.
-   * @return Google_Service_YouTube_Channel
-   */
-  public function update($part, Google_Service_YouTube_Channel $postBody, $optParams = array())
-  {
-    $params = array('part' => $part, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('update', array($params), "Google_Service_YouTube_Channel");
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTube/Resource/CommentThreads.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTube/Resource/CommentThreads.php
deleted file mode 100644
index 4e09a3ad..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTube/Resource/CommentThreads.php
+++ /dev/null
@@ -1,121 +0,0 @@
-
- *   $youtubeService = new Google_Service_YouTube(...);
- *   $commentThreads = $youtubeService->commentThreads;
- *  
- */
-class Google_Service_YouTube_Resource_CommentThreads extends Google_Service_Resource
-{
-  /**
-   * Creates a new top-level comment. To add a reply to an existing comment, use
-   * the comments.insert method instead. (commentThreads.insert)
-   *
-   * @param string $part The part parameter identifies the properties that the API
-   * response will include. Set the parameter value to snippet. The snippet part
-   * has a quota cost of 2 units.
-   * @param Google_Service_YouTube_CommentThread $postBody
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_YouTube_CommentThread
-   */
-  public function insert($part, Google_Service_YouTube_CommentThread $postBody, $optParams = array())
-  {
-    $params = array('part' => $part, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('insert', array($params), "Google_Service_YouTube_CommentThread");
-  }
-  /**
-   * Returns a list of comment threads that match the API request parameters.
-   * (commentThreads.listCommentThreads)
-   *
-   * @param string $part The part parameter specifies a comma-separated list of
-   * one or more commentThread resource properties that the API response will
-   * include.
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param string allThreadsRelatedToChannelId The
-   * allThreadsRelatedToChannelId parameter instructs the API to return all
-   * comment threads associated with the specified channel. The response can
-   * include comments about the channel or about the channel's videos.
-   * @opt_param string channelId The channelId parameter instructs the API to
-   * return comment threads containing comments about the specified channel. (The
-   * response will not include comments left on videos that the channel uploaded.)
-   * @opt_param string id The id parameter specifies a comma-separated list of
-   * comment thread IDs for the resources that should be retrieved.
-   * @opt_param string maxResults The maxResults parameter specifies the maximum
-   * number of items that should be returned in the result set.
-   *
-   * Note: This parameter is not supported for use in conjunction with the id
-   * parameter.
-   * @opt_param string moderationStatus Set this parameter to limit the returned
-   * comment threads to a particular moderation state.
-   *
-   * Note: This parameter is not supported for use in conjunction with the id
-   * parameter.
-   * @opt_param string order The order parameter specifies the order in which the
-   * API response should list comment threads. Valid values are: - time - Comment
-   * threads are ordered by time. This is the default behavior. - relevance -
-   * Comment threads are ordered by relevance.Note: This parameter is not
-   * supported for use in conjunction with the id parameter.
-   * @opt_param string pageToken The pageToken parameter identifies a specific
-   * page in the result set that should be returned. In an API response, the
-   * nextPageToken property identifies the next page of the result that can be
-   * retrieved.
-   *
-   * Note: This parameter is not supported for use in conjunction with the id
-   * parameter.
-   * @opt_param string searchTerms The searchTerms parameter instructs the API to
-   * limit the API response to only contain comments that contain the specified
-   * search terms.
-   *
-   * Note: This parameter is not supported for use in conjunction with the id
-   * parameter.
-   * @opt_param string textFormat Set this parameter's value to html or plainText
-   * to instruct the API to return the comments left by users in html formatted or
-   * in plain text.
-   * @opt_param string videoId The videoId parameter instructs the API to return
-   * comment threads associated with the specified video ID.
-   * @return Google_Service_YouTube_CommentThreadListResponse
-   */
-  public function listCommentThreads($part, $optParams = array())
-  {
-    $params = array('part' => $part);
-    $params = array_merge($params, $optParams);
-    return $this->call('list', array($params), "Google_Service_YouTube_CommentThreadListResponse");
-  }
-  /**
-   * Modifies the top-level comment in a comment thread. (commentThreads.update)
-   *
-   * @param string $part The part parameter specifies a comma-separated list of
-   * commentThread resource properties that the API response will include. You
-   * must at least include the snippet part in the parameter value since that part
-   * contains all of the properties that the API request can update.
-   * @param Google_Service_YouTube_CommentThread $postBody
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_YouTube_CommentThread
-   */
-  public function update($part, Google_Service_YouTube_CommentThread $postBody, $optParams = array())
-  {
-    $params = array('part' => $part, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('update', array($params), "Google_Service_YouTube_CommentThread");
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTube/Resource/Comments.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTube/Resource/Comments.php
deleted file mode 100644
index 44bb7f61..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTube/Resource/Comments.php
+++ /dev/null
@@ -1,151 +0,0 @@
-
- *   $youtubeService = new Google_Service_YouTube(...);
- *   $comments = $youtubeService->comments;
- *  
- */
-class Google_Service_YouTube_Resource_Comments extends Google_Service_Resource
-{
-  /**
-   * Deletes a comment. (comments.delete)
-   *
-   * @param string $id The id parameter specifies the comment ID for the resource
-   * that is being deleted.
-   * @param array $optParams Optional parameters.
-   */
-  public function delete($id, $optParams = array())
-  {
-    $params = array('id' => $id);
-    $params = array_merge($params, $optParams);
-    return $this->call('delete', array($params));
-  }
-  /**
-   * Creates a reply to an existing comment. Note: To create a top-level comment,
-   * use the commentThreads.insert method. (comments.insert)
-   *
-   * @param string $part The part parameter identifies the properties that the API
-   * response will include. Set the parameter value to snippet. The snippet part
-   * has a quota cost of 2 units.
-   * @param Google_Service_YouTube_Comment $postBody
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_YouTube_Comment
-   */
-  public function insert($part, Google_Service_YouTube_Comment $postBody, $optParams = array())
-  {
-    $params = array('part' => $part, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('insert', array($params), "Google_Service_YouTube_Comment");
-  }
-  /**
-   * Returns a list of comments that match the API request parameters.
-   * (comments.listComments)
-   *
-   * @param string $part The part parameter specifies a comma-separated list of
-   * one or more comment resource properties that the API response will include.
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param string id The id parameter specifies a comma-separated list of
-   * comment IDs for the resources that are being retrieved. In a comment
-   * resource, the id property specifies the comment's ID.
-   * @opt_param string maxResults The maxResults parameter specifies the maximum
-   * number of items that should be returned in the result set.
-   *
-   * Note: This parameter is not supported for use in conjunction with the id
-   * parameter.
-   * @opt_param string pageToken The pageToken parameter identifies a specific
-   * page in the result set that should be returned. In an API response, the
-   * nextPageToken property identifies the next page of the result that can be
-   * retrieved.
-   *
-   * Note: This parameter is not supported for use in conjunction with the id
-   * parameter.
-   * @opt_param string parentId The parentId parameter specifies the ID of the
-   * comment for which replies should be retrieved.
-   *
-   * Note: YouTube currently supports replies only for top-level comments.
-   * However, replies to replies may be supported in the future.
-   * @opt_param string textFormat This parameter indicates whether the API should
-   * return comments formatted as HTML or as plain text.
-   * @return Google_Service_YouTube_CommentListResponse
-   */
-  public function listComments($part, $optParams = array())
-  {
-    $params = array('part' => $part);
-    $params = array_merge($params, $optParams);
-    return $this->call('list', array($params), "Google_Service_YouTube_CommentListResponse");
-  }
-  /**
-   * Expresses the caller's opinion that one or more comments should be flagged as
-   * spam. (comments.markAsSpam)
-   *
-   * @param string $id The id parameter specifies a comma-separated list of IDs of
-   * comments that the caller believes should be classified as spam.
-   * @param array $optParams Optional parameters.
-   */
-  public function markAsSpam($id, $optParams = array())
-  {
-    $params = array('id' => $id);
-    $params = array_merge($params, $optParams);
-    return $this->call('markAsSpam', array($params));
-  }
-  /**
-   * Sets the moderation status of one or more comments. The API request must be
-   * authorized by the owner of the channel or video associated with the comments.
-   * (comments.setModerationStatus)
-   *
-   * @param string $id The id parameter specifies a comma-separated list of IDs
-   * that identify the comments for which you are updating the moderation status.
-   * @param string $moderationStatus Identifies the new moderation status of the
-   * specified comments.
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param bool banAuthor The banAuthor parameter lets you indicate that you
-   * want to automatically reject any additional comments written by the comment's
-   * author. Set the parameter value to true to ban the author.
-   *
-   * Note: This parameter is only valid if the moderationStatus parameter is also
-   * set to rejected.
-   */
-  public function setModerationStatus($id, $moderationStatus, $optParams = array())
-  {
-    $params = array('id' => $id, 'moderationStatus' => $moderationStatus);
-    $params = array_merge($params, $optParams);
-    return $this->call('setModerationStatus', array($params));
-  }
-  /**
-   * Modifies a comment. (comments.update)
-   *
-   * @param string $part The part parameter identifies the properties that the API
-   * response will include. You must at least include the snippet part in the
-   * parameter value since that part contains all of the properties that the API
-   * request can update.
-   * @param Google_Service_YouTube_Comment $postBody
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_YouTube_Comment
-   */
-  public function update($part, Google_Service_YouTube_Comment $postBody, $optParams = array())
-  {
-    $params = array('part' => $part, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('update', array($params), "Google_Service_YouTube_Comment");
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTube/Resource/FanFundingEvents.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTube/Resource/FanFundingEvents.php
deleted file mode 100644
index 1a52421b..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTube/Resource/FanFundingEvents.php
+++ /dev/null
@@ -1,60 +0,0 @@
-
- *   $youtubeService = new Google_Service_YouTube(...);
- *   $fanFundingEvents = $youtubeService->fanFundingEvents;
- *  
- */
-class Google_Service_YouTube_Resource_FanFundingEvents extends Google_Service_Resource
-{
-  /**
-   * Lists fan funding events for a channel.
-   * (fanFundingEvents.listFanFundingEvents)
-   *
-   * @param string $part The part parameter specifies the fanFundingEvent resource
-   * parts that the API response will include. Supported values are id and
-   * snippet.
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param string hl The hl parameter instructs the API to retrieve localized
-   * resource metadata for a specific application language that the YouTube
-   * website supports. The parameter value must be a language code included in the
-   * list returned by the i18nLanguages.list method.
-   *
-   * If localized resource details are available in that language, the resource's
-   * snippet.localized object will contain the localized values. However, if
-   * localized details are not available, the snippet.localized object will
-   * contain resource details in the resource's default language.
-   * @opt_param string maxResults The maxResults parameter specifies the maximum
-   * number of items that should be returned in the result set.
-   * @opt_param string pageToken The pageToken parameter identifies a specific
-   * page in the result set that should be returned. In an API response, the
-   * nextPageToken and prevPageToken properties identify other pages that could be
-   * retrieved.
-   * @return Google_Service_YouTube_FanFundingEventListResponse
-   */
-  public function listFanFundingEvents($part, $optParams = array())
-  {
-    $params = array('part' => $part);
-    $params = array_merge($params, $optParams);
-    return $this->call('list', array($params), "Google_Service_YouTube_FanFundingEventListResponse");
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTube/Resource/GuideCategories.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTube/Resource/GuideCategories.php
deleted file mode 100644
index 6ca0020c..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTube/Resource/GuideCategories.php
+++ /dev/null
@@ -1,54 +0,0 @@
-
- *   $youtubeService = new Google_Service_YouTube(...);
- *   $guideCategories = $youtubeService->guideCategories;
- *  
- */
-class Google_Service_YouTube_Resource_GuideCategories extends Google_Service_Resource
-{
-  /**
-   * Returns a list of categories that can be associated with YouTube channels.
-   * (guideCategories.listGuideCategories)
-   *
-   * @param string $part The part parameter specifies the guideCategory resource
-   * properties that the API response will include. Set the parameter value to
-   * snippet.
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param string hl The hl parameter specifies the language that will be
-   * used for text values in the API response.
-   * @opt_param string id The id parameter specifies a comma-separated list of the
-   * YouTube channel category ID(s) for the resource(s) that are being retrieved.
-   * In a guideCategory resource, the id property specifies the YouTube channel
-   * category ID.
-   * @opt_param string regionCode The regionCode parameter instructs the API to
-   * return the list of guide categories available in the specified country. The
-   * parameter value is an ISO 3166-1 alpha-2 country code.
-   * @return Google_Service_YouTube_GuideCategoryListResponse
-   */
-  public function listGuideCategories($part, $optParams = array())
-  {
-    $params = array('part' => $part);
-    $params = array_merge($params, $optParams);
-    return $this->call('list', array($params), "Google_Service_YouTube_GuideCategoryListResponse");
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTube/Resource/I18nLanguages.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTube/Resource/I18nLanguages.php
deleted file mode 100644
index d6b11761..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTube/Resource/I18nLanguages.php
+++ /dev/null
@@ -1,47 +0,0 @@
-
- *   $youtubeService = new Google_Service_YouTube(...);
- *   $i18nLanguages = $youtubeService->i18nLanguages;
- *  
- */
-class Google_Service_YouTube_Resource_I18nLanguages extends Google_Service_Resource
-{
-  /**
-   * Returns a list of application languages that the YouTube website supports.
-   * (i18nLanguages.listI18nLanguages)
-   *
-   * @param string $part The part parameter specifies the i18nLanguage resource
-   * properties that the API response will include. Set the parameter value to
-   * snippet.
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param string hl The hl parameter specifies the language that should be
-   * used for text values in the API response.
-   * @return Google_Service_YouTube_I18nLanguageListResponse
-   */
-  public function listI18nLanguages($part, $optParams = array())
-  {
-    $params = array('part' => $part);
-    $params = array_merge($params, $optParams);
-    return $this->call('list', array($params), "Google_Service_YouTube_I18nLanguageListResponse");
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTube/Resource/I18nRegions.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTube/Resource/I18nRegions.php
deleted file mode 100644
index 107f39fd..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTube/Resource/I18nRegions.php
+++ /dev/null
@@ -1,47 +0,0 @@
-
- *   $youtubeService = new Google_Service_YouTube(...);
- *   $i18nRegions = $youtubeService->i18nRegions;
- *  
- */
-class Google_Service_YouTube_Resource_I18nRegions extends Google_Service_Resource
-{
-  /**
-   * Returns a list of content regions that the YouTube website supports.
-   * (i18nRegions.listI18nRegions)
-   *
-   * @param string $part The part parameter specifies the i18nRegion resource
-   * properties that the API response will include. Set the parameter value to
-   * snippet.
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param string hl The hl parameter specifies the language that should be
-   * used for text values in the API response.
-   * @return Google_Service_YouTube_I18nRegionListResponse
-   */
-  public function listI18nRegions($part, $optParams = array())
-  {
-    $params = array('part' => $part);
-    $params = array_merge($params, $optParams);
-    return $this->call('list', array($params), "Google_Service_YouTube_I18nRegionListResponse");
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTube/Resource/LiveBroadcasts.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTube/Resource/LiveBroadcasts.php
deleted file mode 100644
index ae19831b..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTube/Resource/LiveBroadcasts.php
+++ /dev/null
@@ -1,438 +0,0 @@
-
- *   $youtubeService = new Google_Service_YouTube(...);
- *   $liveBroadcasts = $youtubeService->liveBroadcasts;
- *  
- */
-class Google_Service_YouTube_Resource_LiveBroadcasts extends Google_Service_Resource
-{
-  /**
-   * Binds a YouTube broadcast to a stream or removes an existing binding between
-   * a broadcast and a stream. A broadcast can only be bound to one video stream,
-   * though a video stream may be bound to more than one broadcast.
-   * (liveBroadcasts.bind)
-   *
-   * @param string $id The id parameter specifies the unique ID of the broadcast
-   * that is being bound to a video stream.
-   * @param string $part The part parameter specifies a comma-separated list of
-   * one or more liveBroadcast resource properties that the API response will
-   * include. The part names that you can include in the parameter value are id,
-   * snippet, contentDetails, and status.
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param string onBehalfOfContentOwner Note: This parameter is intended
-   * exclusively for YouTube content partners.
-   *
-   * The onBehalfOfContentOwner parameter indicates that the request's
-   * authorization credentials identify a YouTube CMS user who is acting on behalf
-   * of the content owner specified in the parameter value. This parameter is
-   * intended for YouTube content partners that own and manage many different
-   * YouTube channels. It allows content owners to authenticate once and get
-   * access to all their video and channel data, without having to provide
-   * authentication credentials for each individual channel. The CMS account that
-   * the user authenticates with must be linked to the specified YouTube content
-   * owner.
-   * @opt_param string onBehalfOfContentOwnerChannel This parameter can only be
-   * used in a properly authorized request. Note: This parameter is intended
-   * exclusively for YouTube content partners.
-   *
-   * The onBehalfOfContentOwnerChannel parameter specifies the YouTube channel ID
-   * of the channel to which a video is being added. This parameter is required
-   * when a request specifies a value for the onBehalfOfContentOwner parameter,
-   * and it can only be used in conjunction with that parameter. In addition, the
-   * request must be authorized using a CMS account that is linked to the content
-   * owner that the onBehalfOfContentOwner parameter specifies. Finally, the
-   * channel that the onBehalfOfContentOwnerChannel parameter value specifies must
-   * be linked to the content owner that the onBehalfOfContentOwner parameter
-   * specifies.
-   *
-   * This parameter is intended for YouTube content partners that own and manage
-   * many different YouTube channels. It allows content owners to authenticate
-   * once and perform actions on behalf of the channel specified in the parameter
-   * value, without having to provide authentication credentials for each separate
-   * channel.
-   * @opt_param string streamId The streamId parameter specifies the unique ID of
-   * the video stream that is being bound to a broadcast. If this parameter is
-   * omitted, the API will remove any existing binding between the broadcast and a
-   * video stream.
-   * @return Google_Service_YouTube_LiveBroadcast
-   */
-  public function bind($id, $part, $optParams = array())
-  {
-    $params = array('id' => $id, 'part' => $part);
-    $params = array_merge($params, $optParams);
-    return $this->call('bind', array($params), "Google_Service_YouTube_LiveBroadcast");
-  }
-  /**
-   * Controls the settings for a slate that can be displayed in the broadcast
-   * stream. (liveBroadcasts.control)
-   *
-   * @param string $id The id parameter specifies the YouTube live broadcast ID
-   * that uniquely identifies the broadcast in which the slate is being updated.
-   * @param string $part The part parameter specifies a comma-separated list of
-   * one or more liveBroadcast resource properties that the API response will
-   * include. The part names that you can include in the parameter value are id,
-   * snippet, contentDetails, and status.
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param bool displaySlate The displaySlate parameter specifies whether the
-   * slate is being enabled or disabled.
-   * @opt_param string offsetTimeMs The offsetTimeMs parameter specifies a
-   * positive time offset when the specified slate change will occur. The value is
-   * measured in milliseconds from the beginning of the broadcast's monitor
-   * stream, which is the time that the testing phase for the broadcast began.
-   * Even though it is specified in milliseconds, the value is actually an
-   * approximation, and YouTube completes the requested action as closely as
-   * possible to that time.
-   *
-   * If you do not specify a value for this parameter, then YouTube performs the
-   * action as soon as possible. See the Getting started guide for more details.
-   *
-   * Important: You should only specify a value for this parameter if your
-   * broadcast stream is delayed.
-   * @opt_param string onBehalfOfContentOwner Note: This parameter is intended
-   * exclusively for YouTube content partners.
-   *
-   * The onBehalfOfContentOwner parameter indicates that the request's
-   * authorization credentials identify a YouTube CMS user who is acting on behalf
-   * of the content owner specified in the parameter value. This parameter is
-   * intended for YouTube content partners that own and manage many different
-   * YouTube channels. It allows content owners to authenticate once and get
-   * access to all their video and channel data, without having to provide
-   * authentication credentials for each individual channel. The CMS account that
-   * the user authenticates with must be linked to the specified YouTube content
-   * owner.
-   * @opt_param string onBehalfOfContentOwnerChannel This parameter can only be
-   * used in a properly authorized request. Note: This parameter is intended
-   * exclusively for YouTube content partners.
-   *
-   * The onBehalfOfContentOwnerChannel parameter specifies the YouTube channel ID
-   * of the channel to which a video is being added. This parameter is required
-   * when a request specifies a value for the onBehalfOfContentOwner parameter,
-   * and it can only be used in conjunction with that parameter. In addition, the
-   * request must be authorized using a CMS account that is linked to the content
-   * owner that the onBehalfOfContentOwner parameter specifies. Finally, the
-   * channel that the onBehalfOfContentOwnerChannel parameter value specifies must
-   * be linked to the content owner that the onBehalfOfContentOwner parameter
-   * specifies.
-   *
-   * This parameter is intended for YouTube content partners that own and manage
-   * many different YouTube channels. It allows content owners to authenticate
-   * once and perform actions on behalf of the channel specified in the parameter
-   * value, without having to provide authentication credentials for each separate
-   * channel.
-   * @opt_param string walltime The walltime parameter specifies the wall clock
-   * time at which the specified slate change will occur. The value is specified
-   * in ISO 8601 (YYYY-MM-DDThh:mm:ss.sssZ) format.
-   * @return Google_Service_YouTube_LiveBroadcast
-   */
-  public function control($id, $part, $optParams = array())
-  {
-    $params = array('id' => $id, 'part' => $part);
-    $params = array_merge($params, $optParams);
-    return $this->call('control', array($params), "Google_Service_YouTube_LiveBroadcast");
-  }
-  /**
-   * Deletes a broadcast. (liveBroadcasts.delete)
-   *
-   * @param string $id The id parameter specifies the YouTube live broadcast ID
-   * for the resource that is being deleted.
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param string onBehalfOfContentOwner Note: This parameter is intended
-   * exclusively for YouTube content partners.
-   *
-   * The onBehalfOfContentOwner parameter indicates that the request's
-   * authorization credentials identify a YouTube CMS user who is acting on behalf
-   * of the content owner specified in the parameter value. This parameter is
-   * intended for YouTube content partners that own and manage many different
-   * YouTube channels. It allows content owners to authenticate once and get
-   * access to all their video and channel data, without having to provide
-   * authentication credentials for each individual channel. The CMS account that
-   * the user authenticates with must be linked to the specified YouTube content
-   * owner.
-   * @opt_param string onBehalfOfContentOwnerChannel This parameter can only be
-   * used in a properly authorized request. Note: This parameter is intended
-   * exclusively for YouTube content partners.
-   *
-   * The onBehalfOfContentOwnerChannel parameter specifies the YouTube channel ID
-   * of the channel to which a video is being added. This parameter is required
-   * when a request specifies a value for the onBehalfOfContentOwner parameter,
-   * and it can only be used in conjunction with that parameter. In addition, the
-   * request must be authorized using a CMS account that is linked to the content
-   * owner that the onBehalfOfContentOwner parameter specifies. Finally, the
-   * channel that the onBehalfOfContentOwnerChannel parameter value specifies must
-   * be linked to the content owner that the onBehalfOfContentOwner parameter
-   * specifies.
-   *
-   * This parameter is intended for YouTube content partners that own and manage
-   * many different YouTube channels. It allows content owners to authenticate
-   * once and perform actions on behalf of the channel specified in the parameter
-   * value, without having to provide authentication credentials for each separate
-   * channel.
-   */
-  public function delete($id, $optParams = array())
-  {
-    $params = array('id' => $id);
-    $params = array_merge($params, $optParams);
-    return $this->call('delete', array($params));
-  }
-  /**
-   * Creates a broadcast. (liveBroadcasts.insert)
-   *
-   * @param string $part The part parameter serves two purposes in this operation.
-   * It identifies the properties that the write operation will set as well as the
-   * properties that the API response will include.
-   *
-   * The part properties that you can include in the parameter value are id,
-   * snippet, contentDetails, and status.
-   * @param Google_Service_YouTube_LiveBroadcast $postBody
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param string onBehalfOfContentOwner Note: This parameter is intended
-   * exclusively for YouTube content partners.
-   *
-   * The onBehalfOfContentOwner parameter indicates that the request's
-   * authorization credentials identify a YouTube CMS user who is acting on behalf
-   * of the content owner specified in the parameter value. This parameter is
-   * intended for YouTube content partners that own and manage many different
-   * YouTube channels. It allows content owners to authenticate once and get
-   * access to all their video and channel data, without having to provide
-   * authentication credentials for each individual channel. The CMS account that
-   * the user authenticates with must be linked to the specified YouTube content
-   * owner.
-   * @opt_param string onBehalfOfContentOwnerChannel This parameter can only be
-   * used in a properly authorized request. Note: This parameter is intended
-   * exclusively for YouTube content partners.
-   *
-   * The onBehalfOfContentOwnerChannel parameter specifies the YouTube channel ID
-   * of the channel to which a video is being added. This parameter is required
-   * when a request specifies a value for the onBehalfOfContentOwner parameter,
-   * and it can only be used in conjunction with that parameter. In addition, the
-   * request must be authorized using a CMS account that is linked to the content
-   * owner that the onBehalfOfContentOwner parameter specifies. Finally, the
-   * channel that the onBehalfOfContentOwnerChannel parameter value specifies must
-   * be linked to the content owner that the onBehalfOfContentOwner parameter
-   * specifies.
-   *
-   * This parameter is intended for YouTube content partners that own and manage
-   * many different YouTube channels. It allows content owners to authenticate
-   * once and perform actions on behalf of the channel specified in the parameter
-   * value, without having to provide authentication credentials for each separate
-   * channel.
-   * @return Google_Service_YouTube_LiveBroadcast
-   */
-  public function insert($part, Google_Service_YouTube_LiveBroadcast $postBody, $optParams = array())
-  {
-    $params = array('part' => $part, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('insert', array($params), "Google_Service_YouTube_LiveBroadcast");
-  }
-  /**
-   * Returns a list of YouTube broadcasts that match the API request parameters.
-   * (liveBroadcasts.listLiveBroadcasts)
-   *
-   * @param string $part The part parameter specifies a comma-separated list of
-   * one or more liveBroadcast resource properties that the API response will
-   * include. The part names that you can include in the parameter value are id,
-   * snippet, contentDetails, and status.
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param string broadcastStatus The broadcastStatus parameter filters the
-   * API response to only include broadcasts with the specified status.
-   * @opt_param string broadcastType The broadcastType parameter filters the API
-   * response to only include broadcasts with the specified type. This is only
-   * compatible with the mine filter for now.
-   * @opt_param string id The id parameter specifies a comma-separated list of
-   * YouTube broadcast IDs that identify the broadcasts being retrieved. In a
-   * liveBroadcast resource, the id property specifies the broadcast's ID.
-   * @opt_param string maxResults The maxResults parameter specifies the maximum
-   * number of items that should be returned in the result set.
-   * @opt_param bool mine The mine parameter can be used to instruct the API to
-   * only return broadcasts owned by the authenticated user. Set the parameter
-   * value to true to only retrieve your own broadcasts.
-   * @opt_param string onBehalfOfContentOwner Note: This parameter is intended
-   * exclusively for YouTube content partners.
-   *
-   * The onBehalfOfContentOwner parameter indicates that the request's
-   * authorization credentials identify a YouTube CMS user who is acting on behalf
-   * of the content owner specified in the parameter value. This parameter is
-   * intended for YouTube content partners that own and manage many different
-   * YouTube channels. It allows content owners to authenticate once and get
-   * access to all their video and channel data, without having to provide
-   * authentication credentials for each individual channel. The CMS account that
-   * the user authenticates with must be linked to the specified YouTube content
-   * owner.
-   * @opt_param string onBehalfOfContentOwnerChannel This parameter can only be
-   * used in a properly authorized request. Note: This parameter is intended
-   * exclusively for YouTube content partners.
-   *
-   * The onBehalfOfContentOwnerChannel parameter specifies the YouTube channel ID
-   * of the channel to which a video is being added. This parameter is required
-   * when a request specifies a value for the onBehalfOfContentOwner parameter,
-   * and it can only be used in conjunction with that parameter. In addition, the
-   * request must be authorized using a CMS account that is linked to the content
-   * owner that the onBehalfOfContentOwner parameter specifies. Finally, the
-   * channel that the onBehalfOfContentOwnerChannel parameter value specifies must
-   * be linked to the content owner that the onBehalfOfContentOwner parameter
-   * specifies.
-   *
-   * This parameter is intended for YouTube content partners that own and manage
-   * many different YouTube channels. It allows content owners to authenticate
-   * once and perform actions on behalf of the channel specified in the parameter
-   * value, without having to provide authentication credentials for each separate
-   * channel.
-   * @opt_param string pageToken The pageToken parameter identifies a specific
-   * page in the result set that should be returned. In an API response, the
-   * nextPageToken and prevPageToken properties identify other pages that could be
-   * retrieved.
-   * @return Google_Service_YouTube_LiveBroadcastListResponse
-   */
-  public function listLiveBroadcasts($part, $optParams = array())
-  {
-    $params = array('part' => $part);
-    $params = array_merge($params, $optParams);
-    return $this->call('list', array($params), "Google_Service_YouTube_LiveBroadcastListResponse");
-  }
-  /**
-   * Changes the status of a YouTube live broadcast and initiates any processes
-   * associated with the new status. For example, when you transition a
-   * broadcast's status to testing, YouTube starts to transmit video to that
-   * broadcast's monitor stream. Before calling this method, you should confirm
-   * that the value of the status.streamStatus property for the stream bound to
-   * your broadcast is active. (liveBroadcasts.transition)
-   *
-   * @param string $broadcastStatus The broadcastStatus parameter identifies the
-   * state to which the broadcast is changing. Note that to transition a broadcast
-   * to either the testing or live state, the status.streamStatus must be active
-   * for the stream that the broadcast is bound to.
-   * @param string $id The id parameter specifies the unique ID of the broadcast
-   * that is transitioning to another status.
-   * @param string $part The part parameter specifies a comma-separated list of
-   * one or more liveBroadcast resource properties that the API response will
-   * include. The part names that you can include in the parameter value are id,
-   * snippet, contentDetails, and status.
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param string onBehalfOfContentOwner Note: This parameter is intended
-   * exclusively for YouTube content partners.
-   *
-   * The onBehalfOfContentOwner parameter indicates that the request's
-   * authorization credentials identify a YouTube CMS user who is acting on behalf
-   * of the content owner specified in the parameter value. This parameter is
-   * intended for YouTube content partners that own and manage many different
-   * YouTube channels. It allows content owners to authenticate once and get
-   * access to all their video and channel data, without having to provide
-   * authentication credentials for each individual channel. The CMS account that
-   * the user authenticates with must be linked to the specified YouTube content
-   * owner.
-   * @opt_param string onBehalfOfContentOwnerChannel This parameter can only be
-   * used in a properly authorized request. Note: This parameter is intended
-   * exclusively for YouTube content partners.
-   *
-   * The onBehalfOfContentOwnerChannel parameter specifies the YouTube channel ID
-   * of the channel to which a video is being added. This parameter is required
-   * when a request specifies a value for the onBehalfOfContentOwner parameter,
-   * and it can only be used in conjunction with that parameter. In addition, the
-   * request must be authorized using a CMS account that is linked to the content
-   * owner that the onBehalfOfContentOwner parameter specifies. Finally, the
-   * channel that the onBehalfOfContentOwnerChannel parameter value specifies must
-   * be linked to the content owner that the onBehalfOfContentOwner parameter
-   * specifies.
-   *
-   * This parameter is intended for YouTube content partners that own and manage
-   * many different YouTube channels. It allows content owners to authenticate
-   * once and perform actions on behalf of the channel specified in the parameter
-   * value, without having to provide authentication credentials for each separate
-   * channel.
-   * @return Google_Service_YouTube_LiveBroadcast
-   */
-  public function transition($broadcastStatus, $id, $part, $optParams = array())
-  {
-    $params = array('broadcastStatus' => $broadcastStatus, 'id' => $id, 'part' => $part);
-    $params = array_merge($params, $optParams);
-    return $this->call('transition', array($params), "Google_Service_YouTube_LiveBroadcast");
-  }
-  /**
-   * Updates a broadcast. For example, you could modify the broadcast settings
-   * defined in the liveBroadcast resource's contentDetails object.
-   * (liveBroadcasts.update)
-   *
-   * @param string $part The part parameter serves two purposes in this operation.
-   * It identifies the properties that the write operation will set as well as the
-   * properties that the API response will include.
-   *
-   * The part properties that you can include in the parameter value are id,
-   * snippet, contentDetails, and status.
-   *
-   * Note that this method will override the existing values for all of the
-   * mutable properties that are contained in any parts that the parameter value
-   * specifies. For example, a broadcast's privacy status is defined in the status
-   * part. As such, if your request is updating a private or unlisted broadcast,
-   * and the request's part parameter value includes the status part, the
-   * broadcast's privacy setting will be updated to whatever value the request
-   * body specifies. If the request body does not specify a value, the existing
-   * privacy setting will be removed and the broadcast will revert to the default
-   * privacy setting.
-   * @param Google_Service_YouTube_LiveBroadcast $postBody
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param string onBehalfOfContentOwner Note: This parameter is intended
-   * exclusively for YouTube content partners.
-   *
-   * The onBehalfOfContentOwner parameter indicates that the request's
-   * authorization credentials identify a YouTube CMS user who is acting on behalf
-   * of the content owner specified in the parameter value. This parameter is
-   * intended for YouTube content partners that own and manage many different
-   * YouTube channels. It allows content owners to authenticate once and get
-   * access to all their video and channel data, without having to provide
-   * authentication credentials for each individual channel. The CMS account that
-   * the user authenticates with must be linked to the specified YouTube content
-   * owner.
-   * @opt_param string onBehalfOfContentOwnerChannel This parameter can only be
-   * used in a properly authorized request. Note: This parameter is intended
-   * exclusively for YouTube content partners.
-   *
-   * The onBehalfOfContentOwnerChannel parameter specifies the YouTube channel ID
-   * of the channel to which a video is being added. This parameter is required
-   * when a request specifies a value for the onBehalfOfContentOwner parameter,
-   * and it can only be used in conjunction with that parameter. In addition, the
-   * request must be authorized using a CMS account that is linked to the content
-   * owner that the onBehalfOfContentOwner parameter specifies. Finally, the
-   * channel that the onBehalfOfContentOwnerChannel parameter value specifies must
-   * be linked to the content owner that the onBehalfOfContentOwner parameter
-   * specifies.
-   *
-   * This parameter is intended for YouTube content partners that own and manage
-   * many different YouTube channels. It allows content owners to authenticate
-   * once and perform actions on behalf of the channel specified in the parameter
-   * value, without having to provide authentication credentials for each separate
-   * channel.
-   * @return Google_Service_YouTube_LiveBroadcast
-   */
-  public function update($part, Google_Service_YouTube_LiveBroadcast $postBody, $optParams = array())
-  {
-    $params = array('part' => $part, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('update', array($params), "Google_Service_YouTube_LiveBroadcast");
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTube/Resource/LiveChatBans.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTube/Resource/LiveChatBans.php
deleted file mode 100644
index 629393a0..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTube/Resource/LiveChatBans.php
+++ /dev/null
@@ -1,57 +0,0 @@
-
- *   $youtubeService = new Google_Service_YouTube(...);
- *   $liveChatBans = $youtubeService->liveChatBans;
- *  
- */
-class Google_Service_YouTube_Resource_LiveChatBans extends Google_Service_Resource
-{
-  /**
-   * Removes a chat ban. (liveChatBans.delete)
-   *
-   * @param string $id The id parameter identifies the chat ban to remove. The
-   * value uniquely identifies both the ban and the chat.
-   * @param array $optParams Optional parameters.
-   */
-  public function delete($id, $optParams = array())
-  {
-    $params = array('id' => $id);
-    $params = array_merge($params, $optParams);
-    return $this->call('delete', array($params));
-  }
-  /**
-   * Adds a new ban to the chat. (liveChatBans.insert)
-   *
-   * @param string $part The part parameter serves two purposes in this operation.
-   * It identifies the properties that the write operation will set as well as the
-   * properties that the API response returns. Set the parameter value to snippet.
-   * @param Google_Service_YouTube_LiveChatBan $postBody
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_YouTube_LiveChatBan
-   */
-  public function insert($part, Google_Service_YouTube_LiveChatBan $postBody, $optParams = array())
-  {
-    $params = array('part' => $part, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('insert', array($params), "Google_Service_YouTube_LiveChatBan");
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTube/Resource/LiveChatMessages.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTube/Resource/LiveChatMessages.php
deleted file mode 100644
index 46033d51..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTube/Resource/LiveChatMessages.php
+++ /dev/null
@@ -1,93 +0,0 @@
-
- *   $youtubeService = new Google_Service_YouTube(...);
- *   $liveChatMessages = $youtubeService->liveChatMessages;
- *  
- */
-class Google_Service_YouTube_Resource_LiveChatMessages extends Google_Service_Resource
-{
-  /**
-   * Deletes a chat message. (liveChatMessages.delete)
-   *
-   * @param string $id The id parameter specifies the YouTube chat message ID of
-   * the resource that is being deleted.
-   * @param array $optParams Optional parameters.
-   */
-  public function delete($id, $optParams = array())
-  {
-    $params = array('id' => $id);
-    $params = array_merge($params, $optParams);
-    return $this->call('delete', array($params));
-  }
-  /**
-   * Adds a message to a live chat. (liveChatMessages.insert)
-   *
-   * @param string $part The part parameter serves two purposes. It identifies the
-   * properties that the write operation will set as well as the properties that
-   * the API response will include. Set the parameter value to snippet.
-   * @param Google_Service_YouTube_LiveChatMessage $postBody
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_YouTube_LiveChatMessage
-   */
-  public function insert($part, Google_Service_YouTube_LiveChatMessage $postBody, $optParams = array())
-  {
-    $params = array('part' => $part, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('insert', array($params), "Google_Service_YouTube_LiveChatMessage");
-  }
-  /**
-   * Lists live chat messages for a specific chat.
-   * (liveChatMessages.listLiveChatMessages)
-   *
-   * @param string $liveChatId The liveChatId parameter specifies the ID of the
-   * chat whose messages will be returned.
-   * @param string $part The part parameter specifies the liveChatComment resource
-   * parts that the API response will include. Supported values are id and
-   * snippet.
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param string hl The hl parameter instructs the API to retrieve localized
-   * resource metadata for a specific application language that the YouTube
-   * website supports. The parameter value must be a language code included in the
-   * list returned by the i18nLanguages.list method.
-   *
-   * If localized resource details are available in that language, the resource's
-   * snippet.localized object will contain the localized values. However, if
-   * localized details are not available, the snippet.localized object will
-   * contain resource details in the resource's default language.
-   * @opt_param string maxResults The maxResults parameter specifies the maximum
-   * number of messages that should be returned in the result set.
-   * @opt_param string pageToken The pageToken parameter identifies a specific
-   * page in the result set that should be returned. In an API response, the
-   * nextPageToken property identify other pages that could be retrieved.
-   * @opt_param string profileImageSize The profileImageSize parameter specifies
-   * the size of the user profile pictures that should be returned in the result
-   * set. Default: 88.
-   * @return Google_Service_YouTube_LiveChatMessageListResponse
-   */
-  public function listLiveChatMessages($liveChatId, $part, $optParams = array())
-  {
-    $params = array('liveChatId' => $liveChatId, 'part' => $part);
-    $params = array_merge($params, $optParams);
-    return $this->call('list', array($params), "Google_Service_YouTube_LiveChatMessageListResponse");
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTube/Resource/LiveChatModerators.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTube/Resource/LiveChatModerators.php
deleted file mode 100644
index e9bd09f3..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTube/Resource/LiveChatModerators.php
+++ /dev/null
@@ -1,81 +0,0 @@
-
- *   $youtubeService = new Google_Service_YouTube(...);
- *   $liveChatModerators = $youtubeService->liveChatModerators;
- *  
- */
-class Google_Service_YouTube_Resource_LiveChatModerators extends Google_Service_Resource
-{
-  /**
-   * Removes a chat moderator. (liveChatModerators.delete)
-   *
-   * @param string $id The id parameter identifies the chat moderator to remove.
-   * The value uniquely identifies both the moderator and the chat.
-   * @param array $optParams Optional parameters.
-   */
-  public function delete($id, $optParams = array())
-  {
-    $params = array('id' => $id);
-    $params = array_merge($params, $optParams);
-    return $this->call('delete', array($params));
-  }
-  /**
-   * Adds a new moderator for the chat. (liveChatModerators.insert)
-   *
-   * @param string $part The part parameter serves two purposes in this operation.
-   * It identifies the properties that the write operation will set as well as the
-   * properties that the API response returns. Set the parameter value to snippet.
-   * @param Google_Service_YouTube_LiveChatModerator $postBody
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_YouTube_LiveChatModerator
-   */
-  public function insert($part, Google_Service_YouTube_LiveChatModerator $postBody, $optParams = array())
-  {
-    $params = array('part' => $part, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('insert', array($params), "Google_Service_YouTube_LiveChatModerator");
-  }
-  /**
-   * Lists moderators for a live chat. (liveChatModerators.listLiveChatModerators)
-   *
-   * @param string $liveChatId The liveChatId parameter specifies the YouTube live
-   * chat for which the API should return moderators.
-   * @param string $part The part parameter specifies the liveChatModerator
-   * resource parts that the API response will include. Supported values are id
-   * and snippet.
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param string maxResults The maxResults parameter specifies the maximum
-   * number of items that should be returned in the result set.
-   * @opt_param string pageToken The pageToken parameter identifies a specific
-   * page in the result set that should be returned. In an API response, the
-   * nextPageToken and prevPageToken properties identify other pages that could be
-   * retrieved.
-   * @return Google_Service_YouTube_LiveChatModeratorListResponse
-   */
-  public function listLiveChatModerators($liveChatId, $part, $optParams = array())
-  {
-    $params = array('liveChatId' => $liveChatId, 'part' => $part);
-    $params = array_merge($params, $optParams);
-    return $this->call('list', array($params), "Google_Service_YouTube_LiveChatModeratorListResponse");
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTube/Resource/LiveStreams.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTube/Resource/LiveStreams.php
deleted file mode 100644
index 002da409..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTube/Resource/LiveStreams.php
+++ /dev/null
@@ -1,244 +0,0 @@
-
- *   $youtubeService = new Google_Service_YouTube(...);
- *   $liveStreams = $youtubeService->liveStreams;
- *  
- */
-class Google_Service_YouTube_Resource_LiveStreams extends Google_Service_Resource
-{
-  /**
-   * Deletes a video stream. (liveStreams.delete)
-   *
-   * @param string $id The id parameter specifies the YouTube live stream ID for
-   * the resource that is being deleted.
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param string onBehalfOfContentOwner Note: This parameter is intended
-   * exclusively for YouTube content partners.
-   *
-   * The onBehalfOfContentOwner parameter indicates that the request's
-   * authorization credentials identify a YouTube CMS user who is acting on behalf
-   * of the content owner specified in the parameter value. This parameter is
-   * intended for YouTube content partners that own and manage many different
-   * YouTube channels. It allows content owners to authenticate once and get
-   * access to all their video and channel data, without having to provide
-   * authentication credentials for each individual channel. The CMS account that
-   * the user authenticates with must be linked to the specified YouTube content
-   * owner.
-   * @opt_param string onBehalfOfContentOwnerChannel This parameter can only be
-   * used in a properly authorized request. Note: This parameter is intended
-   * exclusively for YouTube content partners.
-   *
-   * The onBehalfOfContentOwnerChannel parameter specifies the YouTube channel ID
-   * of the channel to which a video is being added. This parameter is required
-   * when a request specifies a value for the onBehalfOfContentOwner parameter,
-   * and it can only be used in conjunction with that parameter. In addition, the
-   * request must be authorized using a CMS account that is linked to the content
-   * owner that the onBehalfOfContentOwner parameter specifies. Finally, the
-   * channel that the onBehalfOfContentOwnerChannel parameter value specifies must
-   * be linked to the content owner that the onBehalfOfContentOwner parameter
-   * specifies.
-   *
-   * This parameter is intended for YouTube content partners that own and manage
-   * many different YouTube channels. It allows content owners to authenticate
-   * once and perform actions on behalf of the channel specified in the parameter
-   * value, without having to provide authentication credentials for each separate
-   * channel.
-   */
-  public function delete($id, $optParams = array())
-  {
-    $params = array('id' => $id);
-    $params = array_merge($params, $optParams);
-    return $this->call('delete', array($params));
-  }
-  /**
-   * Creates a video stream. The stream enables you to send your video to YouTube,
-   * which can then broadcast the video to your audience. (liveStreams.insert)
-   *
-   * @param string $part The part parameter serves two purposes in this operation.
-   * It identifies the properties that the write operation will set as well as the
-   * properties that the API response will include.
-   *
-   * The part properties that you can include in the parameter value are id,
-   * snippet, cdn, and status.
-   * @param Google_Service_YouTube_LiveStream $postBody
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param string onBehalfOfContentOwner Note: This parameter is intended
-   * exclusively for YouTube content partners.
-   *
-   * The onBehalfOfContentOwner parameter indicates that the request's
-   * authorization credentials identify a YouTube CMS user who is acting on behalf
-   * of the content owner specified in the parameter value. This parameter is
-   * intended for YouTube content partners that own and manage many different
-   * YouTube channels. It allows content owners to authenticate once and get
-   * access to all their video and channel data, without having to provide
-   * authentication credentials for each individual channel. The CMS account that
-   * the user authenticates with must be linked to the specified YouTube content
-   * owner.
-   * @opt_param string onBehalfOfContentOwnerChannel This parameter can only be
-   * used in a properly authorized request. Note: This parameter is intended
-   * exclusively for YouTube content partners.
-   *
-   * The onBehalfOfContentOwnerChannel parameter specifies the YouTube channel ID
-   * of the channel to which a video is being added. This parameter is required
-   * when a request specifies a value for the onBehalfOfContentOwner parameter,
-   * and it can only be used in conjunction with that parameter. In addition, the
-   * request must be authorized using a CMS account that is linked to the content
-   * owner that the onBehalfOfContentOwner parameter specifies. Finally, the
-   * channel that the onBehalfOfContentOwnerChannel parameter value specifies must
-   * be linked to the content owner that the onBehalfOfContentOwner parameter
-   * specifies.
-   *
-   * This parameter is intended for YouTube content partners that own and manage
-   * many different YouTube channels. It allows content owners to authenticate
-   * once and perform actions on behalf of the channel specified in the parameter
-   * value, without having to provide authentication credentials for each separate
-   * channel.
-   * @return Google_Service_YouTube_LiveStream
-   */
-  public function insert($part, Google_Service_YouTube_LiveStream $postBody, $optParams = array())
-  {
-    $params = array('part' => $part, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('insert', array($params), "Google_Service_YouTube_LiveStream");
-  }
-  /**
-   * Returns a list of video streams that match the API request parameters.
-   * (liveStreams.listLiveStreams)
-   *
-   * @param string $part The part parameter specifies a comma-separated list of
-   * one or more liveStream resource properties that the API response will
-   * include. The part names that you can include in the parameter value are id,
-   * snippet, cdn, and status.
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param string id The id parameter specifies a comma-separated list of
-   * YouTube stream IDs that identify the streams being retrieved. In a liveStream
-   * resource, the id property specifies the stream's ID.
-   * @opt_param string maxResults The maxResults parameter specifies the maximum
-   * number of items that should be returned in the result set.
-   * @opt_param bool mine The mine parameter can be used to instruct the API to
-   * only return streams owned by the authenticated user. Set the parameter value
-   * to true to only retrieve your own streams.
-   * @opt_param string onBehalfOfContentOwner Note: This parameter is intended
-   * exclusively for YouTube content partners.
-   *
-   * The onBehalfOfContentOwner parameter indicates that the request's
-   * authorization credentials identify a YouTube CMS user who is acting on behalf
-   * of the content owner specified in the parameter value. This parameter is
-   * intended for YouTube content partners that own and manage many different
-   * YouTube channels. It allows content owners to authenticate once and get
-   * access to all their video and channel data, without having to provide
-   * authentication credentials for each individual channel. The CMS account that
-   * the user authenticates with must be linked to the specified YouTube content
-   * owner.
-   * @opt_param string onBehalfOfContentOwnerChannel This parameter can only be
-   * used in a properly authorized request. Note: This parameter is intended
-   * exclusively for YouTube content partners.
-   *
-   * The onBehalfOfContentOwnerChannel parameter specifies the YouTube channel ID
-   * of the channel to which a video is being added. This parameter is required
-   * when a request specifies a value for the onBehalfOfContentOwner parameter,
-   * and it can only be used in conjunction with that parameter. In addition, the
-   * request must be authorized using a CMS account that is linked to the content
-   * owner that the onBehalfOfContentOwner parameter specifies. Finally, the
-   * channel that the onBehalfOfContentOwnerChannel parameter value specifies must
-   * be linked to the content owner that the onBehalfOfContentOwner parameter
-   * specifies.
-   *
-   * This parameter is intended for YouTube content partners that own and manage
-   * many different YouTube channels. It allows content owners to authenticate
-   * once and perform actions on behalf of the channel specified in the parameter
-   * value, without having to provide authentication credentials for each separate
-   * channel.
-   * @opt_param string pageToken The pageToken parameter identifies a specific
-   * page in the result set that should be returned. In an API response, the
-   * nextPageToken and prevPageToken properties identify other pages that could be
-   * retrieved.
-   * @return Google_Service_YouTube_LiveStreamListResponse
-   */
-  public function listLiveStreams($part, $optParams = array())
-  {
-    $params = array('part' => $part);
-    $params = array_merge($params, $optParams);
-    return $this->call('list', array($params), "Google_Service_YouTube_LiveStreamListResponse");
-  }
-  /**
-   * Updates a video stream. If the properties that you want to change cannot be
-   * updated, then you need to create a new stream with the proper settings.
-   * (liveStreams.update)
-   *
-   * @param string $part The part parameter serves two purposes in this operation.
-   * It identifies the properties that the write operation will set as well as the
-   * properties that the API response will include.
-   *
-   * The part properties that you can include in the parameter value are id,
-   * snippet, cdn, and status.
-   *
-   * Note that this method will override the existing values for all of the
-   * mutable properties that are contained in any parts that the parameter value
-   * specifies. If the request body does not specify a value for a mutable
-   * property, the existing value for that property will be removed.
-   * @param Google_Service_YouTube_LiveStream $postBody
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param string onBehalfOfContentOwner Note: This parameter is intended
-   * exclusively for YouTube content partners.
-   *
-   * The onBehalfOfContentOwner parameter indicates that the request's
-   * authorization credentials identify a YouTube CMS user who is acting on behalf
-   * of the content owner specified in the parameter value. This parameter is
-   * intended for YouTube content partners that own and manage many different
-   * YouTube channels. It allows content owners to authenticate once and get
-   * access to all their video and channel data, without having to provide
-   * authentication credentials for each individual channel. The CMS account that
-   * the user authenticates with must be linked to the specified YouTube content
-   * owner.
-   * @opt_param string onBehalfOfContentOwnerChannel This parameter can only be
-   * used in a properly authorized request. Note: This parameter is intended
-   * exclusively for YouTube content partners.
-   *
-   * The onBehalfOfContentOwnerChannel parameter specifies the YouTube channel ID
-   * of the channel to which a video is being added. This parameter is required
-   * when a request specifies a value for the onBehalfOfContentOwner parameter,
-   * and it can only be used in conjunction with that parameter. In addition, the
-   * request must be authorized using a CMS account that is linked to the content
-   * owner that the onBehalfOfContentOwner parameter specifies. Finally, the
-   * channel that the onBehalfOfContentOwnerChannel parameter value specifies must
-   * be linked to the content owner that the onBehalfOfContentOwner parameter
-   * specifies.
-   *
-   * This parameter is intended for YouTube content partners that own and manage
-   * many different YouTube channels. It allows content owners to authenticate
-   * once and perform actions on behalf of the channel specified in the parameter
-   * value, without having to provide authentication credentials for each separate
-   * channel.
-   * @return Google_Service_YouTube_LiveStream
-   */
-  public function update($part, Google_Service_YouTube_LiveStream $postBody, $optParams = array())
-  {
-    $params = array('part' => $part, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('update', array($params), "Google_Service_YouTube_LiveStream");
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTube/Resource/PlaylistItems.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTube/Resource/PlaylistItems.php
deleted file mode 100644
index 1b2cc29d..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTube/Resource/PlaylistItems.php
+++ /dev/null
@@ -1,178 +0,0 @@
-
- *   $youtubeService = new Google_Service_YouTube(...);
- *   $playlistItems = $youtubeService->playlistItems;
- *  
- */
-class Google_Service_YouTube_Resource_PlaylistItems extends Google_Service_Resource
-{
-  /**
-   * Deletes a playlist item. (playlistItems.delete)
-   *
-   * @param string $id The id parameter specifies the YouTube playlist item ID for
-   * the playlist item that is being deleted. In a playlistItem resource, the id
-   * property specifies the playlist item's ID.
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param string onBehalfOfContentOwner Note: This parameter is intended
-   * exclusively for YouTube content partners.
-   *
-   * The onBehalfOfContentOwner parameter indicates that the request's
-   * authorization credentials identify a YouTube CMS user who is acting on behalf
-   * of the content owner specified in the parameter value. This parameter is
-   * intended for YouTube content partners that own and manage many different
-   * YouTube channels. It allows content owners to authenticate once and get
-   * access to all their video and channel data, without having to provide
-   * authentication credentials for each individual channel. The CMS account that
-   * the user authenticates with must be linked to the specified YouTube content
-   * owner.
-   */
-  public function delete($id, $optParams = array())
-  {
-    $params = array('id' => $id);
-    $params = array_merge($params, $optParams);
-    return $this->call('delete', array($params));
-  }
-  /**
-   * Adds a resource to a playlist. (playlistItems.insert)
-   *
-   * @param string $part The part parameter serves two purposes in this operation.
-   * It identifies the properties that the write operation will set as well as the
-   * properties that the API response will include.
-   * @param Google_Service_YouTube_PlaylistItem $postBody
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param string onBehalfOfContentOwner Note: This parameter is intended
-   * exclusively for YouTube content partners.
-   *
-   * The onBehalfOfContentOwner parameter indicates that the request's
-   * authorization credentials identify a YouTube CMS user who is acting on behalf
-   * of the content owner specified in the parameter value. This parameter is
-   * intended for YouTube content partners that own and manage many different
-   * YouTube channels. It allows content owners to authenticate once and get
-   * access to all their video and channel data, without having to provide
-   * authentication credentials for each individual channel. The CMS account that
-   * the user authenticates with must be linked to the specified YouTube content
-   * owner.
-   * @return Google_Service_YouTube_PlaylistItem
-   */
-  public function insert($part, Google_Service_YouTube_PlaylistItem $postBody, $optParams = array())
-  {
-    $params = array('part' => $part, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('insert', array($params), "Google_Service_YouTube_PlaylistItem");
-  }
-  /**
-   * Returns a collection of playlist items that match the API request parameters.
-   * You can retrieve all of the playlist items in a specified playlist or
-   * retrieve one or more playlist items by their unique IDs.
-   * (playlistItems.listPlaylistItems)
-   *
-   * @param string $part The part parameter specifies a comma-separated list of
-   * one or more playlistItem resource properties that the API response will
-   * include.
-   *
-   * If the parameter identifies a property that contains child properties, the
-   * child properties will be included in the response. For example, in a
-   * playlistItem resource, the snippet property contains numerous fields,
-   * including the title, description, position, and resourceId properties. As
-   * such, if you set part=snippet, the API response will contain all of those
-   * properties.
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param string id The id parameter specifies a comma-separated list of one
-   * or more unique playlist item IDs.
-   * @opt_param string maxResults The maxResults parameter specifies the maximum
-   * number of items that should be returned in the result set.
-   * @opt_param string onBehalfOfContentOwner Note: This parameter is intended
-   * exclusively for YouTube content partners.
-   *
-   * The onBehalfOfContentOwner parameter indicates that the request's
-   * authorization credentials identify a YouTube CMS user who is acting on behalf
-   * of the content owner specified in the parameter value. This parameter is
-   * intended for YouTube content partners that own and manage many different
-   * YouTube channels. It allows content owners to authenticate once and get
-   * access to all their video and channel data, without having to provide
-   * authentication credentials for each individual channel. The CMS account that
-   * the user authenticates with must be linked to the specified YouTube content
-   * owner.
-   * @opt_param string pageToken The pageToken parameter identifies a specific
-   * page in the result set that should be returned. In an API response, the
-   * nextPageToken and prevPageToken properties identify other pages that could be
-   * retrieved.
-   * @opt_param string playlistId The playlistId parameter specifies the unique ID
-   * of the playlist for which you want to retrieve playlist items. Note that even
-   * though this is an optional parameter, every request to retrieve playlist
-   * items must specify a value for either the id parameter or the playlistId
-   * parameter.
-   * @opt_param string videoId The videoId parameter specifies that the request
-   * should return only the playlist items that contain the specified video.
-   * @return Google_Service_YouTube_PlaylistItemListResponse
-   */
-  public function listPlaylistItems($part, $optParams = array())
-  {
-    $params = array('part' => $part);
-    $params = array_merge($params, $optParams);
-    return $this->call('list', array($params), "Google_Service_YouTube_PlaylistItemListResponse");
-  }
-  /**
-   * Modifies a playlist item. For example, you could update the item's position
-   * in the playlist. (playlistItems.update)
-   *
-   * @param string $part The part parameter serves two purposes in this operation.
-   * It identifies the properties that the write operation will set as well as the
-   * properties that the API response will include.
-   *
-   * Note that this method will override the existing values for all of the
-   * mutable properties that are contained in any parts that the parameter value
-   * specifies. For example, a playlist item can specify a start time and end
-   * time, which identify the times portion of the video that should play when
-   * users watch the video in the playlist. If your request is updating a playlist
-   * item that sets these values, and the request's part parameter value includes
-   * the contentDetails part, the playlist item's start and end times will be
-   * updated to whatever value the request body specifies. If the request body
-   * does not specify values, the existing start and end times will be removed and
-   * replaced with the default settings.
-   * @param Google_Service_YouTube_PlaylistItem $postBody
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param string onBehalfOfContentOwner Note: This parameter is intended
-   * exclusively for YouTube content partners.
-   *
-   * The onBehalfOfContentOwner parameter indicates that the request's
-   * authorization credentials identify a YouTube CMS user who is acting on behalf
-   * of the content owner specified in the parameter value. This parameter is
-   * intended for YouTube content partners that own and manage many different
-   * YouTube channels. It allows content owners to authenticate once and get
-   * access to all their video and channel data, without having to provide
-   * authentication credentials for each individual channel. The CMS account that
-   * the user authenticates with must be linked to the specified YouTube content
-   * owner.
-   * @return Google_Service_YouTube_PlaylistItem
-   */
-  public function update($part, Google_Service_YouTube_PlaylistItem $postBody, $optParams = array())
-  {
-    $params = array('part' => $part, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('update', array($params), "Google_Service_YouTube_PlaylistItem");
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTube/Resource/Playlists.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTube/Resource/Playlists.php
deleted file mode 100644
index cba9b15a..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTube/Resource/Playlists.php
+++ /dev/null
@@ -1,211 +0,0 @@
-
- *   $youtubeService = new Google_Service_YouTube(...);
- *   $playlists = $youtubeService->playlists;
- *  
- */
-class Google_Service_YouTube_Resource_Playlists extends Google_Service_Resource
-{
-  /**
-   * Deletes a playlist. (playlists.delete)
-   *
-   * @param string $id The id parameter specifies the YouTube playlist ID for the
-   * playlist that is being deleted. In a playlist resource, the id property
-   * specifies the playlist's ID.
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param string onBehalfOfContentOwner Note: This parameter is intended
-   * exclusively for YouTube content partners.
-   *
-   * The onBehalfOfContentOwner parameter indicates that the request's
-   * authorization credentials identify a YouTube CMS user who is acting on behalf
-   * of the content owner specified in the parameter value. This parameter is
-   * intended for YouTube content partners that own and manage many different
-   * YouTube channels. It allows content owners to authenticate once and get
-   * access to all their video and channel data, without having to provide
-   * authentication credentials for each individual channel. The CMS account that
-   * the user authenticates with must be linked to the specified YouTube content
-   * owner.
-   */
-  public function delete($id, $optParams = array())
-  {
-    $params = array('id' => $id);
-    $params = array_merge($params, $optParams);
-    return $this->call('delete', array($params));
-  }
-  /**
-   * Creates a playlist. (playlists.insert)
-   *
-   * @param string $part The part parameter serves two purposes in this operation.
-   * It identifies the properties that the write operation will set as well as the
-   * properties that the API response will include.
-   * @param Google_Service_YouTube_Playlist $postBody
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param string onBehalfOfContentOwner Note: This parameter is intended
-   * exclusively for YouTube content partners.
-   *
-   * The onBehalfOfContentOwner parameter indicates that the request's
-   * authorization credentials identify a YouTube CMS user who is acting on behalf
-   * of the content owner specified in the parameter value. This parameter is
-   * intended for YouTube content partners that own and manage many different
-   * YouTube channels. It allows content owners to authenticate once and get
-   * access to all their video and channel data, without having to provide
-   * authentication credentials for each individual channel. The CMS account that
-   * the user authenticates with must be linked to the specified YouTube content
-   * owner.
-   * @opt_param string onBehalfOfContentOwnerChannel This parameter can only be
-   * used in a properly authorized request. Note: This parameter is intended
-   * exclusively for YouTube content partners.
-   *
-   * The onBehalfOfContentOwnerChannel parameter specifies the YouTube channel ID
-   * of the channel to which a video is being added. This parameter is required
-   * when a request specifies a value for the onBehalfOfContentOwner parameter,
-   * and it can only be used in conjunction with that parameter. In addition, the
-   * request must be authorized using a CMS account that is linked to the content
-   * owner that the onBehalfOfContentOwner parameter specifies. Finally, the
-   * channel that the onBehalfOfContentOwnerChannel parameter value specifies must
-   * be linked to the content owner that the onBehalfOfContentOwner parameter
-   * specifies.
-   *
-   * This parameter is intended for YouTube content partners that own and manage
-   * many different YouTube channels. It allows content owners to authenticate
-   * once and perform actions on behalf of the channel specified in the parameter
-   * value, without having to provide authentication credentials for each separate
-   * channel.
-   * @return Google_Service_YouTube_Playlist
-   */
-  public function insert($part, Google_Service_YouTube_Playlist $postBody, $optParams = array())
-  {
-    $params = array('part' => $part, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('insert', array($params), "Google_Service_YouTube_Playlist");
-  }
-  /**
-   * Returns a collection of playlists that match the API request parameters. For
-   * example, you can retrieve all playlists that the authenticated user owns, or
-   * you can retrieve one or more playlists by their unique IDs.
-   * (playlists.listPlaylists)
-   *
-   * @param string $part The part parameter specifies a comma-separated list of
-   * one or more playlist resource properties that the API response will include.
-   *
-   * If the parameter identifies a property that contains child properties, the
-   * child properties will be included in the response. For example, in a playlist
-   * resource, the snippet property contains properties like author, title,
-   * description, tags, and timeCreated. As such, if you set part=snippet, the API
-   * response will contain all of those properties.
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param string channelId This value indicates that the API should only
-   * return the specified channel's playlists.
-   * @opt_param string hl The hl parameter should be used for filter out the
-   * properties that are not in the given language. Used for the snippet part.
-   * @opt_param string id The id parameter specifies a comma-separated list of the
-   * YouTube playlist ID(s) for the resource(s) that are being retrieved. In a
-   * playlist resource, the id property specifies the playlist's YouTube playlist
-   * ID.
-   * @opt_param string maxResults The maxResults parameter specifies the maximum
-   * number of items that should be returned in the result set.
-   * @opt_param bool mine Set this parameter's value to true to instruct the API
-   * to only return playlists owned by the authenticated user.
-   * @opt_param string onBehalfOfContentOwner Note: This parameter is intended
-   * exclusively for YouTube content partners.
-   *
-   * The onBehalfOfContentOwner parameter indicates that the request's
-   * authorization credentials identify a YouTube CMS user who is acting on behalf
-   * of the content owner specified in the parameter value. This parameter is
-   * intended for YouTube content partners that own and manage many different
-   * YouTube channels. It allows content owners to authenticate once and get
-   * access to all their video and channel data, without having to provide
-   * authentication credentials for each individual channel. The CMS account that
-   * the user authenticates with must be linked to the specified YouTube content
-   * owner.
-   * @opt_param string onBehalfOfContentOwnerChannel This parameter can only be
-   * used in a properly authorized request. Note: This parameter is intended
-   * exclusively for YouTube content partners.
-   *
-   * The onBehalfOfContentOwnerChannel parameter specifies the YouTube channel ID
-   * of the channel to which a video is being added. This parameter is required
-   * when a request specifies a value for the onBehalfOfContentOwner parameter,
-   * and it can only be used in conjunction with that parameter. In addition, the
-   * request must be authorized using a CMS account that is linked to the content
-   * owner that the onBehalfOfContentOwner parameter specifies. Finally, the
-   * channel that the onBehalfOfContentOwnerChannel parameter value specifies must
-   * be linked to the content owner that the onBehalfOfContentOwner parameter
-   * specifies.
-   *
-   * This parameter is intended for YouTube content partners that own and manage
-   * many different YouTube channels. It allows content owners to authenticate
-   * once and perform actions on behalf of the channel specified in the parameter
-   * value, without having to provide authentication credentials for each separate
-   * channel.
-   * @opt_param string pageToken The pageToken parameter identifies a specific
-   * page in the result set that should be returned. In an API response, the
-   * nextPageToken and prevPageToken properties identify other pages that could be
-   * retrieved.
-   * @return Google_Service_YouTube_PlaylistListResponse
-   */
-  public function listPlaylists($part, $optParams = array())
-  {
-    $params = array('part' => $part);
-    $params = array_merge($params, $optParams);
-    return $this->call('list', array($params), "Google_Service_YouTube_PlaylistListResponse");
-  }
-  /**
-   * Modifies a playlist. For example, you could change a playlist's title,
-   * description, or privacy status. (playlists.update)
-   *
-   * @param string $part The part parameter serves two purposes in this operation.
-   * It identifies the properties that the write operation will set as well as the
-   * properties that the API response will include.
-   *
-   * Note that this method will override the existing values for mutable
-   * properties that are contained in any parts that the request body specifies.
-   * For example, a playlist's description is contained in the snippet part, which
-   * must be included in the request body. If the request does not specify a value
-   * for the snippet.description property, the playlist's existing description
-   * will be deleted.
-   * @param Google_Service_YouTube_Playlist $postBody
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param string onBehalfOfContentOwner Note: This parameter is intended
-   * exclusively for YouTube content partners.
-   *
-   * The onBehalfOfContentOwner parameter indicates that the request's
-   * authorization credentials identify a YouTube CMS user who is acting on behalf
-   * of the content owner specified in the parameter value. This parameter is
-   * intended for YouTube content partners that own and manage many different
-   * YouTube channels. It allows content owners to authenticate once and get
-   * access to all their video and channel data, without having to provide
-   * authentication credentials for each individual channel. The CMS account that
-   * the user authenticates with must be linked to the specified YouTube content
-   * owner.
-   * @return Google_Service_YouTube_Playlist
-   */
-  public function update($part, Google_Service_YouTube_Playlist $postBody, $optParams = array())
-  {
-    $params = array('part' => $part, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('update', array($params), "Google_Service_YouTube_Playlist");
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTube/Resource/Search.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTube/Resource/Search.php
deleted file mode 100644
index aa7dd4de..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTube/Resource/Search.php
+++ /dev/null
@@ -1,185 +0,0 @@
-
- *   $youtubeService = new Google_Service_YouTube(...);
- *   $search = $youtubeService->search;
- *  
- */
-class Google_Service_YouTube_Resource_Search extends Google_Service_Resource
-{
-  /**
-   * Returns a collection of search results that match the query parameters
-   * specified in the API request. By default, a search result set identifies
-   * matching video, channel, and playlist resources, but you can also configure
-   * queries to only retrieve a specific type of resource. (search.listSearch)
-   *
-   * @param string $part The part parameter specifies a comma-separated list of
-   * one or more search resource properties that the API response will include.
-   * Set the parameter value to snippet.
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param string channelId The channelId parameter indicates that the API
-   * response should only contain resources created by the channel
-   * @opt_param string channelType The channelType parameter lets you restrict a
-   * search to a particular type of channel.
-   * @opt_param string eventType The eventType parameter restricts a search to
-   * broadcast events. If you specify a value for this parameter, you must also
-   * set the type parameter's value to video.
-   * @opt_param bool forContentOwner Note: This parameter is intended exclusively
-   * for YouTube content partners.
-   *
-   * The forContentOwner parameter restricts the search to only retrieve resources
-   * owned by the content owner specified by the onBehalfOfContentOwner parameter.
-   * The user must be authenticated using a CMS account linked to the specified
-   * content owner and onBehalfOfContentOwner must be provided.
-   * @opt_param bool forDeveloper The forDeveloper parameter restricts the search
-   * to only retrieve videos uploaded via the developer's application or website.
-   * The API server uses the request's authorization credentials to identify the
-   * developer. Therefore, a developer can restrict results to videos uploaded
-   * through the developer's own app or website but not to videos uploaded through
-   * other apps or sites.
-   * @opt_param bool forMine The forMine parameter restricts the search to only
-   * retrieve videos owned by the authenticated user. If you set this parameter to
-   * true, then the type parameter's value must also be set to video.
-   * @opt_param string location The location parameter, in conjunction with the
-   * locationRadius parameter, defines a circular geographic area and also
-   * restricts a search to videos that specify, in their metadata, a geographic
-   * location that falls within that area. The parameter value is a string that
-   * specifies latitude/longitude coordinates e.g. (37.42307,-122.08427).
-   *
-   * - The location parameter value identifies the point at the center of the
-   * area. - The locationRadius parameter specifies the maximum distance that the
-   * location associated with a video can be from that point for the video to
-   * still be included in the search results.The API returns an error if your
-   * request specifies a value for the location parameter but does not also
-   * specify a value for the locationRadius parameter.
-   * @opt_param string locationRadius The locationRadius parameter, in conjunction
-   * with the location parameter, defines a circular geographic area.
-   *
-   * The parameter value must be a floating point number followed by a measurement
-   * unit. Valid measurement units are m, km, ft, and mi. For example, valid
-   * parameter values include 1500m, 5km, 10000ft, and 0.75mi. The API does not
-   * support locationRadius parameter values larger than 1000 kilometers.
-   *
-   * Note: See the definition of the location parameter for more information.
-   * @opt_param string maxResults The maxResults parameter specifies the maximum
-   * number of items that should be returned in the result set.
-   * @opt_param string onBehalfOfContentOwner Note: This parameter is intended
-   * exclusively for YouTube content partners.
-   *
-   * The onBehalfOfContentOwner parameter indicates that the request's
-   * authorization credentials identify a YouTube CMS user who is acting on behalf
-   * of the content owner specified in the parameter value. This parameter is
-   * intended for YouTube content partners that own and manage many different
-   * YouTube channels. It allows content owners to authenticate once and get
-   * access to all their video and channel data, without having to provide
-   * authentication credentials for each individual channel. The CMS account that
-   * the user authenticates with must be linked to the specified YouTube content
-   * owner.
-   * @opt_param string order The order parameter specifies the method that will be
-   * used to order resources in the API response.
-   * @opt_param string pageToken The pageToken parameter identifies a specific
-   * page in the result set that should be returned. In an API response, the
-   * nextPageToken and prevPageToken properties identify other pages that could be
-   * retrieved.
-   * @opt_param string publishedAfter The publishedAfter parameter indicates that
-   * the API response should only contain resources created after the specified
-   * time. The value is an RFC 3339 formatted date-time value
-   * (1970-01-01T00:00:00Z).
-   * @opt_param string publishedBefore The publishedBefore parameter indicates
-   * that the API response should only contain resources created before the
-   * specified time. The value is an RFC 3339 formatted date-time value
-   * (1970-01-01T00:00:00Z).
-   * @opt_param string q The q parameter specifies the query term to search for.
-   *
-   * Your request can also use the Boolean NOT (-) and OR (|) operators to exclude
-   * videos or to find videos that are associated with one of several search
-   * terms. For example, to search for videos matching either "boating" or
-   * "sailing", set the q parameter value to boating|sailing. Similarly, to search
-   * for videos matching either "boating" or "sailing" but not "fishing", set the
-   * q parameter value to boating|sailing -fishing. Note that the pipe character
-   * must be URL-escaped when it is sent in your API request. The URL-escaped
-   * value for the pipe character is %7C.
-   * @opt_param string regionCode The regionCode parameter instructs the API to
-   * return search results for the specified country. The parameter value is an
-   * ISO 3166-1 alpha-2 country code.
-   * @opt_param string relatedToVideoId The relatedToVideoId parameter retrieves a
-   * list of videos that are related to the video that the parameter value
-   * identifies. The parameter value must be set to a YouTube video ID and, if you
-   * are using this parameter, the type parameter must be set to video.
-   * @opt_param string relevanceLanguage The relevanceLanguage parameter instructs
-   * the API to return search results that are most relevant to the specified
-   * language. The parameter value is typically an ISO 639-1 two-letter language
-   * code. However, you should use the values zh-Hans for simplified Chinese and
-   * zh-Hant for traditional Chinese. Please note that results in other languages
-   * will still be returned if they are highly relevant to the search query term.
-   * @opt_param string safeSearch The safeSearch parameter indicates whether the
-   * search results should include restricted content as well as standard content.
-   * @opt_param string topicId The topicId parameter indicates that the API
-   * response should only contain resources associated with the specified topic.
-   * The value identifies a Freebase topic ID.
-   * @opt_param string type The type parameter restricts a search query to only
-   * retrieve a particular type of resource. The value is a comma-separated list
-   * of resource types.
-   * @opt_param string videoCaption The videoCaption parameter indicates whether
-   * the API should filter video search results based on whether they have
-   * captions. If you specify a value for this parameter, you must also set the
-   * type parameter's value to video.
-   * @opt_param string videoCategoryId The videoCategoryId parameter filters video
-   * search results based on their category. If you specify a value for this
-   * parameter, you must also set the type parameter's value to video.
-   * @opt_param string videoDefinition The videoDefinition parameter lets you
-   * restrict a search to only include either high definition (HD) or standard
-   * definition (SD) videos. HD videos are available for playback in at least
-   * 720p, though higher resolutions, like 1080p, might also be available. If you
-   * specify a value for this parameter, you must also set the type parameter's
-   * value to video.
-   * @opt_param string videoDimension The videoDimension parameter lets you
-   * restrict a search to only retrieve 2D or 3D videos. If you specify a value
-   * for this parameter, you must also set the type parameter's value to video.
-   * @opt_param string videoDuration The videoDuration parameter filters video
-   * search results based on their duration. If you specify a value for this
-   * parameter, you must also set the type parameter's value to video.
-   * @opt_param string videoEmbeddable The videoEmbeddable parameter lets you to
-   * restrict a search to only videos that can be embedded into a webpage. If you
-   * specify a value for this parameter, you must also set the type parameter's
-   * value to video.
-   * @opt_param string videoLicense The videoLicense parameter filters search
-   * results to only include videos with a particular license. YouTube lets video
-   * uploaders choose to attach either the Creative Commons license or the
-   * standard YouTube license to each of their videos. If you specify a value for
-   * this parameter, you must also set the type parameter's value to video.
-   * @opt_param string videoSyndicated The videoSyndicated parameter lets you to
-   * restrict a search to only videos that can be played outside youtube.com. If
-   * you specify a value for this parameter, you must also set the type
-   * parameter's value to video.
-   * @opt_param string videoType The videoType parameter lets you restrict a
-   * search to a particular type of videos. If you specify a value for this
-   * parameter, you must also set the type parameter's value to video.
-   * @return Google_Service_YouTube_SearchListResponse
-   */
-  public function listSearch($part, $optParams = array())
-  {
-    $params = array('part' => $part);
-    $params = array_merge($params, $optParams);
-    return $this->call('list', array($params), "Google_Service_YouTube_SearchListResponse");
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTube/Resource/Sponsors.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTube/Resource/Sponsors.php
deleted file mode 100644
index 50590de3..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTube/Resource/Sponsors.php
+++ /dev/null
@@ -1,51 +0,0 @@
-
- *   $youtubeService = new Google_Service_YouTube(...);
- *   $sponsors = $youtubeService->sponsors;
- *  
- */
-class Google_Service_YouTube_Resource_Sponsors extends Google_Service_Resource
-{
-  /**
-   * Lists sponsors for a channel. (sponsors.listSponsors)
-   *
-   * @param string $part The part parameter specifies the sponsor resource parts
-   * that the API response will include. Supported values are id and snippet.
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param string filter The filter parameter specifies which channel
-   * sponsors to return.
-   * @opt_param string maxResults The maxResults parameter specifies the maximum
-   * number of items that should be returned in the result set.
-   * @opt_param string pageToken The pageToken parameter identifies a specific
-   * page in the result set that should be returned. In an API response, the
-   * nextPageToken and prevPageToken properties identify other pages that could be
-   * retrieved.
-   * @return Google_Service_YouTube_SponsorListResponse
-   */
-  public function listSponsors($part, $optParams = array())
-  {
-    $params = array('part' => $part);
-    $params = array_merge($params, $optParams);
-    return $this->call('list', array($params), "Google_Service_YouTube_SponsorListResponse");
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTube/Resource/Subscriptions.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTube/Resource/Subscriptions.php
deleted file mode 100644
index 712ad99b..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTube/Resource/Subscriptions.php
+++ /dev/null
@@ -1,136 +0,0 @@
-
- *   $youtubeService = new Google_Service_YouTube(...);
- *   $subscriptions = $youtubeService->subscriptions;
- *  
- */
-class Google_Service_YouTube_Resource_Subscriptions extends Google_Service_Resource
-{
-  /**
-   * Deletes a subscription. (subscriptions.delete)
-   *
-   * @param string $id The id parameter specifies the YouTube subscription ID for
-   * the resource that is being deleted. In a subscription resource, the id
-   * property specifies the YouTube subscription ID.
-   * @param array $optParams Optional parameters.
-   */
-  public function delete($id, $optParams = array())
-  {
-    $params = array('id' => $id);
-    $params = array_merge($params, $optParams);
-    return $this->call('delete', array($params));
-  }
-  /**
-   * Adds a subscription for the authenticated user's channel.
-   * (subscriptions.insert)
-   *
-   * @param string $part The part parameter serves two purposes in this operation.
-   * It identifies the properties that the write operation will set as well as the
-   * properties that the API response will include.
-   * @param Google_Service_YouTube_Subscription $postBody
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_YouTube_Subscription
-   */
-  public function insert($part, Google_Service_YouTube_Subscription $postBody, $optParams = array())
-  {
-    $params = array('part' => $part, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('insert', array($params), "Google_Service_YouTube_Subscription");
-  }
-  /**
-   * Returns subscription resources that match the API request criteria.
-   * (subscriptions.listSubscriptions)
-   *
-   * @param string $part The part parameter specifies a comma-separated list of
-   * one or more subscription resource properties that the API response will
-   * include.
-   *
-   * If the parameter identifies a property that contains child properties, the
-   * child properties will be included in the response. For example, in a
-   * subscription resource, the snippet property contains other properties, such
-   * as a display title for the subscription. If you set part=snippet, the API
-   * response will also contain all of those nested properties.
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param string channelId The channelId parameter specifies a YouTube
-   * channel ID. The API will only return that channel's subscriptions.
-   * @opt_param string forChannelId The forChannelId parameter specifies a comma-
-   * separated list of channel IDs. The API response will then only contain
-   * subscriptions matching those channels.
-   * @opt_param string id The id parameter specifies a comma-separated list of the
-   * YouTube subscription ID(s) for the resource(s) that are being retrieved. In a
-   * subscription resource, the id property specifies the YouTube subscription ID.
-   * @opt_param string maxResults The maxResults parameter specifies the maximum
-   * number of items that should be returned in the result set.
-   * @opt_param bool mine Set this parameter's value to true to retrieve a feed of
-   * the authenticated user's subscriptions.
-   * @opt_param bool myRecentSubscribers Set this parameter's value to true to
-   * retrieve a feed of the subscribers of the authenticated user in reverse
-   * chronological order (newest first).
-   * @opt_param bool mySubscribers Set this parameter's value to true to retrieve
-   * a feed of the subscribers of the authenticated user in no particular order.
-   * @opt_param string onBehalfOfContentOwner Note: This parameter is intended
-   * exclusively for YouTube content partners.
-   *
-   * The onBehalfOfContentOwner parameter indicates that the request's
-   * authorization credentials identify a YouTube CMS user who is acting on behalf
-   * of the content owner specified in the parameter value. This parameter is
-   * intended for YouTube content partners that own and manage many different
-   * YouTube channels. It allows content owners to authenticate once and get
-   * access to all their video and channel data, without having to provide
-   * authentication credentials for each individual channel. The CMS account that
-   * the user authenticates with must be linked to the specified YouTube content
-   * owner.
-   * @opt_param string onBehalfOfContentOwnerChannel This parameter can only be
-   * used in a properly authorized request. Note: This parameter is intended
-   * exclusively for YouTube content partners.
-   *
-   * The onBehalfOfContentOwnerChannel parameter specifies the YouTube channel ID
-   * of the channel to which a video is being added. This parameter is required
-   * when a request specifies a value for the onBehalfOfContentOwner parameter,
-   * and it can only be used in conjunction with that parameter. In addition, the
-   * request must be authorized using a CMS account that is linked to the content
-   * owner that the onBehalfOfContentOwner parameter specifies. Finally, the
-   * channel that the onBehalfOfContentOwnerChannel parameter value specifies must
-   * be linked to the content owner that the onBehalfOfContentOwner parameter
-   * specifies.
-   *
-   * This parameter is intended for YouTube content partners that own and manage
-   * many different YouTube channels. It allows content owners to authenticate
-   * once and perform actions on behalf of the channel specified in the parameter
-   * value, without having to provide authentication credentials for each separate
-   * channel.
-   * @opt_param string order The order parameter specifies the method that will be
-   * used to sort resources in the API response.
-   * @opt_param string pageToken The pageToken parameter identifies a specific
-   * page in the result set that should be returned. In an API response, the
-   * nextPageToken and prevPageToken properties identify other pages that could be
-   * retrieved.
-   * @return Google_Service_YouTube_SubscriptionListResponse
-   */
-  public function listSubscriptions($part, $optParams = array())
-  {
-    $params = array('part' => $part);
-    $params = array_merge($params, $optParams);
-    return $this->call('list', array($params), "Google_Service_YouTube_SubscriptionListResponse");
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTube/Resource/SuperChatEvents.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTube/Resource/SuperChatEvents.php
deleted file mode 100644
index 1e796c30..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTube/Resource/SuperChatEvents.php
+++ /dev/null
@@ -1,59 +0,0 @@
-
- *   $youtubeService = new Google_Service_YouTube(...);
- *   $superChatEvents = $youtubeService->superChatEvents;
- *  
- */
-class Google_Service_YouTube_Resource_SuperChatEvents extends Google_Service_Resource
-{
-  /**
-   * Lists Super Chat events for a channel. (superChatEvents.listSuperChatEvents)
-   *
-   * @param string $part The part parameter specifies the superChatEvent resource
-   * parts that the API response will include. Supported values are id and
-   * snippet.
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param string hl The hl parameter instructs the API to retrieve localized
-   * resource metadata for a specific application language that the YouTube
-   * website supports. The parameter value must be a language code included in the
-   * list returned by the i18nLanguages.list method.
-   *
-   * If localized resource details are available in that language, the resource's
-   * snippet.localized object will contain the localized values. However, if
-   * localized details are not available, the snippet.localized object will
-   * contain resource details in the resource's default language.
-   * @opt_param string maxResults The maxResults parameter specifies the maximum
-   * number of items that should be returned in the result set.
-   * @opt_param string pageToken The pageToken parameter identifies a specific
-   * page in the result set that should be returned. In an API response, the
-   * nextPageToken and prevPageToken properties identify other pages that could be
-   * retrieved.
-   * @return Google_Service_YouTube_SuperChatEventListResponse
-   */
-  public function listSuperChatEvents($part, $optParams = array())
-  {
-    $params = array('part' => $part);
-    $params = array_merge($params, $optParams);
-    return $this->call('list', array($params), "Google_Service_YouTube_SuperChatEventListResponse");
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTube/Resource/Thumbnails.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTube/Resource/Thumbnails.php
deleted file mode 100644
index 774ca9da..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTube/Resource/Thumbnails.php
+++ /dev/null
@@ -1,56 +0,0 @@
-
- *   $youtubeService = new Google_Service_YouTube(...);
- *   $thumbnails = $youtubeService->thumbnails;
- *  
- */
-class Google_Service_YouTube_Resource_Thumbnails extends Google_Service_Resource
-{
-  /**
-   * Uploads a custom video thumbnail to YouTube and sets it for a video.
-   * (thumbnails.set)
-   *
-   * @param string $videoId The videoId parameter specifies a YouTube video ID for
-   * which the custom video thumbnail is being provided.
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param string onBehalfOfContentOwner Note: This parameter is intended
-   * exclusively for YouTube content partners.
-   *
-   * The onBehalfOfContentOwner parameter indicates that the request's
-   * authorization credentials identify a YouTube CMS user who is acting on behalf
-   * of the content owner specified in the parameter value. This parameter is
-   * intended for YouTube content partners that own and manage many different
-   * YouTube channels. It allows content owners to authenticate once and get
-   * access to all their video and channel data, without having to provide
-   * authentication credentials for each individual channel. The actual CMS
-   * account that the user authenticates with must be linked to the specified
-   * YouTube content owner.
-   * @return Google_Service_YouTube_ThumbnailSetResponse
-   */
-  public function set($videoId, $optParams = array())
-  {
-    $params = array('videoId' => $videoId);
-    $params = array_merge($params, $optParams);
-    return $this->call('set', array($params), "Google_Service_YouTube_ThumbnailSetResponse");
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTube/Resource/VideoAbuseReportReasons.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTube/Resource/VideoAbuseReportReasons.php
deleted file mode 100644
index 234c1122..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTube/Resource/VideoAbuseReportReasons.php
+++ /dev/null
@@ -1,47 +0,0 @@
-
- *   $youtubeService = new Google_Service_YouTube(...);
- *   $videoAbuseReportReasons = $youtubeService->videoAbuseReportReasons;
- *  
- */
-class Google_Service_YouTube_Resource_VideoAbuseReportReasons extends Google_Service_Resource
-{
-  /**
-   * Returns a list of abuse reasons that can be used for reporting abusive
-   * videos. (videoAbuseReportReasons.listVideoAbuseReportReasons)
-   *
-   * @param string $part The part parameter specifies the videoCategory resource
-   * parts that the API response will include. Supported values are id and
-   * snippet.
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param string hl The hl parameter specifies the language that should be
-   * used for text values in the API response.
-   * @return Google_Service_YouTube_VideoAbuseReportReasonListResponse
-   */
-  public function listVideoAbuseReportReasons($part, $optParams = array())
-  {
-    $params = array('part' => $part);
-    $params = array_merge($params, $optParams);
-    return $this->call('list', array($params), "Google_Service_YouTube_VideoAbuseReportReasonListResponse");
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTube/Resource/VideoCategories.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTube/Resource/VideoCategories.php
deleted file mode 100644
index fe46542a..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTube/Resource/VideoCategories.php
+++ /dev/null
@@ -1,52 +0,0 @@
-
- *   $youtubeService = new Google_Service_YouTube(...);
- *   $videoCategories = $youtubeService->videoCategories;
- *  
- */
-class Google_Service_YouTube_Resource_VideoCategories extends Google_Service_Resource
-{
-  /**
-   * Returns a list of categories that can be associated with YouTube videos.
-   * (videoCategories.listVideoCategories)
-   *
-   * @param string $part The part parameter specifies the videoCategory resource
-   * properties that the API response will include. Set the parameter value to
-   * snippet.
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param string hl The hl parameter specifies the language that should be
-   * used for text values in the API response.
-   * @opt_param string id The id parameter specifies a comma-separated list of
-   * video category IDs for the resources that you are retrieving.
-   * @opt_param string regionCode The regionCode parameter instructs the API to
-   * return the list of video categories available in the specified country. The
-   * parameter value is an ISO 3166-1 alpha-2 country code.
-   * @return Google_Service_YouTube_VideoCategoryListResponse
-   */
-  public function listVideoCategories($part, $optParams = array())
-  {
-    $params = array('part' => $part);
-    $params = array_merge($params, $optParams);
-    return $this->call('list', array($params), "Google_Service_YouTube_VideoCategoryListResponse");
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTube/Resource/Videos.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTube/Resource/Videos.php
deleted file mode 100644
index 69b02890..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTube/Resource/Videos.php
+++ /dev/null
@@ -1,315 +0,0 @@
-
- *   $youtubeService = new Google_Service_YouTube(...);
- *   $videos = $youtubeService->videos;
- *  
- */
-class Google_Service_YouTube_Resource_Videos extends Google_Service_Resource
-{
-  /**
-   * Deletes a YouTube video. (videos.delete)
-   *
-   * @param string $id The id parameter specifies the YouTube video ID for the
-   * resource that is being deleted. In a video resource, the id property
-   * specifies the video's ID.
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param string onBehalfOfContentOwner Note: This parameter is intended
-   * exclusively for YouTube content partners.
-   *
-   * The onBehalfOfContentOwner parameter indicates that the request's
-   * authorization credentials identify a YouTube CMS user who is acting on behalf
-   * of the content owner specified in the parameter value. This parameter is
-   * intended for YouTube content partners that own and manage many different
-   * YouTube channels. It allows content owners to authenticate once and get
-   * access to all their video and channel data, without having to provide
-   * authentication credentials for each individual channel. The actual CMS
-   * account that the user authenticates with must be linked to the specified
-   * YouTube content owner.
-   */
-  public function delete($id, $optParams = array())
-  {
-    $params = array('id' => $id);
-    $params = array_merge($params, $optParams);
-    return $this->call('delete', array($params));
-  }
-  /**
-   * Retrieves the ratings that the authorized user gave to a list of specified
-   * videos. (videos.getRating)
-   *
-   * @param string $id The id parameter specifies a comma-separated list of the
-   * YouTube video ID(s) for the resource(s) for which you are retrieving rating
-   * data. In a video resource, the id property specifies the video's ID.
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param string onBehalfOfContentOwner Note: This parameter is intended
-   * exclusively for YouTube content partners.
-   *
-   * The onBehalfOfContentOwner parameter indicates that the request's
-   * authorization credentials identify a YouTube CMS user who is acting on behalf
-   * of the content owner specified in the parameter value. This parameter is
-   * intended for YouTube content partners that own and manage many different
-   * YouTube channels. It allows content owners to authenticate once and get
-   * access to all their video and channel data, without having to provide
-   * authentication credentials for each individual channel. The CMS account that
-   * the user authenticates with must be linked to the specified YouTube content
-   * owner.
-   * @return Google_Service_YouTube_VideoGetRatingResponse
-   */
-  public function getRating($id, $optParams = array())
-  {
-    $params = array('id' => $id);
-    $params = array_merge($params, $optParams);
-    return $this->call('getRating', array($params), "Google_Service_YouTube_VideoGetRatingResponse");
-  }
-  /**
-   * Uploads a video to YouTube and optionally sets the video's metadata.
-   * (videos.insert)
-   *
-   * @param string $part The part parameter serves two purposes in this operation.
-   * It identifies the properties that the write operation will set as well as the
-   * properties that the API response will include.
-   *
-   * Note that not all parts contain properties that can be set when inserting or
-   * updating a video. For example, the statistics object encapsulates statistics
-   * that YouTube calculates for a video and does not contain values that you can
-   * set or modify. If the parameter value specifies a part that does not contain
-   * mutable values, that part will still be included in the API response.
-   * @param Google_Service_YouTube_Video $postBody
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param bool autoLevels The autoLevels parameter indicates whether YouTube
-   * should automatically enhance the video's lighting and color.
-   * @opt_param bool notifySubscribers The notifySubscribers parameter indicates
-   * whether YouTube should send a notification about the new video to users who
-   * subscribe to the video's channel. A parameter value of True indicates that
-   * subscribers will be notified of newly uploaded videos. However, a channel
-   * owner who is uploading many videos might prefer to set the value to False to
-   * avoid sending a notification about each new video to the channel's
-   * subscribers.
-   * @opt_param string onBehalfOfContentOwner Note: This parameter is intended
-   * exclusively for YouTube content partners.
-   *
-   * The onBehalfOfContentOwner parameter indicates that the request's
-   * authorization credentials identify a YouTube CMS user who is acting on behalf
-   * of the content owner specified in the parameter value. This parameter is
-   * intended for YouTube content partners that own and manage many different
-   * YouTube channels. It allows content owners to authenticate once and get
-   * access to all their video and channel data, without having to provide
-   * authentication credentials for each individual channel. The CMS account that
-   * the user authenticates with must be linked to the specified YouTube content
-   * owner.
-   * @opt_param string onBehalfOfContentOwnerChannel This parameter can only be
-   * used in a properly authorized request. Note: This parameter is intended
-   * exclusively for YouTube content partners.
-   *
-   * The onBehalfOfContentOwnerChannel parameter specifies the YouTube channel ID
-   * of the channel to which a video is being added. This parameter is required
-   * when a request specifies a value for the onBehalfOfContentOwner parameter,
-   * and it can only be used in conjunction with that parameter. In addition, the
-   * request must be authorized using a CMS account that is linked to the content
-   * owner that the onBehalfOfContentOwner parameter specifies. Finally, the
-   * channel that the onBehalfOfContentOwnerChannel parameter value specifies must
-   * be linked to the content owner that the onBehalfOfContentOwner parameter
-   * specifies.
-   *
-   * This parameter is intended for YouTube content partners that own and manage
-   * many different YouTube channels. It allows content owners to authenticate
-   * once and perform actions on behalf of the channel specified in the parameter
-   * value, without having to provide authentication credentials for each separate
-   * channel.
-   * @opt_param bool stabilize The stabilize parameter indicates whether YouTube
-   * should adjust the video to remove shaky camera motions.
-   * @return Google_Service_YouTube_Video
-   */
-  public function insert($part, Google_Service_YouTube_Video $postBody, $optParams = array())
-  {
-    $params = array('part' => $part, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('insert', array($params), "Google_Service_YouTube_Video");
-  }
-  /**
-   * Returns a list of videos that match the API request parameters.
-   * (videos.listVideos)
-   *
-   * @param string $part The part parameter specifies a comma-separated list of
-   * one or more video resource properties that the API response will include.
-   *
-   * If the parameter identifies a property that contains child properties, the
-   * child properties will be included in the response. For example, in a video
-   * resource, the snippet property contains the channelId, title, description,
-   * tags, and categoryId properties. As such, if you set part=snippet, the API
-   * response will contain all of those properties.
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param string chart The chart parameter identifies the chart that you
-   * want to retrieve.
-   * @opt_param string hl The hl parameter instructs the API to retrieve localized
-   * resource metadata for a specific application language that the YouTube
-   * website supports. The parameter value must be a language code included in the
-   * list returned by the i18nLanguages.list method.
-   *
-   * If localized resource details are available in that language, the resource's
-   * snippet.localized object will contain the localized values. However, if
-   * localized details are not available, the snippet.localized object will
-   * contain resource details in the resource's default language.
-   * @opt_param string id The id parameter specifies a comma-separated list of the
-   * YouTube video ID(s) for the resource(s) that are being retrieved. In a video
-   * resource, the id property specifies the video's ID.
-   * @opt_param string locale DEPRECATED
-   * @opt_param string maxHeight The maxHeight parameter specifies a maximum
-   * height of the embedded player. If maxWidth is provided, maxHeight may not be
-   * reached in order to not violate the width request.
-   * @opt_param string maxResults The maxResults parameter specifies the maximum
-   * number of items that should be returned in the result set.
-   *
-   * Note: This parameter is supported for use in conjunction with the myRating
-   * and chart parameters, but it is not supported for use in conjunction with the
-   * id parameter.
-   * @opt_param string maxWidth The maxWidth parameter specifies a maximum width
-   * of the embedded player. If maxHeight is provided, maxWidth may not be reached
-   * in order to not violate the height request.
-   * @opt_param string myRating Set this parameter's value to like or dislike to
-   * instruct the API to only return videos liked or disliked by the authenticated
-   * user.
-   * @opt_param string onBehalfOfContentOwner Note: This parameter is intended
-   * exclusively for YouTube content partners.
-   *
-   * The onBehalfOfContentOwner parameter indicates that the request's
-   * authorization credentials identify a YouTube CMS user who is acting on behalf
-   * of the content owner specified in the parameter value. This parameter is
-   * intended for YouTube content partners that own and manage many different
-   * YouTube channels. It allows content owners to authenticate once and get
-   * access to all their video and channel data, without having to provide
-   * authentication credentials for each individual channel. The CMS account that
-   * the user authenticates with must be linked to the specified YouTube content
-   * owner.
-   * @opt_param string pageToken The pageToken parameter identifies a specific
-   * page in the result set that should be returned. In an API response, the
-   * nextPageToken and prevPageToken properties identify other pages that could be
-   * retrieved.
-   *
-   * Note: This parameter is supported for use in conjunction with the myRating
-   * and chart parameters, but it is not supported for use in conjunction with the
-   * id parameter.
-   * @opt_param string regionCode The regionCode parameter instructs the API to
-   * select a video chart available in the specified region. This parameter can
-   * only be used in conjunction with the chart parameter. The parameter value is
-   * an ISO 3166-1 alpha-2 country code.
-   * @opt_param string videoCategoryId The videoCategoryId parameter identifies
-   * the video category for which the chart should be retrieved. This parameter
-   * can only be used in conjunction with the chart parameter. By default, charts
-   * are not restricted to a particular category.
-   * @return Google_Service_YouTube_VideoListResponse
-   */
-  public function listVideos($part, $optParams = array())
-  {
-    $params = array('part' => $part);
-    $params = array_merge($params, $optParams);
-    return $this->call('list', array($params), "Google_Service_YouTube_VideoListResponse");
-  }
-  /**
-   * Add a like or dislike rating to a video or remove a rating from a video.
-   * (videos.rate)
-   *
-   * @param string $id The id parameter specifies the YouTube video ID of the
-   * video that is being rated or having its rating removed.
-   * @param string $rating Specifies the rating to record.
-   * @param array $optParams Optional parameters.
-   */
-  public function rate($id, $rating, $optParams = array())
-  {
-    $params = array('id' => $id, 'rating' => $rating);
-    $params = array_merge($params, $optParams);
-    return $this->call('rate', array($params));
-  }
-  /**
-   * Report abuse for a video. (videos.reportAbuse)
-   *
-   * @param Google_Service_YouTube_VideoAbuseReport $postBody
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param string onBehalfOfContentOwner Note: This parameter is intended
-   * exclusively for YouTube content partners.
-   *
-   * The onBehalfOfContentOwner parameter indicates that the request's
-   * authorization credentials identify a YouTube CMS user who is acting on behalf
-   * of the content owner specified in the parameter value. This parameter is
-   * intended for YouTube content partners that own and manage many different
-   * YouTube channels. It allows content owners to authenticate once and get
-   * access to all their video and channel data, without having to provide
-   * authentication credentials for each individual channel. The CMS account that
-   * the user authenticates with must be linked to the specified YouTube content
-   * owner.
-   */
-  public function reportAbuse(Google_Service_YouTube_VideoAbuseReport $postBody, $optParams = array())
-  {
-    $params = array('postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('reportAbuse', array($params));
-  }
-  /**
-   * Updates a video's metadata. (videos.update)
-   *
-   * @param string $part The part parameter serves two purposes in this operation.
-   * It identifies the properties that the write operation will set as well as the
-   * properties that the API response will include.
-   *
-   * Note that this method will override the existing values for all of the
-   * mutable properties that are contained in any parts that the parameter value
-   * specifies. For example, a video's privacy setting is contained in the status
-   * part. As such, if your request is updating a private video, and the request's
-   * part parameter value includes the status part, the video's privacy setting
-   * will be updated to whatever value the request body specifies. If the request
-   * body does not specify a value, the existing privacy setting will be removed
-   * and the video will revert to the default privacy setting.
-   *
-   * In addition, not all parts contain properties that can be set when inserting
-   * or updating a video. For example, the statistics object encapsulates
-   * statistics that YouTube calculates for a video and does not contain values
-   * that you can set or modify. If the parameter value specifies a part that does
-   * not contain mutable values, that part will still be included in the API
-   * response.
-   * @param Google_Service_YouTube_Video $postBody
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param string onBehalfOfContentOwner Note: This parameter is intended
-   * exclusively for YouTube content partners.
-   *
-   * The onBehalfOfContentOwner parameter indicates that the request's
-   * authorization credentials identify a YouTube CMS user who is acting on behalf
-   * of the content owner specified in the parameter value. This parameter is
-   * intended for YouTube content partners that own and manage many different
-   * YouTube channels. It allows content owners to authenticate once and get
-   * access to all their video and channel data, without having to provide
-   * authentication credentials for each individual channel. The actual CMS
-   * account that the user authenticates with must be linked to the specified
-   * YouTube content owner.
-   * @return Google_Service_YouTube_Video
-   */
-  public function update($part, Google_Service_YouTube_Video $postBody, $optParams = array())
-  {
-    $params = array('part' => $part, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('update', array($params), "Google_Service_YouTube_Video");
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTube/Resource/Watermarks.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTube/Resource/Watermarks.php
deleted file mode 100644
index 2f7735ed..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTube/Resource/Watermarks.php
+++ /dev/null
@@ -1,82 +0,0 @@
-
- *   $youtubeService = new Google_Service_YouTube(...);
- *   $watermarks = $youtubeService->watermarks;
- *  
- */
-class Google_Service_YouTube_Resource_Watermarks extends Google_Service_Resource
-{
-  /**
-   * Uploads a watermark image to YouTube and sets it for a channel.
-   * (watermarks.set)
-   *
-   * @param string $channelId The channelId parameter specifies the YouTube
-   * channel ID for which the watermark is being provided.
-   * @param Google_Service_YouTube_InvideoBranding $postBody
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param string onBehalfOfContentOwner Note: This parameter is intended
-   * exclusively for YouTube content partners.
-   *
-   * The onBehalfOfContentOwner parameter indicates that the request's
-   * authorization credentials identify a YouTube CMS user who is acting on behalf
-   * of the content owner specified in the parameter value. This parameter is
-   * intended for YouTube content partners that own and manage many different
-   * YouTube channels. It allows content owners to authenticate once and get
-   * access to all their video and channel data, without having to provide
-   * authentication credentials for each individual channel. The CMS account that
-   * the user authenticates with must be linked to the specified YouTube content
-   * owner.
-   */
-  public function set($channelId, Google_Service_YouTube_InvideoBranding $postBody, $optParams = array())
-  {
-    $params = array('channelId' => $channelId, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('set', array($params));
-  }
-  /**
-   * Deletes a channel's watermark image. (watermarks.unsetWatermarks)
-   *
-   * @param string $channelId The channelId parameter specifies the YouTube
-   * channel ID for which the watermark is being unset.
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param string onBehalfOfContentOwner Note: This parameter is intended
-   * exclusively for YouTube content partners.
-   *
-   * The onBehalfOfContentOwner parameter indicates that the request's
-   * authorization credentials identify a YouTube CMS user who is acting on behalf
-   * of the content owner specified in the parameter value. This parameter is
-   * intended for YouTube content partners that own and manage many different
-   * YouTube channels. It allows content owners to authenticate once and get
-   * access to all their video and channel data, without having to provide
-   * authentication credentials for each individual channel. The CMS account that
-   * the user authenticates with must be linked to the specified YouTube content
-   * owner.
-   */
-  public function unsetWatermarks($channelId, $optParams = array())
-  {
-    $params = array('channelId' => $channelId);
-    $params = array_merge($params, $optParams);
-    return $this->call('unset', array($params));
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTube/ResourceId.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTube/ResourceId.php
deleted file mode 100644
index 0e924c88..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTube/ResourceId.php
+++ /dev/null
@@ -1,57 +0,0 @@
-channelId = $channelId;
-  }
-  public function getChannelId()
-  {
-    return $this->channelId;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setPlaylistId($playlistId)
-  {
-    $this->playlistId = $playlistId;
-  }
-  public function getPlaylistId()
-  {
-    return $this->playlistId;
-  }
-  public function setVideoId($videoId)
-  {
-    $this->videoId = $videoId;
-  }
-  public function getVideoId()
-  {
-    return $this->videoId;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTube/SearchListResponse.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTube/SearchListResponse.php
deleted file mode 100644
index 61a69ed2..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTube/SearchListResponse.php
+++ /dev/null
@@ -1,115 +0,0 @@
-etag = $etag;
-  }
-  public function getEtag()
-  {
-    return $this->etag;
-  }
-  public function setEventId($eventId)
-  {
-    $this->eventId = $eventId;
-  }
-  public function getEventId()
-  {
-    return $this->eventId;
-  }
-  public function setItems($items)
-  {
-    $this->items = $items;
-  }
-  public function getItems()
-  {
-    return $this->items;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setNextPageToken($nextPageToken)
-  {
-    $this->nextPageToken = $nextPageToken;
-  }
-  public function getNextPageToken()
-  {
-    return $this->nextPageToken;
-  }
-  public function setPageInfo(Google_Service_YouTube_PageInfo $pageInfo)
-  {
-    $this->pageInfo = $pageInfo;
-  }
-  public function getPageInfo()
-  {
-    return $this->pageInfo;
-  }
-  public function setPrevPageToken($prevPageToken)
-  {
-    $this->prevPageToken = $prevPageToken;
-  }
-  public function getPrevPageToken()
-  {
-    return $this->prevPageToken;
-  }
-  public function setRegionCode($regionCode)
-  {
-    $this->regionCode = $regionCode;
-  }
-  public function getRegionCode()
-  {
-    return $this->regionCode;
-  }
-  public function setTokenPagination(Google_Service_YouTube_TokenPagination $tokenPagination)
-  {
-    $this->tokenPagination = $tokenPagination;
-  }
-  public function getTokenPagination()
-  {
-    return $this->tokenPagination;
-  }
-  public function setVisitorId($visitorId)
-  {
-    $this->visitorId = $visitorId;
-  }
-  public function getVisitorId()
-  {
-    return $this->visitorId;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTube/SearchResult.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTube/SearchResult.php
deleted file mode 100644
index 35e8a2b3..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTube/SearchResult.php
+++ /dev/null
@@ -1,59 +0,0 @@
-etag = $etag;
-  }
-  public function getEtag()
-  {
-    return $this->etag;
-  }
-  public function setId(Google_Service_YouTube_ResourceId $id)
-  {
-    $this->id = $id;
-  }
-  public function getId()
-  {
-    return $this->id;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setSnippet(Google_Service_YouTube_SearchResultSnippet $snippet)
-  {
-    $this->snippet = $snippet;
-  }
-  public function getSnippet()
-  {
-    return $this->snippet;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTube/SearchResultSnippet.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTube/SearchResultSnippet.php
deleted file mode 100644
index f40562e4..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTube/SearchResultSnippet.php
+++ /dev/null
@@ -1,85 +0,0 @@
-channelId = $channelId;
-  }
-  public function getChannelId()
-  {
-    return $this->channelId;
-  }
-  public function setChannelTitle($channelTitle)
-  {
-    $this->channelTitle = $channelTitle;
-  }
-  public function getChannelTitle()
-  {
-    return $this->channelTitle;
-  }
-  public function setDescription($description)
-  {
-    $this->description = $description;
-  }
-  public function getDescription()
-  {
-    return $this->description;
-  }
-  public function setLiveBroadcastContent($liveBroadcastContent)
-  {
-    $this->liveBroadcastContent = $liveBroadcastContent;
-  }
-  public function getLiveBroadcastContent()
-  {
-    return $this->liveBroadcastContent;
-  }
-  public function setPublishedAt($publishedAt)
-  {
-    $this->publishedAt = $publishedAt;
-  }
-  public function getPublishedAt()
-  {
-    return $this->publishedAt;
-  }
-  public function setThumbnails(Google_Service_YouTube_ThumbnailDetails $thumbnails)
-  {
-    $this->thumbnails = $thumbnails;
-  }
-  public function getThumbnails()
-  {
-    return $this->thumbnails;
-  }
-  public function setTitle($title)
-  {
-    $this->title = $title;
-  }
-  public function getTitle()
-  {
-    return $this->title;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTube/Sponsor.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTube/Sponsor.php
deleted file mode 100644
index 7c91fd2d..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTube/Sponsor.php
+++ /dev/null
@@ -1,58 +0,0 @@
-etag = $etag;
-  }
-  public function getEtag()
-  {
-    return $this->etag;
-  }
-  public function setId($id)
-  {
-    $this->id = $id;
-  }
-  public function getId()
-  {
-    return $this->id;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setSnippet(Google_Service_YouTube_SponsorSnippet $snippet)
-  {
-    $this->snippet = $snippet;
-  }
-  public function getSnippet()
-  {
-    return $this->snippet;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTube/SponsorListResponse.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTube/SponsorListResponse.php
deleted file mode 100644
index f85333f6..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTube/SponsorListResponse.php
+++ /dev/null
@@ -1,97 +0,0 @@
-etag = $etag;
-  }
-  public function getEtag()
-  {
-    return $this->etag;
-  }
-  public function setEventId($eventId)
-  {
-    $this->eventId = $eventId;
-  }
-  public function getEventId()
-  {
-    return $this->eventId;
-  }
-  public function setItems($items)
-  {
-    $this->items = $items;
-  }
-  public function getItems()
-  {
-    return $this->items;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setNextPageToken($nextPageToken)
-  {
-    $this->nextPageToken = $nextPageToken;
-  }
-  public function getNextPageToken()
-  {
-    return $this->nextPageToken;
-  }
-  public function setPageInfo(Google_Service_YouTube_PageInfo $pageInfo)
-  {
-    $this->pageInfo = $pageInfo;
-  }
-  public function getPageInfo()
-  {
-    return $this->pageInfo;
-  }
-  public function setTokenPagination(Google_Service_YouTube_TokenPagination $tokenPagination)
-  {
-    $this->tokenPagination = $tokenPagination;
-  }
-  public function getTokenPagination()
-  {
-    return $this->tokenPagination;
-  }
-  public function setVisitorId($visitorId)
-  {
-    $this->visitorId = $visitorId;
-  }
-  public function getVisitorId()
-  {
-    return $this->visitorId;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTube/SponsorSnippet.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTube/SponsorSnippet.php
deleted file mode 100644
index 3cbdfd56..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTube/SponsorSnippet.php
+++ /dev/null
@@ -1,49 +0,0 @@
-channelId = $channelId;
-  }
-  public function getChannelId()
-  {
-    return $this->channelId;
-  }
-  public function setSponsorDetails(Google_Service_YouTube_ChannelProfileDetails $sponsorDetails)
-  {
-    $this->sponsorDetails = $sponsorDetails;
-  }
-  public function getSponsorDetails()
-  {
-    return $this->sponsorDetails;
-  }
-  public function setSponsorSince($sponsorSince)
-  {
-    $this->sponsorSince = $sponsorSince;
-  }
-  public function getSponsorSince()
-  {
-    return $this->sponsorSince;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTube/Subscription.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTube/Subscription.php
deleted file mode 100644
index 6a299f57..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTube/Subscription.php
+++ /dev/null
@@ -1,78 +0,0 @@
-contentDetails = $contentDetails;
-  }
-  public function getContentDetails()
-  {
-    return $this->contentDetails;
-  }
-  public function setEtag($etag)
-  {
-    $this->etag = $etag;
-  }
-  public function getEtag()
-  {
-    return $this->etag;
-  }
-  public function setId($id)
-  {
-    $this->id = $id;
-  }
-  public function getId()
-  {
-    return $this->id;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setSnippet(Google_Service_YouTube_SubscriptionSnippet $snippet)
-  {
-    $this->snippet = $snippet;
-  }
-  public function getSnippet()
-  {
-    return $this->snippet;
-  }
-  public function setSubscriberSnippet(Google_Service_YouTube_SubscriptionSubscriberSnippet $subscriberSnippet)
-  {
-    $this->subscriberSnippet = $subscriberSnippet;
-  }
-  public function getSubscriberSnippet()
-  {
-    return $this->subscriberSnippet;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTube/SubscriptionContentDetails.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTube/SubscriptionContentDetails.php
deleted file mode 100644
index 09d5d830..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTube/SubscriptionContentDetails.php
+++ /dev/null
@@ -1,48 +0,0 @@
-activityType = $activityType;
-  }
-  public function getActivityType()
-  {
-    return $this->activityType;
-  }
-  public function setNewItemCount($newItemCount)
-  {
-    $this->newItemCount = $newItemCount;
-  }
-  public function getNewItemCount()
-  {
-    return $this->newItemCount;
-  }
-  public function setTotalItemCount($totalItemCount)
-  {
-    $this->totalItemCount = $totalItemCount;
-  }
-  public function getTotalItemCount()
-  {
-    return $this->totalItemCount;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTube/SubscriptionListResponse.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTube/SubscriptionListResponse.php
deleted file mode 100644
index 83af0cae..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTube/SubscriptionListResponse.php
+++ /dev/null
@@ -1,106 +0,0 @@
-etag = $etag;
-  }
-  public function getEtag()
-  {
-    return $this->etag;
-  }
-  public function setEventId($eventId)
-  {
-    $this->eventId = $eventId;
-  }
-  public function getEventId()
-  {
-    return $this->eventId;
-  }
-  public function setItems($items)
-  {
-    $this->items = $items;
-  }
-  public function getItems()
-  {
-    return $this->items;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setNextPageToken($nextPageToken)
-  {
-    $this->nextPageToken = $nextPageToken;
-  }
-  public function getNextPageToken()
-  {
-    return $this->nextPageToken;
-  }
-  public function setPageInfo(Google_Service_YouTube_PageInfo $pageInfo)
-  {
-    $this->pageInfo = $pageInfo;
-  }
-  public function getPageInfo()
-  {
-    return $this->pageInfo;
-  }
-  public function setPrevPageToken($prevPageToken)
-  {
-    $this->prevPageToken = $prevPageToken;
-  }
-  public function getPrevPageToken()
-  {
-    return $this->prevPageToken;
-  }
-  public function setTokenPagination(Google_Service_YouTube_TokenPagination $tokenPagination)
-  {
-    $this->tokenPagination = $tokenPagination;
-  }
-  public function getTokenPagination()
-  {
-    return $this->tokenPagination;
-  }
-  public function setVisitorId($visitorId)
-  {
-    $this->visitorId = $visitorId;
-  }
-  public function getVisitorId()
-  {
-    return $this->visitorId;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTube/SubscriptionSnippet.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTube/SubscriptionSnippet.php
deleted file mode 100644
index 87981a18..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTube/SubscriptionSnippet.php
+++ /dev/null
@@ -1,86 +0,0 @@
-channelId = $channelId;
-  }
-  public function getChannelId()
-  {
-    return $this->channelId;
-  }
-  public function setChannelTitle($channelTitle)
-  {
-    $this->channelTitle = $channelTitle;
-  }
-  public function getChannelTitle()
-  {
-    return $this->channelTitle;
-  }
-  public function setDescription($description)
-  {
-    $this->description = $description;
-  }
-  public function getDescription()
-  {
-    return $this->description;
-  }
-  public function setPublishedAt($publishedAt)
-  {
-    $this->publishedAt = $publishedAt;
-  }
-  public function getPublishedAt()
-  {
-    return $this->publishedAt;
-  }
-  public function setResourceId(Google_Service_YouTube_ResourceId $resourceId)
-  {
-    $this->resourceId = $resourceId;
-  }
-  public function getResourceId()
-  {
-    return $this->resourceId;
-  }
-  public function setThumbnails(Google_Service_YouTube_ThumbnailDetails $thumbnails)
-  {
-    $this->thumbnails = $thumbnails;
-  }
-  public function getThumbnails()
-  {
-    return $this->thumbnails;
-  }
-  public function setTitle($title)
-  {
-    $this->title = $title;
-  }
-  public function getTitle()
-  {
-    return $this->title;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTube/SubscriptionSubscriberSnippet.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTube/SubscriptionSubscriberSnippet.php
deleted file mode 100644
index 131f6901..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTube/SubscriptionSubscriberSnippet.php
+++ /dev/null
@@ -1,58 +0,0 @@
-channelId = $channelId;
-  }
-  public function getChannelId()
-  {
-    return $this->channelId;
-  }
-  public function setDescription($description)
-  {
-    $this->description = $description;
-  }
-  public function getDescription()
-  {
-    return $this->description;
-  }
-  public function setThumbnails(Google_Service_YouTube_ThumbnailDetails $thumbnails)
-  {
-    $this->thumbnails = $thumbnails;
-  }
-  public function getThumbnails()
-  {
-    return $this->thumbnails;
-  }
-  public function setTitle($title)
-  {
-    $this->title = $title;
-  }
-  public function getTitle()
-  {
-    return $this->title;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTube/SuperChatEvent.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTube/SuperChatEvent.php
deleted file mode 100644
index efba5c14..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTube/SuperChatEvent.php
+++ /dev/null
@@ -1,58 +0,0 @@
-etag = $etag;
-  }
-  public function getEtag()
-  {
-    return $this->etag;
-  }
-  public function setId($id)
-  {
-    $this->id = $id;
-  }
-  public function getId()
-  {
-    return $this->id;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setSnippet(Google_Service_YouTube_SuperChatEventSnippet $snippet)
-  {
-    $this->snippet = $snippet;
-  }
-  public function getSnippet()
-  {
-    return $this->snippet;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTube/SuperChatEventListResponse.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTube/SuperChatEventListResponse.php
deleted file mode 100644
index b5119dab..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTube/SuperChatEventListResponse.php
+++ /dev/null
@@ -1,97 +0,0 @@
-etag = $etag;
-  }
-  public function getEtag()
-  {
-    return $this->etag;
-  }
-  public function setEventId($eventId)
-  {
-    $this->eventId = $eventId;
-  }
-  public function getEventId()
-  {
-    return $this->eventId;
-  }
-  public function setItems($items)
-  {
-    $this->items = $items;
-  }
-  public function getItems()
-  {
-    return $this->items;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setNextPageToken($nextPageToken)
-  {
-    $this->nextPageToken = $nextPageToken;
-  }
-  public function getNextPageToken()
-  {
-    return $this->nextPageToken;
-  }
-  public function setPageInfo(Google_Service_YouTube_PageInfo $pageInfo)
-  {
-    $this->pageInfo = $pageInfo;
-  }
-  public function getPageInfo()
-  {
-    return $this->pageInfo;
-  }
-  public function setTokenPagination(Google_Service_YouTube_TokenPagination $tokenPagination)
-  {
-    $this->tokenPagination = $tokenPagination;
-  }
-  public function getTokenPagination()
-  {
-    return $this->tokenPagination;
-  }
-  public function setVisitorId($visitorId)
-  {
-    $this->visitorId = $visitorId;
-  }
-  public function getVisitorId()
-  {
-    return $this->visitorId;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTube/SuperChatEventSnippet.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTube/SuperChatEventSnippet.php
deleted file mode 100644
index 466aec3e..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTube/SuperChatEventSnippet.php
+++ /dev/null
@@ -1,94 +0,0 @@
-amountMicros = $amountMicros;
-  }
-  public function getAmountMicros()
-  {
-    return $this->amountMicros;
-  }
-  public function setChannelId($channelId)
-  {
-    $this->channelId = $channelId;
-  }
-  public function getChannelId()
-  {
-    return $this->channelId;
-  }
-  public function setCommentText($commentText)
-  {
-    $this->commentText = $commentText;
-  }
-  public function getCommentText()
-  {
-    return $this->commentText;
-  }
-  public function setCreatedAt($createdAt)
-  {
-    $this->createdAt = $createdAt;
-  }
-  public function getCreatedAt()
-  {
-    return $this->createdAt;
-  }
-  public function setCurrency($currency)
-  {
-    $this->currency = $currency;
-  }
-  public function getCurrency()
-  {
-    return $this->currency;
-  }
-  public function setDisplayString($displayString)
-  {
-    $this->displayString = $displayString;
-  }
-  public function getDisplayString()
-  {
-    return $this->displayString;
-  }
-  public function setMessageType($messageType)
-  {
-    $this->messageType = $messageType;
-  }
-  public function getMessageType()
-  {
-    return $this->messageType;
-  }
-  public function setSupporterDetails(Google_Service_YouTube_ChannelProfileDetails $supporterDetails)
-  {
-    $this->supporterDetails = $supporterDetails;
-  }
-  public function getSupporterDetails()
-  {
-    return $this->supporterDetails;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTube/Thumbnail.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTube/Thumbnail.php
deleted file mode 100644
index ce02b03e..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTube/Thumbnail.php
+++ /dev/null
@@ -1,48 +0,0 @@
-height = $height;
-  }
-  public function getHeight()
-  {
-    return $this->height;
-  }
-  public function setUrl($url)
-  {
-    $this->url = $url;
-  }
-  public function getUrl()
-  {
-    return $this->url;
-  }
-  public function setWidth($width)
-  {
-    $this->width = $width;
-  }
-  public function getWidth()
-  {
-    return $this->width;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTube/ThumbnailDetails.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTube/ThumbnailDetails.php
deleted file mode 100644
index 2c391af5..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTube/ThumbnailDetails.php
+++ /dev/null
@@ -1,71 +0,0 @@
-default = $default;
-  }
-  public function getDefault()
-  {
-    return $this->default;
-  }
-  public function setHigh(Google_Service_YouTube_Thumbnail $high)
-  {
-    $this->high = $high;
-  }
-  public function getHigh()
-  {
-    return $this->high;
-  }
-  public function setMaxres(Google_Service_YouTube_Thumbnail $maxres)
-  {
-    $this->maxres = $maxres;
-  }
-  public function getMaxres()
-  {
-    return $this->maxres;
-  }
-  public function setMedium(Google_Service_YouTube_Thumbnail $medium)
-  {
-    $this->medium = $medium;
-  }
-  public function getMedium()
-  {
-    return $this->medium;
-  }
-  public function setStandard(Google_Service_YouTube_Thumbnail $standard)
-  {
-    $this->standard = $standard;
-  }
-  public function getStandard()
-  {
-    return $this->standard;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTube/ThumbnailSetResponse.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTube/ThumbnailSetResponse.php
deleted file mode 100644
index 0c7893a5..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTube/ThumbnailSetResponse.php
+++ /dev/null
@@ -1,68 +0,0 @@
-etag = $etag;
-  }
-  public function getEtag()
-  {
-    return $this->etag;
-  }
-  public function setEventId($eventId)
-  {
-    $this->eventId = $eventId;
-  }
-  public function getEventId()
-  {
-    return $this->eventId;
-  }
-  public function setItems($items)
-  {
-    $this->items = $items;
-  }
-  public function getItems()
-  {
-    return $this->items;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setVisitorId($visitorId)
-  {
-    $this->visitorId = $visitorId;
-  }
-  public function getVisitorId()
-  {
-    return $this->visitorId;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTube/TokenPagination.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTube/TokenPagination.php
deleted file mode 100644
index ead77041..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTube/TokenPagination.php
+++ /dev/null
@@ -1,20 +0,0 @@
-ageGating = $ageGating;
-  }
-  public function getAgeGating()
-  {
-    return $this->ageGating;
-  }
-  public function setContentDetails(Google_Service_YouTube_VideoContentDetails $contentDetails)
-  {
-    $this->contentDetails = $contentDetails;
-  }
-  public function getContentDetails()
-  {
-    return $this->contentDetails;
-  }
-  public function setEtag($etag)
-  {
-    $this->etag = $etag;
-  }
-  public function getEtag()
-  {
-    return $this->etag;
-  }
-  public function setFileDetails(Google_Service_YouTube_VideoFileDetails $fileDetails)
-  {
-    $this->fileDetails = $fileDetails;
-  }
-  public function getFileDetails()
-  {
-    return $this->fileDetails;
-  }
-  public function setId($id)
-  {
-    $this->id = $id;
-  }
-  public function getId()
-  {
-    return $this->id;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setLiveStreamingDetails(Google_Service_YouTube_VideoLiveStreamingDetails $liveStreamingDetails)
-  {
-    $this->liveStreamingDetails = $liveStreamingDetails;
-  }
-  public function getLiveStreamingDetails()
-  {
-    return $this->liveStreamingDetails;
-  }
-  public function setLocalizations($localizations)
-  {
-    $this->localizations = $localizations;
-  }
-  public function getLocalizations()
-  {
-    return $this->localizations;
-  }
-  public function setMonetizationDetails(Google_Service_YouTube_VideoMonetizationDetails $monetizationDetails)
-  {
-    $this->monetizationDetails = $monetizationDetails;
-  }
-  public function getMonetizationDetails()
-  {
-    return $this->monetizationDetails;
-  }
-  public function setPlayer(Google_Service_YouTube_VideoPlayer $player)
-  {
-    $this->player = $player;
-  }
-  public function getPlayer()
-  {
-    return $this->player;
-  }
-  public function setProcessingDetails(Google_Service_YouTube_VideoProcessingDetails $processingDetails)
-  {
-    $this->processingDetails = $processingDetails;
-  }
-  public function getProcessingDetails()
-  {
-    return $this->processingDetails;
-  }
-  public function setProjectDetails(Google_Service_YouTube_VideoProjectDetails $projectDetails)
-  {
-    $this->projectDetails = $projectDetails;
-  }
-  public function getProjectDetails()
-  {
-    return $this->projectDetails;
-  }
-  public function setRecordingDetails(Google_Service_YouTube_VideoRecordingDetails $recordingDetails)
-  {
-    $this->recordingDetails = $recordingDetails;
-  }
-  public function getRecordingDetails()
-  {
-    return $this->recordingDetails;
-  }
-  public function setSnippet(Google_Service_YouTube_VideoSnippet $snippet)
-  {
-    $this->snippet = $snippet;
-  }
-  public function getSnippet()
-  {
-    return $this->snippet;
-  }
-  public function setStatistics(Google_Service_YouTube_VideoStatistics $statistics)
-  {
-    $this->statistics = $statistics;
-  }
-  public function getStatistics()
-  {
-    return $this->statistics;
-  }
-  public function setStatus(Google_Service_YouTube_VideoStatus $status)
-  {
-    $this->status = $status;
-  }
-  public function getStatus()
-  {
-    return $this->status;
-  }
-  public function setSuggestions(Google_Service_YouTube_VideoSuggestions $suggestions)
-  {
-    $this->suggestions = $suggestions;
-  }
-  public function getSuggestions()
-  {
-    return $this->suggestions;
-  }
-  public function setTopicDetails(Google_Service_YouTube_VideoTopicDetails $topicDetails)
-  {
-    $this->topicDetails = $topicDetails;
-  }
-  public function getTopicDetails()
-  {
-    return $this->topicDetails;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTube/VideoAbuseReport.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTube/VideoAbuseReport.php
deleted file mode 100644
index d8c36670..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTube/VideoAbuseReport.php
+++ /dev/null
@@ -1,66 +0,0 @@
-comments = $comments;
-  }
-  public function getComments()
-  {
-    return $this->comments;
-  }
-  public function setLanguage($language)
-  {
-    $this->language = $language;
-  }
-  public function getLanguage()
-  {
-    return $this->language;
-  }
-  public function setReasonId($reasonId)
-  {
-    $this->reasonId = $reasonId;
-  }
-  public function getReasonId()
-  {
-    return $this->reasonId;
-  }
-  public function setSecondaryReasonId($secondaryReasonId)
-  {
-    $this->secondaryReasonId = $secondaryReasonId;
-  }
-  public function getSecondaryReasonId()
-  {
-    return $this->secondaryReasonId;
-  }
-  public function setVideoId($videoId)
-  {
-    $this->videoId = $videoId;
-  }
-  public function getVideoId()
-  {
-    return $this->videoId;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTube/VideoAbuseReportReason.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTube/VideoAbuseReportReason.php
deleted file mode 100644
index 50007d7c..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTube/VideoAbuseReportReason.php
+++ /dev/null
@@ -1,58 +0,0 @@
-etag = $etag;
-  }
-  public function getEtag()
-  {
-    return $this->etag;
-  }
-  public function setId($id)
-  {
-    $this->id = $id;
-  }
-  public function getId()
-  {
-    return $this->id;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setSnippet(Google_Service_YouTube_VideoAbuseReportReasonSnippet $snippet)
-  {
-    $this->snippet = $snippet;
-  }
-  public function getSnippet()
-  {
-    return $this->snippet;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTube/VideoAbuseReportReasonListResponse.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTube/VideoAbuseReportReasonListResponse.php
deleted file mode 100644
index cb3b8acd..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTube/VideoAbuseReportReasonListResponse.php
+++ /dev/null
@@ -1,68 +0,0 @@
-etag = $etag;
-  }
-  public function getEtag()
-  {
-    return $this->etag;
-  }
-  public function setEventId($eventId)
-  {
-    $this->eventId = $eventId;
-  }
-  public function getEventId()
-  {
-    return $this->eventId;
-  }
-  public function setItems($items)
-  {
-    $this->items = $items;
-  }
-  public function getItems()
-  {
-    return $this->items;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setVisitorId($visitorId)
-  {
-    $this->visitorId = $visitorId;
-  }
-  public function getVisitorId()
-  {
-    return $this->visitorId;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTube/VideoAbuseReportReasonSnippet.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTube/VideoAbuseReportReasonSnippet.php
deleted file mode 100644
index ae0e2c0c..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTube/VideoAbuseReportReasonSnippet.php
+++ /dev/null
@@ -1,41 +0,0 @@
-label = $label;
-  }
-  public function getLabel()
-  {
-    return $this->label;
-  }
-  public function setSecondaryReasons($secondaryReasons)
-  {
-    $this->secondaryReasons = $secondaryReasons;
-  }
-  public function getSecondaryReasons()
-  {
-    return $this->secondaryReasons;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTube/VideoAbuseReportSecondaryReason.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTube/VideoAbuseReportSecondaryReason.php
deleted file mode 100644
index 03cff4ef..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTube/VideoAbuseReportSecondaryReason.php
+++ /dev/null
@@ -1,39 +0,0 @@
-id = $id;
-  }
-  public function getId()
-  {
-    return $this->id;
-  }
-  public function setLabel($label)
-  {
-    $this->label = $label;
-  }
-  public function getLabel()
-  {
-    return $this->label;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTube/VideoAgeGating.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTube/VideoAgeGating.php
deleted file mode 100644
index 51994787..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTube/VideoAgeGating.php
+++ /dev/null
@@ -1,48 +0,0 @@
-alcoholContent = $alcoholContent;
-  }
-  public function getAlcoholContent()
-  {
-    return $this->alcoholContent;
-  }
-  public function setRestricted($restricted)
-  {
-    $this->restricted = $restricted;
-  }
-  public function getRestricted()
-  {
-    return $this->restricted;
-  }
-  public function setVideoGameRating($videoGameRating)
-  {
-    $this->videoGameRating = $videoGameRating;
-  }
-  public function getVideoGameRating()
-  {
-    return $this->videoGameRating;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTube/VideoCategory.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTube/VideoCategory.php
deleted file mode 100644
index e909d75e..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTube/VideoCategory.php
+++ /dev/null
@@ -1,58 +0,0 @@
-etag = $etag;
-  }
-  public function getEtag()
-  {
-    return $this->etag;
-  }
-  public function setId($id)
-  {
-    $this->id = $id;
-  }
-  public function getId()
-  {
-    return $this->id;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setSnippet(Google_Service_YouTube_VideoCategorySnippet $snippet)
-  {
-    $this->snippet = $snippet;
-  }
-  public function getSnippet()
-  {
-    return $this->snippet;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTube/VideoCategoryListResponse.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTube/VideoCategoryListResponse.php
deleted file mode 100644
index 6759c9a9..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTube/VideoCategoryListResponse.php
+++ /dev/null
@@ -1,106 +0,0 @@
-etag = $etag;
-  }
-  public function getEtag()
-  {
-    return $this->etag;
-  }
-  public function setEventId($eventId)
-  {
-    $this->eventId = $eventId;
-  }
-  public function getEventId()
-  {
-    return $this->eventId;
-  }
-  public function setItems($items)
-  {
-    $this->items = $items;
-  }
-  public function getItems()
-  {
-    return $this->items;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setNextPageToken($nextPageToken)
-  {
-    $this->nextPageToken = $nextPageToken;
-  }
-  public function getNextPageToken()
-  {
-    return $this->nextPageToken;
-  }
-  public function setPageInfo(Google_Service_YouTube_PageInfo $pageInfo)
-  {
-    $this->pageInfo = $pageInfo;
-  }
-  public function getPageInfo()
-  {
-    return $this->pageInfo;
-  }
-  public function setPrevPageToken($prevPageToken)
-  {
-    $this->prevPageToken = $prevPageToken;
-  }
-  public function getPrevPageToken()
-  {
-    return $this->prevPageToken;
-  }
-  public function setTokenPagination(Google_Service_YouTube_TokenPagination $tokenPagination)
-  {
-    $this->tokenPagination = $tokenPagination;
-  }
-  public function getTokenPagination()
-  {
-    return $this->tokenPagination;
-  }
-  public function setVisitorId($visitorId)
-  {
-    $this->visitorId = $visitorId;
-  }
-  public function getVisitorId()
-  {
-    return $this->visitorId;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTube/VideoCategorySnippet.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTube/VideoCategorySnippet.php
deleted file mode 100644
index 09452e13..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTube/VideoCategorySnippet.php
+++ /dev/null
@@ -1,48 +0,0 @@
-assignable = $assignable;
-  }
-  public function getAssignable()
-  {
-    return $this->assignable;
-  }
-  public function setChannelId($channelId)
-  {
-    $this->channelId = $channelId;
-  }
-  public function getChannelId()
-  {
-    return $this->channelId;
-  }
-  public function setTitle($title)
-  {
-    $this->title = $title;
-  }
-  public function getTitle()
-  {
-    return $this->title;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTube/VideoContentDetails.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTube/VideoContentDetails.php
deleted file mode 100644
index 52c0a1a3..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTube/VideoContentDetails.php
+++ /dev/null
@@ -1,114 +0,0 @@
-caption = $caption;
-  }
-  public function getCaption()
-  {
-    return $this->caption;
-  }
-  public function setContentRating(Google_Service_YouTube_ContentRating $contentRating)
-  {
-    $this->contentRating = $contentRating;
-  }
-  public function getContentRating()
-  {
-    return $this->contentRating;
-  }
-  public function setCountryRestriction(Google_Service_YouTube_AccessPolicy $countryRestriction)
-  {
-    $this->countryRestriction = $countryRestriction;
-  }
-  public function getCountryRestriction()
-  {
-    return $this->countryRestriction;
-  }
-  public function setDefinition($definition)
-  {
-    $this->definition = $definition;
-  }
-  public function getDefinition()
-  {
-    return $this->definition;
-  }
-  public function setDimension($dimension)
-  {
-    $this->dimension = $dimension;
-  }
-  public function getDimension()
-  {
-    return $this->dimension;
-  }
-  public function setDuration($duration)
-  {
-    $this->duration = $duration;
-  }
-  public function getDuration()
-  {
-    return $this->duration;
-  }
-  public function setHasCustomThumbnail($hasCustomThumbnail)
-  {
-    $this->hasCustomThumbnail = $hasCustomThumbnail;
-  }
-  public function getHasCustomThumbnail()
-  {
-    return $this->hasCustomThumbnail;
-  }
-  public function setLicensedContent($licensedContent)
-  {
-    $this->licensedContent = $licensedContent;
-  }
-  public function getLicensedContent()
-  {
-    return $this->licensedContent;
-  }
-  public function setProjection($projection)
-  {
-    $this->projection = $projection;
-  }
-  public function getProjection()
-  {
-    return $this->projection;
-  }
-  public function setRegionRestriction(Google_Service_YouTube_VideoContentDetailsRegionRestriction $regionRestriction)
-  {
-    $this->regionRestriction = $regionRestriction;
-  }
-  public function getRegionRestriction()
-  {
-    return $this->regionRestriction;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTube/VideoContentDetailsRegionRestriction.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTube/VideoContentDetailsRegionRestriction.php
deleted file mode 100644
index 8a276d01..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTube/VideoContentDetailsRegionRestriction.php
+++ /dev/null
@@ -1,40 +0,0 @@
-allowed = $allowed;
-  }
-  public function getAllowed()
-  {
-    return $this->allowed;
-  }
-  public function setBlocked($blocked)
-  {
-    $this->blocked = $blocked;
-  }
-  public function getBlocked()
-  {
-    return $this->blocked;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTube/VideoFileDetails.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTube/VideoFileDetails.php
deleted file mode 100644
index eb04edf2..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTube/VideoFileDetails.php
+++ /dev/null
@@ -1,105 +0,0 @@
-audioStreams = $audioStreams;
-  }
-  public function getAudioStreams()
-  {
-    return $this->audioStreams;
-  }
-  public function setBitrateBps($bitrateBps)
-  {
-    $this->bitrateBps = $bitrateBps;
-  }
-  public function getBitrateBps()
-  {
-    return $this->bitrateBps;
-  }
-  public function setContainer($container)
-  {
-    $this->container = $container;
-  }
-  public function getContainer()
-  {
-    return $this->container;
-  }
-  public function setCreationTime($creationTime)
-  {
-    $this->creationTime = $creationTime;
-  }
-  public function getCreationTime()
-  {
-    return $this->creationTime;
-  }
-  public function setDurationMs($durationMs)
-  {
-    $this->durationMs = $durationMs;
-  }
-  public function getDurationMs()
-  {
-    return $this->durationMs;
-  }
-  public function setFileName($fileName)
-  {
-    $this->fileName = $fileName;
-  }
-  public function getFileName()
-  {
-    return $this->fileName;
-  }
-  public function setFileSize($fileSize)
-  {
-    $this->fileSize = $fileSize;
-  }
-  public function getFileSize()
-  {
-    return $this->fileSize;
-  }
-  public function setFileType($fileType)
-  {
-    $this->fileType = $fileType;
-  }
-  public function getFileType()
-  {
-    return $this->fileType;
-  }
-  public function setVideoStreams($videoStreams)
-  {
-    $this->videoStreams = $videoStreams;
-  }
-  public function getVideoStreams()
-  {
-    return $this->videoStreams;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTube/VideoFileDetailsAudioStream.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTube/VideoFileDetailsAudioStream.php
deleted file mode 100644
index 3220b52e..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTube/VideoFileDetailsAudioStream.php
+++ /dev/null
@@ -1,57 +0,0 @@
-bitrateBps = $bitrateBps;
-  }
-  public function getBitrateBps()
-  {
-    return $this->bitrateBps;
-  }
-  public function setChannelCount($channelCount)
-  {
-    $this->channelCount = $channelCount;
-  }
-  public function getChannelCount()
-  {
-    return $this->channelCount;
-  }
-  public function setCodec($codec)
-  {
-    $this->codec = $codec;
-  }
-  public function getCodec()
-  {
-    return $this->codec;
-  }
-  public function setVendor($vendor)
-  {
-    $this->vendor = $vendor;
-  }
-  public function getVendor()
-  {
-    return $this->vendor;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTube/VideoFileDetailsVideoStream.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTube/VideoFileDetailsVideoStream.php
deleted file mode 100644
index 89a88237..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTube/VideoFileDetailsVideoStream.php
+++ /dev/null
@@ -1,93 +0,0 @@
-aspectRatio = $aspectRatio;
-  }
-  public function getAspectRatio()
-  {
-    return $this->aspectRatio;
-  }
-  public function setBitrateBps($bitrateBps)
-  {
-    $this->bitrateBps = $bitrateBps;
-  }
-  public function getBitrateBps()
-  {
-    return $this->bitrateBps;
-  }
-  public function setCodec($codec)
-  {
-    $this->codec = $codec;
-  }
-  public function getCodec()
-  {
-    return $this->codec;
-  }
-  public function setFrameRateFps($frameRateFps)
-  {
-    $this->frameRateFps = $frameRateFps;
-  }
-  public function getFrameRateFps()
-  {
-    return $this->frameRateFps;
-  }
-  public function setHeightPixels($heightPixels)
-  {
-    $this->heightPixels = $heightPixels;
-  }
-  public function getHeightPixels()
-  {
-    return $this->heightPixels;
-  }
-  public function setRotation($rotation)
-  {
-    $this->rotation = $rotation;
-  }
-  public function getRotation()
-  {
-    return $this->rotation;
-  }
-  public function setVendor($vendor)
-  {
-    $this->vendor = $vendor;
-  }
-  public function getVendor()
-  {
-    return $this->vendor;
-  }
-  public function setWidthPixels($widthPixels)
-  {
-    $this->widthPixels = $widthPixels;
-  }
-  public function getWidthPixels()
-  {
-    return $this->widthPixels;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTube/VideoGetRatingResponse.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTube/VideoGetRatingResponse.php
deleted file mode 100644
index d8d9f033..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTube/VideoGetRatingResponse.php
+++ /dev/null
@@ -1,68 +0,0 @@
-etag = $etag;
-  }
-  public function getEtag()
-  {
-    return $this->etag;
-  }
-  public function setEventId($eventId)
-  {
-    $this->eventId = $eventId;
-  }
-  public function getEventId()
-  {
-    return $this->eventId;
-  }
-  public function setItems($items)
-  {
-    $this->items = $items;
-  }
-  public function getItems()
-  {
-    return $this->items;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setVisitorId($visitorId)
-  {
-    $this->visitorId = $visitorId;
-  }
-  public function getVisitorId()
-  {
-    return $this->visitorId;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTube/VideoListResponse.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTube/VideoListResponse.php
deleted file mode 100644
index 2f1f4df0..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTube/VideoListResponse.php
+++ /dev/null
@@ -1,106 +0,0 @@
-etag = $etag;
-  }
-  public function getEtag()
-  {
-    return $this->etag;
-  }
-  public function setEventId($eventId)
-  {
-    $this->eventId = $eventId;
-  }
-  public function getEventId()
-  {
-    return $this->eventId;
-  }
-  public function setItems($items)
-  {
-    $this->items = $items;
-  }
-  public function getItems()
-  {
-    return $this->items;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setNextPageToken($nextPageToken)
-  {
-    $this->nextPageToken = $nextPageToken;
-  }
-  public function getNextPageToken()
-  {
-    return $this->nextPageToken;
-  }
-  public function setPageInfo(Google_Service_YouTube_PageInfo $pageInfo)
-  {
-    $this->pageInfo = $pageInfo;
-  }
-  public function getPageInfo()
-  {
-    return $this->pageInfo;
-  }
-  public function setPrevPageToken($prevPageToken)
-  {
-    $this->prevPageToken = $prevPageToken;
-  }
-  public function getPrevPageToken()
-  {
-    return $this->prevPageToken;
-  }
-  public function setTokenPagination(Google_Service_YouTube_TokenPagination $tokenPagination)
-  {
-    $this->tokenPagination = $tokenPagination;
-  }
-  public function getTokenPagination()
-  {
-    return $this->tokenPagination;
-  }
-  public function setVisitorId($visitorId)
-  {
-    $this->visitorId = $visitorId;
-  }
-  public function getVisitorId()
-  {
-    return $this->visitorId;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTube/VideoLiveStreamingDetails.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTube/VideoLiveStreamingDetails.php
deleted file mode 100644
index 14de20da..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTube/VideoLiveStreamingDetails.php
+++ /dev/null
@@ -1,75 +0,0 @@
-activeLiveChatId = $activeLiveChatId;
-  }
-  public function getActiveLiveChatId()
-  {
-    return $this->activeLiveChatId;
-  }
-  public function setActualEndTime($actualEndTime)
-  {
-    $this->actualEndTime = $actualEndTime;
-  }
-  public function getActualEndTime()
-  {
-    return $this->actualEndTime;
-  }
-  public function setActualStartTime($actualStartTime)
-  {
-    $this->actualStartTime = $actualStartTime;
-  }
-  public function getActualStartTime()
-  {
-    return $this->actualStartTime;
-  }
-  public function setConcurrentViewers($concurrentViewers)
-  {
-    $this->concurrentViewers = $concurrentViewers;
-  }
-  public function getConcurrentViewers()
-  {
-    return $this->concurrentViewers;
-  }
-  public function setScheduledEndTime($scheduledEndTime)
-  {
-    $this->scheduledEndTime = $scheduledEndTime;
-  }
-  public function getScheduledEndTime()
-  {
-    return $this->scheduledEndTime;
-  }
-  public function setScheduledStartTime($scheduledStartTime)
-  {
-    $this->scheduledStartTime = $scheduledStartTime;
-  }
-  public function getScheduledStartTime()
-  {
-    return $this->scheduledStartTime;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTube/VideoLocalization.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTube/VideoLocalization.php
deleted file mode 100644
index 6947da5c..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTube/VideoLocalization.php
+++ /dev/null
@@ -1,39 +0,0 @@
-description = $description;
-  }
-  public function getDescription()
-  {
-    return $this->description;
-  }
-  public function setTitle($title)
-  {
-    $this->title = $title;
-  }
-  public function getTitle()
-  {
-    return $this->title;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTube/VideoMonetizationDetails.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTube/VideoMonetizationDetails.php
deleted file mode 100644
index 8352fcb6..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTube/VideoMonetizationDetails.php
+++ /dev/null
@@ -1,31 +0,0 @@
-access = $access;
-  }
-  public function getAccess()
-  {
-    return $this->access;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTube/VideoPlayer.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTube/VideoPlayer.php
deleted file mode 100644
index 025dbadf..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTube/VideoPlayer.php
+++ /dev/null
@@ -1,48 +0,0 @@
-embedHeight = $embedHeight;
-  }
-  public function getEmbedHeight()
-  {
-    return $this->embedHeight;
-  }
-  public function setEmbedHtml($embedHtml)
-  {
-    $this->embedHtml = $embedHtml;
-  }
-  public function getEmbedHtml()
-  {
-    return $this->embedHtml;
-  }
-  public function setEmbedWidth($embedWidth)
-  {
-    $this->embedWidth = $embedWidth;
-  }
-  public function getEmbedWidth()
-  {
-    return $this->embedWidth;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTube/VideoProcessingDetails.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTube/VideoProcessingDetails.php
deleted file mode 100644
index 1db7f2a5..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTube/VideoProcessingDetails.php
+++ /dev/null
@@ -1,94 +0,0 @@
-editorSuggestionsAvailability = $editorSuggestionsAvailability;
-  }
-  public function getEditorSuggestionsAvailability()
-  {
-    return $this->editorSuggestionsAvailability;
-  }
-  public function setFileDetailsAvailability($fileDetailsAvailability)
-  {
-    $this->fileDetailsAvailability = $fileDetailsAvailability;
-  }
-  public function getFileDetailsAvailability()
-  {
-    return $this->fileDetailsAvailability;
-  }
-  public function setProcessingFailureReason($processingFailureReason)
-  {
-    $this->processingFailureReason = $processingFailureReason;
-  }
-  public function getProcessingFailureReason()
-  {
-    return $this->processingFailureReason;
-  }
-  public function setProcessingIssuesAvailability($processingIssuesAvailability)
-  {
-    $this->processingIssuesAvailability = $processingIssuesAvailability;
-  }
-  public function getProcessingIssuesAvailability()
-  {
-    return $this->processingIssuesAvailability;
-  }
-  public function setProcessingProgress(Google_Service_YouTube_VideoProcessingDetailsProcessingProgress $processingProgress)
-  {
-    $this->processingProgress = $processingProgress;
-  }
-  public function getProcessingProgress()
-  {
-    return $this->processingProgress;
-  }
-  public function setProcessingStatus($processingStatus)
-  {
-    $this->processingStatus = $processingStatus;
-  }
-  public function getProcessingStatus()
-  {
-    return $this->processingStatus;
-  }
-  public function setTagSuggestionsAvailability($tagSuggestionsAvailability)
-  {
-    $this->tagSuggestionsAvailability = $tagSuggestionsAvailability;
-  }
-  public function getTagSuggestionsAvailability()
-  {
-    return $this->tagSuggestionsAvailability;
-  }
-  public function setThumbnailsAvailability($thumbnailsAvailability)
-  {
-    $this->thumbnailsAvailability = $thumbnailsAvailability;
-  }
-  public function getThumbnailsAvailability()
-  {
-    return $this->thumbnailsAvailability;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTube/VideoProcessingDetailsProcessingProgress.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTube/VideoProcessingDetailsProcessingProgress.php
deleted file mode 100644
index 0a93151d..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTube/VideoProcessingDetailsProcessingProgress.php
+++ /dev/null
@@ -1,48 +0,0 @@
-partsProcessed = $partsProcessed;
-  }
-  public function getPartsProcessed()
-  {
-    return $this->partsProcessed;
-  }
-  public function setPartsTotal($partsTotal)
-  {
-    $this->partsTotal = $partsTotal;
-  }
-  public function getPartsTotal()
-  {
-    return $this->partsTotal;
-  }
-  public function setTimeLeftMs($timeLeftMs)
-  {
-    $this->timeLeftMs = $timeLeftMs;
-  }
-  public function getTimeLeftMs()
-  {
-    return $this->timeLeftMs;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTube/VideoProjectDetails.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTube/VideoProjectDetails.php
deleted file mode 100644
index 22e5f1ef..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTube/VideoProjectDetails.php
+++ /dev/null
@@ -1,31 +0,0 @@
-tags = $tags;
-  }
-  public function getTags()
-  {
-    return $this->tags;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTube/VideoRating.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTube/VideoRating.php
deleted file mode 100644
index b396f6b3..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTube/VideoRating.php
+++ /dev/null
@@ -1,39 +0,0 @@
-rating = $rating;
-  }
-  public function getRating()
-  {
-    return $this->rating;
-  }
-  public function setVideoId($videoId)
-  {
-    $this->videoId = $videoId;
-  }
-  public function getVideoId()
-  {
-    return $this->videoId;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTube/VideoRecordingDetails.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTube/VideoRecordingDetails.php
deleted file mode 100644
index eda99ea0..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTube/VideoRecordingDetails.php
+++ /dev/null
@@ -1,49 +0,0 @@
-location = $location;
-  }
-  public function getLocation()
-  {
-    return $this->location;
-  }
-  public function setLocationDescription($locationDescription)
-  {
-    $this->locationDescription = $locationDescription;
-  }
-  public function getLocationDescription()
-  {
-    return $this->locationDescription;
-  }
-  public function setRecordingDate($recordingDate)
-  {
-    $this->recordingDate = $recordingDate;
-  }
-  public function getRecordingDate()
-  {
-    return $this->recordingDate;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTube/VideoSnippet.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTube/VideoSnippet.php
deleted file mode 100644
index 67e33d45..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTube/VideoSnippet.php
+++ /dev/null
@@ -1,132 +0,0 @@
-categoryId = $categoryId;
-  }
-  public function getCategoryId()
-  {
-    return $this->categoryId;
-  }
-  public function setChannelId($channelId)
-  {
-    $this->channelId = $channelId;
-  }
-  public function getChannelId()
-  {
-    return $this->channelId;
-  }
-  public function setChannelTitle($channelTitle)
-  {
-    $this->channelTitle = $channelTitle;
-  }
-  public function getChannelTitle()
-  {
-    return $this->channelTitle;
-  }
-  public function setDefaultAudioLanguage($defaultAudioLanguage)
-  {
-    $this->defaultAudioLanguage = $defaultAudioLanguage;
-  }
-  public function getDefaultAudioLanguage()
-  {
-    return $this->defaultAudioLanguage;
-  }
-  public function setDefaultLanguage($defaultLanguage)
-  {
-    $this->defaultLanguage = $defaultLanguage;
-  }
-  public function getDefaultLanguage()
-  {
-    return $this->defaultLanguage;
-  }
-  public function setDescription($description)
-  {
-    $this->description = $description;
-  }
-  public function getDescription()
-  {
-    return $this->description;
-  }
-  public function setLiveBroadcastContent($liveBroadcastContent)
-  {
-    $this->liveBroadcastContent = $liveBroadcastContent;
-  }
-  public function getLiveBroadcastContent()
-  {
-    return $this->liveBroadcastContent;
-  }
-  public function setLocalized(Google_Service_YouTube_VideoLocalization $localized)
-  {
-    $this->localized = $localized;
-  }
-  public function getLocalized()
-  {
-    return $this->localized;
-  }
-  public function setPublishedAt($publishedAt)
-  {
-    $this->publishedAt = $publishedAt;
-  }
-  public function getPublishedAt()
-  {
-    return $this->publishedAt;
-  }
-  public function setTags($tags)
-  {
-    $this->tags = $tags;
-  }
-  public function getTags()
-  {
-    return $this->tags;
-  }
-  public function setThumbnails(Google_Service_YouTube_ThumbnailDetails $thumbnails)
-  {
-    $this->thumbnails = $thumbnails;
-  }
-  public function getThumbnails()
-  {
-    return $this->thumbnails;
-  }
-  public function setTitle($title)
-  {
-    $this->title = $title;
-  }
-  public function getTitle()
-  {
-    return $this->title;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTube/VideoStatistics.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTube/VideoStatistics.php
deleted file mode 100644
index 18c20900..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTube/VideoStatistics.php
+++ /dev/null
@@ -1,66 +0,0 @@
-commentCount = $commentCount;
-  }
-  public function getCommentCount()
-  {
-    return $this->commentCount;
-  }
-  public function setDislikeCount($dislikeCount)
-  {
-    $this->dislikeCount = $dislikeCount;
-  }
-  public function getDislikeCount()
-  {
-    return $this->dislikeCount;
-  }
-  public function setFavoriteCount($favoriteCount)
-  {
-    $this->favoriteCount = $favoriteCount;
-  }
-  public function getFavoriteCount()
-  {
-    return $this->favoriteCount;
-  }
-  public function setLikeCount($likeCount)
-  {
-    $this->likeCount = $likeCount;
-  }
-  public function getLikeCount()
-  {
-    return $this->likeCount;
-  }
-  public function setViewCount($viewCount)
-  {
-    $this->viewCount = $viewCount;
-  }
-  public function getViewCount()
-  {
-    return $this->viewCount;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTube/VideoStatus.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTube/VideoStatus.php
deleted file mode 100644
index d367f3c6..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTube/VideoStatus.php
+++ /dev/null
@@ -1,93 +0,0 @@
-embeddable = $embeddable;
-  }
-  public function getEmbeddable()
-  {
-    return $this->embeddable;
-  }
-  public function setFailureReason($failureReason)
-  {
-    $this->failureReason = $failureReason;
-  }
-  public function getFailureReason()
-  {
-    return $this->failureReason;
-  }
-  public function setLicense($license)
-  {
-    $this->license = $license;
-  }
-  public function getLicense()
-  {
-    return $this->license;
-  }
-  public function setPrivacyStatus($privacyStatus)
-  {
-    $this->privacyStatus = $privacyStatus;
-  }
-  public function getPrivacyStatus()
-  {
-    return $this->privacyStatus;
-  }
-  public function setPublicStatsViewable($publicStatsViewable)
-  {
-    $this->publicStatsViewable = $publicStatsViewable;
-  }
-  public function getPublicStatsViewable()
-  {
-    return $this->publicStatsViewable;
-  }
-  public function setPublishAt($publishAt)
-  {
-    $this->publishAt = $publishAt;
-  }
-  public function getPublishAt()
-  {
-    return $this->publishAt;
-  }
-  public function setRejectionReason($rejectionReason)
-  {
-    $this->rejectionReason = $rejectionReason;
-  }
-  public function getRejectionReason()
-  {
-    return $this->rejectionReason;
-  }
-  public function setUploadStatus($uploadStatus)
-  {
-    $this->uploadStatus = $uploadStatus;
-  }
-  public function getUploadStatus()
-  {
-    return $this->uploadStatus;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTube/VideoSuggestions.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTube/VideoSuggestions.php
deleted file mode 100644
index e2b96d8b..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTube/VideoSuggestions.php
+++ /dev/null
@@ -1,68 +0,0 @@
-editorSuggestions = $editorSuggestions;
-  }
-  public function getEditorSuggestions()
-  {
-    return $this->editorSuggestions;
-  }
-  public function setProcessingErrors($processingErrors)
-  {
-    $this->processingErrors = $processingErrors;
-  }
-  public function getProcessingErrors()
-  {
-    return $this->processingErrors;
-  }
-  public function setProcessingHints($processingHints)
-  {
-    $this->processingHints = $processingHints;
-  }
-  public function getProcessingHints()
-  {
-    return $this->processingHints;
-  }
-  public function setProcessingWarnings($processingWarnings)
-  {
-    $this->processingWarnings = $processingWarnings;
-  }
-  public function getProcessingWarnings()
-  {
-    return $this->processingWarnings;
-  }
-  public function setTagSuggestions($tagSuggestions)
-  {
-    $this->tagSuggestions = $tagSuggestions;
-  }
-  public function getTagSuggestions()
-  {
-    return $this->tagSuggestions;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTube/VideoSuggestionsTagSuggestion.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTube/VideoSuggestionsTagSuggestion.php
deleted file mode 100644
index fef8bfbd..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTube/VideoSuggestionsTagSuggestion.php
+++ /dev/null
@@ -1,40 +0,0 @@
-categoryRestricts = $categoryRestricts;
-  }
-  public function getCategoryRestricts()
-  {
-    return $this->categoryRestricts;
-  }
-  public function setTag($tag)
-  {
-    $this->tag = $tag;
-  }
-  public function getTag()
-  {
-    return $this->tag;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTube/VideoTopicDetails.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTube/VideoTopicDetails.php
deleted file mode 100644
index f2f2fec0..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTube/VideoTopicDetails.php
+++ /dev/null
@@ -1,49 +0,0 @@
-relevantTopicIds = $relevantTopicIds;
-  }
-  public function getRelevantTopicIds()
-  {
-    return $this->relevantTopicIds;
-  }
-  public function setTopicCategories($topicCategories)
-  {
-    $this->topicCategories = $topicCategories;
-  }
-  public function getTopicCategories()
-  {
-    return $this->topicCategories;
-  }
-  public function setTopicIds($topicIds)
-  {
-    $this->topicIds = $topicIds;
-  }
-  public function getTopicIds()
-  {
-    return $this->topicIds;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTube/WatchSettings.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTube/WatchSettings.php
deleted file mode 100644
index bfc29521..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTube/WatchSettings.php
+++ /dev/null
@@ -1,48 +0,0 @@
-backgroundColor = $backgroundColor;
-  }
-  public function getBackgroundColor()
-  {
-    return $this->backgroundColor;
-  }
-  public function setFeaturedPlaylistId($featuredPlaylistId)
-  {
-    $this->featuredPlaylistId = $featuredPlaylistId;
-  }
-  public function getFeaturedPlaylistId()
-  {
-    return $this->featuredPlaylistId;
-  }
-  public function setTextColor($textColor)
-  {
-    $this->textColor = $textColor;
-  }
-  public function getTextColor()
-  {
-    return $this->textColor;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTubeAnalytics.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTubeAnalytics.php
deleted file mode 100644
index 9d30f156..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTubeAnalytics.php
+++ /dev/null
@@ -1,240 +0,0 @@
-
- * Retrieves your YouTube Analytics data.

- *
- * 

- * For more information about this service, see the API
- * Documentation
- * 

- *
- * @author Google, Inc.
- */
-class Google_Service_YouTubeAnalytics extends Google_Service
-{
-  /** Manage your YouTube account. */
-  const YOUTUBE =
-      "https://www.googleapis.com/auth/youtube";
-  /** View your YouTube account. */
-  const YOUTUBE_READONLY =
-      "https://www.googleapis.com/auth/youtube.readonly";
-  /** View and manage your assets and associated content on YouTube. */
-  const YOUTUBEPARTNER =
-      "https://www.googleapis.com/auth/youtubepartner";
-  /** View monetary and non-monetary YouTube Analytics reports for your YouTube content. */
-  const YT_ANALYTICS_MONETARY_READONLY =
-      "https://www.googleapis.com/auth/yt-analytics-monetary.readonly";
-  /** View YouTube Analytics reports for your YouTube content. */
-  const YT_ANALYTICS_READONLY =
-      "https://www.googleapis.com/auth/yt-analytics.readonly";
-
-  public $groupItems;
-  public $groups;
-  public $reports;
-  
-  /**
-   * Constructs the internal representation of the YouTubeAnalytics service.
-   *
-   * @param Google_Client $client
-   */
-  public function __construct(Google_Client $client)
-  {
-    parent::__construct($client);
-    $this->rootUrl = 'https://www.googleapis.com/';
-    $this->servicePath = 'youtube/analytics/v1/';
-    $this->version = 'v1';
-    $this->serviceName = 'youtubeAnalytics';
-
-    $this->groupItems = new Google_Service_YouTubeAnalytics_Resource_GroupItems(
-        $this,
-        $this->serviceName,
-        'groupItems',
-        array(
-          'methods' => array(
-            'delete' => array(
-              'path' => 'groupItems',
-              'httpMethod' => 'DELETE',
-              'parameters' => array(
-                'id' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'onBehalfOfContentOwner' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-              ),
-            ),'insert' => array(
-              'path' => 'groupItems',
-              'httpMethod' => 'POST',
-              'parameters' => array(
-                'onBehalfOfContentOwner' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-              ),
-            ),'list' => array(
-              'path' => 'groupItems',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'groupId' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'onBehalfOfContentOwner' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-              ),
-            ),
-          )
-        )
-    );
-    $this->groups = new Google_Service_YouTubeAnalytics_Resource_Groups(
-        $this,
-        $this->serviceName,
-        'groups',
-        array(
-          'methods' => array(
-            'delete' => array(
-              'path' => 'groups',
-              'httpMethod' => 'DELETE',
-              'parameters' => array(
-                'id' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'onBehalfOfContentOwner' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-              ),
-            ),'insert' => array(
-              'path' => 'groups',
-              'httpMethod' => 'POST',
-              'parameters' => array(
-                'onBehalfOfContentOwner' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-              ),
-            ),'list' => array(
-              'path' => 'groups',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'id' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'mine' => array(
-                  'location' => 'query',
-                  'type' => 'boolean',
-                ),
-                'onBehalfOfContentOwner' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'pageToken' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-              ),
-            ),'update' => array(
-              'path' => 'groups',
-              'httpMethod' => 'PUT',
-              'parameters' => array(
-                'onBehalfOfContentOwner' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-              ),
-            ),
-          )
-        )
-    );
-    $this->reports = new Google_Service_YouTubeAnalytics_Resource_Reports(
-        $this,
-        $this->serviceName,
-        'reports',
-        array(
-          'methods' => array(
-            'query' => array(
-              'path' => 'reports',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'ids' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'start-date' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'end-date' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'metrics' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'currency' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'dimensions' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'filters' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'include-historical-channel-data' => array(
-                  'location' => 'query',
-                  'type' => 'boolean',
-                ),
-                'max-results' => array(
-                  'location' => 'query',
-                  'type' => 'integer',
-                ),
-                'sort' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'start-index' => array(
-                  'location' => 'query',
-                  'type' => 'integer',
-                ),
-              ),
-            ),
-          )
-        )
-    );
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTubeAnalytics/BatchReport.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTubeAnalytics/BatchReport.php
deleted file mode 100644
index d0193100..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTubeAnalytics/BatchReport.php
+++ /dev/null
@@ -1,78 +0,0 @@
-id = $id;
-  }
-  public function getId()
-  {
-    return $this->id;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setOutputs($outputs)
-  {
-    $this->outputs = $outputs;
-  }
-  public function getOutputs()
-  {
-    return $this->outputs;
-  }
-  public function setReportId($reportId)
-  {
-    $this->reportId = $reportId;
-  }
-  public function getReportId()
-  {
-    return $this->reportId;
-  }
-  public function setTimeSpan(Google_Service_YouTubeAnalytics_BatchReportTimeSpan $timeSpan)
-  {
-    $this->timeSpan = $timeSpan;
-  }
-  public function getTimeSpan()
-  {
-    return $this->timeSpan;
-  }
-  public function setTimeUpdated($timeUpdated)
-  {
-    $this->timeUpdated = $timeUpdated;
-  }
-  public function getTimeUpdated()
-  {
-    return $this->timeUpdated;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTubeAnalytics/BatchReportDefinition.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTubeAnalytics/BatchReportDefinition.php
deleted file mode 100644
index 233b2560..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTubeAnalytics/BatchReportDefinition.php
+++ /dev/null
@@ -1,66 +0,0 @@
-id = $id;
-  }
-  public function getId()
-  {
-    return $this->id;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setName($name)
-  {
-    $this->name = $name;
-  }
-  public function getName()
-  {
-    return $this->name;
-  }
-  public function setStatus($status)
-  {
-    $this->status = $status;
-  }
-  public function getStatus()
-  {
-    return $this->status;
-  }
-  public function setType($type)
-  {
-    $this->type = $type;
-  }
-  public function getType()
-  {
-    return $this->type;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTubeAnalytics/BatchReportDefinitionList.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTubeAnalytics/BatchReportDefinitionList.php
deleted file mode 100644
index 116f141b..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTubeAnalytics/BatchReportDefinitionList.php
+++ /dev/null
@@ -1,41 +0,0 @@
-items = $items;
-  }
-  public function getItems()
-  {
-    return $this->items;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTubeAnalytics/BatchReportList.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTubeAnalytics/BatchReportList.php
deleted file mode 100644
index 5119337b..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTubeAnalytics/BatchReportList.php
+++ /dev/null
@@ -1,41 +0,0 @@
-items = $items;
-  }
-  public function getItems()
-  {
-    return $this->items;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTubeAnalytics/BatchReportOutputs.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTubeAnalytics/BatchReportOutputs.php
deleted file mode 100644
index 9d95f26e..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTubeAnalytics/BatchReportOutputs.php
+++ /dev/null
@@ -1,48 +0,0 @@
-downloadUrl = $downloadUrl;
-  }
-  public function getDownloadUrl()
-  {
-    return $this->downloadUrl;
-  }
-  public function setFormat($format)
-  {
-    $this->format = $format;
-  }
-  public function getFormat()
-  {
-    return $this->format;
-  }
-  public function setType($type)
-  {
-    $this->type = $type;
-  }
-  public function getType()
-  {
-    return $this->type;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTubeAnalytics/BatchReportTimeSpan.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTubeAnalytics/BatchReportTimeSpan.php
deleted file mode 100644
index 33a952a0..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTubeAnalytics/BatchReportTimeSpan.php
+++ /dev/null
@@ -1,39 +0,0 @@
-endTime = $endTime;
-  }
-  public function getEndTime()
-  {
-    return $this->endTime;
-  }
-  public function setStartTime($startTime)
-  {
-    $this->startTime = $startTime;
-  }
-  public function getStartTime()
-  {
-    return $this->startTime;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTubeAnalytics/Group.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTubeAnalytics/Group.php
deleted file mode 100644
index 4f767bd3..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTubeAnalytics/Group.php
+++ /dev/null
@@ -1,68 +0,0 @@
-contentDetails = $contentDetails;
-  }
-  public function getContentDetails()
-  {
-    return $this->contentDetails;
-  }
-  public function setEtag($etag)
-  {
-    $this->etag = $etag;
-  }
-  public function getEtag()
-  {
-    return $this->etag;
-  }
-  public function setId($id)
-  {
-    $this->id = $id;
-  }
-  public function getId()
-  {
-    return $this->id;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setSnippet(Google_Service_YouTubeAnalytics_GroupSnippet $snippet)
-  {
-    $this->snippet = $snippet;
-  }
-  public function getSnippet()
-  {
-    return $this->snippet;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTubeAnalytics/GroupContentDetails.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTubeAnalytics/GroupContentDetails.php
deleted file mode 100644
index acb50c3f..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTubeAnalytics/GroupContentDetails.php
+++ /dev/null
@@ -1,39 +0,0 @@
-itemCount = $itemCount;
-  }
-  public function getItemCount()
-  {
-    return $this->itemCount;
-  }
-  public function setItemType($itemType)
-  {
-    $this->itemType = $itemType;
-  }
-  public function getItemType()
-  {
-    return $this->itemType;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTubeAnalytics/GroupItem.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTubeAnalytics/GroupItem.php
deleted file mode 100644
index 988c6206..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTubeAnalytics/GroupItem.php
+++ /dev/null
@@ -1,67 +0,0 @@
-etag = $etag;
-  }
-  public function getEtag()
-  {
-    return $this->etag;
-  }
-  public function setGroupId($groupId)
-  {
-    $this->groupId = $groupId;
-  }
-  public function getGroupId()
-  {
-    return $this->groupId;
-  }
-  public function setId($id)
-  {
-    $this->id = $id;
-  }
-  public function getId()
-  {
-    return $this->id;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setResource(Google_Service_YouTubeAnalytics_GroupItemResource $resource)
-  {
-    $this->resource = $resource;
-  }
-  public function getResource()
-  {
-    return $this->resource;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTubeAnalytics/GroupItemListResponse.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTubeAnalytics/GroupItemListResponse.php
deleted file mode 100644
index 5fd9f6e2..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTubeAnalytics/GroupItemListResponse.php
+++ /dev/null
@@ -1,50 +0,0 @@
-etag = $etag;
-  }
-  public function getEtag()
-  {
-    return $this->etag;
-  }
-  public function setItems($items)
-  {
-    $this->items = $items;
-  }
-  public function getItems()
-  {
-    return $this->items;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTubeAnalytics/GroupItemResource.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTubeAnalytics/GroupItemResource.php
deleted file mode 100644
index 2e5c220b..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTubeAnalytics/GroupItemResource.php
+++ /dev/null
@@ -1,39 +0,0 @@
-id = $id;
-  }
-  public function getId()
-  {
-    return $this->id;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTubeAnalytics/GroupListResponse.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTubeAnalytics/GroupListResponse.php
deleted file mode 100644
index dfdf12fc..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTubeAnalytics/GroupListResponse.php
+++ /dev/null
@@ -1,59 +0,0 @@
-etag = $etag;
-  }
-  public function getEtag()
-  {
-    return $this->etag;
-  }
-  public function setItems($items)
-  {
-    $this->items = $items;
-  }
-  public function getItems()
-  {
-    return $this->items;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setNextPageToken($nextPageToken)
-  {
-    $this->nextPageToken = $nextPageToken;
-  }
-  public function getNextPageToken()
-  {
-    return $this->nextPageToken;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTubeAnalytics/GroupSnippet.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTubeAnalytics/GroupSnippet.php
deleted file mode 100644
index 46e9b765..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTubeAnalytics/GroupSnippet.php
+++ /dev/null
@@ -1,39 +0,0 @@
-publishedAt = $publishedAt;
-  }
-  public function getPublishedAt()
-  {
-    return $this->publishedAt;
-  }
-  public function setTitle($title)
-  {
-    $this->title = $title;
-  }
-  public function getTitle()
-  {
-    return $this->title;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTubeAnalytics/Resource/BatchReportDefinitions.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTubeAnalytics/Resource/BatchReportDefinitions.php
deleted file mode 100644
index 08a95a72..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTubeAnalytics/Resource/BatchReportDefinitions.php
+++ /dev/null
@@ -1,43 +0,0 @@
-
- *   $youtubeAnalyticsService = new Google_Service_YouTubeAnalytics(...);
- *   $batchReportDefinitions = $youtubeAnalyticsService->batchReportDefinitions;
- *  
- */
-class Google_Service_YouTubeAnalytics_Resource_BatchReportDefinitions extends Google_Service_Resource
-{
-  /**
-   * Retrieves a list of available batch report definitions.
-   * (batchReportDefinitions.listBatchReportDefinitions)
-   *
-   * @param string $onBehalfOfContentOwner The onBehalfOfContentOwner parameter
-   * identifies the content owner that the user is acting on behalf of.
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_YouTubeAnalytics_BatchReportDefinitionList
-   */
-  public function listBatchReportDefinitions($onBehalfOfContentOwner, $optParams = array())
-  {
-    $params = array('onBehalfOfContentOwner' => $onBehalfOfContentOwner);
-    $params = array_merge($params, $optParams);
-    return $this->call('list', array($params), "Google_Service_YouTubeAnalytics_BatchReportDefinitionList");
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTubeAnalytics/Resource/BatchReports.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTubeAnalytics/Resource/BatchReports.php
deleted file mode 100644
index 852ae2c3..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTubeAnalytics/Resource/BatchReports.php
+++ /dev/null
@@ -1,45 +0,0 @@
-
- *   $youtubeAnalyticsService = new Google_Service_YouTubeAnalytics(...);
- *   $batchReports = $youtubeAnalyticsService->batchReports;
- *  
- */
-class Google_Service_YouTubeAnalytics_Resource_BatchReports extends Google_Service_Resource
-{
-  /**
-   * Retrieves a list of processed batch reports. (batchReports.listBatchReports)
-   *
-   * @param string $batchReportDefinitionId The batchReportDefinitionId parameter
-   * specifies the ID of the batch reportort definition for which you are
-   * retrieving reports.
-   * @param string $onBehalfOfContentOwner The onBehalfOfContentOwner parameter
-   * identifies the content owner that the user is acting on behalf of.
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_YouTubeAnalytics_BatchReportList
-   */
-  public function listBatchReports($batchReportDefinitionId, $onBehalfOfContentOwner, $optParams = array())
-  {
-    $params = array('batchReportDefinitionId' => $batchReportDefinitionId, 'onBehalfOfContentOwner' => $onBehalfOfContentOwner);
-    $params = array_merge($params, $optParams);
-    return $this->call('list', array($params), "Google_Service_YouTubeAnalytics_BatchReportList");
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTubeAnalytics/Resource/GroupItems.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTubeAnalytics/Resource/GroupItems.php
deleted file mode 100644
index a0302c62..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTubeAnalytics/Resource/GroupItems.php
+++ /dev/null
@@ -1,108 +0,0 @@
-
- *   $youtubeAnalyticsService = new Google_Service_YouTubeAnalytics(...);
- *   $groupItems = $youtubeAnalyticsService->groupItems;
- *  
- */
-class Google_Service_YouTubeAnalytics_Resource_GroupItems extends Google_Service_Resource
-{
-  /**
-   * Removes an item from a group. (groupItems.delete)
-   *
-   * @param string $id The id parameter specifies the YouTube group item ID for
-   * the group that is being deleted.
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param string onBehalfOfContentOwner Note: This parameter is intended
-   * exclusively for YouTube content partners.
-   *
-   * The onBehalfOfContentOwner parameter indicates that the request's
-   * authorization credentials identify a YouTube CMS user who is acting on behalf
-   * of the content owner specified in the parameter value. This parameter is
-   * intended for YouTube content partners that own and manage many different
-   * YouTube channels. It allows content owners to authenticate once and get
-   * access to all their video and channel data, without having to provide
-   * authentication credentials for each individual channel. The CMS account that
-   * the user authenticates with must be linked to the specified YouTube content
-   * owner.
-   */
-  public function delete($id, $optParams = array())
-  {
-    $params = array('id' => $id);
-    $params = array_merge($params, $optParams);
-    return $this->call('delete', array($params));
-  }
-  /**
-   * Creates a group item. (groupItems.insert)
-   *
-   * @param Google_Service_YouTubeAnalytics_GroupItem $postBody
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param string onBehalfOfContentOwner Note: This parameter is intended
-   * exclusively for YouTube content partners.
-   *
-   * The onBehalfOfContentOwner parameter indicates that the request's
-   * authorization credentials identify a YouTube CMS user who is acting on behalf
-   * of the content owner specified in the parameter value. This parameter is
-   * intended for YouTube content partners that own and manage many different
-   * YouTube channels. It allows content owners to authenticate once and get
-   * access to all their video and channel data, without having to provide
-   * authentication credentials for each individual channel. The CMS account that
-   * the user authenticates with must be linked to the specified YouTube content
-   * owner.
-   * @return Google_Service_YouTubeAnalytics_GroupItem
-   */
-  public function insert(Google_Service_YouTubeAnalytics_GroupItem $postBody, $optParams = array())
-  {
-    $params = array('postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('insert', array($params), "Google_Service_YouTubeAnalytics_GroupItem");
-  }
-  /**
-   * Returns a collection of group items that match the API request parameters.
-   * (groupItems.listGroupItems)
-   *
-   * @param string $groupId The id parameter specifies the unique ID of the group
-   * for which you want to retrieve group items.
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param string onBehalfOfContentOwner Note: This parameter is intended
-   * exclusively for YouTube content partners.
-   *
-   * The onBehalfOfContentOwner parameter indicates that the request's
-   * authorization credentials identify a YouTube CMS user who is acting on behalf
-   * of the content owner specified in the parameter value. This parameter is
-   * intended for YouTube content partners that own and manage many different
-   * YouTube channels. It allows content owners to authenticate once and get
-   * access to all their video and channel data, without having to provide
-   * authentication credentials for each individual channel. The CMS account that
-   * the user authenticates with must be linked to the specified YouTube content
-   * owner.
-   * @return Google_Service_YouTubeAnalytics_GroupItemListResponse
-   */
-  public function listGroupItems($groupId, $optParams = array())
-  {
-    $params = array('groupId' => $groupId);
-    $params = array_merge($params, $optParams);
-    return $this->call('list', array($params), "Google_Service_YouTubeAnalytics_GroupItemListResponse");
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTubeAnalytics/Resource/Groups.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTubeAnalytics/Resource/Groups.php
deleted file mode 100644
index 9c983ba5..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTubeAnalytics/Resource/Groups.php
+++ /dev/null
@@ -1,142 +0,0 @@
-
- *   $youtubeAnalyticsService = new Google_Service_YouTubeAnalytics(...);
- *   $groups = $youtubeAnalyticsService->groups;
- *  
- */
-class Google_Service_YouTubeAnalytics_Resource_Groups extends Google_Service_Resource
-{
-  /**
-   * Deletes a group. (groups.delete)
-   *
-   * @param string $id The id parameter specifies the YouTube group ID for the
-   * group that is being deleted.
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param string onBehalfOfContentOwner Note: This parameter is intended
-   * exclusively for YouTube content partners.
-   *
-   * The onBehalfOfContentOwner parameter indicates that the request's
-   * authorization credentials identify a YouTube CMS user who is acting on behalf
-   * of the content owner specified in the parameter value. This parameter is
-   * intended for YouTube content partners that own and manage many different
-   * YouTube channels. It allows content owners to authenticate once and get
-   * access to all their video and channel data, without having to provide
-   * authentication credentials for each individual channel. The CMS account that
-   * the user authenticates with must be linked to the specified YouTube content
-   * owner.
-   */
-  public function delete($id, $optParams = array())
-  {
-    $params = array('id' => $id);
-    $params = array_merge($params, $optParams);
-    return $this->call('delete', array($params));
-  }
-  /**
-   * Creates a group. (groups.insert)
-   *
-   * @param Google_Service_YouTubeAnalytics_Group $postBody
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param string onBehalfOfContentOwner Note: This parameter is intended
-   * exclusively for YouTube content partners.
-   *
-   * The onBehalfOfContentOwner parameter indicates that the request's
-   * authorization credentials identify a YouTube CMS user who is acting on behalf
-   * of the content owner specified in the parameter value. This parameter is
-   * intended for YouTube content partners that own and manage many different
-   * YouTube channels. It allows content owners to authenticate once and get
-   * access to all their video and channel data, without having to provide
-   * authentication credentials for each individual channel. The CMS account that
-   * the user authenticates with must be linked to the specified YouTube content
-   * owner.
-   * @return Google_Service_YouTubeAnalytics_Group
-   */
-  public function insert(Google_Service_YouTubeAnalytics_Group $postBody, $optParams = array())
-  {
-    $params = array('postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('insert', array($params), "Google_Service_YouTubeAnalytics_Group");
-  }
-  /**
-   * Returns a collection of groups that match the API request parameters. For
-   * example, you can retrieve all groups that the authenticated user owns, or you
-   * can retrieve one or more groups by their unique IDs. (groups.listGroups)
-   *
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param string id The id parameter specifies a comma-separated list of the
-   * YouTube group ID(s) for the resource(s) that are being retrieved. In a group
-   * resource, the id property specifies the group's YouTube group ID.
-   * @opt_param bool mine Set this parameter's value to true to instruct the API
-   * to only return groups owned by the authenticated user.
-   * @opt_param string onBehalfOfContentOwner Note: This parameter is intended
-   * exclusively for YouTube content partners.
-   *
-   * The onBehalfOfContentOwner parameter indicates that the request's
-   * authorization credentials identify a YouTube CMS user who is acting on behalf
-   * of the content owner specified in the parameter value. This parameter is
-   * intended for YouTube content partners that own and manage many different
-   * YouTube channels. It allows content owners to authenticate once and get
-   * access to all their video and channel data, without having to provide
-   * authentication credentials for each individual channel. The CMS account that
-   * the user authenticates with must be linked to the specified YouTube content
-   * owner.
-   * @opt_param string pageToken The pageToken parameter identifies a specific
-   * page in the result set that should be returned. In an API response, the
-   * nextPageToken property identifies the next page that can be retrieved.
-   * @return Google_Service_YouTubeAnalytics_GroupListResponse
-   */
-  public function listGroups($optParams = array())
-  {
-    $params = array();
-    $params = array_merge($params, $optParams);
-    return $this->call('list', array($params), "Google_Service_YouTubeAnalytics_GroupListResponse");
-  }
-  /**
-   * Modifies a group. For example, you could change a group's title.
-   * (groups.update)
-   *
-   * @param Google_Service_YouTubeAnalytics_Group $postBody
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param string onBehalfOfContentOwner Note: This parameter is intended
-   * exclusively for YouTube content partners.
-   *
-   * The onBehalfOfContentOwner parameter indicates that the request's
-   * authorization credentials identify a YouTube CMS user who is acting on behalf
-   * of the content owner specified in the parameter value. This parameter is
-   * intended for YouTube content partners that own and manage many different
-   * YouTube channels. It allows content owners to authenticate once and get
-   * access to all their video and channel data, without having to provide
-   * authentication credentials for each individual channel. The CMS account that
-   * the user authenticates with must be linked to the specified YouTube content
-   * owner.
-   * @return Google_Service_YouTubeAnalytics_Group
-   */
-  public function update(Google_Service_YouTubeAnalytics_Group $postBody, $optParams = array())
-  {
-    $params = array('postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('update', array($params), "Google_Service_YouTubeAnalytics_Group");
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTubeAnalytics/Resource/Reports.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTubeAnalytics/Resource/Reports.php
deleted file mode 100644
index 6f6f116f..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTubeAnalytics/Resource/Reports.php
+++ /dev/null
@@ -1,83 +0,0 @@
-
- *   $youtubeAnalyticsService = new Google_Service_YouTubeAnalytics(...);
- *   $reports = $youtubeAnalyticsService->reports;
- *  
- */
-class Google_Service_YouTubeAnalytics_Resource_Reports extends Google_Service_Resource
-{
-  /**
-   * Retrieve your YouTube Analytics reports. (reports.query)
-   *
-   * @param string $ids Identifies the YouTube channel or content owner for which
-   * you are retrieving YouTube Analytics data. - To request data for a YouTube
-   * user, set the ids parameter value to channel==CHANNEL_ID, where CHANNEL_ID
-   * specifies the unique YouTube channel ID. - To request data for a YouTube CMS
-   * content owner, set the ids parameter value to contentOwner==OWNER_NAME, where
-   * OWNER_NAME is the CMS name of the content owner.
-   * @param string $startDate The start date for fetching YouTube Analytics data.
-   * The value should be in YYYY-MM-DD format.
-   * @param string $endDate The end date for fetching YouTube Analytics data. The
-   * value should be in YYYY-MM-DD format.
-   * @param string $metrics A comma-separated list of YouTube Analytics metrics,
-   * such as views or likes,dislikes. See the Available Reports document for a
-   * list of the reports that you can retrieve and the metrics available in each
-   * report, and see the Metrics document for definitions of those metrics.
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param string currency The currency to which financial metrics should be
-   * converted. The default is US Dollar (USD). If the result contains no
-   * financial metrics, this flag will be ignored. Responds with an error if the
-   * specified currency is not recognized.
-   * @opt_param string dimensions A comma-separated list of YouTube Analytics
-   * dimensions, such as views or ageGroup,gender. See the Available Reports
-   * document for a list of the reports that you can retrieve and the dimensions
-   * used for those reports. Also see the Dimensions document for definitions of
-   * those dimensions.
-   * @opt_param string filters A list of filters that should be applied when
-   * retrieving YouTube Analytics data. The Available Reports document identifies
-   * the dimensions that can be used to filter each report, and the Dimensions
-   * document defines those dimensions. If a request uses multiple filters, join
-   * them together with a semicolon (;), and the returned result table will
-   * satisfy both filters. For example, a filters parameter value of
-   * video==dMH0bHeiRNg;country==IT restricts the result set to include data for
-   * the given video in Italy.
-   * @opt_param bool include-historical-channel-data If set to true historical
-   * data (i.e. channel data from before the linking of the channel to the content
-   * owner) will be retrieved.
-   * @opt_param int max-results The maximum number of rows to include in the
-   * response.
-   * @opt_param string sort A comma-separated list of dimensions or metrics that
-   * determine the sort order for YouTube Analytics data. By default the sort
-   * order is ascending. The '-' prefix causes descending sort order.
-   * @opt_param int start-index An index of the first entity to retrieve. Use this
-   * parameter as a pagination mechanism along with the max-results parameter
-   * (one-based, inclusive).
-   * @return Google_Service_YouTubeAnalytics_ResultTable
-   */
-  public function query($ids, $startDate, $endDate, $metrics, $optParams = array())
-  {
-    $params = array('ids' => $ids, 'start-date' => $startDate, 'end-date' => $endDate, 'metrics' => $metrics);
-    $params = array_merge($params, $optParams);
-    return $this->call('query', array($params), "Google_Service_YouTubeAnalytics_ResultTable");
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTubeAnalytics/ResultTable.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTubeAnalytics/ResultTable.php
deleted file mode 100644
index 0accde01..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTubeAnalytics/ResultTable.php
+++ /dev/null
@@ -1,50 +0,0 @@
-columnHeaders = $columnHeaders;
-  }
-  public function getColumnHeaders()
-  {
-    return $this->columnHeaders;
-  }
-  public function setKind($kind)
-  {
-    $this->kind = $kind;
-  }
-  public function getKind()
-  {
-    return $this->kind;
-  }
-  public function setRows($rows)
-  {
-    $this->rows = $rows;
-  }
-  public function getRows()
-  {
-    return $this->rows;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTubeAnalytics/ResultTableColumnHeaders.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTubeAnalytics/ResultTableColumnHeaders.php
deleted file mode 100644
index 1798672a..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTubeAnalytics/ResultTableColumnHeaders.php
+++ /dev/null
@@ -1,48 +0,0 @@
-columnType = $columnType;
-  }
-  public function getColumnType()
-  {
-    return $this->columnType;
-  }
-  public function setDataType($dataType)
-  {
-    $this->dataType = $dataType;
-  }
-  public function getDataType()
-  {
-    return $this->dataType;
-  }
-  public function setName($name)
-  {
-    $this->name = $name;
-  }
-  public function getName()
-  {
-    return $this->name;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTubeReporting.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTubeReporting.php
deleted file mode 100644
index f7932338..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTubeReporting.php
+++ /dev/null
@@ -1,242 +0,0 @@
-
- * Schedules reporting jobs containing your YouTube Analytics data and downloads
- * the resulting bulk data reports in the form of CSV files.

- *
- * 

- * For more information about this service, see the API
- * Documentation
- * 

- *
- * @author Google, Inc.
- */
-class Google_Service_YouTubeReporting extends Google_Service
-{
-  /** View monetary and non-monetary YouTube Analytics reports for your YouTube content. */
-  const YT_ANALYTICS_MONETARY_READONLY =
-      "https://www.googleapis.com/auth/yt-analytics-monetary.readonly";
-  /** View YouTube Analytics reports for your YouTube content. */
-  const YT_ANALYTICS_READONLY =
-      "https://www.googleapis.com/auth/yt-analytics.readonly";
-
-  public $jobs;
-  public $jobs_reports;
-  public $media;
-  public $reportTypes;
-  
-  /**
-   * Constructs the internal representation of the YouTubeReporting service.
-   *
-   * @param Google_Client $client
-   */
-  public function __construct(Google_Client $client)
-  {
-    parent::__construct($client);
-    $this->rootUrl = 'https://youtubereporting.googleapis.com/';
-    $this->servicePath = '';
-    $this->version = 'v1';
-    $this->serviceName = 'youtubereporting';
-
-    $this->jobs = new Google_Service_YouTubeReporting_Resource_Jobs(
-        $this,
-        $this->serviceName,
-        'jobs',
-        array(
-          'methods' => array(
-            'create' => array(
-              'path' => 'v1/jobs',
-              'httpMethod' => 'POST',
-              'parameters' => array(
-                'onBehalfOfContentOwner' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-              ),
-            ),'delete' => array(
-              'path' => 'v1/jobs/{jobId}',
-              'httpMethod' => 'DELETE',
-              'parameters' => array(
-                'jobId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'onBehalfOfContentOwner' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-              ),
-            ),'get' => array(
-              'path' => 'v1/jobs/{jobId}',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'jobId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'onBehalfOfContentOwner' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-              ),
-            ),'list' => array(
-              'path' => 'v1/jobs',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'onBehalfOfContentOwner' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'pageToken' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'includeSystemManaged' => array(
-                  'location' => 'query',
-                  'type' => 'boolean',
-                ),
-                'pageSize' => array(
-                  'location' => 'query',
-                  'type' => 'integer',
-                ),
-              ),
-            ),
-          )
-        )
-    );
-    $this->jobs_reports = new Google_Service_YouTubeReporting_Resource_JobsReports(
-        $this,
-        $this->serviceName,
-        'reports',
-        array(
-          'methods' => array(
-            'get' => array(
-              'path' => 'v1/jobs/{jobId}/reports/{reportId}',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'jobId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'reportId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'onBehalfOfContentOwner' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-              ),
-            ),'list' => array(
-              'path' => 'v1/jobs/{jobId}/reports',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'jobId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'onBehalfOfContentOwner' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'startTimeBefore' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'createdAfter' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'pageToken' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'startTimeAtOrAfter' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'pageSize' => array(
-                  'location' => 'query',
-                  'type' => 'integer',
-                ),
-              ),
-            ),
-          )
-        )
-    );
-    $this->media = new Google_Service_YouTubeReporting_Resource_Media(
-        $this,
-        $this->serviceName,
-        'media',
-        array(
-          'methods' => array(
-            'download' => array(
-              'path' => 'v1/media/{+resourceName}',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'resourceName' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),
-          )
-        )
-    );
-    $this->reportTypes = new Google_Service_YouTubeReporting_Resource_ReportTypes(
-        $this,
-        $this->serviceName,
-        'reportTypes',
-        array(
-          'methods' => array(
-            'list' => array(
-              'path' => 'v1/reportTypes',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'onBehalfOfContentOwner' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'pageToken' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'includeSystemManaged' => array(
-                  'location' => 'query',
-                  'type' => 'boolean',
-                ),
-                'pageSize' => array(
-                  'location' => 'query',
-                  'type' => 'integer',
-                ),
-              ),
-            ),
-          )
-        )
-    );
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTubeReporting/Job.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTubeReporting/Job.php
deleted file mode 100644
index 290613fb..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTubeReporting/Job.php
+++ /dev/null
@@ -1,75 +0,0 @@
-createTime = $createTime;
-  }
-  public function getCreateTime()
-  {
-    return $this->createTime;
-  }
-  public function setExpireTime($expireTime)
-  {
-    $this->expireTime = $expireTime;
-  }
-  public function getExpireTime()
-  {
-    return $this->expireTime;
-  }
-  public function setId($id)
-  {
-    $this->id = $id;
-  }
-  public function getId()
-  {
-    return $this->id;
-  }
-  public function setName($name)
-  {
-    $this->name = $name;
-  }
-  public function getName()
-  {
-    return $this->name;
-  }
-  public function setReportTypeId($reportTypeId)
-  {
-    $this->reportTypeId = $reportTypeId;
-  }
-  public function getReportTypeId()
-  {
-    return $this->reportTypeId;
-  }
-  public function setSystemManaged($systemManaged)
-  {
-    $this->systemManaged = $systemManaged;
-  }
-  public function getSystemManaged()
-  {
-    return $this->systemManaged;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTubeReporting/ListJobsResponse.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTubeReporting/ListJobsResponse.php
deleted file mode 100644
index e5052171..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTubeReporting/ListJobsResponse.php
+++ /dev/null
@@ -1,41 +0,0 @@
-jobs = $jobs;
-  }
-  public function getJobs()
-  {
-    return $this->jobs;
-  }
-  public function setNextPageToken($nextPageToken)
-  {
-    $this->nextPageToken = $nextPageToken;
-  }
-  public function getNextPageToken()
-  {
-    return $this->nextPageToken;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTubeReporting/ListReportTypesResponse.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTubeReporting/ListReportTypesResponse.php
deleted file mode 100644
index 08d87d71..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTubeReporting/ListReportTypesResponse.php
+++ /dev/null
@@ -1,41 +0,0 @@
-nextPageToken = $nextPageToken;
-  }
-  public function getNextPageToken()
-  {
-    return $this->nextPageToken;
-  }
-  public function setReportTypes($reportTypes)
-  {
-    $this->reportTypes = $reportTypes;
-  }
-  public function getReportTypes()
-  {
-    return $this->reportTypes;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTubeReporting/ListReportsResponse.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTubeReporting/ListReportsResponse.php
deleted file mode 100644
index d5c66055..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTubeReporting/ListReportsResponse.php
+++ /dev/null
@@ -1,41 +0,0 @@
-nextPageToken = $nextPageToken;
-  }
-  public function getNextPageToken()
-  {
-    return $this->nextPageToken;
-  }
-  public function setReports($reports)
-  {
-    $this->reports = $reports;
-  }
-  public function getReports()
-  {
-    return $this->reports;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTubeReporting/Media.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTubeReporting/Media.php
deleted file mode 100644
index 2035d8bd..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTubeReporting/Media.php
+++ /dev/null
@@ -1,30 +0,0 @@
-resourceName = $resourceName;
-  }
-  public function getResourceName()
-  {
-    return $this->resourceName;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTubeReporting/Report.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTubeReporting/Report.php
deleted file mode 100644
index 60f26843..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTubeReporting/Report.php
+++ /dev/null
@@ -1,84 +0,0 @@
-createTime = $createTime;
-  }
-  public function getCreateTime()
-  {
-    return $this->createTime;
-  }
-  public function setDownloadUrl($downloadUrl)
-  {
-    $this->downloadUrl = $downloadUrl;
-  }
-  public function getDownloadUrl()
-  {
-    return $this->downloadUrl;
-  }
-  public function setEndTime($endTime)
-  {
-    $this->endTime = $endTime;
-  }
-  public function getEndTime()
-  {
-    return $this->endTime;
-  }
-  public function setId($id)
-  {
-    $this->id = $id;
-  }
-  public function getId()
-  {
-    return $this->id;
-  }
-  public function setJobExpireTime($jobExpireTime)
-  {
-    $this->jobExpireTime = $jobExpireTime;
-  }
-  public function getJobExpireTime()
-  {
-    return $this->jobExpireTime;
-  }
-  public function setJobId($jobId)
-  {
-    $this->jobId = $jobId;
-  }
-  public function getJobId()
-  {
-    return $this->jobId;
-  }
-  public function setStartTime($startTime)
-  {
-    $this->startTime = $startTime;
-  }
-  public function getStartTime()
-  {
-    return $this->startTime;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTubeReporting/ReportType.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTubeReporting/ReportType.php
deleted file mode 100644
index 6c027afe..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTubeReporting/ReportType.php
+++ /dev/null
@@ -1,57 +0,0 @@
-deprecateTime = $deprecateTime;
-  }
-  public function getDeprecateTime()
-  {
-    return $this->deprecateTime;
-  }
-  public function setId($id)
-  {
-    $this->id = $id;
-  }
-  public function getId()
-  {
-    return $this->id;
-  }
-  public function setName($name)
-  {
-    $this->name = $name;
-  }
-  public function getName()
-  {
-    return $this->name;
-  }
-  public function setSystemManaged($systemManaged)
-  {
-    $this->systemManaged = $systemManaged;
-  }
-  public function getSystemManaged()
-  {
-    return $this->systemManaged;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTubeReporting/Resource/Jobs.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTubeReporting/Resource/Jobs.php
deleted file mode 100644
index f8707f9b..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTubeReporting/Resource/Jobs.php
+++ /dev/null
@@ -1,104 +0,0 @@
-
- *   $youtubereportingService = new Google_Service_YouTubeReporting(...);
- *   $jobs = $youtubereportingService->jobs;
- *  
- */
-class Google_Service_YouTubeReporting_Resource_Jobs extends Google_Service_Resource
-{
-  /**
-   * Creates a job and returns it. (jobs.create)
-   *
-   * @param Google_Service_YouTubeReporting_Job $postBody
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param string onBehalfOfContentOwner The content owner's external ID on
-   * which behalf the user is acting on. If not set, the user is acting for
-   * himself (his own channel).
-   * @return Google_Service_YouTubeReporting_Job
-   */
-  public function create(Google_Service_YouTubeReporting_Job $postBody, $optParams = array())
-  {
-    $params = array('postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('create', array($params), "Google_Service_YouTubeReporting_Job");
-  }
-  /**
-   * Deletes a job. (jobs.delete)
-   *
-   * @param string $jobId The ID of the job to delete.
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param string onBehalfOfContentOwner The content owner's external ID on
-   * which behalf the user is acting on. If not set, the user is acting for
-   * himself (his own channel).
-   * @return Google_Service_YouTubeReporting_YoutubereportingEmpty
-   */
-  public function delete($jobId, $optParams = array())
-  {
-    $params = array('jobId' => $jobId);
-    $params = array_merge($params, $optParams);
-    return $this->call('delete', array($params), "Google_Service_YouTubeReporting_YoutubereportingEmpty");
-  }
-  /**
-   * Gets a job. (jobs.get)
-   *
-   * @param string $jobId The ID of the job to retrieve.
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param string onBehalfOfContentOwner The content owner's external ID on
-   * which behalf the user is acting on. If not set, the user is acting for
-   * himself (his own channel).
-   * @return Google_Service_YouTubeReporting_Job
-   */
-  public function get($jobId, $optParams = array())
-  {
-    $params = array('jobId' => $jobId);
-    $params = array_merge($params, $optParams);
-    return $this->call('get', array($params), "Google_Service_YouTubeReporting_Job");
-  }
-  /**
-   * Lists jobs. (jobs.listJobs)
-   *
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param string onBehalfOfContentOwner The content owner's external ID on
-   * which behalf the user is acting on. If not set, the user is acting for
-   * himself (his own channel).
-   * @opt_param string pageToken A token identifying a page of results the server
-   * should return. Typically, this is the value of
-   * ListReportTypesResponse.next_page_token returned in response to the previous
-   * call to the `ListJobs` method.
-   * @opt_param bool includeSystemManaged If set to true, also system-managed jobs
-   * will be returned; otherwise only user-created jobs will be returned. System-
-   * managed jobs can neither be modified nor deleted.
-   * @opt_param int pageSize Requested page size. Server may return fewer jobs
-   * than requested. If unspecified, server will pick an appropriate default.
-   * @return Google_Service_YouTubeReporting_ListJobsResponse
-   */
-  public function listJobs($optParams = array())
-  {
-    $params = array();
-    $params = array_merge($params, $optParams);
-    return $this->call('list', array($params), "Google_Service_YouTubeReporting_ListJobsResponse");
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTubeReporting/Resource/JobsReports.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTubeReporting/Resource/JobsReports.php
deleted file mode 100644
index 27b92a2c..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTubeReporting/Resource/JobsReports.php
+++ /dev/null
@@ -1,77 +0,0 @@
-
- *   $youtubereportingService = new Google_Service_YouTubeReporting(...);
- *   $reports = $youtubereportingService->reports;
- *  
- */
-class Google_Service_YouTubeReporting_Resource_JobsReports extends Google_Service_Resource
-{
-  /**
-   * Gets the metadata of a specific report. (reports.get)
-   *
-   * @param string $jobId The ID of the job.
-   * @param string $reportId The ID of the report to retrieve.
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param string onBehalfOfContentOwner The content owner's external ID on
-   * which behalf the user is acting on. If not set, the user is acting for
-   * himself (his own channel).
-   * @return Google_Service_YouTubeReporting_Report
-   */
-  public function get($jobId, $reportId, $optParams = array())
-  {
-    $params = array('jobId' => $jobId, 'reportId' => $reportId);
-    $params = array_merge($params, $optParams);
-    return $this->call('get', array($params), "Google_Service_YouTubeReporting_Report");
-  }
-  /**
-   * Lists reports created by a specific job. Returns NOT_FOUND if the job does
-   * not exist. (reports.listJobsReports)
-   *
-   * @param string $jobId The ID of the job.
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param string onBehalfOfContentOwner The content owner's external ID on
-   * which behalf the user is acting on. If not set, the user is acting for
-   * himself (his own channel).
-   * @opt_param string startTimeBefore If set, only reports whose start time is
-   * smaller than the specified date/time are returned.
-   * @opt_param string createdAfter If set, only reports created after the
-   * specified date/time are returned.
-   * @opt_param string pageToken A token identifying a page of results the server
-   * should return. Typically, this is the value of
-   * ListReportsResponse.next_page_token returned in response to the previous call
-   * to the `ListReports` method.
-   * @opt_param string startTimeAtOrAfter If set, only reports whose start time is
-   * greater than or equal the specified date/time are returned.
-   * @opt_param int pageSize Requested page size. Server may return fewer report
-   * types than requested. If unspecified, server will pick an appropriate
-   * default.
-   * @return Google_Service_YouTubeReporting_ListReportsResponse
-   */
-  public function listJobsReports($jobId, $optParams = array())
-  {
-    $params = array('jobId' => $jobId);
-    $params = array_merge($params, $optParams);
-    return $this->call('list', array($params), "Google_Service_YouTubeReporting_ListReportsResponse");
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTubeReporting/Resource/Media.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTubeReporting/Resource/Media.php
deleted file mode 100644
index 9c9a947e..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTubeReporting/Resource/Media.php
+++ /dev/null
@@ -1,43 +0,0 @@
-
- *   $youtubereportingService = new Google_Service_YouTubeReporting(...);
- *   $media = $youtubereportingService->media;
- *  
- */
-class Google_Service_YouTubeReporting_Resource_Media extends Google_Service_Resource
-{
-  /**
-   * Method for media download. Download is supported on the URI
-   * `/v1/media/{+name}?alt=media`. (media.download)
-   *
-   * @param string $resourceName Name of the media that is being downloaded.  See
-   * ReadRequest.resource_name.
-   * @param array $optParams Optional parameters.
-   * @return Google_Service_YouTubeReporting_Media
-   */
-  public function download($resourceName, $optParams = array())
-  {
-    $params = array('resourceName' => $resourceName);
-    $params = array_merge($params, $optParams);
-    return $this->call('download', array($params), "Google_Service_YouTubeReporting_Media");
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTubeReporting/Resource/ReportTypes.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTubeReporting/Resource/ReportTypes.php
deleted file mode 100644
index 724db661..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTubeReporting/Resource/ReportTypes.php
+++ /dev/null
@@ -1,54 +0,0 @@
-
- *   $youtubereportingService = new Google_Service_YouTubeReporting(...);
- *   $reportTypes = $youtubereportingService->reportTypes;
- *  
- */
-class Google_Service_YouTubeReporting_Resource_ReportTypes extends Google_Service_Resource
-{
-  /**
-   * Lists report types. (reportTypes.listReportTypes)
-   *
-   * @param array $optParams Optional parameters.
-   *
-   * @opt_param string onBehalfOfContentOwner The content owner's external ID on
-   * which behalf the user is acting on. If not set, the user is acting for
-   * himself (his own channel).
-   * @opt_param string pageToken A token identifying a page of results the server
-   * should return. Typically, this is the value of
-   * ListReportTypesResponse.next_page_token returned in response to the previous
-   * call to the `ListReportTypes` method.
-   * @opt_param bool includeSystemManaged If set to true, also system-managed
-   * report types will be returned; otherwise only the report types that can be
-   * used to create new reporting jobs will be returned.
-   * @opt_param int pageSize Requested page size. Server may return fewer report
-   * types than requested. If unspecified, server will pick an appropriate
-   * default.
-   * @return Google_Service_YouTubeReporting_ListReportTypesResponse
-   */
-  public function listReportTypes($optParams = array())
-  {
-    $params = array();
-    $params = array_merge($params, $optParams);
-    return $this->call('list', array($params), "Google_Service_YouTubeReporting_ListReportTypesResponse");
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTubeReporting/YoutubereportingEmpty.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTubeReporting/YoutubereportingEmpty.php
deleted file mode 100644
index 9ca9fbbe..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/src/Google/Service/YouTubeReporting/YoutubereportingEmpty.php
+++ /dev/null
@@ -1,20 +0,0 @@
-getMock('Google_Service');
-    $this->getMock('Google_Model');
-    $this->getMock('Google_Collection');
-    $this->getMock('Google_Service_Resource');
-  }
-  /**
-   * @dataProvider serviceProvider
-   */
-  public function testIncludes($class)
-  {
-    $this->assertTrue(
-        class_exists($class),
-        sprintf('Failed asserting class %s exists.', $class)
-    );
-  }
-
-  public function serviceProvider()
-  {
-    $classes = array();
-    $path = __DIR__ . '/../src/Google/Service/';
-    foreach (glob($path . "*.php") as $file) {
-      $service = basename($file, '.php');
-      $classes[] = array('Google_Service_' . $service);
-      foreach (glob($path . "{$service}/*.php") as $file) {
-        $classes[] = array("Google_Service_{$service}_" . basename($file, '.php'));
-      }
-      foreach (glob($path . "{$service}/Resource/*.php") as $file) {
-        $classes[] = array("Google_Service_{$service}_Resource_" . basename($file, '.php'));
-      }
-    }
-
-    return $classes;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient-services/tests/bootstrap.php b/mayor-orig/www/include/share/googleapi/google/apiclient-services/tests/bootstrap.php
deleted file mode 100644
index e15933af..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient-services/tests/bootstrap.php
+++ /dev/null
@@ -1,3 +0,0 @@
-setApplicationName("Client_Library_Examples");
-$client->setDeveloperKey("YOUR_APP_KEY");
-
-$service = new Google_Service_Books($client);
-$optParams = array('filter' => 'free-ebooks');
-$results = $service->volumes->listVolumes('Henry David Thoreau', $optParams);
-
-foreach ($results as $item) {
-  echo $item['volumeInfo']['title'], "
 \n";
-}
-```
-
-### Authentication with OAuth ###
-
-> An example of this can be seen in [`examples/simple-file-upload.php`](examples/simple-file-upload.php).
-
-1. Follow the instructions to [Create Web Application Credentials](https://developers.google.com/api-client-library/php/auth/web-app#creatingcred)
-1. Download the JSON credentials
-1. Set the path to these credentials using `Google_Client::setAuthConfig`:
-
-    ```php
-    $client = new Google_Client();
-    $client->setAuthConfig('/path/to/client_credentials.json');
-    ```
-
-1. Set the scopes required for the API you are going to call
-
-    ```php
-    $client->addScope(Google_Service_Drive::DRIVE);
-    ```
-
-1. Set your application's redirect URI
-
-    ```php
-    // Your redirect URI can be any registered URI, but in this example
-    // we redirect back to this same page
-    $redirect_uri = 'http://' . $_SERVER['HTTP_HOST'] . $_SERVER['PHP_SELF'];
-    $client->setRedirectUri($redirect_uri);
-    ```
-
-1. In the script handling the redirect URI, exchange the authorization code for an access token:
-
-    ```php
-    if (isset($_GET['code'])) {
-        $token = $client->fetchAccessTokenWithAuthCode($_GET['code']);
-        $client->setAccessToken($token);
-    }
-    ```
-
-### Authentication with Service Accounts ###
-
-> An example of this can be seen in [`examples/service-account.php`](examples/service-account.php).
-
-1. Follow the instructions to [Create a Service Account](https://developers.google.com/api-client-library/php/auth/service-accounts#creatinganaccount)
-1. Download the JSON credentials
-1. Set the path to these credentials using the `GOOGLE_APPLICATION_CREDENTIALS` environment variable:
-
-    ```php
-    putenv('GOOGLE_APPLICATION_CREDENTIALS=/path/to/service-account.json');
-    ```
-
-1. Tell the Google client to use your service account credentials to authenticate:
-
-    ```php
-    $client = new Google_Client();
-    $client->useApplicationDefaultCredentials();
-    ```
-
-1. Set the scopes required for the API you are going to call
-
-    ```php
-    $client->addScope(Google_Service_Drive::DRIVE);
-    ```
-
-1. If you have delegated domain-wide access to the service account and you want to impersonate a user account, specify the email address of the user account using the method setSubject:
-
-    ```php
-    $client->setSubject($user_to_impersonate);
-    ```
-
-### Making Requests ###
-
-The classes used to call the API in [google-api-php-client-services](https://github.com/Google/google-api-php-client-services) are autogenerated. They map directly to the JSON requests and responses found in the [APIs Explorer](https://developers.google.com/apis-explorer/#p/).
-
-A JSON request to the [Datastore API](https://developers.google.com/apis-explorer/#p/datastore/v1beta3/datastore.projects.runQuery) would look like this:
-
-```json
-POST https://datastore.googleapis.com/v1beta3/projects/YOUR_PROJECT_ID:runQuery?key=YOUR_API_KEY
-
-{
-    "query": {
-        "kind": [{
-            "name": "Book"
-        }],
-        "order": [{
-            "property": {
-                "name": "title"
-            },
-            "direction": "descending"
-        }],
-        "limit": 10
-    }
-}
-```
-
-Using this library, the same call would look something like this:
-
-```php
-// create the datastore service class
-$datastore = new Google_Service_Datastore($client);
-
-// build the query - this maps directly to the JSON
-$query = new Google_Service_Datastore_Query([
-    'kind' => [
-        [
-            'name' => 'Book',
-        ],
-    ],
-    'order' => [
-        'property' => [
-            'name' => 'title',
-        ],
-        'direction' => 'descending',
-    ],
-    'limit' => 10,
-]);
-
-// build the request and response
-$request = new Google_Service_Datastore_RunQueryRequest(['query' => $query]);
-$response = $datastore->projects->runQuery('YOUR_DATASET_ID', $request);
-```
-
-However, as each property of the JSON API has a corresponding generated class, the above code could also be written like this:
-
-```php
-// create the datastore service class
-$datastore = new Google_Service_Datastore($client);
-
-// build the query
-$request = new Google_Service_Datastore_RunQueryRequest();
-$query = new Google_Service_Datastore_Query();
-//   - set the order
-$order = new Google_Service_Datastore_PropertyOrder();
-$order->setDirection('descending');
-$property = new Google_Service_Datastore_PropertyReference();
-$property->setName('title');
-$order->setProperty($property);
-$query->setOrder([$order]);
-//   - set the kinds
-$kind = new Google_Service_Datastore_KindExpression();
-$kind->setName('Book');
-$query->setKinds([$kind]);
-//   - set the limit
-$query->setLimit(10);
-
-// add the query to the request and make the request
-$request->setQuery($query);
-$response = $datastore->projects->runQuery('YOUR_DATASET_ID', $request);
-```
-
-The method used is a matter of preference, but *it will be very difficult to use this library without first understanding the JSON syntax for the API*, so it is recommended to look at the [APIs Explorer](https://developers.google.com/apis-explorer/#p/) before using any of the services here.
-
-### Making HTTP Requests Directly ###
-
-If Google Authentication is desired for external applications, or a Google API is not available yet in this library, HTTP requests can be made directly.
-
-The `authorize` method returns an authorized [Guzzle Client](http://docs.guzzlephp.org/), so any request made using the client will contain the corresponding authorization.
-
-```php
-// create the Google client
-$client = new Google_Client();
-
-/**
- * Set your method for authentication. Depending on the API, This could be
- * directly with an access token, API key, or (recommended) using
- * Application Default Credentials.
- */
-$client->useApplicationDefaultCredentials();
-$client->addScope(Google_Service_Plus::PLUS_ME);
-
-// returns a Guzzle HTTP Client
-$httpClient = $client->authorize();
-
-// make an HTTP request
-$response = $httpClient->get('https://www.googleapis.com/plus/v1/people/me');
-```
-
-### Caching ###
-
-It is recommended to use another caching library to improve performance. This can be done by passing a [PSR-6](http://www.php-fig.org/psr/psr-6/) compatible library to the client:
-
-```php
-$cache = new Stash\Pool(new Stash\Driver\FileSystem);
-$client->setCache($cache);
-```
-
-In this example we use [StashPHP](http://www.stashphp.com/). Add this to your project with composer:
-
-```
-composer require tedivm/stash
-```
-
-### Updating Tokens ###
-
-When using [Refresh Tokens](https://developers.google.com/identity/protocols/OAuth2InstalledApp#refresh) or [Service Account Credentials](https://developers.google.com/identity/protocols/OAuth2ServiceAccount#overview), it may be useful to perform some action when a new access token is granted. To do this, pass a callable to the `setTokenCallback` method on the client:
-
-```php
-$logger = new Monolog\Logger;
-$tokenCallback = function ($cacheKey, $accessToken) use ($logger) {
-  $logger->debug(sprintf('new access token received at cache key %s', $cacheKey));
-};
-$client->setTokenCallback($tokenCallback);
-```
-
-### Debugging Your HTTP Request using Charles ###
-
-It is often very useful to debug your API calls by viewing the raw HTTP request. This library supports the use of [Charles Web Proxy](https://www.charlesproxy.com/documentation/getting-started/). Download and run Charles, and then capture all HTTP traffic through Charles with the following code:
-
-```php
-// FOR DEBUGGING ONLY
-$httpClient = new GuzzleHttp\Client([
-    'proxy' => 'localhost:8888', // by default, Charles runs on localhost port 8888
-    'verify' => false, // otherwise HTTPS requests will fail.
-]);
-
-$client = new Google_Client();
-$client->setHttpClient($httpClient);
-```
-
-Now all calls made by this library will appear in the Charles UI.
-
-One additional step is required in Charles to view SSL requests. Go to **Charles > Proxy > SSL Proxying Settings** and add the domain you'd like captured. In the case of the Google APIs, this is usually `*.googleapis.com`.
-
-### Service Specific Examples ###
-
-YouTube: https://github.com/youtube/api-samples/tree/master/php
-
-## How Do I Contribute? ##
-
-Please see the [contributing](CONTRIBUTING.md) page for more information. In particular, we love pull requests - but please make sure to sign the [contributor license agreement](https://developers.google.com/api-client-library/php/contribute).
-
-## Frequently Asked Questions ##
-
-### What do I do if something isn't working? ###
-
-For support with the library the best place to ask is via the google-api-php-client tag on StackOverflow: http://stackoverflow.com/questions/tagged/google-api-php-client
-
-If there is a specific bug with the library, please [file a issue](https://github.com/google/google-api-php-client/issues) in the Github issues tracker, including an example of the failing code and any specific errors retrieved. Feature requests can also be filed, as long as they are core library requests, and not-API specific: for those, refer to the documentation for the individual APIs for the best place to file requests. Please try to provide a clear statement of the problem that the feature would address.
-
-### I want an example of X! ###
-
-If X is a feature of the library, file away! If X is an example of using a specific service, the best place to go is to the teams for those specific APIs - our preference is to link to their examples rather than add them to the library, as they can then pin to specific versions of the library. If you have any examples for other APIs, let us know and we will happily add a link to the README above!
-
-### Why do you still support 5.2? ###
-
-When we started working on the 1.0.0 branch we knew there were several fundamental issues to fix with the 0.6 releases of the library. At that time we looked at the usage of the library, and other related projects, and determined that there was still a large and active base of PHP 5.2 installs. You can see this in statistics such as the PHP versions chart in the WordPress stats: http://wordpress.org/about/stats/. We will keep looking at the types of usage we see, and try to take advantage of newer PHP features where possible.
-
-### Why does Google_..._Service have weird names? ###
-
-The _Service classes are generally automatically generated from the API discovery documents: https://developers.google.com/discovery/. Sometimes new features are added to APIs with unusual names, which can cause some unexpected or non-standard style naming in the PHP classes.
-
-### How do I deal with non-JSON response types? ###
-
-Some services return XML or similar by default, rather than JSON, which is what the library supports. You can request a JSON response by adding an 'alt' argument to optional params that is normally the last argument to a method call:
-
-```
-$opt_params = array(
-  'alt' => "json"
-);
-```
-
-### How do I set a field to null? ###
-
-The library strips out nulls from the objects sent to the Google APIs as its the default value of all of the uninitialized properties. To work around this, set the field you want to null to `Google_Model::NULL_VALUE`. This is a placeholder that will be replaced with a true null when sent over the wire.
-
-## Code Quality ##
-
-Run the PHPUnit tests with PHPUnit. You can configure an API key and token in BaseTest.php to run all calls, but this will require some setup on the Google Developer Console.
-
-    phpunit tests/
-
-### Coding Style
-
-To check for coding style violations, run
-
-```
-vendor/bin/phpcs src --standard=style/ruleset.xml -np
-```
-
-To automatically fix (fixable) coding style violations, run
-
-```
-vendor/bin/phpcbf src --standard=style/ruleset.xml
-```
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient/composer.json b/mayor-orig/www/include/share/googleapi/google/apiclient/composer.json
deleted file mode 100644
index 3f0619c1..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient/composer.json
+++ /dev/null
@@ -1,41 +0,0 @@
-{
-    "name": "google/apiclient",
-    "type": "library",
-    "description": "Client library for Google APIs",
-    "keywords": ["google"],
-    "homepage": "http://developers.google.com/api-client-library/php",
-    "license": "Apache-2.0",
-    "require": {
-        "php": ">=5.4",
-        "google/auth": "^0.11",
-        "google/apiclient-services": "^0.11",
-        "firebase/php-jwt": "~2.0|~3.0|~4.0",
-        "monolog/monolog": "^1.17",
-        "phpseclib/phpseclib": "~0.3.10|~2.0",
-        "guzzlehttp/guzzle": "~5.2|~6.0",
-        "guzzlehttp/psr7": "^1.2"
-    },
-    "require-dev": {
-        "phpunit/phpunit": "~4",
-        "squizlabs/php_codesniffer": "~2.3",
-        "symfony/dom-crawler": "~2.1",
-        "symfony/css-selector": "~2.1",
-        "cache/filesystem-adapter": "^0.3.2"
-    },
-    "suggest": {
-        "cache/filesystem-adapter": "For caching certs and tokens (using Google_Client::setCache)"
-    },
-    "autoload": {
-        "psr-0": {
-            "Google_": "src/"
-        },
-        "classmap": [
-            "src/Google/Service/"
-        ]
-    },
-    "extra": {
-        "branch-alias": {
-            "dev-master": "2.x-dev"
-        }
-    }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient/src/Google/AccessToken/Revoke.php b/mayor-orig/www/include/share/googleapi/google/apiclient/src/Google/AccessToken/Revoke.php
deleted file mode 100644
index 29eb3fb3..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient/src/Google/AccessToken/Revoke.php
+++ /dev/null
@@ -1,78 +0,0 @@
-http = $http;
-  }
-
-  /**
-   * Revoke an OAuth2 access token or refresh token. This method will revoke the current access
-   * token, if a token isn't provided.
-   *
-   * @param string|array $token The token (access token or a refresh token) that should be revoked.
-   * @return boolean Returns True if the revocation was successful, otherwise False.
-   */
-  public function revokeToken($token)
-  {
-    if (is_array($token)) {
-      if (isset($token['refresh_token'])) {
-        $token = $token['refresh_token'];
-      } else {
-        $token = $token['access_token'];
-      }
-    }
-
-    $body = Psr7\stream_for(http_build_query(array('token' => $token)));
-    $request = new Request(
-        'POST',
-        Google_Client::OAUTH2_REVOKE_URI,
-        [
-          'Cache-Control' => 'no-store',
-          'Content-Type'  => 'application/x-www-form-urlencoded',
-        ],
-        $body
-    );
-
-    $httpHandler = HttpHandlerFactory::build($this->http);
-
-    $response = $httpHandler($request);
-
-    return $response->getStatusCode() == 200;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient/src/Google/AccessToken/Verify.php b/mayor-orig/www/include/share/googleapi/google/apiclient/src/Google/AccessToken/Verify.php
deleted file mode 100644
index 748aa3df..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient/src/Google/AccessToken/Verify.php
+++ /dev/null
@@ -1,269 +0,0 @@
-http = $http;
-    $this->cache = $cache;
-    $this->jwt = $jwt ?: $this->getJwtService();
-  }
-
-  /**
-   * Verifies an id token and returns the authenticated apiLoginTicket.
-   * Throws an exception if the id token is not valid.
-   * The audience parameter can be used to control which id tokens are
-   * accepted.  By default, the id token must have been issued to this OAuth2 client.
-   *
-   * @param $audience
-   * @return array the token payload, if successful
-   */
-  public function verifyIdToken($idToken, $audience = null)
-  {
-    if (empty($idToken)) {
-      throw new LogicException('id_token cannot be null');
-    }
-
-    // set phpseclib constants if applicable
-    $this->setPhpsecConstants();
-
-    // Check signature
-    $certs = $this->getFederatedSignOnCerts();
-    foreach ($certs as $cert) {
-      $bigIntClass = $this->getBigIntClass();
-      $rsaClass = $this->getRsaClass();
-      $modulus = new $bigIntClass($this->jwt->urlsafeB64Decode($cert['n']), 256);
-      $exponent = new $bigIntClass($this->jwt->urlsafeB64Decode($cert['e']), 256);
-
-      $rsa = new $rsaClass();
-      $rsa->loadKey(array('n' => $modulus, 'e' => $exponent));
-
-      try {
-        $payload = $this->jwt->decode(
-            $idToken,
-            $rsa->getPublicKey(),
-            array('RS256')
-        );
-
-        if (property_exists($payload, 'aud')) {
-          if ($audience && $payload->aud != $audience) {
-            return false;
-          }
-        }
-
-        // support HTTP and HTTPS issuers
-        // @see https://developers.google.com/identity/sign-in/web/backend-auth
-        $issuers = array(self::OAUTH2_ISSUER, self::OAUTH2_ISSUER_HTTPS);
-        if (!isset($payload->iss) || !in_array($payload->iss, $issuers)) {
-          return false;
-        }
-
-        return (array) $payload;
-      } catch (ExpiredException $e) {
-        return false;
-      } catch (ExpiredExceptionV3 $e) {
-        return false;
-      } catch (DomainException $e) {
-        // continue
-      }
-    }
-
-    return false;
-  }
-
-  private function getCache()
-  {
-    return $this->cache;
-  }
-
-  /**
-   * Retrieve and cache a certificates file.
-   *
-   * @param $url string location
-   * @throws Google_Exception
-   * @return array certificates
-   */
-  private function retrieveCertsFromLocation($url)
-  {
-    // If we're retrieving a local file, just grab it.
-    if (0 !== strpos($url, 'http')) {
-      if (!$file = file_get_contents($url)) {
-        throw new Google_Exception(
-            "Failed to retrieve verification certificates: '" .
-            $url . "'."
-        );
-      }
-
-      return json_decode($file, true);
-    }
-
-    $response = $this->http->get($url);
-
-    if ($response->getStatusCode() == 200) {
-      return json_decode((string) $response->getBody(), true);
-    }
-    throw new Google_Exception(
-        sprintf(
-            'Failed to retrieve verification certificates: "%s".',
-            $response->getBody()->getContents()
-        ),
-        $response->getStatusCode()
-    );
-  }
-
-  // Gets federated sign-on certificates to use for verifying identity tokens.
-  // Returns certs as array structure, where keys are key ids, and values
-  // are PEM encoded certificates.
-  private function getFederatedSignOnCerts()
-  {
-    $certs = null;
-    if ($cache = $this->getCache()) {
-      $cacheItem = $cache->getItem('federated_signon_certs_v3', 3600);
-      $certs = $cacheItem->get();
-    }
-
-
-    if (!$certs) {
-      $certs = $this->retrieveCertsFromLocation(
-          self::FEDERATED_SIGNON_CERT_URL
-      );
-
-      if ($cache) {
-        $cacheItem->set($certs);
-        $cache->save($cacheItem);
-      }
-    }
-
-    if (!isset($certs['keys'])) {
-      throw new InvalidArgumentException(
-          'federated sign-on certs expects "keys" to be set'
-      );
-    }
-
-    return $certs['keys'];
-  }
-
-  private function getJwtService()
-  {
-    $jwtClass = 'JWT';
-    if (class_exists('\Firebase\JWT\JWT')) {
-      $jwtClass = 'Firebase\JWT\JWT';
-    }
-
-    if (property_exists($jwtClass, 'leeway')) {
-      // adds 1 second to JWT leeway
-      // @see https://github.com/google/google-api-php-client/issues/827
-      $jwtClass::$leeway = 1;
-    }
-
-    return new $jwtClass;
-  }
-
-  private function getRsaClass()
-  {
-    if (class_exists('phpseclib\Crypt\RSA')) {
-      return 'phpseclib\Crypt\RSA';
-    }
-
-    return 'Crypt_RSA';
-  }
-
-  private function getBigIntClass()
-  {
-    if (class_exists('phpseclib\Math\BigInteger')) {
-      return 'phpseclib\Math\BigInteger';
-    }
-
-    return 'Math_BigInteger';
-  }
-
-  private function getOpenSslConstant()
-  {
-    if (class_exists('phpseclib\Crypt\RSA')) {
-      return 'phpseclib\Crypt\RSA::MODE_OPENSSL';
-    }
-
-    if (class_exists('Crypt_RSA')) {
-      return 'CRYPT_RSA_MODE_OPENSSL';
-    }
-
-    throw new \Exception('Cannot find RSA class');
-  }
-
-  /**
-   * phpseclib calls "phpinfo" by default, which requires special
-   * whitelisting in the AppEngine VM environment. This function
-   * sets constants to bypass the need for phpseclib to check phpinfo
-   *
-   * @see phpseclib/Math/BigInteger
-   * @see https://github.com/GoogleCloudPlatform/getting-started-php/issues/85
-   */
-  private function setPhpsecConstants()
-  {
-    if (filter_var(getenv('GAE_VM'), FILTER_VALIDATE_BOOLEAN)) {
-      if (!defined('MATH_BIGINTEGER_OPENSSL_ENABLED')) {
-        define('MATH_BIGINTEGER_OPENSSL_ENABLED', true);
-      }
-      if (!defined('CRYPT_RSA_MODE')) {
-        define('CRYPT_RSA_MODE', constant($this->getOpenSslConstant()));
-      }
-    }
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient/src/Google/AuthHandler/AuthHandlerFactory.php b/mayor-orig/www/include/share/googleapi/google/apiclient/src/Google/AuthHandler/AuthHandlerFactory.php
deleted file mode 100644
index f1a3229a..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient/src/Google/AuthHandler/AuthHandlerFactory.php
+++ /dev/null
@@ -1,42 +0,0 @@
-cache = $cache;
-    $this->cacheConfig = $cacheConfig;
-  }
-
-  public function attachCredentials(
-      ClientInterface $http,
-      CredentialsLoader $credentials,
-      callable $tokenCallback = null
-  ) {
-    // use the provided cache
-    if ($this->cache) {
-      $credentials = new FetchAuthTokenCache(
-          $credentials,
-          $this->cacheConfig,
-          $this->cache
-      );
-    }
-    // if we end up needing to make an HTTP request to retrieve credentials, we
-    // can use our existing one, but we need to throw exceptions so the error
-    // bubbles up.
-    $authHttp = $this->createAuthHttp($http);
-    $authHttpHandler = HttpHandlerFactory::build($authHttp);
-    $subscriber = new AuthTokenSubscriber(
-        $credentials,
-        $authHttpHandler,
-        $tokenCallback
-    );
-
-    $http->setDefaultOption('auth', 'google_auth');
-    $http->getEmitter()->attach($subscriber);
-
-    return $http;
-  }
-
-  public function attachToken(ClientInterface $http, array $token, array $scopes)
-  {
-    $tokenFunc = function ($scopes) use ($token) {
-      return $token['access_token'];
-    };
-
-    $subscriber = new ScopedAccessTokenSubscriber(
-        $tokenFunc,
-        $scopes,
-        $this->cacheConfig,
-        $this->cache
-    );
-
-    $http->setDefaultOption('auth', 'scoped');
-    $http->getEmitter()->attach($subscriber);
-
-    return $http;
-  }
-
-  public function attachKey(ClientInterface $http, $key)
-  {
-    $subscriber = new SimpleSubscriber(['key' => $key]);
-
-    $http->setDefaultOption('auth', 'simple');
-    $http->getEmitter()->attach($subscriber);
-
-    return $http;
-  }
-
-  private function createAuthHttp(ClientInterface $http)
-  {
-    return new Client(
-        [
-          'base_url' => $http->getBaseUrl(),
-          'defaults' => [
-            'exceptions' => true,
-            'verify' => $http->getDefaultOption('verify'),
-            'proxy' => $http->getDefaultOption('proxy'),
-          ]
-        ]
-    );
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient/src/Google/AuthHandler/Guzzle6AuthHandler.php b/mayor-orig/www/include/share/googleapi/google/apiclient/src/Google/AuthHandler/Guzzle6AuthHandler.php
deleted file mode 100644
index fcdfb3b0..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient/src/Google/AuthHandler/Guzzle6AuthHandler.php
+++ /dev/null
@@ -1,106 +0,0 @@
-cache = $cache;
-    $this->cacheConfig = $cacheConfig;
-  }
-
-  public function attachCredentials(
-      ClientInterface $http,
-      CredentialsLoader $credentials,
-      callable $tokenCallback = null
-  ) {
-    // use the provided cache
-    if ($this->cache) {
-      $credentials = new FetchAuthTokenCache(
-          $credentials,
-          $this->cacheConfig,
-          $this->cache
-      );
-    }
-    // if we end up needing to make an HTTP request to retrieve credentials, we
-    // can use our existing one, but we need to throw exceptions so the error
-    // bubbles up.
-    $authHttp = $this->createAuthHttp($http);
-    $authHttpHandler = HttpHandlerFactory::build($authHttp);
-    $middleware = new AuthTokenMiddleware(
-        $credentials,
-        $authHttpHandler,
-        $tokenCallback
-    );
-
-    $config = $http->getConfig();
-    $config['handler']->remove('google_auth');
-    $config['handler']->push($middleware, 'google_auth');
-    $config['auth'] = 'google_auth';
-    $http = new Client($config);
-
-    return $http;
-  }
-
-  public function attachToken(ClientInterface $http, array $token, array $scopes)
-  {
-    $tokenFunc = function ($scopes) use ($token) {
-      return $token['access_token'];
-    };
-
-    $middleware = new ScopedAccessTokenMiddleware(
-        $tokenFunc,
-        $scopes,
-        $this->cacheConfig,
-        $this->cache
-    );
-
-    $config = $http->getConfig();
-    $config['handler']->remove('google_auth');
-    $config['handler']->push($middleware, 'google_auth');
-    $config['auth'] = 'scoped';
-    $http = new Client($config);
-
-    return $http;
-  }
-
-  public function attachKey(ClientInterface $http, $key)
-  {
-    $middleware = new SimpleMiddleware(['key' => $key]);
-
-    $config = $http->getConfig();
-    $config['handler']->remove('google_auth');
-    $config['handler']->push($middleware, 'google_auth');
-    $config['auth'] = 'simple';
-    $http = new Client($config);
-
-    return $http;
-  }
-
-  private function createAuthHttp(ClientInterface $http)
-  {
-    return new Client(
-        [
-          'base_uri' => $http->getConfig('base_uri'),
-          'exceptions' => true,
-          'verify' => $http->getConfig('verify'),
-          'proxy' => $http->getConfig('proxy'),
-        ]
-    );
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient/src/Google/Client.php b/mayor-orig/www/include/share/googleapi/google/apiclient/src/Google/Client.php
deleted file mode 100644
index 2fb29578..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient/src/Google/Client.php
+++ /dev/null
@@ -1,1118 +0,0 @@
-config = array_merge(
-        [
-          'application_name' => '',
-
-          // Don't change these unless you're working against a special development
-          // or testing environment.
-          'base_path' => self::API_BASE_PATH,
-
-          // https://developers.google.com/console
-          'client_id' => '',
-          'client_secret' => '',
-          'redirect_uri' => null,
-          'state' => null,
-
-          // Simple API access key, also from the API console. Ensure you get
-          // a Server key, and not a Browser key.
-          'developer_key' => '',
-
-          // For use with Google Cloud Platform
-          // fetch the ApplicationDefaultCredentials, if applicable
-          // @see https://developers.google.com/identity/protocols/application-default-credentials
-          'use_application_default_credentials' => false,
-          'signing_key' => null,
-          'signing_algorithm' => null,
-          'subject' => null,
-
-          // Other OAuth2 parameters.
-          'hd' => '',
-          'prompt' => '',
-          'openid.realm' => '',
-          'include_granted_scopes' => null,
-          'login_hint' => '',
-          'request_visible_actions' => '',
-          'access_type' => 'online',
-          'approval_prompt' => 'auto',
-
-          // Task Runner retry configuration
-          // @see Google_Task_Runner
-          'retry' => array(),
-
-          // cache config for downstream auth caching
-          'cache_config' => [],
-
-          // function to be called when an access token is fetched
-          // follows the signature function ($cacheKey, $accessToken)
-          'token_callback' => null,
-
-          // Service class used in Google_Client::verifyIdToken.
-          // Explicitly pass this in to avoid setting JWT::$leeway
-          'jwt' => null,
-        ],
-        $config
-    );
-  }
-
-  /**
-   * Get a string containing the version of the library.
-   *
-   * @return string
-   */
-  public function getLibraryVersion()
-  {
-    return self::LIBVER;
-  }
-
-  /**
-   * For backwards compatibility
-   * alias for fetchAccessTokenWithAuthCode
-   *
-   * @param $code string code from accounts.google.com
-   * @return array access token
-   * @deprecated
-   */
-  public function authenticate($code)
-  {
-    return $this->fetchAccessTokenWithAuthCode($code);
-  }
-
-  /**
-   * Attempt to exchange a code for an valid authentication token.
-   * Helper wrapped around the OAuth 2.0 implementation.
-   *
-   * @param $code string code from accounts.google.com
-   * @return array access token
-   */
-  public function fetchAccessTokenWithAuthCode($code)
-  {
-    if (strlen($code) == 0) {
-      throw new InvalidArgumentException("Invalid code");
-    }
-
-    $auth = $this->getOAuth2Service();
-    $auth->setCode($code);
-    $auth->setRedirectUri($this->getRedirectUri());
-
-    $httpHandler = HttpHandlerFactory::build($this->getHttpClient());
-    $creds = $auth->fetchAuthToken($httpHandler);
-    if ($creds && isset($creds['access_token'])) {
-      $creds['created'] = time();
-      $this->setAccessToken($creds);
-    }
-
-    return $creds;
-  }
-
-  /**
-   * For backwards compatibility
-   * alias for fetchAccessTokenWithAssertion
-   *
-   * @return array access token
-   * @deprecated
-   */
-  public function refreshTokenWithAssertion()
-  {
-    return $this->fetchAccessTokenWithAssertion();
-  }
-
-  /**
-   * Fetches a fresh access token with a given assertion token.
-   * @param $assertionCredentials optional.
-   * @return array access token
-   */
-  public function fetchAccessTokenWithAssertion(ClientInterface $authHttp = null)
-  {
-    if (!$this->isUsingApplicationDefaultCredentials()) {
-      throw new DomainException(
-          'set the JSON service account credentials using'
-          . ' Google_Client::setAuthConfig or set the path to your JSON file'
-          . ' with the "GOOGLE_APPLICATION_CREDENTIALS" environment variable'
-          . ' and call Google_Client::useApplicationDefaultCredentials to'
-          . ' refresh a token with assertion.'
-      );
-    }
-
-    $this->getLogger()->log(
-        'info',
-        'OAuth2 access token refresh with Signed JWT assertion grants.'
-    );
-
-    $credentials = $this->createApplicationDefaultCredentials();
-
-    $httpHandler = HttpHandlerFactory::build($authHttp);
-    $creds = $credentials->fetchAuthToken($httpHandler);
-    if ($creds && isset($creds['access_token'])) {
-      $creds['created'] = time();
-      $this->setAccessToken($creds);
-    }
-
-    return $creds;
-  }
-
-  /**
-   * For backwards compatibility
-   * alias for fetchAccessTokenWithRefreshToken
-   *
-   * @param string $refreshToken
-   * @return array access token
-   */
-  public function refreshToken($refreshToken)
-  {
-    return $this->fetchAccessTokenWithRefreshToken($refreshToken);
-  }
-
-  /**
-   * Fetches a fresh OAuth 2.0 access token with the given refresh token.
-   * @param string $refreshToken
-   * @return array access token
-   */
-  public function fetchAccessTokenWithRefreshToken($refreshToken = null)
-  {
-    if (null === $refreshToken) {
-      if (!isset($this->token['refresh_token'])) {
-        throw new LogicException(
-            'refresh token must be passed in or set as part of setAccessToken'
-        );
-      }
-      $refreshToken = $this->token['refresh_token'];
-    }
-    $this->getLogger()->info('OAuth2 access token refresh');
-    $auth = $this->getOAuth2Service();
-    $auth->setRefreshToken($refreshToken);
-
-    $httpHandler = HttpHandlerFactory::build($this->getHttpClient());
-    $creds = $auth->fetchAuthToken($httpHandler);
-    if ($creds && isset($creds['access_token'])) {
-      $creds['created'] = time();
-      if (!isset($creds['refresh_token'])) {
-        $creds['refresh_token'] = $refreshToken;
-      }
-      $this->setAccessToken($creds);
-    }
-
-    return $creds;
-  }
-
-  /**
-   * Create a URL to obtain user authorization.
-   * The authorization endpoint allows the user to first
-   * authenticate, and then grant/deny the access request.
-   * @param string|array $scope The scope is expressed as an array or list of space-delimited strings.
-   * @return string
-   */
-  public function createAuthUrl($scope = null)
-  {
-    if (empty($scope)) {
-      $scope = $this->prepareScopes();
-    }
-    if (is_array($scope)) {
-      $scope = implode(' ', $scope);
-    }
-
-    // only accept one of prompt or approval_prompt
-    $approvalPrompt = $this->config['prompt']
-      ? null
-      : $this->config['approval_prompt'];
-
-    // include_granted_scopes should be string "true", string "false", or null
-    $includeGrantedScopes = $this->config['include_granted_scopes'] === null
-      ? null
-      : var_export($this->config['include_granted_scopes'], true);
-
-    $params = array_filter(
-        [
-          'access_type' => $this->config['access_type'],
-          'approval_prompt' => $approvalPrompt,
-          'hd' => $this->config['hd'],
-          'include_granted_scopes' => $includeGrantedScopes,
-          'login_hint' => $this->config['login_hint'],
-          'openid.realm' => $this->config['openid.realm'],
-          'prompt' => $this->config['prompt'],
-          'response_type' => 'code',
-          'scope' => $scope,
-          'state' => $this->config['state'],
-        ]
-    );
-
-    // If the list of scopes contains plus.login, add request_visible_actions
-    // to auth URL.
-    $rva = $this->config['request_visible_actions'];
-    if (strlen($rva) > 0 && false !== strpos($scope, 'plus.login')) {
-        $params['request_visible_actions'] = $rva;
-    }
-
-    $auth = $this->getOAuth2Service();
-
-    return (string) $auth->buildFullAuthorizationUri($params);
-  }
-
-  /**
-   * Adds auth listeners to the HTTP client based on the credentials
-   * set in the Google API Client object
-   *
-   * @param GuzzleHttp\ClientInterface $http the http client object.
-   * @return GuzzleHttp\ClientInterface the http client object
-   */
-  public function authorize(ClientInterface $http = null)
-  {
-    $credentials = null;
-    $token = null;
-    $scopes = null;
-    if (null === $http) {
-      $http = $this->getHttpClient();
-    }
-
-    // These conditionals represent the decision tree for authentication
-    //   1.  Check for Application Default Credentials
-    //   2.  Check for API Key
-    //   3a. Check for an Access Token
-    //   3b. If access token exists but is expired, try to refresh it
-    if ($this->isUsingApplicationDefaultCredentials()) {
-      $credentials = $this->createApplicationDefaultCredentials();
-    } elseif ($token = $this->getAccessToken()) {
-      $scopes = $this->prepareScopes();
-      // add refresh subscriber to request a new token
-      if (isset($token['refresh_token']) && $this->isAccessTokenExpired()) {
-        $credentials = $this->createUserRefreshCredentials(
-            $scopes,
-            $token['refresh_token']
-        );
-      }
-    }
-
-    $authHandler = $this->getAuthHandler();
-
-    if ($credentials) {
-      $callback = $this->config['token_callback'];
-      $http = $authHandler->attachCredentials($http, $credentials, $callback);
-    } elseif ($token) {
-      $http = $authHandler->attachToken($http, $token, (array) $scopes);
-    } elseif ($key = $this->config['developer_key']) {
-      $http = $authHandler->attachKey($http, $key);
-    }
-
-    return $http;
-  }
-
-  /**
-   * Set the configuration to use application default credentials for
-   * authentication
-   *
-   * @see https://developers.google.com/identity/protocols/application-default-credentials
-   * @param boolean $useAppCreds
-   */
-  public function useApplicationDefaultCredentials($useAppCreds = true)
-  {
-    $this->config['use_application_default_credentials'] = $useAppCreds;
-  }
-
-  /**
-   * To prevent useApplicationDefaultCredentials from inappropriately being
-   * called in a conditional
-   *
-   * @see https://developers.google.com/identity/protocols/application-default-credentials
-   */
-  public function isUsingApplicationDefaultCredentials()
-  {
-    return $this->config['use_application_default_credentials'];
-  }
-
-  /**
-   * @param string|array $token
-   * @throws InvalidArgumentException
-   */
-  public function setAccessToken($token)
-  {
-    if (is_string($token)) {
-      if ($json = json_decode($token, true)) {
-        $token = $json;
-      } else {
-        // assume $token is just the token string
-        $token = array(
-          'access_token' => $token,
-        );
-      }
-    }
-    if ($token == null) {
-      throw new InvalidArgumentException('invalid json token');
-    }
-    if (!isset($token['access_token'])) {
-      throw new InvalidArgumentException("Invalid token format");
-    }
-    $this->token = $token;
-  }
-
-  public function getAccessToken()
-  {
-    return $this->token;
-  }
-
-  public function getRefreshToken()
-  {
-    if (isset($this->token['refresh_token'])) {
-      return $this->token['refresh_token'];
-    }
-  }
-
-  /**
-   * Returns if the access_token is expired.
-   * @return bool Returns True if the access_token is expired.
-   */
-  public function isAccessTokenExpired()
-  {
-    if (!$this->token) {
-      return true;
-    }
-
-    $created = 0;
-    if (isset($this->token['created'])) {
-      $created = $this->token['created'];
-    } elseif (isset($this->token['id_token'])) {
-      // check the ID token for "iat"
-      // signature verification is not required here, as we are just
-      // using this for convenience to save a round trip request
-      // to the Google API server
-      $idToken = $this->token['id_token'];
-      if (substr_count($idToken, '.') == 2) {
-        $parts = explode('.', $idToken);
-        $payload = json_decode(base64_decode($parts[1]), true);
-        if ($payload && isset($payload['iat'])) {
-          $created = $payload['iat'];
-        }
-      }
-    }
-
-    // If the token is set to expire in the next 30 seconds.
-    return ($created + ($this->token['expires_in'] - 30)) < time();
-  }
-
-  public function getAuth()
-  {
-    throw new BadMethodCallException(
-        'This function no longer exists. See UPGRADING.md for more information'
-    );
-  }
-
-  public function setAuth($auth)
-  {
-    throw new BadMethodCallException(
-        'This function no longer exists. See UPGRADING.md for more information'
-    );
-  }
-
-  /**
-   * Set the OAuth 2.0 Client ID.
-   * @param string $clientId
-   */
-  public function setClientId($clientId)
-  {
-    $this->config['client_id'] = $clientId;
-  }
-
-  public function getClientId()
-  {
-    return $this->config['client_id'];
-  }
-
-  /**
-   * Set the OAuth 2.0 Client Secret.
-   * @param string $clientSecret
-   */
-  public function setClientSecret($clientSecret)
-  {
-    $this->config['client_secret'] = $clientSecret;
-  }
-
-  public function getClientSecret()
-  {
-    return $this->config['client_secret'];
-  }
-
-  /**
-   * Set the OAuth 2.0 Redirect URI.
-   * @param string $redirectUri
-   */
-  public function setRedirectUri($redirectUri)
-  {
-    $this->config['redirect_uri'] = $redirectUri;
-  }
-
-  public function getRedirectUri()
-  {
-    return $this->config['redirect_uri'];
-  }
-
-  /**
-   * Set OAuth 2.0 "state" parameter to achieve per-request customization.
-   * @see http://tools.ietf.org/html/draft-ietf-oauth-v2-22#section-3.1.2.2
-   * @param string $state
-   */
-  public function setState($state)
-  {
-    $this->config['state'] = $state;
-  }
-
-  /**
-   * @param string $accessType Possible values for access_type include:
-   *  {@code "offline"} to request offline access from the user.
-   *  {@code "online"} to request online access from the user.
-   */
-  public function setAccessType($accessType)
-  {
-    $this->config['access_type'] = $accessType;
-  }
-
-  /**
-   * @param string $approvalPrompt Possible values for approval_prompt include:
-   *  {@code "force"} to force the approval UI to appear.
-   *  {@code "auto"} to request auto-approval when possible. (This is the default value)
-   */
-  public function setApprovalPrompt($approvalPrompt)
-  {
-    $this->config['approval_prompt'] = $approvalPrompt;
-  }
-
-  /**
-   * Set the login hint, email address or sub id.
-   * @param string $loginHint
-   */
-  public function setLoginHint($loginHint)
-  {
-    $this->config['login_hint'] = $loginHint;
-  }
-
-  /**
-   * Set the application name, this is included in the User-Agent HTTP header.
-   * @param string $applicationName
-   */
-  public function setApplicationName($applicationName)
-  {
-    $this->config['application_name'] = $applicationName;
-  }
-
-  /**
-   * If 'plus.login' is included in the list of requested scopes, you can use
-   * this method to define types of app activities that your app will write.
-   * You can find a list of available types here:
-   * @link https://developers.google.com/+/api/moment-types
-   *
-   * @param array $requestVisibleActions Array of app activity types
-   */
-  public function setRequestVisibleActions($requestVisibleActions)
-  {
-    if (is_array($requestVisibleActions)) {
-      $requestVisibleActions = implode(" ", $requestVisibleActions);
-    }
-    $this->config['request_visible_actions'] = $requestVisibleActions;
-  }
-
-  /**
-   * Set the developer key to use, these are obtained through the API Console.
-   * @see http://code.google.com/apis/console-help/#generatingdevkeys
-   * @param string $developerKey
-   */
-  public function setDeveloperKey($developerKey)
-  {
-    $this->config['developer_key'] = $developerKey;
-  }
-
-  /**
-   * Set the hd (hosted domain) parameter streamlines the login process for
-   * Google Apps hosted accounts. By including the domain of the user, you
-   * restrict sign-in to accounts at that domain.
-   * @param $hd string - the domain to use.
-   */
-  public function setHostedDomain($hd)
-  {
-    $this->config['hd'] = $hd;
-  }
-
-  /**
-   * Set the prompt hint. Valid values are none, consent and select_account.
-   * If no value is specified and the user has not previously authorized
-   * access, then the user is shown a consent screen.
-   * @param $prompt string
-   */
-  public function setPrompt($prompt)
-  {
-    $this->config['prompt'] = $prompt;
-  }
-
-  /**
-   * openid.realm is a parameter from the OpenID 2.0 protocol, not from OAuth
-   * 2.0. It is used in OpenID 2.0 requests to signify the URL-space for which
-   * an authentication request is valid.
-   * @param $realm string - the URL-space to use.
-   */
-  public function setOpenidRealm($realm)
-  {
-    $this->config['openid.realm'] = $realm;
-  }
-
-  /**
-   * If this is provided with the value true, and the authorization request is
-   * granted, the authorization will include any previous authorizations
-   * granted to this user/application combination for other scopes.
-   * @param $include boolean - the URL-space to use.
-   */
-  public function setIncludeGrantedScopes($include)
-  {
-    $this->config['include_granted_scopes'] = $include;
-  }
-
-  /**
-   * sets function to be called when an access token is fetched
-   * @param callable $tokenCallback - function ($cacheKey, $accessToken)
-   */
-  public function setTokenCallback(callable $tokenCallback)
-  {
-    $this->config['token_callback'] = $tokenCallback;
-  }
-
-  /**
-   * Revoke an OAuth2 access token or refresh token. This method will revoke the current access
-   * token, if a token isn't provided.
-   *
-   * @param string|null $token The token (access token or a refresh token) that should be revoked.
-   * @return boolean Returns True if the revocation was successful, otherwise False.
-   */
-  public function revokeToken($token = null)
-  {
-    $tokenRevoker = new Google_AccessToken_Revoke(
-        $this->getHttpClient()
-    );
-
-    return $tokenRevoker->revokeToken($token ?: $this->getAccessToken());
-  }
-
-  /**
-   * Verify an id_token. This method will verify the current id_token, if one
-   * isn't provided.
-   *
-   * @throws LogicException
-   * @param string|null $idToken The token (id_token) that should be verified.
-   * @return array|false Returns the token payload as an array if the verification was
-   * successful, false otherwise.
-   */
-  public function verifyIdToken($idToken = null)
-  {
-    $tokenVerifier = new Google_AccessToken_Verify(
-        $this->getHttpClient(),
-        $this->getCache(),
-        $this->config['jwt']
-    );
-
-    if (null === $idToken) {
-      $token = $this->getAccessToken();
-      if (!isset($token['id_token'])) {
-        throw new LogicException(
-            'id_token must be passed in or set as part of setAccessToken'
-        );
-      }
-      $idToken = $token['id_token'];
-    }
-
-    return $tokenVerifier->verifyIdToken(
-        $idToken,
-        $this->getClientId()
-    );
-  }
-
-  /**
-   * Set the scopes to be requested. Must be called before createAuthUrl().
-   * Will remove any previously configured scopes.
-   * @param array $scopes, ie: array('https://www.googleapis.com/auth/plus.login',
-   * 'https://www.googleapis.com/auth/moderator')
-   */
-  public function setScopes($scopes)
-  {
-    $this->requestedScopes = array();
-    $this->addScope($scopes);
-  }
-
-  /**
-   * This functions adds a scope to be requested as part of the OAuth2.0 flow.
-   * Will append any scopes not previously requested to the scope parameter.
-   * A single string will be treated as a scope to request. An array of strings
-   * will each be appended.
-   * @param $scope_or_scopes string|array e.g. "profile"
-   */
-  public function addScope($scope_or_scopes)
-  {
-    if (is_string($scope_or_scopes) && !in_array($scope_or_scopes, $this->requestedScopes)) {
-      $this->requestedScopes[] = $scope_or_scopes;
-    } else if (is_array($scope_or_scopes)) {
-      foreach ($scope_or_scopes as $scope) {
-        $this->addScope($scope);
-      }
-    }
-  }
-
-  /**
-   * Returns the list of scopes requested by the client
-   * @return array the list of scopes
-   *
-   */
-  public function getScopes()
-  {
-     return $this->requestedScopes;
-  }
-
-  /**
-   * @return array
-   * @visible For Testing
-   */
-  public function prepareScopes()
-  {
-    if (empty($this->requestedScopes)) {
-      return null;
-    }
-
-    return implode(' ', $this->requestedScopes);
-  }
-
-  /**
-   * Helper method to execute deferred HTTP requests.
-   *
-   * @param $request Psr\Http\Message\RequestInterface|Google_Http_Batch
-   * @throws Google_Exception
-   * @return object of the type of the expected class or Psr\Http\Message\ResponseInterface.
-   */
-  public function execute(RequestInterface $request, $expectedClass = null)
-  {
-    $request = $request->withHeader(
-        'User-Agent',
-        $this->config['application_name']
-        . " " . self::USER_AGENT_SUFFIX
-        . $this->getLibraryVersion()
-    );
-
-    // call the authorize method
-    // this is where most of the grunt work is done
-    $http = $this->authorize();
-
-    return Google_Http_REST::execute($http, $request, $expectedClass, $this->config['retry']);
-  }
-
-  /**
-   * Declare whether batch calls should be used. This may increase throughput
-   * by making multiple requests in one connection.
-   *
-   * @param boolean $useBatch True if the batch support should
-   * be enabled. Defaults to False.
-   */
-  public function setUseBatch($useBatch)
-  {
-    // This is actually an alias for setDefer.
-    $this->setDefer($useBatch);
-  }
-
-  /**
-   * Are we running in Google AppEngine?
-   * return bool
-   */
-  public function isAppEngine()
-  {
-    return (isset($_SERVER['SERVER_SOFTWARE']) &&
-        strpos($_SERVER['SERVER_SOFTWARE'], 'Google App Engine') !== false);
-  }
-
-  public function setConfig($name, $value)
-  {
-    $this->config[$name] = $value;
-  }
-
-  public function getConfig($name, $default = null)
-  {
-    return isset($this->config[$name]) ? $this->config[$name] : $default;
-  }
-
-  /**
-   * For backwards compatibility
-   * alias for setAuthConfig
-   *
-   * @param string $file the configuration file
-   * @throws Google_Exception
-   * @deprecated
-   */
-  public function setAuthConfigFile($file)
-  {
-    $this->setAuthConfig($file);
-  }
-
-  /**
-   * Set the auth config from new or deprecated JSON config.
-   * This structure should match the file downloaded from
-   * the "Download JSON" button on in the Google Developer
-   * Console.
-   * @param string|array $config the configuration json
-   * @throws Google_Exception
-   */
-  public function setAuthConfig($config)
-  {
-    if (is_string($config)) {
-      if (!file_exists($config)) {
-        throw new InvalidArgumentException('file does not exist');
-      }
-
-      $json = file_get_contents($config);
-
-      if (!$config = json_decode($json, true)) {
-        throw new LogicException('invalid json for auth config');
-      }
-    }
-
-    $key = isset($config['installed']) ? 'installed' : 'web';
-    if (isset($config['type']) && $config['type'] == 'service_account') {
-      // application default credentials
-      $this->useApplicationDefaultCredentials();
-
-      // set the information from the config
-      $this->setClientId($config['client_id']);
-      $this->config['client_email'] = $config['client_email'];
-      $this->config['signing_key'] = $config['private_key'];
-      $this->config['signing_algorithm'] = 'HS256';
-    } elseif (isset($config[$key])) {
-      // old-style
-      $this->setClientId($config[$key]['client_id']);
-      $this->setClientSecret($config[$key]['client_secret']);
-      if (isset($config[$key]['redirect_uris'])) {
-        $this->setRedirectUri($config[$key]['redirect_uris'][0]);
-      }
-    } else {
-      // new-style
-      $this->setClientId($config['client_id']);
-      $this->setClientSecret($config['client_secret']);
-      if (isset($config['redirect_uris'])) {
-        $this->setRedirectUri($config['redirect_uris'][0]);
-      }
-    }
-  }
-
-  /**
-   * Use when the service account has been delegated domain wide access.
-   *
-   * @param string subject an email address account to impersonate
-   */
-  public function setSubject($subject)
-  {
-    $this->config['subject'] = $subject;
-  }
-
-  /**
-   * Declare whether making API calls should make the call immediately, or
-   * return a request which can be called with ->execute();
-   *
-   * @param boolean $defer True if calls should not be executed right away.
-   */
-  public function setDefer($defer)
-  {
-    $this->deferExecution = $defer;
-  }
-
-  /**
-   * Whether or not to return raw requests
-   * @return boolean
-   */
-  public function shouldDefer()
-  {
-    return $this->deferExecution;
-  }
-
-  /**
-   * @return Google\Auth\OAuth2 implementation
-   */
-  public function getOAuth2Service()
-  {
-    if (!isset($this->auth)) {
-      $this->auth = $this->createOAuth2Service();
-    }
-
-    return $this->auth;
-  }
-
-  /**
-   * create a default google auth object
-   */
-  protected function createOAuth2Service()
-  {
-    $auth = new OAuth2(
-        [
-          'clientId'          => $this->getClientId(),
-          'clientSecret'      => $this->getClientSecret(),
-          'authorizationUri'   => self::OAUTH2_AUTH_URL,
-          'tokenCredentialUri' => self::OAUTH2_TOKEN_URI,
-          'redirectUri'       => $this->getRedirectUri(),
-          'issuer'            => $this->config['client_id'],
-          'signingKey'        => $this->config['signing_key'],
-          'signingAlgorithm'  => $this->config['signing_algorithm'],
-        ]
-    );
-
-    return $auth;
-  }
-
-  /**
-   * Set the Cache object
-   * @param Psr\Cache\CacheItemPoolInterface $cache
-   */
-  public function setCache(CacheItemPoolInterface $cache)
-  {
-    $this->cache = $cache;
-  }
-
-  /**
-   * @return Psr\Cache\CacheItemPoolInterface Cache implementation
-   */
-  public function getCache()
-  {
-    if (!$this->cache) {
-      $this->cache = $this->createDefaultCache();
-    }
-
-    return $this->cache;
-  }
-
-  /**
-   * @return Google\Auth\CacheInterface Cache implementation
-   */
-  public function setCacheConfig(array $cacheConfig)
-  {
-    $this->config['cache_config'] = $cacheConfig;
-  }
-
-  /**
-   * Set the Logger object
-   * @param Psr\Log\LoggerInterface $logger
-   */
-  public function setLogger(LoggerInterface $logger)
-  {
-    $this->logger = $logger;
-  }
-
-  /**
-   * @return Psr\Log\LoggerInterface implementation
-   */
-  public function getLogger()
-  {
-    if (!isset($this->logger)) {
-      $this->logger = $this->createDefaultLogger();
-    }
-
-    return $this->logger;
-  }
-
-  protected function createDefaultLogger()
-  {
-    $logger = new Logger('google-api-php-client');
-    if ($this->isAppEngine()) {
-      $handler = new MonologSyslogHandler('app', LOG_USER, Logger::NOTICE);
-    } else {
-      $handler = new MonologStreamHandler('php://stderr', Logger::NOTICE);
-    }
-    $logger->pushHandler($handler);
-
-    return $logger;
-  }
-
-  protected function createDefaultCache()
-  {
-    return new MemoryCacheItemPool;
-  }
-
-  /**
-   * Set the Http Client object
-   * @param GuzzleHttp\ClientInterface $http
-   */
-  public function setHttpClient(ClientInterface $http)
-  {
-    $this->http = $http;
-  }
-
-  /**
-   * @return GuzzleHttp\ClientInterface implementation
-   */
-  public function getHttpClient()
-  {
-    if (null === $this->http) {
-      $this->http = $this->createDefaultHttpClient();
-    }
-
-    return $this->http;
-  }
-
-  protected function createDefaultHttpClient()
-  {
-    $options = ['exceptions' => false];
-
-    $version = ClientInterface::VERSION;
-    if ('5' === $version[0]) {
-      $options = [
-        'base_url' => $this->config['base_path'],
-        'defaults' => $options,
-      ];
-      if ($this->isAppEngine()) {
-        // set StreamHandler on AppEngine by default
-        $options['handler']  = new StreamHandler();
-        $options['defaults']['verify'] = '/etc/ca-certificates.crt';
-      }
-    } else {
-      // guzzle 6
-      $options['base_uri'] = $this->config['base_path'];
-    }
-
-    return new Client($options);
-  }
-
-  private function createApplicationDefaultCredentials()
-  {
-    $scopes = $this->prepareScopes();
-    $sub = $this->config['subject'];
-    $signingKey = $this->config['signing_key'];
-
-    // create credentials using values supplied in setAuthConfig
-    if ($signingKey) {
-      $serviceAccountCredentials = array(
-        'client_id' => $this->config['client_id'],
-        'client_email' => $this->config['client_email'],
-        'private_key' => $signingKey,
-        'type' => 'service_account',
-      );
-      $credentials = CredentialsLoader::makeCredentials($scopes, $serviceAccountCredentials);
-    } else {
-      $credentials = ApplicationDefaultCredentials::getCredentials($scopes);
-    }
-
-    // for service account domain-wide authority (impersonating a user)
-    // @see https://developers.google.com/identity/protocols/OAuth2ServiceAccount
-    if ($sub) {
-      if (!$credentials instanceof ServiceAccountCredentials) {
-        throw new DomainException('domain-wide authority requires service account credentials');
-      }
-
-      $credentials->setSub($sub);
-    }
-
-    return $credentials;
-  }
-
-  protected function getAuthHandler()
-  {
-    // Be very careful using the cache, as the underlying auth library's cache
-    // implementation is naive, and the cache keys do not account for user
-    // sessions.
-    //
-    // @see https://github.com/google/google-api-php-client/issues/821
-    return Google_AuthHandler_AuthHandlerFactory::build(
-        $this->getCache(),
-        $this->config['cache_config']
-    );
-  }
-
-  private function createUserRefreshCredentials($scope, $refreshToken)
-  {
-    $creds = array_filter(
-        array(
-          'client_id' => $this->getClientId(),
-          'client_secret' => $this->getClientSecret(),
-          'refresh_token' => $refreshToken,
-        )
-    );
-
-    return new UserRefreshCredentials($scope, $creds);
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient/src/Google/Collection.php b/mayor-orig/www/include/share/googleapi/google/apiclient/src/Google/Collection.php
deleted file mode 100644
index 7c478bc0..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient/src/Google/Collection.php
+++ /dev/null
@@ -1,101 +0,0 @@
-modelData[$this->collection_key])
-        && is_array($this->modelData[$this->collection_key])) {
-      reset($this->modelData[$this->collection_key]);
-    }
-  }
-
-  public function current()
-  {
-    $this->coerceType($this->key());
-    if (is_array($this->modelData[$this->collection_key])) {
-      return current($this->modelData[$this->collection_key]);
-    }
-  }
-
-  public function key()
-  {
-    if (isset($this->modelData[$this->collection_key])
-        && is_array($this->modelData[$this->collection_key])) {
-      return key($this->modelData[$this->collection_key]);
-    }
-  }
-
-  public function next()
-  {
-    return next($this->modelData[$this->collection_key]);
-  }
-
-  public function valid()
-  {
-    $key = $this->key();
-    return $key !== null && $key !== false;
-  }
-
-  public function count()
-  {
-    if (!isset($this->modelData[$this->collection_key])) {
-      return 0;
-    }
-    return count($this->modelData[$this->collection_key]);
-  }
-
-  public function offsetExists($offset)
-  {
-    if (!is_numeric($offset)) {
-      return parent::offsetExists($offset);
-    }
-    return isset($this->modelData[$this->collection_key][$offset]);
-  }
-
-  public function offsetGet($offset)
-  {
-    if (!is_numeric($offset)) {
-      return parent::offsetGet($offset);
-    }
-    $this->coerceType($offset);
-    return $this->modelData[$this->collection_key][$offset];
-  }
-
-  public function offsetSet($offset, $value)
-  {
-    if (!is_numeric($offset)) {
-      return parent::offsetSet($offset, $value);
-    }
-    $this->modelData[$this->collection_key][$offset] = $value;
-  }
-
-  public function offsetUnset($offset)
-  {
-    if (!is_numeric($offset)) {
-      return parent::offsetUnset($offset);
-    }
-    unset($this->modelData[$this->collection_key][$offset]);
-  }
-
-  private function coerceType($offset)
-  {
-    $typeKey = $this->keyType($this->collection_key);
-    if (isset($this->$typeKey) && !is_object($this->modelData[$this->collection_key][$offset])) {
-      $type = $this->$typeKey;
-      $this->modelData[$this->collection_key][$offset] =
-          new $type($this->modelData[$this->collection_key][$offset]);
-    }
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient/src/Google/Exception.php b/mayor-orig/www/include/share/googleapi/google/apiclient/src/Google/Exception.php
deleted file mode 100644
index af802697..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient/src/Google/Exception.php
+++ /dev/null
@@ -1,20 +0,0 @@
-client = $client;
-    $this->boundary = $boundary ?: mt_rand();
-    $this->rootUrl = rtrim($rootUrl ?: $this->client->getConfig('base_path'), '/');
-    $this->batchPath = $batchPath ?: self::BATCH_PATH;
-  }
-
-  public function add(RequestInterface $request, $key = false)
-  {
-    if (false == $key) {
-      $key = mt_rand();
-    }
-
-    $this->requests[$key] = $request;
-  }
-
-  public function execute()
-  {
-    $body = '';
-    $classes = array();
-    $batchHttpTemplate = <<requests as $key => $request) {
-      $firstLine = sprintf(
-          '%s %s HTTP/%s',
-          $request->getMethod(),
-          $request->getRequestTarget(),
-          $request->getProtocolVersion()
-      );
-
-      $content = (string) $request->getBody();
-
-      $headers = '';
-      foreach ($request->getHeaders() as $name => $values) {
-          $headers .= sprintf("%s:%s\r\n", $name, implode(', ', $values));
-      }
-
-      $body .= sprintf(
-          $batchHttpTemplate,
-          $this->boundary,
-          $key,
-          $firstLine,
-          $headers,
-          $content ? "\n".$content : ''
-      );
-
-      $classes['response-' . $key] = $request->getHeaderLine('X-Php-Expected-Class');
-    }
-
-    $body .= "--{$this->boundary}--";
-    $body = trim($body);
-    $url = $this->rootUrl . '/' . $this->batchPath;
-    $headers = array(
-      'Content-Type' => sprintf('multipart/mixed; boundary=%s', $this->boundary),
-      'Content-Length' => strlen($body),
-    );
-
-    $request = new Request(
-        'POST',
-        $url,
-        $headers,
-        $body
-    );
-
-    $response = $this->client->execute($request);
-
-    return $this->parseResponse($response, $classes);
-  }
-
-  public function parseResponse(ResponseInterface $response, $classes = array())
-  {
-    $contentType = $response->getHeaderLine('content-type');
-    $contentType = explode(';', $contentType);
-    $boundary = false;
-    foreach ($contentType as $part) {
-      $part = explode('=', $part, 2);
-      if (isset($part[0]) && 'boundary' == trim($part[0])) {
-        $boundary = $part[1];
-      }
-    }
-
-    $body = (string) $response->getBody();
-    if (!empty($body)) {
-      $body = str_replace("--$boundary--", "--$boundary", $body);
-      $parts = explode("--$boundary", $body);
-      $responses = array();
-      $requests = array_values($this->requests);
-
-      foreach ($parts as $i => $part) {
-        $part = trim($part);
-        if (!empty($part)) {
-          list($rawHeaders, $part) = explode("\r\n\r\n", $part, 2);
-          $headers = $this->parseRawHeaders($rawHeaders);
-
-          $status = substr($part, 0, strpos($part, "\n"));
-          $status = explode(" ", $status);
-          $status = $status[1];
-
-          list($partHeaders, $partBody) = $this->parseHttpResponse($part, false);
-          $response = new Response(
-              $status,
-              $partHeaders,
-              Psr7\stream_for($partBody)
-          );
-
-          // Need content id.
-          $key = $headers['content-id'];
-
-          try {
-            $response = Google_Http_REST::decodeHttpResponse($response, $requests[$i-1]);
-          } catch (Google_Service_Exception $e) {
-            // Store the exception as the response, so successful responses
-            // can be processed.
-            $response = $e;
-          }
-
-          $responses[$key] = $response;
-        }
-      }
-
-      return $responses;
-    }
-
-    return null;
-  }
-
-  private function parseRawHeaders($rawHeaders)
-  {
-    $headers = array();
-    $responseHeaderLines = explode("\r\n", $rawHeaders);
-    foreach ($responseHeaderLines as $headerLine) {
-      if ($headerLine && strpos($headerLine, ':') !== false) {
-        list($header, $value) = explode(': ', $headerLine, 2);
-        $header = strtolower($header);
-        if (isset($headers[$header])) {
-          $headers[$header] .= "\n" . $value;
-        } else {
-          $headers[$header] = $value;
-        }
-      }
-    }
-    return $headers;
-  }
-
-  /**
-   * Used by the IO lib and also the batch processing.
-   *
-   * @param $respData
-   * @param $headerSize
-   * @return array
-   */
-  private function parseHttpResponse($respData, $headerSize)
-  {
-    // check proxy header
-    foreach (self::$CONNECTION_ESTABLISHED_HEADERS as $established_header) {
-      if (stripos($respData, $established_header) !== false) {
-        // existed, remove it
-        $respData = str_ireplace($established_header, '', $respData);
-        // Subtract the proxy header size unless the cURL bug prior to 7.30.0
-        // is present which prevented the proxy header size from being taken into
-        // account.
-        // @TODO look into this
-        // if (!$this->needsQuirk()) {
-        //   $headerSize -= strlen($established_header);
-        // }
-        break;
-      }
-    }
-
-    if ($headerSize) {
-      $responseBody = substr($respData, $headerSize);
-      $responseHeaders = substr($respData, 0, $headerSize);
-    } else {
-      $responseSegments = explode("\r\n\r\n", $respData, 2);
-      $responseHeaders = $responseSegments[0];
-      $responseBody = isset($responseSegments[1]) ? $responseSegments[1] :
-                                                    null;
-    }
-
-    $responseHeaders = $this->parseRawHeaders($responseHeaders);
-
-    return array($responseHeaders, $responseBody);
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient/src/Google/Http/MediaFileUpload.php b/mayor-orig/www/include/share/googleapi/google/apiclient/src/Google/Http/MediaFileUpload.php
deleted file mode 100644
index bd38a71b..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient/src/Google/Http/MediaFileUpload.php
+++ /dev/null
@@ -1,348 +0,0 @@
-client = $client;
-    $this->request = $request;
-    $this->mimeType = $mimeType;
-    $this->data = $data;
-    $this->resumable = $resumable;
-    $this->chunkSize = $chunkSize;
-    $this->progress = 0;
-
-    $this->process();
-  }
-
-  /**
-   * Set the size of the file that is being uploaded.
-   * @param $size - int file size in bytes
-   */
-  public function setFileSize($size)
-  {
-    $this->size = $size;
-  }
-
-  /**
-   * Return the progress on the upload
-   * @return int progress in bytes uploaded.
-   */
-  public function getProgress()
-  {
-    return $this->progress;
-  }
-
-  /**
-   * Send the next part of the file to upload.
-   * @param [$chunk] the next set of bytes to send. If false will used $data passed
-   * at construct time.
-   */
-  public function nextChunk($chunk = false)
-  {
-    $resumeUri = $this->getResumeUri();
-
-    if (false == $chunk) {
-      $chunk = substr($this->data, $this->progress, $this->chunkSize);
-    }
-
-    $lastBytePos = $this->progress + strlen($chunk) - 1;
-    $headers = array(
-      'content-range' => "bytes $this->progress-$lastBytePos/$this->size",
-      'content-length' => strlen($chunk),
-      'expect' => '',
-    );
-
-    $request = new Request(
-        'PUT',
-        $resumeUri,
-        $headers,
-        Psr7\stream_for($chunk)
-    );
-
-    return $this->makePutRequest($request);
-  }
-
-  /**
-   * Return the HTTP result code from the last call made.
-   * @return int code
-   */
-  public function getHttpResultCode()
-  {
-    return $this->httpResultCode;
-  }
-
-  /**
-  * Sends a PUT-Request to google drive and parses the response,
-  * setting the appropiate variables from the response()
-  *
-  * @param Google_Http_Request $httpRequest the Reuqest which will be send
-  *
-  * @return false|mixed false when the upload is unfinished or the decoded http response
-  *
-  */
-  private function makePutRequest(RequestInterface $request)
-  {
-    $response = $this->client->execute($request);
-    $this->httpResultCode = $response->getStatusCode();
-
-    if (308 == $this->httpResultCode) {
-      // Track the amount uploaded.
-      $range = explode('-', $response->getHeaderLine('range'));
-      $this->progress = $range[1] + 1;
-
-      // Allow for changing upload URLs.
-      $location = $response->getHeaderLine('location');
-      if ($location) {
-        $this->resumeUri = $location;
-      }
-
-      // No problems, but upload not complete.
-      return false;
-    }
-
-    return Google_Http_REST::decodeHttpResponse($response, $this->request);
-  }
-
-  /**
-   * Resume a previously unfinished upload
-   * @param $resumeUri the resume-URI of the unfinished, resumable upload.
-   */
-  public function resume($resumeUri)
-  {
-     $this->resumeUri = $resumeUri;
-     $headers = array(
-       'content-range' => "bytes */$this->size",
-       'content-length' => 0,
-     );
-     $httpRequest = new Request(
-         'PUT',
-         $this->resumeUri,
-         $headers
-     );
-
-     return $this->makePutRequest($httpRequest);
-  }
-
-  /**
-   * @return Psr\Http\Message\RequestInterface $request
-   * @visible for testing
-   */
-  private function process()
-  {
-    $this->transformToUploadUrl();
-    $request = $this->request;
-
-    $postBody = '';
-    $contentType = false;
-
-    $meta = (string) $request->getBody();
-    $meta = is_string($meta) ? json_decode($meta, true) : $meta;
-
-    $uploadType = $this->getUploadType($meta);
-    $request = $request->withUri(
-        Uri::withQueryValue($request->getUri(), 'uploadType', $uploadType)
-    );
-
-    $mimeType = $this->mimeType ?: $request->getHeaderLine('content-type');
-
-    if (self::UPLOAD_RESUMABLE_TYPE == $uploadType) {
-      $contentType = $mimeType;
-      $postBody = is_string($meta) ? $meta : json_encode($meta);
-    } else if (self::UPLOAD_MEDIA_TYPE == $uploadType) {
-      $contentType = $mimeType;
-      $postBody = $this->data;
-    } else if (self::UPLOAD_MULTIPART_TYPE == $uploadType) {
-      // This is a multipart/related upload.
-      $boundary = $this->boundary ?: mt_rand();
-      $boundary = str_replace('"', '', $boundary);
-      $contentType = 'multipart/related; boundary=' . $boundary;
-      $related = "--$boundary\r\n";
-      $related .= "Content-Type: application/json; charset=UTF-8\r\n";
-      $related .= "\r\n" . json_encode($meta) . "\r\n";
-      $related .= "--$boundary\r\n";
-      $related .= "Content-Type: $mimeType\r\n";
-      $related .= "Content-Transfer-Encoding: base64\r\n";
-      $related .= "\r\n" . base64_encode($this->data) . "\r\n";
-      $related .= "--$boundary--";
-      $postBody = $related;
-    }
-
-    $request = $request->withBody(Psr7\stream_for($postBody));
-
-    if (isset($contentType) && $contentType) {
-      $request = $request->withHeader('content-type', $contentType);
-    }
-
-    return $this->request = $request;
-  }
-
-  /**
-   * Valid upload types:
-   * - resumable (UPLOAD_RESUMABLE_TYPE)
-   * - media (UPLOAD_MEDIA_TYPE)
-   * - multipart (UPLOAD_MULTIPART_TYPE)
-   * @param $meta
-   * @return string
-   * @visible for testing
-   */
-  public function getUploadType($meta)
-  {
-    if ($this->resumable) {
-      return self::UPLOAD_RESUMABLE_TYPE;
-    }
-
-    if (false == $meta && $this->data) {
-      return self::UPLOAD_MEDIA_TYPE;
-    }
-
-    return self::UPLOAD_MULTIPART_TYPE;
-  }
-
-  public function getResumeUri()
-  {
-    if (null === $this->resumeUri) {
-      $this->resumeUri = $this->fetchResumeUri();
-    }
-
-    return $this->resumeUri;
-  }
-
-  private function fetchResumeUri()
-  {
-    $body = $this->request->getBody();
-    if ($body) {
-      $headers = array(
-        'content-type' => 'application/json; charset=UTF-8',
-        'content-length' => $body->getSize(),
-        'x-upload-content-type' => $this->mimeType,
-        'x-upload-content-length' => $this->size,
-        'expect' => '',
-      );
-      foreach ($headers as $key => $value) {
-        $this->request = $this->request->withHeader($key, $value);
-      }
-    }
-
-    $response = $this->client->execute($this->request, false);
-    $location = $response->getHeaderLine('location');
-    $code = $response->getStatusCode();
-
-    if (200 == $code && true == $location) {
-      return $location;
-    }
-
-    $message = $code;
-    $body = json_decode((string) $this->request->getBody(), true);
-    if (isset($body['error']['errors'])) {
-      $message .= ': ';
-      foreach ($body['error']['errors'] as $error) {
-        $message .= "{$error[domain]}, {$error[message]};";
-      }
-      $message = rtrim($message, ';');
-    }
-
-    $error = "Failed to start the resumable upload (HTTP {$message})";
-    $this->client->getLogger()->error($error);
-
-    throw new Google_Exception($error);
-  }
-
-  private function transformToUploadUrl()
-  {
-    $parts = parse_url((string) $this->request->getUri());
-    if (!isset($parts['path'])) {
-      $parts['path'] = '';
-    }
-    $parts['path'] = '/upload' . $parts['path'];
-    $uri = Uri::fromParts($parts);
-    $this->request = $this->request->withUri($uri);
-  }
-
-  public function setChunkSize($chunkSize)
-  {
-    $this->chunkSize = $chunkSize;
-  }
-
-  public function getRequest()
-  {
-    return $this->request;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient/src/Google/Http/REST.php b/mayor-orig/www/include/share/googleapi/google/apiclient/src/Google/Http/REST.php
deleted file mode 100644
index c2156a2e..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient/src/Google/Http/REST.php
+++ /dev/null
@@ -1,182 +0,0 @@
-getMethod(), (string) $request->getUri()),
-        array(get_class(), 'doExecute'),
-        array($client, $request, $expectedClass)
-    );
-
-    if (null !== $retryMap) {
-      $runner->setRetryMap($retryMap);
-    }
-
-    return $runner->run();
-  }
-
-  /**
-   * Executes a Psr\Http\Message\RequestInterface
-   *
-   * @param Google_Client $client
-   * @param Psr\Http\Message\RequestInterface $request
-   * @return array decoded result
-   * @throws Google_Service_Exception on server side error (ie: not authenticated,
-   *  invalid or malformed post body, invalid url)
-   */
-  public static function doExecute(ClientInterface $client, RequestInterface $request, $expectedClass = null)
-  {
-    try {
-      $httpHandler = HttpHandlerFactory::build($client);
-      $response = $httpHandler($request);
-    } catch (RequestException $e) {
-      // if Guzzle throws an exception, catch it and handle the response
-      if (!$e->hasResponse()) {
-        throw $e;
-      }
-
-      $response = $e->getResponse();
-      // specific checking for Guzzle 5: convert to PSR7 response
-      if ($response instanceof \GuzzleHttp\Message\ResponseInterface) {
-        $response = new Response(
-            $response->getStatusCode(),
-            $response->getHeaders() ?: [],
-            $response->getBody(),
-            $response->getProtocolVersion(),
-            $response->getReasonPhrase()
-        );
-      }
-    }
-
-    return self::decodeHttpResponse($response, $request, $expectedClass);
-  }
-
-  /**
-   * Decode an HTTP Response.
-   * @static
-   * @throws Google_Service_Exception
-   * @param Psr\Http\Message\RequestInterface $response The http response to be decoded.
-   * @param Psr\Http\Message\ResponseInterface $response
-   * @return mixed|null
-   */
-  public static function decodeHttpResponse(
-      ResponseInterface $response,
-      RequestInterface $request = null,
-      $expectedClass = null
-  ) {
-    $code = $response->getStatusCode();
-
-    // retry strategy
-    if (intVal($code) >= 400) {
-      // if we errored out, it should be safe to grab the response body
-      $body = (string) $response->getBody();
-
-      // Check if we received errors, and add those to the Exception for convenience
-      throw new Google_Service_Exception($body, $code, null, self::getResponseErrors($body));
-    }
-
-    // Ensure we only pull the entire body into memory if the request is not
-    // of media type
-    $body = self::decodeBody($response, $request);
-
-    if ($expectedClass = self::determineExpectedClass($expectedClass, $request)) {
-      $json = json_decode($body, true);
-
-      return new $expectedClass($json);
-    }
-
-    return $response;
-  }
-
-  private static function decodeBody(ResponseInterface $response, RequestInterface $request = null)
-  {
-    if (self::isAltMedia($request)) {
-      // don't decode the body, it's probably a really long string
-      return '';
-    }
-
-    return (string) $response->getBody();
-  }
-
-  private static function determineExpectedClass($expectedClass, RequestInterface $request = null)
-  {
-    // "false" is used to explicitly prevent an expected class from being returned
-    if (false === $expectedClass) {
-      return null;
-    }
-
-    // if we don't have a request, we just use what's passed in
-    if (null === $request) {
-      return $expectedClass;
-    }
-
-    // return what we have in the request header if one was not supplied
-    return $expectedClass ?: $request->getHeaderLine('X-Php-Expected-Class');
-  }
-
-  private static function getResponseErrors($body)
-  {
-    $json = json_decode($body, true);
-
-    if (isset($json['error']['errors'])) {
-      return $json['error']['errors'];
-    }
-
-    return null;
-  }
-
-  private static function isAltMedia(RequestInterface $request = null)
-  {
-    if ($request && $qs = $request->getUri()->getQuery()) {
-      parse_str($qs, $query);
-      if (isset($query['alt']) && $query['alt'] == 'media') {
-        return true;
-      }
-    }
-
-    return false;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient/src/Google/Model.php b/mayor-orig/www/include/share/googleapi/google/apiclient/src/Google/Model.php
deleted file mode 100644
index cd50c9a5..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient/src/Google/Model.php
+++ /dev/null
@@ -1,307 +0,0 @@
-mapTypes($array);
-    }
-    $this->gapiInit();
-  }
-
-  /**
-   * Getter that handles passthrough access to the data array, and lazy object creation.
-   * @param string $key Property name.
-   * @return mixed The value if any, or null.
-   */
-  public function __get($key)
-  {
-    $keyTypeName = $this->keyType($key);
-    $keyDataType = $this->dataType($key);
-    if (isset($this->$keyTypeName) && !isset($this->processed[$key])) {
-      if (isset($this->modelData[$key])) {
-        $val = $this->modelData[$key];
-      } else if (isset($this->$keyDataType) &&
-          ($this->$keyDataType == 'array' || $this->$keyDataType == 'map')) {
-        $val = array();
-      } else {
-        $val = null;
-      }
-
-      if ($this->isAssociativeArray($val)) {
-        if (isset($this->$keyDataType) && 'map' == $this->$keyDataType) {
-          foreach ($val as $arrayKey => $arrayItem) {
-              $this->modelData[$key][$arrayKey] =
-                $this->createObjectFromName($keyTypeName, $arrayItem);
-          }
-        } else {
-          $this->modelData[$key] = $this->createObjectFromName($keyTypeName, $val);
-        }
-      } else if (is_array($val)) {
-        $arrayObject = array();
-        foreach ($val as $arrayIndex => $arrayItem) {
-          $arrayObject[$arrayIndex] =
-            $this->createObjectFromName($keyTypeName, $arrayItem);
-        }
-        $this->modelData[$key] = $arrayObject;
-      }
-      $this->processed[$key] = true;
-    }
-
-    return isset($this->modelData[$key]) ? $this->modelData[$key] : null;
-  }
-
-  /**
-   * Initialize this object's properties from an array.
-   *
-   * @param array $array Used to seed this object's properties.
-   * @return void
-   */
-  protected function mapTypes($array)
-  {
-    // Hard initialise simple types, lazy load more complex ones.
-    foreach ($array as $key => $val) {
-      if ( !property_exists($this, $this->keyType($key)) &&
-        property_exists($this, $key)) {
-          $this->$key = $val;
-          unset($array[$key]);
-      } elseif (property_exists($this, $camelKey = $this->camelCase($key))) {
-          // This checks if property exists as camelCase, leaving it in array as snake_case
-          // in case of backwards compatibility issues.
-          $this->$camelKey = $val;
-      }
-    }
-    $this->modelData = $array;
-  }
-
-  /**
-   * Blank initialiser to be used in subclasses to do  post-construction initialisation - this
-   * avoids the need for subclasses to have to implement the variadics handling in their
-   * constructors.
-   */
-  protected function gapiInit()
-  {
-    return;
-  }
-
-  /**
-   * Create a simplified object suitable for straightforward
-   * conversion to JSON. This is relatively expensive
-   * due to the usage of reflection, but shouldn't be called
-   * a whole lot, and is the most straightforward way to filter.
-   */
-  public function toSimpleObject()
-  {
-    $object = new stdClass();
-
-    // Process all other data.
-    foreach ($this->modelData as $key => $val) {
-      $result = $this->getSimpleValue($val);
-      if ($result !== null) {
-        $object->$key = $this->nullPlaceholderCheck($result);
-      }
-    }
-
-    // Process all public properties.
-    $reflect = new ReflectionObject($this);
-    $props = $reflect->getProperties(ReflectionProperty::IS_PUBLIC);
-    foreach ($props as $member) {
-      $name = $member->getName();
-      $result = $this->getSimpleValue($this->$name);
-      if ($result !== null) {
-        $name = $this->getMappedName($name);
-        $object->$name = $this->nullPlaceholderCheck($result);
-      }
-    }
-
-    return $object;
-  }
-
-  /**
-   * Handle different types of values, primarily
-   * other objects and map and array data types.
-   */
-  private function getSimpleValue($value)
-  {
-    if ($value instanceof Google_Model) {
-      return $value->toSimpleObject();
-    } else if (is_array($value)) {
-      $return = array();
-      foreach ($value as $key => $a_value) {
-        $a_value = $this->getSimpleValue($a_value);
-        if ($a_value !== null) {
-          $key = $this->getMappedName($key);
-          $return[$key] = $this->nullPlaceholderCheck($a_value);
-        }
-      }
-      return $return;
-    }
-    return $value;
-  }
-
-  /**
-   * Check whether the value is the null placeholder and return true null.
-   */
-  private function nullPlaceholderCheck($value)
-  {
-    if ($value === self::NULL_VALUE) {
-      return null;
-    }
-    return $value;
-  }
-
-  /**
-   * If there is an internal name mapping, use that.
-   */
-  private function getMappedName($key)
-  {
-    if (isset($this->internal_gapi_mappings, $this->internal_gapi_mappings[$key])) {
-      $key = $this->internal_gapi_mappings[$key];
-    }
-    return $key;
-  }
-
-  /**
-   * Returns true only if the array is associative.
-   * @param array $array
-   * @return bool True if the array is associative.
-   */
-  protected function isAssociativeArray($array)
-  {
-    if (!is_array($array)) {
-      return false;
-    }
-    $keys = array_keys($array);
-    foreach ($keys as $key) {
-      if (is_string($key)) {
-        return true;
-      }
-    }
-    return false;
-  }
-
-  /**
-   * Given a variable name, discover its type.
-   *
-   * @param $name
-   * @param $item
-   * @return object The object from the item.
-   */
-  private function createObjectFromName($name, $item)
-  {
-    $type = $this->$name;
-    return new $type($item);
-  }
-
-  /**
-   * Verify if $obj is an array.
-   * @throws Google_Exception Thrown if $obj isn't an array.
-   * @param array $obj Items that should be validated.
-   * @param string $method Method expecting an array as an argument.
-   */
-  public function assertIsArray($obj, $method)
-  {
-    if ($obj && !is_array($obj)) {
-      throw new Google_Exception(
-          "Incorrect parameter type passed to $method(). Expected an array."
-      );
-    }
-  }
-
-  public function offsetExists($offset)
-  {
-    return isset($this->$offset) || isset($this->modelData[$offset]);
-  }
-
-  public function offsetGet($offset)
-  {
-    return isset($this->$offset) ?
-        $this->$offset :
-        $this->__get($offset);
-  }
-
-  public function offsetSet($offset, $value)
-  {
-    if (property_exists($this, $offset)) {
-      $this->$offset = $value;
-    } else {
-      $this->modelData[$offset] = $value;
-      $this->processed[$offset] = true;
-    }
-  }
-
-  public function offsetUnset($offset)
-  {
-    unset($this->modelData[$offset]);
-  }
-
-  protected function keyType($key)
-  {
-    return $key . "Type";
-  }
-
-  protected function dataType($key)
-  {
-    return $key . "DataType";
-  }
-
-  public function __isset($key)
-  {
-    return isset($this->modelData[$key]);
-  }
-
-  public function __unset($key)
-  {
-    unset($this->modelData[$key]);
-  }
-
-  /**
-   * Convert a string to camelCase
-   * @param  string $value
-   * @return string
-   */
-  private function camelCase($value)
-  {
-    $value = ucwords(str_replace(array('-', '_'), ' ', $value));
-    $value = str_replace(' ', '', $value);
-    $value[0] = strtolower($value[0]);
-    return $value;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient/src/Google/Service.php b/mayor-orig/www/include/share/googleapi/google/apiclient/src/Google/Service.php
deleted file mode 100644
index d3fd3b49..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient/src/Google/Service.php
+++ /dev/null
@@ -1,56 +0,0 @@
-client = $client;
-  }
-
-  /**
-   * Return the associated Google_Client class.
-   * @return Google_Client
-   */
-  public function getClient()
-  {
-    return $this->client;
-  }
-
-  /**
-   * Create a new HTTP Batch handler for this service
-   *
-   * @return Google_Http_Batch
-   */
-  public function createBatch()
-  {
-    return new Google_Http_Batch(
-        $this->client,
-        false,
-        $this->rootUrl,
-        $this->batchPath
-    );
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient/src/Google/Service/Exception.php b/mayor-orig/www/include/share/googleapi/google/apiclient/src/Google/Service/Exception.php
deleted file mode 100644
index abfd3f7f..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient/src/Google/Service/Exception.php
+++ /dev/null
@@ -1,68 +0,0 @@
-= 0) {
-      parent::__construct($message, $code, $previous);
-    } else {
-      parent::__construct($message, $code);
-    }
-
-    $this->errors = $errors;
-  }
-
-  /**
-   * An example of the possible errors returned.
-   *
-   * {
-   *   "domain": "global",
-   *   "reason": "authError",
-   *   "message": "Invalid Credentials",
-   *   "locationType": "header",
-   *   "location": "Authorization",
-   * }
-   *
-   * @return [{string, string}] List of errors return in an HTTP response or [].
-   */
-  public function getErrors()
-  {
-    return $this->errors;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient/src/Google/Service/README.md b/mayor-orig/www/include/share/googleapi/google/apiclient/src/Google/Service/README.md
deleted file mode 100644
index 0de48620..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient/src/Google/Service/README.md
+++ /dev/null
@@ -1,5 +0,0 @@
-# Google API Client Services
-
-Google API Client Service classes have been moved to the 
-[google-api-php-client-services](https://github.com/google/google-api-php-client-services) 
-repository. 
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient/src/Google/Service/Resource.php b/mayor-orig/www/include/share/googleapi/google/apiclient/src/Google/Service/Resource.php
deleted file mode 100644
index a3c57ee2..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient/src/Google/Service/Resource.php
+++ /dev/null
@@ -1,296 +0,0 @@
- array('type' => 'string', 'location' => 'query'),
-      'fields' => array('type' => 'string', 'location' => 'query'),
-      'trace' => array('type' => 'string', 'location' => 'query'),
-      'userIp' => array('type' => 'string', 'location' => 'query'),
-      'quotaUser' => array('type' => 'string', 'location' => 'query'),
-      'data' => array('type' => 'string', 'location' => 'body'),
-      'mimeType' => array('type' => 'string', 'location' => 'header'),
-      'uploadType' => array('type' => 'string', 'location' => 'query'),
-      'mediaUpload' => array('type' => 'complex', 'location' => 'query'),
-      'prettyPrint' => array('type' => 'string', 'location' => 'query'),
-  );
-
-  /** @var string $rootUrl */
-  private $rootUrl;
-
-  /** @var Google_Client $client */
-  private $client;
-
-  /** @var string $serviceName */
-  private $serviceName;
-
-  /** @var string $servicePath */
-  private $servicePath;
-
-  /** @var string $resourceName */
-  private $resourceName;
-
-  /** @var array $methods */
-  private $methods;
-
-  public function __construct($service, $serviceName, $resourceName, $resource)
-  {
-    $this->rootUrl = $service->rootUrl;
-    $this->client = $service->getClient();
-    $this->servicePath = $service->servicePath;
-    $this->serviceName = $serviceName;
-    $this->resourceName = $resourceName;
-    $this->methods = is_array($resource) && isset($resource['methods']) ?
-        $resource['methods'] :
-        array($resourceName => $resource);
-  }
-
-  /**
-   * TODO: This function needs simplifying.
-   * @param $name
-   * @param $arguments
-   * @param $expectedClass - optional, the expected class name
-   * @return Google_Http_Request|expectedClass
-   * @throws Google_Exception
-   */
-  public function call($name, $arguments, $expectedClass = null)
-  {
-    if (! isset($this->methods[$name])) {
-      $this->client->getLogger()->error(
-          'Service method unknown',
-          array(
-              'service' => $this->serviceName,
-              'resource' => $this->resourceName,
-              'method' => $name
-          )
-      );
-
-      throw new Google_Exception(
-          "Unknown function: " .
-          "{$this->serviceName}->{$this->resourceName}->{$name}()"
-      );
-    }
-    $method = $this->methods[$name];
-    $parameters = $arguments[0];
-
-    // postBody is a special case since it's not defined in the discovery
-    // document as parameter, but we abuse the param entry for storing it.
-    $postBody = null;
-    if (isset($parameters['postBody'])) {
-      if ($parameters['postBody'] instanceof Google_Model) {
-        // In the cases the post body is an existing object, we want
-        // to use the smart method to create a simple object for
-        // for JSONification.
-        $parameters['postBody'] = $parameters['postBody']->toSimpleObject();
-      } else if (is_object($parameters['postBody'])) {
-        // If the post body is another kind of object, we will try and
-        // wrangle it into a sensible format.
-        $parameters['postBody'] =
-            $this->convertToArrayAndStripNulls($parameters['postBody']);
-      }
-      $postBody = (array) $parameters['postBody'];
-      unset($parameters['postBody']);
-    }
-
-    // TODO: optParams here probably should have been
-    // handled already - this may well be redundant code.
-    if (isset($parameters['optParams'])) {
-      $optParams = $parameters['optParams'];
-      unset($parameters['optParams']);
-      $parameters = array_merge($parameters, $optParams);
-    }
-
-    if (!isset($method['parameters'])) {
-      $method['parameters'] = array();
-    }
-
-    $method['parameters'] = array_merge(
-        $this->stackParameters,
-        $method['parameters']
-    );
-
-    foreach ($parameters as $key => $val) {
-      if ($key != 'postBody' && ! isset($method['parameters'][$key])) {
-        $this->client->getLogger()->error(
-            'Service parameter unknown',
-            array(
-                'service' => $this->serviceName,
-                'resource' => $this->resourceName,
-                'method' => $name,
-                'parameter' => $key
-            )
-        );
-        throw new Google_Exception("($name) unknown parameter: '$key'");
-      }
-    }
-
-    foreach ($method['parameters'] as $paramName => $paramSpec) {
-      if (isset($paramSpec['required']) &&
-          $paramSpec['required'] &&
-          ! isset($parameters[$paramName])
-      ) {
-        $this->client->getLogger()->error(
-            'Service parameter missing',
-            array(
-                'service' => $this->serviceName,
-                'resource' => $this->resourceName,
-                'method' => $name,
-                'parameter' => $paramName
-            )
-        );
-        throw new Google_Exception("($name) missing required param: '$paramName'");
-      }
-      if (isset($parameters[$paramName])) {
-        $value = $parameters[$paramName];
-        $parameters[$paramName] = $paramSpec;
-        $parameters[$paramName]['value'] = $value;
-        unset($parameters[$paramName]['required']);
-      } else {
-        // Ensure we don't pass nulls.
-        unset($parameters[$paramName]);
-      }
-    }
-
-    $this->client->getLogger()->info(
-        'Service Call',
-        array(
-            'service' => $this->serviceName,
-            'resource' => $this->resourceName,
-            'method' => $name,
-            'arguments' => $parameters,
-        )
-    );
-
-    // build the service uri
-    $url = $this->createRequestUri(
-        $method['path'],
-        $parameters
-    );
-
-    // NOTE: because we're creating the request by hand,
-    // and because the service has a rootUrl property
-    // the "base_uri" of the Http Client is not accounted for
-    $request = new Request(
-        $method['httpMethod'],
-        $url,
-        ['content-type' => 'application/json'],
-        $postBody ? json_encode($postBody) : ''
-    );
-
-    // support uploads
-    if (isset($parameters['data'])) {
-      $mimeType = isset($parameters['mimeType'])
-        ? $parameters['mimeType']['value']
-        : 'application/octet-stream';
-      $data = $parameters['data']['value'];
-      $upload = new Google_Http_MediaFileUpload($this->client, $request, $mimeType, $data);
-
-      // pull down the modified request
-      $request = $upload->getRequest();
-    }
-
-    // if this is a media type, we will return the raw response
-    // rather than using an expected class
-    if (isset($parameters['alt']) && $parameters['alt']['value'] == 'media') {
-      $expectedClass = null;
-    }
-
-    // if the client is marked for deferring, rather than
-    // execute the request, return the response
-    if ($this->client->shouldDefer()) {
-      // @TODO find a better way to do this
-      $request = $request
-        ->withHeader('X-Php-Expected-Class', $expectedClass);
-
-      return $request;
-    }
-
-    return $this->client->execute($request, $expectedClass);
-  }
-
-  protected function convertToArrayAndStripNulls($o)
-  {
-    $o = (array) $o;
-    foreach ($o as $k => $v) {
-      if ($v === null) {
-        unset($o[$k]);
-      } elseif (is_object($v) || is_array($v)) {
-        $o[$k] = $this->convertToArrayAndStripNulls($o[$k]);
-      }
-    }
-    return $o;
-  }
-
-  /**
-   * Parse/expand request parameters and create a fully qualified
-   * request uri.
-   * @static
-   * @param string $restPath
-   * @param array $params
-   * @return string $requestUrl
-   */
-  public function createRequestUri($restPath, $params)
-  {
-    // code for leading slash
-    $requestUrl = $this->servicePath . $restPath;
-    if ($this->rootUrl) {
-      if ('/' !== substr($this->rootUrl, -1) && '/' !== substr($requestUrl, 0, 1)) {
-        $requestUrl = '/' . $requestUrl;
-      }
-      $requestUrl = $this->rootUrl . $requestUrl;
-    }
-    $uriTemplateVars = array();
-    $queryVars = array();
-    foreach ($params as $paramName => $paramSpec) {
-      if ($paramSpec['type'] == 'boolean') {
-        $paramSpec['value'] = $paramSpec['value'] ? 'true' : 'false';
-      }
-      if ($paramSpec['location'] == 'path') {
-        $uriTemplateVars[$paramName] = $paramSpec['value'];
-      } else if ($paramSpec['location'] == 'query') {
-        if (isset($paramSpec['repeated']) && is_array($paramSpec['value'])) {
-          foreach ($paramSpec['value'] as $value) {
-            $queryVars[] = $paramName . '=' . rawurlencode(rawurldecode($value));
-          }
-        } else {
-          $queryVars[] = $paramName . '=' . rawurlencode(rawurldecode($paramSpec['value']));
-        }
-      }
-    }
-
-    if (count($uriTemplateVars)) {
-      $uriTemplateParser = new Google_Utils_UriTemplate();
-      $requestUrl = $uriTemplateParser->parse($requestUrl, $uriTemplateVars);
-    }
-
-    if (count($queryVars)) {
-      $requestUrl .= '?' . implode($queryVars, '&');
-    }
-
-    return $requestUrl;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient/src/Google/Task/Exception.php b/mayor-orig/www/include/share/googleapi/google/apiclient/src/Google/Task/Exception.php
deleted file mode 100644
index 5422e6fc..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient/src/Google/Task/Exception.php
+++ /dev/null
@@ -1,20 +0,0 @@
- self::TASK_RETRY_ALWAYS,
-    '503' => self::TASK_RETRY_ALWAYS,
-    'rateLimitExceeded' => self::TASK_RETRY_ALWAYS,
-    'userRateLimitExceeded' => self::TASK_RETRY_ALWAYS,
-    6  => self::TASK_RETRY_ALWAYS,  // CURLE_COULDNT_RESOLVE_HOST
-    7  => self::TASK_RETRY_ALWAYS,  // CURLE_COULDNT_CONNECT
-    28 => self::TASK_RETRY_ALWAYS,  // CURLE_OPERATION_TIMEOUTED
-    35 => self::TASK_RETRY_ALWAYS,  // CURLE_SSL_CONNECT_ERROR
-    52 => self::TASK_RETRY_ALWAYS   // CURLE_GOT_NOTHING
-  ];
-
-  /**
-   * Creates a new task runner with exponential backoff support.
-   *
-   * @param array $config The task runner config
-   * @param string $name The name of the current task (used for logging)
-   * @param callable $action The task to run and possibly retry
-   * @param array $arguments The task arguments
-   * @throws Google_Task_Exception when misconfigured
-   */
-  public function __construct(
-      $config,
-      $name,
-      $action,
-      array $arguments = array()
-  ) {
-    if (isset($config['initial_delay'])) {
-      if ($config['initial_delay'] < 0) {
-        throw new Google_Task_Exception(
-            'Task configuration `initial_delay` must not be negative.'
-        );
-      }
-
-      $this->delay = $config['initial_delay'];
-    }
-
-    if (isset($config['max_delay'])) {
-      if ($config['max_delay'] <= 0) {
-        throw new Google_Task_Exception(
-            'Task configuration `max_delay` must be greater than 0.'
-        );
-      }
-
-      $this->maxDelay = $config['max_delay'];
-    }
-
-    if (isset($config['factor'])) {
-      if ($config['factor'] <= 0) {
-        throw new Google_Task_Exception(
-            'Task configuration `factor` must be greater than 0.'
-        );
-      }
-
-      $this->factor = $config['factor'];
-    }
-
-    if (isset($config['jitter'])) {
-      if ($config['jitter'] <= 0) {
-        throw new Google_Task_Exception(
-            'Task configuration `jitter` must be greater than 0.'
-        );
-      }
-
-      $this->jitter = $config['jitter'];
-    }
-
-    if (isset($config['retries'])) {
-      if ($config['retries'] < 0) {
-        throw new Google_Task_Exception(
-            'Task configuration `retries` must not be negative.'
-        );
-      }
-      $this->maxAttempts += $config['retries'];
-    }
-
-    if (!is_callable($action)) {
-        throw new Google_Task_Exception(
-            'Task argument `$action` must be a valid callable.'
-        );
-    }
-
-    $this->action = $action;
-    $this->arguments = $arguments;
-  }
-
-  /**
-   * Checks if a retry can be attempted.
-   *
-   * @return boolean
-   */
-  public function canAttempt()
-  {
-    return $this->attempts < $this->maxAttempts;
-  }
-
-  /**
-   * Runs the task and (if applicable) automatically retries when errors occur.
-   *
-   * @return mixed
-   * @throws Google_Task_Retryable on failure when no retries are available.
-   */
-  public function run()
-  {
-    while ($this->attempt()) {
-      try {
-        return call_user_func_array($this->action, $this->arguments);
-      } catch (Google_Service_Exception $exception) {
-        $allowedRetries = $this->allowedRetries(
-            $exception->getCode(),
-            $exception->getErrors()
-        );
-
-        if (!$this->canAttempt() || !$allowedRetries) {
-          throw $exception;
-        }
-
-        if ($allowedRetries > 0) {
-          $this->maxAttempts = min(
-              $this->maxAttempts,
-              $this->attempts + $allowedRetries
-          );
-        }
-      }
-    }
-  }
-
-  /**
-   * Runs a task once, if possible. This is useful for bypassing the `run()`
-   * loop.
-   *
-   * NOTE: If this is not the first attempt, this function will sleep in
-   * accordance to the backoff configurations before running the task.
-   *
-   * @return boolean
-   */
-  public function attempt()
-  {
-    if (!$this->canAttempt()) {
-      return false;
-    }
-
-    if ($this->attempts > 0) {
-      $this->backOff();
-    }
-
-    $this->attempts++;
-    return true;
-  }
-
-  /**
-   * Sleeps in accordance to the backoff configurations.
-   */
-  private function backOff()
-  {
-    $delay = $this->getDelay();
-
-    usleep($delay * 1000000);
-  }
-
-  /**
-   * Gets the delay (in seconds) for the current backoff period.
-   *
-   * @return float
-   */
-  private function getDelay()
-  {
-    $jitter = $this->getJitter();
-    $factor = $this->attempts > 1 ? $this->factor + $jitter : 1 + abs($jitter);
-
-    return $this->delay = min($this->maxDelay, $this->delay * $factor);
-  }
-
-  /**
-   * Gets the current jitter (random number between -$this->jitter and
-   * $this->jitter).
-   *
-   * @return float
-   */
-  private function getJitter()
-  {
-    return $this->jitter * 2 * mt_rand() / mt_getrandmax() - $this->jitter;
-  }
-
-  /**
-   * Gets the number of times the associated task can be retried.
-   *
-   * NOTE: -1 is returned if the task can be retried indefinitely
-   *
-   * @return integer
-   */
-  public function allowedRetries($code, $errors = array())
-  {
-    if (isset($this->retryMap[$code])) {
-      return $this->retryMap[$code];
-    }
-
-    if (
-        !empty($errors) &&
-        isset($errors[0]['reason'], $this->retryMap[$errors[0]['reason']])
-    ) {
-      return $this->retryMap[$errors[0]['reason']];
-    }
-
-    return 0;
-  }
-
-  public function setRetryMap($retryMap)
-  {
-    $this->retryMap = $retryMap;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient/src/Google/Utils/UriTemplate.php b/mayor-orig/www/include/share/googleapi/google/apiclient/src/Google/Utils/UriTemplate.php
deleted file mode 100644
index e59fe9f2..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient/src/Google/Utils/UriTemplate.php
+++ /dev/null
@@ -1,333 +0,0 @@
- "reserved",
-      "/" => "segments",
-      "." => "dotprefix",
-      "#" => "fragment",
-      ";" => "semicolon",
-      "?" => "form",
-      "&" => "continuation"
-  );
-
-  /**
-   * @var reserved array
-   * These are the characters which should not be URL encoded in reserved
-   * strings.
-   */
-  private $reserved = array(
-      "=", ",", "!", "@", "|", ":", "/", "?", "#",
-      "[", "]",'$', "&", "'", "(", ")", "*", "+", ";"
-  );
-  private $reservedEncoded = array(
-    "%3D", "%2C", "%21", "%40", "%7C", "%3A", "%2F", "%3F",
-    "%23", "%5B", "%5D", "%24", "%26", "%27", "%28", "%29",
-    "%2A", "%2B", "%3B"
-  );
-
-  public function parse($string, array $parameters)
-  {
-    return $this->resolveNextSection($string, $parameters);
-  }
-
-  /**
-   * This function finds the first matching {...} block and
-   * executes the replacement. It then calls itself to find
-   * subsequent blocks, if any.
-   */
-  private function resolveNextSection($string, $parameters)
-  {
-    $start = strpos($string, "{");
-    if ($start === false) {
-      return $string;
-    }
-    $end = strpos($string, "}");
-    if ($end === false) {
-      return $string;
-    }
-    $string = $this->replace($string, $start, $end, $parameters);
-    return $this->resolveNextSection($string, $parameters);
-  }
-
-  private function replace($string, $start, $end, $parameters)
-  {
-    // We know a data block will have {} round it, so we can strip that.
-    $data = substr($string, $start + 1, $end - $start - 1);
-
-    // If the first character is one of the reserved operators, it effects
-    // the processing of the stream.
-    if (isset($this->operators[$data[0]])) {
-      $op = $this->operators[$data[0]];
-      $data = substr($data, 1);
-      $prefix = "";
-      $prefix_on_missing = false;
-
-      switch ($op) {
-        case "reserved":
-          // Reserved means certain characters should not be URL encoded
-          $data = $this->replaceVars($data, $parameters, ",", null, true);
-          break;
-        case "fragment":
-          // Comma separated with fragment prefix. Bare values only.
-          $prefix = "#";
-          $prefix_on_missing = true;
-          $data = $this->replaceVars($data, $parameters, ",", null, true);
-          break;
-        case "segments":
-          // Slash separated data. Bare values only.
-          $prefix = "/";
-          $data =$this->replaceVars($data, $parameters, "/");
-          break;
-        case "dotprefix":
-          // Dot separated data. Bare values only.
-          $prefix = ".";
-          $prefix_on_missing = true;
-          $data = $this->replaceVars($data, $parameters, ".");
-          break;
-        case "semicolon":
-          // Semicolon prefixed and separated. Uses the key name
-          $prefix = ";";
-          $data = $this->replaceVars($data, $parameters, ";", "=", false, true, false);
-          break;
-        case "form":
-          // Standard URL format. Uses the key name
-          $prefix = "?";
-          $data = $this->replaceVars($data, $parameters, "&", "=");
-          break;
-        case "continuation":
-          // Standard URL, but with leading ampersand. Uses key name.
-          $prefix = "&";
-          $data = $this->replaceVars($data, $parameters, "&", "=");
-          break;
-      }
-
-      // Add the initial prefix character if data is valid.
-      if ($data || ($data !== false && $prefix_on_missing)) {
-        $data = $prefix . $data;
-      }
-
-    } else {
-      // If no operator we replace with the defaults.
-      $data = $this->replaceVars($data, $parameters);
-    }
-    // This is chops out the {...} and replaces with the new section.
-    return substr($string, 0, $start) . $data . substr($string, $end + 1);
-  }
-
-  private function replaceVars(
-      $section,
-      $parameters,
-      $sep = ",",
-      $combine = null,
-      $reserved = false,
-      $tag_empty = false,
-      $combine_on_empty = true
-  ) {
-    if (strpos($section, ",") === false) {
-      // If we only have a single value, we can immediately process.
-      return $this->combine(
-          $section,
-          $parameters,
-          $sep,
-          $combine,
-          $reserved,
-          $tag_empty,
-          $combine_on_empty
-      );
-    } else {
-      // If we have multiple values, we need to split and loop over them.
-      // Each is treated individually, then glued together with the
-      // separator character.
-      $vars = explode(",", $section);
-      return $this->combineList(
-          $vars,
-          $sep,
-          $parameters,
-          $combine,
-          $reserved,
-          false, // Never emit empty strings in multi-param replacements
-          $combine_on_empty
-      );
-    }
-  }
-
-  public function combine(
-      $key,
-      $parameters,
-      $sep,
-      $combine,
-      $reserved,
-      $tag_empty,
-      $combine_on_empty
-  ) {
-    $length = false;
-    $explode = false;
-    $skip_final_combine = false;
-    $value = false;
-
-    // Check for length restriction.
-    if (strpos($key, ":") !== false) {
-      list($key, $length) = explode(":", $key);
-    }
-
-    // Check for explode parameter.
-    if ($key[strlen($key) - 1] == "*") {
-      $explode = true;
-      $key = substr($key, 0, -1);
-      $skip_final_combine = true;
-    }
-
-    // Define the list separator.
-    $list_sep = $explode ? $sep : ",";
-
-    if (isset($parameters[$key])) {
-      $data_type = $this->getDataType($parameters[$key]);
-      switch ($data_type) {
-        case self::TYPE_SCALAR:
-          $value = $this->getValue($parameters[$key], $length);
-          break;
-        case self::TYPE_LIST:
-          $values = array();
-          foreach ($parameters[$key] as $pkey => $pvalue) {
-            $pvalue = $this->getValue($pvalue, $length);
-            if ($combine && $explode) {
-              $values[$pkey] = $key . $combine . $pvalue;
-            } else {
-              $values[$pkey] = $pvalue;
-            }
-          }
-          $value = implode($list_sep, $values);
-          if ($value == '') {
-            return '';
-          }
-          break;
-        case self::TYPE_MAP:
-          $values = array();
-          foreach ($parameters[$key] as $pkey => $pvalue) {
-            $pvalue = $this->getValue($pvalue, $length);
-            if ($explode) {
-              $pkey = $this->getValue($pkey, $length);
-              $values[] = $pkey . "=" . $pvalue; // Explode triggers = combine.
-            } else {
-              $values[] = $pkey;
-              $values[] = $pvalue;
-            }
-          }
-          $value = implode($list_sep, $values);
-          if ($value == '') {
-            return false;
-          }
-          break;
-      }
-    } else if ($tag_empty) {
-      // If we are just indicating empty values with their key name, return that.
-      return $key;
-    } else {
-      // Otherwise we can skip this variable due to not being defined.
-      return false;
-    }
-
-    if ($reserved) {
-      $value = str_replace($this->reservedEncoded, $this->reserved, $value);
-    }
-
-    // If we do not need to include the key name, we just return the raw
-    // value.
-    if (!$combine || $skip_final_combine) {
-      return $value;
-    }
-
-    // Else we combine the key name: foo=bar, if value is not the empty string.
-    return $key . ($value != '' || $combine_on_empty ? $combine . $value : '');
-  }
-
-  /**
-   * Return the type of a passed in value
-   */
-  private function getDataType($data)
-  {
-    if (is_array($data)) {
-      reset($data);
-      if (key($data) !== 0) {
-        return self::TYPE_MAP;
-      }
-      return self::TYPE_LIST;
-    }
-    return self::TYPE_SCALAR;
-  }
-
-  /**
-   * Utility function that merges multiple combine calls
-   * for multi-key templates.
-   */
-  private function combineList(
-      $vars,
-      $sep,
-      $parameters,
-      $combine,
-      $reserved,
-      $tag_empty,
-      $combine_on_empty
-  ) {
-    $ret = array();
-    foreach ($vars as $var) {
-      $response = $this->combine(
-          $var,
-          $parameters,
-          $sep,
-          $combine,
-          $reserved,
-          $tag_empty,
-          $combine_on_empty
-      );
-      if ($response === false) {
-        continue;
-      }
-      $ret[] = $response;
-    }
-    return implode($sep, $ret);
-  }
-
-  /**
-   * Utility function to encode and trim values
-   */
-  private function getValue($value, $length)
-  {
-    if ($length) {
-      $value = substr($value, 0, $length);
-    }
-    $value = rawurlencode($value);
-    return $value;
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/apiclient/src/Google/autoload.php b/mayor-orig/www/include/share/googleapi/google/apiclient/src/Google/autoload.php
deleted file mode 100644
index 8b493010..00000000
--- a/mayor-orig/www/include/share/googleapi/google/apiclient/src/Google/autoload.php
+++ /dev/null
@@ -1,21 +0,0 @@
-exclude('vendor')
-    ->in(__DIR__);
-
-// Return a Code Sniffing configuration using
-// all sniffers needed for PSR-2
-// and additionally:
-//  - Remove leading slashes in use clauses.
-//  - PHP single-line arrays should not have trailing comma.
-//  - Single-line whitespace before closing semicolon are prohibited.
-//  - Remove unused use statements in the PHP source code
-//  - Ensure Concatenation to have at least one whitespace around
-//  - Remove trailing whitespace at the end of blank lines.
-return Symfony\CS\Config\Config::create()
-    ->level(Symfony\CS\FixerInterface::PSR2_LEVEL)
-    ->fixers([
-        'remove_leading_slash_use',
-        'single_array_no_trailing_comma',
-        'spaces_before_semicolon',
-        'unused_use',
-        'concat_with_spaces',
-        'whitespacy_lines',
-        'ordered_use',
-        'single_quote',
-        'duplicate_semicolon',
-        'extra_empty_lines',
-        'phpdoc_no_package',
-        'phpdoc_scalar',
-        'no_empty_lines_after_phpdocs'
-    ])
-    ->finder($finder);
diff --git a/mayor-orig/www/include/share/googleapi/google/auth/.travis.yml b/mayor-orig/www/include/share/googleapi/google/auth/.travis.yml
deleted file mode 100644
index c51e2c33..00000000
--- a/mayor-orig/www/include/share/googleapi/google/auth/.travis.yml
+++ /dev/null
@@ -1,31 +0,0 @@
-language: php
-
-branches:
-  only: [master]
-
-sudo: false
-
-php:
-  - 5.4
-  - 5.5
-  - 5.6
-  - 7.0
-  - hhvm
-
-env:
-  - COMPOSER_CMD="composer install"
-  - COMPOSER_CMD="composer update --prefer-lowest"
-matrix:
-  include:
-    - php: "7.0"
-      env: RUN_CS_FIXER=true COMPOSER_CMD="composer install"
-
-before_script:
-  - $(echo $COMPOSER_CMD)
-
-script:
-  - if [ "${RUN_CS_FIXER}" = "true" ]; then
-      vendor/bin/php-cs-fixer fix --dry-run --diff --config-file=.php_cs .;
-    else
-      vendor/bin/phpunit;
-    fi
diff --git a/mayor-orig/www/include/share/googleapi/google/auth/CHANGELOG.md b/mayor-orig/www/include/share/googleapi/google/auth/CHANGELOG.md
deleted file mode 100644
index 1628dc51..00000000
--- a/mayor-orig/www/include/share/googleapi/google/auth/CHANGELOG.md
+++ /dev/null
@@ -1,8 +0,0 @@
-## 0.4.0 (23/04/2015)
-
-### Changes
-
-* Export callback function to update auth metadata ([@stanley-cheung][])
-* Adds an implementation of User Refresh Token auth ([@stanley-cheung][])
-
-[@stanley-cheung]: https://github.com/stanley-cheung
diff --git a/mayor-orig/www/include/share/googleapi/google/auth/CONTRIBUTING.md b/mayor-orig/www/include/share/googleapi/google/auth/CONTRIBUTING.md
deleted file mode 100644
index 0cfb74b6..00000000
--- a/mayor-orig/www/include/share/googleapi/google/auth/CONTRIBUTING.md
+++ /dev/null
@@ -1,73 +0,0 @@
-# How to become a contributor and submit your own code
-
-## Contributor License Agreements
-
-We'd love to accept your sample apps and patches! Before we can take them, we
-have to jump a couple of legal hurdles.
-
-Please fill out either the individual or corporate Contributor License Agreement
-(CLA).
-
-  * If you are an individual writing original source code and you're sure you
-    own the intellectual property, then you'll need to sign an [individual CLA]
-    (http://code.google.com/legal/individual-cla-v1.0.html).
-  * If you work for a company that wants to allow you to contribute your work,
-    then you'll need to sign a [corporate CLA]
-    (http://code.google.com/legal/corporate-cla-v1.0.html).
-
-Follow either of the two links above to access the appropriate CLA and
-instructions for how to sign and return it. Once we receive it, we'll be able to
-accept your pull requests.
-
-## Issue reporting
-
-* Check that the issue has not already been reported.
-* Check that the issue has not already been fixed in the latest code
-  (a.k.a. `master`).
-* Be clear, concise and precise in your description of the problem.
-* Open an issue with a descriptive title and a summary in grammatically correct,
-    complete sentences.
-* Include any relevant code to the issue summary.
-
-## Pull requests
-
-* Read [how to properly contribute to open source projects on Github][2].
-* Fork the project.
-* Use a topic/feature branch to easily amend a pull request later, if necessary.
-* Write [good commit messages][3].
-* Use the same coding conventions as the rest of the project.
-* Commit and push until you are happy with your contribution.
-* Make sure to add tests for it. This is important so I don't break it
-  in a future version unintentionally.
-* Add an entry to the [Changelog](CHANGELOG.md) accordingly. See [changelog entry format](#changelog-entry-format).
-* Please try not to mess with the Rakefile, version, or history. If you want to
-  have your own version, or is otherwise necessary, that is fine, but please
-  isolate to its own commit so I can cherry-pick around it.
-* Make sure the test suite is passing and the code you wrote doesn't produce
-  phpunit or phplint offenses.
-* [Squash related commits together][5].
-* Open a [pull request][4] that relates to *only* one subject with a clear title
-  and description in grammatically correct, complete sentences.
-
-### Changelog entry format
-
-Here are a few examples:
-
-```
-* ADC Support for User Refresh Tokens (@tbetbetbe[])
-* [#16](https://github.com/google/google-auth-library-php/issues/16): ADC Support for User Refresh Tokens ([@tbetbetbe][])
-```
-
-* Mark it up in [Markdown syntax][6].
-* The entry line should start with `* ` (an asterisk and a space).
-* If the change has a related GitHub issue (e.g. a bug fix for a reported issue), put a link to the issue as `[#16](https://github.com/google/google-auth-library-php/issues/16): `.
-* Describe the brief of the change. The sentence should end with a punctuation.
-* At the end of the entry, add an implicit link to your GitHub user page as `([@username][])`.
-* If this is your first contribution to google-auth-library-php project, add a link definition for the implicit link to the bottom of the changelog as `[@username]: https://github.com/username`.
-
-[1]: https://github.com/google/google-auth-php-library/issues
-[2]: http://gun.io/blog/how-to-github-fork-branch-and-pull-request
-[3]: http://tbaggery.com/2008/04/19/a-note-about-git-commit-messages.html
-[4]: https://help.github.com/articles/using-pull-requests
-[5]: http://gitready.com/advanced/2009/02/10/squashing-commits-with-rebase.html
-[6]: http://daringfireball.net/projects/markdown/syntax
diff --git a/mayor-orig/www/include/share/googleapi/google/auth/COPYING b/mayor-orig/www/include/share/googleapi/google/auth/COPYING
deleted file mode 100644
index b5d5055a..00000000
--- a/mayor-orig/www/include/share/googleapi/google/auth/COPYING
+++ /dev/null
@@ -1,202 +0,0 @@
-
-                                 Apache License
-                           Version 2.0, January 2004
-                        http://www.apache.org/licenses/
-
-   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
-   1. Definitions.
-
-      "License" shall mean the terms and conditions for use, reproduction,
-      and distribution as defined by Sections 1 through 9 of this document.
-
-      "Licensor" shall mean the copyright owner or entity authorized by
-      the copyright owner that is granting the License.
-
-      "Legal Entity" shall mean the union of the acting entity and all
-      other entities that control, are controlled by, or are under common
-      control with that entity. For the purposes of this definition,
-      "control" means (i) the power, direct or indirect, to cause the
-      direction or management of such entity, whether by contract or
-      otherwise, or (ii) ownership of fifty percent (50%) or more of the
-      outstanding shares, or (iii) beneficial ownership of such entity.
-
-      "You" (or "Your") shall mean an individual or Legal Entity
-      exercising permissions granted by this License.
-
-      "Source" form shall mean the preferred form for making modifications,
-      including but not limited to software source code, documentation
-      source, and configuration files.
-
-      "Object" form shall mean any form resulting from mechanical
-      transformation or translation of a Source form, including but
-      not limited to compiled object code, generated documentation,
-      and conversions to other media types.
-
-      "Work" shall mean the work of authorship, whether in Source or
-      Object form, made available under the License, as indicated by a
-      copyright notice that is included in or attached to the work
-      (an example is provided in the Appendix below).
-
-      "Derivative Works" shall mean any work, whether in Source or Object
-      form, that is based on (or derived from) the Work and for which the
-      editorial revisions, annotations, elaborations, or other modifications
-      represent, as a whole, an original work of authorship. For the purposes
-      of this License, Derivative Works shall not include works that remain
-      separable from, or merely link (or bind by name) to the interfaces of,
-      the Work and Derivative Works thereof.
-
-      "Contribution" shall mean any work of authorship, including
-      the original version of the Work and any modifications or additions
-      to that Work or Derivative Works thereof, that is intentionally
-      submitted to Licensor for inclusion in the Work by the copyright owner
-      or by an individual or Legal Entity authorized to submit on behalf of
-      the copyright owner. For the purposes of this definition, "submitted"
-      means any form of electronic, verbal, or written communication sent
-      to the Licensor or its representatives, including but not limited to
-      communication on electronic mailing lists, source code control systems,
-      and issue tracking systems that are managed by, or on behalf of, the
-      Licensor for the purpose of discussing and improving the Work, but
-      excluding communication that is conspicuously marked or otherwise
-      designated in writing by the copyright owner as "Not a Contribution."
-
-      "Contributor" shall mean Licensor and any individual or Legal Entity
-      on behalf of whom a Contribution has been received by Licensor and
-      subsequently incorporated within the Work.
-
-   2. Grant of Copyright License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      copyright license to reproduce, prepare Derivative Works of,
-      publicly display, publicly perform, sublicense, and distribute the
-      Work and such Derivative Works in Source or Object form.
-
-   3. Grant of Patent License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      (except as stated in this section) patent license to make, have made,
-      use, offer to sell, sell, import, and otherwise transfer the Work,
-      where such license applies only to those patent claims licensable
-      by such Contributor that are necessarily infringed by their
-      Contribution(s) alone or by combination of their Contribution(s)
-      with the Work to which such Contribution(s) was submitted. If You
-      institute patent litigation against any entity (including a
-      cross-claim or counterclaim in a lawsuit) alleging that the Work
-      or a Contribution incorporated within the Work constitutes direct
-      or contributory patent infringement, then any patent licenses
-      granted to You under this License for that Work shall terminate
-      as of the date such litigation is filed.
-
-   4. Redistribution. You may reproduce and distribute copies of the
-      Work or Derivative Works thereof in any medium, with or without
-      modifications, and in Source or Object form, provided that You
-      meet the following conditions:
-
-      (a) You must give any other recipients of the Work or
-          Derivative Works a copy of this License; and
-
-      (b) You must cause any modified files to carry prominent notices
-          stating that You changed the files; and
-
-      (c) You must retain, in the Source form of any Derivative Works
-          that You distribute, all copyright, patent, trademark, and
-          attribution notices from the Source form of the Work,
-          excluding those notices that do not pertain to any part of
-          the Derivative Works; and
-
-      (d) If the Work includes a "NOTICE" text file as part of its
-          distribution, then any Derivative Works that You distribute must
-          include a readable copy of the attribution notices contained
-          within such NOTICE file, excluding those notices that do not
-          pertain to any part of the Derivative Works, in at least one
-          of the following places: within a NOTICE text file distributed
-          as part of the Derivative Works; within the Source form or
-          documentation, if provided along with the Derivative Works; or,
-          within a display generated by the Derivative Works, if and
-          wherever such third-party notices normally appear. The contents
-          of the NOTICE file are for informational purposes only and
-          do not modify the License. You may add Your own attribution
-          notices within Derivative Works that You distribute, alongside
-          or as an addendum to the NOTICE text from the Work, provided
-          that such additional attribution notices cannot be construed
-          as modifying the License.
-
-      You may add Your own copyright statement to Your modifications and
-      may provide additional or different license terms and conditions
-      for use, reproduction, or distribution of Your modifications, or
-      for any such Derivative Works as a whole, provided Your use,
-      reproduction, and distribution of the Work otherwise complies with
-      the conditions stated in this License.
-
-   5. Submission of Contributions. Unless You explicitly state otherwise,
-      any Contribution intentionally submitted for inclusion in the Work
-      by You to the Licensor shall be under the terms and conditions of
-      this License, without any additional terms or conditions.
-      Notwithstanding the above, nothing herein shall supersede or modify
-      the terms of any separate license agreement you may have executed
-      with Licensor regarding such Contributions.
-
-   6. Trademarks. This License does not grant permission to use the trade
-      names, trademarks, service marks, or product names of the Licensor,
-      except as required for reasonable and customary use in describing the
-      origin of the Work and reproducing the content of the NOTICE file.
-
-   7. Disclaimer of Warranty. Unless required by applicable law or
-      agreed to in writing, Licensor provides the Work (and each
-      Contributor provides its Contributions) on an "AS IS" BASIS,
-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-      implied, including, without limitation, any warranties or conditions
-      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
-      PARTICULAR PURPOSE. You are solely responsible for determining the
-      appropriateness of using or redistributing the Work and assume any
-      risks associated with Your exercise of permissions under this License.
-
-   8. Limitation of Liability. In no event and under no legal theory,
-      whether in tort (including negligence), contract, or otherwise,
-      unless required by applicable law (such as deliberate and grossly
-      negligent acts) or agreed to in writing, shall any Contributor be
-      liable to You for damages, including any direct, indirect, special,
-      incidental, or consequential damages of any character arising as a
-      result of this License or out of the use or inability to use the
-      Work (including but not limited to damages for loss of goodwill,
-      work stoppage, computer failure or malfunction, or any and all
-      other commercial damages or losses), even if such Contributor
-      has been advised of the possibility of such damages.
-
-   9. Accepting Warranty or Additional Liability. While redistributing
-      the Work or Derivative Works thereof, You may choose to offer,
-      and charge a fee for, acceptance of support, warranty, indemnity,
-      or other liability obligations and/or rights consistent with this
-      License. However, in accepting such obligations, You may act only
-      on Your own behalf and on Your sole responsibility, not on behalf
-      of any other Contributor, and only if You agree to indemnify,
-      defend, and hold each Contributor harmless for any liability
-      incurred by, or claims asserted against, such Contributor by reason
-      of your accepting any such warranty or additional liability.
-
-   END OF TERMS AND CONDITIONS
-
-   APPENDIX: How to apply the Apache License to your work.
-
-      To apply the Apache License to your work, attach the following
-      boilerplate notice, with the fields enclosed by brackets "[]"
-      replaced with your own identifying information. (Don't include
-      the brackets!)  The text should be enclosed in the appropriate
-      comment syntax for the file format. We also recommend that a
-      file or class name and description of purpose be included on the
-      same "printed page" as the copyright notice for easier
-      identification within third-party archives.
-
-   Copyright 2015 Google Inc.
-
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
diff --git a/mayor-orig/www/include/share/googleapi/google/auth/LICENSE b/mayor-orig/www/include/share/googleapi/google/auth/LICENSE
deleted file mode 100644
index a148ba56..00000000
--- a/mayor-orig/www/include/share/googleapi/google/auth/LICENSE
+++ /dev/null
@@ -1,203 +0,0 @@
-Apache License
-Version 2.0, January 2004
-http://www.apache.org/licenses/
-
-TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
-1. Definitions.
-
-"License" shall mean the terms and conditions for use, reproduction,
-and distribution as defined by Sections 1 through 9 of this document.
-
-"Licensor" shall mean the copyright owner or entity authorized by
-the copyright owner that is granting the License.
-
-"Legal Entity" shall mean the union of the acting entity and all
-other entities that control, are controlled by, or are under common
-control with that entity. For the purposes of this definition,
-"control" means (i) the power, direct or indirect, to cause the
-direction or management of such entity, whether by contract or
-otherwise, or (ii) ownership of fifty percent (50%) or more of the
-outstanding shares, or (iii) beneficial ownership of such entity.
-
-"You" (or "Your") shall mean an individual or Legal Entity
-exercising permissions granted by this License.
-
-"Source" form shall mean the preferred form for making modifications,
-including but not limited to software source code, documentation
-source, and configuration files.
-
-"Object" form shall mean any form resulting from mechanical
-transformation or translation of a Source form, including but
-not limited to compiled object code, generated documentation,
-and conversions to other media types.
-
-"Work" shall mean the work of authorship, whether in Source or
-Object form, made available under the License, as indicated by a
-copyright notice that is included in or attached to the work
-(an example is provided in the Appendix below).
-
-"Derivative Works" shall mean any work, whether in Source or Object
-form, that is based on (or derived from) the Work and for which the
-editorial revisions, annotations, elaborations, or other modifications
-represent, as a whole, an original work of authorship. For the purposes
-of this License, Derivative Works shall not include works that remain
-separable from, or merely link (or bind by name) to the interfaces of,
-the Work and Derivative Works thereof.
-
-"Contribution" shall mean any work of authorship, including
-the original version of the Work and any modifications or additions
-to that Work or Derivative Works thereof, that is intentionally
-submitted to Licensor for inclusion in the Work by the copyright owner
-or by an individual or Legal Entity authorized to submit on behalf of
-the copyright owner. For the purposes of this definition, "submitted"
-means any form of electronic, verbal, or written communication sent
-to the Licensor or its representatives, including but not limited to
-communication on electronic mailing lists, source code control systems,
-and issue tracking systems that are managed by, or on behalf of, the
-Licensor for the purpose of discussing and improving the Work, but
-excluding communication that is conspicuously marked or otherwise
-designated in writing by the copyright owner as "Not a Contribution."
-
-"Contributor" shall mean Licensor and any individual or Legal Entity
-on behalf of whom a Contribution has been received by Licensor and
-subsequently incorporated within the Work.
-
-2. Grant of Copyright License. Subject to the terms and conditions of
-this License, each Contributor hereby grants to You a perpetual,
-worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-copyright license to reproduce, prepare Derivative Works of,
-publicly display, publicly perform, sublicense, and distribute the
-Work and such Derivative Works in Source or Object form.
-
-3. Grant of Patent License. Subject to the terms and conditions of
-this License, each Contributor hereby grants to You a perpetual,
-worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-(except as stated in this section) patent license to make, have made,
-use, offer to sell, sell, import, and otherwise transfer the Work,
-where such license applies only to those patent claims licensable
-by such Contributor that are necessarily infringed by their
-Contribution(s) alone or by combination of their Contribution(s)
-with the Work to which such Contribution(s) was submitted. If You
-institute patent litigation against any entity (including a
-cross-claim or counterclaim in a lawsuit) alleging that the Work
-or a Contribution incorporated within the Work constitutes direct
-or contributory patent infringement, then any patent licenses
-granted to You under this License for that Work shall terminate
-as of the date such litigation is filed.
-
-4. Redistribution. You may reproduce and distribute copies of the
-Work or Derivative Works thereof in any medium, with or without
-modifications, and in Source or Object form, provided that You
-meet the following conditions:
-
-(a) You must give any other recipients of the Work or
-Derivative Works a copy of this License; and
-
-(b) You must cause any modified files to carry prominent notices
-stating that You changed the files; and
-
-(c) You must retain, in the Source form of any Derivative Works
-that You distribute, all copyright, patent, trademark, and
-attribution notices from the Source form of the Work,
-excluding those notices that do not pertain to any part of
-the Derivative Works; and
-
-(d) If the Work includes a "NOTICE" text file as part of its
-distribution, then any Derivative Works that You distribute must
-include a readable copy of the attribution notices contained
-within such NOTICE file, excluding those notices that do not
-pertain to any part of the Derivative Works, in at least one
-of the following places: within a NOTICE text file distributed
-as part of the Derivative Works; within the Source form or
-documentation, if provided along with the Derivative Works; or,
-within a display generated by the Derivative Works, if and
-wherever such third-party notices normally appear. The contents
-of the NOTICE file are for informational purposes only and
-do not modify the License. You may add Your own attribution
-notices within Derivative Works that You distribute, alongside
-or as an addendum to the NOTICE text from the Work, provided
-that such additional attribution notices cannot be construed
-as modifying the License.
-
-You may add Your own copyright statement to Your modifications and
-may provide additional or different license terms and conditions
-for use, reproduction, or distribution of Your modifications, or
-for any such Derivative Works as a whole, provided Your use,
-reproduction, and distribution of the Work otherwise complies with
-the conditions stated in this License.
-
-5. Submission of Contributions. Unless You explicitly state otherwise,
-any Contribution intentionally submitted for inclusion in the Work
-by You to the Licensor shall be under the terms and conditions of
-this License, without any additional terms or conditions.
-Notwithstanding the above, nothing herein shall supersede or modify
-the terms of any separate license agreement you may have executed
-with Licensor regarding such Contributions.
-
-6. Trademarks. This License does not grant permission to use the trade
-names, trademarks, service marks, or product names of the Licensor,
-except as required for reasonable and customary use in describing the
-origin of the Work and reproducing the content of the NOTICE file.
-
-7. Disclaimer of Warranty. Unless required by applicable law or
-agreed to in writing, Licensor provides the Work (and each
-Contributor provides its Contributions) on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-implied, including, without limitation, any warranties or conditions
-of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
-PARTICULAR PURPOSE. You are solely responsible for determining the
-appropriateness of using or redistributing the Work and assume any
-risks associated with Your exercise of permissions under this License.
-
-8. Limitation of Liability. In no event and under no legal theory,
-whether in tort (including negligence), contract, or otherwise,
-unless required by applicable law (such as deliberate and grossly
-negligent acts) or agreed to in writing, shall any Contributor be
-liable to You for damages, including any direct, indirect, special,
-incidental, or consequential damages of any character arising as a
-result of this License or out of the use or inability to use the
-Work (including but not limited to damages for loss of goodwill,
-work stoppage, computer failure or malfunction, or any and all
-other commercial damages or losses), even if such Contributor
-has been advised of the possibility of such damages.
-
-9. Accepting Warranty or Additional Liability. While redistributing
-the Work or Derivative Works thereof, You may choose to offer,
-and charge a fee for, acceptance of support, warranty, indemnity,
-or other liability obligations and/or rights consistent with this
-License. However, in accepting such obligations, You may act only
-on Your own behalf and on Your sole responsibility, not on behalf
-of any other Contributor, and only if You agree to indemnify,
-defend, and hold each Contributor harmless for any liability
-incurred by, or claims asserted against, such Contributor by reason
-of your accepting any such warranty or additional liability.
-
-END OF TERMS AND CONDITIONS
-
-APPENDIX: How to apply the Apache License to your work.
-
-To apply the Apache License to your work, attach the following
-boilerplate notice, with the fields enclosed by brackets "[]"
-replaced with your own identifying information. (Don't include
-the brackets!) The text should be enclosed in the appropriate
-comment syntax for the file format. We also recommend that a
-file or class name and description of purpose be included on the
-same "printed page" as the copyright notice for easier
-identification within third-party archives.
-
-Copyright [yyyy] [name of copyright owner]
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-
-
diff --git a/mayor-orig/www/include/share/googleapi/google/auth/README.md b/mayor-orig/www/include/share/googleapi/google/auth/README.md
deleted file mode 100644
index 05265f71..00000000
--- a/mayor-orig/www/include/share/googleapi/google/auth/README.md
+++ /dev/null
@@ -1,150 +0,0 @@
-# Google Auth Library for PHP
-
-

-  
Homepage
http://www.github.com/google/google-auth-library-php

-  
Authors

-    
Tim Emiola

-    
Stanley Cheung

-    
Brent Shaffer

-  
Copyright
Copyright © 2015 Google, Inc.

-  
License
Apache 2.0

-

-
-## Description
-
-This is Google's officially supported PHP client library for using OAuth 2.0
-authorization and authentication with Google APIs.
-
-### Installing via Composer
-
-The recommended way to install the google auth library is through
-[Composer](http://getcomposer.org).
-
-```bash
-# Install Composer
-curl -sS https://getcomposer.org/installer | php
-```
-
-Next, run the Composer command to install the latest stable version:
-
-```bash
-composer.phar require google/auth
-```
-
-## Application Default Credentials
-
-This library provides an implementation of
-[application default credentials][application default credentials] for PHP.
-
-The Application Default Credentials provide a simple way to get authorization
-credentials for use in calling Google APIs.
-
-They are best suited for cases when the call needs to have the same identity
-and authorization level for the application independent of the user. This is
-the recommended approach to authorize calls to Cloud APIs, particularly when
-you're building an application that uses Google Compute Engine.
-
-#### Download your Service Account Credentials JSON file
-
-To use `Application Default Credentials`, You first need to download a set of
-JSON credentials for your project. Go to **APIs & Auth** > **Credentials** in
-the [Google Developers Console][developer console] and select
-**Service account** from the **Add credentials** dropdown.
-
-> This file is your *only copy* of these credentials. It should never be
-> committed with your source code, and should be stored securely.
-
-Once downloaded, store the path to this file in the
-`GOOGLE_APPLICATION_CREDENTIALS` environment variable.
-
-```php
-putenv('GOOGLE_APPLICATION_CREDENTIALS=/path/to/my/credentials.json');
-```
-
-> PHP's `putenv` function is just one way to set an environment variable.
-> Consider using `.htaccess` or apache configuration files as well.
-
-#### Enable the API you want to use
-
-Before making your API call, you must be sure the API you're calling has been
-enabled. Go to **APIs & Auth** > **APIs** in the
-[Google Developers Console][developer console] and enable the APIs you'd like to
-call. For the example below, you must enable the `Drive API`.
-
-#### Call the APIs
-
-As long as you update the environment variable below to point to *your* JSON
-credentials file, the following code should output a list of your Drive files.
-
-```php
-use Google\Auth\ApplicationDefaultCredentials;
-use GuzzleHttp\Client;
-use GuzzleHttp\HandlerStack;
-
-// specify the path to your application credentials
-putenv('GOOGLE_APPLICATION_CREDENTIALS=/path/to/my/credentials.json');
-
-// define the scopes for your API call
-$scopes = ['https://www.googleapis.com/auth/drive.readonly'];
-
-// create middleware
-$middleware = ApplicationDefaultCredentials::getMiddleware($scopes);
-$stack = HandlerStack::create();
-$stack->push($middleware);
-
-// create the HTTP client
-$client = new Client([
-  'handler' => $stack,
-  'base_url' => 'https://www.googleapis.com',
-  'auth' => 'google_auth'  // authorize all requests
-]);
-
-// make the request
-$response = $client->get('drive/v2/files');
-
-// show the result!
-print_r((string) $response->getBody());
-```
-
-##### Guzzle 5 Compatibility
-
-If you are using [Guzzle 5][Guzzle 5], replace the `create middleware` and
-`create the HTTP Client` steps with the following:
-
-```php
-// create the HTTP client
-$client = new Client([
-  'base_url' => 'https://www.googleapis.com',
-  'auth' => 'google_auth'  // authorize all requests
-]);
-
-// create subscriber
-$subscriber = ApplicationDefaultCredentials::getSubscriber($scopes);
-$client->getEmitter()->attach($subscriber);
-
-```
-
-## License
-
-This library is licensed under Apache 2.0. Full license text is
-available in [COPYING][copying].
-
-## Contributing
-
-See [CONTRIBUTING][contributing].
-
-## Support
-
-Please
-[report bugs at the project on Github](https://github.com/google/google-auth-library-php/issues). Don't
-hesitate to
-[ask questions](http://stackoverflow.com/questions/tagged/google-auth-library-php)
-about the client or APIs on [StackOverflow](http://stackoverflow.com).
-
-[google-apis-php-client]: https://github.com/google/google-api-php-client
-[application default credentials]: https://developers.google.com/accounts/docs/application-default-credentials
-[contributing]: https://github.com/google/google-auth-library-php/tree/master/CONTRIBUTING.md
-[copying]: https://github.com/google/google-auth-library-php/tree/master/COPYING
-[Guzzle]: https://github.com/guzzle/guzzle
-[Guzzle 5]: http://docs.guzzlephp.org/en/5.3
-[developer console]: https://console.developers.google.com
diff --git a/mayor-orig/www/include/share/googleapi/google/auth/autoload.php b/mayor-orig/www/include/share/googleapi/google/auth/autoload.php
deleted file mode 100644
index f5473378..00000000
--- a/mayor-orig/www/include/share/googleapi/google/auth/autoload.php
+++ /dev/null
@@ -1,34 +0,0 @@
- 3) {
-        // Maximum class file path depth in this project is 3.
-    $classPath = array_slice($classPath, 0, 3);
-    }
-    $filePath = dirname(__FILE__) . '/src/' . implode('/', $classPath) . '.php';
-    if (file_exists($filePath)) {
-        require_once $filePath;
-    }
-}
-
-spl_autoload_register('oauth2client_php_autoload');
diff --git a/mayor-orig/www/include/share/googleapi/google/auth/composer.json b/mayor-orig/www/include/share/googleapi/google/auth/composer.json
deleted file mode 100644
index c528ada1..00000000
--- a/mayor-orig/www/include/share/googleapi/google/auth/composer.json
+++ /dev/null
@@ -1,28 +0,0 @@
-{
-  "name": "google/auth",
-  "type": "library",
-  "description": "Google Auth Library for PHP",
-  "keywords": ["google", "oauth2", "authentication"],
-  "homepage": "http://github.com/google/google-auth-library-php",
-  "license": "Apache-2.0",
-  "require": {
-    "php": ">=5.4",
-    "firebase/php-jwt": "~2.0|~3.0|~4.0",
-    "guzzlehttp/guzzle": "~5.3|~6.0",
-    "guzzlehttp/psr7": "~1.2",
-    "psr/http-message": "^1.0",
-    "psr/cache": "^1.0"
-  },
-  "require-dev": {
-    "phpunit/phpunit": "3.7.*",
-    "friendsofphp/php-cs-fixer": "^1.11"
-  },
-  "autoload": {
-    "classmap": [
-      "src/"
-    ],
-    "psr-4": {
-      "Google\\Auth\\": "src"
-    }
-  }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/auth/phpunit.xml.dist b/mayor-orig/www/include/share/googleapi/google/auth/phpunit.xml.dist
deleted file mode 100644
index bace58bb..00000000
--- a/mayor-orig/www/include/share/googleapi/google/auth/phpunit.xml.dist
+++ /dev/null
@@ -1,16 +0,0 @@
-
-
-  
-    
-      tests
-    
-  
-  
-    
-      src
-      
-        src/
-      
-    
-  
-
diff --git a/mayor-orig/www/include/share/googleapi/google/auth/src/ApplicationDefaultCredentials.php b/mayor-orig/www/include/share/googleapi/google/auth/src/ApplicationDefaultCredentials.php
deleted file mode 100644
index 5d944db9..00000000
--- a/mayor-orig/www/include/share/googleapi/google/auth/src/ApplicationDefaultCredentials.php
+++ /dev/null
@@ -1,173 +0,0 @@
-push($middleware);
- *
- *   $client = new Client([
- *       'handler' => $stack,
- *       'base_uri' => 'https://www.googleapis.com/taskqueue/v1beta2/projects/',
- *       'auth' => 'google_auth' // authorize all requests
- *   ]);
- *
- *   $res = $client->get('myproject/taskqueues/myqueue');
- */
-class ApplicationDefaultCredentials
-{
-    /**
-     * Obtains an AuthTokenSubscriber that uses the default FetchAuthTokenInterface
-     * implementation to use in this environment.
-     *
-     * If supplied, $scope is used to in creating the credentials instance if
-     * this does not fallback to the compute engine defaults.
-     *
-     * @param string|array scope the scope of the access request, expressed
-     *   either as an Array or as a space-delimited String.
-     * @param callable $httpHandler callback which delivers psr7 request
-     * @param array $cacheConfig configuration for the cache when it's present
-     * @param CacheItemPoolInterface $cache an implementation of CacheItemPoolInterface
-     *
-     * @return AuthTokenSubscriber
-     *
-     * @throws DomainException if no implementation can be obtained.
-     */
-    public static function getSubscriber(
-        $scope = null,
-        callable $httpHandler = null,
-        array $cacheConfig = null,
-        CacheItemPoolInterface $cache = null
-    ) {
-        $creds = self::getCredentials($scope, $httpHandler, $cacheConfig, $cache);
-
-        return new AuthTokenSubscriber($creds, $cacheConfig);
-    }
-
-    /**
-     * Obtains an AuthTokenMiddleware that uses the default FetchAuthTokenInterface
-     * implementation to use in this environment.
-     *
-     * If supplied, $scope is used to in creating the credentials instance if
-     * this does not fallback to the compute engine defaults.
-     *
-     * @param string|array scope the scope of the access request, expressed
-     *   either as an Array or as a space-delimited String.
-     * @param callable $httpHandler callback which delivers psr7 request
-     * @param array $cacheConfig configuration for the cache when it's present
-     * @param CacheItemPoolInterface $cache
-     *
-     * @return AuthTokenMiddleware
-     *
-     * @throws DomainException if no implementation can be obtained.
-     */
-    public static function getMiddleware(
-        $scope = null,
-        callable $httpHandler = null,
-        array $cacheConfig = null,
-        CacheItemPoolInterface $cache = null
-    ) {
-        $creds = self::getCredentials($scope, $httpHandler, $cacheConfig, $cache);
-
-        return new AuthTokenMiddleware($creds, $cacheConfig);
-    }
-
-    /**
-     * Obtains the default FetchAuthTokenInterface implementation to use
-     * in this environment.
-     *
-     * If supplied, $scope is used to in creating the credentials instance if
-     * this does not fallback to the Compute Engine defaults.
-     *
-     * @param string|array scope the scope of the access request, expressed
-     *   either as an Array or as a space-delimited String.
-     * @param callable $httpHandler callback which delivers psr7 request
-     * @param array $cacheConfig configuration for the cache when it's present
-     * @param CacheItemPoolInterface $cache
-     *
-     * @return CredentialsLoader
-     *
-     * @throws DomainException if no implementation can be obtained.
-     */
-    public static function getCredentials(
-        $scope = null,
-        callable $httpHandler = null,
-        array $cacheConfig = null,
-        CacheItemPoolInterface $cache = null
-    ) {
-        $creds = null;
-        $jsonKey = CredentialsLoader::fromEnv()
-            ?: CredentialsLoader::fromWellKnownFile();
-
-        if (!is_null($jsonKey)) {
-            $creds = CredentialsLoader::makeCredentials($scope, $jsonKey);
-        } elseif (AppIdentityCredentials::onAppEngine() && !GCECredentials::onAppEngineFlexible()) {
-            $creds = new AppIdentityCredentials($scope);
-        } elseif (GCECredentials::onGce($httpHandler)) {
-            $creds = new GCECredentials();
-        }
-
-        if (is_null($creds)) {
-            throw new \DomainException(self::notFound());
-        }
-        if (!is_null($cache)) {
-            $creds = new FetchAuthTokenCache($creds, $cacheConfig, $cache);
-        }
-        return $creds;
-    }
-
-    private static function notFound()
-    {
-        $msg = 'Could not load the default credentials. Browse to ';
-        $msg .= 'https://developers.google.com';
-        $msg .= '/accounts/docs/application-default-credentials';
-        $msg .= ' for more information';
-
-        return $msg;
-    }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/auth/src/Cache/InvalidArgumentException.php b/mayor-orig/www/include/share/googleapi/google/auth/src/Cache/InvalidArgumentException.php
deleted file mode 100644
index 331e5611..00000000
--- a/mayor-orig/www/include/share/googleapi/google/auth/src/Cache/InvalidArgumentException.php
+++ /dev/null
@@ -1,24 +0,0 @@
-key = $key;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function getKey()
-    {
-        return $this->key;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function get()
-    {
-        return $this->isHit() ? $this->value : null;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function isHit()
-    {
-        if (!$this->isHit) {
-            return false;
-        }
-
-        if ($this->expiration === null) {
-            return true;
-        }
-
-        return new \DateTime() < $this->expiration;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function set($value)
-    {
-        $this->isHit = true;
-        $this->value = $value;
-
-        return $this;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function expiresAt($expiration)
-    {
-        if ($this->isValidExpiration($expiration)) {
-            $this->expiration = $expiration;
-
-            return $this;
-        }
-
-        $implementationMessage = interface_exists('DateTimeInterface')
-            ? 'implement interface DateTimeInterface'
-            : 'be an instance of DateTime';
-
-        $error = sprintf(
-            'Argument 1 passed to %s::expiresAt() must %s, %s given',
-            get_class($this),
-            $implementationMessage,
-            gettype($expiration)
-        );
-
-        $this->handleError($error);
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function expiresAfter($time)
-    {
-        if (is_int($time)) {
-            $this->expiration = new \DateTime("now + $time seconds");
-        } elseif ($time instanceof \DateInterval) {
-            $this->expiration = (new \DateTime())->add($time);
-        } elseif ($time === null) {
-            $this->expiration = $time;
-        } else {
-            $message = 'Argument 1 passed to %s::expiresAfter() must be an ' .
-                       'instance of DateInterval or of the type integer, %s given';
-            $error = sprintf($message, get_class($this), gettype($expiration));
-
-            $this->handleError($error);
-        }
-
-        return $this;
-    }
-
-    /**
-     * Handles an error.
-     *
-     * @param string $error
-     * @throws \TypeError
-     */
-    private function handleError($error)
-    {
-        if (class_exists('TypeError')) {
-            throw new \TypeError($error);
-        }
-
-        trigger_error($error, E_USER_ERROR);
-    }
-
-    /**
-     * Determines if an expiration is valid based on the rules defined by PSR6.
-     *
-     * @param mixed $expiration
-     * @return bool
-     */
-    private function isValidExpiration($expiration)
-    {
-        if ($expiration === null) {
-            return true;
-        }
-
-        // We test for two types here due to the fact the DateTimeInterface
-        // was not introduced until PHP 5.5. Checking for the DateTime type as
-        // well allows us to support 5.4.
-        if ($expiration instanceof \DateTimeInterface) {
-            return true;
-        }
-
-        if ($expiration instanceof \DateTime) {
-            return true;
-        }
-
-        return false;
-    }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/auth/src/Cache/MemoryCacheItemPool.php b/mayor-orig/www/include/share/googleapi/google/auth/src/Cache/MemoryCacheItemPool.php
deleted file mode 100644
index 9533c2cd..00000000
--- a/mayor-orig/www/include/share/googleapi/google/auth/src/Cache/MemoryCacheItemPool.php
+++ /dev/null
@@ -1,155 +0,0 @@
-getItems([$key]));
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function getItems(array $keys = [])
-    {
-        $items = [];
-
-        foreach ($keys as $key) {
-            $this->isValidKey($key);
-            $items[$key] = $this->hasItem($key) ? clone $this->items[$key] : new Item($key);
-        }
-
-        return $items;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function hasItem($key)
-    {
-        $this->isValidKey($key);
-
-        return isset($this->items[$key]) && $this->items[$key]->isHit();
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function clear()
-    {
-        $this->items = [];
-        $this->deferred = [];
-
-        return true;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function deleteItem($key)
-    {
-        return $this->deleteItems([$key]);
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function deleteItems(array $keys)
-    {
-        array_walk($keys, [$this, 'isValidKey']);
-
-        foreach ($keys as $key) {
-            unset($this->items[$key]);
-        }
-
-        return true;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function save(CacheItemInterface $item)
-    {
-        $this->items[$item->getKey()] = $item;
-
-        return true;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function saveDeferred(CacheItemInterface $item)
-    {
-        $this->deferredItems[$item->getKey()] = $item;
-
-        return true;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function commit()
-    {
-        foreach ($this->deferredItems as $item) {
-            $this->save($item);
-        }
-
-        $this->deferredItems = [];
-
-        return true;
-    }
-
-    /**
-     * Determines if the provided key is valid.
-     *
-     * @param string $key
-     * @return bool
-     * @throws InvalidArgumentException
-     */
-    private function isValidKey($key)
-    {
-        $invalidCharacters = '{}()/\\\\@:';
-
-        if (!is_string($key) || preg_match("#[$invalidCharacters]#", $key)) {
-            throw new InvalidArgumentException('The provided key is not valid: ' . var_export($key, true));
-        }
-
-        return true;
-    }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/auth/src/CacheTrait.php b/mayor-orig/www/include/share/googleapi/google/auth/src/CacheTrait.php
deleted file mode 100644
index 02b4b923..00000000
--- a/mayor-orig/www/include/share/googleapi/google/auth/src/CacheTrait.php
+++ /dev/null
@@ -1,72 +0,0 @@
-cache)) {
-            return;
-        }
-
-        $key = $this->getFullCacheKey($k);
-        if (is_null($key)) {
-            return;
-        }
-
-        $cacheItem = $this->cache->getItem($key);
-        return $cacheItem->get();
-    }
-
-    /**
-     * Saves the value in the cache when that is available.
-     */
-    private function setCachedValue($k, $v)
-    {
-        if (is_null($this->cache)) {
-            return;
-        }
-
-        $key = $this->getFullCacheKey($k);
-        if (is_null($key)) {
-            return;
-        }
-
-        $cacheItem = $this->cache->getItem($key);
-        $cacheItem->set($v);
-        $cacheItem->expiresAfter($this->cacheConfig['lifetime']);
-        return $this->cache->save($cacheItem);
-    }
-
-    private function getFullCacheKey($key)
-    {
-        if (is_null($key)) {
-            return;
-        }
-
-        $key = $this->cacheConfig['prefix'] . $key;
-
-        // ensure we do not have illegal characters
-        return preg_replace('|[^a-zA-Z0-9_\.!]|', '', $key);
-    }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/auth/src/Credentials/AppIdentityCredentials.php b/mayor-orig/www/include/share/googleapi/google/auth/src/Credentials/AppIdentityCredentials.php
deleted file mode 100644
index 661c64c9..00000000
--- a/mayor-orig/www/include/share/googleapi/google/auth/src/Credentials/AppIdentityCredentials.php
+++ /dev/null
@@ -1,149 +0,0 @@
-push($middleware);
- *
- *   $client = new Client([
- *       'handler' => $stack,
- *       'base_uri' => 'https://www.googleapis.com/books/v1',
- *       'auth' => 'google_auth'
- *   ]);
- *
- *   $res = $client->get('volumes?q=Henry+David+Thoreau&country=US');
- */
-class AppIdentityCredentials extends CredentialsLoader
-{
-    /**
-     * Result of fetchAuthToken.
-     *
-     * @array
-     */
-    protected $lastReceivedToken;
-
-    /**
-     * Array of OAuth2 scopes to be requested.
-     */
-    private $scope;
-
-    public function __construct($scope = array())
-    {
-        $this->scope = $scope;
-    }
-
-    /**
-     * Determines if this an App Engine instance, by accessing the SERVER_SOFTWARE
-     * environment variable.
-     *
-     * @return true if this an App Engine Instance, false otherwise
-     */
-    public static function onAppEngine()
-    {
-        return isset($_SERVER['SERVER_SOFTWARE']) &&
-        strpos($_SERVER['SERVER_SOFTWARE'], 'Google App Engine') !== false;
-    }
-
-    /**
-     * Implements FetchAuthTokenInterface#fetchAuthToken.
-     *
-     * Fetches the auth tokens using the AppIdentityService if available.
-     * As the AppIdentityService uses protobufs to fetch the access token,
-     * the GuzzleHttp\ClientInterface instance passed in will not be used.
-     *
-     * @param callable $httpHandler callback which delivers psr7 request
-     *
-     * @return array the auth metadata:
-     *  array(2) {
-     *   ["access_token"]=>
-     *   string(3) "xyz"
-     *   ["expiration_time"]=>
-     *   string(10) "1444339905"
-     *  }
-     *
-     * @throws \Exception
-     */
-    public function fetchAuthToken(callable $httpHandler = null)
-    {
-        if (!self::onAppEngine()) {
-            return array();
-        }
-
-        if (!class_exists('google\appengine\api\app_identity\AppIdentityService')) {
-            throw new \Exception(
-                'This class must be run in App Engine, or you must include the AppIdentityService '
-                . 'mock class defined in tests/mocks/AppIdentityService.php'
-            );
-        }
-
-        // AppIdentityService expects an array when multiple scopes are supplied
-        $scope = is_array($this->scope) ? $this->scope : explode(' ', $this->scope);
-
-        $token = AppIdentityService::getAccessToken($scope);
-        $this->lastReceivedToken = $token;
-
-        return $token;
-    }
-
-    /**
-     * @return array|null
-     */
-    public function getLastReceivedToken()
-    {
-        if ($this->lastReceivedToken) {
-            return [
-                'access_token' => $this->lastReceivedToken['access_token'],
-                'expires_at' => $this->lastReceivedToken['expiration_time'],
-            ];
-        }
-
-        return null;
-    }
-
-    /**
-     * Caching is handled by the underlying AppIdentityService, return empty string
-     * to prevent caching.
-     *
-     * @return string
-     */
-    public function getCacheKey()
-    {
-        return '';
-    }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/auth/src/Credentials/GCECredentials.php b/mayor-orig/www/include/share/googleapi/google/auth/src/Credentials/GCECredentials.php
deleted file mode 100644
index 43115290..00000000
--- a/mayor-orig/www/include/share/googleapi/google/auth/src/Credentials/GCECredentials.php
+++ /dev/null
@@ -1,219 +0,0 @@
-push($middleware);
- *
- *   $client = new Client([
- *      'handler' => $stack,
- *      'base_uri' => 'https://www.googleapis.com/taskqueue/v1beta2/projects/',
- *      'auth' => 'google_auth'
- *   ]);
- *
- *   $res = $client->get('myproject/taskqueues/myqueue');
- */
-class GCECredentials extends CredentialsLoader
-{
-    const cacheKey = 'GOOGLE_AUTH_PHP_GCE';
-    /**
-     * The metadata IP address on appengine instances.
-     *
-     * The IP is used instead of the domain 'metadata' to avoid slow responses
-     * when not on Compute Engine.
-     */
-    const METADATA_IP = '169.254.169.254';
-
-    /**
-     * The metadata path of the default token.
-     */
-    const TOKEN_URI_PATH = 'v1/instance/service-accounts/default/token';
-
-    /**
-     * The header whose presence indicates GCE presence.
-     */
-    const FLAVOR_HEADER = 'Metadata-Flavor';
-
-    /**
-     * Flag used to ensure that the onGCE test is only done once;.
-     *
-     * @var bool
-     */
-    private $hasCheckedOnGce = false;
-
-    /**
-     * Flag that stores the value of the onGCE check.
-     *
-     * @var bool
-     */
-    private $isOnGce = false;
-
-    /**
-     * Result of fetchAuthToken.
-     */
-    protected $lastReceivedToken;
-
-    /**
-     * The full uri for accessing the default token.
-     *
-     * @return string
-     */
-    public static function getTokenUri()
-    {
-        $base = 'http://' . self::METADATA_IP . '/computeMetadata/';
-
-        return $base . self::TOKEN_URI_PATH;
-    }
-
-    /**
-     * Determines if this an App Engine Flexible instance, by accessing the
-     * GAE_VM environment variable.
-     *
-     * @return true if this an App Engine Flexible Instance, false otherwise
-     */
-    public static function onAppEngineFlexible()
-    {
-        return isset($_SERVER['GAE_VM']) && 'true' === $_SERVER['GAE_VM'];
-    }
-
-    /**
-     * Determines if this a GCE instance, by accessing the expected metadata
-     * host.
-     * If $httpHandler is not specified a the default HttpHandler is used.
-     *
-     * @param callable $httpHandler callback which delivers psr7 request
-     *
-     * @return true if this a GCEInstance false otherwise
-     */
-    public static function onGce(callable $httpHandler = null)
-    {
-        if (is_null($httpHandler)) {
-            $httpHandler = HttpHandlerFactory::build();
-        }
-        $checkUri = 'http://' . self::METADATA_IP;
-        try {
-            // Comment from: oauth2client/client.py
-            //
-            // Note: the explicit `timeout` below is a workaround. The underlying
-            // issue is that resolving an unknown host on some networks will take
-            // 20-30 seconds; making this timeout short fixes the issue, but
-            // could lead to false negatives in the event that we are on GCE, but
-            // the metadata resolution was particularly slow. The latter case is
-            // "unlikely".
-            $resp = $httpHandler(
-                new Request('GET', $checkUri),
-                ['timeout' => 0.3]
-            );
-
-            return $resp->getHeaderLine(self::FLAVOR_HEADER) == 'Google';
-        } catch (ClientException $e) {
-            return false;
-        } catch (ServerException $e) {
-            return false;
-        } catch (RequestException $e) {
-            return false;
-        }
-    }
-
-    /**
-     * Implements FetchAuthTokenInterface#fetchAuthToken.
-     *
-     * Fetches the auth tokens from the GCE metadata host if it is available.
-     * If $httpHandler is not specified a the default HttpHandler is used.
-     *
-     * @param callable $httpHandler callback which delivers psr7 request
-     *
-     * @return array the response
-     *
-     * @throws \Exception
-     */
-    public function fetchAuthToken(callable $httpHandler = null)
-    {
-        if (is_null($httpHandler)) {
-            $httpHandler = HttpHandlerFactory::build();
-        }
-        if (!$this->hasCheckedOnGce) {
-            $this->isOnGce = self::onGce($httpHandler);
-        }
-        if (!$this->isOnGce) {
-            return array();  // return an empty array with no access token
-        }
-        $resp = $httpHandler(
-            new Request(
-                'GET',
-                self::getTokenUri(),
-                [self::FLAVOR_HEADER => 'Google']
-            )
-        );
-        $body = (string)$resp->getBody();
-
-        // Assume it's JSON; if it's not throw an exception
-        if (null === $json = json_decode($body, true)) {
-            throw new \Exception('Invalid JSON response');
-        }
-
-        // store this so we can retrieve it later
-        $this->lastReceivedToken = $json;
-        $this->lastReceivedToken['expires_at'] = time() + $json['expires_in'];
-
-        return $json;
-    }
-
-    /**
-     * @return string
-     */
-    public function getCacheKey()
-    {
-        return self::cacheKey;
-    }
-
-    /**
-     * @return array|null
-     */
-    public function getLastReceivedToken()
-    {
-        if ($this->lastReceivedToken) {
-            return [
-                'access_token' => $this->lastReceivedToken['access_token'],
-                'expires_at' => $this->lastReceivedToken['expires_at'],
-            ];
-        }
-
-        return null;
-    }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/auth/src/Credentials/IAMCredentials.php b/mayor-orig/www/include/share/googleapi/google/auth/src/Credentials/IAMCredentials.php
deleted file mode 100644
index 0d2a37d1..00000000
--- a/mayor-orig/www/include/share/googleapi/google/auth/src/Credentials/IAMCredentials.php
+++ /dev/null
@@ -1,89 +0,0 @@
-selector = $selector;
-        $this->token = $token;
-    }
-
-    /**
-     * export a callback function which updates runtime metadata.
-     *
-     * @return array updateMetadata function
-     */
-    public function getUpdateMetadataFunc()
-    {
-        return array($this, 'updateMetadata');
-    }
-
-    /**
-     * Updates metadata with the appropriate header metadata.
-     *
-     * @param array $metadata metadata hashmap
-     * @param string $unusedAuthUri optional auth uri
-     * @param callable $httpHandler callback which delivers psr7 request
-     *        Note: this param is unused here, only included here for
-     *        consistency with other credentials class
-     *
-     * @return array updated metadata hashmap
-     */
-    public function updateMetadata(
-        $metadata,
-        $unusedAuthUri = null,
-        callable $httpHandler = null
-    ) {
-        $metadata_copy = $metadata;
-        $metadata_copy[self::SELECTOR_KEY] = $this->selector;
-        $metadata_copy[self::TOKEN_KEY] = $this->token;
-
-        return $metadata_copy;
-    }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/auth/src/Credentials/ServiceAccountCredentials.php b/mayor-orig/www/include/share/googleapi/google/auth/src/Credentials/ServiceAccountCredentials.php
deleted file mode 100644
index db391ecf..00000000
--- a/mayor-orig/www/include/share/googleapi/google/auth/src/Credentials/ServiceAccountCredentials.php
+++ /dev/null
@@ -1,177 +0,0 @@
-push($middleware);
- *
- *   $client = new Client([
- *       'handler' => $stack,
- *       'base_uri' => 'https://www.googleapis.com/taskqueue/v1beta2/projects/',
- *       'auth' => 'google_auth' // authorize all requests
- *   ]);
- *
- *   $res = $client->get('myproject/taskqueues/myqueue');
- */
-class ServiceAccountCredentials extends CredentialsLoader
-{
-    /**
-     * The OAuth2 instance used to conduct authorization.
-     *
-     * @var OAuth2
-     */
-    protected $auth;
-
-    /**
-     * Create a new ServiceAccountCredentials.
-     *
-     * @param string|array $scope the scope of the access request, expressed
-     *   either as an Array or as a space-delimited String.
-     * @param string|array $jsonKey JSON credential file path or JSON credentials
-     *   as an associative array
-     * @param string $sub an email address account to impersonate, in situations when
-     *   the service account has been delegated domain wide access.
-     */
-    public function __construct(
-        $scope,
-        $jsonKey,
-        $sub = null
-    ) {
-        if (is_string($jsonKey)) {
-            if (!file_exists($jsonKey)) {
-                throw new \InvalidArgumentException('file does not exist');
-            }
-            $jsonKeyStream = file_get_contents($jsonKey);
-            if (!$jsonKey = json_decode($jsonKeyStream, true)) {
-                throw new \LogicException('invalid json for auth config');
-            }
-        }
-        if (!array_key_exists('client_email', $jsonKey)) {
-            throw new \InvalidArgumentException(
-                'json key is missing the client_email field');
-        }
-        if (!array_key_exists('private_key', $jsonKey)) {
-            throw new \InvalidArgumentException(
-                'json key is missing the private_key field');
-        }
-        $this->auth = new OAuth2([
-            'audience' => self::TOKEN_CREDENTIAL_URI,
-            'issuer' => $jsonKey['client_email'],
-            'scope' => $scope,
-            'signingAlgorithm' => 'RS256',
-            'signingKey' => $jsonKey['private_key'],
-            'sub' => $sub,
-            'tokenCredentialUri' => self::TOKEN_CREDENTIAL_URI,
-        ]);
-    }
-
-    /**
-     * @param callable $httpHandler
-     *
-     * @return array
-     */
-    public function fetchAuthToken(callable $httpHandler = null)
-    {
-        return $this->auth->fetchAuthToken($httpHandler);
-    }
-
-    /**
-     * @return string
-     */
-    public function getCacheKey()
-    {
-        $key = $this->auth->getIssuer() . ':' . $this->auth->getCacheKey();
-        if ($sub = $this->auth->getSub()) {
-            $key .= ':' . $sub;
-        }
-
-        return $key;
-    }
-
-    /**
-     * @return array
-     */
-    public function getLastReceivedToken()
-    {
-        return $this->auth->getLastReceivedToken();
-    }
-
-    /**
-     * Updates metadata with the authorization token.
-     *
-     * @param array $metadata metadata hashmap
-     * @param string $authUri optional auth uri
-     * @param callable $httpHandler callback which delivers psr7 request
-     *
-     * @return array updated metadata hashmap
-     */
-    public function updateMetadata(
-        $metadata,
-        $authUri = null,
-        callable $httpHandler = null
-    ) {
-        // scope exists. use oauth implementation
-        $scope = $this->auth->getScope();
-        if (!is_null($scope)) {
-            return parent::updateMetadata($metadata, $authUri, $httpHandler);
-        }
-
-        // no scope found. create jwt with the auth uri
-        $credJson = array(
-            'private_key' => $this->auth->getSigningKey(),
-            'client_email' => $this->auth->getIssuer(),
-        );
-        $jwtCreds = new ServiceAccountJwtAccessCredentials($credJson);
-
-        return $jwtCreds->updateMetadata($metadata, $authUri, $httpHandler);
-    }
-
-    /**
-     * @param string $sub an email address account to impersonate, in situations when
-     *   the service account has been delegated domain wide access.
-     */
-    public function setSub($sub)
-    {
-        $this->auth->setSub($sub);
-    }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/auth/src/Credentials/ServiceAccountJwtAccessCredentials.php b/mayor-orig/www/include/share/googleapi/google/auth/src/Credentials/ServiceAccountJwtAccessCredentials.php
deleted file mode 100644
index 28cc7096..00000000
--- a/mayor-orig/www/include/share/googleapi/google/auth/src/Credentials/ServiceAccountJwtAccessCredentials.php
+++ /dev/null
@@ -1,131 +0,0 @@
-auth = new OAuth2([
-            'issuer' => $jsonKey['client_email'],
-            'sub' => $jsonKey['client_email'],
-            'signingAlgorithm' => 'RS256',
-            'signingKey' => $jsonKey['private_key'],
-        ]);
-    }
-
-    /**
-     * Updates metadata with the authorization token.
-     *
-     * @param array $metadata metadata hashmap
-     * @param string $authUri optional auth uri
-     * @param callable $httpHandler callback which delivers psr7 request
-     *
-     * @return array updated metadata hashmap
-     */
-    public function updateMetadata(
-        $metadata,
-        $authUri = null,
-        callable $httpHandler = null
-    ) {
-        if (empty($authUri)) {
-            return $metadata;
-        }
-
-        $this->auth->setAudience($authUri);
-
-        return parent::updateMetadata($metadata, $authUri, $httpHandler);
-    }
-
-    /**
-     * Implements FetchAuthTokenInterface#fetchAuthToken.
-     *
-     * @param callable $httpHandler
-     *
-     * @return array|void
-     */
-    public function fetchAuthToken(callable $httpHandler = null)
-    {
-        $audience = $this->auth->getAudience();
-        if (empty($audience)) {
-            return null;
-        }
-
-        $access_token = $this->auth->toJwt();
-
-        return array('access_token' => $access_token);
-    }
-
-    /**
-     * @return string
-     */
-    public function getCacheKey()
-    {
-        return $this->auth->getCacheKey();
-    }
-
-    /**
-     * @return array
-     */
-    public function getLastReceivedToken()
-    {
-        return $this->auth->getLastReceivedToken();
-    }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/auth/src/Credentials/UserRefreshCredentials.php b/mayor-orig/www/include/share/googleapi/google/auth/src/Credentials/UserRefreshCredentials.php
deleted file mode 100644
index 6c7e5cfa..00000000
--- a/mayor-orig/www/include/share/googleapi/google/auth/src/Credentials/UserRefreshCredentials.php
+++ /dev/null
@@ -1,110 +0,0 @@
-auth = new OAuth2([
-            'clientId' => $jsonKey['client_id'],
-            'clientSecret' => $jsonKey['client_secret'],
-            'refresh_token' => $jsonKey['refresh_token'],
-            'scope' => $scope,
-            'tokenCredentialUri' => self::TOKEN_CREDENTIAL_URI,
-        ]);
-    }
-
-    /**
-     * @param callable $httpHandler
-     *
-     * @return array
-     */
-    public function fetchAuthToken(callable $httpHandler = null)
-    {
-        return $this->auth->fetchAuthToken($httpHandler);
-    }
-
-    /**
-     * @return string
-     */
-    public function getCacheKey()
-    {
-        return $this->auth->getClientId() . ':' . $this->auth->getCacheKey();
-    }
-
-    /**
-     * @return array
-     */
-    public function getLastReceivedToken()
-    {
-        return $this->auth->getLastReceivedToken();
-    }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/auth/src/CredentialsLoader.php b/mayor-orig/www/include/share/googleapi/google/auth/src/CredentialsLoader.php
deleted file mode 100644
index 5ddeda5e..00000000
--- a/mayor-orig/www/include/share/googleapi/google/auth/src/CredentialsLoader.php
+++ /dev/null
@@ -1,163 +0,0 @@
-fetchAuthToken($httpHandler);
-        if (!isset($result['access_token'])) {
-            return $metadata;
-        }
-        $metadata_copy = $metadata;
-        $metadata_copy[self::AUTH_METADATA_KEY] = array('Bearer ' . $result['access_token']);
-
-        return $metadata_copy;
-    }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/auth/src/FetchAuthTokenCache.php b/mayor-orig/www/include/share/googleapi/google/auth/src/FetchAuthTokenCache.php
deleted file mode 100644
index 5b8e01b0..00000000
--- a/mayor-orig/www/include/share/googleapi/google/auth/src/FetchAuthTokenCache.php
+++ /dev/null
@@ -1,108 +0,0 @@
-fetcher = $fetcher;
-        $this->cache = $cache;
-        $this->cacheConfig = array_merge([
-            'lifetime' => 1500,
-            'prefix' => '',
-        ], (array) $cacheConfig);
-    }
-
-    /**
-     * Implements FetchAuthTokenInterface#fetchAuthToken.
-     *
-     * Checks the cache for a valid auth token and fetches the auth tokens
-     * from the supplied fetcher.
-     *
-     * @param callable $httpHandler callback which delivers psr7 request
-     *
-     * @return array the response
-     *
-     * @throws \Exception
-     */
-    public function fetchAuthToken(callable $httpHandler = null)
-    {
-        // Use the cached value if its available.
-        //
-        // TODO: correct caching; update the call to setCachedValue to set the expiry
-        // to the value returned with the auth token.
-        //
-        // TODO: correct caching; enable the cache to be cleared.
-        $cacheKey = $this->fetcher->getCacheKey();
-        $cached = $this->getCachedValue($cacheKey);
-        if (!empty($cached)) {
-            return ['access_token' => $cached];
-        }
-
-        $auth_token = $this->fetcher->fetchAuthToken($httpHandler);
-
-        if (isset($auth_token['access_token'])) {
-            $this->setCachedValue($cacheKey, $auth_token['access_token']);
-        }
-
-        return $auth_token;
-    }
-
-    /**
-     * @return string
-     */
-    public function getCacheKey()
-    {
-        return $this->getFullCacheKey($this->fetcher->getCacheKey());
-    }
-
-    /**
-     * @return array|null
-     */
-    public function getLastReceivedToken()
-    {
-        return $this->fetcher->getLastReceivedToken();
-    }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/auth/src/FetchAuthTokenInterface.php b/mayor-orig/www/include/share/googleapi/google/auth/src/FetchAuthTokenInterface.php
deleted file mode 100644
index e3d8d28b..00000000
--- a/mayor-orig/www/include/share/googleapi/google/auth/src/FetchAuthTokenInterface.php
+++ /dev/null
@@ -1,55 +0,0 @@
-client = $client;
-    }
-
-    /**
-     * Accepts a PSR-7 Request and an array of options and returns a PSR-7 response.
-     *
-     * @param RequestInterface $request
-     * @param array $options
-     *
-     * @return ResponseInterface
-     */
-    public function __invoke(RequestInterface $request, array $options = [])
-    {
-        $request = $this->client->createRequest(
-            $request->getMethod(),
-            $request->getUri(),
-            array_merge([
-                'headers' => $request->getHeaders(),
-                'body' => $request->getBody(),
-            ], $options)
-        );
-
-        $response = $this->client->send($request);
-
-        return new Response(
-            $response->getStatusCode(),
-            $response->getHeaders() ?: [],
-            $response->getBody(),
-            $response->getProtocolVersion(),
-            $response->getReasonPhrase()
-        );
-    }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/auth/src/HttpHandler/Guzzle6HttpHandler.php b/mayor-orig/www/include/share/googleapi/google/auth/src/HttpHandler/Guzzle6HttpHandler.php
deleted file mode 100644
index 79cc7954..00000000
--- a/mayor-orig/www/include/share/googleapi/google/auth/src/HttpHandler/Guzzle6HttpHandler.php
+++ /dev/null
@@ -1,36 +0,0 @@
-client = $client;
-    }
-
-    /**
-     * Accepts a PSR-7 request and an array of options and returns a PSR-7 response.
-     *
-     * @param RequestInterface $request
-     * @param array $options
-     *
-     * @return ResponseInterface
-     */
-    public function __invoke(RequestInterface $request, array $options = [])
-    {
-        return $this->client->send($request, $options);
-    }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/auth/src/HttpHandler/HttpHandlerFactory.php b/mayor-orig/www/include/share/googleapi/google/auth/src/HttpHandler/HttpHandlerFactory.php
deleted file mode 100644
index 1ede7982..00000000
--- a/mayor-orig/www/include/share/googleapi/google/auth/src/HttpHandler/HttpHandlerFactory.php
+++ /dev/null
@@ -1,47 +0,0 @@
-'
- */
-class AuthTokenMiddleware
-{
-    /**
-     * @var callback
-     */
-    private $httpHandler;
-
-    /**
-     * @var FetchAuthTokenInterface
-     */
-    private $fetcher;
-
-    /**
-     * @var callable
-     */
-    private $tokenCallback;
-
-    /**
-     * Creates a new AuthTokenMiddleware.
-     *
-     * @param FetchAuthTokenInterface $fetcher is used to fetch the auth token
-     * @param callable $httpHandler (optional) callback which delivers psr7 request
-     * @param callable $tokenCallback (optional) function to be called when a new token is fetched.
-     */
-    public function __construct(
-        FetchAuthTokenInterface $fetcher,
-        callable $httpHandler = null,
-        callable $tokenCallback = null
-    ) {
-        $this->fetcher = $fetcher;
-        $this->httpHandler = $httpHandler;
-        $this->tokenCallback = $tokenCallback;
-    }
-
-    /**
-     * Updates the request with an Authorization header when auth is 'google_auth'.
-     *
-     *   use Google\Auth\Middleware\AuthTokenMiddleware;
-     *   use Google\Auth\OAuth2;
-     *   use GuzzleHttp\Client;
-     *   use GuzzleHttp\HandlerStack;
-     *
-     *   $config = [...];
-     *   $oauth2 = new OAuth2($config)
-     *   $middleware = new AuthTokenMiddleware($oauth2);
-     *   $stack = HandlerStack::create();
-     *   $stack->push($middleware);
-     *
-     *   $client = new Client([
-     *       'handler' => $stack,
-     *       'base_uri' => 'https://www.googleapis.com/taskqueue/v1beta2/projects/',
-     *       'auth' => 'google_auth' // authorize all requests
-     *   ]);
-     *
-     *   $res = $client->get('myproject/taskqueues/myqueue');
-     *
-     * @param callable $handler
-     *
-     * @return \Closure
-     */
-    public function __invoke(callable $handler)
-    {
-        return function (RequestInterface $request, array $options) use ($handler) {
-            // Requests using "auth"="google_auth" will be authorized.
-            if (!isset($options['auth']) || $options['auth'] !== 'google_auth') {
-                return $handler($request, $options);
-            }
-
-            $request = $request->withHeader('Authorization', 'Bearer ' . $this->fetchToken());
-
-            return $handler($request, $options);
-        };
-    }
-
-    /**
-     * Call fetcher to fetch the token.
-     *
-     * @return string
-     */
-    private function fetchToken()
-    {
-        $auth_tokens = $this->fetcher->fetchAuthToken($this->httpHandler);
-
-        if (array_key_exists('access_token', $auth_tokens)) {
-            // notify the callback if applicable
-            if ($this->tokenCallback) {
-                call_user_func($this->tokenCallback, $this->fetcher->getCacheKey(), $auth_tokens['access_token']);
-            }
-
-            return $auth_tokens['access_token'];
-        }
-    }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/auth/src/Middleware/ScopedAccessTokenMiddleware.php b/mayor-orig/www/include/share/googleapi/google/auth/src/Middleware/ScopedAccessTokenMiddleware.php
deleted file mode 100644
index f0d533cf..00000000
--- a/mayor-orig/www/include/share/googleapi/google/auth/src/Middleware/ScopedAccessTokenMiddleware.php
+++ /dev/null
@@ -1,175 +0,0 @@
-'
- */
-class ScopedAccessTokenMiddleware
-{
-    use CacheTrait;
-
-    const DEFAULT_CACHE_LIFETIME = 1500;
-
-    /**
-     * @var CacheItemPoolInterface
-     */
-    private $cache;
-
-    /**
-     * @var array configuration
-     */
-    private $cacheConfig;
-
-    /**
-     * @var callable
-     */
-    private $tokenFunc;
-
-    /**
-     * @var array|string
-     */
-    private $scopes;
-
-    /**
-     * Creates a new ScopedAccessTokenMiddleware.
-     *
-     * @param callable $tokenFunc a token generator function
-     * @param array|string $scopes the token authentication scopes
-     * @param array $cacheConfig configuration for the cache when it's present
-     * @param CacheItemPoolInterface $cache an implementation of CacheItemPoolInterface
-     */
-    public function __construct(
-        callable $tokenFunc,
-        $scopes,
-        array $cacheConfig = null,
-        CacheItemPoolInterface $cache = null
-    ) {
-        $this->tokenFunc = $tokenFunc;
-        if (!(is_string($scopes) || is_array($scopes))) {
-            throw new \InvalidArgumentException(
-                'wants scope should be string or array');
-        }
-        $this->scopes = $scopes;
-
-        if (!is_null($cache)) {
-            $this->cache = $cache;
-            $this->cacheConfig = array_merge([
-                'lifetime' => self::DEFAULT_CACHE_LIFETIME,
-                'prefix' => '',
-            ], $cacheConfig);
-        }
-    }
-
-    /**
-     * Updates the request with an Authorization header when auth is 'scoped'.
-     *
-     *   E.g this could be used to authenticate using the AppEngine
-     *   AppIdentityService.
-     *
-     *   use google\appengine\api\app_identity\AppIdentityService;
-     *   use Google\Auth\Middleware\ScopedAccessTokenMiddleware;
-     *   use GuzzleHttp\Client;
-     *   use GuzzleHttp\HandlerStack;
-     *
-     *   $scope = 'https://www.googleapis.com/auth/taskqueue'
-     *   $middleware = new ScopedAccessTokenMiddleware(
-     *       'AppIdentityService::getAccessToken',
-     *       $scope,
-     *       [ 'prefix' => 'Google\Auth\ScopedAccessToken::' ],
-     *       $cache = new Memcache()
-     *   );
-     *   $stack = HandlerStack::create();
-     *   $stack->push($middleware);
-     *
-     *   $client = new Client([
-     *       'handler' => $stack,
-     *       'base_url' => 'https://www.googleapis.com/taskqueue/v1beta2/projects/',
-     *       'auth' => 'google_auth' // authorize all requests
-     *   ]);
-     *
-     *   $res = $client->get('myproject/taskqueues/myqueue');
-     *
-     * @param callable $handler
-     *
-     * @return \Closure
-     */
-    public function __invoke(callable $handler)
-    {
-        return function (RequestInterface $request, array $options) use ($handler) {
-            // Requests using "auth"="scoped" will be authorized.
-            if (!isset($options['auth']) || $options['auth'] !== 'scoped') {
-                return $handler($request, $options);
-            }
-
-            $request = $request->withHeader('Authorization', 'Bearer ' . $this->fetchToken());
-
-            return $handler($request, $options);
-        };
-    }
-
-    /**
-     * @return string
-     */
-    private function getCacheKey()
-    {
-        $key = null;
-
-        if (is_string($this->scopes)) {
-            $key .= $this->scopes;
-        } elseif (is_array($this->scopes)) {
-            $key .= implode(':', $this->scopes);
-        }
-
-        return $key;
-    }
-
-    /**
-     * Determine if token is available in the cache, if not call tokenFunc to
-     * fetch it.
-     *
-     * @return string
-     */
-    private function fetchToken()
-    {
-        $cacheKey = $this->getCacheKey();
-        $cached = $this->getCachedValue($cacheKey);
-
-        if (!empty($cached)) {
-            return $cached;
-        }
-
-        $token = call_user_func($this->tokenFunc, $this->scopes);
-        $this->setCachedValue($cacheKey, $token);
-
-        return $token;
-    }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/auth/src/Middleware/SimpleMiddleware.php b/mayor-orig/www/include/share/googleapi/google/auth/src/Middleware/SimpleMiddleware.php
deleted file mode 100644
index c31fc657..00000000
--- a/mayor-orig/www/include/share/googleapi/google/auth/src/Middleware/SimpleMiddleware.php
+++ /dev/null
@@ -1,93 +0,0 @@
-config = array_merge(['key' => null], $config);
-    }
-
-    /**
-     * Updates the request query with the developer key if auth is set to simple.
-     *
-     *   use Google\Auth\Middleware\SimpleMiddleware;
-     *   use GuzzleHttp\Client;
-     *   use GuzzleHttp\HandlerStack;
-     *
-     *   $my_key = 'is not the same as yours';
-     *   $middleware = new SimpleMiddleware(['key' => $my_key]);
-     *   $stack = HandlerStack::create();
-     *   $stack->push($middleware);
-     *
-     *   $client = new Client([
-     *       'handler' => $stack,
-     *       'base_uri' => 'https://www.googleapis.com/discovery/v1/',
-     *       'auth' => 'simple'
-     *   ]);
-     *
-     *   $res = $client->get('drive/v2/rest');
-     *
-     * @param callable $handler
-     *
-     * @return \Closure
-     */
-    public function __invoke(callable $handler)
-    {
-        return function (RequestInterface $request, array $options) use ($handler) {
-            // Requests using "auth"="scoped" will be authorized.
-            if (!isset($options['auth']) || $options['auth'] !== 'simple') {
-                return $handler($request, $options);
-            }
-
-            $query = Psr7\parse_query($request->getUri()->getQuery());
-            $params = array_merge($query, $this->config);
-            $uri = $request->getUri()->withQuery(Psr7\build_query($params));
-            $request = $request->withUri($uri);
-
-            return $handler($request, $options);
-        };
-    }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/auth/src/OAuth2.php b/mayor-orig/www/include/share/googleapi/google/auth/src/OAuth2.php
deleted file mode 100644
index d5378239..00000000
--- a/mayor-orig/www/include/share/googleapi/google/auth/src/OAuth2.php
+++ /dev/null
@@ -1,1306 +0,0 @@
- self::DEFAULT_EXPIRY_SECONDS,
-            'extensionParams' => [],
-            'authorizationUri' => null,
-            'redirectUri' => null,
-            'tokenCredentialUri' => null,
-            'state' => null,
-            'username' => null,
-            'password' => null,
-            'clientId' => null,
-            'clientSecret' => null,
-            'issuer' => null,
-            'sub' => null,
-            'audience' => null,
-            'signingKey' => null,
-            'signingAlgorithm' => null,
-            'scope' => null,
-        ], $config);
-
-        $this->setAuthorizationUri($opts['authorizationUri']);
-        $this->setRedirectUri($opts['redirectUri']);
-        $this->setTokenCredentialUri($opts['tokenCredentialUri']);
-        $this->setState($opts['state']);
-        $this->setUsername($opts['username']);
-        $this->setPassword($opts['password']);
-        $this->setClientId($opts['clientId']);
-        $this->setClientSecret($opts['clientSecret']);
-        $this->setIssuer($opts['issuer']);
-        $this->setSub($opts['sub']);
-        $this->setExpiry($opts['expiry']);
-        $this->setAudience($opts['audience']);
-        $this->setSigningKey($opts['signingKey']);
-        $this->setSigningAlgorithm($opts['signingAlgorithm']);
-        $this->setScope($opts['scope']);
-        $this->setExtensionParams($opts['extensionParams']);
-        $this->updateToken($opts);
-    }
-
-    /**
-     * Verifies the idToken if present.
-     *
-     * - if none is present, return null
-     * - if present, but invalid, raises DomainException.
-     * - otherwise returns the payload in the idtoken as a PHP object.
-     *
-     * if $publicKey is null, the key is decoded without being verified.
-     *
-     * @param string $publicKey The public key to use to authenticate the token
-     * @param array $allowed_algs List of supported verification algorithms
-     *
-     * @return null|object
-     */
-    public function verifyIdToken($publicKey = null, $allowed_algs = array())
-    {
-        $idToken = $this->getIdToken();
-        if (is_null($idToken)) {
-            return null;
-        }
-
-        $resp = $this->jwtDecode($idToken, $publicKey, $allowed_algs);
-        if (!property_exists($resp, 'aud')) {
-            throw new \DomainException('No audience found the id token');
-        }
-        if ($resp->aud != $this->getAudience()) {
-            throw new \DomainException('Wrong audience present in the id token');
-        }
-
-        return $resp;
-    }
-
-    /**
-     * Obtains the encoded jwt from the instance data.
-     *
-     * @param array $config array optional configuration parameters
-     *
-     * @return string
-     */
-    public function toJwt(array $config = [])
-    {
-        if (is_null($this->getSigningKey())) {
-            throw new \DomainException('No signing key available');
-        }
-        if (is_null($this->getSigningAlgorithm())) {
-            throw new \DomainException('No signing algorithm specified');
-        }
-        $now = time();
-
-        $opts = array_merge([
-            'skew' => self::DEFAULT_SKEW_SECONDS,
-        ], $config);
-
-        $assertion = [
-            'iss' => $this->getIssuer(),
-            'aud' => $this->getAudience(),
-            'exp' => ($now + $this->getExpiry()),
-            'iat' => ($now - $opts['skew']),
-        ];
-        foreach ($assertion as $k => $v) {
-            if (is_null($v)) {
-                throw new \DomainException($k . ' should not be null');
-            }
-        }
-        if (!(is_null($this->getScope()))) {
-            $assertion['scope'] = $this->getScope();
-        }
-        if (!(is_null($this->getSub()))) {
-            $assertion['sub'] = $this->getSub();
-        }
-
-        return $this->jwtEncode($assertion, $this->getSigningKey(),
-            $this->getSigningAlgorithm());
-    }
-
-    /**
-     * Generates a request for token credentials.
-     *
-     * @return RequestInterface the authorization Url.
-     */
-    public function generateCredentialsRequest()
-    {
-        $uri = $this->getTokenCredentialUri();
-        if (is_null($uri)) {
-            throw new \DomainException('No token credential URI was set.');
-        }
-
-        $grantType = $this->getGrantType();
-        $params = array('grant_type' => $grantType);
-        switch ($grantType) {
-            case 'authorization_code':
-                $params['code'] = $this->getCode();
-                $params['redirect_uri'] = $this->getRedirectUri();
-                $this->addClientCredentials($params);
-                break;
-            case 'password':
-                $params['username'] = $this->getUsername();
-                $params['password'] = $this->getPassword();
-                $this->addClientCredentials($params);
-                break;
-            case 'refresh_token':
-                $params['refresh_token'] = $this->getRefreshToken();
-                $this->addClientCredentials($params);
-                break;
-            case self::JWT_URN:
-                $params['assertion'] = $this->toJwt();
-                break;
-            default:
-                if (!is_null($this->getRedirectUri())) {
-                    # Grant type was supposed to be 'authorization_code', as there
-                    # is a redirect URI.
-                    throw new \DomainException('Missing authorization code');
-                }
-                unset($params['grant_type']);
-                if (!is_null($grantType)) {
-                    $params['grant_type'] = $grantType;
-                }
-                $params = array_merge($params, $this->getExtensionParams());
-        }
-
-        $headers = [
-            'Cache-Control' => 'no-store',
-            'Content-Type' => 'application/x-www-form-urlencoded',
-        ];
-
-        return new Request(
-            'POST',
-            $uri,
-            $headers,
-            Psr7\build_query($params)
-        );
-    }
-
-    /**
-     * Fetches the auth tokens based on the current state.
-     *
-     * @param callable $httpHandler callback which delivers psr7 request
-     *
-     * @return array the response
-     */
-    public function fetchAuthToken(callable $httpHandler = null)
-    {
-        if (is_null($httpHandler)) {
-            $httpHandler = HttpHandlerFactory::build();
-        }
-
-        $response = $httpHandler($this->generateCredentialsRequest());
-        $credentials = $this->parseTokenResponse($response);
-        $this->updateToken($credentials);
-
-        return $credentials;
-    }
-
-    /**
-     * Obtains a key that can used to cache the results of #fetchAuthToken.
-     *
-     * The key is derived from the scopes.
-     *
-     * @return string a key that may be used to cache the auth token.
-     */
-    public function getCacheKey()
-    {
-        if (is_string($this->scope)) {
-            return $this->scope;
-        } elseif (is_array($this->scope)) {
-            return implode(':', $this->scope);
-        }
-
-        // If scope has not set, return null to indicate no caching.
-        return null;
-    }
-
-    /**
-     * Parses the fetched tokens.
-     *
-     * @param ResponseInterface $resp the response.
-     *
-     * @return array the tokens parsed from the response body.
-     *
-     * @throws \Exception
-     */
-    public function parseTokenResponse(ResponseInterface $resp)
-    {
-        $body = (string)$resp->getBody();
-        if ($resp->hasHeader('Content-Type') &&
-            $resp->getHeaderLine('Content-Type') == 'application/x-www-form-urlencoded'
-        ) {
-            $res = array();
-            parse_str($body, $res);
-
-            return $res;
-        } else {
-            // Assume it's JSON; if it's not throw an exception
-            if (null === $res = json_decode($body, true)) {
-                throw new \Exception('Invalid JSON response');
-            }
-
-            return $res;
-        }
-    }
-
-    /**
-     * Updates an OAuth 2.0 client.
-     *
-     * @example
-     *   client.updateToken([
-     *     'refresh_token' => 'n4E9O119d',
-     *     'access_token' => 'FJQbwq9',
-     *     'expires_in' => 3600
-     *   ])
-     *
-     * @param array $config
-     *  The configuration parameters related to the token.
-     *
-     *  - refresh_token
-     *    The refresh token associated with the access token
-     *    to be refreshed.
-     *
-     *  - access_token
-     *    The current access token for this client.
-     *
-     *  - id_token
-     *    The current ID token for this client.
-     *
-     *  - expires_in
-     *    The time in seconds until access token expiration.
-     *
-     *  - expires_at
-     *    The time as an integer number of seconds since the Epoch
-     *
-     *  - issued_at
-     *    The timestamp that the token was issued at.
-     */
-    public function updateToken(array $config)
-    {
-        $opts = array_merge([
-            'extensionParams' => [],
-            'access_token' => null,
-            'id_token' => null,
-            'expires_in' => null,
-            'expires_at' => null,
-            'issued_at' => null,
-        ], $config);
-
-        $this->setExpiresAt($opts['expires_at']);
-        $this->setExpiresIn($opts['expires_in']);
-        // By default, the token is issued at `Time.now` when `expiresIn` is set,
-        // but this can be used to supply a more precise time.
-        if (!is_null($opts['issued_at'])) {
-            $this->setIssuedAt($opts['issued_at']);
-        }
-
-        $this->setAccessToken($opts['access_token']);
-        $this->setIdToken($opts['id_token']);
-        // The refresh token should only be updated if a value is explicitly
-        // passed in, as some access token responses do not include a refresh
-        // token.
-        if (array_key_exists('refresh_token', $opts)) {
-            $this->setRefreshToken($opts['refresh_token']);
-        }
-    }
-
-    /**
-     * Builds the authorization Uri that the user should be redirected to.
-     *
-     * @param array $config configuration options that customize the return url
-     *
-     * @return UriInterface the authorization Url.
-     *
-     * @throws InvalidArgumentException
-     */
-    public function buildFullAuthorizationUri(array $config = [])
-    {
-        if (is_null($this->getAuthorizationUri())) {
-            throw new InvalidArgumentException(
-                'requires an authorizationUri to have been set');
-        }
-
-        $params = array_merge([
-            'response_type' => 'code',
-            'access_type' => 'offline',
-            'client_id' => $this->clientId,
-            'redirect_uri' => $this->redirectUri,
-            'state' => $this->state,
-            'scope' => $this->getScope(),
-        ], $config);
-
-        // Validate the auth_params
-        if (is_null($params['client_id'])) {
-            throw new InvalidArgumentException(
-                'missing the required client identifier');
-        }
-        if (is_null($params['redirect_uri'])) {
-            throw new InvalidArgumentException('missing the required redirect URI');
-        }
-        if (!empty($params['prompt']) && !empty($params['approval_prompt'])) {
-            throw new InvalidArgumentException(
-                'prompt and approval_prompt are mutually exclusive');
-        }
-
-        // Construct the uri object; return it if it is valid.
-        $result = clone $this->authorizationUri;
-        $existingParams = Psr7\parse_query($result->getQuery());
-
-        $result = $result->withQuery(
-            Psr7\build_query(array_merge($existingParams, $params))
-        );
-
-        if ($result->getScheme() != 'https') {
-            throw new InvalidArgumentException(
-                'Authorization endpoint must be protected by TLS');
-        }
-
-        return $result;
-    }
-
-    /**
-     * Sets the authorization server's HTTP endpoint capable of authenticating
-     * the end-user and obtaining authorization.
-     *
-     * @param string $uri
-     */
-    public function setAuthorizationUri($uri)
-    {
-        $this->authorizationUri = $this->coerceUri($uri);
-    }
-
-    /**
-     * Gets the authorization server's HTTP endpoint capable of authenticating
-     * the end-user and obtaining authorization.
-     *
-     * @return UriInterface
-     */
-    public function getAuthorizationUri()
-    {
-        return $this->authorizationUri;
-    }
-
-    /**
-     * Gets the authorization server's HTTP endpoint capable of issuing tokens
-     * and refreshing expired tokens.
-     *
-     * @return string
-     */
-    public function getTokenCredentialUri()
-    {
-        return $this->tokenCredentialUri;
-    }
-
-    /**
-     * Sets the authorization server's HTTP endpoint capable of issuing tokens
-     * and refreshing expired tokens.
-     *
-     * @param string $uri
-     */
-    public function setTokenCredentialUri($uri)
-    {
-        $this->tokenCredentialUri = $this->coerceUri($uri);
-    }
-
-    /**
-     * Gets the redirection URI used in the initial request.
-     *
-     * @return string
-     */
-    public function getRedirectUri()
-    {
-        return $this->redirectUri;
-    }
-
-    /**
-     * Sets the redirection URI used in the initial request.
-     *
-     * @param string $uri
-     */
-    public function setRedirectUri($uri)
-    {
-        if (is_null($uri)) {
-            $this->redirectUri = null;
-
-            return;
-        }
-        // redirect URI must be absolute
-        if (!$this->isAbsoluteUri($uri)) {
-            // "postmessage" is a reserved URI string in Google-land
-            // @see https://developers.google.com/identity/sign-in/web/server-side-flow
-            if ('postmessage' !== (string)$uri) {
-                throw new InvalidArgumentException(
-                    'Redirect URI must be absolute');
-            }
-        }
-        $this->redirectUri = (string)$uri;
-    }
-
-    /**
-     * Gets the scope of the access requests as a space-delimited String.
-     *
-     * @return string
-     */
-    public function getScope()
-    {
-        if (is_null($this->scope)) {
-            return $this->scope;
-        }
-
-        return implode(' ', $this->scope);
-    }
-
-    /**
-     * Sets the scope of the access request, expressed either as an Array or as
-     * a space-delimited String.
-     *
-     * @param string|array $scope
-     *
-     * @throws InvalidArgumentException
-     */
-    public function setScope($scope)
-    {
-        if (is_null($scope)) {
-            $this->scope = null;
-        } elseif (is_string($scope)) {
-            $this->scope = explode(' ', $scope);
-        } elseif (is_array($scope)) {
-            foreach ($scope as $s) {
-                $pos = strpos($s, ' ');
-                if ($pos !== false) {
-                    throw new InvalidArgumentException(
-                        'array scope values should not contain spaces');
-                }
-            }
-            $this->scope = $scope;
-        } else {
-            throw new InvalidArgumentException(
-                'scopes should be a string or array of strings');
-        }
-    }
-
-    /**
-     * Gets the current grant type.
-     *
-     * @return string
-     */
-    public function getGrantType()
-    {
-        if (!is_null($this->grantType)) {
-            return $this->grantType;
-        }
-
-        // Returns the inferred grant type, based on the current object instance
-        // state.
-        if (!is_null($this->code)) {
-            return 'authorization_code';
-        } elseif (!is_null($this->refreshToken)) {
-            return 'refresh_token';
-        } elseif (!is_null($this->username) && !is_null($this->password)) {
-            return 'password';
-        } elseif (!is_null($this->issuer) && !is_null($this->signingKey)) {
-            return self::JWT_URN;
-        } else {
-            return null;
-        }
-    }
-
-    /**
-     * Sets the current grant type.
-     *
-     * @param $grantType
-     *
-     * @throws InvalidArgumentException
-     */
-    public function setGrantType($grantType)
-    {
-        if (in_array($grantType, self::$knownGrantTypes)) {
-            $this->grantType = $grantType;
-        } else {
-            // validate URI
-            if (!$this->isAbsoluteUri($grantType)) {
-                throw new InvalidArgumentException(
-                    'invalid grant type');
-            }
-            $this->grantType = (string)$grantType;
-        }
-    }
-
-    /**
-     * Gets an arbitrary string designed to allow the client to maintain state.
-     *
-     * @return string
-     */
-    public function getState()
-    {
-        return $this->state;
-    }
-
-    /**
-     * Sets an arbitrary string designed to allow the client to maintain state.
-     *
-     * @param string $state
-     */
-    public function setState($state)
-    {
-        $this->state = $state;
-    }
-
-    /**
-     * Gets the authorization code issued to this client.
-     */
-    public function getCode()
-    {
-        return $this->code;
-    }
-
-    /**
-     * Sets the authorization code issued to this client.
-     *
-     * @param string $code
-     */
-    public function setCode($code)
-    {
-        $this->code = $code;
-    }
-
-    /**
-     * Gets the resource owner's username.
-     */
-    public function getUsername()
-    {
-        return $this->username;
-    }
-
-    /**
-     * Sets the resource owner's username.
-     *
-     * @param string $username
-     */
-    public function setUsername($username)
-    {
-        $this->username = $username;
-    }
-
-    /**
-     * Gets the resource owner's password.
-     */
-    public function getPassword()
-    {
-        return $this->password;
-    }
-
-    /**
-     * Sets the resource owner's password.
-     *
-     * @param $password
-     */
-    public function setPassword($password)
-    {
-        $this->password = $password;
-    }
-
-    /**
-     * Sets a unique identifier issued to the client to identify itself to the
-     * authorization server.
-     */
-    public function getClientId()
-    {
-        return $this->clientId;
-    }
-
-    /**
-     * Sets a unique identifier issued to the client to identify itself to the
-     * authorization server.
-     *
-     * @param $clientId
-     */
-    public function setClientId($clientId)
-    {
-        $this->clientId = $clientId;
-    }
-
-    /**
-     * Gets a shared symmetric secret issued by the authorization server, which
-     * is used to authenticate the client.
-     */
-    public function getClientSecret()
-    {
-        return $this->clientSecret;
-    }
-
-    /**
-     * Sets a shared symmetric secret issued by the authorization server, which
-     * is used to authenticate the client.
-     *
-     * @param $clientSecret
-     */
-    public function setClientSecret($clientSecret)
-    {
-        $this->clientSecret = $clientSecret;
-    }
-
-    /**
-     * Gets the Issuer ID when using assertion profile.
-     */
-    public function getIssuer()
-    {
-        return $this->issuer;
-    }
-
-    /**
-     * Sets the Issuer ID when using assertion profile.
-     *
-     * @param string $issuer
-     */
-    public function setIssuer($issuer)
-    {
-        $this->issuer = $issuer;
-    }
-
-    /**
-     * Gets the target sub when issuing assertions.
-     */
-    public function getSub()
-    {
-        return $this->sub;
-    }
-
-    /**
-     * Sets the target sub when issuing assertions.
-     *
-     * @param string $sub
-     */
-    public function setSub($sub)
-    {
-        $this->sub = $sub;
-    }
-
-    /**
-     * Gets the target audience when issuing assertions.
-     */
-    public function getAudience()
-    {
-        return $this->audience;
-    }
-
-    /**
-     * Sets the target audience when issuing assertions.
-     *
-     * @param string $audience
-     */
-    public function setAudience($audience)
-    {
-        $this->audience = $audience;
-    }
-
-    /**
-     * Gets the signing key when using an assertion profile.
-     */
-    public function getSigningKey()
-    {
-        return $this->signingKey;
-    }
-
-    /**
-     * Sets the signing key when using an assertion profile.
-     *
-     * @param string $signingKey
-     */
-    public function setSigningKey($signingKey)
-    {
-        $this->signingKey = $signingKey;
-    }
-
-    /**
-     * Gets the signing algorithm when using an assertion profile.
-     *
-     * @return string
-     */
-    public function getSigningAlgorithm()
-    {
-        return $this->signingAlgorithm;
-    }
-
-    /**
-     * Sets the signing algorithm when using an assertion profile.
-     *
-     * @param string $signingAlgorithm
-     */
-    public function setSigningAlgorithm($signingAlgorithm)
-    {
-        if (is_null($signingAlgorithm)) {
-            $this->signingAlgorithm = null;
-        } elseif (!in_array($signingAlgorithm, self::$knownSigningAlgorithms)) {
-            throw new InvalidArgumentException('unknown signing algorithm');
-        } else {
-            $this->signingAlgorithm = $signingAlgorithm;
-        }
-    }
-
-    /**
-     * Gets the set of parameters used by extension when using an extension
-     * grant type.
-     */
-    public function getExtensionParams()
-    {
-        return $this->extensionParams;
-    }
-
-    /**
-     * Sets the set of parameters used by extension when using an extension
-     * grant type.
-     *
-     * @param $extensionParams
-     */
-    public function setExtensionParams($extensionParams)
-    {
-        $this->extensionParams = $extensionParams;
-    }
-
-    /**
-     * Gets the number of seconds assertions are valid for.
-     */
-    public function getExpiry()
-    {
-        return $this->expiry;
-    }
-
-    /**
-     * Sets the number of seconds assertions are valid for.
-     *
-     * @param int $expiry
-     */
-    public function setExpiry($expiry)
-    {
-        $this->expiry = $expiry;
-    }
-
-    /**
-     * Gets the lifetime of the access token in seconds.
-     */
-    public function getExpiresIn()
-    {
-        return $this->expiresIn;
-    }
-
-    /**
-     * Sets the lifetime of the access token in seconds.
-     *
-     * @param int $expiresIn
-     */
-    public function setExpiresIn($expiresIn)
-    {
-        if (is_null($expiresIn)) {
-            $this->expiresIn = null;
-            $this->issuedAt = null;
-        } else {
-            $this->issuedAt = time();
-            $this->expiresIn = (int)$expiresIn;
-        }
-    }
-
-    /**
-     * Gets the time the current access token expires at.
-     *
-     * @return int
-     */
-    public function getExpiresAt()
-    {
-        if (!is_null($this->expiresAt)) {
-            return $this->expiresAt;
-        } elseif (!is_null($this->issuedAt) && !is_null($this->expiresIn)) {
-            return $this->issuedAt + $this->expiresIn;
-        }
-
-        return null;
-    }
-
-    /**
-     * Returns true if the acccess token has expired.
-     *
-     * @return bool
-     */
-    public function isExpired()
-    {
-        $expiration = $this->getExpiresAt();
-        $now = time();
-
-        return !is_null($expiration) && $now >= $expiration;
-    }
-
-    /**
-     * Sets the time the current access token expires at.
-     *
-     * @param int $expiresAt
-     */
-    public function setExpiresAt($expiresAt)
-    {
-        $this->expiresAt = $expiresAt;
-    }
-
-    /**
-     * Gets the time the current access token was issued at.
-     */
-    public function getIssuedAt()
-    {
-        return $this->issuedAt;
-    }
-
-    /**
-     * Sets the time the current access token was issued at.
-     *
-     * @param int $issuedAt
-     */
-    public function setIssuedAt($issuedAt)
-    {
-        $this->issuedAt = $issuedAt;
-    }
-
-    /**
-     * Gets the current access token.
-     */
-    public function getAccessToken()
-    {
-        return $this->accessToken;
-    }
-
-    /**
-     * Sets the current access token.
-     *
-     * @param string $accessToken
-     */
-    public function setAccessToken($accessToken)
-    {
-        $this->accessToken = $accessToken;
-    }
-
-    /**
-     * Gets the current ID token.
-     */
-    public function getIdToken()
-    {
-        return $this->idToken;
-    }
-
-    /**
-     * Sets the current ID token.
-     *
-     * @param $idToken
-     */
-    public function setIdToken($idToken)
-    {
-        $this->idToken = $idToken;
-    }
-
-    /**
-     * Gets the refresh token associated with the current access token.
-     */
-    public function getRefreshToken()
-    {
-        return $this->refreshToken;
-    }
-
-    /**
-     * Sets the refresh token associated with the current access token.
-     *
-     * @param $refreshToken
-     */
-    public function setRefreshToken($refreshToken)
-    {
-        $this->refreshToken = $refreshToken;
-    }
-
-    /**
-     * The expiration of the last received token.
-     *
-     * @return array
-     */
-    public function getLastReceivedToken()
-    {
-        if ($token = $this->getAccessToken()) {
-            return [
-                'access_token' => $token,
-                'expires_at' => $this->getExpiresAt(),
-            ];
-        }
-
-        return null;
-    }
-
-    /**
-     * @todo handle uri as array
-     *
-     * @param string $uri
-     *
-     * @return null|UriInterface
-     */
-    private function coerceUri($uri)
-    {
-        if (is_null($uri)) {
-            return;
-        }
-
-        return Psr7\uri_for($uri);
-    }
-
-    /**
-     * @param string $idToken
-     * @param string|array|null $publicKey
-     * @param array $allowedAlgs
-     *
-     * @return object
-     */
-    private function jwtDecode($idToken, $publicKey, $allowedAlgs)
-    {
-        if (class_exists('Firebase\JWT\JWT')) {
-            return \Firebase\JWT\JWT::decode($idToken, $publicKey, $allowedAlgs);
-        }
-
-        return \JWT::decode($idToken, $publicKey, $allowedAlgs);
-    }
-
-    private function jwtEncode($assertion, $signingKey, $signingAlgorithm)
-    {
-        if (class_exists('Firebase\JWT\JWT')) {
-            return \Firebase\JWT\JWT::encode($assertion, $signingKey,
-                $signingAlgorithm);
-        }
-
-        return \JWT::encode($assertion, $signingKey, $signingAlgorithm);
-    }
-
-    /**
-     * Determines if the URI is absolute based on its scheme and host or path
-     * (RFC 3986).
-     *
-     * @param string $uri
-     *
-     * @return bool
-     */
-    private function isAbsoluteUri($uri)
-    {
-        $uri = $this->coerceUri($uri);
-
-        return $uri->getScheme() && ($uri->getHost() || $uri->getPath());
-    }
-
-    /**
-     * @param array $params
-     *
-     * @return array
-     */
-    private function addClientCredentials(&$params)
-    {
-        $clientId = $this->getClientId();
-        $clientSecret = $this->getClientSecret();
-
-        if ($clientId && $clientSecret) {
-            $params['client_id'] = $clientId;
-            $params['client_secret'] = $clientSecret;
-        }
-
-        return $params;
-    }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/auth/src/Subscriber/AuthTokenSubscriber.php b/mayor-orig/www/include/share/googleapi/google/auth/src/Subscriber/AuthTokenSubscriber.php
deleted file mode 100644
index 0df8027f..00000000
--- a/mayor-orig/www/include/share/googleapi/google/auth/src/Subscriber/AuthTokenSubscriber.php
+++ /dev/null
@@ -1,118 +0,0 @@
-'
- */
-class AuthTokenSubscriber implements SubscriberInterface
-{
-    /**
-     * @var callable
-     */
-    private $httpHandler;
-
-    /**
-     * @var FetchAuthTokenInterface
-     */
-    private $fetcher;
-
-    /**
-     * @var callable
-     */
-    private $tokenCallback;
-
-    /**
-     * Creates a new AuthTokenSubscriber.
-     *
-     * @param FetchAuthTokenInterface $fetcher is used to fetch the auth token
-     * @param callable $httpHandler (optional) http client to fetch the token.
-     * @param callable $tokenCallback (optional) function to be called when a new token is fetched.
-     */
-    public function __construct(
-        FetchAuthTokenInterface $fetcher,
-        callable $httpHandler = null,
-        callable $tokenCallback = null
-    ) {
-        $this->fetcher = $fetcher;
-        $this->httpHandler = $httpHandler;
-        $this->tokenCallback = $tokenCallback;
-    }
-
-    /**
-     * @return array
-     */
-    public function getEvents()
-    {
-        return ['before' => ['onBefore', RequestEvents::SIGN_REQUEST]];
-    }
-
-    /**
-     * Updates the request with an Authorization header when auth is 'fetched_auth_token'.
-     *
-     *   use GuzzleHttp\Client;
-     *   use Google\Auth\OAuth2;
-     *   use Google\Auth\Subscriber\AuthTokenSubscriber;
-     *
-     *   $config = [...];
-     *   $oauth2 = new OAuth2($config)
-     *   $subscriber = new AuthTokenSubscriber($oauth2);
-     *
-     *   $client = new Client([
-     *      'base_url' => 'https://www.googleapis.com/taskqueue/v1beta2/projects/',
-     *      'defaults' => ['auth' => 'google_auth']
-     *   ]);
-     *   $client->getEmitter()->attach($subscriber);
-     *
-     *   $res = $client->get('myproject/taskqueues/myqueue');
-     *
-     * @param BeforeEvent $event
-     */
-    public function onBefore(BeforeEvent $event)
-    {
-        // Requests using "auth"="google_auth" will be authorized.
-        $request = $event->getRequest();
-        if ($request->getConfig()['auth'] != 'google_auth') {
-            return;
-        }
-
-        // Fetch the auth token.
-        $auth_tokens = $this->fetcher->fetchAuthToken($this->httpHandler);
-        if (array_key_exists('access_token', $auth_tokens)) {
-            $request->setHeader('Authorization', 'Bearer ' . $auth_tokens['access_token']);
-
-            // notify the callback if applicable
-            if ($this->tokenCallback) {
-                call_user_func($this->tokenCallback, $this->fetcher->getCacheKey(), $auth_tokens['access_token']);
-            }
-        }
-    }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/auth/src/Subscriber/ScopedAccessTokenSubscriber.php b/mayor-orig/www/include/share/googleapi/google/auth/src/Subscriber/ScopedAccessTokenSubscriber.php
deleted file mode 100644
index ad744ead..00000000
--- a/mayor-orig/www/include/share/googleapi/google/auth/src/Subscriber/ScopedAccessTokenSubscriber.php
+++ /dev/null
@@ -1,177 +0,0 @@
-'
- */
-class ScopedAccessTokenSubscriber implements SubscriberInterface
-{
-    use CacheTrait;
-
-    const DEFAULT_CACHE_LIFETIME = 1500;
-
-    /**
-     * @var CacheItemPoolInterface
-     */
-    private $cache;
-
-    /**
-     * @var callable The access token generator function
-     */
-    private $tokenFunc;
-
-    /**
-     * @var array|string The scopes used to generate the token
-     */
-    private $scopes;
-
-    /**
-     * @var array
-     */
-    private $cacheConfig;
-
-    /**
-     * Creates a new ScopedAccessTokenSubscriber.
-     *
-     * @param callable $tokenFunc a token generator function
-     * @param array|string $scopes the token authentication scopes
-     * @param array $cacheConfig configuration for the cache when it's present
-     * @param CacheItemPoolInterface $cache an implementation of CacheItemPoolInterface
-     */
-    public function __construct(
-        callable $tokenFunc,
-        $scopes,
-        array $cacheConfig = null,
-        CacheItemPoolInterface $cache = null
-    ) {
-        $this->tokenFunc = $tokenFunc;
-        if (!(is_string($scopes) || is_array($scopes))) {
-            throw new \InvalidArgumentException(
-                'wants scope should be string or array');
-        }
-        $this->scopes = $scopes;
-
-        if (!is_null($cache)) {
-            $this->cache = $cache;
-            $this->cacheConfig = array_merge([
-                'lifetime' => self::DEFAULT_CACHE_LIFETIME,
-                'prefix' => '',
-            ], $cacheConfig);
-        }
-    }
-
-    /**
-     * @return array
-     */
-    public function getEvents()
-    {
-        return ['before' => ['onBefore', RequestEvents::SIGN_REQUEST]];
-    }
-
-    /**
-     * Updates the request with an Authorization header when auth is 'scoped'.
-     *
-     *   E.g this could be used to authenticate using the AppEngine
-     *   AppIdentityService.
-     *
-     *   use google\appengine\api\app_identity\AppIdentityService;
-     *   use Google\Auth\Subscriber\ScopedAccessTokenSubscriber;
-     *   use GuzzleHttp\Client;
-     *
-     *   $scope = 'https://www.googleapis.com/auth/taskqueue'
-     *   $subscriber = new ScopedAccessToken(
-     *       'AppIdentityService::getAccessToken',
-     *       $scope,
-     *       ['prefix' => 'Google\Auth\ScopedAccessToken::'],
-     *       $cache = new Memcache()
-     *   );
-     *
-     *   $client = new Client([
-     *       'base_url' => 'https://www.googleapis.com/taskqueue/v1beta2/projects/',
-     *       'defaults' => ['auth' => 'scoped']
-     *   ]);
-     *   $client->getEmitter()->attach($subscriber);
-     *
-     *   $res = $client->get('myproject/taskqueues/myqueue');
-     *
-     * @param BeforeEvent $event
-     */
-    public function onBefore(BeforeEvent $event)
-    {
-        // Requests using "auth"="scoped" will be authorized.
-        $request = $event->getRequest();
-        if ($request->getConfig()['auth'] != 'scoped') {
-            return;
-        }
-        $auth_header = 'Bearer ' . $this->fetchToken();
-        $request->setHeader('Authorization', $auth_header);
-    }
-
-    /**
-     * @return string
-     */
-    private function getCacheKey()
-    {
-        $key = null;
-
-        if (is_string($this->scopes)) {
-            $key .= $this->scopes;
-        } elseif (is_array($this->scopes)) {
-            $key .= implode(':', $this->scopes);
-        }
-
-        return $key;
-    }
-
-    /**
-     * Determine if token is available in the cache, if not call tokenFunc to
-     * fetch it.
-     *
-     * @return string
-     */
-    private function fetchToken()
-    {
-        $cacheKey = $this->getCacheKey();
-        $cached = $this->getCachedValue($cacheKey);
-
-        if (!empty($cached)) {
-            return $cached;
-        }
-
-        $token = call_user_func($this->tokenFunc, $this->scopes);
-        $this->setCachedValue($cacheKey, $token);
-
-        return $token;
-    }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/auth/src/Subscriber/SimpleSubscriber.php b/mayor-orig/www/include/share/googleapi/google/auth/src/Subscriber/SimpleSubscriber.php
deleted file mode 100644
index 0c567313..00000000
--- a/mayor-orig/www/include/share/googleapi/google/auth/src/Subscriber/SimpleSubscriber.php
+++ /dev/null
@@ -1,90 +0,0 @@
-config = array_merge([], $config);
-    }
-
-    /**
-     * @return array
-     */
-    public function getEvents()
-    {
-        return ['before' => ['onBefore', RequestEvents::SIGN_REQUEST]];
-    }
-
-    /**
-     * Updates the request query with the developer key if auth is set to simple.
-     *
-     *   use Google\Auth\Subscriber\SimpleSubscriber;
-     *   use GuzzleHttp\Client;
-     *
-     *   $my_key = 'is not the same as yours';
-     *   $subscriber = new SimpleSubscriber(['key' => $my_key]);
-     *
-     *   $client = new Client([
-     *      'base_url' => 'https://www.googleapis.com/discovery/v1/',
-     *      'defaults' => ['auth' => 'simple']
-     *   ]);
-     *   $client->getEmitter()->attach($subscriber);
-     *
-     *   $res = $client->get('drive/v2/rest');
-     *
-     * @param BeforeEvent $event
-     */
-    public function onBefore(BeforeEvent $event)
-    {
-        // Requests using "auth"="simple" with the developer key.
-        $request = $event->getRequest();
-        if ($request->getConfig()['auth'] != 'simple') {
-            return;
-        }
-        $request->getQuery()->overwriteWith($this->config);
-    }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/auth/tests/ApplicationDefaultCredentialsTest.php b/mayor-orig/www/include/share/googleapi/google/auth/tests/ApplicationDefaultCredentialsTest.php
deleted file mode 100644
index b7cda07e..00000000
--- a/mayor-orig/www/include/share/googleapi/google/auth/tests/ApplicationDefaultCredentialsTest.php
+++ /dev/null
@@ -1,299 +0,0 @@
-originalHome = getenv('HOME');
-    }
-
-    protected function tearDown()
-    {
-        if ($this->originalHome != getenv('HOME')) {
-            putenv('HOME=' . $this->originalHome);
-        }
-        putenv(ServiceAccountCredentials::ENV_VAR);  // removes it from
-    }
-
-    /**
-     * @expectedException DomainException
-     */
-    public function testIsFailsEnvSpecifiesNonExistentFile()
-    {
-        $keyFile = __DIR__ . '/fixtures' . '/does-not-exist-private.json';
-        putenv(ServiceAccountCredentials::ENV_VAR . '=' . $keyFile);
-        ApplicationDefaultCredentials::getCredentials('a scope');
-    }
-
-    public function testLoadsOKIfEnvSpecifiedIsValid()
-    {
-        $keyFile = __DIR__ . '/fixtures' . '/private.json';
-        putenv(ServiceAccountCredentials::ENV_VAR . '=' . $keyFile);
-        $this->assertNotNull(
-            ApplicationDefaultCredentials::getCredentials('a scope')
-        );
-    }
-
-    public function testLoadsDefaultFileIfPresentAndEnvVarIsNotSet()
-    {
-        putenv('HOME=' . __DIR__ . '/fixtures');
-        $this->assertNotNull(
-            ApplicationDefaultCredentials::getCredentials('a scope')
-        );
-    }
-
-    /**
-     * @expectedException DomainException
-     */
-    public function testFailsIfNotOnGceAndNoDefaultFileFound()
-    {
-        putenv('HOME=' . __DIR__ . '/not_exist_fixtures');
-        // simulate not being GCE by return 500
-        $httpHandler = getHandler([
-            buildResponse(500),
-        ]);
-
-        ApplicationDefaultCredentials::getCredentials('a scope', $httpHandler);
-    }
-
-    public function testSuccedsIfNoDefaultFilesButIsOnGCE()
-    {
-        $wantedTokens = [
-            'access_token' => '1/abdef1234567890',
-            'expires_in' => '57',
-            'token_type' => 'Bearer',
-        ];
-        $jsonTokens = json_encode($wantedTokens);
-
-        // simulate the response from GCE.
-        $httpHandler = getHandler([
-            buildResponse(200, [GCECredentials::FLAVOR_HEADER => 'Google']),
-            buildResponse(200, [], Psr7\stream_for($jsonTokens)),
-        ]);
-
-        $this->assertNotNull(
-            ApplicationDefaultCredentials::getCredentials('a scope', $httpHandler)
-        );
-    }
-}
-
-class ADCGetMiddlewareTest extends \PHPUnit_Framework_TestCase
-{
-    private $originalHome;
-
-    protected function setUp()
-    {
-        $this->originalHome = getenv('HOME');
-    }
-
-    protected function tearDown()
-    {
-        if ($this->originalHome != getenv('HOME')) {
-            putenv('HOME=' . $this->originalHome);
-        }
-        putenv(ServiceAccountCredentials::ENV_VAR);  // removes it if assigned
-    }
-
-    /**
-     * @expectedException DomainException
-     */
-    public function testIsFailsEnvSpecifiesNonExistentFile()
-    {
-        $keyFile = __DIR__ . '/fixtures' . '/does-not-exist-private.json';
-        putenv(ServiceAccountCredentials::ENV_VAR . '=' . $keyFile);
-        ApplicationDefaultCredentials::getMiddleware('a scope');
-    }
-
-    public function testLoadsOKIfEnvSpecifiedIsValid()
-    {
-        $keyFile = __DIR__ . '/fixtures' . '/private.json';
-        putenv(ServiceAccountCredentials::ENV_VAR . '=' . $keyFile);
-        $this->assertNotNull(ApplicationDefaultCredentials::getMiddleware('a scope'));
-    }
-
-    public function testLoadsDefaultFileIfPresentAndEnvVarIsNotSet()
-    {
-        putenv('HOME=' . __DIR__ . '/fixtures');
-        $this->assertNotNull(ApplicationDefaultCredentials::getMiddleware('a scope'));
-    }
-
-    /**
-     * @expectedException DomainException
-     */
-    public function testFailsIfNotOnGceAndNoDefaultFileFound()
-    {
-        putenv('HOME=' . __DIR__ . '/not_exist_fixtures');
-
-        // simulate not being GCE by return 500
-        $httpHandler = getHandler([
-            buildResponse(500),
-        ]);
-
-        ApplicationDefaultCredentials::getMiddleware('a scope', $httpHandler);
-    }
-
-    public function testSuccedsIfNoDefaultFilesButIsOnGCE()
-    {
-        $wantedTokens = [
-            'access_token' => '1/abdef1234567890',
-            'expires_in' => '57',
-            'token_type' => 'Bearer',
-        ];
-        $jsonTokens = json_encode($wantedTokens);
-
-        // simulate the response from GCE.
-        $httpHandler = getHandler([
-            buildResponse(200, [GCECredentials::FLAVOR_HEADER => 'Google']),
-            buildResponse(200, [], Psr7\stream_for($jsonTokens)),
-        ]);
-
-        $this->assertNotNull(ApplicationDefaultCredentials::getMiddleware('a scope', $httpHandler));
-    }
-}
-
-class ADCGetCredentialsAppEngineTest extends BaseTest
-{
-    private $originalHome;
-    private $originalServiceAccount;
-
-    protected function setUp()
-    {
-        // set home to be somewhere else
-        $this->originalHome = getenv('HOME');
-        putenv('HOME=' . __DIR__ . '/not_exist_fixtures');
-
-        // remove service account path
-        $this->originalServiceAccount = getenv(ServiceAccountCredentials::ENV_VAR);
-        putenv(ServiceAccountCredentials::ENV_VAR);
-    }
-
-    protected function tearDown()
-    {
-        // removes it if assigned
-        putenv('HOME=' . $this->originalHome);
-        putenv(ServiceAccountCredentials::ENV_VAR . '=' . $this->originalServiceAccount);
-    }
-
-    public function testAppEngineStandard()
-    {
-        $_SERVER['SERVER_SOFTWARE'] = 'Google App Engine';
-        $this->assertInstanceOf(
-            'Google\Auth\Credentials\AppIdentityCredentials',
-            ApplicationDefaultCredentials::getCredentials()
-        );
-    }
-
-    public function testAppEngineFlexible()
-    {
-        $_SERVER['SERVER_SOFTWARE'] = 'Google App Engine';
-        $_SERVER['GAE_VM'] = 'true';
-        $httpHandler = getHandler([
-            buildResponse(200, [GCECredentials::FLAVOR_HEADER => 'Google']),
-        ]);
-        $this->assertInstanceOf(
-            'Google\Auth\Credentials\GCECredentials',
-            ApplicationDefaultCredentials::getCredentials(null, $httpHandler)
-        );
-    }
-}
-
-// @todo consider a way to DRY this and above class up
-class ADCGetSubscriberTest extends BaseTest
-{
-    private $originalHome;
-
-    protected function setUp()
-    {
-        $this->onlyGuzzle5();
-
-        $this->originalHome = getenv('HOME');
-    }
-
-    protected function tearDown()
-    {
-        if ($this->originalHome != getenv('HOME')) {
-            putenv('HOME=' . $this->originalHome);
-        }
-        putenv(ServiceAccountCredentials::ENV_VAR);  // removes it if assigned
-    }
-
-    /**
-     * @expectedException DomainException
-     */
-    public function testIsFailsEnvSpecifiesNonExistentFile()
-    {
-        $keyFile = __DIR__ . '/fixtures' . '/does-not-exist-private.json';
-        putenv(ServiceAccountCredentials::ENV_VAR . '=' . $keyFile);
-        ApplicationDefaultCredentials::getSubscriber('a scope');
-    }
-
-    public function testLoadsOKIfEnvSpecifiedIsValid()
-    {
-        $keyFile = __DIR__ . '/fixtures' . '/private.json';
-        putenv(ServiceAccountCredentials::ENV_VAR . '=' . $keyFile);
-        $this->assertNotNull(ApplicationDefaultCredentials::getSubscriber('a scope'));
-    }
-
-    public function testLoadsDefaultFileIfPresentAndEnvVarIsNotSet()
-    {
-        putenv('HOME=' . __DIR__ . '/fixtures');
-        $this->assertNotNull(ApplicationDefaultCredentials::getSubscriber('a scope'));
-    }
-
-    /**
-     * @expectedException DomainException
-     */
-    public function testFailsIfNotOnGceAndNoDefaultFileFound()
-    {
-        putenv('HOME=' . __DIR__ . '/not_exist_fixtures');
-
-        // simulate not being GCE by return 500
-        $httpHandler = getHandler([
-            buildResponse(500),
-        ]);
-
-        ApplicationDefaultCredentials::getSubscriber('a scope', $httpHandler);
-    }
-
-    public function testSuccedsIfNoDefaultFilesButIsOnGCE()
-    {
-        $wantedTokens = [
-            'access_token' => '1/abdef1234567890',
-            'expires_in' => '57',
-            'token_type' => 'Bearer',
-        ];
-        $jsonTokens = json_encode($wantedTokens);
-
-        // simulate the response from GCE.
-        $httpHandler = getHandler([
-            buildResponse(200, [GCECredentials::FLAVOR_HEADER => 'Google']),
-            buildResponse(200, [], Psr7\stream_for($jsonTokens)),
-        ]);
-
-        $this->assertNotNull(ApplicationDefaultCredentials::getSubscriber('a scope', $httpHandler));
-    }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/auth/tests/BaseTest.php b/mayor-orig/www/include/share/googleapi/google/auth/tests/BaseTest.php
deleted file mode 100644
index b005e341..00000000
--- a/mayor-orig/www/include/share/googleapi/google/auth/tests/BaseTest.php
+++ /dev/null
@@ -1,32 +0,0 @@
-markTestSkipped('Guzzle 6 only');
-        }
-    }
-
-    public function onlyGuzzle5()
-    {
-        $version = ClientInterface::VERSION;
-        if ('5' !== $version[0]) {
-            $this->markTestSkipped('Guzzle 5 only');
-        }
-    }
-
-    /**
-     * @see Google\Auth\$this->getValidKeyName
-     */
-    public function getValidKeyName($key)
-    {
-        return preg_replace('|[^a-zA-Z0-9_\.! ]|', '', $key);
-    }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/auth/tests/Cache/ItemTest.php b/mayor-orig/www/include/share/googleapi/google/auth/tests/Cache/ItemTest.php
deleted file mode 100644
index 2d00f36c..00000000
--- a/mayor-orig/www/include/share/googleapi/google/auth/tests/Cache/ItemTest.php
+++ /dev/null
@@ -1,125 +0,0 @@
-assertEquals($key, $this->getItem($key)->getKey());
-    }
-
-    public function testGetsNull()
-    {
-        $item = $this->getItem('item');
-
-        $this->assertNull($item->get());
-        $this->assertFalse($item->isHit());
-    }
-
-    public function testGetsValue()
-    {
-        $value = 'value';
-        $item = $this->getItem('item');
-        $item->set($value);
-
-        $this->assertEquals('value', $item->get());
-    }
-
-    /**
-     * @dataProvider values
-     */
-    public function testSetsValue($value)
-    {
-        $item = $this->getItem('item');
-        $item->set($value);
-
-        $this->assertEquals($value, $item->get());
-    }
-
-    public function values()
-    {
-        return [
-            [1],
-            [1.5],
-            [true],
-            [null],
-            [new \DateTime()],
-            [['test']],
-            ['value']
-        ];
-    }
-
-    public function testIsHit()
-    {
-        $item = $this->getItem('item');
-
-        $this->assertFalse($item->isHit());
-
-        $item->set('value');
-
-        $this->assertTrue($item->isHit());
-    }
-
-    public function testExpiresAt()
-    {
-        $item = $this->getItem('item');
-        $item->set('value');
-        $item->expiresAt(new \DateTime('now + 1 hour'));
-
-        $this->assertTrue($item->isHit());
-
-        $item->expiresAt(null);
-
-        $this->assertTrue($item->isHit());
-
-        $item->expiresAt(new \DateTime('yesterday'));
-
-        $this->assertFalse($item->isHit());
-    }
-
-    public function testExpiresAfter()
-    {
-        $item = $this->getItem('item');
-        $item->set('value');
-        $item->expiresAfter(30);
-
-        $this->assertTrue($item->isHit());
-
-        $item->expiresAfter(0);
-
-        $this->assertFalse($item->isHit());
-
-        $item->expiresAfter(new \DateInterval('PT30S'));
-
-        $this->assertTrue($item->isHit());
-
-        $item->expiresAfter(null);
-
-        $this->assertTrue($item->isHit());
-    }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/auth/tests/Cache/MemoryCacheItemPoolTest.php b/mayor-orig/www/include/share/googleapi/google/auth/tests/Cache/MemoryCacheItemPoolTest.php
deleted file mode 100644
index 950d614a..00000000
--- a/mayor-orig/www/include/share/googleapi/google/auth/tests/Cache/MemoryCacheItemPoolTest.php
+++ /dev/null
@@ -1,189 +0,0 @@
-pool = new MemoryCacheItemPool();
-    }
-
-    public function saveItem($key, $value)
-    {
-        $item = $this->pool->getItem($key);
-        $item->set($value);
-        $this->assertTrue($this->pool->save($item));
-
-        return $item;
-    }
-
-    public function testGetsFreshItem()
-    {
-        $item = $this->pool->getItem('item');
-
-        $this->assertInstanceOf('Google\Auth\Cache\Item', $item);
-        $this->assertNull($item->get());
-        $this->assertFalse($item->isHit());
-    }
-
-    public function testGetsExistingItem()
-    {
-        $key = 'item';
-        $value = 'value';
-        $this->saveItem($key, $value);
-        $item = $this->pool->getItem($key);
-
-        $this->assertInstanceOf('Google\Auth\Cache\Item', $item);
-        $this->assertEquals($value, $item->get());
-        $this->assertTrue($item->isHit());
-    }
-
-    public function testGetsMultipleItems()
-    {
-        $keys = ['item1', 'item2'];
-        $items = $this->pool->getItems($keys);
-
-        $this->assertEquals($keys, array_keys($items));
-        $this->assertContainsOnlyInstancesOf('Google\Auth\Cache\Item', $items);
-    }
-
-    public function testHasItem()
-    {
-        $existsKey = 'does-exist';
-        $this->saveItem($existsKey, 'value');
-
-        $this->assertTrue($this->pool->hasItem($existsKey));
-        $this->assertFalse($this->pool->hasItem('does-not-exist'));
-    }
-
-    public function testClear()
-    {
-        $key = 'item';
-        $this->saveItem($key, 'value');
-
-        $this->assertTrue($this->pool->hasItem($key));
-        $this->assertTrue($this->pool->clear());
-        $this->assertFalse($this->pool->hasItem($key));
-    }
-
-    public function testDeletesItem()
-    {
-        $key = 'item';
-        $this->saveItem($key, 'value');
-
-        $this->assertTrue($this->pool->deleteItem($key));
-        $this->assertFalse($this->pool->hasItem($key));
-    }
-
-    public function testDeletesItems()
-    {
-        $keys = ['item1', 'item2'];
-
-        foreach ($keys as $key) {
-            $this->saveItem($key, 'value');
-        }
-
-        $this->assertTrue($this->pool->deleteItems($keys));
-        $this->assertFalse($this->pool->hasItem($keys[0]));
-        $this->assertFalse($this->pool->hasItem($keys[1]));
-    }
-
-    public function testDoesNotDeleteItemsWithInvalidKey()
-    {
-        $keys = ['item1', '{item2}', 'item3'];
-        $value = 'value';
-        $this->saveItem($keys[0], $value);
-        $this->saveItem($keys[2], $value);
-
-        try {
-            $this->pool->deleteItems($keys);
-        } catch (InvalidArgumentException $ex) {
-            // continue execution
-        }
-
-        $this->assertTrue($this->pool->hasItem($keys[0]));
-        $this->assertTrue($this->pool->hasItem($keys[2]));
-    }
-
-    public function testSavesItem()
-    {
-        $key = 'item';
-        $this->saveItem($key, 'value');
-
-        $this->assertTrue($this->pool->hasItem($key));
-    }
-
-    public function testSavesDeferredItem()
-    {
-        $item = $this->pool->getItem('item');
-        $this->assertTrue($this->pool->saveDeferred($item));
-    }
-
-    public function testCommitsDeferredItems()
-    {
-        $keys = ['item1', 'item2'];
-
-        foreach ($keys as $key) {
-            $item = $this->pool->getItem($key);
-            $item->set('value');
-            $this->pool->saveDeferred($item);
-        }
-
-        $this->assertTrue($this->pool->commit());
-        $this->assertTrue($this->pool->hasItem($keys[0]));
-        $this->assertTrue($this->pool->hasItem($keys[1]));
-    }
-
-    /**
-     * @expectedException \Psr\Cache\InvalidArgumentException
-     * @dataProvider invalidKeys
-     */
-    public function testCheckInvalidKeys($key)
-    {
-        $this->pool->getItem($key);
-        $this->pool->getItems([$key]);
-        $this->pool->hasItem($key);
-        $this->pool->deleteItem($key);
-        $this->pool->deleteItems([$key]);
-    }
-
-    public function invalidKeys()
-    {
-        return [
-            [1],
-            [true],
-            [null],
-            [new \DateTime()],
-            ['{'],
-            ['}'],
-            ['('],
-            [')'],
-            ['/'],
-            ['\\'],
-            ['@'],
-            [':'],
-            [[]]
-        ];
-    }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/auth/tests/CacheTraitTest.php b/mayor-orig/www/include/share/googleapi/google/auth/tests/CacheTraitTest.php
deleted file mode 100644
index 6946cdbe..00000000
--- a/mayor-orig/www/include/share/googleapi/google/auth/tests/CacheTraitTest.php
+++ /dev/null
@@ -1,151 +0,0 @@
-mockFetcher =
-            $this
-                ->getMockBuilder('Google\Auth\FetchAuthTokenInterface')
-                ->getMock();
-        $this->mockCacheItem =
-            $this
-                ->getMockBuilder('Psr\Cache\CacheItemInterface')
-                ->getMock();
-        $this->mockCache =
-            $this
-                ->getMockBuilder('Psr\Cache\CacheItemPoolInterface')
-                ->getMock();
-    }
-
-    public function testSuccessfullyPullsFromCache()
-    {
-        $expectedValue = '1234';
-        $this->mockCacheItem
-            ->expects($this->once())
-            ->method('get')
-            ->will($this->returnValue($expectedValue));
-        $this->mockCache
-            ->expects($this->once())
-            ->method('getItem')
-            ->will($this->returnValue($this->mockCacheItem));
-
-        $implementation = new CacheTraitImplementation([
-            'cache' => $this->mockCache,
-        ]);
-
-        $cachedValue = $implementation->gCachedValue();
-        $this->assertEquals($expectedValue, $cachedValue);
-    }
-
-    public function testFailsPullFromCacheWithNoCache()
-    {
-        $implementation = new CacheTraitImplementation();
-
-        $cachedValue = $implementation->gCachedValue();
-        $this->assertEquals(null, $cachedValue);
-    }
-
-    public function testFailsPullFromCacheWithoutKey()
-    {
-        $implementation = new CacheTraitImplementation([
-            'cache' => $this->mockCache,
-            'key'   => null,
-        ]);
-
-        $cachedValue = $implementation->gCachedValue();
-    }
-
-    public function testSuccessfullySetsToCache()
-    {
-        $value = '1234';
-        $this->mockCacheItem
-            ->expects($this->once())
-            ->method('set')
-            ->with($value);
-        $this->mockCache
-            ->expects($this->once())
-            ->method('getItem')
-            ->with($this->equalTo('key'))
-            ->will($this->returnValue($this->mockCacheItem));
-
-        $implementation = new CacheTraitImplementation([
-            'cache' => $this->mockCache,
-        ]);
-
-        $implementation->sCachedValue($value);
-    }
-
-    public function testFailsSetToCacheWithNoCache()
-    {
-        $implementation = new CacheTraitImplementation();
-
-        $implementation->sCachedValue('1234');
-
-        $cachedValue = $implementation->sCachedValue('1234');
-        $this->assertNull($cachedValue);
-    }
-
-    public function testFailsSetToCacheWithoutKey()
-    {
-        $implementation = new CacheTraitImplementation([
-            'cache' => $this->mockCache,
-            'key'   => null,
-        ]);
-
-        $cachedValue = $implementation->sCachedValue('1234');
-        $this->assertNull($cachedValue);
-    }
-}
-
-class CacheTraitImplementation
-{
-    use CacheTrait;
-
-    private $cache;
-    private $cacheConfig;
-
-    public function __construct(array $config = [])
-    {
-        $this->key = array_key_exists('key', $config) ? $config['key'] : 'key';
-        $this->cache = isset($config['cache']) ? $config['cache'] : null;
-        $this->cacheConfig = [
-            'prefix' => '',
-            'lifetime' => 1000,
-        ];
-    }
-
-    // allows us to keep trait methods private
-    public function gCachedValue()
-    {
-        return $this->getCachedValue($this->key);
-    }
-
-    public function sCachedValue($v)
-    {
-        $this->setCachedValue($this->key, $v);
-    }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/auth/tests/Credentials/AppIndentityCredentialsTest.php b/mayor-orig/www/include/share/googleapi/google/auth/tests/Credentials/AppIndentityCredentialsTest.php
deleted file mode 100644
index a47db8d3..00000000
--- a/mayor-orig/www/include/share/googleapi/google/auth/tests/Credentials/AppIndentityCredentialsTest.php
+++ /dev/null
@@ -1,104 +0,0 @@
-assertFalse(AppIdentityCredentials::onAppEngine());
-    }
-
-    public function testIsTrueWhenServerSoftwareIsGoogleAppEngine()
-    {
-        $_SERVER['SERVER_SOFTWARE'] = 'Google App Engine';
-        $this->assertTrue(AppIdentityCredentials::onAppEngine());
-    }
-}
-
-class AppIdentityCredentialsGetCacheKeyTest extends \PHPUnit_Framework_TestCase
-{
-    public function testShouldBeEmpty()
-    {
-        $g = new AppIdentityCredentials();
-        $this->assertEmpty($g->getCacheKey());
-    }
-}
-
-class AppIdentityCredentialsFetchAuthTokenTest extends \PHPUnit_Framework_TestCase
-{
-    public function testShouldBeEmptyIfNotOnAppEngine()
-    {
-        $g = new AppIdentityCredentials();
-        $this->assertEquals(array(), $g->fetchAuthToken());
-    }
-
-    /* @expectedException */
-    public function testThrowsExceptionIfClassDoesntExist()
-    {
-        $_SERVER['SERVER_SOFTWARE'] = 'Google App Engine';
-        $g = new AppIdentityCredentials();
-    }
-
-    public function testReturnsExpectedToken()
-    {
-        // include the mock AppIdentityService class
-        require_once __DIR__ . '/../mocks/AppIdentityService.php';
-
-        $wantedToken = [
-            'access_token' => '1/abdef1234567890',
-            'expires_in' => '57',
-            'token_type' => 'Bearer',
-        ];
-
-        AppIdentityService::$accessToken = $wantedToken;
-
-        $_SERVER['SERVER_SOFTWARE'] = 'Google App Engine';
-
-        $g = new AppIdentityCredentials();
-        $this->assertEquals($wantedToken, $g->fetchAuthToken());
-    }
-
-    public function testScopeIsAlwaysArray()
-    {
-        // include the mock AppIdentityService class
-        require_once __DIR__ . '/../mocks/AppIdentityService.php';
-
-        $scope1 = ['scopeA', 'scopeB'];
-        $scope2 = 'scopeA scopeB';
-        $scope3 = 'scopeA';
-
-        $_SERVER['SERVER_SOFTWARE'] = 'Google App Engine';
-
-        $g = new AppIdentityCredentials($scope1);
-        $g->fetchAuthToken();
-        $this->assertEquals($scope1, AppIdentityService::$scope);
-
-        $g = new AppIdentityCredentials($scope2);
-        $g->fetchAuthToken();
-        $this->assertEquals(explode(' ', $scope2), AppIdentityService::$scope);
-
-        $g = new AppIdentityCredentials($scope3);
-        $g->fetchAuthToken();
-        $this->assertEquals([$scope3], AppIdentityService::$scope);
-    }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/auth/tests/Credentials/GCECredentialsTest.php b/mayor-orig/www/include/share/googleapi/google/auth/tests/Credentials/GCECredentialsTest.php
deleted file mode 100644
index fe2bb25a..00000000
--- a/mayor-orig/www/include/share/googleapi/google/auth/tests/Credentials/GCECredentialsTest.php
+++ /dev/null
@@ -1,124 +0,0 @@
-assertFalse(GCECredentials::onGCE($httpHandler));
-    }
-
-    public function testIsFalseOnServerErrorStatus()
-    {
-        $httpHandler = getHandler([
-            buildResponse(500),
-        ]);
-        $this->assertFalse(GCECredentials::onGCE($httpHandler));
-    }
-
-    public function testIsFalseOnOkStatusWithoutExpectedHeader()
-    {
-        $httpHandler = getHandler([
-            buildResponse(200),
-        ]);
-        $this->assertFalse(GCECredentials::onGCE($httpHandler));
-    }
-
-    public function testIsOkIfGoogleIsTheFlavor()
-    {
-        $httpHandler = getHandler([
-            buildResponse(200, [GCECredentials::FLAVOR_HEADER => 'Google']),
-        ]);
-        $this->assertTrue(GCECredentials::onGCE($httpHandler));
-    }
-}
-
-class GCECredentialsOnAppEngineFlexibleTest extends \PHPUnit_Framework_TestCase
-{
-    public function testIsFalseByDefault()
-    {
-        $this->assertFalse(GCECredentials::onAppEngineFlexible());
-    }
-
-    public function testIsTrueWhenGaeVmIsTrue()
-    {
-        $_SERVER['GAE_VM'] = 'true';
-        $this->assertTrue(GCECredentials::onAppEngineFlexible());
-    }
-}
-
-class GCECredentialsGetCacheKeyTest extends \PHPUnit_Framework_TestCase
-{
-    public function testShouldNotBeEmpty()
-    {
-        $g = new GCECredentials();
-        $this->assertNotEmpty($g->getCacheKey());
-    }
-}
-
-class GCECredentialsFetchAuthTokenTest extends \PHPUnit_Framework_TestCase
-{
-    public function testShouldBeEmptyIfNotOnGCE()
-    {
-        $httpHandler = getHandler([
-            buildResponse(500),
-        ]);
-        $g = new GCECredentials();
-        $this->assertEquals(array(), $g->fetchAuthToken($httpHandler));
-    }
-
-    /**
-     * @expectedException Exception
-     * @expectedExceptionMessage Invalid JSON response
-     */
-    public function testShouldFailIfResponseIsNotJson()
-    {
-        $notJson = '{"foo": , this is cannot be passed as json" "bar"}';
-        $httpHandler = getHandler([
-            buildResponse(200, [GCECredentials::FLAVOR_HEADER => 'Google']),
-            buildResponse(200, [], $notJson),
-        ]);
-        $g = new GCECredentials();
-        $g->fetchAuthToken($httpHandler);
-    }
-
-    public function testShouldReturnTokenInfo()
-    {
-        $wantedTokens = [
-            'access_token' => '1/abdef1234567890',
-            'expires_in' => '57',
-            'token_type' => 'Bearer',
-        ];
-        $jsonTokens = json_encode($wantedTokens);
-        $httpHandler = getHandler([
-            buildResponse(200, [GCECredentials::FLAVOR_HEADER => 'Google']),
-            buildResponse(200, [], Psr7\stream_for($jsonTokens)),
-        ]);
-        $g = new GCECredentials();
-        $this->assertEquals($wantedTokens, $g->fetchAuthToken($httpHandler));
-        $this->assertEquals(time() + 57, $g->getLastReceivedToken()['expires_at']);
-    }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/auth/tests/Credentials/IAMCredentialsTest.php b/mayor-orig/www/include/share/googleapi/google/auth/tests/Credentials/IAMCredentialsTest.php
deleted file mode 100644
index fc9c8650..00000000
--- a/mayor-orig/www/include/share/googleapi/google/auth/tests/Credentials/IAMCredentialsTest.php
+++ /dev/null
@@ -1,83 +0,0 @@
-assertNotNull(
-            new IAMCredentials('iam-selector', 'iam-token')
-        );
-    }
-}
-
-class IAMUpdateMetadataCallbackTest extends \PHPUnit_Framework_TestCase
-{
-    public function testUpdateMetadataFunc()
-    {
-        $selector = 'iam-selector';
-        $token = 'iam-token';
-        $iam = new IAMCredentials(
-            $selector,
-            $token
-        );
-
-        $update_metadata = $iam->getUpdateMetadataFunc();
-        $this->assertTrue(is_callable($update_metadata));
-
-        $actual_metadata = call_user_func($update_metadata,
-            $metadata = array('foo' => 'bar'));
-        $this->assertTrue(
-            isset($actual_metadata[IAMCredentials::SELECTOR_KEY]));
-        $this->assertEquals(
-            $actual_metadata[IAMCredentials::SELECTOR_KEY],
-            $selector);
-        $this->assertTrue(
-            isset($actual_metadata[IAMCredentials::TOKEN_KEY]));
-        $this->assertEquals(
-            $actual_metadata[IAMCredentials::TOKEN_KEY],
-            $token);
-    }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/auth/tests/Credentials/ServiceAccountCredentialsTest.php b/mayor-orig/www/include/share/googleapi/google/auth/tests/Credentials/ServiceAccountCredentialsTest.php
deleted file mode 100644
index d7066dac..00000000
--- a/mayor-orig/www/include/share/googleapi/google/auth/tests/Credentials/ServiceAccountCredentialsTest.php
+++ /dev/null
@@ -1,508 +0,0 @@
- 'key123',
-        'private_key' => 'privatekey',
-        'client_email' => 'test@example.com',
-        'client_id' => 'client123',
-        'type' => 'service_account',
-    ];
-}
-
-class SACGetCacheKeyTest extends \PHPUnit_Framework_TestCase
-{
-    public function testShouldBeTheSameAsOAuth2WithTheSameScope()
-    {
-        $testJson = createTestJson();
-        $scope = ['scope/1', 'scope/2'];
-        $sa = new ServiceAccountCredentials(
-            $scope,
-            $testJson);
-        $o = new OAuth2(['scope' => $scope]);
-        $this->assertSame(
-            $testJson['client_email'] . ':' . $o->getCacheKey(),
-            $sa->getCacheKey()
-        );
-    }
-
-    public function testShouldBeTheSameAsOAuth2WithTheSameScopeWithSub()
-    {
-        $testJson = createTestJson();
-        $scope = ['scope/1', 'scope/2'];
-        $sub = 'sub123';
-        $sa = new ServiceAccountCredentials(
-            $scope,
-            $testJson,
-            $sub);
-        $o = new OAuth2(['scope' => $scope]);
-        $this->assertSame(
-            $testJson['client_email'] . ':' . $o->getCacheKey() . ':' . $sub,
-            $sa->getCacheKey()
-        );
-    }
-
-    public function testShouldBeTheSameAsOAuth2WithTheSameScopeWithSubAddedLater()
-    {
-        $testJson = createTestJson();
-        $scope = ['scope/1', 'scope/2'];
-        $sub = 'sub123';
-        $sa = new ServiceAccountCredentials(
-            $scope,
-            $testJson,
-            null);
-        $sa->setSub($sub);
-
-        $o = new OAuth2(['scope' => $scope]);
-        $this->assertSame(
-            $testJson['client_email'] . ':' . $o->getCacheKey() . ':' . $sub,
-            $sa->getCacheKey()
-        );
-    }
-}
-
-class SACConstructorTest extends \PHPUnit_Framework_TestCase
-{
-    /**
-     * @expectedException InvalidArgumentException
-     */
-    public function testShouldFailIfScopeIsNotAValidType()
-    {
-        $testJson = createTestJson();
-        $notAnArrayOrString = new \stdClass();
-        $sa = new ServiceAccountCredentials(
-            $notAnArrayOrString,
-            $testJson
-        );
-    }
-
-    /**
-     * @expectedException InvalidArgumentException
-     */
-    public function testShouldFailIfJsonDoesNotHaveClientEmail()
-    {
-        $testJson = createTestJson();
-        unset($testJson['client_email']);
-        $scope = ['scope/1', 'scope/2'];
-        $sa = new ServiceAccountCredentials(
-            $scope,
-            $testJson
-        );
-    }
-
-    /**
-     * @expectedException InvalidArgumentException
-     */
-    public function testShouldFailIfJsonDoesNotHavePrivateKey()
-    {
-        $testJson = createTestJson();
-        unset($testJson['private_key']);
-        $scope = ['scope/1', 'scope/2'];
-        $sa = new ServiceAccountCredentials(
-            $scope,
-            $testJson
-        );
-    }
-
-    /**
-     * @expectedException InvalidArgumentException
-     */
-    public function testFailsToInitalizeFromANonExistentFile()
-    {
-        $keyFile = __DIR__ . '/../fixtures' . '/does-not-exist-private.json';
-        new ServiceAccountCredentials('scope/1', $keyFile);
-    }
-
-    public function testInitalizeFromAFile()
-    {
-        $keyFile = __DIR__ . '/../fixtures' . '/private.json';
-        $this->assertNotNull(
-            new ServiceAccountCredentials('scope/1', $keyFile)
-        );
-    }
-}
-
-class SACFromEnvTest extends \PHPUnit_Framework_TestCase
-{
-    protected function tearDown()
-    {
-        putenv(ServiceAccountCredentials::ENV_VAR);  // removes it from
-    }
-
-    public function testIsNullIfEnvVarIsNotSet()
-    {
-        $this->assertNull(ServiceAccountCredentials::fromEnv());
-    }
-
-    /**
-     * @expectedException DomainException
-     */
-    public function testFailsIfEnvSpecifiesNonExistentFile()
-    {
-        $keyFile = __DIR__ . '/../fixtures' . '/does-not-exist-private.json';
-        putenv(ServiceAccountCredentials::ENV_VAR . '=' . $keyFile);
-        ApplicationDefaultCredentials::getCredentials('a scope');
-    }
-
-    public function testSucceedIfFileExists()
-    {
-        $keyFile = __DIR__ . '/../fixtures' . '/private.json';
-        putenv(ServiceAccountCredentials::ENV_VAR . '=' . $keyFile);
-        $this->assertNotNull(ApplicationDefaultCredentials::getCredentials('a scope'));
-    }
-}
-
-class SACFromWellKnownFileTest extends \PHPUnit_Framework_TestCase
-{
-    private $originalHome;
-
-    protected function setUp()
-    {
-        $this->originalHome = getenv('HOME');
-    }
-
-    protected function tearDown()
-    {
-        if ($this->originalHome != getenv('HOME')) {
-            putenv('HOME=' . $this->originalHome);
-        }
-    }
-
-    public function testIsNullIfFileDoesNotExist()
-    {
-        putenv('HOME=' . __DIR__ . '/../not_exists_fixtures');
-        $this->assertNull(
-            ServiceAccountCredentials::fromWellKnownFile()
-        );
-    }
-
-    public function testSucceedIfFileIsPresent()
-    {
-        putenv('HOME=' . __DIR__ . '/../fixtures');
-        $this->assertNotNull(
-            ApplicationDefaultCredentials::getCredentials('a scope')
-        );
-    }
-}
-
-class SACFetchAuthTokenTest extends \PHPUnit_Framework_TestCase
-{
-    private $privateKey;
-
-    public function setUp()
-    {
-        $this->privateKey =
-            file_get_contents(__DIR__ . '/../fixtures' . '/private.pem');
-    }
-
-    private function createTestJson()
-    {
-        $testJson = createTestJson();
-        $testJson['private_key'] = $this->privateKey;
-
-        return $testJson;
-    }
-
-    /**
-     * @expectedException GuzzleHttp\Exception\ClientException
-     */
-    public function testFailsOnClientErrors()
-    {
-        $testJson = $this->createTestJson();
-        $scope = ['scope/1', 'scope/2'];
-        $httpHandler = getHandler([
-            buildResponse(400),
-        ]);
-        $sa = new ServiceAccountCredentials(
-            $scope,
-            $testJson
-        );
-        $sa->fetchAuthToken($httpHandler);
-    }
-
-    /**
-     * @expectedException GuzzleHttp\Exception\ServerException
-     */
-    public function testFailsOnServerErrors()
-    {
-        $testJson = $this->createTestJson();
-        $scope = ['scope/1', 'scope/2'];
-        $httpHandler = getHandler([
-            buildResponse(500),
-        ]);
-        $sa = new ServiceAccountCredentials(
-            $scope,
-            $testJson
-        );
-        $sa->fetchAuthToken($httpHandler);
-    }
-
-    public function testCanFetchCredsOK()
-    {
-        $testJson = $this->createTestJson();
-        $testJsonText = json_encode($testJson);
-        $scope = ['scope/1', 'scope/2'];
-        $httpHandler = getHandler([
-            buildResponse(200, [], Psr7\stream_for($testJsonText)),
-        ]);
-        $sa = new ServiceAccountCredentials(
-            $scope,
-            $testJson
-        );
-        $tokens = $sa->fetchAuthToken($httpHandler);
-        $this->assertEquals($testJson, $tokens);
-    }
-
-    public function testUpdateMetadataFunc()
-    {
-        $testJson = $this->createTestJson();
-        $scope = ['scope/1', 'scope/2'];
-        $access_token = 'accessToken123';
-        $responseText = json_encode(array('access_token' => $access_token));
-        $httpHandler = getHandler([
-            buildResponse(200, [], Psr7\stream_for($responseText)),
-        ]);
-        $sa = new ServiceAccountCredentials(
-            $scope,
-            $testJson
-        );
-        $update_metadata = $sa->getUpdateMetadataFunc();
-        $this->assertTrue(is_callable($update_metadata));
-
-        $actual_metadata = call_user_func($update_metadata,
-            $metadata = array('foo' => 'bar'),
-            $authUri = null,
-            $httpHandler);
-        $this->assertTrue(
-            isset($actual_metadata[CredentialsLoader::AUTH_METADATA_KEY]));
-        $this->assertEquals(
-            $actual_metadata[CredentialsLoader::AUTH_METADATA_KEY],
-            array('Bearer ' . $access_token));
-    }
-}
-
-class SACJwtAccessTest extends \PHPUnit_Framework_TestCase
-{
-    private $privateKey;
-
-    public function setUp()
-    {
-        $this->privateKey =
-            file_get_contents(__DIR__ . '/../fixtures' . '/private.pem');
-    }
-
-    private function createTestJson()
-    {
-        $testJson = createTestJson();
-        $testJson['private_key'] = $this->privateKey;
-
-        return $testJson;
-    }
-
-    /**
-     * @expectedException InvalidArgumentException
-     */
-    public function testFailsOnMissingClientEmail()
-    {
-        $testJson = $this->createTestJson();
-        unset($testJson['client_email']);
-        $sa = new ServiceAccountJwtAccessCredentials(
-            $testJson
-        );
-    }
-
-    /**
-     * @expectedException InvalidArgumentException
-     */
-    public function testFailsOnMissingPrivateKey()
-    {
-        $testJson = $this->createTestJson();
-        unset($testJson['private_key']);
-        $sa = new ServiceAccountJwtAccessCredentials(
-            $testJson
-        );
-    }
-
-    public function testCanInitializeFromJson()
-    {
-        $testJson = $this->createTestJson();
-        $sa = new ServiceAccountJwtAccessCredentials(
-            $testJson
-        );
-        $this->assertNotNull($sa);
-    }
-
-    public function testNoOpOnFetchAuthToken()
-    {
-        $testJson = $this->createTestJson();
-        $sa = new ServiceAccountJwtAccessCredentials(
-            $testJson
-        );
-        $this->assertNotNull($sa);
-
-        $httpHandler = getHandler([
-            buildResponse(200),
-        ]);
-        $result = $sa->fetchAuthToken($httpHandler); // authUri has not been set
-        $this->assertNull($result);
-    }
-
-    public function testAuthUriIsNotSet()
-    {
-        $testJson = $this->createTestJson();
-        $sa = new ServiceAccountJwtAccessCredentials(
-            $testJson
-        );
-        $this->assertNotNull($sa);
-
-        $update_metadata = $sa->getUpdateMetadataFunc();
-        $this->assertTrue(is_callable($update_metadata));
-
-        $actual_metadata = call_user_func($update_metadata,
-            $metadata = array('foo' => 'bar'),
-            $authUri = null);
-        $this->assertTrue(
-            !isset($actual_metadata[CredentialsLoader::AUTH_METADATA_KEY]));
-    }
-
-    public function testUpdateMetadataFunc()
-    {
-        $testJson = $this->createTestJson();
-        $sa = new ServiceAccountJwtAccessCredentials(
-            $testJson
-        );
-        $this->assertNotNull($sa);
-
-        $update_metadata = $sa->getUpdateMetadataFunc();
-        $this->assertTrue(is_callable($update_metadata));
-
-        $actual_metadata = call_user_func($update_metadata,
-            $metadata = array('foo' => 'bar'),
-            $authUri = 'https://example.com/service');
-        $this->assertTrue(
-            isset($actual_metadata[CredentialsLoader::AUTH_METADATA_KEY]));
-
-        $authorization = $actual_metadata[CredentialsLoader::AUTH_METADATA_KEY];
-        $this->assertTrue(is_array($authorization));
-
-        $bearer_token = current($authorization);
-        $this->assertTrue(is_string($bearer_token));
-        $this->assertTrue(strpos($bearer_token, 'Bearer ') == 0);
-        $this->assertTrue(strlen($bearer_token) > 30);
-
-        $actual_metadata2 = call_user_func($update_metadata,
-            $metadata = array('foo' => 'bar'),
-            $authUri = 'https://example.com/anotherService');
-        $this->assertTrue(
-            isset($actual_metadata2[CredentialsLoader::AUTH_METADATA_KEY]));
-
-        $authorization2 = $actual_metadata2[CredentialsLoader::AUTH_METADATA_KEY];
-        $this->assertTrue(is_array($authorization2));
-
-        $bearer_token2 = current($authorization2);
-        $this->assertTrue(is_string($bearer_token2));
-        $this->assertTrue(strpos($bearer_token2, 'Bearer ') == 0);
-        $this->assertTrue(strlen($bearer_token2) > 30);
-        $this->assertTrue($bearer_token != $bearer_token2);
-    }
-}
-
-class SACJwtAccessComboTest extends \PHPUnit_Framework_TestCase
-{
-    private $privateKey;
-
-    public function setUp()
-    {
-        $this->privateKey =
-            file_get_contents(__DIR__ . '/../fixtures' . '/private.pem');
-    }
-
-    private function createTestJson()
-    {
-        $testJson = createTestJson();
-        $testJson['private_key'] = $this->privateKey;
-
-        return $testJson;
-    }
-
-    public function testNoScopeUseJwtAccess()
-    {
-        $testJson = $this->createTestJson();
-        // no scope, jwt access should be used, no outbound
-        // call should be made
-        $scope = null;
-        $sa = new ServiceAccountCredentials(
-            $scope,
-            $testJson
-        );
-        $this->assertNotNull($sa);
-
-        $update_metadata = $sa->getUpdateMetadataFunc();
-        $this->assertTrue(is_callable($update_metadata));
-
-        $actual_metadata = call_user_func($update_metadata,
-            $metadata = array('foo' => 'bar'),
-            $authUri = 'https://example.com/service');
-        $this->assertTrue(
-            isset($actual_metadata[CredentialsLoader::AUTH_METADATA_KEY]));
-
-        $authorization = $actual_metadata[CredentialsLoader::AUTH_METADATA_KEY];
-        $this->assertTrue(is_array($authorization));
-
-        $bearer_token = current($authorization);
-        $this->assertTrue(is_string($bearer_token));
-        $this->assertTrue(strpos($bearer_token, 'Bearer ') == 0);
-        $this->assertTrue(strlen($bearer_token) > 30);
-    }
-
-    public function testNoScopeAndNoAuthUri()
-    {
-        $testJson = $this->createTestJson();
-        // no scope, jwt access should be used, no outbound
-        // call should be made
-        $scope = null;
-        $sa = new ServiceAccountCredentials(
-            $scope,
-            $testJson
-        );
-        $this->assertNotNull($sa);
-
-        $update_metadata = $sa->getUpdateMetadataFunc();
-        $this->assertTrue(is_callable($update_metadata));
-
-        $actual_metadata = call_user_func($update_metadata,
-            $metadata = array('foo' => 'bar'),
-            $authUri = null);
-        // no access_token is added to the metadata hash
-        // but also, no error should be thrown
-        $this->assertTrue(is_array($actual_metadata));
-        $this->assertTrue(
-            !isset($actual_metadata[CredentialsLoader::AUTH_METADATA_KEY]));
-    }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/auth/tests/Credentials/UserRefreshCredentialsTest.php b/mayor-orig/www/include/share/googleapi/google/auth/tests/Credentials/UserRefreshCredentialsTest.php
deleted file mode 100644
index accf448d..00000000
--- a/mayor-orig/www/include/share/googleapi/google/auth/tests/Credentials/UserRefreshCredentialsTest.php
+++ /dev/null
@@ -1,228 +0,0 @@
- 'client123',
-        'client_secret' => 'clientSecret123',
-        'refresh_token' => 'refreshToken123',
-        'type' => 'authorized_user',
-    ];
-}
-
-class URCGetCacheKeyTest extends \PHPUnit_Framework_TestCase
-{
-    public function testShouldBeTheSameAsOAuth2WithTheSameScope()
-    {
-        $testJson = createURCTestJson();
-        $scope = ['scope/1', 'scope/2'];
-        $sa = new UserRefreshCredentials(
-            $scope,
-            $testJson);
-        $o = new OAuth2(['scope' => $scope]);
-        $this->assertSame(
-            $testJson['client_id'] . ':' . $o->getCacheKey(),
-            $sa->getCacheKey()
-        );
-    }
-}
-
-class URCConstructorTest extends \PHPUnit_Framework_TestCase
-{
-    /**
-     * @expectedException InvalidArgumentException
-     */
-    public function testShouldFailIfScopeIsNotAValidType()
-    {
-        $testJson = createURCTestJson();
-        $notAnArrayOrString = new \stdClass();
-        $sa = new UserRefreshCredentials(
-            $notAnArrayOrString,
-            $testJson
-        );
-    }
-
-    /**
-     * @expectedException InvalidArgumentException
-     */
-    public function testShouldFailIfJsonDoesNotHaveClientSecret()
-    {
-        $testJson = createURCTestJson();
-        unset($testJson['client_secret']);
-        $scope = ['scope/1', 'scope/2'];
-        $sa = new UserRefreshCredentials(
-            $scope,
-            $testJson
-        );
-    }
-
-    /**
-     * @expectedException InvalidArgumentException
-     */
-    public function testShouldFailIfJsonDoesNotHaveRefreshToken()
-    {
-        $testJson = createURCTestJson();
-        unset($testJson['refresh_token']);
-        $scope = ['scope/1', 'scope/2'];
-        $sa = new UserRefreshCredentials(
-            $scope,
-            $testJson
-        );
-    }
-
-    /**
-     * @expectedException InvalidArgumentException
-     */
-    public function testFailsToInitalizeFromANonExistentFile()
-    {
-        $keyFile = __DIR__ . '/../fixtures' . '/does-not-exist-private.json';
-        new UserRefreshCredentials('scope/1', $keyFile);
-    }
-
-    public function testInitalizeFromAFile()
-    {
-        $keyFile = __DIR__ . '/../fixtures2' . '/private.json';
-        $this->assertNotNull(
-            new UserRefreshCredentials('scope/1', $keyFile)
-        );
-    }
-}
-
-class URCFromEnvTest extends \PHPUnit_Framework_TestCase
-{
-    protected function tearDown()
-    {
-        putenv(UserRefreshCredentials::ENV_VAR);  // removes it from
-    }
-
-    public function testIsNullIfEnvVarIsNotSet()
-    {
-        $this->assertNull(UserRefreshCredentials::fromEnv('a scope'));
-    }
-
-    /**
-     * @expectedException DomainException
-     */
-    public function testFailsIfEnvSpecifiesNonExistentFile()
-    {
-        $keyFile = __DIR__ . '/../fixtures' . '/does-not-exist-private.json';
-        putenv(UserRefreshCredentials::ENV_VAR . '=' . $keyFile);
-        UserRefreshCredentials::fromEnv('a scope');
-    }
-
-    public function testSucceedIfFileExists()
-    {
-        $keyFile = __DIR__ . '/../fixtures2' . '/private.json';
-        putenv(UserRefreshCredentials::ENV_VAR . '=' . $keyFile);
-        $this->assertNotNull(ApplicationDefaultCredentials::getCredentials('a scope'));
-    }
-}
-
-class URCFromWellKnownFileTest extends \PHPUnit_Framework_TestCase
-{
-    private $originalHome;
-
-    protected function setUp()
-    {
-        $this->originalHome = getenv('HOME');
-    }
-
-    protected function tearDown()
-    {
-        if ($this->originalHome != getenv('HOME')) {
-            putenv('HOME=' . $this->originalHome);
-        }
-    }
-
-    public function testIsNullIfFileDoesNotExist()
-    {
-        putenv('HOME=' . __DIR__ . '/../not_exist_fixtures');
-        $this->assertNull(
-            UserRefreshCredentials::fromWellKnownFile('a scope')
-        );
-    }
-
-    public function testSucceedIfFileIsPresent()
-    {
-        putenv('HOME=' . __DIR__ . '/../fixtures2');
-        $this->assertNotNull(
-            ApplicationDefaultCredentials::getCredentials('a scope')
-        );
-    }
-}
-
-class URCFetchAuthTokenTest extends \PHPUnit_Framework_TestCase
-{
-    /**
-     * @expectedException GuzzleHttp\Exception\ClientException
-     */
-    public function testFailsOnClientErrors()
-    {
-        $testJson = createURCTestJson();
-        $scope = ['scope/1', 'scope/2'];
-        $httpHandler = getHandler([
-            buildResponse(400),
-        ]);
-        $sa = new UserRefreshCredentials(
-            $scope,
-            $testJson
-        );
-        $sa->fetchAuthToken($httpHandler);
-    }
-
-    /**
-     * @expectedException GuzzleHttp\Exception\ServerException
-     */
-    public function testFailsOnServerErrors()
-    {
-        $testJson = createURCTestJson();
-        $scope = ['scope/1', 'scope/2'];
-        $httpHandler = getHandler([
-            buildResponse(500),
-        ]);
-        $sa = new UserRefreshCredentials(
-            $scope,
-            $testJson
-        );
-        $sa->fetchAuthToken($httpHandler);
-    }
-
-    public function testCanFetchCredsOK()
-    {
-        $testJson = createURCTestJson();
-        $testJsonText = json_encode($testJson);
-        $scope = ['scope/1', 'scope/2'];
-        $httpHandler = getHandler([
-            buildResponse(200, [], Psr7\stream_for($testJsonText)),
-        ]);
-        $sa = new UserRefreshCredentials(
-            $scope,
-            $testJson
-        );
-        $tokens = $sa->fetchAuthToken($httpHandler);
-        $this->assertEquals($testJson, $tokens);
-    }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/auth/tests/FetchAuthTokenCacheTest.php b/mayor-orig/www/include/share/googleapi/google/auth/tests/FetchAuthTokenCacheTest.php
deleted file mode 100644
index 359094a8..00000000
--- a/mayor-orig/www/include/share/googleapi/google/auth/tests/FetchAuthTokenCacheTest.php
+++ /dev/null
@@ -1,146 +0,0 @@
-mockFetcher =
-            $this
-                ->getMockBuilder('Google\Auth\FetchAuthTokenInterface')
-                ->getMock();
-        $this->mockCacheItem =
-            $this
-                ->getMockBuilder('Psr\Cache\CacheItemInterface')
-                ->getMock();
-        $this->mockCache =
-            $this
-                ->getMockBuilder('Psr\Cache\CacheItemPoolInterface')
-                ->getMock();
-    }
-
-    public function testUsesCachedAuthToken()
-    {
-        $cacheKey = 'myKey';
-        $cachedValue = '2/abcdef1234567890';
-        $this->mockCacheItem
-            ->expects($this->once())
-            ->method('get')
-            ->will($this->returnValue($cachedValue));
-        $this->mockCache
-            ->expects($this->once())
-            ->method('getItem')
-            ->with($this->equalTo($cacheKey))
-            ->will($this->returnValue($this->mockCacheItem));
-        $this->mockFetcher
-            ->expects($this->never())
-            ->method('fetchAuthToken');
-        $this->mockFetcher
-            ->expects($this->any())
-            ->method('getCacheKey')
-            ->will($this->returnValue($cacheKey));
-
-        // Run the test.
-        $cachedFetcher = new FetchAuthTokenCache(
-            $this->mockFetcher,
-            null,
-            $this->mockCache
-        );
-        $accessToken = $cachedFetcher->fetchAuthToken();
-        $this->assertEquals($accessToken, ['access_token' => $cachedValue]);
-    }
-
-    public function testGetsCachedAuthTokenUsingCachePrefix()
-    {
-        $prefix = 'test_prefix_';
-        $cacheKey = 'myKey';
-        $cachedValue = '2/abcdef1234567890';
-        $this->mockCacheItem
-            ->expects($this->once())
-            ->method('get')
-            ->will($this->returnValue($cachedValue));
-        $this->mockCache
-            ->expects($this->once())
-            ->method('getItem')
-            ->with($this->equalTo($prefix . $cacheKey))
-            ->will($this->returnValue($this->mockCacheItem));
-        $this->mockFetcher
-            ->expects($this->never())
-            ->method('fetchAuthToken');
-        $this->mockFetcher
-            ->expects($this->any())
-            ->method('getCacheKey')
-            ->will($this->returnValue($cacheKey));
-
-        // Run the test
-        $cachedFetcher = new FetchAuthTokenCache(
-            $this->mockFetcher,
-            ['prefix' => $prefix],
-            $this->mockCache
-        );
-        $accessToken = $cachedFetcher->fetchAuthToken();
-        $this->assertEquals($accessToken, ['access_token' => $cachedValue]);
-    }
-
-    public function testShouldSaveValueInCacheWithCacheOptions()
-    {
-        $prefix = 'test_prefix_';
-        $lifetime = '70707';
-        $cacheKey = 'myKey';
-        $token = '1/abcdef1234567890';
-        $authResult = ['access_token' => $token];
-        $this->mockCacheItem
-            ->expects($this->any())
-            ->method('get')
-            ->will($this->returnValue(null));
-        $this->mockCacheItem
-            ->expects($this->once())
-            ->method('set')
-            ->with($this->equalTo($token))
-            ->will($this->returnValue(false));
-        $this->mockCacheItem
-            ->expects($this->once())
-            ->method('expiresAfter')
-            ->with($this->equalTo($lifetime));
-        $this->mockCache
-            ->expects($this->exactly(2))
-            ->method('getItem')
-            ->with($this->equalTo($prefix . $cacheKey))
-            ->will($this->returnValue($this->mockCacheItem));
-        $this->mockFetcher
-            ->expects($this->any())
-            ->method('getCacheKey')
-            ->will($this->returnValue($cacheKey));
-        $this->mockFetcher
-            ->expects($this->once())
-            ->method('fetchAuthToken')
-            ->will($this->returnValue($authResult));
-
-        // Run the test
-        $cachedFetcher = new FetchAuthTokenCache(
-            $this->mockFetcher,
-            ['prefix' => $prefix, 'lifetime' => $lifetime],
-            $this->mockCache
-        );
-        $accessToken = $cachedFetcher->fetchAuthToken();
-        $this->assertEquals($accessToken, ['access_token' => $token]);
-    }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/auth/tests/FetchAuthTokenTest.php b/mayor-orig/www/include/share/googleapi/google/auth/tests/FetchAuthTokenTest.php
deleted file mode 100644
index 8616993b..00000000
--- a/mayor-orig/www/include/share/googleapi/google/auth/tests/FetchAuthTokenTest.php
+++ /dev/null
@@ -1,170 +0,0 @@
-getLastReceivedToken();
-
-        $this->assertNotNull($accessToken);
-        $this->assertArrayHasKey('access_token', $accessToken);
-        $this->assertArrayHasKey('expires_at', $accessToken);
-
-        $this->assertEquals('xyz', $accessToken['access_token']);
-        $this->assertEquals(strtotime('2001'), $accessToken['expires_at']);
-    }
-
-    public function provideAuthTokenFetcher()
-    {
-        $scopes = ['https://www.googleapis.com/auth/drive.readonly'];
-        $jsonPath = sprintf(
-            '%s/fixtures/.config/%s',
-            __DIR__,
-            CredentialsLoader::WELL_KNOWN_PATH
-        );
-        $jsonPath2 = sprintf(
-            '%s/fixtures2/.config/%s',
-            __DIR__,
-            CredentialsLoader::WELL_KNOWN_PATH
-        );
-
-        return [
-            [$this->getAppIdentityCredentials()],
-            [$this->getGCECredentials()],
-            [$this->getServiceAccountCredentials($scopes, $jsonPath)],
-            [$this->getServiceAccountJwtAccessCredentials($jsonPath)],
-            [$this->getUserRefreshCredentials($scopes, $jsonPath2)],
-            [$this->getOAuth2()],
-        ];
-    }
-
-    private function getAppIdentityCredentials()
-    {
-        $class = new \ReflectionClass(
-            'Google\Auth\Credentials\AppIdentityCredentials'
-        );
-        $property = $class->getProperty('lastReceivedToken');
-        $property->setAccessible(true);
-
-        $credentials = new AppIdentityCredentials();
-        $property->setValue($credentials, [
-            'access_token' => 'xyz',
-            'expiration_time' => strtotime('2001'),
-        ]);
-
-        return $credentials;
-    }
-
-    private function getGCECredentials()
-    {
-        $class = new \ReflectionClass(
-            'Google\Auth\Credentials\GCECredentials'
-        );
-        $property = $class->getProperty('lastReceivedToken');
-        $property->setAccessible(true);
-
-        $credentials = new GCECredentials();
-        $property->setValue($credentials, [
-            'access_token' => 'xyz',
-            'expires_at' => strtotime('2001'),
-        ]);
-
-        return $credentials;
-    }
-
-    private function getServiceAccountCredentials($scopes, $jsonPath)
-    {
-        $class = new \ReflectionClass(
-            'Google\Auth\Credentials\ServiceAccountCredentials'
-        );
-        $property = $class->getProperty('auth');
-        $property->setAccessible(true);
-
-        $credentials = new ServiceAccountCredentials($scopes, $jsonPath);
-        $property->setValue($credentials, $this->getOAuth2Mock());
-
-        return $credentials;
-    }
-
-    private function getServiceAccountJwtAccessCredentials($jsonPath)
-    {
-        $class = new \ReflectionClass(
-            'Google\Auth\Credentials\ServiceAccountJwtAccessCredentials'
-        );
-        $property = $class->getProperty('auth');
-        $property->setAccessible(true);
-
-        $credentials = new ServiceAccountJwtAccessCredentials($jsonPath);
-        $property->setValue($credentials, $this->getOAuth2Mock());
-
-        return $credentials;
-    }
-
-    private function getUserRefreshCredentials($scopes, $jsonPath)
-    {
-        $class = new \ReflectionClass(
-            'Google\Auth\Credentials\UserRefreshCredentials'
-        );
-        $property = $class->getProperty('auth');
-        $property->setAccessible(true);
-
-        $credentials = new UserRefreshCredentials($scopes, $jsonPath);
-        $property->setValue($credentials, $this->getOAuth2Mock());
-
-        return $credentials;
-    }
-
-    private function getOAuth2()
-    {
-        $oauth = new OAuth2([
-            'access_token' => 'xyz',
-            'expires_at' => strtotime('2001'),
-        ]);
-
-        return $oauth;
-    }
-
-    private function getOAuth2Mock()
-    {
-        $mock = $this->getMockBuilder('Google\Auth\OAuth2')
-            ->disableOriginalConstructor()
-            ->getMock();
-
-        $mock
-            ->expects($this->once())
-            ->method('getLastReceivedToken')
-            ->will($this->returnValue([
-                'access_token' => 'xyz',
-                'expires_at' => strtotime('2001'),
-            ]));
-
-        return $mock;
-    }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/auth/tests/HttpHandler/Guzzle5HttpHandlerTest.php b/mayor-orig/www/include/share/googleapi/google/auth/tests/HttpHandler/Guzzle5HttpHandlerTest.php
deleted file mode 100644
index f8560b17..00000000
--- a/mayor-orig/www/include/share/googleapi/google/auth/tests/HttpHandler/Guzzle5HttpHandlerTest.php
+++ /dev/null
@@ -1,59 +0,0 @@
-onlyGuzzle5();
-
-        $this->mockPsr7Request =
-            $this
-                ->getMockBuilder('Psr\Http\Message\RequestInterface')
-                ->getMock();
-        $this->mockRequest =
-            $this
-                ->getMockBuilder('GuzzleHttp\Message\RequestInterface')
-                ->getMock();
-        $this->mockClient =
-            $this
-                ->getMockBuilder('GuzzleHttp\Client')
-                ->disableOriginalConstructor()
-                ->getMock();
-    }
-
-    public function testSuccessfullySendsRequest()
-    {
-        $this->mockClient
-            ->expects($this->any())
-            ->method('send')
-            ->will($this->returnValue(new Response(200)));
-        $this->mockClient
-            ->expects($this->any())
-            ->method('createRequest')
-            ->will($this->returnValue($this->mockRequest));
-
-        $handler = new Guzzle5HttpHandler($this->mockClient);
-        $response = $handler($this->mockPsr7Request);
-        $this->assertInstanceOf('Psr\Http\Message\ResponseInterface', $response);
-    }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/auth/tests/HttpHandler/Guzzle6HttpHandlerTest.php b/mayor-orig/www/include/share/googleapi/google/auth/tests/HttpHandler/Guzzle6HttpHandlerTest.php
deleted file mode 100644
index dfd90db9..00000000
--- a/mayor-orig/www/include/share/googleapi/google/auth/tests/HttpHandler/Guzzle6HttpHandlerTest.php
+++ /dev/null
@@ -1,50 +0,0 @@
-onlyGuzzle6();
-
-        $this->mockRequest =
-            $this
-                ->getMockBuilder('Psr\Http\Message\RequestInterface')
-                ->getMock();
-        $this->mockClient =
-            $this
-                ->getMockBuilder('GuzzleHttp\Client')
-                ->getMock();
-    }
-
-    public function testSuccessfullySendsRequest()
-    {
-        $this->mockClient
-            ->expects($this->any())
-            ->method('send')
-            ->will($this->returnValue(new Response(200)));
-
-        $handler = new Guzzle6HttpHandler($this->mockClient);
-        $response = $handler($this->mockRequest);
-        $this->assertInstanceOf('Psr\Http\Message\ResponseInterface', $response);
-    }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/auth/tests/HttpHandler/HttpHandlerFactoryTest.php b/mayor-orig/www/include/share/googleapi/google/auth/tests/HttpHandler/HttpHandlerFactoryTest.php
deleted file mode 100644
index 73126e60..00000000
--- a/mayor-orig/www/include/share/googleapi/google/auth/tests/HttpHandler/HttpHandlerFactoryTest.php
+++ /dev/null
@@ -1,39 +0,0 @@
-onlyGuzzle5();
-
-        $handler = HttpHandlerFactory::build();
-        $this->assertInstanceOf('Google\Auth\HttpHandler\Guzzle5HttpHandler', $handler);
-    }
-
-    public function testBuildsGuzzle6Handler()
-    {
-        $this->onlyGuzzle6();
-
-        $handler = HttpHandlerFactory::build();
-        $this->assertInstanceOf('Google\Auth\HttpHandler\Guzzle6HttpHandler', $handler);
-    }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/auth/tests/Middleware/AuthTokenMiddlewareTest.php b/mayor-orig/www/include/share/googleapi/google/auth/tests/Middleware/AuthTokenMiddlewareTest.php
deleted file mode 100644
index 43f03705..00000000
--- a/mayor-orig/www/include/share/googleapi/google/auth/tests/Middleware/AuthTokenMiddlewareTest.php
+++ /dev/null
@@ -1,336 +0,0 @@
-onlyGuzzle6();
-
-        $this->mockFetcher =
-            $this
-                ->getMockBuilder('Google\Auth\FetchAuthTokenInterface')
-                ->getMock();
-        $this->mockCacheItem =
-            $this
-                ->getMockBuilder('Psr\Cache\CacheItemInterface')
-                ->getMock();
-        $this->mockCache =
-            $this
-                ->getMockBuilder('Psr\Cache\CacheItemPoolInterface')
-                ->getMock();
-        $this->mockRequest =
-            $this
-                ->getMockBuilder('GuzzleHttp\Psr7\Request')
-                ->disableOriginalConstructor()
-                ->getMock();
-    }
-
-    public function testOnlyTouchesWhenAuthConfigScoped()
-    {
-        $this->mockFetcher
-            ->expects($this->any())
-            ->method('fetchAuthToken')
-            ->will($this->returnValue([]));
-        $this->mockRequest
-            ->expects($this->never())
-            ->method('withHeader');
-
-        $middleware = new AuthTokenMiddleware($this->mockFetcher);
-        $mock = new MockHandler([new Response(200)]);
-        $callable = $middleware($mock);
-        $callable($this->mockRequest, ['auth' => 'not_google_auth']);
-    }
-
-    public function testAddsTheTokenAsAnAuthorizationHeader()
-    {
-        $authResult = ['access_token' => '1/abcdef1234567890'];
-        $this->mockFetcher
-            ->expects($this->once())
-            ->method('fetchAuthToken')
-            ->will($this->returnValue($authResult));
-        $this->mockRequest
-            ->expects($this->once())
-            ->method('withHeader')
-            ->with('Authorization', 'Bearer ' . $authResult['access_token'])
-            ->will($this->returnValue($this->mockRequest));
-
-        // Run the test.
-        $middleware = new AuthTokenMiddleware($this->mockFetcher);
-        $mock = new MockHandler([new Response(200)]);
-        $callable = $middleware($mock);
-        $callable($this->mockRequest, ['auth' => 'google_auth']);
-    }
-
-    public function testDoesNotAddAnAuthorizationHeaderOnNoAccessToken()
-    {
-        $authResult = ['not_access_token' => '1/abcdef1234567890'];
-        $this->mockFetcher
-            ->expects($this->once())
-            ->method('fetchAuthToken')
-            ->will($this->returnValue($authResult));
-        $this->mockRequest
-            ->expects($this->once())
-            ->method('withHeader')
-            ->with('Authorization', 'Bearer ')
-            ->will($this->returnValue($this->mockRequest));
-
-        // Run the test.
-        $middleware = new AuthTokenMiddleware($this->mockFetcher);
-        $mock = new MockHandler([new Response(200)]);
-        $callable = $middleware($mock);
-        $callable($this->mockRequest, ['auth' => 'google_auth']);
-    }
-
-    public function testUsesCachedAuthToken()
-    {
-        $cacheKey = 'myKey';
-        $cachedValue = '2/abcdef1234567890';
-        $this->mockCacheItem
-            ->expects($this->once())
-            ->method('get')
-            ->will($this->returnValue($cachedValue));
-        $this->mockCache
-            ->expects($this->once())
-            ->method('getItem')
-            ->with($this->equalTo($cacheKey))
-            ->will($this->returnValue($this->mockCacheItem));
-        $this->mockFetcher
-            ->expects($this->never())
-            ->method('fetchAuthToken');
-        $this->mockFetcher
-            ->expects($this->any())
-            ->method('getCacheKey')
-            ->will($this->returnValue($cacheKey));
-        $this->mockRequest
-            ->expects($this->once())
-            ->method('withHeader')
-            ->with('Authorization', 'Bearer ' . $cachedValue)
-            ->will($this->returnValue($this->mockRequest));
-
-        // Run the test.
-        $cachedFetcher = new FetchAuthTokenCache(
-            $this->mockFetcher,
-            null,
-            $this->mockCache
-        );
-        $middleware = new AuthTokenMiddleware($cachedFetcher);
-        $mock = new MockHandler([new Response(200)]);
-        $callable = $middleware($mock);
-        $callable($this->mockRequest, ['auth' => 'google_auth']);
-    }
-
-    public function testGetsCachedAuthTokenUsingCacheOptions()
-    {
-        $prefix = 'test_prefix_';
-        $cacheKey = 'myKey';
-        $cachedValue = '2/abcdef1234567890';
-        $this->mockCacheItem
-            ->expects($this->once())
-            ->method('get')
-            ->will($this->returnValue($cachedValue));
-        $this->mockCache
-            ->expects($this->once())
-            ->method('getItem')
-            ->with($this->equalTo($prefix . $cacheKey))
-            ->will($this->returnValue($this->mockCacheItem));
-        $this->mockFetcher
-            ->expects($this->never())
-            ->method('fetchAuthToken');
-        $this->mockFetcher
-            ->expects($this->any())
-            ->method('getCacheKey')
-            ->will($this->returnValue($cacheKey));
-        $this->mockRequest
-            ->expects($this->once())
-            ->method('withHeader')
-            ->with('Authorization', 'Bearer ' . $cachedValue)
-            ->will($this->returnValue($this->mockRequest));
-
-        // Run the test.
-        $cachedFetcher = new FetchAuthTokenCache(
-            $this->mockFetcher,
-            ['prefix' => $prefix],
-            $this->mockCache
-        );
-        $middleware = new AuthTokenMiddleware($cachedFetcher);
-        $mock = new MockHandler([new Response(200)]);
-        $callable = $middleware($mock);
-        $callable($this->mockRequest, ['auth' => 'google_auth']);
-    }
-
-    public function testShouldSaveValueInCacheWithSpecifiedPrefix()
-    {
-        $prefix = 'test_prefix_';
-        $lifetime = '70707';
-        $cacheKey = 'myKey';
-        $token = '1/abcdef1234567890';
-        $authResult = ['access_token' => $token];
-        $this->mockCacheItem
-            ->expects($this->any())
-            ->method('get')
-            ->will($this->returnValue(null));
-        $this->mockCacheItem
-            ->expects($this->once())
-            ->method('set')
-            ->with($this->equalTo($token))
-            ->will($this->returnValue(false));
-        $this->mockCacheItem
-            ->expects($this->once())
-            ->method('expiresAfter')
-            ->with($this->equalTo($lifetime));
-        $this->mockCache
-            ->expects($this->any())
-            ->method('getItem')
-            ->with($this->equalTo($prefix . $cacheKey))
-            ->will($this->returnValue($this->mockCacheItem));
-        $this->mockFetcher
-            ->expects($this->any())
-            ->method('getCacheKey')
-            ->will($this->returnValue($cacheKey));
-        $this->mockFetcher
-            ->expects($this->once())
-            ->method('fetchAuthToken')
-            ->will($this->returnValue($authResult));
-        $this->mockRequest
-            ->expects($this->once())
-            ->method('withHeader')
-            ->with('Authorization', 'Bearer ' . $token)
-            ->will($this->returnValue($this->mockRequest));
-
-        // Run the test.
-        $cachedFetcher = new FetchAuthTokenCache(
-            $this->mockFetcher,
-            ['prefix' => $prefix, 'lifetime' => $lifetime],
-            $this->mockCache
-        );
-        $middleware = new AuthTokenMiddleware($cachedFetcher);
-        $mock = new MockHandler([new Response(200)]);
-        $callable = $middleware($mock);
-        $callable($this->mockRequest, ['auth' => 'google_auth']);
-    }
-
-    /** @dataProvider provideShouldNotifyTokenCallback */
-    public function testShouldNotifyTokenCallback(callable $tokenCallback)
-    {
-        $prefix = 'test_prefix_';
-        $cacheKey = 'myKey';
-        $token = '1/abcdef1234567890';
-        $authResult = ['access_token' => $token];
-        $this->mockCacheItem
-            ->expects($this->any())
-            ->method('get')
-            ->will($this->returnValue(null));
-        $this->mockCache
-            ->expects($this->any())
-            ->method('getItem')
-            ->with($this->equalTo($prefix . $cacheKey))
-            ->will($this->returnValue($this->mockCacheItem));
-        $this->mockFetcher
-            ->expects($this->any())
-            ->method('getCacheKey')
-            ->will($this->returnValue($cacheKey));
-        $this->mockFetcher
-            ->expects($this->once())
-            ->method('fetchAuthToken')
-            ->will($this->returnValue($authResult));
-        $this->mockRequest
-            ->expects($this->once())
-            ->method('withHeader')
-            ->will($this->returnValue($this->mockRequest));
-
-        MiddlewareCallback::$expectedKey = $this->getValidKeyName($prefix . $cacheKey);
-        MiddlewareCallback::$expectedValue = $token;
-        MiddlewareCallback::$called = false;
-
-        // Run the test.
-        $cachedFetcher = new FetchAuthTokenCache(
-            $this->mockFetcher,
-            ['prefix' => $prefix],
-            $this->mockCache
-        );
-        $middleware = new AuthTokenMiddleware(
-            $cachedFetcher,
-            null,
-            $tokenCallback
-        );
-        $mock = new MockHandler([new Response(200)]);
-        $callable = $middleware($mock);
-        $callable($this->mockRequest, ['auth' => 'google_auth']);
-        $this->assertTrue(MiddlewareCallback::$called);
-    }
-
-    public function provideShouldNotifyTokenCallback()
-    {
-        MiddlewareCallback::$phpunit = $this;
-        $anonymousFunc = function ($key, $value) {
-            MiddlewareCallback::staticInvoke($key, $value);
-        };
-        return [
-            ['Google\Auth\Tests\MiddlewareCallbackFunction'],
-            ['Google\Auth\Tests\MiddlewareCallback::staticInvoke'],
-            [['Google\Auth\Tests\MiddlewareCallback', 'staticInvoke']],
-            [$anonymousFunc],
-            [[new MiddlewareCallback, 'staticInvoke']],
-            [[new MiddlewareCallback, 'methodInvoke']],
-            [new MiddlewareCallback],
-        ];
-    }
-}
-
-class MiddlewareCallback
-{
-    public static $phpunit;
-    public static $expectedKey;
-    public static $expectedValue;
-    public static $called = false;
-
-    public function __invoke($key, $value)
-    {
-        self::$phpunit->assertEquals(self::$expectedKey, $key);
-        self::$phpunit->assertEquals(self::$expectedValue, $value);
-        self::$called = true;
-    }
-
-    public function methodInvoke($key, $value)
-    {
-        return $this($key, $value);
-    }
-
-    public static function staticInvoke($key, $value)
-    {
-        $instance = new self();
-        return $instance($key, $value);
-    }
-}
-
-function MiddlewareCallbackFunction($key, $value)
-{
-    return MiddlewareCallback::staticInvoke($key, $value);
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/auth/tests/Middleware/ScopedAccessTokenMiddlewareTest.php b/mayor-orig/www/include/share/googleapi/google/auth/tests/Middleware/ScopedAccessTokenMiddlewareTest.php
deleted file mode 100644
index 27182e0c..00000000
--- a/mayor-orig/www/include/share/googleapi/google/auth/tests/Middleware/ScopedAccessTokenMiddlewareTest.php
+++ /dev/null
@@ -1,245 +0,0 @@
-onlyGuzzle6();
-
-        $this->mockCacheItem =
-            $this
-                ->getMockBuilder('Psr\Cache\CacheItemInterface')
-                ->getMock();
-        $this->mockCache =
-            $this
-                ->getMockBuilder('Psr\Cache\CacheItemPoolInterface')
-                ->getMock();
-        $this->mockRequest =
-            $this
-                ->getMockBuilder('GuzzleHttp\Psr7\Request')
-                ->disableOriginalConstructor()
-                ->getMock();
-    }
-
-    /**
-     * @expectedException InvalidArgumentException
-     */
-    public function testRequiresScopeAsAStringOrArray()
-    {
-        $fakeAuthFunc = function ($unused_scopes) {
-            return '1/abcdef1234567890';
-        };
-        new ScopedAccessTokenMiddleware($fakeAuthFunc, new \stdClass());
-    }
-
-    public function testAddsTheTokenAsAnAuthorizationHeader()
-    {
-        $token = '1/abcdef1234567890';
-        $fakeAuthFunc = function ($unused_scopes) use ($token) {
-            return $token;
-        };
-        $this->mockRequest
-            ->expects($this->once())
-            ->method('withHeader')
-            ->with('Authorization', 'Bearer ' . $token)
-            ->will($this->returnValue($this->mockRequest));
-
-        // Run the test
-        $middleware = new ScopedAccessTokenMiddleware($fakeAuthFunc, self::TEST_SCOPE);
-        $mock = new MockHandler([new Response(200)]);
-        $callable = $middleware($mock);
-        $callable($this->mockRequest, ['auth' => 'scoped']);
-    }
-
-    public function testUsesCachedAuthToken()
-    {
-        $cachedValue = '2/abcdef1234567890';
-        $fakeAuthFunc = function ($unused_scopes) {
-            return '';
-        };
-        $this->mockCacheItem
-            ->expects($this->once())
-            ->method('get')
-            ->will($this->returnValue($cachedValue));
-        $this->mockCache
-            ->expects($this->once())
-            ->method('getItem')
-            ->with($this->equalTo($this->getValidKeyName(self::TEST_SCOPE)))
-            ->will($this->returnValue($this->mockCacheItem));
-        $this->mockRequest
-            ->expects($this->once())
-            ->method('withHeader')
-            ->with('Authorization', 'Bearer ' . $cachedValue)
-            ->will($this->returnValue($this->mockRequest));
-
-        // Run the test
-        $middleware = new ScopedAccessTokenMiddleware(
-            $fakeAuthFunc,
-            self::TEST_SCOPE,
-            [],
-            $this->mockCache
-        );
-        $mock = new MockHandler([new Response(200)]);
-        $callable = $middleware($mock);
-        $callable($this->mockRequest, ['auth' => 'scoped']);
-    }
-
-    public function testGetsCachedAuthTokenUsingCachePrefix()
-    {
-        $prefix = 'test_prefix_';
-        $cachedValue = '2/abcdef1234567890';
-        $fakeAuthFunc = function ($unused_scopes) {
-            return '';
-        };
-        $this->mockCacheItem
-            ->expects($this->once())
-            ->method('get')
-            ->will($this->returnValue($cachedValue));
-        $this->mockCache
-            ->expects($this->once())
-            ->method('getItem')
-            ->with($this->equalTo($prefix . $this->getValidKeyName(self::TEST_SCOPE)))
-            ->will($this->returnValue($this->mockCacheItem));
-        $this->mockRequest
-            ->expects($this->once())
-            ->method('withHeader')
-            ->with('Authorization', 'Bearer ' . $cachedValue)
-            ->will($this->returnValue($this->mockRequest));
-
-        // Run the test
-        $middleware = new ScopedAccessTokenMiddleware(
-            $fakeAuthFunc,
-            self::TEST_SCOPE,
-            ['prefix' => $prefix],
-            $this->mockCache
-        );
-        $mock = new MockHandler([new Response(200)]);
-        $callable = $middleware($mock);
-        $callable($this->mockRequest, ['auth' => 'scoped']);
-    }
-
-    public function testShouldSaveValueInCache()
-    {
-        $token = '2/abcdef1234567890';
-        $fakeAuthFunc = function ($unused_scopes) use ($token) {
-            return $token;
-        };
-        $this->mockCacheItem
-            ->expects($this->once())
-            ->method('get')
-            ->will($this->returnValue(false));
-        $this->mockCacheItem
-            ->expects($this->once())
-            ->method('set')
-            ->with($this->equalTo($token))
-            ->will($this->returnValue(false));
-        $this->mockCache
-            ->expects($this->exactly(2))
-            ->method('getItem')
-            ->with($this->equalTo($this->getValidKeyName(self::TEST_SCOPE)))
-            ->will($this->returnValue($this->mockCacheItem));
-        $this->mockRequest
-            ->expects($this->once())
-            ->method('withHeader')
-            ->with('Authorization', 'Bearer ' . $token)
-            ->will($this->returnValue($this->mockRequest));
-
-        // Run the test
-        $middleware = new ScopedAccessTokenMiddleware(
-            $fakeAuthFunc,
-            self::TEST_SCOPE,
-            [],
-            $this->mockCache
-        );
-        $mock = new MockHandler([new Response(200)]);
-        $callable = $middleware($mock);
-        $callable($this->mockRequest, ['auth' => 'scoped']);
-    }
-
-    public function testShouldSaveValueInCacheWithCacheOptions()
-    {
-        $token = '2/abcdef1234567890';
-        $prefix = 'test_prefix_';
-        $lifetime = '70707';
-        $fakeAuthFunc = function ($unused_scopes) use ($token) {
-            return $token;
-        };
-        $this->mockCacheItem
-            ->expects($this->once())
-            ->method('get')
-            ->will($this->returnValue(false));
-        $this->mockCacheItem
-            ->expects($this->once())
-            ->method('set')
-            ->with($this->equalTo($token))
-            ->will($this->returnValue(false));
-        $this->mockCacheItem
-            ->expects($this->once())
-            ->method('expiresAfter')
-            ->with($this->equalTo($lifetime));
-        $this->mockCache
-            ->expects($this->exactly(2))
-            ->method('getItem')
-            ->with($this->equalTo($prefix . $this->getValidKeyName(self::TEST_SCOPE)))
-            ->will($this->returnValue($this->mockCacheItem));
-        $this->mockRequest
-            ->expects($this->once())
-            ->method('withHeader')
-            ->with('Authorization', 'Bearer ' . $token)
-            ->will($this->returnValue($this->mockRequest));
-
-        // Run the test
-        $middleware = new ScopedAccessTokenMiddleware(
-            $fakeAuthFunc,
-            self::TEST_SCOPE,
-            ['prefix' => $prefix, 'lifetime' => $lifetime],
-            $this->mockCache
-        );
-        $mock = new MockHandler([new Response(200)]);
-        $callable = $middleware($mock);
-        $callable($this->mockRequest, ['auth' => 'scoped']);
-    }
-
-    public function testOnlyTouchesWhenAuthConfigScoped()
-    {
-        $fakeAuthFunc = function ($unused_scopes) {
-            return '1/abcdef1234567890';
-        };
-        $this->mockRequest
-            ->expects($this->never())
-            ->method('withHeader');
-
-        // Run the test
-        $middleware = new ScopedAccessTokenMiddleware($fakeAuthFunc, self::TEST_SCOPE);
-        $mock = new MockHandler([new Response(200)]);
-        $callable = $middleware($mock);
-        $callable($this->mockRequest, ['auth' => 'not_scoped']);
-    }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/auth/tests/Middleware/SimpleMiddlewareTest.php b/mayor-orig/www/include/share/googleapi/google/auth/tests/Middleware/SimpleMiddlewareTest.php
deleted file mode 100644
index 61807aa5..00000000
--- a/mayor-orig/www/include/share/googleapi/google/auth/tests/Middleware/SimpleMiddlewareTest.php
+++ /dev/null
@@ -1,41 +0,0 @@
-onlyGuzzle6();
-
-        $this->mockRequest =
-            $this
-                ->getMockBuilder('GuzzleHttp\Psr7\Request')
-                ->disableOriginalConstructor()
-                ->getMock();
-    }
-
-    public function testTest()
-    {
-    }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/auth/tests/OAuth2Test.php b/mayor-orig/www/include/share/googleapi/google/auth/tests/OAuth2Test.php
deleted file mode 100644
index 59492986..00000000
--- a/mayor-orig/www/include/share/googleapi/google/auth/tests/OAuth2Test.php
+++ /dev/null
@@ -1,858 +0,0 @@
- 'https://accounts.test.org/insecure/url',
-        'redirectUri' => 'https://accounts.test.org/redirect/url',
-        'clientId' => 'aClientID',
-    ];
-
-    /**
-     * @expectedException InvalidArgumentException
-     */
-    public function testIsNullIfAuthorizationUriIsNull()
-    {
-        $o = new OAuth2([]);
-        $this->assertNull($o->buildFullAuthorizationUri());
-    }
-
-    /**
-     * @expectedException InvalidArgumentException
-     */
-    public function testRequiresTheClientId()
-    {
-        $o = new OAuth2([
-            'authorizationUri' => 'https://accounts.test.org/auth/url',
-            'redirectUri' => 'https://accounts.test.org/redirect/url',
-        ]);
-        $o->buildFullAuthorizationUri();
-    }
-
-    /**
-     * @expectedException InvalidArgumentException
-     */
-    public function testRequiresTheRedirectUri()
-    {
-        $o = new OAuth2([
-            'authorizationUri' => 'https://accounts.test.org/auth/url',
-            'clientId' => 'aClientID',
-        ]);
-        $o->buildFullAuthorizationUri();
-    }
-
-    /**
-     * @expectedException InvalidArgumentException
-     */
-    public function testCannotHavePromptAndApprovalPrompt()
-    {
-        $o = new OAuth2([
-            'authorizationUri' => 'https://accounts.test.org/auth/url',
-            'clientId' => 'aClientID',
-        ]);
-        $o->buildFullAuthorizationUri([
-            'approval_prompt' => 'an approval prompt',
-            'prompt' => 'a prompt',
-        ]);
-    }
-
-    /**
-     * @expectedException InvalidArgumentException
-     */
-    public function testCannotHaveInsecureAuthorizationUri()
-    {
-        $o = new OAuth2([
-            'authorizationUri' => 'http://accounts.test.org/insecure/url',
-            'redirectUri' => 'https://accounts.test.org/redirect/url',
-            'clientId' => 'aClientID',
-        ]);
-        $o->buildFullAuthorizationUri();
-    }
-
-    /**
-     * @expectedException InvalidArgumentException
-     */
-    public function testCannotHaveRelativeRedirectUri()
-    {
-        $o = new OAuth2([
-            'authorizationUri' => 'http://accounts.test.org/insecure/url',
-            'redirectUri' => '/redirect/url',
-            'clientId' => 'aClientID',
-        ]);
-        $o->buildFullAuthorizationUri();
-    }
-
-    public function testHasDefaultXXXTypeParams()
-    {
-        $o = new OAuth2($this->minimal);
-        $q = Psr7\parse_query($o->buildFullAuthorizationUri()->getQuery());
-        $this->assertEquals('code', $q['response_type']);
-        $this->assertEquals('offline', $q['access_type']);
-    }
-
-    public function testCanBeUrlObject()
-    {
-        $config = array_merge($this->minimal, [
-            'authorizationUri' => Psr7\uri_for('https://another/uri'),
-        ]);
-        $o = new OAuth2($config);
-        $this->assertEquals('/uri', $o->buildFullAuthorizationUri()->getPath());
-    }
-
-    public function testCanOverrideParams()
-    {
-        $overrides = [
-            'access_type' => 'o_access_type',
-            'client_id' => 'o_client_id',
-            'redirect_uri' => 'o_redirect_uri',
-            'response_type' => 'o_response_type',
-            'state' => 'o_state',
-        ];
-        $config = array_merge($this->minimal, ['state' => 'the_state']);
-        $o = new OAuth2($config);
-        $q = Psr7\parse_query($o->buildFullAuthorizationUri($overrides)->getQuery());
-        $this->assertEquals('o_access_type', $q['access_type']);
-        $this->assertEquals('o_client_id', $q['client_id']);
-        $this->assertEquals('o_redirect_uri', $q['redirect_uri']);
-        $this->assertEquals('o_response_type', $q['response_type']);
-        $this->assertEquals('o_state', $q['state']);
-    }
-
-    public function testIncludesTheScope()
-    {
-        $with_strings = array_merge($this->minimal, ['scope' => 'scope1 scope2']);
-        $o = new OAuth2($with_strings);
-        $q = Psr7\parse_query($o->buildFullAuthorizationUri()->getQuery());
-        $this->assertEquals('scope1 scope2', $q['scope']);
-
-        $with_array = array_merge($this->minimal, [
-            'scope' => ['scope1', 'scope2'],
-        ]);
-        $o = new OAuth2($with_array);
-        $q = Psr7\parse_query($o->buildFullAuthorizationUri()->getQuery());
-        $this->assertEquals('scope1 scope2', $q['scope']);
-    }
-
-    public function testRedirectUriPostmessageIsAllowed()
-    {
-        $o = new OAuth2([
-            'authorizationUri' => 'https://accounts.test.org/insecure/url',
-            'redirectUri' => 'postmessage',
-            'clientId' => 'aClientID',
-        ]);
-        $this->assertEquals('postmessage', $o->getRedirectUri());
-        $url = $o->buildFullAuthorizationUri();
-        $parts = parse_url((string)$url);
-        parse_str($parts['query'], $query);
-        $this->assertArrayHasKey('redirect_uri', $query);
-        $this->assertEquals('postmessage', $query['redirect_uri']);
-    }
-}
-
-class OAuth2GrantTypeTest extends \PHPUnit_Framework_TestCase
-{
-    private $minimal = [
-        'authorizationUri' => 'https://accounts.test.org/insecure/url',
-        'redirectUri' => 'https://accounts.test.org/redirect/url',
-        'clientId' => 'aClientID',
-    ];
-
-    public function testReturnsNullIfCannotBeInferred()
-    {
-        $o = new OAuth2($this->minimal);
-        $this->assertNull($o->getGrantType());
-    }
-
-    public function testInfersAuthorizationCode()
-    {
-        $o = new OAuth2($this->minimal);
-        $o->setCode('an auth code');
-        $this->assertEquals('authorization_code', $o->getGrantType());
-    }
-
-    public function testInfersRefreshToken()
-    {
-        $o = new OAuth2($this->minimal);
-        $o->setRefreshToken('a refresh token');
-        $this->assertEquals('refresh_token', $o->getGrantType());
-    }
-
-    public function testInfersPassword()
-    {
-        $o = new OAuth2($this->minimal);
-        $o->setPassword('a password');
-        $o->setUsername('a username');
-        $this->assertEquals('password', $o->getGrantType());
-    }
-
-    public function testInfersJwtBearer()
-    {
-        $o = new OAuth2($this->minimal);
-        $o->setIssuer('an issuer');
-        $o->setSigningKey('a key');
-        $this->assertEquals('urn:ietf:params:oauth:grant-type:jwt-bearer',
-            $o->getGrantType());
-    }
-
-    public function testSetsKnownTypes()
-    {
-        $o = new OAuth2($this->minimal);
-        foreach (OAuth2::$knownGrantTypes as $t) {
-            $o->setGrantType($t);
-            $this->assertEquals($t, $o->getGrantType());
-        }
-    }
-
-    public function testSetsUrlAsGrantType()
-    {
-        $o = new OAuth2($this->minimal);
-        $o->setGrantType('http://a/grant/url');
-        $this->assertEquals('http://a/grant/url', $o->getGrantType());
-    }
-}
-
-class OAuth2GetCacheKeyTest extends \PHPUnit_Framework_TestCase
-{
-    private $minimal = [
-        'clientID' => 'aClientID',
-    ];
-
-    public function testIsNullWithNoScopes()
-    {
-        $o = new OAuth2($this->minimal);
-        $this->assertNull($o->getCacheKey());
-    }
-
-    public function testIsScopeIfSingleScope()
-    {
-        $o = new OAuth2($this->minimal);
-        $o->setScope('test/scope/1');
-        $this->assertEquals('test/scope/1', $o->getCacheKey());
-    }
-
-    public function testIsAllScopesWhenScopeIsArray()
-    {
-        $o = new OAuth2($this->minimal);
-        $o->setScope(['test/scope/1', 'test/scope/2']);
-        $this->assertEquals('test/scope/1:test/scope/2', $o->getCacheKey());
-    }
-}
-
-class OAuth2TimingTest extends \PHPUnit_Framework_TestCase
-{
-    private $minimal = [
-        'authorizationUri' => 'https://accounts.test.org/insecure/url',
-        'redirectUri' => 'https://accounts.test.org/redirect/url',
-        'clientId' => 'aClientID',
-    ];
-
-    public function testIssuedAtDefaultsToNull()
-    {
-        $o = new OAuth2($this->minimal);
-        $this->assertNull($o->getIssuedAt());
-    }
-
-    public function testExpiresAtDefaultsToNull()
-    {
-        $o = new OAuth2($this->minimal);
-        $this->assertNull($o->getExpiresAt());
-    }
-
-    public function testExpiresInDefaultsToNull()
-    {
-        $o = new OAuth2($this->minimal);
-        $this->assertNull($o->getExpiresIn());
-    }
-
-    public function testSettingExpiresInSetsIssuedAt()
-    {
-        $o = new OAuth2($this->minimal);
-        $this->assertNull($o->getIssuedAt());
-        $aShortWhile = 5;
-        $o->setExpiresIn($aShortWhile);
-        $this->assertEquals($aShortWhile, $o->getExpiresIn());
-        $this->assertNotNull($o->getIssuedAt());
-    }
-
-    public function testSettingExpiresInSetsExpireAt()
-    {
-        $o = new OAuth2($this->minimal);
-        $this->assertNull($o->getExpiresAt());
-        $aShortWhile = 5;
-        $o->setExpiresIn($aShortWhile);
-        $this->assertNotNull($o->getExpiresAt());
-        $this->assertEquals($aShortWhile, $o->getExpiresAt() - $o->getIssuedAt());
-    }
-
-    public function testIsNotExpiredByDefault()
-    {
-        $o = new OAuth2($this->minimal);
-        $this->assertFalse($o->isExpired());
-    }
-
-    public function testIsNotExpiredIfExpiresAtIsOld()
-    {
-        $o = new OAuth2($this->minimal);
-        $o->setExpiresAt(time() - 2);
-        $this->assertTrue($o->isExpired());
-    }
-}
-
-class OAuth2GeneralTest extends \PHPUnit_Framework_TestCase
-{
-    private $minimal = [
-        'authorizationUri' => 'https://accounts.test.org/insecure/url',
-        'redirectUri' => 'https://accounts.test.org/redirect/url',
-        'clientId' => 'aClientID',
-    ];
-
-    /**
-     * @expectedException InvalidArgumentException
-     */
-    public function testFailsOnUnknownSigningAlgorithm()
-    {
-        $o = new OAuth2($this->minimal);
-        $o->setSigningAlgorithm('this is definitely not an algorithm name');
-    }
-
-    public function testAllowsKnownSigningAlgorithms()
-    {
-        $o = new OAuth2($this->minimal);
-        foreach (OAuth2::$knownSigningAlgorithms as $a) {
-            $o->setSigningAlgorithm($a);
-            $this->assertEquals($a, $o->getSigningAlgorithm());
-        }
-    }
-
-    /**
-     * @expectedException InvalidArgumentException
-     */
-    public function testFailsOnRelativeRedirectUri()
-    {
-        $o = new OAuth2($this->minimal);
-        $o->setRedirectUri('/relative/url');
-    }
-
-    public function testAllowsUrnRedirectUri()
-    {
-        $urn = 'urn:ietf:wg:oauth:2.0:oob';
-        $o = new OAuth2($this->minimal);
-        $o->setRedirectUri($urn);
-        $this->assertEquals($urn, $o->getRedirectUri());
-    }
-}
-
-class OAuth2JwtTest extends \PHPUnit_Framework_TestCase
-{
-    private $signingMinimal = [
-        'signingKey' => 'example_key',
-        'signingAlgorithm' => 'HS256',
-        'scope' => 'https://www.googleapis.com/auth/userinfo.profile',
-        'issuer' => 'app@example.com',
-        'audience' => 'accounts.google.com',
-        'clientId' => 'aClientID',
-    ];
-
-    /**
-     * @expectedException DomainException
-     */
-    public function testFailsWithMissingAudience()
-    {
-        $testConfig = $this->signingMinimal;
-        unset($testConfig['audience']);
-        $o = new OAuth2($testConfig);
-        $o->toJwt();
-    }
-
-    /**
-     * @expectedException DomainException
-     */
-    public function testFailsWithMissingIssuer()
-    {
-        $testConfig = $this->signingMinimal;
-        unset($testConfig['issuer']);
-        $o = new OAuth2($testConfig);
-        $o->toJwt();
-    }
-
-    /**
-     */
-    public function testCanHaveNoScope()
-    {
-        $testConfig = $this->signingMinimal;
-        unset($testConfig['scope']);
-        $o = new OAuth2($testConfig);
-        $o->toJwt();
-    }
-
-    /**
-     * @expectedException DomainException
-     */
-    public function testFailsWithMissingSigningKey()
-    {
-        $testConfig = $this->signingMinimal;
-        unset($testConfig['signingKey']);
-        $o = new OAuth2($testConfig);
-        $o->toJwt();
-    }
-
-    /**
-     * @expectedException DomainException
-     */
-    public function testFailsWithMissingSigningAlgorithm()
-    {
-        $testConfig = $this->signingMinimal;
-        unset($testConfig['signingAlgorithm']);
-        $o = new OAuth2($testConfig);
-        $o->toJwt();
-    }
-
-    public function testCanHS256EncodeAValidPayload()
-    {
-        $testConfig = $this->signingMinimal;
-        $o = new OAuth2($testConfig);
-        $payload = $o->toJwt();
-        $roundTrip = $this->jwtDecode($payload, $testConfig['signingKey'], array('HS256'));
-        $this->assertEquals($roundTrip->iss, $testConfig['issuer']);
-        $this->assertEquals($roundTrip->aud, $testConfig['audience']);
-        $this->assertEquals($roundTrip->scope, $testConfig['scope']);
-    }
-
-    public function testCanRS256EncodeAValidPayload()
-    {
-        $publicKey = file_get_contents(__DIR__ . '/fixtures' . '/public.pem');
-        $privateKey = file_get_contents(__DIR__ . '/fixtures' . '/private.pem');
-        $testConfig = $this->signingMinimal;
-        $o = new OAuth2($testConfig);
-        $o->setSigningAlgorithm('RS256');
-        $o->setSigningKey($privateKey);
-        $payload = $o->toJwt();
-        $roundTrip = $this->jwtDecode($payload, $publicKey, array('RS256'));
-        $this->assertEquals($roundTrip->iss, $testConfig['issuer']);
-        $this->assertEquals($roundTrip->aud, $testConfig['audience']);
-        $this->assertEquals($roundTrip->scope, $testConfig['scope']);
-    }
-
-    private function jwtDecode()
-    {
-        $args = func_get_args();
-        $class = 'JWT';
-        if (class_exists('Firebase\JWT\JWT')) {
-            $class = 'Firebase\JWT\JWT';
-        }
-
-        return call_user_func_array("$class::decode", $args);
-    }
-}
-
-class OAuth2GenerateAccessTokenRequestTest extends \PHPUnit_Framework_TestCase
-{
-    private $tokenRequestMinimal = [
-        'tokenCredentialUri' => 'https://tokens_r_us/test',
-        'scope' => 'https://www.googleapis.com/auth/userinfo.profile',
-        'issuer' => 'app@example.com',
-        'audience' => 'accounts.google.com',
-        'clientId' => 'aClientID',
-    ];
-
-    /**
-     * @expectedException DomainException
-     */
-    public function testFailsIfNoTokenCredentialUri()
-    {
-        $testConfig = $this->tokenRequestMinimal;
-        unset($testConfig['tokenCredentialUri']);
-        $o = new OAuth2($testConfig);
-        $o->generateCredentialsRequest();
-    }
-
-    /**
-     * @expectedException DomainException
-     */
-    public function testFailsIfAuthorizationCodeIsMissing()
-    {
-        $testConfig = $this->tokenRequestMinimal;
-        $testConfig['redirectUri'] = 'https://has/redirect/uri';
-        $o = new OAuth2($testConfig);
-        $o->generateCredentialsRequest();
-    }
-
-    public function testGeneratesAuthorizationCodeRequests()
-    {
-        $testConfig = $this->tokenRequestMinimal;
-        $testConfig['redirectUri'] = 'https://has/redirect/uri';
-        $o = new OAuth2($testConfig);
-        $o->setCode('an_auth_code');
-
-        // Generate the request and confirm that it's correct.
-        $req = $o->generateCredentialsRequest();
-        $this->assertInstanceOf('Psr\Http\Message\RequestInterface', $req);
-        $this->assertEquals('POST', $req->getMethod());
-        $fields = Psr7\parse_query((string)$req->getBody());
-        $this->assertEquals('authorization_code', $fields['grant_type']);
-        $this->assertEquals('an_auth_code', $fields['code']);
-    }
-
-    public function testGeneratesPasswordRequests()
-    {
-        $testConfig = $this->tokenRequestMinimal;
-        $o = new OAuth2($testConfig);
-        $o->setUsername('a_username');
-        $o->setPassword('a_password');
-
-        // Generate the request and confirm that it's correct.
-        $req = $o->generateCredentialsRequest();
-        $this->assertInstanceOf('Psr\Http\Message\RequestInterface', $req);
-        $this->assertEquals('POST', $req->getMethod());
-        $fields = Psr7\parse_query((string)$req->getBody());
-        $this->assertEquals('password', $fields['grant_type']);
-        $this->assertEquals('a_password', $fields['password']);
-        $this->assertEquals('a_username', $fields['username']);
-    }
-
-    public function testGeneratesRefreshTokenRequests()
-    {
-        $testConfig = $this->tokenRequestMinimal;
-        $o = new OAuth2($testConfig);
-        $o->setRefreshToken('a_refresh_token');
-
-        // Generate the request and confirm that it's correct.
-        $req = $o->generateCredentialsRequest();
-        $this->assertInstanceOf('Psr\Http\Message\RequestInterface', $req);
-        $this->assertEquals('POST', $req->getMethod());
-        $fields = Psr7\parse_query((string)$req->getBody());
-        $this->assertEquals('refresh_token', $fields['grant_type']);
-        $this->assertEquals('a_refresh_token', $fields['refresh_token']);
-    }
-
-    public function testClientSecretAddedIfSetForAuthorizationCodeRequests()
-    {
-        $testConfig = $this->tokenRequestMinimal;
-        $testConfig['clientSecret'] = 'a_client_secret';
-        $testConfig['redirectUri'] = 'https://has/redirect/uri';
-        $o = new OAuth2($testConfig);
-        $o->setCode('an_auth_code');
-        $request = $o->generateCredentialsRequest();
-        $fields = Psr7\parse_query((string)$request->getBody());
-        $this->assertEquals('a_client_secret', $fields['client_secret']);
-    }
-
-    public function testClientSecretAddedIfSetForRefreshTokenRequests()
-    {
-        $testConfig = $this->tokenRequestMinimal;
-        $testConfig['clientSecret'] = 'a_client_secret';
-        $o = new OAuth2($testConfig);
-        $o->setRefreshToken('a_refresh_token');
-        $request = $o->generateCredentialsRequest();
-        $fields = Psr7\parse_query((string)$request->getBody());
-        $this->assertEquals('a_client_secret', $fields['client_secret']);
-    }
-
-    public function testClientSecretAddedIfSetForPasswordRequests()
-    {
-        $testConfig = $this->tokenRequestMinimal;
-        $testConfig['clientSecret'] = 'a_client_secret';
-        $o = new OAuth2($testConfig);
-        $o->setUsername('a_username');
-        $o->setPassword('a_password');
-        $request = $o->generateCredentialsRequest();
-        $fields = Psr7\parse_query((string)$request->getBody());
-        $this->assertEquals('a_client_secret', $fields['client_secret']);
-    }
-
-    public function testGeneratesAssertionRequests()
-    {
-        $testConfig = $this->tokenRequestMinimal;
-        $o = new OAuth2($testConfig);
-        $o->setSigningKey('a_key');
-        $o->setSigningAlgorithm('HS256');
-
-        // Generate the request and confirm that it's correct.
-        $req = $o->generateCredentialsRequest();
-        $this->assertInstanceOf('Psr\Http\Message\RequestInterface', $req);
-        $this->assertEquals('POST', $req->getMethod());
-        $fields = Psr7\parse_query((string)$req->getBody());
-        $this->assertEquals(OAuth2::JWT_URN, $fields['grant_type']);
-        $this->assertTrue(array_key_exists('assertion', $fields));
-    }
-
-    public function testGeneratesExtendedRequests()
-    {
-        $testConfig = $this->tokenRequestMinimal;
-        $o = new OAuth2($testConfig);
-        $o->setGrantType('urn:my_test_grant_type');
-        $o->setExtensionParams(['my_param' => 'my_value']);
-
-        // Generate the request and confirm that it's correct.
-        $req = $o->generateCredentialsRequest();
-        $this->assertInstanceOf('Psr\Http\Message\RequestInterface', $req);
-        $this->assertEquals('POST', $req->getMethod());
-        $fields = Psr7\parse_query((string)$req->getBody());
-        $this->assertEquals('my_value', $fields['my_param']);
-        $this->assertEquals('urn:my_test_grant_type', $fields['grant_type']);
-    }
-}
-
-class OAuth2FetchAuthTokenTest extends \PHPUnit_Framework_TestCase
-{
-    private $fetchAuthTokenMinimal = [
-        'tokenCredentialUri' => 'https://tokens_r_us/test',
-        'scope' => 'https://www.googleapis.com/auth/userinfo.profile',
-        'signingKey' => 'example_key',
-        'signingAlgorithm' => 'HS256',
-        'issuer' => 'app@example.com',
-        'audience' => 'accounts.google.com',
-        'clientId' => 'aClientID',
-    ];
-
-    /**
-     * @expectedException GuzzleHttp\Exception\ClientException
-     */
-    public function testFailsOn400()
-    {
-        $testConfig = $this->fetchAuthTokenMinimal;
-        $httpHandler = getHandler([
-            buildResponse(400),
-        ]);
-        $o = new OAuth2($testConfig);
-        $o->fetchAuthToken($httpHandler);
-    }
-
-    /**
-     * @expectedException GuzzleHttp\Exception\ServerException
-     */
-    public function testFailsOn500()
-    {
-        $testConfig = $this->fetchAuthTokenMinimal;
-        $httpHandler = getHandler([
-            buildResponse(500),
-        ]);
-        $o = new OAuth2($testConfig);
-        $o->fetchAuthToken($httpHandler);
-    }
-
-    /**
-     * @expectedException Exception
-     * @expectedExceptionMessage Invalid JSON response
-     */
-    public function testFailsOnNoContentTypeIfResponseIsNotJSON()
-    {
-        $testConfig = $this->fetchAuthTokenMinimal;
-        $notJson = '{"foo": , this is cannot be passed as json" "bar"}';
-        $httpHandler = getHandler([
-            buildResponse(200, [], Psr7\stream_for($notJson)),
-        ]);
-        $o = new OAuth2($testConfig);
-        $o->fetchAuthToken($httpHandler);
-    }
-
-    public function testFetchesJsonResponseOnNoContentTypeOK()
-    {
-        $testConfig = $this->fetchAuthTokenMinimal;
-        $json = '{"foo": "bar"}';
-        $httpHandler = getHandler([
-            buildResponse(200, [], Psr7\stream_for($json)),
-        ]);
-        $o = new OAuth2($testConfig);
-        $tokens = $o->fetchAuthToken($httpHandler);
-        $this->assertEquals($tokens['foo'], 'bar');
-    }
-
-    public function testFetchesFromFormEncodedResponseOK()
-    {
-        $testConfig = $this->fetchAuthTokenMinimal;
-        $json = 'foo=bar&spice=nice';
-        $httpHandler = getHandler([
-            buildResponse(
-                200,
-                ['Content-Type' => 'application/x-www-form-urlencoded'],
-                Psr7\stream_for($json)
-            ),
-        ]);
-        $o = new OAuth2($testConfig);
-        $tokens = $o->fetchAuthToken($httpHandler);
-        $this->assertEquals($tokens['foo'], 'bar');
-        $this->assertEquals($tokens['spice'], 'nice');
-    }
-
-    public function testUpdatesTokenFieldsOnFetch()
-    {
-        $testConfig = $this->fetchAuthTokenMinimal;
-        $wanted_updates = [
-            'expires_at' => '1',
-            'expires_in' => '57',
-            'issued_at' => '2',
-            'access_token' => 'an_access_token',
-            'id_token' => 'an_id_token',
-            'refresh_token' => 'a_refresh_token',
-        ];
-        $json = json_encode($wanted_updates);
-        $httpHandler = getHandler([
-            buildResponse(200, [], Psr7\stream_for($json)),
-        ]);
-        $o = new OAuth2($testConfig);
-        $this->assertNull($o->getExpiresAt());
-        $this->assertNull($o->getExpiresIn());
-        $this->assertNull($o->getIssuedAt());
-        $this->assertNull($o->getAccessToken());
-        $this->assertNull($o->getIdToken());
-        $this->assertNull($o->getRefreshToken());
-        $tokens = $o->fetchAuthToken($httpHandler);
-        $this->assertEquals(1, $o->getExpiresAt());
-        $this->assertEquals(57, $o->getExpiresIn());
-        $this->assertEquals(2, $o->getIssuedAt());
-        $this->assertEquals('an_access_token', $o->getAccessToken());
-        $this->assertEquals('an_id_token', $o->getIdToken());
-        $this->assertEquals('a_refresh_token', $o->getRefreshToken());
-    }
-
-    public function testUpdatesTokenFieldsOnFetchMissingRefreshToken()
-    {
-        $testConfig = $this->fetchAuthTokenMinimal;
-        $testConfig['refresh_token'] = 'a_refresh_token';
-        $wanted_updates = [
-            'expires_at' => '1',
-            'expires_in' => '57',
-            'issued_at' => '2',
-            'access_token' => 'an_access_token',
-            'id_token' => 'an_id_token',
-        ];
-        $json = json_encode($wanted_updates);
-        $httpHandler = getHandler([
-            buildResponse(200, [], Psr7\stream_for($json)),
-        ]);
-        $o = new OAuth2($testConfig);
-        $this->assertNull($o->getExpiresAt());
-        $this->assertNull($o->getExpiresIn());
-        $this->assertNull($o->getIssuedAt());
-        $this->assertNull($o->getAccessToken());
-        $this->assertNull($o->getIdToken());
-        $this->assertEquals('a_refresh_token', $o->getRefreshToken());
-        $tokens = $o->fetchAuthToken($httpHandler);
-        $this->assertEquals(1, $o->getExpiresAt());
-        $this->assertEquals(57, $o->getExpiresIn());
-        $this->assertEquals(2, $o->getIssuedAt());
-        $this->assertEquals('an_access_token', $o->getAccessToken());
-        $this->assertEquals('an_id_token', $o->getIdToken());
-        $this->assertEquals('a_refresh_token', $o->getRefreshToken());
-    }
-}
-
-class OAuth2VerifyIdTokenTest extends \PHPUnit_Framework_TestCase
-{
-    private $publicKey;
-    private $privateKey;
-    private $verifyIdTokenMinimal = [
-        'scope' => 'https://www.googleapis.com/auth/userinfo.profile',
-        'audience' => 'myaccount.on.host.issuer.com',
-        'issuer' => 'an.issuer.com',
-        'clientId' => 'myaccount.on.host.issuer.com',
-    ];
-
-    public function setUp()
-    {
-        $this->publicKey =
-            file_get_contents(__DIR__ . '/fixtures' . '/public.pem');
-        $this->privateKey =
-            file_get_contents(__DIR__ . '/fixtures' . '/private.pem');
-    }
-
-    /**
-     * @expectedException UnexpectedValueException
-     */
-    public function testFailsIfIdTokenIsInvalid()
-    {
-        $testConfig = $this->verifyIdTokenMinimal;
-        $not_a_jwt = 'not a jot';
-        $o = new OAuth2($testConfig);
-        $o->setIdToken($not_a_jwt);
-        $o->verifyIdToken($this->publicKey);
-    }
-
-    /**
-     * @expectedException DomainException
-     */
-    public function testFailsIfAudienceIsMissing()
-    {
-        $testConfig = $this->verifyIdTokenMinimal;
-        $now = time();
-        $origIdToken = [
-            'issuer' => $testConfig['issuer'],
-            'exp' => $now + 65, // arbitrary
-            'iat' => $now,
-        ];
-        $o = new OAuth2($testConfig);
-        $jwtIdToken = $this->jwtEncode($origIdToken, $this->privateKey, 'RS256');
-        $o->setIdToken($jwtIdToken);
-        $o->verifyIdToken($this->publicKey, ['RS256']);
-    }
-
-    /**
-     * @expectedException DomainException
-     */
-    public function testFailsIfAudienceIsWrong()
-    {
-        $now = time();
-        $testConfig = $this->verifyIdTokenMinimal;
-        $origIdToken = [
-            'aud' => 'a different audience',
-            'iss' => $testConfig['issuer'],
-            'exp' => $now + 65, // arbitrary
-            'iat' => $now,
-        ];
-        $o = new OAuth2($testConfig);
-        $jwtIdToken = $this->jwtEncode($origIdToken, $this->privateKey, 'RS256');
-        $o->setIdToken($jwtIdToken);
-        $o->verifyIdToken($this->publicKey, ['RS256']);
-    }
-
-    public function testShouldReturnAValidIdToken()
-    {
-        $testConfig = $this->verifyIdTokenMinimal;
-        $now = time();
-        $origIdToken = [
-            'aud' => $testConfig['audience'],
-            'iss' => $testConfig['issuer'],
-            'exp' => $now + 65, // arbitrary
-            'iat' => $now,
-        ];
-        $o = new OAuth2($testConfig);
-        $alg = 'RS256';
-        $jwtIdToken = $this->jwtEncode($origIdToken, $this->privateKey, $alg);
-        $o->setIdToken($jwtIdToken);
-        $roundTrip = $o->verifyIdToken($this->publicKey, array($alg));
-        $this->assertEquals($origIdToken['aud'], $roundTrip->aud);
-    }
-
-    private function jwtEncode()
-    {
-        $args = func_get_args();
-        $class = 'JWT';
-        if (class_exists('Firebase\JWT\JWT')) {
-            $class = 'Firebase\JWT\JWT';
-        }
-
-        return call_user_func_array("$class::encode", $args);
-    }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/auth/tests/Subscriber/AuthTokenSubscriberTest.php b/mayor-orig/www/include/share/googleapi/google/auth/tests/Subscriber/AuthTokenSubscriberTest.php
deleted file mode 100644
index 287692b0..00000000
--- a/mayor-orig/www/include/share/googleapi/google/auth/tests/Subscriber/AuthTokenSubscriberTest.php
+++ /dev/null
@@ -1,325 +0,0 @@
-onlyGuzzle5();
-
-        $this->mockFetcher =
-            $this
-                ->getMockBuilder('Google\Auth\FetchAuthTokenInterface')
-                ->getMock();
-        $this->mockCacheItem =
-            $this
-                ->getMockBuilder('Psr\Cache\CacheItemInterface')
-                ->getMock();
-        $this->mockCache =
-            $this
-                ->getMockBuilder('Psr\Cache\CacheItemPoolInterface')
-                ->getMock();
-    }
-
-    public function testSubscribesToEvents()
-    {
-        $a = new AuthTokenSubscriber($this->mockFetcher);
-        $this->assertArrayHasKey('before', $a->getEvents());
-    }
-
-    public function testOnlyTouchesWhenAuthConfigScoped()
-    {
-        $s = new AuthTokenSubscriber($this->mockFetcher);
-        $client = new Client();
-        $request = $client->createRequest('GET', 'http://testing.org',
-            ['auth' => 'not_google_auth']);
-        $before = new BeforeEvent(new Transaction($client, $request));
-        $s->onBefore($before);
-        $this->assertSame($request->getHeader('Authorization'), '');
-    }
-
-    public function testAddsTheTokenAsAnAuthorizationHeader()
-    {
-        $authResult = ['access_token' => '1/abcdef1234567890'];
-        $this->mockFetcher
-            ->expects($this->once())
-            ->method('fetchAuthToken')
-            ->will($this->returnValue($authResult));
-
-        // Run the test.
-        $a = new AuthTokenSubscriber($this->mockFetcher);
-        $client = new Client();
-        $request = $client->createRequest('GET', 'http://testing.org',
-            ['auth' => 'google_auth']);
-        $before = new BeforeEvent(new Transaction($client, $request));
-        $a->onBefore($before);
-        $this->assertSame($request->getHeader('Authorization'),
-            'Bearer 1/abcdef1234567890');
-    }
-
-    public function testDoesNotAddAnAuthorizationHeaderOnNoAccessToken()
-    {
-        $authResult = ['not_access_token' => '1/abcdef1234567890'];
-        $this->mockFetcher
-            ->expects($this->once())
-            ->method('fetchAuthToken')
-            ->will($this->returnValue($authResult));
-
-        // Run the test.
-        $a = new AuthTokenSubscriber($this->mockFetcher);
-        $client = new Client();
-        $request = $client->createRequest('GET', 'http://testing.org',
-            ['auth' => 'google_auth']);
-        $before = new BeforeEvent(new Transaction($client, $request));
-        $a->onBefore($before);
-        $this->assertSame($request->getHeader('Authorization'), '');
-    }
-
-    public function testUsesCachedAuthToken()
-    {
-        $cacheKey = 'myKey';
-        $cachedValue = '2/abcdef1234567890';
-        $this->mockCacheItem
-            ->expects($this->once())
-            ->method('get')
-            ->will($this->returnValue($cachedValue));
-        $this->mockCache
-            ->expects($this->once())
-            ->method('getItem')
-            ->with($this->equalTo($cacheKey))
-            ->will($this->returnValue($this->mockCacheItem));
-        $this->mockFetcher
-            ->expects($this->never())
-            ->method('fetchAuthToken');
-        $this->mockFetcher
-            ->expects($this->any())
-            ->method('getCacheKey')
-            ->will($this->returnValue($cacheKey));
-
-        // Run the test.
-        $cachedFetcher = new FetchAuthTokenCache(
-            $this->mockFetcher,
-            null,
-            $this->mockCache
-        );
-        $a = new AuthTokenSubscriber($cachedFetcher);
-        $client = new Client();
-        $request = $client->createRequest('GET', 'http://testing.org',
-            ['auth' => 'google_auth']);
-        $before = new BeforeEvent(new Transaction($client, $request));
-        $a->onBefore($before);
-        $this->assertSame($request->getHeader('Authorization'),
-            'Bearer 2/abcdef1234567890');
-    }
-
-    public function testGetsCachedAuthTokenUsingCachePrefix()
-    {
-        $prefix = 'test_prefix_';
-        $cacheKey = 'myKey';
-        $cachedValue = '2/abcdef1234567890';
-        $this->mockCacheItem
-            ->expects($this->once())
-            ->method('get')
-            ->will($this->returnValue($cachedValue));
-        $this->mockCache
-            ->expects($this->once())
-            ->method('getItem')
-            ->with($this->equalTo($prefix . $cacheKey))
-            ->will($this->returnValue($this->mockCacheItem));
-        $this->mockFetcher
-            ->expects($this->never())
-            ->method('fetchAuthToken');
-        $this->mockFetcher
-            ->expects($this->any())
-            ->method('getCacheKey')
-            ->will($this->returnValue($cacheKey));
-
-        // Run the test
-        $cachedFetcher = new FetchAuthTokenCache(
-            $this->mockFetcher,
-            ['prefix' => $prefix],
-            $this->mockCache
-        );
-        $a = new AuthTokenSubscriber($cachedFetcher);
-        $client = new Client();
-        $request = $client->createRequest('GET', 'http://testing.org',
-            ['auth' => 'google_auth']);
-        $before = new BeforeEvent(new Transaction($client, $request));
-        $a->onBefore($before);
-        $this->assertSame($request->getHeader('Authorization'),
-            'Bearer 2/abcdef1234567890');
-    }
-
-    public function testShouldSaveValueInCacheWithCacheOptions()
-    {
-        $prefix = 'test_prefix_';
-        $lifetime = '70707';
-        $cacheKey = 'myKey';
-        $token = '1/abcdef1234567890';
-        $authResult = ['access_token' => $token];
-        $this->mockCacheItem
-            ->expects($this->any())
-            ->method('get')
-            ->will($this->returnValue(null));
-        $this->mockCacheItem
-            ->expects($this->once())
-            ->method('set')
-            ->with($this->equalTo($token))
-            ->will($this->returnValue(false));
-        $this->mockCacheItem
-            ->expects($this->once())
-            ->method('expiresAfter')
-            ->with($this->equalTo($lifetime));
-        $this->mockCache
-            ->expects($this->exactly(2))
-            ->method('getItem')
-            ->with($this->equalTo($prefix . $cacheKey))
-            ->will($this->returnValue($this->mockCacheItem));
-        $this->mockFetcher
-            ->expects($this->any())
-            ->method('getCacheKey')
-            ->will($this->returnValue($cacheKey));
-        $this->mockFetcher
-            ->expects($this->once())
-            ->method('fetchAuthToken')
-            ->will($this->returnValue($authResult));
-
-        // Run the test
-        $cachedFetcher = new FetchAuthTokenCache(
-            $this->mockFetcher,
-            ['prefix' => $prefix, 'lifetime' => $lifetime],
-            $this->mockCache
-        );
-        $a = new AuthTokenSubscriber($cachedFetcher);
-        $client = new Client();
-        $request = $client->createRequest('GET', 'http://testing.org',
-            ['auth' => 'google_auth']);
-        $before = new BeforeEvent(new Transaction($client, $request));
-        $a->onBefore($before);
-        $this->assertSame($request->getHeader('Authorization'),
-            'Bearer 1/abcdef1234567890');
-    }
-
-    /** @dataProvider provideShouldNotifyTokenCallback */
-    public function testShouldNotifyTokenCallback(callable $tokenCallback)
-    {
-        $prefix = 'test_prefix_';
-        $cacheKey = 'myKey';
-        $token = '1/abcdef1234567890';
-        $authResult = ['access_token' => $token];
-        $this->mockCacheItem
-            ->expects($this->any())
-            ->method('get')
-            ->will($this->returnValue(null));
-        $this->mockCache
-            ->expects($this->any())
-            ->method('getItem')
-            ->with($this->equalTo($prefix . $cacheKey))
-            ->will($this->returnValue($this->mockCacheItem));
-        $this->mockFetcher
-            ->expects($this->any())
-            ->method('getCacheKey')
-            ->will($this->returnValue($cacheKey));
-        $this->mockFetcher
-            ->expects($this->once())
-            ->method('fetchAuthToken')
-            ->will($this->returnValue($authResult));
-
-        SubscriberCallback::$expectedKey = $this->getValidKeyName($prefix . $cacheKey);
-        SubscriberCallback::$expectedValue = $token;
-        SubscriberCallback::$called = false;
-
-        // Run the test
-        $cachedFetcher = new FetchAuthTokenCache(
-            $this->mockFetcher,
-            ['prefix' => $prefix],
-            $this->mockCache
-        );
-        $a = new AuthTokenSubscriber(
-            $cachedFetcher,
-            null,
-            $tokenCallback
-        );
-
-        $client = new Client();
-        $request = $client->createRequest('GET', 'http://testing.org',
-            ['auth' => 'google_auth']);
-        $before = new BeforeEvent(new Transaction($client, $request));
-        $a->onBefore($before);
-        $this->assertTrue(SubscriberCallback::$called);
-    }
-
-    public function provideShouldNotifyTokenCallback()
-    {
-        SubscriberCallback::$phpunit = $this;
-        $anonymousFunc = function ($key, $value) {
-            SubscriberCallback::staticInvoke($key, $value);
-        };
-        return [
-            ['Google\Auth\Tests\SubscriberCallbackFunction'],
-            ['Google\Auth\Tests\SubscriberCallback::staticInvoke'],
-            [['Google\Auth\Tests\SubscriberCallback', 'staticInvoke']],
-            [$anonymousFunc],
-            [[new SubscriberCallback, 'staticInvoke']],
-            [[new SubscriberCallback, 'methodInvoke']],
-            [new SubscriberCallback],
-        ];
-    }
-}
-
-class SubscriberCallback
-{
-    public static $phpunit;
-    public static $expectedKey;
-    public static $expectedValue;
-    public static $called = false;
-
-    public function __invoke($key, $value)
-    {
-        self::$phpunit->assertEquals(self::$expectedKey, $key);
-        self::$phpunit->assertEquals(self::$expectedValue, $value);
-        self::$called = true;
-    }
-
-    public function methodInvoke($key, $value)
-    {
-        return $this($key, $value);
-    }
-
-    public static function staticInvoke($key, $value)
-    {
-        $instance = new self();
-        return $instance($key, $value);
-    }
-}
-
-function SubscriberCallbackFunction($key, $value)
-{
-    return SubscriberCallback::staticInvoke($key, $value);
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/auth/tests/Subscriber/ScopedAccessTokenSubscriberTest.php b/mayor-orig/www/include/share/googleapi/google/auth/tests/Subscriber/ScopedAccessTokenSubscriberTest.php
deleted file mode 100644
index b85dda56..00000000
--- a/mayor-orig/www/include/share/googleapi/google/auth/tests/Subscriber/ScopedAccessTokenSubscriberTest.php
+++ /dev/null
@@ -1,238 +0,0 @@
-onlyGuzzle5();
-
-        $this->mockCacheItem =
-            $this
-                ->getMockBuilder('Psr\Cache\CacheItemInterface')
-                ->getMock();
-        $this->mockCache =
-            $this
-                ->getMockBuilder('Psr\Cache\CacheItemPoolInterface')
-                ->getMock();
-        $this->mockRequest =
-            $this
-                ->getMockBuilder('GuzzleHttp\Psr7\Request')
-                ->disableOriginalConstructor()
-                ->getMock();
-    }
-
-    /**
-     * @expectedException InvalidArgumentException
-     */
-    public function testRequiresScopeAsAStringOrArray()
-    {
-        $fakeAuthFunc = function ($unused_scopes) {
-            return '1/abcdef1234567890';
-        };
-        new ScopedAccessTokenSubscriber($fakeAuthFunc, new \stdClass(), array());
-    }
-
-    public function testSubscribesToEvents()
-    {
-        $fakeAuthFunc = function ($unused_scopes) {
-            return '1/abcdef1234567890';
-        };
-        $s = new ScopedAccessTokenSubscriber($fakeAuthFunc, self::TEST_SCOPE, array());
-        $this->assertArrayHasKey('before', $s->getEvents());
-    }
-
-    public function testAddsTheTokenAsAnAuthorizationHeader()
-    {
-        $fakeAuthFunc = function ($unused_scopes) {
-            return '1/abcdef1234567890';
-        };
-        $s = new ScopedAccessTokenSubscriber($fakeAuthFunc, self::TEST_SCOPE, array());
-        $client = new Client();
-        $request = $client->createRequest('GET', 'http://testing.org',
-            ['auth' => 'scoped']);
-        $before = new BeforeEvent(new Transaction($client, $request));
-        $s->onBefore($before);
-        $this->assertSame(
-            'Bearer 1/abcdef1234567890',
-            $request->getHeader('Authorization')
-        );
-    }
-
-    public function testUsesCachedAuthToken()
-    {
-        $cachedValue = '2/abcdef1234567890';
-        $fakeAuthFunc = function ($unused_scopes) {
-            return '';
-        };
-        $this->mockCacheItem
-            ->expects($this->once())
-            ->method('get')
-            ->will($this->returnValue($cachedValue));
-        $this->mockCache
-            ->expects($this->once())
-            ->method('getItem')
-            ->with($this->getValidKeyName(self::TEST_SCOPE))
-            ->will($this->returnValue($this->mockCacheItem));
-
-        // Run the test
-        $s = new ScopedAccessTokenSubscriber($fakeAuthFunc, self::TEST_SCOPE, array(),
-            $this->mockCache);
-        $client = new Client();
-        $request = $client->createRequest('GET', 'http://testing.org',
-            ['auth' => 'scoped']);
-        $before = new BeforeEvent(new Transaction($client, $request));
-        $s->onBefore($before);
-        $this->assertSame(
-            'Bearer 2/abcdef1234567890',
-            $request->getHeader('Authorization')
-        );
-    }
-
-    public function testGetsCachedAuthTokenUsingCachePrefix()
-    {
-        $prefix = 'test_prefix_';
-        $cachedValue = '2/abcdef1234567890';
-        $fakeAuthFunc = function ($unused_scopes) {
-            return '';
-        };
-        $this->mockCacheItem
-            ->expects($this->once())
-            ->method('get')
-            ->will($this->returnValue($cachedValue));
-        $this->mockCache
-            ->expects($this->once())
-            ->method('getItem')
-            ->with($prefix . $this->getValidKeyName(self::TEST_SCOPE))
-            ->will($this->returnValue($this->mockCacheItem));
-
-        // Run the test
-        $s = new ScopedAccessTokenSubscriber($fakeAuthFunc, self::TEST_SCOPE,
-            ['prefix' => $prefix],
-            $this->mockCache);
-        $client = new Client();
-        $request = $client->createRequest('GET', 'http://testing.org',
-            ['auth' => 'scoped']);
-        $before = new BeforeEvent(new Transaction($client, $request));
-        $s->onBefore($before);
-        $this->assertSame(
-            'Bearer 2/abcdef1234567890',
-            $request->getHeader('Authorization')
-        );
-    }
-
-    public function testShouldSaveValueInCache()
-    {
-        $token = '2/abcdef1234567890';
-        $fakeAuthFunc = function ($unused_scopes) {
-            return '2/abcdef1234567890';
-        };
-        $this->mockCacheItem
-            ->expects($this->once())
-            ->method('get')
-            ->will($this->returnValue(false));
-        $this->mockCacheItem
-            ->expects($this->once())
-            ->method('set')
-            ->with($this->equalTo($token))
-            ->will($this->returnValue(false));
-        $this->mockCache
-            ->expects($this->exactly(2))
-            ->method('getItem')
-            ->with($this->getValidKeyName(self::TEST_SCOPE))
-            ->will($this->returnValue($this->mockCacheItem));
-        $s = new ScopedAccessTokenSubscriber($fakeAuthFunc, self::TEST_SCOPE, array(),
-            $this->mockCache);
-        $client = new Client();
-        $request = $client->createRequest('GET', 'http://testing.org',
-            ['auth' => 'scoped']);
-        $before = new BeforeEvent(new Transaction($client, $request));
-        $s->onBefore($before);
-        $this->assertSame(
-            'Bearer 2/abcdef1234567890',
-            $request->getHeader('Authorization')
-        );
-    }
-
-    public function testShouldSaveValueInCacheWithCacheOptions()
-    {
-        $token = '2/abcdef1234567890';
-        $prefix = 'test_prefix_';
-        $lifetime = '70707';
-        $fakeAuthFunc = function ($unused_scopes) {
-            return '2/abcdef1234567890';
-        };
-        $this->mockCacheItem
-            ->expects($this->once())
-            ->method('get')
-            ->will($this->returnValue(false));
-        $this->mockCacheItem
-            ->expects($this->once())
-            ->method('set')
-            ->with($this->equalTo($token));
-        $this->mockCacheItem
-            ->expects($this->once())
-            ->method('expiresAfter')
-            ->with($this->equalTo($lifetime));
-        $this->mockCache
-            ->expects($this->exactly(2))
-            ->method('getItem')
-            ->with($prefix . $this->getValidKeyName(self::TEST_SCOPE))
-            ->will($this->returnValue($this->mockCacheItem));
-
-        // Run the test
-        $s = new ScopedAccessTokenSubscriber($fakeAuthFunc, self::TEST_SCOPE,
-            ['prefix' => $prefix, 'lifetime' => $lifetime],
-            $this->mockCache);
-        $client = new Client();
-        $request = $client->createRequest('GET', 'http://testing.org',
-            ['auth' => 'scoped']);
-        $before = new BeforeEvent(new Transaction($client, $request));
-        $s->onBefore($before);
-        $this->assertSame(
-            'Bearer 2/abcdef1234567890',
-            $request->getHeader('Authorization')
-        );
-    }
-
-    public function testOnlyTouchesWhenAuthConfigScoped()
-    {
-        $fakeAuthFunc = function ($unused_scopes) {
-            return '1/abcdef1234567890';
-        };
-        $s = new ScopedAccessTokenSubscriber($fakeAuthFunc, self::TEST_SCOPE, array());
-        $client = new Client();
-        $request = $client->createRequest('GET', 'http://testing.org',
-            ['auth' => 'notscoped']);
-        $before = new BeforeEvent(new Transaction($client, $request));
-        $s->onBefore($before);
-        $this->assertSame('', $request->getHeader('Authorization'));
-    }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/auth/tests/Subscriber/SimpleSubscriberTest.php b/mayor-orig/www/include/share/googleapi/google/auth/tests/Subscriber/SimpleSubscriberTest.php
deleted file mode 100644
index 6c392e66..00000000
--- a/mayor-orig/www/include/share/googleapi/google/auth/tests/Subscriber/SimpleSubscriberTest.php
+++ /dev/null
@@ -1,69 +0,0 @@
-onlyGuzzle5();
-    }
-
-    /**
-     * @expectedException InvalidArgumentException
-     */
-    public function testRequiresADeveloperKey()
-    {
-        new SimpleSubscriber(['not_key' => 'a test key']);
-    }
-
-    public function testSubscribesToEvents()
-    {
-        $events = (new SimpleSubscriber(['key' => 'a test key']))->getEvents();
-        $this->assertArrayHasKey('before', $events);
-    }
-
-    public function testAddsTheKeyToTheQuery()
-    {
-        $s = new SimpleSubscriber(['key' => 'test_key']);
-        $client = new Client();
-        $request = $client->createRequest('GET', 'http://testing.org',
-            ['auth' => 'simple']);
-        $before = new BeforeEvent(new Transaction($client, $request));
-        $s->onBefore($before);
-        $this->assertCount(1, $request->getQuery());
-        $this->assertTrue($request->getQuery()->hasKey('key'));
-        $this->assertSame($request->getQuery()->get('key'), 'test_key');
-    }
-
-    public function testOnlyTouchesWhenAuthConfigIsSimple()
-    {
-        $s = new SimpleSubscriber(['key' => 'test_key']);
-        $client = new Client();
-        $request = $client->createRequest('GET', 'http://testing.org',
-            ['auth' => 'notsimple']);
-        $before = new BeforeEvent(new Transaction($client, $request));
-        $s->onBefore($before);
-        $this->assertCount(0, $request->getQuery());
-    }
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/auth/tests/bootstrap.php b/mayor-orig/www/include/share/googleapi/google/auth/tests/bootstrap.php
deleted file mode 100644
index 6e7b7d5f..00000000
--- a/mayor-orig/www/include/share/googleapi/google/auth/tests/bootstrap.php
+++ /dev/null
@@ -1,55 +0,0 @@
- $handler]);
-
-        return new \Google\Auth\HttpHandler\Guzzle6HttpHandler($client);
-    }
-
-    $client = new \GuzzleHttp\Client();
-    $client->getEmitter()->attach(
-        new \GuzzleHttp\Subscriber\Mock($mockResponses)
-    );
-
-    return new \Google\Auth\HttpHandler\Guzzle5HttpHandler($client);
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/auth/tests/fixtures/.config/gcloud/application_default_credentials.json b/mayor-orig/www/include/share/googleapi/google/auth/tests/fixtures/.config/gcloud/application_default_credentials.json
deleted file mode 100644
index 608d325c..00000000
--- a/mayor-orig/www/include/share/googleapi/google/auth/tests/fixtures/.config/gcloud/application_default_credentials.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-  "private_key_id": "key123",
-  "private_key": "privatekey",
-  "client_email": "hello@youarecool.com",
-  "client_id": "client123",
-  "type": "service_account"
-}
\ No newline at end of file
diff --git a/mayor-orig/www/include/share/googleapi/google/auth/tests/fixtures/private.json b/mayor-orig/www/include/share/googleapi/google/auth/tests/fixtures/private.json
deleted file mode 100644
index 608d325c..00000000
--- a/mayor-orig/www/include/share/googleapi/google/auth/tests/fixtures/private.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-  "private_key_id": "key123",
-  "private_key": "privatekey",
-  "client_email": "hello@youarecool.com",
-  "client_id": "client123",
-  "type": "service_account"
-}
\ No newline at end of file
diff --git a/mayor-orig/www/include/share/googleapi/google/auth/tests/fixtures/private.pem b/mayor-orig/www/include/share/googleapi/google/auth/tests/fixtures/private.pem
deleted file mode 100644
index 00a658fe..00000000
--- a/mayor-orig/www/include/share/googleapi/google/auth/tests/fixtures/private.pem
+++ /dev/null
@@ -1,15 +0,0 @@
------BEGIN RSA PRIVATE KEY-----
-MIICXQIBAAKBgQDzU+jLTzW6154Joezxrd2+5pCNYP0HcaMoYqEyXfNRpkNE7wrQ
-UEG830o4Qcaae2BhqZoujwSW7RkR6h0Fkd0WTR8h5J8rSGNHv/1jJoUUjP9iZ/5S
-FAyIIyEYfDPqtnA4iF1QWO2lXWlEFSuZjwM/8jBmeGzoiw17akNThIw8NwIDAQAB
-AoGATpboVloEAY/IdFX/QGOmfhTb1T3hG3lheBa695iOkO2BRo9qT7PMN6NqxlbA
-PX7ht0lfCfCZS+HSOg4CR50/6WXHMSmwlvcjGuDIDKWjviQTTYE77MlVBQHw9WzY
-PfiRBbtouyPGQtO4rk42zkIILC6exBZ1vKpRPOmTAnxrjCECQQD+56r6hYcS6GNp
-NOWyv0eVFMBX4iNWAsRf9JVVvGDz2rVuhnkNiN73vfffDWvSXkCydL1jFmalgdQD
-gm77UZQHAkEA9F+CauU0aZsJ1SthQ6H0sDQ+eNRUgnz4itnkSC2C20fZ3DaSpCMC
-0go81CcZOhftNO730ILqiS67C3d3rqLqUQJBAP10ROHMmz4Fq7MUUcClyPtHIuk/
-hXskTTZL76DMKmrN8NDxDLSUf38+eJRkt+z4osPOp/E6eN3gdXr32nox50kCQCl8
-hXGMU+eR0IuF/88xkY7Qb8KnmWlFuhQohZ7TSyHbAttl0GNZJkNuRYFm2duI8FZK
-M3wMnbCIZGy/7WuScOECQQCV+0yrf5dL1M2GHjJfwuTb00wRKalKQEH1v/kvE5vS
-FmdN7BPK5Ra50MaecMNoYqu9rmtyWRBn93dcvKrL57nY
------END RSA PRIVATE KEY-----
diff --git a/mayor-orig/www/include/share/googleapi/google/auth/tests/fixtures/public.pem b/mayor-orig/www/include/share/googleapi/google/auth/tests/fixtures/public.pem
deleted file mode 100644
index 00a8f7af..00000000
--- a/mayor-orig/www/include/share/googleapi/google/auth/tests/fixtures/public.pem
+++ /dev/null
@@ -1,6 +0,0 @@
------BEGIN PUBLIC KEY-----
-MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDzU+jLTzW6154Joezxrd2+5pCN
-YP0HcaMoYqEyXfNRpkNE7wrQUEG830o4Qcaae2BhqZoujwSW7RkR6h0Fkd0WTR8h
-5J8rSGNHv/1jJoUUjP9iZ/5SFAyIIyEYfDPqtnA4iF1QWO2lXWlEFSuZjwM/8jBm
-eGzoiw17akNThIw8NwIDAQAB
------END PUBLIC KEY-----
diff --git a/mayor-orig/www/include/share/googleapi/google/auth/tests/fixtures2/.config/gcloud/application_default_credentials.json b/mayor-orig/www/include/share/googleapi/google/auth/tests/fixtures2/.config/gcloud/application_default_credentials.json
deleted file mode 100644
index 5b5063d8..00000000
--- a/mayor-orig/www/include/share/googleapi/google/auth/tests/fixtures2/.config/gcloud/application_default_credentials.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-  "client_id": "client123",
-  "client_secret": "clientSecret123",
-  "refresh_token": "refreshToken123",
-  "type": "authorized_user"
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/auth/tests/fixtures2/private.json b/mayor-orig/www/include/share/googleapi/google/auth/tests/fixtures2/private.json
deleted file mode 100644
index 5b5063d8..00000000
--- a/mayor-orig/www/include/share/googleapi/google/auth/tests/fixtures2/private.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-  "client_id": "client123",
-  "client_secret": "clientSecret123",
-  "refresh_token": "refreshToken123",
-  "type": "authorized_user"
-}
diff --git a/mayor-orig/www/include/share/googleapi/google/auth/tests/mocks/AppIdentityService.php b/mayor-orig/www/include/share/googleapi/google/auth/tests/mocks/AppIdentityService.php
deleted file mode 100644
index 324292a9..00000000
--- a/mayor-orig/www/include/share/googleapi/google/auth/tests/mocks/AppIdentityService.php
+++ /dev/null
@@ -1,19 +0,0 @@
- 'xyz',
-        'expiration_time' => '2147483646',
-    );
-
-    public static function getAccessToken($scope)
-    {
-        self::$scope = $scope;
-
-        return self::$accessToken;
-    }
-}
diff --git a/mayor-orig/www/include/share/googleapi/guzzlehttp/guzzle/CHANGELOG.md b/mayor-orig/www/include/share/googleapi/guzzlehttp/guzzle/CHANGELOG.md
deleted file mode 100644
index b265cbcd..00000000
--- a/mayor-orig/www/include/share/googleapi/guzzlehttp/guzzle/CHANGELOG.md
+++ /dev/null
@@ -1,1264 +0,0 @@
-# CHANGELOG
-
-## 6.3.0 - 2017-06-22
-
-* Feature: force IP resolution (ipv4 or ipv6) [#1608](https://github.com/guzzle/guzzle/pull/1608), [#1659](https://github.com/guzzle/guzzle/pull/1659)
-* Improvement: Don't include summary in exception message when body is empty [#1621](https://github.com/guzzle/guzzle/pull/1621)
-* Improvement: Handle `on_headers` option in MockHandler [#1580](https://github.com/guzzle/guzzle/pull/1580)
-* Improvement: Added SUSE Linux CA path [#1609](https://github.com/guzzle/guzzle/issues/1609)
-* Improvement: Use class reference for getting the name of the class instead of using hardcoded strings [#1641](https://github.com/guzzle/guzzle/pull/1641)
-* Feature: Added `read_timeout` option [#1611](https://github.com/guzzle/guzzle/pull/1611)
-* Bug fix: PHP 7.x fixes [#1685](https://github.com/guzzle/guzzle/pull/1685), [#1686](https://github.com/guzzle/guzzle/pull/1686), [#1811](https://github.com/guzzle/guzzle/pull/1811)
-* Deprecation: BadResponseException instantiation without a response [#1642](https://github.com/guzzle/guzzle/pull/1642)
-* Feature: Added NTLM auth [#1569](https://github.com/guzzle/guzzle/pull/1569)
-* Feature: Track redirect HTTP status codes [#1711](https://github.com/guzzle/guzzle/pull/1711)
-* Improvement: Check handler type during construction [#1745](https://github.com/guzzle/guzzle/pull/1745)
-* Improvement: Always include the Content-Length if there's a body [#1721](https://github.com/guzzle/guzzle/pull/1721)
-* Feature: Added convenience method to access a cookie by name [#1318](https://github.com/guzzle/guzzle/pull/1318)
-* Bug fix: Fill `CURLOPT_CAPATH` and `CURLOPT_CAINFO` properly [#1684](https://github.com/guzzle/guzzle/pull/1684)
-* Improvement:  	Use `\GuzzleHttp\Promise\rejection_for` function instead of object init [#1827](https://github.com/guzzle/guzzle/pull/1827)
-
-
-+ Minor code cleanups, documentation fixes and clarifications.
-
-## 6.2.3 - 2017-02-28
-
-* Fix deprecations with guzzle/psr7 version 1.4
-
-## 6.2.2 - 2016-10-08
-
-* Allow to pass nullable Response to delay callable
-* Only add scheme when host is present
-* Fix drain case where content-length is the literal string zero
-* Obfuscate in-URL credentials in exceptions
-
-## 6.2.1 - 2016-07-18
-
-* Address HTTP_PROXY security vulnerability, CVE-2016-5385:
-  https://httpoxy.org/
-* Fixing timeout bug with StreamHandler:
-  https://github.com/guzzle/guzzle/pull/1488
-* Only read up to `Content-Length` in PHP StreamHandler to avoid timeouts when
-  a server does not honor `Connection: close`.
-* Ignore URI fragment when sending requests.
-
-## 6.2.0 - 2016-03-21
-
-* Feature: added `GuzzleHttp\json_encode` and `GuzzleHttp\json_decode`.
-  https://github.com/guzzle/guzzle/pull/1389
-* Bug fix: Fix sleep calculation when waiting for delayed requests.
-  https://github.com/guzzle/guzzle/pull/1324
-* Feature: More flexible history containers.
-  https://github.com/guzzle/guzzle/pull/1373
-* Bug fix: defer sink stream opening in StreamHandler.
-  https://github.com/guzzle/guzzle/pull/1377
-* Bug fix: do not attempt to escape cookie values.
-  https://github.com/guzzle/guzzle/pull/1406
-* Feature: report original content encoding and length on decoded responses.
-  https://github.com/guzzle/guzzle/pull/1409
-* Bug fix: rewind seekable request bodies before dispatching to cURL.
-  https://github.com/guzzle/guzzle/pull/1422
-* Bug fix: provide an empty string to `http_build_query` for HHVM workaround.
-  https://github.com/guzzle/guzzle/pull/1367
-
-## 6.1.1 - 2015-11-22
-
-* Bug fix: Proxy::wrapSync() now correctly proxies to the appropriate handler
-  https://github.com/guzzle/guzzle/commit/911bcbc8b434adce64e223a6d1d14e9a8f63e4e4
-* Feature: HandlerStack is now more generic.
-  https://github.com/guzzle/guzzle/commit/f2102941331cda544745eedd97fc8fd46e1ee33e
-* Bug fix: setting verify to false in the StreamHandler now disables peer
-  verification. https://github.com/guzzle/guzzle/issues/1256
-* Feature: Middleware now uses an exception factory, including more error
-  context. https://github.com/guzzle/guzzle/pull/1282
-* Feature: better support for disabled functions.
-  https://github.com/guzzle/guzzle/pull/1287
-* Bug fix: fixed regression where MockHandler was not using `sink`.
-  https://github.com/guzzle/guzzle/pull/1292
-
-## 6.1.0 - 2015-09-08
-
-* Feature: Added the `on_stats` request option to provide access to transfer
-  statistics for requests. https://github.com/guzzle/guzzle/pull/1202
-* Feature: Added the ability to persist session cookies in CookieJars.
-  https://github.com/guzzle/guzzle/pull/1195
-* Feature: Some compatibility updates for Google APP Engine
-  https://github.com/guzzle/guzzle/pull/1216
-* Feature: Added support for NO_PROXY to prevent the use of a proxy based on
-  a simple set of rules. https://github.com/guzzle/guzzle/pull/1197
-* Feature: Cookies can now contain square brackets.
-  https://github.com/guzzle/guzzle/pull/1237
-* Bug fix: Now correctly parsing `=` inside of quotes in Cookies.
-  https://github.com/guzzle/guzzle/pull/1232
-* Bug fix: Cusotm cURL options now correctly override curl options of the
-  same name. https://github.com/guzzle/guzzle/pull/1221
-* Bug fix: Content-Type header is now added when using an explicitly provided
-  multipart body. https://github.com/guzzle/guzzle/pull/1218
-* Bug fix: Now ignoring Set-Cookie headers that have no name.
-* Bug fix: Reason phrase is no longer cast to an int in some cases in the
-  cURL handler. https://github.com/guzzle/guzzle/pull/1187
-* Bug fix: Remove the Authorization header when redirecting if the Host
-  header changes. https://github.com/guzzle/guzzle/pull/1207
-* Bug fix: Cookie path matching fixes
-  https://github.com/guzzle/guzzle/issues/1129
-* Bug fix: Fixing the cURL `body_as_string` setting
-  https://github.com/guzzle/guzzle/pull/1201
-* Bug fix: quotes are no longer stripped when parsing cookies.
-  https://github.com/guzzle/guzzle/issues/1172
-* Bug fix: `form_params` and `query` now always uses the `&` separator.
-  https://github.com/guzzle/guzzle/pull/1163
-* Bug fix: Adding a Content-Length to PHP stream wrapper requests if not set.
-  https://github.com/guzzle/guzzle/pull/1189
-
-## 6.0.2 - 2015-07-04
-
-* Fixed a memory leak in the curl handlers in which references to callbacks
-  were not being removed by `curl_reset`.
-* Cookies are now extracted properly before redirects.
-* Cookies now allow more character ranges.
-* Decoded Content-Encoding responses are now modified to correctly reflect
-  their state if the encoding was automatically removed by a handler. This
-  means that the `Content-Encoding` header may be removed an the
-  `Content-Length` modified to reflect the message size after removing the
-  encoding.
-* Added a more explicit error message when trying to use `form_params` and
-  `multipart` in the same request.
-* Several fixes for HHVM support.
-* Functions are now conditionally required using an additional level of
-  indirection to help with global Composer installations.
-
-## 6.0.1 - 2015-05-27
-
-* Fixed a bug with serializing the `query` request option where the `&`
-  separator was missing.
-* Added a better error message for when `body` is provided as an array. Please
-  use `form_params` or `multipart` instead.
-* Various doc fixes.
-
-## 6.0.0 - 2015-05-26
-
-* See the UPGRADING.md document for more information.
-* Added `multipart` and `form_params` request options.
-* Added `synchronous` request option.
-* Added the `on_headers` request option.
-* Fixed `expect` handling.
-* No longer adding default middlewares in the client ctor. These need to be
-  present on the provided handler in order to work.
-* Requests are no longer initiated when sending async requests with the
-  CurlMultiHandler. This prevents unexpected recursion from requests completing
-  while ticking the cURL loop.
-* Removed the semantics of setting `default` to `true`. This is no longer
-  required now that the cURL loop is not ticked for async requests.
-* Added request and response logging middleware.
-* No longer allowing self signed certificates when using the StreamHandler.
-* Ensuring that `sink` is valid if saving to a file.
-* Request exceptions now include a "handler context" which provides handler
-  specific contextual information.
-* Added `GuzzleHttp\RequestOptions` to allow request options to be applied
-  using constants.
-* `$maxHandles` has been removed from CurlMultiHandler.
-* `MultipartPostBody` is now part of the `guzzlehttp/psr7` package.
-
-## 5.3.0 - 2015-05-19
-
-* Mock now supports `save_to`
-* Marked `AbstractRequestEvent::getTransaction()` as public.
-* Fixed a bug in which multiple headers using different casing would overwrite
-  previous headers in the associative array.
-* Added `Utils::getDefaultHandler()`
-* Marked `GuzzleHttp\Client::getDefaultUserAgent` as deprecated.
-* URL scheme is now always lowercased.
-
-## 6.0.0-beta.1
-
-* Requires PHP >= 5.5
-* Updated to use PSR-7
-  * Requires immutable messages, which basically means an event based system
-    owned by a request instance is no longer possible.
-  * Utilizing the [Guzzle PSR-7 package](https://github.com/guzzle/psr7).
-  * Removed the dependency on `guzzlehttp/streams`. These stream abstractions
-    are available in the `guzzlehttp/psr7` package under the `GuzzleHttp\Psr7`
-    namespace.
-* Added middleware and handler system
-  * Replaced the Guzzle event and subscriber system with a middleware system.
-  * No longer depends on RingPHP, but rather places the HTTP handlers directly
-    in Guzzle, operating on PSR-7 messages.
-  * Retry logic is now encapsulated in `GuzzleHttp\Middleware::retry`, which
-    means the `guzzlehttp/retry-subscriber` is now obsolete.
-  * Mocking responses is now handled using `GuzzleHttp\Handler\MockHandler`.
-* Asynchronous responses
-  * No longer supports the `future` request option to send an async request.
-    Instead, use one of the `*Async` methods of a client (e.g., `requestAsync`,
-    `getAsync`, etc.).
-  * Utilizing `GuzzleHttp\Promise` instead of React's promise library to avoid
-    recursion required by chaining and forwarding react promises. See
-    https://github.com/guzzle/promises
-  * Added `requestAsync` and `sendAsync` to send request asynchronously.
-  * Added magic methods for `getAsync()`, `postAsync()`, etc. to send requests
-    asynchronously.
-* Request options
-  * POST and form updates
-    * Added the `form_fields` and `form_files` request options.
-    * Removed the `GuzzleHttp\Post` namespace.
-    * The `body` request option no longer accepts an array for POST requests.
-  * The `exceptions` request option has been deprecated in favor of the
-    `http_errors` request options.
-  * The `save_to` request option has been deprecated in favor of `sink` request
-    option.
-* Clients no longer accept an array of URI template string and variables for
-  URI variables. You will need to expand URI templates before passing them
-  into a client constructor or request method.
-* Client methods `get()`, `post()`, `put()`, `patch()`, `options()`, etc. are
-  now magic methods that will send synchronous requests.
-* Replaced `Utils.php` with plain functions in `functions.php`.
-* Removed `GuzzleHttp\Collection`.
-* Removed `GuzzleHttp\BatchResults`. Batched pool results are now returned as
-  an array.
-* Removed `GuzzleHttp\Query`. Query string handling is now handled using an
-  associative array passed into the `query` request option. The query string
-  is serialized using PHP's `http_build_query`. If you need more control, you
-  can pass the query string in as a string.
-* `GuzzleHttp\QueryParser` has been replaced with the
-  `GuzzleHttp\Psr7\parse_query`.
-
-## 5.2.0 - 2015-01-27
-
-* Added `AppliesHeadersInterface` to make applying headers to a request based
-  on the body more generic and not specific to `PostBodyInterface`.
-* Reduced the number of stack frames needed to send requests.
-* Nested futures are now resolved in the client rather than the RequestFsm
-* Finishing state transitions is now handled in the RequestFsm rather than the
-  RingBridge.
-* Added a guard in the Pool class to not use recursion for request retries.
-
-## 5.1.0 - 2014-12-19
-
-* Pool class no longer uses recursion when a request is intercepted.
-* The size of a Pool can now be dynamically adjusted using a callback.
-  See https://github.com/guzzle/guzzle/pull/943.
-* Setting a request option to `null` when creating a request with a client will
-  ensure that the option is not set. This allows you to overwrite default
-  request options on a per-request basis.
-  See https://github.com/guzzle/guzzle/pull/937.
-* Added the ability to limit which protocols are allowed for redirects by
-  specifying a `protocols` array in the `allow_redirects` request option.
-* Nested futures due to retries are now resolved when waiting for synchronous
-  responses. See https://github.com/guzzle/guzzle/pull/947.
-* `"0"` is now an allowed URI path. See
-  https://github.com/guzzle/guzzle/pull/935.
-* `Query` no longer typehints on the `$query` argument in the constructor,
-  allowing for strings and arrays.
-* Exceptions thrown in the `end` event are now correctly wrapped with Guzzle
-  specific exceptions if necessary.
-
-## 5.0.3 - 2014-11-03
-
-This change updates query strings so that they are treated as un-encoded values
-by default where the value represents an un-encoded value to send over the
-wire. A Query object then encodes the value before sending over the wire. This
-means that even value query string values (e.g., ":") are url encoded. This
-makes the Query class match PHP's http_build_query function. However, if you
-want to send requests over the wire using valid query string characters that do
-not need to be encoded, then you can provide a string to Url::setQuery() and
-pass true as the second argument to specify that the query string is a raw
-string that should not be parsed or encoded (unless a call to getQuery() is
-subsequently made, forcing the query-string to be converted into a Query
-object).
-
-## 5.0.2 - 2014-10-30
-
-* Added a trailing `\r\n` to multipart/form-data payloads. See
-  https://github.com/guzzle/guzzle/pull/871
-* Added a `GuzzleHttp\Pool::send()` convenience method to match the docs.
-* Status codes are now returned as integers. See
-  https://github.com/guzzle/guzzle/issues/881
-* No longer overwriting an existing `application/x-www-form-urlencoded` header
-  when sending POST requests, allowing for customized headers. See
-  https://github.com/guzzle/guzzle/issues/877
-* Improved path URL serialization.
-
-  * No longer double percent-encoding characters in the path or query string if
-    they are already encoded.
-  * Now properly encoding the supplied path to a URL object, instead of only
-    encoding ' ' and '?'.
-  * Note: This has been changed in 5.0.3 to now encode query string values by
-    default unless the `rawString` argument is provided when setting the query
-    string on a URL: Now allowing many more characters to be present in the
-    query string without being percent encoded. See http://tools.ietf.org/html/rfc3986#appendix-A
-
-## 5.0.1 - 2014-10-16
-
-Bugfix release.
-
-* Fixed an issue where connection errors still returned response object in
-  error and end events event though the response is unusable. This has been
-  corrected so that a response is not returned in the `getResponse` method of
-  these events if the response did not complete. https://github.com/guzzle/guzzle/issues/867
-* Fixed an issue where transfer statistics were not being populated in the
-  RingBridge. https://github.com/guzzle/guzzle/issues/866
-
-## 5.0.0 - 2014-10-12
-
-Adding support for non-blocking responses and some minor API cleanup.
-
-### New Features
-
-* Added support for non-blocking responses based on `guzzlehttp/guzzle-ring`.
-* Added a public API for creating a default HTTP adapter.
-* Updated the redirect plugin to be non-blocking so that redirects are sent
-  concurrently. Other plugins like this can now be updated to be non-blocking.
-* Added a "progress" event so that you can get upload and download progress
-  events.
-* Added `GuzzleHttp\Pool` which implements FutureInterface and transfers
-  requests concurrently using a capped pool size as efficiently as possible.
-* Added `hasListeners()` to EmitterInterface.
-* Removed `GuzzleHttp\ClientInterface::sendAll` and marked
-  `GuzzleHttp\Client::sendAll` as deprecated (it's still there, just not the
-  recommended way).
-
-### Breaking changes
-
-The breaking changes in this release are relatively minor. The biggest thing to
-look out for is that request and response objects no longer implement fluent
-interfaces.
-
-* Removed the fluent interfaces (i.e., `return $this`) from requests,
-  responses, `GuzzleHttp\Collection`, `GuzzleHttp\Url`,
-  `GuzzleHttp\Query`, `GuzzleHttp\Post\PostBody`, and
-  `GuzzleHttp\Cookie\SetCookie`. This blog post provides a good outline of
-  why I did this: http://ocramius.github.io/blog/fluent-interfaces-are-evil/.
-  This also makes the Guzzle message interfaces compatible with the current
-  PSR-7 message proposal.
-* Removed "functions.php", so that Guzzle is truly PSR-4 compliant. Except
-  for the HTTP request functions from function.php, these functions are now
-  implemented in `GuzzleHttp\Utils` using camelCase. `GuzzleHttp\json_decode`
-  moved to `GuzzleHttp\Utils::jsonDecode`. `GuzzleHttp\get_path` moved to
-  `GuzzleHttp\Utils::getPath`. `GuzzleHttp\set_path` moved to
-  `GuzzleHttp\Utils::setPath`. `GuzzleHttp\batch` should now be
-  `GuzzleHttp\Pool::batch`, which returns an `objectStorage`. Using functions.php
-  caused problems for many users: they aren't PSR-4 compliant, require an
-  explicit include, and needed an if-guard to ensure that the functions are not
-  declared multiple times.
-* Rewrote adapter layer.
-    * Removing all classes from `GuzzleHttp\Adapter`, these are now
-      implemented as callables that are stored in `GuzzleHttp\Ring\Client`.
-    * Removed the concept of "parallel adapters". Sending requests serially or
-      concurrently is now handled using a single adapter.
-    * Moved `GuzzleHttp\Adapter\Transaction` to `GuzzleHttp\Transaction`. The
-      Transaction object now exposes the request, response, and client as public
-      properties. The getters and setters have been removed.
-* Removed the "headers" event. This event was only useful for changing the
-  body a response once the headers of the response were known. You can implement
-  a similar behavior in a number of ways. One example might be to use a
-  FnStream that has access to the transaction being sent. For example, when the
-  first byte is written, you could check if the response headers match your
-  expectations, and if so, change the actual stream body that is being
-  written to.
-* Removed the `asArray` parameter from
-  `GuzzleHttp\Message\MessageInterface::getHeader`. If you want to get a header
-  value as an array, then use the newly added `getHeaderAsArray()` method of
-  `MessageInterface`. This change makes the Guzzle interfaces compatible with
-  the PSR-7 interfaces.
-* `GuzzleHttp\Message\MessageFactory` no longer allows subclasses to add
-  custom request options using double-dispatch (this was an implementation
-  detail). Instead, you should now provide an associative array to the
-  constructor which is a mapping of the request option name mapping to a
-  function that applies the option value to a request.
-* Removed the concept of "throwImmediately" from exceptions and error events.
-  This control mechanism was used to stop a transfer of concurrent requests
-  from completing. This can now be handled by throwing the exception or by
-  cancelling a pool of requests or each outstanding future request individually.
-* Updated to "GuzzleHttp\Streams" 3.0.
-    * `GuzzleHttp\Stream\StreamInterface::getContents()` no longer accepts a
-      `maxLen` parameter. This update makes the Guzzle streams project
-      compatible with the current PSR-7 proposal.
-    * `GuzzleHttp\Stream\Stream::__construct`,
-      `GuzzleHttp\Stream\Stream::factory`, and
-      `GuzzleHttp\Stream\Utils::create` no longer accept a size in the second
-      argument. They now accept an associative array of options, including the
-      "size" key and "metadata" key which can be used to provide custom metadata.
-
-## 4.2.2 - 2014-09-08
-
-* Fixed a memory leak in the CurlAdapter when reusing cURL handles.
-* No longer using `request_fulluri` in stream adapter proxies.
-* Relative redirects are now based on the last response, not the first response.
-
-## 4.2.1 - 2014-08-19
-
-* Ensuring that the StreamAdapter does not always add a Content-Type header
-* Adding automated github releases with a phar and zip
-
-## 4.2.0 - 2014-08-17
-
-* Now merging in default options using a case-insensitive comparison.
-  Closes https://github.com/guzzle/guzzle/issues/767
-* Added the ability to automatically decode `Content-Encoding` response bodies
-  using the `decode_content` request option. This is set to `true` by default
-  to decode the response body if it comes over the wire with a
-  `Content-Encoding`. Set this value to `false` to disable decoding the
-  response content, and pass a string to provide a request `Accept-Encoding`
-  header and turn on automatic response decoding. This feature now allows you
-  to pass an `Accept-Encoding` header in the headers of a request but still
-  disable automatic response decoding.
-  Closes https://github.com/guzzle/guzzle/issues/764
-* Added the ability to throw an exception immediately when transferring
-  requests in parallel. Closes https://github.com/guzzle/guzzle/issues/760
-* Updating guzzlehttp/streams dependency to ~2.1
-* No longer utilizing the now deprecated namespaced methods from the stream
-  package.
-
-## 4.1.8 - 2014-08-14
-
-* Fixed an issue in the CurlFactory that caused setting the `stream=false`
-  request option to throw an exception.
-  See: https://github.com/guzzle/guzzle/issues/769
-* TransactionIterator now calls rewind on the inner iterator.
-  See: https://github.com/guzzle/guzzle/pull/765
-* You can now set the `Content-Type` header to `multipart/form-data`
-  when creating POST requests to force multipart bodies.
-  See https://github.com/guzzle/guzzle/issues/768
-
-## 4.1.7 - 2014-08-07
-
-* Fixed an error in the HistoryPlugin that caused the same request and response
-  to be logged multiple times when an HTTP protocol error occurs.
-* Ensuring that cURL does not add a default Content-Type when no Content-Type
-  has been supplied by the user. This prevents the adapter layer from modifying
-  the request that is sent over the wire after any listeners may have already
-  put the request in a desired state (e.g., signed the request).
-* Throwing an exception when you attempt to send requests that have the
-  "stream" set to true in parallel using the MultiAdapter.
-* Only calling curl_multi_select when there are active cURL handles. This was
-  previously changed and caused performance problems on some systems due to PHP
-  always selecting until the maximum select timeout.
-* Fixed a bug where multipart/form-data POST fields were not correctly
-  aggregated (e.g., values with "&").
-
-## 4.1.6 - 2014-08-03
-
-* Added helper methods to make it easier to represent messages as strings,
-  including getting the start line and getting headers as a string.
-
-## 4.1.5 - 2014-08-02
-
-* Automatically retrying cURL "Connection died, retrying a fresh connect"
-  errors when possible.
-* cURL implementation cleanup
-* Allowing multiple event subscriber listeners to be registered per event by
-  passing an array of arrays of listener configuration.
-
-## 4.1.4 - 2014-07-22
-
-* Fixed a bug that caused multi-part POST requests with more than one field to
-  serialize incorrectly.
-* Paths can now be set to "0"
-* `ResponseInterface::xml` now accepts a `libxml_options` option and added a
-  missing default argument that was required when parsing XML response bodies.
-* A `save_to` stream is now created lazily, which means that files are not
-  created on disk unless a request succeeds.
-
-## 4.1.3 - 2014-07-15
-
-* Various fixes to multipart/form-data POST uploads
-* Wrapping function.php in an if-statement to ensure Guzzle can be used
-  globally and in a Composer install
-* Fixed an issue with generating and merging in events to an event array
-* POST headers are only applied before sending a request to allow you to change
-  the query aggregator used before uploading
-* Added much more robust query string parsing
-* Fixed various parsing and normalization issues with URLs
-* Fixing an issue where multi-valued headers were not being utilized correctly
-  in the StreamAdapter
-
-## 4.1.2 - 2014-06-18
-
-* Added support for sending payloads with GET requests
-
-## 4.1.1 - 2014-06-08
-
-* Fixed an issue related to using custom message factory options in subclasses
-* Fixed an issue with nested form fields in a multi-part POST
-* Fixed an issue with using the `json` request option for POST requests
-* Added `ToArrayInterface` to `GuzzleHttp\Cookie\CookieJar`
-
-## 4.1.0 - 2014-05-27
-
-* Added a `json` request option to easily serialize JSON payloads.
-* Added a `GuzzleHttp\json_decode()` wrapper to safely parse JSON.
-* Added `setPort()` and `getPort()` to `GuzzleHttp\Message\RequestInterface`.
-* Added the ability to provide an emitter to a client in the client constructor.
-* Added the ability to persist a cookie session using $_SESSION.
-* Added a trait that can be used to add event listeners to an iterator.
-* Removed request method constants from RequestInterface.
-* Fixed warning when invalid request start-lines are received.
-* Updated MessageFactory to work with custom request option methods.
-* Updated cacert bundle to latest build.
-
-4.0.2 (2014-04-16)
-------------------
-
-* Proxy requests using the StreamAdapter now properly use request_fulluri (#632)
-* Added the ability to set scalars as POST fields (#628)
-
-## 4.0.1 - 2014-04-04
-
-* The HTTP status code of a response is now set as the exception code of
-  RequestException objects.
-* 303 redirects will now correctly switch from POST to GET requests.
-* The default parallel adapter of a client now correctly uses the MultiAdapter.
-* HasDataTrait now initializes the internal data array as an empty array so
-  that the toArray() method always returns an array.
-
-## 4.0.0 - 2014-03-29
-
-* For more information on the 4.0 transition, see:
-  http://mtdowling.com/blog/2014/03/15/guzzle-4-rc/
-* For information on changes and upgrading, see:
-  https://github.com/guzzle/guzzle/blob/master/UPGRADING.md#3x-to-40
-* Added `GuzzleHttp\batch()` as a convenience function for sending requests in
-  parallel without needing to write asynchronous code.
-* Restructured how events are added to `GuzzleHttp\ClientInterface::sendAll()`.
-  You can now pass a callable or an array of associative arrays where each
-  associative array contains the "fn", "priority", and "once" keys.
-
-## 4.0.0.rc-2 - 2014-03-25
-
-* Removed `getConfig()` and `setConfig()` from clients to avoid confusion
-  around whether things like base_url, message_factory, etc. should be able to
-  be retrieved or modified.
-* Added `getDefaultOption()` and `setDefaultOption()` to ClientInterface
-* functions.php functions were renamed using snake_case to match PHP idioms
-* Added support for `HTTP_PROXY`, `HTTPS_PROXY`, and
-  `GUZZLE_CURL_SELECT_TIMEOUT` environment variables
-* Added the ability to specify custom `sendAll()` event priorities
-* Added the ability to specify custom stream context options to the stream
-  adapter.
-* Added a functions.php function for `get_path()` and `set_path()`
-* CurlAdapter and MultiAdapter now use a callable to generate curl resources
-* MockAdapter now properly reads a body and emits a `headers` event
-* Updated Url class to check if a scheme and host are set before adding ":"
-  and "//". This allows empty Url (e.g., "") to be serialized as "".
-* Parsing invalid XML no longer emits warnings
-* Curl classes now properly throw AdapterExceptions
-* Various performance optimizations
-* Streams are created with the faster `Stream\create()` function
-* Marked deprecation_proxy() as internal
-* Test server is now a collection of static methods on a class
-
-## 4.0.0-rc.1 - 2014-03-15
-
-* See https://github.com/guzzle/guzzle/blob/master/UPGRADING.md#3x-to-40
-
-## 3.8.1 - 2014-01-28
-
-* Bug: Always using GET requests when redirecting from a 303 response
-* Bug: CURLOPT_SSL_VERIFYHOST is now correctly set to false when setting `$certificateAuthority` to false in
-  `Guzzle\Http\ClientInterface::setSslVerification()`
-* Bug: RedirectPlugin now uses strict RFC 3986 compliance when combining a base URL with a relative URL
-* Bug: The body of a request can now be set to `"0"`
-* Sending PHP stream requests no longer forces `HTTP/1.0`
-* Adding more information to ExceptionCollection exceptions so that users have more context, including a stack trace of
-  each sub-exception
-* Updated the `$ref` attribute in service descriptions to merge over any existing parameters of a schema (rather than
-  clobbering everything).
-* Merging URLs will now use the query string object from the relative URL (thus allowing custom query aggregators)
-* Query strings are now parsed in a way that they do no convert empty keys with no value to have a dangling `=`.
-  For example `foo&bar=baz` is now correctly parsed and recognized as `foo&bar=baz` rather than `foo=&bar=baz`.
-* Now properly escaping the regular expression delimiter when matching Cookie domains.
-* Network access is now disabled when loading XML documents
-
-## 3.8.0 - 2013-12-05
-
-* Added the ability to define a POST name for a file
-* JSON response parsing now properly walks additionalProperties
-* cURL error code 18 is now retried automatically in the BackoffPlugin
-* Fixed a cURL error when URLs contain fragments
-* Fixed an issue in the BackoffPlugin retry event where it was trying to access all exceptions as if they were
-  CurlExceptions
-* CURLOPT_PROGRESS function fix for PHP 5.5 (69fcc1e)
-* Added the ability for Guzzle to work with older versions of cURL that do not support `CURLOPT_TIMEOUT_MS`
-* Fixed a bug that was encountered when parsing empty header parameters
-* UriTemplate now has a `setRegex()` method to match the docs
-* The `debug` request parameter now checks if it is truthy rather than if it exists
-* Setting the `debug` request parameter to true shows verbose cURL output instead of using the LogPlugin
-* Added the ability to combine URLs using strict RFC 3986 compliance
-* Command objects can now return the validation errors encountered by the command
-* Various fixes to cache revalidation (#437 and 29797e5)
-* Various fixes to the AsyncPlugin
-* Cleaned up build scripts
-
-## 3.7.4 - 2013-10-02
-
-* Bug fix: 0 is now an allowed value in a description parameter that has a default value (#430)
-* Bug fix: SchemaFormatter now returns an integer when formatting to a Unix timestamp
-  (see https://github.com/aws/aws-sdk-php/issues/147)
-* Bug fix: Cleaned up and fixed URL dot segment removal to properly resolve internal dots
-* Minimum PHP version is now properly specified as 5.3.3 (up from 5.3.2) (#420)
-* Updated the bundled cacert.pem (#419)
-* OauthPlugin now supports adding authentication to headers or query string (#425)
-
-## 3.7.3 - 2013-09-08
-
-* Added the ability to get the exception associated with a request/command when using `MultiTransferException` and
-  `CommandTransferException`.
-* Setting `additionalParameters` of a response to false is now honored when parsing responses with a service description
-* Schemas are only injected into response models when explicitly configured.
-* No longer guessing Content-Type based on the path of a request. Content-Type is now only guessed based on the path of
-  an EntityBody.
-* Bug fix: ChunkedIterator can now properly chunk a \Traversable as well as an \Iterator.
-* Bug fix: FilterIterator now relies on `\Iterator` instead of `\Traversable`.
-* Bug fix: Gracefully handling malformed responses in RequestMediator::writeResponseBody()
-* Bug fix: Replaced call to canCache with canCacheRequest in the CallbackCanCacheStrategy of the CachePlugin
-* Bug fix: Visiting XML attributes first before visiting XML children when serializing requests
-* Bug fix: Properly parsing headers that contain commas contained in quotes
-* Bug fix: mimetype guessing based on a filename is now case-insensitive
-
-## 3.7.2 - 2013-08-02
-
-* Bug fix: Properly URL encoding paths when using the PHP-only version of the UriTemplate expander
-  See https://github.com/guzzle/guzzle/issues/371
-* Bug fix: Cookie domains are now matched correctly according to RFC 6265
-  See https://github.com/guzzle/guzzle/issues/377
-* Bug fix: GET parameters are now used when calculating an OAuth signature
-* Bug fix: Fixed an issue with cache revalidation where the If-None-Match header was being double quoted
-* `Guzzle\Common\AbstractHasDispatcher::dispatch()` now returns the event that was dispatched
-* `Guzzle\Http\QueryString::factory()` now guesses the most appropriate query aggregator to used based on the input.
-  See https://github.com/guzzle/guzzle/issues/379
-* Added a way to add custom domain objects to service description parsing using the `operation.parse_class` event. See
-  https://github.com/guzzle/guzzle/pull/380
-* cURL multi cleanup and optimizations
-
-## 3.7.1 - 2013-07-05
-
-* Bug fix: Setting default options on a client now works
-* Bug fix: Setting options on HEAD requests now works. See #352
-* Bug fix: Moving stream factory before send event to before building the stream. See #353
-* Bug fix: Cookies no longer match on IP addresses per RFC 6265
-* Bug fix: Correctly parsing header parameters that are in `<>` and quotes
-* Added `cert` and `ssl_key` as request options
-* `Host` header can now diverge from the host part of a URL if the header is set manually
-* `Guzzle\Service\Command\LocationVisitor\Request\XmlVisitor` was rewritten to change from using SimpleXML to XMLWriter
-* OAuth parameters are only added via the plugin if they aren't already set
-* Exceptions are now thrown when a URL cannot be parsed
-* Returning `false` if `Guzzle\Http\EntityBody::getContentMd5()` fails
-* Not setting a `Content-MD5` on a command if calculating the Content-MD5 fails via the CommandContentMd5Plugin
-
-## 3.7.0 - 2013-06-10
-
-* See UPGRADING.md for more information on how to upgrade.
-* Requests now support the ability to specify an array of $options when creating a request to more easily modify a
-  request. You can pass a 'request.options' configuration setting to a client to apply default request options to
-  every request created by a client (e.g. default query string variables, headers, curl options, etc.).
-* Added a static facade class that allows you to use Guzzle with static methods and mount the class to `\Guzzle`.
-  See `Guzzle\Http\StaticClient::mount`.
-* Added `command.request_options` to `Guzzle\Service\Command\AbstractCommand` to pass request options to requests
-      created by a command (e.g. custom headers, query string variables, timeout settings, etc.).
-* Stream size in `Guzzle\Stream\PhpStreamRequestFactory` will now be set if Content-Length is returned in the
-  headers of a response
-* Added `Guzzle\Common\Collection::setPath($path, $value)` to set a value into an array using a nested key
-  (e.g. `$collection->setPath('foo/baz/bar', 'test'); echo $collection['foo']['bar']['bar'];`)
-* ServiceBuilders now support storing and retrieving arbitrary data
-* CachePlugin can now purge all resources for a given URI
-* CachePlugin can automatically purge matching cached items when a non-idempotent request is sent to a resource
-* CachePlugin now uses the Vary header to determine if a resource is a cache hit
-* `Guzzle\Http\Message\Response` now implements `\Serializable`
-* Added `Guzzle\Cache\CacheAdapterFactory::fromCache()` to more easily create cache adapters
-* `Guzzle\Service\ClientInterface::execute()` now accepts an array, single command, or Traversable
-* Fixed a bug in `Guzzle\Http\Message\Header\Link::addLink()`
-* Better handling of calculating the size of a stream in `Guzzle\Stream\Stream` using fstat() and caching the size
-* `Guzzle\Common\Exception\ExceptionCollection` now creates a more readable exception message
-* Fixing BC break: Added back the MonologLogAdapter implementation rather than extending from PsrLog so that older
-  Symfony users can still use the old version of Monolog.
-* Fixing BC break: Added the implementation back in for `Guzzle\Http\Message\AbstractMessage::getTokenizedHeader()`.
-  Now triggering an E_USER_DEPRECATED warning when used. Use `$message->getHeader()->parseParams()`.
-* Several performance improvements to `Guzzle\Common\Collection`
-* Added an `$options` argument to the end of the following methods of `Guzzle\Http\ClientInterface`:
-  createRequest, head, delete, put, patch, post, options, prepareRequest
-* Added an `$options` argument to the end of `Guzzle\Http\Message\Request\RequestFactoryInterface::createRequest()`
-* Added an `applyOptions()` method to `Guzzle\Http\Message\Request\RequestFactoryInterface`
-* Changed `Guzzle\Http\ClientInterface::get($uri = null, $headers = null, $body = null)` to
-  `Guzzle\Http\ClientInterface::get($uri = null, $headers = null, $options = array())`. You can still pass in a
-  resource, string, or EntityBody into the $options parameter to specify the download location of the response.
-* Changed `Guzzle\Common\Collection::__construct($data)` to no longer accepts a null value for `$data` but a
-  default `array()`
-* Added `Guzzle\Stream\StreamInterface::isRepeatable`
-* Removed `Guzzle\Http\ClientInterface::setDefaultHeaders(). Use
-  $client->getConfig()->setPath('request.options/headers/{header_name}', 'value')`. or
-  $client->getConfig()->setPath('request.options/headers', array('header_name' => 'value'))`.
-* Removed `Guzzle\Http\ClientInterface::getDefaultHeaders(). Use $client->getConfig()->getPath('request.options/headers')`.
-* Removed `Guzzle\Http\ClientInterface::expandTemplate()`
-* Removed `Guzzle\Http\ClientInterface::setRequestFactory()`
-* Removed `Guzzle\Http\ClientInterface::getCurlMulti()`
-* Removed `Guzzle\Http\Message\RequestInterface::canCache`
-* Removed `Guzzle\Http\Message\RequestInterface::setIsRedirect`
-* Removed `Guzzle\Http\Message\RequestInterface::isRedirect`
-* Made `Guzzle\Http\Client::expandTemplate` and `getUriTemplate` protected methods.
-* You can now enable E_USER_DEPRECATED warnings to see if you are using a deprecated method by setting
-  `Guzzle\Common\Version::$emitWarnings` to true.
-* Marked `Guzzle\Http\Message\Request::isResponseBodyRepeatable()` as deprecated. Use
-      `$request->getResponseBody()->isRepeatable()` instead.
-* Marked `Guzzle\Http\Message\Request::canCache()` as deprecated. Use
-  `Guzzle\Plugin\Cache\DefaultCanCacheStrategy->canCacheRequest()` instead.
-* Marked `Guzzle\Http\Message\Request::canCache()` as deprecated. Use
-  `Guzzle\Plugin\Cache\DefaultCanCacheStrategy->canCacheRequest()` instead.
-* Marked `Guzzle\Http\Message\Request::setIsRedirect()` as deprecated. Use the HistoryPlugin instead.
-* Marked `Guzzle\Http\Message\Request::isRedirect()` as deprecated. Use the HistoryPlugin instead.
-* Marked `Guzzle\Cache\CacheAdapterFactory::factory()` as deprecated
-* Marked 'command.headers', 'command.response_body' and 'command.on_complete' as deprecated for AbstractCommand.
-  These will work through Guzzle 4.0
-* Marked 'request.params' for `Guzzle\Http\Client` as deprecated. Use [request.options][params].
-* Marked `Guzzle\Service\Client::enableMagicMethods()` as deprecated. Magic methods can no longer be disabled on a Guzzle\Service\Client.
-* Marked `Guzzle\Service\Client::getDefaultHeaders()` as deprecated. Use $client->getConfig()->getPath('request.options/headers')`.
-* Marked `Guzzle\Service\Client::setDefaultHeaders()` as deprecated. Use $client->getConfig()->setPath('request.options/headers/{header_name}', 'value')`.
-* Marked `Guzzle\Parser\Url\UrlParser` as deprecated. Just use PHP's `parse_url()` and percent encode your UTF-8.
-* Marked `Guzzle\Common\Collection::inject()` as deprecated.
-* Marked `Guzzle\Plugin\CurlAuth\CurlAuthPlugin` as deprecated. Use `$client->getConfig()->setPath('request.options/auth', array('user', 'pass', 'Basic|Digest');`
-* CacheKeyProviderInterface and DefaultCacheKeyProvider are no longer used. All of this logic is handled in a
-  CacheStorageInterface. These two objects and interface will be removed in a future version.
-* Always setting X-cache headers on cached responses
-* Default cache TTLs are now handled by the CacheStorageInterface of a CachePlugin
-* `CacheStorageInterface::cache($key, Response $response, $ttl = null)` has changed to `cache(RequestInterface
-  $request, Response $response);`
-* `CacheStorageInterface::fetch($key)` has changed to `fetch(RequestInterface $request);`
-* `CacheStorageInterface::delete($key)` has changed to `delete(RequestInterface $request);`
-* Added `CacheStorageInterface::purge($url)`
-* `DefaultRevalidation::__construct(CacheKeyProviderInterface $cacheKey, CacheStorageInterface $cache, CachePlugin
-  $plugin)` has changed to `DefaultRevalidation::__construct(CacheStorageInterface $cache,
-  CanCacheStrategyInterface $canCache = null)`
-* Added `RevalidationInterface::shouldRevalidate(RequestInterface $request, Response $response)`
-
-## 3.6.0 - 2013-05-29
-
-* ServiceDescription now implements ToArrayInterface
-* Added command.hidden_params to blacklist certain headers from being treated as additionalParameters
-* Guzzle can now correctly parse incomplete URLs
-* Mixed casing of headers are now forced to be a single consistent casing across all values for that header.
-* Messages internally use a HeaderCollection object to delegate handling case-insensitive header resolution
-* Removed the whole changedHeader() function system of messages because all header changes now go through addHeader().
-* Specific header implementations can be created for complex headers. When a message creates a header, it uses a
-  HeaderFactory which can map specific headers to specific header classes. There is now a Link header and
-  CacheControl header implementation.
-* Removed from interface: Guzzle\Http\ClientInterface::setUriTemplate
-* Removed from interface: Guzzle\Http\ClientInterface::setCurlMulti()
-* Removed Guzzle\Http\Message\Request::receivedRequestHeader() and implemented this functionality in
-  Guzzle\Http\Curl\RequestMediator
-* Removed the optional $asString parameter from MessageInterface::getHeader(). Just cast the header to a string.
-* Removed the optional $tryChunkedTransfer option from Guzzle\Http\Message\EntityEnclosingRequestInterface
-* Removed the $asObjects argument from Guzzle\Http\Message\MessageInterface::getHeaders()
-* Removed Guzzle\Parser\ParserRegister::get(). Use getParser()
-* Removed Guzzle\Parser\ParserRegister::set(). Use registerParser().
-* All response header helper functions return a string rather than mixing Header objects and strings inconsistently
-* Removed cURL blacklist support. This is no longer necessary now that Expect, Accept, etc. are managed by Guzzle
-  directly via interfaces
-* Removed the injecting of a request object onto a response object. The methods to get and set a request still exist
-  but are a no-op until removed.
-* Most classes that used to require a `Guzzle\Service\Command\CommandInterface` typehint now request a
-  `Guzzle\Service\Command\ArrayCommandInterface`.
-* Added `Guzzle\Http\Message\RequestInterface::startResponse()` to the RequestInterface to handle injecting a response
-  on a request while the request is still being transferred
-* The ability to case-insensitively search for header values
-* Guzzle\Http\Message\Header::hasExactHeader
-* Guzzle\Http\Message\Header::raw. Use getAll()
-* Deprecated cache control specific methods on Guzzle\Http\Message\AbstractMessage. Use the CacheControl header object
-  instead.
-* `Guzzle\Service\Command\CommandInterface` now extends from ToArrayInterface and ArrayAccess
-* Added the ability to cast Model objects to a string to view debug information.
-
-## 3.5.0 - 2013-05-13
-
-* Bug: Fixed a regression so that request responses are parsed only once per oncomplete event rather than multiple times
-* Bug: Better cleanup of one-time events across the board (when an event is meant to fire once, it will now remove
-  itself from the EventDispatcher)
-* Bug: `Guzzle\Log\MessageFormatter` now properly writes "total_time" and "connect_time" values
-* Bug: Cloning an EntityEnclosingRequest now clones the EntityBody too
-* Bug: Fixed an undefined index error when parsing nested JSON responses with a sentAs parameter that reference a
-  non-existent key
-* Bug: All __call() method arguments are now required (helps with mocking frameworks)
-* Deprecating Response::getRequest() and now using a shallow clone of a request object to remove a circular reference
-  to help with refcount based garbage collection of resources created by sending a request
-* Deprecating ZF1 cache and log adapters. These will be removed in the next major version.
-* Deprecating `Response::getPreviousResponse()` (method signature still exists, but it's deprecated). Use the
-  HistoryPlugin for a history.
-* Added a `responseBody` alias for the `response_body` location
-* Refactored internals to no longer rely on Response::getRequest()
-* HistoryPlugin can now be cast to a string
-* HistoryPlugin now logs transactions rather than requests and responses to more accurately keep track of the requests
-  and responses that are sent over the wire
-* Added `getEffectiveUrl()` and `getRedirectCount()` to Response objects
-
-## 3.4.3 - 2013-04-30
-
-* Bug fix: Fixing bug introduced in 3.4.2 where redirect responses are duplicated on the final redirected response
-* Added a check to re-extract the temp cacert bundle from the phar before sending each request
-
-## 3.4.2 - 2013-04-29
-
-* Bug fix: Stream objects now work correctly with "a" and "a+" modes
-* Bug fix: Removing `Transfer-Encoding: chunked` header when a Content-Length is present
-* Bug fix: AsyncPlugin no longer forces HEAD requests
-* Bug fix: DateTime timezones are now properly handled when using the service description schema formatter
-* Bug fix: CachePlugin now properly handles stale-if-error directives when a request to the origin server fails
-* Setting a response on a request will write to the custom request body from the response body if one is specified
-* LogPlugin now writes to php://output when STDERR is undefined
-* Added the ability to set multiple POST files for the same key in a single call
-* application/x-www-form-urlencoded POSTs now use the utf-8 charset by default
-* Added the ability to queue CurlExceptions to the MockPlugin
-* Cleaned up how manual responses are queued on requests (removed "queued_response" and now using request.before_send)
-* Configuration loading now allows remote files
-
-## 3.4.1 - 2013-04-16
-
-* Large refactoring to how CurlMulti handles work. There is now a proxy that sits in front of a pool of CurlMulti
-  handles. This greatly simplifies the implementation, fixes a couple bugs, and provides a small performance boost.
-* Exceptions are now properly grouped when sending requests in parallel
-* Redirects are now properly aggregated when a multi transaction fails
-* Redirects now set the response on the original object even in the event of a failure
-* Bug fix: Model names are now properly set even when using $refs
-* Added support for PHP 5.5's CurlFile to prevent warnings with the deprecated @ syntax
-* Added support for oauth_callback in OAuth signatures
-* Added support for oauth_verifier in OAuth signatures
-* Added support to attempt to retrieve a command first literally, then ucfirst, the with inflection
-
-## 3.4.0 - 2013-04-11
-
-* Bug fix: URLs are now resolved correctly based on http://tools.ietf.org/html/rfc3986#section-5.2. #289
-* Bug fix: Absolute URLs with a path in a service description will now properly override the base URL. #289
-* Bug fix: Parsing a query string with a single PHP array value will now result in an array. #263
-* Bug fix: Better normalization of the User-Agent header to prevent duplicate headers. #264.
-* Bug fix: Added `number` type to service descriptions.
-* Bug fix: empty parameters are removed from an OAuth signature
-* Bug fix: Revalidating a cache entry prefers the Last-Modified over the Date header
-* Bug fix: Fixed "array to string" error when validating a union of types in a service description
-* Bug fix: Removed code that attempted to determine the size of a stream when data is written to the stream
-* Bug fix: Not including an `oauth_token` if the value is null in the OauthPlugin.
-* Bug fix: Now correctly aggregating successful requests and failed requests in CurlMulti when a redirect occurs.
-* The new default CURLOPT_TIMEOUT setting has been increased to 150 seconds so that Guzzle works on poor connections.
-* Added a feature to EntityEnclosingRequest::setBody() that will automatically set the Content-Type of the request if
-  the Content-Type can be determined based on the entity body or the path of the request.
-* Added the ability to overwrite configuration settings in a client when grabbing a throwaway client from a builder.
-* Added support for a PSR-3 LogAdapter.
-* Added a `command.after_prepare` event
-* Added `oauth_callback` parameter to the OauthPlugin
-* Added the ability to create a custom stream class when using a stream factory
-* Added a CachingEntityBody decorator
-* Added support for `additionalParameters` in service descriptions to define how custom parameters are serialized.
-* The bundled SSL certificate is now provided in the phar file and extracted when running Guzzle from a phar.
-* You can now send any EntityEnclosingRequest with POST fields or POST files and cURL will handle creating bodies
-* POST requests using a custom entity body are now treated exactly like PUT requests but with a custom cURL method. This
-  means that the redirect behavior of POST requests with custom bodies will not be the same as POST requests that use
-  POST fields or files (the latter is only used when emulating a form POST in the browser).
-* Lots of cleanup to CurlHandle::factory and RequestFactory::createRequest
-
-## 3.3.1 - 2013-03-10
-
-* Added the ability to create PHP streaming responses from HTTP requests
-* Bug fix: Running any filters when parsing response headers with service descriptions
-* Bug fix: OauthPlugin fixes to allow for multi-dimensional array signing, and sorting parameters before signing
-* Bug fix: Removed the adding of default empty arrays and false Booleans to responses in order to be consistent across
-  response location visitors.
-* Bug fix: Removed the possibility of creating configuration files with circular dependencies
-* RequestFactory::create() now uses the key of a POST file when setting the POST file name
-* Added xmlAllowEmpty to serialize an XML body even if no XML specific parameters are set
-
-## 3.3.0 - 2013-03-03
-
-* A large number of performance optimizations have been made
-* Bug fix: Added 'wb' as a valid write mode for streams
-* Bug fix: `Guzzle\Http\Message\Response::json()` now allows scalar values to be returned
-* Bug fix: Fixed bug in `Guzzle\Http\Message\Response` where wrapping quotes were stripped from `getEtag()`
-* BC: Removed `Guzzle\Http\Utils` class
-* BC: Setting a service description on a client will no longer modify the client's command factories.
-* BC: Emitting IO events from a RequestMediator is now a parameter that must be set in a request's curl options using
-  the 'emit_io' key. This was previously set under a request's parameters using 'curl.emit_io'
-* BC: `Guzzle\Stream\Stream::getWrapper()` and `Guzzle\Stream\Stream::getSteamType()` are no longer converted to
-  lowercase
-* Operation parameter objects are now lazy loaded internally
-* Added ErrorResponsePlugin that can throw errors for responses defined in service description operations' errorResponses
-* Added support for instantiating responseType=class responseClass classes. Classes must implement
-  `Guzzle\Service\Command\ResponseClassInterface`
-* Added support for additionalProperties for top-level parameters in responseType=model responseClasses. These
-  additional properties also support locations and can be used to parse JSON responses where the outermost part of the
-  JSON is an array
-* Added support for nested renaming of JSON models (rename sentAs to name)
-* CachePlugin
-    * Added support for stale-if-error so that the CachePlugin can now serve stale content from the cache on error
-    * Debug headers can now added to cached response in the CachePlugin
-
-## 3.2.0 - 2013-02-14
-
-* CurlMulti is no longer reused globally. A new multi object is created per-client. This helps to isolate clients.
-* URLs with no path no longer contain a "/" by default
-* Guzzle\Http\QueryString does no longer manages the leading "?". This is now handled in Guzzle\Http\Url.
-* BadResponseException no longer includes the full request and response message
-* Adding setData() to Guzzle\Service\Description\ServiceDescriptionInterface
-* Adding getResponseBody() to Guzzle\Http\Message\RequestInterface
-* Various updates to classes to use ServiceDescriptionInterface type hints rather than ServiceDescription
-* Header values can now be normalized into distinct values when multiple headers are combined with a comma separated list
-* xmlEncoding can now be customized for the XML declaration of a XML service description operation
-* Guzzle\Http\QueryString now uses Guzzle\Http\QueryAggregator\QueryAggregatorInterface objects to add custom value
-  aggregation and no longer uses callbacks
-* The URL encoding implementation of Guzzle\Http\QueryString can now be customized
-* Bug fix: Filters were not always invoked for array service description parameters
-* Bug fix: Redirects now use a target response body rather than a temporary response body
-* Bug fix: The default exponential backoff BackoffPlugin was not giving when the request threshold was exceeded
-* Bug fix: Guzzle now takes the first found value when grabbing Cache-Control directives
-
-## 3.1.2 - 2013-01-27
-
-* Refactored how operation responses are parsed. Visitors now include a before() method responsible for parsing the
-  response body. For example, the XmlVisitor now parses the XML response into an array in the before() method.
-* Fixed an issue where cURL would not automatically decompress responses when the Accept-Encoding header was sent
-* CURLOPT_SSL_VERIFYHOST is never set to 1 because it is deprecated (see 5e0ff2ef20f839e19d1eeb298f90ba3598784444)
-* Fixed a bug where redirect responses were not chained correctly using getPreviousResponse()
-* Setting default headers on a client after setting the user-agent will not erase the user-agent setting
-
-## 3.1.1 - 2013-01-20
-
-* Adding wildcard support to Guzzle\Common\Collection::getPath()
-* Adding alias support to ServiceBuilder configs
-* Adding Guzzle\Service\Resource\CompositeResourceIteratorFactory and cleaning up factory interface
-
-## 3.1.0 - 2013-01-12
-
-* BC: CurlException now extends from RequestException rather than BadResponseException
-* BC: Renamed Guzzle\Plugin\Cache\CanCacheStrategyInterface::canCache() to canCacheRequest() and added CanCacheResponse()
-* Added getData to ServiceDescriptionInterface
-* Added context array to RequestInterface::setState()
-* Bug: Removing hard dependency on the BackoffPlugin from Guzzle\Http
-* Bug: Adding required content-type when JSON request visitor adds JSON to a command
-* Bug: Fixing the serialization of a service description with custom data
-* Made it easier to deal with exceptions thrown when transferring commands or requests in parallel by providing
-  an array of successful and failed responses
-* Moved getPath from Guzzle\Service\Resource\Model to Guzzle\Common\Collection
-* Added Guzzle\Http\IoEmittingEntityBody
-* Moved command filtration from validators to location visitors
-* Added `extends` attributes to service description parameters
-* Added getModels to ServiceDescriptionInterface
-
-## 3.0.7 - 2012-12-19
-
-* Fixing phar detection when forcing a cacert to system if null or true
-* Allowing filename to be passed to `Guzzle\Http\Message\Request::setResponseBody()`
-* Cleaning up `Guzzle\Common\Collection::inject` method
-* Adding a response_body location to service descriptions
-
-## 3.0.6 - 2012-12-09
-
-* CurlMulti performance improvements
-* Adding setErrorResponses() to Operation
-* composer.json tweaks
-
-## 3.0.5 - 2012-11-18
-
-* Bug: Fixing an infinite recursion bug caused from revalidating with the CachePlugin
-* Bug: Response body can now be a string containing "0"
-* Bug: Using Guzzle inside of a phar uses system by default but now allows for a custom cacert
-* Bug: QueryString::fromString now properly parses query string parameters that contain equal signs
-* Added support for XML attributes in service description responses
-* DefaultRequestSerializer now supports array URI parameter values for URI template expansion
-* Added better mimetype guessing to requests and post files
-
-## 3.0.4 - 2012-11-11
-
-* Bug: Fixed a bug when adding multiple cookies to a request to use the correct glue value
-* Bug: Cookies can now be added that have a name, domain, or value set to "0"
-* Bug: Using the system cacert bundle when using the Phar
-* Added json and xml methods to Response to make it easier to parse JSON and XML response data into data structures
-* Enhanced cookie jar de-duplication
-* Added the ability to enable strict cookie jars that throw exceptions when invalid cookies are added
-* Added setStream to StreamInterface to actually make it possible to implement custom rewind behavior for entity bodies
-* Added the ability to create any sort of hash for a stream rather than just an MD5 hash
-
-## 3.0.3 - 2012-11-04
-
-* Implementing redirects in PHP rather than cURL
-* Added PECL URI template extension and using as default parser if available
-* Bug: Fixed Content-Length parsing of Response factory
-* Adding rewind() method to entity bodies and streams. Allows for custom rewinding of non-repeatable streams.
-* Adding ToArrayInterface throughout library
-* Fixing OauthPlugin to create unique nonce values per request
-
-## 3.0.2 - 2012-10-25
-
-* Magic methods are enabled by default on clients
-* Magic methods return the result of a command
-* Service clients no longer require a base_url option in the factory
-* Bug: Fixed an issue with URI templates where null template variables were being expanded
-
-## 3.0.1 - 2012-10-22
-
-* Models can now be used like regular collection objects by calling filter, map, etc.
-* Models no longer require a Parameter structure or initial data in the constructor
-* Added a custom AppendIterator to get around a PHP bug with the `\AppendIterator`
-
-## 3.0.0 - 2012-10-15
-
-* Rewrote service description format to be based on Swagger
-    * Now based on JSON schema
-    * Added nested input structures and nested response models
-    * Support for JSON and XML input and output models
-    * Renamed `commands` to `operations`
-    * Removed dot class notation
-    * Removed custom types
-* Broke the project into smaller top-level namespaces to be more component friendly
-* Removed support for XML configs and descriptions. Use arrays or JSON files.
-* Removed the Validation component and Inspector
-* Moved all cookie code to Guzzle\Plugin\Cookie
-* Magic methods on a Guzzle\Service\Client now return the command un-executed.
-* Calling getResult() or getResponse() on a command will lazily execute the command if needed.
-* Now shipping with cURL's CA certs and using it by default
-* Added previousResponse() method to response objects
-* No longer sending Accept and Accept-Encoding headers on every request
-* Only sending an Expect header by default when a payload is greater than 1MB
-* Added/moved client options:
-    * curl.blacklist to curl.option.blacklist
-    * Added ssl.certificate_authority
-* Added a Guzzle\Iterator component
-* Moved plugins from Guzzle\Http\Plugin to Guzzle\Plugin
-* Added a more robust backoff retry strategy (replaced the ExponentialBackoffPlugin)
-* Added a more robust caching plugin
-* Added setBody to response objects
-* Updating LogPlugin to use a more flexible MessageFormatter
-* Added a completely revamped build process
-* Cleaning up Collection class and removing default values from the get method
-* Fixed ZF2 cache adapters
-
-## 2.8.8 - 2012-10-15
-
-* Bug: Fixed a cookie issue that caused dot prefixed domains to not match where popular browsers did
-
-## 2.8.7 - 2012-09-30
-
-* Bug: Fixed config file aliases for JSON includes
-* Bug: Fixed cookie bug on a request object by using CookieParser to parse cookies on requests
-* Bug: Removing the path to a file when sending a Content-Disposition header on a POST upload
-* Bug: Hardening request and response parsing to account for missing parts
-* Bug: Fixed PEAR packaging
-* Bug: Fixed Request::getInfo
-* Bug: Fixed cases where CURLM_CALL_MULTI_PERFORM return codes were causing curl transactions to fail
-* Adding the ability for the namespace Iterator factory to look in multiple directories
-* Added more getters/setters/removers from service descriptions
-* Added the ability to remove POST fields from OAuth signatures
-* OAuth plugin now supports 2-legged OAuth
-
-## 2.8.6 - 2012-09-05
-
-* Added the ability to modify and build service descriptions
-* Added the use of visitors to apply parameters to locations in service descriptions using the dynamic command
-* Added a `json` parameter location
-* Now allowing dot notation for classes in the CacheAdapterFactory
-* Using the union of two arrays rather than an array_merge when extending service builder services and service params
-* Ensuring that a service is a string before doing strpos() checks on it when substituting services for references
-  in service builder config files.
-* Services defined in two different config files that include one another will by default replace the previously
-  defined service, but you can now create services that extend themselves and merge their settings over the previous
-* The JsonLoader now supports aliasing filenames with different filenames. This allows you to alias something like
-  '_default' with a default JSON configuration file.
-
-## 2.8.5 - 2012-08-29
-
-* Bug: Suppressed empty arrays from URI templates
-* Bug: Added the missing $options argument from ServiceDescription::factory to enable caching
-* Added support for HTTP responses that do not contain a reason phrase in the start-line
-* AbstractCommand commands are now invokable
-* Added a way to get the data used when signing an Oauth request before a request is sent
-
-## 2.8.4 - 2012-08-15
-
-* Bug: Custom delay time calculations are no longer ignored in the ExponentialBackoffPlugin
-* Added the ability to transfer entity bodies as a string rather than streamed. This gets around curl error 65. Set `body_as_string` in a request's curl options to enable.
-* Added a StreamInterface, EntityBodyInterface, and added ftell() to Guzzle\Common\Stream
-* Added an AbstractEntityBodyDecorator and a ReadLimitEntityBody decorator to transfer only a subset of a decorated stream
-* Stream and EntityBody objects will now return the file position to the previous position after a read required operation (e.g. getContentMd5())
-* Added additional response status codes
-* Removed SSL information from the default User-Agent header
-* DELETE requests can now send an entity body
-* Added an EventDispatcher to the ExponentialBackoffPlugin and added an ExponentialBackoffLogger to log backoff retries
-* Added the ability of the MockPlugin to consume mocked request bodies
-* LogPlugin now exposes request and response objects in the extras array
-
-## 2.8.3 - 2012-07-30
-
-* Bug: Fixed a case where empty POST requests were sent as GET requests
-* Bug: Fixed a bug in ExponentialBackoffPlugin that caused fatal errors when retrying an EntityEnclosingRequest that does not have a body
-* Bug: Setting the response body of a request to null after completing a request, not when setting the state of a request to new
-* Added multiple inheritance to service description commands
-* Added an ApiCommandInterface and added `getParamNames()` and `hasParam()`
-* Removed the default 2mb size cutoff from the Md5ValidatorPlugin so that it now defaults to validating everything
-* Changed CurlMulti::perform to pass a smaller timeout to CurlMulti::executeHandles
-
-## 2.8.2 - 2012-07-24
-
-* Bug: Query string values set to 0 are no longer dropped from the query string
-* Bug: A Collection object is no longer created each time a call is made to `Guzzle\Service\Command\AbstractCommand::getRequestHeaders()`
-* Bug: `+` is now treated as an encoded space when parsing query strings
-* QueryString and Collection performance improvements
-* Allowing dot notation for class paths in filters attribute of a service descriptions
-
-## 2.8.1 - 2012-07-16
-
-* Loosening Event Dispatcher dependency
-* POST redirects can now be customized using CURLOPT_POSTREDIR
-
-## 2.8.0 - 2012-07-15
-
-* BC: Guzzle\Http\Query
-    * Query strings with empty variables will always show an equal sign unless the variable is set to QueryString::BLANK (e.g. ?acl= vs ?acl)
-    * Changed isEncodingValues() and isEncodingFields() to isUrlEncoding()
-    * Changed setEncodeValues(bool) and setEncodeFields(bool) to useUrlEncoding(bool)
-    * Changed the aggregation functions of QueryString to be static methods
-    * Can now use fromString() with querystrings that have a leading ?
-* cURL configuration values can be specified in service descriptions using `curl.` prefixed parameters
-* Content-Length is set to 0 before emitting the request.before_send event when sending an empty request body
-* Cookies are no longer URL decoded by default
-* Bug: URI template variables set to null are no longer expanded
-
-## 2.7.2 - 2012-07-02
-
-* BC: Moving things to get ready for subtree splits. Moving Inflection into Common. Moving Guzzle\Http\Parser to Guzzle\Parser.
-* BC: Removing Guzzle\Common\Batch\Batch::count() and replacing it with isEmpty()
-* CachePlugin now allows for a custom request parameter function to check if a request can be cached
-* Bug fix: CachePlugin now only caches GET and HEAD requests by default
-* Bug fix: Using header glue when transferring headers over the wire
-* Allowing deeply nested arrays for composite variables in URI templates
-* Batch divisors can now return iterators or arrays
-
-## 2.7.1 - 2012-06-26
-
-* Minor patch to update version number in UA string
-* Updating build process
-
-## 2.7.0 - 2012-06-25
-
-* BC: Inflection classes moved to Guzzle\Inflection. No longer static methods. Can now inject custom inflectors into classes.
-* BC: Removed magic setX methods from commands
-* BC: Magic methods mapped to service description commands are now inflected in the command factory rather than the client __call() method
-* Verbose cURL options are no longer enabled by default. Set curl.debug to true on a client to enable.
-* Bug: Now allowing colons in a response start-line (e.g. HTTP/1.1 503 Service Unavailable: Back-end server is at capacity)
-* Guzzle\Service\Resource\ResourceIteratorApplyBatched now internally uses the Guzzle\Common\Batch namespace
-* Added Guzzle\Service\Plugin namespace and a PluginCollectionPlugin
-* Added the ability to set POST fields and files in a service description
-* Guzzle\Http\EntityBody::factory() now accepts objects with a __toString() method
-* Adding a command.before_prepare event to clients
-* Added BatchClosureTransfer and BatchClosureDivisor
-* BatchTransferException now includes references to the batch divisor and transfer strategies
-* Fixed some tests so that they pass more reliably
-* Added Guzzle\Common\Log\ArrayLogAdapter
-
-## 2.6.6 - 2012-06-10
-
-* BC: Removing Guzzle\Http\Plugin\BatchQueuePlugin
-* BC: Removing Guzzle\Service\Command\CommandSet
-* Adding generic batching system (replaces the batch queue plugin and command set)
-* Updating ZF cache and log adapters and now using ZF's composer repository
-* Bug: Setting the name of each ApiParam when creating through an ApiCommand
-* Adding result_type, result_doc, deprecated, and doc_url to service descriptions
-* Bug: Changed the default cookie header casing back to 'Cookie'
-
-## 2.6.5 - 2012-06-03
-
-* BC: Renaming Guzzle\Http\Message\RequestInterface::getResourceUri() to getResource()
-* BC: Removing unused AUTH_BASIC and AUTH_DIGEST constants from
-* BC: Guzzle\Http\Cookie is now used to manage Set-Cookie data, not Cookie data
-* BC: Renaming methods in the CookieJarInterface
-* Moving almost all cookie logic out of the CookiePlugin and into the Cookie or CookieJar implementations
-* Making the default glue for HTTP headers ';' instead of ','
-* Adding a removeValue to Guzzle\Http\Message\Header
-* Adding getCookies() to request interface.
-* Making it easier to add event subscribers to HasDispatcherInterface classes. Can now directly call addSubscriber()
-
-## 2.6.4 - 2012-05-30
-
-* BC: Cleaning up how POST files are stored in EntityEnclosingRequest objects. Adding PostFile class.
-* BC: Moving ApiCommand specific functionality from the Inspector and on to the ApiCommand
-* Bug: Fixing magic method command calls on clients
-* Bug: Email constraint only validates strings
-* Bug: Aggregate POST fields when POST files are present in curl handle
-* Bug: Fixing default User-Agent header
-* Bug: Only appending or prepending parameters in commands if they are specified
-* Bug: Not requiring response reason phrases or status codes to match a predefined list of codes
-* Allowing the use of dot notation for class namespaces when using instance_of constraint
-* Added any_match validation constraint
-* Added an AsyncPlugin
-* Passing request object to the calculateWait method of the ExponentialBackoffPlugin
-* Allowing the result of a command object to be changed
-* Parsing location and type sub values when instantiating a service description rather than over and over at runtime
-
-## 2.6.3 - 2012-05-23
-
-* [BC] Guzzle\Common\FromConfigInterface no longer requires any config options.
-* [BC] Refactoring how POST files are stored on an EntityEnclosingRequest. They are now separate from POST fields.
-* You can now use an array of data when creating PUT request bodies in the request factory.
-* Removing the requirement that HTTPS requests needed a Cache-Control: public directive to be cacheable.
-* [Http] Adding support for Content-Type in multipart POST uploads per upload
-* [Http] Added support for uploading multiple files using the same name (foo[0], foo[1])
-* Adding more POST data operations for easier manipulation of POST data.
-* You can now set empty POST fields.
-* The body of a request is only shown on EntityEnclosingRequest objects that do not use POST files.
-* Split the Guzzle\Service\Inspector::validateConfig method into two methods. One to initialize when a command is created, and one to validate.
-* CS updates
-
-## 2.6.2 - 2012-05-19
-
-* [Http] Better handling of nested scope requests in CurlMulti.  Requests are now always prepares in the send() method rather than the addRequest() method.
-
-## 2.6.1 - 2012-05-19
-
-* [BC] Removing 'path' support in service descriptions.  Use 'uri'.
-* [BC] Guzzle\Service\Inspector::parseDocBlock is now protected. Adding getApiParamsForClass() with cache.
-* [BC] Removing Guzzle\Common\NullObject.  Use https://github.com/mtdowling/NullObject if you need it.
-* [BC] Removing Guzzle\Common\XmlElement.
-* All commands, both dynamic and concrete, have ApiCommand objects.
-* Adding a fix for CurlMulti so that if all of the connections encounter some sort of curl error, then the loop exits.
-* Adding checks to EntityEnclosingRequest so that empty POST files and fields are ignored.
-* Making the method signature of Guzzle\Service\Builder\ServiceBuilder::factory more flexible.
-
-## 2.6.0 - 2012-05-15
-
-* [BC] Moving Guzzle\Service\Builder to Guzzle\Service\Builder\ServiceBuilder
-* [BC] Executing a Command returns the result of the command rather than the command
-* [BC] Moving all HTTP parsing logic to Guzzle\Http\Parsers. Allows for faster C implementations if needed.
-* [BC] Changing the Guzzle\Http\Message\Response::setProtocol() method to accept a protocol and version in separate args.
-* [BC] Moving ResourceIterator* to Guzzle\Service\Resource
-* [BC] Completely refactored ResourceIterators to iterate over a cloned command object
-* [BC] Moved Guzzle\Http\UriTemplate to Guzzle\Http\Parser\UriTemplate\UriTemplate
-* [BC] Guzzle\Guzzle is now deprecated
-* Moving Guzzle\Common\Guzzle::inject to Guzzle\Common\Collection::inject
-* Adding Guzzle\Version class to give version information about Guzzle
-* Adding Guzzle\Http\Utils class to provide getDefaultUserAgent() and getHttpDate()
-* Adding Guzzle\Curl\CurlVersion to manage caching curl_version() data
-* ServiceDescription and ServiceBuilder are now cacheable using similar configs
-* Changing the format of XML and JSON service builder configs.  Backwards compatible.
-* Cleaned up Cookie parsing
-* Trimming the default Guzzle User-Agent header
-* Adding a setOnComplete() method to Commands that is called when a command completes
-* Keeping track of requests that were mocked in the MockPlugin
-* Fixed a caching bug in the CacheAdapterFactory
-* Inspector objects can be injected into a Command object
-* Refactoring a lot of code and tests to be case insensitive when dealing with headers
-* Adding Guzzle\Http\Message\HeaderComparison for easy comparison of HTTP headers using a DSL
-* Adding the ability to set global option overrides to service builder configs
-* Adding the ability to include other service builder config files from within XML and JSON files
-* Moving the parseQuery method out of Url and on to QueryString::fromString() as a static factory method.
-
-## 2.5.0 - 2012-05-08
-
-* Major performance improvements
-* [BC] Simplifying Guzzle\Common\Collection.  Please check to see if you are using features that are now deprecated.
-* [BC] Using a custom validation system that allows a flyweight implementation for much faster validation. No longer using Symfony2 Validation component.
-* [BC] No longer supporting "{{ }}" for injecting into command or UriTemplates.  Use "{}"
-* Added the ability to passed parameters to all requests created by a client
-* Added callback functionality to the ExponentialBackoffPlugin
-* Using microtime in ExponentialBackoffPlugin to allow more granular backoff strategies.
-* Rewinding request stream bodies when retrying requests
-* Exception is thrown when JSON response body cannot be decoded
-* Added configurable magic method calls to clients and commands.  This is off by default.
-* Fixed a defect that added a hash to every parsed URL part
-* Fixed duplicate none generation for OauthPlugin.
-* Emitting an event each time a client is generated by a ServiceBuilder
-* Using an ApiParams object instead of a Collection for parameters of an ApiCommand
-* cache.* request parameters should be renamed to params.cache.*
-* Added the ability to set arbitrary curl options on requests (disable_wire, progress, etc.). See CurlHandle.
-* Added the ability to disable type validation of service descriptions
-* ServiceDescriptions and ServiceBuilders are now Serializable
diff --git a/mayor-orig/www/include/share/googleapi/guzzlehttp/guzzle/LICENSE b/mayor-orig/www/include/share/googleapi/guzzlehttp/guzzle/LICENSE
deleted file mode 100644
index ea7f07c5..00000000
--- a/mayor-orig/www/include/share/googleapi/guzzlehttp/guzzle/LICENSE
+++ /dev/null
@@ -1,19 +0,0 @@
-Copyright (c) 2011-2016 Michael Dowling, https://github.com/mtdowling 
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-THE SOFTWARE.
diff --git a/mayor-orig/www/include/share/googleapi/guzzlehttp/guzzle/README.md b/mayor-orig/www/include/share/googleapi/guzzlehttp/guzzle/README.md
deleted file mode 100644
index 2f614d6f..00000000
--- a/mayor-orig/www/include/share/googleapi/guzzlehttp/guzzle/README.md
+++ /dev/null
@@ -1,89 +0,0 @@
-Guzzle, PHP HTTP client
-=======================
-
-[![Build Status](https://travis-ci.org/guzzle/guzzle.svg?branch=master)](https://travis-ci.org/guzzle/guzzle)
-
-Guzzle is a PHP HTTP client that makes it easy to send HTTP requests and
-trivial to integrate with web services.
-
-- Simple interface for building query strings, POST requests, streaming large
-  uploads, streaming large downloads, using HTTP cookies, uploading JSON data,
-  etc...
-- Can send both synchronous and asynchronous requests using the same interface.
-- Uses PSR-7 interfaces for requests, responses, and streams. This allows you
-  to utilize other PSR-7 compatible libraries with Guzzle.
-- Abstracts away the underlying HTTP transport, allowing you to write
-  environment and transport agnostic code; i.e., no hard dependency on cURL,
-  PHP streams, sockets, or non-blocking event loops.
-- Middleware system allows you to augment and compose client behavior.
-
-```php
-$client = new \GuzzleHttp\Client();
-$res = $client->request('GET', 'https://api.github.com/repos/guzzle/guzzle');
-echo $res->getStatusCode();
-// 200
-echo $res->getHeaderLine('content-type');
-// 'application/json; charset=utf8'
-echo $res->getBody();
-// '{"id": 1420053, "name": "guzzle", ...}'
-
-// Send an asynchronous request.
-$request = new \GuzzleHttp\Psr7\Request('GET', 'http://httpbin.org');
-$promise = $client->sendAsync($request)->then(function ($response) {
-    echo 'I completed! ' . $response->getBody();
-});
-$promise->wait();
-```
-
-## Help and docs
-
-- [Documentation](http://guzzlephp.org/)
-- [Stack Overflow](http://stackoverflow.com/questions/tagged/guzzle)
-- [Gitter](https://gitter.im/guzzle/guzzle)
-
-
-## Installing Guzzle
-
-The recommended way to install Guzzle is through
-[Composer](http://getcomposer.org).
-
-```bash
-# Install Composer
-curl -sS https://getcomposer.org/installer | php
-```
-
-Next, run the Composer command to install the latest stable version of Guzzle:
-
-```bash
-php composer.phar require guzzlehttp/guzzle
-```
-
-After installing, you need to require Composer's autoloader:
-
-```php
-require 'vendor/autoload.php';
-```
-
-You can then later update Guzzle using composer:
-
- ```bash
-composer.phar update
- ```
-
-
-## Version Guidance
-
-| Version | Status     | Packagist           | Namespace    | Repo                | Docs                | PSR-7 | PHP Version |
-|---------|------------|---------------------|--------------|---------------------|---------------------|-------|-------------|
-| 3.x     | EOL        | `guzzle/guzzle`     | `Guzzle`     | [v3][guzzle-3-repo] | [v3][guzzle-3-docs] | No    | >= 5.3.3    |
-| 4.x     | EOL        | `guzzlehttp/guzzle` | `GuzzleHttp` | [v4][guzzle-4-repo] | N/A                 | No    | >= 5.4      |
-| 5.x     | Maintained | `guzzlehttp/guzzle` | `GuzzleHttp` | [v5][guzzle-5-repo] | [v5][guzzle-5-docs] | No    | >= 5.4      |
-| 6.x     | Latest     | `guzzlehttp/guzzle` | `GuzzleHttp` | [v6][guzzle-6-repo] | [v6][guzzle-6-docs] | Yes   | >= 5.5      |
-
-[guzzle-3-repo]: https://github.com/guzzle/guzzle3
-[guzzle-4-repo]: https://github.com/guzzle/guzzle/tree/4.x
-[guzzle-5-repo]: https://github.com/guzzle/guzzle/tree/5.3
-[guzzle-6-repo]: https://github.com/guzzle/guzzle
-[guzzle-3-docs]: http://guzzle3.readthedocs.org/en/latest/
-[guzzle-5-docs]: http://guzzle.readthedocs.org/en/5.3/
-[guzzle-6-docs]: http://guzzle.readthedocs.org/en/latest/
diff --git a/mayor-orig/www/include/share/googleapi/guzzlehttp/guzzle/UPGRADING.md b/mayor-orig/www/include/share/googleapi/guzzlehttp/guzzle/UPGRADING.md
deleted file mode 100644
index 91d1dcc9..00000000
--- a/mayor-orig/www/include/share/googleapi/guzzlehttp/guzzle/UPGRADING.md
+++ /dev/null
@@ -1,1203 +0,0 @@
-Guzzle Upgrade Guide
-====================
-
-5.0 to 6.0
-----------
-
-Guzzle now uses [PSR-7](http://www.php-fig.org/psr/psr-7/) for HTTP messages.
-Due to the fact that these messages are immutable, this prompted a refactoring
-of Guzzle to use a middleware based system rather than an event system. Any
-HTTP message interaction (e.g., `GuzzleHttp\Message\Request`) need to be
-updated to work with the new immutable PSR-7 request and response objects. Any
-event listeners or subscribers need to be updated to become middleware
-functions that wrap handlers (or are injected into a
-`GuzzleHttp\HandlerStack`).
-
-- Removed `GuzzleHttp\BatchResults`
-- Removed `GuzzleHttp\Collection`
-- Removed `GuzzleHttp\HasDataTrait`
-- Removed `GuzzleHttp\ToArrayInterface`
-- The `guzzlehttp/streams` dependency has been removed. Stream functionality
-  is now present in the `GuzzleHttp\Psr7` namespace provided by the
-  `guzzlehttp/psr7` package.
-- Guzzle no longer uses ReactPHP promises and now uses the
-  `guzzlehttp/promises` library. We use a custom promise library for three
-  significant reasons:
-  1. React promises (at the time of writing this) are recursive. Promise
-     chaining and promise resolution will eventually blow the stack. Guzzle
-     promises are not recursive as they use a sort of trampolining technique.
-     Note: there has been movement in the React project to modify promises to
-     no longer utilize recursion.
-  2. Guzzle needs to have the ability to synchronously block on a promise to
-     wait for a result. Guzzle promises allows this functionality (and does
-     not require the use of recursion).
-  3. Because we need to be able to wait on a result, doing so using React
-     promises requires wrapping react promises with RingPHP futures. This
-     overhead is no longer needed, reducing stack sizes, reducing complexity,
-     and improving performance.
-- `GuzzleHttp\Mimetypes` has been moved to a function in
-  `GuzzleHttp\Psr7\mimetype_from_extension` and
-  `GuzzleHttp\Psr7\mimetype_from_filename`.
-- `GuzzleHttp\Query` and `GuzzleHttp\QueryParser` have been removed. Query
-  strings must now be passed into request objects as strings, or provided to
-  the `query` request option when creating requests with clients. The `query`
-  option uses PHP's `http_build_query` to convert an array to a string. If you
-  need a different serialization technique, you will need to pass the query
-  string in as a string. There are a couple helper functions that will make
-  working with query strings easier: `GuzzleHttp\Psr7\parse_query` and
-  `GuzzleHttp\Psr7\build_query`.
-- Guzzle no longer has a dependency on RingPHP. Due to the use of a middleware
-  system based on PSR-7, using RingPHP and it's middleware system as well adds
-  more complexity than the benefits it provides. All HTTP handlers that were
-  present in RingPHP have been modified to work directly with PSR-7 messages
-  and placed in the `GuzzleHttp\Handler` namespace. This significantly reduces
-  complexity in Guzzle, removes a dependency, and improves performance. RingPHP
-  will be maintained for Guzzle 5 support, but will no longer be a part of
-  Guzzle 6.
-- As Guzzle now uses a middleware based systems the event system and RingPHP
-  integration has been removed. Note: while the event system has been removed,
-  it is possible to add your own type of event system that is powered by the
-  middleware system.
-  - Removed the `Event` namespace.
-  - Removed the `Subscriber` namespace.
-  - Removed `Transaction` class
-  - Removed `RequestFsm`
-  - Removed `RingBridge`
-  - `GuzzleHttp\Subscriber\Cookie` is now provided by
-    `GuzzleHttp\Middleware::cookies`
-  - `GuzzleHttp\Subscriber\HttpError` is now provided by
-    `GuzzleHttp\Middleware::httpError`
-  - `GuzzleHttp\Subscriber\History` is now provided by
-    `GuzzleHttp\Middleware::history`
-  - `GuzzleHttp\Subscriber\Mock` is now provided by
-    `GuzzleHttp\Handler\MockHandler`
-  - `GuzzleHttp\Subscriber\Prepare` is now provided by
-    `GuzzleHttp\PrepareBodyMiddleware`
-  - `GuzzleHttp\Subscriber\Redirect` is now provided by
-    `GuzzleHttp\RedirectMiddleware`
-- Guzzle now uses `Psr\Http\Message\UriInterface` (implements in
-  `GuzzleHttp\Psr7\Uri`) for URI support. `GuzzleHttp\Url` is now gone.
-- Static functions in `GuzzleHttp\Utils` have been moved to namespaced
-  functions under the `GuzzleHttp` namespace. This requires either a Composer
-  based autoloader or you to include functions.php.
-- `GuzzleHttp\ClientInterface::getDefaultOption` has been renamed to
-  `GuzzleHttp\ClientInterface::getConfig`.
-- `GuzzleHttp\ClientInterface::setDefaultOption` has been removed.
-- The `json` and `xml` methods of response objects has been removed. With the
-  migration to strictly adhering to PSR-7 as the interface for Guzzle messages,
-  adding methods to message interfaces would actually require Guzzle messages
-  to extend from PSR-7 messages rather then work with them directly.
-
-## Migrating to middleware
-
-The change to PSR-7 unfortunately required significant refactoring to Guzzle
-due to the fact that PSR-7 messages are immutable. Guzzle 5 relied on an event
-system from plugins. The event system relied on mutability of HTTP messages and
-side effects in order to work. With immutable messages, you have to change your
-workflow to become more about either returning a value (e.g., functional
-middlewares) or setting a value on an object. Guzzle v6 has chosen the
-functional middleware approach.
-
-Instead of using the event system to listen for things like the `before` event,
-you now create a stack based middleware function that intercepts a request on
-the way in and the promise of the response on the way out. This is a much
-simpler and more predictable approach than the event system and works nicely
-with PSR-7 middleware. Due to the use of promises, the middleware system is
-also asynchronous.
-
-v5:
-
-```php
-use GuzzleHttp\Event\BeforeEvent;
-$client = new GuzzleHttp\Client();
-// Get the emitter and listen to the before event.
-$client->getEmitter()->on('before', function (BeforeEvent $e) {
-    // Guzzle v5 events relied on mutation
-    $e->getRequest()->setHeader('X-Foo', 'Bar');
-});
-```
-
-v6:
-
-In v6, you can modify the request before it is sent using the `mapRequest`
-middleware. The idiomatic way in v6 to modify the request/response lifecycle is
-to setup a handler middleware stack up front and inject the handler into a
-client.
-
-```php
-use GuzzleHttp\Middleware;
-// Create a handler stack that has all of the default middlewares attached
-$handler = GuzzleHttp\HandlerStack::create();
-// Push the handler onto the handler stack
-$handler->push(Middleware::mapRequest(function (RequestInterface $request) {
-    // Notice that we have to return a request object
-    return $request->withHeader('X-Foo', 'Bar');
-}));
-// Inject the handler into the client
-$client = new GuzzleHttp\Client(['handler' => $handler]);
-```
-
-## POST Requests
-
-This version added the [`form_params`](http://guzzle.readthedocs.org/en/latest/request-options.html#form_params)
-and `multipart` request options. `form_params` is an associative array of
-strings or array of strings and is used to serialize an
-`application/x-www-form-urlencoded` POST request. The
-[`multipart`](http://guzzle.readthedocs.org/en/latest/request-options.html#multipart)
-option is now used to send a multipart/form-data POST request.
-
-`GuzzleHttp\Post\PostFile` has been removed. Use the `multipart` option to add
-POST files to a multipart/form-data request.
-
-The `body` option no longer accepts an array to send POST requests. Please use
-`multipart` or `form_params` instead.
-
-The `base_url` option has been renamed to `base_uri`.
-
-4.x to 5.0
-----------
-
-## Rewritten Adapter Layer
-
-Guzzle now uses [RingPHP](http://ringphp.readthedocs.org/en/latest) to send
-HTTP requests. The `adapter` option in a `GuzzleHttp\Client` constructor
-is still supported, but it has now been renamed to `handler`. Instead of
-passing a `GuzzleHttp\Adapter\AdapterInterface`, you must now pass a PHP
-`callable` that follows the RingPHP specification.
-
-## Removed Fluent Interfaces
-
-[Fluent interfaces were removed](http://ocramius.github.io/blog/fluent-interfaces-are-evil)
-from the following classes:
-
-- `GuzzleHttp\Collection`
-- `GuzzleHttp\Url`
-- `GuzzleHttp\Query`
-- `GuzzleHttp\Post\PostBody`
-- `GuzzleHttp\Cookie\SetCookie`
-
-## Removed functions.php
-
-Removed "functions.php", so that Guzzle is truly PSR-4 compliant. The following
-functions can be used as replacements.
-
-- `GuzzleHttp\json_decode` -> `GuzzleHttp\Utils::jsonDecode`
-- `GuzzleHttp\get_path` -> `GuzzleHttp\Utils::getPath`
-- `GuzzleHttp\Utils::setPath` -> `GuzzleHttp\set_path`
-- `GuzzleHttp\Pool::batch` -> `GuzzleHttp\batch`. This function is, however,
-  deprecated in favor of using `GuzzleHttp\Pool::batch()`.
-
-The "procedural" global client has been removed with no replacement (e.g.,
-`GuzzleHttp\get()`, `GuzzleHttp\post()`, etc.). Use a `GuzzleHttp\Client`
-object as a replacement.
-
-## `throwImmediately` has been removed
-
-The concept of "throwImmediately" has been removed from exceptions and error
-events. This control mechanism was used to stop a transfer of concurrent
-requests from completing. This can now be handled by throwing the exception or
-by cancelling a pool of requests or each outstanding future request
-individually.
-
-## headers event has been removed
-
-Removed the "headers" event. This event was only useful for changing the
-body a response once the headers of the response were known. You can implement
-a similar behavior in a number of ways. One example might be to use a
-FnStream that has access to the transaction being sent. For example, when the
-first byte is written, you could check if the response headers match your
-expectations, and if so, change the actual stream body that is being
-written to.
-
-## Updates to HTTP Messages
-
-Removed the `asArray` parameter from
-`GuzzleHttp\Message\MessageInterface::getHeader`. If you want to get a header
-value as an array, then use the newly added `getHeaderAsArray()` method of
-`MessageInterface`. This change makes the Guzzle interfaces compatible with
-the PSR-7 interfaces.
-
-3.x to 4.0
-----------
-
-## Overarching changes:
-
-- Now requires PHP 5.4 or greater.
-- No longer requires cURL to send requests.
-- Guzzle no longer wraps every exception it throws. Only exceptions that are
-  recoverable are now wrapped by Guzzle.
-- Various namespaces have been removed or renamed.
-- No longer requiring the Symfony EventDispatcher. A custom event dispatcher
-  based on the Symfony EventDispatcher is
-  now utilized in `GuzzleHttp\Event\EmitterInterface` (resulting in significant
-  speed and functionality improvements).
-
-Changes per Guzzle 3.x namespace are described below.
-
-## Batch
-
-The `Guzzle\Batch` namespace has been removed. This is best left to
-third-parties to implement on top of Guzzle's core HTTP library.
-
-## Cache
-
-The `Guzzle\Cache` namespace has been removed. (Todo: No suitable replacement
-has been implemented yet, but hoping to utilize a PSR cache interface).
-
-## Common
-
-- Removed all of the wrapped exceptions. It's better to use the standard PHP
-  library for unrecoverable exceptions.
-- `FromConfigInterface` has been removed.
-- `Guzzle\Common\Version` has been removed. The VERSION constant can be found
-  at `GuzzleHttp\ClientInterface::VERSION`.
-
-### Collection
-
-- `getAll` has been removed. Use `toArray` to convert a collection to an array.
-- `inject` has been removed.
-- `keySearch` has been removed.
-- `getPath` no longer supports wildcard expressions. Use something better like
-  JMESPath for this.
-- `setPath` now supports appending to an existing array via the `[]` notation.
-
-### Events
-
-Guzzle no longer requires Symfony's EventDispatcher component. Guzzle now uses
-`GuzzleHttp\Event\Emitter`.
-
-- `Symfony\Component\EventDispatcher\EventDispatcherInterface` is replaced by
-  `GuzzleHttp\Event\EmitterInterface`.
-- `Symfony\Component\EventDispatcher\EventDispatcher` is replaced by
-  `GuzzleHttp\Event\Emitter`.
-- `Symfony\Component\EventDispatcher\Event` is replaced by
-  `GuzzleHttp\Event\Event`, and Guzzle now has an EventInterface in
-  `GuzzleHttp\Event\EventInterface`.
-- `AbstractHasDispatcher` has moved to a trait, `HasEmitterTrait`, and
-  `HasDispatcherInterface` has moved to `HasEmitterInterface`. Retrieving the
-  event emitter of a request, client, etc. now uses the `getEmitter` method
-  rather than the `getDispatcher` method.
-
-#### Emitter
-
-- Use the `once()` method to add a listener that automatically removes itself
-  the first time it is invoked.
-- Use the `listeners()` method to retrieve a list of event listeners rather than
-  the `getListeners()` method.
-- Use `emit()` instead of `dispatch()` to emit an event from an emitter.
-- Use `attach()` instead of `addSubscriber()` and `detach()` instead of
-  `removeSubscriber()`.
-
-```php
-$mock = new Mock();
-// 3.x
-$request->getEventDispatcher()->addSubscriber($mock);
-$request->getEventDispatcher()->removeSubscriber($mock);
-// 4.x
-$request->getEmitter()->attach($mock);
-$request->getEmitter()->detach($mock);
-```
-
-Use the `on()` method to add a listener rather than the `addListener()` method.
-
-```php
-// 3.x
-$request->getEventDispatcher()->addListener('foo', function (Event $event) { /* ... */ } );
-// 4.x
-$request->getEmitter()->on('foo', function (Event $event, $name) { /* ... */ } );
-```
-
-## Http
-
-### General changes
-
-- The cacert.pem certificate has been moved to `src/cacert.pem`.
-- Added the concept of adapters that are used to transfer requests over the
-  wire.
-- Simplified the event system.
-- Sending requests in parallel is still possible, but batching is no longer a
-  concept of the HTTP layer. Instead, you must use the `complete` and `error`
-  events to asynchronously manage parallel request transfers.
-- `Guzzle\Http\Url` has moved to `GuzzleHttp\Url`.
-- `Guzzle\Http\QueryString` has moved to `GuzzleHttp\Query`.
-- QueryAggregators have been rewritten so that they are simply callable
-  functions.
-- `GuzzleHttp\StaticClient` has been removed. Use the functions provided in
-  `functions.php` for an easy to use static client instance.
-- Exceptions in `GuzzleHttp\Exception` have been updated to all extend from
-  `GuzzleHttp\Exception\TransferException`.
-
-### Client
-
-Calling methods like `get()`, `post()`, `head()`, etc. no longer create and
-return a request, but rather creates a request, sends the request, and returns
-the response.
-
-```php
-// 3.0
-$request = $client->get('/');
-$response = $request->send();
-
-// 4.0
-$response = $client->get('/');
-
-// or, to mirror the previous behavior
-$request = $client->createRequest('GET', '/');
-$response = $client->send($request);
-```
-
-`GuzzleHttp\ClientInterface` has changed.
-
-- The `send` method no longer accepts more than one request. Use `sendAll` to
-  send multiple requests in parallel.
-- `setUserAgent()` has been removed. Use a default request option instead. You
-  could, for example, do something like:
-  `$client->setConfig('defaults/headers/User-Agent', 'Foo/Bar ' . $client::getDefaultUserAgent())`.
-- `setSslVerification()` has been removed. Use default request options instead,
-  like `$client->setConfig('defaults/verify', true)`.
-
-`GuzzleHttp\Client` has changed.
-
-- The constructor now accepts only an associative array. You can include a
-  `base_url` string or array to use a URI template as the base URL of a client.
-  You can also specify a `defaults` key that is an associative array of default
-  request options. You can pass an `adapter` to use a custom adapter,
-  `batch_adapter` to use a custom adapter for sending requests in parallel, or
-  a `message_factory` to change the factory used to create HTTP requests and
-  responses.
-- The client no longer emits a `client.create_request` event.
-- Creating requests with a client no longer automatically utilize a URI
-  template. You must pass an array into a creational method (e.g.,
-  `createRequest`, `get`, `put`, etc.) in order to expand a URI template.
-
-### Messages
-
-Messages no longer have references to their counterparts (i.e., a request no
-longer has a reference to it's response, and a response no loger has a
-reference to its request). This association is now managed through a
-`GuzzleHttp\Adapter\TransactionInterface` object. You can get references to
-these transaction objects using request events that are emitted over the
-lifecycle of a request.
-
-#### Requests with a body
-
-- `GuzzleHttp\Message\EntityEnclosingRequest` and
-  `GuzzleHttp\Message\EntityEnclosingRequestInterface` have been removed. The
-  separation between requests that contain a body and requests that do not
-  contain a body has been removed, and now `GuzzleHttp\Message\RequestInterface`
-  handles both use cases.
-- Any method that previously accepts a `GuzzleHttp\Response` object now accept a
-  `GuzzleHttp\Message\ResponseInterface`.
-- `GuzzleHttp\Message\RequestFactoryInterface` has been renamed to
-  `GuzzleHttp\Message\MessageFactoryInterface`. This interface is used to create
-  both requests and responses and is implemented in
-  `GuzzleHttp\Message\MessageFactory`.
-- POST field and file methods have been removed from the request object. You
-  must now use the methods made available to `GuzzleHttp\Post\PostBodyInterface`
-  to control the format of a POST body. Requests that are created using a
-  standard `GuzzleHttp\Message\MessageFactoryInterface` will automatically use
-  a `GuzzleHttp\Post\PostBody` body if the body was passed as an array or if
-  the method is POST and no body is provided.
-
-```php
-$request = $client->createRequest('POST', '/');
-$request->getBody()->setField('foo', 'bar');
-$request->getBody()->addFile(new PostFile('file_key', fopen('/path/to/content', 'r')));
-```
-
-#### Headers
-
-- `GuzzleHttp\Message\Header` has been removed. Header values are now simply
-  represented by an array of values or as a string. Header values are returned
-  as a string by default when retrieving a header value from a message. You can
-  pass an optional argument of `true` to retrieve a header value as an array
-  of strings instead of a single concatenated string.
-- `GuzzleHttp\PostFile` and `GuzzleHttp\PostFileInterface` have been moved to
-  `GuzzleHttp\Post`. This interface has been simplified and now allows the
-  addition of arbitrary headers.
-- Custom headers like `GuzzleHttp\Message\Header\Link` have been removed. Most
-  of the custom headers are now handled separately in specific
-  subscribers/plugins, and `GuzzleHttp\Message\HeaderValues::parseParams()` has
-  been updated to properly handle headers that contain parameters (like the
-  `Link` header).
-
-#### Responses
-
-- `GuzzleHttp\Message\Response::getInfo()` and
-  `GuzzleHttp\Message\Response::setInfo()` have been removed. Use the event
-  system to retrieve this type of information.
-- `GuzzleHttp\Message\Response::getRawHeaders()` has been removed.
-- `GuzzleHttp\Message\Response::getMessage()` has been removed.
-- `GuzzleHttp\Message\Response::calculateAge()` and other cache specific
-  methods have moved to the CacheSubscriber.
-- Header specific helper functions like `getContentMd5()` have been removed.
-  Just use `getHeader('Content-MD5')` instead.
-- `GuzzleHttp\Message\Response::setRequest()` and
-  `GuzzleHttp\Message\Response::getRequest()` have been removed. Use the event
-  system to work with request and response objects as a transaction.
-- `GuzzleHttp\Message\Response::getRedirectCount()` has been removed. Use the
-  Redirect subscriber instead.
-- `GuzzleHttp\Message\Response::isSuccessful()` and other related methods have
-  been removed. Use `getStatusCode()` instead.
-
-#### Streaming responses
-
-Streaming requests can now be created by a client directly, returning a
-`GuzzleHttp\Message\ResponseInterface` object that contains a body stream
-referencing an open PHP HTTP stream.
-
-```php
-// 3.0
-use Guzzle\Stream\PhpStreamRequestFactory;
-$request = $client->get('/');
-$factory = new PhpStreamRequestFactory();
-$stream = $factory->fromRequest($request);
-$data = $stream->read(1024);
-
-// 4.0
-$response = $client->get('/', ['stream' => true]);
-// Read some data off of the stream in the response body
-$data = $response->getBody()->read(1024);
-```
-
-#### Redirects
-
-The `configureRedirects()` method has been removed in favor of a
-`allow_redirects` request option.
-
-```php
-// Standard redirects with a default of a max of 5 redirects
-$request = $client->createRequest('GET', '/', ['allow_redirects' => true]);
-
-// Strict redirects with a custom number of redirects
-$request = $client->createRequest('GET', '/', [
-    'allow_redirects' => ['max' => 5, 'strict' => true]
-]);
-```
-
-#### EntityBody
-
-EntityBody interfaces and classes have been removed or moved to
-`GuzzleHttp\Stream`. All classes and interfaces that once required
-`GuzzleHttp\EntityBodyInterface` now require
-`GuzzleHttp\Stream\StreamInterface`. Creating a new body for a request no
-longer uses `GuzzleHttp\EntityBody::factory` but now uses
-`GuzzleHttp\Stream\Stream::factory` or even better:
-`GuzzleHttp\Stream\create()`.
-
-- `Guzzle\Http\EntityBodyInterface` is now `GuzzleHttp\Stream\StreamInterface`
-- `Guzzle\Http\EntityBody` is now `GuzzleHttp\Stream\Stream`
-- `Guzzle\Http\CachingEntityBody` is now `GuzzleHttp\Stream\CachingStream`
-- `Guzzle\Http\ReadLimitEntityBody` is now `GuzzleHttp\Stream\LimitStream`
-- `Guzzle\Http\IoEmittyinEntityBody` has been removed.
-
-#### Request lifecycle events
-
-Requests previously submitted a large number of requests. The number of events
-emitted over the lifecycle of a request has been significantly reduced to make
-it easier to understand how to extend the behavior of a request. All events
-emitted during the lifecycle of a request now emit a custom
-`GuzzleHttp\Event\EventInterface` object that contains context providing
-methods and a way in which to modify the transaction at that specific point in
-time (e.g., intercept the request and set a response on the transaction).
-
-- `request.before_send` has been renamed to `before` and now emits a
-  `GuzzleHttp\Event\BeforeEvent`
-- `request.complete` has been renamed to `complete` and now emits a
-  `GuzzleHttp\Event\CompleteEvent`.
-- `request.sent` has been removed. Use `complete`.
-- `request.success` has been removed. Use `complete`.
-- `error` is now an event that emits a `GuzzleHttp\Event\ErrorEvent`.
-- `request.exception` has been removed. Use `error`.
-- `request.receive.status_line` has been removed.
-- `curl.callback.progress` has been removed. Use a custom `StreamInterface` to
-  maintain a status update.
-- `curl.callback.write` has been removed. Use a custom `StreamInterface` to
-  intercept writes.
-- `curl.callback.read` has been removed. Use a custom `StreamInterface` to
-  intercept reads.
-
-`headers` is a new event that is emitted after the response headers of a
-request have been received before the body of the response is downloaded. This
-event emits a `GuzzleHttp\Event\HeadersEvent`.
-
-You can intercept a request and inject a response using the `intercept()` event
-of a `GuzzleHttp\Event\BeforeEvent`, `GuzzleHttp\Event\CompleteEvent`, and
-`GuzzleHttp\Event\ErrorEvent` event.
-
-See: http://docs.guzzlephp.org/en/latest/events.html
-
-## Inflection
-
-The `Guzzle\Inflection` namespace has been removed. This is not a core concern
-of Guzzle.
-
-## Iterator
-
-The `Guzzle\Iterator` namespace has been removed.
-
-- `Guzzle\Iterator\AppendIterator`, `Guzzle\Iterator\ChunkedIterator`, and
-  `Guzzle\Iterator\MethodProxyIterator` are nice, but not a core requirement of
-  Guzzle itself.
-- `Guzzle\Iterator\FilterIterator` is no longer needed because an equivalent
-  class is shipped with PHP 5.4.
-- `Guzzle\Iterator\MapIterator` is not really needed when using PHP 5.5 because
-  it's easier to just wrap an iterator in a generator that maps values.
-
-For a replacement of these iterators, see https://github.com/nikic/iter
-
-## Log
-
-The LogPlugin has moved to https://github.com/guzzle/log-subscriber. The
-`Guzzle\Log` namespace has been removed. Guzzle now relies on
-`Psr\Log\LoggerInterface` for all logging. The MessageFormatter class has been
-moved to `GuzzleHttp\Subscriber\Log\Formatter`.
-
-## Parser
-
-The `Guzzle\Parser` namespace has been removed. This was previously used to
-make it possible to plug in custom parsers for cookies, messages, URI
-templates, and URLs; however, this level of complexity is not needed in Guzzle
-so it has been removed.
-
-- Cookie: Cookie parsing logic has been moved to
-  `GuzzleHttp\Cookie\SetCookie::fromString`.
-- Message: Message parsing logic for both requests and responses has been moved
-  to `GuzzleHttp\Message\MessageFactory::fromMessage`. Message parsing is only
-  used in debugging or deserializing messages, so it doesn't make sense for
-  Guzzle as a library to add this level of complexity to parsing messages.
-- UriTemplate: URI template parsing has been moved to
-  `GuzzleHttp\UriTemplate`. The Guzzle library will automatically use the PECL
-  URI template library if it is installed.
-- Url: URL parsing is now performed in `GuzzleHttp\Url::fromString` (previously
-  it was `Guzzle\Http\Url::factory()`). If custom URL parsing is necessary,
-  then developers are free to subclass `GuzzleHttp\Url`.
-
-## Plugin
-
-The `Guzzle\Plugin` namespace has been renamed to `GuzzleHttp\Subscriber`.
-Several plugins are shipping with the core Guzzle library under this namespace.
-
-- `GuzzleHttp\Subscriber\Cookie`: Replaces the old CookiePlugin. Cookie jar
-  code has moved to `GuzzleHttp\Cookie`.
-- `GuzzleHttp\Subscriber\History`: Replaces the old HistoryPlugin.
-- `GuzzleHttp\Subscriber\HttpError`: Throws errors when a bad HTTP response is
-  received.
-- `GuzzleHttp\Subscriber\Mock`: Replaces the old MockPlugin.
-- `GuzzleHttp\Subscriber\Prepare`: Prepares the body of a request just before
-  sending. This subscriber is attached to all requests by default.
-- `GuzzleHttp\Subscriber\Redirect`: Replaces the RedirectPlugin.
-
-The following plugins have been removed (third-parties are free to re-implement
-these if needed):
-
-- `GuzzleHttp\Plugin\Async` has been removed.
-- `GuzzleHttp\Plugin\CurlAuth` has been removed.
-- `GuzzleHttp\Plugin\ErrorResponse\ErrorResponsePlugin` has been removed. This
-  functionality should instead be implemented with event listeners that occur
-  after normal response parsing occurs in the guzzle/command package.
-
-The following plugins are not part of the core Guzzle package, but are provided
-in separate repositories:
-
-- `Guzzle\Http\Plugin\BackoffPlugin` has been rewritten to be much simpler
-  to build custom retry policies using simple functions rather than various
-  chained classes. See: https://github.com/guzzle/retry-subscriber
-- `Guzzle\Http\Plugin\Cache\CachePlugin` has moved to
-  https://github.com/guzzle/cache-subscriber
-- `Guzzle\Http\Plugin\Log\LogPlugin` has moved to
-  https://github.com/guzzle/log-subscriber
-- `Guzzle\Http\Plugin\Md5\Md5Plugin` has moved to
-  https://github.com/guzzle/message-integrity-subscriber
-- `Guzzle\Http\Plugin\Mock\MockPlugin` has moved to
-  `GuzzleHttp\Subscriber\MockSubscriber`.
-- `Guzzle\Http\Plugin\Oauth\OauthPlugin` has moved to
-  https://github.com/guzzle/oauth-subscriber
-
-## Service
-
-The service description layer of Guzzle has moved into two separate packages:
-
-- http://github.com/guzzle/command Provides a high level abstraction over web
-  services by representing web service operations using commands.
-- http://github.com/guzzle/guzzle-services Provides an implementation of
-  guzzle/command that provides request serialization and response parsing using
-  Guzzle service descriptions.
-
-## Stream
-
-Stream have moved to a separate package available at
-https://github.com/guzzle/streams.
-
-`Guzzle\Stream\StreamInterface` has been given a large update to cleanly take
-on the responsibilities of `Guzzle\Http\EntityBody` and
-`Guzzle\Http\EntityBodyInterface` now that they have been removed. The number
-of methods implemented by the `StreamInterface` has been drastically reduced to
-allow developers to more easily extend and decorate stream behavior.
-
-## Removed methods from StreamInterface
-
-- `getStream` and `setStream` have been removed to better encapsulate streams.
-- `getMetadata` and `setMetadata` have been removed in favor of
-  `GuzzleHttp\Stream\MetadataStreamInterface`.
-- `getWrapper`, `getWrapperData`, `getStreamType`, and `getUri` have all been
-  removed. This data is accessible when
-  using streams that implement `GuzzleHttp\Stream\MetadataStreamInterface`.
-- `rewind` has been removed. Use `seek(0)` for a similar behavior.
-
-## Renamed methods
-
-- `detachStream` has been renamed to `detach`.
-- `feof` has been renamed to `eof`.
-- `ftell` has been renamed to `tell`.
-- `readLine` has moved from an instance method to a static class method of
-  `GuzzleHttp\Stream\Stream`.
-
-## Metadata streams
-
-`GuzzleHttp\Stream\MetadataStreamInterface` has been added to denote streams
-that contain additional metadata accessible via `getMetadata()`.
-`GuzzleHttp\Stream\StreamInterface::getMetadata` and
-`GuzzleHttp\Stream\StreamInterface::setMetadata` have been removed.
-
-## StreamRequestFactory
-
-The entire concept of the StreamRequestFactory has been removed. The way this
-was used in Guzzle 3 broke the actual interface of sending streaming requests
-(instead of getting back a Response, you got a StreamInterface). Streaming
-PHP requests are now implemented through the `GuzzleHttp\Adapter\StreamAdapter`.
-
-3.6 to 3.7
-----------
-
-### Deprecations
-
-- You can now enable E_USER_DEPRECATED warnings to see if you are using any deprecated methods.:
-
-```php
-\Guzzle\Common\Version::$emitWarnings = true;
-```
-
-The following APIs and options have been marked as deprecated:
-
-- Marked `Guzzle\Http\Message\Request::isResponseBodyRepeatable()` as deprecated. Use `$request->getResponseBody()->isRepeatable()` instead.
-- Marked `Guzzle\Http\Message\Request::canCache()` as deprecated. Use `Guzzle\Plugin\Cache\DefaultCanCacheStrategy->canCacheRequest()` instead.
-- Marked `Guzzle\Http\Message\Request::canCache()` as deprecated. Use `Guzzle\Plugin\Cache\DefaultCanCacheStrategy->canCacheRequest()` instead.
-- Marked `Guzzle\Http\Message\Request::setIsRedirect()` as deprecated. Use the HistoryPlugin instead.
-- Marked `Guzzle\Http\Message\Request::isRedirect()` as deprecated. Use the HistoryPlugin instead.
-- Marked `Guzzle\Cache\CacheAdapterFactory::factory()` as deprecated
-- Marked `Guzzle\Service\Client::enableMagicMethods()` as deprecated. Magic methods can no longer be disabled on a Guzzle\Service\Client.
-- Marked `Guzzle\Parser\Url\UrlParser` as deprecated. Just use PHP's `parse_url()` and percent encode your UTF-8.
-- Marked `Guzzle\Common\Collection::inject()` as deprecated.
-- Marked `Guzzle\Plugin\CurlAuth\CurlAuthPlugin` as deprecated. Use
-  `$client->getConfig()->setPath('request.options/auth', array('user', 'pass', 'Basic|Digest|NTLM|Any'));` or
-  `$client->setDefaultOption('auth', array('user', 'pass', 'Basic|Digest|NTLM|Any'));`
-
-3.7 introduces `request.options` as a parameter for a client configuration and as an optional argument to all creational
-request methods. When paired with a client's configuration settings, these options allow you to specify default settings
-for various aspects of a request. Because these options make other previous configuration options redundant, several
-configuration options and methods of a client and AbstractCommand have been deprecated.
-
-- Marked `Guzzle\Service\Client::getDefaultHeaders()` as deprecated. Use `$client->getDefaultOption('headers')`.
-- Marked `Guzzle\Service\Client::setDefaultHeaders()` as deprecated. Use `$client->setDefaultOption('headers/{header_name}', 'value')`.
-- Marked 'request.params' for `Guzzle\Http\Client` as deprecated. Use `$client->setDefaultOption('params/{param_name}', 'value')`
-- Marked 'command.headers', 'command.response_body' and 'command.on_complete' as deprecated for AbstractCommand. These will work through Guzzle 4.0
-
-        $command = $client->getCommand('foo', array(
-            'command.headers' => array('Test' => '123'),
-            'command.response_body' => '/path/to/file'
-        ));
-
-        // Should be changed to:
-
-        $command = $client->getCommand('foo', array(
-            'command.request_options' => array(
-                'headers' => array('Test' => '123'),
-                'save_as' => '/path/to/file'
-            )
-        ));
-
-### Interface changes
-
-Additions and changes (you will need to update any implementations or subclasses you may have created):
-
-- Added an `$options` argument to the end of the following methods of `Guzzle\Http\ClientInterface`:
-  createRequest, head, delete, put, patch, post, options, prepareRequest
-- Added an `$options` argument to the end of `Guzzle\Http\Message\Request\RequestFactoryInterface::createRequest()`
-- Added an `applyOptions()` method to `Guzzle\Http\Message\Request\RequestFactoryInterface`
-- Changed `Guzzle\Http\ClientInterface::get($uri = null, $headers = null, $body = null)` to
-  `Guzzle\Http\ClientInterface::get($uri = null, $headers = null, $options = array())`. You can still pass in a
-  resource, string, or EntityBody into the $options parameter to specify the download location of the response.
-- Changed `Guzzle\Common\Collection::__construct($data)` to no longer accepts a null value for `$data` but a
-  default `array()`
-- Added `Guzzle\Stream\StreamInterface::isRepeatable`
-- Made `Guzzle\Http\Client::expandTemplate` and `getUriTemplate` protected methods.
-
-The following methods were removed from interfaces. All of these methods are still available in the concrete classes
-that implement them, but you should update your code to use alternative methods:
-
-- Removed `Guzzle\Http\ClientInterface::setDefaultHeaders(). Use
-  `$client->getConfig()->setPath('request.options/headers/{header_name}', 'value')`. or
-  `$client->getConfig()->setPath('request.options/headers', array('header_name' => 'value'))` or
-  `$client->setDefaultOption('headers/{header_name}', 'value')`. or
-  `$client->setDefaultOption('headers', array('header_name' => 'value'))`.
-- Removed `Guzzle\Http\ClientInterface::getDefaultHeaders(). Use `$client->getConfig()->getPath('request.options/headers')`.
-- Removed `Guzzle\Http\ClientInterface::expandTemplate()`. This is an implementation detail.
-- Removed `Guzzle\Http\ClientInterface::setRequestFactory()`. This is an implementation detail.
-- Removed `Guzzle\Http\ClientInterface::getCurlMulti()`. This is a very specific implementation detail.
-- Removed `Guzzle\Http\Message\RequestInterface::canCache`. Use the CachePlugin.
-- Removed `Guzzle\Http\Message\RequestInterface::setIsRedirect`. Use the HistoryPlugin.
-- Removed `Guzzle\Http\Message\RequestInterface::isRedirect`. Use the HistoryPlugin.
-
-### Cache plugin breaking changes
-
-- CacheKeyProviderInterface and DefaultCacheKeyProvider are no longer used. All of this logic is handled in a
-  CacheStorageInterface. These two objects and interface will be removed in a future version.
-- Always setting X-cache headers on cached responses
-- Default cache TTLs are now handled by the CacheStorageInterface of a CachePlugin
-- `CacheStorageInterface::cache($key, Response $response, $ttl = null)` has changed to `cache(RequestInterface
-  $request, Response $response);`
-- `CacheStorageInterface::fetch($key)` has changed to `fetch(RequestInterface $request);`
-- `CacheStorageInterface::delete($key)` has changed to `delete(RequestInterface $request);`
-- Added `CacheStorageInterface::purge($url)`
-- `DefaultRevalidation::__construct(CacheKeyProviderInterface $cacheKey, CacheStorageInterface $cache, CachePlugin
-  $plugin)` has changed to `DefaultRevalidation::__construct(CacheStorageInterface $cache,
-  CanCacheStrategyInterface $canCache = null)`
-- Added `RevalidationInterface::shouldRevalidate(RequestInterface $request, Response $response)`
-
-3.5 to 3.6
-----------
-
-* Mixed casing of headers are now forced to be a single consistent casing across all values for that header.
-* Messages internally use a HeaderCollection object to delegate handling case-insensitive header resolution
-* Removed the whole changedHeader() function system of messages because all header changes now go through addHeader().
-  For example, setHeader() first removes the header using unset on a HeaderCollection and then calls addHeader().
-  Keeping the Host header and URL host in sync is now handled by overriding the addHeader method in Request.
-* Specific header implementations can be created for complex headers. When a message creates a header, it uses a
-  HeaderFactory which can map specific headers to specific header classes. There is now a Link header and
-  CacheControl header implementation.
-* Moved getLinks() from Response to just be used on a Link header object.
-
-If you previously relied on Guzzle\Http\Message\Header::raw(), then you will need to update your code to use the
-HeaderInterface (e.g. toArray(), getAll(), etc.).
-
-### Interface changes
-
-* Removed from interface: Guzzle\Http\ClientInterface::setUriTemplate
-* Removed from interface: Guzzle\Http\ClientInterface::setCurlMulti()
-* Removed Guzzle\Http\Message\Request::receivedRequestHeader() and implemented this functionality in
-  Guzzle\Http\Curl\RequestMediator
-* Removed the optional $asString parameter from MessageInterface::getHeader(). Just cast the header to a string.
-* Removed the optional $tryChunkedTransfer option from Guzzle\Http\Message\EntityEnclosingRequestInterface
-* Removed the $asObjects argument from Guzzle\Http\Message\MessageInterface::getHeaders()
-
-### Removed deprecated functions
-
-* Removed Guzzle\Parser\ParserRegister::get(). Use getParser()
-* Removed Guzzle\Parser\ParserRegister::set(). Use registerParser().
-
-### Deprecations
-
-* The ability to case-insensitively search for header values
-* Guzzle\Http\Message\Header::hasExactHeader
-* Guzzle\Http\Message\Header::raw. Use getAll()
-* Deprecated cache control specific methods on Guzzle\Http\Message\AbstractMessage. Use the CacheControl header object
-  instead.
-
-### Other changes
-
-* All response header helper functions return a string rather than mixing Header objects and strings inconsistently
-* Removed cURL blacklist support. This is no longer necessary now that Expect, Accept, etc. are managed by Guzzle
-  directly via interfaces
-* Removed the injecting of a request object onto a response object. The methods to get and set a request still exist
-  but are a no-op until removed.
-* Most classes that used to require a `Guzzle\Service\Command\CommandInterface` typehint now request a
-  `Guzzle\Service\Command\ArrayCommandInterface`.
-* Added `Guzzle\Http\Message\RequestInterface::startResponse()` to the RequestInterface to handle injecting a response
-  on a request while the request is still being transferred
-* `Guzzle\Service\Command\CommandInterface` now extends from ToArrayInterface and ArrayAccess
-
-3.3 to 3.4
-----------
-
-Base URLs of a client now follow the rules of http://tools.ietf.org/html/rfc3986#section-5.2.2 when merging URLs.
-
-3.2 to 3.3
-----------
-
-### Response::getEtag() quote stripping removed
-
-`Guzzle\Http\Message\Response::getEtag()` no longer strips quotes around the ETag response header
-
-### Removed `Guzzle\Http\Utils`
-
-The `Guzzle\Http\Utils` class was removed. This class was only used for testing.
-
-### Stream wrapper and type
-
-`Guzzle\Stream\Stream::getWrapper()` and `Guzzle\Stream\Stream::getStreamType()` are no longer converted to lowercase.
-
-### curl.emit_io became emit_io
-
-Emitting IO events from a RequestMediator is now a parameter that must be set in a request's curl options using the
-'emit_io' key. This was previously set under a request's parameters using 'curl.emit_io'
-
-3.1 to 3.2
-----------
-
-### CurlMulti is no longer reused globally
-
-Before 3.2, the same CurlMulti object was reused globally for each client. This can cause issue where plugins added
-to a single client can pollute requests dispatched from other clients.
-
-If you still wish to reuse the same CurlMulti object with each client, then you can add a listener to the
-ServiceBuilder's `service_builder.create_client` event to inject a custom CurlMulti object into each client as it is
-created.
-
-```php
-$multi = new Guzzle\Http\Curl\CurlMulti();
-$builder = Guzzle\Service\Builder\ServiceBuilder::factory('/path/to/config.json');
-$builder->addListener('service_builder.create_client', function ($event) use ($multi) {
-    $event['client']->setCurlMulti($multi);
-}
-});
-```
-
-### No default path
-
-URLs no longer have a default path value of '/' if no path was specified.
-
-Before:
-
-```php
-$request = $client->get('http://www.foo.com');
-echo $request->getUrl();
-// >> http://www.foo.com/
-```
-
-After:
-
-```php
-$request = $client->get('http://www.foo.com');
-echo $request->getUrl();
-// >> http://www.foo.com
-```
-
-### Less verbose BadResponseException
-
-The exception message for `Guzzle\Http\Exception\BadResponseException` no longer contains the full HTTP request and
-response information. You can, however, get access to the request and response object by calling `getRequest()` or
-`getResponse()` on the exception object.
-
-### Query parameter aggregation
-
-Multi-valued query parameters are no longer aggregated using a callback function. `Guzzle\Http\Query` now has a
-setAggregator() method that accepts a `Guzzle\Http\QueryAggregator\QueryAggregatorInterface` object. This object is
-responsible for handling the aggregation of multi-valued query string variables into a flattened hash.
-
-2.8 to 3.x
-----------
-
-### Guzzle\Service\Inspector
-
-Change `\Guzzle\Service\Inspector::fromConfig` to `\Guzzle\Common\Collection::fromConfig`
-
-**Before**
-
-```php
-use Guzzle\Service\Inspector;
-
-class YourClient extends \Guzzle\Service\Client
-{
-    public static function factory($config = array())
-    {
-        $default = array();
-        $required = array('base_url', 'username', 'api_key');
-        $config = Inspector::fromConfig($config, $default, $required);
-
-        $client = new self(
-            $config->get('base_url'),
-            $config->get('username'),
-            $config->get('api_key')
-        );
-        $client->setConfig($config);
-
-        $client->setDescription(ServiceDescription::factory(__DIR__ . DIRECTORY_SEPARATOR . 'client.json'));
-
-        return $client;
-    }
-```
-
-**After**
-
-```php
-use Guzzle\Common\Collection;
-
-class YourClient extends \Guzzle\Service\Client
-{
-    public static function factory($config = array())
-    {
-        $default = array();
-        $required = array('base_url', 'username', 'api_key');
-        $config = Collection::fromConfig($config, $default, $required);
-
-        $client = new self(
-            $config->get('base_url'),
-            $config->get('username'),
-            $config->get('api_key')
-        );
-        $client->setConfig($config);
-
-        $client->setDescription(ServiceDescription::factory(__DIR__ . DIRECTORY_SEPARATOR . 'client.json'));
-
-        return $client;
-    }
-```
-
-### Convert XML Service Descriptions to JSON
-
-**Before**
-
-```xml
-
-
-    
-        
-        
-            Get a list of groups
-        
-        
-            Uses a search query to get a list of groups
-            
-        
-        
-            Create a group
-            
-            
-        
-        
-            Delete a group by ID
-            
-        
-        
-            
-        
-        
-            Update a group
-            
-            
-            
-        
-    
-
-```
-
-**After**
-
-```json
-{
-    "name":       "Zendesk REST API v2",
-    "apiVersion": "2012-12-31",
-    "description":"Provides access to Zendesk views, groups, tickets, ticket fields, and users",
-    "operations": {
-        "list_groups":  {
-            "httpMethod":"GET",
-            "uri":       "groups.json",
-            "summary":   "Get a list of groups"
-        },
-        "search_groups":{
-            "httpMethod":"GET",
-            "uri":       "search.json?query=\"{query} type:group\"",
-            "summary":   "Uses a search query to get a list of groups",
-            "parameters":{
-                "query":{
-                    "location":   "uri",
-                    "description":"Zendesk Search Query",
-                    "type":       "string",
-                    "required":   true
-                }
-            }
-        },
-        "create_group": {
-            "httpMethod":"POST",
-            "uri":       "groups.json",
-            "summary":   "Create a group",
-            "parameters":{
-                "data":        {
-                    "type":       "array",
-                    "location":   "body",
-                    "description":"Group JSON",
-                    "filters":    "json_encode",
-                    "required":   true
-                },
-                "Content-Type":{
-                    "type":    "string",
-                    "location":"header",
-                    "static":  "application/json"
-                }
-            }
-        },
-        "delete_group": {
-            "httpMethod":"DELETE",
-            "uri":       "groups/{id}.json",
-            "summary":   "Delete a group",
-            "parameters":{
-                "id":{
-                    "location":   "uri",
-                    "description":"Group to delete by ID",
-                    "type":       "integer",
-                    "required":   true
-                }
-            }
-        },
-        "get_group":    {
-            "httpMethod":"GET",
-            "uri":       "groups/{id}.json",
-            "summary":   "Get a ticket",
-            "parameters":{
-                "id":{
-                    "location":   "uri",
-                    "description":"Group to get by ID",
-                    "type":       "integer",
-                    "required":   true
-                }
-            }
-        },
-        "update_group": {
-            "httpMethod":"PUT",
-            "uri":       "groups/{id}.json",
-            "summary":   "Update a group",
-            "parameters":{
-                "id":          {
-                    "location":   "uri",
-                    "description":"Group to update by ID",
-                    "type":       "integer",
-                    "required":   true
-                },
-                "data":        {
-                    "type":       "array",
-                    "location":   "body",
-                    "description":"Group JSON",
-                    "filters":    "json_encode",
-                    "required":   true
-                },
-                "Content-Type":{
-                    "type":    "string",
-                    "location":"header",
-                    "static":  "application/json"
-                }
-            }
-        }
-}
-```
-
-### Guzzle\Service\Description\ServiceDescription
-
-Commands are now called Operations
-
-**Before**
-
-```php
-use Guzzle\Service\Description\ServiceDescription;
-
-$sd = new ServiceDescription();
-$sd->getCommands();     // @returns ApiCommandInterface[]
-$sd->hasCommand($name);
-$sd->getCommand($name); // @returns ApiCommandInterface|null
-$sd->addCommand($command); // @param ApiCommandInterface $command
-```
-
-**After**
-
-```php
-use Guzzle\Service\Description\ServiceDescription;
-
-$sd = new ServiceDescription();
-$sd->getOperations();           // @returns OperationInterface[]
-$sd->hasOperation($name);
-$sd->getOperation($name);       // @returns OperationInterface|null
-$sd->addOperation($operation);  // @param OperationInterface $operation
-```
-
-### Guzzle\Common\Inflection\Inflector
-
-Namespace is now `Guzzle\Inflection\Inflector`
-
-### Guzzle\Http\Plugin
-
-Namespace is now `Guzzle\Plugin`. Many other changes occur within this namespace and are detailed in their own sections below.
-
-### Guzzle\Http\Plugin\LogPlugin and Guzzle\Common\Log
-
-Now `Guzzle\Plugin\Log\LogPlugin` and `Guzzle\Log` respectively.
-
-**Before**
-
-```php
-use Guzzle\Common\Log\ClosureLogAdapter;
-use Guzzle\Http\Plugin\LogPlugin;
-
-/** @var \Guzzle\Http\Client */
-$client;
-
-// $verbosity is an integer indicating desired message verbosity level
-$client->addSubscriber(new LogPlugin(new ClosureLogAdapter(function($m) { echo $m; }, $verbosity = LogPlugin::LOG_VERBOSE);
-```
-
-**After**
-
-```php
-use Guzzle\Log\ClosureLogAdapter;
-use Guzzle\Log\MessageFormatter;
-use Guzzle\Plugin\Log\LogPlugin;
-
-/** @var \Guzzle\Http\Client */
-$client;
-
-// $format is a string indicating desired message format -- @see MessageFormatter
-$client->addSubscriber(new LogPlugin(new ClosureLogAdapter(function($m) { echo $m; }, $format = MessageFormatter::DEBUG_FORMAT);
-```
-
-### Guzzle\Http\Plugin\CurlAuthPlugin
-
-Now `Guzzle\Plugin\CurlAuth\CurlAuthPlugin`.
-
-### Guzzle\Http\Plugin\ExponentialBackoffPlugin
-
-Now `Guzzle\Plugin\Backoff\BackoffPlugin`, and other changes.
-
-**Before**
-
-```php
-use Guzzle\Http\Plugin\ExponentialBackoffPlugin;
-
-$backoffPlugin = new ExponentialBackoffPlugin($maxRetries, array_merge(
-        ExponentialBackoffPlugin::getDefaultFailureCodes(), array(429)
-    ));
-
-$client->addSubscriber($backoffPlugin);
-```
-
-**After**
-
-```php
-use Guzzle\Plugin\Backoff\BackoffPlugin;
-use Guzzle\Plugin\Backoff\HttpBackoffStrategy;
-
-// Use convenient factory method instead -- see implementation for ideas of what
-// you can do with chaining backoff strategies
-$backoffPlugin = BackoffPlugin::getExponentialBackoff($maxRetries, array_merge(
-        HttpBackoffStrategy::getDefaultFailureCodes(), array(429)
-    ));
-$client->addSubscriber($backoffPlugin);
-```
-
-### Known Issues
-
-#### [BUG] Accept-Encoding header behavior changed unintentionally.
-
-(See #217) (Fixed in 09daeb8c666fb44499a0646d655a8ae36456575e)
-
-In version 2.8 setting the `Accept-Encoding` header would set the CURLOPT_ENCODING option, which permitted cURL to
-properly handle gzip/deflate compressed responses from the server. In versions affected by this bug this does not happen.
-See issue #217 for a workaround, or use a version containing the fix.
diff --git a/mayor-orig/www/include/share/googleapi/guzzlehttp/guzzle/composer.json b/mayor-orig/www/include/share/googleapi/guzzlehttp/guzzle/composer.json
deleted file mode 100644
index 65687a58..00000000
--- a/mayor-orig/www/include/share/googleapi/guzzlehttp/guzzle/composer.json
+++ /dev/null
@@ -1,44 +0,0 @@
-{
-    "name": "guzzlehttp/guzzle",
-    "type": "library",
-    "description": "Guzzle is a PHP HTTP client library",
-    "keywords": ["framework", "http", "rest", "web service", "curl", "client", "HTTP client"],
-    "homepage": "http://guzzlephp.org/",
-    "license": "MIT",
-    "authors": [
-        {
-            "name": "Michael Dowling",
-            "email": "mtdowling@gmail.com",
-            "homepage": "https://github.com/mtdowling"
-        }
-    ],
-    "require": {
-        "php": ">=5.5",
-        "guzzlehttp/psr7": "^1.4",
-        "guzzlehttp/promises": "^1.0"
-    },
-    "require-dev": {
-        "ext-curl": "*",
-        "phpunit/phpunit": "^4.0 || ^5.0",
-        "psr/log": "^1.0"
-    },
-    "autoload": {
-        "files": ["src/functions_include.php"],
-        "psr-4": {
-            "GuzzleHttp\\": "src/"
-        }
-    },
-    "autoload-dev": {
-        "psr-4": {
-            "GuzzleHttp\\Tests\\": "tests/"
-        }
-    },
-    "suggest": {
-        "psr/log": "Required for using the Log middleware"
-    },
-    "extra": {
-        "branch-alias": {
-            "dev-master": "6.2-dev"
-        }
-    }
-}
diff --git a/mayor-orig/www/include/share/googleapi/guzzlehttp/guzzle/src/Client.php b/mayor-orig/www/include/share/googleapi/guzzlehttp/guzzle/src/Client.php
deleted file mode 100644
index de4df8a5..00000000
--- a/mayor-orig/www/include/share/googleapi/guzzlehttp/guzzle/src/Client.php
+++ /dev/null
@@ -1,414 +0,0 @@
- 'http://www.foo.com/1.0/',
-     *         'timeout'         => 0,
-     *         'allow_redirects' => false,
-     *         'proxy'           => '192.168.16.1:10'
-     *     ]);
-     *
-     * Client configuration settings include the following options:
-     *
-     * - handler: (callable) Function that transfers HTTP requests over the
-     *   wire. The function is called with a Psr7\Http\Message\RequestInterface
-     *   and array of transfer options, and must return a
-     *   GuzzleHttp\Promise\PromiseInterface that is fulfilled with a
-     *   Psr7\Http\Message\ResponseInterface on success. "handler" is a
-     *   constructor only option that cannot be overridden in per/request
-     *   options. If no handler is provided, a default handler will be created
-     *   that enables all of the request options below by attaching all of the
-     *   default middleware to the handler.
-     * - base_uri: (string|UriInterface) Base URI of the client that is merged
-     *   into relative URIs. Can be a string or instance of UriInterface.
-     * - **: any request option
-     *
-     * @param array $config Client configuration settings.
-     *
-     * @see \GuzzleHttp\RequestOptions for a list of available request options.
-     */
-    public function __construct(array $config = [])
-    {
-        if (!isset($config['handler'])) {
-            $config['handler'] = HandlerStack::create();
-        } elseif (!is_callable($config['handler'])) {
-            throw new \InvalidArgumentException('handler must be a callable');
-        }
-
-        // Convert the base_uri to a UriInterface
-        if (isset($config['base_uri'])) {
-            $config['base_uri'] = Psr7\uri_for($config['base_uri']);
-        }
-
-        $this->configureDefaults($config);
-    }
-
-    public function __call($method, $args)
-    {
-        if (count($args) < 1) {
-            throw new \InvalidArgumentException('Magic request methods require a URI and optional options array');
-        }
-
-        $uri = $args[0];
-        $opts = isset($args[1]) ? $args[1] : [];
-
-        return substr($method, -5) === 'Async'
-            ? $this->requestAsync(substr($method, 0, -5), $uri, $opts)
-            : $this->request($method, $uri, $opts);
-    }
-
-    public function sendAsync(RequestInterface $request, array $options = [])
-    {
-        // Merge the base URI into the request URI if needed.
-        $options = $this->prepareDefaults($options);
-
-        return $this->transfer(
-            $request->withUri($this->buildUri($request->getUri(), $options), $request->hasHeader('Host')),
-            $options
-        );
-    }
-
-    public function send(RequestInterface $request, array $options = [])
-    {
-        $options[RequestOptions::SYNCHRONOUS] = true;
-        return $this->sendAsync($request, $options)->wait();
-    }
-
-    public function requestAsync($method, $uri = '', array $options = [])
-    {
-        $options = $this->prepareDefaults($options);
-        // Remove request modifying parameter because it can be done up-front.
-        $headers = isset($options['headers']) ? $options['headers'] : [];
-        $body = isset($options['body']) ? $options['body'] : null;
-        $version = isset($options['version']) ? $options['version'] : '1.1';
-        // Merge the URI into the base URI.
-        $uri = $this->buildUri($uri, $options);
-        if (is_array($body)) {
-            $this->invalidBody();
-        }
-        $request = new Psr7\Request($method, $uri, $headers, $body, $version);
-        // Remove the option so that they are not doubly-applied.
-        unset($options['headers'], $options['body'], $options['version']);
-
-        return $this->transfer($request, $options);
-    }
-
-    public function request($method, $uri = '', array $options = [])
-    {
-        $options[RequestOptions::SYNCHRONOUS] = true;
-        return $this->requestAsync($method, $uri, $options)->wait();
-    }
-
-    public function getConfig($option = null)
-    {
-        return $option === null
-            ? $this->config
-            : (isset($this->config[$option]) ? $this->config[$option] : null);
-    }
-
-    private function buildUri($uri, array $config)
-    {
-        // for BC we accept null which would otherwise fail in uri_for
-        $uri = Psr7\uri_for($uri === null ? '' : $uri);
-
-        if (isset($config['base_uri'])) {
-            $uri = Psr7\UriResolver::resolve(Psr7\uri_for($config['base_uri']), $uri);
-        }
-
-        return $uri->getScheme() === '' && $uri->getHost() !== '' ? $uri->withScheme('http') : $uri;
-    }
-
-    /**
-     * Configures the default options for a client.
-     *
-     * @param array $config
-     */
-    private function configureDefaults(array $config)
-    {
-        $defaults = [
-            'allow_redirects' => RedirectMiddleware::$defaultSettings,
-            'http_errors'     => true,
-            'decode_content'  => true,
-            'verify'          => true,
-            'cookies'         => false
-        ];
-
-        // Use the standard Linux HTTP_PROXY and HTTPS_PROXY if set.
-
-        // We can only trust the HTTP_PROXY environment variable in a CLI
-        // process due to the fact that PHP has no reliable mechanism to
-        // get environment variables that start with "HTTP_".
-        if (php_sapi_name() == 'cli' && getenv('HTTP_PROXY')) {
-            $defaults['proxy']['http'] = getenv('HTTP_PROXY');
-        }
-
-        if ($proxy = getenv('HTTPS_PROXY')) {
-            $defaults['proxy']['https'] = $proxy;
-        }
-
-        if ($noProxy = getenv('NO_PROXY')) {
-            $cleanedNoProxy = str_replace(' ', '', $noProxy);
-            $defaults['proxy']['no'] = explode(',', $cleanedNoProxy);
-        }
-
-        $this->config = $config + $defaults;
-
-        if (!empty($config['cookies']) && $config['cookies'] === true) {
-            $this->config['cookies'] = new CookieJar();
-        }
-
-        // Add the default user-agent header.
-        if (!isset($this->config['headers'])) {
-            $this->config['headers'] = ['User-Agent' => default_user_agent()];
-        } else {
-            // Add the User-Agent header if one was not already set.
-            foreach (array_keys($this->config['headers']) as $name) {
-                if (strtolower($name) === 'user-agent') {
-                    return;
-                }
-            }
-            $this->config['headers']['User-Agent'] = default_user_agent();
-        }
-    }
-
-    /**
-     * Merges default options into the array.
-     *
-     * @param array $options Options to modify by reference
-     *
-     * @return array
-     */
-    private function prepareDefaults($options)
-    {
-        $defaults = $this->config;
-
-        if (!empty($defaults['headers'])) {
-            // Default headers are only added if they are not present.
-            $defaults['_conditional'] = $defaults['headers'];
-            unset($defaults['headers']);
-        }
-
-        // Special handling for headers is required as they are added as
-        // conditional headers and as headers passed to a request ctor.
-        if (array_key_exists('headers', $options)) {
-            // Allows default headers to be unset.
-            if ($options['headers'] === null) {
-                $defaults['_conditional'] = null;
-                unset($options['headers']);
-            } elseif (!is_array($options['headers'])) {
-                throw new \InvalidArgumentException('headers must be an array');
-            }
-        }
-
-        // Shallow merge defaults underneath options.
-        $result = $options + $defaults;
-
-        // Remove null values.
-        foreach ($result as $k => $v) {
-            if ($v === null) {
-                unset($result[$k]);
-            }
-        }
-
-        return $result;
-    }
-
-    /**
-     * Transfers the given request and applies request options.
-     *
-     * The URI of the request is not modified and the request options are used
-     * as-is without merging in default options.
-     *
-     * @param RequestInterface $request
-     * @param array            $options
-     *
-     * @return Promise\PromiseInterface
-     */
-    private function transfer(RequestInterface $request, array $options)
-    {
-        // save_to -> sink
-        if (isset($options['save_to'])) {
-            $options['sink'] = $options['save_to'];
-            unset($options['save_to']);
-        }
-
-        // exceptions -> http_errors
-        if (isset($options['exceptions'])) {
-            $options['http_errors'] = $options['exceptions'];
-            unset($options['exceptions']);
-        }
-
-        $request = $this->applyOptions($request, $options);
-        $handler = $options['handler'];
-
-        try {
-            return Promise\promise_for($handler($request, $options));
-        } catch (\Exception $e) {
-            return Promise\rejection_for($e);
-        }
-    }
-
-    /**
-     * Applies the array of request options to a request.
-     *
-     * @param RequestInterface $request
-     * @param array            $options
-     *
-     * @return RequestInterface
-     */
-    private function applyOptions(RequestInterface $request, array &$options)
-    {
-        $modify = [];
-
-        if (isset($options['form_params'])) {
-            if (isset($options['multipart'])) {
-                throw new \InvalidArgumentException('You cannot use '
-                    . 'form_params and multipart at the same time. Use the '
-                    . 'form_params option if you want to send application/'
-                    . 'x-www-form-urlencoded requests, and the multipart '
-                    . 'option to send multipart/form-data requests.');
-            }
-            $options['body'] = http_build_query($options['form_params'], '', '&');
-            unset($options['form_params']);
-            $options['_conditional']['Content-Type'] = 'application/x-www-form-urlencoded';
-        }
-
-        if (isset($options['multipart'])) {
-            $options['body'] = new Psr7\MultipartStream($options['multipart']);
-            unset($options['multipart']);
-        }
-
-        if (isset($options['json'])) {
-            $options['body'] = \GuzzleHttp\json_encode($options['json']);
-            unset($options['json']);
-            $options['_conditional']['Content-Type'] = 'application/json';
-        }
-
-        if (!empty($options['decode_content'])
-            && $options['decode_content'] !== true
-        ) {
-            $modify['set_headers']['Accept-Encoding'] = $options['decode_content'];
-        }
-
-        if (isset($options['headers'])) {
-            if (isset($modify['set_headers'])) {
-                $modify['set_headers'] = $options['headers'] + $modify['set_headers'];
-            } else {
-                $modify['set_headers'] = $options['headers'];
-            }
-            unset($options['headers']);
-        }
-
-        if (isset($options['body'])) {
-            if (is_array($options['body'])) {
-                $this->invalidBody();
-            }
-            $modify['body'] = Psr7\stream_for($options['body']);
-            unset($options['body']);
-        }
-
-        if (!empty($options['auth']) && is_array($options['auth'])) {
-            $value = $options['auth'];
-            $type = isset($value[2]) ? strtolower($value[2]) : 'basic';
-            switch ($type) {
-                case 'basic':
-                    $modify['set_headers']['Authorization'] = 'Basic '
-                        . base64_encode("$value[0]:$value[1]");
-                    break;
-                case 'digest':
-                    // @todo: Do not rely on curl
-                    $options['curl'][CURLOPT_HTTPAUTH] = CURLAUTH_DIGEST;
-                    $options['curl'][CURLOPT_USERPWD] = "$value[0]:$value[1]";
-                    break;
-                case 'ntlm':
-                    $options['curl'][CURLOPT_HTTPAUTH] = CURLAUTH_NTLM;
-                    $options['curl'][CURLOPT_USERPWD] = "$value[0]:$value[1]";
-                    break;
-            }
-        }
-
-        if (isset($options['query'])) {
-            $value = $options['query'];
-            if (is_array($value)) {
-                $value = http_build_query($value, null, '&', PHP_QUERY_RFC3986);
-            }
-            if (!is_string($value)) {
-                throw new \InvalidArgumentException('query must be a string or array');
-            }
-            $modify['query'] = $value;
-            unset($options['query']);
-        }
-
-        // Ensure that sink is not an invalid value.
-        if (isset($options['sink'])) {
-            // TODO: Add more sink validation?
-            if (is_bool($options['sink'])) {
-                throw new \InvalidArgumentException('sink must not be a boolean');
-            }
-        }
-
-        $request = Psr7\modify_request($request, $modify);
-        if ($request->getBody() instanceof Psr7\MultipartStream) {
-            // Use a multipart/form-data POST if a Content-Type is not set.
-            $options['_conditional']['Content-Type'] = 'multipart/form-data; boundary='
-                . $request->getBody()->getBoundary();
-        }
-
-        // Merge in conditional headers if they are not present.
-        if (isset($options['_conditional'])) {
-            // Build up the changes so it's in a single clone of the message.
-            $modify = [];
-            foreach ($options['_conditional'] as $k => $v) {
-                if (!$request->hasHeader($k)) {
-                    $modify['set_headers'][$k] = $v;
-                }
-            }
-            $request = Psr7\modify_request($request, $modify);
-            // Don't pass this internal value along to middleware/handlers.
-            unset($options['_conditional']);
-        }
-
-        return $request;
-    }
-
-    private function invalidBody()
-    {
-        throw new \InvalidArgumentException('Passing in the "body" request '
-            . 'option as an array to send a POST request has been deprecated. '
-            . 'Please use the "form_params" request option to send a '
-            . 'application/x-www-form-urlencoded request, or the "multipart" '
-            . 'request option to send a multipart/form-data request.');
-    }
-}
diff --git a/mayor-orig/www/include/share/googleapi/guzzlehttp/guzzle/src/ClientInterface.php b/mayor-orig/www/include/share/googleapi/guzzlehttp/guzzle/src/ClientInterface.php
deleted file mode 100644
index 5a67b66b..00000000
--- a/mayor-orig/www/include/share/googleapi/guzzlehttp/guzzle/src/ClientInterface.php
+++ /dev/null
@@ -1,84 +0,0 @@
-strictMode = $strictMode;
-
-        foreach ($cookieArray as $cookie) {
-            if (!($cookie instanceof SetCookie)) {
-                $cookie = new SetCookie($cookie);
-            }
-            $this->setCookie($cookie);
-        }
-    }
-
-    /**
-     * Create a new Cookie jar from an associative array and domain.
-     *
-     * @param array  $cookies Cookies to create the jar from
-     * @param string $domain  Domain to set the cookies to
-     *
-     * @return self
-     */
-    public static function fromArray(array $cookies, $domain)
-    {
-        $cookieJar = new self();
-        foreach ($cookies as $name => $value) {
-            $cookieJar->setCookie(new SetCookie([
-                'Domain'  => $domain,
-                'Name'    => $name,
-                'Value'   => $value,
-                'Discard' => true
-            ]));
-        }
-
-        return $cookieJar;
-    }
-
-    /**
-     * @deprecated
-     */
-    public static function getCookieValue($value)
-    {
-        return $value;
-    }
-
-    /**
-     * Evaluate if this cookie should be persisted to storage
-     * that survives between requests.
-     *
-     * @param SetCookie $cookie Being evaluated.
-     * @param bool $allowSessionCookies If we should persist session cookies
-     * @return bool
-     */
-    public static function shouldPersist(
-        SetCookie $cookie,
-        $allowSessionCookies = false
-    ) {
-        if ($cookie->getExpires() || $allowSessionCookies) {
-            if (!$cookie->getDiscard()) {
-                return true;
-            }
-        }
-
-        return false;
-    }
-
-    /**
-     * Finds and returns the cookie based on the name
-     *
-     * @param string $name cookie name to search for
-     * @return SetCookie|null cookie that was found or null if not found
-     */
-    public function getCookieByName($name)
-    {
-        // don't allow a null name
-        if($name === null) {
-            return null;
-        }
-        foreach($this->cookies as $cookie) {
-            if($cookie->getName() !== null && strcasecmp($cookie->getName(), $name) === 0) {
-                return $cookie;
-            }
-        }
-    }
-
-    public function toArray()
-    {
-        return array_map(function (SetCookie $cookie) {
-            return $cookie->toArray();
-        }, $this->getIterator()->getArrayCopy());
-    }
-
-    public function clear($domain = null, $path = null, $name = null)
-    {
-        if (!$domain) {
-            $this->cookies = [];
-            return;
-        } elseif (!$path) {
-            $this->cookies = array_filter(
-                $this->cookies,
-                function (SetCookie $cookie) use ($path, $domain) {
-                    return !$cookie->matchesDomain($domain);
-                }
-            );
-        } elseif (!$name) {
-            $this->cookies = array_filter(
-                $this->cookies,
-                function (SetCookie $cookie) use ($path, $domain) {
-                    return !($cookie->matchesPath($path) &&
-                        $cookie->matchesDomain($domain));
-                }
-            );
-        } else {
-            $this->cookies = array_filter(
-                $this->cookies,
-                function (SetCookie $cookie) use ($path, $domain, $name) {
-                    return !($cookie->getName() == $name &&
-                        $cookie->matchesPath($path) &&
-                        $cookie->matchesDomain($domain));
-                }
-            );
-        }
-    }
-
-    public function clearSessionCookies()
-    {
-        $this->cookies = array_filter(
-            $this->cookies,
-            function (SetCookie $cookie) {
-                return !$cookie->getDiscard() && $cookie->getExpires();
-            }
-        );
-    }
-
-    public function setCookie(SetCookie $cookie)
-    {
-        // If the name string is empty (but not 0), ignore the set-cookie
-        // string entirely.
-        $name = $cookie->getName();
-        if (!$name && $name !== '0') {
-            return false;
-        }
-
-        // Only allow cookies with set and valid domain, name, value
-        $result = $cookie->validate();
-        if ($result !== true) {
-            if ($this->strictMode) {
-                throw new \RuntimeException('Invalid cookie: ' . $result);
-            } else {
-                $this->removeCookieIfEmpty($cookie);
-                return false;
-            }
-        }
-
-        // Resolve conflicts with previously set cookies
-        foreach ($this->cookies as $i => $c) {
-
-            // Two cookies are identical, when their path, and domain are
-            // identical.
-            if ($c->getPath() != $cookie->getPath() ||
-                $c->getDomain() != $cookie->getDomain() ||
-                $c->getName() != $cookie->getName()
-            ) {
-                continue;
-            }
-
-            // The previously set cookie is a discard cookie and this one is
-            // not so allow the new cookie to be set
-            if (!$cookie->getDiscard() && $c->getDiscard()) {
-                unset($this->cookies[$i]);
-                continue;
-            }
-
-            // If the new cookie's expiration is further into the future, then
-            // replace the old cookie
-            if ($cookie->getExpires() > $c->getExpires()) {
-                unset($this->cookies[$i]);
-                continue;
-            }
-
-            // If the value has changed, we better change it
-            if ($cookie->getValue() !== $c->getValue()) {
-                unset($this->cookies[$i]);
-                continue;
-            }
-
-            // The cookie exists, so no need to continue
-            return false;
-        }
-
-        $this->cookies[] = $cookie;
-
-        return true;
-    }
-
-    public function count()
-    {
-        return count($this->cookies);
-    }
-
-    public function getIterator()
-    {
-        return new \ArrayIterator(array_values($this->cookies));
-    }
-
-    public function extractCookies(
-        RequestInterface $request,
-        ResponseInterface $response
-    ) {
-        if ($cookieHeader = $response->getHeader('Set-Cookie')) {
-            foreach ($cookieHeader as $cookie) {
-                $sc = SetCookie::fromString($cookie);
-                if (!$sc->getDomain()) {
-                    $sc->setDomain($request->getUri()->getHost());
-                }
-                if (0 !== strpos($sc->getPath(), '/')) {
-                    $sc->setPath($this->getCookiePathFromRequest($request));
-                }
-                $this->setCookie($sc);
-            }
-        }
-    }
-
-    /**
-     * Computes cookie path following RFC 6265 section 5.1.4
-     *
-     * @link https://tools.ietf.org/html/rfc6265#section-5.1.4
-     *
-     * @param RequestInterface $request
-     * @return string
-     */
-    private function getCookiePathFromRequest(RequestInterface $request)
-    {
-        $uriPath = $request->getUri()->getPath();
-        if (''  === $uriPath) {
-            return '/';
-        }
-        if (0 !== strpos($uriPath, '/')) {
-            return '/';
-        }
-        if ('/' === $uriPath) {
-            return '/';
-        }
-        if (0 === $lastSlashPos = strrpos($uriPath, '/')) {
-            return '/';
-        }
-
-        return substr($uriPath, 0, $lastSlashPos);
-    }
-
-    public function withCookieHeader(RequestInterface $request)
-    {
-        $values = [];
-        $uri = $request->getUri();
-        $scheme = $uri->getScheme();
-        $host = $uri->getHost();
-        $path = $uri->getPath() ?: '/';
-
-        foreach ($this->cookies as $cookie) {
-            if ($cookie->matchesPath($path) &&
-                $cookie->matchesDomain($host) &&
-                !$cookie->isExpired() &&
-                (!$cookie->getSecure() || $scheme === 'https')
-            ) {
-                $values[] = $cookie->getName() . '='
-                    . $cookie->getValue();
-            }
-        }
-
-        return $values
-            ? $request->withHeader('Cookie', implode('; ', $values))
-            : $request;
-    }
-
-    /**
-     * If a cookie already exists and the server asks to set it again with a
-     * null value, the cookie must be deleted.
-     *
-     * @param SetCookie $cookie
-     */
-    private function removeCookieIfEmpty(SetCookie $cookie)
-    {
-        $cookieValue = $cookie->getValue();
-        if ($cookieValue === null || $cookieValue === '') {
-            $this->clear(
-                $cookie->getDomain(),
-                $cookie->getPath(),
-                $cookie->getName()
-            );
-        }
-    }
-}
diff --git a/mayor-orig/www/include/share/googleapi/guzzlehttp/guzzle/src/Cookie/CookieJarInterface.php b/mayor-orig/www/include/share/googleapi/guzzlehttp/guzzle/src/Cookie/CookieJarInterface.php
deleted file mode 100644
index 2cf298a8..00000000
--- a/mayor-orig/www/include/share/googleapi/guzzlehttp/guzzle/src/Cookie/CookieJarInterface.php
+++ /dev/null
@@ -1,84 +0,0 @@
-filename = $cookieFile;
-        $this->storeSessionCookies = $storeSessionCookies;
-
-        if (file_exists($cookieFile)) {
-            $this->load($cookieFile);
-        }
-    }
-
-    /**
-     * Saves the file when shutting down
-     */
-    public function __destruct()
-    {
-        $this->save($this->filename);
-    }
-
-    /**
-     * Saves the cookies to a file.
-     *
-     * @param string $filename File to save
-     * @throws \RuntimeException if the file cannot be found or created
-     */
-    public function save($filename)
-    {
-        $json = [];
-        foreach ($this as $cookie) {
-            /** @var SetCookie $cookie */
-            if (CookieJar::shouldPersist($cookie, $this->storeSessionCookies)) {
-                $json[] = $cookie->toArray();
-            }
-        }
-
-        $jsonStr = \GuzzleHttp\json_encode($json);
-        if (false === file_put_contents($filename, $jsonStr)) {
-            throw new \RuntimeException("Unable to save file {$filename}");
-        }
-    }
-
-    /**
-     * Load cookies from a JSON formatted file.
-     *
-     * Old cookies are kept unless overwritten by newly loaded ones.
-     *
-     * @param string $filename Cookie file to load.
-     * @throws \RuntimeException if the file cannot be loaded.
-     */
-    public function load($filename)
-    {
-        $json = file_get_contents($filename);
-        if (false === $json) {
-            throw new \RuntimeException("Unable to load file {$filename}");
-        } elseif ($json === '') {
-            return;
-        }
-
-        $data = \GuzzleHttp\json_decode($json, true);
-        if (is_array($data)) {
-            foreach (json_decode($json, true) as $cookie) {
-                $this->setCookie(new SetCookie($cookie));
-            }
-        } elseif (strlen($data)) {
-            throw new \RuntimeException("Invalid cookie file: {$filename}");
-        }
-    }
-}
diff --git a/mayor-orig/www/include/share/googleapi/guzzlehttp/guzzle/src/Cookie/SessionCookieJar.php b/mayor-orig/www/include/share/googleapi/guzzlehttp/guzzle/src/Cookie/SessionCookieJar.php
deleted file mode 100644
index e4bfafd4..00000000
--- a/mayor-orig/www/include/share/googleapi/guzzlehttp/guzzle/src/Cookie/SessionCookieJar.php
+++ /dev/null
@@ -1,71 +0,0 @@
-sessionKey = $sessionKey;
-        $this->storeSessionCookies = $storeSessionCookies;
-        $this->load();
-    }
-
-    /**
-     * Saves cookies to session when shutting down
-     */
-    public function __destruct()
-    {
-        $this->save();
-    }
-
-    /**
-     * Save cookies to the client session
-     */
-    public function save()
-    {
-        $json = [];
-        foreach ($this as $cookie) {
-            /** @var SetCookie $cookie */
-            if (CookieJar::shouldPersist($cookie, $this->storeSessionCookies)) {
-                $json[] = $cookie->toArray();
-            }
-        }
-
-        $_SESSION[$this->sessionKey] = json_encode($json);
-    }
-
-    /**
-     * Load the contents of the client session into the data array
-     */
-    protected function load()
-    {
-        if (!isset($_SESSION[$this->sessionKey])) {
-            return;
-        }
-        $data = json_decode($_SESSION[$this->sessionKey], true);
-        if (is_array($data)) {
-            foreach ($data as $cookie) {
-                $this->setCookie(new SetCookie($cookie));
-            }
-        } elseif (strlen($data)) {
-            throw new \RuntimeException("Invalid cookie data");
-        }
-    }
-}
diff --git a/mayor-orig/www/include/share/googleapi/guzzlehttp/guzzle/src/Cookie/SetCookie.php b/mayor-orig/www/include/share/googleapi/guzzlehttp/guzzle/src/Cookie/SetCookie.php
deleted file mode 100644
index c911e2a3..00000000
--- a/mayor-orig/www/include/share/googleapi/guzzlehttp/guzzle/src/Cookie/SetCookie.php
+++ /dev/null
@@ -1,404 +0,0 @@
- null,
-        'Value'    => null,
-        'Domain'   => null,
-        'Path'     => '/',
-        'Max-Age'  => null,
-        'Expires'  => null,
-        'Secure'   => false,
-        'Discard'  => false,
-        'HttpOnly' => false
-    ];
-
-    /** @var array Cookie data */
-    private $data;
-
-    /**
-     * Create a new SetCookie object from a string
-     *
-     * @param string $cookie Set-Cookie header string
-     *
-     * @return self
-     */
-    public static function fromString($cookie)
-    {
-        // Create the default return array
-        $data = self::$defaults;
-        // Explode the cookie string using a series of semicolons
-        $pieces = array_filter(array_map('trim', explode(';', $cookie)));
-        // The name of the cookie (first kvp) must include an equal sign.
-        if (empty($pieces) || !strpos($pieces[0], '=')) {
-            return new self($data);
-        }
-
-        // Add the cookie pieces into the parsed data array
-        foreach ($pieces as $part) {
-
-            $cookieParts = explode('=', $part, 2);
-            $key = trim($cookieParts[0]);
-            $value = isset($cookieParts[1])
-                ? trim($cookieParts[1], " \n\r\t\0\x0B")
-                : true;
-
-            // Only check for non-cookies when cookies have been found
-            if (empty($data['Name'])) {
-                $data['Name'] = $key;
-                $data['Value'] = $value;
-            } else {
-                foreach (array_keys(self::$defaults) as $search) {
-                    if (!strcasecmp($search, $key)) {
-                        $data[$search] = $value;
-                        continue 2;
-                    }
-                }
-                $data[$key] = $value;
-            }
-        }
-
-        return new self($data);
-    }
-
-    /**
-     * @param array $data Array of cookie data provided by a Cookie parser
-     */
-    public function __construct(array $data = [])
-    {
-        $this->data = array_replace(self::$defaults, $data);
-        // Extract the Expires value and turn it into a UNIX timestamp if needed
-        if (!$this->getExpires() && $this->getMaxAge()) {
-            // Calculate the Expires date
-            $this->setExpires(time() + $this->getMaxAge());
-        } elseif ($this->getExpires() && !is_numeric($this->getExpires())) {
-            $this->setExpires($this->getExpires());
-        }
-    }
-
-    public function __toString()
-    {
-        $str = $this->data['Name'] . '=' . $this->data['Value'] . '; ';
-        foreach ($this->data as $k => $v) {
-            if ($k !== 'Name' && $k !== 'Value' && $v !== null && $v !== false) {
-                if ($k === 'Expires') {
-                    $str .= 'Expires=' . gmdate('D, d M Y H:i:s \G\M\T', $v) . '; ';
-                } else {
-                    $str .= ($v === true ? $k : "{$k}={$v}") . '; ';
-                }
-            }
-        }
-
-        return rtrim($str, '; ');
-    }
-
-    public function toArray()
-    {
-        return $this->data;
-    }
-
-    /**
-     * Get the cookie name
-     *
-     * @return string
-     */
-    public function getName()
-    {
-        return $this->data['Name'];
-    }
-
-    /**
-     * Set the cookie name
-     *
-     * @param string $name Cookie name
-     */
-    public function setName($name)
-    {
-        $this->data['Name'] = $name;
-    }
-
-    /**
-     * Get the cookie value
-     *
-     * @return string
-     */
-    public function getValue()
-    {
-        return $this->data['Value'];
-    }
-
-    /**
-     * Set the cookie value
-     *
-     * @param string $value Cookie value
-     */
-    public function setValue($value)
-    {
-        $this->data['Value'] = $value;
-    }
-
-    /**
-     * Get the domain
-     *
-     * @return string|null
-     */
-    public function getDomain()
-    {
-        return $this->data['Domain'];
-    }
-
-    /**
-     * Set the domain of the cookie
-     *
-     * @param string $domain
-     */
-    public function setDomain($domain)
-    {
-        $this->data['Domain'] = $domain;
-    }
-
-    /**
-     * Get the path
-     *
-     * @return string
-     */
-    public function getPath()
-    {
-        return $this->data['Path'];
-    }
-
-    /**
-     * Set the path of the cookie
-     *
-     * @param string $path Path of the cookie
-     */
-    public function setPath($path)
-    {
-        $this->data['Path'] = $path;
-    }
-
-    /**
-     * Maximum lifetime of the cookie in seconds
-     *
-     * @return int|null
-     */
-    public function getMaxAge()
-    {
-        return $this->data['Max-Age'];
-    }
-
-    /**
-     * Set the max-age of the cookie
-     *
-     * @param int $maxAge Max age of the cookie in seconds
-     */
-    public function setMaxAge($maxAge)
-    {
-        $this->data['Max-Age'] = $maxAge;
-    }
-
-    /**
-     * The UNIX timestamp when the cookie Expires
-     *
-     * @return mixed
-     */
-    public function getExpires()
-    {
-        return $this->data['Expires'];
-    }
-
-    /**
-     * Set the unix timestamp for which the cookie will expire
-     *
-     * @param int $timestamp Unix timestamp
-     */
-    public function setExpires($timestamp)
-    {
-        $this->data['Expires'] = is_numeric($timestamp)
-            ? (int) $timestamp
-            : strtotime($timestamp);
-    }
-
-    /**
-     * Get whether or not this is a secure cookie
-     *
-     * @return null|bool
-     */
-    public function getSecure()
-    {
-        return $this->data['Secure'];
-    }
-
-    /**
-     * Set whether or not the cookie is secure
-     *
-     * @param bool $secure Set to true or false if secure
-     */
-    public function setSecure($secure)
-    {
-        $this->data['Secure'] = $secure;
-    }
-
-    /**
-     * Get whether or not this is a session cookie
-     *
-     * @return null|bool
-     */
-    public function getDiscard()
-    {
-        return $this->data['Discard'];
-    }
-
-    /**
-     * Set whether or not this is a session cookie
-     *
-     * @param bool $discard Set to true or false if this is a session cookie
-     */
-    public function setDiscard($discard)
-    {
-        $this->data['Discard'] = $discard;
-    }
-
-    /**
-     * Get whether or not this is an HTTP only cookie
-     *
-     * @return bool
-     */
-    public function getHttpOnly()
-    {
-        return $this->data['HttpOnly'];
-    }
-
-    /**
-     * Set whether or not this is an HTTP only cookie
-     *
-     * @param bool $httpOnly Set to true or false if this is HTTP only
-     */
-    public function setHttpOnly($httpOnly)
-    {
-        $this->data['HttpOnly'] = $httpOnly;
-    }
-
-    /**
-     * Check if the cookie matches a path value.
-     *
-     * A request-path path-matches a given cookie-path if at least one of
-     * the following conditions holds:
-     *
-     * - The cookie-path and the request-path are identical.
-     * - The cookie-path is a prefix of the request-path, and the last
-     *   character of the cookie-path is %x2F ("/").
-     * - The cookie-path is a prefix of the request-path, and the first
-     *   character of the request-path that is not included in the cookie-
-     *   path is a %x2F ("/") character.
-     *
-     * @param string $requestPath Path to check against
-     *
-     * @return bool
-     */
-    public function matchesPath($requestPath)
-    {
-        $cookiePath = $this->getPath();
-
-        // Match on exact matches or when path is the default empty "/"
-        if ($cookiePath === '/' || $cookiePath == $requestPath) {
-            return true;
-        }
-
-        // Ensure that the cookie-path is a prefix of the request path.
-        if (0 !== strpos($requestPath, $cookiePath)) {
-            return false;
-        }
-
-        // Match if the last character of the cookie-path is "/"
-        if (substr($cookiePath, -1, 1) === '/') {
-            return true;
-        }
-
-        // Match if the first character not included in cookie path is "/"
-        return substr($requestPath, strlen($cookiePath), 1) === '/';
-    }
-
-    /**
-     * Check if the cookie matches a domain value
-     *
-     * @param string $domain Domain to check against
-     *
-     * @return bool
-     */
-    public function matchesDomain($domain)
-    {
-        // Remove the leading '.' as per spec in RFC 6265.
-        // http://tools.ietf.org/html/rfc6265#section-5.2.3
-        $cookieDomain = ltrim($this->getDomain(), '.');
-
-        // Domain not set or exact match.
-        if (!$cookieDomain || !strcasecmp($domain, $cookieDomain)) {
-            return true;
-        }
-
-        // Matching the subdomain according to RFC 6265.
-        // http://tools.ietf.org/html/rfc6265#section-5.1.3
-        if (filter_var($domain, FILTER_VALIDATE_IP)) {
-            return false;
-        }
-
-        return (bool) preg_match('/\.' . preg_quote($cookieDomain) . '$/', $domain);
-    }
-
-    /**
-     * Check if the cookie is expired
-     *
-     * @return bool
-     */
-    public function isExpired()
-    {
-        return $this->getExpires() && time() > $this->getExpires();
-    }
-
-    /**
-     * Check if the cookie is valid according to RFC 6265
-     *
-     * @return bool|string Returns true if valid or an error message if invalid
-     */
-    public function validate()
-    {
-        // Names must not be empty, but can be 0
-        $name = $this->getName();
-        if (empty($name) && !is_numeric($name)) {
-            return 'The cookie name must not be empty';
-        }
-
-        // Check if any of the invalid characters are present in the cookie name
-        if (preg_match(
-            '/[\x00-\x20\x22\x28-\x29\x2c\x2f\x3a-\x40\x5c\x7b\x7d\x7f]/',
-            $name)
-        ) {
-            return 'Cookie name must not contain invalid characters: ASCII '
-                . 'Control characters (0-31;127), space, tab and the '
-                . 'following characters: ()<>@,;:\"/?={}';
-        }
-
-        // Value must not be empty, but can be 0
-        $value = $this->getValue();
-        if (empty($value) && !is_numeric($value)) {
-            return 'The cookie value must not be empty';
-        }
-
-        // Domains must not be empty, but can be 0
-        // A "0" is not a valid internet domain, but may be used as server name
-        // in a private network.
-        $domain = $this->getDomain();
-        if (empty($domain) && !is_numeric($domain)) {
-            return 'The cookie domain must not be empty';
-        }
-
-        return true;
-    }
-}
diff --git a/mayor-orig/www/include/share/googleapi/guzzlehttp/guzzle/src/Exception/BadResponseException.php b/mayor-orig/www/include/share/googleapi/guzzlehttp/guzzle/src/Exception/BadResponseException.php
deleted file mode 100644
index 427d896f..00000000
--- a/mayor-orig/www/include/share/googleapi/guzzlehttp/guzzle/src/Exception/BadResponseException.php
+++ /dev/null
@@ -1,27 +0,0 @@
-getStatusCode()
-            : 0;
-        parent::__construct($message, $code, $previous);
-        $this->request = $request;
-        $this->response = $response;
-        $this->handlerContext = $handlerContext;
-    }
-
-    /**
-     * Wrap non-RequestExceptions with a RequestException
-     *
-     * @param RequestInterface $request
-     * @param \Exception       $e
-     *
-     * @return RequestException
-     */
-    public static function wrapException(RequestInterface $request, \Exception $e)
-    {
-        return $e instanceof RequestException
-            ? $e
-            : new RequestException($e->getMessage(), $request, null, $e);
-    }
-
-    /**
-     * Factory method to create a new exception with a normalized error message
-     *
-     * @param RequestInterface  $request  Request
-     * @param ResponseInterface $response Response received
-     * @param \Exception        $previous Previous exception
-     * @param array             $ctx      Optional handler context.
-     *
-     * @return self
-     */
-    public static function create(
-        RequestInterface $request,
-        ResponseInterface $response = null,
-        \Exception $previous = null,
-        array $ctx = []
-    ) {
-        if (!$response) {
-            return new self(
-                'Error completing request',
-                $request,
-                null,
-                $previous,
-                $ctx
-            );
-        }
-
-        $level = (int) floor($response->getStatusCode() / 100);
-        if ($level === 4) {
-            $label = 'Client error';
-            $className = ClientException::class;
-        } elseif ($level === 5) {
-            $label = 'Server error';
-            $className = ServerException::class;
-        } else {
-            $label = 'Unsuccessful request';
-            $className = __CLASS__;
-        }
-
-        $uri = $request->getUri();
-        $uri = static::obfuscateUri($uri);
-
-        // Client Error: `GET /` resulted in a `404 Not Found` response:
-        //  ... (truncated)
-        $message = sprintf(
-            '%s: `%s %s` resulted in a `%s %s` response',
-            $label,
-            $request->getMethod(),
-            $uri,
-            $response->getStatusCode(),
-            $response->getReasonPhrase()
-        );
-
-        $summary = static::getResponseBodySummary($response);
-
-        if ($summary !== null) {
-            $message .= ":\n{$summary}\n";
-        }
-
-        return new $className($message, $request, $response, $previous, $ctx);
-    }
-
-    /**
-     * Get a short summary of the response
-     *
-     * Will return `null` if the response is not printable.
-     *
-     * @param ResponseInterface $response
-     *
-     * @return string|null
-     */
-    public static function getResponseBodySummary(ResponseInterface $response)
-    {
-        $body = $response->getBody();
-
-        if (!$body->isSeekable()) {
-            return null;
-        }
-
-        $size = $body->getSize();
-
-        if ($size === 0) {
-            return null;
-        }
-
-        $summary = $body->read(120);
-        $body->rewind();
-
-        if ($size > 120) {
-            $summary .= ' (truncated...)';
-        }
-
-        // Matches any printable character, including unicode characters:
-        // letters, marks, numbers, punctuation, spacing, and separators.
-        if (preg_match('/[^\pL\pM\pN\pP\pS\pZ\n\r\t]/', $summary)) {
-            return null;
-        }
-
-        return $summary;
-    }
-
-    /**
-     * Obfuscates URI if there is an username and a password present
-     *
-     * @param UriInterface $uri
-     *
-     * @return UriInterface
-     */
-    private static function obfuscateUri($uri)
-    {
-        $userInfo = $uri->getUserInfo();
-
-        if (false !== ($pos = strpos($userInfo, ':'))) {
-            return $uri->withUserInfo(substr($userInfo, 0, $pos), '***');
-        }
-
-        return $uri;
-    }
-
-    /**
-     * Get the request that caused the exception
-     *
-     * @return RequestInterface
-     */
-    public function getRequest()
-    {
-        return $this->request;
-    }
-
-    /**
-     * Get the associated response
-     *
-     * @return ResponseInterface|null
-     */
-    public function getResponse()
-    {
-        return $this->response;
-    }
-
-    /**
-     * Check if a response was received
-     *
-     * @return bool
-     */
-    public function hasResponse()
-    {
-        return $this->response !== null;
-    }
-
-    /**
-     * Get contextual information about the error from the underlying handler.
-     *
-     * The contents of this array will vary depending on which handler you are
-     * using. It may also be just an empty array. Relying on this data will
-     * couple you to a specific handler, but can give more debug information
-     * when needed.
-     *
-     * @return array
-     */
-    public function getHandlerContext()
-    {
-        return $this->handlerContext;
-    }
-}
diff --git a/mayor-orig/www/include/share/googleapi/guzzlehttp/guzzle/src/Exception/SeekException.php b/mayor-orig/www/include/share/googleapi/guzzlehttp/guzzle/src/Exception/SeekException.php
deleted file mode 100644
index a77c2892..00000000
--- a/mayor-orig/www/include/share/googleapi/guzzlehttp/guzzle/src/Exception/SeekException.php
+++ /dev/null
@@ -1,27 +0,0 @@
-stream = $stream;
-        $msg = $msg ?: 'Could not seek the stream to position ' . $pos;
-        parent::__construct($msg);
-    }
-
-    /**
-     * @return StreamInterface
-     */
-    public function getStream()
-    {
-        return $this->stream;
-    }
-}
diff --git a/mayor-orig/www/include/share/googleapi/guzzlehttp/guzzle/src/Exception/ServerException.php b/mayor-orig/www/include/share/googleapi/guzzlehttp/guzzle/src/Exception/ServerException.php
deleted file mode 100644
index 7cdd3408..00000000
--- a/mayor-orig/www/include/share/googleapi/guzzlehttp/guzzle/src/Exception/ServerException.php
+++ /dev/null
@@ -1,7 +0,0 @@
-maxHandles = $maxHandles;
-    }
-
-    public function create(RequestInterface $request, array $options)
-    {
-        if (isset($options['curl']['body_as_string'])) {
-            $options['_body_as_string'] = $options['curl']['body_as_string'];
-            unset($options['curl']['body_as_string']);
-        }
-
-        $easy = new EasyHandle;
-        $easy->request = $request;
-        $easy->options = $options;
-        $conf = $this->getDefaultConf($easy);
-        $this->applyMethod($easy, $conf);
-        $this->applyHandlerOptions($easy, $conf);
-        $this->applyHeaders($easy, $conf);
-        unset($conf['_headers']);
-
-        // Add handler options from the request configuration options
-        if (isset($options['curl'])) {
-            $conf = array_replace($conf, $options['curl']);
-        }
-
-        $conf[CURLOPT_HEADERFUNCTION] = $this->createHeaderFn($easy);
-        $easy->handle = $this->handles
-            ? array_pop($this->handles)
-            : curl_init();
-        curl_setopt_array($easy->handle, $conf);
-
-        return $easy;
-    }
-
-    public function release(EasyHandle $easy)
-    {
-        $resource = $easy->handle;
-        unset($easy->handle);
-
-        if (count($this->handles) >= $this->maxHandles) {
-            curl_close($resource);
-        } else {
-            // Remove all callback functions as they can hold onto references
-            // and are not cleaned up by curl_reset. Using curl_setopt_array
-            // does not work for some reason, so removing each one
-            // individually.
-            curl_setopt($resource, CURLOPT_HEADERFUNCTION, null);
-            curl_setopt($resource, CURLOPT_READFUNCTION, null);
-            curl_setopt($resource, CURLOPT_WRITEFUNCTION, null);
-            curl_setopt($resource, CURLOPT_PROGRESSFUNCTION, null);
-            curl_reset($resource);
-            $this->handles[] = $resource;
-        }
-    }
-
-    /**
-     * Completes a cURL transaction, either returning a response promise or a
-     * rejected promise.
-     *
-     * @param callable             $handler
-     * @param EasyHandle           $easy
-     * @param CurlFactoryInterface $factory Dictates how the handle is released
-     *
-     * @return \GuzzleHttp\Promise\PromiseInterface
-     */
-    public static function finish(
-        callable $handler,
-        EasyHandle $easy,
-        CurlFactoryInterface $factory
-    ) {
-        if (isset($easy->options['on_stats'])) {
-            self::invokeStats($easy);
-        }
-
-        if (!$easy->response || $easy->errno) {
-            return self::finishError($handler, $easy, $factory);
-        }
-
-        // Return the response if it is present and there is no error.
-        $factory->release($easy);
-
-        // Rewind the body of the response if possible.
-        $body = $easy->response->getBody();
-        if ($body->isSeekable()) {
-            $body->rewind();
-        }
-
-        return new FulfilledPromise($easy->response);
-    }
-
-    private static function invokeStats(EasyHandle $easy)
-    {
-        $curlStats = curl_getinfo($easy->handle);
-        $stats = new TransferStats(
-            $easy->request,
-            $easy->response,
-            $curlStats['total_time'],
-            $easy->errno,
-            $curlStats
-        );
-        call_user_func($easy->options['on_stats'], $stats);
-    }
-
-    private static function finishError(
-        callable $handler,
-        EasyHandle $easy,
-        CurlFactoryInterface $factory
-    ) {
-        // Get error information and release the handle to the factory.
-        $ctx = [
-            'errno' => $easy->errno,
-            'error' => curl_error($easy->handle),
-        ] + curl_getinfo($easy->handle);
-        $factory->release($easy);
-
-        // Retry when nothing is present or when curl failed to rewind.
-        if (empty($easy->options['_err_message'])
-            && (!$easy->errno || $easy->errno == 65)
-        ) {
-            return self::retryFailedRewind($handler, $easy, $ctx);
-        }
-
-        return self::createRejection($easy, $ctx);
-    }
-
-    private static function createRejection(EasyHandle $easy, array $ctx)
-    {
-        static $connectionErrors = [
-            CURLE_OPERATION_TIMEOUTED  => true,
-            CURLE_COULDNT_RESOLVE_HOST => true,
-            CURLE_COULDNT_CONNECT      => true,
-            CURLE_SSL_CONNECT_ERROR    => true,
-            CURLE_GOT_NOTHING          => true,
-        ];
-
-        // If an exception was encountered during the onHeaders event, then
-        // return a rejected promise that wraps that exception.
-        if ($easy->onHeadersException) {
-            return \GuzzleHttp\Promise\rejection_for(
-                new RequestException(
-                    'An error was encountered during the on_headers event',
-                    $easy->request,
-                    $easy->response,
-                    $easy->onHeadersException,
-                    $ctx
-                )
-            );
-        }
-
-        $message = sprintf(
-            'cURL error %s: %s (%s)',
-            $ctx['errno'],
-            $ctx['error'],
-            'see http://curl.haxx.se/libcurl/c/libcurl-errors.html'
-        );
-
-        // Create a connection exception if it was a specific error code.
-        $error = isset($connectionErrors[$easy->errno])
-            ? new ConnectException($message, $easy->request, null, $ctx)
-            : new RequestException($message, $easy->request, $easy->response, null, $ctx);
-
-        return \GuzzleHttp\Promise\rejection_for($error);
-    }
-
-    private function getDefaultConf(EasyHandle $easy)
-    {
-        $conf = [
-            '_headers'             => $easy->request->getHeaders(),
-            CURLOPT_CUSTOMREQUEST  => $easy->request->getMethod(),
-            CURLOPT_URL            => (string) $easy->request->getUri()->withFragment(''),
-            CURLOPT_RETURNTRANSFER => false,
-            CURLOPT_HEADER         => false,
-            CURLOPT_CONNECTTIMEOUT => 150,
-        ];
-
-        if (defined('CURLOPT_PROTOCOLS')) {
-            $conf[CURLOPT_PROTOCOLS] = CURLPROTO_HTTP | CURLPROTO_HTTPS;
-        }
-
-        $version = $easy->request->getProtocolVersion();
-        if ($version == 1.1) {
-            $conf[CURLOPT_HTTP_VERSION] = CURL_HTTP_VERSION_1_1;
-        } elseif ($version == 2.0) {
-            $conf[CURLOPT_HTTP_VERSION] = CURL_HTTP_VERSION_2_0;
-        } else {
-            $conf[CURLOPT_HTTP_VERSION] = CURL_HTTP_VERSION_1_0;
-        }
-
-        return $conf;
-    }
-
-    private function applyMethod(EasyHandle $easy, array &$conf)
-    {
-        $body = $easy->request->getBody();
-        $size = $body->getSize();
-
-        if ($size === null || $size > 0) {
-            $this->applyBody($easy->request, $easy->options, $conf);
-            return;
-        }
-
-        $method = $easy->request->getMethod();
-        if ($method === 'PUT' || $method === 'POST') {
-            // See http://tools.ietf.org/html/rfc7230#section-3.3.2
-            if (!$easy->request->hasHeader('Content-Length')) {
-                $conf[CURLOPT_HTTPHEADER][] = 'Content-Length: 0';
-            }
-        } elseif ($method === 'HEAD') {
-            $conf[CURLOPT_NOBODY] = true;
-            unset(
-                $conf[CURLOPT_WRITEFUNCTION],
-                $conf[CURLOPT_READFUNCTION],
-                $conf[CURLOPT_FILE],
-                $conf[CURLOPT_INFILE]
-            );
-        }
-    }
-
-    private function applyBody(RequestInterface $request, array $options, array &$conf)
-    {
-        $size = $request->hasHeader('Content-Length')
-            ? (int) $request->getHeaderLine('Content-Length')
-            : null;
-
-        // Send the body as a string if the size is less than 1MB OR if the
-        // [curl][body_as_string] request value is set.
-        if (($size !== null && $size < 1000000) ||
-            !empty($options['_body_as_string'])
-        ) {
-            $conf[CURLOPT_POSTFIELDS] = (string) $request->getBody();
-            // Don't duplicate the Content-Length header
-            $this->removeHeader('Content-Length', $conf);
-            $this->removeHeader('Transfer-Encoding', $conf);
-        } else {
-            $conf[CURLOPT_UPLOAD] = true;
-            if ($size !== null) {
-                $conf[CURLOPT_INFILESIZE] = $size;
-                $this->removeHeader('Content-Length', $conf);
-            }
-            $body = $request->getBody();
-            if ($body->isSeekable()) {
-                $body->rewind();
-            }
-            $conf[CURLOPT_READFUNCTION] = function ($ch, $fd, $length) use ($body) {
-                return $body->read($length);
-            };
-        }
-
-        // If the Expect header is not present, prevent curl from adding it
-        if (!$request->hasHeader('Expect')) {
-            $conf[CURLOPT_HTTPHEADER][] = 'Expect:';
-        }
-
-        // cURL sometimes adds a content-type by default. Prevent this.
-        if (!$request->hasHeader('Content-Type')) {
-            $conf[CURLOPT_HTTPHEADER][] = 'Content-Type:';
-        }
-    }
-
-    private function applyHeaders(EasyHandle $easy, array &$conf)
-    {
-        foreach ($conf['_headers'] as $name => $values) {
-            foreach ($values as $value) {
-                $conf[CURLOPT_HTTPHEADER][] = "$name: $value";
-            }
-        }
-
-        // Remove the Accept header if one was not set
-        if (!$easy->request->hasHeader('Accept')) {
-            $conf[CURLOPT_HTTPHEADER][] = 'Accept:';
-        }
-    }
-
-    /**
-     * Remove a header from the options array.
-     *
-     * @param string $name    Case-insensitive header to remove
-     * @param array  $options Array of options to modify
-     */
-    private function removeHeader($name, array &$options)
-    {
-        foreach (array_keys($options['_headers']) as $key) {
-            if (!strcasecmp($key, $name)) {
-                unset($options['_headers'][$key]);
-                return;
-            }
-        }
-    }
-
-    private function applyHandlerOptions(EasyHandle $easy, array &$conf)
-    {
-        $options = $easy->options;
-        if (isset($options['verify'])) {
-            if ($options['verify'] === false) {
-                unset($conf[CURLOPT_CAINFO]);
-                $conf[CURLOPT_SSL_VERIFYHOST] = 0;
-                $conf[CURLOPT_SSL_VERIFYPEER] = false;
-            } else {
-                $conf[CURLOPT_SSL_VERIFYHOST] = 2;
-                $conf[CURLOPT_SSL_VERIFYPEER] = true;
-                if (is_string($options['verify'])) {
-                    // Throw an error if the file/folder/link path is not valid or doesn't exist.
-                    if (!file_exists($options['verify'])) {
-                        throw new \InvalidArgumentException(
-                            "SSL CA bundle not found: {$options['verify']}"
-                        );
-                    }
-                    // If it's a directory or a link to a directory use CURLOPT_CAPATH.
-                    // If not, it's probably a file, or a link to a file, so use CURLOPT_CAINFO.
-                    if (is_dir($options['verify']) ||
-                        (is_link($options['verify']) && is_dir(readlink($options['verify'])))) {
-                        $conf[CURLOPT_CAPATH] = $options['verify'];
-                    } else {
-                        $conf[CURLOPT_CAINFO] = $options['verify'];
-                    }
-                }
-            }
-        }
-
-        if (!empty($options['decode_content'])) {
-            $accept = $easy->request->getHeaderLine('Accept-Encoding');
-            if ($accept) {
-                $conf[CURLOPT_ENCODING] = $accept;
-            } else {
-                $conf[CURLOPT_ENCODING] = '';
-                // Don't let curl send the header over the wire
-                $conf[CURLOPT_HTTPHEADER][] = 'Accept-Encoding:';
-            }
-        }
-
-        if (isset($options['sink'])) {
-            $sink = $options['sink'];
-            if (!is_string($sink)) {
-                $sink = \GuzzleHttp\Psr7\stream_for($sink);
-            } elseif (!is_dir(dirname($sink))) {
-                // Ensure that the directory exists before failing in curl.
-                throw new \RuntimeException(sprintf(
-                    'Directory %s does not exist for sink value of %s',
-                    dirname($sink),
-                    $sink
-                ));
-            } else {
-                $sink = new LazyOpenStream($sink, 'w+');
-            }
-            $easy->sink = $sink;
-            $conf[CURLOPT_WRITEFUNCTION] = function ($ch, $write) use ($sink) {
-                return $sink->write($write);
-            };
-        } else {
-            // Use a default temp stream if no sink was set.
-            $conf[CURLOPT_FILE] = fopen('php://temp', 'w+');
-            $easy->sink = Psr7\stream_for($conf[CURLOPT_FILE]);
-        }
-        $timeoutRequiresNoSignal = false;
-        if (isset($options['timeout'])) {
-            $timeoutRequiresNoSignal |= $options['timeout'] < 1;
-            $conf[CURLOPT_TIMEOUT_MS] = $options['timeout'] * 1000;
-        }
-
-        // CURL default value is CURL_IPRESOLVE_WHATEVER
-        if (isset($options['force_ip_resolve'])) {
-            if ('v4' === $options['force_ip_resolve']) {
-                $conf[CURLOPT_IPRESOLVE] = CURL_IPRESOLVE_V4;
-            } else if ('v6' === $options['force_ip_resolve']) {
-                $conf[CURLOPT_IPRESOLVE] = CURL_IPRESOLVE_V6;
-            }
-        }
-
-        if (isset($options['connect_timeout'])) {
-            $timeoutRequiresNoSignal |= $options['connect_timeout'] < 1;
-            $conf[CURLOPT_CONNECTTIMEOUT_MS] = $options['connect_timeout'] * 1000;
-        }
-
-        if ($timeoutRequiresNoSignal && strtoupper(substr(PHP_OS, 0, 3)) !== 'WIN') {
-            $conf[CURLOPT_NOSIGNAL] = true;
-        }
-
-        if (isset($options['proxy'])) {
-            if (!is_array($options['proxy'])) {
-                $conf[CURLOPT_PROXY] = $options['proxy'];
-            } else {
-                $scheme = $easy->request->getUri()->getScheme();
-                if (isset($options['proxy'][$scheme])) {
-                    $host = $easy->request->getUri()->getHost();
-                    if (!isset($options['proxy']['no']) ||
-                        !\GuzzleHttp\is_host_in_noproxy($host, $options['proxy']['no'])
-                    ) {
-                        $conf[CURLOPT_PROXY] = $options['proxy'][$scheme];
-                    }
-                }
-            }
-        }
-
-        if (isset($options['cert'])) {
-            $cert = $options['cert'];
-            if (is_array($cert)) {
-                $conf[CURLOPT_SSLCERTPASSWD] = $cert[1];
-                $cert = $cert[0];
-            }
-            if (!file_exists($cert)) {
-                throw new \InvalidArgumentException(
-                    "SSL certificate not found: {$cert}"
-                );
-            }
-            $conf[CURLOPT_SSLCERT] = $cert;
-        }
-
-        if (isset($options['ssl_key'])) {
-            $sslKey = $options['ssl_key'];
-            if (is_array($sslKey)) {
-                $conf[CURLOPT_SSLKEYPASSWD] = $sslKey[1];
-                $sslKey = $sslKey[0];
-            }
-            if (!file_exists($sslKey)) {
-                throw new \InvalidArgumentException(
-                    "SSL private key not found: {$sslKey}"
-                );
-            }
-            $conf[CURLOPT_SSLKEY] = $sslKey;
-        }
-
-        if (isset($options['progress'])) {
-            $progress = $options['progress'];
-            if (!is_callable($progress)) {
-                throw new \InvalidArgumentException(
-                    'progress client option must be callable'
-                );
-            }
-            $conf[CURLOPT_NOPROGRESS] = false;
-            $conf[CURLOPT_PROGRESSFUNCTION] = function () use ($progress) {
-                $args = func_get_args();
-                // PHP 5.5 pushed the handle onto the start of the args
-                if (is_resource($args[0])) {
-                    array_shift($args);
-                }
-                call_user_func_array($progress, $args);
-            };
-        }
-
-        if (!empty($options['debug'])) {
-            $conf[CURLOPT_STDERR] = \GuzzleHttp\debug_resource($options['debug']);
-            $conf[CURLOPT_VERBOSE] = true;
-        }
-    }
-
-    /**
-     * This function ensures that a response was set on a transaction. If one
-     * was not set, then the request is retried if possible. This error
-     * typically means you are sending a payload, curl encountered a
-     * "Connection died, retrying a fresh connect" error, tried to rewind the
-     * stream, and then encountered a "necessary data rewind wasn't possible"
-     * error, causing the request to be sent through curl_multi_info_read()
-     * without an error status.
-     */
-    private static function retryFailedRewind(
-        callable $handler,
-        EasyHandle $easy,
-        array $ctx
-    ) {
-        try {
-            // Only rewind if the body has been read from.
-            $body = $easy->request->getBody();
-            if ($body->tell() > 0) {
-                $body->rewind();
-            }
-        } catch (\RuntimeException $e) {
-            $ctx['error'] = 'The connection unexpectedly failed without '
-                . 'providing an error. The request would have been retried, '
-                . 'but attempting to rewind the request body failed. '
-                . 'Exception: ' . $e;
-            return self::createRejection($easy, $ctx);
-        }
-
-        // Retry no more than 3 times before giving up.
-        if (!isset($easy->options['_curl_retries'])) {
-            $easy->options['_curl_retries'] = 1;
-        } elseif ($easy->options['_curl_retries'] == 2) {
-            $ctx['error'] = 'The cURL request was retried 3 times '
-                . 'and did not succeed. The most likely reason for the failure '
-                . 'is that cURL was unable to rewind the body of the request '
-                . 'and subsequent retries resulted in the same error. Turn on '
-                . 'the debug option to see what went wrong. See '
-                . 'https://bugs.php.net/bug.php?id=47204 for more information.';
-            return self::createRejection($easy, $ctx);
-        } else {
-            $easy->options['_curl_retries']++;
-        }
-
-        return $handler($easy->request, $easy->options);
-    }
-
-    private function createHeaderFn(EasyHandle $easy)
-    {
-        if (isset($easy->options['on_headers'])) {
-            $onHeaders = $easy->options['on_headers'];
-
-            if (!is_callable($onHeaders)) {
-                throw new \InvalidArgumentException('on_headers must be callable');
-            }
-        } else {
-            $onHeaders = null;
-        }
-
-        return function ($ch, $h) use (
-            $onHeaders,
-            $easy,
-            &$startingResponse
-        ) {
-            $value = trim($h);
-            if ($value === '') {
-                $startingResponse = true;
-                $easy->createResponse();
-                if ($onHeaders !== null) {
-                    try {
-                        $onHeaders($easy->response);
-                    } catch (\Exception $e) {
-                        // Associate the exception with the handle and trigger
-                        // a curl header write error by returning 0.
-                        $easy->onHeadersException = $e;
-                        return -1;
-                    }
-                }
-            } elseif ($startingResponse) {
-                $startingResponse = false;
-                $easy->headers = [$value];
-            } else {
-                $easy->headers[] = $value;
-            }
-            return strlen($h);
-        };
-    }
-}
diff --git a/mayor-orig/www/include/share/googleapi/guzzlehttp/guzzle/src/Handler/CurlFactoryInterface.php b/mayor-orig/www/include/share/googleapi/guzzlehttp/guzzle/src/Handler/CurlFactoryInterface.php
deleted file mode 100644
index b0fc2368..00000000
--- a/mayor-orig/www/include/share/googleapi/guzzlehttp/guzzle/src/Handler/CurlFactoryInterface.php
+++ /dev/null
@@ -1,27 +0,0 @@
-factory = isset($options['handle_factory'])
-            ? $options['handle_factory']
-            : new CurlFactory(3);
-    }
-
-    public function __invoke(RequestInterface $request, array $options)
-    {
-        if (isset($options['delay'])) {
-            usleep($options['delay'] * 1000);
-        }
-
-        $easy = $this->factory->create($request, $options);
-        curl_exec($easy->handle);
-        $easy->errno = curl_errno($easy->handle);
-
-        return CurlFactory::finish($this, $easy, $this->factory);
-    }
-}
diff --git a/mayor-orig/www/include/share/googleapi/guzzlehttp/guzzle/src/Handler/CurlMultiHandler.php b/mayor-orig/www/include/share/googleapi/guzzlehttp/guzzle/src/Handler/CurlMultiHandler.php
deleted file mode 100644
index 945d06ee..00000000
--- a/mayor-orig/www/include/share/googleapi/guzzlehttp/guzzle/src/Handler/CurlMultiHandler.php
+++ /dev/null
@@ -1,197 +0,0 @@
-factory = isset($options['handle_factory'])
-            ? $options['handle_factory'] : new CurlFactory(50);
-        $this->selectTimeout = isset($options['select_timeout'])
-            ? $options['select_timeout'] : 1;
-    }
-
-    public function __get($name)
-    {
-        if ($name === '_mh') {
-            return $this->_mh = curl_multi_init();
-        }
-
-        throw new \BadMethodCallException();
-    }
-
-    public function __destruct()
-    {
-        if (isset($this->_mh)) {
-            curl_multi_close($this->_mh);
-            unset($this->_mh);
-        }
-    }
-
-    public function __invoke(RequestInterface $request, array $options)
-    {
-        $easy = $this->factory->create($request, $options);
-        $id = (int) $easy->handle;
-
-        $promise = new Promise(
-            [$this, 'execute'],
-            function () use ($id) { return $this->cancel($id); }
-        );
-
-        $this->addRequest(['easy' => $easy, 'deferred' => $promise]);
-
-        return $promise;
-    }
-
-    /**
-     * Ticks the curl event loop.
-     */
-    public function tick()
-    {
-        // Add any delayed handles if needed.
-        if ($this->delays) {
-            $currentTime = microtime(true);
-            foreach ($this->delays as $id => $delay) {
-                if ($currentTime >= $delay) {
-                    unset($this->delays[$id]);
-                    curl_multi_add_handle(
-                        $this->_mh,
-                        $this->handles[$id]['easy']->handle
-                    );
-                }
-            }
-        }
-
-        // Step through the task queue which may add additional requests.
-        P\queue()->run();
-
-        if ($this->active &&
-            curl_multi_select($this->_mh, $this->selectTimeout) === -1
-        ) {
-            // Perform a usleep if a select returns -1.
-            // See: https://bugs.php.net/bug.php?id=61141
-            usleep(250);
-        }
-
-        while (curl_multi_exec($this->_mh, $this->active) === CURLM_CALL_MULTI_PERFORM);
-
-        $this->processMessages();
-    }
-
-    /**
-     * Runs until all outstanding connections have completed.
-     */
-    public function execute()
-    {
-        $queue = P\queue();
-
-        while ($this->handles || !$queue->isEmpty()) {
-            // If there are no transfers, then sleep for the next delay
-            if (!$this->active && $this->delays) {
-                usleep($this->timeToNext());
-            }
-            $this->tick();
-        }
-    }
-
-    private function addRequest(array $entry)
-    {
-        $easy = $entry['easy'];
-        $id = (int) $easy->handle;
-        $this->handles[$id] = $entry;
-        if (empty($easy->options['delay'])) {
-            curl_multi_add_handle($this->_mh, $easy->handle);
-        } else {
-            $this->delays[$id] = microtime(true) + ($easy->options['delay'] / 1000);
-        }
-    }
-
-    /**
-     * Cancels a handle from sending and removes references to it.
-     *
-     * @param int $id Handle ID to cancel and remove.
-     *
-     * @return bool True on success, false on failure.
-     */
-    private function cancel($id)
-    {
-        // Cannot cancel if it has been processed.
-        if (!isset($this->handles[$id])) {
-            return false;
-        }
-
-        $handle = $this->handles[$id]['easy']->handle;
-        unset($this->delays[$id], $this->handles[$id]);
-        curl_multi_remove_handle($this->_mh, $handle);
-        curl_close($handle);
-
-        return true;
-    }
-
-    private function processMessages()
-    {
-        while ($done = curl_multi_info_read($this->_mh)) {
-            $id = (int) $done['handle'];
-            curl_multi_remove_handle($this->_mh, $done['handle']);
-
-            if (!isset($this->handles[$id])) {
-                // Probably was cancelled.
-                continue;
-            }
-
-            $entry = $this->handles[$id];
-            unset($this->handles[$id], $this->delays[$id]);
-            $entry['easy']->errno = $done['result'];
-            $entry['deferred']->resolve(
-                CurlFactory::finish(
-                    $this,
-                    $entry['easy'],
-                    $this->factory
-                )
-            );
-        }
-    }
-
-    private function timeToNext()
-    {
-        $currentTime = microtime(true);
-        $nextTime = PHP_INT_MAX;
-        foreach ($this->delays as $time) {
-            if ($time < $nextTime) {
-                $nextTime = $time;
-            }
-        }
-
-        return max(0, $nextTime - $currentTime) * 1000000;
-    }
-}
diff --git a/mayor-orig/www/include/share/googleapi/guzzlehttp/guzzle/src/Handler/EasyHandle.php b/mayor-orig/www/include/share/googleapi/guzzlehttp/guzzle/src/Handler/EasyHandle.php
deleted file mode 100644
index 7754e911..00000000
--- a/mayor-orig/www/include/share/googleapi/guzzlehttp/guzzle/src/Handler/EasyHandle.php
+++ /dev/null
@@ -1,92 +0,0 @@
-headers)) {
-            throw new \RuntimeException('No headers have been received');
-        }
-
-        // HTTP-version SP status-code SP reason-phrase
-        $startLine = explode(' ', array_shift($this->headers), 3);
-        $headers = \GuzzleHttp\headers_from_lines($this->headers);
-        $normalizedKeys = \GuzzleHttp\normalize_header_keys($headers);
-
-        if (!empty($this->options['decode_content'])
-            && isset($normalizedKeys['content-encoding'])
-        ) {
-            $headers['x-encoded-content-encoding']
-                = $headers[$normalizedKeys['content-encoding']];
-            unset($headers[$normalizedKeys['content-encoding']]);
-            if (isset($normalizedKeys['content-length'])) {
-                $headers['x-encoded-content-length']
-                    = $headers[$normalizedKeys['content-length']];
-
-                $bodyLength = (int) $this->sink->getSize();
-                if ($bodyLength) {
-                    $headers[$normalizedKeys['content-length']] = $bodyLength;
-                } else {
-                    unset($headers[$normalizedKeys['content-length']]);
-                }
-            }
-        }
-
-        // Attach a response to the easy handle with the parsed headers.
-        $this->response = new Response(
-            $startLine[1],
-            $headers,
-            $this->sink,
-            substr($startLine[0], 5),
-            isset($startLine[2]) ? (string) $startLine[2] : null
-        );
-    }
-
-    public function __get($name)
-    {
-        $msg = $name === 'handle'
-            ? 'The EasyHandle has been released'
-            : 'Invalid property: ' . $name;
-        throw new \BadMethodCallException($msg);
-    }
-}
diff --git a/mayor-orig/www/include/share/googleapi/guzzlehttp/guzzle/src/Handler/MockHandler.php b/mayor-orig/www/include/share/googleapi/guzzlehttp/guzzle/src/Handler/MockHandler.php
deleted file mode 100644
index d892061c..00000000
--- a/mayor-orig/www/include/share/googleapi/guzzlehttp/guzzle/src/Handler/MockHandler.php
+++ /dev/null
@@ -1,189 +0,0 @@
-onFulfilled = $onFulfilled;
-        $this->onRejected = $onRejected;
-
-        if ($queue) {
-            call_user_func_array([$this, 'append'], $queue);
-        }
-    }
-
-    public function __invoke(RequestInterface $request, array $options)
-    {
-        if (!$this->queue) {
-            throw new \OutOfBoundsException('Mock queue is empty');
-        }
-
-        if (isset($options['delay'])) {
-            usleep($options['delay'] * 1000);
-        }
-
-        $this->lastRequest = $request;
-        $this->lastOptions = $options;
-        $response = array_shift($this->queue);
-
-        if (isset($options['on_headers'])) {
-            if (!is_callable($options['on_headers'])) {
-                throw new \InvalidArgumentException('on_headers must be callable');
-            }
-            try {
-                $options['on_headers']($response);
-            } catch (\Exception $e) {
-                $msg = 'An error was encountered during the on_headers event';
-                $response = new RequestException($msg, $request, $response, $e);
-            }
-        }
-
-        if (is_callable($response)) {
-            $response = call_user_func($response, $request, $options);
-        }
-
-        $response = $response instanceof \Exception
-            ? \GuzzleHttp\Promise\rejection_for($response)
-            : \GuzzleHttp\Promise\promise_for($response);
-
-        return $response->then(
-            function ($value) use ($request, $options) {
-                $this->invokeStats($request, $options, $value);
-                if ($this->onFulfilled) {
-                    call_user_func($this->onFulfilled, $value);
-                }
-                if (isset($options['sink'])) {
-                    $contents = (string) $value->getBody();
-                    $sink = $options['sink'];
-
-                    if (is_resource($sink)) {
-                        fwrite($sink, $contents);
-                    } elseif (is_string($sink)) {
-                        file_put_contents($sink, $contents);
-                    } elseif ($sink instanceof \Psr\Http\Message\StreamInterface) {
-                        $sink->write($contents);
-                    }
-                }
-
-                return $value;
-            },
-            function ($reason) use ($request, $options) {
-                $this->invokeStats($request, $options, null, $reason);
-                if ($this->onRejected) {
-                    call_user_func($this->onRejected, $reason);
-                }
-                return \GuzzleHttp\Promise\rejection_for($reason);
-            }
-        );
-    }
-
-    /**
-     * Adds one or more variadic requests, exceptions, callables, or promises
-     * to the queue.
-     */
-    public function append()
-    {
-        foreach (func_get_args() as $value) {
-            if ($value instanceof ResponseInterface
-                || $value instanceof \Exception
-                || $value instanceof PromiseInterface
-                || is_callable($value)
-            ) {
-                $this->queue[] = $value;
-            } else {
-                throw new \InvalidArgumentException('Expected a response or '
-                    . 'exception. Found ' . \GuzzleHttp\describe_type($value));
-            }
-        }
-    }
-
-    /**
-     * Get the last received request.
-     *
-     * @return RequestInterface
-     */
-    public function getLastRequest()
-    {
-        return $this->lastRequest;
-    }
-
-    /**
-     * Get the last received request options.
-     *
-     * @return array
-     */
-    public function getLastOptions()
-    {
-        return $this->lastOptions;
-    }
-
-    /**
-     * Returns the number of remaining items in the queue.
-     *
-     * @return int
-     */
-    public function count()
-    {
-        return count($this->queue);
-    }
-
-    private function invokeStats(
-        RequestInterface $request,
-        array $options,
-        ResponseInterface $response = null,
-        $reason = null
-    ) {
-        if (isset($options['on_stats'])) {
-            $stats = new TransferStats($request, $response, 0, $reason);
-            call_user_func($options['on_stats'], $stats);
-        }
-    }
-}
diff --git a/mayor-orig/www/include/share/googleapi/guzzlehttp/guzzle/src/Handler/Proxy.php b/mayor-orig/www/include/share/googleapi/guzzlehttp/guzzle/src/Handler/Proxy.php
deleted file mode 100644
index f8b00be0..00000000
--- a/mayor-orig/www/include/share/googleapi/guzzlehttp/guzzle/src/Handler/Proxy.php
+++ /dev/null
@@ -1,55 +0,0 @@
-withoutHeader('Expect');
-
-            // Append a content-length header if body size is zero to match
-            // cURL's behavior.
-            if (0 === $request->getBody()->getSize()) {
-                $request = $request->withHeader('Content-Length', 0);
-            }
-
-            return $this->createResponse(
-                $request,
-                $options,
-                $this->createStream($request, $options),
-                $startTime
-            );
-        } catch (\InvalidArgumentException $e) {
-            throw $e;
-        } catch (\Exception $e) {
-            // Determine if the error was a networking error.
-            $message = $e->getMessage();
-            // This list can probably get more comprehensive.
-            if (strpos($message, 'getaddrinfo') // DNS lookup failed
-                || strpos($message, 'Connection refused')
-                || strpos($message, "couldn't connect to host") // error on HHVM
-            ) {
-                $e = new ConnectException($e->getMessage(), $request, $e);
-            }
-            $e = RequestException::wrapException($request, $e);
-            $this->invokeStats($options, $request, $startTime, null, $e);
-
-            return \GuzzleHttp\Promise\rejection_for($e);
-        }
-    }
-
-    private function invokeStats(
-        array $options,
-        RequestInterface $request,
-        $startTime,
-        ResponseInterface $response = null,
-        $error = null
-    ) {
-        if (isset($options['on_stats'])) {
-            $stats = new TransferStats(
-                $request,
-                $response,
-                microtime(true) - $startTime,
-                $error,
-                []
-            );
-            call_user_func($options['on_stats'], $stats);
-        }
-    }
-
-    private function createResponse(
-        RequestInterface $request,
-        array $options,
-        $stream,
-        $startTime
-    ) {
-        $hdrs = $this->lastHeaders;
-        $this->lastHeaders = [];
-        $parts = explode(' ', array_shift($hdrs), 3);
-        $ver = explode('/', $parts[0])[1];
-        $status = $parts[1];
-        $reason = isset($parts[2]) ? $parts[2] : null;
-        $headers = \GuzzleHttp\headers_from_lines($hdrs);
-        list ($stream, $headers) = $this->checkDecode($options, $headers, $stream);
-        $stream = Psr7\stream_for($stream);
-        $sink = $stream;
-
-        if (strcasecmp('HEAD', $request->getMethod())) {
-            $sink = $this->createSink($stream, $options);
-        }
-
-        $response = new Psr7\Response($status, $headers, $sink, $ver, $reason);
-
-        if (isset($options['on_headers'])) {
-            try {
-                $options['on_headers']($response);
-            } catch (\Exception $e) {
-                $msg = 'An error was encountered during the on_headers event';
-                $ex = new RequestException($msg, $request, $response, $e);
-                return \GuzzleHttp\Promise\rejection_for($ex);
-            }
-        }
-
-        // Do not drain when the request is a HEAD request because they have
-        // no body.
-        if ($sink !== $stream) {
-            $this->drain(
-                $stream,
-                $sink,
-                $response->getHeaderLine('Content-Length')
-            );
-        }
-
-        $this->invokeStats($options, $request, $startTime, $response, null);
-
-        return new FulfilledPromise($response);
-    }
-
-    private function createSink(StreamInterface $stream, array $options)
-    {
-        if (!empty($options['stream'])) {
-            return $stream;
-        }
-
-        $sink = isset($options['sink'])
-            ? $options['sink']
-            : fopen('php://temp', 'r+');
-
-        return is_string($sink)
-            ? new Psr7\LazyOpenStream($sink, 'w+')
-            : Psr7\stream_for($sink);
-    }
-
-    private function checkDecode(array $options, array $headers, $stream)
-    {
-        // Automatically decode responses when instructed.
-        if (!empty($options['decode_content'])) {
-            $normalizedKeys = \GuzzleHttp\normalize_header_keys($headers);
-            if (isset($normalizedKeys['content-encoding'])) {
-                $encoding = $headers[$normalizedKeys['content-encoding']];
-                if ($encoding[0] === 'gzip' || $encoding[0] === 'deflate') {
-                    $stream = new Psr7\InflateStream(
-                        Psr7\stream_for($stream)
-                    );
-                    $headers['x-encoded-content-encoding']
-                        = $headers[$normalizedKeys['content-encoding']];
-                    // Remove content-encoding header
-                    unset($headers[$normalizedKeys['content-encoding']]);
-                    // Fix content-length header
-                    if (isset($normalizedKeys['content-length'])) {
-                        $headers['x-encoded-content-length']
-                            = $headers[$normalizedKeys['content-length']];
-
-                        $length = (int) $stream->getSize();
-                        if ($length === 0) {
-                            unset($headers[$normalizedKeys['content-length']]);
-                        } else {
-                            $headers[$normalizedKeys['content-length']] = [$length];
-                        }
-                    }
-                }
-            }
-        }
-
-        return [$stream, $headers];
-    }
-
-    /**
-     * Drains the source stream into the "sink" client option.
-     *
-     * @param StreamInterface $source
-     * @param StreamInterface $sink
-     * @param string          $contentLength Header specifying the amount of
-     *                                       data to read.
-     *
-     * @return StreamInterface
-     * @throws \RuntimeException when the sink option is invalid.
-     */
-    private function drain(
-        StreamInterface $source,
-        StreamInterface $sink,
-        $contentLength
-    ) {
-        // If a content-length header is provided, then stop reading once
-        // that number of bytes has been read. This can prevent infinitely
-        // reading from a stream when dealing with servers that do not honor
-        // Connection: Close headers.
-        Psr7\copy_to_stream(
-            $source,
-            $sink,
-            (strlen($contentLength) > 0 && (int) $contentLength > 0) ? (int) $contentLength : -1
-        );
-
-        $sink->seek(0);
-        $source->close();
-
-        return $sink;
-    }
-
-    /**
-     * Create a resource and check to ensure it was created successfully
-     *
-     * @param callable $callback Callable that returns stream resource
-     *
-     * @return resource
-     * @throws \RuntimeException on error
-     */
-    private function createResource(callable $callback)
-    {
-        $errors = null;
-        set_error_handler(function ($_, $msg, $file, $line) use (&$errors) {
-            $errors[] = [
-                'message' => $msg,
-                'file'    => $file,
-                'line'    => $line
-            ];
-            return true;
-        });
-
-        $resource = $callback();
-        restore_error_handler();
-
-        if (!$resource) {
-            $message = 'Error creating resource: ';
-            foreach ($errors as $err) {
-                foreach ($err as $key => $value) {
-                    $message .= "[$key] $value" . PHP_EOL;
-                }
-            }
-            throw new \RuntimeException(trim($message));
-        }
-
-        return $resource;
-    }
-
-    private function createStream(RequestInterface $request, array $options)
-    {
-        static $methods;
-        if (!$methods) {
-            $methods = array_flip(get_class_methods(__CLASS__));
-        }
-
-        // HTTP/1.1 streams using the PHP stream wrapper require a
-        // Connection: close header
-        if ($request->getProtocolVersion() == '1.1'
-            && !$request->hasHeader('Connection')
-        ) {
-            $request = $request->withHeader('Connection', 'close');
-        }
-
-        // Ensure SSL is verified by default
-        if (!isset($options['verify'])) {
-            $options['verify'] = true;
-        }
-
-        $params = [];
-        $context = $this->getDefaultContext($request, $options);
-
-        if (isset($options['on_headers']) && !is_callable($options['on_headers'])) {
-            throw new \InvalidArgumentException('on_headers must be callable');
-        }
-
-        if (!empty($options)) {
-            foreach ($options as $key => $value) {
-                $method = "add_{$key}";
-                if (isset($methods[$method])) {
-                    $this->{$method}($request, $context, $value, $params);
-                }
-            }
-        }
-
-        if (isset($options['stream_context'])) {
-            if (!is_array($options['stream_context'])) {
-                throw new \InvalidArgumentException('stream_context must be an array');
-            }
-            $context = array_replace_recursive(
-                $context,
-                $options['stream_context']
-            );
-        }
-
-        // Microsoft NTLM authentication only supported with curl handler
-        if (isset($options['auth'])
-            && is_array($options['auth'])
-            && isset($options['auth'][2])
-            && 'ntlm' == $options['auth'][2]
-        ) {
-
-            throw new \InvalidArgumentException('Microsoft NTLM authentication only supported with curl handler');
-        }
-
-        $uri = $this->resolveHost($request, $options);
-
-        $context = $this->createResource(
-            function () use ($context, $params) {
-                return stream_context_create($context, $params);
-            }
-        );
-
-        return $this->createResource(
-            function () use ($uri, &$http_response_header, $context, $options) {
-                $resource = fopen((string) $uri, 'r', null, $context);
-                $this->lastHeaders = $http_response_header;
-
-                if (isset($options['read_timeout'])) {
-                    $readTimeout = $options['read_timeout'];
-                    $sec = (int) $readTimeout;
-                    $usec = ($readTimeout - $sec) * 100000;
-                    stream_set_timeout($resource, $sec, $usec);
-                }
-
-                return $resource;
-            }
-        );
-    }
-
-    private function resolveHost(RequestInterface $request, array $options)
-    {
-        $uri = $request->getUri();
-
-        if (isset($options['force_ip_resolve']) && !filter_var($uri->getHost(), FILTER_VALIDATE_IP)) {
-            if ('v4' === $options['force_ip_resolve']) {
-                $records = dns_get_record($uri->getHost(), DNS_A);
-                if (!isset($records[0]['ip'])) {
-                    throw new ConnectException(sprintf("Could not resolve IPv4 address for host '%s'", $uri->getHost()), $request);
-                }
-                $uri = $uri->withHost($records[0]['ip']);
-            } elseif ('v6' === $options['force_ip_resolve']) {
-                $records = dns_get_record($uri->getHost(), DNS_AAAA);
-                if (!isset($records[0]['ipv6'])) {
-                    throw new ConnectException(sprintf("Could not resolve IPv6 address for host '%s'", $uri->getHost()), $request);
-                }
-                $uri = $uri->withHost('[' . $records[0]['ipv6'] . ']');
-            }
-        }
-
-        return $uri;
-    }
-
-    private function getDefaultContext(RequestInterface $request)
-    {
-        $headers = '';
-        foreach ($request->getHeaders() as $name => $value) {
-            foreach ($value as $val) {
-                $headers .= "$name: $val\r\n";
-            }
-        }
-
-        $context = [
-            'http' => [
-                'method'           => $request->getMethod(),
-                'header'           => $headers,
-                'protocol_version' => $request->getProtocolVersion(),
-                'ignore_errors'    => true,
-                'follow_location'  => 0,
-            ],
-        ];
-
-        $body = (string) $request->getBody();
-
-        if (!empty($body)) {
-            $context['http']['content'] = $body;
-            // Prevent the HTTP handler from adding a Content-Type header.
-            if (!$request->hasHeader('Content-Type')) {
-                $context['http']['header'] .= "Content-Type:\r\n";
-            }
-        }
-
-        $context['http']['header'] = rtrim($context['http']['header']);
-
-        return $context;
-    }
-
-    private function add_proxy(RequestInterface $request, &$options, $value, &$params)
-    {
-        if (!is_array($value)) {
-            $options['http']['proxy'] = $value;
-        } else {
-            $scheme = $request->getUri()->getScheme();
-            if (isset($value[$scheme])) {
-                if (!isset($value['no'])
-                    || !\GuzzleHttp\is_host_in_noproxy(
-                        $request->getUri()->getHost(),
-                        $value['no']
-                    )
-                ) {
-                    $options['http']['proxy'] = $value[$scheme];
-                }
-            }
-        }
-    }
-
-    private function add_timeout(RequestInterface $request, &$options, $value, &$params)
-    {
-        if ($value > 0) {
-            $options['http']['timeout'] = $value;
-        }
-    }
-
-    private function add_verify(RequestInterface $request, &$options, $value, &$params)
-    {
-        if ($value === true) {
-            // PHP 5.6 or greater will find the system cert by default. When
-            // < 5.6, use the Guzzle bundled cacert.
-            if (PHP_VERSION_ID < 50600) {
-                $options['ssl']['cafile'] = \GuzzleHttp\default_ca_bundle();
-            }
-        } elseif (is_string($value)) {
-            $options['ssl']['cafile'] = $value;
-            if (!file_exists($value)) {
-                throw new \RuntimeException("SSL CA bundle not found: $value");
-            }
-        } elseif ($value === false) {
-            $options['ssl']['verify_peer'] = false;
-            $options['ssl']['verify_peer_name'] = false;
-            return;
-        } else {
-            throw new \InvalidArgumentException('Invalid verify request option');
-        }
-
-        $options['ssl']['verify_peer'] = true;
-        $options['ssl']['verify_peer_name'] = true;
-        $options['ssl']['allow_self_signed'] = false;
-    }
-
-    private function add_cert(RequestInterface $request, &$options, $value, &$params)
-    {
-        if (is_array($value)) {
-            $options['ssl']['passphrase'] = $value[1];
-            $value = $value[0];
-        }
-
-        if (!file_exists($value)) {
-            throw new \RuntimeException("SSL certificate not found: {$value}");
-        }
-
-        $options['ssl']['local_cert'] = $value;
-    }
-
-    private function add_progress(RequestInterface $request, &$options, $value, &$params)
-    {
-        $this->addNotification(
-            $params,
-            function ($code, $a, $b, $c, $transferred, $total) use ($value) {
-                if ($code == STREAM_NOTIFY_PROGRESS) {
-                    $value($total, $transferred, null, null);
-                }
-            }
-        );
-    }
-
-    private function add_debug(RequestInterface $request, &$options, $value, &$params)
-    {
-        if ($value === false) {
-            return;
-        }
-
-        static $map = [
-            STREAM_NOTIFY_CONNECT       => 'CONNECT',
-            STREAM_NOTIFY_AUTH_REQUIRED => 'AUTH_REQUIRED',
-            STREAM_NOTIFY_AUTH_RESULT   => 'AUTH_RESULT',
-            STREAM_NOTIFY_MIME_TYPE_IS  => 'MIME_TYPE_IS',
-            STREAM_NOTIFY_FILE_SIZE_IS  => 'FILE_SIZE_IS',
-            STREAM_NOTIFY_REDIRECTED    => 'REDIRECTED',
-            STREAM_NOTIFY_PROGRESS      => 'PROGRESS',
-            STREAM_NOTIFY_FAILURE       => 'FAILURE',
-            STREAM_NOTIFY_COMPLETED     => 'COMPLETED',
-            STREAM_NOTIFY_RESOLVE       => 'RESOLVE',
-        ];
-        static $args = ['severity', 'message', 'message_code',
-            'bytes_transferred', 'bytes_max'];
-
-        $value = \GuzzleHttp\debug_resource($value);
-        $ident = $request->getMethod() . ' ' . $request->getUri()->withFragment('');
-        $this->addNotification(
-            $params,
-            function () use ($ident, $value, $map, $args) {
-                $passed = func_get_args();
-                $code = array_shift($passed);
-                fprintf($value, '<%s> [%s] ', $ident, $map[$code]);
-                foreach (array_filter($passed) as $i => $v) {
-                    fwrite($value, $args[$i] . ': "' . $v . '" ');
-                }
-                fwrite($value, "\n");
-            }
-        );
-    }
-
-    private function addNotification(array &$params, callable $notify)
-    {
-        // Wrap the existing function if needed.
-        if (!isset($params['notification'])) {
-            $params['notification'] = $notify;
-        } else {
-            $params['notification'] = $this->callArray([
-                $params['notification'],
-                $notify
-            ]);
-        }
-    }
-
-    private function callArray(array $functions)
-    {
-        return function () use ($functions) {
-            $args = func_get_args();
-            foreach ($functions as $fn) {
-                call_user_func_array($fn, $args);
-            }
-        };
-    }
-}
diff --git a/mayor-orig/www/include/share/googleapi/guzzlehttp/guzzle/src/HandlerStack.php b/mayor-orig/www/include/share/googleapi/guzzlehttp/guzzle/src/HandlerStack.php
deleted file mode 100644
index a72e38a5..00000000
--- a/mayor-orig/www/include/share/googleapi/guzzlehttp/guzzle/src/HandlerStack.php
+++ /dev/null
@@ -1,273 +0,0 @@
-push(Middleware::httpErrors(), 'http_errors');
-        $stack->push(Middleware::redirect(), 'allow_redirects');
-        $stack->push(Middleware::cookies(), 'cookies');
-        $stack->push(Middleware::prepareBody(), 'prepare_body');
-
-        return $stack;
-    }
-
-    /**
-     * @param callable $handler Underlying HTTP handler.
-     */
-    public function __construct(callable $handler = null)
-    {
-        $this->handler = $handler;
-    }
-
-    /**
-     * Invokes the handler stack as a composed handler
-     *
-     * @param RequestInterface $request
-     * @param array            $options
-     */
-    public function __invoke(RequestInterface $request, array $options)
-    {
-        $handler = $this->resolve();
-
-        return $handler($request, $options);
-    }
-
-    /**
-     * Dumps a string representation of the stack.
-     *
-     * @return string
-     */
-    public function __toString()
-    {
-        $depth = 0;
-        $stack = [];
-        if ($this->handler) {
-            $stack[] = "0) Handler: " . $this->debugCallable($this->handler);
-        }
-
-        $result = '';
-        foreach (array_reverse($this->stack) as $tuple) {
-            $depth++;
-            $str = "{$depth}) Name: '{$tuple[1]}', ";
-            $str .= "Function: " . $this->debugCallable($tuple[0]);
-            $result = "> {$str}\n{$result}";
-            $stack[] = $str;
-        }
-
-        foreach (array_keys($stack) as $k) {
-            $result .= "< {$stack[$k]}\n";
-        }
-
-        return $result;
-    }
-
-    /**
-     * Set the HTTP handler that actually returns a promise.
-     *
-     * @param callable $handler Accepts a request and array of options and
-     *                          returns a Promise.
-     */
-    public function setHandler(callable $handler)
-    {
-        $this->handler = $handler;
-        $this->cached = null;
-    }
-
-    /**
-     * Returns true if the builder has a handler.
-     *
-     * @return bool
-     */
-    public function hasHandler()
-    {
-        return (bool) $this->handler;
-    }
-
-    /**
-     * Unshift a middleware to the bottom of the stack.
-     *
-     * @param callable $middleware Middleware function
-     * @param string   $name       Name to register for this middleware.
-     */
-    public function unshift(callable $middleware, $name = null)
-    {
-        array_unshift($this->stack, [$middleware, $name]);
-        $this->cached = null;
-    }
-
-    /**
-     * Push a middleware to the top of the stack.
-     *
-     * @param callable $middleware Middleware function
-     * @param string   $name       Name to register for this middleware.
-     */
-    public function push(callable $middleware, $name = '')
-    {
-        $this->stack[] = [$middleware, $name];
-        $this->cached = null;
-    }
-
-    /**
-     * Add a middleware before another middleware by name.
-     *
-     * @param string   $findName   Middleware to find
-     * @param callable $middleware Middleware function
-     * @param string   $withName   Name to register for this middleware.
-     */
-    public function before($findName, callable $middleware, $withName = '')
-    {
-        $this->splice($findName, $withName, $middleware, true);
-    }
-
-    /**
-     * Add a middleware after another middleware by name.
-     *
-     * @param string   $findName   Middleware to find
-     * @param callable $middleware Middleware function
-     * @param string   $withName   Name to register for this middleware.
-     */
-    public function after($findName, callable $middleware, $withName = '')
-    {
-        $this->splice($findName, $withName, $middleware, false);
-    }
-
-    /**
-     * Remove a middleware by instance or name from the stack.
-     *
-     * @param callable|string $remove Middleware to remove by instance or name.
-     */
-    public function remove($remove)
-    {
-        $this->cached = null;
-        $idx = is_callable($remove) ? 0 : 1;
-        $this->stack = array_values(array_filter(
-            $this->stack,
-            function ($tuple) use ($idx, $remove) {
-                return $tuple[$idx] !== $remove;
-            }
-        ));
-    }
-
-    /**
-     * Compose the middleware and handler into a single callable function.
-     *
-     * @return callable
-     */
-    public function resolve()
-    {
-        if (!$this->cached) {
-            if (!($prev = $this->handler)) {
-                throw new \LogicException('No handler has been specified');
-            }
-
-            foreach (array_reverse($this->stack) as $fn) {
-                $prev = $fn[0]($prev);
-            }
-
-            $this->cached = $prev;
-        }
-
-        return $this->cached;
-    }
-
-    /**
-     * @param $name
-     * @return int
-     */
-    private function findByName($name)
-    {
-        foreach ($this->stack as $k => $v) {
-            if ($v[1] === $name) {
-                return $k;
-            }
-        }
-
-        throw new \InvalidArgumentException("Middleware not found: $name");
-    }
-
-    /**
-     * Splices a function into the middleware list at a specific position.
-     *
-     * @param          $findName
-     * @param          $withName
-     * @param callable $middleware
-     * @param          $before
-     */
-    private function splice($findName, $withName, callable $middleware, $before)
-    {
-        $this->cached = null;
-        $idx = $this->findByName($findName);
-        $tuple = [$middleware, $withName];
-
-        if ($before) {
-            if ($idx === 0) {
-                array_unshift($this->stack, $tuple);
-            } else {
-                $replacement = [$tuple, $this->stack[$idx]];
-                array_splice($this->stack, $idx, 1, $replacement);
-            }
-        } elseif ($idx === count($this->stack) - 1) {
-            $this->stack[] = $tuple;
-        } else {
-            $replacement = [$this->stack[$idx], $tuple];
-            array_splice($this->stack, $idx, 1, $replacement);
-        }
-    }
-
-    /**
-     * Provides a debug string for a given callable.
-     *
-     * @param array|callable $fn Function to write as a string.
-     *
-     * @return string
-     */
-    private function debugCallable($fn)
-    {
-        if (is_string($fn)) {
-            return "callable({$fn})";
-        }
-
-        if (is_array($fn)) {
-            return is_string($fn[0])
-                ? "callable({$fn[0]}::{$fn[1]})"
-                : "callable(['" . get_class($fn[0]) . "', '{$fn[1]}'])";
-        }
-
-        return 'callable(' . spl_object_hash($fn) . ')';
-    }
-}
diff --git a/mayor-orig/www/include/share/googleapi/guzzlehttp/guzzle/src/MessageFormatter.php b/mayor-orig/www/include/share/googleapi/guzzlehttp/guzzle/src/MessageFormatter.php
deleted file mode 100644
index 6b090a97..00000000
--- a/mayor-orig/www/include/share/googleapi/guzzlehttp/guzzle/src/MessageFormatter.php
+++ /dev/null
@@ -1,182 +0,0 @@
->>>>>>>\n{request}\n<<<<<<<<\n{response}\n--------\n{error}";
-    const SHORT = '[{ts}] "{method} {target} HTTP/{version}" {code}';
-
-    /** @var string Template used to format log messages */
-    private $template;
-
-    /**
-     * @param string $template Log message template
-     */
-    public function __construct($template = self::CLF)
-    {
-        $this->template = $template ?: self::CLF;
-    }
-
-    /**
-     * Returns a formatted message string.
-     *
-     * @param RequestInterface  $request  Request that was sent
-     * @param ResponseInterface $response Response that was received
-     * @param \Exception        $error    Exception that was received
-     *
-     * @return string
-     */
-    public function format(
-        RequestInterface $request,
-        ResponseInterface $response = null,
-        \Exception $error = null
-    ) {
-        $cache = [];
-
-        return preg_replace_callback(
-            '/{\s*([A-Za-z_\-\.0-9]+)\s*}/',
-            function (array $matches) use ($request, $response, $error, &$cache) {
-
-                if (isset($cache[$matches[1]])) {
-                    return $cache[$matches[1]];
-                }
-
-                $result = '';
-                switch ($matches[1]) {
-                    case 'request':
-                        $result = Psr7\str($request);
-                        break;
-                    case 'response':
-                        $result = $response ? Psr7\str($response) : '';
-                        break;
-                    case 'req_headers':
-                        $result = trim($request->getMethod()
-                                . ' ' . $request->getRequestTarget())
-                            . ' HTTP/' . $request->getProtocolVersion() . "\r\n"
-                            . $this->headers($request);
-                        break;
-                    case 'res_headers':
-                        $result = $response ?
-                            sprintf(
-                                'HTTP/%s %d %s',
-                                $response->getProtocolVersion(),
-                                $response->getStatusCode(),
-                                $response->getReasonPhrase()
-                            ) . "\r\n" . $this->headers($response)
-                            : 'NULL';
-                        break;
-                    case 'req_body':
-                        $result = $request->getBody();
-                        break;
-                    case 'res_body':
-                        $result = $response ? $response->getBody() : 'NULL';
-                        break;
-                    case 'ts':
-                    case 'date_iso_8601':
-                        $result = gmdate('c');
-                        break;
-                    case 'date_common_log':
-                        $result = date('d/M/Y:H:i:s O');
-                        break;
-                    case 'method':
-                        $result = $request->getMethod();
-                        break;
-                    case 'version':
-                        $result = $request->getProtocolVersion();
-                        break;
-                    case 'uri':
-                    case 'url':
-                        $result = $request->getUri();
-                        break;
-                    case 'target':
-                        $result = $request->getRequestTarget();
-                        break;
-                    case 'req_version':
-                        $result = $request->getProtocolVersion();
-                        break;
-                    case 'res_version':
-                        $result = $response
-                            ? $response->getProtocolVersion()
-                            : 'NULL';
-                        break;
-                    case 'host':
-                        $result = $request->getHeaderLine('Host');
-                        break;
-                    case 'hostname':
-                        $result = gethostname();
-                        break;
-                    case 'code':
-                        $result = $response ? $response->getStatusCode() : 'NULL';
-                        break;
-                    case 'phrase':
-                        $result = $response ? $response->getReasonPhrase() : 'NULL';
-                        break;
-                    case 'error':
-                        $result = $error ? $error->getMessage() : 'NULL';
-                        break;
-                    default:
-                        // handle prefixed dynamic headers
-                        if (strpos($matches[1], 'req_header_') === 0) {
-                            $result = $request->getHeaderLine(substr($matches[1], 11));
-                        } elseif (strpos($matches[1], 'res_header_') === 0) {
-                            $result = $response
-                                ? $response->getHeaderLine(substr($matches[1], 11))
-                                : 'NULL';
-                        }
-                }
-
-                $cache[$matches[1]] = $result;
-                return $result;
-            },
-            $this->template
-        );
-    }
-
-    private function headers(MessageInterface $message)
-    {
-        $result = '';
-        foreach ($message->getHeaders() as $name => $values) {
-            $result .= $name . ': ' . implode(', ', $values) . "\r\n";
-        }
-
-        return trim($result);
-    }
-}
diff --git a/mayor-orig/www/include/share/googleapi/guzzlehttp/guzzle/src/Middleware.php b/mayor-orig/www/include/share/googleapi/guzzlehttp/guzzle/src/Middleware.php
deleted file mode 100644
index 9d79bd26..00000000
--- a/mayor-orig/www/include/share/googleapi/guzzlehttp/guzzle/src/Middleware.php
+++ /dev/null
@@ -1,254 +0,0 @@
-withCookieHeader($request);
-                return $handler($request, $options)
-                    ->then(function ($response) use ($cookieJar, $request) {
-                        $cookieJar->extractCookies($request, $response);
-                        return $response;
-                    }
-                );
-            };
-        };
-    }
-
-    /**
-     * Middleware that throws exceptions for 4xx or 5xx responses when the
-     * "http_error" request option is set to true.
-     *
-     * @return callable Returns a function that accepts the next handler.
-     */
-    public static function httpErrors()
-    {
-        return function (callable $handler) {
-            return function ($request, array $options) use ($handler) {
-                if (empty($options['http_errors'])) {
-                    return $handler($request, $options);
-                }
-                return $handler($request, $options)->then(
-                    function (ResponseInterface $response) use ($request, $handler) {
-                        $code = $response->getStatusCode();
-                        if ($code < 400) {
-                            return $response;
-                        }
-                        throw RequestException::create($request, $response);
-                    }
-                );
-            };
-        };
-    }
-
-    /**
-     * Middleware that pushes history data to an ArrayAccess container.
-     *
-     * @param array $container Container to hold the history (by reference).
-     *
-     * @return callable Returns a function that accepts the next handler.
-     * @throws \InvalidArgumentException if container is not an array or ArrayAccess.
-     */
-    public static function history(&$container)
-    {
-        if (!is_array($container) && !$container instanceof \ArrayAccess) {
-            throw new \InvalidArgumentException('history container must be an array or object implementing ArrayAccess');
-        }
-
-        return function (callable $handler) use (&$container) {
-            return function ($request, array $options) use ($handler, &$container) {
-                return $handler($request, $options)->then(
-                    function ($value) use ($request, &$container, $options) {
-                        $container[] = [
-                            'request'  => $request,
-                            'response' => $value,
-                            'error'    => null,
-                            'options'  => $options
-                        ];
-                        return $value;
-                    },
-                    function ($reason) use ($request, &$container, $options) {
-                        $container[] = [
-                            'request'  => $request,
-                            'response' => null,
-                            'error'    => $reason,
-                            'options'  => $options
-                        ];
-                        return \GuzzleHttp\Promise\rejection_for($reason);
-                    }
-                );
-            };
-        };
-    }
-
-    /**
-     * Middleware that invokes a callback before and after sending a request.
-     *
-     * The provided listener cannot modify or alter the response. It simply
-     * "taps" into the chain to be notified before returning the promise. The
-     * before listener accepts a request and options array, and the after
-     * listener accepts a request, options array, and response promise.
-     *
-     * @param callable $before Function to invoke before forwarding the request.
-     * @param callable $after  Function invoked after forwarding.
-     *
-     * @return callable Returns a function that accepts the next handler.
-     */
-    public static function tap(callable $before = null, callable $after = null)
-    {
-        return function (callable $handler) use ($before, $after) {
-            return function ($request, array $options) use ($handler, $before, $after) {
-                if ($before) {
-                    $before($request, $options);
-                }
-                $response = $handler($request, $options);
-                if ($after) {
-                    $after($request, $options, $response);
-                }
-                return $response;
-            };
-        };
-    }
-
-    /**
-     * Middleware that handles request redirects.
-     *
-     * @return callable Returns a function that accepts the next handler.
-     */
-    public static function redirect()
-    {
-        return function (callable $handler) {
-            return new RedirectMiddleware($handler);
-        };
-    }
-
-    /**
-     * Middleware that retries requests based on the boolean result of
-     * invoking the provided "decider" function.
-     *
-     * If no delay function is provided, a simple implementation of exponential
-     * backoff will be utilized.
-     *
-     * @param callable $decider Function that accepts the number of retries,
-     *                          a request, [response], and [exception] and
-     *                          returns true if the request is to be retried.
-     * @param callable $delay   Function that accepts the number of retries and
-     *                          returns the number of milliseconds to delay.
-     *
-     * @return callable Returns a function that accepts the next handler.
-     */
-    public static function retry(callable $decider, callable $delay = null)
-    {
-        return function (callable $handler) use ($decider, $delay) {
-            return new RetryMiddleware($decider, $handler, $delay);
-        };
-    }
-
-    /**
-     * Middleware that logs requests, responses, and errors using a message
-     * formatter.
-     *
-     * @param LoggerInterface  $logger Logs messages.
-     * @param MessageFormatter $formatter Formatter used to create message strings.
-     * @param string           $logLevel Level at which to log requests.
-     *
-     * @return callable Returns a function that accepts the next handler.
-     */
-    public static function log(LoggerInterface $logger, MessageFormatter $formatter, $logLevel = LogLevel::INFO)
-    {
-        return function (callable $handler) use ($logger, $formatter, $logLevel) {
-            return function ($request, array $options) use ($handler, $logger, $formatter, $logLevel) {
-                return $handler($request, $options)->then(
-                    function ($response) use ($logger, $request, $formatter, $logLevel) {
-                        $message = $formatter->format($request, $response);
-                        $logger->log($logLevel, $message);
-                        return $response;
-                    },
-                    function ($reason) use ($logger, $request, $formatter) {
-                        $response = $reason instanceof RequestException
-                            ? $reason->getResponse()
-                            : null;
-                        $message = $formatter->format($request, $response, $reason);
-                        $logger->notice($message);
-                        return \GuzzleHttp\Promise\rejection_for($reason);
-                    }
-                );
-            };
-        };
-    }
-
-    /**
-     * This middleware adds a default content-type if possible, a default
-     * content-length or transfer-encoding header, and the expect header.
-     *
-     * @return callable
-     */
-    public static function prepareBody()
-    {
-        return function (callable $handler) {
-            return new PrepareBodyMiddleware($handler);
-        };
-    }
-
-    /**
-     * Middleware that applies a map function to the request before passing to
-     * the next handler.
-     *
-     * @param callable $fn Function that accepts a RequestInterface and returns
-     *                     a RequestInterface.
-     * @return callable
-     */
-    public static function mapRequest(callable $fn)
-    {
-        return function (callable $handler) use ($fn) {
-            return function ($request, array $options) use ($handler, $fn) {
-                return $handler($fn($request), $options);
-            };
-        };
-    }
-
-    /**
-     * Middleware that applies a map function to the resolved promise's
-     * response.
-     *
-     * @param callable $fn Function that accepts a ResponseInterface and
-     *                     returns a ResponseInterface.
-     * @return callable
-     */
-    public static function mapResponse(callable $fn)
-    {
-        return function (callable $handler) use ($fn) {
-            return function ($request, array $options) use ($handler, $fn) {
-                return $handler($request, $options)->then($fn);
-            };
-        };
-    }
-}
diff --git a/mayor-orig/www/include/share/googleapi/guzzlehttp/guzzle/src/Pool.php b/mayor-orig/www/include/share/googleapi/guzzlehttp/guzzle/src/Pool.php
deleted file mode 100644
index 8f1be33c..00000000
--- a/mayor-orig/www/include/share/googleapi/guzzlehttp/guzzle/src/Pool.php
+++ /dev/null
@@ -1,123 +0,0 @@
- $rfn) {
-                if ($rfn instanceof RequestInterface) {
-                    yield $key => $client->sendAsync($rfn, $opts);
-                } elseif (is_callable($rfn)) {
-                    yield $key => $rfn($opts);
-                } else {
-                    throw new \InvalidArgumentException('Each value yielded by '
-                        . 'the iterator must be a Psr7\Http\Message\RequestInterface '
-                        . 'or a callable that returns a promise that fulfills '
-                        . 'with a Psr7\Message\Http\ResponseInterface object.');
-                }
-            }
-        };
-
-        $this->each = new EachPromise($requests(), $config);
-    }
-
-    public function promise()
-    {
-        return $this->each->promise();
-    }
-
-    /**
-     * Sends multiple requests concurrently and returns an array of responses
-     * and exceptions that uses the same ordering as the provided requests.
-     *
-     * IMPORTANT: This method keeps every request and response in memory, and
-     * as such, is NOT recommended when sending a large number or an
-     * indeterminate number of requests concurrently.
-     *
-     * @param ClientInterface $client   Client used to send the requests
-     * @param array|\Iterator $requests Requests to send concurrently.
-     * @param array           $options  Passes through the options available in
-     *                                  {@see GuzzleHttp\Pool::__construct}
-     *
-     * @return array Returns an array containing the response or an exception
-     *               in the same order that the requests were sent.
-     * @throws \InvalidArgumentException if the event format is incorrect.
-     */
-    public static function batch(
-        ClientInterface $client,
-        $requests,
-        array $options = []
-    ) {
-        $res = [];
-        self::cmpCallback($options, 'fulfilled', $res);
-        self::cmpCallback($options, 'rejected', $res);
-        $pool = new static($client, $requests, $options);
-        $pool->promise()->wait();
-        ksort($res);
-
-        return $res;
-    }
-
-    private static function cmpCallback(array &$options, $name, array &$results)
-    {
-        if (!isset($options[$name])) {
-            $options[$name] = function ($v, $k) use (&$results) {
-                $results[$k] = $v;
-            };
-        } else {
-            $currentFn = $options[$name];
-            $options[$name] = function ($v, $k) use (&$results, $currentFn) {
-                $currentFn($v, $k);
-                $results[$k] = $v;
-            };
-        }
-    }
-}
diff --git a/mayor-orig/www/include/share/googleapi/guzzlehttp/guzzle/src/PrepareBodyMiddleware.php b/mayor-orig/www/include/share/googleapi/guzzlehttp/guzzle/src/PrepareBodyMiddleware.php
deleted file mode 100644
index 2eb95f9b..00000000
--- a/mayor-orig/www/include/share/googleapi/guzzlehttp/guzzle/src/PrepareBodyMiddleware.php
+++ /dev/null
@@ -1,106 +0,0 @@
-nextHandler = $nextHandler;
-    }
-
-    /**
-     * @param RequestInterface $request
-     * @param array            $options
-     *
-     * @return PromiseInterface
-     */
-    public function __invoke(RequestInterface $request, array $options)
-    {
-        $fn = $this->nextHandler;
-
-        // Don't do anything if the request has no body.
-        if ($request->getBody()->getSize() === 0) {
-            return $fn($request, $options);
-        }
-
-        $modify = [];
-
-        // Add a default content-type if possible.
-        if (!$request->hasHeader('Content-Type')) {
-            if ($uri = $request->getBody()->getMetadata('uri')) {
-                if ($type = Psr7\mimetype_from_filename($uri)) {
-                    $modify['set_headers']['Content-Type'] = $type;
-                }
-            }
-        }
-
-        // Add a default content-length or transfer-encoding header.
-        if (!$request->hasHeader('Content-Length')
-            && !$request->hasHeader('Transfer-Encoding')
-        ) {
-            $size = $request->getBody()->getSize();
-            if ($size !== null) {
-                $modify['set_headers']['Content-Length'] = $size;
-            } else {
-                $modify['set_headers']['Transfer-Encoding'] = 'chunked';
-            }
-        }
-
-        // Add the expect header if needed.
-        $this->addExpectHeader($request, $options, $modify);
-
-        return $fn(Psr7\modify_request($request, $modify), $options);
-    }
-
-    private function addExpectHeader(
-        RequestInterface $request,
-        array $options,
-        array &$modify
-    ) {
-        // Determine if the Expect header should be used
-        if ($request->hasHeader('Expect')) {
-            return;
-        }
-
-        $expect = isset($options['expect']) ? $options['expect'] : null;
-
-        // Return if disabled or if you're not using HTTP/1.1 or HTTP/2.0
-        if ($expect === false || $request->getProtocolVersion() < 1.1) {
-            return;
-        }
-
-        // The expect header is unconditionally enabled
-        if ($expect === true) {
-            $modify['set_headers']['Expect'] = '100-Continue';
-            return;
-        }
-
-        // By default, send the expect header when the payload is > 1mb
-        if ($expect === null) {
-            $expect = 1048576;
-        }
-
-        // Always add if the body cannot be rewound, the size cannot be
-        // determined, or the size is greater than the cutoff threshold
-        $body = $request->getBody();
-        $size = $body->getSize();
-
-        if ($size === null || $size >= (int) $expect || !$body->isSeekable()) {
-            $modify['set_headers']['Expect'] = '100-Continue';
-        }
-    }
-}
diff --git a/mayor-orig/www/include/share/googleapi/guzzlehttp/guzzle/src/RedirectMiddleware.php b/mayor-orig/www/include/share/googleapi/guzzlehttp/guzzle/src/RedirectMiddleware.php
deleted file mode 100644
index 131b7717..00000000
--- a/mayor-orig/www/include/share/googleapi/guzzlehttp/guzzle/src/RedirectMiddleware.php
+++ /dev/null
@@ -1,237 +0,0 @@
- 5,
-        'protocols'       => ['http', 'https'],
-        'strict'          => false,
-        'referer'         => false,
-        'track_redirects' => false,
-    ];
-
-    /** @var callable  */
-    private $nextHandler;
-
-    /**
-     * @param callable $nextHandler Next handler to invoke.
-     */
-    public function __construct(callable $nextHandler)
-    {
-        $this->nextHandler = $nextHandler;
-    }
-
-    /**
-     * @param RequestInterface $request
-     * @param array            $options
-     *
-     * @return PromiseInterface
-     */
-    public function __invoke(RequestInterface $request, array $options)
-    {
-        $fn = $this->nextHandler;
-
-        if (empty($options['allow_redirects'])) {
-            return $fn($request, $options);
-        }
-
-        if ($options['allow_redirects'] === true) {
-            $options['allow_redirects'] = self::$defaultSettings;
-        } elseif (!is_array($options['allow_redirects'])) {
-            throw new \InvalidArgumentException('allow_redirects must be true, false, or array');
-        } else {
-            // Merge the default settings with the provided settings
-            $options['allow_redirects'] += self::$defaultSettings;
-        }
-
-        if (empty($options['allow_redirects']['max'])) {
-            return $fn($request, $options);
-        }
-
-        return $fn($request, $options)
-            ->then(function (ResponseInterface $response) use ($request, $options) {
-                return $this->checkRedirect($request, $options, $response);
-            });
-    }
-
-    /**
-     * @param RequestInterface  $request
-     * @param array             $options
-     * @param ResponseInterface|PromiseInterface $response
-     *
-     * @return ResponseInterface|PromiseInterface
-     */
-    public function checkRedirect(
-        RequestInterface $request,
-        array $options,
-        ResponseInterface $response
-    ) {
-        if (substr($response->getStatusCode(), 0, 1) != '3'
-            || !$response->hasHeader('Location')
-        ) {
-            return $response;
-        }
-
-        $this->guardMax($request, $options);
-        $nextRequest = $this->modifyRequest($request, $options, $response);
-
-        if (isset($options['allow_redirects']['on_redirect'])) {
-            call_user_func(
-                $options['allow_redirects']['on_redirect'],
-                $request,
-                $response,
-                $nextRequest->getUri()
-            );
-        }
-
-        /** @var PromiseInterface|ResponseInterface $promise */
-        $promise = $this($nextRequest, $options);
-
-        // Add headers to be able to track history of redirects.
-        if (!empty($options['allow_redirects']['track_redirects'])) {
-            return $this->withTracking(
-                $promise,
-                (string) $nextRequest->getUri(),
-                $response->getStatusCode()
-            );
-        }
-
-        return $promise;
-    }
-
-    private function withTracking(PromiseInterface $promise, $uri, $statusCode)
-    {
-        return $promise->then(
-            function (ResponseInterface $response) use ($uri, $statusCode) {
-                // Note that we are pushing to the front of the list as this
-                // would be an earlier response than what is currently present
-                // in the history header.
-                $historyHeader = $response->getHeader(self::HISTORY_HEADER);
-                $statusHeader = $response->getHeader(self::STATUS_HISTORY_HEADER);
-                array_unshift($historyHeader, $uri);
-                array_unshift($statusHeader, $statusCode);
-                return $response->withHeader(self::HISTORY_HEADER, $historyHeader)
-                                ->withHeader(self::STATUS_HISTORY_HEADER, $statusHeader);
-            }
-        );
-    }
-
-    private function guardMax(RequestInterface $request, array &$options)
-    {
-        $current = isset($options['__redirect_count'])
-            ? $options['__redirect_count']
-            : 0;
-        $options['__redirect_count'] = $current + 1;
-        $max = $options['allow_redirects']['max'];
-
-        if ($options['__redirect_count'] > $max) {
-            throw new TooManyRedirectsException(
-                "Will not follow more than {$max} redirects",
-                $request
-            );
-        }
-    }
-
-    /**
-     * @param RequestInterface  $request
-     * @param array             $options
-     * @param ResponseInterface $response
-     *
-     * @return RequestInterface
-     */
-    public function modifyRequest(
-        RequestInterface $request,
-        array $options,
-        ResponseInterface $response
-    ) {
-        // Request modifications to apply.
-        $modify = [];
-        $protocols = $options['allow_redirects']['protocols'];
-
-        // Use a GET request if this is an entity enclosing request and we are
-        // not forcing RFC compliance, but rather emulating what all browsers
-        // would do.
-        $statusCode = $response->getStatusCode();
-        if ($statusCode == 303 ||
-            ($statusCode <= 302 && $request->getBody() && !$options['allow_redirects']['strict'])
-        ) {
-            $modify['method'] = 'GET';
-            $modify['body'] = '';
-        }
-
-        $modify['uri'] = $this->redirectUri($request, $response, $protocols);
-        Psr7\rewind_body($request);
-
-        // Add the Referer header if it is told to do so and only
-        // add the header if we are not redirecting from https to http.
-        if ($options['allow_redirects']['referer']
-            && $modify['uri']->getScheme() === $request->getUri()->getScheme()
-        ) {
-            $uri = $request->getUri()->withUserInfo('', '');
-            $modify['set_headers']['Referer'] = (string) $uri;
-        } else {
-            $modify['remove_headers'][] = 'Referer';
-        }
-
-        // Remove Authorization header if host is different.
-        if ($request->getUri()->getHost() !== $modify['uri']->getHost()) {
-            $modify['remove_headers'][] = 'Authorization';
-        }
-
-        return Psr7\modify_request($request, $modify);
-    }
-
-    /**
-     * Set the appropriate URL on the request based on the location header
-     *
-     * @param RequestInterface  $request
-     * @param ResponseInterface $response
-     * @param array             $protocols
-     *
-     * @return UriInterface
-     */
-    private function redirectUri(
-        RequestInterface $request,
-        ResponseInterface $response,
-        array $protocols
-    ) {
-        $location = Psr7\UriResolver::resolve(
-            $request->getUri(),
-            new Psr7\Uri($response->getHeaderLine('Location'))
-        );
-
-        // Ensure that the redirect URI is allowed based on the protocols.
-        if (!in_array($location->getScheme(), $protocols)) {
-            throw new BadResponseException(
-                sprintf(
-                    'Redirect URI, %s, does not use one of the allowed redirect protocols: %s',
-                    $location,
-                    implode(', ', $protocols)
-                ),
-                $request,
-                $response
-            );
-        }
-
-        return $location;
-    }
-}
diff --git a/mayor-orig/www/include/share/googleapi/guzzlehttp/guzzle/src/RequestOptions.php b/mayor-orig/www/include/share/googleapi/guzzlehttp/guzzle/src/RequestOptions.php
deleted file mode 100644
index c6aacfb1..00000000
--- a/mayor-orig/www/include/share/googleapi/guzzlehttp/guzzle/src/RequestOptions.php
+++ /dev/null
@@ -1,255 +0,0 @@
-decider = $decider;
-        $this->nextHandler = $nextHandler;
-        $this->delay = $delay ?: __CLASS__ . '::exponentialDelay';
-    }
-
-    /**
-     * Default exponential backoff delay function.
-     *
-     * @param $retries
-     *
-     * @return int
-     */
-    public static function exponentialDelay($retries)
-    {
-        return (int) pow(2, $retries - 1);
-    }
-
-    /**
-     * @param RequestInterface $request
-     * @param array            $options
-     *
-     * @return PromiseInterface
-     */
-    public function __invoke(RequestInterface $request, array $options)
-    {
-        if (!isset($options['retries'])) {
-            $options['retries'] = 0;
-        }
-
-        $fn = $this->nextHandler;
-        return $fn($request, $options)
-            ->then(
-                $this->onFulfilled($request, $options),
-                $this->onRejected($request, $options)
-            );
-    }
-
-    private function onFulfilled(RequestInterface $req, array $options)
-    {
-        return function ($value) use ($req, $options) {
-            if (!call_user_func(
-                $this->decider,
-                $options['retries'],
-                $req,
-                $value,
-                null
-            )) {
-                return $value;
-            }
-            return $this->doRetry($req, $options, $value);
-        };
-    }
-
-    private function onRejected(RequestInterface $req, array $options)
-    {
-        return function ($reason) use ($req, $options) {
-            if (!call_user_func(
-                $this->decider,
-                $options['retries'],
-                $req,
-                null,
-                $reason
-            )) {
-                return \GuzzleHttp\Promise\rejection_for($reason);
-            }
-            return $this->doRetry($req, $options);
-        };
-    }
-
-    private function doRetry(RequestInterface $request, array $options, ResponseInterface $response = null)
-    {
-        $options['delay'] = call_user_func($this->delay, ++$options['retries'], $response);
-
-        return $this($request, $options);
-    }
-}
diff --git a/mayor-orig/www/include/share/googleapi/guzzlehttp/guzzle/src/TransferStats.php b/mayor-orig/www/include/share/googleapi/guzzlehttp/guzzle/src/TransferStats.php
deleted file mode 100644
index 15f717e1..00000000
--- a/mayor-orig/www/include/share/googleapi/guzzlehttp/guzzle/src/TransferStats.php
+++ /dev/null
@@ -1,126 +0,0 @@
-request = $request;
-        $this->response = $response;
-        $this->transferTime = $transferTime;
-        $this->handlerErrorData = $handlerErrorData;
-        $this->handlerStats = $handlerStats;
-    }
-
-    /**
-     * @return RequestInterface
-     */
-    public function getRequest()
-    {
-        return $this->request;
-    }
-
-    /**
-     * Returns the response that was received (if any).
-     *
-     * @return ResponseInterface|null
-     */
-    public function getResponse()
-    {
-        return $this->response;
-    }
-
-    /**
-     * Returns true if a response was received.
-     *
-     * @return bool
-     */
-    public function hasResponse()
-    {
-        return $this->response !== null;
-    }
-
-    /**
-     * Gets handler specific error data.
-     *
-     * This might be an exception, a integer representing an error code, or
-     * anything else. Relying on this value assumes that you know what handler
-     * you are using.
-     *
-     * @return mixed
-     */
-    public function getHandlerErrorData()
-    {
-        return $this->handlerErrorData;
-    }
-
-    /**
-     * Get the effective URI the request was sent to.
-     *
-     * @return UriInterface
-     */
-    public function getEffectiveUri()
-    {
-        return $this->request->getUri();
-    }
-
-    /**
-     * Get the estimated time the request was being transferred by the handler.
-     *
-     * @return float Time in seconds.
-     */
-    public function getTransferTime()
-    {
-        return $this->transferTime;
-    }
-
-    /**
-     * Gets an array of all of the handler specific transfer data.
-     *
-     * @return array
-     */
-    public function getHandlerStats()
-    {
-        return $this->handlerStats;
-    }
-
-    /**
-     * Get a specific handler statistic from the handler by name.
-     *
-     * @param string $stat Handler specific transfer stat to retrieve.
-     *
-     * @return mixed|null
-     */
-    public function getHandlerStat($stat)
-    {
-        return isset($this->handlerStats[$stat])
-            ? $this->handlerStats[$stat]
-            : null;
-    }
-}
diff --git a/mayor-orig/www/include/share/googleapi/guzzlehttp/guzzle/src/UriTemplate.php b/mayor-orig/www/include/share/googleapi/guzzlehttp/guzzle/src/UriTemplate.php
deleted file mode 100644
index 0b1623ec..00000000
--- a/mayor-orig/www/include/share/googleapi/guzzlehttp/guzzle/src/UriTemplate.php
+++ /dev/null
@@ -1,241 +0,0 @@
- ['prefix' => '',  'joiner' => ',', 'query' => false],
-        '+' => ['prefix' => '',  'joiner' => ',', 'query' => false],
-        '#' => ['prefix' => '#', 'joiner' => ',', 'query' => false],
-        '.' => ['prefix' => '.', 'joiner' => '.', 'query' => false],
-        '/' => ['prefix' => '/', 'joiner' => '/', 'query' => false],
-        ';' => ['prefix' => ';', 'joiner' => ';', 'query' => true],
-        '?' => ['prefix' => '?', 'joiner' => '&', 'query' => true],
-        '&' => ['prefix' => '&', 'joiner' => '&', 'query' => true]
-    ];
-
-    /** @var array Delimiters */
-    private static $delims = [':', '/', '?', '#', '[', ']', '@', '!', '$',
-        '&', '\'', '(', ')', '*', '+', ',', ';', '='];
-
-    /** @var array Percent encoded delimiters */
-    private static $delimsPct = ['%3A', '%2F', '%3F', '%23', '%5B', '%5D',
-        '%40', '%21', '%24', '%26', '%27', '%28', '%29', '%2A', '%2B', '%2C',
-        '%3B', '%3D'];
-
-    public function expand($template, array $variables)
-    {
-        if (false === strpos($template, '{')) {
-            return $template;
-        }
-
-        $this->template = $template;
-        $this->variables = $variables;
-
-        return preg_replace_callback(
-            '/\{([^\}]+)\}/',
-            [$this, 'expandMatch'],
-            $this->template
-        );
-    }
-
-    /**
-     * Parse an expression into parts
-     *
-     * @param string $expression Expression to parse
-     *
-     * @return array Returns an associative array of parts
-     */
-    private function parseExpression($expression)
-    {
-        $result = [];
-
-        if (isset(self::$operatorHash[$expression[0]])) {
-            $result['operator'] = $expression[0];
-            $expression = substr($expression, 1);
-        } else {
-            $result['operator'] = '';
-        }
-
-        foreach (explode(',', $expression) as $value) {
-            $value = trim($value);
-            $varspec = [];
-            if ($colonPos = strpos($value, ':')) {
-                $varspec['value'] = substr($value, 0, $colonPos);
-                $varspec['modifier'] = ':';
-                $varspec['position'] = (int) substr($value, $colonPos + 1);
-            } elseif (substr($value, -1) === '*') {
-                $varspec['modifier'] = '*';
-                $varspec['value'] = substr($value, 0, -1);
-            } else {
-                $varspec['value'] = (string) $value;
-                $varspec['modifier'] = '';
-            }
-            $result['values'][] = $varspec;
-        }
-
-        return $result;
-    }
-
-    /**
-     * Process an expansion
-     *
-     * @param array $matches Matches met in the preg_replace_callback
-     *
-     * @return string Returns the replacement string
-     */
-    private function expandMatch(array $matches)
-    {
-        static $rfc1738to3986 = ['+' => '%20', '%7e' => '~'];
-
-        $replacements = [];
-        $parsed = self::parseExpression($matches[1]);
-        $prefix = self::$operatorHash[$parsed['operator']]['prefix'];
-        $joiner = self::$operatorHash[$parsed['operator']]['joiner'];
-        $useQuery = self::$operatorHash[$parsed['operator']]['query'];
-
-        foreach ($parsed['values'] as $value) {
-
-            if (!isset($this->variables[$value['value']])) {
-                continue;
-            }
-
-            $variable = $this->variables[$value['value']];
-            $actuallyUseQuery = $useQuery;
-            $expanded = '';
-
-            if (is_array($variable)) {
-
-                $isAssoc = $this->isAssoc($variable);
-                $kvp = [];
-                foreach ($variable as $key => $var) {
-
-                    if ($isAssoc) {
-                        $key = rawurlencode($key);
-                        $isNestedArray = is_array($var);
-                    } else {
-                        $isNestedArray = false;
-                    }
-
-                    if (!$isNestedArray) {
-                        $var = rawurlencode($var);
-                        if ($parsed['operator'] === '+' ||
-                            $parsed['operator'] === '#'
-                        ) {
-                            $var = $this->decodeReserved($var);
-                        }
-                    }
-
-                    if ($value['modifier'] === '*') {
-                        if ($isAssoc) {
-                            if ($isNestedArray) {
-                                // Nested arrays must allow for deeply nested
-                                // structures.
-                                $var = strtr(
-                                    http_build_query([$key => $var]),
-                                    $rfc1738to3986
-                                );
-                            } else {
-                                $var = $key . '=' . $var;
-                            }
-                        } elseif ($key > 0 && $actuallyUseQuery) {
-                            $var = $value['value'] . '=' . $var;
-                        }
-                    }
-
-                    $kvp[$key] = $var;
-                }
-
-                if (empty($variable)) {
-                    $actuallyUseQuery = false;
-                } elseif ($value['modifier'] === '*') {
-                    $expanded = implode($joiner, $kvp);
-                    if ($isAssoc) {
-                        // Don't prepend the value name when using the explode
-                        // modifier with an associative array.
-                        $actuallyUseQuery = false;
-                    }
-                } else {
-                    if ($isAssoc) {
-                        // When an associative array is encountered and the
-                        // explode modifier is not set, then the result must be
-                        // a comma separated list of keys followed by their
-                        // respective values.
-                        foreach ($kvp as $k => &$v) {
-                            $v = $k . ',' . $v;
-                        }
-                    }
-                    $expanded = implode(',', $kvp);
-                }
-
-            } else {
-                if ($value['modifier'] === ':') {
-                    $variable = substr($variable, 0, $value['position']);
-                }
-                $expanded = rawurlencode($variable);
-                if ($parsed['operator'] === '+' || $parsed['operator'] === '#') {
-                    $expanded = $this->decodeReserved($expanded);
-                }
-            }
-
-            if ($actuallyUseQuery) {
-                if (!$expanded && $joiner !== '&') {
-                    $expanded = $value['value'];
-                } else {
-                    $expanded = $value['value'] . '=' . $expanded;
-                }
-            }
-
-            $replacements[] = $expanded;
-        }
-
-        $ret = implode($joiner, $replacements);
-        if ($ret && $prefix) {
-            return $prefix . $ret;
-        }
-
-        return $ret;
-    }
-
-    /**
-     * Determines if an array is associative.
-     *
-     * This makes the assumption that input arrays are sequences or hashes.
-     * This assumption is a tradeoff for accuracy in favor of speed, but it
-     * should work in almost every case where input is supplied for a URI
-     * template.
-     *
-     * @param array $array Array to check
-     *
-     * @return bool
-     */
-    private function isAssoc(array $array)
-    {
-        return $array && array_keys($array)[0] !== 0;
-    }
-
-    /**
-     * Removes percent encoding on reserved characters (used with + and #
-     * modifiers).
-     *
-     * @param string $string String to fix
-     *
-     * @return string
-     */
-    private function decodeReserved($string)
-    {
-        return str_replace(self::$delimsPct, self::$delims, $string);
-    }
-}
diff --git a/mayor-orig/www/include/share/googleapi/guzzlehttp/guzzle/src/functions.php b/mayor-orig/www/include/share/googleapi/guzzlehttp/guzzle/src/functions.php
deleted file mode 100644
index 59e212ed..00000000
--- a/mayor-orig/www/include/share/googleapi/guzzlehttp/guzzle/src/functions.php
+++ /dev/null
@@ -1,331 +0,0 @@
-expand($template, $variables);
-}
-
-/**
- * Debug function used to describe the provided value type and class.
- *
- * @param mixed $input
- *
- * @return string Returns a string containing the type of the variable and
- *                if a class is provided, the class name.
- */
-function describe_type($input)
-{
-    switch (gettype($input)) {
-        case 'object':
-            return 'object(' . get_class($input) . ')';
-        case 'array':
-            return 'array(' . count($input) . ')';
-        default:
-            ob_start();
-            var_dump($input);
-            // normalize float vs double
-            return str_replace('double(', 'float(', rtrim(ob_get_clean()));
-    }
-}
-
-/**
- * Parses an array of header lines into an associative array of headers.
- *
- * @param array $lines Header lines array of strings in the following
- *                     format: "Name: Value"
- * @return array
- */
-function headers_from_lines($lines)
-{
-    $headers = [];
-
-    foreach ($lines as $line) {
-        $parts = explode(':', $line, 2);
-        $headers[trim($parts[0])][] = isset($parts[1])
-            ? trim($parts[1])
-            : null;
-    }
-
-    return $headers;
-}
-
-/**
- * Returns a debug stream based on the provided variable.
- *
- * @param mixed $value Optional value
- *
- * @return resource
- */
-function debug_resource($value = null)
-{
-    if (is_resource($value)) {
-        return $value;
-    } elseif (defined('STDOUT')) {
-        return STDOUT;
-    }
-
-    return fopen('php://output', 'w');
-}
-
-/**
- * Chooses and creates a default handler to use based on the environment.
- *
- * The returned handler is not wrapped by any default middlewares.
- *
- * @throws \RuntimeException if no viable Handler is available.
- * @return callable Returns the best handler for the given system.
- */
-function choose_handler()
-{
-    $handler = null;
-    if (function_exists('curl_multi_exec') && function_exists('curl_exec')) {
-        $handler = Proxy::wrapSync(new CurlMultiHandler(), new CurlHandler());
-    } elseif (function_exists('curl_exec')) {
-        $handler = new CurlHandler();
-    } elseif (function_exists('curl_multi_exec')) {
-        $handler = new CurlMultiHandler();
-    }
-
-    if (ini_get('allow_url_fopen')) {
-        $handler = $handler
-            ? Proxy::wrapStreaming($handler, new StreamHandler())
-            : new StreamHandler();
-    } elseif (!$handler) {
-        throw new \RuntimeException('GuzzleHttp requires cURL, the '
-            . 'allow_url_fopen ini setting, or a custom HTTP handler.');
-    }
-
-    return $handler;
-}
-
-/**
- * Get the default User-Agent string to use with Guzzle
- *
- * @return string
- */
-function default_user_agent()
-{
-    static $defaultAgent = '';
-
-    if (!$defaultAgent) {
-        $defaultAgent = 'GuzzleHttp/' . Client::VERSION;
-        if (extension_loaded('curl') && function_exists('curl_version')) {
-            $defaultAgent .= ' curl/' . \curl_version()['version'];
-        }
-        $defaultAgent .= ' PHP/' . PHP_VERSION;
-    }
-
-    return $defaultAgent;
-}
-
-/**
- * Returns the default cacert bundle for the current system.
- *
- * First, the openssl.cafile and curl.cainfo php.ini settings are checked.
- * If those settings are not configured, then the common locations for
- * bundles found on Red Hat, CentOS, Fedora, Ubuntu, Debian, FreeBSD, OS X
- * and Windows are checked. If any of these file locations are found on
- * disk, they will be utilized.
- *
- * Note: the result of this function is cached for subsequent calls.
- *
- * @return string
- * @throws \RuntimeException if no bundle can be found.
- */
-function default_ca_bundle()
-{
-    static $cached = null;
-    static $cafiles = [
-        // Red Hat, CentOS, Fedora (provided by the ca-certificates package)
-        '/etc/pki/tls/certs/ca-bundle.crt',
-        // Ubuntu, Debian (provided by the ca-certificates package)
-        '/etc/ssl/certs/ca-certificates.crt',
-        // FreeBSD (provided by the ca_root_nss package)
-        '/usr/local/share/certs/ca-root-nss.crt',
-        // SLES 12 (provided by the ca-certificates package)
-        '/var/lib/ca-certificates/ca-bundle.pem',
-        // OS X provided by homebrew (using the default path)
-        '/usr/local/etc/openssl/cert.pem',
-        // Google app engine
-        '/etc/ca-certificates.crt',
-        // Windows?
-        'C:\\windows\\system32\\curl-ca-bundle.crt',
-        'C:\\windows\\curl-ca-bundle.crt',
-    ];
-
-    if ($cached) {
-        return $cached;
-    }
-
-    if ($ca = ini_get('openssl.cafile')) {
-        return $cached = $ca;
-    }
-
-    if ($ca = ini_get('curl.cainfo')) {
-        return $cached = $ca;
-    }
-
-    foreach ($cafiles as $filename) {
-        if (file_exists($filename)) {
-            return $cached = $filename;
-        }
-    }
-
-    throw new \RuntimeException(<<< EOT
-No system CA bundle could be found in any of the the common system locations.
-PHP versions earlier than 5.6 are not properly configured to use the system's
-CA bundle by default. In order to verify peer certificates, you will need to
-supply the path on disk to a certificate bundle to the 'verify' request
-option: http://docs.guzzlephp.org/en/latest/clients.html#verify. If you do not
-need a specific certificate bundle, then Mozilla provides a commonly used CA
-bundle which can be downloaded here (provided by the maintainer of cURL):
-https://raw.githubusercontent.com/bagder/ca-bundle/master/ca-bundle.crt. Once
-you have a CA bundle available on disk, you can set the 'openssl.cafile' PHP
-ini setting to point to the path to the file, allowing you to omit the 'verify'
-request option. See http://curl.haxx.se/docs/sslcerts.html for more
-information.
-EOT
-    );
-}
-
-/**
- * Creates an associative array of lowercase header names to the actual
- * header casing.
- *
- * @param array $headers
- *
- * @return array
- */
-function normalize_header_keys(array $headers)
-{
-    $result = [];
-    foreach (array_keys($headers) as $key) {
-        $result[strtolower($key)] = $key;
-    }
-
-    return $result;
-}
-
-/**
- * Returns true if the provided host matches any of the no proxy areas.
- *
- * This method will strip a port from the host if it is present. Each pattern
- * can be matched with an exact match (e.g., "foo.com" == "foo.com") or a
- * partial match: (e.g., "foo.com" == "baz.foo.com" and ".foo.com" ==
- * "baz.foo.com", but ".foo.com" != "foo.com").
- *
- * Areas are matched in the following cases:
- * 1. "*" (without quotes) always matches any hosts.
- * 2. An exact match.
- * 3. The area starts with "." and the area is the last part of the host. e.g.
- *    '.mit.edu' will match any host that ends with '.mit.edu'.
- *
- * @param string $host         Host to check against the patterns.
- * @param array  $noProxyArray An array of host patterns.
- *
- * @return bool
- */
-function is_host_in_noproxy($host, array $noProxyArray)
-{
-    if (strlen($host) === 0) {
-        throw new \InvalidArgumentException('Empty host provided');
-    }
-
-    // Strip port if present.
-    if (strpos($host, ':')) {
-        $host = explode($host, ':', 2)[0];
-    }
-
-    foreach ($noProxyArray as $area) {
-        // Always match on wildcards.
-        if ($area === '*') {
-            return true;
-        } elseif (empty($area)) {
-            // Don't match on empty values.
-            continue;
-        } elseif ($area === $host) {
-            // Exact matches.
-            return true;
-        } else {
-            // Special match if the area when prefixed with ".". Remove any
-            // existing leading "." and add a new leading ".".
-            $area = '.' . ltrim($area, '.');
-            if (substr($host, -(strlen($area))) === $area) {
-                return true;
-            }
-        }
-    }
-
-    return false;
-}
-
-/**
- * Wrapper for json_decode that throws when an error occurs.
- *
- * @param string $json    JSON data to parse
- * @param bool $assoc     When true, returned objects will be converted
- *                        into associative arrays.
- * @param int    $depth   User specified recursion depth.
- * @param int    $options Bitmask of JSON decode options.
- *
- * @return mixed
- * @throws \InvalidArgumentException if the JSON cannot be decoded.
- * @link http://www.php.net/manual/en/function.json-decode.php
- */
-function json_decode($json, $assoc = false, $depth = 512, $options = 0)
-{
-    $data = \json_decode($json, $assoc, $depth, $options);
-    if (JSON_ERROR_NONE !== json_last_error()) {
-        throw new \InvalidArgumentException(
-            'json_decode error: ' . json_last_error_msg());
-    }
-
-    return $data;
-}
-
-/**
- * Wrapper for JSON encoding that throws when an error occurs.
- *
- * @param mixed $value   The value being encoded
- * @param int    $options JSON encode option bitmask
- * @param int    $depth   Set the maximum depth. Must be greater than zero.
- *
- * @return string
- * @throws \InvalidArgumentException if the JSON cannot be encoded.
- * @link http://www.php.net/manual/en/function.json-encode.php
- */
-function json_encode($value, $options = 0, $depth = 512)
-{
-    $json = \json_encode($value, $options, $depth);
-    if (JSON_ERROR_NONE !== json_last_error()) {
-        throw new \InvalidArgumentException(
-            'json_encode error: ' . json_last_error_msg());
-    }
-
-    return $json;
-}
diff --git a/mayor-orig/www/include/share/googleapi/guzzlehttp/guzzle/src/functions_include.php b/mayor-orig/www/include/share/googleapi/guzzlehttp/guzzle/src/functions_include.php
deleted file mode 100644
index a93393ac..00000000
--- a/mayor-orig/www/include/share/googleapi/guzzlehttp/guzzle/src/functions_include.php
+++ /dev/null
@@ -1,6 +0,0 @@
-
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-THE SOFTWARE.
diff --git a/mayor-orig/www/include/share/googleapi/guzzlehttp/promises/Makefile b/mayor-orig/www/include/share/googleapi/guzzlehttp/promises/Makefile
deleted file mode 100644
index 8d5b3ef9..00000000
--- a/mayor-orig/www/include/share/googleapi/guzzlehttp/promises/Makefile
+++ /dev/null
@@ -1,13 +0,0 @@
-all: clean test
-
-test:
-	vendor/bin/phpunit
-
-coverage:
-	vendor/bin/phpunit --coverage-html=artifacts/coverage
-
-view-coverage:
-	open artifacts/coverage/index.html
-
-clean:
-	rm -rf artifacts/*
diff --git a/mayor-orig/www/include/share/googleapi/guzzlehttp/promises/README.md b/mayor-orig/www/include/share/googleapi/guzzlehttp/promises/README.md
deleted file mode 100644
index 7b607e28..00000000
--- a/mayor-orig/www/include/share/googleapi/guzzlehttp/promises/README.md
+++ /dev/null
@@ -1,504 +0,0 @@
-# Guzzle Promises
-
-[Promises/A+](https://promisesaplus.com/) implementation that handles promise
-chaining and resolution iteratively, allowing for "infinite" promise chaining
-while keeping the stack size constant. Read [this blog post](https://blog.domenic.me/youre-missing-the-point-of-promises/)
-for a general introduction to promises.
-
-- [Features](#features)
-- [Quick start](#quick-start)
-- [Synchronous wait](#synchronous-wait)
-- [Cancellation](#cancellation)
-- [API](#api)
-  - [Promise](#promise)
-  - [FulfilledPromise](#fulfilledpromise)
-  - [RejectedPromise](#rejectedpromise)
-- [Promise interop](#promise-interop)
-- [Implementation notes](#implementation-notes)
-
-
-# Features
-
-- [Promises/A+](https://promisesaplus.com/) implementation.
-- Promise resolution and chaining is handled iteratively, allowing for
-  "infinite" promise chaining.
-- Promises have a synchronous `wait` method.
-- Promises can be cancelled.
-- Works with any object that has a `then` function.
-- C# style async/await coroutine promises using
-  `GuzzleHttp\Promise\coroutine()`.
-
-
-# Quick start
-
-A *promise* represents the eventual result of an asynchronous operation. The
-primary way of interacting with a promise is through its `then` method, which
-registers callbacks to receive either a promise's eventual value or the reason
-why the promise cannot be fulfilled.
-
-
-## Callbacks
-
-Callbacks are registered with the `then` method by providing an optional 
-`$onFulfilled` followed by an optional `$onRejected` function.
-
-
-```php
-use GuzzleHttp\Promise\Promise;
-
-$promise = new Promise();
-$promise->then(
-    // $onFulfilled
-    function ($value) {
-        echo 'The promise was fulfilled.';
-    },
-    // $onRejected
-    function ($reason) {
-        echo 'The promise was rejected.';
-    }
-);
-```
-
-*Resolving* a promise means that you either fulfill a promise with a *value* or
-reject a promise with a *reason*. Resolving a promises triggers callbacks
-registered with the promises's `then` method. These callbacks are triggered
-only once and in the order in which they were added.
-
-
-## Resolving a promise
-
-Promises are fulfilled using the `resolve($value)` method. Resolving a promise
-with any value other than a `GuzzleHttp\Promise\RejectedPromise` will trigger
-all of the onFulfilled callbacks (resolving a promise with a rejected promise
-will reject the promise and trigger the `$onRejected` callbacks).
-
-```php
-use GuzzleHttp\Promise\Promise;
-
-$promise = new Promise();
-$promise
-    ->then(function ($value) {
-        // Return a value and don't break the chain
-        return "Hello, " . $value;
-    })
-    // This then is executed after the first then and receives the value
-    // returned from the first then.
-    ->then(function ($value) {
-        echo $value;
-    });
-
-// Resolving the promise triggers the $onFulfilled callbacks and outputs
-// "Hello, reader".
-$promise->resolve('reader.');
-```
-
-
-## Promise forwarding
-
-Promises can be chained one after the other. Each then in the chain is a new
-promise. The return value of a promise is what's forwarded to the next
-promise in the chain. Returning a promise in a `then` callback will cause the
-subsequent promises in the chain to only be fulfilled when the returned promise
-has been fulfilled. The next promise in the chain will be invoked with the
-resolved value of the promise.
-
-```php
-use GuzzleHttp\Promise\Promise;
-
-$promise = new Promise();
-$nextPromise = new Promise();
-
-$promise
-    ->then(function ($value) use ($nextPromise) {
-        echo $value;
-        return $nextPromise;
-    })
-    ->then(function ($value) {
-        echo $value;
-    });
-
-// Triggers the first callback and outputs "A"
-$promise->resolve('A');
-// Triggers the second callback and outputs "B"
-$nextPromise->resolve('B');
-```
-
-## Promise rejection
-
-When a promise is rejected, the `$onRejected` callbacks are invoked with the
-rejection reason.
-
-```php
-use GuzzleHttp\Promise\Promise;
-
-$promise = new Promise();
-$promise->then(null, function ($reason) {
-    echo $reason;
-});
-
-$promise->reject('Error!');
-// Outputs "Error!"
-```
-
-## Rejection forwarding
-
-If an exception is thrown in an `$onRejected` callback, subsequent
-`$onRejected` callbacks are invoked with the thrown exception as the reason.
-
-```php
-use GuzzleHttp\Promise\Promise;
-
-$promise = new Promise();
-$promise->then(null, function ($reason) {
-    throw new \Exception($reason);
-})->then(null, function ($reason) {
-    assert($reason->getMessage() === 'Error!');
-});
-
-$promise->reject('Error!');
-```
-
-You can also forward a rejection down the promise chain by returning a
-`GuzzleHttp\Promise\RejectedPromise` in either an `$onFulfilled` or
-`$onRejected` callback.
-
-```php
-use GuzzleHttp\Promise\Promise;
-use GuzzleHttp\Promise\RejectedPromise;
-
-$promise = new Promise();
-$promise->then(null, function ($reason) {
-    return new RejectedPromise($reason);
-})->then(null, function ($reason) {
-    assert($reason === 'Error!');
-});
-
-$promise->reject('Error!');
-```
-
-If an exception is not thrown in a `$onRejected` callback and the callback
-does not return a rejected promise, downstream `$onFulfilled` callbacks are
-invoked using the value returned from the `$onRejected` callback.
-
-```php
-use GuzzleHttp\Promise\Promise;
-use GuzzleHttp\Promise\RejectedPromise;
-
-$promise = new Promise();
-$promise
-    ->then(null, function ($reason) {
-        return "It's ok";
-    })
-    ->then(function ($value) {
-        assert($value === "It's ok");
-    });
-
-$promise->reject('Error!');
-```
-
-# Synchronous wait
-
-You can synchronously force promises to complete using a promise's `wait`
-method. When creating a promise, you can provide a wait function that is used
-to synchronously force a promise to complete. When a wait function is invoked
-it is expected to deliver a value to the promise or reject the promise. If the
-wait function does not deliver a value, then an exception is thrown. The wait
-function provided to a promise constructor is invoked when the `wait` function
-of the promise is called.
-
-```php
-$promise = new Promise(function () use (&$promise) {
-    $promise->resolve('foo');
-});
-
-// Calling wait will return the value of the promise.
-echo $promise->wait(); // outputs "foo"
-```
-
-If an exception is encountered while invoking the wait function of a promise,
-the promise is rejected with the exception and the exception is thrown.
-
-```php
-$promise = new Promise(function () use (&$promise) {
-    throw new \Exception('foo');
-});
-
-$promise->wait(); // throws the exception.
-```
-
-Calling `wait` on a promise that has been fulfilled will not trigger the wait
-function. It will simply return the previously resolved value.
-
-```php
-$promise = new Promise(function () { die('this is not called!'); });
-$promise->resolve('foo');
-echo $promise->wait(); // outputs "foo"
-```
-
-Calling `wait` on a promise that has been rejected will throw an exception. If
-the rejection reason is an instance of `\Exception` the reason is thrown.
-Otherwise, a `GuzzleHttp\Promise\RejectionException` is thrown and the reason
-can be obtained by calling the `getReason` method of the exception.
-
-```php
-$promise = new Promise();
-$promise->reject('foo');
-$promise->wait();
-```
-
-> PHP Fatal error:  Uncaught exception 'GuzzleHttp\Promise\RejectionException' with message 'The promise was rejected with value: foo'
-
-
-## Unwrapping a promise
-
-When synchronously waiting on a promise, you are joining the state of the
-promise into the current state of execution (i.e., return the value of the
-promise if it was fulfilled or throw an exception if it was rejected). This is
-called "unwrapping" the promise. Waiting on a promise will by default unwrap
-the promise state.
-
-You can force a promise to resolve and *not* unwrap the state of the promise
-by passing `false` to the first argument of the `wait` function:
-
-```php
-$promise = new Promise();
-$promise->reject('foo');
-// This will not throw an exception. It simply ensures the promise has
-// been resolved.
-$promise->wait(false);
-```
-
-When unwrapping a promise, the resolved value of the promise will be waited
-upon until the unwrapped value is not a promise. This means that if you resolve
-promise A with a promise B and unwrap promise A, the value returned by the
-wait function will be the value delivered to promise B.
-
-**Note**: when you do not unwrap the promise, no value is returned.
-
-
-# Cancellation
-
-You can cancel a promise that has not yet been fulfilled using the `cancel()`
-method of a promise. When creating a promise you can provide an optional
-cancel function that when invoked cancels the action of computing a resolution
-of the promise.
-
-
-# API
-
-
-## Promise
-
-When creating a promise object, you can provide an optional `$waitFn` and
-`$cancelFn`. `$waitFn` is a function that is invoked with no arguments and is
-expected to resolve the promise. `$cancelFn` is a function with no arguments
-that is expected to cancel the computation of a promise. It is invoked when the
-`cancel()` method of a promise is called.
-
-```php
-use GuzzleHttp\Promise\Promise;
-
-$promise = new Promise(
-    function () use (&$promise) {
-        $promise->resolve('waited');
-    },
-    function () {
-        // do something that will cancel the promise computation (e.g., close
-        // a socket, cancel a database query, etc...)
-    }
-);
-
-assert('waited' === $promise->wait());
-```
-
-A promise has the following methods:
-
-- `then(callable $onFulfilled, callable $onRejected) : PromiseInterface`
-  
-  Appends fulfillment and rejection handlers to the promise, and returns a new promise resolving to the return value of the called handler.
-
-- `otherwise(callable $onRejected) : PromiseInterface`
-  
-  Appends a rejection handler callback to the promise, and returns a new promise resolving to the return value of the callback if it is called, or to its original fulfillment value if the promise is instead fulfilled.
-
-- `wait($unwrap = true) : mixed`
-
-  Synchronously waits on the promise to complete.
-  
-  `$unwrap` controls whether or not the value of the promise is returned for a
-  fulfilled promise or if an exception is thrown if the promise is rejected.
-  This is set to `true` by default.
-
-- `cancel()`
-
-  Attempts to cancel the promise if possible. The promise being cancelled and
-  the parent most ancestor that has not yet been resolved will also be
-  cancelled. Any promises waiting on the cancelled promise to resolve will also
-  be cancelled.
-
-- `getState() : string`
-
-  Returns the state of the promise. One of `pending`, `fulfilled`, or
-  `rejected`.
-
-- `resolve($value)`
-
-  Fulfills the promise with the given `$value`.
-
-- `reject($reason)`
-
-  Rejects the promise with the given `$reason`.
-
-
-## FulfilledPromise
-
-A fulfilled promise can be created to represent a promise that has been
-fulfilled.
-
-```php
-use GuzzleHttp\Promise\FulfilledPromise;
-
-$promise = new FulfilledPromise('value');
-
-// Fulfilled callbacks are immediately invoked.
-$promise->then(function ($value) {
-    echo $value;
-});
-```
-
-
-## RejectedPromise
-
-A rejected promise can be created to represent a promise that has been
-rejected.
-
-```php
-use GuzzleHttp\Promise\RejectedPromise;
-
-$promise = new RejectedPromise('Error');
-
-// Rejected callbacks are immediately invoked.
-$promise->then(null, function ($reason) {
-    echo $reason;
-});
-```
-
-
-# Promise interop
-
-This library works with foreign promises that have a `then` method. This means
-you can use Guzzle promises with [React promises](https://github.com/reactphp/promise)
-for example. When a foreign promise is returned inside of a then method
-callback, promise resolution will occur recursively.
-
-```php
-// Create a React promise
-$deferred = new React\Promise\Deferred();
-$reactPromise = $deferred->promise();
-
-// Create a Guzzle promise that is fulfilled with a React promise.
-$guzzlePromise = new \GuzzleHttp\Promise\Promise();
-$guzzlePromise->then(function ($value) use ($reactPromise) {
-    // Do something something with the value...
-    // Return the React promise
-    return $reactPromise;
-});
-```
-
-Please note that wait and cancel chaining is no longer possible when forwarding
-a foreign promise. You will need to wrap a third-party promise with a Guzzle
-promise in order to utilize wait and cancel functions with foreign promises.
-
-
-## Event Loop Integration
-
-In order to keep the stack size constant, Guzzle promises are resolved
-asynchronously using a task queue. When waiting on promises synchronously, the
-task queue will be automatically run to ensure that the blocking promise and
-any forwarded promises are resolved. When using promises asynchronously in an
-event loop, you will need to run the task queue on each tick of the loop. If
-you do not run the task queue, then promises will not be resolved.
-
-You can run the task queue using the `run()` method of the global task queue
-instance.
-
-```php
-// Get the global task queue
-$queue = \GuzzleHttp\Promise\queue();
-$queue->run();
-```
-
-For example, you could use Guzzle promises with React using a periodic timer:
-
-```php
-$loop = React\EventLoop\Factory::create();
-$loop->addPeriodicTimer(0, [$queue, 'run']);
-```
-
-*TODO*: Perhaps adding a `futureTick()` on each tick would be faster?
-
-
-# Implementation notes
-
-
-## Promise resolution and chaining is handled iteratively
-
-By shuffling pending handlers from one owner to another, promises are
-resolved iteratively, allowing for "infinite" then chaining.
-
-```php
-then(function ($v) {
-        // The stack size remains constant (a good thing)
-        echo xdebug_get_stack_depth() . ', ';
-        return $v + 1;
-    });
-}
-
-$parent->resolve(0);
-var_dump($p->wait()); // int(1000)
-
-```
-
-When a promise is fulfilled or rejected with a non-promise value, the promise
-then takes ownership of the handlers of each child promise and delivers values
-down the chain without using recursion.
-
-When a promise is resolved with another promise, the original promise transfers
-all of its pending handlers to the new promise. When the new promise is
-eventually resolved, all of the pending handlers are delivered the forwarded
-value.
-
-
-## A promise is the deferred.
-
-Some promise libraries implement promises using a deferred object to represent
-a computation and a promise object to represent the delivery of the result of
-the computation. This is a nice separation of computation and delivery because
-consumers of the promise cannot modify the value that will be eventually
-delivered.
-
-One side effect of being able to implement promise resolution and chaining
-iteratively is that you need to be able for one promise to reach into the state
-of another promise to shuffle around ownership of handlers. In order to achieve
-this without making the handlers of a promise publicly mutable, a promise is
-also the deferred value, allowing promises of the same parent class to reach
-into and modify the private properties of promises of the same type. While this
-does allow consumers of the value to modify the resolution or rejection of the
-deferred, it is a small price to pay for keeping the stack size constant.
-
-```php
-$promise = new Promise();
-$promise->then(function ($value) { echo $value; });
-// The promise is the deferred value, so you can deliver a value to it.
-$promise->resolve('foo');
-// prints "foo"
-```
diff --git a/mayor-orig/www/include/share/googleapi/guzzlehttp/promises/composer.json b/mayor-orig/www/include/share/googleapi/guzzlehttp/promises/composer.json
deleted file mode 100644
index ec41a61e..00000000
--- a/mayor-orig/www/include/share/googleapi/guzzlehttp/promises/composer.json
+++ /dev/null
@@ -1,34 +0,0 @@
-{
-    "name": "guzzlehttp/promises",
-    "description": "Guzzle promises library",
-    "keywords": ["promise"],
-    "license": "MIT",
-    "authors": [
-        {
-            "name": "Michael Dowling",
-            "email": "mtdowling@gmail.com",
-            "homepage": "https://github.com/mtdowling"
-        }
-    ],
-    "require": {
-        "php": ">=5.5.0"
-    },
-    "require-dev": {
-        "phpunit/phpunit": "^4.0"
-    },
-    "autoload": {
-        "psr-4": {
-            "GuzzleHttp\\Promise\\": "src/"
-        },
-        "files": ["src/functions_include.php"]
-    },
-    "scripts": {
-        "test": "vendor/bin/phpunit",
-        "test-ci": "vendor/bin/phpunit --coverage-text"
-    },
-    "extra": {
-        "branch-alias": {
-            "dev-master": "1.4-dev"
-        }
-    }
-}
diff --git a/mayor-orig/www/include/share/googleapi/guzzlehttp/promises/src/AggregateException.php b/mayor-orig/www/include/share/googleapi/guzzlehttp/promises/src/AggregateException.php
deleted file mode 100644
index 6a5690c3..00000000
--- a/mayor-orig/www/include/share/googleapi/guzzlehttp/promises/src/AggregateException.php
+++ /dev/null
@@ -1,16 +0,0 @@
-then(function ($v) { echo $v; });
- *
- * @param callable $generatorFn Generator function to wrap into a promise.
- *
- * @return Promise
- * @link https://github.com/petkaantonov/bluebird/blob/master/API.md#generators inspiration
- */
-final class Coroutine implements PromiseInterface
-{
-    /**
-     * @var PromiseInterface|null
-     */
-    private $currentPromise;
-
-    /**
-     * @var Generator
-     */
-    private $generator;
-
-    /**
-     * @var Promise
-     */
-    private $result;
-
-    public function __construct(callable $generatorFn)
-    {
-        $this->generator = $generatorFn();
-        $this->result = new Promise(function () {
-            while (isset($this->currentPromise)) {
-                $this->currentPromise->wait();
-            }
-        });
-        $this->nextCoroutine($this->generator->current());
-    }
-
-    public function then(
-        callable $onFulfilled = null,
-        callable $onRejected = null
-    ) {
-        return $this->result->then($onFulfilled, $onRejected);
-    }
-
-    public function otherwise(callable $onRejected)
-    {
-        return $this->result->otherwise($onRejected);
-    }
-
-    public function wait($unwrap = true)
-    {
-        return $this->result->wait($unwrap);
-    }
-
-    public function getState()
-    {
-        return $this->result->getState();
-    }
-
-    public function resolve($value)
-    {
-        $this->result->resolve($value);
-    }
-
-    public function reject($reason)
-    {
-        $this->result->reject($reason);
-    }
-
-    public function cancel()
-    {
-        $this->currentPromise->cancel();
-        $this->result->cancel();
-    }
-
-    private function nextCoroutine($yielded)
-    {
-        $this->currentPromise = promise_for($yielded)
-            ->then([$this, '_handleSuccess'], [$this, '_handleFailure']);
-    }
-
-    /**
-     * @internal
-     */
-    public function _handleSuccess($value)
-    {
-        unset($this->currentPromise);
-        try {
-            $next = $this->generator->send($value);
-            if ($this->generator->valid()) {
-                $this->nextCoroutine($next);
-            } else {
-                $this->result->resolve($value);
-            }
-        } catch (Exception $exception) {
-            $this->result->reject($exception);
-        } catch (Throwable $throwable) {
-            $this->result->reject($throwable);
-        }
-    }
-
-    /**
-     * @internal
-     */
-    public function _handleFailure($reason)
-    {
-        unset($this->currentPromise);
-        try {
-            $nextYield = $this->generator->throw(exception_for($reason));
-            // The throw was caught, so keep iterating on the coroutine
-            $this->nextCoroutine($nextYield);
-        } catch (Exception $exception) {
-            $this->result->reject($exception);
-        } catch (Throwable $throwable) {
-            $this->result->reject($throwable);
-        }
-    }
-}
diff --git a/mayor-orig/www/include/share/googleapi/guzzlehttp/promises/src/EachPromise.php b/mayor-orig/www/include/share/googleapi/guzzlehttp/promises/src/EachPromise.php
deleted file mode 100644
index d0ddf603..00000000
--- a/mayor-orig/www/include/share/googleapi/guzzlehttp/promises/src/EachPromise.php
+++ /dev/null
@@ -1,229 +0,0 @@
-iterable = iter_for($iterable);
-
-        if (isset($config['concurrency'])) {
-            $this->concurrency = $config['concurrency'];
-        }
-
-        if (isset($config['fulfilled'])) {
-            $this->onFulfilled = $config['fulfilled'];
-        }
-
-        if (isset($config['rejected'])) {
-            $this->onRejected = $config['rejected'];
-        }
-    }
-
-    public function promise()
-    {
-        if ($this->aggregate) {
-            return $this->aggregate;
-        }
-
-        try {
-            $this->createPromise();
-            $this->iterable->rewind();
-            $this->refillPending();
-        } catch (\Throwable $e) {
-            $this->aggregate->reject($e);
-        } catch (\Exception $e) {
-            $this->aggregate->reject($e);
-        }
-
-        return $this->aggregate;
-    }
-
-    private function createPromise()
-    {
-        $this->mutex = false;
-        $this->aggregate = new Promise(function () {
-            reset($this->pending);
-            if (empty($this->pending) && !$this->iterable->valid()) {
-                $this->aggregate->resolve(null);
-                return;
-            }
-
-            // Consume a potentially fluctuating list of promises while
-            // ensuring that indexes are maintained (precluding array_shift).
-            while ($promise = current($this->pending)) {
-                next($this->pending);
-                $promise->wait();
-                if ($this->aggregate->getState() !== PromiseInterface::PENDING) {
-                    return;
-                }
-            }
-        });
-
-        // Clear the references when the promise is resolved.
-        $clearFn = function () {
-            $this->iterable = $this->concurrency = $this->pending = null;
-            $this->onFulfilled = $this->onRejected = null;
-        };
-
-        $this->aggregate->then($clearFn, $clearFn);
-    }
-
-    private function refillPending()
-    {
-        if (!$this->concurrency) {
-            // Add all pending promises.
-            while ($this->addPending() && $this->advanceIterator());
-            return;
-        }
-
-        // Add only up to N pending promises.
-        $concurrency = is_callable($this->concurrency)
-            ? call_user_func($this->concurrency, count($this->pending))
-            : $this->concurrency;
-        $concurrency = max($concurrency - count($this->pending), 0);
-        // Concurrency may be set to 0 to disallow new promises.
-        if (!$concurrency) {
-            return;
-        }
-        // Add the first pending promise.
-        $this->addPending();
-        // Note this is special handling for concurrency=1 so that we do
-        // not advance the iterator after adding the first promise. This
-        // helps work around issues with generators that might not have the
-        // next value to yield until promise callbacks are called.
-        while (--$concurrency
-            && $this->advanceIterator()
-            && $this->addPending());
-    }
-
-    private function addPending()
-    {
-        if (!$this->iterable || !$this->iterable->valid()) {
-            return false;
-        }
-
-        $promise = promise_for($this->iterable->current());
-        $idx = $this->iterable->key();
-
-        $this->pending[$idx] = $promise->then(
-            function ($value) use ($idx) {
-                if ($this->onFulfilled) {
-                    call_user_func(
-                        $this->onFulfilled, $value, $idx, $this->aggregate
-                    );
-                }
-                $this->step($idx);
-            },
-            function ($reason) use ($idx) {
-                if ($this->onRejected) {
-                    call_user_func(
-                        $this->onRejected, $reason, $idx, $this->aggregate
-                    );
-                }
-                $this->step($idx);
-            }
-        );
-
-        return true;
-    }
-
-    private function advanceIterator()
-    {
-        // Place a lock on the iterator so that we ensure to not recurse,
-        // preventing fatal generator errors.
-        if ($this->mutex) {
-            return false;
-        }
-
-        $this->mutex = true;
-
-        try {
-            $this->iterable->next();
-            $this->mutex = false;
-            return true;
-        } catch (\Throwable $e) {
-            $this->aggregate->reject($e);
-            $this->mutex = false;
-            return false;
-        } catch (\Exception $e) {
-            $this->aggregate->reject($e);
-            $this->mutex = false;
-            return false;
-        }
-    }
-
-    private function step($idx)
-    {
-        // If the promise was already resolved, then ignore this step.
-        if ($this->aggregate->getState() !== PromiseInterface::PENDING) {
-            return;
-        }
-
-        unset($this->pending[$idx]);
-
-        // Only refill pending promises if we are not locked, preventing the
-        // EachPromise to recursively invoke the provided iterator, which
-        // cause a fatal error: "Cannot resume an already running generator"
-        if ($this->advanceIterator() && !$this->checkIfFinished()) {
-            // Add more pending promises if possible.
-            $this->refillPending();
-        }
-    }
-
-    private function checkIfFinished()
-    {
-        if (!$this->pending && !$this->iterable->valid()) {
-            // Resolve the promise if there's nothing left to do.
-            $this->aggregate->resolve(null);
-            return true;
-        }
-
-        return false;
-    }
-}
diff --git a/mayor-orig/www/include/share/googleapi/guzzlehttp/promises/src/FulfilledPromise.php b/mayor-orig/www/include/share/googleapi/guzzlehttp/promises/src/FulfilledPromise.php
deleted file mode 100644
index dbbeeb9f..00000000
--- a/mayor-orig/www/include/share/googleapi/guzzlehttp/promises/src/FulfilledPromise.php
+++ /dev/null
@@ -1,82 +0,0 @@
-value = $value;
-    }
-
-    public function then(
-        callable $onFulfilled = null,
-        callable $onRejected = null
-    ) {
-        // Return itself if there is no onFulfilled function.
-        if (!$onFulfilled) {
-            return $this;
-        }
-
-        $queue = queue();
-        $p = new Promise([$queue, 'run']);
-        $value = $this->value;
-        $queue->add(static function () use ($p, $value, $onFulfilled) {
-            if ($p->getState() === self::PENDING) {
-                try {
-                    $p->resolve($onFulfilled($value));
-                } catch (\Throwable $e) {
-                    $p->reject($e);
-                } catch (\Exception $e) {
-                    $p->reject($e);
-                }
-            }
-        });
-
-        return $p;
-    }
-
-    public function otherwise(callable $onRejected)
-    {
-        return $this->then(null, $onRejected);
-    }
-
-    public function wait($unwrap = true, $defaultDelivery = null)
-    {
-        return $unwrap ? $this->value : null;
-    }
-
-    public function getState()
-    {
-        return self::FULFILLED;
-    }
-
-    public function resolve($value)
-    {
-        if ($value !== $this->value) {
-            throw new \LogicException("Cannot resolve a fulfilled promise");
-        }
-    }
-
-    public function reject($reason)
-    {
-        throw new \LogicException("Cannot reject a fulfilled promise");
-    }
-
-    public function cancel()
-    {
-        // pass
-    }
-}
diff --git a/mayor-orig/www/include/share/googleapi/guzzlehttp/promises/src/Promise.php b/mayor-orig/www/include/share/googleapi/guzzlehttp/promises/src/Promise.php
deleted file mode 100644
index 844ada07..00000000
--- a/mayor-orig/www/include/share/googleapi/guzzlehttp/promises/src/Promise.php
+++ /dev/null
@@ -1,280 +0,0 @@
-waitFn = $waitFn;
-        $this->cancelFn = $cancelFn;
-    }
-
-    public function then(
-        callable $onFulfilled = null,
-        callable $onRejected = null
-    ) {
-        if ($this->state === self::PENDING) {
-            $p = new Promise(null, [$this, 'cancel']);
-            $this->handlers[] = [$p, $onFulfilled, $onRejected];
-            $p->waitList = $this->waitList;
-            $p->waitList[] = $this;
-            return $p;
-        }
-
-        // Return a fulfilled promise and immediately invoke any callbacks.
-        if ($this->state === self::FULFILLED) {
-            return $onFulfilled
-                ? promise_for($this->result)->then($onFulfilled)
-                : promise_for($this->result);
-        }
-
-        // It's either cancelled or rejected, so return a rejected promise
-        // and immediately invoke any callbacks.
-        $rejection = rejection_for($this->result);
-        return $onRejected ? $rejection->then(null, $onRejected) : $rejection;
-    }
-
-    public function otherwise(callable $onRejected)
-    {
-        return $this->then(null, $onRejected);
-    }
-
-    public function wait($unwrap = true)
-    {
-        $this->waitIfPending();
-
-        $inner = $this->result instanceof PromiseInterface
-            ? $this->result->wait($unwrap)
-            : $this->result;
-
-        if ($unwrap) {
-            if ($this->result instanceof PromiseInterface
-                || $this->state === self::FULFILLED
-            ) {
-                return $inner;
-            } else {
-                // It's rejected so "unwrap" and throw an exception.
-                throw exception_for($inner);
-            }
-        }
-    }
-
-    public function getState()
-    {
-        return $this->state;
-    }
-
-    public function cancel()
-    {
-        if ($this->state !== self::PENDING) {
-            return;
-        }
-
-        $this->waitFn = $this->waitList = null;
-
-        if ($this->cancelFn) {
-            $fn = $this->cancelFn;
-            $this->cancelFn = null;
-            try {
-                $fn();
-            } catch (\Throwable $e) {
-                $this->reject($e);
-            } catch (\Exception $e) {
-                $this->reject($e);
-            }
-        }
-
-        // Reject the promise only if it wasn't rejected in a then callback.
-        if ($this->state === self::PENDING) {
-            $this->reject(new CancellationException('Promise has been cancelled'));
-        }
-    }
-
-    public function resolve($value)
-    {
-        $this->settle(self::FULFILLED, $value);
-    }
-
-    public function reject($reason)
-    {
-        $this->settle(self::REJECTED, $reason);
-    }
-
-    private function settle($state, $value)
-    {
-        if ($this->state !== self::PENDING) {
-            // Ignore calls with the same resolution.
-            if ($state === $this->state && $value === $this->result) {
-                return;
-            }
-            throw $this->state === $state
-                ? new \LogicException("The promise is already {$state}.")
-                : new \LogicException("Cannot change a {$this->state} promise to {$state}");
-        }
-
-        if ($value === $this) {
-            throw new \LogicException('Cannot fulfill or reject a promise with itself');
-        }
-
-        // Clear out the state of the promise but stash the handlers.
-        $this->state = $state;
-        $this->result = $value;
-        $handlers = $this->handlers;
-        $this->handlers = null;
-        $this->waitList = $this->waitFn = null;
-        $this->cancelFn = null;
-
-        if (!$handlers) {
-            return;
-        }
-
-        // If the value was not a settled promise or a thenable, then resolve
-        // it in the task queue using the correct ID.
-        if (!method_exists($value, 'then')) {
-            $id = $state === self::FULFILLED ? 1 : 2;
-            // It's a success, so resolve the handlers in the queue.
-            queue()->add(static function () use ($id, $value, $handlers) {
-                foreach ($handlers as $handler) {
-                    self::callHandler($id, $value, $handler);
-                }
-            });
-        } elseif ($value instanceof Promise
-            && $value->getState() === self::PENDING
-        ) {
-            // We can just merge our handlers onto the next promise.
-            $value->handlers = array_merge($value->handlers, $handlers);
-        } else {
-            // Resolve the handlers when the forwarded promise is resolved.
-            $value->then(
-                static function ($value) use ($handlers) {
-                    foreach ($handlers as $handler) {
-                        self::callHandler(1, $value, $handler);
-                    }
-                },
-                static function ($reason) use ($handlers) {
-                    foreach ($handlers as $handler) {
-                        self::callHandler(2, $reason, $handler);
-                    }
-                }
-            );
-        }
-    }
-
-    /**
-     * Call a stack of handlers using a specific callback index and value.
-     *
-     * @param int   $index   1 (resolve) or 2 (reject).
-     * @param mixed $value   Value to pass to the callback.
-     * @param array $handler Array of handler data (promise and callbacks).
-     *
-     * @return array Returns the next group to resolve.
-     */
-    private static function callHandler($index, $value, array $handler)
-    {
-        /** @var PromiseInterface $promise */
-        $promise = $handler[0];
-
-        // The promise may have been cancelled or resolved before placing
-        // this thunk in the queue.
-        if ($promise->getState() !== self::PENDING) {
-            return;
-        }
-
-        try {
-            if (isset($handler[$index])) {
-                $promise->resolve($handler[$index]($value));
-            } elseif ($index === 1) {
-                // Forward resolution values as-is.
-                $promise->resolve($value);
-            } else {
-                // Forward rejections down the chain.
-                $promise->reject($value);
-            }
-        } catch (\Throwable $reason) {
-            $promise->reject($reason);
-        } catch (\Exception $reason) {
-            $promise->reject($reason);
-        }
-    }
-
-    private function waitIfPending()
-    {
-        if ($this->state !== self::PENDING) {
-            return;
-        } elseif ($this->waitFn) {
-            $this->invokeWaitFn();
-        } elseif ($this->waitList) {
-            $this->invokeWaitList();
-        } else {
-            // If there's not wait function, then reject the promise.
-            $this->reject('Cannot wait on a promise that has '
-                . 'no internal wait function. You must provide a wait '
-                . 'function when constructing the promise to be able to '
-                . 'wait on a promise.');
-        }
-
-        queue()->run();
-
-        if ($this->state === self::PENDING) {
-            $this->reject('Invoking the wait callback did not resolve the promise');
-        }
-    }
-
-    private function invokeWaitFn()
-    {
-        try {
-            $wfn = $this->waitFn;
-            $this->waitFn = null;
-            $wfn(true);
-        } catch (\Exception $reason) {
-            if ($this->state === self::PENDING) {
-                // The promise has not been resolved yet, so reject the promise
-                // with the exception.
-                $this->reject($reason);
-            } else {
-                // The promise was already resolved, so there's a problem in
-                // the application.
-                throw $reason;
-            }
-        }
-    }
-
-    private function invokeWaitList()
-    {
-        $waitList = $this->waitList;
-        $this->waitList = null;
-
-        foreach ($waitList as $result) {
-            while (true) {
-                $result->waitIfPending();
-
-                if ($result->result instanceof Promise) {
-                    $result = $result->result;
-                } else {
-                    if ($result->result instanceof PromiseInterface) {
-                        $result->result->wait(false);
-                    }
-                    break;
-                }
-            }
-        }
-    }
-}
diff --git a/mayor-orig/www/include/share/googleapi/guzzlehttp/promises/src/PromiseInterface.php b/mayor-orig/www/include/share/googleapi/guzzlehttp/promises/src/PromiseInterface.php
deleted file mode 100644
index 8f5f4b99..00000000
--- a/mayor-orig/www/include/share/googleapi/guzzlehttp/promises/src/PromiseInterface.php
+++ /dev/null
@@ -1,93 +0,0 @@
-reason = $reason;
-    }
-
-    public function then(
-        callable $onFulfilled = null,
-        callable $onRejected = null
-    ) {
-        // If there's no onRejected callback then just return self.
-        if (!$onRejected) {
-            return $this;
-        }
-
-        $queue = queue();
-        $reason = $this->reason;
-        $p = new Promise([$queue, 'run']);
-        $queue->add(static function () use ($p, $reason, $onRejected) {
-            if ($p->getState() === self::PENDING) {
-                try {
-                    // Return a resolved promise if onRejected does not throw.
-                    $p->resolve($onRejected($reason));
-                } catch (\Throwable $e) {
-                    // onRejected threw, so return a rejected promise.
-                    $p->reject($e);
-                } catch (\Exception $e) {
-                    // onRejected threw, so return a rejected promise.
-                    $p->reject($e);
-                }
-            }
-        });
-
-        return $p;
-    }
-
-    public function otherwise(callable $onRejected)
-    {
-        return $this->then(null, $onRejected);
-    }
-
-    public function wait($unwrap = true, $defaultDelivery = null)
-    {
-        if ($unwrap) {
-            throw exception_for($this->reason);
-        }
-    }
-
-    public function getState()
-    {
-        return self::REJECTED;
-    }
-
-    public function resolve($value)
-    {
-        throw new \LogicException("Cannot resolve a rejected promise");
-    }
-
-    public function reject($reason)
-    {
-        if ($reason !== $this->reason) {
-            throw new \LogicException("Cannot reject a rejected promise");
-        }
-    }
-
-    public function cancel()
-    {
-        // pass
-    }
-}
diff --git a/mayor-orig/www/include/share/googleapi/guzzlehttp/promises/src/RejectionException.php b/mayor-orig/www/include/share/googleapi/guzzlehttp/promises/src/RejectionException.php
deleted file mode 100644
index 07c1136d..00000000
--- a/mayor-orig/www/include/share/googleapi/guzzlehttp/promises/src/RejectionException.php
+++ /dev/null
@@ -1,47 +0,0 @@
-reason = $reason;
-
-        $message = 'The promise was rejected';
-
-        if ($description) {
-            $message .= ' with reason: ' . $description;
-        } elseif (is_string($reason)
-            || (is_object($reason) && method_exists($reason, '__toString'))
-        ) {
-            $message .= ' with reason: ' . $this->reason;
-        } elseif ($reason instanceof \JsonSerializable) {
-            $message .= ' with reason: '
-                . json_encode($this->reason, JSON_PRETTY_PRINT);
-        }
-
-        parent::__construct($message);
-    }
-
-    /**
-     * Returns the rejection reason.
-     *
-     * @return mixed
-     */
-    public function getReason()
-    {
-        return $this->reason;
-    }
-}
diff --git a/mayor-orig/www/include/share/googleapi/guzzlehttp/promises/src/TaskQueue.php b/mayor-orig/www/include/share/googleapi/guzzlehttp/promises/src/TaskQueue.php
deleted file mode 100644
index 6e8a2a08..00000000
--- a/mayor-orig/www/include/share/googleapi/guzzlehttp/promises/src/TaskQueue.php
+++ /dev/null
@@ -1,66 +0,0 @@
-run();
- */
-class TaskQueue implements TaskQueueInterface
-{
-    private $enableShutdown = true;
-    private $queue = [];
-
-    public function __construct($withShutdown = true)
-    {
-        if ($withShutdown) {
-            register_shutdown_function(function () {
-                if ($this->enableShutdown) {
-                    // Only run the tasks if an E_ERROR didn't occur.
-                    $err = error_get_last();
-                    if (!$err || ($err['type'] ^ E_ERROR)) {
-                        $this->run();
-                    }
-                }
-            });
-        }
-    }
-
-    public function isEmpty()
-    {
-        return !$this->queue;
-    }
-
-    public function add(callable $task)
-    {
-        $this->queue[] = $task;
-    }
-
-    public function run()
-    {
-        /** @var callable $task */
-        while ($task = array_shift($this->queue)) {
-            $task();
-        }
-    }
-
-    /**
-     * The task queue will be run and exhausted by default when the process
-     * exits IFF the exit is not the result of a PHP E_ERROR error.
-     *
-     * You can disable running the automatic shutdown of the queue by calling
-     * this function. If you disable the task queue shutdown process, then you
-     * MUST either run the task queue (as a result of running your event loop
-     * or manually using the run() method) or wait on each outstanding promise.
-     *
-     * Note: This shutdown will occur before any destructors are triggered.
-     */
-    public function disableShutdown()
-    {
-        $this->enableShutdown = false;
-    }
-}
diff --git a/mayor-orig/www/include/share/googleapi/guzzlehttp/promises/src/TaskQueueInterface.php b/mayor-orig/www/include/share/googleapi/guzzlehttp/promises/src/TaskQueueInterface.php
deleted file mode 100644
index ac8306e1..00000000
--- a/mayor-orig/www/include/share/googleapi/guzzlehttp/promises/src/TaskQueueInterface.php
+++ /dev/null
@@ -1,25 +0,0 @@
-
- * while ($eventLoop->isRunning()) {
- *     GuzzleHttp\Promise\queue()->run();
- * }
- * 
- *
- * @param TaskQueueInterface $assign Optionally specify a new queue instance.
- *
- * @return TaskQueueInterface
- */
-function queue(TaskQueueInterface $assign = null)
-{
-    static $queue;
-
-    if ($assign) {
-        $queue = $assign;
-    } elseif (!$queue) {
-        $queue = new TaskQueue();
-    }
-
-    return $queue;
-}
-
-/**
- * Adds a function to run in the task queue when it is next `run()` and returns
- * a promise that is fulfilled or rejected with the result.
- *
- * @param callable $task Task function to run.
- *
- * @return PromiseInterface
- */
-function task(callable $task)
-{
-    $queue = queue();
-    $promise = new Promise([$queue, 'run']);
-    $queue->add(function () use ($task, $promise) {
-        try {
-            $promise->resolve($task());
-        } catch (\Throwable $e) {
-            $promise->reject($e);
-        } catch (\Exception $e) {
-            $promise->reject($e);
-        }
-    });
-
-    return $promise;
-}
-
-/**
- * Creates a promise for a value if the value is not a promise.
- *
- * @param mixed $value Promise or value.
- *
- * @return PromiseInterface
- */
-function promise_for($value)
-{
-    if ($value instanceof PromiseInterface) {
-        return $value;
-    }
-
-    // Return a Guzzle promise that shadows the given promise.
-    if (method_exists($value, 'then')) {
-        $wfn = method_exists($value, 'wait') ? [$value, 'wait'] : null;
-        $cfn = method_exists($value, 'cancel') ? [$value, 'cancel'] : null;
-        $promise = new Promise($wfn, $cfn);
-        $value->then([$promise, 'resolve'], [$promise, 'reject']);
-        return $promise;
-    }
-
-    return new FulfilledPromise($value);
-}
-
-/**
- * Creates a rejected promise for a reason if the reason is not a promise. If
- * the provided reason is a promise, then it is returned as-is.
- *
- * @param mixed $reason Promise or reason.
- *
- * @return PromiseInterface
- */
-function rejection_for($reason)
-{
-    if ($reason instanceof PromiseInterface) {
-        return $reason;
-    }
-
-    return new RejectedPromise($reason);
-}
-
-/**
- * Create an exception for a rejected promise value.
- *
- * @param mixed $reason
- *
- * @return \Exception|\Throwable
- */
-function exception_for($reason)
-{
-    return $reason instanceof \Exception || $reason instanceof \Throwable
-        ? $reason
-        : new RejectionException($reason);
-}
-
-/**
- * Returns an iterator for the given value.
- *
- * @param mixed $value
- *
- * @return \Iterator
- */
-function iter_for($value)
-{
-    if ($value instanceof \Iterator) {
-        return $value;
-    } elseif (is_array($value)) {
-        return new \ArrayIterator($value);
-    } else {
-        return new \ArrayIterator([$value]);
-    }
-}
-
-/**
- * Synchronously waits on a promise to resolve and returns an inspection state
- * array.
- *
- * Returns a state associative array containing a "state" key mapping to a
- * valid promise state. If the state of the promise is "fulfilled", the array
- * will contain a "value" key mapping to the fulfilled value of the promise. If
- * the promise is rejected, the array will contain a "reason" key mapping to
- * the rejection reason of the promise.
- *
- * @param PromiseInterface $promise Promise or value.
- *
- * @return array
- */
-function inspect(PromiseInterface $promise)
-{
-    try {
-        return [
-            'state' => PromiseInterface::FULFILLED,
-            'value' => $promise->wait()
-        ];
-    } catch (RejectionException $e) {
-        return ['state' => PromiseInterface::REJECTED, 'reason' => $e->getReason()];
-    } catch (\Throwable $e) {
-        return ['state' => PromiseInterface::REJECTED, 'reason' => $e];
-    } catch (\Exception $e) {
-        return ['state' => PromiseInterface::REJECTED, 'reason' => $e];
-    }
-}
-
-/**
- * Waits on all of the provided promises, but does not unwrap rejected promises
- * as thrown exception.
- *
- * Returns an array of inspection state arrays.
- *
- * @param PromiseInterface[] $promises Traversable of promises to wait upon.
- *
- * @return array
- * @see GuzzleHttp\Promise\inspect for the inspection state array format.
- */
-function inspect_all($promises)
-{
-    $results = [];
-    foreach ($promises as $key => $promise) {
-        $results[$key] = inspect($promise);
-    }
-
-    return $results;
-}
-
-/**
- * Waits on all of the provided promises and returns the fulfilled values.
- *
- * Returns an array that contains the value of each promise (in the same order
- * the promises were provided). An exception is thrown if any of the promises
- * are rejected.
- *
- * @param mixed $promises Iterable of PromiseInterface objects to wait on.
- *
- * @return array
- * @throws \Exception on error
- * @throws \Throwable on error in PHP >=7
- */
-function unwrap($promises)
-{
-    $results = [];
-    foreach ($promises as $key => $promise) {
-        $results[$key] = $promise->wait();
-    }
-
-    return $results;
-}
-
-/**
- * Given an array of promises, return a promise that is fulfilled when all the
- * items in the array are fulfilled.
- *
- * The promise's fulfillment value is an array with fulfillment values at
- * respective positions to the original array. If any promise in the array
- * rejects, the returned promise is rejected with the rejection reason.
- *
- * @param mixed $promises Promises or values.
- *
- * @return PromiseInterface
- */
-function all($promises)
-{
-    $results = [];
-    return each(
-        $promises,
-        function ($value, $idx) use (&$results) {
-            $results[$idx] = $value;
-        },
-        function ($reason, $idx, Promise $aggregate) {
-            $aggregate->reject($reason);
-        }
-    )->then(function () use (&$results) {
-        ksort($results);
-        return $results;
-    });
-}
-
-/**
- * Initiate a competitive race between multiple promises or values (values will
- * become immediately fulfilled promises).
- *
- * When count amount of promises have been fulfilled, the returned promise is
- * fulfilled with an array that contains the fulfillment values of the winners
- * in order of resolution.
- *
- * This prommise is rejected with a {@see GuzzleHttp\Promise\AggregateException}
- * if the number of fulfilled promises is less than the desired $count.
- *
- * @param int   $count    Total number of promises.
- * @param mixed $promises Promises or values.
- *
- * @return PromiseInterface
- */
-function some($count, $promises)
-{
-    $results = [];
-    $rejections = [];
-
-    return each(
-        $promises,
-        function ($value, $idx, PromiseInterface $p) use (&$results, $count) {
-            if ($p->getState() !== PromiseInterface::PENDING) {
-                return;
-            }
-            $results[$idx] = $value;
-            if (count($results) >= $count) {
-                $p->resolve(null);
-            }
-        },
-        function ($reason) use (&$rejections) {
-            $rejections[] = $reason;
-        }
-    )->then(
-        function () use (&$results, &$rejections, $count) {
-            if (count($results) !== $count) {
-                throw new AggregateException(
-                    'Not enough promises to fulfill count',
-                    $rejections
-                );
-            }
-            ksort($results);
-            return array_values($results);
-        }
-    );
-}
-
-/**
- * Like some(), with 1 as count. However, if the promise fulfills, the
- * fulfillment value is not an array of 1 but the value directly.
- *
- * @param mixed $promises Promises or values.
- *
- * @return PromiseInterface
- */
-function any($promises)
-{
-    return some(1, $promises)->then(function ($values) { return $values[0]; });
-}
-
-/**
- * Returns a promise that is fulfilled when all of the provided promises have
- * been fulfilled or rejected.
- *
- * The returned promise is fulfilled with an array of inspection state arrays.
- *
- * @param mixed $promises Promises or values.
- *
- * @return PromiseInterface
- * @see GuzzleHttp\Promise\inspect for the inspection state array format.
- */
-function settle($promises)
-{
-    $results = [];
-
-    return each(
-        $promises,
-        function ($value, $idx) use (&$results) {
-            $results[$idx] = ['state' => PromiseInterface::FULFILLED, 'value' => $value];
-        },
-        function ($reason, $idx) use (&$results) {
-            $results[$idx] = ['state' => PromiseInterface::REJECTED, 'reason' => $reason];
-        }
-    )->then(function () use (&$results) {
-        ksort($results);
-        return $results;
-    });
-}
-
-/**
- * Given an iterator that yields promises or values, returns a promise that is
- * fulfilled with a null value when the iterator has been consumed or the
- * aggregate promise has been fulfilled or rejected.
- *
- * $onFulfilled is a function that accepts the fulfilled value, iterator
- * index, and the aggregate promise. The callback can invoke any necessary side
- * effects and choose to resolve or reject the aggregate promise if needed.
- *
- * $onRejected is a function that accepts the rejection reason, iterator
- * index, and the aggregate promise. The callback can invoke any necessary side
- * effects and choose to resolve or reject the aggregate promise if needed.
- *
- * @param mixed    $iterable    Iterator or array to iterate over.
- * @param callable $onFulfilled
- * @param callable $onRejected
- *
- * @return PromiseInterface
- */
-function each(
-    $iterable,
-    callable $onFulfilled = null,
-    callable $onRejected = null
-) {
-    return (new EachPromise($iterable, [
-        'fulfilled' => $onFulfilled,
-        'rejected'  => $onRejected
-    ]))->promise();
-}
-
-/**
- * Like each, but only allows a certain number of outstanding promises at any
- * given time.
- *
- * $concurrency may be an integer or a function that accepts the number of
- * pending promises and returns a numeric concurrency limit value to allow for
- * dynamic a concurrency size.
- *
- * @param mixed        $iterable
- * @param int|callable $concurrency
- * @param callable     $onFulfilled
- * @param callable     $onRejected
- *
- * @return PromiseInterface
- */
-function each_limit(
-    $iterable,
-    $concurrency,
-    callable $onFulfilled = null,
-    callable $onRejected = null
-) {
-    return (new EachPromise($iterable, [
-        'fulfilled'   => $onFulfilled,
-        'rejected'    => $onRejected,
-        'concurrency' => $concurrency
-    ]))->promise();
-}
-
-/**
- * Like each_limit, but ensures that no promise in the given $iterable argument
- * is rejected. If any promise is rejected, then the aggregate promise is
- * rejected with the encountered rejection.
- *
- * @param mixed        $iterable
- * @param int|callable $concurrency
- * @param callable     $onFulfilled
- *
- * @return PromiseInterface
- */
-function each_limit_all(
-    $iterable,
-    $concurrency,
-    callable $onFulfilled = null
-) {
-    return each_limit(
-        $iterable,
-        $concurrency,
-        $onFulfilled,
-        function ($reason, $idx, PromiseInterface $aggregate) {
-            $aggregate->reject($reason);
-        }
-    );
-}
-
-/**
- * Returns true if a promise is fulfilled.
- *
- * @param PromiseInterface $promise
- *
- * @return bool
- */
-function is_fulfilled(PromiseInterface $promise)
-{
-    return $promise->getState() === PromiseInterface::FULFILLED;
-}
-
-/**
- * Returns true if a promise is rejected.
- *
- * @param PromiseInterface $promise
- *
- * @return bool
- */
-function is_rejected(PromiseInterface $promise)
-{
-    return $promise->getState() === PromiseInterface::REJECTED;
-}
-
-/**
- * Returns true if a promise is fulfilled or rejected.
- *
- * @param PromiseInterface $promise
- *
- * @return bool
- */
-function is_settled(PromiseInterface $promise)
-{
-    return $promise->getState() !== PromiseInterface::PENDING;
-}
-
-/**
- * @see Coroutine
- *
- * @param callable $generatorFn
- *
- * @return PromiseInterface
- */
-function coroutine(callable $generatorFn)
-{
-    return new Coroutine($generatorFn);
-}
diff --git a/mayor-orig/www/include/share/googleapi/guzzlehttp/promises/src/functions_include.php b/mayor-orig/www/include/share/googleapi/guzzlehttp/promises/src/functions_include.php
deleted file mode 100644
index 34cd1710..00000000
--- a/mayor-orig/www/include/share/googleapi/guzzlehttp/promises/src/functions_include.php
+++ /dev/null
@@ -1,6 +0,0 @@
-withPath('foo')->withHost('example.com')` will throw an exception
-    because the path of a URI with an authority must start with a slash "/" or be empty
-  - `(new Uri())->withScheme('http')` will return `'http://localhost'`
-* Fix compatibility of URIs with `file` scheme and empty host.
-* Added common URI utility methods based on RFC 3986 (see documentation in the readme):
-  - `Uri::isDefaultPort`
-  - `Uri::isAbsolute`
-  - `Uri::isNetworkPathReference`
-  - `Uri::isAbsolutePathReference`
-  - `Uri::isRelativePathReference`
-  - `Uri::isSameDocumentReference`
-  - `Uri::composeComponents`
-  - `UriNormalizer::normalize`
-  - `UriNormalizer::isEquivalent`
-  - `UriResolver::relativize`
-* Deprecated `Uri::resolve` in favor of `UriResolver::resolve`
-* Deprecated `Uri::removeDotSegments` in favor of `UriResolver::removeDotSegments`
-
-## 1.3.1 - 2016-06-25
-
-* Fix `Uri::__toString` for network path references, e.g. `//example.org`.
-* Fix missing lowercase normalization for host.
-* Fix handling of URI components in case they are `'0'` in a lot of places,
-  e.g. as a user info password.
-* Fix `Uri::withAddedHeader` to correctly merge headers with different case.
-* Fix trimming of header values in `Uri::withAddedHeader`. Header values may
-  be surrounded by whitespace which should be ignored according to RFC 7230
-  Section 3.2.4. This does not apply to header names.
-* Fix `Uri::withAddedHeader` with an array of header values.
-* Fix `Uri::resolve` when base path has no slash and handling of fragment.
-* Fix handling of encoding in `Uri::with(out)QueryValue` so one can pass the
-  key/value both in encoded as well as decoded form to those methods. This is
-  consistent with withPath, withQuery etc.
-* Fix `ServerRequest::withoutAttribute` when attribute value is null.
-
-## 1.3.0 - 2016-04-13
-
-* Added remaining interfaces needed for full PSR7 compatibility
-  (ServerRequestInterface, UploadedFileInterface, etc.).
-* Added support for stream_for from scalars.
-* Can now extend Uri.
-* Fixed a bug in validating request methods by making it more permissive.
-
-## 1.2.3 - 2016-02-18
-
-* Fixed support in `GuzzleHttp\Psr7\CachingStream` for seeking forward on remote
-  streams, which can sometimes return fewer bytes than requested with `fread`.
-* Fixed handling of gzipped responses with FNAME headers.
-
-## 1.2.2 - 2016-01-22
-
-* Added support for URIs without any authority.
-* Added support for HTTP 451 'Unavailable For Legal Reasons.'
-* Added support for using '0' as a filename.
-* Added support for including non-standard ports in Host headers.
-
-## 1.2.1 - 2015-11-02
-
-* Now supporting negative offsets when seeking to SEEK_END.
-
-## 1.2.0 - 2015-08-15
-
-* Body as `"0"` is now properly added to a response.
-* Now allowing forward seeking in CachingStream.
-* Now properly parsing HTTP requests that contain proxy targets in
-  `parse_request`.
-* functions.php is now conditionally required.
-* user-info is no longer dropped when resolving URIs.
-
-## 1.1.0 - 2015-06-24
-
-* URIs can now be relative.
-* `multipart/form-data` headers are now overridden case-insensitively.
-* URI paths no longer encode the following characters because they are allowed
-  in URIs: "(", ")", "*", "!", "'"
-* A port is no longer added to a URI when the scheme is missing and no port is
-  present.
-
-## 1.0.0 - 2015-05-19
-
-Initial release.
-
-Currently unsupported:
-
-- `Psr\Http\Message\ServerRequestInterface`
-- `Psr\Http\Message\UploadedFileInterface`
diff --git a/mayor-orig/www/include/share/googleapi/guzzlehttp/psr7/LICENSE b/mayor-orig/www/include/share/googleapi/guzzlehttp/psr7/LICENSE
deleted file mode 100644
index 581d95f9..00000000
--- a/mayor-orig/www/include/share/googleapi/guzzlehttp/psr7/LICENSE
+++ /dev/null
@@ -1,19 +0,0 @@
-Copyright (c) 2015 Michael Dowling, https://github.com/mtdowling 
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-THE SOFTWARE.
diff --git a/mayor-orig/www/include/share/googleapi/guzzlehttp/psr7/README.md b/mayor-orig/www/include/share/googleapi/guzzlehttp/psr7/README.md
deleted file mode 100644
index 16499358..00000000
--- a/mayor-orig/www/include/share/googleapi/guzzlehttp/psr7/README.md
+++ /dev/null
@@ -1,739 +0,0 @@
-# PSR-7 Message Implementation
-
-This repository contains a full [PSR-7](http://www.php-fig.org/psr/psr-7/)
-message implementation, several stream decorators, and some helpful
-functionality like query string parsing.
-
-
-[![Build Status](https://travis-ci.org/guzzle/psr7.svg?branch=master)](https://travis-ci.org/guzzle/psr7)
-
-
-# Stream implementation
-
-This package comes with a number of stream implementations and stream
-decorators.
-
-
-## AppendStream
-
-`GuzzleHttp\Psr7\AppendStream`
-
-Reads from multiple streams, one after the other.
-
-```php
-use GuzzleHttp\Psr7;
-
-$a = Psr7\stream_for('abc, ');
-$b = Psr7\stream_for('123.');
-$composed = new Psr7\AppendStream([$a, $b]);
-
-$composed->addStream(Psr7\stream_for(' Above all listen to me'));
-
-echo $composed; // abc, 123. Above all listen to me.
-```
-
-
-## BufferStream
-
-`GuzzleHttp\Psr7\BufferStream`
-
-Provides a buffer stream that can be written to fill a buffer, and read
-from to remove bytes from the buffer.
-
-This stream returns a "hwm" metadata value that tells upstream consumers
-what the configured high water mark of the stream is, or the maximum
-preferred size of the buffer.
-
-```php
-use GuzzleHttp\Psr7;
-
-// When more than 1024 bytes are in the buffer, it will begin returning
-// false to writes. This is an indication that writers should slow down.
-$buffer = new Psr7\BufferStream(1024);
-```
-
-
-## CachingStream
-
-The CachingStream is used to allow seeking over previously read bytes on
-non-seekable streams. This can be useful when transferring a non-seekable
-entity body fails due to needing to rewind the stream (for example, resulting
-from a redirect). Data that is read from the remote stream will be buffered in
-a PHP temp stream so that previously read bytes are cached first in memory,
-then on disk.
-
-```php
-use GuzzleHttp\Psr7;
-
-$original = Psr7\stream_for(fopen('http://www.google.com', 'r'));
-$stream = new Psr7\CachingStream($original);
-
-$stream->read(1024);
-echo $stream->tell();
-// 1024
-
-$stream->seek(0);
-echo $stream->tell();
-// 0
-```
-
-
-## DroppingStream
-
-`GuzzleHttp\Psr7\DroppingStream`
-
-Stream decorator that begins dropping data once the size of the underlying
-stream becomes too full.
-
-```php
-use GuzzleHttp\Psr7;
-
-// Create an empty stream
-$stream = Psr7\stream_for();
-
-// Start dropping data when the stream has more than 10 bytes
-$dropping = new Psr7\DroppingStream($stream, 10);
-
-$dropping->write('01234567890123456789');
-echo $stream; // 0123456789
-```
-
-
-## FnStream
-
-`GuzzleHttp\Psr7\FnStream`
-
-Compose stream implementations based on a hash of functions.
-
-Allows for easy testing and extension of a provided stream without needing
-to create a concrete class for a simple extension point.
-
-```php
-
-use GuzzleHttp\Psr7;
-
-$stream = Psr7\stream_for('hi');
-$fnStream = Psr7\FnStream::decorate($stream, [
-    'rewind' => function () use ($stream) {
-        echo 'About to rewind - ';
-        $stream->rewind();
-        echo 'rewound!';
-    }
-]);
-
-$fnStream->rewind();
-// Outputs: About to rewind - rewound!
-```
-
-
-## InflateStream
-
-`GuzzleHttp\Psr7\InflateStream`
-
-Uses PHP's zlib.inflate filter to inflate deflate or gzipped content.
-
-This stream decorator skips the first 10 bytes of the given stream to remove
-the gzip header, converts the provided stream to a PHP stream resource,
-then appends the zlib.inflate filter. The stream is then converted back
-to a Guzzle stream resource to be used as a Guzzle stream.
-
-
-## LazyOpenStream
-
-`GuzzleHttp\Psr7\LazyOpenStream`
-
-Lazily reads or writes to a file that is opened only after an IO operation
-take place on the stream.
-
-```php
-use GuzzleHttp\Psr7;
-
-$stream = new Psr7\LazyOpenStream('/path/to/file', 'r');
-// The file has not yet been opened...
-
-echo $stream->read(10);
-// The file is opened and read from only when needed.
-```
-
-
-## LimitStream
-
-`GuzzleHttp\Psr7\LimitStream`
-
-LimitStream can be used to read a subset or slice of an existing stream object.
-This can be useful for breaking a large file into smaller pieces to be sent in
-chunks (e.g. Amazon S3's multipart upload API).
-
-```php
-use GuzzleHttp\Psr7;
-
-$original = Psr7\stream_for(fopen('/tmp/test.txt', 'r+'));
-echo $original->getSize();
-// >>> 1048576
-
-// Limit the size of the body to 1024 bytes and start reading from byte 2048
-$stream = new Psr7\LimitStream($original, 1024, 2048);
-echo $stream->getSize();
-// >>> 1024
-echo $stream->tell();
-// >>> 0
-```
-
-
-## MultipartStream
-
-`GuzzleHttp\Psr7\MultipartStream`
-
-Stream that when read returns bytes for a streaming multipart or
-multipart/form-data stream.
-
-
-## NoSeekStream
-
-`GuzzleHttp\Psr7\NoSeekStream`
-
-NoSeekStream wraps a stream and does not allow seeking.
-
-```php
-use GuzzleHttp\Psr7;
-
-$original = Psr7\stream_for('foo');
-$noSeek = new Psr7\NoSeekStream($original);
-
-echo $noSeek->read(3);
-// foo
-var_export($noSeek->isSeekable());
-// false
-$noSeek->seek(0);
-var_export($noSeek->read(3));
-// NULL
-```
-
-
-## PumpStream
-
-`GuzzleHttp\Psr7\PumpStream`
-
-Provides a read only stream that pumps data from a PHP callable.
-
-When invoking the provided callable, the PumpStream will pass the amount of
-data requested to read to the callable. The callable can choose to ignore
-this value and return fewer or more bytes than requested. Any extra data
-returned by the provided callable is buffered internally until drained using
-the read() function of the PumpStream. The provided callable MUST return
-false when there is no more data to read.
-
-
-## Implementing stream decorators
-
-Creating a stream decorator is very easy thanks to the
-`GuzzleHttp\Psr7\StreamDecoratorTrait`. This trait provides methods that
-implement `Psr\Http\Message\StreamInterface` by proxying to an underlying
-stream. Just `use` the `StreamDecoratorTrait` and implement your custom
-methods.
-
-For example, let's say we wanted to call a specific function each time the last
-byte is read from a stream. This could be implemented by overriding the
-`read()` method.
-
-```php
-use Psr\Http\Message\StreamInterface;
-use GuzzleHttp\Psr7\StreamDecoratorTrait;
-
-class EofCallbackStream implements StreamInterface
-{
-    use StreamDecoratorTrait;
-
-    private $callback;
-
-    public function __construct(StreamInterface $stream, callable $cb)
-    {
-        $this->stream = $stream;
-        $this->callback = $cb;
-    }
-
-    public function read($length)
-    {
-        $result = $this->stream->read($length);
-
-        // Invoke the callback when EOF is hit.
-        if ($this->eof()) {
-            call_user_func($this->callback);
-        }
-
-        return $result;
-    }
-}
-```
-
-This decorator could be added to any existing stream and used like so:
-
-```php
-use GuzzleHttp\Psr7;
-
-$original = Psr7\stream_for('foo');
-
-$eofStream = new EofCallbackStream($original, function () {
-    echo 'EOF!';
-});
-
-$eofStream->read(2);
-$eofStream->read(1);
-// echoes "EOF!"
-$eofStream->seek(0);
-$eofStream->read(3);
-// echoes "EOF!"
-```
-
-
-## PHP StreamWrapper
-
-You can use the `GuzzleHttp\Psr7\StreamWrapper` class if you need to use a
-PSR-7 stream as a PHP stream resource.
-
-Use the `GuzzleHttp\Psr7\StreamWrapper::getResource()` method to create a PHP
-stream from a PSR-7 stream.
-
-```php
-use GuzzleHttp\Psr7\StreamWrapper;
-
-$stream = GuzzleHttp\Psr7\stream_for('hello!');
-$resource = StreamWrapper::getResource($stream);
-echo fread($resource, 6); // outputs hello!
-```
-
-
-# Function API
-
-There are various functions available under the `GuzzleHttp\Psr7` namespace.
-
-
-## `function str`
-
-`function str(MessageInterface $message)`
-
-Returns the string representation of an HTTP message.
-
-```php
-$request = new GuzzleHttp\Psr7\Request('GET', 'http://example.com');
-echo GuzzleHttp\Psr7\str($request);
-```
-
-
-## `function uri_for`
-
-`function uri_for($uri)`
-
-This function accepts a string or `Psr\Http\Message\UriInterface` and returns a
-UriInterface for the given value. If the value is already a `UriInterface`, it
-is returned as-is.
-
-```php
-$uri = GuzzleHttp\Psr7\uri_for('http://example.com');
-assert($uri === GuzzleHttp\Psr7\uri_for($uri));
-```
-
-
-## `function stream_for`
-
-`function stream_for($resource = '', array $options = [])`
-
-Create a new stream based on the input type.
-
-Options is an associative array that can contain the following keys:
-
-* - metadata: Array of custom metadata.
-* - size: Size of the stream.
-
-This method accepts the following `$resource` types:
-
-- `Psr\Http\Message\StreamInterface`: Returns the value as-is.
-- `string`: Creates a stream object that uses the given string as the contents.
-- `resource`: Creates a stream object that wraps the given PHP stream resource.
-- `Iterator`: If the provided value implements `Iterator`, then a read-only
-  stream object will be created that wraps the given iterable. Each time the
-  stream is read from, data from the iterator will fill a buffer and will be
-  continuously called until the buffer is equal to the requested read size.
-  Subsequent read calls will first read from the buffer and then call `next`
-  on the underlying iterator until it is exhausted.
-- `object` with `__toString()`: If the object has the `__toString()` method,
-  the object will be cast to a string and then a stream will be returned that
-  uses the string value.
-- `NULL`: When `null` is passed, an empty stream object is returned.
-- `callable` When a callable is passed, a read-only stream object will be
-  created that invokes the given callable. The callable is invoked with the
-  number of suggested bytes to read. The callable can return any number of
-  bytes, but MUST return `false` when there is no more data to return. The
-  stream object that wraps the callable will invoke the callable until the
-  number of requested bytes are available. Any additional bytes will be
-  buffered and used in subsequent reads.
-
-```php
-$stream = GuzzleHttp\Psr7\stream_for('foo');
-$stream = GuzzleHttp\Psr7\stream_for(fopen('/path/to/file', 'r'));
-
-$generator function ($bytes) {
-    for ($i = 0; $i < $bytes; $i++) {
-        yield ' ';
-    }
-}
-
-$stream = GuzzleHttp\Psr7\stream_for($generator(100));
-```
-
-
-## `function parse_header`
-
-`function parse_header($header)`
-
-Parse an array of header values containing ";" separated data into an array of
-associative arrays representing the header key value pair data of the header.
-When a parameter does not contain a value, but just contains a key, this
-function will inject a key with a '' string value.
-
-
-## `function normalize_header`
-
-`function normalize_header($header)`
-
-Converts an array of header values that may contain comma separated headers
-into an array of headers with no comma separated values.
-
-
-## `function modify_request`
-
-`function modify_request(RequestInterface $request, array $changes)`
-
-Clone and modify a request with the given changes. This method is useful for
-reducing the number of clones needed to mutate a message.
-
-The changes can be one of:
-
-- method: (string) Changes the HTTP method.
-- set_headers: (array) Sets the given headers.
-- remove_headers: (array) Remove the given headers.
-- body: (mixed) Sets the given body.
-- uri: (UriInterface) Set the URI.
-- query: (string) Set the query string value of the URI.
-- version: (string) Set the protocol version.
-
-
-## `function rewind_body`
-
-`function rewind_body(MessageInterface $message)`
-
-Attempts to rewind a message body and throws an exception on failure. The body
-of the message will only be rewound if a call to `tell()` returns a value other
-than `0`.
-
-
-## `function try_fopen`
-
-`function try_fopen($filename, $mode)`
-
-Safely opens a PHP stream resource using a filename.
-
-When fopen fails, PHP normally raises a warning. This function adds an error
-handler that checks for errors and throws an exception instead.
-
-
-## `function copy_to_string`
-
-`function copy_to_string(StreamInterface $stream, $maxLen = -1)`
-
-Copy the contents of a stream into a string until the given number of bytes
-have been read.
-
-
-## `function copy_to_stream`
-
-`function copy_to_stream(StreamInterface $source, StreamInterface $dest, $maxLen = -1)`
-
-Copy the contents of a stream into another stream until the given number of
-bytes have been read.
-
-
-## `function hash`
-
-`function hash(StreamInterface $stream, $algo, $rawOutput = false)`
-
-Calculate a hash of a Stream. This method reads the entire stream to calculate
-a rolling hash (based on PHP's hash_init functions).
-
-
-## `function readline`
-
-`function readline(StreamInterface $stream, $maxLength = null)`
-
-Read a line from the stream up to the maximum allowed buffer length.
-
-
-## `function parse_request`
-
-`function parse_request($message)`
-
-Parses a request message string into a request object.
-
-
-## `function parse_response`
-
-`function parse_response($message)`
-
-Parses a response message string into a response object.
-
-
-## `function parse_query`
-
-`function parse_query($str, $urlEncoding = true)`
-
-Parse a query string into an associative array.
-
-If multiple values are found for the same key, the value of that key value pair
-will become an array. This function does not parse nested PHP style arrays into
-an associative array (e.g., `foo[a]=1&foo[b]=2` will be parsed into
-`['foo[a]' => '1', 'foo[b]' => '2']`).
-
-
-## `function build_query`
-
-`function build_query(array $params, $encoding = PHP_QUERY_RFC3986)`
-
-Build a query string from an array of key value pairs.
-
-This function can use the return value of parse_query() to build a query string.
-This function does not modify the provided keys when an array is encountered
-(like http_build_query would).
-
-
-## `function mimetype_from_filename`
-
-`function mimetype_from_filename($filename)`
-
-Determines the mimetype of a file by looking at its extension.
-
-
-## `function mimetype_from_extension`
-
-`function mimetype_from_extension($extension)`
-
-Maps a file extensions to a mimetype.
-
-
-# Additional URI Methods
-
-Aside from the standard `Psr\Http\Message\UriInterface` implementation in form of the `GuzzleHttp\Psr7\Uri` class,
-this library also provides additional functionality when working with URIs as static methods.
-
-## URI Types
-
-An instance of `Psr\Http\Message\UriInterface` can either be an absolute URI or a relative reference.
-An absolute URI has a scheme. A relative reference is used to express a URI relative to another URI,
-the base URI. Relative references can be divided into several forms according to
-[RFC 3986 Section 4.2](https://tools.ietf.org/html/rfc3986#section-4.2):
-
-- network-path references, e.g. `//example.com/path`
-- absolute-path references, e.g. `/path`
-- relative-path references, e.g. `subpath`
-
-The following methods can be used to identify the type of the URI.
-
-### `GuzzleHttp\Psr7\Uri::isAbsolute`
-
-`public static function isAbsolute(UriInterface $uri): bool`
-
-Whether the URI is absolute, i.e. it has a scheme.
-
-### `GuzzleHttp\Psr7\Uri::isNetworkPathReference`
-
-`public static function isNetworkPathReference(UriInterface $uri): bool`
-
-Whether the URI is a network-path reference. A relative reference that begins with two slash characters is
-termed an network-path reference.
-
-### `GuzzleHttp\Psr7\Uri::isAbsolutePathReference`
-
-`public static function isAbsolutePathReference(UriInterface $uri): bool`
-
-Whether the URI is a absolute-path reference. A relative reference that begins with a single slash character is
-termed an absolute-path reference.
-
-### `GuzzleHttp\Psr7\Uri::isRelativePathReference`
-
-`public static function isRelativePathReference(UriInterface $uri): bool`
-
-Whether the URI is a relative-path reference. A relative reference that does not begin with a slash character is
-termed a relative-path reference.
-
-### `GuzzleHttp\Psr7\Uri::isSameDocumentReference`
-
-`public static function isSameDocumentReference(UriInterface $uri, UriInterface $base = null): bool`
-
-Whether the URI is a same-document reference. A same-document reference refers to a URI that is, aside from its
-fragment component, identical to the base URI. When no base URI is given, only an empty URI reference
-(apart from its fragment) is considered a same-document reference.
-
-## URI Components
-
-Additional methods to work with URI components.
-
-### `GuzzleHttp\Psr7\Uri::isDefaultPort`
-
-`public static function isDefaultPort(UriInterface $uri): bool`
-
-Whether the URI has the default port of the current scheme. `Psr\Http\Message\UriInterface::getPort` may return null
-or the standard port. This method can be used independently of the implementation.
-
-### `GuzzleHttp\Psr7\Uri::composeComponents`
-
-`public static function composeComponents($scheme, $authority, $path, $query, $fragment): string`
-
-Composes a URI reference string from its various components according to
-[RFC 3986 Section 5.3](https://tools.ietf.org/html/rfc3986#section-5.3). Usually this method does not need to be called
-manually but instead is used indirectly via `Psr\Http\Message\UriInterface::__toString`.
-
-### `GuzzleHttp\Psr7\Uri::fromParts`
-
-`public static function fromParts(array $parts): UriInterface`
-
-Creates a URI from a hash of [`parse_url`](http://php.net/manual/en/function.parse-url.php) components.
-
-
-### `GuzzleHttp\Psr7\Uri::withQueryValue`
-
-`public static function withQueryValue(UriInterface $uri, $key, $value): UriInterface`
-
-Creates a new URI with a specific query string value. Any existing query string values that exactly match the
-provided key are removed and replaced with the given key value pair. A value of null will set the query string
-key without a value, e.g. "key" instead of "key=value".
-
-
-### `GuzzleHttp\Psr7\Uri::withoutQueryValue`
-
-`public static function withoutQueryValue(UriInterface $uri, $key): UriInterface`
-
-Creates a new URI with a specific query string value removed. Any existing query string values that exactly match the
-provided key are removed.
-
-## Reference Resolution
-
-`GuzzleHttp\Psr7\UriResolver` provides methods to resolve a URI reference in the context of a base URI according
-to [RFC 3986 Section 5](https://tools.ietf.org/html/rfc3986#section-5). This is for example also what web browsers
-do when resolving a link in a website based on the current request URI.
-
-### `GuzzleHttp\Psr7\UriResolver::resolve`
-
-`public static function resolve(UriInterface $base, UriInterface $rel): UriInterface`
-
-Converts the relative URI into a new URI that is resolved against the base URI.
-
-### `GuzzleHttp\Psr7\UriResolver::removeDotSegments`
-
-`public static function removeDotSegments(string $path): string`
-
-Removes dot segments from a path and returns the new path according to
-[RFC 3986 Section 5.2.4](https://tools.ietf.org/html/rfc3986#section-5.2.4).
-
-### `GuzzleHttp\Psr7\UriResolver::relativize`
-
-`public static function relativize(UriInterface $base, UriInterface $target): UriInterface`
-
-Returns the target URI as a relative reference from the base URI. This method is the counterpart to resolve():
-
-```php
-(string) $target === (string) UriResolver::resolve($base, UriResolver::relativize($base, $target))
-```
-
-One use-case is to use the current request URI as base URI and then generate relative links in your documents
-to reduce the document size or offer self-contained downloadable document archives.
-
-```php
-$base = new Uri('http://example.com/a/b/');
-echo UriResolver::relativize($base, new Uri('http://example.com/a/b/c'));  // prints 'c'.
-echo UriResolver::relativize($base, new Uri('http://example.com/a/x/y'));  // prints '../x/y'.
-echo UriResolver::relativize($base, new Uri('http://example.com/a/b/?q')); // prints '?q'.
-echo UriResolver::relativize($base, new Uri('http://example.org/a/b/'));   // prints '//example.org/a/b/'.
-```
-
-## Normalization and Comparison
-
-`GuzzleHttp\Psr7\UriNormalizer` provides methods to normalize and compare URIs according to
-[RFC 3986 Section 6](https://tools.ietf.org/html/rfc3986#section-6).
-
-### `GuzzleHttp\Psr7\UriNormalizer::normalize`
-
-`public static function normalize(UriInterface $uri, $flags = self::PRESERVING_NORMALIZATIONS): UriInterface`
-
-Returns a normalized URI. The scheme and host component are already normalized to lowercase per PSR-7 UriInterface.
-This methods adds additional normalizations that can be configured with the `$flags` parameter which is a bitmask
-of normalizations to apply. The following normalizations are available:
-
-- `UriNormalizer::PRESERVING_NORMALIZATIONS`
-
-    Default normalizations which only include the ones that preserve semantics.
-
-- `UriNormalizer::CAPITALIZE_PERCENT_ENCODING`
-
-    All letters within a percent-encoding triplet (e.g., "%3A") are case-insensitive, and should be capitalized.
-
-    Example: `http://example.org/a%c2%b1b` → `http://example.org/a%C2%B1b`
-
-- `UriNormalizer::DECODE_UNRESERVED_CHARACTERS`
-
-    Decodes percent-encoded octets of unreserved characters. For consistency, percent-encoded octets in the ranges of
-    ALPHA (%41–%5A and %61–%7A), DIGIT (%30–%39), hyphen (%2D), period (%2E), underscore (%5F), or tilde (%7E) should
-    not be created by URI producers and, when found in a URI, should be decoded to their corresponding unreserved
-    characters by URI normalizers.
-
-    Example: `http://example.org/%7Eusern%61me/` → `http://example.org/~username/`
-
-- `UriNormalizer::CONVERT_EMPTY_PATH`
-
-    Converts the empty path to "/" for http and https URIs.
-
-    Example: `http://example.org` → `http://example.org/`
-
-- `UriNormalizer::REMOVE_DEFAULT_HOST`
-
-    Removes the default host of the given URI scheme from the URI. Only the "file" scheme defines the default host
-    "localhost". All of `file:/myfile`, `file:///myfile`, and `file://localhost/myfile` are equivalent according to
-    RFC 3986.
-
-    Example: `file://localhost/myfile` → `file:///myfile`
-
-- `UriNormalizer::REMOVE_DEFAULT_PORT`
-
-    Removes the default port of the given URI scheme from the URI.
-
-    Example: `http://example.org:80/` → `http://example.org/`
-
-- `UriNormalizer::REMOVE_DOT_SEGMENTS`
-
-    Removes unnecessary dot-segments. Dot-segments in relative-path references are not removed as it would
-    change the semantics of the URI reference.
-
-    Example: `http://example.org/../a/b/../c/./d.html` → `http://example.org/a/c/d.html`
-
-- `UriNormalizer::REMOVE_DUPLICATE_SLASHES`
-
-    Paths which include two or more adjacent slashes are converted to one. Webservers usually ignore duplicate slashes
-    and treat those URIs equivalent. But in theory those URIs do not need to be equivalent. So this normalization
-    may change the semantics. Encoded slashes (%2F) are not removed.
-
-    Example: `http://example.org//foo///bar.html` → `http://example.org/foo/bar.html`
-
-- `UriNormalizer::SORT_QUERY_PARAMETERS`
-
-    Sort query parameters with their values in alphabetical order. However, the order of parameters in a URI may be
-    significant (this is not defined by the standard). So this normalization is not safe and may change the semantics
-    of the URI.
-
-    Example: `?lang=en&article=fred` → `?article=fred&lang=en`
-
-### `GuzzleHttp\Psr7\UriNormalizer::isEquivalent`
-
-`public static function isEquivalent(UriInterface $uri1, UriInterface $uri2, $normalizations = self::PRESERVING_NORMALIZATIONS): bool`
-
-Whether two URIs can be considered equivalent. Both URIs are normalized automatically before comparison with the given
-`$normalizations` bitmask. The method also accepts relative URI references and returns true when they are equivalent.
-This of course assumes they will be resolved against the same base URI. If this is not the case, determination of
-equivalence or difference of relative references does not mean anything.
diff --git a/mayor-orig/www/include/share/googleapi/guzzlehttp/psr7/composer.json b/mayor-orig/www/include/share/googleapi/guzzlehttp/psr7/composer.json
deleted file mode 100644
index b1c5a90b..00000000
--- a/mayor-orig/www/include/share/googleapi/guzzlehttp/psr7/composer.json
+++ /dev/null
@@ -1,39 +0,0 @@
-{
-    "name": "guzzlehttp/psr7",
-    "type": "library",
-    "description": "PSR-7 message implementation that also provides common utility methods",
-    "keywords": ["request", "response", "message", "stream", "http", "uri", "url"],
-    "license": "MIT",
-    "authors": [
-        {
-            "name": "Michael Dowling",
-            "email": "mtdowling@gmail.com",
-            "homepage": "https://github.com/mtdowling"
-        },
-        {
-            "name": "Tobias Schultze",
-            "homepage": "https://github.com/Tobion"
-        }
-    ],
-    "require": {
-        "php": ">=5.4.0",
-        "psr/http-message": "~1.0"
-    },
-    "require-dev": {
-        "phpunit/phpunit": "~4.0"
-    },
-    "provide": {
-        "psr/http-message-implementation": "1.0"
-    },
-    "autoload": {
-        "psr-4": {
-            "GuzzleHttp\\Psr7\\": "src/"
-        },
-        "files": ["src/functions_include.php"]
-    },
-    "extra": {
-        "branch-alias": {
-            "dev-master": "1.4-dev"
-        }
-    }
-}
diff --git a/mayor-orig/www/include/share/googleapi/guzzlehttp/psr7/src/AppendStream.php b/mayor-orig/www/include/share/googleapi/guzzlehttp/psr7/src/AppendStream.php
deleted file mode 100644
index 23039fd7..00000000
--- a/mayor-orig/www/include/share/googleapi/guzzlehttp/psr7/src/AppendStream.php
+++ /dev/null
@@ -1,233 +0,0 @@
-addStream($stream);
-        }
-    }
-
-    public function __toString()
-    {
-        try {
-            $this->rewind();
-            return $this->getContents();
-        } catch (\Exception $e) {
-            return '';
-        }
-    }
-
-    /**
-     * Add a stream to the AppendStream
-     *
-     * @param StreamInterface $stream Stream to append. Must be readable.
-     *
-     * @throws \InvalidArgumentException if the stream is not readable
-     */
-    public function addStream(StreamInterface $stream)
-    {
-        if (!$stream->isReadable()) {
-            throw new \InvalidArgumentException('Each stream must be readable');
-        }
-
-        // The stream is only seekable if all streams are seekable
-        if (!$stream->isSeekable()) {
-            $this->seekable = false;
-        }
-
-        $this->streams[] = $stream;
-    }
-
-    public function getContents()
-    {
-        return copy_to_string($this);
-    }
-
-    /**
-     * Closes each attached stream.
-     *
-     * {@inheritdoc}
-     */
-    public function close()
-    {
-        $this->pos = $this->current = 0;
-
-        foreach ($this->streams as $stream) {
-            $stream->close();
-        }
-
-        $this->streams = [];
-    }
-
-    /**
-     * Detaches each attached stream
-     *
-     * {@inheritdoc}
-     */
-    public function detach()
-    {
-        $this->close();
-        $this->detached = true;
-    }
-
-    public function tell()
-    {
-        return $this->pos;
-    }
-
-    /**
-     * Tries to calculate the size by adding the size of each stream.
-     *
-     * If any of the streams do not return a valid number, then the size of the
-     * append stream cannot be determined and null is returned.
-     *
-     * {@inheritdoc}
-     */
-    public function getSize()
-    {
-        $size = 0;
-
-        foreach ($this->streams as $stream) {
-            $s = $stream->getSize();
-            if ($s === null) {
-                return null;
-            }
-            $size += $s;
-        }
-
-        return $size;
-    }
-
-    public function eof()
-    {
-        return !$this->streams ||
-            ($this->current >= count($this->streams) - 1 &&
-             $this->streams[$this->current]->eof());
-    }
-
-    public function rewind()
-    {
-        $this->seek(0);
-    }
-
-    /**
-     * Attempts to seek to the given position. Only supports SEEK_SET.
-     *
-     * {@inheritdoc}
-     */
-    public function seek($offset, $whence = SEEK_SET)
-    {
-        if (!$this->seekable) {
-            throw new \RuntimeException('This AppendStream is not seekable');
-        } elseif ($whence !== SEEK_SET) {
-            throw new \RuntimeException('The AppendStream can only seek with SEEK_SET');
-        }
-
-        $this->pos = $this->current = 0;
-
-        // Rewind each stream
-        foreach ($this->streams as $i => $stream) {
-            try {
-                $stream->rewind();
-            } catch (\Exception $e) {
-                throw new \RuntimeException('Unable to seek stream '
-                    . $i . ' of the AppendStream', 0, $e);
-            }
-        }
-
-        // Seek to the actual position by reading from each stream
-        while ($this->pos < $offset && !$this->eof()) {
-            $result = $this->read(min(8096, $offset - $this->pos));
-            if ($result === '') {
-                break;
-            }
-        }
-    }
-
-    /**
-     * Reads from all of the appended streams until the length is met or EOF.
-     *
-     * {@inheritdoc}
-     */
-    public function read($length)
-    {
-        $buffer = '';
-        $total = count($this->streams) - 1;
-        $remaining = $length;
-        $progressToNext = false;
-
-        while ($remaining > 0) {
-
-            // Progress to the next stream if needed.
-            if ($progressToNext || $this->streams[$this->current]->eof()) {
-                $progressToNext = false;
-                if ($this->current === $total) {
-                    break;
-                }
-                $this->current++;
-            }
-
-            $result = $this->streams[$this->current]->read($remaining);
-
-            // Using a loose comparison here to match on '', false, and null
-            if ($result == null) {
-                $progressToNext = true;
-                continue;
-            }
-
-            $buffer .= $result;
-            $remaining = $length - strlen($buffer);
-        }
-
-        $this->pos += strlen($buffer);
-
-        return $buffer;
-    }
-
-    public function isReadable()
-    {
-        return true;
-    }
-
-    public function isWritable()
-    {
-        return false;
-    }
-
-    public function isSeekable()
-    {
-        return $this->seekable;
-    }
-
-    public function write($string)
-    {
-        throw new \RuntimeException('Cannot write to an AppendStream');
-    }
-
-    public function getMetadata($key = null)
-    {
-        return $key ? null : [];
-    }
-}
diff --git a/mayor-orig/www/include/share/googleapi/guzzlehttp/psr7/src/BufferStream.php b/mayor-orig/www/include/share/googleapi/guzzlehttp/psr7/src/BufferStream.php
deleted file mode 100644
index af4d4c22..00000000
--- a/mayor-orig/www/include/share/googleapi/guzzlehttp/psr7/src/BufferStream.php
+++ /dev/null
@@ -1,137 +0,0 @@
-hwm = $hwm;
-    }
-
-    public function __toString()
-    {
-        return $this->getContents();
-    }
-
-    public function getContents()
-    {
-        $buffer = $this->buffer;
-        $this->buffer = '';
-
-        return $buffer;
-    }
-
-    public function close()
-    {
-        $this->buffer = '';
-    }
-
-    public function detach()
-    {
-        $this->close();
-    }
-
-    public function getSize()
-    {
-        return strlen($this->buffer);
-    }
-
-    public function isReadable()
-    {
-        return true;
-    }
-
-    public function isWritable()
-    {
-        return true;
-    }
-
-    public function isSeekable()
-    {
-        return false;
-    }
-
-    public function rewind()
-    {
-        $this->seek(0);
-    }
-
-    public function seek($offset, $whence = SEEK_SET)
-    {
-        throw new \RuntimeException('Cannot seek a BufferStream');
-    }
-
-    public function eof()
-    {
-        return strlen($this->buffer) === 0;
-    }
-
-    public function tell()
-    {
-        throw new \RuntimeException('Cannot determine the position of a BufferStream');
-    }
-
-    /**
-     * Reads data from the buffer.
-     */
-    public function read($length)
-    {
-        $currentLength = strlen($this->buffer);
-
-        if ($length >= $currentLength) {
-            // No need to slice the buffer because we don't have enough data.
-            $result = $this->buffer;
-            $this->buffer = '';
-        } else {
-            // Slice up the result to provide a subset of the buffer.
-            $result = substr($this->buffer, 0, $length);
-            $this->buffer = substr($this->buffer, $length);
-        }
-
-        return $result;
-    }
-
-    /**
-     * Writes data to the buffer.
-     */
-    public function write($string)
-    {
-        $this->buffer .= $string;
-
-        // TODO: What should happen here?
-        if (strlen($this->buffer) >= $this->hwm) {
-            return false;
-        }
-
-        return strlen($string);
-    }
-
-    public function getMetadata($key = null)
-    {
-        if ($key == 'hwm') {
-            return $this->hwm;
-        }
-
-        return $key ? null : [];
-    }
-}
diff --git a/mayor-orig/www/include/share/googleapi/guzzlehttp/psr7/src/CachingStream.php b/mayor-orig/www/include/share/googleapi/guzzlehttp/psr7/src/CachingStream.php
deleted file mode 100644
index ed68f086..00000000
--- a/mayor-orig/www/include/share/googleapi/guzzlehttp/psr7/src/CachingStream.php
+++ /dev/null
@@ -1,138 +0,0 @@
-remoteStream = $stream;
-        $this->stream = $target ?: new Stream(fopen('php://temp', 'r+'));
-    }
-
-    public function getSize()
-    {
-        return max($this->stream->getSize(), $this->remoteStream->getSize());
-    }
-
-    public function rewind()
-    {
-        $this->seek(0);
-    }
-
-    public function seek($offset, $whence = SEEK_SET)
-    {
-        if ($whence == SEEK_SET) {
-            $byte = $offset;
-        } elseif ($whence == SEEK_CUR) {
-            $byte = $offset + $this->tell();
-        } elseif ($whence == SEEK_END) {
-            $size = $this->remoteStream->getSize();
-            if ($size === null) {
-                $size = $this->cacheEntireStream();
-            }
-            $byte = $size + $offset;
-        } else {
-            throw new \InvalidArgumentException('Invalid whence');
-        }
-
-        $diff = $byte - $this->stream->getSize();
-
-        if ($diff > 0) {
-            // Read the remoteStream until we have read in at least the amount
-            // of bytes requested, or we reach the end of the file.
-            while ($diff > 0 && !$this->remoteStream->eof()) {
-                $this->read($diff);
-                $diff = $byte - $this->stream->getSize();
-            }
-        } else {
-            // We can just do a normal seek since we've already seen this byte.
-            $this->stream->seek($byte);
-        }
-    }
-
-    public function read($length)
-    {
-        // Perform a regular read on any previously read data from the buffer
-        $data = $this->stream->read($length);
-        $remaining = $length - strlen($data);
-
-        // More data was requested so read from the remote stream
-        if ($remaining) {
-            // If data was written to the buffer in a position that would have
-            // been filled from the remote stream, then we must skip bytes on
-            // the remote stream to emulate overwriting bytes from that
-            // position. This mimics the behavior of other PHP stream wrappers.
-            $remoteData = $this->remoteStream->read(
-                $remaining + $this->skipReadBytes
-            );
-
-            if ($this->skipReadBytes) {
-                $len = strlen($remoteData);
-                $remoteData = substr($remoteData, $this->skipReadBytes);
-                $this->skipReadBytes = max(0, $this->skipReadBytes - $len);
-            }
-
-            $data .= $remoteData;
-            $this->stream->write($remoteData);
-        }
-
-        return $data;
-    }
-
-    public function write($string)
-    {
-        // When appending to the end of the currently read stream, you'll want
-        // to skip bytes from being read from the remote stream to emulate
-        // other stream wrappers. Basically replacing bytes of data of a fixed
-        // length.
-        $overflow = (strlen($string) + $this->tell()) - $this->remoteStream->tell();
-        if ($overflow > 0) {
-            $this->skipReadBytes += $overflow;
-        }
-
-        return $this->stream->write($string);
-    }
-
-    public function eof()
-    {
-        return $this->stream->eof() && $this->remoteStream->eof();
-    }
-
-    /**
-     * Close both the remote stream and buffer stream
-     */
-    public function close()
-    {
-        $this->remoteStream->close() && $this->stream->close();
-    }
-
-    private function cacheEntireStream()
-    {
-        $target = new FnStream(['write' => 'strlen']);
-        copy_to_stream($this, $target);
-
-        return $this->tell();
-    }
-}
diff --git a/mayor-orig/www/include/share/googleapi/guzzlehttp/psr7/src/DroppingStream.php b/mayor-orig/www/include/share/googleapi/guzzlehttp/psr7/src/DroppingStream.php
deleted file mode 100644
index 8935c80d..00000000
--- a/mayor-orig/www/include/share/googleapi/guzzlehttp/psr7/src/DroppingStream.php
+++ /dev/null
@@ -1,42 +0,0 @@
-stream = $stream;
-        $this->maxLength = $maxLength;
-    }
-
-    public function write($string)
-    {
-        $diff = $this->maxLength - $this->stream->getSize();
-
-        // Begin returning 0 when the underlying stream is too large.
-        if ($diff <= 0) {
-            return 0;
-        }
-
-        // Write the stream or a subset of the stream if needed.
-        if (strlen($string) < $diff) {
-            return $this->stream->write($string);
-        }
-
-        return $this->stream->write(substr($string, 0, $diff));
-    }
-}
diff --git a/mayor-orig/www/include/share/googleapi/guzzlehttp/psr7/src/FnStream.php b/mayor-orig/www/include/share/googleapi/guzzlehttp/psr7/src/FnStream.php
deleted file mode 100644
index cc9b4453..00000000
--- a/mayor-orig/www/include/share/googleapi/guzzlehttp/psr7/src/FnStream.php
+++ /dev/null
@@ -1,149 +0,0 @@
-methods = $methods;
-
-        // Create the functions on the class
-        foreach ($methods as $name => $fn) {
-            $this->{'_fn_' . $name} = $fn;
-        }
-    }
-
-    /**
-     * Lazily determine which methods are not implemented.
-     * @throws \BadMethodCallException
-     */
-    public function __get($name)
-    {
-        throw new \BadMethodCallException(str_replace('_fn_', '', $name)
-            . '() is not implemented in the FnStream');
-    }
-
-    /**
-     * The close method is called on the underlying stream only if possible.
-     */
-    public function __destruct()
-    {
-        if (isset($this->_fn_close)) {
-            call_user_func($this->_fn_close);
-        }
-    }
-
-    /**
-     * Adds custom functionality to an underlying stream by intercepting
-     * specific method calls.
-     *
-     * @param StreamInterface $stream  Stream to decorate
-     * @param array           $methods Hash of method name to a closure
-     *
-     * @return FnStream
-     */
-    public static function decorate(StreamInterface $stream, array $methods)
-    {
-        // If any of the required methods were not provided, then simply
-        // proxy to the decorated stream.
-        foreach (array_diff(self::$slots, array_keys($methods)) as $diff) {
-            $methods[$diff] = [$stream, $diff];
-        }
-
-        return new self($methods);
-    }
-
-    public function __toString()
-    {
-        return call_user_func($this->_fn___toString);
-    }
-
-    public function close()
-    {
-        return call_user_func($this->_fn_close);
-    }
-
-    public function detach()
-    {
-        return call_user_func($this->_fn_detach);
-    }
-
-    public function getSize()
-    {
-        return call_user_func($this->_fn_getSize);
-    }
-
-    public function tell()
-    {
-        return call_user_func($this->_fn_tell);
-    }
-
-    public function eof()
-    {
-        return call_user_func($this->_fn_eof);
-    }
-
-    public function isSeekable()
-    {
-        return call_user_func($this->_fn_isSeekable);
-    }
-
-    public function rewind()
-    {
-        call_user_func($this->_fn_rewind);
-    }
-
-    public function seek($offset, $whence = SEEK_SET)
-    {
-        call_user_func($this->_fn_seek, $offset, $whence);
-    }
-
-    public function isWritable()
-    {
-        return call_user_func($this->_fn_isWritable);
-    }
-
-    public function write($string)
-    {
-        return call_user_func($this->_fn_write, $string);
-    }
-
-    public function isReadable()
-    {
-        return call_user_func($this->_fn_isReadable);
-    }
-
-    public function read($length)
-    {
-        return call_user_func($this->_fn_read, $length);
-    }
-
-    public function getContents()
-    {
-        return call_user_func($this->_fn_getContents);
-    }
-
-    public function getMetadata($key = null)
-    {
-        return call_user_func($this->_fn_getMetadata, $key);
-    }
-}
diff --git a/mayor-orig/www/include/share/googleapi/guzzlehttp/psr7/src/InflateStream.php b/mayor-orig/www/include/share/googleapi/guzzlehttp/psr7/src/InflateStream.php
deleted file mode 100644
index 0051d3fe..00000000
--- a/mayor-orig/www/include/share/googleapi/guzzlehttp/psr7/src/InflateStream.php
+++ /dev/null
@@ -1,52 +0,0 @@
-read(10);
-        $filenameHeaderLength = $this->getLengthOfPossibleFilenameHeader($stream, $header);
-        // Skip the header, that is 10 + length of filename + 1 (nil) bytes
-        $stream = new LimitStream($stream, -1, 10 + $filenameHeaderLength);
-        $resource = StreamWrapper::getResource($stream);
-        stream_filter_append($resource, 'zlib.inflate', STREAM_FILTER_READ);
-        $this->stream = new Stream($resource);
-    }
-
-    /**
-     * @param StreamInterface $stream
-     * @param $header
-     * @return int
-     */
-    private function getLengthOfPossibleFilenameHeader(StreamInterface $stream, $header)
-    {
-        $filename_header_length = 0;
-
-        if (substr(bin2hex($header), 6, 2) === '08') {
-            // we have a filename, read until nil
-            $filename_header_length = 1;
-            while ($stream->read(1) !== chr(0)) {
-                $filename_header_length++;
-            }
-        }
-
-        return $filename_header_length;
-    }
-}
diff --git a/mayor-orig/www/include/share/googleapi/guzzlehttp/psr7/src/LazyOpenStream.php b/mayor-orig/www/include/share/googleapi/guzzlehttp/psr7/src/LazyOpenStream.php
deleted file mode 100644
index 02cec3af..00000000
--- a/mayor-orig/www/include/share/googleapi/guzzlehttp/psr7/src/LazyOpenStream.php
+++ /dev/null
@@ -1,39 +0,0 @@
-filename = $filename;
-        $this->mode = $mode;
-    }
-
-    /**
-     * Creates the underlying stream lazily when required.
-     *
-     * @return StreamInterface
-     */
-    protected function createStream()
-    {
-        return stream_for(try_fopen($this->filename, $this->mode));
-    }
-}
diff --git a/mayor-orig/www/include/share/googleapi/guzzlehttp/psr7/src/LimitStream.php b/mayor-orig/www/include/share/googleapi/guzzlehttp/psr7/src/LimitStream.php
deleted file mode 100644
index 3c13d4f4..00000000
--- a/mayor-orig/www/include/share/googleapi/guzzlehttp/psr7/src/LimitStream.php
+++ /dev/null
@@ -1,155 +0,0 @@
-stream = $stream;
-        $this->setLimit($limit);
-        $this->setOffset($offset);
-    }
-
-    public function eof()
-    {
-        // Always return true if the underlying stream is EOF
-        if ($this->stream->eof()) {
-            return true;
-        }
-
-        // No limit and the underlying stream is not at EOF
-        if ($this->limit == -1) {
-            return false;
-        }
-
-        return $this->stream->tell() >= $this->offset + $this->limit;
-    }
-
-    /**
-     * Returns the size of the limited subset of data
-     * {@inheritdoc}
-     */
-    public function getSize()
-    {
-        if (null === ($length = $this->stream->getSize())) {
-            return null;
-        } elseif ($this->limit == -1) {
-            return $length - $this->offset;
-        } else {
-            return min($this->limit, $length - $this->offset);
-        }
-    }
-
-    /**
-     * Allow for a bounded seek on the read limited stream
-     * {@inheritdoc}
-     */
-    public function seek($offset, $whence = SEEK_SET)
-    {
-        if ($whence !== SEEK_SET || $offset < 0) {
-            throw new \RuntimeException(sprintf(
-                'Cannot seek to offset % with whence %s',
-                $offset,
-                $whence
-            ));
-        }
-
-        $offset += $this->offset;
-
-        if ($this->limit !== -1) {
-            if ($offset > $this->offset + $this->limit) {
-                $offset = $this->offset + $this->limit;
-            }
-        }
-
-        $this->stream->seek($offset);
-    }
-
-    /**
-     * Give a relative tell()
-     * {@inheritdoc}
-     */
-    public function tell()
-    {
-        return $this->stream->tell() - $this->offset;
-    }
-
-    /**
-     * Set the offset to start limiting from
-     *
-     * @param int $offset Offset to seek to and begin byte limiting from
-     *
-     * @throws \RuntimeException if the stream cannot be seeked.
-     */
-    public function setOffset($offset)
-    {
-        $current = $this->stream->tell();
-
-        if ($current !== $offset) {
-            // If the stream cannot seek to the offset position, then read to it
-            if ($this->stream->isSeekable()) {
-                $this->stream->seek($offset);
-            } elseif ($current > $offset) {
-                throw new \RuntimeException("Could not seek to stream offset $offset");
-            } else {
-                $this->stream->read($offset - $current);
-            }
-        }
-
-        $this->offset = $offset;
-    }
-
-    /**
-     * Set the limit of bytes that the decorator allows to be read from the
-     * stream.
-     *
-     * @param int $limit Number of bytes to allow to be read from the stream.
-     *                   Use -1 for no limit.
-     */
-    public function setLimit($limit)
-    {
-        $this->limit = $limit;
-    }
-
-    public function read($length)
-    {
-        if ($this->limit == -1) {
-            return $this->stream->read($length);
-        }
-
-        // Check if the current position is less than the total allowed
-        // bytes + original offset
-        $remaining = ($this->offset + $this->limit) - $this->stream->tell();
-        if ($remaining > 0) {
-            // Only return the amount of requested data, ensuring that the byte
-            // limit is not exceeded
-            return $this->stream->read(min($remaining, $length));
-        }
-
-        return '';
-    }
-}
diff --git a/mayor-orig/www/include/share/googleapi/guzzlehttp/psr7/src/MessageTrait.php b/mayor-orig/www/include/share/googleapi/guzzlehttp/psr7/src/MessageTrait.php
deleted file mode 100644
index 1e4da649..00000000
--- a/mayor-orig/www/include/share/googleapi/guzzlehttp/psr7/src/MessageTrait.php
+++ /dev/null
@@ -1,183 +0,0 @@
- array of values */
-    private $headers = [];
-
-    /** @var array Map of lowercase header name => original name at registration */
-    private $headerNames  = [];
-
-    /** @var string */
-    private $protocol = '1.1';
-
-    /** @var StreamInterface */
-    private $stream;
-
-    public function getProtocolVersion()
-    {
-        return $this->protocol;
-    }
-
-    public function withProtocolVersion($version)
-    {
-        if ($this->protocol === $version) {
-            return $this;
-        }
-
-        $new = clone $this;
-        $new->protocol = $version;
-        return $new;
-    }
-
-    public function getHeaders()
-    {
-        return $this->headers;
-    }
-
-    public function hasHeader($header)
-    {
-        return isset($this->headerNames[strtolower($header)]);
-    }
-
-    public function getHeader($header)
-    {
-        $header = strtolower($header);
-
-        if (!isset($this->headerNames[$header])) {
-            return [];
-        }
-
-        $header = $this->headerNames[$header];
-
-        return $this->headers[$header];
-    }
-
-    public function getHeaderLine($header)
-    {
-        return implode(', ', $this->getHeader($header));
-    }
-
-    public function withHeader($header, $value)
-    {
-        if (!is_array($value)) {
-            $value = [$value];
-        }
-
-        $value = $this->trimHeaderValues($value);
-        $normalized = strtolower($header);
-
-        $new = clone $this;
-        if (isset($new->headerNames[$normalized])) {
-            unset($new->headers[$new->headerNames[$normalized]]);
-        }
-        $new->headerNames[$normalized] = $header;
-        $new->headers[$header] = $value;
-
-        return $new;
-    }
-
-    public function withAddedHeader($header, $value)
-    {
-        if (!is_array($value)) {
-            $value = [$value];
-        }
-
-        $value = $this->trimHeaderValues($value);
-        $normalized = strtolower($header);
-
-        $new = clone $this;
-        if (isset($new->headerNames[$normalized])) {
-            $header = $this->headerNames[$normalized];
-            $new->headers[$header] = array_merge($this->headers[$header], $value);
-        } else {
-            $new->headerNames[$normalized] = $header;
-            $new->headers[$header] = $value;
-        }
-
-        return $new;
-    }
-
-    public function withoutHeader($header)
-    {
-        $normalized = strtolower($header);
-
-        if (!isset($this->headerNames[$normalized])) {
-            return $this;
-        }
-
-        $header = $this->headerNames[$normalized];
-
-        $new = clone $this;
-        unset($new->headers[$header], $new->headerNames[$normalized]);
-
-        return $new;
-    }
-
-    public function getBody()
-    {
-        if (!$this->stream) {
-            $this->stream = stream_for('');
-        }
-
-        return $this->stream;
-    }
-
-    public function withBody(StreamInterface $body)
-    {
-        if ($body === $this->stream) {
-            return $this;
-        }
-
-        $new = clone $this;
-        $new->stream = $body;
-        return $new;
-    }
-
-    private function setHeaders(array $headers)
-    {
-        $this->headerNames = $this->headers = [];
-        foreach ($headers as $header => $value) {
-            if (!is_array($value)) {
-                $value = [$value];
-            }
-
-            $value = $this->trimHeaderValues($value);
-            $normalized = strtolower($header);
-            if (isset($this->headerNames[$normalized])) {
-                $header = $this->headerNames[$normalized];
-                $this->headers[$header] = array_merge($this->headers[$header], $value);
-            } else {
-                $this->headerNames[$normalized] = $header;
-                $this->headers[$header] = $value;
-            }
-        }
-    }
-
-    /**
-     * Trims whitespace from the header values.
-     *
-     * Spaces and tabs ought to be excluded by parsers when extracting the field value from a header field.
-     *
-     * header-field = field-name ":" OWS field-value OWS
-     * OWS          = *( SP / HTAB )
-     *
-     * @param string[] $values Header values
-     *
-     * @return string[] Trimmed header values
-     *
-     * @see https://tools.ietf.org/html/rfc7230#section-3.2.4
-     */
-    private function trimHeaderValues(array $values)
-    {
-        return array_map(function ($value) {
-            return trim($value, " \t");
-        }, $values);
-    }
-}
diff --git a/mayor-orig/www/include/share/googleapi/guzzlehttp/psr7/src/MultipartStream.php b/mayor-orig/www/include/share/googleapi/guzzlehttp/psr7/src/MultipartStream.php
deleted file mode 100644
index c0fd584f..00000000
--- a/mayor-orig/www/include/share/googleapi/guzzlehttp/psr7/src/MultipartStream.php
+++ /dev/null
@@ -1,153 +0,0 @@
-boundary = $boundary ?: sha1(uniqid('', true));
-        $this->stream = $this->createStream($elements);
-    }
-
-    /**
-     * Get the boundary
-     *
-     * @return string
-     */
-    public function getBoundary()
-    {
-        return $this->boundary;
-    }
-
-    public function isWritable()
-    {
-        return false;
-    }
-
-    /**
-     * Get the headers needed before transferring the content of a POST file
-     */
-    private function getHeaders(array $headers)
-    {
-        $str = '';
-        foreach ($headers as $key => $value) {
-            $str .= "{$key}: {$value}\r\n";
-        }
-
-        return "--{$this->boundary}\r\n" . trim($str) . "\r\n\r\n";
-    }
-
-    /**
-     * Create the aggregate stream that will be used to upload the POST data
-     */
-    protected function createStream(array $elements)
-    {
-        $stream = new AppendStream();
-
-        foreach ($elements as $element) {
-            $this->addElement($stream, $element);
-        }
-
-        // Add the trailing boundary with CRLF
-        $stream->addStream(stream_for("--{$this->boundary}--\r\n"));
-
-        return $stream;
-    }
-
-    private function addElement(AppendStream $stream, array $element)
-    {
-        foreach (['contents', 'name'] as $key) {
-            if (!array_key_exists($key, $element)) {
-                throw new \InvalidArgumentException("A '{$key}' key is required");
-            }
-        }
-
-        $element['contents'] = stream_for($element['contents']);
-
-        if (empty($element['filename'])) {
-            $uri = $element['contents']->getMetadata('uri');
-            if (substr($uri, 0, 6) !== 'php://') {
-                $element['filename'] = $uri;
-            }
-        }
-
-        list($body, $headers) = $this->createElement(
-            $element['name'],
-            $element['contents'],
-            isset($element['filename']) ? $element['filename'] : null,
-            isset($element['headers']) ? $element['headers'] : []
-        );
-
-        $stream->addStream(stream_for($this->getHeaders($headers)));
-        $stream->addStream($body);
-        $stream->addStream(stream_for("\r\n"));
-    }
-
-    /**
-     * @return array
-     */
-    private function createElement($name, StreamInterface $stream, $filename, array $headers)
-    {
-        // Set a default content-disposition header if one was no provided
-        $disposition = $this->getHeader($headers, 'content-disposition');
-        if (!$disposition) {
-            $headers['Content-Disposition'] = ($filename === '0' || $filename)
-                ? sprintf('form-data; name="%s"; filename="%s"',
-                    $name,
-                    basename($filename))
-                : "form-data; name=\"{$name}\"";
-        }
-
-        // Set a default content-length header if one was no provided
-        $length = $this->getHeader($headers, 'content-length');
-        if (!$length) {
-            if ($length = $stream->getSize()) {
-                $headers['Content-Length'] = (string) $length;
-            }
-        }
-
-        // Set a default Content-Type if one was not supplied
-        $type = $this->getHeader($headers, 'content-type');
-        if (!$type && ($filename === '0' || $filename)) {
-            if ($type = mimetype_from_filename($filename)) {
-                $headers['Content-Type'] = $type;
-            }
-        }
-
-        return [$stream, $headers];
-    }
-
-    private function getHeader(array $headers, $key)
-    {
-        $lowercaseHeader = strtolower($key);
-        foreach ($headers as $k => $v) {
-            if (strtolower($k) === $lowercaseHeader) {
-                return $v;
-            }
-        }
-
-        return null;
-    }
-}
diff --git a/mayor-orig/www/include/share/googleapi/guzzlehttp/psr7/src/NoSeekStream.php b/mayor-orig/www/include/share/googleapi/guzzlehttp/psr7/src/NoSeekStream.php
deleted file mode 100644
index 23322180..00000000
--- a/mayor-orig/www/include/share/googleapi/guzzlehttp/psr7/src/NoSeekStream.php
+++ /dev/null
@@ -1,22 +0,0 @@
-source = $source;
-        $this->size = isset($options['size']) ? $options['size'] : null;
-        $this->metadata = isset($options['metadata']) ? $options['metadata'] : [];
-        $this->buffer = new BufferStream();
-    }
-
-    public function __toString()
-    {
-        try {
-            return copy_to_string($this);
-        } catch (\Exception $e) {
-            return '';
-        }
-    }
-
-    public function close()
-    {
-        $this->detach();
-    }
-
-    public function detach()
-    {
-        $this->tellPos = false;
-        $this->source = null;
-    }
-
-    public function getSize()
-    {
-        return $this->size;
-    }
-
-    public function tell()
-    {
-        return $this->tellPos;
-    }
-
-    public function eof()
-    {
-        return !$this->source;
-    }
-
-    public function isSeekable()
-    {
-        return false;
-    }
-
-    public function rewind()
-    {
-        $this->seek(0);
-    }
-
-    public function seek($offset, $whence = SEEK_SET)
-    {
-        throw new \RuntimeException('Cannot seek a PumpStream');
-    }
-
-    public function isWritable()
-    {
-        return false;
-    }
-
-    public function write($string)
-    {
-        throw new \RuntimeException('Cannot write to a PumpStream');
-    }
-
-    public function isReadable()
-    {
-        return true;
-    }
-
-    public function read($length)
-    {
-        $data = $this->buffer->read($length);
-        $readLen = strlen($data);
-        $this->tellPos += $readLen;
-        $remaining = $length - $readLen;
-
-        if ($remaining) {
-            $this->pump($remaining);
-            $data .= $this->buffer->read($remaining);
-            $this->tellPos += strlen($data) - $readLen;
-        }
-
-        return $data;
-    }
-
-    public function getContents()
-    {
-        $result = '';
-        while (!$this->eof()) {
-            $result .= $this->read(1000000);
-        }
-
-        return $result;
-    }
-
-    public function getMetadata($key = null)
-    {
-        if (!$key) {
-            return $this->metadata;
-        }
-
-        return isset($this->metadata[$key]) ? $this->metadata[$key] : null;
-    }
-
-    private function pump($length)
-    {
-        if ($this->source) {
-            do {
-                $data = call_user_func($this->source, $length);
-                if ($data === false || $data === null) {
-                    $this->source = null;
-                    return;
-                }
-                $this->buffer->write($data);
-                $length -= strlen($data);
-            } while ($length > 0);
-        }
-    }
-}
diff --git a/mayor-orig/www/include/share/googleapi/guzzlehttp/psr7/src/Request.php b/mayor-orig/www/include/share/googleapi/guzzlehttp/psr7/src/Request.php
deleted file mode 100644
index 08285484..00000000
--- a/mayor-orig/www/include/share/googleapi/guzzlehttp/psr7/src/Request.php
+++ /dev/null
@@ -1,142 +0,0 @@
-method = strtoupper($method);
-        $this->uri = $uri;
-        $this->setHeaders($headers);
-        $this->protocol = $version;
-
-        if (!$this->hasHeader('Host')) {
-            $this->updateHostFromUri();
-        }
-
-        if ($body !== '' && $body !== null) {
-            $this->stream = stream_for($body);
-        }
-    }
-
-    public function getRequestTarget()
-    {
-        if ($this->requestTarget !== null) {
-            return $this->requestTarget;
-        }
-
-        $target = $this->uri->getPath();
-        if ($target == '') {
-            $target = '/';
-        }
-        if ($this->uri->getQuery() != '') {
-            $target .= '?' . $this->uri->getQuery();
-        }
-
-        return $target;
-    }
-
-    public function withRequestTarget($requestTarget)
-    {
-        if (preg_match('#\s#', $requestTarget)) {
-            throw new InvalidArgumentException(
-                'Invalid request target provided; cannot contain whitespace'
-            );
-        }
-
-        $new = clone $this;
-        $new->requestTarget = $requestTarget;
-        return $new;
-    }
-
-    public function getMethod()
-    {
-        return $this->method;
-    }
-
-    public function withMethod($method)
-    {
-        $new = clone $this;
-        $new->method = strtoupper($method);
-        return $new;
-    }
-
-    public function getUri()
-    {
-        return $this->uri;
-    }
-
-    public function withUri(UriInterface $uri, $preserveHost = false)
-    {
-        if ($uri === $this->uri) {
-            return $this;
-        }
-
-        $new = clone $this;
-        $new->uri = $uri;
-
-        if (!$preserveHost) {
-            $new->updateHostFromUri();
-        }
-
-        return $new;
-    }
-
-    private function updateHostFromUri()
-    {
-        $host = $this->uri->getHost();
-
-        if ($host == '') {
-            return;
-        }
-
-        if (($port = $this->uri->getPort()) !== null) {
-            $host .= ':' . $port;
-        }
-
-        if (isset($this->headerNames['host'])) {
-            $header = $this->headerNames['host'];
-        } else {
-            $header = 'Host';
-            $this->headerNames['host'] = 'Host';
-        }
-        // Ensure Host is the first header.
-        // See: http://tools.ietf.org/html/rfc7230#section-5.4
-        $this->headers = [$header => [$host]] + $this->headers;
-    }
-}
diff --git a/mayor-orig/www/include/share/googleapi/guzzlehttp/psr7/src/Response.php b/mayor-orig/www/include/share/googleapi/guzzlehttp/psr7/src/Response.php
deleted file mode 100644
index 2830c6c9..00000000
--- a/mayor-orig/www/include/share/googleapi/guzzlehttp/psr7/src/Response.php
+++ /dev/null
@@ -1,132 +0,0 @@
- 'Continue',
-        101 => 'Switching Protocols',
-        102 => 'Processing',
-        200 => 'OK',
-        201 => 'Created',
-        202 => 'Accepted',
-        203 => 'Non-Authoritative Information',
-        204 => 'No Content',
-        205 => 'Reset Content',
-        206 => 'Partial Content',
-        207 => 'Multi-status',
-        208 => 'Already Reported',
-        300 => 'Multiple Choices',
-        301 => 'Moved Permanently',
-        302 => 'Found',
-        303 => 'See Other',
-        304 => 'Not Modified',
-        305 => 'Use Proxy',
-        306 => 'Switch Proxy',
-        307 => 'Temporary Redirect',
-        400 => 'Bad Request',
-        401 => 'Unauthorized',
-        402 => 'Payment Required',
-        403 => 'Forbidden',
-        404 => 'Not Found',
-        405 => 'Method Not Allowed',
-        406 => 'Not Acceptable',
-        407 => 'Proxy Authentication Required',
-        408 => 'Request Time-out',
-        409 => 'Conflict',
-        410 => 'Gone',
-        411 => 'Length Required',
-        412 => 'Precondition Failed',
-        413 => 'Request Entity Too Large',
-        414 => 'Request-URI Too Large',
-        415 => 'Unsupported Media Type',
-        416 => 'Requested range not satisfiable',
-        417 => 'Expectation Failed',
-        418 => 'I\'m a teapot',
-        422 => 'Unprocessable Entity',
-        423 => 'Locked',
-        424 => 'Failed Dependency',
-        425 => 'Unordered Collection',
-        426 => 'Upgrade Required',
-        428 => 'Precondition Required',
-        429 => 'Too Many Requests',
-        431 => 'Request Header Fields Too Large',
-        451 => 'Unavailable For Legal Reasons',
-        500 => 'Internal Server Error',
-        501 => 'Not Implemented',
-        502 => 'Bad Gateway',
-        503 => 'Service Unavailable',
-        504 => 'Gateway Time-out',
-        505 => 'HTTP Version not supported',
-        506 => 'Variant Also Negotiates',
-        507 => 'Insufficient Storage',
-        508 => 'Loop Detected',
-        511 => 'Network Authentication Required',
-    ];
-
-    /** @var string */
-    private $reasonPhrase = '';
-
-    /** @var int */
-    private $statusCode = 200;
-
-    /**
-     * @param int                                  $status  Status code
-     * @param array                                $headers Response headers
-     * @param string|null|resource|StreamInterface $body    Response body
-     * @param string                               $version Protocol version
-     * @param string|null                          $reason  Reason phrase (when empty a default will be used based on the status code)
-     */
-    public function __construct(
-        $status = 200,
-        array $headers = [],
-        $body = null,
-        $version = '1.1',
-        $reason = null
-    ) {
-        $this->statusCode = (int) $status;
-
-        if ($body !== '' && $body !== null) {
-            $this->stream = stream_for($body);
-        }
-
-        $this->setHeaders($headers);
-        if ($reason == '' && isset(self::$phrases[$this->statusCode])) {
-            $this->reasonPhrase = self::$phrases[$this->statusCode];
-        } else {
-            $this->reasonPhrase = (string) $reason;
-        }
-
-        $this->protocol = $version;
-    }
-
-    public function getStatusCode()
-    {
-        return $this->statusCode;
-    }
-
-    public function getReasonPhrase()
-    {
-        return $this->reasonPhrase;
-    }
-
-    public function withStatus($code, $reasonPhrase = '')
-    {
-        $new = clone $this;
-        $new->statusCode = (int) $code;
-        if ($reasonPhrase == '' && isset(self::$phrases[$new->statusCode])) {
-            $reasonPhrase = self::$phrases[$new->statusCode];
-        }
-        $new->reasonPhrase = $reasonPhrase;
-        return $new;
-    }
-}
diff --git a/mayor-orig/www/include/share/googleapi/guzzlehttp/psr7/src/ServerRequest.php b/mayor-orig/www/include/share/googleapi/guzzlehttp/psr7/src/ServerRequest.php
deleted file mode 100644
index 575aab84..00000000
--- a/mayor-orig/www/include/share/googleapi/guzzlehttp/psr7/src/ServerRequest.php
+++ /dev/null
@@ -1,358 +0,0 @@
-serverParams = $serverParams;
-
-        parent::__construct($method, $uri, $headers, $body, $version);
-    }
-
-    /**
-     * Return an UploadedFile instance array.
-     *
-     * @param array $files A array which respect $_FILES structure
-     * @throws InvalidArgumentException for unrecognized values
-     * @return array
-     */
-    public static function normalizeFiles(array $files)
-    {
-        $normalized = [];
-
-        foreach ($files as $key => $value) {
-            if ($value instanceof UploadedFileInterface) {
-                $normalized[$key] = $value;
-            } elseif (is_array($value) && isset($value['tmp_name'])) {
-                $normalized[$key] = self::createUploadedFileFromSpec($value);
-            } elseif (is_array($value)) {
-                $normalized[$key] = self::normalizeFiles($value);
-                continue;
-            } else {
-                throw new InvalidArgumentException('Invalid value in files specification');
-            }
-        }
-
-        return $normalized;
-    }
-
-    /**
-     * Create and return an UploadedFile instance from a $_FILES specification.
-     *
-     * If the specification represents an array of values, this method will
-     * delegate to normalizeNestedFileSpec() and return that return value.
-     *
-     * @param array $value $_FILES struct
-     * @return array|UploadedFileInterface
-     */
-    private static function createUploadedFileFromSpec(array $value)
-    {
-        if (is_array($value['tmp_name'])) {
-            return self::normalizeNestedFileSpec($value);
-        }
-
-        return new UploadedFile(
-            $value['tmp_name'],
-            (int) $value['size'],
-            (int) $value['error'],
-            $value['name'],
-            $value['type']
-        );
-    }
-
-    /**
-     * Normalize an array of file specifications.
-     *
-     * Loops through all nested files and returns a normalized array of
-     * UploadedFileInterface instances.
-     *
-     * @param array $files
-     * @return UploadedFileInterface[]
-     */
-    private static function normalizeNestedFileSpec(array $files = [])
-    {
-        $normalizedFiles = [];
-
-        foreach (array_keys($files['tmp_name']) as $key) {
-            $spec = [
-                'tmp_name' => $files['tmp_name'][$key],
-                'size'     => $files['size'][$key],
-                'error'    => $files['error'][$key],
-                'name'     => $files['name'][$key],
-                'type'     => $files['type'][$key],
-            ];
-            $normalizedFiles[$key] = self::createUploadedFileFromSpec($spec);
-        }
-
-        return $normalizedFiles;
-    }
-
-    /**
-     * Return a ServerRequest populated with superglobals:
-     * $_GET
-     * $_POST
-     * $_COOKIE
-     * $_FILES
-     * $_SERVER
-     *
-     * @return ServerRequestInterface
-     */
-    public static function fromGlobals()
-    {
-        $method = isset($_SERVER['REQUEST_METHOD']) ? $_SERVER['REQUEST_METHOD'] : 'GET';
-        $headers = function_exists('getallheaders') ? getallheaders() : [];
-        $uri = self::getUriFromGlobals();
-        $body = new LazyOpenStream('php://input', 'r+');
-        $protocol = isset($_SERVER['SERVER_PROTOCOL']) ? str_replace('HTTP/', '', $_SERVER['SERVER_PROTOCOL']) : '1.1';
-
-        $serverRequest = new ServerRequest($method, $uri, $headers, $body, $protocol, $_SERVER);
-
-        return $serverRequest
-            ->withCookieParams($_COOKIE)
-            ->withQueryParams($_GET)
-            ->withParsedBody($_POST)
-            ->withUploadedFiles(self::normalizeFiles($_FILES));
-    }
-
-    /**
-     * Get a Uri populated with values from $_SERVER.
-     *
-     * @return UriInterface
-     */
-    public static function getUriFromGlobals() {
-        $uri = new Uri('');
-
-        $uri = $uri->withScheme(!empty($_SERVER['HTTPS']) && $_SERVER['HTTPS'] !== 'off' ? 'https' : 'http');
-
-        $hasPort = false;
-        if (isset($_SERVER['HTTP_HOST'])) {
-            $hostHeaderParts = explode(':', $_SERVER['HTTP_HOST']);
-            $uri = $uri->withHost($hostHeaderParts[0]);
-            if (isset($hostHeaderParts[1])) {
-                $hasPort = true;
-                $uri = $uri->withPort($hostHeaderParts[1]);
-            }
-        } elseif (isset($_SERVER['SERVER_NAME'])) {
-            $uri = $uri->withHost($_SERVER['SERVER_NAME']);
-        } elseif (isset($_SERVER['SERVER_ADDR'])) {
-            $uri = $uri->withHost($_SERVER['SERVER_ADDR']);
-        }
-
-        if (!$hasPort && isset($_SERVER['SERVER_PORT'])) {
-            $uri = $uri->withPort($_SERVER['SERVER_PORT']);
-        }
-
-        $hasQuery = false;
-        if (isset($_SERVER['REQUEST_URI'])) {
-            $requestUriParts = explode('?', $_SERVER['REQUEST_URI']);
-            $uri = $uri->withPath($requestUriParts[0]);
-            if (isset($requestUriParts[1])) {
-                $hasQuery = true;
-                $uri = $uri->withQuery($requestUriParts[1]);
-            }
-        }
-
-        if (!$hasQuery && isset($_SERVER['QUERY_STRING'])) {
-            $uri = $uri->withQuery($_SERVER['QUERY_STRING']);
-        }
-
-        return $uri;
-    }
-
-
-    /**
-     * {@inheritdoc}
-     */
-    public function getServerParams()
-    {
-        return $this->serverParams;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function getUploadedFiles()
-    {
-        return $this->uploadedFiles;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function withUploadedFiles(array $uploadedFiles)
-    {
-        $new = clone $this;
-        $new->uploadedFiles = $uploadedFiles;
-
-        return $new;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function getCookieParams()
-    {
-        return $this->cookieParams;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function withCookieParams(array $cookies)
-    {
-        $new = clone $this;
-        $new->cookieParams = $cookies;
-
-        return $new;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function getQueryParams()
-    {
-        return $this->queryParams;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function withQueryParams(array $query)
-    {
-        $new = clone $this;
-        $new->queryParams = $query;
-
-        return $new;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function getParsedBody()
-    {
-        return $this->parsedBody;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function withParsedBody($data)
-    {
-        $new = clone $this;
-        $new->parsedBody = $data;
-
-        return $new;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function getAttributes()
-    {
-        return $this->attributes;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function getAttribute($attribute, $default = null)
-    {
-        if (false === array_key_exists($attribute, $this->attributes)) {
-            return $default;
-        }
-
-        return $this->attributes[$attribute];
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function withAttribute($attribute, $value)
-    {
-        $new = clone $this;
-        $new->attributes[$attribute] = $value;
-
-        return $new;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function withoutAttribute($attribute)
-    {
-        if (false === array_key_exists($attribute, $this->attributes)) {
-            return $this;
-        }
-
-        $new = clone $this;
-        unset($new->attributes[$attribute]);
-
-        return $new;
-    }
-}
diff --git a/mayor-orig/www/include/share/googleapi/guzzlehttp/psr7/src/Stream.php b/mayor-orig/www/include/share/googleapi/guzzlehttp/psr7/src/Stream.php
deleted file mode 100644
index e3366287..00000000
--- a/mayor-orig/www/include/share/googleapi/guzzlehttp/psr7/src/Stream.php
+++ /dev/null
@@ -1,257 +0,0 @@
- [
-            'r' => true, 'w+' => true, 'r+' => true, 'x+' => true, 'c+' => true,
-            'rb' => true, 'w+b' => true, 'r+b' => true, 'x+b' => true,
-            'c+b' => true, 'rt' => true, 'w+t' => true, 'r+t' => true,
-            'x+t' => true, 'c+t' => true, 'a+' => true
-        ],
-        'write' => [
-            'w' => true, 'w+' => true, 'rw' => true, 'r+' => true, 'x+' => true,
-            'c+' => true, 'wb' => true, 'w+b' => true, 'r+b' => true,
-            'x+b' => true, 'c+b' => true, 'w+t' => true, 'r+t' => true,
-            'x+t' => true, 'c+t' => true, 'a' => true, 'a+' => true
-        ]
-    ];
-
-    /**
-     * This constructor accepts an associative array of options.
-     *
-     * - size: (int) If a read stream would otherwise have an indeterminate
-     *   size, but the size is known due to foreknowledge, then you can
-     *   provide that size, in bytes.
-     * - metadata: (array) Any additional metadata to return when the metadata
-     *   of the stream is accessed.
-     *
-     * @param resource $stream  Stream resource to wrap.
-     * @param array    $options Associative array of options.
-     *
-     * @throws \InvalidArgumentException if the stream is not a stream resource
-     */
-    public function __construct($stream, $options = [])
-    {
-        if (!is_resource($stream)) {
-            throw new \InvalidArgumentException('Stream must be a resource');
-        }
-
-        if (isset($options['size'])) {
-            $this->size = $options['size'];
-        }
-
-        $this->customMetadata = isset($options['metadata'])
-            ? $options['metadata']
-            : [];
-
-        $this->stream = $stream;
-        $meta = stream_get_meta_data($this->stream);
-        $this->seekable = $meta['seekable'];
-        $this->readable = isset(self::$readWriteHash['read'][$meta['mode']]);
-        $this->writable = isset(self::$readWriteHash['write'][$meta['mode']]);
-        $this->uri = $this->getMetadata('uri');
-    }
-
-    public function __get($name)
-    {
-        if ($name == 'stream') {
-            throw new \RuntimeException('The stream is detached');
-        }
-
-        throw new \BadMethodCallException('No value for ' . $name);
-    }
-
-    /**
-     * Closes the stream when the destructed
-     */
-    public function __destruct()
-    {
-        $this->close();
-    }
-
-    public function __toString()
-    {
-        try {
-            $this->seek(0);
-            return (string) stream_get_contents($this->stream);
-        } catch (\Exception $e) {
-            return '';
-        }
-    }
-
-    public function getContents()
-    {
-        $contents = stream_get_contents($this->stream);
-
-        if ($contents === false) {
-            throw new \RuntimeException('Unable to read stream contents');
-        }
-
-        return $contents;
-    }
-
-    public function close()
-    {
-        if (isset($this->stream)) {
-            if (is_resource($this->stream)) {
-                fclose($this->stream);
-            }
-            $this->detach();
-        }
-    }
-
-    public function detach()
-    {
-        if (!isset($this->stream)) {
-            return null;
-        }
-
-        $result = $this->stream;
-        unset($this->stream);
-        $this->size = $this->uri = null;
-        $this->readable = $this->writable = $this->seekable = false;
-
-        return $result;
-    }
-
-    public function getSize()
-    {
-        if ($this->size !== null) {
-            return $this->size;
-        }
-
-        if (!isset($this->stream)) {
-            return null;
-        }
-
-        // Clear the stat cache if the stream has a URI
-        if ($this->uri) {
-            clearstatcache(true, $this->uri);
-        }
-
-        $stats = fstat($this->stream);
-        if (isset($stats['size'])) {
-            $this->size = $stats['size'];
-            return $this->size;
-        }
-
-        return null;
-    }
-
-    public function isReadable()
-    {
-        return $this->readable;
-    }
-
-    public function isWritable()
-    {
-        return $this->writable;
-    }
-
-    public function isSeekable()
-    {
-        return $this->seekable;
-    }
-
-    public function eof()
-    {
-        return !$this->stream || feof($this->stream);
-    }
-
-    public function tell()
-    {
-        $result = ftell($this->stream);
-
-        if ($result === false) {
-            throw new \RuntimeException('Unable to determine stream position');
-        }
-
-        return $result;
-    }
-
-    public function rewind()
-    {
-        $this->seek(0);
-    }
-
-    public function seek($offset, $whence = SEEK_SET)
-    {
-        if (!$this->seekable) {
-            throw new \RuntimeException('Stream is not seekable');
-        } elseif (fseek($this->stream, $offset, $whence) === -1) {
-            throw new \RuntimeException('Unable to seek to stream position '
-                . $offset . ' with whence ' . var_export($whence, true));
-        }
-    }
-
-    public function read($length)
-    {
-        if (!$this->readable) {
-            throw new \RuntimeException('Cannot read from non-readable stream');
-        }
-        if ($length < 0) {
-            throw new \RuntimeException('Length parameter cannot be negative');
-        }
-
-        if (0 === $length) {
-            return '';
-        }
-
-        $string = fread($this->stream, $length);
-        if (false === $string) {
-            throw new \RuntimeException('Unable to read from stream');
-        }
-
-        return $string;
-    }
-
-    public function write($string)
-    {
-        if (!$this->writable) {
-            throw new \RuntimeException('Cannot write to a non-writable stream');
-        }
-
-        // We can't know the size after writing anything
-        $this->size = null;
-        $result = fwrite($this->stream, $string);
-
-        if ($result === false) {
-            throw new \RuntimeException('Unable to write to stream');
-        }
-
-        return $result;
-    }
-
-    public function getMetadata($key = null)
-    {
-        if (!isset($this->stream)) {
-            return $key ? null : [];
-        } elseif (!$key) {
-            return $this->customMetadata + stream_get_meta_data($this->stream);
-        } elseif (isset($this->customMetadata[$key])) {
-            return $this->customMetadata[$key];
-        }
-
-        $meta = stream_get_meta_data($this->stream);
-
-        return isset($meta[$key]) ? $meta[$key] : null;
-    }
-}
diff --git a/mayor-orig/www/include/share/googleapi/guzzlehttp/psr7/src/StreamDecoratorTrait.php b/mayor-orig/www/include/share/googleapi/guzzlehttp/psr7/src/StreamDecoratorTrait.php
deleted file mode 100644
index daec6f52..00000000
--- a/mayor-orig/www/include/share/googleapi/guzzlehttp/psr7/src/StreamDecoratorTrait.php
+++ /dev/null
@@ -1,149 +0,0 @@
-stream = $stream;
-    }
-
-    /**
-     * Magic method used to create a new stream if streams are not added in
-     * the constructor of a decorator (e.g., LazyOpenStream).
-     *
-     * @param string $name Name of the property (allows "stream" only).
-     *
-     * @return StreamInterface
-     */
-    public function __get($name)
-    {
-        if ($name == 'stream') {
-            $this->stream = $this->createStream();
-            return $this->stream;
-        }
-
-        throw new \UnexpectedValueException("$name not found on class");
-    }
-
-    public function __toString()
-    {
-        try {
-            if ($this->isSeekable()) {
-                $this->seek(0);
-            }
-            return $this->getContents();
-        } catch (\Exception $e) {
-            // Really, PHP? https://bugs.php.net/bug.php?id=53648
-            trigger_error('StreamDecorator::__toString exception: '
-                . (string) $e, E_USER_ERROR);
-            return '';
-        }
-    }
-
-    public function getContents()
-    {
-        return copy_to_string($this);
-    }
-
-    /**
-     * Allow decorators to implement custom methods
-     *
-     * @param string $method Missing method name
-     * @param array  $args   Method arguments
-     *
-     * @return mixed
-     */
-    public function __call($method, array $args)
-    {
-        $result = call_user_func_array([$this->stream, $method], $args);
-
-        // Always return the wrapped object if the result is a return $this
-        return $result === $this->stream ? $this : $result;
-    }
-
-    public function close()
-    {
-        $this->stream->close();
-    }
-
-    public function getMetadata($key = null)
-    {
-        return $this->stream->getMetadata($key);
-    }
-
-    public function detach()
-    {
-        return $this->stream->detach();
-    }
-
-    public function getSize()
-    {
-        return $this->stream->getSize();
-    }
-
-    public function eof()
-    {
-        return $this->stream->eof();
-    }
-
-    public function tell()
-    {
-        return $this->stream->tell();
-    }
-
-    public function isReadable()
-    {
-        return $this->stream->isReadable();
-    }
-
-    public function isWritable()
-    {
-        return $this->stream->isWritable();
-    }
-
-    public function isSeekable()
-    {
-        return $this->stream->isSeekable();
-    }
-
-    public function rewind()
-    {
-        $this->seek(0);
-    }
-
-    public function seek($offset, $whence = SEEK_SET)
-    {
-        $this->stream->seek($offset, $whence);
-    }
-
-    public function read($length)
-    {
-        return $this->stream->read($length);
-    }
-
-    public function write($string)
-    {
-        return $this->stream->write($string);
-    }
-
-    /**
-     * Implement in subclasses to dynamically create streams when requested.
-     *
-     * @return StreamInterface
-     * @throws \BadMethodCallException
-     */
-    protected function createStream()
-    {
-        throw new \BadMethodCallException('Not implemented');
-    }
-}
diff --git a/mayor-orig/www/include/share/googleapi/guzzlehttp/psr7/src/StreamWrapper.php b/mayor-orig/www/include/share/googleapi/guzzlehttp/psr7/src/StreamWrapper.php
deleted file mode 100644
index cf7b2232..00000000
--- a/mayor-orig/www/include/share/googleapi/guzzlehttp/psr7/src/StreamWrapper.php
+++ /dev/null
@@ -1,121 +0,0 @@
-isReadable()) {
-            $mode = $stream->isWritable() ? 'r+' : 'r';
-        } elseif ($stream->isWritable()) {
-            $mode = 'w';
-        } else {
-            throw new \InvalidArgumentException('The stream must be readable, '
-                . 'writable, or both.');
-        }
-
-        return fopen('guzzle://stream', $mode, null, stream_context_create([
-            'guzzle' => ['stream' => $stream]
-        ]));
-    }
-
-    /**
-     * Registers the stream wrapper if needed
-     */
-    public static function register()
-    {
-        if (!in_array('guzzle', stream_get_wrappers())) {
-            stream_wrapper_register('guzzle', __CLASS__);
-        }
-    }
-
-    public function stream_open($path, $mode, $options, &$opened_path)
-    {
-        $options = stream_context_get_options($this->context);
-
-        if (!isset($options['guzzle']['stream'])) {
-            return false;
-        }
-
-        $this->mode = $mode;
-        $this->stream = $options['guzzle']['stream'];
-
-        return true;
-    }
-
-    public function stream_read($count)
-    {
-        return $this->stream->read($count);
-    }
-
-    public function stream_write($data)
-    {
-        return (int) $this->stream->write($data);
-    }
-
-    public function stream_tell()
-    {
-        return $this->stream->tell();
-    }
-
-    public function stream_eof()
-    {
-        return $this->stream->eof();
-    }
-
-    public function stream_seek($offset, $whence)
-    {
-        $this->stream->seek($offset, $whence);
-
-        return true;
-    }
-
-    public function stream_stat()
-    {
-        static $modeMap = [
-            'r'  => 33060,
-            'r+' => 33206,
-            'w'  => 33188
-        ];
-
-        return [
-            'dev'     => 0,
-            'ino'     => 0,
-            'mode'    => $modeMap[$this->mode],
-            'nlink'   => 0,
-            'uid'     => 0,
-            'gid'     => 0,
-            'rdev'    => 0,
-            'size'    => $this->stream->getSize() ?: 0,
-            'atime'   => 0,
-            'mtime'   => 0,
-            'ctime'   => 0,
-            'blksize' => 0,
-            'blocks'  => 0
-        ];
-    }
-}
diff --git a/mayor-orig/www/include/share/googleapi/guzzlehttp/psr7/src/UploadedFile.php b/mayor-orig/www/include/share/googleapi/guzzlehttp/psr7/src/UploadedFile.php
deleted file mode 100644
index e62bd5c8..00000000
--- a/mayor-orig/www/include/share/googleapi/guzzlehttp/psr7/src/UploadedFile.php
+++ /dev/null
@@ -1,316 +0,0 @@
-setError($errorStatus);
-        $this->setSize($size);
-        $this->setClientFilename($clientFilename);
-        $this->setClientMediaType($clientMediaType);
-
-        if ($this->isOk()) {
-            $this->setStreamOrFile($streamOrFile);
-        }
-    }
-
-    /**
-     * Depending on the value set file or stream variable
-     *
-     * @param mixed $streamOrFile
-     * @throws InvalidArgumentException
-     */
-    private function setStreamOrFile($streamOrFile)
-    {
-        if (is_string($streamOrFile)) {
-            $this->file = $streamOrFile;
-        } elseif (is_resource($streamOrFile)) {
-            $this->stream = new Stream($streamOrFile);
-        } elseif ($streamOrFile instanceof StreamInterface) {
-            $this->stream = $streamOrFile;
-        } else {
-            throw new InvalidArgumentException(
-                'Invalid stream or file provided for UploadedFile'
-            );
-        }
-    }
-
-    /**
-     * @param int $error
-     * @throws InvalidArgumentException
-     */
-    private function setError($error)
-    {
-        if (false === is_int($error)) {
-            throw new InvalidArgumentException(
-                'Upload file error status must be an integer'
-            );
-        }
-
-        if (false === in_array($error, UploadedFile::$errors)) {
-            throw new InvalidArgumentException(
-                'Invalid error status for UploadedFile'
-            );
-        }
-
-        $this->error = $error;
-    }
-
-    /**
-     * @param int $size
-     * @throws InvalidArgumentException
-     */
-    private function setSize($size)
-    {
-        if (false === is_int($size)) {
-            throw new InvalidArgumentException(
-                'Upload file size must be an integer'
-            );
-        }
-
-        $this->size = $size;
-    }
-
-    /**
-     * @param mixed $param
-     * @return boolean
-     */
-    private function isStringOrNull($param)
-    {
-        return in_array(gettype($param), ['string', 'NULL']);
-    }
-
-    /**
-     * @param mixed $param
-     * @return boolean
-     */
-    private function isStringNotEmpty($param)
-    {
-        return is_string($param) && false === empty($param);
-    }
-
-    /**
-     * @param string|null $clientFilename
-     * @throws InvalidArgumentException
-     */
-    private function setClientFilename($clientFilename)
-    {
-        if (false === $this->isStringOrNull($clientFilename)) {
-            throw new InvalidArgumentException(
-                'Upload file client filename must be a string or null'
-            );
-        }
-
-        $this->clientFilename = $clientFilename;
-    }
-
-    /**
-     * @param string|null $clientMediaType
-     * @throws InvalidArgumentException
-     */
-    private function setClientMediaType($clientMediaType)
-    {
-        if (false === $this->isStringOrNull($clientMediaType)) {
-            throw new InvalidArgumentException(
-                'Upload file client media type must be a string or null'
-            );
-        }
-
-        $this->clientMediaType = $clientMediaType;
-    }
-
-    /**
-     * Return true if there is no upload error
-     *
-     * @return boolean
-     */
-    private function isOk()
-    {
-        return $this->error === UPLOAD_ERR_OK;
-    }
-
-    /**
-     * @return boolean
-     */
-    public function isMoved()
-    {
-        return $this->moved;
-    }
-
-    /**
-     * @throws RuntimeException if is moved or not ok
-     */
-    private function validateActive()
-    {
-        if (false === $this->isOk()) {
-            throw new RuntimeException('Cannot retrieve stream due to upload error');
-        }
-
-        if ($this->isMoved()) {
-            throw new RuntimeException('Cannot retrieve stream after it has already been moved');
-        }
-    }
-
-    /**
-     * {@inheritdoc}
-     * @throws RuntimeException if the upload was not successful.
-     */
-    public function getStream()
-    {
-        $this->validateActive();
-
-        if ($this->stream instanceof StreamInterface) {
-            return $this->stream;
-        }
-
-        return new LazyOpenStream($this->file, 'r+');
-    }
-
-    /**
-     * {@inheritdoc}
-     *
-     * @see http://php.net/is_uploaded_file
-     * @see http://php.net/move_uploaded_file
-     * @param string $targetPath Path to which to move the uploaded file.
-     * @throws RuntimeException if the upload was not successful.
-     * @throws InvalidArgumentException if the $path specified is invalid.
-     * @throws RuntimeException on any error during the move operation, or on
-     *     the second or subsequent call to the method.
-     */
-    public function moveTo($targetPath)
-    {
-        $this->validateActive();
-
-        if (false === $this->isStringNotEmpty($targetPath)) {
-            throw new InvalidArgumentException(
-                'Invalid path provided for move operation; must be a non-empty string'
-            );
-        }
-
-        if ($this->file) {
-            $this->moved = php_sapi_name() == 'cli'
-                ? rename($this->file, $targetPath)
-                : move_uploaded_file($this->file, $targetPath);
-        } else {
-            copy_to_stream(
-                $this->getStream(),
-                new LazyOpenStream($targetPath, 'w')
-            );
-
-            $this->moved = true;
-        }
-
-        if (false === $this->moved) {
-            throw new RuntimeException(
-                sprintf('Uploaded file could not be moved to %s', $targetPath)
-            );
-        }
-    }
-
-    /**
-     * {@inheritdoc}
-     *
-     * @return int|null The file size in bytes or null if unknown.
-     */
-    public function getSize()
-    {
-        return $this->size;
-    }
-
-    /**
-     * {@inheritdoc}
-     *
-     * @see http://php.net/manual/en/features.file-upload.errors.php
-     * @return int One of PHP's UPLOAD_ERR_XXX constants.
-     */
-    public function getError()
-    {
-        return $this->error;
-    }
-
-    /**
-     * {@inheritdoc}
-     *
-     * @return string|null The filename sent by the client or null if none
-     *     was provided.
-     */
-    public function getClientFilename()
-    {
-        return $this->clientFilename;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function getClientMediaType()
-    {
-        return $this->clientMediaType;
-    }
-}
diff --git a/mayor-orig/www/include/share/googleapi/guzzlehttp/psr7/src/Uri.php b/mayor-orig/www/include/share/googleapi/guzzlehttp/psr7/src/Uri.php
deleted file mode 100644
index f46c1db9..00000000
--- a/mayor-orig/www/include/share/googleapi/guzzlehttp/psr7/src/Uri.php
+++ /dev/null
@@ -1,702 +0,0 @@
- 80,
-        'https' => 443,
-        'ftp' => 21,
-        'gopher' => 70,
-        'nntp' => 119,
-        'news' => 119,
-        'telnet' => 23,
-        'tn3270' => 23,
-        'imap' => 143,
-        'pop' => 110,
-        'ldap' => 389,
-    ];
-
-    private static $charUnreserved = 'a-zA-Z0-9_\-\.~';
-    private static $charSubDelims = '!\$&\'\(\)\*\+,;=';
-    private static $replaceQuery = ['=' => '%3D', '&' => '%26'];
-
-    /** @var string Uri scheme. */
-    private $scheme = '';
-
-    /** @var string Uri user info. */
-    private $userInfo = '';
-
-    /** @var string Uri host. */
-    private $host = '';
-
-    /** @var int|null Uri port. */
-    private $port;
-
-    /** @var string Uri path. */
-    private $path = '';
-
-    /** @var string Uri query string. */
-    private $query = '';
-
-    /** @var string Uri fragment. */
-    private $fragment = '';
-
-    /**
-     * @param string $uri URI to parse
-     */
-    public function __construct($uri = '')
-    {
-        // weak type check to also accept null until we can add scalar type hints
-        if ($uri != '') {
-            $parts = parse_url($uri);
-            if ($parts === false) {
-                throw new \InvalidArgumentException("Unable to parse URI: $uri");
-            }
-            $this->applyParts($parts);
-        }
-    }
-
-    public function __toString()
-    {
-        return self::composeComponents(
-            $this->scheme,
-            $this->getAuthority(),
-            $this->path,
-            $this->query,
-            $this->fragment
-        );
-    }
-
-    /**
-     * Composes a URI reference string from its various components.
-     *
-     * Usually this method does not need to be called manually but instead is used indirectly via
-     * `Psr\Http\Message\UriInterface::__toString`.
-     *
-     * PSR-7 UriInterface treats an empty component the same as a missing component as
-     * getQuery(), getFragment() etc. always return a string. This explains the slight
-     * difference to RFC 3986 Section 5.3.
-     *
-     * Another adjustment is that the authority separator is added even when the authority is missing/empty
-     * for the "file" scheme. This is because PHP stream functions like `file_get_contents` only work with
-     * `file:///myfile` but not with `file:/myfile` although they are equivalent according to RFC 3986. But
-     * `file:///` is the more common syntax for the file scheme anyway (Chrome for example redirects to
-     * that format).
-     *
-     * @param string $scheme
-     * @param string $authority
-     * @param string $path
-     * @param string $query
-     * @param string $fragment
-     *
-     * @return string
-     *
-     * @link https://tools.ietf.org/html/rfc3986#section-5.3
-     */
-    public static function composeComponents($scheme, $authority, $path, $query, $fragment)
-    {
-        $uri = '';
-
-        // weak type checks to also accept null until we can add scalar type hints
-        if ($scheme != '') {
-            $uri .= $scheme . ':';
-        }
-
-        if ($authority != ''|| $scheme === 'file') {
-            $uri .= '//' . $authority;
-        }
-
-        $uri .= $path;
-
-        if ($query != '') {
-            $uri .= '?' . $query;
-        }
-
-        if ($fragment != '') {
-            $uri .= '#' . $fragment;
-        }
-
-        return $uri;
-    }
-
-    /**
-     * Whether the URI has the default port of the current scheme.
-     *
-     * `Psr\Http\Message\UriInterface::getPort` may return null or the standard port. This method can be used
-     * independently of the implementation.
-     *
-     * @param UriInterface $uri
-     *
-     * @return bool
-     */
-    public static function isDefaultPort(UriInterface $uri)
-    {
-        return $uri->getPort() === null
-            || (isset(self::$defaultPorts[$uri->getScheme()]) && $uri->getPort() === self::$defaultPorts[$uri->getScheme()]);
-    }
-
-    /**
-     * Whether the URI is absolute, i.e. it has a scheme.
-     *
-     * An instance of UriInterface can either be an absolute URI or a relative reference. This method returns true
-     * if it is the former. An absolute URI has a scheme. A relative reference is used to express a URI relative
-     * to another URI, the base URI. Relative references can be divided into several forms:
-     * - network-path references, e.g. '//example.com/path'
-     * - absolute-path references, e.g. '/path'
-     * - relative-path references, e.g. 'subpath'
-     *
-     * @param UriInterface $uri
-     *
-     * @return bool
-     * @see Uri::isNetworkPathReference
-     * @see Uri::isAbsolutePathReference
-     * @see Uri::isRelativePathReference
-     * @link https://tools.ietf.org/html/rfc3986#section-4
-     */
-    public static function isAbsolute(UriInterface $uri)
-    {
-        return $uri->getScheme() !== '';
-    }
-
-    /**
-     * Whether the URI is a network-path reference.
-     *
-     * A relative reference that begins with two slash characters is termed an network-path reference.
-     *
-     * @param UriInterface $uri
-     *
-     * @return bool
-     * @link https://tools.ietf.org/html/rfc3986#section-4.2
-     */
-    public static function isNetworkPathReference(UriInterface $uri)
-    {
-        return $uri->getScheme() === '' && $uri->getAuthority() !== '';
-    }
-
-    /**
-     * Whether the URI is a absolute-path reference.
-     *
-     * A relative reference that begins with a single slash character is termed an absolute-path reference.
-     *
-     * @param UriInterface $uri
-     *
-     * @return bool
-     * @link https://tools.ietf.org/html/rfc3986#section-4.2
-     */
-    public static function isAbsolutePathReference(UriInterface $uri)
-    {
-        return $uri->getScheme() === ''
-            && $uri->getAuthority() === ''
-            && isset($uri->getPath()[0])
-            && $uri->getPath()[0] === '/';
-    }
-
-    /**
-     * Whether the URI is a relative-path reference.
-     *
-     * A relative reference that does not begin with a slash character is termed a relative-path reference.
-     *
-     * @param UriInterface $uri
-     *
-     * @return bool
-     * @link https://tools.ietf.org/html/rfc3986#section-4.2
-     */
-    public static function isRelativePathReference(UriInterface $uri)
-    {
-        return $uri->getScheme() === ''
-            && $uri->getAuthority() === ''
-            && (!isset($uri->getPath()[0]) || $uri->getPath()[0] !== '/');
-    }
-
-    /**
-     * Whether the URI is a same-document reference.
-     *
-     * A same-document reference refers to a URI that is, aside from its fragment
-     * component, identical to the base URI. When no base URI is given, only an empty
-     * URI reference (apart from its fragment) is considered a same-document reference.
-     *
-     * @param UriInterface      $uri  The URI to check
-     * @param UriInterface|null $base An optional base URI to compare against
-     *
-     * @return bool
-     * @link https://tools.ietf.org/html/rfc3986#section-4.4
-     */
-    public static function isSameDocumentReference(UriInterface $uri, UriInterface $base = null)
-    {
-        if ($base !== null) {
-            $uri = UriResolver::resolve($base, $uri);
-
-            return ($uri->getScheme() === $base->getScheme())
-                && ($uri->getAuthority() === $base->getAuthority())
-                && ($uri->getPath() === $base->getPath())
-                && ($uri->getQuery() === $base->getQuery());
-        }
-
-        return $uri->getScheme() === '' && $uri->getAuthority() === '' && $uri->getPath() === '' && $uri->getQuery() === '';
-    }
-
-    /**
-     * Removes dot segments from a path and returns the new path.
-     *
-     * @param string $path
-     *
-     * @return string
-     *
-     * @deprecated since version 1.4. Use UriResolver::removeDotSegments instead.
-     * @see UriResolver::removeDotSegments
-     */
-    public static function removeDotSegments($path)
-    {
-        return UriResolver::removeDotSegments($path);
-    }
-
-    /**
-     * Converts the relative URI into a new URI that is resolved against the base URI.
-     *
-     * @param UriInterface        $base Base URI
-     * @param string|UriInterface $rel  Relative URI
-     *
-     * @return UriInterface
-     *
-     * @deprecated since version 1.4. Use UriResolver::resolve instead.
-     * @see UriResolver::resolve
-     */
-    public static function resolve(UriInterface $base, $rel)
-    {
-        if (!($rel instanceof UriInterface)) {
-            $rel = new self($rel);
-        }
-
-        return UriResolver::resolve($base, $rel);
-    }
-
-    /**
-     * Creates a new URI with a specific query string value removed.
-     *
-     * Any existing query string values that exactly match the provided key are
-     * removed.
-     *
-     * @param UriInterface $uri URI to use as a base.
-     * @param string       $key Query string key to remove.
-     *
-     * @return UriInterface
-     */
-    public static function withoutQueryValue(UriInterface $uri, $key)
-    {
-        $current = $uri->getQuery();
-        if ($current === '') {
-            return $uri;
-        }
-
-        $decodedKey = rawurldecode($key);
-        $result = array_filter(explode('&', $current), function ($part) use ($decodedKey) {
-            return rawurldecode(explode('=', $part)[0]) !== $decodedKey;
-        });
-
-        return $uri->withQuery(implode('&', $result));
-    }
-
-    /**
-     * Creates a new URI with a specific query string value.
-     *
-     * Any existing query string values that exactly match the provided key are
-     * removed and replaced with the given key value pair.
-     *
-     * A value of null will set the query string key without a value, e.g. "key"
-     * instead of "key=value".
-     *
-     * @param UriInterface $uri   URI to use as a base.
-     * @param string       $key   Key to set.
-     * @param string|null  $value Value to set
-     *
-     * @return UriInterface
-     */
-    public static function withQueryValue(UriInterface $uri, $key, $value)
-    {
-        $current = $uri->getQuery();
-
-        if ($current === '') {
-            $result = [];
-        } else {
-            $decodedKey = rawurldecode($key);
-            $result = array_filter(explode('&', $current), function ($part) use ($decodedKey) {
-                return rawurldecode(explode('=', $part)[0]) !== $decodedKey;
-            });
-        }
-
-        // Query string separators ("=", "&") within the key or value need to be encoded
-        // (while preventing double-encoding) before setting the query string. All other
-        // chars that need percent-encoding will be encoded by withQuery().
-        $key = strtr($key, self::$replaceQuery);
-
-        if ($value !== null) {
-            $result[] = $key . '=' . strtr($value, self::$replaceQuery);
-        } else {
-            $result[] = $key;
-        }
-
-        return $uri->withQuery(implode('&', $result));
-    }
-
-    /**
-     * Creates a URI from a hash of `parse_url` components.
-     *
-     * @param array $parts
-     *
-     * @return UriInterface
-     * @link http://php.net/manual/en/function.parse-url.php
-     *
-     * @throws \InvalidArgumentException If the components do not form a valid URI.
-     */
-    public static function fromParts(array $parts)
-    {
-        $uri = new self();
-        $uri->applyParts($parts);
-        $uri->validateState();
-
-        return $uri;
-    }
-
-    public function getScheme()
-    {
-        return $this->scheme;
-    }
-
-    public function getAuthority()
-    {
-        $authority = $this->host;
-        if ($this->userInfo !== '') {
-            $authority = $this->userInfo . '@' . $authority;
-        }
-
-        if ($this->port !== null) {
-            $authority .= ':' . $this->port;
-        }
-
-        return $authority;
-    }
-
-    public function getUserInfo()
-    {
-        return $this->userInfo;
-    }
-
-    public function getHost()
-    {
-        return $this->host;
-    }
-
-    public function getPort()
-    {
-        return $this->port;
-    }
-
-    public function getPath()
-    {
-        return $this->path;
-    }
-
-    public function getQuery()
-    {
-        return $this->query;
-    }
-
-    public function getFragment()
-    {
-        return $this->fragment;
-    }
-
-    public function withScheme($scheme)
-    {
-        $scheme = $this->filterScheme($scheme);
-
-        if ($this->scheme === $scheme) {
-            return $this;
-        }
-
-        $new = clone $this;
-        $new->scheme = $scheme;
-        $new->removeDefaultPort();
-        $new->validateState();
-
-        return $new;
-    }
-
-    public function withUserInfo($user, $password = null)
-    {
-        $info = $user;
-        if ($password != '') {
-            $info .= ':' . $password;
-        }
-
-        if ($this->userInfo === $info) {
-            return $this;
-        }
-
-        $new = clone $this;
-        $new->userInfo = $info;
-        $new->validateState();
-
-        return $new;
-    }
-
-    public function withHost($host)
-    {
-        $host = $this->filterHost($host);
-
-        if ($this->host === $host) {
-            return $this;
-        }
-
-        $new = clone $this;
-        $new->host = $host;
-        $new->validateState();
-
-        return $new;
-    }
-
-    public function withPort($port)
-    {
-        $port = $this->filterPort($port);
-
-        if ($this->port === $port) {
-            return $this;
-        }
-
-        $new = clone $this;
-        $new->port = $port;
-        $new->removeDefaultPort();
-        $new->validateState();
-
-        return $new;
-    }
-
-    public function withPath($path)
-    {
-        $path = $this->filterPath($path);
-
-        if ($this->path === $path) {
-            return $this;
-        }
-
-        $new = clone $this;
-        $new->path = $path;
-        $new->validateState();
-
-        return $new;
-    }
-
-    public function withQuery($query)
-    {
-        $query = $this->filterQueryAndFragment($query);
-
-        if ($this->query === $query) {
-            return $this;
-        }
-
-        $new = clone $this;
-        $new->query = $query;
-
-        return $new;
-    }
-
-    public function withFragment($fragment)
-    {
-        $fragment = $this->filterQueryAndFragment($fragment);
-
-        if ($this->fragment === $fragment) {
-            return $this;
-        }
-
-        $new = clone $this;
-        $new->fragment = $fragment;
-
-        return $new;
-    }
-
-    /**
-     * Apply parse_url parts to a URI.
-     *
-     * @param array $parts Array of parse_url parts to apply.
-     */
-    private function applyParts(array $parts)
-    {
-        $this->scheme = isset($parts['scheme'])
-            ? $this->filterScheme($parts['scheme'])
-            : '';
-        $this->userInfo = isset($parts['user']) ? $parts['user'] : '';
-        $this->host = isset($parts['host'])
-            ? $this->filterHost($parts['host'])
-            : '';
-        $this->port = isset($parts['port'])
-            ? $this->filterPort($parts['port'])
-            : null;
-        $this->path = isset($parts['path'])
-            ? $this->filterPath($parts['path'])
-            : '';
-        $this->query = isset($parts['query'])
-            ? $this->filterQueryAndFragment($parts['query'])
-            : '';
-        $this->fragment = isset($parts['fragment'])
-            ? $this->filterQueryAndFragment($parts['fragment'])
-            : '';
-        if (isset($parts['pass'])) {
-            $this->userInfo .= ':' . $parts['pass'];
-        }
-
-        $this->removeDefaultPort();
-    }
-
-    /**
-     * @param string $scheme
-     *
-     * @return string
-     *
-     * @throws \InvalidArgumentException If the scheme is invalid.
-     */
-    private function filterScheme($scheme)
-    {
-        if (!is_string($scheme)) {
-            throw new \InvalidArgumentException('Scheme must be a string');
-        }
-
-        return strtolower($scheme);
-    }
-
-    /**
-     * @param string $host
-     *
-     * @return string
-     *
-     * @throws \InvalidArgumentException If the host is invalid.
-     */
-    private function filterHost($host)
-    {
-        if (!is_string($host)) {
-            throw new \InvalidArgumentException('Host must be a string');
-        }
-
-        return strtolower($host);
-    }
-
-    /**
-     * @param int|null $port
-     *
-     * @return int|null
-     *
-     * @throws \InvalidArgumentException If the port is invalid.
-     */
-    private function filterPort($port)
-    {
-        if ($port === null) {
-            return null;
-        }
-
-        $port = (int) $port;
-        if (1 > $port || 0xffff < $port) {
-            throw new \InvalidArgumentException(
-                sprintf('Invalid port: %d. Must be between 1 and 65535', $port)
-            );
-        }
-
-        return $port;
-    }
-
-    private function removeDefaultPort()
-    {
-        if ($this->port !== null && self::isDefaultPort($this)) {
-            $this->port = null;
-        }
-    }
-
-    /**
-     * Filters the path of a URI
-     *
-     * @param string $path
-     *
-     * @return string
-     *
-     * @throws \InvalidArgumentException If the path is invalid.
-     */
-    private function filterPath($path)
-    {
-        if (!is_string($path)) {
-            throw new \InvalidArgumentException('Path must be a string');
-        }
-
-        return preg_replace_callback(
-            '/(?:[^' . self::$charUnreserved . self::$charSubDelims . '%:@\/]++|%(?![A-Fa-f0-9]{2}))/',
-            [$this, 'rawurlencodeMatchZero'],
-            $path
-        );
-    }
-
-    /**
-     * Filters the query string or fragment of a URI.
-     *
-     * @param string $str
-     *
-     * @return string
-     *
-     * @throws \InvalidArgumentException If the query or fragment is invalid.
-     */
-    private function filterQueryAndFragment($str)
-    {
-        if (!is_string($str)) {
-            throw new \InvalidArgumentException('Query and fragment must be a string');
-        }
-
-        return preg_replace_callback(
-            '/(?:[^' . self::$charUnreserved . self::$charSubDelims . '%:@\/\?]++|%(?![A-Fa-f0-9]{2}))/',
-            [$this, 'rawurlencodeMatchZero'],
-            $str
-        );
-    }
-
-    private function rawurlencodeMatchZero(array $match)
-    {
-        return rawurlencode($match[0]);
-    }
-
-    private function validateState()
-    {
-        if ($this->host === '' && ($this->scheme === 'http' || $this->scheme === 'https')) {
-            $this->host = self::HTTP_DEFAULT_HOST;
-        }
-
-        if ($this->getAuthority() === '') {
-            if (0 === strpos($this->path, '//')) {
-                throw new \InvalidArgumentException('The path of a URI without an authority must not start with two slashes "//"');
-            }
-            if ($this->scheme === '' && false !== strpos(explode('/', $this->path, 2)[0], ':')) {
-                throw new \InvalidArgumentException('A relative URI must not have a path beginning with a segment containing a colon');
-            }
-        } elseif (isset($this->path[0]) && $this->path[0] !== '/') {
-            @trigger_error(
-                'The path of a URI with an authority must start with a slash "/" or be empty. Automagically fixing the URI ' .
-                'by adding a leading slash to the path is deprecated since version 1.4 and will throw an exception instead.',
-                E_USER_DEPRECATED
-            );
-            $this->path = '/'. $this->path;
-            //throw new \InvalidArgumentException('The path of a URI with an authority must start with a slash "/" or be empty');
-        }
-    }
-}
diff --git a/mayor-orig/www/include/share/googleapi/guzzlehttp/psr7/src/UriNormalizer.php b/mayor-orig/www/include/share/googleapi/guzzlehttp/psr7/src/UriNormalizer.php
deleted file mode 100644
index 384c29e5..00000000
--- a/mayor-orig/www/include/share/googleapi/guzzlehttp/psr7/src/UriNormalizer.php
+++ /dev/null
@@ -1,216 +0,0 @@
-getPath() === '' &&
-            ($uri->getScheme() === 'http' || $uri->getScheme() === 'https')
-        ) {
-            $uri = $uri->withPath('/');
-        }
-
-        if ($flags & self::REMOVE_DEFAULT_HOST && $uri->getScheme() === 'file' && $uri->getHost() === 'localhost') {
-            $uri = $uri->withHost('');
-        }
-
-        if ($flags & self::REMOVE_DEFAULT_PORT && $uri->getPort() !== null && Uri::isDefaultPort($uri)) {
-            $uri = $uri->withPort(null);
-        }
-
-        if ($flags & self::REMOVE_DOT_SEGMENTS && !Uri::isRelativePathReference($uri)) {
-            $uri = $uri->withPath(UriResolver::removeDotSegments($uri->getPath()));
-        }
-
-        if ($flags & self::REMOVE_DUPLICATE_SLASHES) {
-            $uri = $uri->withPath(preg_replace('#//++#', '/', $uri->getPath()));
-        }
-
-        if ($flags & self::SORT_QUERY_PARAMETERS && $uri->getQuery() !== '') {
-            $queryKeyValues = explode('&', $uri->getQuery());
-            sort($queryKeyValues);
-            $uri = $uri->withQuery(implode('&', $queryKeyValues));
-        }
-
-        return $uri;
-    }
-
-    /**
-     * Whether two URIs can be considered equivalent.
-     *
-     * Both URIs are normalized automatically before comparison with the given $normalizations bitmask. The method also
-     * accepts relative URI references and returns true when they are equivalent. This of course assumes they will be
-     * resolved against the same base URI. If this is not the case, determination of equivalence or difference of
-     * relative references does not mean anything.
-     *
-     * @param UriInterface $uri1           An URI to compare
-     * @param UriInterface $uri2           An URI to compare
-     * @param int          $normalizations A bitmask of normalizations to apply, see constants
-     *
-     * @return bool
-     * @link https://tools.ietf.org/html/rfc3986#section-6.1
-     */
-    public static function isEquivalent(UriInterface $uri1, UriInterface $uri2, $normalizations = self::PRESERVING_NORMALIZATIONS)
-    {
-        return (string) self::normalize($uri1, $normalizations) === (string) self::normalize($uri2, $normalizations);
-    }
-
-    private static function capitalizePercentEncoding(UriInterface $uri)
-    {
-        $regex = '/(?:%[A-Fa-f0-9]{2})++/';
-
-        $callback = function (array $match) {
-            return strtoupper($match[0]);
-        };
-
-        return
-            $uri->withPath(
-                preg_replace_callback($regex, $callback, $uri->getPath())
-            )->withQuery(
-                preg_replace_callback($regex, $callback, $uri->getQuery())
-            );
-    }
-
-    private static function decodeUnreservedCharacters(UriInterface $uri)
-    {
-        $regex = '/%(?:2D|2E|5F|7E|3[0-9]|[46][1-9A-F]|[57][0-9A])/i';
-
-        $callback = function (array $match) {
-            return rawurldecode($match[0]);
-        };
-
-        return
-            $uri->withPath(
-                preg_replace_callback($regex, $callback, $uri->getPath())
-            )->withQuery(
-                preg_replace_callback($regex, $callback, $uri->getQuery())
-            );
-    }
-
-    private function __construct()
-    {
-        // cannot be instantiated
-    }
-}
diff --git a/mayor-orig/www/include/share/googleapi/guzzlehttp/psr7/src/UriResolver.php b/mayor-orig/www/include/share/googleapi/guzzlehttp/psr7/src/UriResolver.php
deleted file mode 100644
index c1cb8a27..00000000
--- a/mayor-orig/www/include/share/googleapi/guzzlehttp/psr7/src/UriResolver.php
+++ /dev/null
@@ -1,219 +0,0 @@
-getScheme() != '') {
-            return $rel->withPath(self::removeDotSegments($rel->getPath()));
-        }
-
-        if ($rel->getAuthority() != '') {
-            $targetAuthority = $rel->getAuthority();
-            $targetPath = self::removeDotSegments($rel->getPath());
-            $targetQuery = $rel->getQuery();
-        } else {
-            $targetAuthority = $base->getAuthority();
-            if ($rel->getPath() === '') {
-                $targetPath = $base->getPath();
-                $targetQuery = $rel->getQuery() != '' ? $rel->getQuery() : $base->getQuery();
-            } else {
-                if ($rel->getPath()[0] === '/') {
-                    $targetPath = $rel->getPath();
-                } else {
-                    if ($targetAuthority != '' && $base->getPath() === '') {
-                        $targetPath = '/' . $rel->getPath();
-                    } else {
-                        $lastSlashPos = strrpos($base->getPath(), '/');
-                        if ($lastSlashPos === false) {
-                            $targetPath = $rel->getPath();
-                        } else {
-                            $targetPath = substr($base->getPath(), 0, $lastSlashPos + 1) . $rel->getPath();
-                        }
-                    }
-                }
-                $targetPath = self::removeDotSegments($targetPath);
-                $targetQuery = $rel->getQuery();
-            }
-        }
-
-        return new Uri(Uri::composeComponents(
-            $base->getScheme(),
-            $targetAuthority,
-            $targetPath,
-            $targetQuery,
-            $rel->getFragment()
-        ));
-    }
-
-    /**
-     * Returns the target URI as a relative reference from the base URI.
-     *
-     * This method is the counterpart to resolve():
-     *
-     *    (string) $target === (string) UriResolver::resolve($base, UriResolver::relativize($base, $target))
-     *
-     * One use-case is to use the current request URI as base URI and then generate relative links in your documents
-     * to reduce the document size or offer self-contained downloadable document archives.
-     *
-     *    $base = new Uri('http://example.com/a/b/');
-     *    echo UriResolver::relativize($base, new Uri('http://example.com/a/b/c'));  // prints 'c'.
-     *    echo UriResolver::relativize($base, new Uri('http://example.com/a/x/y'));  // prints '../x/y'.
-     *    echo UriResolver::relativize($base, new Uri('http://example.com/a/b/?q')); // prints '?q'.
-     *    echo UriResolver::relativize($base, new Uri('http://example.org/a/b/'));   // prints '//example.org/a/b/'.
-     *
-     * This method also accepts a target that is already relative and will try to relativize it further. Only a
-     * relative-path reference will be returned as-is.
-     *
-     *    echo UriResolver::relativize($base, new Uri('/a/b/c'));  // prints 'c' as well
-     *
-     * @param UriInterface $base   Base URI
-     * @param UriInterface $target Target URI
-     *
-     * @return UriInterface The relative URI reference
-     */
-    public static function relativize(UriInterface $base, UriInterface $target)
-    {
-        if ($target->getScheme() !== '' &&
-            ($base->getScheme() !== $target->getScheme() || $target->getAuthority() === '' && $base->getAuthority() !== '')
-        ) {
-            return $target;
-        }
-
-        if (Uri::isRelativePathReference($target)) {
-            // As the target is already highly relative we return it as-is. It would be possible to resolve
-            // the target with `$target = self::resolve($base, $target);` and then try make it more relative
-            // by removing a duplicate query. But let's not do that automatically.
-            return $target;
-        }
-
-        if ($target->getAuthority() !== '' && $base->getAuthority() !== $target->getAuthority()) {
-            return $target->withScheme('');
-        }
-
-        // We must remove the path before removing the authority because if the path starts with two slashes, the URI
-        // would turn invalid. And we also cannot set a relative path before removing the authority, as that is also
-        // invalid.
-        $emptyPathUri = $target->withScheme('')->withPath('')->withUserInfo('')->withPort(null)->withHost('');
-
-        if ($base->getPath() !== $target->getPath()) {
-            return $emptyPathUri->withPath(self::getRelativePath($base, $target));
-        }
-
-        if ($base->getQuery() === $target->getQuery()) {
-            // Only the target fragment is left. And it must be returned even if base and target fragment are the same.
-            return $emptyPathUri->withQuery('');
-        }
-
-        // If the base URI has a query but the target has none, we cannot return an empty path reference as it would
-        // inherit the base query component when resolving.
-        if ($target->getQuery() === '') {
-            $segments = explode('/', $target->getPath());
-            $lastSegment = end($segments);
-
-            return $emptyPathUri->withPath($lastSegment === '' ? './' : $lastSegment);
-        }
-
-        return $emptyPathUri;
-    }
-
-    private static function getRelativePath(UriInterface $base, UriInterface $target)
-    {
-        $sourceSegments = explode('/', $base->getPath());
-        $targetSegments = explode('/', $target->getPath());
-        array_pop($sourceSegments);
-        $targetLastSegment = array_pop($targetSegments);
-        foreach ($sourceSegments as $i => $segment) {
-            if (isset($targetSegments[$i]) && $segment === $targetSegments[$i]) {
-                unset($sourceSegments[$i], $targetSegments[$i]);
-            } else {
-                break;
-            }
-        }
-        $targetSegments[] = $targetLastSegment;
-        $relativePath = str_repeat('../', count($sourceSegments)) . implode('/', $targetSegments);
-
-        // A reference to am empty last segment or an empty first sub-segment must be prefixed with "./".
-        // This also applies to a segment with a colon character (e.g., "file:colon") that cannot be used
-        // as the first segment of a relative-path reference, as it would be mistaken for a scheme name.
-        if ('' === $relativePath || false !== strpos(explode('/', $relativePath, 2)[0], ':')) {
-            $relativePath = "./$relativePath";
-        } elseif ('/' === $relativePath[0]) {
-            if ($base->getAuthority() != '' && $base->getPath() === '') {
-                // In this case an extra slash is added by resolve() automatically. So we must not add one here.
-                $relativePath = ".$relativePath";
-            } else {
-                $relativePath = "./$relativePath";
-            }
-        }
-
-        return $relativePath;
-    }
-
-    private function __construct()
-    {
-        // cannot be instantiated
-    }
-}
diff --git a/mayor-orig/www/include/share/googleapi/guzzlehttp/psr7/src/functions.php b/mayor-orig/www/include/share/googleapi/guzzlehttp/psr7/src/functions.php
deleted file mode 100644
index e40348d6..00000000
--- a/mayor-orig/www/include/share/googleapi/guzzlehttp/psr7/src/functions.php
+++ /dev/null
@@ -1,828 +0,0 @@
-getMethod() . ' '
-                . $message->getRequestTarget())
-            . ' HTTP/' . $message->getProtocolVersion();
-        if (!$message->hasHeader('host')) {
-            $msg .= "\r\nHost: " . $message->getUri()->getHost();
-        }
-    } elseif ($message instanceof ResponseInterface) {
-        $msg = 'HTTP/' . $message->getProtocolVersion() . ' '
-            . $message->getStatusCode() . ' '
-            . $message->getReasonPhrase();
-    } else {
-        throw new \InvalidArgumentException('Unknown message type');
-    }
-
-    foreach ($message->getHeaders() as $name => $values) {
-        $msg .= "\r\n{$name}: " . implode(', ', $values);
-    }
-
-    return "{$msg}\r\n\r\n" . $message->getBody();
-}
-
-/**
- * Returns a UriInterface for the given value.
- *
- * This function accepts a string or {@see Psr\Http\Message\UriInterface} and
- * returns a UriInterface for the given value. If the value is already a
- * `UriInterface`, it is returned as-is.
- *
- * @param string|UriInterface $uri
- *
- * @return UriInterface
- * @throws \InvalidArgumentException
- */
-function uri_for($uri)
-{
-    if ($uri instanceof UriInterface) {
-        return $uri;
-    } elseif (is_string($uri)) {
-        return new Uri($uri);
-    }
-
-    throw new \InvalidArgumentException('URI must be a string or UriInterface');
-}
-
-/**
- * Create a new stream based on the input type.
- *
- * Options is an associative array that can contain the following keys:
- * - metadata: Array of custom metadata.
- * - size: Size of the stream.
- *
- * @param resource|string|null|int|float|bool|StreamInterface|callable $resource Entity body data
- * @param array                                                        $options  Additional options
- *
- * @return Stream
- * @throws \InvalidArgumentException if the $resource arg is not valid.
- */
-function stream_for($resource = '', array $options = [])
-{
-    if (is_scalar($resource)) {
-        $stream = fopen('php://temp', 'r+');
-        if ($resource !== '') {
-            fwrite($stream, $resource);
-            fseek($stream, 0);
-        }
-        return new Stream($stream, $options);
-    }
-
-    switch (gettype($resource)) {
-        case 'resource':
-            return new Stream($resource, $options);
-        case 'object':
-            if ($resource instanceof StreamInterface) {
-                return $resource;
-            } elseif ($resource instanceof \Iterator) {
-                return new PumpStream(function () use ($resource) {
-                    if (!$resource->valid()) {
-                        return false;
-                    }
-                    $result = $resource->current();
-                    $resource->next();
-                    return $result;
-                }, $options);
-            } elseif (method_exists($resource, '__toString')) {
-                return stream_for((string) $resource, $options);
-            }
-            break;
-        case 'NULL':
-            return new Stream(fopen('php://temp', 'r+'), $options);
-    }
-
-    if (is_callable($resource)) {
-        return new PumpStream($resource, $options);
-    }
-
-    throw new \InvalidArgumentException('Invalid resource type: ' . gettype($resource));
-}
-
-/**
- * Parse an array of header values containing ";" separated data into an
- * array of associative arrays representing the header key value pair
- * data of the header. When a parameter does not contain a value, but just
- * contains a key, this function will inject a key with a '' string value.
- *
- * @param string|array $header Header to parse into components.
- *
- * @return array Returns the parsed header values.
- */
-function parse_header($header)
-{
-    static $trimmed = "\"'  \n\t\r";
-    $params = $matches = [];
-
-    foreach (normalize_header($header) as $val) {
-        $part = [];
-        foreach (preg_split('/;(?=([^"]*"[^"]*")*[^"]*$)/', $val) as $kvp) {
-            if (preg_match_all('/<[^>]+>|[^=]+/', $kvp, $matches)) {
-                $m = $matches[0];
-                if (isset($m[1])) {
-                    $part[trim($m[0], $trimmed)] = trim($m[1], $trimmed);
-                } else {
-                    $part[] = trim($m[0], $trimmed);
-                }
-            }
-        }
-        if ($part) {
-            $params[] = $part;
-        }
-    }
-
-    return $params;
-}
-
-/**
- * Converts an array of header values that may contain comma separated
- * headers into an array of headers with no comma separated values.
- *
- * @param string|array $header Header to normalize.
- *
- * @return array Returns the normalized header field values.
- */
-function normalize_header($header)
-{
-    if (!is_array($header)) {
-        return array_map('trim', explode(',', $header));
-    }
-
-    $result = [];
-    foreach ($header as $value) {
-        foreach ((array) $value as $v) {
-            if (strpos($v, ',') === false) {
-                $result[] = $v;
-                continue;
-            }
-            foreach (preg_split('/,(?=([^"]*"[^"]*")*[^"]*$)/', $v) as $vv) {
-                $result[] = trim($vv);
-            }
-        }
-    }
-
-    return $result;
-}
-
-/**
- * Clone and modify a request with the given changes.
- *
- * The changes can be one of:
- * - method: (string) Changes the HTTP method.
- * - set_headers: (array) Sets the given headers.
- * - remove_headers: (array) Remove the given headers.
- * - body: (mixed) Sets the given body.
- * - uri: (UriInterface) Set the URI.
- * - query: (string) Set the query string value of the URI.
- * - version: (string) Set the protocol version.
- *
- * @param RequestInterface $request Request to clone and modify.
- * @param array            $changes Changes to apply.
- *
- * @return RequestInterface
- */
-function modify_request(RequestInterface $request, array $changes)
-{
-    if (!$changes) {
-        return $request;
-    }
-
-    $headers = $request->getHeaders();
-
-    if (!isset($changes['uri'])) {
-        $uri = $request->getUri();
-    } else {
-        // Remove the host header if one is on the URI
-        if ($host = $changes['uri']->getHost()) {
-            $changes['set_headers']['Host'] = $host;
-
-            if ($port = $changes['uri']->getPort()) {
-                $standardPorts = ['http' => 80, 'https' => 443];
-                $scheme = $changes['uri']->getScheme();
-                if (isset($standardPorts[$scheme]) && $port != $standardPorts[$scheme]) {
-                    $changes['set_headers']['Host'] .= ':'.$port;
-                }
-            }
-        }
-        $uri = $changes['uri'];
-    }
-
-    if (!empty($changes['remove_headers'])) {
-        $headers = _caseless_remove($changes['remove_headers'], $headers);
-    }
-
-    if (!empty($changes['set_headers'])) {
-        $headers = _caseless_remove(array_keys($changes['set_headers']), $headers);
-        $headers = $changes['set_headers'] + $headers;
-    }
-
-    if (isset($changes['query'])) {
-        $uri = $uri->withQuery($changes['query']);
-    }
-
-    if ($request instanceof ServerRequestInterface) {
-        return new ServerRequest(
-            isset($changes['method']) ? $changes['method'] : $request->getMethod(),
-            $uri,
-            $headers,
-            isset($changes['body']) ? $changes['body'] : $request->getBody(),
-            isset($changes['version'])
-                ? $changes['version']
-                : $request->getProtocolVersion(),
-            $request->getServerParams()
-        );
-    }
-
-    return new Request(
-        isset($changes['method']) ? $changes['method'] : $request->getMethod(),
-        $uri,
-        $headers,
-        isset($changes['body']) ? $changes['body'] : $request->getBody(),
-        isset($changes['version'])
-            ? $changes['version']
-            : $request->getProtocolVersion()
-    );
-}
-
-/**
- * Attempts to rewind a message body and throws an exception on failure.
- *
- * The body of the message will only be rewound if a call to `tell()` returns a
- * value other than `0`.
- *
- * @param MessageInterface $message Message to rewind
- *
- * @throws \RuntimeException
- */
-function rewind_body(MessageInterface $message)
-{
-    $body = $message->getBody();
-
-    if ($body->tell()) {
-        $body->rewind();
-    }
-}
-
-/**
- * Safely opens a PHP stream resource using a filename.
- *
- * When fopen fails, PHP normally raises a warning. This function adds an
- * error handler that checks for errors and throws an exception instead.
- *
- * @param string $filename File to open
- * @param string $mode     Mode used to open the file
- *
- * @return resource
- * @throws \RuntimeException if the file cannot be opened
- */
-function try_fopen($filename, $mode)
-{
-    $ex = null;
-    set_error_handler(function () use ($filename, $mode, &$ex) {
-        $ex = new \RuntimeException(sprintf(
-            'Unable to open %s using mode %s: %s',
-            $filename,
-            $mode,
-            func_get_args()[1]
-        ));
-    });
-
-    $handle = fopen($filename, $mode);
-    restore_error_handler();
-
-    if ($ex) {
-        /** @var $ex \RuntimeException */
-        throw $ex;
-    }
-
-    return $handle;
-}
-
-/**
- * Copy the contents of a stream into a string until the given number of
- * bytes have been read.
- *
- * @param StreamInterface $stream Stream to read
- * @param int             $maxLen Maximum number of bytes to read. Pass -1
- *                                to read the entire stream.
- * @return string
- * @throws \RuntimeException on error.
- */
-function copy_to_string(StreamInterface $stream, $maxLen = -1)
-{
-    $buffer = '';
-
-    if ($maxLen === -1) {
-        while (!$stream->eof()) {
-            $buf = $stream->read(1048576);
-            // Using a loose equality here to match on '' and false.
-            if ($buf == null) {
-                break;
-            }
-            $buffer .= $buf;
-        }
-        return $buffer;
-    }
-
-    $len = 0;
-    while (!$stream->eof() && $len < $maxLen) {
-        $buf = $stream->read($maxLen - $len);
-        // Using a loose equality here to match on '' and false.
-        if ($buf == null) {
-            break;
-        }
-        $buffer .= $buf;
-        $len = strlen($buffer);
-    }
-
-    return $buffer;
-}
-
-/**
- * Copy the contents of a stream into another stream until the given number
- * of bytes have been read.
- *
- * @param StreamInterface $source Stream to read from
- * @param StreamInterface $dest   Stream to write to
- * @param int             $maxLen Maximum number of bytes to read. Pass -1
- *                                to read the entire stream.
- *
- * @throws \RuntimeException on error.
- */
-function copy_to_stream(
-    StreamInterface $source,
-    StreamInterface $dest,
-    $maxLen = -1
-) {
-    $bufferSize = 8192;
-
-    if ($maxLen === -1) {
-        while (!$source->eof()) {
-            if (!$dest->write($source->read($bufferSize))) {
-                break;
-            }
-        }
-    } else {
-        $remaining = $maxLen;
-        while ($remaining > 0 && !$source->eof()) {
-            $buf = $source->read(min($bufferSize, $remaining));
-            $len = strlen($buf);
-            if (!$len) {
-                break;
-            }
-            $remaining -= $len;
-            $dest->write($buf);
-        }
-    }
-}
-
-/**
- * Calculate a hash of a Stream
- *
- * @param StreamInterface $stream    Stream to calculate the hash for
- * @param string          $algo      Hash algorithm (e.g. md5, crc32, etc)
- * @param bool            $rawOutput Whether or not to use raw output
- *
- * @return string Returns the hash of the stream
- * @throws \RuntimeException on error.
- */
-function hash(
-    StreamInterface $stream,
-    $algo,
-    $rawOutput = false
-) {
-    $pos = $stream->tell();
-
-    if ($pos > 0) {
-        $stream->rewind();
-    }
-
-    $ctx = hash_init($algo);
-    while (!$stream->eof()) {
-        hash_update($ctx, $stream->read(1048576));
-    }
-
-    $out = hash_final($ctx, (bool) $rawOutput);
-    $stream->seek($pos);
-
-    return $out;
-}
-
-/**
- * Read a line from the stream up to the maximum allowed buffer length
- *
- * @param StreamInterface $stream    Stream to read from
- * @param int             $maxLength Maximum buffer length
- *
- * @return string|bool
- */
-function readline(StreamInterface $stream, $maxLength = null)
-{
-    $buffer = '';
-    $size = 0;
-
-    while (!$stream->eof()) {
-        // Using a loose equality here to match on '' and false.
-        if (null == ($byte = $stream->read(1))) {
-            return $buffer;
-        }
-        $buffer .= $byte;
-        // Break when a new line is found or the max length - 1 is reached
-        if ($byte === "\n" || ++$size === $maxLength - 1) {
-            break;
-        }
-    }
-
-    return $buffer;
-}
-
-/**
- * Parses a request message string into a request object.
- *
- * @param string $message Request message string.
- *
- * @return Request
- */
-function parse_request($message)
-{
-    $data = _parse_message($message);
-    $matches = [];
-    if (!preg_match('/^[\S]+\s+([a-zA-Z]+:\/\/|\/).*/', $data['start-line'], $matches)) {
-        throw new \InvalidArgumentException('Invalid request string');
-    }
-    $parts = explode(' ', $data['start-line'], 3);
-    $version = isset($parts[2]) ? explode('/', $parts[2])[1] : '1.1';
-
-    $request = new Request(
-        $parts[0],
-        $matches[1] === '/' ? _parse_request_uri($parts[1], $data['headers']) : $parts[1],
-        $data['headers'],
-        $data['body'],
-        $version
-    );
-
-    return $matches[1] === '/' ? $request : $request->withRequestTarget($parts[1]);
-}
-
-/**
- * Parses a response message string into a response object.
- *
- * @param string $message Response message string.
- *
- * @return Response
- */
-function parse_response($message)
-{
-    $data = _parse_message($message);
-    // According to https://tools.ietf.org/html/rfc7230#section-3.1.2 the space
-    // between status-code and reason-phrase is required. But browsers accept
-    // responses without space and reason as well.
-    if (!preg_match('/^HTTP\/.* [0-9]{3}( .*|$)/', $data['start-line'])) {
-        throw new \InvalidArgumentException('Invalid response string');
-    }
-    $parts = explode(' ', $data['start-line'], 3);
-
-    return new Response(
-        $parts[1],
-        $data['headers'],
-        $data['body'],
-        explode('/', $parts[0])[1],
-        isset($parts[2]) ? $parts[2] : null
-    );
-}
-
-/**
- * Parse a query string into an associative array.
- *
- * If multiple values are found for the same key, the value of that key
- * value pair will become an array. This function does not parse nested
- * PHP style arrays into an associative array (e.g., foo[a]=1&foo[b]=2 will
- * be parsed into ['foo[a]' => '1', 'foo[b]' => '2']).
- *
- * @param string      $str         Query string to parse
- * @param bool|string $urlEncoding How the query string is encoded
- *
- * @return array
- */
-function parse_query($str, $urlEncoding = true)
-{
-    $result = [];
-
-    if ($str === '') {
-        return $result;
-    }
-
-    if ($urlEncoding === true) {
-        $decoder = function ($value) {
-            return rawurldecode(str_replace('+', ' ', $value));
-        };
-    } elseif ($urlEncoding == PHP_QUERY_RFC3986) {
-        $decoder = 'rawurldecode';
-    } elseif ($urlEncoding == PHP_QUERY_RFC1738) {
-        $decoder = 'urldecode';
-    } else {
-        $decoder = function ($str) { return $str; };
-    }
-
-    foreach (explode('&', $str) as $kvp) {
-        $parts = explode('=', $kvp, 2);
-        $key = $decoder($parts[0]);
-        $value = isset($parts[1]) ? $decoder($parts[1]) : null;
-        if (!isset($result[$key])) {
-            $result[$key] = $value;
-        } else {
-            if (!is_array($result[$key])) {
-                $result[$key] = [$result[$key]];
-            }
-            $result[$key][] = $value;
-        }
-    }
-
-    return $result;
-}
-
-/**
- * Build a query string from an array of key value pairs.
- *
- * This function can use the return value of parse_query() to build a query
- * string. This function does not modify the provided keys when an array is
- * encountered (like http_build_query would).
- *
- * @param array     $params   Query string parameters.
- * @param int|false $encoding Set to false to not encode, PHP_QUERY_RFC3986
- *                            to encode using RFC3986, or PHP_QUERY_RFC1738
- *                            to encode using RFC1738.
- * @return string
- */
-function build_query(array $params, $encoding = PHP_QUERY_RFC3986)
-{
-    if (!$params) {
-        return '';
-    }
-
-    if ($encoding === false) {
-        $encoder = function ($str) { return $str; };
-    } elseif ($encoding === PHP_QUERY_RFC3986) {
-        $encoder = 'rawurlencode';
-    } elseif ($encoding === PHP_QUERY_RFC1738) {
-        $encoder = 'urlencode';
-    } else {
-        throw new \InvalidArgumentException('Invalid type');
-    }
-
-    $qs = '';
-    foreach ($params as $k => $v) {
-        $k = $encoder($k);
-        if (!is_array($v)) {
-            $qs .= $k;
-            if ($v !== null) {
-                $qs .= '=' . $encoder($v);
-            }
-            $qs .= '&';
-        } else {
-            foreach ($v as $vv) {
-                $qs .= $k;
-                if ($vv !== null) {
-                    $qs .= '=' . $encoder($vv);
-                }
-                $qs .= '&';
-            }
-        }
-    }
-
-    return $qs ? (string) substr($qs, 0, -1) : '';
-}
-
-/**
- * Determines the mimetype of a file by looking at its extension.
- *
- * @param $filename
- *
- * @return null|string
- */
-function mimetype_from_filename($filename)
-{
-    return mimetype_from_extension(pathinfo($filename, PATHINFO_EXTENSION));
-}
-
-/**
- * Maps a file extensions to a mimetype.
- *
- * @param $extension string The file extension.
- *
- * @return string|null
- * @link http://svn.apache.org/repos/asf/httpd/httpd/branches/1.3.x/conf/mime.types
- */
-function mimetype_from_extension($extension)
-{
-    static $mimetypes = [
-        '7z' => 'application/x-7z-compressed',
-        'aac' => 'audio/x-aac',
-        'ai' => 'application/postscript',
-        'aif' => 'audio/x-aiff',
-        'asc' => 'text/plain',
-        'asf' => 'video/x-ms-asf',
-        'atom' => 'application/atom+xml',
-        'avi' => 'video/x-msvideo',
-        'bmp' => 'image/bmp',
-        'bz2' => 'application/x-bzip2',
-        'cer' => 'application/pkix-cert',
-        'crl' => 'application/pkix-crl',
-        'crt' => 'application/x-x509-ca-cert',
-        'css' => 'text/css',
-        'csv' => 'text/csv',
-        'cu' => 'application/cu-seeme',
-        'deb' => 'application/x-debian-package',
-        'doc' => 'application/msword',
-        'docx' => 'application/vnd.openxmlformats-officedocument.wordprocessingml.document',
-        'dvi' => 'application/x-dvi',
-        'eot' => 'application/vnd.ms-fontobject',
-        'eps' => 'application/postscript',
-        'epub' => 'application/epub+zip',
-        'etx' => 'text/x-setext',
-        'flac' => 'audio/flac',
-        'flv' => 'video/x-flv',
-        'gif' => 'image/gif',
-        'gz' => 'application/gzip',
-        'htm' => 'text/html',
-        'html' => 'text/html',
-        'ico' => 'image/x-icon',
-        'ics' => 'text/calendar',
-        'ini' => 'text/plain',
-        'iso' => 'application/x-iso9660-image',
-        'jar' => 'application/java-archive',
-        'jpe' => 'image/jpeg',
-        'jpeg' => 'image/jpeg',
-        'jpg' => 'image/jpeg',
-        'js' => 'text/javascript',
-        'json' => 'application/json',
-        'latex' => 'application/x-latex',
-        'log' => 'text/plain',
-        'm4a' => 'audio/mp4',
-        'm4v' => 'video/mp4',
-        'mid' => 'audio/midi',
-        'midi' => 'audio/midi',
-        'mov' => 'video/quicktime',
-        'mp3' => 'audio/mpeg',
-        'mp4' => 'video/mp4',
-        'mp4a' => 'audio/mp4',
-        'mp4v' => 'video/mp4',
-        'mpe' => 'video/mpeg',
-        'mpeg' => 'video/mpeg',
-        'mpg' => 'video/mpeg',
-        'mpg4' => 'video/mp4',
-        'oga' => 'audio/ogg',
-        'ogg' => 'audio/ogg',
-        'ogv' => 'video/ogg',
-        'ogx' => 'application/ogg',
-        'pbm' => 'image/x-portable-bitmap',
-        'pdf' => 'application/pdf',
-        'pgm' => 'image/x-portable-graymap',
-        'png' => 'image/png',
-        'pnm' => 'image/x-portable-anymap',
-        'ppm' => 'image/x-portable-pixmap',
-        'ppt' => 'application/vnd.ms-powerpoint',
-        'pptx' => 'application/vnd.openxmlformats-officedocument.presentationml.presentation',
-        'ps' => 'application/postscript',
-        'qt' => 'video/quicktime',
-        'rar' => 'application/x-rar-compressed',
-        'ras' => 'image/x-cmu-raster',
-        'rss' => 'application/rss+xml',
-        'rtf' => 'application/rtf',
-        'sgm' => 'text/sgml',
-        'sgml' => 'text/sgml',
-        'svg' => 'image/svg+xml',
-        'swf' => 'application/x-shockwave-flash',
-        'tar' => 'application/x-tar',
-        'tif' => 'image/tiff',
-        'tiff' => 'image/tiff',
-        'torrent' => 'application/x-bittorrent',
-        'ttf' => 'application/x-font-ttf',
-        'txt' => 'text/plain',
-        'wav' => 'audio/x-wav',
-        'webm' => 'video/webm',
-        'wma' => 'audio/x-ms-wma',
-        'wmv' => 'video/x-ms-wmv',
-        'woff' => 'application/x-font-woff',
-        'wsdl' => 'application/wsdl+xml',
-        'xbm' => 'image/x-xbitmap',
-        'xls' => 'application/vnd.ms-excel',
-        'xlsx' => 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet',
-        'xml' => 'application/xml',
-        'xpm' => 'image/x-xpixmap',
-        'xwd' => 'image/x-xwindowdump',
-        'yaml' => 'text/yaml',
-        'yml' => 'text/yaml',
-        'zip' => 'application/zip',
-    ];
-
-    $extension = strtolower($extension);
-
-    return isset($mimetypes[$extension])
-        ? $mimetypes[$extension]
-        : null;
-}
-
-/**
- * Parses an HTTP message into an associative array.
- *
- * The array contains the "start-line" key containing the start line of
- * the message, "headers" key containing an associative array of header
- * array values, and a "body" key containing the body of the message.
- *
- * @param string $message HTTP request or response to parse.
- *
- * @return array
- * @internal
- */
-function _parse_message($message)
-{
-    if (!$message) {
-        throw new \InvalidArgumentException('Invalid message');
-    }
-
-    // Iterate over each line in the message, accounting for line endings
-    $lines = preg_split('/(\\r?\\n)/', $message, -1, PREG_SPLIT_DELIM_CAPTURE);
-    $result = ['start-line' => array_shift($lines), 'headers' => [], 'body' => ''];
-    array_shift($lines);
-
-    for ($i = 0, $totalLines = count($lines); $i < $totalLines; $i += 2) {
-        $line = $lines[$i];
-        // If two line breaks were encountered, then this is the end of body
-        if (empty($line)) {
-            if ($i < $totalLines - 1) {
-                $result['body'] = implode('', array_slice($lines, $i + 2));
-            }
-            break;
-        }
-        if (strpos($line, ':')) {
-            $parts = explode(':', $line, 2);
-            $key = trim($parts[0]);
-            $value = isset($parts[1]) ? trim($parts[1]) : '';
-            $result['headers'][$key][] = $value;
-        }
-    }
-
-    return $result;
-}
-
-/**
- * Constructs a URI for an HTTP request message.
- *
- * @param string $path    Path from the start-line
- * @param array  $headers Array of headers (each value an array).
- *
- * @return string
- * @internal
- */
-function _parse_request_uri($path, array $headers)
-{
-    $hostKey = array_filter(array_keys($headers), function ($k) {
-        return strtolower($k) === 'host';
-    });
-
-    // If no host is found, then a full URI cannot be constructed.
-    if (!$hostKey) {
-        return $path;
-    }
-
-    $host = $headers[reset($hostKey)][0];
-    $scheme = substr($host, -4) === ':443' ? 'https' : 'http';
-
-    return $scheme . '://' . $host . '/' . ltrim($path, '/');
-}
-
-/** @internal */
-function _caseless_remove($keys, array $data)
-{
-    $result = [];
-
-    foreach ($keys as &$key) {
-        $key = strtolower($key);
-    }
-
-    foreach ($data as $k => $v) {
-        if (!in_array(strtolower($k), $keys)) {
-            $result[$k] = $v;
-        }
-    }
-
-    return $result;
-}
diff --git a/mayor-orig/www/include/share/googleapi/guzzlehttp/psr7/src/functions_include.php b/mayor-orig/www/include/share/googleapi/guzzlehttp/psr7/src/functions_include.php
deleted file mode 100644
index 96a4a83a..00000000
--- a/mayor-orig/www/include/share/googleapi/guzzlehttp/psr7/src/functions_include.php
+++ /dev/null
@@ -1,6 +0,0 @@
-
-
-For the full copyright and license information, please view the LICENSE
-file that was distributed with this source code.
-EOF;
-
-$finder = Symfony\CS\Finder::create()
-    ->files()
-    ->name('*.php')
-    ->exclude('Fixtures')
-    ->in(__DIR__.'/src')
-    ->in(__DIR__.'/tests')
-;
-
-return Symfony\CS\Config::create()
-    ->setUsingCache(true)
-    //->setUsingLinter(false)
-    ->setRiskyAllowed(true)
-    ->setRules(array(
-        '@PSR2' => true,
-        'binary_operator_spaces' => true,
-        'blank_line_before_return' => true,
-        'header_comment' => array('header' => $header),
-        'include' => true,
-        'long_array_syntax' => true,
-        'method_separation' => true,
-        'no_blank_lines_after_class_opening' => true,
-        'no_blank_lines_after_phpdoc' => true,
-        'no_blank_lines_between_uses' => true,
-        'no_duplicate_semicolons' => true,
-        'no_extra_consecutive_blank_lines' => true,
-        'no_leading_import_slash' => true,
-        'no_leading_namespace_whitespace' => true,
-        'no_trailing_comma_in_singleline_array' => true,
-        'no_unused_imports' => true,
-        'object_operator_without_whitespace' => true,
-        'phpdoc_align' => true,
-        'phpdoc_indent' => true,
-        'phpdoc_no_access' => true,
-        'phpdoc_no_package' => true,
-        'phpdoc_order' => true,
-        'phpdoc_scalar' => true,
-        'phpdoc_trim' => true,
-        'phpdoc_type_to_var' => true,
-        'psr0' => true,
-        'single_blank_line_before_namespace' => true,
-        'spaces_cast' => true,
-        'standardize_not_equals' => true,
-        'ternary_operator_spaces' => true,
-        'trailing_comma_in_multiline_array' => true,
-        'whitespacy_lines' => true,
-    ))
-    ->finder($finder)
-;
diff --git a/mayor-orig/www/include/share/googleapi/monolog/monolog/CHANGELOG.md b/mayor-orig/www/include/share/googleapi/monolog/monolog/CHANGELOG.md
deleted file mode 100644
index cd1142d1..00000000
--- a/mayor-orig/www/include/share/googleapi/monolog/monolog/CHANGELOG.md
+++ /dev/null
@@ -1,342 +0,0 @@
-### 1.23.0 (2017-06-19)
-
-  * Improved SyslogUdpHandler's support for RFC5424 and added optional `$ident` argument
-  * Fixed GelfHandler truncation to be per field and not per message
-  * Fixed compatibility issue with PHP <5.3.6
-  * Fixed support for headless Chrome in ChromePHPHandler
-  * Fixed support for latest Aws SDK in DynamoDbHandler
-  * Fixed support for SwiftMailer 6.0+ in SwiftMailerHandler
-
-### 1.22.1 (2017-03-13)
-
-  * Fixed lots of minor issues in the new Slack integrations
-  * Fixed support for allowInlineLineBreaks in LineFormatter when formatting exception backtraces
-
-### 1.22.0 (2016-11-26)
-
-  * Added SlackbotHandler and SlackWebhookHandler to set up Slack integration more easily
-  * Added MercurialProcessor to add mercurial revision and branch names to log records
-  * Added support for AWS SDK v3 in DynamoDbHandler
-  * Fixed fatal errors occuring when normalizing generators that have been fully consumed
-  * Fixed RollbarHandler to include a level (rollbar level), monolog_level (original name), channel and datetime (unix)
-  * Fixed RollbarHandler not flushing records automatically, calling close() explicitly is not necessary anymore
-  * Fixed SyslogUdpHandler to avoid sending empty frames
-  * Fixed a few PHP 7.0 and 7.1 compatibility issues
-
-### 1.21.0 (2016-07-29)
-
-  * Break: Reverted the addition of $context when the ErrorHandler handles regular php errors from 1.20.0 as it was causing issues
-  * Added support for more formats in RotatingFileHandler::setFilenameFormat as long as they have Y, m and d in order
-  * Added ability to format the main line of text the SlackHandler sends by explictly setting a formatter on the handler
-  * Added information about SoapFault instances in NormalizerFormatter
-  * Added $handleOnlyReportedErrors option on ErrorHandler::registerErrorHandler (default true) to allow logging of all errors no matter the error_reporting level
-
-### 1.20.0 (2016-07-02)
-
-  * Added FingersCrossedHandler::activate() to manually trigger the handler regardless of the activation policy
-  * Added StreamHandler::getUrl to retrieve the stream's URL
-  * Added ability to override addRow/addTitle in HtmlFormatter
-  * Added the $context to context information when the ErrorHandler handles a regular php error
-  * Deprecated RotatingFileHandler::setFilenameFormat to only support 3 formats: Y, Y-m and Y-m-d
-  * Fixed WhatFailureGroupHandler to work with PHP7 throwables
-  * Fixed a few minor bugs
-
-### 1.19.0 (2016-04-12)
-
-  * Break: StreamHandler will not close streams automatically that it does not own. If you pass in a stream (not a path/url), then it will not close it for you. You can retrieve those using getStream() if needed
-  * Added DeduplicationHandler to remove duplicate records from notifications across multiple requests, useful for email or other notifications on errors
-  * Added ability to use `%message%` and other LineFormatter replacements in the subject line of emails sent with NativeMailHandler and SwiftMailerHandler
-  * Fixed HipChatHandler handling of long messages
-
-### 1.18.2 (2016-04-02)
-
-  * Fixed ElasticaFormatter to use more precise dates
-  * Fixed GelfMessageFormatter sending too long messages
-
-### 1.18.1 (2016-03-13)
-
-  * Fixed SlackHandler bug where slack dropped messages randomly
-  * Fixed RedisHandler issue when using with the PHPRedis extension
-  * Fixed AmqpHandler content-type being incorrectly set when using with the AMQP extension
-  * Fixed BrowserConsoleHandler regression
-
-### 1.18.0 (2016-03-01)
-
-  * Added optional reduction of timestamp precision via `Logger->useMicrosecondTimestamps(false)`, disabling it gets you a bit of performance boost but reduces the precision to the second instead of microsecond
-  * Added possibility to skip some extra stack frames in IntrospectionProcessor if you have some library wrapping Monolog that is always adding frames
-  * Added `Logger->withName` to clone a logger (keeping all handlers) with a new name
-  * Added FluentdFormatter for the Fluentd unix socket protocol
-  * Added HandlerWrapper base class to ease the creation of handler wrappers, just extend it and override as needed
-  * Added support for replacing context sub-keys using `%context.*%` in LineFormatter
-  * Added support for `payload` context value in RollbarHandler
-  * Added setRelease to RavenHandler to describe the application version, sent with every log
-  * Added support for `fingerprint` context value in RavenHandler
-  * Fixed JSON encoding errors that would gobble up the whole log record, we now handle those more gracefully by dropping chars as needed
-  * Fixed write timeouts in SocketHandler and derivatives, set to 10sec by default, lower it with `setWritingTimeout()`
-  * Fixed PHP7 compatibility with regard to Exception/Throwable handling in a few places
-
-### 1.17.2 (2015-10-14)
-
-  * Fixed ErrorHandler compatibility with non-Monolog PSR-3 loggers
-  * Fixed SlackHandler handling to use slack functionalities better
-  * Fixed SwiftMailerHandler bug when sending multiple emails they all had the same id
-  * Fixed 5.3 compatibility regression
-
-### 1.17.1 (2015-08-31)
-
-  * Fixed RollbarHandler triggering PHP notices
-
-### 1.17.0 (2015-08-30)
-
-  * Added support for `checksum` and `release` context/extra values in RavenHandler
-  * Added better support for exceptions in RollbarHandler
-  * Added UidProcessor::getUid
-  * Added support for showing the resource type in NormalizedFormatter
-  * Fixed IntrospectionProcessor triggering PHP notices
-
-### 1.16.0 (2015-08-09)
-
-  * Added IFTTTHandler to notify ifttt.com triggers
-  * Added Logger::setHandlers() to allow setting/replacing all handlers
-  * Added $capSize in RedisHandler to cap the log size
-  * Fixed StreamHandler creation of directory to only trigger when the first log write happens
-  * Fixed bug in the handling of curl failures
-  * Fixed duplicate logging of fatal errors when both error and fatal error handlers are registered in monolog's ErrorHandler
-  * Fixed missing fatal errors records with handlers that need to be closed to flush log records
-  * Fixed TagProcessor::addTags support for associative arrays
-
-### 1.15.0 (2015-07-12)
-
-  * Added addTags and setTags methods to change a TagProcessor
-  * Added automatic creation of directories if they are missing for a StreamHandler to open a log file
-  * Added retry functionality to Loggly, Cube and Mandrill handlers so they retry up to 5 times in case of network failure
-  * Fixed process exit code being incorrectly reset to 0 if ErrorHandler::registerExceptionHandler was used
-  * Fixed HTML/JS escaping in BrowserConsoleHandler
-  * Fixed JSON encoding errors being silently suppressed (PHP 5.5+ only)
-
-### 1.14.0 (2015-06-19)
-
-  * Added PHPConsoleHandler to send record to Chrome's PHP Console extension and library
-  * Added support for objects implementing __toString in the NormalizerFormatter
-  * Added support for HipChat's v2 API in HipChatHandler
-  * Added Logger::setTimezone() to initialize the timezone monolog should use in case date.timezone isn't correct for your app
-  * Added an option to send formatted message instead of the raw record on PushoverHandler via ->useFormattedMessage(true)
-  * Fixed curl errors being silently suppressed
-
-### 1.13.1 (2015-03-09)
-
-  * Fixed regression in HipChat requiring a new token to be created
-
-### 1.13.0 (2015-03-05)
-
-  * Added Registry::hasLogger to check for the presence of a logger instance
-  * Added context.user support to RavenHandler
-  * Added HipChat API v2 support in the HipChatHandler
-  * Added NativeMailerHandler::addParameter to pass params to the mail() process
-  * Added context data to SlackHandler when $includeContextAndExtra is true
-  * Added ability to customize the Swift_Message per-email in SwiftMailerHandler
-  * Fixed SwiftMailerHandler to lazily create message instances if a callback is provided
-  * Fixed serialization of INF and NaN values in Normalizer and LineFormatter
-
-### 1.12.0 (2014-12-29)
-
-  * Break: HandlerInterface::isHandling now receives a partial record containing only a level key. This was always the intent and does not break any Monolog handler but is strictly speaking a BC break and you should check if you relied on any other field in your own handlers.
-  * Added PsrHandler to forward records to another PSR-3 logger
-  * Added SamplingHandler to wrap around a handler and include only every Nth record
-  * Added MongoDBFormatter to support better storage with MongoDBHandler (it must be enabled manually for now)
-  * Added exception codes in the output of most formatters
-  * Added LineFormatter::includeStacktraces to enable exception stack traces in logs (uses more than one line)
-  * Added $useShortAttachment to SlackHandler to minify attachment size and $includeExtra to append extra data
-  * Added $host to HipChatHandler for users of private instances
-  * Added $transactionName to NewRelicHandler and support for a transaction_name context value
-  * Fixed MandrillHandler to avoid outputing API call responses
-  * Fixed some non-standard behaviors in SyslogUdpHandler
-
-### 1.11.0 (2014-09-30)
-
-  * Break: The NewRelicHandler extra and context data are now prefixed with extra_ and context_ to avoid clashes. Watch out if you have scripts reading those from the API and rely on names
-  * Added WhatFailureGroupHandler to suppress any exception coming from the wrapped handlers and avoid chain failures if a logging service fails
-  * Added MandrillHandler to send emails via the Mandrillapp.com API
-  * Added SlackHandler to log records to a Slack.com account
-  * Added FleepHookHandler to log records to a Fleep.io account
-  * Added LogglyHandler::addTag to allow adding tags to an existing handler
-  * Added $ignoreEmptyContextAndExtra to LineFormatter to avoid empty [] at the end
-  * Added $useLocking to StreamHandler and RotatingFileHandler to enable flock() while writing
-  * Added support for PhpAmqpLib in the AmqpHandler
-  * Added FingersCrossedHandler::clear and BufferHandler::clear to reset them between batches in long running jobs
-  * Added support for adding extra fields from $_SERVER in the WebProcessor
-  * Fixed support for non-string values in PrsLogMessageProcessor
-  * Fixed SwiftMailer messages being sent with the wrong date in long running scripts
-  * Fixed minor PHP 5.6 compatibility issues
-  * Fixed BufferHandler::close being called twice
-
-### 1.10.0 (2014-06-04)
-
-  * Added Logger::getHandlers() and Logger::getProcessors() methods
-  * Added $passthruLevel argument to FingersCrossedHandler to let it always pass some records through even if the trigger level is not reached
-  * Added support for extra data in NewRelicHandler
-  * Added $expandNewlines flag to the ErrorLogHandler to create multiple log entries when a message has multiple lines
-
-### 1.9.1 (2014-04-24)
-
-  * Fixed regression in RotatingFileHandler file permissions
-  * Fixed initialization of the BufferHandler to make sure it gets flushed after receiving records
-  * Fixed ChromePHPHandler and FirePHPHandler's activation strategies to be more conservative
-
-### 1.9.0 (2014-04-20)
-
-  * Added LogEntriesHandler to send logs to a LogEntries account
-  * Added $filePermissions to tweak file mode on StreamHandler and RotatingFileHandler
-  * Added $useFormatting flag to MemoryProcessor to make it send raw data in bytes
-  * Added support for table formatting in FirePHPHandler via the table context key
-  * Added a TagProcessor to add tags to records, and support for tags in RavenHandler
-  * Added $appendNewline flag to the JsonFormatter to enable using it when logging to files
-  * Added sound support to the PushoverHandler
-  * Fixed multi-threading support in StreamHandler
-  * Fixed empty headers issue when ChromePHPHandler received no records
-  * Fixed default format of the ErrorLogHandler
-
-### 1.8.0 (2014-03-23)
-
-  * Break: the LineFormatter now strips newlines by default because this was a bug, set $allowInlineLineBreaks to true if you need them
-  * Added BrowserConsoleHandler to send logs to any browser's console via console.log() injection in the output
-  * Added FilterHandler to filter records and only allow those of a given list of levels through to the wrapped handler
-  * Added FlowdockHandler to send logs to a Flowdock account
-  * Added RollbarHandler to send logs to a Rollbar account
-  * Added HtmlFormatter to send prettier log emails with colors for each log level
-  * Added GitProcessor to add the current branch/commit to extra record data
-  * Added a Monolog\Registry class to allow easier global access to pre-configured loggers
-  * Added support for the new official graylog2/gelf-php lib for GelfHandler, upgrade if you can by replacing the mlehner/gelf-php requirement
-  * Added support for HHVM
-  * Added support for Loggly batch uploads
-  * Added support for tweaking the content type and encoding in NativeMailerHandler
-  * Added $skipClassesPartials to tweak the ignored classes in the IntrospectionProcessor
-  * Fixed batch request support in GelfHandler
-
-### 1.7.0 (2013-11-14)
-
-  * Added ElasticSearchHandler to send logs to an Elastic Search server
-  * Added DynamoDbHandler and ScalarFormatter to send logs to Amazon's Dynamo DB
-  * Added SyslogUdpHandler to send logs to a remote syslogd server
-  * Added LogglyHandler to send logs to a Loggly account
-  * Added $level to IntrospectionProcessor so it only adds backtraces when needed
-  * Added $version to LogstashFormatter to allow using the new v1 Logstash format
-  * Added $appName to NewRelicHandler
-  * Added configuration of Pushover notification retries/expiry
-  * Added $maxColumnWidth to NativeMailerHandler to change the 70 chars default
-  * Added chainability to most setters for all handlers
-  * Fixed RavenHandler batch processing so it takes the message from the record with highest priority
-  * Fixed HipChatHandler batch processing so it sends all messages at once
-  * Fixed issues with eAccelerator
-  * Fixed and improved many small things
-
-### 1.6.0 (2013-07-29)
-
-  * Added HipChatHandler to send logs to a HipChat chat room
-  * Added ErrorLogHandler to send logs to PHP's error_log function
-  * Added NewRelicHandler to send logs to NewRelic's service
-  * Added Monolog\ErrorHandler helper class to register a Logger as exception/error/fatal handler
-  * Added ChannelLevelActivationStrategy for the FingersCrossedHandler to customize levels by channel
-  * Added stack traces output when normalizing exceptions (json output & co)
-  * Added Monolog\Logger::API constant (currently 1)
-  * Added support for ChromePHP's v4.0 extension
-  * Added support for message priorities in PushoverHandler, see $highPriorityLevel and $emergencyLevel
-  * Added support for sending messages to multiple users at once with the PushoverHandler
-  * Fixed RavenHandler's support for batch sending of messages (when behind a Buffer or FingersCrossedHandler)
-  * Fixed normalization of Traversables with very large data sets, only the first 1000 items are shown now
-  * Fixed issue in RotatingFileHandler when an open_basedir restriction is active
-  * Fixed minor issues in RavenHandler and bumped the API to Raven 0.5.0
-  * Fixed SyslogHandler issue when many were used concurrently with different facilities
-
-### 1.5.0 (2013-04-23)
-
-  * Added ProcessIdProcessor to inject the PID in log records
-  * Added UidProcessor to inject a unique identifier to all log records of one request/run
-  * Added support for previous exceptions in the LineFormatter exception serialization
-  * Added Monolog\Logger::getLevels() to get all available levels
-  * Fixed ChromePHPHandler so it avoids sending headers larger than Chrome can handle
-
-### 1.4.1 (2013-04-01)
-
-  * Fixed exception formatting in the LineFormatter to be more minimalistic
-  * Fixed RavenHandler's handling of context/extra data, requires Raven client >0.1.0
-  * Fixed log rotation in RotatingFileHandler to work with long running scripts spanning multiple days
-  * Fixed WebProcessor array access so it checks for data presence
-  * Fixed Buffer, Group and FingersCrossed handlers to make use of their processors
-
-### 1.4.0 (2013-02-13)
-
-  * Added RedisHandler to log to Redis via the Predis library or the phpredis extension
-  * Added ZendMonitorHandler to log to the Zend Server monitor
-  * Added the possibility to pass arrays of handlers and processors directly in the Logger constructor
-  * Added `$useSSL` option to the PushoverHandler which is enabled by default
-  * Fixed ChromePHPHandler and FirePHPHandler issue when multiple instances are used simultaneously
-  * Fixed header injection capability in the NativeMailHandler
-
-### 1.3.1 (2013-01-11)
-
-  * Fixed LogstashFormatter to be usable with stream handlers
-  * Fixed GelfMessageFormatter levels on Windows
-
-### 1.3.0 (2013-01-08)
-
-  * Added PSR-3 compliance, the `Monolog\Logger` class is now an instance of `Psr\Log\LoggerInterface`
-  * Added PsrLogMessageProcessor that you can selectively enable for full PSR-3 compliance
-  * Added LogstashFormatter (combine with SocketHandler or StreamHandler to send logs to Logstash)
-  * Added PushoverHandler to send mobile notifications
-  * Added CouchDBHandler and DoctrineCouchDBHandler
-  * Added RavenHandler to send data to Sentry servers
-  * Added support for the new MongoClient class in MongoDBHandler
-  * Added microsecond precision to log records' timestamps
-  * Added `$flushOnOverflow` param to BufferHandler to flush by batches instead of losing
-    the oldest entries
-  * Fixed normalization of objects with cyclic references
-
-### 1.2.1 (2012-08-29)
-
-  * Added new $logopts arg to SyslogHandler to provide custom openlog options
-  * Fixed fatal error in SyslogHandler
-
-### 1.2.0 (2012-08-18)
-
-  * Added AmqpHandler (for use with AMQP servers)
-  * Added CubeHandler
-  * Added NativeMailerHandler::addHeader() to send custom headers in mails
-  * Added the possibility to specify more than one recipient in NativeMailerHandler
-  * Added the possibility to specify float timeouts in SocketHandler
-  * Added NOTICE and EMERGENCY levels to conform with RFC 5424
-  * Fixed the log records to use the php default timezone instead of UTC
-  * Fixed BufferHandler not being flushed properly on PHP fatal errors
-  * Fixed normalization of exotic resource types
-  * Fixed the default format of the SyslogHandler to avoid duplicating datetimes in syslog
-
-### 1.1.0 (2012-04-23)
-
-  * Added Monolog\Logger::isHandling() to check if a handler will
-    handle the given log level
-  * Added ChromePHPHandler
-  * Added MongoDBHandler
-  * Added GelfHandler (for use with Graylog2 servers)
-  * Added SocketHandler (for use with syslog-ng for example)
-  * Added NormalizerFormatter
-  * Added the possibility to change the activation strategy of the FingersCrossedHandler
-  * Added possibility to show microseconds in logs
-  * Added `server` and `referer` to WebProcessor output
-
-### 1.0.2 (2011-10-24)
-
-  * Fixed bug in IE with large response headers and FirePHPHandler
-
-### 1.0.1 (2011-08-25)
-
-  * Added MemoryPeakUsageProcessor and MemoryUsageProcessor
-  * Added Monolog\Logger::getName() to get a logger's channel name
-
-### 1.0.0 (2011-07-06)
-
-  * Added IntrospectionProcessor to get info from where the logger was called
-  * Fixed WebProcessor in CLI
-
-### 1.0.0-RC1 (2011-07-01)
-
-  * Initial release
diff --git a/mayor-orig/www/include/share/googleapi/monolog/monolog/LICENSE b/mayor-orig/www/include/share/googleapi/monolog/monolog/LICENSE
deleted file mode 100644
index 16473219..00000000
--- a/mayor-orig/www/include/share/googleapi/monolog/monolog/LICENSE
+++ /dev/null
@@ -1,19 +0,0 @@
-Copyright (c) 2011-2016 Jordi Boggiano
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is furnished
-to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-THE SOFTWARE.
diff --git a/mayor-orig/www/include/share/googleapi/monolog/monolog/README.md b/mayor-orig/www/include/share/googleapi/monolog/monolog/README.md
deleted file mode 100644
index 7d8ade52..00000000
--- a/mayor-orig/www/include/share/googleapi/monolog/monolog/README.md
+++ /dev/null
@@ -1,95 +0,0 @@
-# Monolog - Logging for PHP [![Build Status](https://img.shields.io/travis/Seldaek/monolog.svg)](https://travis-ci.org/Seldaek/monolog)
-
-[![Total Downloads](https://img.shields.io/packagist/dt/monolog/monolog.svg)](https://packagist.org/packages/monolog/monolog)
-[![Latest Stable Version](https://img.shields.io/packagist/v/monolog/monolog.svg)](https://packagist.org/packages/monolog/monolog)
-[![Reference Status](https://www.versioneye.com/php/monolog:monolog/reference_badge.svg)](https://www.versioneye.com/php/monolog:monolog/references)
-
-
-Monolog sends your logs to files, sockets, inboxes, databases and various
-web services. See the complete list of handlers below. Special handlers
-allow you to build advanced logging strategies.
-
-This library implements the [PSR-3](https://github.com/php-fig/fig-standards/blob/master/accepted/PSR-3-logger-interface.md)
-interface that you can type-hint against in your own libraries to keep
-a maximum of interoperability. You can also use it in your applications to
-make sure you can always use another compatible logger at a later time.
-As of 1.11.0 Monolog public APIs will also accept PSR-3 log levels.
-Internally Monolog still uses its own level scheme since it predates PSR-3.
-
-## Installation
-
-Install the latest version with
-
-```bash
-$ composer require monolog/monolog
-```
-
-## Basic Usage
-
-```php
-pushHandler(new StreamHandler('path/to/your.log', Logger::WARNING));
-
-// add records to the log
-$log->addWarning('Foo');
-$log->addError('Bar');
-```
-
-## Documentation
-
-- [Usage Instructions](doc/01-usage.md)
-- [Handlers, Formatters and Processors](doc/02-handlers-formatters-processors.md)
-- [Utility classes](doc/03-utilities.md)
-- [Extending Monolog](doc/04-extending.md)
-
-## Third Party Packages
-
-Third party handlers, formatters and processors are
-[listed in the wiki](https://github.com/Seldaek/monolog/wiki/Third-Party-Packages). You
-can also add your own there if you publish one.
-
-## About
-
-### Requirements
-
-- Monolog works with PHP 5.3 or above, and is also tested to work with HHVM.
-
-### Submitting bugs and feature requests
-
-Bugs and feature request are tracked on [GitHub](https://github.com/Seldaek/monolog/issues)
-
-### Framework Integrations
-
-- Frameworks and libraries using [PSR-3](https://github.com/php-fig/fig-standards/blob/master/accepted/PSR-3-logger-interface.md)
-  can be used very easily with Monolog since it implements the interface.
-- [Symfony2](http://symfony.com) comes out of the box with Monolog.
-- [Silex](http://silex.sensiolabs.org/) comes out of the box with Monolog.
-- [Laravel 4 & 5](http://laravel.com/) come out of the box with Monolog.
-- [Lumen](http://lumen.laravel.com/) comes out of the box with Monolog.
-- [PPI](http://www.ppi.io/) comes out of the box with Monolog.
-- [CakePHP](http://cakephp.org/) is usable with Monolog via the [cakephp-monolog](https://github.com/jadb/cakephp-monolog) plugin.
-- [Slim](http://www.slimframework.com/) is usable with Monolog via the [Slim-Monolog](https://github.com/Flynsarmy/Slim-Monolog) log writer.
-- [XOOPS 2.6](http://xoops.org/) comes out of the box with Monolog.
-- [Aura.Web_Project](https://github.com/auraphp/Aura.Web_Project) comes out of the box with Monolog.
-- [Nette Framework](http://nette.org/en/) can be used with Monolog via [Kdyby/Monolog](https://github.com/Kdyby/Monolog) extension.
-- [Proton Micro Framework](https://github.com/alexbilbie/Proton) comes out of the box with Monolog.
-
-### Author
-
-Jordi Boggiano -  - 

-See also the list of [contributors](https://github.com/Seldaek/monolog/contributors) which participated in this project.
-
-### License
-
-Monolog is licensed under the MIT License - see the `LICENSE` file for details
-
-### Acknowledgements
-
-This library is heavily inspired by Python's [Logbook](http://packages.python.org/Logbook/)
-library, although most concepts have been adjusted to fit to the PHP world.
diff --git a/mayor-orig/www/include/share/googleapi/monolog/monolog/composer.json b/mayor-orig/www/include/share/googleapi/monolog/monolog/composer.json
deleted file mode 100644
index 3b0c8805..00000000
--- a/mayor-orig/www/include/share/googleapi/monolog/monolog/composer.json
+++ /dev/null
@@ -1,66 +0,0 @@
-{
-    "name": "monolog/monolog",
-    "description": "Sends your logs to files, sockets, inboxes, databases and various web services",
-    "keywords": ["log", "logging", "psr-3"],
-    "homepage": "http://github.com/Seldaek/monolog",
-    "type": "library",
-    "license": "MIT",
-    "authors": [
-        {
-            "name": "Jordi Boggiano",
-            "email": "j.boggiano@seld.be",
-            "homepage": "http://seld.be"
-        }
-    ],
-    "require": {
-        "php": ">=5.3.0",
-        "psr/log": "~1.0"
-    },
-    "require-dev": {
-        "phpunit/phpunit": "~4.5",
-        "graylog2/gelf-php": "~1.0",
-        "sentry/sentry": "^0.13",
-        "ruflin/elastica": ">=0.90 <3.0",
-        "doctrine/couchdb": "~1.0@dev",
-        "aws/aws-sdk-php": "^2.4.9 || ^3.0",
-        "php-amqplib/php-amqplib": "~2.4",
-        "swiftmailer/swiftmailer": "^5.3|^6.0",
-        "php-console/php-console": "^3.1.3",
-        "phpunit/phpunit-mock-objects": "2.3.0",
-        "jakub-onderka/php-parallel-lint": "0.9"
-    },
-    "_": "phpunit/phpunit-mock-objects required in 2.3.0 due to https://github.com/sebastianbergmann/phpunit-mock-objects/issues/223 - needs hhvm 3.8+ on travis",
-    "suggest": {
-        "graylog2/gelf-php": "Allow sending log messages to a GrayLog2 server",
-        "sentry/sentry": "Allow sending log messages to a Sentry server",
-        "doctrine/couchdb": "Allow sending log messages to a CouchDB server",
-        "ruflin/elastica": "Allow sending log messages to an Elastic Search server",
-        "php-amqplib/php-amqplib": "Allow sending log messages to an AMQP server using php-amqplib",
-        "ext-amqp": "Allow sending log messages to an AMQP server (1.0+ required)",
-        "ext-mongo": "Allow sending log messages to a MongoDB server",
-        "mongodb/mongodb": "Allow sending log messages to a MongoDB server via PHP Driver",
-        "aws/aws-sdk-php": "Allow sending log messages to AWS services like DynamoDB",
-        "rollbar/rollbar": "Allow sending log messages to Rollbar",
-        "php-console/php-console": "Allow sending log messages to Google Chrome"
-    },
-    "autoload": {
-        "psr-4": {"Monolog\\": "src/Monolog"}
-    },
-    "autoload-dev": {
-        "psr-4": {"Monolog\\": "tests/Monolog"}
-    },
-    "provide": {
-        "psr/log-implementation": "1.0.0"
-    },
-    "extra": {
-        "branch-alias": {
-            "dev-master": "2.0.x-dev"
-        }
-    },
-    "scripts": {
-        "test": [
-            "parallel-lint . --exclude vendor",
-            "phpunit"
-        ]
-    }
-}
diff --git a/mayor-orig/www/include/share/googleapi/monolog/monolog/doc/01-usage.md b/mayor-orig/www/include/share/googleapi/monolog/monolog/doc/01-usage.md
deleted file mode 100644
index 8e2551f3..00000000
--- a/mayor-orig/www/include/share/googleapi/monolog/monolog/doc/01-usage.md
+++ /dev/null
@@ -1,231 +0,0 @@
-# Using Monolog
-
-- [Installation](#installation)
-- [Core Concepts](#core-concepts)
-- [Log Levels](#log-levels)
-- [Configuring a logger](#configuring-a-logger)
-- [Adding extra data in the records](#adding-extra-data-in-the-records)
-- [Leveraging channels](#leveraging-channels)
-- [Customizing the log format](#customizing-the-log-format)
-
-## Installation
-
-Monolog is available on Packagist ([monolog/monolog](http://packagist.org/packages/monolog/monolog))
-and as such installable via [Composer](http://getcomposer.org/).
-
-```bash
-composer require monolog/monolog
-```
-
-If you do not use Composer, you can grab the code from GitHub, and use any
-PSR-0 compatible autoloader (e.g. the [Symfony2 ClassLoader component](https://github.com/symfony/ClassLoader))
-to load Monolog classes.
-
-## Core Concepts
-
-Every `Logger` instance has a channel (name) and a stack of handlers. Whenever
-you add a record to the logger, it traverses the handler stack. Each handler
-decides whether it fully handled the record, and if so, the propagation of the
-record ends there.
-
-This allows for flexible logging setups, for example having a `StreamHandler` at
-the bottom of the stack that will log anything to disk, and on top of that add
-a `MailHandler` that will send emails only when an error message is logged.
-Handlers also have a `$bubble` property which defines whether they block the
-record or not if they handled it. In this example, setting the `MailHandler`'s
-`$bubble` argument to false means that records handled by the `MailHandler` will
-not propagate to the `StreamHandler` anymore.
-
-You can create many `Logger`s, each defining a channel (e.g.: db, request,
-router, ..) and each of them combining various handlers, which can be shared
-or not. The channel is reflected in the logs and allows you to easily see or
-filter records.
-
-Each Handler also has a Formatter, a default one with settings that make sense
-will be created if you don't set one. The formatters normalize and format
-incoming records so that they can be used by the handlers to output useful
-information.
-
-Custom severity levels are not available. Only the eight
-[RFC 5424](http://tools.ietf.org/html/rfc5424) levels (debug, info, notice,
-warning, error, critical, alert, emergency) are present for basic filtering
-purposes, but for sorting and other use cases that would require
-flexibility, you should add Processors to the Logger that can add extra
-information (tags, user ip, ..) to the records before they are handled.
-
-## Log Levels
-
-Monolog supports the logging levels described by [RFC 5424](http://tools.ietf.org/html/rfc5424).
-
-- **DEBUG** (100): Detailed debug information.
-
-- **INFO** (200): Interesting events. Examples: User logs in, SQL logs.
-
-- **NOTICE** (250): Normal but significant events.
-
-- **WARNING** (300): Exceptional occurrences that are not errors. Examples:
-  Use of deprecated APIs, poor use of an API, undesirable things that are not
-  necessarily wrong.
-
-- **ERROR** (400): Runtime errors that do not require immediate action but
-  should typically be logged and monitored.
-
-- **CRITICAL** (500): Critical conditions. Example: Application component
-  unavailable, unexpected exception.
-
-- **ALERT** (550): Action must be taken immediately. Example: Entire website
-  down, database unavailable, etc. This should trigger the SMS alerts and wake
-  you up.
-
-- **EMERGENCY** (600): Emergency: system is unusable.
-
-## Configuring a logger
-
-Here is a basic setup to log to a file and to firephp on the DEBUG level:
-
-```php
-pushHandler(new StreamHandler(__DIR__.'/my_app.log', Logger::DEBUG));
-$logger->pushHandler(new FirePHPHandler());
-
-// You can now use your logger
-$logger->addInfo('My logger is now ready');
-```
-
-Let's explain it. The first step is to create the logger instance which will
-be used in your code. The argument is a channel name, which is useful when
-you use several loggers (see below for more details about it).
-
-The logger itself does not know how to handle a record. It delegates it to
-some handlers. The code above registers two handlers in the stack to allow
-handling records in two different ways.
-
-Note that the FirePHPHandler is called first as it is added on top of the
-stack. This allows you to temporarily add a logger with bubbling disabled if
-you want to override other configured loggers.
-
-> If you use Monolog standalone and are looking for an easy way to
-> configure many handlers, the [theorchard/monolog-cascade](https://github.com/theorchard/monolog-cascade)
-> can help you build complex logging configs via PHP arrays, yaml or json configs.
-
-## Adding extra data in the records
-
-Monolog provides two different ways to add extra informations along the simple
-textual message.
-
-### Using the logging context
-
-The first way is the context, allowing to pass an array of data along the
-record:
-
-```php
-addInfo('Adding a new user', array('username' => 'Seldaek'));
-```
-
-Simple handlers (like the StreamHandler for instance) will simply format
-the array to a string but richer handlers can take advantage of the context
-(FirePHP is able to display arrays in pretty way for instance).
-
-### Using processors
-
-The second way is to add extra data for all records by using a processor.
-Processors can be any callable. They will get the record as parameter and
-must return it after having eventually changed the `extra` part of it. Let's
-write a processor adding some dummy data in the record:
-
-```php
-pushProcessor(function ($record) {
-    $record['extra']['dummy'] = 'Hello world!';
-
-    return $record;
-});
-```
-
-Monolog provides some built-in processors that can be used in your project.
-Look at the [dedicated chapter](https://github.com/Seldaek/monolog/blob/master/doc/02-handlers-formatters-processors.md#processors) for the list.
-
-> Tip: processors can also be registered on a specific handler instead of
-  the logger to apply only for this handler.
-
-## Leveraging channels
-
-Channels are a great way to identify to which part of the application a record
-is related. This is useful in big applications (and is leveraged by
-MonologBundle in Symfony2).
-
-Picture two loggers sharing a handler that writes to a single log file.
-Channels would allow you to identify the logger that issued every record.
-You can easily grep through the log files filtering this or that channel.
-
-```php
-pushHandler($stream);
-$logger->pushHandler($firephp);
-
-// Create a logger for the security-related stuff with a different channel
-$securityLogger = new Logger('security');
-$securityLogger->pushHandler($stream);
-$securityLogger->pushHandler($firephp);
-
-// Or clone the first one to only change the channel
-$securityLogger = $logger->withName('security');
-```
-
-## Customizing the log format
-
-In Monolog it's easy to customize the format of the logs written into files,
-sockets, mails, databases and other handlers. Most of the handlers use the
-
-```php
-$record['formatted']
-```
-
-value to be automatically put into the log device. This value depends on the
-formatter settings. You can choose between predefined formatter classes or
-write your own (e.g. a multiline text file for human-readable output).
-
-To configure a predefined formatter class, just set it as the handler's field:
-
-```php
-// the default date format is "Y-m-d H:i:s"
-$dateFormat = "Y n j, g:i a";
-// the default output format is "[%datetime%] %channel%.%level_name%: %message% %context% %extra%\n"
-$output = "%datetime% > %level_name% > %message% %context% %extra%\n";
-// finally, create a formatter
-$formatter = new LineFormatter($output, $dateFormat);
-
-// Create a handler
-$stream = new StreamHandler(__DIR__.'/my_app.log', Logger::DEBUG);
-$stream->setFormatter($formatter);
-// bind it to a logger object
-$securityLogger = new Logger('security');
-$securityLogger->pushHandler($stream);
-```
-
-You may also reuse the same formatter between multiple handlers and share those
-handlers between multiple loggers.
-
-[Handlers, Formatters and Processors](02-handlers-formatters-processors.md) →
diff --git a/mayor-orig/www/include/share/googleapi/monolog/monolog/doc/02-handlers-formatters-processors.md b/mayor-orig/www/include/share/googleapi/monolog/monolog/doc/02-handlers-formatters-processors.md
deleted file mode 100644
index bea968ac..00000000
--- a/mayor-orig/www/include/share/googleapi/monolog/monolog/doc/02-handlers-formatters-processors.md
+++ /dev/null
@@ -1,157 +0,0 @@
-# Handlers, Formatters and Processors
-
-- [Handlers](#handlers)
-  - [Log to files and syslog](#log-to-files-and-syslog)
-  - [Send alerts and emails](#send-alerts-and-emails)
-  - [Log specific servers and networked logging](#log-specific-servers-and-networked-logging)
-  - [Logging in development](#logging-in-development)
-  - [Log to databases](#log-to-databases)
-  - [Wrappers / Special Handlers](#wrappers--special-handlers)
-- [Formatters](#formatters)
-- [Processors](#processors)
-- [Third Party Packages](#third-party-packages)
-
-## Handlers
-
-### Log to files and syslog
-
-- _StreamHandler_: Logs records into any PHP stream, use this for log files.
-- _RotatingFileHandler_: Logs records to a file and creates one logfile per day.
-  It will also delete files older than `$maxFiles`. You should use
-  [logrotate](http://linuxcommand.org/man_pages/logrotate8.html) for high profile
-  setups though, this is just meant as a quick and dirty solution.
-- _SyslogHandler_: Logs records to the syslog.
-- _ErrorLogHandler_: Logs records to PHP's
-  [`error_log()`](http://docs.php.net/manual/en/function.error-log.php) function.
-
-### Send alerts and emails
-
-- _NativeMailerHandler_: Sends emails using PHP's
-  [`mail()`](http://php.net/manual/en/function.mail.php) function.
-- _SwiftMailerHandler_: Sends emails using a [`Swift_Mailer`](http://swiftmailer.org/) instance.
-- _PushoverHandler_: Sends mobile notifications via the [Pushover](https://www.pushover.net/) API.
-- _HipChatHandler_: Logs records to a [HipChat](http://hipchat.com) chat room using its API.
-- _FlowdockHandler_: Logs records to a [Flowdock](https://www.flowdock.com/) account.
-- _SlackHandler_: Logs records to a [Slack](https://www.slack.com/) account using the Slack API.
-- _SlackbotHandler_: Logs records to a [Slack](https://www.slack.com/) account using the Slackbot incoming hook.
-- _SlackWebhookHandler_: Logs records to a [Slack](https://www.slack.com/) account using Slack Webhooks.
-- _MandrillHandler_: Sends emails via the Mandrill API using a [`Swift_Message`](http://swiftmailer.org/) instance.
-- _FleepHookHandler_: Logs records to a [Fleep](https://fleep.io/) conversation using Webhooks.
-- _IFTTTHandler_: Notifies an [IFTTT](https://ifttt.com/maker) trigger with the log channel, level name and message.
-
-### Log specific servers and networked logging
-
-- _SocketHandler_: Logs records to [sockets](http://php.net/fsockopen), use this
-  for UNIX and TCP sockets. See an [example](sockets.md).
-- _AmqpHandler_: Logs records to an [amqp](http://www.amqp.org/) compatible
-  server. Requires the [php-amqp](http://pecl.php.net/package/amqp) extension (1.0+).
-- _GelfHandler_: Logs records to a [Graylog2](http://www.graylog2.org) server.
-- _CubeHandler_: Logs records to a [Cube](http://square.github.com/cube/) server.
-- _RavenHandler_: Logs records to a [Sentry](http://getsentry.com/) server using
-  [raven](https://packagist.org/packages/raven/raven).
-- _ZendMonitorHandler_: Logs records to the Zend Monitor present in Zend Server.
-- _NewRelicHandler_: Logs records to a [NewRelic](http://newrelic.com/) application.
-- _LogglyHandler_: Logs records to a [Loggly](http://www.loggly.com/) account.
-- _RollbarHandler_: Logs records to a [Rollbar](https://rollbar.com/) account.
-- _SyslogUdpHandler_: Logs records to a remote [Syslogd](http://www.rsyslog.com/) server.
-- _LogEntriesHandler_: Logs records to a [LogEntries](http://logentries.com/) account.
-
-### Logging in development
-
-- _FirePHPHandler_: Handler for [FirePHP](http://www.firephp.org/), providing
-  inline `console` messages within [FireBug](http://getfirebug.com/).
-- _ChromePHPHandler_: Handler for [ChromePHP](http://www.chromephp.com/), providing
-  inline `console` messages within Chrome.
-- _BrowserConsoleHandler_: Handler to send logs to browser's Javascript `console` with
-  no browser extension required. Most browsers supporting `console` API are supported.
-- _PHPConsoleHandler_: Handler for [PHP Console](https://chrome.google.com/webstore/detail/php-console/nfhmhhlpfleoednkpnnnkolmclajemef), providing
-  inline `console` and notification popup messages within Chrome.
-
-### Log to databases
-
-- _RedisHandler_: Logs records to a [redis](http://redis.io) server.
-- _MongoDBHandler_: Handler to write records in MongoDB via a
-  [Mongo](http://pecl.php.net/package/mongo) extension connection.
-- _CouchDBHandler_: Logs records to a CouchDB server.
-- _DoctrineCouchDBHandler_: Logs records to a CouchDB server via the Doctrine CouchDB ODM.
-- _ElasticSearchHandler_: Logs records to an Elastic Search server.
-- _DynamoDbHandler_: Logs records to a DynamoDB table with the [AWS SDK](https://github.com/aws/aws-sdk-php).
-
-### Wrappers / Special Handlers
-
-- _FingersCrossedHandler_: A very interesting wrapper. It takes a logger as
-  parameter and will accumulate log records of all levels until a record
-  exceeds the defined severity level. At which point it delivers all records,
-  including those of lower severity, to the handler it wraps. This means that
-  until an error actually happens you will not see anything in your logs, but
-  when it happens you will have the full information, including debug and info
-  records. This provides you with all the information you need, but only when
-  you need it.
-- _DeduplicationHandler_: Useful if you are sending notifications or emails
-  when critical errors occur. It takes a logger as parameter and will
-  accumulate log records of all levels until the end of the request (or
-  `flush()` is called). At that point it delivers all records to the handler
-  it wraps, but only if the records are unique over a given time period
-  (60seconds by default). If the records are duplicates they are simply
-  discarded. The main use of this is in case of critical failure like if your
-  database is unreachable for example all your requests will fail and that
-  can result in a lot of notifications being sent. Adding this handler reduces
-  the amount of notifications to a manageable level.
-- _WhatFailureGroupHandler_: This handler extends the _GroupHandler_ ignoring
-   exceptions raised by each child handler. This allows you to ignore issues
-   where a remote tcp connection may have died but you do not want your entire
-   application to crash and may wish to continue to log to other handlers.
-- _BufferHandler_: This handler will buffer all the log records it receives
-  until `close()` is called at which point it will call `handleBatch()` on the
-  handler it wraps with all the log messages at once. This is very useful to
-  send an email with all records at once for example instead of having one mail
-  for every log record.
-- _GroupHandler_: This handler groups other handlers. Every record received is
-  sent to all the handlers it is configured with.
-- _FilterHandler_: This handler only lets records of the given levels through
-   to the wrapped handler.
-- _SamplingHandler_: Wraps around another handler and lets you sample records
-   if you only want to store some of them.
-- _NullHandler_: Any record it can handle will be thrown away. This can be used
-  to put on top of an existing handler stack to disable it temporarily.
-- _PsrHandler_: Can be used to forward log records to an existing PSR-3 logger
-- _TestHandler_: Used for testing, it records everything that is sent to it and
-  has accessors to read out the information.
-- _HandlerWrapper_: A simple handler wrapper you can inherit from to create
- your own wrappers easily.
-
-## Formatters
-
-- _LineFormatter_: Formats a log record into a one-line string.
-- _HtmlFormatter_: Used to format log records into a human readable html table, mainly suitable for emails.
-- _NormalizerFormatter_: Normalizes objects/resources down to strings so a record can easily be serialized/encoded.
-- _ScalarFormatter_: Used to format log records into an associative array of scalar values.
-- _JsonFormatter_: Encodes a log record into json.
-- _WildfireFormatter_: Used to format log records into the Wildfire/FirePHP protocol, only useful for the FirePHPHandler.
-- _ChromePHPFormatter_: Used to format log records into the ChromePHP format, only useful for the ChromePHPHandler.
-- _GelfMessageFormatter_: Used to format log records into Gelf message instances, only useful for the GelfHandler.
-- _LogstashFormatter_: Used to format log records into [logstash](http://logstash.net/) event json, useful for any handler listed under inputs [here](http://logstash.net/docs/latest).
-- _ElasticaFormatter_: Used to format log records into an Elastica\Document object, only useful for the ElasticSearchHandler.
-- _LogglyFormatter_: Used to format log records into Loggly messages, only useful for the LogglyHandler.
-- _FlowdockFormatter_: Used to format log records into Flowdock messages, only useful for the FlowdockHandler.
-- _MongoDBFormatter_: Converts \DateTime instances to \MongoDate and objects recursively to arrays, only useful with the MongoDBHandler.
-
-## Processors
-
-- _PsrLogMessageProcessor_: Processes a log record's message according to PSR-3 rules, replacing `{foo}` with the value from `$context['foo']`.
-- _IntrospectionProcessor_: Adds the line/file/class/method from which the log call originated.
-- _WebProcessor_: Adds the current request URI, request method and client IP to a log record.
-- _MemoryUsageProcessor_: Adds the current memory usage to a log record.
-- _MemoryPeakUsageProcessor_: Adds the peak memory usage to a log record.
-- _ProcessIdProcessor_: Adds the process id to a log record.
-- _UidProcessor_: Adds a unique identifier to a log record.
-- _GitProcessor_: Adds the current git branch and commit to a log record.
-- _TagProcessor_: Adds an array of predefined tags to a log record.
-
-## Third Party Packages
-
-Third party handlers, formatters and processors are
-[listed in the wiki](https://github.com/Seldaek/monolog/wiki/Third-Party-Packages). You
-can also add your own there if you publish one.
-
-← [Usage](01-usage.md) |  [Utility classes](03-utilities.md) →
diff --git a/mayor-orig/www/include/share/googleapi/monolog/monolog/doc/03-utilities.md b/mayor-orig/www/include/share/googleapi/monolog/monolog/doc/03-utilities.md
deleted file mode 100644
index c62aa416..00000000
--- a/mayor-orig/www/include/share/googleapi/monolog/monolog/doc/03-utilities.md
+++ /dev/null
@@ -1,13 +0,0 @@
-# Utilities
-
-- _Registry_: The `Monolog\Registry` class lets you configure global loggers that you
-  can then statically access from anywhere. It is not really a best practice but can
-  help in some older codebases or for ease of use.
-- _ErrorHandler_: The `Monolog\ErrorHandler` class allows you to easily register
-  a Logger instance as an exception handler, error handler or fatal error handler.
-- _ErrorLevelActivationStrategy_: Activates a FingersCrossedHandler when a certain log
-  level is reached.
-- _ChannelLevelActivationStrategy_: Activates a FingersCrossedHandler when a certain
-  log level is reached, depending on which channel received the log record.
-
-← [Handlers, Formatters and Processors](02-handlers-formatters-processors.md) |  [Extending Monolog](04-extending.md) →
diff --git a/mayor-orig/www/include/share/googleapi/monolog/monolog/doc/04-extending.md b/mayor-orig/www/include/share/googleapi/monolog/monolog/doc/04-extending.md
deleted file mode 100644
index ebd9104d..00000000
--- a/mayor-orig/www/include/share/googleapi/monolog/monolog/doc/04-extending.md
+++ /dev/null
@@ -1,76 +0,0 @@
-# Extending Monolog
-
-Monolog is fully extensible, allowing you to adapt your logger to your needs.
-
-## Writing your own handler
-
-Monolog provides many built-in handlers. But if the one you need does not
-exist, you can write it and use it in your logger. The only requirement is
-to implement `Monolog\Handler\HandlerInterface`.
-
-Let's write a PDOHandler to log records to a database. We will extend the
-abstract class provided by Monolog to keep things DRY.
-
-```php
-pdo = $pdo;
-        parent::__construct($level, $bubble);
-    }
-
-    protected function write(array $record)
-    {
-        if (!$this->initialized) {
-            $this->initialize();
-        }
-
-        $this->statement->execute(array(
-            'channel' => $record['channel'],
-            'level' => $record['level'],
-            'message' => $record['formatted'],
-            'time' => $record['datetime']->format('U'),
-        ));
-    }
-
-    private function initialize()
-    {
-        $this->pdo->exec(
-            'CREATE TABLE IF NOT EXISTS monolog '
-            .'(channel VARCHAR(255), level INTEGER, message LONGTEXT, time INTEGER UNSIGNED)'
-        );
-        $this->statement = $this->pdo->prepare(
-            'INSERT INTO monolog (channel, level, message, time) VALUES (:channel, :level, :message, :time)'
-        );
-
-        $this->initialized = true;
-    }
-}
-```
-
-You can now use this handler in your logger:
-
-```php
-pushHandler(new PDOHandler(new PDO('sqlite:logs.sqlite')));
-
-// You can now use your logger
-$logger->addInfo('My logger is now ready');
-```
-
-The `Monolog\Handler\AbstractProcessingHandler` class provides most of the
-logic needed for the handler, including the use of processors and the formatting
-of the record (which is why we use ``$record['formatted']`` instead of ``$record['message']``).
-
-← [Utility classes](03-utilities.md)
diff --git a/mayor-orig/www/include/share/googleapi/monolog/monolog/doc/sockets.md b/mayor-orig/www/include/share/googleapi/monolog/monolog/doc/sockets.md
deleted file mode 100644
index ea9cf0ea..00000000
--- a/mayor-orig/www/include/share/googleapi/monolog/monolog/doc/sockets.md
+++ /dev/null
@@ -1,39 +0,0 @@
-Sockets Handler
-===============
-
-This handler allows you to write your logs to sockets using [fsockopen](http://php.net/fsockopen)
-or [pfsockopen](http://php.net/pfsockopen).
-
-Persistent sockets are mainly useful in web environments where you gain some performance not closing/opening
-the connections between requests.
-
-You can use a `unix://` prefix to access unix sockets and `udp://` to open UDP sockets instead of the default TCP.
-
-Basic Example
--------------
-
-```php
-setPersistent(true);
-
-// Now add the handler
-$logger->pushHandler($handler, Logger::DEBUG);
-
-// You can now use your logger
-$logger->addInfo('My logger is now ready');
-
-```
-
-In this example, using syslog-ng, you should see the log on the log server:
-
-    cweb1 [2012-02-26 00:12:03] my_logger.INFO: My logger is now ready [] []
-
diff --git a/mayor-orig/www/include/share/googleapi/monolog/monolog/phpunit.xml.dist b/mayor-orig/www/include/share/googleapi/monolog/monolog/phpunit.xml.dist
deleted file mode 100644
index 20d82b63..00000000
--- a/mayor-orig/www/include/share/googleapi/monolog/monolog/phpunit.xml.dist
+++ /dev/null
@@ -1,19 +0,0 @@
-
-
-
-    
-        
-            tests/Monolog/
-        
-    
-
-    
-        
-            src/Monolog/
-        
-    
-
-    
-        
-    
-
diff --git a/mayor-orig/www/include/share/googleapi/monolog/monolog/src/Monolog/ErrorHandler.php b/mayor-orig/www/include/share/googleapi/monolog/monolog/src/Monolog/ErrorHandler.php
deleted file mode 100644
index 7bfcd833..00000000
--- a/mayor-orig/www/include/share/googleapi/monolog/monolog/src/Monolog/ErrorHandler.php
+++ /dev/null
@@ -1,230 +0,0 @@
-
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Monolog;
-
-use Psr\Log\LoggerInterface;
-use Psr\Log\LogLevel;
-use Monolog\Handler\AbstractHandler;
-
-/**
- * Monolog error handler
- *
- * A facility to enable logging of runtime errors, exceptions and fatal errors.
- *
- * Quick setup: ErrorHandler::register($logger);
- *
- * @author Jordi Boggiano 
- */
-class ErrorHandler
-{
-    private $logger;
-
-    private $previousExceptionHandler;
-    private $uncaughtExceptionLevel;
-
-    private $previousErrorHandler;
-    private $errorLevelMap;
-    private $handleOnlyReportedErrors;
-
-    private $hasFatalErrorHandler;
-    private $fatalLevel;
-    private $reservedMemory;
-    private static $fatalErrors = array(E_ERROR, E_PARSE, E_CORE_ERROR, E_COMPILE_ERROR, E_USER_ERROR);
-
-    public function __construct(LoggerInterface $logger)
-    {
-        $this->logger = $logger;
-    }
-
-    /**
-     * Registers a new ErrorHandler for a given Logger
-     *
-     * By default it will handle errors, exceptions and fatal errors
-     *
-     * @param  LoggerInterface $logger
-     * @param  array|false     $errorLevelMap  an array of E_* constant to LogLevel::* constant mapping, or false to disable error handling
-     * @param  int|false       $exceptionLevel a LogLevel::* constant, or false to disable exception handling
-     * @param  int|false       $fatalLevel     a LogLevel::* constant, or false to disable fatal error handling
-     * @return ErrorHandler
-     */
-    public static function register(LoggerInterface $logger, $errorLevelMap = array(), $exceptionLevel = null, $fatalLevel = null)
-    {
-        //Forces the autoloader to run for LogLevel. Fixes an autoload issue at compile-time on PHP5.3. See https://github.com/Seldaek/monolog/pull/929
-        class_exists('\\Psr\\Log\\LogLevel', true);
-
-        $handler = new static($logger);
-        if ($errorLevelMap !== false) {
-            $handler->registerErrorHandler($errorLevelMap);
-        }
-        if ($exceptionLevel !== false) {
-            $handler->registerExceptionHandler($exceptionLevel);
-        }
-        if ($fatalLevel !== false) {
-            $handler->registerFatalHandler($fatalLevel);
-        }
-
-        return $handler;
-    }
-
-    public function registerExceptionHandler($level = null, $callPrevious = true)
-    {
-        $prev = set_exception_handler(array($this, 'handleException'));
-        $this->uncaughtExceptionLevel = $level;
-        if ($callPrevious && $prev) {
-            $this->previousExceptionHandler = $prev;
-        }
-    }
-
-    public function registerErrorHandler(array $levelMap = array(), $callPrevious = true, $errorTypes = -1, $handleOnlyReportedErrors = true)
-    {
-        $prev = set_error_handler(array($this, 'handleError'), $errorTypes);
-        $this->errorLevelMap = array_replace($this->defaultErrorLevelMap(), $levelMap);
-        if ($callPrevious) {
-            $this->previousErrorHandler = $prev ?: true;
-        }
-
-        $this->handleOnlyReportedErrors = $handleOnlyReportedErrors;
-    }
-
-    public function registerFatalHandler($level = null, $reservedMemorySize = 20)
-    {
-        register_shutdown_function(array($this, 'handleFatalError'));
-
-        $this->reservedMemory = str_repeat(' ', 1024 * $reservedMemorySize);
-        $this->fatalLevel = $level;
-        $this->hasFatalErrorHandler = true;
-    }
-
-    protected function defaultErrorLevelMap()
-    {
-        return array(
-            E_ERROR             => LogLevel::CRITICAL,
-            E_WARNING           => LogLevel::WARNING,
-            E_PARSE             => LogLevel::ALERT,
-            E_NOTICE            => LogLevel::NOTICE,
-            E_CORE_ERROR        => LogLevel::CRITICAL,
-            E_CORE_WARNING      => LogLevel::WARNING,
-            E_COMPILE_ERROR     => LogLevel::ALERT,
-            E_COMPILE_WARNING   => LogLevel::WARNING,
-            E_USER_ERROR        => LogLevel::ERROR,
-            E_USER_WARNING      => LogLevel::WARNING,
-            E_USER_NOTICE       => LogLevel::NOTICE,
-            E_STRICT            => LogLevel::NOTICE,
-            E_RECOVERABLE_ERROR => LogLevel::ERROR,
-            E_DEPRECATED        => LogLevel::NOTICE,
-            E_USER_DEPRECATED   => LogLevel::NOTICE,
-        );
-    }
-
-    /**
-     * @private
-     */
-    public function handleException($e)
-    {
-        $this->logger->log(
-            $this->uncaughtExceptionLevel === null ? LogLevel::ERROR : $this->uncaughtExceptionLevel,
-            sprintf('Uncaught Exception %s: "%s" at %s line %s', get_class($e), $e->getMessage(), $e->getFile(), $e->getLine()),
-            array('exception' => $e)
-        );
-
-        if ($this->previousExceptionHandler) {
-            call_user_func($this->previousExceptionHandler, $e);
-        }
-
-        exit(255);
-    }
-
-    /**
-     * @private
-     */
-    public function handleError($code, $message, $file = '', $line = 0, $context = array())
-    {
-        if ($this->handleOnlyReportedErrors && !(error_reporting() & $code)) {
-            return;
-        }
-
-        // fatal error codes are ignored if a fatal error handler is present as well to avoid duplicate log entries
-        if (!$this->hasFatalErrorHandler || !in_array($code, self::$fatalErrors, true)) {
-            $level = isset($this->errorLevelMap[$code]) ? $this->errorLevelMap[$code] : LogLevel::CRITICAL;
-            $this->logger->log($level, self::codeToString($code).': '.$message, array('code' => $code, 'message' => $message, 'file' => $file, 'line' => $line));
-        }
-
-        if ($this->previousErrorHandler === true) {
-            return false;
-        } elseif ($this->previousErrorHandler) {
-            return call_user_func($this->previousErrorHandler, $code, $message, $file, $line, $context);
-        }
-    }
-
-    /**
-     * @private
-     */
-    public function handleFatalError()
-    {
-        $this->reservedMemory = null;
-
-        $lastError = error_get_last();
-        if ($lastError && in_array($lastError['type'], self::$fatalErrors, true)) {
-            $this->logger->log(
-                $this->fatalLevel === null ? LogLevel::ALERT : $this->fatalLevel,
-                'Fatal Error ('.self::codeToString($lastError['type']).'): '.$lastError['message'],
-                array('code' => $lastError['type'], 'message' => $lastError['message'], 'file' => $lastError['file'], 'line' => $lastError['line'])
-            );
-
-            if ($this->logger instanceof Logger) {
-                foreach ($this->logger->getHandlers() as $handler) {
-                    if ($handler instanceof AbstractHandler) {
-                        $handler->close();
-                    }
-                }
-            }
-        }
-    }
-
-    private static function codeToString($code)
-    {
-        switch ($code) {
-            case E_ERROR:
-                return 'E_ERROR';
-            case E_WARNING:
-                return 'E_WARNING';
-            case E_PARSE:
-                return 'E_PARSE';
-            case E_NOTICE:
-                return 'E_NOTICE';
-            case E_CORE_ERROR:
-                return 'E_CORE_ERROR';
-            case E_CORE_WARNING:
-                return 'E_CORE_WARNING';
-            case E_COMPILE_ERROR:
-                return 'E_COMPILE_ERROR';
-            case E_COMPILE_WARNING:
-                return 'E_COMPILE_WARNING';
-            case E_USER_ERROR:
-                return 'E_USER_ERROR';
-            case E_USER_WARNING:
-                return 'E_USER_WARNING';
-            case E_USER_NOTICE:
-                return 'E_USER_NOTICE';
-            case E_STRICT:
-                return 'E_STRICT';
-            case E_RECOVERABLE_ERROR:
-                return 'E_RECOVERABLE_ERROR';
-            case E_DEPRECATED:
-                return 'E_DEPRECATED';
-            case E_USER_DEPRECATED:
-                return 'E_USER_DEPRECATED';
-        }
-
-        return 'Unknown PHP error';
-    }
-}
diff --git a/mayor-orig/www/include/share/googleapi/monolog/monolog/src/Monolog/Formatter/ChromePHPFormatter.php b/mayor-orig/www/include/share/googleapi/monolog/monolog/src/Monolog/Formatter/ChromePHPFormatter.php
deleted file mode 100644
index 9beda1e7..00000000
--- a/mayor-orig/www/include/share/googleapi/monolog/monolog/src/Monolog/Formatter/ChromePHPFormatter.php
+++ /dev/null
@@ -1,78 +0,0 @@
-
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Monolog\Formatter;
-
-use Monolog\Logger;
-
-/**
- * Formats a log message according to the ChromePHP array format
- *
- * @author Christophe Coevoet 
- */
-class ChromePHPFormatter implements FormatterInterface
-{
-    /**
-     * Translates Monolog log levels to Wildfire levels.
-     */
-    private $logLevels = array(
-        Logger::DEBUG     => 'log',
-        Logger::INFO      => 'info',
-        Logger::NOTICE    => 'info',
-        Logger::WARNING   => 'warn',
-        Logger::ERROR     => 'error',
-        Logger::CRITICAL  => 'error',
-        Logger::ALERT     => 'error',
-        Logger::EMERGENCY => 'error',
-    );
-
-    /**
-     * {@inheritdoc}
-     */
-    public function format(array $record)
-    {
-        // Retrieve the line and file if set and remove them from the formatted extra
-        $backtrace = 'unknown';
-        if (isset($record['extra']['file'], $record['extra']['line'])) {
-            $backtrace = $record['extra']['file'].' : '.$record['extra']['line'];
-            unset($record['extra']['file'], $record['extra']['line']);
-        }
-
-        $message = array('message' => $record['message']);
-        if ($record['context']) {
-            $message['context'] = $record['context'];
-        }
-        if ($record['extra']) {
-            $message['extra'] = $record['extra'];
-        }
-        if (count($message) === 1) {
-            $message = reset($message);
-        }
-
-        return array(
-            $record['channel'],
-            $message,
-            $backtrace,
-            $this->logLevels[$record['level']],
-        );
-    }
-
-    public function formatBatch(array $records)
-    {
-        $formatted = array();
-
-        foreach ($records as $record) {
-            $formatted[] = $this->format($record);
-        }
-
-        return $formatted;
-    }
-}
diff --git a/mayor-orig/www/include/share/googleapi/monolog/monolog/src/Monolog/Formatter/ElasticaFormatter.php b/mayor-orig/www/include/share/googleapi/monolog/monolog/src/Monolog/Formatter/ElasticaFormatter.php
deleted file mode 100644
index 4c556cf1..00000000
--- a/mayor-orig/www/include/share/googleapi/monolog/monolog/src/Monolog/Formatter/ElasticaFormatter.php
+++ /dev/null
@@ -1,89 +0,0 @@
-
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Monolog\Formatter;
-
-use Elastica\Document;
-
-/**
- * Format a log message into an Elastica Document
- *
- * @author Jelle Vink 
- */
-class ElasticaFormatter extends NormalizerFormatter
-{
-    /**
-     * @var string Elastic search index name
-     */
-    protected $index;
-
-    /**
-     * @var string Elastic search document type
-     */
-    protected $type;
-
-    /**
-     * @param string $index Elastic Search index name
-     * @param string $type  Elastic Search document type
-     */
-    public function __construct($index, $type)
-    {
-        // elasticsearch requires a ISO 8601 format date with optional millisecond precision.
-        parent::__construct('Y-m-d\TH:i:s.uP');
-
-        $this->index = $index;
-        $this->type = $type;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function format(array $record)
-    {
-        $record = parent::format($record);
-
-        return $this->getDocument($record);
-    }
-
-    /**
-     * Getter index
-     * @return string
-     */
-    public function getIndex()
-    {
-        return $this->index;
-    }
-
-    /**
-     * Getter type
-     * @return string
-     */
-    public function getType()
-    {
-        return $this->type;
-    }
-
-    /**
-     * Convert a log message into an Elastica Document
-     *
-     * @param  array    $record Log message
-     * @return Document
-     */
-    protected function getDocument($record)
-    {
-        $document = new Document();
-        $document->setData($record);
-        $document->setType($this->type);
-        $document->setIndex($this->index);
-
-        return $document;
-    }
-}
diff --git a/mayor-orig/www/include/share/googleapi/monolog/monolog/src/Monolog/Formatter/FlowdockFormatter.php b/mayor-orig/www/include/share/googleapi/monolog/monolog/src/Monolog/Formatter/FlowdockFormatter.php
deleted file mode 100644
index 5094af3c..00000000
--- a/mayor-orig/www/include/share/googleapi/monolog/monolog/src/Monolog/Formatter/FlowdockFormatter.php
+++ /dev/null
@@ -1,116 +0,0 @@
-
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Monolog\Formatter;
-
-/**
- * formats the record to be used in the FlowdockHandler
- *
- * @author Dominik Liebler 
- */
-class FlowdockFormatter implements FormatterInterface
-{
-    /**
-     * @var string
-     */
-    private $source;
-
-    /**
-     * @var string
-     */
-    private $sourceEmail;
-
-    /**
-     * @param string $source
-     * @param string $sourceEmail
-     */
-    public function __construct($source, $sourceEmail)
-    {
-        $this->source = $source;
-        $this->sourceEmail = $sourceEmail;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function format(array $record)
-    {
-        $tags = array(
-            '#logs',
-            '#' . strtolower($record['level_name']),
-            '#' . $record['channel'],
-        );
-
-        foreach ($record['extra'] as $value) {
-            $tags[] = '#' . $value;
-        }
-
-        $subject = sprintf(
-            'in %s: %s - %s',
-            $this->source,
-            $record['level_name'],
-            $this->getShortMessage($record['message'])
-        );
-
-        $record['flowdock'] = array(
-            'source' => $this->source,
-            'from_address' => $this->sourceEmail,
-            'subject' => $subject,
-            'content' => $record['message'],
-            'tags' => $tags,
-            'project' => $this->source,
-        );
-
-        return $record;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function formatBatch(array $records)
-    {
-        $formatted = array();
-
-        foreach ($records as $record) {
-            $formatted[] = $this->format($record);
-        }
-
-        return $formatted;
-    }
-
-    /**
-     * @param string $message
-     *
-     * @return string
-     */
-    public function getShortMessage($message)
-    {
-        static $hasMbString;
-
-        if (null === $hasMbString) {
-            $hasMbString = function_exists('mb_strlen');
-        }
-
-        $maxLength = 45;
-
-        if ($hasMbString) {
-            if (mb_strlen($message, 'UTF-8') > $maxLength) {
-                $message = mb_substr($message, 0, $maxLength - 4, 'UTF-8') . ' ...';
-            }
-        } else {
-            if (strlen($message) > $maxLength) {
-                $message = substr($message, 0, $maxLength - 4) . ' ...';
-            }
-        }
-
-        return $message;
-    }
-}
diff --git a/mayor-orig/www/include/share/googleapi/monolog/monolog/src/Monolog/Formatter/FluentdFormatter.php b/mayor-orig/www/include/share/googleapi/monolog/monolog/src/Monolog/Formatter/FluentdFormatter.php
deleted file mode 100644
index 02632bb5..00000000
--- a/mayor-orig/www/include/share/googleapi/monolog/monolog/src/Monolog/Formatter/FluentdFormatter.php
+++ /dev/null
@@ -1,85 +0,0 @@
-
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Monolog\Formatter;
-
-/**
- * Class FluentdFormatter
- *
- * Serializes a log message to Fluentd unix socket protocol
- *
- * Fluentd config:
- *
- * 
- *  type unix
- *  path /var/run/td-agent/td-agent.sock
- * 
- *
- * Monolog setup:
- *
- * $logger = new Monolog\Logger('fluent.tag');
- * $fluentHandler = new Monolog\Handler\SocketHandler('unix:///var/run/td-agent/td-agent.sock');
- * $fluentHandler->setFormatter(new Monolog\Formatter\FluentdFormatter());
- * $logger->pushHandler($fluentHandler);
- *
- * @author Andrius Putna 
- */
-class FluentdFormatter implements FormatterInterface
-{
-    /**
-     * @var bool $levelTag should message level be a part of the fluentd tag
-     */
-    protected $levelTag = false;
-
-    public function __construct($levelTag = false)
-    {
-        if (!function_exists('json_encode')) {
-            throw new \RuntimeException('PHP\'s json extension is required to use Monolog\'s FluentdUnixFormatter');
-        }
-
-        $this->levelTag = (bool) $levelTag;
-    }
-
-    public function isUsingLevelsInTag()
-    {
-        return $this->levelTag;
-    }
-
-    public function format(array $record)
-    {
-        $tag = $record['channel'];
-        if ($this->levelTag) {
-            $tag .= '.' . strtolower($record['level_name']);
-        }
-
-        $message = array(
-            'message' => $record['message'],
-            'extra' => $record['extra'],
-        );
-
-        if (!$this->levelTag) {
-            $message['level'] = $record['level'];
-            $message['level_name'] = $record['level_name'];
-        }
-
-        return json_encode(array($tag, $record['datetime']->getTimestamp(), $message));
-    }
-
-    public function formatBatch(array $records)
-    {
-        $message = '';
-        foreach ($records as $record) {
-            $message .= $this->format($record);
-        }
-
-        return $message;
-    }
-}
diff --git a/mayor-orig/www/include/share/googleapi/monolog/monolog/src/Monolog/Formatter/FormatterInterface.php b/mayor-orig/www/include/share/googleapi/monolog/monolog/src/Monolog/Formatter/FormatterInterface.php
deleted file mode 100644
index b5de7511..00000000
--- a/mayor-orig/www/include/share/googleapi/monolog/monolog/src/Monolog/Formatter/FormatterInterface.php
+++ /dev/null
@@ -1,36 +0,0 @@
-
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Monolog\Formatter;
-
-/**
- * Interface for formatters
- *
- * @author Jordi Boggiano 
- */
-interface FormatterInterface
-{
-    /**
-     * Formats a log record.
-     *
-     * @param  array $record A record to format
-     * @return mixed The formatted record
-     */
-    public function format(array $record);
-
-    /**
-     * Formats a set of log records.
-     *
-     * @param  array $records A set of records to format
-     * @return mixed The formatted set of records
-     */
-    public function formatBatch(array $records);
-}
diff --git a/mayor-orig/www/include/share/googleapi/monolog/monolog/src/Monolog/Formatter/GelfMessageFormatter.php b/mayor-orig/www/include/share/googleapi/monolog/monolog/src/Monolog/Formatter/GelfMessageFormatter.php
deleted file mode 100644
index 2c1b0e86..00000000
--- a/mayor-orig/www/include/share/googleapi/monolog/monolog/src/Monolog/Formatter/GelfMessageFormatter.php
+++ /dev/null
@@ -1,138 +0,0 @@
-
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Monolog\Formatter;
-
-use Monolog\Logger;
-use Gelf\Message;
-
-/**
- * Serializes a log message to GELF
- * @see http://www.graylog2.org/about/gelf
- *
- * @author Matt Lehner 
- */
-class GelfMessageFormatter extends NormalizerFormatter
-{
-    const DEFAULT_MAX_LENGTH = 32766;
-
-    /**
-     * @var string the name of the system for the Gelf log message
-     */
-    protected $systemName;
-
-    /**
-     * @var string a prefix for 'extra' fields from the Monolog record (optional)
-     */
-    protected $extraPrefix;
-
-    /**
-     * @var string a prefix for 'context' fields from the Monolog record (optional)
-     */
-    protected $contextPrefix;
-
-    /**
-     * @var int max length per field
-     */
-    protected $maxLength;
-
-    /**
-     * Translates Monolog log levels to Graylog2 log priorities.
-     */
-    private $logLevels = array(
-        Logger::DEBUG     => 7,
-        Logger::INFO      => 6,
-        Logger::NOTICE    => 5,
-        Logger::WARNING   => 4,
-        Logger::ERROR     => 3,
-        Logger::CRITICAL  => 2,
-        Logger::ALERT     => 1,
-        Logger::EMERGENCY => 0,
-    );
-
-    public function __construct($systemName = null, $extraPrefix = null, $contextPrefix = 'ctxt_', $maxLength = null)
-    {
-        parent::__construct('U.u');
-
-        $this->systemName = $systemName ?: gethostname();
-
-        $this->extraPrefix = $extraPrefix;
-        $this->contextPrefix = $contextPrefix;
-        $this->maxLength = is_null($maxLength) ? self::DEFAULT_MAX_LENGTH : $maxLength;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function format(array $record)
-    {
-        $record = parent::format($record);
-
-        if (!isset($record['datetime'], $record['message'], $record['level'])) {
-            throw new \InvalidArgumentException('The record should at least contain datetime, message and level keys, '.var_export($record, true).' given');
-        }
-
-        $message = new Message();
-        $message
-            ->setTimestamp($record['datetime'])
-            ->setShortMessage((string) $record['message'])
-            ->setHost($this->systemName)
-            ->setLevel($this->logLevels[$record['level']]);
-
-        // message length + system name length + 200 for padding / metadata 
-        $len = 200 + strlen((string) $record['message']) + strlen($this->systemName);
-
-        if ($len > $this->maxLength) {
-            $message->setShortMessage(substr($record['message'], 0, $this->maxLength));
-        }
-
-        if (isset($record['channel'])) {
-            $message->setFacility($record['channel']);
-        }
-        if (isset($record['extra']['line'])) {
-            $message->setLine($record['extra']['line']);
-            unset($record['extra']['line']);
-        }
-        if (isset($record['extra']['file'])) {
-            $message->setFile($record['extra']['file']);
-            unset($record['extra']['file']);
-        }
-
-        foreach ($record['extra'] as $key => $val) {
-            $val = is_scalar($val) || null === $val ? $val : $this->toJson($val);
-            $len = strlen($this->extraPrefix . $key . $val);
-            if ($len > $this->maxLength) {
-                $message->setAdditional($this->extraPrefix . $key, substr($val, 0, $this->maxLength));
-                break;
-            }
-            $message->setAdditional($this->extraPrefix . $key, $val);
-        }
-
-        foreach ($record['context'] as $key => $val) {
-            $val = is_scalar($val) || null === $val ? $val : $this->toJson($val);
-            $len = strlen($this->contextPrefix . $key . $val);
-            if ($len > $this->maxLength) {
-                $message->setAdditional($this->contextPrefix . $key, substr($val, 0, $this->maxLength));
-                break;
-            }
-            $message->setAdditional($this->contextPrefix . $key, $val);
-        }
-
-        if (null === $message->getFile() && isset($record['context']['exception']['file'])) {
-            if (preg_match("/^(.+):([0-9]+)$/", $record['context']['exception']['file'], $matches)) {
-                $message->setFile($matches[1]);
-                $message->setLine($matches[2]);
-            }
-        }
-
-        return $message;
-    }
-}
diff --git a/mayor-orig/www/include/share/googleapi/monolog/monolog/src/Monolog/Formatter/HtmlFormatter.php b/mayor-orig/www/include/share/googleapi/monolog/monolog/src/Monolog/Formatter/HtmlFormatter.php
deleted file mode 100644
index 3eec95f6..00000000
--- a/mayor-orig/www/include/share/googleapi/monolog/monolog/src/Monolog/Formatter/HtmlFormatter.php
+++ /dev/null
@@ -1,141 +0,0 @@
-
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Monolog\Formatter;
-
-use Monolog\Logger;
-
-/**
- * Formats incoming records into an HTML table
- *
- * This is especially useful for html email logging
- *
- * @author Tiago Brito 
- */
-class HtmlFormatter extends NormalizerFormatter
-{
-    /**
-     * Translates Monolog log levels to html color priorities.
-     */
-    protected $logLevels = array(
-        Logger::DEBUG     => '#cccccc',
-        Logger::INFO      => '#468847',
-        Logger::NOTICE    => '#3a87ad',
-        Logger::WARNING   => '#c09853',
-        Logger::ERROR     => '#f0ad4e',
-        Logger::CRITICAL  => '#FF7708',
-        Logger::ALERT     => '#C12A19',
-        Logger::EMERGENCY => '#000000',
-    );
-
-    /**
-     * @param string $dateFormat The format of the timestamp: one supported by DateTime::format
-     */
-    public function __construct($dateFormat = null)
-    {
-        parent::__construct($dateFormat);
-    }
-
-    /**
-     * Creates an HTML table row
-     *
-     * @param  string $th       Row header content
-     * @param  string $td       Row standard cell content
-     * @param  bool   $escapeTd false if td content must not be html escaped
-     * @return string
-     */
-    protected function addRow($th, $td = ' ', $escapeTd = true)
-    {
-        $th = htmlspecialchars($th, ENT_NOQUOTES, 'UTF-8');
-        if ($escapeTd) {
-            $td = '
'.htmlspecialchars($td, ENT_NOQUOTES, 'UTF-8').'
';
-        }
-
-        return "\n$th:\n".$td."\n";
-    }
-
-    /**
-     * Create a HTML h1 tag
-     *
-     * @param  string $title Text to be in the h1
-     * @param  int    $level Error level
-     * @return string
-     */
-    protected function addTitle($title, $level)
-    {
-        $title = htmlspecialchars($title, ENT_NOQUOTES, 'UTF-8');
-
-        return '
'.$title.'
';
-    }
-
-    /**
-     * Formats a log record.
-     *
-     * @param  array $record A record to format
-     * @return mixed The formatted record
-     */
-    public function format(array $record)
-    {
-        $output = $this->addTitle($record['level_name'], $record['level']);
-        $output .= '';
-
-        $output .= $this->addRow('Message', (string) $record['message']);
-        $output .= $this->addRow('Time', $record['datetime']->format($this->dateFormat));
-        $output .= $this->addRow('Channel', $record['channel']);
-        if ($record['context']) {
-            $embeddedTable = '
';
-            foreach ($record['context'] as $key => $value) {
-                $embeddedTable .= $this->addRow($key, $this->convertToString($value));
-            }
-            $embeddedTable .= '
';
-            $output .= $this->addRow('Context', $embeddedTable, false);
-        }
-        if ($record['extra']) {
-            $embeddedTable = '';
-            foreach ($record['extra'] as $key => $value) {
-                $embeddedTable .= $this->addRow($key, $this->convertToString($value));
-            }
-            $embeddedTable .= '
';
-            $output .= $this->addRow('Extra', $embeddedTable, false);
-        }
-
-        return $output.'';
-    }
-
-    /**
-     * Formats a set of log records.
-     *
-     * @param  array $records A set of records to format
-     * @return mixed The formatted set of records
-     */
-    public function formatBatch(array $records)
-    {
-        $message = '';
-        foreach ($records as $record) {
-            $message .= $this->format($record);
-        }
-
-        return $message;
-    }
-
-    protected function convertToString($data)
-    {
-        if (null === $data || is_scalar($data)) {
-            return (string) $data;
-        }
-
-        $data = $this->normalize($data);
-        if (version_compare(PHP_VERSION, '5.4.0', '>=')) {
-            return json_encode($data, JSON_PRETTY_PRINT | JSON_UNESCAPED_SLASHES | JSON_UNESCAPED_UNICODE);
-        }
-
-        return str_replace('\\/', '/', json_encode($data));
-    }
-}
diff --git a/mayor-orig/www/include/share/googleapi/monolog/monolog/src/Monolog/Formatter/JsonFormatter.php b/mayor-orig/www/include/share/googleapi/monolog/monolog/src/Monolog/Formatter/JsonFormatter.php
deleted file mode 100644
index 0782f149..00000000
--- a/mayor-orig/www/include/share/googleapi/monolog/monolog/src/Monolog/Formatter/JsonFormatter.php
+++ /dev/null
@@ -1,208 +0,0 @@
-
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Monolog\Formatter;
-
-use Exception;
-use Throwable;
-
-/**
- * Encodes whatever record data is passed to it as json
- *
- * This can be useful to log to databases or remote APIs
- *
- * @author Jordi Boggiano 
- */
-class JsonFormatter extends NormalizerFormatter
-{
-    const BATCH_MODE_JSON = 1;
-    const BATCH_MODE_NEWLINES = 2;
-
-    protected $batchMode;
-    protected $appendNewline;
-
-    /**
-     * @var bool
-     */
-    protected $includeStacktraces = false;
-
-    /**
-     * @param int $batchMode
-     * @param bool $appendNewline
-     */
-    public function __construct($batchMode = self::BATCH_MODE_JSON, $appendNewline = true)
-    {
-        $this->batchMode = $batchMode;
-        $this->appendNewline = $appendNewline;
-    }
-
-    /**
-     * The batch mode option configures the formatting style for
-     * multiple records. By default, multiple records will be
-     * formatted as a JSON-encoded array. However, for
-     * compatibility with some API endpoints, alternative styles
-     * are available.
-     *
-     * @return int
-     */
-    public function getBatchMode()
-    {
-        return $this->batchMode;
-    }
-
-    /**
-     * True if newlines are appended to every formatted record
-     *
-     * @return bool
-     */
-    public function isAppendingNewlines()
-    {
-        return $this->appendNewline;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function format(array $record)
-    {
-        return $this->toJson($this->normalize($record), true) . ($this->appendNewline ? "\n" : '');
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function formatBatch(array $records)
-    {
-        switch ($this->batchMode) {
-            case static::BATCH_MODE_NEWLINES:
-                return $this->formatBatchNewlines($records);
-
-            case static::BATCH_MODE_JSON:
-            default:
-                return $this->formatBatchJson($records);
-        }
-    }
-
-    /**
-     * @param bool $include
-     */
-    public function includeStacktraces($include = true)
-    {
-        $this->includeStacktraces = $include;
-    }
-
-    /**
-     * Return a JSON-encoded array of records.
-     *
-     * @param  array  $records
-     * @return string
-     */
-    protected function formatBatchJson(array $records)
-    {
-        return $this->toJson($this->normalize($records), true);
-    }
-
-    /**
-     * Use new lines to separate records instead of a
-     * JSON-encoded array.
-     *
-     * @param  array  $records
-     * @return string
-     */
-    protected function formatBatchNewlines(array $records)
-    {
-        $instance = $this;
-
-        $oldNewline = $this->appendNewline;
-        $this->appendNewline = false;
-        array_walk($records, function (&$value, $key) use ($instance) {
-            $value = $instance->format($value);
-        });
-        $this->appendNewline = $oldNewline;
-
-        return implode("\n", $records);
-    }
-
-    /**
-     * Normalizes given $data.
-     *
-     * @param mixed $data
-     *
-     * @return mixed
-     */
-    protected function normalize($data)
-    {
-        if (is_array($data) || $data instanceof \Traversable) {
-            $normalized = array();
-
-            $count = 1;
-            foreach ($data as $key => $value) {
-                if ($count++ >= 1000) {
-                    $normalized['...'] = 'Over 1000 items, aborting normalization';
-                    break;
-                }
-                $normalized[$key] = $this->normalize($value);
-            }
-
-            return $normalized;
-        }
-
-        if ($data instanceof Exception || $data instanceof Throwable) {
-            return $this->normalizeException($data);
-        }
-
-        return $data;
-    }
-
-    /**
-     * Normalizes given exception with or without its own stack trace based on
-     * `includeStacktraces` property.
-     *
-     * @param Exception|Throwable $e
-     *
-     * @return array
-     */
-    protected function normalizeException($e)
-    {
-        // TODO 2.0 only check for Throwable
-        if (!$e instanceof Exception && !$e instanceof Throwable) {
-            throw new \InvalidArgumentException('Exception/Throwable expected, got '.gettype($e).' / '.get_class($e));
-        }
-
-        $data = array(
-            'class' => get_class($e),
-            'message' => $e->getMessage(),
-            'code' => $e->getCode(),
-            'file' => $e->getFile().':'.$e->getLine(),
-        );
-
-        if ($this->includeStacktraces) {
-            $trace = $e->getTrace();
-            foreach ($trace as $frame) {
-                if (isset($frame['file'])) {
-                    $data['trace'][] = $frame['file'].':'.$frame['line'];
-                } elseif (isset($frame['function']) && $frame['function'] === '{closure}') {
-                    // We should again normalize the frames, because it might contain invalid items
-                    $data['trace'][] = $frame['function'];
-                } else {
-                    // We should again normalize the frames, because it might contain invalid items
-                    $data['trace'][] = $this->normalize($frame);
-                }
-            }
-        }
-
-        if ($previous = $e->getPrevious()) {
-            $data['previous'] = $this->normalizeException($previous);
-        }
-
-        return $data;
-    }
-}
diff --git a/mayor-orig/www/include/share/googleapi/monolog/monolog/src/Monolog/Formatter/LineFormatter.php b/mayor-orig/www/include/share/googleapi/monolog/monolog/src/Monolog/Formatter/LineFormatter.php
deleted file mode 100644
index d3e209e6..00000000
--- a/mayor-orig/www/include/share/googleapi/monolog/monolog/src/Monolog/Formatter/LineFormatter.php
+++ /dev/null
@@ -1,179 +0,0 @@
-
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Monolog\Formatter;
-
-/**
- * Formats incoming records into a one-line string
- *
- * This is especially useful for logging to files
- *
- * @author Jordi Boggiano 
- * @author Christophe Coevoet 
- */
-class LineFormatter extends NormalizerFormatter
-{
-    const SIMPLE_FORMAT = "[%datetime%] %channel%.%level_name%: %message% %context% %extra%\n";
-
-    protected $format;
-    protected $allowInlineLineBreaks;
-    protected $ignoreEmptyContextAndExtra;
-    protected $includeStacktraces;
-
-    /**
-     * @param string $format                     The format of the message
-     * @param string $dateFormat                 The format of the timestamp: one supported by DateTime::format
-     * @param bool   $allowInlineLineBreaks      Whether to allow inline line breaks in log entries
-     * @param bool   $ignoreEmptyContextAndExtra
-     */
-    public function __construct($format = null, $dateFormat = null, $allowInlineLineBreaks = false, $ignoreEmptyContextAndExtra = false)
-    {
-        $this->format = $format ?: static::SIMPLE_FORMAT;
-        $this->allowInlineLineBreaks = $allowInlineLineBreaks;
-        $this->ignoreEmptyContextAndExtra = $ignoreEmptyContextAndExtra;
-        parent::__construct($dateFormat);
-    }
-
-    public function includeStacktraces($include = true)
-    {
-        $this->includeStacktraces = $include;
-        if ($this->includeStacktraces) {
-            $this->allowInlineLineBreaks = true;
-        }
-    }
-
-    public function allowInlineLineBreaks($allow = true)
-    {
-        $this->allowInlineLineBreaks = $allow;
-    }
-
-    public function ignoreEmptyContextAndExtra($ignore = true)
-    {
-        $this->ignoreEmptyContextAndExtra = $ignore;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function format(array $record)
-    {
-        $vars = parent::format($record);
-
-        $output = $this->format;
-
-        foreach ($vars['extra'] as $var => $val) {
-            if (false !== strpos($output, '%extra.'.$var.'%')) {
-                $output = str_replace('%extra.'.$var.'%', $this->stringify($val), $output);
-                unset($vars['extra'][$var]);
-            }
-        }
-
-
-        foreach ($vars['context'] as $var => $val) {
-            if (false !== strpos($output, '%context.'.$var.'%')) {
-                $output = str_replace('%context.'.$var.'%', $this->stringify($val), $output);
-                unset($vars['context'][$var]);
-            }
-        }
-
-        if ($this->ignoreEmptyContextAndExtra) {
-            if (empty($vars['context'])) {
-                unset($vars['context']);
-                $output = str_replace('%context%', '', $output);
-            }
-
-            if (empty($vars['extra'])) {
-                unset($vars['extra']);
-                $output = str_replace('%extra%', '', $output);
-            }
-        }
-
-        foreach ($vars as $var => $val) {
-            if (false !== strpos($output, '%'.$var.'%')) {
-                $output = str_replace('%'.$var.'%', $this->stringify($val), $output);
-            }
-        }
-
-        // remove leftover %extra.xxx% and %context.xxx% if any
-        if (false !== strpos($output, '%')) {
-            $output = preg_replace('/%(?:extra|context)\..+?%/', '', $output);
-        }
-
-        return $output;
-    }
-
-    public function formatBatch(array $records)
-    {
-        $message = '';
-        foreach ($records as $record) {
-            $message .= $this->format($record);
-        }
-
-        return $message;
-    }
-
-    public function stringify($value)
-    {
-        return $this->replaceNewlines($this->convertToString($value));
-    }
-
-    protected function normalizeException($e)
-    {
-        // TODO 2.0 only check for Throwable
-        if (!$e instanceof \Exception && !$e instanceof \Throwable) {
-            throw new \InvalidArgumentException('Exception/Throwable expected, got '.gettype($e).' / '.get_class($e));
-        }
-
-        $previousText = '';
-        if ($previous = $e->getPrevious()) {
-            do {
-                $previousText .= ', '.get_class($previous).'(code: '.$previous->getCode().'): '.$previous->getMessage().' at '.$previous->getFile().':'.$previous->getLine();
-            } while ($previous = $previous->getPrevious());
-        }
-
-        $str = '[object] ('.get_class($e).'(code: '.$e->getCode().'): '.$e->getMessage().' at '.$e->getFile().':'.$e->getLine().$previousText.')';
-        if ($this->includeStacktraces) {
-            $str .= "\n[stacktrace]\n".$e->getTraceAsString()."\n";
-        }
-
-        return $str;
-    }
-
-    protected function convertToString($data)
-    {
-        if (null === $data || is_bool($data)) {
-            return var_export($data, true);
-        }
-
-        if (is_scalar($data)) {
-            return (string) $data;
-        }
-
-        if (version_compare(PHP_VERSION, '5.4.0', '>=')) {
-            return $this->toJson($data, true);
-        }
-
-        return str_replace('\\/', '/', @json_encode($data));
-    }
-
-    protected function replaceNewlines($str)
-    {
-        if ($this->allowInlineLineBreaks) {
-            if (0 === strpos($str, '{')) {
-                return str_replace(array('\r', '\n'), array("\r", "\n"), $str);
-            }
-
-            return $str;
-        }
-
-        return str_replace(array("\r\n", "\r", "\n"), ' ', $str);
-    }
-}
diff --git a/mayor-orig/www/include/share/googleapi/monolog/monolog/src/Monolog/Formatter/LogglyFormatter.php b/mayor-orig/www/include/share/googleapi/monolog/monolog/src/Monolog/Formatter/LogglyFormatter.php
deleted file mode 100644
index 401859bb..00000000
--- a/mayor-orig/www/include/share/googleapi/monolog/monolog/src/Monolog/Formatter/LogglyFormatter.php
+++ /dev/null
@@ -1,47 +0,0 @@
-
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Monolog\Formatter;
-
-/**
- * Encodes message information into JSON in a format compatible with Loggly.
- *
- * @author Adam Pancutt 
- */
-class LogglyFormatter extends JsonFormatter
-{
-    /**
-     * Overrides the default batch mode to new lines for compatibility with the
-     * Loggly bulk API.
-     *
-     * @param int $batchMode
-     */
-    public function __construct($batchMode = self::BATCH_MODE_NEWLINES, $appendNewline = false)
-    {
-        parent::__construct($batchMode, $appendNewline);
-    }
-
-    /**
-     * Appends the 'timestamp' parameter for indexing by Loggly.
-     *
-     * @see https://www.loggly.com/docs/automated-parsing/#json
-     * @see \Monolog\Formatter\JsonFormatter::format()
-     */
-    public function format(array $record)
-    {
-        if (isset($record["datetime"]) && ($record["datetime"] instanceof \DateTime)) {
-            $record["timestamp"] = $record["datetime"]->format("Y-m-d\TH:i:s.uO");
-            // TODO 2.0 unset the 'datetime' parameter, retained for BC
-        }
-
-        return parent::format($record);
-    }
-}
diff --git a/mayor-orig/www/include/share/googleapi/monolog/monolog/src/Monolog/Formatter/LogstashFormatter.php b/mayor-orig/www/include/share/googleapi/monolog/monolog/src/Monolog/Formatter/LogstashFormatter.php
deleted file mode 100644
index 8f83bec0..00000000
--- a/mayor-orig/www/include/share/googleapi/monolog/monolog/src/Monolog/Formatter/LogstashFormatter.php
+++ /dev/null
@@ -1,166 +0,0 @@
-
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Monolog\Formatter;
-
-/**
- * Serializes a log message to Logstash Event Format
- *
- * @see http://logstash.net/
- * @see https://github.com/logstash/logstash/blob/master/lib/logstash/event.rb
- *
- * @author Tim Mower 
- */
-class LogstashFormatter extends NormalizerFormatter
-{
-    const V0 = 0;
-    const V1 = 1;
-
-    /**
-     * @var string the name of the system for the Logstash log message, used to fill the @source field
-     */
-    protected $systemName;
-
-    /**
-     * @var string an application name for the Logstash log message, used to fill the @type field
-     */
-    protected $applicationName;
-
-    /**
-     * @var string a prefix for 'extra' fields from the Monolog record (optional)
-     */
-    protected $extraPrefix;
-
-    /**
-     * @var string a prefix for 'context' fields from the Monolog record (optional)
-     */
-    protected $contextPrefix;
-
-    /**
-     * @var int logstash format version to use
-     */
-    protected $version;
-
-    /**
-     * @param string $applicationName the application that sends the data, used as the "type" field of logstash
-     * @param string $systemName      the system/machine name, used as the "source" field of logstash, defaults to the hostname of the machine
-     * @param string $extraPrefix     prefix for extra keys inside logstash "fields"
-     * @param string $contextPrefix   prefix for context keys inside logstash "fields", defaults to ctxt_
-     * @param int    $version         the logstash format version to use, defaults to 0
-     */
-    public function __construct($applicationName, $systemName = null, $extraPrefix = null, $contextPrefix = 'ctxt_', $version = self::V0)
-    {
-        // logstash requires a ISO 8601 format date with optional millisecond precision.
-        parent::__construct('Y-m-d\TH:i:s.uP');
-
-        $this->systemName = $systemName ?: gethostname();
-        $this->applicationName = $applicationName;
-        $this->extraPrefix = $extraPrefix;
-        $this->contextPrefix = $contextPrefix;
-        $this->version = $version;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function format(array $record)
-    {
-        $record = parent::format($record);
-
-        if ($this->version === self::V1) {
-            $message = $this->formatV1($record);
-        } else {
-            $message = $this->formatV0($record);
-        }
-
-        return $this->toJson($message) . "\n";
-    }
-
-    protected function formatV0(array $record)
-    {
-        if (empty($record['datetime'])) {
-            $record['datetime'] = gmdate('c');
-        }
-        $message = array(
-            '@timestamp' => $record['datetime'],
-            '@source' => $this->systemName,
-            '@fields' => array(),
-        );
-        if (isset($record['message'])) {
-            $message['@message'] = $record['message'];
-        }
-        if (isset($record['channel'])) {
-            $message['@tags'] = array($record['channel']);
-            $message['@fields']['channel'] = $record['channel'];
-        }
-        if (isset($record['level'])) {
-            $message['@fields']['level'] = $record['level'];
-        }
-        if ($this->applicationName) {
-            $message['@type'] = $this->applicationName;
-        }
-        if (isset($record['extra']['server'])) {
-            $message['@source_host'] = $record['extra']['server'];
-        }
-        if (isset($record['extra']['url'])) {
-            $message['@source_path'] = $record['extra']['url'];
-        }
-        if (!empty($record['extra'])) {
-            foreach ($record['extra'] as $key => $val) {
-                $message['@fields'][$this->extraPrefix . $key] = $val;
-            }
-        }
-        if (!empty($record['context'])) {
-            foreach ($record['context'] as $key => $val) {
-                $message['@fields'][$this->contextPrefix . $key] = $val;
-            }
-        }
-
-        return $message;
-    }
-
-    protected function formatV1(array $record)
-    {
-        if (empty($record['datetime'])) {
-            $record['datetime'] = gmdate('c');
-        }
-        $message = array(
-            '@timestamp' => $record['datetime'],
-            '@version' => 1,
-            'host' => $this->systemName,
-        );
-        if (isset($record['message'])) {
-            $message['message'] = $record['message'];
-        }
-        if (isset($record['channel'])) {
-            $message['type'] = $record['channel'];
-            $message['channel'] = $record['channel'];
-        }
-        if (isset($record['level_name'])) {
-            $message['level'] = $record['level_name'];
-        }
-        if ($this->applicationName) {
-            $message['type'] = $this->applicationName;
-        }
-        if (!empty($record['extra'])) {
-            foreach ($record['extra'] as $key => $val) {
-                $message[$this->extraPrefix . $key] = $val;
-            }
-        }
-        if (!empty($record['context'])) {
-            foreach ($record['context'] as $key => $val) {
-                $message[$this->contextPrefix . $key] = $val;
-            }
-        }
-
-        return $message;
-    }
-}
diff --git a/mayor-orig/www/include/share/googleapi/monolog/monolog/src/Monolog/Formatter/MongoDBFormatter.php b/mayor-orig/www/include/share/googleapi/monolog/monolog/src/Monolog/Formatter/MongoDBFormatter.php
deleted file mode 100644
index eb067bb7..00000000
--- a/mayor-orig/www/include/share/googleapi/monolog/monolog/src/Monolog/Formatter/MongoDBFormatter.php
+++ /dev/null
@@ -1,105 +0,0 @@
-
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Monolog\Formatter;
-
-/**
- * Formats a record for use with the MongoDBHandler.
- *
- * @author Florian Plattner 
- */
-class MongoDBFormatter implements FormatterInterface
-{
-    private $exceptionTraceAsString;
-    private $maxNestingLevel;
-
-    /**
-     * @param int  $maxNestingLevel        0 means infinite nesting, the $record itself is level 1, $record['context'] is 2
-     * @param bool $exceptionTraceAsString set to false to log exception traces as a sub documents instead of strings
-     */
-    public function __construct($maxNestingLevel = 3, $exceptionTraceAsString = true)
-    {
-        $this->maxNestingLevel = max($maxNestingLevel, 0);
-        $this->exceptionTraceAsString = (bool) $exceptionTraceAsString;
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public function format(array $record)
-    {
-        return $this->formatArray($record);
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public function formatBatch(array $records)
-    {
-        foreach ($records as $key => $record) {
-            $records[$key] = $this->format($record);
-        }
-
-        return $records;
-    }
-
-    protected function formatArray(array $record, $nestingLevel = 0)
-    {
-        if ($this->maxNestingLevel == 0 || $nestingLevel <= $this->maxNestingLevel) {
-            foreach ($record as $name => $value) {
-                if ($value instanceof \DateTime) {
-                    $record[$name] = $this->formatDate($value, $nestingLevel + 1);
-                } elseif ($value instanceof \Exception) {
-                    $record[$name] = $this->formatException($value, $nestingLevel + 1);
-                } elseif (is_array($value)) {
-                    $record[$name] = $this->formatArray($value, $nestingLevel + 1);
-                } elseif (is_object($value)) {
-                    $record[$name] = $this->formatObject($value, $nestingLevel + 1);
-                }
-            }
-        } else {
-            $record = '[...]';
-        }
-
-        return $record;
-    }
-
-    protected function formatObject($value, $nestingLevel)
-    {
-        $objectVars = get_object_vars($value);
-        $objectVars['class'] = get_class($value);
-
-        return $this->formatArray($objectVars, $nestingLevel);
-    }
-
-    protected function formatException(\Exception $exception, $nestingLevel)
-    {
-        $formattedException = array(
-            'class' => get_class($exception),
-            'message' => $exception->getMessage(),
-            'code' => $exception->getCode(),
-            'file' => $exception->getFile() . ':' . $exception->getLine(),
-        );
-
-        if ($this->exceptionTraceAsString === true) {
-            $formattedException['trace'] = $exception->getTraceAsString();
-        } else {
-            $formattedException['trace'] = $exception->getTrace();
-        }
-
-        return $this->formatArray($formattedException, $nestingLevel);
-    }
-
-    protected function formatDate(\DateTime $value, $nestingLevel)
-    {
-        return new \MongoDate($value->getTimestamp());
-    }
-}
diff --git a/mayor-orig/www/include/share/googleapi/monolog/monolog/src/Monolog/Formatter/NormalizerFormatter.php b/mayor-orig/www/include/share/googleapi/monolog/monolog/src/Monolog/Formatter/NormalizerFormatter.php
deleted file mode 100644
index d4414882..00000000
--- a/mayor-orig/www/include/share/googleapi/monolog/monolog/src/Monolog/Formatter/NormalizerFormatter.php
+++ /dev/null
@@ -1,297 +0,0 @@
-
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Monolog\Formatter;
-
-use Exception;
-
-/**
- * Normalizes incoming records to remove objects/resources so it's easier to dump to various targets
- *
- * @author Jordi Boggiano 
- */
-class NormalizerFormatter implements FormatterInterface
-{
-    const SIMPLE_DATE = "Y-m-d H:i:s";
-
-    protected $dateFormat;
-
-    /**
-     * @param string $dateFormat The format of the timestamp: one supported by DateTime::format
-     */
-    public function __construct($dateFormat = null)
-    {
-        $this->dateFormat = $dateFormat ?: static::SIMPLE_DATE;
-        if (!function_exists('json_encode')) {
-            throw new \RuntimeException('PHP\'s json extension is required to use Monolog\'s NormalizerFormatter');
-        }
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function format(array $record)
-    {
-        return $this->normalize($record);
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function formatBatch(array $records)
-    {
-        foreach ($records as $key => $record) {
-            $records[$key] = $this->format($record);
-        }
-
-        return $records;
-    }
-
-    protected function normalize($data)
-    {
-        if (null === $data || is_scalar($data)) {
-            if (is_float($data)) {
-                if (is_infinite($data)) {
-                    return ($data > 0 ? '' : '-') . 'INF';
-                }
-                if (is_nan($data)) {
-                    return 'NaN';
-                }
-            }
-
-            return $data;
-        }
-
-        if (is_array($data)) {
-            $normalized = array();
-
-            $count = 1;
-            foreach ($data as $key => $value) {
-                if ($count++ >= 1000) {
-                    $normalized['...'] = 'Over 1000 items ('.count($data).' total), aborting normalization';
-                    break;
-                }
-                $normalized[$key] = $this->normalize($value);
-            }
-
-            return $normalized;
-        }
-
-        if ($data instanceof \DateTime) {
-            return $data->format($this->dateFormat);
-        }
-
-        if (is_object($data)) {
-            // TODO 2.0 only check for Throwable
-            if ($data instanceof Exception || (PHP_VERSION_ID > 70000 && $data instanceof \Throwable)) {
-                return $this->normalizeException($data);
-            }
-
-            // non-serializable objects that implement __toString stringified
-            if (method_exists($data, '__toString') && !$data instanceof \JsonSerializable) {
-                $value = $data->__toString();
-            } else {
-                // the rest is json-serialized in some way
-                $value = $this->toJson($data, true);
-            }
-
-            return sprintf("[object] (%s: %s)", get_class($data), $value);
-        }
-
-        if (is_resource($data)) {
-            return sprintf('[resource] (%s)', get_resource_type($data));
-        }
-
-        return '[unknown('.gettype($data).')]';
-    }
-
-    protected function normalizeException($e)
-    {
-        // TODO 2.0 only check for Throwable
-        if (!$e instanceof Exception && !$e instanceof \Throwable) {
-            throw new \InvalidArgumentException('Exception/Throwable expected, got '.gettype($e).' / '.get_class($e));
-        }
-
-        $data = array(
-            'class' => get_class($e),
-            'message' => $e->getMessage(),
-            'code' => $e->getCode(),
-            'file' => $e->getFile().':'.$e->getLine(),
-        );
-
-        if ($e instanceof \SoapFault) {
-            if (isset($e->faultcode)) {
-                $data['faultcode'] = $e->faultcode;
-            }
-
-            if (isset($e->faultactor)) {
-                $data['faultactor'] = $e->faultactor;
-            }
-
-            if (isset($e->detail)) {
-                $data['detail'] = $e->detail;
-            }
-        }
-
-        $trace = $e->getTrace();
-        foreach ($trace as $frame) {
-            if (isset($frame['file'])) {
-                $data['trace'][] = $frame['file'].':'.$frame['line'];
-            } elseif (isset($frame['function']) && $frame['function'] === '{closure}') {
-                // We should again normalize the frames, because it might contain invalid items
-                $data['trace'][] = $frame['function'];
-            } else {
-                // We should again normalize the frames, because it might contain invalid items
-                $data['trace'][] = $this->toJson($this->normalize($frame), true);
-            }
-        }
-
-        if ($previous = $e->getPrevious()) {
-            $data['previous'] = $this->normalizeException($previous);
-        }
-
-        return $data;
-    }
-
-    /**
-     * Return the JSON representation of a value
-     *
-     * @param  mixed             $data
-     * @param  bool              $ignoreErrors
-     * @throws \RuntimeException if encoding fails and errors are not ignored
-     * @return string
-     */
-    protected function toJson($data, $ignoreErrors = false)
-    {
-        // suppress json_encode errors since it's twitchy with some inputs
-        if ($ignoreErrors) {
-            return @$this->jsonEncode($data);
-        }
-
-        $json = $this->jsonEncode($data);
-
-        if ($json === false) {
-            $json = $this->handleJsonError(json_last_error(), $data);
-        }
-
-        return $json;
-    }
-
-    /**
-     * @param  mixed  $data
-     * @return string JSON encoded data or null on failure
-     */
-    private function jsonEncode($data)
-    {
-        if (version_compare(PHP_VERSION, '5.4.0', '>=')) {
-            return json_encode($data, JSON_UNESCAPED_SLASHES | JSON_UNESCAPED_UNICODE);
-        }
-
-        return json_encode($data);
-    }
-
-    /**
-     * Handle a json_encode failure.
-     *
-     * If the failure is due to invalid string encoding, try to clean the
-     * input and encode again. If the second encoding attempt fails, the
-     * inital error is not encoding related or the input can't be cleaned then
-     * raise a descriptive exception.
-     *
-     * @param  int               $code return code of json_last_error function
-     * @param  mixed             $data data that was meant to be encoded
-     * @throws \RuntimeException if failure can't be corrected
-     * @return string            JSON encoded data after error correction
-     */
-    private function handleJsonError($code, $data)
-    {
-        if ($code !== JSON_ERROR_UTF8) {
-            $this->throwEncodeError($code, $data);
-        }
-
-        if (is_string($data)) {
-            $this->detectAndCleanUtf8($data);
-        } elseif (is_array($data)) {
-            array_walk_recursive($data, array($this, 'detectAndCleanUtf8'));
-        } else {
-            $this->throwEncodeError($code, $data);
-        }
-
-        $json = $this->jsonEncode($data);
-
-        if ($json === false) {
-            $this->throwEncodeError(json_last_error(), $data);
-        }
-
-        return $json;
-    }
-
-    /**
-     * Throws an exception according to a given code with a customized message
-     *
-     * @param  int               $code return code of json_last_error function
-     * @param  mixed             $data data that was meant to be encoded
-     * @throws \RuntimeException
-     */
-    private function throwEncodeError($code, $data)
-    {
-        switch ($code) {
-            case JSON_ERROR_DEPTH:
-                $msg = 'Maximum stack depth exceeded';
-                break;
-            case JSON_ERROR_STATE_MISMATCH:
-                $msg = 'Underflow or the modes mismatch';
-                break;
-            case JSON_ERROR_CTRL_CHAR:
-                $msg = 'Unexpected control character found';
-                break;
-            case JSON_ERROR_UTF8:
-                $msg = 'Malformed UTF-8 characters, possibly incorrectly encoded';
-                break;
-            default:
-                $msg = 'Unknown error';
-        }
-
-        throw new \RuntimeException('JSON encoding failed: '.$msg.'. Encoding: '.var_export($data, true));
-    }
-
-    /**
-     * Detect invalid UTF-8 string characters and convert to valid UTF-8.
-     *
-     * Valid UTF-8 input will be left unmodified, but strings containing
-     * invalid UTF-8 codepoints will be reencoded as UTF-8 with an assumed
-     * original encoding of ISO-8859-15. This conversion may result in
-     * incorrect output if the actual encoding was not ISO-8859-15, but it
-     * will be clean UTF-8 output and will not rely on expensive and fragile
-     * detection algorithms.
-     *
-     * Function converts the input in place in the passed variable so that it
-     * can be used as a callback for array_walk_recursive.
-     *
-     * @param mixed &$data Input to check and convert if needed
-     * @private
-     */
-    public function detectAndCleanUtf8(&$data)
-    {
-        if (is_string($data) && !preg_match('//u', $data)) {
-            $data = preg_replace_callback(
-                '/[\x80-\xFF]+/',
-                function ($m) { return utf8_encode($m[0]); },
-                $data
-            );
-            $data = str_replace(
-                array('¤', '¦', '¨', '´', '¸', '¼', '½', '¾'),
-                array('€', 'Š', 'š', 'Ž', 'ž', 'Œ', 'œ', 'Ÿ'),
-                $data
-            );
-        }
-    }
-}
diff --git a/mayor-orig/www/include/share/googleapi/monolog/monolog/src/Monolog/Formatter/ScalarFormatter.php b/mayor-orig/www/include/share/googleapi/monolog/monolog/src/Monolog/Formatter/ScalarFormatter.php
deleted file mode 100644
index 5d345d53..00000000
--- a/mayor-orig/www/include/share/googleapi/monolog/monolog/src/Monolog/Formatter/ScalarFormatter.php
+++ /dev/null
@@ -1,48 +0,0 @@
-
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Monolog\Formatter;
-
-/**
- * Formats data into an associative array of scalar values.
- * Objects and arrays will be JSON encoded.
- *
- * @author Andrew Lawson 
- */
-class ScalarFormatter extends NormalizerFormatter
-{
-    /**
-     * {@inheritdoc}
-     */
-    public function format(array $record)
-    {
-        foreach ($record as $key => $value) {
-            $record[$key] = $this->normalizeValue($value);
-        }
-
-        return $record;
-    }
-
-    /**
-     * @param  mixed $value
-     * @return mixed
-     */
-    protected function normalizeValue($value)
-    {
-        $normalized = $this->normalize($value);
-
-        if (is_array($normalized) || is_object($normalized)) {
-            return $this->toJson($normalized, true);
-        }
-
-        return $normalized;
-    }
-}
diff --git a/mayor-orig/www/include/share/googleapi/monolog/monolog/src/Monolog/Formatter/WildfireFormatter.php b/mayor-orig/www/include/share/googleapi/monolog/monolog/src/Monolog/Formatter/WildfireFormatter.php
deleted file mode 100644
index 654710a8..00000000
--- a/mayor-orig/www/include/share/googleapi/monolog/monolog/src/Monolog/Formatter/WildfireFormatter.php
+++ /dev/null
@@ -1,113 +0,0 @@
-
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Monolog\Formatter;
-
-use Monolog\Logger;
-
-/**
- * Serializes a log message according to Wildfire's header requirements
- *
- * @author Eric Clemmons (@ericclemmons) 
- * @author Christophe Coevoet 
- * @author Kirill chEbba Chebunin 
- */
-class WildfireFormatter extends NormalizerFormatter
-{
-    const TABLE = 'table';
-
-    /**
-     * Translates Monolog log levels to Wildfire levels.
-     */
-    private $logLevels = array(
-        Logger::DEBUG     => 'LOG',
-        Logger::INFO      => 'INFO',
-        Logger::NOTICE    => 'INFO',
-        Logger::WARNING   => 'WARN',
-        Logger::ERROR     => 'ERROR',
-        Logger::CRITICAL  => 'ERROR',
-        Logger::ALERT     => 'ERROR',
-        Logger::EMERGENCY => 'ERROR',
-    );
-
-    /**
-     * {@inheritdoc}
-     */
-    public function format(array $record)
-    {
-        // Retrieve the line and file if set and remove them from the formatted extra
-        $file = $line = '';
-        if (isset($record['extra']['file'])) {
-            $file = $record['extra']['file'];
-            unset($record['extra']['file']);
-        }
-        if (isset($record['extra']['line'])) {
-            $line = $record['extra']['line'];
-            unset($record['extra']['line']);
-        }
-
-        $record = $this->normalize($record);
-        $message = array('message' => $record['message']);
-        $handleError = false;
-        if ($record['context']) {
-            $message['context'] = $record['context'];
-            $handleError = true;
-        }
-        if ($record['extra']) {
-            $message['extra'] = $record['extra'];
-            $handleError = true;
-        }
-        if (count($message) === 1) {
-            $message = reset($message);
-        }
-
-        if (isset($record['context'][self::TABLE])) {
-            $type  = 'TABLE';
-            $label = $record['channel'] .': '. $record['message'];
-            $message = $record['context'][self::TABLE];
-        } else {
-            $type  = $this->logLevels[$record['level']];
-            $label = $record['channel'];
-        }
-
-        // Create JSON object describing the appearance of the message in the console
-        $json = $this->toJson(array(
-            array(
-                'Type'  => $type,
-                'File'  => $file,
-                'Line'  => $line,
-                'Label' => $label,
-            ),
-            $message,
-        ), $handleError);
-
-        // The message itself is a serialization of the above JSON object + it's length
-        return sprintf(
-            '%s|%s|',
-            strlen($json),
-            $json
-        );
-    }
-
-    public function formatBatch(array $records)
-    {
-        throw new \BadMethodCallException('Batch formatting does not make sense for the WildfireFormatter');
-    }
-
-    protected function normalize($data)
-    {
-        if (is_object($data) && !$data instanceof \DateTime) {
-            return $data;
-        }
-
-        return parent::normalize($data);
-    }
-}
diff --git a/mayor-orig/www/include/share/googleapi/monolog/monolog/src/Monolog/Handler/AbstractHandler.php b/mayor-orig/www/include/share/googleapi/monolog/monolog/src/Monolog/Handler/AbstractHandler.php
deleted file mode 100644
index 758a425c..00000000
--- a/mayor-orig/www/include/share/googleapi/monolog/monolog/src/Monolog/Handler/AbstractHandler.php
+++ /dev/null
@@ -1,186 +0,0 @@
-
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Monolog\Handler;
-
-use Monolog\Logger;
-use Monolog\Formatter\FormatterInterface;
-use Monolog\Formatter\LineFormatter;
-
-/**
- * Base Handler class providing the Handler structure
- *
- * @author Jordi Boggiano 
- */
-abstract class AbstractHandler implements HandlerInterface
-{
-    protected $level = Logger::DEBUG;
-    protected $bubble = true;
-
-    /**
-     * @var FormatterInterface
-     */
-    protected $formatter;
-    protected $processors = array();
-
-    /**
-     * @param int     $level  The minimum logging level at which this handler will be triggered
-     * @param Boolean $bubble Whether the messages that are handled can bubble up the stack or not
-     */
-    public function __construct($level = Logger::DEBUG, $bubble = true)
-    {
-        $this->setLevel($level);
-        $this->bubble = $bubble;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function isHandling(array $record)
-    {
-        return $record['level'] >= $this->level;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function handleBatch(array $records)
-    {
-        foreach ($records as $record) {
-            $this->handle($record);
-        }
-    }
-
-    /**
-     * Closes the handler.
-     *
-     * This will be called automatically when the object is destroyed
-     */
-    public function close()
-    {
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function pushProcessor($callback)
-    {
-        if (!is_callable($callback)) {
-            throw new \InvalidArgumentException('Processors must be valid callables (callback or object with an __invoke method), '.var_export($callback, true).' given');
-        }
-        array_unshift($this->processors, $callback);
-
-        return $this;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function popProcessor()
-    {
-        if (!$this->processors) {
-            throw new \LogicException('You tried to pop from an empty processor stack.');
-        }
-
-        return array_shift($this->processors);
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function setFormatter(FormatterInterface $formatter)
-    {
-        $this->formatter = $formatter;
-
-        return $this;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function getFormatter()
-    {
-        if (!$this->formatter) {
-            $this->formatter = $this->getDefaultFormatter();
-        }
-
-        return $this->formatter;
-    }
-
-    /**
-     * Sets minimum logging level at which this handler will be triggered.
-     *
-     * @param  int|string $level Level or level name
-     * @return self
-     */
-    public function setLevel($level)
-    {
-        $this->level = Logger::toMonologLevel($level);
-
-        return $this;
-    }
-
-    /**
-     * Gets minimum logging level at which this handler will be triggered.
-     *
-     * @return int
-     */
-    public function getLevel()
-    {
-        return $this->level;
-    }
-
-    /**
-     * Sets the bubbling behavior.
-     *
-     * @param  Boolean $bubble true means that this handler allows bubbling.
-     *                         false means that bubbling is not permitted.
-     * @return self
-     */
-    public function setBubble($bubble)
-    {
-        $this->bubble = $bubble;
-
-        return $this;
-    }
-
-    /**
-     * Gets the bubbling behavior.
-     *
-     * @return Boolean true means that this handler allows bubbling.
-     *                 false means that bubbling is not permitted.
-     */
-    public function getBubble()
-    {
-        return $this->bubble;
-    }
-
-    public function __destruct()
-    {
-        try {
-            $this->close();
-        } catch (\Exception $e) {
-            // do nothing
-        } catch (\Throwable $e) {
-            // do nothing
-        }
-    }
-
-    /**
-     * Gets the default formatter.
-     *
-     * @return FormatterInterface
-     */
-    protected function getDefaultFormatter()
-    {
-        return new LineFormatter();
-    }
-}
diff --git a/mayor-orig/www/include/share/googleapi/monolog/monolog/src/Monolog/Handler/AbstractProcessingHandler.php b/mayor-orig/www/include/share/googleapi/monolog/monolog/src/Monolog/Handler/AbstractProcessingHandler.php
deleted file mode 100644
index 6f18f72e..00000000
--- a/mayor-orig/www/include/share/googleapi/monolog/monolog/src/Monolog/Handler/AbstractProcessingHandler.php
+++ /dev/null
@@ -1,66 +0,0 @@
-
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Monolog\Handler;
-
-/**
- * Base Handler class providing the Handler structure
- *
- * Classes extending it should (in most cases) only implement write($record)
- *
- * @author Jordi Boggiano 
- * @author Christophe Coevoet 
- */
-abstract class AbstractProcessingHandler extends AbstractHandler
-{
-    /**
-     * {@inheritdoc}
-     */
-    public function handle(array $record)
-    {
-        if (!$this->isHandling($record)) {
-            return false;
-        }
-
-        $record = $this->processRecord($record);
-
-        $record['formatted'] = $this->getFormatter()->format($record);
-
-        $this->write($record);
-
-        return false === $this->bubble;
-    }
-
-    /**
-     * Writes the record down to the log of the implementing handler
-     *
-     * @param  array $record
-     * @return void
-     */
-    abstract protected function write(array $record);
-
-    /**
-     * Processes a record.
-     *
-     * @param  array $record
-     * @return array
-     */
-    protected function processRecord(array $record)
-    {
-        if ($this->processors) {
-            foreach ($this->processors as $processor) {
-                $record = call_user_func($processor, $record);
-            }
-        }
-
-        return $record;
-    }
-}
diff --git a/mayor-orig/www/include/share/googleapi/monolog/monolog/src/Monolog/Handler/AbstractSyslogHandler.php b/mayor-orig/www/include/share/googleapi/monolog/monolog/src/Monolog/Handler/AbstractSyslogHandler.php
deleted file mode 100644
index e2b2832d..00000000
--- a/mayor-orig/www/include/share/googleapi/monolog/monolog/src/Monolog/Handler/AbstractSyslogHandler.php
+++ /dev/null
@@ -1,101 +0,0 @@
-
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Monolog\Handler;
-
-use Monolog\Logger;
-use Monolog\Formatter\LineFormatter;
-
-/**
- * Common syslog functionality
- */
-abstract class AbstractSyslogHandler extends AbstractProcessingHandler
-{
-    protected $facility;
-
-    /**
-     * Translates Monolog log levels to syslog log priorities.
-     */
-    protected $logLevels = array(
-        Logger::DEBUG     => LOG_DEBUG,
-        Logger::INFO      => LOG_INFO,
-        Logger::NOTICE    => LOG_NOTICE,
-        Logger::WARNING   => LOG_WARNING,
-        Logger::ERROR     => LOG_ERR,
-        Logger::CRITICAL  => LOG_CRIT,
-        Logger::ALERT     => LOG_ALERT,
-        Logger::EMERGENCY => LOG_EMERG,
-    );
-
-    /**
-     * List of valid log facility names.
-     */
-    protected $facilities = array(
-        'auth'     => LOG_AUTH,
-        'authpriv' => LOG_AUTHPRIV,
-        'cron'     => LOG_CRON,
-        'daemon'   => LOG_DAEMON,
-        'kern'     => LOG_KERN,
-        'lpr'      => LOG_LPR,
-        'mail'     => LOG_MAIL,
-        'news'     => LOG_NEWS,
-        'syslog'   => LOG_SYSLOG,
-        'user'     => LOG_USER,
-        'uucp'     => LOG_UUCP,
-    );
-
-    /**
-     * @param mixed   $facility
-     * @param int     $level    The minimum logging level at which this handler will be triggered
-     * @param Boolean $bubble   Whether the messages that are handled can bubble up the stack or not
-     */
-    public function __construct($facility = LOG_USER, $level = Logger::DEBUG, $bubble = true)
-    {
-        parent::__construct($level, $bubble);
-
-        if (!defined('PHP_WINDOWS_VERSION_BUILD')) {
-            $this->facilities['local0'] = LOG_LOCAL0;
-            $this->facilities['local1'] = LOG_LOCAL1;
-            $this->facilities['local2'] = LOG_LOCAL2;
-            $this->facilities['local3'] = LOG_LOCAL3;
-            $this->facilities['local4'] = LOG_LOCAL4;
-            $this->facilities['local5'] = LOG_LOCAL5;
-            $this->facilities['local6'] = LOG_LOCAL6;
-            $this->facilities['local7'] = LOG_LOCAL7;
-        } else {
-            $this->facilities['local0'] = 128; // LOG_LOCAL0
-            $this->facilities['local1'] = 136; // LOG_LOCAL1
-            $this->facilities['local2'] = 144; // LOG_LOCAL2
-            $this->facilities['local3'] = 152; // LOG_LOCAL3
-            $this->facilities['local4'] = 160; // LOG_LOCAL4
-            $this->facilities['local5'] = 168; // LOG_LOCAL5
-            $this->facilities['local6'] = 176; // LOG_LOCAL6
-            $this->facilities['local7'] = 184; // LOG_LOCAL7
-        }
-
-        // convert textual description of facility to syslog constant
-        if (array_key_exists(strtolower($facility), $this->facilities)) {
-            $facility = $this->facilities[strtolower($facility)];
-        } elseif (!in_array($facility, array_values($this->facilities), true)) {
-            throw new \UnexpectedValueException('Unknown facility value "'.$facility.'" given');
-        }
-
-        $this->facility = $facility;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    protected function getDefaultFormatter()
-    {
-        return new LineFormatter('%channel%.%level_name%: %message% %context% %extra%');
-    }
-}
diff --git a/mayor-orig/www/include/share/googleapi/monolog/monolog/src/Monolog/Handler/AmqpHandler.php b/mayor-orig/www/include/share/googleapi/monolog/monolog/src/Monolog/Handler/AmqpHandler.php
deleted file mode 100644
index e5a46bc0..00000000
--- a/mayor-orig/www/include/share/googleapi/monolog/monolog/src/Monolog/Handler/AmqpHandler.php
+++ /dev/null
@@ -1,148 +0,0 @@
-
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Monolog\Handler;
-
-use Monolog\Logger;
-use Monolog\Formatter\JsonFormatter;
-use PhpAmqpLib\Message\AMQPMessage;
-use PhpAmqpLib\Channel\AMQPChannel;
-use AMQPExchange;
-
-class AmqpHandler extends AbstractProcessingHandler
-{
-    /**
-     * @var AMQPExchange|AMQPChannel $exchange
-     */
-    protected $exchange;
-
-    /**
-     * @var string
-     */
-    protected $exchangeName;
-
-    /**
-     * @param AMQPExchange|AMQPChannel $exchange     AMQPExchange (php AMQP ext) or PHP AMQP lib channel, ready for use
-     * @param string                   $exchangeName
-     * @param int                      $level
-     * @param bool                     $bubble       Whether the messages that are handled can bubble up the stack or not
-     */
-    public function __construct($exchange, $exchangeName = 'log', $level = Logger::DEBUG, $bubble = true)
-    {
-        if ($exchange instanceof AMQPExchange) {
-            $exchange->setName($exchangeName);
-        } elseif ($exchange instanceof AMQPChannel) {
-            $this->exchangeName = $exchangeName;
-        } else {
-            throw new \InvalidArgumentException('PhpAmqpLib\Channel\AMQPChannel or AMQPExchange instance required');
-        }
-        $this->exchange = $exchange;
-
-        parent::__construct($level, $bubble);
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    protected function write(array $record)
-    {
-        $data = $record["formatted"];
-        $routingKey = $this->getRoutingKey($record);
-
-        if ($this->exchange instanceof AMQPExchange) {
-            $this->exchange->publish(
-                $data,
-                $routingKey,
-                0,
-                array(
-                    'delivery_mode' => 2,
-                    'content_type' => 'application/json',
-                )
-            );
-        } else {
-            $this->exchange->basic_publish(
-                $this->createAmqpMessage($data),
-                $this->exchangeName,
-                $routingKey
-            );
-        }
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public function handleBatch(array $records)
-    {
-        if ($this->exchange instanceof AMQPExchange) {
-            parent::handleBatch($records);
-
-            return;
-        }
-
-        foreach ($records as $record) {
-            if (!$this->isHandling($record)) {
-                continue;
-            }
-
-            $record = $this->processRecord($record);
-            $data = $this->getFormatter()->format($record);
-
-            $this->exchange->batch_basic_publish(
-                $this->createAmqpMessage($data),
-                $this->exchangeName,
-                $this->getRoutingKey($record)
-            );
-        }
-
-        $this->exchange->publish_batch();
-    }
-
-    /**
-     * Gets the routing key for the AMQP exchange
-     *
-     * @param  array  $record
-     * @return string
-     */
-    protected function getRoutingKey(array $record)
-    {
-        $routingKey = sprintf(
-            '%s.%s',
-            // TODO 2.0 remove substr call
-            substr($record['level_name'], 0, 4),
-            $record['channel']
-        );
-
-        return strtolower($routingKey);
-    }
-
-    /**
-     * @param  string      $data
-     * @return AMQPMessage
-     */
-    private function createAmqpMessage($data)
-    {
-        return new AMQPMessage(
-            (string) $data,
-            array(
-                'delivery_mode' => 2,
-                'content_type' => 'application/json',
-            )
-        );
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    protected function getDefaultFormatter()
-    {
-        return new JsonFormatter(JsonFormatter::BATCH_MODE_JSON, false);
-    }
-}
diff --git a/mayor-orig/www/include/share/googleapi/monolog/monolog/src/Monolog/Handler/BrowserConsoleHandler.php b/mayor-orig/www/include/share/googleapi/monolog/monolog/src/Monolog/Handler/BrowserConsoleHandler.php
deleted file mode 100644
index b3a21bd4..00000000
--- a/mayor-orig/www/include/share/googleapi/monolog/monolog/src/Monolog/Handler/BrowserConsoleHandler.php
+++ /dev/null
@@ -1,230 +0,0 @@
-
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Monolog\Handler;
-
-use Monolog\Formatter\LineFormatter;
-
-/**
- * Handler sending logs to browser's javascript console with no browser extension required
- *
- * @author Olivier Poitrey 
- */
-class BrowserConsoleHandler extends AbstractProcessingHandler
-{
-    protected static $initialized = false;
-    protected static $records = array();
-
-    /**
-     * {@inheritDoc}
-     *
-     * Formatted output may contain some formatting markers to be transferred to `console.log` using the %c format.
-     *
-     * Example of formatted string:
-     *
-     *     You can do [[blue text]]{color: blue} or [[green background]]{background-color: green; color: white}
-     */
-    protected function getDefaultFormatter()
-    {
-        return new LineFormatter('[[%channel%]]{macro: autolabel} [[%level_name%]]{font-weight: bold} %message%');
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    protected function write(array $record)
-    {
-        // Accumulate records
-        self::$records[] = $record;
-
-        // Register shutdown handler if not already done
-        if (!self::$initialized) {
-            self::$initialized = true;
-            $this->registerShutdownFunction();
-        }
-    }
-
-    /**
-     * Convert records to javascript console commands and send it to the browser.
-     * This method is automatically called on PHP shutdown if output is HTML or Javascript.
-     */
-    public static function send()
-    {
-        $format = self::getResponseFormat();
-        if ($format === 'unknown') {
-            return;
-        }
-
-        if (count(self::$records)) {
-            if ($format === 'html') {
-                self::writeOutput('');
-            } elseif ($format === 'js') {
-                self::writeOutput(self::generateScript());
-            }
-            self::reset();
-        }
-    }
-
-    /**
-     * Forget all logged records
-     */
-    public static function reset()
-    {
-        self::$records = array();
-    }
-
-    /**
-     * Wrapper for register_shutdown_function to allow overriding
-     */
-    protected function registerShutdownFunction()
-    {
-        if (PHP_SAPI !== 'cli') {
-            register_shutdown_function(array('Monolog\Handler\BrowserConsoleHandler', 'send'));
-        }
-    }
-
-    /**
-     * Wrapper for echo to allow overriding
-     *
-     * @param string $str
-     */
-    protected static function writeOutput($str)
-    {
-        echo $str;
-    }
-
-    /**
-     * Checks the format of the response
-     *
-     * If Content-Type is set to application/javascript or text/javascript -> js
-     * If Content-Type is set to text/html, or is unset -> html
-     * If Content-Type is anything else -> unknown
-     *
-     * @return string One of 'js', 'html' or 'unknown'
-     */
-    protected static function getResponseFormat()
-    {
-        // Check content type
-        foreach (headers_list() as $header) {
-            if (stripos($header, 'content-type:') === 0) {
-                // This handler only works with HTML and javascript outputs
-                // text/javascript is obsolete in favour of application/javascript, but still used
-                if (stripos($header, 'application/javascript') !== false || stripos($header, 'text/javascript') !== false) {
-                    return 'js';
-                }
-                if (stripos($header, 'text/html') === false) {
-                    return 'unknown';
-                }
-                break;
-            }
-        }
-
-        return 'html';
-    }
-
-    private static function generateScript()
-    {
-        $script = array();
-        foreach (self::$records as $record) {
-            $context = self::dump('Context', $record['context']);
-            $extra = self::dump('Extra', $record['extra']);
-
-            if (empty($context) && empty($extra)) {
-                $script[] = self::call_array('log', self::handleStyles($record['formatted']));
-            } else {
-                $script = array_merge($script,
-                    array(self::call_array('groupCollapsed', self::handleStyles($record['formatted']))),
-                    $context,
-                    $extra,
-                    array(self::call('groupEnd'))
-                );
-            }
-        }
-
-        return "(function (c) {if (c && c.groupCollapsed) {\n" . implode("\n", $script) . "\n}})(console);";
-    }
-
-    private static function handleStyles($formatted)
-    {
-        $args = array(self::quote('font-weight: normal'));
-        $format = '%c' . $formatted;
-        preg_match_all('/\[\[(.*?)\]\]\{([^}]*)\}/s', $format, $matches, PREG_OFFSET_CAPTURE | PREG_SET_ORDER);
-
-        foreach (array_reverse($matches) as $match) {
-            $args[] = self::quote(self::handleCustomStyles($match[2][0], $match[1][0]));
-            $args[] = '"font-weight: normal"';
-
-            $pos = $match[0][1];
-            $format = substr($format, 0, $pos) . '%c' . $match[1][0] . '%c' . substr($format, $pos + strlen($match[0][0]));
-        }
-
-        array_unshift($args, self::quote($format));
-
-        return $args;
-    }
-
-    private static function handleCustomStyles($style, $string)
-    {
-        static $colors = array('blue', 'green', 'red', 'magenta', 'orange', 'black', 'grey');
-        static $labels = array();
-
-        return preg_replace_callback('/macro\s*:(.*?)(?:;|$)/', function ($m) use ($string, &$colors, &$labels) {
-            if (trim($m[1]) === 'autolabel') {
-                // Format the string as a label with consistent auto assigned background color
-                if (!isset($labels[$string])) {
-                    $labels[$string] = $colors[count($labels) % count($colors)];
-                }
-                $color = $labels[$string];
-
-                return "background-color: $color; color: white; border-radius: 3px; padding: 0 2px 0 2px";
-            }
-
-            return $m[1];
-        }, $style);
-    }
-
-    private static function dump($title, array $dict)
-    {
-        $script = array();
-        $dict = array_filter($dict);
-        if (empty($dict)) {
-            return $script;
-        }
-        $script[] = self::call('log', self::quote('%c%s'), self::quote('font-weight: bold'), self::quote($title));
-        foreach ($dict as $key => $value) {
-            $value = json_encode($value);
-            if (empty($value)) {
-                $value = self::quote('');
-            }
-            $script[] = self::call('log', self::quote('%s: %o'), self::quote($key), $value);
-        }
-
-        return $script;
-    }
-
-    private static function quote($arg)
-    {
-        return '"' . addcslashes($arg, "\"\n\\") . '"';
-    }
-
-    private static function call()
-    {
-        $args = func_get_args();
-        $method = array_shift($args);
-
-        return self::call_array($method, $args);
-    }
-
-    private static function call_array($method, array $args)
-    {
-        return 'c.' . $method . '(' . implode(', ', $args) . ');';
-    }
-}
diff --git a/mayor-orig/www/include/share/googleapi/monolog/monolog/src/Monolog/Handler/BufferHandler.php b/mayor-orig/www/include/share/googleapi/monolog/monolog/src/Monolog/Handler/BufferHandler.php
deleted file mode 100644
index 72f89535..00000000
--- a/mayor-orig/www/include/share/googleapi/monolog/monolog/src/Monolog/Handler/BufferHandler.php
+++ /dev/null
@@ -1,117 +0,0 @@
-
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Monolog\Handler;
-
-use Monolog\Logger;
-
-/**
- * Buffers all records until closing the handler and then pass them as batch.
- *
- * This is useful for a MailHandler to send only one mail per request instead of
- * sending one per log message.
- *
- * @author Christophe Coevoet 
- */
-class BufferHandler extends AbstractHandler
-{
-    protected $handler;
-    protected $bufferSize = 0;
-    protected $bufferLimit;
-    protected $flushOnOverflow;
-    protected $buffer = array();
-    protected $initialized = false;
-
-    /**
-     * @param HandlerInterface $handler         Handler.
-     * @param int              $bufferLimit     How many entries should be buffered at most, beyond that the oldest items are removed from the buffer.
-     * @param int              $level           The minimum logging level at which this handler will be triggered
-     * @param Boolean          $bubble          Whether the messages that are handled can bubble up the stack or not
-     * @param Boolean          $flushOnOverflow If true, the buffer is flushed when the max size has been reached, by default oldest entries are discarded
-     */
-    public function __construct(HandlerInterface $handler, $bufferLimit = 0, $level = Logger::DEBUG, $bubble = true, $flushOnOverflow = false)
-    {
-        parent::__construct($level, $bubble);
-        $this->handler = $handler;
-        $this->bufferLimit = (int) $bufferLimit;
-        $this->flushOnOverflow = $flushOnOverflow;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function handle(array $record)
-    {
-        if ($record['level'] < $this->level) {
-            return false;
-        }
-
-        if (!$this->initialized) {
-            // __destructor() doesn't get called on Fatal errors
-            register_shutdown_function(array($this, 'close'));
-            $this->initialized = true;
-        }
-
-        if ($this->bufferLimit > 0 && $this->bufferSize === $this->bufferLimit) {
-            if ($this->flushOnOverflow) {
-                $this->flush();
-            } else {
-                array_shift($this->buffer);
-                $this->bufferSize--;
-            }
-        }
-
-        if ($this->processors) {
-            foreach ($this->processors as $processor) {
-                $record = call_user_func($processor, $record);
-            }
-        }
-
-        $this->buffer[] = $record;
-        $this->bufferSize++;
-
-        return false === $this->bubble;
-    }
-
-    public function flush()
-    {
-        if ($this->bufferSize === 0) {
-            return;
-        }
-
-        $this->handler->handleBatch($this->buffer);
-        $this->clear();
-    }
-
-    public function __destruct()
-    {
-        // suppress the parent behavior since we already have register_shutdown_function()
-        // to call close(), and the reference contained there will prevent this from being
-        // GC'd until the end of the request
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function close()
-    {
-        $this->flush();
-    }
-
-    /**
-     * Clears the buffer without flushing any messages down to the wrapped handler.
-     */
-    public function clear()
-    {
-        $this->bufferSize = 0;
-        $this->buffer = array();
-    }
-}
diff --git a/mayor-orig/www/include/share/googleapi/monolog/monolog/src/Monolog/Handler/ChromePHPHandler.php b/mayor-orig/www/include/share/googleapi/monolog/monolog/src/Monolog/Handler/ChromePHPHandler.php
deleted file mode 100644
index 785cb0c9..00000000
--- a/mayor-orig/www/include/share/googleapi/monolog/monolog/src/Monolog/Handler/ChromePHPHandler.php
+++ /dev/null
@@ -1,211 +0,0 @@
-
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Monolog\Handler;
-
-use Monolog\Formatter\ChromePHPFormatter;
-use Monolog\Logger;
-
-/**
- * Handler sending logs to the ChromePHP extension (http://www.chromephp.com/)
- *
- * This also works out of the box with Firefox 43+
- *
- * @author Christophe Coevoet 
- */
-class ChromePHPHandler extends AbstractProcessingHandler
-{
-    /**
-     * Version of the extension
-     */
-    const VERSION = '4.0';
-
-    /**
-     * Header name
-     */
-    const HEADER_NAME = 'X-ChromeLogger-Data';
-    
-    /**
-     * Regular expression to detect supported browsers (matches any Chrome, or Firefox 43+)
-     */
-    const USER_AGENT_REGEX = '{\b(?:Chrome/\d+(?:\.\d+)*|HeadlessChrome|Firefox/(?:4[3-9]|[5-9]\d|\d{3,})(?:\.\d)*)\b}';
-
-    protected static $initialized = false;
-
-    /**
-     * Tracks whether we sent too much data
-     *
-     * Chrome limits the headers to 256KB, so when we sent 240KB we stop sending
-     *
-     * @var Boolean
-     */
-    protected static $overflowed = false;
-
-    protected static $json = array(
-        'version' => self::VERSION,
-        'columns' => array('label', 'log', 'backtrace', 'type'),
-        'rows' => array(),
-    );
-
-    protected static $sendHeaders = true;
-
-    /**
-     * @param int     $level  The minimum logging level at which this handler will be triggered
-     * @param Boolean $bubble Whether the messages that are handled can bubble up the stack or not
-     */
-    public function __construct($level = Logger::DEBUG, $bubble = true)
-    {
-        parent::__construct($level, $bubble);
-        if (!function_exists('json_encode')) {
-            throw new \RuntimeException('PHP\'s json extension is required to use Monolog\'s ChromePHPHandler');
-        }
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function handleBatch(array $records)
-    {
-        $messages = array();
-
-        foreach ($records as $record) {
-            if ($record['level'] < $this->level) {
-                continue;
-            }
-            $messages[] = $this->processRecord($record);
-        }
-
-        if (!empty($messages)) {
-            $messages = $this->getFormatter()->formatBatch($messages);
-            self::$json['rows'] = array_merge(self::$json['rows'], $messages);
-            $this->send();
-        }
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    protected function getDefaultFormatter()
-    {
-        return new ChromePHPFormatter();
-    }
-
-    /**
-     * Creates & sends header for a record
-     *
-     * @see sendHeader()
-     * @see send()
-     * @param array $record
-     */
-    protected function write(array $record)
-    {
-        self::$json['rows'][] = $record['formatted'];
-
-        $this->send();
-    }
-
-    /**
-     * Sends the log header
-     *
-     * @see sendHeader()
-     */
-    protected function send()
-    {
-        if (self::$overflowed || !self::$sendHeaders) {
-            return;
-        }
-
-        if (!self::$initialized) {
-            self::$initialized = true;
-
-            self::$sendHeaders = $this->headersAccepted();
-            if (!self::$sendHeaders) {
-                return;
-            }
-
-            self::$json['request_uri'] = isset($_SERVER['REQUEST_URI']) ? $_SERVER['REQUEST_URI'] : '';
-        }
-
-        $json = @json_encode(self::$json);
-        $data = base64_encode(utf8_encode($json));
-        if (strlen($data) > 240 * 1024) {
-            self::$overflowed = true;
-
-            $record = array(
-                'message' => 'Incomplete logs, chrome header size limit reached',
-                'context' => array(),
-                'level' => Logger::WARNING,
-                'level_name' => Logger::getLevelName(Logger::WARNING),
-                'channel' => 'monolog',
-                'datetime' => new \DateTime(),
-                'extra' => array(),
-            );
-            self::$json['rows'][count(self::$json['rows']) - 1] = $this->getFormatter()->format($record);
-            $json = @json_encode(self::$json);
-            $data = base64_encode(utf8_encode($json));
-        }
-
-        if (trim($data) !== '') {
-            $this->sendHeader(self::HEADER_NAME, $data);
-        }
-    }
-
-    /**
-     * Send header string to the client
-     *
-     * @param string $header
-     * @param string $content
-     */
-    protected function sendHeader($header, $content)
-    {
-        if (!headers_sent() && self::$sendHeaders) {
-            header(sprintf('%s: %s', $header, $content));
-        }
-    }
-
-    /**
-     * Verifies if the headers are accepted by the current user agent
-     *
-     * @return Boolean
-     */
-    protected function headersAccepted()
-    {
-        if (empty($_SERVER['HTTP_USER_AGENT'])) {
-            return false;
-        }
-
-        return preg_match(self::USER_AGENT_REGEX, $_SERVER['HTTP_USER_AGENT']);
-    }
-
-    /**
-     * BC getter for the sendHeaders property that has been made static
-     */
-    public function __get($property)
-    {
-        if ('sendHeaders' !== $property) {
-            throw new \InvalidArgumentException('Undefined property '.$property);
-        }
-
-        return static::$sendHeaders;
-    }
-
-    /**
-     * BC setter for the sendHeaders property that has been made static
-     */
-    public function __set($property, $value)
-    {
-        if ('sendHeaders' !== $property) {
-            throw new \InvalidArgumentException('Undefined property '.$property);
-        }
-
-        static::$sendHeaders = $value;
-    }
-}
diff --git a/mayor-orig/www/include/share/googleapi/monolog/monolog/src/Monolog/Handler/CouchDBHandler.php b/mayor-orig/www/include/share/googleapi/monolog/monolog/src/Monolog/Handler/CouchDBHandler.php
deleted file mode 100644
index cc986971..00000000
--- a/mayor-orig/www/include/share/googleapi/monolog/monolog/src/Monolog/Handler/CouchDBHandler.php
+++ /dev/null
@@ -1,72 +0,0 @@
-
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Monolog\Handler;
-
-use Monolog\Formatter\JsonFormatter;
-use Monolog\Logger;
-
-/**
- * CouchDB handler
- *
- * @author Markus Bachmann 
- */
-class CouchDBHandler extends AbstractProcessingHandler
-{
-    private $options;
-
-    public function __construct(array $options = array(), $level = Logger::DEBUG, $bubble = true)
-    {
-        $this->options = array_merge(array(
-            'host'     => 'localhost',
-            'port'     => 5984,
-            'dbname'   => 'logger',
-            'username' => null,
-            'password' => null,
-        ), $options);
-
-        parent::__construct($level, $bubble);
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    protected function write(array $record)
-    {
-        $basicAuth = null;
-        if ($this->options['username']) {
-            $basicAuth = sprintf('%s:%s@', $this->options['username'], $this->options['password']);
-        }
-
-        $url = 'http://'.$basicAuth.$this->options['host'].':'.$this->options['port'].'/'.$this->options['dbname'];
-        $context = stream_context_create(array(
-            'http' => array(
-                'method'        => 'POST',
-                'content'       => $record['formatted'],
-                'ignore_errors' => true,
-                'max_redirects' => 0,
-                'header'        => 'Content-type: application/json',
-            ),
-        ));
-
-        if (false === @file_get_contents($url, null, $context)) {
-            throw new \RuntimeException(sprintf('Could not connect to %s', $url));
-        }
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    protected function getDefaultFormatter()
-    {
-        return new JsonFormatter(JsonFormatter::BATCH_MODE_JSON, false);
-    }
-}
diff --git a/mayor-orig/www/include/share/googleapi/monolog/monolog/src/Monolog/Handler/CubeHandler.php b/mayor-orig/www/include/share/googleapi/monolog/monolog/src/Monolog/Handler/CubeHandler.php
deleted file mode 100644
index 96b3ca0c..00000000
--- a/mayor-orig/www/include/share/googleapi/monolog/monolog/src/Monolog/Handler/CubeHandler.php
+++ /dev/null
@@ -1,151 +0,0 @@
-
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Monolog\Handler;
-
-use Monolog\Logger;
-
-/**
- * Logs to Cube.
- *
- * @link http://square.github.com/cube/
- * @author Wan Chen 
- */
-class CubeHandler extends AbstractProcessingHandler
-{
-    private $udpConnection;
-    private $httpConnection;
-    private $scheme;
-    private $host;
-    private $port;
-    private $acceptedSchemes = array('http', 'udp');
-
-    /**
-     * Create a Cube handler
-     *
-     * @throws \UnexpectedValueException when given url is not a valid url.
-     *                                   A valid url must consist of three parts : protocol://host:port
-     *                                   Only valid protocols used by Cube are http and udp
-     */
-    public function __construct($url, $level = Logger::DEBUG, $bubble = true)
-    {
-        $urlInfo = parse_url($url);
-
-        if (!isset($urlInfo['scheme'], $urlInfo['host'], $urlInfo['port'])) {
-            throw new \UnexpectedValueException('URL "'.$url.'" is not valid');
-        }
-
-        if (!in_array($urlInfo['scheme'], $this->acceptedSchemes)) {
-            throw new \UnexpectedValueException(
-                'Invalid protocol (' . $urlInfo['scheme']  . ').'
-                . ' Valid options are ' . implode(', ', $this->acceptedSchemes));
-        }
-
-        $this->scheme = $urlInfo['scheme'];
-        $this->host = $urlInfo['host'];
-        $this->port = $urlInfo['port'];
-
-        parent::__construct($level, $bubble);
-    }
-
-    /**
-     * Establish a connection to an UDP socket
-     *
-     * @throws \LogicException           when unable to connect to the socket
-     * @throws MissingExtensionException when there is no socket extension
-     */
-    protected function connectUdp()
-    {
-        if (!extension_loaded('sockets')) {
-            throw new MissingExtensionException('The sockets extension is required to use udp URLs with the CubeHandler');
-        }
-
-        $this->udpConnection = socket_create(AF_INET, SOCK_DGRAM, 0);
-        if (!$this->udpConnection) {
-            throw new \LogicException('Unable to create a socket');
-        }
-
-        if (!socket_connect($this->udpConnection, $this->host, $this->port)) {
-            throw new \LogicException('Unable to connect to the socket at ' . $this->host . ':' . $this->port);
-        }
-    }
-
-    /**
-     * Establish a connection to a http server
-     * @throws \LogicException when no curl extension
-     */
-    protected function connectHttp()
-    {
-        if (!extension_loaded('curl')) {
-            throw new \LogicException('The curl extension is needed to use http URLs with the CubeHandler');
-        }
-
-        $this->httpConnection = curl_init('http://'.$this->host.':'.$this->port.'/1.0/event/put');
-
-        if (!$this->httpConnection) {
-            throw new \LogicException('Unable to connect to ' . $this->host . ':' . $this->port);
-        }
-
-        curl_setopt($this->httpConnection, CURLOPT_CUSTOMREQUEST, "POST");
-        curl_setopt($this->httpConnection, CURLOPT_RETURNTRANSFER, true);
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    protected function write(array $record)
-    {
-        $date = $record['datetime'];
-
-        $data = array('time' => $date->format('Y-m-d\TH:i:s.uO'));
-        unset($record['datetime']);
-
-        if (isset($record['context']['type'])) {
-            $data['type'] = $record['context']['type'];
-            unset($record['context']['type']);
-        } else {
-            $data['type'] = $record['channel'];
-        }
-
-        $data['data'] = $record['context'];
-        $data['data']['level'] = $record['level'];
-
-        if ($this->scheme === 'http') {
-            $this->writeHttp(json_encode($data));
-        } else {
-            $this->writeUdp(json_encode($data));
-        }
-    }
-
-    private function writeUdp($data)
-    {
-        if (!$this->udpConnection) {
-            $this->connectUdp();
-        }
-
-        socket_send($this->udpConnection, $data, strlen($data), 0);
-    }
-
-    private function writeHttp($data)
-    {
-        if (!$this->httpConnection) {
-            $this->connectHttp();
-        }
-
-        curl_setopt($this->httpConnection, CURLOPT_POSTFIELDS, '['.$data.']');
-        curl_setopt($this->httpConnection, CURLOPT_HTTPHEADER, array(
-            'Content-Type: application/json',
-            'Content-Length: ' . strlen('['.$data.']'),
-        ));
-
-        Curl\Util::execute($this->httpConnection, 5, false);
-    }
-}
diff --git a/mayor-orig/www/include/share/googleapi/monolog/monolog/src/Monolog/Handler/Curl/Util.php b/mayor-orig/www/include/share/googleapi/monolog/monolog/src/Monolog/Handler/Curl/Util.php
deleted file mode 100644
index 48d30b35..00000000
--- a/mayor-orig/www/include/share/googleapi/monolog/monolog/src/Monolog/Handler/Curl/Util.php
+++ /dev/null
@@ -1,57 +0,0 @@
-
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Monolog\Handler\Curl;
-
-class Util
-{
-    private static $retriableErrorCodes = array(
-        CURLE_COULDNT_RESOLVE_HOST,
-        CURLE_COULDNT_CONNECT,
-        CURLE_HTTP_NOT_FOUND,
-        CURLE_READ_ERROR,
-        CURLE_OPERATION_TIMEOUTED,
-        CURLE_HTTP_POST_ERROR,
-        CURLE_SSL_CONNECT_ERROR,
-    );
-
-    /**
-     * Executes a CURL request with optional retries and exception on failure
-     *
-     * @param  resource          $ch curl handler
-     * @throws \RuntimeException
-     */
-    public static function execute($ch, $retries = 5, $closeAfterDone = true)
-    {
-        while ($retries--) {
-            if (curl_exec($ch) === false) {
-                $curlErrno = curl_errno($ch);
-
-                if (false === in_array($curlErrno, self::$retriableErrorCodes, true) || !$retries) {
-                    $curlError = curl_error($ch);
-
-                    if ($closeAfterDone) {
-                        curl_close($ch);
-                    }
-
-                    throw new \RuntimeException(sprintf('Curl error (code %s): %s', $curlErrno, $curlError));
-                }
-
-                continue;
-            }
-
-            if ($closeAfterDone) {
-                curl_close($ch);
-            }
-            break;
-        }
-    }
-}
diff --git a/mayor-orig/www/include/share/googleapi/monolog/monolog/src/Monolog/Handler/DeduplicationHandler.php b/mayor-orig/www/include/share/googleapi/monolog/monolog/src/Monolog/Handler/DeduplicationHandler.php
deleted file mode 100644
index 7778c22a..00000000
--- a/mayor-orig/www/include/share/googleapi/monolog/monolog/src/Monolog/Handler/DeduplicationHandler.php
+++ /dev/null
@@ -1,169 +0,0 @@
-
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Monolog\Handler;
-
-use Monolog\Logger;
-
-/**
- * Simple handler wrapper that deduplicates log records across multiple requests
- *
- * It also includes the BufferHandler functionality and will buffer
- * all messages until the end of the request or flush() is called.
- *
- * This works by storing all log records' messages above $deduplicationLevel
- * to the file specified by $deduplicationStore. When further logs come in at the end of the
- * request (or when flush() is called), all those above $deduplicationLevel are checked
- * against the existing stored logs. If they match and the timestamps in the stored log is
- * not older than $time seconds, the new log record is discarded. If no log record is new, the
- * whole data set is discarded.
- *
- * This is mainly useful in combination with Mail handlers or things like Slack or HipChat handlers
- * that send messages to people, to avoid spamming with the same message over and over in case of
- * a major component failure like a database server being down which makes all requests fail in the
- * same way.
- *
- * @author Jordi Boggiano 
- */
-class DeduplicationHandler extends BufferHandler
-{
-    /**
-     * @var string
-     */
-    protected $deduplicationStore;
-
-    /**
-     * @var int
-     */
-    protected $deduplicationLevel;
-
-    /**
-     * @var int
-     */
-    protected $time;
-
-    /**
-     * @var bool
-     */
-    private $gc = false;
-
-    /**
-     * @param HandlerInterface $handler            Handler.
-     * @param string           $deduplicationStore The file/path where the deduplication log should be kept
-     * @param int              $deduplicationLevel The minimum logging level for log records to be looked at for deduplication purposes
-     * @param int              $time               The period (in seconds) during which duplicate entries should be suppressed after a given log is sent through
-     * @param Boolean          $bubble             Whether the messages that are handled can bubble up the stack or not
-     */
-    public function __construct(HandlerInterface $handler, $deduplicationStore = null, $deduplicationLevel = Logger::ERROR, $time = 60, $bubble = true)
-    {
-        parent::__construct($handler, 0, Logger::DEBUG, $bubble, false);
-
-        $this->deduplicationStore = $deduplicationStore === null ? sys_get_temp_dir() . '/monolog-dedup-' . substr(md5(__FILE__), 0, 20) .'.log' : $deduplicationStore;
-        $this->deduplicationLevel = Logger::toMonologLevel($deduplicationLevel);
-        $this->time = $time;
-    }
-
-    public function flush()
-    {
-        if ($this->bufferSize === 0) {
-            return;
-        }
-
-        $passthru = null;
-
-        foreach ($this->buffer as $record) {
-            if ($record['level'] >= $this->deduplicationLevel) {
-
-                $passthru = $passthru || !$this->isDuplicate($record);
-                if ($passthru) {
-                    $this->appendRecord($record);
-                }
-            }
-        }
-
-        // default of null is valid as well as if no record matches duplicationLevel we just pass through
-        if ($passthru === true || $passthru === null) {
-            $this->handler->handleBatch($this->buffer);
-        }
-
-        $this->clear();
-
-        if ($this->gc) {
-            $this->collectLogs();
-        }
-    }
-
-    private function isDuplicate(array $record)
-    {
-        if (!file_exists($this->deduplicationStore)) {
-            return false;
-        }
-
-        $store = file($this->deduplicationStore, FILE_IGNORE_NEW_LINES | FILE_SKIP_EMPTY_LINES);
-        if (!is_array($store)) {
-            return false;
-        }
-
-        $yesterday = time() - 86400;
-        $timestampValidity = $record['datetime']->getTimestamp() - $this->time;
-        $expectedMessage = preg_replace('{[\r\n].*}', '', $record['message']);
-
-        for ($i = count($store) - 1; $i >= 0; $i--) {
-            list($timestamp, $level, $message) = explode(':', $store[$i], 3);
-
-            if ($level === $record['level_name'] && $message === $expectedMessage && $timestamp > $timestampValidity) {
-                return true;
-            }
-
-            if ($timestamp < $yesterday) {
-                $this->gc = true;
-            }
-        }
-
-        return false;
-    }
-
-    private function collectLogs()
-    {
-        if (!file_exists($this->deduplicationStore)) {
-            return false;
-        }
-
-        $handle = fopen($this->deduplicationStore, 'rw+');
-        flock($handle, LOCK_EX);
-        $validLogs = array();
-
-        $timestampValidity = time() - $this->time;
-
-        while (!feof($handle)) {
-            $log = fgets($handle);
-            if (substr($log, 0, 10) >= $timestampValidity) {
-                $validLogs[] = $log;
-            }
-        }
-
-        ftruncate($handle, 0);
-        rewind($handle);
-        foreach ($validLogs as $log) {
-            fwrite($handle, $log);
-        }
-
-        flock($handle, LOCK_UN);
-        fclose($handle);
-
-        $this->gc = false;
-    }
-
-    private function appendRecord(array $record)
-    {
-        file_put_contents($this->deduplicationStore, $record['datetime']->getTimestamp() . ':' . $record['level_name'] . ':' . preg_replace('{[\r\n].*}', '', $record['message']) . "\n", FILE_APPEND);
-    }
-}
diff --git a/mayor-orig/www/include/share/googleapi/monolog/monolog/src/Monolog/Handler/DoctrineCouchDBHandler.php b/mayor-orig/www/include/share/googleapi/monolog/monolog/src/Monolog/Handler/DoctrineCouchDBHandler.php
deleted file mode 100644
index b91ffec9..00000000
--- a/mayor-orig/www/include/share/googleapi/monolog/monolog/src/Monolog/Handler/DoctrineCouchDBHandler.php
+++ /dev/null
@@ -1,45 +0,0 @@
-
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Monolog\Handler;
-
-use Monolog\Logger;
-use Monolog\Formatter\NormalizerFormatter;
-use Doctrine\CouchDB\CouchDBClient;
-
-/**
- * CouchDB handler for Doctrine CouchDB ODM
- *
- * @author Markus Bachmann 
- */
-class DoctrineCouchDBHandler extends AbstractProcessingHandler
-{
-    private $client;
-
-    public function __construct(CouchDBClient $client, $level = Logger::DEBUG, $bubble = true)
-    {
-        $this->client = $client;
-        parent::__construct($level, $bubble);
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    protected function write(array $record)
-    {
-        $this->client->postDocument($record['formatted']);
-    }
-
-    protected function getDefaultFormatter()
-    {
-        return new NormalizerFormatter;
-    }
-}
diff --git a/mayor-orig/www/include/share/googleapi/monolog/monolog/src/Monolog/Handler/DynamoDbHandler.php b/mayor-orig/www/include/share/googleapi/monolog/monolog/src/Monolog/Handler/DynamoDbHandler.php
deleted file mode 100644
index 237b71f6..00000000
--- a/mayor-orig/www/include/share/googleapi/monolog/monolog/src/Monolog/Handler/DynamoDbHandler.php
+++ /dev/null
@@ -1,107 +0,0 @@
-
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Monolog\Handler;
-
-use Aws\Sdk;
-use Aws\DynamoDb\DynamoDbClient;
-use Aws\DynamoDb\Marshaler;
-use Monolog\Formatter\ScalarFormatter;
-use Monolog\Logger;
-
-/**
- * Amazon DynamoDB handler (http://aws.amazon.com/dynamodb/)
- *
- * @link https://github.com/aws/aws-sdk-php/
- * @author Andrew Lawson 
- */
-class DynamoDbHandler extends AbstractProcessingHandler
-{
-    const DATE_FORMAT = 'Y-m-d\TH:i:s.uO';
-
-    /**
-     * @var DynamoDbClient
-     */
-    protected $client;
-
-    /**
-     * @var string
-     */
-    protected $table;
-
-    /**
-     * @var int
-     */
-    protected $version;
-
-    /**
-     * @var Marshaler
-     */
-    protected $marshaler;
-
-    /**
-     * @param DynamoDbClient $client
-     * @param string         $table
-     * @param int            $level
-     * @param bool           $bubble
-     */
-    public function __construct(DynamoDbClient $client, $table, $level = Logger::DEBUG, $bubble = true)
-    {
-        if (defined('Aws\Sdk::VERSION') && version_compare(Sdk::VERSION, '3.0', '>=')) {
-            $this->version = 3;
-            $this->marshaler = new Marshaler;
-        } else {
-            $this->version = 2;
-        }
-
-        $this->client = $client;
-        $this->table = $table;
-
-        parent::__construct($level, $bubble);
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    protected function write(array $record)
-    {
-        $filtered = $this->filterEmptyFields($record['formatted']);
-        if ($this->version === 3) {
-            $formatted = $this->marshaler->marshalItem($filtered);
-        } else {
-            $formatted = $this->client->formatAttributes($filtered);
-        }
-
-        $this->client->putItem(array(
-            'TableName' => $this->table,
-            'Item' => $formatted,
-        ));
-    }
-
-    /**
-     * @param  array $record
-     * @return array
-     */
-    protected function filterEmptyFields(array $record)
-    {
-        return array_filter($record, function ($value) {
-            return !empty($value) || false === $value || 0 === $value;
-        });
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    protected function getDefaultFormatter()
-    {
-        return new ScalarFormatter(self::DATE_FORMAT);
-    }
-}
diff --git a/mayor-orig/www/include/share/googleapi/monolog/monolog/src/Monolog/Handler/ElasticSearchHandler.php b/mayor-orig/www/include/share/googleapi/monolog/monolog/src/Monolog/Handler/ElasticSearchHandler.php
deleted file mode 100644
index 81967406..00000000
--- a/mayor-orig/www/include/share/googleapi/monolog/monolog/src/Monolog/Handler/ElasticSearchHandler.php
+++ /dev/null
@@ -1,128 +0,0 @@
-
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Monolog\Handler;
-
-use Monolog\Formatter\FormatterInterface;
-use Monolog\Formatter\ElasticaFormatter;
-use Monolog\Logger;
-use Elastica\Client;
-use Elastica\Exception\ExceptionInterface;
-
-/**
- * Elastic Search handler
- *
- * Usage example:
- *
- *    $client = new \Elastica\Client();
- *    $options = array(
- *        'index' => 'elastic_index_name',
- *        'type' => 'elastic_doc_type',
- *    );
- *    $handler = new ElasticSearchHandler($client, $options);
- *    $log = new Logger('application');
- *    $log->pushHandler($handler);
- *
- * @author Jelle Vink 
- */
-class ElasticSearchHandler extends AbstractProcessingHandler
-{
-    /**
-     * @var Client
-     */
-    protected $client;
-
-    /**
-     * @var array Handler config options
-     */
-    protected $options = array();
-
-    /**
-     * @param Client  $client  Elastica Client object
-     * @param array   $options Handler configuration
-     * @param int     $level   The minimum logging level at which this handler will be triggered
-     * @param Boolean $bubble  Whether the messages that are handled can bubble up the stack or not
-     */
-    public function __construct(Client $client, array $options = array(), $level = Logger::DEBUG, $bubble = true)
-    {
-        parent::__construct($level, $bubble);
-        $this->client = $client;
-        $this->options = array_merge(
-            array(
-                'index'          => 'monolog',      // Elastic index name
-                'type'           => 'record',       // Elastic document type
-                'ignore_error'   => false,          // Suppress Elastica exceptions
-            ),
-            $options
-        );
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    protected function write(array $record)
-    {
-        $this->bulkSend(array($record['formatted']));
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function setFormatter(FormatterInterface $formatter)
-    {
-        if ($formatter instanceof ElasticaFormatter) {
-            return parent::setFormatter($formatter);
-        }
-        throw new \InvalidArgumentException('ElasticSearchHandler is only compatible with ElasticaFormatter');
-    }
-
-    /**
-     * Getter options
-     * @return array
-     */
-    public function getOptions()
-    {
-        return $this->options;
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    protected function getDefaultFormatter()
-    {
-        return new ElasticaFormatter($this->options['index'], $this->options['type']);
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function handleBatch(array $records)
-    {
-        $documents = $this->getFormatter()->formatBatch($records);
-        $this->bulkSend($documents);
-    }
-
-    /**
-     * Use Elasticsearch bulk API to send list of documents
-     * @param  array             $documents
-     * @throws \RuntimeException
-     */
-    protected function bulkSend(array $documents)
-    {
-        try {
-            $this->client->addDocuments($documents);
-        } catch (ExceptionInterface $e) {
-            if (!$this->options['ignore_error']) {
-                throw new \RuntimeException("Error sending messages to Elasticsearch", 0, $e);
-            }
-        }
-    }
-}
diff --git a/mayor-orig/www/include/share/googleapi/monolog/monolog/src/Monolog/Handler/ErrorLogHandler.php b/mayor-orig/www/include/share/googleapi/monolog/monolog/src/Monolog/Handler/ErrorLogHandler.php
deleted file mode 100644
index 1447a584..00000000
--- a/mayor-orig/www/include/share/googleapi/monolog/monolog/src/Monolog/Handler/ErrorLogHandler.php
+++ /dev/null
@@ -1,82 +0,0 @@
-
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Monolog\Handler;
-
-use Monolog\Formatter\LineFormatter;
-use Monolog\Logger;
-
-/**
- * Stores to PHP error_log() handler.
- *
- * @author Elan Ruusamäe 
- */
-class ErrorLogHandler extends AbstractProcessingHandler
-{
-    const OPERATING_SYSTEM = 0;
-    const SAPI = 4;
-
-    protected $messageType;
-    protected $expandNewlines;
-
-    /**
-     * @param int     $messageType    Says where the error should go.
-     * @param int     $level          The minimum logging level at which this handler will be triggered
-     * @param Boolean $bubble         Whether the messages that are handled can bubble up the stack or not
-     * @param Boolean $expandNewlines If set to true, newlines in the message will be expanded to be take multiple log entries
-     */
-    public function __construct($messageType = self::OPERATING_SYSTEM, $level = Logger::DEBUG, $bubble = true, $expandNewlines = false)
-    {
-        parent::__construct($level, $bubble);
-
-        if (false === in_array($messageType, self::getAvailableTypes())) {
-            $message = sprintf('The given message type "%s" is not supported', print_r($messageType, true));
-            throw new \InvalidArgumentException($message);
-        }
-
-        $this->messageType = $messageType;
-        $this->expandNewlines = $expandNewlines;
-    }
-
-    /**
-     * @return array With all available types
-     */
-    public static function getAvailableTypes()
-    {
-        return array(
-            self::OPERATING_SYSTEM,
-            self::SAPI,
-        );
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    protected function getDefaultFormatter()
-    {
-        return new LineFormatter('[%datetime%] %channel%.%level_name%: %message% %context% %extra%');
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    protected function write(array $record)
-    {
-        if ($this->expandNewlines) {
-            $lines = preg_split('{[\r\n]+}', (string) $record['formatted']);
-            foreach ($lines as $line) {
-                error_log($line, $this->messageType);
-            }
-        } else {
-            error_log((string) $record['formatted'], $this->messageType);
-        }
-    }
-}
diff --git a/mayor-orig/www/include/share/googleapi/monolog/monolog/src/Monolog/Handler/FilterHandler.php b/mayor-orig/www/include/share/googleapi/monolog/monolog/src/Monolog/Handler/FilterHandler.php
deleted file mode 100644
index 2a0f7fd1..00000000
--- a/mayor-orig/www/include/share/googleapi/monolog/monolog/src/Monolog/Handler/FilterHandler.php
+++ /dev/null
@@ -1,140 +0,0 @@
-
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Monolog\Handler;
-
-use Monolog\Logger;
-
-/**
- * Simple handler wrapper that filters records based on a list of levels
- *
- * It can be configured with an exact list of levels to allow, or a min/max level.
- *
- * @author Hennadiy Verkh
- * @author Jordi Boggiano 
- */
-class FilterHandler extends AbstractHandler
-{
-    /**
-     * Handler or factory callable($record, $this)
-     *
-     * @var callable|\Monolog\Handler\HandlerInterface
-     */
-    protected $handler;
-
-    /**
-     * Minimum level for logs that are passed to handler
-     *
-     * @var int[]
-     */
-    protected $acceptedLevels;
-
-    /**
-     * Whether the messages that are handled can bubble up the stack or not
-     *
-     * @var Boolean
-     */
-    protected $bubble;
-
-    /**
-     * @param callable|HandlerInterface $handler        Handler or factory callable($record, $this).
-     * @param int|array                 $minLevelOrList A list of levels to accept or a minimum level if maxLevel is provided
-     * @param int                       $maxLevel       Maximum level to accept, only used if $minLevelOrList is not an array
-     * @param Boolean                   $bubble         Whether the messages that are handled can bubble up the stack or not
-     */
-    public function __construct($handler, $minLevelOrList = Logger::DEBUG, $maxLevel = Logger::EMERGENCY, $bubble = true)
-    {
-        $this->handler  = $handler;
-        $this->bubble   = $bubble;
-        $this->setAcceptedLevels($minLevelOrList, $maxLevel);
-
-        if (!$this->handler instanceof HandlerInterface && !is_callable($this->handler)) {
-            throw new \RuntimeException("The given handler (".json_encode($this->handler).") is not a callable nor a Monolog\Handler\HandlerInterface object");
-        }
-    }
-
-    /**
-     * @return array
-     */
-    public function getAcceptedLevels()
-    {
-        return array_flip($this->acceptedLevels);
-    }
-
-    /**
-     * @param int|string|array $minLevelOrList A list of levels to accept or a minimum level or level name if maxLevel is provided
-     * @param int|string       $maxLevel       Maximum level or level name to accept, only used if $minLevelOrList is not an array
-     */
-    public function setAcceptedLevels($minLevelOrList = Logger::DEBUG, $maxLevel = Logger::EMERGENCY)
-    {
-        if (is_array($minLevelOrList)) {
-            $acceptedLevels = array_map('Monolog\Logger::toMonologLevel', $minLevelOrList);
-        } else {
-            $minLevelOrList = Logger::toMonologLevel($minLevelOrList);
-            $maxLevel = Logger::toMonologLevel($maxLevel);
-            $acceptedLevels = array_values(array_filter(Logger::getLevels(), function ($level) use ($minLevelOrList, $maxLevel) {
-                return $level >= $minLevelOrList && $level <= $maxLevel;
-            }));
-        }
-        $this->acceptedLevels = array_flip($acceptedLevels);
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function isHandling(array $record)
-    {
-        return isset($this->acceptedLevels[$record['level']]);
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function handle(array $record)
-    {
-        if (!$this->isHandling($record)) {
-            return false;
-        }
-
-        // The same logic as in FingersCrossedHandler
-        if (!$this->handler instanceof HandlerInterface) {
-            $this->handler = call_user_func($this->handler, $record, $this);
-            if (!$this->handler instanceof HandlerInterface) {
-                throw new \RuntimeException("The factory callable should return a HandlerInterface");
-            }
-        }
-
-        if ($this->processors) {
-            foreach ($this->processors as $processor) {
-                $record = call_user_func($processor, $record);
-            }
-        }
-
-        $this->handler->handle($record);
-
-        return false === $this->bubble;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function handleBatch(array $records)
-    {
-        $filtered = array();
-        foreach ($records as $record) {
-            if ($this->isHandling($record)) {
-                $filtered[] = $record;
-            }
-        }
-
-        $this->handler->handleBatch($filtered);
-    }
-}
diff --git a/mayor-orig/www/include/share/googleapi/monolog/monolog/src/Monolog/Handler/FingersCrossed/ActivationStrategyInterface.php b/mayor-orig/www/include/share/googleapi/monolog/monolog/src/Monolog/Handler/FingersCrossed/ActivationStrategyInterface.php
deleted file mode 100644
index c3e42efe..00000000
--- a/mayor-orig/www/include/share/googleapi/monolog/monolog/src/Monolog/Handler/FingersCrossed/ActivationStrategyInterface.php
+++ /dev/null
@@ -1,28 +0,0 @@
-
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Monolog\Handler\FingersCrossed;
-
-/**
- * Interface for activation strategies for the FingersCrossedHandler.
- *
- * @author Johannes M. Schmitt 
- */
-interface ActivationStrategyInterface
-{
-    /**
-     * Returns whether the given record activates the handler.
-     *
-     * @param  array   $record
-     * @return Boolean
-     */
-    public function isHandlerActivated(array $record);
-}
diff --git a/mayor-orig/www/include/share/googleapi/monolog/monolog/src/Monolog/Handler/FingersCrossed/ChannelLevelActivationStrategy.php b/mayor-orig/www/include/share/googleapi/monolog/monolog/src/Monolog/Handler/FingersCrossed/ChannelLevelActivationStrategy.php
deleted file mode 100644
index 2a2a64d9..00000000
--- a/mayor-orig/www/include/share/googleapi/monolog/monolog/src/Monolog/Handler/FingersCrossed/ChannelLevelActivationStrategy.php
+++ /dev/null
@@ -1,59 +0,0 @@
-
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Monolog\Handler\FingersCrossed;
-
-use Monolog\Logger;
-
-/**
- * Channel and Error level based monolog activation strategy. Allows to trigger activation
- * based on level per channel. e.g. trigger activation on level 'ERROR' by default, except
- * for records of the 'sql' channel; those should trigger activation on level 'WARN'.
- *
- * Example:
- *
- * 
- *   $activationStrategy = new ChannelLevelActivationStrategy(
- *       Logger::CRITICAL,
- *       array(
- *           'request' => Logger::ALERT,
- *           'sensitive' => Logger::ERROR,
- *       )
- *   );
- *   $handler = new FingersCrossedHandler(new StreamHandler('php://stderr'), $activationStrategy);
- * 
- *
- * @author Mike Meessen 
- */
-class ChannelLevelActivationStrategy implements ActivationStrategyInterface
-{
-    private $defaultActionLevel;
-    private $channelToActionLevel;
-
-    /**
-     * @param int   $defaultActionLevel   The default action level to be used if the record's category doesn't match any
-     * @param array $channelToActionLevel An array that maps channel names to action levels.
-     */
-    public function __construct($defaultActionLevel, $channelToActionLevel = array())
-    {
-        $this->defaultActionLevel = Logger::toMonologLevel($defaultActionLevel);
-        $this->channelToActionLevel = array_map('Monolog\Logger::toMonologLevel', $channelToActionLevel);
-    }
-
-    public function isHandlerActivated(array $record)
-    {
-        if (isset($this->channelToActionLevel[$record['channel']])) {
-            return $record['level'] >= $this->channelToActionLevel[$record['channel']];
-        }
-
-        return $record['level'] >= $this->defaultActionLevel;
-    }
-}
diff --git a/mayor-orig/www/include/share/googleapi/monolog/monolog/src/Monolog/Handler/FingersCrossed/ErrorLevelActivationStrategy.php b/mayor-orig/www/include/share/googleapi/monolog/monolog/src/Monolog/Handler/FingersCrossed/ErrorLevelActivationStrategy.php
deleted file mode 100644
index 6e630852..00000000
--- a/mayor-orig/www/include/share/googleapi/monolog/monolog/src/Monolog/Handler/FingersCrossed/ErrorLevelActivationStrategy.php
+++ /dev/null
@@ -1,34 +0,0 @@
-
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Monolog\Handler\FingersCrossed;
-
-use Monolog\Logger;
-
-/**
- * Error level based activation strategy.
- *
- * @author Johannes M. Schmitt 
- */
-class ErrorLevelActivationStrategy implements ActivationStrategyInterface
-{
-    private $actionLevel;
-
-    public function __construct($actionLevel)
-    {
-        $this->actionLevel = Logger::toMonologLevel($actionLevel);
-    }
-
-    public function isHandlerActivated(array $record)
-    {
-        return $record['level'] >= $this->actionLevel;
-    }
-}
diff --git a/mayor-orig/www/include/share/googleapi/monolog/monolog/src/Monolog/Handler/FingersCrossedHandler.php b/mayor-orig/www/include/share/googleapi/monolog/monolog/src/Monolog/Handler/FingersCrossedHandler.php
deleted file mode 100644
index d1dcaacf..00000000
--- a/mayor-orig/www/include/share/googleapi/monolog/monolog/src/Monolog/Handler/FingersCrossedHandler.php
+++ /dev/null
@@ -1,163 +0,0 @@
-
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Monolog\Handler;
-
-use Monolog\Handler\FingersCrossed\ErrorLevelActivationStrategy;
-use Monolog\Handler\FingersCrossed\ActivationStrategyInterface;
-use Monolog\Logger;
-
-/**
- * Buffers all records until a certain level is reached
- *
- * The advantage of this approach is that you don't get any clutter in your log files.
- * Only requests which actually trigger an error (or whatever your actionLevel is) will be
- * in the logs, but they will contain all records, not only those above the level threshold.
- *
- * You can find the various activation strategies in the
- * Monolog\Handler\FingersCrossed\ namespace.
- *
- * @author Jordi Boggiano 
- */
-class FingersCrossedHandler extends AbstractHandler
-{
-    protected $handler;
-    protected $activationStrategy;
-    protected $buffering = true;
-    protected $bufferSize;
-    protected $buffer = array();
-    protected $stopBuffering;
-    protected $passthruLevel;
-
-    /**
-     * @param callable|HandlerInterface       $handler            Handler or factory callable($record, $fingersCrossedHandler).
-     * @param int|ActivationStrategyInterface $activationStrategy Strategy which determines when this handler takes action
-     * @param int                             $bufferSize         How many entries should be buffered at most, beyond that the oldest items are removed from the buffer.
-     * @param Boolean                         $bubble             Whether the messages that are handled can bubble up the stack or not
-     * @param Boolean                         $stopBuffering      Whether the handler should stop buffering after being triggered (default true)
-     * @param int                             $passthruLevel      Minimum level to always flush to handler on close, even if strategy not triggered
-     */
-    public function __construct($handler, $activationStrategy = null, $bufferSize = 0, $bubble = true, $stopBuffering = true, $passthruLevel = null)
-    {
-        if (null === $activationStrategy) {
-            $activationStrategy = new ErrorLevelActivationStrategy(Logger::WARNING);
-        }
-
-        // convert simple int activationStrategy to an object
-        if (!$activationStrategy instanceof ActivationStrategyInterface) {
-            $activationStrategy = new ErrorLevelActivationStrategy($activationStrategy);
-        }
-
-        $this->handler = $handler;
-        $this->activationStrategy = $activationStrategy;
-        $this->bufferSize = $bufferSize;
-        $this->bubble = $bubble;
-        $this->stopBuffering = $stopBuffering;
-
-        if ($passthruLevel !== null) {
-            $this->passthruLevel = Logger::toMonologLevel($passthruLevel);
-        }
-
-        if (!$this->handler instanceof HandlerInterface && !is_callable($this->handler)) {
-            throw new \RuntimeException("The given handler (".json_encode($this->handler).") is not a callable nor a Monolog\Handler\HandlerInterface object");
-        }
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function isHandling(array $record)
-    {
-        return true;
-    }
-
-    /**
-     * Manually activate this logger regardless of the activation strategy
-     */
-    public function activate()
-    {
-        if ($this->stopBuffering) {
-            $this->buffering = false;
-        }
-        if (!$this->handler instanceof HandlerInterface) {
-            $record = end($this->buffer) ?: null;
-
-            $this->handler = call_user_func($this->handler, $record, $this);
-            if (!$this->handler instanceof HandlerInterface) {
-                throw new \RuntimeException("The factory callable should return a HandlerInterface");
-            }
-        }
-        $this->handler->handleBatch($this->buffer);
-        $this->buffer = array();
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function handle(array $record)
-    {
-        if ($this->processors) {
-            foreach ($this->processors as $processor) {
-                $record = call_user_func($processor, $record);
-            }
-        }
-
-        if ($this->buffering) {
-            $this->buffer[] = $record;
-            if ($this->bufferSize > 0 && count($this->buffer) > $this->bufferSize) {
-                array_shift($this->buffer);
-            }
-            if ($this->activationStrategy->isHandlerActivated($record)) {
-                $this->activate();
-            }
-        } else {
-            $this->handler->handle($record);
-        }
-
-        return false === $this->bubble;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function close()
-    {
-        if (null !== $this->passthruLevel) {
-            $level = $this->passthruLevel;
-            $this->buffer = array_filter($this->buffer, function ($record) use ($level) {
-                return $record['level'] >= $level;
-            });
-            if (count($this->buffer) > 0) {
-                $this->handler->handleBatch($this->buffer);
-                $this->buffer = array();
-            }
-        }
-    }
-
-    /**
-     * Resets the state of the handler. Stops forwarding records to the wrapped handler.
-     */
-    public function reset()
-    {
-        $this->buffering = true;
-    }
-
-    /**
-     * Clears the buffer without flushing any messages down to the wrapped handler.
-     *
-     * It also resets the handler to its initial buffering state.
-     */
-    public function clear()
-    {
-        $this->buffer = array();
-        $this->reset();
-    }
-}
diff --git a/mayor-orig/www/include/share/googleapi/monolog/monolog/src/Monolog/Handler/FirePHPHandler.php b/mayor-orig/www/include/share/googleapi/monolog/monolog/src/Monolog/Handler/FirePHPHandler.php
deleted file mode 100644
index fee47950..00000000
--- a/mayor-orig/www/include/share/googleapi/monolog/monolog/src/Monolog/Handler/FirePHPHandler.php
+++ /dev/null
@@ -1,195 +0,0 @@
-
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Monolog\Handler;
-
-use Monolog\Formatter\WildfireFormatter;
-
-/**
- * Simple FirePHP Handler (http://www.firephp.org/), which uses the Wildfire protocol.
- *
- * @author Eric Clemmons (@ericclemmons) 
- */
-class FirePHPHandler extends AbstractProcessingHandler
-{
-    /**
-     * WildFire JSON header message format
-     */
-    const PROTOCOL_URI = 'http://meta.wildfirehq.org/Protocol/JsonStream/0.2';
-
-    /**
-     * FirePHP structure for parsing messages & their presentation
-     */
-    const STRUCTURE_URI = 'http://meta.firephp.org/Wildfire/Structure/FirePHP/FirebugConsole/0.1';
-
-    /**
-     * Must reference a "known" plugin, otherwise headers won't display in FirePHP
-     */
-    const PLUGIN_URI = 'http://meta.firephp.org/Wildfire/Plugin/FirePHP/Library-FirePHPCore/0.3';
-
-    /**
-     * Header prefix for Wildfire to recognize & parse headers
-     */
-    const HEADER_PREFIX = 'X-Wf';
-
-    /**
-     * Whether or not Wildfire vendor-specific headers have been generated & sent yet
-     */
-    protected static $initialized = false;
-
-    /**
-     * Shared static message index between potentially multiple handlers
-     * @var int
-     */
-    protected static $messageIndex = 1;
-
-    protected static $sendHeaders = true;
-
-    /**
-     * Base header creation function used by init headers & record headers
-     *
-     * @param  array  $meta    Wildfire Plugin, Protocol & Structure Indexes
-     * @param  string $message Log message
-     * @return array  Complete header string ready for the client as key and message as value
-     */
-    protected function createHeader(array $meta, $message)
-    {
-        $header = sprintf('%s-%s', self::HEADER_PREFIX, join('-', $meta));
-
-        return array($header => $message);
-    }
-
-    /**
-     * Creates message header from record
-     *
-     * @see createHeader()
-     * @param  array  $record
-     * @return string
-     */
-    protected function createRecordHeader(array $record)
-    {
-        // Wildfire is extensible to support multiple protocols & plugins in a single request,
-        // but we're not taking advantage of that (yet), so we're using "1" for simplicity's sake.
-        return $this->createHeader(
-            array(1, 1, 1, self::$messageIndex++),
-            $record['formatted']
-        );
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    protected function getDefaultFormatter()
-    {
-        return new WildfireFormatter();
-    }
-
-    /**
-     * Wildfire initialization headers to enable message parsing
-     *
-     * @see createHeader()
-     * @see sendHeader()
-     * @return array
-     */
-    protected function getInitHeaders()
-    {
-        // Initial payload consists of required headers for Wildfire
-        return array_merge(
-            $this->createHeader(array('Protocol', 1), self::PROTOCOL_URI),
-            $this->createHeader(array(1, 'Structure', 1), self::STRUCTURE_URI),
-            $this->createHeader(array(1, 'Plugin', 1), self::PLUGIN_URI)
-        );
-    }
-
-    /**
-     * Send header string to the client
-     *
-     * @param string $header
-     * @param string $content
-     */
-    protected function sendHeader($header, $content)
-    {
-        if (!headers_sent() && self::$sendHeaders) {
-            header(sprintf('%s: %s', $header, $content));
-        }
-    }
-
-    /**
-     * Creates & sends header for a record, ensuring init headers have been sent prior
-     *
-     * @see sendHeader()
-     * @see sendInitHeaders()
-     * @param array $record
-     */
-    protected function write(array $record)
-    {
-        if (!self::$sendHeaders) {
-            return;
-        }
-
-        // WildFire-specific headers must be sent prior to any messages
-        if (!self::$initialized) {
-            self::$initialized = true;
-
-            self::$sendHeaders = $this->headersAccepted();
-            if (!self::$sendHeaders) {
-                return;
-            }
-
-            foreach ($this->getInitHeaders() as $header => $content) {
-                $this->sendHeader($header, $content);
-            }
-        }
-
-        $header = $this->createRecordHeader($record);
-        if (trim(current($header)) !== '') {
-            $this->sendHeader(key($header), current($header));
-        }
-    }
-
-    /**
-     * Verifies if the headers are accepted by the current user agent
-     *
-     * @return Boolean
-     */
-    protected function headersAccepted()
-    {
-        if (!empty($_SERVER['HTTP_USER_AGENT']) && preg_match('{\bFirePHP/\d+\.\d+\b}', $_SERVER['HTTP_USER_AGENT'])) {
-            return true;
-        }
-
-        return isset($_SERVER['HTTP_X_FIREPHP_VERSION']);
-    }
-
-    /**
-     * BC getter for the sendHeaders property that has been made static
-     */
-    public function __get($property)
-    {
-        if ('sendHeaders' !== $property) {
-            throw new \InvalidArgumentException('Undefined property '.$property);
-        }
-
-        return static::$sendHeaders;
-    }
-
-    /**
-     * BC setter for the sendHeaders property that has been made static
-     */
-    public function __set($property, $value)
-    {
-        if ('sendHeaders' !== $property) {
-            throw new \InvalidArgumentException('Undefined property '.$property);
-        }
-
-        static::$sendHeaders = $value;
-    }
-}
diff --git a/mayor-orig/www/include/share/googleapi/monolog/monolog/src/Monolog/Handler/FleepHookHandler.php b/mayor-orig/www/include/share/googleapi/monolog/monolog/src/Monolog/Handler/FleepHookHandler.php
deleted file mode 100644
index c43c0134..00000000
--- a/mayor-orig/www/include/share/googleapi/monolog/monolog/src/Monolog/Handler/FleepHookHandler.php
+++ /dev/null
@@ -1,126 +0,0 @@
-
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Monolog\Handler;
-
-use Monolog\Formatter\LineFormatter;
-use Monolog\Logger;
-
-/**
- * Sends logs to Fleep.io using Webhook integrations
- *
- * You'll need a Fleep.io account to use this handler.
- *
- * @see https://fleep.io/integrations/webhooks/ Fleep Webhooks Documentation
- * @author Ando Roots 
- */
-class FleepHookHandler extends SocketHandler
-{
-    const FLEEP_HOST = 'fleep.io';
-
-    const FLEEP_HOOK_URI = '/hook/';
-
-    /**
-     * @var string Webhook token (specifies the conversation where logs are sent)
-     */
-    protected $token;
-
-    /**
-     * Construct a new Fleep.io Handler.
-     *
-     * For instructions on how to create a new web hook in your conversations
-     * see https://fleep.io/integrations/webhooks/
-     *
-     * @param  string                    $token  Webhook token
-     * @param  bool|int                  $level  The minimum logging level at which this handler will be triggered
-     * @param  bool                      $bubble Whether the messages that are handled can bubble up the stack or not
-     * @throws MissingExtensionException
-     */
-    public function __construct($token, $level = Logger::DEBUG, $bubble = true)
-    {
-        if (!extension_loaded('openssl')) {
-            throw new MissingExtensionException('The OpenSSL PHP extension is required to use the FleepHookHandler');
-        }
-
-        $this->token = $token;
-
-        $connectionString = 'ssl://' . self::FLEEP_HOST . ':443';
-        parent::__construct($connectionString, $level, $bubble);
-    }
-
-    /**
-     * Returns the default formatter to use with this handler
-     *
-     * Overloaded to remove empty context and extra arrays from the end of the log message.
-     *
-     * @return LineFormatter
-     */
-    protected function getDefaultFormatter()
-    {
-        return new LineFormatter(null, null, true, true);
-    }
-
-    /**
-     * Handles a log record
-     *
-     * @param array $record
-     */
-    public function write(array $record)
-    {
-        parent::write($record);
-        $this->closeSocket();
-    }
-
-    /**
-     * {@inheritdoc}
-     *
-     * @param  array  $record
-     * @return string
-     */
-    protected function generateDataStream($record)
-    {
-        $content = $this->buildContent($record);
-
-        return $this->buildHeader($content) . $content;
-    }
-
-    /**
-     * Builds the header of the API Call
-     *
-     * @param  string $content
-     * @return string
-     */
-    private function buildHeader($content)
-    {
-        $header = "POST " . self::FLEEP_HOOK_URI . $this->token . " HTTP/1.1\r\n";
-        $header .= "Host: " . self::FLEEP_HOST . "\r\n";
-        $header .= "Content-Type: application/x-www-form-urlencoded\r\n";
-        $header .= "Content-Length: " . strlen($content) . "\r\n";
-        $header .= "\r\n";
-
-        return $header;
-    }
-
-    /**
-     * Builds the body of API call
-     *
-     * @param  array  $record
-     * @return string
-     */
-    private function buildContent($record)
-    {
-        $dataArray = array(
-            'message' => $record['formatted'],
-        );
-
-        return http_build_query($dataArray);
-    }
-}
diff --git a/mayor-orig/www/include/share/googleapi/monolog/monolog/src/Monolog/Handler/FlowdockHandler.php b/mayor-orig/www/include/share/googleapi/monolog/monolog/src/Monolog/Handler/FlowdockHandler.php
deleted file mode 100644
index dd9a361c..00000000
--- a/mayor-orig/www/include/share/googleapi/monolog/monolog/src/Monolog/Handler/FlowdockHandler.php
+++ /dev/null
@@ -1,127 +0,0 @@
-
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Monolog\Handler;
-
-use Monolog\Logger;
-use Monolog\Formatter\FlowdockFormatter;
-use Monolog\Formatter\FormatterInterface;
-
-/**
- * Sends notifications through the Flowdock push API
- *
- * This must be configured with a FlowdockFormatter instance via setFormatter()
- *
- * Notes:
- * API token - Flowdock API token
- *
- * @author Dominik Liebler 
- * @see https://www.flowdock.com/api/push
- */
-class FlowdockHandler extends SocketHandler
-{
-    /**
-     * @var string
-     */
-    protected $apiToken;
-
-    /**
-     * @param string   $apiToken
-     * @param bool|int $level    The minimum logging level at which this handler will be triggered
-     * @param bool     $bubble   Whether the messages that are handled can bubble up the stack or not
-     *
-     * @throws MissingExtensionException if OpenSSL is missing
-     */
-    public function __construct($apiToken, $level = Logger::DEBUG, $bubble = true)
-    {
-        if (!extension_loaded('openssl')) {
-            throw new MissingExtensionException('The OpenSSL PHP extension is required to use the FlowdockHandler');
-        }
-
-        parent::__construct('ssl://api.flowdock.com:443', $level, $bubble);
-        $this->apiToken = $apiToken;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function setFormatter(FormatterInterface $formatter)
-    {
-        if (!$formatter instanceof FlowdockFormatter) {
-            throw new \InvalidArgumentException('The FlowdockHandler requires an instance of Monolog\Formatter\FlowdockFormatter to function correctly');
-        }
-
-        return parent::setFormatter($formatter);
-    }
-
-    /**
-     * Gets the default formatter.
-     *
-     * @return FormatterInterface
-     */
-    protected function getDefaultFormatter()
-    {
-        throw new \InvalidArgumentException('The FlowdockHandler must be configured (via setFormatter) with an instance of Monolog\Formatter\FlowdockFormatter to function correctly');
-    }
-
-    /**
-     * {@inheritdoc}
-     *
-     * @param array $record
-     */
-    protected function write(array $record)
-    {
-        parent::write($record);
-
-        $this->closeSocket();
-    }
-
-    /**
-     * {@inheritdoc}
-     *
-     * @param  array  $record
-     * @return string
-     */
-    protected function generateDataStream($record)
-    {
-        $content = $this->buildContent($record);
-
-        return $this->buildHeader($content) . $content;
-    }
-
-    /**
-     * Builds the body of API call
-     *
-     * @param  array  $record
-     * @return string
-     */
-    private function buildContent($record)
-    {
-        return json_encode($record['formatted']['flowdock']);
-    }
-
-    /**
-     * Builds the header of the API Call
-     *
-     * @param  string $content
-     * @return string
-     */
-    private function buildHeader($content)
-    {
-        $header = "POST /v1/messages/team_inbox/" . $this->apiToken . " HTTP/1.1\r\n";
-        $header .= "Host: api.flowdock.com\r\n";
-        $header .= "Content-Type: application/json\r\n";
-        $header .= "Content-Length: " . strlen($content) . "\r\n";
-        $header .= "\r\n";
-
-        return $header;
-    }
-}
diff --git a/mayor-orig/www/include/share/googleapi/monolog/monolog/src/Monolog/Handler/GelfHandler.php b/mayor-orig/www/include/share/googleapi/monolog/monolog/src/Monolog/Handler/GelfHandler.php
deleted file mode 100644
index d3847d82..00000000
--- a/mayor-orig/www/include/share/googleapi/monolog/monolog/src/Monolog/Handler/GelfHandler.php
+++ /dev/null
@@ -1,73 +0,0 @@
-
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Monolog\Handler;
-
-use Gelf\IMessagePublisher;
-use Gelf\PublisherInterface;
-use Gelf\Publisher;
-use InvalidArgumentException;
-use Monolog\Logger;
-use Monolog\Formatter\GelfMessageFormatter;
-
-/**
- * Handler to send messages to a Graylog2 (http://www.graylog2.org) server
- *
- * @author Matt Lehner 
- * @author Benjamin Zikarsky 
- */
-class GelfHandler extends AbstractProcessingHandler
-{
-    /**
-     * @var Publisher the publisher object that sends the message to the server
-     */
-    protected $publisher;
-
-    /**
-     * @param PublisherInterface|IMessagePublisher|Publisher $publisher a publisher object
-     * @param int                                            $level     The minimum logging level at which this handler will be triggered
-     * @param bool                                           $bubble    Whether the messages that are handled can bubble up the stack or not
-     */
-    public function __construct($publisher, $level = Logger::DEBUG, $bubble = true)
-    {
-        parent::__construct($level, $bubble);
-
-        if (!$publisher instanceof Publisher && !$publisher instanceof IMessagePublisher && !$publisher instanceof PublisherInterface) {
-            throw new InvalidArgumentException('Invalid publisher, expected a Gelf\Publisher, Gelf\IMessagePublisher or Gelf\PublisherInterface instance');
-        }
-
-        $this->publisher = $publisher;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function close()
-    {
-        $this->publisher = null;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    protected function write(array $record)
-    {
-        $this->publisher->publish($record['formatted']);
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    protected function getDefaultFormatter()
-    {
-        return new GelfMessageFormatter();
-    }
-}
diff --git a/mayor-orig/www/include/share/googleapi/monolog/monolog/src/Monolog/Handler/GroupHandler.php b/mayor-orig/www/include/share/googleapi/monolog/monolog/src/Monolog/Handler/GroupHandler.php
deleted file mode 100644
index 663f5a92..00000000
--- a/mayor-orig/www/include/share/googleapi/monolog/monolog/src/Monolog/Handler/GroupHandler.php
+++ /dev/null
@@ -1,104 +0,0 @@
-
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Monolog\Handler;
-
-use Monolog\Formatter\FormatterInterface;
-
-/**
- * Forwards records to multiple handlers
- *
- * @author Lenar Lõhmus 
- */
-class GroupHandler extends AbstractHandler
-{
-    protected $handlers;
-
-    /**
-     * @param array   $handlers Array of Handlers.
-     * @param Boolean $bubble   Whether the messages that are handled can bubble up the stack or not
-     */
-    public function __construct(array $handlers, $bubble = true)
-    {
-        foreach ($handlers as $handler) {
-            if (!$handler instanceof HandlerInterface) {
-                throw new \InvalidArgumentException('The first argument of the GroupHandler must be an array of HandlerInterface instances.');
-            }
-        }
-
-        $this->handlers = $handlers;
-        $this->bubble = $bubble;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function isHandling(array $record)
-    {
-        foreach ($this->handlers as $handler) {
-            if ($handler->isHandling($record)) {
-                return true;
-            }
-        }
-
-        return false;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function handle(array $record)
-    {
-        if ($this->processors) {
-            foreach ($this->processors as $processor) {
-                $record = call_user_func($processor, $record);
-            }
-        }
-
-        foreach ($this->handlers as $handler) {
-            $handler->handle($record);
-        }
-
-        return false === $this->bubble;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function handleBatch(array $records)
-    {
-        if ($this->processors) {
-            $processed = array();
-            foreach ($records as $record) {
-                foreach ($this->processors as $processor) {
-                    $processed[] = call_user_func($processor, $record);
-                }
-            }
-            $records = $processed;
-        }
-
-        foreach ($this->handlers as $handler) {
-            $handler->handleBatch($records);
-        }
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function setFormatter(FormatterInterface $formatter)
-    {
-        foreach ($this->handlers as $handler) {
-            $handler->setFormatter($formatter);
-        }
-
-        return $this;
-    }
-}
diff --git a/mayor-orig/www/include/share/googleapi/monolog/monolog/src/Monolog/Handler/HandlerInterface.php b/mayor-orig/www/include/share/googleapi/monolog/monolog/src/Monolog/Handler/HandlerInterface.php
deleted file mode 100644
index d920c4ba..00000000
--- a/mayor-orig/www/include/share/googleapi/monolog/monolog/src/Monolog/Handler/HandlerInterface.php
+++ /dev/null
@@ -1,90 +0,0 @@
-
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Monolog\Handler;
-
-use Monolog\Formatter\FormatterInterface;
-
-/**
- * Interface that all Monolog Handlers must implement
- *
- * @author Jordi Boggiano 
- */
-interface HandlerInterface
-{
-    /**
-     * Checks whether the given record will be handled by this handler.
-     *
-     * This is mostly done for performance reasons, to avoid calling processors for nothing.
-     *
-     * Handlers should still check the record levels within handle(), returning false in isHandling()
-     * is no guarantee that handle() will not be called, and isHandling() might not be called
-     * for a given record.
-     *
-     * @param array $record Partial log record containing only a level key
-     *
-     * @return Boolean
-     */
-    public function isHandling(array $record);
-
-    /**
-     * Handles a record.
-     *
-     * All records may be passed to this method, and the handler should discard
-     * those that it does not want to handle.
-     *
-     * The return value of this function controls the bubbling process of the handler stack.
-     * Unless the bubbling is interrupted (by returning true), the Logger class will keep on
-     * calling further handlers in the stack with a given log record.
-     *
-     * @param  array   $record The record to handle
-     * @return Boolean true means that this handler handled the record, and that bubbling is not permitted.
-     *                        false means the record was either not processed or that this handler allows bubbling.
-     */
-    public function handle(array $record);
-
-    /**
-     * Handles a set of records at once.
-     *
-     * @param array $records The records to handle (an array of record arrays)
-     */
-    public function handleBatch(array $records);
-
-    /**
-     * Adds a processor in the stack.
-     *
-     * @param  callable $callback
-     * @return self
-     */
-    public function pushProcessor($callback);
-
-    /**
-     * Removes the processor on top of the stack and returns it.
-     *
-     * @return callable
-     */
-    public function popProcessor();
-
-    /**
-     * Sets the formatter.
-     *
-     * @param  FormatterInterface $formatter
-     * @return self
-     */
-    public function setFormatter(FormatterInterface $formatter);
-
-    /**
-     * Gets the formatter.
-     *
-     * @return FormatterInterface
-     */
-    public function getFormatter();
-}
diff --git a/mayor-orig/www/include/share/googleapi/monolog/monolog/src/Monolog/Handler/HandlerWrapper.php b/mayor-orig/www/include/share/googleapi/monolog/monolog/src/Monolog/Handler/HandlerWrapper.php
deleted file mode 100644
index e540d80f..00000000
--- a/mayor-orig/www/include/share/googleapi/monolog/monolog/src/Monolog/Handler/HandlerWrapper.php
+++ /dev/null
@@ -1,108 +0,0 @@
-
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Monolog\Handler;
-
-use Monolog\Formatter\FormatterInterface;
-
-/**
- * This simple wrapper class can be used to extend handlers functionality.
- *
- * Example: A custom filtering that can be applied to any handler.
- *
- * Inherit from this class and override handle() like this:
- *
- *   public function handle(array $record)
- *   {
- *        if ($record meets certain conditions) {
- *            return false;
- *        }
- *        return $this->handler->handle($record);
- *   }
- *
- * @author Alexey Karapetov 
- */
-class HandlerWrapper implements HandlerInterface
-{
-    /**
-     * @var HandlerInterface
-     */
-    protected $handler;
-
-    /**
-     * HandlerWrapper constructor.
-     * @param HandlerInterface $handler
-     */
-    public function __construct(HandlerInterface $handler)
-    {
-        $this->handler = $handler;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function isHandling(array $record)
-    {
-        return $this->handler->isHandling($record);
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function handle(array $record)
-    {
-        return $this->handler->handle($record);
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function handleBatch(array $records)
-    {
-        return $this->handler->handleBatch($records);
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function pushProcessor($callback)
-    {
-        $this->handler->pushProcessor($callback);
-
-        return $this;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function popProcessor()
-    {
-        return $this->handler->popProcessor();
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function setFormatter(FormatterInterface $formatter)
-    {
-        $this->handler->setFormatter($formatter);
-
-        return $this;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function getFormatter()
-    {
-        return $this->handler->getFormatter();
-    }
-}
diff --git a/mayor-orig/www/include/share/googleapi/monolog/monolog/src/Monolog/Handler/HipChatHandler.php b/mayor-orig/www/include/share/googleapi/monolog/monolog/src/Monolog/Handler/HipChatHandler.php
deleted file mode 100644
index 73049f36..00000000
--- a/mayor-orig/www/include/share/googleapi/monolog/monolog/src/Monolog/Handler/HipChatHandler.php
+++ /dev/null
@@ -1,350 +0,0 @@
-
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Monolog\Handler;
-
-use Monolog\Logger;
-
-/**
- * Sends notifications through the hipchat api to a hipchat room
- *
- * Notes:
- * API token - HipChat API token
- * Room      - HipChat Room Id or name, where messages are sent
- * Name      - Name used to send the message (from)
- * notify    - Should the message trigger a notification in the clients
- * version   - The API version to use (HipChatHandler::API_V1 | HipChatHandler::API_V2)
- *
- * @author Rafael Dohms 
- * @see    https://www.hipchat.com/docs/api
- */
-class HipChatHandler extends SocketHandler
-{
-    /**
-     * Use API version 1
-     */
-    const API_V1 = 'v1';
-
-    /**
-     * Use API version v2
-     */
-    const API_V2 = 'v2';
-
-    /**
-     * The maximum allowed length for the name used in the "from" field.
-     */
-    const MAXIMUM_NAME_LENGTH = 15;
-
-    /**
-     * The maximum allowed length for the message.
-     */
-    const MAXIMUM_MESSAGE_LENGTH = 9500;
-
-    /**
-     * @var string
-     */
-    private $token;
-
-    /**
-     * @var string
-     */
-    private $room;
-
-    /**
-     * @var string
-     */
-    private $name;
-
-    /**
-     * @var bool
-     */
-    private $notify;
-
-    /**
-     * @var string
-     */
-    private $format;
-
-    /**
-     * @var string
-     */
-    private $host;
-
-    /**
-     * @var string
-     */
-    private $version;
-
-    /**
-     * @param string $token   HipChat API Token
-     * @param string $room    The room that should be alerted of the message (Id or Name)
-     * @param string $name    Name used in the "from" field.
-     * @param bool   $notify  Trigger a notification in clients or not
-     * @param int    $level   The minimum logging level at which this handler will be triggered
-     * @param bool   $bubble  Whether the messages that are handled can bubble up the stack or not
-     * @param bool   $useSSL  Whether to connect via SSL.
-     * @param string $format  The format of the messages (default to text, can be set to html if you have html in the messages)
-     * @param string $host    The HipChat server hostname.
-     * @param string $version The HipChat API version (default HipChatHandler::API_V1)
-     */
-    public function __construct($token, $room, $name = 'Monolog', $notify = false, $level = Logger::CRITICAL, $bubble = true, $useSSL = true, $format = 'text', $host = 'api.hipchat.com', $version = self::API_V1)
-    {
-        if ($version == self::API_V1 && !$this->validateStringLength($name, static::MAXIMUM_NAME_LENGTH)) {
-            throw new \InvalidArgumentException('The supplied name is too long. HipChat\'s v1 API supports names up to 15 UTF-8 characters.');
-        }
-
-        $connectionString = $useSSL ? 'ssl://'.$host.':443' : $host.':80';
-        parent::__construct($connectionString, $level, $bubble);
-
-        $this->token = $token;
-        $this->name = $name;
-        $this->notify = $notify;
-        $this->room = $room;
-        $this->format = $format;
-        $this->host = $host;
-        $this->version = $version;
-    }
-
-    /**
-     * {@inheritdoc}
-     *
-     * @param  array  $record
-     * @return string
-     */
-    protected function generateDataStream($record)
-    {
-        $content = $this->buildContent($record);
-
-        return $this->buildHeader($content) . $content;
-    }
-
-    /**
-     * Builds the body of API call
-     *
-     * @param  array  $record
-     * @return string
-     */
-    private function buildContent($record)
-    {
-        $dataArray = array(
-            'notify' => $this->version == self::API_V1 ?
-                ($this->notify ? 1 : 0) :
-                ($this->notify ? 'true' : 'false'),
-            'message' => $record['formatted'],
-            'message_format' => $this->format,
-            'color' => $this->getAlertColor($record['level']),
-        );
-
-        if (!$this->validateStringLength($dataArray['message'], static::MAXIMUM_MESSAGE_LENGTH)) {
-            if (function_exists('mb_substr')) {
-                $dataArray['message'] = mb_substr($dataArray['message'], 0, static::MAXIMUM_MESSAGE_LENGTH).' [truncated]';
-            } else {
-                $dataArray['message'] = substr($dataArray['message'], 0, static::MAXIMUM_MESSAGE_LENGTH).' [truncated]';
-            }
-        }
-
-        // if we are using the legacy API then we need to send some additional information
-        if ($this->version == self::API_V1) {
-            $dataArray['room_id'] = $this->room;
-        }
-
-        // append the sender name if it is set
-        // always append it if we use the v1 api (it is required in v1)
-        if ($this->version == self::API_V1 || $this->name !== null) {
-            $dataArray['from'] = (string) $this->name;
-        }
-
-        return http_build_query($dataArray);
-    }
-
-    /**
-     * Builds the header of the API Call
-     *
-     * @param  string $content
-     * @return string
-     */
-    private function buildHeader($content)
-    {
-        if ($this->version == self::API_V1) {
-            $header = "POST /v1/rooms/message?format=json&auth_token={$this->token} HTTP/1.1\r\n";
-        } else {
-            // needed for rooms with special (spaces, etc) characters in the name
-            $room = rawurlencode($this->room);
-            $header = "POST /v2/room/{$room}/notification?auth_token={$this->token} HTTP/1.1\r\n";
-        }
-
-        $header .= "Host: {$this->host}\r\n";
-        $header .= "Content-Type: application/x-www-form-urlencoded\r\n";
-        $header .= "Content-Length: " . strlen($content) . "\r\n";
-        $header .= "\r\n";
-
-        return $header;
-    }
-
-    /**
-     * Assigns a color to each level of log records.
-     *
-     * @param  int    $level
-     * @return string
-     */
-    protected function getAlertColor($level)
-    {
-        switch (true) {
-            case $level >= Logger::ERROR:
-                return 'red';
-            case $level >= Logger::WARNING:
-                return 'yellow';
-            case $level >= Logger::INFO:
-                return 'green';
-            case $level == Logger::DEBUG:
-                return 'gray';
-            default:
-                return 'yellow';
-        }
-    }
-
-    /**
-     * {@inheritdoc}
-     *
-     * @param array $record
-     */
-    protected function write(array $record)
-    {
-        parent::write($record);
-        $this->closeSocket();
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function handleBatch(array $records)
-    {
-        if (count($records) == 0) {
-            return true;
-        }
-
-        $batchRecords = $this->combineRecords($records);
-
-        $handled = false;
-        foreach ($batchRecords as $batchRecord) {
-            if ($this->isHandling($batchRecord)) {
-                $this->write($batchRecord);
-                $handled = true;
-            }
-        }
-
-        if (!$handled) {
-            return false;
-        }
-
-        return false === $this->bubble;
-    }
-
-    /**
-     * Combines multiple records into one. Error level of the combined record
-     * will be the highest level from the given records. Datetime will be taken
-     * from the first record.
-     *
-     * @param $records
-     * @return array
-     */
-    private function combineRecords($records)
-    {
-        $batchRecord = null;
-        $batchRecords = array();
-        $messages = array();
-        $formattedMessages = array();
-        $level = 0;
-        $levelName = null;
-        $datetime = null;
-
-        foreach ($records as $record) {
-            $record = $this->processRecord($record);
-
-            if ($record['level'] > $level) {
-                $level = $record['level'];
-                $levelName = $record['level_name'];
-            }
-
-            if (null === $datetime) {
-                $datetime = $record['datetime'];
-            }
-
-            $messages[] = $record['message'];
-            $messageStr = implode(PHP_EOL, $messages);
-            $formattedMessages[] = $this->getFormatter()->format($record);
-            $formattedMessageStr = implode('', $formattedMessages);
-
-            $batchRecord = array(
-                'message'   => $messageStr,
-                'formatted' => $formattedMessageStr,
-                'context'   => array(),
-                'extra'     => array(),
-            );
-
-            if (!$this->validateStringLength($batchRecord['formatted'], static::MAXIMUM_MESSAGE_LENGTH)) {
-                // Pop the last message and implode the remaining messages
-                $lastMessage = array_pop($messages);
-                $lastFormattedMessage = array_pop($formattedMessages);
-                $batchRecord['message'] = implode(PHP_EOL, $messages);
-                $batchRecord['formatted'] = implode('', $formattedMessages);
-
-                $batchRecords[] = $batchRecord;
-                $messages = array($lastMessage);
-                $formattedMessages = array($lastFormattedMessage);
-
-                $batchRecord = null;
-            }
-        }
-
-        if (null !== $batchRecord) {
-            $batchRecords[] = $batchRecord;
-        }
-
-        // Set the max level and datetime for all records
-        foreach ($batchRecords as &$batchRecord) {
-            $batchRecord = array_merge(
-                $batchRecord,
-                array(
-                    'level'      => $level,
-                    'level_name' => $levelName,
-                    'datetime'   => $datetime,
-                )
-            );
-        }
-
-        return $batchRecords;
-    }
-
-    /**
-     * Validates the length of a string.
-     *
-     * If the `mb_strlen()` function is available, it will use that, as HipChat
-     * allows UTF-8 characters. Otherwise, it will fall back to `strlen()`.
-     *
-     * Note that this might cause false failures in the specific case of using
-     * a valid name with less than 16 characters, but 16 or more bytes, on a
-     * system where `mb_strlen()` is unavailable.
-     *
-     * @param string $str
-     * @param int    $length
-     *
-     * @return bool
-     */
-    private function validateStringLength($str, $length)
-    {
-        if (function_exists('mb_strlen')) {
-            return (mb_strlen($str) <= $length);
-        }
-
-        return (strlen($str) <= $length);
-    }
-}
diff --git a/mayor-orig/www/include/share/googleapi/monolog/monolog/src/Monolog/Handler/IFTTTHandler.php b/mayor-orig/www/include/share/googleapi/monolog/monolog/src/Monolog/Handler/IFTTTHandler.php
deleted file mode 100644
index d60a3c82..00000000
--- a/mayor-orig/www/include/share/googleapi/monolog/monolog/src/Monolog/Handler/IFTTTHandler.php
+++ /dev/null
@@ -1,69 +0,0 @@
-
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Monolog\Handler;
-
-use Monolog\Logger;
-
-/**
- * IFTTTHandler uses cURL to trigger IFTTT Maker actions
- *
- * Register a secret key and trigger/event name at https://ifttt.com/maker
- *
- * value1 will be the channel from monolog's Logger constructor,
- * value2 will be the level name (ERROR, WARNING, ..)
- * value3 will be the log record's message
- *
- * @author Nehal Patel 
- */
-class IFTTTHandler extends AbstractProcessingHandler
-{
-    private $eventName;
-    private $secretKey;
-
-    /**
-     * @param string  $eventName The name of the IFTTT Maker event that should be triggered
-     * @param string  $secretKey A valid IFTTT secret key
-     * @param int     $level     The minimum logging level at which this handler will be triggered
-     * @param Boolean $bubble    Whether the messages that are handled can bubble up the stack or not
-     */
-    public function __construct($eventName, $secretKey, $level = Logger::ERROR, $bubble = true)
-    {
-        $this->eventName = $eventName;
-        $this->secretKey = $secretKey;
-
-        parent::__construct($level, $bubble);
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function write(array $record)
-    {
-        $postData = array(
-            "value1" => $record["channel"],
-            "value2" => $record["level_name"],
-            "value3" => $record["message"],
-        );
-        $postString = json_encode($postData);
-
-        $ch = curl_init();
-        curl_setopt($ch, CURLOPT_URL, "https://maker.ifttt.com/trigger/" . $this->eventName . "/with/key/" . $this->secretKey);
-        curl_setopt($ch, CURLOPT_POST, true);
-        curl_setopt($ch, CURLOPT_RETURNTRANSFER, true);
-        curl_setopt($ch, CURLOPT_POSTFIELDS, $postString);
-        curl_setopt($ch, CURLOPT_HTTPHEADER, array(
-            "Content-Type: application/json",
-        ));
-
-        Curl\Util::execute($ch);
-    }
-}
diff --git a/mayor-orig/www/include/share/googleapi/monolog/monolog/src/Monolog/Handler/LogEntriesHandler.php b/mayor-orig/www/include/share/googleapi/monolog/monolog/src/Monolog/Handler/LogEntriesHandler.php
deleted file mode 100644
index 494c605b..00000000
--- a/mayor-orig/www/include/share/googleapi/monolog/monolog/src/Monolog/Handler/LogEntriesHandler.php
+++ /dev/null
@@ -1,55 +0,0 @@
-
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Monolog\Handler;
-
-use Monolog\Logger;
-
-/**
- * @author Robert Kaufmann III 
- */
-class LogEntriesHandler extends SocketHandler
-{
-    /**
-     * @var string
-     */
-    protected $logToken;
-
-    /**
-     * @param string $token  Log token supplied by LogEntries
-     * @param bool   $useSSL Whether or not SSL encryption should be used.
-     * @param int    $level  The minimum logging level to trigger this handler
-     * @param bool   $bubble Whether or not messages that are handled should bubble up the stack.
-     *
-     * @throws MissingExtensionException If SSL encryption is set to true and OpenSSL is missing
-     */
-    public function __construct($token, $useSSL = true, $level = Logger::DEBUG, $bubble = true)
-    {
-        if ($useSSL && !extension_loaded('openssl')) {
-            throw new MissingExtensionException('The OpenSSL PHP plugin is required to use SSL encrypted connection for LogEntriesHandler');
-        }
-
-        $endpoint = $useSSL ? 'ssl://data.logentries.com:443' : 'data.logentries.com:80';
-        parent::__construct($endpoint, $level, $bubble);
-        $this->logToken = $token;
-    }
-
-    /**
-     * {@inheritdoc}
-     *
-     * @param  array  $record
-     * @return string
-     */
-    protected function generateDataStream($record)
-    {
-        return $this->logToken . ' ' . $record['formatted'];
-    }
-}
diff --git a/mayor-orig/www/include/share/googleapi/monolog/monolog/src/Monolog/Handler/LogglyHandler.php b/mayor-orig/www/include/share/googleapi/monolog/monolog/src/Monolog/Handler/LogglyHandler.php
deleted file mode 100644
index bcd62e1c..00000000
--- a/mayor-orig/www/include/share/googleapi/monolog/monolog/src/Monolog/Handler/LogglyHandler.php
+++ /dev/null
@@ -1,102 +0,0 @@
-
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Monolog\Handler;
-
-use Monolog\Logger;
-use Monolog\Formatter\LogglyFormatter;
-
-/**
- * Sends errors to Loggly.
- *
- * @author Przemek Sobstel 
- * @author Adam Pancutt 
- * @author Gregory Barchard 
- */
-class LogglyHandler extends AbstractProcessingHandler
-{
-    const HOST = 'logs-01.loggly.com';
-    const ENDPOINT_SINGLE = 'inputs';
-    const ENDPOINT_BATCH = 'bulk';
-
-    protected $token;
-
-    protected $tag = array();
-
-    public function __construct($token, $level = Logger::DEBUG, $bubble = true)
-    {
-        if (!extension_loaded('curl')) {
-            throw new \LogicException('The curl extension is needed to use the LogglyHandler');
-        }
-
-        $this->token = $token;
-
-        parent::__construct($level, $bubble);
-    }
-
-    public function setTag($tag)
-    {
-        $tag = !empty($tag) ? $tag : array();
-        $this->tag = is_array($tag) ? $tag : array($tag);
-    }
-
-    public function addTag($tag)
-    {
-        if (!empty($tag)) {
-            $tag = is_array($tag) ? $tag : array($tag);
-            $this->tag = array_unique(array_merge($this->tag, $tag));
-        }
-    }
-
-    protected function write(array $record)
-    {
-        $this->send($record["formatted"], self::ENDPOINT_SINGLE);
-    }
-
-    public function handleBatch(array $records)
-    {
-        $level = $this->level;
-
-        $records = array_filter($records, function ($record) use ($level) {
-            return ($record['level'] >= $level);
-        });
-
-        if ($records) {
-            $this->send($this->getFormatter()->formatBatch($records), self::ENDPOINT_BATCH);
-        }
-    }
-
-    protected function send($data, $endpoint)
-    {
-        $url = sprintf("https://%s/%s/%s/", self::HOST, $endpoint, $this->token);
-
-        $headers = array('Content-Type: application/json');
-
-        if (!empty($this->tag)) {
-            $headers[] = 'X-LOGGLY-TAG: '.implode(',', $this->tag);
-        }
-
-        $ch = curl_init();
-
-        curl_setopt($ch, CURLOPT_URL, $url);
-        curl_setopt($ch, CURLOPT_POST, true);
-        curl_setopt($ch, CURLOPT_POSTFIELDS, $data);
-        curl_setopt($ch, CURLOPT_HTTPHEADER, $headers);
-        curl_setopt($ch, CURLOPT_RETURNTRANSFER, true);
-
-        Curl\Util::execute($ch);
-    }
-
-    protected function getDefaultFormatter()
-    {
-        return new LogglyFormatter();
-    }
-}
diff --git a/mayor-orig/www/include/share/googleapi/monolog/monolog/src/Monolog/Handler/MailHandler.php b/mayor-orig/www/include/share/googleapi/monolog/monolog/src/Monolog/Handler/MailHandler.php
deleted file mode 100644
index 9e232838..00000000
--- a/mayor-orig/www/include/share/googleapi/monolog/monolog/src/Monolog/Handler/MailHandler.php
+++ /dev/null
@@ -1,67 +0,0 @@
-
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Monolog\Handler;
-
-/**
- * Base class for all mail handlers
- *
- * @author Gyula Sallai
- */
-abstract class MailHandler extends AbstractProcessingHandler
-{
-    /**
-     * {@inheritdoc}
-     */
-    public function handleBatch(array $records)
-    {
-        $messages = array();
-
-        foreach ($records as $record) {
-            if ($record['level'] < $this->level) {
-                continue;
-            }
-            $messages[] = $this->processRecord($record);
-        }
-
-        if (!empty($messages)) {
-            $this->send((string) $this->getFormatter()->formatBatch($messages), $messages);
-        }
-    }
-
-    /**
-     * Send a mail with the given content
-     *
-     * @param string $content formatted email body to be sent
-     * @param array  $records the array of log records that formed this content
-     */
-    abstract protected function send($content, array $records);
-
-    /**
-     * {@inheritdoc}
-     */
-    protected function write(array $record)
-    {
-        $this->send((string) $record['formatted'], array($record));
-    }
-
-    protected function getHighestRecord(array $records)
-    {
-        $highestRecord = null;
-        foreach ($records as $record) {
-            if ($highestRecord === null || $highestRecord['level'] < $record['level']) {
-                $highestRecord = $record;
-            }
-        }
-
-        return $highestRecord;
-    }
-}
diff --git a/mayor-orig/www/include/share/googleapi/monolog/monolog/src/Monolog/Handler/MandrillHandler.php b/mayor-orig/www/include/share/googleapi/monolog/monolog/src/Monolog/Handler/MandrillHandler.php
deleted file mode 100644
index ab95924f..00000000
--- a/mayor-orig/www/include/share/googleapi/monolog/monolog/src/Monolog/Handler/MandrillHandler.php
+++ /dev/null
@@ -1,68 +0,0 @@
-
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Monolog\Handler;
-
-use Monolog\Logger;
-
-/**
- * MandrillHandler uses cURL to send the emails to the Mandrill API
- *
- * @author Adam Nicholson 
- */
-class MandrillHandler extends MailHandler
-{
-    protected $message;
-    protected $apiKey;
-
-    /**
-     * @param string                  $apiKey  A valid Mandrill API key
-     * @param callable|\Swift_Message $message An example message for real messages, only the body will be replaced
-     * @param int                     $level   The minimum logging level at which this handler will be triggered
-     * @param Boolean                 $bubble  Whether the messages that are handled can bubble up the stack or not
-     */
-    public function __construct($apiKey, $message, $level = Logger::ERROR, $bubble = true)
-    {
-        parent::__construct($level, $bubble);
-
-        if (!$message instanceof \Swift_Message && is_callable($message)) {
-            $message = call_user_func($message);
-        }
-        if (!$message instanceof \Swift_Message) {
-            throw new \InvalidArgumentException('You must provide either a Swift_Message instance or a callable returning it');
-        }
-        $this->message = $message;
-        $this->apiKey = $apiKey;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    protected function send($content, array $records)
-    {
-        $message = clone $this->message;
-        $message->setBody($content);
-        $message->setDate(time());
-
-        $ch = curl_init();
-
-        curl_setopt($ch, CURLOPT_URL, 'https://mandrillapp.com/api/1.0/messages/send-raw.json');
-        curl_setopt($ch, CURLOPT_POST, 1);
-        curl_setopt($ch, CURLOPT_RETURNTRANSFER, 1);
-        curl_setopt($ch, CURLOPT_POSTFIELDS, http_build_query(array(
-            'key' => $this->apiKey,
-            'raw_message' => (string) $message,
-            'async' => false,
-        )));
-
-        Curl\Util::execute($ch);
-    }
-}
diff --git a/mayor-orig/www/include/share/googleapi/monolog/monolog/src/Monolog/Handler/MissingExtensionException.php b/mayor-orig/www/include/share/googleapi/monolog/monolog/src/Monolog/Handler/MissingExtensionException.php
deleted file mode 100644
index 4724a7e2..00000000
--- a/mayor-orig/www/include/share/googleapi/monolog/monolog/src/Monolog/Handler/MissingExtensionException.php
+++ /dev/null
@@ -1,21 +0,0 @@
-
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Monolog\Handler;
-
-/**
- * Exception can be thrown if an extension for an handler is missing
- *
- * @author  Christian Bergau 
- */
-class MissingExtensionException extends \Exception
-{
-}
diff --git a/mayor-orig/www/include/share/googleapi/monolog/monolog/src/Monolog/Handler/MongoDBHandler.php b/mayor-orig/www/include/share/googleapi/monolog/monolog/src/Monolog/Handler/MongoDBHandler.php
deleted file mode 100644
index 56fe755b..00000000
--- a/mayor-orig/www/include/share/googleapi/monolog/monolog/src/Monolog/Handler/MongoDBHandler.php
+++ /dev/null
@@ -1,59 +0,0 @@
-
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Monolog\Handler;
-
-use Monolog\Logger;
-use Monolog\Formatter\NormalizerFormatter;
-
-/**
- * Logs to a MongoDB database.
- *
- * usage example:
- *
- *   $log = new Logger('application');
- *   $mongodb = new MongoDBHandler(new \Mongo("mongodb://localhost:27017"), "logs", "prod");
- *   $log->pushHandler($mongodb);
- *
- * @author Thomas Tourlourat 
- */
-class MongoDBHandler extends AbstractProcessingHandler
-{
-    protected $mongoCollection;
-
-    public function __construct($mongo, $database, $collection, $level = Logger::DEBUG, $bubble = true)
-    {
-        if (!($mongo instanceof \MongoClient || $mongo instanceof \Mongo || $mongo instanceof \MongoDB\Client)) {
-            throw new \InvalidArgumentException('MongoClient, Mongo or MongoDB\Client instance required');
-        }
-
-        $this->mongoCollection = $mongo->selectCollection($database, $collection);
-
-        parent::__construct($level, $bubble);
-    }
-
-    protected function write(array $record)
-    {
-        if ($this->mongoCollection instanceof \MongoDB\Collection) {
-            $this->mongoCollection->insertOne($record["formatted"]);
-        } else {
-            $this->mongoCollection->save($record["formatted"]);
-        }
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    protected function getDefaultFormatter()
-    {
-        return new NormalizerFormatter();
-    }
-}
diff --git a/mayor-orig/www/include/share/googleapi/monolog/monolog/src/Monolog/Handler/NativeMailerHandler.php b/mayor-orig/www/include/share/googleapi/monolog/monolog/src/Monolog/Handler/NativeMailerHandler.php
deleted file mode 100644
index d7807fd1..00000000
--- a/mayor-orig/www/include/share/googleapi/monolog/monolog/src/Monolog/Handler/NativeMailerHandler.php
+++ /dev/null
@@ -1,185 +0,0 @@
-
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Monolog\Handler;
-
-use Monolog\Logger;
-use Monolog\Formatter\LineFormatter;
-
-/**
- * NativeMailerHandler uses the mail() function to send the emails
- *
- * @author Christophe Coevoet 
- * @author Mark Garrett 
- */
-class NativeMailerHandler extends MailHandler
-{
-    /**
-     * The email addresses to which the message will be sent
-     * @var array
-     */
-    protected $to;
-
-    /**
-     * The subject of the email
-     * @var string
-     */
-    protected $subject;
-
-    /**
-     * Optional headers for the message
-     * @var array
-     */
-    protected $headers = array();
-
-    /**
-     * Optional parameters for the message
-     * @var array
-     */
-    protected $parameters = array();
-
-    /**
-     * The wordwrap length for the message
-     * @var int
-     */
-    protected $maxColumnWidth;
-
-    /**
-     * The Content-type for the message
-     * @var string
-     */
-    protected $contentType = 'text/plain';
-
-    /**
-     * The encoding for the message
-     * @var string
-     */
-    protected $encoding = 'utf-8';
-
-    /**
-     * @param string|array $to             The receiver of the mail
-     * @param string       $subject        The subject of the mail
-     * @param string       $from           The sender of the mail
-     * @param int          $level          The minimum logging level at which this handler will be triggered
-     * @param bool         $bubble         Whether the messages that are handled can bubble up the stack or not
-     * @param int          $maxColumnWidth The maximum column width that the message lines will have
-     */
-    public function __construct($to, $subject, $from, $level = Logger::ERROR, $bubble = true, $maxColumnWidth = 70)
-    {
-        parent::__construct($level, $bubble);
-        $this->to = is_array($to) ? $to : array($to);
-        $this->subject = $subject;
-        $this->addHeader(sprintf('From: %s', $from));
-        $this->maxColumnWidth = $maxColumnWidth;
-    }
-
-    /**
-     * Add headers to the message
-     *
-     * @param  string|array $headers Custom added headers
-     * @return self
-     */
-    public function addHeader($headers)
-    {
-        foreach ((array) $headers as $header) {
-            if (strpos($header, "\n") !== false || strpos($header, "\r") !== false) {
-                throw new \InvalidArgumentException('Headers can not contain newline characters for security reasons');
-            }
-            $this->headers[] = $header;
-        }
-
-        return $this;
-    }
-
-    /**
-     * Add parameters to the message
-     *
-     * @param  string|array $parameters Custom added parameters
-     * @return self
-     */
-    public function addParameter($parameters)
-    {
-        $this->parameters = array_merge($this->parameters, (array) $parameters);
-
-        return $this;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    protected function send($content, array $records)
-    {
-        $content = wordwrap($content, $this->maxColumnWidth);
-        $headers = ltrim(implode("\r\n", $this->headers) . "\r\n", "\r\n");
-        $headers .= 'Content-type: ' . $this->getContentType() . '; charset=' . $this->getEncoding() . "\r\n";
-        if ($this->getContentType() == 'text/html' && false === strpos($headers, 'MIME-Version:')) {
-            $headers .= 'MIME-Version: 1.0' . "\r\n";
-        }
-
-        $subject = $this->subject;
-        if ($records) {
-            $subjectFormatter = new LineFormatter($this->subject);
-            $subject = $subjectFormatter->format($this->getHighestRecord($records));
-        }
-
-        $parameters = implode(' ', $this->parameters);
-        foreach ($this->to as $to) {
-            mail($to, $subject, $content, $headers, $parameters);
-        }
-    }
-
-    /**
-     * @return string $contentType
-     */
-    public function getContentType()
-    {
-        return $this->contentType;
-    }
-
-    /**
-     * @return string $encoding
-     */
-    public function getEncoding()
-    {
-        return $this->encoding;
-    }
-
-    /**
-     * @param  string $contentType The content type of the email - Defaults to text/plain. Use text/html for HTML
-     *                             messages.
-     * @return self
-     */
-    public function setContentType($contentType)
-    {
-        if (strpos($contentType, "\n") !== false || strpos($contentType, "\r") !== false) {
-            throw new \InvalidArgumentException('The content type can not contain newline characters to prevent email header injection');
-        }
-
-        $this->contentType = $contentType;
-
-        return $this;
-    }
-
-    /**
-     * @param  string $encoding
-     * @return self
-     */
-    public function setEncoding($encoding)
-    {
-        if (strpos($encoding, "\n") !== false || strpos($encoding, "\r") !== false) {
-            throw new \InvalidArgumentException('The encoding can not contain newline characters to prevent email header injection');
-        }
-
-        $this->encoding = $encoding;
-
-        return $this;
-    }
-}
diff --git a/mayor-orig/www/include/share/googleapi/monolog/monolog/src/Monolog/Handler/NewRelicHandler.php b/mayor-orig/www/include/share/googleapi/monolog/monolog/src/Monolog/Handler/NewRelicHandler.php
deleted file mode 100644
index 6718e9e0..00000000
--- a/mayor-orig/www/include/share/googleapi/monolog/monolog/src/Monolog/Handler/NewRelicHandler.php
+++ /dev/null
@@ -1,202 +0,0 @@
-
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Monolog\Handler;
-
-use Monolog\Logger;
-use Monolog\Formatter\NormalizerFormatter;
-
-/**
- * Class to record a log on a NewRelic application.
- * Enabling New Relic High Security mode may prevent capture of useful information.
- *
- * @see https://docs.newrelic.com/docs/agents/php-agent
- * @see https://docs.newrelic.com/docs/accounts-partnerships/accounts/security/high-security
- */
-class NewRelicHandler extends AbstractProcessingHandler
-{
-    /**
-     * Name of the New Relic application that will receive logs from this handler.
-     *
-     * @var string
-     */
-    protected $appName;
-
-    /**
-     * Name of the current transaction
-     *
-     * @var string
-     */
-    protected $transactionName;
-
-    /**
-     * Some context and extra data is passed into the handler as arrays of values. Do we send them as is
-     * (useful if we are using the API), or explode them for display on the NewRelic RPM website?
-     *
-     * @var bool
-     */
-    protected $explodeArrays;
-
-    /**
-     * {@inheritDoc}
-     *
-     * @param string $appName
-     * @param bool   $explodeArrays
-     * @param string $transactionName
-     */
-    public function __construct(
-        $level = Logger::ERROR,
-        $bubble = true,
-        $appName = null,
-        $explodeArrays = false,
-        $transactionName = null
-    ) {
-        parent::__construct($level, $bubble);
-
-        $this->appName       = $appName;
-        $this->explodeArrays = $explodeArrays;
-        $this->transactionName = $transactionName;
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    protected function write(array $record)
-    {
-        if (!$this->isNewRelicEnabled()) {
-            throw new MissingExtensionException('The newrelic PHP extension is required to use the NewRelicHandler');
-        }
-
-        if ($appName = $this->getAppName($record['context'])) {
-            $this->setNewRelicAppName($appName);
-        }
-
-        if ($transactionName = $this->getTransactionName($record['context'])) {
-            $this->setNewRelicTransactionName($transactionName);
-            unset($record['formatted']['context']['transaction_name']);
-        }
-
-        if (isset($record['context']['exception']) && $record['context']['exception'] instanceof \Exception) {
-            newrelic_notice_error($record['message'], $record['context']['exception']);
-            unset($record['formatted']['context']['exception']);
-        } else {
-            newrelic_notice_error($record['message']);
-        }
-
-        if (isset($record['formatted']['context']) && is_array($record['formatted']['context'])) {
-            foreach ($record['formatted']['context'] as $key => $parameter) {
-                if (is_array($parameter) && $this->explodeArrays) {
-                    foreach ($parameter as $paramKey => $paramValue) {
-                        $this->setNewRelicParameter('context_' . $key . '_' . $paramKey, $paramValue);
-                    }
-                } else {
-                    $this->setNewRelicParameter('context_' . $key, $parameter);
-                }
-            }
-        }
-
-        if (isset($record['formatted']['extra']) && is_array($record['formatted']['extra'])) {
-            foreach ($record['formatted']['extra'] as $key => $parameter) {
-                if (is_array($parameter) && $this->explodeArrays) {
-                    foreach ($parameter as $paramKey => $paramValue) {
-                        $this->setNewRelicParameter('extra_' . $key . '_' . $paramKey, $paramValue);
-                    }
-                } else {
-                    $this->setNewRelicParameter('extra_' . $key, $parameter);
-                }
-            }
-        }
-    }
-
-    /**
-     * Checks whether the NewRelic extension is enabled in the system.
-     *
-     * @return bool
-     */
-    protected function isNewRelicEnabled()
-    {
-        return extension_loaded('newrelic');
-    }
-
-    /**
-     * Returns the appname where this log should be sent. Each log can override the default appname, set in this
-     * handler's constructor, by providing the appname in it's context.
-     *
-     * @param  array       $context
-     * @return null|string
-     */
-    protected function getAppName(array $context)
-    {
-        if (isset($context['appname'])) {
-            return $context['appname'];
-        }
-
-        return $this->appName;
-    }
-
-    /**
-     * Returns the name of the current transaction. Each log can override the default transaction name, set in this
-     * handler's constructor, by providing the transaction_name in it's context
-     *
-     * @param array $context
-     *
-     * @return null|string
-     */
-    protected function getTransactionName(array $context)
-    {
-        if (isset($context['transaction_name'])) {
-            return $context['transaction_name'];
-        }
-
-        return $this->transactionName;
-    }
-
-    /**
-     * Sets the NewRelic application that should receive this log.
-     *
-     * @param string $appName
-     */
-    protected function setNewRelicAppName($appName)
-    {
-        newrelic_set_appname($appName);
-    }
-
-    /**
-     * Overwrites the name of the current transaction
-     *
-     * @param string $transactionName
-     */
-    protected function setNewRelicTransactionName($transactionName)
-    {
-        newrelic_name_transaction($transactionName);
-    }
-
-    /**
-     * @param string $key
-     * @param mixed  $value
-     */
-    protected function setNewRelicParameter($key, $value)
-    {
-        if (null === $value || is_scalar($value)) {
-            newrelic_add_custom_parameter($key, $value);
-        } else {
-            newrelic_add_custom_parameter($key, @json_encode($value));
-        }
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    protected function getDefaultFormatter()
-    {
-        return new NormalizerFormatter();
-    }
-}
diff --git a/mayor-orig/www/include/share/googleapi/monolog/monolog/src/Monolog/Handler/NullHandler.php b/mayor-orig/www/include/share/googleapi/monolog/monolog/src/Monolog/Handler/NullHandler.php
deleted file mode 100644
index 4b845883..00000000
--- a/mayor-orig/www/include/share/googleapi/monolog/monolog/src/Monolog/Handler/NullHandler.php
+++ /dev/null
@@ -1,45 +0,0 @@
-
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Monolog\Handler;
-
-use Monolog\Logger;
-
-/**
- * Blackhole
- *
- * Any record it can handle will be thrown away. This can be used
- * to put on top of an existing stack to override it temporarily.
- *
- * @author Jordi Boggiano 
- */
-class NullHandler extends AbstractHandler
-{
-    /**
-     * @param int $level The minimum logging level at which this handler will be triggered
-     */
-    public function __construct($level = Logger::DEBUG)
-    {
-        parent::__construct($level, false);
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function handle(array $record)
-    {
-        if ($record['level'] < $this->level) {
-            return false;
-        }
-
-        return true;
-    }
-}
diff --git a/mayor-orig/www/include/share/googleapi/monolog/monolog/src/Monolog/Handler/PHPConsoleHandler.php b/mayor-orig/www/include/share/googleapi/monolog/monolog/src/Monolog/Handler/PHPConsoleHandler.php
deleted file mode 100644
index 1f2076a4..00000000
--- a/mayor-orig/www/include/share/googleapi/monolog/monolog/src/Monolog/Handler/PHPConsoleHandler.php
+++ /dev/null
@@ -1,242 +0,0 @@
-
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Monolog\Handler;
-
-use Exception;
-use Monolog\Formatter\LineFormatter;
-use Monolog\Logger;
-use PhpConsole\Connector;
-use PhpConsole\Handler;
-use PhpConsole\Helper;
-
-/**
- * Monolog handler for Google Chrome extension "PHP Console"
- *
- * Display PHP error/debug log messages in Google Chrome console and notification popups, executes PHP code remotely
- *
- * Usage:
- * 1. Install Google Chrome extension https://chrome.google.com/webstore/detail/php-console/nfhmhhlpfleoednkpnnnkolmclajemef
- * 2. See overview https://github.com/barbushin/php-console#overview
- * 3. Install PHP Console library https://github.com/barbushin/php-console#installation
- * 4. Example (result will looks like http://i.hizliresim.com/vg3Pz4.png)
- *
- *      $logger = new \Monolog\Logger('all', array(new \Monolog\Handler\PHPConsoleHandler()));
- *      \Monolog\ErrorHandler::register($logger);
- *      echo $undefinedVar;
- *      $logger->addDebug('SELECT * FROM users', array('db', 'time' => 0.012));
- *      PC::debug($_SERVER); // PHP Console debugger for any type of vars
- *
- * @author Sergey Barbushin https://www.linkedin.com/in/barbushin
- */
-class PHPConsoleHandler extends AbstractProcessingHandler
-{
-    private $options = array(
-        'enabled' => true, // bool Is PHP Console server enabled
-        'classesPartialsTraceIgnore' => array('Monolog\\'), // array Hide calls of classes started with...
-        'debugTagsKeysInContext' => array(0, 'tag'), // bool Is PHP Console server enabled
-        'useOwnErrorsHandler' => false, // bool Enable errors handling
-        'useOwnExceptionsHandler' => false, // bool Enable exceptions handling
-        'sourcesBasePath' => null, // string Base path of all project sources to strip in errors source paths
-        'registerHelper' => true, // bool Register PhpConsole\Helper that allows short debug calls like PC::debug($var, 'ta.g.s')
-        'serverEncoding' => null, // string|null Server internal encoding
-        'headersLimit' => null, // int|null Set headers size limit for your web-server
-        'password' => null, // string|null Protect PHP Console connection by password
-        'enableSslOnlyMode' => false, // bool Force connection by SSL for clients with PHP Console installed
-        'ipMasks' => array(), // array Set IP masks of clients that will be allowed to connect to PHP Console: array('192.168.*.*', '127.0.0.1')
-        'enableEvalListener' => false, // bool Enable eval request to be handled by eval dispatcher(if enabled, 'password' option is also required)
-        'dumperDetectCallbacks' => false, // bool Convert callback items in dumper vars to (callback SomeClass::someMethod) strings
-        'dumperLevelLimit' => 5, // int Maximum dumped vars array or object nested dump level
-        'dumperItemsCountLimit' => 100, // int Maximum dumped var same level array items or object properties number
-        'dumperItemSizeLimit' => 5000, // int Maximum length of any string or dumped array item
-        'dumperDumpSizeLimit' => 500000, // int Maximum approximate size of dumped vars result formatted in JSON
-        'detectDumpTraceAndSource' => false, // bool Autodetect and append trace data to debug
-        'dataStorage' => null, // PhpConsole\Storage|null Fixes problem with custom $_SESSION handler(see http://goo.gl/Ne8juJ)
-    );
-
-    /** @var Connector */
-    private $connector;
-
-    /**
-     * @param  array          $options   See \Monolog\Handler\PHPConsoleHandler::$options for more details
-     * @param  Connector|null $connector Instance of \PhpConsole\Connector class (optional)
-     * @param  int            $level
-     * @param  bool           $bubble
-     * @throws Exception
-     */
-    public function __construct(array $options = array(), Connector $connector = null, $level = Logger::DEBUG, $bubble = true)
-    {
-        if (!class_exists('PhpConsole\Connector')) {
-            throw new Exception('PHP Console library not found. See https://github.com/barbushin/php-console#installation');
-        }
-        parent::__construct($level, $bubble);
-        $this->options = $this->initOptions($options);
-        $this->connector = $this->initConnector($connector);
-    }
-
-    private function initOptions(array $options)
-    {
-        $wrongOptions = array_diff(array_keys($options), array_keys($this->options));
-        if ($wrongOptions) {
-            throw new Exception('Unknown options: ' . implode(', ', $wrongOptions));
-        }
-
-        return array_replace($this->options, $options);
-    }
-
-    private function initConnector(Connector $connector = null)
-    {
-        if (!$connector) {
-            if ($this->options['dataStorage']) {
-                Connector::setPostponeStorage($this->options['dataStorage']);
-            }
-            $connector = Connector::getInstance();
-        }
-
-        if ($this->options['registerHelper'] && !Helper::isRegistered()) {
-            Helper::register();
-        }
-
-        if ($this->options['enabled'] && $connector->isActiveClient()) {
-            if ($this->options['useOwnErrorsHandler'] || $this->options['useOwnExceptionsHandler']) {
-                $handler = Handler::getInstance();
-                $handler->setHandleErrors($this->options['useOwnErrorsHandler']);
-                $handler->setHandleExceptions($this->options['useOwnExceptionsHandler']);
-                $handler->start();
-            }
-            if ($this->options['sourcesBasePath']) {
-                $connector->setSourcesBasePath($this->options['sourcesBasePath']);
-            }
-            if ($this->options['serverEncoding']) {
-                $connector->setServerEncoding($this->options['serverEncoding']);
-            }
-            if ($this->options['password']) {
-                $connector->setPassword($this->options['password']);
-            }
-            if ($this->options['enableSslOnlyMode']) {
-                $connector->enableSslOnlyMode();
-            }
-            if ($this->options['ipMasks']) {
-                $connector->setAllowedIpMasks($this->options['ipMasks']);
-            }
-            if ($this->options['headersLimit']) {
-                $connector->setHeadersLimit($this->options['headersLimit']);
-            }
-            if ($this->options['detectDumpTraceAndSource']) {
-                $connector->getDebugDispatcher()->detectTraceAndSource = true;
-            }
-            $dumper = $connector->getDumper();
-            $dumper->levelLimit = $this->options['dumperLevelLimit'];
-            $dumper->itemsCountLimit = $this->options['dumperItemsCountLimit'];
-            $dumper->itemSizeLimit = $this->options['dumperItemSizeLimit'];
-            $dumper->dumpSizeLimit = $this->options['dumperDumpSizeLimit'];
-            $dumper->detectCallbacks = $this->options['dumperDetectCallbacks'];
-            if ($this->options['enableEvalListener']) {
-                $connector->startEvalRequestsListener();
-            }
-        }
-
-        return $connector;
-    }
-
-    public function getConnector()
-    {
-        return $this->connector;
-    }
-
-    public function getOptions()
-    {
-        return $this->options;
-    }
-
-    public function handle(array $record)
-    {
-        if ($this->options['enabled'] && $this->connector->isActiveClient()) {
-            return parent::handle($record);
-        }
-
-        return !$this->bubble;
-    }
-
-    /**
-     * Writes the record down to the log of the implementing handler
-     *
-     * @param  array $record
-     * @return void
-     */
-    protected function write(array $record)
-    {
-        if ($record['level'] < Logger::NOTICE) {
-            $this->handleDebugRecord($record);
-        } elseif (isset($record['context']['exception']) && $record['context']['exception'] instanceof Exception) {
-            $this->handleExceptionRecord($record);
-        } else {
-            $this->handleErrorRecord($record);
-        }
-    }
-
-    private function handleDebugRecord(array $record)
-    {
-        $tags = $this->getRecordTags($record);
-        $message = $record['message'];
-        if ($record['context']) {
-            $message .= ' ' . json_encode($this->connector->getDumper()->dump(array_filter($record['context'])));
-        }
-        $this->connector->getDebugDispatcher()->dispatchDebug($message, $tags, $this->options['classesPartialsTraceIgnore']);
-    }
-
-    private function handleExceptionRecord(array $record)
-    {
-        $this->connector->getErrorsDispatcher()->dispatchException($record['context']['exception']);
-    }
-
-    private function handleErrorRecord(array $record)
-    {
-        $context = $record['context'];
-
-        $this->connector->getErrorsDispatcher()->dispatchError(
-            isset($context['code']) ? $context['code'] : null,
-            isset($context['message']) ? $context['message'] : $record['message'],
-            isset($context['file']) ? $context['file'] : null,
-            isset($context['line']) ? $context['line'] : null,
-            $this->options['classesPartialsTraceIgnore']
-        );
-    }
-
-    private function getRecordTags(array &$record)
-    {
-        $tags = null;
-        if (!empty($record['context'])) {
-            $context = & $record['context'];
-            foreach ($this->options['debugTagsKeysInContext'] as $key) {
-                if (!empty($context[$key])) {
-                    $tags = $context[$key];
-                    if ($key === 0) {
-                        array_shift($context);
-                    } else {
-                        unset($context[$key]);
-                    }
-                    break;
-                }
-            }
-        }
-
-        return $tags ?: strtolower($record['level_name']);
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    protected function getDefaultFormatter()
-    {
-        return new LineFormatter('%message%');
-    }
-}
diff --git a/mayor-orig/www/include/share/googleapi/monolog/monolog/src/Monolog/Handler/PsrHandler.php b/mayor-orig/www/include/share/googleapi/monolog/monolog/src/Monolog/Handler/PsrHandler.php
deleted file mode 100644
index 1ae85845..00000000
--- a/mayor-orig/www/include/share/googleapi/monolog/monolog/src/Monolog/Handler/PsrHandler.php
+++ /dev/null
@@ -1,56 +0,0 @@
-
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Monolog\Handler;
-
-use Monolog\Logger;
-use Psr\Log\LoggerInterface;
-
-/**
- * Proxies log messages to an existing PSR-3 compliant logger.
- *
- * @author Michael Moussa 
- */
-class PsrHandler extends AbstractHandler
-{
-    /**
-     * PSR-3 compliant logger
-     *
-     * @var LoggerInterface
-     */
-    protected $logger;
-
-    /**
-     * @param LoggerInterface $logger The underlying PSR-3 compliant logger to which messages will be proxied
-     * @param int             $level  The minimum logging level at which this handler will be triggered
-     * @param Boolean         $bubble Whether the messages that are handled can bubble up the stack or not
-     */
-    public function __construct(LoggerInterface $logger, $level = Logger::DEBUG, $bubble = true)
-    {
-        parent::__construct($level, $bubble);
-
-        $this->logger = $logger;
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public function handle(array $record)
-    {
-        if (!$this->isHandling($record)) {
-            return false;
-        }
-
-        $this->logger->log(strtolower($record['level_name']), $record['message'], $record['context']);
-
-        return false === $this->bubble;
-    }
-}
diff --git a/mayor-orig/www/include/share/googleapi/monolog/monolog/src/Monolog/Handler/PushoverHandler.php b/mayor-orig/www/include/share/googleapi/monolog/monolog/src/Monolog/Handler/PushoverHandler.php
deleted file mode 100644
index bba72005..00000000
--- a/mayor-orig/www/include/share/googleapi/monolog/monolog/src/Monolog/Handler/PushoverHandler.php
+++ /dev/null
@@ -1,185 +0,0 @@
-
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Monolog\Handler;
-
-use Monolog\Logger;
-
-/**
- * Sends notifications through the pushover api to mobile phones
- *
- * @author Sebastian Göttschkes 
- * @see    https://www.pushover.net/api
- */
-class PushoverHandler extends SocketHandler
-{
-    private $token;
-    private $users;
-    private $title;
-    private $user;
-    private $retry;
-    private $expire;
-
-    private $highPriorityLevel;
-    private $emergencyLevel;
-    private $useFormattedMessage = false;
-
-    /**
-     * All parameters that can be sent to Pushover
-     * @see https://pushover.net/api
-     * @var array
-     */
-    private $parameterNames = array(
-        'token' => true,
-        'user' => true,
-        'message' => true,
-        'device' => true,
-        'title' => true,
-        'url' => true,
-        'url_title' => true,
-        'priority' => true,
-        'timestamp' => true,
-        'sound' => true,
-        'retry' => true,
-        'expire' => true,
-        'callback' => true,
-    );
-
-    /**
-     * Sounds the api supports by default
-     * @see https://pushover.net/api#sounds
-     * @var array
-     */
-    private $sounds = array(
-        'pushover', 'bike', 'bugle', 'cashregister', 'classical', 'cosmic', 'falling', 'gamelan', 'incoming',
-        'intermission', 'magic', 'mechanical', 'pianobar', 'siren', 'spacealarm', 'tugboat', 'alien', 'climb',
-        'persistent', 'echo', 'updown', 'none',
-    );
-
-    /**
-     * @param string       $token             Pushover api token
-     * @param string|array $users             Pushover user id or array of ids the message will be sent to
-     * @param string       $title             Title sent to the Pushover API
-     * @param int          $level             The minimum logging level at which this handler will be triggered
-     * @param Boolean      $bubble            Whether the messages that are handled can bubble up the stack or not
-     * @param Boolean      $useSSL            Whether to connect via SSL. Required when pushing messages to users that are not
-     *                                        the pushover.net app owner. OpenSSL is required for this option.
-     * @param int          $highPriorityLevel The minimum logging level at which this handler will start
-     *                                        sending "high priority" requests to the Pushover API
-     * @param int          $emergencyLevel    The minimum logging level at which this handler will start
-     *                                        sending "emergency" requests to the Pushover API
-     * @param int          $retry             The retry parameter specifies how often (in seconds) the Pushover servers will send the same notification to the user.
-     * @param int          $expire            The expire parameter specifies how many seconds your notification will continue to be retried for (every retry seconds).
-     */
-    public function __construct($token, $users, $title = null, $level = Logger::CRITICAL, $bubble = true, $useSSL = true, $highPriorityLevel = Logger::CRITICAL, $emergencyLevel = Logger::EMERGENCY, $retry = 30, $expire = 25200)
-    {
-        $connectionString = $useSSL ? 'ssl://api.pushover.net:443' : 'api.pushover.net:80';
-        parent::__construct($connectionString, $level, $bubble);
-
-        $this->token = $token;
-        $this->users = (array) $users;
-        $this->title = $title ?: gethostname();
-        $this->highPriorityLevel = Logger::toMonologLevel($highPriorityLevel);
-        $this->emergencyLevel = Logger::toMonologLevel($emergencyLevel);
-        $this->retry = $retry;
-        $this->expire = $expire;
-    }
-
-    protected function generateDataStream($record)
-    {
-        $content = $this->buildContent($record);
-
-        return $this->buildHeader($content) . $content;
-    }
-
-    private function buildContent($record)
-    {
-        // Pushover has a limit of 512 characters on title and message combined.
-        $maxMessageLength = 512 - strlen($this->title);
-
-        $message = ($this->useFormattedMessage) ? $record['formatted'] : $record['message'];
-        $message = substr($message, 0, $maxMessageLength);
-
-        $timestamp = $record['datetime']->getTimestamp();
-
-        $dataArray = array(
-            'token' => $this->token,
-            'user' => $this->user,
-            'message' => $message,
-            'title' => $this->title,
-            'timestamp' => $timestamp,
-        );
-
-        if (isset($record['level']) && $record['level'] >= $this->emergencyLevel) {
-            $dataArray['priority'] = 2;
-            $dataArray['retry'] = $this->retry;
-            $dataArray['expire'] = $this->expire;
-        } elseif (isset($record['level']) && $record['level'] >= $this->highPriorityLevel) {
-            $dataArray['priority'] = 1;
-        }
-
-        // First determine the available parameters
-        $context = array_intersect_key($record['context'], $this->parameterNames);
-        $extra = array_intersect_key($record['extra'], $this->parameterNames);
-
-        // Least important info should be merged with subsequent info
-        $dataArray = array_merge($extra, $context, $dataArray);
-
-        // Only pass sounds that are supported by the API
-        if (isset($dataArray['sound']) && !in_array($dataArray['sound'], $this->sounds)) {
-            unset($dataArray['sound']);
-        }
-
-        return http_build_query($dataArray);
-    }
-
-    private function buildHeader($content)
-    {
-        $header = "POST /1/messages.json HTTP/1.1\r\n";
-        $header .= "Host: api.pushover.net\r\n";
-        $header .= "Content-Type: application/x-www-form-urlencoded\r\n";
-        $header .= "Content-Length: " . strlen($content) . "\r\n";
-        $header .= "\r\n";
-
-        return $header;
-    }
-
-    protected function write(array $record)
-    {
-        foreach ($this->users as $user) {
-            $this->user = $user;
-
-            parent::write($record);
-            $this->closeSocket();
-        }
-
-        $this->user = null;
-    }
-
-    public function setHighPriorityLevel($value)
-    {
-        $this->highPriorityLevel = $value;
-    }
-
-    public function setEmergencyLevel($value)
-    {
-        $this->emergencyLevel = $value;
-    }
-
-    /**
-     * Use the formatted message?
-     * @param bool $value
-     */
-    public function useFormattedMessage($value)
-    {
-        $this->useFormattedMessage = (boolean) $value;
-    }
-}
diff --git a/mayor-orig/www/include/share/googleapi/monolog/monolog/src/Monolog/Handler/RavenHandler.php b/mayor-orig/www/include/share/googleapi/monolog/monolog/src/Monolog/Handler/RavenHandler.php
deleted file mode 100644
index 53a8b391..00000000
--- a/mayor-orig/www/include/share/googleapi/monolog/monolog/src/Monolog/Handler/RavenHandler.php
+++ /dev/null
@@ -1,232 +0,0 @@
-
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Monolog\Handler;
-
-use Monolog\Formatter\LineFormatter;
-use Monolog\Formatter\FormatterInterface;
-use Monolog\Logger;
-use Raven_Client;
-
-/**
- * Handler to send messages to a Sentry (https://github.com/getsentry/sentry) server
- * using raven-php (https://github.com/getsentry/raven-php)
- *
- * @author Marc Abramowitz 
- */
-class RavenHandler extends AbstractProcessingHandler
-{
-    /**
-     * Translates Monolog log levels to Raven log levels.
-     */
-    private $logLevels = array(
-        Logger::DEBUG     => Raven_Client::DEBUG,
-        Logger::INFO      => Raven_Client::INFO,
-        Logger::NOTICE    => Raven_Client::INFO,
-        Logger::WARNING   => Raven_Client::WARNING,
-        Logger::ERROR     => Raven_Client::ERROR,
-        Logger::CRITICAL  => Raven_Client::FATAL,
-        Logger::ALERT     => Raven_Client::FATAL,
-        Logger::EMERGENCY => Raven_Client::FATAL,
-    );
-
-    /**
-     * @var string should represent the current version of the calling
-     *             software. Can be any string (git commit, version number)
-     */
-    private $release;
-
-    /**
-     * @var Raven_Client the client object that sends the message to the server
-     */
-    protected $ravenClient;
-
-    /**
-     * @var LineFormatter The formatter to use for the logs generated via handleBatch()
-     */
-    protected $batchFormatter;
-
-    /**
-     * @param Raven_Client $ravenClient
-     * @param int          $level       The minimum logging level at which this handler will be triggered
-     * @param Boolean      $bubble      Whether the messages that are handled can bubble up the stack or not
-     */
-    public function __construct(Raven_Client $ravenClient, $level = Logger::DEBUG, $bubble = true)
-    {
-        parent::__construct($level, $bubble);
-
-        $this->ravenClient = $ravenClient;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function handleBatch(array $records)
-    {
-        $level = $this->level;
-
-        // filter records based on their level
-        $records = array_filter($records, function ($record) use ($level) {
-            return $record['level'] >= $level;
-        });
-
-        if (!$records) {
-            return;
-        }
-
-        // the record with the highest severity is the "main" one
-        $record = array_reduce($records, function ($highest, $record) {
-            if ($record['level'] > $highest['level']) {
-                return $record;
-            }
-
-            return $highest;
-        });
-
-        // the other ones are added as a context item
-        $logs = array();
-        foreach ($records as $r) {
-            $logs[] = $this->processRecord($r);
-        }
-
-        if ($logs) {
-            $record['context']['logs'] = (string) $this->getBatchFormatter()->formatBatch($logs);
-        }
-
-        $this->handle($record);
-    }
-
-    /**
-     * Sets the formatter for the logs generated by handleBatch().
-     *
-     * @param FormatterInterface $formatter
-     */
-    public function setBatchFormatter(FormatterInterface $formatter)
-    {
-        $this->batchFormatter = $formatter;
-    }
-
-    /**
-     * Gets the formatter for the logs generated by handleBatch().
-     *
-     * @return FormatterInterface
-     */
-    public function getBatchFormatter()
-    {
-        if (!$this->batchFormatter) {
-            $this->batchFormatter = $this->getDefaultBatchFormatter();
-        }
-
-        return $this->batchFormatter;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    protected function write(array $record)
-    {
-        $previousUserContext = false;
-        $options = array();
-        $options['level'] = $this->logLevels[$record['level']];
-        $options['tags'] = array();
-        if (!empty($record['extra']['tags'])) {
-            $options['tags'] = array_merge($options['tags'], $record['extra']['tags']);
-            unset($record['extra']['tags']);
-        }
-        if (!empty($record['context']['tags'])) {
-            $options['tags'] = array_merge($options['tags'], $record['context']['tags']);
-            unset($record['context']['tags']);
-        }
-        if (!empty($record['context']['fingerprint'])) {
-            $options['fingerprint'] = $record['context']['fingerprint'];
-            unset($record['context']['fingerprint']);
-        }
-        if (!empty($record['context']['logger'])) {
-            $options['logger'] = $record['context']['logger'];
-            unset($record['context']['logger']);
-        } else {
-            $options['logger'] = $record['channel'];
-        }
-        foreach ($this->getExtraParameters() as $key) {
-            foreach (array('extra', 'context') as $source) {
-                if (!empty($record[$source][$key])) {
-                    $options[$key] = $record[$source][$key];
-                    unset($record[$source][$key]);
-                }
-            }
-        }
-        if (!empty($record['context'])) {
-            $options['extra']['context'] = $record['context'];
-            if (!empty($record['context']['user'])) {
-                $previousUserContext = $this->ravenClient->context->user;
-                $this->ravenClient->user_context($record['context']['user']);
-                unset($options['extra']['context']['user']);
-            }
-        }
-        if (!empty($record['extra'])) {
-            $options['extra']['extra'] = $record['extra'];
-        }
-
-        if (!empty($this->release) && !isset($options['release'])) {
-            $options['release'] = $this->release;
-        }
-
-        if (isset($record['context']['exception']) && ($record['context']['exception'] instanceof \Exception || (PHP_VERSION_ID >= 70000 && $record['context']['exception'] instanceof \Throwable))) {
-            $options['extra']['message'] = $record['formatted'];
-            $this->ravenClient->captureException($record['context']['exception'], $options);
-        } else {
-            $this->ravenClient->captureMessage($record['formatted'], array(), $options);
-        }
-
-        if ($previousUserContext !== false) {
-            $this->ravenClient->user_context($previousUserContext);
-        }
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    protected function getDefaultFormatter()
-    {
-        return new LineFormatter('[%channel%] %message%');
-    }
-
-    /**
-     * Gets the default formatter for the logs generated by handleBatch().
-     *
-     * @return FormatterInterface
-     */
-    protected function getDefaultBatchFormatter()
-    {
-        return new LineFormatter();
-    }
-
-    /**
-     * Gets extra parameters supported by Raven that can be found in "extra" and "context"
-     *
-     * @return array
-     */
-    protected function getExtraParameters()
-    {
-        return array('checksum', 'release', 'event_id');
-    }
-
-    /**
-     * @param string $value
-     * @return self
-     */
-    public function setRelease($value)
-    {
-        $this->release = $value;
-
-        return $this;
-    }
-}
diff --git a/mayor-orig/www/include/share/googleapi/monolog/monolog/src/Monolog/Handler/RedisHandler.php b/mayor-orig/www/include/share/googleapi/monolog/monolog/src/Monolog/Handler/RedisHandler.php
deleted file mode 100644
index 590f9965..00000000
--- a/mayor-orig/www/include/share/googleapi/monolog/monolog/src/Monolog/Handler/RedisHandler.php
+++ /dev/null
@@ -1,97 +0,0 @@
-
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Monolog\Handler;
-
-use Monolog\Formatter\LineFormatter;
-use Monolog\Logger;
-
-/**
- * Logs to a Redis key using rpush
- *
- * usage example:
- *
- *   $log = new Logger('application');
- *   $redis = new RedisHandler(new Predis\Client("tcp://localhost:6379"), "logs", "prod");
- *   $log->pushHandler($redis);
- *
- * @author Thomas Tourlourat 
- */
-class RedisHandler extends AbstractProcessingHandler
-{
-    private $redisClient;
-    private $redisKey;
-    protected $capSize;
-
-    /**
-     * @param \Predis\Client|\Redis $redis   The redis instance
-     * @param string                $key     The key name to push records to
-     * @param int                   $level   The minimum logging level at which this handler will be triggered
-     * @param bool                  $bubble  Whether the messages that are handled can bubble up the stack or not
-     * @param int                   $capSize Number of entries to limit list size to
-     */
-    public function __construct($redis, $key, $level = Logger::DEBUG, $bubble = true, $capSize = false)
-    {
-        if (!(($redis instanceof \Predis\Client) || ($redis instanceof \Redis))) {
-            throw new \InvalidArgumentException('Predis\Client or Redis instance required');
-        }
-
-        $this->redisClient = $redis;
-        $this->redisKey = $key;
-        $this->capSize = $capSize;
-
-        parent::__construct($level, $bubble);
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    protected function write(array $record)
-    {
-        if ($this->capSize) {
-            $this->writeCapped($record);
-        } else {
-            $this->redisClient->rpush($this->redisKey, $record["formatted"]);
-        }
-    }
-
-    /**
-     * Write and cap the collection
-     * Writes the record to the redis list and caps its
-     *
-     * @param  array $record associative record array
-     * @return void
-     */
-    protected function writeCapped(array $record)
-    {
-        if ($this->redisClient instanceof \Redis) {
-            $this->redisClient->multi()
-                ->rpush($this->redisKey, $record["formatted"])
-                ->ltrim($this->redisKey, -$this->capSize, -1)
-                ->exec();
-        } else {
-            $redisKey = $this->redisKey;
-            $capSize = $this->capSize;
-            $this->redisClient->transaction(function ($tx) use ($record, $redisKey, $capSize) {
-                $tx->rpush($redisKey, $record["formatted"]);
-                $tx->ltrim($redisKey, -$capSize, -1);
-            });
-        }
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    protected function getDefaultFormatter()
-    {
-        return new LineFormatter();
-    }
-}
diff --git a/mayor-orig/www/include/share/googleapi/monolog/monolog/src/Monolog/Handler/RollbarHandler.php b/mayor-orig/www/include/share/googleapi/monolog/monolog/src/Monolog/Handler/RollbarHandler.php
deleted file mode 100644
index 6c8a3e3e..00000000
--- a/mayor-orig/www/include/share/googleapi/monolog/monolog/src/Monolog/Handler/RollbarHandler.php
+++ /dev/null
@@ -1,132 +0,0 @@
-
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Monolog\Handler;
-
-use RollbarNotifier;
-use Exception;
-use Monolog\Logger;
-
-/**
- * Sends errors to Rollbar
- *
- * If the context data contains a `payload` key, that is used as an array
- * of payload options to RollbarNotifier's report_message/report_exception methods.
- *
- * Rollbar's context info will contain the context + extra keys from the log record
- * merged, and then on top of that a few keys:
- *
- *  - level (rollbar level name)
- *  - monolog_level (monolog level name, raw level, as rollbar only has 5 but monolog 8)
- *  - channel
- *  - datetime (unix timestamp)
- *
- * @author Paul Statezny 
- */
-class RollbarHandler extends AbstractProcessingHandler
-{
-    /**
-     * Rollbar notifier
-     *
-     * @var RollbarNotifier
-     */
-    protected $rollbarNotifier;
-
-    protected $levelMap = array(
-        Logger::DEBUG     => 'debug',
-        Logger::INFO      => 'info',
-        Logger::NOTICE    => 'info',
-        Logger::WARNING   => 'warning',
-        Logger::ERROR     => 'error',
-        Logger::CRITICAL  => 'critical',
-        Logger::ALERT     => 'critical',
-        Logger::EMERGENCY => 'critical',
-    );
-
-    /**
-     * Records whether any log records have been added since the last flush of the rollbar notifier
-     *
-     * @var bool
-     */
-    private $hasRecords = false;
-
-    protected $initialized = false;
-
-    /**
-     * @param RollbarNotifier $rollbarNotifier RollbarNotifier object constructed with valid token
-     * @param int             $level           The minimum logging level at which this handler will be triggered
-     * @param bool            $bubble          Whether the messages that are handled can bubble up the stack or not
-     */
-    public function __construct(RollbarNotifier $rollbarNotifier, $level = Logger::ERROR, $bubble = true)
-    {
-        $this->rollbarNotifier = $rollbarNotifier;
-
-        parent::__construct($level, $bubble);
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    protected function write(array $record)
-    {
-        if (!$this->initialized) {
-            // __destructor() doesn't get called on Fatal errors
-            register_shutdown_function(array($this, 'close'));
-            $this->initialized = true;
-        }
-
-        $context = $record['context'];
-        $payload = array();
-        if (isset($context['payload'])) {
-            $payload = $context['payload'];
-            unset($context['payload']);
-        }
-        $context = array_merge($context, $record['extra'], array(
-            'level' => $this->levelMap[$record['level']],
-            'monolog_level' => $record['level_name'],
-            'channel' => $record['channel'],
-            'datetime' => $record['datetime']->format('U'),
-        ));
-
-        if (isset($context['exception']) && $context['exception'] instanceof Exception) {
-            $payload['level'] = $context['level'];
-            $exception = $context['exception'];
-            unset($context['exception']);
-
-            $this->rollbarNotifier->report_exception($exception, $context, $payload);
-        } else {
-            $this->rollbarNotifier->report_message(
-                $record['message'],
-                $context['level'],
-                $context,
-                $payload
-            );
-        }
-
-        $this->hasRecords = true;
-    }
-
-    public function flush()
-    {
-        if ($this->hasRecords) {
-            $this->rollbarNotifier->flush();
-            $this->hasRecords = false;
-        }
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function close()
-    {
-        $this->flush();
-    }
-}
diff --git a/mayor-orig/www/include/share/googleapi/monolog/monolog/src/Monolog/Handler/RotatingFileHandler.php b/mayor-orig/www/include/share/googleapi/monolog/monolog/src/Monolog/Handler/RotatingFileHandler.php
deleted file mode 100644
index 3b60b3d1..00000000
--- a/mayor-orig/www/include/share/googleapi/monolog/monolog/src/Monolog/Handler/RotatingFileHandler.php
+++ /dev/null
@@ -1,178 +0,0 @@
-
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Monolog\Handler;
-
-use Monolog\Logger;
-
-/**
- * Stores logs to files that are rotated every day and a limited number of files are kept.
- *
- * This rotation is only intended to be used as a workaround. Using logrotate to
- * handle the rotation is strongly encouraged when you can use it.
- *
- * @author Christophe Coevoet 
- * @author Jordi Boggiano 
- */
-class RotatingFileHandler extends StreamHandler
-{
-    const FILE_PER_DAY = 'Y-m-d';
-    const FILE_PER_MONTH = 'Y-m';
-    const FILE_PER_YEAR = 'Y';
-
-    protected $filename;
-    protected $maxFiles;
-    protected $mustRotate;
-    protected $nextRotation;
-    protected $filenameFormat;
-    protected $dateFormat;
-
-    /**
-     * @param string   $filename
-     * @param int      $maxFiles       The maximal amount of files to keep (0 means unlimited)
-     * @param int      $level          The minimum logging level at which this handler will be triggered
-     * @param Boolean  $bubble         Whether the messages that are handled can bubble up the stack or not
-     * @param int|null $filePermission Optional file permissions (default (0644) are only for owner read/write)
-     * @param Boolean  $useLocking     Try to lock log file before doing any writes
-     */
-    public function __construct($filename, $maxFiles = 0, $level = Logger::DEBUG, $bubble = true, $filePermission = null, $useLocking = false)
-    {
-        $this->filename = $filename;
-        $this->maxFiles = (int) $maxFiles;
-        $this->nextRotation = new \DateTime('tomorrow');
-        $this->filenameFormat = '{filename}-{date}';
-        $this->dateFormat = 'Y-m-d';
-
-        parent::__construct($this->getTimedFilename(), $level, $bubble, $filePermission, $useLocking);
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function close()
-    {
-        parent::close();
-
-        if (true === $this->mustRotate) {
-            $this->rotate();
-        }
-    }
-
-    public function setFilenameFormat($filenameFormat, $dateFormat)
-    {
-        if (!preg_match('{^Y(([/_.-]?m)([/_.-]?d)?)?$}', $dateFormat)) {
-            trigger_error(
-                'Invalid date format - format must be one of '.
-                'RotatingFileHandler::FILE_PER_DAY ("Y-m-d"), RotatingFileHandler::FILE_PER_MONTH ("Y-m") '.
-                'or RotatingFileHandler::FILE_PER_YEAR ("Y"), or you can set one of the '.
-                'date formats using slashes, underscores and/or dots instead of dashes.',
-                E_USER_DEPRECATED
-            );
-        }
-        if (substr_count($filenameFormat, '{date}') === 0) {
-            trigger_error(
-                'Invalid filename format - format should contain at least `{date}`, because otherwise rotating is impossible.',
-                E_USER_DEPRECATED
-            );
-        }
-        $this->filenameFormat = $filenameFormat;
-        $this->dateFormat = $dateFormat;
-        $this->url = $this->getTimedFilename();
-        $this->close();
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    protected function write(array $record)
-    {
-        // on the first record written, if the log is new, we should rotate (once per day)
-        if (null === $this->mustRotate) {
-            $this->mustRotate = !file_exists($this->url);
-        }
-
-        if ($this->nextRotation < $record['datetime']) {
-            $this->mustRotate = true;
-            $this->close();
-        }
-
-        parent::write($record);
-    }
-
-    /**
-     * Rotates the files.
-     */
-    protected function rotate()
-    {
-        // update filename
-        $this->url = $this->getTimedFilename();
-        $this->nextRotation = new \DateTime('tomorrow');
-
-        // skip GC of old logs if files are unlimited
-        if (0 === $this->maxFiles) {
-            return;
-        }
-
-        $logFiles = glob($this->getGlobPattern());
-        if ($this->maxFiles >= count($logFiles)) {
-            // no files to remove
-            return;
-        }
-
-        // Sorting the files by name to remove the older ones
-        usort($logFiles, function ($a, $b) {
-            return strcmp($b, $a);
-        });
-
-        foreach (array_slice($logFiles, $this->maxFiles) as $file) {
-            if (is_writable($file)) {
-                // suppress errors here as unlink() might fail if two processes
-                // are cleaning up/rotating at the same time
-                set_error_handler(function ($errno, $errstr, $errfile, $errline) {});
-                unlink($file);
-                restore_error_handler();
-            }
-        }
-
-        $this->mustRotate = false;
-    }
-
-    protected function getTimedFilename()
-    {
-        $fileInfo = pathinfo($this->filename);
-        $timedFilename = str_replace(
-            array('{filename}', '{date}'),
-            array($fileInfo['filename'], date($this->dateFormat)),
-            $fileInfo['dirname'] . '/' . $this->filenameFormat
-        );
-
-        if (!empty($fileInfo['extension'])) {
-            $timedFilename .= '.'.$fileInfo['extension'];
-        }
-
-        return $timedFilename;
-    }
-
-    protected function getGlobPattern()
-    {
-        $fileInfo = pathinfo($this->filename);
-        $glob = str_replace(
-            array('{filename}', '{date}'),
-            array($fileInfo['filename'], '*'),
-            $fileInfo['dirname'] . '/' . $this->filenameFormat
-        );
-        if (!empty($fileInfo['extension'])) {
-            $glob .= '.'.$fileInfo['extension'];
-        }
-
-        return $glob;
-    }
-}
diff --git a/mayor-orig/www/include/share/googleapi/monolog/monolog/src/Monolog/Handler/SamplingHandler.php b/mayor-orig/www/include/share/googleapi/monolog/monolog/src/Monolog/Handler/SamplingHandler.php
deleted file mode 100644
index 9509ae37..00000000
--- a/mayor-orig/www/include/share/googleapi/monolog/monolog/src/Monolog/Handler/SamplingHandler.php
+++ /dev/null
@@ -1,82 +0,0 @@
-
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Monolog\Handler;
-
-/**
- * Sampling handler
- *
- * A sampled event stream can be useful for logging high frequency events in
- * a production environment where you only need an idea of what is happening
- * and are not concerned with capturing every occurrence. Since the decision to
- * handle or not handle a particular event is determined randomly, the
- * resulting sampled log is not guaranteed to contain 1/N of the events that
- * occurred in the application, but based on the Law of large numbers, it will
- * tend to be close to this ratio with a large number of attempts.
- *
- * @author Bryan Davis 
- * @author Kunal Mehta 
- */
-class SamplingHandler extends AbstractHandler
-{
-    /**
-     * @var callable|HandlerInterface $handler
-     */
-    protected $handler;
-
-    /**
-     * @var int $factor
-     */
-    protected $factor;
-
-    /**
-     * @param callable|HandlerInterface $handler Handler or factory callable($record, $fingersCrossedHandler).
-     * @param int                       $factor  Sample factor
-     */
-    public function __construct($handler, $factor)
-    {
-        parent::__construct();
-        $this->handler = $handler;
-        $this->factor = $factor;
-
-        if (!$this->handler instanceof HandlerInterface && !is_callable($this->handler)) {
-            throw new \RuntimeException("The given handler (".json_encode($this->handler).") is not a callable nor a Monolog\Handler\HandlerInterface object");
-        }
-    }
-
-    public function isHandling(array $record)
-    {
-        return $this->handler->isHandling($record);
-    }
-
-    public function handle(array $record)
-    {
-        if ($this->isHandling($record) && mt_rand(1, $this->factor) === 1) {
-            // The same logic as in FingersCrossedHandler
-            if (!$this->handler instanceof HandlerInterface) {
-                $this->handler = call_user_func($this->handler, $record, $this);
-                if (!$this->handler instanceof HandlerInterface) {
-                    throw new \RuntimeException("The factory callable should return a HandlerInterface");
-                }
-            }
-
-            if ($this->processors) {
-                foreach ($this->processors as $processor) {
-                    $record = call_user_func($processor, $record);
-                }
-            }
-
-            $this->handler->handle($record);
-        }
-
-        return false === $this->bubble;
-    }
-}
diff --git a/mayor-orig/www/include/share/googleapi/monolog/monolog/src/Monolog/Handler/Slack/SlackRecord.php b/mayor-orig/www/include/share/googleapi/monolog/monolog/src/Monolog/Handler/Slack/SlackRecord.php
deleted file mode 100644
index 38bc838a..00000000
--- a/mayor-orig/www/include/share/googleapi/monolog/monolog/src/Monolog/Handler/Slack/SlackRecord.php
+++ /dev/null
@@ -1,294 +0,0 @@
-
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Monolog\Handler\Slack;
-
-use Monolog\Logger;
-use Monolog\Formatter\NormalizerFormatter;
-use Monolog\Formatter\FormatterInterface;
-
-/**
- * Slack record utility helping to log to Slack webhooks or API.
- *
- * @author Greg Kedzierski 
- * @author Haralan Dobrev 
- * @see    https://api.slack.com/incoming-webhooks
- * @see    https://api.slack.com/docs/message-attachments
- */
-class SlackRecord
-{
-    const COLOR_DANGER = 'danger';
-
-    const COLOR_WARNING = 'warning';
-
-    const COLOR_GOOD = 'good';
-
-    const COLOR_DEFAULT = '#e3e4e6';
-
-    /**
-     * Slack channel (encoded ID or name)
-     * @var string|null
-     */
-    private $channel;
-
-    /**
-     * Name of a bot
-     * @var string|null
-     */
-    private $username;
-
-    /**
-     * User icon e.g. 'ghost', 'http://example.com/user.png'
-     * @var string
-     */
-    private $userIcon;
-
-    /**
-     * Whether the message should be added to Slack as attachment (plain text otherwise)
-     * @var bool
-     */
-    private $useAttachment;
-
-    /**
-     * Whether the the context/extra messages added to Slack as attachments are in a short style
-     * @var bool
-     */
-    private $useShortAttachment;
-
-    /**
-     * Whether the attachment should include context and extra data
-     * @var bool
-     */
-    private $includeContextAndExtra;
-
-    /**
-     * Dot separated list of fields to exclude from slack message. E.g. ['context.field1', 'extra.field2']
-     * @var array
-     */
-    private $excludeFields;
-
-    /**
-     * @var FormatterInterface
-     */
-    private $formatter;
-
-    /**
-     * @var NormalizerFormatter
-     */
-    private $normalizerFormatter;
-
-    public function __construct($channel = null, $username = null, $useAttachment = true, $userIcon = null, $useShortAttachment = false, $includeContextAndExtra = false, array $excludeFields = array(), FormatterInterface $formatter = null)
-    {
-        $this->channel = $channel;
-        $this->username = $username;
-        $this->userIcon = trim($userIcon, ':');
-        $this->useAttachment = $useAttachment;
-        $this->useShortAttachment = $useShortAttachment;
-        $this->includeContextAndExtra = $includeContextAndExtra;
-        $this->excludeFields = $excludeFields;
-        $this->formatter = $formatter;
-
-        if ($this->includeContextAndExtra) {
-            $this->normalizerFormatter = new NormalizerFormatter();
-        }
-    }
-
-    public function getSlackData(array $record)
-    {
-        $dataArray = array();
-        $record = $this->excludeFields($record);
-
-        if ($this->username) {
-            $dataArray['username'] = $this->username;
-        }
-
-        if ($this->channel) {
-            $dataArray['channel'] = $this->channel;
-        }
-
-        if ($this->formatter && !$this->useAttachment) {
-            $message = $this->formatter->format($record);
-        } else {
-            $message = $record['message'];
-        }
-
-        if ($this->useAttachment) {
-            $attachment = array(
-                'fallback'  => $message,
-                'text'      => $message,
-                'color'     => $this->getAttachmentColor($record['level']),
-                'fields'    => array(),
-                'mrkdwn_in' => array('fields'),
-                'ts'        => $record['datetime']->getTimestamp()
-            );
-
-            if ($this->useShortAttachment) {
-                $attachment['title'] = $record['level_name'];
-            } else {
-                $attachment['title'] = 'Message';
-                $attachment['fields'][] = $this->generateAttachmentField('Level', $record['level_name']);
-            }
-
-
-            if ($this->includeContextAndExtra) {
-                foreach (array('extra', 'context') as $key) {
-                    if (empty($record[$key])) {
-                        continue;
-                    }
-
-                    if ($this->useShortAttachment) {
-                        $attachment['fields'][] = $this->generateAttachmentField(
-                            ucfirst($key),
-                            $record[$key]
-                        );
-                    } else {
-                        // Add all extra fields as individual fields in attachment
-                        $attachment['fields'] = array_merge(
-                            $attachment['fields'],
-                            $this->generateAttachmentFields($record[$key])
-                        );
-                    }
-                }
-            }
-
-            $dataArray['attachments'] = array($attachment);
-        } else {
-            $dataArray['text'] = $message;
-        }
-
-        if ($this->userIcon) {
-            if (filter_var($this->userIcon, FILTER_VALIDATE_URL)) {
-                $dataArray['icon_url'] = $this->userIcon;
-            } else {
-                $dataArray['icon_emoji'] = ":{$this->userIcon}:";
-            }
-        }
-
-        return $dataArray;
-    }
-
-    /**
-     * Returned a Slack message attachment color associated with
-     * provided level.
-     *
-     * @param  int    $level
-     * @return string
-     */
-    public function getAttachmentColor($level)
-    {
-        switch (true) {
-            case $level >= Logger::ERROR:
-                return self::COLOR_DANGER;
-            case $level >= Logger::WARNING:
-                return self::COLOR_WARNING;
-            case $level >= Logger::INFO:
-                return self::COLOR_GOOD;
-            default:
-                return self::COLOR_DEFAULT;
-        }
-    }
-
-    /**
-     * Stringifies an array of key/value pairs to be used in attachment fields
-     *
-     * @param array $fields
-     *
-     * @return string
-     */
-    public function stringify($fields)
-    {
-        $normalized = $this->normalizerFormatter->format($fields);
-        $prettyPrintFlag = defined('JSON_PRETTY_PRINT') ? JSON_PRETTY_PRINT : 128;
-
-        $hasSecondDimension = count(array_filter($normalized, 'is_array'));
-        $hasNonNumericKeys = !count(array_filter(array_keys($normalized), 'is_numeric'));
-
-        return $hasSecondDimension || $hasNonNumericKeys
-            ? json_encode($normalized, $prettyPrintFlag)
-            : json_encode($normalized);
-    }
-
-    /**
-     * Sets the formatter
-     *
-     * @param FormatterInterface $formatter
-     */
-    public function setFormatter(FormatterInterface $formatter)
-    {
-        $this->formatter = $formatter;
-    }
-
-    /**
-     * Generates attachment field
-     *
-     * @param string $title
-     * @param string|array $value\
-     *
-     * @return array
-     */
-    private function generateAttachmentField($title, $value)
-    {
-        $value = is_array($value)
-            ? sprintf('```%s```', $this->stringify($value))
-            : $value;
-
-        return array(
-            'title' => $title,
-            'value' => $value,
-            'short' => false
-        );
-    }
-
-    /**
-     * Generates a collection of attachment fields from array
-     *
-     * @param array $data
-     *
-     * @return array
-     */
-    private function generateAttachmentFields(array $data)
-    {
-        $fields = array();
-        foreach ($data as $key => $value) {
-            $fields[] = $this->generateAttachmentField($key, $value);
-        }
-
-        return $fields;
-    }
-
-    /**
-     * Get a copy of record with fields excluded according to $this->excludeFields
-     *
-     * @param array $record
-     *
-     * @return array
-     */
-    private function excludeFields(array $record)
-    {
-        foreach ($this->excludeFields as $field) {
-            $keys = explode('.', $field);
-            $node = &$record;
-            $lastKey = end($keys);
-            foreach ($keys as $key) {
-                if (!isset($node[$key])) {
-                    break;
-                }
-                if ($lastKey === $key) {
-                    unset($node[$key]);
-                    break;
-                }
-                $node = &$node[$key];
-            }
-        }
-
-        return $record;
-    }
-}
diff --git a/mayor-orig/www/include/share/googleapi/monolog/monolog/src/Monolog/Handler/SlackHandler.php b/mayor-orig/www/include/share/googleapi/monolog/monolog/src/Monolog/Handler/SlackHandler.php
deleted file mode 100644
index 3ac4d836..00000000
--- a/mayor-orig/www/include/share/googleapi/monolog/monolog/src/Monolog/Handler/SlackHandler.php
+++ /dev/null
@@ -1,215 +0,0 @@
-
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Monolog\Handler;
-
-use Monolog\Formatter\FormatterInterface;
-use Monolog\Logger;
-use Monolog\Handler\Slack\SlackRecord;
-
-/**
- * Sends notifications through Slack API
- *
- * @author Greg Kedzierski 
- * @see    https://api.slack.com/
- */
-class SlackHandler extends SocketHandler
-{
-    /**
-     * Slack API token
-     * @var string
-     */
-    private $token;
-
-    /**
-     * Instance of the SlackRecord util class preparing data for Slack API.
-     * @var SlackRecord
-     */
-    private $slackRecord;
-
-    /**
-     * @param  string                    $token                  Slack API token
-     * @param  string                    $channel                Slack channel (encoded ID or name)
-     * @param  string|null               $username               Name of a bot
-     * @param  bool                      $useAttachment          Whether the message should be added to Slack as attachment (plain text otherwise)
-     * @param  string|null               $iconEmoji              The emoji name to use (or null)
-     * @param  int                       $level                  The minimum logging level at which this handler will be triggered
-     * @param  bool                      $bubble                 Whether the messages that are handled can bubble up the stack or not
-     * @param  bool                      $useShortAttachment     Whether the the context/extra messages added to Slack as attachments are in a short style
-     * @param  bool                      $includeContextAndExtra Whether the attachment should include context and extra data
-     * @param  array                     $excludeFields          Dot separated list of fields to exclude from slack message. E.g. ['context.field1', 'extra.field2']
-     * @throws MissingExtensionException If no OpenSSL PHP extension configured
-     */
-    public function __construct($token, $channel, $username = null, $useAttachment = true, $iconEmoji = null, $level = Logger::CRITICAL, $bubble = true, $useShortAttachment = false, $includeContextAndExtra = false, array $excludeFields = array())
-    {
-        if (!extension_loaded('openssl')) {
-            throw new MissingExtensionException('The OpenSSL PHP extension is required to use the SlackHandler');
-        }
-
-        parent::__construct('ssl://slack.com:443', $level, $bubble);
-
-        $this->slackRecord = new SlackRecord(
-            $channel,
-            $username,
-            $useAttachment,
-            $iconEmoji,
-            $useShortAttachment,
-            $includeContextAndExtra,
-            $excludeFields,
-            $this->formatter
-        );
-
-        $this->token = $token;
-    }
-
-    public function getSlackRecord()
-    {
-        return $this->slackRecord;
-    }
-
-    /**
-     * {@inheritdoc}
-     *
-     * @param  array  $record
-     * @return string
-     */
-    protected function generateDataStream($record)
-    {
-        $content = $this->buildContent($record);
-
-        return $this->buildHeader($content) . $content;
-    }
-
-    /**
-     * Builds the body of API call
-     *
-     * @param  array  $record
-     * @return string
-     */
-    private function buildContent($record)
-    {
-        $dataArray = $this->prepareContentData($record);
-
-        return http_build_query($dataArray);
-    }
-
-    /**
-     * Prepares content data
-     *
-     * @param  array $record
-     * @return array
-     */
-    protected function prepareContentData($record)
-    {
-        $dataArray = $this->slackRecord->getSlackData($record);
-        $dataArray['token'] = $this->token;
-
-        if (!empty($dataArray['attachments'])) {
-            $dataArray['attachments'] = json_encode($dataArray['attachments']);
-        }
-
-        return $dataArray;
-    }
-
-    /**
-     * Builds the header of the API Call
-     *
-     * @param  string $content
-     * @return string
-     */
-    private function buildHeader($content)
-    {
-        $header = "POST /api/chat.postMessage HTTP/1.1\r\n";
-        $header .= "Host: slack.com\r\n";
-        $header .= "Content-Type: application/x-www-form-urlencoded\r\n";
-        $header .= "Content-Length: " . strlen($content) . "\r\n";
-        $header .= "\r\n";
-
-        return $header;
-    }
-
-    /**
-     * {@inheritdoc}
-     *
-     * @param array $record
-     */
-    protected function write(array $record)
-    {
-        parent::write($record);
-        $this->finalizeWrite();
-    }
-
-    /**
-     * Finalizes the request by reading some bytes and then closing the socket
-     *
-     * If we do not read some but close the socket too early, slack sometimes
-     * drops the request entirely.
-     */
-    protected function finalizeWrite()
-    {
-        $res = $this->getResource();
-        if (is_resource($res)) {
-            @fread($res, 2048);
-        }
-        $this->closeSocket();
-    }
-
-    /**
-     * Returned a Slack message attachment color associated with
-     * provided level.
-     *
-     * @param  int    $level
-     * @return string
-     * @deprecated Use underlying SlackRecord instead
-     */
-    protected function getAttachmentColor($level)
-    {
-        trigger_error(
-            'SlackHandler::getAttachmentColor() is deprecated. Use underlying SlackRecord instead.',
-            E_USER_DEPRECATED
-        );
-
-        return $this->slackRecord->getAttachmentColor($level);
-    }
-
-    /**
-     * Stringifies an array of key/value pairs to be used in attachment fields
-     *
-     * @param  array  $fields
-     * @return string
-     * @deprecated Use underlying SlackRecord instead
-     */
-    protected function stringify($fields)
-    {
-        trigger_error(
-            'SlackHandler::stringify() is deprecated. Use underlying SlackRecord instead.',
-            E_USER_DEPRECATED
-        );
-
-        return $this->slackRecord->stringify($fields);
-    }
-
-    public function setFormatter(FormatterInterface $formatter)
-    {
-        parent::setFormatter($formatter);
-        $this->slackRecord->setFormatter($formatter);
-
-        return $this;
-    }
-
-    public function getFormatter()
-    {
-        $formatter = parent::getFormatter();
-        $this->slackRecord->setFormatter($formatter);
-
-        return $formatter;
-    }
-}
diff --git a/mayor-orig/www/include/share/googleapi/monolog/monolog/src/Monolog/Handler/SlackWebhookHandler.php b/mayor-orig/www/include/share/googleapi/monolog/monolog/src/Monolog/Handler/SlackWebhookHandler.php
deleted file mode 100644
index 9a1bbb44..00000000
--- a/mayor-orig/www/include/share/googleapi/monolog/monolog/src/Monolog/Handler/SlackWebhookHandler.php
+++ /dev/null
@@ -1,115 +0,0 @@
-
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Monolog\Handler;
-
-use Monolog\Formatter\FormatterInterface;
-use Monolog\Logger;
-use Monolog\Handler\Slack\SlackRecord;
-
-/**
- * Sends notifications through Slack Webhooks
- *
- * @author Haralan Dobrev 
- * @see    https://api.slack.com/incoming-webhooks
- */
-class SlackWebhookHandler extends AbstractProcessingHandler
-{
-    /**
-     * Slack Webhook token
-     * @var string
-     */
-    private $webhookUrl;
-
-    /**
-     * Instance of the SlackRecord util class preparing data for Slack API.
-     * @var SlackRecord
-     */
-    private $slackRecord;
-
-    /**
-     * @param  string      $webhookUrl             Slack Webhook URL
-     * @param  string|null $channel                Slack channel (encoded ID or name)
-     * @param  string|null $username               Name of a bot
-     * @param  bool        $useAttachment          Whether the message should be added to Slack as attachment (plain text otherwise)
-     * @param  string|null $iconEmoji              The emoji name to use (or null)
-     * @param  bool        $useShortAttachment     Whether the the context/extra messages added to Slack as attachments are in a short style
-     * @param  bool        $includeContextAndExtra Whether the attachment should include context and extra data
-     * @param  int         $level                  The minimum logging level at which this handler will be triggered
-     * @param  bool        $bubble                 Whether the messages that are handled can bubble up the stack or not
-     * @param  array       $excludeFields          Dot separated list of fields to exclude from slack message. E.g. ['context.field1', 'extra.field2']
-     */
-    public function __construct($webhookUrl, $channel = null, $username = null, $useAttachment = true, $iconEmoji = null, $useShortAttachment = false, $includeContextAndExtra = false, $level = Logger::CRITICAL, $bubble = true, array $excludeFields = array())
-    {
-        parent::__construct($level, $bubble);
-
-        $this->webhookUrl = $webhookUrl;
-
-        $this->slackRecord = new SlackRecord(
-            $channel,
-            $username,
-            $useAttachment,
-            $iconEmoji,
-            $useShortAttachment,
-            $includeContextAndExtra,
-            $excludeFields,
-            $this->formatter
-        );
-    }
-
-    public function getSlackRecord()
-    {
-        return $this->slackRecord;
-    }
-
-    /**
-     * {@inheritdoc}
-     *
-     * @param array $record
-     */
-    protected function write(array $record)
-    {
-        $postData = $this->slackRecord->getSlackData($record);
-        $postString = json_encode($postData);
-
-        $ch = curl_init();
-        $options = array(
-            CURLOPT_URL => $this->webhookUrl,
-            CURLOPT_POST => true,
-            CURLOPT_RETURNTRANSFER => true,
-            CURLOPT_HTTPHEADER => array('Content-type: application/json'),
-            CURLOPT_POSTFIELDS => $postString
-        );
-        if (defined('CURLOPT_SAFE_UPLOAD')) {
-            $options[CURLOPT_SAFE_UPLOAD] = true;
-        }
-
-        curl_setopt_array($ch, $options);
-
-        Curl\Util::execute($ch);
-    }
-
-    public function setFormatter(FormatterInterface $formatter)
-    {
-        parent::setFormatter($formatter);
-        $this->slackRecord->setFormatter($formatter);
-
-        return $this;
-    }
-
-    public function getFormatter()
-    {
-        $formatter = parent::getFormatter();
-        $this->slackRecord->setFormatter($formatter);
-
-        return $formatter;
-    }
-}
diff --git a/mayor-orig/www/include/share/googleapi/monolog/monolog/src/Monolog/Handler/SlackbotHandler.php b/mayor-orig/www/include/share/googleapi/monolog/monolog/src/Monolog/Handler/SlackbotHandler.php
deleted file mode 100644
index baead525..00000000
--- a/mayor-orig/www/include/share/googleapi/monolog/monolog/src/Monolog/Handler/SlackbotHandler.php
+++ /dev/null
@@ -1,80 +0,0 @@
-
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Monolog\Handler;
-
-use Monolog\Logger;
-
-/**
- * Sends notifications through Slack's Slackbot
- *
- * @author Haralan Dobrev 
- * @see    https://slack.com/apps/A0F81R8ET-slackbot
- */
-class SlackbotHandler extends AbstractProcessingHandler
-{
-    /**
-     * The slug of the Slack team
-     * @var string
-     */
-    private $slackTeam;
-
-    /**
-     * Slackbot token
-     * @var string
-     */
-    private $token;
-
-    /**
-     * Slack channel name
-     * @var string
-     */
-    private $channel;
-
-    /**
-     * @param  string $slackTeam Slack team slug
-     * @param  string $token     Slackbot token
-     * @param  string $channel   Slack channel (encoded ID or name)
-     * @param  int    $level     The minimum logging level at which this handler will be triggered
-     * @param  bool   $bubble    Whether the messages that are handled can bubble up the stack or not
-     */
-    public function __construct($slackTeam, $token, $channel, $level = Logger::CRITICAL, $bubble = true)
-    {
-        parent::__construct($level, $bubble);
-
-        $this->slackTeam = $slackTeam;
-        $this->token = $token;
-        $this->channel = $channel;
-    }
-
-    /**
-     * {@inheritdoc}
-     *
-     * @param array $record
-     */
-    protected function write(array $record)
-    {
-        $slackbotUrl = sprintf(
-            'https://%s.slack.com/services/hooks/slackbot?token=%s&channel=%s',
-            $this->slackTeam,
-            $this->token,
-            $this->channel
-        );
-
-        $ch = curl_init();
-        curl_setopt($ch, CURLOPT_URL, $slackbotUrl);
-        curl_setopt($ch, CURLOPT_POST, true);
-        curl_setopt($ch, CURLOPT_RETURNTRANSFER, true);
-        curl_setopt($ch, CURLOPT_POSTFIELDS, $record['message']);
-
-        Curl\Util::execute($ch);
-    }
-}
diff --git a/mayor-orig/www/include/share/googleapi/monolog/monolog/src/Monolog/Handler/SocketHandler.php b/mayor-orig/www/include/share/googleapi/monolog/monolog/src/Monolog/Handler/SocketHandler.php
deleted file mode 100644
index 7a61bf4e..00000000
--- a/mayor-orig/www/include/share/googleapi/monolog/monolog/src/Monolog/Handler/SocketHandler.php
+++ /dev/null
@@ -1,346 +0,0 @@
-
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Monolog\Handler;
-
-use Monolog\Logger;
-
-/**
- * Stores to any socket - uses fsockopen() or pfsockopen().
- *
- * @author Pablo de Leon Belloc 
- * @see    http://php.net/manual/en/function.fsockopen.php
- */
-class SocketHandler extends AbstractProcessingHandler
-{
-    private $connectionString;
-    private $connectionTimeout;
-    private $resource;
-    private $timeout = 0;
-    private $writingTimeout = 10;
-    private $lastSentBytes = null;
-    private $persistent = false;
-    private $errno;
-    private $errstr;
-    private $lastWritingAt;
-
-    /**
-     * @param string  $connectionString Socket connection string
-     * @param int     $level            The minimum logging level at which this handler will be triggered
-     * @param Boolean $bubble           Whether the messages that are handled can bubble up the stack or not
-     */
-    public function __construct($connectionString, $level = Logger::DEBUG, $bubble = true)
-    {
-        parent::__construct($level, $bubble);
-        $this->connectionString = $connectionString;
-        $this->connectionTimeout = (float) ini_get('default_socket_timeout');
-    }
-
-    /**
-     * Connect (if necessary) and write to the socket
-     *
-     * @param array $record
-     *
-     * @throws \UnexpectedValueException
-     * @throws \RuntimeException
-     */
-    protected function write(array $record)
-    {
-        $this->connectIfNotConnected();
-        $data = $this->generateDataStream($record);
-        $this->writeToSocket($data);
-    }
-
-    /**
-     * We will not close a PersistentSocket instance so it can be reused in other requests.
-     */
-    public function close()
-    {
-        if (!$this->isPersistent()) {
-            $this->closeSocket();
-        }
-    }
-
-    /**
-     * Close socket, if open
-     */
-    public function closeSocket()
-    {
-        if (is_resource($this->resource)) {
-            fclose($this->resource);
-            $this->resource = null;
-        }
-    }
-
-    /**
-     * Set socket connection to nbe persistent. It only has effect before the connection is initiated.
-     *
-     * @param bool $persistent
-     */
-    public function setPersistent($persistent)
-    {
-        $this->persistent = (boolean) $persistent;
-    }
-
-    /**
-     * Set connection timeout.  Only has effect before we connect.
-     *
-     * @param float $seconds
-     *
-     * @see http://php.net/manual/en/function.fsockopen.php
-     */
-    public function setConnectionTimeout($seconds)
-    {
-        $this->validateTimeout($seconds);
-        $this->connectionTimeout = (float) $seconds;
-    }
-
-    /**
-     * Set write timeout. Only has effect before we connect.
-     *
-     * @param float $seconds
-     *
-     * @see http://php.net/manual/en/function.stream-set-timeout.php
-     */
-    public function setTimeout($seconds)
-    {
-        $this->validateTimeout($seconds);
-        $this->timeout = (float) $seconds;
-    }
-
-    /**
-     * Set writing timeout. Only has effect during connection in the writing cycle.
-     *
-     * @param float $seconds 0 for no timeout
-     */
-    public function setWritingTimeout($seconds)
-    {
-        $this->validateTimeout($seconds);
-        $this->writingTimeout = (float) $seconds;
-    }
-
-    /**
-     * Get current connection string
-     *
-     * @return string
-     */
-    public function getConnectionString()
-    {
-        return $this->connectionString;
-    }
-
-    /**
-     * Get persistent setting
-     *
-     * @return bool
-     */
-    public function isPersistent()
-    {
-        return $this->persistent;
-    }
-
-    /**
-     * Get current connection timeout setting
-     *
-     * @return float
-     */
-    public function getConnectionTimeout()
-    {
-        return $this->connectionTimeout;
-    }
-
-    /**
-     * Get current in-transfer timeout
-     *
-     * @return float
-     */
-    public function getTimeout()
-    {
-        return $this->timeout;
-    }
-
-    /**
-     * Get current local writing timeout
-     *
-     * @return float
-     */
-    public function getWritingTimeout()
-    {
-        return $this->writingTimeout;
-    }
-
-    /**
-     * Check to see if the socket is currently available.
-     *
-     * UDP might appear to be connected but might fail when writing.  See http://php.net/fsockopen for details.
-     *
-     * @return bool
-     */
-    public function isConnected()
-    {
-        return is_resource($this->resource)
-            && !feof($this->resource);  // on TCP - other party can close connection.
-    }
-
-    /**
-     * Wrapper to allow mocking
-     */
-    protected function pfsockopen()
-    {
-        return @pfsockopen($this->connectionString, -1, $this->errno, $this->errstr, $this->connectionTimeout);
-    }
-
-    /**
-     * Wrapper to allow mocking
-     */
-    protected function fsockopen()
-    {
-        return @fsockopen($this->connectionString, -1, $this->errno, $this->errstr, $this->connectionTimeout);
-    }
-
-    /**
-     * Wrapper to allow mocking
-     *
-     * @see http://php.net/manual/en/function.stream-set-timeout.php
-     */
-    protected function streamSetTimeout()
-    {
-        $seconds = floor($this->timeout);
-        $microseconds = round(($this->timeout - $seconds) * 1e6);
-
-        return stream_set_timeout($this->resource, $seconds, $microseconds);
-    }
-
-    /**
-     * Wrapper to allow mocking
-     */
-    protected function fwrite($data)
-    {
-        return @fwrite($this->resource, $data);
-    }
-
-    /**
-     * Wrapper to allow mocking
-     */
-    protected function streamGetMetadata()
-    {
-        return stream_get_meta_data($this->resource);
-    }
-
-    private function validateTimeout($value)
-    {
-        $ok = filter_var($value, FILTER_VALIDATE_FLOAT);
-        if ($ok === false || $value < 0) {
-            throw new \InvalidArgumentException("Timeout must be 0 or a positive float (got $value)");
-        }
-    }
-
-    private function connectIfNotConnected()
-    {
-        if ($this->isConnected()) {
-            return;
-        }
-        $this->connect();
-    }
-
-    protected function generateDataStream($record)
-    {
-        return (string) $record['formatted'];
-    }
-
-    /**
-     * @return resource|null
-     */
-    protected function getResource()
-    {
-        return $this->resource;
-    }
-
-    private function connect()
-    {
-        $this->createSocketResource();
-        $this->setSocketTimeout();
-    }
-
-    private function createSocketResource()
-    {
-        if ($this->isPersistent()) {
-            $resource = $this->pfsockopen();
-        } else {
-            $resource = $this->fsockopen();
-        }
-        if (!$resource) {
-            throw new \UnexpectedValueException("Failed connecting to $this->connectionString ($this->errno: $this->errstr)");
-        }
-        $this->resource = $resource;
-    }
-
-    private function setSocketTimeout()
-    {
-        if (!$this->streamSetTimeout()) {
-            throw new \UnexpectedValueException("Failed setting timeout with stream_set_timeout()");
-        }
-    }
-
-    private function writeToSocket($data)
-    {
-        $length = strlen($data);
-        $sent = 0;
-        $this->lastSentBytes = $sent;
-        while ($this->isConnected() && $sent < $length) {
-            if (0 == $sent) {
-                $chunk = $this->fwrite($data);
-            } else {
-                $chunk = $this->fwrite(substr($data, $sent));
-            }
-            if ($chunk === false) {
-                throw new \RuntimeException("Could not write to socket");
-            }
-            $sent += $chunk;
-            $socketInfo = $this->streamGetMetadata();
-            if ($socketInfo['timed_out']) {
-                throw new \RuntimeException("Write timed-out");
-            }
-
-            if ($this->writingIsTimedOut($sent)) {
-                throw new \RuntimeException("Write timed-out, no data sent for `{$this->writingTimeout}` seconds, probably we got disconnected (sent $sent of $length)");
-            }
-        }
-        if (!$this->isConnected() && $sent < $length) {
-            throw new \RuntimeException("End-of-file reached, probably we got disconnected (sent $sent of $length)");
-        }
-    }
-
-    private function writingIsTimedOut($sent)
-    {
-        $writingTimeout = (int) floor($this->writingTimeout);
-        if (0 === $writingTimeout) {
-            return false;
-        }
-
-        if ($sent !== $this->lastSentBytes) {
-            $this->lastWritingAt = time();
-            $this->lastSentBytes = $sent;
-
-            return false;
-        } else {
-            usleep(100);
-        }
-
-        if ((time() - $this->lastWritingAt) >= $writingTimeout) {
-            $this->closeSocket();
-
-            return true;
-        }
-
-        return false;
-    }
-}
diff --git a/mayor-orig/www/include/share/googleapi/monolog/monolog/src/Monolog/Handler/StreamHandler.php b/mayor-orig/www/include/share/googleapi/monolog/monolog/src/Monolog/Handler/StreamHandler.php
deleted file mode 100644
index 09a15738..00000000
--- a/mayor-orig/www/include/share/googleapi/monolog/monolog/src/Monolog/Handler/StreamHandler.php
+++ /dev/null
@@ -1,176 +0,0 @@
-
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Monolog\Handler;
-
-use Monolog\Logger;
-
-/**
- * Stores to any stream resource
- *
- * Can be used to store into php://stderr, remote and local files, etc.
- *
- * @author Jordi Boggiano 
- */
-class StreamHandler extends AbstractProcessingHandler
-{
-    protected $stream;
-    protected $url;
-    private $errorMessage;
-    protected $filePermission;
-    protected $useLocking;
-    private $dirCreated;
-
-    /**
-     * @param resource|string $stream
-     * @param int             $level          The minimum logging level at which this handler will be triggered
-     * @param Boolean         $bubble         Whether the messages that are handled can bubble up the stack or not
-     * @param int|null        $filePermission Optional file permissions (default (0644) are only for owner read/write)
-     * @param Boolean         $useLocking     Try to lock log file before doing any writes
-     *
-     * @throws \Exception                If a missing directory is not buildable
-     * @throws \InvalidArgumentException If stream is not a resource or string
-     */
-    public function __construct($stream, $level = Logger::DEBUG, $bubble = true, $filePermission = null, $useLocking = false)
-    {
-        parent::__construct($level, $bubble);
-        if (is_resource($stream)) {
-            $this->stream = $stream;
-        } elseif (is_string($stream)) {
-            $this->url = $stream;
-        } else {
-            throw new \InvalidArgumentException('A stream must either be a resource or a string.');
-        }
-
-        $this->filePermission = $filePermission;
-        $this->useLocking = $useLocking;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function close()
-    {
-        if ($this->url && is_resource($this->stream)) {
-            fclose($this->stream);
-        }
-        $this->stream = null;
-    }
-
-    /**
-     * Return the currently active stream if it is open
-     *
-     * @return resource|null
-     */
-    public function getStream()
-    {
-        return $this->stream;
-    }
-
-    /**
-     * Return the stream URL if it was configured with a URL and not an active resource
-     *
-     * @return string|null
-     */
-    public function getUrl()
-    {
-        return $this->url;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    protected function write(array $record)
-    {
-        if (!is_resource($this->stream)) {
-            if (null === $this->url || '' === $this->url) {
-                throw new \LogicException('Missing stream url, the stream can not be opened. This may be caused by a premature call to close().');
-            }
-            $this->createDir();
-            $this->errorMessage = null;
-            set_error_handler(array($this, 'customErrorHandler'));
-            $this->stream = fopen($this->url, 'a');
-            if ($this->filePermission !== null) {
-                @chmod($this->url, $this->filePermission);
-            }
-            restore_error_handler();
-            if (!is_resource($this->stream)) {
-                $this->stream = null;
-                throw new \UnexpectedValueException(sprintf('The stream or file "%s" could not be opened: '.$this->errorMessage, $this->url));
-            }
-        }
-
-        if ($this->useLocking) {
-            // ignoring errors here, there's not much we can do about them
-            flock($this->stream, LOCK_EX);
-        }
-
-        $this->streamWrite($this->stream, $record);
-
-        if ($this->useLocking) {
-            flock($this->stream, LOCK_UN);
-        }
-    }
-
-    /**
-     * Write to stream
-     * @param resource $stream
-     * @param array $record
-     */
-    protected function streamWrite($stream, array $record)
-    {
-        fwrite($stream, (string) $record['formatted']);
-    }
-
-    private function customErrorHandler($code, $msg)
-    {
-        $this->errorMessage = preg_replace('{^(fopen|mkdir)\(.*?\): }', '', $msg);
-    }
-
-    /**
-     * @param string $stream
-     *
-     * @return null|string
-     */
-    private function getDirFromStream($stream)
-    {
-        $pos = strpos($stream, '://');
-        if ($pos === false) {
-            return dirname($stream);
-        }
-
-        if ('file://' === substr($stream, 0, 7)) {
-            return dirname(substr($stream, 7));
-        }
-
-        return;
-    }
-
-    private function createDir()
-    {
-        // Do not try to create dir if it has already been tried.
-        if ($this->dirCreated) {
-            return;
-        }
-
-        $dir = $this->getDirFromStream($this->url);
-        if (null !== $dir && !is_dir($dir)) {
-            $this->errorMessage = null;
-            set_error_handler(array($this, 'customErrorHandler'));
-            $status = mkdir($dir, 0777, true);
-            restore_error_handler();
-            if (false === $status) {
-                throw new \UnexpectedValueException(sprintf('There is no existing directory at "%s" and its not buildable: '.$this->errorMessage, $dir));
-            }
-        }
-        $this->dirCreated = true;
-    }
-}
diff --git a/mayor-orig/www/include/share/googleapi/monolog/monolog/src/Monolog/Handler/SwiftMailerHandler.php b/mayor-orig/www/include/share/googleapi/monolog/monolog/src/Monolog/Handler/SwiftMailerHandler.php
deleted file mode 100644
index 72f44a53..00000000
--- a/mayor-orig/www/include/share/googleapi/monolog/monolog/src/Monolog/Handler/SwiftMailerHandler.php
+++ /dev/null
@@ -1,99 +0,0 @@
-
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Monolog\Handler;
-
-use Monolog\Logger;
-use Monolog\Formatter\LineFormatter;
-use Swift;
-
-/**
- * SwiftMailerHandler uses Swift_Mailer to send the emails
- *
- * @author Gyula Sallai
- */
-class SwiftMailerHandler extends MailHandler
-{
-    protected $mailer;
-    private $messageTemplate;
-
-    /**
-     * @param \Swift_Mailer           $mailer  The mailer to use
-     * @param callable|\Swift_Message $message An example message for real messages, only the body will be replaced
-     * @param int                     $level   The minimum logging level at which this handler will be triggered
-     * @param Boolean                 $bubble  Whether the messages that are handled can bubble up the stack or not
-     */
-    public function __construct(\Swift_Mailer $mailer, $message, $level = Logger::ERROR, $bubble = true)
-    {
-        parent::__construct($level, $bubble);
-
-        $this->mailer = $mailer;
-        $this->messageTemplate = $message;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    protected function send($content, array $records)
-    {
-        $this->mailer->send($this->buildMessage($content, $records));
-    }
-
-    /**
-     * Creates instance of Swift_Message to be sent
-     *
-     * @param  string         $content formatted email body to be sent
-     * @param  array          $records Log records that formed the content
-     * @return \Swift_Message
-     */
-    protected function buildMessage($content, array $records)
-    {
-        $message = null;
-        if ($this->messageTemplate instanceof \Swift_Message) {
-            $message = clone $this->messageTemplate;
-            $message->generateId();
-        } elseif (is_callable($this->messageTemplate)) {
-            $message = call_user_func($this->messageTemplate, $content, $records);
-        }
-
-        if (!$message instanceof \Swift_Message) {
-            throw new \InvalidArgumentException('Could not resolve message as instance of Swift_Message or a callable returning it');
-        }
-
-        if ($records) {
-            $subjectFormatter = new LineFormatter($message->getSubject());
-            $message->setSubject($subjectFormatter->format($this->getHighestRecord($records)));
-        }
-
-        $message->setBody($content);
-        if (version_compare(Swift::VERSION, '6.0.0', '>=')) {
-            $message->setDate(new \DateTimeImmutable());
-        } else {
-            $message->setDate(time());
-        }
-
-        return $message;
-    }
-
-    /**
-     * BC getter, to be removed in 2.0
-     */
-    public function __get($name)
-    {
-        if ($name === 'message') {
-            trigger_error('SwiftMailerHandler->message is deprecated, use ->buildMessage() instead to retrieve the message', E_USER_DEPRECATED);
-
-            return $this->buildMessage(null, array());
-        }
-
-        throw new \InvalidArgumentException('Invalid property '.$name);
-    }
-}
diff --git a/mayor-orig/www/include/share/googleapi/monolog/monolog/src/Monolog/Handler/SyslogHandler.php b/mayor-orig/www/include/share/googleapi/monolog/monolog/src/Monolog/Handler/SyslogHandler.php
deleted file mode 100644
index 376bc3b2..00000000
--- a/mayor-orig/www/include/share/googleapi/monolog/monolog/src/Monolog/Handler/SyslogHandler.php
+++ /dev/null
@@ -1,67 +0,0 @@
-
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Monolog\Handler;
-
-use Monolog\Logger;
-
-/**
- * Logs to syslog service.
- *
- * usage example:
- *
- *   $log = new Logger('application');
- *   $syslog = new SyslogHandler('myfacility', 'local6');
- *   $formatter = new LineFormatter("%channel%.%level_name%: %message% %extra%");
- *   $syslog->setFormatter($formatter);
- *   $log->pushHandler($syslog);
- *
- * @author Sven Paulus 
- */
-class SyslogHandler extends AbstractSyslogHandler
-{
-    protected $ident;
-    protected $logopts;
-
-    /**
-     * @param string  $ident
-     * @param mixed   $facility
-     * @param int     $level    The minimum logging level at which this handler will be triggered
-     * @param Boolean $bubble   Whether the messages that are handled can bubble up the stack or not
-     * @param int     $logopts  Option flags for the openlog() call, defaults to LOG_PID
-     */
-    public function __construct($ident, $facility = LOG_USER, $level = Logger::DEBUG, $bubble = true, $logopts = LOG_PID)
-    {
-        parent::__construct($facility, $level, $bubble);
-
-        $this->ident = $ident;
-        $this->logopts = $logopts;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function close()
-    {
-        closelog();
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    protected function write(array $record)
-    {
-        if (!openlog($this->ident, $this->logopts, $this->facility)) {
-            throw new \LogicException('Can\'t open syslog for ident "'.$this->ident.'" and facility "'.$this->facility.'"');
-        }
-        syslog($this->logLevels[$record['level']], (string) $record['formatted']);
-    }
-}
diff --git a/mayor-orig/www/include/share/googleapi/monolog/monolog/src/Monolog/Handler/SyslogUdp/UdpSocket.php b/mayor-orig/www/include/share/googleapi/monolog/monolog/src/Monolog/Handler/SyslogUdp/UdpSocket.php
deleted file mode 100644
index 3bff085b..00000000
--- a/mayor-orig/www/include/share/googleapi/monolog/monolog/src/Monolog/Handler/SyslogUdp/UdpSocket.php
+++ /dev/null
@@ -1,56 +0,0 @@
-
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Monolog\Handler\SyslogUdp;
-
-class UdpSocket
-{
-    const DATAGRAM_MAX_LENGTH = 65023;
-
-    protected $ip;
-    protected $port;
-    protected $socket;
-
-    public function __construct($ip, $port = 514)
-    {
-        $this->ip = $ip;
-        $this->port = $port;
-        $this->socket = socket_create(AF_INET, SOCK_DGRAM, SOL_UDP);
-    }
-
-    public function write($line, $header = "")
-    {
-        $this->send($this->assembleMessage($line, $header));
-    }
-
-    public function close()
-    {
-        if (is_resource($this->socket)) {
-            socket_close($this->socket);
-            $this->socket = null;
-        }
-    }
-
-    protected function send($chunk)
-    {
-        if (!is_resource($this->socket)) {
-            throw new \LogicException('The UdpSocket to '.$this->ip.':'.$this->port.' has been closed and can not be written to anymore');
-        }
-        socket_sendto($this->socket, $chunk, strlen($chunk), $flags = 0, $this->ip, $this->port);
-    }
-
-    protected function assembleMessage($line, $header)
-    {
-        $chunkSize = self::DATAGRAM_MAX_LENGTH - strlen($header);
-
-        return $header . substr($line, 0, $chunkSize);
-    }
-}
diff --git a/mayor-orig/www/include/share/googleapi/monolog/monolog/src/Monolog/Handler/SyslogUdpHandler.php b/mayor-orig/www/include/share/googleapi/monolog/monolog/src/Monolog/Handler/SyslogUdpHandler.php
deleted file mode 100644
index 4718711b..00000000
--- a/mayor-orig/www/include/share/googleapi/monolog/monolog/src/Monolog/Handler/SyslogUdpHandler.php
+++ /dev/null
@@ -1,103 +0,0 @@
-
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Monolog\Handler;
-
-use Monolog\Logger;
-use Monolog\Handler\SyslogUdp\UdpSocket;
-
-/**
- * A Handler for logging to a remote syslogd server.
- *
- * @author Jesper Skovgaard Nielsen 
- */
-class SyslogUdpHandler extends AbstractSyslogHandler
-{
-    protected $socket;
-    protected $ident;
-
-    /**
-     * @param string  $host
-     * @param int     $port
-     * @param mixed   $facility
-     * @param int     $level    The minimum logging level at which this handler will be triggered
-     * @param Boolean $bubble   Whether the messages that are handled can bubble up the stack or not
-     * @param string  $ident    Program name or tag for each log message.
-     */
-    public function __construct($host, $port = 514, $facility = LOG_USER, $level = Logger::DEBUG, $bubble = true, $ident = 'php')
-    {
-        parent::__construct($facility, $level, $bubble);
-
-        $this->ident = $ident;
-
-        $this->socket = new UdpSocket($host, $port ?: 514);
-    }
-
-    protected function write(array $record)
-    {
-        $lines = $this->splitMessageIntoLines($record['formatted']);
-
-        $header = $this->makeCommonSyslogHeader($this->logLevels[$record['level']]);
-
-        foreach ($lines as $line) {
-            $this->socket->write($line, $header);
-        }
-    }
-
-    public function close()
-    {
-        $this->socket->close();
-    }
-
-    private function splitMessageIntoLines($message)
-    {
-        if (is_array($message)) {
-            $message = implode("\n", $message);
-        }
-
-        return preg_split('/$\R?^/m', $message, -1, PREG_SPLIT_NO_EMPTY);
-    }
-
-    /**
-     * Make common syslog header (see rfc5424)
-     */
-    protected function makeCommonSyslogHeader($severity)
-    {
-        $priority = $severity + $this->facility;
-
-        if (!$pid = getmypid()) {
-            $pid = '-';
-        }
-
-        if (!$hostname = gethostname()) {
-            $hostname = '-';
-        }
-
-        return "<$priority>1 " .
-            $this->getDateTime() . " " .
-            $hostname . " " .
-            $this->ident . " " .
-            $pid . " - - ";
-    }
-
-    protected function getDateTime()
-    {
-        return date(\DateTime::RFC3339);
-    }
-
-    /**
-     * Inject your own socket, mainly used for testing
-     */
-    public function setSocket($socket)
-    {
-        $this->socket = $socket;
-    }
-}
diff --git a/mayor-orig/www/include/share/googleapi/monolog/monolog/src/Monolog/Handler/TestHandler.php b/mayor-orig/www/include/share/googleapi/monolog/monolog/src/Monolog/Handler/TestHandler.php
deleted file mode 100644
index e39cfc66..00000000
--- a/mayor-orig/www/include/share/googleapi/monolog/monolog/src/Monolog/Handler/TestHandler.php
+++ /dev/null
@@ -1,154 +0,0 @@
-
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Monolog\Handler;
-
-/**
- * Used for testing purposes.
- *
- * It records all records and gives you access to them for verification.
- *
- * @author Jordi Boggiano 
- *
- * @method bool hasEmergency($record)
- * @method bool hasAlert($record)
- * @method bool hasCritical($record)
- * @method bool hasError($record)
- * @method bool hasWarning($record)
- * @method bool hasNotice($record)
- * @method bool hasInfo($record)
- * @method bool hasDebug($record)
- *
- * @method bool hasEmergencyRecords()
- * @method bool hasAlertRecords()
- * @method bool hasCriticalRecords()
- * @method bool hasErrorRecords()
- * @method bool hasWarningRecords()
- * @method bool hasNoticeRecords()
- * @method bool hasInfoRecords()
- * @method bool hasDebugRecords()
- *
- * @method bool hasEmergencyThatContains($message)
- * @method bool hasAlertThatContains($message)
- * @method bool hasCriticalThatContains($message)
- * @method bool hasErrorThatContains($message)
- * @method bool hasWarningThatContains($message)
- * @method bool hasNoticeThatContains($message)
- * @method bool hasInfoThatContains($message)
- * @method bool hasDebugThatContains($message)
- *
- * @method bool hasEmergencyThatMatches($message)
- * @method bool hasAlertThatMatches($message)
- * @method bool hasCriticalThatMatches($message)
- * @method bool hasErrorThatMatches($message)
- * @method bool hasWarningThatMatches($message)
- * @method bool hasNoticeThatMatches($message)
- * @method bool hasInfoThatMatches($message)
- * @method bool hasDebugThatMatches($message)
- *
- * @method bool hasEmergencyThatPasses($message)
- * @method bool hasAlertThatPasses($message)
- * @method bool hasCriticalThatPasses($message)
- * @method bool hasErrorThatPasses($message)
- * @method bool hasWarningThatPasses($message)
- * @method bool hasNoticeThatPasses($message)
- * @method bool hasInfoThatPasses($message)
- * @method bool hasDebugThatPasses($message)
- */
-class TestHandler extends AbstractProcessingHandler
-{
-    protected $records = array();
-    protected $recordsByLevel = array();
-
-    public function getRecords()
-    {
-        return $this->records;
-    }
-
-    public function clear()
-    {
-        $this->records = array();
-        $this->recordsByLevel = array();
-    }
-
-    public function hasRecords($level)
-    {
-        return isset($this->recordsByLevel[$level]);
-    }
-
-    public function hasRecord($record, $level)
-    {
-        if (is_array($record)) {
-            $record = $record['message'];
-        }
-
-        return $this->hasRecordThatPasses(function ($rec) use ($record) {
-            return $rec['message'] === $record;
-        }, $level);
-    }
-
-    public function hasRecordThatContains($message, $level)
-    {
-        return $this->hasRecordThatPasses(function ($rec) use ($message) {
-            return strpos($rec['message'], $message) !== false;
-        }, $level);
-    }
-
-    public function hasRecordThatMatches($regex, $level)
-    {
-        return $this->hasRecordThatPasses(function ($rec) use ($regex) {
-            return preg_match($regex, $rec['message']) > 0;
-        }, $level);
-    }
-
-    public function hasRecordThatPasses($predicate, $level)
-    {
-        if (!is_callable($predicate)) {
-            throw new \InvalidArgumentException("Expected a callable for hasRecordThatSucceeds");
-        }
-
-        if (!isset($this->recordsByLevel[$level])) {
-            return false;
-        }
-
-        foreach ($this->recordsByLevel[$level] as $i => $rec) {
-            if (call_user_func($predicate, $rec, $i)) {
-                return true;
-            }
-        }
-
-        return false;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    protected function write(array $record)
-    {
-        $this->recordsByLevel[$record['level']][] = $record;
-        $this->records[] = $record;
-    }
-
-    public function __call($method, $args)
-    {
-        if (preg_match('/(.*)(Debug|Info|Notice|Warning|Error|Critical|Alert|Emergency)(.*)/', $method, $matches) > 0) {
-            $genericMethod = $matches[1] . ('Records' !== $matches[3] ? 'Record' : '') . $matches[3];
-            $level = constant('Monolog\Logger::' . strtoupper($matches[2]));
-            if (method_exists($this, $genericMethod)) {
-                $args[] = $level;
-
-                return call_user_func_array(array($this, $genericMethod), $args);
-            }
-        }
-
-        throw new \BadMethodCallException('Call to undefined method ' . get_class($this) . '::' . $method . '()');
-    }
-}
diff --git a/mayor-orig/www/include/share/googleapi/monolog/monolog/src/Monolog/Handler/WhatFailureGroupHandler.php b/mayor-orig/www/include/share/googleapi/monolog/monolog/src/Monolog/Handler/WhatFailureGroupHandler.php
deleted file mode 100644
index 2732ba3d..00000000
--- a/mayor-orig/www/include/share/googleapi/monolog/monolog/src/Monolog/Handler/WhatFailureGroupHandler.php
+++ /dev/null
@@ -1,61 +0,0 @@
-
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Monolog\Handler;
-
-/**
- * Forwards records to multiple handlers suppressing failures of each handler
- * and continuing through to give every handler a chance to succeed.
- *
- * @author Craig D'Amelio 
- */
-class WhatFailureGroupHandler extends GroupHandler
-{
-    /**
-     * {@inheritdoc}
-     */
-    public function handle(array $record)
-    {
-        if ($this->processors) {
-            foreach ($this->processors as $processor) {
-                $record = call_user_func($processor, $record);
-            }
-        }
-
-        foreach ($this->handlers as $handler) {
-            try {
-                $handler->handle($record);
-            } catch (\Exception $e) {
-                // What failure?
-            } catch (\Throwable $e) {
-                // What failure?
-            }
-        }
-
-        return false === $this->bubble;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function handleBatch(array $records)
-    {
-        foreach ($this->handlers as $handler) {
-            try {
-                $handler->handleBatch($records);
-            } catch (\Exception $e) {
-                // What failure?
-            } catch (\Throwable $e) {
-                // What failure?
-            }
-        }
-    }
-}
diff --git a/mayor-orig/www/include/share/googleapi/monolog/monolog/src/Monolog/Handler/ZendMonitorHandler.php b/mayor-orig/www/include/share/googleapi/monolog/monolog/src/Monolog/Handler/ZendMonitorHandler.php
deleted file mode 100644
index f22cf218..00000000
--- a/mayor-orig/www/include/share/googleapi/monolog/monolog/src/Monolog/Handler/ZendMonitorHandler.php
+++ /dev/null
@@ -1,95 +0,0 @@
-
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Monolog\Handler;
-
-use Monolog\Formatter\NormalizerFormatter;
-use Monolog\Logger;
-
-/**
- * Handler sending logs to Zend Monitor
- *
- * @author  Christian Bergau 
- */
-class ZendMonitorHandler extends AbstractProcessingHandler
-{
-    /**
-     * Monolog level / ZendMonitor Custom Event priority map
-     *
-     * @var array
-     */
-    protected $levelMap = array(
-        Logger::DEBUG     => 1,
-        Logger::INFO      => 2,
-        Logger::NOTICE    => 3,
-        Logger::WARNING   => 4,
-        Logger::ERROR     => 5,
-        Logger::CRITICAL  => 6,
-        Logger::ALERT     => 7,
-        Logger::EMERGENCY => 0,
-    );
-
-    /**
-     * Construct
-     *
-     * @param  int                       $level
-     * @param  bool                      $bubble
-     * @throws MissingExtensionException
-     */
-    public function __construct($level = Logger::DEBUG, $bubble = true)
-    {
-        if (!function_exists('zend_monitor_custom_event')) {
-            throw new MissingExtensionException('You must have Zend Server installed in order to use this handler');
-        }
-        parent::__construct($level, $bubble);
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    protected function write(array $record)
-    {
-        $this->writeZendMonitorCustomEvent(
-            $this->levelMap[$record['level']],
-            $record['message'],
-            $record['formatted']
-        );
-    }
-
-    /**
-     * Write a record to Zend Monitor
-     *
-     * @param int    $level
-     * @param string $message
-     * @param array  $formatted
-     */
-    protected function writeZendMonitorCustomEvent($level, $message, $formatted)
-    {
-        zend_monitor_custom_event($level, $message, $formatted);
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function getDefaultFormatter()
-    {
-        return new NormalizerFormatter();
-    }
-
-    /**
-     * Get the level map
-     *
-     * @return array
-     */
-    public function getLevelMap()
-    {
-        return $this->levelMap;
-    }
-}
diff --git a/mayor-orig/www/include/share/googleapi/monolog/monolog/src/Monolog/Logger.php b/mayor-orig/www/include/share/googleapi/monolog/monolog/src/Monolog/Logger.php
deleted file mode 100644
index 49d00af1..00000000
--- a/mayor-orig/www/include/share/googleapi/monolog/monolog/src/Monolog/Logger.php
+++ /dev/null
@@ -1,700 +0,0 @@
-
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Monolog;
-
-use Monolog\Handler\HandlerInterface;
-use Monolog\Handler\StreamHandler;
-use Psr\Log\LoggerInterface;
-use Psr\Log\InvalidArgumentException;
-
-/**
- * Monolog log channel
- *
- * It contains a stack of Handlers and a stack of Processors,
- * and uses them to store records that are added to it.
- *
- * @author Jordi Boggiano 
- */
-class Logger implements LoggerInterface
-{
-    /**
-     * Detailed debug information
-     */
-    const DEBUG = 100;
-
-    /**
-     * Interesting events
-     *
-     * Examples: User logs in, SQL logs.
-     */
-    const INFO = 200;
-
-    /**
-     * Uncommon events
-     */
-    const NOTICE = 250;
-
-    /**
-     * Exceptional occurrences that are not errors
-     *
-     * Examples: Use of deprecated APIs, poor use of an API,
-     * undesirable things that are not necessarily wrong.
-     */
-    const WARNING = 300;
-
-    /**
-     * Runtime errors
-     */
-    const ERROR = 400;
-
-    /**
-     * Critical conditions
-     *
-     * Example: Application component unavailable, unexpected exception.
-     */
-    const CRITICAL = 500;
-
-    /**
-     * Action must be taken immediately
-     *
-     * Example: Entire website down, database unavailable, etc.
-     * This should trigger the SMS alerts and wake you up.
-     */
-    const ALERT = 550;
-
-    /**
-     * Urgent alert.
-     */
-    const EMERGENCY = 600;
-
-    /**
-     * Monolog API version
-     *
-     * This is only bumped when API breaks are done and should
-     * follow the major version of the library
-     *
-     * @var int
-     */
-    const API = 1;
-
-    /**
-     * Logging levels from syslog protocol defined in RFC 5424
-     *
-     * @var array $levels Logging levels
-     */
-    protected static $levels = array(
-        self::DEBUG     => 'DEBUG',
-        self::INFO      => 'INFO',
-        self::NOTICE    => 'NOTICE',
-        self::WARNING   => 'WARNING',
-        self::ERROR     => 'ERROR',
-        self::CRITICAL  => 'CRITICAL',
-        self::ALERT     => 'ALERT',
-        self::EMERGENCY => 'EMERGENCY',
-    );
-
-    /**
-     * @var \DateTimeZone
-     */
-    protected static $timezone;
-
-    /**
-     * @var string
-     */
-    protected $name;
-
-    /**
-     * The handler stack
-     *
-     * @var HandlerInterface[]
-     */
-    protected $handlers;
-
-    /**
-     * Processors that will process all log records
-     *
-     * To process records of a single handler instead, add the processor on that specific handler
-     *
-     * @var callable[]
-     */
-    protected $processors;
-
-    /**
-     * @var bool
-     */
-    protected $microsecondTimestamps = true;
-
-    /**
-     * @param string             $name       The logging channel
-     * @param HandlerInterface[] $handlers   Optional stack of handlers, the first one in the array is called first, etc.
-     * @param callable[]         $processors Optional array of processors
-     */
-    public function __construct($name, array $handlers = array(), array $processors = array())
-    {
-        $this->name = $name;
-        $this->handlers = $handlers;
-        $this->processors = $processors;
-    }
-
-    /**
-     * @return string
-     */
-    public function getName()
-    {
-        return $this->name;
-    }
-
-    /**
-     * Return a new cloned instance with the name changed
-     *
-     * @return static
-     */
-    public function withName($name)
-    {
-        $new = clone $this;
-        $new->name = $name;
-
-        return $new;
-    }
-
-    /**
-     * Pushes a handler on to the stack.
-     *
-     * @param  HandlerInterface $handler
-     * @return $this
-     */
-    public function pushHandler(HandlerInterface $handler)
-    {
-        array_unshift($this->handlers, $handler);
-
-        return $this;
-    }
-
-    /**
-     * Pops a handler from the stack
-     *
-     * @return HandlerInterface
-     */
-    public function popHandler()
-    {
-        if (!$this->handlers) {
-            throw new \LogicException('You tried to pop from an empty handler stack.');
-        }
-
-        return array_shift($this->handlers);
-    }
-
-    /**
-     * Set handlers, replacing all existing ones.
-     *
-     * If a map is passed, keys will be ignored.
-     *
-     * @param  HandlerInterface[] $handlers
-     * @return $this
-     */
-    public function setHandlers(array $handlers)
-    {
-        $this->handlers = array();
-        foreach (array_reverse($handlers) as $handler) {
-            $this->pushHandler($handler);
-        }
-
-        return $this;
-    }
-
-    /**
-     * @return HandlerInterface[]
-     */
-    public function getHandlers()
-    {
-        return $this->handlers;
-    }
-
-    /**
-     * Adds a processor on to the stack.
-     *
-     * @param  callable $callback
-     * @return $this
-     */
-    public function pushProcessor($callback)
-    {
-        if (!is_callable($callback)) {
-            throw new \InvalidArgumentException('Processors must be valid callables (callback or object with an __invoke method), '.var_export($callback, true).' given');
-        }
-        array_unshift($this->processors, $callback);
-
-        return $this;
-    }
-
-    /**
-     * Removes the processor on top of the stack and returns it.
-     *
-     * @return callable
-     */
-    public function popProcessor()
-    {
-        if (!$this->processors) {
-            throw new \LogicException('You tried to pop from an empty processor stack.');
-        }
-
-        return array_shift($this->processors);
-    }
-
-    /**
-     * @return callable[]
-     */
-    public function getProcessors()
-    {
-        return $this->processors;
-    }
-
-    /**
-     * Control the use of microsecond resolution timestamps in the 'datetime'
-     * member of new records.
-     *
-     * Generating microsecond resolution timestamps by calling
-     * microtime(true), formatting the result via sprintf() and then parsing
-     * the resulting string via \DateTime::createFromFormat() can incur
-     * a measurable runtime overhead vs simple usage of DateTime to capture
-     * a second resolution timestamp in systems which generate a large number
-     * of log events.
-     *
-     * @param bool $micro True to use microtime() to create timestamps
-     */
-    public function useMicrosecondTimestamps($micro)
-    {
-        $this->microsecondTimestamps = (bool) $micro;
-    }
-
-    /**
-     * Adds a log record.
-     *
-     * @param  int     $level   The logging level
-     * @param  string  $message The log message
-     * @param  array   $context The log context
-     * @return Boolean Whether the record has been processed
-     */
-    public function addRecord($level, $message, array $context = array())
-    {
-        if (!$this->handlers) {
-            $this->pushHandler(new StreamHandler('php://stderr', static::DEBUG));
-        }
-
-        $levelName = static::getLevelName($level);
-
-        // check if any handler will handle this message so we can return early and save cycles
-        $handlerKey = null;
-        reset($this->handlers);
-        while ($handler = current($this->handlers)) {
-            if ($handler->isHandling(array('level' => $level))) {
-                $handlerKey = key($this->handlers);
-                break;
-            }
-
-            next($this->handlers);
-        }
-
-        if (null === $handlerKey) {
-            return false;
-        }
-
-        if (!static::$timezone) {
-            static::$timezone = new \DateTimeZone(date_default_timezone_get() ?: 'UTC');
-        }
-
-        // php7.1+ always has microseconds enabled, so we do not need this hack
-        if ($this->microsecondTimestamps && PHP_VERSION_ID < 70100) {
-            $ts = \DateTime::createFromFormat('U.u', sprintf('%.6F', microtime(true)), static::$timezone);
-        } else {
-            $ts = new \DateTime(null, static::$timezone);
-        }
-        $ts->setTimezone(static::$timezone);
-
-        $record = array(
-            'message' => (string) $message,
-            'context' => $context,
-            'level' => $level,
-            'level_name' => $levelName,
-            'channel' => $this->name,
-            'datetime' => $ts,
-            'extra' => array(),
-        );
-
-        foreach ($this->processors as $processor) {
-            $record = call_user_func($processor, $record);
-        }
-
-        while ($handler = current($this->handlers)) {
-            if (true === $handler->handle($record)) {
-                break;
-            }
-
-            next($this->handlers);
-        }
-
-        return true;
-    }
-
-    /**
-     * Adds a log record at the DEBUG level.
-     *
-     * @param  string  $message The log message
-     * @param  array   $context The log context
-     * @return Boolean Whether the record has been processed
-     */
-    public function addDebug($message, array $context = array())
-    {
-        return $this->addRecord(static::DEBUG, $message, $context);
-    }
-
-    /**
-     * Adds a log record at the INFO level.
-     *
-     * @param  string  $message The log message
-     * @param  array   $context The log context
-     * @return Boolean Whether the record has been processed
-     */
-    public function addInfo($message, array $context = array())
-    {
-        return $this->addRecord(static::INFO, $message, $context);
-    }
-
-    /**
-     * Adds a log record at the NOTICE level.
-     *
-     * @param  string  $message The log message
-     * @param  array   $context The log context
-     * @return Boolean Whether the record has been processed
-     */
-    public function addNotice($message, array $context = array())
-    {
-        return $this->addRecord(static::NOTICE, $message, $context);
-    }
-
-    /**
-     * Adds a log record at the WARNING level.
-     *
-     * @param  string  $message The log message
-     * @param  array   $context The log context
-     * @return Boolean Whether the record has been processed
-     */
-    public function addWarning($message, array $context = array())
-    {
-        return $this->addRecord(static::WARNING, $message, $context);
-    }
-
-    /**
-     * Adds a log record at the ERROR level.
-     *
-     * @param  string  $message The log message
-     * @param  array   $context The log context
-     * @return Boolean Whether the record has been processed
-     */
-    public function addError($message, array $context = array())
-    {
-        return $this->addRecord(static::ERROR, $message, $context);
-    }
-
-    /**
-     * Adds a log record at the CRITICAL level.
-     *
-     * @param  string  $message The log message
-     * @param  array   $context The log context
-     * @return Boolean Whether the record has been processed
-     */
-    public function addCritical($message, array $context = array())
-    {
-        return $this->addRecord(static::CRITICAL, $message, $context);
-    }
-
-    /**
-     * Adds a log record at the ALERT level.
-     *
-     * @param  string  $message The log message
-     * @param  array   $context The log context
-     * @return Boolean Whether the record has been processed
-     */
-    public function addAlert($message, array $context = array())
-    {
-        return $this->addRecord(static::ALERT, $message, $context);
-    }
-
-    /**
-     * Adds a log record at the EMERGENCY level.
-     *
-     * @param  string  $message The log message
-     * @param  array   $context The log context
-     * @return Boolean Whether the record has been processed
-     */
-    public function addEmergency($message, array $context = array())
-    {
-        return $this->addRecord(static::EMERGENCY, $message, $context);
-    }
-
-    /**
-     * Gets all supported logging levels.
-     *
-     * @return array Assoc array with human-readable level names => level codes.
-     */
-    public static function getLevels()
-    {
-        return array_flip(static::$levels);
-    }
-
-    /**
-     * Gets the name of the logging level.
-     *
-     * @param  int    $level
-     * @return string
-     */
-    public static function getLevelName($level)
-    {
-        if (!isset(static::$levels[$level])) {
-            throw new InvalidArgumentException('Level "'.$level.'" is not defined, use one of: '.implode(', ', array_keys(static::$levels)));
-        }
-
-        return static::$levels[$level];
-    }
-
-    /**
-     * Converts PSR-3 levels to Monolog ones if necessary
-     *
-     * @param string|int Level number (monolog) or name (PSR-3)
-     * @return int
-     */
-    public static function toMonologLevel($level)
-    {
-        if (is_string($level) && defined(__CLASS__.'::'.strtoupper($level))) {
-            return constant(__CLASS__.'::'.strtoupper($level));
-        }
-
-        return $level;
-    }
-
-    /**
-     * Checks whether the Logger has a handler that listens on the given level
-     *
-     * @param  int     $level
-     * @return Boolean
-     */
-    public function isHandling($level)
-    {
-        $record = array(
-            'level' => $level,
-        );
-
-        foreach ($this->handlers as $handler) {
-            if ($handler->isHandling($record)) {
-                return true;
-            }
-        }
-
-        return false;
-    }
-
-    /**
-     * Adds a log record at an arbitrary level.
-     *
-     * This method allows for compatibility with common interfaces.
-     *
-     * @param  mixed   $level   The log level
-     * @param  string  $message The log message
-     * @param  array   $context The log context
-     * @return Boolean Whether the record has been processed
-     */
-    public function log($level, $message, array $context = array())
-    {
-        $level = static::toMonologLevel($level);
-
-        return $this->addRecord($level, $message, $context);
-    }
-
-    /**
-     * Adds a log record at the DEBUG level.
-     *
-     * This method allows for compatibility with common interfaces.
-     *
-     * @param  string  $message The log message
-     * @param  array   $context The log context
-     * @return Boolean Whether the record has been processed
-     */
-    public function debug($message, array $context = array())
-    {
-        return $this->addRecord(static::DEBUG, $message, $context);
-    }
-
-    /**
-     * Adds a log record at the INFO level.
-     *
-     * This method allows for compatibility with common interfaces.
-     *
-     * @param  string  $message The log message
-     * @param  array   $context The log context
-     * @return Boolean Whether the record has been processed
-     */
-    public function info($message, array $context = array())
-    {
-        return $this->addRecord(static::INFO, $message, $context);
-    }
-
-    /**
-     * Adds a log record at the NOTICE level.
-     *
-     * This method allows for compatibility with common interfaces.
-     *
-     * @param  string  $message The log message
-     * @param  array   $context The log context
-     * @return Boolean Whether the record has been processed
-     */
-    public function notice($message, array $context = array())
-    {
-        return $this->addRecord(static::NOTICE, $message, $context);
-    }
-
-    /**
-     * Adds a log record at the WARNING level.
-     *
-     * This method allows for compatibility with common interfaces.
-     *
-     * @param  string  $message The log message
-     * @param  array   $context The log context
-     * @return Boolean Whether the record has been processed
-     */
-    public function warn($message, array $context = array())
-    {
-        return $this->addRecord(static::WARNING, $message, $context);
-    }
-
-    /**
-     * Adds a log record at the WARNING level.
-     *
-     * This method allows for compatibility with common interfaces.
-     *
-     * @param  string  $message The log message
-     * @param  array   $context The log context
-     * @return Boolean Whether the record has been processed
-     */
-    public function warning($message, array $context = array())
-    {
-        return $this->addRecord(static::WARNING, $message, $context);
-    }
-
-    /**
-     * Adds a log record at the ERROR level.
-     *
-     * This method allows for compatibility with common interfaces.
-     *
-     * @param  string  $message The log message
-     * @param  array   $context The log context
-     * @return Boolean Whether the record has been processed
-     */
-    public function err($message, array $context = array())
-    {
-        return $this->addRecord(static::ERROR, $message, $context);
-    }
-
-    /**
-     * Adds a log record at the ERROR level.
-     *
-     * This method allows for compatibility with common interfaces.
-     *
-     * @param  string  $message The log message
-     * @param  array   $context The log context
-     * @return Boolean Whether the record has been processed
-     */
-    public function error($message, array $context = array())
-    {
-        return $this->addRecord(static::ERROR, $message, $context);
-    }
-
-    /**
-     * Adds a log record at the CRITICAL level.
-     *
-     * This method allows for compatibility with common interfaces.
-     *
-     * @param  string  $message The log message
-     * @param  array   $context The log context
-     * @return Boolean Whether the record has been processed
-     */
-    public function crit($message, array $context = array())
-    {
-        return $this->addRecord(static::CRITICAL, $message, $context);
-    }
-
-    /**
-     * Adds a log record at the CRITICAL level.
-     *
-     * This method allows for compatibility with common interfaces.
-     *
-     * @param  string  $message The log message
-     * @param  array   $context The log context
-     * @return Boolean Whether the record has been processed
-     */
-    public function critical($message, array $context = array())
-    {
-        return $this->addRecord(static::CRITICAL, $message, $context);
-    }
-
-    /**
-     * Adds a log record at the ALERT level.
-     *
-     * This method allows for compatibility with common interfaces.
-     *
-     * @param  string  $message The log message
-     * @param  array   $context The log context
-     * @return Boolean Whether the record has been processed
-     */
-    public function alert($message, array $context = array())
-    {
-        return $this->addRecord(static::ALERT, $message, $context);
-    }
-
-    /**
-     * Adds a log record at the EMERGENCY level.
-     *
-     * This method allows for compatibility with common interfaces.
-     *
-     * @param  string  $message The log message
-     * @param  array   $context The log context
-     * @return Boolean Whether the record has been processed
-     */
-    public function emerg($message, array $context = array())
-    {
-        return $this->addRecord(static::EMERGENCY, $message, $context);
-    }
-
-    /**
-     * Adds a log record at the EMERGENCY level.
-     *
-     * This method allows for compatibility with common interfaces.
-     *
-     * @param  string  $message The log message
-     * @param  array   $context The log context
-     * @return Boolean Whether the record has been processed
-     */
-    public function emergency($message, array $context = array())
-    {
-        return $this->addRecord(static::EMERGENCY, $message, $context);
-    }
-
-    /**
-     * Set the timezone to be used for the timestamp of log records.
-     *
-     * This is stored globally for all Logger instances
-     *
-     * @param \DateTimeZone $tz Timezone object
-     */
-    public static function setTimezone(\DateTimeZone $tz)
-    {
-        self::$timezone = $tz;
-    }
-}
diff --git a/mayor-orig/www/include/share/googleapi/monolog/monolog/src/Monolog/Processor/GitProcessor.php b/mayor-orig/www/include/share/googleapi/monolog/monolog/src/Monolog/Processor/GitProcessor.php
deleted file mode 100644
index 1899400d..00000000
--- a/mayor-orig/www/include/share/googleapi/monolog/monolog/src/Monolog/Processor/GitProcessor.php
+++ /dev/null
@@ -1,64 +0,0 @@
-
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Monolog\Processor;
-
-use Monolog\Logger;
-
-/**
- * Injects Git branch and Git commit SHA in all records
- *
- * @author Nick Otter
- * @author Jordi Boggiano 
- */
-class GitProcessor
-{
-    private $level;
-    private static $cache;
-
-    public function __construct($level = Logger::DEBUG)
-    {
-        $this->level = Logger::toMonologLevel($level);
-    }
-
-    /**
-     * @param  array $record
-     * @return array
-     */
-    public function __invoke(array $record)
-    {
-        // return if the level is not high enough
-        if ($record['level'] < $this->level) {
-            return $record;
-        }
-
-        $record['extra']['git'] = self::getGitInfo();
-
-        return $record;
-    }
-
-    private static function getGitInfo()
-    {
-        if (self::$cache) {
-            return self::$cache;
-        }
-
-        $branches = `git branch -v --no-abbrev`;
-        if (preg_match('{^\* (.+?)\s+([a-f0-9]{40})(?:\s|$)}m', $branches, $matches)) {
-            return self::$cache = array(
-                'branch' => $matches[1],
-                'commit' => $matches[2],
-            );
-        }
-
-        return self::$cache = array();
-    }
-}
diff --git a/mayor-orig/www/include/share/googleapi/monolog/monolog/src/Monolog/Processor/IntrospectionProcessor.php b/mayor-orig/www/include/share/googleapi/monolog/monolog/src/Monolog/Processor/IntrospectionProcessor.php
deleted file mode 100644
index 2c07caed..00000000
--- a/mayor-orig/www/include/share/googleapi/monolog/monolog/src/Monolog/Processor/IntrospectionProcessor.php
+++ /dev/null
@@ -1,112 +0,0 @@
-
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Monolog\Processor;
-
-use Monolog\Logger;
-
-/**
- * Injects line/file:class/function where the log message came from
- *
- * Warning: This only works if the handler processes the logs directly.
- * If you put the processor on a handler that is behind a FingersCrossedHandler
- * for example, the processor will only be called once the trigger level is reached,
- * and all the log records will have the same file/line/.. data from the call that
- * triggered the FingersCrossedHandler.
- *
- * @author Jordi Boggiano 
- */
-class IntrospectionProcessor
-{
-    private $level;
-
-    private $skipClassesPartials;
-
-    private $skipStackFramesCount;
-
-    private $skipFunctions = array(
-        'call_user_func',
-        'call_user_func_array',
-    );
-
-    public function __construct($level = Logger::DEBUG, array $skipClassesPartials = array(), $skipStackFramesCount = 0)
-    {
-        $this->level = Logger::toMonologLevel($level);
-        $this->skipClassesPartials = array_merge(array('Monolog\\'), $skipClassesPartials);
-        $this->skipStackFramesCount = $skipStackFramesCount;
-    }
-
-    /**
-     * @param  array $record
-     * @return array
-     */
-    public function __invoke(array $record)
-    {
-        // return if the level is not high enough
-        if ($record['level'] < $this->level) {
-            return $record;
-        }
-
-        /*
-        * http://php.net/manual/en/function.debug-backtrace.php
-        * As of 5.3.6, DEBUG_BACKTRACE_IGNORE_ARGS option was added.
-        * Any version less than 5.3.6 must use the DEBUG_BACKTRACE_IGNORE_ARGS constant value '2'.
-        */
-        $trace = debug_backtrace((PHP_VERSION_ID < 50306) ? 2 : DEBUG_BACKTRACE_IGNORE_ARGS);
-
-        // skip first since it's always the current method
-        array_shift($trace);
-        // the call_user_func call is also skipped
-        array_shift($trace);
-
-        $i = 0;
-
-        while ($this->isTraceClassOrSkippedFunction($trace, $i)) {
-            if (isset($trace[$i]['class'])) {
-                foreach ($this->skipClassesPartials as $part) {
-                    if (strpos($trace[$i]['class'], $part) !== false) {
-                        $i++;
-                        continue 2;
-                    }
-                }
-            } elseif (in_array($trace[$i]['function'], $this->skipFunctions)) {
-                $i++;
-                continue;
-            }
-
-            break;
-        }
-
-        $i += $this->skipStackFramesCount;
-
-        // we should have the call source now
-        $record['extra'] = array_merge(
-            $record['extra'],
-            array(
-                'file'      => isset($trace[$i - 1]['file']) ? $trace[$i - 1]['file'] : null,
-                'line'      => isset($trace[$i - 1]['line']) ? $trace[$i - 1]['line'] : null,
-                'class'     => isset($trace[$i]['class']) ? $trace[$i]['class'] : null,
-                'function'  => isset($trace[$i]['function']) ? $trace[$i]['function'] : null,
-            )
-        );
-
-        return $record;
-    }
-
-    private function isTraceClassOrSkippedFunction(array $trace, $index)
-    {
-        if (!isset($trace[$index])) {
-            return false;
-        }
-
-        return isset($trace[$index]['class']) || in_array($trace[$index]['function'], $this->skipFunctions);
-    }
-}
diff --git a/mayor-orig/www/include/share/googleapi/monolog/monolog/src/Monolog/Processor/MemoryPeakUsageProcessor.php b/mayor-orig/www/include/share/googleapi/monolog/monolog/src/Monolog/Processor/MemoryPeakUsageProcessor.php
deleted file mode 100644
index 0543e929..00000000
--- a/mayor-orig/www/include/share/googleapi/monolog/monolog/src/Monolog/Processor/MemoryPeakUsageProcessor.php
+++ /dev/null
@@ -1,35 +0,0 @@
-
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Monolog\Processor;
-
-/**
- * Injects memory_get_peak_usage in all records
- *
- * @see Monolog\Processor\MemoryProcessor::__construct() for options
- * @author Rob Jensen
- */
-class MemoryPeakUsageProcessor extends MemoryProcessor
-{
-    /**
-     * @param  array $record
-     * @return array
-     */
-    public function __invoke(array $record)
-    {
-        $bytes = memory_get_peak_usage($this->realUsage);
-        $formatted = $this->formatBytes($bytes);
-
-        $record['extra']['memory_peak_usage'] = $formatted;
-
-        return $record;
-    }
-}
diff --git a/mayor-orig/www/include/share/googleapi/monolog/monolog/src/Monolog/Processor/MemoryProcessor.php b/mayor-orig/www/include/share/googleapi/monolog/monolog/src/Monolog/Processor/MemoryProcessor.php
deleted file mode 100644
index 85f9dc5e..00000000
--- a/mayor-orig/www/include/share/googleapi/monolog/monolog/src/Monolog/Processor/MemoryProcessor.php
+++ /dev/null
@@ -1,63 +0,0 @@
-
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Monolog\Processor;
-
-/**
- * Some methods that are common for all memory processors
- *
- * @author Rob Jensen
- */
-abstract class MemoryProcessor
-{
-    /**
-     * @var bool If true, get the real size of memory allocated from system. Else, only the memory used by emalloc() is reported.
-     */
-    protected $realUsage;
-
-    /**
-     * @var bool If true, then format memory size to human readable string (MB, KB, B depending on size)
-     */
-    protected $useFormatting;
-
-    /**
-     * @param bool $realUsage     Set this to true to get the real size of memory allocated from system.
-     * @param bool $useFormatting If true, then format memory size to human readable string (MB, KB, B depending on size)
-     */
-    public function __construct($realUsage = true, $useFormatting = true)
-    {
-        $this->realUsage = (boolean) $realUsage;
-        $this->useFormatting = (boolean) $useFormatting;
-    }
-
-    /**
-     * Formats bytes into a human readable string if $this->useFormatting is true, otherwise return $bytes as is
-     *
-     * @param  int        $bytes
-     * @return string|int Formatted string if $this->useFormatting is true, otherwise return $bytes as is
-     */
-    protected function formatBytes($bytes)
-    {
-        $bytes = (int) $bytes;
-
-        if (!$this->useFormatting) {
-            return $bytes;
-        }
-
-        if ($bytes > 1024 * 1024) {
-            return round($bytes / 1024 / 1024, 2).' MB';
-        } elseif ($bytes > 1024) {
-            return round($bytes / 1024, 2).' KB';
-        }
-
-        return $bytes . ' B';
-    }
-}
diff --git a/mayor-orig/www/include/share/googleapi/monolog/monolog/src/Monolog/Processor/MemoryUsageProcessor.php b/mayor-orig/www/include/share/googleapi/monolog/monolog/src/Monolog/Processor/MemoryUsageProcessor.php
deleted file mode 100644
index 2783d656..00000000
--- a/mayor-orig/www/include/share/googleapi/monolog/monolog/src/Monolog/Processor/MemoryUsageProcessor.php
+++ /dev/null
@@ -1,35 +0,0 @@
-
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Monolog\Processor;
-
-/**
- * Injects memory_get_usage in all records
- *
- * @see Monolog\Processor\MemoryProcessor::__construct() for options
- * @author Rob Jensen
- */
-class MemoryUsageProcessor extends MemoryProcessor
-{
-    /**
-     * @param  array $record
-     * @return array
-     */
-    public function __invoke(array $record)
-    {
-        $bytes = memory_get_usage($this->realUsage);
-        $formatted = $this->formatBytes($bytes);
-
-        $record['extra']['memory_usage'] = $formatted;
-
-        return $record;
-    }
-}
diff --git a/mayor-orig/www/include/share/googleapi/monolog/monolog/src/Monolog/Processor/MercurialProcessor.php b/mayor-orig/www/include/share/googleapi/monolog/monolog/src/Monolog/Processor/MercurialProcessor.php
deleted file mode 100644
index 7c07a7e9..00000000
--- a/mayor-orig/www/include/share/googleapi/monolog/monolog/src/Monolog/Processor/MercurialProcessor.php
+++ /dev/null
@@ -1,63 +0,0 @@
-
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Monolog\Processor;
-
-use Monolog\Logger;
-
-/**
- * Injects Hg branch and Hg revision number in all records
- *
- * @author Jonathan A. Schweder 
- */
-class MercurialProcessor
-{
-    private $level;
-    private static $cache;
-
-    public function __construct($level = Logger::DEBUG)
-    {
-        $this->level = Logger::toMonologLevel($level);
-    }
-
-    /**
-     * @param  array $record
-     * @return array
-     */
-    public function __invoke(array $record)
-    {
-        // return if the level is not high enough
-        if ($record['level'] < $this->level) {
-            return $record;
-        }
-
-        $record['extra']['hg'] = self::getMercurialInfo();
-
-        return $record;
-    }
-
-    private static function getMercurialInfo()
-    {
-        if (self::$cache) {
-            return self::$cache;
-        }
-
-        $result = explode(' ', trim(`hg id -nb`));
-        if (count($result) >= 3) {
-            return self::$cache = array(
-                'branch' => $result[1],
-                'revision' => $result[2],
-            );
-        }
-
-        return self::$cache = array();
-    }
-}
diff --git a/mayor-orig/www/include/share/googleapi/monolog/monolog/src/Monolog/Processor/ProcessIdProcessor.php b/mayor-orig/www/include/share/googleapi/monolog/monolog/src/Monolog/Processor/ProcessIdProcessor.php
deleted file mode 100644
index 9d3f5590..00000000
--- a/mayor-orig/www/include/share/googleapi/monolog/monolog/src/Monolog/Processor/ProcessIdProcessor.php
+++ /dev/null
@@ -1,31 +0,0 @@
-
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Monolog\Processor;
-
-/**
- * Adds value of getmypid into records
- *
- * @author Andreas Hörnicke
- */
-class ProcessIdProcessor
-{
-    /**
-     * @param  array $record
-     * @return array
-     */
-    public function __invoke(array $record)
-    {
-        $record['extra']['process_id'] = getmypid();
-
-        return $record;
-    }
-}
diff --git a/mayor-orig/www/include/share/googleapi/monolog/monolog/src/Monolog/Processor/PsrLogMessageProcessor.php b/mayor-orig/www/include/share/googleapi/monolog/monolog/src/Monolog/Processor/PsrLogMessageProcessor.php
deleted file mode 100644
index c2686ce5..00000000
--- a/mayor-orig/www/include/share/googleapi/monolog/monolog/src/Monolog/Processor/PsrLogMessageProcessor.php
+++ /dev/null
@@ -1,48 +0,0 @@
-
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Monolog\Processor;
-
-/**
- * Processes a record's message according to PSR-3 rules
- *
- * It replaces {foo} with the value from $context['foo']
- *
- * @author Jordi Boggiano 
- */
-class PsrLogMessageProcessor
-{
-    /**
-     * @param  array $record
-     * @return array
-     */
-    public function __invoke(array $record)
-    {
-        if (false === strpos($record['message'], '{')) {
-            return $record;
-        }
-
-        $replacements = array();
-        foreach ($record['context'] as $key => $val) {
-            if (is_null($val) || is_scalar($val) || (is_object($val) && method_exists($val, "__toString"))) {
-                $replacements['{'.$key.'}'] = $val;
-            } elseif (is_object($val)) {
-                $replacements['{'.$key.'}'] = '[object '.get_class($val).']';
-            } else {
-                $replacements['{'.$key.'}'] = '['.gettype($val).']';
-            }
-        }
-
-        $record['message'] = strtr($record['message'], $replacements);
-
-        return $record;
-    }
-}
diff --git a/mayor-orig/www/include/share/googleapi/monolog/monolog/src/Monolog/Processor/TagProcessor.php b/mayor-orig/www/include/share/googleapi/monolog/monolog/src/Monolog/Processor/TagProcessor.php
deleted file mode 100644
index 7e2df2ac..00000000
--- a/mayor-orig/www/include/share/googleapi/monolog/monolog/src/Monolog/Processor/TagProcessor.php
+++ /dev/null
@@ -1,44 +0,0 @@
-
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Monolog\Processor;
-
-/**
- * Adds a tags array into record
- *
- * @author Martijn Riemers
- */
-class TagProcessor
-{
-    private $tags;
-
-    public function __construct(array $tags = array())
-    {
-        $this->setTags($tags);
-    }
-
-    public function addTags(array $tags = array())
-    {
-        $this->tags = array_merge($this->tags, $tags);
-    }
-
-    public function setTags(array $tags = array())
-    {
-        $this->tags = $tags;
-    }
-
-    public function __invoke(array $record)
-    {
-        $record['extra']['tags'] = $this->tags;
-
-        return $record;
-    }
-}
diff --git a/mayor-orig/www/include/share/googleapi/monolog/monolog/src/Monolog/Processor/UidProcessor.php b/mayor-orig/www/include/share/googleapi/monolog/monolog/src/Monolog/Processor/UidProcessor.php
deleted file mode 100644
index 812707cd..00000000
--- a/mayor-orig/www/include/share/googleapi/monolog/monolog/src/Monolog/Processor/UidProcessor.php
+++ /dev/null
@@ -1,46 +0,0 @@
-
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Monolog\Processor;
-
-/**
- * Adds a unique identifier into records
- *
- * @author Simon Mönch 
- */
-class UidProcessor
-{
-    private $uid;
-
-    public function __construct($length = 7)
-    {
-        if (!is_int($length) || $length > 32 || $length < 1) {
-            throw new \InvalidArgumentException('The uid length must be an integer between 1 and 32');
-        }
-
-        $this->uid = substr(hash('md5', uniqid('', true)), 0, $length);
-    }
-
-    public function __invoke(array $record)
-    {
-        $record['extra']['uid'] = $this->uid;
-
-        return $record;
-    }
-
-    /**
-     * @return string
-     */
-    public function getUid()
-    {
-        return $this->uid;
-    }
-}
diff --git a/mayor-orig/www/include/share/googleapi/monolog/monolog/src/Monolog/Processor/WebProcessor.php b/mayor-orig/www/include/share/googleapi/monolog/monolog/src/Monolog/Processor/WebProcessor.php
deleted file mode 100644
index ea1d8978..00000000
--- a/mayor-orig/www/include/share/googleapi/monolog/monolog/src/Monolog/Processor/WebProcessor.php
+++ /dev/null
@@ -1,113 +0,0 @@
-
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Monolog\Processor;
-
-/**
- * Injects url/method and remote IP of the current web request in all records
- *
- * @author Jordi Boggiano 
- */
-class WebProcessor
-{
-    /**
-     * @var array|\ArrayAccess
-     */
-    protected $serverData;
-
-    /**
-     * Default fields
-     *
-     * Array is structured as [key in record.extra => key in $serverData]
-     *
-     * @var array
-     */
-    protected $extraFields = array(
-        'url'         => 'REQUEST_URI',
-        'ip'          => 'REMOTE_ADDR',
-        'http_method' => 'REQUEST_METHOD',
-        'server'      => 'SERVER_NAME',
-        'referrer'    => 'HTTP_REFERER',
-    );
-
-    /**
-     * @param array|\ArrayAccess $serverData  Array or object w/ ArrayAccess that provides access to the $_SERVER data
-     * @param array|null         $extraFields Field names and the related key inside $serverData to be added. If not provided it defaults to: url, ip, http_method, server, referrer
-     */
-    public function __construct($serverData = null, array $extraFields = null)
-    {
-        if (null === $serverData) {
-            $this->serverData = &$_SERVER;
-        } elseif (is_array($serverData) || $serverData instanceof \ArrayAccess) {
-            $this->serverData = $serverData;
-        } else {
-            throw new \UnexpectedValueException('$serverData must be an array or object implementing ArrayAccess.');
-        }
-
-        if (null !== $extraFields) {
-            if (isset($extraFields[0])) {
-                foreach (array_keys($this->extraFields) as $fieldName) {
-                    if (!in_array($fieldName, $extraFields)) {
-                        unset($this->extraFields[$fieldName]);
-                    }
-                }
-            } else {
-                $this->extraFields = $extraFields;
-            }
-        }
-    }
-
-    /**
-     * @param  array $record
-     * @return array
-     */
-    public function __invoke(array $record)
-    {
-        // skip processing if for some reason request data
-        // is not present (CLI or wonky SAPIs)
-        if (!isset($this->serverData['REQUEST_URI'])) {
-            return $record;
-        }
-
-        $record['extra'] = $this->appendExtraFields($record['extra']);
-
-        return $record;
-    }
-
-    /**
-     * @param  string $extraName
-     * @param  string $serverName
-     * @return $this
-     */
-    public function addExtraField($extraName, $serverName)
-    {
-        $this->extraFields[$extraName] = $serverName;
-
-        return $this;
-    }
-
-    /**
-     * @param  array $extra
-     * @return array
-     */
-    private function appendExtraFields(array $extra)
-    {
-        foreach ($this->extraFields as $extraName => $serverName) {
-            $extra[$extraName] = isset($this->serverData[$serverName]) ? $this->serverData[$serverName] : null;
-        }
-
-        if (isset($this->serverData['UNIQUE_ID'])) {
-            $extra['unique_id'] = $this->serverData['UNIQUE_ID'];
-        }
-
-        return $extra;
-    }
-}
diff --git a/mayor-orig/www/include/share/googleapi/monolog/monolog/src/Monolog/Registry.php b/mayor-orig/www/include/share/googleapi/monolog/monolog/src/Monolog/Registry.php
deleted file mode 100644
index 159b751c..00000000
--- a/mayor-orig/www/include/share/googleapi/monolog/monolog/src/Monolog/Registry.php
+++ /dev/null
@@ -1,134 +0,0 @@
-
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Monolog;
-
-use InvalidArgumentException;
-
-/**
- * Monolog log registry
- *
- * Allows to get `Logger` instances in the global scope
- * via static method calls on this class.
- *
- * 
- * $application = new Monolog\Logger('application');
- * $api = new Monolog\Logger('api');
- *
- * Monolog\Registry::addLogger($application);
- * Monolog\Registry::addLogger($api);
- *
- * function testLogger()
- * {
- *     Monolog\Registry::api()->addError('Sent to $api Logger instance');
- *     Monolog\Registry::application()->addError('Sent to $application Logger instance');
- * }
- * 
- *
- * @author Tomas Tatarko 
- */
-class Registry
-{
-    /**
-     * List of all loggers in the registry (by named indexes)
-     *
-     * @var Logger[]
-     */
-    private static $loggers = array();
-
-    /**
-     * Adds new logging channel to the registry
-     *
-     * @param  Logger                    $logger    Instance of the logging channel
-     * @param  string|null               $name      Name of the logging channel ($logger->getName() by default)
-     * @param  bool                      $overwrite Overwrite instance in the registry if the given name already exists?
-     * @throws \InvalidArgumentException If $overwrite set to false and named Logger instance already exists
-     */
-    public static function addLogger(Logger $logger, $name = null, $overwrite = false)
-    {
-        $name = $name ?: $logger->getName();
-
-        if (isset(self::$loggers[$name]) && !$overwrite) {
-            throw new InvalidArgumentException('Logger with the given name already exists');
-        }
-
-        self::$loggers[$name] = $logger;
-    }
-
-    /**
-     * Checks if such logging channel exists by name or instance
-     *
-     * @param string|Logger $logger Name or logger instance
-     */
-    public static function hasLogger($logger)
-    {
-        if ($logger instanceof Logger) {
-            $index = array_search($logger, self::$loggers, true);
-
-            return false !== $index;
-        } else {
-            return isset(self::$loggers[$logger]);
-        }
-    }
-
-    /**
-     * Removes instance from registry by name or instance
-     *
-     * @param string|Logger $logger Name or logger instance
-     */
-    public static function removeLogger($logger)
-    {
-        if ($logger instanceof Logger) {
-            if (false !== ($idx = array_search($logger, self::$loggers, true))) {
-                unset(self::$loggers[$idx]);
-            }
-        } else {
-            unset(self::$loggers[$logger]);
-        }
-    }
-
-    /**
-     * Clears the registry
-     */
-    public static function clear()
-    {
-        self::$loggers = array();
-    }
-
-    /**
-     * Gets Logger instance from the registry
-     *
-     * @param  string                    $name Name of the requested Logger instance
-     * @throws \InvalidArgumentException If named Logger instance is not in the registry
-     * @return Logger                    Requested instance of Logger
-     */
-    public static function getInstance($name)
-    {
-        if (!isset(self::$loggers[$name])) {
-            throw new InvalidArgumentException(sprintf('Requested "%s" logger instance is not in the registry', $name));
-        }
-
-        return self::$loggers[$name];
-    }
-
-    /**
-     * Gets Logger instance from the registry via static method call
-     *
-     * @param  string                    $name      Name of the requested Logger instance
-     * @param  array                     $arguments Arguments passed to static method call
-     * @throws \InvalidArgumentException If named Logger instance is not in the registry
-     * @return Logger                    Requested instance of Logger
-     */
-    public static function __callStatic($name, $arguments)
-    {
-        return self::getInstance($name);
-    }
-}
diff --git a/mayor-orig/www/include/share/googleapi/monolog/monolog/tests/Monolog/ErrorHandlerTest.php b/mayor-orig/www/include/share/googleapi/monolog/monolog/tests/Monolog/ErrorHandlerTest.php
deleted file mode 100644
index a9a3f301..00000000
--- a/mayor-orig/www/include/share/googleapi/monolog/monolog/tests/Monolog/ErrorHandlerTest.php
+++ /dev/null
@@ -1,31 +0,0 @@
-
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Monolog;
-
-use Monolog\Handler\TestHandler;
-
-class ErrorHandlerTest extends \PHPUnit_Framework_TestCase
-{
-    public function testHandleError()
-    {
-        $logger = new Logger('test', array($handler = new TestHandler));
-        $errHandler = new ErrorHandler($logger);
-
-        $errHandler->registerErrorHandler(array(E_USER_NOTICE => Logger::EMERGENCY), false);
-        trigger_error('Foo', E_USER_ERROR);
-        $this->assertCount(1, $handler->getRecords());
-        $this->assertTrue($handler->hasErrorRecords());
-        trigger_error('Foo', E_USER_NOTICE);
-        $this->assertCount(2, $handler->getRecords());
-        $this->assertTrue($handler->hasEmergencyRecords());
-    }
-}
diff --git a/mayor-orig/www/include/share/googleapi/monolog/monolog/tests/Monolog/Formatter/ChromePHPFormatterTest.php b/mayor-orig/www/include/share/googleapi/monolog/monolog/tests/Monolog/Formatter/ChromePHPFormatterTest.php
deleted file mode 100644
index 71c42046..00000000
--- a/mayor-orig/www/include/share/googleapi/monolog/monolog/tests/Monolog/Formatter/ChromePHPFormatterTest.php
+++ /dev/null
@@ -1,158 +0,0 @@
-
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Monolog\Formatter;
-
-use Monolog\Logger;
-
-class ChromePHPFormatterTest extends \PHPUnit_Framework_TestCase
-{
-    /**
-     * @covers Monolog\Formatter\ChromePHPFormatter::format
-     */
-    public function testDefaultFormat()
-    {
-        $formatter = new ChromePHPFormatter();
-        $record = array(
-            'level' => Logger::ERROR,
-            'level_name' => 'ERROR',
-            'channel' => 'meh',
-            'context' => array('from' => 'logger'),
-            'datetime' => new \DateTime("@0"),
-            'extra' => array('ip' => '127.0.0.1'),
-            'message' => 'log',
-        );
-
-        $message = $formatter->format($record);
-
-        $this->assertEquals(
-            array(
-                'meh',
-                array(
-                    'message' => 'log',
-                    'context' => array('from' => 'logger'),
-                    'extra' => array('ip' => '127.0.0.1'),
-                ),
-                'unknown',
-                'error',
-            ),
-            $message
-        );
-    }
-
-    /**
-     * @covers Monolog\Formatter\ChromePHPFormatter::format
-     */
-    public function testFormatWithFileAndLine()
-    {
-        $formatter = new ChromePHPFormatter();
-        $record = array(
-            'level' => Logger::CRITICAL,
-            'level_name' => 'CRITICAL',
-            'channel' => 'meh',
-            'context' => array('from' => 'logger'),
-            'datetime' => new \DateTime("@0"),
-            'extra' => array('ip' => '127.0.0.1', 'file' => 'test', 'line' => 14),
-            'message' => 'log',
-        );
-
-        $message = $formatter->format($record);
-
-        $this->assertEquals(
-            array(
-                'meh',
-                array(
-                    'message' => 'log',
-                    'context' => array('from' => 'logger'),
-                    'extra' => array('ip' => '127.0.0.1'),
-                ),
-                'test : 14',
-                'error',
-            ),
-            $message
-        );
-    }
-
-    /**
-     * @covers Monolog\Formatter\ChromePHPFormatter::format
-     */
-    public function testFormatWithoutContext()
-    {
-        $formatter = new ChromePHPFormatter();
-        $record = array(
-            'level' => Logger::DEBUG,
-            'level_name' => 'DEBUG',
-            'channel' => 'meh',
-            'context' => array(),
-            'datetime' => new \DateTime("@0"),
-            'extra' => array(),
-            'message' => 'log',
-        );
-
-        $message = $formatter->format($record);
-
-        $this->assertEquals(
-            array(
-                'meh',
-                'log',
-                'unknown',
-                'log',
-            ),
-            $message
-        );
-    }
-
-    /**
-     * @covers Monolog\Formatter\ChromePHPFormatter::formatBatch
-     */
-    public function testBatchFormatThrowException()
-    {
-        $formatter = new ChromePHPFormatter();
-        $records = array(
-            array(
-                'level' => Logger::INFO,
-                'level_name' => 'INFO',
-                'channel' => 'meh',
-                'context' => array(),
-                'datetime' => new \DateTime("@0"),
-                'extra' => array(),
-                'message' => 'log',
-            ),
-            array(
-                'level' => Logger::WARNING,
-                'level_name' => 'WARNING',
-                'channel' => 'foo',
-                'context' => array(),
-                'datetime' => new \DateTime("@0"),
-                'extra' => array(),
-                'message' => 'log2',
-            ),
-        );
-
-        $this->assertEquals(
-            array(
-                array(
-                    'meh',
-                    'log',
-                    'unknown',
-                    'info',
-                ),
-                array(
-                    'foo',
-                    'log2',
-                    'unknown',
-                    'warn',
-                ),
-            ),
-            $formatter->formatBatch($records)
-        );
-    }
-}
diff --git a/mayor-orig/www/include/share/googleapi/monolog/monolog/tests/Monolog/Formatter/ElasticaFormatterTest.php b/mayor-orig/www/include/share/googleapi/monolog/monolog/tests/Monolog/Formatter/ElasticaFormatterTest.php
deleted file mode 100644
index 90cc48dd..00000000
--- a/mayor-orig/www/include/share/googleapi/monolog/monolog/tests/Monolog/Formatter/ElasticaFormatterTest.php
+++ /dev/null
@@ -1,79 +0,0 @@
-
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Monolog\Formatter;
-
-use Monolog\Logger;
-
-class ElasticaFormatterTest extends \PHPUnit_Framework_TestCase
-{
-    public function setUp()
-    {
-        if (!class_exists("Elastica\Document")) {
-            $this->markTestSkipped("ruflin/elastica not installed");
-        }
-    }
-
-    /**
-     * @covers Monolog\Formatter\ElasticaFormatter::__construct
-     * @covers Monolog\Formatter\ElasticaFormatter::format
-     * @covers Monolog\Formatter\ElasticaFormatter::getDocument
-     */
-    public function testFormat()
-    {
-        // test log message
-        $msg = array(
-            'level' => Logger::ERROR,
-            'level_name' => 'ERROR',
-            'channel' => 'meh',
-            'context' => array('foo' => 7, 'bar', 'class' => new \stdClass),
-            'datetime' => new \DateTime("@0"),
-            'extra' => array(),
-            'message' => 'log',
-        );
-
-        // expected values
-        $expected = $msg;
-        $expected['datetime'] = '1970-01-01T00:00:00.000000+00:00';
-        $expected['context'] = array(
-            'class' => '[object] (stdClass: {})',
-            'foo' => 7,
-            0 => 'bar',
-        );
-
-        // format log message
-        $formatter = new ElasticaFormatter('my_index', 'doc_type');
-        $doc = $formatter->format($msg);
-        $this->assertInstanceOf('Elastica\Document', $doc);
-
-        // Document parameters
-        $params = $doc->getParams();
-        $this->assertEquals('my_index', $params['_index']);
-        $this->assertEquals('doc_type', $params['_type']);
-
-        // Document data values
-        $data = $doc->getData();
-        foreach (array_keys($expected) as $key) {
-            $this->assertEquals($expected[$key], $data[$key]);
-        }
-    }
-
-    /**
-     * @covers Monolog\Formatter\ElasticaFormatter::getIndex
-     * @covers Monolog\Formatter\ElasticaFormatter::getType
-     */
-    public function testGetters()
-    {
-        $formatter = new ElasticaFormatter('my_index', 'doc_type');
-        $this->assertEquals('my_index', $formatter->getIndex());
-        $this->assertEquals('doc_type', $formatter->getType());
-    }
-}
diff --git a/mayor-orig/www/include/share/googleapi/monolog/monolog/tests/Monolog/Formatter/FlowdockFormatterTest.php b/mayor-orig/www/include/share/googleapi/monolog/monolog/tests/Monolog/Formatter/FlowdockFormatterTest.php
deleted file mode 100644
index 1b2fd97a..00000000
--- a/mayor-orig/www/include/share/googleapi/monolog/monolog/tests/Monolog/Formatter/FlowdockFormatterTest.php
+++ /dev/null
@@ -1,55 +0,0 @@
-
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Monolog\Formatter;
-
-use Monolog\Logger;
-use Monolog\TestCase;
-
-class FlowdockFormatterTest extends TestCase
-{
-    /**
-     * @covers Monolog\Formatter\FlowdockFormatter::format
-     */
-    public function testFormat()
-    {
-        $formatter = new FlowdockFormatter('test_source', 'source@test.com');
-        $record = $this->getRecord();
-
-        $expected = array(
-            'source' => 'test_source',
-            'from_address' => 'source@test.com',
-            'subject' => 'in test_source: WARNING - test',
-            'content' => 'test',
-            'tags' => array('#logs', '#warning', '#test'),
-            'project' => 'test_source',
-        );
-        $formatted = $formatter->format($record);
-
-        $this->assertEquals($expected, $formatted['flowdock']);
-    }
-
-    /**
-     * @ covers Monolog\Formatter\FlowdockFormatter::formatBatch
-     */
-    public function testFormatBatch()
-    {
-        $formatter = new FlowdockFormatter('test_source', 'source@test.com');
-        $records = array(
-            $this->getRecord(Logger::WARNING),
-            $this->getRecord(Logger::DEBUG),
-        );
-        $formatted = $formatter->formatBatch($records);
-
-        $this->assertArrayHasKey('flowdock', $formatted[0]);
-        $this->assertArrayHasKey('flowdock', $formatted[1]);
-    }
-}
diff --git a/mayor-orig/www/include/share/googleapi/monolog/monolog/tests/Monolog/Formatter/FluentdFormatterTest.php b/mayor-orig/www/include/share/googleapi/monolog/monolog/tests/Monolog/Formatter/FluentdFormatterTest.php
deleted file mode 100644
index 622b2bae..00000000
--- a/mayor-orig/www/include/share/googleapi/monolog/monolog/tests/Monolog/Formatter/FluentdFormatterTest.php
+++ /dev/null
@@ -1,62 +0,0 @@
-
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Monolog\Formatter;
-
-use Monolog\Logger;
-use Monolog\TestCase;
-
-class FluentdFormatterTest extends TestCase
-{
-    /**
-     * @covers Monolog\Formatter\FluentdFormatter::__construct
-     * @covers Monolog\Formatter\FluentdFormatter::isUsingLevelsInTag
-     */
-    public function testConstruct()
-    {
-        $formatter = new FluentdFormatter();
-        $this->assertEquals(false, $formatter->isUsingLevelsInTag());
-        $formatter = new FluentdFormatter(false);
-        $this->assertEquals(false, $formatter->isUsingLevelsInTag());
-        $formatter = new FluentdFormatter(true);
-        $this->assertEquals(true, $formatter->isUsingLevelsInTag());
-    }
-
-    /**
-     * @covers Monolog\Formatter\FluentdFormatter::format
-     */
-    public function testFormat()
-    {
-        $record = $this->getRecord(Logger::WARNING);
-        $record['datetime'] = new \DateTime("@0");
-
-        $formatter = new FluentdFormatter();
-        $this->assertEquals(
-            '["test",0,{"message":"test","extra":[],"level":300,"level_name":"WARNING"}]',
-            $formatter->format($record)
-        );
-    }
-
-    /**
-     * @covers Monolog\Formatter\FluentdFormatter::format
-     */
-    public function testFormatWithTag()
-    {
-        $record = $this->getRecord(Logger::ERROR);
-        $record['datetime'] = new \DateTime("@0");
-
-        $formatter = new FluentdFormatter(true);
-        $this->assertEquals(
-            '["test.error",0,{"message":"test","extra":[]}]',
-            $formatter->format($record)
-        );
-    }
-}
diff --git a/mayor-orig/www/include/share/googleapi/monolog/monolog/tests/Monolog/Formatter/GelfMessageFormatterTest.php b/mayor-orig/www/include/share/googleapi/monolog/monolog/tests/Monolog/Formatter/GelfMessageFormatterTest.php
deleted file mode 100644
index 4a247616..00000000
--- a/mayor-orig/www/include/share/googleapi/monolog/monolog/tests/Monolog/Formatter/GelfMessageFormatterTest.php
+++ /dev/null
@@ -1,258 +0,0 @@
-
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Monolog\Formatter;
-
-use Monolog\Logger;
-
-class GelfMessageFormatterTest extends \PHPUnit_Framework_TestCase
-{
-    public function setUp()
-    {
-        if (!class_exists('\Gelf\Message')) {
-            $this->markTestSkipped("graylog2/gelf-php or mlehner/gelf-php is not installed");
-        }
-    }
-
-    /**
-     * @covers Monolog\Formatter\GelfMessageFormatter::format
-     */
-    public function testDefaultFormatter()
-    {
-        $formatter = new GelfMessageFormatter();
-        $record = array(
-            'level' => Logger::ERROR,
-            'level_name' => 'ERROR',
-            'channel' => 'meh',
-            'context' => array(),
-            'datetime' => new \DateTime("@0"),
-            'extra' => array(),
-            'message' => 'log',
-        );
-
-        $message = $formatter->format($record);
-
-        $this->assertInstanceOf('Gelf\Message', $message);
-        $this->assertEquals(0, $message->getTimestamp());
-        $this->assertEquals('log', $message->getShortMessage());
-        $this->assertEquals('meh', $message->getFacility());
-        $this->assertEquals(null, $message->getLine());
-        $this->assertEquals(null, $message->getFile());
-        $this->assertEquals($this->isLegacy() ? 3 : 'error', $message->getLevel());
-        $this->assertNotEmpty($message->getHost());
-
-        $formatter = new GelfMessageFormatter('mysystem');
-
-        $message = $formatter->format($record);
-
-        $this->assertInstanceOf('Gelf\Message', $message);
-        $this->assertEquals('mysystem', $message->getHost());
-    }
-
-    /**
-     * @covers Monolog\Formatter\GelfMessageFormatter::format
-     */
-    public function testFormatWithFileAndLine()
-    {
-        $formatter = new GelfMessageFormatter();
-        $record = array(
-            'level' => Logger::ERROR,
-            'level_name' => 'ERROR',
-            'channel' => 'meh',
-            'context' => array('from' => 'logger'),
-            'datetime' => new \DateTime("@0"),
-            'extra' => array('file' => 'test', 'line' => 14),
-            'message' => 'log',
-        );
-
-        $message = $formatter->format($record);
-
-        $this->assertInstanceOf('Gelf\Message', $message);
-        $this->assertEquals('test', $message->getFile());
-        $this->assertEquals(14, $message->getLine());
-    }
-
-    /**
-     * @covers Monolog\Formatter\GelfMessageFormatter::format
-     * @expectedException InvalidArgumentException
-     */
-    public function testFormatInvalidFails()
-    {
-        $formatter = new GelfMessageFormatter();
-        $record = array(
-            'level' => Logger::ERROR,
-            'level_name' => 'ERROR',
-        );
-
-        $formatter->format($record);
-    }
-
-    /**
-     * @covers Monolog\Formatter\GelfMessageFormatter::format
-     */
-    public function testFormatWithContext()
-    {
-        $formatter = new GelfMessageFormatter();
-        $record = array(
-            'level' => Logger::ERROR,
-            'level_name' => 'ERROR',
-            'channel' => 'meh',
-            'context' => array('from' => 'logger'),
-            'datetime' => new \DateTime("@0"),
-            'extra' => array('key' => 'pair'),
-            'message' => 'log',
-        );
-
-        $message = $formatter->format($record);
-
-        $this->assertInstanceOf('Gelf\Message', $message);
-
-        $message_array = $message->toArray();
-
-        $this->assertArrayHasKey('_ctxt_from', $message_array);
-        $this->assertEquals('logger', $message_array['_ctxt_from']);
-
-        // Test with extraPrefix
-        $formatter = new GelfMessageFormatter(null, null, 'CTX');
-        $message = $formatter->format($record);
-
-        $this->assertInstanceOf('Gelf\Message', $message);
-
-        $message_array = $message->toArray();
-
-        $this->assertArrayHasKey('_CTXfrom', $message_array);
-        $this->assertEquals('logger', $message_array['_CTXfrom']);
-    }
-
-    /**
-     * @covers Monolog\Formatter\GelfMessageFormatter::format
-     */
-    public function testFormatWithContextContainingException()
-    {
-        $formatter = new GelfMessageFormatter();
-        $record = array(
-            'level' => Logger::ERROR,
-            'level_name' => 'ERROR',
-            'channel' => 'meh',
-            'context' => array('from' => 'logger', 'exception' => array(
-                'class' => '\Exception',
-                'file'  => '/some/file/in/dir.php:56',
-                'trace' => array('/some/file/1.php:23', '/some/file/2.php:3'),
-            )),
-            'datetime' => new \DateTime("@0"),
-            'extra' => array(),
-            'message' => 'log',
-        );
-
-        $message = $formatter->format($record);
-
-        $this->assertInstanceOf('Gelf\Message', $message);
-
-        $this->assertEquals("/some/file/in/dir.php", $message->getFile());
-        $this->assertEquals("56", $message->getLine());
-    }
-
-    /**
-     * @covers Monolog\Formatter\GelfMessageFormatter::format
-     */
-    public function testFormatWithExtra()
-    {
-        $formatter = new GelfMessageFormatter();
-        $record = array(
-            'level' => Logger::ERROR,
-            'level_name' => 'ERROR',
-            'channel' => 'meh',
-            'context' => array('from' => 'logger'),
-            'datetime' => new \DateTime("@0"),
-            'extra' => array('key' => 'pair'),
-            'message' => 'log',
-        );
-
-        $message = $formatter->format($record);
-
-        $this->assertInstanceOf('Gelf\Message', $message);
-
-        $message_array = $message->toArray();
-
-        $this->assertArrayHasKey('_key', $message_array);
-        $this->assertEquals('pair', $message_array['_key']);
-
-        // Test with extraPrefix
-        $formatter = new GelfMessageFormatter(null, 'EXT');
-        $message = $formatter->format($record);
-
-        $this->assertInstanceOf('Gelf\Message', $message);
-
-        $message_array = $message->toArray();
-
-        $this->assertArrayHasKey('_EXTkey', $message_array);
-        $this->assertEquals('pair', $message_array['_EXTkey']);
-    }
-
-    public function testFormatWithLargeData()
-    {
-        $formatter = new GelfMessageFormatter();
-        $record = array(
-            'level' => Logger::ERROR,
-            'level_name' => 'ERROR',
-            'channel' => 'meh',
-            'context' => array('exception' => str_repeat(' ', 32767)),
-            'datetime' => new \DateTime("@0"),
-            'extra' => array('key' => str_repeat(' ', 32767)),
-            'message' => 'log'
-        );
-        $message = $formatter->format($record);
-        $messageArray = $message->toArray();
-
-        // 200 for padding + metadata
-        $length = 200;
-
-        foreach ($messageArray as $key => $value) {
-            if (!in_array($key, array('level', 'timestamp'))) {
-                $length += strlen($value);
-            }
-        }
-
-        $this->assertLessThanOrEqual(65792, $length, 'The message length is no longer than the maximum allowed length');
-    }
-
-    public function testFormatWithUnlimitedLength()
-    {
-        $formatter = new GelfMessageFormatter('LONG_SYSTEM_NAME', null, 'ctxt_', PHP_INT_MAX);
-        $record = array(
-            'level' => Logger::ERROR,
-            'level_name' => 'ERROR',
-            'channel' => 'meh',
-            'context' => array('exception' => str_repeat(' ', 32767 * 2)),
-            'datetime' => new \DateTime("@0"),
-            'extra' => array('key' => str_repeat(' ', 32767 * 2)),
-            'message' => 'log'
-        );
-        $message = $formatter->format($record);
-        $messageArray = $message->toArray();
-
-        // 200 for padding + metadata
-        $length = 200;
-
-        foreach ($messageArray as $key => $value) {
-            if (!in_array($key, array('level', 'timestamp'))) {
-                $length += strlen($value);
-            }
-        }
-
-        $this->assertGreaterThanOrEqual(131289, $length, 'The message should not be truncated');
-    }
-
-    private function isLegacy()
-    {
-        return interface_exists('\Gelf\IMessagePublisher');
-    }
-}
diff --git a/mayor-orig/www/include/share/googleapi/monolog/monolog/tests/Monolog/Formatter/JsonFormatterTest.php b/mayor-orig/www/include/share/googleapi/monolog/monolog/tests/Monolog/Formatter/JsonFormatterTest.php
deleted file mode 100644
index c9445f36..00000000
--- a/mayor-orig/www/include/share/googleapi/monolog/monolog/tests/Monolog/Formatter/JsonFormatterTest.php
+++ /dev/null
@@ -1,183 +0,0 @@
-
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Monolog\Formatter;
-
-use Monolog\Logger;
-use Monolog\TestCase;
-
-class JsonFormatterTest extends TestCase
-{
-    /**
-     * @covers Monolog\Formatter\JsonFormatter::__construct
-     * @covers Monolog\Formatter\JsonFormatter::getBatchMode
-     * @covers Monolog\Formatter\JsonFormatter::isAppendingNewlines
-     */
-    public function testConstruct()
-    {
-        $formatter = new JsonFormatter();
-        $this->assertEquals(JsonFormatter::BATCH_MODE_JSON, $formatter->getBatchMode());
-        $this->assertEquals(true, $formatter->isAppendingNewlines());
-        $formatter = new JsonFormatter(JsonFormatter::BATCH_MODE_NEWLINES, false);
-        $this->assertEquals(JsonFormatter::BATCH_MODE_NEWLINES, $formatter->getBatchMode());
-        $this->assertEquals(false, $formatter->isAppendingNewlines());
-    }
-
-    /**
-     * @covers Monolog\Formatter\JsonFormatter::format
-     */
-    public function testFormat()
-    {
-        $formatter = new JsonFormatter();
-        $record = $this->getRecord();
-        $this->assertEquals(json_encode($record)."\n", $formatter->format($record));
-
-        $formatter = new JsonFormatter(JsonFormatter::BATCH_MODE_JSON, false);
-        $record = $this->getRecord();
-        $this->assertEquals(json_encode($record), $formatter->format($record));
-    }
-
-    /**
-     * @covers Monolog\Formatter\JsonFormatter::formatBatch
-     * @covers Monolog\Formatter\JsonFormatter::formatBatchJson
-     */
-    public function testFormatBatch()
-    {
-        $formatter = new JsonFormatter();
-        $records = array(
-            $this->getRecord(Logger::WARNING),
-            $this->getRecord(Logger::DEBUG),
-        );
-        $this->assertEquals(json_encode($records), $formatter->formatBatch($records));
-    }
-
-    /**
-     * @covers Monolog\Formatter\JsonFormatter::formatBatch
-     * @covers Monolog\Formatter\JsonFormatter::formatBatchNewlines
-     */
-    public function testFormatBatchNewlines()
-    {
-        $formatter = new JsonFormatter(JsonFormatter::BATCH_MODE_NEWLINES);
-        $records = $expected = array(
-            $this->getRecord(Logger::WARNING),
-            $this->getRecord(Logger::DEBUG),
-        );
-        array_walk($expected, function (&$value, $key) {
-            $value = json_encode($value);
-        });
-        $this->assertEquals(implode("\n", $expected), $formatter->formatBatch($records));
-    }
-
-    public function testDefFormatWithException()
-    {
-        $formatter = new JsonFormatter();
-        $exception = new \RuntimeException('Foo');
-        $formattedException = $this->formatException($exception);
-
-        $message = $this->formatRecordWithExceptionInContext($formatter, $exception);
-
-        $this->assertContextContainsFormattedException($formattedException, $message);
-    }
-
-    public function testDefFormatWithPreviousException()
-    {
-        $formatter = new JsonFormatter();
-        $exception = new \RuntimeException('Foo', 0, new \LogicException('Wut?'));
-        $formattedPrevException = $this->formatException($exception->getPrevious());
-        $formattedException = $this->formatException($exception, $formattedPrevException);
-
-        $message = $this->formatRecordWithExceptionInContext($formatter, $exception);
-
-        $this->assertContextContainsFormattedException($formattedException, $message);
-    }
-
-    public function testDefFormatWithThrowable()
-    {
-        if (!class_exists('Error') || !is_subclass_of('Error', 'Throwable')) {
-            $this->markTestSkipped('Requires PHP >=7');
-        }
-
-        $formatter = new JsonFormatter();
-        $throwable = new \Error('Foo');
-        $formattedThrowable = $this->formatException($throwable);
-
-        $message = $this->formatRecordWithExceptionInContext($formatter, $throwable);
-
-        $this->assertContextContainsFormattedException($formattedThrowable, $message);
-    }
-
-    /**
-     * @param string $expected
-     * @param string $actual
-     *
-     * @internal param string $exception
-     */
-    private function assertContextContainsFormattedException($expected, $actual)
-    {
-        $this->assertEquals(
-            '{"level_name":"CRITICAL","channel":"core","context":{"exception":'.$expected.'},"datetime":null,"extra":[],"message":"foobar"}'."\n",
-            $actual
-        );
-    }
-
-    /**
-     * @param JsonFormatter $formatter
-     * @param \Exception|\Throwable $exception
-     *
-     * @return string
-     */
-    private function formatRecordWithExceptionInContext(JsonFormatter $formatter, $exception)
-    {
-        $message = $formatter->format(array(
-            'level_name' => 'CRITICAL',
-            'channel' => 'core',
-            'context' => array('exception' => $exception),
-            'datetime' => null,
-            'extra' => array(),
-            'message' => 'foobar',
-        ));
-        return $message;
-    }
-
-    /**
-     * @param \Exception|\Throwable $exception
-     *
-     * @return string
-     */
-    private function formatExceptionFilePathWithLine($exception)
-    {
-        $options = 0;
-        if (version_compare(PHP_VERSION, '5.4.0', '>=')) {
-            $options = JSON_UNESCAPED_SLASHES | JSON_UNESCAPED_UNICODE;
-        }
-        $path = substr(json_encode($exception->getFile(), $options), 1, -1);
-        return $path . ':' . $exception->getLine();
-    }
-
-    /**
-     * @param \Exception|\Throwable $exception
-     *
-     * @param null|string $previous
-     *
-     * @return string
-     */
-    private function formatException($exception, $previous = null)
-    {
-        $formattedException =
-            '{"class":"' . get_class($exception) .
-            '","message":"' . $exception->getMessage() .
-            '","code":' . $exception->getCode() .
-            ',"file":"' . $this->formatExceptionFilePathWithLine($exception) .
-            ($previous ? '","previous":' . $previous : '"') .
-            '}';
-        return $formattedException;
-    }
-}
diff --git a/mayor-orig/www/include/share/googleapi/monolog/monolog/tests/Monolog/Formatter/LineFormatterTest.php b/mayor-orig/www/include/share/googleapi/monolog/monolog/tests/Monolog/Formatter/LineFormatterTest.php
deleted file mode 100644
index 310d93ca..00000000
--- a/mayor-orig/www/include/share/googleapi/monolog/monolog/tests/Monolog/Formatter/LineFormatterTest.php
+++ /dev/null
@@ -1,222 +0,0 @@
-
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Monolog\Formatter;
-
-/**
- * @covers Monolog\Formatter\LineFormatter
- */
-class LineFormatterTest extends \PHPUnit_Framework_TestCase
-{
-    public function testDefFormatWithString()
-    {
-        $formatter = new LineFormatter(null, 'Y-m-d');
-        $message = $formatter->format(array(
-            'level_name' => 'WARNING',
-            'channel' => 'log',
-            'context' => array(),
-            'message' => 'foo',
-            'datetime' => new \DateTime,
-            'extra' => array(),
-        ));
-        $this->assertEquals('['.date('Y-m-d').'] log.WARNING: foo [] []'."\n", $message);
-    }
-
-    public function testDefFormatWithArrayContext()
-    {
-        $formatter = new LineFormatter(null, 'Y-m-d');
-        $message = $formatter->format(array(
-            'level_name' => 'ERROR',
-            'channel' => 'meh',
-            'message' => 'foo',
-            'datetime' => new \DateTime,
-            'extra' => array(),
-            'context' => array(
-                'foo' => 'bar',
-                'baz' => 'qux',
-                'bool' => false,
-                'null' => null,
-            ),
-        ));
-        $this->assertEquals('['.date('Y-m-d').'] meh.ERROR: foo {"foo":"bar","baz":"qux","bool":false,"null":null} []'."\n", $message);
-    }
-
-    public function testDefFormatExtras()
-    {
-        $formatter = new LineFormatter(null, 'Y-m-d');
-        $message = $formatter->format(array(
-            'level_name' => 'ERROR',
-            'channel' => 'meh',
-            'context' => array(),
-            'datetime' => new \DateTime,
-            'extra' => array('ip' => '127.0.0.1'),
-            'message' => 'log',
-        ));
-        $this->assertEquals('['.date('Y-m-d').'] meh.ERROR: log [] {"ip":"127.0.0.1"}'."\n", $message);
-    }
-
-    public function testFormatExtras()
-    {
-        $formatter = new LineFormatter("[%datetime%] %channel%.%level_name%: %message% %context% %extra.file% %extra%\n", 'Y-m-d');
-        $message = $formatter->format(array(
-            'level_name' => 'ERROR',
-            'channel' => 'meh',
-            'context' => array(),
-            'datetime' => new \DateTime,
-            'extra' => array('ip' => '127.0.0.1', 'file' => 'test'),
-            'message' => 'log',
-        ));
-        $this->assertEquals('['.date('Y-m-d').'] meh.ERROR: log [] test {"ip":"127.0.0.1"}'."\n", $message);
-    }
-
-    public function testContextAndExtraOptionallyNotShownIfEmpty()
-    {
-        $formatter = new LineFormatter(null, 'Y-m-d', false, true);
-        $message = $formatter->format(array(
-            'level_name' => 'ERROR',
-            'channel' => 'meh',
-            'context' => array(),
-            'datetime' => new \DateTime,
-            'extra' => array(),
-            'message' => 'log',
-        ));
-        $this->assertEquals('['.date('Y-m-d').'] meh.ERROR: log  '."\n", $message);
-    }
-
-    public function testContextAndExtraReplacement()
-    {
-        $formatter = new LineFormatter('%context.foo% => %extra.foo%');
-        $message = $formatter->format(array(
-            'level_name' => 'ERROR',
-            'channel' => 'meh',
-            'context' => array('foo' => 'bar'),
-            'datetime' => new \DateTime,
-            'extra' => array('foo' => 'xbar'),
-            'message' => 'log',
-        ));
-        $this->assertEquals('bar => xbar', $message);
-    }
-
-    public function testDefFormatWithObject()
-    {
-        $formatter = new LineFormatter(null, 'Y-m-d');
-        $message = $formatter->format(array(
-            'level_name' => 'ERROR',
-            'channel' => 'meh',
-            'context' => array(),
-            'datetime' => new \DateTime,
-            'extra' => array('foo' => new TestFoo, 'bar' => new TestBar, 'baz' => array(), 'res' => fopen('php://memory', 'rb')),
-            'message' => 'foobar',
-        ));
-
-        $this->assertEquals('['.date('Y-m-d').'] meh.ERROR: foobar [] {"foo":"[object] (Monolog\\\\Formatter\\\\TestFoo: {\\"foo\\":\\"foo\\"})","bar":"[object] (Monolog\\\\Formatter\\\\TestBar: bar)","baz":[],"res":"[resource] (stream)"}'."\n", $message);
-    }
-
-    public function testDefFormatWithException()
-    {
-        $formatter = new LineFormatter(null, 'Y-m-d');
-        $message = $formatter->format(array(
-            'level_name' => 'CRITICAL',
-            'channel' => 'core',
-            'context' => array('exception' => new \RuntimeException('Foo')),
-            'datetime' => new \DateTime,
-            'extra' => array(),
-            'message' => 'foobar',
-        ));
-
-        $path = str_replace('\\/', '/', json_encode(__FILE__));
-
-        $this->assertEquals('['.date('Y-m-d').'] core.CRITICAL: foobar {"exception":"[object] (RuntimeException(code: 0): Foo at '.substr($path, 1, -1).':'.(__LINE__ - 8).')"} []'."\n", $message);
-    }
-
-    public function testDefFormatWithPreviousException()
-    {
-        $formatter = new LineFormatter(null, 'Y-m-d');
-        $previous = new \LogicException('Wut?');
-        $message = $formatter->format(array(
-            'level_name' => 'CRITICAL',
-            'channel' => 'core',
-            'context' => array('exception' => new \RuntimeException('Foo', 0, $previous)),
-            'datetime' => new \DateTime,
-            'extra' => array(),
-            'message' => 'foobar',
-        ));
-
-        $path = str_replace('\\/', '/', json_encode(__FILE__));
-
-        $this->assertEquals('['.date('Y-m-d').'] core.CRITICAL: foobar {"exception":"[object] (RuntimeException(code: 0): Foo at '.substr($path, 1, -1).':'.(__LINE__ - 8).', LogicException(code: 0): Wut? at '.substr($path, 1, -1).':'.(__LINE__ - 12).')"} []'."\n", $message);
-    }
-
-    public function testBatchFormat()
-    {
-        $formatter = new LineFormatter(null, 'Y-m-d');
-        $message = $formatter->formatBatch(array(
-            array(
-                'level_name' => 'CRITICAL',
-                'channel' => 'test',
-                'message' => 'bar',
-                'context' => array(),
-                'datetime' => new \DateTime,
-                'extra' => array(),
-            ),
-            array(
-                'level_name' => 'WARNING',
-                'channel' => 'log',
-                'message' => 'foo',
-                'context' => array(),
-                'datetime' => new \DateTime,
-                'extra' => array(),
-            ),
-        ));
-        $this->assertEquals('['.date('Y-m-d').'] test.CRITICAL: bar [] []'."\n".'['.date('Y-m-d').'] log.WARNING: foo [] []'."\n", $message);
-    }
-
-    public function testFormatShouldStripInlineLineBreaks()
-    {
-        $formatter = new LineFormatter(null, 'Y-m-d');
-        $message = $formatter->format(
-            array(
-                'message' => "foo\nbar",
-                'context' => array(),
-                'extra' => array(),
-            )
-        );
-
-        $this->assertRegExp('/foo bar/', $message);
-    }
-
-    public function testFormatShouldNotStripInlineLineBreaksWhenFlagIsSet()
-    {
-        $formatter = new LineFormatter(null, 'Y-m-d', true);
-        $message = $formatter->format(
-            array(
-                'message' => "foo\nbar",
-                'context' => array(),
-                'extra' => array(),
-            )
-        );
-
-        $this->assertRegExp('/foo\nbar/', $message);
-    }
-}
-
-class TestFoo
-{
-    public $foo = 'foo';
-}
-
-class TestBar
-{
-    public function __toString()
-    {
-        return 'bar';
-    }
-}
diff --git a/mayor-orig/www/include/share/googleapi/monolog/monolog/tests/Monolog/Formatter/LogglyFormatterTest.php b/mayor-orig/www/include/share/googleapi/monolog/monolog/tests/Monolog/Formatter/LogglyFormatterTest.php
deleted file mode 100644
index 6d59b3f3..00000000
--- a/mayor-orig/www/include/share/googleapi/monolog/monolog/tests/Monolog/Formatter/LogglyFormatterTest.php
+++ /dev/null
@@ -1,40 +0,0 @@
-
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Monolog\Formatter;
-
-use Monolog\TestCase;
-
-class LogglyFormatterTest extends TestCase
-{
-    /**
-     * @covers Monolog\Formatter\LogglyFormatter::__construct
-     */
-    public function testConstruct()
-    {
-        $formatter = new LogglyFormatter();
-        $this->assertEquals(LogglyFormatter::BATCH_MODE_NEWLINES, $formatter->getBatchMode());
-        $formatter = new LogglyFormatter(LogglyFormatter::BATCH_MODE_JSON);
-        $this->assertEquals(LogglyFormatter::BATCH_MODE_JSON, $formatter->getBatchMode());
-    }
-
-    /**
-     * @covers Monolog\Formatter\LogglyFormatter::format
-     */
-    public function testFormat()
-    {
-        $formatter = new LogglyFormatter();
-        $record = $this->getRecord();
-        $formatted_decoded = json_decode($formatter->format($record), true);
-        $this->assertArrayHasKey("timestamp", $formatted_decoded);
-        $this->assertEquals(new \DateTime($formatted_decoded["timestamp"]), $record["datetime"]);
-    }
-}
diff --git a/mayor-orig/www/include/share/googleapi/monolog/monolog/tests/Monolog/Formatter/LogstashFormatterTest.php b/mayor-orig/www/include/share/googleapi/monolog/monolog/tests/Monolog/Formatter/LogstashFormatterTest.php
deleted file mode 100644
index 9f6b1cc4..00000000
--- a/mayor-orig/www/include/share/googleapi/monolog/monolog/tests/Monolog/Formatter/LogstashFormatterTest.php
+++ /dev/null
@@ -1,333 +0,0 @@
-
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Monolog\Formatter;
-
-use Monolog\Logger;
-
-class LogstashFormatterTest extends \PHPUnit_Framework_TestCase
-{
-    public function tearDown()
-    {
-        \PHPUnit_Framework_Error_Warning::$enabled = true;
-
-        return parent::tearDown();
-    }
-
-    /**
-     * @covers Monolog\Formatter\LogstashFormatter::format
-     */
-    public function testDefaultFormatter()
-    {
-        $formatter = new LogstashFormatter('test', 'hostname');
-        $record = array(
-            'level' => Logger::ERROR,
-            'level_name' => 'ERROR',
-            'channel' => 'meh',
-            'context' => array(),
-            'datetime' => new \DateTime("@0"),
-            'extra' => array(),
-            'message' => 'log',
-        );
-
-        $message = json_decode($formatter->format($record), true);
-
-        $this->assertEquals("1970-01-01T00:00:00.000000+00:00", $message['@timestamp']);
-        $this->assertEquals('log', $message['@message']);
-        $this->assertEquals('meh', $message['@fields']['channel']);
-        $this->assertContains('meh', $message['@tags']);
-        $this->assertEquals(Logger::ERROR, $message['@fields']['level']);
-        $this->assertEquals('test', $message['@type']);
-        $this->assertEquals('hostname', $message['@source']);
-
-        $formatter = new LogstashFormatter('mysystem');
-
-        $message = json_decode($formatter->format($record), true);
-
-        $this->assertEquals('mysystem', $message['@type']);
-    }
-
-    /**
-     * @covers Monolog\Formatter\LogstashFormatter::format
-     */
-    public function testFormatWithFileAndLine()
-    {
-        $formatter = new LogstashFormatter('test');
-        $record = array(
-            'level' => Logger::ERROR,
-            'level_name' => 'ERROR',
-            'channel' => 'meh',
-            'context' => array('from' => 'logger'),
-            'datetime' => new \DateTime("@0"),
-            'extra' => array('file' => 'test', 'line' => 14),
-            'message' => 'log',
-        );
-
-        $message = json_decode($formatter->format($record), true);
-
-        $this->assertEquals('test', $message['@fields']['file']);
-        $this->assertEquals(14, $message['@fields']['line']);
-    }
-
-    /**
-     * @covers Monolog\Formatter\LogstashFormatter::format
-     */
-    public function testFormatWithContext()
-    {
-        $formatter = new LogstashFormatter('test');
-        $record = array(
-            'level' => Logger::ERROR,
-            'level_name' => 'ERROR',
-            'channel' => 'meh',
-            'context' => array('from' => 'logger'),
-            'datetime' => new \DateTime("@0"),
-            'extra' => array('key' => 'pair'),
-            'message' => 'log',
-        );
-
-        $message = json_decode($formatter->format($record), true);
-
-        $message_array = $message['@fields'];
-
-        $this->assertArrayHasKey('ctxt_from', $message_array);
-        $this->assertEquals('logger', $message_array['ctxt_from']);
-
-        // Test with extraPrefix
-        $formatter = new LogstashFormatter('test', null, null, 'CTX');
-        $message = json_decode($formatter->format($record), true);
-
-        $message_array = $message['@fields'];
-
-        $this->assertArrayHasKey('CTXfrom', $message_array);
-        $this->assertEquals('logger', $message_array['CTXfrom']);
-    }
-
-    /**
-     * @covers Monolog\Formatter\LogstashFormatter::format
-     */
-    public function testFormatWithExtra()
-    {
-        $formatter = new LogstashFormatter('test');
-        $record = array(
-            'level' => Logger::ERROR,
-            'level_name' => 'ERROR',
-            'channel' => 'meh',
-            'context' => array('from' => 'logger'),
-            'datetime' => new \DateTime("@0"),
-            'extra' => array('key' => 'pair'),
-            'message' => 'log',
-        );
-
-        $message = json_decode($formatter->format($record), true);
-
-        $message_array = $message['@fields'];
-
-        $this->assertArrayHasKey('key', $message_array);
-        $this->assertEquals('pair', $message_array['key']);
-
-        // Test with extraPrefix
-        $formatter = new LogstashFormatter('test', null, 'EXT');
-        $message = json_decode($formatter->format($record), true);
-
-        $message_array = $message['@fields'];
-
-        $this->assertArrayHasKey('EXTkey', $message_array);
-        $this->assertEquals('pair', $message_array['EXTkey']);
-    }
-
-    public function testFormatWithApplicationName()
-    {
-        $formatter = new LogstashFormatter('app', 'test');
-        $record = array(
-            'level' => Logger::ERROR,
-            'level_name' => 'ERROR',
-            'channel' => 'meh',
-            'context' => array('from' => 'logger'),
-            'datetime' => new \DateTime("@0"),
-            'extra' => array('key' => 'pair'),
-            'message' => 'log',
-        );
-
-        $message = json_decode($formatter->format($record), true);
-
-        $this->assertArrayHasKey('@type', $message);
-        $this->assertEquals('app', $message['@type']);
-    }
-
-    /**
-     * @covers Monolog\Formatter\LogstashFormatter::format
-     */
-    public function testDefaultFormatterV1()
-    {
-        $formatter = new LogstashFormatter('test', 'hostname', null, 'ctxt_', LogstashFormatter::V1);
-        $record = array(
-            'level' => Logger::ERROR,
-            'level_name' => 'ERROR',
-            'channel' => 'meh',
-            'context' => array(),
-            'datetime' => new \DateTime("@0"),
-            'extra' => array(),
-            'message' => 'log',
-        );
-
-        $message = json_decode($formatter->format($record), true);
-
-        $this->assertEquals("1970-01-01T00:00:00.000000+00:00", $message['@timestamp']);
-        $this->assertEquals("1", $message['@version']);
-        $this->assertEquals('log', $message['message']);
-        $this->assertEquals('meh', $message['channel']);
-        $this->assertEquals('ERROR', $message['level']);
-        $this->assertEquals('test', $message['type']);
-        $this->assertEquals('hostname', $message['host']);
-
-        $formatter = new LogstashFormatter('mysystem', null, null, 'ctxt_', LogstashFormatter::V1);
-
-        $message = json_decode($formatter->format($record), true);
-
-        $this->assertEquals('mysystem', $message['type']);
-    }
-
-    /**
-     * @covers Monolog\Formatter\LogstashFormatter::format
-     */
-    public function testFormatWithFileAndLineV1()
-    {
-        $formatter = new LogstashFormatter('test', null, null, 'ctxt_', LogstashFormatter::V1);
-        $record = array(
-            'level' => Logger::ERROR,
-            'level_name' => 'ERROR',
-            'channel' => 'meh',
-            'context' => array('from' => 'logger'),
-            'datetime' => new \DateTime("@0"),
-            'extra' => array('file' => 'test', 'line' => 14),
-            'message' => 'log',
-        );
-
-        $message = json_decode($formatter->format($record), true);
-
-        $this->assertEquals('test', $message['file']);
-        $this->assertEquals(14, $message['line']);
-    }
-
-    /**
-     * @covers Monolog\Formatter\LogstashFormatter::format
-     */
-    public function testFormatWithContextV1()
-    {
-        $formatter = new LogstashFormatter('test', null, null, 'ctxt_', LogstashFormatter::V1);
-        $record = array(
-            'level' => Logger::ERROR,
-            'level_name' => 'ERROR',
-            'channel' => 'meh',
-            'context' => array('from' => 'logger'),
-            'datetime' => new \DateTime("@0"),
-            'extra' => array('key' => 'pair'),
-            'message' => 'log',
-        );
-
-        $message = json_decode($formatter->format($record), true);
-
-        $this->assertArrayHasKey('ctxt_from', $message);
-        $this->assertEquals('logger', $message['ctxt_from']);
-
-        // Test with extraPrefix
-        $formatter = new LogstashFormatter('test', null, null, 'CTX', LogstashFormatter::V1);
-        $message = json_decode($formatter->format($record), true);
-
-        $this->assertArrayHasKey('CTXfrom', $message);
-        $this->assertEquals('logger', $message['CTXfrom']);
-    }
-
-    /**
-     * @covers Monolog\Formatter\LogstashFormatter::format
-     */
-    public function testFormatWithExtraV1()
-    {
-        $formatter = new LogstashFormatter('test', null, null, 'ctxt_', LogstashFormatter::V1);
-        $record = array(
-            'level' => Logger::ERROR,
-            'level_name' => 'ERROR',
-            'channel' => 'meh',
-            'context' => array('from' => 'logger'),
-            'datetime' => new \DateTime("@0"),
-            'extra' => array('key' => 'pair'),
-            'message' => 'log',
-        );
-
-        $message = json_decode($formatter->format($record), true);
-
-        $this->assertArrayHasKey('key', $message);
-        $this->assertEquals('pair', $message['key']);
-
-        // Test with extraPrefix
-        $formatter = new LogstashFormatter('test', null, 'EXT', 'ctxt_', LogstashFormatter::V1);
-        $message = json_decode($formatter->format($record), true);
-
-        $this->assertArrayHasKey('EXTkey', $message);
-        $this->assertEquals('pair', $message['EXTkey']);
-    }
-
-    public function testFormatWithApplicationNameV1()
-    {
-        $formatter = new LogstashFormatter('app', 'test', null, 'ctxt_', LogstashFormatter::V1);
-        $record = array(
-            'level' => Logger::ERROR,
-            'level_name' => 'ERROR',
-            'channel' => 'meh',
-            'context' => array('from' => 'logger'),
-            'datetime' => new \DateTime("@0"),
-            'extra' => array('key' => 'pair'),
-            'message' => 'log',
-        );
-
-        $message = json_decode($formatter->format($record), true);
-
-        $this->assertArrayHasKey('type', $message);
-        $this->assertEquals('app', $message['type']);
-    }
-
-    public function testFormatWithLatin9Data()
-    {
-        if (version_compare(PHP_VERSION, '5.5.0', '<')) {
-            // Ignore the warning that will be emitted by PHP <5.5.0
-            \PHPUnit_Framework_Error_Warning::$enabled = false;
-        }
-        $formatter = new LogstashFormatter('test', 'hostname');
-        $record = array(
-            'level' => Logger::ERROR,
-            'level_name' => 'ERROR',
-            'channel' => '¯\_(ツ)_/¯',
-            'context' => array(),
-            'datetime' => new \DateTime("@0"),
-            'extra' => array(
-                'user_agent' => "\xD6WN; FBCR/OrangeEspa\xF1a; Vers\xE3o/4.0; F\xE4rist",
-            ),
-            'message' => 'log',
-        );
-
-        $message = json_decode($formatter->format($record), true);
-
-        $this->assertEquals("1970-01-01T00:00:00.000000+00:00", $message['@timestamp']);
-        $this->assertEquals('log', $message['@message']);
-        $this->assertEquals('¯\_(ツ)_/¯', $message['@fields']['channel']);
-        $this->assertContains('¯\_(ツ)_/¯', $message['@tags']);
-        $this->assertEquals(Logger::ERROR, $message['@fields']['level']);
-        $this->assertEquals('test', $message['@type']);
-        $this->assertEquals('hostname', $message['@source']);
-        if (version_compare(PHP_VERSION, '5.5.0', '>=')) {
-            $this->assertEquals('ÖWN; FBCR/OrangeEspaña; Versão/4.0; Färist', $message['@fields']['user_agent']);
-        } else {
-            // PHP <5.5 does not return false for an element encoding failure,
-            // instead it emits a warning (possibly) and nulls the value.
-            $this->assertEquals(null, $message['@fields']['user_agent']);
-        }
-    }
-}
diff --git a/mayor-orig/www/include/share/googleapi/monolog/monolog/tests/Monolog/Formatter/MongoDBFormatterTest.php b/mayor-orig/www/include/share/googleapi/monolog/monolog/tests/Monolog/Formatter/MongoDBFormatterTest.php
deleted file mode 100644
index 52e699e0..00000000
--- a/mayor-orig/www/include/share/googleapi/monolog/monolog/tests/Monolog/Formatter/MongoDBFormatterTest.php
+++ /dev/null
@@ -1,262 +0,0 @@
-
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Monolog\Formatter;
-
-use Monolog\Logger;
-
-/**
- * @author Florian Plattner 
- */
-class MongoDBFormatterTest extends \PHPUnit_Framework_TestCase
-{
-    public function setUp()
-    {
-        if (!class_exists('MongoDate')) {
-            $this->markTestSkipped('mongo extension not installed');
-        }
-    }
-
-    public function constructArgumentProvider()
-    {
-        return array(
-            array(1, true, 1, true),
-            array(0, false, 0, false),
-        );
-    }
-
-    /**
-     * @param $traceDepth
-     * @param $traceAsString
-     * @param $expectedTraceDepth
-     * @param $expectedTraceAsString
-     *
-     * @dataProvider constructArgumentProvider
-     */
-    public function testConstruct($traceDepth, $traceAsString, $expectedTraceDepth, $expectedTraceAsString)
-    {
-        $formatter = new MongoDBFormatter($traceDepth, $traceAsString);
-
-        $reflTrace = new \ReflectionProperty($formatter, 'exceptionTraceAsString');
-        $reflTrace->setAccessible(true);
-        $this->assertEquals($expectedTraceAsString, $reflTrace->getValue($formatter));
-
-        $reflDepth = new\ReflectionProperty($formatter, 'maxNestingLevel');
-        $reflDepth->setAccessible(true);
-        $this->assertEquals($expectedTraceDepth, $reflDepth->getValue($formatter));
-    }
-
-    public function testSimpleFormat()
-    {
-        $record = array(
-            'message' => 'some log message',
-            'context' => array(),
-            'level' => Logger::WARNING,
-            'level_name' => Logger::getLevelName(Logger::WARNING),
-            'channel' => 'test',
-            'datetime' => new \DateTime('2014-02-01 00:00:00'),
-            'extra' => array(),
-        );
-
-        $formatter = new MongoDBFormatter();
-        $formattedRecord = $formatter->format($record);
-
-        $this->assertCount(7, $formattedRecord);
-        $this->assertEquals('some log message', $formattedRecord['message']);
-        $this->assertEquals(array(), $formattedRecord['context']);
-        $this->assertEquals(Logger::WARNING, $formattedRecord['level']);
-        $this->assertEquals(Logger::getLevelName(Logger::WARNING), $formattedRecord['level_name']);
-        $this->assertEquals('test', $formattedRecord['channel']);
-        $this->assertInstanceOf('\MongoDate', $formattedRecord['datetime']);
-        $this->assertEquals('0.00000000 1391212800', $formattedRecord['datetime']->__toString());
-        $this->assertEquals(array(), $formattedRecord['extra']);
-    }
-
-    public function testRecursiveFormat()
-    {
-        $someObject = new \stdClass();
-        $someObject->foo = 'something';
-        $someObject->bar = 'stuff';
-
-        $record = array(
-            'message' => 'some log message',
-            'context' => array(
-                'stuff' => new \DateTime('2014-02-01 02:31:33'),
-                'some_object' => $someObject,
-                'context_string' => 'some string',
-                'context_int' => 123456,
-                'except' => new \Exception('exception message', 987),
-            ),
-            'level' => Logger::WARNING,
-            'level_name' => Logger::getLevelName(Logger::WARNING),
-            'channel' => 'test',
-            'datetime' => new \DateTime('2014-02-01 00:00:00'),
-            'extra' => array(),
-        );
-
-        $formatter = new MongoDBFormatter();
-        $formattedRecord = $formatter->format($record);
-
-        $this->assertCount(5, $formattedRecord['context']);
-        $this->assertInstanceOf('\MongoDate', $formattedRecord['context']['stuff']);
-        $this->assertEquals('0.00000000 1391221893', $formattedRecord['context']['stuff']->__toString());
-        $this->assertEquals(
-            array(
-                'foo' => 'something',
-                'bar' => 'stuff',
-                'class' => 'stdClass',
-            ),
-            $formattedRecord['context']['some_object']
-        );
-        $this->assertEquals('some string', $formattedRecord['context']['context_string']);
-        $this->assertEquals(123456, $formattedRecord['context']['context_int']);
-
-        $this->assertCount(5, $formattedRecord['context']['except']);
-        $this->assertEquals('exception message', $formattedRecord['context']['except']['message']);
-        $this->assertEquals(987, $formattedRecord['context']['except']['code']);
-        $this->assertInternalType('string', $formattedRecord['context']['except']['file']);
-        $this->assertInternalType('integer', $formattedRecord['context']['except']['code']);
-        $this->assertInternalType('string', $formattedRecord['context']['except']['trace']);
-        $this->assertEquals('Exception', $formattedRecord['context']['except']['class']);
-    }
-
-    public function testFormatDepthArray()
-    {
-        $record = array(
-            'message' => 'some log message',
-            'context' => array(
-                'nest2' => array(
-                    'property' => 'anything',
-                    'nest3' => array(
-                        'nest4' => 'value',
-                        'property' => 'nothing',
-                    ),
-                ),
-            ),
-            'level' => Logger::WARNING,
-            'level_name' => Logger::getLevelName(Logger::WARNING),
-            'channel' => 'test',
-            'datetime' => new \DateTime('2014-02-01 00:00:00'),
-            'extra' => array(),
-        );
-
-        $formatter = new MongoDBFormatter(2);
-        $formattedResult = $formatter->format($record);
-
-        $this->assertEquals(
-            array(
-                'nest2' => array(
-                    'property' => 'anything',
-                    'nest3' => '[...]',
-                ),
-            ),
-            $formattedResult['context']
-        );
-    }
-
-    public function testFormatDepthArrayInfiniteNesting()
-    {
-        $record = array(
-            'message' => 'some log message',
-            'context' => array(
-                'nest2' => array(
-                    'property' => 'something',
-                    'nest3' => array(
-                        'property' => 'anything',
-                        'nest4' => array(
-                            'property' => 'nothing',
-                        ),
-                    ),
-                ),
-            ),
-            'level' => Logger::WARNING,
-            'level_name' => Logger::getLevelName(Logger::WARNING),
-            'channel' => 'test',
-            'datetime' => new \DateTime('2014-02-01 00:00:00'),
-            'extra' => array(),
-        );
-
-        $formatter = new MongoDBFormatter(0);
-        $formattedResult = $formatter->format($record);
-
-        $this->assertEquals(
-            array(
-                'nest2' => array(
-                    'property' => 'something',
-                    'nest3' => array(
-                        'property' => 'anything',
-                        'nest4' => array(
-                            'property' => 'nothing',
-                        ),
-                    ),
-                ),
-            ),
-            $formattedResult['context']
-        );
-    }
-
-    public function testFormatDepthObjects()
-    {
-        $someObject = new \stdClass();
-        $someObject->property = 'anything';
-        $someObject->nest3 = new \stdClass();
-        $someObject->nest3->property = 'nothing';
-        $someObject->nest3->nest4 = 'invisible';
-
-        $record = array(
-            'message' => 'some log message',
-            'context' => array(
-                'nest2' => $someObject,
-            ),
-            'level' => Logger::WARNING,
-            'level_name' => Logger::getLevelName(Logger::WARNING),
-            'channel' => 'test',
-            'datetime' => new \DateTime('2014-02-01 00:00:00'),
-            'extra' => array(),
-        );
-
-        $formatter = new MongoDBFormatter(2, true);
-        $formattedResult = $formatter->format($record);
-
-        $this->assertEquals(
-            array(
-                'nest2' => array(
-                    'property' => 'anything',
-                    'nest3' => '[...]',
-                    'class' => 'stdClass',
-                ),
-            ),
-            $formattedResult['context']
-        );
-    }
-
-    public function testFormatDepthException()
-    {
-        $record = array(
-            'message' => 'some log message',
-            'context' => array(
-                'nest2' => new \Exception('exception message', 987),
-            ),
-            'level' => Logger::WARNING,
-            'level_name' => Logger::getLevelName(Logger::WARNING),
-            'channel' => 'test',
-            'datetime' => new \DateTime('2014-02-01 00:00:00'),
-            'extra' => array(),
-        );
-
-        $formatter = new MongoDBFormatter(2, false);
-        $formattedRecord = $formatter->format($record);
-
-        $this->assertEquals('exception message', $formattedRecord['context']['nest2']['message']);
-        $this->assertEquals(987, $formattedRecord['context']['nest2']['code']);
-        $this->assertEquals('[...]', $formattedRecord['context']['nest2']['trace']);
-    }
-}
diff --git a/mayor-orig/www/include/share/googleapi/monolog/monolog/tests/Monolog/Formatter/NormalizerFormatterTest.php b/mayor-orig/www/include/share/googleapi/monolog/monolog/tests/Monolog/Formatter/NormalizerFormatterTest.php
deleted file mode 100644
index 57bcdf98..00000000
--- a/mayor-orig/www/include/share/googleapi/monolog/monolog/tests/Monolog/Formatter/NormalizerFormatterTest.php
+++ /dev/null
@@ -1,423 +0,0 @@
-
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Monolog\Formatter;
-
-/**
- * @covers Monolog\Formatter\NormalizerFormatter
- */
-class NormalizerFormatterTest extends \PHPUnit_Framework_TestCase
-{
-    public function tearDown()
-    {
-        \PHPUnit_Framework_Error_Warning::$enabled = true;
-
-        return parent::tearDown();
-    }
-
-    public function testFormat()
-    {
-        $formatter = new NormalizerFormatter('Y-m-d');
-        $formatted = $formatter->format(array(
-            'level_name' => 'ERROR',
-            'channel' => 'meh',
-            'message' => 'foo',
-            'datetime' => new \DateTime,
-            'extra' => array('foo' => new TestFooNorm, 'bar' => new TestBarNorm, 'baz' => array(), 'res' => fopen('php://memory', 'rb')),
-            'context' => array(
-                'foo' => 'bar',
-                'baz' => 'qux',
-                'inf' => INF,
-                '-inf' => -INF,
-                'nan' => acos(4),
-            ),
-        ));
-
-        $this->assertEquals(array(
-            'level_name' => 'ERROR',
-            'channel' => 'meh',
-            'message' => 'foo',
-            'datetime' => date('Y-m-d'),
-            'extra' => array(
-                'foo' => '[object] (Monolog\\Formatter\\TestFooNorm: {"foo":"foo"})',
-                'bar' => '[object] (Monolog\\Formatter\\TestBarNorm: bar)',
-                'baz' => array(),
-                'res' => '[resource] (stream)',
-            ),
-            'context' => array(
-                'foo' => 'bar',
-                'baz' => 'qux',
-                'inf' => 'INF',
-                '-inf' => '-INF',
-                'nan' => 'NaN',
-            ),
-        ), $formatted);
-    }
-
-    public function testFormatExceptions()
-    {
-        $formatter = new NormalizerFormatter('Y-m-d');
-        $e = new \LogicException('bar');
-        $e2 = new \RuntimeException('foo', 0, $e);
-        $formatted = $formatter->format(array(
-            'exception' => $e2,
-        ));
-
-        $this->assertGreaterThan(5, count($formatted['exception']['trace']));
-        $this->assertTrue(isset($formatted['exception']['previous']));
-        unset($formatted['exception']['trace'], $formatted['exception']['previous']);
-
-        $this->assertEquals(array(
-            'exception' => array(
-                'class'   => get_class($e2),
-                'message' => $e2->getMessage(),
-                'code'    => $e2->getCode(),
-                'file'    => $e2->getFile().':'.$e2->getLine(),
-            ),
-        ), $formatted);
-    }
-
-    public function testFormatSoapFaultException()
-    {
-        if (!class_exists('SoapFault')) {
-            $this->markTestSkipped('Requires the soap extension');
-        }
-
-        $formatter = new NormalizerFormatter('Y-m-d');
-        $e = new \SoapFault('foo', 'bar', 'hello', 'world');
-        $formatted = $formatter->format(array(
-            'exception' => $e,
-        ));
-
-        unset($formatted['exception']['trace']);
-
-        $this->assertEquals(array(
-            'exception' => array(
-                'class' => 'SoapFault',
-                'message' => 'bar',
-                'code' => 0,
-                'file' => $e->getFile().':'.$e->getLine(),
-                'faultcode' => 'foo',
-                'faultactor' => 'hello',
-                'detail' => 'world',
-            ),
-        ), $formatted);
-    }
-
-    public function testFormatToStringExceptionHandle()
-    {
-        $formatter = new NormalizerFormatter('Y-m-d');
-        $this->setExpectedException('RuntimeException', 'Could not convert to string');
-        $formatter->format(array(
-            'myObject' => new TestToStringError(),
-        ));
-    }
-
-    public function testBatchFormat()
-    {
-        $formatter = new NormalizerFormatter('Y-m-d');
-        $formatted = $formatter->formatBatch(array(
-            array(
-                'level_name' => 'CRITICAL',
-                'channel' => 'test',
-                'message' => 'bar',
-                'context' => array(),
-                'datetime' => new \DateTime,
-                'extra' => array(),
-            ),
-            array(
-                'level_name' => 'WARNING',
-                'channel' => 'log',
-                'message' => 'foo',
-                'context' => array(),
-                'datetime' => new \DateTime,
-                'extra' => array(),
-            ),
-        ));
-        $this->assertEquals(array(
-            array(
-                'level_name' => 'CRITICAL',
-                'channel' => 'test',
-                'message' => 'bar',
-                'context' => array(),
-                'datetime' => date('Y-m-d'),
-                'extra' => array(),
-            ),
-            array(
-                'level_name' => 'WARNING',
-                'channel' => 'log',
-                'message' => 'foo',
-                'context' => array(),
-                'datetime' => date('Y-m-d'),
-                'extra' => array(),
-            ),
-        ), $formatted);
-    }
-
-    /**
-     * Test issue #137
-     */
-    public function testIgnoresRecursiveObjectReferences()
-    {
-        // set up the recursion
-        $foo = new \stdClass();
-        $bar = new \stdClass();
-
-        $foo->bar = $bar;
-        $bar->foo = $foo;
-
-        // set an error handler to assert that the error is not raised anymore
-        $that = $this;
-        set_error_handler(function ($level, $message, $file, $line, $context) use ($that) {
-            if (error_reporting() & $level) {
-                restore_error_handler();
-                $that->fail("$message should not be raised");
-            }
-        });
-
-        $formatter = new NormalizerFormatter();
-        $reflMethod = new \ReflectionMethod($formatter, 'toJson');
-        $reflMethod->setAccessible(true);
-        $res = $reflMethod->invoke($formatter, array($foo, $bar), true);
-
-        restore_error_handler();
-
-        $this->assertEquals(@json_encode(array($foo, $bar)), $res);
-    }
-
-    public function testIgnoresInvalidTypes()
-    {
-        // set up the recursion
-        $resource = fopen(__FILE__, 'r');
-
-        // set an error handler to assert that the error is not raised anymore
-        $that = $this;
-        set_error_handler(function ($level, $message, $file, $line, $context) use ($that) {
-            if (error_reporting() & $level) {
-                restore_error_handler();
-                $that->fail("$message should not be raised");
-            }
-        });
-
-        $formatter = new NormalizerFormatter();
-        $reflMethod = new \ReflectionMethod($formatter, 'toJson');
-        $reflMethod->setAccessible(true);
-        $res = $reflMethod->invoke($formatter, array($resource), true);
-
-        restore_error_handler();
-
-        $this->assertEquals(@json_encode(array($resource)), $res);
-    }
-
-    public function testNormalizeHandleLargeArrays()
-    {
-        $formatter = new NormalizerFormatter();
-        $largeArray = range(1, 2000);
-
-        $res = $formatter->format(array(
-            'level_name' => 'CRITICAL',
-            'channel' => 'test',
-            'message' => 'bar',
-            'context' => array($largeArray),
-            'datetime' => new \DateTime,
-            'extra' => array(),
-        ));
-
-        $this->assertCount(1000, $res['context'][0]);
-        $this->assertEquals('Over 1000 items (2000 total), aborting normalization', $res['context'][0]['...']);
-    }
-
-    /**
-     * @expectedException RuntimeException
-     */
-    public function testThrowsOnInvalidEncoding()
-    {
-        if (version_compare(PHP_VERSION, '5.5.0', '<')) {
-            // Ignore the warning that will be emitted by PHP <5.5.0
-            \PHPUnit_Framework_Error_Warning::$enabled = false;
-        }
-        $formatter = new NormalizerFormatter();
-        $reflMethod = new \ReflectionMethod($formatter, 'toJson');
-        $reflMethod->setAccessible(true);
-
-        // send an invalid unicode sequence as a object that can't be cleaned
-        $record = new \stdClass;
-        $record->message = "\xB1\x31";
-        $res = $reflMethod->invoke($formatter, $record);
-        if (PHP_VERSION_ID < 50500 && $res === '{"message":null}') {
-            throw new \RuntimeException('PHP 5.3/5.4 throw a warning and null the value instead of returning false entirely');
-        }
-    }
-
-    public function testConvertsInvalidEncodingAsLatin9()
-    {
-        if (version_compare(PHP_VERSION, '5.5.0', '<')) {
-            // Ignore the warning that will be emitted by PHP <5.5.0
-            \PHPUnit_Framework_Error_Warning::$enabled = false;
-        }
-        $formatter = new NormalizerFormatter();
-        $reflMethod = new \ReflectionMethod($formatter, 'toJson');
-        $reflMethod->setAccessible(true);
-
-        $res = $reflMethod->invoke($formatter, array('message' => "\xA4\xA6\xA8\xB4\xB8\xBC\xBD\xBE"));
-
-        if (version_compare(PHP_VERSION, '5.5.0', '>=')) {
-            $this->assertSame('{"message":"€ŠšŽžŒœŸ"}', $res);
-        } else {
-            // PHP <5.5 does not return false for an element encoding failure,
-            // instead it emits a warning (possibly) and nulls the value.
-            $this->assertSame('{"message":null}', $res);
-        }
-    }
-
-    /**
-     * @param mixed $in     Input
-     * @param mixed $expect Expected output
-     * @covers Monolog\Formatter\NormalizerFormatter::detectAndCleanUtf8
-     * @dataProvider providesDetectAndCleanUtf8
-     */
-    public function testDetectAndCleanUtf8($in, $expect)
-    {
-        $formatter = new NormalizerFormatter();
-        $formatter->detectAndCleanUtf8($in);
-        $this->assertSame($expect, $in);
-    }
-
-    public function providesDetectAndCleanUtf8()
-    {
-        $obj = new \stdClass;
-
-        return array(
-            'null' => array(null, null),
-            'int' => array(123, 123),
-            'float' => array(123.45, 123.45),
-            'bool false' => array(false, false),
-            'bool true' => array(true, true),
-            'ascii string' => array('abcdef', 'abcdef'),
-            'latin9 string' => array("\xB1\x31\xA4\xA6\xA8\xB4\xB8\xBC\xBD\xBE\xFF", '±1€ŠšŽžŒœŸÿ'),
-            'unicode string' => array('¤¦¨´¸¼½¾€ŠšŽžŒœŸ', '¤¦¨´¸¼½¾€ŠšŽžŒœŸ'),
-            'empty array' => array(array(), array()),
-            'array' => array(array('abcdef'), array('abcdef')),
-            'object' => array($obj, $obj),
-        );
-    }
-
-    /**
-     * @param int    $code
-     * @param string $msg
-     * @dataProvider providesHandleJsonErrorFailure
-     */
-    public function testHandleJsonErrorFailure($code, $msg)
-    {
-        $formatter = new NormalizerFormatter();
-        $reflMethod = new \ReflectionMethod($formatter, 'handleJsonError');
-        $reflMethod->setAccessible(true);
-
-        $this->setExpectedException('RuntimeException', $msg);
-        $reflMethod->invoke($formatter, $code, 'faked');
-    }
-
-    public function providesHandleJsonErrorFailure()
-    {
-        return array(
-            'depth' => array(JSON_ERROR_DEPTH, 'Maximum stack depth exceeded'),
-            'state' => array(JSON_ERROR_STATE_MISMATCH, 'Underflow or the modes mismatch'),
-            'ctrl' => array(JSON_ERROR_CTRL_CHAR, 'Unexpected control character found'),
-            'default' => array(-1, 'Unknown error'),
-        );
-    }
-
-    public function testExceptionTraceWithArgs()
-    {
-        if (defined('HHVM_VERSION')) {
-            $this->markTestSkipped('Not supported in HHVM since it detects errors differently');
-        }
-
-        // This happens i.e. in React promises or Guzzle streams where stream wrappers are registered
-        // and no file or line are included in the trace because it's treated as internal function
-        set_error_handler(function ($errno, $errstr, $errfile, $errline) {
-            throw new \ErrorException($errstr, 0, $errno, $errfile, $errline);
-        });
-
-        try {
-            // This will contain $resource and $wrappedResource as arguments in the trace item
-            $resource = fopen('php://memory', 'rw+');
-            fwrite($resource, 'test_resource');
-            $wrappedResource = new TestFooNorm;
-            $wrappedResource->foo = $resource;
-            // Just do something stupid with a resource/wrapped resource as argument
-            array_keys($wrappedResource);
-        } catch (\Exception $e) {
-            restore_error_handler();
-        }
-
-        $formatter = new NormalizerFormatter();
-        $record = array('context' => array('exception' => $e));
-        $result = $formatter->format($record);
-
-        $this->assertRegExp(
-            '%"resource":"\[resource\] \(stream\)"%',
-            $result['context']['exception']['trace'][0]
-        );
-
-        if (version_compare(PHP_VERSION, '5.5.0', '>=')) {
-            $pattern = '%"wrappedResource":"\[object\] \(Monolog\\\\\\\\Formatter\\\\\\\\TestFooNorm: \)"%';
-        } else {
-            $pattern = '%\\\\"foo\\\\":null%';
-        }
-
-        // Tests that the wrapped resource is ignored while encoding, only works for PHP <= 5.4
-        $this->assertRegExp(
-            $pattern,
-            $result['context']['exception']['trace'][0]
-        );
-    }
-}
-
-class TestFooNorm
-{
-    public $foo = 'foo';
-}
-
-class TestBarNorm
-{
-    public function __toString()
-    {
-        return 'bar';
-    }
-}
-
-class TestStreamFoo
-{
-    public $foo;
-    public $resource;
-
-    public function __construct($resource)
-    {
-        $this->resource = $resource;
-        $this->foo = 'BAR';
-    }
-
-    public function __toString()
-    {
-        fseek($this->resource, 0);
-
-        return $this->foo . ' - ' . (string) stream_get_contents($this->resource);
-    }
-}
-
-class TestToStringError
-{
-    public function __toString()
-    {
-        throw new \RuntimeException('Could not convert to string');
-    }
-}
diff --git a/mayor-orig/www/include/share/googleapi/monolog/monolog/tests/Monolog/Formatter/ScalarFormatterTest.php b/mayor-orig/www/include/share/googleapi/monolog/monolog/tests/Monolog/Formatter/ScalarFormatterTest.php
deleted file mode 100644
index b1c8fd49..00000000
--- a/mayor-orig/www/include/share/googleapi/monolog/monolog/tests/Monolog/Formatter/ScalarFormatterTest.php
+++ /dev/null
@@ -1,110 +0,0 @@
-
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Monolog\Formatter;
-
-class ScalarFormatterTest extends \PHPUnit_Framework_TestCase
-{
-    private $formatter;
-
-    public function setUp()
-    {
-        $this->formatter = new ScalarFormatter();
-    }
-
-    public function buildTrace(\Exception $e)
-    {
-        $data = array();
-        $trace = $e->getTrace();
-        foreach ($trace as $frame) {
-            if (isset($frame['file'])) {
-                $data[] = $frame['file'].':'.$frame['line'];
-            } else {
-                $data[] = json_encode($frame);
-            }
-        }
-
-        return $data;
-    }
-
-    public function encodeJson($data)
-    {
-        if (version_compare(PHP_VERSION, '5.4.0', '>=')) {
-            return json_encode($data, JSON_UNESCAPED_SLASHES | JSON_UNESCAPED_UNICODE);
-        }
-
-        return json_encode($data);
-    }
-
-    public function testFormat()
-    {
-        $exception = new \Exception('foo');
-        $formatted = $this->formatter->format(array(
-            'foo' => 'string',
-            'bar' => 1,
-            'baz' => false,
-            'bam' => array(1, 2, 3),
-            'bat' => array('foo' => 'bar'),
-            'bap' => \DateTime::createFromFormat(\DateTime::ISO8601, '1970-01-01T00:00:00+0000'),
-            'ban' => $exception,
-        ));
-
-        $this->assertSame(array(
-            'foo' => 'string',
-            'bar' => 1,
-            'baz' => false,
-            'bam' => $this->encodeJson(array(1, 2, 3)),
-            'bat' => $this->encodeJson(array('foo' => 'bar')),
-            'bap' => '1970-01-01 00:00:00',
-            'ban' => $this->encodeJson(array(
-                'class'   => get_class($exception),
-                'message' => $exception->getMessage(),
-                'code'    => $exception->getCode(),
-                'file'    => $exception->getFile() . ':' . $exception->getLine(),
-                'trace'   => $this->buildTrace($exception),
-            )),
-        ), $formatted);
-    }
-
-    public function testFormatWithErrorContext()
-    {
-        $context = array('file' => 'foo', 'line' => 1);
-        $formatted = $this->formatter->format(array(
-            'context' => $context,
-        ));
-
-        $this->assertSame(array(
-            'context' => $this->encodeJson($context),
-        ), $formatted);
-    }
-
-    public function testFormatWithExceptionContext()
-    {
-        $exception = new \Exception('foo');
-        $formatted = $this->formatter->format(array(
-            'context' => array(
-                'exception' => $exception,
-            ),
-        ));
-
-        $this->assertSame(array(
-            'context' => $this->encodeJson(array(
-                'exception' => array(
-                    'class'   => get_class($exception),
-                    'message' => $exception->getMessage(),
-                    'code'    => $exception->getCode(),
-                    'file'    => $exception->getFile() . ':' . $exception->getLine(),
-                    'trace'   => $this->buildTrace($exception),
-                ),
-            )),
-        ), $formatted);
-    }
-}
diff --git a/mayor-orig/www/include/share/googleapi/monolog/monolog/tests/Monolog/Formatter/WildfireFormatterTest.php b/mayor-orig/www/include/share/googleapi/monolog/monolog/tests/Monolog/Formatter/WildfireFormatterTest.php
deleted file mode 100644
index 52f15a36..00000000
--- a/mayor-orig/www/include/share/googleapi/monolog/monolog/tests/Monolog/Formatter/WildfireFormatterTest.php
+++ /dev/null
@@ -1,142 +0,0 @@
-
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Monolog\Formatter;
-
-use Monolog\Logger;
-
-class WildfireFormatterTest extends \PHPUnit_Framework_TestCase
-{
-    /**
-     * @covers Monolog\Formatter\WildfireFormatter::format
-     */
-    public function testDefaultFormat()
-    {
-        $wildfire = new WildfireFormatter();
-        $record = array(
-            'level' => Logger::ERROR,
-            'level_name' => 'ERROR',
-            'channel' => 'meh',
-            'context' => array('from' => 'logger'),
-            'datetime' => new \DateTime("@0"),
-            'extra' => array('ip' => '127.0.0.1'),
-            'message' => 'log',
-        );
-
-        $message = $wildfire->format($record);
-
-        $this->assertEquals(
-            '125|[{"Type":"ERROR","File":"","Line":"","Label":"meh"},'
-                .'{"message":"log","context":{"from":"logger"},"extra":{"ip":"127.0.0.1"}}]|',
-            $message
-        );
-    }
-
-    /**
-     * @covers Monolog\Formatter\WildfireFormatter::format
-     */
-    public function testFormatWithFileAndLine()
-    {
-        $wildfire = new WildfireFormatter();
-        $record = array(
-            'level' => Logger::ERROR,
-            'level_name' => 'ERROR',
-            'channel' => 'meh',
-            'context' => array('from' => 'logger'),
-            'datetime' => new \DateTime("@0"),
-            'extra' => array('ip' => '127.0.0.1', 'file' => 'test', 'line' => 14),
-            'message' => 'log',
-        );
-
-        $message = $wildfire->format($record);
-
-        $this->assertEquals(
-            '129|[{"Type":"ERROR","File":"test","Line":14,"Label":"meh"},'
-                .'{"message":"log","context":{"from":"logger"},"extra":{"ip":"127.0.0.1"}}]|',
-            $message
-        );
-    }
-
-    /**
-     * @covers Monolog\Formatter\WildfireFormatter::format
-     */
-    public function testFormatWithoutContext()
-    {
-        $wildfire = new WildfireFormatter();
-        $record = array(
-            'level' => Logger::ERROR,
-            'level_name' => 'ERROR',
-            'channel' => 'meh',
-            'context' => array(),
-            'datetime' => new \DateTime("@0"),
-            'extra' => array(),
-            'message' => 'log',
-        );
-
-        $message = $wildfire->format($record);
-
-        $this->assertEquals(
-            '58|[{"Type":"ERROR","File":"","Line":"","Label":"meh"},"log"]|',
-            $message
-        );
-    }
-
-    /**
-     * @covers Monolog\Formatter\WildfireFormatter::formatBatch
-     * @expectedException BadMethodCallException
-     */
-    public function testBatchFormatThrowException()
-    {
-        $wildfire = new WildfireFormatter();
-        $record = array(
-            'level' => Logger::ERROR,
-            'level_name' => 'ERROR',
-            'channel' => 'meh',
-            'context' => array(),
-            'datetime' => new \DateTime("@0"),
-            'extra' => array(),
-            'message' => 'log',
-        );
-
-        $wildfire->formatBatch(array($record));
-    }
-
-    /**
-     * @covers Monolog\Formatter\WildfireFormatter::format
-     */
-    public function testTableFormat()
-    {
-        $wildfire = new WildfireFormatter();
-        $record = array(
-            'level' => Logger::ERROR,
-            'level_name' => 'ERROR',
-            'channel' => 'table-channel',
-            'context' => array(
-            WildfireFormatter::TABLE => array(
-                    array('col1', 'col2', 'col3'),
-                    array('val1', 'val2', 'val3'),
-                    array('foo1', 'foo2', 'foo3'),
-                    array('bar1', 'bar2', 'bar3'),
-                ),
-            ),
-            'datetime' => new \DateTime("@0"),
-            'extra' => array(),
-            'message' => 'table-message',
-        );
-
-        $message = $wildfire->format($record);
-
-        $this->assertEquals(
-            '171|[{"Type":"TABLE","File":"","Line":"","Label":"table-channel: table-message"},[["col1","col2","col3"],["val1","val2","val3"],["foo1","foo2","foo3"],["bar1","bar2","bar3"]]]|',
-            $message
-        );
-    }
-}
diff --git a/mayor-orig/www/include/share/googleapi/monolog/monolog/tests/Monolog/Handler/AbstractHandlerTest.php b/mayor-orig/www/include/share/googleapi/monolog/monolog/tests/Monolog/Handler/AbstractHandlerTest.php
deleted file mode 100644
index 568eb9da..00000000
--- a/mayor-orig/www/include/share/googleapi/monolog/monolog/tests/Monolog/Handler/AbstractHandlerTest.php
+++ /dev/null
@@ -1,115 +0,0 @@
-
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Monolog\Handler;
-
-use Monolog\TestCase;
-use Monolog\Logger;
-use Monolog\Formatter\LineFormatter;
-use Monolog\Processor\WebProcessor;
-
-class AbstractHandlerTest extends TestCase
-{
-    /**
-     * @covers Monolog\Handler\AbstractHandler::__construct
-     * @covers Monolog\Handler\AbstractHandler::getLevel
-     * @covers Monolog\Handler\AbstractHandler::setLevel
-     * @covers Monolog\Handler\AbstractHandler::getBubble
-     * @covers Monolog\Handler\AbstractHandler::setBubble
-     * @covers Monolog\Handler\AbstractHandler::getFormatter
-     * @covers Monolog\Handler\AbstractHandler::setFormatter
-     */
-    public function testConstructAndGetSet()
-    {
-        $handler = $this->getMockForAbstractClass('Monolog\Handler\AbstractHandler', array(Logger::WARNING, false));
-        $this->assertEquals(Logger::WARNING, $handler->getLevel());
-        $this->assertEquals(false, $handler->getBubble());
-
-        $handler->setLevel(Logger::ERROR);
-        $handler->setBubble(true);
-        $handler->setFormatter($formatter = new LineFormatter);
-        $this->assertEquals(Logger::ERROR, $handler->getLevel());
-        $this->assertEquals(true, $handler->getBubble());
-        $this->assertSame($formatter, $handler->getFormatter());
-    }
-
-    /**
-     * @covers Monolog\Handler\AbstractHandler::handleBatch
-     */
-    public function testHandleBatch()
-    {
-        $handler = $this->getMockForAbstractClass('Monolog\Handler\AbstractHandler');
-        $handler->expects($this->exactly(2))
-            ->method('handle');
-        $handler->handleBatch(array($this->getRecord(), $this->getRecord()));
-    }
-
-    /**
-     * @covers Monolog\Handler\AbstractHandler::isHandling
-     */
-    public function testIsHandling()
-    {
-        $handler = $this->getMockForAbstractClass('Monolog\Handler\AbstractHandler', array(Logger::WARNING, false));
-        $this->assertTrue($handler->isHandling($this->getRecord()));
-        $this->assertFalse($handler->isHandling($this->getRecord(Logger::DEBUG)));
-    }
-
-    /**
-     * @covers Monolog\Handler\AbstractHandler::__construct
-     */
-    public function testHandlesPsrStyleLevels()
-    {
-        $handler = $this->getMockForAbstractClass('Monolog\Handler\AbstractHandler', array('warning', false));
-        $this->assertFalse($handler->isHandling($this->getRecord(Logger::DEBUG)));
-        $handler->setLevel('debug');
-        $this->assertTrue($handler->isHandling($this->getRecord(Logger::DEBUG)));
-    }
-
-    /**
-     * @covers Monolog\Handler\AbstractHandler::getFormatter
-     * @covers Monolog\Handler\AbstractHandler::getDefaultFormatter
-     */
-    public function testGetFormatterInitializesDefault()
-    {
-        $handler = $this->getMockForAbstractClass('Monolog\Handler\AbstractHandler');
-        $this->assertInstanceOf('Monolog\Formatter\LineFormatter', $handler->getFormatter());
-    }
-
-    /**
-     * @covers Monolog\Handler\AbstractHandler::pushProcessor
-     * @covers Monolog\Handler\AbstractHandler::popProcessor
-     * @expectedException LogicException
-     */
-    public function testPushPopProcessor()
-    {
-        $logger = $this->getMockForAbstractClass('Monolog\Handler\AbstractHandler');
-        $processor1 = new WebProcessor;
-        $processor2 = new WebProcessor;
-
-        $logger->pushProcessor($processor1);
-        $logger->pushProcessor($processor2);
-
-        $this->assertEquals($processor2, $logger->popProcessor());
-        $this->assertEquals($processor1, $logger->popProcessor());
-        $logger->popProcessor();
-    }
-
-    /**
-     * @covers Monolog\Handler\AbstractHandler::pushProcessor
-     * @expectedException InvalidArgumentException
-     */
-    public function testPushProcessorWithNonCallable()
-    {
-        $handler = $this->getMockForAbstractClass('Monolog\Handler\AbstractHandler');
-
-        $handler->pushProcessor(new \stdClass());
-    }
-}
diff --git a/mayor-orig/www/include/share/googleapi/monolog/monolog/tests/Monolog/Handler/AbstractProcessingHandlerTest.php b/mayor-orig/www/include/share/googleapi/monolog/monolog/tests/Monolog/Handler/AbstractProcessingHandlerTest.php
deleted file mode 100644
index 24d4f63c..00000000
--- a/mayor-orig/www/include/share/googleapi/monolog/monolog/tests/Monolog/Handler/AbstractProcessingHandlerTest.php
+++ /dev/null
@@ -1,80 +0,0 @@
-
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Monolog\Handler;
-
-use Monolog\TestCase;
-use Monolog\Logger;
-use Monolog\Processor\WebProcessor;
-
-class AbstractProcessingHandlerTest extends TestCase
-{
-    /**
-     * @covers Monolog\Handler\AbstractProcessingHandler::handle
-     */
-    public function testHandleLowerLevelMessage()
-    {
-        $handler = $this->getMockForAbstractClass('Monolog\Handler\AbstractProcessingHandler', array(Logger::WARNING, true));
-        $this->assertFalse($handler->handle($this->getRecord(Logger::DEBUG)));
-    }
-
-    /**
-     * @covers Monolog\Handler\AbstractProcessingHandler::handle
-     */
-    public function testHandleBubbling()
-    {
-        $handler = $this->getMockForAbstractClass('Monolog\Handler\AbstractProcessingHandler', array(Logger::DEBUG, true));
-        $this->assertFalse($handler->handle($this->getRecord()));
-    }
-
-    /**
-     * @covers Monolog\Handler\AbstractProcessingHandler::handle
-     */
-    public function testHandleNotBubbling()
-    {
-        $handler = $this->getMockForAbstractClass('Monolog\Handler\AbstractProcessingHandler', array(Logger::DEBUG, false));
-        $this->assertTrue($handler->handle($this->getRecord()));
-    }
-
-    /**
-     * @covers Monolog\Handler\AbstractProcessingHandler::handle
-     */
-    public function testHandleIsFalseWhenNotHandled()
-    {
-        $handler = $this->getMockForAbstractClass('Monolog\Handler\AbstractProcessingHandler', array(Logger::WARNING, false));
-        $this->assertTrue($handler->handle($this->getRecord()));
-        $this->assertFalse($handler->handle($this->getRecord(Logger::DEBUG)));
-    }
-
-    /**
-     * @covers Monolog\Handler\AbstractProcessingHandler::processRecord
-     */
-    public function testProcessRecord()
-    {
-        $handler = $this->getMockForAbstractClass('Monolog\Handler\AbstractProcessingHandler');
-        $handler->pushProcessor(new WebProcessor(array(
-            'REQUEST_URI' => '',
-            'REQUEST_METHOD' => '',
-            'REMOTE_ADDR' => '',
-            'SERVER_NAME' => '',
-            'UNIQUE_ID' => '',
-        )));
-        $handledRecord = null;
-        $handler->expects($this->once())
-            ->method('write')
-            ->will($this->returnCallback(function ($record) use (&$handledRecord) {
-                $handledRecord = $record;
-            }))
-        ;
-        $handler->handle($this->getRecord());
-        $this->assertEquals(6, count($handledRecord['extra']));
-    }
-}
diff --git a/mayor-orig/www/include/share/googleapi/monolog/monolog/tests/Monolog/Handler/AmqpHandlerTest.php b/mayor-orig/www/include/share/googleapi/monolog/monolog/tests/Monolog/Handler/AmqpHandlerTest.php
deleted file mode 100644
index 8e0e7237..00000000
--- a/mayor-orig/www/include/share/googleapi/monolog/monolog/tests/Monolog/Handler/AmqpHandlerTest.php
+++ /dev/null
@@ -1,136 +0,0 @@
-
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Monolog\Handler;
-
-use Monolog\TestCase;
-use Monolog\Logger;
-use PhpAmqpLib\Message\AMQPMessage;
-use PhpAmqpLib\Connection\AMQPConnection;
-
-/**
- * @covers Monolog\Handler\RotatingFileHandler
- */
-class AmqpHandlerTest extends TestCase
-{
-    public function testHandleAmqpExt()
-    {
-        if (!class_exists('AMQPConnection') || !class_exists('AMQPExchange')) {
-            $this->markTestSkipped("amqp-php not installed");
-        }
-
-        if (!class_exists('AMQPChannel')) {
-            $this->markTestSkipped("Please update AMQP to version >= 1.0");
-        }
-
-        $messages = array();
-
-        $exchange = $this->getMock('AMQPExchange', array('publish', 'setName'), array(), '', false);
-        $exchange->expects($this->once())
-            ->method('setName')
-            ->with('log')
-        ;
-        $exchange->expects($this->any())
-            ->method('publish')
-            ->will($this->returnCallback(function ($message, $routing_key, $flags = 0, $attributes = array()) use (&$messages) {
-                $messages[] = array($message, $routing_key, $flags, $attributes);
-            }))
-        ;
-
-        $handler = new AmqpHandler($exchange, 'log');
-
-        $record = $this->getRecord(Logger::WARNING, 'test', array('data' => new \stdClass, 'foo' => 34));
-
-        $expected = array(
-            array(
-                'message' => 'test',
-                'context' => array(
-                    'data' => array(),
-                    'foo' => 34,
-                ),
-                'level' => 300,
-                'level_name' => 'WARNING',
-                'channel' => 'test',
-                'extra' => array(),
-            ),
-            'warn.test',
-            0,
-            array(
-                'delivery_mode' => 2,
-                'content_type' => 'application/json',
-            ),
-        );
-
-        $handler->handle($record);
-
-        $this->assertCount(1, $messages);
-        $messages[0][0] = json_decode($messages[0][0], true);
-        unset($messages[0][0]['datetime']);
-        $this->assertEquals($expected, $messages[0]);
-    }
-
-    public function testHandlePhpAmqpLib()
-    {
-        if (!class_exists('PhpAmqpLib\Connection\AMQPConnection')) {
-            $this->markTestSkipped("php-amqplib not installed");
-        }
-
-        $messages = array();
-
-        $exchange = $this->getMock('PhpAmqpLib\Channel\AMQPChannel', array('basic_publish', '__destruct'), array(), '', false);
-
-        $exchange->expects($this->any())
-            ->method('basic_publish')
-            ->will($this->returnCallback(function (AMQPMessage $msg, $exchange = "", $routing_key = "", $mandatory = false, $immediate = false, $ticket = null) use (&$messages) {
-                $messages[] = array($msg, $exchange, $routing_key, $mandatory, $immediate, $ticket);
-            }))
-        ;
-
-        $handler = new AmqpHandler($exchange, 'log');
-
-        $record = $this->getRecord(Logger::WARNING, 'test', array('data' => new \stdClass, 'foo' => 34));
-
-        $expected = array(
-            array(
-                'message' => 'test',
-                'context' => array(
-                    'data' => array(),
-                    'foo' => 34,
-                ),
-                'level' => 300,
-                'level_name' => 'WARNING',
-                'channel' => 'test',
-                'extra' => array(),
-            ),
-            'log',
-            'warn.test',
-            false,
-            false,
-            null,
-            array(
-                'delivery_mode' => 2,
-                'content_type' => 'application/json',
-            ),
-        );
-
-        $handler->handle($record);
-
-        $this->assertCount(1, $messages);
-
-        /* @var $msg AMQPMessage */
-        $msg = $messages[0][0];
-        $messages[0][0] = json_decode($msg->body, true);
-        $messages[0][] = $msg->get_properties();
-        unset($messages[0][0]['datetime']);
-
-        $this->assertEquals($expected, $messages[0]);
-    }
-}
diff --git a/mayor-orig/www/include/share/googleapi/monolog/monolog/tests/Monolog/Handler/BrowserConsoleHandlerTest.php b/mayor-orig/www/include/share/googleapi/monolog/monolog/tests/Monolog/Handler/BrowserConsoleHandlerTest.php
deleted file mode 100644
index ffb1d746..00000000
--- a/mayor-orig/www/include/share/googleapi/monolog/monolog/tests/Monolog/Handler/BrowserConsoleHandlerTest.php
+++ /dev/null
@@ -1,130 +0,0 @@
-
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Monolog\Handler;
-
-use Monolog\TestCase;
-use Monolog\Logger;
-
-/**
- * @covers Monolog\Handler\BrowserConsoleHandlerTest
- */
-class BrowserConsoleHandlerTest extends TestCase
-{
-    protected function setUp()
-    {
-        BrowserConsoleHandler::reset();
-    }
-
-    protected function generateScript()
-    {
-        $reflMethod = new \ReflectionMethod('Monolog\Handler\BrowserConsoleHandler', 'generateScript');
-        $reflMethod->setAccessible(true);
-
-        return $reflMethod->invoke(null);
-    }
-
-    public function testStyling()
-    {
-        $handler = new BrowserConsoleHandler();
-        $handler->setFormatter($this->getIdentityFormatter());
-
-        $handler->handle($this->getRecord(Logger::DEBUG, 'foo[[bar]]{color: red}'));
-
-        $expected = <<assertEquals($expected, $this->generateScript());
-    }
-
-    public function testEscaping()
-    {
-        $handler = new BrowserConsoleHandler();
-        $handler->setFormatter($this->getIdentityFormatter());
-
-        $handler->handle($this->getRecord(Logger::DEBUG, "[foo] [[\"bar\n[baz]\"]]{color: red}"));
-
-        $expected = <<assertEquals($expected, $this->generateScript());
-    }
-
-    public function testAutolabel()
-    {
-        $handler = new BrowserConsoleHandler();
-        $handler->setFormatter($this->getIdentityFormatter());
-
-        $handler->handle($this->getRecord(Logger::DEBUG, '[[foo]]{macro: autolabel}'));
-        $handler->handle($this->getRecord(Logger::DEBUG, '[[bar]]{macro: autolabel}'));
-        $handler->handle($this->getRecord(Logger::DEBUG, '[[foo]]{macro: autolabel}'));
-
-        $expected = <<assertEquals($expected, $this->generateScript());
-    }
-
-    public function testContext()
-    {
-        $handler = new BrowserConsoleHandler();
-        $handler->setFormatter($this->getIdentityFormatter());
-
-        $handler->handle($this->getRecord(Logger::DEBUG, 'test', array('foo' => 'bar')));
-
-        $expected = <<assertEquals($expected, $this->generateScript());
-    }
-
-    public function testConcurrentHandlers()
-    {
-        $handler1 = new BrowserConsoleHandler();
-        $handler1->setFormatter($this->getIdentityFormatter());
-
-        $handler2 = new BrowserConsoleHandler();
-        $handler2->setFormatter($this->getIdentityFormatter());
-
-        $handler1->handle($this->getRecord(Logger::DEBUG, 'test1'));
-        $handler2->handle($this->getRecord(Logger::DEBUG, 'test2'));
-        $handler1->handle($this->getRecord(Logger::DEBUG, 'test3'));
-        $handler2->handle($this->getRecord(Logger::DEBUG, 'test4'));
-
-        $expected = <<assertEquals($expected, $this->generateScript());
-    }
-}
diff --git a/mayor-orig/www/include/share/googleapi/monolog/monolog/tests/Monolog/Handler/BufferHandlerTest.php b/mayor-orig/www/include/share/googleapi/monolog/monolog/tests/Monolog/Handler/BufferHandlerTest.php
deleted file mode 100644
index da8b3c39..00000000
--- a/mayor-orig/www/include/share/googleapi/monolog/monolog/tests/Monolog/Handler/BufferHandlerTest.php
+++ /dev/null
@@ -1,158 +0,0 @@
-
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Monolog\Handler;
-
-use Monolog\TestCase;
-use Monolog\Logger;
-
-class BufferHandlerTest extends TestCase
-{
-    private $shutdownCheckHandler;
-
-    /**
-     * @covers Monolog\Handler\BufferHandler::__construct
-     * @covers Monolog\Handler\BufferHandler::handle
-     * @covers Monolog\Handler\BufferHandler::close
-     */
-    public function testHandleBuffers()
-    {
-        $test = new TestHandler();
-        $handler = new BufferHandler($test);
-        $handler->handle($this->getRecord(Logger::DEBUG));
-        $handler->handle($this->getRecord(Logger::INFO));
-        $this->assertFalse($test->hasDebugRecords());
-        $this->assertFalse($test->hasInfoRecords());
-        $handler->close();
-        $this->assertTrue($test->hasInfoRecords());
-        $this->assertTrue(count($test->getRecords()) === 2);
-    }
-
-    /**
-     * @covers Monolog\Handler\BufferHandler::close
-     * @covers Monolog\Handler\BufferHandler::flush
-     */
-    public function testPropagatesRecordsAtEndOfRequest()
-    {
-        $test = new TestHandler();
-        $handler = new BufferHandler($test);
-        $handler->handle($this->getRecord(Logger::WARNING));
-        $handler->handle($this->getRecord(Logger::DEBUG));
-        $this->shutdownCheckHandler = $test;
-        register_shutdown_function(array($this, 'checkPropagation'));
-    }
-
-    public function checkPropagation()
-    {
-        if (!$this->shutdownCheckHandler->hasWarningRecords() || !$this->shutdownCheckHandler->hasDebugRecords()) {
-            echo '!!! BufferHandlerTest::testPropagatesRecordsAtEndOfRequest failed to verify that the messages have been propagated' . PHP_EOL;
-            exit(1);
-        }
-    }
-
-    /**
-     * @covers Monolog\Handler\BufferHandler::handle
-     */
-    public function testHandleBufferLimit()
-    {
-        $test = new TestHandler();
-        $handler = new BufferHandler($test, 2);
-        $handler->handle($this->getRecord(Logger::DEBUG));
-        $handler->handle($this->getRecord(Logger::DEBUG));
-        $handler->handle($this->getRecord(Logger::INFO));
-        $handler->handle($this->getRecord(Logger::WARNING));
-        $handler->close();
-        $this->assertTrue($test->hasWarningRecords());
-        $this->assertTrue($test->hasInfoRecords());
-        $this->assertFalse($test->hasDebugRecords());
-    }
-
-    /**
-     * @covers Monolog\Handler\BufferHandler::handle
-     */
-    public function testHandleBufferLimitWithFlushOnOverflow()
-    {
-        $test = new TestHandler();
-        $handler = new BufferHandler($test, 3, Logger::DEBUG, true, true);
-
-        // send two records
-        $handler->handle($this->getRecord(Logger::DEBUG));
-        $handler->handle($this->getRecord(Logger::DEBUG));
-        $handler->handle($this->getRecord(Logger::DEBUG));
-        $this->assertFalse($test->hasDebugRecords());
-        $this->assertCount(0, $test->getRecords());
-
-        // overflow
-        $handler->handle($this->getRecord(Logger::INFO));
-        $this->assertTrue($test->hasDebugRecords());
-        $this->assertCount(3, $test->getRecords());
-
-        // should buffer again
-        $handler->handle($this->getRecord(Logger::WARNING));
-        $this->assertCount(3, $test->getRecords());
-
-        $handler->close();
-        $this->assertCount(5, $test->getRecords());
-        $this->assertTrue($test->hasWarningRecords());
-        $this->assertTrue($test->hasInfoRecords());
-    }
-
-    /**
-     * @covers Monolog\Handler\BufferHandler::handle
-     */
-    public function testHandleLevel()
-    {
-        $test = new TestHandler();
-        $handler = new BufferHandler($test, 0, Logger::INFO);
-        $handler->handle($this->getRecord(Logger::DEBUG));
-        $handler->handle($this->getRecord(Logger::INFO));
-        $handler->handle($this->getRecord(Logger::WARNING));
-        $handler->handle($this->getRecord(Logger::DEBUG));
-        $handler->close();
-        $this->assertTrue($test->hasWarningRecords());
-        $this->assertTrue($test->hasInfoRecords());
-        $this->assertFalse($test->hasDebugRecords());
-    }
-
-    /**
-     * @covers Monolog\Handler\BufferHandler::flush
-     */
-    public function testFlush()
-    {
-        $test = new TestHandler();
-        $handler = new BufferHandler($test, 0);
-        $handler->handle($this->getRecord(Logger::DEBUG));
-        $handler->handle($this->getRecord(Logger::INFO));
-        $handler->flush();
-        $this->assertTrue($test->hasInfoRecords());
-        $this->assertTrue($test->hasDebugRecords());
-        $this->assertFalse($test->hasWarningRecords());
-    }
-
-    /**
-     * @covers Monolog\Handler\BufferHandler::handle
-     */
-    public function testHandleUsesProcessors()
-    {
-        $test = new TestHandler();
-        $handler = new BufferHandler($test);
-        $handler->pushProcessor(function ($record) {
-            $record['extra']['foo'] = true;
-
-            return $record;
-        });
-        $handler->handle($this->getRecord(Logger::WARNING));
-        $handler->flush();
-        $this->assertTrue($test->hasWarningRecords());
-        $records = $test->getRecords();
-        $this->assertTrue($records[0]['extra']['foo']);
-    }
-}
diff --git a/mayor-orig/www/include/share/googleapi/monolog/monolog/tests/Monolog/Handler/ChromePHPHandlerTest.php b/mayor-orig/www/include/share/googleapi/monolog/monolog/tests/Monolog/Handler/ChromePHPHandlerTest.php
deleted file mode 100644
index 0449f8b1..00000000
--- a/mayor-orig/www/include/share/googleapi/monolog/monolog/tests/Monolog/Handler/ChromePHPHandlerTest.php
+++ /dev/null
@@ -1,156 +0,0 @@
-
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Monolog\Handler;
-
-use Monolog\TestCase;
-use Monolog\Logger;
-
-/**
- * @covers Monolog\Handler\ChromePHPHandler
- */
-class ChromePHPHandlerTest extends TestCase
-{
-    protected function setUp()
-    {
-        TestChromePHPHandler::reset();
-        $_SERVER['HTTP_USER_AGENT'] = 'Monolog Test; Chrome/1.0';
-    }
-
-    /**
-     * @dataProvider agentsProvider
-     */
-    public function testHeaders($agent)
-    {
-        $_SERVER['HTTP_USER_AGENT'] = $agent;
-
-        $handler = new TestChromePHPHandler();
-        $handler->setFormatter($this->getIdentityFormatter());
-        $handler->handle($this->getRecord(Logger::DEBUG));
-        $handler->handle($this->getRecord(Logger::WARNING));
-
-        $expected = array(
-            'X-ChromeLogger-Data'   => base64_encode(utf8_encode(json_encode(array(
-                'version' => ChromePHPHandler::VERSION,
-                'columns' => array('label', 'log', 'backtrace', 'type'),
-                'rows' => array(
-                    'test',
-                    'test',
-                ),
-                'request_uri' => '',
-            )))),
-        );
-
-        $this->assertEquals($expected, $handler->getHeaders());
-    }
-
-    public static function agentsProvider()
-    {
-        return array(
-            array('Monolog Test; Chrome/1.0'),
-            array('Mozilla/5.0 (X11; Ubuntu; Linux x86_64; rv:52.0) Gecko/20100101 Firefox/52.0'),
-            array('Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Ubuntu Chromium/56.0.2924.76 Chrome/56.0.2924.76 Safari/537.36'),
-            array('Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) HeadlessChrome Safari/537.36'),
-        );
-    }
-
-    public function testHeadersOverflow()
-    {
-        $handler = new TestChromePHPHandler();
-        $handler->handle($this->getRecord(Logger::DEBUG));
-        $handler->handle($this->getRecord(Logger::WARNING, str_repeat('a', 150 * 1024)));
-
-        // overflow chrome headers limit
-        $handler->handle($this->getRecord(Logger::WARNING, str_repeat('a', 100 * 1024)));
-
-        $expected = array(
-            'X-ChromeLogger-Data'   => base64_encode(utf8_encode(json_encode(array(
-                'version' => ChromePHPHandler::VERSION,
-                'columns' => array('label', 'log', 'backtrace', 'type'),
-                'rows' => array(
-                    array(
-                        'test',
-                        'test',
-                        'unknown',
-                        'log',
-                    ),
-                    array(
-                        'test',
-                        str_repeat('a', 150 * 1024),
-                        'unknown',
-                        'warn',
-                    ),
-                    array(
-                        'monolog',
-                        'Incomplete logs, chrome header size limit reached',
-                        'unknown',
-                        'warn',
-                    ),
-                ),
-                'request_uri' => '',
-            )))),
-        );
-
-        $this->assertEquals($expected, $handler->getHeaders());
-    }
-
-    public function testConcurrentHandlers()
-    {
-        $handler = new TestChromePHPHandler();
-        $handler->setFormatter($this->getIdentityFormatter());
-        $handler->handle($this->getRecord(Logger::DEBUG));
-        $handler->handle($this->getRecord(Logger::WARNING));
-
-        $handler2 = new TestChromePHPHandler();
-        $handler2->setFormatter($this->getIdentityFormatter());
-        $handler2->handle($this->getRecord(Logger::DEBUG));
-        $handler2->handle($this->getRecord(Logger::WARNING));
-
-        $expected = array(
-            'X-ChromeLogger-Data'   => base64_encode(utf8_encode(json_encode(array(
-                'version' => ChromePHPHandler::VERSION,
-                'columns' => array('label', 'log', 'backtrace', 'type'),
-                'rows' => array(
-                    'test',
-                    'test',
-                    'test',
-                    'test',
-                ),
-                'request_uri' => '',
-            )))),
-        );
-
-        $this->assertEquals($expected, $handler2->getHeaders());
-    }
-}
-
-class TestChromePHPHandler extends ChromePHPHandler
-{
-    protected $headers = array();
-
-    public static function reset()
-    {
-        self::$initialized = false;
-        self::$overflowed = false;
-        self::$sendHeaders = true;
-        self::$json['rows'] = array();
-    }
-
-    protected function sendHeader($header, $content)
-    {
-        $this->headers[$header] = $content;
-    }
-
-    public function getHeaders()
-    {
-        return $this->headers;
-    }
-}
diff --git a/mayor-orig/www/include/share/googleapi/monolog/monolog/tests/Monolog/Handler/CouchDBHandlerTest.php b/mayor-orig/www/include/share/googleapi/monolog/monolog/tests/Monolog/Handler/CouchDBHandlerTest.php
deleted file mode 100644
index 9fc4b388..00000000
--- a/mayor-orig/www/include/share/googleapi/monolog/monolog/tests/Monolog/Handler/CouchDBHandlerTest.php
+++ /dev/null
@@ -1,31 +0,0 @@
-
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Monolog\Handler;
-
-use Monolog\TestCase;
-use Monolog\Logger;
-
-class CouchDBHandlerTest extends TestCase
-{
-    public function testHandle()
-    {
-        $record = $this->getRecord(Logger::WARNING, 'test', array('data' => new \stdClass, 'foo' => 34));
-
-        $handler = new CouchDBHandler();
-
-        try {
-            $handler->handle($record);
-        } catch (\RuntimeException $e) {
-            $this->markTestSkipped('Could not connect to couchdb server on http://localhost:5984');
-        }
-    }
-}
diff --git a/mayor-orig/www/include/share/googleapi/monolog/monolog/tests/Monolog/Handler/DeduplicationHandlerTest.php b/mayor-orig/www/include/share/googleapi/monolog/monolog/tests/Monolog/Handler/DeduplicationHandlerTest.php
deleted file mode 100644
index e2aff868..00000000
--- a/mayor-orig/www/include/share/googleapi/monolog/monolog/tests/Monolog/Handler/DeduplicationHandlerTest.php
+++ /dev/null
@@ -1,165 +0,0 @@
-
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Monolog\Handler;
-
-use Monolog\TestCase;
-use Monolog\Logger;
-
-class DeduplicationHandlerTest extends TestCase
-{
-    /**
-     * @covers Monolog\Handler\DeduplicationHandler::flush
-     */
-    public function testFlushPassthruIfAllRecordsUnderTrigger()
-    {
-        $test = new TestHandler();
-        @unlink(sys_get_temp_dir().'/monolog_dedup.log');
-        $handler = new DeduplicationHandler($test, sys_get_temp_dir().'/monolog_dedup.log', 0);
-
-        $handler->handle($this->getRecord(Logger::DEBUG));
-        $handler->handle($this->getRecord(Logger::INFO));
-
-        $handler->flush();
-
-        $this->assertTrue($test->hasInfoRecords());
-        $this->assertTrue($test->hasDebugRecords());
-        $this->assertFalse($test->hasWarningRecords());
-    }
-
-    /**
-     * @covers Monolog\Handler\DeduplicationHandler::flush
-     * @covers Monolog\Handler\DeduplicationHandler::appendRecord
-     */
-    public function testFlushPassthruIfEmptyLog()
-    {
-        $test = new TestHandler();
-        @unlink(sys_get_temp_dir().'/monolog_dedup.log');
-        $handler = new DeduplicationHandler($test, sys_get_temp_dir().'/monolog_dedup.log', 0);
-
-        $handler->handle($this->getRecord(Logger::ERROR, 'Foo:bar'));
-        $handler->handle($this->getRecord(Logger::CRITICAL, "Foo\nbar"));
-
-        $handler->flush();
-
-        $this->assertTrue($test->hasErrorRecords());
-        $this->assertTrue($test->hasCriticalRecords());
-        $this->assertFalse($test->hasWarningRecords());
-    }
-
-    /**
-     * @covers Monolog\Handler\DeduplicationHandler::flush
-     * @covers Monolog\Handler\DeduplicationHandler::appendRecord
-     * @covers Monolog\Handler\DeduplicationHandler::isDuplicate
-     * @depends testFlushPassthruIfEmptyLog
-     */
-    public function testFlushSkipsIfLogExists()
-    {
-        $test = new TestHandler();
-        $handler = new DeduplicationHandler($test, sys_get_temp_dir().'/monolog_dedup.log', 0);
-
-        $handler->handle($this->getRecord(Logger::ERROR, 'Foo:bar'));
-        $handler->handle($this->getRecord(Logger::CRITICAL, "Foo\nbar"));
-
-        $handler->flush();
-
-        $this->assertFalse($test->hasErrorRecords());
-        $this->assertFalse($test->hasCriticalRecords());
-        $this->assertFalse($test->hasWarningRecords());
-    }
-
-    /**
-     * @covers Monolog\Handler\DeduplicationHandler::flush
-     * @covers Monolog\Handler\DeduplicationHandler::appendRecord
-     * @covers Monolog\Handler\DeduplicationHandler::isDuplicate
-     * @depends testFlushPassthruIfEmptyLog
-     */
-    public function testFlushPassthruIfLogTooOld()
-    {
-        $test = new TestHandler();
-        $handler = new DeduplicationHandler($test, sys_get_temp_dir().'/monolog_dedup.log', 0);
-
-        $record = $this->getRecord(Logger::ERROR);
-        $record['datetime']->modify('+62seconds');
-        $handler->handle($record);
-        $record = $this->getRecord(Logger::CRITICAL);
-        $record['datetime']->modify('+62seconds');
-        $handler->handle($record);
-
-        $handler->flush();
-
-        $this->assertTrue($test->hasErrorRecords());
-        $this->assertTrue($test->hasCriticalRecords());
-        $this->assertFalse($test->hasWarningRecords());
-    }
-
-    /**
-     * @covers Monolog\Handler\DeduplicationHandler::flush
-     * @covers Monolog\Handler\DeduplicationHandler::appendRecord
-     * @covers Monolog\Handler\DeduplicationHandler::isDuplicate
-     * @covers Monolog\Handler\DeduplicationHandler::collectLogs
-     */
-    public function testGcOldLogs()
-    {
-        $test = new TestHandler();
-        @unlink(sys_get_temp_dir().'/monolog_dedup.log');
-        $handler = new DeduplicationHandler($test, sys_get_temp_dir().'/monolog_dedup.log', 0);
-
-        // handle two records from yesterday, and one recent
-        $record = $this->getRecord(Logger::ERROR);
-        $record['datetime']->modify('-1day -10seconds');
-        $handler->handle($record);
-        $record2 = $this->getRecord(Logger::CRITICAL);
-        $record2['datetime']->modify('-1day -10seconds');
-        $handler->handle($record2);
-        $record3 = $this->getRecord(Logger::CRITICAL);
-        $record3['datetime']->modify('-30seconds');
-        $handler->handle($record3);
-
-        // log is written as none of them are duplicate
-        $handler->flush();
-        $this->assertSame(
-            $record['datetime']->getTimestamp() . ":ERROR:test\n" .
-            $record2['datetime']->getTimestamp() . ":CRITICAL:test\n" .
-            $record3['datetime']->getTimestamp() . ":CRITICAL:test\n",
-            file_get_contents(sys_get_temp_dir() . '/monolog_dedup.log')
-        );
-        $this->assertTrue($test->hasErrorRecords());
-        $this->assertTrue($test->hasCriticalRecords());
-        $this->assertFalse($test->hasWarningRecords());
-
-        // clear test handler
-        $test->clear();
-        $this->assertFalse($test->hasErrorRecords());
-        $this->assertFalse($test->hasCriticalRecords());
-
-        // log new records, duplicate log gets GC'd at the end of this flush call
-        $handler->handle($record = $this->getRecord(Logger::ERROR));
-        $handler->handle($record2 = $this->getRecord(Logger::CRITICAL));
-        $handler->flush();
-
-        // log should now contain the new errors and the previous one that was recent enough
-        $this->assertSame(
-            $record3['datetime']->getTimestamp() . ":CRITICAL:test\n" .
-            $record['datetime']->getTimestamp() . ":ERROR:test\n" .
-            $record2['datetime']->getTimestamp() . ":CRITICAL:test\n",
-            file_get_contents(sys_get_temp_dir() . '/monolog_dedup.log')
-        );
-        $this->assertTrue($test->hasErrorRecords());
-        $this->assertTrue($test->hasCriticalRecords());
-        $this->assertFalse($test->hasWarningRecords());
-    }
-
-    public static function tearDownAfterClass()
-    {
-        @unlink(sys_get_temp_dir().'/monolog_dedup.log');
-    }
-}
diff --git a/mayor-orig/www/include/share/googleapi/monolog/monolog/tests/Monolog/Handler/DoctrineCouchDBHandlerTest.php b/mayor-orig/www/include/share/googleapi/monolog/monolog/tests/Monolog/Handler/DoctrineCouchDBHandlerTest.php
deleted file mode 100644
index d67da90a..00000000
--- a/mayor-orig/www/include/share/googleapi/monolog/monolog/tests/Monolog/Handler/DoctrineCouchDBHandlerTest.php
+++ /dev/null
@@ -1,52 +0,0 @@
-
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Monolog\Handler;
-
-use Monolog\TestCase;
-use Monolog\Logger;
-
-class DoctrineCouchDBHandlerTest extends TestCase
-{
-    protected function setup()
-    {
-        if (!class_exists('Doctrine\CouchDB\CouchDBClient')) {
-            $this->markTestSkipped('The "doctrine/couchdb" package is not installed');
-        }
-    }
-
-    public function testHandle()
-    {
-        $client = $this->getMockBuilder('Doctrine\\CouchDB\\CouchDBClient')
-            ->setMethods(array('postDocument'))
-            ->disableOriginalConstructor()
-            ->getMock();
-
-        $record = $this->getRecord(Logger::WARNING, 'test', array('data' => new \stdClass, 'foo' => 34));
-
-        $expected = array(
-            'message' => 'test',
-            'context' => array('data' => '[object] (stdClass: {})', 'foo' => 34),
-            'level' => Logger::WARNING,
-            'level_name' => 'WARNING',
-            'channel' => 'test',
-            'datetime' => $record['datetime']->format('Y-m-d H:i:s'),
-            'extra' => array(),
-        );
-
-        $client->expects($this->once())
-            ->method('postDocument')
-            ->with($expected);
-
-        $handler = new DoctrineCouchDBHandler($client);
-        $handler->handle($record);
-    }
-}
diff --git a/mayor-orig/www/include/share/googleapi/monolog/monolog/tests/Monolog/Handler/DynamoDbHandlerTest.php b/mayor-orig/www/include/share/googleapi/monolog/monolog/tests/Monolog/Handler/DynamoDbHandlerTest.php
deleted file mode 100644
index 2e6c348d..00000000
--- a/mayor-orig/www/include/share/googleapi/monolog/monolog/tests/Monolog/Handler/DynamoDbHandlerTest.php
+++ /dev/null
@@ -1,82 +0,0 @@
-
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Monolog\Handler;
-
-use Monolog\TestCase;
-
-class DynamoDbHandlerTest extends TestCase
-{
-    private $client;
-
-    public function setUp()
-    {
-        if (!class_exists('Aws\DynamoDb\DynamoDbClient')) {
-            $this->markTestSkipped('aws/aws-sdk-php not installed');
-        }
-
-        $this->client = $this->getMockBuilder('Aws\DynamoDb\DynamoDbClient')
-            ->setMethods(array('formatAttributes', '__call'))
-            ->disableOriginalConstructor()->getMock();
-    }
-
-    public function testConstruct()
-    {
-        $this->assertInstanceOf('Monolog\Handler\DynamoDbHandler', new DynamoDbHandler($this->client, 'foo'));
-    }
-
-    public function testInterface()
-    {
-        $this->assertInstanceOf('Monolog\Handler\HandlerInterface', new DynamoDbHandler($this->client, 'foo'));
-    }
-
-    public function testGetFormatter()
-    {
-        $handler = new DynamoDbHandler($this->client, 'foo');
-        $this->assertInstanceOf('Monolog\Formatter\ScalarFormatter', $handler->getFormatter());
-    }
-
-    public function testHandle()
-    {
-        $record = $this->getRecord();
-        $formatter = $this->getMock('Monolog\Formatter\FormatterInterface');
-        $formatted = array('foo' => 1, 'bar' => 2);
-        $handler = new DynamoDbHandler($this->client, 'foo');
-        $handler->setFormatter($formatter);
-
-        $isV3 = defined('Aws\Sdk::VERSION') && version_compare(\Aws\Sdk::VERSION, '3.0', '>=');
-        if ($isV3) {
-            $expFormatted = array('foo' => array('N' => 1), 'bar' => array('N' => 2));
-        } else {
-            $expFormatted = $formatted;
-        }
-
-        $formatter
-             ->expects($this->once())
-             ->method('format')
-             ->with($record)
-             ->will($this->returnValue($formatted));
-        $this->client
-             ->expects($isV3 ? $this->never() : $this->once())
-             ->method('formatAttributes')
-             ->with($this->isType('array'))
-             ->will($this->returnValue($formatted));
-        $this->client
-             ->expects($this->once())
-             ->method('__call')
-             ->with('putItem', array(array(
-                 'TableName' => 'foo',
-                 'Item' => $expFormatted,
-             )));
-
-        $handler->handle($record);
-    }
-}
diff --git a/mayor-orig/www/include/share/googleapi/monolog/monolog/tests/Monolog/Handler/ElasticSearchHandlerTest.php b/mayor-orig/www/include/share/googleapi/monolog/monolog/tests/Monolog/Handler/ElasticSearchHandlerTest.php
deleted file mode 100644
index 1687074b..00000000
--- a/mayor-orig/www/include/share/googleapi/monolog/monolog/tests/Monolog/Handler/ElasticSearchHandlerTest.php
+++ /dev/null
@@ -1,239 +0,0 @@
-
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Monolog\Handler;
-
-use Monolog\Formatter\ElasticaFormatter;
-use Monolog\Formatter\NormalizerFormatter;
-use Monolog\TestCase;
-use Monolog\Logger;
-use Elastica\Client;
-use Elastica\Request;
-use Elastica\Response;
-
-class ElasticSearchHandlerTest extends TestCase
-{
-    /**
-     * @var Client mock
-     */
-    protected $client;
-
-    /**
-     * @var array Default handler options
-     */
-    protected $options = array(
-        'index' => 'my_index',
-        'type'  => 'doc_type',
-    );
-
-    public function setUp()
-    {
-        // Elastica lib required
-        if (!class_exists("Elastica\Client")) {
-            $this->markTestSkipped("ruflin/elastica not installed");
-        }
-
-        // base mock Elastica Client object
-        $this->client = $this->getMockBuilder('Elastica\Client')
-            ->setMethods(array('addDocuments'))
-            ->disableOriginalConstructor()
-            ->getMock();
-    }
-
-    /**
-     * @covers Monolog\Handler\ElasticSearchHandler::write
-     * @covers Monolog\Handler\ElasticSearchHandler::handleBatch
-     * @covers Monolog\Handler\ElasticSearchHandler::bulkSend
-     * @covers Monolog\Handler\ElasticSearchHandler::getDefaultFormatter
-     */
-    public function testHandle()
-    {
-        // log message
-        $msg = array(
-            'level' => Logger::ERROR,
-            'level_name' => 'ERROR',
-            'channel' => 'meh',
-            'context' => array('foo' => 7, 'bar', 'class' => new \stdClass),
-            'datetime' => new \DateTime("@0"),
-            'extra' => array(),
-            'message' => 'log',
-        );
-
-        // format expected result
-        $formatter = new ElasticaFormatter($this->options['index'], $this->options['type']);
-        $expected = array($formatter->format($msg));
-
-        // setup ES client mock
-        $this->client->expects($this->any())
-            ->method('addDocuments')
-            ->with($expected);
-
-        // perform tests
-        $handler = new ElasticSearchHandler($this->client, $this->options);
-        $handler->handle($msg);
-        $handler->handleBatch(array($msg));
-    }
-
-    /**
-     * @covers Monolog\Handler\ElasticSearchHandler::setFormatter
-     */
-    public function testSetFormatter()
-    {
-        $handler = new ElasticSearchHandler($this->client);
-        $formatter = new ElasticaFormatter('index_new', 'type_new');
-        $handler->setFormatter($formatter);
-        $this->assertInstanceOf('Monolog\Formatter\ElasticaFormatter', $handler->getFormatter());
-        $this->assertEquals('index_new', $handler->getFormatter()->getIndex());
-        $this->assertEquals('type_new', $handler->getFormatter()->getType());
-    }
-
-    /**
-     * @covers                   Monolog\Handler\ElasticSearchHandler::setFormatter
-     * @expectedException        InvalidArgumentException
-     * @expectedExceptionMessage ElasticSearchHandler is only compatible with ElasticaFormatter
-     */
-    public function testSetFormatterInvalid()
-    {
-        $handler = new ElasticSearchHandler($this->client);
-        $formatter = new NormalizerFormatter();
-        $handler->setFormatter($formatter);
-    }
-
-    /**
-     * @covers Monolog\Handler\ElasticSearchHandler::__construct
-     * @covers Monolog\Handler\ElasticSearchHandler::getOptions
-     */
-    public function testOptions()
-    {
-        $expected = array(
-            'index' => $this->options['index'],
-            'type' => $this->options['type'],
-            'ignore_error' => false,
-        );
-        $handler = new ElasticSearchHandler($this->client, $this->options);
-        $this->assertEquals($expected, $handler->getOptions());
-    }
-
-    /**
-     * @covers       Monolog\Handler\ElasticSearchHandler::bulkSend
-     * @dataProvider providerTestConnectionErrors
-     */
-    public function testConnectionErrors($ignore, $expectedError)
-    {
-        $clientOpts = array('host' => '127.0.0.1', 'port' => 1);
-        $client = new Client($clientOpts);
-        $handlerOpts = array('ignore_error' => $ignore);
-        $handler = new ElasticSearchHandler($client, $handlerOpts);
-
-        if ($expectedError) {
-            $this->setExpectedException($expectedError[0], $expectedError[1]);
-            $handler->handle($this->getRecord());
-        } else {
-            $this->assertFalse($handler->handle($this->getRecord()));
-        }
-    }
-
-    /**
-     * @return array
-     */
-    public function providerTestConnectionErrors()
-    {
-        return array(
-            array(false, array('RuntimeException', 'Error sending messages to Elasticsearch')),
-            array(true, false),
-        );
-    }
-
-    /**
-     * Integration test using localhost Elastic Search server
-     *
-     * @covers Monolog\Handler\ElasticSearchHandler::__construct
-     * @covers Monolog\Handler\ElasticSearchHandler::handleBatch
-     * @covers Monolog\Handler\ElasticSearchHandler::bulkSend
-     * @covers Monolog\Handler\ElasticSearchHandler::getDefaultFormatter
-     */
-    public function testHandleIntegration()
-    {
-        $msg = array(
-            'level' => Logger::ERROR,
-            'level_name' => 'ERROR',
-            'channel' => 'meh',
-            'context' => array('foo' => 7, 'bar', 'class' => new \stdClass),
-            'datetime' => new \DateTime("@0"),
-            'extra' => array(),
-            'message' => 'log',
-        );
-
-        $expected = $msg;
-        $expected['datetime'] = $msg['datetime']->format(\DateTime::ISO8601);
-        $expected['context'] = array(
-            'class' => '[object] (stdClass: {})',
-            'foo' => 7,
-            0 => 'bar',
-        );
-
-        $client = new Client();
-        $handler = new ElasticSearchHandler($client, $this->options);
-        try {
-            $handler->handleBatch(array($msg));
-        } catch (\RuntimeException $e) {
-            $this->markTestSkipped("Cannot connect to Elastic Search server on localhost");
-        }
-
-        // check document id from ES server response
-        $documentId = $this->getCreatedDocId($client->getLastResponse());
-        $this->assertNotEmpty($documentId, 'No elastic document id received');
-
-        // retrieve document source from ES and validate
-        $document = $this->getDocSourceFromElastic(
-            $client,
-            $this->options['index'],
-            $this->options['type'],
-            $documentId
-        );
-        $this->assertEquals($expected, $document);
-
-        // remove test index from ES
-        $client->request("/{$this->options['index']}", Request::DELETE);
-    }
-
-    /**
-     * Return last created document id from ES response
-     * @param  Response    $response Elastica Response object
-     * @return string|null
-     */
-    protected function getCreatedDocId(Response $response)
-    {
-        $data = $response->getData();
-        if (!empty($data['items'][0]['create']['_id'])) {
-            return $data['items'][0]['create']['_id'];
-        }
-    }
-
-    /**
-     * Retrieve document by id from Elasticsearch
-     * @param  Client $client     Elastica client
-     * @param  string $index
-     * @param  string $type
-     * @param  string $documentId
-     * @return array
-     */
-    protected function getDocSourceFromElastic(Client $client, $index, $type, $documentId)
-    {
-        $resp = $client->request("/{$index}/{$type}/{$documentId}", Request::GET);
-        $data = $resp->getData();
-        if (!empty($data['_source'])) {
-            return $data['_source'];
-        }
-
-        return array();
-    }
-}
diff --git a/mayor-orig/www/include/share/googleapi/monolog/monolog/tests/Monolog/Handler/ErrorLogHandlerTest.php b/mayor-orig/www/include/share/googleapi/monolog/monolog/tests/Monolog/Handler/ErrorLogHandlerTest.php
deleted file mode 100644
index 99785cbb..00000000
--- a/mayor-orig/www/include/share/googleapi/monolog/monolog/tests/Monolog/Handler/ErrorLogHandlerTest.php
+++ /dev/null
@@ -1,66 +0,0 @@
-
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Monolog\Handler;
-
-use Monolog\TestCase;
-use Monolog\Logger;
-use Monolog\Formatter\LineFormatter;
-
-function error_log()
-{
-    $GLOBALS['error_log'][] = func_get_args();
-}
-
-class ErrorLogHandlerTest extends TestCase
-{
-    protected function setUp()
-    {
-        $GLOBALS['error_log'] = array();
-    }
-
-    /**
-     * @covers Monolog\Handler\ErrorLogHandler::__construct
-     * @expectedException InvalidArgumentException
-     * @expectedExceptionMessage The given message type "42" is not supported
-     */
-    public function testShouldNotAcceptAnInvalidTypeOnContructor()
-    {
-        new ErrorLogHandler(42);
-    }
-
-    /**
-     * @covers Monolog\Handler\ErrorLogHandler::write
-     */
-    public function testShouldLogMessagesUsingErrorLogFuncion()
-    {
-        $type = ErrorLogHandler::OPERATING_SYSTEM;
-        $handler = new ErrorLogHandler($type);
-        $handler->setFormatter(new LineFormatter('%channel%.%level_name%: %message% %context% %extra%', null, true));
-        $handler->handle($this->getRecord(Logger::ERROR, "Foo\nBar\r\n\r\nBaz"));
-
-        $this->assertSame("test.ERROR: Foo\nBar\r\n\r\nBaz [] []", $GLOBALS['error_log'][0][0]);
-        $this->assertSame($GLOBALS['error_log'][0][1], $type);
-
-        $handler = new ErrorLogHandler($type, Logger::DEBUG, true, true);
-        $handler->setFormatter(new LineFormatter(null, null, true));
-        $handler->handle($this->getRecord(Logger::ERROR, "Foo\nBar\r\n\r\nBaz"));
-
-        $this->assertStringMatchesFormat('[%s] test.ERROR: Foo', $GLOBALS['error_log'][1][0]);
-        $this->assertSame($GLOBALS['error_log'][1][1], $type);
-
-        $this->assertStringMatchesFormat('Bar', $GLOBALS['error_log'][2][0]);
-        $this->assertSame($GLOBALS['error_log'][2][1], $type);
-
-        $this->assertStringMatchesFormat('Baz [] []', $GLOBALS['error_log'][3][0]);
-        $this->assertSame($GLOBALS['error_log'][3][1], $type);
-    }
-}
diff --git a/mayor-orig/www/include/share/googleapi/monolog/monolog/tests/Monolog/Handler/FilterHandlerTest.php b/mayor-orig/www/include/share/googleapi/monolog/monolog/tests/Monolog/Handler/FilterHandlerTest.php
deleted file mode 100644
index 31b7686a..00000000
--- a/mayor-orig/www/include/share/googleapi/monolog/monolog/tests/Monolog/Handler/FilterHandlerTest.php
+++ /dev/null
@@ -1,170 +0,0 @@
-
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Monolog\Handler;
-
-use Monolog\Logger;
-use Monolog\TestCase;
-
-class FilterHandlerTest extends TestCase
-{
-    /**
-     * @covers Monolog\Handler\FilterHandler::isHandling
-     */
-    public function testIsHandling()
-    {
-        $test    = new TestHandler();
-        $handler = new FilterHandler($test, Logger::INFO, Logger::NOTICE);
-        $this->assertFalse($handler->isHandling($this->getRecord(Logger::DEBUG)));
-        $this->assertTrue($handler->isHandling($this->getRecord(Logger::INFO)));
-        $this->assertTrue($handler->isHandling($this->getRecord(Logger::NOTICE)));
-        $this->assertFalse($handler->isHandling($this->getRecord(Logger::WARNING)));
-        $this->assertFalse($handler->isHandling($this->getRecord(Logger::ERROR)));
-        $this->assertFalse($handler->isHandling($this->getRecord(Logger::CRITICAL)));
-        $this->assertFalse($handler->isHandling($this->getRecord(Logger::ALERT)));
-        $this->assertFalse($handler->isHandling($this->getRecord(Logger::EMERGENCY)));
-    }
-
-    /**
-     * @covers Monolog\Handler\FilterHandler::handle
-     * @covers Monolog\Handler\FilterHandler::setAcceptedLevels
-     * @covers Monolog\Handler\FilterHandler::isHandling
-     */
-    public function testHandleProcessOnlyNeededLevels()
-    {
-        $test    = new TestHandler();
-        $handler = new FilterHandler($test, Logger::INFO, Logger::NOTICE);
-
-        $handler->handle($this->getRecord(Logger::DEBUG));
-        $this->assertFalse($test->hasDebugRecords());
-
-        $handler->handle($this->getRecord(Logger::INFO));
-        $this->assertTrue($test->hasInfoRecords());
-        $handler->handle($this->getRecord(Logger::NOTICE));
-        $this->assertTrue($test->hasNoticeRecords());
-
-        $handler->handle($this->getRecord(Logger::WARNING));
-        $this->assertFalse($test->hasWarningRecords());
-        $handler->handle($this->getRecord(Logger::ERROR));
-        $this->assertFalse($test->hasErrorRecords());
-        $handler->handle($this->getRecord(Logger::CRITICAL));
-        $this->assertFalse($test->hasCriticalRecords());
-        $handler->handle($this->getRecord(Logger::ALERT));
-        $this->assertFalse($test->hasAlertRecords());
-        $handler->handle($this->getRecord(Logger::EMERGENCY));
-        $this->assertFalse($test->hasEmergencyRecords());
-
-        $test    = new TestHandler();
-        $handler = new FilterHandler($test, array(Logger::INFO, Logger::ERROR));
-
-        $handler->handle($this->getRecord(Logger::DEBUG));
-        $this->assertFalse($test->hasDebugRecords());
-        $handler->handle($this->getRecord(Logger::INFO));
-        $this->assertTrue($test->hasInfoRecords());
-        $handler->handle($this->getRecord(Logger::NOTICE));
-        $this->assertFalse($test->hasNoticeRecords());
-        $handler->handle($this->getRecord(Logger::ERROR));
-        $this->assertTrue($test->hasErrorRecords());
-        $handler->handle($this->getRecord(Logger::CRITICAL));
-        $this->assertFalse($test->hasCriticalRecords());
-    }
-
-    /**
-     * @covers Monolog\Handler\FilterHandler::setAcceptedLevels
-     * @covers Monolog\Handler\FilterHandler::getAcceptedLevels
-     */
-    public function testAcceptedLevelApi()
-    {
-        $test    = new TestHandler();
-        $handler = new FilterHandler($test);
-
-        $levels = array(Logger::INFO, Logger::ERROR);
-        $handler->setAcceptedLevels($levels);
-        $this->assertSame($levels, $handler->getAcceptedLevels());
-
-        $handler->setAcceptedLevels(array('info', 'error'));
-        $this->assertSame($levels, $handler->getAcceptedLevels());
-
-        $levels = array(Logger::CRITICAL, Logger::ALERT, Logger::EMERGENCY);
-        $handler->setAcceptedLevels(Logger::CRITICAL, Logger::EMERGENCY);
-        $this->assertSame($levels, $handler->getAcceptedLevels());
-
-        $handler->setAcceptedLevels('critical', 'emergency');
-        $this->assertSame($levels, $handler->getAcceptedLevels());
-    }
-
-    /**
-     * @covers Monolog\Handler\FilterHandler::handle
-     */
-    public function testHandleUsesProcessors()
-    {
-        $test    = new TestHandler();
-        $handler = new FilterHandler($test, Logger::DEBUG, Logger::EMERGENCY);
-        $handler->pushProcessor(
-            function ($record) {
-                $record['extra']['foo'] = true;
-
-                return $record;
-            }
-        );
-        $handler->handle($this->getRecord(Logger::WARNING));
-        $this->assertTrue($test->hasWarningRecords());
-        $records = $test->getRecords();
-        $this->assertTrue($records[0]['extra']['foo']);
-    }
-
-    /**
-     * @covers Monolog\Handler\FilterHandler::handle
-     */
-    public function testHandleRespectsBubble()
-    {
-        $test = new TestHandler();
-
-        $handler = new FilterHandler($test, Logger::INFO, Logger::NOTICE, false);
-        $this->assertTrue($handler->handle($this->getRecord(Logger::INFO)));
-        $this->assertFalse($handler->handle($this->getRecord(Logger::WARNING)));
-
-        $handler = new FilterHandler($test, Logger::INFO, Logger::NOTICE, true);
-        $this->assertFalse($handler->handle($this->getRecord(Logger::INFO)));
-        $this->assertFalse($handler->handle($this->getRecord(Logger::WARNING)));
-    }
-
-    /**
-     * @covers Monolog\Handler\FilterHandler::handle
-     */
-    public function testHandleWithCallback()
-    {
-        $test    = new TestHandler();
-        $handler = new FilterHandler(
-            function ($record, $handler) use ($test) {
-                return $test;
-            }, Logger::INFO, Logger::NOTICE, false
-        );
-        $handler->handle($this->getRecord(Logger::DEBUG));
-        $handler->handle($this->getRecord(Logger::INFO));
-        $this->assertFalse($test->hasDebugRecords());
-        $this->assertTrue($test->hasInfoRecords());
-    }
-
-    /**
-     * @covers Monolog\Handler\FilterHandler::handle
-     * @expectedException \RuntimeException
-     */
-    public function testHandleWithBadCallbackThrowsException()
-    {
-        $handler = new FilterHandler(
-            function ($record, $handler) {
-                return 'foo';
-            }
-        );
-        $handler->handle($this->getRecord(Logger::WARNING));
-    }
-}
diff --git a/mayor-orig/www/include/share/googleapi/monolog/monolog/tests/Monolog/Handler/FingersCrossedHandlerTest.php b/mayor-orig/www/include/share/googleapi/monolog/monolog/tests/Monolog/Handler/FingersCrossedHandlerTest.php
deleted file mode 100644
index b92bf437..00000000
--- a/mayor-orig/www/include/share/googleapi/monolog/monolog/tests/Monolog/Handler/FingersCrossedHandlerTest.php
+++ /dev/null
@@ -1,279 +0,0 @@
-
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Monolog\Handler;
-
-use Monolog\TestCase;
-use Monolog\Logger;
-use Monolog\Handler\FingersCrossed\ErrorLevelActivationStrategy;
-use Monolog\Handler\FingersCrossed\ChannelLevelActivationStrategy;
-use Psr\Log\LogLevel;
-
-class FingersCrossedHandlerTest extends TestCase
-{
-    /**
-     * @covers Monolog\Handler\FingersCrossedHandler::__construct
-     * @covers Monolog\Handler\FingersCrossedHandler::handle
-     * @covers Monolog\Handler\FingersCrossedHandler::activate
-     */
-    public function testHandleBuffers()
-    {
-        $test = new TestHandler();
-        $handler = new FingersCrossedHandler($test);
-        $handler->handle($this->getRecord(Logger::DEBUG));
-        $handler->handle($this->getRecord(Logger::INFO));
-        $this->assertFalse($test->hasDebugRecords());
-        $this->assertFalse($test->hasInfoRecords());
-        $handler->handle($this->getRecord(Logger::WARNING));
-        $handler->close();
-        $this->assertTrue($test->hasInfoRecords());
-        $this->assertTrue(count($test->getRecords()) === 3);
-    }
-
-    /**
-     * @covers Monolog\Handler\FingersCrossedHandler::handle
-     * @covers Monolog\Handler\FingersCrossedHandler::activate
-     */
-    public function testHandleStopsBufferingAfterTrigger()
-    {
-        $test = new TestHandler();
-        $handler = new FingersCrossedHandler($test);
-        $handler->handle($this->getRecord(Logger::WARNING));
-        $handler->handle($this->getRecord(Logger::DEBUG));
-        $handler->close();
-        $this->assertTrue($test->hasWarningRecords());
-        $this->assertTrue($test->hasDebugRecords());
-    }
-
-    /**
-     * @covers Monolog\Handler\FingersCrossedHandler::handle
-     * @covers Monolog\Handler\FingersCrossedHandler::activate
-     * @covers Monolog\Handler\FingersCrossedHandler::reset
-     */
-    public function testHandleRestartBufferingAfterReset()
-    {
-        $test = new TestHandler();
-        $handler = new FingersCrossedHandler($test);
-        $handler->handle($this->getRecord(Logger::WARNING));
-        $handler->handle($this->getRecord(Logger::DEBUG));
-        $handler->reset();
-        $handler->handle($this->getRecord(Logger::INFO));
-        $handler->close();
-        $this->assertTrue($test->hasWarningRecords());
-        $this->assertTrue($test->hasDebugRecords());
-        $this->assertFalse($test->hasInfoRecords());
-    }
-
-    /**
-     * @covers Monolog\Handler\FingersCrossedHandler::handle
-     * @covers Monolog\Handler\FingersCrossedHandler::activate
-     */
-    public function testHandleRestartBufferingAfterBeingTriggeredWhenStopBufferingIsDisabled()
-    {
-        $test = new TestHandler();
-        $handler = new FingersCrossedHandler($test, Logger::WARNING, 0, false, false);
-        $handler->handle($this->getRecord(Logger::DEBUG));
-        $handler->handle($this->getRecord(Logger::WARNING));
-        $handler->handle($this->getRecord(Logger::INFO));
-        $handler->close();
-        $this->assertTrue($test->hasWarningRecords());
-        $this->assertTrue($test->hasDebugRecords());
-        $this->assertFalse($test->hasInfoRecords());
-    }
-
-    /**
-     * @covers Monolog\Handler\FingersCrossedHandler::handle
-     * @covers Monolog\Handler\FingersCrossedHandler::activate
-     */
-    public function testHandleBufferLimit()
-    {
-        $test = new TestHandler();
-        $handler = new FingersCrossedHandler($test, Logger::WARNING, 2);
-        $handler->handle($this->getRecord(Logger::DEBUG));
-        $handler->handle($this->getRecord(Logger::DEBUG));
-        $handler->handle($this->getRecord(Logger::INFO));
-        $handler->handle($this->getRecord(Logger::WARNING));
-        $this->assertTrue($test->hasWarningRecords());
-        $this->assertTrue($test->hasInfoRecords());
-        $this->assertFalse($test->hasDebugRecords());
-    }
-
-    /**
-     * @covers Monolog\Handler\FingersCrossedHandler::handle
-     * @covers Monolog\Handler\FingersCrossedHandler::activate
-     */
-    public function testHandleWithCallback()
-    {
-        $test = new TestHandler();
-        $handler = new FingersCrossedHandler(function ($record, $handler) use ($test) {
-                    return $test;
-                });
-        $handler->handle($this->getRecord(Logger::DEBUG));
-        $handler->handle($this->getRecord(Logger::INFO));
-        $this->assertFalse($test->hasDebugRecords());
-        $this->assertFalse($test->hasInfoRecords());
-        $handler->handle($this->getRecord(Logger::WARNING));
-        $this->assertTrue($test->hasInfoRecords());
-        $this->assertTrue(count($test->getRecords()) === 3);
-    }
-
-    /**
-     * @covers Monolog\Handler\FingersCrossedHandler::handle
-     * @covers Monolog\Handler\FingersCrossedHandler::activate
-     * @expectedException RuntimeException
-     */
-    public function testHandleWithBadCallbackThrowsException()
-    {
-        $handler = new FingersCrossedHandler(function ($record, $handler) {
-                    return 'foo';
-                });
-        $handler->handle($this->getRecord(Logger::WARNING));
-    }
-
-    /**
-     * @covers Monolog\Handler\FingersCrossedHandler::isHandling
-     */
-    public function testIsHandlingAlways()
-    {
-        $test = new TestHandler();
-        $handler = new FingersCrossedHandler($test, Logger::ERROR);
-        $this->assertTrue($handler->isHandling($this->getRecord(Logger::DEBUG)));
-    }
-
-    /**
-     * @covers Monolog\Handler\FingersCrossedHandler::__construct
-     * @covers Monolog\Handler\FingersCrossed\ErrorLevelActivationStrategy::__construct
-     * @covers Monolog\Handler\FingersCrossed\ErrorLevelActivationStrategy::isHandlerActivated
-     */
-    public function testErrorLevelActivationStrategy()
-    {
-        $test = new TestHandler();
-        $handler = new FingersCrossedHandler($test, new ErrorLevelActivationStrategy(Logger::WARNING));
-        $handler->handle($this->getRecord(Logger::DEBUG));
-        $this->assertFalse($test->hasDebugRecords());
-        $handler->handle($this->getRecord(Logger::WARNING));
-        $this->assertTrue($test->hasDebugRecords());
-        $this->assertTrue($test->hasWarningRecords());
-    }
-
-    /**
-     * @covers Monolog\Handler\FingersCrossedHandler::__construct
-     * @covers Monolog\Handler\FingersCrossed\ErrorLevelActivationStrategy::__construct
-     * @covers Monolog\Handler\FingersCrossed\ErrorLevelActivationStrategy::isHandlerActivated
-     */
-    public function testErrorLevelActivationStrategyWithPsrLevel()
-    {
-        $test = new TestHandler();
-        $handler = new FingersCrossedHandler($test, new ErrorLevelActivationStrategy('warning'));
-        $handler->handle($this->getRecord(Logger::DEBUG));
-        $this->assertFalse($test->hasDebugRecords());
-        $handler->handle($this->getRecord(Logger::WARNING));
-        $this->assertTrue($test->hasDebugRecords());
-        $this->assertTrue($test->hasWarningRecords());
-    }
-
-    /**
-     * @covers Monolog\Handler\FingersCrossedHandler::__construct
-     * @covers Monolog\Handler\FingersCrossedHandler::activate
-     */
-    public function testOverrideActivationStrategy()
-    {
-        $test = new TestHandler();
-        $handler = new FingersCrossedHandler($test, new ErrorLevelActivationStrategy('warning'));
-        $handler->handle($this->getRecord(Logger::DEBUG));
-        $this->assertFalse($test->hasDebugRecords());
-        $handler->activate();
-        $this->assertTrue($test->hasDebugRecords());
-        $handler->handle($this->getRecord(Logger::INFO));
-        $this->assertTrue($test->hasInfoRecords());
-    }
-
-    /**
-     * @covers Monolog\Handler\FingersCrossed\ChannelLevelActivationStrategy::__construct
-     * @covers Monolog\Handler\FingersCrossed\ChannelLevelActivationStrategy::isHandlerActivated
-     */
-    public function testChannelLevelActivationStrategy()
-    {
-        $test = new TestHandler();
-        $handler = new FingersCrossedHandler($test, new ChannelLevelActivationStrategy(Logger::ERROR, array('othertest' => Logger::DEBUG)));
-        $handler->handle($this->getRecord(Logger::WARNING));
-        $this->assertFalse($test->hasWarningRecords());
-        $record = $this->getRecord(Logger::DEBUG);
-        $record['channel'] = 'othertest';
-        $handler->handle($record);
-        $this->assertTrue($test->hasDebugRecords());
-        $this->assertTrue($test->hasWarningRecords());
-    }
-
-    /**
-     * @covers Monolog\Handler\FingersCrossed\ChannelLevelActivationStrategy::__construct
-     * @covers Monolog\Handler\FingersCrossed\ChannelLevelActivationStrategy::isHandlerActivated
-     */
-    public function testChannelLevelActivationStrategyWithPsrLevels()
-    {
-        $test = new TestHandler();
-        $handler = new FingersCrossedHandler($test, new ChannelLevelActivationStrategy('error', array('othertest' => 'debug')));
-        $handler->handle($this->getRecord(Logger::WARNING));
-        $this->assertFalse($test->hasWarningRecords());
-        $record = $this->getRecord(Logger::DEBUG);
-        $record['channel'] = 'othertest';
-        $handler->handle($record);
-        $this->assertTrue($test->hasDebugRecords());
-        $this->assertTrue($test->hasWarningRecords());
-    }
-
-    /**
-     * @covers Monolog\Handler\FingersCrossedHandler::handle
-     * @covers Monolog\Handler\FingersCrossedHandler::activate
-     */
-    public function testHandleUsesProcessors()
-    {
-        $test = new TestHandler();
-        $handler = new FingersCrossedHandler($test, Logger::INFO);
-        $handler->pushProcessor(function ($record) {
-            $record['extra']['foo'] = true;
-
-            return $record;
-        });
-        $handler->handle($this->getRecord(Logger::WARNING));
-        $this->assertTrue($test->hasWarningRecords());
-        $records = $test->getRecords();
-        $this->assertTrue($records[0]['extra']['foo']);
-    }
-
-    /**
-     * @covers Monolog\Handler\FingersCrossedHandler::close
-     */
-    public function testPassthruOnClose()
-    {
-        $test = new TestHandler();
-        $handler = new FingersCrossedHandler($test, new ErrorLevelActivationStrategy(Logger::WARNING), 0, true, true, Logger::INFO);
-        $handler->handle($this->getRecord(Logger::DEBUG));
-        $handler->handle($this->getRecord(Logger::INFO));
-        $handler->close();
-        $this->assertFalse($test->hasDebugRecords());
-        $this->assertTrue($test->hasInfoRecords());
-    }
-
-    /**
-     * @covers Monolog\Handler\FingersCrossedHandler::close
-     */
-    public function testPsrLevelPassthruOnClose()
-    {
-        $test = new TestHandler();
-        $handler = new FingersCrossedHandler($test, new ErrorLevelActivationStrategy(Logger::WARNING), 0, true, true, LogLevel::INFO);
-        $handler->handle($this->getRecord(Logger::DEBUG));
-        $handler->handle($this->getRecord(Logger::INFO));
-        $handler->close();
-        $this->assertFalse($test->hasDebugRecords());
-        $this->assertTrue($test->hasInfoRecords());
-    }
-}
diff --git a/mayor-orig/www/include/share/googleapi/monolog/monolog/tests/Monolog/Handler/FirePHPHandlerTest.php b/mayor-orig/www/include/share/googleapi/monolog/monolog/tests/Monolog/Handler/FirePHPHandlerTest.php
deleted file mode 100644
index 0eb10a63..00000000
--- a/mayor-orig/www/include/share/googleapi/monolog/monolog/tests/Monolog/Handler/FirePHPHandlerTest.php
+++ /dev/null
@@ -1,96 +0,0 @@
-
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Monolog\Handler;
-
-use Monolog\TestCase;
-use Monolog\Logger;
-
-/**
- * @covers Monolog\Handler\FirePHPHandler
- */
-class FirePHPHandlerTest extends TestCase
-{
-    public function setUp()
-    {
-        TestFirePHPHandler::reset();
-        $_SERVER['HTTP_USER_AGENT'] = 'Monolog Test; FirePHP/1.0';
-    }
-
-    public function testHeaders()
-    {
-        $handler = new TestFirePHPHandler;
-        $handler->setFormatter($this->getIdentityFormatter());
-        $handler->handle($this->getRecord(Logger::DEBUG));
-        $handler->handle($this->getRecord(Logger::WARNING));
-
-        $expected = array(
-            'X-Wf-Protocol-1'    => 'http://meta.wildfirehq.org/Protocol/JsonStream/0.2',
-            'X-Wf-1-Structure-1' => 'http://meta.firephp.org/Wildfire/Structure/FirePHP/FirebugConsole/0.1',
-            'X-Wf-1-Plugin-1'    => 'http://meta.firephp.org/Wildfire/Plugin/FirePHP/Library-FirePHPCore/0.3',
-            'X-Wf-1-1-1-1'       => 'test',
-            'X-Wf-1-1-1-2'       => 'test',
-        );
-
-        $this->assertEquals($expected, $handler->getHeaders());
-    }
-
-    public function testConcurrentHandlers()
-    {
-        $handler = new TestFirePHPHandler;
-        $handler->setFormatter($this->getIdentityFormatter());
-        $handler->handle($this->getRecord(Logger::DEBUG));
-        $handler->handle($this->getRecord(Logger::WARNING));
-
-        $handler2 = new TestFirePHPHandler;
-        $handler2->setFormatter($this->getIdentityFormatter());
-        $handler2->handle($this->getRecord(Logger::DEBUG));
-        $handler2->handle($this->getRecord(Logger::WARNING));
-
-        $expected = array(
-            'X-Wf-Protocol-1'    => 'http://meta.wildfirehq.org/Protocol/JsonStream/0.2',
-            'X-Wf-1-Structure-1' => 'http://meta.firephp.org/Wildfire/Structure/FirePHP/FirebugConsole/0.1',
-            'X-Wf-1-Plugin-1'    => 'http://meta.firephp.org/Wildfire/Plugin/FirePHP/Library-FirePHPCore/0.3',
-            'X-Wf-1-1-1-1'       => 'test',
-            'X-Wf-1-1-1-2'       => 'test',
-        );
-
-        $expected2 = array(
-            'X-Wf-1-1-1-3'       => 'test',
-            'X-Wf-1-1-1-4'       => 'test',
-        );
-
-        $this->assertEquals($expected, $handler->getHeaders());
-        $this->assertEquals($expected2, $handler2->getHeaders());
-    }
-}
-
-class TestFirePHPHandler extends FirePHPHandler
-{
-    protected $headers = array();
-
-    public static function reset()
-    {
-        self::$initialized = false;
-        self::$sendHeaders = true;
-        self::$messageIndex = 1;
-    }
-
-    protected function sendHeader($header, $content)
-    {
-        $this->headers[$header] = $content;
-    }
-
-    public function getHeaders()
-    {
-        return $this->headers;
-    }
-}
diff --git a/mayor-orig/www/include/share/googleapi/monolog/monolog/tests/Monolog/Handler/Fixtures/.gitkeep b/mayor-orig/www/include/share/googleapi/monolog/monolog/tests/Monolog/Handler/Fixtures/.gitkeep
deleted file mode 100644
index e69de29b..00000000
diff --git a/mayor-orig/www/include/share/googleapi/monolog/monolog/tests/Monolog/Handler/FleepHookHandlerTest.php b/mayor-orig/www/include/share/googleapi/monolog/monolog/tests/Monolog/Handler/FleepHookHandlerTest.php
deleted file mode 100644
index 91cdd312..00000000
--- a/mayor-orig/www/include/share/googleapi/monolog/monolog/tests/Monolog/Handler/FleepHookHandlerTest.php
+++ /dev/null
@@ -1,85 +0,0 @@
-
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Monolog\Handler;
-
-use Monolog\Formatter\LineFormatter;
-use Monolog\Logger;
-use Monolog\TestCase;
-
-/**
- * @coversDefaultClass \Monolog\Handler\FleepHookHandler
- */
-class FleepHookHandlerTest extends TestCase
-{
-    /**
-     * Default token to use in tests
-     */
-    const TOKEN = '123abc';
-
-    /**
-     * @var FleepHookHandler
-     */
-    private $handler;
-
-    public function setUp()
-    {
-        parent::setUp();
-
-        if (!extension_loaded('openssl')) {
-            $this->markTestSkipped('This test requires openssl extension to run');
-        }
-
-        // Create instances of the handler and logger for convenience
-        $this->handler = new FleepHookHandler(self::TOKEN);
-    }
-
-    /**
-     * @covers ::__construct
-     */
-    public function testConstructorSetsExpectedDefaults()
-    {
-        $this->assertEquals(Logger::DEBUG, $this->handler->getLevel());
-        $this->assertEquals(true, $this->handler->getBubble());
-    }
-
-    /**
-     * @covers ::getDefaultFormatter
-     */
-    public function testHandlerUsesLineFormatterWhichIgnoresEmptyArrays()
-    {
-        $record = array(
-            'message' => 'msg',
-            'context' => array(),
-            'level' => Logger::DEBUG,
-            'level_name' => Logger::getLevelName(Logger::DEBUG),
-            'channel' => 'channel',
-            'datetime' => new \DateTime(),
-            'extra' => array(),
-        );
-
-        $expectedFormatter = new LineFormatter(null, null, true, true);
-        $expected = $expectedFormatter->format($record);
-
-        $handlerFormatter = $this->handler->getFormatter();
-        $actual = $handlerFormatter->format($record);
-
-        $this->assertEquals($expected, $actual, 'Empty context and extra arrays should not be rendered');
-    }
-
-    /**
-     * @covers ::__construct
-     */
-    public function testConnectionStringisConstructedCorrectly()
-    {
-        $this->assertEquals('ssl://' . FleepHookHandler::FLEEP_HOST . ':443', $this->handler->getConnectionString());
-    }
-}
diff --git a/mayor-orig/www/include/share/googleapi/monolog/monolog/tests/Monolog/Handler/FlowdockHandlerTest.php b/mayor-orig/www/include/share/googleapi/monolog/monolog/tests/Monolog/Handler/FlowdockHandlerTest.php
deleted file mode 100644
index 4b120d51..00000000
--- a/mayor-orig/www/include/share/googleapi/monolog/monolog/tests/Monolog/Handler/FlowdockHandlerTest.php
+++ /dev/null
@@ -1,88 +0,0 @@
-
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Monolog\Handler;
-
-use Monolog\Formatter\FlowdockFormatter;
-use Monolog\TestCase;
-use Monolog\Logger;
-
-/**
- * @author Dominik Liebler 
- * @see    https://www.hipchat.com/docs/api
- */
-class FlowdockHandlerTest extends TestCase
-{
-    /**
-     * @var resource
-     */
-    private $res;
-
-    /**
-     * @var FlowdockHandler
-     */
-    private $handler;
-
-    public function setUp()
-    {
-        if (!extension_loaded('openssl')) {
-            $this->markTestSkipped('This test requires openssl to run');
-        }
-    }
-
-    public function testWriteHeader()
-    {
-        $this->createHandler();
-        $this->handler->handle($this->getRecord(Logger::CRITICAL, 'test1'));
-        fseek($this->res, 0);
-        $content = fread($this->res, 1024);
-
-        $this->assertRegexp('/POST \/v1\/messages\/team_inbox\/.* HTTP\/1.1\\r\\nHost: api.flowdock.com\\r\\nContent-Type: application\/json\\r\\nContent-Length: \d{2,4}\\r\\n\\r\\n/', $content);
-
-        return $content;
-    }
-
-    /**
-     * @depends testWriteHeader
-     */
-    public function testWriteContent($content)
-    {
-        $this->assertRegexp('/"source":"test_source"/', $content);
-        $this->assertRegexp('/"from_address":"source@test\.com"/', $content);
-    }
-
-    private function createHandler($token = 'myToken')
-    {
-        $constructorArgs = array($token, Logger::DEBUG);
-        $this->res = fopen('php://memory', 'a');
-        $this->handler = $this->getMock(
-            '\Monolog\Handler\FlowdockHandler',
-            array('fsockopen', 'streamSetTimeout', 'closeSocket'),
-            $constructorArgs
-        );
-
-        $reflectionProperty = new \ReflectionProperty('\Monolog\Handler\SocketHandler', 'connectionString');
-        $reflectionProperty->setAccessible(true);
-        $reflectionProperty->setValue($this->handler, 'localhost:1234');
-
-        $this->handler->expects($this->any())
-            ->method('fsockopen')
-            ->will($this->returnValue($this->res));
-        $this->handler->expects($this->any())
-            ->method('streamSetTimeout')
-            ->will($this->returnValue(true));
-        $this->handler->expects($this->any())
-            ->method('closeSocket')
-            ->will($this->returnValue(true));
-
-        $this->handler->setFormatter(new FlowdockFormatter('test_source', 'source@test.com'));
-    }
-}
diff --git a/mayor-orig/www/include/share/googleapi/monolog/monolog/tests/Monolog/Handler/GelfHandlerLegacyTest.php b/mayor-orig/www/include/share/googleapi/monolog/monolog/tests/Monolog/Handler/GelfHandlerLegacyTest.php
deleted file mode 100644
index 9d007b13..00000000
--- a/mayor-orig/www/include/share/googleapi/monolog/monolog/tests/Monolog/Handler/GelfHandlerLegacyTest.php
+++ /dev/null
@@ -1,95 +0,0 @@
-
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Monolog\Handler;
-
-use Gelf\Message;
-use Monolog\TestCase;
-use Monolog\Logger;
-use Monolog\Formatter\GelfMessageFormatter;
-
-class GelfHandlerLegacyTest extends TestCase
-{
-    public function setUp()
-    {
-        if (!class_exists('Gelf\MessagePublisher') || !class_exists('Gelf\Message')) {
-            $this->markTestSkipped("mlehner/gelf-php not installed");
-        }
-
-        require_once __DIR__ . '/GelfMockMessagePublisher.php';
-    }
-
-    /**
-     * @covers Monolog\Handler\GelfHandler::__construct
-     */
-    public function testConstruct()
-    {
-        $handler = new GelfHandler($this->getMessagePublisher());
-        $this->assertInstanceOf('Monolog\Handler\GelfHandler', $handler);
-    }
-
-    protected function getHandler($messagePublisher)
-    {
-        $handler = new GelfHandler($messagePublisher);
-
-        return $handler;
-    }
-
-    protected function getMessagePublisher()
-    {
-        return new GelfMockMessagePublisher('localhost');
-    }
-
-    public function testDebug()
-    {
-        $messagePublisher = $this->getMessagePublisher();
-        $handler = $this->getHandler($messagePublisher);
-
-        $record = $this->getRecord(Logger::DEBUG, "A test debug message");
-        $handler->handle($record);
-
-        $this->assertEquals(7, $messagePublisher->lastMessage->getLevel());
-        $this->assertEquals('test', $messagePublisher->lastMessage->getFacility());
-        $this->assertEquals($record['message'], $messagePublisher->lastMessage->getShortMessage());
-        $this->assertEquals(null, $messagePublisher->lastMessage->getFullMessage());
-    }
-
-    public function testWarning()
-    {
-        $messagePublisher = $this->getMessagePublisher();
-        $handler = $this->getHandler($messagePublisher);
-
-        $record = $this->getRecord(Logger::WARNING, "A test warning message");
-        $handler->handle($record);
-
-        $this->assertEquals(4, $messagePublisher->lastMessage->getLevel());
-        $this->assertEquals('test', $messagePublisher->lastMessage->getFacility());
-        $this->assertEquals($record['message'], $messagePublisher->lastMessage->getShortMessage());
-        $this->assertEquals(null, $messagePublisher->lastMessage->getFullMessage());
-    }
-
-    public function testInjectedGelfMessageFormatter()
-    {
-        $messagePublisher = $this->getMessagePublisher();
-        $handler = $this->getHandler($messagePublisher);
-
-        $handler->setFormatter(new GelfMessageFormatter('mysystem', 'EXT', 'CTX'));
-
-        $record = $this->getRecord(Logger::WARNING, "A test warning message");
-        $record['extra']['blarg'] = 'yep';
-        $record['context']['from'] = 'logger';
-        $handler->handle($record);
-
-        $this->assertEquals('mysystem', $messagePublisher->lastMessage->getHost());
-        $this->assertArrayHasKey('_EXTblarg', $messagePublisher->lastMessage->toArray());
-        $this->assertArrayHasKey('_CTXfrom', $messagePublisher->lastMessage->toArray());
-    }
-}
diff --git a/mayor-orig/www/include/share/googleapi/monolog/monolog/tests/Monolog/Handler/GelfHandlerTest.php b/mayor-orig/www/include/share/googleapi/monolog/monolog/tests/Monolog/Handler/GelfHandlerTest.php
deleted file mode 100644
index 8cdd64f4..00000000
--- a/mayor-orig/www/include/share/googleapi/monolog/monolog/tests/Monolog/Handler/GelfHandlerTest.php
+++ /dev/null
@@ -1,117 +0,0 @@
-
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Monolog\Handler;
-
-use Gelf\Message;
-use Monolog\TestCase;
-use Monolog\Logger;
-use Monolog\Formatter\GelfMessageFormatter;
-
-class GelfHandlerTest extends TestCase
-{
-    public function setUp()
-    {
-        if (!class_exists('Gelf\Publisher') || !class_exists('Gelf\Message')) {
-            $this->markTestSkipped("graylog2/gelf-php not installed");
-        }
-    }
-
-    /**
-     * @covers Monolog\Handler\GelfHandler::__construct
-     */
-    public function testConstruct()
-    {
-        $handler = new GelfHandler($this->getMessagePublisher());
-        $this->assertInstanceOf('Monolog\Handler\GelfHandler', $handler);
-    }
-
-    protected function getHandler($messagePublisher)
-    {
-        $handler = new GelfHandler($messagePublisher);
-
-        return $handler;
-    }
-
-    protected function getMessagePublisher()
-    {
-        return $this->getMock('Gelf\Publisher', array('publish'), array(), '', false);
-    }
-
-    public function testDebug()
-    {
-        $record = $this->getRecord(Logger::DEBUG, "A test debug message");
-        $expectedMessage = new Message();
-        $expectedMessage
-            ->setLevel(7)
-            ->setFacility("test")
-            ->setShortMessage($record['message'])
-            ->setTimestamp($record['datetime'])
-        ;
-
-        $messagePublisher = $this->getMessagePublisher();
-        $messagePublisher->expects($this->once())
-            ->method('publish')
-            ->with($expectedMessage);
-
-        $handler = $this->getHandler($messagePublisher);
-
-        $handler->handle($record);
-    }
-
-    public function testWarning()
-    {
-        $record = $this->getRecord(Logger::WARNING, "A test warning message");
-        $expectedMessage = new Message();
-        $expectedMessage
-            ->setLevel(4)
-            ->setFacility("test")
-            ->setShortMessage($record['message'])
-            ->setTimestamp($record['datetime'])
-        ;
-
-        $messagePublisher = $this->getMessagePublisher();
-        $messagePublisher->expects($this->once())
-            ->method('publish')
-            ->with($expectedMessage);
-
-        $handler = $this->getHandler($messagePublisher);
-
-        $handler->handle($record);
-    }
-
-    public function testInjectedGelfMessageFormatter()
-    {
-        $record = $this->getRecord(Logger::WARNING, "A test warning message");
-        $record['extra']['blarg'] = 'yep';
-        $record['context']['from'] = 'logger';
-
-        $expectedMessage = new Message();
-        $expectedMessage
-            ->setLevel(4)
-            ->setFacility("test")
-            ->setHost("mysystem")
-            ->setShortMessage($record['message'])
-            ->setTimestamp($record['datetime'])
-            ->setAdditional("EXTblarg", 'yep')
-            ->setAdditional("CTXfrom", 'logger')
-        ;
-
-        $messagePublisher = $this->getMessagePublisher();
-        $messagePublisher->expects($this->once())
-            ->method('publish')
-            ->with($expectedMessage);
-
-        $handler = $this->getHandler($messagePublisher);
-        $handler->setFormatter(new GelfMessageFormatter('mysystem', 'EXT', 'CTX'));
-        $handler->handle($record);
-    }
-}
diff --git a/mayor-orig/www/include/share/googleapi/monolog/monolog/tests/Monolog/Handler/GelfMockMessagePublisher.php b/mayor-orig/www/include/share/googleapi/monolog/monolog/tests/Monolog/Handler/GelfMockMessagePublisher.php
deleted file mode 100644
index 873d92fb..00000000
--- a/mayor-orig/www/include/share/googleapi/monolog/monolog/tests/Monolog/Handler/GelfMockMessagePublisher.php
+++ /dev/null
@@ -1,25 +0,0 @@
-
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Monolog\Handler;
-
-use Gelf\MessagePublisher;
-use Gelf\Message;
-
-class GelfMockMessagePublisher extends MessagePublisher
-{
-    public function publish(Message $message)
-    {
-        $this->lastMessage = $message;
-    }
-
-    public $lastMessage = null;
-}
diff --git a/mayor-orig/www/include/share/googleapi/monolog/monolog/tests/Monolog/Handler/GroupHandlerTest.php b/mayor-orig/www/include/share/googleapi/monolog/monolog/tests/Monolog/Handler/GroupHandlerTest.php
deleted file mode 100644
index a1b86176..00000000
--- a/mayor-orig/www/include/share/googleapi/monolog/monolog/tests/Monolog/Handler/GroupHandlerTest.php
+++ /dev/null
@@ -1,112 +0,0 @@
-
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Monolog\Handler;
-
-use Monolog\TestCase;
-use Monolog\Logger;
-
-class GroupHandlerTest extends TestCase
-{
-    /**
-     * @covers Monolog\Handler\GroupHandler::__construct
-     * @expectedException InvalidArgumentException
-     */
-    public function testConstructorOnlyTakesHandler()
-    {
-        new GroupHandler(array(new TestHandler(), "foo"));
-    }
-
-    /**
-     * @covers Monolog\Handler\GroupHandler::__construct
-     * @covers Monolog\Handler\GroupHandler::handle
-     */
-    public function testHandle()
-    {
-        $testHandlers = array(new TestHandler(), new TestHandler());
-        $handler = new GroupHandler($testHandlers);
-        $handler->handle($this->getRecord(Logger::DEBUG));
-        $handler->handle($this->getRecord(Logger::INFO));
-        foreach ($testHandlers as $test) {
-            $this->assertTrue($test->hasDebugRecords());
-            $this->assertTrue($test->hasInfoRecords());
-            $this->assertTrue(count($test->getRecords()) === 2);
-        }
-    }
-
-    /**
-     * @covers Monolog\Handler\GroupHandler::handleBatch
-     */
-    public function testHandleBatch()
-    {
-        $testHandlers = array(new TestHandler(), new TestHandler());
-        $handler = new GroupHandler($testHandlers);
-        $handler->handleBatch(array($this->getRecord(Logger::DEBUG), $this->getRecord(Logger::INFO)));
-        foreach ($testHandlers as $test) {
-            $this->assertTrue($test->hasDebugRecords());
-            $this->assertTrue($test->hasInfoRecords());
-            $this->assertTrue(count($test->getRecords()) === 2);
-        }
-    }
-
-    /**
-     * @covers Monolog\Handler\GroupHandler::isHandling
-     */
-    public function testIsHandling()
-    {
-        $testHandlers = array(new TestHandler(Logger::ERROR), new TestHandler(Logger::WARNING));
-        $handler = new GroupHandler($testHandlers);
-        $this->assertTrue($handler->isHandling($this->getRecord(Logger::ERROR)));
-        $this->assertTrue($handler->isHandling($this->getRecord(Logger::WARNING)));
-        $this->assertFalse($handler->isHandling($this->getRecord(Logger::DEBUG)));
-    }
-
-    /**
-     * @covers Monolog\Handler\GroupHandler::handle
-     */
-    public function testHandleUsesProcessors()
-    {
-        $test = new TestHandler();
-        $handler = new GroupHandler(array($test));
-        $handler->pushProcessor(function ($record) {
-            $record['extra']['foo'] = true;
-
-            return $record;
-        });
-        $handler->handle($this->getRecord(Logger::WARNING));
-        $this->assertTrue($test->hasWarningRecords());
-        $records = $test->getRecords();
-        $this->assertTrue($records[0]['extra']['foo']);
-    }
-
-    /**
-     * @covers Monolog\Handler\GroupHandler::handle
-     */
-    public function testHandleBatchUsesProcessors()
-    {
-        $testHandlers = array(new TestHandler(), new TestHandler());
-        $handler = new GroupHandler($testHandlers);
-        $handler->pushProcessor(function ($record) {
-            $record['extra']['foo'] = true;
-
-            return $record;
-        });
-        $handler->handleBatch(array($this->getRecord(Logger::DEBUG), $this->getRecord(Logger::INFO)));
-        foreach ($testHandlers as $test) {
-            $this->assertTrue($test->hasDebugRecords());
-            $this->assertTrue($test->hasInfoRecords());
-            $this->assertTrue(count($test->getRecords()) === 2);
-            $records = $test->getRecords();
-            $this->assertTrue($records[0]['extra']['foo']);
-            $this->assertTrue($records[1]['extra']['foo']);
-        }
-    }
-}
diff --git a/mayor-orig/www/include/share/googleapi/monolog/monolog/tests/Monolog/Handler/HandlerWrapperTest.php b/mayor-orig/www/include/share/googleapi/monolog/monolog/tests/Monolog/Handler/HandlerWrapperTest.php
deleted file mode 100644
index d8d0452c..00000000
--- a/mayor-orig/www/include/share/googleapi/monolog/monolog/tests/Monolog/Handler/HandlerWrapperTest.php
+++ /dev/null
@@ -1,130 +0,0 @@
-
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Monolog\Handler;
-
-use Monolog\TestCase;
-
-/**
- * @author Alexey Karapetov 
- */
-class HandlerWrapperTest extends TestCase
-{
-    /**
-     * @var HandlerWrapper
-     */
-    private $wrapper;
-
-    private $handler;
-
-    public function setUp()
-    {
-        parent::setUp();
-        $this->handler = $this->getMock('Monolog\\Handler\\HandlerInterface');
-        $this->wrapper = new HandlerWrapper($this->handler);
-    }
-
-    /**
-     * @return array
-     */
-    public function trueFalseDataProvider()
-    {
-        return array(
-            array(true),
-            array(false),
-        );
-    }
-
-    /**
-     * @param $result
-     * @dataProvider trueFalseDataProvider
-     */
-    public function testIsHandling($result)
-    {
-        $record = $this->getRecord();
-        $this->handler->expects($this->once())
-            ->method('isHandling')
-            ->with($record)
-            ->willReturn($result);
-
-        $this->assertEquals($result, $this->wrapper->isHandling($record));
-    }
-
-    /**
-     * @param $result
-     * @dataProvider trueFalseDataProvider
-     */
-    public function testHandle($result)
-    {
-        $record = $this->getRecord();
-        $this->handler->expects($this->once())
-            ->method('handle')
-            ->with($record)
-            ->willReturn($result);
-
-        $this->assertEquals($result, $this->wrapper->handle($record));
-    }
-
-    /**
-     * @param $result
-     * @dataProvider trueFalseDataProvider
-     */
-    public function testHandleBatch($result)
-    {
-        $records = $this->getMultipleRecords();
-        $this->handler->expects($this->once())
-            ->method('handleBatch')
-            ->with($records)
-            ->willReturn($result);
-
-        $this->assertEquals($result, $this->wrapper->handleBatch($records));
-    }
-
-    public function testPushProcessor()
-    {
-        $processor = function () {};
-        $this->handler->expects($this->once())
-            ->method('pushProcessor')
-            ->with($processor);
-
-        $this->assertEquals($this->wrapper, $this->wrapper->pushProcessor($processor));
-    }
-
-    public function testPopProcessor()
-    {
-        $processor = function () {};
-        $this->handler->expects($this->once())
-            ->method('popProcessor')
-            ->willReturn($processor);
-
-        $this->assertEquals($processor, $this->wrapper->popProcessor());
-    }
-
-    public function testSetFormatter()
-    {
-        $formatter = $this->getMock('Monolog\\Formatter\\FormatterInterface');
-        $this->handler->expects($this->once())
-            ->method('setFormatter')
-            ->with($formatter);
-
-        $this->assertEquals($this->wrapper, $this->wrapper->setFormatter($formatter));
-    }
-
-    public function testGetFormatter()
-    {
-        $formatter = $this->getMock('Monolog\\Formatter\\FormatterInterface');
-        $this->handler->expects($this->once())
-            ->method('getFormatter')
-            ->willReturn($formatter);
-
-        $this->assertEquals($formatter, $this->wrapper->getFormatter());
-    }
-}
diff --git a/mayor-orig/www/include/share/googleapi/monolog/monolog/tests/Monolog/Handler/HipChatHandlerTest.php b/mayor-orig/www/include/share/googleapi/monolog/monolog/tests/Monolog/Handler/HipChatHandlerTest.php
deleted file mode 100644
index 52dc9dac..00000000
--- a/mayor-orig/www/include/share/googleapi/monolog/monolog/tests/Monolog/Handler/HipChatHandlerTest.php
+++ /dev/null
@@ -1,279 +0,0 @@
-
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Monolog\Handler;
-
-use Monolog\TestCase;
-use Monolog\Logger;
-
-/**
- * @author Rafael Dohms 
- * @see    https://www.hipchat.com/docs/api
- */
-class HipChatHandlerTest extends TestCase
-{
-    private $res;
-    /** @var  HipChatHandler */
-    private $handler;
-
-    public function testWriteHeader()
-    {
-        $this->createHandler();
-        $this->handler->handle($this->getRecord(Logger::CRITICAL, 'test1'));
-        fseek($this->res, 0);
-        $content = fread($this->res, 1024);
-
-        $this->assertRegexp('/POST \/v1\/rooms\/message\?format=json&auth_token=.* HTTP\/1.1\\r\\nHost: api.hipchat.com\\r\\nContent-Type: application\/x-www-form-urlencoded\\r\\nContent-Length: \d{2,4}\\r\\n\\r\\n/', $content);
-
-        return $content;
-    }
-
-    public function testWriteCustomHostHeader()
-    {
-        $this->createHandler('myToken', 'room1', 'Monolog', true, 'hipchat.foo.bar');
-        $this->handler->handle($this->getRecord(Logger::CRITICAL, 'test1'));
-        fseek($this->res, 0);
-        $content = fread($this->res, 1024);
-
-        $this->assertRegexp('/POST \/v1\/rooms\/message\?format=json&auth_token=.* HTTP\/1.1\\r\\nHost: hipchat.foo.bar\\r\\nContent-Type: application\/x-www-form-urlencoded\\r\\nContent-Length: \d{2,4}\\r\\n\\r\\n/', $content);
-
-        return $content;
-    }
-
-    public function testWriteV2()
-    {
-        $this->createHandler('myToken', 'room1', 'Monolog', false, 'hipchat.foo.bar', 'v2');
-        $this->handler->handle($this->getRecord(Logger::CRITICAL, 'test1'));
-        fseek($this->res, 0);
-        $content = fread($this->res, 1024);
-
-        $this->assertRegexp('/POST \/v2\/room\/room1\/notification\?auth_token=.* HTTP\/1.1\\r\\nHost: hipchat.foo.bar\\r\\nContent-Type: application\/x-www-form-urlencoded\\r\\nContent-Length: \d{2,4}\\r\\n\\r\\n/', $content);
-
-        return $content;
-    }
-
-    public function testWriteV2Notify()
-    {
-        $this->createHandler('myToken', 'room1', 'Monolog', true, 'hipchat.foo.bar', 'v2');
-        $this->handler->handle($this->getRecord(Logger::CRITICAL, 'test1'));
-        fseek($this->res, 0);
-        $content = fread($this->res, 1024);
-
-        $this->assertRegexp('/POST \/v2\/room\/room1\/notification\?auth_token=.* HTTP\/1.1\\r\\nHost: hipchat.foo.bar\\r\\nContent-Type: application\/x-www-form-urlencoded\\r\\nContent-Length: \d{2,4}\\r\\n\\r\\n/', $content);
-
-        return $content;
-    }
-
-    public function testRoomSpaces()
-    {
-        $this->createHandler('myToken', 'room name', 'Monolog', false, 'hipchat.foo.bar', 'v2');
-        $this->handler->handle($this->getRecord(Logger::CRITICAL, 'test1'));
-        fseek($this->res, 0);
-        $content = fread($this->res, 1024);
-
-        $this->assertRegexp('/POST \/v2\/room\/room%20name\/notification\?auth_token=.* HTTP\/1.1\\r\\nHost: hipchat.foo.bar\\r\\nContent-Type: application\/x-www-form-urlencoded\\r\\nContent-Length: \d{2,4}\\r\\n\\r\\n/', $content);
-
-        return $content;
-    }
-
-    /**
-     * @depends testWriteHeader
-     */
-    public function testWriteContent($content)
-    {
-        $this->assertRegexp('/notify=0&message=test1&message_format=text&color=red&room_id=room1&from=Monolog$/', $content);
-    }
-
-    public function testWriteContentV1WithoutName()
-    {
-        $this->createHandler('myToken', 'room1', null, false, 'hipchat.foo.bar', 'v1');
-        $this->handler->handle($this->getRecord(Logger::CRITICAL, 'test1'));
-        fseek($this->res, 0);
-        $content = fread($this->res, 1024);
-
-        $this->assertRegexp('/notify=0&message=test1&message_format=text&color=red&room_id=room1&from=$/', $content);
-
-        return $content;
-    }
-
-    /**
-     * @depends testWriteCustomHostHeader
-     */
-    public function testWriteContentNotify($content)
-    {
-        $this->assertRegexp('/notify=1&message=test1&message_format=text&color=red&room_id=room1&from=Monolog$/', $content);
-    }
-
-    /**
-     * @depends testWriteV2
-     */
-    public function testWriteContentV2($content)
-    {
-        $this->assertRegexp('/notify=false&message=test1&message_format=text&color=red&from=Monolog$/', $content);
-    }
-
-    /**
-     * @depends testWriteV2Notify
-     */
-    public function testWriteContentV2Notify($content)
-    {
-        $this->assertRegexp('/notify=true&message=test1&message_format=text&color=red&from=Monolog$/', $content);
-    }
-
-    public function testWriteContentV2WithoutName()
-    {
-        $this->createHandler('myToken', 'room1', null, false, 'hipchat.foo.bar', 'v2');
-        $this->handler->handle($this->getRecord(Logger::CRITICAL, 'test1'));
-        fseek($this->res, 0);
-        $content = fread($this->res, 1024);
-
-        $this->assertRegexp('/notify=false&message=test1&message_format=text&color=red$/', $content);
-
-        return $content;
-    }
-
-    public function testWriteWithComplexMessage()
-    {
-        $this->createHandler();
-        $this->handler->handle($this->getRecord(Logger::CRITICAL, 'Backup of database "example" finished in 16 minutes.'));
-        fseek($this->res, 0);
-        $content = fread($this->res, 1024);
-
-        $this->assertRegexp('/message=Backup\+of\+database\+%22example%22\+finished\+in\+16\+minutes\./', $content);
-    }
-
-    public function testWriteTruncatesLongMessage()
-    {
-        $this->createHandler();
-        $this->handler->handle($this->getRecord(Logger::CRITICAL, str_repeat('abcde', 2000)));
-        fseek($this->res, 0);
-        $content = fread($this->res, 12000);
-
-        $this->assertRegexp('/message='.str_repeat('abcde', 1900).'\+%5Btruncated%5D/', $content);
-    }
-
-    /**
-     * @dataProvider provideLevelColors
-     */
-    public function testWriteWithErrorLevelsAndColors($level, $expectedColor)
-    {
-        $this->createHandler();
-        $this->handler->handle($this->getRecord($level, 'Backup of database "example" finished in 16 minutes.'));
-        fseek($this->res, 0);
-        $content = fread($this->res, 1024);
-
-        $this->assertRegexp('/color='.$expectedColor.'/', $content);
-    }
-
-    public function provideLevelColors()
-    {
-        return array(
-            array(Logger::DEBUG,    'gray'),
-            array(Logger::INFO,     'green'),
-            array(Logger::WARNING,  'yellow'),
-            array(Logger::ERROR,    'red'),
-            array(Logger::CRITICAL, 'red'),
-            array(Logger::ALERT,    'red'),
-            array(Logger::EMERGENCY,'red'),
-            array(Logger::NOTICE,   'green'),
-        );
-    }
-
-    /**
-     * @dataProvider provideBatchRecords
-     */
-    public function testHandleBatch($records, $expectedColor)
-    {
-        $this->createHandler();
-
-        $this->handler->handleBatch($records);
-
-        fseek($this->res, 0);
-        $content = fread($this->res, 1024);
-
-        $this->assertRegexp('/color='.$expectedColor.'/', $content);
-    }
-
-    public function provideBatchRecords()
-    {
-        return array(
-            array(
-                array(
-                    array('level' => Logger::WARNING, 'message' => 'Oh bugger!', 'level_name' => 'warning', 'datetime' => new \DateTime()),
-                    array('level' => Logger::NOTICE, 'message' => 'Something noticeable happened.', 'level_name' => 'notice', 'datetime' => new \DateTime()),
-                    array('level' => Logger::CRITICAL, 'message' => 'Everything is broken!', 'level_name' => 'critical', 'datetime' => new \DateTime()),
-                ),
-                'red',
-            ),
-            array(
-                array(
-                    array('level' => Logger::WARNING, 'message' => 'Oh bugger!', 'level_name' => 'warning', 'datetime' => new \DateTime()),
-                    array('level' => Logger::NOTICE, 'message' => 'Something noticeable happened.', 'level_name' => 'notice', 'datetime' => new \DateTime()),
-                ),
-                'yellow',
-            ),
-            array(
-                array(
-                    array('level' => Logger::DEBUG, 'message' => 'Just debugging.', 'level_name' => 'debug', 'datetime' => new \DateTime()),
-                    array('level' => Logger::NOTICE, 'message' => 'Something noticeable happened.', 'level_name' => 'notice', 'datetime' => new \DateTime()),
-                ),
-                'green',
-            ),
-            array(
-                array(
-                    array('level' => Logger::DEBUG, 'message' => 'Just debugging.', 'level_name' => 'debug', 'datetime' => new \DateTime()),
-                ),
-                'gray',
-            ),
-        );
-    }
-
-    private function createHandler($token = 'myToken', $room = 'room1', $name = 'Monolog', $notify = false, $host = 'api.hipchat.com', $version = 'v1')
-    {
-        $constructorArgs = array($token, $room, $name, $notify, Logger::DEBUG, true, true, 'text', $host, $version);
-        $this->res = fopen('php://memory', 'a');
-        $this->handler = $this->getMock(
-            '\Monolog\Handler\HipChatHandler',
-            array('fsockopen', 'streamSetTimeout', 'closeSocket'),
-            $constructorArgs
-        );
-
-        $reflectionProperty = new \ReflectionProperty('\Monolog\Handler\SocketHandler', 'connectionString');
-        $reflectionProperty->setAccessible(true);
-        $reflectionProperty->setValue($this->handler, 'localhost:1234');
-
-        $this->handler->expects($this->any())
-            ->method('fsockopen')
-            ->will($this->returnValue($this->res));
-        $this->handler->expects($this->any())
-            ->method('streamSetTimeout')
-            ->will($this->returnValue(true));
-        $this->handler->expects($this->any())
-            ->method('closeSocket')
-            ->will($this->returnValue(true));
-
-        $this->handler->setFormatter($this->getIdentityFormatter());
-    }
-
-    /**
-     * @expectedException InvalidArgumentException
-     */
-    public function testCreateWithTooLongName()
-    {
-        $hipChatHandler = new HipChatHandler('token', 'room', 'SixteenCharsHere');
-    }
-
-    public function testCreateWithTooLongNameV2()
-    {
-        // creating a handler with too long of a name but using the v2 api doesn't matter.
-        $hipChatHandler = new HipChatHandler('token', 'room', 'SixteenCharsHere', false, Logger::CRITICAL, true, true, 'test', 'api.hipchat.com', 'v2');
-    }
-}
diff --git a/mayor-orig/www/include/share/googleapi/monolog/monolog/tests/Monolog/Handler/LogEntriesHandlerTest.php b/mayor-orig/www/include/share/googleapi/monolog/monolog/tests/Monolog/Handler/LogEntriesHandlerTest.php
deleted file mode 100644
index b2deb40a..00000000
--- a/mayor-orig/www/include/share/googleapi/monolog/monolog/tests/Monolog/Handler/LogEntriesHandlerTest.php
+++ /dev/null
@@ -1,84 +0,0 @@
-
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Monolog\Handler;
-
-use Monolog\TestCase;
-use Monolog\Logger;
-
-/**
- * @author Robert Kaufmann III 
- */
-class LogEntriesHandlerTest extends TestCase
-{
-    /**
-     * @var resource
-     */
-    private $res;
-
-    /**
-     * @var LogEntriesHandler
-     */
-    private $handler;
-
-    public function testWriteContent()
-    {
-        $this->createHandler();
-        $this->handler->handle($this->getRecord(Logger::CRITICAL, 'Critical write test'));
-
-        fseek($this->res, 0);
-        $content = fread($this->res, 1024);
-
-        $this->assertRegexp('/testToken \[\d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2}\] test.CRITICAL: Critical write test/', $content);
-    }
-
-    public function testWriteBatchContent()
-    {
-        $records = array(
-            $this->getRecord(),
-            $this->getRecord(),
-            $this->getRecord(),
-        );
-        $this->createHandler();
-        $this->handler->handleBatch($records);
-
-        fseek($this->res, 0);
-        $content = fread($this->res, 1024);
-
-        $this->assertRegexp('/(testToken \[\d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2}\] .* \[\] \[\]\n){3}/', $content);
-    }
-
-    private function createHandler()
-    {
-        $useSSL = extension_loaded('openssl');
-        $args = array('testToken', $useSSL, Logger::DEBUG, true);
-        $this->res = fopen('php://memory', 'a');
-        $this->handler = $this->getMock(
-            '\Monolog\Handler\LogEntriesHandler',
-            array('fsockopen', 'streamSetTimeout', 'closeSocket'),
-            $args
-        );
-
-        $reflectionProperty = new \ReflectionProperty('\Monolog\Handler\SocketHandler', 'connectionString');
-        $reflectionProperty->setAccessible(true);
-        $reflectionProperty->setValue($this->handler, 'localhost:1234');
-
-        $this->handler->expects($this->any())
-            ->method('fsockopen')
-            ->will($this->returnValue($this->res));
-        $this->handler->expects($this->any())
-            ->method('streamSetTimeout')
-            ->will($this->returnValue(true));
-        $this->handler->expects($this->any())
-            ->method('closeSocket')
-            ->will($this->returnValue(true));
-    }
-}
diff --git a/mayor-orig/www/include/share/googleapi/monolog/monolog/tests/Monolog/Handler/MailHandlerTest.php b/mayor-orig/www/include/share/googleapi/monolog/monolog/tests/Monolog/Handler/MailHandlerTest.php
deleted file mode 100644
index 6754f3d6..00000000
--- a/mayor-orig/www/include/share/googleapi/monolog/monolog/tests/Monolog/Handler/MailHandlerTest.php
+++ /dev/null
@@ -1,75 +0,0 @@
-
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Monolog\Handler;
-
-use Monolog\Logger;
-use Monolog\TestCase;
-
-class MailHandlerTest extends TestCase
-{
-    /**
-     * @covers Monolog\Handler\MailHandler::handleBatch
-     */
-    public function testHandleBatch()
-    {
-        $formatter = $this->getMock('Monolog\\Formatter\\FormatterInterface');
-        $formatter->expects($this->once())
-            ->method('formatBatch'); // Each record is formatted
-
-        $handler = $this->getMockForAbstractClass('Monolog\\Handler\\MailHandler');
-        $handler->expects($this->once())
-            ->method('send');
-        $handler->expects($this->never())
-            ->method('write'); // write is for individual records
-
-        $handler->setFormatter($formatter);
-
-        $handler->handleBatch($this->getMultipleRecords());
-    }
-
-    /**
-     * @covers Monolog\Handler\MailHandler::handleBatch
-     */
-    public function testHandleBatchNotSendsMailIfMessagesAreBelowLevel()
-    {
-        $records = array(
-            $this->getRecord(Logger::DEBUG, 'debug message 1'),
-            $this->getRecord(Logger::DEBUG, 'debug message 2'),
-            $this->getRecord(Logger::INFO, 'information'),
-        );
-
-        $handler = $this->getMockForAbstractClass('Monolog\\Handler\\MailHandler');
-        $handler->expects($this->never())
-            ->method('send');
-        $handler->setLevel(Logger::ERROR);
-
-        $handler->handleBatch($records);
-    }
-
-    /**
-     * @covers Monolog\Handler\MailHandler::write
-     */
-    public function testHandle()
-    {
-        $handler = $this->getMockForAbstractClass('Monolog\\Handler\\MailHandler');
-
-        $record = $this->getRecord();
-        $records = array($record);
-        $records[0]['formatted'] = '['.$record['datetime']->format('Y-m-d H:i:s').'] test.WARNING: test [] []'."\n";
-
-        $handler->expects($this->once())
-            ->method('send')
-            ->with($records[0]['formatted'], $records);
-
-        $handler->handle($record);
-    }
-}
diff --git a/mayor-orig/www/include/share/googleapi/monolog/monolog/tests/Monolog/Handler/MockRavenClient.php b/mayor-orig/www/include/share/googleapi/monolog/monolog/tests/Monolog/Handler/MockRavenClient.php
deleted file mode 100644
index a0833225..00000000
--- a/mayor-orig/www/include/share/googleapi/monolog/monolog/tests/Monolog/Handler/MockRavenClient.php
+++ /dev/null
@@ -1,27 +0,0 @@
-
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Monolog\Handler;
-
-use Raven_Client;
-
-class MockRavenClient extends Raven_Client
-{
-    public function capture($data, $stack, $vars = null)
-    {
-        $data = array_merge($this->get_user_data(), $data);
-        $this->lastData = $data;
-        $this->lastStack = $stack;
-    }
-
-    public $lastData;
-    public $lastStack;
-}
diff --git a/mayor-orig/www/include/share/googleapi/monolog/monolog/tests/Monolog/Handler/MongoDBHandlerTest.php b/mayor-orig/www/include/share/googleapi/monolog/monolog/tests/Monolog/Handler/MongoDBHandlerTest.php
deleted file mode 100644
index 0fdef63a..00000000
--- a/mayor-orig/www/include/share/googleapi/monolog/monolog/tests/Monolog/Handler/MongoDBHandlerTest.php
+++ /dev/null
@@ -1,65 +0,0 @@
-
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Monolog\Handler;
-
-use Monolog\TestCase;
-use Monolog\Logger;
-
-class MongoDBHandlerTest extends TestCase
-{
-    /**
-     * @expectedException InvalidArgumentException
-     */
-    public function testConstructorShouldThrowExceptionForInvalidMongo()
-    {
-        new MongoDBHandler(new \stdClass(), 'DB', 'Collection');
-    }
-
-    public function testHandle()
-    {
-        $mongo = $this->getMock('Mongo', array('selectCollection'), array(), '', false);
-        $collection = $this->getMock('stdClass', array('save'));
-
-        $mongo->expects($this->once())
-            ->method('selectCollection')
-            ->with('DB', 'Collection')
-            ->will($this->returnValue($collection));
-
-        $record = $this->getRecord(Logger::WARNING, 'test', array('data' => new \stdClass, 'foo' => 34));
-
-        $expected = array(
-            'message' => 'test',
-            'context' => array('data' => '[object] (stdClass: {})', 'foo' => 34),
-            'level' => Logger::WARNING,
-            'level_name' => 'WARNING',
-            'channel' => 'test',
-            'datetime' => $record['datetime']->format('Y-m-d H:i:s'),
-            'extra' => array(),
-        );
-
-        $collection->expects($this->once())
-            ->method('save')
-            ->with($expected);
-
-        $handler = new MongoDBHandler($mongo, 'DB', 'Collection');
-        $handler->handle($record);
-    }
-}
-
-if (!class_exists('Mongo')) {
-    class Mongo
-    {
-        public function selectCollection()
-        {
-        }
-    }
-}
diff --git a/mayor-orig/www/include/share/googleapi/monolog/monolog/tests/Monolog/Handler/NativeMailerHandlerTest.php b/mayor-orig/www/include/share/googleapi/monolog/monolog/tests/Monolog/Handler/NativeMailerHandlerTest.php
deleted file mode 100644
index ddf545db..00000000
--- a/mayor-orig/www/include/share/googleapi/monolog/monolog/tests/Monolog/Handler/NativeMailerHandlerTest.php
+++ /dev/null
@@ -1,111 +0,0 @@
-
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Monolog\Handler;
-
-use Monolog\TestCase;
-use Monolog\Logger;
-use InvalidArgumentException;
-
-function mail($to, $subject, $message, $additional_headers = null, $additional_parameters = null)
-{
-    $GLOBALS['mail'][] = func_get_args();
-}
-
-class NativeMailerHandlerTest extends TestCase
-{
-    protected function setUp()
-    {
-        $GLOBALS['mail'] = array();
-    }
-
-    /**
-     * @expectedException InvalidArgumentException
-     */
-    public function testConstructorHeaderInjection()
-    {
-        $mailer = new NativeMailerHandler('spammer@example.org', 'dear victim', "receiver@example.org\r\nFrom: faked@attacker.org");
-    }
-
-    /**
-     * @expectedException InvalidArgumentException
-     */
-    public function testSetterHeaderInjection()
-    {
-        $mailer = new NativeMailerHandler('spammer@example.org', 'dear victim', 'receiver@example.org');
-        $mailer->addHeader("Content-Type: text/html\r\nFrom: faked@attacker.org");
-    }
-
-    /**
-     * @expectedException InvalidArgumentException
-     */
-    public function testSetterArrayHeaderInjection()
-    {
-        $mailer = new NativeMailerHandler('spammer@example.org', 'dear victim', 'receiver@example.org');
-        $mailer->addHeader(array("Content-Type: text/html\r\nFrom: faked@attacker.org"));
-    }
-
-    /**
-     * @expectedException InvalidArgumentException
-     */
-    public function testSetterContentTypeInjection()
-    {
-        $mailer = new NativeMailerHandler('spammer@example.org', 'dear victim', 'receiver@example.org');
-        $mailer->setContentType("text/html\r\nFrom: faked@attacker.org");
-    }
-
-    /**
-     * @expectedException InvalidArgumentException
-     */
-    public function testSetterEncodingInjection()
-    {
-        $mailer = new NativeMailerHandler('spammer@example.org', 'dear victim', 'receiver@example.org');
-        $mailer->setEncoding("utf-8\r\nFrom: faked@attacker.org");
-    }
-
-    public function testSend()
-    {
-        $to = 'spammer@example.org';
-        $subject = 'dear victim';
-        $from = 'receiver@example.org';
-
-        $mailer = new NativeMailerHandler($to, $subject, $from);
-        $mailer->handleBatch(array());
-
-        // batch is empty, nothing sent
-        $this->assertEmpty($GLOBALS['mail']);
-
-        // non-empty batch
-        $mailer->handle($this->getRecord(Logger::ERROR, "Foo\nBar\r\n\r\nBaz"));
-        $this->assertNotEmpty($GLOBALS['mail']);
-        $this->assertInternalType('array', $GLOBALS['mail']);
-        $this->assertArrayHasKey('0', $GLOBALS['mail']);
-        $params = $GLOBALS['mail'][0];
-        $this->assertCount(5, $params);
-        $this->assertSame($to, $params[0]);
-        $this->assertSame($subject, $params[1]);
-        $this->assertStringEndsWith(" test.ERROR: Foo Bar  Baz [] []\n", $params[2]);
-        $this->assertSame("From: $from\r\nContent-type: text/plain; charset=utf-8\r\n", $params[3]);
-        $this->assertSame('', $params[4]);
-    }
-
-    public function testMessageSubjectFormatting()
-    {
-        $mailer = new NativeMailerHandler('to@example.org', 'Alert: %level_name% %message%', 'from@example.org');
-        $mailer->handle($this->getRecord(Logger::ERROR, "Foo\nBar\r\n\r\nBaz"));
-        $this->assertNotEmpty($GLOBALS['mail']);
-        $this->assertInternalType('array', $GLOBALS['mail']);
-        $this->assertArrayHasKey('0', $GLOBALS['mail']);
-        $params = $GLOBALS['mail'][0];
-        $this->assertCount(5, $params);
-        $this->assertSame('Alert: ERROR Foo Bar  Baz', $params[1]);
-    }
-}
diff --git a/mayor-orig/www/include/share/googleapi/monolog/monolog/tests/Monolog/Handler/NewRelicHandlerTest.php b/mayor-orig/www/include/share/googleapi/monolog/monolog/tests/Monolog/Handler/NewRelicHandlerTest.php
deleted file mode 100644
index 4d3a615f..00000000
--- a/mayor-orig/www/include/share/googleapi/monolog/monolog/tests/Monolog/Handler/NewRelicHandlerTest.php
+++ /dev/null
@@ -1,200 +0,0 @@
-
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Monolog\Handler;
-
-use Monolog\Formatter\LineFormatter;
-use Monolog\TestCase;
-use Monolog\Logger;
-
-class NewRelicHandlerTest extends TestCase
-{
-    public static $appname;
-    public static $customParameters;
-    public static $transactionName;
-
-    public function setUp()
-    {
-        self::$appname = null;
-        self::$customParameters = array();
-        self::$transactionName = null;
-    }
-
-    /**
-     * @expectedException Monolog\Handler\MissingExtensionException
-     */
-    public function testThehandlerThrowsAnExceptionIfTheNRExtensionIsNotLoaded()
-    {
-        $handler = new StubNewRelicHandlerWithoutExtension();
-        $handler->handle($this->getRecord(Logger::ERROR));
-    }
-
-    public function testThehandlerCanHandleTheRecord()
-    {
-        $handler = new StubNewRelicHandler();
-        $handler->handle($this->getRecord(Logger::ERROR));
-    }
-
-    public function testThehandlerCanAddContextParamsToTheNewRelicTrace()
-    {
-        $handler = new StubNewRelicHandler();
-        $handler->handle($this->getRecord(Logger::ERROR, 'log message', array('a' => 'b')));
-        $this->assertEquals(array('context_a' => 'b'), self::$customParameters);
-    }
-
-    public function testThehandlerCanAddExplodedContextParamsToTheNewRelicTrace()
-    {
-        $handler = new StubNewRelicHandler(Logger::ERROR, true, self::$appname, true);
-        $handler->handle($this->getRecord(
-            Logger::ERROR,
-            'log message',
-            array('a' => array('key1' => 'value1', 'key2' => 'value2'))
-        ));
-        $this->assertEquals(
-            array('context_a_key1' => 'value1', 'context_a_key2' => 'value2'),
-            self::$customParameters
-        );
-    }
-
-    public function testThehandlerCanAddExtraParamsToTheNewRelicTrace()
-    {
-        $record = $this->getRecord(Logger::ERROR, 'log message');
-        $record['extra'] = array('c' => 'd');
-
-        $handler = new StubNewRelicHandler();
-        $handler->handle($record);
-
-        $this->assertEquals(array('extra_c' => 'd'), self::$customParameters);
-    }
-
-    public function testThehandlerCanAddExplodedExtraParamsToTheNewRelicTrace()
-    {
-        $record = $this->getRecord(Logger::ERROR, 'log message');
-        $record['extra'] = array('c' => array('key1' => 'value1', 'key2' => 'value2'));
-
-        $handler = new StubNewRelicHandler(Logger::ERROR, true, self::$appname, true);
-        $handler->handle($record);
-
-        $this->assertEquals(
-            array('extra_c_key1' => 'value1', 'extra_c_key2' => 'value2'),
-            self::$customParameters
-        );
-    }
-
-    public function testThehandlerCanAddExtraContextAndParamsToTheNewRelicTrace()
-    {
-        $record = $this->getRecord(Logger::ERROR, 'log message', array('a' => 'b'));
-        $record['extra'] = array('c' => 'd');
-
-        $handler = new StubNewRelicHandler();
-        $handler->handle($record);
-
-        $expected = array(
-            'context_a' => 'b',
-            'extra_c' => 'd',
-        );
-
-        $this->assertEquals($expected, self::$customParameters);
-    }
-
-    public function testThehandlerCanHandleTheRecordsFormattedUsingTheLineFormatter()
-    {
-        $handler = new StubNewRelicHandler();
-        $handler->setFormatter(new LineFormatter());
-        $handler->handle($this->getRecord(Logger::ERROR));
-    }
-
-    public function testTheAppNameIsNullByDefault()
-    {
-        $handler = new StubNewRelicHandler();
-        $handler->handle($this->getRecord(Logger::ERROR, 'log message'));
-
-        $this->assertEquals(null, self::$appname);
-    }
-
-    public function testTheAppNameCanBeInjectedFromtheConstructor()
-    {
-        $handler = new StubNewRelicHandler(Logger::DEBUG, false, 'myAppName');
-        $handler->handle($this->getRecord(Logger::ERROR, 'log message'));
-
-        $this->assertEquals('myAppName', self::$appname);
-    }
-
-    public function testTheAppNameCanBeOverriddenFromEachLog()
-    {
-        $handler = new StubNewRelicHandler(Logger::DEBUG, false, 'myAppName');
-        $handler->handle($this->getRecord(Logger::ERROR, 'log message', array('appname' => 'logAppName')));
-
-        $this->assertEquals('logAppName', self::$appname);
-    }
-
-    public function testTheTransactionNameIsNullByDefault()
-    {
-        $handler = new StubNewRelicHandler();
-        $handler->handle($this->getRecord(Logger::ERROR, 'log message'));
-
-        $this->assertEquals(null, self::$transactionName);
-    }
-
-    public function testTheTransactionNameCanBeInjectedFromTheConstructor()
-    {
-        $handler = new StubNewRelicHandler(Logger::DEBUG, false, null, false, 'myTransaction');
-        $handler->handle($this->getRecord(Logger::ERROR, 'log message'));
-
-        $this->assertEquals('myTransaction', self::$transactionName);
-    }
-
-    public function testTheTransactionNameCanBeOverriddenFromEachLog()
-    {
-        $handler = new StubNewRelicHandler(Logger::DEBUG, false, null, false, 'myTransaction');
-        $handler->handle($this->getRecord(Logger::ERROR, 'log message', array('transaction_name' => 'logTransactName')));
-
-        $this->assertEquals('logTransactName', self::$transactionName);
-    }
-}
-
-class StubNewRelicHandlerWithoutExtension extends NewRelicHandler
-{
-    protected function isNewRelicEnabled()
-    {
-        return false;
-    }
-}
-
-class StubNewRelicHandler extends NewRelicHandler
-{
-    protected function isNewRelicEnabled()
-    {
-        return true;
-    }
-}
-
-function newrelic_notice_error()
-{
-    return true;
-}
-
-function newrelic_set_appname($appname)
-{
-    return NewRelicHandlerTest::$appname = $appname;
-}
-
-function newrelic_name_transaction($transactionName)
-{
-    return NewRelicHandlerTest::$transactionName = $transactionName;
-}
-
-function newrelic_add_custom_parameter($key, $value)
-{
-    NewRelicHandlerTest::$customParameters[$key] = $value;
-
-    return true;
-}
diff --git a/mayor-orig/www/include/share/googleapi/monolog/monolog/tests/Monolog/Handler/NullHandlerTest.php b/mayor-orig/www/include/share/googleapi/monolog/monolog/tests/Monolog/Handler/NullHandlerTest.php
deleted file mode 100644
index 292df78c..00000000
--- a/mayor-orig/www/include/share/googleapi/monolog/monolog/tests/Monolog/Handler/NullHandlerTest.php
+++ /dev/null
@@ -1,33 +0,0 @@
-
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Monolog\Handler;
-
-use Monolog\TestCase;
-use Monolog\Logger;
-
-/**
- * @covers Monolog\Handler\NullHandler::handle
- */
-class NullHandlerTest extends TestCase
-{
-    public function testHandle()
-    {
-        $handler = new NullHandler();
-        $this->assertTrue($handler->handle($this->getRecord()));
-    }
-
-    public function testHandleLowerLevelRecord()
-    {
-        $handler = new NullHandler(Logger::WARNING);
-        $this->assertFalse($handler->handle($this->getRecord(Logger::DEBUG)));
-    }
-}
diff --git a/mayor-orig/www/include/share/googleapi/monolog/monolog/tests/Monolog/Handler/PHPConsoleHandlerTest.php b/mayor-orig/www/include/share/googleapi/monolog/monolog/tests/Monolog/Handler/PHPConsoleHandlerTest.php
deleted file mode 100644
index 152573ef..00000000
--- a/mayor-orig/www/include/share/googleapi/monolog/monolog/tests/Monolog/Handler/PHPConsoleHandlerTest.php
+++ /dev/null
@@ -1,273 +0,0 @@
-
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Monolog\Handler;
-
-use Exception;
-use Monolog\ErrorHandler;
-use Monolog\Logger;
-use Monolog\TestCase;
-use PhpConsole\Connector;
-use PhpConsole\Dispatcher\Debug as DebugDispatcher;
-use PhpConsole\Dispatcher\Errors as ErrorDispatcher;
-use PhpConsole\Handler;
-use PHPUnit_Framework_MockObject_MockObject;
-
-/**
- * @covers Monolog\Handler\PHPConsoleHandler
- * @author Sergey Barbushin https://www.linkedin.com/in/barbushin
- */
-class PHPConsoleHandlerTest extends TestCase
-{
-    /** @var  Connector|PHPUnit_Framework_MockObject_MockObject */
-    protected $connector;
-    /** @var  DebugDispatcher|PHPUnit_Framework_MockObject_MockObject */
-    protected $debugDispatcher;
-    /** @var  ErrorDispatcher|PHPUnit_Framework_MockObject_MockObject */
-    protected $errorDispatcher;
-
-    protected function setUp()
-    {
-        if (!class_exists('PhpConsole\Connector')) {
-            $this->markTestSkipped('PHP Console library not found. See https://github.com/barbushin/php-console#installation');
-        }
-        $this->connector = $this->initConnectorMock();
-
-        $this->debugDispatcher = $this->initDebugDispatcherMock($this->connector);
-        $this->connector->setDebugDispatcher($this->debugDispatcher);
-
-        $this->errorDispatcher = $this->initErrorDispatcherMock($this->connector);
-        $this->connector->setErrorsDispatcher($this->errorDispatcher);
-    }
-
-    protected function initDebugDispatcherMock(Connector $connector)
-    {
-        return $this->getMockBuilder('PhpConsole\Dispatcher\Debug')
-            ->disableOriginalConstructor()
-            ->setMethods(array('dispatchDebug'))
-            ->setConstructorArgs(array($connector, $connector->getDumper()))
-            ->getMock();
-    }
-
-    protected function initErrorDispatcherMock(Connector $connector)
-    {
-        return $this->getMockBuilder('PhpConsole\Dispatcher\Errors')
-            ->disableOriginalConstructor()
-            ->setMethods(array('dispatchError', 'dispatchException'))
-            ->setConstructorArgs(array($connector, $connector->getDumper()))
-            ->getMock();
-    }
-
-    protected function initConnectorMock()
-    {
-        $connector = $this->getMockBuilder('PhpConsole\Connector')
-            ->disableOriginalConstructor()
-            ->setMethods(array(
-                'sendMessage',
-                'onShutDown',
-                'isActiveClient',
-                'setSourcesBasePath',
-                'setServerEncoding',
-                'setPassword',
-                'enableSslOnlyMode',
-                'setAllowedIpMasks',
-                'setHeadersLimit',
-                'startEvalRequestsListener',
-            ))
-            ->getMock();
-
-        $connector->expects($this->any())
-            ->method('isActiveClient')
-            ->will($this->returnValue(true));
-
-        return $connector;
-    }
-
-    protected function getHandlerDefaultOption($name)
-    {
-        $handler = new PHPConsoleHandler(array(), $this->connector);
-        $options = $handler->getOptions();
-
-        return $options[$name];
-    }
-
-    protected function initLogger($handlerOptions = array(), $level = Logger::DEBUG)
-    {
-        return new Logger('test', array(
-            new PHPConsoleHandler($handlerOptions, $this->connector, $level),
-        ));
-    }
-
-    public function testInitWithDefaultConnector()
-    {
-        $handler = new PHPConsoleHandler();
-        $this->assertEquals(spl_object_hash(Connector::getInstance()), spl_object_hash($handler->getConnector()));
-    }
-
-    public function testInitWithCustomConnector()
-    {
-        $handler = new PHPConsoleHandler(array(), $this->connector);
-        $this->assertEquals(spl_object_hash($this->connector), spl_object_hash($handler->getConnector()));
-    }
-
-    public function testDebug()
-    {
-        $this->debugDispatcher->expects($this->once())->method('dispatchDebug')->with($this->equalTo('test'));
-        $this->initLogger()->addDebug('test');
-    }
-
-    public function testDebugContextInMessage()
-    {
-        $message = 'test';
-        $tag = 'tag';
-        $context = array($tag, 'custom' => mt_rand());
-        $expectedMessage = $message . ' ' . json_encode(array_slice($context, 1));
-        $this->debugDispatcher->expects($this->once())->method('dispatchDebug')->with(
-            $this->equalTo($expectedMessage),
-            $this->equalTo($tag)
-        );
-        $this->initLogger()->addDebug($message, $context);
-    }
-
-    public function testDebugTags($tagsContextKeys = null)
-    {
-        $expectedTags = mt_rand();
-        $logger = $this->initLogger($tagsContextKeys ? array('debugTagsKeysInContext' => $tagsContextKeys) : array());
-        if (!$tagsContextKeys) {
-            $tagsContextKeys = $this->getHandlerDefaultOption('debugTagsKeysInContext');
-        }
-        foreach ($tagsContextKeys as $key) {
-            $debugDispatcher = $this->initDebugDispatcherMock($this->connector);
-            $debugDispatcher->expects($this->once())->method('dispatchDebug')->with(
-                $this->anything(),
-                $this->equalTo($expectedTags)
-            );
-            $this->connector->setDebugDispatcher($debugDispatcher);
-            $logger->addDebug('test', array($key => $expectedTags));
-        }
-    }
-
-    public function testError($classesPartialsTraceIgnore = null)
-    {
-        $code = E_USER_NOTICE;
-        $message = 'message';
-        $file = __FILE__;
-        $line = __LINE__;
-        $this->errorDispatcher->expects($this->once())->method('dispatchError')->with(
-            $this->equalTo($code),
-            $this->equalTo($message),
-            $this->equalTo($file),
-            $this->equalTo($line),
-            $classesPartialsTraceIgnore ?: $this->equalTo($this->getHandlerDefaultOption('classesPartialsTraceIgnore'))
-        );
-        $errorHandler = ErrorHandler::register($this->initLogger($classesPartialsTraceIgnore ? array('classesPartialsTraceIgnore' => $classesPartialsTraceIgnore) : array()), false);
-        $errorHandler->registerErrorHandler(array(), false, E_USER_WARNING);
-        $errorHandler->handleError($code, $message, $file, $line);
-    }
-
-    public function testException()
-    {
-        $e = new Exception();
-        $this->errorDispatcher->expects($this->once())->method('dispatchException')->with(
-            $this->equalTo($e)
-        );
-        $handler = $this->initLogger();
-        $handler->log(
-            \Psr\Log\LogLevel::ERROR,
-            sprintf('Uncaught Exception %s: "%s" at %s line %s', get_class($e), $e->getMessage(), $e->getFile(), $e->getLine()),
-            array('exception' => $e)
-        );
-    }
-
-    /**
-     * @expectedException Exception
-     */
-    public function testWrongOptionsThrowsException()
-    {
-        new PHPConsoleHandler(array('xxx' => 1));
-    }
-
-    public function testOptionEnabled()
-    {
-        $this->debugDispatcher->expects($this->never())->method('dispatchDebug');
-        $this->initLogger(array('enabled' => false))->addDebug('test');
-    }
-
-    public function testOptionClassesPartialsTraceIgnore()
-    {
-        $this->testError(array('Class', 'Namespace\\'));
-    }
-
-    public function testOptionDebugTagsKeysInContext()
-    {
-        $this->testDebugTags(array('key1', 'key2'));
-    }
-
-    public function testOptionUseOwnErrorsAndExceptionsHandler()
-    {
-        $this->initLogger(array('useOwnErrorsHandler' => true, 'useOwnExceptionsHandler' => true));
-        $this->assertEquals(array(Handler::getInstance(), 'handleError'), set_error_handler(function () {
-        }));
-        $this->assertEquals(array(Handler::getInstance(), 'handleException'), set_exception_handler(function () {
-        }));
-    }
-
-    public static function provideConnectorMethodsOptionsSets()
-    {
-        return array(
-            array('sourcesBasePath', 'setSourcesBasePath', __DIR__),
-            array('serverEncoding', 'setServerEncoding', 'cp1251'),
-            array('password', 'setPassword', '******'),
-            array('enableSslOnlyMode', 'enableSslOnlyMode', true, false),
-            array('ipMasks', 'setAllowedIpMasks', array('127.0.0.*')),
-            array('headersLimit', 'setHeadersLimit', 2500),
-            array('enableEvalListener', 'startEvalRequestsListener', true, false),
-        );
-    }
-
-    /**
-     * @dataProvider provideConnectorMethodsOptionsSets
-     */
-    public function testOptionCallsConnectorMethod($option, $method, $value, $isArgument = true)
-    {
-        $expectCall = $this->connector->expects($this->once())->method($method);
-        if ($isArgument) {
-            $expectCall->with($value);
-        }
-        new PHPConsoleHandler(array($option => $value), $this->connector);
-    }
-
-    public function testOptionDetectDumpTraceAndSource()
-    {
-        new PHPConsoleHandler(array('detectDumpTraceAndSource' => true), $this->connector);
-        $this->assertTrue($this->connector->getDebugDispatcher()->detectTraceAndSource);
-    }
-
-    public static function provideDumperOptionsValues()
-    {
-        return array(
-            array('dumperLevelLimit', 'levelLimit', 1001),
-            array('dumperItemsCountLimit', 'itemsCountLimit', 1002),
-            array('dumperItemSizeLimit', 'itemSizeLimit', 1003),
-            array('dumperDumpSizeLimit', 'dumpSizeLimit', 1004),
-            array('dumperDetectCallbacks', 'detectCallbacks', true),
-        );
-    }
-
-    /**
-     * @dataProvider provideDumperOptionsValues
-     */
-    public function testDumperOptions($option, $dumperProperty, $value)
-    {
-        new PHPConsoleHandler(array($option => $value), $this->connector);
-        $this->assertEquals($value, $this->connector->getDumper()->$dumperProperty);
-    }
-}
diff --git a/mayor-orig/www/include/share/googleapi/monolog/monolog/tests/Monolog/Handler/PsrHandlerTest.php b/mayor-orig/www/include/share/googleapi/monolog/monolog/tests/Monolog/Handler/PsrHandlerTest.php
deleted file mode 100644
index 64eaab16..00000000
--- a/mayor-orig/www/include/share/googleapi/monolog/monolog/tests/Monolog/Handler/PsrHandlerTest.php
+++ /dev/null
@@ -1,50 +0,0 @@
-
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Monolog\Handler;
-
-use Monolog\TestCase;
-use Monolog\Logger;
-
-/**
- * @covers Monolog\Handler\PsrHandler::handle
- */
-class PsrHandlerTest extends TestCase
-{
-    public function logLevelProvider()
-    {
-        $levels = array();
-        $monologLogger = new Logger('');
-
-        foreach ($monologLogger->getLevels() as $levelName => $level) {
-            $levels[] = array($levelName, $level);
-        }
-
-        return $levels;
-    }
-
-    /**
-     * @dataProvider logLevelProvider
-     */
-    public function testHandlesAllLevels($levelName, $level)
-    {
-        $message = 'Hello, world! ' . $level;
-        $context = array('foo' => 'bar', 'level' => $level);
-
-        $psrLogger = $this->getMock('Psr\Log\NullLogger');
-        $psrLogger->expects($this->once())
-            ->method('log')
-            ->with(strtolower($levelName), $message, $context);
-
-        $handler = new PsrHandler($psrLogger);
-        $handler->handle(array('level' => $level, 'level_name' => $levelName, 'message' => $message, 'context' => $context));
-    }
-}
diff --git a/mayor-orig/www/include/share/googleapi/monolog/monolog/tests/Monolog/Handler/PushoverHandlerTest.php b/mayor-orig/www/include/share/googleapi/monolog/monolog/tests/Monolog/Handler/PushoverHandlerTest.php
deleted file mode 100644
index 56df474a..00000000
--- a/mayor-orig/www/include/share/googleapi/monolog/monolog/tests/Monolog/Handler/PushoverHandlerTest.php
+++ /dev/null
@@ -1,141 +0,0 @@
-
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Monolog\Handler;
-
-use Monolog\TestCase;
-use Monolog\Logger;
-
-/**
- * Almost all examples (expected header, titles, messages) taken from
- * https://www.pushover.net/api
- * @author Sebastian Göttschkes 
- * @see https://www.pushover.net/api
- */
-class PushoverHandlerTest extends TestCase
-{
-    private $res;
-    private $handler;
-
-    public function testWriteHeader()
-    {
-        $this->createHandler();
-        $this->handler->setHighPriorityLevel(Logger::EMERGENCY); // skip priority notifications
-        $this->handler->handle($this->getRecord(Logger::CRITICAL, 'test1'));
-        fseek($this->res, 0);
-        $content = fread($this->res, 1024);
-
-        $this->assertRegexp('/POST \/1\/messages.json HTTP\/1.1\\r\\nHost: api.pushover.net\\r\\nContent-Type: application\/x-www-form-urlencoded\\r\\nContent-Length: \d{2,4}\\r\\n\\r\\n/', $content);
-
-        return $content;
-    }
-
-    /**
-     * @depends testWriteHeader
-     */
-    public function testWriteContent($content)
-    {
-        $this->assertRegexp('/token=myToken&user=myUser&message=test1&title=Monolog×tamp=\d{10}$/', $content);
-    }
-
-    public function testWriteWithComplexTitle()
-    {
-        $this->createHandler('myToken', 'myUser', 'Backup finished - SQL1');
-        $this->handler->handle($this->getRecord(Logger::CRITICAL, 'test1'));
-        fseek($this->res, 0);
-        $content = fread($this->res, 1024);
-
-        $this->assertRegexp('/title=Backup\+finished\+-\+SQL1/', $content);
-    }
-
-    public function testWriteWithComplexMessage()
-    {
-        $this->createHandler();
-        $this->handler->setHighPriorityLevel(Logger::EMERGENCY); // skip priority notifications
-        $this->handler->handle($this->getRecord(Logger::CRITICAL, 'Backup of database "example" finished in 16 minutes.'));
-        fseek($this->res, 0);
-        $content = fread($this->res, 1024);
-
-        $this->assertRegexp('/message=Backup\+of\+database\+%22example%22\+finished\+in\+16\+minutes\./', $content);
-    }
-
-    public function testWriteWithTooLongMessage()
-    {
-        $message = str_pad('test', 520, 'a');
-        $this->createHandler();
-        $this->handler->setHighPriorityLevel(Logger::EMERGENCY); // skip priority notifications
-        $this->handler->handle($this->getRecord(Logger::CRITICAL, $message));
-        fseek($this->res, 0);
-        $content = fread($this->res, 1024);
-
-        $expectedMessage = substr($message, 0, 505);
-
-        $this->assertRegexp('/message=' . $expectedMessage . '&title/', $content);
-    }
-
-    public function testWriteWithHighPriority()
-    {
-        $this->createHandler();
-        $this->handler->handle($this->getRecord(Logger::CRITICAL, 'test1'));
-        fseek($this->res, 0);
-        $content = fread($this->res, 1024);
-
-        $this->assertRegexp('/token=myToken&user=myUser&message=test1&title=Monolog×tamp=\d{10}&priority=1$/', $content);
-    }
-
-    public function testWriteWithEmergencyPriority()
-    {
-        $this->createHandler();
-        $this->handler->handle($this->getRecord(Logger::EMERGENCY, 'test1'));
-        fseek($this->res, 0);
-        $content = fread($this->res, 1024);
-
-        $this->assertRegexp('/token=myToken&user=myUser&message=test1&title=Monolog×tamp=\d{10}&priority=2&retry=30&expire=25200$/', $content);
-    }
-
-    public function testWriteToMultipleUsers()
-    {
-        $this->createHandler('myToken', array('userA', 'userB'));
-        $this->handler->handle($this->getRecord(Logger::EMERGENCY, 'test1'));
-        fseek($this->res, 0);
-        $content = fread($this->res, 1024);
-
-        $this->assertRegexp('/token=myToken&user=userA&message=test1&title=Monolog×tamp=\d{10}&priority=2&retry=30&expire=25200POST/', $content);
-        $this->assertRegexp('/token=myToken&user=userB&message=test1&title=Monolog×tamp=\d{10}&priority=2&retry=30&expire=25200$/', $content);
-    }
-
-    private function createHandler($token = 'myToken', $user = 'myUser', $title = 'Monolog')
-    {
-        $constructorArgs = array($token, $user, $title);
-        $this->res = fopen('php://memory', 'a');
-        $this->handler = $this->getMock(
-            '\Monolog\Handler\PushoverHandler',
-            array('fsockopen', 'streamSetTimeout', 'closeSocket'),
-            $constructorArgs
-        );
-
-        $reflectionProperty = new \ReflectionProperty('\Monolog\Handler\SocketHandler', 'connectionString');
-        $reflectionProperty->setAccessible(true);
-        $reflectionProperty->setValue($this->handler, 'localhost:1234');
-
-        $this->handler->expects($this->any())
-            ->method('fsockopen')
-            ->will($this->returnValue($this->res));
-        $this->handler->expects($this->any())
-            ->method('streamSetTimeout')
-            ->will($this->returnValue(true));
-        $this->handler->expects($this->any())
-            ->method('closeSocket')
-            ->will($this->returnValue(true));
-
-        $this->handler->setFormatter($this->getIdentityFormatter());
-    }
-}
diff --git a/mayor-orig/www/include/share/googleapi/monolog/monolog/tests/Monolog/Handler/RavenHandlerTest.php b/mayor-orig/www/include/share/googleapi/monolog/monolog/tests/Monolog/Handler/RavenHandlerTest.php
deleted file mode 100644
index 26d212b9..00000000
--- a/mayor-orig/www/include/share/googleapi/monolog/monolog/tests/Monolog/Handler/RavenHandlerTest.php
+++ /dev/null
@@ -1,255 +0,0 @@
-
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Monolog\Handler;
-
-use Monolog\TestCase;
-use Monolog\Logger;
-use Monolog\Formatter\LineFormatter;
-
-class RavenHandlerTest extends TestCase
-{
-    public function setUp()
-    {
-        if (!class_exists('Raven_Client')) {
-            $this->markTestSkipped('raven/raven not installed');
-        }
-
-        require_once __DIR__ . '/MockRavenClient.php';
-    }
-
-    /**
-     * @covers Monolog\Handler\RavenHandler::__construct
-     */
-    public function testConstruct()
-    {
-        $handler = new RavenHandler($this->getRavenClient());
-        $this->assertInstanceOf('Monolog\Handler\RavenHandler', $handler);
-    }
-
-    protected function getHandler($ravenClient)
-    {
-        $handler = new RavenHandler($ravenClient);
-
-        return $handler;
-    }
-
-    protected function getRavenClient()
-    {
-        $dsn = 'http://43f6017361224d098402974103bfc53d:a6a0538fc2934ba2bed32e08741b2cd3@marca.python.live.cheggnet.com:9000/1';
-
-        return new MockRavenClient($dsn);
-    }
-
-    public function testDebug()
-    {
-        $ravenClient = $this->getRavenClient();
-        $handler = $this->getHandler($ravenClient);
-
-        $record = $this->getRecord(Logger::DEBUG, 'A test debug message');
-        $handler->handle($record);
-
-        $this->assertEquals($ravenClient::DEBUG, $ravenClient->lastData['level']);
-        $this->assertContains($record['message'], $ravenClient->lastData['message']);
-    }
-
-    public function testWarning()
-    {
-        $ravenClient = $this->getRavenClient();
-        $handler = $this->getHandler($ravenClient);
-
-        $record = $this->getRecord(Logger::WARNING, 'A test warning message');
-        $handler->handle($record);
-
-        $this->assertEquals($ravenClient::WARNING, $ravenClient->lastData['level']);
-        $this->assertContains($record['message'], $ravenClient->lastData['message']);
-    }
-
-    public function testTag()
-    {
-        $ravenClient = $this->getRavenClient();
-        $handler = $this->getHandler($ravenClient);
-
-        $tags = array(1, 2, 'foo');
-        $record = $this->getRecord(Logger::INFO, 'test', array('tags' => $tags));
-        $handler->handle($record);
-
-        $this->assertEquals($tags, $ravenClient->lastData['tags']);
-    }
-
-    public function testExtraParameters()
-    {
-        $ravenClient = $this->getRavenClient();
-        $handler = $this->getHandler($ravenClient);
-
-        $checksum = '098f6bcd4621d373cade4e832627b4f6';
-        $release = '05a671c66aefea124cc08b76ea6d30bb';
-        $eventId = '31423';
-        $record = $this->getRecord(Logger::INFO, 'test', array('checksum' => $checksum, 'release' => $release, 'event_id' => $eventId));
-        $handler->handle($record);
-
-        $this->assertEquals($checksum, $ravenClient->lastData['checksum']);
-        $this->assertEquals($release, $ravenClient->lastData['release']);
-        $this->assertEquals($eventId, $ravenClient->lastData['event_id']);
-    }
-
-    public function testFingerprint()
-    {
-        $ravenClient = $this->getRavenClient();
-        $handler = $this->getHandler($ravenClient);
-
-        $fingerprint = array('{{ default }}', 'other value');
-        $record = $this->getRecord(Logger::INFO, 'test', array('fingerprint' => $fingerprint));
-        $handler->handle($record);
-
-        $this->assertEquals($fingerprint, $ravenClient->lastData['fingerprint']);
-    }
-
-    public function testUserContext()
-    {
-        $ravenClient = $this->getRavenClient();
-        $handler = $this->getHandler($ravenClient);
-
-        $recordWithNoContext = $this->getRecord(Logger::INFO, 'test with default user context');
-        // set user context 'externally'
-
-        $user = array(
-            'id' => '123',
-            'email' => 'test@test.com',
-        );
-
-        $recordWithContext = $this->getRecord(Logger::INFO, 'test', array('user' => $user));
-
-        $ravenClient->user_context(array('id' => 'test_user_id'));
-        // handle context
-        $handler->handle($recordWithContext);
-        $this->assertEquals($user, $ravenClient->lastData['user']);
-
-        // check to see if its reset
-        $handler->handle($recordWithNoContext);
-        $this->assertInternalType('array', $ravenClient->context->user);
-        $this->assertSame('test_user_id', $ravenClient->context->user['id']);
-
-        // handle with null context
-        $ravenClient->user_context(null);
-        $handler->handle($recordWithContext);
-        $this->assertEquals($user, $ravenClient->lastData['user']);
-
-        // check to see if its reset
-        $handler->handle($recordWithNoContext);
-        $this->assertNull($ravenClient->context->user);
-    }
-
-    public function testException()
-    {
-        $ravenClient = $this->getRavenClient();
-        $handler = $this->getHandler($ravenClient);
-
-        try {
-            $this->methodThatThrowsAnException();
-        } catch (\Exception $e) {
-            $record = $this->getRecord(Logger::ERROR, $e->getMessage(), array('exception' => $e));
-            $handler->handle($record);
-        }
-
-        $this->assertEquals($record['message'], $ravenClient->lastData['message']);
-    }
-
-    public function testHandleBatch()
-    {
-        $records = $this->getMultipleRecords();
-        $records[] = $this->getRecord(Logger::WARNING, 'warning');
-        $records[] = $this->getRecord(Logger::WARNING, 'warning');
-
-        $logFormatter = $this->getMock('Monolog\\Formatter\\FormatterInterface');
-        $logFormatter->expects($this->once())->method('formatBatch');
-
-        $formatter = $this->getMock('Monolog\\Formatter\\FormatterInterface');
-        $formatter->expects($this->once())->method('format')->with($this->callback(function ($record) {
-            return $record['level'] == 400;
-        }));
-
-        $handler = $this->getHandler($this->getRavenClient());
-        $handler->setBatchFormatter($logFormatter);
-        $handler->setFormatter($formatter);
-        $handler->handleBatch($records);
-    }
-
-    public function testHandleBatchDoNothingIfRecordsAreBelowLevel()
-    {
-        $records = array(
-            $this->getRecord(Logger::DEBUG, 'debug message 1'),
-            $this->getRecord(Logger::DEBUG, 'debug message 2'),
-            $this->getRecord(Logger::INFO, 'information'),
-        );
-
-        $handler = $this->getMock('Monolog\Handler\RavenHandler', null, array($this->getRavenClient()));
-        $handler->expects($this->never())->method('handle');
-        $handler->setLevel(Logger::ERROR);
-        $handler->handleBatch($records);
-    }
-
-    public function testHandleBatchPicksProperMessage()
-    {
-        $records = array(
-            $this->getRecord(Logger::DEBUG, 'debug message 1'),
-            $this->getRecord(Logger::DEBUG, 'debug message 2'),
-            $this->getRecord(Logger::INFO, 'information 1'),
-            $this->getRecord(Logger::ERROR, 'error 1'),
-            $this->getRecord(Logger::WARNING, 'warning'),
-            $this->getRecord(Logger::ERROR, 'error 2'),
-            $this->getRecord(Logger::INFO, 'information 2'),
-        );
-
-        $logFormatter = $this->getMock('Monolog\\Formatter\\FormatterInterface');
-        $logFormatter->expects($this->once())->method('formatBatch');
-
-        $formatter = $this->getMock('Monolog\\Formatter\\FormatterInterface');
-        $formatter->expects($this->once())->method('format')->with($this->callback(function ($record) use ($records) {
-            return $record['message'] == 'error 1';
-        }));
-
-        $handler = $this->getHandler($this->getRavenClient());
-        $handler->setBatchFormatter($logFormatter);
-        $handler->setFormatter($formatter);
-        $handler->handleBatch($records);
-    }
-
-    public function testGetSetBatchFormatter()
-    {
-        $ravenClient = $this->getRavenClient();
-        $handler = $this->getHandler($ravenClient);
-
-        $handler->setBatchFormatter($formatter = new LineFormatter());
-        $this->assertSame($formatter, $handler->getBatchFormatter());
-    }
-
-    public function testRelease()
-    {
-        $ravenClient = $this->getRavenClient();
-        $handler = $this->getHandler($ravenClient);
-        $release = 'v42.42.42';
-        $handler->setRelease($release);
-        $record = $this->getRecord(Logger::INFO, 'test');
-        $handler->handle($record);
-        $this->assertEquals($release, $ravenClient->lastData['release']);
-
-        $localRelease = 'v41.41.41';
-        $record = $this->getRecord(Logger::INFO, 'test', array('release' => $localRelease));
-        $handler->handle($record);
-        $this->assertEquals($localRelease, $ravenClient->lastData['release']);
-    }
-
-    private function methodThatThrowsAnException()
-    {
-        throw new \Exception('This is an exception');
-    }
-}
diff --git a/mayor-orig/www/include/share/googleapi/monolog/monolog/tests/Monolog/Handler/RedisHandlerTest.php b/mayor-orig/www/include/share/googleapi/monolog/monolog/tests/Monolog/Handler/RedisHandlerTest.php
deleted file mode 100644
index 689d5278..00000000
--- a/mayor-orig/www/include/share/googleapi/monolog/monolog/tests/Monolog/Handler/RedisHandlerTest.php
+++ /dev/null
@@ -1,127 +0,0 @@
-
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Monolog\Handler;
-
-use Monolog\TestCase;
-use Monolog\Logger;
-use Monolog\Formatter\LineFormatter;
-
-class RedisHandlerTest extends TestCase
-{
-    /**
-     * @expectedException InvalidArgumentException
-     */
-    public function testConstructorShouldThrowExceptionForInvalidRedis()
-    {
-        new RedisHandler(new \stdClass(), 'key');
-    }
-
-    public function testConstructorShouldWorkWithPredis()
-    {
-        $redis = $this->getMock('Predis\Client');
-        $this->assertInstanceof('Monolog\Handler\RedisHandler', new RedisHandler($redis, 'key'));
-    }
-
-    public function testConstructorShouldWorkWithRedis()
-    {
-        $redis = $this->getMock('Redis');
-        $this->assertInstanceof('Monolog\Handler\RedisHandler', new RedisHandler($redis, 'key'));
-    }
-
-    public function testPredisHandle()
-    {
-        $redis = $this->getMock('Predis\Client', array('rpush'));
-
-        // Predis\Client uses rpush
-        $redis->expects($this->once())
-            ->method('rpush')
-            ->with('key', 'test');
-
-        $record = $this->getRecord(Logger::WARNING, 'test', array('data' => new \stdClass, 'foo' => 34));
-
-        $handler = new RedisHandler($redis, 'key');
-        $handler->setFormatter(new LineFormatter("%message%"));
-        $handler->handle($record);
-    }
-
-    public function testRedisHandle()
-    {
-        $redis = $this->getMock('Redis', array('rpush'));
-
-        // Redis uses rPush
-        $redis->expects($this->once())
-            ->method('rPush')
-            ->with('key', 'test');
-
-        $record = $this->getRecord(Logger::WARNING, 'test', array('data' => new \stdClass, 'foo' => 34));
-
-        $handler = new RedisHandler($redis, 'key');
-        $handler->setFormatter(new LineFormatter("%message%"));
-        $handler->handle($record);
-    }
-
-    public function testRedisHandleCapped()
-    {
-        $redis = $this->getMock('Redis', array('multi', 'rpush', 'ltrim', 'exec'));
-
-        // Redis uses multi
-        $redis->expects($this->once())
-            ->method('multi')
-            ->will($this->returnSelf());
-
-        $redis->expects($this->once())
-            ->method('rpush')
-            ->will($this->returnSelf());
-
-        $redis->expects($this->once())
-            ->method('ltrim')
-            ->will($this->returnSelf());
-
-        $redis->expects($this->once())
-            ->method('exec')
-            ->will($this->returnSelf());
-
-        $record = $this->getRecord(Logger::WARNING, 'test', array('data' => new \stdClass, 'foo' => 34));
-
-        $handler = new RedisHandler($redis, 'key', Logger::DEBUG, true, 10);
-        $handler->setFormatter(new LineFormatter("%message%"));
-        $handler->handle($record);
-    }
-
-    public function testPredisHandleCapped()
-    {
-        $redis = $this->getMock('Predis\Client', array('transaction'));
-
-        $redisTransaction = $this->getMock('Predis\Client', array('rpush', 'ltrim'));
-
-        $redisTransaction->expects($this->once())
-            ->method('rpush')
-            ->will($this->returnSelf());
-
-        $redisTransaction->expects($this->once())
-            ->method('ltrim')
-            ->will($this->returnSelf());
-
-        // Redis uses multi
-        $redis->expects($this->once())
-            ->method('transaction')
-            ->will($this->returnCallback(function ($cb) use ($redisTransaction) {
-                $cb($redisTransaction);
-            }));
-
-        $record = $this->getRecord(Logger::WARNING, 'test', array('data' => new \stdClass, 'foo' => 34));
-
-        $handler = new RedisHandler($redis, 'key', Logger::DEBUG, true, 10);
-        $handler->setFormatter(new LineFormatter("%message%"));
-        $handler->handle($record);
-    }
-}
diff --git a/mayor-orig/www/include/share/googleapi/monolog/monolog/tests/Monolog/Handler/RollbarHandlerTest.php b/mayor-orig/www/include/share/googleapi/monolog/monolog/tests/Monolog/Handler/RollbarHandlerTest.php
deleted file mode 100644
index f302e917..00000000
--- a/mayor-orig/www/include/share/googleapi/monolog/monolog/tests/Monolog/Handler/RollbarHandlerTest.php
+++ /dev/null
@@ -1,84 +0,0 @@
-
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Monolog\Handler;
-
-use Exception;
-use Monolog\TestCase;
-use Monolog\Logger;
-use PHPUnit_Framework_MockObject_MockObject as MockObject;
-
-/**
- * @author Erik Johansson 
- * @see    https://rollbar.com/docs/notifier/rollbar-php/
- *
- * @coversDefaultClass Monolog\Handler\RollbarHandler
- */
-class RollbarHandlerTest extends TestCase
-{
-    /**
-     * @var MockObject
-     */
-    private $rollbarNotifier;
-
-    /**
-     * @var array
-     */
-    public $reportedExceptionArguments = null;
-
-    protected function setUp()
-    {
-        parent::setUp();
-
-        $this->setupRollbarNotifierMock();
-    }
-
-    /**
-     * When reporting exceptions to Rollbar the
-     * level has to be set in the payload data
-     */
-    public function testExceptionLogLevel()
-    {
-        $handler = $this->createHandler();
-
-        $handler->handle($this->createExceptionRecord(Logger::DEBUG));
-
-        $this->assertEquals('debug', $this->reportedExceptionArguments['payload']['level']);
-    }
-
-    private function setupRollbarNotifierMock()
-    {
-        $this->rollbarNotifier = $this->getMockBuilder('RollbarNotifier')
-            ->setMethods(array('report_message', 'report_exception', 'flush'))
-            ->getMock();
-
-        $that = $this;
-
-        $this->rollbarNotifier
-            ->expects($this->any())
-            ->method('report_exception')
-            ->willReturnCallback(function ($exception, $context, $payload) use ($that) {
-                $that->reportedExceptionArguments = compact('exception', 'context', 'payload');
-            });
-    }
-
-    private function createHandler()
-    {
-        return new RollbarHandler($this->rollbarNotifier, Logger::DEBUG);
-    }
-
-    private function createExceptionRecord($level = Logger::DEBUG, $message = 'test', $exception = null)
-    {
-        return $this->getRecord($level, $message, array(
-            'exception' => $exception ?: new Exception()
-        ));
-    }
-}
diff --git a/mayor-orig/www/include/share/googleapi/monolog/monolog/tests/Monolog/Handler/RotatingFileHandlerTest.php b/mayor-orig/www/include/share/googleapi/monolog/monolog/tests/Monolog/Handler/RotatingFileHandlerTest.php
deleted file mode 100644
index f1feb228..00000000
--- a/mayor-orig/www/include/share/googleapi/monolog/monolog/tests/Monolog/Handler/RotatingFileHandlerTest.php
+++ /dev/null
@@ -1,211 +0,0 @@
-
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Monolog\Handler;
-
-use Monolog\TestCase;
-use PHPUnit_Framework_Error_Deprecated;
-
-/**
- * @covers Monolog\Handler\RotatingFileHandler
- */
-class RotatingFileHandlerTest extends TestCase
-{
-    /**
-     * This var should be private but then the anonymous function
-     * in the `setUp` method won't be able to set it. `$this` cant't
-     * be used in the anonymous function in `setUp` because PHP 5.3
-     * does not support it.
-     */
-    public $lastError;
-
-    public function setUp()
-    {
-        $dir = __DIR__.'/Fixtures';
-        chmod($dir, 0777);
-        if (!is_writable($dir)) {
-            $this->markTestSkipped($dir.' must be writable to test the RotatingFileHandler.');
-        }
-        $this->lastError = null;
-        $self = $this;
-        // workaround with &$self used for PHP 5.3
-        set_error_handler(function($code, $message) use (&$self) {
-            $self->lastError = array(
-                'code' => $code,
-                'message' => $message,
-            );
-        });
-    }
-
-    private function assertErrorWasTriggered($code, $message)
-    {
-        if (empty($this->lastError)) {
-            $this->fail(
-                sprintf(
-                    'Failed asserting that error with code `%d` and message `%s` was triggered',
-                    $code,
-                    $message
-                )
-            );
-        }
-        $this->assertEquals($code, $this->lastError['code'], sprintf('Expected an error with code %d to be triggered, got `%s` instead', $code, $this->lastError['code']));
-        $this->assertEquals($message, $this->lastError['message'], sprintf('Expected an error with message `%d` to be triggered, got `%s` instead', $message, $this->lastError['message']));
-    }
-
-    public function testRotationCreatesNewFile()
-    {
-        touch(__DIR__.'/Fixtures/foo-'.date('Y-m-d', time() - 86400).'.rot');
-
-        $handler = new RotatingFileHandler(__DIR__.'/Fixtures/foo.rot');
-        $handler->setFormatter($this->getIdentityFormatter());
-        $handler->handle($this->getRecord());
-
-        $log = __DIR__.'/Fixtures/foo-'.date('Y-m-d').'.rot';
-        $this->assertTrue(file_exists($log));
-        $this->assertEquals('test', file_get_contents($log));
-    }
-
-    /**
-     * @dataProvider rotationTests
-     */
-    public function testRotation($createFile, $dateFormat, $timeCallback)
-    {
-        touch($old1 = __DIR__.'/Fixtures/foo-'.date($dateFormat, $timeCallback(-1)).'.rot');
-        touch($old2 = __DIR__.'/Fixtures/foo-'.date($dateFormat, $timeCallback(-2)).'.rot');
-        touch($old3 = __DIR__.'/Fixtures/foo-'.date($dateFormat, $timeCallback(-3)).'.rot');
-        touch($old4 = __DIR__.'/Fixtures/foo-'.date($dateFormat, $timeCallback(-4)).'.rot');
-
-        $log = __DIR__.'/Fixtures/foo-'.date($dateFormat).'.rot';
-
-        if ($createFile) {
-            touch($log);
-        }
-
-        $handler = new RotatingFileHandler(__DIR__.'/Fixtures/foo.rot', 2);
-        $handler->setFormatter($this->getIdentityFormatter());
-        $handler->setFilenameFormat('{filename}-{date}', $dateFormat);
-        $handler->handle($this->getRecord());
-
-        $handler->close();
-
-        $this->assertTrue(file_exists($log));
-        $this->assertTrue(file_exists($old1));
-        $this->assertEquals($createFile, file_exists($old2));
-        $this->assertEquals($createFile, file_exists($old3));
-        $this->assertEquals($createFile, file_exists($old4));
-        $this->assertEquals('test', file_get_contents($log));
-    }
-
-    public function rotationTests()
-    {
-        $now = time();
-        $dayCallback = function($ago) use ($now) {
-            return $now + 86400 * $ago;
-        };
-        $monthCallback = function($ago) {
-            return gmmktime(0, 0, 0, date('n') + $ago, 1, date('Y'));
-        };
-        $yearCallback = function($ago) {
-            return gmmktime(0, 0, 0, 1, 1, date('Y') + $ago);
-        };
-
-        return array(
-            'Rotation is triggered when the file of the current day is not present'
-                => array(true, RotatingFileHandler::FILE_PER_DAY, $dayCallback),
-            'Rotation is not triggered when the file of the current day is already present'
-                => array(false, RotatingFileHandler::FILE_PER_DAY, $dayCallback),
-
-            'Rotation is triggered when the file of the current month is not present'
-                => array(true, RotatingFileHandler::FILE_PER_MONTH, $monthCallback),
-            'Rotation is not triggered when the file of the current month is already present'
-                => array(false, RotatingFileHandler::FILE_PER_MONTH, $monthCallback),
-
-            'Rotation is triggered when the file of the current year is not present'
-                => array(true, RotatingFileHandler::FILE_PER_YEAR, $yearCallback),
-            'Rotation is not triggered when the file of the current year is already present'
-                => array(false, RotatingFileHandler::FILE_PER_YEAR, $yearCallback),
-        );
-    }
-
-    /**
-     * @dataProvider dateFormatProvider
-     */
-    public function testAllowOnlyFixedDefinedDateFormats($dateFormat, $valid)
-    {
-        $handler = new RotatingFileHandler(__DIR__.'/Fixtures/foo.rot', 2);
-        $handler->setFilenameFormat('{filename}-{date}', $dateFormat);
-        if (!$valid) {
-            $this->assertErrorWasTriggered(
-                E_USER_DEPRECATED,
-                'Invalid date format - format must be one of RotatingFileHandler::FILE_PER_DAY ("Y-m-d"), '.
-                'RotatingFileHandler::FILE_PER_MONTH ("Y-m") or RotatingFileHandler::FILE_PER_YEAR ("Y"), '.
-                'or you can set one of the date formats using slashes, underscores and/or dots instead of dashes.'
-            );
-        }
-    }
-
-    public function dateFormatProvider()
-    {
-        return array(
-            array(RotatingFileHandler::FILE_PER_DAY, true),
-            array(RotatingFileHandler::FILE_PER_MONTH, true),
-            array(RotatingFileHandler::FILE_PER_YEAR, true),
-            array('m-d-Y', false),
-            array('Y-m-d-h-i', false)
-        );
-    }
-
-    /**
-     * @dataProvider filenameFormatProvider
-     */
-    public function testDisallowFilenameFormatsWithoutDate($filenameFormat, $valid)
-    {
-        $handler = new RotatingFileHandler(__DIR__.'/Fixtures/foo.rot', 2);
-        $handler->setFilenameFormat($filenameFormat, RotatingFileHandler::FILE_PER_DAY);
-        if (!$valid) {
-            $this->assertErrorWasTriggered(
-                E_USER_DEPRECATED,
-                'Invalid filename format - format should contain at least `{date}`, because otherwise rotating is impossible.'
-            );
-        }
-    }
-
-    public function filenameFormatProvider()
-    {
-        return array(
-            array('{filename}', false),
-            array('{filename}-{date}', true),
-            array('{date}', true),
-            array('foobar-{date}', true),
-            array('foo-{date}-bar', true),
-            array('{date}-foobar', true),
-            array('foobar', false),
-        );
-    }
-
-    public function testReuseCurrentFile()
-    {
-        $log = __DIR__.'/Fixtures/foo-'.date('Y-m-d').'.rot';
-        file_put_contents($log, "foo");
-        $handler = new RotatingFileHandler(__DIR__.'/Fixtures/foo.rot');
-        $handler->setFormatter($this->getIdentityFormatter());
-        $handler->handle($this->getRecord());
-        $this->assertEquals('footest', file_get_contents($log));
-    }
-
-    public function tearDown()
-    {
-        foreach (glob(__DIR__.'/Fixtures/*.rot') as $file) {
-            unlink($file);
-        }
-        restore_error_handler();
-    }
-}
diff --git a/mayor-orig/www/include/share/googleapi/monolog/monolog/tests/Monolog/Handler/SamplingHandlerTest.php b/mayor-orig/www/include/share/googleapi/monolog/monolog/tests/Monolog/Handler/SamplingHandlerTest.php
deleted file mode 100644
index b354cee1..00000000
--- a/mayor-orig/www/include/share/googleapi/monolog/monolog/tests/Monolog/Handler/SamplingHandlerTest.php
+++ /dev/null
@@ -1,33 +0,0 @@
-
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Monolog\Handler;
-
-use Monolog\TestCase;
-
-/**
- * @covers Monolog\Handler\SamplingHandler::handle
- */
-class SamplingHandlerTest extends TestCase
-{
-    public function testHandle()
-    {
-        $testHandler = new TestHandler();
-        $handler = new SamplingHandler($testHandler, 2);
-        for ($i = 0; $i < 10000; $i++) {
-            $handler->handle($this->getRecord());
-        }
-        $count = count($testHandler->getRecords());
-        // $count should be half of 10k, so between 4k and 6k
-        $this->assertLessThan(6000, $count);
-        $this->assertGreaterThan(4000, $count);
-    }
-}
diff --git a/mayor-orig/www/include/share/googleapi/monolog/monolog/tests/Monolog/Handler/Slack/SlackRecordTest.php b/mayor-orig/www/include/share/googleapi/monolog/monolog/tests/Monolog/Handler/Slack/SlackRecordTest.php
deleted file mode 100644
index e1aa96d7..00000000
--- a/mayor-orig/www/include/share/googleapi/monolog/monolog/tests/Monolog/Handler/Slack/SlackRecordTest.php
+++ /dev/null
@@ -1,387 +0,0 @@
-
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Monolog\Handler\Slack;
-
-use Monolog\Logger;
-use Monolog\TestCase;
-
-/**
- * @coversDefaultClass Monolog\Handler\Slack\SlackRecord
- */
-class SlackRecordTest extends TestCase
-{
-    private $jsonPrettyPrintFlag;
-
-    protected function setUp()
-    {
-        $this->jsonPrettyPrintFlag = defined('JSON_PRETTY_PRINT') ? JSON_PRETTY_PRINT : 128;
-    }
-
-    public function dataGetAttachmentColor()
-    {
-        return array(
-            array(Logger::DEBUG, SlackRecord::COLOR_DEFAULT),
-            array(Logger::INFO, SlackRecord::COLOR_GOOD),
-            array(Logger::NOTICE, SlackRecord::COLOR_GOOD),
-            array(Logger::WARNING, SlackRecord::COLOR_WARNING),
-            array(Logger::ERROR, SlackRecord::COLOR_DANGER),
-            array(Logger::CRITICAL, SlackRecord::COLOR_DANGER),
-            array(Logger::ALERT, SlackRecord::COLOR_DANGER),
-            array(Logger::EMERGENCY, SlackRecord::COLOR_DANGER),
-        );
-    }
-
-    /**
-     * @dataProvider dataGetAttachmentColor
-     * @param  int $logLevel
-     * @param  string $expectedColour RGB hex color or name of Slack color
-     * @covers ::getAttachmentColor
-     */
-    public function testGetAttachmentColor($logLevel, $expectedColour)
-    {
-        $slackRecord = new SlackRecord();
-        $this->assertSame(
-            $expectedColour,
-            $slackRecord->getAttachmentColor($logLevel)
-        );
-    }
-
-    public function testAddsChannel()
-    {
-        $channel = '#test';
-        $record = new SlackRecord($channel);
-        $data = $record->getSlackData($this->getRecord());
-
-        $this->assertArrayHasKey('channel', $data);
-        $this->assertSame($channel, $data['channel']);
-    }
-
-    public function testNoUsernameByDefault()
-    {
-        $record = new SlackRecord();
-        $data = $record->getSlackData($this->getRecord());
-
-        $this->assertArrayNotHasKey('username', $data);
-    }
-
-    /**
-     * @return array
-     */
-    public function dataStringify()
-    {
-        $jsonPrettyPrintFlag = defined('JSON_PRETTY_PRINT') ? JSON_PRETTY_PRINT : 128;
-
-        $multipleDimensions = array(array(1, 2));
-        $numericKeys = array('library' => 'monolog');
-        $singleDimension = array(1, 'Hello', 'Jordi');
-
-        return array(
-            array(array(), '[]'),
-            array($multipleDimensions, json_encode($multipleDimensions, $jsonPrettyPrintFlag)),
-            array($numericKeys, json_encode($numericKeys, $jsonPrettyPrintFlag)),
-            array($singleDimension, json_encode($singleDimension))
-        );
-    }
-
-    /**
-     * @dataProvider dataStringify
-     */
-    public function testStringify($fields, $expectedResult)
-    {
-        $slackRecord = new SlackRecord(
-            '#test',
-            'test',
-            true,
-            null,
-            true,
-            true
-        );
-
-        $this->assertSame($expectedResult, $slackRecord->stringify($fields));
-    }
-
-    public function testAddsCustomUsername()
-    {
-        $username = 'Monolog bot';
-        $record = new SlackRecord(null, $username);
-        $data = $record->getSlackData($this->getRecord());
-
-        $this->assertArrayHasKey('username', $data);
-        $this->assertSame($username, $data['username']);
-    }
-
-    public function testNoIcon()
-    {
-        $record = new SlackRecord();
-        $data = $record->getSlackData($this->getRecord());
-
-        $this->assertArrayNotHasKey('icon_emoji', $data);
-    }
-
-    public function testAddsIcon()
-    {
-        $record = $this->getRecord();
-        $slackRecord = new SlackRecord(null, null, false, 'ghost');
-        $data = $slackRecord->getSlackData($record);
-
-        $slackRecord2 = new SlackRecord(null, null, false, 'http://github.com/Seldaek/monolog');
-        $data2 = $slackRecord2->getSlackData($record);
-
-        $this->assertArrayHasKey('icon_emoji', $data);
-        $this->assertSame(':ghost:', $data['icon_emoji']);
-        $this->assertArrayHasKey('icon_url', $data2);
-        $this->assertSame('http://github.com/Seldaek/monolog', $data2['icon_url']);
-    }
-
-    public function testAttachmentsNotPresentIfNoAttachment()
-    {
-        $record = new SlackRecord(null, null, false);
-        $data = $record->getSlackData($this->getRecord());
-
-        $this->assertArrayNotHasKey('attachments', $data);
-    }
-
-    public function testAddsOneAttachment()
-    {
-        $record = new SlackRecord();
-        $data = $record->getSlackData($this->getRecord());
-
-        $this->assertArrayHasKey('attachments', $data);
-        $this->assertArrayHasKey(0, $data['attachments']);
-        $this->assertInternalType('array', $data['attachments'][0]);
-    }
-
-    public function testTextEqualsMessageIfNoAttachment()
-    {
-        $message = 'Test message';
-        $record = new SlackRecord(null, null, false);
-        $data = $record->getSlackData($this->getRecord(Logger::WARNING, $message));
-
-        $this->assertArrayHasKey('text', $data);
-        $this->assertSame($message, $data['text']);
-    }
-
-    public function testTextEqualsFormatterOutput()
-    {
-        $formatter = $this->getMock('Monolog\\Formatter\\FormatterInterface');
-        $formatter
-            ->expects($this->any())
-            ->method('format')
-            ->will($this->returnCallback(function ($record) { return $record['message'] . 'test'; }));
-
-        $formatter2 = $this->getMock('Monolog\\Formatter\\FormatterInterface');
-        $formatter2
-            ->expects($this->any())
-            ->method('format')
-            ->will($this->returnCallback(function ($record) { return $record['message'] . 'test1'; }));
-
-        $message = 'Test message';
-        $record = new SlackRecord(null, null, false, null, false, false, array(), $formatter);
-        $data = $record->getSlackData($this->getRecord(Logger::WARNING, $message));
-
-        $this->assertArrayHasKey('text', $data);
-        $this->assertSame($message . 'test', $data['text']);
-
-        $record->setFormatter($formatter2);
-        $data = $record->getSlackData($this->getRecord(Logger::WARNING, $message));
-
-        $this->assertArrayHasKey('text', $data);
-        $this->assertSame($message . 'test1', $data['text']);
-    }
-
-    public function testAddsFallbackAndTextToAttachment()
-    {
-        $message = 'Test message';
-        $record = new SlackRecord(null);
-        $data = $record->getSlackData($this->getRecord(Logger::WARNING, $message));
-
-        $this->assertSame($message, $data['attachments'][0]['text']);
-        $this->assertSame($message, $data['attachments'][0]['fallback']);
-    }
-
-    public function testMapsLevelToColorAttachmentColor()
-    {
-        $record = new SlackRecord(null);
-        $errorLoggerRecord = $this->getRecord(Logger::ERROR);
-        $emergencyLoggerRecord = $this->getRecord(Logger::EMERGENCY);
-        $warningLoggerRecord = $this->getRecord(Logger::WARNING);
-        $infoLoggerRecord = $this->getRecord(Logger::INFO);
-        $debugLoggerRecord = $this->getRecord(Logger::DEBUG);
-
-        $data = $record->getSlackData($errorLoggerRecord);
-        $this->assertSame(SlackRecord::COLOR_DANGER, $data['attachments'][0]['color']);
-
-        $data = $record->getSlackData($emergencyLoggerRecord);
-        $this->assertSame(SlackRecord::COLOR_DANGER, $data['attachments'][0]['color']);
-
-        $data = $record->getSlackData($warningLoggerRecord);
-        $this->assertSame(SlackRecord::COLOR_WARNING, $data['attachments'][0]['color']);
-
-        $data = $record->getSlackData($infoLoggerRecord);
-        $this->assertSame(SlackRecord::COLOR_GOOD, $data['attachments'][0]['color']);
-
-        $data = $record->getSlackData($debugLoggerRecord);
-        $this->assertSame(SlackRecord::COLOR_DEFAULT, $data['attachments'][0]['color']);
-    }
-
-    public function testAddsShortAttachmentWithoutContextAndExtra()
-    {
-        $level = Logger::ERROR;
-        $levelName = Logger::getLevelName($level);
-        $record = new SlackRecord(null, null, true, null, true);
-        $data = $record->getSlackData($this->getRecord($level, 'test', array('test' => 1)));
-
-        $attachment = $data['attachments'][0];
-        $this->assertArrayHasKey('title', $attachment);
-        $this->assertArrayHasKey('fields', $attachment);
-        $this->assertSame($levelName, $attachment['title']);
-        $this->assertSame(array(), $attachment['fields']);
-    }
-
-    public function testAddsShortAttachmentWithContextAndExtra()
-    {
-        $level = Logger::ERROR;
-        $levelName = Logger::getLevelName($level);
-        $context = array('test' => 1);
-        $extra = array('tags' => array('web'));
-        $record = new SlackRecord(null, null, true, null, true, true);
-        $loggerRecord = $this->getRecord($level, 'test', $context);
-        $loggerRecord['extra'] = $extra;
-        $data = $record->getSlackData($loggerRecord);
-
-        $attachment = $data['attachments'][0];
-        $this->assertArrayHasKey('title', $attachment);
-        $this->assertArrayHasKey('fields', $attachment);
-        $this->assertCount(2, $attachment['fields']);
-        $this->assertSame($levelName, $attachment['title']);
-        $this->assertSame(
-            array(
-                array(
-                    'title' => 'Extra',
-                    'value' => sprintf('```%s```', json_encode($extra, $this->jsonPrettyPrintFlag)),
-                    'short' => false
-                ),
-                array(
-                    'title' => 'Context',
-                    'value' => sprintf('```%s```', json_encode($context, $this->jsonPrettyPrintFlag)),
-                    'short' => false
-                )
-            ),
-            $attachment['fields']
-        );
-    }
-
-    public function testAddsLongAttachmentWithoutContextAndExtra()
-    {
-        $level = Logger::ERROR;
-        $levelName = Logger::getLevelName($level);
-        $record = new SlackRecord(null, null, true, null);
-        $data = $record->getSlackData($this->getRecord($level, 'test', array('test' => 1)));
-
-        $attachment = $data['attachments'][0];
-        $this->assertArrayHasKey('title', $attachment);
-        $this->assertArrayHasKey('fields', $attachment);
-        $this->assertCount(1, $attachment['fields']);
-        $this->assertSame('Message', $attachment['title']);
-        $this->assertSame(
-            array(array(
-                'title' => 'Level',
-                'value' => $levelName,
-                'short' => false
-            )),
-            $attachment['fields']
-        );
-    }
-
-    public function testAddsLongAttachmentWithContextAndExtra()
-    {
-        $level = Logger::ERROR;
-        $levelName = Logger::getLevelName($level);
-        $context = array('test' => 1);
-        $extra = array('tags' => array('web'));
-        $record = new SlackRecord(null, null, true, null, false, true);
-        $loggerRecord = $this->getRecord($level, 'test', $context);
-        $loggerRecord['extra'] = $extra;
-        $data = $record->getSlackData($loggerRecord);
-
-        $expectedFields = array(
-            array(
-                'title' => 'Level',
-                'value' => $levelName,
-                'short' => false,
-            ),
-            array(
-                'title' => 'tags',
-                'value' => sprintf('```%s```', json_encode($extra['tags'])),
-                'short' => false
-            ),
-            array(
-                'title' => 'test',
-                'value' => $context['test'],
-                'short' => false
-            )
-        );
-
-        $attachment = $data['attachments'][0];
-        $this->assertArrayHasKey('title', $attachment);
-        $this->assertArrayHasKey('fields', $attachment);
-        $this->assertCount(3, $attachment['fields']);
-        $this->assertSame('Message', $attachment['title']);
-        $this->assertSame(
-            $expectedFields,
-            $attachment['fields']
-        );
-    }
-
-    public function testAddsTimestampToAttachment()
-    {
-        $record = $this->getRecord();
-        $slackRecord = new SlackRecord();
-        $data = $slackRecord->getSlackData($this->getRecord());
-
-        $attachment = $data['attachments'][0];
-        $this->assertArrayHasKey('ts', $attachment);
-        $this->assertSame($record['datetime']->getTimestamp(), $attachment['ts']);
-    }
-
-    public function testExcludeExtraAndContextFields()
-    {
-        $record = $this->getRecord(
-            Logger::WARNING,
-            'test',
-            array('info' => array('library' => 'monolog', 'author' => 'Jordi'))
-        );
-        $record['extra'] = array('tags' => array('web', 'cli'));
-
-        $slackRecord = new SlackRecord(null, null, true, null, false, true, array('context.info.library', 'extra.tags.1'));
-        $data = $slackRecord->getSlackData($record);
-        $attachment = $data['attachments'][0];
-
-        $expected = array(
-            array(
-                'title' => 'info',
-                'value' => sprintf('```%s```', json_encode(array('author' => 'Jordi'), $this->jsonPrettyPrintFlag)),
-                'short' => false
-            ),
-            array(
-                'title' => 'tags',
-                'value' => sprintf('```%s```', json_encode(array('web'))),
-                'short' => false
-            ),
-        );
-
-        foreach ($expected as $field) {
-            $this->assertNotFalse(array_search($field, $attachment['fields']));
-            break;
-        }
-    }
-}
diff --git a/mayor-orig/www/include/share/googleapi/monolog/monolog/tests/Monolog/Handler/SlackHandlerTest.php b/mayor-orig/www/include/share/googleapi/monolog/monolog/tests/Monolog/Handler/SlackHandlerTest.php
deleted file mode 100644
index b12b01f4..00000000
--- a/mayor-orig/www/include/share/googleapi/monolog/monolog/tests/Monolog/Handler/SlackHandlerTest.php
+++ /dev/null
@@ -1,155 +0,0 @@
-
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Monolog\Handler;
-
-use Monolog\TestCase;
-use Monolog\Logger;
-use Monolog\Formatter\LineFormatter;
-use Monolog\Handler\Slack\SlackRecord;
-
-/**
- * @author Greg Kedzierski 
- * @see    https://api.slack.com/
- */
-class SlackHandlerTest extends TestCase
-{
-    /**
-     * @var resource
-     */
-    private $res;
-
-    /**
-     * @var SlackHandler
-     */
-    private $handler;
-
-    public function setUp()
-    {
-        if (!extension_loaded('openssl')) {
-            $this->markTestSkipped('This test requires openssl to run');
-        }
-    }
-
-    public function testWriteHeader()
-    {
-        $this->createHandler();
-        $this->handler->handle($this->getRecord(Logger::CRITICAL, 'test1'));
-        fseek($this->res, 0);
-        $content = fread($this->res, 1024);
-
-        $this->assertRegexp('/POST \/api\/chat.postMessage HTTP\/1.1\\r\\nHost: slack.com\\r\\nContent-Type: application\/x-www-form-urlencoded\\r\\nContent-Length: \d{2,4}\\r\\n\\r\\n/', $content);
-    }
-
-    public function testWriteContent()
-    {
-        $this->createHandler();
-        $this->handler->handle($this->getRecord(Logger::CRITICAL, 'test1'));
-        fseek($this->res, 0);
-        $content = fread($this->res, 1024);
-
-        $this->assertRegExp('/username=Monolog/', $content);
-        $this->assertRegExp('/channel=channel1/', $content);
-        $this->assertRegExp('/token=myToken/', $content);
-        $this->assertRegExp('/attachments/', $content);
-    }
-
-    public function testWriteContentUsesFormatterIfProvided()
-    {
-        $this->createHandler('myToken', 'channel1', 'Monolog', false);
-        $this->handler->handle($this->getRecord(Logger::CRITICAL, 'test1'));
-        fseek($this->res, 0);
-        $content = fread($this->res, 1024);
-
-        $this->createHandler('myToken', 'channel1', 'Monolog', false);
-        $this->handler->setFormatter(new LineFormatter('foo--%message%'));
-        $this->handler->handle($this->getRecord(Logger::CRITICAL, 'test2'));
-        fseek($this->res, 0);
-        $content2 = fread($this->res, 1024);
-
-        $this->assertRegexp('/text=test1/', $content);
-        $this->assertRegexp('/text=foo--test2/', $content2);
-    }
-
-    public function testWriteContentWithEmoji()
-    {
-        $this->createHandler('myToken', 'channel1', 'Monolog', true, 'alien');
-        $this->handler->handle($this->getRecord(Logger::CRITICAL, 'test1'));
-        fseek($this->res, 0);
-        $content = fread($this->res, 1024);
-
-        $this->assertRegexp('/icon_emoji=%3Aalien%3A/', $content);
-    }
-
-    /**
-     * @dataProvider provideLevelColors
-     */
-    public function testWriteContentWithColors($level, $expectedColor)
-    {
-        $this->createHandler();
-        $this->handler->handle($this->getRecord($level, 'test1'));
-        fseek($this->res, 0);
-        $content = fread($this->res, 1024);
-
-        $this->assertRegexp('/%22color%22%3A%22'.$expectedColor.'/', $content);
-    }
-
-    public function testWriteContentWithPlainTextMessage()
-    {
-        $this->createHandler('myToken', 'channel1', 'Monolog', false);
-        $this->handler->handle($this->getRecord(Logger::CRITICAL, 'test1'));
-        fseek($this->res, 0);
-        $content = fread($this->res, 1024);
-
-        $this->assertRegexp('/text=test1/', $content);
-    }
-
-    public function provideLevelColors()
-    {
-        return array(
-            array(Logger::DEBUG,    urlencode(SlackRecord::COLOR_DEFAULT)),
-            array(Logger::INFO,     SlackRecord::COLOR_GOOD),
-            array(Logger::NOTICE,   SlackRecord::COLOR_GOOD),
-            array(Logger::WARNING,  SlackRecord::COLOR_WARNING),
-            array(Logger::ERROR,    SlackRecord::COLOR_DANGER),
-            array(Logger::CRITICAL, SlackRecord::COLOR_DANGER),
-            array(Logger::ALERT,    SlackRecord::COLOR_DANGER),
-            array(Logger::EMERGENCY,SlackRecord::COLOR_DANGER),
-        );
-    }
-
-    private function createHandler($token = 'myToken', $channel = 'channel1', $username = 'Monolog', $useAttachment = true, $iconEmoji = null, $useShortAttachment = false, $includeExtra = false)
-    {
-        $constructorArgs = array($token, $channel, $username, $useAttachment, $iconEmoji, Logger::DEBUG, true, $useShortAttachment, $includeExtra);
-        $this->res = fopen('php://memory', 'a');
-        $this->handler = $this->getMock(
-            '\Monolog\Handler\SlackHandler',
-            array('fsockopen', 'streamSetTimeout', 'closeSocket'),
-            $constructorArgs
-        );
-
-        $reflectionProperty = new \ReflectionProperty('\Monolog\Handler\SocketHandler', 'connectionString');
-        $reflectionProperty->setAccessible(true);
-        $reflectionProperty->setValue($this->handler, 'localhost:1234');
-
-        $this->handler->expects($this->any())
-            ->method('fsockopen')
-            ->will($this->returnValue($this->res));
-        $this->handler->expects($this->any())
-            ->method('streamSetTimeout')
-            ->will($this->returnValue(true));
-        $this->handler->expects($this->any())
-            ->method('closeSocket')
-            ->will($this->returnValue(true));
-
-        $this->handler->setFormatter($this->getIdentityFormatter());
-    }
-}
diff --git a/mayor-orig/www/include/share/googleapi/monolog/monolog/tests/Monolog/Handler/SlackWebhookHandlerTest.php b/mayor-orig/www/include/share/googleapi/monolog/monolog/tests/Monolog/Handler/SlackWebhookHandlerTest.php
deleted file mode 100644
index c9229e26..00000000
--- a/mayor-orig/www/include/share/googleapi/monolog/monolog/tests/Monolog/Handler/SlackWebhookHandlerTest.php
+++ /dev/null
@@ -1,107 +0,0 @@
-
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Monolog\Handler;
-
-use Monolog\TestCase;
-use Monolog\Logger;
-use Monolog\Formatter\LineFormatter;
-use Monolog\Handler\Slack\SlackRecord;
-
-/**
- * @author Haralan Dobrev 
- * @see    https://api.slack.com/incoming-webhooks
- * @coversDefaultClass Monolog\Handler\SlackWebhookHandler
- */
-class SlackWebhookHandlerTest extends TestCase
-{
-    const WEBHOOK_URL = 'https://hooks.slack.com/services/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E';
-
-    /**
-     * @covers ::__construct
-     * @covers ::getSlackRecord
-     */
-    public function testConstructorMinimal()
-    {
-        $handler = new SlackWebhookHandler(self::WEBHOOK_URL);
-        $record = $this->getRecord();
-        $slackRecord = $handler->getSlackRecord();
-        $this->assertInstanceOf('Monolog\Handler\Slack\SlackRecord', $slackRecord);
-        $this->assertEquals(array(
-            'attachments' => array(
-                array(
-                    'fallback' => 'test',
-                    'text' => 'test',
-                    'color' => SlackRecord::COLOR_WARNING,
-                    'fields' => array(
-                        array(
-                            'title' => 'Level',
-                            'value' => 'WARNING',
-                            'short' => false,
-                        ),
-                    ),
-                    'title' => 'Message',
-                    'mrkdwn_in' => array('fields'),
-                    'ts' => $record['datetime']->getTimestamp(),
-                ),
-            ),
-        ), $slackRecord->getSlackData($record));
-    }
-
-    /**
-     * @covers ::__construct
-     * @covers ::getSlackRecord
-     */
-    public function testConstructorFull()
-    {
-        $handler = new SlackWebhookHandler(
-            self::WEBHOOK_URL,
-            'test-channel',
-            'test-username',
-            false,
-            ':ghost:',
-            false,
-            false,
-            Logger::DEBUG,
-            false
-        );
-
-        $slackRecord = $handler->getSlackRecord();
-        $this->assertInstanceOf('Monolog\Handler\Slack\SlackRecord', $slackRecord);
-        $this->assertEquals(array(
-            'username' => 'test-username',
-            'text' => 'test',
-            'channel' => 'test-channel',
-            'icon_emoji' => ':ghost:',
-        ), $slackRecord->getSlackData($this->getRecord()));
-    }
-
-    /**
-     * @covers ::getFormatter
-     */
-    public function testGetFormatter()
-    {
-        $handler = new SlackWebhookHandler(self::WEBHOOK_URL);
-        $formatter = $handler->getFormatter();
-        $this->assertInstanceOf('Monolog\Formatter\FormatterInterface', $formatter);
-    }
-
-    /**
-     * @covers ::setFormatter
-     */
-    public function testSetFormatter()
-    {
-        $handler = new SlackWebhookHandler(self::WEBHOOK_URL);
-        $formatter = new LineFormatter();
-        $handler->setFormatter($formatter);
-        $this->assertSame($formatter, $handler->getFormatter());
-    }
-}
diff --git a/mayor-orig/www/include/share/googleapi/monolog/monolog/tests/Monolog/Handler/SlackbotHandlerTest.php b/mayor-orig/www/include/share/googleapi/monolog/monolog/tests/Monolog/Handler/SlackbotHandlerTest.php
deleted file mode 100644
index b1b02bde..00000000
--- a/mayor-orig/www/include/share/googleapi/monolog/monolog/tests/Monolog/Handler/SlackbotHandlerTest.php
+++ /dev/null
@@ -1,47 +0,0 @@
-
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Monolog\Handler;
-
-use Monolog\TestCase;
-use Monolog\Logger;
-
-/**
- * @author Haralan Dobrev 
- * @see    https://slack.com/apps/A0F81R8ET-slackbot
- * @coversDefaultClass Monolog\Handler\SlackbotHandler
- */
-class SlackbotHandlerTest extends TestCase
-{
-    /**
-     * @covers ::__construct
-     */
-    public function testConstructorMinimal()
-    {
-        $handler = new SlackbotHandler('test-team', 'test-token', 'test-channel');
-        $this->assertInstanceOf('Monolog\Handler\AbstractProcessingHandler', $handler);
-    }
-
-    /**
-     * @covers ::__construct
-     */
-    public function testConstructorFull()
-    {
-        $handler = new SlackbotHandler(
-            'test-team',
-            'test-token',
-            'test-channel',
-            Logger::DEBUG,
-            false
-        );
-        $this->assertInstanceOf('Monolog\Handler\AbstractProcessingHandler', $handler);
-    }
-}
diff --git a/mayor-orig/www/include/share/googleapi/monolog/monolog/tests/Monolog/Handler/SocketHandlerTest.php b/mayor-orig/www/include/share/googleapi/monolog/monolog/tests/Monolog/Handler/SocketHandlerTest.php
deleted file mode 100644
index 1f9c1f28..00000000
--- a/mayor-orig/www/include/share/googleapi/monolog/monolog/tests/Monolog/Handler/SocketHandlerTest.php
+++ /dev/null
@@ -1,309 +0,0 @@
-
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Monolog\Handler;
-
-use Monolog\TestCase;
-use Monolog\Logger;
-
-/**
- * @author Pablo de Leon Belloc 
- */
-class SocketHandlerTest extends TestCase
-{
-    /**
-     * @var Monolog\Handler\SocketHandler
-     */
-    private $handler;
-
-    /**
-     * @var resource
-     */
-    private $res;
-
-    /**
-     * @expectedException UnexpectedValueException
-     */
-    public function testInvalidHostname()
-    {
-        $this->createHandler('garbage://here');
-        $this->writeRecord('data');
-    }
-
-    /**
-     * @expectedException \InvalidArgumentException
-     */
-    public function testBadConnectionTimeout()
-    {
-        $this->createHandler('localhost:1234');
-        $this->handler->setConnectionTimeout(-1);
-    }
-
-    public function testSetConnectionTimeout()
-    {
-        $this->createHandler('localhost:1234');
-        $this->handler->setConnectionTimeout(10.1);
-        $this->assertEquals(10.1, $this->handler->getConnectionTimeout());
-    }
-
-    /**
-     * @expectedException \InvalidArgumentException
-     */
-    public function testBadTimeout()
-    {
-        $this->createHandler('localhost:1234');
-        $this->handler->setTimeout(-1);
-    }
-
-    public function testSetTimeout()
-    {
-        $this->createHandler('localhost:1234');
-        $this->handler->setTimeout(10.25);
-        $this->assertEquals(10.25, $this->handler->getTimeout());
-    }
-
-    public function testSetWritingTimeout()
-    {
-        $this->createHandler('localhost:1234');
-        $this->handler->setWritingTimeout(10.25);
-        $this->assertEquals(10.25, $this->handler->getWritingTimeout());
-    }
-
-    public function testSetConnectionString()
-    {
-        $this->createHandler('tcp://localhost:9090');
-        $this->assertEquals('tcp://localhost:9090', $this->handler->getConnectionString());
-    }
-
-    /**
-     * @expectedException UnexpectedValueException
-     */
-    public function testExceptionIsThrownOnFsockopenError()
-    {
-        $this->setMockHandler(array('fsockopen'));
-        $this->handler->expects($this->once())
-            ->method('fsockopen')
-            ->will($this->returnValue(false));
-        $this->writeRecord('Hello world');
-    }
-
-    /**
-     * @expectedException UnexpectedValueException
-     */
-    public function testExceptionIsThrownOnPfsockopenError()
-    {
-        $this->setMockHandler(array('pfsockopen'));
-        $this->handler->expects($this->once())
-            ->method('pfsockopen')
-            ->will($this->returnValue(false));
-        $this->handler->setPersistent(true);
-        $this->writeRecord('Hello world');
-    }
-
-    /**
-     * @expectedException UnexpectedValueException
-     */
-    public function testExceptionIsThrownIfCannotSetTimeout()
-    {
-        $this->setMockHandler(array('streamSetTimeout'));
-        $this->handler->expects($this->once())
-            ->method('streamSetTimeout')
-            ->will($this->returnValue(false));
-        $this->writeRecord('Hello world');
-    }
-
-    /**
-     * @expectedException RuntimeException
-     */
-    public function testWriteFailsOnIfFwriteReturnsFalse()
-    {
-        $this->setMockHandler(array('fwrite'));
-
-        $callback = function ($arg) {
-            $map = array(
-                'Hello world' => 6,
-                'world' => false,
-            );
-
-            return $map[$arg];
-        };
-
-        $this->handler->expects($this->exactly(2))
-            ->method('fwrite')
-            ->will($this->returnCallback($callback));
-
-        $this->writeRecord('Hello world');
-    }
-
-    /**
-     * @expectedException RuntimeException
-     */
-    public function testWriteFailsIfStreamTimesOut()
-    {
-        $this->setMockHandler(array('fwrite', 'streamGetMetadata'));
-
-        $callback = function ($arg) {
-            $map = array(
-                'Hello world' => 6,
-                'world' => 5,
-            );
-
-            return $map[$arg];
-        };
-
-        $this->handler->expects($this->exactly(1))
-            ->method('fwrite')
-            ->will($this->returnCallback($callback));
-        $this->handler->expects($this->exactly(1))
-            ->method('streamGetMetadata')
-            ->will($this->returnValue(array('timed_out' => true)));
-
-        $this->writeRecord('Hello world');
-    }
-
-    /**
-     * @expectedException RuntimeException
-     */
-    public function testWriteFailsOnIncompleteWrite()
-    {
-        $this->setMockHandler(array('fwrite', 'streamGetMetadata'));
-
-        $res = $this->res;
-        $callback = function ($string) use ($res) {
-            fclose($res);
-
-            return strlen('Hello');
-        };
-
-        $this->handler->expects($this->exactly(1))
-            ->method('fwrite')
-            ->will($this->returnCallback($callback));
-        $this->handler->expects($this->exactly(1))
-            ->method('streamGetMetadata')
-            ->will($this->returnValue(array('timed_out' => false)));
-
-        $this->writeRecord('Hello world');
-    }
-
-    public function testWriteWithMemoryFile()
-    {
-        $this->setMockHandler();
-        $this->writeRecord('test1');
-        $this->writeRecord('test2');
-        $this->writeRecord('test3');
-        fseek($this->res, 0);
-        $this->assertEquals('test1test2test3', fread($this->res, 1024));
-    }
-
-    public function testWriteWithMock()
-    {
-        $this->setMockHandler(array('fwrite'));
-
-        $callback = function ($arg) {
-            $map = array(
-                'Hello world' => 6,
-                'world' => 5,
-            );
-
-            return $map[$arg];
-        };
-
-        $this->handler->expects($this->exactly(2))
-            ->method('fwrite')
-            ->will($this->returnCallback($callback));
-
-        $this->writeRecord('Hello world');
-    }
-
-    public function testClose()
-    {
-        $this->setMockHandler();
-        $this->writeRecord('Hello world');
-        $this->assertInternalType('resource', $this->res);
-        $this->handler->close();
-        $this->assertFalse(is_resource($this->res), "Expected resource to be closed after closing handler");
-    }
-
-    public function testCloseDoesNotClosePersistentSocket()
-    {
-        $this->setMockHandler();
-        $this->handler->setPersistent(true);
-        $this->writeRecord('Hello world');
-        $this->assertTrue(is_resource($this->res));
-        $this->handler->close();
-        $this->assertTrue(is_resource($this->res));
-    }
-
-    /**
-     * @expectedException \RuntimeException
-     */
-    public function testAvoidInfiniteLoopWhenNoDataIsWrittenForAWritingTimeoutSeconds()
-    {
-        $this->setMockHandler(array('fwrite', 'streamGetMetadata'));
-
-        $this->handler->expects($this->any())
-            ->method('fwrite')
-            ->will($this->returnValue(0));
-
-        $this->handler->expects($this->any())
-            ->method('streamGetMetadata')
-            ->will($this->returnValue(array('timed_out' => false)));
-
-        $this->handler->setWritingTimeout(1);
-
-        $this->writeRecord('Hello world');
-    }
-
-    private function createHandler($connectionString)
-    {
-        $this->handler = new SocketHandler($connectionString);
-        $this->handler->setFormatter($this->getIdentityFormatter());
-    }
-
-    private function writeRecord($string)
-    {
-        $this->handler->handle($this->getRecord(Logger::WARNING, $string));
-    }
-
-    private function setMockHandler(array $methods = array())
-    {
-        $this->res = fopen('php://memory', 'a');
-
-        $defaultMethods = array('fsockopen', 'pfsockopen', 'streamSetTimeout');
-        $newMethods = array_diff($methods, $defaultMethods);
-
-        $finalMethods = array_merge($defaultMethods, $newMethods);
-
-        $this->handler = $this->getMock(
-            '\Monolog\Handler\SocketHandler', $finalMethods, array('localhost:1234')
-        );
-
-        if (!in_array('fsockopen', $methods)) {
-            $this->handler->expects($this->any())
-                ->method('fsockopen')
-                ->will($this->returnValue($this->res));
-        }
-
-        if (!in_array('pfsockopen', $methods)) {
-            $this->handler->expects($this->any())
-                ->method('pfsockopen')
-                ->will($this->returnValue($this->res));
-        }
-
-        if (!in_array('streamSetTimeout', $methods)) {
-            $this->handler->expects($this->any())
-                ->method('streamSetTimeout')
-                ->will($this->returnValue(true));
-        }
-
-        $this->handler->setFormatter($this->getIdentityFormatter());
-    }
-}
diff --git a/mayor-orig/www/include/share/googleapi/monolog/monolog/tests/Monolog/Handler/StreamHandlerTest.php b/mayor-orig/www/include/share/googleapi/monolog/monolog/tests/Monolog/Handler/StreamHandlerTest.php
deleted file mode 100644
index 487030fe..00000000
--- a/mayor-orig/www/include/share/googleapi/monolog/monolog/tests/Monolog/Handler/StreamHandlerTest.php
+++ /dev/null
@@ -1,184 +0,0 @@
-
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Monolog\Handler;
-
-use Monolog\TestCase;
-use Monolog\Logger;
-
-class StreamHandlerTest extends TestCase
-{
-    /**
-     * @covers Monolog\Handler\StreamHandler::__construct
-     * @covers Monolog\Handler\StreamHandler::write
-     */
-    public function testWrite()
-    {
-        $handle = fopen('php://memory', 'a+');
-        $handler = new StreamHandler($handle);
-        $handler->setFormatter($this->getIdentityFormatter());
-        $handler->handle($this->getRecord(Logger::WARNING, 'test'));
-        $handler->handle($this->getRecord(Logger::WARNING, 'test2'));
-        $handler->handle($this->getRecord(Logger::WARNING, 'test3'));
-        fseek($handle, 0);
-        $this->assertEquals('testtest2test3', fread($handle, 100));
-    }
-
-    /**
-     * @covers Monolog\Handler\StreamHandler::close
-     */
-    public function testCloseKeepsExternalHandlersOpen()
-    {
-        $handle = fopen('php://memory', 'a+');
-        $handler = new StreamHandler($handle);
-        $this->assertTrue(is_resource($handle));
-        $handler->close();
-        $this->assertTrue(is_resource($handle));
-    }
-
-    /**
-     * @covers Monolog\Handler\StreamHandler::close
-     */
-    public function testClose()
-    {
-        $handler = new StreamHandler('php://memory');
-        $handler->handle($this->getRecord(Logger::WARNING, 'test'));
-        $streamProp = new \ReflectionProperty('Monolog\Handler\StreamHandler', 'stream');
-        $streamProp->setAccessible(true);
-        $handle = $streamProp->getValue($handler);
-
-        $this->assertTrue(is_resource($handle));
-        $handler->close();
-        $this->assertFalse(is_resource($handle));
-    }
-
-    /**
-     * @covers Monolog\Handler\StreamHandler::write
-     */
-    public function testWriteCreatesTheStreamResource()
-    {
-        $handler = new StreamHandler('php://memory');
-        $handler->handle($this->getRecord());
-    }
-
-    /**
-     * @covers Monolog\Handler\StreamHandler::__construct
-     * @covers Monolog\Handler\StreamHandler::write
-     */
-    public function testWriteLocking()
-    {
-        $temp = sys_get_temp_dir() . DIRECTORY_SEPARATOR . 'monolog_locked_log';
-        $handler = new StreamHandler($temp, Logger::DEBUG, true, null, true);
-        $handler->handle($this->getRecord());
-    }
-
-    /**
-     * @expectedException LogicException
-     * @covers Monolog\Handler\StreamHandler::__construct
-     * @covers Monolog\Handler\StreamHandler::write
-     */
-    public function testWriteMissingResource()
-    {
-        $handler = new StreamHandler(null);
-        $handler->handle($this->getRecord());
-    }
-
-    public function invalidArgumentProvider()
-    {
-        return array(
-            array(1),
-            array(array()),
-            array(array('bogus://url')),
-        );
-    }
-
-    /**
-     * @dataProvider invalidArgumentProvider
-     * @expectedException InvalidArgumentException
-     * @covers Monolog\Handler\StreamHandler::__construct
-     */
-    public function testWriteInvalidArgument($invalidArgument)
-    {
-        $handler = new StreamHandler($invalidArgument);
-    }
-
-    /**
-     * @expectedException UnexpectedValueException
-     * @covers Monolog\Handler\StreamHandler::__construct
-     * @covers Monolog\Handler\StreamHandler::write
-     */
-    public function testWriteInvalidResource()
-    {
-        $handler = new StreamHandler('bogus://url');
-        $handler->handle($this->getRecord());
-    }
-
-    /**
-     * @expectedException UnexpectedValueException
-     * @covers Monolog\Handler\StreamHandler::__construct
-     * @covers Monolog\Handler\StreamHandler::write
-     */
-    public function testWriteNonExistingResource()
-    {
-        $handler = new StreamHandler('ftp://foo/bar/baz/'.rand(0, 10000));
-        $handler->handle($this->getRecord());
-    }
-
-    /**
-     * @covers Monolog\Handler\StreamHandler::__construct
-     * @covers Monolog\Handler\StreamHandler::write
-     */
-    public function testWriteNonExistingPath()
-    {
-        $handler = new StreamHandler(sys_get_temp_dir().'/bar/'.rand(0, 10000).DIRECTORY_SEPARATOR.rand(0, 10000));
-        $handler->handle($this->getRecord());
-    }
-
-    /**
-     * @covers Monolog\Handler\StreamHandler::__construct
-     * @covers Monolog\Handler\StreamHandler::write
-     */
-    public function testWriteNonExistingFileResource()
-    {
-        $handler = new StreamHandler('file://'.sys_get_temp_dir().'/bar/'.rand(0, 10000).DIRECTORY_SEPARATOR.rand(0, 10000));
-        $handler->handle($this->getRecord());
-    }
-
-    /**
-     * @expectedException Exception
-     * @expectedExceptionMessageRegExp /There is no existing directory at/
-     * @covers Monolog\Handler\StreamHandler::__construct
-     * @covers Monolog\Handler\StreamHandler::write
-     */
-    public function testWriteNonExistingAndNotCreatablePath()
-    {
-        if (defined('PHP_WINDOWS_VERSION_BUILD')) {
-            $this->markTestSkipped('Permissions checks can not run on windows');
-        }
-        $handler = new StreamHandler('/foo/bar/'.rand(0, 10000).DIRECTORY_SEPARATOR.rand(0, 10000));
-        $handler->handle($this->getRecord());
-    }
-
-    /**
-     * @expectedException Exception
-     * @expectedExceptionMessageRegExp /There is no existing directory at/
-     * @covers Monolog\Handler\StreamHandler::__construct
-     * @covers Monolog\Handler\StreamHandler::write
-     */
-    public function testWriteNonExistingAndNotCreatableFileResource()
-    {
-        if (defined('PHP_WINDOWS_VERSION_BUILD')) {
-            $this->markTestSkipped('Permissions checks can not run on windows');
-        }
-        $handler = new StreamHandler('file:///foo/bar/'.rand(0, 10000).DIRECTORY_SEPARATOR.rand(0, 10000));
-        $handler->handle($this->getRecord());
-    }
-}
diff --git a/mayor-orig/www/include/share/googleapi/monolog/monolog/tests/Monolog/Handler/SwiftMailerHandlerTest.php b/mayor-orig/www/include/share/googleapi/monolog/monolog/tests/Monolog/Handler/SwiftMailerHandlerTest.php
deleted file mode 100644
index 1d62940f..00000000
--- a/mayor-orig/www/include/share/googleapi/monolog/monolog/tests/Monolog/Handler/SwiftMailerHandlerTest.php
+++ /dev/null
@@ -1,113 +0,0 @@
-
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Monolog\Handler;
-
-use Monolog\Logger;
-use Monolog\TestCase;
-
-class SwiftMailerHandlerTest extends TestCase
-{
-    /** @var \Swift_Mailer|\PHPUnit_Framework_MockObject_MockObject */
-    private $mailer;
-
-    public function setUp()
-    {
-        $this->mailer = $this
-            ->getMockBuilder('Swift_Mailer')
-            ->disableOriginalConstructor()
-            ->getMock();
-    }
-
-    public function testMessageCreationIsLazyWhenUsingCallback()
-    {
-        $this->mailer->expects($this->never())
-            ->method('send');
-
-        $callback = function () {
-            throw new \RuntimeException('Swift_Message creation callback should not have been called in this test');
-        };
-        $handler = new SwiftMailerHandler($this->mailer, $callback);
-
-        $records = array(
-            $this->getRecord(Logger::DEBUG),
-            $this->getRecord(Logger::INFO),
-        );
-        $handler->handleBatch($records);
-    }
-
-    public function testMessageCanBeCustomizedGivenLoggedData()
-    {
-        // Wire Mailer to expect a specific Swift_Message with a customized Subject
-        $expectedMessage = new \Swift_Message();
-        $this->mailer->expects($this->once())
-            ->method('send')
-            ->with($this->callback(function ($value) use ($expectedMessage) {
-                return $value instanceof \Swift_Message
-                    && $value->getSubject() === 'Emergency'
-                    && $value === $expectedMessage;
-            }));
-
-        // Callback dynamically changes subject based on number of logged records
-        $callback = function ($content, array $records) use ($expectedMessage) {
-            $subject = count($records) > 0 ? 'Emergency' : 'Normal';
-            $expectedMessage->setSubject($subject);
-
-            return $expectedMessage;
-        };
-        $handler = new SwiftMailerHandler($this->mailer, $callback);
-
-        // Logging 1 record makes this an Emergency
-        $records = array(
-            $this->getRecord(Logger::EMERGENCY),
-        );
-        $handler->handleBatch($records);
-    }
-
-    public function testMessageSubjectFormatting()
-    {
-        // Wire Mailer to expect a specific Swift_Message with a customized Subject
-        $messageTemplate = new \Swift_Message();
-        $messageTemplate->setSubject('Alert: %level_name% %message%');
-        $receivedMessage = null;
-
-        $this->mailer->expects($this->once())
-            ->method('send')
-            ->with($this->callback(function ($value) use (&$receivedMessage) {
-                $receivedMessage = $value;
-                return true;
-            }));
-
-        $handler = new SwiftMailerHandler($this->mailer, $messageTemplate);
-
-        $records = array(
-            $this->getRecord(Logger::EMERGENCY),
-        );
-        $handler->handleBatch($records);
-
-        $this->assertEquals('Alert: EMERGENCY test', $receivedMessage->getSubject());
-    }
-
-    public function testMessageHaveUniqueId()
-    {
-        $messageTemplate = new \Swift_Message();
-        $handler = new SwiftMailerHandler($this->mailer, $messageTemplate);
-
-        $method = new \ReflectionMethod('Monolog\Handler\SwiftMailerHandler', 'buildMessage');
-        $method->setAccessible(true);
-        $method->invokeArgs($handler, array($messageTemplate, array()));
-
-        $builtMessage1 = $method->invoke($handler, $messageTemplate, array());
-        $builtMessage2 = $method->invoke($handler, $messageTemplate, array());
-
-        $this->assertFalse($builtMessage1->getId() === $builtMessage2->getId(), 'Two different messages have the same id');
-    }
-}
diff --git a/mayor-orig/www/include/share/googleapi/monolog/monolog/tests/Monolog/Handler/SyslogHandlerTest.php b/mayor-orig/www/include/share/googleapi/monolog/monolog/tests/Monolog/Handler/SyslogHandlerTest.php
deleted file mode 100644
index 8f9e46bf..00000000
--- a/mayor-orig/www/include/share/googleapi/monolog/monolog/tests/Monolog/Handler/SyslogHandlerTest.php
+++ /dev/null
@@ -1,44 +0,0 @@
-
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Monolog\Handler;
-
-use Monolog\Logger;
-
-class SyslogHandlerTest extends \PHPUnit_Framework_TestCase
-{
-    /**
-     * @covers Monolog\Handler\SyslogHandler::__construct
-     */
-    public function testConstruct()
-    {
-        $handler = new SyslogHandler('test');
-        $this->assertInstanceOf('Monolog\Handler\SyslogHandler', $handler);
-
-        $handler = new SyslogHandler('test', LOG_USER);
-        $this->assertInstanceOf('Monolog\Handler\SyslogHandler', $handler);
-
-        $handler = new SyslogHandler('test', 'user');
-        $this->assertInstanceOf('Monolog\Handler\SyslogHandler', $handler);
-
-        $handler = new SyslogHandler('test', LOG_USER, Logger::DEBUG, true, LOG_PERROR);
-        $this->assertInstanceOf('Monolog\Handler\SyslogHandler', $handler);
-    }
-
-    /**
-     * @covers Monolog\Handler\SyslogHandler::__construct
-     */
-    public function testConstructInvalidFacility()
-    {
-        $this->setExpectedException('UnexpectedValueException');
-        $handler = new SyslogHandler('test', 'unknown');
-    }
-}
diff --git a/mayor-orig/www/include/share/googleapi/monolog/monolog/tests/Monolog/Handler/SyslogUdpHandlerTest.php b/mayor-orig/www/include/share/googleapi/monolog/monolog/tests/Monolog/Handler/SyslogUdpHandlerTest.php
deleted file mode 100644
index 7ee8a985..00000000
--- a/mayor-orig/www/include/share/googleapi/monolog/monolog/tests/Monolog/Handler/SyslogUdpHandlerTest.php
+++ /dev/null
@@ -1,76 +0,0 @@
-
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Monolog\Handler;
-
-use Monolog\TestCase;
-
-/**
- * @requires extension sockets
- */
-class SyslogUdpHandlerTest extends TestCase
-{
-    /**
-     * @expectedException UnexpectedValueException
-     */
-    public function testWeValidateFacilities()
-    {
-        $handler = new SyslogUdpHandler("ip", null, "invalidFacility");
-    }
-
-    public function testWeSplitIntoLines()
-    {
-        $time = '2014-01-07T12:34';
-        $pid = getmypid();
-        $host = gethostname();
-
-        $handler = $this->getMockBuilder('\Monolog\Handler\SyslogUdpHandler')
-            ->setConstructorArgs(array("127.0.0.1", 514, "authpriv"))
-            ->setMethods(array('getDateTime'))
-            ->getMock();
-
-        $handler->method('getDateTime')
-            ->willReturn($time);
-
-        $handler->setFormatter(new \Monolog\Formatter\ChromePHPFormatter());
-
-        $socket = $this->getMock('\Monolog\Handler\SyslogUdp\UdpSocket', array('write'), array('lol', 'lol'));
-        $socket->expects($this->at(0))
-            ->method('write')
-            ->with("lol", "<".(LOG_AUTHPRIV + LOG_WARNING).">1 $time $host php $pid - - ");
-        $socket->expects($this->at(1))
-            ->method('write')
-            ->with("hej", "<".(LOG_AUTHPRIV + LOG_WARNING).">1 $time $host php $pid - - ");
-
-        $handler->setSocket($socket);
-
-        $handler->handle($this->getRecordWithMessage("hej\nlol"));
-    }
-
-    public function testSplitWorksOnEmptyMsg()
-    {
-        $handler = new SyslogUdpHandler("127.0.0.1", 514, "authpriv");
-        $handler->setFormatter($this->getIdentityFormatter());
-
-        $socket = $this->getMock('\Monolog\Handler\SyslogUdp\UdpSocket', array('write'), array('lol', 'lol'));
-        $socket->expects($this->never())
-            ->method('write');
-
-        $handler->setSocket($socket);
-
-        $handler->handle($this->getRecordWithMessage(null));
-    }
-
-    protected function getRecordWithMessage($msg)
-    {
-        return array('message' => $msg, 'level' => \Monolog\Logger::WARNING, 'context' => null, 'extra' => array(), 'channel' => 'lol');
-    }
-}
diff --git a/mayor-orig/www/include/share/googleapi/monolog/monolog/tests/Monolog/Handler/TestHandlerTest.php b/mayor-orig/www/include/share/googleapi/monolog/monolog/tests/Monolog/Handler/TestHandlerTest.php
deleted file mode 100644
index bfb8d3df..00000000
--- a/mayor-orig/www/include/share/googleapi/monolog/monolog/tests/Monolog/Handler/TestHandlerTest.php
+++ /dev/null
@@ -1,70 +0,0 @@
-
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Monolog\Handler;
-
-use Monolog\TestCase;
-use Monolog\Logger;
-
-/**
- * @covers Monolog\Handler\TestHandler
- */
-class TestHandlerTest extends TestCase
-{
-    /**
-     * @dataProvider methodProvider
-     */
-    public function testHandler($method, $level)
-    {
-        $handler = new TestHandler;
-        $record = $this->getRecord($level, 'test'.$method);
-        $this->assertFalse($handler->hasRecords($level));
-        $this->assertFalse($handler->hasRecord($record, $level));
-        $this->assertFalse($handler->{'has'.$method}($record), 'has'.$method);
-        $this->assertFalse($handler->{'has'.$method.'ThatContains'}('test'), 'has'.$method.'ThatContains');
-        $this->assertFalse($handler->{'has'.$method.'ThatPasses'}(function ($rec) {
-            return true;
-        }), 'has'.$method.'ThatPasses');
-        $this->assertFalse($handler->{'has'.$method.'ThatMatches'}('/test\w+/'));
-        $this->assertFalse($handler->{'has'.$method.'Records'}(), 'has'.$method.'Records');
-        $handler->handle($record);
-
-        $this->assertFalse($handler->{'has'.$method}('bar'), 'has'.$method);
-        $this->assertTrue($handler->hasRecords($level));
-        $this->assertTrue($handler->hasRecord($record, $level));
-        $this->assertTrue($handler->{'has'.$method}($record), 'has'.$method);
-        $this->assertTrue($handler->{'has'.$method}('test'.$method), 'has'.$method);
-        $this->assertTrue($handler->{'has'.$method.'ThatContains'}('test'), 'has'.$method.'ThatContains');
-        $this->assertTrue($handler->{'has'.$method.'ThatPasses'}(function ($rec) {
-            return true;
-        }), 'has'.$method.'ThatPasses');
-        $this->assertTrue($handler->{'has'.$method.'ThatMatches'}('/test\w+/'));
-        $this->assertTrue($handler->{'has'.$method.'Records'}(), 'has'.$method.'Records');
-
-        $records = $handler->getRecords();
-        unset($records[0]['formatted']);
-        $this->assertEquals(array($record), $records);
-    }
-
-    public function methodProvider()
-    {
-        return array(
-            array('Emergency', Logger::EMERGENCY),
-            array('Alert'    , Logger::ALERT),
-            array('Critical' , Logger::CRITICAL),
-            array('Error'    , Logger::ERROR),
-            array('Warning'  , Logger::WARNING),
-            array('Info'     , Logger::INFO),
-            array('Notice'   , Logger::NOTICE),
-            array('Debug'    , Logger::DEBUG),
-        );
-    }
-}
diff --git a/mayor-orig/www/include/share/googleapi/monolog/monolog/tests/Monolog/Handler/UdpSocketTest.php b/mayor-orig/www/include/share/googleapi/monolog/monolog/tests/Monolog/Handler/UdpSocketTest.php
deleted file mode 100644
index fa524d00..00000000
--- a/mayor-orig/www/include/share/googleapi/monolog/monolog/tests/Monolog/Handler/UdpSocketTest.php
+++ /dev/null
@@ -1,64 +0,0 @@
-
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Monolog\Handler;
-
-use Monolog\TestCase;
-use Monolog\Handler\SyslogUdp\UdpSocket;
-
-/**
- * @requires extension sockets
- */
-class UdpSocketTest extends TestCase
-{
-    public function testWeDoNotTruncateShortMessages()
-    {
-        $socket = $this->getMock('\Monolog\Handler\SyslogUdp\UdpSocket', array('send'), array('lol', 'lol'));
-
-        $socket->expects($this->at(0))
-            ->method('send')
-            ->with("HEADER: The quick brown fox jumps over the lazy dog");
-
-        $socket->write("The quick brown fox jumps over the lazy dog", "HEADER: ");
-    }
-
-    public function testLongMessagesAreTruncated()
-    {
-        $socket = $this->getMock('\Monolog\Handler\SyslogUdp\UdpSocket', array('send'), array('lol', 'lol'));
-
-        $truncatedString = str_repeat("derp", 16254).'d';
-
-        $socket->expects($this->exactly(1))
-            ->method('send')
-            ->with("HEADER" . $truncatedString);
-
-        $longString = str_repeat("derp", 20000);
-
-        $socket->write($longString, "HEADER");
-    }
-
-    public function testDoubleCloseDoesNotError()
-    {
-        $socket = new UdpSocket('127.0.0.1', 514);
-        $socket->close();
-        $socket->close();
-    }
-
-    /**
-     * @expectedException LogicException
-     */
-    public function testWriteAfterCloseErrors()
-    {
-        $socket = new UdpSocket('127.0.0.1', 514);
-        $socket->close();
-        $socket->write('foo', "HEADER");
-    }
-}
diff --git a/mayor-orig/www/include/share/googleapi/monolog/monolog/tests/Monolog/Handler/WhatFailureGroupHandlerTest.php b/mayor-orig/www/include/share/googleapi/monolog/monolog/tests/Monolog/Handler/WhatFailureGroupHandlerTest.php
deleted file mode 100644
index 8d37a1fc..00000000
--- a/mayor-orig/www/include/share/googleapi/monolog/monolog/tests/Monolog/Handler/WhatFailureGroupHandlerTest.php
+++ /dev/null
@@ -1,121 +0,0 @@
-
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Monolog\Handler;
-
-use Monolog\TestCase;
-use Monolog\Logger;
-
-class WhatFailureGroupHandlerTest extends TestCase
-{
-    /**
-     * @covers Monolog\Handler\WhatFailureGroupHandler::__construct
-     * @expectedException InvalidArgumentException
-     */
-    public function testConstructorOnlyTakesHandler()
-    {
-        new WhatFailureGroupHandler(array(new TestHandler(), "foo"));
-    }
-
-    /**
-     * @covers Monolog\Handler\WhatFailureGroupHandler::__construct
-     * @covers Monolog\Handler\WhatFailureGroupHandler::handle
-     */
-    public function testHandle()
-    {
-        $testHandlers = array(new TestHandler(), new TestHandler());
-        $handler = new WhatFailureGroupHandler($testHandlers);
-        $handler->handle($this->getRecord(Logger::DEBUG));
-        $handler->handle($this->getRecord(Logger::INFO));
-        foreach ($testHandlers as $test) {
-            $this->assertTrue($test->hasDebugRecords());
-            $this->assertTrue($test->hasInfoRecords());
-            $this->assertTrue(count($test->getRecords()) === 2);
-        }
-    }
-
-    /**
-     * @covers Monolog\Handler\WhatFailureGroupHandler::handleBatch
-     */
-    public function testHandleBatch()
-    {
-        $testHandlers = array(new TestHandler(), new TestHandler());
-        $handler = new WhatFailureGroupHandler($testHandlers);
-        $handler->handleBatch(array($this->getRecord(Logger::DEBUG), $this->getRecord(Logger::INFO)));
-        foreach ($testHandlers as $test) {
-            $this->assertTrue($test->hasDebugRecords());
-            $this->assertTrue($test->hasInfoRecords());
-            $this->assertTrue(count($test->getRecords()) === 2);
-        }
-    }
-
-    /**
-     * @covers Monolog\Handler\WhatFailureGroupHandler::isHandling
-     */
-    public function testIsHandling()
-    {
-        $testHandlers = array(new TestHandler(Logger::ERROR), new TestHandler(Logger::WARNING));
-        $handler = new WhatFailureGroupHandler($testHandlers);
-        $this->assertTrue($handler->isHandling($this->getRecord(Logger::ERROR)));
-        $this->assertTrue($handler->isHandling($this->getRecord(Logger::WARNING)));
-        $this->assertFalse($handler->isHandling($this->getRecord(Logger::DEBUG)));
-    }
-
-    /**
-     * @covers Monolog\Handler\WhatFailureGroupHandler::handle
-     */
-    public function testHandleUsesProcessors()
-    {
-        $test = new TestHandler();
-        $handler = new WhatFailureGroupHandler(array($test));
-        $handler->pushProcessor(function ($record) {
-            $record['extra']['foo'] = true;
-
-            return $record;
-        });
-        $handler->handle($this->getRecord(Logger::WARNING));
-        $this->assertTrue($test->hasWarningRecords());
-        $records = $test->getRecords();
-        $this->assertTrue($records[0]['extra']['foo']);
-    }
-
-    /**
-     * @covers Monolog\Handler\WhatFailureGroupHandler::handle
-     */
-    public function testHandleException()
-    {
-        $test = new TestHandler();
-        $exception = new ExceptionTestHandler();
-        $handler = new WhatFailureGroupHandler(array($exception, $test, $exception));
-        $handler->pushProcessor(function ($record) {
-            $record['extra']['foo'] = true;
-
-            return $record;
-        });
-        $handler->handle($this->getRecord(Logger::WARNING));
-        $this->assertTrue($test->hasWarningRecords());
-        $records = $test->getRecords();
-        $this->assertTrue($records[0]['extra']['foo']);
-    }
-}
-
-class ExceptionTestHandler extends TestHandler
-{
-    /**
-     * {@inheritdoc}
-     */
-    public function handle(array $record)
-    {
-        parent::handle($record);
-
-        throw new \Exception("ExceptionTestHandler::handle");
-    }
-}
diff --git a/mayor-orig/www/include/share/googleapi/monolog/monolog/tests/Monolog/Handler/ZendMonitorHandlerTest.php b/mayor-orig/www/include/share/googleapi/monolog/monolog/tests/Monolog/Handler/ZendMonitorHandlerTest.php
deleted file mode 100644
index 69b001ea..00000000
--- a/mayor-orig/www/include/share/googleapi/monolog/monolog/tests/Monolog/Handler/ZendMonitorHandlerTest.php
+++ /dev/null
@@ -1,69 +0,0 @@
-
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Monolog\Handler;
-
-use Monolog\TestCase;
-
-class ZendMonitorHandlerTest extends TestCase
-{
-    protected $zendMonitorHandler;
-
-    public function setUp()
-    {
-        if (!function_exists('zend_monitor_custom_event')) {
-            $this->markTestSkipped('ZendServer is not installed');
-        }
-    }
-
-    /**
-     * @covers  Monolog\Handler\ZendMonitorHandler::write
-     */
-    public function testWrite()
-    {
-        $record = $this->getRecord();
-        $formatterResult = array(
-            'message' => $record['message'],
-        );
-
-        $zendMonitor = $this->getMockBuilder('Monolog\Handler\ZendMonitorHandler')
-            ->setMethods(array('writeZendMonitorCustomEvent', 'getDefaultFormatter'))
-            ->getMock();
-
-        $formatterMock = $this->getMockBuilder('Monolog\Formatter\NormalizerFormatter')
-            ->disableOriginalConstructor()
-            ->getMock();
-
-        $formatterMock->expects($this->once())
-            ->method('format')
-            ->will($this->returnValue($formatterResult));
-
-        $zendMonitor->expects($this->once())
-            ->method('getDefaultFormatter')
-            ->will($this->returnValue($formatterMock));
-
-        $levelMap = $zendMonitor->getLevelMap();
-
-        $zendMonitor->expects($this->once())
-            ->method('writeZendMonitorCustomEvent')
-            ->with($levelMap[$record['level']], $record['message'], $formatterResult);
-
-        $zendMonitor->handle($record);
-    }
-
-    /**
-     * @covers Monolog\Handler\ZendMonitorHandler::getDefaultFormatter
-     */
-    public function testGetDefaultFormatterReturnsNormalizerFormatter()
-    {
-        $zendMonitor = new ZendMonitorHandler();
-        $this->assertInstanceOf('Monolog\Formatter\NormalizerFormatter', $zendMonitor->getDefaultFormatter());
-    }
-}
diff --git a/mayor-orig/www/include/share/googleapi/monolog/monolog/tests/Monolog/LoggerTest.php b/mayor-orig/www/include/share/googleapi/monolog/monolog/tests/Monolog/LoggerTest.php
deleted file mode 100644
index 1ecc34a0..00000000
--- a/mayor-orig/www/include/share/googleapi/monolog/monolog/tests/Monolog/LoggerTest.php
+++ /dev/null
@@ -1,548 +0,0 @@
-
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Monolog;
-
-use Monolog\Processor\WebProcessor;
-use Monolog\Handler\TestHandler;
-
-class LoggerTest extends \PHPUnit_Framework_TestCase
-{
-    /**
-     * @covers Monolog\Logger::getName
-     */
-    public function testGetName()
-    {
-        $logger = new Logger('foo');
-        $this->assertEquals('foo', $logger->getName());
-    }
-
-    /**
-     * @covers Monolog\Logger::getLevelName
-     */
-    public function testGetLevelName()
-    {
-        $this->assertEquals('ERROR', Logger::getLevelName(Logger::ERROR));
-    }
-
-    /**
-     * @covers Monolog\Logger::withName
-     */
-    public function testWithName()
-    {
-        $first = new Logger('first', array($handler = new TestHandler()));
-        $second = $first->withName('second');
-
-        $this->assertSame('first', $first->getName());
-        $this->assertSame('second', $second->getName());
-        $this->assertSame($handler, $second->popHandler());
-    }
-
-    /**
-     * @covers Monolog\Logger::toMonologLevel
-     */
-    public function testConvertPSR3ToMonologLevel()
-    {
-        $this->assertEquals(Logger::toMonologLevel('debug'), 100);
-        $this->assertEquals(Logger::toMonologLevel('info'), 200);
-        $this->assertEquals(Logger::toMonologLevel('notice'), 250);
-        $this->assertEquals(Logger::toMonologLevel('warning'), 300);
-        $this->assertEquals(Logger::toMonologLevel('error'), 400);
-        $this->assertEquals(Logger::toMonologLevel('critical'), 500);
-        $this->assertEquals(Logger::toMonologLevel('alert'), 550);
-        $this->assertEquals(Logger::toMonologLevel('emergency'), 600);
-    }
-
-    /**
-     * @covers Monolog\Logger::getLevelName
-     * @expectedException InvalidArgumentException
-     */
-    public function testGetLevelNameThrows()
-    {
-        Logger::getLevelName(5);
-    }
-
-    /**
-     * @covers Monolog\Logger::__construct
-     */
-    public function testChannel()
-    {
-        $logger = new Logger('foo');
-        $handler = new TestHandler;
-        $logger->pushHandler($handler);
-        $logger->addWarning('test');
-        list($record) = $handler->getRecords();
-        $this->assertEquals('foo', $record['channel']);
-    }
-
-    /**
-     * @covers Monolog\Logger::addRecord
-     */
-    public function testLog()
-    {
-        $logger = new Logger(__METHOD__);
-
-        $handler = $this->getMock('Monolog\Handler\NullHandler', array('handle'));
-        $handler->expects($this->once())
-            ->method('handle');
-        $logger->pushHandler($handler);
-
-        $this->assertTrue($logger->addWarning('test'));
-    }
-
-    /**
-     * @covers Monolog\Logger::addRecord
-     */
-    public function testLogNotHandled()
-    {
-        $logger = new Logger(__METHOD__);
-
-        $handler = $this->getMock('Monolog\Handler\NullHandler', array('handle'), array(Logger::ERROR));
-        $handler->expects($this->never())
-            ->method('handle');
-        $logger->pushHandler($handler);
-
-        $this->assertFalse($logger->addWarning('test'));
-    }
-
-    public function testHandlersInCtor()
-    {
-        $handler1 = new TestHandler;
-        $handler2 = new TestHandler;
-        $logger = new Logger(__METHOD__, array($handler1, $handler2));
-
-        $this->assertEquals($handler1, $logger->popHandler());
-        $this->assertEquals($handler2, $logger->popHandler());
-    }
-
-    public function testProcessorsInCtor()
-    {
-        $processor1 = new WebProcessor;
-        $processor2 = new WebProcessor;
-        $logger = new Logger(__METHOD__, array(), array($processor1, $processor2));
-
-        $this->assertEquals($processor1, $logger->popProcessor());
-        $this->assertEquals($processor2, $logger->popProcessor());
-    }
-
-    /**
-     * @covers Monolog\Logger::pushHandler
-     * @covers Monolog\Logger::popHandler
-     * @expectedException LogicException
-     */
-    public function testPushPopHandler()
-    {
-        $logger = new Logger(__METHOD__);
-        $handler1 = new TestHandler;
-        $handler2 = new TestHandler;
-
-        $logger->pushHandler($handler1);
-        $logger->pushHandler($handler2);
-
-        $this->assertEquals($handler2, $logger->popHandler());
-        $this->assertEquals($handler1, $logger->popHandler());
-        $logger->popHandler();
-    }
-
-    /**
-     * @covers Monolog\Logger::setHandlers
-     */
-    public function testSetHandlers()
-    {
-        $logger = new Logger(__METHOD__);
-        $handler1 = new TestHandler;
-        $handler2 = new TestHandler;
-
-        $logger->pushHandler($handler1);
-        $logger->setHandlers(array($handler2));
-
-        // handler1 has been removed
-        $this->assertEquals(array($handler2), $logger->getHandlers());
-
-        $logger->setHandlers(array(
-            "AMapKey" => $handler1,
-            "Woop" => $handler2,
-        ));
-
-        // Keys have been scrubbed
-        $this->assertEquals(array($handler1, $handler2), $logger->getHandlers());
-    }
-
-    /**
-     * @covers Monolog\Logger::pushProcessor
-     * @covers Monolog\Logger::popProcessor
-     * @expectedException LogicException
-     */
-    public function testPushPopProcessor()
-    {
-        $logger = new Logger(__METHOD__);
-        $processor1 = new WebProcessor;
-        $processor2 = new WebProcessor;
-
-        $logger->pushProcessor($processor1);
-        $logger->pushProcessor($processor2);
-
-        $this->assertEquals($processor2, $logger->popProcessor());
-        $this->assertEquals($processor1, $logger->popProcessor());
-        $logger->popProcessor();
-    }
-
-    /**
-     * @covers Monolog\Logger::pushProcessor
-     * @expectedException InvalidArgumentException
-     */
-    public function testPushProcessorWithNonCallable()
-    {
-        $logger = new Logger(__METHOD__);
-
-        $logger->pushProcessor(new \stdClass());
-    }
-
-    /**
-     * @covers Monolog\Logger::addRecord
-     */
-    public function testProcessorsAreExecuted()
-    {
-        $logger = new Logger(__METHOD__);
-        $handler = new TestHandler;
-        $logger->pushHandler($handler);
-        $logger->pushProcessor(function ($record) {
-            $record['extra']['win'] = true;
-
-            return $record;
-        });
-        $logger->addError('test');
-        list($record) = $handler->getRecords();
-        $this->assertTrue($record['extra']['win']);
-    }
-
-    /**
-     * @covers Monolog\Logger::addRecord
-     */
-    public function testProcessorsAreCalledOnlyOnce()
-    {
-        $logger = new Logger(__METHOD__);
-        $handler = $this->getMock('Monolog\Handler\HandlerInterface');
-        $handler->expects($this->any())
-            ->method('isHandling')
-            ->will($this->returnValue(true))
-        ;
-        $handler->expects($this->any())
-            ->method('handle')
-            ->will($this->returnValue(true))
-        ;
-        $logger->pushHandler($handler);
-
-        $processor = $this->getMockBuilder('Monolog\Processor\WebProcessor')
-            ->disableOriginalConstructor()
-            ->setMethods(array('__invoke'))
-            ->getMock()
-        ;
-        $processor->expects($this->once())
-            ->method('__invoke')
-            ->will($this->returnArgument(0))
-        ;
-        $logger->pushProcessor($processor);
-
-        $logger->addError('test');
-    }
-
-    /**
-     * @covers Monolog\Logger::addRecord
-     */
-    public function testProcessorsNotCalledWhenNotHandled()
-    {
-        $logger = new Logger(__METHOD__);
-        $handler = $this->getMock('Monolog\Handler\HandlerInterface');
-        $handler->expects($this->once())
-            ->method('isHandling')
-            ->will($this->returnValue(false))
-        ;
-        $logger->pushHandler($handler);
-        $that = $this;
-        $logger->pushProcessor(function ($record) use ($that) {
-            $that->fail('The processor should not be called');
-        });
-        $logger->addAlert('test');
-    }
-
-    /**
-     * @covers Monolog\Logger::addRecord
-     */
-    public function testHandlersNotCalledBeforeFirstHandling()
-    {
-        $logger = new Logger(__METHOD__);
-
-        $handler1 = $this->getMock('Monolog\Handler\HandlerInterface');
-        $handler1->expects($this->never())
-            ->method('isHandling')
-            ->will($this->returnValue(false))
-        ;
-        $handler1->expects($this->once())
-            ->method('handle')
-            ->will($this->returnValue(false))
-        ;
-        $logger->pushHandler($handler1);
-
-        $handler2 = $this->getMock('Monolog\Handler\HandlerInterface');
-        $handler2->expects($this->once())
-            ->method('isHandling')
-            ->will($this->returnValue(true))
-        ;
-        $handler2->expects($this->once())
-            ->method('handle')
-            ->will($this->returnValue(false))
-        ;
-        $logger->pushHandler($handler2);
-
-        $handler3 = $this->getMock('Monolog\Handler\HandlerInterface');
-        $handler3->expects($this->once())
-            ->method('isHandling')
-            ->will($this->returnValue(false))
-        ;
-        $handler3->expects($this->never())
-            ->method('handle')
-        ;
-        $logger->pushHandler($handler3);
-
-        $logger->debug('test');
-    }
-
-    /**
-     * @covers Monolog\Logger::addRecord
-     */
-    public function testHandlersNotCalledBeforeFirstHandlingWithAssocArray()
-    {
-        $handler1 = $this->getMock('Monolog\Handler\HandlerInterface');
-        $handler1->expects($this->never())
-            ->method('isHandling')
-            ->will($this->returnValue(false))
-        ;
-        $handler1->expects($this->once())
-            ->method('handle')
-            ->will($this->returnValue(false))
-        ;
-
-        $handler2 = $this->getMock('Monolog\Handler\HandlerInterface');
-        $handler2->expects($this->once())
-            ->method('isHandling')
-            ->will($this->returnValue(true))
-        ;
-        $handler2->expects($this->once())
-            ->method('handle')
-            ->will($this->returnValue(false))
-        ;
-
-        $handler3 = $this->getMock('Monolog\Handler\HandlerInterface');
-        $handler3->expects($this->once())
-            ->method('isHandling')
-            ->will($this->returnValue(false))
-        ;
-        $handler3->expects($this->never())
-            ->method('handle')
-        ;
-
-        $logger = new Logger(__METHOD__, array('last' => $handler3, 'second' => $handler2, 'first' => $handler1));
-
-        $logger->debug('test');
-    }
-
-    /**
-     * @covers Monolog\Logger::addRecord
-     */
-    public function testBubblingWhenTheHandlerReturnsFalse()
-    {
-        $logger = new Logger(__METHOD__);
-
-        $handler1 = $this->getMock('Monolog\Handler\HandlerInterface');
-        $handler1->expects($this->any())
-            ->method('isHandling')
-            ->will($this->returnValue(true))
-        ;
-        $handler1->expects($this->once())
-            ->method('handle')
-            ->will($this->returnValue(false))
-        ;
-        $logger->pushHandler($handler1);
-
-        $handler2 = $this->getMock('Monolog\Handler\HandlerInterface');
-        $handler2->expects($this->any())
-            ->method('isHandling')
-            ->will($this->returnValue(true))
-        ;
-        $handler2->expects($this->once())
-            ->method('handle')
-            ->will($this->returnValue(false))
-        ;
-        $logger->pushHandler($handler2);
-
-        $logger->debug('test');
-    }
-
-    /**
-     * @covers Monolog\Logger::addRecord
-     */
-    public function testNotBubblingWhenTheHandlerReturnsTrue()
-    {
-        $logger = new Logger(__METHOD__);
-
-        $handler1 = $this->getMock('Monolog\Handler\HandlerInterface');
-        $handler1->expects($this->any())
-            ->method('isHandling')
-            ->will($this->returnValue(true))
-        ;
-        $handler1->expects($this->never())
-            ->method('handle')
-        ;
-        $logger->pushHandler($handler1);
-
-        $handler2 = $this->getMock('Monolog\Handler\HandlerInterface');
-        $handler2->expects($this->any())
-            ->method('isHandling')
-            ->will($this->returnValue(true))
-        ;
-        $handler2->expects($this->once())
-            ->method('handle')
-            ->will($this->returnValue(true))
-        ;
-        $logger->pushHandler($handler2);
-
-        $logger->debug('test');
-    }
-
-    /**
-     * @covers Monolog\Logger::isHandling
-     */
-    public function testIsHandling()
-    {
-        $logger = new Logger(__METHOD__);
-
-        $handler1 = $this->getMock('Monolog\Handler\HandlerInterface');
-        $handler1->expects($this->any())
-            ->method('isHandling')
-            ->will($this->returnValue(false))
-        ;
-
-        $logger->pushHandler($handler1);
-        $this->assertFalse($logger->isHandling(Logger::DEBUG));
-
-        $handler2 = $this->getMock('Monolog\Handler\HandlerInterface');
-        $handler2->expects($this->any())
-            ->method('isHandling')
-            ->will($this->returnValue(true))
-        ;
-
-        $logger->pushHandler($handler2);
-        $this->assertTrue($logger->isHandling(Logger::DEBUG));
-    }
-
-    /**
-     * @dataProvider logMethodProvider
-     * @covers Monolog\Logger::addDebug
-     * @covers Monolog\Logger::addInfo
-     * @covers Monolog\Logger::addNotice
-     * @covers Monolog\Logger::addWarning
-     * @covers Monolog\Logger::addError
-     * @covers Monolog\Logger::addCritical
-     * @covers Monolog\Logger::addAlert
-     * @covers Monolog\Logger::addEmergency
-     * @covers Monolog\Logger::debug
-     * @covers Monolog\Logger::info
-     * @covers Monolog\Logger::notice
-     * @covers Monolog\Logger::warn
-     * @covers Monolog\Logger::err
-     * @covers Monolog\Logger::crit
-     * @covers Monolog\Logger::alert
-     * @covers Monolog\Logger::emerg
-     */
-    public function testLogMethods($method, $expectedLevel)
-    {
-        $logger = new Logger('foo');
-        $handler = new TestHandler;
-        $logger->pushHandler($handler);
-        $logger->{$method}('test');
-        list($record) = $handler->getRecords();
-        $this->assertEquals($expectedLevel, $record['level']);
-    }
-
-    public function logMethodProvider()
-    {
-        return array(
-            // monolog methods
-            array('addDebug',     Logger::DEBUG),
-            array('addInfo',      Logger::INFO),
-            array('addNotice',    Logger::NOTICE),
-            array('addWarning',   Logger::WARNING),
-            array('addError',     Logger::ERROR),
-            array('addCritical',  Logger::CRITICAL),
-            array('addAlert',     Logger::ALERT),
-            array('addEmergency', Logger::EMERGENCY),
-
-            // ZF/Sf2 compat methods
-            array('debug',  Logger::DEBUG),
-            array('info',   Logger::INFO),
-            array('notice', Logger::NOTICE),
-            array('warn',   Logger::WARNING),
-            array('err',    Logger::ERROR),
-            array('crit',   Logger::CRITICAL),
-            array('alert',  Logger::ALERT),
-            array('emerg',  Logger::EMERGENCY),
-        );
-    }
-
-    /**
-     * @dataProvider setTimezoneProvider
-     * @covers Monolog\Logger::setTimezone
-     */
-    public function testSetTimezone($tz)
-    {
-        Logger::setTimezone($tz);
-        $logger = new Logger('foo');
-        $handler = new TestHandler;
-        $logger->pushHandler($handler);
-        $logger->info('test');
-        list($record) = $handler->getRecords();
-        $this->assertEquals($tz, $record['datetime']->getTimezone());
-    }
-
-    public function setTimezoneProvider()
-    {
-        return array_map(
-            function ($tz) { return array(new \DateTimeZone($tz)); },
-            \DateTimeZone::listIdentifiers()
-        );
-    }
-
-    /**
-     * @dataProvider useMicrosecondTimestampsProvider
-     * @covers Monolog\Logger::useMicrosecondTimestamps
-     * @covers Monolog\Logger::addRecord
-     */
-    public function testUseMicrosecondTimestamps($micro, $assert)
-    {
-        $logger = new Logger('foo');
-        $logger->useMicrosecondTimestamps($micro);
-        $handler = new TestHandler;
-        $logger->pushHandler($handler);
-        $logger->info('test');
-        list($record) = $handler->getRecords();
-        $this->{$assert}('000000', $record['datetime']->format('u'));
-    }
-
-    public function useMicrosecondTimestampsProvider()
-    {
-        return array(
-            // this has a very small chance of a false negative (1/10^6)
-            'with microseconds' => array(true, 'assertNotSame'),
-            'without microseconds' => array(false, PHP_VERSION_ID >= 70100 ? 'assertNotSame' : 'assertSame'),
-        );
-    }
-}
diff --git a/mayor-orig/www/include/share/googleapi/monolog/monolog/tests/Monolog/Processor/GitProcessorTest.php b/mayor-orig/www/include/share/googleapi/monolog/monolog/tests/Monolog/Processor/GitProcessorTest.php
deleted file mode 100644
index 5adb505d..00000000
--- a/mayor-orig/www/include/share/googleapi/monolog/monolog/tests/Monolog/Processor/GitProcessorTest.php
+++ /dev/null
@@ -1,29 +0,0 @@
-
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Monolog\Processor;
-
-use Monolog\TestCase;
-
-class GitProcessorTest extends TestCase
-{
-    /**
-     * @covers Monolog\Processor\GitProcessor::__invoke
-     */
-    public function testProcessor()
-    {
-        $processor = new GitProcessor();
-        $record = $processor($this->getRecord());
-
-        $this->assertArrayHasKey('git', $record['extra']);
-        $this->assertTrue(!is_array($record['extra']['git']['branch']));
-    }
-}
diff --git a/mayor-orig/www/include/share/googleapi/monolog/monolog/tests/Monolog/Processor/IntrospectionProcessorTest.php b/mayor-orig/www/include/share/googleapi/monolog/monolog/tests/Monolog/Processor/IntrospectionProcessorTest.php
deleted file mode 100644
index 0dd411d7..00000000
--- a/mayor-orig/www/include/share/googleapi/monolog/monolog/tests/Monolog/Processor/IntrospectionProcessorTest.php
+++ /dev/null
@@ -1,123 +0,0 @@
-
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Acme;
-
-class Tester
-{
-    public function test($handler, $record)
-    {
-        $handler->handle($record);
-    }
-}
-
-function tester($handler, $record)
-{
-    $handler->handle($record);
-}
-
-namespace Monolog\Processor;
-
-use Monolog\Logger;
-use Monolog\TestCase;
-use Monolog\Handler\TestHandler;
-
-class IntrospectionProcessorTest extends TestCase
-{
-    public function getHandler()
-    {
-        $processor = new IntrospectionProcessor();
-        $handler = new TestHandler();
-        $handler->pushProcessor($processor);
-
-        return $handler;
-    }
-
-    public function testProcessorFromClass()
-    {
-        $handler = $this->getHandler();
-        $tester = new \Acme\Tester;
-        $tester->test($handler, $this->getRecord());
-        list($record) = $handler->getRecords();
-        $this->assertEquals(__FILE__, $record['extra']['file']);
-        $this->assertEquals(18, $record['extra']['line']);
-        $this->assertEquals('Acme\Tester', $record['extra']['class']);
-        $this->assertEquals('test', $record['extra']['function']);
-    }
-
-    public function testProcessorFromFunc()
-    {
-        $handler = $this->getHandler();
-        \Acme\tester($handler, $this->getRecord());
-        list($record) = $handler->getRecords();
-        $this->assertEquals(__FILE__, $record['extra']['file']);
-        $this->assertEquals(24, $record['extra']['line']);
-        $this->assertEquals(null, $record['extra']['class']);
-        $this->assertEquals('Acme\tester', $record['extra']['function']);
-    }
-
-    public function testLevelTooLow()
-    {
-        $input = array(
-            'level' => Logger::DEBUG,
-            'extra' => array(),
-        );
-
-        $expected = $input;
-
-        $processor = new IntrospectionProcessor(Logger::CRITICAL);
-        $actual = $processor($input);
-
-        $this->assertEquals($expected, $actual);
-    }
-
-    public function testLevelEqual()
-    {
-        $input = array(
-            'level' => Logger::CRITICAL,
-            'extra' => array(),
-        );
-
-        $expected = $input;
-        $expected['extra'] = array(
-            'file' => null,
-            'line' => null,
-            'class' => 'ReflectionMethod',
-            'function' => 'invokeArgs',
-        );
-
-        $processor = new IntrospectionProcessor(Logger::CRITICAL);
-        $actual = $processor($input);
-
-        $this->assertEquals($expected, $actual);
-    }
-
-    public function testLevelHigher()
-    {
-        $input = array(
-            'level' => Logger::EMERGENCY,
-            'extra' => array(),
-        );
-
-        $expected = $input;
-        $expected['extra'] = array(
-            'file' => null,
-            'line' => null,
-            'class' => 'ReflectionMethod',
-            'function' => 'invokeArgs',
-        );
-
-        $processor = new IntrospectionProcessor(Logger::CRITICAL);
-        $actual = $processor($input);
-
-        $this->assertEquals($expected, $actual);
-    }
-}
diff --git a/mayor-orig/www/include/share/googleapi/monolog/monolog/tests/Monolog/Processor/MemoryPeakUsageProcessorTest.php b/mayor-orig/www/include/share/googleapi/monolog/monolog/tests/Monolog/Processor/MemoryPeakUsageProcessorTest.php
deleted file mode 100644
index eb666144..00000000
--- a/mayor-orig/www/include/share/googleapi/monolog/monolog/tests/Monolog/Processor/MemoryPeakUsageProcessorTest.php
+++ /dev/null
@@ -1,42 +0,0 @@
-
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Monolog\Processor;
-
-use Monolog\TestCase;
-
-class MemoryPeakUsageProcessorTest extends TestCase
-{
-    /**
-     * @covers Monolog\Processor\MemoryPeakUsageProcessor::__invoke
-     * @covers Monolog\Processor\MemoryProcessor::formatBytes
-     */
-    public function testProcessor()
-    {
-        $processor = new MemoryPeakUsageProcessor();
-        $record = $processor($this->getRecord());
-        $this->assertArrayHasKey('memory_peak_usage', $record['extra']);
-        $this->assertRegExp('#[0-9.]+ (M|K)?B$#', $record['extra']['memory_peak_usage']);
-    }
-
-    /**
-     * @covers Monolog\Processor\MemoryPeakUsageProcessor::__invoke
-     * @covers Monolog\Processor\MemoryProcessor::formatBytes
-     */
-    public function testProcessorWithoutFormatting()
-    {
-        $processor = new MemoryPeakUsageProcessor(true, false);
-        $record = $processor($this->getRecord());
-        $this->assertArrayHasKey('memory_peak_usage', $record['extra']);
-        $this->assertInternalType('int', $record['extra']['memory_peak_usage']);
-        $this->assertGreaterThan(0, $record['extra']['memory_peak_usage']);
-    }
-}
diff --git a/mayor-orig/www/include/share/googleapi/monolog/monolog/tests/Monolog/Processor/MemoryUsageProcessorTest.php b/mayor-orig/www/include/share/googleapi/monolog/monolog/tests/Monolog/Processor/MemoryUsageProcessorTest.php
deleted file mode 100644
index 4692dbfc..00000000
--- a/mayor-orig/www/include/share/googleapi/monolog/monolog/tests/Monolog/Processor/MemoryUsageProcessorTest.php
+++ /dev/null
@@ -1,42 +0,0 @@
-
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Monolog\Processor;
-
-use Monolog\TestCase;
-
-class MemoryUsageProcessorTest extends TestCase
-{
-    /**
-     * @covers Monolog\Processor\MemoryUsageProcessor::__invoke
-     * @covers Monolog\Processor\MemoryProcessor::formatBytes
-     */
-    public function testProcessor()
-    {
-        $processor = new MemoryUsageProcessor();
-        $record = $processor($this->getRecord());
-        $this->assertArrayHasKey('memory_usage', $record['extra']);
-        $this->assertRegExp('#[0-9.]+ (M|K)?B$#', $record['extra']['memory_usage']);
-    }
-
-    /**
-     * @covers Monolog\Processor\MemoryUsageProcessor::__invoke
-     * @covers Monolog\Processor\MemoryProcessor::formatBytes
-     */
-    public function testProcessorWithoutFormatting()
-    {
-        $processor = new MemoryUsageProcessor(true, false);
-        $record = $processor($this->getRecord());
-        $this->assertArrayHasKey('memory_usage', $record['extra']);
-        $this->assertInternalType('int', $record['extra']['memory_usage']);
-        $this->assertGreaterThan(0, $record['extra']['memory_usage']);
-    }
-}
diff --git a/mayor-orig/www/include/share/googleapi/monolog/monolog/tests/Monolog/Processor/MercurialProcessorTest.php b/mayor-orig/www/include/share/googleapi/monolog/monolog/tests/Monolog/Processor/MercurialProcessorTest.php
deleted file mode 100644
index 11f2b35a..00000000
--- a/mayor-orig/www/include/share/googleapi/monolog/monolog/tests/Monolog/Processor/MercurialProcessorTest.php
+++ /dev/null
@@ -1,41 +0,0 @@
-
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Monolog\Processor;
-
-use Monolog\TestCase;
-
-class MercurialProcessorTest extends TestCase
-{
-    /**
-     * @covers Monolog\Processor\MercurialProcessor::__invoke
-     */
-    public function testProcessor()
-    {
-        if (defined('PHP_WINDOWS_VERSION_BUILD')) {
-            exec("where hg 2>NUL", $output, $result);
-        } else {
-            exec("which hg 2>/dev/null >/dev/null", $output, $result);
-        }
-        if ($result != 0) {
-            $this->markTestSkipped('hg is missing');
-            return;
-        }
-
-        `hg init`;
-        $processor = new MercurialProcessor();
-        $record = $processor($this->getRecord());
-
-        $this->assertArrayHasKey('hg', $record['extra']);
-        $this->assertTrue(!is_array($record['extra']['hg']['branch']));
-        $this->assertTrue(!is_array($record['extra']['hg']['revision']));
-    }
-}
diff --git a/mayor-orig/www/include/share/googleapi/monolog/monolog/tests/Monolog/Processor/ProcessIdProcessorTest.php b/mayor-orig/www/include/share/googleapi/monolog/monolog/tests/Monolog/Processor/ProcessIdProcessorTest.php
deleted file mode 100644
index 458d2a33..00000000
--- a/mayor-orig/www/include/share/googleapi/monolog/monolog/tests/Monolog/Processor/ProcessIdProcessorTest.php
+++ /dev/null
@@ -1,30 +0,0 @@
-
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Monolog\Processor;
-
-use Monolog\TestCase;
-
-class ProcessIdProcessorTest extends TestCase
-{
-    /**
-     * @covers Monolog\Processor\ProcessIdProcessor::__invoke
-     */
-    public function testProcessor()
-    {
-        $processor = new ProcessIdProcessor();
-        $record = $processor($this->getRecord());
-        $this->assertArrayHasKey('process_id', $record['extra']);
-        $this->assertInternalType('int', $record['extra']['process_id']);
-        $this->assertGreaterThan(0, $record['extra']['process_id']);
-        $this->assertEquals(getmypid(), $record['extra']['process_id']);
-    }
-}
diff --git a/mayor-orig/www/include/share/googleapi/monolog/monolog/tests/Monolog/Processor/PsrLogMessageProcessorTest.php b/mayor-orig/www/include/share/googleapi/monolog/monolog/tests/Monolog/Processor/PsrLogMessageProcessorTest.php
deleted file mode 100644
index 029a0c02..00000000
--- a/mayor-orig/www/include/share/googleapi/monolog/monolog/tests/Monolog/Processor/PsrLogMessageProcessorTest.php
+++ /dev/null
@@ -1,43 +0,0 @@
-
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Monolog\Processor;
-
-class PsrLogMessageProcessorTest extends \PHPUnit_Framework_TestCase
-{
-    /**
-     * @dataProvider getPairs
-     */
-    public function testReplacement($val, $expected)
-    {
-        $proc = new PsrLogMessageProcessor;
-
-        $message = $proc(array(
-            'message' => '{foo}',
-            'context' => array('foo' => $val),
-        ));
-        $this->assertEquals($expected, $message['message']);
-    }
-
-    public function getPairs()
-    {
-        return array(
-            array('foo',    'foo'),
-            array('3',      '3'),
-            array(3,        '3'),
-            array(null,     ''),
-            array(true,     '1'),
-            array(false,    ''),
-            array(new \stdClass, '[object stdClass]'),
-            array(array(), '[array]'),
-        );
-    }
-}
diff --git a/mayor-orig/www/include/share/googleapi/monolog/monolog/tests/Monolog/Processor/TagProcessorTest.php b/mayor-orig/www/include/share/googleapi/monolog/monolog/tests/Monolog/Processor/TagProcessorTest.php
deleted file mode 100644
index 0d860c61..00000000
--- a/mayor-orig/www/include/share/googleapi/monolog/monolog/tests/Monolog/Processor/TagProcessorTest.php
+++ /dev/null
@@ -1,49 +0,0 @@
-
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Monolog\Processor;
-
-use Monolog\TestCase;
-
-class TagProcessorTest extends TestCase
-{
-    /**
-     * @covers Monolog\Processor\TagProcessor::__invoke
-     */
-    public function testProcessor()
-    {
-        $tags = array(1, 2, 3);
-        $processor = new TagProcessor($tags);
-        $record = $processor($this->getRecord());
-
-        $this->assertEquals($tags, $record['extra']['tags']);
-    }
-
-    /**
-     * @covers Monolog\Processor\TagProcessor::__invoke
-     */
-    public function testProcessorTagModification()
-    {
-        $tags = array(1, 2, 3);
-        $processor = new TagProcessor($tags);
-
-        $record = $processor($this->getRecord());
-        $this->assertEquals($tags, $record['extra']['tags']);
-
-        $processor->setTags(array('a', 'b'));
-        $record = $processor($this->getRecord());
-        $this->assertEquals(array('a', 'b'), $record['extra']['tags']);
-
-        $processor->addTags(array('a', 'c', 'foo' => 'bar'));
-        $record = $processor($this->getRecord());
-        $this->assertEquals(array('a', 'b', 'a', 'c', 'foo' => 'bar'), $record['extra']['tags']);
-    }
-}
diff --git a/mayor-orig/www/include/share/googleapi/monolog/monolog/tests/Monolog/Processor/UidProcessorTest.php b/mayor-orig/www/include/share/googleapi/monolog/monolog/tests/Monolog/Processor/UidProcessorTest.php
deleted file mode 100644
index 5d13058f..00000000
--- a/mayor-orig/www/include/share/googleapi/monolog/monolog/tests/Monolog/Processor/UidProcessorTest.php
+++ /dev/null
@@ -1,33 +0,0 @@
-
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Monolog\Processor;
-
-use Monolog\TestCase;
-
-class UidProcessorTest extends TestCase
-{
-    /**
-     * @covers Monolog\Processor\UidProcessor::__invoke
-     */
-    public function testProcessor()
-    {
-        $processor = new UidProcessor();
-        $record = $processor($this->getRecord());
-        $this->assertArrayHasKey('uid', $record['extra']);
-    }
-
-    public function testGetUid()
-    {
-        $processor = new UidProcessor(10);
-        $this->assertEquals(10, strlen($processor->getUid()));
-    }
-}
diff --git a/mayor-orig/www/include/share/googleapi/monolog/monolog/tests/Monolog/Processor/WebProcessorTest.php b/mayor-orig/www/include/share/googleapi/monolog/monolog/tests/Monolog/Processor/WebProcessorTest.php
deleted file mode 100644
index 4105baf7..00000000
--- a/mayor-orig/www/include/share/googleapi/monolog/monolog/tests/Monolog/Processor/WebProcessorTest.php
+++ /dev/null
@@ -1,113 +0,0 @@
-
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Monolog\Processor;
-
-use Monolog\TestCase;
-
-class WebProcessorTest extends TestCase
-{
-    public function testProcessor()
-    {
-        $server = array(
-            'REQUEST_URI'    => 'A',
-            'REMOTE_ADDR'    => 'B',
-            'REQUEST_METHOD' => 'C',
-            'HTTP_REFERER'   => 'D',
-            'SERVER_NAME'    => 'F',
-            'UNIQUE_ID'      => 'G',
-        );
-
-        $processor = new WebProcessor($server);
-        $record = $processor($this->getRecord());
-        $this->assertEquals($server['REQUEST_URI'], $record['extra']['url']);
-        $this->assertEquals($server['REMOTE_ADDR'], $record['extra']['ip']);
-        $this->assertEquals($server['REQUEST_METHOD'], $record['extra']['http_method']);
-        $this->assertEquals($server['HTTP_REFERER'], $record['extra']['referrer']);
-        $this->assertEquals($server['SERVER_NAME'], $record['extra']['server']);
-        $this->assertEquals($server['UNIQUE_ID'], $record['extra']['unique_id']);
-    }
-
-    public function testProcessorDoNothingIfNoRequestUri()
-    {
-        $server = array(
-            'REMOTE_ADDR'    => 'B',
-            'REQUEST_METHOD' => 'C',
-        );
-        $processor = new WebProcessor($server);
-        $record = $processor($this->getRecord());
-        $this->assertEmpty($record['extra']);
-    }
-
-    public function testProcessorReturnNullIfNoHttpReferer()
-    {
-        $server = array(
-            'REQUEST_URI'    => 'A',
-            'REMOTE_ADDR'    => 'B',
-            'REQUEST_METHOD' => 'C',
-            'SERVER_NAME'    => 'F',
-        );
-        $processor = new WebProcessor($server);
-        $record = $processor($this->getRecord());
-        $this->assertNull($record['extra']['referrer']);
-    }
-
-    public function testProcessorDoesNotAddUniqueIdIfNotPresent()
-    {
-        $server = array(
-            'REQUEST_URI'    => 'A',
-            'REMOTE_ADDR'    => 'B',
-            'REQUEST_METHOD' => 'C',
-            'SERVER_NAME'    => 'F',
-        );
-        $processor = new WebProcessor($server);
-        $record = $processor($this->getRecord());
-        $this->assertFalse(isset($record['extra']['unique_id']));
-    }
-
-    public function testProcessorAddsOnlyRequestedExtraFields()
-    {
-        $server = array(
-            'REQUEST_URI'    => 'A',
-            'REMOTE_ADDR'    => 'B',
-            'REQUEST_METHOD' => 'C',
-            'SERVER_NAME'    => 'F',
-        );
-
-        $processor = new WebProcessor($server, array('url', 'http_method'));
-        $record = $processor($this->getRecord());
-
-        $this->assertSame(array('url' => 'A', 'http_method' => 'C'), $record['extra']);
-    }
-
-    public function testProcessorConfiguringOfExtraFields()
-    {
-        $server = array(
-            'REQUEST_URI'    => 'A',
-            'REMOTE_ADDR'    => 'B',
-            'REQUEST_METHOD' => 'C',
-            'SERVER_NAME'    => 'F',
-        );
-
-        $processor = new WebProcessor($server, array('url' => 'REMOTE_ADDR'));
-        $record = $processor($this->getRecord());
-
-        $this->assertSame(array('url' => 'B'), $record['extra']);
-    }
-
-    /**
-     * @expectedException UnexpectedValueException
-     */
-    public function testInvalidData()
-    {
-        new WebProcessor(new \stdClass);
-    }
-}
diff --git a/mayor-orig/www/include/share/googleapi/monolog/monolog/tests/Monolog/PsrLogCompatTest.php b/mayor-orig/www/include/share/googleapi/monolog/monolog/tests/Monolog/PsrLogCompatTest.php
deleted file mode 100644
index ab899449..00000000
--- a/mayor-orig/www/include/share/googleapi/monolog/monolog/tests/Monolog/PsrLogCompatTest.php
+++ /dev/null
@@ -1,47 +0,0 @@
-
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Monolog;
-
-use Monolog\Handler\TestHandler;
-use Monolog\Formatter\LineFormatter;
-use Monolog\Processor\PsrLogMessageProcessor;
-use Psr\Log\Test\LoggerInterfaceTest;
-
-class PsrLogCompatTest extends LoggerInterfaceTest
-{
-    private $handler;
-
-    public function getLogger()
-    {
-        $logger = new Logger('foo');
-        $logger->pushHandler($handler = new TestHandler);
-        $logger->pushProcessor(new PsrLogMessageProcessor);
-        $handler->setFormatter(new LineFormatter('%level_name% %message%'));
-
-        $this->handler = $handler;
-
-        return $logger;
-    }
-
-    public function getLogs()
-    {
-        $convert = function ($record) {
-            $lower = function ($match) {
-                return strtolower($match[0]);
-            };
-
-            return preg_replace_callback('{^[A-Z]+}', $lower, $record['formatted']);
-        };
-
-        return array_map($convert, $this->handler->getRecords());
-    }
-}
diff --git a/mayor-orig/www/include/share/googleapi/monolog/monolog/tests/Monolog/RegistryTest.php b/mayor-orig/www/include/share/googleapi/monolog/monolog/tests/Monolog/RegistryTest.php
deleted file mode 100644
index 15fdfbd2..00000000
--- a/mayor-orig/www/include/share/googleapi/monolog/monolog/tests/Monolog/RegistryTest.php
+++ /dev/null
@@ -1,153 +0,0 @@
-
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Monolog;
-
-class RegistryTest extends \PHPUnit_Framework_TestCase
-{
-    protected function setUp()
-    {
-        Registry::clear();
-    }
-
-    /**
-     * @dataProvider hasLoggerProvider
-     * @covers Monolog\Registry::hasLogger
-     */
-    public function testHasLogger(array $loggersToAdd, array $loggersToCheck, array $expectedResult)
-    {
-        foreach ($loggersToAdd as $loggerToAdd) {
-            Registry::addLogger($loggerToAdd);
-        }
-        foreach ($loggersToCheck as $index => $loggerToCheck) {
-            $this->assertSame($expectedResult[$index], Registry::hasLogger($loggerToCheck));
-        }
-    }
-
-    public function hasLoggerProvider()
-    {
-        $logger1 = new Logger('test1');
-        $logger2 = new Logger('test2');
-        $logger3 = new Logger('test3');
-
-        return array(
-            // only instances
-            array(
-                array($logger1),
-                array($logger1, $logger2),
-                array(true, false),
-            ),
-            // only names
-            array(
-                array($logger1),
-                array('test1', 'test2'),
-                array(true, false),
-            ),
-            // mixed case
-            array(
-                array($logger1, $logger2),
-                array('test1', $logger2, 'test3', $logger3),
-                array(true, true, false, false),
-            ),
-        );
-    }
-
-    /**
-     * @covers Monolog\Registry::clear
-     */
-    public function testClearClears()
-    {
-        Registry::addLogger(new Logger('test1'), 'log');
-        Registry::clear();
-
-        $this->setExpectedException('\InvalidArgumentException');
-        Registry::getInstance('log');
-    }
-
-    /**
-     * @dataProvider removedLoggerProvider
-     * @covers Monolog\Registry::addLogger
-     * @covers Monolog\Registry::removeLogger
-     */
-    public function testRemovesLogger($loggerToAdd, $remove)
-    {
-        Registry::addLogger($loggerToAdd);
-        Registry::removeLogger($remove);
-
-        $this->setExpectedException('\InvalidArgumentException');
-        Registry::getInstance($loggerToAdd->getName());
-    }
-
-    public function removedLoggerProvider()
-    {
-        $logger1 = new Logger('test1');
-
-        return array(
-            array($logger1, $logger1),
-            array($logger1, 'test1'),
-        );
-    }
-
-    /**
-     * @covers Monolog\Registry::addLogger
-     * @covers Monolog\Registry::getInstance
-     * @covers Monolog\Registry::__callStatic
-     */
-    public function testGetsSameLogger()
-    {
-        $logger1 = new Logger('test1');
-        $logger2 = new Logger('test2');
-
-        Registry::addLogger($logger1, 'test1');
-        Registry::addLogger($logger2);
-
-        $this->assertSame($logger1, Registry::getInstance('test1'));
-        $this->assertSame($logger2, Registry::test2());
-    }
-
-    /**
-     * @expectedException \InvalidArgumentException
-     * @covers Monolog\Registry::getInstance
-     */
-    public function testFailsOnNonExistantLogger()
-    {
-        Registry::getInstance('test1');
-    }
-
-    /**
-     * @covers Monolog\Registry::addLogger
-     */
-    public function testReplacesLogger()
-    {
-        $log1 = new Logger('test1');
-        $log2 = new Logger('test2');
-
-        Registry::addLogger($log1, 'log');
-
-        Registry::addLogger($log2, 'log', true);
-
-        $this->assertSame($log2, Registry::getInstance('log'));
-    }
-
-    /**
-     * @expectedException \InvalidArgumentException
-     * @covers Monolog\Registry::addLogger
-     */
-    public function testFailsOnUnspecifiedReplacement()
-    {
-        $log1 = new Logger('test1');
-        $log2 = new Logger('test2');
-
-        Registry::addLogger($log1, 'log');
-
-        Registry::addLogger($log2, 'log');
-    }
-}
diff --git a/mayor-orig/www/include/share/googleapi/monolog/monolog/tests/Monolog/TestCase.php b/mayor-orig/www/include/share/googleapi/monolog/monolog/tests/Monolog/TestCase.php
deleted file mode 100644
index 4eb7b4c9..00000000
--- a/mayor-orig/www/include/share/googleapi/monolog/monolog/tests/Monolog/TestCase.php
+++ /dev/null
@@ -1,58 +0,0 @@
-
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Monolog;
-
-class TestCase extends \PHPUnit_Framework_TestCase
-{
-    /**
-     * @return array Record
-     */
-    protected function getRecord($level = Logger::WARNING, $message = 'test', $context = array())
-    {
-        return array(
-            'message' => $message,
-            'context' => $context,
-            'level' => $level,
-            'level_name' => Logger::getLevelName($level),
-            'channel' => 'test',
-            'datetime' => \DateTime::createFromFormat('U.u', sprintf('%.6F', microtime(true))),
-            'extra' => array(),
-        );
-    }
-
-    /**
-     * @return array
-     */
-    protected function getMultipleRecords()
-    {
-        return array(
-            $this->getRecord(Logger::DEBUG, 'debug message 1'),
-            $this->getRecord(Logger::DEBUG, 'debug message 2'),
-            $this->getRecord(Logger::INFO, 'information'),
-            $this->getRecord(Logger::WARNING, 'warning'),
-            $this->getRecord(Logger::ERROR, 'error'),
-        );
-    }
-
-    /**
-     * @return Monolog\Formatter\FormatterInterface
-     */
-    protected function getIdentityFormatter()
-    {
-        $formatter = $this->getMock('Monolog\\Formatter\\FormatterInterface');
-        $formatter->expects($this->any())
-            ->method('format')
-            ->will($this->returnCallback(function ($record) { return $record['message']; }));
-
-        return $formatter;
-    }
-}
diff --git a/mayor-orig/www/include/share/googleapi/phpseclib/phpseclib/AUTHORS b/mayor-orig/www/include/share/googleapi/phpseclib/phpseclib/AUTHORS
deleted file mode 100644
index a08b3099..00000000
--- a/mayor-orig/www/include/share/googleapi/phpseclib/phpseclib/AUTHORS
+++ /dev/null
@@ -1,6 +0,0 @@
-phpseclib Lead Developer:  TerraFrost (Jim Wigginton)
-
-phpseclib Developers:      monnerat (Patrick Monnerat)
-                           bantu (Andreas Fischer)
-                           petrich (Hans-Jürgen Petrich)
-                           GrahamCampbell (Graham Campbell)
diff --git a/mayor-orig/www/include/share/googleapi/phpseclib/phpseclib/LICENSE b/mayor-orig/www/include/share/googleapi/phpseclib/phpseclib/LICENSE
deleted file mode 100644
index a8ec8ebd..00000000
--- a/mayor-orig/www/include/share/googleapi/phpseclib/phpseclib/LICENSE
+++ /dev/null
@@ -1,21 +0,0 @@
-Copyright 2007-2016 TerraFrost and other contributors
-http://phpseclib.sourceforge.net/
-
-Permission is hereby granted, free of charge, to any person obtaining
-a copy of this software and associated documentation files (the
-"Software"), to deal in the Software without restriction, including
-without limitation the rights to use, copy, modify, merge, publish,
-distribute, sublicense, and/or sell copies of the Software, and to
-permit persons to whom the Software is furnished to do so, subject to
-the following conditions:
-
-The above copyright notice and this permission notice shall be
-included in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
diff --git a/mayor-orig/www/include/share/googleapi/phpseclib/phpseclib/README.md b/mayor-orig/www/include/share/googleapi/phpseclib/phpseclib/README.md
deleted file mode 100644
index 89f84c24..00000000
--- a/mayor-orig/www/include/share/googleapi/phpseclib/phpseclib/README.md
+++ /dev/null
@@ -1,74 +0,0 @@
-# phpseclib - PHP Secure Communications Library
-
-[![Build Status](https://travis-ci.org/phpseclib/phpseclib.svg?branch=2.0)](https://travis-ci.org/phpseclib/phpseclib)
-
-MIT-licensed pure-PHP implementations of an arbitrary-precision integer
-arithmetic library, fully PKCS#1 (v2.1) compliant RSA, DES, 3DES, RC4, Rijndael,
-AES, Blowfish, Twofish, SSH-1, SSH-2, SFTP, and X.509
-
-* [Browse Git](https://github.com/phpseclib/phpseclib)
-* [Code Coverage Report](https://coverage.phpseclib.org/2.0/latest/)
-
-## Documentation
-
-* [Documentation / Manual](http://phpseclib.sourceforge.net/)
-* [API Documentation](https://api.phpseclib.org/2.0/) (generated by Sami)
-
-## Branches
-
-### master
-
-* Development Branch
-* Unstable API
-* Do not use in production
-
-### 2.0
-
-* Modernized version of 1.0
-* Minimum PHP version: 5.3.3
-* PSR-4 autoloading with namespace rooted at `\phpseclib`
-* Install via Composer: `composer require phpseclib/phpseclib ~2.0`
-
-### 1.0
-
-* Long term support (LTS) release
-* PHP4 compatible
-* Composer compatible (PSR-0 autoloading)
-* Install using Composer: `composer require phpseclib/phpseclib ~1.0`
-* Install using PEAR: See [phpseclib PEAR Channel Documentation](http://phpseclib.sourceforge.net/pear.htm)
-* [Download 1.0.7 as ZIP](http://sourceforge.net/projects/phpseclib/files/phpseclib1.0.7.zip/download)
-
-## Support
-
-Need Support?
-
-* [Checkout Questions and Answers on Stack Overflow](http://stackoverflow.com/questions/tagged/phpseclib)
-* [Create a Support Ticket on GitHub](https://github.com/phpseclib/phpseclib/issues/new)
-* [Browse the Support Forum](http://www.frostjedi.com/phpbb/viewforum.php?f=46) (no longer in use)
-
-## Contributing
-
-1. Fork the Project
-
-2. Ensure you have Composer installed (see [Composer Download Instructions](https://getcomposer.org/download/))
-
-3. Install Development Dependencies
-
-    ``` sh
-    composer install
-    ```
-
-4. Create a Feature Branch
-
-5. (Recommended) Run the Test Suite
-
-    ``` sh
-    vendor/bin/phpunit
-    ```
-6. (Recommended) Check whether your code conforms to our Coding Standards by running
-
-    ``` sh
-    vendor/bin/phing -f build/build.xml sniff
-    ```
-
-7. Send us a Pull Request
diff --git a/mayor-orig/www/include/share/googleapi/phpseclib/phpseclib/composer.json b/mayor-orig/www/include/share/googleapi/phpseclib/phpseclib/composer.json
deleted file mode 100644
index 4b84b110..00000000
--- a/mayor-orig/www/include/share/googleapi/phpseclib/phpseclib/composer.json
+++ /dev/null
@@ -1,76 +0,0 @@
-{
-    "name": "phpseclib/phpseclib",
-    "type": "library",
-    "description": "PHP Secure Communications Library - Pure-PHP implementations of RSA, AES, SSH2, SFTP, X.509 etc.",
-    "keywords": [
-        "security",
-        "crypto",
-        "cryptography",
-        "encryption",
-        "signature",
-        "signing",
-        "rsa",
-        "aes",
-        "blowfish",
-        "twofish",
-        "ssh",
-        "sftp",
-        "x509",
-        "x.509",
-        "asn1",
-        "asn.1",
-        "BigInteger"
-        ],
-    "homepage": "http://phpseclib.sourceforge.net",
-    "license": "MIT",
-    "authors": [
-        {
-            "name": "Jim Wigginton",
-            "email": "terrafrost@php.net",
-            "role": "Lead Developer"
-        },
-        {
-            "name": "Patrick Monnerat",
-            "email": "pm@datasphere.ch",
-            "role": "Developer"
-        },
-        {
-            "name": "Andreas Fischer",
-            "email": "bantu@phpbb.com",
-            "role": "Developer"
-        },
-        {
-            "name": "Hans-Jürgen Petrich",
-            "email": "petrich@tronic-media.com",
-            "role": "Developer"
-        },
-        {
-            "name": "Graham Campbell",
-            "email": "graham@alt-three.com",
-            "role": "Developer"
-        }
-    ],
-    "require": {
-        "php": ">=5.3.3"
-    },
-    "require-dev": {
-        "phing/phing": "~2.7",
-        "phpunit/phpunit": "~4.0",
-        "sami/sami": "~2.0",
-        "squizlabs/php_codesniffer": "~2.0"
-    },
-    "suggest": {
-        "ext-libsodium": "SSH2/SFTP can make use of some algorithms provided by the libsodium-php extension.",
-        "ext-openssl": "Install the OpenSSL extension in order to speed up a wide variety of cryptographic operations.",
-        "ext-mcrypt": "Install the Mcrypt extension in order to speed up a few other cryptographic operations.",
-        "ext-gmp": "Install the GMP (GNU Multiple Precision) extension in order to speed up arbitrary precision integer arithmetic operations."
-    },
-    "autoload": {
-        "files": [
-            "phpseclib/bootstrap.php"
-        ],
-        "psr-4": {
-            "phpseclib\\": "phpseclib/"
-        }
-    }
-}
diff --git a/mayor-orig/www/include/share/googleapi/phpseclib/phpseclib/composer.lock b/mayor-orig/www/include/share/googleapi/phpseclib/phpseclib/composer.lock
deleted file mode 100644
index beda2d64..00000000
--- a/mayor-orig/www/include/share/googleapi/phpseclib/phpseclib/composer.lock
+++ /dev/null
@@ -1,1819 +0,0 @@
-{
-    "_readme": [
-        "This file locks the dependencies of your project to a known state",
-        "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file",
-        "This file is @generated automatically"
-    ],
-    "hash": "8599992bf6058a9da82372eb8bcae2c2",
-    "content-hash": "fde47c84178c55c06de858a2128e3d07",
-    "packages": [],
-    "packages-dev": [
-        {
-            "name": "doctrine/instantiator",
-            "version": "1.0.5",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/doctrine/instantiator.git",
-                "reference": "8e884e78f9f0eb1329e445619e04456e64d8051d"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/doctrine/instantiator/zipball/8e884e78f9f0eb1329e445619e04456e64d8051d",
-                "reference": "8e884e78f9f0eb1329e445619e04456e64d8051d",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=5.3,<8.0-DEV"
-            },
-            "require-dev": {
-                "athletic/athletic": "~0.1.8",
-                "ext-pdo": "*",
-                "ext-phar": "*",
-                "phpunit/phpunit": "~4.0",
-                "squizlabs/php_codesniffer": "~2.0"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "1.0.x-dev"
-                }
-            },
-            "autoload": {
-                "psr-4": {
-                    "Doctrine\\Instantiator\\": "src/Doctrine/Instantiator/"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Marco Pivetta",
-                    "email": "ocramius@gmail.com",
-                    "homepage": "http://ocramius.github.com/"
-                }
-            ],
-            "description": "A small, lightweight utility to instantiate objects in PHP without invoking their constructors",
-            "homepage": "https://github.com/doctrine/instantiator",
-            "keywords": [
-                "constructor",
-                "instantiate"
-            ],
-            "time": "2015-06-14 21:17:01"
-        },
-        {
-            "name": "michelf/php-markdown",
-            "version": "1.6.0",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/michelf/php-markdown.git",
-                "reference": "156e56ee036505ec637d761ee62dc425d807183c"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/michelf/php-markdown/zipball/156e56ee036505ec637d761ee62dc425d807183c",
-                "reference": "156e56ee036505ec637d761ee62dc425d807183c",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=5.3.0"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-lib": "1.4.x-dev"
-                }
-            },
-            "autoload": {
-                "psr-0": {
-                    "Michelf": ""
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "BSD-3-Clause"
-            ],
-            "authors": [
-                {
-                    "name": "Michel Fortin",
-                    "email": "michel.fortin@michelf.ca",
-                    "homepage": "https://michelf.ca/",
-                    "role": "Developer"
-                },
-                {
-                    "name": "John Gruber",
-                    "homepage": "https://daringfireball.net/"
-                }
-            ],
-            "description": "PHP Markdown",
-            "homepage": "https://michelf.ca/projects/php-markdown/",
-            "keywords": [
-                "markdown"
-            ],
-            "time": "2015-12-24 01:37:31"
-        },
-        {
-            "name": "nikic/php-parser",
-            "version": "v0.9.5",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/nikic/PHP-Parser.git",
-                "reference": "ef70767475434bdb3615b43c327e2cae17ef12eb"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/ef70767475434bdb3615b43c327e2cae17ef12eb",
-                "reference": "ef70767475434bdb3615b43c327e2cae17ef12eb",
-                "shasum": ""
-            },
-            "require": {
-                "ext-tokenizer": "*",
-                "php": ">=5.2"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "0.9-dev"
-                }
-            },
-            "autoload": {
-                "psr-0": {
-                    "PHPParser": "lib/"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "BSD-3-Clause"
-            ],
-            "authors": [
-                {
-                    "name": "Nikita Popov"
-                }
-            ],
-            "description": "A PHP parser written in PHP",
-            "keywords": [
-                "parser",
-                "php"
-            ],
-            "time": "2014-07-23 18:24:17"
-        },
-        {
-            "name": "phing/phing",
-            "version": "2.14.0",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/phingofficial/phing.git",
-                "reference": "7dd73c83c377623def54b58121f46b4dcb35dd61"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/phingofficial/phing/zipball/7dd73c83c377623def54b58121f46b4dcb35dd61",
-                "reference": "7dd73c83c377623def54b58121f46b4dcb35dd61",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=5.2.0"
-            },
-            "require-dev": {
-                "ext-pdo_sqlite": "*",
-                "lastcraft/simpletest": "@dev",
-                "mikey179/vfsstream": "^1.6",
-                "pdepend/pdepend": "2.x",
-                "pear/archive_tar": "1.4.x",
-                "pear/http_request2": "dev-trunk",
-                "pear/net_growl": "dev-trunk",
-                "pear/pear-core-minimal": "1.10.1",
-                "pear/versioncontrol_git": "@dev",
-                "pear/versioncontrol_svn": "~0.5",
-                "phpdocumentor/phpdocumentor": "2.x",
-                "phploc/phploc": "~2.0.6",
-                "phpmd/phpmd": "~2.2",
-                "phpunit/phpunit": ">=3.7",
-                "sebastian/git": "~1.0",
-                "sebastian/phpcpd": "2.x",
-                "squizlabs/php_codesniffer": "~2.2",
-                "symfony/yaml": "~2.7"
-            },
-            "suggest": {
-                "pdepend/pdepend": "PHP version of JDepend",
-                "pear/archive_tar": "Tar file management class",
-                "pear/versioncontrol_git": "A library that provides OO interface to handle Git repository",
-                "pear/versioncontrol_svn": "A simple OO-style interface for Subversion, the free/open-source version control system",
-                "phpdocumentor/phpdocumentor": "Documentation Generator for PHP",
-                "phploc/phploc": "A tool for quickly measuring the size of a PHP project",
-                "phpmd/phpmd": "PHP version of PMD tool",
-                "phpunit/php-code-coverage": "Library that provides collection, processing, and rendering functionality for PHP code coverage information",
-                "phpunit/phpunit": "The PHP Unit Testing Framework",
-                "sebastian/phpcpd": "Copy/Paste Detector (CPD) for PHP code",
-                "tedivm/jshrink": "Javascript Minifier built in PHP"
-            },
-            "bin": [
-                "bin/phing"
-            ],
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "2.14.x-dev"
-                }
-            },
-            "autoload": {
-                "classmap": [
-                    "classes/phing/"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "include-path": [
-                "classes"
-            ],
-            "license": [
-                "LGPL-3.0"
-            ],
-            "authors": [
-                {
-                    "name": "Michiel Rook",
-                    "email": "mrook@php.net"
-                },
-                {
-                    "name": "Phing Community",
-                    "homepage": "https://www.phing.info/trac/wiki/Development/Contributors"
-                }
-            ],
-            "description": "PHing Is Not GNU make; it's a PHP project build system or build tool based on Apache Ant.",
-            "homepage": "https://www.phing.info/",
-            "keywords": [
-                "build",
-                "phing",
-                "task",
-                "tool"
-            ],
-            "time": "2016-03-10 21:39:23"
-        },
-        {
-            "name": "phpdocumentor/reflection-common",
-            "version": "1.0",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/phpDocumentor/ReflectionCommon.git",
-                "reference": "144c307535e82c8fdcaacbcfc1d6d8eeb896687c"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/phpDocumentor/ReflectionCommon/zipball/144c307535e82c8fdcaacbcfc1d6d8eeb896687c",
-                "reference": "144c307535e82c8fdcaacbcfc1d6d8eeb896687c",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=5.5"
-            },
-            "require-dev": {
-                "phpunit/phpunit": "^4.6"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "1.0.x-dev"
-                }
-            },
-            "autoload": {
-                "psr-4": {
-                    "phpDocumentor\\Reflection\\": [
-                        "src"
-                    ]
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Jaap van Otterdijk",
-                    "email": "opensource@ijaap.nl"
-                }
-            ],
-            "description": "Common reflection classes used by phpdocumentor to reflect the code structure",
-            "homepage": "http://www.phpdoc.org",
-            "keywords": [
-                "FQSEN",
-                "phpDocumentor",
-                "phpdoc",
-                "reflection",
-                "static analysis"
-            ],
-            "time": "2015-12-27 11:43:31"
-        },
-        {
-            "name": "phpdocumentor/reflection-docblock",
-            "version": "3.1.0",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/phpDocumentor/ReflectionDocBlock.git",
-                "reference": "9270140b940ff02e58ec577c237274e92cd40cdd"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/phpDocumentor/ReflectionDocBlock/zipball/9270140b940ff02e58ec577c237274e92cd40cdd",
-                "reference": "9270140b940ff02e58ec577c237274e92cd40cdd",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=5.5",
-                "phpdocumentor/reflection-common": "^1.0@dev",
-                "phpdocumentor/type-resolver": "^0.2.0",
-                "webmozart/assert": "^1.0"
-            },
-            "require-dev": {
-                "mockery/mockery": "^0.9.4",
-                "phpunit/phpunit": "^4.4"
-            },
-            "type": "library",
-            "autoload": {
-                "psr-4": {
-                    "phpDocumentor\\Reflection\\": [
-                        "src/"
-                    ]
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Mike van Riel",
-                    "email": "me@mikevanriel.com"
-                }
-            ],
-            "description": "With this component, a library can provide support for annotations via DocBlocks or otherwise retrieve information that is embedded in a DocBlock.",
-            "time": "2016-06-10 09:48:41"
-        },
-        {
-            "name": "phpdocumentor/type-resolver",
-            "version": "0.2",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/phpDocumentor/TypeResolver.git",
-                "reference": "b39c7a5b194f9ed7bd0dd345c751007a41862443"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/phpDocumentor/TypeResolver/zipball/b39c7a5b194f9ed7bd0dd345c751007a41862443",
-                "reference": "b39c7a5b194f9ed7bd0dd345c751007a41862443",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=5.5",
-                "phpdocumentor/reflection-common": "^1.0"
-            },
-            "require-dev": {
-                "mockery/mockery": "^0.9.4",
-                "phpunit/phpunit": "^5.2||^4.8.24"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "1.0.x-dev"
-                }
-            },
-            "autoload": {
-                "psr-4": {
-                    "phpDocumentor\\Reflection\\": [
-                        "src/"
-                    ]
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Mike van Riel",
-                    "email": "me@mikevanriel.com"
-                }
-            ],
-            "time": "2016-06-10 07:14:17"
-        },
-        {
-            "name": "phpspec/prophecy",
-            "version": "v1.6.1",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/phpspec/prophecy.git",
-                "reference": "58a8137754bc24b25740d4281399a4a3596058e0"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/phpspec/prophecy/zipball/58a8137754bc24b25740d4281399a4a3596058e0",
-                "reference": "58a8137754bc24b25740d4281399a4a3596058e0",
-                "shasum": ""
-            },
-            "require": {
-                "doctrine/instantiator": "^1.0.2",
-                "php": "^5.3|^7.0",
-                "phpdocumentor/reflection-docblock": "^2.0|^3.0.2",
-                "sebastian/comparator": "^1.1",
-                "sebastian/recursion-context": "^1.0"
-            },
-            "require-dev": {
-                "phpspec/phpspec": "^2.0"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "1.6.x-dev"
-                }
-            },
-            "autoload": {
-                "psr-0": {
-                    "Prophecy\\": "src/"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Konstantin Kudryashov",
-                    "email": "ever.zet@gmail.com",
-                    "homepage": "http://everzet.com"
-                },
-                {
-                    "name": "Marcello Duarte",
-                    "email": "marcello.duarte@gmail.com"
-                }
-            ],
-            "description": "Highly opinionated mocking framework for PHP 5.3+",
-            "homepage": "https://github.com/phpspec/prophecy",
-            "keywords": [
-                "Double",
-                "Dummy",
-                "fake",
-                "mock",
-                "spy",
-                "stub"
-            ],
-            "time": "2016-06-07 08:13:47"
-        },
-        {
-            "name": "phpunit/php-code-coverage",
-            "version": "2.2.4",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/sebastianbergmann/php-code-coverage.git",
-                "reference": "eabf68b476ac7d0f73793aada060f1c1a9bf8979"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/eabf68b476ac7d0f73793aada060f1c1a9bf8979",
-                "reference": "eabf68b476ac7d0f73793aada060f1c1a9bf8979",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=5.3.3",
-                "phpunit/php-file-iterator": "~1.3",
-                "phpunit/php-text-template": "~1.2",
-                "phpunit/php-token-stream": "~1.3",
-                "sebastian/environment": "^1.3.2",
-                "sebastian/version": "~1.0"
-            },
-            "require-dev": {
-                "ext-xdebug": ">=2.1.4",
-                "phpunit/phpunit": "~4"
-            },
-            "suggest": {
-                "ext-dom": "*",
-                "ext-xdebug": ">=2.2.1",
-                "ext-xmlwriter": "*"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "2.2.x-dev"
-                }
-            },
-            "autoload": {
-                "classmap": [
-                    "src/"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "BSD-3-Clause"
-            ],
-            "authors": [
-                {
-                    "name": "Sebastian Bergmann",
-                    "email": "sb@sebastian-bergmann.de",
-                    "role": "lead"
-                }
-            ],
-            "description": "Library that provides collection, processing, and rendering functionality for PHP code coverage information.",
-            "homepage": "https://github.com/sebastianbergmann/php-code-coverage",
-            "keywords": [
-                "coverage",
-                "testing",
-                "xunit"
-            ],
-            "time": "2015-10-06 15:47:00"
-        },
-        {
-            "name": "phpunit/php-file-iterator",
-            "version": "1.4.1",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/sebastianbergmann/php-file-iterator.git",
-                "reference": "6150bf2c35d3fc379e50c7602b75caceaa39dbf0"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/php-file-iterator/zipball/6150bf2c35d3fc379e50c7602b75caceaa39dbf0",
-                "reference": "6150bf2c35d3fc379e50c7602b75caceaa39dbf0",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=5.3.3"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "1.4.x-dev"
-                }
-            },
-            "autoload": {
-                "classmap": [
-                    "src/"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "BSD-3-Clause"
-            ],
-            "authors": [
-                {
-                    "name": "Sebastian Bergmann",
-                    "email": "sb@sebastian-bergmann.de",
-                    "role": "lead"
-                }
-            ],
-            "description": "FilterIterator implementation that filters files based on a list of suffixes.",
-            "homepage": "https://github.com/sebastianbergmann/php-file-iterator/",
-            "keywords": [
-                "filesystem",
-                "iterator"
-            ],
-            "time": "2015-06-21 13:08:43"
-        },
-        {
-            "name": "phpunit/php-text-template",
-            "version": "1.2.1",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/sebastianbergmann/php-text-template.git",
-                "reference": "31f8b717e51d9a2afca6c9f046f5d69fc27c8686"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/php-text-template/zipball/31f8b717e51d9a2afca6c9f046f5d69fc27c8686",
-                "reference": "31f8b717e51d9a2afca6c9f046f5d69fc27c8686",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=5.3.3"
-            },
-            "type": "library",
-            "autoload": {
-                "classmap": [
-                    "src/"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "BSD-3-Clause"
-            ],
-            "authors": [
-                {
-                    "name": "Sebastian Bergmann",
-                    "email": "sebastian@phpunit.de",
-                    "role": "lead"
-                }
-            ],
-            "description": "Simple template engine.",
-            "homepage": "https://github.com/sebastianbergmann/php-text-template/",
-            "keywords": [
-                "template"
-            ],
-            "time": "2015-06-21 13:50:34"
-        },
-        {
-            "name": "phpunit/php-timer",
-            "version": "1.0.8",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/sebastianbergmann/php-timer.git",
-                "reference": "38e9124049cf1a164f1e4537caf19c99bf1eb260"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/php-timer/zipball/38e9124049cf1a164f1e4537caf19c99bf1eb260",
-                "reference": "38e9124049cf1a164f1e4537caf19c99bf1eb260",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=5.3.3"
-            },
-            "require-dev": {
-                "phpunit/phpunit": "~4|~5"
-            },
-            "type": "library",
-            "autoload": {
-                "classmap": [
-                    "src/"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "BSD-3-Clause"
-            ],
-            "authors": [
-                {
-                    "name": "Sebastian Bergmann",
-                    "email": "sb@sebastian-bergmann.de",
-                    "role": "lead"
-                }
-            ],
-            "description": "Utility class for timing",
-            "homepage": "https://github.com/sebastianbergmann/php-timer/",
-            "keywords": [
-                "timer"
-            ],
-            "time": "2016-05-12 18:03:57"
-        },
-        {
-            "name": "phpunit/php-token-stream",
-            "version": "1.4.8",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/sebastianbergmann/php-token-stream.git",
-                "reference": "3144ae21711fb6cac0b1ab4cbe63b75ce3d4e8da"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/php-token-stream/zipball/3144ae21711fb6cac0b1ab4cbe63b75ce3d4e8da",
-                "reference": "3144ae21711fb6cac0b1ab4cbe63b75ce3d4e8da",
-                "shasum": ""
-            },
-            "require": {
-                "ext-tokenizer": "*",
-                "php": ">=5.3.3"
-            },
-            "require-dev": {
-                "phpunit/phpunit": "~4.2"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "1.4-dev"
-                }
-            },
-            "autoload": {
-                "classmap": [
-                    "src/"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "BSD-3-Clause"
-            ],
-            "authors": [
-                {
-                    "name": "Sebastian Bergmann",
-                    "email": "sebastian@phpunit.de"
-                }
-            ],
-            "description": "Wrapper around PHP's tokenizer extension.",
-            "homepage": "https://github.com/sebastianbergmann/php-token-stream/",
-            "keywords": [
-                "tokenizer"
-            ],
-            "time": "2015-09-15 10:49:45"
-        },
-        {
-            "name": "phpunit/phpunit",
-            "version": "4.8.26",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/sebastianbergmann/phpunit.git",
-                "reference": "fc1d8cd5b5de11625979125c5639347896ac2c74"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/fc1d8cd5b5de11625979125c5639347896ac2c74",
-                "reference": "fc1d8cd5b5de11625979125c5639347896ac2c74",
-                "shasum": ""
-            },
-            "require": {
-                "ext-dom": "*",
-                "ext-json": "*",
-                "ext-pcre": "*",
-                "ext-reflection": "*",
-                "ext-spl": "*",
-                "php": ">=5.3.3",
-                "phpspec/prophecy": "^1.3.1",
-                "phpunit/php-code-coverage": "~2.1",
-                "phpunit/php-file-iterator": "~1.4",
-                "phpunit/php-text-template": "~1.2",
-                "phpunit/php-timer": "^1.0.6",
-                "phpunit/phpunit-mock-objects": "~2.3",
-                "sebastian/comparator": "~1.1",
-                "sebastian/diff": "~1.2",
-                "sebastian/environment": "~1.3",
-                "sebastian/exporter": "~1.2",
-                "sebastian/global-state": "~1.0",
-                "sebastian/version": "~1.0",
-                "symfony/yaml": "~2.1|~3.0"
-            },
-            "suggest": {
-                "phpunit/php-invoker": "~1.1"
-            },
-            "bin": [
-                "phpunit"
-            ],
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "4.8.x-dev"
-                }
-            },
-            "autoload": {
-                "classmap": [
-                    "src/"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "BSD-3-Clause"
-            ],
-            "authors": [
-                {
-                    "name": "Sebastian Bergmann",
-                    "email": "sebastian@phpunit.de",
-                    "role": "lead"
-                }
-            ],
-            "description": "The PHP Unit Testing framework.",
-            "homepage": "https://phpunit.de/",
-            "keywords": [
-                "phpunit",
-                "testing",
-                "xunit"
-            ],
-            "time": "2016-05-17 03:09:28"
-        },
-        {
-            "name": "phpunit/phpunit-mock-objects",
-            "version": "2.3.8",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/sebastianbergmann/phpunit-mock-objects.git",
-                "reference": "ac8e7a3db35738d56ee9a76e78a4e03d97628983"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/phpunit-mock-objects/zipball/ac8e7a3db35738d56ee9a76e78a4e03d97628983",
-                "reference": "ac8e7a3db35738d56ee9a76e78a4e03d97628983",
-                "shasum": ""
-            },
-            "require": {
-                "doctrine/instantiator": "^1.0.2",
-                "php": ">=5.3.3",
-                "phpunit/php-text-template": "~1.2",
-                "sebastian/exporter": "~1.2"
-            },
-            "require-dev": {
-                "phpunit/phpunit": "~4.4"
-            },
-            "suggest": {
-                "ext-soap": "*"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "2.3.x-dev"
-                }
-            },
-            "autoload": {
-                "classmap": [
-                    "src/"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "BSD-3-Clause"
-            ],
-            "authors": [
-                {
-                    "name": "Sebastian Bergmann",
-                    "email": "sb@sebastian-bergmann.de",
-                    "role": "lead"
-                }
-            ],
-            "description": "Mock Object library for PHPUnit",
-            "homepage": "https://github.com/sebastianbergmann/phpunit-mock-objects/",
-            "keywords": [
-                "mock",
-                "xunit"
-            ],
-            "time": "2015-10-02 06:51:40"
-        },
-        {
-            "name": "pimple/pimple",
-            "version": "v2.1.1",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/silexphp/Pimple.git",
-                "reference": "ea22fb2880faf7b7b0e17c9809c6fe25b071fd76"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/silexphp/Pimple/zipball/ea22fb2880faf7b7b0e17c9809c6fe25b071fd76",
-                "reference": "ea22fb2880faf7b7b0e17c9809c6fe25b071fd76",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=5.3.0"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "2.1.x-dev"
-                }
-            },
-            "autoload": {
-                "psr-0": {
-                    "Pimple": "src/"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Fabien Potencier",
-                    "email": "fabien@symfony.com"
-                }
-            ],
-            "description": "Pimple is a simple Dependency Injection Container for PHP 5.3",
-            "homepage": "http://pimple.sensiolabs.org",
-            "keywords": [
-                "container",
-                "dependency injection"
-            ],
-            "time": "2014-07-24 07:10:08"
-        },
-        {
-            "name": "sami/sami",
-            "version": "v2.0.0",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/FriendsOfPHP/Sami.git",
-                "reference": "fa58b324f41aa2aefe21dac4f22d8c98965fc012"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/FriendsOfPHP/Sami/zipball/fa58b324f41aa2aefe21dac4f22d8c98965fc012",
-                "reference": "fa58b324f41aa2aefe21dac4f22d8c98965fc012",
-                "shasum": ""
-            },
-            "require": {
-                "michelf/php-markdown": "~1.3",
-                "nikic/php-parser": "0.9.*",
-                "php": ">=5.3.0",
-                "pimple/pimple": "2.*",
-                "symfony/console": "~2.1",
-                "symfony/filesystem": "~2.1",
-                "symfony/finder": "~2.1",
-                "symfony/process": "~2.1",
-                "symfony/yaml": "~2.1",
-                "twig/twig": "1.*"
-            },
-            "bin": [
-                "sami.php"
-            ],
-            "type": "application",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "2.0-dev"
-                }
-            },
-            "autoload": {
-                "psr-0": {
-                    "Sami": "."
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Fabien Potencier",
-                    "email": "fabien@symfony.com"
-                }
-            ],
-            "description": "Sami, an API documentation generator",
-            "homepage": "http://sami.sensiolabs.org",
-            "keywords": [
-                "phpdoc"
-            ],
-            "time": "2014-06-25 12:05:18"
-        },
-        {
-            "name": "sebastian/comparator",
-            "version": "1.2.0",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/sebastianbergmann/comparator.git",
-                "reference": "937efb279bd37a375bcadf584dec0726f84dbf22"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/comparator/zipball/937efb279bd37a375bcadf584dec0726f84dbf22",
-                "reference": "937efb279bd37a375bcadf584dec0726f84dbf22",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=5.3.3",
-                "sebastian/diff": "~1.2",
-                "sebastian/exporter": "~1.2"
-            },
-            "require-dev": {
-                "phpunit/phpunit": "~4.4"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "1.2.x-dev"
-                }
-            },
-            "autoload": {
-                "classmap": [
-                    "src/"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "BSD-3-Clause"
-            ],
-            "authors": [
-                {
-                    "name": "Jeff Welch",
-                    "email": "whatthejeff@gmail.com"
-                },
-                {
-                    "name": "Volker Dusch",
-                    "email": "github@wallbash.com"
-                },
-                {
-                    "name": "Bernhard Schussek",
-                    "email": "bschussek@2bepublished.at"
-                },
-                {
-                    "name": "Sebastian Bergmann",
-                    "email": "sebastian@phpunit.de"
-                }
-            ],
-            "description": "Provides the functionality to compare PHP values for equality",
-            "homepage": "http://www.github.com/sebastianbergmann/comparator",
-            "keywords": [
-                "comparator",
-                "compare",
-                "equality"
-            ],
-            "time": "2015-07-26 15:48:44"
-        },
-        {
-            "name": "sebastian/diff",
-            "version": "1.4.1",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/sebastianbergmann/diff.git",
-                "reference": "13edfd8706462032c2f52b4b862974dd46b71c9e"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/diff/zipball/13edfd8706462032c2f52b4b862974dd46b71c9e",
-                "reference": "13edfd8706462032c2f52b4b862974dd46b71c9e",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=5.3.3"
-            },
-            "require-dev": {
-                "phpunit/phpunit": "~4.8"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "1.4-dev"
-                }
-            },
-            "autoload": {
-                "classmap": [
-                    "src/"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "BSD-3-Clause"
-            ],
-            "authors": [
-                {
-                    "name": "Kore Nordmann",
-                    "email": "mail@kore-nordmann.de"
-                },
-                {
-                    "name": "Sebastian Bergmann",
-                    "email": "sebastian@phpunit.de"
-                }
-            ],
-            "description": "Diff implementation",
-            "homepage": "https://github.com/sebastianbergmann/diff",
-            "keywords": [
-                "diff"
-            ],
-            "time": "2015-12-08 07:14:41"
-        },
-        {
-            "name": "sebastian/environment",
-            "version": "1.3.7",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/sebastianbergmann/environment.git",
-                "reference": "4e8f0da10ac5802913afc151413bc8c53b6c2716"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/environment/zipball/4e8f0da10ac5802913afc151413bc8c53b6c2716",
-                "reference": "4e8f0da10ac5802913afc151413bc8c53b6c2716",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=5.3.3"
-            },
-            "require-dev": {
-                "phpunit/phpunit": "~4.4"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "1.3.x-dev"
-                }
-            },
-            "autoload": {
-                "classmap": [
-                    "src/"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "BSD-3-Clause"
-            ],
-            "authors": [
-                {
-                    "name": "Sebastian Bergmann",
-                    "email": "sebastian@phpunit.de"
-                }
-            ],
-            "description": "Provides functionality to handle HHVM/PHP environments",
-            "homepage": "http://www.github.com/sebastianbergmann/environment",
-            "keywords": [
-                "Xdebug",
-                "environment",
-                "hhvm"
-            ],
-            "time": "2016-05-17 03:18:57"
-        },
-        {
-            "name": "sebastian/exporter",
-            "version": "1.2.2",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/sebastianbergmann/exporter.git",
-                "reference": "42c4c2eec485ee3e159ec9884f95b431287edde4"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/exporter/zipball/42c4c2eec485ee3e159ec9884f95b431287edde4",
-                "reference": "42c4c2eec485ee3e159ec9884f95b431287edde4",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=5.3.3",
-                "sebastian/recursion-context": "~1.0"
-            },
-            "require-dev": {
-                "ext-mbstring": "*",
-                "phpunit/phpunit": "~4.4"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "1.3.x-dev"
-                }
-            },
-            "autoload": {
-                "classmap": [
-                    "src/"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "BSD-3-Clause"
-            ],
-            "authors": [
-                {
-                    "name": "Jeff Welch",
-                    "email": "whatthejeff@gmail.com"
-                },
-                {
-                    "name": "Volker Dusch",
-                    "email": "github@wallbash.com"
-                },
-                {
-                    "name": "Bernhard Schussek",
-                    "email": "bschussek@2bepublished.at"
-                },
-                {
-                    "name": "Sebastian Bergmann",
-                    "email": "sebastian@phpunit.de"
-                },
-                {
-                    "name": "Adam Harvey",
-                    "email": "aharvey@php.net"
-                }
-            ],
-            "description": "Provides the functionality to export PHP variables for visualization",
-            "homepage": "http://www.github.com/sebastianbergmann/exporter",
-            "keywords": [
-                "export",
-                "exporter"
-            ],
-            "time": "2016-06-17 09:04:28"
-        },
-        {
-            "name": "sebastian/global-state",
-            "version": "1.1.1",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/sebastianbergmann/global-state.git",
-                "reference": "bc37d50fea7d017d3d340f230811c9f1d7280af4"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/global-state/zipball/bc37d50fea7d017d3d340f230811c9f1d7280af4",
-                "reference": "bc37d50fea7d017d3d340f230811c9f1d7280af4",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=5.3.3"
-            },
-            "require-dev": {
-                "phpunit/phpunit": "~4.2"
-            },
-            "suggest": {
-                "ext-uopz": "*"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "1.0-dev"
-                }
-            },
-            "autoload": {
-                "classmap": [
-                    "src/"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "BSD-3-Clause"
-            ],
-            "authors": [
-                {
-                    "name": "Sebastian Bergmann",
-                    "email": "sebastian@phpunit.de"
-                }
-            ],
-            "description": "Snapshotting of global state",
-            "homepage": "http://www.github.com/sebastianbergmann/global-state",
-            "keywords": [
-                "global state"
-            ],
-            "time": "2015-10-12 03:26:01"
-        },
-        {
-            "name": "sebastian/recursion-context",
-            "version": "1.0.2",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/sebastianbergmann/recursion-context.git",
-                "reference": "913401df809e99e4f47b27cdd781f4a258d58791"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/recursion-context/zipball/913401df809e99e4f47b27cdd781f4a258d58791",
-                "reference": "913401df809e99e4f47b27cdd781f4a258d58791",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=5.3.3"
-            },
-            "require-dev": {
-                "phpunit/phpunit": "~4.4"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "1.0.x-dev"
-                }
-            },
-            "autoload": {
-                "classmap": [
-                    "src/"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "BSD-3-Clause"
-            ],
-            "authors": [
-                {
-                    "name": "Jeff Welch",
-                    "email": "whatthejeff@gmail.com"
-                },
-                {
-                    "name": "Sebastian Bergmann",
-                    "email": "sebastian@phpunit.de"
-                },
-                {
-                    "name": "Adam Harvey",
-                    "email": "aharvey@php.net"
-                }
-            ],
-            "description": "Provides functionality to recursively process PHP variables",
-            "homepage": "http://www.github.com/sebastianbergmann/recursion-context",
-            "time": "2015-11-11 19:50:13"
-        },
-        {
-            "name": "sebastian/version",
-            "version": "1.0.6",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/sebastianbergmann/version.git",
-                "reference": "58b3a85e7999757d6ad81c787a1fbf5ff6c628c6"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/version/zipball/58b3a85e7999757d6ad81c787a1fbf5ff6c628c6",
-                "reference": "58b3a85e7999757d6ad81c787a1fbf5ff6c628c6",
-                "shasum": ""
-            },
-            "type": "library",
-            "autoload": {
-                "classmap": [
-                    "src/"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "BSD-3-Clause"
-            ],
-            "authors": [
-                {
-                    "name": "Sebastian Bergmann",
-                    "email": "sebastian@phpunit.de",
-                    "role": "lead"
-                }
-            ],
-            "description": "Library that helps with managing the version number of Git-hosted PHP projects",
-            "homepage": "https://github.com/sebastianbergmann/version",
-            "time": "2015-06-21 13:59:46"
-        },
-        {
-            "name": "squizlabs/php_codesniffer",
-            "version": "2.6.1",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/squizlabs/PHP_CodeSniffer.git",
-                "reference": "fb72ed32f8418db5e7770be1653e62e0d6f5dd3d"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/squizlabs/PHP_CodeSniffer/zipball/fb72ed32f8418db5e7770be1653e62e0d6f5dd3d",
-                "reference": "fb72ed32f8418db5e7770be1653e62e0d6f5dd3d",
-                "shasum": ""
-            },
-            "require": {
-                "ext-simplexml": "*",
-                "ext-tokenizer": "*",
-                "ext-xmlwriter": "*",
-                "php": ">=5.1.2"
-            },
-            "require-dev": {
-                "phpunit/phpunit": "~4.0"
-            },
-            "bin": [
-                "scripts/phpcs",
-                "scripts/phpcbf"
-            ],
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "2.x-dev"
-                }
-            },
-            "autoload": {
-                "classmap": [
-                    "CodeSniffer.php",
-                    "CodeSniffer/CLI.php",
-                    "CodeSniffer/Exception.php",
-                    "CodeSniffer/File.php",
-                    "CodeSniffer/Fixer.php",
-                    "CodeSniffer/Report.php",
-                    "CodeSniffer/Reporting.php",
-                    "CodeSniffer/Sniff.php",
-                    "CodeSniffer/Tokens.php",
-                    "CodeSniffer/Reports/",
-                    "CodeSniffer/Tokenizers/",
-                    "CodeSniffer/DocGenerators/",
-                    "CodeSniffer/Standards/AbstractPatternSniff.php",
-                    "CodeSniffer/Standards/AbstractScopeSniff.php",
-                    "CodeSniffer/Standards/AbstractVariableSniff.php",
-                    "CodeSniffer/Standards/IncorrectPatternException.php",
-                    "CodeSniffer/Standards/Generic/Sniffs/",
-                    "CodeSniffer/Standards/MySource/Sniffs/",
-                    "CodeSniffer/Standards/PEAR/Sniffs/",
-                    "CodeSniffer/Standards/PSR1/Sniffs/",
-                    "CodeSniffer/Standards/PSR2/Sniffs/",
-                    "CodeSniffer/Standards/Squiz/Sniffs/",
-                    "CodeSniffer/Standards/Zend/Sniffs/"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "BSD-3-Clause"
-            ],
-            "authors": [
-                {
-                    "name": "Greg Sherwood",
-                    "role": "lead"
-                }
-            ],
-            "description": "PHP_CodeSniffer tokenizes PHP, JavaScript and CSS files and detects violations of a defined set of coding standards.",
-            "homepage": "http://www.squizlabs.com/php-codesniffer",
-            "keywords": [
-                "phpcs",
-                "standards"
-            ],
-            "time": "2016-05-30 22:24:32"
-        },
-        {
-            "name": "symfony/console",
-            "version": "v2.8.7",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/symfony/console.git",
-                "reference": "5ac8bc9aa77bb2edf06af3a1bb6bc1020d23acd3"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/console/zipball/5ac8bc9aa77bb2edf06af3a1bb6bc1020d23acd3",
-                "reference": "5ac8bc9aa77bb2edf06af3a1bb6bc1020d23acd3",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=5.3.9",
-                "symfony/polyfill-mbstring": "~1.0"
-            },
-            "require-dev": {
-                "psr/log": "~1.0",
-                "symfony/event-dispatcher": "~2.1|~3.0.0",
-                "symfony/process": "~2.1|~3.0.0"
-            },
-            "suggest": {
-                "psr/log": "For using the console logger",
-                "symfony/event-dispatcher": "",
-                "symfony/process": ""
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "2.8-dev"
-                }
-            },
-            "autoload": {
-                "psr-4": {
-                    "Symfony\\Component\\Console\\": ""
-                },
-                "exclude-from-classmap": [
-                    "/Tests/"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Fabien Potencier",
-                    "email": "fabien@symfony.com"
-                },
-                {
-                    "name": "Symfony Community",
-                    "homepage": "https://symfony.com/contributors"
-                }
-            ],
-            "description": "Symfony Console Component",
-            "homepage": "https://symfony.com",
-            "time": "2016-06-06 15:06:25"
-        },
-        {
-            "name": "symfony/filesystem",
-            "version": "v2.8.7",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/symfony/filesystem.git",
-                "reference": "dee379131dceed90a429e951546b33edfe7dccbb"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/filesystem/zipball/dee379131dceed90a429e951546b33edfe7dccbb",
-                "reference": "dee379131dceed90a429e951546b33edfe7dccbb",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=5.3.9"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "2.8-dev"
-                }
-            },
-            "autoload": {
-                "psr-4": {
-                    "Symfony\\Component\\Filesystem\\": ""
-                },
-                "exclude-from-classmap": [
-                    "/Tests/"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Fabien Potencier",
-                    "email": "fabien@symfony.com"
-                },
-                {
-                    "name": "Symfony Community",
-                    "homepage": "https://symfony.com/contributors"
-                }
-            ],
-            "description": "Symfony Filesystem Component",
-            "homepage": "https://symfony.com",
-            "time": "2016-04-12 18:01:21"
-        },
-        {
-            "name": "symfony/finder",
-            "version": "v2.8.7",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/symfony/finder.git",
-                "reference": "3ec095fab1800222732ca522a95dce8fa124007b"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/finder/zipball/3ec095fab1800222732ca522a95dce8fa124007b",
-                "reference": "3ec095fab1800222732ca522a95dce8fa124007b",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=5.3.9"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "2.8-dev"
-                }
-            },
-            "autoload": {
-                "psr-4": {
-                    "Symfony\\Component\\Finder\\": ""
-                },
-                "exclude-from-classmap": [
-                    "/Tests/"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Fabien Potencier",
-                    "email": "fabien@symfony.com"
-                },
-                {
-                    "name": "Symfony Community",
-                    "homepage": "https://symfony.com/contributors"
-                }
-            ],
-            "description": "Symfony Finder Component",
-            "homepage": "https://symfony.com",
-            "time": "2016-06-06 11:11:27"
-        },
-        {
-            "name": "symfony/polyfill-mbstring",
-            "version": "v1.2.0",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/symfony/polyfill-mbstring.git",
-                "reference": "dff51f72b0706335131b00a7f49606168c582594"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/dff51f72b0706335131b00a7f49606168c582594",
-                "reference": "dff51f72b0706335131b00a7f49606168c582594",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=5.3.3"
-            },
-            "suggest": {
-                "ext-mbstring": "For best performance"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "1.2-dev"
-                }
-            },
-            "autoload": {
-                "psr-4": {
-                    "Symfony\\Polyfill\\Mbstring\\": ""
-                },
-                "files": [
-                    "bootstrap.php"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Nicolas Grekas",
-                    "email": "p@tchwork.com"
-                },
-                {
-                    "name": "Symfony Community",
-                    "homepage": "https://symfony.com/contributors"
-                }
-            ],
-            "description": "Symfony polyfill for the Mbstring extension",
-            "homepage": "https://symfony.com",
-            "keywords": [
-                "compatibility",
-                "mbstring",
-                "polyfill",
-                "portable",
-                "shim"
-            ],
-            "time": "2016-05-18 14:26:46"
-        },
-        {
-            "name": "symfony/process",
-            "version": "v2.8.7",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/symfony/process.git",
-                "reference": "115347d00c342198cdc52a7bd8bc15b5ab43500c"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/process/zipball/115347d00c342198cdc52a7bd8bc15b5ab43500c",
-                "reference": "115347d00c342198cdc52a7bd8bc15b5ab43500c",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=5.3.9"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "2.8-dev"
-                }
-            },
-            "autoload": {
-                "psr-4": {
-                    "Symfony\\Component\\Process\\": ""
-                },
-                "exclude-from-classmap": [
-                    "/Tests/"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Fabien Potencier",
-                    "email": "fabien@symfony.com"
-                },
-                {
-                    "name": "Symfony Community",
-                    "homepage": "https://symfony.com/contributors"
-                }
-            ],
-            "description": "Symfony Process Component",
-            "homepage": "https://symfony.com",
-            "time": "2016-06-06 11:11:27"
-        },
-        {
-            "name": "symfony/yaml",
-            "version": "v2.8.7",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/symfony/yaml.git",
-                "reference": "815fabf3f48c7d1df345a69d1ad1a88f59757b34"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/yaml/zipball/815fabf3f48c7d1df345a69d1ad1a88f59757b34",
-                "reference": "815fabf3f48c7d1df345a69d1ad1a88f59757b34",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=5.3.9"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "2.8-dev"
-                }
-            },
-            "autoload": {
-                "psr-4": {
-                    "Symfony\\Component\\Yaml\\": ""
-                },
-                "exclude-from-classmap": [
-                    "/Tests/"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Fabien Potencier",
-                    "email": "fabien@symfony.com"
-                },
-                {
-                    "name": "Symfony Community",
-                    "homepage": "https://symfony.com/contributors"
-                }
-            ],
-            "description": "Symfony Yaml Component",
-            "homepage": "https://symfony.com",
-            "time": "2016-06-06 11:11:27"
-        },
-        {
-            "name": "twig/twig",
-            "version": "v1.24.1",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/twigphp/Twig.git",
-                "reference": "3566d311a92aae4deec6e48682dc5a4528c4a512"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/twigphp/Twig/zipball/3566d311a92aae4deec6e48682dc5a4528c4a512",
-                "reference": "3566d311a92aae4deec6e48682dc5a4528c4a512",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=5.2.7"
-            },
-            "require-dev": {
-                "symfony/debug": "~2.7",
-                "symfony/phpunit-bridge": "~2.7"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "1.24-dev"
-                }
-            },
-            "autoload": {
-                "psr-0": {
-                    "Twig_": "lib/"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "BSD-3-Clause"
-            ],
-            "authors": [
-                {
-                    "name": "Fabien Potencier",
-                    "email": "fabien@symfony.com",
-                    "homepage": "http://fabien.potencier.org",
-                    "role": "Lead Developer"
-                },
-                {
-                    "name": "Armin Ronacher",
-                    "email": "armin.ronacher@active-4.com",
-                    "role": "Project Founder"
-                },
-                {
-                    "name": "Twig Team",
-                    "homepage": "http://twig.sensiolabs.org/contributors",
-                    "role": "Contributors"
-                }
-            ],
-            "description": "Twig, the flexible, fast, and secure template language for PHP",
-            "homepage": "http://twig.sensiolabs.org",
-            "keywords": [
-                "templating"
-            ],
-            "time": "2016-05-30 09:11:59"
-        },
-        {
-            "name": "webmozart/assert",
-            "version": "1.0.2",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/webmozart/assert.git",
-                "reference": "30eed06dd6bc88410a4ff7f77b6d22f3ce13dbde"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/webmozart/assert/zipball/30eed06dd6bc88410a4ff7f77b6d22f3ce13dbde",
-                "reference": "30eed06dd6bc88410a4ff7f77b6d22f3ce13dbde",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=5.3.3"
-            },
-            "require-dev": {
-                "phpunit/phpunit": "^4.6"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "1.0-dev"
-                }
-            },
-            "autoload": {
-                "psr-4": {
-                    "Webmozart\\Assert\\": "src/"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Bernhard Schussek",
-                    "email": "bschussek@gmail.com"
-                }
-            ],
-            "description": "Assertions to validate method input/output with nice error messages.",
-            "keywords": [
-                "assert",
-                "check",
-                "validate"
-            ],
-            "time": "2015-08-24 13:29:44"
-        }
-    ],
-    "aliases": [],
-    "minimum-stability": "stable",
-    "stability-flags": [],
-    "prefer-stable": false,
-    "prefer-lowest": false,
-    "platform": {
-        "php": ">=5.3.3"
-    },
-    "platform-dev": []
-}
diff --git a/mayor-orig/www/include/share/googleapi/phpseclib/phpseclib/phpseclib/Crypt/AES.php b/mayor-orig/www/include/share/googleapi/phpseclib/phpseclib/phpseclib/Crypt/AES.php
deleted file mode 100644
index 7d8cb8b0..00000000
--- a/mayor-orig/www/include/share/googleapi/phpseclib/phpseclib/phpseclib/Crypt/AES.php
+++ /dev/null
@@ -1,126 +0,0 @@
-
- * setKey('abcdefghijklmnop');
- *
- *    $size = 10 * 1024;
- *    $plaintext = '';
- *    for ($i = 0; $i < $size; $i++) {
- *        $plaintext.= 'a';
- *    }
- *
- *    echo $aes->decrypt($aes->encrypt($plaintext));
- * ?>
- * 
- *
- * @category  Crypt
- * @package   AES
- * @author    Jim Wigginton 
- * @copyright 2008 Jim Wigginton
- * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
- * @link      http://phpseclib.sourceforge.net
- */
-
-namespace phpseclib\Crypt;
-
-/**
- * Pure-PHP implementation of AES.
- *
- * @package AES
- * @author  Jim Wigginton 
- * @access  public
- */
-class AES extends Rijndael
-{
-    /**
-     * Dummy function
-     *
-     * Since \phpseclib\Crypt\AES extends \phpseclib\Crypt\Rijndael, this function is, technically, available, but it doesn't do anything.
-     *
-     * @see \phpseclib\Crypt\Rijndael::setBlockLength()
-     * @access public
-     * @param int $length
-     */
-    function setBlockLength($length)
-    {
-        return;
-    }
-
-    /**
-     * Sets the key length
-     *
-     * Valid key lengths are 128, 192, and 256.  If the length is less than 128, it will be rounded up to
-     * 128.  If the length is greater than 128 and invalid, it will be rounded down to the closest valid amount.
-     *
-     * @see \phpseclib\Crypt\Rijndael:setKeyLength()
-     * @access public
-     * @param int $length
-     */
-    function setKeyLength($length)
-    {
-        switch ($length) {
-            case 160:
-                $length = 192;
-                break;
-            case 224:
-                $length = 256;
-        }
-        parent::setKeyLength($length);
-    }
-
-    /**
-     * Sets the key.
-     *
-     * Rijndael supports five different key lengths, AES only supports three.
-     *
-     * @see \phpseclib\Crypt\Rijndael:setKey()
-     * @see setKeyLength()
-     * @access public
-     * @param string $key
-     */
-    function setKey($key)
-    {
-        parent::setKey($key);
-
-        if (!$this->explicit_key_length) {
-            $length = strlen($key);
-            switch (true) {
-                case $length <= 16:
-                    $this->key_length = 16;
-                    break;
-                case $length <= 24:
-                    $this->key_length = 24;
-                    break;
-                default:
-                    $this->key_length = 32;
-            }
-            $this->_setEngine();
-        }
-    }
-}
diff --git a/mayor-orig/www/include/share/googleapi/phpseclib/phpseclib/phpseclib/Crypt/Base.php b/mayor-orig/www/include/share/googleapi/phpseclib/phpseclib/phpseclib/Crypt/Base.php
deleted file mode 100644
index fd99c44f..00000000
--- a/mayor-orig/www/include/share/googleapi/phpseclib/phpseclib/phpseclib/Crypt/Base.php
+++ /dev/null
@@ -1,2553 +0,0 @@
-
- * @author    Hans-Juergen Petrich 
- * @copyright 2007 Jim Wigginton
- * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
- * @link      http://phpseclib.sourceforge.net
- */
-
-namespace phpseclib\Crypt;
-
-/**
- * Base Class for all \phpseclib\Crypt\* cipher classes
- *
- * @package Base
- * @author  Jim Wigginton 
- * @author  Hans-Juergen Petrich 
- */
-abstract class Base
-{
-    /**#@+
-     * @access public
-     * @see \phpseclib\Crypt\Base::encrypt()
-     * @see \phpseclib\Crypt\Base::decrypt()
-     */
-    /**
-     * Encrypt / decrypt using the Counter mode.
-     *
-     * Set to -1 since that's what Crypt/Random.php uses to index the CTR mode.
-     *
-     * @link http://en.wikipedia.org/wiki/Block_cipher_modes_of_operation#Counter_.28CTR.29
-     */
-    const MODE_CTR = -1;
-    /**
-     * Encrypt / decrypt using the Electronic Code Book mode.
-     *
-     * @link http://en.wikipedia.org/wiki/Block_cipher_modes_of_operation#Electronic_codebook_.28ECB.29
-     */
-    const MODE_ECB = 1;
-    /**
-     * Encrypt / decrypt using the Code Book Chaining mode.
-     *
-     * @link http://en.wikipedia.org/wiki/Block_cipher_modes_of_operation#Cipher-block_chaining_.28CBC.29
-     */
-    const MODE_CBC = 2;
-    /**
-     * Encrypt / decrypt using the Cipher Feedback mode.
-     *
-     * @link http://en.wikipedia.org/wiki/Block_cipher_modes_of_operation#Cipher_feedback_.28CFB.29
-     */
-    const MODE_CFB = 3;
-    /**
-     * Encrypt / decrypt using the Output Feedback mode.
-     *
-     * @link http://en.wikipedia.org/wiki/Block_cipher_modes_of_operation#Output_feedback_.28OFB.29
-     */
-    const MODE_OFB = 4;
-    /**
-     * Encrypt / decrypt using streaming mode.
-     */
-    const MODE_STREAM = 5;
-    /**#@-*/
-
-    /**
-     * Whirlpool available flag
-     *
-     * @see \phpseclib\Crypt\Base::_hashInlineCryptFunction()
-     * @var bool
-     * @access private
-     */
-    static $WHIRLPOOL_AVAILABLE;
-
-    /**#@+
-     * @access private
-     * @see \phpseclib\Crypt\Base::__construct()
-     */
-    /**
-     * Base value for the internal implementation $engine switch
-     */
-    const ENGINE_INTERNAL = 1;
-    /**
-     * Base value for the mcrypt implementation $engine switch
-     */
-    const ENGINE_MCRYPT = 2;
-    /**
-     * Base value for the mcrypt implementation $engine switch
-     */
-    const ENGINE_OPENSSL = 3;
-    /**#@-*/
-
-    /**
-     * The Encryption Mode
-     *
-     * @see self::__construct()
-     * @var int
-     * @access private
-     */
-    var $mode;
-
-    /**
-     * The Block Length of the block cipher
-     *
-     * @var int
-     * @access private
-     */
-    var $block_size = 16;
-
-    /**
-     * The Key
-     *
-     * @see self::setKey()
-     * @var string
-     * @access private
-     */
-    var $key = "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0";
-
-    /**
-     * The Initialization Vector
-     *
-     * @see self::setIV()
-     * @var string
-     * @access private
-     */
-    var $iv;
-
-    /**
-     * A "sliding" Initialization Vector
-     *
-     * @see self::enableContinuousBuffer()
-     * @see self::_clearBuffers()
-     * @var string
-     * @access private
-     */
-    var $encryptIV;
-
-    /**
-     * A "sliding" Initialization Vector
-     *
-     * @see self::enableContinuousBuffer()
-     * @see self::_clearBuffers()
-     * @var string
-     * @access private
-     */
-    var $decryptIV;
-
-    /**
-     * Continuous Buffer status
-     *
-     * @see self::enableContinuousBuffer()
-     * @var bool
-     * @access private
-     */
-    var $continuousBuffer = false;
-
-    /**
-     * Encryption buffer for CTR, OFB and CFB modes
-     *
-     * @see self::encrypt()
-     * @see self::_clearBuffers()
-     * @var array
-     * @access private
-     */
-    var $enbuffer;
-
-    /**
-     * Decryption buffer for CTR, OFB and CFB modes
-     *
-     * @see self::decrypt()
-     * @see self::_clearBuffers()
-     * @var array
-     * @access private
-     */
-    var $debuffer;
-
-    /**
-     * mcrypt resource for encryption
-     *
-     * The mcrypt resource can be recreated every time something needs to be created or it can be created just once.
-     * Since mcrypt operates in continuous mode, by default, it'll need to be recreated when in non-continuous mode.
-     *
-     * @see self::encrypt()
-     * @var resource
-     * @access private
-     */
-    var $enmcrypt;
-
-    /**
-     * mcrypt resource for decryption
-     *
-     * The mcrypt resource can be recreated every time something needs to be created or it can be created just once.
-     * Since mcrypt operates in continuous mode, by default, it'll need to be recreated when in non-continuous mode.
-     *
-     * @see self::decrypt()
-     * @var resource
-     * @access private
-     */
-    var $demcrypt;
-
-    /**
-     * Does the enmcrypt resource need to be (re)initialized?
-     *
-     * @see \phpseclib\Crypt\Twofish::setKey()
-     * @see \phpseclib\Crypt\Twofish::setIV()
-     * @var bool
-     * @access private
-     */
-    var $enchanged = true;
-
-    /**
-     * Does the demcrypt resource need to be (re)initialized?
-     *
-     * @see \phpseclib\Crypt\Twofish::setKey()
-     * @see \phpseclib\Crypt\Twofish::setIV()
-     * @var bool
-     * @access private
-     */
-    var $dechanged = true;
-
-    /**
-     * mcrypt resource for CFB mode
-     *
-     * mcrypt's CFB mode, in (and only in) buffered context,
-     * is broken, so phpseclib implements the CFB mode by it self,
-     * even when the mcrypt php extension is available.
-     *
-     * In order to do the CFB-mode work (fast) phpseclib
-     * use a separate ECB-mode mcrypt resource.
-     *
-     * @link http://phpseclib.sourceforge.net/cfb-demo.phps
-     * @see self::encrypt()
-     * @see self::decrypt()
-     * @see self::_setupMcrypt()
-     * @var resource
-     * @access private
-     */
-    var $ecb;
-
-    /**
-     * Optimizing value while CFB-encrypting
-     *
-     * Only relevant if $continuousBuffer enabled
-     * and $engine == self::ENGINE_MCRYPT
-     *
-     * It's faster to re-init $enmcrypt if
-     * $buffer bytes > $cfb_init_len than
-     * using the $ecb resource furthermore.
-     *
-     * This value depends of the chosen cipher
-     * and the time it would be needed for it's
-     * initialization [by mcrypt_generic_init()]
-     * which, typically, depends on the complexity
-     * on its internaly Key-expanding algorithm.
-     *
-     * @see self::encrypt()
-     * @var int
-     * @access private
-     */
-    var $cfb_init_len = 600;
-
-    /**
-     * Does internal cipher state need to be (re)initialized?
-     *
-     * @see self::setKey()
-     * @see self::setIV()
-     * @see self::disableContinuousBuffer()
-     * @var bool
-     * @access private
-     */
-    var $changed = true;
-
-    /**
-     * Padding status
-     *
-     * @see self::enablePadding()
-     * @var bool
-     * @access private
-     */
-    var $padding = true;
-
-    /**
-     * Is the mode one that is paddable?
-     *
-     * @see self::__construct()
-     * @var bool
-     * @access private
-     */
-    var $paddable = false;
-
-    /**
-     * Holds which crypt engine internaly should be use,
-     * which will be determined automatically on __construct()
-     *
-     * Currently available $engines are:
-     * - self::ENGINE_OPENSSL  (very fast, php-extension: openssl, extension_loaded('openssl') required)
-     * - self::ENGINE_MCRYPT   (fast, php-extension: mcrypt, extension_loaded('mcrypt') required)
-     * - self::ENGINE_INTERNAL (slower, pure php-engine, no php-extension required)
-     *
-     * @see self::_setEngine()
-     * @see self::encrypt()
-     * @see self::decrypt()
-     * @var int
-     * @access private
-     */
-    var $engine;
-
-    /**
-     * Holds the preferred crypt engine
-     *
-     * @see self::_setEngine()
-     * @see self::setPreferredEngine()
-     * @var int
-     * @access private
-     */
-    var $preferredEngine;
-
-    /**
-     * The mcrypt specific name of the cipher
-     *
-     * Only used if $engine == self::ENGINE_MCRYPT
-     *
-     * @link http://www.php.net/mcrypt_module_open
-     * @link http://www.php.net/mcrypt_list_algorithms
-     * @see self::_setupMcrypt()
-     * @var string
-     * @access private
-     */
-    var $cipher_name_mcrypt;
-
-    /**
-     * The openssl specific name of the cipher
-     *
-     * Only used if $engine == self::ENGINE_OPENSSL
-     *
-     * @link http://www.php.net/openssl-get-cipher-methods
-     * @var string
-     * @access private
-     */
-    var $cipher_name_openssl;
-
-    /**
-     * The openssl specific name of the cipher in ECB mode
-     *
-     * If OpenSSL does not support the mode we're trying to use (CTR)
-     * it can still be emulated with ECB mode.
-     *
-     * @link http://www.php.net/openssl-get-cipher-methods
-     * @var string
-     * @access private
-     */
-    var $cipher_name_openssl_ecb;
-
-    /**
-     * The default salt used by setPassword()
-     *
-     * @see self::setPassword()
-     * @var string
-     * @access private
-     */
-    var $password_default_salt = 'phpseclib/salt';
-
-    /**
-     * The name of the performance-optimized callback function
-     *
-     * Used by encrypt() / decrypt()
-     * only if $engine == self::ENGINE_INTERNAL
-     *
-     * @see self::encrypt()
-     * @see self::decrypt()
-     * @see self::_setupInlineCrypt()
-     * @see self::$use_inline_crypt
-     * @var Callback
-     * @access private
-     */
-    var $inline_crypt;
-
-    /**
-     * Holds whether performance-optimized $inline_crypt() can/should be used.
-     *
-     * @see self::encrypt()
-     * @see self::decrypt()
-     * @see self::inline_crypt
-     * @var mixed
-     * @access private
-     */
-    var $use_inline_crypt;
-
-    /**
-     * If OpenSSL can be used in ECB but not in CTR we can emulate CTR
-     *
-     * @see self::_openssl_ctr_process()
-     * @var bool
-     * @access private
-     */
-    var $openssl_emulate_ctr = false;
-
-    /**
-     * Determines what options are passed to openssl_encrypt/decrypt
-     *
-     * @see self::isValidEngine()
-     * @var mixed
-     * @access private
-     */
-    var $openssl_options;
-
-    /**
-     * Has the key length explicitly been set or should it be derived from the key, itself?
-     *
-     * @see self::setKeyLength()
-     * @var bool
-     * @access private
-     */
-    var $explicit_key_length = false;
-
-    /**
-     * Don't truncate / null pad key
-     *
-     * @see self::_clearBuffers()
-     * @var bool
-     * @access private
-     */
-    var $skip_key_adjustment = false;
-
-    /**
-     * Default Constructor.
-     *
-     * Determines whether or not the mcrypt extension should be used.
-     *
-     * $mode could be:
-     *
-     * - self::MODE_ECB
-     *
-     * - self::MODE_CBC
-     *
-     * - self::MODE_CTR
-     *
-     * - self::MODE_CFB
-     *
-     * - self::MODE_OFB
-     *
-     * If not explicitly set, self::MODE_CBC will be used.
-     *
-     * @param int $mode
-     * @access public
-     */
-    function __construct($mode = self::MODE_CBC)
-    {
-        // $mode dependent settings
-        switch ($mode) {
-            case self::MODE_ECB:
-                $this->paddable = true;
-                $this->mode = self::MODE_ECB;
-                break;
-            case self::MODE_CTR:
-            case self::MODE_CFB:
-            case self::MODE_OFB:
-            case self::MODE_STREAM:
-                $this->mode = $mode;
-                break;
-            case self::MODE_CBC:
-            default:
-                $this->paddable = true;
-                $this->mode = self::MODE_CBC;
-        }
-
-        $this->_setEngine();
-
-        // Determining whether inline crypting can be used by the cipher
-        if ($this->use_inline_crypt !== false && function_exists('create_function')) {
-            $this->use_inline_crypt = true;
-        }
-    }
-
-    /**
-     * Sets the initialization vector. (optional)
-     *
-     * SetIV is not required when self::MODE_ECB (or ie for AES: \phpseclib\Crypt\AES::MODE_ECB) is being used.  If not explicitly set, it'll be assumed
-     * to be all zero's.
-     *
-     * @access public
-     * @param string $iv
-     * @internal Can be overwritten by a sub class, but does not have to be
-     */
-    function setIV($iv)
-    {
-        if ($this->mode == self::MODE_ECB) {
-            return;
-        }
-
-        $this->iv = $iv;
-        $this->changed = true;
-    }
-
-    /**
-     * Sets the key length.
-     *
-     * Keys with explicitly set lengths need to be treated accordingly
-     *
-     * @access public
-     * @param int $length
-     */
-    function setKeyLength($length)
-    {
-        $this->explicit_key_length = true;
-        $this->changed = true;
-        $this->_setEngine();
-    }
-
-    /**
-     * Returns the current key length in bits
-     *
-     * @access public
-     * @return int
-     */
-    function getKeyLength()
-    {
-        return $this->key_length << 3;
-    }
-
-    /**
-     * Returns the current block length in bits
-     *
-     * @access public
-     * @return int
-     */
-    function getBlockLength()
-    {
-        return $this->block_size << 3;
-    }
-
-    /**
-     * Sets the key.
-     *
-     * The min/max length(s) of the key depends on the cipher which is used.
-     * If the key not fits the length(s) of the cipher it will paded with null bytes
-     * up to the closest valid key length.  If the key is more than max length,
-     * we trim the excess bits.
-     *
-     * If the key is not explicitly set, it'll be assumed to be all null bytes.
-     *
-     * @access public
-     * @param string $key
-     * @internal Could, but not must, extend by the child Crypt_* class
-     */
-    function setKey($key)
-    {
-        if (!$this->explicit_key_length) {
-            $this->setKeyLength(strlen($key) << 3);
-            $this->explicit_key_length = false;
-        }
-
-        $this->key = $key;
-        $this->changed = true;
-        $this->_setEngine();
-    }
-
-    /**
-     * Sets the password.
-     *
-     * Depending on what $method is set to, setPassword()'s (optional) parameters are as follows:
-     *     {@link http://en.wikipedia.org/wiki/PBKDF2 pbkdf2} or pbkdf1:
-     *         $hash, $salt, $count, $dkLen
-     *
-     *         Where $hash (default = sha1) currently supports the following hashes: see: Crypt/Hash.php
-     *
-     * @see Crypt/Hash.php
-     * @param string $password
-     * @param string $method
-     * @return bool
-     * @access public
-     * @internal Could, but not must, extend by the child Crypt_* class
-     */
-    function setPassword($password, $method = 'pbkdf2')
-    {
-        $key = '';
-
-        switch ($method) {
-            default: // 'pbkdf2' or 'pbkdf1'
-                $func_args = func_get_args();
-
-                // Hash function
-                $hash = isset($func_args[2]) ? $func_args[2] : 'sha1';
-
-                // WPA and WPA2 use the SSID as the salt
-                $salt = isset($func_args[3]) ? $func_args[3] : $this->password_default_salt;
-
-                // RFC2898#section-4.2 uses 1,000 iterations by default
-                // WPA and WPA2 use 4,096.
-                $count = isset($func_args[4]) ? $func_args[4] : 1000;
-
-                // Keylength
-                if (isset($func_args[5])) {
-                    $dkLen = $func_args[5];
-                } else {
-                    $dkLen = $method == 'pbkdf1' ? 2 * $this->key_length : $this->key_length;
-                }
-
-                switch (true) {
-                    case $method == 'pbkdf1':
-                        $hashObj = new Hash();
-                        $hashObj->setHash($hash);
-                        if ($dkLen > $hashObj->getLength()) {
-                            user_error('Derived key too long');
-                            return false;
-                        }
-                        $t = $password . $salt;
-                        for ($i = 0; $i < $count; ++$i) {
-                            $t = $hashObj->hash($t);
-                        }
-                        $key = substr($t, 0, $dkLen);
-
-                        $this->setKey(substr($key, 0, $dkLen >> 1));
-                        $this->setIV(substr($key, $dkLen >> 1));
-
-                        return true;
-                    // Determining if php[>=5.5.0]'s hash_pbkdf2() function avail- and useable
-                    case !function_exists('hash_pbkdf2'):
-                    case !function_exists('hash_algos'):
-                    case !in_array($hash, hash_algos()):
-                        $i = 1;
-                        while (strlen($key) < $dkLen) {
-                            $hmac = new Hash();
-                            $hmac->setHash($hash);
-                            $hmac->setKey($password);
-                            $f = $u = $hmac->hash($salt . pack('N', $i++));
-                            for ($j = 2; $j <= $count; ++$j) {
-                                $u = $hmac->hash($u);
-                                $f^= $u;
-                            }
-                            $key.= $f;
-                        }
-                        $key = substr($key, 0, $dkLen);
-                        break;
-                    default:
-                        $key = hash_pbkdf2($hash, $password, $salt, $count, $dkLen, true);
-                }
-        }
-
-        $this->setKey($key);
-
-        return true;
-    }
-
-    /**
-     * Encrypts a message.
-     *
-     * $plaintext will be padded with additional bytes such that it's length is a multiple of the block size. Other cipher
-     * implementations may or may not pad in the same manner.  Other common approaches to padding and the reasons why it's
-     * necessary are discussed in the following
-     * URL:
-     *
-     * {@link http://www.di-mgt.com.au/cryptopad.html http://www.di-mgt.com.au/cryptopad.html}
-     *
-     * An alternative to padding is to, separately, send the length of the file.  This is what SSH, in fact, does.
-     * strlen($plaintext) will still need to be a multiple of the block size, however, arbitrary values can be added to make it that
-     * length.
-     *
-     * @see self::decrypt()
-     * @access public
-     * @param string $plaintext
-     * @return string $ciphertext
-     * @internal Could, but not must, extend by the child Crypt_* class
-     */
-    function encrypt($plaintext)
-    {
-        if ($this->paddable) {
-            $plaintext = $this->_pad($plaintext);
-        }
-
-        if ($this->engine === self::ENGINE_OPENSSL) {
-            if ($this->changed) {
-                $this->_clearBuffers();
-                $this->changed = false;
-            }
-            switch ($this->mode) {
-                case self::MODE_STREAM:
-                    return openssl_encrypt($plaintext, $this->cipher_name_openssl, $this->key, $this->openssl_options);
-                case self::MODE_ECB:
-                    $result = openssl_encrypt($plaintext, $this->cipher_name_openssl, $this->key, $this->openssl_options);
-                    return !defined('OPENSSL_RAW_DATA') ? substr($result, 0, -$this->block_size) : $result;
-                case self::MODE_CBC:
-                    $result = openssl_encrypt($plaintext, $this->cipher_name_openssl, $this->key, $this->openssl_options, $this->encryptIV);
-                    if (!defined('OPENSSL_RAW_DATA')) {
-                        $result = substr($result, 0, -$this->block_size);
-                    }
-                    if ($this->continuousBuffer) {
-                        $this->encryptIV = substr($result, -$this->block_size);
-                    }
-                    return $result;
-                case self::MODE_CTR:
-                    return $this->_openssl_ctr_process($plaintext, $this->encryptIV, $this->enbuffer);
-                case self::MODE_CFB:
-                    // cfb loosely routines inspired by openssl's:
-                    // {@link http://cvs.openssl.org/fileview?f=openssl/crypto/modes/cfb128.c&v=1.3.2.2.2.1}
-                    $ciphertext = '';
-                    if ($this->continuousBuffer) {
-                        $iv = &$this->encryptIV;
-                        $pos = &$this->enbuffer['pos'];
-                    } else {
-                        $iv = $this->encryptIV;
-                        $pos = 0;
-                    }
-                    $len = strlen($plaintext);
-                    $i = 0;
-                    if ($pos) {
-                        $orig_pos = $pos;
-                        $max = $this->block_size - $pos;
-                        if ($len >= $max) {
-                            $i = $max;
-                            $len-= $max;
-                            $pos = 0;
-                        } else {
-                            $i = $len;
-                            $pos+= $len;
-                            $len = 0;
-                        }
-                        // ie. $i = min($max, $len), $len-= $i, $pos+= $i, $pos%= $blocksize
-                        $ciphertext = substr($iv, $orig_pos) ^ $plaintext;
-                        $iv = substr_replace($iv, $ciphertext, $orig_pos, $i);
-                        $plaintext = substr($plaintext, $i);
-                    }
-
-                    $overflow = $len % $this->block_size;
-
-                    if ($overflow) {
-                        $ciphertext.= openssl_encrypt(substr($plaintext, 0, -$overflow) . str_repeat("\0", $this->block_size), $this->cipher_name_openssl, $this->key, $this->openssl_options, $iv);
-                        $iv = $this->_string_pop($ciphertext, $this->block_size);
-
-                        $size = $len - $overflow;
-                        $block = $iv ^ substr($plaintext, -$overflow);
-                        $iv = substr_replace($iv, $block, 0, $overflow);
-                        $ciphertext.= $block;
-                        $pos = $overflow;
-                    } elseif ($len) {
-                        $ciphertext = openssl_encrypt($plaintext, $this->cipher_name_openssl, $this->key, $this->openssl_options, $iv);
-                        $iv = substr($ciphertext, -$this->block_size);
-                    }
-
-                    return $ciphertext;
-                case self::MODE_OFB:
-                    return $this->_openssl_ofb_process($plaintext, $this->encryptIV, $this->enbuffer);
-            }
-        }
-
-        if ($this->engine === self::ENGINE_MCRYPT) {
-            if ($this->changed) {
-                $this->_setupMcrypt();
-                $this->changed = false;
-            }
-            if ($this->enchanged) {
-                @mcrypt_generic_init($this->enmcrypt, $this->key, $this->encryptIV);
-                $this->enchanged = false;
-            }
-
-            // re: {@link http://phpseclib.sourceforge.net/cfb-demo.phps}
-            // using mcrypt's default handing of CFB the above would output two different things.  using phpseclib's
-            // rewritten CFB implementation the above outputs the same thing twice.
-            if ($this->mode == self::MODE_CFB && $this->continuousBuffer) {
-                $block_size = $this->block_size;
-                $iv = &$this->encryptIV;
-                $pos = &$this->enbuffer['pos'];
-                $len = strlen($plaintext);
-                $ciphertext = '';
-                $i = 0;
-                if ($pos) {
-                    $orig_pos = $pos;
-                    $max = $block_size - $pos;
-                    if ($len >= $max) {
-                        $i = $max;
-                        $len-= $max;
-                        $pos = 0;
-                    } else {
-                        $i = $len;
-                        $pos+= $len;
-                        $len = 0;
-                    }
-                    $ciphertext = substr($iv, $orig_pos) ^ $plaintext;
-                    $iv = substr_replace($iv, $ciphertext, $orig_pos, $i);
-                    $this->enbuffer['enmcrypt_init'] = true;
-                }
-                if ($len >= $block_size) {
-                    if ($this->enbuffer['enmcrypt_init'] === false || $len > $this->cfb_init_len) {
-                        if ($this->enbuffer['enmcrypt_init'] === true) {
-                            @mcrypt_generic_init($this->enmcrypt, $this->key, $iv);
-                            $this->enbuffer['enmcrypt_init'] = false;
-                        }
-                        $ciphertext.= @mcrypt_generic($this->enmcrypt, substr($plaintext, $i, $len - $len % $block_size));
-                        $iv = substr($ciphertext, -$block_size);
-                        $len%= $block_size;
-                    } else {
-                        while ($len >= $block_size) {
-                            $iv = @mcrypt_generic($this->ecb, $iv) ^ substr($plaintext, $i, $block_size);
-                            $ciphertext.= $iv;
-                            $len-= $block_size;
-                            $i+= $block_size;
-                        }
-                    }
-                }
-
-                if ($len) {
-                    $iv = @mcrypt_generic($this->ecb, $iv);
-                    $block = $iv ^ substr($plaintext, -$len);
-                    $iv = substr_replace($iv, $block, 0, $len);
-                    $ciphertext.= $block;
-                    $pos = $len;
-                }
-
-                return $ciphertext;
-            }
-
-            $ciphertext = @mcrypt_generic($this->enmcrypt, $plaintext);
-
-            if (!$this->continuousBuffer) {
-                @mcrypt_generic_init($this->enmcrypt, $this->key, $this->encryptIV);
-            }
-
-            return $ciphertext;
-        }
-
-        if ($this->changed) {
-            $this->_setup();
-            $this->changed = false;
-        }
-        if ($this->use_inline_crypt) {
-            $inline = $this->inline_crypt;
-            return $inline('encrypt', $this, $plaintext);
-        }
-
-        $buffer = &$this->enbuffer;
-        $block_size = $this->block_size;
-        $ciphertext = '';
-        switch ($this->mode) {
-            case self::MODE_ECB:
-                for ($i = 0; $i < strlen($plaintext); $i+=$block_size) {
-                    $ciphertext.= $this->_encryptBlock(substr($plaintext, $i, $block_size));
-                }
-                break;
-            case self::MODE_CBC:
-                $xor = $this->encryptIV;
-                for ($i = 0; $i < strlen($plaintext); $i+=$block_size) {
-                    $block = substr($plaintext, $i, $block_size);
-                    $block = $this->_encryptBlock($block ^ $xor);
-                    $xor = $block;
-                    $ciphertext.= $block;
-                }
-                if ($this->continuousBuffer) {
-                    $this->encryptIV = $xor;
-                }
-                break;
-            case self::MODE_CTR:
-                $xor = $this->encryptIV;
-                if (strlen($buffer['ciphertext'])) {
-                    for ($i = 0; $i < strlen($plaintext); $i+=$block_size) {
-                        $block = substr($plaintext, $i, $block_size);
-                        if (strlen($block) > strlen($buffer['ciphertext'])) {
-                            $buffer['ciphertext'].= $this->_encryptBlock($xor);
-                        }
-                        $this->_increment_str($xor);
-                        $key = $this->_string_shift($buffer['ciphertext'], $block_size);
-                        $ciphertext.= $block ^ $key;
-                    }
-                } else {
-                    for ($i = 0; $i < strlen($plaintext); $i+=$block_size) {
-                        $block = substr($plaintext, $i, $block_size);
-                        $key = $this->_encryptBlock($xor);
-                        $this->_increment_str($xor);
-                        $ciphertext.= $block ^ $key;
-                    }
-                }
-                if ($this->continuousBuffer) {
-                    $this->encryptIV = $xor;
-                    if ($start = strlen($plaintext) % $block_size) {
-                        $buffer['ciphertext'] = substr($key, $start) . $buffer['ciphertext'];
-                    }
-                }
-                break;
-            case self::MODE_CFB:
-                // cfb loosely routines inspired by openssl's:
-                // {@link http://cvs.openssl.org/fileview?f=openssl/crypto/modes/cfb128.c&v=1.3.2.2.2.1}
-                if ($this->continuousBuffer) {
-                    $iv = &$this->encryptIV;
-                    $pos = &$buffer['pos'];
-                } else {
-                    $iv = $this->encryptIV;
-                    $pos = 0;
-                }
-                $len = strlen($plaintext);
-                $i = 0;
-                if ($pos) {
-                    $orig_pos = $pos;
-                    $max = $block_size - $pos;
-                    if ($len >= $max) {
-                        $i = $max;
-                        $len-= $max;
-                        $pos = 0;
-                    } else {
-                        $i = $len;
-                        $pos+= $len;
-                        $len = 0;
-                    }
-                    // ie. $i = min($max, $len), $len-= $i, $pos+= $i, $pos%= $blocksize
-                    $ciphertext = substr($iv, $orig_pos) ^ $plaintext;
-                    $iv = substr_replace($iv, $ciphertext, $orig_pos, $i);
-                }
-                while ($len >= $block_size) {
-                    $iv = $this->_encryptBlock($iv) ^ substr($plaintext, $i, $block_size);
-                    $ciphertext.= $iv;
-                    $len-= $block_size;
-                    $i+= $block_size;
-                }
-                if ($len) {
-                    $iv = $this->_encryptBlock($iv);
-                    $block = $iv ^ substr($plaintext, $i);
-                    $iv = substr_replace($iv, $block, 0, $len);
-                    $ciphertext.= $block;
-                    $pos = $len;
-                }
-                break;
-            case self::MODE_OFB:
-                $xor = $this->encryptIV;
-                if (strlen($buffer['xor'])) {
-                    for ($i = 0; $i < strlen($plaintext); $i+=$block_size) {
-                        $block = substr($plaintext, $i, $block_size);
-                        if (strlen($block) > strlen($buffer['xor'])) {
-                            $xor = $this->_encryptBlock($xor);
-                            $buffer['xor'].= $xor;
-                        }
-                        $key = $this->_string_shift($buffer['xor'], $block_size);
-                        $ciphertext.= $block ^ $key;
-                    }
-                } else {
-                    for ($i = 0; $i < strlen($plaintext); $i+=$block_size) {
-                        $xor = $this->_encryptBlock($xor);
-                        $ciphertext.= substr($plaintext, $i, $block_size) ^ $xor;
-                    }
-                    $key = $xor;
-                }
-                if ($this->continuousBuffer) {
-                    $this->encryptIV = $xor;
-                    if ($start = strlen($plaintext) % $block_size) {
-                        $buffer['xor'] = substr($key, $start) . $buffer['xor'];
-                    }
-                }
-                break;
-            case self::MODE_STREAM:
-                $ciphertext = $this->_encryptBlock($plaintext);
-                break;
-        }
-
-        return $ciphertext;
-    }
-
-    /**
-     * Decrypts a message.
-     *
-     * If strlen($ciphertext) is not a multiple of the block size, null bytes will be added to the end of the string until
-     * it is.
-     *
-     * @see self::encrypt()
-     * @access public
-     * @param string $ciphertext
-     * @return string $plaintext
-     * @internal Could, but not must, extend by the child Crypt_* class
-     */
-    function decrypt($ciphertext)
-    {
-        if ($this->paddable) {
-            // we pad with chr(0) since that's what mcrypt_generic does.  to quote from {@link http://www.php.net/function.mcrypt-generic}:
-            // "The data is padded with "\0" to make sure the length of the data is n * blocksize."
-            $ciphertext = str_pad($ciphertext, strlen($ciphertext) + ($this->block_size - strlen($ciphertext) % $this->block_size) % $this->block_size, chr(0));
-        }
-
-        if ($this->engine === self::ENGINE_OPENSSL) {
-            if ($this->changed) {
-                $this->_clearBuffers();
-                $this->changed = false;
-            }
-            switch ($this->mode) {
-                case self::MODE_STREAM:
-                    $plaintext = openssl_decrypt($ciphertext, $this->cipher_name_openssl, $this->key, $this->openssl_options);
-                    break;
-                case self::MODE_ECB:
-                    if (!defined('OPENSSL_RAW_DATA')) {
-                        $ciphertext.= openssl_encrypt('', $this->cipher_name_openssl_ecb, $this->key, true);
-                    }
-                    $plaintext = openssl_decrypt($ciphertext, $this->cipher_name_openssl, $this->key, $this->openssl_options);
-                    break;
-                case self::MODE_CBC:
-                    if (!defined('OPENSSL_RAW_DATA')) {
-                        $padding = str_repeat(chr($this->block_size), $this->block_size) ^ substr($ciphertext, -$this->block_size);
-                        $ciphertext.= substr(openssl_encrypt($padding, $this->cipher_name_openssl_ecb, $this->key, true), 0, $this->block_size);
-                        $offset = 2 * $this->block_size;
-                    } else {
-                        $offset = $this->block_size;
-                    }
-                    $plaintext = openssl_decrypt($ciphertext, $this->cipher_name_openssl, $this->key, $this->openssl_options, $this->decryptIV);
-                    if ($this->continuousBuffer) {
-                        $this->decryptIV = substr($ciphertext, -$offset, $this->block_size);
-                    }
-                    break;
-                case self::MODE_CTR:
-                    $plaintext = $this->_openssl_ctr_process($ciphertext, $this->decryptIV, $this->debuffer);
-                    break;
-                case self::MODE_CFB:
-                    // cfb loosely routines inspired by openssl's:
-                    // {@link http://cvs.openssl.org/fileview?f=openssl/crypto/modes/cfb128.c&v=1.3.2.2.2.1}
-                    $plaintext = '';
-                    if ($this->continuousBuffer) {
-                        $iv = &$this->decryptIV;
-                        $pos = &$this->buffer['pos'];
-                    } else {
-                        $iv = $this->decryptIV;
-                        $pos = 0;
-                    }
-                    $len = strlen($ciphertext);
-                    $i = 0;
-                    if ($pos) {
-                        $orig_pos = $pos;
-                        $max = $this->block_size - $pos;
-                        if ($len >= $max) {
-                            $i = $max;
-                            $len-= $max;
-                            $pos = 0;
-                        } else {
-                            $i = $len;
-                            $pos+= $len;
-                            $len = 0;
-                        }
-                        // ie. $i = min($max, $len), $len-= $i, $pos+= $i, $pos%= $this->blocksize
-                        $plaintext = substr($iv, $orig_pos) ^ $ciphertext;
-                        $iv = substr_replace($iv, substr($ciphertext, 0, $i), $orig_pos, $i);
-                        $ciphertext = substr($ciphertext, $i);
-                    }
-                    $overflow = $len % $this->block_size;
-                    if ($overflow) {
-                        $plaintext.= openssl_decrypt(substr($ciphertext, 0, -$overflow), $this->cipher_name_openssl, $this->key, $this->openssl_options, $iv);
-                        if ($len - $overflow) {
-                            $iv = substr($ciphertext, -$overflow - $this->block_size, -$overflow);
-                        }
-                        $iv = openssl_encrypt(str_repeat("\0", $this->block_size), $this->cipher_name_openssl, $this->key, $this->openssl_options, $iv);
-                        $plaintext.= $iv ^ substr($ciphertext, -$overflow);
-                        $iv = substr_replace($iv, substr($ciphertext, -$overflow), 0, $overflow);
-                        $pos = $overflow;
-                    } elseif ($len) {
-                        $plaintext.= openssl_decrypt($ciphertext, $this->cipher_name_openssl, $this->key, $this->openssl_options, $iv);
-                        $iv = substr($ciphertext, -$this->block_size);
-                    }
-                    break;
-                case self::MODE_OFB:
-                    $plaintext = $this->_openssl_ofb_process($ciphertext, $this->decryptIV, $this->debuffer);
-            }
-
-            return $this->paddable ? $this->_unpad($plaintext) : $plaintext;
-        }
-
-        if ($this->engine === self::ENGINE_MCRYPT) {
-            $block_size = $this->block_size;
-            if ($this->changed) {
-                $this->_setupMcrypt();
-                $this->changed = false;
-            }
-            if ($this->dechanged) {
-                @mcrypt_generic_init($this->demcrypt, $this->key, $this->decryptIV);
-                $this->dechanged = false;
-            }
-
-            if ($this->mode == self::MODE_CFB && $this->continuousBuffer) {
-                $iv = &$this->decryptIV;
-                $pos = &$this->debuffer['pos'];
-                $len = strlen($ciphertext);
-                $plaintext = '';
-                $i = 0;
-                if ($pos) {
-                    $orig_pos = $pos;
-                    $max = $block_size - $pos;
-                    if ($len >= $max) {
-                        $i = $max;
-                        $len-= $max;
-                        $pos = 0;
-                    } else {
-                        $i = $len;
-                        $pos+= $len;
-                        $len = 0;
-                    }
-                    // ie. $i = min($max, $len), $len-= $i, $pos+= $i, $pos%= $blocksize
-                    $plaintext = substr($iv, $orig_pos) ^ $ciphertext;
-                    $iv = substr_replace($iv, substr($ciphertext, 0, $i), $orig_pos, $i);
-                }
-                if ($len >= $block_size) {
-                    $cb = substr($ciphertext, $i, $len - $len % $block_size);
-                    $plaintext.= @mcrypt_generic($this->ecb, $iv . $cb) ^ $cb;
-                    $iv = substr($cb, -$block_size);
-                    $len%= $block_size;
-                }
-                if ($len) {
-                    $iv = @mcrypt_generic($this->ecb, $iv);
-                    $plaintext.= $iv ^ substr($ciphertext, -$len);
-                    $iv = substr_replace($iv, substr($ciphertext, -$len), 0, $len);
-                    $pos = $len;
-                }
-
-                return $plaintext;
-            }
-
-            $plaintext = @mdecrypt_generic($this->demcrypt, $ciphertext);
-
-            if (!$this->continuousBuffer) {
-                @mcrypt_generic_init($this->demcrypt, $this->key, $this->decryptIV);
-            }
-
-            return $this->paddable ? $this->_unpad($plaintext) : $plaintext;
-        }
-
-        if ($this->changed) {
-            $this->_setup();
-            $this->changed = false;
-        }
-        if ($this->use_inline_crypt) {
-            $inline = $this->inline_crypt;
-            return $inline('decrypt', $this, $ciphertext);
-        }
-
-        $block_size = $this->block_size;
-
-        $buffer = &$this->debuffer;
-        $plaintext = '';
-        switch ($this->mode) {
-            case self::MODE_ECB:
-                for ($i = 0; $i < strlen($ciphertext); $i+=$block_size) {
-                    $plaintext.= $this->_decryptBlock(substr($ciphertext, $i, $block_size));
-                }
-                break;
-            case self::MODE_CBC:
-                $xor = $this->decryptIV;
-                for ($i = 0; $i < strlen($ciphertext); $i+=$block_size) {
-                    $block = substr($ciphertext, $i, $block_size);
-                    $plaintext.= $this->_decryptBlock($block) ^ $xor;
-                    $xor = $block;
-                }
-                if ($this->continuousBuffer) {
-                    $this->decryptIV = $xor;
-                }
-                break;
-            case self::MODE_CTR:
-                $xor = $this->decryptIV;
-                if (strlen($buffer['ciphertext'])) {
-                    for ($i = 0; $i < strlen($ciphertext); $i+=$block_size) {
-                        $block = substr($ciphertext, $i, $block_size);
-                        if (strlen($block) > strlen($buffer['ciphertext'])) {
-                            $buffer['ciphertext'].= $this->_encryptBlock($xor);
-                            $this->_increment_str($xor);
-                        }
-                        $key = $this->_string_shift($buffer['ciphertext'], $block_size);
-                        $plaintext.= $block ^ $key;
-                    }
-                } else {
-                    for ($i = 0; $i < strlen($ciphertext); $i+=$block_size) {
-                        $block = substr($ciphertext, $i, $block_size);
-                        $key = $this->_encryptBlock($xor);
-                        $this->_increment_str($xor);
-                        $plaintext.= $block ^ $key;
-                    }
-                }
-                if ($this->continuousBuffer) {
-                    $this->decryptIV = $xor;
-                    if ($start = strlen($ciphertext) % $block_size) {
-                        $buffer['ciphertext'] = substr($key, $start) . $buffer['ciphertext'];
-                    }
-                }
-                break;
-            case self::MODE_CFB:
-                if ($this->continuousBuffer) {
-                    $iv = &$this->decryptIV;
-                    $pos = &$buffer['pos'];
-                } else {
-                    $iv = $this->decryptIV;
-                    $pos = 0;
-                }
-                $len = strlen($ciphertext);
-                $i = 0;
-                if ($pos) {
-                    $orig_pos = $pos;
-                    $max = $block_size - $pos;
-                    if ($len >= $max) {
-                        $i = $max;
-                        $len-= $max;
-                        $pos = 0;
-                    } else {
-                        $i = $len;
-                        $pos+= $len;
-                        $len = 0;
-                    }
-                    // ie. $i = min($max, $len), $len-= $i, $pos+= $i, $pos%= $blocksize
-                    $plaintext = substr($iv, $orig_pos) ^ $ciphertext;
-                    $iv = substr_replace($iv, substr($ciphertext, 0, $i), $orig_pos, $i);
-                }
-                while ($len >= $block_size) {
-                    $iv = $this->_encryptBlock($iv);
-                    $cb = substr($ciphertext, $i, $block_size);
-                    $plaintext.= $iv ^ $cb;
-                    $iv = $cb;
-                    $len-= $block_size;
-                    $i+= $block_size;
-                }
-                if ($len) {
-                    $iv = $this->_encryptBlock($iv);
-                    $plaintext.= $iv ^ substr($ciphertext, $i);
-                    $iv = substr_replace($iv, substr($ciphertext, $i), 0, $len);
-                    $pos = $len;
-                }
-                break;
-            case self::MODE_OFB:
-                $xor = $this->decryptIV;
-                if (strlen($buffer['xor'])) {
-                    for ($i = 0; $i < strlen($ciphertext); $i+=$block_size) {
-                        $block = substr($ciphertext, $i, $block_size);
-                        if (strlen($block) > strlen($buffer['xor'])) {
-                            $xor = $this->_encryptBlock($xor);
-                            $buffer['xor'].= $xor;
-                        }
-                        $key = $this->_string_shift($buffer['xor'], $block_size);
-                        $plaintext.= $block ^ $key;
-                    }
-                } else {
-                    for ($i = 0; $i < strlen($ciphertext); $i+=$block_size) {
-                        $xor = $this->_encryptBlock($xor);
-                        $plaintext.= substr($ciphertext, $i, $block_size) ^ $xor;
-                    }
-                    $key = $xor;
-                }
-                if ($this->continuousBuffer) {
-                    $this->decryptIV = $xor;
-                    if ($start = strlen($ciphertext) % $block_size) {
-                        $buffer['xor'] = substr($key, $start) . $buffer['xor'];
-                    }
-                }
-                break;
-            case self::MODE_STREAM:
-                $plaintext = $this->_decryptBlock($ciphertext);
-                break;
-        }
-        return $this->paddable ? $this->_unpad($plaintext) : $plaintext;
-    }
-
-    /**
-     * OpenSSL CTR Processor
-     *
-     * PHP's OpenSSL bindings do not operate in continuous mode so we'll wrap around it. Since the keystream
-     * for CTR is the same for both encrypting and decrypting this function is re-used by both Base::encrypt()
-     * and Base::decrypt(). Also, OpenSSL doesn't implement CTR for all of it's symmetric ciphers so this
-     * function will emulate CTR with ECB when necessary.
-     *
-     * @see self::encrypt()
-     * @see self::decrypt()
-     * @param string $plaintext
-     * @param string $encryptIV
-     * @param array $buffer
-     * @return string
-     * @access private
-     */
-    function _openssl_ctr_process($plaintext, &$encryptIV, &$buffer)
-    {
-        $ciphertext = '';
-
-        $block_size = $this->block_size;
-        $key = $this->key;
-
-        if ($this->openssl_emulate_ctr) {
-            $xor = $encryptIV;
-            if (strlen($buffer['ciphertext'])) {
-                for ($i = 0; $i < strlen($plaintext); $i+=$block_size) {
-                    $block = substr($plaintext, $i, $block_size);
-                    if (strlen($block) > strlen($buffer['ciphertext'])) {
-                        $result = openssl_encrypt($xor, $this->cipher_name_openssl_ecb, $key, $this->openssl_options);
-                        $result = !defined('OPENSSL_RAW_DATA') ? substr($result, 0, -$this->block_size) : $result;
-                        $buffer['ciphertext'].= $result;
-                    }
-                    $this->_increment_str($xor);
-                    $otp = $this->_string_shift($buffer['ciphertext'], $block_size);
-                    $ciphertext.= $block ^ $otp;
-                }
-            } else {
-                for ($i = 0; $i < strlen($plaintext); $i+=$block_size) {
-                    $block = substr($plaintext, $i, $block_size);
-                    $otp = openssl_encrypt($xor, $this->cipher_name_openssl_ecb, $key, $this->openssl_options);
-                    $otp = !defined('OPENSSL_RAW_DATA') ? substr($otp, 0, -$this->block_size) : $otp;
-                    $this->_increment_str($xor);
-                    $ciphertext.= $block ^ $otp;
-                }
-            }
-            if ($this->continuousBuffer) {
-                $encryptIV = $xor;
-                if ($start = strlen($plaintext) % $block_size) {
-                    $buffer['ciphertext'] = substr($key, $start) . $buffer['ciphertext'];
-                }
-            }
-
-            return $ciphertext;
-        }
-
-        if (strlen($buffer['ciphertext'])) {
-            $ciphertext = $plaintext ^ $this->_string_shift($buffer['ciphertext'], strlen($plaintext));
-            $plaintext = substr($plaintext, strlen($ciphertext));
-
-            if (!strlen($plaintext)) {
-                return $ciphertext;
-            }
-        }
-
-        $overflow = strlen($plaintext) % $block_size;
-        if ($overflow) {
-            $plaintext2 = $this->_string_pop($plaintext, $overflow); // ie. trim $plaintext to a multiple of $block_size and put rest of $plaintext in $plaintext2
-            $encrypted = openssl_encrypt($plaintext . str_repeat("\0", $block_size), $this->cipher_name_openssl, $key, $this->openssl_options, $encryptIV);
-            $temp = $this->_string_pop($encrypted, $block_size);
-            $ciphertext.= $encrypted . ($plaintext2 ^ $temp);
-            if ($this->continuousBuffer) {
-                $buffer['ciphertext'] = substr($temp, $overflow);
-                $encryptIV = $temp;
-            }
-        } elseif (!strlen($buffer['ciphertext'])) {
-            $ciphertext.= openssl_encrypt($plaintext . str_repeat("\0", $block_size), $this->cipher_name_openssl, $key, $this->openssl_options, $encryptIV);
-            $temp = $this->_string_pop($ciphertext, $block_size);
-            if ($this->continuousBuffer) {
-                $encryptIV = $temp;
-            }
-        }
-        if ($this->continuousBuffer) {
-            if (!defined('OPENSSL_RAW_DATA')) {
-                $encryptIV.= openssl_encrypt('', $this->cipher_name_openssl_ecb, $key, $this->openssl_options);
-            }
-            $encryptIV = openssl_decrypt($encryptIV, $this->cipher_name_openssl_ecb, $key, $this->openssl_options);
-            if ($overflow) {
-                $this->_increment_str($encryptIV);
-            }
-        }
-
-        return $ciphertext;
-    }
-
-    /**
-     * OpenSSL OFB Processor
-     *
-     * PHP's OpenSSL bindings do not operate in continuous mode so we'll wrap around it. Since the keystream
-     * for OFB is the same for both encrypting and decrypting this function is re-used by both Base::encrypt()
-     * and Base::decrypt().
-     *
-     * @see self::encrypt()
-     * @see self::decrypt()
-     * @param string $plaintext
-     * @param string $encryptIV
-     * @param array $buffer
-     * @return string
-     * @access private
-     */
-    function _openssl_ofb_process($plaintext, &$encryptIV, &$buffer)
-    {
-        if (strlen($buffer['xor'])) {
-            $ciphertext = $plaintext ^ $buffer['xor'];
-            $buffer['xor'] = substr($buffer['xor'], strlen($ciphertext));
-            $plaintext = substr($plaintext, strlen($ciphertext));
-        } else {
-            $ciphertext = '';
-        }
-
-        $block_size = $this->block_size;
-
-        $len = strlen($plaintext);
-        $key = $this->key;
-        $overflow = $len % $block_size;
-
-        if (strlen($plaintext)) {
-            if ($overflow) {
-                $ciphertext.= openssl_encrypt(substr($plaintext, 0, -$overflow) . str_repeat("\0", $block_size), $this->cipher_name_openssl, $key, $this->openssl_options, $encryptIV);
-                $xor = $this->_string_pop($ciphertext, $block_size);
-                if ($this->continuousBuffer) {
-                    $encryptIV = $xor;
-                }
-                $ciphertext.= $this->_string_shift($xor, $overflow) ^ substr($plaintext, -$overflow);
-                if ($this->continuousBuffer) {
-                    $buffer['xor'] = $xor;
-                }
-            } else {
-                $ciphertext = openssl_encrypt($plaintext, $this->cipher_name_openssl, $key, $this->openssl_options, $encryptIV);
-                if ($this->continuousBuffer) {
-                    $encryptIV = substr($ciphertext, -$block_size) ^ substr($plaintext, -$block_size);
-                }
-            }
-        }
-
-        return $ciphertext;
-    }
-
-    /**
-     * phpseclib <-> OpenSSL Mode Mapper
-     *
-     * May need to be overwritten by classes extending this one in some cases
-     *
-     * @return int
-     * @access private
-     */
-    function _openssl_translate_mode()
-    {
-        switch ($this->mode) {
-            case self::MODE_ECB:
-                return 'ecb';
-            case self::MODE_CBC:
-                return 'cbc';
-            case self::MODE_CTR:
-                return 'ctr';
-            case self::MODE_CFB:
-                return 'cfb';
-            case self::MODE_OFB:
-                return 'ofb';
-        }
-    }
-
-    /**
-     * Pad "packets".
-     *
-     * Block ciphers working by encrypting between their specified [$this->]block_size at a time
-     * If you ever need to encrypt or decrypt something that isn't of the proper length, it becomes necessary to
-     * pad the input so that it is of the proper length.
-     *
-     * Padding is enabled by default.  Sometimes, however, it is undesirable to pad strings.  Such is the case in SSH,
-     * where "packets" are padded with random bytes before being encrypted.  Unpad these packets and you risk stripping
-     * away characters that shouldn't be stripped away. (SSH knows how many bytes are added because the length is
-     * transmitted separately)
-     *
-     * @see self::disablePadding()
-     * @access public
-     */
-    function enablePadding()
-    {
-        $this->padding = true;
-    }
-
-    /**
-     * Do not pad packets.
-     *
-     * @see self::enablePadding()
-     * @access public
-     */
-    function disablePadding()
-    {
-        $this->padding = false;
-    }
-
-    /**
-     * Treat consecutive "packets" as if they are a continuous buffer.
-     *
-     * Say you have a 32-byte plaintext $plaintext.  Using the default behavior, the two following code snippets
-     * will yield different outputs:
-     *
-     * 
-     *    echo $rijndael->encrypt(substr($plaintext,  0, 16));
-     *    echo $rijndael->encrypt(substr($plaintext, 16, 16));
-     * 
-     * 
-     *    echo $rijndael->encrypt($plaintext);
-     * 
-     *
-     * The solution is to enable the continuous buffer.  Although this will resolve the above discrepancy, it creates
-     * another, as demonstrated with the following:
-     *
-     * 
-     *    $rijndael->encrypt(substr($plaintext, 0, 16));
-     *    echo $rijndael->decrypt($rijndael->encrypt(substr($plaintext, 16, 16)));
-     * 
-     * 
-     *    echo $rijndael->decrypt($rijndael->encrypt(substr($plaintext, 16, 16)));
-     * 
-     *
-     * With the continuous buffer disabled, these would yield the same output.  With it enabled, they yield different
-     * outputs.  The reason is due to the fact that the initialization vector's change after every encryption /
-     * decryption round when the continuous buffer is enabled.  When it's disabled, they remain constant.
-     *
-     * Put another way, when the continuous buffer is enabled, the state of the \phpseclib\Crypt\*() object changes after each
-     * encryption / decryption round, whereas otherwise, it'd remain constant.  For this reason, it's recommended that
-     * continuous buffers not be used.  They do offer better security and are, in fact, sometimes required (SSH uses them),
-     * however, they are also less intuitive and more likely to cause you problems.
-     *
-     * @see self::disableContinuousBuffer()
-     * @access public
-     * @internal Could, but not must, extend by the child Crypt_* class
-     */
-    function enableContinuousBuffer()
-    {
-        if ($this->mode == self::MODE_ECB) {
-            return;
-        }
-
-        $this->continuousBuffer = true;
-
-        $this->_setEngine();
-    }
-
-    /**
-     * Treat consecutive packets as if they are a discontinuous buffer.
-     *
-     * The default behavior.
-     *
-     * @see self::enableContinuousBuffer()
-     * @access public
-     * @internal Could, but not must, extend by the child Crypt_* class
-     */
-    function disableContinuousBuffer()
-    {
-        if ($this->mode == self::MODE_ECB) {
-            return;
-        }
-        if (!$this->continuousBuffer) {
-            return;
-        }
-
-        $this->continuousBuffer = false;
-        $this->changed = true;
-
-        $this->_setEngine();
-    }
-
-    /**
-     * Test for engine validity
-     *
-     * @see self::__construct()
-     * @param int $engine
-     * @access public
-     * @return bool
-     */
-    function isValidEngine($engine)
-    {
-        switch ($engine) {
-            case self::ENGINE_OPENSSL:
-                if ($this->mode == self::MODE_STREAM && $this->continuousBuffer) {
-                    return false;
-                }
-                $this->openssl_emulate_ctr = false;
-                $result = $this->cipher_name_openssl &&
-                          extension_loaded('openssl') &&
-                          // PHP 5.3.0 - 5.3.2 did not let you set IV's
-                          version_compare(PHP_VERSION, '5.3.3', '>=');
-                if (!$result) {
-                    return false;
-                }
-
-                // prior to PHP 5.4.0 OPENSSL_RAW_DATA and OPENSSL_ZERO_PADDING were not defined. instead of expecting an integer
-                // $options openssl_encrypt expected a boolean $raw_data.
-                if (!defined('OPENSSL_RAW_DATA')) {
-                    $this->openssl_options = true;
-                } else {
-                    $this->openssl_options = OPENSSL_RAW_DATA | OPENSSL_ZERO_PADDING;
-                }
-
-                $methods = openssl_get_cipher_methods();
-                if (in_array($this->cipher_name_openssl, $methods)) {
-                    return true;
-                }
-                // not all of openssl's symmetric cipher's support ctr. for those
-                // that don't we'll emulate it
-                switch ($this->mode) {
-                    case self::MODE_CTR:
-                        if (in_array($this->cipher_name_openssl_ecb, $methods)) {
-                            $this->openssl_emulate_ctr = true;
-                            return true;
-                        }
-                }
-                return false;
-            case self::ENGINE_MCRYPT:
-                return $this->cipher_name_mcrypt &&
-                       extension_loaded('mcrypt') &&
-                       in_array($this->cipher_name_mcrypt, @mcrypt_list_algorithms());
-            case self::ENGINE_INTERNAL:
-                return true;
-        }
-
-        return false;
-    }
-
-    /**
-     * Sets the preferred crypt engine
-     *
-     * Currently, $engine could be:
-     *
-     * - \phpseclib\Crypt\Base::ENGINE_OPENSSL  [very fast]
-     *
-     * - \phpseclib\Crypt\Base::ENGINE_MCRYPT   [fast]
-     *
-     * - \phpseclib\Crypt\Base::ENGINE_INTERNAL [slow]
-     *
-     * If the preferred crypt engine is not available the fastest available one will be used
-     *
-     * @see self::__construct()
-     * @param int $engine
-     * @access public
-     */
-    function setPreferredEngine($engine)
-    {
-        switch ($engine) {
-            //case self::ENGINE_OPENSSL;
-            case self::ENGINE_MCRYPT:
-            case self::ENGINE_INTERNAL:
-                $this->preferredEngine = $engine;
-                break;
-            default:
-                $this->preferredEngine = self::ENGINE_OPENSSL;
-        }
-
-        $this->_setEngine();
-    }
-
-    /**
-     * Returns the engine currently being utilized
-     *
-     * @see self::_setEngine()
-     * @access public
-     */
-    function getEngine()
-    {
-        return $this->engine;
-    }
-
-    /**
-     * Sets the engine as appropriate
-     *
-     * @see self::__construct()
-     * @access private
-     */
-    function _setEngine()
-    {
-        $this->engine = null;
-
-        $candidateEngines = array(
-            $this->preferredEngine,
-            self::ENGINE_OPENSSL,
-            self::ENGINE_MCRYPT
-        );
-        foreach ($candidateEngines as $engine) {
-            if ($this->isValidEngine($engine)) {
-                $this->engine = $engine;
-                break;
-            }
-        }
-        if (!$this->engine) {
-            $this->engine = self::ENGINE_INTERNAL;
-        }
-
-        if ($this->engine != self::ENGINE_MCRYPT && $this->enmcrypt) {
-            // Closing the current mcrypt resource(s). _mcryptSetup() will, if needed,
-            // (re)open them with the module named in $this->cipher_name_mcrypt
-            @mcrypt_module_close($this->enmcrypt);
-            @mcrypt_module_close($this->demcrypt);
-            $this->enmcrypt = null;
-            $this->demcrypt = null;
-
-            if ($this->ecb) {
-                @mcrypt_module_close($this->ecb);
-                $this->ecb = null;
-            }
-        }
-
-        $this->changed = true;
-    }
-
-    /**
-     * Encrypts a block
-     *
-     * Note: Must be extended by the child \phpseclib\Crypt\* class
-     *
-     * @access private
-     * @param string $in
-     * @return string
-     */
-    abstract function _encryptBlock($in);
-
-    /**
-     * Decrypts a block
-     *
-     * Note: Must be extended by the child \phpseclib\Crypt\* class
-     *
-     * @access private
-     * @param string $in
-     * @return string
-     */
-    abstract function _decryptBlock($in);
-
-    /**
-     * Setup the key (expansion)
-     *
-     * Only used if $engine == self::ENGINE_INTERNAL
-     *
-     * Note: Must extend by the child \phpseclib\Crypt\* class
-     *
-     * @see self::_setup()
-     * @access private
-     */
-    abstract function _setupKey();
-
-    /**
-     * Setup the self::ENGINE_INTERNAL $engine
-     *
-     * (re)init, if necessary, the internal cipher $engine and flush all $buffers
-     * Used (only) if $engine == self::ENGINE_INTERNAL
-     *
-     * _setup() will be called each time if $changed === true
-     * typically this happens when using one or more of following public methods:
-     *
-     * - setKey()
-     *
-     * - setIV()
-     *
-     * - disableContinuousBuffer()
-     *
-     * - First run of encrypt() / decrypt() with no init-settings
-     *
-     * @see self::setKey()
-     * @see self::setIV()
-     * @see self::disableContinuousBuffer()
-     * @access private
-     * @internal _setup() is always called before en/decryption.
-     * @internal Could, but not must, extend by the child Crypt_* class
-     */
-    function _setup()
-    {
-        $this->_clearBuffers();
-        $this->_setupKey();
-
-        if ($this->use_inline_crypt) {
-            $this->_setupInlineCrypt();
-        }
-    }
-
-    /**
-     * Setup the self::ENGINE_MCRYPT $engine
-     *
-     * (re)init, if necessary, the (ext)mcrypt resources and flush all $buffers
-     * Used (only) if $engine = self::ENGINE_MCRYPT
-     *
-     * _setupMcrypt() will be called each time if $changed === true
-     * typically this happens when using one or more of following public methods:
-     *
-     * - setKey()
-     *
-     * - setIV()
-     *
-     * - disableContinuousBuffer()
-     *
-     * - First run of encrypt() / decrypt()
-     *
-     * @see self::setKey()
-     * @see self::setIV()
-     * @see self::disableContinuousBuffer()
-     * @access private
-     * @internal Could, but not must, extend by the child Crypt_* class
-     */
-    function _setupMcrypt()
-    {
-        $this->_clearBuffers();
-        $this->enchanged = $this->dechanged = true;
-
-        if (!isset($this->enmcrypt)) {
-            static $mcrypt_modes = array(
-                self::MODE_CTR    => 'ctr',
-                self::MODE_ECB    => MCRYPT_MODE_ECB,
-                self::MODE_CBC    => MCRYPT_MODE_CBC,
-                self::MODE_CFB    => 'ncfb',
-                self::MODE_OFB    => MCRYPT_MODE_NOFB,
-                self::MODE_STREAM => MCRYPT_MODE_STREAM,
-            );
-
-            $this->demcrypt = @mcrypt_module_open($this->cipher_name_mcrypt, '', $mcrypt_modes[$this->mode], '');
-            $this->enmcrypt = @mcrypt_module_open($this->cipher_name_mcrypt, '', $mcrypt_modes[$this->mode], '');
-
-            // we need the $ecb mcrypt resource (only) in MODE_CFB with enableContinuousBuffer()
-            // to workaround mcrypt's broken ncfb implementation in buffered mode
-            // see: {@link http://phpseclib.sourceforge.net/cfb-demo.phps}
-            if ($this->mode == self::MODE_CFB) {
-                $this->ecb = @mcrypt_module_open($this->cipher_name_mcrypt, '', MCRYPT_MODE_ECB, '');
-            }
-        } // else should mcrypt_generic_deinit be called?
-
-        if ($this->mode == self::MODE_CFB) {
-            @mcrypt_generic_init($this->ecb, $this->key, str_repeat("\0", $this->block_size));
-        }
-    }
-
-    /**
-     * Pads a string
-     *
-     * Pads a string using the RSA PKCS padding standards so that its length is a multiple of the blocksize.
-     * $this->block_size - (strlen($text) % $this->block_size) bytes are added, each of which is equal to
-     * chr($this->block_size - (strlen($text) % $this->block_size)
-     *
-     * If padding is disabled and $text is not a multiple of the blocksize, the string will be padded regardless
-     * and padding will, hence forth, be enabled.
-     *
-     * @see self::_unpad()
-     * @param string $text
-     * @access private
-     * @return string
-     */
-    function _pad($text)
-    {
-        $length = strlen($text);
-
-        if (!$this->padding) {
-            if ($length % $this->block_size == 0) {
-                return $text;
-            } else {
-                user_error("The plaintext's length ($length) is not a multiple of the block size ({$this->block_size})");
-                $this->padding = true;
-            }
-        }
-
-        $pad = $this->block_size - ($length % $this->block_size);
-
-        return str_pad($text, $length + $pad, chr($pad));
-    }
-
-    /**
-     * Unpads a string.
-     *
-     * If padding is enabled and the reported padding length is invalid the encryption key will be assumed to be wrong
-     * and false will be returned.
-     *
-     * @see self::_pad()
-     * @param string $text
-     * @access private
-     * @return string
-     */
-    function _unpad($text)
-    {
-        if (!$this->padding) {
-            return $text;
-        }
-
-        $length = ord($text[strlen($text) - 1]);
-
-        if (!$length || $length > $this->block_size) {
-            return false;
-        }
-
-        return substr($text, 0, -$length);
-    }
-
-    /**
-     * Clears internal buffers
-     *
-     * Clearing/resetting the internal buffers is done everytime
-     * after disableContinuousBuffer() or on cipher $engine (re)init
-     * ie after setKey() or setIV()
-     *
-     * @access public
-     * @internal Could, but not must, extend by the child Crypt_* class
-     */
-    function _clearBuffers()
-    {
-        $this->enbuffer = $this->debuffer = array('ciphertext' => '', 'xor' => '', 'pos' => 0, 'enmcrypt_init' => true);
-
-        // mcrypt's handling of invalid's $iv:
-        // $this->encryptIV = $this->decryptIV = strlen($this->iv) == $this->block_size ? $this->iv : str_repeat("\0", $this->block_size);
-        $this->encryptIV = $this->decryptIV = str_pad(substr($this->iv, 0, $this->block_size), $this->block_size, "\0");
-
-        if (!$this->skip_key_adjustment) {
-            $this->key = str_pad(substr($this->key, 0, $this->key_length), $this->key_length, "\0");
-        }
-    }
-
-    /**
-     * String Shift
-     *
-     * Inspired by array_shift
-     *
-     * @param string $string
-     * @param int $index
-     * @access private
-     * @return string
-     */
-    function _string_shift(&$string, $index = 1)
-    {
-        $substr = substr($string, 0, $index);
-        $string = substr($string, $index);
-        return $substr;
-    }
-
-    /**
-     * String Pop
-     *
-     * Inspired by array_pop
-     *
-     * @param string $string
-     * @param int $index
-     * @access private
-     * @return string
-     */
-    function _string_pop(&$string, $index = 1)
-    {
-        $substr = substr($string, -$index);
-        $string = substr($string, 0, -$index);
-        return $substr;
-    }
-
-    /**
-     * Increment the current string
-     *
-     * @see self::decrypt()
-     * @see self::encrypt()
-     * @param string $var
-     * @access private
-     */
-    function _increment_str(&$var)
-    {
-        for ($i = 4; $i <= strlen($var); $i+= 4) {
-            $temp = substr($var, -$i, 4);
-            switch ($temp) {
-                case "\xFF\xFF\xFF\xFF":
-                    $var = substr_replace($var, "\x00\x00\x00\x00", -$i, 4);
-                    break;
-                case "\x7F\xFF\xFF\xFF":
-                    $var = substr_replace($var, "\x80\x00\x00\x00", -$i, 4);
-                    return;
-                default:
-                    $temp = unpack('Nnum', $temp);
-                    $var = substr_replace($var, pack('N', $temp['num'] + 1), -$i, 4);
-                    return;
-            }
-        }
-
-        $remainder = strlen($var) % 4;
-
-        if ($remainder == 0) {
-            return;
-        }
-
-        $temp = unpack('Nnum', str_pad(substr($var, 0, $remainder), 4, "\0", STR_PAD_LEFT));
-        $temp = substr(pack('N', $temp['num'] + 1), -$remainder);
-        $var = substr_replace($var, $temp, 0, $remainder);
-    }
-
-    /**
-     * Setup the performance-optimized function for de/encrypt()
-     *
-     * Stores the created (or existing) callback function-name
-     * in $this->inline_crypt
-     *
-     * Internally for phpseclib developers:
-     *
-     *     _setupInlineCrypt() would be called only if:
-     *
-     *     - $engine == self::ENGINE_INTERNAL and
-     *
-     *     - $use_inline_crypt === true
-     *
-     *     - each time on _setup(), after(!) _setupKey()
-     *
-     *
-     *     This ensures that _setupInlineCrypt() has always a
-     *     full ready2go initializated internal cipher $engine state
-     *     where, for example, the keys allready expanded,
-     *     keys/block_size calculated and such.
-     *
-     *     It is, each time if called, the responsibility of _setupInlineCrypt():
-     *
-     *     - to set $this->inline_crypt to a valid and fully working callback function
-     *       as a (faster) replacement for encrypt() / decrypt()
-     *
-     *     - NOT to create unlimited callback functions (for memory reasons!)
-     *       no matter how often _setupInlineCrypt() would be called. At some
-     *       point of amount they must be generic re-useable.
-     *
-     *     - the code of _setupInlineCrypt() it self,
-     *       and the generated callback code,
-     *       must be, in following order:
-     *       - 100% safe
-     *       - 100% compatible to encrypt()/decrypt()
-     *       - using only php5+ features/lang-constructs/php-extensions if
-     *         compatibility (down to php4) or fallback is provided
-     *       - readable/maintainable/understandable/commented and... not-cryptic-styled-code :-)
-     *       - >= 10% faster than encrypt()/decrypt() [which is, by the way,
-     *         the reason for the existence of _setupInlineCrypt() :-)]
-     *       - memory-nice
-     *       - short (as good as possible)
-     *
-     * Note: - _setupInlineCrypt() is using _createInlineCryptFunction() to create the full callback function code.
-     *       - In case of using inline crypting, _setupInlineCrypt() must extend by the child \phpseclib\Crypt\* class.
-     *       - The following variable names are reserved:
-     *         - $_*  (all variable names prefixed with an underscore)
-     *         - $self (object reference to it self. Do not use $this, but $self instead)
-     *         - $in (the content of $in has to en/decrypt by the generated code)
-     *       - The callback function should not use the 'return' statement, but en/decrypt'ing the content of $in only
-     *
-     *
-     * @see self::_setup()
-     * @see self::_createInlineCryptFunction()
-     * @see self::encrypt()
-     * @see self::decrypt()
-     * @access private
-     * @internal If a Crypt_* class providing inline crypting it must extend _setupInlineCrypt()
-     */
-    function _setupInlineCrypt()
-    {
-        // If, for any reason, an extending \phpseclib\Crypt\Base() \phpseclib\Crypt\* class
-        // not using inline crypting then it must be ensured that: $this->use_inline_crypt = false
-        // ie in the class var declaration of $use_inline_crypt in general for the \phpseclib\Crypt\* class,
-        // in the constructor at object instance-time
-        // or, if it's runtime-specific, at runtime
-
-        $this->use_inline_crypt = false;
-    }
-
-    /**
-     * Creates the performance-optimized function for en/decrypt()
-     *
-     * Internally for phpseclib developers:
-     *
-     *    _createInlineCryptFunction():
-     *
-     *    - merge the $cipher_code [setup'ed by _setupInlineCrypt()]
-     *      with the current [$this->]mode of operation code
-     *
-     *    - create the $inline function, which called by encrypt() / decrypt()
-     *      as its replacement to speed up the en/decryption operations.
-     *
-     *    - return the name of the created $inline callback function
-     *
-     *    - used to speed up en/decryption
-     *
-     *
-     *
-     *    The main reason why can speed up things [up to 50%] this way are:
-     *
-     *    - using variables more effective then regular.
-     *      (ie no use of expensive arrays but integers $k_0, $k_1 ...
-     *      or even, for example, the pure $key[] values hardcoded)
-     *
-     *    - avoiding 1000's of function calls of ie _encryptBlock()
-     *      but inlining the crypt operations.
-     *      in the mode of operation for() loop.
-     *
-     *    - full loop unroll the (sometimes key-dependent) rounds
-     *      avoiding this way ++$i counters and runtime-if's etc...
-     *
-     *    The basic code architectur of the generated $inline en/decrypt()
-     *    lambda function, in pseudo php, is:
-     *
-     *    
-     *    +----------------------------------------------------------------------------------------------+
-     *    | callback $inline = create_function:                                                          |
-     *    | lambda_function_0001_crypt_ECB($action, $text)                                               |
-     *    | {                                                                                            |
-     *    |     INSERT PHP CODE OF:                                                                      |
-     *    |     $cipher_code['init_crypt'];                  // general init code.                       |
-     *    |                                                  // ie: $sbox'es declarations used for       |
-     *    |                                                  //     encrypt and decrypt'ing.             |
-     *    |                                                                                              |
-     *    |     switch ($action) {                                                                       |
-     *    |         case 'encrypt':                                                                      |
-     *    |             INSERT PHP CODE OF:                                                              |
-     *    |             $cipher_code['init_encrypt'];       // encrypt sepcific init code.               |
-     *    |                                                    ie: specified $key or $box                |
-     *    |                                                        declarations for encrypt'ing.         |
-     *    |                                                                                              |
-     *    |             foreach ($ciphertext) {                                                          |
-     *    |                 $in = $block_size of $ciphertext;                                            |
-     *    |                                                                                              |
-     *    |                 INSERT PHP CODE OF:                                                          |
-     *    |                 $cipher_code['encrypt_block'];  // encrypt's (string) $in, which is always:  |
-     *    |                                                 // strlen($in) == $this->block_size          |
-     *    |                                                 // here comes the cipher algorithm in action |
-     *    |                                                 // for encryption.                           |
-     *    |                                                 // $cipher_code['encrypt_block'] has to      |
-     *    |                                                 // encrypt the content of the $in variable   |
-     *    |                                                                                              |
-     *    |                 $plaintext .= $in;                                                           |
-     *    |             }                                                                                |
-     *    |             return $plaintext;                                                               |
-     *    |                                                                                              |
-     *    |         case 'decrypt':                                                                      |
-     *    |             INSERT PHP CODE OF:                                                              |
-     *    |             $cipher_code['init_decrypt'];       // decrypt sepcific init code                |
-     *    |                                                    ie: specified $key or $box                |
-     *    |                                                        declarations for decrypt'ing.         |
-     *    |             foreach ($plaintext) {                                                           |
-     *    |                 $in = $block_size of $plaintext;                                             |
-     *    |                                                                                              |
-     *    |                 INSERT PHP CODE OF:                                                          |
-     *    |                 $cipher_code['decrypt_block'];  // decrypt's (string) $in, which is always   |
-     *    |                                                 // strlen($in) == $this->block_size          |
-     *    |                                                 // here comes the cipher algorithm in action |
-     *    |                                                 // for decryption.                           |
-     *    |                                                 // $cipher_code['decrypt_block'] has to      |
-     *    |                                                 // decrypt the content of the $in variable   |
-     *    |                 $ciphertext .= $in;                                                          |
-     *    |             }                                                                                |
-     *    |             return $ciphertext;                                                              |
-     *    |     }                                                                                        |
-     *    | }                                                                                            |
-     *    +----------------------------------------------------------------------------------------------+
-     *    
-     *
-     *    See also the \phpseclib\Crypt\*::_setupInlineCrypt()'s for
-     *    productive inline $cipher_code's how they works.
-     *
-     *    Structure of:
-     *    
-     *    $cipher_code = array(
-     *        'init_crypt'    => (string) '', // optional
-     *        'init_encrypt'  => (string) '', // optional
-     *        'init_decrypt'  => (string) '', // optional
-     *        'encrypt_block' => (string) '', // required
-     *        'decrypt_block' => (string) ''  // required
-     *    );
-     *    
-     *
-     * @see self::_setupInlineCrypt()
-     * @see self::encrypt()
-     * @see self::decrypt()
-     * @param array $cipher_code
-     * @access private
-     * @return string (the name of the created callback function)
-     */
-    function _createInlineCryptFunction($cipher_code)
-    {
-        $block_size = $this->block_size;
-
-        // optional
-        $init_crypt    = isset($cipher_code['init_crypt'])    ? $cipher_code['init_crypt']    : '';
-        $init_encrypt  = isset($cipher_code['init_encrypt'])  ? $cipher_code['init_encrypt']  : '';
-        $init_decrypt  = isset($cipher_code['init_decrypt'])  ? $cipher_code['init_decrypt']  : '';
-        // required
-        $encrypt_block = $cipher_code['encrypt_block'];
-        $decrypt_block = $cipher_code['decrypt_block'];
-
-        // Generating mode of operation inline code,
-        // merged with the $cipher_code algorithm
-        // for encrypt- and decryption.
-        switch ($this->mode) {
-            case self::MODE_ECB:
-                $encrypt = $init_encrypt . '
-                    $_ciphertext = "";
-                    $_plaintext_len = strlen($_text);
-
-                    for ($_i = 0; $_i < $_plaintext_len; $_i+= '.$block_size.') {
-                        $in = substr($_text, $_i, '.$block_size.');
-                        '.$encrypt_block.'
-                        $_ciphertext.= $in;
-                    }
-
-                    return $_ciphertext;
-                    ';
-
-                $decrypt = $init_decrypt . '
-                    $_plaintext = "";
-                    $_text = str_pad($_text, strlen($_text) + ('.$block_size.' - strlen($_text) % '.$block_size.') % '.$block_size.', chr(0));
-                    $_ciphertext_len = strlen($_text);
-
-                    for ($_i = 0; $_i < $_ciphertext_len; $_i+= '.$block_size.') {
-                        $in = substr($_text, $_i, '.$block_size.');
-                        '.$decrypt_block.'
-                        $_plaintext.= $in;
-                    }
-
-                    return $self->_unpad($_plaintext);
-                    ';
-                break;
-            case self::MODE_CTR:
-                $encrypt = $init_encrypt . '
-                    $_ciphertext = "";
-                    $_plaintext_len = strlen($_text);
-                    $_xor = $self->encryptIV;
-                    $_buffer = &$self->enbuffer;
-                    if (strlen($_buffer["ciphertext"])) {
-                        for ($_i = 0; $_i < $_plaintext_len; $_i+= '.$block_size.') {
-                            $_block = substr($_text, $_i, '.$block_size.');
-                            if (strlen($_block) > strlen($_buffer["ciphertext"])) {
-                                $in = $_xor;
-                                '.$encrypt_block.'
-                                $self->_increment_str($_xor);
-                                $_buffer["ciphertext"].= $in;
-                            }
-                            $_key = $self->_string_shift($_buffer["ciphertext"], '.$block_size.');
-                            $_ciphertext.= $_block ^ $_key;
-                        }
-                    } else {
-                        for ($_i = 0; $_i < $_plaintext_len; $_i+= '.$block_size.') {
-                            $_block = substr($_text, $_i, '.$block_size.');
-                            $in = $_xor;
-                            '.$encrypt_block.'
-                            $self->_increment_str($_xor);
-                            $_key = $in;
-                            $_ciphertext.= $_block ^ $_key;
-                        }
-                    }
-                    if ($self->continuousBuffer) {
-                        $self->encryptIV = $_xor;
-                        if ($_start = $_plaintext_len % '.$block_size.') {
-                            $_buffer["ciphertext"] = substr($_key, $_start) . $_buffer["ciphertext"];
-                        }
-                    }
-
-                    return $_ciphertext;
-                ';
-
-                $decrypt = $init_encrypt . '
-                    $_plaintext = "";
-                    $_ciphertext_len = strlen($_text);
-                    $_xor = $self->decryptIV;
-                    $_buffer = &$self->debuffer;
-
-                    if (strlen($_buffer["ciphertext"])) {
-                        for ($_i = 0; $_i < $_ciphertext_len; $_i+= '.$block_size.') {
-                            $_block = substr($_text, $_i, '.$block_size.');
-                            if (strlen($_block) > strlen($_buffer["ciphertext"])) {
-                                $in = $_xor;
-                                '.$encrypt_block.'
-                                $self->_increment_str($_xor);
-                                $_buffer["ciphertext"].= $in;
-                            }
-                            $_key = $self->_string_shift($_buffer["ciphertext"], '.$block_size.');
-                            $_plaintext.= $_block ^ $_key;
-                        }
-                    } else {
-                        for ($_i = 0; $_i < $_ciphertext_len; $_i+= '.$block_size.') {
-                            $_block = substr($_text, $_i, '.$block_size.');
-                            $in = $_xor;
-                            '.$encrypt_block.'
-                            $self->_increment_str($_xor);
-                            $_key = $in;
-                            $_plaintext.= $_block ^ $_key;
-                        }
-                    }
-                    if ($self->continuousBuffer) {
-                        $self->decryptIV = $_xor;
-                        if ($_start = $_ciphertext_len % '.$block_size.') {
-                            $_buffer["ciphertext"] = substr($_key, $_start) . $_buffer["ciphertext"];
-                        }
-                    }
-
-                    return $_plaintext;
-                    ';
-                break;
-            case self::MODE_CFB:
-                $encrypt = $init_encrypt . '
-                    $_ciphertext = "";
-                    $_buffer = &$self->enbuffer;
-
-                    if ($self->continuousBuffer) {
-                        $_iv = &$self->encryptIV;
-                        $_pos = &$_buffer["pos"];
-                    } else {
-                        $_iv = $self->encryptIV;
-                        $_pos = 0;
-                    }
-                    $_len = strlen($_text);
-                    $_i = 0;
-                    if ($_pos) {
-                        $_orig_pos = $_pos;
-                        $_max = '.$block_size.' - $_pos;
-                        if ($_len >= $_max) {
-                            $_i = $_max;
-                            $_len-= $_max;
-                            $_pos = 0;
-                        } else {
-                            $_i = $_len;
-                            $_pos+= $_len;
-                            $_len = 0;
-                        }
-                        $_ciphertext = substr($_iv, $_orig_pos) ^ $_text;
-                        $_iv = substr_replace($_iv, $_ciphertext, $_orig_pos, $_i);
-                    }
-                    while ($_len >= '.$block_size.') {
-                        $in = $_iv;
-                        '.$encrypt_block.';
-                        $_iv = $in ^ substr($_text, $_i, '.$block_size.');
-                        $_ciphertext.= $_iv;
-                        $_len-= '.$block_size.';
-                        $_i+= '.$block_size.';
-                    }
-                    if ($_len) {
-                        $in = $_iv;
-                        '.$encrypt_block.'
-                        $_iv = $in;
-                        $_block = $_iv ^ substr($_text, $_i);
-                        $_iv = substr_replace($_iv, $_block, 0, $_len);
-                        $_ciphertext.= $_block;
-                        $_pos = $_len;
-                    }
-                    return $_ciphertext;
-                ';
-
-                $decrypt = $init_encrypt . '
-                    $_plaintext = "";
-                    $_buffer = &$self->debuffer;
-
-                    if ($self->continuousBuffer) {
-                        $_iv = &$self->decryptIV;
-                        $_pos = &$_buffer["pos"];
-                    } else {
-                        $_iv = $self->decryptIV;
-                        $_pos = 0;
-                    }
-                    $_len = strlen($_text);
-                    $_i = 0;
-                    if ($_pos) {
-                        $_orig_pos = $_pos;
-                        $_max = '.$block_size.' - $_pos;
-                        if ($_len >= $_max) {
-                            $_i = $_max;
-                            $_len-= $_max;
-                            $_pos = 0;
-                        } else {
-                            $_i = $_len;
-                            $_pos+= $_len;
-                            $_len = 0;
-                        }
-                        $_plaintext = substr($_iv, $_orig_pos) ^ $_text;
-                        $_iv = substr_replace($_iv, substr($_text, 0, $_i), $_orig_pos, $_i);
-                    }
-                    while ($_len >= '.$block_size.') {
-                        $in = $_iv;
-                        '.$encrypt_block.'
-                        $_iv = $in;
-                        $cb = substr($_text, $_i, '.$block_size.');
-                        $_plaintext.= $_iv ^ $cb;
-                        $_iv = $cb;
-                        $_len-= '.$block_size.';
-                        $_i+= '.$block_size.';
-                    }
-                    if ($_len) {
-                        $in = $_iv;
-                        '.$encrypt_block.'
-                        $_iv = $in;
-                        $_plaintext.= $_iv ^ substr($_text, $_i);
-                        $_iv = substr_replace($_iv, substr($_text, $_i), 0, $_len);
-                        $_pos = $_len;
-                    }
-
-                    return $_plaintext;
-                    ';
-                break;
-            case self::MODE_OFB:
-                $encrypt = $init_encrypt . '
-                    $_ciphertext = "";
-                    $_plaintext_len = strlen($_text);
-                    $_xor = $self->encryptIV;
-                    $_buffer = &$self->enbuffer;
-
-                    if (strlen($_buffer["xor"])) {
-                        for ($_i = 0; $_i < $_plaintext_len; $_i+= '.$block_size.') {
-                            $_block = substr($_text, $_i, '.$block_size.');
-                            if (strlen($_block) > strlen($_buffer["xor"])) {
-                                $in = $_xor;
-                                '.$encrypt_block.'
-                                $_xor = $in;
-                                $_buffer["xor"].= $_xor;
-                            }
-                            $_key = $self->_string_shift($_buffer["xor"], '.$block_size.');
-                            $_ciphertext.= $_block ^ $_key;
-                        }
-                    } else {
-                        for ($_i = 0; $_i < $_plaintext_len; $_i+= '.$block_size.') {
-                            $in = $_xor;
-                            '.$encrypt_block.'
-                            $_xor = $in;
-                            $_ciphertext.= substr($_text, $_i, '.$block_size.') ^ $_xor;
-                        }
-                        $_key = $_xor;
-                    }
-                    if ($self->continuousBuffer) {
-                        $self->encryptIV = $_xor;
-                        if ($_start = $_plaintext_len % '.$block_size.') {
-                             $_buffer["xor"] = substr($_key, $_start) . $_buffer["xor"];
-                        }
-                    }
-                    return $_ciphertext;
-                    ';
-
-                $decrypt = $init_encrypt . '
-                    $_plaintext = "";
-                    $_ciphertext_len = strlen($_text);
-                    $_xor = $self->decryptIV;
-                    $_buffer = &$self->debuffer;
-
-                    if (strlen($_buffer["xor"])) {
-                        for ($_i = 0; $_i < $_ciphertext_len; $_i+= '.$block_size.') {
-                            $_block = substr($_text, $_i, '.$block_size.');
-                            if (strlen($_block) > strlen($_buffer["xor"])) {
-                                $in = $_xor;
-                                '.$encrypt_block.'
-                                $_xor = $in;
-                                $_buffer["xor"].= $_xor;
-                            }
-                            $_key = $self->_string_shift($_buffer["xor"], '.$block_size.');
-                            $_plaintext.= $_block ^ $_key;
-                        }
-                    } else {
-                        for ($_i = 0; $_i < $_ciphertext_len; $_i+= '.$block_size.') {
-                            $in = $_xor;
-                            '.$encrypt_block.'
-                            $_xor = $in;
-                            $_plaintext.= substr($_text, $_i, '.$block_size.') ^ $_xor;
-                        }
-                        $_key = $_xor;
-                    }
-                    if ($self->continuousBuffer) {
-                        $self->decryptIV = $_xor;
-                        if ($_start = $_ciphertext_len % '.$block_size.') {
-                             $_buffer["xor"] = substr($_key, $_start) . $_buffer["xor"];
-                        }
-                    }
-                    return $_plaintext;
-                    ';
-                break;
-            case self::MODE_STREAM:
-                $encrypt = $init_encrypt . '
-                    $_ciphertext = "";
-                    '.$encrypt_block.'
-                    return $_ciphertext;
-                    ';
-                $decrypt = $init_decrypt . '
-                    $_plaintext = "";
-                    '.$decrypt_block.'
-                    return $_plaintext;
-                    ';
-                break;
-            // case self::MODE_CBC:
-            default:
-                $encrypt = $init_encrypt . '
-                    $_ciphertext = "";
-                    $_plaintext_len = strlen($_text);
-
-                    $in = $self->encryptIV;
-
-                    for ($_i = 0; $_i < $_plaintext_len; $_i+= '.$block_size.') {
-                        $in = substr($_text, $_i, '.$block_size.') ^ $in;
-                        '.$encrypt_block.'
-                        $_ciphertext.= $in;
-                    }
-
-                    if ($self->continuousBuffer) {
-                        $self->encryptIV = $in;
-                    }
-
-                    return $_ciphertext;
-                    ';
-
-                $decrypt = $init_decrypt . '
-                    $_plaintext = "";
-                    $_text = str_pad($_text, strlen($_text) + ('.$block_size.' - strlen($_text) % '.$block_size.') % '.$block_size.', chr(0));
-                    $_ciphertext_len = strlen($_text);
-
-                    $_iv = $self->decryptIV;
-
-                    for ($_i = 0; $_i < $_ciphertext_len; $_i+= '.$block_size.') {
-                        $in = $_block = substr($_text, $_i, '.$block_size.');
-                        '.$decrypt_block.'
-                        $_plaintext.= $in ^ $_iv;
-                        $_iv = $_block;
-                    }
-
-                    if ($self->continuousBuffer) {
-                        $self->decryptIV = $_iv;
-                    }
-
-                    return $self->_unpad($_plaintext);
-                    ';
-                break;
-        }
-
-        // Create the $inline function and return its name as string. Ready to run!
-        return create_function('$_action, &$self, $_text', $init_crypt . 'if ($_action == "encrypt") { ' . $encrypt . ' } else { ' . $decrypt . ' }');
-    }
-
-    /**
-     * Holds the lambda_functions table (classwide)
-     *
-     * Each name of the lambda function, created from
-     * _setupInlineCrypt() && _createInlineCryptFunction()
-     * is stored, classwide (!), here for reusing.
-     *
-     * The string-based index of $function is a classwide
-     * unique value representing, at least, the $mode of
-     * operation (or more... depends of the optimizing level)
-     * for which $mode the lambda function was created.
-     *
-     * @access private
-     * @return array &$functions
-     */
-    function &_getLambdaFunctions()
-    {
-        static $functions = array();
-        return $functions;
-    }
-
-    /**
-     * Generates a digest from $bytes
-     *
-     * @see self::_setupInlineCrypt()
-     * @access private
-     * @param $bytes
-     * @return string
-     */
-    function _hashInlineCryptFunction($bytes)
-    {
-        if (!isset(self::$WHIRLPOOL_AVAILABLE)) {
-            self::$WHIRLPOOL_AVAILABLE = extension_loaded('hash') && in_array('whirlpool', hash_algos());
-        }
-
-        $result = '';
-        $hash = $bytes;
-
-        switch (true) {
-            case self::$WHIRLPOOL_AVAILABLE:
-                foreach (str_split($bytes, 64) as $t) {
-                    $hash = hash('whirlpool', $hash, true);
-                    $result .= $t ^ $hash;
-                }
-                return $result . hash('whirlpool', $hash, true);
-            default:
-                $len = strlen($bytes);
-                for ($i = 0; $i < $len; $i+=20) {
-                    $t = substr($bytes, $i, 20);
-                    $hash = pack('H*', sha1($hash));
-                    $result .= $t ^ $hash;
-                }
-                return $result . pack('H*', sha1($hash));
-        }
-    }
-}
diff --git a/mayor-orig/www/include/share/googleapi/phpseclib/phpseclib/phpseclib/Crypt/Blowfish.php b/mayor-orig/www/include/share/googleapi/phpseclib/phpseclib/phpseclib/Crypt/Blowfish.php
deleted file mode 100644
index 19d0a020..00000000
--- a/mayor-orig/www/include/share/googleapi/phpseclib/phpseclib/phpseclib/Crypt/Blowfish.php
+++ /dev/null
@@ -1,577 +0,0 @@
-
- * setKey('12345678901234567890123456789012');
- *
- *    $plaintext = str_repeat('a', 1024);
- *
- *    echo $blowfish->decrypt($blowfish->encrypt($plaintext));
- * ?>
- * 
- *
- * @category  Crypt
- * @package   Blowfish
- * @author    Jim Wigginton 
- * @author    Hans-Juergen Petrich 
- * @copyright 2007 Jim Wigginton
- * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
- * @link      http://phpseclib.sourceforge.net
- */
-
-namespace phpseclib\Crypt;
-
-/**
- * Pure-PHP implementation of Blowfish.
- *
- * @package Blowfish
- * @author  Jim Wigginton 
- * @author  Hans-Juergen Petrich 
- * @access  public
- */
-class Blowfish extends Base
-{
-    /**
-     * Block Length of the cipher
-     *
-     * @see \phpseclib\Crypt\Base::block_size
-     * @var int
-     * @access private
-     */
-    var $block_size = 8;
-
-    /**
-     * The mcrypt specific name of the cipher
-     *
-     * @see \phpseclib\Crypt\Base::cipher_name_mcrypt
-     * @var string
-     * @access private
-     */
-    var $cipher_name_mcrypt = 'blowfish';
-
-    /**
-     * Optimizing value while CFB-encrypting
-     *
-     * @see \phpseclib\Crypt\Base::cfb_init_len
-     * @var int
-     * @access private
-     */
-    var $cfb_init_len = 500;
-
-    /**
-     * The fixed subkeys boxes ($sbox0 - $sbox3) with 256 entries each
-     *
-     * S-Box 0
-     *
-     * @access private
-     * @var    array
-     */
-    var $sbox0 = array(
-        0xd1310ba6, 0x98dfb5ac, 0x2ffd72db, 0xd01adfb7, 0xb8e1afed, 0x6a267e96, 0xba7c9045, 0xf12c7f99,
-        0x24a19947, 0xb3916cf7, 0x0801f2e2, 0x858efc16, 0x636920d8, 0x71574e69, 0xa458fea3, 0xf4933d7e,
-        0x0d95748f, 0x728eb658, 0x718bcd58, 0x82154aee, 0x7b54a41d, 0xc25a59b5, 0x9c30d539, 0x2af26013,
-        0xc5d1b023, 0x286085f0, 0xca417918, 0xb8db38ef, 0x8e79dcb0, 0x603a180e, 0x6c9e0e8b, 0xb01e8a3e,
-        0xd71577c1, 0xbd314b27, 0x78af2fda, 0x55605c60, 0xe65525f3, 0xaa55ab94, 0x57489862, 0x63e81440,
-        0x55ca396a, 0x2aab10b6, 0xb4cc5c34, 0x1141e8ce, 0xa15486af, 0x7c72e993, 0xb3ee1411, 0x636fbc2a,
-        0x2ba9c55d, 0x741831f6, 0xce5c3e16, 0x9b87931e, 0xafd6ba33, 0x6c24cf5c, 0x7a325381, 0x28958677,
-        0x3b8f4898, 0x6b4bb9af, 0xc4bfe81b, 0x66282193, 0x61d809cc, 0xfb21a991, 0x487cac60, 0x5dec8032,
-        0xef845d5d, 0xe98575b1, 0xdc262302, 0xeb651b88, 0x23893e81, 0xd396acc5, 0x0f6d6ff3, 0x83f44239,
-        0x2e0b4482, 0xa4842004, 0x69c8f04a, 0x9e1f9b5e, 0x21c66842, 0xf6e96c9a, 0x670c9c61, 0xabd388f0,
-        0x6a51a0d2, 0xd8542f68, 0x960fa728, 0xab5133a3, 0x6eef0b6c, 0x137a3be4, 0xba3bf050, 0x7efb2a98,
-        0xa1f1651d, 0x39af0176, 0x66ca593e, 0x82430e88, 0x8cee8619, 0x456f9fb4, 0x7d84a5c3, 0x3b8b5ebe,
-        0xe06f75d8, 0x85c12073, 0x401a449f, 0x56c16aa6, 0x4ed3aa62, 0x363f7706, 0x1bfedf72, 0x429b023d,
-        0x37d0d724, 0xd00a1248, 0xdb0fead3, 0x49f1c09b, 0x075372c9, 0x80991b7b, 0x25d479d8, 0xf6e8def7,
-        0xe3fe501a, 0xb6794c3b, 0x976ce0bd, 0x04c006ba, 0xc1a94fb6, 0x409f60c4, 0x5e5c9ec2, 0x196a2463,
-        0x68fb6faf, 0x3e6c53b5, 0x1339b2eb, 0x3b52ec6f, 0x6dfc511f, 0x9b30952c, 0xcc814544, 0xaf5ebd09,
-        0xbee3d004, 0xde334afd, 0x660f2807, 0x192e4bb3, 0xc0cba857, 0x45c8740f, 0xd20b5f39, 0xb9d3fbdb,
-        0x5579c0bd, 0x1a60320a, 0xd6a100c6, 0x402c7279, 0x679f25fe, 0xfb1fa3cc, 0x8ea5e9f8, 0xdb3222f8,
-        0x3c7516df, 0xfd616b15, 0x2f501ec8, 0xad0552ab, 0x323db5fa, 0xfd238760, 0x53317b48, 0x3e00df82,
-        0x9e5c57bb, 0xca6f8ca0, 0x1a87562e, 0xdf1769db, 0xd542a8f6, 0x287effc3, 0xac6732c6, 0x8c4f5573,
-        0x695b27b0, 0xbbca58c8, 0xe1ffa35d, 0xb8f011a0, 0x10fa3d98, 0xfd2183b8, 0x4afcb56c, 0x2dd1d35b,
-        0x9a53e479, 0xb6f84565, 0xd28e49bc, 0x4bfb9790, 0xe1ddf2da, 0xa4cb7e33, 0x62fb1341, 0xcee4c6e8,
-        0xef20cada, 0x36774c01, 0xd07e9efe, 0x2bf11fb4, 0x95dbda4d, 0xae909198, 0xeaad8e71, 0x6b93d5a0,
-        0xd08ed1d0, 0xafc725e0, 0x8e3c5b2f, 0x8e7594b7, 0x8ff6e2fb, 0xf2122b64, 0x8888b812, 0x900df01c,
-        0x4fad5ea0, 0x688fc31c, 0xd1cff191, 0xb3a8c1ad, 0x2f2f2218, 0xbe0e1777, 0xea752dfe, 0x8b021fa1,
-        0xe5a0cc0f, 0xb56f74e8, 0x18acf3d6, 0xce89e299, 0xb4a84fe0, 0xfd13e0b7, 0x7cc43b81, 0xd2ada8d9,
-        0x165fa266, 0x80957705, 0x93cc7314, 0x211a1477, 0xe6ad2065, 0x77b5fa86, 0xc75442f5, 0xfb9d35cf,
-        0xebcdaf0c, 0x7b3e89a0, 0xd6411bd3, 0xae1e7e49, 0x00250e2d, 0x2071b35e, 0x226800bb, 0x57b8e0af,
-        0x2464369b, 0xf009b91e, 0x5563911d, 0x59dfa6aa, 0x78c14389, 0xd95a537f, 0x207d5ba2, 0x02e5b9c5,
-        0x83260376, 0x6295cfa9, 0x11c81968, 0x4e734a41, 0xb3472dca, 0x7b14a94a, 0x1b510052, 0x9a532915,
-        0xd60f573f, 0xbc9bc6e4, 0x2b60a476, 0x81e67400, 0x08ba6fb5, 0x571be91f, 0xf296ec6b, 0x2a0dd915,
-        0xb6636521, 0xe7b9f9b6, 0xff34052e, 0xc5855664, 0x53b02d5d, 0xa99f8fa1, 0x08ba4799, 0x6e85076a
-    );
-
-    /**
-     * S-Box 1
-     *
-     * @access private
-     * @var    array
-     */
-    var $sbox1 = array(
-        0x4b7a70e9, 0xb5b32944, 0xdb75092e, 0xc4192623, 0xad6ea6b0, 0x49a7df7d, 0x9cee60b8, 0x8fedb266,
-        0xecaa8c71, 0x699a17ff, 0x5664526c, 0xc2b19ee1, 0x193602a5, 0x75094c29, 0xa0591340, 0xe4183a3e,
-        0x3f54989a, 0x5b429d65, 0x6b8fe4d6, 0x99f73fd6, 0xa1d29c07, 0xefe830f5, 0x4d2d38e6, 0xf0255dc1,
-        0x4cdd2086, 0x8470eb26, 0x6382e9c6, 0x021ecc5e, 0x09686b3f, 0x3ebaefc9, 0x3c971814, 0x6b6a70a1,
-        0x687f3584, 0x52a0e286, 0xb79c5305, 0xaa500737, 0x3e07841c, 0x7fdeae5c, 0x8e7d44ec, 0x5716f2b8,
-        0xb03ada37, 0xf0500c0d, 0xf01c1f04, 0x0200b3ff, 0xae0cf51a, 0x3cb574b2, 0x25837a58, 0xdc0921bd,
-        0xd19113f9, 0x7ca92ff6, 0x94324773, 0x22f54701, 0x3ae5e581, 0x37c2dadc, 0xc8b57634, 0x9af3dda7,
-        0xa9446146, 0x0fd0030e, 0xecc8c73e, 0xa4751e41, 0xe238cd99, 0x3bea0e2f, 0x3280bba1, 0x183eb331,
-        0x4e548b38, 0x4f6db908, 0x6f420d03, 0xf60a04bf, 0x2cb81290, 0x24977c79, 0x5679b072, 0xbcaf89af,
-        0xde9a771f, 0xd9930810, 0xb38bae12, 0xdccf3f2e, 0x5512721f, 0x2e6b7124, 0x501adde6, 0x9f84cd87,
-        0x7a584718, 0x7408da17, 0xbc9f9abc, 0xe94b7d8c, 0xec7aec3a, 0xdb851dfa, 0x63094366, 0xc464c3d2,
-        0xef1c1847, 0x3215d908, 0xdd433b37, 0x24c2ba16, 0x12a14d43, 0x2a65c451, 0x50940002, 0x133ae4dd,
-        0x71dff89e, 0x10314e55, 0x81ac77d6, 0x5f11199b, 0x043556f1, 0xd7a3c76b, 0x3c11183b, 0x5924a509,
-        0xf28fe6ed, 0x97f1fbfa, 0x9ebabf2c, 0x1e153c6e, 0x86e34570, 0xeae96fb1, 0x860e5e0a, 0x5a3e2ab3,
-        0x771fe71c, 0x4e3d06fa, 0x2965dcb9, 0x99e71d0f, 0x803e89d6, 0x5266c825, 0x2e4cc978, 0x9c10b36a,
-        0xc6150eba, 0x94e2ea78, 0xa5fc3c53, 0x1e0a2df4, 0xf2f74ea7, 0x361d2b3d, 0x1939260f, 0x19c27960,
-        0x5223a708, 0xf71312b6, 0xebadfe6e, 0xeac31f66, 0xe3bc4595, 0xa67bc883, 0xb17f37d1, 0x018cff28,
-        0xc332ddef, 0xbe6c5aa5, 0x65582185, 0x68ab9802, 0xeecea50f, 0xdb2f953b, 0x2aef7dad, 0x5b6e2f84,
-        0x1521b628, 0x29076170, 0xecdd4775, 0x619f1510, 0x13cca830, 0xeb61bd96, 0x0334fe1e, 0xaa0363cf,
-        0xb5735c90, 0x4c70a239, 0xd59e9e0b, 0xcbaade14, 0xeecc86bc, 0x60622ca7, 0x9cab5cab, 0xb2f3846e,
-        0x648b1eaf, 0x19bdf0ca, 0xa02369b9, 0x655abb50, 0x40685a32, 0x3c2ab4b3, 0x319ee9d5, 0xc021b8f7,
-        0x9b540b19, 0x875fa099, 0x95f7997e, 0x623d7da8, 0xf837889a, 0x97e32d77, 0x11ed935f, 0x16681281,
-        0x0e358829, 0xc7e61fd6, 0x96dedfa1, 0x7858ba99, 0x57f584a5, 0x1b227263, 0x9b83c3ff, 0x1ac24696,
-        0xcdb30aeb, 0x532e3054, 0x8fd948e4, 0x6dbc3128, 0x58ebf2ef, 0x34c6ffea, 0xfe28ed61, 0xee7c3c73,
-        0x5d4a14d9, 0xe864b7e3, 0x42105d14, 0x203e13e0, 0x45eee2b6, 0xa3aaabea, 0xdb6c4f15, 0xfacb4fd0,
-        0xc742f442, 0xef6abbb5, 0x654f3b1d, 0x41cd2105, 0xd81e799e, 0x86854dc7, 0xe44b476a, 0x3d816250,
-        0xcf62a1f2, 0x5b8d2646, 0xfc8883a0, 0xc1c7b6a3, 0x7f1524c3, 0x69cb7492, 0x47848a0b, 0x5692b285,
-        0x095bbf00, 0xad19489d, 0x1462b174, 0x23820e00, 0x58428d2a, 0x0c55f5ea, 0x1dadf43e, 0x233f7061,
-        0x3372f092, 0x8d937e41, 0xd65fecf1, 0x6c223bdb, 0x7cde3759, 0xcbee7460, 0x4085f2a7, 0xce77326e,
-        0xa6078084, 0x19f8509e, 0xe8efd855, 0x61d99735, 0xa969a7aa, 0xc50c06c2, 0x5a04abfc, 0x800bcadc,
-        0x9e447a2e, 0xc3453484, 0xfdd56705, 0x0e1e9ec9, 0xdb73dbd3, 0x105588cd, 0x675fda79, 0xe3674340,
-        0xc5c43465, 0x713e38d8, 0x3d28f89e, 0xf16dff20, 0x153e21e7, 0x8fb03d4a, 0xe6e39f2b, 0xdb83adf7
-    );
-
-    /**
-     * S-Box 2
-     *
-     * @access private
-     * @var    array
-     */
-    var $sbox2 = array(
-        0xe93d5a68, 0x948140f7, 0xf64c261c, 0x94692934, 0x411520f7, 0x7602d4f7, 0xbcf46b2e, 0xd4a20068,
-        0xd4082471, 0x3320f46a, 0x43b7d4b7, 0x500061af, 0x1e39f62e, 0x97244546, 0x14214f74, 0xbf8b8840,
-        0x4d95fc1d, 0x96b591af, 0x70f4ddd3, 0x66a02f45, 0xbfbc09ec, 0x03bd9785, 0x7fac6dd0, 0x31cb8504,
-        0x96eb27b3, 0x55fd3941, 0xda2547e6, 0xabca0a9a, 0x28507825, 0x530429f4, 0x0a2c86da, 0xe9b66dfb,
-        0x68dc1462, 0xd7486900, 0x680ec0a4, 0x27a18dee, 0x4f3ffea2, 0xe887ad8c, 0xb58ce006, 0x7af4d6b6,
-        0xaace1e7c, 0xd3375fec, 0xce78a399, 0x406b2a42, 0x20fe9e35, 0xd9f385b9, 0xee39d7ab, 0x3b124e8b,
-        0x1dc9faf7, 0x4b6d1856, 0x26a36631, 0xeae397b2, 0x3a6efa74, 0xdd5b4332, 0x6841e7f7, 0xca7820fb,
-        0xfb0af54e, 0xd8feb397, 0x454056ac, 0xba489527, 0x55533a3a, 0x20838d87, 0xfe6ba9b7, 0xd096954b,
-        0x55a867bc, 0xa1159a58, 0xcca92963, 0x99e1db33, 0xa62a4a56, 0x3f3125f9, 0x5ef47e1c, 0x9029317c,
-        0xfdf8e802, 0x04272f70, 0x80bb155c, 0x05282ce3, 0x95c11548, 0xe4c66d22, 0x48c1133f, 0xc70f86dc,
-        0x07f9c9ee, 0x41041f0f, 0x404779a4, 0x5d886e17, 0x325f51eb, 0xd59bc0d1, 0xf2bcc18f, 0x41113564,
-        0x257b7834, 0x602a9c60, 0xdff8e8a3, 0x1f636c1b, 0x0e12b4c2, 0x02e1329e, 0xaf664fd1, 0xcad18115,
-        0x6b2395e0, 0x333e92e1, 0x3b240b62, 0xeebeb922, 0x85b2a20e, 0xe6ba0d99, 0xde720c8c, 0x2da2f728,
-        0xd0127845, 0x95b794fd, 0x647d0862, 0xe7ccf5f0, 0x5449a36f, 0x877d48fa, 0xc39dfd27, 0xf33e8d1e,
-        0x0a476341, 0x992eff74, 0x3a6f6eab, 0xf4f8fd37, 0xa812dc60, 0xa1ebddf8, 0x991be14c, 0xdb6e6b0d,
-        0xc67b5510, 0x6d672c37, 0x2765d43b, 0xdcd0e804, 0xf1290dc7, 0xcc00ffa3, 0xb5390f92, 0x690fed0b,
-        0x667b9ffb, 0xcedb7d9c, 0xa091cf0b, 0xd9155ea3, 0xbb132f88, 0x515bad24, 0x7b9479bf, 0x763bd6eb,
-        0x37392eb3, 0xcc115979, 0x8026e297, 0xf42e312d, 0x6842ada7, 0xc66a2b3b, 0x12754ccc, 0x782ef11c,
-        0x6a124237, 0xb79251e7, 0x06a1bbe6, 0x4bfb6350, 0x1a6b1018, 0x11caedfa, 0x3d25bdd8, 0xe2e1c3c9,
-        0x44421659, 0x0a121386, 0xd90cec6e, 0xd5abea2a, 0x64af674e, 0xda86a85f, 0xbebfe988, 0x64e4c3fe,
-        0x9dbc8057, 0xf0f7c086, 0x60787bf8, 0x6003604d, 0xd1fd8346, 0xf6381fb0, 0x7745ae04, 0xd736fccc,
-        0x83426b33, 0xf01eab71, 0xb0804187, 0x3c005e5f, 0x77a057be, 0xbde8ae24, 0x55464299, 0xbf582e61,
-        0x4e58f48f, 0xf2ddfda2, 0xf474ef38, 0x8789bdc2, 0x5366f9c3, 0xc8b38e74, 0xb475f255, 0x46fcd9b9,
-        0x7aeb2661, 0x8b1ddf84, 0x846a0e79, 0x915f95e2, 0x466e598e, 0x20b45770, 0x8cd55591, 0xc902de4c,
-        0xb90bace1, 0xbb8205d0, 0x11a86248, 0x7574a99e, 0xb77f19b6, 0xe0a9dc09, 0x662d09a1, 0xc4324633,
-        0xe85a1f02, 0x09f0be8c, 0x4a99a025, 0x1d6efe10, 0x1ab93d1d, 0x0ba5a4df, 0xa186f20f, 0x2868f169,
-        0xdcb7da83, 0x573906fe, 0xa1e2ce9b, 0x4fcd7f52, 0x50115e01, 0xa70683fa, 0xa002b5c4, 0x0de6d027,
-        0x9af88c27, 0x773f8641, 0xc3604c06, 0x61a806b5, 0xf0177a28, 0xc0f586e0, 0x006058aa, 0x30dc7d62,
-        0x11e69ed7, 0x2338ea63, 0x53c2dd94, 0xc2c21634, 0xbbcbee56, 0x90bcb6de, 0xebfc7da1, 0xce591d76,
-        0x6f05e409, 0x4b7c0188, 0x39720a3d, 0x7c927c24, 0x86e3725f, 0x724d9db9, 0x1ac15bb4, 0xd39eb8fc,
-        0xed545578, 0x08fca5b5, 0xd83d7cd3, 0x4dad0fc4, 0x1e50ef5e, 0xb161e6f8, 0xa28514d9, 0x6c51133c,
-        0x6fd5c7e7, 0x56e14ec4, 0x362abfce, 0xddc6c837, 0xd79a3234, 0x92638212, 0x670efa8e, 0x406000e0
-    );
-
-    /**
-     * S-Box 3
-     *
-     * @access private
-     * @var    array
-     */
-    var $sbox3 = array(
-        0x3a39ce37, 0xd3faf5cf, 0xabc27737, 0x5ac52d1b, 0x5cb0679e, 0x4fa33742, 0xd3822740, 0x99bc9bbe,
-        0xd5118e9d, 0xbf0f7315, 0xd62d1c7e, 0xc700c47b, 0xb78c1b6b, 0x21a19045, 0xb26eb1be, 0x6a366eb4,
-        0x5748ab2f, 0xbc946e79, 0xc6a376d2, 0x6549c2c8, 0x530ff8ee, 0x468dde7d, 0xd5730a1d, 0x4cd04dc6,
-        0x2939bbdb, 0xa9ba4650, 0xac9526e8, 0xbe5ee304, 0xa1fad5f0, 0x6a2d519a, 0x63ef8ce2, 0x9a86ee22,
-        0xc089c2b8, 0x43242ef6, 0xa51e03aa, 0x9cf2d0a4, 0x83c061ba, 0x9be96a4d, 0x8fe51550, 0xba645bd6,
-        0x2826a2f9, 0xa73a3ae1, 0x4ba99586, 0xef5562e9, 0xc72fefd3, 0xf752f7da, 0x3f046f69, 0x77fa0a59,
-        0x80e4a915, 0x87b08601, 0x9b09e6ad, 0x3b3ee593, 0xe990fd5a, 0x9e34d797, 0x2cf0b7d9, 0x022b8b51,
-        0x96d5ac3a, 0x017da67d, 0xd1cf3ed6, 0x7c7d2d28, 0x1f9f25cf, 0xadf2b89b, 0x5ad6b472, 0x5a88f54c,
-        0xe029ac71, 0xe019a5e6, 0x47b0acfd, 0xed93fa9b, 0xe8d3c48d, 0x283b57cc, 0xf8d56629, 0x79132e28,
-        0x785f0191, 0xed756055, 0xf7960e44, 0xe3d35e8c, 0x15056dd4, 0x88f46dba, 0x03a16125, 0x0564f0bd,
-        0xc3eb9e15, 0x3c9057a2, 0x97271aec, 0xa93a072a, 0x1b3f6d9b, 0x1e6321f5, 0xf59c66fb, 0x26dcf319,
-        0x7533d928, 0xb155fdf5, 0x03563482, 0x8aba3cbb, 0x28517711, 0xc20ad9f8, 0xabcc5167, 0xccad925f,
-        0x4de81751, 0x3830dc8e, 0x379d5862, 0x9320f991, 0xea7a90c2, 0xfb3e7bce, 0x5121ce64, 0x774fbe32,
-        0xa8b6e37e, 0xc3293d46, 0x48de5369, 0x6413e680, 0xa2ae0810, 0xdd6db224, 0x69852dfd, 0x09072166,
-        0xb39a460a, 0x6445c0dd, 0x586cdecf, 0x1c20c8ae, 0x5bbef7dd, 0x1b588d40, 0xccd2017f, 0x6bb4e3bb,
-        0xdda26a7e, 0x3a59ff45, 0x3e350a44, 0xbcb4cdd5, 0x72eacea8, 0xfa6484bb, 0x8d6612ae, 0xbf3c6f47,
-        0xd29be463, 0x542f5d9e, 0xaec2771b, 0xf64e6370, 0x740e0d8d, 0xe75b1357, 0xf8721671, 0xaf537d5d,
-        0x4040cb08, 0x4eb4e2cc, 0x34d2466a, 0x0115af84, 0xe1b00428, 0x95983a1d, 0x06b89fb4, 0xce6ea048,
-        0x6f3f3b82, 0x3520ab82, 0x011a1d4b, 0x277227f8, 0x611560b1, 0xe7933fdc, 0xbb3a792b, 0x344525bd,
-        0xa08839e1, 0x51ce794b, 0x2f32c9b7, 0xa01fbac9, 0xe01cc87e, 0xbcc7d1f6, 0xcf0111c3, 0xa1e8aac7,
-        0x1a908749, 0xd44fbd9a, 0xd0dadecb, 0xd50ada38, 0x0339c32a, 0xc6913667, 0x8df9317c, 0xe0b12b4f,
-        0xf79e59b7, 0x43f5bb3a, 0xf2d519ff, 0x27d9459c, 0xbf97222c, 0x15e6fc2a, 0x0f91fc71, 0x9b941525,
-        0xfae59361, 0xceb69ceb, 0xc2a86459, 0x12baa8d1, 0xb6c1075e, 0xe3056a0c, 0x10d25065, 0xcb03a442,
-        0xe0ec6e0e, 0x1698db3b, 0x4c98a0be, 0x3278e964, 0x9f1f9532, 0xe0d392df, 0xd3a0342b, 0x8971f21e,
-        0x1b0a7441, 0x4ba3348c, 0xc5be7120, 0xc37632d8, 0xdf359f8d, 0x9b992f2e, 0xe60b6f47, 0x0fe3f11d,
-        0xe54cda54, 0x1edad891, 0xce6279cf, 0xcd3e7e6f, 0x1618b166, 0xfd2c1d05, 0x848fd2c5, 0xf6fb2299,
-        0xf523f357, 0xa6327623, 0x93a83531, 0x56cccd02, 0xacf08162, 0x5a75ebb5, 0x6e163697, 0x88d273cc,
-        0xde966292, 0x81b949d0, 0x4c50901b, 0x71c65614, 0xe6c6c7bd, 0x327a140a, 0x45e1d006, 0xc3f27b9a,
-        0xc9aa53fd, 0x62a80f00, 0xbb25bfe2, 0x35bdd2f6, 0x71126905, 0xb2040222, 0xb6cbcf7c, 0xcd769c2b,
-        0x53113ec0, 0x1640e3d3, 0x38abbd60, 0x2547adf0, 0xba38209c, 0xf746ce76, 0x77afa1c5, 0x20756060,
-        0x85cbfe4e, 0x8ae88dd8, 0x7aaaf9b0, 0x4cf9aa7e, 0x1948c25c, 0x02fb8a8c, 0x01c36ae4, 0xd6ebe1f9,
-        0x90d4f869, 0xa65cdea0, 0x3f09252d, 0xc208e69f, 0xb74e6132, 0xce77e25b, 0x578fdfe3, 0x3ac372e6
-    );
-
-    /**
-     * P-Array consists of 18 32-bit subkeys
-     *
-     * @var array
-     * @access private
-     */
-    var $parray = array(
-        0x243f6a88, 0x85a308d3, 0x13198a2e, 0x03707344, 0xa4093822, 0x299f31d0,
-        0x082efa98, 0xec4e6c89, 0x452821e6, 0x38d01377, 0xbe5466cf, 0x34e90c6c,
-        0xc0ac29b7, 0xc97c50dd, 0x3f84d5b5, 0xb5470917, 0x9216d5d9, 0x8979fb1b
-    );
-
-    /**
-     * The BCTX-working Array
-     *
-     * Holds the expanded key [p] and the key-depended s-boxes [sb]
-     *
-     * @var array
-     * @access private
-     */
-    var $bctx;
-
-    /**
-     * Holds the last used key
-     *
-     * @var array
-     * @access private
-     */
-    var $kl;
-
-    /**
-     * The Key Length (in bytes)
-     *
-     * @see \phpseclib\Crypt\Base::setKeyLength()
-     * @var int
-     * @access private
-     * @internal The max value is 256 / 8 = 32, the min value is 128 / 8 = 16.  Exists in conjunction with $Nk
-     *    because the encryption / decryption / key schedule creation requires this number and not $key_length.  We could
-     *    derive this from $key_length or vice versa, but that'd mean we'd have to do multiple shift operations, so in lieu
-     *    of that, we'll just precompute it once.
-     */
-    var $key_length = 16;
-
-    /**
-     * Sets the key length.
-     *
-     * Key lengths can be between 32 and 448 bits.
-     *
-     * @access public
-     * @param int $length
-     */
-    function setKeyLength($length)
-    {
-        if ($length < 32) {
-            $this->key_length = 7;
-        } elseif ($length > 448) {
-            $this->key_length = 56;
-        } else {
-            $this->key_length = $length >> 3;
-        }
-
-        parent::setKeyLength($length);
-    }
-
-    /**
-     * Test for engine validity
-     *
-     * This is mainly just a wrapper to set things up for \phpseclib\Crypt\Base::isValidEngine()
-     *
-     * @see \phpseclib\Crypt\Base::isValidEngine()
-     * @param int $engine
-     * @access public
-     * @return bool
-     */
-    function isValidEngine($engine)
-    {
-        if ($engine == self::ENGINE_OPENSSL) {
-            if (version_compare(PHP_VERSION, '5.3.7') < 0 && $this->key_length != 16) {
-                return false;
-            }
-            if ($this->key_length < 16) {
-                return false;
-            }
-            $this->cipher_name_openssl_ecb = 'bf-ecb';
-            $this->cipher_name_openssl = 'bf-' . $this->_openssl_translate_mode();
-        }
-
-        return parent::isValidEngine($engine);
-    }
-
-    /**
-     * Setup the key (expansion)
-     *
-     * @see \phpseclib\Crypt\Base::_setupKey()
-     * @access private
-     */
-    function _setupKey()
-    {
-        if (isset($this->kl['key']) && $this->key === $this->kl['key']) {
-            // already expanded
-            return;
-        }
-        $this->kl = array('key' => $this->key);
-
-        /* key-expanding p[] and S-Box building sb[] */
-        $this->bctx = array(
-            'p'  => array(),
-            'sb' => array(
-                $this->sbox0,
-                $this->sbox1,
-                $this->sbox2,
-                $this->sbox3
-            )
-        );
-
-        // unpack binary string in unsigned chars
-        $key  = array_values(unpack('C*', $this->key));
-        $keyl = count($key);
-        for ($j = 0, $i = 0; $i < 18; ++$i) {
-            // xor P1 with the first 32-bits of the key, xor P2 with the second 32-bits ...
-            for ($data = 0, $k = 0; $k < 4; ++$k) {
-                $data = ($data << 8) | $key[$j];
-                if (++$j >= $keyl) {
-                    $j = 0;
-                }
-            }
-            $this->bctx['p'][] = $this->parray[$i] ^ $data;
-        }
-
-        // encrypt the zero-string, replace P1 and P2 with the encrypted data,
-        // encrypt P3 and P4 with the new P1 and P2, do it with all P-array and subkeys
-        $data = "\0\0\0\0\0\0\0\0";
-        for ($i = 0; $i < 18; $i += 2) {
-            list($l, $r) = array_values(unpack('N*', $data = $this->_encryptBlock($data)));
-            $this->bctx['p'][$i    ] = $l;
-            $this->bctx['p'][$i + 1] = $r;
-        }
-        for ($i = 0; $i < 4; ++$i) {
-            for ($j = 0; $j < 256; $j += 2) {
-                list($l, $r) = array_values(unpack('N*', $data = $this->_encryptBlock($data)));
-                $this->bctx['sb'][$i][$j    ] = $l;
-                $this->bctx['sb'][$i][$j + 1] = $r;
-            }
-        }
-    }
-
-    /**
-     * Encrypts a block
-     *
-     * @access private
-     * @param string $in
-     * @return string
-     */
-    function _encryptBlock($in)
-    {
-        $p = $this->bctx["p"];
-        // extract($this->bctx["sb"], EXTR_PREFIX_ALL, "sb"); // slower
-        $sb_0 = $this->bctx["sb"][0];
-        $sb_1 = $this->bctx["sb"][1];
-        $sb_2 = $this->bctx["sb"][2];
-        $sb_3 = $this->bctx["sb"][3];
-
-        $in = unpack("N*", $in);
-        $l = $in[1];
-        $r = $in[2];
-
-        for ($i = 0; $i < 16; $i+= 2) {
-            $l^= $p[$i];
-            $r^= ($sb_0[$l >> 24 & 0xff]  +
-                  $sb_1[$l >> 16 & 0xff]  ^
-                  $sb_2[$l >>  8 & 0xff]) +
-                  $sb_3[$l       & 0xff];
-
-            $r^= $p[$i + 1];
-            $l^= ($sb_0[$r >> 24 & 0xff]  +
-                  $sb_1[$r >> 16 & 0xff]  ^
-                  $sb_2[$r >>  8 & 0xff]) +
-                  $sb_3[$r       & 0xff];
-        }
-        return pack("N*", $r ^ $p[17], $l ^ $p[16]);
-    }
-
-    /**
-     * Decrypts a block
-     *
-     * @access private
-     * @param string $in
-     * @return string
-     */
-    function _decryptBlock($in)
-    {
-        $p = $this->bctx["p"];
-        $sb_0 = $this->bctx["sb"][0];
-        $sb_1 = $this->bctx["sb"][1];
-        $sb_2 = $this->bctx["sb"][2];
-        $sb_3 = $this->bctx["sb"][3];
-
-        $in = unpack("N*", $in);
-        $l = $in[1];
-        $r = $in[2];
-
-        for ($i = 17; $i > 2; $i-= 2) {
-            $l^= $p[$i];
-            $r^= ($sb_0[$l >> 24 & 0xff]  +
-                  $sb_1[$l >> 16 & 0xff]  ^
-                  $sb_2[$l >>  8 & 0xff]) +
-                  $sb_3[$l       & 0xff];
-
-            $r^= $p[$i - 1];
-            $l^= ($sb_0[$r >> 24 & 0xff]  +
-                  $sb_1[$r >> 16 & 0xff]  ^
-                  $sb_2[$r >>  8 & 0xff]) +
-                  $sb_3[$r       & 0xff];
-        }
-        return pack("N*", $r ^ $p[0], $l ^ $p[1]);
-    }
-
-    /**
-     * Setup the performance-optimized function for de/encrypt()
-     *
-     * @see \phpseclib\Crypt\Base::_setupInlineCrypt()
-     * @access private
-     */
-    function _setupInlineCrypt()
-    {
-        $lambda_functions =& self::_getLambdaFunctions();
-
-        // We create max. 10 hi-optimized code for memory reason. Means: For each $key one ultra fast inline-crypt function.
-        // (Currently, for Blowfish, one generated $lambda_function cost on php5.5@32bit ~100kb unfreeable mem and ~180kb on php5.5@64bit)
-        // After that, we'll still create very fast optimized code but not the hi-ultimative code, for each $mode one.
-        $gen_hi_opt_code = (bool)(count($lambda_functions) < 10);
-
-        // Generation of a unique hash for our generated code
-        $code_hash = "Crypt_Blowfish, {$this->mode}";
-        if ($gen_hi_opt_code) {
-            $code_hash = str_pad($code_hash, 32) . $this->_hashInlineCryptFunction($this->key);
-        }
-
-        if (!isset($lambda_functions[$code_hash])) {
-            switch (true) {
-                case $gen_hi_opt_code:
-                    $p = $this->bctx['p'];
-                    $init_crypt = '
-                        static $sb_0, $sb_1, $sb_2, $sb_3;
-                        if (!$sb_0) {
-                            $sb_0 = $self->bctx["sb"][0];
-                            $sb_1 = $self->bctx["sb"][1];
-                            $sb_2 = $self->bctx["sb"][2];
-                            $sb_3 = $self->bctx["sb"][3];
-                        }
-                    ';
-                    break;
-                default:
-                    $p   = array();
-                    for ($i = 0; $i < 18; ++$i) {
-                        $p[] = '$p_' . $i;
-                    }
-                    $init_crypt = '
-                        list($sb_0, $sb_1, $sb_2, $sb_3) = $self->bctx["sb"];
-                        list(' . implode(',', $p) . ') = $self->bctx["p"];
-
-                    ';
-            }
-
-            // Generating encrypt code:
-            $encrypt_block = '
-                $in = unpack("N*", $in);
-                $l = $in[1];
-                $r = $in[2];
-            ';
-            for ($i = 0; $i < 16; $i+= 2) {
-                $encrypt_block.= '
-                    $l^= ' . $p[$i] . ';
-                    $r^= ($sb_0[$l >> 24 & 0xff]  +
-                          $sb_1[$l >> 16 & 0xff]  ^
-                          $sb_2[$l >>  8 & 0xff]) +
-                          $sb_3[$l       & 0xff];
-
-                    $r^= ' . $p[$i + 1] . ';
-                    $l^= ($sb_0[$r >> 24 & 0xff]  +
-                          $sb_1[$r >> 16 & 0xff]  ^
-                          $sb_2[$r >>  8 & 0xff]) +
-                          $sb_3[$r       & 0xff];
-                ';
-            }
-            $encrypt_block.= '
-                $in = pack("N*",
-                    $r ^ ' . $p[17] . ',
-                    $l ^ ' . $p[16] . '
-                );
-            ';
-
-            // Generating decrypt code:
-            $decrypt_block = '
-                $in = unpack("N*", $in);
-                $l = $in[1];
-                $r = $in[2];
-            ';
-
-            for ($i = 17; $i > 2; $i-= 2) {
-                $decrypt_block.= '
-                    $l^= ' . $p[$i] . ';
-                    $r^= ($sb_0[$l >> 24 & 0xff]  +
-                          $sb_1[$l >> 16 & 0xff]  ^
-                          $sb_2[$l >>  8 & 0xff]) +
-                          $sb_3[$l       & 0xff];
-
-                    $r^= ' . $p[$i - 1] . ';
-                    $l^= ($sb_0[$r >> 24 & 0xff]  +
-                          $sb_1[$r >> 16 & 0xff]  ^
-                          $sb_2[$r >>  8 & 0xff]) +
-                          $sb_3[$r       & 0xff];
-                ';
-            }
-
-            $decrypt_block.= '
-                $in = pack("N*",
-                    $r ^ ' . $p[0] . ',
-                    $l ^ ' . $p[1] . '
-                );
-            ';
-
-            $lambda_functions[$code_hash] = $this->_createInlineCryptFunction(
-                array(
-                   'init_crypt'    => $init_crypt,
-                   'init_encrypt'  => '',
-                   'init_decrypt'  => '',
-                   'encrypt_block' => $encrypt_block,
-                   'decrypt_block' => $decrypt_block
-                )
-            );
-        }
-        $this->inline_crypt = $lambda_functions[$code_hash];
-    }
-}
diff --git a/mayor-orig/www/include/share/googleapi/phpseclib/phpseclib/phpseclib/Crypt/DES.php b/mayor-orig/www/include/share/googleapi/phpseclib/phpseclib/phpseclib/Crypt/DES.php
deleted file mode 100644
index 51220469..00000000
--- a/mayor-orig/www/include/share/googleapi/phpseclib/phpseclib/phpseclib/Crypt/DES.php
+++ /dev/null
@@ -1,1443 +0,0 @@
-
- * setKey('abcdefgh');
- *
- *    $size = 10 * 1024;
- *    $plaintext = '';
- *    for ($i = 0; $i < $size; $i++) {
- *        $plaintext.= 'a';
- *    }
- *
- *    echo $des->decrypt($des->encrypt($plaintext));
- * ?>
- * 
- *
- * @category  Crypt
- * @package   DES
- * @author    Jim Wigginton 
- * @copyright 2007 Jim Wigginton
- * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
- * @link      http://phpseclib.sourceforge.net
- */
-
-namespace phpseclib\Crypt;
-
-/**
- * Pure-PHP implementation of DES.
- *
- * @package DES
- * @author  Jim Wigginton 
- * @access  public
- */
-class DES extends Base
-{
-    /**#@+
-     * @access private
-     * @see \phpseclib\Crypt\DES::_setupKey()
-     * @see \phpseclib\Crypt\DES::_processBlock()
-     */
-    /**
-     * Contains $keys[self::ENCRYPT]
-     */
-    const ENCRYPT = 0;
-    /**
-     * Contains $keys[self::DECRYPT]
-     */
-    const DECRYPT = 1;
-    /**#@-*/
-
-    /**
-     * Block Length of the cipher
-     *
-     * @see \phpseclib\Crypt\Base::block_size
-     * @var int
-     * @access private
-     */
-    var $block_size = 8;
-
-    /**
-     * Key Length (in bytes)
-     *
-     * @see \phpseclib\Crypt\Base::setKeyLength()
-     * @var int
-     * @access private
-     */
-    var $key_length = 8;
-
-    /**
-     * The mcrypt specific name of the cipher
-     *
-     * @see \phpseclib\Crypt\Base::cipher_name_mcrypt
-     * @var string
-     * @access private
-     */
-    var $cipher_name_mcrypt = 'des';
-
-    /**
-     * The OpenSSL names of the cipher / modes
-     *
-     * @see \phpseclib\Crypt\Base::openssl_mode_names
-     * @var array
-     * @access private
-     */
-    var $openssl_mode_names = array(
-        self::MODE_ECB => 'des-ecb',
-        self::MODE_CBC => 'des-cbc',
-        self::MODE_CFB => 'des-cfb',
-        self::MODE_OFB => 'des-ofb'
-        // self::MODE_CTR is undefined for DES
-    );
-
-    /**
-     * Optimizing value while CFB-encrypting
-     *
-     * @see \phpseclib\Crypt\Base::cfb_init_len
-     * @var int
-     * @access private
-     */
-    var $cfb_init_len = 500;
-
-    /**
-     * Switch for DES/3DES encryption
-     *
-     * Used only if $engine == self::ENGINE_INTERNAL
-     *
-     * @see self::_setupKey()
-     * @see self::_processBlock()
-     * @var int
-     * @access private
-     */
-    var $des_rounds = 1;
-
-    /**
-     * max possible size of $key
-     *
-     * @see self::setKey()
-     * @var string
-     * @access private
-     */
-    var $key_length_max = 8;
-
-    /**
-     * The Key Schedule
-     *
-     * @see self::_setupKey()
-     * @var array
-     * @access private
-     */
-    var $keys;
-
-    /**
-     * Shuffle table.
-     *
-     * For each byte value index, the entry holds an 8-byte string
-     * with each byte containing all bits in the same state as the
-     * corresponding bit in the index value.
-     *
-     * @see self::_processBlock()
-     * @see self::_setupKey()
-     * @var array
-     * @access private
-     */
-    var $shuffle = array(
-        "\x00\x00\x00\x00\x00\x00\x00\x00", "\x00\x00\x00\x00\x00\x00\x00\xFF",
-        "\x00\x00\x00\x00\x00\x00\xFF\x00", "\x00\x00\x00\x00\x00\x00\xFF\xFF",
-        "\x00\x00\x00\x00\x00\xFF\x00\x00", "\x00\x00\x00\x00\x00\xFF\x00\xFF",
-        "\x00\x00\x00\x00\x00\xFF\xFF\x00", "\x00\x00\x00\x00\x00\xFF\xFF\xFF",
-        "\x00\x00\x00\x00\xFF\x00\x00\x00", "\x00\x00\x00\x00\xFF\x00\x00\xFF",
-        "\x00\x00\x00\x00\xFF\x00\xFF\x00", "\x00\x00\x00\x00\xFF\x00\xFF\xFF",
-        "\x00\x00\x00\x00\xFF\xFF\x00\x00", "\x00\x00\x00\x00\xFF\xFF\x00\xFF",
-        "\x00\x00\x00\x00\xFF\xFF\xFF\x00", "\x00\x00\x00\x00\xFF\xFF\xFF\xFF",
-        "\x00\x00\x00\xFF\x00\x00\x00\x00", "\x00\x00\x00\xFF\x00\x00\x00\xFF",
-        "\x00\x00\x00\xFF\x00\x00\xFF\x00", "\x00\x00\x00\xFF\x00\x00\xFF\xFF",
-        "\x00\x00\x00\xFF\x00\xFF\x00\x00", "\x00\x00\x00\xFF\x00\xFF\x00\xFF",
-        "\x00\x00\x00\xFF\x00\xFF\xFF\x00", "\x00\x00\x00\xFF\x00\xFF\xFF\xFF",
-        "\x00\x00\x00\xFF\xFF\x00\x00\x00", "\x00\x00\x00\xFF\xFF\x00\x00\xFF",
-        "\x00\x00\x00\xFF\xFF\x00\xFF\x00", "\x00\x00\x00\xFF\xFF\x00\xFF\xFF",
-        "\x00\x00\x00\xFF\xFF\xFF\x00\x00", "\x00\x00\x00\xFF\xFF\xFF\x00\xFF",
-        "\x00\x00\x00\xFF\xFF\xFF\xFF\x00", "\x00\x00\x00\xFF\xFF\xFF\xFF\xFF",
-        "\x00\x00\xFF\x00\x00\x00\x00\x00", "\x00\x00\xFF\x00\x00\x00\x00\xFF",
-        "\x00\x00\xFF\x00\x00\x00\xFF\x00", "\x00\x00\xFF\x00\x00\x00\xFF\xFF",
-        "\x00\x00\xFF\x00\x00\xFF\x00\x00", "\x00\x00\xFF\x00\x00\xFF\x00\xFF",
-        "\x00\x00\xFF\x00\x00\xFF\xFF\x00", "\x00\x00\xFF\x00\x00\xFF\xFF\xFF",
-        "\x00\x00\xFF\x00\xFF\x00\x00\x00", "\x00\x00\xFF\x00\xFF\x00\x00\xFF",
-        "\x00\x00\xFF\x00\xFF\x00\xFF\x00", "\x00\x00\xFF\x00\xFF\x00\xFF\xFF",
-        "\x00\x00\xFF\x00\xFF\xFF\x00\x00", "\x00\x00\xFF\x00\xFF\xFF\x00\xFF",
-        "\x00\x00\xFF\x00\xFF\xFF\xFF\x00", "\x00\x00\xFF\x00\xFF\xFF\xFF\xFF",
-        "\x00\x00\xFF\xFF\x00\x00\x00\x00", "\x00\x00\xFF\xFF\x00\x00\x00\xFF",
-        "\x00\x00\xFF\xFF\x00\x00\xFF\x00", "\x00\x00\xFF\xFF\x00\x00\xFF\xFF",
-        "\x00\x00\xFF\xFF\x00\xFF\x00\x00", "\x00\x00\xFF\xFF\x00\xFF\x00\xFF",
-        "\x00\x00\xFF\xFF\x00\xFF\xFF\x00", "\x00\x00\xFF\xFF\x00\xFF\xFF\xFF",
-        "\x00\x00\xFF\xFF\xFF\x00\x00\x00", "\x00\x00\xFF\xFF\xFF\x00\x00\xFF",
-        "\x00\x00\xFF\xFF\xFF\x00\xFF\x00", "\x00\x00\xFF\xFF\xFF\x00\xFF\xFF",
-        "\x00\x00\xFF\xFF\xFF\xFF\x00\x00", "\x00\x00\xFF\xFF\xFF\xFF\x00\xFF",
-        "\x00\x00\xFF\xFF\xFF\xFF\xFF\x00", "\x00\x00\xFF\xFF\xFF\xFF\xFF\xFF",
-        "\x00\xFF\x00\x00\x00\x00\x00\x00", "\x00\xFF\x00\x00\x00\x00\x00\xFF",
-        "\x00\xFF\x00\x00\x00\x00\xFF\x00", "\x00\xFF\x00\x00\x00\x00\xFF\xFF",
-        "\x00\xFF\x00\x00\x00\xFF\x00\x00", "\x00\xFF\x00\x00\x00\xFF\x00\xFF",
-        "\x00\xFF\x00\x00\x00\xFF\xFF\x00", "\x00\xFF\x00\x00\x00\xFF\xFF\xFF",
-        "\x00\xFF\x00\x00\xFF\x00\x00\x00", "\x00\xFF\x00\x00\xFF\x00\x00\xFF",
-        "\x00\xFF\x00\x00\xFF\x00\xFF\x00", "\x00\xFF\x00\x00\xFF\x00\xFF\xFF",
-        "\x00\xFF\x00\x00\xFF\xFF\x00\x00", "\x00\xFF\x00\x00\xFF\xFF\x00\xFF",
-        "\x00\xFF\x00\x00\xFF\xFF\xFF\x00", "\x00\xFF\x00\x00\xFF\xFF\xFF\xFF",
-        "\x00\xFF\x00\xFF\x00\x00\x00\x00", "\x00\xFF\x00\xFF\x00\x00\x00\xFF",
-        "\x00\xFF\x00\xFF\x00\x00\xFF\x00", "\x00\xFF\x00\xFF\x00\x00\xFF\xFF",
-        "\x00\xFF\x00\xFF\x00\xFF\x00\x00", "\x00\xFF\x00\xFF\x00\xFF\x00\xFF",
-        "\x00\xFF\x00\xFF\x00\xFF\xFF\x00", "\x00\xFF\x00\xFF\x00\xFF\xFF\xFF",
-        "\x00\xFF\x00\xFF\xFF\x00\x00\x00", "\x00\xFF\x00\xFF\xFF\x00\x00\xFF",
-        "\x00\xFF\x00\xFF\xFF\x00\xFF\x00", "\x00\xFF\x00\xFF\xFF\x00\xFF\xFF",
-        "\x00\xFF\x00\xFF\xFF\xFF\x00\x00", "\x00\xFF\x00\xFF\xFF\xFF\x00\xFF",
-        "\x00\xFF\x00\xFF\xFF\xFF\xFF\x00", "\x00\xFF\x00\xFF\xFF\xFF\xFF\xFF",
-        "\x00\xFF\xFF\x00\x00\x00\x00\x00", "\x00\xFF\xFF\x00\x00\x00\x00\xFF",
-        "\x00\xFF\xFF\x00\x00\x00\xFF\x00", "\x00\xFF\xFF\x00\x00\x00\xFF\xFF",
-        "\x00\xFF\xFF\x00\x00\xFF\x00\x00", "\x00\xFF\xFF\x00\x00\xFF\x00\xFF",
-        "\x00\xFF\xFF\x00\x00\xFF\xFF\x00", "\x00\xFF\xFF\x00\x00\xFF\xFF\xFF",
-        "\x00\xFF\xFF\x00\xFF\x00\x00\x00", "\x00\xFF\xFF\x00\xFF\x00\x00\xFF",
-        "\x00\xFF\xFF\x00\xFF\x00\xFF\x00", "\x00\xFF\xFF\x00\xFF\x00\xFF\xFF",
-        "\x00\xFF\xFF\x00\xFF\xFF\x00\x00", "\x00\xFF\xFF\x00\xFF\xFF\x00\xFF",
-        "\x00\xFF\xFF\x00\xFF\xFF\xFF\x00", "\x00\xFF\xFF\x00\xFF\xFF\xFF\xFF",
-        "\x00\xFF\xFF\xFF\x00\x00\x00\x00", "\x00\xFF\xFF\xFF\x00\x00\x00\xFF",
-        "\x00\xFF\xFF\xFF\x00\x00\xFF\x00", "\x00\xFF\xFF\xFF\x00\x00\xFF\xFF",
-        "\x00\xFF\xFF\xFF\x00\xFF\x00\x00", "\x00\xFF\xFF\xFF\x00\xFF\x00\xFF",
-        "\x00\xFF\xFF\xFF\x00\xFF\xFF\x00", "\x00\xFF\xFF\xFF\x00\xFF\xFF\xFF",
-        "\x00\xFF\xFF\xFF\xFF\x00\x00\x00", "\x00\xFF\xFF\xFF\xFF\x00\x00\xFF",
-        "\x00\xFF\xFF\xFF\xFF\x00\xFF\x00", "\x00\xFF\xFF\xFF\xFF\x00\xFF\xFF",
-        "\x00\xFF\xFF\xFF\xFF\xFF\x00\x00", "\x00\xFF\xFF\xFF\xFF\xFF\x00\xFF",
-        "\x00\xFF\xFF\xFF\xFF\xFF\xFF\x00", "\x00\xFF\xFF\xFF\xFF\xFF\xFF\xFF",
-        "\xFF\x00\x00\x00\x00\x00\x00\x00", "\xFF\x00\x00\x00\x00\x00\x00\xFF",
-        "\xFF\x00\x00\x00\x00\x00\xFF\x00", "\xFF\x00\x00\x00\x00\x00\xFF\xFF",
-        "\xFF\x00\x00\x00\x00\xFF\x00\x00", "\xFF\x00\x00\x00\x00\xFF\x00\xFF",
-        "\xFF\x00\x00\x00\x00\xFF\xFF\x00", "\xFF\x00\x00\x00\x00\xFF\xFF\xFF",
-        "\xFF\x00\x00\x00\xFF\x00\x00\x00", "\xFF\x00\x00\x00\xFF\x00\x00\xFF",
-        "\xFF\x00\x00\x00\xFF\x00\xFF\x00", "\xFF\x00\x00\x00\xFF\x00\xFF\xFF",
-        "\xFF\x00\x00\x00\xFF\xFF\x00\x00", "\xFF\x00\x00\x00\xFF\xFF\x00\xFF",
-        "\xFF\x00\x00\x00\xFF\xFF\xFF\x00", "\xFF\x00\x00\x00\xFF\xFF\xFF\xFF",
-        "\xFF\x00\x00\xFF\x00\x00\x00\x00", "\xFF\x00\x00\xFF\x00\x00\x00\xFF",
-        "\xFF\x00\x00\xFF\x00\x00\xFF\x00", "\xFF\x00\x00\xFF\x00\x00\xFF\xFF",
-        "\xFF\x00\x00\xFF\x00\xFF\x00\x00", "\xFF\x00\x00\xFF\x00\xFF\x00\xFF",
-        "\xFF\x00\x00\xFF\x00\xFF\xFF\x00", "\xFF\x00\x00\xFF\x00\xFF\xFF\xFF",
-        "\xFF\x00\x00\xFF\xFF\x00\x00\x00", "\xFF\x00\x00\xFF\xFF\x00\x00\xFF",
-        "\xFF\x00\x00\xFF\xFF\x00\xFF\x00", "\xFF\x00\x00\xFF\xFF\x00\xFF\xFF",
-        "\xFF\x00\x00\xFF\xFF\xFF\x00\x00", "\xFF\x00\x00\xFF\xFF\xFF\x00\xFF",
-        "\xFF\x00\x00\xFF\xFF\xFF\xFF\x00", "\xFF\x00\x00\xFF\xFF\xFF\xFF\xFF",
-        "\xFF\x00\xFF\x00\x00\x00\x00\x00", "\xFF\x00\xFF\x00\x00\x00\x00\xFF",
-        "\xFF\x00\xFF\x00\x00\x00\xFF\x00", "\xFF\x00\xFF\x00\x00\x00\xFF\xFF",
-        "\xFF\x00\xFF\x00\x00\xFF\x00\x00", "\xFF\x00\xFF\x00\x00\xFF\x00\xFF",
-        "\xFF\x00\xFF\x00\x00\xFF\xFF\x00", "\xFF\x00\xFF\x00\x00\xFF\xFF\xFF",
-        "\xFF\x00\xFF\x00\xFF\x00\x00\x00", "\xFF\x00\xFF\x00\xFF\x00\x00\xFF",
-        "\xFF\x00\xFF\x00\xFF\x00\xFF\x00", "\xFF\x00\xFF\x00\xFF\x00\xFF\xFF",
-        "\xFF\x00\xFF\x00\xFF\xFF\x00\x00", "\xFF\x00\xFF\x00\xFF\xFF\x00\xFF",
-        "\xFF\x00\xFF\x00\xFF\xFF\xFF\x00", "\xFF\x00\xFF\x00\xFF\xFF\xFF\xFF",
-        "\xFF\x00\xFF\xFF\x00\x00\x00\x00", "\xFF\x00\xFF\xFF\x00\x00\x00\xFF",
-        "\xFF\x00\xFF\xFF\x00\x00\xFF\x00", "\xFF\x00\xFF\xFF\x00\x00\xFF\xFF",
-        "\xFF\x00\xFF\xFF\x00\xFF\x00\x00", "\xFF\x00\xFF\xFF\x00\xFF\x00\xFF",
-        "\xFF\x00\xFF\xFF\x00\xFF\xFF\x00", "\xFF\x00\xFF\xFF\x00\xFF\xFF\xFF",
-        "\xFF\x00\xFF\xFF\xFF\x00\x00\x00", "\xFF\x00\xFF\xFF\xFF\x00\x00\xFF",
-        "\xFF\x00\xFF\xFF\xFF\x00\xFF\x00", "\xFF\x00\xFF\xFF\xFF\x00\xFF\xFF",
-        "\xFF\x00\xFF\xFF\xFF\xFF\x00\x00", "\xFF\x00\xFF\xFF\xFF\xFF\x00\xFF",
-        "\xFF\x00\xFF\xFF\xFF\xFF\xFF\x00", "\xFF\x00\xFF\xFF\xFF\xFF\xFF\xFF",
-        "\xFF\xFF\x00\x00\x00\x00\x00\x00", "\xFF\xFF\x00\x00\x00\x00\x00\xFF",
-        "\xFF\xFF\x00\x00\x00\x00\xFF\x00", "\xFF\xFF\x00\x00\x00\x00\xFF\xFF",
-        "\xFF\xFF\x00\x00\x00\xFF\x00\x00", "\xFF\xFF\x00\x00\x00\xFF\x00\xFF",
-        "\xFF\xFF\x00\x00\x00\xFF\xFF\x00", "\xFF\xFF\x00\x00\x00\xFF\xFF\xFF",
-        "\xFF\xFF\x00\x00\xFF\x00\x00\x00", "\xFF\xFF\x00\x00\xFF\x00\x00\xFF",
-        "\xFF\xFF\x00\x00\xFF\x00\xFF\x00", "\xFF\xFF\x00\x00\xFF\x00\xFF\xFF",
-        "\xFF\xFF\x00\x00\xFF\xFF\x00\x00", "\xFF\xFF\x00\x00\xFF\xFF\x00\xFF",
-        "\xFF\xFF\x00\x00\xFF\xFF\xFF\x00", "\xFF\xFF\x00\x00\xFF\xFF\xFF\xFF",
-        "\xFF\xFF\x00\xFF\x00\x00\x00\x00", "\xFF\xFF\x00\xFF\x00\x00\x00\xFF",
-        "\xFF\xFF\x00\xFF\x00\x00\xFF\x00", "\xFF\xFF\x00\xFF\x00\x00\xFF\xFF",
-        "\xFF\xFF\x00\xFF\x00\xFF\x00\x00", "\xFF\xFF\x00\xFF\x00\xFF\x00\xFF",
-        "\xFF\xFF\x00\xFF\x00\xFF\xFF\x00", "\xFF\xFF\x00\xFF\x00\xFF\xFF\xFF",
-        "\xFF\xFF\x00\xFF\xFF\x00\x00\x00", "\xFF\xFF\x00\xFF\xFF\x00\x00\xFF",
-        "\xFF\xFF\x00\xFF\xFF\x00\xFF\x00", "\xFF\xFF\x00\xFF\xFF\x00\xFF\xFF",
-        "\xFF\xFF\x00\xFF\xFF\xFF\x00\x00", "\xFF\xFF\x00\xFF\xFF\xFF\x00\xFF",
-        "\xFF\xFF\x00\xFF\xFF\xFF\xFF\x00", "\xFF\xFF\x00\xFF\xFF\xFF\xFF\xFF",
-        "\xFF\xFF\xFF\x00\x00\x00\x00\x00", "\xFF\xFF\xFF\x00\x00\x00\x00\xFF",
-        "\xFF\xFF\xFF\x00\x00\x00\xFF\x00", "\xFF\xFF\xFF\x00\x00\x00\xFF\xFF",
-        "\xFF\xFF\xFF\x00\x00\xFF\x00\x00", "\xFF\xFF\xFF\x00\x00\xFF\x00\xFF",
-        "\xFF\xFF\xFF\x00\x00\xFF\xFF\x00", "\xFF\xFF\xFF\x00\x00\xFF\xFF\xFF",
-        "\xFF\xFF\xFF\x00\xFF\x00\x00\x00", "\xFF\xFF\xFF\x00\xFF\x00\x00\xFF",
-        "\xFF\xFF\xFF\x00\xFF\x00\xFF\x00", "\xFF\xFF\xFF\x00\xFF\x00\xFF\xFF",
-        "\xFF\xFF\xFF\x00\xFF\xFF\x00\x00", "\xFF\xFF\xFF\x00\xFF\xFF\x00\xFF",
-        "\xFF\xFF\xFF\x00\xFF\xFF\xFF\x00", "\xFF\xFF\xFF\x00\xFF\xFF\xFF\xFF",
-        "\xFF\xFF\xFF\xFF\x00\x00\x00\x00", "\xFF\xFF\xFF\xFF\x00\x00\x00\xFF",
-        "\xFF\xFF\xFF\xFF\x00\x00\xFF\x00", "\xFF\xFF\xFF\xFF\x00\x00\xFF\xFF",
-        "\xFF\xFF\xFF\xFF\x00\xFF\x00\x00", "\xFF\xFF\xFF\xFF\x00\xFF\x00\xFF",
-        "\xFF\xFF\xFF\xFF\x00\xFF\xFF\x00", "\xFF\xFF\xFF\xFF\x00\xFF\xFF\xFF",
-        "\xFF\xFF\xFF\xFF\xFF\x00\x00\x00", "\xFF\xFF\xFF\xFF\xFF\x00\x00\xFF",
-        "\xFF\xFF\xFF\xFF\xFF\x00\xFF\x00", "\xFF\xFF\xFF\xFF\xFF\x00\xFF\xFF",
-        "\xFF\xFF\xFF\xFF\xFF\xFF\x00\x00", "\xFF\xFF\xFF\xFF\xFF\xFF\x00\xFF",
-        "\xFF\xFF\xFF\xFF\xFF\xFF\xFF\x00", "\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF"
-    );
-
-    /**
-     * IP mapping helper table.
-     *
-     * Indexing this table with each source byte performs the initial bit permutation.
-     *
-     * @var array
-     * @access private
-     */
-    var $ipmap = array(
-        0x00, 0x10, 0x01, 0x11, 0x20, 0x30, 0x21, 0x31,
-        0x02, 0x12, 0x03, 0x13, 0x22, 0x32, 0x23, 0x33,
-        0x40, 0x50, 0x41, 0x51, 0x60, 0x70, 0x61, 0x71,
-        0x42, 0x52, 0x43, 0x53, 0x62, 0x72, 0x63, 0x73,
-        0x04, 0x14, 0x05, 0x15, 0x24, 0x34, 0x25, 0x35,
-        0x06, 0x16, 0x07, 0x17, 0x26, 0x36, 0x27, 0x37,
-        0x44, 0x54, 0x45, 0x55, 0x64, 0x74, 0x65, 0x75,
-        0x46, 0x56, 0x47, 0x57, 0x66, 0x76, 0x67, 0x77,
-        0x80, 0x90, 0x81, 0x91, 0xA0, 0xB0, 0xA1, 0xB1,
-        0x82, 0x92, 0x83, 0x93, 0xA2, 0xB2, 0xA3, 0xB3,
-        0xC0, 0xD0, 0xC1, 0xD1, 0xE0, 0xF0, 0xE1, 0xF1,
-        0xC2, 0xD2, 0xC3, 0xD3, 0xE2, 0xF2, 0xE3, 0xF3,
-        0x84, 0x94, 0x85, 0x95, 0xA4, 0xB4, 0xA5, 0xB5,
-        0x86, 0x96, 0x87, 0x97, 0xA6, 0xB6, 0xA7, 0xB7,
-        0xC4, 0xD4, 0xC5, 0xD5, 0xE4, 0xF4, 0xE5, 0xF5,
-        0xC6, 0xD6, 0xC7, 0xD7, 0xE6, 0xF6, 0xE7, 0xF7,
-        0x08, 0x18, 0x09, 0x19, 0x28, 0x38, 0x29, 0x39,
-        0x0A, 0x1A, 0x0B, 0x1B, 0x2A, 0x3A, 0x2B, 0x3B,
-        0x48, 0x58, 0x49, 0x59, 0x68, 0x78, 0x69, 0x79,
-        0x4A, 0x5A, 0x4B, 0x5B, 0x6A, 0x7A, 0x6B, 0x7B,
-        0x0C, 0x1C, 0x0D, 0x1D, 0x2C, 0x3C, 0x2D, 0x3D,
-        0x0E, 0x1E, 0x0F, 0x1F, 0x2E, 0x3E, 0x2F, 0x3F,
-        0x4C, 0x5C, 0x4D, 0x5D, 0x6C, 0x7C, 0x6D, 0x7D,
-        0x4E, 0x5E, 0x4F, 0x5F, 0x6E, 0x7E, 0x6F, 0x7F,
-        0x88, 0x98, 0x89, 0x99, 0xA8, 0xB8, 0xA9, 0xB9,
-        0x8A, 0x9A, 0x8B, 0x9B, 0xAA, 0xBA, 0xAB, 0xBB,
-        0xC8, 0xD8, 0xC9, 0xD9, 0xE8, 0xF8, 0xE9, 0xF9,
-        0xCA, 0xDA, 0xCB, 0xDB, 0xEA, 0xFA, 0xEB, 0xFB,
-        0x8C, 0x9C, 0x8D, 0x9D, 0xAC, 0xBC, 0xAD, 0xBD,
-        0x8E, 0x9E, 0x8F, 0x9F, 0xAE, 0xBE, 0xAF, 0xBF,
-        0xCC, 0xDC, 0xCD, 0xDD, 0xEC, 0xFC, 0xED, 0xFD,
-        0xCE, 0xDE, 0xCF, 0xDF, 0xEE, 0xFE, 0xEF, 0xFF
-    );
-
-    /**
-     * Inverse IP mapping helper table.
-     * Indexing this table with a byte value reverses the bit order.
-     *
-     * @var array
-     * @access private
-     */
-    var $invipmap = array(
-        0x00, 0x80, 0x40, 0xC0, 0x20, 0xA0, 0x60, 0xE0,
-        0x10, 0x90, 0x50, 0xD0, 0x30, 0xB0, 0x70, 0xF0,
-        0x08, 0x88, 0x48, 0xC8, 0x28, 0xA8, 0x68, 0xE8,
-        0x18, 0x98, 0x58, 0xD8, 0x38, 0xB8, 0x78, 0xF8,
-        0x04, 0x84, 0x44, 0xC4, 0x24, 0xA4, 0x64, 0xE4,
-        0x14, 0x94, 0x54, 0xD4, 0x34, 0xB4, 0x74, 0xF4,
-        0x0C, 0x8C, 0x4C, 0xCC, 0x2C, 0xAC, 0x6C, 0xEC,
-        0x1C, 0x9C, 0x5C, 0xDC, 0x3C, 0xBC, 0x7C, 0xFC,
-        0x02, 0x82, 0x42, 0xC2, 0x22, 0xA2, 0x62, 0xE2,
-        0x12, 0x92, 0x52, 0xD2, 0x32, 0xB2, 0x72, 0xF2,
-        0x0A, 0x8A, 0x4A, 0xCA, 0x2A, 0xAA, 0x6A, 0xEA,
-        0x1A, 0x9A, 0x5A, 0xDA, 0x3A, 0xBA, 0x7A, 0xFA,
-        0x06, 0x86, 0x46, 0xC6, 0x26, 0xA6, 0x66, 0xE6,
-        0x16, 0x96, 0x56, 0xD6, 0x36, 0xB6, 0x76, 0xF6,
-        0x0E, 0x8E, 0x4E, 0xCE, 0x2E, 0xAE, 0x6E, 0xEE,
-        0x1E, 0x9E, 0x5E, 0xDE, 0x3E, 0xBE, 0x7E, 0xFE,
-        0x01, 0x81, 0x41, 0xC1, 0x21, 0xA1, 0x61, 0xE1,
-        0x11, 0x91, 0x51, 0xD1, 0x31, 0xB1, 0x71, 0xF1,
-        0x09, 0x89, 0x49, 0xC9, 0x29, 0xA9, 0x69, 0xE9,
-        0x19, 0x99, 0x59, 0xD9, 0x39, 0xB9, 0x79, 0xF9,
-        0x05, 0x85, 0x45, 0xC5, 0x25, 0xA5, 0x65, 0xE5,
-        0x15, 0x95, 0x55, 0xD5, 0x35, 0xB5, 0x75, 0xF5,
-        0x0D, 0x8D, 0x4D, 0xCD, 0x2D, 0xAD, 0x6D, 0xED,
-        0x1D, 0x9D, 0x5D, 0xDD, 0x3D, 0xBD, 0x7D, 0xFD,
-        0x03, 0x83, 0x43, 0xC3, 0x23, 0xA3, 0x63, 0xE3,
-        0x13, 0x93, 0x53, 0xD3, 0x33, 0xB3, 0x73, 0xF3,
-        0x0B, 0x8B, 0x4B, 0xCB, 0x2B, 0xAB, 0x6B, 0xEB,
-        0x1B, 0x9B, 0x5B, 0xDB, 0x3B, 0xBB, 0x7B, 0xFB,
-        0x07, 0x87, 0x47, 0xC7, 0x27, 0xA7, 0x67, 0xE7,
-        0x17, 0x97, 0x57, 0xD7, 0x37, 0xB7, 0x77, 0xF7,
-        0x0F, 0x8F, 0x4F, 0xCF, 0x2F, 0xAF, 0x6F, 0xEF,
-        0x1F, 0x9F, 0x5F, 0xDF, 0x3F, 0xBF, 0x7F, 0xFF
-    );
-
-    /**
-     * Pre-permuted S-box1
-     *
-     * Each box ($sbox1-$sbox8) has been vectorized, then each value pre-permuted using the
-     * P table: concatenation can then be replaced by exclusive ORs.
-     *
-     * @var array
-     * @access private
-     */
-    var $sbox1 = array(
-        0x00808200, 0x00000000, 0x00008000, 0x00808202,
-        0x00808002, 0x00008202, 0x00000002, 0x00008000,
-        0x00000200, 0x00808200, 0x00808202, 0x00000200,
-        0x00800202, 0x00808002, 0x00800000, 0x00000002,
-        0x00000202, 0x00800200, 0x00800200, 0x00008200,
-        0x00008200, 0x00808000, 0x00808000, 0x00800202,
-        0x00008002, 0x00800002, 0x00800002, 0x00008002,
-        0x00000000, 0x00000202, 0x00008202, 0x00800000,
-        0x00008000, 0x00808202, 0x00000002, 0x00808000,
-        0x00808200, 0x00800000, 0x00800000, 0x00000200,
-        0x00808002, 0x00008000, 0x00008200, 0x00800002,
-        0x00000200, 0x00000002, 0x00800202, 0x00008202,
-        0x00808202, 0x00008002, 0x00808000, 0x00800202,
-        0x00800002, 0x00000202, 0x00008202, 0x00808200,
-        0x00000202, 0x00800200, 0x00800200, 0x00000000,
-        0x00008002, 0x00008200, 0x00000000, 0x00808002
-    );
-
-    /**
-     * Pre-permuted S-box2
-     *
-     * @var array
-     * @access private
-     */
-    var $sbox2 = array(
-        0x40084010, 0x40004000, 0x00004000, 0x00084010,
-        0x00080000, 0x00000010, 0x40080010, 0x40004010,
-        0x40000010, 0x40084010, 0x40084000, 0x40000000,
-        0x40004000, 0x00080000, 0x00000010, 0x40080010,
-        0x00084000, 0x00080010, 0x40004010, 0x00000000,
-        0x40000000, 0x00004000, 0x00084010, 0x40080000,
-        0x00080010, 0x40000010, 0x00000000, 0x00084000,
-        0x00004010, 0x40084000, 0x40080000, 0x00004010,
-        0x00000000, 0x00084010, 0x40080010, 0x00080000,
-        0x40004010, 0x40080000, 0x40084000, 0x00004000,
-        0x40080000, 0x40004000, 0x00000010, 0x40084010,
-        0x00084010, 0x00000010, 0x00004000, 0x40000000,
-        0x00004010, 0x40084000, 0x00080000, 0x40000010,
-        0x00080010, 0x40004010, 0x40000010, 0x00080010,
-        0x00084000, 0x00000000, 0x40004000, 0x00004010,
-        0x40000000, 0x40080010, 0x40084010, 0x00084000
-    );
-
-    /**
-     * Pre-permuted S-box3
-     *
-     * @var array
-     * @access private
-     */
-    var $sbox3 = array(
-        0x00000104, 0x04010100, 0x00000000, 0x04010004,
-        0x04000100, 0x00000000, 0x00010104, 0x04000100,
-        0x00010004, 0x04000004, 0x04000004, 0x00010000,
-        0x04010104, 0x00010004, 0x04010000, 0x00000104,
-        0x04000000, 0x00000004, 0x04010100, 0x00000100,
-        0x00010100, 0x04010000, 0x04010004, 0x00010104,
-        0x04000104, 0x00010100, 0x00010000, 0x04000104,
-        0x00000004, 0x04010104, 0x00000100, 0x04000000,
-        0x04010100, 0x04000000, 0x00010004, 0x00000104,
-        0x00010000, 0x04010100, 0x04000100, 0x00000000,
-        0x00000100, 0x00010004, 0x04010104, 0x04000100,
-        0x04000004, 0x00000100, 0x00000000, 0x04010004,
-        0x04000104, 0x00010000, 0x04000000, 0x04010104,
-        0x00000004, 0x00010104, 0x00010100, 0x04000004,
-        0x04010000, 0x04000104, 0x00000104, 0x04010000,
-        0x00010104, 0x00000004, 0x04010004, 0x00010100
-    );
-
-    /**
-     * Pre-permuted S-box4
-     *
-     * @var array
-     * @access private
-     */
-    var $sbox4 = array(
-        0x80401000, 0x80001040, 0x80001040, 0x00000040,
-        0x00401040, 0x80400040, 0x80400000, 0x80001000,
-        0x00000000, 0x00401000, 0x00401000, 0x80401040,
-        0x80000040, 0x00000000, 0x00400040, 0x80400000,
-        0x80000000, 0x00001000, 0x00400000, 0x80401000,
-        0x00000040, 0x00400000, 0x80001000, 0x00001040,
-        0x80400040, 0x80000000, 0x00001040, 0x00400040,
-        0x00001000, 0x00401040, 0x80401040, 0x80000040,
-        0x00400040, 0x80400000, 0x00401000, 0x80401040,
-        0x80000040, 0x00000000, 0x00000000, 0x00401000,
-        0x00001040, 0x00400040, 0x80400040, 0x80000000,
-        0x80401000, 0x80001040, 0x80001040, 0x00000040,
-        0x80401040, 0x80000040, 0x80000000, 0x00001000,
-        0x80400000, 0x80001000, 0x00401040, 0x80400040,
-        0x80001000, 0x00001040, 0x00400000, 0x80401000,
-        0x00000040, 0x00400000, 0x00001000, 0x00401040
-    );
-
-    /**
-     * Pre-permuted S-box5
-     *
-     * @var array
-     * @access private
-     */
-    var $sbox5 = array(
-        0x00000080, 0x01040080, 0x01040000, 0x21000080,
-        0x00040000, 0x00000080, 0x20000000, 0x01040000,
-        0x20040080, 0x00040000, 0x01000080, 0x20040080,
-        0x21000080, 0x21040000, 0x00040080, 0x20000000,
-        0x01000000, 0x20040000, 0x20040000, 0x00000000,
-        0x20000080, 0x21040080, 0x21040080, 0x01000080,
-        0x21040000, 0x20000080, 0x00000000, 0x21000000,
-        0x01040080, 0x01000000, 0x21000000, 0x00040080,
-        0x00040000, 0x21000080, 0x00000080, 0x01000000,
-        0x20000000, 0x01040000, 0x21000080, 0x20040080,
-        0x01000080, 0x20000000, 0x21040000, 0x01040080,
-        0x20040080, 0x00000080, 0x01000000, 0x21040000,
-        0x21040080, 0x00040080, 0x21000000, 0x21040080,
-        0x01040000, 0x00000000, 0x20040000, 0x21000000,
-        0x00040080, 0x01000080, 0x20000080, 0x00040000,
-        0x00000000, 0x20040000, 0x01040080, 0x20000080
-    );
-
-    /**
-     * Pre-permuted S-box6
-     *
-     * @var array
-     * @access private
-     */
-    var $sbox6 = array(
-        0x10000008, 0x10200000, 0x00002000, 0x10202008,
-        0x10200000, 0x00000008, 0x10202008, 0x00200000,
-        0x10002000, 0x00202008, 0x00200000, 0x10000008,
-        0x00200008, 0x10002000, 0x10000000, 0x00002008,
-        0x00000000, 0x00200008, 0x10002008, 0x00002000,
-        0x00202000, 0x10002008, 0x00000008, 0x10200008,
-        0x10200008, 0x00000000, 0x00202008, 0x10202000,
-        0x00002008, 0x00202000, 0x10202000, 0x10000000,
-        0x10002000, 0x00000008, 0x10200008, 0x00202000,
-        0x10202008, 0x00200000, 0x00002008, 0x10000008,
-        0x00200000, 0x10002000, 0x10000000, 0x00002008,
-        0x10000008, 0x10202008, 0x00202000, 0x10200000,
-        0x00202008, 0x10202000, 0x00000000, 0x10200008,
-        0x00000008, 0x00002000, 0x10200000, 0x00202008,
-        0x00002000, 0x00200008, 0x10002008, 0x00000000,
-        0x10202000, 0x10000000, 0x00200008, 0x10002008
-    );
-
-    /**
-     * Pre-permuted S-box7
-     *
-     * @var array
-     * @access private
-     */
-    var $sbox7 = array(
-        0x00100000, 0x02100001, 0x02000401, 0x00000000,
-        0x00000400, 0x02000401, 0x00100401, 0x02100400,
-        0x02100401, 0x00100000, 0x00000000, 0x02000001,
-        0x00000001, 0x02000000, 0x02100001, 0x00000401,
-        0x02000400, 0x00100401, 0x00100001, 0x02000400,
-        0x02000001, 0x02100000, 0x02100400, 0x00100001,
-        0x02100000, 0x00000400, 0x00000401, 0x02100401,
-        0x00100400, 0x00000001, 0x02000000, 0x00100400,
-        0x02000000, 0x00100400, 0x00100000, 0x02000401,
-        0x02000401, 0x02100001, 0x02100001, 0x00000001,
-        0x00100001, 0x02000000, 0x02000400, 0x00100000,
-        0x02100400, 0x00000401, 0x00100401, 0x02100400,
-        0x00000401, 0x02000001, 0x02100401, 0x02100000,
-        0x00100400, 0x00000000, 0x00000001, 0x02100401,
-        0x00000000, 0x00100401, 0x02100000, 0x00000400,
-        0x02000001, 0x02000400, 0x00000400, 0x00100001
-    );
-
-    /**
-     * Pre-permuted S-box8
-     *
-     * @var array
-     * @access private
-     */
-    var $sbox8 = array(
-        0x08000820, 0x00000800, 0x00020000, 0x08020820,
-        0x08000000, 0x08000820, 0x00000020, 0x08000000,
-        0x00020020, 0x08020000, 0x08020820, 0x00020800,
-        0x08020800, 0x00020820, 0x00000800, 0x00000020,
-        0x08020000, 0x08000020, 0x08000800, 0x00000820,
-        0x00020800, 0x00020020, 0x08020020, 0x08020800,
-        0x00000820, 0x00000000, 0x00000000, 0x08020020,
-        0x08000020, 0x08000800, 0x00020820, 0x00020000,
-        0x00020820, 0x00020000, 0x08020800, 0x00000800,
-        0x00000020, 0x08020020, 0x00000800, 0x00020820,
-        0x08000800, 0x00000020, 0x08000020, 0x08020000,
-        0x08020020, 0x08000000, 0x00020000, 0x08000820,
-        0x00000000, 0x08020820, 0x00020020, 0x08000020,
-        0x08020000, 0x08000800, 0x08000820, 0x00000000,
-        0x08020820, 0x00020800, 0x00020800, 0x00000820,
-        0x00000820, 0x00020020, 0x08000000, 0x08020800
-    );
-
-    /**
-     * Test for engine validity
-     *
-     * This is mainly just a wrapper to set things up for \phpseclib\Crypt\Base::isValidEngine()
-     *
-     * @see \phpseclib\Crypt\Base::isValidEngine()
-     * @param int $engine
-     * @access public
-     * @return bool
-     */
-    function isValidEngine($engine)
-    {
-        if ($this->key_length_max == 8) {
-            if ($engine == self::ENGINE_OPENSSL) {
-                $this->cipher_name_openssl_ecb = 'des-ecb';
-                $this->cipher_name_openssl = 'des-' . $this->_openssl_translate_mode();
-            }
-        }
-
-        return parent::isValidEngine($engine);
-    }
-
-    /**
-     * Sets the key.
-     *
-     * Keys can be of any length.  DES, itself, uses 64-bit keys (eg. strlen($key) == 8), however, we
-     * only use the first eight, if $key has more then eight characters in it, and pad $key with the
-     * null byte if it is less then eight characters long.
-     *
-     * DES also requires that every eighth bit be a parity bit, however, we'll ignore that.
-     *
-     * If the key is not explicitly set, it'll be assumed to be all zero's.
-     *
-     * @see \phpseclib\Crypt\Base::setKey()
-     * @access public
-     * @param string $key
-     */
-    function setKey($key)
-    {
-        // We check/cut here only up to max length of the key.
-        // Key padding to the proper length will be done in _setupKey()
-        if (strlen($key) > $this->key_length_max) {
-            $key = substr($key, 0, $this->key_length_max);
-        }
-
-        // Sets the key
-        parent::setKey($key);
-    }
-
-    /**
-     * Encrypts a block
-     *
-     * @see \phpseclib\Crypt\Base::_encryptBlock()
-     * @see \phpseclib\Crypt\Base::encrypt()
-     * @see self::encrypt()
-     * @access private
-     * @param string $in
-     * @return string
-     */
-    function _encryptBlock($in)
-    {
-        return $this->_processBlock($in, self::ENCRYPT);
-    }
-
-    /**
-     * Decrypts a block
-     *
-     * @see \phpseclib\Crypt\Base::_decryptBlock()
-     * @see \phpseclib\Crypt\Base::decrypt()
-     * @see self::decrypt()
-     * @access private
-     * @param string $in
-     * @return string
-     */
-    function _decryptBlock($in)
-    {
-        return $this->_processBlock($in, self::DECRYPT);
-    }
-
-    /**
-     * Encrypts or decrypts a 64-bit block
-     *
-     * $mode should be either self::ENCRYPT or self::DECRYPT.  See
-     * {@link http://en.wikipedia.org/wiki/Image:Feistel.png Feistel.png} to get a general
-     * idea of what this function does.
-     *
-     * @see self::_encryptBlock()
-     * @see self::_decryptBlock()
-     * @access private
-     * @param string $block
-     * @param int $mode
-     * @return string
-     */
-    function _processBlock($block, $mode)
-    {
-        static $sbox1, $sbox2, $sbox3, $sbox4, $sbox5, $sbox6, $sbox7, $sbox8, $shuffleip, $shuffleinvip;
-        if (!$sbox1) {
-            $sbox1 = array_map("intval", $this->sbox1);
-            $sbox2 = array_map("intval", $this->sbox2);
-            $sbox3 = array_map("intval", $this->sbox3);
-            $sbox4 = array_map("intval", $this->sbox4);
-            $sbox5 = array_map("intval", $this->sbox5);
-            $sbox6 = array_map("intval", $this->sbox6);
-            $sbox7 = array_map("intval", $this->sbox7);
-            $sbox8 = array_map("intval", $this->sbox8);
-            /* Merge $shuffle with $[inv]ipmap */
-            for ($i = 0; $i < 256; ++$i) {
-                $shuffleip[]    =  $this->shuffle[$this->ipmap[$i]];
-                $shuffleinvip[] =  $this->shuffle[$this->invipmap[$i]];
-            }
-        }
-
-        $keys  = $this->keys[$mode];
-        $ki    = -1;
-
-        // Do the initial IP permutation.
-        $t = unpack('Nl/Nr', $block);
-        list($l, $r) = array($t['l'], $t['r']);
-        $block = ($shuffleip[ $r        & 0xFF] & "\x80\x80\x80\x80\x80\x80\x80\x80") |
-                 ($shuffleip[($r >>  8) & 0xFF] & "\x40\x40\x40\x40\x40\x40\x40\x40") |
-                 ($shuffleip[($r >> 16) & 0xFF] & "\x20\x20\x20\x20\x20\x20\x20\x20") |
-                 ($shuffleip[($r >> 24) & 0xFF] & "\x10\x10\x10\x10\x10\x10\x10\x10") |
-                 ($shuffleip[ $l        & 0xFF] & "\x08\x08\x08\x08\x08\x08\x08\x08") |
-                 ($shuffleip[($l >>  8) & 0xFF] & "\x04\x04\x04\x04\x04\x04\x04\x04") |
-                 ($shuffleip[($l >> 16) & 0xFF] & "\x02\x02\x02\x02\x02\x02\x02\x02") |
-                 ($shuffleip[($l >> 24) & 0xFF] & "\x01\x01\x01\x01\x01\x01\x01\x01");
-
-        // Extract L0 and R0.
-        $t = unpack('Nl/Nr', $block);
-        list($l, $r) = array($t['l'], $t['r']);
-
-        for ($des_round = 0; $des_round < $this->des_rounds; ++$des_round) {
-            // Perform the 16 steps.
-            for ($i = 0; $i < 16; $i++) {
-                // start of "the Feistel (F) function" - see the following URL:
-                // http://en.wikipedia.org/wiki/Image:Data_Encryption_Standard_InfoBox_Diagram.png
-                // Merge key schedule.
-                $b1 = (($r >>  3) & 0x1FFFFFFF) ^ ($r << 29) ^ $keys[++$ki];
-                $b2 = (($r >> 31) & 0x00000001) ^ ($r <<  1) ^ $keys[++$ki];
-
-                // S-box indexing.
-                $t = $sbox1[($b1 >> 24) & 0x3F] ^ $sbox2[($b2 >> 24) & 0x3F] ^
-                     $sbox3[($b1 >> 16) & 0x3F] ^ $sbox4[($b2 >> 16) & 0x3F] ^
-                     $sbox5[($b1 >>  8) & 0x3F] ^ $sbox6[($b2 >>  8) & 0x3F] ^
-                     $sbox7[ $b1        & 0x3F] ^ $sbox8[ $b2        & 0x3F] ^ $l;
-                // end of "the Feistel (F) function"
-
-                $l = $r;
-                $r = $t;
-            }
-
-            // Last step should not permute L & R.
-            $t = $l;
-            $l = $r;
-            $r = $t;
-        }
-
-        // Perform the inverse IP permutation.
-        return ($shuffleinvip[($r >> 24) & 0xFF] & "\x80\x80\x80\x80\x80\x80\x80\x80") |
-               ($shuffleinvip[($l >> 24) & 0xFF] & "\x40\x40\x40\x40\x40\x40\x40\x40") |
-               ($shuffleinvip[($r >> 16) & 0xFF] & "\x20\x20\x20\x20\x20\x20\x20\x20") |
-               ($shuffleinvip[($l >> 16) & 0xFF] & "\x10\x10\x10\x10\x10\x10\x10\x10") |
-               ($shuffleinvip[($r >>  8) & 0xFF] & "\x08\x08\x08\x08\x08\x08\x08\x08") |
-               ($shuffleinvip[($l >>  8) & 0xFF] & "\x04\x04\x04\x04\x04\x04\x04\x04") |
-               ($shuffleinvip[ $r        & 0xFF] & "\x02\x02\x02\x02\x02\x02\x02\x02") |
-               ($shuffleinvip[ $l        & 0xFF] & "\x01\x01\x01\x01\x01\x01\x01\x01");
-    }
-
-    /**
-     * Creates the key schedule
-     *
-     * @see \phpseclib\Crypt\Base::_setupKey()
-     * @access private
-     */
-    function _setupKey()
-    {
-        if (isset($this->kl['key']) && $this->key === $this->kl['key'] && $this->des_rounds === $this->kl['des_rounds']) {
-            // already expanded
-            return;
-        }
-        $this->kl = array('key' => $this->key, 'des_rounds' => $this->des_rounds);
-
-        static $shifts = array( // number of key bits shifted per round
-            1, 1, 2, 2, 2, 2, 2, 2, 1, 2, 2, 2, 2, 2, 2, 1
-        );
-
-        static $pc1map = array(
-            0x00, 0x00, 0x08, 0x08, 0x04, 0x04, 0x0C, 0x0C,
-            0x02, 0x02, 0x0A, 0x0A, 0x06, 0x06, 0x0E, 0x0E,
-            0x10, 0x10, 0x18, 0x18, 0x14, 0x14, 0x1C, 0x1C,
-            0x12, 0x12, 0x1A, 0x1A, 0x16, 0x16, 0x1E, 0x1E,
-            0x20, 0x20, 0x28, 0x28, 0x24, 0x24, 0x2C, 0x2C,
-            0x22, 0x22, 0x2A, 0x2A, 0x26, 0x26, 0x2E, 0x2E,
-            0x30, 0x30, 0x38, 0x38, 0x34, 0x34, 0x3C, 0x3C,
-            0x32, 0x32, 0x3A, 0x3A, 0x36, 0x36, 0x3E, 0x3E,
-            0x40, 0x40, 0x48, 0x48, 0x44, 0x44, 0x4C, 0x4C,
-            0x42, 0x42, 0x4A, 0x4A, 0x46, 0x46, 0x4E, 0x4E,
-            0x50, 0x50, 0x58, 0x58, 0x54, 0x54, 0x5C, 0x5C,
-            0x52, 0x52, 0x5A, 0x5A, 0x56, 0x56, 0x5E, 0x5E,
-            0x60, 0x60, 0x68, 0x68, 0x64, 0x64, 0x6C, 0x6C,
-            0x62, 0x62, 0x6A, 0x6A, 0x66, 0x66, 0x6E, 0x6E,
-            0x70, 0x70, 0x78, 0x78, 0x74, 0x74, 0x7C, 0x7C,
-            0x72, 0x72, 0x7A, 0x7A, 0x76, 0x76, 0x7E, 0x7E,
-            0x80, 0x80, 0x88, 0x88, 0x84, 0x84, 0x8C, 0x8C,
-            0x82, 0x82, 0x8A, 0x8A, 0x86, 0x86, 0x8E, 0x8E,
-            0x90, 0x90, 0x98, 0x98, 0x94, 0x94, 0x9C, 0x9C,
-            0x92, 0x92, 0x9A, 0x9A, 0x96, 0x96, 0x9E, 0x9E,
-            0xA0, 0xA0, 0xA8, 0xA8, 0xA4, 0xA4, 0xAC, 0xAC,
-            0xA2, 0xA2, 0xAA, 0xAA, 0xA6, 0xA6, 0xAE, 0xAE,
-            0xB0, 0xB0, 0xB8, 0xB8, 0xB4, 0xB4, 0xBC, 0xBC,
-            0xB2, 0xB2, 0xBA, 0xBA, 0xB6, 0xB6, 0xBE, 0xBE,
-            0xC0, 0xC0, 0xC8, 0xC8, 0xC4, 0xC4, 0xCC, 0xCC,
-            0xC2, 0xC2, 0xCA, 0xCA, 0xC6, 0xC6, 0xCE, 0xCE,
-            0xD0, 0xD0, 0xD8, 0xD8, 0xD4, 0xD4, 0xDC, 0xDC,
-            0xD2, 0xD2, 0xDA, 0xDA, 0xD6, 0xD6, 0xDE, 0xDE,
-            0xE0, 0xE0, 0xE8, 0xE8, 0xE4, 0xE4, 0xEC, 0xEC,
-            0xE2, 0xE2, 0xEA, 0xEA, 0xE6, 0xE6, 0xEE, 0xEE,
-            0xF0, 0xF0, 0xF8, 0xF8, 0xF4, 0xF4, 0xFC, 0xFC,
-            0xF2, 0xF2, 0xFA, 0xFA, 0xF6, 0xF6, 0xFE, 0xFE
-        );
-
-        // Mapping tables for the PC-2 transformation.
-        static $pc2mapc1 = array(
-            0x00000000, 0x00000400, 0x00200000, 0x00200400,
-            0x00000001, 0x00000401, 0x00200001, 0x00200401,
-            0x02000000, 0x02000400, 0x02200000, 0x02200400,
-            0x02000001, 0x02000401, 0x02200001, 0x02200401
-        );
-        static $pc2mapc2 = array(
-            0x00000000, 0x00000800, 0x08000000, 0x08000800,
-            0x00010000, 0x00010800, 0x08010000, 0x08010800,
-            0x00000000, 0x00000800, 0x08000000, 0x08000800,
-            0x00010000, 0x00010800, 0x08010000, 0x08010800,
-            0x00000100, 0x00000900, 0x08000100, 0x08000900,
-            0x00010100, 0x00010900, 0x08010100, 0x08010900,
-            0x00000100, 0x00000900, 0x08000100, 0x08000900,
-            0x00010100, 0x00010900, 0x08010100, 0x08010900,
-            0x00000010, 0x00000810, 0x08000010, 0x08000810,
-            0x00010010, 0x00010810, 0x08010010, 0x08010810,
-            0x00000010, 0x00000810, 0x08000010, 0x08000810,
-            0x00010010, 0x00010810, 0x08010010, 0x08010810,
-            0x00000110, 0x00000910, 0x08000110, 0x08000910,
-            0x00010110, 0x00010910, 0x08010110, 0x08010910,
-            0x00000110, 0x00000910, 0x08000110, 0x08000910,
-            0x00010110, 0x00010910, 0x08010110, 0x08010910,
-            0x00040000, 0x00040800, 0x08040000, 0x08040800,
-            0x00050000, 0x00050800, 0x08050000, 0x08050800,
-            0x00040000, 0x00040800, 0x08040000, 0x08040800,
-            0x00050000, 0x00050800, 0x08050000, 0x08050800,
-            0x00040100, 0x00040900, 0x08040100, 0x08040900,
-            0x00050100, 0x00050900, 0x08050100, 0x08050900,
-            0x00040100, 0x00040900, 0x08040100, 0x08040900,
-            0x00050100, 0x00050900, 0x08050100, 0x08050900,
-            0x00040010, 0x00040810, 0x08040010, 0x08040810,
-            0x00050010, 0x00050810, 0x08050010, 0x08050810,
-            0x00040010, 0x00040810, 0x08040010, 0x08040810,
-            0x00050010, 0x00050810, 0x08050010, 0x08050810,
-            0x00040110, 0x00040910, 0x08040110, 0x08040910,
-            0x00050110, 0x00050910, 0x08050110, 0x08050910,
-            0x00040110, 0x00040910, 0x08040110, 0x08040910,
-            0x00050110, 0x00050910, 0x08050110, 0x08050910,
-            0x01000000, 0x01000800, 0x09000000, 0x09000800,
-            0x01010000, 0x01010800, 0x09010000, 0x09010800,
-            0x01000000, 0x01000800, 0x09000000, 0x09000800,
-            0x01010000, 0x01010800, 0x09010000, 0x09010800,
-            0x01000100, 0x01000900, 0x09000100, 0x09000900,
-            0x01010100, 0x01010900, 0x09010100, 0x09010900,
-            0x01000100, 0x01000900, 0x09000100, 0x09000900,
-            0x01010100, 0x01010900, 0x09010100, 0x09010900,
-            0x01000010, 0x01000810, 0x09000010, 0x09000810,
-            0x01010010, 0x01010810, 0x09010010, 0x09010810,
-            0x01000010, 0x01000810, 0x09000010, 0x09000810,
-            0x01010010, 0x01010810, 0x09010010, 0x09010810,
-            0x01000110, 0x01000910, 0x09000110, 0x09000910,
-            0x01010110, 0x01010910, 0x09010110, 0x09010910,
-            0x01000110, 0x01000910, 0x09000110, 0x09000910,
-            0x01010110, 0x01010910, 0x09010110, 0x09010910,
-            0x01040000, 0x01040800, 0x09040000, 0x09040800,
-            0x01050000, 0x01050800, 0x09050000, 0x09050800,
-            0x01040000, 0x01040800, 0x09040000, 0x09040800,
-            0x01050000, 0x01050800, 0x09050000, 0x09050800,
-            0x01040100, 0x01040900, 0x09040100, 0x09040900,
-            0x01050100, 0x01050900, 0x09050100, 0x09050900,
-            0x01040100, 0x01040900, 0x09040100, 0x09040900,
-            0x01050100, 0x01050900, 0x09050100, 0x09050900,
-            0x01040010, 0x01040810, 0x09040010, 0x09040810,
-            0x01050010, 0x01050810, 0x09050010, 0x09050810,
-            0x01040010, 0x01040810, 0x09040010, 0x09040810,
-            0x01050010, 0x01050810, 0x09050010, 0x09050810,
-            0x01040110, 0x01040910, 0x09040110, 0x09040910,
-            0x01050110, 0x01050910, 0x09050110, 0x09050910,
-            0x01040110, 0x01040910, 0x09040110, 0x09040910,
-            0x01050110, 0x01050910, 0x09050110, 0x09050910
-        );
-        static $pc2mapc3 = array(
-            0x00000000, 0x00000004, 0x00001000, 0x00001004,
-            0x00000000, 0x00000004, 0x00001000, 0x00001004,
-            0x10000000, 0x10000004, 0x10001000, 0x10001004,
-            0x10000000, 0x10000004, 0x10001000, 0x10001004,
-            0x00000020, 0x00000024, 0x00001020, 0x00001024,
-            0x00000020, 0x00000024, 0x00001020, 0x00001024,
-            0x10000020, 0x10000024, 0x10001020, 0x10001024,
-            0x10000020, 0x10000024, 0x10001020, 0x10001024,
-            0x00080000, 0x00080004, 0x00081000, 0x00081004,
-            0x00080000, 0x00080004, 0x00081000, 0x00081004,
-            0x10080000, 0x10080004, 0x10081000, 0x10081004,
-            0x10080000, 0x10080004, 0x10081000, 0x10081004,
-            0x00080020, 0x00080024, 0x00081020, 0x00081024,
-            0x00080020, 0x00080024, 0x00081020, 0x00081024,
-            0x10080020, 0x10080024, 0x10081020, 0x10081024,
-            0x10080020, 0x10080024, 0x10081020, 0x10081024,
-            0x20000000, 0x20000004, 0x20001000, 0x20001004,
-            0x20000000, 0x20000004, 0x20001000, 0x20001004,
-            0x30000000, 0x30000004, 0x30001000, 0x30001004,
-            0x30000000, 0x30000004, 0x30001000, 0x30001004,
-            0x20000020, 0x20000024, 0x20001020, 0x20001024,
-            0x20000020, 0x20000024, 0x20001020, 0x20001024,
-            0x30000020, 0x30000024, 0x30001020, 0x30001024,
-            0x30000020, 0x30000024, 0x30001020, 0x30001024,
-            0x20080000, 0x20080004, 0x20081000, 0x20081004,
-            0x20080000, 0x20080004, 0x20081000, 0x20081004,
-            0x30080000, 0x30080004, 0x30081000, 0x30081004,
-            0x30080000, 0x30080004, 0x30081000, 0x30081004,
-            0x20080020, 0x20080024, 0x20081020, 0x20081024,
-            0x20080020, 0x20080024, 0x20081020, 0x20081024,
-            0x30080020, 0x30080024, 0x30081020, 0x30081024,
-            0x30080020, 0x30080024, 0x30081020, 0x30081024,
-            0x00000002, 0x00000006, 0x00001002, 0x00001006,
-            0x00000002, 0x00000006, 0x00001002, 0x00001006,
-            0x10000002, 0x10000006, 0x10001002, 0x10001006,
-            0x10000002, 0x10000006, 0x10001002, 0x10001006,
-            0x00000022, 0x00000026, 0x00001022, 0x00001026,
-            0x00000022, 0x00000026, 0x00001022, 0x00001026,
-            0x10000022, 0x10000026, 0x10001022, 0x10001026,
-            0x10000022, 0x10000026, 0x10001022, 0x10001026,
-            0x00080002, 0x00080006, 0x00081002, 0x00081006,
-            0x00080002, 0x00080006, 0x00081002, 0x00081006,
-            0x10080002, 0x10080006, 0x10081002, 0x10081006,
-            0x10080002, 0x10080006, 0x10081002, 0x10081006,
-            0x00080022, 0x00080026, 0x00081022, 0x00081026,
-            0x00080022, 0x00080026, 0x00081022, 0x00081026,
-            0x10080022, 0x10080026, 0x10081022, 0x10081026,
-            0x10080022, 0x10080026, 0x10081022, 0x10081026,
-            0x20000002, 0x20000006, 0x20001002, 0x20001006,
-            0x20000002, 0x20000006, 0x20001002, 0x20001006,
-            0x30000002, 0x30000006, 0x30001002, 0x30001006,
-            0x30000002, 0x30000006, 0x30001002, 0x30001006,
-            0x20000022, 0x20000026, 0x20001022, 0x20001026,
-            0x20000022, 0x20000026, 0x20001022, 0x20001026,
-            0x30000022, 0x30000026, 0x30001022, 0x30001026,
-            0x30000022, 0x30000026, 0x30001022, 0x30001026,
-            0x20080002, 0x20080006, 0x20081002, 0x20081006,
-            0x20080002, 0x20080006, 0x20081002, 0x20081006,
-            0x30080002, 0x30080006, 0x30081002, 0x30081006,
-            0x30080002, 0x30080006, 0x30081002, 0x30081006,
-            0x20080022, 0x20080026, 0x20081022, 0x20081026,
-            0x20080022, 0x20080026, 0x20081022, 0x20081026,
-            0x30080022, 0x30080026, 0x30081022, 0x30081026,
-            0x30080022, 0x30080026, 0x30081022, 0x30081026
-        );
-        static $pc2mapc4 = array(
-            0x00000000, 0x00100000, 0x00000008, 0x00100008,
-            0x00000200, 0x00100200, 0x00000208, 0x00100208,
-            0x00000000, 0x00100000, 0x00000008, 0x00100008,
-            0x00000200, 0x00100200, 0x00000208, 0x00100208,
-            0x04000000, 0x04100000, 0x04000008, 0x04100008,
-            0x04000200, 0x04100200, 0x04000208, 0x04100208,
-            0x04000000, 0x04100000, 0x04000008, 0x04100008,
-            0x04000200, 0x04100200, 0x04000208, 0x04100208,
-            0x00002000, 0x00102000, 0x00002008, 0x00102008,
-            0x00002200, 0x00102200, 0x00002208, 0x00102208,
-            0x00002000, 0x00102000, 0x00002008, 0x00102008,
-            0x00002200, 0x00102200, 0x00002208, 0x00102208,
-            0x04002000, 0x04102000, 0x04002008, 0x04102008,
-            0x04002200, 0x04102200, 0x04002208, 0x04102208,
-            0x04002000, 0x04102000, 0x04002008, 0x04102008,
-            0x04002200, 0x04102200, 0x04002208, 0x04102208,
-            0x00000000, 0x00100000, 0x00000008, 0x00100008,
-            0x00000200, 0x00100200, 0x00000208, 0x00100208,
-            0x00000000, 0x00100000, 0x00000008, 0x00100008,
-            0x00000200, 0x00100200, 0x00000208, 0x00100208,
-            0x04000000, 0x04100000, 0x04000008, 0x04100008,
-            0x04000200, 0x04100200, 0x04000208, 0x04100208,
-            0x04000000, 0x04100000, 0x04000008, 0x04100008,
-            0x04000200, 0x04100200, 0x04000208, 0x04100208,
-            0x00002000, 0x00102000, 0x00002008, 0x00102008,
-            0x00002200, 0x00102200, 0x00002208, 0x00102208,
-            0x00002000, 0x00102000, 0x00002008, 0x00102008,
-            0x00002200, 0x00102200, 0x00002208, 0x00102208,
-            0x04002000, 0x04102000, 0x04002008, 0x04102008,
-            0x04002200, 0x04102200, 0x04002208, 0x04102208,
-            0x04002000, 0x04102000, 0x04002008, 0x04102008,
-            0x04002200, 0x04102200, 0x04002208, 0x04102208,
-            0x00020000, 0x00120000, 0x00020008, 0x00120008,
-            0x00020200, 0x00120200, 0x00020208, 0x00120208,
-            0x00020000, 0x00120000, 0x00020008, 0x00120008,
-            0x00020200, 0x00120200, 0x00020208, 0x00120208,
-            0x04020000, 0x04120000, 0x04020008, 0x04120008,
-            0x04020200, 0x04120200, 0x04020208, 0x04120208,
-            0x04020000, 0x04120000, 0x04020008, 0x04120008,
-            0x04020200, 0x04120200, 0x04020208, 0x04120208,
-            0x00022000, 0x00122000, 0x00022008, 0x00122008,
-            0x00022200, 0x00122200, 0x00022208, 0x00122208,
-            0x00022000, 0x00122000, 0x00022008, 0x00122008,
-            0x00022200, 0x00122200, 0x00022208, 0x00122208,
-            0x04022000, 0x04122000, 0x04022008, 0x04122008,
-            0x04022200, 0x04122200, 0x04022208, 0x04122208,
-            0x04022000, 0x04122000, 0x04022008, 0x04122008,
-            0x04022200, 0x04122200, 0x04022208, 0x04122208,
-            0x00020000, 0x00120000, 0x00020008, 0x00120008,
-            0x00020200, 0x00120200, 0x00020208, 0x00120208,
-            0x00020000, 0x00120000, 0x00020008, 0x00120008,
-            0x00020200, 0x00120200, 0x00020208, 0x00120208,
-            0x04020000, 0x04120000, 0x04020008, 0x04120008,
-            0x04020200, 0x04120200, 0x04020208, 0x04120208,
-            0x04020000, 0x04120000, 0x04020008, 0x04120008,
-            0x04020200, 0x04120200, 0x04020208, 0x04120208,
-            0x00022000, 0x00122000, 0x00022008, 0x00122008,
-            0x00022200, 0x00122200, 0x00022208, 0x00122208,
-            0x00022000, 0x00122000, 0x00022008, 0x00122008,
-            0x00022200, 0x00122200, 0x00022208, 0x00122208,
-            0x04022000, 0x04122000, 0x04022008, 0x04122008,
-            0x04022200, 0x04122200, 0x04022208, 0x04122208,
-            0x04022000, 0x04122000, 0x04022008, 0x04122008,
-            0x04022200, 0x04122200, 0x04022208, 0x04122208
-        );
-        static $pc2mapd1 = array(
-            0x00000000, 0x00000001, 0x08000000, 0x08000001,
-            0x00200000, 0x00200001, 0x08200000, 0x08200001,
-            0x00000002, 0x00000003, 0x08000002, 0x08000003,
-            0x00200002, 0x00200003, 0x08200002, 0x08200003
-        );
-        static $pc2mapd2 = array(
-            0x00000000, 0x00100000, 0x00000800, 0x00100800,
-            0x00000000, 0x00100000, 0x00000800, 0x00100800,
-            0x04000000, 0x04100000, 0x04000800, 0x04100800,
-            0x04000000, 0x04100000, 0x04000800, 0x04100800,
-            0x00000004, 0x00100004, 0x00000804, 0x00100804,
-            0x00000004, 0x00100004, 0x00000804, 0x00100804,
-            0x04000004, 0x04100004, 0x04000804, 0x04100804,
-            0x04000004, 0x04100004, 0x04000804, 0x04100804,
-            0x00000000, 0x00100000, 0x00000800, 0x00100800,
-            0x00000000, 0x00100000, 0x00000800, 0x00100800,
-            0x04000000, 0x04100000, 0x04000800, 0x04100800,
-            0x04000000, 0x04100000, 0x04000800, 0x04100800,
-            0x00000004, 0x00100004, 0x00000804, 0x00100804,
-            0x00000004, 0x00100004, 0x00000804, 0x00100804,
-            0x04000004, 0x04100004, 0x04000804, 0x04100804,
-            0x04000004, 0x04100004, 0x04000804, 0x04100804,
-            0x00000200, 0x00100200, 0x00000A00, 0x00100A00,
-            0x00000200, 0x00100200, 0x00000A00, 0x00100A00,
-            0x04000200, 0x04100200, 0x04000A00, 0x04100A00,
-            0x04000200, 0x04100200, 0x04000A00, 0x04100A00,
-            0x00000204, 0x00100204, 0x00000A04, 0x00100A04,
-            0x00000204, 0x00100204, 0x00000A04, 0x00100A04,
-            0x04000204, 0x04100204, 0x04000A04, 0x04100A04,
-            0x04000204, 0x04100204, 0x04000A04, 0x04100A04,
-            0x00000200, 0x00100200, 0x00000A00, 0x00100A00,
-            0x00000200, 0x00100200, 0x00000A00, 0x00100A00,
-            0x04000200, 0x04100200, 0x04000A00, 0x04100A00,
-            0x04000200, 0x04100200, 0x04000A00, 0x04100A00,
-            0x00000204, 0x00100204, 0x00000A04, 0x00100A04,
-            0x00000204, 0x00100204, 0x00000A04, 0x00100A04,
-            0x04000204, 0x04100204, 0x04000A04, 0x04100A04,
-            0x04000204, 0x04100204, 0x04000A04, 0x04100A04,
-            0x00020000, 0x00120000, 0x00020800, 0x00120800,
-            0x00020000, 0x00120000, 0x00020800, 0x00120800,
-            0x04020000, 0x04120000, 0x04020800, 0x04120800,
-            0x04020000, 0x04120000, 0x04020800, 0x04120800,
-            0x00020004, 0x00120004, 0x00020804, 0x00120804,
-            0x00020004, 0x00120004, 0x00020804, 0x00120804,
-            0x04020004, 0x04120004, 0x04020804, 0x04120804,
-            0x04020004, 0x04120004, 0x04020804, 0x04120804,
-            0x00020000, 0x00120000, 0x00020800, 0x00120800,
-            0x00020000, 0x00120000, 0x00020800, 0x00120800,
-            0x04020000, 0x04120000, 0x04020800, 0x04120800,
-            0x04020000, 0x04120000, 0x04020800, 0x04120800,
-            0x00020004, 0x00120004, 0x00020804, 0x00120804,
-            0x00020004, 0x00120004, 0x00020804, 0x00120804,
-            0x04020004, 0x04120004, 0x04020804, 0x04120804,
-            0x04020004, 0x04120004, 0x04020804, 0x04120804,
-            0x00020200, 0x00120200, 0x00020A00, 0x00120A00,
-            0x00020200, 0x00120200, 0x00020A00, 0x00120A00,
-            0x04020200, 0x04120200, 0x04020A00, 0x04120A00,
-            0x04020200, 0x04120200, 0x04020A00, 0x04120A00,
-            0x00020204, 0x00120204, 0x00020A04, 0x00120A04,
-            0x00020204, 0x00120204, 0x00020A04, 0x00120A04,
-            0x04020204, 0x04120204, 0x04020A04, 0x04120A04,
-            0x04020204, 0x04120204, 0x04020A04, 0x04120A04,
-            0x00020200, 0x00120200, 0x00020A00, 0x00120A00,
-            0x00020200, 0x00120200, 0x00020A00, 0x00120A00,
-            0x04020200, 0x04120200, 0x04020A00, 0x04120A00,
-            0x04020200, 0x04120200, 0x04020A00, 0x04120A00,
-            0x00020204, 0x00120204, 0x00020A04, 0x00120A04,
-            0x00020204, 0x00120204, 0x00020A04, 0x00120A04,
-            0x04020204, 0x04120204, 0x04020A04, 0x04120A04,
-            0x04020204, 0x04120204, 0x04020A04, 0x04120A04
-        );
-        static $pc2mapd3 = array(
-            0x00000000, 0x00010000, 0x02000000, 0x02010000,
-            0x00000020, 0x00010020, 0x02000020, 0x02010020,
-            0x00040000, 0x00050000, 0x02040000, 0x02050000,
-            0x00040020, 0x00050020, 0x02040020, 0x02050020,
-            0x00002000, 0x00012000, 0x02002000, 0x02012000,
-            0x00002020, 0x00012020, 0x02002020, 0x02012020,
-            0x00042000, 0x00052000, 0x02042000, 0x02052000,
-            0x00042020, 0x00052020, 0x02042020, 0x02052020,
-            0x00000000, 0x00010000, 0x02000000, 0x02010000,
-            0x00000020, 0x00010020, 0x02000020, 0x02010020,
-            0x00040000, 0x00050000, 0x02040000, 0x02050000,
-            0x00040020, 0x00050020, 0x02040020, 0x02050020,
-            0x00002000, 0x00012000, 0x02002000, 0x02012000,
-            0x00002020, 0x00012020, 0x02002020, 0x02012020,
-            0x00042000, 0x00052000, 0x02042000, 0x02052000,
-            0x00042020, 0x00052020, 0x02042020, 0x02052020,
-            0x00000010, 0x00010010, 0x02000010, 0x02010010,
-            0x00000030, 0x00010030, 0x02000030, 0x02010030,
-            0x00040010, 0x00050010, 0x02040010, 0x02050010,
-            0x00040030, 0x00050030, 0x02040030, 0x02050030,
-            0x00002010, 0x00012010, 0x02002010, 0x02012010,
-            0x00002030, 0x00012030, 0x02002030, 0x02012030,
-            0x00042010, 0x00052010, 0x02042010, 0x02052010,
-            0x00042030, 0x00052030, 0x02042030, 0x02052030,
-            0x00000010, 0x00010010, 0x02000010, 0x02010010,
-            0x00000030, 0x00010030, 0x02000030, 0x02010030,
-            0x00040010, 0x00050010, 0x02040010, 0x02050010,
-            0x00040030, 0x00050030, 0x02040030, 0x02050030,
-            0x00002010, 0x00012010, 0x02002010, 0x02012010,
-            0x00002030, 0x00012030, 0x02002030, 0x02012030,
-            0x00042010, 0x00052010, 0x02042010, 0x02052010,
-            0x00042030, 0x00052030, 0x02042030, 0x02052030,
-            0x20000000, 0x20010000, 0x22000000, 0x22010000,
-            0x20000020, 0x20010020, 0x22000020, 0x22010020,
-            0x20040000, 0x20050000, 0x22040000, 0x22050000,
-            0x20040020, 0x20050020, 0x22040020, 0x22050020,
-            0x20002000, 0x20012000, 0x22002000, 0x22012000,
-            0x20002020, 0x20012020, 0x22002020, 0x22012020,
-            0x20042000, 0x20052000, 0x22042000, 0x22052000,
-            0x20042020, 0x20052020, 0x22042020, 0x22052020,
-            0x20000000, 0x20010000, 0x22000000, 0x22010000,
-            0x20000020, 0x20010020, 0x22000020, 0x22010020,
-            0x20040000, 0x20050000, 0x22040000, 0x22050000,
-            0x20040020, 0x20050020, 0x22040020, 0x22050020,
-            0x20002000, 0x20012000, 0x22002000, 0x22012000,
-            0x20002020, 0x20012020, 0x22002020, 0x22012020,
-            0x20042000, 0x20052000, 0x22042000, 0x22052000,
-            0x20042020, 0x20052020, 0x22042020, 0x22052020,
-            0x20000010, 0x20010010, 0x22000010, 0x22010010,
-            0x20000030, 0x20010030, 0x22000030, 0x22010030,
-            0x20040010, 0x20050010, 0x22040010, 0x22050010,
-            0x20040030, 0x20050030, 0x22040030, 0x22050030,
-            0x20002010, 0x20012010, 0x22002010, 0x22012010,
-            0x20002030, 0x20012030, 0x22002030, 0x22012030,
-            0x20042010, 0x20052010, 0x22042010, 0x22052010,
-            0x20042030, 0x20052030, 0x22042030, 0x22052030,
-            0x20000010, 0x20010010, 0x22000010, 0x22010010,
-            0x20000030, 0x20010030, 0x22000030, 0x22010030,
-            0x20040010, 0x20050010, 0x22040010, 0x22050010,
-            0x20040030, 0x20050030, 0x22040030, 0x22050030,
-            0x20002010, 0x20012010, 0x22002010, 0x22012010,
-            0x20002030, 0x20012030, 0x22002030, 0x22012030,
-            0x20042010, 0x20052010, 0x22042010, 0x22052010,
-            0x20042030, 0x20052030, 0x22042030, 0x22052030
-        );
-        static $pc2mapd4 = array(
-            0x00000000, 0x00000400, 0x01000000, 0x01000400,
-            0x00000000, 0x00000400, 0x01000000, 0x01000400,
-            0x00000100, 0x00000500, 0x01000100, 0x01000500,
-            0x00000100, 0x00000500, 0x01000100, 0x01000500,
-            0x10000000, 0x10000400, 0x11000000, 0x11000400,
-            0x10000000, 0x10000400, 0x11000000, 0x11000400,
-            0x10000100, 0x10000500, 0x11000100, 0x11000500,
-            0x10000100, 0x10000500, 0x11000100, 0x11000500,
-            0x00080000, 0x00080400, 0x01080000, 0x01080400,
-            0x00080000, 0x00080400, 0x01080000, 0x01080400,
-            0x00080100, 0x00080500, 0x01080100, 0x01080500,
-            0x00080100, 0x00080500, 0x01080100, 0x01080500,
-            0x10080000, 0x10080400, 0x11080000, 0x11080400,
-            0x10080000, 0x10080400, 0x11080000, 0x11080400,
-            0x10080100, 0x10080500, 0x11080100, 0x11080500,
-            0x10080100, 0x10080500, 0x11080100, 0x11080500,
-            0x00000008, 0x00000408, 0x01000008, 0x01000408,
-            0x00000008, 0x00000408, 0x01000008, 0x01000408,
-            0x00000108, 0x00000508, 0x01000108, 0x01000508,
-            0x00000108, 0x00000508, 0x01000108, 0x01000508,
-            0x10000008, 0x10000408, 0x11000008, 0x11000408,
-            0x10000008, 0x10000408, 0x11000008, 0x11000408,
-            0x10000108, 0x10000508, 0x11000108, 0x11000508,
-            0x10000108, 0x10000508, 0x11000108, 0x11000508,
-            0x00080008, 0x00080408, 0x01080008, 0x01080408,
-            0x00080008, 0x00080408, 0x01080008, 0x01080408,
-            0x00080108, 0x00080508, 0x01080108, 0x01080508,
-            0x00080108, 0x00080508, 0x01080108, 0x01080508,
-            0x10080008, 0x10080408, 0x11080008, 0x11080408,
-            0x10080008, 0x10080408, 0x11080008, 0x11080408,
-            0x10080108, 0x10080508, 0x11080108, 0x11080508,
-            0x10080108, 0x10080508, 0x11080108, 0x11080508,
-            0x00001000, 0x00001400, 0x01001000, 0x01001400,
-            0x00001000, 0x00001400, 0x01001000, 0x01001400,
-            0x00001100, 0x00001500, 0x01001100, 0x01001500,
-            0x00001100, 0x00001500, 0x01001100, 0x01001500,
-            0x10001000, 0x10001400, 0x11001000, 0x11001400,
-            0x10001000, 0x10001400, 0x11001000, 0x11001400,
-            0x10001100, 0x10001500, 0x11001100, 0x11001500,
-            0x10001100, 0x10001500, 0x11001100, 0x11001500,
-            0x00081000, 0x00081400, 0x01081000, 0x01081400,
-            0x00081000, 0x00081400, 0x01081000, 0x01081400,
-            0x00081100, 0x00081500, 0x01081100, 0x01081500,
-            0x00081100, 0x00081500, 0x01081100, 0x01081500,
-            0x10081000, 0x10081400, 0x11081000, 0x11081400,
-            0x10081000, 0x10081400, 0x11081000, 0x11081400,
-            0x10081100, 0x10081500, 0x11081100, 0x11081500,
-            0x10081100, 0x10081500, 0x11081100, 0x11081500,
-            0x00001008, 0x00001408, 0x01001008, 0x01001408,
-            0x00001008, 0x00001408, 0x01001008, 0x01001408,
-            0x00001108, 0x00001508, 0x01001108, 0x01001508,
-            0x00001108, 0x00001508, 0x01001108, 0x01001508,
-            0x10001008, 0x10001408, 0x11001008, 0x11001408,
-            0x10001008, 0x10001408, 0x11001008, 0x11001408,
-            0x10001108, 0x10001508, 0x11001108, 0x11001508,
-            0x10001108, 0x10001508, 0x11001108, 0x11001508,
-            0x00081008, 0x00081408, 0x01081008, 0x01081408,
-            0x00081008, 0x00081408, 0x01081008, 0x01081408,
-            0x00081108, 0x00081508, 0x01081108, 0x01081508,
-            0x00081108, 0x00081508, 0x01081108, 0x01081508,
-            0x10081008, 0x10081408, 0x11081008, 0x11081408,
-            0x10081008, 0x10081408, 0x11081008, 0x11081408,
-            0x10081108, 0x10081508, 0x11081108, 0x11081508,
-            0x10081108, 0x10081508, 0x11081108, 0x11081508
-        );
-
-        $keys = array();
-        for ($des_round = 0; $des_round < $this->des_rounds; ++$des_round) {
-            // pad the key and remove extra characters as appropriate.
-            $key = str_pad(substr($this->key, $des_round * 8, 8), 8, "\0");
-
-            // Perform the PC/1 transformation and compute C and D.
-            $t = unpack('Nl/Nr', $key);
-            list($l, $r) = array($t['l'], $t['r']);
-            $key = ($this->shuffle[$pc1map[ $r        & 0xFF]] & "\x80\x80\x80\x80\x80\x80\x80\x00") |
-                   ($this->shuffle[$pc1map[($r >>  8) & 0xFF]] & "\x40\x40\x40\x40\x40\x40\x40\x00") |
-                   ($this->shuffle[$pc1map[($r >> 16) & 0xFF]] & "\x20\x20\x20\x20\x20\x20\x20\x00") |
-                   ($this->shuffle[$pc1map[($r >> 24) & 0xFF]] & "\x10\x10\x10\x10\x10\x10\x10\x00") |
-                   ($this->shuffle[$pc1map[ $l        & 0xFF]] & "\x08\x08\x08\x08\x08\x08\x08\x00") |
-                   ($this->shuffle[$pc1map[($l >>  8) & 0xFF]] & "\x04\x04\x04\x04\x04\x04\x04\x00") |
-                   ($this->shuffle[$pc1map[($l >> 16) & 0xFF]] & "\x02\x02\x02\x02\x02\x02\x02\x00") |
-                   ($this->shuffle[$pc1map[($l >> 24) & 0xFF]] & "\x01\x01\x01\x01\x01\x01\x01\x00");
-            $key = unpack('Nc/Nd', $key);
-            $c = ( $key['c'] >> 4) & 0x0FFFFFFF;
-            $d = (($key['d'] >> 4) & 0x0FFFFFF0) | ($key['c'] & 0x0F);
-
-            $keys[$des_round] = array(
-                self::ENCRYPT => array(),
-                self::DECRYPT => array_fill(0, 32, 0)
-            );
-            for ($i = 0, $ki = 31; $i < 16; ++$i, $ki-= 2) {
-                $c <<= $shifts[$i];
-                $c = ($c | ($c >> 28)) & 0x0FFFFFFF;
-                $d <<= $shifts[$i];
-                $d = ($d | ($d >> 28)) & 0x0FFFFFFF;
-
-                // Perform the PC-2 transformation.
-                $cp = $pc2mapc1[ $c >> 24        ] | $pc2mapc2[($c >> 16) & 0xFF] |
-                      $pc2mapc3[($c >>  8) & 0xFF] | $pc2mapc4[ $c        & 0xFF];
-                $dp = $pc2mapd1[ $d >> 24        ] | $pc2mapd2[($d >> 16) & 0xFF] |
-                      $pc2mapd3[($d >>  8) & 0xFF] | $pc2mapd4[ $d        & 0xFF];
-
-                // Reorder: odd bytes/even bytes. Push the result in key schedule.
-                $val1 = ( $cp        & 0xFF000000) | (($cp <<  8) & 0x00FF0000) |
-                        (($dp >> 16) & 0x0000FF00) | (($dp >>  8) & 0x000000FF);
-                $val2 = (($cp <<  8) & 0xFF000000) | (($cp << 16) & 0x00FF0000) |
-                        (($dp >>  8) & 0x0000FF00) | ( $dp        & 0x000000FF);
-                $keys[$des_round][self::ENCRYPT][       ] = $val1;
-                $keys[$des_round][self::DECRYPT][$ki - 1] = $val1;
-                $keys[$des_round][self::ENCRYPT][       ] = $val2;
-                $keys[$des_round][self::DECRYPT][$ki    ] = $val2;
-            }
-        }
-
-        switch ($this->des_rounds) {
-            case 3: // 3DES keys
-                $this->keys = array(
-                    self::ENCRYPT => array_merge(
-                        $keys[0][self::ENCRYPT],
-                        $keys[1][self::DECRYPT],
-                        $keys[2][self::ENCRYPT]
-                    ),
-                    self::DECRYPT => array_merge(
-                        $keys[2][self::DECRYPT],
-                        $keys[1][self::ENCRYPT],
-                        $keys[0][self::DECRYPT]
-                    )
-                );
-                break;
-            // case 1: // DES keys
-            default:
-                $this->keys = array(
-                    self::ENCRYPT => $keys[0][self::ENCRYPT],
-                    self::DECRYPT => $keys[0][self::DECRYPT]
-                );
-        }
-    }
-
-    /**
-     * Setup the performance-optimized function for de/encrypt()
-     *
-     * @see \phpseclib\Crypt\Base::_setupInlineCrypt()
-     * @access private
-     */
-    function _setupInlineCrypt()
-    {
-        $lambda_functions =& self::_getLambdaFunctions();
-
-        // Engine configuration for:
-        // -  DES ($des_rounds == 1) or
-        // - 3DES ($des_rounds == 3)
-        $des_rounds = $this->des_rounds;
-
-        // We create max. 10 hi-optimized code for memory reason. Means: For each $key one ultra fast inline-crypt function.
-        // (Currently, for DES, one generated $lambda_function cost on php5.5@32bit ~135kb unfreeable mem and ~230kb on php5.5@64bit)
-        // (Currently, for TripleDES, one generated $lambda_function cost on php5.5@32bit ~240kb unfreeable mem and ~340kb on php5.5@64bit)
-        // After that, we'll still create very fast optimized code but not the hi-ultimative code, for each $mode one
-        $gen_hi_opt_code = (bool)( count($lambda_functions) < 10 );
-
-        // Generation of a unique hash for our generated code
-        $code_hash = "Crypt_DES, $des_rounds, {$this->mode}";
-        if ($gen_hi_opt_code) {
-            // For hi-optimized code, we create for each combination of
-            // $mode, $des_rounds and $this->key its own encrypt/decrypt function.
-            // After max 10 hi-optimized functions, we create generic
-            // (still very fast.. but not ultra) functions for each $mode/$des_rounds
-            // Currently 2 * 5 generic functions will be then max. possible.
-            $code_hash = str_pad($code_hash, 32) . $this->_hashInlineCryptFunction($this->key);
-        }
-
-        // Is there a re-usable $lambda_functions in there? If not, we have to create it.
-        if (!isset($lambda_functions[$code_hash])) {
-            // Init code for both, encrypt and decrypt.
-            $init_crypt = 'static $sbox1, $sbox2, $sbox3, $sbox4, $sbox5, $sbox6, $sbox7, $sbox8, $shuffleip, $shuffleinvip;
-                if (!$sbox1) {
-                    $sbox1 = array_map("intval", $self->sbox1);
-                    $sbox2 = array_map("intval", $self->sbox2);
-                    $sbox3 = array_map("intval", $self->sbox3);
-                    $sbox4 = array_map("intval", $self->sbox4);
-                    $sbox5 = array_map("intval", $self->sbox5);
-                    $sbox6 = array_map("intval", $self->sbox6);
-                    $sbox7 = array_map("intval", $self->sbox7);
-                    $sbox8 = array_map("intval", $self->sbox8);'
-                    /* Merge $shuffle with $[inv]ipmap */ . '
-                    for ($i = 0; $i < 256; ++$i) {
-                        $shuffleip[]    =  $self->shuffle[$self->ipmap[$i]];
-                        $shuffleinvip[] =  $self->shuffle[$self->invipmap[$i]];
-                    }
-                }
-            ';
-
-            switch (true) {
-                case $gen_hi_opt_code:
-                    // In Hi-optimized code mode, we use our [3]DES key schedule as hardcoded integers.
-                    // No futher initialisation of the $keys schedule is necessary.
-                    // That is the extra performance boost.
-                    $k = array(
-                        self::ENCRYPT => $this->keys[self::ENCRYPT],
-                        self::DECRYPT => $this->keys[self::DECRYPT]
-                    );
-                    $init_encrypt = '';
-                    $init_decrypt = '';
-                    break;
-                default:
-                    // In generic optimized code mode, we have to use, as the best compromise [currently],
-                    // our key schedule as $ke/$kd arrays. (with hardcoded indexes...)
-                    $k = array(
-                        self::ENCRYPT => array(),
-                        self::DECRYPT => array()
-                    );
-                    for ($i = 0, $c = count($this->keys[self::ENCRYPT]); $i < $c; ++$i) {
-                        $k[self::ENCRYPT][$i] = '$ke[' . $i . ']';
-                        $k[self::DECRYPT][$i] = '$kd[' . $i . ']';
-                    }
-                    $init_encrypt = '$ke = $self->keys[self::ENCRYPT];';
-                    $init_decrypt = '$kd = $self->keys[self::DECRYPT];';
-                    break;
-            }
-
-            // Creating code for en- and decryption.
-            $crypt_block = array();
-            foreach (array(self::ENCRYPT, self::DECRYPT) as $c) {
-                /* Do the initial IP permutation. */
-                $crypt_block[$c] = '
-                    $in = unpack("N*", $in);
-                    $l  = $in[1];
-                    $r  = $in[2];
-                    $in = unpack("N*",
-                        ($shuffleip[ $r        & 0xFF] & "\x80\x80\x80\x80\x80\x80\x80\x80") |
-                        ($shuffleip[($r >>  8) & 0xFF] & "\x40\x40\x40\x40\x40\x40\x40\x40") |
-                        ($shuffleip[($r >> 16) & 0xFF] & "\x20\x20\x20\x20\x20\x20\x20\x20") |
-                        ($shuffleip[($r >> 24) & 0xFF] & "\x10\x10\x10\x10\x10\x10\x10\x10") |
-                        ($shuffleip[ $l        & 0xFF] & "\x08\x08\x08\x08\x08\x08\x08\x08") |
-                        ($shuffleip[($l >>  8) & 0xFF] & "\x04\x04\x04\x04\x04\x04\x04\x04") |
-                        ($shuffleip[($l >> 16) & 0xFF] & "\x02\x02\x02\x02\x02\x02\x02\x02") |
-                        ($shuffleip[($l >> 24) & 0xFF] & "\x01\x01\x01\x01\x01\x01\x01\x01")
-                    );
-                    ' . /* Extract L0 and R0 */ '
-                    $l = $in[1];
-                    $r = $in[2];
-                ';
-
-                $l = '$l';
-                $r = '$r';
-
-                // Perform DES or 3DES.
-                for ($ki = -1, $des_round = 0; $des_round < $des_rounds; ++$des_round) {
-                    // Perform the 16 steps.
-                    for ($i = 0; $i < 16; ++$i) {
-                        // start of "the Feistel (F) function" - see the following URL:
-                        // http://en.wikipedia.org/wiki/Image:Data_Encryption_Standard_InfoBox_Diagram.png
-                        // Merge key schedule.
-                        $crypt_block[$c].= '
-                            $b1 = ((' . $r . ' >>  3) & 0x1FFFFFFF)  ^ (' . $r . ' << 29) ^ ' . $k[$c][++$ki] . ';
-                            $b2 = ((' . $r . ' >> 31) & 0x00000001)  ^ (' . $r . ' <<  1) ^ ' . $k[$c][++$ki] . ';' .
-                            /* S-box indexing. */
-                            $l . ' = $sbox1[($b1 >> 24) & 0x3F] ^ $sbox2[($b2 >> 24) & 0x3F] ^
-                                     $sbox3[($b1 >> 16) & 0x3F] ^ $sbox4[($b2 >> 16) & 0x3F] ^
-                                     $sbox5[($b1 >>  8) & 0x3F] ^ $sbox6[($b2 >>  8) & 0x3F] ^
-                                     $sbox7[ $b1        & 0x3F] ^ $sbox8[ $b2        & 0x3F] ^ ' . $l . ';
-                        ';
-                        // end of "the Feistel (F) function"
-
-                        // swap L & R
-                        list($l, $r) = array($r, $l);
-                    }
-                    list($l, $r) = array($r, $l);
-                }
-
-                // Perform the inverse IP permutation.
-                $crypt_block[$c].= '$in =
-                    ($shuffleinvip[($l >> 24) & 0xFF] & "\x80\x80\x80\x80\x80\x80\x80\x80") |
-                    ($shuffleinvip[($r >> 24) & 0xFF] & "\x40\x40\x40\x40\x40\x40\x40\x40") |
-                    ($shuffleinvip[($l >> 16) & 0xFF] & "\x20\x20\x20\x20\x20\x20\x20\x20") |
-                    ($shuffleinvip[($r >> 16) & 0xFF] & "\x10\x10\x10\x10\x10\x10\x10\x10") |
-                    ($shuffleinvip[($l >>  8) & 0xFF] & "\x08\x08\x08\x08\x08\x08\x08\x08") |
-                    ($shuffleinvip[($r >>  8) & 0xFF] & "\x04\x04\x04\x04\x04\x04\x04\x04") |
-                    ($shuffleinvip[ $l        & 0xFF] & "\x02\x02\x02\x02\x02\x02\x02\x02") |
-                    ($shuffleinvip[ $r        & 0xFF] & "\x01\x01\x01\x01\x01\x01\x01\x01");
-                ';
-            }
-
-            // Creates the inline-crypt function
-            $lambda_functions[$code_hash] = $this->_createInlineCryptFunction(
-                array(
-                   'init_crypt'    => $init_crypt,
-                   'init_encrypt'  => $init_encrypt,
-                   'init_decrypt'  => $init_decrypt,
-                   'encrypt_block' => $crypt_block[self::ENCRYPT],
-                   'decrypt_block' => $crypt_block[self::DECRYPT]
-                )
-            );
-        }
-
-        // Set the inline-crypt function as callback in: $this->inline_crypt
-        $this->inline_crypt = $lambda_functions[$code_hash];
-    }
-}
diff --git a/mayor-orig/www/include/share/googleapi/phpseclib/phpseclib/phpseclib/Crypt/Hash.php b/mayor-orig/www/include/share/googleapi/phpseclib/phpseclib/phpseclib/Crypt/Hash.php
deleted file mode 100644
index 07665a16..00000000
--- a/mayor-orig/www/include/share/googleapi/phpseclib/phpseclib/phpseclib/Crypt/Hash.php
+++ /dev/null
@@ -1,824 +0,0 @@
-
- * setKey('abcdefg');
- *
- *    echo base64_encode($hash->hash('abcdefg'));
- * ?>
- * 
- *
- * @category  Crypt
- * @package   Hash
- * @author    Jim Wigginton 
- * @copyright 2007 Jim Wigginton
- * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
- * @link      http://phpseclib.sourceforge.net
- */
-
-namespace phpseclib\Crypt;
-
-use phpseclib\Math\BigInteger;
-
-/**
- * Pure-PHP implementations of keyed-hash message authentication codes (HMACs) and various cryptographic hashing functions.
- *
- * @package Hash
- * @author  Jim Wigginton 
- * @access  public
- */
-class Hash
-{
-    /**#@+
-     * @access private
-     * @see \phpseclib\Crypt\Hash::__construct()
-     */
-    /**
-     * Toggles the internal implementation
-     */
-    const MODE_INTERNAL = 1;
-    /**
-     * Toggles the mhash() implementation, which has been deprecated on PHP 5.3.0+.
-     */
-    const MODE_MHASH = 2;
-    /**
-     * Toggles the hash() implementation, which works on PHP 5.1.2+.
-     */
-    const MODE_HASH = 3;
-    /**#@-*/
-
-    /**
-     * Hash Parameter
-     *
-     * @see self::setHash()
-     * @var int
-     * @access private
-     */
-    var $hashParam;
-
-    /**
-     * Byte-length of compression blocks / key (Internal HMAC)
-     *
-     * @see self::setAlgorithm()
-     * @var int
-     * @access private
-     */
-    var $b;
-
-    /**
-     * Byte-length of hash output (Internal HMAC)
-     *
-     * @see self::setHash()
-     * @var int
-     * @access private
-     */
-    var $l = false;
-
-    /**
-     * Hash Algorithm
-     *
-     * @see self::setHash()
-     * @var string
-     * @access private
-     */
-    var $hash;
-
-    /**
-     * Key
-     *
-     * @see self::setKey()
-     * @var string
-     * @access private
-     */
-    var $key = false;
-
-    /**
-     * Outer XOR (Internal HMAC)
-     *
-     * @see self::setKey()
-     * @var string
-     * @access private
-     */
-    var $opad;
-
-    /**
-     * Inner XOR (Internal HMAC)
-     *
-     * @see self::setKey()
-     * @var string
-     * @access private
-     */
-    var $ipad;
-
-    /**
-     * Default Constructor.
-     *
-     * @param string $hash
-     * @return \phpseclib\Crypt\Hash
-     * @access public
-     */
-    function __construct($hash = 'sha1')
-    {
-        if (!defined('CRYPT_HASH_MODE')) {
-            switch (true) {
-                case extension_loaded('hash'):
-                    define('CRYPT_HASH_MODE', self::MODE_HASH);
-                    break;
-                case extension_loaded('mhash'):
-                    define('CRYPT_HASH_MODE', self::MODE_MHASH);
-                    break;
-                default:
-                    define('CRYPT_HASH_MODE', self::MODE_INTERNAL);
-            }
-        }
-
-        $this->setHash($hash);
-    }
-
-    /**
-     * Sets the key for HMACs
-     *
-     * Keys can be of any length.
-     *
-     * @access public
-     * @param string $key
-     */
-    function setKey($key = false)
-    {
-        $this->key = $key;
-    }
-
-    /**
-     * Gets the hash function.
-     *
-     * As set by the constructor or by the setHash() method.
-     *
-     * @access public
-     * @return string
-     */
-    function getHash()
-    {
-        return $this->hashParam;
-    }
-
-    /**
-     * Sets the hash function.
-     *
-     * @access public
-     * @param string $hash
-     */
-    function setHash($hash)
-    {
-        $this->hashParam = $hash = strtolower($hash);
-        switch ($hash) {
-            case 'md5-96':
-            case 'sha1-96':
-            case 'sha256-96':
-            case 'sha512-96':
-                $hash = substr($hash, 0, -3);
-                $this->l = 12; // 96 / 8 = 12
-                break;
-            case 'md2':
-            case 'md5':
-                $this->l = 16;
-                break;
-            case 'sha1':
-                $this->l = 20;
-                break;
-            case 'sha256':
-                $this->l = 32;
-                break;
-            case 'sha384':
-                $this->l = 48;
-                break;
-            case 'sha512':
-                $this->l = 64;
-        }
-
-        switch ($hash) {
-            case 'md2':
-                $mode = CRYPT_HASH_MODE == self::MODE_HASH && in_array('md2', hash_algos()) ?
-                    self::MODE_HASH : self::MODE_INTERNAL;
-                break;
-            case 'sha384':
-            case 'sha512':
-                $mode = CRYPT_HASH_MODE == self::MODE_MHASH ? self::MODE_INTERNAL : CRYPT_HASH_MODE;
-                break;
-            default:
-                $mode = CRYPT_HASH_MODE;
-        }
-
-        switch ($mode) {
-            case self::MODE_MHASH:
-                switch ($hash) {
-                    case 'md5':
-                        $this->hash = MHASH_MD5;
-                        break;
-                    case 'sha256':
-                        $this->hash = MHASH_SHA256;
-                        break;
-                    case 'sha1':
-                    default:
-                        $this->hash = MHASH_SHA1;
-                }
-                return;
-            case self::MODE_HASH:
-                switch ($hash) {
-                    case 'md5':
-                        $this->hash = 'md5';
-                        return;
-                    case 'md2':
-                    case 'sha256':
-                    case 'sha384':
-                    case 'sha512':
-                        $this->hash = $hash;
-                        return;
-                    case 'sha1':
-                    default:
-                        $this->hash = 'sha1';
-                }
-                return;
-        }
-
-        switch ($hash) {
-            case 'md2':
-                $this->b = 16;
-                $this->hash = array($this, '_md2');
-                break;
-            case 'md5':
-                $this->b = 64;
-                $this->hash = array($this, '_md5');
-                break;
-            case 'sha256':
-                $this->b = 64;
-                $this->hash = array($this, '_sha256');
-                break;
-            case 'sha384':
-            case 'sha512':
-                $this->b = 128;
-                $this->hash = array($this, '_sha512');
-                break;
-            case 'sha1':
-            default:
-                $this->b = 64;
-                $this->hash = array($this, '_sha1');
-        }
-
-        $this->ipad = str_repeat(chr(0x36), $this->b);
-        $this->opad = str_repeat(chr(0x5C), $this->b);
-    }
-
-    /**
-     * Compute the HMAC.
-     *
-     * @access public
-     * @param string $text
-     * @return string
-     */
-    function hash($text)
-    {
-        $mode = is_array($this->hash) ? self::MODE_INTERNAL : CRYPT_HASH_MODE;
-
-        if (!empty($this->key) || is_string($this->key)) {
-            switch ($mode) {
-                case self::MODE_MHASH:
-                    $output = mhash($this->hash, $text, $this->key);
-                    break;
-                case self::MODE_HASH:
-                    $output = hash_hmac($this->hash, $text, $this->key, true);
-                    break;
-                case self::MODE_INTERNAL:
-                    /* "Applications that use keys longer than B bytes will first hash the key using H and then use the
-                        resultant L byte string as the actual key to HMAC."
-
-                        -- http://tools.ietf.org/html/rfc2104#section-2 */
-                    $key = strlen($this->key) > $this->b ? call_user_func($this->hash, $this->key) : $this->key;
-
-                    $key    = str_pad($key, $this->b, chr(0));      // step 1
-                    $temp   = $this->ipad ^ $key;                   // step 2
-                    $temp  .= $text;                                // step 3
-                    $temp   = call_user_func($this->hash, $temp);   // step 4
-                    $output = $this->opad ^ $key;                   // step 5
-                    $output.= $temp;                                // step 6
-                    $output = call_user_func($this->hash, $output); // step 7
-            }
-        } else {
-            switch ($mode) {
-                case self::MODE_MHASH:
-                    $output = mhash($this->hash, $text);
-                    break;
-                case self::MODE_HASH:
-                    $output = hash($this->hash, $text, true);
-                    break;
-                case self::MODE_INTERNAL:
-                    $output = call_user_func($this->hash, $text);
-            }
-        }
-
-        return substr($output, 0, $this->l);
-    }
-
-    /**
-     * Returns the hash length (in bytes)
-     *
-     * @access public
-     * @return int
-     */
-    function getLength()
-    {
-        return $this->l;
-    }
-
-    /**
-     * Wrapper for MD5
-     *
-     * @access private
-     * @param string $m
-     */
-    function _md5($m)
-    {
-        return pack('H*', md5($m));
-    }
-
-    /**
-     * Wrapper for SHA1
-     *
-     * @access private
-     * @param string $m
-     */
-    function _sha1($m)
-    {
-        return pack('H*', sha1($m));
-    }
-
-    /**
-     * Pure-PHP implementation of MD2
-     *
-     * See {@link http://tools.ietf.org/html/rfc1319 RFC1319}.
-     *
-     * @access private
-     * @param string $m
-     */
-    function _md2($m)
-    {
-        static $s = array(
-             41,  46,  67, 201, 162, 216, 124,   1,  61,  54,  84, 161, 236, 240, 6,
-             19,  98, 167,   5, 243, 192, 199, 115, 140, 152, 147,  43, 217, 188,
-             76, 130, 202,  30, 155,  87,  60, 253, 212, 224,  22, 103,  66, 111, 24,
-            138,  23, 229,  18, 190,  78, 196, 214, 218, 158, 222,  73, 160, 251,
-            245, 142, 187,  47, 238, 122, 169, 104, 121, 145,  21, 178,   7,  63,
-            148, 194,  16, 137,  11,  34,  95,  33, 128, 127,  93, 154,  90, 144, 50,
-             39,  53,  62, 204, 231, 191, 247, 151,   3, 255,  25,  48, 179,  72, 165,
-            181, 209, 215,  94, 146,  42, 172,  86, 170, 198,  79, 184,  56, 210,
-            150, 164, 125, 182, 118, 252, 107, 226, 156, 116,   4, 241,  69, 157,
-            112,  89, 100, 113, 135,  32, 134,  91, 207, 101, 230,  45, 168,   2, 27,
-             96,  37, 173, 174, 176, 185, 246,  28,  70,  97, 105,  52,  64, 126, 15,
-             85,  71, 163,  35, 221,  81, 175,  58, 195,  92, 249, 206, 186, 197,
-            234,  38,  44,  83,  13, 110, 133,  40, 132,   9, 211, 223, 205, 244, 65,
-            129,  77,  82, 106, 220,  55, 200, 108, 193, 171, 250,  36, 225, 123,
-              8,  12, 189, 177,  74, 120, 136, 149, 139, 227,  99, 232, 109, 233,
-            203, 213, 254,  59,   0,  29,  57, 242, 239, 183,  14, 102,  88, 208, 228,
-            166, 119, 114, 248, 235, 117,  75,  10,  49,  68,  80, 180, 143, 237,
-             31,  26, 219, 153, 141,  51, 159,  17, 131, 20
-        );
-
-        // Step 1. Append Padding Bytes
-        $pad = 16 - (strlen($m) & 0xF);
-        $m.= str_repeat(chr($pad), $pad);
-
-        $length = strlen($m);
-
-        // Step 2. Append Checksum
-        $c = str_repeat(chr(0), 16);
-        $l = chr(0);
-        for ($i = 0; $i < $length; $i+= 16) {
-            for ($j = 0; $j < 16; $j++) {
-                // RFC1319 incorrectly states that C[j] should be set to S[c xor L]
-                //$c[$j] = chr($s[ord($m[$i + $j] ^ $l)]);
-                // per , however, C[j] should be set to S[c xor L] xor C[j]
-                $c[$j] = chr($s[ord($m[$i + $j] ^ $l)] ^ ord($c[$j]));
-                $l = $c[$j];
-            }
-        }
-        $m.= $c;
-
-        $length+= 16;
-
-        // Step 3. Initialize MD Buffer
-        $x = str_repeat(chr(0), 48);
-
-        // Step 4. Process Message in 16-Byte Blocks
-        for ($i = 0; $i < $length; $i+= 16) {
-            for ($j = 0; $j < 16; $j++) {
-                $x[$j + 16] = $m[$i + $j];
-                $x[$j + 32] = $x[$j + 16] ^ $x[$j];
-            }
-            $t = chr(0);
-            for ($j = 0; $j < 18; $j++) {
-                for ($k = 0; $k < 48; $k++) {
-                    $x[$k] = $t = $x[$k] ^ chr($s[ord($t)]);
-                    //$t = $x[$k] = $x[$k] ^ chr($s[ord($t)]);
-                }
-                $t = chr(ord($t) + $j);
-            }
-        }
-
-        // Step 5. Output
-        return substr($x, 0, 16);
-    }
-
-    /**
-     * Pure-PHP implementation of SHA256
-     *
-     * See {@link http://en.wikipedia.org/wiki/SHA_hash_functions#SHA-256_.28a_SHA-2_variant.29_pseudocode SHA-256 (a SHA-2 variant) pseudocode - Wikipedia}.
-     *
-     * @access private
-     * @param string $m
-     */
-    function _sha256($m)
-    {
-        if (extension_loaded('suhosin')) {
-            return pack('H*', sha256($m));
-        }
-
-        // Initialize variables
-        $hash = array(
-            0x6a09e667, 0xbb67ae85, 0x3c6ef372, 0xa54ff53a, 0x510e527f, 0x9b05688c, 0x1f83d9ab, 0x5be0cd19
-        );
-        // Initialize table of round constants
-        // (first 32 bits of the fractional parts of the cube roots of the first 64 primes 2..311)
-        static $k = array(
-            0x428a2f98, 0x71374491, 0xb5c0fbcf, 0xe9b5dba5, 0x3956c25b, 0x59f111f1, 0x923f82a4, 0xab1c5ed5,
-            0xd807aa98, 0x12835b01, 0x243185be, 0x550c7dc3, 0x72be5d74, 0x80deb1fe, 0x9bdc06a7, 0xc19bf174,
-            0xe49b69c1, 0xefbe4786, 0x0fc19dc6, 0x240ca1cc, 0x2de92c6f, 0x4a7484aa, 0x5cb0a9dc, 0x76f988da,
-            0x983e5152, 0xa831c66d, 0xb00327c8, 0xbf597fc7, 0xc6e00bf3, 0xd5a79147, 0x06ca6351, 0x14292967,
-            0x27b70a85, 0x2e1b2138, 0x4d2c6dfc, 0x53380d13, 0x650a7354, 0x766a0abb, 0x81c2c92e, 0x92722c85,
-            0xa2bfe8a1, 0xa81a664b, 0xc24b8b70, 0xc76c51a3, 0xd192e819, 0xd6990624, 0xf40e3585, 0x106aa070,
-            0x19a4c116, 0x1e376c08, 0x2748774c, 0x34b0bcb5, 0x391c0cb3, 0x4ed8aa4a, 0x5b9cca4f, 0x682e6ff3,
-            0x748f82ee, 0x78a5636f, 0x84c87814, 0x8cc70208, 0x90befffa, 0xa4506ceb, 0xbef9a3f7, 0xc67178f2
-        );
-
-        // Pre-processing
-        $length = strlen($m);
-        // to round to nearest 56 mod 64, we'll add 64 - (length + (64 - 56)) % 64
-        $m.= str_repeat(chr(0), 64 - (($length + 8) & 0x3F));
-        $m[$length] = chr(0x80);
-        // we don't support hashing strings 512MB long
-        $m.= pack('N2', 0, $length << 3);
-
-        // Process the message in successive 512-bit chunks
-        $chunks = str_split($m, 64);
-        foreach ($chunks as $chunk) {
-            $w = array();
-            for ($i = 0; $i < 16; $i++) {
-                extract(unpack('Ntemp', $this->_string_shift($chunk, 4)));
-                $w[] = $temp;
-            }
-
-            // Extend the sixteen 32-bit words into sixty-four 32-bit words
-            for ($i = 16; $i < 64; $i++) {
-                // @codingStandardsIgnoreStart
-                $s0 = $this->_rightRotate($w[$i - 15],  7) ^
-                      $this->_rightRotate($w[$i - 15], 18) ^
-                      $this->_rightShift( $w[$i - 15],  3);
-                $s1 = $this->_rightRotate($w[$i - 2], 17) ^
-                      $this->_rightRotate($w[$i - 2], 19) ^
-                      $this->_rightShift( $w[$i - 2], 10);
-                // @codingStandardsIgnoreEnd
-                $w[$i] = $this->_add($w[$i - 16], $s0, $w[$i - 7], $s1);
-            }
-
-            // Initialize hash value for this chunk
-            list($a, $b, $c, $d, $e, $f, $g, $h) = $hash;
-
-            // Main loop
-            for ($i = 0; $i < 64; $i++) {
-                $s0 = $this->_rightRotate($a,  2) ^
-                      $this->_rightRotate($a, 13) ^
-                      $this->_rightRotate($a, 22);
-                $maj = ($a & $b) ^
-                       ($a & $c) ^
-                       ($b & $c);
-                $t2 = $this->_add($s0, $maj);
-
-                $s1 = $this->_rightRotate($e,  6) ^
-                      $this->_rightRotate($e, 11) ^
-                      $this->_rightRotate($e, 25);
-                $ch = ($e & $f) ^
-                      ($this->_not($e) & $g);
-                $t1 = $this->_add($h, $s1, $ch, $k[$i], $w[$i]);
-
-                $h = $g;
-                $g = $f;
-                $f = $e;
-                $e = $this->_add($d, $t1);
-                $d = $c;
-                $c = $b;
-                $b = $a;
-                $a = $this->_add($t1, $t2);
-            }
-
-            // Add this chunk's hash to result so far
-            $hash = array(
-                $this->_add($hash[0], $a),
-                $this->_add($hash[1], $b),
-                $this->_add($hash[2], $c),
-                $this->_add($hash[3], $d),
-                $this->_add($hash[4], $e),
-                $this->_add($hash[5], $f),
-                $this->_add($hash[6], $g),
-                $this->_add($hash[7], $h)
-            );
-        }
-
-        // Produce the final hash value (big-endian)
-        return pack('N8', $hash[0], $hash[1], $hash[2], $hash[3], $hash[4], $hash[5], $hash[6], $hash[7]);
-    }
-
-    /**
-     * Pure-PHP implementation of SHA384 and SHA512
-     *
-     * @access private
-     * @param string $m
-     */
-    function _sha512($m)
-    {
-        static $init384, $init512, $k;
-
-        if (!isset($k)) {
-            // Initialize variables
-            $init384 = array( // initial values for SHA384
-                'cbbb9d5dc1059ed8', '629a292a367cd507', '9159015a3070dd17', '152fecd8f70e5939',
-                '67332667ffc00b31', '8eb44a8768581511', 'db0c2e0d64f98fa7', '47b5481dbefa4fa4'
-            );
-            $init512 = array( // initial values for SHA512
-                '6a09e667f3bcc908', 'bb67ae8584caa73b', '3c6ef372fe94f82b', 'a54ff53a5f1d36f1',
-                '510e527fade682d1', '9b05688c2b3e6c1f', '1f83d9abfb41bd6b', '5be0cd19137e2179'
-            );
-
-            for ($i = 0; $i < 8; $i++) {
-                $init384[$i] = new BigInteger($init384[$i], 16);
-                $init384[$i]->setPrecision(64);
-                $init512[$i] = new BigInteger($init512[$i], 16);
-                $init512[$i]->setPrecision(64);
-            }
-
-            // Initialize table of round constants
-            // (first 64 bits of the fractional parts of the cube roots of the first 80 primes 2..409)
-            $k = array(
-                '428a2f98d728ae22', '7137449123ef65cd', 'b5c0fbcfec4d3b2f', 'e9b5dba58189dbbc',
-                '3956c25bf348b538', '59f111f1b605d019', '923f82a4af194f9b', 'ab1c5ed5da6d8118',
-                'd807aa98a3030242', '12835b0145706fbe', '243185be4ee4b28c', '550c7dc3d5ffb4e2',
-                '72be5d74f27b896f', '80deb1fe3b1696b1', '9bdc06a725c71235', 'c19bf174cf692694',
-                'e49b69c19ef14ad2', 'efbe4786384f25e3', '0fc19dc68b8cd5b5', '240ca1cc77ac9c65',
-                '2de92c6f592b0275', '4a7484aa6ea6e483', '5cb0a9dcbd41fbd4', '76f988da831153b5',
-                '983e5152ee66dfab', 'a831c66d2db43210', 'b00327c898fb213f', 'bf597fc7beef0ee4',
-                'c6e00bf33da88fc2', 'd5a79147930aa725', '06ca6351e003826f', '142929670a0e6e70',
-                '27b70a8546d22ffc', '2e1b21385c26c926', '4d2c6dfc5ac42aed', '53380d139d95b3df',
-                '650a73548baf63de', '766a0abb3c77b2a8', '81c2c92e47edaee6', '92722c851482353b',
-                'a2bfe8a14cf10364', 'a81a664bbc423001', 'c24b8b70d0f89791', 'c76c51a30654be30',
-                'd192e819d6ef5218', 'd69906245565a910', 'f40e35855771202a', '106aa07032bbd1b8',
-                '19a4c116b8d2d0c8', '1e376c085141ab53', '2748774cdf8eeb99', '34b0bcb5e19b48a8',
-                '391c0cb3c5c95a63', '4ed8aa4ae3418acb', '5b9cca4f7763e373', '682e6ff3d6b2b8a3',
-                '748f82ee5defb2fc', '78a5636f43172f60', '84c87814a1f0ab72', '8cc702081a6439ec',
-                '90befffa23631e28', 'a4506cebde82bde9', 'bef9a3f7b2c67915', 'c67178f2e372532b',
-                'ca273eceea26619c', 'd186b8c721c0c207', 'eada7dd6cde0eb1e', 'f57d4f7fee6ed178',
-                '06f067aa72176fba', '0a637dc5a2c898a6', '113f9804bef90dae', '1b710b35131c471b',
-                '28db77f523047d84', '32caab7b40c72493', '3c9ebe0a15c9bebc', '431d67c49c100d4c',
-                '4cc5d4becb3e42b6', '597f299cfc657e2a', '5fcb6fab3ad6faec', '6c44198c4a475817'
-            );
-
-            for ($i = 0; $i < 80; $i++) {
-                $k[$i] = new BigInteger($k[$i], 16);
-            }
-        }
-
-        $hash = $this->l == 48 ? $init384 : $init512;
-
-        // Pre-processing
-        $length = strlen($m);
-        // to round to nearest 112 mod 128, we'll add 128 - (length + (128 - 112)) % 128
-        $m.= str_repeat(chr(0), 128 - (($length + 16) & 0x7F));
-        $m[$length] = chr(0x80);
-        // we don't support hashing strings 512MB long
-        $m.= pack('N4', 0, 0, 0, $length << 3);
-
-        // Process the message in successive 1024-bit chunks
-        $chunks = str_split($m, 128);
-        foreach ($chunks as $chunk) {
-            $w = array();
-            for ($i = 0; $i < 16; $i++) {
-                $temp = new BigInteger($this->_string_shift($chunk, 8), 256);
-                $temp->setPrecision(64);
-                $w[] = $temp;
-            }
-
-            // Extend the sixteen 32-bit words into eighty 32-bit words
-            for ($i = 16; $i < 80; $i++) {
-                $temp = array(
-                          $w[$i - 15]->bitwise_rightRotate(1),
-                          $w[$i - 15]->bitwise_rightRotate(8),
-                          $w[$i - 15]->bitwise_rightShift(7)
-                );
-                $s0 = $temp[0]->bitwise_xor($temp[1]);
-                $s0 = $s0->bitwise_xor($temp[2]);
-                $temp = array(
-                          $w[$i - 2]->bitwise_rightRotate(19),
-                          $w[$i - 2]->bitwise_rightRotate(61),
-                          $w[$i - 2]->bitwise_rightShift(6)
-                );
-                $s1 = $temp[0]->bitwise_xor($temp[1]);
-                $s1 = $s1->bitwise_xor($temp[2]);
-                $w[$i] = $w[$i - 16]->copy();
-                $w[$i] = $w[$i]->add($s0);
-                $w[$i] = $w[$i]->add($w[$i - 7]);
-                $w[$i] = $w[$i]->add($s1);
-            }
-
-            // Initialize hash value for this chunk
-            $a = $hash[0]->copy();
-            $b = $hash[1]->copy();
-            $c = $hash[2]->copy();
-            $d = $hash[3]->copy();
-            $e = $hash[4]->copy();
-            $f = $hash[5]->copy();
-            $g = $hash[6]->copy();
-            $h = $hash[7]->copy();
-
-            // Main loop
-            for ($i = 0; $i < 80; $i++) {
-                $temp = array(
-                    $a->bitwise_rightRotate(28),
-                    $a->bitwise_rightRotate(34),
-                    $a->bitwise_rightRotate(39)
-                );
-                $s0 = $temp[0]->bitwise_xor($temp[1]);
-                $s0 = $s0->bitwise_xor($temp[2]);
-                $temp = array(
-                    $a->bitwise_and($b),
-                    $a->bitwise_and($c),
-                    $b->bitwise_and($c)
-                );
-                $maj = $temp[0]->bitwise_xor($temp[1]);
-                $maj = $maj->bitwise_xor($temp[2]);
-                $t2 = $s0->add($maj);
-
-                $temp = array(
-                    $e->bitwise_rightRotate(14),
-                    $e->bitwise_rightRotate(18),
-                    $e->bitwise_rightRotate(41)
-                );
-                $s1 = $temp[0]->bitwise_xor($temp[1]);
-                $s1 = $s1->bitwise_xor($temp[2]);
-                $temp = array(
-                    $e->bitwise_and($f),
-                    $g->bitwise_and($e->bitwise_not())
-                );
-                $ch = $temp[0]->bitwise_xor($temp[1]);
-                $t1 = $h->add($s1);
-                $t1 = $t1->add($ch);
-                $t1 = $t1->add($k[$i]);
-                $t1 = $t1->add($w[$i]);
-
-                $h = $g->copy();
-                $g = $f->copy();
-                $f = $e->copy();
-                $e = $d->add($t1);
-                $d = $c->copy();
-                $c = $b->copy();
-                $b = $a->copy();
-                $a = $t1->add($t2);
-            }
-
-            // Add this chunk's hash to result so far
-            $hash = array(
-                $hash[0]->add($a),
-                $hash[1]->add($b),
-                $hash[2]->add($c),
-                $hash[3]->add($d),
-                $hash[4]->add($e),
-                $hash[5]->add($f),
-                $hash[6]->add($g),
-                $hash[7]->add($h)
-            );
-        }
-
-        // Produce the final hash value (big-endian)
-        // (\phpseclib\Crypt\Hash::hash() trims the output for hashes but not for HMACs.  as such, we trim the output here)
-        $temp = $hash[0]->toBytes() . $hash[1]->toBytes() . $hash[2]->toBytes() . $hash[3]->toBytes() .
-                $hash[4]->toBytes() . $hash[5]->toBytes();
-        if ($this->l != 48) {
-            $temp.= $hash[6]->toBytes() . $hash[7]->toBytes();
-        }
-
-        return $temp;
-    }
-
-    /**
-     * Right Rotate
-     *
-     * @access private
-     * @param int $int
-     * @param int $amt
-     * @see self::_sha256()
-     * @return int
-     */
-    function _rightRotate($int, $amt)
-    {
-        $invamt = 32 - $amt;
-        $mask = (1 << $invamt) - 1;
-        return (($int << $invamt) & 0xFFFFFFFF) | (($int >> $amt) & $mask);
-    }
-
-    /**
-     * Right Shift
-     *
-     * @access private
-     * @param int $int
-     * @param int $amt
-     * @see self::_sha256()
-     * @return int
-     */
-    function _rightShift($int, $amt)
-    {
-        $mask = (1 << (32 - $amt)) - 1;
-        return ($int >> $amt) & $mask;
-    }
-
-    /**
-     * Not
-     *
-     * @access private
-     * @param int $int
-     * @see self::_sha256()
-     * @return int
-     */
-    function _not($int)
-    {
-        return ~$int & 0xFFFFFFFF;
-    }
-
-    /**
-     * Add
-     *
-     * _sha256() adds multiple unsigned 32-bit integers.  Since PHP doesn't support unsigned integers and since the
-     * possibility of overflow exists, care has to be taken.  BigInteger could be used but this should be faster.
-     *
-     * @param int $...
-     * @return int
-     * @see self::_sha256()
-     * @access private
-     */
-    function _add()
-    {
-        static $mod;
-        if (!isset($mod)) {
-            $mod = pow(2, 32);
-        }
-
-        $result = 0;
-        $arguments = func_get_args();
-        foreach ($arguments as $argument) {
-            $result+= $argument < 0 ? ($argument & 0x7FFFFFFF) + 0x80000000 : $argument;
-        }
-
-        return fmod($result, $mod);
-    }
-
-    /**
-     * String Shift
-     *
-     * Inspired by array_shift
-     *
-     * @param string $string
-     * @param int $index
-     * @return string
-     * @access private
-     */
-    function _string_shift(&$string, $index = 1)
-    {
-        $substr = substr($string, 0, $index);
-        $string = substr($string, $index);
-        return $substr;
-    }
-}
diff --git a/mayor-orig/www/include/share/googleapi/phpseclib/phpseclib/phpseclib/Crypt/RC2.php b/mayor-orig/www/include/share/googleapi/phpseclib/phpseclib/phpseclib/Crypt/RC2.php
deleted file mode 100644
index e9cfa3f8..00000000
--- a/mayor-orig/www/include/share/googleapi/phpseclib/phpseclib/phpseclib/Crypt/RC2.php
+++ /dev/null
@@ -1,688 +0,0 @@
-
- * setKey('abcdefgh');
- *
- *    $plaintext = str_repeat('a', 1024);
- *
- *    echo $rc2->decrypt($rc2->encrypt($plaintext));
- * ?>
- * 
- *
- * @category Crypt
- * @package  RC2
- * @author   Patrick Monnerat 
- * @license  http://www.opensource.org/licenses/mit-license.html  MIT License
- * @link     http://phpseclib.sourceforge.net
- */
-
-namespace phpseclib\Crypt;
-
-/**
- * Pure-PHP implementation of RC2.
- *
- * @package RC2
- * @access  public
- */
-class RC2 extends Base
-{
-    /**
-     * Block Length of the cipher
-     *
-     * @see \phpseclib\Crypt\Base::block_size
-     * @var int
-     * @access private
-     */
-    var $block_size = 8;
-
-    /**
-     * The Key
-     *
-     * @see \phpseclib\Crypt\Base::key
-     * @see self::setKey()
-     * @var string
-     * @access private
-     */
-    var $key;
-
-    /**
-     * The Original (unpadded) Key
-     *
-     * @see \phpseclib\Crypt\Base::key
-     * @see self::setKey()
-     * @see self::encrypt()
-     * @see self::decrypt()
-     * @var string
-     * @access private
-     */
-    var $orig_key;
-
-    /**
-     * Don't truncate / null pad key
-     *
-     * @see \phpseclib\Crypt\Base::_clearBuffers()
-     * @var bool
-     * @access private
-     */
-    var $skip_key_adjustment = true;
-
-    /**
-     * Key Length (in bytes)
-     *
-     * @see \phpseclib\Crypt\RC2::setKeyLength()
-     * @var int
-     * @access private
-     */
-    var $key_length = 16; // = 128 bits
-
-    /**
-     * The mcrypt specific name of the cipher
-     *
-     * @see \phpseclib\Crypt\Base::cipher_name_mcrypt
-     * @var string
-     * @access private
-     */
-    var $cipher_name_mcrypt = 'rc2';
-
-    /**
-     * Optimizing value while CFB-encrypting
-     *
-     * @see \phpseclib\Crypt\Base::cfb_init_len
-     * @var int
-     * @access private
-     */
-    var $cfb_init_len = 500;
-
-    /**
-     * The key length in bits.
-     *
-     * @see self::setKeyLength()
-     * @see self::setKey()
-     * @var int
-     * @access private
-     * @internal Should be in range [1..1024].
-     * @internal Changing this value after setting the key has no effect.
-     */
-    var $default_key_length = 1024;
-
-    /**
-     * The key length in bits.
-     *
-     * @see self::isValidEnine()
-     * @see self::setKey()
-     * @var int
-     * @access private
-     * @internal Should be in range [1..1024].
-     */
-    var $current_key_length;
-
-    /**
-     * The Key Schedule
-     *
-     * @see self::_setupKey()
-     * @var array
-     * @access private
-     */
-    var $keys;
-
-    /**
-     * Key expansion randomization table.
-     * Twice the same 256-value sequence to save a modulus in key expansion.
-     *
-     * @see self::setKey()
-     * @var array
-     * @access private
-     */
-    var $pitable = array(
-        0xD9, 0x78, 0xF9, 0xC4, 0x19, 0xDD, 0xB5, 0xED,
-        0x28, 0xE9, 0xFD, 0x79, 0x4A, 0xA0, 0xD8, 0x9D,
-        0xC6, 0x7E, 0x37, 0x83, 0x2B, 0x76, 0x53, 0x8E,
-        0x62, 0x4C, 0x64, 0x88, 0x44, 0x8B, 0xFB, 0xA2,
-        0x17, 0x9A, 0x59, 0xF5, 0x87, 0xB3, 0x4F, 0x13,
-        0x61, 0x45, 0x6D, 0x8D, 0x09, 0x81, 0x7D, 0x32,
-        0xBD, 0x8F, 0x40, 0xEB, 0x86, 0xB7, 0x7B, 0x0B,
-        0xF0, 0x95, 0x21, 0x22, 0x5C, 0x6B, 0x4E, 0x82,
-        0x54, 0xD6, 0x65, 0x93, 0xCE, 0x60, 0xB2, 0x1C,
-        0x73, 0x56, 0xC0, 0x14, 0xA7, 0x8C, 0xF1, 0xDC,
-        0x12, 0x75, 0xCA, 0x1F, 0x3B, 0xBE, 0xE4, 0xD1,
-        0x42, 0x3D, 0xD4, 0x30, 0xA3, 0x3C, 0xB6, 0x26,
-        0x6F, 0xBF, 0x0E, 0xDA, 0x46, 0x69, 0x07, 0x57,
-        0x27, 0xF2, 0x1D, 0x9B, 0xBC, 0x94, 0x43, 0x03,
-        0xF8, 0x11, 0xC7, 0xF6, 0x90, 0xEF, 0x3E, 0xE7,
-        0x06, 0xC3, 0xD5, 0x2F, 0xC8, 0x66, 0x1E, 0xD7,
-        0x08, 0xE8, 0xEA, 0xDE, 0x80, 0x52, 0xEE, 0xF7,
-        0x84, 0xAA, 0x72, 0xAC, 0x35, 0x4D, 0x6A, 0x2A,
-        0x96, 0x1A, 0xD2, 0x71, 0x5A, 0x15, 0x49, 0x74,
-        0x4B, 0x9F, 0xD0, 0x5E, 0x04, 0x18, 0xA4, 0xEC,
-        0xC2, 0xE0, 0x41, 0x6E, 0x0F, 0x51, 0xCB, 0xCC,
-        0x24, 0x91, 0xAF, 0x50, 0xA1, 0xF4, 0x70, 0x39,
-        0x99, 0x7C, 0x3A, 0x85, 0x23, 0xB8, 0xB4, 0x7A,
-        0xFC, 0x02, 0x36, 0x5B, 0x25, 0x55, 0x97, 0x31,
-        0x2D, 0x5D, 0xFA, 0x98, 0xE3, 0x8A, 0x92, 0xAE,
-        0x05, 0xDF, 0x29, 0x10, 0x67, 0x6C, 0xBA, 0xC9,
-        0xD3, 0x00, 0xE6, 0xCF, 0xE1, 0x9E, 0xA8, 0x2C,
-        0x63, 0x16, 0x01, 0x3F, 0x58, 0xE2, 0x89, 0xA9,
-        0x0D, 0x38, 0x34, 0x1B, 0xAB, 0x33, 0xFF, 0xB0,
-        0xBB, 0x48, 0x0C, 0x5F, 0xB9, 0xB1, 0xCD, 0x2E,
-        0xC5, 0xF3, 0xDB, 0x47, 0xE5, 0xA5, 0x9C, 0x77,
-        0x0A, 0xA6, 0x20, 0x68, 0xFE, 0x7F, 0xC1, 0xAD,
-        0xD9, 0x78, 0xF9, 0xC4, 0x19, 0xDD, 0xB5, 0xED,
-        0x28, 0xE9, 0xFD, 0x79, 0x4A, 0xA0, 0xD8, 0x9D,
-        0xC6, 0x7E, 0x37, 0x83, 0x2B, 0x76, 0x53, 0x8E,
-        0x62, 0x4C, 0x64, 0x88, 0x44, 0x8B, 0xFB, 0xA2,
-        0x17, 0x9A, 0x59, 0xF5, 0x87, 0xB3, 0x4F, 0x13,
-        0x61, 0x45, 0x6D, 0x8D, 0x09, 0x81, 0x7D, 0x32,
-        0xBD, 0x8F, 0x40, 0xEB, 0x86, 0xB7, 0x7B, 0x0B,
-        0xF0, 0x95, 0x21, 0x22, 0x5C, 0x6B, 0x4E, 0x82,
-        0x54, 0xD6, 0x65, 0x93, 0xCE, 0x60, 0xB2, 0x1C,
-        0x73, 0x56, 0xC0, 0x14, 0xA7, 0x8C, 0xF1, 0xDC,
-        0x12, 0x75, 0xCA, 0x1F, 0x3B, 0xBE, 0xE4, 0xD1,
-        0x42, 0x3D, 0xD4, 0x30, 0xA3, 0x3C, 0xB6, 0x26,
-        0x6F, 0xBF, 0x0E, 0xDA, 0x46, 0x69, 0x07, 0x57,
-        0x27, 0xF2, 0x1D, 0x9B, 0xBC, 0x94, 0x43, 0x03,
-        0xF8, 0x11, 0xC7, 0xF6, 0x90, 0xEF, 0x3E, 0xE7,
-        0x06, 0xC3, 0xD5, 0x2F, 0xC8, 0x66, 0x1E, 0xD7,
-        0x08, 0xE8, 0xEA, 0xDE, 0x80, 0x52, 0xEE, 0xF7,
-        0x84, 0xAA, 0x72, 0xAC, 0x35, 0x4D, 0x6A, 0x2A,
-        0x96, 0x1A, 0xD2, 0x71, 0x5A, 0x15, 0x49, 0x74,
-        0x4B, 0x9F, 0xD0, 0x5E, 0x04, 0x18, 0xA4, 0xEC,
-        0xC2, 0xE0, 0x41, 0x6E, 0x0F, 0x51, 0xCB, 0xCC,
-        0x24, 0x91, 0xAF, 0x50, 0xA1, 0xF4, 0x70, 0x39,
-        0x99, 0x7C, 0x3A, 0x85, 0x23, 0xB8, 0xB4, 0x7A,
-        0xFC, 0x02, 0x36, 0x5B, 0x25, 0x55, 0x97, 0x31,
-        0x2D, 0x5D, 0xFA, 0x98, 0xE3, 0x8A, 0x92, 0xAE,
-        0x05, 0xDF, 0x29, 0x10, 0x67, 0x6C, 0xBA, 0xC9,
-        0xD3, 0x00, 0xE6, 0xCF, 0xE1, 0x9E, 0xA8, 0x2C,
-        0x63, 0x16, 0x01, 0x3F, 0x58, 0xE2, 0x89, 0xA9,
-        0x0D, 0x38, 0x34, 0x1B, 0xAB, 0x33, 0xFF, 0xB0,
-        0xBB, 0x48, 0x0C, 0x5F, 0xB9, 0xB1, 0xCD, 0x2E,
-        0xC5, 0xF3, 0xDB, 0x47, 0xE5, 0xA5, 0x9C, 0x77,
-        0x0A, 0xA6, 0x20, 0x68, 0xFE, 0x7F, 0xC1, 0xAD
-    );
-
-    /**
-     * Inverse key expansion randomization table.
-     *
-     * @see self::setKey()
-     * @var array
-     * @access private
-     */
-    var $invpitable = array(
-        0xD1, 0xDA, 0xB9, 0x6F, 0x9C, 0xC8, 0x78, 0x66,
-        0x80, 0x2C, 0xF8, 0x37, 0xEA, 0xE0, 0x62, 0xA4,
-        0xCB, 0x71, 0x50, 0x27, 0x4B, 0x95, 0xD9, 0x20,
-        0x9D, 0x04, 0x91, 0xE3, 0x47, 0x6A, 0x7E, 0x53,
-        0xFA, 0x3A, 0x3B, 0xB4, 0xA8, 0xBC, 0x5F, 0x68,
-        0x08, 0xCA, 0x8F, 0x14, 0xD7, 0xC0, 0xEF, 0x7B,
-        0x5B, 0xBF, 0x2F, 0xE5, 0xE2, 0x8C, 0xBA, 0x12,
-        0xE1, 0xAF, 0xB2, 0x54, 0x5D, 0x59, 0x76, 0xDB,
-        0x32, 0xA2, 0x58, 0x6E, 0x1C, 0x29, 0x64, 0xF3,
-        0xE9, 0x96, 0x0C, 0x98, 0x19, 0x8D, 0x3E, 0x26,
-        0xAB, 0xA5, 0x85, 0x16, 0x40, 0xBD, 0x49, 0x67,
-        0xDC, 0x22, 0x94, 0xBB, 0x3C, 0xC1, 0x9B, 0xEB,
-        0x45, 0x28, 0x18, 0xD8, 0x1A, 0x42, 0x7D, 0xCC,
-        0xFB, 0x65, 0x8E, 0x3D, 0xCD, 0x2A, 0xA3, 0x60,
-        0xAE, 0x93, 0x8A, 0x48, 0x97, 0x51, 0x15, 0xF7,
-        0x01, 0x0B, 0xB7, 0x36, 0xB1, 0x2E, 0x11, 0xFD,
-        0x84, 0x2D, 0x3F, 0x13, 0x88, 0xB3, 0x34, 0x24,
-        0x1B, 0xDE, 0xC5, 0x1D, 0x4D, 0x2B, 0x17, 0x31,
-        0x74, 0xA9, 0xC6, 0x43, 0x6D, 0x39, 0x90, 0xBE,
-        0xC3, 0xB0, 0x21, 0x6B, 0xF6, 0x0F, 0xD5, 0x99,
-        0x0D, 0xAC, 0x1F, 0x5C, 0x9E, 0xF5, 0xF9, 0x4C,
-        0xD6, 0xDF, 0x89, 0xE4, 0x8B, 0xFF, 0xC7, 0xAA,
-        0xE7, 0xED, 0x46, 0x25, 0xB6, 0x06, 0x5E, 0x35,
-        0xB5, 0xEC, 0xCE, 0xE8, 0x6C, 0x30, 0x55, 0x61,
-        0x4A, 0xFE, 0xA0, 0x79, 0x03, 0xF0, 0x10, 0x72,
-        0x7C, 0xCF, 0x52, 0xA6, 0xA7, 0xEE, 0x44, 0xD3,
-        0x9A, 0x57, 0x92, 0xD0, 0x5A, 0x7A, 0x41, 0x7F,
-        0x0E, 0x00, 0x63, 0xF2, 0x4F, 0x05, 0x83, 0xC9,
-        0xA1, 0xD4, 0xDD, 0xC4, 0x56, 0xF4, 0xD2, 0x77,
-        0x81, 0x09, 0x82, 0x33, 0x9F, 0x07, 0x86, 0x75,
-        0x38, 0x4E, 0x69, 0xF1, 0xAD, 0x23, 0x73, 0x87,
-        0x70, 0x02, 0xC2, 0x1E, 0xB8, 0x0A, 0xFC, 0xE6
-    );
-
-    /**
-     * Test for engine validity
-     *
-     * This is mainly just a wrapper to set things up for \phpseclib\Crypt\Base::isValidEngine()
-     *
-     * @see \phpseclib\Crypt\Base::__construct()
-     * @param int $engine
-     * @access public
-     * @return bool
-     */
-    function isValidEngine($engine)
-    {
-        switch ($engine) {
-            case self::ENGINE_OPENSSL:
-                if ($this->current_key_length != 128 || strlen($this->orig_key) < 16) {
-                    return false;
-                }
-                $this->cipher_name_openssl_ecb = 'rc2-ecb';
-                $this->cipher_name_openssl = 'rc2-' . $this->_openssl_translate_mode();
-        }
-
-        return parent::isValidEngine($engine);
-    }
-
-    /**
-     * Sets the key length.
-     *
-     * Valid key lengths are 8 to 1024.
-     * Calling this function after setting the key has no effect until the next
-     *  \phpseclib\Crypt\RC2::setKey() call.
-     *
-     * @access public
-     * @param int $length in bits
-     */
-    function setKeyLength($length)
-    {
-        if ($length < 8) {
-            $this->default_key_length = 8;
-        } elseif ($length > 1024) {
-            $this->default_key_length = 128;
-        } else {
-            $this->default_key_length = $length;
-        }
-        $this->current_key_length = $this->default_key_length;
-
-        parent::setKeyLength($length);
-    }
-
-    /**
-     * Returns the current key length
-     *
-     * @access public
-     * @return int
-     */
-    function getKeyLength()
-    {
-        return $this->current_key_length;
-    }
-
-    /**
-     * Sets the key.
-     *
-     * Keys can be of any length. RC2, itself, uses 8 to 1024 bit keys (eg.
-     * strlen($key) <= 128), however, we only use the first 128 bytes if $key
-     * has more then 128 bytes in it, and set $key to a single null byte if
-     * it is empty.
-     *
-     * If the key is not explicitly set, it'll be assumed to be a single
-     * null byte.
-     *
-     * @see \phpseclib\Crypt\Base::setKey()
-     * @access public
-     * @param string $key
-     * @param int $t1 optional Effective key length in bits.
-     */
-    function setKey($key, $t1 = 0)
-    {
-        $this->orig_key = $key;
-
-        if ($t1 <= 0) {
-            $t1 = $this->default_key_length;
-        } elseif ($t1 > 1024) {
-            $t1 = 1024;
-        }
-        $this->current_key_length = $t1;
-        // Key byte count should be 1..128.
-        $key = strlen($key) ? substr($key, 0, 128) : "\x00";
-        $t = strlen($key);
-
-        // The mcrypt RC2 implementation only supports effective key length
-        // of 1024 bits. It is however possible to handle effective key
-        // lengths in range 1..1024 by expanding the key and applying
-        // inverse pitable mapping to the first byte before submitting it
-        // to mcrypt.
-
-        // Key expansion.
-        $l = array_values(unpack('C*', $key));
-        $t8 = ($t1 + 7) >> 3;
-        $tm = 0xFF >> (8 * $t8 - $t1);
-
-        // Expand key.
-        $pitable = $this->pitable;
-        for ($i = $t; $i < 128; $i++) {
-            $l[$i] = $pitable[$l[$i - 1] + $l[$i - $t]];
-        }
-        $i = 128 - $t8;
-        $l[$i] = $pitable[$l[$i] & $tm];
-        while ($i--) {
-            $l[$i] = $pitable[$l[$i + 1] ^ $l[$i + $t8]];
-        }
-
-        // Prepare the key for mcrypt.
-        $l[0] = $this->invpitable[$l[0]];
-        array_unshift($l, 'C*');
-
-        parent::setKey(call_user_func_array('pack', $l));
-    }
-
-    /**
-     * Encrypts a message.
-     *
-     * Mostly a wrapper for \phpseclib\Crypt\Base::encrypt, with some additional OpenSSL handling code
-     *
-     * @see self::decrypt()
-     * @access public
-     * @param string $plaintext
-     * @return string $ciphertext
-     */
-    function encrypt($plaintext)
-    {
-        if ($this->engine == self::ENGINE_OPENSSL) {
-            $temp = $this->key;
-            $this->key = $this->orig_key;
-            $result = parent::encrypt($plaintext);
-            $this->key = $temp;
-            return $result;
-        }
-
-        return parent::encrypt($plaintext);
-    }
-
-    /**
-     * Decrypts a message.
-     *
-     * Mostly a wrapper for \phpseclib\Crypt\Base::decrypt, with some additional OpenSSL handling code
-     *
-     * @see self::encrypt()
-     * @access public
-     * @param string $ciphertext
-     * @return string $plaintext
-     */
-    function decrypt($ciphertext)
-    {
-        if ($this->engine == self::ENGINE_OPENSSL) {
-            $temp = $this->key;
-            $this->key = $this->orig_key;
-            $result = parent::decrypt($ciphertext);
-            $this->key = $temp;
-            return $result;
-        }
-
-        return parent::decrypt($ciphertext);
-    }
-
-    /**
-     * Encrypts a block
-     *
-     * @see \phpseclib\Crypt\Base::_encryptBlock()
-     * @see \phpseclib\Crypt\Base::encrypt()
-     * @access private
-     * @param string $in
-     * @return string
-     */
-    function _encryptBlock($in)
-    {
-        list($r0, $r1, $r2, $r3) = array_values(unpack('v*', $in));
-        $keys = $this->keys;
-        $limit = 20;
-        $actions = array($limit => 44, 44 => 64);
-        $j = 0;
-
-        for (;;) {
-            // Mixing round.
-            $r0 = (($r0 + $keys[$j++] + ((($r1 ^ $r2) & $r3) ^ $r1)) & 0xFFFF) << 1;
-            $r0 |= $r0 >> 16;
-            $r1 = (($r1 + $keys[$j++] + ((($r2 ^ $r3) & $r0) ^ $r2)) & 0xFFFF) << 2;
-            $r1 |= $r1 >> 16;
-            $r2 = (($r2 + $keys[$j++] + ((($r3 ^ $r0) & $r1) ^ $r3)) & 0xFFFF) << 3;
-            $r2 |= $r2 >> 16;
-            $r3 = (($r3 + $keys[$j++] + ((($r0 ^ $r1) & $r2) ^ $r0)) & 0xFFFF) << 5;
-            $r3 |= $r3 >> 16;
-
-            if ($j === $limit) {
-                if ($limit === 64) {
-                    break;
-                }
-
-                // Mashing round.
-                $r0 += $keys[$r3 & 0x3F];
-                $r1 += $keys[$r0 & 0x3F];
-                $r2 += $keys[$r1 & 0x3F];
-                $r3 += $keys[$r2 & 0x3F];
-                $limit = $actions[$limit];
-            }
-        }
-
-        return pack('vvvv', $r0, $r1, $r2, $r3);
-    }
-
-    /**
-     * Decrypts a block
-     *
-     * @see \phpseclib\Crypt\Base::_decryptBlock()
-     * @see \phpseclib\Crypt\Base::decrypt()
-     * @access private
-     * @param string $in
-     * @return string
-     */
-    function _decryptBlock($in)
-    {
-        list($r0, $r1, $r2, $r3) = array_values(unpack('v*', $in));
-        $keys = $this->keys;
-        $limit = 44;
-        $actions = array($limit => 20, 20 => 0);
-        $j = 64;
-
-        for (;;) {
-            // R-mixing round.
-            $r3 = ($r3 | ($r3 << 16)) >> 5;
-            $r3 = ($r3 - $keys[--$j] - ((($r0 ^ $r1) & $r2) ^ $r0)) & 0xFFFF;
-            $r2 = ($r2 | ($r2 << 16)) >> 3;
-            $r2 = ($r2 - $keys[--$j] - ((($r3 ^ $r0) & $r1) ^ $r3)) & 0xFFFF;
-            $r1 = ($r1 | ($r1 << 16)) >> 2;
-            $r1 = ($r1 - $keys[--$j] - ((($r2 ^ $r3) & $r0) ^ $r2)) & 0xFFFF;
-            $r0 = ($r0 | ($r0 << 16)) >> 1;
-            $r0 = ($r0 - $keys[--$j] - ((($r1 ^ $r2) & $r3) ^ $r1)) & 0xFFFF;
-
-            if ($j === $limit) {
-                if ($limit === 0) {
-                    break;
-                }
-
-                // R-mashing round.
-                $r3 = ($r3 - $keys[$r2 & 0x3F]) & 0xFFFF;
-                $r2 = ($r2 - $keys[$r1 & 0x3F]) & 0xFFFF;
-                $r1 = ($r1 - $keys[$r0 & 0x3F]) & 0xFFFF;
-                $r0 = ($r0 - $keys[$r3 & 0x3F]) & 0xFFFF;
-                $limit = $actions[$limit];
-            }
-        }
-
-        return pack('vvvv', $r0, $r1, $r2, $r3);
-    }
-
-    /**
-     * Setup the \phpseclib\Crypt\Base::ENGINE_MCRYPT $engine
-     *
-     * @see \phpseclib\Crypt\Base::_setupMcrypt()
-     * @access private
-     */
-    function _setupMcrypt()
-    {
-        if (!isset($this->key)) {
-            $this->setKey('');
-        }
-
-        parent::_setupMcrypt();
-    }
-
-    /**
-     * Creates the key schedule
-     *
-     * @see \phpseclib\Crypt\Base::_setupKey()
-     * @access private
-     */
-    function _setupKey()
-    {
-        if (!isset($this->key)) {
-            $this->setKey('');
-        }
-
-        // Key has already been expanded in \phpseclib\Crypt\RC2::setKey():
-        // Only the first value must be altered.
-        $l = unpack('Ca/Cb/v*', $this->key);
-        array_unshift($l, $this->pitable[$l['a']] | ($l['b'] << 8));
-        unset($l['a']);
-        unset($l['b']);
-        $this->keys = $l;
-    }
-
-    /**
-     * Setup the performance-optimized function for de/encrypt()
-     *
-     * @see \phpseclib\Crypt\Base::_setupInlineCrypt()
-     * @access private
-     */
-    function _setupInlineCrypt()
-    {
-        $lambda_functions =& self::_getLambdaFunctions();
-
-        // The first 10 generated $lambda_functions will use the $keys hardcoded as integers
-        // for the mixing rounds, for better inline crypt performance [~20% faster].
-        // But for memory reason we have to limit those ultra-optimized $lambda_functions to an amount of 10.
-        // (Currently, for Crypt_RC2, one generated $lambda_function cost on php5.5@32bit ~60kb unfreeable mem and ~100kb on php5.5@64bit)
-        $gen_hi_opt_code = (bool)(count($lambda_functions) < 10);
-
-        // Generation of a unique hash for our generated code
-        $code_hash = "Crypt_RC2, {$this->mode}";
-        if ($gen_hi_opt_code) {
-            $code_hash = str_pad($code_hash, 32) . $this->_hashInlineCryptFunction($this->key);
-        }
-
-        // Is there a re-usable $lambda_functions in there?
-        // If not, we have to create it.
-        if (!isset($lambda_functions[$code_hash])) {
-            // Init code for both, encrypt and decrypt.
-            $init_crypt = '$keys = $self->keys;';
-
-            switch (true) {
-                case $gen_hi_opt_code:
-                    $keys = $this->keys;
-                default:
-                    $keys = array();
-                    foreach ($this->keys as $k => $v) {
-                        $keys[$k] = '$keys[' . $k . ']';
-                    }
-            }
-
-            // $in is the current 8 bytes block which has to be en/decrypt
-            $encrypt_block = $decrypt_block = '
-                $in = unpack("v4", $in);
-                $r0 = $in[1];
-                $r1 = $in[2];
-                $r2 = $in[3];
-                $r3 = $in[4];
-            ';
-
-            // Create code for encryption.
-            $limit = 20;
-            $actions = array($limit => 44, 44 => 64);
-            $j = 0;
-
-            for (;;) {
-                // Mixing round.
-                $encrypt_block .= '
-                    $r0 = (($r0 + ' . $keys[$j++] . ' +
-                           ((($r1 ^ $r2) & $r3) ^ $r1)) & 0xFFFF) << 1;
-                    $r0 |= $r0 >> 16;
-                    $r1 = (($r1 + ' . $keys[$j++] . ' +
-                           ((($r2 ^ $r3) & $r0) ^ $r2)) & 0xFFFF) << 2;
-                    $r1 |= $r1 >> 16;
-                    $r2 = (($r2 + ' . $keys[$j++] . ' +
-                           ((($r3 ^ $r0) & $r1) ^ $r3)) & 0xFFFF) << 3;
-                    $r2 |= $r2 >> 16;
-                    $r3 = (($r3 + ' . $keys[$j++] . ' +
-                           ((($r0 ^ $r1) & $r2) ^ $r0)) & 0xFFFF) << 5;
-                    $r3 |= $r3 >> 16;';
-
-                if ($j === $limit) {
-                    if ($limit === 64) {
-                        break;
-                    }
-
-                    // Mashing round.
-                    $encrypt_block .= '
-                        $r0 += $keys[$r3 & 0x3F];
-                        $r1 += $keys[$r0 & 0x3F];
-                        $r2 += $keys[$r1 & 0x3F];
-                        $r3 += $keys[$r2 & 0x3F];';
-                    $limit = $actions[$limit];
-                }
-            }
-
-            $encrypt_block .= '$in = pack("v4", $r0, $r1, $r2, $r3);';
-
-            // Create code for decryption.
-            $limit = 44;
-            $actions = array($limit => 20, 20 => 0);
-            $j = 64;
-
-            for (;;) {
-                // R-mixing round.
-                $decrypt_block .= '
-                    $r3 = ($r3 | ($r3 << 16)) >> 5;
-                    $r3 = ($r3 - ' . $keys[--$j] . ' -
-                           ((($r0 ^ $r1) & $r2) ^ $r0)) & 0xFFFF;
-                    $r2 = ($r2 | ($r2 << 16)) >> 3;
-                    $r2 = ($r2 - ' . $keys[--$j] . ' -
-                           ((($r3 ^ $r0) & $r1) ^ $r3)) & 0xFFFF;
-                    $r1 = ($r1 | ($r1 << 16)) >> 2;
-                    $r1 = ($r1 - ' . $keys[--$j] . ' -
-                           ((($r2 ^ $r3) & $r0) ^ $r2)) & 0xFFFF;
-                    $r0 = ($r0 | ($r0 << 16)) >> 1;
-                    $r0 = ($r0 - ' . $keys[--$j] . ' -
-                           ((($r1 ^ $r2) & $r3) ^ $r1)) & 0xFFFF;';
-
-                if ($j === $limit) {
-                    if ($limit === 0) {
-                        break;
-                    }
-
-                    // R-mashing round.
-                    $decrypt_block .= '
-                        $r3 = ($r3 - $keys[$r2 & 0x3F]) & 0xFFFF;
-                        $r2 = ($r2 - $keys[$r1 & 0x3F]) & 0xFFFF;
-                        $r1 = ($r1 - $keys[$r0 & 0x3F]) & 0xFFFF;
-                        $r0 = ($r0 - $keys[$r3 & 0x3F]) & 0xFFFF;';
-                    $limit = $actions[$limit];
-                }
-            }
-
-            $decrypt_block .= '$in = pack("v4", $r0, $r1, $r2, $r3);';
-
-            // Creates the inline-crypt function
-            $lambda_functions[$code_hash] = $this->_createInlineCryptFunction(
-                array(
-                   'init_crypt'    => $init_crypt,
-                   'encrypt_block' => $encrypt_block,
-                   'decrypt_block' => $decrypt_block
-                )
-            );
-        }
-
-        // Set the inline-crypt function as callback in: $this->inline_crypt
-        $this->inline_crypt = $lambda_functions[$code_hash];
-    }
-}
diff --git a/mayor-orig/www/include/share/googleapi/phpseclib/phpseclib/phpseclib/Crypt/RC4.php b/mayor-orig/www/include/share/googleapi/phpseclib/phpseclib/phpseclib/Crypt/RC4.php
deleted file mode 100644
index 4812010c..00000000
--- a/mayor-orig/www/include/share/googleapi/phpseclib/phpseclib/phpseclib/Crypt/RC4.php
+++ /dev/null
@@ -1,342 +0,0 @@
-
- * setKey('abcdefgh');
- *
- *    $size = 10 * 1024;
- *    $plaintext = '';
- *    for ($i = 0; $i < $size; $i++) {
- *        $plaintext.= 'a';
- *    }
- *
- *    echo $rc4->decrypt($rc4->encrypt($plaintext));
- * ?>
- * 
- *
- * @category  Crypt
- * @package   RC4
- * @author    Jim Wigginton 
- * @copyright 2007 Jim Wigginton
- * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
- * @link      http://phpseclib.sourceforge.net
- */
-
-namespace phpseclib\Crypt;
-
-/**
- * Pure-PHP implementation of RC4.
- *
- * @package RC4
- * @author  Jim Wigginton 
- * @access  public
- */
-class RC4 extends Base
-{
-    /**#@+
-     * @access private
-     * @see \phpseclib\Crypt\RC4::_crypt()
-    */
-    const ENCRYPT = 0;
-    const DECRYPT = 1;
-    /**#@-*/
-
-    /**
-     * Block Length of the cipher
-     *
-     * RC4 is a stream cipher
-     * so we the block_size to 0
-     *
-     * @see \phpseclib\Crypt\Base::block_size
-     * @var int
-     * @access private
-     */
-    var $block_size = 0;
-
-    /**
-     * Key Length (in bytes)
-     *
-     * @see \phpseclib\Crypt\RC4::setKeyLength()
-     * @var int
-     * @access private
-     */
-    var $key_length = 128; // = 1024 bits
-
-    /**
-     * The mcrypt specific name of the cipher
-     *
-     * @see \phpseclib\Crypt\Base::cipher_name_mcrypt
-     * @var string
-     * @access private
-     */
-    var $cipher_name_mcrypt = 'arcfour';
-
-    /**
-     * Holds whether performance-optimized $inline_crypt() can/should be used.
-     *
-     * @see \phpseclib\Crypt\Base::inline_crypt
-     * @var mixed
-     * @access private
-     */
-    var $use_inline_crypt = false; // currently not available
-
-    /**
-     * The Key
-     *
-     * @see self::setKey()
-     * @var string
-     * @access private
-     */
-    var $key = "\0";
-
-    /**
-     * The Key Stream for decryption and encryption
-     *
-     * @see self::setKey()
-     * @var array
-     * @access private
-     */
-    var $stream;
-
-    /**
-     * Default Constructor.
-     *
-     * Determines whether or not the mcrypt extension should be used.
-     *
-     * @see \phpseclib\Crypt\Base::__construct()
-     * @return \phpseclib\Crypt\RC4
-     * @access public
-     */
-    function __construct()
-    {
-        parent::__construct(Base::MODE_STREAM);
-    }
-
-    /**
-     * Test for engine validity
-     *
-     * This is mainly just a wrapper to set things up for \phpseclib\Crypt\Base::isValidEngine()
-     *
-     * @see \phpseclib\Crypt\Base::__construct()
-     * @param int $engine
-     * @access public
-     * @return bool
-     */
-    function isValidEngine($engine)
-    {
-        if ($engine == Base::ENGINE_OPENSSL) {
-            if (version_compare(PHP_VERSION, '5.3.7') >= 0) {
-                $this->cipher_name_openssl = 'rc4-40';
-            } else {
-                switch (strlen($this->key)) {
-                    case 5:
-                        $this->cipher_name_openssl = 'rc4-40';
-                        break;
-                    case 8:
-                        $this->cipher_name_openssl = 'rc4-64';
-                        break;
-                    case 16:
-                        $this->cipher_name_openssl = 'rc4';
-                        break;
-                    default:
-                        return false;
-                }
-            }
-        }
-
-        return parent::isValidEngine($engine);
-    }
-
-    /**
-     * Dummy function.
-     *
-     * Some protocols, such as WEP, prepend an "initialization vector" to the key, effectively creating a new key [1].
-     * If you need to use an initialization vector in this manner, feel free to prepend it to the key, yourself, before
-     * calling setKey().
-     *
-     * [1] WEP's initialization vectors (IV's) are used in a somewhat insecure way.  Since, in that protocol,
-     * the IV's are relatively easy to predict, an attack described by
-     * {@link http://www.drizzle.com/~aboba/IEEE/rc4_ksaproc.pdf Scott Fluhrer, Itsik Mantin, and Adi Shamir}
-     * can be used to quickly guess at the rest of the key.  The following links elaborate:
-     *
-     * {@link http://www.rsa.com/rsalabs/node.asp?id=2009 http://www.rsa.com/rsalabs/node.asp?id=2009}
-     * {@link http://en.wikipedia.org/wiki/Related_key_attack http://en.wikipedia.org/wiki/Related_key_attack}
-     *
-     * @param string $iv
-     * @see self::setKey()
-     * @access public
-     */
-    function setIV($iv)
-    {
-    }
-
-    /**
-     * Sets the key length
-     *
-     * Keys can be between 1 and 256 bytes long.
-     *
-     * @access public
-     * @param int $length
-     */
-    function setKeyLength($length)
-    {
-        if ($length < 8) {
-            $this->key_length = 1;
-        } elseif ($length > 2048) {
-            $this->key_length = 256;
-        } else {
-            $this->key_length = $length >> 3;
-        }
-
-        parent::setKeyLength($length);
-    }
-
-    /**
-     * Encrypts a message.
-     *
-     * @see \phpseclib\Crypt\Base::decrypt()
-     * @see self::_crypt()
-     * @access public
-     * @param string $plaintext
-     * @return string $ciphertext
-     */
-    function encrypt($plaintext)
-    {
-        if ($this->engine != Base::ENGINE_INTERNAL) {
-            return parent::encrypt($plaintext);
-        }
-        return $this->_crypt($plaintext, self::ENCRYPT);
-    }
-
-    /**
-     * Decrypts a message.
-     *
-     * $this->decrypt($this->encrypt($plaintext)) == $this->encrypt($this->encrypt($plaintext)).
-     * At least if the continuous buffer is disabled.
-     *
-     * @see \phpseclib\Crypt\Base::encrypt()
-     * @see self::_crypt()
-     * @access public
-     * @param string $ciphertext
-     * @return string $plaintext
-     */
-    function decrypt($ciphertext)
-    {
-        if ($this->engine != Base::ENGINE_INTERNAL) {
-            return parent::decrypt($ciphertext);
-        }
-        return $this->_crypt($ciphertext, self::DECRYPT);
-    }
-
-    /**
-     * Encrypts a block
-     *
-     * @access private
-     * @param string $in
-     */
-    function _encryptBlock($in)
-    {
-        // RC4 does not utilize this method
-    }
-
-    /**
-     * Decrypts a block
-     *
-     * @access private
-     * @param string $in
-     */
-    function _decryptBlock($in)
-    {
-        // RC4 does not utilize this method
-    }
-
-    /**
-     * Setup the key (expansion)
-     *
-     * @see \phpseclib\Crypt\Base::_setupKey()
-     * @access private
-     */
-    function _setupKey()
-    {
-        $key = $this->key;
-        $keyLength = strlen($key);
-        $keyStream = range(0, 255);
-        $j = 0;
-        for ($i = 0; $i < 256; $i++) {
-            $j = ($j + $keyStream[$i] + ord($key[$i % $keyLength])) & 255;
-            $temp = $keyStream[$i];
-            $keyStream[$i] = $keyStream[$j];
-            $keyStream[$j] = $temp;
-        }
-
-        $this->stream = array();
-        $this->stream[self::DECRYPT] = $this->stream[self::ENCRYPT] = array(
-            0, // index $i
-            0, // index $j
-            $keyStream
-        );
-    }
-
-    /**
-     * Encrypts or decrypts a message.
-     *
-     * @see self::encrypt()
-     * @see self::decrypt()
-     * @access private
-     * @param string $text
-     * @param int $mode
-     * @return string $text
-     */
-    function _crypt($text, $mode)
-    {
-        if ($this->changed) {
-            $this->_setup();
-            $this->changed = false;
-        }
-
-        $stream = &$this->stream[$mode];
-        if ($this->continuousBuffer) {
-            $i = &$stream[0];
-            $j = &$stream[1];
-            $keyStream = &$stream[2];
-        } else {
-            $i = $stream[0];
-            $j = $stream[1];
-            $keyStream = $stream[2];
-        }
-
-        $len = strlen($text);
-        for ($k = 0; $k < $len; ++$k) {
-            $i = ($i + 1) & 255;
-            $ksi = $keyStream[$i];
-            $j = ($j + $ksi) & 255;
-            $ksj = $keyStream[$j];
-
-            $keyStream[$i] = $ksj;
-            $keyStream[$j] = $ksi;
-            $text[$k] = $text[$k] ^ chr($keyStream[($ksj + $ksi) & 255]);
-        }
-
-        return $text;
-    }
-}
diff --git a/mayor-orig/www/include/share/googleapi/phpseclib/phpseclib/phpseclib/Crypt/RSA.php b/mayor-orig/www/include/share/googleapi/phpseclib/phpseclib/phpseclib/Crypt/RSA.php
deleted file mode 100644
index 9670c01a..00000000
--- a/mayor-orig/www/include/share/googleapi/phpseclib/phpseclib/phpseclib/Crypt/RSA.php
+++ /dev/null
@@ -1,3053 +0,0 @@
-
- * createKey());
- *
- *    $plaintext = 'terrafrost';
- *
- *    $rsa->loadKey($privatekey);
- *    $ciphertext = $rsa->encrypt($plaintext);
- *
- *    $rsa->loadKey($publickey);
- *    echo $rsa->decrypt($ciphertext);
- * ?>
- * 
- *
- * Here's an example of how to create signatures and verify signatures with this library:
- * 
- * createKey());
- *
- *    $plaintext = 'terrafrost';
- *
- *    $rsa->loadKey($privatekey);
- *    $signature = $rsa->sign($plaintext);
- *
- *    $rsa->loadKey($publickey);
- *    echo $rsa->verify($plaintext, $signature) ? 'verified' : 'unverified';
- * ?>
- * 
- *
- * @category  Crypt
- * @package   RSA
- * @author    Jim Wigginton 
- * @copyright 2009 Jim Wigginton
- * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
- * @link      http://phpseclib.sourceforge.net
- */
-
-namespace phpseclib\Crypt;
-
-use phpseclib\Math\BigInteger;
-
-/**
- * Pure-PHP PKCS#1 compliant implementation of RSA.
- *
- * @package RSA
- * @author  Jim Wigginton 
- * @access  public
- */
-class RSA
-{
-    /**#@+
-     * @access public
-     * @see self::encrypt()
-     * @see self::decrypt()
-     */
-    /**
-     * Use {@link http://en.wikipedia.org/wiki/Optimal_Asymmetric_Encryption_Padding Optimal Asymmetric Encryption Padding}
-     * (OAEP) for encryption / decryption.
-     *
-     * Uses sha1 by default.
-     *
-     * @see self::setHash()
-     * @see self::setMGFHash()
-     */
-    const ENCRYPTION_OAEP = 1;
-    /**
-     * Use PKCS#1 padding.
-     *
-     * Although self::ENCRYPTION_OAEP offers more security, including PKCS#1 padding is necessary for purposes of backwards
-     * compatibility with protocols (like SSH-1) written before OAEP's introduction.
-     */
-    const ENCRYPTION_PKCS1 = 2;
-    /**
-     * Do not use any padding
-     *
-     * Although this method is not recommended it can none-the-less sometimes be useful if you're trying to decrypt some legacy
-     * stuff, if you're trying to diagnose why an encrypted message isn't decrypting, etc.
-     */
-    const ENCRYPTION_NONE = 3;
-    /**#@-*/
-
-    /**#@+
-     * @access public
-     * @see self::sign()
-     * @see self::verify()
-     * @see self::setHash()
-    */
-    /**
-     * Use the Probabilistic Signature Scheme for signing
-     *
-     * Uses sha1 by default.
-     *
-     * @see self::setSaltLength()
-     * @see self::setMGFHash()
-     */
-    const SIGNATURE_PSS = 1;
-    /**
-     * Use the PKCS#1 scheme by default.
-     *
-     * Although self::SIGNATURE_PSS offers more security, including PKCS#1 signing is necessary for purposes of backwards
-     * compatibility with protocols (like SSH-2) written before PSS's introduction.
-     */
-    const SIGNATURE_PKCS1 = 2;
-    /**#@-*/
-
-    /**#@+
-     * @access private
-     * @see \phpseclib\Crypt\RSA::createKey()
-    */
-    /**
-     * ASN1 Integer
-     */
-    const ASN1_INTEGER = 2;
-    /**
-     * ASN1 Bit String
-     */
-    const ASN1_BITSTRING = 3;
-    /**
-     * ASN1 Octet String
-     */
-    const ASN1_OCTETSTRING = 4;
-    /**
-     * ASN1 Object Identifier
-     */
-    const ASN1_OBJECT = 6;
-    /**
-     * ASN1 Sequence (with the constucted bit set)
-     */
-    const ASN1_SEQUENCE = 48;
-    /**#@-*/
-
-    /**#@+
-     * @access private
-     * @see \phpseclib\Crypt\RSA::__construct()
-    */
-    /**
-     * To use the pure-PHP implementation
-     */
-    const MODE_INTERNAL = 1;
-    /**
-     * To use the OpenSSL library
-     *
-     * (if enabled; otherwise, the internal implementation will be used)
-     */
-    const MODE_OPENSSL = 2;
-    /**#@-*/
-
-    /**#@+
-     * @access public
-     * @see \phpseclib\Crypt\RSA::createKey()
-     * @see \phpseclib\Crypt\RSA::setPrivateKeyFormat()
-    */
-    /**
-     * PKCS#1 formatted private key
-     *
-     * Used by OpenSSH
-     */
-    const PRIVATE_FORMAT_PKCS1 = 0;
-    /**
-     * PuTTY formatted private key
-     */
-    const PRIVATE_FORMAT_PUTTY = 1;
-    /**
-     * XML formatted private key
-     */
-    const PRIVATE_FORMAT_XML = 2;
-    /**
-     * PKCS#8 formatted private key
-     */
-    const PRIVATE_FORMAT_PKCS8 = 8;
-    /**#@-*/
-
-    /**#@+
-     * @access public
-     * @see \phpseclib\Crypt\RSA::createKey()
-     * @see \phpseclib\Crypt\RSA::setPublicKeyFormat()
-    */
-    /**
-     * Raw public key
-     *
-     * An array containing two \phpseclib\Math\BigInteger objects.
-     *
-     * The exponent can be indexed with any of the following:
-     *
-     * 0, e, exponent, publicExponent
-     *
-     * The modulus can be indexed with any of the following:
-     *
-     * 1, n, modulo, modulus
-     */
-    const PUBLIC_FORMAT_RAW = 3;
-    /**
-     * PKCS#1 formatted public key (raw)
-     *
-     * Used by File/X509.php
-     *
-     * Has the following header:
-     *
-     * -----BEGIN RSA PUBLIC KEY-----
-     *
-     * Analogous to ssh-keygen's pem format (as specified by -m)
-     */
-    const PUBLIC_FORMAT_PKCS1 = 4;
-    const PUBLIC_FORMAT_PKCS1_RAW = 4;
-    /**
-     * XML formatted public key
-     */
-    const PUBLIC_FORMAT_XML = 5;
-    /**
-     * OpenSSH formatted public key
-     *
-     * Place in $HOME/.ssh/authorized_keys
-     */
-    const PUBLIC_FORMAT_OPENSSH = 6;
-    /**
-     * PKCS#1 formatted public key (encapsulated)
-     *
-     * Used by PHP's openssl_public_encrypt() and openssl's rsautl (when -pubin is set)
-     *
-     * Has the following header:
-     *
-     * -----BEGIN PUBLIC KEY-----
-     *
-     * Analogous to ssh-keygen's pkcs8 format (as specified by -m). Although PKCS8
-     * is specific to private keys it's basically creating a DER-encoded wrapper
-     * for keys. This just extends that same concept to public keys (much like ssh-keygen)
-     */
-    const PUBLIC_FORMAT_PKCS8 = 7;
-    /**#@-*/
-
-    /**
-     * Precomputed Zero
-     *
-     * @var \phpseclib\Math\BigInteger
-     * @access private
-     */
-    var $zero;
-
-    /**
-     * Precomputed One
-     *
-     * @var \phpseclib\Math\BigInteger
-     * @access private
-     */
-    var $one;
-
-    /**
-     * Private Key Format
-     *
-     * @var int
-     * @access private
-     */
-    var $privateKeyFormat = self::PRIVATE_FORMAT_PKCS1;
-
-    /**
-     * Public Key Format
-     *
-     * @var int
-     * @access public
-     */
-    var $publicKeyFormat = self::PUBLIC_FORMAT_PKCS8;
-
-    /**
-     * Modulus (ie. n)
-     *
-     * @var \phpseclib\Math\BigInteger
-     * @access private
-     */
-    var $modulus;
-
-    /**
-     * Modulus length
-     *
-     * @var \phpseclib\Math\BigInteger
-     * @access private
-     */
-    var $k;
-
-    /**
-     * Exponent (ie. e or d)
-     *
-     * @var \phpseclib\Math\BigInteger
-     * @access private
-     */
-    var $exponent;
-
-    /**
-     * Primes for Chinese Remainder Theorem (ie. p and q)
-     *
-     * @var array
-     * @access private
-     */
-    var $primes;
-
-    /**
-     * Exponents for Chinese Remainder Theorem (ie. dP and dQ)
-     *
-     * @var array
-     * @access private
-     */
-    var $exponents;
-
-    /**
-     * Coefficients for Chinese Remainder Theorem (ie. qInv)
-     *
-     * @var array
-     * @access private
-     */
-    var $coefficients;
-
-    /**
-     * Hash name
-     *
-     * @var string
-     * @access private
-     */
-    var $hashName;
-
-    /**
-     * Hash function
-     *
-     * @var \phpseclib\Crypt\Hash
-     * @access private
-     */
-    var $hash;
-
-    /**
-     * Length of hash function output
-     *
-     * @var int
-     * @access private
-     */
-    var $hLen;
-
-    /**
-     * Length of salt
-     *
-     * @var int
-     * @access private
-     */
-    var $sLen;
-
-    /**
-     * Hash function for the Mask Generation Function
-     *
-     * @var \phpseclib\Crypt\Hash
-     * @access private
-     */
-    var $mgfHash;
-
-    /**
-     * Length of MGF hash function output
-     *
-     * @var int
-     * @access private
-     */
-    var $mgfHLen;
-
-    /**
-     * Encryption mode
-     *
-     * @var int
-     * @access private
-     */
-    var $encryptionMode = self::ENCRYPTION_OAEP;
-
-    /**
-     * Signature mode
-     *
-     * @var int
-     * @access private
-     */
-    var $signatureMode = self::SIGNATURE_PSS;
-
-    /**
-     * Public Exponent
-     *
-     * @var mixed
-     * @access private
-     */
-    var $publicExponent = false;
-
-    /**
-     * Password
-     *
-     * @var string
-     * @access private
-     */
-    var $password = false;
-
-    /**
-     * Components
-     *
-     * For use with parsing XML formatted keys.  PHP's XML Parser functions use utilized - instead of PHP's DOM functions -
-     * because PHP's XML Parser functions work on PHP4 whereas PHP's DOM functions - although surperior - don't.
-     *
-     * @see self::_start_element_handler()
-     * @var array
-     * @access private
-     */
-    var $components = array();
-
-    /**
-     * Current String
-     *
-     * For use with parsing XML formatted keys.
-     *
-     * @see self::_character_handler()
-     * @see self::_stop_element_handler()
-     * @var mixed
-     * @access private
-     */
-    var $current;
-
-    /**
-     * OpenSSL configuration file name.
-     *
-     * Set to null to use system configuration file.
-     * @see self::createKey()
-     * @var mixed
-     * @Access public
-     */
-    var $configFile;
-
-    /**
-     * Public key comment field.
-     *
-     * @var string
-     * @access private
-     */
-    var $comment = 'phpseclib-generated-key';
-
-    /**
-     * The constructor
-     *
-     * If you want to make use of the openssl extension, you'll need to set the mode manually, yourself.  The reason
-     * \phpseclib\Crypt\RSA doesn't do it is because OpenSSL doesn't fail gracefully.  openssl_pkey_new(), in particular, requires
-     * openssl.cnf be present somewhere and, unfortunately, the only real way to find out is too late.
-     *
-     * @return \phpseclib\Crypt\RSA
-     * @access public
-     */
-    function __construct()
-    {
-        $this->configFile = dirname(__FILE__) . '/../openssl.cnf';
-
-        if (!defined('CRYPT_RSA_MODE')) {
-            switch (true) {
-                // Math/BigInteger's openssl requirements are a little less stringent than Crypt/RSA's. in particular,
-                // Math/BigInteger doesn't require an openssl.cfg file whereas Crypt/RSA does. so if Math/BigInteger
-                // can't use OpenSSL it can be pretty trivially assumed, then, that Crypt/RSA can't either.
-                case defined('MATH_BIGINTEGER_OPENSSL_DISABLE'):
-                    define('CRYPT_RSA_MODE', self::MODE_INTERNAL);
-                    break;
-                case extension_loaded('openssl') && file_exists($this->configFile):
-                    // some versions of XAMPP have mismatched versions of OpenSSL which causes it not to work
-                    ob_start();
-                    @phpinfo();
-                    $content = ob_get_contents();
-                    ob_end_clean();
-
-                    preg_match_all('#OpenSSL (Header|Library) Version(.*)#im', $content, $matches);
-
-                    $versions = array();
-                    if (!empty($matches[1])) {
-                        for ($i = 0; $i < count($matches[1]); $i++) {
-                            $fullVersion = trim(str_replace('=>', '', strip_tags($matches[2][$i])));
-
-                            // Remove letter part in OpenSSL version
-                            if (!preg_match('/(\d+\.\d+\.\d+)/i', $fullVersion, $m)) {
-                                $versions[$matches[1][$i]] = $fullVersion;
-                            } else {
-                                $versions[$matches[1][$i]] = $m[0];
-                            }
-                        }
-                    }
-
-                    // it doesn't appear that OpenSSL versions were reported upon until PHP 5.3+
-                    switch (true) {
-                        case !isset($versions['Header']):
-                        case !isset($versions['Library']):
-                        case $versions['Header'] == $versions['Library']:
-                        case version_compare($versions['Header'], '1.0.0') >= 0 && version_compare($versions['Library'], '1.0.0') >= 0:
-                            define('CRYPT_RSA_MODE', self::MODE_OPENSSL);
-                            break;
-                        default:
-                            define('CRYPT_RSA_MODE', self::MODE_INTERNAL);
-                            define('MATH_BIGINTEGER_OPENSSL_DISABLE', true);
-                    }
-                    break;
-                default:
-                    define('CRYPT_RSA_MODE', self::MODE_INTERNAL);
-            }
-        }
-
-        $this->zero = new BigInteger();
-        $this->one = new BigInteger(1);
-
-        $this->hash = new Hash('sha1');
-        $this->hLen = $this->hash->getLength();
-        $this->hashName = 'sha1';
-        $this->mgfHash = new Hash('sha1');
-        $this->mgfHLen = $this->mgfHash->getLength();
-    }
-
-    /**
-     * Create public / private key pair
-     *
-     * Returns an array with the following three elements:
-     *  - 'privatekey': The private key.
-     *  - 'publickey':  The public key.
-     *  - 'partialkey': A partially computed key (if the execution time exceeded $timeout).
-     *                  Will need to be passed back to \phpseclib\Crypt\RSA::createKey() as the third parameter for further processing.
-     *
-     * @access public
-     * @param int $bits
-     * @param int $timeout
-     * @param array $p
-     */
-    function createKey($bits = 1024, $timeout = false, $partial = array())
-    {
-        if (!defined('CRYPT_RSA_EXPONENT')) {
-            // http://en.wikipedia.org/wiki/65537_%28number%29
-            define('CRYPT_RSA_EXPONENT', '65537');
-        }
-        // per , this number ought not result in primes smaller
-        // than 256 bits. as a consequence if the key you're trying to create is 1024 bits and you've set CRYPT_RSA_SMALLEST_PRIME
-        // to 384 bits then you're going to get a 384 bit prime and a 640 bit prime (384 + 1024 % 384). at least if
-        // CRYPT_RSA_MODE is set to self::MODE_INTERNAL. if CRYPT_RSA_MODE is set to self::MODE_OPENSSL then
-        // CRYPT_RSA_SMALLEST_PRIME is ignored (ie. multi-prime RSA support is more intended as a way to speed up RSA key
-        // generation when there's a chance neither gmp nor OpenSSL are installed)
-        if (!defined('CRYPT_RSA_SMALLEST_PRIME')) {
-            define('CRYPT_RSA_SMALLEST_PRIME', 4096);
-        }
-
-        // OpenSSL uses 65537 as the exponent and requires RSA keys be 384 bits minimum
-        if (CRYPT_RSA_MODE == self::MODE_OPENSSL && $bits >= 384 && CRYPT_RSA_EXPONENT == 65537) {
-            $config = array();
-            if (isset($this->configFile)) {
-                $config['config'] = $this->configFile;
-            }
-            $rsa = openssl_pkey_new(array('private_key_bits' => $bits) + $config);
-            openssl_pkey_export($rsa, $privatekey, null, $config);
-            $publickey = openssl_pkey_get_details($rsa);
-            $publickey = $publickey['key'];
-
-            $privatekey = call_user_func_array(array($this, '_convertPrivateKey'), array_values($this->_parseKey($privatekey, self::PRIVATE_FORMAT_PKCS1)));
-            $publickey = call_user_func_array(array($this, '_convertPublicKey'), array_values($this->_parseKey($publickey, self::PUBLIC_FORMAT_PKCS1)));
-
-            // clear the buffer of error strings stemming from a minimalistic openssl.cnf
-            while (openssl_error_string() !== false) {
-            }
-
-            return array(
-                'privatekey' => $privatekey,
-                'publickey' => $publickey,
-                'partialkey' => false
-            );
-        }
-
-        static $e;
-        if (!isset($e)) {
-            $e = new BigInteger(CRYPT_RSA_EXPONENT);
-        }
-
-        extract($this->_generateMinMax($bits));
-        $absoluteMin = $min;
-        $temp = $bits >> 1; // divide by two to see how many bits P and Q would be
-        if ($temp > CRYPT_RSA_SMALLEST_PRIME) {
-            $num_primes = floor($bits / CRYPT_RSA_SMALLEST_PRIME);
-            $temp = CRYPT_RSA_SMALLEST_PRIME;
-        } else {
-            $num_primes = 2;
-        }
-        extract($this->_generateMinMax($temp + $bits % $temp));
-        $finalMax = $max;
-        extract($this->_generateMinMax($temp));
-
-        $generator = new BigInteger();
-
-        $n = $this->one->copy();
-        if (!empty($partial)) {
-            extract(unserialize($partial));
-        } else {
-            $exponents = $coefficients = $primes = array();
-            $lcm = array(
-                'top' => $this->one->copy(),
-                'bottom' => false
-            );
-        }
-
-        $start = time();
-        $i0 = count($primes) + 1;
-
-        do {
-            for ($i = $i0; $i <= $num_primes; $i++) {
-                if ($timeout !== false) {
-                    $timeout-= time() - $start;
-                    $start = time();
-                    if ($timeout <= 0) {
-                        return array(
-                            'privatekey' => '',
-                            'publickey'  => '',
-                            'partialkey' => serialize(array(
-                                'primes' => $primes,
-                                'coefficients' => $coefficients,
-                                'lcm' => $lcm,
-                                'exponents' => $exponents
-                            ))
-                        );
-                    }
-                }
-
-                if ($i == $num_primes) {
-                    list($min, $temp) = $absoluteMin->divide($n);
-                    if (!$temp->equals($this->zero)) {
-                        $min = $min->add($this->one); // ie. ceil()
-                    }
-                    $primes[$i] = $generator->randomPrime($min, $finalMax, $timeout);
-                } else {
-                    $primes[$i] = $generator->randomPrime($min, $max, $timeout);
-                }
-
-                if ($primes[$i] === false) { // if we've reached the timeout
-                    if (count($primes) > 1) {
-                        $partialkey = '';
-                    } else {
-                        array_pop($primes);
-                        $partialkey = serialize(array(
-                            'primes' => $primes,
-                            'coefficients' => $coefficients,
-                            'lcm' => $lcm,
-                            'exponents' => $exponents
-                        ));
-                    }
-
-                    return array(
-                        'privatekey' => '',
-                        'publickey'  => '',
-                        'partialkey' => $partialkey
-                    );
-                }
-
-                // the first coefficient is calculated differently from the rest
-                // ie. instead of being $primes[1]->modInverse($primes[2]), it's $primes[2]->modInverse($primes[1])
-                if ($i > 2) {
-                    $coefficients[$i] = $n->modInverse($primes[$i]);
-                }
-
-                $n = $n->multiply($primes[$i]);
-
-                $temp = $primes[$i]->subtract($this->one);
-
-                // textbook RSA implementations use Euler's totient function instead of the least common multiple.
-                // see http://en.wikipedia.org/wiki/Euler%27s_totient_function
-                $lcm['top'] = $lcm['top']->multiply($temp);
-                $lcm['bottom'] = $lcm['bottom'] === false ? $temp : $lcm['bottom']->gcd($temp);
-
-                $exponents[$i] = $e->modInverse($temp);
-            }
-
-            list($temp) = $lcm['top']->divide($lcm['bottom']);
-            $gcd = $temp->gcd($e);
-            $i0 = 1;
-        } while (!$gcd->equals($this->one));
-
-        $d = $e->modInverse($temp);
-
-        $coefficients[2] = $primes[2]->modInverse($primes[1]);
-
-        // from :
-        // RSAPrivateKey ::= SEQUENCE {
-        //     version           Version,
-        //     modulus           INTEGER,  -- n
-        //     publicExponent    INTEGER,  -- e
-        //     privateExponent   INTEGER,  -- d
-        //     prime1            INTEGER,  -- p
-        //     prime2            INTEGER,  -- q
-        //     exponent1         INTEGER,  -- d mod (p-1)
-        //     exponent2         INTEGER,  -- d mod (q-1)
-        //     coefficient       INTEGER,  -- (inverse of q) mod p
-        //     otherPrimeInfos   OtherPrimeInfos OPTIONAL
-        // }
-
-        return array(
-            'privatekey' => $this->_convertPrivateKey($n, $e, $d, $primes, $exponents, $coefficients),
-            'publickey'  => $this->_convertPublicKey($n, $e),
-            'partialkey' => false
-        );
-    }
-
-    /**
-     * Convert a private key to the appropriate format.
-     *
-     * @access private
-     * @see self::setPrivateKeyFormat()
-     * @param string $RSAPrivateKey
-     * @return string
-     */
-    function _convertPrivateKey($n, $e, $d, $primes, $exponents, $coefficients)
-    {
-        $signed = $this->privateKeyFormat != self::PRIVATE_FORMAT_XML;
-        $num_primes = count($primes);
-        $raw = array(
-            'version' => $num_primes == 2 ? chr(0) : chr(1), // two-prime vs. multi
-            'modulus' => $n->toBytes($signed),
-            'publicExponent' => $e->toBytes($signed),
-            'privateExponent' => $d->toBytes($signed),
-            'prime1' => $primes[1]->toBytes($signed),
-            'prime2' => $primes[2]->toBytes($signed),
-            'exponent1' => $exponents[1]->toBytes($signed),
-            'exponent2' => $exponents[2]->toBytes($signed),
-            'coefficient' => $coefficients[2]->toBytes($signed)
-        );
-
-        // if the format in question does not support multi-prime rsa and multi-prime rsa was used,
-        // call _convertPublicKey() instead.
-        switch ($this->privateKeyFormat) {
-            case self::PRIVATE_FORMAT_XML:
-                if ($num_primes != 2) {
-                    return false;
-                }
-                return "\r\n" .
-                       '  ' . base64_encode($raw['modulus']) . "\r\n" .
-                       '  ' . base64_encode($raw['publicExponent']) . "\r\n" .
-                       '  
' . base64_encode($raw['prime1']) . "
\r\n" .
-                       '  ' . base64_encode($raw['prime2']) . "\r\n" .
-                       '  ' . base64_encode($raw['exponent1']) . "\r\n" .
-                       '  ' . base64_encode($raw['exponent2']) . "\r\n" .
-                       '  ' . base64_encode($raw['coefficient']) . "\r\n" .
-                       '  ' . base64_encode($raw['privateExponent']) . "\r\n" .
-                       '';
-                break;
-            case self::PRIVATE_FORMAT_PUTTY:
-                if ($num_primes != 2) {
-                    return false;
-                }
-                $key = "PuTTY-User-Key-File-2: ssh-rsa\r\nEncryption: ";
-                $encryption = (!empty($this->password) || is_string($this->password)) ? 'aes256-cbc' : 'none';
-                $key.= $encryption;
-                $key.= "\r\nComment: " . $this->comment . "\r\n";
-                $public = pack(
-                    'Na*Na*Na*',
-                    strlen('ssh-rsa'),
-                    'ssh-rsa',
-                    strlen($raw['publicExponent']),
-                    $raw['publicExponent'],
-                    strlen($raw['modulus']),
-                    $raw['modulus']
-                );
-                $source = pack(
-                    'Na*Na*Na*Na*',
-                    strlen('ssh-rsa'),
-                    'ssh-rsa',
-                    strlen($encryption),
-                    $encryption,
-                    strlen($this->comment),
-                    $this->comment,
-                    strlen($public),
-                    $public
-                );
-                $public = base64_encode($public);
-                $key.= "Public-Lines: " . ((strlen($public) + 63) >> 6) . "\r\n";
-                $key.= chunk_split($public, 64);
-                $private = pack(
-                    'Na*Na*Na*Na*',
-                    strlen($raw['privateExponent']),
-                    $raw['privateExponent'],
-                    strlen($raw['prime1']),
-                    $raw['prime1'],
-                    strlen($raw['prime2']),
-                    $raw['prime2'],
-                    strlen($raw['coefficient']),
-                    $raw['coefficient']
-                );
-                if (empty($this->password) && !is_string($this->password)) {
-                    $source.= pack('Na*', strlen($private), $private);
-                    $hashkey = 'putty-private-key-file-mac-key';
-                } else {
-                    $private.= Random::string(16 - (strlen($private) & 15));
-                    $source.= pack('Na*', strlen($private), $private);
-                    $sequence = 0;
-                    $symkey = '';
-                    while (strlen($symkey) < 32) {
-                        $temp = pack('Na*', $sequence++, $this->password);
-                        $symkey.= pack('H*', sha1($temp));
-                    }
-                    $symkey = substr($symkey, 0, 32);
-                    $crypto = new AES();
-
-                    $crypto->setKey($symkey);
-                    $crypto->disablePadding();
-                    $private = $crypto->encrypt($private);
-                    $hashkey = 'putty-private-key-file-mac-key' . $this->password;
-                }
-
-                $private = base64_encode($private);
-                $key.= 'Private-Lines: ' . ((strlen($private) + 63) >> 6) . "\r\n";
-                $key.= chunk_split($private, 64);
-                $hash = new Hash('sha1');
-                $hash->setKey(pack('H*', sha1($hashkey)));
-                $key.= 'Private-MAC: ' . bin2hex($hash->hash($source)) . "\r\n";
-
-                return $key;
-            default: // eg. self::PRIVATE_FORMAT_PKCS1
-                $components = array();
-                foreach ($raw as $name => $value) {
-                    $components[$name] = pack('Ca*a*', self::ASN1_INTEGER, $this->_encodeLength(strlen($value)), $value);
-                }
-
-                $RSAPrivateKey = implode('', $components);
-
-                if ($num_primes > 2) {
-                    $OtherPrimeInfos = '';
-                    for ($i = 3; $i <= $num_primes; $i++) {
-                        // OtherPrimeInfos ::= SEQUENCE SIZE(1..MAX) OF OtherPrimeInfo
-                        //
-                        // OtherPrimeInfo ::= SEQUENCE {
-                        //     prime             INTEGER,  -- ri
-                        //     exponent          INTEGER,  -- di
-                        //     coefficient       INTEGER   -- ti
-                        // }
-                        $OtherPrimeInfo = pack('Ca*a*', self::ASN1_INTEGER, $this->_encodeLength(strlen($primes[$i]->toBytes(true))), $primes[$i]->toBytes(true));
-                        $OtherPrimeInfo.= pack('Ca*a*', self::ASN1_INTEGER, $this->_encodeLength(strlen($exponents[$i]->toBytes(true))), $exponents[$i]->toBytes(true));
-                        $OtherPrimeInfo.= pack('Ca*a*', self::ASN1_INTEGER, $this->_encodeLength(strlen($coefficients[$i]->toBytes(true))), $coefficients[$i]->toBytes(true));
-                        $OtherPrimeInfos.= pack('Ca*a*', self::ASN1_SEQUENCE, $this->_encodeLength(strlen($OtherPrimeInfo)), $OtherPrimeInfo);
-                    }
-                    $RSAPrivateKey.= pack('Ca*a*', self::ASN1_SEQUENCE, $this->_encodeLength(strlen($OtherPrimeInfos)), $OtherPrimeInfos);
-                }
-
-                $RSAPrivateKey = pack('Ca*a*', self::ASN1_SEQUENCE, $this->_encodeLength(strlen($RSAPrivateKey)), $RSAPrivateKey);
-
-                if ($this->privateKeyFormat == self::PRIVATE_FORMAT_PKCS8) {
-                    $rsaOID = pack('H*', '300d06092a864886f70d0101010500'); // hex version of MA0GCSqGSIb3DQEBAQUA
-                    $RSAPrivateKey = pack(
-                        'Ca*a*Ca*a*',
-                        self::ASN1_INTEGER,
-                        "\01\00",
-                        $rsaOID,
-                        4,
-                        $this->_encodeLength(strlen($RSAPrivateKey)),
-                        $RSAPrivateKey
-                    );
-                    $RSAPrivateKey = pack('Ca*a*', self::ASN1_SEQUENCE, $this->_encodeLength(strlen($RSAPrivateKey)), $RSAPrivateKey);
-                    if (!empty($this->password) || is_string($this->password)) {
-                        $salt = Random::string(8);
-                        $iterationCount = 2048;
-
-                        $crypto = new DES();
-                        $crypto->setPassword($this->password, 'pbkdf1', 'md5', $salt, $iterationCount);
-                        $RSAPrivateKey = $crypto->encrypt($RSAPrivateKey);
-
-                        $parameters = pack(
-                            'Ca*a*Ca*N',
-                            self::ASN1_OCTETSTRING,
-                            $this->_encodeLength(strlen($salt)),
-                            $salt,
-                            self::ASN1_INTEGER,
-                            $this->_encodeLength(4),
-                            $iterationCount
-                        );
-                        $pbeWithMD5AndDES_CBC = "\x2a\x86\x48\x86\xf7\x0d\x01\x05\x03";
-
-                        $encryptionAlgorithm = pack(
-                            'Ca*a*Ca*a*',
-                            self::ASN1_OBJECT,
-                            $this->_encodeLength(strlen($pbeWithMD5AndDES_CBC)),
-                            $pbeWithMD5AndDES_CBC,
-                            self::ASN1_SEQUENCE,
-                            $this->_encodeLength(strlen($parameters)),
-                            $parameters
-                        );
-
-                        $RSAPrivateKey = pack(
-                            'Ca*a*Ca*a*',
-                            self::ASN1_SEQUENCE,
-                            $this->_encodeLength(strlen($encryptionAlgorithm)),
-                            $encryptionAlgorithm,
-                            self::ASN1_OCTETSTRING,
-                            $this->_encodeLength(strlen($RSAPrivateKey)),
-                            $RSAPrivateKey
-                        );
-
-                        $RSAPrivateKey = pack('Ca*a*', self::ASN1_SEQUENCE, $this->_encodeLength(strlen($RSAPrivateKey)), $RSAPrivateKey);
-
-                        $RSAPrivateKey = "-----BEGIN ENCRYPTED PRIVATE KEY-----\r\n" .
-                                         chunk_split(base64_encode($RSAPrivateKey), 64) .
-                                         '-----END ENCRYPTED PRIVATE KEY-----';
-                    } else {
-                        $RSAPrivateKey = "-----BEGIN PRIVATE KEY-----\r\n" .
-                                         chunk_split(base64_encode($RSAPrivateKey), 64) .
-                                         '-----END PRIVATE KEY-----';
-                    }
-                    return $RSAPrivateKey;
-                }
-
-                if (!empty($this->password) || is_string($this->password)) {
-                    $iv = Random::string(8);
-                    $symkey = pack('H*', md5($this->password . $iv)); // symkey is short for symmetric key
-                    $symkey.= substr(pack('H*', md5($symkey . $this->password . $iv)), 0, 8);
-                    $des = new TripleDES();
-                    $des->setKey($symkey);
-                    $des->setIV($iv);
-                    $iv = strtoupper(bin2hex($iv));
-                    $RSAPrivateKey = "-----BEGIN RSA PRIVATE KEY-----\r\n" .
-                                     "Proc-Type: 4,ENCRYPTED\r\n" .
-                                     "DEK-Info: DES-EDE3-CBC,$iv\r\n" .
-                                     "\r\n" .
-                                     chunk_split(base64_encode($des->encrypt($RSAPrivateKey)), 64) .
-                                     '-----END RSA PRIVATE KEY-----';
-                } else {
-                    $RSAPrivateKey = "-----BEGIN RSA PRIVATE KEY-----\r\n" .
-                                     chunk_split(base64_encode($RSAPrivateKey), 64) .
-                                     '-----END RSA PRIVATE KEY-----';
-                }
-
-                return $RSAPrivateKey;
-        }
-    }
-
-    /**
-     * Convert a public key to the appropriate format
-     *
-     * @access private
-     * @see self::setPublicKeyFormat()
-     * @param string $RSAPrivateKey
-     * @return string
-     */
-    function _convertPublicKey($n, $e)
-    {
-        $signed = $this->publicKeyFormat != self::PUBLIC_FORMAT_XML;
-
-        $modulus = $n->toBytes($signed);
-        $publicExponent = $e->toBytes($signed);
-
-        switch ($this->publicKeyFormat) {
-            case self::PUBLIC_FORMAT_RAW:
-                return array('e' => $e->copy(), 'n' => $n->copy());
-            case self::PUBLIC_FORMAT_XML:
-                return "\r\n" .
-                       '  ' . base64_encode($modulus) . "\r\n" .
-                       '  ' . base64_encode($publicExponent) . "\r\n" .
-                       '';
-                break;
-            case self::PUBLIC_FORMAT_OPENSSH:
-                // from :
-                // string    "ssh-rsa"
-                // mpint     e
-                // mpint     n
-                $RSAPublicKey = pack('Na*Na*Na*', strlen('ssh-rsa'), 'ssh-rsa', strlen($publicExponent), $publicExponent, strlen($modulus), $modulus);
-                $RSAPublicKey = 'ssh-rsa ' . base64_encode($RSAPublicKey) . ' ' . $this->comment;
-
-                return $RSAPublicKey;
-            default: // eg. self::PUBLIC_FORMAT_PKCS1_RAW or self::PUBLIC_FORMAT_PKCS1
-                // from :
-                // RSAPublicKey ::= SEQUENCE {
-                //     modulus           INTEGER,  -- n
-                //     publicExponent    INTEGER   -- e
-                // }
-                $components = array(
-                    'modulus' => pack('Ca*a*', self::ASN1_INTEGER, $this->_encodeLength(strlen($modulus)), $modulus),
-                    'publicExponent' => pack('Ca*a*', self::ASN1_INTEGER, $this->_encodeLength(strlen($publicExponent)), $publicExponent)
-                );
-
-                $RSAPublicKey = pack(
-                    'Ca*a*a*',
-                    self::ASN1_SEQUENCE,
-                    $this->_encodeLength(strlen($components['modulus']) + strlen($components['publicExponent'])),
-                    $components['modulus'],
-                    $components['publicExponent']
-                );
-
-                if ($this->publicKeyFormat == self::PUBLIC_FORMAT_PKCS1_RAW) {
-                    $RSAPublicKey = "-----BEGIN RSA PUBLIC KEY-----\r\n" .
-                                    chunk_split(base64_encode($RSAPublicKey), 64) .
-                                    '-----END RSA PUBLIC KEY-----';
-                } else {
-                    // sequence(oid(1.2.840.113549.1.1.1), null)) = rsaEncryption.
-                    $rsaOID = pack('H*', '300d06092a864886f70d0101010500'); // hex version of MA0GCSqGSIb3DQEBAQUA
-                    $RSAPublicKey = chr(0) . $RSAPublicKey;
-                    $RSAPublicKey = chr(3) . $this->_encodeLength(strlen($RSAPublicKey)) . $RSAPublicKey;
-
-                    $RSAPublicKey = pack(
-                        'Ca*a*',
-                        self::ASN1_SEQUENCE,
-                        $this->_encodeLength(strlen($rsaOID . $RSAPublicKey)),
-                        $rsaOID . $RSAPublicKey
-                    );
-
-                    $RSAPublicKey = "-----BEGIN PUBLIC KEY-----\r\n" .
-                                     chunk_split(base64_encode($RSAPublicKey), 64) .
-                                     '-----END PUBLIC KEY-----';
-                }
-
-                return $RSAPublicKey;
-        }
-    }
-
-    /**
-     * Break a public or private key down into its constituant components
-     *
-     * @access private
-     * @see self::_convertPublicKey()
-     * @see self::_convertPrivateKey()
-     * @param string $key
-     * @param int $type
-     * @return array
-     */
-    function _parseKey($key, $type)
-    {
-        if ($type != self::PUBLIC_FORMAT_RAW && !is_string($key)) {
-            return false;
-        }
-
-        switch ($type) {
-            case self::PUBLIC_FORMAT_RAW:
-                if (!is_array($key)) {
-                    return false;
-                }
-                $components = array();
-                switch (true) {
-                    case isset($key['e']):
-                        $components['publicExponent'] = $key['e']->copy();
-                        break;
-                    case isset($key['exponent']):
-                        $components['publicExponent'] = $key['exponent']->copy();
-                        break;
-                    case isset($key['publicExponent']):
-                        $components['publicExponent'] = $key['publicExponent']->copy();
-                        break;
-                    case isset($key[0]):
-                        $components['publicExponent'] = $key[0]->copy();
-                }
-                switch (true) {
-                    case isset($key['n']):
-                        $components['modulus'] = $key['n']->copy();
-                        break;
-                    case isset($key['modulo']):
-                        $components['modulus'] = $key['modulo']->copy();
-                        break;
-                    case isset($key['modulus']):
-                        $components['modulus'] = $key['modulus']->copy();
-                        break;
-                    case isset($key[1]):
-                        $components['modulus'] = $key[1]->copy();
-                }
-                return isset($components['modulus']) && isset($components['publicExponent']) ? $components : false;
-            case self::PRIVATE_FORMAT_PKCS1:
-            case self::PRIVATE_FORMAT_PKCS8:
-            case self::PUBLIC_FORMAT_PKCS1:
-                /* Although PKCS#1 proposes a format that public and private keys can use, encrypting them is
-                   "outside the scope" of PKCS#1.  PKCS#1 then refers you to PKCS#12 and PKCS#15 if you're wanting to
-                   protect private keys, however, that's not what OpenSSL* does.  OpenSSL protects private keys by adding
-                   two new "fields" to the key - DEK-Info and Proc-Type.  These fields are discussed here:
-
-                   http://tools.ietf.org/html/rfc1421#section-4.6.1.1
-                   http://tools.ietf.org/html/rfc1421#section-4.6.1.3
-
-                   DES-EDE3-CBC as an algorithm, however, is not discussed anywhere, near as I can tell.
-                   DES-CBC and DES-EDE are discussed in RFC1423, however, DES-EDE3-CBC isn't, nor is its key derivation
-                   function.  As is, the definitive authority on this encoding scheme isn't the IETF but rather OpenSSL's
-                   own implementation.  ie. the implementation *is* the standard and any bugs that may exist in that
-                   implementation are part of the standard, as well.
-
-                   * OpenSSL is the de facto standard.  It's utilized by OpenSSH and other projects */
-                if (preg_match('#DEK-Info: (.+),(.+)#', $key, $matches)) {
-                    $iv = pack('H*', trim($matches[2]));
-                    $symkey = pack('H*', md5($this->password . substr($iv, 0, 8))); // symkey is short for symmetric key
-                    $symkey.= pack('H*', md5($symkey . $this->password . substr($iv, 0, 8)));
-                    // remove the Proc-Type / DEK-Info sections as they're no longer needed
-                    $key = preg_replace('#^(?:Proc-Type|DEK-Info): .*#m', '', $key);
-                    $ciphertext = $this->_extractBER($key);
-                    if ($ciphertext === false) {
-                        $ciphertext = $key;
-                    }
-                    switch ($matches[1]) {
-                        case 'AES-256-CBC':
-                            $crypto = new AES();
-                            break;
-                        case 'AES-128-CBC':
-                            $symkey = substr($symkey, 0, 16);
-                            $crypto = new AES();
-                            break;
-                        case 'DES-EDE3-CFB':
-                            $crypto = new TripleDES(Base::MODE_CFB);
-                            break;
-                        case 'DES-EDE3-CBC':
-                            $symkey = substr($symkey, 0, 24);
-                            $crypto = new TripleDES();
-                            break;
-                        case 'DES-CBC':
-                            $crypto = new DES();
-                            break;
-                        default:
-                            return false;
-                    }
-                    $crypto->setKey($symkey);
-                    $crypto->setIV($iv);
-                    $decoded = $crypto->decrypt($ciphertext);
-                } else {
-                    $decoded = $this->_extractBER($key);
-                }
-
-                if ($decoded !== false) {
-                    $key = $decoded;
-                }
-
-                $components = array();
-
-                if (ord($this->_string_shift($key)) != self::ASN1_SEQUENCE) {
-                    return false;
-                }
-                if ($this->_decodeLength($key) != strlen($key)) {
-                    return false;
-                }
-
-                $tag = ord($this->_string_shift($key));
-                /* intended for keys for which OpenSSL's asn1parse returns the following:
-
-                    0:d=0  hl=4 l= 631 cons: SEQUENCE
-                    4:d=1  hl=2 l=   1 prim:  INTEGER           :00
-                    7:d=1  hl=2 l=  13 cons:  SEQUENCE
-                    9:d=2  hl=2 l=   9 prim:   OBJECT            :rsaEncryption
-                   20:d=2  hl=2 l=   0 prim:   NULL
-                   22:d=1  hl=4 l= 609 prim:  OCTET STRING
-
-                   ie. PKCS8 keys*/
-
-                if ($tag == self::ASN1_INTEGER && substr($key, 0, 3) == "\x01\x00\x30") {
-                    $this->_string_shift($key, 3);
-                    $tag = self::ASN1_SEQUENCE;
-                }
-
-                if ($tag == self::ASN1_SEQUENCE) {
-                    $temp = $this->_string_shift($key, $this->_decodeLength($key));
-                    if (ord($this->_string_shift($temp)) != self::ASN1_OBJECT) {
-                        return false;
-                    }
-                    $length = $this->_decodeLength($temp);
-                    switch ($this->_string_shift($temp, $length)) {
-                        case "\x2a\x86\x48\x86\xf7\x0d\x01\x01\x01": // rsaEncryption
-                            break;
-                        case "\x2a\x86\x48\x86\xf7\x0d\x01\x05\x03": // pbeWithMD5AndDES-CBC
-                            /*
-                               PBEParameter ::= SEQUENCE {
-                                   salt OCTET STRING (SIZE(8)),
-                                   iterationCount INTEGER }
-                            */
-                            if (ord($this->_string_shift($temp)) != self::ASN1_SEQUENCE) {
-                                return false;
-                            }
-                            if ($this->_decodeLength($temp) != strlen($temp)) {
-                                return false;
-                            }
-                            $this->_string_shift($temp); // assume it's an octet string
-                            $salt = $this->_string_shift($temp, $this->_decodeLength($temp));
-                            if (ord($this->_string_shift($temp)) != self::ASN1_INTEGER) {
-                                return false;
-                            }
-                            $this->_decodeLength($temp);
-                            list(, $iterationCount) = unpack('N', str_pad($temp, 4, chr(0), STR_PAD_LEFT));
-                            $this->_string_shift($key); // assume it's an octet string
-                            $length = $this->_decodeLength($key);
-                            if (strlen($key) != $length) {
-                                return false;
-                            }
-
-                            $crypto = new DES();
-                            $crypto->setPassword($this->password, 'pbkdf1', 'md5', $salt, $iterationCount);
-                            $key = $crypto->decrypt($key);
-                            if ($key === false) {
-                                return false;
-                            }
-                            return $this->_parseKey($key, self::PRIVATE_FORMAT_PKCS1);
-                        default:
-                            return false;
-                    }
-                    /* intended for keys for which OpenSSL's asn1parse returns the following:
-
-                        0:d=0  hl=4 l= 290 cons: SEQUENCE
-                        4:d=1  hl=2 l=  13 cons:  SEQUENCE
-                        6:d=2  hl=2 l=   9 prim:   OBJECT            :rsaEncryption
-                       17:d=2  hl=2 l=   0 prim:   NULL
-                       19:d=1  hl=4 l= 271 prim:  BIT STRING */
-                    $tag = ord($this->_string_shift($key)); // skip over the BIT STRING / OCTET STRING tag
-                    $this->_decodeLength($key); // skip over the BIT STRING / OCTET STRING length
-                    // "The initial octet shall encode, as an unsigned binary integer wtih bit 1 as the least significant bit, the number of
-                    //  unused bits in the final subsequent octet. The number shall be in the range zero to seven."
-                    //  -- http://www.itu.int/ITU-T/studygroups/com17/languages/X.690-0207.pdf (section 8.6.2.2)
-                    if ($tag == self::ASN1_BITSTRING) {
-                        $this->_string_shift($key);
-                    }
-                    if (ord($this->_string_shift($key)) != self::ASN1_SEQUENCE) {
-                        return false;
-                    }
-                    if ($this->_decodeLength($key) != strlen($key)) {
-                        return false;
-                    }
-                    $tag = ord($this->_string_shift($key));
-                }
-                if ($tag != self::ASN1_INTEGER) {
-                    return false;
-                }
-
-                $length = $this->_decodeLength($key);
-                $temp = $this->_string_shift($key, $length);
-                if (strlen($temp) != 1 || ord($temp) > 2) {
-                    $components['modulus'] = new BigInteger($temp, 256);
-                    $this->_string_shift($key); // skip over self::ASN1_INTEGER
-                    $length = $this->_decodeLength($key);
-                    $components[$type == self::PUBLIC_FORMAT_PKCS1 ? 'publicExponent' : 'privateExponent'] = new BigInteger($this->_string_shift($key, $length), 256);
-
-                    return $components;
-                }
-                if (ord($this->_string_shift($key)) != self::ASN1_INTEGER) {
-                    return false;
-                }
-                $length = $this->_decodeLength($key);
-                $components['modulus'] = new BigInteger($this->_string_shift($key, $length), 256);
-                $this->_string_shift($key);
-                $length = $this->_decodeLength($key);
-                $components['publicExponent'] = new BigInteger($this->_string_shift($key, $length), 256);
-                $this->_string_shift($key);
-                $length = $this->_decodeLength($key);
-                $components['privateExponent'] = new BigInteger($this->_string_shift($key, $length), 256);
-                $this->_string_shift($key);
-                $length = $this->_decodeLength($key);
-                $components['primes'] = array(1 => new BigInteger($this->_string_shift($key, $length), 256));
-                $this->_string_shift($key);
-                $length = $this->_decodeLength($key);
-                $components['primes'][] = new BigInteger($this->_string_shift($key, $length), 256);
-                $this->_string_shift($key);
-                $length = $this->_decodeLength($key);
-                $components['exponents'] = array(1 => new BigInteger($this->_string_shift($key, $length), 256));
-                $this->_string_shift($key);
-                $length = $this->_decodeLength($key);
-                $components['exponents'][] = new BigInteger($this->_string_shift($key, $length), 256);
-                $this->_string_shift($key);
-                $length = $this->_decodeLength($key);
-                $components['coefficients'] = array(2 => new BigInteger($this->_string_shift($key, $length), 256));
-
-                if (!empty($key)) {
-                    if (ord($this->_string_shift($key)) != self::ASN1_SEQUENCE) {
-                        return false;
-                    }
-                    $this->_decodeLength($key);
-                    while (!empty($key)) {
-                        if (ord($this->_string_shift($key)) != self::ASN1_SEQUENCE) {
-                            return false;
-                        }
-                        $this->_decodeLength($key);
-                        $key = substr($key, 1);
-                        $length = $this->_decodeLength($key);
-                        $components['primes'][] = new BigInteger($this->_string_shift($key, $length), 256);
-                        $this->_string_shift($key);
-                        $length = $this->_decodeLength($key);
-                        $components['exponents'][] = new BigInteger($this->_string_shift($key, $length), 256);
-                        $this->_string_shift($key);
-                        $length = $this->_decodeLength($key);
-                        $components['coefficients'][] = new BigInteger($this->_string_shift($key, $length), 256);
-                    }
-                }
-
-                return $components;
-            case self::PUBLIC_FORMAT_OPENSSH:
-                $parts = explode(' ', $key, 3);
-
-                $key = isset($parts[1]) ? base64_decode($parts[1]) : false;
-                if ($key === false) {
-                    return false;
-                }
-
-                $comment = isset($parts[2]) ? $parts[2] : false;
-
-                $cleanup = substr($key, 0, 11) == "\0\0\0\7ssh-rsa";
-
-                if (strlen($key) <= 4) {
-                    return false;
-                }
-                extract(unpack('Nlength', $this->_string_shift($key, 4)));
-                $publicExponent = new BigInteger($this->_string_shift($key, $length), -256);
-                if (strlen($key) <= 4) {
-                    return false;
-                }
-                extract(unpack('Nlength', $this->_string_shift($key, 4)));
-                $modulus = new BigInteger($this->_string_shift($key, $length), -256);
-
-                if ($cleanup && strlen($key)) {
-                    if (strlen($key) <= 4) {
-                        return false;
-                    }
-                    extract(unpack('Nlength', $this->_string_shift($key, 4)));
-                    $realModulus = new BigInteger($this->_string_shift($key, $length), -256);
-                    return strlen($key) ? false : array(
-                        'modulus' => $realModulus,
-                        'publicExponent' => $modulus,
-                        'comment' => $comment
-                    );
-                } else {
-                    return strlen($key) ? false : array(
-                        'modulus' => $modulus,
-                        'publicExponent' => $publicExponent,
-                        'comment' => $comment
-                    );
-                }
-            // http://www.w3.org/TR/xmldsig-core/#sec-RSAKeyValue
-            // http://en.wikipedia.org/wiki/XML_Signature
-            case self::PRIVATE_FORMAT_XML:
-            case self::PUBLIC_FORMAT_XML:
-                $this->components = array();
-
-                $xml = xml_parser_create('UTF-8');
-                xml_set_object($xml, $this);
-                xml_set_element_handler($xml, '_start_element_handler', '_stop_element_handler');
-                xml_set_character_data_handler($xml, '_data_handler');
-                // add  to account for "dangling" tags like ... that are sometimes added
-                if (!xml_parse($xml, '' . $key . '')) {
-                    return false;
-                }
-
-                return isset($this->components['modulus']) && isset($this->components['publicExponent']) ? $this->components : false;
-            // from PuTTY's SSHPUBK.C
-            case self::PRIVATE_FORMAT_PUTTY:
-                $components = array();
-                $key = preg_split('#\r\n|\r|\n#', $key);
-                $type = trim(preg_replace('#PuTTY-User-Key-File-2: (.+)#', '$1', $key[0]));
-                if ($type != 'ssh-rsa') {
-                    return false;
-                }
-                $encryption = trim(preg_replace('#Encryption: (.+)#', '$1', $key[1]));
-                $comment = trim(preg_replace('#Comment: (.+)#', '$1', $key[2]));
-
-                $publicLength = trim(preg_replace('#Public-Lines: (\d+)#', '$1', $key[3]));
-                $public = base64_decode(implode('', array_map('trim', array_slice($key, 4, $publicLength))));
-                $public = substr($public, 11);
-                extract(unpack('Nlength', $this->_string_shift($public, 4)));
-                $components['publicExponent'] = new BigInteger($this->_string_shift($public, $length), -256);
-                extract(unpack('Nlength', $this->_string_shift($public, 4)));
-                $components['modulus'] = new BigInteger($this->_string_shift($public, $length), -256);
-
-                $privateLength = trim(preg_replace('#Private-Lines: (\d+)#', '$1', $key[$publicLength + 4]));
-                $private = base64_decode(implode('', array_map('trim', array_slice($key, $publicLength + 5, $privateLength))));
-
-                switch ($encryption) {
-                    case 'aes256-cbc':
-                        $symkey = '';
-                        $sequence = 0;
-                        while (strlen($symkey) < 32) {
-                            $temp = pack('Na*', $sequence++, $this->password);
-                            $symkey.= pack('H*', sha1($temp));
-                        }
-                        $symkey = substr($symkey, 0, 32);
-                        $crypto = new AES();
-                }
-
-                if ($encryption != 'none') {
-                    $crypto->setKey($symkey);
-                    $crypto->disablePadding();
-                    $private = $crypto->decrypt($private);
-                    if ($private === false) {
-                        return false;
-                    }
-                }
-
-                extract(unpack('Nlength', $this->_string_shift($private, 4)));
-                if (strlen($private) < $length) {
-                    return false;
-                }
-                $components['privateExponent'] = new BigInteger($this->_string_shift($private, $length), -256);
-                extract(unpack('Nlength', $this->_string_shift($private, 4)));
-                if (strlen($private) < $length) {
-                    return false;
-                }
-                $components['primes'] = array(1 => new BigInteger($this->_string_shift($private, $length), -256));
-                extract(unpack('Nlength', $this->_string_shift($private, 4)));
-                if (strlen($private) < $length) {
-                    return false;
-                }
-                $components['primes'][] = new BigInteger($this->_string_shift($private, $length), -256);
-
-                $temp = $components['primes'][1]->subtract($this->one);
-                $components['exponents'] = array(1 => $components['publicExponent']->modInverse($temp));
-                $temp = $components['primes'][2]->subtract($this->one);
-                $components['exponents'][] = $components['publicExponent']->modInverse($temp);
-
-                extract(unpack('Nlength', $this->_string_shift($private, 4)));
-                if (strlen($private) < $length) {
-                    return false;
-                }
-                $components['coefficients'] = array(2 => new BigInteger($this->_string_shift($private, $length), -256));
-
-                return $components;
-        }
-    }
-
-    /**
-     * Returns the key size
-     *
-     * More specifically, this returns the size of the modulo in bits.
-     *
-     * @access public
-     * @return int
-     */
-    function getSize()
-    {
-        return !isset($this->modulus) ? 0 : strlen($this->modulus->toBits());
-    }
-
-    /**
-     * Start Element Handler
-     *
-     * Called by xml_set_element_handler()
-     *
-     * @access private
-     * @param resource $parser
-     * @param string $name
-     * @param array $attribs
-     */
-    function _start_element_handler($parser, $name, $attribs)
-    {
-        //$name = strtoupper($name);
-        switch ($name) {
-            case 'MODULUS':
-                $this->current = &$this->components['modulus'];
-                break;
-            case 'EXPONENT':
-                $this->current = &$this->components['publicExponent'];
-                break;
-            case 'P':
-                $this->current = &$this->components['primes'][1];
-                break;
-            case 'Q':
-                $this->current = &$this->components['primes'][2];
-                break;
-            case 'DP':
-                $this->current = &$this->components['exponents'][1];
-                break;
-            case 'DQ':
-                $this->current = &$this->components['exponents'][2];
-                break;
-            case 'INVERSEQ':
-                $this->current = &$this->components['coefficients'][2];
-                break;
-            case 'D':
-                $this->current = &$this->components['privateExponent'];
-        }
-        $this->current = '';
-    }
-
-    /**
-     * Stop Element Handler
-     *
-     * Called by xml_set_element_handler()
-     *
-     * @access private
-     * @param resource $parser
-     * @param string $name
-     */
-    function _stop_element_handler($parser, $name)
-    {
-        if (isset($this->current)) {
-            $this->current = new BigInteger(base64_decode($this->current), 256);
-            unset($this->current);
-        }
-    }
-
-    /**
-     * Data Handler
-     *
-     * Called by xml_set_character_data_handler()
-     *
-     * @access private
-     * @param resource $parser
-     * @param string $data
-     */
-    function _data_handler($parser, $data)
-    {
-        if (!isset($this->current) || is_object($this->current)) {
-            return;
-        }
-        $this->current.= trim($data);
-    }
-
-    /**
-     * Loads a public or private key
-     *
-     * Returns true on success and false on failure (ie. an incorrect password was provided or the key was malformed)
-     *
-     * @access public
-     * @param string $key
-     * @param int $type optional
-     */
-    function loadKey($key, $type = false)
-    {
-        if ($key instanceof RSA) {
-            $this->privateKeyFormat = $key->privateKeyFormat;
-            $this->publicKeyFormat = $key->publicKeyFormat;
-            $this->k = $key->k;
-            $this->hLen = $key->hLen;
-            $this->sLen = $key->sLen;
-            $this->mgfHLen = $key->mgfHLen;
-            $this->encryptionMode = $key->encryptionMode;
-            $this->signatureMode = $key->signatureMode;
-            $this->password = $key->password;
-            $this->configFile = $key->configFile;
-            $this->comment = $key->comment;
-
-            if (is_object($key->hash)) {
-                $this->hash = new Hash($key->hash->getHash());
-            }
-            if (is_object($key->mgfHash)) {
-                $this->mgfHash = new Hash($key->mgfHash->getHash());
-            }
-
-            if (is_object($key->modulus)) {
-                $this->modulus = $key->modulus->copy();
-            }
-            if (is_object($key->exponent)) {
-                $this->exponent = $key->exponent->copy();
-            }
-            if (is_object($key->publicExponent)) {
-                $this->publicExponent = $key->publicExponent->copy();
-            }
-
-            $this->primes = array();
-            $this->exponents = array();
-            $this->coefficients = array();
-
-            foreach ($this->primes as $prime) {
-                $this->primes[] = $prime->copy();
-            }
-            foreach ($this->exponents as $exponent) {
-                $this->exponents[] = $exponent->copy();
-            }
-            foreach ($this->coefficients as $coefficient) {
-                $this->coefficients[] = $coefficient->copy();
-            }
-
-            return true;
-        }
-
-        if ($type === false) {
-            $types = array(
-                self::PUBLIC_FORMAT_RAW,
-                self::PRIVATE_FORMAT_PKCS1,
-                self::PRIVATE_FORMAT_XML,
-                self::PRIVATE_FORMAT_PUTTY,
-                self::PUBLIC_FORMAT_OPENSSH
-            );
-            foreach ($types as $type) {
-                $components = $this->_parseKey($key, $type);
-                if ($components !== false) {
-                    break;
-                }
-            }
-        } else {
-            $components = $this->_parseKey($key, $type);
-        }
-
-        if ($components === false) {
-            $this->comment = null;
-            $this->modulus = null;
-            $this->k = null;
-            $this->exponent = null;
-            $this->primes = null;
-            $this->exponents = null;
-            $this->coefficients = null;
-            $this->publicExponent = null;
-
-            return false;
-        }
-
-        if (isset($components['comment']) && $components['comment'] !== false) {
-            $this->comment = $components['comment'];
-        }
-        $this->modulus = $components['modulus'];
-        $this->k = strlen($this->modulus->toBytes());
-        $this->exponent = isset($components['privateExponent']) ? $components['privateExponent'] : $components['publicExponent'];
-        if (isset($components['primes'])) {
-            $this->primes = $components['primes'];
-            $this->exponents = $components['exponents'];
-            $this->coefficients = $components['coefficients'];
-            $this->publicExponent = $components['publicExponent'];
-        } else {
-            $this->primes = array();
-            $this->exponents = array();
-            $this->coefficients = array();
-            $this->publicExponent = false;
-        }
-
-        switch ($type) {
-            case self::PUBLIC_FORMAT_OPENSSH:
-            case self::PUBLIC_FORMAT_RAW:
-                $this->setPublicKey();
-                break;
-            case self::PRIVATE_FORMAT_PKCS1:
-                switch (true) {
-                    case strpos($key, '-BEGIN PUBLIC KEY-') !== false:
-                    case strpos($key, '-BEGIN RSA PUBLIC KEY-') !== false:
-                        $this->setPublicKey();
-                }
-        }
-
-        return true;
-    }
-
-    /**
-     * Sets the password
-     *
-     * Private keys can be encrypted with a password.  To unset the password, pass in the empty string or false.
-     * Or rather, pass in $password such that empty($password) && !is_string($password) is true.
-     *
-     * @see self::createKey()
-     * @see self::loadKey()
-     * @access public
-     * @param string $password
-     */
-    function setPassword($password = false)
-    {
-        $this->password = $password;
-    }
-
-    /**
-     * Defines the public key
-     *
-     * Some private key formats define the public exponent and some don't.  Those that don't define it are problematic when
-     * used in certain contexts.  For example, in SSH-2, RSA authentication works by sending the public key along with a
-     * message signed by the private key to the server.  The SSH-2 server looks the public key up in an index of public keys
-     * and if it's present then proceeds to verify the signature.  Problem is, if your private key doesn't include the public
-     * exponent this won't work unless you manually add the public exponent. phpseclib tries to guess if the key being used
-     * is the public key but in the event that it guesses incorrectly you might still want to explicitly set the key as being
-     * public.
-     *
-     * Do note that when a new key is loaded the index will be cleared.
-     *
-     * Returns true on success, false on failure
-     *
-     * @see self::getPublicKey()
-     * @access public
-     * @param string $key optional
-     * @param int $type optional
-     * @return bool
-     */
-    function setPublicKey($key = false, $type = false)
-    {
-        // if a public key has already been loaded return false
-        if (!empty($this->publicExponent)) {
-            return false;
-        }
-
-        if ($key === false && !empty($this->modulus)) {
-            $this->publicExponent = $this->exponent;
-            return true;
-        }
-
-        if ($type === false) {
-            $types = array(
-                self::PUBLIC_FORMAT_RAW,
-                self::PUBLIC_FORMAT_PKCS1,
-                self::PUBLIC_FORMAT_XML,
-                self::PUBLIC_FORMAT_OPENSSH
-            );
-            foreach ($types as $type) {
-                $components = $this->_parseKey($key, $type);
-                if ($components !== false) {
-                    break;
-                }
-            }
-        } else {
-            $components = $this->_parseKey($key, $type);
-        }
-
-        if ($components === false) {
-            return false;
-        }
-
-        if (empty($this->modulus) || !$this->modulus->equals($components['modulus'])) {
-            $this->modulus = $components['modulus'];
-            $this->exponent = $this->publicExponent = $components['publicExponent'];
-            return true;
-        }
-
-        $this->publicExponent = $components['publicExponent'];
-
-        return true;
-    }
-
-    /**
-     * Defines the private key
-     *
-     * If phpseclib guessed a private key was a public key and loaded it as such it might be desirable to force
-     * phpseclib to treat the key as a private key. This function will do that.
-     *
-     * Do note that when a new key is loaded the index will be cleared.
-     *
-     * Returns true on success, false on failure
-     *
-     * @see self::getPublicKey()
-     * @access public
-     * @param string $key optional
-     * @param int $type optional
-     * @return bool
-     */
-    function setPrivateKey($key = false, $type = false)
-    {
-        if ($key === false && !empty($this->publicExponent)) {
-            $this->publicExponent = false;
-            return true;
-        }
-
-        $rsa = new RSA();
-        if (!$rsa->loadKey($key, $type)) {
-            return false;
-        }
-        $rsa->publicExponent = false;
-
-        // don't overwrite the old key if the new key is invalid
-        $this->loadKey($rsa);
-        return true;
-    }
-
-    /**
-     * Returns the public key
-     *
-     * The public key is only returned under two circumstances - if the private key had the public key embedded within it
-     * or if the public key was set via setPublicKey().  If the currently loaded key is supposed to be the public key this
-     * function won't return it since this library, for the most part, doesn't distinguish between public and private keys.
-     *
-     * @see self::getPublicKey()
-     * @access public
-     * @param string $key
-     * @param int $type optional
-     */
-    function getPublicKey($type = self::PUBLIC_FORMAT_PKCS8)
-    {
-        if (empty($this->modulus) || empty($this->publicExponent)) {
-            return false;
-        }
-
-        $oldFormat = $this->publicKeyFormat;
-        $this->publicKeyFormat = $type;
-        $temp = $this->_convertPublicKey($this->modulus, $this->publicExponent);
-        $this->publicKeyFormat = $oldFormat;
-        return $temp;
-    }
-
-    /**
-     * Returns the public key's fingerprint
-     *
-     * The public key's fingerprint is returned, which is equivalent to running `ssh-keygen -lf rsa.pub`. If there is
-     * no public key currently loaded, false is returned.
-     * Example output (md5): "c1:b1:30:29:d7:b8:de:6c:97:77:10:d7:46:41:63:87" (as specified by RFC 4716)
-     *
-     * @access public
-     * @param string $algorithm The hashing algorithm to be used. Valid options are 'md5' and 'sha256'. False is returned
-     * for invalid values.
-     * @return mixed
-     */
-    function getPublicKeyFingerprint($algorithm = 'md5')
-    {
-        if (empty($this->modulus) || empty($this->publicExponent)) {
-            return false;
-        }
-
-        $modulus = $this->modulus->toBytes(true);
-        $publicExponent = $this->publicExponent->toBytes(true);
-
-        $RSAPublicKey = pack('Na*Na*Na*', strlen('ssh-rsa'), 'ssh-rsa', strlen($publicExponent), $publicExponent, strlen($modulus), $modulus);
-
-        switch ($algorithm) {
-            case 'sha256':
-                $hash = new Hash('sha256');
-                $base = base64_encode($hash->hash($RSAPublicKey));
-                return substr($base, 0, strlen($base) - 1);
-            case 'md5':
-                return substr(chunk_split(md5($RSAPublicKey), 2, ':'), 0, -1);
-            default:
-                return false;
-        }
-    }
-
-    /**
-     * Returns the private key
-     *
-     * The private key is only returned if the currently loaded key contains the constituent prime numbers.
-     *
-     * @see self::getPublicKey()
-     * @access public
-     * @param string $key
-     * @param int $type optional
-     * @return mixed
-     */
-    function getPrivateKey($type = self::PUBLIC_FORMAT_PKCS1)
-    {
-        if (empty($this->primes)) {
-            return false;
-        }
-
-        $oldFormat = $this->privateKeyFormat;
-        $this->privateKeyFormat = $type;
-        $temp = $this->_convertPrivateKey($this->modulus, $this->publicExponent, $this->exponent, $this->primes, $this->exponents, $this->coefficients);
-        $this->privateKeyFormat = $oldFormat;
-        return $temp;
-    }
-
-    /**
-     * Returns a minimalistic private key
-     *
-     * Returns the private key without the prime number constituants.  Structurally identical to a public key that
-     * hasn't been set as the public key
-     *
-     * @see self::getPrivateKey()
-     * @access private
-     * @param string $key
-     * @param int $type optional
-     */
-    function _getPrivatePublicKey($mode = self::PUBLIC_FORMAT_PKCS8)
-    {
-        if (empty($this->modulus) || empty($this->exponent)) {
-            return false;
-        }
-
-        $oldFormat = $this->publicKeyFormat;
-        $this->publicKeyFormat = $mode;
-        $temp = $this->_convertPublicKey($this->modulus, $this->exponent);
-        $this->publicKeyFormat = $oldFormat;
-        return $temp;
-    }
-
-    /**
-     *  __toString() magic method
-     *
-     * @access public
-     * @return string
-     */
-    function __toString()
-    {
-        $key = $this->getPrivateKey($this->privateKeyFormat);
-        if ($key !== false) {
-            return $key;
-        }
-        $key = $this->_getPrivatePublicKey($this->publicKeyFormat);
-        return $key !== false ? $key : '';
-    }
-
-    /**
-     *  __clone() magic method
-     *
-     * @access public
-     * @return Crypt_RSA
-     */
-    function __clone()
-    {
-        $key = new RSA();
-        $key->loadKey($this);
-        return $key;
-    }
-
-    /**
-     * Generates the smallest and largest numbers requiring $bits bits
-     *
-     * @access private
-     * @param int $bits
-     * @return array
-     */
-    function _generateMinMax($bits)
-    {
-        $bytes = $bits >> 3;
-        $min = str_repeat(chr(0), $bytes);
-        $max = str_repeat(chr(0xFF), $bytes);
-        $msb = $bits & 7;
-        if ($msb) {
-            $min = chr(1 << ($msb - 1)) . $min;
-            $max = chr((1 << $msb) - 1) . $max;
-        } else {
-            $min[0] = chr(0x80);
-        }
-
-        return array(
-            'min' => new BigInteger($min, 256),
-            'max' => new BigInteger($max, 256)
-        );
-    }
-
-    /**
-     * DER-decode the length
-     *
-     * DER supports lengths up to (2**8)**127, however, we'll only support lengths up to (2**8)**4.  See
-     * {@link http://itu.int/ITU-T/studygroups/com17/languages/X.690-0207.pdf#p=13 X.690 paragraph 8.1.3} for more information.
-     *
-     * @access private
-     * @param string $string
-     * @return int
-     */
-    function _decodeLength(&$string)
-    {
-        $length = ord($this->_string_shift($string));
-        if ($length & 0x80) { // definite length, long form
-            $length&= 0x7F;
-            $temp = $this->_string_shift($string, $length);
-            list(, $length) = unpack('N', substr(str_pad($temp, 4, chr(0), STR_PAD_LEFT), -4));
-        }
-        return $length;
-    }
-
-    /**
-     * DER-encode the length
-     *
-     * DER supports lengths up to (2**8)**127, however, we'll only support lengths up to (2**8)**4.  See
-     * {@link http://itu.int/ITU-T/studygroups/com17/languages/X.690-0207.pdf#p=13 X.690 paragraph 8.1.3} for more information.
-     *
-     * @access private
-     * @param int $length
-     * @return string
-     */
-    function _encodeLength($length)
-    {
-        if ($length <= 0x7F) {
-            return chr($length);
-        }
-
-        $temp = ltrim(pack('N', $length), chr(0));
-        return pack('Ca*', 0x80 | strlen($temp), $temp);
-    }
-
-    /**
-     * String Shift
-     *
-     * Inspired by array_shift
-     *
-     * @param string $string
-     * @param int $index
-     * @return string
-     * @access private
-     */
-    function _string_shift(&$string, $index = 1)
-    {
-        $substr = substr($string, 0, $index);
-        $string = substr($string, $index);
-        return $substr;
-    }
-
-    /**
-     * Determines the private key format
-     *
-     * @see self::createKey()
-     * @access public
-     * @param int $format
-     */
-    function setPrivateKeyFormat($format)
-    {
-        $this->privateKeyFormat = $format;
-    }
-
-    /**
-     * Determines the public key format
-     *
-     * @see self::createKey()
-     * @access public
-     * @param int $format
-     */
-    function setPublicKeyFormat($format)
-    {
-        $this->publicKeyFormat = $format;
-    }
-
-    /**
-     * Determines which hashing function should be used
-     *
-     * Used with signature production / verification and (if the encryption mode is self::ENCRYPTION_OAEP) encryption and
-     * decryption.  If $hash isn't supported, sha1 is used.
-     *
-     * @access public
-     * @param string $hash
-     */
-    function setHash($hash)
-    {
-        // \phpseclib\Crypt\Hash supports algorithms that PKCS#1 doesn't support.  md5-96 and sha1-96, for example.
-        switch ($hash) {
-            case 'md2':
-            case 'md5':
-            case 'sha1':
-            case 'sha256':
-            case 'sha384':
-            case 'sha512':
-                $this->hash = new Hash($hash);
-                $this->hashName = $hash;
-                break;
-            default:
-                $this->hash = new Hash('sha1');
-                $this->hashName = 'sha1';
-        }
-        $this->hLen = $this->hash->getLength();
-    }
-
-    /**
-     * Determines which hashing function should be used for the mask generation function
-     *
-     * The mask generation function is used by self::ENCRYPTION_OAEP and self::SIGNATURE_PSS and although it's
-     * best if Hash and MGFHash are set to the same thing this is not a requirement.
-     *
-     * @access public
-     * @param string $hash
-     */
-    function setMGFHash($hash)
-    {
-        // \phpseclib\Crypt\Hash supports algorithms that PKCS#1 doesn't support.  md5-96 and sha1-96, for example.
-        switch ($hash) {
-            case 'md2':
-            case 'md5':
-            case 'sha1':
-            case 'sha256':
-            case 'sha384':
-            case 'sha512':
-                $this->mgfHash = new Hash($hash);
-                break;
-            default:
-                $this->mgfHash = new Hash('sha1');
-        }
-        $this->mgfHLen = $this->mgfHash->getLength();
-    }
-
-    /**
-     * Determines the salt length
-     *
-     * To quote from {@link http://tools.ietf.org/html/rfc3447#page-38 RFC3447#page-38}:
-     *
-     *    Typical salt lengths in octets are hLen (the length of the output
-     *    of the hash function Hash) and 0.
-     *
-     * @access public
-     * @param int $format
-     */
-    function setSaltLength($sLen)
-    {
-        $this->sLen = $sLen;
-    }
-
-    /**
-     * Integer-to-Octet-String primitive
-     *
-     * See {@link http://tools.ietf.org/html/rfc3447#section-4.1 RFC3447#section-4.1}.
-     *
-     * @access private
-     * @param \phpseclib\Math\BigInteger $x
-     * @param int $xLen
-     * @return string
-     */
-    function _i2osp($x, $xLen)
-    {
-        $x = $x->toBytes();
-        if (strlen($x) > $xLen) {
-            user_error('Integer too large');
-            return false;
-        }
-        return str_pad($x, $xLen, chr(0), STR_PAD_LEFT);
-    }
-
-    /**
-     * Octet-String-to-Integer primitive
-     *
-     * See {@link http://tools.ietf.org/html/rfc3447#section-4.2 RFC3447#section-4.2}.
-     *
-     * @access private
-     * @param string $x
-     * @return \phpseclib\Math\BigInteger
-     */
-    function _os2ip($x)
-    {
-        return new BigInteger($x, 256);
-    }
-
-    /**
-     * Exponentiate with or without Chinese Remainder Theorem
-     *
-     * See {@link http://tools.ietf.org/html/rfc3447#section-5.1.1 RFC3447#section-5.1.2}.
-     *
-     * @access private
-     * @param \phpseclib\Math\BigInteger $x
-     * @return \phpseclib\Math\BigInteger
-     */
-    function _exponentiate($x)
-    {
-        switch (true) {
-            case empty($this->primes):
-            case $this->primes[1]->equals($this->zero):
-            case empty($this->coefficients):
-            case $this->coefficients[2]->equals($this->zero):
-            case empty($this->exponents):
-            case $this->exponents[1]->equals($this->zero):
-                return $x->modPow($this->exponent, $this->modulus);
-        }
-
-        $num_primes = count($this->primes);
-
-        if (defined('CRYPT_RSA_DISABLE_BLINDING')) {
-            $m_i = array(
-                1 => $x->modPow($this->exponents[1], $this->primes[1]),
-                2 => $x->modPow($this->exponents[2], $this->primes[2])
-            );
-            $h = $m_i[1]->subtract($m_i[2]);
-            $h = $h->multiply($this->coefficients[2]);
-            list(, $h) = $h->divide($this->primes[1]);
-            $m = $m_i[2]->add($h->multiply($this->primes[2]));
-
-            $r = $this->primes[1];
-            for ($i = 3; $i <= $num_primes; $i++) {
-                $m_i = $x->modPow($this->exponents[$i], $this->primes[$i]);
-
-                $r = $r->multiply($this->primes[$i - 1]);
-
-                $h = $m_i->subtract($m);
-                $h = $h->multiply($this->coefficients[$i]);
-                list(, $h) = $h->divide($this->primes[$i]);
-
-                $m = $m->add($r->multiply($h));
-            }
-        } else {
-            $smallest = $this->primes[1];
-            for ($i = 2; $i <= $num_primes; $i++) {
-                if ($smallest->compare($this->primes[$i]) > 0) {
-                    $smallest = $this->primes[$i];
-                }
-            }
-
-            $one = new BigInteger(1);
-
-            $r = $one->random($one, $smallest->subtract($one));
-
-            $m_i = array(
-                1 => $this->_blind($x, $r, 1),
-                2 => $this->_blind($x, $r, 2)
-            );
-            $h = $m_i[1]->subtract($m_i[2]);
-            $h = $h->multiply($this->coefficients[2]);
-            list(, $h) = $h->divide($this->primes[1]);
-            $m = $m_i[2]->add($h->multiply($this->primes[2]));
-
-            $r = $this->primes[1];
-            for ($i = 3; $i <= $num_primes; $i++) {
-                $m_i = $this->_blind($x, $r, $i);
-
-                $r = $r->multiply($this->primes[$i - 1]);
-
-                $h = $m_i->subtract($m);
-                $h = $h->multiply($this->coefficients[$i]);
-                list(, $h) = $h->divide($this->primes[$i]);
-
-                $m = $m->add($r->multiply($h));
-            }
-        }
-
-        return $m;
-    }
-
-    /**
-     * Performs RSA Blinding
-     *
-     * Protects against timing attacks by employing RSA Blinding.
-     * Returns $x->modPow($this->exponents[$i], $this->primes[$i])
-     *
-     * @access private
-     * @param \phpseclib\Math\BigInteger $x
-     * @param \phpseclib\Math\BigInteger $r
-     * @param int $i
-     * @return \phpseclib\Math\BigInteger
-     */
-    function _blind($x, $r, $i)
-    {
-        $x = $x->multiply($r->modPow($this->publicExponent, $this->primes[$i]));
-        $x = $x->modPow($this->exponents[$i], $this->primes[$i]);
-
-        $r = $r->modInverse($this->primes[$i]);
-        $x = $x->multiply($r);
-        list(, $x) = $x->divide($this->primes[$i]);
-
-        return $x;
-    }
-
-    /**
-     * Performs blinded RSA equality testing
-     *
-     * Protects against a particular type of timing attack described.
-     *
-     * See {@link http://codahale.com/a-lesson-in-timing-attacks/ A Lesson In Timing Attacks (or, Don't use MessageDigest.isEquals)}
-     *
-     * Thanks for the heads up singpolyma!
-     *
-     * @access private
-     * @param string $x
-     * @param string $y
-     * @return bool
-     */
-    function _equals($x, $y)
-    {
-        if (strlen($x) != strlen($y)) {
-            return false;
-        }
-
-        $result = 0;
-        for ($i = 0; $i < strlen($x); $i++) {
-            $result |= ord($x[$i]) ^ ord($y[$i]);
-        }
-
-        return $result == 0;
-    }
-
-    /**
-     * RSAEP
-     *
-     * See {@link http://tools.ietf.org/html/rfc3447#section-5.1.1 RFC3447#section-5.1.1}.
-     *
-     * @access private
-     * @param \phpseclib\Math\BigInteger $m
-     * @return \phpseclib\Math\BigInteger
-     */
-    function _rsaep($m)
-    {
-        if ($m->compare($this->zero) < 0 || $m->compare($this->modulus) > 0) {
-            user_error('Message representative out of range');
-            return false;
-        }
-        return $this->_exponentiate($m);
-    }
-
-    /**
-     * RSADP
-     *
-     * See {@link http://tools.ietf.org/html/rfc3447#section-5.1.2 RFC3447#section-5.1.2}.
-     *
-     * @access private
-     * @param \phpseclib\Math\BigInteger $c
-     * @return \phpseclib\Math\BigInteger
-     */
-    function _rsadp($c)
-    {
-        if ($c->compare($this->zero) < 0 || $c->compare($this->modulus) > 0) {
-            user_error('Ciphertext representative out of range');
-            return false;
-        }
-        return $this->_exponentiate($c);
-    }
-
-    /**
-     * RSASP1
-     *
-     * See {@link http://tools.ietf.org/html/rfc3447#section-5.2.1 RFC3447#section-5.2.1}.
-     *
-     * @access private
-     * @param \phpseclib\Math\BigInteger $m
-     * @return \phpseclib\Math\BigInteger
-     */
-    function _rsasp1($m)
-    {
-        if ($m->compare($this->zero) < 0 || $m->compare($this->modulus) > 0) {
-            user_error('Message representative out of range');
-            return false;
-        }
-        return $this->_exponentiate($m);
-    }
-
-    /**
-     * RSAVP1
-     *
-     * See {@link http://tools.ietf.org/html/rfc3447#section-5.2.2 RFC3447#section-5.2.2}.
-     *
-     * @access private
-     * @param \phpseclib\Math\BigInteger $s
-     * @return \phpseclib\Math\BigInteger
-     */
-    function _rsavp1($s)
-    {
-        if ($s->compare($this->zero) < 0 || $s->compare($this->modulus) > 0) {
-            user_error('Signature representative out of range');
-            return false;
-        }
-        return $this->_exponentiate($s);
-    }
-
-    /**
-     * MGF1
-     *
-     * See {@link http://tools.ietf.org/html/rfc3447#appendix-B.2.1 RFC3447#appendix-B.2.1}.
-     *
-     * @access private
-     * @param string $mgfSeed
-     * @param int $mgfLen
-     * @return string
-     */
-    function _mgf1($mgfSeed, $maskLen)
-    {
-        // if $maskLen would yield strings larger than 4GB, PKCS#1 suggests a "Mask too long" error be output.
-
-        $t = '';
-        $count = ceil($maskLen / $this->mgfHLen);
-        for ($i = 0; $i < $count; $i++) {
-            $c = pack('N', $i);
-            $t.= $this->mgfHash->hash($mgfSeed . $c);
-        }
-
-        return substr($t, 0, $maskLen);
-    }
-
-    /**
-     * RSAES-OAEP-ENCRYPT
-     *
-     * See {@link http://tools.ietf.org/html/rfc3447#section-7.1.1 RFC3447#section-7.1.1} and
-     * {http://en.wikipedia.org/wiki/Optimal_Asymmetric_Encryption_Padding OAES}.
-     *
-     * @access private
-     * @param string $m
-     * @param string $l
-     * @return string
-     */
-    function _rsaes_oaep_encrypt($m, $l = '')
-    {
-        $mLen = strlen($m);
-
-        // Length checking
-
-        // if $l is larger than two million terrabytes and you're using sha1, PKCS#1 suggests a "Label too long" error
-        // be output.
-
-        if ($mLen > $this->k - 2 * $this->hLen - 2) {
-            user_error('Message too long');
-            return false;
-        }
-
-        // EME-OAEP encoding
-
-        $lHash = $this->hash->hash($l);
-        $ps = str_repeat(chr(0), $this->k - $mLen - 2 * $this->hLen - 2);
-        $db = $lHash . $ps . chr(1) . $m;
-        $seed = Random::string($this->hLen);
-        $dbMask = $this->_mgf1($seed, $this->k - $this->hLen - 1);
-        $maskedDB = $db ^ $dbMask;
-        $seedMask = $this->_mgf1($maskedDB, $this->hLen);
-        $maskedSeed = $seed ^ $seedMask;
-        $em = chr(0) . $maskedSeed . $maskedDB;
-
-        // RSA encryption
-
-        $m = $this->_os2ip($em);
-        $c = $this->_rsaep($m);
-        $c = $this->_i2osp($c, $this->k);
-
-        // Output the ciphertext C
-
-        return $c;
-    }
-
-    /**
-     * RSAES-OAEP-DECRYPT
-     *
-     * See {@link http://tools.ietf.org/html/rfc3447#section-7.1.2 RFC3447#section-7.1.2}.  The fact that the error
-     * messages aren't distinguishable from one another hinders debugging, but, to quote from RFC3447#section-7.1.2:
-     *
-     *    Note.  Care must be taken to ensure that an opponent cannot
-     *    distinguish the different error conditions in Step 3.g, whether by
-     *    error message or timing, or, more generally, learn partial
-     *    information about the encoded message EM.  Otherwise an opponent may
-     *    be able to obtain useful information about the decryption of the
-     *    ciphertext C, leading to a chosen-ciphertext attack such as the one
-     *    observed by Manger [36].
-     *
-     * As for $l...  to quote from {@link http://tools.ietf.org/html/rfc3447#page-17 RFC3447#page-17}:
-     *
-     *    Both the encryption and the decryption operations of RSAES-OAEP take
-     *    the value of a label L as input.  In this version of PKCS #1, L is
-     *    the empty string; other uses of the label are outside the scope of
-     *    this document.
-     *
-     * @access private
-     * @param string $c
-     * @param string $l
-     * @return string
-     */
-    function _rsaes_oaep_decrypt($c, $l = '')
-    {
-        // Length checking
-
-        // if $l is larger than two million terrabytes and you're using sha1, PKCS#1 suggests a "Label too long" error
-        // be output.
-
-        if (strlen($c) != $this->k || $this->k < 2 * $this->hLen + 2) {
-            user_error('Decryption error');
-            return false;
-        }
-
-        // RSA decryption
-
-        $c = $this->_os2ip($c);
-        $m = $this->_rsadp($c);
-        if ($m === false) {
-            user_error('Decryption error');
-            return false;
-        }
-        $em = $this->_i2osp($m, $this->k);
-
-        // EME-OAEP decoding
-
-        $lHash = $this->hash->hash($l);
-        $y = ord($em[0]);
-        $maskedSeed = substr($em, 1, $this->hLen);
-        $maskedDB = substr($em, $this->hLen + 1);
-        $seedMask = $this->_mgf1($maskedDB, $this->hLen);
-        $seed = $maskedSeed ^ $seedMask;
-        $dbMask = $this->_mgf1($seed, $this->k - $this->hLen - 1);
-        $db = $maskedDB ^ $dbMask;
-        $lHash2 = substr($db, 0, $this->hLen);
-        $m = substr($db, $this->hLen);
-        if ($lHash != $lHash2) {
-            user_error('Decryption error');
-            return false;
-        }
-        $m = ltrim($m, chr(0));
-        if (ord($m[0]) != 1) {
-            user_error('Decryption error');
-            return false;
-        }
-
-        // Output the message M
-
-        return substr($m, 1);
-    }
-
-    /**
-     * Raw Encryption / Decryption
-     *
-     * Doesn't use padding and is not recommended.
-     *
-     * @access private
-     * @param string $m
-     * @return string
-     */
-    function _raw_encrypt($m)
-    {
-        $temp = $this->_os2ip($m);
-        $temp = $this->_rsaep($temp);
-        return  $this->_i2osp($temp, $this->k);
-    }
-
-    /**
-     * RSAES-PKCS1-V1_5-ENCRYPT
-     *
-     * See {@link http://tools.ietf.org/html/rfc3447#section-7.2.1 RFC3447#section-7.2.1}.
-     *
-     * @access private
-     * @param string $m
-     * @return string
-     */
-    function _rsaes_pkcs1_v1_5_encrypt($m)
-    {
-        $mLen = strlen($m);
-
-        // Length checking
-
-        if ($mLen > $this->k - 11) {
-            user_error('Message too long');
-            return false;
-        }
-
-        // EME-PKCS1-v1_5 encoding
-
-        $psLen = $this->k - $mLen - 3;
-        $ps = '';
-        while (strlen($ps) != $psLen) {
-            $temp = Random::string($psLen - strlen($ps));
-            $temp = str_replace("\x00", '', $temp);
-            $ps.= $temp;
-        }
-        $type = 2;
-        // see the comments of _rsaes_pkcs1_v1_5_decrypt() to understand why this is being done
-        if (defined('CRYPT_RSA_PKCS15_COMPAT') && (!isset($this->publicExponent) || $this->exponent !== $this->publicExponent)) {
-            $type = 1;
-            // "The padding string PS shall consist of k-3-||D|| octets. ... for block type 01, they shall have value FF"
-            $ps = str_repeat("\xFF", $psLen);
-        }
-        $em = chr(0) . chr($type) . $ps . chr(0) . $m;
-
-        // RSA encryption
-        $m = $this->_os2ip($em);
-        $c = $this->_rsaep($m);
-        $c = $this->_i2osp($c, $this->k);
-
-        // Output the ciphertext C
-
-        return $c;
-    }
-
-    /**
-     * RSAES-PKCS1-V1_5-DECRYPT
-     *
-     * See {@link http://tools.ietf.org/html/rfc3447#section-7.2.2 RFC3447#section-7.2.2}.
-     *
-     * For compatibility purposes, this function departs slightly from the description given in RFC3447.
-     * The reason being that RFC2313#section-8.1 (PKCS#1 v1.5) states that ciphertext's encrypted by the
-     * private key should have the second byte set to either 0 or 1 and that ciphertext's encrypted by the
-     * public key should have the second byte set to 2.  In RFC3447 (PKCS#1 v2.1), the second byte is supposed
-     * to be 2 regardless of which key is used.  For compatibility purposes, we'll just check to make sure the
-     * second byte is 2 or less.  If it is, we'll accept the decrypted string as valid.
-     *
-     * As a consequence of this, a private key encrypted ciphertext produced with \phpseclib\Crypt\RSA may not decrypt
-     * with a strictly PKCS#1 v1.5 compliant RSA implementation.  Public key encrypted ciphertext's should but
-     * not private key encrypted ciphertext's.
-     *
-     * @access private
-     * @param string $c
-     * @return string
-     */
-    function _rsaes_pkcs1_v1_5_decrypt($c)
-    {
-        // Length checking
-
-        if (strlen($c) != $this->k) { // or if k < 11
-            user_error('Decryption error');
-            return false;
-        }
-
-        // RSA decryption
-
-        $c = $this->_os2ip($c);
-        $m = $this->_rsadp($c);
-
-        if ($m === false) {
-            user_error('Decryption error');
-            return false;
-        }
-        $em = $this->_i2osp($m, $this->k);
-
-        // EME-PKCS1-v1_5 decoding
-
-        if (ord($em[0]) != 0 || ord($em[1]) > 2) {
-            user_error('Decryption error');
-            return false;
-        }
-
-        $ps = substr($em, 2, strpos($em, chr(0), 2) - 2);
-        $m = substr($em, strlen($ps) + 3);
-
-        if (strlen($ps) < 8) {
-            user_error('Decryption error');
-            return false;
-        }
-
-        // Output M
-
-        return $m;
-    }
-
-    /**
-     * EMSA-PSS-ENCODE
-     *
-     * See {@link http://tools.ietf.org/html/rfc3447#section-9.1.1 RFC3447#section-9.1.1}.
-     *
-     * @access private
-     * @param string $m
-     * @param int $emBits
-     */
-    function _emsa_pss_encode($m, $emBits)
-    {
-        // if $m is larger than two million terrabytes and you're using sha1, PKCS#1 suggests a "Label too long" error
-        // be output.
-
-        $emLen = ($emBits + 1) >> 3; // ie. ceil($emBits / 8)
-        $sLen = $this->sLen !== null ? $this->sLen : $this->hLen;
-
-        $mHash = $this->hash->hash($m);
-        if ($emLen < $this->hLen + $sLen + 2) {
-            user_error('Encoding error');
-            return false;
-        }
-
-        $salt = Random::string($sLen);
-        $m2 = "\0\0\0\0\0\0\0\0" . $mHash . $salt;
-        $h = $this->hash->hash($m2);
-        $ps = str_repeat(chr(0), $emLen - $sLen - $this->hLen - 2);
-        $db = $ps . chr(1) . $salt;
-        $dbMask = $this->_mgf1($h, $emLen - $this->hLen - 1);
-        $maskedDB = $db ^ $dbMask;
-        $maskedDB[0] = ~chr(0xFF << ($emBits & 7)) & $maskedDB[0];
-        $em = $maskedDB . $h . chr(0xBC);
-
-        return $em;
-    }
-
-    /**
-     * EMSA-PSS-VERIFY
-     *
-     * See {@link http://tools.ietf.org/html/rfc3447#section-9.1.2 RFC3447#section-9.1.2}.
-     *
-     * @access private
-     * @param string $m
-     * @param string $em
-     * @param int $emBits
-     * @return string
-     */
-    function _emsa_pss_verify($m, $em, $emBits)
-    {
-        // if $m is larger than two million terrabytes and you're using sha1, PKCS#1 suggests a "Label too long" error
-        // be output.
-
-        $emLen = ($emBits + 1) >> 3; // ie. ceil($emBits / 8);
-        $sLen = $this->sLen !== null ? $this->sLen : $this->hLen;
-
-        $mHash = $this->hash->hash($m);
-        if ($emLen < $this->hLen + $sLen + 2) {
-            return false;
-        }
-
-        if ($em[strlen($em) - 1] != chr(0xBC)) {
-            return false;
-        }
-
-        $maskedDB = substr($em, 0, -$this->hLen - 1);
-        $h = substr($em, -$this->hLen - 1, $this->hLen);
-        $temp = chr(0xFF << ($emBits & 7));
-        if ((~$maskedDB[0] & $temp) != $temp) {
-            return false;
-        }
-        $dbMask = $this->_mgf1($h, $emLen - $this->hLen - 1);
-        $db = $maskedDB ^ $dbMask;
-        $db[0] = ~chr(0xFF << ($emBits & 7)) & $db[0];
-        $temp = $emLen - $this->hLen - $sLen - 2;
-        if (substr($db, 0, $temp) != str_repeat(chr(0), $temp) || ord($db[$temp]) != 1) {
-            return false;
-        }
-        $salt = substr($db, $temp + 1); // should be $sLen long
-        $m2 = "\0\0\0\0\0\0\0\0" . $mHash . $salt;
-        $h2 = $this->hash->hash($m2);
-        return $this->_equals($h, $h2);
-    }
-
-    /**
-     * RSASSA-PSS-SIGN
-     *
-     * See {@link http://tools.ietf.org/html/rfc3447#section-8.1.1 RFC3447#section-8.1.1}.
-     *
-     * @access private
-     * @param string $m
-     * @return string
-     */
-    function _rsassa_pss_sign($m)
-    {
-        // EMSA-PSS encoding
-
-        $em = $this->_emsa_pss_encode($m, 8 * $this->k - 1);
-
-        // RSA signature
-
-        $m = $this->_os2ip($em);
-        $s = $this->_rsasp1($m);
-        $s = $this->_i2osp($s, $this->k);
-
-        // Output the signature S
-
-        return $s;
-    }
-
-    /**
-     * RSASSA-PSS-VERIFY
-     *
-     * See {@link http://tools.ietf.org/html/rfc3447#section-8.1.2 RFC3447#section-8.1.2}.
-     *
-     * @access private
-     * @param string $m
-     * @param string $s
-     * @return string
-     */
-    function _rsassa_pss_verify($m, $s)
-    {
-        // Length checking
-
-        if (strlen($s) != $this->k) {
-            user_error('Invalid signature');
-            return false;
-        }
-
-        // RSA verification
-
-        $modBits = 8 * $this->k;
-
-        $s2 = $this->_os2ip($s);
-        $m2 = $this->_rsavp1($s2);
-        if ($m2 === false) {
-            user_error('Invalid signature');
-            return false;
-        }
-        $em = $this->_i2osp($m2, $modBits >> 3);
-        if ($em === false) {
-            user_error('Invalid signature');
-            return false;
-        }
-
-        // EMSA-PSS verification
-
-        return $this->_emsa_pss_verify($m, $em, $modBits - 1);
-    }
-
-    /**
-     * EMSA-PKCS1-V1_5-ENCODE
-     *
-     * See {@link http://tools.ietf.org/html/rfc3447#section-9.2 RFC3447#section-9.2}.
-     *
-     * @access private
-     * @param string $m
-     * @param int $emLen
-     * @return string
-     */
-    function _emsa_pkcs1_v1_5_encode($m, $emLen)
-    {
-        $h = $this->hash->hash($m);
-        if ($h === false) {
-            return false;
-        }
-
-        // see http://tools.ietf.org/html/rfc3447#page-43
-        switch ($this->hashName) {
-            case 'md2':
-                $t = pack('H*', '3020300c06082a864886f70d020205000410');
-                break;
-            case 'md5':
-                $t = pack('H*', '3020300c06082a864886f70d020505000410');
-                break;
-            case 'sha1':
-                $t = pack('H*', '3021300906052b0e03021a05000414');
-                break;
-            case 'sha256':
-                $t = pack('H*', '3031300d060960864801650304020105000420');
-                break;
-            case 'sha384':
-                $t = pack('H*', '3041300d060960864801650304020205000430');
-                break;
-            case 'sha512':
-                $t = pack('H*', '3051300d060960864801650304020305000440');
-        }
-        $t.= $h;
-        $tLen = strlen($t);
-
-        if ($emLen < $tLen + 11) {
-            user_error('Intended encoded message length too short');
-            return false;
-        }
-
-        $ps = str_repeat(chr(0xFF), $emLen - $tLen - 3);
-
-        $em = "\0\1$ps\0$t";
-
-        return $em;
-    }
-
-    /**
-     * RSASSA-PKCS1-V1_5-SIGN
-     *
-     * See {@link http://tools.ietf.org/html/rfc3447#section-8.2.1 RFC3447#section-8.2.1}.
-     *
-     * @access private
-     * @param string $m
-     * @return string
-     */
-    function _rsassa_pkcs1_v1_5_sign($m)
-    {
-        // EMSA-PKCS1-v1_5 encoding
-
-        $em = $this->_emsa_pkcs1_v1_5_encode($m, $this->k);
-        if ($em === false) {
-            user_error('RSA modulus too short');
-            return false;
-        }
-
-        // RSA signature
-
-        $m = $this->_os2ip($em);
-        $s = $this->_rsasp1($m);
-        $s = $this->_i2osp($s, $this->k);
-
-        // Output the signature S
-
-        return $s;
-    }
-
-    /**
-     * RSASSA-PKCS1-V1_5-VERIFY
-     *
-     * See {@link http://tools.ietf.org/html/rfc3447#section-8.2.2 RFC3447#section-8.2.2}.
-     *
-     * @access private
-     * @param string $m
-     * @return string
-     */
-    function _rsassa_pkcs1_v1_5_verify($m, $s)
-    {
-        // Length checking
-
-        if (strlen($s) != $this->k) {
-            user_error('Invalid signature');
-            return false;
-        }
-
-        // RSA verification
-
-        $s = $this->_os2ip($s);
-        $m2 = $this->_rsavp1($s);
-        if ($m2 === false) {
-            user_error('Invalid signature');
-            return false;
-        }
-        $em = $this->_i2osp($m2, $this->k);
-        if ($em === false) {
-            user_error('Invalid signature');
-            return false;
-        }
-
-        // EMSA-PKCS1-v1_5 encoding
-
-        $em2 = $this->_emsa_pkcs1_v1_5_encode($m, $this->k);
-        if ($em2 === false) {
-            user_error('RSA modulus too short');
-            return false;
-        }
-
-        // Compare
-        return $this->_equals($em, $em2);
-    }
-
-    /**
-     * Set Encryption Mode
-     *
-     * Valid values include self::ENCRYPTION_OAEP and self::ENCRYPTION_PKCS1.
-     *
-     * @access public
-     * @param int $mode
-     */
-    function setEncryptionMode($mode)
-    {
-        $this->encryptionMode = $mode;
-    }
-
-    /**
-     * Set Signature Mode
-     *
-     * Valid values include self::SIGNATURE_PSS and self::SIGNATURE_PKCS1
-     *
-     * @access public
-     * @param int $mode
-     */
-    function setSignatureMode($mode)
-    {
-        $this->signatureMode = $mode;
-    }
-
-    /**
-     * Set public key comment.
-     *
-     * @access public
-     * @param string $comment
-     */
-    function setComment($comment)
-    {
-        $this->comment = $comment;
-    }
-
-    /**
-     * Get public key comment.
-     *
-     * @access public
-     * @return string
-     */
-    function getComment()
-    {
-        return $this->comment;
-    }
-
-    /**
-     * Encryption
-     *
-     * Both self::ENCRYPTION_OAEP and self::ENCRYPTION_PKCS1 both place limits on how long $plaintext can be.
-     * If $plaintext exceeds those limits it will be broken up so that it does and the resultant ciphertext's will
-     * be concatenated together.
-     *
-     * @see self::decrypt()
-     * @access public
-     * @param string $plaintext
-     * @return string
-     */
-    function encrypt($plaintext)
-    {
-        switch ($this->encryptionMode) {
-            case self::ENCRYPTION_NONE:
-                $plaintext = str_split($plaintext, $this->k);
-                $ciphertext = '';
-                foreach ($plaintext as $m) {
-                    $ciphertext.= $this->_raw_encrypt($m);
-                }
-                return $ciphertext;
-            case self::ENCRYPTION_PKCS1:
-                $length = $this->k - 11;
-                if ($length <= 0) {
-                    return false;
-                }
-
-                $plaintext = str_split($plaintext, $length);
-                $ciphertext = '';
-                foreach ($plaintext as $m) {
-                    $ciphertext.= $this->_rsaes_pkcs1_v1_5_encrypt($m);
-                }
-                return $ciphertext;
-            //case self::ENCRYPTION_OAEP:
-            default:
-                $length = $this->k - 2 * $this->hLen - 2;
-                if ($length <= 0) {
-                    return false;
-                }
-
-                $plaintext = str_split($plaintext, $length);
-                $ciphertext = '';
-                foreach ($plaintext as $m) {
-                    $ciphertext.= $this->_rsaes_oaep_encrypt($m);
-                }
-                return $ciphertext;
-        }
-    }
-
-    /**
-     * Decryption
-     *
-     * @see self::encrypt()
-     * @access public
-     * @param string $plaintext
-     * @return string
-     */
-    function decrypt($ciphertext)
-    {
-        if ($this->k <= 0) {
-            return false;
-        }
-
-        $ciphertext = str_split($ciphertext, $this->k);
-        $ciphertext[count($ciphertext) - 1] = str_pad($ciphertext[count($ciphertext) - 1], $this->k, chr(0), STR_PAD_LEFT);
-
-        $plaintext = '';
-
-        switch ($this->encryptionMode) {
-            case self::ENCRYPTION_NONE:
-                $decrypt = '_raw_encrypt';
-                break;
-            case self::ENCRYPTION_PKCS1:
-                $decrypt = '_rsaes_pkcs1_v1_5_decrypt';
-                break;
-            //case self::ENCRYPTION_OAEP:
-            default:
-                $decrypt = '_rsaes_oaep_decrypt';
-        }
-
-        foreach ($ciphertext as $c) {
-            $temp = $this->$decrypt($c);
-            if ($temp === false) {
-                return false;
-            }
-            $plaintext.= $temp;
-        }
-
-        return $plaintext;
-    }
-
-    /**
-     * Create a signature
-     *
-     * @see self::verify()
-     * @access public
-     * @param string $message
-     * @return string
-     */
-    function sign($message)
-    {
-        if (empty($this->modulus) || empty($this->exponent)) {
-            return false;
-        }
-
-        switch ($this->signatureMode) {
-            case self::SIGNATURE_PKCS1:
-                return $this->_rsassa_pkcs1_v1_5_sign($message);
-            //case self::SIGNATURE_PSS:
-            default:
-                return $this->_rsassa_pss_sign($message);
-        }
-    }
-
-    /**
-     * Verifies a signature
-     *
-     * @see self::sign()
-     * @access public
-     * @param string $message
-     * @param string $signature
-     * @return bool
-     */
-    function verify($message, $signature)
-    {
-        if (empty($this->modulus) || empty($this->exponent)) {
-            return false;
-        }
-
-        switch ($this->signatureMode) {
-            case self::SIGNATURE_PKCS1:
-                return $this->_rsassa_pkcs1_v1_5_verify($message, $signature);
-            //case self::SIGNATURE_PSS:
-            default:
-                return $this->_rsassa_pss_verify($message, $signature);
-        }
-    }
-
-    /**
-     * Extract raw BER from Base64 encoding
-     *
-     * @access private
-     * @param string $str
-     * @return string
-     */
-    function _extractBER($str)
-    {
-        /* X.509 certs are assumed to be base64 encoded but sometimes they'll have additional things in them
-         * above and beyond the ceritificate.
-         * ie. some may have the following preceding the -----BEGIN CERTIFICATE----- line:
-         *
-         * Bag Attributes
-         *     localKeyID: 01 00 00 00
-         * subject=/O=organization/OU=org unit/CN=common name
-         * issuer=/O=organization/CN=common name
-         */
-        $temp = preg_replace('#.*?^-+[^-]+-+[\r\n ]*$#ms', '', $str, 1);
-        // remove the -----BEGIN CERTIFICATE----- and -----END CERTIFICATE----- stuff
-        $temp = preg_replace('#-+[^-]+-+#', '', $temp);
-        // remove new lines
-        $temp = str_replace(array("\r", "\n", ' '), '', $temp);
-        $temp = preg_match('#^[a-zA-Z\d/+]*={0,2}$#', $temp) ? base64_decode($temp) : false;
-        return $temp != false ? $temp : $str;
-    }
-}
diff --git a/mayor-orig/www/include/share/googleapi/phpseclib/phpseclib/phpseclib/Crypt/Random.php b/mayor-orig/www/include/share/googleapi/phpseclib/phpseclib/phpseclib/Crypt/Random.php
deleted file mode 100644
index 6b29e751..00000000
--- a/mayor-orig/www/include/share/googleapi/phpseclib/phpseclib/phpseclib/Crypt/Random.php
+++ /dev/null
@@ -1,270 +0,0 @@
-
- * 
- * 
- *
- * @category  Crypt
- * @package   Random
- * @author    Jim Wigginton 
- * @copyright 2007 Jim Wigginton
- * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
- * @link      http://phpseclib.sourceforge.net
- */
-
-namespace phpseclib\Crypt;
-
-/**
- * Pure-PHP Random Number Generator
- *
- * @package Random
- * @author  Jim Wigginton 
- * @access  public
- */
-class Random
-{
-    /**
-     * Generate a random string.
-     *
-     * Although microoptimizations are generally discouraged as they impair readability this function is ripe with
-     * microoptimizations because this function has the potential of being called a huge number of times.
-     * eg. for RSA key generation.
-     *
-     * @param int $length
-     * @return string
-     */
-    static function string($length)
-    {
-        if (version_compare(PHP_VERSION, '7.0.0', '>=')) {
-            try {
-                return \random_bytes($length);
-            } catch (\Throwable $e) {
-                // If a sufficient source of randomness is unavailable, random_bytes() will throw an
-                // object that implements the Throwable interface (Exception, TypeError, Error).
-                // We don't actually need to do anything here. The string() method should just continue
-                // as normal. Note, however, that if we don't have a sufficient source of randomness for
-                // random_bytes(), most of the other calls here will fail too, so we'll end up using
-                // the PHP implementation.
-            }
-        }
-
-        if (strtoupper(substr(PHP_OS, 0, 3)) === 'WIN') {
-            // method 1. prior to PHP 5.3 this would call rand() on windows hence the function_exists('class_alias') call.
-            // ie. class_alias is a function that was introduced in PHP 5.3
-            if (extension_loaded('mcrypt') && function_exists('class_alias')) {
-                return @mcrypt_create_iv($length);
-            }
-            // method 2. openssl_random_pseudo_bytes was introduced in PHP 5.3.0 but prior to PHP 5.3.4 there was,
-            // to quote , "possible blocking behavior". as of 5.3.4
-            // openssl_random_pseudo_bytes and mcrypt_create_iv do the exact same thing on Windows. ie. they both
-            // call php_win32_get_random_bytes():
-            //
-            // https://github.com/php/php-src/blob/7014a0eb6d1611151a286c0ff4f2238f92c120d6/ext/openssl/openssl.c#L5008
-            // https://github.com/php/php-src/blob/7014a0eb6d1611151a286c0ff4f2238f92c120d6/ext/mcrypt/mcrypt.c#L1392
-            //
-            // php_win32_get_random_bytes() is defined thusly:
-            //
-            // https://github.com/php/php-src/blob/7014a0eb6d1611151a286c0ff4f2238f92c120d6/win32/winutil.c#L80
-            //
-            // we're calling it, all the same, in the off chance that the mcrypt extension is not available
-            if (extension_loaded('openssl') && version_compare(PHP_VERSION, '5.3.4', '>=')) {
-                return openssl_random_pseudo_bytes($length);
-            }
-        } else {
-            // method 1. the fastest
-            if (extension_loaded('openssl')) {
-                return openssl_random_pseudo_bytes($length);
-            }
-            // method 2
-            static $fp = true;
-            if ($fp === true) {
-                // warning's will be output unles the error suppression operator is used. errors such as
-                // "open_basedir restriction in effect", "Permission denied", "No such file or directory", etc.
-                $fp = @fopen('/dev/urandom', 'rb');
-            }
-            if ($fp !== true && $fp !== false) { // surprisingly faster than !is_bool() or is_resource()
-                return fread($fp, $length);
-            }
-            // method 3. pretty much does the same thing as method 2 per the following url:
-            // https://github.com/php/php-src/blob/7014a0eb6d1611151a286c0ff4f2238f92c120d6/ext/mcrypt/mcrypt.c#L1391
-            // surprisingly slower than method 2. maybe that's because mcrypt_create_iv does a bunch of error checking that we're
-            // not doing. regardless, this'll only be called if this PHP script couldn't open /dev/urandom due to open_basedir
-            // restrictions or some such
-            if (extension_loaded('mcrypt')) {
-                return @mcrypt_create_iv($length, MCRYPT_DEV_URANDOM);
-            }
-        }
-        // at this point we have no choice but to use a pure-PHP CSPRNG
-
-        // cascade entropy across multiple PHP instances by fixing the session and collecting all
-        // environmental variables, including the previous session data and the current session
-        // data.
-        //
-        // mt_rand seeds itself by looking at the PID and the time, both of which are (relatively)
-        // easy to guess at. linux uses mouse clicks, keyboard timings, etc, as entropy sources, but
-        // PHP isn't low level to be able to use those as sources and on a web server there's not likely
-        // going to be a ton of keyboard or mouse action. web servers do have one thing that we can use
-        // however, a ton of people visiting the website. obviously you don't want to base your seeding
-        // soley on parameters a potential attacker sends but (1) not everything in $_SERVER is controlled
-        // by the user and (2) this isn't just looking at the data sent by the current user - it's based
-        // on the data sent by all users. one user requests the page and a hash of their info is saved.
-        // another user visits the page and the serialization of their data is utilized along with the
-        // server envirnment stuff and a hash of the previous http request data (which itself utilizes
-        // a hash of the session data before that). certainly an attacker should be assumed to have
-        // full control over his own http requests. he, however, is not going to have control over
-        // everyone's http requests.
-        static $crypto = false, $v;
-        if ($crypto === false) {
-            // save old session data
-            $old_session_id = session_id();
-            $old_use_cookies = ini_get('session.use_cookies');
-            $old_session_cache_limiter = session_cache_limiter();
-            $_OLD_SESSION = isset($_SESSION) ? $_SESSION : false;
-            if ($old_session_id != '') {
-                session_write_close();
-            }
-
-            session_id(1);
-            ini_set('session.use_cookies', 0);
-            session_cache_limiter('');
-            session_start();
-
-            $v = $seed = $_SESSION['seed'] = pack('H*', sha1(
-                (isset($_SERVER) ? phpseclib_safe_serialize($_SERVER) : '') .
-                (isset($_POST) ? phpseclib_safe_serialize($_POST) : '') .
-                (isset($_GET) ? phpseclib_safe_serialize($_GET) : '') .
-                (isset($_COOKIE) ? phpseclib_safe_serialize($_COOKIE) : '') .
-                phpseclib_safe_serialize($GLOBALS) .
-                phpseclib_safe_serialize($_SESSION) .
-                phpseclib_safe_serialize($_OLD_SESSION)
-            ));
-            if (!isset($_SESSION['count'])) {
-                $_SESSION['count'] = 0;
-            }
-            $_SESSION['count']++;
-
-            session_write_close();
-
-            // restore old session data
-            if ($old_session_id != '') {
-                session_id($old_session_id);
-                session_start();
-                ini_set('session.use_cookies', $old_use_cookies);
-                session_cache_limiter($old_session_cache_limiter);
-            } else {
-                if ($_OLD_SESSION !== false) {
-                    $_SESSION = $_OLD_SESSION;
-                    unset($_OLD_SESSION);
-                } else {
-                    unset($_SESSION);
-                }
-            }
-
-            // in SSH2 a shared secret and an exchange hash are generated through the key exchange process.
-            // the IV client to server is the hash of that "nonce" with the letter A and for the encryption key it's the letter C.
-            // if the hash doesn't produce enough a key or an IV that's long enough concat successive hashes of the
-            // original hash and the current hash. we'll be emulating that. for more info see the following URL:
-            //
-            // http://tools.ietf.org/html/rfc4253#section-7.2
-            //
-            // see the is_string($crypto) part for an example of how to expand the keys
-            $key = pack('H*', sha1($seed . 'A'));
-            $iv = pack('H*', sha1($seed . 'C'));
-
-            // ciphers are used as per the nist.gov link below. also, see this link:
-            //
-            // http://en.wikipedia.org/wiki/Cryptographically_secure_pseudorandom_number_generator#Designs_based_on_cryptographic_primitives
-            switch (true) {
-                case class_exists('\phpseclib\Crypt\AES'):
-                    $crypto = new AES(Base::MODE_CTR);
-                    break;
-                case class_exists('\phpseclib\Crypt\Twofish'):
-                    $crypto = new Twofish(Base::MODE_CTR);
-                    break;
-                case class_exists('\phpseclib\Crypt\Blowfish'):
-                    $crypto = new Blowfish(Base::MODE_CTR);
-                    break;
-                case class_exists('\phpseclib\Crypt\TripleDES'):
-                    $crypto = new TripleDES(Base::MODE_CTR);
-                    break;
-                case class_exists('\phpseclib\Crypt\DES'):
-                    $crypto = new DES(Base::MODE_CTR);
-                    break;
-                case class_exists('\phpseclib\Crypt\RC4'):
-                    $crypto = new RC4();
-                    break;
-                default:
-                    user_error(__CLASS__ . ' requires at least one symmetric cipher be loaded');
-                    return false;
-            }
-
-            $crypto->setKey($key);
-            $crypto->setIV($iv);
-            $crypto->enableContinuousBuffer();
-        }
-
-        //return $crypto->encrypt(str_repeat("\0", $length));
-
-        // the following is based off of ANSI X9.31:
-        //
-        // http://csrc.nist.gov/groups/STM/cavp/documents/rng/931rngext.pdf
-        //
-        // OpenSSL uses that same standard for it's random numbers:
-        //
-        // http://www.opensource.apple.com/source/OpenSSL/OpenSSL-38/openssl/fips-1.0/rand/fips_rand.c
-        // (do a search for "ANS X9.31 A.2.4")
-        $result = '';
-        while (strlen($result) < $length) {
-            $i = $crypto->encrypt(microtime()); // strlen(microtime()) == 21
-            $r = $crypto->encrypt($i ^ $v); // strlen($v) == 20
-            $v = $crypto->encrypt($r ^ $i); // strlen($r) == 20
-            $result.= $r;
-        }
-        return substr($result, 0, $length);
-    }
-}
-
-if (!function_exists('phpseclib_safe_serialize')) {
-    /**
-     * Safely serialize variables
-     *
-     * If a class has a private __sleep() method it'll give a fatal error on PHP 5.2 and earlier.
-     * PHP 5.3 will emit a warning.
-     *
-     * @param mixed $arr
-     * @access public
-     */
-    function phpseclib_safe_serialize(&$arr)
-    {
-        if (is_object($arr)) {
-            return '';
-        }
-        if (!is_array($arr)) {
-            return serialize($arr);
-        }
-        // prevent circular array recursion
-        if (isset($arr['__phpseclib_marker'])) {
-            return '';
-        }
-        $safearr = array();
-        $arr['__phpseclib_marker'] = true;
-        foreach (array_keys($arr) as $key) {
-            // do not recurse on the '__phpseclib_marker' key itself, for smaller memory usage
-            if ($key !== '__phpseclib_marker') {
-                $safearr[$key] = phpseclib_safe_serialize($arr[$key]);
-            }
-        }
-        unset($arr['__phpseclib_marker']);
-        return serialize($safearr);
-    }
-}
diff --git a/mayor-orig/www/include/share/googleapi/phpseclib/phpseclib/phpseclib/Crypt/Rijndael.php b/mayor-orig/www/include/share/googleapi/phpseclib/phpseclib/phpseclib/Crypt/Rijndael.php
deleted file mode 100644
index 3648a197..00000000
--- a/mayor-orig/www/include/share/googleapi/phpseclib/phpseclib/phpseclib/Crypt/Rijndael.php
+++ /dev/null
@@ -1,936 +0,0 @@
-
- * setKey('abcdefghijklmnop');
- *
- *    $size = 10 * 1024;
- *    $plaintext = '';
- *    for ($i = 0; $i < $size; $i++) {
- *        $plaintext.= 'a';
- *    }
- *
- *    echo $rijndael->decrypt($rijndael->encrypt($plaintext));
- * ?>
- * 
- *
- * @category  Crypt
- * @package   Rijndael
- * @author    Jim Wigginton 
- * @copyright 2008 Jim Wigginton
- * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
- * @link      http://phpseclib.sourceforge.net
- */
-
-namespace phpseclib\Crypt;
-
-/**
- * Pure-PHP implementation of Rijndael.
- *
- * @package Rijndael
- * @author  Jim Wigginton 
- * @access  public
- */
-class Rijndael extends Base
-{
-    /**
-     * The mcrypt specific name of the cipher
-     *
-     * Mcrypt is useable for 128/192/256-bit $block_size/$key_length. For 160/224 not.
-     * \phpseclib\Crypt\Rijndael determines automatically whether mcrypt is useable
-     * or not for the current $block_size/$key_length.
-     * In case of, $cipher_name_mcrypt will be set dynamically at run time accordingly.
-     *
-     * @see \phpseclib\Crypt\Base::cipher_name_mcrypt
-     * @see \phpseclib\Crypt\Base::engine
-     * @see self::isValidEngine()
-     * @var string
-     * @access private
-     */
-    var $cipher_name_mcrypt = 'rijndael-128';
-
-    /**
-     * The default salt used by setPassword()
-     *
-     * @see \phpseclib\Crypt\Base::password_default_salt
-     * @see \phpseclib\Crypt\Base::setPassword()
-     * @var string
-     * @access private
-     */
-    var $password_default_salt = 'phpseclib';
-
-    /**
-     * The Key Schedule
-     *
-     * @see self::_setup()
-     * @var array
-     * @access private
-     */
-    var $w;
-
-    /**
-     * The Inverse Key Schedule
-     *
-     * @see self::_setup()
-     * @var array
-     * @access private
-     */
-    var $dw;
-
-    /**
-     * The Block Length divided by 32
-     *
-     * @see self::setBlockLength()
-     * @var int
-     * @access private
-     * @internal The max value is 256 / 32 = 8, the min value is 128 / 32 = 4.  Exists in conjunction with $block_size
-     *    because the encryption / decryption / key schedule creation requires this number and not $block_size.  We could
-     *    derive this from $block_size or vice versa, but that'd mean we'd have to do multiple shift operations, so in lieu
-     *    of that, we'll just precompute it once.
-     */
-    var $Nb = 4;
-
-    /**
-     * The Key Length (in bytes)
-     *
-     * @see self::setKeyLength()
-     * @var int
-     * @access private
-     * @internal The max value is 256 / 8 = 32, the min value is 128 / 8 = 16.  Exists in conjunction with $Nk
-     *    because the encryption / decryption / key schedule creation requires this number and not $key_length.  We could
-     *    derive this from $key_length or vice versa, but that'd mean we'd have to do multiple shift operations, so in lieu
-     *    of that, we'll just precompute it once.
-     */
-    var $key_length = 16;
-
-    /**
-     * The Key Length divided by 32
-     *
-     * @see self::setKeyLength()
-     * @var int
-     * @access private
-     * @internal The max value is 256 / 32 = 8, the min value is 128 / 32 = 4
-     */
-    var $Nk = 4;
-
-    /**
-     * The Number of Rounds
-     *
-     * @var int
-     * @access private
-     * @internal The max value is 14, the min value is 10.
-     */
-    var $Nr;
-
-    /**
-     * Shift offsets
-     *
-     * @var array
-     * @access private
-     */
-    var $c;
-
-    /**
-     * Holds the last used key- and block_size information
-     *
-     * @var array
-     * @access private
-     */
-    var $kl;
-
-    /**
-     * Sets the key length.
-     *
-     * Valid key lengths are 128, 160, 192, 224, and 256.  If the length is less than 128, it will be rounded up to
-     * 128.  If the length is greater than 128 and invalid, it will be rounded down to the closest valid amount.
-     *
-     * Note: phpseclib extends Rijndael (and AES) for using 160- and 224-bit keys but they are officially not defined
-     *       and the most (if not all) implementations are not able using 160/224-bit keys but round/pad them up to
-     *       192/256 bits as, for example, mcrypt will do.
-     *
-     *       That said, if you want be compatible with other Rijndael and AES implementations,
-     *       you should not setKeyLength(160) or setKeyLength(224).
-     *
-     * Additional: In case of 160- and 224-bit keys, phpseclib will/can, for that reason, not use
-     *             the mcrypt php extension, even if available.
-     *             This results then in slower encryption.
-     *
-     * @access public
-     * @param int $length
-     */
-    function setKeyLength($length)
-    {
-        switch (true) {
-            case $length <= 128:
-                $this->key_length = 16;
-                break;
-            case $length <= 160:
-                $this->key_length = 20;
-                break;
-            case $length <= 192:
-                $this->key_length = 24;
-                break;
-            case $length <= 224:
-                $this->key_length = 28;
-                break;
-            default:
-                $this->key_length = 32;
-        }
-
-        parent::setKeyLength($length);
-    }
-
-    /**
-     * Sets the block length
-     *
-     * Valid block lengths are 128, 160, 192, 224, and 256.  If the length is less than 128, it will be rounded up to
-     * 128.  If the length is greater than 128 and invalid, it will be rounded down to the closest valid amount.
-     *
-     * @access public
-     * @param int $length
-     */
-    function setBlockLength($length)
-    {
-        $length >>= 5;
-        if ($length > 8) {
-            $length = 8;
-        } elseif ($length < 4) {
-            $length = 4;
-        }
-        $this->Nb = $length;
-        $this->block_size = $length << 2;
-        $this->changed = true;
-        $this->_setEngine();
-    }
-
-    /**
-     * Test for engine validity
-     *
-     * This is mainly just a wrapper to set things up for \phpseclib\Crypt\Base::isValidEngine()
-     *
-     * @see \phpseclib\Crypt\Base::__construct()
-     * @param int $engine
-     * @access public
-     * @return bool
-     */
-    function isValidEngine($engine)
-    {
-        switch ($engine) {
-            case self::ENGINE_OPENSSL:
-                if ($this->block_size != 16) {
-                    return false;
-                }
-                $this->cipher_name_openssl_ecb = 'aes-' . ($this->key_length << 3) . '-ecb';
-                $this->cipher_name_openssl = 'aes-' . ($this->key_length << 3) . '-' . $this->_openssl_translate_mode();
-                break;
-            case self::ENGINE_MCRYPT:
-                $this->cipher_name_mcrypt = 'rijndael-' . ($this->block_size << 3);
-                if ($this->key_length % 8) { // is it a 160/224-bit key?
-                    // mcrypt is not usable for them, only for 128/192/256-bit keys
-                    return false;
-                }
-        }
-
-        return parent::isValidEngine($engine);
-    }
-
-    /**
-     * Encrypts a block
-     *
-     * @access private
-     * @param string $in
-     * @return string
-     */
-    function _encryptBlock($in)
-    {
-        static $tables;
-        if (empty($tables)) {
-            $tables = &$this->_getTables();
-        }
-        $t0   = $tables[0];
-        $t1   = $tables[1];
-        $t2   = $tables[2];
-        $t3   = $tables[3];
-        $sbox = $tables[4];
-
-        $state = array();
-        $words = unpack('N*', $in);
-
-        $c = $this->c;
-        $w = $this->w;
-        $Nb = $this->Nb;
-        $Nr = $this->Nr;
-
-        // addRoundKey
-        $wc = $Nb - 1;
-        foreach ($words as $word) {
-            $state[] = $word ^ $w[++$wc];
-        }
-
-        // fips-197.pdf#page=19, "Figure 5. Pseudo Code for the Cipher", states that this loop has four components -
-        // subBytes, shiftRows, mixColumns, and addRoundKey. fips-197.pdf#page=30, "Implementation Suggestions Regarding
-        // Various Platforms" suggests that performs enhanced implementations are described in Rijndael-ammended.pdf.
-        // Rijndael-ammended.pdf#page=20, "Implementation aspects / 32-bit processor", discusses such an optimization.
-        // Unfortunately, the description given there is not quite correct.  Per aes.spec.v316.pdf#page=19 [1],
-        // equation (7.4.7) is supposed to use addition instead of subtraction, so we'll do that here, as well.
-
-        // [1] http://fp.gladman.plus.com/cryptography_technology/rijndael/aes.spec.v316.pdf
-        $temp = array();
-        for ($round = 1; $round < $Nr; ++$round) {
-            $i = 0; // $c[0] == 0
-            $j = $c[1];
-            $k = $c[2];
-            $l = $c[3];
-
-            while ($i < $Nb) {
-                $temp[$i] = $t0[$state[$i] >> 24 & 0x000000FF] ^
-                            $t1[$state[$j] >> 16 & 0x000000FF] ^
-                            $t2[$state[$k] >>  8 & 0x000000FF] ^
-                            $t3[$state[$l]       & 0x000000FF] ^
-                            $w[++$wc];
-                ++$i;
-                $j = ($j + 1) % $Nb;
-                $k = ($k + 1) % $Nb;
-                $l = ($l + 1) % $Nb;
-            }
-            $state = $temp;
-        }
-
-        // subWord
-        for ($i = 0; $i < $Nb; ++$i) {
-            $state[$i] =   $sbox[$state[$i]       & 0x000000FF]        |
-                          ($sbox[$state[$i] >>  8 & 0x000000FF] <<  8) |
-                          ($sbox[$state[$i] >> 16 & 0x000000FF] << 16) |
-                          ($sbox[$state[$i] >> 24 & 0x000000FF] << 24);
-        }
-
-        // shiftRows + addRoundKey
-        $i = 0; // $c[0] == 0
-        $j = $c[1];
-        $k = $c[2];
-        $l = $c[3];
-        while ($i < $Nb) {
-            $temp[$i] = ($state[$i] & 0xFF000000) ^
-                        ($state[$j] & 0x00FF0000) ^
-                        ($state[$k] & 0x0000FF00) ^
-                        ($state[$l] & 0x000000FF) ^
-                         $w[$i];
-            ++$i;
-            $j = ($j + 1) % $Nb;
-            $k = ($k + 1) % $Nb;
-            $l = ($l + 1) % $Nb;
-        }
-
-        switch ($Nb) {
-            case 8:
-                return pack('N*', $temp[0], $temp[1], $temp[2], $temp[3], $temp[4], $temp[5], $temp[6], $temp[7]);
-            case 7:
-                return pack('N*', $temp[0], $temp[1], $temp[2], $temp[3], $temp[4], $temp[5], $temp[6]);
-            case 6:
-                return pack('N*', $temp[0], $temp[1], $temp[2], $temp[3], $temp[4], $temp[5]);
-            case 5:
-                return pack('N*', $temp[0], $temp[1], $temp[2], $temp[3], $temp[4]);
-            default:
-                return pack('N*', $temp[0], $temp[1], $temp[2], $temp[3]);
-        }
-    }
-
-    /**
-     * Decrypts a block
-     *
-     * @access private
-     * @param string $in
-     * @return string
-     */
-    function _decryptBlock($in)
-    {
-        static $invtables;
-        if (empty($invtables)) {
-            $invtables = &$this->_getInvTables();
-        }
-        $dt0   = $invtables[0];
-        $dt1   = $invtables[1];
-        $dt2   = $invtables[2];
-        $dt3   = $invtables[3];
-        $isbox = $invtables[4];
-
-        $state = array();
-        $words = unpack('N*', $in);
-
-        $c  = $this->c;
-        $dw = $this->dw;
-        $Nb = $this->Nb;
-        $Nr = $this->Nr;
-
-        // addRoundKey
-        $wc = $Nb - 1;
-        foreach ($words as $word) {
-            $state[] = $word ^ $dw[++$wc];
-        }
-
-        $temp = array();
-        for ($round = $Nr - 1; $round > 0; --$round) {
-            $i = 0; // $c[0] == 0
-            $j = $Nb - $c[1];
-            $k = $Nb - $c[2];
-            $l = $Nb - $c[3];
-
-            while ($i < $Nb) {
-                $temp[$i] = $dt0[$state[$i] >> 24 & 0x000000FF] ^
-                            $dt1[$state[$j] >> 16 & 0x000000FF] ^
-                            $dt2[$state[$k] >>  8 & 0x000000FF] ^
-                            $dt3[$state[$l]       & 0x000000FF] ^
-                            $dw[++$wc];
-                ++$i;
-                $j = ($j + 1) % $Nb;
-                $k = ($k + 1) % $Nb;
-                $l = ($l + 1) % $Nb;
-            }
-            $state = $temp;
-        }
-
-        // invShiftRows + invSubWord + addRoundKey
-        $i = 0; // $c[0] == 0
-        $j = $Nb - $c[1];
-        $k = $Nb - $c[2];
-        $l = $Nb - $c[3];
-
-        while ($i < $Nb) {
-            $word = ($state[$i] & 0xFF000000) |
-                    ($state[$j] & 0x00FF0000) |
-                    ($state[$k] & 0x0000FF00) |
-                    ($state[$l] & 0x000000FF);
-
-            $temp[$i] = $dw[$i] ^ ($isbox[$word       & 0x000000FF]        |
-                                  ($isbox[$word >>  8 & 0x000000FF] <<  8) |
-                                  ($isbox[$word >> 16 & 0x000000FF] << 16) |
-                                  ($isbox[$word >> 24 & 0x000000FF] << 24));
-            ++$i;
-            $j = ($j + 1) % $Nb;
-            $k = ($k + 1) % $Nb;
-            $l = ($l + 1) % $Nb;
-        }
-
-        switch ($Nb) {
-            case 8:
-                return pack('N*', $temp[0], $temp[1], $temp[2], $temp[3], $temp[4], $temp[5], $temp[6], $temp[7]);
-            case 7:
-                return pack('N*', $temp[0], $temp[1], $temp[2], $temp[3], $temp[4], $temp[5], $temp[6]);
-            case 6:
-                return pack('N*', $temp[0], $temp[1], $temp[2], $temp[3], $temp[4], $temp[5]);
-            case 5:
-                return pack('N*', $temp[0], $temp[1], $temp[2], $temp[3], $temp[4]);
-            default:
-                return pack('N*', $temp[0], $temp[1], $temp[2], $temp[3]);
-        }
-    }
-
-    /**
-     * Setup the key (expansion)
-     *
-     * @see \phpseclib\Crypt\Base::_setupKey()
-     * @access private
-     */
-    function _setupKey()
-    {
-        // Each number in $rcon is equal to the previous number multiplied by two in Rijndael's finite field.
-        // See http://en.wikipedia.org/wiki/Finite_field_arithmetic#Multiplicative_inverse
-        static $rcon = array(0,
-            0x01000000, 0x02000000, 0x04000000, 0x08000000, 0x10000000,
-            0x20000000, 0x40000000, 0x80000000, 0x1B000000, 0x36000000,
-            0x6C000000, 0xD8000000, 0xAB000000, 0x4D000000, 0x9A000000,
-            0x2F000000, 0x5E000000, 0xBC000000, 0x63000000, 0xC6000000,
-            0x97000000, 0x35000000, 0x6A000000, 0xD4000000, 0xB3000000,
-            0x7D000000, 0xFA000000, 0xEF000000, 0xC5000000, 0x91000000
-        );
-
-        if (isset($this->kl['key']) && $this->key === $this->kl['key'] && $this->key_length === $this->kl['key_length'] && $this->block_size === $this->kl['block_size']) {
-            // already expanded
-            return;
-        }
-        $this->kl = array('key' => $this->key, 'key_length' => $this->key_length, 'block_size' => $this->block_size);
-
-        $this->Nk = $this->key_length >> 2;
-        // see Rijndael-ammended.pdf#page=44
-        $this->Nr = max($this->Nk, $this->Nb) + 6;
-
-        // shift offsets for Nb = 5, 7 are defined in Rijndael-ammended.pdf#page=44,
-        //     "Table 8: Shift offsets in Shiftrow for the alternative block lengths"
-        // shift offsets for Nb = 4, 6, 8 are defined in Rijndael-ammended.pdf#page=14,
-        //     "Table 2: Shift offsets for different block lengths"
-        switch ($this->Nb) {
-            case 4:
-            case 5:
-            case 6:
-                $this->c = array(0, 1, 2, 3);
-                break;
-            case 7:
-                $this->c = array(0, 1, 2, 4);
-                break;
-            case 8:
-                $this->c = array(0, 1, 3, 4);
-        }
-
-        $w = array_values(unpack('N*words', $this->key));
-
-        $length = $this->Nb * ($this->Nr + 1);
-        for ($i = $this->Nk; $i < $length; $i++) {
-            $temp = $w[$i - 1];
-            if ($i % $this->Nk == 0) {
-                // according to , "the size of an integer is platform-dependent".
-                // on a 32-bit machine, it's 32-bits, and on a 64-bit machine, it's 64-bits. on a 32-bit machine,
-                // 0xFFFFFFFF << 8 == 0xFFFFFF00, but on a 64-bit machine, it equals 0xFFFFFFFF00. as such, doing 'and'
-                // with 0xFFFFFFFF (or 0xFFFFFF00) on a 32-bit machine is unnecessary, but on a 64-bit machine, it is.
-                $temp = (($temp << 8) & 0xFFFFFF00) | (($temp >> 24) & 0x000000FF); // rotWord
-                $temp = $this->_subWord($temp) ^ $rcon[$i / $this->Nk];
-            } elseif ($this->Nk > 6 && $i % $this->Nk == 4) {
-                $temp = $this->_subWord($temp);
-            }
-            $w[$i] = $w[$i - $this->Nk] ^ $temp;
-        }
-
-        // convert the key schedule from a vector of $Nb * ($Nr + 1) length to a matrix with $Nr + 1 rows and $Nb columns
-        // and generate the inverse key schedule.  more specifically,
-        // according to  (section 5.3.3),
-        // "The key expansion for the Inverse Cipher is defined as follows:
-        //        1. Apply the Key Expansion.
-        //        2. Apply InvMixColumn to all Round Keys except the first and the last one."
-        // also, see fips-197.pdf#page=27, "5.3.5 Equivalent Inverse Cipher"
-        list($dt0, $dt1, $dt2, $dt3) = $this->_getInvTables();
-        $temp = $this->w = $this->dw = array();
-        for ($i = $row = $col = 0; $i < $length; $i++, $col++) {
-            if ($col == $this->Nb) {
-                if ($row == 0) {
-                    $this->dw[0] = $this->w[0];
-                } else {
-                    // subWord + invMixColumn + invSubWord = invMixColumn
-                    $j = 0;
-                    while ($j < $this->Nb) {
-                        $dw = $this->_subWord($this->w[$row][$j]);
-                        $temp[$j] = $dt0[$dw >> 24 & 0x000000FF] ^
-                                    $dt1[$dw >> 16 & 0x000000FF] ^
-                                    $dt2[$dw >>  8 & 0x000000FF] ^
-                                    $dt3[$dw       & 0x000000FF];
-                        $j++;
-                    }
-                    $this->dw[$row] = $temp;
-                }
-
-                $col = 0;
-                $row++;
-            }
-            $this->w[$row][$col] = $w[$i];
-        }
-
-        $this->dw[$row] = $this->w[$row];
-
-        // Converting to 1-dim key arrays (both ascending)
-        $this->dw = array_reverse($this->dw);
-        $w  = array_pop($this->w);
-        $dw = array_pop($this->dw);
-        foreach ($this->w as $r => $wr) {
-            foreach ($wr as $c => $wc) {
-                $w[]  = $wc;
-                $dw[] = $this->dw[$r][$c];
-            }
-        }
-        $this->w  = $w;
-        $this->dw = $dw;
-    }
-
-    /**
-     * Performs S-Box substitutions
-     *
-     * @access private
-     * @param int $word
-     */
-    function _subWord($word)
-    {
-        static $sbox;
-        if (empty($sbox)) {
-            list(, , , , $sbox) = $this->_getTables();
-        }
-
-        return  $sbox[$word       & 0x000000FF]        |
-               ($sbox[$word >>  8 & 0x000000FF] <<  8) |
-               ($sbox[$word >> 16 & 0x000000FF] << 16) |
-               ($sbox[$word >> 24 & 0x000000FF] << 24);
-    }
-
-    /**
-     * Provides the mixColumns and sboxes tables
-     *
-     * @see self::_encryptBlock()
-     * @see self::_setupInlineCrypt()
-     * @see self::_subWord()
-     * @access private
-     * @return array &$tables
-     */
-    function &_getTables()
-    {
-        static $tables;
-        if (empty($tables)) {
-            // according to  (section 5.2.1),
-            // precomputed tables can be used in the mixColumns phase. in that example, they're assigned t0...t3, so
-            // those are the names we'll use.
-            $t3 = array_map('intval', array(
-                // with array_map('intval', ...) we ensure we have only int's and not
-                // some slower floats converted by php automatically on high values
-                0x6363A5C6, 0x7C7C84F8, 0x777799EE, 0x7B7B8DF6, 0xF2F20DFF, 0x6B6BBDD6, 0x6F6FB1DE, 0xC5C55491,
-                0x30305060, 0x01010302, 0x6767A9CE, 0x2B2B7D56, 0xFEFE19E7, 0xD7D762B5, 0xABABE64D, 0x76769AEC,
-                0xCACA458F, 0x82829D1F, 0xC9C94089, 0x7D7D87FA, 0xFAFA15EF, 0x5959EBB2, 0x4747C98E, 0xF0F00BFB,
-                0xADADEC41, 0xD4D467B3, 0xA2A2FD5F, 0xAFAFEA45, 0x9C9CBF23, 0xA4A4F753, 0x727296E4, 0xC0C05B9B,
-                0xB7B7C275, 0xFDFD1CE1, 0x9393AE3D, 0x26266A4C, 0x36365A6C, 0x3F3F417E, 0xF7F702F5, 0xCCCC4F83,
-                0x34345C68, 0xA5A5F451, 0xE5E534D1, 0xF1F108F9, 0x717193E2, 0xD8D873AB, 0x31315362, 0x15153F2A,
-                0x04040C08, 0xC7C75295, 0x23236546, 0xC3C35E9D, 0x18182830, 0x9696A137, 0x05050F0A, 0x9A9AB52F,
-                0x0707090E, 0x12123624, 0x80809B1B, 0xE2E23DDF, 0xEBEB26CD, 0x2727694E, 0xB2B2CD7F, 0x75759FEA,
-                0x09091B12, 0x83839E1D, 0x2C2C7458, 0x1A1A2E34, 0x1B1B2D36, 0x6E6EB2DC, 0x5A5AEEB4, 0xA0A0FB5B,
-                0x5252F6A4, 0x3B3B4D76, 0xD6D661B7, 0xB3B3CE7D, 0x29297B52, 0xE3E33EDD, 0x2F2F715E, 0x84849713,
-                0x5353F5A6, 0xD1D168B9, 0x00000000, 0xEDED2CC1, 0x20206040, 0xFCFC1FE3, 0xB1B1C879, 0x5B5BEDB6,
-                0x6A6ABED4, 0xCBCB468D, 0xBEBED967, 0x39394B72, 0x4A4ADE94, 0x4C4CD498, 0x5858E8B0, 0xCFCF4A85,
-                0xD0D06BBB, 0xEFEF2AC5, 0xAAAAE54F, 0xFBFB16ED, 0x4343C586, 0x4D4DD79A, 0x33335566, 0x85859411,
-                0x4545CF8A, 0xF9F910E9, 0x02020604, 0x7F7F81FE, 0x5050F0A0, 0x3C3C4478, 0x9F9FBA25, 0xA8A8E34B,
-                0x5151F3A2, 0xA3A3FE5D, 0x4040C080, 0x8F8F8A05, 0x9292AD3F, 0x9D9DBC21, 0x38384870, 0xF5F504F1,
-                0xBCBCDF63, 0xB6B6C177, 0xDADA75AF, 0x21216342, 0x10103020, 0xFFFF1AE5, 0xF3F30EFD, 0xD2D26DBF,
-                0xCDCD4C81, 0x0C0C1418, 0x13133526, 0xECEC2FC3, 0x5F5FE1BE, 0x9797A235, 0x4444CC88, 0x1717392E,
-                0xC4C45793, 0xA7A7F255, 0x7E7E82FC, 0x3D3D477A, 0x6464ACC8, 0x5D5DE7BA, 0x19192B32, 0x737395E6,
-                0x6060A0C0, 0x81819819, 0x4F4FD19E, 0xDCDC7FA3, 0x22226644, 0x2A2A7E54, 0x9090AB3B, 0x8888830B,
-                0x4646CA8C, 0xEEEE29C7, 0xB8B8D36B, 0x14143C28, 0xDEDE79A7, 0x5E5EE2BC, 0x0B0B1D16, 0xDBDB76AD,
-                0xE0E03BDB, 0x32325664, 0x3A3A4E74, 0x0A0A1E14, 0x4949DB92, 0x06060A0C, 0x24246C48, 0x5C5CE4B8,
-                0xC2C25D9F, 0xD3D36EBD, 0xACACEF43, 0x6262A6C4, 0x9191A839, 0x9595A431, 0xE4E437D3, 0x79798BF2,
-                0xE7E732D5, 0xC8C8438B, 0x3737596E, 0x6D6DB7DA, 0x8D8D8C01, 0xD5D564B1, 0x4E4ED29C, 0xA9A9E049,
-                0x6C6CB4D8, 0x5656FAAC, 0xF4F407F3, 0xEAEA25CF, 0x6565AFCA, 0x7A7A8EF4, 0xAEAEE947, 0x08081810,
-                0xBABAD56F, 0x787888F0, 0x25256F4A, 0x2E2E725C, 0x1C1C2438, 0xA6A6F157, 0xB4B4C773, 0xC6C65197,
-                0xE8E823CB, 0xDDDD7CA1, 0x74749CE8, 0x1F1F213E, 0x4B4BDD96, 0xBDBDDC61, 0x8B8B860D, 0x8A8A850F,
-                0x707090E0, 0x3E3E427C, 0xB5B5C471, 0x6666AACC, 0x4848D890, 0x03030506, 0xF6F601F7, 0x0E0E121C,
-                0x6161A3C2, 0x35355F6A, 0x5757F9AE, 0xB9B9D069, 0x86869117, 0xC1C15899, 0x1D1D273A, 0x9E9EB927,
-                0xE1E138D9, 0xF8F813EB, 0x9898B32B, 0x11113322, 0x6969BBD2, 0xD9D970A9, 0x8E8E8907, 0x9494A733,
-                0x9B9BB62D, 0x1E1E223C, 0x87879215, 0xE9E920C9, 0xCECE4987, 0x5555FFAA, 0x28287850, 0xDFDF7AA5,
-                0x8C8C8F03, 0xA1A1F859, 0x89898009, 0x0D0D171A, 0xBFBFDA65, 0xE6E631D7, 0x4242C684, 0x6868B8D0,
-                0x4141C382, 0x9999B029, 0x2D2D775A, 0x0F0F111E, 0xB0B0CB7B, 0x5454FCA8, 0xBBBBD66D, 0x16163A2C
-            ));
-
-            foreach ($t3 as $t3i) {
-                $t0[] = (($t3i << 24) & 0xFF000000) | (($t3i >>  8) & 0x00FFFFFF);
-                $t1[] = (($t3i << 16) & 0xFFFF0000) | (($t3i >> 16) & 0x0000FFFF);
-                $t2[] = (($t3i <<  8) & 0xFFFFFF00) | (($t3i >> 24) & 0x000000FF);
-            }
-
-            $tables = array(
-                // The Precomputed mixColumns tables t0 - t3
-                $t0,
-                $t1,
-                $t2,
-                $t3,
-                // The SubByte S-Box
-                array(
-                    0x63, 0x7C, 0x77, 0x7B, 0xF2, 0x6B, 0x6F, 0xC5, 0x30, 0x01, 0x67, 0x2B, 0xFE, 0xD7, 0xAB, 0x76,
-                    0xCA, 0x82, 0xC9, 0x7D, 0xFA, 0x59, 0x47, 0xF0, 0xAD, 0xD4, 0xA2, 0xAF, 0x9C, 0xA4, 0x72, 0xC0,
-                    0xB7, 0xFD, 0x93, 0x26, 0x36, 0x3F, 0xF7, 0xCC, 0x34, 0xA5, 0xE5, 0xF1, 0x71, 0xD8, 0x31, 0x15,
-                    0x04, 0xC7, 0x23, 0xC3, 0x18, 0x96, 0x05, 0x9A, 0x07, 0x12, 0x80, 0xE2, 0xEB, 0x27, 0xB2, 0x75,
-                    0x09, 0x83, 0x2C, 0x1A, 0x1B, 0x6E, 0x5A, 0xA0, 0x52, 0x3B, 0xD6, 0xB3, 0x29, 0xE3, 0x2F, 0x84,
-                    0x53, 0xD1, 0x00, 0xED, 0x20, 0xFC, 0xB1, 0x5B, 0x6A, 0xCB, 0xBE, 0x39, 0x4A, 0x4C, 0x58, 0xCF,
-                    0xD0, 0xEF, 0xAA, 0xFB, 0x43, 0x4D, 0x33, 0x85, 0x45, 0xF9, 0x02, 0x7F, 0x50, 0x3C, 0x9F, 0xA8,
-                    0x51, 0xA3, 0x40, 0x8F, 0x92, 0x9D, 0x38, 0xF5, 0xBC, 0xB6, 0xDA, 0x21, 0x10, 0xFF, 0xF3, 0xD2,
-                    0xCD, 0x0C, 0x13, 0xEC, 0x5F, 0x97, 0x44, 0x17, 0xC4, 0xA7, 0x7E, 0x3D, 0x64, 0x5D, 0x19, 0x73,
-                    0x60, 0x81, 0x4F, 0xDC, 0x22, 0x2A, 0x90, 0x88, 0x46, 0xEE, 0xB8, 0x14, 0xDE, 0x5E, 0x0B, 0xDB,
-                    0xE0, 0x32, 0x3A, 0x0A, 0x49, 0x06, 0x24, 0x5C, 0xC2, 0xD3, 0xAC, 0x62, 0x91, 0x95, 0xE4, 0x79,
-                    0xE7, 0xC8, 0x37, 0x6D, 0x8D, 0xD5, 0x4E, 0xA9, 0x6C, 0x56, 0xF4, 0xEA, 0x65, 0x7A, 0xAE, 0x08,
-                    0xBA, 0x78, 0x25, 0x2E, 0x1C, 0xA6, 0xB4, 0xC6, 0xE8, 0xDD, 0x74, 0x1F, 0x4B, 0xBD, 0x8B, 0x8A,
-                    0x70, 0x3E, 0xB5, 0x66, 0x48, 0x03, 0xF6, 0x0E, 0x61, 0x35, 0x57, 0xB9, 0x86, 0xC1, 0x1D, 0x9E,
-                    0xE1, 0xF8, 0x98, 0x11, 0x69, 0xD9, 0x8E, 0x94, 0x9B, 0x1E, 0x87, 0xE9, 0xCE, 0x55, 0x28, 0xDF,
-                    0x8C, 0xA1, 0x89, 0x0D, 0xBF, 0xE6, 0x42, 0x68, 0x41, 0x99, 0x2D, 0x0F, 0xB0, 0x54, 0xBB, 0x16
-                )
-            );
-        }
-        return $tables;
-    }
-
-    /**
-     * Provides the inverse mixColumns and inverse sboxes tables
-     *
-     * @see self::_decryptBlock()
-     * @see self::_setupInlineCrypt()
-     * @see self::_setupKey()
-     * @access private
-     * @return array &$tables
-     */
-    function &_getInvTables()
-    {
-        static $tables;
-        if (empty($tables)) {
-            $dt3 = array_map('intval', array(
-                0xF4A75051, 0x4165537E, 0x17A4C31A, 0x275E963A, 0xAB6BCB3B, 0x9D45F11F, 0xFA58ABAC, 0xE303934B,
-                0x30FA5520, 0x766DF6AD, 0xCC769188, 0x024C25F5, 0xE5D7FC4F, 0x2ACBD7C5, 0x35448026, 0x62A38FB5,
-                0xB15A49DE, 0xBA1B6725, 0xEA0E9845, 0xFEC0E15D, 0x2F7502C3, 0x4CF01281, 0x4697A38D, 0xD3F9C66B,
-                0x8F5FE703, 0x929C9515, 0x6D7AEBBF, 0x5259DA95, 0xBE832DD4, 0x7421D358, 0xE0692949, 0xC9C8448E,
-                0xC2896A75, 0x8E7978F4, 0x583E6B99, 0xB971DD27, 0xE14FB6BE, 0x88AD17F0, 0x20AC66C9, 0xCE3AB47D,
-                0xDF4A1863, 0x1A3182E5, 0x51336097, 0x537F4562, 0x6477E0B1, 0x6BAE84BB, 0x81A01CFE, 0x082B94F9,
-                0x48685870, 0x45FD198F, 0xDE6C8794, 0x7BF8B752, 0x73D323AB, 0x4B02E272, 0x1F8F57E3, 0x55AB2A66,
-                0xEB2807B2, 0xB5C2032F, 0xC57B9A86, 0x3708A5D3, 0x2887F230, 0xBFA5B223, 0x036ABA02, 0x16825CED,
-                0xCF1C2B8A, 0x79B492A7, 0x07F2F0F3, 0x69E2A14E, 0xDAF4CD65, 0x05BED506, 0x34621FD1, 0xA6FE8AC4,
-                0x2E539D34, 0xF355A0A2, 0x8AE13205, 0xF6EB75A4, 0x83EC390B, 0x60EFAA40, 0x719F065E, 0x6E1051BD,
-                0x218AF93E, 0xDD063D96, 0x3E05AEDD, 0xE6BD464D, 0x548DB591, 0xC45D0571, 0x06D46F04, 0x5015FF60,
-                0x98FB2419, 0xBDE997D6, 0x4043CC89, 0xD99E7767, 0xE842BDB0, 0x898B8807, 0x195B38E7, 0xC8EEDB79,
-                0x7C0A47A1, 0x420FE97C, 0x841EC9F8, 0x00000000, 0x80868309, 0x2BED4832, 0x1170AC1E, 0x5A724E6C,
-                0x0EFFFBFD, 0x8538560F, 0xAED51E3D, 0x2D392736, 0x0FD9640A, 0x5CA62168, 0x5B54D19B, 0x362E3A24,
-                0x0A67B10C, 0x57E70F93, 0xEE96D2B4, 0x9B919E1B, 0xC0C54F80, 0xDC20A261, 0x774B695A, 0x121A161C,
-                0x93BA0AE2, 0xA02AE5C0, 0x22E0433C, 0x1B171D12, 0x090D0B0E, 0x8BC7ADF2, 0xB6A8B92D, 0x1EA9C814,
-                0xF1198557, 0x75074CAF, 0x99DDBBEE, 0x7F60FDA3, 0x01269FF7, 0x72F5BC5C, 0x663BC544, 0xFB7E345B,
-                0x4329768B, 0x23C6DCCB, 0xEDFC68B6, 0xE4F163B8, 0x31DCCAD7, 0x63851042, 0x97224013, 0xC6112084,
-                0x4A247D85, 0xBB3DF8D2, 0xF93211AE, 0x29A16DC7, 0x9E2F4B1D, 0xB230F3DC, 0x8652EC0D, 0xC1E3D077,
-                0xB3166C2B, 0x70B999A9, 0x9448FA11, 0xE9642247, 0xFC8CC4A8, 0xF03F1AA0, 0x7D2CD856, 0x3390EF22,
-                0x494EC787, 0x38D1C1D9, 0xCAA2FE8C, 0xD40B3698, 0xF581CFA6, 0x7ADE28A5, 0xB78E26DA, 0xADBFA43F,
-                0x3A9DE42C, 0x78920D50, 0x5FCC9B6A, 0x7E466254, 0x8D13C2F6, 0xD8B8E890, 0x39F75E2E, 0xC3AFF582,
-                0x5D80BE9F, 0xD0937C69, 0xD52DA96F, 0x2512B3CF, 0xAC993BC8, 0x187DA710, 0x9C636EE8, 0x3BBB7BDB,
-                0x267809CD, 0x5918F46E, 0x9AB701EC, 0x4F9AA883, 0x956E65E6, 0xFFE67EAA, 0xBCCF0821, 0x15E8E6EF,
-                0xE79BD9BA, 0x6F36CE4A, 0x9F09D4EA, 0xB07CD629, 0xA4B2AF31, 0x3F23312A, 0xA59430C6, 0xA266C035,
-                0x4EBC3774, 0x82CAA6FC, 0x90D0B0E0, 0xA7D81533, 0x04984AF1, 0xECDAF741, 0xCD500E7F, 0x91F62F17,
-                0x4DD68D76, 0xEFB04D43, 0xAA4D54CC, 0x9604DFE4, 0xD1B5E39E, 0x6A881B4C, 0x2C1FB8C1, 0x65517F46,
-                0x5EEA049D, 0x8C355D01, 0x877473FA, 0x0B412EFB, 0x671D5AB3, 0xDBD25292, 0x105633E9, 0xD647136D,
-                0xD7618C9A, 0xA10C7A37, 0xF8148E59, 0x133C89EB, 0xA927EECE, 0x61C935B7, 0x1CE5EDE1, 0x47B13C7A,
-                0xD2DF599C, 0xF2733F55, 0x14CE7918, 0xC737BF73, 0xF7CDEA53, 0xFDAA5B5F, 0x3D6F14DF, 0x44DB8678,
-                0xAFF381CA, 0x68C43EB9, 0x24342C38, 0xA3405FC2, 0x1DC37216, 0xE2250CBC, 0x3C498B28, 0x0D9541FF,
-                0xA8017139, 0x0CB3DE08, 0xB4E49CD8, 0x56C19064, 0xCB84617B, 0x32B670D5, 0x6C5C7448, 0xB85742D0
-            ));
-
-            foreach ($dt3 as $dt3i) {
-                $dt0[] = (($dt3i << 24) & 0xFF000000) | (($dt3i >>  8) & 0x00FFFFFF);
-                $dt1[] = (($dt3i << 16) & 0xFFFF0000) | (($dt3i >> 16) & 0x0000FFFF);
-                $dt2[] = (($dt3i <<  8) & 0xFFFFFF00) | (($dt3i >> 24) & 0x000000FF);
-            };
-
-            $tables = array(
-                // The Precomputed inverse mixColumns tables dt0 - dt3
-                $dt0,
-                $dt1,
-                $dt2,
-                $dt3,
-                // The inverse SubByte S-Box
-                array(
-                    0x52, 0x09, 0x6A, 0xD5, 0x30, 0x36, 0xA5, 0x38, 0xBF, 0x40, 0xA3, 0x9E, 0x81, 0xF3, 0xD7, 0xFB,
-                    0x7C, 0xE3, 0x39, 0x82, 0x9B, 0x2F, 0xFF, 0x87, 0x34, 0x8E, 0x43, 0x44, 0xC4, 0xDE, 0xE9, 0xCB,
-                    0x54, 0x7B, 0x94, 0x32, 0xA6, 0xC2, 0x23, 0x3D, 0xEE, 0x4C, 0x95, 0x0B, 0x42, 0xFA, 0xC3, 0x4E,
-                    0x08, 0x2E, 0xA1, 0x66, 0x28, 0xD9, 0x24, 0xB2, 0x76, 0x5B, 0xA2, 0x49, 0x6D, 0x8B, 0xD1, 0x25,
-                    0x72, 0xF8, 0xF6, 0x64, 0x86, 0x68, 0x98, 0x16, 0xD4, 0xA4, 0x5C, 0xCC, 0x5D, 0x65, 0xB6, 0x92,
-                    0x6C, 0x70, 0x48, 0x50, 0xFD, 0xED, 0xB9, 0xDA, 0x5E, 0x15, 0x46, 0x57, 0xA7, 0x8D, 0x9D, 0x84,
-                    0x90, 0xD8, 0xAB, 0x00, 0x8C, 0xBC, 0xD3, 0x0A, 0xF7, 0xE4, 0x58, 0x05, 0xB8, 0xB3, 0x45, 0x06,
-                    0xD0, 0x2C, 0x1E, 0x8F, 0xCA, 0x3F, 0x0F, 0x02, 0xC1, 0xAF, 0xBD, 0x03, 0x01, 0x13, 0x8A, 0x6B,
-                    0x3A, 0x91, 0x11, 0x41, 0x4F, 0x67, 0xDC, 0xEA, 0x97, 0xF2, 0xCF, 0xCE, 0xF0, 0xB4, 0xE6, 0x73,
-                    0x96, 0xAC, 0x74, 0x22, 0xE7, 0xAD, 0x35, 0x85, 0xE2, 0xF9, 0x37, 0xE8, 0x1C, 0x75, 0xDF, 0x6E,
-                    0x47, 0xF1, 0x1A, 0x71, 0x1D, 0x29, 0xC5, 0x89, 0x6F, 0xB7, 0x62, 0x0E, 0xAA, 0x18, 0xBE, 0x1B,
-                    0xFC, 0x56, 0x3E, 0x4B, 0xC6, 0xD2, 0x79, 0x20, 0x9A, 0xDB, 0xC0, 0xFE, 0x78, 0xCD, 0x5A, 0xF4,
-                    0x1F, 0xDD, 0xA8, 0x33, 0x88, 0x07, 0xC7, 0x31, 0xB1, 0x12, 0x10, 0x59, 0x27, 0x80, 0xEC, 0x5F,
-                    0x60, 0x51, 0x7F, 0xA9, 0x19, 0xB5, 0x4A, 0x0D, 0x2D, 0xE5, 0x7A, 0x9F, 0x93, 0xC9, 0x9C, 0xEF,
-                    0xA0, 0xE0, 0x3B, 0x4D, 0xAE, 0x2A, 0xF5, 0xB0, 0xC8, 0xEB, 0xBB, 0x3C, 0x83, 0x53, 0x99, 0x61,
-                    0x17, 0x2B, 0x04, 0x7E, 0xBA, 0x77, 0xD6, 0x26, 0xE1, 0x69, 0x14, 0x63, 0x55, 0x21, 0x0C, 0x7D
-                )
-            );
-        }
-        return $tables;
-    }
-
-    /**
-     * Setup the performance-optimized function for de/encrypt()
-     *
-     * @see \phpseclib\Crypt\Base::_setupInlineCrypt()
-     * @access private
-     */
-    function _setupInlineCrypt()
-    {
-        // Note: _setupInlineCrypt() will be called only if $this->changed === true
-        // So here we are'nt under the same heavy timing-stress as we are in _de/encryptBlock() or de/encrypt().
-        // However...the here generated function- $code, stored as php callback in $this->inline_crypt, must work as fast as even possible.
-
-        $lambda_functions =& self::_getLambdaFunctions();
-
-        // We create max. 10 hi-optimized code for memory reason. Means: For each $key one ultra fast inline-crypt function.
-        // (Currently, for Crypt_Rijndael/AES, one generated $lambda_function cost on php5.5@32bit ~80kb unfreeable mem and ~130kb on php5.5@64bit)
-        // After that, we'll still create very fast optimized code but not the hi-ultimative code, for each $mode one.
-        $gen_hi_opt_code = (bool)(count($lambda_functions) < 10);
-
-        // Generation of a uniqe hash for our generated code
-        $code_hash = "Crypt_Rijndael, {$this->mode}, {$this->Nr}, {$this->Nb}";
-        if ($gen_hi_opt_code) {
-            $code_hash = str_pad($code_hash, 32) . $this->_hashInlineCryptFunction($this->key);
-        }
-
-        if (!isset($lambda_functions[$code_hash])) {
-            switch (true) {
-                case $gen_hi_opt_code:
-                    // The hi-optimized $lambda_functions will use the key-words hardcoded for better performance.
-                    $w  = $this->w;
-                    $dw = $this->dw;
-                    $init_encrypt = '';
-                    $init_decrypt = '';
-                    break;
-                default:
-                    for ($i = 0, $cw = count($this->w); $i < $cw; ++$i) {
-                        $w[]  = '$w['  . $i . ']';
-                        $dw[] = '$dw[' . $i . ']';
-                    }
-                    $init_encrypt = '$w  = $self->w;';
-                    $init_decrypt = '$dw = $self->dw;';
-            }
-
-            $Nr = $this->Nr;
-            $Nb = $this->Nb;
-            $c  = $this->c;
-
-            // Generating encrypt code:
-            $init_encrypt.= '
-                static $tables;
-                if (empty($tables)) {
-                    $tables = &$self->_getTables();
-                }
-                $t0   = $tables[0];
-                $t1   = $tables[1];
-                $t2   = $tables[2];
-                $t3   = $tables[3];
-                $sbox = $tables[4];
-            ';
-
-            $s  = 'e';
-            $e  = 's';
-            $wc = $Nb - 1;
-
-            // Preround: addRoundKey
-            $encrypt_block = '$in = unpack("N*", $in);'."\n";
-            for ($i = 0; $i < $Nb; ++$i) {
-                $encrypt_block .= '$s'.$i.' = $in['.($i + 1).'] ^ '.$w[++$wc].";\n";
-            }
-
-            // Mainrounds: shiftRows + subWord + mixColumns + addRoundKey
-            for ($round = 1; $round < $Nr; ++$round) {
-                list($s, $e) = array($e, $s);
-                for ($i = 0; $i < $Nb; ++$i) {
-                    $encrypt_block.=
-                        '$'.$e.$i.' =
-                        $t0[($'.$s.$i                  .' >> 24) & 0xff] ^
-                        $t1[($'.$s.(($i + $c[1]) % $Nb).' >> 16) & 0xff] ^
-                        $t2[($'.$s.(($i + $c[2]) % $Nb).' >>  8) & 0xff] ^
-                        $t3[ $'.$s.(($i + $c[3]) % $Nb).'        & 0xff] ^
-                        '.$w[++$wc].";\n";
-                }
-            }
-
-            // Finalround: subWord + shiftRows + addRoundKey
-            for ($i = 0; $i < $Nb; ++$i) {
-                $encrypt_block.=
-                    '$'.$e.$i.' =
-                     $sbox[ $'.$e.$i.'        & 0xff]        |
-                    ($sbox[($'.$e.$i.' >>  8) & 0xff] <<  8) |
-                    ($sbox[($'.$e.$i.' >> 16) & 0xff] << 16) |
-                    ($sbox[($'.$e.$i.' >> 24) & 0xff] << 24);'."\n";
-            }
-            $encrypt_block .= '$in = pack("N*"'."\n";
-            for ($i = 0; $i < $Nb; ++$i) {
-                $encrypt_block.= ',
-                    ($'.$e.$i                  .' & '.((int)0xFF000000).') ^
-                    ($'.$e.(($i + $c[1]) % $Nb).' &         0x00FF0000   ) ^
-                    ($'.$e.(($i + $c[2]) % $Nb).' &         0x0000FF00   ) ^
-                    ($'.$e.(($i + $c[3]) % $Nb).' &         0x000000FF   ) ^
-                    '.$w[$i]."\n";
-            }
-            $encrypt_block .= ');';
-
-            // Generating decrypt code:
-            $init_decrypt.= '
-                static $invtables;
-                if (empty($invtables)) {
-                    $invtables = &$self->_getInvTables();
-                }
-                $dt0   = $invtables[0];
-                $dt1   = $invtables[1];
-                $dt2   = $invtables[2];
-                $dt3   = $invtables[3];
-                $isbox = $invtables[4];
-            ';
-
-            $s  = 'e';
-            $e  = 's';
-            $wc = $Nb - 1;
-
-            // Preround: addRoundKey
-            $decrypt_block = '$in = unpack("N*", $in);'."\n";
-            for ($i = 0; $i < $Nb; ++$i) {
-                $decrypt_block .= '$s'.$i.' = $in['.($i + 1).'] ^ '.$dw[++$wc].';'."\n";
-            }
-
-            // Mainrounds: shiftRows + subWord + mixColumns + addRoundKey
-            for ($round = 1; $round < $Nr; ++$round) {
-                list($s, $e) = array($e, $s);
-                for ($i = 0; $i < $Nb; ++$i) {
-                    $decrypt_block.=
-                        '$'.$e.$i.' =
-                        $dt0[($'.$s.$i                        .' >> 24) & 0xff] ^
-                        $dt1[($'.$s.(($Nb + $i - $c[1]) % $Nb).' >> 16) & 0xff] ^
-                        $dt2[($'.$s.(($Nb + $i - $c[2]) % $Nb).' >>  8) & 0xff] ^
-                        $dt3[ $'.$s.(($Nb + $i - $c[3]) % $Nb).'        & 0xff] ^
-                        '.$dw[++$wc].";\n";
-                }
-            }
-
-            // Finalround: subWord + shiftRows + addRoundKey
-            for ($i = 0; $i < $Nb; ++$i) {
-                $decrypt_block.=
-                    '$'.$e.$i.' =
-                     $isbox[ $'.$e.$i.'        & 0xff]        |
-                    ($isbox[($'.$e.$i.' >>  8) & 0xff] <<  8) |
-                    ($isbox[($'.$e.$i.' >> 16) & 0xff] << 16) |
-                    ($isbox[($'.$e.$i.' >> 24) & 0xff] << 24);'."\n";
-            }
-            $decrypt_block .= '$in = pack("N*"'."\n";
-            for ($i = 0; $i < $Nb; ++$i) {
-                $decrypt_block.= ',
-                    ($'.$e.$i.                        ' & '.((int)0xFF000000).') ^
-                    ($'.$e.(($Nb + $i - $c[1]) % $Nb).' &         0x00FF0000   ) ^
-                    ($'.$e.(($Nb + $i - $c[2]) % $Nb).' &         0x0000FF00   ) ^
-                    ($'.$e.(($Nb + $i - $c[3]) % $Nb).' &         0x000000FF   ) ^
-                    '.$dw[$i]."\n";
-            }
-            $decrypt_block .= ');';
-
-            $lambda_functions[$code_hash] = $this->_createInlineCryptFunction(
-                array(
-                   'init_crypt'    => '',
-                   'init_encrypt'  => $init_encrypt,
-                   'init_decrypt'  => $init_decrypt,
-                   'encrypt_block' => $encrypt_block,
-                   'decrypt_block' => $decrypt_block
-                )
-            );
-        }
-        $this->inline_crypt = $lambda_functions[$code_hash];
-    }
-}
diff --git a/mayor-orig/www/include/share/googleapi/phpseclib/phpseclib/phpseclib/Crypt/TripleDES.php b/mayor-orig/www/include/share/googleapi/phpseclib/phpseclib/phpseclib/Crypt/TripleDES.php
deleted file mode 100644
index a2c41668..00000000
--- a/mayor-orig/www/include/share/googleapi/phpseclib/phpseclib/phpseclib/Crypt/TripleDES.php
+++ /dev/null
@@ -1,460 +0,0 @@
-
- * setKey('abcdefghijklmnopqrstuvwx');
- *
- *    $size = 10 * 1024;
- *    $plaintext = '';
- *    for ($i = 0; $i < $size; $i++) {
- *        $plaintext.= 'a';
- *    }
- *
- *    echo $des->decrypt($des->encrypt($plaintext));
- * ?>
- * 
- *
- * @category  Crypt
- * @package   TripleDES
- * @author    Jim Wigginton 
- * @copyright 2007 Jim Wigginton
- * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
- * @link      http://phpseclib.sourceforge.net
- */
-
-namespace phpseclib\Crypt;
-
-/**
- * Pure-PHP implementation of Triple DES.
- *
- * @package TripleDES
- * @author  Jim Wigginton 
- * @access  public
- */
-class TripleDES extends DES
-{
-    /**
-     * Encrypt / decrypt using inner chaining
-     *
-     * Inner chaining is used by SSH-1 and is generally considered to be less secure then outer chaining (self::MODE_CBC3).
-     */
-    const MODE_3CBC = -2;
-
-    /**
-     * Encrypt / decrypt using outer chaining
-     *
-     * Outer chaining is used by SSH-2 and when the mode is set to \phpseclib\Crypt\Base::MODE_CBC.
-     */
-    const MODE_CBC3 = Base::MODE_CBC;
-
-    /**
-     * Key Length (in bytes)
-     *
-     * @see \phpseclib\Crypt\TripleDES::setKeyLength()
-     * @var int
-     * @access private
-     */
-    var $key_length = 24;
-
-    /**
-     * The default salt used by setPassword()
-     *
-     * @see \phpseclib\Crypt\Base::password_default_salt
-     * @see \phpseclib\Crypt\Base::setPassword()
-     * @var string
-     * @access private
-     */
-    var $password_default_salt = 'phpseclib';
-
-    /**
-     * The mcrypt specific name of the cipher
-     *
-     * @see \phpseclib\Crypt\DES::cipher_name_mcrypt
-     * @see \phpseclib\Crypt\Base::cipher_name_mcrypt
-     * @var string
-     * @access private
-     */
-    var $cipher_name_mcrypt = 'tripledes';
-
-    /**
-     * Optimizing value while CFB-encrypting
-     *
-     * @see \phpseclib\Crypt\Base::cfb_init_len
-     * @var int
-     * @access private
-     */
-    var $cfb_init_len = 750;
-
-    /**
-     * max possible size of $key
-     *
-     * @see self::setKey()
-     * @see \phpseclib\Crypt\DES::setKey()
-     * @var string
-     * @access private
-     */
-    var $key_length_max = 24;
-
-    /**
-     * Internal flag whether using self::MODE_3CBC or not
-     *
-     * @var bool
-     * @access private
-     */
-    var $mode_3cbc;
-
-    /**
-     * The \phpseclib\Crypt\DES objects
-     *
-     * Used only if $mode_3cbc === true
-     *
-     * @var array
-     * @access private
-     */
-    var $des;
-
-    /**
-     * Default Constructor.
-     *
-     * Determines whether or not the mcrypt extension should be used.
-     *
-     * $mode could be:
-     *
-     * - \phpseclib\Crypt\Base::MODE_ECB
-     *
-     * - \phpseclib\Crypt\Base::MODE_CBC
-     *
-     * - \phpseclib\Crypt\Base::MODE_CTR
-     *
-     * - \phpseclib\Crypt\Base::MODE_CFB
-     *
-     * - \phpseclib\Crypt\Base::MODE_OFB
-     *
-     * - \phpseclib\Crypt\TripleDES::MODE_3CBC
-     *
-     * If not explicitly set, \phpseclib\Crypt\Base::MODE_CBC will be used.
-     *
-     * @see \phpseclib\Crypt\DES::__construct()
-     * @see \phpseclib\Crypt\Base::__construct()
-     * @param int $mode
-     * @access public
-     */
-    function __construct($mode = Base::MODE_CBC)
-    {
-        switch ($mode) {
-            // In case of self::MODE_3CBC, we init as CRYPT_DES_MODE_CBC
-            // and additional flag us internally as 3CBC
-            case self::MODE_3CBC:
-                parent::__construct(Base::MODE_CBC);
-                $this->mode_3cbc = true;
-
-                // This three $des'es will do the 3CBC work (if $key > 64bits)
-                $this->des = array(
-                    new DES(Base::MODE_CBC),
-                    new DES(Base::MODE_CBC),
-                    new DES(Base::MODE_CBC),
-                );
-
-                // we're going to be doing the padding, ourselves, so disable it in the \phpseclib\Crypt\DES objects
-                $this->des[0]->disablePadding();
-                $this->des[1]->disablePadding();
-                $this->des[2]->disablePadding();
-                break;
-            // If not 3CBC, we init as usual
-            default:
-                parent::__construct($mode);
-        }
-    }
-
-    /**
-     * Test for engine validity
-     *
-     * This is mainly just a wrapper to set things up for \phpseclib\Crypt\Base::isValidEngine()
-     *
-     * @see \phpseclib\Crypt\Base::__construct()
-     * @param int $engine
-     * @access public
-     * @return bool
-     */
-    function isValidEngine($engine)
-    {
-        if ($engine == self::ENGINE_OPENSSL) {
-            $this->cipher_name_openssl_ecb = 'des-ede3';
-            $mode = $this->_openssl_translate_mode();
-            $this->cipher_name_openssl = $mode == 'ecb' ? 'des-ede3' : 'des-ede3-' . $mode;
-        }
-
-        return parent::isValidEngine($engine);
-    }
-
-    /**
-     * Sets the initialization vector. (optional)
-     *
-     * SetIV is not required when \phpseclib\Crypt\Base::MODE_ECB is being used.  If not explicitly set, it'll be assumed
-     * to be all zero's.
-     *
-     * @see \phpseclib\Crypt\Base::setIV()
-     * @access public
-     * @param string $iv
-     */
-    function setIV($iv)
-    {
-        parent::setIV($iv);
-        if ($this->mode_3cbc) {
-            $this->des[0]->setIV($iv);
-            $this->des[1]->setIV($iv);
-            $this->des[2]->setIV($iv);
-        }
-    }
-
-    /**
-     * Sets the key length.
-     *
-     * Valid key lengths are 64, 128 and 192
-     *
-     * @see \phpseclib\Crypt\Base:setKeyLength()
-     * @access public
-     * @param int $length
-     */
-    function setKeyLength($length)
-    {
-        $length >>= 3;
-        switch (true) {
-            case $length <= 8:
-                $this->key_length = 8;
-                break;
-            case $length <= 16:
-                $this->key_length = 16;
-                break;
-            default:
-                $this->key_length = 24;
-        }
-
-        parent::setKeyLength($length);
-    }
-
-    /**
-     * Sets the key.
-     *
-     * Keys can be of any length.  Triple DES, itself, can use 128-bit (eg. strlen($key) == 16) or
-     * 192-bit (eg. strlen($key) == 24) keys.  This function pads and truncates $key as appropriate.
-     *
-     * DES also requires that every eighth bit be a parity bit, however, we'll ignore that.
-     *
-     * If the key is not explicitly set, it'll be assumed to be all null bytes.
-     *
-     * @access public
-     * @see \phpseclib\Crypt\DES::setKey()
-     * @see \phpseclib\Crypt\Base::setKey()
-     * @param string $key
-     */
-    function setKey($key)
-    {
-        $length = $this->explicit_key_length ? $this->key_length : strlen($key);
-        if ($length > 8) {
-            $key = str_pad(substr($key, 0, 24), 24, chr(0));
-            // if $key is between 64 and 128-bits, use the first 64-bits as the last, per this:
-            // http://php.net/function.mcrypt-encrypt#47973
-            $key = $length <= 16 ? substr_replace($key, substr($key, 0, 8), 16) : substr($key, 0, 24);
-        } else {
-            $key = str_pad($key, 8, chr(0));
-        }
-        parent::setKey($key);
-
-        // And in case of self::MODE_3CBC:
-        // if key <= 64bits we not need the 3 $des to work,
-        // because we will then act as regular DES-CBC with just a <= 64bit key.
-        // So only if the key > 64bits (> 8 bytes) we will call setKey() for the 3 $des.
-        if ($this->mode_3cbc && $length > 8) {
-            $this->des[0]->setKey(substr($key,  0, 8));
-            $this->des[1]->setKey(substr($key,  8, 8));
-            $this->des[2]->setKey(substr($key, 16, 8));
-        }
-    }
-
-    /**
-     * Encrypts a message.
-     *
-     * @see \phpseclib\Crypt\Base::encrypt()
-     * @access public
-     * @param string $plaintext
-     * @return string $cipertext
-     */
-    function encrypt($plaintext)
-    {
-        // parent::en/decrypt() is able to do all the work for all modes and keylengths,
-        // except for: self::MODE_3CBC (inner chaining CBC) with a key > 64bits
-
-        // if the key is smaller then 8, do what we'd normally do
-        if ($this->mode_3cbc && strlen($this->key) > 8) {
-            return $this->des[2]->encrypt(
-                $this->des[1]->decrypt(
-                    $this->des[0]->encrypt(
-                        $this->_pad($plaintext)
-                    )
-                )
-            );
-        }
-
-        return parent::encrypt($plaintext);
-    }
-
-    /**
-     * Decrypts a message.
-     *
-     * @see \phpseclib\Crypt\Base::decrypt()
-     * @access public
-     * @param string $ciphertext
-     * @return string $plaintext
-     */
-    function decrypt($ciphertext)
-    {
-        if ($this->mode_3cbc && strlen($this->key) > 8) {
-            return $this->_unpad(
-                $this->des[0]->decrypt(
-                    $this->des[1]->encrypt(
-                        $this->des[2]->decrypt(
-                            str_pad($ciphertext, (strlen($ciphertext) + 7) & 0xFFFFFFF8, "\0")
-                        )
-                    )
-                )
-            );
-        }
-
-        return parent::decrypt($ciphertext);
-    }
-
-    /**
-     * Treat consecutive "packets" as if they are a continuous buffer.
-     *
-     * Say you have a 16-byte plaintext $plaintext.  Using the default behavior, the two following code snippets
-     * will yield different outputs:
-     *
-     * 
-     *    echo $des->encrypt(substr($plaintext, 0, 8));
-     *    echo $des->encrypt(substr($plaintext, 8, 8));
-     * 
-     * 
-     *    echo $des->encrypt($plaintext);
-     * 
-     *
-     * The solution is to enable the continuous buffer.  Although this will resolve the above discrepancy, it creates
-     * another, as demonstrated with the following:
-     *
-     * 
-     *    $des->encrypt(substr($plaintext, 0, 8));
-     *    echo $des->decrypt($des->encrypt(substr($plaintext, 8, 8)));
-     * 
-     * 
-     *    echo $des->decrypt($des->encrypt(substr($plaintext, 8, 8)));
-     * 
-     *
-     * With the continuous buffer disabled, these would yield the same output.  With it enabled, they yield different
-     * outputs.  The reason is due to the fact that the initialization vector's change after every encryption /
-     * decryption round when the continuous buffer is enabled.  When it's disabled, they remain constant.
-     *
-     * Put another way, when the continuous buffer is enabled, the state of the \phpseclib\Crypt\DES() object changes after each
-     * encryption / decryption round, whereas otherwise, it'd remain constant.  For this reason, it's recommended that
-     * continuous buffers not be used.  They do offer better security and are, in fact, sometimes required (SSH uses them),
-     * however, they are also less intuitive and more likely to cause you problems.
-     *
-     * @see \phpseclib\Crypt\Base::enableContinuousBuffer()
-     * @see self::disableContinuousBuffer()
-     * @access public
-     */
-    function enableContinuousBuffer()
-    {
-        parent::enableContinuousBuffer();
-        if ($this->mode_3cbc) {
-            $this->des[0]->enableContinuousBuffer();
-            $this->des[1]->enableContinuousBuffer();
-            $this->des[2]->enableContinuousBuffer();
-        }
-    }
-
-    /**
-     * Treat consecutive packets as if they are a discontinuous buffer.
-     *
-     * The default behavior.
-     *
-     * @see \phpseclib\Crypt\Base::disableContinuousBuffer()
-     * @see self::enableContinuousBuffer()
-     * @access public
-     */
-    function disableContinuousBuffer()
-    {
-        parent::disableContinuousBuffer();
-        if ($this->mode_3cbc) {
-            $this->des[0]->disableContinuousBuffer();
-            $this->des[1]->disableContinuousBuffer();
-            $this->des[2]->disableContinuousBuffer();
-        }
-    }
-
-    /**
-     * Creates the key schedule
-     *
-     * @see \phpseclib\Crypt\DES::_setupKey()
-     * @see \phpseclib\Crypt\Base::_setupKey()
-     * @access private
-     */
-    function _setupKey()
-    {
-        switch (true) {
-            // if $key <= 64bits we configure our internal pure-php cipher engine
-            // to act as regular [1]DES, not as 3DES. mcrypt.so::tripledes does the same.
-            case strlen($this->key) <= 8:
-                $this->des_rounds = 1;
-                break;
-
-            // otherwise, if $key > 64bits, we configure our engine to work as 3DES.
-            default:
-                $this->des_rounds = 3;
-
-                // (only) if 3CBC is used we have, of course, to setup the $des[0-2] keys also separately.
-                if ($this->mode_3cbc) {
-                    $this->des[0]->_setupKey();
-                    $this->des[1]->_setupKey();
-                    $this->des[2]->_setupKey();
-
-                    // because $des[0-2] will, now, do all the work we can return here
-                    // not need unnecessary stress parent::_setupKey() with our, now unused, $key.
-                    return;
-                }
-        }
-        // setup our key
-        parent::_setupKey();
-    }
-
-    /**
-     * Sets the internal crypt engine
-     *
-     * @see \phpseclib\Crypt\Base::__construct()
-     * @see \phpseclib\Crypt\Base::setPreferredEngine()
-     * @param int $engine
-     * @access public
-     * @return int
-     */
-    function setPreferredEngine($engine)
-    {
-        if ($this->mode_3cbc) {
-            $this->des[0]->setPreferredEngine($engine);
-            $this->des[1]->setPreferredEngine($engine);
-            $this->des[2]->setPreferredEngine($engine);
-        }
-
-        return parent::setPreferredEngine($engine);
-    }
-}
diff --git a/mayor-orig/www/include/share/googleapi/phpseclib/phpseclib/phpseclib/Crypt/Twofish.php b/mayor-orig/www/include/share/googleapi/phpseclib/phpseclib/phpseclib/Crypt/Twofish.php
deleted file mode 100644
index 3dd4ea1d..00000000
--- a/mayor-orig/www/include/share/googleapi/phpseclib/phpseclib/phpseclib/Crypt/Twofish.php
+++ /dev/null
@@ -1,808 +0,0 @@
-
- * setKey('12345678901234567890123456789012');
- *
- *    $plaintext = str_repeat('a', 1024);
- *
- *    echo $twofish->decrypt($twofish->encrypt($plaintext));
- * ?>
- * 
- *
- * @category  Crypt
- * @package   Twofish
- * @author    Jim Wigginton 
- * @author    Hans-Juergen Petrich 
- * @copyright 2007 Jim Wigginton
- * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
- * @link      http://phpseclib.sourceforge.net
- */
-
-namespace phpseclib\Crypt;
-
-/**
- * Pure-PHP implementation of Twofish.
- *
- * @package Twofish
- * @author  Jim Wigginton 
- * @author  Hans-Juergen Petrich 
- * @access  public
- */
-class Twofish extends Base
-{
-    /**
-     * The mcrypt specific name of the cipher
-     *
-     * @see \phpseclib\Crypt\Base::cipher_name_mcrypt
-     * @var string
-     * @access private
-     */
-    var $cipher_name_mcrypt = 'twofish';
-
-    /**
-     * Optimizing value while CFB-encrypting
-     *
-     * @see \phpseclib\Crypt\Base::cfb_init_len
-     * @var int
-     * @access private
-     */
-    var $cfb_init_len = 800;
-
-    /**
-     * Q-Table
-     *
-     * @var array
-     * @access private
-     */
-    var $q0 = array(
-        0xA9, 0x67, 0xB3, 0xE8, 0x04, 0xFD, 0xA3, 0x76,
-        0x9A, 0x92, 0x80, 0x78, 0xE4, 0xDD, 0xD1, 0x38,
-        0x0D, 0xC6, 0x35, 0x98, 0x18, 0xF7, 0xEC, 0x6C,
-        0x43, 0x75, 0x37, 0x26, 0xFA, 0x13, 0x94, 0x48,
-        0xF2, 0xD0, 0x8B, 0x30, 0x84, 0x54, 0xDF, 0x23,
-        0x19, 0x5B, 0x3D, 0x59, 0xF3, 0xAE, 0xA2, 0x82,
-        0x63, 0x01, 0x83, 0x2E, 0xD9, 0x51, 0x9B, 0x7C,
-        0xA6, 0xEB, 0xA5, 0xBE, 0x16, 0x0C, 0xE3, 0x61,
-        0xC0, 0x8C, 0x3A, 0xF5, 0x73, 0x2C, 0x25, 0x0B,
-        0xBB, 0x4E, 0x89, 0x6B, 0x53, 0x6A, 0xB4, 0xF1,
-        0xE1, 0xE6, 0xBD, 0x45, 0xE2, 0xF4, 0xB6, 0x66,
-        0xCC, 0x95, 0x03, 0x56, 0xD4, 0x1C, 0x1E, 0xD7,
-        0xFB, 0xC3, 0x8E, 0xB5, 0xE9, 0xCF, 0xBF, 0xBA,
-        0xEA, 0x77, 0x39, 0xAF, 0x33, 0xC9, 0x62, 0x71,
-        0x81, 0x79, 0x09, 0xAD, 0x24, 0xCD, 0xF9, 0xD8,
-        0xE5, 0xC5, 0xB9, 0x4D, 0x44, 0x08, 0x86, 0xE7,
-        0xA1, 0x1D, 0xAA, 0xED, 0x06, 0x70, 0xB2, 0xD2,
-        0x41, 0x7B, 0xA0, 0x11, 0x31, 0xC2, 0x27, 0x90,
-        0x20, 0xF6, 0x60, 0xFF, 0x96, 0x5C, 0xB1, 0xAB,
-        0x9E, 0x9C, 0x52, 0x1B, 0x5F, 0x93, 0x0A, 0xEF,
-        0x91, 0x85, 0x49, 0xEE, 0x2D, 0x4F, 0x8F, 0x3B,
-        0x47, 0x87, 0x6D, 0x46, 0xD6, 0x3E, 0x69, 0x64,
-        0x2A, 0xCE, 0xCB, 0x2F, 0xFC, 0x97, 0x05, 0x7A,
-        0xAC, 0x7F, 0xD5, 0x1A, 0x4B, 0x0E, 0xA7, 0x5A,
-        0x28, 0x14, 0x3F, 0x29, 0x88, 0x3C, 0x4C, 0x02,
-        0xB8, 0xDA, 0xB0, 0x17, 0x55, 0x1F, 0x8A, 0x7D,
-        0x57, 0xC7, 0x8D, 0x74, 0xB7, 0xC4, 0x9F, 0x72,
-        0x7E, 0x15, 0x22, 0x12, 0x58, 0x07, 0x99, 0x34,
-        0x6E, 0x50, 0xDE, 0x68, 0x65, 0xBC, 0xDB, 0xF8,
-        0xC8, 0xA8, 0x2B, 0x40, 0xDC, 0xFE, 0x32, 0xA4,
-        0xCA, 0x10, 0x21, 0xF0, 0xD3, 0x5D, 0x0F, 0x00,
-        0x6F, 0x9D, 0x36, 0x42, 0x4A, 0x5E, 0xC1, 0xE0
-    );
-
-    /**
-     * Q-Table
-     *
-     * @var array
-     * @access private
-     */
-    var $q1 = array(
-        0x75, 0xF3, 0xC6, 0xF4, 0xDB, 0x7B, 0xFB, 0xC8,
-        0x4A, 0xD3, 0xE6, 0x6B, 0x45, 0x7D, 0xE8, 0x4B,
-        0xD6, 0x32, 0xD8, 0xFD, 0x37, 0x71, 0xF1, 0xE1,
-        0x30, 0x0F, 0xF8, 0x1B, 0x87, 0xFA, 0x06, 0x3F,
-        0x5E, 0xBA, 0xAE, 0x5B, 0x8A, 0x00, 0xBC, 0x9D,
-        0x6D, 0xC1, 0xB1, 0x0E, 0x80, 0x5D, 0xD2, 0xD5,
-        0xA0, 0x84, 0x07, 0x14, 0xB5, 0x90, 0x2C, 0xA3,
-        0xB2, 0x73, 0x4C, 0x54, 0x92, 0x74, 0x36, 0x51,
-        0x38, 0xB0, 0xBD, 0x5A, 0xFC, 0x60, 0x62, 0x96,
-        0x6C, 0x42, 0xF7, 0x10, 0x7C, 0x28, 0x27, 0x8C,
-        0x13, 0x95, 0x9C, 0xC7, 0x24, 0x46, 0x3B, 0x70,
-        0xCA, 0xE3, 0x85, 0xCB, 0x11, 0xD0, 0x93, 0xB8,
-        0xA6, 0x83, 0x20, 0xFF, 0x9F, 0x77, 0xC3, 0xCC,
-        0x03, 0x6F, 0x08, 0xBF, 0x40, 0xE7, 0x2B, 0xE2,
-        0x79, 0x0C, 0xAA, 0x82, 0x41, 0x3A, 0xEA, 0xB9,
-        0xE4, 0x9A, 0xA4, 0x97, 0x7E, 0xDA, 0x7A, 0x17,
-        0x66, 0x94, 0xA1, 0x1D, 0x3D, 0xF0, 0xDE, 0xB3,
-        0x0B, 0x72, 0xA7, 0x1C, 0xEF, 0xD1, 0x53, 0x3E,
-        0x8F, 0x33, 0x26, 0x5F, 0xEC, 0x76, 0x2A, 0x49,
-        0x81, 0x88, 0xEE, 0x21, 0xC4, 0x1A, 0xEB, 0xD9,
-        0xC5, 0x39, 0x99, 0xCD, 0xAD, 0x31, 0x8B, 0x01,
-        0x18, 0x23, 0xDD, 0x1F, 0x4E, 0x2D, 0xF9, 0x48,
-        0x4F, 0xF2, 0x65, 0x8E, 0x78, 0x5C, 0x58, 0x19,
-        0x8D, 0xE5, 0x98, 0x57, 0x67, 0x7F, 0x05, 0x64,
-        0xAF, 0x63, 0xB6, 0xFE, 0xF5, 0xB7, 0x3C, 0xA5,
-        0xCE, 0xE9, 0x68, 0x44, 0xE0, 0x4D, 0x43, 0x69,
-        0x29, 0x2E, 0xAC, 0x15, 0x59, 0xA8, 0x0A, 0x9E,
-        0x6E, 0x47, 0xDF, 0x34, 0x35, 0x6A, 0xCF, 0xDC,
-        0x22, 0xC9, 0xC0, 0x9B, 0x89, 0xD4, 0xED, 0xAB,
-        0x12, 0xA2, 0x0D, 0x52, 0xBB, 0x02, 0x2F, 0xA9,
-        0xD7, 0x61, 0x1E, 0xB4, 0x50, 0x04, 0xF6, 0xC2,
-        0x16, 0x25, 0x86, 0x56, 0x55, 0x09, 0xBE, 0x91
-    );
-
-    /**
-     * M-Table
-     *
-     * @var array
-     * @access private
-     */
-    var $m0 = array(
-        0xBCBC3275, 0xECEC21F3, 0x202043C6, 0xB3B3C9F4, 0xDADA03DB, 0x02028B7B, 0xE2E22BFB, 0x9E9EFAC8,
-        0xC9C9EC4A, 0xD4D409D3, 0x18186BE6, 0x1E1E9F6B, 0x98980E45, 0xB2B2387D, 0xA6A6D2E8, 0x2626B74B,
-        0x3C3C57D6, 0x93938A32, 0x8282EED8, 0x525298FD, 0x7B7BD437, 0xBBBB3771, 0x5B5B97F1, 0x474783E1,
-        0x24243C30, 0x5151E20F, 0xBABAC6F8, 0x4A4AF31B, 0xBFBF4887, 0x0D0D70FA, 0xB0B0B306, 0x7575DE3F,
-        0xD2D2FD5E, 0x7D7D20BA, 0x666631AE, 0x3A3AA35B, 0x59591C8A, 0x00000000, 0xCDCD93BC, 0x1A1AE09D,
-        0xAEAE2C6D, 0x7F7FABC1, 0x2B2BC7B1, 0xBEBEB90E, 0xE0E0A080, 0x8A8A105D, 0x3B3B52D2, 0x6464BAD5,
-        0xD8D888A0, 0xE7E7A584, 0x5F5FE807, 0x1B1B1114, 0x2C2CC2B5, 0xFCFCB490, 0x3131272C, 0x808065A3,
-        0x73732AB2, 0x0C0C8173, 0x79795F4C, 0x6B6B4154, 0x4B4B0292, 0x53536974, 0x94948F36, 0x83831F51,
-        0x2A2A3638, 0xC4C49CB0, 0x2222C8BD, 0xD5D5F85A, 0xBDBDC3FC, 0x48487860, 0xFFFFCE62, 0x4C4C0796,
-        0x4141776C, 0xC7C7E642, 0xEBEB24F7, 0x1C1C1410, 0x5D5D637C, 0x36362228, 0x6767C027, 0xE9E9AF8C,
-        0x4444F913, 0x1414EA95, 0xF5F5BB9C, 0xCFCF18C7, 0x3F3F2D24, 0xC0C0E346, 0x7272DB3B, 0x54546C70,
-        0x29294CCA, 0xF0F035E3, 0x0808FE85, 0xC6C617CB, 0xF3F34F11, 0x8C8CE4D0, 0xA4A45993, 0xCACA96B8,
-        0x68683BA6, 0xB8B84D83, 0x38382820, 0xE5E52EFF, 0xADAD569F, 0x0B0B8477, 0xC8C81DC3, 0x9999FFCC,
-        0x5858ED03, 0x19199A6F, 0x0E0E0A08, 0x95957EBF, 0x70705040, 0xF7F730E7, 0x6E6ECF2B, 0x1F1F6EE2,
-        0xB5B53D79, 0x09090F0C, 0x616134AA, 0x57571682, 0x9F9F0B41, 0x9D9D803A, 0x111164EA, 0x2525CDB9,
-        0xAFAFDDE4, 0x4545089A, 0xDFDF8DA4, 0xA3A35C97, 0xEAEAD57E, 0x353558DA, 0xEDEDD07A, 0x4343FC17,
-        0xF8F8CB66, 0xFBFBB194, 0x3737D3A1, 0xFAFA401D, 0xC2C2683D, 0xB4B4CCF0, 0x32325DDE, 0x9C9C71B3,
-        0x5656E70B, 0xE3E3DA72, 0x878760A7, 0x15151B1C, 0xF9F93AEF, 0x6363BFD1, 0x3434A953, 0x9A9A853E,
-        0xB1B1428F, 0x7C7CD133, 0x88889B26, 0x3D3DA65F, 0xA1A1D7EC, 0xE4E4DF76, 0x8181942A, 0x91910149,
-        0x0F0FFB81, 0xEEEEAA88, 0x161661EE, 0xD7D77321, 0x9797F5C4, 0xA5A5A81A, 0xFEFE3FEB, 0x6D6DB5D9,
-        0x7878AEC5, 0xC5C56D39, 0x1D1DE599, 0x7676A4CD, 0x3E3EDCAD, 0xCBCB6731, 0xB6B6478B, 0xEFEF5B01,
-        0x12121E18, 0x6060C523, 0x6A6AB0DD, 0x4D4DF61F, 0xCECEE94E, 0xDEDE7C2D, 0x55559DF9, 0x7E7E5A48,
-        0x2121B24F, 0x03037AF2, 0xA0A02665, 0x5E5E198E, 0x5A5A6678, 0x65654B5C, 0x62624E58, 0xFDFD4519,
-        0x0606F48D, 0x404086E5, 0xF2F2BE98, 0x3333AC57, 0x17179067, 0x05058E7F, 0xE8E85E05, 0x4F4F7D64,
-        0x89896AAF, 0x10109563, 0x74742FB6, 0x0A0A75FE, 0x5C5C92F5, 0x9B9B74B7, 0x2D2D333C, 0x3030D6A5,
-        0x2E2E49CE, 0x494989E9, 0x46467268, 0x77775544, 0xA8A8D8E0, 0x9696044D, 0x2828BD43, 0xA9A92969,
-        0xD9D97929, 0x8686912E, 0xD1D187AC, 0xF4F44A15, 0x8D8D1559, 0xD6D682A8, 0xB9B9BC0A, 0x42420D9E,
-        0xF6F6C16E, 0x2F2FB847, 0xDDDD06DF, 0x23233934, 0xCCCC6235, 0xF1F1C46A, 0xC1C112CF, 0x8585EBDC,
-        0x8F8F9E22, 0x7171A1C9, 0x9090F0C0, 0xAAAA539B, 0x0101F189, 0x8B8BE1D4, 0x4E4E8CED, 0x8E8E6FAB,
-        0xABABA212, 0x6F6F3EA2, 0xE6E6540D, 0xDBDBF252, 0x92927BBB, 0xB7B7B602, 0x6969CA2F, 0x3939D9A9,
-        0xD3D30CD7, 0xA7A72361, 0xA2A2AD1E, 0xC3C399B4, 0x6C6C4450, 0x07070504, 0x04047FF6, 0x272746C2,
-        0xACACA716, 0xD0D07625, 0x50501386, 0xDCDCF756, 0x84841A55, 0xE1E15109, 0x7A7A25BE, 0x1313EF91
-    );
-
-    /**
-     * M-Table
-     *
-     * @var array
-     * @access private
-     */
-    var $m1 = array(
-        0xA9D93939, 0x67901717, 0xB3719C9C, 0xE8D2A6A6, 0x04050707, 0xFD985252, 0xA3658080, 0x76DFE4E4,
-        0x9A084545, 0x92024B4B, 0x80A0E0E0, 0x78665A5A, 0xE4DDAFAF, 0xDDB06A6A, 0xD1BF6363, 0x38362A2A,
-        0x0D54E6E6, 0xC6432020, 0x3562CCCC, 0x98BEF2F2, 0x181E1212, 0xF724EBEB, 0xECD7A1A1, 0x6C774141,
-        0x43BD2828, 0x7532BCBC, 0x37D47B7B, 0x269B8888, 0xFA700D0D, 0x13F94444, 0x94B1FBFB, 0x485A7E7E,
-        0xF27A0303, 0xD0E48C8C, 0x8B47B6B6, 0x303C2424, 0x84A5E7E7, 0x54416B6B, 0xDF06DDDD, 0x23C56060,
-        0x1945FDFD, 0x5BA33A3A, 0x3D68C2C2, 0x59158D8D, 0xF321ECEC, 0xAE316666, 0xA23E6F6F, 0x82165757,
-        0x63951010, 0x015BEFEF, 0x834DB8B8, 0x2E918686, 0xD9B56D6D, 0x511F8383, 0x9B53AAAA, 0x7C635D5D,
-        0xA63B6868, 0xEB3FFEFE, 0xA5D63030, 0xBE257A7A, 0x16A7ACAC, 0x0C0F0909, 0xE335F0F0, 0x6123A7A7,
-        0xC0F09090, 0x8CAFE9E9, 0x3A809D9D, 0xF5925C5C, 0x73810C0C, 0x2C273131, 0x2576D0D0, 0x0BE75656,
-        0xBB7B9292, 0x4EE9CECE, 0x89F10101, 0x6B9F1E1E, 0x53A93434, 0x6AC4F1F1, 0xB499C3C3, 0xF1975B5B,
-        0xE1834747, 0xE66B1818, 0xBDC82222, 0x450E9898, 0xE26E1F1F, 0xF4C9B3B3, 0xB62F7474, 0x66CBF8F8,
-        0xCCFF9999, 0x95EA1414, 0x03ED5858, 0x56F7DCDC, 0xD4E18B8B, 0x1C1B1515, 0x1EADA2A2, 0xD70CD3D3,
-        0xFB2BE2E2, 0xC31DC8C8, 0x8E195E5E, 0xB5C22C2C, 0xE9894949, 0xCF12C1C1, 0xBF7E9595, 0xBA207D7D,
-        0xEA641111, 0x77840B0B, 0x396DC5C5, 0xAF6A8989, 0x33D17C7C, 0xC9A17171, 0x62CEFFFF, 0x7137BBBB,
-        0x81FB0F0F, 0x793DB5B5, 0x0951E1E1, 0xADDC3E3E, 0x242D3F3F, 0xCDA47676, 0xF99D5555, 0xD8EE8282,
-        0xE5864040, 0xC5AE7878, 0xB9CD2525, 0x4D049696, 0x44557777, 0x080A0E0E, 0x86135050, 0xE730F7F7,
-        0xA1D33737, 0x1D40FAFA, 0xAA346161, 0xED8C4E4E, 0x06B3B0B0, 0x706C5454, 0xB22A7373, 0xD2523B3B,
-        0x410B9F9F, 0x7B8B0202, 0xA088D8D8, 0x114FF3F3, 0x3167CBCB, 0xC2462727, 0x27C06767, 0x90B4FCFC,
-        0x20283838, 0xF67F0404, 0x60784848, 0xFF2EE5E5, 0x96074C4C, 0x5C4B6565, 0xB1C72B2B, 0xAB6F8E8E,
-        0x9E0D4242, 0x9CBBF5F5, 0x52F2DBDB, 0x1BF34A4A, 0x5FA63D3D, 0x9359A4A4, 0x0ABCB9B9, 0xEF3AF9F9,
-        0x91EF1313, 0x85FE0808, 0x49019191, 0xEE611616, 0x2D7CDEDE, 0x4FB22121, 0x8F42B1B1, 0x3BDB7272,
-        0x47B82F2F, 0x8748BFBF, 0x6D2CAEAE, 0x46E3C0C0, 0xD6573C3C, 0x3E859A9A, 0x6929A9A9, 0x647D4F4F,
-        0x2A948181, 0xCE492E2E, 0xCB17C6C6, 0x2FCA6969, 0xFCC3BDBD, 0x975CA3A3, 0x055EE8E8, 0x7AD0EDED,
-        0xAC87D1D1, 0x7F8E0505, 0xD5BA6464, 0x1AA8A5A5, 0x4BB72626, 0x0EB9BEBE, 0xA7608787, 0x5AF8D5D5,
-        0x28223636, 0x14111B1B, 0x3FDE7575, 0x2979D9D9, 0x88AAEEEE, 0x3C332D2D, 0x4C5F7979, 0x02B6B7B7,
-        0xB896CACA, 0xDA583535, 0xB09CC4C4, 0x17FC4343, 0x551A8484, 0x1FF64D4D, 0x8A1C5959, 0x7D38B2B2,
-        0x57AC3333, 0xC718CFCF, 0x8DF40606, 0x74695353, 0xB7749B9B, 0xC4F59797, 0x9F56ADAD, 0x72DAE3E3,
-        0x7ED5EAEA, 0x154AF4F4, 0x229E8F8F, 0x12A2ABAB, 0x584E6262, 0x07E85F5F, 0x99E51D1D, 0x34392323,
-        0x6EC1F6F6, 0x50446C6C, 0xDE5D3232, 0x68724646, 0x6526A0A0, 0xBC93CDCD, 0xDB03DADA, 0xF8C6BABA,
-        0xC8FA9E9E, 0xA882D6D6, 0x2BCF6E6E, 0x40507070, 0xDCEB8585, 0xFE750A0A, 0x328A9393, 0xA48DDFDF,
-        0xCA4C2929, 0x10141C1C, 0x2173D7D7, 0xF0CCB4B4, 0xD309D4D4, 0x5D108A8A, 0x0FE25151, 0x00000000,
-        0x6F9A1919, 0x9DE01A1A, 0x368F9494, 0x42E6C7C7, 0x4AECC9C9, 0x5EFDD2D2, 0xC1AB7F7F, 0xE0D8A8A8
-    );
-
-    /**
-     * M-Table
-     *
-     * @var array
-     * @access private
-     */
-    var $m2 = array(
-        0xBC75BC32, 0xECF3EC21, 0x20C62043, 0xB3F4B3C9, 0xDADBDA03, 0x027B028B, 0xE2FBE22B, 0x9EC89EFA,
-        0xC94AC9EC, 0xD4D3D409, 0x18E6186B, 0x1E6B1E9F, 0x9845980E, 0xB27DB238, 0xA6E8A6D2, 0x264B26B7,
-        0x3CD63C57, 0x9332938A, 0x82D882EE, 0x52FD5298, 0x7B377BD4, 0xBB71BB37, 0x5BF15B97, 0x47E14783,
-        0x2430243C, 0x510F51E2, 0xBAF8BAC6, 0x4A1B4AF3, 0xBF87BF48, 0x0DFA0D70, 0xB006B0B3, 0x753F75DE,
-        0xD25ED2FD, 0x7DBA7D20, 0x66AE6631, 0x3A5B3AA3, 0x598A591C, 0x00000000, 0xCDBCCD93, 0x1A9D1AE0,
-        0xAE6DAE2C, 0x7FC17FAB, 0x2BB12BC7, 0xBE0EBEB9, 0xE080E0A0, 0x8A5D8A10, 0x3BD23B52, 0x64D564BA,
-        0xD8A0D888, 0xE784E7A5, 0x5F075FE8, 0x1B141B11, 0x2CB52CC2, 0xFC90FCB4, 0x312C3127, 0x80A38065,
-        0x73B2732A, 0x0C730C81, 0x794C795F, 0x6B546B41, 0x4B924B02, 0x53745369, 0x9436948F, 0x8351831F,
-        0x2A382A36, 0xC4B0C49C, 0x22BD22C8, 0xD55AD5F8, 0xBDFCBDC3, 0x48604878, 0xFF62FFCE, 0x4C964C07,
-        0x416C4177, 0xC742C7E6, 0xEBF7EB24, 0x1C101C14, 0x5D7C5D63, 0x36283622, 0x672767C0, 0xE98CE9AF,
-        0x441344F9, 0x149514EA, 0xF59CF5BB, 0xCFC7CF18, 0x3F243F2D, 0xC046C0E3, 0x723B72DB, 0x5470546C,
-        0x29CA294C, 0xF0E3F035, 0x088508FE, 0xC6CBC617, 0xF311F34F, 0x8CD08CE4, 0xA493A459, 0xCAB8CA96,
-        0x68A6683B, 0xB883B84D, 0x38203828, 0xE5FFE52E, 0xAD9FAD56, 0x0B770B84, 0xC8C3C81D, 0x99CC99FF,
-        0x580358ED, 0x196F199A, 0x0E080E0A, 0x95BF957E, 0x70407050, 0xF7E7F730, 0x6E2B6ECF, 0x1FE21F6E,
-        0xB579B53D, 0x090C090F, 0x61AA6134, 0x57825716, 0x9F419F0B, 0x9D3A9D80, 0x11EA1164, 0x25B925CD,
-        0xAFE4AFDD, 0x459A4508, 0xDFA4DF8D, 0xA397A35C, 0xEA7EEAD5, 0x35DA3558, 0xED7AEDD0, 0x431743FC,
-        0xF866F8CB, 0xFB94FBB1, 0x37A137D3, 0xFA1DFA40, 0xC23DC268, 0xB4F0B4CC, 0x32DE325D, 0x9CB39C71,
-        0x560B56E7, 0xE372E3DA, 0x87A78760, 0x151C151B, 0xF9EFF93A, 0x63D163BF, 0x345334A9, 0x9A3E9A85,
-        0xB18FB142, 0x7C337CD1, 0x8826889B, 0x3D5F3DA6, 0xA1ECA1D7, 0xE476E4DF, 0x812A8194, 0x91499101,
-        0x0F810FFB, 0xEE88EEAA, 0x16EE1661, 0xD721D773, 0x97C497F5, 0xA51AA5A8, 0xFEEBFE3F, 0x6DD96DB5,
-        0x78C578AE, 0xC539C56D, 0x1D991DE5, 0x76CD76A4, 0x3EAD3EDC, 0xCB31CB67, 0xB68BB647, 0xEF01EF5B,
-        0x1218121E, 0x602360C5, 0x6ADD6AB0, 0x4D1F4DF6, 0xCE4ECEE9, 0xDE2DDE7C, 0x55F9559D, 0x7E487E5A,
-        0x214F21B2, 0x03F2037A, 0xA065A026, 0x5E8E5E19, 0x5A785A66, 0x655C654B, 0x6258624E, 0xFD19FD45,
-        0x068D06F4, 0x40E54086, 0xF298F2BE, 0x335733AC, 0x17671790, 0x057F058E, 0xE805E85E, 0x4F644F7D,
-        0x89AF896A, 0x10631095, 0x74B6742F, 0x0AFE0A75, 0x5CF55C92, 0x9BB79B74, 0x2D3C2D33, 0x30A530D6,
-        0x2ECE2E49, 0x49E94989, 0x46684672, 0x77447755, 0xA8E0A8D8, 0x964D9604, 0x284328BD, 0xA969A929,
-        0xD929D979, 0x862E8691, 0xD1ACD187, 0xF415F44A, 0x8D598D15, 0xD6A8D682, 0xB90AB9BC, 0x429E420D,
-        0xF66EF6C1, 0x2F472FB8, 0xDDDFDD06, 0x23342339, 0xCC35CC62, 0xF16AF1C4, 0xC1CFC112, 0x85DC85EB,
-        0x8F228F9E, 0x71C971A1, 0x90C090F0, 0xAA9BAA53, 0x018901F1, 0x8BD48BE1, 0x4EED4E8C, 0x8EAB8E6F,
-        0xAB12ABA2, 0x6FA26F3E, 0xE60DE654, 0xDB52DBF2, 0x92BB927B, 0xB702B7B6, 0x692F69CA, 0x39A939D9,
-        0xD3D7D30C, 0xA761A723, 0xA21EA2AD, 0xC3B4C399, 0x6C506C44, 0x07040705, 0x04F6047F, 0x27C22746,
-        0xAC16ACA7, 0xD025D076, 0x50865013, 0xDC56DCF7, 0x8455841A, 0xE109E151, 0x7ABE7A25, 0x139113EF
-    );
-
-    /**
-     * M-Table
-     *
-     * @var array
-     * @access private
-     */
-    var $m3 = array(
-        0xD939A9D9, 0x90176790, 0x719CB371, 0xD2A6E8D2, 0x05070405, 0x9852FD98, 0x6580A365, 0xDFE476DF,
-        0x08459A08, 0x024B9202, 0xA0E080A0, 0x665A7866, 0xDDAFE4DD, 0xB06ADDB0, 0xBF63D1BF, 0x362A3836,
-        0x54E60D54, 0x4320C643, 0x62CC3562, 0xBEF298BE, 0x1E12181E, 0x24EBF724, 0xD7A1ECD7, 0x77416C77,
-        0xBD2843BD, 0x32BC7532, 0xD47B37D4, 0x9B88269B, 0x700DFA70, 0xF94413F9, 0xB1FB94B1, 0x5A7E485A,
-        0x7A03F27A, 0xE48CD0E4, 0x47B68B47, 0x3C24303C, 0xA5E784A5, 0x416B5441, 0x06DDDF06, 0xC56023C5,
-        0x45FD1945, 0xA33A5BA3, 0x68C23D68, 0x158D5915, 0x21ECF321, 0x3166AE31, 0x3E6FA23E, 0x16578216,
-        0x95106395, 0x5BEF015B, 0x4DB8834D, 0x91862E91, 0xB56DD9B5, 0x1F83511F, 0x53AA9B53, 0x635D7C63,
-        0x3B68A63B, 0x3FFEEB3F, 0xD630A5D6, 0x257ABE25, 0xA7AC16A7, 0x0F090C0F, 0x35F0E335, 0x23A76123,
-        0xF090C0F0, 0xAFE98CAF, 0x809D3A80, 0x925CF592, 0x810C7381, 0x27312C27, 0x76D02576, 0xE7560BE7,
-        0x7B92BB7B, 0xE9CE4EE9, 0xF10189F1, 0x9F1E6B9F, 0xA93453A9, 0xC4F16AC4, 0x99C3B499, 0x975BF197,
-        0x8347E183, 0x6B18E66B, 0xC822BDC8, 0x0E98450E, 0x6E1FE26E, 0xC9B3F4C9, 0x2F74B62F, 0xCBF866CB,
-        0xFF99CCFF, 0xEA1495EA, 0xED5803ED, 0xF7DC56F7, 0xE18BD4E1, 0x1B151C1B, 0xADA21EAD, 0x0CD3D70C,
-        0x2BE2FB2B, 0x1DC8C31D, 0x195E8E19, 0xC22CB5C2, 0x8949E989, 0x12C1CF12, 0x7E95BF7E, 0x207DBA20,
-        0x6411EA64, 0x840B7784, 0x6DC5396D, 0x6A89AF6A, 0xD17C33D1, 0xA171C9A1, 0xCEFF62CE, 0x37BB7137,
-        0xFB0F81FB, 0x3DB5793D, 0x51E10951, 0xDC3EADDC, 0x2D3F242D, 0xA476CDA4, 0x9D55F99D, 0xEE82D8EE,
-        0x8640E586, 0xAE78C5AE, 0xCD25B9CD, 0x04964D04, 0x55774455, 0x0A0E080A, 0x13508613, 0x30F7E730,
-        0xD337A1D3, 0x40FA1D40, 0x3461AA34, 0x8C4EED8C, 0xB3B006B3, 0x6C54706C, 0x2A73B22A, 0x523BD252,
-        0x0B9F410B, 0x8B027B8B, 0x88D8A088, 0x4FF3114F, 0x67CB3167, 0x4627C246, 0xC06727C0, 0xB4FC90B4,
-        0x28382028, 0x7F04F67F, 0x78486078, 0x2EE5FF2E, 0x074C9607, 0x4B655C4B, 0xC72BB1C7, 0x6F8EAB6F,
-        0x0D429E0D, 0xBBF59CBB, 0xF2DB52F2, 0xF34A1BF3, 0xA63D5FA6, 0x59A49359, 0xBCB90ABC, 0x3AF9EF3A,
-        0xEF1391EF, 0xFE0885FE, 0x01914901, 0x6116EE61, 0x7CDE2D7C, 0xB2214FB2, 0x42B18F42, 0xDB723BDB,
-        0xB82F47B8, 0x48BF8748, 0x2CAE6D2C, 0xE3C046E3, 0x573CD657, 0x859A3E85, 0x29A96929, 0x7D4F647D,
-        0x94812A94, 0x492ECE49, 0x17C6CB17, 0xCA692FCA, 0xC3BDFCC3, 0x5CA3975C, 0x5EE8055E, 0xD0ED7AD0,
-        0x87D1AC87, 0x8E057F8E, 0xBA64D5BA, 0xA8A51AA8, 0xB7264BB7, 0xB9BE0EB9, 0x6087A760, 0xF8D55AF8,
-        0x22362822, 0x111B1411, 0xDE753FDE, 0x79D92979, 0xAAEE88AA, 0x332D3C33, 0x5F794C5F, 0xB6B702B6,
-        0x96CAB896, 0x5835DA58, 0x9CC4B09C, 0xFC4317FC, 0x1A84551A, 0xF64D1FF6, 0x1C598A1C, 0x38B27D38,
-        0xAC3357AC, 0x18CFC718, 0xF4068DF4, 0x69537469, 0x749BB774, 0xF597C4F5, 0x56AD9F56, 0xDAE372DA,
-        0xD5EA7ED5, 0x4AF4154A, 0x9E8F229E, 0xA2AB12A2, 0x4E62584E, 0xE85F07E8, 0xE51D99E5, 0x39233439,
-        0xC1F66EC1, 0x446C5044, 0x5D32DE5D, 0x72466872, 0x26A06526, 0x93CDBC93, 0x03DADB03, 0xC6BAF8C6,
-        0xFA9EC8FA, 0x82D6A882, 0xCF6E2BCF, 0x50704050, 0xEB85DCEB, 0x750AFE75, 0x8A93328A, 0x8DDFA48D,
-        0x4C29CA4C, 0x141C1014, 0x73D72173, 0xCCB4F0CC, 0x09D4D309, 0x108A5D10, 0xE2510FE2, 0x00000000,
-        0x9A196F9A, 0xE01A9DE0, 0x8F94368F, 0xE6C742E6, 0xECC94AEC, 0xFDD25EFD, 0xAB7FC1AB, 0xD8A8E0D8
-    );
-
-    /**
-     * The Key Schedule Array
-     *
-     * @var array
-     * @access private
-     */
-    var $K = array();
-
-    /**
-     * The Key depended S-Table 0
-     *
-     * @var array
-     * @access private
-     */
-    var $S0 = array();
-
-    /**
-     * The Key depended S-Table 1
-     *
-     * @var array
-     * @access private
-     */
-    var $S1 = array();
-
-    /**
-     * The Key depended S-Table 2
-     *
-     * @var array
-     * @access private
-     */
-    var $S2 = array();
-
-    /**
-     * The Key depended S-Table 3
-     *
-     * @var array
-     * @access private
-     */
-    var $S3 = array();
-
-    /**
-     * Holds the last used key
-     *
-     * @var array
-     * @access private
-     */
-    var $kl;
-
-    /**
-     * The Key Length (in bytes)
-     *
-     * @see Crypt_Twofish::setKeyLength()
-     * @var int
-     * @access private
-     */
-    var $key_length = 16;
-
-    /**
-     * Sets the key length.
-     *
-     * Valid key lengths are 128, 192 or 256 bits
-     *
-     * @access public
-     * @param int $length
-     */
-    function setKeyLength($length)
-    {
-        switch (true) {
-            case $length <= 128:
-                $this->key_length = 16;
-                break;
-            case $length <= 192:
-                $this->key_length = 24;
-                break;
-            default:
-                $this->key_length = 32;
-        }
-
-        parent::setKeyLength($length);
-    }
-
-    /**
-     * Setup the key (expansion)
-     *
-     * @see \phpseclib\Crypt\Base::_setupKey()
-     * @access private
-     */
-    function _setupKey()
-    {
-        if (isset($this->kl['key']) && $this->key === $this->kl['key']) {
-            // already expanded
-            return;
-        }
-        $this->kl = array('key' => $this->key);
-
-        /* Key expanding and generating the key-depended s-boxes */
-        $le_longs = unpack('V*', $this->key);
-        $key = unpack('C*', $this->key);
-        $m0 = $this->m0;
-        $m1 = $this->m1;
-        $m2 = $this->m2;
-        $m3 = $this->m3;
-        $q0 = $this->q0;
-        $q1 = $this->q1;
-
-        $K = $S0 = $S1 = $S2 = $S3 = array();
-
-        switch (strlen($this->key)) {
-            case 16:
-                list($s7, $s6, $s5, $s4) = $this->_mdsrem($le_longs[1], $le_longs[2]);
-                list($s3, $s2, $s1, $s0) = $this->_mdsrem($le_longs[3], $le_longs[4]);
-                for ($i = 0, $j = 1; $i < 40; $i+= 2, $j+= 2) {
-                    $A = $m0[$q0[$q0[$i] ^ $key[ 9]] ^ $key[1]] ^
-                         $m1[$q0[$q1[$i] ^ $key[10]] ^ $key[2]] ^
-                         $m2[$q1[$q0[$i] ^ $key[11]] ^ $key[3]] ^
-                         $m3[$q1[$q1[$i] ^ $key[12]] ^ $key[4]];
-                    $B = $m0[$q0[$q0[$j] ^ $key[13]] ^ $key[5]] ^
-                         $m1[$q0[$q1[$j] ^ $key[14]] ^ $key[6]] ^
-                         $m2[$q1[$q0[$j] ^ $key[15]] ^ $key[7]] ^
-                         $m3[$q1[$q1[$j] ^ $key[16]] ^ $key[8]];
-                    $B = ($B << 8) | ($B >> 24 & 0xff);
-                    $K[] = $A+= $B;
-                    $K[] = (($A+= $B) << 9 | $A >> 23 & 0x1ff);
-                }
-                for ($i = 0; $i < 256; ++$i) {
-                    $S0[$i] = $m0[$q0[$q0[$i] ^ $s4] ^ $s0];
-                    $S1[$i] = $m1[$q0[$q1[$i] ^ $s5] ^ $s1];
-                    $S2[$i] = $m2[$q1[$q0[$i] ^ $s6] ^ $s2];
-                    $S3[$i] = $m3[$q1[$q1[$i] ^ $s7] ^ $s3];
-                }
-                break;
-            case 24:
-                list($sb, $sa, $s9, $s8) = $this->_mdsrem($le_longs[1], $le_longs[2]);
-                list($s7, $s6, $s5, $s4) = $this->_mdsrem($le_longs[3], $le_longs[4]);
-                list($s3, $s2, $s1, $s0) = $this->_mdsrem($le_longs[5], $le_longs[6]);
-                for ($i = 0, $j = 1; $i < 40; $i+= 2, $j+= 2) {
-                    $A = $m0[$q0[$q0[$q1[$i] ^ $key[17]] ^ $key[ 9]] ^ $key[1]] ^
-                         $m1[$q0[$q1[$q1[$i] ^ $key[18]] ^ $key[10]] ^ $key[2]] ^
-                         $m2[$q1[$q0[$q0[$i] ^ $key[19]] ^ $key[11]] ^ $key[3]] ^
-                         $m3[$q1[$q1[$q0[$i] ^ $key[20]] ^ $key[12]] ^ $key[4]];
-                    $B = $m0[$q0[$q0[$q1[$j] ^ $key[21]] ^ $key[13]] ^ $key[5]] ^
-                         $m1[$q0[$q1[$q1[$j] ^ $key[22]] ^ $key[14]] ^ $key[6]] ^
-                         $m2[$q1[$q0[$q0[$j] ^ $key[23]] ^ $key[15]] ^ $key[7]] ^
-                         $m3[$q1[$q1[$q0[$j] ^ $key[24]] ^ $key[16]] ^ $key[8]];
-                    $B = ($B << 8) | ($B >> 24 & 0xff);
-                    $K[] = $A+= $B;
-                    $K[] = (($A+= $B) << 9 | $A >> 23 & 0x1ff);
-                }
-                for ($i = 0; $i < 256; ++$i) {
-                    $S0[$i] = $m0[$q0[$q0[$q1[$i] ^ $s8] ^ $s4] ^ $s0];
-                    $S1[$i] = $m1[$q0[$q1[$q1[$i] ^ $s9] ^ $s5] ^ $s1];
-                    $S2[$i] = $m2[$q1[$q0[$q0[$i] ^ $sa] ^ $s6] ^ $s2];
-                    $S3[$i] = $m3[$q1[$q1[$q0[$i] ^ $sb] ^ $s7] ^ $s3];
-                }
-                break;
-            default: // 32
-                list($sf, $se, $sd, $sc) = $this->_mdsrem($le_longs[1], $le_longs[2]);
-                list($sb, $sa, $s9, $s8) = $this->_mdsrem($le_longs[3], $le_longs[4]);
-                list($s7, $s6, $s5, $s4) = $this->_mdsrem($le_longs[5], $le_longs[6]);
-                list($s3, $s2, $s1, $s0) = $this->_mdsrem($le_longs[7], $le_longs[8]);
-                for ($i = 0, $j = 1; $i < 40; $i+= 2, $j+= 2) {
-                    $A = $m0[$q0[$q0[$q1[$q1[$i] ^ $key[25]] ^ $key[17]] ^ $key[ 9]] ^ $key[1]] ^
-                         $m1[$q0[$q1[$q1[$q0[$i] ^ $key[26]] ^ $key[18]] ^ $key[10]] ^ $key[2]] ^
-                         $m2[$q1[$q0[$q0[$q0[$i] ^ $key[27]] ^ $key[19]] ^ $key[11]] ^ $key[3]] ^
-                         $m3[$q1[$q1[$q0[$q1[$i] ^ $key[28]] ^ $key[20]] ^ $key[12]] ^ $key[4]];
-                    $B = $m0[$q0[$q0[$q1[$q1[$j] ^ $key[29]] ^ $key[21]] ^ $key[13]] ^ $key[5]] ^
-                         $m1[$q0[$q1[$q1[$q0[$j] ^ $key[30]] ^ $key[22]] ^ $key[14]] ^ $key[6]] ^
-                         $m2[$q1[$q0[$q0[$q0[$j] ^ $key[31]] ^ $key[23]] ^ $key[15]] ^ $key[7]] ^
-                         $m3[$q1[$q1[$q0[$q1[$j] ^ $key[32]] ^ $key[24]] ^ $key[16]] ^ $key[8]];
-                    $B = ($B << 8) | ($B >> 24 & 0xff);
-                    $K[] = $A+= $B;
-                    $K[] = (($A+= $B) << 9 | $A >> 23 & 0x1ff);
-                }
-                for ($i = 0; $i < 256; ++$i) {
-                    $S0[$i] = $m0[$q0[$q0[$q1[$q1[$i] ^ $sc] ^ $s8] ^ $s4] ^ $s0];
-                    $S1[$i] = $m1[$q0[$q1[$q1[$q0[$i] ^ $sd] ^ $s9] ^ $s5] ^ $s1];
-                    $S2[$i] = $m2[$q1[$q0[$q0[$q0[$i] ^ $se] ^ $sa] ^ $s6] ^ $s2];
-                    $S3[$i] = $m3[$q1[$q1[$q0[$q1[$i] ^ $sf] ^ $sb] ^ $s7] ^ $s3];
-                }
-        }
-
-        $this->K  = $K;
-        $this->S0 = $S0;
-        $this->S1 = $S1;
-        $this->S2 = $S2;
-        $this->S3 = $S3;
-    }
-
-    /**
-     * _mdsrem function using by the twofish cipher algorithm
-     *
-     * @access private
-     * @param string $A
-     * @param string $B
-     * @return array
-     */
-    function _mdsrem($A, $B)
-    {
-        // No gain by unrolling this loop.
-        for ($i = 0; $i < 8; ++$i) {
-            // Get most significant coefficient.
-            $t = 0xff & ($B >> 24);
-
-            // Shift the others up.
-            $B = ($B << 8) | (0xff & ($A >> 24));
-            $A<<= 8;
-
-            $u = $t << 1;
-
-            // Subtract the modular polynomial on overflow.
-            if ($t & 0x80) {
-                $u^= 0x14d;
-            }
-
-            // Remove t * (a * x^2 + 1).
-            $B ^= $t ^ ($u << 16);
-
-            // Form u = a*t + t/a = t*(a + 1/a).
-            $u^= 0x7fffffff & ($t >> 1);
-
-            // Add the modular polynomial on underflow.
-            if ($t & 0x01) {
-                $u^= 0xa6 ;
-            }
-
-            // Remove t * (a + 1/a) * (x^3 + x).
-            $B^= ($u << 24) | ($u << 8);
-        }
-
-        return array(
-            0xff & $B >> 24,
-            0xff & $B >> 16,
-            0xff & $B >>  8,
-            0xff & $B);
-    }
-
-    /**
-     * Encrypts a block
-     *
-     * @access private
-     * @param string $in
-     * @return string
-     */
-    function _encryptBlock($in)
-    {
-        $S0 = $this->S0;
-        $S1 = $this->S1;
-        $S2 = $this->S2;
-        $S3 = $this->S3;
-        $K  = $this->K;
-
-        $in = unpack("V4", $in);
-        $R0 = $K[0] ^ $in[1];
-        $R1 = $K[1] ^ $in[2];
-        $R2 = $K[2] ^ $in[3];
-        $R3 = $K[3] ^ $in[4];
-
-        $ki = 7;
-        while ($ki < 39) {
-            $t0 = $S0[ $R0        & 0xff] ^
-                  $S1[($R0 >>  8) & 0xff] ^
-                  $S2[($R0 >> 16) & 0xff] ^
-                  $S3[($R0 >> 24) & 0xff];
-            $t1 = $S0[($R1 >> 24) & 0xff] ^
-                  $S1[ $R1        & 0xff] ^
-                  $S2[($R1 >>  8) & 0xff] ^
-                  $S3[($R1 >> 16) & 0xff];
-            $R2^= $t0 + $t1 + $K[++$ki];
-            $R2 = ($R2 >> 1 & 0x7fffffff) | ($R2 << 31);
-            $R3 = ((($R3 >> 31) & 1) | ($R3 << 1)) ^ ($t0 + ($t1 << 1) + $K[++$ki]);
-
-            $t0 = $S0[ $R2        & 0xff] ^
-                  $S1[($R2 >>  8) & 0xff] ^
-                  $S2[($R2 >> 16) & 0xff] ^
-                  $S3[($R2 >> 24) & 0xff];
-            $t1 = $S0[($R3 >> 24) & 0xff] ^
-                  $S1[ $R3        & 0xff] ^
-                  $S2[($R3 >>  8) & 0xff] ^
-                  $S3[($R3 >> 16) & 0xff];
-            $R0^= ($t0 + $t1 + $K[++$ki]);
-            $R0 = ($R0 >> 1 & 0x7fffffff) | ($R0 << 31);
-            $R1 = ((($R1 >> 31) & 1) | ($R1 << 1)) ^ ($t0 + ($t1 << 1) + $K[++$ki]);
-        }
-
-        // @codingStandardsIgnoreStart
-        return pack("V4", $K[4] ^ $R2,
-                          $K[5] ^ $R3,
-                          $K[6] ^ $R0,
-                          $K[7] ^ $R1);
-        // @codingStandardsIgnoreEnd
-    }
-
-    /**
-     * Decrypts a block
-     *
-     * @access private
-     * @param string $in
-     * @return string
-     */
-    function _decryptBlock($in)
-    {
-        $S0 = $this->S0;
-        $S1 = $this->S1;
-        $S2 = $this->S2;
-        $S3 = $this->S3;
-        $K  = $this->K;
-
-        $in = unpack("V4", $in);
-        $R0 = $K[4] ^ $in[1];
-        $R1 = $K[5] ^ $in[2];
-        $R2 = $K[6] ^ $in[3];
-        $R3 = $K[7] ^ $in[4];
-
-        $ki = 40;
-        while ($ki > 8) {
-            $t0 = $S0[$R0       & 0xff] ^
-                  $S1[$R0 >>  8 & 0xff] ^
-                  $S2[$R0 >> 16 & 0xff] ^
-                  $S3[$R0 >> 24 & 0xff];
-            $t1 = $S0[$R1 >> 24 & 0xff] ^
-                  $S1[$R1       & 0xff] ^
-                  $S2[$R1 >>  8 & 0xff] ^
-                  $S3[$R1 >> 16 & 0xff];
-            $R3^= $t0 + ($t1 << 1) + $K[--$ki];
-            $R3 = $R3 >> 1 & 0x7fffffff | $R3 << 31;
-            $R2 = ($R2 >> 31 & 0x1 | $R2 << 1) ^ ($t0 + $t1 + $K[--$ki]);
-
-            $t0 = $S0[$R2       & 0xff] ^
-                  $S1[$R2 >>  8 & 0xff] ^
-                  $S2[$R2 >> 16 & 0xff] ^
-                  $S3[$R2 >> 24 & 0xff];
-            $t1 = $S0[$R3 >> 24 & 0xff] ^
-                  $S1[$R3       & 0xff] ^
-                  $S2[$R3 >>  8 & 0xff] ^
-                  $S3[$R3 >> 16 & 0xff];
-            $R1^= $t0 + ($t1 << 1) + $K[--$ki];
-            $R1 = $R1 >> 1 & 0x7fffffff | $R1 << 31;
-            $R0 = ($R0 >> 31 & 0x1 | $R0 << 1) ^ ($t0 + $t1 + $K[--$ki]);
-        }
-
-        // @codingStandardsIgnoreStart
-        return pack("V4", $K[0] ^ $R2,
-                          $K[1] ^ $R3,
-                          $K[2] ^ $R0,
-                          $K[3] ^ $R1);
-        // @codingStandardsIgnoreEnd
-    }
-
-    /**
-     * Setup the performance-optimized function for de/encrypt()
-     *
-     * @see \phpseclib\Crypt\Base::_setupInlineCrypt()
-     * @access private
-     */
-    function _setupInlineCrypt()
-    {
-        $lambda_functions =& self::_getLambdaFunctions();
-
-        // Max. 10 Ultra-Hi-optimized inline-crypt functions. After that, we'll (still) create very fast code, but not the ultimate fast one.
-        // (Currently, for Crypt_Twofish, one generated $lambda_function cost on php5.5@32bit ~140kb unfreeable mem and ~240kb on php5.5@64bit)
-        $gen_hi_opt_code = (bool)(count($lambda_functions) < 10);
-
-        // Generation of a unique hash for our generated code
-        $code_hash = "Crypt_Twofish, {$this->mode}";
-        if ($gen_hi_opt_code) {
-            $code_hash = str_pad($code_hash, 32) . $this->_hashInlineCryptFunction($this->key);
-        }
-
-        if (!isset($lambda_functions[$code_hash])) {
-            switch (true) {
-                case $gen_hi_opt_code:
-                    $K = $this->K;
-                    $init_crypt = '
-                        static $S0, $S1, $S2, $S3;
-                        if (!$S0) {
-                            for ($i = 0; $i < 256; ++$i) {
-                                $S0[] = (int)$self->S0[$i];
-                                $S1[] = (int)$self->S1[$i];
-                                $S2[] = (int)$self->S2[$i];
-                                $S3[] = (int)$self->S3[$i];
-                            }
-                        }
-                    ';
-                    break;
-                default:
-                    $K   = array();
-                    for ($i = 0; $i < 40; ++$i) {
-                        $K[] = '$K_' . $i;
-                    }
-                    $init_crypt = '
-                        $S0 = $self->S0;
-                        $S1 = $self->S1;
-                        $S2 = $self->S2;
-                        $S3 = $self->S3;
-                        list(' . implode(',', $K) . ') = $self->K;
-                    ';
-            }
-
-            // Generating encrypt code:
-            $encrypt_block = '
-                $in = unpack("V4", $in);
-                $R0 = '.$K[0].' ^ $in[1];
-                $R1 = '.$K[1].' ^ $in[2];
-                $R2 = '.$K[2].' ^ $in[3];
-                $R3 = '.$K[3].' ^ $in[4];
-            ';
-            for ($ki = 7, $i = 0; $i < 8; ++$i) {
-                $encrypt_block.= '
-                    $t0 = $S0[ $R0        & 0xff] ^
-                          $S1[($R0 >>  8) & 0xff] ^
-                          $S2[($R0 >> 16) & 0xff] ^
-                          $S3[($R0 >> 24) & 0xff];
-                    $t1 = $S0[($R1 >> 24) & 0xff] ^
-                          $S1[ $R1        & 0xff] ^
-                          $S2[($R1 >>  8) & 0xff] ^
-                          $S3[($R1 >> 16) & 0xff];
-                    $R2^= ($t0 + $t1 + '.$K[++$ki].');
-                    $R2 = ($R2 >> 1 & 0x7fffffff) | ($R2 << 31);
-                    $R3 = ((($R3 >> 31) & 1) | ($R3 << 1)) ^ ($t0 + ($t1 << 1) + '.$K[++$ki].');
-
-                    $t0 = $S0[ $R2        & 0xff] ^
-                          $S1[($R2 >>  8) & 0xff] ^
-                          $S2[($R2 >> 16) & 0xff] ^
-                          $S3[($R2 >> 24) & 0xff];
-                    $t1 = $S0[($R3 >> 24) & 0xff] ^
-                          $S1[ $R3        & 0xff] ^
-                          $S2[($R3 >>  8) & 0xff] ^
-                          $S3[($R3 >> 16) & 0xff];
-                    $R0^= ($t0 + $t1 + '.$K[++$ki].');
-                    $R0 = ($R0 >> 1 & 0x7fffffff) | ($R0 << 31);
-                    $R1 = ((($R1 >> 31) & 1) | ($R1 << 1)) ^ ($t0 + ($t1 << 1) + '.$K[++$ki].');
-                ';
-            }
-            $encrypt_block.= '
-                $in = pack("V4", '.$K[4].' ^ $R2,
-                                 '.$K[5].' ^ $R3,
-                                 '.$K[6].' ^ $R0,
-                                 '.$K[7].' ^ $R1);
-            ';
-
-            // Generating decrypt code:
-            $decrypt_block = '
-                $in = unpack("V4", $in);
-                $R0 = '.$K[4].' ^ $in[1];
-                $R1 = '.$K[5].' ^ $in[2];
-                $R2 = '.$K[6].' ^ $in[3];
-                $R3 = '.$K[7].' ^ $in[4];
-            ';
-            for ($ki = 40, $i = 0; $i < 8; ++$i) {
-                $decrypt_block.= '
-                    $t0 = $S0[$R0       & 0xff] ^
-                          $S1[$R0 >>  8 & 0xff] ^
-                          $S2[$R0 >> 16 & 0xff] ^
-                          $S3[$R0 >> 24 & 0xff];
-                    $t1 = $S0[$R1 >> 24 & 0xff] ^
-                          $S1[$R1       & 0xff] ^
-                          $S2[$R1 >>  8 & 0xff] ^
-                          $S3[$R1 >> 16 & 0xff];
-                    $R3^= $t0 + ($t1 << 1) + '.$K[--$ki].';
-                    $R3 = $R3 >> 1 & 0x7fffffff | $R3 << 31;
-                    $R2 = ($R2 >> 31 & 0x1 | $R2 << 1) ^ ($t0 + $t1 + '.$K[--$ki].');
-
-                    $t0 = $S0[$R2       & 0xff] ^
-                          $S1[$R2 >>  8 & 0xff] ^
-                          $S2[$R2 >> 16 & 0xff] ^
-                          $S3[$R2 >> 24 & 0xff];
-                    $t1 = $S0[$R3 >> 24 & 0xff] ^
-                          $S1[$R3       & 0xff] ^
-                          $S2[$R3 >>  8 & 0xff] ^
-                          $S3[$R3 >> 16 & 0xff];
-                    $R1^= $t0 + ($t1 << 1) + '.$K[--$ki].';
-                    $R1 = $R1 >> 1 & 0x7fffffff | $R1 << 31;
-                    $R0 = ($R0 >> 31 & 0x1 | $R0 << 1) ^ ($t0 + $t1 + '.$K[--$ki].');
-                ';
-            }
-            $decrypt_block.= '
-                $in = pack("V4", '.$K[0].' ^ $R2,
-                                 '.$K[1].' ^ $R3,
-                                 '.$K[2].' ^ $R0,
-                                 '.$K[3].' ^ $R1);
-            ';
-
-            $lambda_functions[$code_hash] = $this->_createInlineCryptFunction(
-                array(
-                   'init_crypt'    => $init_crypt,
-                   'init_encrypt'  => '',
-                   'init_decrypt'  => '',
-                   'encrypt_block' => $encrypt_block,
-                   'decrypt_block' => $decrypt_block
-                )
-            );
-        }
-        $this->inline_crypt = $lambda_functions[$code_hash];
-    }
-}
diff --git a/mayor-orig/www/include/share/googleapi/phpseclib/phpseclib/phpseclib/File/ANSI.php b/mayor-orig/www/include/share/googleapi/phpseclib/phpseclib/phpseclib/File/ANSI.php
deleted file mode 100644
index 1f3eecb3..00000000
--- a/mayor-orig/www/include/share/googleapi/phpseclib/phpseclib/phpseclib/File/ANSI.php
+++ /dev/null
@@ -1,574 +0,0 @@
-
- * @copyright 2012 Jim Wigginton
- * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
- * @link      http://phpseclib.sourceforge.net
- */
-
-namespace phpseclib\File;
-
-/**
- * Pure-PHP ANSI Decoder
- *
- * @package ANSI
- * @author  Jim Wigginton 
- * @access  public
- */
-class ANSI
-{
-    /**
-     * Max Width
-     *
-     * @var int
-     * @access private
-     */
-    var $max_x;
-
-    /**
-     * Max Height
-     *
-     * @var int
-     * @access private
-     */
-    var $max_y;
-
-    /**
-     * Max History
-     *
-     * @var int
-     * @access private
-     */
-    var $max_history;
-
-    /**
-     * History
-     *
-     * @var array
-     * @access private
-     */
-    var $history;
-
-    /**
-     * History Attributes
-     *
-     * @var array
-     * @access private
-     */
-    var $history_attrs;
-
-    /**
-     * Current Column
-     *
-     * @var int
-     * @access private
-     */
-    var $x;
-
-    /**
-     * Current Row
-     *
-     * @var int
-     * @access private
-     */
-    var $y;
-
-    /**
-     * Old Column
-     *
-     * @var int
-     * @access private
-     */
-    var $old_x;
-
-    /**
-     * Old Row
-     *
-     * @var int
-     * @access private
-     */
-    var $old_y;
-
-    /**
-     * An empty attribute cell
-     *
-     * @var object
-     * @access private
-     */
-    var $base_attr_cell;
-
-    /**
-     * The current attribute cell
-     *
-     * @var object
-     * @access private
-     */
-    var $attr_cell;
-
-    /**
-     * An empty attribute row
-     *
-     * @var array
-     * @access private
-     */
-    var $attr_row;
-
-    /**
-     * The current screen text
-     *
-     * @var array
-     * @access private
-     */
-    var $screen;
-
-    /**
-     * The current screen attributes
-     *
-     * @var array
-     * @access private
-     */
-    var $attrs;
-
-    /**
-     * Current ANSI code
-     *
-     * @var string
-     * @access private
-     */
-    var $ansi;
-
-    /**
-     * Tokenization
-     *
-     * @var array
-     * @access private
-     */
-    var $tokenization;
-
-    /**
-     * Default Constructor.
-     *
-     * @return \phpseclib\File\ANSI
-     * @access public
-     */
-    function __construct()
-    {
-        $attr_cell = new \stdClass();
-        $attr_cell->bold = false;
-        $attr_cell->underline = false;
-        $attr_cell->blink = false;
-        $attr_cell->background = 'black';
-        $attr_cell->foreground = 'white';
-        $attr_cell->reverse = false;
-        $this->base_attr_cell = clone $attr_cell;
-        $this->attr_cell = clone $attr_cell;
-
-        $this->setHistory(200);
-        $this->setDimensions(80, 24);
-    }
-
-    /**
-     * Set terminal width and height
-     *
-     * Resets the screen as well
-     *
-     * @param int $x
-     * @param int $y
-     * @access public
-     */
-    function setDimensions($x, $y)
-    {
-        $this->max_x = $x - 1;
-        $this->max_y = $y - 1;
-        $this->x = $this->y = 0;
-        $this->history = $this->history_attrs = array();
-        $this->attr_row = array_fill(0, $this->max_x + 2, $this->base_attr_cell);
-        $this->screen = array_fill(0, $this->max_y + 1, '');
-        $this->attrs = array_fill(0, $this->max_y + 1, $this->attr_row);
-        $this->ansi = '';
-    }
-
-    /**
-     * Set the number of lines that should be logged past the terminal height
-     *
-     * @param int $x
-     * @param int $y
-     * @access public
-     */
-    function setHistory($history)
-    {
-        $this->max_history = $history;
-    }
-
-    /**
-     * Load a string
-     *
-     * @param string $source
-     * @access public
-     */
-    function loadString($source)
-    {
-        $this->setDimensions($this->max_x + 1, $this->max_y + 1);
-        $this->appendString($source);
-    }
-
-    /**
-     * Appdend a string
-     *
-     * @param string $source
-     * @access public
-     */
-    function appendString($source)
-    {
-        $this->tokenization = array('');
-        for ($i = 0; $i < strlen($source); $i++) {
-            if (strlen($this->ansi)) {
-                $this->ansi.= $source[$i];
-                $chr = ord($source[$i]);
-                // http://en.wikipedia.org/wiki/ANSI_escape_code#Sequence_elements
-                // single character CSI's not currently supported
-                switch (true) {
-                    case $this->ansi == "\x1B=":
-                        $this->ansi = '';
-                        continue 2;
-                    case strlen($this->ansi) == 2 && $chr >= 64 && $chr <= 95 && $chr != ord('['):
-                    case strlen($this->ansi) > 2 && $chr >= 64 && $chr <= 126:
-                        break;
-                    default:
-                        continue 2;
-                }
-                $this->tokenization[] = $this->ansi;
-                $this->tokenization[] = '';
-                // http://ascii-table.com/ansi-escape-sequences-vt-100.php
-                switch ($this->ansi) {
-                    case "\x1B[H": // Move cursor to upper left corner
-                        $this->old_x = $this->x;
-                        $this->old_y = $this->y;
-                        $this->x = $this->y = 0;
-                        break;
-                    case "\x1B[J": // Clear screen from cursor down
-                        $this->history = array_merge($this->history, array_slice(array_splice($this->screen, $this->y + 1), 0, $this->old_y));
-                        $this->screen = array_merge($this->screen, array_fill($this->y, $this->max_y, ''));
-
-                        $this->history_attrs = array_merge($this->history_attrs, array_slice(array_splice($this->attrs, $this->y + 1), 0, $this->old_y));
-                        $this->attrs = array_merge($this->attrs, array_fill($this->y, $this->max_y, $this->attr_row));
-
-                        if (count($this->history) == $this->max_history) {
-                            array_shift($this->history);
-                            array_shift($this->history_attrs);
-                        }
-                    case "\x1B[K": // Clear screen from cursor right
-                        $this->screen[$this->y] = substr($this->screen[$this->y], 0, $this->x);
-
-                        array_splice($this->attrs[$this->y], $this->x + 1, $this->max_x - $this->x, array_fill($this->x, $this->max_x - $this->x - 1, $this->base_attr_cell));
-                        break;
-                    case "\x1B[2K": // Clear entire line
-                        $this->screen[$this->y] = str_repeat(' ', $this->x);
-                        $this->attrs[$this->y] = $this->attr_row;
-                        break;
-                    case "\x1B[?1h": // set cursor key to application
-                    case "\x1B[?25h": // show the cursor
-                    case "\x1B(B": // set united states g0 character set
-                        break;
-                    case "\x1BE": // Move to next line
-                        $this->_newLine();
-                        $this->x = 0;
-                        break;
-                    default:
-                        switch (true) {
-                            case preg_match('#\x1B\[(\d+)B#', $this->ansi, $match): // Move cursor down n lines
-                                $this->old_y = $this->y;
-                                $this->y+= $match[1];
-                                break;
-                            case preg_match('#\x1B\[(\d+);(\d+)H#', $this->ansi, $match): // Move cursor to screen location v,h
-                                $this->old_x = $this->x;
-                                $this->old_y = $this->y;
-                                $this->x = $match[2] - 1;
-                                $this->y = $match[1] - 1;
-                                break;
-                            case preg_match('#\x1B\[(\d+)C#', $this->ansi, $match): // Move cursor right n lines
-                                $this->old_x = $this->x;
-                                $this->x+= $match[1];
-                                break;
-                            case preg_match('#\x1B\[(\d+)D#', $this->ansi, $match): // Move cursor left n lines
-                                $this->old_x = $this->x;
-                                $this->x-= $match[1];
-                                break;
-                            case preg_match('#\x1B\[(\d+);(\d+)r#', $this->ansi, $match): // Set top and bottom lines of a window
-                                break;
-                            case preg_match('#\x1B\[(\d*(?:;\d*)*)m#', $this->ansi, $match): // character attributes
-                                $attr_cell = &$this->attr_cell;
-                                $mods = explode(';', $match[1]);
-                                foreach ($mods as $mod) {
-                                    switch ($mod) {
-                                        case 0: // Turn off character attributes
-                                            $attr_cell = clone $this->base_attr_cell;
-                                            break;
-                                        case 1: // Turn bold mode on
-                                            $attr_cell->bold = true;
-                                            break;
-                                        case 4: // Turn underline mode on
-                                            $attr_cell->underline = true;
-                                            break;
-                                        case 5: // Turn blinking mode on
-                                            $attr_cell->blink = true;
-                                            break;
-                                        case 7: // Turn reverse video on
-                                            $attr_cell->reverse = !$attr_cell->reverse;
-                                            $temp = $attr_cell->background;
-                                            $attr_cell->background = $attr_cell->foreground;
-                                            $attr_cell->foreground = $temp;
-                                            break;
-                                        default: // set colors
-                                            //$front = $attr_cell->reverse ? &$attr_cell->background : &$attr_cell->foreground;
-                                            $front = &$attr_cell->{ $attr_cell->reverse ? 'background' : 'foreground' };
-                                            //$back = $attr_cell->reverse ? &$attr_cell->foreground : &$attr_cell->background;
-                                            $back = &$attr_cell->{ $attr_cell->reverse ? 'foreground' : 'background' };
-                                            switch ($mod) {
-                                                // @codingStandardsIgnoreStart
-                                                case 30: $front = 'black'; break;
-                                                case 31: $front = 'red'; break;
-                                                case 32: $front = 'green'; break;
-                                                case 33: $front = 'yellow'; break;
-                                                case 34: $front = 'blue'; break;
-                                                case 35: $front = 'magenta'; break;
-                                                case 36: $front = 'cyan'; break;
-                                                case 37: $front = 'white'; break;
-
-                                                case 40: $back = 'black'; break;
-                                                case 41: $back = 'red'; break;
-                                                case 42: $back = 'green'; break;
-                                                case 43: $back = 'yellow'; break;
-                                                case 44: $back = 'blue'; break;
-                                                case 45: $back = 'magenta'; break;
-                                                case 46: $back = 'cyan'; break;
-                                                case 47: $back = 'white'; break;
-                                                // @codingStandardsIgnoreEnd
-
-                                                default:
-                                                    //user_error('Unsupported attribute: ' . $mod);
-                                                    $this->ansi = '';
-                                                    break 2;
-                                            }
-                                    }
-                                }
-                                break;
-                            default:
-                                //user_error("{$this->ansi} is unsupported\r\n");
-                        }
-                }
-                $this->ansi = '';
-                continue;
-            }
-
-            $this->tokenization[count($this->tokenization) - 1].= $source[$i];
-            switch ($source[$i]) {
-                case "\r":
-                    $this->x = 0;
-                    break;
-                case "\n":
-                    $this->_newLine();
-                    break;
-                case "\x08": // backspace
-                    if ($this->x) {
-                        $this->x--;
-                        $this->attrs[$this->y][$this->x] = clone $this->base_attr_cell;
-                        $this->screen[$this->y] = substr_replace(
-                            $this->screen[$this->y],
-                            $source[$i],
-                            $this->x,
-                            1
-                        );
-                    }
-                    break;
-                case "\x0F": // shift
-                    break;
-                case "\x1B": // start ANSI escape code
-                    $this->tokenization[count($this->tokenization) - 1] = substr($this->tokenization[count($this->tokenization) - 1], 0, -1);
-                    //if (!strlen($this->tokenization[count($this->tokenization) - 1])) {
-                    //    array_pop($this->tokenization);
-                    //}
-                    $this->ansi.= "\x1B";
-                    break;
-                default:
-                    $this->attrs[$this->y][$this->x] = clone $this->attr_cell;
-                    if ($this->x > strlen($this->screen[$this->y])) {
-                        $this->screen[$this->y] = str_repeat(' ', $this->x);
-                    }
-                    $this->screen[$this->y] = substr_replace(
-                        $this->screen[$this->y],
-                        $source[$i],
-                        $this->x,
-                        1
-                    );
-
-                    if ($this->x > $this->max_x) {
-                        $this->x = 0;
-                        $this->y++;
-                    } else {
-                        $this->x++;
-                    }
-            }
-        }
-    }
-
-    /**
-     * Add a new line
-     *
-     * Also update the $this->screen and $this->history buffers
-     *
-     * @access private
-     */
-    function _newLine()
-    {
-        //if ($this->y < $this->max_y) {
-        //    $this->y++;
-        //}
-
-        while ($this->y >= $this->max_y) {
-            $this->history = array_merge($this->history, array(array_shift($this->screen)));
-            $this->screen[] = '';
-
-            $this->history_attrs = array_merge($this->history_attrs, array(array_shift($this->attrs)));
-            $this->attrs[] = $this->attr_row;
-
-            if (count($this->history) >= $this->max_history) {
-                array_shift($this->history);
-                array_shift($this->history_attrs);
-            }
-
-            $this->y--;
-        }
-        $this->y++;
-    }
-
-    /**
-     * Returns the current coordinate without preformating
-     *
-     * @access private
-     * @return string
-     */
-    function _processCoordinate($last_attr, $cur_attr, $char)
-    {
-        $output = '';
-
-        if ($last_attr != $cur_attr) {
-            $close = $open = '';
-            if ($last_attr->foreground != $cur_attr->foreground) {
-                if ($cur_attr->foreground != 'white') {
-                    $open.= '';
-                }
-                if ($last_attr->foreground != 'white') {
-                    $close = '' . $close;
-                }
-            }
-            if ($last_attr->background != $cur_attr->background) {
-                if ($cur_attr->background != 'black') {
-                    $open.= '';
-                }
-                if ($last_attr->background != 'black') {
-                    $close = '' . $close;
-                }
-            }
-            if ($last_attr->bold != $cur_attr->bold) {
-                if ($cur_attr->bold) {
-                    $open.= '';
-                } else {
-                    $close = '' . $close;
-                }
-            }
-            if ($last_attr->underline != $cur_attr->underline) {
-                if ($cur_attr->underline) {
-                    $open.= '';
-                } else {
-                    $close = '' . $close;
-                }
-            }
-            if ($last_attr->blink != $cur_attr->blink) {
-                if ($cur_attr->blink) {
-                    $open.= '';
-                } else {
-                    $close = '' . $close;
-                }
-            }
-            $output.= $close . $open;
-        }
-
-        $output.= htmlspecialchars($char);
-
-        return $output;
-    }
-
-    /**
-     * Returns the current screen without preformating
-     *
-     * @access private
-     * @return string
-     */
-    function _getScreen()
-    {
-        $output = '';
-        $last_attr = $this->base_attr_cell;
-        for ($i = 0; $i <= $this->max_y; $i++) {
-            for ($j = 0; $j <= $this->max_x; $j++) {
-                $cur_attr = $this->attrs[$i][$j];
-                $output.= $this->_processCoordinate($last_attr, $cur_attr, isset($this->screen[$i][$j]) ? $this->screen[$i][$j] : '');
-                $last_attr = $this->attrs[$i][$j];
-            }
-            $output.= "\r\n";
-        }
-        $output = substr($output, 0, -2);
-        // close any remaining open tags
-        $output.= $this->_processCoordinate($last_attr, $this->base_attr_cell, '');
-        return rtrim($output);
-    }
-
-    /**
-     * Returns the current screen
-     *
-     * @access public
-     * @return string
-     */
-    function getScreen()
-    {
-        return '
' . $this->_getScreen() . '
';
-    }
-
-    /**
-     * Returns the current screen and the x previous lines
-     *
-     * @access public
-     * @return string
-     */
-    function getHistory()
-    {
-        $scrollback = '';
-        $last_attr = $this->base_attr_cell;
-        for ($i = 0; $i < count($this->history); $i++) {
-            for ($j = 0; $j <= $this->max_x + 1; $j++) {
-                $cur_attr = $this->history_attrs[$i][$j];
-                $scrollback.= $this->_processCoordinate($last_attr, $cur_attr, isset($this->history[$i][$j]) ? $this->history[$i][$j] : '');
-                $last_attr = $this->history_attrs[$i][$j];
-            }
-            $scrollback.= "\r\n";
-        }
-        $base_attr_cell = $this->base_attr_cell;
-        $this->base_attr_cell = $last_attr;
-        $scrollback.= $this->_getScreen();
-        $this->base_attr_cell = $base_attr_cell;
-
-        return '
' . $scrollback . '
';
-    }
-}
diff --git a/mayor-orig/www/include/share/googleapi/phpseclib/phpseclib/phpseclib/File/ASN1.php b/mayor-orig/www/include/share/googleapi/phpseclib/phpseclib/phpseclib/File/ASN1.php
deleted file mode 100644
index 504dbe8b..00000000
--- a/mayor-orig/www/include/share/googleapi/phpseclib/phpseclib/phpseclib/File/ASN1.php
+++ /dev/null
@@ -1,1323 +0,0 @@
-
- * @copyright 2012 Jim Wigginton
- * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
- * @link      http://phpseclib.sourceforge.net
- */
-
-namespace phpseclib\File;
-
-use phpseclib\File\ASN1\Element;
-use phpseclib\Math\BigInteger;
-
-/**
- * Pure-PHP ASN.1 Parser
- *
- * @package ASN1
- * @author  Jim Wigginton 
- * @access  public
- */
-class ASN1
-{
-    /**#@+
-     * Tag Classes
-     *
-     * @access private
-     * @link http://www.itu.int/ITU-T/studygroups/com17/languages/X.690-0207.pdf#page=12
-     */
-    const CLASS_UNIVERSAL        = 0;
-    const CLASS_APPLICATION      = 1;
-    const CLASS_CONTEXT_SPECIFIC = 2;
-    const CLASS_PRIVATE          = 3;
-    /**#@-*/
-
-    /**#@+
-     * Tag Classes
-     *
-     * @access private
-     * @link http://www.obj-sys.com/asn1tutorial/node124.html
-    */
-    const TYPE_BOOLEAN           = 1;
-    const TYPE_INTEGER           = 2;
-    const TYPE_BIT_STRING        = 3;
-    const TYPE_OCTET_STRING      = 4;
-    const TYPE_NULL              = 5;
-    const TYPE_OBJECT_IDENTIFIER = 6;
-    //const TYPE_OBJECT_DESCRIPTOR = 7;
-    //const TYPE_INSTANCE_OF       = 8; // EXTERNAL
-    const TYPE_REAL              = 9;
-    const TYPE_ENUMERATED        = 10;
-    //const TYPE_EMBEDDED          = 11;
-    const TYPE_UTF8_STRING       = 12;
-    //const TYPE_RELATIVE_OID      = 13;
-    const TYPE_SEQUENCE          = 16; // SEQUENCE OF
-    const TYPE_SET               = 17; // SET OF
-    /**#@-*/
-    /**#@+
-     * More Tag Classes
-     *
-     * @access private
-     * @link http://www.obj-sys.com/asn1tutorial/node10.html
-    */
-    const TYPE_NUMERIC_STRING   = 18;
-    const TYPE_PRINTABLE_STRING = 19;
-    const TYPE_TELETEX_STRING   = 20; // T61String
-    const TYPE_VIDEOTEX_STRING  = 21;
-    const TYPE_IA5_STRING       = 22;
-    const TYPE_UTC_TIME         = 23;
-    const TYPE_GENERALIZED_TIME = 24;
-    const TYPE_GRAPHIC_STRING   = 25;
-    const TYPE_VISIBLE_STRING   = 26; // ISO646String
-    const TYPE_GENERAL_STRING   = 27;
-    const TYPE_UNIVERSAL_STRING = 28;
-    //const TYPE_CHARACTER_STRING = 29;
-    const TYPE_BMP_STRING       = 30;
-    /**#@-*/
-
-    /**#@+
-     * Tag Aliases
-     *
-     * These tags are kinda place holders for other tags.
-     *
-     * @access private
-    */
-    const TYPE_CHOICE = -1;
-    const TYPE_ANY    = -2;
-    /**#@-*/
-
-    /**
-     * ASN.1 object identifier
-     *
-     * @var array
-     * @access private
-     * @link http://en.wikipedia.org/wiki/Object_identifier
-     */
-    var $oids = array();
-
-    /**
-     * Default date format
-     *
-     * @var string
-     * @access private
-     * @link http://php.net/class.datetime
-     */
-    var $format = 'D, d M Y H:i:s O';
-
-    /**
-     * Default date format
-     *
-     * @var array
-     * @access private
-     * @see self::setTimeFormat()
-     * @see self::asn1map()
-     * @link http://php.net/class.datetime
-     */
-    var $encoded;
-
-    /**
-     * Filters
-     *
-     * If the mapping type is self::TYPE_ANY what do we actually encode it as?
-     *
-     * @var array
-     * @access private
-     * @see self::_encode_der()
-     */
-    var $filters;
-
-    /**
-     * Type mapping table for the ANY type.
-     *
-     * Structured or unknown types are mapped to a \phpseclib\File\ASN1\Element.
-     * Unambiguous types get the direct mapping (int/real/bool).
-     * Others are mapped as a choice, with an extra indexing level.
-     *
-     * @var array
-     * @access public
-     */
-    var $ANYmap = array(
-        self::TYPE_BOOLEAN              => true,
-        self::TYPE_INTEGER              => true,
-        self::TYPE_BIT_STRING           => 'bitString',
-        self::TYPE_OCTET_STRING         => 'octetString',
-        self::TYPE_NULL                 => 'null',
-        self::TYPE_OBJECT_IDENTIFIER    => 'objectIdentifier',
-        self::TYPE_REAL                 => true,
-        self::TYPE_ENUMERATED           => 'enumerated',
-        self::TYPE_UTF8_STRING          => 'utf8String',
-        self::TYPE_NUMERIC_STRING       => 'numericString',
-        self::TYPE_PRINTABLE_STRING     => 'printableString',
-        self::TYPE_TELETEX_STRING       => 'teletexString',
-        self::TYPE_VIDEOTEX_STRING      => 'videotexString',
-        self::TYPE_IA5_STRING           => 'ia5String',
-        self::TYPE_UTC_TIME             => 'utcTime',
-        self::TYPE_GENERALIZED_TIME     => 'generalTime',
-        self::TYPE_GRAPHIC_STRING       => 'graphicString',
-        self::TYPE_VISIBLE_STRING       => 'visibleString',
-        self::TYPE_GENERAL_STRING       => 'generalString',
-        self::TYPE_UNIVERSAL_STRING     => 'universalString',
-        //self::TYPE_CHARACTER_STRING     => 'characterString',
-        self::TYPE_BMP_STRING           => 'bmpString'
-    );
-
-    /**
-     * String type to character size mapping table.
-     *
-     * Non-convertable types are absent from this table.
-     * size == 0 indicates variable length encoding.
-     *
-     * @var array
-     * @access public
-     */
-    var $stringTypeSize = array(
-        self::TYPE_UTF8_STRING      => 0,
-        self::TYPE_BMP_STRING       => 2,
-        self::TYPE_UNIVERSAL_STRING => 4,
-        self::TYPE_PRINTABLE_STRING => 1,
-        self::TYPE_TELETEX_STRING   => 1,
-        self::TYPE_IA5_STRING       => 1,
-        self::TYPE_VISIBLE_STRING   => 1,
-    );
-
-    /**
-     * Parse BER-encoding
-     *
-     * Serves a similar purpose to openssl's asn1parse
-     *
-     * @param string $encoded
-     * @return array
-     * @access public
-     */
-    function decodeBER($encoded)
-    {
-        if ($encoded instanceof Element) {
-            $encoded = $encoded->element;
-        }
-
-        $this->encoded = $encoded;
-        // encapsulate in an array for BC with the old decodeBER
-        return array($this->_decode_ber($encoded));
-    }
-
-    /**
-     * Parse BER-encoding (Helper function)
-     *
-     * Sometimes we want to get the BER encoding of a particular tag.  $start lets us do that without having to reencode.
-     * $encoded is passed by reference for the recursive calls done for self::TYPE_BIT_STRING and
-     * self::TYPE_OCTET_STRING. In those cases, the indefinite length is used.
-     *
-     * @param string $encoded
-     * @param int $start
-     * @param int $encoded_pos
-     * @return array
-     * @access private
-     */
-    function _decode_ber($encoded, $start = 0, $encoded_pos = 0)
-    {
-        $current = array('start' => $start);
-
-        $type = ord($encoded[$encoded_pos++]);
-        $start++;
-
-        $constructed = ($type >> 5) & 1;
-
-        $tag = $type & 0x1F;
-        if ($tag == 0x1F) {
-            $tag = 0;
-            // process septets (since the eighth bit is ignored, it's not an octet)
-            do {
-                $loop = ord($encoded[0]) >> 7;
-                $tag <<= 7;
-                $tag |= ord($encoded[$encoded_pos++]) & 0x7F;
-                $start++;
-            } while ($loop);
-        }
-
-        // Length, as discussed in paragraph 8.1.3 of X.690-0207.pdf#page=13
-        $length = ord($encoded[$encoded_pos++]);
-        $start++;
-        if ($length == 0x80) { // indefinite length
-            // "[A sender shall] use the indefinite form (see 8.1.3.6) if the encoding is constructed and is not all
-            //  immediately available." -- paragraph 8.1.3.2.c
-            $length = strlen($encoded) - $encoded_pos;
-        } elseif ($length & 0x80) { // definite length, long form
-            // technically, the long form of the length can be represented by up to 126 octets (bytes), but we'll only
-            // support it up to four.
-            $length&= 0x7F;
-            $temp = substr($encoded, $encoded_pos, $length);
-            $encoded_pos += $length;
-            // tags of indefinte length don't really have a header length; this length includes the tag
-            $current+= array('headerlength' => $length + 2);
-            $start+= $length;
-            extract(unpack('Nlength', substr(str_pad($temp, 4, chr(0), STR_PAD_LEFT), -4)));
-        } else {
-            $current+= array('headerlength' => 2);
-        }
-
-        if ($length > (strlen($encoded) - $encoded_pos)) {
-            return false;
-        }
-
-        $content = substr($encoded, $encoded_pos, $length);
-        $content_pos = 0;
-
-        // at this point $length can be overwritten. it's only accurate for definite length things as is
-
-        /* Class is UNIVERSAL, APPLICATION, PRIVATE, or CONTEXT-SPECIFIC. The UNIVERSAL class is restricted to the ASN.1
-           built-in types. It defines an application-independent data type that must be distinguishable from all other
-           data types. The other three classes are user defined. The APPLICATION class distinguishes data types that
-           have a wide, scattered use within a particular presentation context. PRIVATE distinguishes data types within
-           a particular organization or country. CONTEXT-SPECIFIC distinguishes members of a sequence or set, the
-           alternatives of a CHOICE, or universally tagged set members. Only the class number appears in braces for this
-           data type; the term CONTEXT-SPECIFIC does not appear.
-
-             -- http://www.obj-sys.com/asn1tutorial/node12.html */
-        $class = ($type >> 6) & 3;
-        switch ($class) {
-            case self::CLASS_APPLICATION:
-            case self::CLASS_PRIVATE:
-            case self::CLASS_CONTEXT_SPECIFIC:
-                if (!$constructed) {
-                    return array(
-                        'type'     => $class,
-                        'constant' => $tag,
-                        'content'  => $content,
-                        'length'   => $length + $start - $current['start']
-                    );
-                }
-
-                $newcontent = array();
-                $remainingLength = $length;
-                while ($remainingLength > 0) {
-                    $temp = $this->_decode_ber($content, $start, $content_pos);
-                    $length = $temp['length'];
-                    // end-of-content octets - see paragraph 8.1.5
-                    if (substr($content, $content_pos + $length, 2) == "\0\0") {
-                        $length+= 2;
-                        $start+= $length;
-                        $newcontent[] = $temp;
-                        break;
-                    }
-                    $start+= $length;
-                    $remainingLength-= $length;
-                    $newcontent[] = $temp;
-                    $content_pos += $length;
-                }
-
-                return array(
-                    'type'     => $class,
-                    'constant' => $tag,
-                    // the array encapsulation is for BC with the old format
-                    'content'  => $newcontent,
-                    // the only time when $content['headerlength'] isn't defined is when the length is indefinite.
-                    // the absence of $content['headerlength'] is how we know if something is indefinite or not.
-                    // technically, it could be defined to be 2 and then another indicator could be used but whatever.
-                    'length'   => $start - $current['start']
-                ) + $current;
-        }
-
-        $current+= array('type' => $tag);
-
-        // decode UNIVERSAL tags
-        switch ($tag) {
-            case self::TYPE_BOOLEAN:
-                // "The contents octets shall consist of a single octet." -- paragraph 8.2.1
-                //if (strlen($content) != 1) {
-                //    return false;
-                //}
-                $current['content'] = (bool) ord($content[$content_pos]);
-                break;
-            case self::TYPE_INTEGER:
-            case self::TYPE_ENUMERATED:
-                $current['content'] = new BigInteger(substr($content, $content_pos), -256);
-                break;
-            case self::TYPE_REAL: // not currently supported
-                return false;
-            case self::TYPE_BIT_STRING:
-                // The initial octet shall encode, as an unsigned binary integer with bit 1 as the least significant bit,
-                // the number of unused bits in the final subsequent octet. The number shall be in the range zero to
-                // seven.
-                if (!$constructed) {
-                    $current['content'] = substr($content, $content_pos);
-                } else {
-                    $temp = $this->_decode_ber($content, $start, $content_pos);
-                    $length-= (strlen($content) - $content_pos);
-                    $last = count($temp) - 1;
-                    for ($i = 0; $i < $last; $i++) {
-                        // all subtags should be bit strings
-                        //if ($temp[$i]['type'] != self::TYPE_BIT_STRING) {
-                        //    return false;
-                        //}
-                        $current['content'].= substr($temp[$i]['content'], 1);
-                    }
-                    // all subtags should be bit strings
-                    //if ($temp[$last]['type'] != self::TYPE_BIT_STRING) {
-                    //    return false;
-                    //}
-                    $current['content'] = $temp[$last]['content'][0] . $current['content'] . substr($temp[$i]['content'], 1);
-                }
-                break;
-            case self::TYPE_OCTET_STRING:
-                if (!$constructed) {
-                    $current['content'] = substr($content, $content_pos);
-                } else {
-                    $current['content'] = '';
-                    $length = 0;
-                    while (substr($content, $content_pos, 2) != "\0\0") {
-                        $temp = $this->_decode_ber($content, $length + $start, $content_pos);
-                        $content_pos += $temp['length'];
-                        // all subtags should be octet strings
-                        //if ($temp['type'] != self::TYPE_OCTET_STRING) {
-                        //    return false;
-                        //}
-                        $current['content'].= $temp['content'];
-                        $length+= $temp['length'];
-                    }
-                    if (substr($content, $content_pos, 2) == "\0\0") {
-                        $length+= 2; // +2 for the EOC
-                    }
-                }
-                break;
-            case self::TYPE_NULL:
-                // "The contents octets shall not contain any octets." -- paragraph 8.8.2
-                //if (strlen($content)) {
-                //    return false;
-                //}
-                break;
-            case self::TYPE_SEQUENCE:
-            case self::TYPE_SET:
-                $offset = 0;
-                $current['content'] = array();
-                $content_len = strlen($content);
-                while ($content_pos < $content_len) {
-                    // if indefinite length construction was used and we have an end-of-content string next
-                    // see paragraphs 8.1.1.3, 8.1.3.2, 8.1.3.6, 8.1.5, and (for an example) 8.6.4.2
-                    if (!isset($current['headerlength']) && substr($content, $content_pos, 2) == "\0\0") {
-                        $length = $offset + 2; // +2 for the EOC
-                        break 2;
-                    }
-                    $temp = $this->_decode_ber($content, $start + $offset, $content_pos);
-                    $content_pos += $temp['length'];
-                    $current['content'][] = $temp;
-                    $offset+= $temp['length'];
-                }
-                break;
-            case self::TYPE_OBJECT_IDENTIFIER:
-                $temp = ord($content[$content_pos++]);
-                $current['content'] = sprintf('%d.%d', floor($temp / 40), $temp % 40);
-                $valuen = 0;
-                // process septets
-                $content_len = strlen($content);
-                while ($content_pos < $content_len) {
-                    $temp = ord($content[$content_pos++]);
-                    $valuen <<= 7;
-                    $valuen |= $temp & 0x7F;
-                    if (~$temp & 0x80) {
-                        $current['content'].= ".$valuen";
-                        $valuen = 0;
-                    }
-                }
-                // the eighth bit of the last byte should not be 1
-                //if ($temp >> 7) {
-                //    return false;
-                //}
-                break;
-            /* Each character string type shall be encoded as if it had been declared:
-               [UNIVERSAL x] IMPLICIT OCTET STRING
-
-                 -- X.690-0207.pdf#page=23 (paragraph 8.21.3)
-
-               Per that, we're not going to do any validation.  If there are any illegal characters in the string,
-               we don't really care */
-            case self::TYPE_NUMERIC_STRING:
-                // 0,1,2,3,4,5,6,7,8,9, and space
-            case self::TYPE_PRINTABLE_STRING:
-                // Upper and lower case letters, digits, space, apostrophe, left/right parenthesis, plus sign, comma,
-                // hyphen, full stop, solidus, colon, equal sign, question mark
-            case self::TYPE_TELETEX_STRING:
-                // The Teletex character set in CCITT's T61, space, and delete
-                // see http://en.wikipedia.org/wiki/Teletex#Character_sets
-            case self::TYPE_VIDEOTEX_STRING:
-                // The Videotex character set in CCITT's T.100 and T.101, space, and delete
-            case self::TYPE_VISIBLE_STRING:
-                // Printing character sets of international ASCII, and space
-            case self::TYPE_IA5_STRING:
-                // International Alphabet 5 (International ASCII)
-            case self::TYPE_GRAPHIC_STRING:
-                // All registered G sets, and space
-            case self::TYPE_GENERAL_STRING:
-                // All registered C and G sets, space and delete
-            case self::TYPE_UTF8_STRING:
-                // ????
-            case self::TYPE_BMP_STRING:
-                $current['content'] = substr($content, $content_pos);
-                break;
-            case self::TYPE_UTC_TIME:
-            case self::TYPE_GENERALIZED_TIME:
-                $current['content'] = $this->_decodeTime(substr($content, $content_pos), $tag);
-            default:
-        }
-
-        $start+= $length;
-
-        // ie. length is the length of the full TLV encoding - it's not just the length of the value
-        return $current + array('length' => $start - $current['start']);
-    }
-
-    /**
-     * ASN.1 Map
-     *
-     * Provides an ASN.1 semantic mapping ($mapping) from a parsed BER-encoding to a human readable format.
-     *
-     * "Special" mappings may be applied on a per tag-name basis via $special.
-     *
-     * @param array $decoded
-     * @param array $mapping
-     * @param array $special
-     * @return array
-     * @access public
-     */
-    function asn1map($decoded, $mapping, $special = array())
-    {
-        if (isset($mapping['explicit']) && is_array($decoded['content'])) {
-            $decoded = $decoded['content'][0];
-        }
-
-        switch (true) {
-            case $mapping['type'] == self::TYPE_ANY:
-                $intype = $decoded['type'];
-                if (isset($decoded['constant']) || !isset($this->ANYmap[$intype]) || (ord($this->encoded[$decoded['start']]) & 0x20)) {
-                    return new Element(substr($this->encoded, $decoded['start'], $decoded['length']));
-                }
-                $inmap = $this->ANYmap[$intype];
-                if (is_string($inmap)) {
-                    return array($inmap => $this->asn1map($decoded, array('type' => $intype) + $mapping, $special));
-                }
-                break;
-            case $mapping['type'] == self::TYPE_CHOICE:
-                foreach ($mapping['children'] as $key => $option) {
-                    switch (true) {
-                        case isset($option['constant']) && $option['constant'] == $decoded['constant']:
-                        case !isset($option['constant']) && $option['type'] == $decoded['type']:
-                            $value = $this->asn1map($decoded, $option, $special);
-                            break;
-                        case !isset($option['constant']) && $option['type'] == self::TYPE_CHOICE:
-                            $v = $this->asn1map($decoded, $option, $special);
-                            if (isset($v)) {
-                                $value = $v;
-                            }
-                    }
-                    if (isset($value)) {
-                        if (isset($special[$key])) {
-                            $value = call_user_func($special[$key], $value);
-                        }
-                        return array($key => $value);
-                    }
-                }
-                return null;
-            case isset($mapping['implicit']):
-            case isset($mapping['explicit']):
-            case $decoded['type'] == $mapping['type']:
-                break;
-            default:
-                // if $decoded['type'] and $mapping['type'] are both strings, but different types of strings,
-                // let it through
-                switch (true) {
-                    case $decoded['type'] < 18: // self::TYPE_NUMERIC_STRING == 18
-                    case $decoded['type'] > 30: // self::TYPE_BMP_STRING == 30
-                    case $mapping['type'] < 18:
-                    case $mapping['type'] > 30:
-                        return null;
-                }
-        }
-
-        if (isset($mapping['implicit'])) {
-            $decoded['type'] = $mapping['type'];
-        }
-
-        switch ($decoded['type']) {
-            case self::TYPE_SEQUENCE:
-                $map = array();
-
-                // ignore the min and max
-                if (isset($mapping['min']) && isset($mapping['max'])) {
-                    $child = $mapping['children'];
-                    foreach ($decoded['content'] as $content) {
-                        if (($map[] = $this->asn1map($content, $child, $special)) === null) {
-                            return null;
-                        }
-                    }
-
-                    return $map;
-                }
-
-                $n = count($decoded['content']);
-                $i = 0;
-
-                foreach ($mapping['children'] as $key => $child) {
-                    $maymatch = $i < $n; // Match only existing input.
-                    if ($maymatch) {
-                        $temp = $decoded['content'][$i];
-
-                        if ($child['type'] != self::TYPE_CHOICE) {
-                            // Get the mapping and input class & constant.
-                            $childClass = $tempClass = self::CLASS_UNIVERSAL;
-                            $constant = null;
-                            if (isset($temp['constant'])) {
-                                $tempClass = isset($temp['class']) ? $temp['class'] : self::CLASS_CONTEXT_SPECIFIC;
-                            }
-                            if (isset($child['class'])) {
-                                $childClass = $child['class'];
-                                $constant = $child['cast'];
-                            } elseif (isset($child['constant'])) {
-                                $childClass = self::CLASS_CONTEXT_SPECIFIC;
-                                $constant = $child['constant'];
-                            }
-
-                            if (isset($constant) && isset($temp['constant'])) {
-                                // Can only match if constants and class match.
-                                $maymatch = $constant == $temp['constant'] && $childClass == $tempClass;
-                            } else {
-                                // Can only match if no constant expected and type matches or is generic.
-                                $maymatch = !isset($child['constant']) && array_search($child['type'], array($temp['type'], self::TYPE_ANY, self::TYPE_CHOICE)) !== false;
-                            }
-                        }
-                    }
-
-                    if ($maymatch) {
-                        // Attempt submapping.
-                        $candidate = $this->asn1map($temp, $child, $special);
-                        $maymatch = $candidate !== null;
-                    }
-
-                    if ($maymatch) {
-                        // Got the match: use it.
-                        if (isset($special[$key])) {
-                            $candidate = call_user_func($special[$key], $candidate);
-                        }
-                        $map[$key] = $candidate;
-                        $i++;
-                    } elseif (isset($child['default'])) {
-                        $map[$key] = $child['default']; // Use default.
-                    } elseif (!isset($child['optional'])) {
-                        return null; // Syntax error.
-                    }
-                }
-
-                // Fail mapping if all input items have not been consumed.
-                return $i < $n ? null: $map;
-
-            // the main diff between sets and sequences is the encapsulation of the foreach in another for loop
-            case self::TYPE_SET:
-                $map = array();
-
-                // ignore the min and max
-                if (isset($mapping['min']) && isset($mapping['max'])) {
-                    $child = $mapping['children'];
-                    foreach ($decoded['content'] as $content) {
-                        if (($map[] = $this->asn1map($content, $child, $special)) === null) {
-                            return null;
-                        }
-                    }
-
-                    return $map;
-                }
-
-                for ($i = 0; $i < count($decoded['content']); $i++) {
-                    $temp = $decoded['content'][$i];
-                    $tempClass = self::CLASS_UNIVERSAL;
-                    if (isset($temp['constant'])) {
-                        $tempClass = isset($temp['class']) ? $temp['class'] : self::CLASS_CONTEXT_SPECIFIC;
-                    }
-
-                    foreach ($mapping['children'] as $key => $child) {
-                        if (isset($map[$key])) {
-                            continue;
-                        }
-                        $maymatch = true;
-                        if ($child['type'] != self::TYPE_CHOICE) {
-                            $childClass = self::CLASS_UNIVERSAL;
-                            $constant = null;
-                            if (isset($child['class'])) {
-                                $childClass = $child['class'];
-                                $constant = $child['cast'];
-                            } elseif (isset($child['constant'])) {
-                                $childClass = self::CLASS_CONTEXT_SPECIFIC;
-                                $constant = $child['constant'];
-                            }
-
-                            if (isset($constant) && isset($temp['constant'])) {
-                                // Can only match if constants and class match.
-                                $maymatch = $constant == $temp['constant'] && $childClass == $tempClass;
-                            } else {
-                                // Can only match if no constant expected and type matches or is generic.
-                                $maymatch = !isset($child['constant']) && array_search($child['type'], array($temp['type'], self::TYPE_ANY, self::TYPE_CHOICE)) !== false;
-                            }
-                        }
-
-                        if ($maymatch) {
-                            // Attempt submapping.
-                            $candidate = $this->asn1map($temp, $child, $special);
-                            $maymatch = $candidate !== null;
-                        }
-
-                        if (!$maymatch) {
-                            break;
-                        }
-
-                        // Got the match: use it.
-                        if (isset($special[$key])) {
-                            $candidate = call_user_func($special[$key], $candidate);
-                        }
-                        $map[$key] = $candidate;
-                        break;
-                    }
-                }
-
-                foreach ($mapping['children'] as $key => $child) {
-                    if (!isset($map[$key])) {
-                        if (isset($child['default'])) {
-                            $map[$key] = $child['default'];
-                        } elseif (!isset($child['optional'])) {
-                            return null;
-                        }
-                    }
-                }
-                return $map;
-            case self::TYPE_OBJECT_IDENTIFIER:
-                return isset($this->oids[$decoded['content']]) ? $this->oids[$decoded['content']] : $decoded['content'];
-            case self::TYPE_UTC_TIME:
-            case self::TYPE_GENERALIZED_TIME:
-                if (isset($mapping['implicit'])) {
-                    $decoded['content'] = $this->_decodeTime($decoded['content'], $decoded['type']);
-                }
-                return @date($this->format, $decoded['content']);
-            case self::TYPE_BIT_STRING:
-                if (isset($mapping['mapping'])) {
-                    $offset = ord($decoded['content'][0]);
-                    $size = (strlen($decoded['content']) - 1) * 8 - $offset;
-                    /*
-                       From X.680-0207.pdf#page=46 (21.7):
-
-                       "When a "NamedBitList" is used in defining a bitstring type ASN.1 encoding rules are free to add (or remove)
-                        arbitrarily any trailing 0 bits to (or from) values that are being encoded or decoded. Application designers should
-                        therefore ensure that different semantics are not associated with such values which differ only in the number of trailing
-                        0 bits."
-                    */
-                    $bits = count($mapping['mapping']) == $size ? array() : array_fill(0, count($mapping['mapping']) - $size, false);
-                    for ($i = strlen($decoded['content']) - 1; $i > 0; $i--) {
-                        $current = ord($decoded['content'][$i]);
-                        for ($j = $offset; $j < 8; $j++) {
-                            $bits[] = (bool) ($current & (1 << $j));
-                        }
-                        $offset = 0;
-                    }
-                    $values = array();
-                    $map = array_reverse($mapping['mapping']);
-                    foreach ($map as $i => $value) {
-                        if ($bits[$i]) {
-                            $values[] = $value;
-                        }
-                    }
-                    return $values;
-                }
-            case self::TYPE_OCTET_STRING:
-                return base64_encode($decoded['content']);
-            case self::TYPE_NULL:
-                return '';
-            case self::TYPE_BOOLEAN:
-                return $decoded['content'];
-            case self::TYPE_NUMERIC_STRING:
-            case self::TYPE_PRINTABLE_STRING:
-            case self::TYPE_TELETEX_STRING:
-            case self::TYPE_VIDEOTEX_STRING:
-            case self::TYPE_IA5_STRING:
-            case self::TYPE_GRAPHIC_STRING:
-            case self::TYPE_VISIBLE_STRING:
-            case self::TYPE_GENERAL_STRING:
-            case self::TYPE_UNIVERSAL_STRING:
-            case self::TYPE_UTF8_STRING:
-            case self::TYPE_BMP_STRING:
-                return $decoded['content'];
-            case self::TYPE_INTEGER:
-            case self::TYPE_ENUMERATED:
-                $temp = $decoded['content'];
-                if (isset($mapping['implicit'])) {
-                    $temp = new BigInteger($decoded['content'], -256);
-                }
-                if (isset($mapping['mapping'])) {
-                    $temp = (int) $temp->toString();
-                    return isset($mapping['mapping'][$temp]) ?
-                        $mapping['mapping'][$temp] :
-                        false;
-                }
-                return $temp;
-        }
-    }
-
-    /**
-     * ASN.1 Encode
-     *
-     * DER-encodes an ASN.1 semantic mapping ($mapping).  Some libraries would probably call this function
-     * an ASN.1 compiler.
-     *
-     * "Special" mappings can be applied via $special.
-     *
-     * @param string $source
-     * @param string $mapping
-     * @param int $idx
-     * @return string
-     * @access public
-     */
-    function encodeDER($source, $mapping, $special = array())
-    {
-        $this->location = array();
-        return $this->_encode_der($source, $mapping, null, $special);
-    }
-
-    /**
-     * ASN.1 Encode (Helper function)
-     *
-     * @param string $source
-     * @param string $mapping
-     * @param int $idx
-     * @return string
-     * @access private
-     */
-    function _encode_der($source, $mapping, $idx = null, $special = array())
-    {
-        if ($source instanceof Element) {
-            return $source->element;
-        }
-
-        // do not encode (implicitly optional) fields with value set to default
-        if (isset($mapping['default']) && $source === $mapping['default']) {
-            return '';
-        }
-
-        if (isset($idx)) {
-            if (isset($special[$idx])) {
-                $source = call_user_func($special[$idx], $source);
-            }
-            $this->location[] = $idx;
-        }
-
-        $tag = $mapping['type'];
-
-        switch ($tag) {
-            case self::TYPE_SET:    // Children order is not important, thus process in sequence.
-            case self::TYPE_SEQUENCE:
-                $tag|= 0x20; // set the constructed bit
-
-                // ignore the min and max
-                if (isset($mapping['min']) && isset($mapping['max'])) {
-                    $value = array();
-                    $child = $mapping['children'];
-
-                    foreach ($source as $content) {
-                        $temp = $this->_encode_der($content, $child, null, $special);
-                        if ($temp === false) {
-                            return false;
-                        }
-                        $value[]= $temp;
-                    }
-                    /* "The encodings of the component values of a set-of value shall appear in ascending order, the encodings being compared
-                        as octet strings with the shorter components being padded at their trailing end with 0-octets.
-                        NOTE - The padding octets are for comparison purposes only and do not appear in the encodings."
-
-                       -- sec 11.6 of http://www.itu.int/ITU-T/studygroups/com17/languages/X.690-0207.pdf  */
-                    if ($mapping['type'] == self::TYPE_SET) {
-                        sort($value);
-                    }
-                    $value = implode($value, '');
-                    break;
-                }
-
-                $value = '';
-                foreach ($mapping['children'] as $key => $child) {
-                    if (!array_key_exists($key, $source)) {
-                        if (!isset($child['optional'])) {
-                            return false;
-                        }
-                        continue;
-                    }
-
-                    $temp = $this->_encode_der($source[$key], $child, $key, $special);
-                    if ($temp === false) {
-                        return false;
-                    }
-
-                    // An empty child encoding means it has been optimized out.
-                    // Else we should have at least one tag byte.
-                    if ($temp === '') {
-                        continue;
-                    }
-
-                    // if isset($child['constant']) is true then isset($child['optional']) should be true as well
-                    if (isset($child['constant'])) {
-                        /*
-                           From X.680-0207.pdf#page=58 (30.6):
-
-                           "The tagging construction specifies explicit tagging if any of the following holds:
-                            ...
-                            c) the "Tag Type" alternative is used and the value of "TagDefault" for the module is IMPLICIT TAGS or
-                            AUTOMATIC TAGS, but the type defined by "Type" is an untagged choice type, an untagged open type, or
-                            an untagged "DummyReference" (see ITU-T Rec. X.683 | ISO/IEC 8824-4, 8.3)."
-                         */
-                        if (isset($child['explicit']) || $child['type'] == self::TYPE_CHOICE) {
-                            $subtag = chr((self::CLASS_CONTEXT_SPECIFIC << 6) | 0x20 | $child['constant']);
-                            $temp = $subtag . $this->_encodeLength(strlen($temp)) . $temp;
-                        } else {
-                            $subtag = chr((self::CLASS_CONTEXT_SPECIFIC << 6) | (ord($temp[0]) & 0x20) | $child['constant']);
-                            $temp = $subtag . substr($temp, 1);
-                        }
-                    }
-                    $value.= $temp;
-                }
-                break;
-            case self::TYPE_CHOICE:
-                $temp = false;
-
-                foreach ($mapping['children'] as $key => $child) {
-                    if (!isset($source[$key])) {
-                        continue;
-                    }
-
-                    $temp = $this->_encode_der($source[$key], $child, $key, $special);
-                    if ($temp === false) {
-                        return false;
-                    }
-
-                    // An empty child encoding means it has been optimized out.
-                    // Else we should have at least one tag byte.
-                    if ($temp === '') {
-                        continue;
-                    }
-
-                    $tag = ord($temp[0]);
-
-                    // if isset($child['constant']) is true then isset($child['optional']) should be true as well
-                    if (isset($child['constant'])) {
-                        if (isset($child['explicit']) || $child['type'] == self::TYPE_CHOICE) {
-                            $subtag = chr((self::CLASS_CONTEXT_SPECIFIC << 6) | 0x20 | $child['constant']);
-                            $temp = $subtag . $this->_encodeLength(strlen($temp)) . $temp;
-                        } else {
-                            $subtag = chr((self::CLASS_CONTEXT_SPECIFIC << 6) | (ord($temp[0]) & 0x20) | $child['constant']);
-                            $temp = $subtag . substr($temp, 1);
-                        }
-                    }
-                }
-
-                if (isset($idx)) {
-                    array_pop($this->location);
-                }
-
-                if ($temp && isset($mapping['cast'])) {
-                    $temp[0] = chr(($mapping['class'] << 6) | ($tag & 0x20) | $mapping['cast']);
-                }
-
-                return $temp;
-            case self::TYPE_INTEGER:
-            case self::TYPE_ENUMERATED:
-                if (!isset($mapping['mapping'])) {
-                    if (is_numeric($source)) {
-                        $source = new BigInteger($source);
-                    }
-                    $value = $source->toBytes(true);
-                } else {
-                    $value = array_search($source, $mapping['mapping']);
-                    if ($value === false) {
-                        return false;
-                    }
-                    $value = new BigInteger($value);
-                    $value = $value->toBytes(true);
-                }
-                if (!strlen($value)) {
-                    $value = chr(0);
-                }
-                break;
-            case self::TYPE_UTC_TIME:
-            case self::TYPE_GENERALIZED_TIME:
-                $format = $mapping['type'] == self::TYPE_UTC_TIME ? 'y' : 'Y';
-                $format.= 'mdHis';
-                $value = @gmdate($format, strtotime($source)) . 'Z';
-                break;
-            case self::TYPE_BIT_STRING:
-                if (isset($mapping['mapping'])) {
-                    $bits = array_fill(0, count($mapping['mapping']), 0);
-                    $size = 0;
-                    for ($i = 0; $i < count($mapping['mapping']); $i++) {
-                        if (in_array($mapping['mapping'][$i], $source)) {
-                            $bits[$i] = 1;
-                            $size = $i;
-                        }
-                    }
-
-                    if (isset($mapping['min']) && $mapping['min'] >= 1 && $size < $mapping['min']) {
-                        $size = $mapping['min'] - 1;
-                    }
-
-                    $offset = 8 - (($size + 1) & 7);
-                    $offset = $offset !== 8 ? $offset : 0;
-
-                    $value = chr($offset);
-
-                    for ($i = $size + 1; $i < count($mapping['mapping']); $i++) {
-                        unset($bits[$i]);
-                    }
-
-                    $bits = implode('', array_pad($bits, $size + $offset + 1, 0));
-                    $bytes = explode(' ', rtrim(chunk_split($bits, 8, ' ')));
-                    foreach ($bytes as $byte) {
-                        $value.= chr(bindec($byte));
-                    }
-
-                    break;
-                }
-            case self::TYPE_OCTET_STRING:
-                /* The initial octet shall encode, as an unsigned binary integer with bit 1 as the least significant bit,
-                   the number of unused bits in the final subsequent octet. The number shall be in the range zero to seven.
-
-                   -- http://www.itu.int/ITU-T/studygroups/com17/languages/X.690-0207.pdf#page=16 */
-                $value = base64_decode($source);
-                break;
-            case self::TYPE_OBJECT_IDENTIFIER:
-                $oid = preg_match('#(?:\d+\.)+#', $source) ? $source : array_search($source, $this->oids);
-                if ($oid === false) {
-                    user_error('Invalid OID');
-                    return false;
-                }
-                $value = '';
-                $parts = explode('.', $oid);
-                $value = chr(40 * $parts[0] + $parts[1]);
-                for ($i = 2; $i < count($parts); $i++) {
-                    $temp = '';
-                    if (!$parts[$i]) {
-                        $temp = "\0";
-                    } else {
-                        while ($parts[$i]) {
-                            $temp = chr(0x80 | ($parts[$i] & 0x7F)) . $temp;
-                            $parts[$i] >>= 7;
-                        }
-                        $temp[strlen($temp) - 1] = $temp[strlen($temp) - 1] & chr(0x7F);
-                    }
-                    $value.= $temp;
-                }
-                break;
-            case self::TYPE_ANY:
-                $loc = $this->location;
-                if (isset($idx)) {
-                    array_pop($this->location);
-                }
-
-                switch (true) {
-                    case !isset($source):
-                        return $this->_encode_der(null, array('type' => self::TYPE_NULL) + $mapping, null, $special);
-                    case is_int($source):
-                    case $source instanceof BigInteger:
-                        return $this->_encode_der($source, array('type' => self::TYPE_INTEGER) + $mapping, null, $special);
-                    case is_float($source):
-                        return $this->_encode_der($source, array('type' => self::TYPE_REAL) + $mapping, null, $special);
-                    case is_bool($source):
-                        return $this->_encode_der($source, array('type' => self::TYPE_BOOLEAN) + $mapping, null, $special);
-                    case is_array($source) && count($source) == 1:
-                        $typename = implode('', array_keys($source));
-                        $outtype = array_search($typename, $this->ANYmap, true);
-                        if ($outtype !== false) {
-                            return $this->_encode_der($source[$typename], array('type' => $outtype) + $mapping, null, $special);
-                        }
-                }
-
-                $filters = $this->filters;
-                foreach ($loc as $part) {
-                    if (!isset($filters[$part])) {
-                        $filters = false;
-                        break;
-                    }
-                    $filters = $filters[$part];
-                }
-                if ($filters === false) {
-                    user_error('No filters defined for ' . implode('/', $loc));
-                    return false;
-                }
-                return $this->_encode_der($source, $filters + $mapping, null, $special);
-            case self::TYPE_NULL:
-                $value = '';
-                break;
-            case self::TYPE_NUMERIC_STRING:
-            case self::TYPE_TELETEX_STRING:
-            case self::TYPE_PRINTABLE_STRING:
-            case self::TYPE_UNIVERSAL_STRING:
-            case self::TYPE_UTF8_STRING:
-            case self::TYPE_BMP_STRING:
-            case self::TYPE_IA5_STRING:
-            case self::TYPE_VISIBLE_STRING:
-            case self::TYPE_VIDEOTEX_STRING:
-            case self::TYPE_GRAPHIC_STRING:
-            case self::TYPE_GENERAL_STRING:
-                $value = $source;
-                break;
-            case self::TYPE_BOOLEAN:
-                $value = $source ? "\xFF" : "\x00";
-                break;
-            default:
-                user_error('Mapping provides no type definition for ' . implode('/', $this->location));
-                return false;
-        }
-
-        if (isset($idx)) {
-            array_pop($this->location);
-        }
-
-        if (isset($mapping['cast'])) {
-            if (isset($mapping['explicit']) || $mapping['type'] == self::TYPE_CHOICE) {
-                $value = chr($tag) . $this->_encodeLength(strlen($value)) . $value;
-                $tag = ($mapping['class'] << 6) | 0x20 | $mapping['cast'];
-            } else {
-                $tag = ($mapping['class'] << 6) | (ord($temp[0]) & 0x20) | $mapping['cast'];
-            }
-        }
-
-        return chr($tag) . $this->_encodeLength(strlen($value)) . $value;
-    }
-
-    /**
-     * DER-encode the length
-     *
-     * DER supports lengths up to (2**8)**127, however, we'll only support lengths up to (2**8)**4.  See
-     * {@link http://itu.int/ITU-T/studygroups/com17/languages/X.690-0207.pdf#p=13 X.690 paragraph 8.1.3} for more information.
-     *
-     * @access private
-     * @param int $length
-     * @return string
-     */
-    function _encodeLength($length)
-    {
-        if ($length <= 0x7F) {
-            return chr($length);
-        }
-
-        $temp = ltrim(pack('N', $length), chr(0));
-        return pack('Ca*', 0x80 | strlen($temp), $temp);
-    }
-
-    /**
-     * BER-decode the time
-     *
-     * Called by _decode_ber() and in the case of implicit tags asn1map().
-     *
-     * @access private
-     * @param string $content
-     * @param int $tag
-     * @return string
-     */
-    function _decodeTime($content, $tag)
-    {
-        /* UTCTime:
-           http://tools.ietf.org/html/rfc5280#section-4.1.2.5.1
-           http://www.obj-sys.com/asn1tutorial/node15.html
-
-           GeneralizedTime:
-           http://tools.ietf.org/html/rfc5280#section-4.1.2.5.2
-           http://www.obj-sys.com/asn1tutorial/node14.html */
-
-        $pattern = $tag == self::TYPE_UTC_TIME ?
-            '#^(..)(..)(..)(..)(..)(..)?(.*)$#' :
-            '#(....)(..)(..)(..)(..)(..).*([Z+-].*)$#';
-
-        preg_match($pattern, $content, $matches);
-
-        list(, $year, $month, $day, $hour, $minute, $second, $timezone) = $matches;
-
-        if ($tag == self::TYPE_UTC_TIME) {
-            $year = $year >= 50 ? "19$year" : "20$year";
-        }
-
-        if ($timezone == 'Z') {
-            $mktime = 'gmmktime';
-            $timezone = 0;
-        } elseif (preg_match('#([+-])(\d\d)(\d\d)#', $timezone, $matches)) {
-            $mktime = 'gmmktime';
-            $timezone = 60 * $matches[3] + 3600 * $matches[2];
-            if ($matches[1] == '-') {
-                $timezone = -$timezone;
-            }
-        } else {
-            $mktime = 'mktime';
-            $timezone = 0;
-        }
-
-        return @$mktime((int)$hour, (int)$minute, (int)$second, (int)$month, (int)$day, (int)$year) + $timezone;
-    }
-
-    /**
-     * Set the time format
-     *
-     * Sets the time / date format for asn1map().
-     *
-     * @access public
-     * @param string $format
-     */
-    function setTimeFormat($format)
-    {
-        $this->format = $format;
-    }
-
-    /**
-     * Load OIDs
-     *
-     * Load the relevant OIDs for a particular ASN.1 semantic mapping.
-     *
-     * @access public
-     * @param array $oids
-     */
-    function loadOIDs($oids)
-    {
-        $this->oids = $oids;
-    }
-
-    /**
-     * Load filters
-     *
-     * See \phpseclib\File\X509, etc, for an example.
-     *
-     * @access public
-     * @param array $filters
-     */
-    function loadFilters($filters)
-    {
-        $this->filters = $filters;
-    }
-
-    /**
-     * String Shift
-     *
-     * Inspired by array_shift
-     *
-     * @param string $string
-     * @param int $index
-     * @return string
-     * @access private
-     */
-    function _string_shift(&$string, $index = 1)
-    {
-        $substr = substr($string, 0, $index);
-        $string = substr($string, $index);
-        return $substr;
-    }
-
-    /**
-     * String type conversion
-     *
-     * This is a lazy conversion, dealing only with character size.
-     * No real conversion table is used.
-     *
-     * @param string $in
-     * @param int $from
-     * @param int $to
-     * @return string
-     * @access public
-     */
-    function convert($in, $from = self::TYPE_UTF8_STRING, $to = self::TYPE_UTF8_STRING)
-    {
-        if (!isset($this->stringTypeSize[$from]) || !isset($this->stringTypeSize[$to])) {
-            return false;
-        }
-        $insize = $this->stringTypeSize[$from];
-        $outsize = $this->stringTypeSize[$to];
-        $inlength = strlen($in);
-        $out = '';
-
-        for ($i = 0; $i < $inlength;) {
-            if ($inlength - $i < $insize) {
-                return false;
-            }
-
-            // Get an input character as a 32-bit value.
-            $c = ord($in[$i++]);
-            switch (true) {
-                case $insize == 4:
-                    $c = ($c << 8) | ord($in[$i++]);
-                    $c = ($c << 8) | ord($in[$i++]);
-                case $insize == 2:
-                    $c = ($c << 8) | ord($in[$i++]);
-                case $insize == 1:
-                    break;
-                case ($c & 0x80) == 0x00:
-                    break;
-                case ($c & 0x40) == 0x00:
-                    return false;
-                default:
-                    $bit = 6;
-                    do {
-                        if ($bit > 25 || $i >= $inlength || (ord($in[$i]) & 0xC0) != 0x80) {
-                            return false;
-                        }
-                        $c = ($c << 6) | (ord($in[$i++]) & 0x3F);
-                        $bit += 5;
-                        $mask = 1 << $bit;
-                    } while ($c & $bit);
-                    $c &= $mask - 1;
-                    break;
-            }
-
-            // Convert and append the character to output string.
-            $v = '';
-            switch (true) {
-                case $outsize == 4:
-                    $v .= chr($c & 0xFF);
-                    $c >>= 8;
-                    $v .= chr($c & 0xFF);
-                    $c >>= 8;
-                case $outsize == 2:
-                    $v .= chr($c & 0xFF);
-                    $c >>= 8;
-                case $outsize == 1:
-                    $v .= chr($c & 0xFF);
-                    $c >>= 8;
-                    if ($c) {
-                        return false;
-                    }
-                    break;
-                case ($c & 0x80000000) != 0:
-                    return false;
-                case $c >= 0x04000000:
-                    $v .= chr(0x80 | ($c & 0x3F));
-                    $c = ($c >> 6) | 0x04000000;
-                case $c >= 0x00200000:
-                    $v .= chr(0x80 | ($c & 0x3F));
-                    $c = ($c >> 6) | 0x00200000;
-                case $c >= 0x00010000:
-                    $v .= chr(0x80 | ($c & 0x3F));
-                    $c = ($c >> 6) | 0x00010000;
-                case $c >= 0x00000800:
-                    $v .= chr(0x80 | ($c & 0x3F));
-                    $c = ($c >> 6) | 0x00000800;
-                case $c >= 0x00000080:
-                    $v .= chr(0x80 | ($c & 0x3F));
-                    $c = ($c >> 6) | 0x000000C0;
-                default:
-                    $v .= chr($c);
-                    break;
-            }
-            $out .= strrev($v);
-        }
-        return $out;
-    }
-}
diff --git a/mayor-orig/www/include/share/googleapi/phpseclib/phpseclib/phpseclib/File/ASN1/Element.php b/mayor-orig/www/include/share/googleapi/phpseclib/phpseclib/phpseclib/File/ASN1/Element.php
deleted file mode 100644
index 68246e2b..00000000
--- a/mayor-orig/www/include/share/googleapi/phpseclib/phpseclib/phpseclib/File/ASN1/Element.php
+++ /dev/null
@@ -1,47 +0,0 @@
-
- * @copyright 2012 Jim Wigginton
- * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
- * @link      http://phpseclib.sourceforge.net
- */
-
-namespace phpseclib\File\ASN1;
-
-/**
- * ASN.1 Element
- *
- * Bypass normal encoding rules in phpseclib\File\ASN1::encodeDER()
- *
- * @package ASN1
- * @author  Jim Wigginton 
- * @access  public
- */
-class Element
-{
-    /**
-     * Raw element value
-     *
-     * @var string
-     * @access private
-     */
-    var $element;
-
-    /**
-     * Constructor
-     *
-     * @param string $encoded
-     * @return \phpseclib\File\ASN1\Element
-     * @access public
-     */
-    function __construct($encoded)
-    {
-        $this->element = $encoded;
-    }
-}
diff --git a/mayor-orig/www/include/share/googleapi/phpseclib/phpseclib/phpseclib/File/X509.php b/mayor-orig/www/include/share/googleapi/phpseclib/phpseclib/phpseclib/File/X509.php
deleted file mode 100644
index 9a70457b..00000000
--- a/mayor-orig/www/include/share/googleapi/phpseclib/phpseclib/phpseclib/File/X509.php
+++ /dev/null
@@ -1,4823 +0,0 @@
-
- * @copyright 2012 Jim Wigginton
- * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
- * @link      http://phpseclib.sourceforge.net
- */
-
-namespace phpseclib\File;
-
-use phpseclib\Crypt\Hash;
-use phpseclib\Crypt\Random;
-use phpseclib\Crypt\RSA;
-use phpseclib\File\ASN1\Element;
-use phpseclib\Math\BigInteger;
-
-/**
- * Pure-PHP X.509 Parser
- *
- * @package X509
- * @author  Jim Wigginton 
- * @access  public
- */
-class X509
-{
-    /**
-     * Flag to only accept signatures signed by certificate authorities
-     *
-     * Not really used anymore but retained all the same to suppress E_NOTICEs from old installs
-     *
-     * @access public
-     */
-    const VALIDATE_SIGNATURE_BY_CA = 1;
-
-    /**#@+
-     * @access public
-     * @see \phpseclib\File\X509::getDN()
-    */
-    /**
-     * Return internal array representation
-     */
-    const DN_ARRAY = 0;
-    /**
-     * Return string
-     */
-    const DN_STRING = 1;
-    /**
-     * Return ASN.1 name string
-     */
-    const DN_ASN1 = 2;
-    /**
-     * Return OpenSSL compatible array
-     */
-    const DN_OPENSSL = 3;
-    /**
-     * Return canonical ASN.1 RDNs string
-     */
-    const DN_CANON = 4;
-    /**
-     * Return name hash for file indexing
-     */
-    const DN_HASH = 5;
-    /**#@-*/
-
-    /**#@+
-     * @access public
-     * @see \phpseclib\File\X509::saveX509()
-     * @see \phpseclib\File\X509::saveCSR()
-     * @see \phpseclib\File\X509::saveCRL()
-    */
-    /**
-     * Save as PEM
-     *
-     * ie. a base64-encoded PEM with a header and a footer
-     */
-    const FORMAT_PEM = 0;
-    /**
-     * Save as DER
-     */
-    const FORMAT_DER = 1;
-    /**
-     * Save as a SPKAC
-     *
-     * Only works on CSRs. Not currently supported.
-     */
-    const FORMAT_SPKAC = 2;
-    /**
-     * Auto-detect the format
-     *
-     * Used only by the load*() functions
-     */
-    const FORMAT_AUTO_DETECT = 3;
-    /**#@-*/
-
-    /**
-     * Attribute value disposition.
-     * If disposition is >= 0, this is the index of the target value.
-     */
-    const ATTR_ALL = -1; // All attribute values (array).
-    const ATTR_APPEND = -2; // Add a value.
-    const ATTR_REPLACE = -3; // Clear first, then add a value.
-
-    /**
-     * ASN.1 syntax for X.509 certificates
-     *
-     * @var array
-     * @access private
-     */
-    var $Certificate;
-
-    /**#@+
-     * ASN.1 syntax for various extensions
-     *
-     * @access private
-     */
-    var $DirectoryString;
-    var $PKCS9String;
-    var $AttributeValue;
-    var $Extensions;
-    var $KeyUsage;
-    var $ExtKeyUsageSyntax;
-    var $BasicConstraints;
-    var $KeyIdentifier;
-    var $CRLDistributionPoints;
-    var $AuthorityKeyIdentifier;
-    var $CertificatePolicies;
-    var $AuthorityInfoAccessSyntax;
-    var $SubjectAltName;
-    var $SubjectDirectoryAttributes;
-    var $PrivateKeyUsagePeriod;
-    var $IssuerAltName;
-    var $PolicyMappings;
-    var $NameConstraints;
-
-    var $CPSuri;
-    var $UserNotice;
-
-    var $netscape_cert_type;
-    var $netscape_comment;
-    var $netscape_ca_policy_url;
-
-    var $Name;
-    var $RelativeDistinguishedName;
-    var $CRLNumber;
-    var $CRLReason;
-    var $IssuingDistributionPoint;
-    var $InvalidityDate;
-    var $CertificateIssuer;
-    var $HoldInstructionCode;
-    var $SignedPublicKeyAndChallenge;
-    /**#@-*/
-
-    /**#@+
-     * ASN.1 syntax for various DN attributes
-     *
-     * @access private
-     */
-    var $PostalAddress;
-    /**#@-*/
-
-    /**
-     * ASN.1 syntax for Certificate Signing Requests (RFC2986)
-     *
-     * @var array
-     * @access private
-     */
-    var $CertificationRequest;
-
-    /**
-     * ASN.1 syntax for Certificate Revocation Lists (RFC5280)
-     *
-     * @var array
-     * @access private
-     */
-    var $CertificateList;
-
-    /**
-     * Distinguished Name
-     *
-     * @var array
-     * @access private
-     */
-    var $dn;
-
-    /**
-     * Public key
-     *
-     * @var string
-     * @access private
-     */
-    var $publicKey;
-
-    /**
-     * Private key
-     *
-     * @var string
-     * @access private
-     */
-    var $privateKey;
-
-    /**
-     * Object identifiers for X.509 certificates
-     *
-     * @var array
-     * @access private
-     * @link http://en.wikipedia.org/wiki/Object_identifier
-     */
-    var $oids;
-
-    /**
-     * The certificate authorities
-     *
-     * @var array
-     * @access private
-     */
-    var $CAs;
-
-    /**
-     * The currently loaded certificate
-     *
-     * @var array
-     * @access private
-     */
-    var $currentCert;
-
-    /**
-     * The signature subject
-     *
-     * There's no guarantee \phpseclib\File\X509 is going to re-encode an X.509 cert in the same way it was originally
-     * encoded so we take save the portion of the original cert that the signature would have made for.
-     *
-     * @var string
-     * @access private
-     */
-    var $signatureSubject;
-
-    /**
-     * Certificate Start Date
-     *
-     * @var string
-     * @access private
-     */
-    var $startDate;
-
-    /**
-     * Certificate End Date
-     *
-     * @var string
-     * @access private
-     */
-    var $endDate;
-
-    /**
-     * Serial Number
-     *
-     * @var string
-     * @access private
-     */
-    var $serialNumber;
-
-    /**
-     * Key Identifier
-     *
-     * See {@link http://tools.ietf.org/html/rfc5280#section-4.2.1.1 RFC5280#section-4.2.1.1} and
-     * {@link http://tools.ietf.org/html/rfc5280#section-4.2.1.2 RFC5280#section-4.2.1.2}.
-     *
-     * @var string
-     * @access private
-     */
-    var $currentKeyIdentifier;
-
-    /**
-     * CA Flag
-     *
-     * @var bool
-     * @access private
-     */
-    var $caFlag = false;
-
-    /**
-     * SPKAC Challenge
-     *
-     * @var string
-     * @access private
-     */
-    var $challenge;
-
-    /**
-     * Default Constructor.
-     *
-     * @return \phpseclib\File\X509
-     * @access public
-     */
-    function __construct()
-    {
-        // Explicitly Tagged Module, 1988 Syntax
-        // http://tools.ietf.org/html/rfc5280#appendix-A.1
-
-        $this->DirectoryString = array(
-            'type'     => ASN1::TYPE_CHOICE,
-            'children' => array(
-                'teletexString'   => array('type' => ASN1::TYPE_TELETEX_STRING),
-                'printableString' => array('type' => ASN1::TYPE_PRINTABLE_STRING),
-                'universalString' => array('type' => ASN1::TYPE_UNIVERSAL_STRING),
-                'utf8String'      => array('type' => ASN1::TYPE_UTF8_STRING),
-                'bmpString'       => array('type' => ASN1::TYPE_BMP_STRING)
-            )
-        );
-
-        $this->PKCS9String = array(
-            'type'     => ASN1::TYPE_CHOICE,
-            'children' => array(
-                'ia5String'       => array('type' => ASN1::TYPE_IA5_STRING),
-                'directoryString' => $this->DirectoryString
-            )
-        );
-
-        $this->AttributeValue = array('type' => ASN1::TYPE_ANY);
-
-        $AttributeType = array('type' => ASN1::TYPE_OBJECT_IDENTIFIER);
-
-        $AttributeTypeAndValue = array(
-            'type'     => ASN1::TYPE_SEQUENCE,
-            'children' => array(
-                'type' => $AttributeType,
-                'value'=> $this->AttributeValue
-            )
-        );
-
-        /*
-        In practice, RDNs containing multiple name-value pairs (called "multivalued RDNs") are rare,
-        but they can be useful at times when either there is no unique attribute in the entry or you
-        want to ensure that the entry's DN contains some useful identifying information.
-
-        - https://www.opends.org/wiki/page/DefinitionRelativeDistinguishedName
-        */
-        $this->RelativeDistinguishedName = array(
-            'type'     => ASN1::TYPE_SET,
-            'min'      => 1,
-            'max'      => -1,
-            'children' => $AttributeTypeAndValue
-        );
-
-        // http://tools.ietf.org/html/rfc5280#section-4.1.2.4
-        $RDNSequence = array(
-            'type'     => ASN1::TYPE_SEQUENCE,
-            // RDNSequence does not define a min or a max, which means it doesn't have one
-            'min'      => 0,
-            'max'      => -1,
-            'children' => $this->RelativeDistinguishedName
-        );
-
-        $this->Name = array(
-            'type'     => ASN1::TYPE_CHOICE,
-            'children' => array(
-                'rdnSequence' => $RDNSequence
-            )
-        );
-
-        // http://tools.ietf.org/html/rfc5280#section-4.1.1.2
-        $AlgorithmIdentifier = array(
-            'type'     => ASN1::TYPE_SEQUENCE,
-            'children' => array(
-                'algorithm'  => array('type' => ASN1::TYPE_OBJECT_IDENTIFIER),
-                'parameters' => array(
-                                    'type'     => ASN1::TYPE_ANY,
-                                    'optional' => true
-                                )
-            )
-        );
-
-        /*
-           A certificate using system MUST reject the certificate if it encounters
-           a critical extension it does not recognize; however, a non-critical
-           extension may be ignored if it is not recognized.
-
-           http://tools.ietf.org/html/rfc5280#section-4.2
-        */
-        $Extension = array(
-            'type'     => ASN1::TYPE_SEQUENCE,
-            'children' => array(
-                'extnId'   => array('type' => ASN1::TYPE_OBJECT_IDENTIFIER),
-                'critical' => array(
-                                  'type'     => ASN1::TYPE_BOOLEAN,
-                                  'optional' => true,
-                                  'default'  => false
-                              ),
-                'extnValue' => array('type' => ASN1::TYPE_OCTET_STRING)
-            )
-        );
-
-        $this->Extensions = array(
-            'type'     => ASN1::TYPE_SEQUENCE,
-            'min'      => 1,
-            // technically, it's MAX, but we'll assume anything < 0 is MAX
-            'max'      => -1,
-            // if 'children' isn't an array then 'min' and 'max' must be defined
-            'children' => $Extension
-        );
-
-        $SubjectPublicKeyInfo = array(
-            'type'     => ASN1::TYPE_SEQUENCE,
-            'children' => array(
-                'algorithm'        => $AlgorithmIdentifier,
-                'subjectPublicKey' => array('type' => ASN1::TYPE_BIT_STRING)
-            )
-        );
-
-        $UniqueIdentifier = array('type' => ASN1::TYPE_BIT_STRING);
-
-        $Time = array(
-            'type'     => ASN1::TYPE_CHOICE,
-            'children' => array(
-                'utcTime'     => array('type' => ASN1::TYPE_UTC_TIME),
-                'generalTime' => array('type' => ASN1::TYPE_GENERALIZED_TIME)
-            )
-        );
-
-        // http://tools.ietf.org/html/rfc5280#section-4.1.2.5
-        $Validity = array(
-            'type'     => ASN1::TYPE_SEQUENCE,
-            'children' => array(
-                'notBefore' => $Time,
-                'notAfter'  => $Time
-            )
-        );
-
-        $CertificateSerialNumber = array('type' => ASN1::TYPE_INTEGER);
-
-        $Version = array(
-            'type'    => ASN1::TYPE_INTEGER,
-            'mapping' => array('v1', 'v2', 'v3')
-        );
-
-        // assert($TBSCertificate['children']['signature'] == $Certificate['children']['signatureAlgorithm'])
-        $TBSCertificate = array(
-            'type'     => ASN1::TYPE_SEQUENCE,
-            'children' => array(
-                // technically, default implies optional, but we'll define it as being optional, none-the-less, just to
-                // reenforce that fact
-                'version'             => array(
-                                             'constant' => 0,
-                                             'optional' => true,
-                                             'explicit' => true,
-                                             'default'  => 'v1'
-                                         ) + $Version,
-                'serialNumber'         => $CertificateSerialNumber,
-                'signature'            => $AlgorithmIdentifier,
-                'issuer'               => $this->Name,
-                'validity'             => $Validity,
-                'subject'              => $this->Name,
-                'subjectPublicKeyInfo' => $SubjectPublicKeyInfo,
-                // implicit means that the T in the TLV structure is to be rewritten, regardless of the type
-                'issuerUniqueID'       => array(
-                                               'constant' => 1,
-                                               'optional' => true,
-                                               'implicit' => true
-                                           ) + $UniqueIdentifier,
-                'subjectUniqueID'       => array(
-                                               'constant' => 2,
-                                               'optional' => true,
-                                               'implicit' => true
-                                           ) + $UniqueIdentifier,
-                //  doesn't use the EXPLICIT keyword but if
-                // it's not IMPLICIT, it's EXPLICIT
-                'extensions'            => array(
-                                               'constant' => 3,
-                                               'optional' => true,
-                                               'explicit' => true
-                                           ) + $this->Extensions
-            )
-        );
-
-        $this->Certificate = array(
-            'type'     => ASN1::TYPE_SEQUENCE,
-            'children' => array(
-                 'tbsCertificate'     => $TBSCertificate,
-                 'signatureAlgorithm' => $AlgorithmIdentifier,
-                 'signature'          => array('type' => ASN1::TYPE_BIT_STRING)
-            )
-        );
-
-        $this->KeyUsage = array(
-            'type'    => ASN1::TYPE_BIT_STRING,
-            'mapping' => array(
-                'digitalSignature',
-                'nonRepudiation',
-                'keyEncipherment',
-                'dataEncipherment',
-                'keyAgreement',
-                'keyCertSign',
-                'cRLSign',
-                'encipherOnly',
-                'decipherOnly'
-            )
-        );
-
-        $this->BasicConstraints = array(
-            'type'     => ASN1::TYPE_SEQUENCE,
-            'children' => array(
-                'cA'                => array(
-                                                 'type'     => ASN1::TYPE_BOOLEAN,
-                                                 'optional' => true,
-                                                 'default'  => false
-                                       ),
-                'pathLenConstraint' => array(
-                                                 'type' => ASN1::TYPE_INTEGER,
-                                                 'optional' => true
-                                       )
-            )
-        );
-
-        $this->KeyIdentifier = array('type' => ASN1::TYPE_OCTET_STRING);
-
-        $OrganizationalUnitNames = array(
-            'type'     => ASN1::TYPE_SEQUENCE,
-            'min'      => 1,
-            'max'      => 4, // ub-organizational-units
-            'children' => array('type' => ASN1::TYPE_PRINTABLE_STRING)
-        );
-
-        $PersonalName = array(
-            'type'     => ASN1::TYPE_SET,
-            'children' => array(
-                'surname'              => array(
-                                           'type' => ASN1::TYPE_PRINTABLE_STRING,
-                                           'constant' => 0,
-                                           'optional' => true,
-                                           'implicit' => true
-                                         ),
-                'given-name'           => array(
-                                           'type' => ASN1::TYPE_PRINTABLE_STRING,
-                                           'constant' => 1,
-                                           'optional' => true,
-                                           'implicit' => true
-                                         ),
-                'initials'             => array(
-                                           'type' => ASN1::TYPE_PRINTABLE_STRING,
-                                           'constant' => 2,
-                                           'optional' => true,
-                                           'implicit' => true
-                                         ),
-                'generation-qualifier' => array(
-                                           'type' => ASN1::TYPE_PRINTABLE_STRING,
-                                           'constant' => 3,
-                                           'optional' => true,
-                                           'implicit' => true
-                                         )
-            )
-        );
-
-        $NumericUserIdentifier = array('type' => ASN1::TYPE_NUMERIC_STRING);
-
-        $OrganizationName = array('type' => ASN1::TYPE_PRINTABLE_STRING);
-
-        $PrivateDomainName = array(
-            'type'     => ASN1::TYPE_CHOICE,
-            'children' => array(
-                'numeric'   => array('type' => ASN1::TYPE_NUMERIC_STRING),
-                'printable' => array('type' => ASN1::TYPE_PRINTABLE_STRING)
-            )
-        );
-
-        $TerminalIdentifier = array('type' => ASN1::TYPE_PRINTABLE_STRING);
-
-        $NetworkAddress = array('type' => ASN1::TYPE_NUMERIC_STRING);
-
-        $AdministrationDomainName = array(
-            'type'     => ASN1::TYPE_CHOICE,
-            // if class isn't present it's assumed to be \phpseclib\File\ASN1::CLASS_UNIVERSAL or
-            // (if constant is present) \phpseclib\File\ASN1::CLASS_CONTEXT_SPECIFIC
-            'class'    => ASN1::CLASS_APPLICATION,
-            'cast'     => 2,
-            'children' => array(
-                'numeric'   => array('type' => ASN1::TYPE_NUMERIC_STRING),
-                'printable' => array('type' => ASN1::TYPE_PRINTABLE_STRING)
-            )
-        );
-
-        $CountryName = array(
-            'type'     => ASN1::TYPE_CHOICE,
-            // if class isn't present it's assumed to be \phpseclib\File\ASN1::CLASS_UNIVERSAL or
-            // (if constant is present) \phpseclib\File\ASN1::CLASS_CONTEXT_SPECIFIC
-            'class'    => ASN1::CLASS_APPLICATION,
-            'cast'     => 1,
-            'children' => array(
-                'x121-dcc-code'        => array('type' => ASN1::TYPE_NUMERIC_STRING),
-                'iso-3166-alpha2-code' => array('type' => ASN1::TYPE_PRINTABLE_STRING)
-            )
-        );
-
-        $AnotherName = array(
-            'type'     => ASN1::TYPE_SEQUENCE,
-            'children' => array(
-                 'type-id' => array('type' => ASN1::TYPE_OBJECT_IDENTIFIER),
-                 'value'   => array(
-                                  'type' => ASN1::TYPE_ANY,
-                                  'constant' => 0,
-                                  'optional' => true,
-                                  'explicit' => true
-                              )
-            )
-        );
-
-        $ExtensionAttribute = array(
-            'type'     => ASN1::TYPE_SEQUENCE,
-            'children' => array(
-                 'extension-attribute-type'  => array(
-                                                    'type' => ASN1::TYPE_PRINTABLE_STRING,
-                                                    'constant' => 0,
-                                                    'optional' => true,
-                                                    'implicit' => true
-                                                ),
-                 'extension-attribute-value' => array(
-                                                    'type' => ASN1::TYPE_ANY,
-                                                    'constant' => 1,
-                                                    'optional' => true,
-                                                    'explicit' => true
-                                                )
-            )
-        );
-
-        $ExtensionAttributes = array(
-            'type'     => ASN1::TYPE_SET,
-            'min'      => 1,
-            'max'      => 256, // ub-extension-attributes
-            'children' => $ExtensionAttribute
-        );
-
-        $BuiltInDomainDefinedAttribute = array(
-            'type'     => ASN1::TYPE_SEQUENCE,
-            'children' => array(
-                 'type'  => array('type' => ASN1::TYPE_PRINTABLE_STRING),
-                 'value' => array('type' => ASN1::TYPE_PRINTABLE_STRING)
-            )
-        );
-
-        $BuiltInDomainDefinedAttributes = array(
-            'type'     => ASN1::TYPE_SEQUENCE,
-            'min'      => 1,
-            'max'      => 4, // ub-domain-defined-attributes
-            'children' => $BuiltInDomainDefinedAttribute
-        );
-
-        $BuiltInStandardAttributes =  array(
-            'type'     => ASN1::TYPE_SEQUENCE,
-            'children' => array(
-                'country-name'               => array('optional' => true) + $CountryName,
-                'administration-domain-name' => array('optional' => true) + $AdministrationDomainName,
-                'network-address'            => array(
-                                                 'constant' => 0,
-                                                 'optional' => true,
-                                                 'implicit' => true
-                                               ) + $NetworkAddress,
-                'terminal-identifier'        => array(
-                                                 'constant' => 1,
-                                                 'optional' => true,
-                                                 'implicit' => true
-                                               ) + $TerminalIdentifier,
-                'private-domain-name'        => array(
-                                                 'constant' => 2,
-                                                 'optional' => true,
-                                                 'explicit' => true
-                                               ) + $PrivateDomainName,
-                'organization-name'          => array(
-                                                 'constant' => 3,
-                                                 'optional' => true,
-                                                 'implicit' => true
-                                               ) + $OrganizationName,
-                'numeric-user-identifier'    => array(
-                                                 'constant' => 4,
-                                                 'optional' => true,
-                                                 'implicit' => true
-                                               ) + $NumericUserIdentifier,
-                'personal-name'              => array(
-                                                 'constant' => 5,
-                                                 'optional' => true,
-                                                 'implicit' => true
-                                               ) + $PersonalName,
-                'organizational-unit-names'  => array(
-                                                 'constant' => 6,
-                                                 'optional' => true,
-                                                 'implicit' => true
-                                               ) + $OrganizationalUnitNames
-            )
-        );
-
-        $ORAddress = array(
-            'type'     => ASN1::TYPE_SEQUENCE,
-            'children' => array(
-                 'built-in-standard-attributes'       => $BuiltInStandardAttributes,
-                 'built-in-domain-defined-attributes' => array('optional' => true) + $BuiltInDomainDefinedAttributes,
-                 'extension-attributes'               => array('optional' => true) + $ExtensionAttributes
-            )
-        );
-
-        $EDIPartyName = array(
-            'type'     => ASN1::TYPE_SEQUENCE,
-            'children' => array(
-                 'nameAssigner' => array(
-                                    'constant' => 0,
-                                    'optional' => true,
-                                    'implicit' => true
-                                ) + $this->DirectoryString,
-                 // partyName is technically required but \phpseclib\File\ASN1 doesn't currently support non-optional constants and
-                 // setting it to optional gets the job done in any event.
-                 'partyName'    => array(
-                                    'constant' => 1,
-                                    'optional' => true,
-                                    'implicit' => true
-                                ) + $this->DirectoryString
-            )
-        );
-
-        $GeneralName = array(
-            'type'     => ASN1::TYPE_CHOICE,
-            'children' => array(
-                'otherName'                 => array(
-                                                 'constant' => 0,
-                                                 'optional' => true,
-                                                 'implicit' => true
-                                               ) + $AnotherName,
-                'rfc822Name'                => array(
-                                                 'type' => ASN1::TYPE_IA5_STRING,
-                                                 'constant' => 1,
-                                                 'optional' => true,
-                                                 'implicit' => true
-                                               ),
-                'dNSName'                   => array(
-                                                 'type' => ASN1::TYPE_IA5_STRING,
-                                                 'constant' => 2,
-                                                 'optional' => true,
-                                                 'implicit' => true
-                                               ),
-                'x400Address'               => array(
-                                                 'constant' => 3,
-                                                 'optional' => true,
-                                                 'implicit' => true
-                                               ) + $ORAddress,
-                'directoryName'             => array(
-                                                 'constant' => 4,
-                                                 'optional' => true,
-                                                 'explicit' => true
-                                               ) + $this->Name,
-                'ediPartyName'              => array(
-                                                 'constant' => 5,
-                                                 'optional' => true,
-                                                 'implicit' => true
-                                               ) + $EDIPartyName,
-                'uniformResourceIdentifier' => array(
-                                                 'type' => ASN1::TYPE_IA5_STRING,
-                                                 'constant' => 6,
-                                                 'optional' => true,
-                                                 'implicit' => true
-                                               ),
-                'iPAddress'                 => array(
-                                                 'type' => ASN1::TYPE_OCTET_STRING,
-                                                 'constant' => 7,
-                                                 'optional' => true,
-                                                 'implicit' => true
-                                               ),
-                'registeredID'              => array(
-                                                 'type' => ASN1::TYPE_OBJECT_IDENTIFIER,
-                                                 'constant' => 8,
-                                                 'optional' => true,
-                                                 'implicit' => true
-                                               )
-            )
-        );
-
-        $GeneralNames = array(
-            'type'     => ASN1::TYPE_SEQUENCE,
-            'min'      => 1,
-            'max'      => -1,
-            'children' => $GeneralName
-        );
-
-        $this->IssuerAltName = $GeneralNames;
-
-        $ReasonFlags = array(
-            'type'    => ASN1::TYPE_BIT_STRING,
-            'mapping' => array(
-                'unused',
-                'keyCompromise',
-                'cACompromise',
-                'affiliationChanged',
-                'superseded',
-                'cessationOfOperation',
-                'certificateHold',
-                'privilegeWithdrawn',
-                'aACompromise'
-            )
-        );
-
-        $DistributionPointName = array(
-            'type'     => ASN1::TYPE_CHOICE,
-            'children' => array(
-                'fullName'                => array(
-                                                 'constant' => 0,
-                                                 'optional' => true,
-                                                 'implicit' => true
-                                       ) + $GeneralNames,
-                'nameRelativeToCRLIssuer' => array(
-                                                 'constant' => 1,
-                                                 'optional' => true,
-                                                 'implicit' => true
-                                       ) + $this->RelativeDistinguishedName
-            )
-        );
-
-        $DistributionPoint = array(
-            'type'     => ASN1::TYPE_SEQUENCE,
-            'children' => array(
-                'distributionPoint' => array(
-                                                 'constant' => 0,
-                                                 'optional' => true,
-                                                 'explicit' => true
-                                       ) + $DistributionPointName,
-                'reasons'           => array(
-                                                 'constant' => 1,
-                                                 'optional' => true,
-                                                 'implicit' => true
-                                       ) + $ReasonFlags,
-                'cRLIssuer'         => array(
-                                                 'constant' => 2,
-                                                 'optional' => true,
-                                                 'implicit' => true
-                                       ) + $GeneralNames
-            )
-        );
-
-        $this->CRLDistributionPoints = array(
-            'type'     => ASN1::TYPE_SEQUENCE,
-            'min'      => 1,
-            'max'      => -1,
-            'children' => $DistributionPoint
-        );
-
-        $this->AuthorityKeyIdentifier = array(
-            'type'     => ASN1::TYPE_SEQUENCE,
-            'children' => array(
-                'keyIdentifier'             => array(
-                                                 'constant' => 0,
-                                                 'optional' => true,
-                                                 'implicit' => true
-                                               ) + $this->KeyIdentifier,
-                'authorityCertIssuer'       => array(
-                                                 'constant' => 1,
-                                                 'optional' => true,
-                                                 'implicit' => true
-                                               ) + $GeneralNames,
-                'authorityCertSerialNumber' => array(
-                                                 'constant' => 2,
-                                                 'optional' => true,
-                                                 'implicit' => true
-                                               ) + $CertificateSerialNumber
-            )
-        );
-
-        $PolicyQualifierId = array('type' => ASN1::TYPE_OBJECT_IDENTIFIER);
-
-        $PolicyQualifierInfo = array(
-            'type'     => ASN1::TYPE_SEQUENCE,
-            'children' => array(
-                'policyQualifierId' => $PolicyQualifierId,
-                'qualifier'         => array('type' => ASN1::TYPE_ANY)
-            )
-        );
-
-        $CertPolicyId = array('type' => ASN1::TYPE_OBJECT_IDENTIFIER);
-
-        $PolicyInformation = array(
-            'type'     => ASN1::TYPE_SEQUENCE,
-            'children' => array(
-                'policyIdentifier' => $CertPolicyId,
-                'policyQualifiers' => array(
-                                          'type'     => ASN1::TYPE_SEQUENCE,
-                                          'min'      => 0,
-                                          'max'      => -1,
-                                          'optional' => true,
-                                          'children' => $PolicyQualifierInfo
-                                      )
-            )
-        );
-
-        $this->CertificatePolicies = array(
-            'type'     => ASN1::TYPE_SEQUENCE,
-            'min'      => 1,
-            'max'      => -1,
-            'children' => $PolicyInformation
-        );
-
-        $this->PolicyMappings = array(
-            'type'     => ASN1::TYPE_SEQUENCE,
-            'min'      => 1,
-            'max'      => -1,
-            'children' => array(
-                              'type'     => ASN1::TYPE_SEQUENCE,
-                              'children' => array(
-                                  'issuerDomainPolicy' => $CertPolicyId,
-                                  'subjectDomainPolicy' => $CertPolicyId
-                              )
-                       )
-        );
-
-        $KeyPurposeId = array('type' => ASN1::TYPE_OBJECT_IDENTIFIER);
-
-        $this->ExtKeyUsageSyntax = array(
-            'type'     => ASN1::TYPE_SEQUENCE,
-            'min'      => 1,
-            'max'      => -1,
-            'children' => $KeyPurposeId
-        );
-
-        $AccessDescription = array(
-            'type'     => ASN1::TYPE_SEQUENCE,
-            'children' => array(
-                'accessMethod'   => array('type' => ASN1::TYPE_OBJECT_IDENTIFIER),
-                'accessLocation' => $GeneralName
-            )
-        );
-
-        $this->AuthorityInfoAccessSyntax = array(
-            'type'     => ASN1::TYPE_SEQUENCE,
-            'min'      => 1,
-            'max'      => -1,
-            'children' => $AccessDescription
-        );
-
-        $this->SubjectAltName = $GeneralNames;
-
-        $this->PrivateKeyUsagePeriod = array(
-            'type'     => ASN1::TYPE_SEQUENCE,
-            'children' => array(
-                'notBefore' => array(
-                                                 'constant' => 0,
-                                                 'optional' => true,
-                                                 'implicit' => true,
-                                                 'type' => ASN1::TYPE_GENERALIZED_TIME),
-                'notAfter'  => array(
-                                                 'constant' => 1,
-                                                 'optional' => true,
-                                                 'implicit' => true,
-                                                 'type' => ASN1::TYPE_GENERALIZED_TIME)
-            )
-        );
-
-        $BaseDistance = array('type' => ASN1::TYPE_INTEGER);
-
-        $GeneralSubtree = array(
-            'type'     => ASN1::TYPE_SEQUENCE,
-            'children' => array(
-                'base'    => $GeneralName,
-                'minimum' => array(
-                                 'constant' => 0,
-                                 'optional' => true,
-                                 'implicit' => true,
-                                 'default' => new BigInteger(0)
-                             ) + $BaseDistance,
-                'maximum' => array(
-                                 'constant' => 1,
-                                 'optional' => true,
-                                 'implicit' => true,
-                             ) + $BaseDistance
-            )
-        );
-
-        $GeneralSubtrees = array(
-            'type'     => ASN1::TYPE_SEQUENCE,
-            'min'      => 1,
-            'max'      => -1,
-            'children' => $GeneralSubtree
-        );
-
-        $this->NameConstraints = array(
-            'type'     => ASN1::TYPE_SEQUENCE,
-            'children' => array(
-                'permittedSubtrees' => array(
-                                           'constant' => 0,
-                                           'optional' => true,
-                                           'implicit' => true
-                                       ) + $GeneralSubtrees,
-                'excludedSubtrees'  => array(
-                                           'constant' => 1,
-                                           'optional' => true,
-                                           'implicit' => true
-                                       ) + $GeneralSubtrees
-            )
-        );
-
-        $this->CPSuri = array('type' => ASN1::TYPE_IA5_STRING);
-
-        $DisplayText = array(
-            'type'     => ASN1::TYPE_CHOICE,
-            'children' => array(
-                'ia5String'     => array('type' => ASN1::TYPE_IA5_STRING),
-                'visibleString' => array('type' => ASN1::TYPE_VISIBLE_STRING),
-                'bmpString'     => array('type' => ASN1::TYPE_BMP_STRING),
-                'utf8String'    => array('type' => ASN1::TYPE_UTF8_STRING)
-            )
-        );
-
-        $NoticeReference = array(
-            'type'     => ASN1::TYPE_SEQUENCE,
-            'children' => array(
-                'organization'  => $DisplayText,
-                'noticeNumbers' => array(
-                                       'type'     => ASN1::TYPE_SEQUENCE,
-                                       'min'      => 1,
-                                       'max'      => 200,
-                                       'children' => array('type' => ASN1::TYPE_INTEGER)
-                                   )
-            )
-        );
-
-        $this->UserNotice = array(
-            'type'     => ASN1::TYPE_SEQUENCE,
-            'children' => array(
-                'noticeRef' => array(
-                                           'optional' => true,
-                                           'implicit' => true
-                                       ) + $NoticeReference,
-                'explicitText'  => array(
-                                           'optional' => true,
-                                           'implicit' => true
-                                       ) + $DisplayText
-            )
-        );
-
-        // mapping is from 
-        $this->netscape_cert_type = array(
-            'type'    => ASN1::TYPE_BIT_STRING,
-            'mapping' => array(
-                'SSLClient',
-                'SSLServer',
-                'Email',
-                'ObjectSigning',
-                'Reserved',
-                'SSLCA',
-                'EmailCA',
-                'ObjectSigningCA'
-            )
-        );
-
-        $this->netscape_comment = array('type' => ASN1::TYPE_IA5_STRING);
-        $this->netscape_ca_policy_url = array('type' => ASN1::TYPE_IA5_STRING);
-
-        // attribute is used in RFC2986 but we're using the RFC5280 definition
-
-        $Attribute = array(
-            'type'     => ASN1::TYPE_SEQUENCE,
-            'children' => array(
-                'type' => $AttributeType,
-                'value'=> array(
-                              'type'     => ASN1::TYPE_SET,
-                              'min'      => 1,
-                              'max'      => -1,
-                              'children' => $this->AttributeValue
-                          )
-            )
-        );
-
-        $this->SubjectDirectoryAttributes = array(
-            'type'     => ASN1::TYPE_SEQUENCE,
-            'min'      => 1,
-            'max'      => -1,
-            'children' => $Attribute
-        );
-
-        // adapted from 
-
-        $Attributes = array(
-            'type'     => ASN1::TYPE_SET,
-            'min'      => 1,
-            'max'      => -1,
-            'children' => $Attribute
-        );
-
-        $CertificationRequestInfo = array(
-            'type'     => ASN1::TYPE_SEQUENCE,
-            'children' => array(
-                'version'       => array(
-                                       'type' => ASN1::TYPE_INTEGER,
-                                       'mapping' => array('v1')
-                                   ),
-                'subject'       => $this->Name,
-                'subjectPKInfo' => $SubjectPublicKeyInfo,
-                'attributes'    => array(
-                                       'constant' => 0,
-                                       'optional' => true,
-                                       'implicit' => true
-                                   ) + $Attributes,
-            )
-        );
-
-        $this->CertificationRequest = array(
-            'type'     => ASN1::TYPE_SEQUENCE,
-            'children' => array(
-                'certificationRequestInfo' => $CertificationRequestInfo,
-                'signatureAlgorithm'       => $AlgorithmIdentifier,
-                'signature'                => array('type' => ASN1::TYPE_BIT_STRING)
-            )
-        );
-
-        $RevokedCertificate = array(
-            'type'     => ASN1::TYPE_SEQUENCE,
-            'children' => array(
-                              'userCertificate'    => $CertificateSerialNumber,
-                              'revocationDate'     => $Time,
-                              'crlEntryExtensions' => array(
-                                                          'optional' => true
-                                                      ) + $this->Extensions
-                          )
-        );
-
-        $TBSCertList = array(
-            'type'     => ASN1::TYPE_SEQUENCE,
-            'children' => array(
-                'version'             => array(
-                                             'optional' => true,
-                                             'default'  => 'v1'
-                                         ) + $Version,
-                'signature'           => $AlgorithmIdentifier,
-                'issuer'              => $this->Name,
-                'thisUpdate'          => $Time,
-                'nextUpdate'          => array(
-                                             'optional' => true
-                                         ) + $Time,
-                'revokedCertificates' => array(
-                                             'type'     => ASN1::TYPE_SEQUENCE,
-                                             'optional' => true,
-                                             'min'      => 0,
-                                             'max'      => -1,
-                                             'children' => $RevokedCertificate
-                                         ),
-                'crlExtensions'       => array(
-                                             'constant' => 0,
-                                             'optional' => true,
-                                             'explicit' => true
-                                         ) + $this->Extensions
-            )
-        );
-
-        $this->CertificateList = array(
-            'type'     => ASN1::TYPE_SEQUENCE,
-            'children' => array(
-                'tbsCertList'        => $TBSCertList,
-                'signatureAlgorithm' => $AlgorithmIdentifier,
-                'signature'          => array('type' => ASN1::TYPE_BIT_STRING)
-            )
-        );
-
-        $this->CRLNumber = array('type' => ASN1::TYPE_INTEGER);
-
-        $this->CRLReason = array('type' => ASN1::TYPE_ENUMERATED,
-           'mapping' => array(
-                            'unspecified',
-                            'keyCompromise',
-                            'cACompromise',
-                            'affiliationChanged',
-                            'superseded',
-                            'cessationOfOperation',
-                            'certificateHold',
-                            // Value 7 is not used.
-                            8 => 'removeFromCRL',
-                            'privilegeWithdrawn',
-                            'aACompromise'
-            )
-        );
-
-        $this->IssuingDistributionPoint = array('type' => ASN1::TYPE_SEQUENCE,
-            'children' => array(
-                'distributionPoint'          => array(
-                                                    'constant' => 0,
-                                                    'optional' => true,
-                                                    'explicit' => true
-                                                ) + $DistributionPointName,
-                'onlyContainsUserCerts'      => array(
-                                                    'type'     => ASN1::TYPE_BOOLEAN,
-                                                    'constant' => 1,
-                                                    'optional' => true,
-                                                    'default'  => false,
-                                                    'implicit' => true
-                                                ),
-                'onlyContainsCACerts'        => array(
-                                                    'type'     => ASN1::TYPE_BOOLEAN,
-                                                    'constant' => 2,
-                                                    'optional' => true,
-                                                    'default'  => false,
-                                                    'implicit' => true
-                                                ),
-                'onlySomeReasons'           => array(
-                                                    'constant' => 3,
-                                                    'optional' => true,
-                                                    'implicit' => true
-                                                ) + $ReasonFlags,
-                'indirectCRL'               => array(
-                                                    'type'     => ASN1::TYPE_BOOLEAN,
-                                                    'constant' => 4,
-                                                    'optional' => true,
-                                                    'default'  => false,
-                                                    'implicit' => true
-                                                ),
-                'onlyContainsAttributeCerts' => array(
-                                                    'type'     => ASN1::TYPE_BOOLEAN,
-                                                    'constant' => 5,
-                                                    'optional' => true,
-                                                    'default'  => false,
-                                                    'implicit' => true
-                                                )
-                          )
-        );
-
-        $this->InvalidityDate = array('type' => ASN1::TYPE_GENERALIZED_TIME);
-
-        $this->CertificateIssuer = $GeneralNames;
-
-        $this->HoldInstructionCode = array('type' => ASN1::TYPE_OBJECT_IDENTIFIER);
-
-        $PublicKeyAndChallenge = array(
-            'type'     => ASN1::TYPE_SEQUENCE,
-            'children' => array(
-                'spki'      => $SubjectPublicKeyInfo,
-                'challenge' => array('type' => ASN1::TYPE_IA5_STRING)
-            )
-        );
-
-        $this->SignedPublicKeyAndChallenge = array(
-            'type'     => ASN1::TYPE_SEQUENCE,
-            'children' => array(
-                'publicKeyAndChallenge' => $PublicKeyAndChallenge,
-                'signatureAlgorithm'    => $AlgorithmIdentifier,
-                'signature'             => array('type' => ASN1::TYPE_BIT_STRING)
-            )
-        );
-
-        $this->PostalAddress = array(
-            'type'     => ASN1::TYPE_SEQUENCE,
-            'optional' => true,
-            'min'      => 1,
-            'max'      => -1,
-            'children' => $this->DirectoryString
-        );
-
-        // OIDs from RFC5280 and those RFCs mentioned in RFC5280#section-4.1.1.2
-        $this->oids = array(
-            '1.3.6.1.5.5.7' => 'id-pkix',
-            '1.3.6.1.5.5.7.1' => 'id-pe',
-            '1.3.6.1.5.5.7.2' => 'id-qt',
-            '1.3.6.1.5.5.7.3' => 'id-kp',
-            '1.3.6.1.5.5.7.48' => 'id-ad',
-            '1.3.6.1.5.5.7.2.1' => 'id-qt-cps',
-            '1.3.6.1.5.5.7.2.2' => 'id-qt-unotice',
-            '1.3.6.1.5.5.7.48.1' =>'id-ad-ocsp',
-            '1.3.6.1.5.5.7.48.2' => 'id-ad-caIssuers',
-            '1.3.6.1.5.5.7.48.3' => 'id-ad-timeStamping',
-            '1.3.6.1.5.5.7.48.5' => 'id-ad-caRepository',
-            '2.5.4' => 'id-at',
-            '2.5.4.41' => 'id-at-name',
-            '2.5.4.4' => 'id-at-surname',
-            '2.5.4.42' => 'id-at-givenName',
-            '2.5.4.43' => 'id-at-initials',
-            '2.5.4.44' => 'id-at-generationQualifier',
-            '2.5.4.3' => 'id-at-commonName',
-            '2.5.4.7' => 'id-at-localityName',
-            '2.5.4.8' => 'id-at-stateOrProvinceName',
-            '2.5.4.10' => 'id-at-organizationName',
-            '2.5.4.11' => 'id-at-organizationalUnitName',
-            '2.5.4.12' => 'id-at-title',
-            '2.5.4.13' => 'id-at-description',
-            '2.5.4.46' => 'id-at-dnQualifier',
-            '2.5.4.6' => 'id-at-countryName',
-            '2.5.4.5' => 'id-at-serialNumber',
-            '2.5.4.65' => 'id-at-pseudonym',
-            '2.5.4.17' => 'id-at-postalCode',
-            '2.5.4.9' => 'id-at-streetAddress',
-            '2.5.4.45' => 'id-at-uniqueIdentifier',
-            '2.5.4.72' => 'id-at-role',
-            '2.5.4.16' => 'id-at-postalAddress',
-
-            '0.9.2342.19200300.100.1.25' => 'id-domainComponent',
-            '1.2.840.113549.1.9' => 'pkcs-9',
-            '1.2.840.113549.1.9.1' => 'pkcs-9-at-emailAddress',
-            '2.5.29' => 'id-ce',
-            '2.5.29.35' => 'id-ce-authorityKeyIdentifier',
-            '2.5.29.14' => 'id-ce-subjectKeyIdentifier',
-            '2.5.29.15' => 'id-ce-keyUsage',
-            '2.5.29.16' => 'id-ce-privateKeyUsagePeriod',
-            '2.5.29.32' => 'id-ce-certificatePolicies',
-            '2.5.29.32.0' => 'anyPolicy',
-
-            '2.5.29.33' => 'id-ce-policyMappings',
-            '2.5.29.17' => 'id-ce-subjectAltName',
-            '2.5.29.18' => 'id-ce-issuerAltName',
-            '2.5.29.9' => 'id-ce-subjectDirectoryAttributes',
-            '2.5.29.19' => 'id-ce-basicConstraints',
-            '2.5.29.30' => 'id-ce-nameConstraints',
-            '2.5.29.36' => 'id-ce-policyConstraints',
-            '2.5.29.31' => 'id-ce-cRLDistributionPoints',
-            '2.5.29.37' => 'id-ce-extKeyUsage',
-            '2.5.29.37.0' => 'anyExtendedKeyUsage',
-            '1.3.6.1.5.5.7.3.1' => 'id-kp-serverAuth',
-            '1.3.6.1.5.5.7.3.2' => 'id-kp-clientAuth',
-            '1.3.6.1.5.5.7.3.3' => 'id-kp-codeSigning',
-            '1.3.6.1.5.5.7.3.4' => 'id-kp-emailProtection',
-            '1.3.6.1.5.5.7.3.8' => 'id-kp-timeStamping',
-            '1.3.6.1.5.5.7.3.9' => 'id-kp-OCSPSigning',
-            '2.5.29.54' => 'id-ce-inhibitAnyPolicy',
-            '2.5.29.46' => 'id-ce-freshestCRL',
-            '1.3.6.1.5.5.7.1.1' => 'id-pe-authorityInfoAccess',
-            '1.3.6.1.5.5.7.1.11' => 'id-pe-subjectInfoAccess',
-            '2.5.29.20' => 'id-ce-cRLNumber',
-            '2.5.29.28' => 'id-ce-issuingDistributionPoint',
-            '2.5.29.27' => 'id-ce-deltaCRLIndicator',
-            '2.5.29.21' => 'id-ce-cRLReasons',
-            '2.5.29.29' => 'id-ce-certificateIssuer',
-            '2.5.29.23' => 'id-ce-holdInstructionCode',
-            '1.2.840.10040.2' => 'holdInstruction',
-            '1.2.840.10040.2.1' => 'id-holdinstruction-none',
-            '1.2.840.10040.2.2' => 'id-holdinstruction-callissuer',
-            '1.2.840.10040.2.3' => 'id-holdinstruction-reject',
-            '2.5.29.24' => 'id-ce-invalidityDate',
-
-            '1.2.840.113549.2.2' => 'md2',
-            '1.2.840.113549.2.5' => 'md5',
-            '1.3.14.3.2.26' => 'id-sha1',
-            '1.2.840.10040.4.1' => 'id-dsa',
-            '1.2.840.10040.4.3' => 'id-dsa-with-sha1',
-            '1.2.840.113549.1.1' => 'pkcs-1',
-            '1.2.840.113549.1.1.1' => 'rsaEncryption',
-            '1.2.840.113549.1.1.2' => 'md2WithRSAEncryption',
-            '1.2.840.113549.1.1.4' => 'md5WithRSAEncryption',
-            '1.2.840.113549.1.1.5' => 'sha1WithRSAEncryption',
-            '1.2.840.10046.2.1' => 'dhpublicnumber',
-            '2.16.840.1.101.2.1.1.22' => 'id-keyExchangeAlgorithm',
-            '1.2.840.10045' => 'ansi-X9-62',
-            '1.2.840.10045.4' => 'id-ecSigType',
-            '1.2.840.10045.4.1' => 'ecdsa-with-SHA1',
-            '1.2.840.10045.1' => 'id-fieldType',
-            '1.2.840.10045.1.1' => 'prime-field',
-            '1.2.840.10045.1.2' => 'characteristic-two-field',
-            '1.2.840.10045.1.2.3' => 'id-characteristic-two-basis',
-            '1.2.840.10045.1.2.3.1' => 'gnBasis',
-            '1.2.840.10045.1.2.3.2' => 'tpBasis',
-            '1.2.840.10045.1.2.3.3' => 'ppBasis',
-            '1.2.840.10045.2' => 'id-publicKeyType',
-            '1.2.840.10045.2.1' => 'id-ecPublicKey',
-            '1.2.840.10045.3' => 'ellipticCurve',
-            '1.2.840.10045.3.0' => 'c-TwoCurve',
-            '1.2.840.10045.3.0.1' => 'c2pnb163v1',
-            '1.2.840.10045.3.0.2' => 'c2pnb163v2',
-            '1.2.840.10045.3.0.3' => 'c2pnb163v3',
-            '1.2.840.10045.3.0.4' => 'c2pnb176w1',
-            '1.2.840.10045.3.0.5' => 'c2pnb191v1',
-            '1.2.840.10045.3.0.6' => 'c2pnb191v2',
-            '1.2.840.10045.3.0.7' => 'c2pnb191v3',
-            '1.2.840.10045.3.0.8' => 'c2pnb191v4',
-            '1.2.840.10045.3.0.9' => 'c2pnb191v5',
-            '1.2.840.10045.3.0.10' => 'c2pnb208w1',
-            '1.2.840.10045.3.0.11' => 'c2pnb239v1',
-            '1.2.840.10045.3.0.12' => 'c2pnb239v2',
-            '1.2.840.10045.3.0.13' => 'c2pnb239v3',
-            '1.2.840.10045.3.0.14' => 'c2pnb239v4',
-            '1.2.840.10045.3.0.15' => 'c2pnb239v5',
-            '1.2.840.10045.3.0.16' => 'c2pnb272w1',
-            '1.2.840.10045.3.0.17' => 'c2pnb304w1',
-            '1.2.840.10045.3.0.18' => 'c2pnb359v1',
-            '1.2.840.10045.3.0.19' => 'c2pnb368w1',
-            '1.2.840.10045.3.0.20' => 'c2pnb431r1',
-            '1.2.840.10045.3.1' => 'primeCurve',
-            '1.2.840.10045.3.1.1' => 'prime192v1',
-            '1.2.840.10045.3.1.2' => 'prime192v2',
-            '1.2.840.10045.3.1.3' => 'prime192v3',
-            '1.2.840.10045.3.1.4' => 'prime239v1',
-            '1.2.840.10045.3.1.5' => 'prime239v2',
-            '1.2.840.10045.3.1.6' => 'prime239v3',
-            '1.2.840.10045.3.1.7' => 'prime256v1',
-            '1.2.840.113549.1.1.7' => 'id-RSAES-OAEP',
-            '1.2.840.113549.1.1.9' => 'id-pSpecified',
-            '1.2.840.113549.1.1.10' => 'id-RSASSA-PSS',
-            '1.2.840.113549.1.1.8' => 'id-mgf1',
-            '1.2.840.113549.1.1.14' => 'sha224WithRSAEncryption',
-            '1.2.840.113549.1.1.11' => 'sha256WithRSAEncryption',
-            '1.2.840.113549.1.1.12' => 'sha384WithRSAEncryption',
-            '1.2.840.113549.1.1.13' => 'sha512WithRSAEncryption',
-            '2.16.840.1.101.3.4.2.4' => 'id-sha224',
-            '2.16.840.1.101.3.4.2.1' => 'id-sha256',
-            '2.16.840.1.101.3.4.2.2' => 'id-sha384',
-            '2.16.840.1.101.3.4.2.3' => 'id-sha512',
-            '1.2.643.2.2.4' => 'id-GostR3411-94-with-GostR3410-94',
-            '1.2.643.2.2.3' => 'id-GostR3411-94-with-GostR3410-2001',
-            '1.2.643.2.2.20' => 'id-GostR3410-2001',
-            '1.2.643.2.2.19' => 'id-GostR3410-94',
-            // Netscape Object Identifiers from "Netscape Certificate Extensions"
-            '2.16.840.1.113730' => 'netscape',
-            '2.16.840.1.113730.1' => 'netscape-cert-extension',
-            '2.16.840.1.113730.1.1' => 'netscape-cert-type',
-            '2.16.840.1.113730.1.13' => 'netscape-comment',
-            '2.16.840.1.113730.1.8' => 'netscape-ca-policy-url',
-            // the following are X.509 extensions not supported by phpseclib
-            '1.3.6.1.5.5.7.1.12' => 'id-pe-logotype',
-            '1.2.840.113533.7.65.0' => 'entrustVersInfo',
-            '2.16.840.1.113733.1.6.9' => 'verisignPrivate',
-            // for Certificate Signing Requests
-            // see http://tools.ietf.org/html/rfc2985
-            '1.2.840.113549.1.9.2' => 'pkcs-9-at-unstructuredName', // PKCS #9 unstructured name
-            '1.2.840.113549.1.9.7' => 'pkcs-9-at-challengePassword', // Challenge password for certificate revocations
-            '1.2.840.113549.1.9.14' => 'pkcs-9-at-extensionRequest' // Certificate extension request
-        );
-    }
-
-    /**
-     * Load X.509 certificate
-     *
-     * Returns an associative array describing the X.509 cert or a false if the cert failed to load
-     *
-     * @param string $cert
-     * @param int $mode
-     * @access public
-     * @return mixed
-     */
-    function loadX509($cert, $mode = self::FORMAT_AUTO_DETECT)
-    {
-        if (is_array($cert) && isset($cert['tbsCertificate'])) {
-            unset($this->currentCert);
-            unset($this->currentKeyIdentifier);
-            $this->dn = $cert['tbsCertificate']['subject'];
-            if (!isset($this->dn)) {
-                return false;
-            }
-            $this->currentCert = $cert;
-
-            $currentKeyIdentifier = $this->getExtension('id-ce-subjectKeyIdentifier');
-            $this->currentKeyIdentifier = is_string($currentKeyIdentifier) ? $currentKeyIdentifier : null;
-
-            unset($this->signatureSubject);
-
-            return $cert;
-        }
-
-        $asn1 = new ASN1();
-
-        if ($mode != self::FORMAT_DER) {
-            $newcert = $this->_extractBER($cert);
-            if ($mode == self::FORMAT_PEM && $cert == $newcert) {
-                return false;
-            }
-            $cert = $newcert;
-        }
-
-        if ($cert === false) {
-            $this->currentCert = false;
-            return false;
-        }
-
-        $asn1->loadOIDs($this->oids);
-        $decoded = $asn1->decodeBER($cert);
-
-        if (!empty($decoded)) {
-            $x509 = $asn1->asn1map($decoded[0], $this->Certificate);
-        }
-        if (!isset($x509) || $x509 === false) {
-            $this->currentCert = false;
-            return false;
-        }
-
-        $this->signatureSubject = substr($cert, $decoded[0]['content'][0]['start'], $decoded[0]['content'][0]['length']);
-
-        if ($this->_isSubArrayValid($x509, 'tbsCertificate/extensions')) {
-            $this->_mapInExtensions($x509, 'tbsCertificate/extensions', $asn1);
-        }
-        $this->_mapInDNs($x509, 'tbsCertificate/issuer/rdnSequence', $asn1);
-        $this->_mapInDNs($x509, 'tbsCertificate/subject/rdnSequence', $asn1);
-
-        $key = &$x509['tbsCertificate']['subjectPublicKeyInfo']['subjectPublicKey'];
-        $key = $this->_reformatKey($x509['tbsCertificate']['subjectPublicKeyInfo']['algorithm']['algorithm'], $key);
-
-        $this->currentCert = $x509;
-        $this->dn = $x509['tbsCertificate']['subject'];
-
-        $currentKeyIdentifier = $this->getExtension('id-ce-subjectKeyIdentifier');
-        $this->currentKeyIdentifier = is_string($currentKeyIdentifier) ? $currentKeyIdentifier : null;
-
-        return $x509;
-    }
-
-    /**
-     * Save X.509 certificate
-     *
-     * @param array $cert
-     * @param int $format optional
-     * @access public
-     * @return string
-     */
-    function saveX509($cert, $format = self::FORMAT_PEM)
-    {
-        if (!is_array($cert) || !isset($cert['tbsCertificate'])) {
-            return false;
-        }
-
-        switch (true) {
-            // "case !$a: case !$b: break; default: whatever();" is the same thing as "if ($a && $b) whatever()"
-            case !($algorithm = $this->_subArray($cert, 'tbsCertificate/subjectPublicKeyInfo/algorithm/algorithm')):
-            case is_object($cert['tbsCertificate']['subjectPublicKeyInfo']['subjectPublicKey']):
-                break;
-            default:
-                switch ($algorithm) {
-                    case 'rsaEncryption':
-                        $cert['tbsCertificate']['subjectPublicKeyInfo']['subjectPublicKey']
-                            = base64_encode("\0" . base64_decode(preg_replace('#-.+-|[\r\n]#', '', $cert['tbsCertificate']['subjectPublicKeyInfo']['subjectPublicKey'])));
-                        /* "[For RSA keys] the parameters field MUST have ASN.1 type NULL for this algorithm identifier."
-                           -- https://tools.ietf.org/html/rfc3279#section-2.3.1
-
-                           given that and the fact that RSA keys appear ot be the only key type for which the parameters field can be blank,
-                           it seems like perhaps the ASN.1 description ought not say the parameters field is OPTIONAL, but whatever.
-                         */
-                        $cert['tbsCertificate']['subjectPublicKeyInfo']['algorithm']['parameters'] = null;
-                        // https://tools.ietf.org/html/rfc3279#section-2.2.1
-                        $cert['signatureAlgorithm']['parameters'] = null;
-                        $cert['tbsCertificate']['signature']['parameters'] = null;
-                }
-        }
-
-        $asn1 = new ASN1();
-        $asn1->loadOIDs($this->oids);
-
-        $filters = array();
-        $type_utf8_string = array('type' => ASN1::TYPE_UTF8_STRING);
-        $filters['tbsCertificate']['signature']['parameters'] = $type_utf8_string;
-        $filters['tbsCertificate']['signature']['issuer']['rdnSequence']['value'] = $type_utf8_string;
-        $filters['tbsCertificate']['issuer']['rdnSequence']['value'] = $type_utf8_string;
-        $filters['tbsCertificate']['subject']['rdnSequence']['value'] = $type_utf8_string;
-        $filters['tbsCertificate']['subjectPublicKeyInfo']['algorithm']['parameters'] = $type_utf8_string;
-        $filters['signatureAlgorithm']['parameters'] = $type_utf8_string;
-        $filters['authorityCertIssuer']['directoryName']['rdnSequence']['value'] = $type_utf8_string;
-        //$filters['policyQualifiers']['qualifier'] = $type_utf8_string;
-        $filters['distributionPoint']['fullName']['directoryName']['rdnSequence']['value'] = $type_utf8_string;
-        $filters['directoryName']['rdnSequence']['value'] = $type_utf8_string;
-
-        /* in the case of policyQualifiers/qualifier, the type has to be \phpseclib\File\ASN1::TYPE_IA5_STRING.
-           \phpseclib\File\ASN1::TYPE_PRINTABLE_STRING will cause OpenSSL's X.509 parser to spit out random
-           characters.
-         */
-        $filters['policyQualifiers']['qualifier']
-            = array('type' => ASN1::TYPE_IA5_STRING);
-
-        $asn1->loadFilters($filters);
-
-        $this->_mapOutExtensions($cert, 'tbsCertificate/extensions', $asn1);
-        $this->_mapOutDNs($cert, 'tbsCertificate/issuer/rdnSequence', $asn1);
-        $this->_mapOutDNs($cert, 'tbsCertificate/subject/rdnSequence', $asn1);
-
-        $cert = $asn1->encodeDER($cert, $this->Certificate);
-
-        switch ($format) {
-            case self::FORMAT_DER:
-                return $cert;
-            // case self::FORMAT_PEM:
-            default:
-                return "-----BEGIN CERTIFICATE-----\r\n" . chunk_split(base64_encode($cert), 64) . '-----END CERTIFICATE-----';
-        }
-    }
-
-    /**
-     * Map extension values from octet string to extension-specific internal
-     *   format.
-     *
-     * @param array ref $root
-     * @param string $path
-     * @param object $asn1
-     * @access private
-     */
-    function _mapInExtensions(&$root, $path, $asn1)
-    {
-        $extensions = &$this->_subArrayUnchecked($root, $path);
-
-        if ($extensions) {
-            for ($i = 0; $i < count($extensions); $i++) {
-                $id = $extensions[$i]['extnId'];
-                $value = &$extensions[$i]['extnValue'];
-                $value = base64_decode($value);
-                $decoded = $asn1->decodeBER($value);
-                /* [extnValue] contains the DER encoding of an ASN.1 value
-                   corresponding to the extension type identified by extnID */
-                $map = $this->_getMapping($id);
-                if (!is_bool($map)) {
-                    $mapped = $asn1->asn1map($decoded[0], $map, array('iPAddress' => array($this, '_decodeIP')));
-                    $value = $mapped === false ? $decoded[0] : $mapped;
-
-                    if ($id == 'id-ce-certificatePolicies') {
-                        for ($j = 0; $j < count($value); $j++) {
-                            if (!isset($value[$j]['policyQualifiers'])) {
-                                continue;
-                            }
-                            for ($k = 0; $k < count($value[$j]['policyQualifiers']); $k++) {
-                                $subid = $value[$j]['policyQualifiers'][$k]['policyQualifierId'];
-                                $map = $this->_getMapping($subid);
-                                $subvalue = &$value[$j]['policyQualifiers'][$k]['qualifier'];
-                                if ($map !== false) {
-                                    $decoded = $asn1->decodeBER($subvalue);
-                                    $mapped = $asn1->asn1map($decoded[0], $map);
-                                    $subvalue = $mapped === false ? $decoded[0] : $mapped;
-                                }
-                            }
-                        }
-                    }
-                } else {
-                    $value = base64_encode($value);
-                }
-            }
-        }
-    }
-
-    /**
-     * Map extension values from extension-specific internal format to
-     *   octet string.
-     *
-     * @param array ref $root
-     * @param string $path
-     * @param object $asn1
-     * @access private
-     */
-    function _mapOutExtensions(&$root, $path, $asn1)
-    {
-        $extensions = &$this->_subArray($root, $path);
-
-        if (is_array($extensions)) {
-            $size = count($extensions);
-            for ($i = 0; $i < $size; $i++) {
-                if ($extensions[$i] instanceof Element) {
-                    continue;
-                }
-
-                $id = $extensions[$i]['extnId'];
-                $value = &$extensions[$i]['extnValue'];
-
-                switch ($id) {
-                    case 'id-ce-certificatePolicies':
-                        for ($j = 0; $j < count($value); $j++) {
-                            if (!isset($value[$j]['policyQualifiers'])) {
-                                continue;
-                            }
-                            for ($k = 0; $k < count($value[$j]['policyQualifiers']); $k++) {
-                                $subid = $value[$j]['policyQualifiers'][$k]['policyQualifierId'];
-                                $map = $this->_getMapping($subid);
-                                $subvalue = &$value[$j]['policyQualifiers'][$k]['qualifier'];
-                                if ($map !== false) {
-                                    // by default \phpseclib\File\ASN1 will try to render qualifier as a \phpseclib\File\ASN1::TYPE_IA5_STRING since it's
-                                    // actual type is \phpseclib\File\ASN1::TYPE_ANY
-                                    $subvalue = new Element($asn1->encodeDER($subvalue, $map));
-                                }
-                            }
-                        }
-                        break;
-                    case 'id-ce-authorityKeyIdentifier': // use 00 as the serial number instead of an empty string
-                        if (isset($value['authorityCertSerialNumber'])) {
-                            if ($value['authorityCertSerialNumber']->toBytes() == '') {
-                                $temp = chr((ASN1::CLASS_CONTEXT_SPECIFIC << 6) | 2) . "\1\0";
-                                $value['authorityCertSerialNumber'] = new Element($temp);
-                            }
-                        }
-                }
-
-                /* [extnValue] contains the DER encoding of an ASN.1 value
-                   corresponding to the extension type identified by extnID */
-                $map = $this->_getMapping($id);
-                if (is_bool($map)) {
-                    if (!$map) {
-                        user_error($id . ' is not a currently supported extension');
-                        unset($extensions[$i]);
-                    }
-                } else {
-                    $temp = $asn1->encodeDER($value, $map, array('iPAddress' => array($this, '_encodeIP')));
-                    $value = base64_encode($temp);
-                }
-            }
-        }
-    }
-
-    /**
-     * Map attribute values from ANY type to attribute-specific internal
-     *   format.
-     *
-     * @param array ref $root
-     * @param string $path
-     * @param object $asn1
-     * @access private
-     */
-    function _mapInAttributes(&$root, $path, $asn1)
-    {
-        $attributes = &$this->_subArray($root, $path);
-
-        if (is_array($attributes)) {
-            for ($i = 0; $i < count($attributes); $i++) {
-                $id = $attributes[$i]['type'];
-                /* $value contains the DER encoding of an ASN.1 value
-                   corresponding to the attribute type identified by type */
-                $map = $this->_getMapping($id);
-                if (is_array($attributes[$i]['value'])) {
-                    $values = &$attributes[$i]['value'];
-                    for ($j = 0; $j < count($values); $j++) {
-                        $value = $asn1->encodeDER($values[$j], $this->AttributeValue);
-                        $decoded = $asn1->decodeBER($value);
-                        if (!is_bool($map)) {
-                            $mapped = $asn1->asn1map($decoded[0], $map);
-                            if ($mapped !== false) {
-                                $values[$j] = $mapped;
-                            }
-                            if ($id == 'pkcs-9-at-extensionRequest' && $this->_isSubArrayValid($values, $j)) {
-                                $this->_mapInExtensions($values, $j, $asn1);
-                            }
-                        } elseif ($map) {
-                            $values[$j] = base64_encode($value);
-                        }
-                    }
-                }
-            }
-        }
-    }
-
-    /**
-     * Map attribute values from attribute-specific internal format to
-     *   ANY type.
-     *
-     * @param array ref $root
-     * @param string $path
-     * @param object $asn1
-     * @access private
-     */
-    function _mapOutAttributes(&$root, $path, $asn1)
-    {
-        $attributes = &$this->_subArray($root, $path);
-
-        if (is_array($attributes)) {
-            $size = count($attributes);
-            for ($i = 0; $i < $size; $i++) {
-                /* [value] contains the DER encoding of an ASN.1 value
-                   corresponding to the attribute type identified by type */
-                $id = $attributes[$i]['type'];
-                $map = $this->_getMapping($id);
-                if ($map === false) {
-                    user_error($id . ' is not a currently supported attribute', E_USER_NOTICE);
-                    unset($attributes[$i]);
-                } elseif (is_array($attributes[$i]['value'])) {
-                    $values = &$attributes[$i]['value'];
-                    for ($j = 0; $j < count($values); $j++) {
-                        switch ($id) {
-                            case 'pkcs-9-at-extensionRequest':
-                                $this->_mapOutExtensions($values, $j, $asn1);
-                                break;
-                        }
-
-                        if (!is_bool($map)) {
-                            $temp = $asn1->encodeDER($values[$j], $map);
-                            $decoded = $asn1->decodeBER($temp);
-                            $values[$j] = $asn1->asn1map($decoded[0], $this->AttributeValue);
-                        }
-                    }
-                }
-            }
-        }
-    }
-
-    /**
-     * Map DN values from ANY type to DN-specific internal
-     *   format.
-     *
-     * @param array ref $root
-     * @param string $path
-     * @param object $asn1
-     * @access private
-     */
-    function _mapInDNs(&$root, $path, $asn1)
-    {
-        $dns = &$this->_subArray($root, $path);
-
-        if (is_array($dns)) {
-            for ($i = 0; $i < count($dns); $i++) {
-                for ($j = 0; $j < count($dns[$i]); $j++) {
-                    $type = $dns[$i][$j]['type'];
-                    $value = &$dns[$i][$j]['value'];
-                    if (is_object($value) && $value instanceof Element) {
-                        $map = $this->_getMapping($type);
-                        if (!is_bool($map)) {
-                            $decoded = $asn1->decodeBER($value);
-                            $value = $asn1->asn1map($decoded[0], $map);
-                        }
-                    }
-                }
-            }
-        }
-    }
-
-    /**
-     * Map DN values from DN-specific internal format to
-     *   ANY type.
-     *
-     * @param array ref $root
-     * @param string $path
-     * @param object $asn1
-     * @access private
-     */
-    function _mapOutDNs(&$root, $path, $asn1)
-    {
-        $dns = &$this->_subArray($root, $path);
-
-        if (is_array($dns)) {
-            $size = count($dns);
-            for ($i = 0; $i < $size; $i++) {
-                for ($j = 0; $j < count($dns[$i]); $j++) {
-                    $type = $dns[$i][$j]['type'];
-                    $value = &$dns[$i][$j]['value'];
-                    if (is_object($value) && $value instanceof Element) {
-                        continue;
-                    }
-
-                    $map = $this->_getMapping($type);
-                    if (!is_bool($map)) {
-                        $value = new Element($asn1->encodeDER($value, $map));
-                    }
-                }
-            }
-        }
-    }
-
-    /**
-     * Associate an extension ID to an extension mapping
-     *
-     * @param string $extnId
-     * @access private
-     * @return mixed
-     */
-    function _getMapping($extnId)
-    {
-        if (!is_string($extnId)) { // eg. if it's a \phpseclib\File\ASN1\Element object
-            return true;
-        }
-
-        switch ($extnId) {
-            case 'id-ce-keyUsage':
-                return $this->KeyUsage;
-            case 'id-ce-basicConstraints':
-                return $this->BasicConstraints;
-            case 'id-ce-subjectKeyIdentifier':
-                return $this->KeyIdentifier;
-            case 'id-ce-cRLDistributionPoints':
-                return $this->CRLDistributionPoints;
-            case 'id-ce-authorityKeyIdentifier':
-                return $this->AuthorityKeyIdentifier;
-            case 'id-ce-certificatePolicies':
-                return $this->CertificatePolicies;
-            case 'id-ce-extKeyUsage':
-                return $this->ExtKeyUsageSyntax;
-            case 'id-pe-authorityInfoAccess':
-                return $this->AuthorityInfoAccessSyntax;
-            case 'id-ce-subjectAltName':
-                return $this->SubjectAltName;
-            case 'id-ce-subjectDirectoryAttributes':
-                return $this->SubjectDirectoryAttributes;
-            case 'id-ce-privateKeyUsagePeriod':
-                return $this->PrivateKeyUsagePeriod;
-            case 'id-ce-issuerAltName':
-                return $this->IssuerAltName;
-            case 'id-ce-policyMappings':
-                return $this->PolicyMappings;
-            case 'id-ce-nameConstraints':
-                return $this->NameConstraints;
-
-            case 'netscape-cert-type':
-                return $this->netscape_cert_type;
-            case 'netscape-comment':
-                return $this->netscape_comment;
-            case 'netscape-ca-policy-url':
-                return $this->netscape_ca_policy_url;
-
-            // since id-qt-cps isn't a constructed type it will have already been decoded as a string by the time it gets
-            // back around to asn1map() and we don't want it decoded again.
-            //case 'id-qt-cps':
-            //    return $this->CPSuri;
-            case 'id-qt-unotice':
-                return $this->UserNotice;
-
-            // the following OIDs are unsupported but we don't want them to give notices when calling saveX509().
-            case 'id-pe-logotype': // http://www.ietf.org/rfc/rfc3709.txt
-            case 'entrustVersInfo':
-            // http://support.microsoft.com/kb/287547
-            case '1.3.6.1.4.1.311.20.2': // szOID_ENROLL_CERTTYPE_EXTENSION
-            case '1.3.6.1.4.1.311.21.1': // szOID_CERTSRV_CA_VERSION
-            // "SET Secure Electronic Transaction Specification"
-            // http://www.maithean.com/docs/set_bk3.pdf
-            case '2.23.42.7.0': // id-set-hashedRootKey
-            // "Certificate Transparency"
-            // https://tools.ietf.org/html/rfc6962
-            case '1.3.6.1.4.1.11129.2.4.2':
-                return true;
-
-            // CSR attributes
-            case 'pkcs-9-at-unstructuredName':
-                return $this->PKCS9String;
-            case 'pkcs-9-at-challengePassword':
-                return $this->DirectoryString;
-            case 'pkcs-9-at-extensionRequest':
-                return $this->Extensions;
-
-            // CRL extensions.
-            case 'id-ce-cRLNumber':
-                return $this->CRLNumber;
-            case 'id-ce-deltaCRLIndicator':
-                return $this->CRLNumber;
-            case 'id-ce-issuingDistributionPoint':
-                return $this->IssuingDistributionPoint;
-            case 'id-ce-freshestCRL':
-                return $this->CRLDistributionPoints;
-            case 'id-ce-cRLReasons':
-                return $this->CRLReason;
-            case 'id-ce-invalidityDate':
-                return $this->InvalidityDate;
-            case 'id-ce-certificateIssuer':
-                return $this->CertificateIssuer;
-            case 'id-ce-holdInstructionCode':
-                return $this->HoldInstructionCode;
-            case 'id-at-postalAddress':
-                return $this->PostalAddress;
-        }
-
-        return false;
-    }
-
-    /**
-     * Load an X.509 certificate as a certificate authority
-     *
-     * @param string $cert
-     * @access public
-     * @return bool
-     */
-    function loadCA($cert)
-    {
-        $olddn = $this->dn;
-        $oldcert = $this->currentCert;
-        $oldsigsubj = $this->signatureSubject;
-        $oldkeyid = $this->currentKeyIdentifier;
-
-        $cert = $this->loadX509($cert);
-        if (!$cert) {
-            $this->dn = $olddn;
-            $this->currentCert = $oldcert;
-            $this->signatureSubject = $oldsigsubj;
-            $this->currentKeyIdentifier = $oldkeyid;
-
-            return false;
-        }
-
-        /* From RFC5280 "PKIX Certificate and CRL Profile":
-
-           If the keyUsage extension is present, then the subject public key
-           MUST NOT be used to verify signatures on certificates or CRLs unless
-           the corresponding keyCertSign or cRLSign bit is set. */
-        //$keyUsage = $this->getExtension('id-ce-keyUsage');
-        //if ($keyUsage && !in_array('keyCertSign', $keyUsage)) {
-        //    return false;
-        //}
-
-        /* From RFC5280 "PKIX Certificate and CRL Profile":
-
-           The cA boolean indicates whether the certified public key may be used
-           to verify certificate signatures.  If the cA boolean is not asserted,
-           then the keyCertSign bit in the key usage extension MUST NOT be
-           asserted.  If the basic constraints extension is not present in a
-           version 3 certificate, or the extension is present but the cA boolean
-           is not asserted, then the certified public key MUST NOT be used to
-           verify certificate signatures. */
-        //$basicConstraints = $this->getExtension('id-ce-basicConstraints');
-        //if (!$basicConstraints || !$basicConstraints['cA']) {
-        //    return false;
-        //}
-
-        $this->CAs[] = $cert;
-
-        $this->dn = $olddn;
-        $this->currentCert = $oldcert;
-        $this->signatureSubject = $oldsigsubj;
-
-        return true;
-    }
-
-    /**
-     * Validate an X.509 certificate against a URL
-     *
-     * From RFC2818 "HTTP over TLS":
-     *
-     * Matching is performed using the matching rules specified by
-     * [RFC2459].  If more than one identity of a given type is present in
-     * the certificate (e.g., more than one dNSName name, a match in any one
-     * of the set is considered acceptable.) Names may contain the wildcard
-     * character * which is considered to match any single domain name
-     * component or component fragment. E.g., *.a.com matches foo.a.com but
-     * not bar.foo.a.com. f*.com matches foo.com but not bar.com.
-     *
-     * @param string $url
-     * @access public
-     * @return bool
-     */
-    function validateURL($url)
-    {
-        if (!is_array($this->currentCert) || !isset($this->currentCert['tbsCertificate'])) {
-            return false;
-        }
-
-        $components = parse_url($url);
-        if (!isset($components['host'])) {
-            return false;
-        }
-
-        if ($names = $this->getExtension('id-ce-subjectAltName')) {
-            foreach ($names as $key => $value) {
-                $value = str_replace(array('.', '*'), array('\.', '[^.]*'), $value);
-                switch ($key) {
-                    case 'dNSName':
-                        /* From RFC2818 "HTTP over TLS":
-
-                           If a subjectAltName extension of type dNSName is present, that MUST
-                           be used as the identity. Otherwise, the (most specific) Common Name
-                           field in the Subject field of the certificate MUST be used. Although
-                           the use of the Common Name is existing practice, it is deprecated and
-                           Certification Authorities are encouraged to use the dNSName instead. */
-                        if (preg_match('#^' . $value . '$#', $components['host'])) {
-                            return true;
-                        }
-                        break;
-                    case 'iPAddress':
-                        /* From RFC2818 "HTTP over TLS":
-
-                           In some cases, the URI is specified as an IP address rather than a
-                           hostname. In this case, the iPAddress subjectAltName must be present
-                           in the certificate and must exactly match the IP in the URI. */
-                        if (preg_match('#(?:\d{1-3}\.){4}#', $components['host'] . '.') && preg_match('#^' . $value . '$#', $components['host'])) {
-                            return true;
-                        }
-                }
-            }
-            return false;
-        }
-
-        if ($value = $this->getDNProp('id-at-commonName')) {
-            $value = str_replace(array('.', '*'), array('\.', '[^.]*'), $value[0]);
-            return preg_match('#^' . $value . '$#', $components['host']);
-        }
-
-        return false;
-    }
-
-    /**
-     * Validate a date
-     *
-     * If $date isn't defined it is assumed to be the current date.
-     *
-     * @param int $date optional
-     * @access public
-     */
-    function validateDate($date = null)
-    {
-        if (!is_array($this->currentCert) || !isset($this->currentCert['tbsCertificate'])) {
-            return false;
-        }
-
-        if (!isset($date)) {
-            $date = time();
-        }
-
-        $notBefore = $this->currentCert['tbsCertificate']['validity']['notBefore'];
-        $notBefore = isset($notBefore['generalTime']) ? $notBefore['generalTime'] : $notBefore['utcTime'];
-
-        $notAfter = $this->currentCert['tbsCertificate']['validity']['notAfter'];
-        $notAfter = isset($notAfter['generalTime']) ? $notAfter['generalTime'] : $notAfter['utcTime'];
-
-        switch (true) {
-            case $date < @strtotime($notBefore):
-            case $date > @strtotime($notAfter):
-                return false;
-        }
-
-        return true;
-    }
-
-    /**
-     * Validate a signature
-     *
-     * Works on X.509 certs, CSR's and CRL's.
-     * Returns true if the signature is verified, false if it is not correct or null on error
-     *
-     * By default returns false for self-signed certs. Call validateSignature(false) to make this support
-     * self-signed.
-     *
-     * The behavior of this function is inspired by {@link http://php.net/openssl-verify openssl_verify}.
-     *
-     * @param bool $caonly optional
-     * @access public
-     * @return mixed
-     */
-    function validateSignature($caonly = true)
-    {
-        if (!is_array($this->currentCert) || !isset($this->signatureSubject)) {
-            return null;
-        }
-
-        /* TODO:
-           "emailAddress attribute values are not case-sensitive (e.g., "subscriber@example.com" is the same as "SUBSCRIBER@EXAMPLE.COM")."
-            -- http://tools.ietf.org/html/rfc5280#section-4.1.2.6
-
-           implement pathLenConstraint in the id-ce-basicConstraints extension */
-
-        switch (true) {
-            case isset($this->currentCert['tbsCertificate']):
-                // self-signed cert
-                switch (true) {
-                    case !defined('FILE_X509_IGNORE_TYPE') && $this->currentCert['tbsCertificate']['issuer'] === $this->currentCert['tbsCertificate']['subject']:
-                    case defined('FILE_X509_IGNORE_TYPE') && $this->getIssuerDN(self::DN_STRING) === $this->getDN(self::DN_STRING):
-                        $authorityKey = $this->getExtension('id-ce-authorityKeyIdentifier');
-                        $subjectKeyID = $this->getExtension('id-ce-subjectKeyIdentifier');
-                        switch (true) {
-                            case !is_array($authorityKey):
-                            case is_array($authorityKey) && isset($authorityKey['keyIdentifier']) && $authorityKey['keyIdentifier'] === $subjectKeyID:
-                                $signingCert = $this->currentCert; // working cert
-                        }
-                }
-
-                if (!empty($this->CAs)) {
-                    for ($i = 0; $i < count($this->CAs); $i++) {
-                        // even if the cert is a self-signed one we still want to see if it's a CA;
-                        // if not, we'll conditionally return an error
-                        $ca = $this->CAs[$i];
-                        switch (true) {
-                            case !defined('FILE_X509_IGNORE_TYPE') && $this->currentCert['tbsCertificate']['issuer'] === $ca['tbsCertificate']['subject']:
-                            case defined('FILE_X509_IGNORE_TYPE') && $this->getDN(self::DN_STRING, $this->currentCert['tbsCertificate']['issuer']) === $this->getDN(self::DN_STRING, $ca['tbsCertificate']['subject']):
-                                $authorityKey = $this->getExtension('id-ce-authorityKeyIdentifier');
-                                $subjectKeyID = $this->getExtension('id-ce-subjectKeyIdentifier', $ca);
-                                switch (true) {
-                                    case !is_array($authorityKey):
-                                    case is_array($authorityKey) && isset($authorityKey['keyIdentifier']) && $authorityKey['keyIdentifier'] === $subjectKeyID:
-                                        $signingCert = $ca; // working cert
-                                        break 3;
-                                }
-                        }
-                    }
-                    if (count($this->CAs) == $i && $caonly) {
-                        return false;
-                    }
-                } elseif (!isset($signingCert) || $caonly) {
-                    return false;
-                }
-                return $this->_validateSignature(
-                    $signingCert['tbsCertificate']['subjectPublicKeyInfo']['algorithm']['algorithm'],
-                    $signingCert['tbsCertificate']['subjectPublicKeyInfo']['subjectPublicKey'],
-                    $this->currentCert['signatureAlgorithm']['algorithm'],
-                    substr(base64_decode($this->currentCert['signature']), 1),
-                    $this->signatureSubject
-                );
-            case isset($this->currentCert['certificationRequestInfo']):
-                return $this->_validateSignature(
-                    $this->currentCert['certificationRequestInfo']['subjectPKInfo']['algorithm']['algorithm'],
-                    $this->currentCert['certificationRequestInfo']['subjectPKInfo']['subjectPublicKey'],
-                    $this->currentCert['signatureAlgorithm']['algorithm'],
-                    substr(base64_decode($this->currentCert['signature']), 1),
-                    $this->signatureSubject
-                );
-            case isset($this->currentCert['publicKeyAndChallenge']):
-                return $this->_validateSignature(
-                    $this->currentCert['publicKeyAndChallenge']['spki']['algorithm']['algorithm'],
-                    $this->currentCert['publicKeyAndChallenge']['spki']['subjectPublicKey'],
-                    $this->currentCert['signatureAlgorithm']['algorithm'],
-                    substr(base64_decode($this->currentCert['signature']), 1),
-                    $this->signatureSubject
-                );
-            case isset($this->currentCert['tbsCertList']):
-                if (!empty($this->CAs)) {
-                    for ($i = 0; $i < count($this->CAs); $i++) {
-                        $ca = $this->CAs[$i];
-                        switch (true) {
-                            case !defined('FILE_X509_IGNORE_TYPE') && $this->currentCert['tbsCertList']['issuer'] === $ca['tbsCertificate']['subject']:
-                            case defined('FILE_X509_IGNORE_TYPE') && $this->getDN(self::DN_STRING, $this->currentCert['tbsCertList']['issuer']) === $this->getDN(self::DN_STRING, $ca['tbsCertificate']['subject']):
-                                $authorityKey = $this->getExtension('id-ce-authorityKeyIdentifier');
-                                $subjectKeyID = $this->getExtension('id-ce-subjectKeyIdentifier', $ca);
-                                switch (true) {
-                                    case !is_array($authorityKey):
-                                    case is_array($authorityKey) && isset($authorityKey['keyIdentifier']) && $authorityKey['keyIdentifier'] === $subjectKeyID:
-                                        $signingCert = $ca; // working cert
-                                        break 3;
-                                }
-                        }
-                    }
-                }
-                if (!isset($signingCert)) {
-                    return false;
-                }
-                return $this->_validateSignature(
-                    $signingCert['tbsCertificate']['subjectPublicKeyInfo']['algorithm']['algorithm'],
-                    $signingCert['tbsCertificate']['subjectPublicKeyInfo']['subjectPublicKey'],
-                    $this->currentCert['signatureAlgorithm']['algorithm'],
-                    substr(base64_decode($this->currentCert['signature']), 1),
-                    $this->signatureSubject
-                );
-            default:
-                return false;
-        }
-    }
-
-    /**
-     * Validates a signature
-     *
-     * Returns true if the signature is verified, false if it is not correct or null on error
-     *
-     * @param string $publicKeyAlgorithm
-     * @param string $publicKey
-     * @param string $signatureAlgorithm
-     * @param string $signature
-     * @param string $signatureSubject
-     * @access private
-     * @return int
-     */
-    function _validateSignature($publicKeyAlgorithm, $publicKey, $signatureAlgorithm, $signature, $signatureSubject)
-    {
-        switch ($publicKeyAlgorithm) {
-            case 'rsaEncryption':
-                $rsa = new RSA();
-                $rsa->loadKey($publicKey);
-
-                switch ($signatureAlgorithm) {
-                    case 'md2WithRSAEncryption':
-                    case 'md5WithRSAEncryption':
-                    case 'sha1WithRSAEncryption':
-                    case 'sha224WithRSAEncryption':
-                    case 'sha256WithRSAEncryption':
-                    case 'sha384WithRSAEncryption':
-                    case 'sha512WithRSAEncryption':
-                        $rsa->setHash(preg_replace('#WithRSAEncryption$#', '', $signatureAlgorithm));
-                        $rsa->setSignatureMode(RSA::SIGNATURE_PKCS1);
-                        if (!@$rsa->verify($signatureSubject, $signature)) {
-                            return false;
-                        }
-                        break;
-                    default:
-                        return null;
-                }
-                break;
-            default:
-                return null;
-        }
-
-        return true;
-    }
-
-    /**
-     * Reformat public keys
-     *
-     * Reformats a public key to a format supported by phpseclib (if applicable)
-     *
-     * @param string $algorithm
-     * @param string $key
-     * @access private
-     * @return string
-     */
-    function _reformatKey($algorithm, $key)
-    {
-        switch ($algorithm) {
-            case 'rsaEncryption':
-                return
-                    "-----BEGIN RSA PUBLIC KEY-----\r\n" .
-                    // subjectPublicKey is stored as a bit string in X.509 certs.  the first byte of a bit string represents how many bits
-                    // in the last byte should be ignored.  the following only supports non-zero stuff but as none of the X.509 certs Firefox
-                    // uses as a cert authority actually use a non-zero bit I think it's safe to assume that none do.
-                    chunk_split(base64_encode(substr(base64_decode($key), 1)), 64) .
-                    '-----END RSA PUBLIC KEY-----';
-            default:
-                return $key;
-        }
-    }
-
-    /**
-     * Decodes an IP address
-     *
-     * Takes in a base64 encoded "blob" and returns a human readable IP address
-     *
-     * @param string $ip
-     * @access private
-     * @return string
-     */
-    function _decodeIP($ip)
-    {
-        return inet_ntop(base64_decode($ip));
-    }
-
-    /**
-     * Encodes an IP address
-     *
-     * Takes a human readable IP address into a base64-encoded "blob"
-     *
-     * @param string $ip
-     * @access private
-     * @return string
-     */
-    function _encodeIP($ip)
-    {
-        return base64_encode(inet_pton($ip));
-    }
-
-    /**
-     * "Normalizes" a Distinguished Name property
-     *
-     * @param string $propName
-     * @access private
-     * @return mixed
-     */
-    function _translateDNProp($propName)
-    {
-        switch (strtolower($propName)) {
-            case 'id-at-countryname':
-            case 'countryname':
-            case 'c':
-                return 'id-at-countryName';
-            case 'id-at-organizationname':
-            case 'organizationname':
-            case 'o':
-                return 'id-at-organizationName';
-            case 'id-at-dnqualifier':
-            case 'dnqualifier':
-                return 'id-at-dnQualifier';
-            case 'id-at-commonname':
-            case 'commonname':
-            case 'cn':
-                return 'id-at-commonName';
-            case 'id-at-stateorprovincename':
-            case 'stateorprovincename':
-            case 'state':
-            case 'province':
-            case 'provincename':
-            case 'st':
-                return 'id-at-stateOrProvinceName';
-            case 'id-at-localityname':
-            case 'localityname':
-            case 'l':
-                return 'id-at-localityName';
-            case 'id-emailaddress':
-            case 'emailaddress':
-                return 'pkcs-9-at-emailAddress';
-            case 'id-at-serialnumber':
-            case 'serialnumber':
-                return 'id-at-serialNumber';
-            case 'id-at-postalcode':
-            case 'postalcode':
-                return 'id-at-postalCode';
-            case 'id-at-streetaddress':
-            case 'streetaddress':
-                return 'id-at-streetAddress';
-            case 'id-at-name':
-            case 'name':
-                return 'id-at-name';
-            case 'id-at-givenname':
-            case 'givenname':
-                return 'id-at-givenName';
-            case 'id-at-surname':
-            case 'surname':
-            case 'sn':
-                return 'id-at-surname';
-            case 'id-at-initials':
-            case 'initials':
-                return 'id-at-initials';
-            case 'id-at-generationqualifier':
-            case 'generationqualifier':
-                return 'id-at-generationQualifier';
-            case 'id-at-organizationalunitname':
-            case 'organizationalunitname':
-            case 'ou':
-                return 'id-at-organizationalUnitName';
-            case 'id-at-pseudonym':
-            case 'pseudonym':
-                return 'id-at-pseudonym';
-            case 'id-at-title':
-            case 'title':
-                return 'id-at-title';
-            case 'id-at-description':
-            case 'description':
-                return 'id-at-description';
-            case 'id-at-role':
-            case 'role':
-                return 'id-at-role';
-            case 'id-at-uniqueidentifier':
-            case 'uniqueidentifier':
-            case 'x500uniqueidentifier':
-                return 'id-at-uniqueIdentifier';
-            case 'postaladdress':
-            case 'id-at-postaladdress':
-                return 'id-at-postalAddress';
-            default:
-                return false;
-        }
-    }
-
-    /**
-     * Set a Distinguished Name property
-     *
-     * @param string $propName
-     * @param mixed $propValue
-     * @param string $type optional
-     * @access public
-     * @return bool
-     */
-    function setDNProp($propName, $propValue, $type = 'utf8String')
-    {
-        if (empty($this->dn)) {
-            $this->dn = array('rdnSequence' => array());
-        }
-
-        if (($propName = $this->_translateDNProp($propName)) === false) {
-            return false;
-        }
-
-        foreach ((array) $propValue as $v) {
-            if (!is_array($v) && isset($type)) {
-                $v = array($type => $v);
-            }
-            $this->dn['rdnSequence'][] = array(
-                array(
-                    'type' => $propName,
-                    'value'=> $v
-                )
-            );
-        }
-
-        return true;
-    }
-
-    /**
-     * Remove Distinguished Name properties
-     *
-     * @param string $propName
-     * @access public
-     */
-    function removeDNProp($propName)
-    {
-        if (empty($this->dn)) {
-            return;
-        }
-
-        if (($propName = $this->_translateDNProp($propName)) === false) {
-            return;
-        }
-
-        $dn = &$this->dn['rdnSequence'];
-        $size = count($dn);
-        for ($i = 0; $i < $size; $i++) {
-            if ($dn[$i][0]['type'] == $propName) {
-                unset($dn[$i]);
-            }
-        }
-
-        $dn = array_values($dn);
-    }
-
-    /**
-     * Get Distinguished Name properties
-     *
-     * @param string $propName
-     * @param array $dn optional
-     * @param bool $withType optional
-     * @return mixed
-     * @access public
-     */
-    function getDNProp($propName, $dn = null, $withType = false)
-    {
-        if (!isset($dn)) {
-            $dn = $this->dn;
-        }
-
-        if (empty($dn)) {
-            return false;
-        }
-
-        if (($propName = $this->_translateDNProp($propName)) === false) {
-            return false;
-        }
-
-        $asn1 = new ASN1();
-        $asn1->loadOIDs($this->oids);
-        $filters = array();
-        $filters['value'] = array('type' => ASN1::TYPE_UTF8_STRING);
-        $asn1->loadFilters($filters);
-        $this->_mapOutDNs($dn, 'rdnSequence', $asn1);
-        $dn = $dn['rdnSequence'];
-        $result = array();
-        for ($i = 0; $i < count($dn); $i++) {
-            if ($dn[$i][0]['type'] == $propName) {
-                $v = $dn[$i][0]['value'];
-                if (!$withType) {
-                    if (is_array($v)) {
-                        foreach ($v as $type => $s) {
-                            $type = array_search($type, $asn1->ANYmap, true);
-                            if ($type !== false && isset($asn1->stringTypeSize[$type])) {
-                                $s = $asn1->convert($s, $type);
-                                if ($s !== false) {
-                                    $v = $s;
-                                    break;
-                                }
-                            }
-                        }
-                        if (is_array($v)) {
-                            $v = array_pop($v); // Always strip data type.
-                        }
-                    } elseif (is_object($v) && $v instanceof Element) {
-                        $map = $this->_getMapping($propName);
-                        if (!is_bool($map)) {
-                            $decoded = $asn1->decodeBER($v);
-                            $v = $asn1->asn1map($decoded[0], $map);
-                        }
-                    }
-                }
-                $result[] = $v;
-            }
-        }
-
-        return $result;
-    }
-
-    /**
-     * Set a Distinguished Name
-     *
-     * @param mixed $dn
-     * @param bool $merge optional
-     * @param string $type optional
-     * @access public
-     * @return bool
-     */
-    function setDN($dn, $merge = false, $type = 'utf8String')
-    {
-        if (!$merge) {
-            $this->dn = null;
-        }
-
-        if (is_array($dn)) {
-            if (isset($dn['rdnSequence'])) {
-                $this->dn = $dn; // No merge here.
-                return true;
-            }
-
-            // handles stuff generated by openssl_x509_parse()
-            foreach ($dn as $prop => $value) {
-                if (!$this->setDNProp($prop, $value, $type)) {
-                    return false;
-                }
-            }
-            return true;
-        }
-
-        // handles everything else
-        $results = preg_split('#((?:^|, *|/)(?:C=|O=|OU=|CN=|L=|ST=|SN=|postalCode=|streetAddress=|emailAddress=|serialNumber=|organizationalUnitName=|title=|description=|role=|x500UniqueIdentifier=|postalAddress=))#', $dn, -1, PREG_SPLIT_DELIM_CAPTURE);
-        for ($i = 1; $i < count($results); $i+=2) {
-            $prop = trim($results[$i], ', =/');
-            $value = $results[$i + 1];
-            if (!$this->setDNProp($prop, $value, $type)) {
-                return false;
-            }
-        }
-
-        return true;
-    }
-
-    /**
-     * Get the Distinguished Name for a certificates subject
-     *
-     * @param mixed $format optional
-     * @param array $dn optional
-     * @access public
-     * @return bool
-     */
-    function getDN($format = self::DN_ARRAY, $dn = null)
-    {
-        if (!isset($dn)) {
-            $dn = isset($this->currentCert['tbsCertList']) ? $this->currentCert['tbsCertList']['issuer'] : $this->dn;
-        }
-
-        switch ((int) $format) {
-            case self::DN_ARRAY:
-                return $dn;
-            case self::DN_ASN1:
-                $asn1 = new ASN1();
-                $asn1->loadOIDs($this->oids);
-                $filters = array();
-                $filters['rdnSequence']['value'] = array('type' => ASN1::TYPE_UTF8_STRING);
-                $asn1->loadFilters($filters);
-                $this->_mapOutDNs($dn, 'rdnSequence', $asn1);
-                return $asn1->encodeDER($dn, $this->Name);
-            case self::DN_CANON:
-                //  No SEQUENCE around RDNs and all string values normalized as
-                // trimmed lowercase UTF-8 with all spacing as one blank.
-                // constructed RDNs will not be canonicalized
-                $asn1 = new ASN1();
-                $asn1->loadOIDs($this->oids);
-                $filters = array();
-                $filters['value'] = array('type' => ASN1::TYPE_UTF8_STRING);
-                $asn1->loadFilters($filters);
-                $result = '';
-                $this->_mapOutDNs($dn, 'rdnSequence', $asn1);
-                foreach ($dn['rdnSequence'] as $rdn) {
-                    foreach ($rdn as $i => $attr) {
-                        $attr = &$rdn[$i];
-                        if (is_array($attr['value'])) {
-                            foreach ($attr['value'] as $type => $v) {
-                                $type = array_search($type, $asn1->ANYmap, true);
-                                if ($type !== false && isset($asn1->stringTypeSize[$type])) {
-                                    $v = $asn1->convert($v, $type);
-                                    if ($v !== false) {
-                                        $v = preg_replace('/\s+/', ' ', $v);
-                                        $attr['value'] = strtolower(trim($v));
-                                        break;
-                                    }
-                                }
-                            }
-                        }
-                    }
-                    $result .= $asn1->encodeDER($rdn, $this->RelativeDistinguishedName);
-                }
-                return $result;
-            case self::DN_HASH:
-                $dn = $this->getDN(self::DN_CANON, $dn);
-                $hash = new Hash('sha1');
-                $hash = $hash->hash($dn);
-                extract(unpack('Vhash', $hash));
-                return strtolower(bin2hex(pack('N', $hash)));
-        }
-
-        // Default is to return a string.
-        $start = true;
-        $output = '';
-
-        $result = array();
-        $asn1 = new ASN1();
-        $asn1->loadOIDs($this->oids);
-        $filters = array();
-        $filters['rdnSequence']['value'] = array('type' => ASN1::TYPE_UTF8_STRING);
-        $asn1->loadFilters($filters);
-        $this->_mapOutDNs($dn, 'rdnSequence', $asn1);
-
-        foreach ($dn['rdnSequence'] as $field) {
-            $prop = $field[0]['type'];
-            $value = $field[0]['value'];
-
-            $delim = ', ';
-            switch ($prop) {
-                case 'id-at-countryName':
-                    $desc = 'C';
-                    break;
-                case 'id-at-stateOrProvinceName':
-                    $desc = 'ST';
-                    break;
-                case 'id-at-organizationName':
-                    $desc = 'O';
-                    break;
-                case 'id-at-organizationalUnitName':
-                    $desc = 'OU';
-                    break;
-                case 'id-at-commonName':
-                    $desc = 'CN';
-                    break;
-                case 'id-at-localityName':
-                    $desc = 'L';
-                    break;
-                case 'id-at-surname':
-                    $desc = 'SN';
-                    break;
-                case 'id-at-uniqueIdentifier':
-                    $delim = '/';
-                    $desc = 'x500UniqueIdentifier';
-                    break;
-                case 'id-at-postalAddress':
-                    $delim = '/';
-                    $desc = 'postalAddress';
-                    break;
-                default:
-                    $delim = '/';
-                    $desc = preg_replace('#.+-([^-]+)$#', '$1', $prop);
-            }
-
-            if (!$start) {
-                $output.= $delim;
-            }
-            if (is_array($value)) {
-                foreach ($value as $type => $v) {
-                    $type = array_search($type, $asn1->ANYmap, true);
-                    if ($type !== false && isset($asn1->stringTypeSize[$type])) {
-                        $v = $asn1->convert($v, $type);
-                        if ($v !== false) {
-                            $value = $v;
-                            break;
-                        }
-                    }
-                }
-                if (is_array($value)) {
-                    $value = array_pop($value); // Always strip data type.
-                }
-            } elseif (is_object($value) && $value instanceof Element) {
-                $callback = create_function('$x', 'return "\x" . bin2hex($x[0]);');
-                $value = strtoupper(preg_replace_callback('#[^\x20-\x7E]#', $callback, $value->element));
-            }
-            $output.= $desc . '=' . $value;
-            $result[$desc] = isset($result[$desc]) ?
-                array_merge((array) $dn[$prop], array($value)) :
-                $value;
-            $start = false;
-        }
-
-        return $format == self::DN_OPENSSL ? $result : $output;
-    }
-
-    /**
-     * Get the Distinguished Name for a certificate/crl issuer
-     *
-     * @param int $format optional
-     * @access public
-     * @return mixed
-     */
-    function getIssuerDN($format = self::DN_ARRAY)
-    {
-        switch (true) {
-            case !isset($this->currentCert) || !is_array($this->currentCert):
-                break;
-            case isset($this->currentCert['tbsCertificate']):
-                return $this->getDN($format, $this->currentCert['tbsCertificate']['issuer']);
-            case isset($this->currentCert['tbsCertList']):
-                return $this->getDN($format, $this->currentCert['tbsCertList']['issuer']);
-        }
-
-        return false;
-    }
-
-    /**
-     * Get the Distinguished Name for a certificate/csr subject
-     * Alias of getDN()
-     *
-     * @param int $format optional
-     * @access public
-     * @return mixed
-     */
-    function getSubjectDN($format = self::DN_ARRAY)
-    {
-        switch (true) {
-            case !empty($this->dn):
-                return $this->getDN($format);
-            case !isset($this->currentCert) || !is_array($this->currentCert):
-                break;
-            case isset($this->currentCert['tbsCertificate']):
-                return $this->getDN($format, $this->currentCert['tbsCertificate']['subject']);
-            case isset($this->currentCert['certificationRequestInfo']):
-                return $this->getDN($format, $this->currentCert['certificationRequestInfo']['subject']);
-        }
-
-        return false;
-    }
-
-    /**
-     * Get an individual Distinguished Name property for a certificate/crl issuer
-     *
-     * @param string $propName
-     * @param bool $withType optional
-     * @access public
-     * @return mixed
-     */
-    function getIssuerDNProp($propName, $withType = false)
-    {
-        switch (true) {
-            case !isset($this->currentCert) || !is_array($this->currentCert):
-                break;
-            case isset($this->currentCert['tbsCertificate']):
-                return $this->getDNProp($propName, $this->currentCert['tbsCertificate']['issuer'], $withType);
-            case isset($this->currentCert['tbsCertList']):
-                return $this->getDNProp($propName, $this->currentCert['tbsCertList']['issuer'], $withType);
-        }
-
-        return false;
-    }
-
-    /**
-     * Get an individual Distinguished Name property for a certificate/csr subject
-     *
-     * @param string $propName
-     * @param bool $withType optional
-     * @access public
-     * @return mixed
-     */
-    function getSubjectDNProp($propName, $withType = false)
-    {
-        switch (true) {
-            case !empty($this->dn):
-                return $this->getDNProp($propName, null, $withType);
-            case !isset($this->currentCert) || !is_array($this->currentCert):
-                break;
-            case isset($this->currentCert['tbsCertificate']):
-                return $this->getDNProp($propName, $this->currentCert['tbsCertificate']['subject'], $withType);
-            case isset($this->currentCert['certificationRequestInfo']):
-                return $this->getDNProp($propName, $this->currentCert['certificationRequestInfo']['subject'], $withType);
-        }
-
-        return false;
-    }
-
-    /**
-     * Get the certificate chain for the current cert
-     *
-     * @access public
-     * @return mixed
-     */
-    function getChain()
-    {
-        $chain = array($this->currentCert);
-
-        if (!is_array($this->currentCert) || !isset($this->currentCert['tbsCertificate'])) {
-            return false;
-        }
-        if (empty($this->CAs)) {
-            return $chain;
-        }
-        while (true) {
-            $currentCert = $chain[count($chain) - 1];
-            for ($i = 0; $i < count($this->CAs); $i++) {
-                $ca = $this->CAs[$i];
-                if ($currentCert['tbsCertificate']['issuer'] === $ca['tbsCertificate']['subject']) {
-                    $authorityKey = $this->getExtension('id-ce-authorityKeyIdentifier', $currentCert);
-                    $subjectKeyID = $this->getExtension('id-ce-subjectKeyIdentifier', $ca);
-                    switch (true) {
-                        case !is_array($authorityKey):
-                        case is_array($authorityKey) && isset($authorityKey['keyIdentifier']) && $authorityKey['keyIdentifier'] === $subjectKeyID:
-                            if ($currentCert === $ca) {
-                                break 3;
-                            }
-                            $chain[] = $ca;
-                            break 2;
-                    }
-                }
-            }
-            if ($i == count($this->CAs)) {
-                break;
-            }
-        }
-        foreach ($chain as $key => $value) {
-            $chain[$key] = new X509();
-            $chain[$key]->loadX509($value);
-        }
-        return $chain;
-    }
-
-    /**
-     * Set public key
-     *
-     * Key needs to be a \phpseclib\Crypt\RSA object
-     *
-     * @param object $key
-     * @access public
-     * @return bool
-     */
-    function setPublicKey($key)
-    {
-        $key->setPublicKey();
-        $this->publicKey = $key;
-    }
-
-    /**
-     * Set private key
-     *
-     * Key needs to be a \phpseclib\Crypt\RSA object
-     *
-     * @param object $key
-     * @access public
-     */
-    function setPrivateKey($key)
-    {
-        $this->privateKey = $key;
-    }
-
-    /**
-     * Set challenge
-     *
-     * Used for SPKAC CSR's
-     *
-     * @param string $challenge
-     * @access public
-     */
-    function setChallenge($challenge)
-    {
-        $this->challenge = $challenge;
-    }
-
-    /**
-     * Gets the public key
-     *
-     * Returns a \phpseclib\Crypt\RSA object or a false.
-     *
-     * @access public
-     * @return mixed
-     */
-    function getPublicKey()
-    {
-        if (isset($this->publicKey)) {
-            return $this->publicKey;
-        }
-
-        if (isset($this->currentCert) && is_array($this->currentCert)) {
-            foreach (array('tbsCertificate/subjectPublicKeyInfo', 'certificationRequestInfo/subjectPKInfo') as $path) {
-                $keyinfo = $this->_subArray($this->currentCert, $path);
-                if (!empty($keyinfo)) {
-                    break;
-                }
-            }
-        }
-        if (empty($keyinfo)) {
-            return false;
-        }
-
-        $key = $keyinfo['subjectPublicKey'];
-
-        switch ($keyinfo['algorithm']['algorithm']) {
-            case 'rsaEncryption':
-                $publicKey = new RSA();
-                $publicKey->loadKey($key);
-                $publicKey->setPublicKey();
-                break;
-            default:
-                return false;
-        }
-
-        return $publicKey;
-    }
-
-    /**
-     * Load a Certificate Signing Request
-     *
-     * @param string $csr
-     * @access public
-     * @return mixed
-     */
-    function loadCSR($csr, $mode = self::FORMAT_AUTO_DETECT)
-    {
-        if (is_array($csr) && isset($csr['certificationRequestInfo'])) {
-            unset($this->currentCert);
-            unset($this->currentKeyIdentifier);
-            unset($this->signatureSubject);
-            $this->dn = $csr['certificationRequestInfo']['subject'];
-            if (!isset($this->dn)) {
-                return false;
-            }
-
-            $this->currentCert = $csr;
-            return $csr;
-        }
-
-        // see http://tools.ietf.org/html/rfc2986
-
-        $asn1 = new ASN1();
-
-        if ($mode != self::FORMAT_DER) {
-            $newcsr = $this->_extractBER($csr);
-            if ($mode == self::FORMAT_PEM && $csr == $newcsr) {
-                return false;
-            }
-            $csr = $newcsr;
-        }
-        $orig = $csr;
-
-        if ($csr === false) {
-            $this->currentCert = false;
-            return false;
-        }
-
-        $asn1->loadOIDs($this->oids);
-        $decoded = $asn1->decodeBER($csr);
-
-        if (empty($decoded)) {
-            $this->currentCert = false;
-            return false;
-        }
-
-        $csr = $asn1->asn1map($decoded[0], $this->CertificationRequest);
-        if (!isset($csr) || $csr === false) {
-            $this->currentCert = false;
-            return false;
-        }
-
-        $this->_mapInAttributes($csr, 'certificationRequestInfo/attributes', $asn1);
-        $this->_mapInDNs($csr, 'certificationRequestInfo/subject/rdnSequence', $asn1);
-
-        $this->dn = $csr['certificationRequestInfo']['subject'];
-
-        $this->signatureSubject = substr($orig, $decoded[0]['content'][0]['start'], $decoded[0]['content'][0]['length']);
-
-        $algorithm = &$csr['certificationRequestInfo']['subjectPKInfo']['algorithm']['algorithm'];
-        $key = &$csr['certificationRequestInfo']['subjectPKInfo']['subjectPublicKey'];
-        $key = $this->_reformatKey($algorithm, $key);
-
-        switch ($algorithm) {
-            case 'rsaEncryption':
-                $this->publicKey = new RSA();
-                $this->publicKey->loadKey($key);
-                $this->publicKey->setPublicKey();
-                break;
-            default:
-                $this->publicKey = null;
-        }
-
-        $this->currentKeyIdentifier = null;
-        $this->currentCert = $csr;
-
-        return $csr;
-    }
-
-    /**
-     * Save CSR request
-     *
-     * @param array $csr
-     * @param int $format optional
-     * @access public
-     * @return string
-     */
-    function saveCSR($csr, $format = self::FORMAT_PEM)
-    {
-        if (!is_array($csr) || !isset($csr['certificationRequestInfo'])) {
-            return false;
-        }
-
-        switch (true) {
-            case !($algorithm = $this->_subArray($csr, 'certificationRequestInfo/subjectPKInfo/algorithm/algorithm')):
-            case is_object($csr['certificationRequestInfo']['subjectPKInfo']['subjectPublicKey']):
-                break;
-            default:
-                switch ($algorithm) {
-                    case 'rsaEncryption':
-                        $csr['certificationRequestInfo']['subjectPKInfo']['subjectPublicKey']
-                            = base64_encode("\0" . base64_decode(preg_replace('#-.+-|[\r\n]#', '', $csr['certificationRequestInfo']['subjectPKInfo']['subjectPublicKey'])));
-                        $csr['certificationRequestInfo']['subjectPKInfo']['algorithm']['parameters'] = null;
-                        $csr['signatureAlgorithm']['parameters'] = null;
-                        $csr['certificationRequestInfo']['signature']['parameters'] = null;
-                }
-        }
-
-        $asn1 = new ASN1();
-
-        $asn1->loadOIDs($this->oids);
-
-        $filters = array();
-        $filters['certificationRequestInfo']['subject']['rdnSequence']['value']
-            = array('type' => ASN1::TYPE_UTF8_STRING);
-
-        $asn1->loadFilters($filters);
-
-        $this->_mapOutDNs($csr, 'certificationRequestInfo/subject/rdnSequence', $asn1);
-        $this->_mapOutAttributes($csr, 'certificationRequestInfo/attributes', $asn1);
-        $csr = $asn1->encodeDER($csr, $this->CertificationRequest);
-
-        switch ($format) {
-            case self::FORMAT_DER:
-                return $csr;
-            // case self::FORMAT_PEM:
-            default:
-                return "-----BEGIN CERTIFICATE REQUEST-----\r\n" . chunk_split(base64_encode($csr), 64) . '-----END CERTIFICATE REQUEST-----';
-        }
-    }
-
-    /**
-     * Load a SPKAC CSR
-     *
-     * SPKAC's are produced by the HTML5 keygen element:
-     *
-     * https://developer.mozilla.org/en-US/docs/HTML/Element/keygen
-     *
-     * @param string $csr
-     * @access public
-     * @return mixed
-     */
-    function loadSPKAC($spkac)
-    {
-        if (is_array($spkac) && isset($spkac['publicKeyAndChallenge'])) {
-            unset($this->currentCert);
-            unset($this->currentKeyIdentifier);
-            unset($this->signatureSubject);
-            $this->currentCert = $spkac;
-            return $spkac;
-        }
-
-        // see http://www.w3.org/html/wg/drafts/html/master/forms.html#signedpublickeyandchallenge
-
-        $asn1 = new ASN1();
-
-        // OpenSSL produces SPKAC's that are preceded by the string SPKAC=
-        $temp = preg_replace('#(?:SPKAC=)|[ \r\n\\\]#', '', $spkac);
-        $temp = preg_match('#^[a-zA-Z\d/+]*={0,2}$#', $temp) ? base64_decode($temp) : false;
-        if ($temp != false) {
-            $spkac = $temp;
-        }
-        $orig = $spkac;
-
-        if ($spkac === false) {
-            $this->currentCert = false;
-            return false;
-        }
-
-        $asn1->loadOIDs($this->oids);
-        $decoded = $asn1->decodeBER($spkac);
-
-        if (empty($decoded)) {
-            $this->currentCert = false;
-            return false;
-        }
-
-        $spkac = $asn1->asn1map($decoded[0], $this->SignedPublicKeyAndChallenge);
-
-        if (!isset($spkac) || $spkac === false) {
-            $this->currentCert = false;
-            return false;
-        }
-
-        $this->signatureSubject = substr($orig, $decoded[0]['content'][0]['start'], $decoded[0]['content'][0]['length']);
-
-        $algorithm = &$spkac['publicKeyAndChallenge']['spki']['algorithm']['algorithm'];
-        $key = &$spkac['publicKeyAndChallenge']['spki']['subjectPublicKey'];
-        $key = $this->_reformatKey($algorithm, $key);
-
-        switch ($algorithm) {
-            case 'rsaEncryption':
-                $this->publicKey = new RSA();
-                $this->publicKey->loadKey($key);
-                $this->publicKey->setPublicKey();
-                break;
-            default:
-                $this->publicKey = null;
-        }
-
-        $this->currentKeyIdentifier = null;
-        $this->currentCert = $spkac;
-
-        return $spkac;
-    }
-
-    /**
-     * Save a SPKAC CSR request
-     *
-     * @param array $csr
-     * @param int $format optional
-     * @access public
-     * @return string
-     */
-    function saveSPKAC($spkac, $format = self::FORMAT_PEM)
-    {
-        if (!is_array($spkac) || !isset($spkac['publicKeyAndChallenge'])) {
-            return false;
-        }
-
-        $algorithm = $this->_subArray($spkac, 'publicKeyAndChallenge/spki/algorithm/algorithm');
-        switch (true) {
-            case !$algorithm:
-            case is_object($spkac['publicKeyAndChallenge']['spki']['subjectPublicKey']):
-                break;
-            default:
-                switch ($algorithm) {
-                    case 'rsaEncryption':
-                        $spkac['publicKeyAndChallenge']['spki']['subjectPublicKey']
-                            = base64_encode("\0" . base64_decode(preg_replace('#-.+-|[\r\n]#', '', $spkac['publicKeyAndChallenge']['spki']['subjectPublicKey'])));
-                }
-        }
-
-        $asn1 = new ASN1();
-
-        $asn1->loadOIDs($this->oids);
-        $spkac = $asn1->encodeDER($spkac, $this->SignedPublicKeyAndChallenge);
-
-        switch ($format) {
-            case self::FORMAT_DER:
-                return $spkac;
-            // case self::FORMAT_PEM:
-            default:
-                // OpenSSL's implementation of SPKAC requires the SPKAC be preceded by SPKAC= and since there are pretty much
-                // no other SPKAC decoders phpseclib will use that same format
-                return 'SPKAC=' . base64_encode($spkac);
-        }
-    }
-
-    /**
-     * Load a Certificate Revocation List
-     *
-     * @param string $crl
-     * @access public
-     * @return mixed
-     */
-    function loadCRL($crl, $mode = self::FORMAT_AUTO_DETECT)
-    {
-        if (is_array($crl) && isset($crl['tbsCertList'])) {
-            $this->currentCert = $crl;
-            unset($this->signatureSubject);
-            return $crl;
-        }
-
-        $asn1 = new ASN1();
-
-        if ($mode != self::FORMAT_DER) {
-            $newcrl = $this->_extractBER($crl);
-            if ($mode == self::FORMAT_PEM && $crl == $newcrl) {
-                return false;
-            }
-            $crl = $newcrl;
-        }
-        $orig = $crl;
-
-        if ($crl === false) {
-            $this->currentCert = false;
-            return false;
-        }
-
-        $asn1->loadOIDs($this->oids);
-        $decoded = $asn1->decodeBER($crl);
-
-        if (empty($decoded)) {
-            $this->currentCert = false;
-            return false;
-        }
-
-        $crl = $asn1->asn1map($decoded[0], $this->CertificateList);
-        if (!isset($crl) || $crl === false) {
-            $this->currentCert = false;
-            return false;
-        }
-
-        $this->signatureSubject = substr($orig, $decoded[0]['content'][0]['start'], $decoded[0]['content'][0]['length']);
-
-        $this->_mapInDNs($crl, 'tbsCertList/issuer/rdnSequence', $asn1);
-        if ($this->_isSubArrayValid($crl, 'tbsCertList/crlExtensions')) {
-            $this->_mapInExtensions($crl, 'tbsCertList/crlExtensions', $asn1);
-        }
-        if ($this->_isSubArrayValid($crl, 'tbsCertList/revokedCertificates')) {
-            $rclist_ref = &$this->_subArrayUnchecked($crl, 'tbsCertList/revokedCertificates');
-            if ($rclist_ref) {
-                $rclist = $crl['tbsCertList']['revokedCertificates'];
-                foreach ($rclist as $i => $extension) {
-                    if ($this->_isSubArrayValid($rclist, "$i/crlEntryExtensions", $asn1)) {
-                        $this->_mapInExtensions($rclist_ref, "$i/crlEntryExtensions", $asn1);
-                    }
-                }
-            }
-        }
-
-        $this->currentKeyIdentifier = null;
-        $this->currentCert = $crl;
-
-        return $crl;
-    }
-
-    /**
-     * Save Certificate Revocation List.
-     *
-     * @param array $crl
-     * @param int $format optional
-     * @access public
-     * @return string
-     */
-    function saveCRL($crl, $format = self::FORMAT_PEM)
-    {
-        if (!is_array($crl) || !isset($crl['tbsCertList'])) {
-            return false;
-        }
-
-        $asn1 = new ASN1();
-
-        $asn1->loadOIDs($this->oids);
-
-        $filters = array();
-        $filters['tbsCertList']['issuer']['rdnSequence']['value']
-            = array('type' => ASN1::TYPE_UTF8_STRING);
-        $filters['tbsCertList']['signature']['parameters']
-            = array('type' => ASN1::TYPE_UTF8_STRING);
-        $filters['signatureAlgorithm']['parameters']
-            = array('type' => ASN1::TYPE_UTF8_STRING);
-
-        if (empty($crl['tbsCertList']['signature']['parameters'])) {
-            $filters['tbsCertList']['signature']['parameters']
-                = array('type' => ASN1::TYPE_NULL);
-        }
-
-        if (empty($crl['signatureAlgorithm']['parameters'])) {
-            $filters['signatureAlgorithm']['parameters']
-                = array('type' => ASN1::TYPE_NULL);
-        }
-
-        $asn1->loadFilters($filters);
-
-        $this->_mapOutDNs($crl, 'tbsCertList/issuer/rdnSequence', $asn1);
-        $this->_mapOutExtensions($crl, 'tbsCertList/crlExtensions', $asn1);
-        $rclist = &$this->_subArray($crl, 'tbsCertList/revokedCertificates');
-        if (is_array($rclist)) {
-            foreach ($rclist as $i => $extension) {
-                $this->_mapOutExtensions($rclist, "$i/crlEntryExtensions", $asn1);
-            }
-        }
-
-        $crl = $asn1->encodeDER($crl, $this->CertificateList);
-
-        switch ($format) {
-            case self::FORMAT_DER:
-                return $crl;
-            // case self::FORMAT_PEM:
-            default:
-                return "-----BEGIN X509 CRL-----\r\n" . chunk_split(base64_encode($crl), 64) . '-----END X509 CRL-----';
-        }
-    }
-
-    /**
-     * Helper function to build a time field according to RFC 3280 section
-     *  - 4.1.2.5 Validity
-     *  - 5.1.2.4 This Update
-     *  - 5.1.2.5 Next Update
-     *  - 5.1.2.6 Revoked Certificates
-     * by choosing utcTime iff year of date given is before 2050 and generalTime else.
-     *
-     * @param string $date in format date('D, d M Y H:i:s O')
-     * @access private
-     * @return array
-     */
-    function _timeField($date)
-    {
-        $year = @gmdate("Y", @strtotime($date)); // the same way ASN1.php parses this
-        if ($year < 2050) {
-            return array('utcTime' => $date);
-        } else {
-            return array('generalTime' => $date);
-        }
-    }
-
-    /**
-     * Sign an X.509 certificate
-     *
-     * $issuer's private key needs to be loaded.
-     * $subject can be either an existing X.509 cert (if you want to resign it),
-     * a CSR or something with the DN and public key explicitly set.
-     *
-     * @param \phpseclib\File\X509 $issuer
-     * @param \phpseclib\File\X509 $subject
-     * @param string $signatureAlgorithm optional
-     * @access public
-     * @return mixed
-     */
-    function sign($issuer, $subject, $signatureAlgorithm = 'sha1WithRSAEncryption')
-    {
-        if (!is_object($issuer->privateKey) || empty($issuer->dn)) {
-            return false;
-        }
-
-        if (isset($subject->publicKey) && !($subjectPublicKey = $subject->_formatSubjectPublicKey())) {
-            return false;
-        }
-
-        $currentCert = isset($this->currentCert) ? $this->currentCert : null;
-        $signatureSubject = isset($this->signatureSubject) ? $this->signatureSubject: null;
-
-        if (isset($subject->currentCert) && is_array($subject->currentCert) && isset($subject->currentCert['tbsCertificate'])) {
-            $this->currentCert = $subject->currentCert;
-            $this->currentCert['tbsCertificate']['signature']['algorithm'] = $signatureAlgorithm;
-            $this->currentCert['signatureAlgorithm']['algorithm'] = $signatureAlgorithm;
-
-            if (!empty($this->startDate)) {
-                $this->currentCert['tbsCertificate']['validity']['notBefore'] = $this->_timeField($this->startDate);
-            }
-            if (!empty($this->endDate)) {
-                $this->currentCert['tbsCertificate']['validity']['notAfter'] = $this->_timeField($this->endDate);
-            }
-            if (!empty($this->serialNumber)) {
-                $this->currentCert['tbsCertificate']['serialNumber'] = $this->serialNumber;
-            }
-            if (!empty($subject->dn)) {
-                $this->currentCert['tbsCertificate']['subject'] = $subject->dn;
-            }
-            if (!empty($subject->publicKey)) {
-                $this->currentCert['tbsCertificate']['subjectPublicKeyInfo'] = $subjectPublicKey;
-            }
-            $this->removeExtension('id-ce-authorityKeyIdentifier');
-            if (isset($subject->domains)) {
-                $this->removeExtension('id-ce-subjectAltName');
-            }
-        } elseif (isset($subject->currentCert) && is_array($subject->currentCert) && isset($subject->currentCert['tbsCertList'])) {
-            return false;
-        } else {
-            if (!isset($subject->publicKey)) {
-                return false;
-            }
-
-            $startDate = !empty($this->startDate) ? $this->startDate : @date('D, d M Y H:i:s O');
-            $endDate = !empty($this->endDate) ? $this->endDate : @date('D, d M Y H:i:s O', strtotime('+1 year'));
-            /* "The serial number MUST be a positive integer"
-               "Conforming CAs MUST NOT use serialNumber values longer than 20 octets."
-                -- https://tools.ietf.org/html/rfc5280#section-4.1.2.2
-
-               for the integer to be positive the leading bit needs to be 0 hence the
-               application of a bitmap
-            */
-            $serialNumber = !empty($this->serialNumber) ?
-                $this->serialNumber :
-                new BigInteger(Random::string(20) & ("\x7F" . str_repeat("\xFF", 19)), 256);
-
-            $this->currentCert = array(
-                'tbsCertificate' =>
-                    array(
-                        'version' => 'v3',
-                        'serialNumber' => $serialNumber, // $this->setserialNumber()
-                        'signature' => array('algorithm' => $signatureAlgorithm),
-                        'issuer' => false, // this is going to be overwritten later
-                        'validity' => array(
-                            'notBefore' => $this->_timeField($startDate), // $this->setStartDate()
-                            'notAfter' => $this->_timeField($endDate)   // $this->setEndDate()
-                        ),
-                        'subject' => $subject->dn,
-                        'subjectPublicKeyInfo' => $subjectPublicKey
-                    ),
-                    'signatureAlgorithm' => array('algorithm' => $signatureAlgorithm),
-                    'signature'          => false // this is going to be overwritten later
-            );
-
-            // Copy extensions from CSR.
-            $csrexts = $subject->getAttribute('pkcs-9-at-extensionRequest', 0);
-
-            if (!empty($csrexts)) {
-                $this->currentCert['tbsCertificate']['extensions'] = $csrexts;
-            }
-        }
-
-        $this->currentCert['tbsCertificate']['issuer'] = $issuer->dn;
-
-        if (isset($issuer->currentKeyIdentifier)) {
-            $this->setExtension('id-ce-authorityKeyIdentifier', array(
-                    //'authorityCertIssuer' => array(
-                    //    array(
-                    //        'directoryName' => $issuer->dn
-                    //    )
-                    //),
-                    'keyIdentifier' => $issuer->currentKeyIdentifier
-                ));
-            //$extensions = &$this->currentCert['tbsCertificate']['extensions'];
-            //if (isset($issuer->serialNumber)) {
-            //    $extensions[count($extensions) - 1]['authorityCertSerialNumber'] = $issuer->serialNumber;
-            //}
-            //unset($extensions);
-        }
-
-        if (isset($subject->currentKeyIdentifier)) {
-            $this->setExtension('id-ce-subjectKeyIdentifier', $subject->currentKeyIdentifier);
-        }
-
-        $altName = array();
-
-        if (isset($subject->domains) && count($subject->domains)) {
-            $altName = array_map(array('\phpseclib\File\X509', '_dnsName'), $subject->domains);
-        }
-
-        if (isset($subject->ipAddresses) && count($subject->ipAddresses)) {
-            // should an IP address appear as the CN if no domain name is specified? idk
-            //$ips = count($subject->domains) ? $subject->ipAddresses : array_slice($subject->ipAddresses, 1);
-            $ipAddresses = array();
-            foreach ($subject->ipAddresses as $ipAddress) {
-                $encoded = $subject->_ipAddress($ipAddress);
-                if ($encoded !== false) {
-                    $ipAddresses[] = $encoded;
-                }
-            }
-            if (count($ipAddresses)) {
-                $altName = array_merge($altName, $ipAddresses);
-            }
-        }
-
-        if (!empty($altName)) {
-            $this->setExtension('id-ce-subjectAltName', $altName);
-        }
-
-        if ($this->caFlag) {
-            $keyUsage = $this->getExtension('id-ce-keyUsage');
-            if (!$keyUsage) {
-                $keyUsage = array();
-            }
-
-            $this->setExtension(
-                'id-ce-keyUsage',
-                array_values(array_unique(array_merge($keyUsage, array('cRLSign', 'keyCertSign'))))
-            );
-
-            $basicConstraints = $this->getExtension('id-ce-basicConstraints');
-            if (!$basicConstraints) {
-                $basicConstraints = array();
-            }
-
-            $this->setExtension(
-                'id-ce-basicConstraints',
-                array_unique(array_merge(array('cA' => true), $basicConstraints)),
-                true
-            );
-
-            if (!isset($subject->currentKeyIdentifier)) {
-                $this->setExtension('id-ce-subjectKeyIdentifier', base64_encode($this->computeKeyIdentifier($this->currentCert)), false, false);
-            }
-        }
-
-        // resync $this->signatureSubject
-        // save $tbsCertificate in case there are any \phpseclib\File\ASN1\Element objects in it
-        $tbsCertificate = $this->currentCert['tbsCertificate'];
-        $this->loadX509($this->saveX509($this->currentCert));
-
-        $result = $this->_sign($issuer->privateKey, $signatureAlgorithm);
-        $result['tbsCertificate'] = $tbsCertificate;
-
-        $this->currentCert = $currentCert;
-        $this->signatureSubject = $signatureSubject;
-
-        return $result;
-    }
-
-    /**
-     * Sign a CSR
-     *
-     * @access public
-     * @return mixed
-     */
-    function signCSR($signatureAlgorithm = 'sha1WithRSAEncryption')
-    {
-        if (!is_object($this->privateKey) || empty($this->dn)) {
-            return false;
-        }
-
-        $origPublicKey = $this->publicKey;
-        $class = get_class($this->privateKey);
-        $this->publicKey = new $class();
-        $this->publicKey->loadKey($this->privateKey->getPublicKey());
-        $this->publicKey->setPublicKey();
-        if (!($publicKey = $this->_formatSubjectPublicKey())) {
-            return false;
-        }
-        $this->publicKey = $origPublicKey;
-
-        $currentCert = isset($this->currentCert) ? $this->currentCert : null;
-        $signatureSubject = isset($this->signatureSubject) ? $this->signatureSubject: null;
-
-        if (isset($this->currentCert) && is_array($this->currentCert) && isset($this->currentCert['certificationRequestInfo'])) {
-            $this->currentCert['signatureAlgorithm']['algorithm'] = $signatureAlgorithm;
-            if (!empty($this->dn)) {
-                $this->currentCert['certificationRequestInfo']['subject'] = $this->dn;
-            }
-            $this->currentCert['certificationRequestInfo']['subjectPKInfo'] = $publicKey;
-        } else {
-            $this->currentCert = array(
-                'certificationRequestInfo' =>
-                    array(
-                        'version' => 'v1',
-                        'subject' => $this->dn,
-                        'subjectPKInfo' => $publicKey
-                    ),
-                    'signatureAlgorithm' => array('algorithm' => $signatureAlgorithm),
-                    'signature'          => false // this is going to be overwritten later
-            );
-        }
-
-        // resync $this->signatureSubject
-        // save $certificationRequestInfo in case there are any \phpseclib\File\ASN1\Element objects in it
-        $certificationRequestInfo = $this->currentCert['certificationRequestInfo'];
-        $this->loadCSR($this->saveCSR($this->currentCert));
-
-        $result = $this->_sign($this->privateKey, $signatureAlgorithm);
-        $result['certificationRequestInfo'] = $certificationRequestInfo;
-
-        $this->currentCert = $currentCert;
-        $this->signatureSubject = $signatureSubject;
-
-        return $result;
-    }
-
-    /**
-     * Sign a SPKAC
-     *
-     * @access public
-     * @return mixed
-     */
-    function signSPKAC($signatureAlgorithm = 'sha1WithRSAEncryption')
-    {
-        if (!is_object($this->privateKey)) {
-            return false;
-        }
-
-        $origPublicKey = $this->publicKey;
-        $class = get_class($this->privateKey);
-        $this->publicKey = new $class();
-        $this->publicKey->loadKey($this->privateKey->getPublicKey());
-        $this->publicKey->setPublicKey();
-        $publicKey = $this->_formatSubjectPublicKey();
-        if (!$publicKey) {
-            return false;
-        }
-        $this->publicKey = $origPublicKey;
-
-        $currentCert = isset($this->currentCert) ? $this->currentCert : null;
-        $signatureSubject = isset($this->signatureSubject) ? $this->signatureSubject: null;
-
-        // re-signing a SPKAC seems silly but since everything else supports re-signing why not?
-        if (isset($this->currentCert) && is_array($this->currentCert) && isset($this->currentCert['publicKeyAndChallenge'])) {
-            $this->currentCert['signatureAlgorithm']['algorithm'] = $signatureAlgorithm;
-            $this->currentCert['publicKeyAndChallenge']['spki'] = $publicKey;
-            if (!empty($this->challenge)) {
-                // the bitwise AND ensures that the output is a valid IA5String
-                $this->currentCert['publicKeyAndChallenge']['challenge'] = $this->challenge & str_repeat("\x7F", strlen($this->challenge));
-            }
-        } else {
-            $this->currentCert = array(
-                'publicKeyAndChallenge' =>
-                    array(
-                        'spki' => $publicKey,
-                        // quoting ,
-                        // "A challenge string that is submitted along with the public key. Defaults to an empty string if not specified."
-                        // both Firefox and OpenSSL ("openssl spkac -key private.key") behave this way
-                        // we could alternatively do this instead if we ignored the specs:
-                        // Random::string(8) & str_repeat("\x7F", 8)
-                        'challenge' => !empty($this->challenge) ? $this->challenge : ''
-                    ),
-                    'signatureAlgorithm' => array('algorithm' => $signatureAlgorithm),
-                    'signature'          => false // this is going to be overwritten later
-            );
-        }
-
-        // resync $this->signatureSubject
-        // save $publicKeyAndChallenge in case there are any \phpseclib\File\ASN1\Element objects in it
-        $publicKeyAndChallenge = $this->currentCert['publicKeyAndChallenge'];
-        $this->loadSPKAC($this->saveSPKAC($this->currentCert));
-
-        $result = $this->_sign($this->privateKey, $signatureAlgorithm);
-        $result['publicKeyAndChallenge'] = $publicKeyAndChallenge;
-
-        $this->currentCert = $currentCert;
-        $this->signatureSubject = $signatureSubject;
-
-        return $result;
-    }
-
-    /**
-     * Sign a CRL
-     *
-     * $issuer's private key needs to be loaded.
-     *
-     * @param \phpseclib\File\X509 $issuer
-     * @param \phpseclib\File\X509 $crl
-     * @param string $signatureAlgorithm optional
-     * @access public
-     * @return mixed
-     */
-    function signCRL($issuer, $crl, $signatureAlgorithm = 'sha1WithRSAEncryption')
-    {
-        if (!is_object($issuer->privateKey) || empty($issuer->dn)) {
-            return false;
-        }
-
-        $currentCert = isset($this->currentCert) ? $this->currentCert : null;
-        $signatureSubject = isset($this->signatureSubject) ? $this->signatureSubject : null;
-        $thisUpdate = !empty($this->startDate) ? $this->startDate : @date('D, d M Y H:i:s O');
-
-        if (isset($crl->currentCert) && is_array($crl->currentCert) && isset($crl->currentCert['tbsCertList'])) {
-            $this->currentCert = $crl->currentCert;
-            $this->currentCert['tbsCertList']['signature']['algorithm'] = $signatureAlgorithm;
-            $this->currentCert['signatureAlgorithm']['algorithm'] = $signatureAlgorithm;
-        } else {
-            $this->currentCert = array(
-                'tbsCertList' =>
-                    array(
-                        'version' => 'v2',
-                        'signature' => array('algorithm' => $signatureAlgorithm),
-                        'issuer' => false, // this is going to be overwritten later
-                        'thisUpdate' => $this->_timeField($thisUpdate) // $this->setStartDate()
-                    ),
-                    'signatureAlgorithm' => array('algorithm' => $signatureAlgorithm),
-                    'signature'          => false // this is going to be overwritten later
-            );
-        }
-
-        $tbsCertList = &$this->currentCert['tbsCertList'];
-        $tbsCertList['issuer'] = $issuer->dn;
-        $tbsCertList['thisUpdate'] = $this->_timeField($thisUpdate);
-
-        if (!empty($this->endDate)) {
-            $tbsCertList['nextUpdate'] = $this->_timeField($this->endDate); // $this->setEndDate()
-        } else {
-            unset($tbsCertList['nextUpdate']);
-        }
-
-        if (!empty($this->serialNumber)) {
-            $crlNumber = $this->serialNumber;
-        } else {
-            $crlNumber = $this->getExtension('id-ce-cRLNumber');
-            // "The CRL number is a non-critical CRL extension that conveys a
-            //  monotonically increasing sequence number for a given CRL scope and
-            //  CRL issuer.  This extension allows users to easily determine when a
-            //  particular CRL supersedes another CRL."
-            // -- https://tools.ietf.org/html/rfc5280#section-5.2.3
-            $crlNumber = $crlNumber !== false ? $crlNumber->add(new BigInteger(1)) : null;
-        }
-
-        $this->removeExtension('id-ce-authorityKeyIdentifier');
-        $this->removeExtension('id-ce-issuerAltName');
-
-        // Be sure version >= v2 if some extension found.
-        $version = isset($tbsCertList['version']) ? $tbsCertList['version'] : 0;
-        if (!$version) {
-            if (!empty($tbsCertList['crlExtensions'])) {
-                $version = 1; // v2.
-            } elseif (!empty($tbsCertList['revokedCertificates'])) {
-                foreach ($tbsCertList['revokedCertificates'] as $cert) {
-                    if (!empty($cert['crlEntryExtensions'])) {
-                        $version = 1; // v2.
-                    }
-                }
-            }
-
-            if ($version) {
-                $tbsCertList['version'] = $version;
-            }
-        }
-
-        // Store additional extensions.
-        if (!empty($tbsCertList['version'])) { // At least v2.
-            if (!empty($crlNumber)) {
-                $this->setExtension('id-ce-cRLNumber', $crlNumber);
-            }
-
-            if (isset($issuer->currentKeyIdentifier)) {
-                $this->setExtension('id-ce-authorityKeyIdentifier', array(
-                        //'authorityCertIssuer' => array(
-                        //    array(
-                        //        'directoryName' => $issuer->dn
-                        //    )
-                        //),
-                        'keyIdentifier' => $issuer->currentKeyIdentifier
-                    ));
-                //$extensions = &$tbsCertList['crlExtensions'];
-                //if (isset($issuer->serialNumber)) {
-                //    $extensions[count($extensions) - 1]['authorityCertSerialNumber'] = $issuer->serialNumber;
-                //}
-                //unset($extensions);
-            }
-
-            $issuerAltName = $this->getExtension('id-ce-subjectAltName', $issuer->currentCert);
-
-            if ($issuerAltName !== false) {
-                $this->setExtension('id-ce-issuerAltName', $issuerAltName);
-            }
-        }
-
-        if (empty($tbsCertList['revokedCertificates'])) {
-            unset($tbsCertList['revokedCertificates']);
-        }
-
-        unset($tbsCertList);
-
-        // resync $this->signatureSubject
-        // save $tbsCertList in case there are any \phpseclib\File\ASN1\Element objects in it
-        $tbsCertList = $this->currentCert['tbsCertList'];
-        $this->loadCRL($this->saveCRL($this->currentCert));
-
-        $result = $this->_sign($issuer->privateKey, $signatureAlgorithm);
-        $result['tbsCertList'] = $tbsCertList;
-
-        $this->currentCert = $currentCert;
-        $this->signatureSubject = $signatureSubject;
-
-        return $result;
-    }
-
-    /**
-     * X.509 certificate signing helper function.
-     *
-     * @param object $key
-     * @param \phpseclib\File\X509 $subject
-     * @param string $signatureAlgorithm
-     * @access public
-     * @return mixed
-     */
-    function _sign($key, $signatureAlgorithm)
-    {
-        if ($key instanceof RSA) {
-            switch ($signatureAlgorithm) {
-                case 'md2WithRSAEncryption':
-                case 'md5WithRSAEncryption':
-                case 'sha1WithRSAEncryption':
-                case 'sha224WithRSAEncryption':
-                case 'sha256WithRSAEncryption':
-                case 'sha384WithRSAEncryption':
-                case 'sha512WithRSAEncryption':
-                    $key->setHash(preg_replace('#WithRSAEncryption$#', '', $signatureAlgorithm));
-                    $key->setSignatureMode(RSA::SIGNATURE_PKCS1);
-
-                    $this->currentCert['signature'] = base64_encode("\0" . $key->sign($this->signatureSubject));
-                    return $this->currentCert;
-            }
-        }
-
-        return false;
-    }
-
-    /**
-     * Set certificate start date
-     *
-     * @param string $date
-     * @access public
-     */
-    function setStartDate($date)
-    {
-        $this->startDate = @date('D, d M Y H:i:s O', @strtotime($date));
-    }
-
-    /**
-     * Set certificate end date
-     *
-     * @param string $date
-     * @access public
-     */
-    function setEndDate($date)
-    {
-        /*
-          To indicate that a certificate has no well-defined expiration date,
-          the notAfter SHOULD be assigned the GeneralizedTime value of
-          99991231235959Z.
-
-          -- http://tools.ietf.org/html/rfc5280#section-4.1.2.5
-        */
-        if (strtolower($date) == 'lifetime') {
-            $temp = '99991231235959Z';
-            $asn1 = new ASN1();
-            $temp = chr(ASN1::TYPE_GENERALIZED_TIME) . $asn1->_encodeLength(strlen($temp)) . $temp;
-            $this->endDate = new Element($temp);
-        } else {
-            $this->endDate = @date('D, d M Y H:i:s O', @strtotime($date));
-        }
-    }
-
-    /**
-     * Set Serial Number
-     *
-     * @param string $serial
-     * @param $base optional
-     * @access public
-     */
-    function setSerialNumber($serial, $base = -256)
-    {
-        $this->serialNumber = new BigInteger($serial, $base);
-    }
-
-    /**
-     * Turns the certificate into a certificate authority
-     *
-     * @access public
-     */
-    function makeCA()
-    {
-        $this->caFlag = true;
-    }
-
-    /**
-     * Check for validity of subarray
-     *
-     * This is intended for use in conjunction with _subArrayUnchecked(),
-     * implementing the checks included in _subArray() but without copying
-     * a potentially large array by passing its reference by-value to is_array().
-     *
-     * @param array $root
-     * @param string $path
-     * @return boolean
-     * @access private
-     */
-    function _isSubArrayValid($root, $path)
-    {
-        if (!is_array($root)) {
-            return false;
-        }
-
-        foreach (explode('/', $path) as $i) {
-            if (!is_array($root)) {
-                return false;
-            }
-
-            if (!isset($root[$i])) {
-                return true;
-            }
-
-            $root = $root[$i];
-        }
-
-        return true;
-    }
-
-    /**
-     * Get a reference to a subarray
-     *
-     * This variant of _subArray() does no is_array() checking,
-     * so $root should be checked with _isSubArrayValid() first.
-     *
-     * This is here for performance reasons:
-     * Passing a reference (i.e. $root) by-value (i.e. to is_array())
-     * creates a copy. If $root is an especially large array, this is expensive.
-     *
-     * @param array $root
-     * @param string $path  absolute path with / as component separator
-     * @param bool $create optional
-     * @access private
-     * @return array|false
-     */
-    function &_subArrayUnchecked(&$root, $path, $create = false)
-    {
-        $false = false;
-
-        foreach (explode('/', $path) as $i) {
-            if (!isset($root[$i])) {
-                if (!$create) {
-                    return $false;
-                }
-
-                $root[$i] = array();
-            }
-
-            $root = &$root[$i];
-        }
-
-        return $root;
-    }
-
-    /**
-     * Get a reference to a subarray
-     *
-     * @param array $root
-     * @param string $path  absolute path with / as component separator
-     * @param bool $create optional
-     * @access private
-     * @return array|false
-     */
-    function &_subArray(&$root, $path, $create = false)
-    {
-        $false = false;
-
-        if (!is_array($root)) {
-            return $false;
-        }
-
-        foreach (explode('/', $path) as $i) {
-            if (!is_array($root)) {
-                return $false;
-            }
-
-            if (!isset($root[$i])) {
-                if (!$create) {
-                    return $false;
-                }
-
-                $root[$i] = array();
-            }
-
-            $root = &$root[$i];
-        }
-
-        return $root;
-    }
-
-    /**
-     * Get a reference to an extension subarray
-     *
-     * @param array $root
-     * @param string $path optional absolute path with / as component separator
-     * @param bool $create optional
-     * @access private
-     * @return array|false
-     */
-    function &_extensions(&$root, $path = null, $create = false)
-    {
-        if (!isset($root)) {
-            $root = $this->currentCert;
-        }
-
-        switch (true) {
-            case !empty($path):
-            case !is_array($root):
-                break;
-            case isset($root['tbsCertificate']):
-                $path = 'tbsCertificate/extensions';
-                break;
-            case isset($root['tbsCertList']):
-                $path = 'tbsCertList/crlExtensions';
-                break;
-            case isset($root['certificationRequestInfo']):
-                $pth = 'certificationRequestInfo/attributes';
-                $attributes = &$this->_subArray($root, $pth, $create);
-
-                if (is_array($attributes)) {
-                    foreach ($attributes as $key => $value) {
-                        if ($value['type'] == 'pkcs-9-at-extensionRequest') {
-                            $path = "$pth/$key/value/0";
-                            break 2;
-                        }
-                    }
-                    if ($create) {
-                        $key = count($attributes);
-                        $attributes[] = array('type' => 'pkcs-9-at-extensionRequest', 'value' => array());
-                        $path = "$pth/$key/value/0";
-                    }
-                }
-                break;
-        }
-
-        $extensions = &$this->_subArray($root, $path, $create);
-
-        if (!is_array($extensions)) {
-            $false = false;
-            return $false;
-        }
-
-        return $extensions;
-    }
-
-    /**
-     * Remove an Extension
-     *
-     * @param string $id
-     * @param string $path optional
-     * @access private
-     * @return bool
-     */
-    function _removeExtension($id, $path = null)
-    {
-        $extensions = &$this->_extensions($this->currentCert, $path);
-
-        if (!is_array($extensions)) {
-            return false;
-        }
-
-        $result = false;
-        foreach ($extensions as $key => $value) {
-            if ($value['extnId'] == $id) {
-                unset($extensions[$key]);
-                $result = true;
-            }
-        }
-
-        $extensions = array_values($extensions);
-        return $result;
-    }
-
-    /**
-     * Get an Extension
-     *
-     * Returns the extension if it exists and false if not
-     *
-     * @param string $id
-     * @param array $cert optional
-     * @param string $path optional
-     * @access private
-     * @return mixed
-     */
-    function _getExtension($id, $cert = null, $path = null)
-    {
-        $extensions = $this->_extensions($cert, $path);
-
-        if (!is_array($extensions)) {
-            return false;
-        }
-
-        foreach ($extensions as $key => $value) {
-            if ($value['extnId'] == $id) {
-                return $value['extnValue'];
-            }
-        }
-
-        return false;
-    }
-
-    /**
-     * Returns a list of all extensions in use
-     *
-     * @param array $cert optional
-     * @param string $path optional
-     * @access private
-     * @return array
-     */
-    function _getExtensions($cert = null, $path = null)
-    {
-        $exts = $this->_extensions($cert, $path);
-        $extensions = array();
-
-        if (is_array($exts)) {
-            foreach ($exts as $extension) {
-                $extensions[] = $extension['extnId'];
-            }
-        }
-
-        return $extensions;
-    }
-
-    /**
-     * Set an Extension
-     *
-     * @param string $id
-     * @param mixed $value
-     * @param bool $critical optional
-     * @param bool $replace optional
-     * @param string $path optional
-     * @access private
-     * @return bool
-     */
-    function _setExtension($id, $value, $critical = false, $replace = true, $path = null)
-    {
-        $extensions = &$this->_extensions($this->currentCert, $path, true);
-
-        if (!is_array($extensions)) {
-            return false;
-        }
-
-        $newext = array('extnId'  => $id, 'critical' => $critical, 'extnValue' => $value);
-
-        foreach ($extensions as $key => $value) {
-            if ($value['extnId'] == $id) {
-                if (!$replace) {
-                    return false;
-                }
-
-                $extensions[$key] = $newext;
-                return true;
-            }
-        }
-
-        $extensions[] = $newext;
-        return true;
-    }
-
-    /**
-     * Remove a certificate, CSR or CRL Extension
-     *
-     * @param string $id
-     * @access public
-     * @return bool
-     */
-    function removeExtension($id)
-    {
-        return $this->_removeExtension($id);
-    }
-
-    /**
-     * Get a certificate, CSR or CRL Extension
-     *
-     * Returns the extension if it exists and false if not
-     *
-     * @param string $id
-     * @param array $cert optional
-     * @access public
-     * @return mixed
-     */
-    function getExtension($id, $cert = null)
-    {
-        return $this->_getExtension($id, $cert);
-    }
-
-    /**
-     * Returns a list of all extensions in use in certificate, CSR or CRL
-     *
-     * @param array $cert optional
-     * @access public
-     * @return array
-     */
-    function getExtensions($cert = null)
-    {
-        return $this->_getExtensions($cert);
-    }
-
-    /**
-     * Set a certificate, CSR or CRL Extension
-     *
-     * @param string $id
-     * @param mixed $value
-     * @param bool $critical optional
-     * @param bool $replace optional
-     * @access public
-     * @return bool
-     */
-    function setExtension($id, $value, $critical = false, $replace = true)
-    {
-        return $this->_setExtension($id, $value, $critical, $replace);
-    }
-
-    /**
-     * Remove a CSR attribute.
-     *
-     * @param string $id
-     * @param int $disposition optional
-     * @access public
-     * @return bool
-     */
-    function removeAttribute($id, $disposition = self::ATTR_ALL)
-    {
-        $attributes = &$this->_subArray($this->currentCert, 'certificationRequestInfo/attributes');
-
-        if (!is_array($attributes)) {
-            return false;
-        }
-
-        $result = false;
-        foreach ($attributes as $key => $attribute) {
-            if ($attribute['type'] == $id) {
-                $n = count($attribute['value']);
-                switch (true) {
-                    case $disposition == self::ATTR_APPEND:
-                    case $disposition == self::ATTR_REPLACE:
-                        return false;
-                    case $disposition >= $n:
-                        $disposition -= $n;
-                        break;
-                    case $disposition == self::ATTR_ALL:
-                    case $n == 1:
-                        unset($attributes[$key]);
-                        $result = true;
-                        break;
-                    default:
-                        unset($attributes[$key]['value'][$disposition]);
-                        $attributes[$key]['value'] = array_values($attributes[$key]['value']);
-                        $result = true;
-                        break;
-                }
-                if ($result && $disposition != self::ATTR_ALL) {
-                    break;
-                }
-            }
-        }
-
-        $attributes = array_values($attributes);
-        return $result;
-    }
-
-    /**
-     * Get a CSR attribute
-     *
-     * Returns the attribute if it exists and false if not
-     *
-     * @param string $id
-     * @param int $disposition optional
-     * @param array $csr optional
-     * @access public
-     * @return mixed
-     */
-    function getAttribute($id, $disposition = self::ATTR_ALL, $csr = null)
-    {
-        if (empty($csr)) {
-            $csr = $this->currentCert;
-        }
-
-        $attributes = $this->_subArray($csr, 'certificationRequestInfo/attributes');
-
-        if (!is_array($attributes)) {
-            return false;
-        }
-
-        foreach ($attributes as $key => $attribute) {
-            if ($attribute['type'] == $id) {
-                $n = count($attribute['value']);
-                switch (true) {
-                    case $disposition == self::ATTR_APPEND:
-                    case $disposition == self::ATTR_REPLACE:
-                        return false;
-                    case $disposition == self::ATTR_ALL:
-                        return $attribute['value'];
-                    case $disposition >= $n:
-                        $disposition -= $n;
-                        break;
-                    default:
-                        return $attribute['value'][$disposition];
-                }
-            }
-        }
-
-        return false;
-    }
-
-    /**
-     * Returns a list of all CSR attributes in use
-     *
-     * @param array $csr optional
-     * @access public
-     * @return array
-     */
-    function getAttributes($csr = null)
-    {
-        if (empty($csr)) {
-            $csr = $this->currentCert;
-        }
-
-        $attributes = $this->_subArray($csr, 'certificationRequestInfo/attributes');
-        $attrs = array();
-
-        if (is_array($attributes)) {
-            foreach ($attributes as $attribute) {
-                $attrs[] = $attribute['type'];
-            }
-        }
-
-        return $attrs;
-    }
-
-    /**
-     * Set a CSR attribute
-     *
-     * @param string $id
-     * @param mixed $value
-     * @param bool $disposition optional
-     * @access public
-     * @return bool
-     */
-    function setAttribute($id, $value, $disposition = self::ATTR_ALL)
-    {
-        $attributes = &$this->_subArray($this->currentCert, 'certificationRequestInfo/attributes', true);
-
-        if (!is_array($attributes)) {
-            return false;
-        }
-
-        switch ($disposition) {
-            case self::ATTR_REPLACE:
-                $disposition = self::ATTR_APPEND;
-            case self::ATTR_ALL:
-                $this->removeAttribute($id);
-                break;
-        }
-
-        foreach ($attributes as $key => $attribute) {
-            if ($attribute['type'] == $id) {
-                $n = count($attribute['value']);
-                switch (true) {
-                    case $disposition == self::ATTR_APPEND:
-                        $last = $key;
-                        break;
-                    case $disposition >= $n:
-                        $disposition -= $n;
-                        break;
-                    default:
-                        $attributes[$key]['value'][$disposition] = $value;
-                        return true;
-                }
-            }
-        }
-
-        switch (true) {
-            case $disposition >= 0:
-                return false;
-            case isset($last):
-                $attributes[$last]['value'][] = $value;
-                break;
-            default:
-                $attributes[] = array('type' => $id, 'value' => $disposition == self::ATTR_ALL ? $value: array($value));
-                break;
-        }
-
-        return true;
-    }
-
-    /**
-     * Sets the subject key identifier
-     *
-     * This is used by the id-ce-authorityKeyIdentifier and the id-ce-subjectKeyIdentifier extensions.
-     *
-     * @param string $value
-     * @access public
-     */
-    function setKeyIdentifier($value)
-    {
-        if (empty($value)) {
-            unset($this->currentKeyIdentifier);
-        } else {
-            $this->currentKeyIdentifier = base64_encode($value);
-        }
-    }
-
-    /**
-     * Compute a public key identifier.
-     *
-     * Although key identifiers may be set to any unique value, this function
-     * computes key identifiers from public key according to the two
-     * recommended methods (4.2.1.2 RFC 3280).
-     * Highly polymorphic: try to accept all possible forms of key:
-     * - Key object
-     * - \phpseclib\File\X509 object with public or private key defined
-     * - Certificate or CSR array
-     * - \phpseclib\File\ASN1\Element object
-     * - PEM or DER string
-     *
-     * @param mixed $key optional
-     * @param int $method optional
-     * @access public
-     * @return string binary key identifier
-     */
-    function computeKeyIdentifier($key = null, $method = 1)
-    {
-        if (is_null($key)) {
-            $key = $this;
-        }
-
-        switch (true) {
-            case is_string($key):
-                break;
-            case is_array($key) && isset($key['tbsCertificate']['subjectPublicKeyInfo']['subjectPublicKey']):
-                return $this->computeKeyIdentifier($key['tbsCertificate']['subjectPublicKeyInfo']['subjectPublicKey'], $method);
-            case is_array($key) && isset($key['certificationRequestInfo']['subjectPKInfo']['subjectPublicKey']):
-                return $this->computeKeyIdentifier($key['certificationRequestInfo']['subjectPKInfo']['subjectPublicKey'], $method);
-            case !is_object($key):
-                return false;
-            case $key instanceof Element:
-                // Assume the element is a bitstring-packed key.
-                $asn1 = new ASN1();
-                $decoded = $asn1->decodeBER($key->element);
-                if (empty($decoded)) {
-                    return false;
-                }
-                $raw = $asn1->asn1map($decoded[0], array('type' => ASN1::TYPE_BIT_STRING));
-                if (empty($raw)) {
-                    return false;
-                }
-                $raw = base64_decode($raw);
-                // If the key is private, compute identifier from its corresponding public key.
-                $key = new RSA();
-                if (!$key->loadKey($raw)) {
-                    return false;   // Not an unencrypted RSA key.
-                }
-                if ($key->getPrivateKey() !== false) {  // If private.
-                    return $this->computeKeyIdentifier($key, $method);
-                }
-                $key = $raw;    // Is a public key.
-                break;
-            case $key instanceof X509:
-                if (isset($key->publicKey)) {
-                    return $this->computeKeyIdentifier($key->publicKey, $method);
-                }
-                if (isset($key->privateKey)) {
-                    return $this->computeKeyIdentifier($key->privateKey, $method);
-                }
-                if (isset($key->currentCert['tbsCertificate']) || isset($key->currentCert['certificationRequestInfo'])) {
-                    return $this->computeKeyIdentifier($key->currentCert, $method);
-                }
-                return false;
-            default: // Should be a key object (i.e.: \phpseclib\Crypt\RSA).
-                $key = $key->getPublicKey(RSA::PUBLIC_FORMAT_PKCS1);
-                break;
-        }
-
-        // If in PEM format, convert to binary.
-        $key = $this->_extractBER($key);
-
-        // Now we have the key string: compute its sha-1 sum.
-        $hash = new Hash('sha1');
-        $hash = $hash->hash($key);
-
-        if ($method == 2) {
-            $hash = substr($hash, -8);
-            $hash[0] = chr((ord($hash[0]) & 0x0F) | 0x40);
-        }
-
-        return $hash;
-    }
-
-    /**
-     * Format a public key as appropriate
-     *
-     * @access private
-     * @return array
-     */
-    function _formatSubjectPublicKey()
-    {
-        if ($this->publicKey instanceof RSA) {
-            // the following two return statements do the same thing. i dunno.. i just prefer the later for some reason.
-            // the former is a good example of how to do fuzzing on the public key
-            //return new Element(base64_decode(preg_replace('#-.+-|[\r\n]#', '', $this->publicKey->getPublicKey())));
-            return array(
-                'algorithm' => array('algorithm' => 'rsaEncryption'),
-                'subjectPublicKey' => $this->publicKey->getPublicKey(RSA::PUBLIC_FORMAT_PKCS1)
-            );
-        }
-
-        return false;
-    }
-
-    /**
-     * Set the domain name's which the cert is to be valid for
-     *
-     * @access public
-     * @return array
-     */
-    function setDomain()
-    {
-        $this->domains = func_get_args();
-        $this->removeDNProp('id-at-commonName');
-        $this->setDNProp('id-at-commonName', $this->domains[0]);
-    }
-
-    /**
-     * Set the IP Addresses's which the cert is to be valid for
-     *
-     * @access public
-     * @param string $ipAddress optional
-     */
-    function setIPAddress()
-    {
-        $this->ipAddresses = func_get_args();
-        /*
-        if (!isset($this->domains)) {
-            $this->removeDNProp('id-at-commonName');
-            $this->setDNProp('id-at-commonName', $this->ipAddresses[0]);
-        }
-        */
-    }
-
-    /**
-     * Helper function to build domain array
-     *
-     * @access private
-     * @param string $domain
-     * @return array
-     */
-    function _dnsName($domain)
-    {
-        return array('dNSName' => $domain);
-    }
-
-    /**
-     * Helper function to build IP Address array
-     *
-     * (IPv6 is not currently supported)
-     *
-     * @access private
-     * @param string $address
-     * @return array
-     */
-    function _iPAddress($address)
-    {
-        return array('iPAddress' => $address);
-    }
-
-    /**
-     * Get the index of a revoked certificate.
-     *
-     * @param array $rclist
-     * @param string $serial
-     * @param bool $create optional
-     * @access private
-     * @return int|false
-     */
-    function _revokedCertificate(&$rclist, $serial, $create = false)
-    {
-        $serial = new BigInteger($serial);
-
-        foreach ($rclist as $i => $rc) {
-            if (!($serial->compare($rc['userCertificate']))) {
-                return $i;
-            }
-        }
-
-        if (!$create) {
-            return false;
-        }
-
-        $i = count($rclist);
-        $rclist[] = array('userCertificate' => $serial,
-                          'revocationDate'  => $this->_timeField(@date('D, d M Y H:i:s O')));
-        return $i;
-    }
-
-    /**
-     * Revoke a certificate.
-     *
-     * @param string $serial
-     * @param string $date optional
-     * @access public
-     * @return bool
-     */
-    function revoke($serial, $date = null)
-    {
-        if (isset($this->currentCert['tbsCertList'])) {
-            if (is_array($rclist = &$this->_subArray($this->currentCert, 'tbsCertList/revokedCertificates', true))) {
-                if ($this->_revokedCertificate($rclist, $serial) === false) { // If not yet revoked
-                    if (($i = $this->_revokedCertificate($rclist, $serial, true)) !== false) {
-                        if (!empty($date)) {
-                            $rclist[$i]['revocationDate'] = $this->_timeField($date);
-                        }
-
-                        return true;
-                    }
-                }
-            }
-        }
-
-        return false;
-    }
-
-    /**
-     * Unrevoke a certificate.
-     *
-     * @param string $serial
-     * @access public
-     * @return bool
-     */
-    function unrevoke($serial)
-    {
-        if (is_array($rclist = &$this->_subArray($this->currentCert, 'tbsCertList/revokedCertificates'))) {
-            if (($i = $this->_revokedCertificate($rclist, $serial)) !== false) {
-                unset($rclist[$i]);
-                $rclist = array_values($rclist);
-                return true;
-            }
-        }
-
-        return false;
-    }
-
-    /**
-     * Get a revoked certificate.
-     *
-     * @param string $serial
-     * @access public
-     * @return mixed
-     */
-    function getRevoked($serial)
-    {
-        if (is_array($rclist = $this->_subArray($this->currentCert, 'tbsCertList/revokedCertificates'))) {
-            if (($i = $this->_revokedCertificate($rclist, $serial)) !== false) {
-                return $rclist[$i];
-            }
-        }
-
-        return false;
-    }
-
-    /**
-     * List revoked certificates
-     *
-     * @param array $crl optional
-     * @access public
-     * @return array
-     */
-    function listRevoked($crl = null)
-    {
-        if (!isset($crl)) {
-            $crl = $this->currentCert;
-        }
-
-        if (!isset($crl['tbsCertList'])) {
-            return false;
-        }
-
-        $result = array();
-
-        if (is_array($rclist = $this->_subArray($crl, 'tbsCertList/revokedCertificates'))) {
-            foreach ($rclist as $rc) {
-                $result[] = $rc['userCertificate']->toString();
-            }
-        }
-
-        return $result;
-    }
-
-    /**
-     * Remove a Revoked Certificate Extension
-     *
-     * @param string $serial
-     * @param string $id
-     * @access public
-     * @return bool
-     */
-    function removeRevokedCertificateExtension($serial, $id)
-    {
-        if (is_array($rclist = &$this->_subArray($this->currentCert, 'tbsCertList/revokedCertificates'))) {
-            if (($i = $this->_revokedCertificate($rclist, $serial)) !== false) {
-                return $this->_removeExtension($id, "tbsCertList/revokedCertificates/$i/crlEntryExtensions");
-            }
-        }
-
-        return false;
-    }
-
-    /**
-     * Get a Revoked Certificate Extension
-     *
-     * Returns the extension if it exists and false if not
-     *
-     * @param string $serial
-     * @param string $id
-     * @param array $crl optional
-     * @access public
-     * @return mixed
-     */
-    function getRevokedCertificateExtension($serial, $id, $crl = null)
-    {
-        if (!isset($crl)) {
-            $crl = $this->currentCert;
-        }
-
-        if (is_array($rclist = $this->_subArray($crl, 'tbsCertList/revokedCertificates'))) {
-            if (($i = $this->_revokedCertificate($rclist, $serial)) !== false) {
-                return $this->_getExtension($id, $crl,  "tbsCertList/revokedCertificates/$i/crlEntryExtensions");
-            }
-        }
-
-        return false;
-    }
-
-    /**
-     * Returns a list of all extensions in use for a given revoked certificate
-     *
-     * @param string $serial
-     * @param array $crl optional
-     * @access public
-     * @return array
-     */
-    function getRevokedCertificateExtensions($serial, $crl = null)
-    {
-        if (!isset($crl)) {
-            $crl = $this->currentCert;
-        }
-
-        if (is_array($rclist = $this->_subArray($crl, 'tbsCertList/revokedCertificates'))) {
-            if (($i = $this->_revokedCertificate($rclist, $serial)) !== false) {
-                return $this->_getExtensions($crl, "tbsCertList/revokedCertificates/$i/crlEntryExtensions");
-            }
-        }
-
-        return false;
-    }
-
-    /**
-     * Set a Revoked Certificate Extension
-     *
-     * @param string $serial
-     * @param string $id
-     * @param mixed $value
-     * @param bool $critical optional
-     * @param bool $replace optional
-     * @access public
-     * @return bool
-     */
-    function setRevokedCertificateExtension($serial, $id, $value, $critical = false, $replace = true)
-    {
-        if (isset($this->currentCert['tbsCertList'])) {
-            if (is_array($rclist = &$this->_subArray($this->currentCert, 'tbsCertList/revokedCertificates', true))) {
-                if (($i = $this->_revokedCertificate($rclist, $serial, true)) !== false) {
-                    return $this->_setExtension($id, $value, $critical, $replace, "tbsCertList/revokedCertificates/$i/crlEntryExtensions");
-                }
-            }
-        }
-
-        return false;
-    }
-
-    /**
-     * Extract raw BER from Base64 encoding
-     *
-     * @access private
-     * @param string $str
-     * @return string
-     */
-    function _extractBER($str)
-    {
-        /* X.509 certs are assumed to be base64 encoded but sometimes they'll have additional things in them
-         * above and beyond the ceritificate.
-         * ie. some may have the following preceding the -----BEGIN CERTIFICATE----- line:
-         *
-         * Bag Attributes
-         *     localKeyID: 01 00 00 00
-         * subject=/O=organization/OU=org unit/CN=common name
-         * issuer=/O=organization/CN=common name
-         */
-        $temp = preg_replace('#.*?^-+[^-]+-+[\r\n ]*$#ms', '', $str, 1);
-        // remove the -----BEGIN CERTIFICATE----- and -----END CERTIFICATE----- stuff
-        $temp = preg_replace('#-+[^-]+-+#', '', $temp);
-        // remove new lines
-        $temp = str_replace(array("\r", "\n", ' '), '', $temp);
-        $temp = preg_match('#^[a-zA-Z\d/+]*={0,2}$#', $temp) ? base64_decode($temp) : false;
-        return $temp != false ? $temp : $str;
-    }
-
-    /**
-     * Returns the OID corresponding to a name
-     *
-     * What's returned in the associative array returned by loadX509() (or load*()) is either a name or an OID if
-     * no OID to name mapping is available. The problem with this is that what may be an unmapped OID in one version
-     * of phpseclib may not be unmapped in the next version, so apps that are looking at this OID may not be able
-     * to work from version to version.
-     *
-     * This method will return the OID if a name is passed to it and if no mapping is avialable it'll assume that
-     * what's being passed to it already is an OID and return that instead. A few examples.
-     *
-     * getOID('2.16.840.1.101.3.4.2.1') == '2.16.840.1.101.3.4.2.1'
-     * getOID('id-sha256') == '2.16.840.1.101.3.4.2.1'
-     * getOID('zzz') == 'zzz'
-     *
-     * @access public
-     * @return string
-     */
-    function getOID($name)
-    {
-        static $reverseMap;
-        if (!isset($reverseMap)) {
-            $reverseMap = array_flip($this->oids);
-        }
-        return isset($reverseMap[$name]) ? $reverseMap[$name] : $name;
-    }
-}
diff --git a/mayor-orig/www/include/share/googleapi/phpseclib/phpseclib/phpseclib/Math/BigInteger.php b/mayor-orig/www/include/share/googleapi/phpseclib/phpseclib/phpseclib/Math/BigInteger.php
deleted file mode 100644
index 4b13d7c6..00000000
--- a/mayor-orig/www/include/share/googleapi/phpseclib/phpseclib/phpseclib/Math/BigInteger.php
+++ /dev/null
@@ -1,3755 +0,0 @@
-> and << cannot be used, nor can the modulo operator %,
- * which only supports integers.  Although this fact will slow this library down, the fact that such a high
- * base is being used should more than compensate.
- *
- * Numbers are stored in {@link http://en.wikipedia.org/wiki/Endianness little endian} format.  ie.
- * (new \phpseclib\Math\BigInteger(pow(2, 26)))->value = array(0, 1)
- *
- * Useful resources are as follows:
- *
- *  - {@link http://www.cacr.math.uwaterloo.ca/hac/about/chap14.pdf Handbook of Applied Cryptography (HAC)}
- *  - {@link http://math.libtomcrypt.com/files/tommath.pdf Multi-Precision Math (MPM)}
- *  - Java's BigInteger classes.  See /j2se/src/share/classes/java/math in jdk-1_5_0-src-jrl.zip
- *
- * Here's an example of how to use this library:
- * 
- * add($b);
- *
- *    echo $c->toString(); // outputs 5
- * ?>
- * 
- *
- * @category  Math
- * @package   BigInteger
- * @author    Jim Wigginton 
- * @copyright 2006 Jim Wigginton
- * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
- * @link      http://pear.php.net/package/Math_BigInteger
- */
-
-namespace phpseclib\Math;
-
-use phpseclib\Crypt\Random;
-
-/**
- * Pure-PHP arbitrary precision integer arithmetic library. Supports base-2, base-10, base-16, and base-256
- * numbers.
- *
- * @package BigInteger
- * @author  Jim Wigginton 
- * @access  public
- */
-class BigInteger
-{
-    /**#@+
-     * Reduction constants
-     *
-     * @access private
-     * @see BigInteger::_reduce()
-     */
-    /**
-     * @see BigInteger::_montgomery()
-     * @see BigInteger::_prepMontgomery()
-     */
-    const MONTGOMERY = 0;
-    /**
-     * @see BigInteger::_barrett()
-     */
-    const BARRETT = 1;
-    /**
-     * @see BigInteger::_mod2()
-     */
-    const POWEROF2 = 2;
-    /**
-     * @see BigInteger::_remainder()
-     */
-    const CLASSIC = 3;
-    /**
-     * @see BigInteger::__clone()
-     */
-    const NONE = 4;
-    /**#@-*/
-
-    /**#@+
-     * Array constants
-     *
-     * Rather than create a thousands and thousands of new BigInteger objects in repeated function calls to add() and
-     * multiply() or whatever, we'll just work directly on arrays, taking them in as parameters and returning them.
-     *
-     * @access private
-    */
-    /**
-     * $result[self::VALUE] contains the value.
-     */
-    const VALUE = 0;
-    /**
-     * $result[self::SIGN] contains the sign.
-     */
-    const SIGN = 1;
-    /**#@-*/
-
-    /**#@+
-     * @access private
-     * @see BigInteger::_montgomery()
-     * @see BigInteger::_barrett()
-    */
-    /**
-     * Cache constants
-     *
-     * $cache[self::VARIABLE] tells us whether or not the cached data is still valid.
-     */
-    const VARIABLE = 0;
-    /**
-     * $cache[self::DATA] contains the cached data.
-     */
-    const DATA = 1;
-    /**#@-*/
-
-    /**#@+
-     * Mode constants.
-     *
-     * @access private
-     * @see BigInteger::__construct()
-    */
-    /**
-     * To use the pure-PHP implementation
-     */
-    const MODE_INTERNAL = 1;
-    /**
-     * To use the BCMath library
-     *
-     * (if enabled; otherwise, the internal implementation will be used)
-     */
-    const MODE_BCMATH = 2;
-    /**
-     * To use the GMP library
-     *
-     * (if present; otherwise, either the BCMath or the internal implementation will be used)
-     */
-    const MODE_GMP = 3;
-    /**#@-*/
-
-    /**
-     * Karatsuba Cutoff
-     *
-     * At what point do we switch between Karatsuba multiplication and schoolbook long multiplication?
-     *
-     * @access private
-     */
-    const KARATSUBA_CUTOFF = 25;
-
-    /**#@+
-     * Static properties used by the pure-PHP implementation.
-     *
-     * @see __construct()
-     */
-    protected static $base;
-    protected static $baseFull;
-    protected static $maxDigit;
-    protected static $msb;
-
-    /**
-     * $max10 in greatest $max10Len satisfying
-     * $max10 = 10**$max10Len <= 2**$base.
-     */
-    protected static $max10;
-
-    /**
-     * $max10Len in greatest $max10Len satisfying
-     * $max10 = 10**$max10Len <= 2**$base.
-     */
-    protected static $max10Len;
-    protected static $maxDigit2;
-    /**#@-*/
-
-    /**
-     * Holds the BigInteger's value.
-     *
-     * @var array
-     * @access private
-     */
-    var $value;
-
-    /**
-     * Holds the BigInteger's magnitude.
-     *
-     * @var bool
-     * @access private
-     */
-    var $is_negative = false;
-
-    /**
-     * Precision
-     *
-     * @see self::setPrecision()
-     * @access private
-     */
-    var $precision = -1;
-
-    /**
-     * Precision Bitmask
-     *
-     * @see self::setPrecision()
-     * @access private
-     */
-    var $bitmask = false;
-
-    /**
-     * Mode independent value used for serialization.
-     *
-     * If the bcmath or gmp extensions are installed $this->value will be a non-serializable resource, hence the need for
-     * a variable that'll be serializable regardless of whether or not extensions are being used.  Unlike $this->value,
-     * however, $this->hex is only calculated when $this->__sleep() is called.
-     *
-     * @see self::__sleep()
-     * @see self::__wakeup()
-     * @var string
-     * @access private
-     */
-    var $hex;
-
-    /**
-     * Converts base-2, base-10, base-16, and binary strings (base-256) to BigIntegers.
-     *
-     * If the second parameter - $base - is negative, then it will be assumed that the number's are encoded using
-     * two's compliment.  The sole exception to this is -10, which is treated the same as 10 is.
-     *
-     * Here's an example:
-     * 
-     * toString(); // outputs 50
-     * ?>
-     * 
-     *
-     * @param $x base-10 number or base-$base number if $base set.
-     * @param int $base
-     * @return \phpseclib\Math\BigInteger
-     * @access public
-     */
-    function __construct($x = 0, $base = 10)
-    {
-        if (!defined('MATH_BIGINTEGER_MODE')) {
-            switch (true) {
-                case extension_loaded('gmp'):
-                    define('MATH_BIGINTEGER_MODE', self::MODE_GMP);
-                    break;
-                case extension_loaded('bcmath'):
-                    define('MATH_BIGINTEGER_MODE', self::MODE_BCMATH);
-                    break;
-                default:
-                    define('MATH_BIGINTEGER_MODE', self::MODE_INTERNAL);
-            }
-        }
-
-        if (extension_loaded('openssl') && !defined('MATH_BIGINTEGER_OPENSSL_DISABLE') && !defined('MATH_BIGINTEGER_OPENSSL_ENABLED')) {
-            // some versions of XAMPP have mismatched versions of OpenSSL which causes it not to work
-            ob_start();
-            @phpinfo();
-            $content = ob_get_contents();
-            ob_end_clean();
-
-            preg_match_all('#OpenSSL (Header|Library) Version(.*)#im', $content, $matches);
-
-            $versions = array();
-            if (!empty($matches[1])) {
-                for ($i = 0; $i < count($matches[1]); $i++) {
-                    $fullVersion = trim(str_replace('=>', '', strip_tags($matches[2][$i])));
-
-                    // Remove letter part in OpenSSL version
-                    if (!preg_match('/(\d+\.\d+\.\d+)/i', $fullVersion, $m)) {
-                        $versions[$matches[1][$i]] = $fullVersion;
-                    } else {
-                        $versions[$matches[1][$i]] = $m[0];
-                    }
-                }
-            }
-
-            // it doesn't appear that OpenSSL versions were reported upon until PHP 5.3+
-            switch (true) {
-                case !isset($versions['Header']):
-                case !isset($versions['Library']):
-                case $versions['Header'] == $versions['Library']:
-                case version_compare($versions['Header'], '1.0.0') >= 0 && version_compare($versions['Library'], '1.0.0') >= 0:
-                    define('MATH_BIGINTEGER_OPENSSL_ENABLED', true);
-                    break;
-                default:
-                    define('MATH_BIGINTEGER_OPENSSL_DISABLE', true);
-            }
-        }
-
-        if (!defined('PHP_INT_SIZE')) {
-            define('PHP_INT_SIZE', 4);
-        }
-
-        if (empty(self::$base) && MATH_BIGINTEGER_MODE == self::MODE_INTERNAL) {
-            switch (PHP_INT_SIZE) {
-                case 8: // use 64-bit integers if int size is 8 bytes
-                    self::$base      = 31;
-                    self::$baseFull  = 0x80000000;
-                    self::$maxDigit  = 0x7FFFFFFF;
-                    self::$msb       = 0x40000000;
-                    self::$max10     = 1000000000;
-                    self::$max10Len  = 9;
-                    self::$maxDigit2 = pow(2, 62);
-                    break;
-                //case 4: // use 64-bit floats if int size is 4 bytes
-                default:
-                    self::$base      = 26;
-                    self::$baseFull  = 0x4000000;
-                    self::$maxDigit  = 0x3FFFFFF;
-                    self::$msb       = 0x2000000;
-                    self::$max10     = 10000000;
-                    self::$max10Len  = 7;
-                    self::$maxDigit2 = pow(2, 52); // pow() prevents truncation
-            }
-        }
-
-        switch (MATH_BIGINTEGER_MODE) {
-            case self::MODE_GMP:
-                switch (true) {
-                    case is_resource($x) && get_resource_type($x) == 'GMP integer':
-                    // PHP 5.6 switched GMP from using resources to objects
-                    case $x instanceof \GMP:
-                        $this->value = $x;
-                        return;
-                }
-                $this->value = gmp_init(0);
-                break;
-            case self::MODE_BCMATH:
-                $this->value = '0';
-                break;
-            default:
-                $this->value = array();
-        }
-
-        // '0' counts as empty() but when the base is 256 '0' is equal to ord('0') or 48
-        // '0' is the only value like this per http://php.net/empty
-        if (empty($x) && (abs($base) != 256 || $x !== '0')) {
-            return;
-        }
-
-        switch ($base) {
-            case -256:
-                if (ord($x[0]) & 0x80) {
-                    $x = ~$x;
-                    $this->is_negative = true;
-                }
-            case 256:
-                switch (MATH_BIGINTEGER_MODE) {
-                    case self::MODE_GMP:
-                        $sign = $this->is_negative ? '-' : '';
-                        $this->value = gmp_init($sign . '0x' . bin2hex($x));
-                        break;
-                    case self::MODE_BCMATH:
-                        // round $len to the nearest 4 (thanks, DavidMJ!)
-                        $len = (strlen($x) + 3) & 0xFFFFFFFC;
-
-                        $x = str_pad($x, $len, chr(0), STR_PAD_LEFT);
-
-                        for ($i = 0; $i < $len; $i+= 4) {
-                            $this->value = bcmul($this->value, '4294967296', 0); // 4294967296 == 2**32
-                            $this->value = bcadd($this->value, 0x1000000 * ord($x[$i]) + ((ord($x[$i + 1]) << 16) | (ord($x[$i + 2]) << 8) | ord($x[$i + 3])), 0);
-                        }
-
-                        if ($this->is_negative) {
-                            $this->value = '-' . $this->value;
-                        }
-
-                        break;
-                    // converts a base-2**8 (big endian / msb) number to base-2**26 (little endian / lsb)
-                    default:
-                        while (strlen($x)) {
-                            $this->value[] = $this->_bytes2int($this->_base256_rshift($x, self::$base));
-                        }
-                }
-
-                if ($this->is_negative) {
-                    if (MATH_BIGINTEGER_MODE != self::MODE_INTERNAL) {
-                        $this->is_negative = false;
-                    }
-                    $temp = $this->add(new static('-1'));
-                    $this->value = $temp->value;
-                }
-                break;
-            case 16:
-            case -16:
-                if ($base > 0 && $x[0] == '-') {
-                    $this->is_negative = true;
-                    $x = substr($x, 1);
-                }
-
-                $x = preg_replace('#^(?:0x)?([A-Fa-f0-9]*).*#', '$1', $x);
-
-                $is_negative = false;
-                if ($base < 0 && hexdec($x[0]) >= 8) {
-                    $this->is_negative = $is_negative = true;
-                    $x = bin2hex(~pack('H*', $x));
-                }
-
-                switch (MATH_BIGINTEGER_MODE) {
-                    case self::MODE_GMP:
-                        $temp = $this->is_negative ? '-0x' . $x : '0x' . $x;
-                        $this->value = gmp_init($temp);
-                        $this->is_negative = false;
-                        break;
-                    case self::MODE_BCMATH:
-                        $x = (strlen($x) & 1) ? '0' . $x : $x;
-                        $temp = new static(pack('H*', $x), 256);
-                        $this->value = $this->is_negative ? '-' . $temp->value : $temp->value;
-                        $this->is_negative = false;
-                        break;
-                    default:
-                        $x = (strlen($x) & 1) ? '0' . $x : $x;
-                        $temp = new static(pack('H*', $x), 256);
-                        $this->value = $temp->value;
-                }
-
-                if ($is_negative) {
-                    $temp = $this->add(new static('-1'));
-                    $this->value = $temp->value;
-                }
-                break;
-            case 10:
-            case -10:
-                // (?value = gmp_init($x);
-                        break;
-                    case self::MODE_BCMATH:
-                        // explicitly casting $x to a string is necessary, here, since doing $x[0] on -1 yields different
-                        // results then doing it on '-1' does (modInverse does $x[0])
-                        $this->value = $x === '-' ? '0' : (string) $x;
-                        break;
-                    default:
-                        $temp = new static();
-
-                        $multiplier = new static();
-                        $multiplier->value = array(self::$max10);
-
-                        if ($x[0] == '-') {
-                            $this->is_negative = true;
-                            $x = substr($x, 1);
-                        }
-
-                        $x = str_pad($x, strlen($x) + ((self::$max10Len - 1) * strlen($x)) % self::$max10Len, 0, STR_PAD_LEFT);
-                        while (strlen($x)) {
-                            $temp = $temp->multiply($multiplier);
-                            $temp = $temp->add(new static($this->_int2bytes(substr($x, 0, self::$max10Len)), 256));
-                            $x = substr($x, self::$max10Len);
-                        }
-
-                        $this->value = $temp->value;
-                }
-                break;
-            case 2: // base-2 support originally implemented by Lluis Pamies - thanks!
-            case -2:
-                if ($base > 0 && $x[0] == '-') {
-                    $this->is_negative = true;
-                    $x = substr($x, 1);
-                }
-
-                $x = preg_replace('#^([01]*).*#', '$1', $x);
-                $x = str_pad($x, strlen($x) + (3 * strlen($x)) % 4, 0, STR_PAD_LEFT);
-
-                $str = '0x';
-                while (strlen($x)) {
-                    $part = substr($x, 0, 4);
-                    $str.= dechex(bindec($part));
-                    $x = substr($x, 4);
-                }
-
-                if ($this->is_negative) {
-                    $str = '-' . $str;
-                }
-
-                $temp = new static($str, 8 * $base); // ie. either -16 or +16
-                $this->value = $temp->value;
-                $this->is_negative = $temp->is_negative;
-
-                break;
-            default:
-                // base not supported, so we'll let $this == 0
-        }
-    }
-
-    /**
-     * Converts a BigInteger to a byte string (eg. base-256).
-     *
-     * Negative numbers are saved as positive numbers, unless $twos_compliment is set to true, at which point, they're
-     * saved as two's compliment.
-     *
-     * Here's an example:
-     * 
-     * toBytes(); // outputs chr(65)
-     * ?>
-     * 
-     *
-     * @param bool $twos_compliment
-     * @return string
-     * @access public
-     * @internal Converts a base-2**26 number to base-2**8
-     */
-    function toBytes($twos_compliment = false)
-    {
-        if ($twos_compliment) {
-            $comparison = $this->compare(new static());
-            if ($comparison == 0) {
-                return $this->precision > 0 ? str_repeat(chr(0), ($this->precision + 1) >> 3) : '';
-            }
-
-            $temp = $comparison < 0 ? $this->add(new static(1)) : $this->copy();
-            $bytes = $temp->toBytes();
-
-            if (empty($bytes)) { // eg. if the number we're trying to convert is -1
-                $bytes = chr(0);
-            }
-
-            if (ord($bytes[0]) & 0x80) {
-                $bytes = chr(0) . $bytes;
-            }
-
-            return $comparison < 0 ? ~$bytes : $bytes;
-        }
-
-        switch (MATH_BIGINTEGER_MODE) {
-            case self::MODE_GMP:
-                if (gmp_cmp($this->value, gmp_init(0)) == 0) {
-                    return $this->precision > 0 ? str_repeat(chr(0), ($this->precision + 1) >> 3) : '';
-                }
-
-                $temp = gmp_strval(gmp_abs($this->value), 16);
-                $temp = (strlen($temp) & 1) ? '0' . $temp : $temp;
-                $temp = pack('H*', $temp);
-
-                return $this->precision > 0 ?
-                    substr(str_pad($temp, $this->precision >> 3, chr(0), STR_PAD_LEFT), -($this->precision >> 3)) :
-                    ltrim($temp, chr(0));
-            case self::MODE_BCMATH:
-                if ($this->value === '0') {
-                    return $this->precision > 0 ? str_repeat(chr(0), ($this->precision + 1) >> 3) : '';
-                }
-
-                $value = '';
-                $current = $this->value;
-
-                if ($current[0] == '-') {
-                    $current = substr($current, 1);
-                }
-
-                while (bccomp($current, '0', 0) > 0) {
-                    $temp = bcmod($current, '16777216');
-                    $value = chr($temp >> 16) . chr($temp >> 8) . chr($temp) . $value;
-                    $current = bcdiv($current, '16777216', 0);
-                }
-
-                return $this->precision > 0 ?
-                    substr(str_pad($value, $this->precision >> 3, chr(0), STR_PAD_LEFT), -($this->precision >> 3)) :
-                    ltrim($value, chr(0));
-        }
-
-        if (!count($this->value)) {
-            return $this->precision > 0 ? str_repeat(chr(0), ($this->precision + 1) >> 3) : '';
-        }
-        $result = $this->_int2bytes($this->value[count($this->value) - 1]);
-
-        $temp = $this->copy();
-
-        for ($i = count($temp->value) - 2; $i >= 0; --$i) {
-            $temp->_base256_lshift($result, self::$base);
-            $result = $result | str_pad($temp->_int2bytes($temp->value[$i]), strlen($result), chr(0), STR_PAD_LEFT);
-        }
-
-        return $this->precision > 0 ?
-            str_pad(substr($result, -(($this->precision + 7) >> 3)), ($this->precision + 7) >> 3, chr(0), STR_PAD_LEFT) :
-            $result;
-    }
-
-    /**
-     * Converts a BigInteger to a hex string (eg. base-16)).
-     *
-     * Negative numbers are saved as positive numbers, unless $twos_compliment is set to true, at which point, they're
-     * saved as two's compliment.
-     *
-     * Here's an example:
-     * 
-     * toHex(); // outputs '41'
-     * ?>
-     * 
-     *
-     * @param bool $twos_compliment
-     * @return string
-     * @access public
-     * @internal Converts a base-2**26 number to base-2**8
-     */
-    function toHex($twos_compliment = false)
-    {
-        return bin2hex($this->toBytes($twos_compliment));
-    }
-
-    /**
-     * Converts a BigInteger to a bit string (eg. base-2).
-     *
-     * Negative numbers are saved as positive numbers, unless $twos_compliment is set to true, at which point, they're
-     * saved as two's compliment.
-     *
-     * Here's an example:
-     * 
-     * toBits(); // outputs '1000001'
-     * ?>
-     * 
-     *
-     * @param bool $twos_compliment
-     * @return string
-     * @access public
-     * @internal Converts a base-2**26 number to base-2**2
-     */
-    function toBits($twos_compliment = false)
-    {
-        $hex = $this->toHex($twos_compliment);
-        $bits = '';
-        for ($i = strlen($hex) - 8, $start = strlen($hex) & 7; $i >= $start; $i-=8) {
-            $bits = str_pad(decbin(hexdec(substr($hex, $i, 8))), 32, '0', STR_PAD_LEFT) . $bits;
-        }
-        if ($start) { // hexdec('') == 0
-            $bits = str_pad(decbin(hexdec(substr($hex, 0, $start))), 8, '0', STR_PAD_LEFT) . $bits;
-        }
-        $result = $this->precision > 0 ? substr($bits, -$this->precision) : ltrim($bits, '0');
-
-        if ($twos_compliment && $this->compare(new static()) > 0 && $this->precision <= 0) {
-            return '0' . $result;
-        }
-
-        return $result;
-    }
-
-    /**
-     * Converts a BigInteger to a base-10 number.
-     *
-     * Here's an example:
-     * 
-     * toString(); // outputs 50
-     * ?>
-     * 
-     *
-     * @return string
-     * @access public
-     * @internal Converts a base-2**26 number to base-10**7 (which is pretty much base-10)
-     */
-    function toString()
-    {
-        switch (MATH_BIGINTEGER_MODE) {
-            case self::MODE_GMP:
-                return gmp_strval($this->value);
-            case self::MODE_BCMATH:
-                if ($this->value === '0') {
-                    return '0';
-                }
-
-                return ltrim($this->value, '0');
-        }
-
-        if (!count($this->value)) {
-            return '0';
-        }
-
-        $temp = $this->copy();
-        $temp->is_negative = false;
-
-        $divisor = new static();
-        $divisor->value = array(self::$max10);
-        $result = '';
-        while (count($temp->value)) {
-            list($temp, $mod) = $temp->divide($divisor);
-            $result = str_pad(isset($mod->value[0]) ? $mod->value[0] : '', self::$max10Len, '0', STR_PAD_LEFT) . $result;
-        }
-        $result = ltrim($result, '0');
-        if (empty($result)) {
-            $result = '0';
-        }
-
-        if ($this->is_negative) {
-            $result = '-' . $result;
-        }
-
-        return $result;
-    }
-
-    /**
-     * Copy an object
-     *
-     * PHP5 passes objects by reference while PHP4 passes by value.  As such, we need a function to guarantee
-     * that all objects are passed by value, when appropriate.  More information can be found here:
-     *
-     * {@link http://php.net/language.oop5.basic#51624}
-     *
-     * @access public
-     * @see self::__clone()
-     * @return \phpseclib\Math\BigInteger
-     */
-    function copy()
-    {
-        $temp = new static();
-        $temp->value = $this->value;
-        $temp->is_negative = $this->is_negative;
-        $temp->precision = $this->precision;
-        $temp->bitmask = $this->bitmask;
-        return $temp;
-    }
-
-    /**
-     *  __toString() magic method
-     *
-     * Will be called, automatically, if you're supporting just PHP5.  If you're supporting PHP4, you'll need to call
-     * toString().
-     *
-     * @access public
-     * @internal Implemented per a suggestion by Techie-Michael - thanks!
-     */
-    function __toString()
-    {
-        return $this->toString();
-    }
-
-    /**
-     * __clone() magic method
-     *
-     * Although you can call BigInteger::__toString() directly in PHP5, you cannot call BigInteger::__clone() directly
-     * in PHP5.  You can in PHP4 since it's not a magic method, but in PHP5, you have to call it by using the PHP5
-     * only syntax of $y = clone $x.  As such, if you're trying to write an application that works on both PHP4 and
-     * PHP5, call BigInteger::copy(), instead.
-     *
-     * @access public
-     * @see self::copy()
-     * @return \phpseclib\Math\BigInteger
-     */
-    function __clone()
-    {
-        return $this->copy();
-    }
-
-    /**
-     *  __sleep() magic method
-     *
-     * Will be called, automatically, when serialize() is called on a BigInteger object.
-     *
-     * @see self::__wakeup()
-     * @access public
-     */
-    function __sleep()
-    {
-        $this->hex = $this->toHex(true);
-        $vars = array('hex');
-        if ($this->precision > 0) {
-            $vars[] = 'precision';
-        }
-        return $vars;
-    }
-
-    /**
-     *  __wakeup() magic method
-     *
-     * Will be called, automatically, when unserialize() is called on a BigInteger object.
-     *
-     * @see self::__sleep()
-     * @access public
-     */
-    function __wakeup()
-    {
-        $temp = new static($this->hex, -16);
-        $this->value = $temp->value;
-        $this->is_negative = $temp->is_negative;
-        if ($this->precision > 0) {
-            // recalculate $this->bitmask
-            $this->setPrecision($this->precision);
-        }
-    }
-
-    /**
-     *  __debugInfo() magic method
-     *
-     * Will be called, automatically, when print_r() or var_dump() are called
-     *
-     * @access public
-     */
-    function __debugInfo()
-    {
-        $opts = array();
-        switch (MATH_BIGINTEGER_MODE) {
-            case self::MODE_GMP:
-                $engine = 'gmp';
-                break;
-            case self::MODE_BCMATH:
-                $engine = 'bcmath';
-                break;
-            case self::MODE_INTERNAL:
-                $engine = 'internal';
-                $opts[] = PHP_INT_SIZE == 8 ? '64-bit' : '32-bit';
-        }
-        if (MATH_BIGINTEGER_MODE != self::MODE_GMP && defined('MATH_BIGINTEGER_OPENSSL_ENABLED')) {
-            $opts[] = 'OpenSSL';
-        }
-        if (!empty($opts)) {
-            $engine.= ' (' . implode($opts, ', ') . ')';
-        }
-        return array(
-            'value' => '0x' . $this->toHex(true),
-            'engine' => $engine
-        );
-    }
-
-    /**
-     * Adds two BigIntegers.
-     *
-     * Here's an example:
-     * 
-     * add($b);
-     *
-     *    echo $c->toString(); // outputs 30
-     * ?>
-     * 
-     *
-     * @param \phpseclib\Math\BigInteger $y
-     * @return \phpseclib\Math\BigInteger
-     * @access public
-     * @internal Performs base-2**52 addition
-     */
-    function add($y)
-    {
-        switch (MATH_BIGINTEGER_MODE) {
-            case self::MODE_GMP:
-                $temp = new static();
-                $temp->value = gmp_add($this->value, $y->value);
-
-                return $this->_normalize($temp);
-            case self::MODE_BCMATH:
-                $temp = new static();
-                $temp->value = bcadd($this->value, $y->value, 0);
-
-                return $this->_normalize($temp);
-        }
-
-        $temp = $this->_add($this->value, $this->is_negative, $y->value, $y->is_negative);
-
-        $result = new static();
-        $result->value = $temp[self::VALUE];
-        $result->is_negative = $temp[self::SIGN];
-
-        return $this->_normalize($result);
-    }
-
-    /**
-     * Performs addition.
-     *
-     * @param array $x_value
-     * @param bool $x_negative
-     * @param array $y_value
-     * @param bool $y_negative
-     * @return array
-     * @access private
-     */
-    function _add($x_value, $x_negative, $y_value, $y_negative)
-    {
-        $x_size = count($x_value);
-        $y_size = count($y_value);
-
-        if ($x_size == 0) {
-            return array(
-                self::VALUE => $y_value,
-                self::SIGN => $y_negative
-            );
-        } elseif ($y_size == 0) {
-            return array(
-                self::VALUE => $x_value,
-                self::SIGN => $x_negative
-            );
-        }
-
-        // subtract, if appropriate
-        if ($x_negative != $y_negative) {
-            if ($x_value == $y_value) {
-                return array(
-                    self::VALUE => array(),
-                    self::SIGN => false
-                );
-            }
-
-            $temp = $this->_subtract($x_value, false, $y_value, false);
-            $temp[self::SIGN] = $this->_compare($x_value, false, $y_value, false) > 0 ?
-                                          $x_negative : $y_negative;
-
-            return $temp;
-        }
-
-        if ($x_size < $y_size) {
-            $size = $x_size;
-            $value = $y_value;
-        } else {
-            $size = $y_size;
-            $value = $x_value;
-        }
-
-        $value[count($value)] = 0; // just in case the carry adds an extra digit
-
-        $carry = 0;
-        for ($i = 0, $j = 1; $j < $size; $i+=2, $j+=2) {
-            $sum = $x_value[$j] * self::$baseFull + $x_value[$i] + $y_value[$j] * self::$baseFull + $y_value[$i] + $carry;
-            $carry = $sum >= self::$maxDigit2; // eg. floor($sum / 2**52); only possible values (in any base) are 0 and 1
-            $sum = $carry ? $sum - self::$maxDigit2 : $sum;
-
-            $temp = self::$base === 26 ? intval($sum / 0x4000000) : ($sum >> 31);
-
-            $value[$i] = (int) ($sum - self::$baseFull * $temp); // eg. a faster alternative to fmod($sum, 0x4000000)
-            $value[$j] = $temp;
-        }
-
-        if ($j == $size) { // ie. if $y_size is odd
-            $sum = $x_value[$i] + $y_value[$i] + $carry;
-            $carry = $sum >= self::$baseFull;
-            $value[$i] = $carry ? $sum - self::$baseFull : $sum;
-            ++$i; // ie. let $i = $j since we've just done $value[$i]
-        }
-
-        if ($carry) {
-            for (; $value[$i] == self::$maxDigit; ++$i) {
-                $value[$i] = 0;
-            }
-            ++$value[$i];
-        }
-
-        return array(
-            self::VALUE => $this->_trim($value),
-            self::SIGN => $x_negative
-        );
-    }
-
-    /**
-     * Subtracts two BigIntegers.
-     *
-     * Here's an example:
-     * 
-     * subtract($b);
-     *
-     *    echo $c->toString(); // outputs -10
-     * ?>
-     * 
-     *
-     * @param \phpseclib\Math\BigInteger $y
-     * @return \phpseclib\Math\BigInteger
-     * @access public
-     * @internal Performs base-2**52 subtraction
-     */
-    function subtract($y)
-    {
-        switch (MATH_BIGINTEGER_MODE) {
-            case self::MODE_GMP:
-                $temp = new static();
-                $temp->value = gmp_sub($this->value, $y->value);
-
-                return $this->_normalize($temp);
-            case self::MODE_BCMATH:
-                $temp = new static();
-                $temp->value = bcsub($this->value, $y->value, 0);
-
-                return $this->_normalize($temp);
-        }
-
-        $temp = $this->_subtract($this->value, $this->is_negative, $y->value, $y->is_negative);
-
-        $result = new static();
-        $result->value = $temp[self::VALUE];
-        $result->is_negative = $temp[self::SIGN];
-
-        return $this->_normalize($result);
-    }
-
-    /**
-     * Performs subtraction.
-     *
-     * @param array $x_value
-     * @param bool $x_negative
-     * @param array $y_value
-     * @param bool $y_negative
-     * @return array
-     * @access private
-     */
-    function _subtract($x_value, $x_negative, $y_value, $y_negative)
-    {
-        $x_size = count($x_value);
-        $y_size = count($y_value);
-
-        if ($x_size == 0) {
-            return array(
-                self::VALUE => $y_value,
-                self::SIGN => !$y_negative
-            );
-        } elseif ($y_size == 0) {
-            return array(
-                self::VALUE => $x_value,
-                self::SIGN => $x_negative
-            );
-        }
-
-        // add, if appropriate (ie. -$x - +$y or +$x - -$y)
-        if ($x_negative != $y_negative) {
-            $temp = $this->_add($x_value, false, $y_value, false);
-            $temp[self::SIGN] = $x_negative;
-
-            return $temp;
-        }
-
-        $diff = $this->_compare($x_value, $x_negative, $y_value, $y_negative);
-
-        if (!$diff) {
-            return array(
-                self::VALUE => array(),
-                self::SIGN => false
-            );
-        }
-
-        // switch $x and $y around, if appropriate.
-        if ((!$x_negative && $diff < 0) || ($x_negative && $diff > 0)) {
-            $temp = $x_value;
-            $x_value = $y_value;
-            $y_value = $temp;
-
-            $x_negative = !$x_negative;
-
-            $x_size = count($x_value);
-            $y_size = count($y_value);
-        }
-
-        // at this point, $x_value should be at least as big as - if not bigger than - $y_value
-
-        $carry = 0;
-        for ($i = 0, $j = 1; $j < $y_size; $i+=2, $j+=2) {
-            $sum = $x_value[$j] * self::$baseFull + $x_value[$i] - $y_value[$j] * self::$baseFull - $y_value[$i] - $carry;
-            $carry = $sum < 0; // eg. floor($sum / 2**52); only possible values (in any base) are 0 and 1
-            $sum = $carry ? $sum + self::$maxDigit2 : $sum;
-
-            $temp = self::$base === 26 ? intval($sum / 0x4000000) : ($sum >> 31);
-
-            $x_value[$i] = (int) ($sum - self::$baseFull * $temp);
-            $x_value[$j] = $temp;
-        }
-
-        if ($j == $y_size) { // ie. if $y_size is odd
-            $sum = $x_value[$i] - $y_value[$i] - $carry;
-            $carry = $sum < 0;
-            $x_value[$i] = $carry ? $sum + self::$baseFull : $sum;
-            ++$i;
-        }
-
-        if ($carry) {
-            for (; !$x_value[$i]; ++$i) {
-                $x_value[$i] = self::$maxDigit;
-            }
-            --$x_value[$i];
-        }
-
-        return array(
-            self::VALUE => $this->_trim($x_value),
-            self::SIGN => $x_negative
-        );
-    }
-
-    /**
-     * Multiplies two BigIntegers
-     *
-     * Here's an example:
-     * 
-     * multiply($b);
-     *
-     *    echo $c->toString(); // outputs 200
-     * ?>
-     * 
-     *
-     * @param \phpseclib\Math\BigInteger $x
-     * @return \phpseclib\Math\BigInteger
-     * @access public
-     */
-    function multiply($x)
-    {
-        switch (MATH_BIGINTEGER_MODE) {
-            case self::MODE_GMP:
-                $temp = new static();
-                $temp->value = gmp_mul($this->value, $x->value);
-
-                return $this->_normalize($temp);
-            case self::MODE_BCMATH:
-                $temp = new static();
-                $temp->value = bcmul($this->value, $x->value, 0);
-
-                return $this->_normalize($temp);
-        }
-
-        $temp = $this->_multiply($this->value, $this->is_negative, $x->value, $x->is_negative);
-
-        $product = new static();
-        $product->value = $temp[self::VALUE];
-        $product->is_negative = $temp[self::SIGN];
-
-        return $this->_normalize($product);
-    }
-
-    /**
-     * Performs multiplication.
-     *
-     * @param array $x_value
-     * @param bool $x_negative
-     * @param array $y_value
-     * @param bool $y_negative
-     * @return array
-     * @access private
-     */
-    function _multiply($x_value, $x_negative, $y_value, $y_negative)
-    {
-        //if ( $x_value == $y_value ) {
-        //    return array(
-        //        self::VALUE => $this->_square($x_value),
-        //        self::SIGN => $x_sign != $y_value
-        //    );
-        //}
-
-        $x_length = count($x_value);
-        $y_length = count($y_value);
-
-        if (!$x_length || !$y_length) { // a 0 is being multiplied
-            return array(
-                self::VALUE => array(),
-                self::SIGN => false
-            );
-        }
-
-        return array(
-            self::VALUE => min($x_length, $y_length) < 2 * self::KARATSUBA_CUTOFF ?
-                $this->_trim($this->_regularMultiply($x_value, $y_value)) :
-                $this->_trim($this->_karatsuba($x_value, $y_value)),
-            self::SIGN => $x_negative != $y_negative
-        );
-    }
-
-    /**
-     * Performs long multiplication on two BigIntegers
-     *
-     * Modeled after 'multiply' in MutableBigInteger.java.
-     *
-     * @param array $x_value
-     * @param array $y_value
-     * @return array
-     * @access private
-     */
-    function _regularMultiply($x_value, $y_value)
-    {
-        $x_length = count($x_value);
-        $y_length = count($y_value);
-
-        if (!$x_length || !$y_length) { // a 0 is being multiplied
-            return array();
-        }
-
-        if ($x_length < $y_length) {
-            $temp = $x_value;
-            $x_value = $y_value;
-            $y_value = $temp;
-
-            $x_length = count($x_value);
-            $y_length = count($y_value);
-        }
-
-        $product_value = $this->_array_repeat(0, $x_length + $y_length);
-
-        // the following for loop could be removed if the for loop following it
-        // (the one with nested for loops) initially set $i to 0, but
-        // doing so would also make the result in one set of unnecessary adds,
-        // since on the outermost loops first pass, $product->value[$k] is going
-        // to always be 0
-
-        $carry = 0;
-
-        for ($j = 0; $j < $x_length; ++$j) { // ie. $i = 0
-            $temp = $x_value[$j] * $y_value[0] + $carry; // $product_value[$k] == 0
-            $carry = self::$base === 26 ? intval($temp / 0x4000000) : ($temp >> 31);
-            $product_value[$j] = (int) ($temp - self::$baseFull * $carry);
-        }
-
-        $product_value[$j] = $carry;
-
-        // the above for loop is what the previous comment was talking about.  the
-        // following for loop is the "one with nested for loops"
-        for ($i = 1; $i < $y_length; ++$i) {
-            $carry = 0;
-
-            for ($j = 0, $k = $i; $j < $x_length; ++$j, ++$k) {
-                $temp = $product_value[$k] + $x_value[$j] * $y_value[$i] + $carry;
-                $carry = self::$base === 26 ? intval($temp / 0x4000000) : ($temp >> 31);
-                $product_value[$k] = (int) ($temp - self::$baseFull * $carry);
-            }
-
-            $product_value[$k] = $carry;
-        }
-
-        return $product_value;
-    }
-
-    /**
-     * Performs Karatsuba multiplication on two BigIntegers
-     *
-     * See {@link http://en.wikipedia.org/wiki/Karatsuba_algorithm Karatsuba algorithm} and
-     * {@link http://math.libtomcrypt.com/files/tommath.pdf#page=120 MPM 5.2.3}.
-     *
-     * @param array $x_value
-     * @param array $y_value
-     * @return array
-     * @access private
-     */
-    function _karatsuba($x_value, $y_value)
-    {
-        $m = min(count($x_value) >> 1, count($y_value) >> 1);
-
-        if ($m < self::KARATSUBA_CUTOFF) {
-            return $this->_regularMultiply($x_value, $y_value);
-        }
-
-        $x1 = array_slice($x_value, $m);
-        $x0 = array_slice($x_value, 0, $m);
-        $y1 = array_slice($y_value, $m);
-        $y0 = array_slice($y_value, 0, $m);
-
-        $z2 = $this->_karatsuba($x1, $y1);
-        $z0 = $this->_karatsuba($x0, $y0);
-
-        $z1 = $this->_add($x1, false, $x0, false);
-        $temp = $this->_add($y1, false, $y0, false);
-        $z1 = $this->_karatsuba($z1[self::VALUE], $temp[self::VALUE]);
-        $temp = $this->_add($z2, false, $z0, false);
-        $z1 = $this->_subtract($z1, false, $temp[self::VALUE], false);
-
-        $z2 = array_merge(array_fill(0, 2 * $m, 0), $z2);
-        $z1[self::VALUE] = array_merge(array_fill(0, $m, 0), $z1[self::VALUE]);
-
-        $xy = $this->_add($z2, false, $z1[self::VALUE], $z1[self::SIGN]);
-        $xy = $this->_add($xy[self::VALUE], $xy[self::SIGN], $z0, false);
-
-        return $xy[self::VALUE];
-    }
-
-    /**
-     * Performs squaring
-     *
-     * @param array $x
-     * @return array
-     * @access private
-     */
-    function _square($x = false)
-    {
-        return count($x) < 2 * self::KARATSUBA_CUTOFF ?
-            $this->_trim($this->_baseSquare($x)) :
-            $this->_trim($this->_karatsubaSquare($x));
-    }
-
-    /**
-     * Performs traditional squaring on two BigIntegers
-     *
-     * Squaring can be done faster than multiplying a number by itself can be.  See
-     * {@link http://www.cacr.math.uwaterloo.ca/hac/about/chap14.pdf#page=7 HAC 14.2.4} /
-     * {@link http://math.libtomcrypt.com/files/tommath.pdf#page=141 MPM 5.3} for more information.
-     *
-     * @param array $value
-     * @return array
-     * @access private
-     */
-    function _baseSquare($value)
-    {
-        if (empty($value)) {
-            return array();
-        }
-        $square_value = $this->_array_repeat(0, 2 * count($value));
-
-        for ($i = 0, $max_index = count($value) - 1; $i <= $max_index; ++$i) {
-            $i2 = $i << 1;
-
-            $temp = $square_value[$i2] + $value[$i] * $value[$i];
-            $carry = self::$base === 26 ? intval($temp / 0x4000000) : ($temp >> 31);
-            $square_value[$i2] = (int) ($temp - self::$baseFull * $carry);
-
-            // note how we start from $i+1 instead of 0 as we do in multiplication.
-            for ($j = $i + 1, $k = $i2 + 1; $j <= $max_index; ++$j, ++$k) {
-                $temp = $square_value[$k] + 2 * $value[$j] * $value[$i] + $carry;
-                $carry = self::$base === 26 ? intval($temp / 0x4000000) : ($temp >> 31);
-                $square_value[$k] = (int) ($temp - self::$baseFull * $carry);
-            }
-
-            // the following line can yield values larger 2**15.  at this point, PHP should switch
-            // over to floats.
-            $square_value[$i + $max_index + 1] = $carry;
-        }
-
-        return $square_value;
-    }
-
-    /**
-     * Performs Karatsuba "squaring" on two BigIntegers
-     *
-     * See {@link http://en.wikipedia.org/wiki/Karatsuba_algorithm Karatsuba algorithm} and
-     * {@link http://math.libtomcrypt.com/files/tommath.pdf#page=151 MPM 5.3.4}.
-     *
-     * @param array $value
-     * @return array
-     * @access private
-     */
-    function _karatsubaSquare($value)
-    {
-        $m = count($value) >> 1;
-
-        if ($m < self::KARATSUBA_CUTOFF) {
-            return $this->_baseSquare($value);
-        }
-
-        $x1 = array_slice($value, $m);
-        $x0 = array_slice($value, 0, $m);
-
-        $z2 = $this->_karatsubaSquare($x1);
-        $z0 = $this->_karatsubaSquare($x0);
-
-        $z1 = $this->_add($x1, false, $x0, false);
-        $z1 = $this->_karatsubaSquare($z1[self::VALUE]);
-        $temp = $this->_add($z2, false, $z0, false);
-        $z1 = $this->_subtract($z1, false, $temp[self::VALUE], false);
-
-        $z2 = array_merge(array_fill(0, 2 * $m, 0), $z2);
-        $z1[self::VALUE] = array_merge(array_fill(0, $m, 0), $z1[self::VALUE]);
-
-        $xx = $this->_add($z2, false, $z1[self::VALUE], $z1[self::SIGN]);
-        $xx = $this->_add($xx[self::VALUE], $xx[self::SIGN], $z0, false);
-
-        return $xx[self::VALUE];
-    }
-
-    /**
-     * Divides two BigIntegers.
-     *
-     * Returns an array whose first element contains the quotient and whose second element contains the
-     * "common residue".  If the remainder would be positive, the "common residue" and the remainder are the
-     * same.  If the remainder would be negative, the "common residue" is equal to the sum of the remainder
-     * and the divisor (basically, the "common residue" is the first positive modulo).
-     *
-     * Here's an example:
-     * 
-     * divide($b);
-     *
-     *    echo $quotient->toString(); // outputs 0
-     *    echo "\r\n";
-     *    echo $remainder->toString(); // outputs 10
-     * ?>
-     * 
-     *
-     * @param \phpseclib\Math\BigInteger $y
-     * @return array
-     * @access public
-     * @internal This function is based off of {@link http://www.cacr.math.uwaterloo.ca/hac/about/chap14.pdf#page=9 HAC 14.20}.
-     */
-    function divide($y)
-    {
-        switch (MATH_BIGINTEGER_MODE) {
-            case self::MODE_GMP:
-                $quotient = new static();
-                $remainder = new static();
-
-                list($quotient->value, $remainder->value) = gmp_div_qr($this->value, $y->value);
-
-                if (gmp_sign($remainder->value) < 0) {
-                    $remainder->value = gmp_add($remainder->value, gmp_abs($y->value));
-                }
-
-                return array($this->_normalize($quotient), $this->_normalize($remainder));
-            case self::MODE_BCMATH:
-                $quotient = new static();
-                $remainder = new static();
-
-                $quotient->value = bcdiv($this->value, $y->value, 0);
-                $remainder->value = bcmod($this->value, $y->value);
-
-                if ($remainder->value[0] == '-') {
-                    $remainder->value = bcadd($remainder->value, $y->value[0] == '-' ? substr($y->value, 1) : $y->value, 0);
-                }
-
-                return array($this->_normalize($quotient), $this->_normalize($remainder));
-        }
-
-        if (count($y->value) == 1) {
-            list($q, $r) = $this->_divide_digit($this->value, $y->value[0]);
-            $quotient = new static();
-            $remainder = new static();
-            $quotient->value = $q;
-            $remainder->value = array($r);
-            $quotient->is_negative = $this->is_negative != $y->is_negative;
-            return array($this->_normalize($quotient), $this->_normalize($remainder));
-        }
-
-        static $zero;
-        if (!isset($zero)) {
-            $zero = new static();
-        }
-
-        $x = $this->copy();
-        $y = $y->copy();
-
-        $x_sign = $x->is_negative;
-        $y_sign = $y->is_negative;
-
-        $x->is_negative = $y->is_negative = false;
-
-        $diff = $x->compare($y);
-
-        if (!$diff) {
-            $temp = new static();
-            $temp->value = array(1);
-            $temp->is_negative = $x_sign != $y_sign;
-            return array($this->_normalize($temp), $this->_normalize(new static()));
-        }
-
-        if ($diff < 0) {
-            // if $x is negative, "add" $y.
-            if ($x_sign) {
-                $x = $y->subtract($x);
-            }
-            return array($this->_normalize(new static()), $this->_normalize($x));
-        }
-
-        // normalize $x and $y as described in HAC 14.23 / 14.24
-        $msb = $y->value[count($y->value) - 1];
-        for ($shift = 0; !($msb & self::$msb); ++$shift) {
-            $msb <<= 1;
-        }
-        $x->_lshift($shift);
-        $y->_lshift($shift);
-        $y_value = &$y->value;
-
-        $x_max = count($x->value) - 1;
-        $y_max = count($y->value) - 1;
-
-        $quotient = new static();
-        $quotient_value = &$quotient->value;
-        $quotient_value = $this->_array_repeat(0, $x_max - $y_max + 1);
-
-        static $temp, $lhs, $rhs;
-        if (!isset($temp)) {
-            $temp = new static();
-            $lhs =  new static();
-            $rhs =  new static();
-        }
-        $temp_value = &$temp->value;
-        $rhs_value =  &$rhs->value;
-
-        // $temp = $y << ($x_max - $y_max-1) in base 2**26
-        $temp_value = array_merge($this->_array_repeat(0, $x_max - $y_max), $y_value);
-
-        while ($x->compare($temp) >= 0) {
-            // calculate the "common residue"
-            ++$quotient_value[$x_max - $y_max];
-            $x = $x->subtract($temp);
-            $x_max = count($x->value) - 1;
-        }
-
-        for ($i = $x_max; $i >= $y_max + 1; --$i) {
-            $x_value = &$x->value;
-            $x_window = array(
-                isset($x_value[$i]) ? $x_value[$i] : 0,
-                isset($x_value[$i - 1]) ? $x_value[$i - 1] : 0,
-                isset($x_value[$i - 2]) ? $x_value[$i - 2] : 0
-            );
-            $y_window = array(
-                $y_value[$y_max],
-                ($y_max > 0) ? $y_value[$y_max - 1] : 0
-            );
-
-            $q_index = $i - $y_max - 1;
-            if ($x_window[0] == $y_window[0]) {
-                $quotient_value[$q_index] = self::$maxDigit;
-            } else {
-                $quotient_value[$q_index] = $this->_safe_divide(
-                    $x_window[0] * self::$baseFull + $x_window[1],
-                    $y_window[0]
-                );
-            }
-
-            $temp_value = array($y_window[1], $y_window[0]);
-
-            $lhs->value = array($quotient_value[$q_index]);
-            $lhs = $lhs->multiply($temp);
-
-            $rhs_value = array($x_window[2], $x_window[1], $x_window[0]);
-
-            while ($lhs->compare($rhs) > 0) {
-                --$quotient_value[$q_index];
-
-                $lhs->value = array($quotient_value[$q_index]);
-                $lhs = $lhs->multiply($temp);
-            }
-
-            $adjust = $this->_array_repeat(0, $q_index);
-            $temp_value = array($quotient_value[$q_index]);
-            $temp = $temp->multiply($y);
-            $temp_value = &$temp->value;
-            $temp_value = array_merge($adjust, $temp_value);
-
-            $x = $x->subtract($temp);
-
-            if ($x->compare($zero) < 0) {
-                $temp_value = array_merge($adjust, $y_value);
-                $x = $x->add($temp);
-
-                --$quotient_value[$q_index];
-            }
-
-            $x_max = count($x_value) - 1;
-        }
-
-        // unnormalize the remainder
-        $x->_rshift($shift);
-
-        $quotient->is_negative = $x_sign != $y_sign;
-
-        // calculate the "common residue", if appropriate
-        if ($x_sign) {
-            $y->_rshift($shift);
-            $x = $y->subtract($x);
-        }
-
-        return array($this->_normalize($quotient), $this->_normalize($x));
-    }
-
-    /**
-     * Divides a BigInteger by a regular integer
-     *
-     * abc / x = a00 / x + b0 / x + c / x
-     *
-     * @param array $dividend
-     * @param array $divisor
-     * @return array
-     * @access private
-     */
-    function _divide_digit($dividend, $divisor)
-    {
-        $carry = 0;
-        $result = array();
-
-        for ($i = count($dividend) - 1; $i >= 0; --$i) {
-            $temp = self::$baseFull * $carry + $dividend[$i];
-            $result[$i] = $this->_safe_divide($temp, $divisor);
-            $carry = (int) ($temp - $divisor * $result[$i]);
-        }
-
-        return array($result, $carry);
-    }
-
-    /**
-     * Performs modular exponentiation.
-     *
-     * Here's an example:
-     * 
-     * modPow($b, $c);
-     *
-     *    echo $c->toString(); // outputs 10
-     * ?>
-     * 
-     *
-     * @param \phpseclib\Math\BigInteger $e
-     * @param \phpseclib\Math\BigInteger $n
-     * @return \phpseclib\Math\BigInteger
-     * @access public
-     * @internal The most naive approach to modular exponentiation has very unreasonable requirements, and
-     *    and although the approach involving repeated squaring does vastly better, it, too, is impractical
-     *    for our purposes.  The reason being that division - by far the most complicated and time-consuming
-     *    of the basic operations (eg. +,-,*,/) - occurs multiple times within it.
-     *
-     *    Modular reductions resolve this issue.  Although an individual modular reduction takes more time
-     *    then an individual division, when performed in succession (with the same modulo), they're a lot faster.
-     *
-     *    The two most commonly used modular reductions are Barrett and Montgomery reduction.  Montgomery reduction,
-     *    although faster, only works when the gcd of the modulo and of the base being used is 1.  In RSA, when the
-     *    base is a power of two, the modulo - a product of two primes - is always going to have a gcd of 1 (because
-     *    the product of two odd numbers is odd), but what about when RSA isn't used?
-     *
-     *    In contrast, Barrett reduction has no such constraint.  As such, some bigint implementations perform a
-     *    Barrett reduction after every operation in the modpow function.  Others perform Barrett reductions when the
-     *    modulo is even and Montgomery reductions when the modulo is odd.  BigInteger.java's modPow method, however,
-     *    uses a trick involving the Chinese Remainder Theorem to factor the even modulo into two numbers - one odd and
-     *    the other, a power of two - and recombine them, later.  This is the method that this modPow function uses.
-     *    {@link http://islab.oregonstate.edu/papers/j34monex.pdf Montgomery Reduction with Even Modulus} elaborates.
-     */
-    function modPow($e, $n)
-    {
-        $n = $this->bitmask !== false && $this->bitmask->compare($n) < 0 ? $this->bitmask : $n->abs();
-
-        if ($e->compare(new static()) < 0) {
-            $e = $e->abs();
-
-            $temp = $this->modInverse($n);
-            if ($temp === false) {
-                return false;
-            }
-
-            return $this->_normalize($temp->modPow($e, $n));
-        }
-
-        if (MATH_BIGINTEGER_MODE == self::MODE_GMP) {
-            $temp = new static();
-            $temp->value = gmp_powm($this->value, $e->value, $n->value);
-
-            return $this->_normalize($temp);
-        }
-
-        if ($this->compare(new static()) < 0 || $this->compare($n) > 0) {
-            list(, $temp) = $this->divide($n);
-            return $temp->modPow($e, $n);
-        }
-
-        if (defined('MATH_BIGINTEGER_OPENSSL_ENABLED')) {
-            $components = array(
-                'modulus' => $n->toBytes(true),
-                'publicExponent' => $e->toBytes(true)
-            );
-
-            $components = array(
-                'modulus' => pack('Ca*a*', 2, $this->_encodeASN1Length(strlen($components['modulus'])), $components['modulus']),
-                'publicExponent' => pack('Ca*a*', 2, $this->_encodeASN1Length(strlen($components['publicExponent'])), $components['publicExponent'])
-            );
-
-            $RSAPublicKey = pack(
-                'Ca*a*a*',
-                48,
-                $this->_encodeASN1Length(strlen($components['modulus']) + strlen($components['publicExponent'])),
-                $components['modulus'],
-                $components['publicExponent']
-            );
-
-            $rsaOID = pack('H*', '300d06092a864886f70d0101010500'); // hex version of MA0GCSqGSIb3DQEBAQUA
-            $RSAPublicKey = chr(0) . $RSAPublicKey;
-            $RSAPublicKey = chr(3) . $this->_encodeASN1Length(strlen($RSAPublicKey)) . $RSAPublicKey;
-
-            $encapsulated = pack(
-                'Ca*a*',
-                48,
-                $this->_encodeASN1Length(strlen($rsaOID . $RSAPublicKey)),
-                $rsaOID . $RSAPublicKey
-            );
-
-            $RSAPublicKey = "-----BEGIN PUBLIC KEY-----\r\n" .
-                             chunk_split(base64_encode($encapsulated)) .
-                             '-----END PUBLIC KEY-----';
-
-            $plaintext = str_pad($this->toBytes(), strlen($n->toBytes(true)) - 1, "\0", STR_PAD_LEFT);
-
-            if (openssl_public_encrypt($plaintext, $result, $RSAPublicKey, OPENSSL_NO_PADDING)) {
-                return new static($result, 256);
-            }
-        }
-
-        if (MATH_BIGINTEGER_MODE == self::MODE_BCMATH) {
-            $temp = new static();
-            $temp->value = bcpowmod($this->value, $e->value, $n->value, 0);
-
-            return $this->_normalize($temp);
-        }
-
-        if (empty($e->value)) {
-            $temp = new static();
-            $temp->value = array(1);
-            return $this->_normalize($temp);
-        }
-
-        if ($e->value == array(1)) {
-            list(, $temp) = $this->divide($n);
-            return $this->_normalize($temp);
-        }
-
-        if ($e->value == array(2)) {
-            $temp = new static();
-            $temp->value = $this->_square($this->value);
-            list(, $temp) = $temp->divide($n);
-            return $this->_normalize($temp);
-        }
-
-        return $this->_normalize($this->_slidingWindow($e, $n, self::BARRETT));
-
-        // the following code, although not callable, can be run independently of the above code
-        // although the above code performed better in my benchmarks the following could might
-        // perform better under different circumstances. in lieu of deleting it it's just been
-        // made uncallable
-
-        // is the modulo odd?
-        if ($n->value[0] & 1) {
-            return $this->_normalize($this->_slidingWindow($e, $n, self::MONTGOMERY));
-        }
-        // if it's not, it's even
-
-        // find the lowest set bit (eg. the max pow of 2 that divides $n)
-        for ($i = 0; $i < count($n->value); ++$i) {
-            if ($n->value[$i]) {
-                $temp = decbin($n->value[$i]);
-                $j = strlen($temp) - strrpos($temp, '1') - 1;
-                $j+= 26 * $i;
-                break;
-            }
-        }
-        // at this point, 2^$j * $n/(2^$j) == $n
-
-        $mod1 = $n->copy();
-        $mod1->_rshift($j);
-        $mod2 = new static();
-        $mod2->value = array(1);
-        $mod2->_lshift($j);
-
-        $part1 = ($mod1->value != array(1)) ? $this->_slidingWindow($e, $mod1, self::MONTGOMERY) : new static();
-        $part2 = $this->_slidingWindow($e, $mod2, self::POWEROF2);
-
-        $y1 = $mod2->modInverse($mod1);
-        $y2 = $mod1->modInverse($mod2);
-
-        $result = $part1->multiply($mod2);
-        $result = $result->multiply($y1);
-
-        $temp = $part2->multiply($mod1);
-        $temp = $temp->multiply($y2);
-
-        $result = $result->add($temp);
-        list(, $result) = $result->divide($n);
-
-        return $this->_normalize($result);
-    }
-
-    /**
-     * Performs modular exponentiation.
-     *
-     * Alias for modPow().
-     *
-     * @param \phpseclib\Math\BigInteger $e
-     * @param \phpseclib\Math\BigInteger $n
-     * @return \phpseclib\Math\BigInteger
-     * @access public
-     */
-    function powMod($e, $n)
-    {
-        return $this->modPow($e, $n);
-    }
-
-    /**
-     * Sliding Window k-ary Modular Exponentiation
-     *
-     * Based on {@link http://www.cacr.math.uwaterloo.ca/hac/about/chap14.pdf#page=27 HAC 14.85} /
-     * {@link http://math.libtomcrypt.com/files/tommath.pdf#page=210 MPM 7.7}.  In a departure from those algorithims,
-     * however, this function performs a modular reduction after every multiplication and squaring operation.
-     * As such, this function has the same preconditions that the reductions being used do.
-     *
-     * @param \phpseclib\Math\BigInteger $e
-     * @param \phpseclib\Math\BigInteger $n
-     * @param int $mode
-     * @return \phpseclib\Math\BigInteger
-     * @access private
-     */
-    function _slidingWindow($e, $n, $mode)
-    {
-        static $window_ranges = array(7, 25, 81, 241, 673, 1793); // from BigInteger.java's oddModPow function
-        //static $window_ranges = array(0, 7, 36, 140, 450, 1303, 3529); // from MPM 7.3.1
-
-        $e_value = $e->value;
-        $e_length = count($e_value) - 1;
-        $e_bits = decbin($e_value[$e_length]);
-        for ($i = $e_length - 1; $i >= 0; --$i) {
-            $e_bits.= str_pad(decbin($e_value[$i]), self::$base, '0', STR_PAD_LEFT);
-        }
-
-        $e_length = strlen($e_bits);
-
-        // calculate the appropriate window size.
-        // $window_size == 3 if $window_ranges is between 25 and 81, for example.
-        for ($i = 0, $window_size = 1; $i < count($window_ranges) && $e_length > $window_ranges[$i]; ++$window_size, ++$i) {
-        }
-
-        $n_value = $n->value;
-
-        // precompute $this^0 through $this^$window_size
-        $powers = array();
-        $powers[1] = $this->_prepareReduce($this->value, $n_value, $mode);
-        $powers[2] = $this->_squareReduce($powers[1], $n_value, $mode);
-
-        // we do every other number since substr($e_bits, $i, $j+1) (see below) is supposed to end
-        // in a 1.  ie. it's supposed to be odd.
-        $temp = 1 << ($window_size - 1);
-        for ($i = 1; $i < $temp; ++$i) {
-            $i2 = $i << 1;
-            $powers[$i2 + 1] = $this->_multiplyReduce($powers[$i2 - 1], $powers[2], $n_value, $mode);
-        }
-
-        $result = array(1);
-        $result = $this->_prepareReduce($result, $n_value, $mode);
-
-        for ($i = 0; $i < $e_length;) {
-            if (!$e_bits[$i]) {
-                $result = $this->_squareReduce($result, $n_value, $mode);
-                ++$i;
-            } else {
-                for ($j = $window_size - 1; $j > 0; --$j) {
-                    if (!empty($e_bits[$i + $j])) {
-                        break;
-                    }
-                }
-
-                // eg. the length of substr($e_bits, $i, $j + 1)
-                for ($k = 0; $k <= $j; ++$k) {
-                    $result = $this->_squareReduce($result, $n_value, $mode);
-                }
-
-                $result = $this->_multiplyReduce($result, $powers[bindec(substr($e_bits, $i, $j + 1))], $n_value, $mode);
-
-                $i += $j + 1;
-            }
-        }
-
-        $temp = new static();
-        $temp->value = $this->_reduce($result, $n_value, $mode);
-
-        return $temp;
-    }
-
-    /**
-     * Modular reduction
-     *
-     * For most $modes this will return the remainder.
-     *
-     * @see self::_slidingWindow()
-     * @access private
-     * @param array $x
-     * @param array $n
-     * @param int $mode
-     * @return array
-     */
-    function _reduce($x, $n, $mode)
-    {
-        switch ($mode) {
-            case self::MONTGOMERY:
-                return $this->_montgomery($x, $n);
-            case self::BARRETT:
-                return $this->_barrett($x, $n);
-            case self::POWEROF2:
-                $lhs = new static();
-                $lhs->value = $x;
-                $rhs = new static();
-                $rhs->value = $n;
-                return $x->_mod2($n);
-            case self::CLASSIC:
-                $lhs = new static();
-                $lhs->value = $x;
-                $rhs = new static();
-                $rhs->value = $n;
-                list(, $temp) = $lhs->divide($rhs);
-                return $temp->value;
-            case self::NONE:
-                return $x;
-            default:
-                // an invalid $mode was provided
-        }
-    }
-
-    /**
-     * Modular reduction preperation
-     *
-     * @see self::_slidingWindow()
-     * @access private
-     * @param array $x
-     * @param array $n
-     * @param int $mode
-     * @return array
-     */
-    function _prepareReduce($x, $n, $mode)
-    {
-        if ($mode == self::MONTGOMERY) {
-            return $this->_prepMontgomery($x, $n);
-        }
-        return $this->_reduce($x, $n, $mode);
-    }
-
-    /**
-     * Modular multiply
-     *
-     * @see self::_slidingWindow()
-     * @access private
-     * @param array $x
-     * @param array $y
-     * @param array $n
-     * @param int $mode
-     * @return array
-     */
-    function _multiplyReduce($x, $y, $n, $mode)
-    {
-        if ($mode == self::MONTGOMERY) {
-            return $this->_montgomeryMultiply($x, $y, $n);
-        }
-        $temp = $this->_multiply($x, false, $y, false);
-        return $this->_reduce($temp[self::VALUE], $n, $mode);
-    }
-
-    /**
-     * Modular square
-     *
-     * @see self::_slidingWindow()
-     * @access private
-     * @param array $x
-     * @param array $n
-     * @param int $mode
-     * @return array
-     */
-    function _squareReduce($x, $n, $mode)
-    {
-        if ($mode == self::MONTGOMERY) {
-            return $this->_montgomeryMultiply($x, $x, $n);
-        }
-        return $this->_reduce($this->_square($x), $n, $mode);
-    }
-
-    /**
-     * Modulos for Powers of Two
-     *
-     * Calculates $x%$n, where $n = 2**$e, for some $e.  Since this is basically the same as doing $x & ($n-1),
-     * we'll just use this function as a wrapper for doing that.
-     *
-     * @see self::_slidingWindow()
-     * @access private
-     * @param \phpseclib\Math\BigInteger
-     * @return \phpseclib\Math\BigInteger
-     */
-    function _mod2($n)
-    {
-        $temp = new static();
-        $temp->value = array(1);
-        return $this->bitwise_and($n->subtract($temp));
-    }
-
-    /**
-     * Barrett Modular Reduction
-     *
-     * See {@link http://www.cacr.math.uwaterloo.ca/hac/about/chap14.pdf#page=14 HAC 14.3.3} /
-     * {@link http://math.libtomcrypt.com/files/tommath.pdf#page=165 MPM 6.2.5} for more information.  Modified slightly,
-     * so as not to require negative numbers (initially, this script didn't support negative numbers).
-     *
-     * Employs "folding", as described at
-     * {@link http://www.cosic.esat.kuleuven.be/publications/thesis-149.pdf#page=66 thesis-149.pdf#page=66}.  To quote from
-     * it, "the idea [behind folding] is to find a value x' such that x (mod m) = x' (mod m), with x' being smaller than x."
-     *
-     * Unfortunately, the "Barrett Reduction with Folding" algorithm described in thesis-149.pdf is not, as written, all that
-     * usable on account of (1) its not using reasonable radix points as discussed in
-     * {@link http://math.libtomcrypt.com/files/tommath.pdf#page=162 MPM 6.2.2} and (2) the fact that, even with reasonable
-     * radix points, it only works when there are an even number of digits in the denominator.  The reason for (2) is that
-     * (x >> 1) + (x >> 1) != x / 2 + x / 2.  If x is even, they're the same, but if x is odd, they're not.  See the in-line
-     * comments for details.
-     *
-     * @see self::_slidingWindow()
-     * @access private
-     * @param array $n
-     * @param array $m
-     * @return array
-     */
-    function _barrett($n, $m)
-    {
-        static $cache = array(
-            self::VARIABLE => array(),
-            self::DATA => array()
-        );
-
-        $m_length = count($m);
-
-        // if ($this->_compare($n, $this->_square($m)) >= 0) {
-        if (count($n) > 2 * $m_length) {
-            $lhs = new static();
-            $rhs = new static();
-            $lhs->value = $n;
-            $rhs->value = $m;
-            list(, $temp) = $lhs->divide($rhs);
-            return $temp->value;
-        }
-
-        // if (m.length >> 1) + 2 <= m.length then m is too small and n can't be reduced
-        if ($m_length < 5) {
-            return $this->_regularBarrett($n, $m);
-        }
-
-        // n = 2 * m.length
-
-        if (($key = array_search($m, $cache[self::VARIABLE])) === false) {
-            $key = count($cache[self::VARIABLE]);
-            $cache[self::VARIABLE][] = $m;
-
-            $lhs = new static();
-            $lhs_value = &$lhs->value;
-            $lhs_value = $this->_array_repeat(0, $m_length + ($m_length >> 1));
-            $lhs_value[] = 1;
-            $rhs = new static();
-            $rhs->value = $m;
-
-            list($u, $m1) = $lhs->divide($rhs);
-            $u = $u->value;
-            $m1 = $m1->value;
-
-            $cache[self::DATA][] = array(
-                'u' => $u, // m.length >> 1 (technically (m.length >> 1) + 1)
-                'm1'=> $m1 // m.length
-            );
-        } else {
-            extract($cache[self::DATA][$key]);
-        }
-
-        $cutoff = $m_length + ($m_length >> 1);
-        $lsd = array_slice($n, 0, $cutoff); // m.length + (m.length >> 1)
-        $msd = array_slice($n, $cutoff);    // m.length >> 1
-        $lsd = $this->_trim($lsd);
-        $temp = $this->_multiply($msd, false, $m1, false);
-        $n = $this->_add($lsd, false, $temp[self::VALUE], false); // m.length + (m.length >> 1) + 1
-
-        if ($m_length & 1) {
-            return $this->_regularBarrett($n[self::VALUE], $m);
-        }
-
-        // (m.length + (m.length >> 1) + 1) - (m.length - 1) == (m.length >> 1) + 2
-        $temp = array_slice($n[self::VALUE], $m_length - 1);
-        // if even: ((m.length >> 1) + 2) + (m.length >> 1) == m.length + 2
-        // if odd:  ((m.length >> 1) + 2) + (m.length >> 1) == (m.length - 1) + 2 == m.length + 1
-        $temp = $this->_multiply($temp, false, $u, false);
-        // if even: (m.length + 2) - ((m.length >> 1) + 1) = m.length - (m.length >> 1) + 1
-        // if odd:  (m.length + 1) - ((m.length >> 1) + 1) = m.length - (m.length >> 1)
-        $temp = array_slice($temp[self::VALUE], ($m_length >> 1) + 1);
-        // if even: (m.length - (m.length >> 1) + 1) + m.length = 2 * m.length - (m.length >> 1) + 1
-        // if odd:  (m.length - (m.length >> 1)) + m.length     = 2 * m.length - (m.length >> 1)
-        $temp = $this->_multiply($temp, false, $m, false);
-
-        // at this point, if m had an odd number of digits, we'd be subtracting a 2 * m.length - (m.length >> 1) digit
-        // number from a m.length + (m.length >> 1) + 1 digit number.  ie. there'd be an extra digit and the while loop
-        // following this comment would loop a lot (hence our calling _regularBarrett() in that situation).
-
-        $result = $this->_subtract($n[self::VALUE], false, $temp[self::VALUE], false);
-
-        while ($this->_compare($result[self::VALUE], $result[self::SIGN], $m, false) >= 0) {
-            $result = $this->_subtract($result[self::VALUE], $result[self::SIGN], $m, false);
-        }
-
-        return $result[self::VALUE];
-    }
-
-    /**
-     * (Regular) Barrett Modular Reduction
-     *
-     * For numbers with more than four digits BigInteger::_barrett() is faster.  The difference between that and this
-     * is that this function does not fold the denominator into a smaller form.
-     *
-     * @see self::_slidingWindow()
-     * @access private
-     * @param array $x
-     * @param array $n
-     * @return array
-     */
-    function _regularBarrett($x, $n)
-    {
-        static $cache = array(
-            self::VARIABLE => array(),
-            self::DATA => array()
-        );
-
-        $n_length = count($n);
-
-        if (count($x) > 2 * $n_length) {
-            $lhs = new static();
-            $rhs = new static();
-            $lhs->value = $x;
-            $rhs->value = $n;
-            list(, $temp) = $lhs->divide($rhs);
-            return $temp->value;
-        }
-
-        if (($key = array_search($n, $cache[self::VARIABLE])) === false) {
-            $key = count($cache[self::VARIABLE]);
-            $cache[self::VARIABLE][] = $n;
-            $lhs = new static();
-            $lhs_value = &$lhs->value;
-            $lhs_value = $this->_array_repeat(0, 2 * $n_length);
-            $lhs_value[] = 1;
-            $rhs = new static();
-            $rhs->value = $n;
-            list($temp, ) = $lhs->divide($rhs); // m.length
-            $cache[self::DATA][] = $temp->value;
-        }
-
-        // 2 * m.length - (m.length - 1) = m.length + 1
-        $temp = array_slice($x, $n_length - 1);
-        // (m.length + 1) + m.length = 2 * m.length + 1
-        $temp = $this->_multiply($temp, false, $cache[self::DATA][$key], false);
-        // (2 * m.length + 1) - (m.length - 1) = m.length + 2
-        $temp = array_slice($temp[self::VALUE], $n_length + 1);
-
-        // m.length + 1
-        $result = array_slice($x, 0, $n_length + 1);
-        // m.length + 1
-        $temp = $this->_multiplyLower($temp, false, $n, false, $n_length + 1);
-        // $temp == array_slice($temp->_multiply($temp, false, $n, false)->value, 0, $n_length + 1)
-
-        if ($this->_compare($result, false, $temp[self::VALUE], $temp[self::SIGN]) < 0) {
-            $corrector_value = $this->_array_repeat(0, $n_length + 1);
-            $corrector_value[count($corrector_value)] = 1;
-            $result = $this->_add($result, false, $corrector_value, false);
-            $result = $result[self::VALUE];
-        }
-
-        // at this point, we're subtracting a number with m.length + 1 digits from another number with m.length + 1 digits
-        $result = $this->_subtract($result, false, $temp[self::VALUE], $temp[self::SIGN]);
-        while ($this->_compare($result[self::VALUE], $result[self::SIGN], $n, false) > 0) {
-            $result = $this->_subtract($result[self::VALUE], $result[self::SIGN], $n, false);
-        }
-
-        return $result[self::VALUE];
-    }
-
-    /**
-     * Performs long multiplication up to $stop digits
-     *
-     * If you're going to be doing array_slice($product->value, 0, $stop), some cycles can be saved.
-     *
-     * @see self::_regularBarrett()
-     * @param array $x_value
-     * @param bool $x_negative
-     * @param array $y_value
-     * @param bool $y_negative
-     * @param int $stop
-     * @return array
-     * @access private
-     */
-    function _multiplyLower($x_value, $x_negative, $y_value, $y_negative, $stop)
-    {
-        $x_length = count($x_value);
-        $y_length = count($y_value);
-
-        if (!$x_length || !$y_length) { // a 0 is being multiplied
-            return array(
-                self::VALUE => array(),
-                self::SIGN => false
-            );
-        }
-
-        if ($x_length < $y_length) {
-            $temp = $x_value;
-            $x_value = $y_value;
-            $y_value = $temp;
-
-            $x_length = count($x_value);
-            $y_length = count($y_value);
-        }
-
-        $product_value = $this->_array_repeat(0, $x_length + $y_length);
-
-        // the following for loop could be removed if the for loop following it
-        // (the one with nested for loops) initially set $i to 0, but
-        // doing so would also make the result in one set of unnecessary adds,
-        // since on the outermost loops first pass, $product->value[$k] is going
-        // to always be 0
-
-        $carry = 0;
-
-        for ($j = 0; $j < $x_length; ++$j) { // ie. $i = 0, $k = $i
-            $temp = $x_value[$j] * $y_value[0] + $carry; // $product_value[$k] == 0
-            $carry = self::$base === 26 ? intval($temp / 0x4000000) : ($temp >> 31);
-            $product_value[$j] = (int) ($temp - self::$baseFull * $carry);
-        }
-
-        if ($j < $stop) {
-            $product_value[$j] = $carry;
-        }
-
-        // the above for loop is what the previous comment was talking about.  the
-        // following for loop is the "one with nested for loops"
-
-        for ($i = 1; $i < $y_length; ++$i) {
-            $carry = 0;
-
-            for ($j = 0, $k = $i; $j < $x_length && $k < $stop; ++$j, ++$k) {
-                $temp = $product_value[$k] + $x_value[$j] * $y_value[$i] + $carry;
-                $carry = self::$base === 26 ? intval($temp / 0x4000000) : ($temp >> 31);
-                $product_value[$k] = (int) ($temp - self::$baseFull * $carry);
-            }
-
-            if ($k < $stop) {
-                $product_value[$k] = $carry;
-            }
-        }
-
-        return array(
-            self::VALUE => $this->_trim($product_value),
-            self::SIGN => $x_negative != $y_negative
-        );
-    }
-
-    /**
-     * Montgomery Modular Reduction
-     *
-     * ($x->_prepMontgomery($n))->_montgomery($n) yields $x % $n.
-     * {@link http://math.libtomcrypt.com/files/tommath.pdf#page=170 MPM 6.3} provides insights on how this can be
-     * improved upon (basically, by using the comba method).  gcd($n, 2) must be equal to one for this function
-     * to work correctly.
-     *
-     * @see self::_prepMontgomery()
-     * @see self::_slidingWindow()
-     * @access private
-     * @param array $x
-     * @param array $n
-     * @return array
-     */
-    function _montgomery($x, $n)
-    {
-        static $cache = array(
-            self::VARIABLE => array(),
-            self::DATA => array()
-        );
-
-        if (($key = array_search($n, $cache[self::VARIABLE])) === false) {
-            $key = count($cache[self::VARIABLE]);
-            $cache[self::VARIABLE][] = $x;
-            $cache[self::DATA][] = $this->_modInverse67108864($n);
-        }
-
-        $k = count($n);
-
-        $result = array(self::VALUE => $x);
-
-        for ($i = 0; $i < $k; ++$i) {
-            $temp = $result[self::VALUE][$i] * $cache[self::DATA][$key];
-            $temp = $temp - self::$baseFull * (self::$base === 26 ? intval($temp / 0x4000000) : ($temp >> 31));
-            $temp = $this->_regularMultiply(array($temp), $n);
-            $temp = array_merge($this->_array_repeat(0, $i), $temp);
-            $result = $this->_add($result[self::VALUE], false, $temp, false);
-        }
-
-        $result[self::VALUE] = array_slice($result[self::VALUE], $k);
-
-        if ($this->_compare($result, false, $n, false) >= 0) {
-            $result = $this->_subtract($result[self::VALUE], false, $n, false);
-        }
-
-        return $result[self::VALUE];
-    }
-
-    /**
-     * Montgomery Multiply
-     *
-     * Interleaves the montgomery reduction and long multiplication algorithms together as described in
-     * {@link http://www.cacr.math.uwaterloo.ca/hac/about/chap14.pdf#page=13 HAC 14.36}
-     *
-     * @see self::_prepMontgomery()
-     * @see self::_montgomery()
-     * @access private
-     * @param array $x
-     * @param array $y
-     * @param array $m
-     * @return array
-     */
-    function _montgomeryMultiply($x, $y, $m)
-    {
-        $temp = $this->_multiply($x, false, $y, false);
-        return $this->_montgomery($temp[self::VALUE], $m);
-
-        // the following code, although not callable, can be run independently of the above code
-        // although the above code performed better in my benchmarks the following could might
-        // perform better under different circumstances. in lieu of deleting it it's just been
-        // made uncallable
-
-        static $cache = array(
-            self::VARIABLE => array(),
-            self::DATA => array()
-        );
-
-        if (($key = array_search($m, $cache[self::VARIABLE])) === false) {
-            $key = count($cache[self::VARIABLE]);
-            $cache[self::VARIABLE][] = $m;
-            $cache[self::DATA][] = $this->_modInverse67108864($m);
-        }
-
-        $n = max(count($x), count($y), count($m));
-        $x = array_pad($x, $n, 0);
-        $y = array_pad($y, $n, 0);
-        $m = array_pad($m, $n, 0);
-        $a = array(self::VALUE => $this->_array_repeat(0, $n + 1));
-        for ($i = 0; $i < $n; ++$i) {
-            $temp = $a[self::VALUE][0] + $x[$i] * $y[0];
-            $temp = $temp - self::$baseFull * (self::$base === 26 ? intval($temp / 0x4000000) : ($temp >> 31));
-            $temp = $temp * $cache[self::DATA][$key];
-            $temp = $temp - self::$baseFull * (self::$base === 26 ? intval($temp / 0x4000000) : ($temp >> 31));
-            $temp = $this->_add($this->_regularMultiply(array($x[$i]), $y), false, $this->_regularMultiply(array($temp), $m), false);
-            $a = $this->_add($a[self::VALUE], false, $temp[self::VALUE], false);
-            $a[self::VALUE] = array_slice($a[self::VALUE], 1);
-        }
-        if ($this->_compare($a[self::VALUE], false, $m, false) >= 0) {
-            $a = $this->_subtract($a[self::VALUE], false, $m, false);
-        }
-        return $a[self::VALUE];
-    }
-
-    /**
-     * Prepare a number for use in Montgomery Modular Reductions
-     *
-     * @see self::_montgomery()
-     * @see self::_slidingWindow()
-     * @access private
-     * @param array $x
-     * @param array $n
-     * @return array
-     */
-    function _prepMontgomery($x, $n)
-    {
-        $lhs = new static();
-        $lhs->value = array_merge($this->_array_repeat(0, count($n)), $x);
-        $rhs = new static();
-        $rhs->value = $n;
-
-        list(, $temp) = $lhs->divide($rhs);
-        return $temp->value;
-    }
-
-    /**
-     * Modular Inverse of a number mod 2**26 (eg. 67108864)
-     *
-     * Based off of the bnpInvDigit function implemented and justified in the following URL:
-     *
-     * {@link http://www-cs-students.stanford.edu/~tjw/jsbn/jsbn.js}
-     *
-     * The following URL provides more info:
-     *
-     * {@link http://groups.google.com/group/sci.crypt/msg/7a137205c1be7d85}
-     *
-     * As for why we do all the bitmasking...  strange things can happen when converting from floats to ints. For
-     * instance, on some computers, var_dump((int) -4294967297) yields int(-1) and on others, it yields
-     * int(-2147483648).  To avoid problems stemming from this, we use bitmasks to guarantee that ints aren't
-     * auto-converted to floats.  The outermost bitmask is present because without it, there's no guarantee that
-     * the "residue" returned would be the so-called "common residue".  We use fmod, in the last step, because the
-     * maximum possible $x is 26 bits and the maximum $result is 16 bits.  Thus, we have to be able to handle up to
-     * 40 bits, which only 64-bit floating points will support.
-     *
-     * Thanks to Pedro Gimeno Fortea for input!
-     *
-     * @see self::_montgomery()
-     * @access private
-     * @param array $x
-     * @return int
-     */
-    function _modInverse67108864($x) // 2**26 == 67,108,864
-    {
-        $x = -$x[0];
-        $result = $x & 0x3; // x**-1 mod 2**2
-        $result = ($result * (2 - $x * $result)) & 0xF; // x**-1 mod 2**4
-        $result = ($result * (2 - ($x & 0xFF) * $result))  & 0xFF; // x**-1 mod 2**8
-        $result = ($result * ((2 - ($x & 0xFFFF) * $result) & 0xFFFF)) & 0xFFFF; // x**-1 mod 2**16
-        $result = fmod($result * (2 - fmod($x * $result, self::$baseFull)), self::$baseFull); // x**-1 mod 2**26
-        return $result & self::$maxDigit;
-    }
-
-    /**
-     * Calculates modular inverses.
-     *
-     * Say you have (30 mod 17 * x mod 17) mod 17 == 1.  x can be found using modular inverses.
-     *
-     * Here's an example:
-     * 
-     * modInverse($b);
-     *    echo $c->toString(); // outputs 4
-     *
-     *    echo "\r\n";
-     *
-     *    $d = $a->multiply($c);
-     *    list(, $d) = $d->divide($b);
-     *    echo $d; // outputs 1 (as per the definition of modular inverse)
-     * ?>
-     * 
-     *
-     * @param \phpseclib\Math\BigInteger $n
-     * @return \phpseclib\Math\BigInteger|false
-     * @access public
-     * @internal See {@link http://www.cacr.math.uwaterloo.ca/hac/about/chap14.pdf#page=21 HAC 14.64} for more information.
-     */
-    function modInverse($n)
-    {
-        switch (MATH_BIGINTEGER_MODE) {
-            case self::MODE_GMP:
-                $temp = new static();
-                $temp->value = gmp_invert($this->value, $n->value);
-
-                return ($temp->value === false) ? false : $this->_normalize($temp);
-        }
-
-        static $zero, $one;
-        if (!isset($zero)) {
-            $zero = new static();
-            $one = new static(1);
-        }
-
-        // $x mod -$n == $x mod $n.
-        $n = $n->abs();
-
-        if ($this->compare($zero) < 0) {
-            $temp = $this->abs();
-            $temp = $temp->modInverse($n);
-            return $this->_normalize($n->subtract($temp));
-        }
-
-        extract($this->extendedGCD($n));
-
-        if (!$gcd->equals($one)) {
-            return false;
-        }
-
-        $x = $x->compare($zero) < 0 ? $x->add($n) : $x;
-
-        return $this->compare($zero) < 0 ? $this->_normalize($n->subtract($x)) : $this->_normalize($x);
-    }
-
-    /**
-     * Calculates the greatest common divisor and Bezout's identity.
-     *
-     * Say you have 693 and 609.  The GCD is 21.  Bezout's identity states that there exist integers x and y such that
-     * 693*x + 609*y == 21.  In point of fact, there are actually an infinite number of x and y combinations and which
-     * combination is returned is dependent upon which mode is in use.  See
-     * {@link http://en.wikipedia.org/wiki/B%C3%A9zout%27s_identity Bezout's identity - Wikipedia} for more information.
-     *
-     * Here's an example:
-     * 
-     * extendedGCD($b));
-     *
-     *    echo $gcd->toString() . "\r\n"; // outputs 21
-     *    echo $a->toString() * $x->toString() + $b->toString() * $y->toString(); // outputs 21
-     * ?>
-     * 
-     *
-     * @param \phpseclib\Math\BigInteger $n
-     * @return \phpseclib\Math\BigInteger
-     * @access public
-     * @internal Calculates the GCD using the binary xGCD algorithim described in
-     *    {@link http://www.cacr.math.uwaterloo.ca/hac/about/chap14.pdf#page=19 HAC 14.61}.  As the text above 14.61 notes,
-     *    the more traditional algorithim requires "relatively costly multiple-precision divisions".
-     */
-    function extendedGCD($n)
-    {
-        switch (MATH_BIGINTEGER_MODE) {
-            case self::MODE_GMP:
-                extract(gmp_gcdext($this->value, $n->value));
-
-                return array(
-                    'gcd' => $this->_normalize(new static($g)),
-                    'x'   => $this->_normalize(new static($s)),
-                    'y'   => $this->_normalize(new static($t))
-                );
-            case self::MODE_BCMATH:
-                // it might be faster to use the binary xGCD algorithim here, as well, but (1) that algorithim works
-                // best when the base is a power of 2 and (2) i don't think it'd make much difference, anyway.  as is,
-                // the basic extended euclidean algorithim is what we're using.
-
-                $u = $this->value;
-                $v = $n->value;
-
-                $a = '1';
-                $b = '0';
-                $c = '0';
-                $d = '1';
-
-                while (bccomp($v, '0', 0) != 0) {
-                    $q = bcdiv($u, $v, 0);
-
-                    $temp = $u;
-                    $u = $v;
-                    $v = bcsub($temp, bcmul($v, $q, 0), 0);
-
-                    $temp = $a;
-                    $a = $c;
-                    $c = bcsub($temp, bcmul($a, $q, 0), 0);
-
-                    $temp = $b;
-                    $b = $d;
-                    $d = bcsub($temp, bcmul($b, $q, 0), 0);
-                }
-
-                return array(
-                    'gcd' => $this->_normalize(new static($u)),
-                    'x'   => $this->_normalize(new static($a)),
-                    'y'   => $this->_normalize(new static($b))
-                );
-        }
-
-        $y = $n->copy();
-        $x = $this->copy();
-        $g = new static();
-        $g->value = array(1);
-
-        while (!(($x->value[0] & 1)|| ($y->value[0] & 1))) {
-            $x->_rshift(1);
-            $y->_rshift(1);
-            $g->_lshift(1);
-        }
-
-        $u = $x->copy();
-        $v = $y->copy();
-
-        $a = new static();
-        $b = new static();
-        $c = new static();
-        $d = new static();
-
-        $a->value = $d->value = $g->value = array(1);
-        $b->value = $c->value = array();
-
-        while (!empty($u->value)) {
-            while (!($u->value[0] & 1)) {
-                $u->_rshift(1);
-                if ((!empty($a->value) && ($a->value[0] & 1)) || (!empty($b->value) && ($b->value[0] & 1))) {
-                    $a = $a->add($y);
-                    $b = $b->subtract($x);
-                }
-                $a->_rshift(1);
-                $b->_rshift(1);
-            }
-
-            while (!($v->value[0] & 1)) {
-                $v->_rshift(1);
-                if ((!empty($d->value) && ($d->value[0] & 1)) || (!empty($c->value) && ($c->value[0] & 1))) {
-                    $c = $c->add($y);
-                    $d = $d->subtract($x);
-                }
-                $c->_rshift(1);
-                $d->_rshift(1);
-            }
-
-            if ($u->compare($v) >= 0) {
-                $u = $u->subtract($v);
-                $a = $a->subtract($c);
-                $b = $b->subtract($d);
-            } else {
-                $v = $v->subtract($u);
-                $c = $c->subtract($a);
-                $d = $d->subtract($b);
-            }
-        }
-
-        return array(
-            'gcd' => $this->_normalize($g->multiply($v)),
-            'x'   => $this->_normalize($c),
-            'y'   => $this->_normalize($d)
-        );
-    }
-
-    /**
-     * Calculates the greatest common divisor
-     *
-     * Say you have 693 and 609.  The GCD is 21.
-     *
-     * Here's an example:
-     * 
-     * extendedGCD($b);
-     *
-     *    echo $gcd->toString() . "\r\n"; // outputs 21
-     * ?>
-     * 
-     *
-     * @param \phpseclib\Math\BigInteger $n
-     * @return \phpseclib\Math\BigInteger
-     * @access public
-     */
-    function gcd($n)
-    {
-        extract($this->extendedGCD($n));
-        return $gcd;
-    }
-
-    /**
-     * Absolute value.
-     *
-     * @return \phpseclib\Math\BigInteger
-     * @access public
-     */
-    function abs()
-    {
-        $temp = new static();
-
-        switch (MATH_BIGINTEGER_MODE) {
-            case self::MODE_GMP:
-                $temp->value = gmp_abs($this->value);
-                break;
-            case self::MODE_BCMATH:
-                $temp->value = (bccomp($this->value, '0', 0) < 0) ? substr($this->value, 1) : $this->value;
-                break;
-            default:
-                $temp->value = $this->value;
-        }
-
-        return $temp;
-    }
-
-    /**
-     * Compares two numbers.
-     *
-     * Although one might think !$x->compare($y) means $x != $y, it, in fact, means the opposite.  The reason for this is
-     * demonstrated thusly:
-     *
-     * $x  > $y: $x->compare($y)  > 0
-     * $x  < $y: $x->compare($y)  < 0
-     * $x == $y: $x->compare($y) == 0
-     *
-     * Note how the same comparison operator is used.  If you want to test for equality, use $x->equals($y).
-     *
-     * @param \phpseclib\Math\BigInteger $y
-     * @return int < 0 if $this is less than $y; > 0 if $this is greater than $y, and 0 if they are equal.
-     * @access public
-     * @see self::equals()
-     * @internal Could return $this->subtract($x), but that's not as fast as what we do do.
-     */
-    function compare($y)
-    {
-        switch (MATH_BIGINTEGER_MODE) {
-            case self::MODE_GMP:
-                return gmp_cmp($this->value, $y->value);
-            case self::MODE_BCMATH:
-                return bccomp($this->value, $y->value, 0);
-        }
-
-        return $this->_compare($this->value, $this->is_negative, $y->value, $y->is_negative);
-    }
-
-    /**
-     * Compares two numbers.
-     *
-     * @param array $x_value
-     * @param bool $x_negative
-     * @param array $y_value
-     * @param bool $y_negative
-     * @return int
-     * @see self::compare()
-     * @access private
-     */
-    function _compare($x_value, $x_negative, $y_value, $y_negative)
-    {
-        if ($x_negative != $y_negative) {
-            return (!$x_negative && $y_negative) ? 1 : -1;
-        }
-
-        $result = $x_negative ? -1 : 1;
-
-        if (count($x_value) != count($y_value)) {
-            return (count($x_value) > count($y_value)) ? $result : -$result;
-        }
-        $size = max(count($x_value), count($y_value));
-
-        $x_value = array_pad($x_value, $size, 0);
-        $y_value = array_pad($y_value, $size, 0);
-
-        for ($i = count($x_value) - 1; $i >= 0; --$i) {
-            if ($x_value[$i] != $y_value[$i]) {
-                return ($x_value[$i] > $y_value[$i]) ? $result : -$result;
-            }
-        }
-
-        return 0;
-    }
-
-    /**
-     * Tests the equality of two numbers.
-     *
-     * If you need to see if one number is greater than or less than another number, use BigInteger::compare()
-     *
-     * @param \phpseclib\Math\BigInteger $x
-     * @return bool
-     * @access public
-     * @see self::compare()
-     */
-    function equals($x)
-    {
-        switch (MATH_BIGINTEGER_MODE) {
-            case self::MODE_GMP:
-                return gmp_cmp($this->value, $x->value) == 0;
-            default:
-                return $this->value === $x->value && $this->is_negative == $x->is_negative;
-        }
-    }
-
-    /**
-     * Set Precision
-     *
-     * Some bitwise operations give different results depending on the precision being used.  Examples include left
-     * shift, not, and rotates.
-     *
-     * @param int $bits
-     * @access public
-     */
-    function setPrecision($bits)
-    {
-        $this->precision = $bits;
-        if (MATH_BIGINTEGER_MODE != self::MODE_BCMATH) {
-            $this->bitmask = new static(chr((1 << ($bits & 0x7)) - 1) . str_repeat(chr(0xFF), $bits >> 3), 256);
-        } else {
-            $this->bitmask = new static(bcpow('2', $bits, 0));
-        }
-
-        $temp = $this->_normalize($this);
-        $this->value = $temp->value;
-    }
-
-    /**
-     * Logical And
-     *
-     * @param \phpseclib\Math\BigInteger $x
-     * @access public
-     * @internal Implemented per a request by Lluis Pamies i Juarez 
-     * @return \phpseclib\Math\BigInteger
-     */
-    function bitwise_and($x)
-    {
-        switch (MATH_BIGINTEGER_MODE) {
-            case self::MODE_GMP:
-                $temp = new static();
-                $temp->value = gmp_and($this->value, $x->value);
-
-                return $this->_normalize($temp);
-            case self::MODE_BCMATH:
-                $left = $this->toBytes();
-                $right = $x->toBytes();
-
-                $length = max(strlen($left), strlen($right));
-
-                $left = str_pad($left, $length, chr(0), STR_PAD_LEFT);
-                $right = str_pad($right, $length, chr(0), STR_PAD_LEFT);
-
-                return $this->_normalize(new static($left & $right, 256));
-        }
-
-        $result = $this->copy();
-
-        $length = min(count($x->value), count($this->value));
-
-        $result->value = array_slice($result->value, 0, $length);
-
-        for ($i = 0; $i < $length; ++$i) {
-            $result->value[$i]&= $x->value[$i];
-        }
-
-        return $this->_normalize($result);
-    }
-
-    /**
-     * Logical Or
-     *
-     * @param \phpseclib\Math\BigInteger $x
-     * @access public
-     * @internal Implemented per a request by Lluis Pamies i Juarez 
-     * @return \phpseclib\Math\BigInteger
-     */
-    function bitwise_or($x)
-    {
-        switch (MATH_BIGINTEGER_MODE) {
-            case self::MODE_GMP:
-                $temp = new static();
-                $temp->value = gmp_or($this->value, $x->value);
-
-                return $this->_normalize($temp);
-            case self::MODE_BCMATH:
-                $left = $this->toBytes();
-                $right = $x->toBytes();
-
-                $length = max(strlen($left), strlen($right));
-
-                $left = str_pad($left, $length, chr(0), STR_PAD_LEFT);
-                $right = str_pad($right, $length, chr(0), STR_PAD_LEFT);
-
-                return $this->_normalize(new static($left | $right, 256));
-        }
-
-        $length = max(count($this->value), count($x->value));
-        $result = $this->copy();
-        $result->value = array_pad($result->value, $length, 0);
-        $x->value = array_pad($x->value, $length, 0);
-
-        for ($i = 0; $i < $length; ++$i) {
-            $result->value[$i]|= $x->value[$i];
-        }
-
-        return $this->_normalize($result);
-    }
-
-    /**
-     * Logical Exclusive-Or
-     *
-     * @param \phpseclib\Math\BigInteger $x
-     * @access public
-     * @internal Implemented per a request by Lluis Pamies i Juarez 
-     * @return \phpseclib\Math\BigInteger
-     */
-    function bitwise_xor($x)
-    {
-        switch (MATH_BIGINTEGER_MODE) {
-            case self::MODE_GMP:
-                $temp = new static();
-                $temp->value = gmp_xor($this->value, $x->value);
-
-                return $this->_normalize($temp);
-            case self::MODE_BCMATH:
-                $left = $this->toBytes();
-                $right = $x->toBytes();
-
-                $length = max(strlen($left), strlen($right));
-
-                $left = str_pad($left, $length, chr(0), STR_PAD_LEFT);
-                $right = str_pad($right, $length, chr(0), STR_PAD_LEFT);
-
-                return $this->_normalize(new static($left ^ $right, 256));
-        }
-
-        $length = max(count($this->value), count($x->value));
-        $result = $this->copy();
-        $result->value = array_pad($result->value, $length, 0);
-        $x->value = array_pad($x->value, $length, 0);
-
-        for ($i = 0; $i < $length; ++$i) {
-            $result->value[$i]^= $x->value[$i];
-        }
-
-        return $this->_normalize($result);
-    }
-
-    /**
-     * Logical Not
-     *
-     * @access public
-     * @internal Implemented per a request by Lluis Pamies i Juarez 
-     * @return \phpseclib\Math\BigInteger
-     */
-    function bitwise_not()
-    {
-        // calculuate "not" without regard to $this->precision
-        // (will always result in a smaller number.  ie. ~1 isn't 1111 1110 - it's 0)
-        $temp = $this->toBytes();
-        if ($temp == '') {
-            return '';
-        }
-        $pre_msb = decbin(ord($temp[0]));
-        $temp = ~$temp;
-        $msb = decbin(ord($temp[0]));
-        if (strlen($msb) == 8) {
-            $msb = substr($msb, strpos($msb, '0'));
-        }
-        $temp[0] = chr(bindec($msb));
-
-        // see if we need to add extra leading 1's
-        $current_bits = strlen($pre_msb) + 8 * strlen($temp) - 8;
-        $new_bits = $this->precision - $current_bits;
-        if ($new_bits <= 0) {
-            return $this->_normalize(new static($temp, 256));
-        }
-
-        // generate as many leading 1's as we need to.
-        $leading_ones = chr((1 << ($new_bits & 0x7)) - 1) . str_repeat(chr(0xFF), $new_bits >> 3);
-        $this->_base256_lshift($leading_ones, $current_bits);
-
-        $temp = str_pad($temp, strlen($leading_ones), chr(0), STR_PAD_LEFT);
-
-        return $this->_normalize(new static($leading_ones | $temp, 256));
-    }
-
-    /**
-     * Logical Right Shift
-     *
-     * Shifts BigInteger's by $shift bits, effectively dividing by 2**$shift.
-     *
-     * @param int $shift
-     * @return \phpseclib\Math\BigInteger
-     * @access public
-     * @internal The only version that yields any speed increases is the internal version.
-     */
-    function bitwise_rightShift($shift)
-    {
-        $temp = new static();
-
-        switch (MATH_BIGINTEGER_MODE) {
-            case self::MODE_GMP:
-                static $two;
-
-                if (!isset($two)) {
-                    $two = gmp_init('2');
-                }
-
-                $temp->value = gmp_div_q($this->value, gmp_pow($two, $shift));
-
-                break;
-            case self::MODE_BCMATH:
-                $temp->value = bcdiv($this->value, bcpow('2', $shift, 0), 0);
-
-                break;
-            default: // could just replace _lshift with this, but then all _lshift() calls would need to be rewritten
-                     // and I don't want to do that...
-                $temp->value = $this->value;
-                $temp->_rshift($shift);
-        }
-
-        return $this->_normalize($temp);
-    }
-
-    /**
-     * Logical Left Shift
-     *
-     * Shifts BigInteger's by $shift bits, effectively multiplying by 2**$shift.
-     *
-     * @param int $shift
-     * @return \phpseclib\Math\BigInteger
-     * @access public
-     * @internal The only version that yields any speed increases is the internal version.
-     */
-    function bitwise_leftShift($shift)
-    {
-        $temp = new static();
-
-        switch (MATH_BIGINTEGER_MODE) {
-            case self::MODE_GMP:
-                static $two;
-
-                if (!isset($two)) {
-                    $two = gmp_init('2');
-                }
-
-                $temp->value = gmp_mul($this->value, gmp_pow($two, $shift));
-
-                break;
-            case self::MODE_BCMATH:
-                $temp->value = bcmul($this->value, bcpow('2', $shift, 0), 0);
-
-                break;
-            default: // could just replace _rshift with this, but then all _lshift() calls would need to be rewritten
-                     // and I don't want to do that...
-                $temp->value = $this->value;
-                $temp->_lshift($shift);
-        }
-
-        return $this->_normalize($temp);
-    }
-
-    /**
-     * Logical Left Rotate
-     *
-     * Instead of the top x bits being dropped they're appended to the shifted bit string.
-     *
-     * @param int $shift
-     * @return \phpseclib\Math\BigInteger
-     * @access public
-     */
-    function bitwise_leftRotate($shift)
-    {
-        $bits = $this->toBytes();
-
-        if ($this->precision > 0) {
-            $precision = $this->precision;
-            if (MATH_BIGINTEGER_MODE == self::MODE_BCMATH) {
-                $mask = $this->bitmask->subtract(new static(1));
-                $mask = $mask->toBytes();
-            } else {
-                $mask = $this->bitmask->toBytes();
-            }
-        } else {
-            $temp = ord($bits[0]);
-            for ($i = 0; $temp >> $i; ++$i) {
-            }
-            $precision = 8 * strlen($bits) - 8 + $i;
-            $mask = chr((1 << ($precision & 0x7)) - 1) . str_repeat(chr(0xFF), $precision >> 3);
-        }
-
-        if ($shift < 0) {
-            $shift+= $precision;
-        }
-        $shift%= $precision;
-
-        if (!$shift) {
-            return $this->copy();
-        }
-
-        $left = $this->bitwise_leftShift($shift);
-        $left = $left->bitwise_and(new static($mask, 256));
-        $right = $this->bitwise_rightShift($precision - $shift);
-        $result = MATH_BIGINTEGER_MODE != self::MODE_BCMATH ? $left->bitwise_or($right) : $left->add($right);
-        return $this->_normalize($result);
-    }
-
-    /**
-     * Logical Right Rotate
-     *
-     * Instead of the bottom x bits being dropped they're prepended to the shifted bit string.
-     *
-     * @param int $shift
-     * @return \phpseclib\Math\BigInteger
-     * @access public
-     */
-    function bitwise_rightRotate($shift)
-    {
-        return $this->bitwise_leftRotate(-$shift);
-    }
-
-    /**
-     * Generates a random BigInteger
-     *
-     * Byte length is equal to $length. Uses \phpseclib\Crypt\Random if it's loaded and mt_rand if it's not.
-     *
-     * @param int $length
-     * @return \phpseclib\Math\BigInteger
-     * @access private
-     */
-    function _random_number_helper($size)
-    {
-        if (class_exists('\phpseclib\Crypt\Random')) {
-            $random = Random::string($size);
-        } else {
-            $random = '';
-
-            if ($size & 1) {
-                $random.= chr(mt_rand(0, 255));
-            }
-
-            $blocks = $size >> 1;
-            for ($i = 0; $i < $blocks; ++$i) {
-                // mt_rand(-2147483648, 0x7FFFFFFF) always produces -2147483648 on some systems
-                $random.= pack('n', mt_rand(0, 0xFFFF));
-            }
-        }
-
-        return new static($random, 256);
-    }
-
-    /**
-     * Generate a random number
-     *
-     * Returns a random number between $min and $max where $min and $max
-     * can be defined using one of the two methods:
-     *
-     * $min->random($max)
-     * $max->random($min)
-     *
-     * @param \phpseclib\Math\BigInteger $arg1
-     * @param \phpseclib\Math\BigInteger $arg2
-     * @return \phpseclib\Math\BigInteger
-     * @access public
-     * @internal The API for creating random numbers used to be $a->random($min, $max), where $a was a BigInteger object.
-     *           That method is still supported for BC purposes.
-     */
-    function random($arg1, $arg2 = false)
-    {
-        if ($arg1 === false) {
-            return false;
-        }
-
-        if ($arg2 === false) {
-            $max = $arg1;
-            $min = $this;
-        } else {
-            $min = $arg1;
-            $max = $arg2;
-        }
-
-        $compare = $max->compare($min);
-
-        if (!$compare) {
-            return $this->_normalize($min);
-        } elseif ($compare < 0) {
-            // if $min is bigger then $max, swap $min and $max
-            $temp = $max;
-            $max = $min;
-            $min = $temp;
-        }
-
-        static $one;
-        if (!isset($one)) {
-            $one = new static(1);
-        }
-
-        $max = $max->subtract($min->subtract($one));
-        $size = strlen(ltrim($max->toBytes(), chr(0)));
-
-        /*
-            doing $random % $max doesn't work because some numbers will be more likely to occur than others.
-            eg. if $max is 140 and $random's max is 255 then that'd mean both $random = 5 and $random = 145
-            would produce 5 whereas the only value of random that could produce 139 would be 139. ie.
-            not all numbers would be equally likely. some would be more likely than others.
-
-            creating a whole new random number until you find one that is within the range doesn't work
-            because, for sufficiently small ranges, the likelihood that you'd get a number within that range
-            would be pretty small. eg. with $random's max being 255 and if your $max being 1 the probability
-            would be pretty high that $random would be greater than $max.
-
-            phpseclib works around this using the technique described here:
-
-            http://crypto.stackexchange.com/questions/5708/creating-a-small-number-from-a-cryptographically-secure-random-string
-        */
-        $random_max = new static(chr(1) . str_repeat("\0", $size), 256);
-        $random = $this->_random_number_helper($size);
-
-        list($max_multiple) = $random_max->divide($max);
-        $max_multiple = $max_multiple->multiply($max);
-
-        while ($random->compare($max_multiple) >= 0) {
-            $random = $random->subtract($max_multiple);
-            $random_max = $random_max->subtract($max_multiple);
-            $random = $random->bitwise_leftShift(8);
-            $random = $random->add($this->_random_number_helper(1));
-            $random_max = $random_max->bitwise_leftShift(8);
-            list($max_multiple) = $random_max->divide($max);
-            $max_multiple = $max_multiple->multiply($max);
-        }
-        list(, $random) = $random->divide($max);
-
-        return $this->_normalize($random->add($min));
-    }
-
-    /**
-     * Generate a random prime number.
-     *
-     * If there's not a prime within the given range, false will be returned.
-     * If more than $timeout seconds have elapsed, give up and return false.
-     *
-     * @param \phpseclib\Math\BigInteger $arg1
-     * @param \phpseclib\Math\BigInteger $arg2
-     * @param int $timeout
-     * @return Math_BigInteger|false
-     * @access public
-     * @internal See {@link http://www.cacr.math.uwaterloo.ca/hac/about/chap4.pdf#page=15 HAC 4.44}.
-     */
-    function randomPrime($arg1, $arg2 = false, $timeout = false)
-    {
-        if ($arg1 === false) {
-            return false;
-        }
-
-        if ($arg2 === false) {
-            $max = $arg1;
-            $min = $this;
-        } else {
-            $min = $arg1;
-            $max = $arg2;
-        }
-
-        $compare = $max->compare($min);
-
-        if (!$compare) {
-            return $min->isPrime() ? $min : false;
-        } elseif ($compare < 0) {
-            // if $min is bigger then $max, swap $min and $max
-            $temp = $max;
-            $max = $min;
-            $min = $temp;
-        }
-
-        static $one, $two;
-        if (!isset($one)) {
-            $one = new static(1);
-            $two = new static(2);
-        }
-
-        $start = time();
-
-        $x = $this->random($min, $max);
-
-        // gmp_nextprime() requires PHP 5 >= 5.2.0 per .
-        if (MATH_BIGINTEGER_MODE == self::MODE_GMP && extension_loaded('gmp')) {
-            $p = new static();
-            $p->value = gmp_nextprime($x->value);
-
-            if ($p->compare($max) <= 0) {
-                return $p;
-            }
-
-            if (!$min->equals($x)) {
-                $x = $x->subtract($one);
-            }
-
-            return $x->randomPrime($min, $x);
-        }
-
-        if ($x->equals($two)) {
-            return $x;
-        }
-
-        $x->_make_odd();
-        if ($x->compare($max) > 0) {
-            // if $x > $max then $max is even and if $min == $max then no prime number exists between the specified range
-            if ($min->equals($max)) {
-                return false;
-            }
-            $x = $min->copy();
-            $x->_make_odd();
-        }
-
-        $initial_x = $x->copy();
-
-        while (true) {
-            if ($timeout !== false && time() - $start > $timeout) {
-                return false;
-            }
-
-            if ($x->isPrime()) {
-                return $x;
-            }
-
-            $x = $x->add($two);
-
-            if ($x->compare($max) > 0) {
-                $x = $min->copy();
-                if ($x->equals($two)) {
-                    return $x;
-                }
-                $x->_make_odd();
-            }
-
-            if ($x->equals($initial_x)) {
-                return false;
-            }
-        }
-    }
-
-    /**
-     * Make the current number odd
-     *
-     * If the current number is odd it'll be unchanged.  If it's even, one will be added to it.
-     *
-     * @see self::randomPrime()
-     * @access private
-     */
-    function _make_odd()
-    {
-        switch (MATH_BIGINTEGER_MODE) {
-            case self::MODE_GMP:
-                gmp_setbit($this->value, 0);
-                break;
-            case self::MODE_BCMATH:
-                if ($this->value[strlen($this->value) - 1] % 2 == 0) {
-                    $this->value = bcadd($this->value, '1');
-                }
-                break;
-            default:
-                $this->value[0] |= 1;
-        }
-    }
-
-    /**
-     * Checks a numer to see if it's prime
-     *
-     * Assuming the $t parameter is not set, this function has an error rate of 2**-80.  The main motivation for the
-     * $t parameter is distributability.  BigInteger::randomPrime() can be distributed across multiple pageloads
-     * on a website instead of just one.
-     *
-     * @param \phpseclib\Math\BigInteger $t
-     * @return bool
-     * @access public
-     * @internal Uses the
-     *     {@link http://en.wikipedia.org/wiki/Miller%E2%80%93Rabin_primality_test Miller-Rabin primality test}.  See
-     *     {@link http://www.cacr.math.uwaterloo.ca/hac/about/chap4.pdf#page=8 HAC 4.24}.
-     */
-    function isPrime($t = false)
-    {
-        $length = strlen($this->toBytes());
-
-        if (!$t) {
-            // see HAC 4.49 "Note (controlling the error probability)"
-            // @codingStandardsIgnoreStart
-                 if ($length >= 163) { $t =  2; } // floor(1300 / 8)
-            else if ($length >= 106) { $t =  3; } // floor( 850 / 8)
-            else if ($length >= 81 ) { $t =  4; } // floor( 650 / 8)
-            else if ($length >= 68 ) { $t =  5; } // floor( 550 / 8)
-            else if ($length >= 56 ) { $t =  6; } // floor( 450 / 8)
-            else if ($length >= 50 ) { $t =  7; } // floor( 400 / 8)
-            else if ($length >= 43 ) { $t =  8; } // floor( 350 / 8)
-            else if ($length >= 37 ) { $t =  9; } // floor( 300 / 8)
-            else if ($length >= 31 ) { $t = 12; } // floor( 250 / 8)
-            else if ($length >= 25 ) { $t = 15; } // floor( 200 / 8)
-            else if ($length >= 18 ) { $t = 18; } // floor( 150 / 8)
-            else                     { $t = 27; }
-            // @codingStandardsIgnoreEnd
-        }
-
-        // ie. gmp_testbit($this, 0)
-        // ie. isEven() or !isOdd()
-        switch (MATH_BIGINTEGER_MODE) {
-            case self::MODE_GMP:
-                return gmp_prob_prime($this->value, $t) != 0;
-            case self::MODE_BCMATH:
-                if ($this->value === '2') {
-                    return true;
-                }
-                if ($this->value[strlen($this->value) - 1] % 2 == 0) {
-                    return false;
-                }
-                break;
-            default:
-                if ($this->value == array(2)) {
-                    return true;
-                }
-                if (~$this->value[0] & 1) {
-                    return false;
-                }
-        }
-
-        static $primes, $zero, $one, $two;
-
-        if (!isset($primes)) {
-            $primes = array(
-                3,    5,    7,    11,   13,   17,   19,   23,   29,   31,   37,   41,   43,   47,   53,   59,
-                61,   67,   71,   73,   79,   83,   89,   97,   101,  103,  107,  109,  113,  127,  131,  137,
-                139,  149,  151,  157,  163,  167,  173,  179,  181,  191,  193,  197,  199,  211,  223,  227,
-                229,  233,  239,  241,  251,  257,  263,  269,  271,  277,  281,  283,  293,  307,  311,  313,
-                317,  331,  337,  347,  349,  353,  359,  367,  373,  379,  383,  389,  397,  401,  409,  419,
-                421,  431,  433,  439,  443,  449,  457,  461,  463,  467,  479,  487,  491,  499,  503,  509,
-                521,  523,  541,  547,  557,  563,  569,  571,  577,  587,  593,  599,  601,  607,  613,  617,
-                619,  631,  641,  643,  647,  653,  659,  661,  673,  677,  683,  691,  701,  709,  719,  727,
-                733,  739,  743,  751,  757,  761,  769,  773,  787,  797,  809,  811,  821,  823,  827,  829,
-                839,  853,  857,  859,  863,  877,  881,  883,  887,  907,  911,  919,  929,  937,  941,  947,
-                953,  967,  971,  977,  983,  991,  997
-            );
-
-            if (MATH_BIGINTEGER_MODE != self::MODE_INTERNAL) {
-                for ($i = 0; $i < count($primes); ++$i) {
-                    $primes[$i] = new static($primes[$i]);
-                }
-            }
-
-            $zero = new static();
-            $one = new static(1);
-            $two = new static(2);
-        }
-
-        if ($this->equals($one)) {
-            return false;
-        }
-
-        // see HAC 4.4.1 "Random search for probable primes"
-        if (MATH_BIGINTEGER_MODE != self::MODE_INTERNAL) {
-            foreach ($primes as $prime) {
-                list(, $r) = $this->divide($prime);
-                if ($r->equals($zero)) {
-                    return $this->equals($prime);
-                }
-            }
-        } else {
-            $value = $this->value;
-            foreach ($primes as $prime) {
-                list(, $r) = $this->_divide_digit($value, $prime);
-                if (!$r) {
-                    return count($value) == 1 && $value[0] == $prime;
-                }
-            }
-        }
-
-        $n   = $this->copy();
-        $n_1 = $n->subtract($one);
-        $n_2 = $n->subtract($two);
-
-        $r = $n_1->copy();
-        $r_value = $r->value;
-        // ie. $s = gmp_scan1($n, 0) and $r = gmp_div_q($n, gmp_pow(gmp_init('2'), $s));
-        if (MATH_BIGINTEGER_MODE == self::MODE_BCMATH) {
-            $s = 0;
-            // if $n was 1, $r would be 0 and this would be an infinite loop, hence our $this->equals($one) check earlier
-            while ($r->value[strlen($r->value) - 1] % 2 == 0) {
-                $r->value = bcdiv($r->value, '2', 0);
-                ++$s;
-            }
-        } else {
-            for ($i = 0, $r_length = count($r_value); $i < $r_length; ++$i) {
-                $temp = ~$r_value[$i] & 0xFFFFFF;
-                for ($j = 1; ($temp >> $j) & 1; ++$j) {
-                }
-                if ($j != 25) {
-                    break;
-                }
-            }
-            $s = 26 * $i + $j - 1;
-            $r->_rshift($s);
-        }
-
-        for ($i = 0; $i < $t; ++$i) {
-            $a = $this->random($two, $n_2);
-            $y = $a->modPow($r, $n);
-
-            if (!$y->equals($one) && !$y->equals($n_1)) {
-                for ($j = 1; $j < $s && !$y->equals($n_1); ++$j) {
-                    $y = $y->modPow($two, $n);
-                    if ($y->equals($one)) {
-                        return false;
-                    }
-                }
-
-                if (!$y->equals($n_1)) {
-                    return false;
-                }
-            }
-        }
-        return true;
-    }
-
-    /**
-     * Logical Left Shift
-     *
-     * Shifts BigInteger's by $shift bits.
-     *
-     * @param int $shift
-     * @access private
-     */
-    function _lshift($shift)
-    {
-        if ($shift == 0) {
-            return;
-        }
-
-        $num_digits = (int) ($shift / self::$base);
-        $shift %= self::$base;
-        $shift = 1 << $shift;
-
-        $carry = 0;
-
-        for ($i = 0; $i < count($this->value); ++$i) {
-            $temp = $this->value[$i] * $shift + $carry;
-            $carry = self::$base === 26 ? intval($temp / 0x4000000) : ($temp >> 31);
-            $this->value[$i] = (int) ($temp - $carry * self::$baseFull);
-        }
-
-        if ($carry) {
-            $this->value[count($this->value)] = $carry;
-        }
-
-        while ($num_digits--) {
-            array_unshift($this->value, 0);
-        }
-    }
-
-    /**
-     * Logical Right Shift
-     *
-     * Shifts BigInteger's by $shift bits.
-     *
-     * @param int $shift
-     * @access private
-     */
-    function _rshift($shift)
-    {
-        if ($shift == 0) {
-            return;
-        }
-
-        $num_digits = (int) ($shift / self::$base);
-        $shift %= self::$base;
-        $carry_shift = self::$base - $shift;
-        $carry_mask = (1 << $shift) - 1;
-
-        if ($num_digits) {
-            $this->value = array_slice($this->value, $num_digits);
-        }
-
-        $carry = 0;
-
-        for ($i = count($this->value) - 1; $i >= 0; --$i) {
-            $temp = $this->value[$i] >> $shift | $carry;
-            $carry = ($this->value[$i] & $carry_mask) << $carry_shift;
-            $this->value[$i] = $temp;
-        }
-
-        $this->value = $this->_trim($this->value);
-    }
-
-    /**
-     * Normalize
-     *
-     * Removes leading zeros and truncates (if necessary) to maintain the appropriate precision
-     *
-     * @param \phpseclib\Math\BigInteger
-     * @return \phpseclib\Math\BigInteger
-     * @see self::_trim()
-     * @access private
-     */
-    function _normalize($result)
-    {
-        $result->precision = $this->precision;
-        $result->bitmask = $this->bitmask;
-
-        switch (MATH_BIGINTEGER_MODE) {
-            case self::MODE_GMP:
-                if ($this->bitmask !== false) {
-                    $result->value = gmp_and($result->value, $result->bitmask->value);
-                }
-
-                return $result;
-            case self::MODE_BCMATH:
-                if (!empty($result->bitmask->value)) {
-                    $result->value = bcmod($result->value, $result->bitmask->value);
-                }
-
-                return $result;
-        }
-
-        $value = &$result->value;
-
-        if (!count($value)) {
-            return $result;
-        }
-
-        $value = $this->_trim($value);
-
-        if (!empty($result->bitmask->value)) {
-            $length = min(count($value), count($this->bitmask->value));
-            $value = array_slice($value, 0, $length);
-
-            for ($i = 0; $i < $length; ++$i) {
-                $value[$i] = $value[$i] & $this->bitmask->value[$i];
-            }
-        }
-
-        return $result;
-    }
-
-    /**
-     * Trim
-     *
-     * Removes leading zeros
-     *
-     * @param array $value
-     * @return \phpseclib\Math\BigInteger
-     * @access private
-     */
-    function _trim($value)
-    {
-        for ($i = count($value) - 1; $i >= 0; --$i) {
-            if ($value[$i]) {
-                break;
-            }
-            unset($value[$i]);
-        }
-
-        return $value;
-    }
-
-    /**
-     * Array Repeat
-     *
-     * @param $input Array
-     * @param $multiplier mixed
-     * @return array
-     * @access private
-     */
-    function _array_repeat($input, $multiplier)
-    {
-        return ($multiplier) ? array_fill(0, $multiplier, $input) : array();
-    }
-
-    /**
-     * Logical Left Shift
-     *
-     * Shifts binary strings $shift bits, essentially multiplying by 2**$shift.
-     *
-     * @param $x String
-     * @param $shift Integer
-     * @return string
-     * @access private
-     */
-    function _base256_lshift(&$x, $shift)
-    {
-        if ($shift == 0) {
-            return;
-        }
-
-        $num_bytes = $shift >> 3; // eg. floor($shift/8)
-        $shift &= 7; // eg. $shift % 8
-
-        $carry = 0;
-        for ($i = strlen($x) - 1; $i >= 0; --$i) {
-            $temp = ord($x[$i]) << $shift | $carry;
-            $x[$i] = chr($temp);
-            $carry = $temp >> 8;
-        }
-        $carry = ($carry != 0) ? chr($carry) : '';
-        $x = $carry . $x . str_repeat(chr(0), $num_bytes);
-    }
-
-    /**
-     * Logical Right Shift
-     *
-     * Shifts binary strings $shift bits, essentially dividing by 2**$shift and returning the remainder.
-     *
-     * @param $x String
-     * @param $shift Integer
-     * @return string
-     * @access private
-     */
-    function _base256_rshift(&$x, $shift)
-    {
-        if ($shift == 0) {
-            $x = ltrim($x, chr(0));
-            return '';
-        }
-
-        $num_bytes = $shift >> 3; // eg. floor($shift/8)
-        $shift &= 7; // eg. $shift % 8
-
-        $remainder = '';
-        if ($num_bytes) {
-            $start = $num_bytes > strlen($x) ? -strlen($x) : -$num_bytes;
-            $remainder = substr($x, $start);
-            $x = substr($x, 0, -$num_bytes);
-        }
-
-        $carry = 0;
-        $carry_shift = 8 - $shift;
-        for ($i = 0; $i < strlen($x); ++$i) {
-            $temp = (ord($x[$i]) >> $shift) | $carry;
-            $carry = (ord($x[$i]) << $carry_shift) & 0xFF;
-            $x[$i] = chr($temp);
-        }
-        $x = ltrim($x, chr(0));
-
-        $remainder = chr($carry >> $carry_shift) . $remainder;
-
-        return ltrim($remainder, chr(0));
-    }
-
-    // one quirk about how the following functions are implemented is that PHP defines N to be an unsigned long
-    // at 32-bits, while java's longs are 64-bits.
-
-    /**
-     * Converts 32-bit integers to bytes.
-     *
-     * @param int $x
-     * @return string
-     * @access private
-     */
-    function _int2bytes($x)
-    {
-        return ltrim(pack('N', $x), chr(0));
-    }
-
-    /**
-     * Converts bytes to 32-bit integers
-     *
-     * @param string $x
-     * @return int
-     * @access private
-     */
-    function _bytes2int($x)
-    {
-        $temp = unpack('Nint', str_pad($x, 4, chr(0), STR_PAD_LEFT));
-        return $temp['int'];
-    }
-
-    /**
-     * DER-encode an integer
-     *
-     * The ability to DER-encode integers is needed to create RSA public keys for use with OpenSSL
-     *
-     * @see self::modPow()
-     * @access private
-     * @param int $length
-     * @return string
-     */
-    function _encodeASN1Length($length)
-    {
-        if ($length <= 0x7F) {
-            return chr($length);
-        }
-
-        $temp = ltrim(pack('N', $length), chr(0));
-        return pack('Ca*', 0x80 | strlen($temp), $temp);
-    }
-
-    /**
-     * Single digit division
-     *
-     * Even if int64 is being used the division operator will return a float64 value
-     * if the dividend is not evenly divisible by the divisor. Since a float64 doesn't
-     * have the precision of int64 this is a problem so, when int64 is being used,
-     * we'll guarantee that the dividend is divisible by first subtracting the remainder.
-     *
-     * @access private
-     * @param int $x
-     * @param int $y
-     * @return int
-     */
-    function _safe_divide($x, $y)
-    {
-        if (self::$base === 26) {
-            return (int) ($x / $y);
-        }
-
-        // self::$base === 31
-        return ($x - ($x % $y)) / $y;
-    }
-}
diff --git a/mayor-orig/www/include/share/googleapi/phpseclib/phpseclib/phpseclib/Net/SCP.php b/mayor-orig/www/include/share/googleapi/phpseclib/phpseclib/phpseclib/Net/SCP.php
deleted file mode 100644
index f95bce6d..00000000
--- a/mayor-orig/www/include/share/googleapi/phpseclib/phpseclib/phpseclib/Net/SCP.php
+++ /dev/null
@@ -1,337 +0,0 @@
-
- * login('username', 'password')) {
- *        exit('bad login');
- *    }
- *    $scp = new \phpseclib\Net\SCP($ssh);
- *
- *    $scp->put('abcd', str_repeat('x', 1024*1024));
- * ?>
- * 
- *
- * @category  Net
- * @package   SCP
- * @author    Jim Wigginton 
- * @copyright 2010 Jim Wigginton
- * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
- * @link      http://phpseclib.sourceforge.net
- */
-
-namespace phpseclib\Net;
-
-/**
- * Pure-PHP implementations of SCP.
- *
- * @package SCP
- * @author  Jim Wigginton 
- * @access  public
- */
-class SCP
-{
-    /**#@+
-     * @access public
-     * @see \phpseclib\Net\SCP::put()
-     */
-    /**
-     * Reads data from a local file.
-     */
-    const SOURCE_LOCAL_FILE = 1;
-    /**
-     * Reads data from a string.
-     */
-    const SOURCE_STRING = 2;
-    /**#@-*/
-
-    /**#@+
-     * @access private
-     * @see \phpseclib\Net\SCP::_send()
-     * @see \phpseclib\Net\SCP::_receive()
-    */
-    /**
-     * SSH1 is being used.
-     */
-    const MODE_SSH1 = 1;
-    /**
-     * SSH2 is being used.
-     */
-    const MODE_SSH2 =  2;
-    /**#@-*/
-
-    /**
-     * SSH Object
-     *
-     * @var object
-     * @access private
-     */
-    var $ssh;
-
-    /**
-     * Packet Size
-     *
-     * @var int
-     * @access private
-     */
-    var $packet_size;
-
-    /**
-     * Mode
-     *
-     * @var int
-     * @access private
-     */
-    var $mode;
-
-    /**
-     * Default Constructor.
-     *
-     * Connects to an SSH server
-     *
-     * @param \phpseclib\Net\SSH1|\phpseclib\Net\SSH2 $ssh
-     * @return \phpseclib\Net\SCP
-     * @access public
-     */
-    function __construct($ssh)
-    {
-        if ($ssh instanceof SSH2) {
-            $this->mode = self::MODE_SSH2;
-        } elseif ($ssh instanceof SSH1) {
-            $this->packet_size = 50000;
-            $this->mode = self::MODE_SSH1;
-        } else {
-            return;
-        }
-
-        $this->ssh = $ssh;
-    }
-
-    /**
-     * Uploads a file to the SCP server.
-     *
-     * By default, \phpseclib\Net\SCP::put() does not read from the local filesystem.  $data is dumped directly into $remote_file.
-     * So, for example, if you set $data to 'filename.ext' and then do \phpseclib\Net\SCP::get(), you will get a file, twelve bytes
-     * long, containing 'filename.ext' as its contents.
-     *
-     * Setting $mode to self::SOURCE_LOCAL_FILE will change the above behavior.  With self::SOURCE_LOCAL_FILE, $remote_file will
-     * contain as many bytes as filename.ext does on your local filesystem.  If your filename.ext is 1MB then that is how
-     * large $remote_file will be, as well.
-     *
-     * Currently, only binary mode is supported.  As such, if the line endings need to be adjusted, you will need to take
-     * care of that, yourself.
-     *
-     * @param string $remote_file
-     * @param string $data
-     * @param int $mode
-     * @param callable $callback
-     * @return bool
-     * @access public
-     */
-    function put($remote_file, $data, $mode = self::SOURCE_STRING, $callback = null)
-    {
-        if (!isset($this->ssh)) {
-            return false;
-        }
-
-        if (!$this->ssh->exec('scp -t ' . escapeshellarg($remote_file), false)) { // -t = to
-            return false;
-        }
-
-        $temp = $this->_receive();
-        if ($temp !== chr(0)) {
-            return false;
-        }
-
-        if ($this->mode == self::MODE_SSH2) {
-            $this->packet_size = $this->ssh->packet_size_client_to_server[SSH2::CHANNEL_EXEC] - 4;
-        }
-
-        $remote_file = basename($remote_file);
-
-        if ($mode == self::SOURCE_STRING) {
-            $size = strlen($data);
-        } else {
-            if (!is_file($data)) {
-                user_error("$data is not a valid file", E_USER_NOTICE);
-                return false;
-            }
-
-            $fp = @fopen($data, 'rb');
-            if (!$fp) {
-                return false;
-            }
-            $size = filesize($data);
-        }
-
-        $this->_send('C0644 ' . $size . ' ' . $remote_file . "\n");
-
-        $temp = $this->_receive();
-        if ($temp !== chr(0)) {
-            return false;
-        }
-
-        $sent = 0;
-        while ($sent < $size) {
-            $temp = $mode & self::SOURCE_STRING ? substr($data, $sent, $this->packet_size) : fread($fp, $this->packet_size);
-            $this->_send($temp);
-            $sent+= strlen($temp);
-
-            if (is_callable($callback)) {
-                call_user_func($callback, $sent);
-            }
-        }
-        $this->_close();
-
-        if ($mode != self::SOURCE_STRING) {
-            fclose($fp);
-        }
-
-        return true;
-    }
-
-    /**
-     * Downloads a file from the SCP server.
-     *
-     * Returns a string containing the contents of $remote_file if $local_file is left undefined or a boolean false if
-     * the operation was unsuccessful.  If $local_file is defined, returns true or false depending on the success of the
-     * operation
-     *
-     * @param string $remote_file
-     * @param string $local_file
-     * @return mixed
-     * @access public
-     */
-    function get($remote_file, $local_file = false)
-    {
-        if (!isset($this->ssh)) {
-            return false;
-        }
-
-        if (!$this->ssh->exec('scp -f ' . escapeshellarg($remote_file), false)) { // -f = from
-            return false;
-        }
-
-        $this->_send("\0");
-
-        if (!preg_match('#(?[^ ]+) (?\d+) (?.+)#', rtrim($this->_receive()), $info)) {
-            return false;
-        }
-
-        $this->_send("\0");
-
-        $size = 0;
-
-        if ($local_file !== false) {
-            $fp = @fopen($local_file, 'wb');
-            if (!$fp) {
-                return false;
-            }
-        }
-
-        $content = '';
-        while ($size < $info['size']) {
-            $data = $this->_receive();
-            // SCP usually seems to split stuff out into 16k chunks
-            $size+= strlen($data);
-
-            if ($local_file === false) {
-                $content.= $data;
-            } else {
-                fputs($fp, $data);
-            }
-        }
-
-        $this->_close();
-
-        if ($local_file !== false) {
-            fclose($fp);
-            return true;
-        }
-
-        return $content;
-    }
-
-    /**
-     * Sends a packet to an SSH server
-     *
-     * @param string $data
-     * @access private
-     */
-    function _send($data)
-    {
-        switch ($this->mode) {
-            case self::MODE_SSH2:
-                $this->ssh->_send_channel_packet(SSH2::CHANNEL_EXEC, $data);
-                break;
-            case self::MODE_SSH1:
-                $data = pack('CNa*', NET_SSH1_CMSG_STDIN_DATA, strlen($data), $data);
-                $this->ssh->_send_binary_packet($data);
-        }
-    }
-
-    /**
-     * Receives a packet from an SSH server
-     *
-     * @return string
-     * @access private
-     */
-    function _receive()
-    {
-        switch ($this->mode) {
-            case self::MODE_SSH2:
-                return $this->ssh->_get_channel_packet(SSH2::CHANNEL_EXEC, true);
-            case self::MODE_SSH1:
-                if (!$this->ssh->bitmap) {
-                    return false;
-                }
-                while (true) {
-                    $response = $this->ssh->_get_binary_packet();
-                    switch ($response[SSH1::RESPONSE_TYPE]) {
-                        case NET_SSH1_SMSG_STDOUT_DATA:
-                            if (strlen($response[SSH1::RESPONSE_DATA]) < 4) {
-                                return false;
-                            }
-                            extract(unpack('Nlength', $response[SSH1::RESPONSE_DATA]));
-                            return $this->ssh->_string_shift($response[SSH1::RESPONSE_DATA], $length);
-                        case NET_SSH1_SMSG_STDERR_DATA:
-                            break;
-                        case NET_SSH1_SMSG_EXITSTATUS:
-                            $this->ssh->_send_binary_packet(chr(NET_SSH1_CMSG_EXIT_CONFIRMATION));
-                            fclose($this->ssh->fsock);
-                            $this->ssh->bitmap = 0;
-                            return false;
-                        default:
-                            user_error('Unknown packet received', E_USER_NOTICE);
-                            return false;
-                    }
-                }
-        }
-    }
-
-    /**
-     * Closes the connection to an SSH server
-     *
-     * @access private
-     */
-    function _close()
-    {
-        switch ($this->mode) {
-            case self::MODE_SSH2:
-                $this->ssh->_close_channel(SSH2::CHANNEL_EXEC, true);
-                break;
-            case self::MODE_SSH1:
-                $this->ssh->disconnect();
-        }
-    }
-}
diff --git a/mayor-orig/www/include/share/googleapi/phpseclib/phpseclib/phpseclib/Net/SFTP.php b/mayor-orig/www/include/share/googleapi/phpseclib/phpseclib/phpseclib/Net/SFTP.php
deleted file mode 100644
index 1421ecb4..00000000
--- a/mayor-orig/www/include/share/googleapi/phpseclib/phpseclib/phpseclib/Net/SFTP.php
+++ /dev/null
@@ -1,3063 +0,0 @@
-
- * login('username', 'password')) {
- *        exit('Login Failed');
- *    }
- *
- *    echo $sftp->pwd() . "\r\n";
- *    $sftp->put('filename.ext', 'hello, world!');
- *    print_r($sftp->nlist());
- * ?>
- * 
- *
- * @category  Net
- * @package   SFTP
- * @author    Jim Wigginton 
- * @copyright 2009 Jim Wigginton
- * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
- * @link      http://phpseclib.sourceforge.net
- */
-
-namespace phpseclib\Net;
-
-/**
- * Pure-PHP implementations of SFTP.
- *
- * @package SFTP
- * @author  Jim Wigginton 
- * @access  public
- */
-class SFTP extends SSH2
-{
-    /**
-     * SFTP channel constant
-     *
-     * \phpseclib\Net\SSH2::exec() uses 0 and \phpseclib\Net\SSH2::read() / \phpseclib\Net\SSH2::write() use 1.
-     *
-     * @see \phpseclib\Net\SSH2::_send_channel_packet()
-     * @see \phpseclib\Net\SSH2::_get_channel_packet()
-     * @access private
-     */
-    const CHANNEL = 0x100;
-
-    /**#@+
-     * @access public
-     * @see \phpseclib\Net\SFTP::put()
-    */
-    /**
-     * Reads data from a local file.
-     */
-    const SOURCE_LOCAL_FILE = 1;
-    /**
-     * Reads data from a string.
-     */
-    // this value isn't really used anymore but i'm keeping it reserved for historical reasons
-    const SOURCE_STRING = 2;
-    /**
-     * Reads data from callback:
-     * function callback($length) returns string to proceed, null for EOF
-     */
-    const SOURCE_CALLBACK = 16;
-    /**
-     * Resumes an upload
-     */
-    const RESUME = 4;
-    /**
-     * Append a local file to an already existing remote file
-     */
-    const RESUME_START = 8;
-    /**#@-*/
-
-    /**
-     * Packet Types
-     *
-     * @see self::__construct()
-     * @var array
-     * @access private
-     */
-    var $packet_types = array();
-
-    /**
-     * Status Codes
-     *
-     * @see self::__construct()
-     * @var array
-     * @access private
-     */
-    var $status_codes = array();
-
-    /**
-     * The Request ID
-     *
-     * The request ID exists in the off chance that a packet is sent out-of-order.  Of course, this library doesn't support
-     * concurrent actions, so it's somewhat academic, here.
-     *
-     * @var int
-     * @see self::_send_sftp_packet()
-     * @access private
-     */
-    var $request_id = false;
-
-    /**
-     * The Packet Type
-     *
-     * The request ID exists in the off chance that a packet is sent out-of-order.  Of course, this library doesn't support
-     * concurrent actions, so it's somewhat academic, here.
-     *
-     * @var int
-     * @see self::_get_sftp_packet()
-     * @access private
-     */
-    var $packet_type = -1;
-
-    /**
-     * Packet Buffer
-     *
-     * @var string
-     * @see self::_get_sftp_packet()
-     * @access private
-     */
-    var $packet_buffer = '';
-
-    /**
-     * Extensions supported by the server
-     *
-     * @var array
-     * @see self::_initChannel()
-     * @access private
-     */
-    var $extensions = array();
-
-    /**
-     * Server SFTP version
-     *
-     * @var int
-     * @see self::_initChannel()
-     * @access private
-     */
-    var $version;
-
-    /**
-     * Current working directory
-     *
-     * @var string
-     * @see self::_realpath()
-     * @see self::chdir()
-     * @access private
-     */
-    var $pwd = false;
-
-    /**
-     * Packet Type Log
-     *
-     * @see self::getLog()
-     * @var array
-     * @access private
-     */
-    var $packet_type_log = array();
-
-    /**
-     * Packet Log
-     *
-     * @see self::getLog()
-     * @var array
-     * @access private
-     */
-    var $packet_log = array();
-
-    /**
-     * Error information
-     *
-     * @see self::getSFTPErrors()
-     * @see self::getLastSFTPError()
-     * @var string
-     * @access private
-     */
-    var $sftp_errors = array();
-
-    /**
-     * Stat Cache
-     *
-     * Rather than always having to open a directory and close it immediately there after to see if a file is a directory
-     * we'll cache the results.
-     *
-     * @see self::_update_stat_cache()
-     * @see self::_remove_from_stat_cache()
-     * @see self::_query_stat_cache()
-     * @var array
-     * @access private
-     */
-    var $stat_cache = array();
-
-    /**
-     * Max SFTP Packet Size
-     *
-     * @see self::__construct()
-     * @see self::get()
-     * @var array
-     * @access private
-     */
-    var $max_sftp_packet;
-
-    /**
-     * Stat Cache Flag
-     *
-     * @see self::disableStatCache()
-     * @see self::enableStatCache()
-     * @var bool
-     * @access private
-     */
-    var $use_stat_cache = true;
-
-    /**
-     * Sort Options
-     *
-     * @see self::_comparator()
-     * @see self::setListOrder()
-     * @var array
-     * @access private
-     */
-    var $sortOptions = array();
-
-    /**
-     * Default Constructor.
-     *
-     * Connects to an SFTP server
-     *
-     * @param string $host
-     * @param int $port
-     * @param int $timeout
-     * @return \phpseclib\Net\SFTP
-     * @access public
-     */
-    function __construct($host, $port = 22, $timeout = 10)
-    {
-        parent::__construct($host, $port, $timeout);
-
-        $this->max_sftp_packet = 1 << 15;
-
-        $this->packet_types = array(
-            1  => 'NET_SFTP_INIT',
-            2  => 'NET_SFTP_VERSION',
-            /* the format of SSH_FXP_OPEN changed between SFTPv4 and SFTPv5+:
-                   SFTPv5+: http://tools.ietf.org/html/draft-ietf-secsh-filexfer-13#section-8.1.1
-               pre-SFTPv5 : http://tools.ietf.org/html/draft-ietf-secsh-filexfer-04#section-6.3 */
-            3  => 'NET_SFTP_OPEN',
-            4  => 'NET_SFTP_CLOSE',
-            5  => 'NET_SFTP_READ',
-            6  => 'NET_SFTP_WRITE',
-            7  => 'NET_SFTP_LSTAT',
-            9  => 'NET_SFTP_SETSTAT',
-            11 => 'NET_SFTP_OPENDIR',
-            12 => 'NET_SFTP_READDIR',
-            13 => 'NET_SFTP_REMOVE',
-            14 => 'NET_SFTP_MKDIR',
-            15 => 'NET_SFTP_RMDIR',
-            16 => 'NET_SFTP_REALPATH',
-            17 => 'NET_SFTP_STAT',
-            /* the format of SSH_FXP_RENAME changed between SFTPv4 and SFTPv5+:
-                   SFTPv5+: http://tools.ietf.org/html/draft-ietf-secsh-filexfer-13#section-8.3
-               pre-SFTPv5 : http://tools.ietf.org/html/draft-ietf-secsh-filexfer-04#section-6.5 */
-            18 => 'NET_SFTP_RENAME',
-            19 => 'NET_SFTP_READLINK',
-            20 => 'NET_SFTP_SYMLINK',
-
-            101=> 'NET_SFTP_STATUS',
-            102=> 'NET_SFTP_HANDLE',
-            /* the format of SSH_FXP_NAME changed between SFTPv3 and SFTPv4+:
-                   SFTPv4+: http://tools.ietf.org/html/draft-ietf-secsh-filexfer-13#section-9.4
-               pre-SFTPv4 : http://tools.ietf.org/html/draft-ietf-secsh-filexfer-02#section-7 */
-            103=> 'NET_SFTP_DATA',
-            104=> 'NET_SFTP_NAME',
-            105=> 'NET_SFTP_ATTRS',
-
-            200=> 'NET_SFTP_EXTENDED'
-        );
-        $this->status_codes = array(
-            0 => 'NET_SFTP_STATUS_OK',
-            1 => 'NET_SFTP_STATUS_EOF',
-            2 => 'NET_SFTP_STATUS_NO_SUCH_FILE',
-            3 => 'NET_SFTP_STATUS_PERMISSION_DENIED',
-            4 => 'NET_SFTP_STATUS_FAILURE',
-            5 => 'NET_SFTP_STATUS_BAD_MESSAGE',
-            6 => 'NET_SFTP_STATUS_NO_CONNECTION',
-            7 => 'NET_SFTP_STATUS_CONNECTION_LOST',
-            8 => 'NET_SFTP_STATUS_OP_UNSUPPORTED',
-            9 => 'NET_SFTP_STATUS_INVALID_HANDLE',
-            10 => 'NET_SFTP_STATUS_NO_SUCH_PATH',
-            11 => 'NET_SFTP_STATUS_FILE_ALREADY_EXISTS',
-            12 => 'NET_SFTP_STATUS_WRITE_PROTECT',
-            13 => 'NET_SFTP_STATUS_NO_MEDIA',
-            14 => 'NET_SFTP_STATUS_NO_SPACE_ON_FILESYSTEM',
-            15 => 'NET_SFTP_STATUS_QUOTA_EXCEEDED',
-            16 => 'NET_SFTP_STATUS_UNKNOWN_PRINCIPAL',
-            17 => 'NET_SFTP_STATUS_LOCK_CONFLICT',
-            18 => 'NET_SFTP_STATUS_DIR_NOT_EMPTY',
-            19 => 'NET_SFTP_STATUS_NOT_A_DIRECTORY',
-            20 => 'NET_SFTP_STATUS_INVALID_FILENAME',
-            21 => 'NET_SFTP_STATUS_LINK_LOOP',
-            22 => 'NET_SFTP_STATUS_CANNOT_DELETE',
-            23 => 'NET_SFTP_STATUS_INVALID_PARAMETER',
-            24 => 'NET_SFTP_STATUS_FILE_IS_A_DIRECTORY',
-            25 => 'NET_SFTP_STATUS_BYTE_RANGE_LOCK_CONFLICT',
-            26 => 'NET_SFTP_STATUS_BYTE_RANGE_LOCK_REFUSED',
-            27 => 'NET_SFTP_STATUS_DELETE_PENDING',
-            28 => 'NET_SFTP_STATUS_FILE_CORRUPT',
-            29 => 'NET_SFTP_STATUS_OWNER_INVALID',
-            30 => 'NET_SFTP_STATUS_GROUP_INVALID',
-            31 => 'NET_SFTP_STATUS_NO_MATCHING_BYTE_RANGE_LOCK'
-        );
-        // http://tools.ietf.org/html/draft-ietf-secsh-filexfer-13#section-7.1
-        // the order, in this case, matters quite a lot - see \phpseclib\Net\SFTP::_parseAttributes() to understand why
-        $this->attributes = array(
-            0x00000001 => 'NET_SFTP_ATTR_SIZE',
-            0x00000002 => 'NET_SFTP_ATTR_UIDGID', // defined in SFTPv3, removed in SFTPv4+
-            0x00000004 => 'NET_SFTP_ATTR_PERMISSIONS',
-            0x00000008 => 'NET_SFTP_ATTR_ACCESSTIME',
-            // 0x80000000 will yield a floating point on 32-bit systems and converting floating points to integers
-            // yields inconsistent behavior depending on how php is compiled.  so we left shift -1 (which, in
-            // two's compliment, consists of all 1 bits) by 31.  on 64-bit systems this'll yield 0xFFFFFFFF80000000.
-            // that's not a problem, however, and 'anded' and a 32-bit number, as all the leading 1 bits are ignored.
-              -1 << 31 => 'NET_SFTP_ATTR_EXTENDED'
-        );
-        // http://tools.ietf.org/html/draft-ietf-secsh-filexfer-04#section-6.3
-        // the flag definitions change somewhat in SFTPv5+.  if SFTPv5+ support is added to this library, maybe name
-        // the array for that $this->open5_flags and similarly alter the constant names.
-        $this->open_flags = array(
-            0x00000001 => 'NET_SFTP_OPEN_READ',
-            0x00000002 => 'NET_SFTP_OPEN_WRITE',
-            0x00000004 => 'NET_SFTP_OPEN_APPEND',
-            0x00000008 => 'NET_SFTP_OPEN_CREATE',
-            0x00000010 => 'NET_SFTP_OPEN_TRUNCATE',
-            0x00000020 => 'NET_SFTP_OPEN_EXCL'
-        );
-        // http://tools.ietf.org/html/draft-ietf-secsh-filexfer-04#section-5.2
-        // see \phpseclib\Net\SFTP::_parseLongname() for an explanation
-        $this->file_types = array(
-            1 => 'NET_SFTP_TYPE_REGULAR',
-            2 => 'NET_SFTP_TYPE_DIRECTORY',
-            3 => 'NET_SFTP_TYPE_SYMLINK',
-            4 => 'NET_SFTP_TYPE_SPECIAL',
-            5 => 'NET_SFTP_TYPE_UNKNOWN',
-            // the followin types were first defined for use in SFTPv5+
-            // http://tools.ietf.org/html/draft-ietf-secsh-filexfer-05#section-5.2
-            6 => 'NET_SFTP_TYPE_SOCKET',
-            7 => 'NET_SFTP_TYPE_CHAR_DEVICE',
-            8 => 'NET_SFTP_TYPE_BLOCK_DEVICE',
-            9 => 'NET_SFTP_TYPE_FIFO'
-        );
-        $this->_define_array(
-            $this->packet_types,
-            $this->status_codes,
-            $this->attributes,
-            $this->open_flags,
-            $this->file_types
-        );
-
-        if (!defined('NET_SFTP_QUEUE_SIZE')) {
-            define('NET_SFTP_QUEUE_SIZE', 32);
-        }
-    }
-
-    /**
-     * Login
-     *
-     * @param string $username
-     * @param string $password
-     * @return bool
-     * @access public
-     */
-    function login($username)
-    {
-        $args = func_get_args();
-        if (!call_user_func_array(array(&$this, '_login'), $args)) {
-            return false;
-        }
-
-        $this->window_size_server_to_client[self::CHANNEL] = $this->window_size;
-
-        $packet = pack(
-            'CNa*N3',
-            NET_SSH2_MSG_CHANNEL_OPEN,
-            strlen('session'),
-            'session',
-            self::CHANNEL,
-            $this->window_size,
-            0x4000
-        );
-
-        if (!$this->_send_binary_packet($packet)) {
-            return false;
-        }
-
-        $this->channel_status[self::CHANNEL] = NET_SSH2_MSG_CHANNEL_OPEN;
-
-        $response = $this->_get_channel_packet(self::CHANNEL);
-        if ($response === false) {
-            return false;
-        }
-
-        $packet = pack(
-            'CNNa*CNa*',
-            NET_SSH2_MSG_CHANNEL_REQUEST,
-            $this->server_channels[self::CHANNEL],
-            strlen('subsystem'),
-            'subsystem',
-            1,
-            strlen('sftp'),
-            'sftp'
-        );
-        if (!$this->_send_binary_packet($packet)) {
-            return false;
-        }
-
-        $this->channel_status[self::CHANNEL] = NET_SSH2_MSG_CHANNEL_REQUEST;
-
-        $response = $this->_get_channel_packet(self::CHANNEL);
-        if ($response === false) {
-            // from PuTTY's psftp.exe
-            $command = "test -x /usr/lib/sftp-server && exec /usr/lib/sftp-server\n" .
-                       "test -x /usr/local/lib/sftp-server && exec /usr/local/lib/sftp-server\n" .
-                       "exec sftp-server";
-            // we don't do $this->exec($command, false) because exec() operates on a different channel and plus the SSH_MSG_CHANNEL_OPEN that exec() does
-            // is redundant
-            $packet = pack(
-                'CNNa*CNa*',
-                NET_SSH2_MSG_CHANNEL_REQUEST,
-                $this->server_channels[self::CHANNEL],
-                strlen('exec'),
-                'exec',
-                1,
-                strlen($command),
-                $command
-            );
-            if (!$this->_send_binary_packet($packet)) {
-                return false;
-            }
-
-            $this->channel_status[self::CHANNEL] = NET_SSH2_MSG_CHANNEL_REQUEST;
-
-            $response = $this->_get_channel_packet(self::CHANNEL);
-            if ($response === false) {
-                return false;
-            }
-        }
-
-        $this->channel_status[self::CHANNEL] = NET_SSH2_MSG_CHANNEL_DATA;
-
-        if (!$this->_send_sftp_packet(NET_SFTP_INIT, "\0\0\0\3")) {
-            return false;
-        }
-
-        $response = $this->_get_sftp_packet();
-        if ($this->packet_type != NET_SFTP_VERSION) {
-            user_error('Expected SSH_FXP_VERSION');
-            return false;
-        }
-
-        if (strlen($response) < 4) {
-            return false;
-        }
-        extract(unpack('Nversion', $this->_string_shift($response, 4)));
-        $this->version = $version;
-        while (!empty($response)) {
-            if (strlen($response) < 4) {
-                return false;
-            }
-            extract(unpack('Nlength', $this->_string_shift($response, 4)));
-            $key = $this->_string_shift($response, $length);
-            if (strlen($response) < 4) {
-                return false;
-            }
-            extract(unpack('Nlength', $this->_string_shift($response, 4)));
-            $value = $this->_string_shift($response, $length);
-            $this->extensions[$key] = $value;
-        }
-
-        /*
-         SFTPv4+ defines a 'newline' extension.  SFTPv3 seems to have unofficial support for it via 'newline@vandyke.com',
-         however, I'm not sure what 'newline@vandyke.com' is supposed to do (the fact that it's unofficial means that it's
-         not in the official SFTPv3 specs) and 'newline@vandyke.com' / 'newline' are likely not drop-in substitutes for
-         one another due to the fact that 'newline' comes with a SSH_FXF_TEXT bitmask whereas it seems unlikely that
-         'newline@vandyke.com' would.
-        */
-        /*
-        if (isset($this->extensions['newline@vandyke.com'])) {
-            $this->extensions['newline'] = $this->extensions['newline@vandyke.com'];
-            unset($this->extensions['newline@vandyke.com']);
-        }
-        */
-
-        $this->request_id = 1;
-
-        /*
-         A Note on SFTPv4/5/6 support:
-          states the following:
-
-         "If the client wishes to interoperate with servers that support noncontiguous version
-          numbers it SHOULD send '3'"
-
-         Given that the server only sends its version number after the client has already done so, the above
-         seems to be suggesting that v3 should be the default version.  This makes sense given that v3 is the
-         most popular.
-
-          states the following;
-
-         "If the server did not send the "versions" extension, or the version-from-list was not included, the
-          server MAY send a status response describing the failure, but MUST then close the channel without
-          processing any further requests."
-
-         So what do you do if you have a client whose initial SSH_FXP_INIT packet says it implements v3 and
-         a server whose initial SSH_FXP_VERSION reply says it implements v4 and only v4?  If it only implements
-         v4, the "versions" extension is likely not going to have been sent so version re-negotiation as discussed
-         in draft-ietf-secsh-filexfer-13 would be quite impossible.  As such, what \phpseclib\Net\SFTP would do is close the
-         channel and reopen it with a new and updated SSH_FXP_INIT packet.
-        */
-        switch ($this->version) {
-            case 2:
-            case 3:
-                break;
-            default:
-                return false;
-        }
-
-        $this->pwd = $this->_realpath('.');
-
-        $this->_update_stat_cache($this->pwd, array());
-
-        return true;
-    }
-
-    /**
-     * Disable the stat cache
-     *
-     * @access public
-     */
-    function disableStatCache()
-    {
-        $this->use_stat_cache = false;
-    }
-
-    /**
-     * Enable the stat cache
-     *
-     * @access public
-     */
-    function enableStatCache()
-    {
-        $this->use_stat_cache = true;
-    }
-
-    /**
-     * Clear the stat cache
-     *
-     * @access public
-     */
-    function clearStatCache()
-    {
-        $this->stat_cache = array();
-    }
-
-    /**
-     * Returns the current directory name
-     *
-     * @return mixed
-     * @access public
-     */
-    function pwd()
-    {
-        return $this->pwd;
-    }
-
-    /**
-     * Logs errors
-     *
-     * @param string $response
-     * @param int $status
-     * @access public
-     */
-    function _logError($response, $status = -1)
-    {
-        if ($status == -1) {
-            if (strlen($response) < 4) {
-                return;
-            }
-            extract(unpack('Nstatus', $this->_string_shift($response, 4)));
-        }
-
-        $error = $this->status_codes[$status];
-
-        if ($this->version > 2 || strlen($response) < 4) {
-            extract(unpack('Nlength', $this->_string_shift($response, 4)));
-            $this->sftp_errors[] = $error . ': ' . $this->_string_shift($response, $length);
-        } else {
-            $this->sftp_errors[] = $error;
-        }
-    }
-
-    /**
-     * Returns canonicalized absolute pathname
-     *
-     * realpath() expands all symbolic links and resolves references to '/./', '/../' and extra '/' characters in the input
-     * path and returns the canonicalized absolute pathname.
-     *
-     * @param string $path
-     * @return mixed
-     * @access public
-     */
-    function realpath($path)
-    {
-        return $this->_realpath($path);
-    }
-
-    /**
-     * Canonicalize the Server-Side Path Name
-     *
-     * SFTP doesn't provide a mechanism by which the current working directory can be changed, so we'll emulate it.  Returns
-     * the absolute (canonicalized) path.
-     *
-     * @see self::chdir()
-     * @param string $path
-     * @return mixed
-     * @access private
-     */
-    function _realpath($path)
-    {
-        if ($this->pwd === false) {
-            // http://tools.ietf.org/html/draft-ietf-secsh-filexfer-13#section-8.9
-            if (!$this->_send_sftp_packet(NET_SFTP_REALPATH, pack('Na*', strlen($path), $path))) {
-                return false;
-            }
-
-            $response = $this->_get_sftp_packet();
-            switch ($this->packet_type) {
-                case NET_SFTP_NAME:
-                    // although SSH_FXP_NAME is implemented differently in SFTPv3 than it is in SFTPv4+, the following
-                    // should work on all SFTP versions since the only part of the SSH_FXP_NAME packet the following looks
-                    // at is the first part and that part is defined the same in SFTP versions 3 through 6.
-                    $this->_string_shift($response, 4); // skip over the count - it should be 1, anyway
-                    if (strlen($response) < 4) {
-                        return false;
-                    }
-                    extract(unpack('Nlength', $this->_string_shift($response, 4)));
-                    return $this->_string_shift($response, $length);
-                case NET_SFTP_STATUS:
-                    $this->_logError($response);
-                    return false;
-                default:
-                    user_error('Expected SSH_FXP_NAME or SSH_FXP_STATUS');
-                    return false;
-            }
-        }
-
-        if ($path[0] != '/') {
-            $path = $this->pwd . '/' . $path;
-        }
-
-        $path = explode('/', $path);
-        $new = array();
-        foreach ($path as $dir) {
-            if (!strlen($dir)) {
-                continue;
-            }
-            switch ($dir) {
-                case '..':
-                    array_pop($new);
-                case '.':
-                    break;
-                default:
-                    $new[] = $dir;
-            }
-        }
-
-        return '/' . implode('/', $new);
-    }
-
-    /**
-     * Changes the current directory
-     *
-     * @param string $dir
-     * @return bool
-     * @access public
-     */
-    function chdir($dir)
-    {
-        if (!($this->bitmap & SSH2::MASK_LOGIN)) {
-            return false;
-        }
-
-        // assume current dir if $dir is empty
-        if ($dir === '') {
-            $dir = './';
-        // suffix a slash if needed
-        } elseif ($dir[strlen($dir) - 1] != '/') {
-            $dir.= '/';
-        }
-
-        $dir = $this->_realpath($dir);
-
-        // confirm that $dir is, in fact, a valid directory
-        if ($this->use_stat_cache && is_array($this->_query_stat_cache($dir))) {
-            $this->pwd = $dir;
-            return true;
-        }
-
-        // we could do a stat on the alleged $dir to see if it's a directory but that doesn't tell us
-        // the currently logged in user has the appropriate permissions or not. maybe you could see if
-        // the file's uid / gid match the currently logged in user's uid / gid but how there's no easy
-        // way to get those with SFTP
-
-        if (!$this->_send_sftp_packet(NET_SFTP_OPENDIR, pack('Na*', strlen($dir), $dir))) {
-            return false;
-        }
-
-        // see \phpseclib\Net\SFTP::nlist() for a more thorough explanation of the following
-        $response = $this->_get_sftp_packet();
-        switch ($this->packet_type) {
-            case NET_SFTP_HANDLE:
-                $handle = substr($response, 4);
-                break;
-            case NET_SFTP_STATUS:
-                $this->_logError($response);
-                return false;
-            default:
-                user_error('Expected SSH_FXP_HANDLE or SSH_FXP_STATUS');
-                return false;
-        }
-
-        if (!$this->_close_handle($handle)) {
-            return false;
-        }
-
-        $this->_update_stat_cache($dir, array());
-
-        $this->pwd = $dir;
-        return true;
-    }
-
-    /**
-     * Returns a list of files in the given directory
-     *
-     * @param string $dir
-     * @param bool $recursive
-     * @return mixed
-     * @access public
-     */
-    function nlist($dir = '.', $recursive = false)
-    {
-        return $this->_nlist_helper($dir, $recursive, '');
-    }
-
-    /**
-     * Helper method for nlist
-     *
-     * @param string $dir
-     * @param bool $recursive
-     * @param string $relativeDir
-     * @return mixed
-     * @access private
-     */
-    function _nlist_helper($dir, $recursive, $relativeDir)
-    {
-        $files = $this->_list($dir, false);
-
-        if (!$recursive || $files === false) {
-            return $files;
-        }
-
-        $result = array();
-        foreach ($files as $value) {
-            if ($value == '.' || $value == '..') {
-                if ($relativeDir == '') {
-                    $result[] = $value;
-                }
-                continue;
-            }
-            if (is_array($this->_query_stat_cache($this->_realpath($dir . '/' . $value)))) {
-                $temp = $this->_nlist_helper($dir . '/' . $value, true, $relativeDir . $value . '/');
-                $result = array_merge($result, $temp);
-            } else {
-                $result[] = $relativeDir . $value;
-            }
-        }
-
-        return $result;
-    }
-
-    /**
-     * Returns a detailed list of files in the given directory
-     *
-     * @param string $dir
-     * @param bool $recursive
-     * @return mixed
-     * @access public
-     */
-    function rawlist($dir = '.', $recursive = false)
-    {
-        $files = $this->_list($dir, true);
-        if (!$recursive || $files === false) {
-            return $files;
-        }
-
-        static $depth = 0;
-
-        foreach ($files as $key => $value) {
-            if ($depth != 0 && $key == '..') {
-                unset($files[$key]);
-                continue;
-            }
-            if ($key != '.' && $key != '..' && is_array($this->_query_stat_cache($this->_realpath($dir . '/' . $key)))) {
-                $depth++;
-                $files[$key] = $this->rawlist($dir . '/' . $key, true);
-                $depth--;
-            } else {
-                $files[$key] = (object) $value;
-            }
-        }
-
-        return $files;
-    }
-
-    /**
-     * Reads a list, be it detailed or not, of files in the given directory
-     *
-     * @param string $dir
-     * @param bool $raw
-     * @return mixed
-     * @access private
-     */
-    function _list($dir, $raw = true)
-    {
-        if (!($this->bitmap & SSH2::MASK_LOGIN)) {
-            return false;
-        }
-
-        $dir = $this->_realpath($dir . '/');
-        if ($dir === false) {
-            return false;
-        }
-
-        // http://tools.ietf.org/html/draft-ietf-secsh-filexfer-13#section-8.1.2
-        if (!$this->_send_sftp_packet(NET_SFTP_OPENDIR, pack('Na*', strlen($dir), $dir))) {
-            return false;
-        }
-
-        $response = $this->_get_sftp_packet();
-        switch ($this->packet_type) {
-            case NET_SFTP_HANDLE:
-                // http://tools.ietf.org/html/draft-ietf-secsh-filexfer-13#section-9.2
-                // since 'handle' is the last field in the SSH_FXP_HANDLE packet, we'll just remove the first four bytes that
-                // represent the length of the string and leave it at that
-                $handle = substr($response, 4);
-                break;
-            case NET_SFTP_STATUS:
-                // presumably SSH_FX_NO_SUCH_FILE or SSH_FX_PERMISSION_DENIED
-                $this->_logError($response);
-                return false;
-            default:
-                user_error('Expected SSH_FXP_HANDLE or SSH_FXP_STATUS');
-                return false;
-        }
-
-        $this->_update_stat_cache($dir, array());
-
-        $contents = array();
-        while (true) {
-            // http://tools.ietf.org/html/draft-ietf-secsh-filexfer-13#section-8.2.2
-            // why multiple SSH_FXP_READDIR packets would be sent when the response to a single one can span arbitrarily many
-            // SSH_MSG_CHANNEL_DATA messages is not known to me.
-            if (!$this->_send_sftp_packet(NET_SFTP_READDIR, pack('Na*', strlen($handle), $handle))) {
-                return false;
-            }
-
-            $response = $this->_get_sftp_packet();
-            switch ($this->packet_type) {
-                case NET_SFTP_NAME:
-                    if (strlen($response) < 4) {
-                        return false;
-                    }
-                    extract(unpack('Ncount', $this->_string_shift($response, 4)));
-                    for ($i = 0; $i < $count; $i++) {
-                        if (strlen($response) < 4) {
-                            return false;
-                        }
-                        extract(unpack('Nlength', $this->_string_shift($response, 4)));
-                        $shortname = $this->_string_shift($response, $length);
-                        if (strlen($response) < 4) {
-                            return false;
-                        }
-                        extract(unpack('Nlength', $this->_string_shift($response, 4)));
-                        $longname = $this->_string_shift($response, $length);
-                        $attributes = $this->_parseAttributes($response);
-                        if (!isset($attributes['type'])) {
-                            $fileType = $this->_parseLongname($longname);
-                            if ($fileType) {
-                                $attributes['type'] = $fileType;
-                            }
-                        }
-                        $contents[$shortname] = $attributes + array('filename' => $shortname);
-
-                        if (isset($attributes['type']) && $attributes['type'] == NET_SFTP_TYPE_DIRECTORY && ($shortname != '.' && $shortname != '..')) {
-                            $this->_update_stat_cache($dir . '/' . $shortname, array());
-                        } else {
-                            if ($shortname == '..') {
-                                $temp = $this->_realpath($dir . '/..') . '/.';
-                            } else {
-                                $temp = $dir . '/' . $shortname;
-                            }
-                            $this->_update_stat_cache($temp, (object) array('lstat' => $attributes));
-                        }
-                        // SFTPv6 has an optional boolean end-of-list field, but we'll ignore that, since the
-                        // final SSH_FXP_STATUS packet should tell us that, already.
-                    }
-                    break;
-                case NET_SFTP_STATUS:
-                    if (strlen($response) < 4) {
-                        return false;
-                    }
-                    extract(unpack('Nstatus', $this->_string_shift($response, 4)));
-                    if ($status != NET_SFTP_STATUS_EOF) {
-                        $this->_logError($response, $status);
-                        return false;
-                    }
-                    break 2;
-                default:
-                    user_error('Expected SSH_FXP_NAME or SSH_FXP_STATUS');
-                    return false;
-            }
-        }
-
-        if (!$this->_close_handle($handle)) {
-            return false;
-        }
-
-        if (count($this->sortOptions)) {
-            uasort($contents, array(&$this, '_comparator'));
-        }
-
-        return $raw ? $contents : array_keys($contents);
-    }
-
-    /**
-     * Compares two rawlist entries using parameters set by setListOrder()
-     *
-     * Intended for use with uasort()
-     *
-     * @param array $a
-     * @param array $b
-     * @return int
-     * @access private
-     */
-    function _comparator($a, $b)
-    {
-        switch (true) {
-            case $a['filename'] === '.' || $b['filename'] === '.':
-                if ($a['filename'] === $b['filename']) {
-                    return 0;
-                }
-                return $a['filename'] === '.' ? -1 : 1;
-            case $a['filename'] === '..' || $b['filename'] === '..':
-                if ($a['filename'] === $b['filename']) {
-                    return 0;
-                }
-                return $a['filename'] === '..' ? -1 : 1;
-            case isset($a['type']) && $a['type'] === NET_SFTP_TYPE_DIRECTORY:
-                if (!isset($b['type'])) {
-                    return 1;
-                }
-                if ($b['type'] !== $a['type']) {
-                    return -1;
-                }
-                break;
-            case isset($b['type']) && $b['type'] === NET_SFTP_TYPE_DIRECTORY:
-                return 1;
-        }
-        foreach ($this->sortOptions as $sort => $order) {
-            if (!isset($a[$sort]) || !isset($b[$sort])) {
-                if (isset($a[$sort])) {
-                    return -1;
-                }
-                if (isset($b[$sort])) {
-                    return 1;
-                }
-                return 0;
-            }
-            switch ($sort) {
-                case 'filename':
-                    $result = strcasecmp($a['filename'], $b['filename']);
-                    if ($result) {
-                        return $order === SORT_DESC ? -$result : $result;
-                    }
-                    break;
-                case 'permissions':
-                case 'mode':
-                    $a[$sort]&= 07777;
-                    $b[$sort]&= 07777;
-                default:
-                    if ($a[$sort] === $b[$sort]) {
-                        break;
-                    }
-                    return $order === SORT_ASC ? $a[$sort] - $b[$sort] : $b[$sort] - $a[$sort];
-            }
-        }
-    }
-
-    /**
-     * Defines how nlist() and rawlist() will be sorted - if at all.
-     *
-     * If sorting is enabled directories and files will be sorted independently with
-     * directories appearing before files in the resultant array that is returned.
-     *
-     * Any parameter returned by stat is a valid sort parameter for this function.
-     * Filename comparisons are case insensitive.
-     *
-     * Examples:
-     *
-     * $sftp->setListOrder('filename', SORT_ASC);
-     * $sftp->setListOrder('size', SORT_DESC, 'filename', SORT_ASC);
-     * $sftp->setListOrder(true);
-     *    Separates directories from files but doesn't do any sorting beyond that
-     * $sftp->setListOrder();
-     *    Don't do any sort of sorting
-     *
-     * @access public
-     */
-    function setListOrder()
-    {
-        $this->sortOptions = array();
-        $args = func_get_args();
-        if (empty($args)) {
-            return;
-        }
-        $len = count($args) & 0x7FFFFFFE;
-        for ($i = 0; $i < $len; $i+=2) {
-            $this->sortOptions[$args[$i]] = $args[$i + 1];
-        }
-        if (!count($this->sortOptions)) {
-            $this->sortOptions = array('bogus' => true);
-        }
-    }
-
-    /**
-     * Returns the file size, in bytes, or false, on failure
-     *
-     * Files larger than 4GB will show up as being exactly 4GB.
-     *
-     * @param string $filename
-     * @return mixed
-     * @access public
-     */
-    function size($filename)
-    {
-        if (!($this->bitmap & SSH2::MASK_LOGIN)) {
-            return false;
-        }
-
-        $result = $this->stat($filename);
-        if ($result === false) {
-            return false;
-        }
-        return isset($result['size']) ? $result['size'] : -1;
-    }
-
-    /**
-     * Save files / directories to cache
-     *
-     * @param string $path
-     * @param mixed $value
-     * @access private
-     */
-    function _update_stat_cache($path, $value)
-    {
-        if ($this->use_stat_cache === false) {
-            return;
-        }
-
-        // preg_replace('#^/|/(?=/)|/$#', '', $dir) == str_replace('//', '/', trim($path, '/'))
-        $dirs = explode('/', preg_replace('#^/|/(?=/)|/$#', '', $path));
-
-        $temp = &$this->stat_cache;
-        $max = count($dirs) - 1;
-        foreach ($dirs as $i => $dir) {
-            // if $temp is an object that means one of two things.
-            //  1. a file was deleted and changed to a directory behind phpseclib's back
-            //  2. it's a symlink. when lstat is done it's unclear what it's a symlink to
-            if (is_object($temp)) {
-                $temp = array();
-            }
-            if (!isset($temp[$dir])) {
-                $temp[$dir] = array();
-            }
-            if ($i === $max) {
-                if (is_object($temp[$dir])) {
-                    if (!isset($value->stat) && isset($temp[$dir]->stat)) {
-                        $value->stat = $temp[$dir]->stat;
-                    }
-                    if (!isset($value->lstat) && isset($temp[$dir]->lstat)) {
-                        $value->lstat = $temp[$dir]->lstat;
-                    }
-                }
-                $temp[$dir] = $value;
-                break;
-            }
-            $temp = &$temp[$dir];
-        }
-    }
-
-    /**
-     * Remove files / directories from cache
-     *
-     * @param string $path
-     * @return bool
-     * @access private
-     */
-    function _remove_from_stat_cache($path)
-    {
-        $dirs = explode('/', preg_replace('#^/|/(?=/)|/$#', '', $path));
-
-        $temp = &$this->stat_cache;
-        $max = count($dirs) - 1;
-        foreach ($dirs as $i => $dir) {
-            if ($i === $max) {
-                unset($temp[$dir]);
-                return true;
-            }
-            if (!isset($temp[$dir])) {
-                return false;
-            }
-            $temp = &$temp[$dir];
-        }
-    }
-
-    /**
-     * Checks cache for path
-     *
-     * Mainly used by file_exists
-     *
-     * @param string $dir
-     * @return mixed
-     * @access private
-     */
-    function _query_stat_cache($path)
-    {
-        $dirs = explode('/', preg_replace('#^/|/(?=/)|/$#', '', $path));
-
-        $temp = &$this->stat_cache;
-        foreach ($dirs as $dir) {
-            if (!isset($temp[$dir])) {
-                return null;
-            }
-            $temp = &$temp[$dir];
-        }
-        return $temp;
-    }
-
-    /**
-     * Returns general information about a file.
-     *
-     * Returns an array on success and false otherwise.
-     *
-     * @param string $filename
-     * @return mixed
-     * @access public
-     */
-    function stat($filename)
-    {
-        if (!($this->bitmap & SSH2::MASK_LOGIN)) {
-            return false;
-        }
-
-        $filename = $this->_realpath($filename);
-        if ($filename === false) {
-            return false;
-        }
-
-        if ($this->use_stat_cache) {
-            $result = $this->_query_stat_cache($filename);
-            if (is_array($result) && isset($result['.']) && isset($result['.']->stat)) {
-                return $result['.']->stat;
-            }
-            if (is_object($result) && isset($result->stat)) {
-                return $result->stat;
-            }
-        }
-
-        $stat = $this->_stat($filename, NET_SFTP_STAT);
-        if ($stat === false) {
-            $this->_remove_from_stat_cache($filename);
-            return false;
-        }
-        if (isset($stat['type'])) {
-            if ($stat['type'] == NET_SFTP_TYPE_DIRECTORY) {
-                $filename.= '/.';
-            }
-            $this->_update_stat_cache($filename, (object) array('stat' => $stat));
-            return $stat;
-        }
-
-        $pwd = $this->pwd;
-        $stat['type'] = $this->chdir($filename) ?
-            NET_SFTP_TYPE_DIRECTORY :
-            NET_SFTP_TYPE_REGULAR;
-        $this->pwd = $pwd;
-
-        if ($stat['type'] == NET_SFTP_TYPE_DIRECTORY) {
-            $filename.= '/.';
-        }
-        $this->_update_stat_cache($filename, (object) array('stat' => $stat));
-
-        return $stat;
-    }
-
-    /**
-     * Returns general information about a file or symbolic link.
-     *
-     * Returns an array on success and false otherwise.
-     *
-     * @param string $filename
-     * @return mixed
-     * @access public
-     */
-    function lstat($filename)
-    {
-        if (!($this->bitmap & SSH2::MASK_LOGIN)) {
-            return false;
-        }
-
-        $filename = $this->_realpath($filename);
-        if ($filename === false) {
-            return false;
-        }
-
-        if ($this->use_stat_cache) {
-            $result = $this->_query_stat_cache($filename);
-            if (is_array($result) && isset($result['.']) && isset($result['.']->lstat)) {
-                return $result['.']->lstat;
-            }
-            if (is_object($result) && isset($result->lstat)) {
-                return $result->lstat;
-            }
-        }
-
-        $lstat = $this->_stat($filename, NET_SFTP_LSTAT);
-        if ($lstat === false) {
-            $this->_remove_from_stat_cache($filename);
-            return false;
-        }
-        if (isset($lstat['type'])) {
-            if ($lstat['type'] == NET_SFTP_TYPE_DIRECTORY) {
-                $filename.= '/.';
-            }
-            $this->_update_stat_cache($filename, (object) array('lstat' => $lstat));
-            return $lstat;
-        }
-
-        $stat = $this->_stat($filename, NET_SFTP_STAT);
-
-        if ($lstat != $stat) {
-            $lstat = array_merge($lstat, array('type' => NET_SFTP_TYPE_SYMLINK));
-            $this->_update_stat_cache($filename, (object) array('lstat' => $lstat));
-            return $stat;
-        }
-
-        $pwd = $this->pwd;
-        $lstat['type'] = $this->chdir($filename) ?
-            NET_SFTP_TYPE_DIRECTORY :
-            NET_SFTP_TYPE_REGULAR;
-        $this->pwd = $pwd;
-
-        if ($lstat['type'] == NET_SFTP_TYPE_DIRECTORY) {
-            $filename.= '/.';
-        }
-        $this->_update_stat_cache($filename, (object) array('lstat' => $lstat));
-
-        return $lstat;
-    }
-
-    /**
-     * Returns general information about a file or symbolic link
-     *
-     * Determines information without calling \phpseclib\Net\SFTP::_realpath().
-     * The second parameter can be either NET_SFTP_STAT or NET_SFTP_LSTAT.
-     *
-     * @param string $filename
-     * @param int $type
-     * @return mixed
-     * @access private
-     */
-    function _stat($filename, $type)
-    {
-        // SFTPv4+ adds an additional 32-bit integer field - flags - to the following:
-        $packet = pack('Na*', strlen($filename), $filename);
-        if (!$this->_send_sftp_packet($type, $packet)) {
-            return false;
-        }
-
-        $response = $this->_get_sftp_packet();
-        switch ($this->packet_type) {
-            case NET_SFTP_ATTRS:
-                return $this->_parseAttributes($response);
-            case NET_SFTP_STATUS:
-                $this->_logError($response);
-                return false;
-        }
-
-        user_error('Expected SSH_FXP_ATTRS or SSH_FXP_STATUS');
-        return false;
-    }
-
-    /**
-     * Truncates a file to a given length
-     *
-     * @param string $filename
-     * @param int $new_size
-     * @return bool
-     * @access public
-     */
-    function truncate($filename, $new_size)
-    {
-        $attr = pack('N3', NET_SFTP_ATTR_SIZE, $new_size / 4294967296, $new_size); // 4294967296 == 0x100000000 == 1<<32
-
-        return $this->_setstat($filename, $attr, false);
-    }
-
-    /**
-     * Sets access and modification time of file.
-     *
-     * If the file does not exist, it will be created.
-     *
-     * @param string $filename
-     * @param int $time
-     * @param int $atime
-     * @return bool
-     * @access public
-     */
-    function touch($filename, $time = null, $atime = null)
-    {
-        if (!($this->bitmap & SSH2::MASK_LOGIN)) {
-            return false;
-        }
-
-        $filename = $this->_realpath($filename);
-        if ($filename === false) {
-            return false;
-        }
-
-        if (!isset($time)) {
-            $time = time();
-        }
-        if (!isset($atime)) {
-            $atime = $time;
-        }
-
-        $flags = NET_SFTP_OPEN_WRITE | NET_SFTP_OPEN_CREATE | NET_SFTP_OPEN_EXCL;
-        $attr = pack('N3', NET_SFTP_ATTR_ACCESSTIME, $time, $atime);
-        $packet = pack('Na*Na*', strlen($filename), $filename, $flags, $attr);
-        if (!$this->_send_sftp_packet(NET_SFTP_OPEN, $packet)) {
-            return false;
-        }
-
-        $response = $this->_get_sftp_packet();
-        switch ($this->packet_type) {
-            case NET_SFTP_HANDLE:
-                return $this->_close_handle(substr($response, 4));
-            case NET_SFTP_STATUS:
-                $this->_logError($response);
-                break;
-            default:
-                user_error('Expected SSH_FXP_HANDLE or SSH_FXP_STATUS');
-                return false;
-        }
-
-        return $this->_setstat($filename, $attr, false);
-    }
-
-    /**
-     * Changes file or directory owner
-     *
-     * Returns true on success or false on error.
-     *
-     * @param string $filename
-     * @param int $uid
-     * @param bool $recursive
-     * @return bool
-     * @access public
-     */
-    function chown($filename, $uid, $recursive = false)
-    {
-        // quoting from ,
-        // "if the owner or group is specified as -1, then that ID is not changed"
-        $attr = pack('N3', NET_SFTP_ATTR_UIDGID, $uid, -1);
-
-        return $this->_setstat($filename, $attr, $recursive);
-    }
-
-    /**
-     * Changes file or directory group
-     *
-     * Returns true on success or false on error.
-     *
-     * @param string $filename
-     * @param int $gid
-     * @param bool $recursive
-     * @return bool
-     * @access public
-     */
-    function chgrp($filename, $gid, $recursive = false)
-    {
-        $attr = pack('N3', NET_SFTP_ATTR_UIDGID, -1, $gid);
-
-        return $this->_setstat($filename, $attr, $recursive);
-    }
-
-    /**
-     * Set permissions on a file.
-     *
-     * Returns the new file permissions on success or false on error.
-     * If $recursive is true than this just returns true or false.
-     *
-     * @param int $mode
-     * @param string $filename
-     * @param bool $recursive
-     * @return mixed
-     * @access public
-     */
-    function chmod($mode, $filename, $recursive = false)
-    {
-        if (is_string($mode) && is_int($filename)) {
-            $temp = $mode;
-            $mode = $filename;
-            $filename = $temp;
-        }
-
-        $attr = pack('N2', NET_SFTP_ATTR_PERMISSIONS, $mode & 07777);
-        if (!$this->_setstat($filename, $attr, $recursive)) {
-            return false;
-        }
-        if ($recursive) {
-            return true;
-        }
-
-        $filename = $this->_realPath($filename);
-        // rather than return what the permissions *should* be, we'll return what they actually are.  this will also
-        // tell us if the file actually exists.
-        // incidentally, SFTPv4+ adds an additional 32-bit integer field - flags - to the following:
-        $packet = pack('Na*', strlen($filename), $filename);
-        if (!$this->_send_sftp_packet(NET_SFTP_STAT, $packet)) {
-            return false;
-        }
-
-        $response = $this->_get_sftp_packet();
-        switch ($this->packet_type) {
-            case NET_SFTP_ATTRS:
-                $attrs = $this->_parseAttributes($response);
-                return $attrs['permissions'];
-            case NET_SFTP_STATUS:
-                $this->_logError($response);
-                return false;
-        }
-
-        user_error('Expected SSH_FXP_ATTRS or SSH_FXP_STATUS');
-        return false;
-    }
-
-    /**
-     * Sets information about a file
-     *
-     * @param string $filename
-     * @param string $attr
-     * @param bool $recursive
-     * @return bool
-     * @access private
-     */
-    function _setstat($filename, $attr, $recursive)
-    {
-        if (!($this->bitmap & SSH2::MASK_LOGIN)) {
-            return false;
-        }
-
-        $filename = $this->_realpath($filename);
-        if ($filename === false) {
-            return false;
-        }
-
-        $this->_remove_from_stat_cache($filename);
-
-        if ($recursive) {
-            $i = 0;
-            $result = $this->_setstat_recursive($filename, $attr, $i);
-            $this->_read_put_responses($i);
-            return $result;
-        }
-
-        // SFTPv4+ has an additional byte field - type - that would need to be sent, as well. setting it to
-        // SSH_FILEXFER_TYPE_UNKNOWN might work. if not, we'd have to do an SSH_FXP_STAT before doing an SSH_FXP_SETSTAT.
-        if (!$this->_send_sftp_packet(NET_SFTP_SETSTAT, pack('Na*a*', strlen($filename), $filename, $attr))) {
-            return false;
-        }
-
-        /*
-         "Because some systems must use separate system calls to set various attributes, it is possible that a failure
-          response will be returned, but yet some of the attributes may be have been successfully modified.  If possible,
-          servers SHOULD avoid this situation; however, clients MUST be aware that this is possible."
-
-          -- http://tools.ietf.org/html/draft-ietf-secsh-filexfer-13#section-8.6
-        */
-        $response = $this->_get_sftp_packet();
-        if ($this->packet_type != NET_SFTP_STATUS) {
-            user_error('Expected SSH_FXP_STATUS');
-            return false;
-        }
-
-        if (strlen($response) < 4) {
-            return false;
-        }
-        extract(unpack('Nstatus', $this->_string_shift($response, 4)));
-        if ($status != NET_SFTP_STATUS_OK) {
-            $this->_logError($response, $status);
-            return false;
-        }
-
-        return true;
-    }
-
-    /**
-     * Recursively sets information on directories on the SFTP server
-     *
-     * Minimizes directory lookups and SSH_FXP_STATUS requests for speed.
-     *
-     * @param string $path
-     * @param string $attr
-     * @param int $i
-     * @return bool
-     * @access private
-     */
-    function _setstat_recursive($path, $attr, &$i)
-    {
-        if (!$this->_read_put_responses($i)) {
-            return false;
-        }
-        $i = 0;
-        $entries = $this->_list($path, true);
-
-        if ($entries === false) {
-            return $this->_setstat($path, $attr, false);
-        }
-
-        // normally $entries would have at least . and .. but it might not if the directories
-        // permissions didn't allow reading
-        if (empty($entries)) {
-            return false;
-        }
-
-        unset($entries['.'], $entries['..']);
-        foreach ($entries as $filename => $props) {
-            if (!isset($props['type'])) {
-                return false;
-            }
-
-            $temp = $path . '/' . $filename;
-            if ($props['type'] == NET_SFTP_TYPE_DIRECTORY) {
-                if (!$this->_setstat_recursive($temp, $attr, $i)) {
-                    return false;
-                }
-            } else {
-                if (!$this->_send_sftp_packet(NET_SFTP_SETSTAT, pack('Na*a*', strlen($temp), $temp, $attr))) {
-                    return false;
-                }
-
-                $i++;
-
-                if ($i >= NET_SFTP_QUEUE_SIZE) {
-                    if (!$this->_read_put_responses($i)) {
-                        return false;
-                    }
-                    $i = 0;
-                }
-            }
-        }
-
-        if (!$this->_send_sftp_packet(NET_SFTP_SETSTAT, pack('Na*a*', strlen($path), $path, $attr))) {
-            return false;
-        }
-
-        $i++;
-
-        if ($i >= NET_SFTP_QUEUE_SIZE) {
-            if (!$this->_read_put_responses($i)) {
-                return false;
-            }
-            $i = 0;
-        }
-
-        return true;
-    }
-
-    /**
-     * Return the target of a symbolic link
-     *
-     * @param string $link
-     * @return mixed
-     * @access public
-     */
-    function readlink($link)
-    {
-        if (!($this->bitmap & SSH2::MASK_LOGIN)) {
-            return false;
-        }
-
-        $link = $this->_realpath($link);
-
-        if (!$this->_send_sftp_packet(NET_SFTP_READLINK, pack('Na*', strlen($link), $link))) {
-            return false;
-        }
-
-        $response = $this->_get_sftp_packet();
-        switch ($this->packet_type) {
-            case NET_SFTP_NAME:
-                break;
-            case NET_SFTP_STATUS:
-                $this->_logError($response);
-                return false;
-            default:
-                user_error('Expected SSH_FXP_NAME or SSH_FXP_STATUS');
-                return false;
-        }
-
-        if (strlen($response) < 4) {
-            return false;
-        }
-        extract(unpack('Ncount', $this->_string_shift($response, 4)));
-        // the file isn't a symlink
-        if (!$count) {
-            return false;
-        }
-
-        if (strlen($response) < 4) {
-            return false;
-        }
-        extract(unpack('Nlength', $this->_string_shift($response, 4)));
-        return $this->_string_shift($response, $length);
-    }
-
-    /**
-     * Create a symlink
-     *
-     * symlink() creates a symbolic link to the existing target with the specified name link.
-     *
-     * @param string $target
-     * @param string $link
-     * @return bool
-     * @access public
-     */
-    function symlink($target, $link)
-    {
-        if (!($this->bitmap & SSH2::MASK_LOGIN)) {
-            return false;
-        }
-
-        //$target = $this->_realpath($target);
-        $link = $this->_realpath($link);
-
-        $packet = pack('Na*Na*', strlen($target), $target, strlen($link), $link);
-        if (!$this->_send_sftp_packet(NET_SFTP_SYMLINK, $packet)) {
-            return false;
-        }
-
-        $response = $this->_get_sftp_packet();
-        if ($this->packet_type != NET_SFTP_STATUS) {
-            user_error('Expected SSH_FXP_STATUS');
-            return false;
-        }
-
-        if (strlen($response) < 4) {
-            return false;
-        }
-        extract(unpack('Nstatus', $this->_string_shift($response, 4)));
-        if ($status != NET_SFTP_STATUS_OK) {
-            $this->_logError($response, $status);
-            return false;
-        }
-
-        return true;
-    }
-
-    /**
-     * Creates a directory.
-     *
-     * @param string $dir
-     * @return bool
-     * @access public
-     */
-    function mkdir($dir, $mode = -1, $recursive = false)
-    {
-        if (!($this->bitmap & SSH2::MASK_LOGIN)) {
-            return false;
-        }
-
-        $dir = $this->_realpath($dir);
-        // by not providing any permissions, hopefully the server will use the logged in users umask - their
-        // default permissions.
-        $attr = $mode == -1 ? "\0\0\0\0" : pack('N2', NET_SFTP_ATTR_PERMISSIONS, $mode & 07777);
-
-        if ($recursive) {
-            $dirs = explode('/', preg_replace('#/(?=/)|/$#', '', $dir));
-            if (empty($dirs[0])) {
-                array_shift($dirs);
-                $dirs[0] = '/' . $dirs[0];
-            }
-            for ($i = 0; $i < count($dirs); $i++) {
-                $temp = array_slice($dirs, 0, $i + 1);
-                $temp = implode('/', $temp);
-                $result = $this->_mkdir_helper($temp, $attr);
-            }
-            return $result;
-        }
-
-        return $this->_mkdir_helper($dir, $attr);
-    }
-
-    /**
-     * Helper function for directory creation
-     *
-     * @param string $dir
-     * @return bool
-     * @access private
-     */
-    function _mkdir_helper($dir, $attr)
-    {
-        if (!$this->_send_sftp_packet(NET_SFTP_MKDIR, pack('Na*a*', strlen($dir), $dir, $attr))) {
-            return false;
-        }
-
-        $response = $this->_get_sftp_packet();
-        if ($this->packet_type != NET_SFTP_STATUS) {
-            user_error('Expected SSH_FXP_STATUS');
-            return false;
-        }
-
-        if (strlen($response) < 4) {
-            return false;
-        }
-        extract(unpack('Nstatus', $this->_string_shift($response, 4)));
-        if ($status != NET_SFTP_STATUS_OK) {
-            $this->_logError($response, $status);
-            return false;
-        }
-
-        return true;
-    }
-
-    /**
-     * Removes a directory.
-     *
-     * @param string $dir
-     * @return bool
-     * @access public
-     */
-    function rmdir($dir)
-    {
-        if (!($this->bitmap & SSH2::MASK_LOGIN)) {
-            return false;
-        }
-
-        $dir = $this->_realpath($dir);
-        if ($dir === false) {
-            return false;
-        }
-
-        if (!$this->_send_sftp_packet(NET_SFTP_RMDIR, pack('Na*', strlen($dir), $dir))) {
-            return false;
-        }
-
-        $response = $this->_get_sftp_packet();
-        if ($this->packet_type != NET_SFTP_STATUS) {
-            user_error('Expected SSH_FXP_STATUS');
-            return false;
-        }
-
-        if (strlen($response) < 4) {
-            return false;
-        }
-        extract(unpack('Nstatus', $this->_string_shift($response, 4)));
-        if ($status != NET_SFTP_STATUS_OK) {
-            // presumably SSH_FX_NO_SUCH_FILE or SSH_FX_PERMISSION_DENIED?
-            $this->_logError($response, $status);
-            return false;
-        }
-
-        $this->_remove_from_stat_cache($dir);
-        // the following will do a soft delete, which would be useful if you deleted a file
-        // and then tried to do a stat on the deleted file. the above, in contrast, does
-        // a hard delete
-        //$this->_update_stat_cache($dir, false);
-
-        return true;
-    }
-
-    /**
-     * Uploads a file to the SFTP server.
-     *
-     * By default, \phpseclib\Net\SFTP::put() does not read from the local filesystem.  $data is dumped directly into $remote_file.
-     * So, for example, if you set $data to 'filename.ext' and then do \phpseclib\Net\SFTP::get(), you will get a file, twelve bytes
-     * long, containing 'filename.ext' as its contents.
-     *
-     * Setting $mode to self::SOURCE_LOCAL_FILE will change the above behavior.  With self::SOURCE_LOCAL_FILE, $remote_file will
-     * contain as many bytes as filename.ext does on your local filesystem.  If your filename.ext is 1MB then that is how
-     * large $remote_file will be, as well.
-     *
-     * Setting $mode to self::SOURCE_CALLBACK will use $data as callback function, which gets only one parameter -- number of bytes to return, and returns a string if there is some data or null if there is no more data
-     *
-     * If $data is a resource then it'll be used as a resource instead.
-     *
-     * Currently, only binary mode is supported.  As such, if the line endings need to be adjusted, you will need to take
-     * care of that, yourself.
-     *
-     * $mode can take an additional two parameters - self::RESUME and self::RESUME_START. These are bitwise AND'd with
-     * $mode. So if you want to resume upload of a 300mb file on the local file system you'd set $mode to the following:
-     *
-     * self::SOURCE_LOCAL_FILE | self::RESUME
-     *
-     * If you wanted to simply append the full contents of a local file to the full contents of a remote file you'd replace
-     * self::RESUME with self::RESUME_START.
-     *
-     * If $mode & (self::RESUME | self::RESUME_START) then self::RESUME_START will be assumed.
-     *
-     * $start and $local_start give you more fine grained control over this process and take precident over self::RESUME
-     * when they're non-negative. ie. $start could let you write at the end of a file (like self::RESUME) or in the middle
-     * of one. $local_start could let you start your reading from the end of a file (like self::RESUME_START) or in the
-     * middle of one.
-     *
-     * Setting $local_start to > 0 or $mode | self::RESUME_START doesn't do anything unless $mode | self::SOURCE_LOCAL_FILE.
-     *
-     * @param string $remote_file
-     * @param string|resource $data
-     * @param int $mode
-     * @param int $start
-     * @param int $local_start
-     * @param callable|null $progressCallback
-     * @return bool
-     * @access public
-     * @internal ASCII mode for SFTPv4/5/6 can be supported by adding a new function - \phpseclib\Net\SFTP::setMode().
-     */
-    function put($remote_file, $data, $mode = self::SOURCE_STRING, $start = -1, $local_start = -1, $progressCallback = null)
-    {
-        if (!($this->bitmap & SSH2::MASK_LOGIN)) {
-            return false;
-        }
-
-        $remote_file = $this->_realpath($remote_file);
-        if ($remote_file === false) {
-            return false;
-        }
-
-        $this->_remove_from_stat_cache($remote_file);
-
-        $flags = NET_SFTP_OPEN_WRITE | NET_SFTP_OPEN_CREATE;
-        // according to the SFTP specs, NET_SFTP_OPEN_APPEND should "force all writes to append data at the end of the file."
-        // in practice, it doesn't seem to do that.
-        //$flags|= ($mode & self::RESUME) ? NET_SFTP_OPEN_APPEND : NET_SFTP_OPEN_TRUNCATE;
-
-        if ($start >= 0) {
-            $offset = $start;
-        } elseif ($mode & self::RESUME) {
-            // if NET_SFTP_OPEN_APPEND worked as it should _size() wouldn't need to be called
-            $size = $this->size($remote_file);
-            $offset = $size !== false ? $size : 0;
-        } else {
-            $offset = 0;
-            $flags|= NET_SFTP_OPEN_TRUNCATE;
-        }
-
-        $packet = pack('Na*N2', strlen($remote_file), $remote_file, $flags, 0);
-        if (!$this->_send_sftp_packet(NET_SFTP_OPEN, $packet)) {
-            return false;
-        }
-
-        $response = $this->_get_sftp_packet();
-        switch ($this->packet_type) {
-            case NET_SFTP_HANDLE:
-                $handle = substr($response, 4);
-                break;
-            case NET_SFTP_STATUS:
-                $this->_logError($response);
-                return false;
-            default:
-                user_error('Expected SSH_FXP_HANDLE or SSH_FXP_STATUS');
-                return false;
-        }
-
-        // http://tools.ietf.org/html/draft-ietf-secsh-filexfer-13#section-8.2.3
-        $dataCallback = false;
-        switch (true) {
-            case $mode & self::SOURCE_CALLBACK:
-                if (!is_callable($data)) {
-                    user_error("\$data should be is_callable() if you specify SOURCE_CALLBACK flag");
-                }
-                $dataCallback = $data;
-                // do nothing
-                break;
-            case is_resource($data):
-                $mode = $mode & ~self::SOURCE_LOCAL_FILE;
-                $info = stream_get_meta_data($data);
-                if ($info['wrapper_type'] == 'PHP' && $info['stream_type'] == 'Input') {
-                    $fp = fopen('php://memory', 'w+');
-                    stream_copy_to_stream($data, $fp);
-                    rewind($fp);
-                } else {
-                    $fp = $data;
-                }
-                break;
-            case $mode & self::SOURCE_LOCAL_FILE:
-                if (!is_file($data)) {
-                    user_error("$data is not a valid file");
-                    return false;
-                }
-                $fp = @fopen($data, 'rb');
-                if (!$fp) {
-                    return false;
-                }
-        }
-
-        if (isset($fp)) {
-            $stat = fstat($fp);
-            $size = $stat['size'];
-
-            if ($local_start >= 0) {
-                fseek($fp, $local_start);
-                $size-= $local_start;
-            }
-        } elseif ($dataCallback) {
-            $size = 0;
-        } else {
-            $size = strlen($data);
-        }
-
-        $sent = 0;
-        $size = $size < 0 ? ($size & 0x7FFFFFFF) + 0x80000000 : $size;
-
-        $sftp_packet_size = 4096; // PuTTY uses 4096
-        // make the SFTP packet be exactly 4096 bytes by including the bytes in the NET_SFTP_WRITE packets "header"
-        $sftp_packet_size-= strlen($handle) + 25;
-        $i = 0;
-        while ($dataCallback || ($size === 0 || $sent < $size)) {
-            if ($dataCallback) {
-                $temp = call_user_func($dataCallback, $sftp_packet_size);
-                if (is_null($temp)) {
-                    break;
-                }
-            } else {
-                $temp = isset($fp) ? fread($fp, $sftp_packet_size) : substr($data, $sent, $sftp_packet_size);
-                if ($temp === false || $temp === '') {
-                    break;
-                }
-            }
-
-            $subtemp = $offset + $sent;
-            $packet = pack('Na*N3a*', strlen($handle), $handle, $subtemp / 4294967296, $subtemp, strlen($temp), $temp);
-            if (!$this->_send_sftp_packet(NET_SFTP_WRITE, $packet)) {
-                if ($mode & self::SOURCE_LOCAL_FILE) {
-                    fclose($fp);
-                }
-                return false;
-            }
-            $sent+= strlen($temp);
-            if (is_callable($progressCallback)) {
-                call_user_func($progressCallback, $sent);
-            }
-
-            $i++;
-
-            if ($i == NET_SFTP_QUEUE_SIZE) {
-                if (!$this->_read_put_responses($i)) {
-                    $i = 0;
-                    break;
-                }
-                $i = 0;
-            }
-        }
-
-        if (!$this->_read_put_responses($i)) {
-            if ($mode & self::SOURCE_LOCAL_FILE) {
-                fclose($fp);
-            }
-            $this->_close_handle($handle);
-            return false;
-        }
-
-        if ($mode & self::SOURCE_LOCAL_FILE) {
-            fclose($fp);
-        }
-
-        return $this->_close_handle($handle);
-    }
-
-    /**
-     * Reads multiple successive SSH_FXP_WRITE responses
-     *
-     * Sending an SSH_FXP_WRITE packet and immediately reading its response isn't as efficient as blindly sending out $i
-     * SSH_FXP_WRITEs, in succession, and then reading $i responses.
-     *
-     * @param int $i
-     * @return bool
-     * @access private
-     */
-    function _read_put_responses($i)
-    {
-        while ($i--) {
-            $response = $this->_get_sftp_packet();
-            if ($this->packet_type != NET_SFTP_STATUS) {
-                user_error('Expected SSH_FXP_STATUS');
-                return false;
-            }
-
-            if (strlen($response) < 4) {
-                return false;
-            }
-            extract(unpack('Nstatus', $this->_string_shift($response, 4)));
-            if ($status != NET_SFTP_STATUS_OK) {
-                $this->_logError($response, $status);
-                break;
-            }
-        }
-
-        return $i < 0;
-    }
-
-    /**
-     * Close handle
-     *
-     * @param string $handle
-     * @return bool
-     * @access private
-     */
-    function _close_handle($handle)
-    {
-        if (!$this->_send_sftp_packet(NET_SFTP_CLOSE, pack('Na*', strlen($handle), $handle))) {
-            return false;
-        }
-
-        // "The client MUST release all resources associated with the handle regardless of the status."
-        //  -- http://tools.ietf.org/html/draft-ietf-secsh-filexfer-13#section-8.1.3
-        $response = $this->_get_sftp_packet();
-        if ($this->packet_type != NET_SFTP_STATUS) {
-            user_error('Expected SSH_FXP_STATUS');
-            return false;
-        }
-
-        if (strlen($response) < 4) {
-            return false;
-        }
-        extract(unpack('Nstatus', $this->_string_shift($response, 4)));
-        if ($status != NET_SFTP_STATUS_OK) {
-            $this->_logError($response, $status);
-            return false;
-        }
-
-        return true;
-    }
-
-    /**
-     * Downloads a file from the SFTP server.
-     *
-     * Returns a string containing the contents of $remote_file if $local_file is left undefined or a boolean false if
-     * the operation was unsuccessful.  If $local_file is defined, returns true or false depending on the success of the
-     * operation.
-     *
-     * $offset and $length can be used to download files in chunks.
-     *
-     * @param string $remote_file
-     * @param string $local_file
-     * @param int $offset
-     * @param int $length
-     * @return mixed
-     * @access public
-     */
-    function get($remote_file, $local_file = false, $offset = 0, $length = -1)
-    {
-        if (!($this->bitmap & SSH2::MASK_LOGIN)) {
-            return false;
-        }
-
-        $remote_file = $this->_realpath($remote_file);
-        if ($remote_file === false) {
-            return false;
-        }
-
-        $packet = pack('Na*N2', strlen($remote_file), $remote_file, NET_SFTP_OPEN_READ, 0);
-        if (!$this->_send_sftp_packet(NET_SFTP_OPEN, $packet)) {
-            return false;
-        }
-
-        $response = $this->_get_sftp_packet();
-        switch ($this->packet_type) {
-            case NET_SFTP_HANDLE:
-                $handle = substr($response, 4);
-                break;
-            case NET_SFTP_STATUS: // presumably SSH_FX_NO_SUCH_FILE or SSH_FX_PERMISSION_DENIED
-                $this->_logError($response);
-                return false;
-            default:
-                user_error('Expected SSH_FXP_HANDLE or SSH_FXP_STATUS');
-                return false;
-        }
-
-        if (is_resource($local_file)) {
-            $fp = $local_file;
-            $stat = fstat($fp);
-            $res_offset = $stat['size'];
-        } else {
-            $res_offset = 0;
-            if ($local_file !== false) {
-                $fp = fopen($local_file, 'wb');
-                if (!$fp) {
-                    return false;
-                }
-            } else {
-                $content = '';
-            }
-        }
-
-        $fclose_check = $local_file !== false && !is_resource($local_file);
-
-        $start = $offset;
-        $read = 0;
-        while (true) {
-            $i = 0;
-
-            while ($i < NET_SFTP_QUEUE_SIZE && ($length < 0 || $read < $length)) {
-                $tempoffset = $start + $read;
-
-                $packet_size = $length > 0 ? min($this->max_sftp_packet, $length - $read) : $this->max_sftp_packet;
-
-                $packet = pack('Na*N3', strlen($handle), $handle, $tempoffset / 4294967296, $tempoffset, $packet_size);
-                if (!$this->_send_sftp_packet(NET_SFTP_READ, $packet)) {
-                    if ($fclose_check) {
-                        fclose($fp);
-                    }
-                    return false;
-                }
-                $packet = null;
-                $read+= $packet_size;
-                $i++;
-            }
-
-            if (!$i) {
-                break;
-            }
-
-            $clear_responses = false;
-            while ($i > 0) {
-                $i--;
-
-                if ($clear_responses) {
-                    $this->_get_sftp_packet();
-                    continue;
-                } else {
-                    $response = $this->_get_sftp_packet();
-                }
-
-                switch ($this->packet_type) {
-                    case NET_SFTP_DATA:
-                        $temp = substr($response, 4);
-                        $offset+= strlen($temp);
-                        if ($local_file === false) {
-                            $content.= $temp;
-                        } else {
-                            fputs($fp, $temp);
-                        }
-                        $temp = null;
-                        break;
-                    case NET_SFTP_STATUS:
-                        // could, in theory, return false if !strlen($content) but we'll hold off for the time being
-                        $this->_logError($response);
-                        $clear_responses = true; // don't break out of the loop yet, so we can read the remaining responses
-                        break;
-                    default:
-                        if ($fclose_check) {
-                            fclose($fp);
-                        }
-                        user_error('Expected SSH_FX_DATA or SSH_FXP_STATUS');
-                }
-                $response = null;
-            }
-
-            if ($clear_responses) {
-                break;
-            }
-        }
-
-        if ($length > 0 && $length <= $offset - $start) {
-            if ($local_file === false) {
-                $content = substr($content, 0, $length);
-            } else {
-                ftruncate($fp, $length + $res_offset);
-            }
-        }
-
-        if ($fclose_check) {
-            fclose($fp);
-        }
-
-        if (!$this->_close_handle($handle)) {
-            return false;
-        }
-
-        // if $content isn't set that means a file was written to
-        return isset($content) ? $content : true;
-    }
-
-    /**
-     * Deletes a file on the SFTP server.
-     *
-     * @param string $path
-     * @param bool $recursive
-     * @return bool
-     * @access public
-     */
-    function delete($path, $recursive = true)
-    {
-        if (!($this->bitmap & SSH2::MASK_LOGIN)) {
-            return false;
-        }
-
-        if (is_object($path)) {
-            // It's an object. Cast it as string before we check anything else.
-            $path = (string) $path;
-        }
-
-        if (!is_string($path) || $path == '') {
-            return false;
-        }
-
-        $path = $this->_realpath($path);
-        if ($path === false) {
-            return false;
-        }
-
-        // http://tools.ietf.org/html/draft-ietf-secsh-filexfer-13#section-8.3
-        if (!$this->_send_sftp_packet(NET_SFTP_REMOVE, pack('Na*', strlen($path), $path))) {
-            return false;
-        }
-
-        $response = $this->_get_sftp_packet();
-        if ($this->packet_type != NET_SFTP_STATUS) {
-            user_error('Expected SSH_FXP_STATUS');
-            return false;
-        }
-
-        // if $status isn't SSH_FX_OK it's probably SSH_FX_NO_SUCH_FILE or SSH_FX_PERMISSION_DENIED
-        if (strlen($response) < 4) {
-            return false;
-        }
-        extract(unpack('Nstatus', $this->_string_shift($response, 4)));
-        if ($status != NET_SFTP_STATUS_OK) {
-            $this->_logError($response, $status);
-            if (!$recursive) {
-                return false;
-            }
-            $i = 0;
-            $result = $this->_delete_recursive($path, $i);
-            $this->_read_put_responses($i);
-            return $result;
-        }
-
-        $this->_remove_from_stat_cache($path);
-
-        return true;
-    }
-
-    /**
-     * Recursively deletes directories on the SFTP server
-     *
-     * Minimizes directory lookups and SSH_FXP_STATUS requests for speed.
-     *
-     * @param string $path
-     * @param int $i
-     * @return bool
-     * @access private
-     */
-    function _delete_recursive($path, &$i)
-    {
-        if (!$this->_read_put_responses($i)) {
-            return false;
-        }
-        $i = 0;
-        $entries = $this->_list($path, true);
-
-        // normally $entries would have at least . and .. but it might not if the directories
-        // permissions didn't allow reading
-        if (empty($entries)) {
-            return false;
-        }
-
-        unset($entries['.'], $entries['..']);
-        foreach ($entries as $filename => $props) {
-            if (!isset($props['type'])) {
-                return false;
-            }
-
-            $temp = $path . '/' . $filename;
-            if ($props['type'] == NET_SFTP_TYPE_DIRECTORY) {
-                if (!$this->_delete_recursive($temp, $i)) {
-                    return false;
-                }
-            } else {
-                if (!$this->_send_sftp_packet(NET_SFTP_REMOVE, pack('Na*', strlen($temp), $temp))) {
-                    return false;
-                }
-                $this->_remove_from_stat_cache($temp);
-
-                $i++;
-
-                if ($i >= NET_SFTP_QUEUE_SIZE) {
-                    if (!$this->_read_put_responses($i)) {
-                        return false;
-                    }
-                    $i = 0;
-                }
-            }
-        }
-
-        if (!$this->_send_sftp_packet(NET_SFTP_RMDIR, pack('Na*', strlen($path), $path))) {
-            return false;
-        }
-        $this->_remove_from_stat_cache($path);
-
-        $i++;
-
-        if ($i >= NET_SFTP_QUEUE_SIZE) {
-            if (!$this->_read_put_responses($i)) {
-                return false;
-            }
-            $i = 0;
-        }
-
-        return true;
-    }
-
-    /**
-     * Checks whether a file or directory exists
-     *
-     * @param string $path
-     * @return bool
-     * @access public
-     */
-    function file_exists($path)
-    {
-        if ($this->use_stat_cache) {
-            $path = $this->_realpath($path);
-
-            $result = $this->_query_stat_cache($path);
-
-            if (isset($result)) {
-                // return true if $result is an array or if it's an stdClass object
-                return $result !== false;
-            }
-        }
-
-        return $this->stat($path) !== false;
-    }
-
-    /**
-     * Tells whether the filename is a directory
-     *
-     * @param string $path
-     * @return bool
-     * @access public
-     */
-    function is_dir($path)
-    {
-        $result = $this->_get_stat_cache_prop($path, 'type');
-        if ($result === false) {
-            return false;
-        }
-        return $result === NET_SFTP_TYPE_DIRECTORY;
-    }
-
-    /**
-     * Tells whether the filename is a regular file
-     *
-     * @param string $path
-     * @return bool
-     * @access public
-     */
-    function is_file($path)
-    {
-        $result = $this->_get_stat_cache_prop($path, 'type');
-        if ($result === false) {
-            return false;
-        }
-        return $result === NET_SFTP_TYPE_REGULAR;
-    }
-
-    /**
-     * Tells whether the filename is a symbolic link
-     *
-     * @param string $path
-     * @return bool
-     * @access public
-     */
-    function is_link($path)
-    {
-        $result = $this->_get_lstat_cache_prop($path, 'type');
-        if ($result === false) {
-            return false;
-        }
-        return $result === NET_SFTP_TYPE_SYMLINK;
-    }
-
-    /**
-     * Tells whether a file exists and is readable
-     *
-     * @param string $path
-     * @return bool
-     * @access public
-     */
-    function is_readable($path)
-    {
-        $path = $this->_realpath($path);
-
-        $packet = pack('Na*N2', strlen($path), $path, NET_SFTP_OPEN_READ, 0);
-        if (!$this->_send_sftp_packet(NET_SFTP_OPEN, $packet)) {
-            return false;
-        }
-
-        $response = $this->_get_sftp_packet();
-        switch ($this->packet_type) {
-            case NET_SFTP_HANDLE:
-                return true;
-            case NET_SFTP_STATUS: // presumably SSH_FX_NO_SUCH_FILE or SSH_FX_PERMISSION_DENIED
-                return false;
-            default:
-                user_error('Expected SSH_FXP_HANDLE or SSH_FXP_STATUS');
-                return false;
-        }
-    }
-
-    /**
-     * Tells whether the filename is writable
-     *
-     * @param string $path
-     * @return bool
-     * @access public
-     */
-    function is_writable($path)
-    {
-        $path = $this->_realpath($path);
-
-        $packet = pack('Na*N2', strlen($path), $path, NET_SFTP_OPEN_WRITE, 0);
-        if (!$this->_send_sftp_packet(NET_SFTP_OPEN, $packet)) {
-            return false;
-        }
-
-        $response = $this->_get_sftp_packet();
-        switch ($this->packet_type) {
-            case NET_SFTP_HANDLE:
-                return true;
-            case NET_SFTP_STATUS: // presumably SSH_FX_NO_SUCH_FILE or SSH_FX_PERMISSION_DENIED
-                return false;
-            default:
-                user_error('Expected SSH_FXP_HANDLE or SSH_FXP_STATUS');
-                return false;
-        }
-    }
-
-    /**
-     * Tells whether the filename is writeable
-     *
-     * Alias of is_writable
-     *
-     * @param string $path
-     * @return bool
-     * @access public
-     */
-    function is_writeable($path)
-    {
-        return $this->is_writable($path);
-    }
-
-    /**
-     * Gets last access time of file
-     *
-     * @param string $path
-     * @return mixed
-     * @access public
-     */
-    function fileatime($path)
-    {
-        return $this->_get_stat_cache_prop($path, 'atime');
-    }
-
-    /**
-     * Gets file modification time
-     *
-     * @param string $path
-     * @return mixed
-     * @access public
-     */
-    function filemtime($path)
-    {
-        return $this->_get_stat_cache_prop($path, 'mtime');
-    }
-
-    /**
-     * Gets file permissions
-     *
-     * @param string $path
-     * @return mixed
-     * @access public
-     */
-    function fileperms($path)
-    {
-        return $this->_get_stat_cache_prop($path, 'permissions');
-    }
-
-    /**
-     * Gets file owner
-     *
-     * @param string $path
-     * @return mixed
-     * @access public
-     */
-    function fileowner($path)
-    {
-        return $this->_get_stat_cache_prop($path, 'uid');
-    }
-
-    /**
-     * Gets file group
-     *
-     * @param string $path
-     * @return mixed
-     * @access public
-     */
-    function filegroup($path)
-    {
-        return $this->_get_stat_cache_prop($path, 'gid');
-    }
-
-    /**
-     * Gets file size
-     *
-     * @param string $path
-     * @return mixed
-     * @access public
-     */
-    function filesize($path)
-    {
-        return $this->_get_stat_cache_prop($path, 'size');
-    }
-
-    /**
-     * Gets file type
-     *
-     * @param string $path
-     * @return mixed
-     * @access public
-     */
-    function filetype($path)
-    {
-        $type = $this->_get_stat_cache_prop($path, 'type');
-        if ($type === false) {
-            return false;
-        }
-
-        switch ($type) {
-            case NET_SFTP_TYPE_BLOCK_DEVICE:
-                return 'block';
-            case NET_SFTP_TYPE_CHAR_DEVICE:
-                return 'char';
-            case NET_SFTP_TYPE_DIRECTORY:
-                return 'dir';
-            case NET_SFTP_TYPE_FIFO:
-                return 'fifo';
-            case NET_SFTP_TYPE_REGULAR:
-                return 'file';
-            case NET_SFTP_TYPE_SYMLINK:
-                return 'link';
-            default:
-                return false;
-        }
-    }
-
-    /**
-     * Return a stat properity
-     *
-     * Uses cache if appropriate.
-     *
-     * @param string $path
-     * @param string $prop
-     * @return mixed
-     * @access private
-     */
-    function _get_stat_cache_prop($path, $prop)
-    {
-        return $this->_get_xstat_cache_prop($path, $prop, 'stat');
-    }
-
-    /**
-     * Return an lstat properity
-     *
-     * Uses cache if appropriate.
-     *
-     * @param string $path
-     * @param string $prop
-     * @return mixed
-     * @access private
-     */
-    function _get_lstat_cache_prop($path, $prop)
-    {
-        return $this->_get_xstat_cache_prop($path, $prop, 'lstat');
-    }
-
-    /**
-     * Return a stat or lstat properity
-     *
-     * Uses cache if appropriate.
-     *
-     * @param string $path
-     * @param string $prop
-     * @return mixed
-     * @access private
-     */
-    function _get_xstat_cache_prop($path, $prop, $type)
-    {
-        if ($this->use_stat_cache) {
-            $path = $this->_realpath($path);
-
-            $result = $this->_query_stat_cache($path);
-
-            if (is_object($result) && isset($result->$type)) {
-                return $result->{$type}[$prop];
-            }
-        }
-
-        $result = $this->$type($path);
-
-        if ($result === false || !isset($result[$prop])) {
-            return false;
-        }
-
-        return $result[$prop];
-    }
-
-    /**
-     * Renames a file or a directory on the SFTP server
-     *
-     * @param string $oldname
-     * @param string $newname
-     * @return bool
-     * @access public
-     */
-    function rename($oldname, $newname)
-    {
-        if (!($this->bitmap & SSH2::MASK_LOGIN)) {
-            return false;
-        }
-
-        $oldname = $this->_realpath($oldname);
-        $newname = $this->_realpath($newname);
-        if ($oldname === false || $newname === false) {
-            return false;
-        }
-
-        // http://tools.ietf.org/html/draft-ietf-secsh-filexfer-13#section-8.3
-        $packet = pack('Na*Na*', strlen($oldname), $oldname, strlen($newname), $newname);
-        if (!$this->_send_sftp_packet(NET_SFTP_RENAME, $packet)) {
-            return false;
-        }
-
-        $response = $this->_get_sftp_packet();
-        if ($this->packet_type != NET_SFTP_STATUS) {
-            user_error('Expected SSH_FXP_STATUS');
-            return false;
-        }
-
-        // if $status isn't SSH_FX_OK it's probably SSH_FX_NO_SUCH_FILE or SSH_FX_PERMISSION_DENIED
-        if (strlen($response) < 4) {
-            return false;
-        }
-        extract(unpack('Nstatus', $this->_string_shift($response, 4)));
-        if ($status != NET_SFTP_STATUS_OK) {
-            $this->_logError($response, $status);
-            return false;
-        }
-
-        // don't move the stat cache entry over since this operation could very well change the
-        // atime and mtime attributes
-        //$this->_update_stat_cache($newname, $this->_query_stat_cache($oldname));
-        $this->_remove_from_stat_cache($oldname);
-        $this->_remove_from_stat_cache($newname);
-
-        return true;
-    }
-
-    /**
-     * Parse Attributes
-     *
-     * See '7.  File Attributes' of draft-ietf-secsh-filexfer-13 for more info.
-     *
-     * @param string $response
-     * @return array
-     * @access private
-     */
-    function _parseAttributes(&$response)
-    {
-        $attr = array();
-        if (strlen($response) < 4) {
-            user_error('Malformed file attributes');
-            return array();
-        }
-        extract(unpack('Nflags', $this->_string_shift($response, 4)));
-        // SFTPv4+ have a type field (a byte) that follows the above flag field
-        foreach ($this->attributes as $key => $value) {
-            switch ($flags & $key) {
-                case NET_SFTP_ATTR_SIZE: // 0x00000001
-                    // The size attribute is defined as an unsigned 64-bit integer.
-                    // The following will use floats on 32-bit platforms, if necessary.
-                    // As can be seen in the BigInteger class, floats are generally
-                    // IEEE 754 binary64 "double precision" on such platforms and
-                    // as such can represent integers of at least 2^50 without loss
-                    // of precision. Interpreted in filesize, 2^50 bytes = 1024 TiB.
-                    $attr['size'] = hexdec(bin2hex($this->_string_shift($response, 8)));
-                    break;
-                case NET_SFTP_ATTR_UIDGID: // 0x00000002 (SFTPv3 only)
-                    if (strlen($response) < 8) {
-                        user_error('Malformed file attributes');
-                        return $attr;
-                    }
-                    $attr+= unpack('Nuid/Ngid', $this->_string_shift($response, 8));
-                    break;
-                case NET_SFTP_ATTR_PERMISSIONS: // 0x00000004
-                    if (strlen($response) < 4) {
-                        user_error('Malformed file attributes');
-                        return $attr;
-                    }
-                    $attr+= unpack('Npermissions', $this->_string_shift($response, 4));
-                    // mode == permissions; permissions was the original array key and is retained for bc purposes.
-                    // mode was added because that's the more industry standard terminology
-                    $attr+= array('mode' => $attr['permissions']);
-                    $fileType = $this->_parseMode($attr['permissions']);
-                    if ($fileType !== false) {
-                        $attr+= array('type' => $fileType);
-                    }
-                    break;
-                case NET_SFTP_ATTR_ACCESSTIME: // 0x00000008
-                    if (strlen($response) < 8) {
-                        user_error('Malformed file attributes');
-                        return $attr;
-                    }
-                    $attr+= unpack('Natime/Nmtime', $this->_string_shift($response, 8));
-                    break;
-                case NET_SFTP_ATTR_EXTENDED: // 0x80000000
-                    if (strlen($response) < 4) {
-                        user_error('Malformed file attributes');
-                        return $attr;
-                    }
-                    extract(unpack('Ncount', $this->_string_shift($response, 4)));
-                    for ($i = 0; $i < $count; $i++) {
-                        if (strlen($response) < 4) {
-                            user_error('Malformed file attributes');
-                            return $attr;
-                        }
-                        extract(unpack('Nlength', $this->_string_shift($response, 4)));
-                        $key = $this->_string_shift($response, $length);
-                        if (strlen($response) < 4) {
-                            user_error('Malformed file attributes');
-                            return $attr;
-                        }
-                        extract(unpack('Nlength', $this->_string_shift($response, 4)));
-                        $attr[$key] = $this->_string_shift($response, $length);
-                    }
-            }
-        }
-        return $attr;
-    }
-
-    /**
-     * Attempt to identify the file type
-     *
-     * Quoting the SFTP RFC, "Implementations MUST NOT send bits that are not defined" but they seem to anyway
-     *
-     * @param int $mode
-     * @return int
-     * @access private
-     */
-    function _parseMode($mode)
-    {
-        // values come from http://lxr.free-electrons.com/source/include/uapi/linux/stat.h#L12
-        // see, also, http://linux.die.net/man/2/stat
-        switch ($mode & 0170000) {// ie. 1111 0000 0000 0000
-            case 0000000: // no file type specified - figure out the file type using alternative means
-                return false;
-            case 0040000:
-                return NET_SFTP_TYPE_DIRECTORY;
-            case 0100000:
-                return NET_SFTP_TYPE_REGULAR;
-            case 0120000:
-                return NET_SFTP_TYPE_SYMLINK;
-            // new types introduced in SFTPv5+
-            // http://tools.ietf.org/html/draft-ietf-secsh-filexfer-05#section-5.2
-            case 0010000: // named pipe (fifo)
-                return NET_SFTP_TYPE_FIFO;
-            case 0020000: // character special
-                return NET_SFTP_TYPE_CHAR_DEVICE;
-            case 0060000: // block special
-                return NET_SFTP_TYPE_BLOCK_DEVICE;
-            case 0140000: // socket
-                return NET_SFTP_TYPE_SOCKET;
-            case 0160000: // whiteout
-                // "SPECIAL should be used for files that are of
-                //  a known type which cannot be expressed in the protocol"
-                return NET_SFTP_TYPE_SPECIAL;
-            default:
-                return NET_SFTP_TYPE_UNKNOWN;
-        }
-    }
-
-    /**
-     * Parse Longname
-     *
-     * SFTPv3 doesn't provide any easy way of identifying a file type.  You could try to open
-     * a file as a directory and see if an error is returned or you could try to parse the
-     * SFTPv3-specific longname field of the SSH_FXP_NAME packet.  That's what this function does.
-     * The result is returned using the
-     * {@link http://tools.ietf.org/html/draft-ietf-secsh-filexfer-04#section-5.2 SFTPv4 type constants}.
-     *
-     * If the longname is in an unrecognized format bool(false) is returned.
-     *
-     * @param string $longname
-     * @return mixed
-     * @access private
-     */
-    function _parseLongname($longname)
-    {
-        // http://en.wikipedia.org/wiki/Unix_file_types
-        // http://en.wikipedia.org/wiki/Filesystem_permissions#Notation_of_traditional_Unix_permissions
-        if (preg_match('#^[^/]([r-][w-][xstST-]){3}#', $longname)) {
-            switch ($longname[0]) {
-                case '-':
-                    return NET_SFTP_TYPE_REGULAR;
-                case 'd':
-                    return NET_SFTP_TYPE_DIRECTORY;
-                case 'l':
-                    return NET_SFTP_TYPE_SYMLINK;
-                default:
-                    return NET_SFTP_TYPE_SPECIAL;
-            }
-        }
-
-        return false;
-    }
-
-    /**
-     * Sends SFTP Packets
-     *
-     * See '6. General Packet Format' of draft-ietf-secsh-filexfer-13 for more info.
-     *
-     * @param int $type
-     * @param string $data
-     * @see self::_get_sftp_packet()
-     * @see self::_send_channel_packet()
-     * @return bool
-     * @access private
-     */
-    function _send_sftp_packet($type, $data)
-    {
-        $packet = $this->request_id !== false ?
-            pack('NCNa*', strlen($data) + 5, $type, $this->request_id, $data) :
-            pack('NCa*',  strlen($data) + 1, $type, $data);
-
-        $start = strtok(microtime(), ' ') + strtok(''); // http://php.net/microtime#61838
-        $result = $this->_send_channel_packet(self::CHANNEL, $packet);
-        $stop = strtok(microtime(), ' ') + strtok('');
-
-        if (defined('NET_SFTP_LOGGING')) {
-            $packet_type = '-> ' . $this->packet_types[$type] .
-                           ' (' . round($stop - $start, 4) . 's)';
-            if (NET_SFTP_LOGGING == self::LOG_REALTIME) {
-                echo "
\r\n" . $this->_format_log(array($data), array($packet_type)) . "\r\n
\r\n";
-                flush();
-                ob_flush();
-            } else {
-                $this->packet_type_log[] = $packet_type;
-                if (NET_SFTP_LOGGING == self::LOG_COMPLEX) {
-                    $this->packet_log[] = $data;
-                }
-            }
-        }
-
-        return $result;
-    }
-
-    /**
-     * Receives SFTP Packets
-     *
-     * See '6. General Packet Format' of draft-ietf-secsh-filexfer-13 for more info.
-     *
-     * Incidentally, the number of SSH_MSG_CHANNEL_DATA messages has no bearing on the number of SFTP packets present.
-     * There can be one SSH_MSG_CHANNEL_DATA messages containing two SFTP packets or there can be two SSH_MSG_CHANNEL_DATA
-     * messages containing one SFTP packet.
-     *
-     * @see self::_send_sftp_packet()
-     * @return string
-     * @access private
-     */
-    function _get_sftp_packet()
-    {
-        $this->curTimeout = false;
-
-        $start = strtok(microtime(), ' ') + strtok(''); // http://php.net/microtime#61838
-
-        // SFTP packet length
-        while (strlen($this->packet_buffer) < 4) {
-            $temp = $this->_get_channel_packet(self::CHANNEL);
-            if (is_bool($temp)) {
-                $this->packet_type = false;
-                $this->packet_buffer = '';
-                return false;
-            }
-            $this->packet_buffer.= $temp;
-        }
-        if (strlen($this->packet_buffer) < 4) {
-            return false;
-        }
-        extract(unpack('Nlength', $this->_string_shift($this->packet_buffer, 4)));
-        $tempLength = $length;
-        $tempLength-= strlen($this->packet_buffer);
-
-        // SFTP packet type and data payload
-        while ($tempLength > 0) {
-            $temp = $this->_get_channel_packet(self::CHANNEL);
-            if (is_bool($temp)) {
-                $this->packet_type = false;
-                $this->packet_buffer = '';
-                return false;
-            }
-            $this->packet_buffer.= $temp;
-            $tempLength-= strlen($temp);
-        }
-
-        $stop = strtok(microtime(), ' ') + strtok('');
-
-        $this->packet_type = ord($this->_string_shift($this->packet_buffer));
-
-        if ($this->request_id !== false) {
-            $this->_string_shift($this->packet_buffer, 4); // remove the request id
-            $length-= 5; // account for the request id and the packet type
-        } else {
-            $length-= 1; // account for the packet type
-        }
-
-        $packet = $this->_string_shift($this->packet_buffer, $length);
-
-        if (defined('NET_SFTP_LOGGING')) {
-            $packet_type = '<- ' . $this->packet_types[$this->packet_type] .
-                           ' (' . round($stop - $start, 4) . 's)';
-            if (NET_SFTP_LOGGING == self::LOG_REALTIME) {
-                echo "
\r\n" . $this->_format_log(array($packet), array($packet_type)) . "\r\n
\r\n";
-                flush();
-                ob_flush();
-            } else {
-                $this->packet_type_log[] = $packet_type;
-                if (NET_SFTP_LOGGING == self::LOG_COMPLEX) {
-                    $this->packet_log[] = $packet;
-                }
-            }
-        }
-
-        return $packet;
-    }
-
-    /**
-     * Returns a log of the packets that have been sent and received.
-     *
-     * Returns a string if NET_SFTP_LOGGING == NET_SFTP_LOG_COMPLEX, an array if NET_SFTP_LOGGING == NET_SFTP_LOG_SIMPLE and false if !defined('NET_SFTP_LOGGING')
-     *
-     * @access public
-     * @return string or Array
-     */
-    function getSFTPLog()
-    {
-        if (!defined('NET_SFTP_LOGGING')) {
-            return false;
-        }
-
-        switch (NET_SFTP_LOGGING) {
-            case self::LOG_COMPLEX:
-                return $this->_format_log($this->packet_log, $this->packet_type_log);
-                break;
-            //case self::LOG_SIMPLE:
-            default:
-                return $this->packet_type_log;
-        }
-    }
-
-    /**
-     * Returns all errors
-     *
-     * @return string
-     * @access public
-     */
-    function getSFTPErrors()
-    {
-        return $this->sftp_errors;
-    }
-
-    /**
-     * Returns the last error
-     *
-     * @return string
-     * @access public
-     */
-    function getLastSFTPError()
-    {
-        return count($this->sftp_errors) ? $this->sftp_errors[count($this->sftp_errors) - 1] : '';
-    }
-
-    /**
-     * Get supported SFTP versions
-     *
-     * @return array
-     * @access public
-     */
-    function getSupportedVersions()
-    {
-        $temp = array('version' => $this->version);
-        if (isset($this->extensions['versions'])) {
-            $temp['extensions'] = $this->extensions['versions'];
-        }
-        return $temp;
-    }
-
-    /**
-     * Disconnect
-     *
-     * @param int $reason
-     * @return bool
-     * @access private
-     */
-    function _disconnect($reason)
-    {
-        $this->pwd = false;
-        parent::_disconnect($reason);
-    }
-}
diff --git a/mayor-orig/www/include/share/googleapi/phpseclib/phpseclib/phpseclib/Net/SFTP/Stream.php b/mayor-orig/www/include/share/googleapi/phpseclib/phpseclib/phpseclib/Net/SFTP/Stream.php
deleted file mode 100644
index 08d726ca..00000000
--- a/mayor-orig/www/include/share/googleapi/phpseclib/phpseclib/phpseclib/Net/SFTP/Stream.php
+++ /dev/null
@@ -1,795 +0,0 @@
-
- * @copyright 2013 Jim Wigginton
- * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
- * @link      http://phpseclib.sourceforge.net
- */
-
-namespace phpseclib\Net\SFTP;
-
-use phpseclib\Crypt\RSA;
-use phpseclib\Net\SFTP;
-
-/**
- * SFTP Stream Wrapper
- *
- * @package SFTP
- * @author  Jim Wigginton 
- * @access  public
- */
-class Stream
-{
-    /**
-     * SFTP instances
-     *
-     * Rather than re-create the connection we re-use instances if possible
-     *
-     * @var array
-     */
-    static $instances;
-
-    /**
-     * SFTP instance
-     *
-     * @var object
-     * @access private
-     */
-    var $sftp;
-
-    /**
-     * Path
-     *
-     * @var string
-     * @access private
-     */
-    var $path;
-
-    /**
-     * Mode
-     *
-     * @var string
-     * @access private
-     */
-    var $mode;
-
-    /**
-     * Position
-     *
-     * @var int
-     * @access private
-     */
-    var $pos;
-
-    /**
-     * Size
-     *
-     * @var int
-     * @access private
-     */
-    var $size;
-
-    /**
-     * Directory entries
-     *
-     * @var array
-     * @access private
-     */
-    var $entries;
-
-    /**
-     * EOF flag
-     *
-     * @var bool
-     * @access private
-     */
-    var $eof;
-
-    /**
-     * Context resource
-     *
-     * Technically this needs to be publically accessible so PHP can set it directly
-     *
-     * @var resource
-     * @access public
-     */
-    var $context;
-
-    /**
-     * Notification callback function
-     *
-     * @var callable
-     * @access public
-     */
-    var $notification;
-
-    /**
-     * Registers this class as a URL wrapper.
-     *
-     * @param string $protocol The wrapper name to be registered.
-     * @return bool True on success, false otherwise.
-     * @access public
-     */
-    static function register($protocol = 'sftp')
-    {
-        if (in_array($protocol, stream_get_wrappers(), true)) {
-            return false;
-        }
-        return stream_wrapper_register($protocol, get_called_class());
-    }
-
-    /**
-     * The Constructor
-     *
-     * @access public
-     */
-    function __construct()
-    {
-        if (defined('NET_SFTP_STREAM_LOGGING')) {
-            echo "__construct()\r\n";
-        }
-    }
-
-    /**
-     * Path Parser
-     *
-     * Extract a path from a URI and actually connect to an SSH server if appropriate
-     *
-     * If "notification" is set as a context parameter the message code for successful login is
-     * NET_SSH2_MSG_USERAUTH_SUCCESS. For a failed login it's NET_SSH2_MSG_USERAUTH_FAILURE.
-     *
-     * @param string $path
-     * @return string
-     * @access private
-     */
-    function _parse_path($path)
-    {
-        $orig = $path;
-        extract(parse_url($path) + array('port' => 22));
-        if (isset($query)) {
-            $path.= '?' . $query;
-        } elseif (preg_match('/(\?|\?#)$/', $orig)) {
-            $path.= '?';
-        }
-        if (isset($fragment)) {
-            $path.= '#' . $fragment;
-        } elseif ($orig[strlen($orig) - 1] == '#') {
-            $path.= '#';
-        }
-
-        if (!isset($host)) {
-            return false;
-        }
-
-        if (isset($this->context)) {
-            $context = stream_context_get_params($this->context);
-            if (isset($context['notification'])) {
-                $this->notification = $context['notification'];
-            }
-        }
-
-        if ($host[0] == '$') {
-            $host = substr($host, 1);
-            global $$host;
-            if (($$host instanceof SFTP) === false) {
-                return false;
-            }
-            $this->sftp = $$host;
-        } else {
-            if (isset($this->context)) {
-                $context = stream_context_get_options($this->context);
-            }
-            if (isset($context[$scheme]['session'])) {
-                $sftp = $context[$scheme]['session'];
-            }
-            if (isset($context[$scheme]['sftp'])) {
-                $sftp = $context[$scheme]['sftp'];
-            }
-            if (isset($sftp) && $sftp instanceof SFTP) {
-                $this->sftp = $sftp;
-                return $path;
-            }
-            if (isset($context[$scheme]['username'])) {
-                $user = $context[$scheme]['username'];
-            }
-            if (isset($context[$scheme]['password'])) {
-                $pass = $context[$scheme]['password'];
-            }
-            if (isset($context[$scheme]['privkey']) && $context[$scheme]['privkey'] instanceof RSA) {
-                $pass = $context[$scheme]['privkey'];
-            }
-
-            if (!isset($user) || !isset($pass)) {
-                return false;
-            }
-
-            // casting $pass to a string is necessary in the event that it's a \phpseclib\Crypt\RSA object
-            if (isset(self::$instances[$host][$port][$user][(string) $pass])) {
-                $this->sftp = self::$instances[$host][$port][$user][(string) $pass];
-            } else {
-                $this->sftp = new SFTP($host, $port);
-                $this->sftp->disableStatCache();
-                if (isset($this->notification) && is_callable($this->notification)) {
-                    /* if !is_callable($this->notification) we could do this:
-
-                       user_error('fopen(): failed to call user notifier', E_USER_WARNING);
-
-                       the ftp wrapper gives errors like that when the notifier isn't callable.
-                       i've opted not to do that, however, since the ftp wrapper gives the line
-                       on which the fopen occurred as the line number - not the line that the
-                       user_error is on.
-                    */
-                    call_user_func($this->notification, STREAM_NOTIFY_CONNECT, STREAM_NOTIFY_SEVERITY_INFO, '', 0, 0, 0);
-                    call_user_func($this->notification, STREAM_NOTIFY_AUTH_REQUIRED, STREAM_NOTIFY_SEVERITY_INFO, '', 0, 0, 0);
-                    if (!$this->sftp->login($user, $pass)) {
-                        call_user_func($this->notification, STREAM_NOTIFY_AUTH_RESULT, STREAM_NOTIFY_SEVERITY_ERR, 'Login Failure', NET_SSH2_MSG_USERAUTH_FAILURE, 0, 0);
-                        return false;
-                    }
-                    call_user_func($this->notification, STREAM_NOTIFY_AUTH_RESULT, STREAM_NOTIFY_SEVERITY_INFO, 'Login Success', NET_SSH2_MSG_USERAUTH_SUCCESS, 0, 0);
-                } else {
-                    if (!$this->sftp->login($user, $pass)) {
-                        return false;
-                    }
-                }
-                self::$instances[$host][$port][$user][(string) $pass] = $this->sftp;
-            }
-        }
-
-        return $path;
-    }
-
-    /**
-     * Opens file or URL
-     *
-     * @param string $path
-     * @param string $mode
-     * @param int $options
-     * @param string $opened_path
-     * @return bool
-     * @access public
-     */
-    function _stream_open($path, $mode, $options, &$opened_path)
-    {
-        $path = $this->_parse_path($path);
-
-        if ($path === false) {
-            return false;
-        }
-        $this->path = $path;
-
-        $this->size = $this->sftp->size($path);
-        $this->mode = preg_replace('#[bt]$#', '', $mode);
-        $this->eof = false;
-
-        if ($this->size === false) {
-            if ($this->mode[0] == 'r') {
-                return false;
-            } else {
-                $this->sftp->touch($path);
-                $this->size = 0;
-            }
-        } else {
-            switch ($this->mode[0]) {
-                case 'x':
-                    return false;
-                case 'w':
-                    $this->sftp->truncate($path, 0);
-                    $this->size = 0;
-            }
-        }
-
-        $this->pos = $this->mode[0] != 'a' ? 0 : $this->size;
-
-        return true;
-    }
-
-    /**
-     * Read from stream
-     *
-     * @param int $count
-     * @return mixed
-     * @access public
-     */
-    function _stream_read($count)
-    {
-        switch ($this->mode) {
-            case 'w':
-            case 'a':
-            case 'x':
-            case 'c':
-                return false;
-        }
-
-        // commented out because some files - eg. /dev/urandom - will say their size is 0 when in fact it's kinda infinite
-        //if ($this->pos >= $this->size) {
-        //    $this->eof = true;
-        //    return false;
-        //}
-
-        $result = $this->sftp->get($this->path, false, $this->pos, $count);
-        if (isset($this->notification) && is_callable($this->notification)) {
-            if ($result === false) {
-                call_user_func($this->notification, STREAM_NOTIFY_FAILURE, STREAM_NOTIFY_SEVERITY_ERR, $this->sftp->getLastSFTPError(), NET_SFTP_OPEN, 0, 0);
-                return 0;
-            }
-            // seems that PHP calls stream_read in 8k chunks
-            call_user_func($this->notification, STREAM_NOTIFY_PROGRESS, STREAM_NOTIFY_SEVERITY_INFO, '', 0, strlen($result), $this->size);
-        }
-
-        if (empty($result)) { // ie. false or empty string
-            $this->eof = true;
-            return false;
-        }
-        $this->pos+= strlen($result);
-
-        return $result;
-    }
-
-    /**
-     * Write to stream
-     *
-     * @param string $data
-     * @return mixed
-     * @access public
-     */
-    function _stream_write($data)
-    {
-        switch ($this->mode) {
-            case 'r':
-                return false;
-        }
-
-        $result = $this->sftp->put($this->path, $data, SFTP::SOURCE_STRING, $this->pos);
-        if (isset($this->notification) && is_callable($this->notification)) {
-            if (!$result) {
-                call_user_func($this->notification, STREAM_NOTIFY_FAILURE, STREAM_NOTIFY_SEVERITY_ERR, $this->sftp->getLastSFTPError(), NET_SFTP_OPEN, 0, 0);
-                return 0;
-            }
-            // seems that PHP splits up strings into 8k blocks before calling stream_write
-            call_user_func($this->notification, STREAM_NOTIFY_PROGRESS, STREAM_NOTIFY_SEVERITY_INFO, '', 0, strlen($data), strlen($data));
-        }
-
-        if ($result === false) {
-            return false;
-        }
-        $this->pos+= strlen($data);
-        if ($this->pos > $this->size) {
-            $this->size = $this->pos;
-        }
-        $this->eof = false;
-        return strlen($data);
-    }
-
-    /**
-     * Retrieve the current position of a stream
-     *
-     * @return int
-     * @access public
-     */
-    function _stream_tell()
-    {
-        return $this->pos;
-    }
-
-    /**
-     * Tests for end-of-file on a file pointer
-     *
-     * In my testing there are four classes functions that normally effect the pointer:
-     * fseek, fputs  / fwrite, fgets / fread and ftruncate.
-     *
-     * Only fgets / fread, however, results in feof() returning true. do fputs($fp, 'aaa') on a blank file and feof()
-     * will return false. do fread($fp, 1) and feof() will then return true. do fseek($fp, 10) on ablank file and feof()
-     * will return false. do fread($fp, 1) and feof() will then return true.
-     *
-     * @return bool
-     * @access public
-     */
-    function _stream_eof()
-    {
-        return $this->eof;
-    }
-
-    /**
-     * Seeks to specific location in a stream
-     *
-     * @param int $offset
-     * @param int $whence
-     * @return bool
-     * @access public
-     */
-    function _stream_seek($offset, $whence)
-    {
-        switch ($whence) {
-            case SEEK_SET:
-                if ($offset >= $this->size || $offset < 0) {
-                    return false;
-                }
-                break;
-            case SEEK_CUR:
-                $offset+= $this->pos;
-                break;
-            case SEEK_END:
-                $offset+= $this->size;
-        }
-
-        $this->pos = $offset;
-        $this->eof = false;
-        return true;
-    }
-
-    /**
-     * Change stream options
-     *
-     * @param string $path
-     * @param int $option
-     * @param mixed $var
-     * @return bool
-     * @access public
-     */
-    function _stream_metadata($path, $option, $var)
-    {
-        $path = $this->_parse_path($path);
-        if ($path === false) {
-            return false;
-        }
-
-        // stream_metadata was introduced in PHP 5.4.0 but as of 5.4.11 the constants haven't been defined
-        // see http://www.php.net/streamwrapper.stream-metadata and https://bugs.php.net/64246
-        //     and https://github.com/php/php-src/blob/master/main/php_streams.h#L592
-        switch ($option) {
-            case 1: // PHP_STREAM_META_TOUCH
-                return $this->sftp->touch($path, $var[0], $var[1]);
-            case 2: // PHP_STREAM_OWNER_NAME
-            case 3: // PHP_STREAM_GROUP_NAME
-                return false;
-            case 4: // PHP_STREAM_META_OWNER
-                return $this->sftp->chown($path, $var);
-            case 5: // PHP_STREAM_META_GROUP
-                return $this->sftp->chgrp($path, $var);
-            case 6: // PHP_STREAM_META_ACCESS
-                return $this->sftp->chmod($path, $var) !== false;
-        }
-    }
-
-    /**
-     * Retrieve the underlaying resource
-     *
-     * @param int $cast_as
-     * @return resource
-     * @access public
-     */
-    function _stream_cast($cast_as)
-    {
-        return $this->sftp->fsock;
-    }
-
-    /**
-     * Advisory file locking
-     *
-     * @param int $operation
-     * @return bool
-     * @access public
-     */
-    function _stream_lock($operation)
-    {
-        return false;
-    }
-
-    /**
-     * Renames a file or directory
-     *
-     * Attempts to rename oldname to newname, moving it between directories if necessary.
-     * If newname exists, it will be overwritten.  This is a departure from what \phpseclib\Net\SFTP
-     * does.
-     *
-     * @param string $path_from
-     * @param string $path_to
-     * @return bool
-     * @access public
-     */
-    function _rename($path_from, $path_to)
-    {
-        $path1 = parse_url($path_from);
-        $path2 = parse_url($path_to);
-        unset($path1['path'], $path2['path']);
-        if ($path1 != $path2) {
-            return false;
-        }
-
-        $path_from = $this->_parse_path($path_from);
-        $path_to = parse_url($path_to);
-        if ($path_from === false) {
-            return false;
-        }
-
-        $path_to = $path_to['path']; // the $component part of parse_url() was added in PHP 5.1.2
-        // "It is an error if there already exists a file with the name specified by newpath."
-        //  -- http://tools.ietf.org/html/draft-ietf-secsh-filexfer-02#section-6.5
-        if (!$this->sftp->rename($path_from, $path_to)) {
-            if ($this->sftp->stat($path_to)) {
-                return $this->sftp->delete($path_to, true) && $this->sftp->rename($path_from, $path_to);
-            }
-            return false;
-        }
-
-        return true;
-    }
-
-    /**
-     * Open directory handle
-     *
-     * The only $options is "whether or not to enforce safe_mode (0x04)". Since safe mode was deprecated in 5.3 and
-     * removed in 5.4 I'm just going to ignore it.
-     *
-     * Also, nlist() is the best that this function is realistically going to be able to do. When an SFTP client
-     * sends a SSH_FXP_READDIR packet you don't generally get info on just one file but on multiple files. Quoting
-     * the SFTP specs:
-     *
-     *    The SSH_FXP_NAME response has the following format:
-     *
-     *        uint32     id
-     *        uint32     count
-     *        repeats count times:
-     *                string     filename
-     *                string     longname
-     *                ATTRS      attrs
-     *
-     * @param string $path
-     * @param int $options
-     * @return bool
-     * @access public
-     */
-    function _dir_opendir($path, $options)
-    {
-        $path = $this->_parse_path($path);
-        if ($path === false) {
-            return false;
-        }
-        $this->pos = 0;
-        $this->entries = $this->sftp->nlist($path);
-        return $this->entries !== false;
-    }
-
-    /**
-     * Read entry from directory handle
-     *
-     * @return mixed
-     * @access public
-     */
-    function _dir_readdir()
-    {
-        if (isset($this->entries[$this->pos])) {
-            return $this->entries[$this->pos++];
-        }
-        return false;
-    }
-
-    /**
-     * Rewind directory handle
-     *
-     * @return bool
-     * @access public
-     */
-    function _dir_rewinddir()
-    {
-        $this->pos = 0;
-        return true;
-    }
-
-    /**
-     * Close directory handle
-     *
-     * @return bool
-     * @access public
-     */
-    function _dir_closedir()
-    {
-        return true;
-    }
-
-    /**
-     * Create a directory
-     *
-     * Only valid $options is STREAM_MKDIR_RECURSIVE
-     *
-     * @param string $path
-     * @param int $mode
-     * @param int $options
-     * @return bool
-     * @access public
-     */
-    function _mkdir($path, $mode, $options)
-    {
-        $path = $this->_parse_path($path);
-        if ($path === false) {
-            return false;
-        }
-
-        return $this->sftp->mkdir($path, $mode, $options & STREAM_MKDIR_RECURSIVE);
-    }
-
-    /**
-     * Removes a directory
-     *
-     * Only valid $options is STREAM_MKDIR_RECURSIVE per , however,
-     *   does not have a $recursive parameter as mkdir() does so I don't know how
-     * STREAM_MKDIR_RECURSIVE is supposed to be set. Also, when I try it out with rmdir() I get 8 as
-     * $options. What does 8 correspond to?
-     *
-     * @param string $path
-     * @param int $mode
-     * @param int $options
-     * @return bool
-     * @access public
-     */
-    function _rmdir($path, $options)
-    {
-        $path = $this->_parse_path($path);
-        if ($path === false) {
-            return false;
-        }
-
-        return $this->sftp->rmdir($path);
-    }
-
-    /**
-     * Flushes the output
-     *
-     * See . Always returns true because \phpseclib\Net\SFTP doesn't cache stuff before writing
-     *
-     * @return bool
-     * @access public
-     */
-    function _stream_flush()
-    {
-        return true;
-    }
-
-    /**
-     * Retrieve information about a file resource
-     *
-     * @return mixed
-     * @access public
-     */
-    function _stream_stat()
-    {
-        $results = $this->sftp->stat($this->path);
-        if ($results === false) {
-            return false;
-        }
-        return $results;
-    }
-
-    /**
-     * Delete a file
-     *
-     * @param string $path
-     * @return bool
-     * @access public
-     */
-    function _unlink($path)
-    {
-        $path = $this->_parse_path($path);
-        if ($path === false) {
-            return false;
-        }
-
-        return $this->sftp->delete($path, false);
-    }
-
-    /**
-     * Retrieve information about a file
-     *
-     * Ignores the STREAM_URL_STAT_QUIET flag because the entirety of \phpseclib\Net\SFTP\Stream is quiet by default
-     * might be worthwhile to reconstruct bits 12-16 (ie. the file type) if mode doesn't have them but we'll
-     * cross that bridge when and if it's reached
-     *
-     * @param string $path
-     * @param int $flags
-     * @return mixed
-     * @access public
-     */
-    function _url_stat($path, $flags)
-    {
-        $path = $this->_parse_path($path);
-        if ($path === false) {
-            return false;
-        }
-
-        $results = $flags & STREAM_URL_STAT_LINK ? $this->sftp->lstat($path) : $this->sftp->stat($path);
-        if ($results === false) {
-            return false;
-        }
-
-        return $results;
-    }
-
-    /**
-     * Truncate stream
-     *
-     * @param int $new_size
-     * @return bool
-     * @access public
-     */
-    function _stream_truncate($new_size)
-    {
-        if (!$this->sftp->truncate($this->path, $new_size)) {
-            return false;
-        }
-
-        $this->eof = false;
-        $this->size = $new_size;
-
-        return true;
-    }
-
-    /**
-     * Change stream options
-     *
-     * STREAM_OPTION_WRITE_BUFFER isn't supported for the same reason stream_flush isn't.
-     * The other two aren't supported because of limitations in \phpseclib\Net\SFTP.
-     *
-     * @param int $option
-     * @param int $arg1
-     * @param int $arg2
-     * @return bool
-     * @access public
-     */
-    function _stream_set_option($option, $arg1, $arg2)
-    {
-        return false;
-    }
-
-    /**
-     * Close an resource
-     *
-     * @access public
-     */
-    function _stream_close()
-    {
-    }
-
-    /**
-     * __call Magic Method
-     *
-     * When you're utilizing an SFTP stream you're not calling the methods in this class directly - PHP is calling them for you.
-     * Which kinda begs the question... what methods is PHP calling and what parameters is it passing to them? This function
-     * lets you figure that out.
-     *
-     * If NET_SFTP_STREAM_LOGGING is defined all calls will be output on the screen and then (regardless of whether or not
-     * NET_SFTP_STREAM_LOGGING is enabled) the parameters will be passed through to the appropriate method.
-     *
-     * @param string
-     * @param array
-     * @return mixed
-     * @access public
-     */
-    function __call($name, $arguments)
-    {
-        if (defined('NET_SFTP_STREAM_LOGGING')) {
-            echo $name . '(';
-            $last = count($arguments) - 1;
-            foreach ($arguments as $i => $argument) {
-                var_export($argument);
-                if ($i != $last) {
-                    echo ',';
-                }
-            }
-            echo ")\r\n";
-        }
-        $name = '_' . $name;
-        if (!method_exists($this, $name)) {
-            return false;
-        }
-        return call_user_func_array(array($this, $name), $arguments);
-    }
-}
diff --git a/mayor-orig/www/include/share/googleapi/phpseclib/phpseclib/phpseclib/Net/SSH1.php b/mayor-orig/www/include/share/googleapi/phpseclib/phpseclib/phpseclib/Net/SSH1.php
deleted file mode 100644
index 9e608f4b..00000000
--- a/mayor-orig/www/include/share/googleapi/phpseclib/phpseclib/phpseclib/Net/SSH1.php
+++ /dev/null
@@ -1,1642 +0,0 @@
-
- * login('username', 'password')) {
- *        exit('Login Failed');
- *    }
- *
- *    echo $ssh->exec('ls -la');
- * ?>
- * 
- *
- * Here's another short example:
- * 
- * login('username', 'password')) {
- *        exit('Login Failed');
- *    }
- *
- *    echo $ssh->read('username@username:~$');
- *    $ssh->write("ls -la\n");
- *    echo $ssh->read('username@username:~$');
- * ?>
- * 
- *
- * More information on the SSHv1 specification can be found by reading
- * {@link http://www.snailbook.com/docs/protocol-1.5.txt protocol-1.5.txt}.
- *
- * @category  Net
- * @package   SSH1
- * @author    Jim Wigginton 
- * @copyright 2007 Jim Wigginton
- * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
- * @link      http://phpseclib.sourceforge.net
- */
-
-namespace phpseclib\Net;
-
-use phpseclib\Crypt\DES;
-use phpseclib\Crypt\Random;
-use phpseclib\Crypt\TripleDES;
-use phpseclib\Math\BigInteger;
-
-/**
- * Pure-PHP implementation of SSHv1.
- *
- * @package SSH1
- * @author  Jim Wigginton 
- * @access  public
- */
-class SSH1
-{
-    /**#@+
-     * Encryption Methods
-     *
-     * @see \phpseclib\Net\SSH1::getSupportedCiphers()
-     * @access public
-     */
-    /**
-     * No encryption
-     *
-     * Not supported.
-     */
-    const CIPHER_NONE = 0;
-    /**
-     * IDEA in CFB mode
-     *
-     * Not supported.
-     */
-    const CIPHER_IDEA = 1;
-    /**
-     * DES in CBC mode
-     */
-    const CIPHER_DES = 2;
-    /**
-     * Triple-DES in CBC mode
-     *
-     * All implementations are required to support this
-     */
-    const CIPHER_3DES = 3;
-    /**
-     * TRI's Simple Stream encryption CBC
-     *
-     * Not supported nor is it defined in the official SSH1 specs.  OpenSSH, however, does define it (see cipher.h),
-     * although it doesn't use it (see cipher.c)
-     */
-    const CIPHER_BROKEN_TSS = 4;
-    /**
-     * RC4
-     *
-     * Not supported.
-     *
-     * @internal According to the SSH1 specs:
-     *
-     *        "The first 16 bytes of the session key are used as the key for
-     *         the server to client direction.  The remaining 16 bytes are used
-     *         as the key for the client to server direction.  This gives
-     *         independent 128-bit keys for each direction."
-     *
-     *     This library currently only supports encryption when the same key is being used for both directions.  This is
-     *     because there's only one $crypto object.  Two could be added ($encrypt and $decrypt, perhaps).
-     */
-    const CIPHER_RC4 = 5;
-    /**
-     * Blowfish
-     *
-     * Not supported nor is it defined in the official SSH1 specs.  OpenSSH, however, defines it (see cipher.h) and
-     * uses it (see cipher.c)
-     */
-    const CIPHER_BLOWFISH = 6;
-    /**#@-*/
-
-    /**#@+
-     * Authentication Methods
-     *
-     * @see \phpseclib\Net\SSH1::getSupportedAuthentications()
-     * @access public
-    */
-    /**
-     * .rhosts or /etc/hosts.equiv
-     */
-    const AUTH_RHOSTS = 1;
-    /**
-     * pure RSA authentication
-     */
-    const AUTH_RSA = 2;
-    /**
-     * password authentication
-     *
-     * This is the only method that is supported by this library.
-     */
-    const AUTH_PASSWORD = 3;
-    /**
-     * .rhosts with RSA host authentication
-     */
-    const AUTH_RHOSTS_RSA = 4;
-    /**#@-*/
-
-    /**#@+
-     * Terminal Modes
-     *
-     * @link http://3sp.com/content/developer/maverick-net/docs/Maverick.SSH.PseudoTerminalModesMembers.html
-     * @access private
-    */
-    const TTY_OP_END = 0;
-    /**#@-*/
-
-    /**
-     * The Response Type
-     *
-     * @see \phpseclib\Net\SSH1::_get_binary_packet()
-     * @access private
-     */
-    const RESPONSE_TYPE = 1;
-
-    /**
-     * The Response Data
-     *
-     * @see \phpseclib\Net\SSH1::_get_binary_packet()
-     * @access private
-     */
-    const RESPONSE_DATA = 2;
-
-    /**#@+
-     * Execution Bitmap Masks
-     *
-     * @see \phpseclib\Net\SSH1::bitmap
-     * @access private
-    */
-    const MASK_CONSTRUCTOR = 0x00000001;
-    const MASK_CONNECTED   = 0x00000002;
-    const MASK_LOGIN       = 0x00000004;
-    const MASK_SHELL       = 0x00000008;
-    /**#@-*/
-
-    /**#@+
-     * @access public
-     * @see \phpseclib\Net\SSH1::getLog()
-    */
-    /**
-     * Returns the message numbers
-     */
-    const LOG_SIMPLE = 1;
-    /**
-     * Returns the message content
-     */
-    const LOG_COMPLEX = 2;
-    /**
-     * Outputs the content real-time
-     */
-    const LOG_REALTIME = 3;
-    /**
-     * Dumps the content real-time to a file
-     */
-    const LOG_REALTIME_FILE = 4;
-    /**#@-*/
-
-    /**#@+
-     * @access public
-     * @see \phpseclib\Net\SSH1::read()
-    */
-    /**
-     * Returns when a string matching $expect exactly is found
-     */
-    const READ_SIMPLE = 1;
-    /**
-     * Returns when a string matching the regular expression $expect is found
-     */
-    const READ_REGEX = 2;
-    /**#@-*/
-
-    /**
-     * The SSH identifier
-     *
-     * @var string
-     * @access private
-     */
-    var $identifier = 'SSH-1.5-phpseclib';
-
-    /**
-     * The Socket Object
-     *
-     * @var object
-     * @access private
-     */
-    var $fsock;
-
-    /**
-     * The cryptography object
-     *
-     * @var object
-     * @access private
-     */
-    var $crypto = false;
-
-    /**
-     * Execution Bitmap
-     *
-     * The bits that are set represent functions that have been called already.  This is used to determine
-     * if a requisite function has been successfully executed.  If not, an error should be thrown.
-     *
-     * @var int
-     * @access private
-     */
-    var $bitmap = 0;
-
-    /**
-     * The Server Key Public Exponent
-     *
-     * Logged for debug purposes
-     *
-     * @see self::getServerKeyPublicExponent()
-     * @var string
-     * @access private
-     */
-    var $server_key_public_exponent;
-
-    /**
-     * The Server Key Public Modulus
-     *
-     * Logged for debug purposes
-     *
-     * @see self::getServerKeyPublicModulus()
-     * @var string
-     * @access private
-     */
-    var $server_key_public_modulus;
-
-    /**
-     * The Host Key Public Exponent
-     *
-     * Logged for debug purposes
-     *
-     * @see self::getHostKeyPublicExponent()
-     * @var string
-     * @access private
-     */
-    var $host_key_public_exponent;
-
-    /**
-     * The Host Key Public Modulus
-     *
-     * Logged for debug purposes
-     *
-     * @see self::getHostKeyPublicModulus()
-     * @var string
-     * @access private
-     */
-    var $host_key_public_modulus;
-
-    /**
-     * Supported Ciphers
-     *
-     * Logged for debug purposes
-     *
-     * @see self::getSupportedCiphers()
-     * @var array
-     * @access private
-     */
-    var $supported_ciphers = array(
-        self::CIPHER_NONE       => 'No encryption',
-        self::CIPHER_IDEA       => 'IDEA in CFB mode',
-        self::CIPHER_DES        => 'DES in CBC mode',
-        self::CIPHER_3DES       => 'Triple-DES in CBC mode',
-        self::CIPHER_BROKEN_TSS => 'TRI\'s Simple Stream encryption CBC',
-        self::CIPHER_RC4        => 'RC4',
-        self::CIPHER_BLOWFISH   => 'Blowfish'
-    );
-
-    /**
-     * Supported Authentications
-     *
-     * Logged for debug purposes
-     *
-     * @see self::getSupportedAuthentications()
-     * @var array
-     * @access private
-     */
-    var $supported_authentications = array(
-        self::AUTH_RHOSTS     => '.rhosts or /etc/hosts.equiv',
-        self::AUTH_RSA        => 'pure RSA authentication',
-        self::AUTH_PASSWORD   => 'password authentication',
-        self::AUTH_RHOSTS_RSA => '.rhosts with RSA host authentication'
-    );
-
-    /**
-     * Server Identification
-     *
-     * @see self::getServerIdentification()
-     * @var string
-     * @access private
-     */
-    var $server_identification = '';
-
-    /**
-     * Protocol Flags
-     *
-     * @see self::__construct()
-     * @var array
-     * @access private
-     */
-    var $protocol_flags = array();
-
-    /**
-     * Protocol Flag Log
-     *
-     * @see self::getLog()
-     * @var array
-     * @access private
-     */
-    var $protocol_flag_log = array();
-
-    /**
-     * Message Log
-     *
-     * @see self::getLog()
-     * @var array
-     * @access private
-     */
-    var $message_log = array();
-
-    /**
-     * Real-time log file pointer
-     *
-     * @see self::_append_log()
-     * @var resource
-     * @access private
-     */
-    var $realtime_log_file;
-
-    /**
-     * Real-time log file size
-     *
-     * @see self::_append_log()
-     * @var int
-     * @access private
-     */
-    var $realtime_log_size;
-
-    /**
-     * Real-time log file wrap boolean
-     *
-     * @see self::_append_log()
-     * @var bool
-     * @access private
-     */
-    var $realtime_log_wrap;
-
-    /**
-     * Interactive Buffer
-     *
-     * @see self::read()
-     * @var array
-     * @access private
-     */
-    var $interactiveBuffer = '';
-
-    /**
-     * Timeout
-     *
-     * @see self::setTimeout()
-     * @access private
-     */
-    var $timeout;
-
-    /**
-     * Current Timeout
-     *
-     * @see self::_get_channel_packet()
-     * @access private
-     */
-    var $curTimeout;
-
-    /**
-     * Log Boundary
-     *
-     * @see self::_format_log()
-     * @access private
-     */
-    var $log_boundary = ':';
-
-    /**
-     * Log Long Width
-     *
-     * @see self::_format_log()
-     * @access private
-     */
-    var $log_long_width = 65;
-
-    /**
-     * Log Short Width
-     *
-     * @see self::_format_log()
-     * @access private
-     */
-    var $log_short_width = 16;
-
-    /**
-     * Hostname
-     *
-     * @see self::__construct()
-     * @see self::_connect()
-     * @var string
-     * @access private
-     */
-    var $host;
-
-    /**
-     * Port Number
-     *
-     * @see self::__construct()
-     * @see self::_connect()
-     * @var int
-     * @access private
-     */
-    var $port;
-
-    /**
-     * Timeout for initial connection
-     *
-     * Set by the constructor call. Calling setTimeout() is optional. If it's not called functions like
-     * exec() won't timeout unless some PHP setting forces it too. The timeout specified in the constructor,
-     * however, is non-optional. There will be a timeout, whether or not you set it. If you don't it'll be
-     * 10 seconds. It is used by fsockopen() in that function.
-     *
-     * @see self::__construct()
-     * @see self::_connect()
-     * @var int
-     * @access private
-     */
-    var $connectionTimeout;
-
-    /**
-     * Default cipher
-     *
-     * @see self::__construct()
-     * @see self::_connect()
-     * @var int
-     * @access private
-     */
-    var $cipher;
-
-    /**
-     * Default Constructor.
-     *
-     * Connects to an SSHv1 server
-     *
-     * @param string $host
-     * @param int $port
-     * @param int $timeout
-     * @param int $cipher
-     * @return \phpseclib\Net\SSH1
-     * @access public
-     */
-    function __construct($host, $port = 22, $timeout = 10, $cipher = self::CIPHER_3DES)
-    {
-        $this->protocol_flags = array(
-            1  => 'NET_SSH1_MSG_DISCONNECT',
-            2  => 'NET_SSH1_SMSG_PUBLIC_KEY',
-            3  => 'NET_SSH1_CMSG_SESSION_KEY',
-            4  => 'NET_SSH1_CMSG_USER',
-            9  => 'NET_SSH1_CMSG_AUTH_PASSWORD',
-            10 => 'NET_SSH1_CMSG_REQUEST_PTY',
-            12 => 'NET_SSH1_CMSG_EXEC_SHELL',
-            13 => 'NET_SSH1_CMSG_EXEC_CMD',
-            14 => 'NET_SSH1_SMSG_SUCCESS',
-            15 => 'NET_SSH1_SMSG_FAILURE',
-            16 => 'NET_SSH1_CMSG_STDIN_DATA',
-            17 => 'NET_SSH1_SMSG_STDOUT_DATA',
-            18 => 'NET_SSH1_SMSG_STDERR_DATA',
-            19 => 'NET_SSH1_CMSG_EOF',
-            20 => 'NET_SSH1_SMSG_EXITSTATUS',
-            33 => 'NET_SSH1_CMSG_EXIT_CONFIRMATION'
-        );
-
-        $this->_define_array($this->protocol_flags);
-
-        $this->host = $host;
-        $this->port = $port;
-        $this->connectionTimeout = $timeout;
-        $this->cipher = $cipher;
-    }
-
-    /**
-     * Connect to an SSHv1 server
-     *
-     * @return bool
-     * @access private
-     */
-    function _connect()
-    {
-        $this->fsock = @fsockopen($this->host, $this->port, $errno, $errstr, $this->connectionTimeout);
-        if (!$this->fsock) {
-            user_error(rtrim("Cannot connect to {$this->host}:{$this->port}. Error $errno. $errstr"));
-            return false;
-        }
-
-        $this->server_identification = $init_line = fgets($this->fsock, 255);
-
-        if (defined('NET_SSH1_LOGGING')) {
-            $this->_append_log('<-', $this->server_identification);
-            $this->_append_log('->', $this->identifier . "\r\n");
-        }
-
-        if (!preg_match('#SSH-([0-9\.]+)-(.+)#', $init_line, $parts)) {
-            user_error('Can only connect to SSH servers');
-            return false;
-        }
-        if ($parts[1][0] != 1) {
-            user_error("Cannot connect to SSH $parts[1] servers");
-            return false;
-        }
-
-        fputs($this->fsock, $this->identifier."\r\n");
-
-        $response = $this->_get_binary_packet();
-        if ($response[self::RESPONSE_TYPE] != NET_SSH1_SMSG_PUBLIC_KEY) {
-            user_error('Expected SSH_SMSG_PUBLIC_KEY');
-            return false;
-        }
-
-        $anti_spoofing_cookie = $this->_string_shift($response[self::RESPONSE_DATA], 8);
-
-        $this->_string_shift($response[self::RESPONSE_DATA], 4);
-
-        if (strlen($response[self::RESPONSE_DATA]) < 2) {
-            return false;
-        }
-        $temp = unpack('nlen', $this->_string_shift($response[self::RESPONSE_DATA], 2));
-        $server_key_public_exponent = new BigInteger($this->_string_shift($response[self::RESPONSE_DATA], ceil($temp['len'] / 8)), 256);
-        $this->server_key_public_exponent = $server_key_public_exponent;
-
-        if (strlen($response[self::RESPONSE_DATA]) < 2) {
-            return false;
-        }
-        $temp = unpack('nlen', $this->_string_shift($response[self::RESPONSE_DATA], 2));
-        $server_key_public_modulus = new BigInteger($this->_string_shift($response[self::RESPONSE_DATA], ceil($temp['len'] / 8)), 256);
-
-        $this->server_key_public_modulus = $server_key_public_modulus;
-
-        $this->_string_shift($response[self::RESPONSE_DATA], 4);
-
-        if (strlen($response[self::RESPONSE_DATA]) < 2) {
-            return false;
-        }
-        $temp = unpack('nlen', $this->_string_shift($response[self::RESPONSE_DATA], 2));
-        $host_key_public_exponent = new BigInteger($this->_string_shift($response[self::RESPONSE_DATA], ceil($temp['len'] / 8)), 256);
-        $this->host_key_public_exponent = $host_key_public_exponent;
-
-        if (strlen($response[self::RESPONSE_DATA]) < 2) {
-            return false;
-        }
-        $temp = unpack('nlen', $this->_string_shift($response[self::RESPONSE_DATA], 2));
-        $host_key_public_modulus = new BigInteger($this->_string_shift($response[self::RESPONSE_DATA], ceil($temp['len'] / 8)), 256);
-
-        $this->host_key_public_modulus = $host_key_public_modulus;
-
-        $this->_string_shift($response[self::RESPONSE_DATA], 4);
-
-        // get a list of the supported ciphers
-        if (strlen($response[self::RESPONSE_DATA]) < 4) {
-            return false;
-        }
-        extract(unpack('Nsupported_ciphers_mask', $this->_string_shift($response[self::RESPONSE_DATA], 4)));
-
-        foreach ($this->supported_ciphers as $mask => $name) {
-            if (($supported_ciphers_mask & (1 << $mask)) == 0) {
-                unset($this->supported_ciphers[$mask]);
-            }
-        }
-
-        // get a list of the supported authentications
-        if (strlen($response[self::RESPONSE_DATA]) < 4) {
-            return false;
-        }
-        extract(unpack('Nsupported_authentications_mask', $this->_string_shift($response[self::RESPONSE_DATA], 4)));
-        foreach ($this->supported_authentications as $mask => $name) {
-            if (($supported_authentications_mask & (1 << $mask)) == 0) {
-                unset($this->supported_authentications[$mask]);
-            }
-        }
-
-        $session_id = pack('H*', md5($host_key_public_modulus->toBytes() . $server_key_public_modulus->toBytes() . $anti_spoofing_cookie));
-
-        $session_key = Random::string(32);
-        $double_encrypted_session_key = $session_key ^ str_pad($session_id, 32, chr(0));
-
-        if ($server_key_public_modulus->compare($host_key_public_modulus) < 0) {
-            $double_encrypted_session_key = $this->_rsa_crypt(
-                $double_encrypted_session_key,
-                array(
-                    $server_key_public_exponent,
-                    $server_key_public_modulus
-                )
-            );
-            $double_encrypted_session_key = $this->_rsa_crypt(
-                $double_encrypted_session_key,
-                array(
-                    $host_key_public_exponent,
-                    $host_key_public_modulus
-                )
-            );
-        } else {
-            $double_encrypted_session_key = $this->_rsa_crypt(
-                $double_encrypted_session_key,
-                array(
-                    $host_key_public_exponent,
-                    $host_key_public_modulus
-                )
-            );
-            $double_encrypted_session_key = $this->_rsa_crypt(
-                $double_encrypted_session_key,
-                array(
-                    $server_key_public_exponent,
-                    $server_key_public_modulus
-                )
-            );
-        }
-
-        $cipher = isset($this->supported_ciphers[$this->cipher]) ? $this->cipher : self::CIPHER_3DES;
-        $data = pack('C2a*na*N', NET_SSH1_CMSG_SESSION_KEY, $cipher, $anti_spoofing_cookie, 8 * strlen($double_encrypted_session_key), $double_encrypted_session_key, 0);
-
-        if (!$this->_send_binary_packet($data)) {
-            user_error('Error sending SSH_CMSG_SESSION_KEY');
-            return false;
-        }
-
-        switch ($cipher) {
-            //case self::CIPHER_NONE:
-            //    $this->crypto = new \phpseclib\Crypt\Null();
-            //    break;
-            case self::CIPHER_DES:
-                $this->crypto = new DES();
-                $this->crypto->disablePadding();
-                $this->crypto->enableContinuousBuffer();
-                $this->crypto->setKey(substr($session_key, 0,  8));
-                break;
-            case self::CIPHER_3DES:
-                $this->crypto = new TripleDES(TripleDES::MODE_3CBC);
-                $this->crypto->disablePadding();
-                $this->crypto->enableContinuousBuffer();
-                $this->crypto->setKey(substr($session_key, 0, 24));
-                break;
-            //case self::CIPHER_RC4:
-            //    $this->crypto = new RC4();
-            //    $this->crypto->enableContinuousBuffer();
-            //    $this->crypto->setKey(substr($session_key, 0,  16));
-            //    break;
-        }
-
-        $response = $this->_get_binary_packet();
-
-        if ($response[self::RESPONSE_TYPE] != NET_SSH1_SMSG_SUCCESS) {
-            user_error('Expected SSH_SMSG_SUCCESS');
-            return false;
-        }
-
-        $this->bitmap = self::MASK_CONNECTED;
-
-        return true;
-    }
-
-    /**
-     * Login
-     *
-     * @param string $username
-     * @param string $password
-     * @return bool
-     * @access public
-     */
-    function login($username, $password = '')
-    {
-        if (!($this->bitmap & self::MASK_CONSTRUCTOR)) {
-            $this->bitmap |= self::MASK_CONSTRUCTOR;
-            if (!$this->_connect()) {
-                return false;
-            }
-        }
-
-        if (!($this->bitmap & self::MASK_CONNECTED)) {
-            return false;
-        }
-
-        $data = pack('CNa*', NET_SSH1_CMSG_USER, strlen($username), $username);
-
-        if (!$this->_send_binary_packet($data)) {
-            user_error('Error sending SSH_CMSG_USER');
-            return false;
-        }
-
-        $response = $this->_get_binary_packet();
-
-        if ($response === true) {
-            return false;
-        }
-        if ($response[self::RESPONSE_TYPE] == NET_SSH1_SMSG_SUCCESS) {
-            $this->bitmap |= self::MASK_LOGIN;
-            return true;
-        } elseif ($response[self::RESPONSE_TYPE] != NET_SSH1_SMSG_FAILURE) {
-            user_error('Expected SSH_SMSG_SUCCESS or SSH_SMSG_FAILURE');
-            return false;
-        }
-
-        $data = pack('CNa*', NET_SSH1_CMSG_AUTH_PASSWORD, strlen($password), $password);
-
-        if (!$this->_send_binary_packet($data)) {
-            user_error('Error sending SSH_CMSG_AUTH_PASSWORD');
-            return false;
-        }
-
-        // remove the username and password from the last logged packet
-        if (defined('NET_SSH1_LOGGING') && NET_SSH1_LOGGING == self::LOG_COMPLEX) {
-            $data = pack('CNa*', NET_SSH1_CMSG_AUTH_PASSWORD, strlen('password'), 'password');
-            $this->message_log[count($this->message_log) - 1] = $data;
-        }
-
-        $response = $this->_get_binary_packet();
-
-        if ($response === true) {
-            return false;
-        }
-        if ($response[self::RESPONSE_TYPE] == NET_SSH1_SMSG_SUCCESS) {
-            $this->bitmap |= self::MASK_LOGIN;
-            return true;
-        } elseif ($response[self::RESPONSE_TYPE] == NET_SSH1_SMSG_FAILURE) {
-            return false;
-        } else {
-            user_error('Expected SSH_SMSG_SUCCESS or SSH_SMSG_FAILURE');
-            return false;
-        }
-    }
-
-    /**
-     * Set Timeout
-     *
-     * $ssh->exec('ping 127.0.0.1'); on a Linux host will never return and will run indefinitely.  setTimeout() makes it so it'll timeout.
-     * Setting $timeout to false or 0 will mean there is no timeout.
-     *
-     * @param mixed $timeout
-     */
-    function setTimeout($timeout)
-    {
-        $this->timeout = $this->curTimeout = $timeout;
-    }
-
-    /**
-     * Executes a command on a non-interactive shell, returns the output, and quits.
-     *
-     * An SSH1 server will close the connection after a command has been executed on a non-interactive shell.  SSH2
-     * servers don't, however, this isn't an SSH2 client.  The way this works, on the server, is by initiating a
-     * shell with the -s option, as discussed in the following links:
-     *
-     * {@link http://www.faqs.org/docs/bashman/bashref_65.html http://www.faqs.org/docs/bashman/bashref_65.html}
-     * {@link http://www.faqs.org/docs/bashman/bashref_62.html http://www.faqs.org/docs/bashman/bashref_62.html}
-     *
-     * To execute further commands, a new \phpseclib\Net\SSH1 object will need to be created.
-     *
-     * Returns false on failure and the output, otherwise.
-     *
-     * @see self::interactiveRead()
-     * @see self::interactiveWrite()
-     * @param string $cmd
-     * @return mixed
-     * @access public
-     */
-    function exec($cmd, $block = true)
-    {
-        if (!($this->bitmap & self::MASK_LOGIN)) {
-            user_error('Operation disallowed prior to login()');
-            return false;
-        }
-
-        $data = pack('CNa*', NET_SSH1_CMSG_EXEC_CMD, strlen($cmd), $cmd);
-
-        if (!$this->_send_binary_packet($data)) {
-            user_error('Error sending SSH_CMSG_EXEC_CMD');
-            return false;
-        }
-
-        if (!$block) {
-            return true;
-        }
-
-        $output = '';
-        $response = $this->_get_binary_packet();
-
-        if ($response !== false) {
-            do {
-                $output.= substr($response[self::RESPONSE_DATA], 4);
-                $response = $this->_get_binary_packet();
-            } while (is_array($response) && $response[self::RESPONSE_TYPE] != NET_SSH1_SMSG_EXITSTATUS);
-        }
-
-        $data = pack('C', NET_SSH1_CMSG_EXIT_CONFIRMATION);
-
-        // i don't think it's really all that important if this packet gets sent or not.
-        $this->_send_binary_packet($data);
-
-        fclose($this->fsock);
-
-        // reset the execution bitmap - a new \phpseclib\Net\SSH1 object needs to be created.
-        $this->bitmap = 0;
-
-        return $output;
-    }
-
-    /**
-     * Creates an interactive shell
-     *
-     * @see self::interactiveRead()
-     * @see self::interactiveWrite()
-     * @return bool
-     * @access private
-     */
-    function _initShell()
-    {
-        // connect using the sample parameters in protocol-1.5.txt.
-        // according to wikipedia.org's entry on text terminals, "the fundamental type of application running on a text
-        // terminal is a command line interpreter or shell".  thus, opening a terminal session to run the shell.
-        $data = pack('CNa*N4C', NET_SSH1_CMSG_REQUEST_PTY, strlen('vt100'), 'vt100', 24, 80, 0, 0, self::TTY_OP_END);
-
-        if (!$this->_send_binary_packet($data)) {
-            user_error('Error sending SSH_CMSG_REQUEST_PTY');
-            return false;
-        }
-
-        $response = $this->_get_binary_packet();
-
-        if ($response === true) {
-            return false;
-        }
-        if ($response[self::RESPONSE_TYPE] != NET_SSH1_SMSG_SUCCESS) {
-            user_error('Expected SSH_SMSG_SUCCESS');
-            return false;
-        }
-
-        $data = pack('C', NET_SSH1_CMSG_EXEC_SHELL);
-
-        if (!$this->_send_binary_packet($data)) {
-            user_error('Error sending SSH_CMSG_EXEC_SHELL');
-            return false;
-        }
-
-        $this->bitmap |= self::MASK_SHELL;
-
-        //stream_set_blocking($this->fsock, 0);
-
-        return true;
-    }
-
-    /**
-     * Inputs a command into an interactive shell.
-     *
-     * @see self::interactiveWrite()
-     * @param string $cmd
-     * @return bool
-     * @access public
-     */
-    function write($cmd)
-    {
-        return $this->interactiveWrite($cmd);
-    }
-
-    /**
-     * Returns the output of an interactive shell when there's a match for $expect
-     *
-     * $expect can take the form of a string literal or, if $mode == self::READ__REGEX,
-     * a regular expression.
-     *
-     * @see self::write()
-     * @param string $expect
-     * @param int $mode
-     * @return bool
-     * @access public
-     */
-    function read($expect, $mode = self::READ__SIMPLE)
-    {
-        if (!($this->bitmap & self::MASK_LOGIN)) {
-            user_error('Operation disallowed prior to login()');
-            return false;
-        }
-
-        if (!($this->bitmap & self::MASK_SHELL) && !$this->_initShell()) {
-            user_error('Unable to initiate an interactive shell session');
-            return false;
-        }
-
-        $match = $expect;
-        while (true) {
-            if ($mode == self::READ__REGEX) {
-                preg_match($expect, $this->interactiveBuffer, $matches);
-                $match = isset($matches[0]) ? $matches[0] : '';
-            }
-            $pos = strlen($match) ? strpos($this->interactiveBuffer, $match) : false;
-            if ($pos !== false) {
-                return $this->_string_shift($this->interactiveBuffer, $pos + strlen($match));
-            }
-            $response = $this->_get_binary_packet();
-
-            if ($response === true) {
-                return $this->_string_shift($this->interactiveBuffer, strlen($this->interactiveBuffer));
-            }
-            $this->interactiveBuffer.= substr($response[self::RESPONSE_DATA], 4);
-        }
-    }
-
-    /**
-     * Inputs a command into an interactive shell.
-     *
-     * @see self::interactiveRead()
-     * @param string $cmd
-     * @return bool
-     * @access public
-     */
-    function interactiveWrite($cmd)
-    {
-        if (!($this->bitmap & self::MASK_LOGIN)) {
-            user_error('Operation disallowed prior to login()');
-            return false;
-        }
-
-        if (!($this->bitmap & self::MASK_SHELL) && !$this->_initShell()) {
-            user_error('Unable to initiate an interactive shell session');
-            return false;
-        }
-
-        $data = pack('CNa*', NET_SSH1_CMSG_STDIN_DATA, strlen($cmd), $cmd);
-
-        if (!$this->_send_binary_packet($data)) {
-            user_error('Error sending SSH_CMSG_STDIN');
-            return false;
-        }
-
-        return true;
-    }
-
-    /**
-     * Returns the output of an interactive shell when no more output is available.
-     *
-     * Requires PHP 4.3.0 or later due to the use of the stream_select() function.  If you see stuff like
-     * "^[[00m", you're seeing ANSI escape codes.  According to
-     * {@link http://support.microsoft.com/kb/101875 How to Enable ANSI.SYS in a Command Window}, "Windows NT
-     * does not support ANSI escape sequences in Win32 Console applications", so if you're a Windows user,
-     * there's not going to be much recourse.
-     *
-     * @see self::interactiveRead()
-     * @return string
-     * @access public
-     */
-    function interactiveRead()
-    {
-        if (!($this->bitmap & self::MASK_LOGIN)) {
-            user_error('Operation disallowed prior to login()');
-            return false;
-        }
-
-        if (!($this->bitmap & self::MASK_SHELL) && !$this->_initShell()) {
-            user_error('Unable to initiate an interactive shell session');
-            return false;
-        }
-
-        $read = array($this->fsock);
-        $write = $except = null;
-        if (stream_select($read, $write, $except, 0)) {
-            $response = $this->_get_binary_packet();
-            return substr($response[self::RESPONSE_DATA], 4);
-        } else {
-            return '';
-        }
-    }
-
-    /**
-     * Disconnect
-     *
-     * @access public
-     */
-    function disconnect()
-    {
-        $this->_disconnect();
-    }
-
-    /**
-     * Destructor.
-     *
-     * Will be called, automatically, if you're supporting just PHP5.  If you're supporting PHP4, you'll need to call
-     * disconnect().
-     *
-     * @access public
-     */
-    function __destruct()
-    {
-        $this->_disconnect();
-    }
-
-    /**
-     * Disconnect
-     *
-     * @param string $msg
-     * @access private
-     */
-    function _disconnect($msg = 'Client Quit')
-    {
-        if ($this->bitmap) {
-            $data = pack('C', NET_SSH1_CMSG_EOF);
-            $this->_send_binary_packet($data);
-            /*
-            $response = $this->_get_binary_packet();
-            if ($response === true) {
-                $response = array(self::RESPONSE_TYPE => -1);
-            }
-            switch ($response[self::RESPONSE_TYPE]) {
-                case NET_SSH1_SMSG_EXITSTATUS:
-                    $data = pack('C', NET_SSH1_CMSG_EXIT_CONFIRMATION);
-                    break;
-                default:
-                    $data = pack('CNa*', NET_SSH1_MSG_DISCONNECT, strlen($msg), $msg);
-            }
-            */
-            $data = pack('CNa*', NET_SSH1_MSG_DISCONNECT, strlen($msg), $msg);
-
-            $this->_send_binary_packet($data);
-            fclose($this->fsock);
-            $this->bitmap = 0;
-        }
-    }
-
-    /**
-     * Gets Binary Packets
-     *
-     * See 'The Binary Packet Protocol' of protocol-1.5.txt for more info.
-     *
-     * Also, this function could be improved upon by adding detection for the following exploit:
-     * http://www.securiteam.com/securitynews/5LP042K3FY.html
-     *
-     * @see self::_send_binary_packet()
-     * @return array
-     * @access private
-     */
-    function _get_binary_packet()
-    {
-        if (feof($this->fsock)) {
-            //user_error('connection closed prematurely');
-            return false;
-        }
-
-        if ($this->curTimeout) {
-            $read = array($this->fsock);
-            $write = $except = null;
-
-            $start = strtok(microtime(), ' ') + strtok(''); // http://php.net/microtime#61838
-            $sec = floor($this->curTimeout);
-            $usec = 1000000 * ($this->curTimeout - $sec);
-            // on windows this returns a "Warning: Invalid CRT parameters detected" error
-            if (!@stream_select($read, $write, $except, $sec, $usec) && !count($read)) {
-                //$this->_disconnect('Timeout');
-                return true;
-            }
-            $elapsed = strtok(microtime(), ' ') + strtok('') - $start;
-            $this->curTimeout-= $elapsed;
-        }
-
-        $start = strtok(microtime(), ' ') + strtok(''); // http://php.net/microtime#61838
-        $data = fread($this->fsock, 4);
-        if (strlen($data) < 4) {
-            return false;
-        }
-        $temp = unpack('Nlength', $data);
-
-        $padding_length = 8 - ($temp['length'] & 7);
-        $length = $temp['length'] + $padding_length;
-        $raw = '';
-
-        while ($length > 0) {
-            $temp = fread($this->fsock, $length);
-            $raw.= $temp;
-            $length-= strlen($temp);
-        }
-        $stop = strtok(microtime(), ' ') + strtok('');
-
-        if (strlen($raw) && $this->crypto !== false) {
-            $raw = $this->crypto->decrypt($raw);
-        }
-
-        $padding = substr($raw, 0, $padding_length);
-        $type = $raw[$padding_length];
-        $data = substr($raw, $padding_length + 1, -4);
-
-        if (strlen($raw) < 4) {
-            return false;
-        }
-        $temp = unpack('Ncrc', substr($raw, -4));
-
-        //if ( $temp['crc'] != $this->_crc($padding . $type . $data) ) {
-        //    user_error('Bad CRC in packet from server');
-        //    return false;
-        //}
-
-        $type = ord($type);
-
-        if (defined('NET_SSH1_LOGGING')) {
-            $temp = isset($this->protocol_flags[$type]) ? $this->protocol_flags[$type] : 'UNKNOWN';
-            $temp = '<- ' . $temp .
-                    ' (' . round($stop - $start, 4) . 's)';
-            $this->_append_log($temp, $data);
-        }
-
-        return array(
-            self::RESPONSE_TYPE => $type,
-            self::RESPONSE_DATA => $data
-        );
-    }
-
-    /**
-     * Sends Binary Packets
-     *
-     * Returns true on success, false on failure.
-     *
-     * @see self::_get_binary_packet()
-     * @param string $data
-     * @return bool
-     * @access private
-     */
-    function _send_binary_packet($data)
-    {
-        if (feof($this->fsock)) {
-            //user_error('connection closed prematurely');
-            return false;
-        }
-
-        $length = strlen($data) + 4;
-
-        $padding = Random::string(8 - ($length & 7));
-
-        $orig = $data;
-        $data = $padding . $data;
-        $data.= pack('N', $this->_crc($data));
-
-        if ($this->crypto !== false) {
-            $data = $this->crypto->encrypt($data);
-        }
-
-        $packet = pack('Na*', $length, $data);
-
-        $start = strtok(microtime(), ' ') + strtok(''); // http://php.net/microtime#61838
-        $result = strlen($packet) == fputs($this->fsock, $packet);
-        $stop = strtok(microtime(), ' ') + strtok('');
-
-        if (defined('NET_SSH1_LOGGING')) {
-            $temp = isset($this->protocol_flags[ord($orig[0])]) ? $this->protocol_flags[ord($orig[0])] : 'UNKNOWN';
-            $temp = '-> ' . $temp .
-                    ' (' . round($stop - $start, 4) . 's)';
-            $this->_append_log($temp, $orig);
-        }
-
-        return $result;
-    }
-
-    /**
-     * Cyclic Redundancy Check (CRC)
-     *
-     * PHP's crc32 function is implemented slightly differently than the one that SSH v1 uses, so
-     * we've reimplemented it. A more detailed discussion of the differences can be found after
-     * $crc_lookup_table's initialization.
-     *
-     * @see self::_get_binary_packet()
-     * @see self::_send_binary_packet()
-     * @param string $data
-     * @return int
-     * @access private
-     */
-    function _crc($data)
-    {
-        static $crc_lookup_table = array(
-            0x00000000, 0x77073096, 0xEE0E612C, 0x990951BA,
-            0x076DC419, 0x706AF48F, 0xE963A535, 0x9E6495A3,
-            0x0EDB8832, 0x79DCB8A4, 0xE0D5E91E, 0x97D2D988,
-            0x09B64C2B, 0x7EB17CBD, 0xE7B82D07, 0x90BF1D91,
-            0x1DB71064, 0x6AB020F2, 0xF3B97148, 0x84BE41DE,
-            0x1ADAD47D, 0x6DDDE4EB, 0xF4D4B551, 0x83D385C7,
-            0x136C9856, 0x646BA8C0, 0xFD62F97A, 0x8A65C9EC,
-            0x14015C4F, 0x63066CD9, 0xFA0F3D63, 0x8D080DF5,
-            0x3B6E20C8, 0x4C69105E, 0xD56041E4, 0xA2677172,
-            0x3C03E4D1, 0x4B04D447, 0xD20D85FD, 0xA50AB56B,
-            0x35B5A8FA, 0x42B2986C, 0xDBBBC9D6, 0xACBCF940,
-            0x32D86CE3, 0x45DF5C75, 0xDCD60DCF, 0xABD13D59,
-            0x26D930AC, 0x51DE003A, 0xC8D75180, 0xBFD06116,
-            0x21B4F4B5, 0x56B3C423, 0xCFBA9599, 0xB8BDA50F,
-            0x2802B89E, 0x5F058808, 0xC60CD9B2, 0xB10BE924,
-            0x2F6F7C87, 0x58684C11, 0xC1611DAB, 0xB6662D3D,
-            0x76DC4190, 0x01DB7106, 0x98D220BC, 0xEFD5102A,
-            0x71B18589, 0x06B6B51F, 0x9FBFE4A5, 0xE8B8D433,
-            0x7807C9A2, 0x0F00F934, 0x9609A88E, 0xE10E9818,
-            0x7F6A0DBB, 0x086D3D2D, 0x91646C97, 0xE6635C01,
-            0x6B6B51F4, 0x1C6C6162, 0x856530D8, 0xF262004E,
-            0x6C0695ED, 0x1B01A57B, 0x8208F4C1, 0xF50FC457,
-            0x65B0D9C6, 0x12B7E950, 0x8BBEB8EA, 0xFCB9887C,
-            0x62DD1DDF, 0x15DA2D49, 0x8CD37CF3, 0xFBD44C65,
-            0x4DB26158, 0x3AB551CE, 0xA3BC0074, 0xD4BB30E2,
-            0x4ADFA541, 0x3DD895D7, 0xA4D1C46D, 0xD3D6F4FB,
-            0x4369E96A, 0x346ED9FC, 0xAD678846, 0xDA60B8D0,
-            0x44042D73, 0x33031DE5, 0xAA0A4C5F, 0xDD0D7CC9,
-            0x5005713C, 0x270241AA, 0xBE0B1010, 0xC90C2086,
-            0x5768B525, 0x206F85B3, 0xB966D409, 0xCE61E49F,
-            0x5EDEF90E, 0x29D9C998, 0xB0D09822, 0xC7D7A8B4,
-            0x59B33D17, 0x2EB40D81, 0xB7BD5C3B, 0xC0BA6CAD,
-            0xEDB88320, 0x9ABFB3B6, 0x03B6E20C, 0x74B1D29A,
-            0xEAD54739, 0x9DD277AF, 0x04DB2615, 0x73DC1683,
-            0xE3630B12, 0x94643B84, 0x0D6D6A3E, 0x7A6A5AA8,
-            0xE40ECF0B, 0x9309FF9D, 0x0A00AE27, 0x7D079EB1,
-            0xF00F9344, 0x8708A3D2, 0x1E01F268, 0x6906C2FE,
-            0xF762575D, 0x806567CB, 0x196C3671, 0x6E6B06E7,
-            0xFED41B76, 0x89D32BE0, 0x10DA7A5A, 0x67DD4ACC,
-            0xF9B9DF6F, 0x8EBEEFF9, 0x17B7BE43, 0x60B08ED5,
-            0xD6D6A3E8, 0xA1D1937E, 0x38D8C2C4, 0x4FDFF252,
-            0xD1BB67F1, 0xA6BC5767, 0x3FB506DD, 0x48B2364B,
-            0xD80D2BDA, 0xAF0A1B4C, 0x36034AF6, 0x41047A60,
-            0xDF60EFC3, 0xA867DF55, 0x316E8EEF, 0x4669BE79,
-            0xCB61B38C, 0xBC66831A, 0x256FD2A0, 0x5268E236,
-            0xCC0C7795, 0xBB0B4703, 0x220216B9, 0x5505262F,
-            0xC5BA3BBE, 0xB2BD0B28, 0x2BB45A92, 0x5CB36A04,
-            0xC2D7FFA7, 0xB5D0CF31, 0x2CD99E8B, 0x5BDEAE1D,
-            0x9B64C2B0, 0xEC63F226, 0x756AA39C, 0x026D930A,
-            0x9C0906A9, 0xEB0E363F, 0x72076785, 0x05005713,
-            0x95BF4A82, 0xE2B87A14, 0x7BB12BAE, 0x0CB61B38,
-            0x92D28E9B, 0xE5D5BE0D, 0x7CDCEFB7, 0x0BDBDF21,
-            0x86D3D2D4, 0xF1D4E242, 0x68DDB3F8, 0x1FDA836E,
-            0x81BE16CD, 0xF6B9265B, 0x6FB077E1, 0x18B74777,
-            0x88085AE6, 0xFF0F6A70, 0x66063BCA, 0x11010B5C,
-            0x8F659EFF, 0xF862AE69, 0x616BFFD3, 0x166CCF45,
-            0xA00AE278, 0xD70DD2EE, 0x4E048354, 0x3903B3C2,
-            0xA7672661, 0xD06016F7, 0x4969474D, 0x3E6E77DB,
-            0xAED16A4A, 0xD9D65ADC, 0x40DF0B66, 0x37D83BF0,
-            0xA9BCAE53, 0xDEBB9EC5, 0x47B2CF7F, 0x30B5FFE9,
-            0xBDBDF21C, 0xCABAC28A, 0x53B39330, 0x24B4A3A6,
-            0xBAD03605, 0xCDD70693, 0x54DE5729, 0x23D967BF,
-            0xB3667A2E, 0xC4614AB8, 0x5D681B02, 0x2A6F2B94,
-            0xB40BBE37, 0xC30C8EA1, 0x5A05DF1B, 0x2D02EF8D
-        );
-
-        // For this function to yield the same output as PHP's crc32 function, $crc would have to be
-        // set to 0xFFFFFFFF, initially - not 0x00000000 as it currently is.
-        $crc = 0x00000000;
-        $length = strlen($data);
-
-        for ($i=0; $i<$length; $i++) {
-            // We AND $crc >> 8 with 0x00FFFFFF because we want the eight newly added bits to all
-            // be zero.  PHP, unfortunately, doesn't always do this.  0x80000000 >> 8, as an example,
-            // yields 0xFF800000 - not 0x00800000.  The following link elaborates:
-            // http://www.php.net/manual/en/language.operators.bitwise.php#57281
-            $crc = (($crc >> 8) & 0x00FFFFFF) ^ $crc_lookup_table[($crc & 0xFF) ^ ord($data[$i])];
-        }
-
-        // In addition to having to set $crc to 0xFFFFFFFF, initially, the return value must be XOR'd with
-        // 0xFFFFFFFF for this function to return the same thing that PHP's crc32 function would.
-        return $crc;
-    }
-
-    /**
-     * String Shift
-     *
-     * Inspired by array_shift
-     *
-     * @param string $string
-     * @param int $index
-     * @return string
-     * @access private
-     */
-    function _string_shift(&$string, $index = 1)
-    {
-        $substr = substr($string, 0, $index);
-        $string = substr($string, $index);
-        return $substr;
-    }
-
-    /**
-     * RSA Encrypt
-     *
-     * Returns mod(pow($m, $e), $n), where $n should be the product of two (large) primes $p and $q and where $e
-     * should be a number with the property that gcd($e, ($p - 1) * ($q - 1)) == 1.  Could just make anything that
-     * calls this call modexp, instead, but I think this makes things clearer, maybe...
-     *
-     * @see self::__construct()
-     * @param BigInteger $m
-     * @param array $key
-     * @return BigInteger
-     * @access private
-     */
-    function _rsa_crypt($m, $key)
-    {
-        /*
-        $rsa = new RSA();
-        $rsa->loadKey($key, RSA::PUBLIC_FORMAT_RAW);
-        $rsa->setEncryptionMode(RSA::ENCRYPTION_PKCS1);
-        return $rsa->encrypt($m);
-        */
-
-        // To quote from protocol-1.5.txt:
-        // The most significant byte (which is only partial as the value must be
-        // less than the public modulus, which is never a power of two) is zero.
-        //
-        // The next byte contains the value 2 (which stands for public-key
-        // encrypted data in the PKCS standard [PKCS#1]).  Then, there are non-
-        // zero random bytes to fill any unused space, a zero byte, and the data
-        // to be encrypted in the least significant bytes, the last byte of the
-        // data in the least significant byte.
-
-        // Presumably the part of PKCS#1 they're refering to is "Section 7.2.1 Encryption Operation",
-        // under "7.2 RSAES-PKCS1-v1.5" and "7 Encryption schemes" of the following URL:
-        // ftp://ftp.rsasecurity.com/pub/pkcs/pkcs-1/pkcs-1v2-1.pdf
-        $modulus = $key[1]->toBytes();
-        $length = strlen($modulus) - strlen($m) - 3;
-        $random = '';
-        while (strlen($random) != $length) {
-            $block = Random::string($length - strlen($random));
-            $block = str_replace("\x00", '', $block);
-            $random.= $block;
-        }
-        $temp = chr(0) . chr(2) . $random . chr(0) . $m;
-
-        $m = new BigInteger($temp, 256);
-        $m = $m->modPow($key[0], $key[1]);
-
-        return $m->toBytes();
-    }
-
-    /**
-     * Define Array
-     *
-     * Takes any number of arrays whose indices are integers and whose values are strings and defines a bunch of
-     * named constants from it, using the value as the name of the constant and the index as the value of the constant.
-     * If any of the constants that would be defined already exists, none of the constants will be defined.
-     *
-     * @param array $array
-     * @access private
-     */
-    function _define_array()
-    {
-        $args = func_get_args();
-        foreach ($args as $arg) {
-            foreach ($arg as $key => $value) {
-                if (!defined($value)) {
-                    define($value, $key);
-                } else {
-                    break 2;
-                }
-            }
-        }
-    }
-
-    /**
-     * Returns a log of the packets that have been sent and received.
-     *
-     * Returns a string if NET_SSH1_LOGGING == self::LOG_COMPLEX, an array if NET_SSH1_LOGGING == self::LOG_SIMPLE and false if !defined('NET_SSH1_LOGGING')
-     *
-     * @access public
-     * @return array|false|string
-     */
-    function getLog()
-    {
-        if (!defined('NET_SSH1_LOGGING')) {
-            return false;
-        }
-
-        switch (NET_SSH1_LOGGING) {
-            case self::LOG_SIMPLE:
-                return $this->message_number_log;
-                break;
-            case self::LOG_COMPLEX:
-                return $this->_format_log($this->message_log, $this->protocol_flags_log);
-                break;
-            default:
-                return false;
-        }
-    }
-
-    /**
-     * Formats a log for printing
-     *
-     * @param array $message_log
-     * @param array $message_number_log
-     * @access private
-     * @return string
-     */
-    function _format_log($message_log, $message_number_log)
-    {
-        $output = '';
-        for ($i = 0; $i < count($message_log); $i++) {
-            $output.= $message_number_log[$i] . "\r\n";
-            $current_log = $message_log[$i];
-            $j = 0;
-            do {
-                if (strlen($current_log)) {
-                    $output.= str_pad(dechex($j), 7, '0', STR_PAD_LEFT) . '0  ';
-                }
-                $fragment = $this->_string_shift($current_log, $this->log_short_width);
-                $hex = substr(preg_replace_callback('#.#s', array($this, '_format_log_helper'), $fragment), strlen($this->log_boundary));
-                // replace non ASCII printable characters with dots
-                // http://en.wikipedia.org/wiki/ASCII#ASCII_printable_characters
-                // also replace < with a . since < messes up the output on web browsers
-                $raw = preg_replace('#[^\x20-\x7E]|<#', '.', $fragment);
-                $output.= str_pad($hex, $this->log_long_width - $this->log_short_width, ' ') . $raw . "\r\n";
-                $j++;
-            } while (strlen($current_log));
-            $output.= "\r\n";
-        }
-
-        return $output;
-    }
-
-    /**
-     * Helper function for _format_log
-     *
-     * For use with preg_replace_callback()
-     *
-     * @param array $matches
-     * @access private
-     * @return string
-     */
-    function _format_log_helper($matches)
-    {
-        return $this->log_boundary . str_pad(dechex(ord($matches[0])), 2, '0', STR_PAD_LEFT);
-    }
-
-    /**
-     * Return the server key public exponent
-     *
-     * Returns, by default, the base-10 representation.  If $raw_output is set to true, returns, instead,
-     * the raw bytes.  This behavior is similar to PHP's md5() function.
-     *
-     * @param bool $raw_output
-     * @return string
-     * @access public
-     */
-    function getServerKeyPublicExponent($raw_output = false)
-    {
-        return $raw_output ? $this->server_key_public_exponent->toBytes() : $this->server_key_public_exponent->toString();
-    }
-
-    /**
-     * Return the server key public modulus
-     *
-     * Returns, by default, the base-10 representation.  If $raw_output is set to true, returns, instead,
-     * the raw bytes.  This behavior is similar to PHP's md5() function.
-     *
-     * @param bool $raw_output
-     * @return string
-     * @access public
-     */
-    function getServerKeyPublicModulus($raw_output = false)
-    {
-        return $raw_output ? $this->server_key_public_modulus->toBytes() : $this->server_key_public_modulus->toString();
-    }
-
-    /**
-     * Return the host key public exponent
-     *
-     * Returns, by default, the base-10 representation.  If $raw_output is set to true, returns, instead,
-     * the raw bytes.  This behavior is similar to PHP's md5() function.
-     *
-     * @param bool $raw_output
-     * @return string
-     * @access public
-     */
-    function getHostKeyPublicExponent($raw_output = false)
-    {
-        return $raw_output ? $this->host_key_public_exponent->toBytes() : $this->host_key_public_exponent->toString();
-    }
-
-    /**
-     * Return the host key public modulus
-     *
-     * Returns, by default, the base-10 representation.  If $raw_output is set to true, returns, instead,
-     * the raw bytes.  This behavior is similar to PHP's md5() function.
-     *
-     * @param bool $raw_output
-     * @return string
-     * @access public
-     */
-    function getHostKeyPublicModulus($raw_output = false)
-    {
-        return $raw_output ? $this->host_key_public_modulus->toBytes() : $this->host_key_public_modulus->toString();
-    }
-
-    /**
-     * Return a list of ciphers supported by SSH1 server.
-     *
-     * Just because a cipher is supported by an SSH1 server doesn't mean it's supported by this library. If $raw_output
-     * is set to true, returns, instead, an array of constants.  ie. instead of array('Triple-DES in CBC mode'), you'll
-     * get array(self::CIPHER_3DES).
-     *
-     * @param bool $raw_output
-     * @return array
-     * @access public
-     */
-    function getSupportedCiphers($raw_output = false)
-    {
-        return $raw_output ? array_keys($this->supported_ciphers) : array_values($this->supported_ciphers);
-    }
-
-    /**
-     * Return a list of authentications supported by SSH1 server.
-     *
-     * Just because a cipher is supported by an SSH1 server doesn't mean it's supported by this library. If $raw_output
-     * is set to true, returns, instead, an array of constants.  ie. instead of array('password authentication'), you'll
-     * get array(self::AUTH_PASSWORD).
-     *
-     * @param bool $raw_output
-     * @return array
-     * @access public
-     */
-    function getSupportedAuthentications($raw_output = false)
-    {
-        return $raw_output ? array_keys($this->supported_authentications) : array_values($this->supported_authentications);
-    }
-
-    /**
-     * Return the server identification.
-     *
-     * @return string
-     * @access public
-     */
-    function getServerIdentification()
-    {
-        return rtrim($this->server_identification);
-    }
-
-    /**
-     * Logs data packets
-     *
-     * Makes sure that only the last 1MB worth of packets will be logged
-     *
-     * @param string $data
-     * @access private
-     */
-    function _append_log($protocol_flags, $message)
-    {
-        switch (NET_SSH1_LOGGING) {
-            // useful for benchmarks
-            case self::LOG_SIMPLE:
-                $this->protocol_flags_log[] = $protocol_flags;
-                break;
-            // the most useful log for SSH1
-            case self::LOG_COMPLEX:
-                $this->protocol_flags_log[] = $protocol_flags;
-                $this->_string_shift($message);
-                $this->log_size+= strlen($message);
-                $this->message_log[] = $message;
-                while ($this->log_size > self::LOG_MAX_SIZE) {
-                    $this->log_size-= strlen(array_shift($this->message_log));
-                    array_shift($this->protocol_flags_log);
-                }
-                break;
-            // dump the output out realtime; packets may be interspersed with non packets,
-            // passwords won't be filtered out and select other packets may not be correctly
-            // identified
-            case self::LOG_REALTIME:
-                echo "
\r\n" . $this->_format_log(array($message), array($protocol_flags)) . "\r\n
\r\n";
-                @flush();
-                @ob_flush();
-                break;
-            // basically the same thing as self::LOG_REALTIME with the caveat that self::LOG_REALTIME_FILE
-            // needs to be defined and that the resultant log file will be capped out at self::LOG_MAX_SIZE.
-            // the earliest part of the log file is denoted by the first <<< START >>> and is not going to necessarily
-            // at the beginning of the file
-            case self::LOG_REALTIME_FILE:
-                if (!isset($this->realtime_log_file)) {
-                    // PHP doesn't seem to like using constants in fopen()
-                    $filename = self::LOG_REALTIME_FILE;
-                    $fp = fopen($filename, 'w');
-                    $this->realtime_log_file = $fp;
-                }
-                if (!is_resource($this->realtime_log_file)) {
-                    break;
-                }
-                $entry = $this->_format_log(array($message), array($protocol_flags));
-                if ($this->realtime_log_wrap) {
-                    $temp = "<<< START >>>\r\n";
-                    $entry.= $temp;
-                    fseek($this->realtime_log_file, ftell($this->realtime_log_file) - strlen($temp));
-                }
-                $this->realtime_log_size+= strlen($entry);
-                if ($this->realtime_log_size > self::LOG_MAX_SIZE) {
-                    fseek($this->realtime_log_file, 0);
-                    $this->realtime_log_size = strlen($entry);
-                    $this->realtime_log_wrap = true;
-                }
-                fputs($this->realtime_log_file, $entry);
-        }
-    }
-}
diff --git a/mayor-orig/www/include/share/googleapi/phpseclib/phpseclib/phpseclib/Net/SSH2.php b/mayor-orig/www/include/share/googleapi/phpseclib/phpseclib/phpseclib/Net/SSH2.php
deleted file mode 100644
index 937c38cc..00000000
--- a/mayor-orig/www/include/share/googleapi/phpseclib/phpseclib/phpseclib/Net/SSH2.php
+++ /dev/null
@@ -1,4397 +0,0 @@
-
- * login('username', 'password')) {
- *        exit('Login Failed');
- *    }
- *
- *    echo $ssh->exec('pwd');
- *    echo $ssh->exec('ls -la');
- * ?>
- * 
- *
- * 
- * setPassword('whatever');
- *    $key->loadKey(file_get_contents('privatekey'));
- *
- *    $ssh = new \phpseclib\Net\SSH2('www.domain.tld');
- *    if (!$ssh->login('username', $key)) {
- *        exit('Login Failed');
- *    }
- *
- *    echo $ssh->read('username@username:~$');
- *    $ssh->write("ls -la\n");
- *    echo $ssh->read('username@username:~$');
- * ?>
- * 
- *
- * @category  Net
- * @package   SSH2
- * @author    Jim Wigginton 
- * @copyright 2007 Jim Wigginton
- * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
- * @link      http://phpseclib.sourceforge.net
- */
-
-namespace phpseclib\Net;
-
-use phpseclib\Crypt\Base;
-use phpseclib\Crypt\Blowfish;
-use phpseclib\Crypt\Hash;
-use phpseclib\Crypt\Random;
-use phpseclib\Crypt\RC4;
-use phpseclib\Crypt\Rijndael;
-use phpseclib\Crypt\RSA;
-use phpseclib\Crypt\TripleDES;
-use phpseclib\Crypt\Twofish;
-use phpseclib\Math\BigInteger; // Used to do Diffie-Hellman key exchange and DSA/RSA signature verification.
-use phpseclib\System\SSH\Agent;
-
-/**
- * Pure-PHP implementation of SSHv2.
- *
- * @package SSH2
- * @author  Jim Wigginton 
- * @access  public
- */
-class SSH2
-{
-    /**#@+
-     * Execution Bitmap Masks
-     *
-     * @see \phpseclib\Net\SSH2::bitmap
-     * @access private
-     */
-    const MASK_CONSTRUCTOR   = 0x00000001;
-    const MASK_CONNECTED     = 0x00000002;
-    const MASK_LOGIN_REQ     = 0x00000004;
-    const MASK_LOGIN         = 0x00000008;
-    const MASK_SHELL         = 0x00000010;
-    const MASK_WINDOW_ADJUST = 0x00000020;
-    /**#@-*/
-
-    /**#@+
-     * Channel constants
-     *
-     * RFC4254 refers not to client and server channels but rather to sender and recipient channels.  we don't refer
-     * to them in that way because RFC4254 toggles the meaning. the client sends a SSH_MSG_CHANNEL_OPEN message with
-     * a sender channel and the server sends a SSH_MSG_CHANNEL_OPEN_CONFIRMATION in response, with a sender and a
-     * recepient channel.  at first glance, you might conclude that SSH_MSG_CHANNEL_OPEN_CONFIRMATION's sender channel
-     * would be the same thing as SSH_MSG_CHANNEL_OPEN's sender channel, but it's not, per this snipet:
-     *     The 'recipient channel' is the channel number given in the original
-     *     open request, and 'sender channel' is the channel number allocated by
-     *     the other side.
-     *
-     * @see \phpseclib\Net\SSH2::_send_channel_packet()
-     * @see \phpseclib\Net\SSH2::_get_channel_packet()
-     * @access private
-    */
-    const CHANNEL_EXEC          = 0; // PuTTy uses 0x100
-    const CHANNEL_SHELL         = 1;
-    const CHANNEL_SUBSYSTEM     = 2;
-    const CHANNEL_AGENT_FORWARD = 3;
-    /**#@-*/
-
-    /**#@+
-     * @access public
-     * @see \phpseclib\Net\SSH2::getLog()
-    */
-    /**
-     * Returns the message numbers
-     */
-    const LOG_SIMPLE = 1;
-    /**
-     * Returns the message content
-     */
-    const LOG_COMPLEX = 2;
-    /**
-     * Outputs the content real-time
-     */
-    const LOG_REALTIME = 3;
-    /**
-     * Dumps the content real-time to a file
-     */
-    const LOG_REALTIME_FILE = 4;
-    /**#@-*/
-
-    /**#@+
-     * @access public
-     * @see \phpseclib\Net\SSH2::read()
-    */
-    /**
-     * Returns when a string matching $expect exactly is found
-     */
-    const READ_SIMPLE = 1;
-    /**
-     * Returns when a string matching the regular expression $expect is found
-     */
-    const READ_REGEX = 2;
-    /**
-     * Make sure that the log never gets larger than this
-     */
-    const LOG_MAX_SIZE = 1048576; // 1024 * 1024
-    /**#@-*/
-
-    /**
-     * The SSH identifier
-     *
-     * @var string
-     * @access private
-     */
-    var $identifier;
-
-    /**
-     * The Socket Object
-     *
-     * @var object
-     * @access private
-     */
-    var $fsock;
-
-    /**
-     * Execution Bitmap
-     *
-     * The bits that are set represent functions that have been called already.  This is used to determine
-     * if a requisite function has been successfully executed.  If not, an error should be thrown.
-     *
-     * @var int
-     * @access private
-     */
-    var $bitmap = 0;
-
-    /**
-     * Error information
-     *
-     * @see self::getErrors()
-     * @see self::getLastError()
-     * @var string
-     * @access private
-     */
-    var $errors = array();
-
-    /**
-     * Server Identifier
-     *
-     * @see self::getServerIdentification()
-     * @var array|false
-     * @access private
-     */
-    var $server_identifier = false;
-
-    /**
-     * Key Exchange Algorithms
-     *
-     * @see self::getKexAlgorithims()
-     * @var array|false
-     * @access private
-     */
-    var $kex_algorithms = false;
-
-    /**
-     * Minimum Diffie-Hellman Group Bit Size in RFC 4419 Key Exchange Methods
-     *
-     * @see self::_key_exchange()
-     * @var int
-     * @access private
-     */
-    var $kex_dh_group_size_min = 1536;
-
-    /**
-     * Preferred Diffie-Hellman Group Bit Size in RFC 4419 Key Exchange Methods
-     *
-     * @see self::_key_exchange()
-     * @var int
-     * @access private
-     */
-    var $kex_dh_group_size_preferred = 2048;
-
-    /**
-     * Maximum Diffie-Hellman Group Bit Size in RFC 4419 Key Exchange Methods
-     *
-     * @see self::_key_exchange()
-     * @var int
-     * @access private
-     */
-    var $kex_dh_group_size_max = 4096;
-
-    /**
-     * Server Host Key Algorithms
-     *
-     * @see self::getServerHostKeyAlgorithms()
-     * @var array|false
-     * @access private
-     */
-    var $server_host_key_algorithms = false;
-
-    /**
-     * Encryption Algorithms: Client to Server
-     *
-     * @see self::getEncryptionAlgorithmsClient2Server()
-     * @var array|false
-     * @access private
-     */
-    var $encryption_algorithms_client_to_server = false;
-
-    /**
-     * Encryption Algorithms: Server to Client
-     *
-     * @see self::getEncryptionAlgorithmsServer2Client()
-     * @var array|false
-     * @access private
-     */
-    var $encryption_algorithms_server_to_client = false;
-
-    /**
-     * MAC Algorithms: Client to Server
-     *
-     * @see self::getMACAlgorithmsClient2Server()
-     * @var array|false
-     * @access private
-     */
-    var $mac_algorithms_client_to_server = false;
-
-    /**
-     * MAC Algorithms: Server to Client
-     *
-     * @see self::getMACAlgorithmsServer2Client()
-     * @var array|false
-     * @access private
-     */
-    var $mac_algorithms_server_to_client = false;
-
-    /**
-     * Compression Algorithms: Client to Server
-     *
-     * @see self::getCompressionAlgorithmsClient2Server()
-     * @var array|false
-     * @access private
-     */
-    var $compression_algorithms_client_to_server = false;
-
-    /**
-     * Compression Algorithms: Server to Client
-     *
-     * @see self::getCompressionAlgorithmsServer2Client()
-     * @var array|false
-     * @access private
-     */
-    var $compression_algorithms_server_to_client = false;
-
-    /**
-     * Languages: Server to Client
-     *
-     * @see self::getLanguagesServer2Client()
-     * @var array|false
-     * @access private
-     */
-    var $languages_server_to_client = false;
-
-    /**
-     * Languages: Client to Server
-     *
-     * @see self::getLanguagesClient2Server()
-     * @var array|false
-     * @access private
-     */
-    var $languages_client_to_server = false;
-
-    /**
-     * Block Size for Server to Client Encryption
-     *
-     * "Note that the length of the concatenation of 'packet_length',
-     *  'padding_length', 'payload', and 'random padding' MUST be a multiple
-     *  of the cipher block size or 8, whichever is larger.  This constraint
-     *  MUST be enforced, even when using stream ciphers."
-     *
-     *  -- http://tools.ietf.org/html/rfc4253#section-6
-     *
-     * @see self::__construct()
-     * @see self::_send_binary_packet()
-     * @var int
-     * @access private
-     */
-    var $encrypt_block_size = 8;
-
-    /**
-     * Block Size for Client to Server Encryption
-     *
-     * @see self::__construct()
-     * @see self::_get_binary_packet()
-     * @var int
-     * @access private
-     */
-    var $decrypt_block_size = 8;
-
-    /**
-     * Server to Client Encryption Object
-     *
-     * @see self::_get_binary_packet()
-     * @var object
-     * @access private
-     */
-    var $decrypt = false;
-
-    /**
-     * Client to Server Encryption Object
-     *
-     * @see self::_send_binary_packet()
-     * @var object
-     * @access private
-     */
-    var $encrypt = false;
-
-    /**
-     * Client to Server HMAC Object
-     *
-     * @see self::_send_binary_packet()
-     * @var object
-     * @access private
-     */
-    var $hmac_create = false;
-
-    /**
-     * Server to Client HMAC Object
-     *
-     * @see self::_get_binary_packet()
-     * @var object
-     * @access private
-     */
-    var $hmac_check = false;
-
-    /**
-     * Size of server to client HMAC
-     *
-     * We need to know how big the HMAC will be for the server to client direction so that we know how many bytes to read.
-     * For the client to server side, the HMAC object will make the HMAC as long as it needs to be.  All we need to do is
-     * append it.
-     *
-     * @see self::_get_binary_packet()
-     * @var int
-     * @access private
-     */
-    var $hmac_size = false;
-
-    /**
-     * Server Public Host Key
-     *
-     * @see self::getServerPublicHostKey()
-     * @var string
-     * @access private
-     */
-    var $server_public_host_key;
-
-    /**
-     * Session identifier
-     *
-     * "The exchange hash H from the first key exchange is additionally
-     *  used as the session identifier, which is a unique identifier for
-     *  this connection."
-     *
-     *  -- http://tools.ietf.org/html/rfc4253#section-7.2
-     *
-     * @see self::_key_exchange()
-     * @var string
-     * @access private
-     */
-    var $session_id = false;
-
-    /**
-     * Exchange hash
-     *
-     * The current exchange hash
-     *
-     * @see self::_key_exchange()
-     * @var string
-     * @access private
-     */
-    var $exchange_hash = false;
-
-    /**
-     * Message Numbers
-     *
-     * @see self::__construct()
-     * @var array
-     * @access private
-     */
-    var $message_numbers = array();
-
-    /**
-     * Disconnection Message 'reason codes' defined in RFC4253
-     *
-     * @see self::__construct()
-     * @var array
-     * @access private
-     */
-    var $disconnect_reasons = array();
-
-    /**
-     * SSH_MSG_CHANNEL_OPEN_FAILURE 'reason codes', defined in RFC4254
-     *
-     * @see self::__construct()
-     * @var array
-     * @access private
-     */
-    var $channel_open_failure_reasons = array();
-
-    /**
-     * Terminal Modes
-     *
-     * @link http://tools.ietf.org/html/rfc4254#section-8
-     * @see self::__construct()
-     * @var array
-     * @access private
-     */
-    var $terminal_modes = array();
-
-    /**
-     * SSH_MSG_CHANNEL_EXTENDED_DATA's data_type_codes
-     *
-     * @link http://tools.ietf.org/html/rfc4254#section-5.2
-     * @see self::__construct()
-     * @var array
-     * @access private
-     */
-    var $channel_extended_data_type_codes = array();
-
-    /**
-     * Send Sequence Number
-     *
-     * See 'Section 6.4.  Data Integrity' of rfc4253 for more info.
-     *
-     * @see self::_send_binary_packet()
-     * @var int
-     * @access private
-     */
-    var $send_seq_no = 0;
-
-    /**
-     * Get Sequence Number
-     *
-     * See 'Section 6.4.  Data Integrity' of rfc4253 for more info.
-     *
-     * @see self::_get_binary_packet()
-     * @var int
-     * @access private
-     */
-    var $get_seq_no = 0;
-
-    /**
-     * Server Channels
-     *
-     * Maps client channels to server channels
-     *
-     * @see self::_get_channel_packet()
-     * @see self::exec()
-     * @var array
-     * @access private
-     */
-    var $server_channels = array();
-
-    /**
-     * Channel Buffers
-     *
-     * If a client requests a packet from one channel but receives two packets from another those packets should
-     * be placed in a buffer
-     *
-     * @see self::_get_channel_packet()
-     * @see self::exec()
-     * @var array
-     * @access private
-     */
-    var $channel_buffers = array();
-
-    /**
-     * Channel Status
-     *
-     * Contains the type of the last sent message
-     *
-     * @see self::_get_channel_packet()
-     * @var array
-     * @access private
-     */
-    var $channel_status = array();
-
-    /**
-     * Packet Size
-     *
-     * Maximum packet size indexed by channel
-     *
-     * @see self::_send_channel_packet()
-     * @var array
-     * @access private
-     */
-    var $packet_size_client_to_server = array();
-
-    /**
-     * Message Number Log
-     *
-     * @see self::getLog()
-     * @var array
-     * @access private
-     */
-    var $message_number_log = array();
-
-    /**
-     * Message Log
-     *
-     * @see self::getLog()
-     * @var array
-     * @access private
-     */
-    var $message_log = array();
-
-    /**
-     * The Window Size
-     *
-     * Bytes the other party can send before it must wait for the window to be adjusted (0x7FFFFFFF = 2GB)
-     *
-     * @var int
-     * @see self::_send_channel_packet()
-     * @see self::exec()
-     * @access private
-     */
-    var $window_size = 0x7FFFFFFF;
-
-    /**
-     * Window size, server to client
-     *
-     * Window size indexed by channel
-     *
-     * @see self::_send_channel_packet()
-     * @var array
-     * @access private
-     */
-    var $window_size_server_to_client = array();
-
-    /**
-     * Window size, client to server
-     *
-     * Window size indexed by channel
-     *
-     * @see self::_get_channel_packet()
-     * @var array
-     * @access private
-     */
-    var $window_size_client_to_server = array();
-
-    /**
-     * Server signature
-     *
-     * Verified against $this->session_id
-     *
-     * @see self::getServerPublicHostKey()
-     * @var string
-     * @access private
-     */
-    var $signature = '';
-
-    /**
-     * Server signature format
-     *
-     * ssh-rsa or ssh-dss.
-     *
-     * @see self::getServerPublicHostKey()
-     * @var string
-     * @access private
-     */
-    var $signature_format = '';
-
-    /**
-     * Interactive Buffer
-     *
-     * @see self::read()
-     * @var array
-     * @access private
-     */
-    var $interactiveBuffer = '';
-
-    /**
-     * Current log size
-     *
-     * Should never exceed self::LOG_MAX_SIZE
-     *
-     * @see self::_send_binary_packet()
-     * @see self::_get_binary_packet()
-     * @var int
-     * @access private
-     */
-    var $log_size;
-
-    /**
-     * Timeout
-     *
-     * @see self::setTimeout()
-     * @access private
-     */
-    var $timeout;
-
-    /**
-     * Current Timeout
-     *
-     * @see self::_get_channel_packet()
-     * @access private
-     */
-    var $curTimeout;
-
-    /**
-     * Real-time log file pointer
-     *
-     * @see self::_append_log()
-     * @var resource
-     * @access private
-     */
-    var $realtime_log_file;
-
-    /**
-     * Real-time log file size
-     *
-     * @see self::_append_log()
-     * @var int
-     * @access private
-     */
-    var $realtime_log_size;
-
-    /**
-     * Has the signature been validated?
-     *
-     * @see self::getServerPublicHostKey()
-     * @var bool
-     * @access private
-     */
-    var $signature_validated = false;
-
-    /**
-     * Real-time log file wrap boolean
-     *
-     * @see self::_append_log()
-     * @access private
-     */
-    var $realtime_log_wrap;
-
-    /**
-     * Flag to suppress stderr from output
-     *
-     * @see self::enableQuietMode()
-     * @access private
-     */
-    var $quiet_mode = false;
-
-    /**
-     * Time of first network activity
-     *
-     * @var int
-     * @access private
-     */
-    var $last_packet;
-
-    /**
-     * Exit status returned from ssh if any
-     *
-     * @var int
-     * @access private
-     */
-    var $exit_status;
-
-    /**
-     * Flag to request a PTY when using exec()
-     *
-     * @var bool
-     * @see self::enablePTY()
-     * @access private
-     */
-    var $request_pty = false;
-
-    /**
-     * Flag set while exec() is running when using enablePTY()
-     *
-     * @var bool
-     * @access private
-     */
-    var $in_request_pty_exec = false;
-
-    /**
-     * Flag set after startSubsystem() is called
-     *
-     * @var bool
-     * @access private
-     */
-    var $in_subsystem;
-
-    /**
-     * Contents of stdError
-     *
-     * @var string
-     * @access private
-     */
-    var $stdErrorLog;
-
-    /**
-     * The Last Interactive Response
-     *
-     * @see self::_keyboard_interactive_process()
-     * @var string
-     * @access private
-     */
-    var $last_interactive_response = '';
-
-    /**
-     * Keyboard Interactive Request / Responses
-     *
-     * @see self::_keyboard_interactive_process()
-     * @var array
-     * @access private
-     */
-    var $keyboard_requests_responses = array();
-
-    /**
-     * Banner Message
-     *
-     * Quoting from the RFC, "in some jurisdictions, sending a warning message before
-     * authentication may be relevant for getting legal protection."
-     *
-     * @see self::_filter()
-     * @see self::getBannerMessage()
-     * @var string
-     * @access private
-     */
-    var $banner_message = '';
-
-    /**
-     * Did read() timeout or return normally?
-     *
-     * @see self::isTimeout()
-     * @var bool
-     * @access private
-     */
-    var $is_timeout = false;
-
-    /**
-     * Log Boundary
-     *
-     * @see self::_format_log()
-     * @var string
-     * @access private
-     */
-    var $log_boundary = ':';
-
-    /**
-     * Log Long Width
-     *
-     * @see self::_format_log()
-     * @var int
-     * @access private
-     */
-    var $log_long_width = 65;
-
-    /**
-     * Log Short Width
-     *
-     * @see self::_format_log()
-     * @var int
-     * @access private
-     */
-    var $log_short_width = 16;
-
-    /**
-     * Hostname
-     *
-     * @see self::__construct()
-     * @see self::_connect()
-     * @var string
-     * @access private
-     */
-    var $host;
-
-    /**
-     * Port Number
-     *
-     * @see self::__construct()
-     * @see self::_connect()
-     * @var int
-     * @access private
-     */
-    var $port;
-
-    /**
-     * Number of columns for terminal window size
-     *
-     * @see self::getWindowColumns()
-     * @see self::setWindowColumns()
-     * @see self::setWindowSize()
-     * @var int
-     * @access private
-     */
-    var $windowColumns = 80;
-
-    /**
-     * Number of columns for terminal window size
-     *
-     * @see self::getWindowRows()
-     * @see self::setWindowRows()
-     * @see self::setWindowSize()
-     * @var int
-     * @access private
-     */
-    var $windowRows = 24;
-
-    /**
-     * Crypto Engine
-     *
-     * @see self::setCryptoEngine()
-     * @see self::_key_exchange()
-     * @var int
-     * @access private
-     */
-    var $crypto_engine = false;
-
-    /**
-     * A System_SSH_Agent for use in the SSH2 Agent Forwarding scenario
-     *
-     * @var System_SSH_Agent
-     * @access private
-     */
-    var $agent;
-
-    /**
-     * Default Constructor.
-     *
-     * $host can either be a string, representing the host, or a stream resource.
-     *
-     * @param mixed $host
-     * @param int $port
-     * @param int $timeout
-     * @see self::login()
-     * @return \phpseclib\Net\SSH2
-     * @access public
-     */
-    function __construct($host, $port = 22, $timeout = 10)
-    {
-        $this->message_numbers = array(
-            1 => 'NET_SSH2_MSG_DISCONNECT',
-            2 => 'NET_SSH2_MSG_IGNORE',
-            3 => 'NET_SSH2_MSG_UNIMPLEMENTED',
-            4 => 'NET_SSH2_MSG_DEBUG',
-            5 => 'NET_SSH2_MSG_SERVICE_REQUEST',
-            6 => 'NET_SSH2_MSG_SERVICE_ACCEPT',
-            20 => 'NET_SSH2_MSG_KEXINIT',
-            21 => 'NET_SSH2_MSG_NEWKEYS',
-            30 => 'NET_SSH2_MSG_KEXDH_INIT',
-            31 => 'NET_SSH2_MSG_KEXDH_REPLY',
-            50 => 'NET_SSH2_MSG_USERAUTH_REQUEST',
-            51 => 'NET_SSH2_MSG_USERAUTH_FAILURE',
-            52 => 'NET_SSH2_MSG_USERAUTH_SUCCESS',
-            53 => 'NET_SSH2_MSG_USERAUTH_BANNER',
-
-            80 => 'NET_SSH2_MSG_GLOBAL_REQUEST',
-            81 => 'NET_SSH2_MSG_REQUEST_SUCCESS',
-            82 => 'NET_SSH2_MSG_REQUEST_FAILURE',
-            90 => 'NET_SSH2_MSG_CHANNEL_OPEN',
-            91 => 'NET_SSH2_MSG_CHANNEL_OPEN_CONFIRMATION',
-            92 => 'NET_SSH2_MSG_CHANNEL_OPEN_FAILURE',
-            93 => 'NET_SSH2_MSG_CHANNEL_WINDOW_ADJUST',
-            94 => 'NET_SSH2_MSG_CHANNEL_DATA',
-            95 => 'NET_SSH2_MSG_CHANNEL_EXTENDED_DATA',
-            96 => 'NET_SSH2_MSG_CHANNEL_EOF',
-            97 => 'NET_SSH2_MSG_CHANNEL_CLOSE',
-            98 => 'NET_SSH2_MSG_CHANNEL_REQUEST',
-            99 => 'NET_SSH2_MSG_CHANNEL_SUCCESS',
-            100 => 'NET_SSH2_MSG_CHANNEL_FAILURE'
-        );
-        $this->disconnect_reasons = array(
-            1 => 'NET_SSH2_DISCONNECT_HOST_NOT_ALLOWED_TO_CONNECT',
-            2 => 'NET_SSH2_DISCONNECT_PROTOCOL_ERROR',
-            3 => 'NET_SSH2_DISCONNECT_KEY_EXCHANGE_FAILED',
-            4 => 'NET_SSH2_DISCONNECT_RESERVED',
-            5 => 'NET_SSH2_DISCONNECT_MAC_ERROR',
-            6 => 'NET_SSH2_DISCONNECT_COMPRESSION_ERROR',
-            7 => 'NET_SSH2_DISCONNECT_SERVICE_NOT_AVAILABLE',
-            8 => 'NET_SSH2_DISCONNECT_PROTOCOL_VERSION_NOT_SUPPORTED',
-            9 => 'NET_SSH2_DISCONNECT_HOST_KEY_NOT_VERIFIABLE',
-            10 => 'NET_SSH2_DISCONNECT_CONNECTION_LOST',
-            11 => 'NET_SSH2_DISCONNECT_BY_APPLICATION',
-            12 => 'NET_SSH2_DISCONNECT_TOO_MANY_CONNECTIONS',
-            13 => 'NET_SSH2_DISCONNECT_AUTH_CANCELLED_BY_USER',
-            14 => 'NET_SSH2_DISCONNECT_NO_MORE_AUTH_METHODS_AVAILABLE',
-            15 => 'NET_SSH2_DISCONNECT_ILLEGAL_USER_NAME'
-        );
-        $this->channel_open_failure_reasons = array(
-            1 => 'NET_SSH2_OPEN_ADMINISTRATIVELY_PROHIBITED'
-        );
-        $this->terminal_modes = array(
-            0 => 'NET_SSH2_TTY_OP_END'
-        );
-        $this->channel_extended_data_type_codes = array(
-            1 => 'NET_SSH2_EXTENDED_DATA_STDERR'
-        );
-
-        $this->_define_array(
-            $this->message_numbers,
-            $this->disconnect_reasons,
-            $this->channel_open_failure_reasons,
-            $this->terminal_modes,
-            $this->channel_extended_data_type_codes,
-            array(60 => 'NET_SSH2_MSG_USERAUTH_PASSWD_CHANGEREQ'),
-            array(60 => 'NET_SSH2_MSG_USERAUTH_PK_OK'),
-            array(60 => 'NET_SSH2_MSG_USERAUTH_INFO_REQUEST',
-                  61 => 'NET_SSH2_MSG_USERAUTH_INFO_RESPONSE'),
-            // RFC 4419 - diffie-hellman-group-exchange-sha{1,256}
-            array(30 => 'NET_SSH2_MSG_KEXDH_GEX_REQUEST_OLD',
-                  31 => 'NET_SSH2_MSG_KEXDH_GEX_GROUP',
-                  32 => 'NET_SSH2_MSG_KEXDH_GEX_INIT',
-                  33 => 'NET_SSH2_MSG_KEXDH_GEX_REPLY',
-                  34 => 'NET_SSH2_MSG_KEXDH_GEX_REQUEST'),
-            // RFC 5656 - Elliptic Curves (for curve25519-sha256@libssh.org)
-            array(30 => 'NET_SSH2_MSG_KEX_ECDH_INIT',
-                  31 => 'NET_SSH2_MSG_KEX_ECDH_REPLY')
-        );
-
-        if (is_resource($host)) {
-            $this->fsock = $host;
-            return;
-        }
-
-        if (is_string($host)) {
-            $this->host = $host;
-            $this->port = $port;
-            $this->timeout = $timeout;
-        }
-    }
-
-    /**
-     * Set Crypto Engine Mode
-     *
-     * Possible $engine values:
-     * CRYPT_MODE_INTERNAL, CRYPT_MODE_MCRYPT
-     *
-     * @param int $engine
-     * @access private
-     */
-    function setCryptoEngine($engine)
-    {
-        $this->crypto_engine = $engine;
-    }
-
-    /**
-     * Connect to an SSHv2 server
-     *
-     * @return bool
-     * @access private
-     */
-    function _connect()
-    {
-        if ($this->bitmap & self::MASK_CONSTRUCTOR) {
-            return false;
-        }
-
-        $this->bitmap |= self::MASK_CONSTRUCTOR;
-
-        $this->curTimeout = $this->timeout;
-
-        $this->last_packet = microtime(true);
-
-        if (!is_resource($this->fsock)) {
-            $start = microtime(true);
-            // with stream_select a timeout of 0 means that no timeout takes place;
-            // with fsockopen a timeout of 0 means that you instantly timeout
-            // to resolve this incompatibility a timeout of 100,000 will be used for fsockopen if timeout is 0
-            $this->fsock = @fsockopen($this->host, $this->port, $errno, $errstr, $this->curTimeout == 0 ? 100000 : $this->curTimeout);
-            if (!$this->fsock) {
-                $host = $this->host . ':' . $this->port;
-                user_error(rtrim("Cannot connect to $host. Error $errno. $errstr"));
-                return false;
-            }
-            $elapsed = microtime(true) - $start;
-
-            $this->curTimeout-= $elapsed;
-
-            if ($this->curTimeout <= 0) {
-                $this->is_timeout = true;
-                return false;
-            }
-        }
-
-        $this->identifier = $this->_generate_identifier();
-
-        fputs($this->fsock, $this->identifier . "\r\n");
-
-        /* According to the SSH2 specs,
-
-          "The server MAY send other lines of data before sending the version
-           string.  Each line SHOULD be terminated by a Carriage Return and Line
-           Feed.  Such lines MUST NOT begin with "SSH-", and SHOULD be encoded
-           in ISO-10646 UTF-8 [RFC3629] (language is not specified).  Clients
-           MUST be able to process such lines." */
-        $data = '';
-        while (!feof($this->fsock) && !preg_match('#(.*)^(SSH-(\d\.\d+).*)#ms', $data, $matches)) {
-            $line = '';
-            while (true) {
-                if ($this->curTimeout) {
-                    if ($this->curTimeout < 0) {
-                        $this->is_timeout = true;
-                        return false;
-                    }
-                    $read = array($this->fsock);
-                    $write = $except = null;
-                    $start = microtime(true);
-                    $sec = floor($this->curTimeout);
-                    $usec = 1000000 * ($this->curTimeout - $sec);
-                    // on windows this returns a "Warning: Invalid CRT parameters detected" error
-                    // the !count() is done as a workaround for 
-                    if (!@stream_select($read, $write, $except, $sec, $usec) && !count($read)) {
-                        $this->is_timeout = true;
-                        return false;
-                    }
-                    $elapsed = microtime(true) - $start;
-                    $this->curTimeout-= $elapsed;
-                }
-
-                $temp = stream_get_line($this->fsock, 255, "\n");
-                if (strlen($temp) == 255) {
-                    continue;
-                }
-
-                $line.= "$temp\n";
-
-                // quoting RFC4253, "Implementers who wish to maintain
-                // compatibility with older, undocumented versions of this protocol may
-                // want to process the identification string without expecting the
-                // presence of the carriage return character for reasons described in
-                // Section 5 of this document."
-
-                //if (substr($line, -2) == "\r\n") {
-                //    break;
-                //}
-
-                break;
-            }
-
-            $data.= $line;
-        }
-
-        if (feof($this->fsock)) {
-            user_error('Connection closed by server');
-            return false;
-        }
-
-        $extra = $matches[1];
-
-        if (defined('NET_SSH2_LOGGING')) {
-            $this->_append_log('<-', $matches[0]);
-            $this->_append_log('->', $this->identifier . "\r\n");
-        }
-
-        $this->server_identifier = trim($temp, "\r\n");
-        if (strlen($extra)) {
-            $this->errors[] = utf8_decode($data);
-        }
-
-        if ($matches[3] != '1.99' && $matches[3] != '2.0') {
-            user_error("Cannot connect to SSH $matches[3] servers");
-            return false;
-        }
-
-        $response = $this->_get_binary_packet();
-        if ($response === false) {
-            user_error('Connection closed by server');
-            return false;
-        }
-
-        if (!strlen($response) || ord($response[0]) != NET_SSH2_MSG_KEXINIT) {
-            user_error('Expected SSH_MSG_KEXINIT');
-            return false;
-        }
-
-        if (!$this->_key_exchange($response)) {
-            return false;
-        }
-
-        $this->bitmap|= self::MASK_CONNECTED;
-
-        return true;
-    }
-
-    /**
-     * Generates the SSH identifier
-     *
-     * You should overwrite this method in your own class if you want to use another identifier
-     *
-     * @access protected
-     * @return string
-     */
-    function _generate_identifier()
-    {
-        $identifier = 'SSH-2.0-phpseclib_2.0';
-
-        $ext = array();
-        if (extension_loaded('libsodium')) {
-            $ext[] = 'libsodium';
-        }
-
-        if (extension_loaded('openssl')) {
-            $ext[] = 'openssl';
-        } elseif (extension_loaded('mcrypt')) {
-            $ext[] = 'mcrypt';
-        }
-
-        if (extension_loaded('gmp')) {
-            $ext[] = 'gmp';
-        } elseif (extension_loaded('bcmath')) {
-            $ext[] = 'bcmath';
-        }
-
-        if (!empty($ext)) {
-            $identifier .= ' (' . implode(', ', $ext) . ')';
-        }
-
-        return $identifier;
-    }
-
-    /**
-     * Key Exchange
-     *
-     * @param string $kexinit_payload_server
-     * @access private
-     */
-    function _key_exchange($kexinit_payload_server)
-    {
-        $kex_algorithms = array(
-            // Elliptic Curve Diffie-Hellman Key Agreement (ECDH) using
-            // Curve25519. See doc/curve25519-sha256@libssh.org.txt in the
-            // libssh repository for more information.
-            'curve25519-sha256@libssh.org',
-
-            // Diffie-Hellman Key Agreement (DH) using integer modulo prime
-            // groups.
-            'diffie-hellman-group1-sha1', // REQUIRED
-            'diffie-hellman-group14-sha1', // REQUIRED
-            'diffie-hellman-group-exchange-sha1', // RFC 4419
-            'diffie-hellman-group-exchange-sha256', // RFC 4419
-        );
-        if (!function_exists('\\Sodium\\library_version_major')) {
-            $kex_algorithms = array_diff(
-                $kex_algorithms,
-                array('curve25519-sha256@libssh.org')
-            );
-        }
-
-        $server_host_key_algorithms = array(
-            'ssh-rsa', // RECOMMENDED  sign   Raw RSA Key
-            'ssh-dss'  // REQUIRED     sign   Raw DSS Key
-        );
-
-        $encryption_algorithms = array(
-            // from :
-            'arcfour256',
-            'arcfour128',
-
-            //'arcfour',      // OPTIONAL          the ARCFOUR stream cipher with a 128-bit key
-
-            // CTR modes from :
-            'aes128-ctr',     // RECOMMENDED       AES (Rijndael) in SDCTR mode, with 128-bit key
-            'aes192-ctr',     // RECOMMENDED       AES with 192-bit key
-            'aes256-ctr',     // RECOMMENDED       AES with 256-bit key
-
-            'twofish128-ctr', // OPTIONAL          Twofish in SDCTR mode, with 128-bit key
-            'twofish192-ctr', // OPTIONAL          Twofish with 192-bit key
-            'twofish256-ctr', // OPTIONAL          Twofish with 256-bit key
-
-            'aes128-cbc',     // RECOMMENDED       AES with a 128-bit key
-            'aes192-cbc',     // OPTIONAL          AES with a 192-bit key
-            'aes256-cbc',     // OPTIONAL          AES in CBC mode, with a 256-bit key
-
-            'twofish128-cbc', // OPTIONAL          Twofish with a 128-bit key
-            'twofish192-cbc', // OPTIONAL          Twofish with a 192-bit key
-            'twofish256-cbc',
-            'twofish-cbc',    // OPTIONAL          alias for "twofish256-cbc"
-                              //                   (this is being retained for historical reasons)
-
-            'blowfish-ctr',   // OPTIONAL          Blowfish in SDCTR mode
-
-            'blowfish-cbc',   // OPTIONAL          Blowfish in CBC mode
-
-            '3des-ctr',       // RECOMMENDED       Three-key 3DES in SDCTR mode
-
-            '3des-cbc',       // REQUIRED          three-key 3DES in CBC mode
-                //'none'         // OPTIONAL          no encryption; NOT RECOMMENDED
-        );
-
-        if (extension_loaded('openssl') && !extension_loaded('mcrypt')) {
-            // OpenSSL does not support arcfour256 in any capacity and arcfour128 / arcfour support is limited to
-            // instances that do not use continuous buffers
-            $encryption_algorithms = array_diff(
-                $encryption_algorithms,
-                array('arcfour256', 'arcfour128', 'arcfour')
-            );
-        }
-
-        if (class_exists('\phpseclib\Crypt\RC4') === false) {
-            $encryption_algorithms = array_diff(
-                $encryption_algorithms,
-                array('arcfour256', 'arcfour128', 'arcfour')
-            );
-        }
-        if (class_exists('\phpseclib\Crypt\Rijndael') === false) {
-            $encryption_algorithms = array_diff(
-                $encryption_algorithms,
-                array('aes128-ctr', 'aes192-ctr', 'aes256-ctr', 'aes128-cbc', 'aes192-cbc', 'aes256-cbc')
-            );
-        }
-        if (class_exists('\phpseclib\Crypt\Twofish') === false) {
-            $encryption_algorithms = array_diff(
-                $encryption_algorithms,
-                array('twofish128-ctr', 'twofish192-ctr', 'twofish256-ctr', 'twofish128-cbc', 'twofish192-cbc', 'twofish256-cbc', 'twofish-cbc')
-            );
-        }
-        if (class_exists('\phpseclib\Crypt\Blowfish') === false) {
-            $encryption_algorithms = array_diff(
-                $encryption_algorithms,
-                array('blowfish-ctr', 'blowfish-cbc')
-            );
-        }
-        if (class_exists('\phpseclib\Crypt\TripleDES') === false) {
-            $encryption_algorithms = array_diff(
-                $encryption_algorithms,
-                array('3des-ctr', '3des-cbc')
-            );
-        }
-        $encryption_algorithms = array_values($encryption_algorithms);
-
-        $mac_algorithms = array(
-            // from :
-            'hmac-sha2-256',// RECOMMENDED     HMAC-SHA256 (digest length = key length = 32)
-
-            'hmac-sha1-96', // RECOMMENDED     first 96 bits of HMAC-SHA1 (digest length = 12, key length = 20)
-            'hmac-sha1',    // REQUIRED        HMAC-SHA1 (digest length = key length = 20)
-            'hmac-md5-96',  // OPTIONAL        first 96 bits of HMAC-MD5 (digest length = 12, key length = 16)
-            'hmac-md5',     // OPTIONAL        HMAC-MD5 (digest length = key length = 16)
-            //'none'          // OPTIONAL        no MAC; NOT RECOMMENDED
-        );
-
-        $compression_algorithms = array(
-            'none'   // REQUIRED        no compression
-            //'zlib' // OPTIONAL        ZLIB (LZ77) compression
-        );
-
-        // some SSH servers have buggy implementations of some of the above algorithms
-        switch ($this->server_identifier) {
-            case 'SSH-2.0-SSHD':
-                $mac_algorithms = array_values(array_diff(
-                    $mac_algorithms,
-                    array('hmac-sha1-96', 'hmac-md5-96')
-                ));
-        }
-
-        $str_kex_algorithms = implode(',', $kex_algorithms);
-        $str_server_host_key_algorithms = implode(',', $server_host_key_algorithms);
-        $encryption_algorithms_server_to_client = $encryption_algorithms_client_to_server = implode(',', $encryption_algorithms);
-        $mac_algorithms_server_to_client = $mac_algorithms_client_to_server = implode(',', $mac_algorithms);
-        $compression_algorithms_server_to_client = $compression_algorithms_client_to_server = implode(',', $compression_algorithms);
-
-        $client_cookie = Random::string(16);
-
-        $response = $kexinit_payload_server;
-        $this->_string_shift($response, 1); // skip past the message number (it should be SSH_MSG_KEXINIT)
-        $server_cookie = $this->_string_shift($response, 16);
-
-        if (strlen($response) < 4) {
-            return false;
-        }
-        $temp = unpack('Nlength', $this->_string_shift($response, 4));
-        $this->kex_algorithms = explode(',', $this->_string_shift($response, $temp['length']));
-
-        if (strlen($response) < 4) {
-            return false;
-        }
-        $temp = unpack('Nlength', $this->_string_shift($response, 4));
-        $this->server_host_key_algorithms = explode(',', $this->_string_shift($response, $temp['length']));
-
-        if (strlen($response) < 4) {
-            return false;
-        }
-        $temp = unpack('Nlength', $this->_string_shift($response, 4));
-        $this->encryption_algorithms_client_to_server = explode(',', $this->_string_shift($response, $temp['length']));
-
-        if (strlen($response) < 4) {
-            return false;
-        }
-        $temp = unpack('Nlength', $this->_string_shift($response, 4));
-        $this->encryption_algorithms_server_to_client = explode(',', $this->_string_shift($response, $temp['length']));
-
-        if (strlen($response) < 4) {
-            return false;
-        }
-        $temp = unpack('Nlength', $this->_string_shift($response, 4));
-        $this->mac_algorithms_client_to_server = explode(',', $this->_string_shift($response, $temp['length']));
-
-        if (strlen($response) < 4) {
-            return false;
-        }
-        $temp = unpack('Nlength', $this->_string_shift($response, 4));
-        $this->mac_algorithms_server_to_client = explode(',', $this->_string_shift($response, $temp['length']));
-
-        if (strlen($response) < 4) {
-            return false;
-        }
-        $temp = unpack('Nlength', $this->_string_shift($response, 4));
-        $this->compression_algorithms_client_to_server = explode(',', $this->_string_shift($response, $temp['length']));
-
-        if (strlen($response) < 4) {
-            return false;
-        }
-        $temp = unpack('Nlength', $this->_string_shift($response, 4));
-        $this->compression_algorithms_server_to_client = explode(',', $this->_string_shift($response, $temp['length']));
-
-        if (strlen($response) < 4) {
-            return false;
-        }
-        $temp = unpack('Nlength', $this->_string_shift($response, 4));
-        $this->languages_client_to_server = explode(',', $this->_string_shift($response, $temp['length']));
-
-        if (strlen($response) < 4) {
-            return false;
-        }
-        $temp = unpack('Nlength', $this->_string_shift($response, 4));
-        $this->languages_server_to_client = explode(',', $this->_string_shift($response, $temp['length']));
-
-        if (!strlen($response)) {
-            return false;
-        }
-        extract(unpack('Cfirst_kex_packet_follows', $this->_string_shift($response, 1)));
-        $first_kex_packet_follows = $first_kex_packet_follows != 0;
-
-        // the sending of SSH2_MSG_KEXINIT could go in one of two places.  this is the second place.
-        $kexinit_payload_client = pack(
-            'Ca*Na*Na*Na*Na*Na*Na*Na*Na*Na*Na*CN',
-            NET_SSH2_MSG_KEXINIT,
-            $client_cookie,
-            strlen($str_kex_algorithms),
-            $str_kex_algorithms,
-            strlen($str_server_host_key_algorithms),
-            $str_server_host_key_algorithms,
-            strlen($encryption_algorithms_client_to_server),
-            $encryption_algorithms_client_to_server,
-            strlen($encryption_algorithms_server_to_client),
-            $encryption_algorithms_server_to_client,
-            strlen($mac_algorithms_client_to_server),
-            $mac_algorithms_client_to_server,
-            strlen($mac_algorithms_server_to_client),
-            $mac_algorithms_server_to_client,
-            strlen($compression_algorithms_client_to_server),
-            $compression_algorithms_client_to_server,
-            strlen($compression_algorithms_server_to_client),
-            $compression_algorithms_server_to_client,
-            0,
-            '',
-            0,
-            '',
-            0,
-            0
-        );
-
-        if (!$this->_send_binary_packet($kexinit_payload_client)) {
-            return false;
-        }
-        // here ends the second place.
-
-        // we need to decide upon the symmetric encryption algorithms before we do the diffie-hellman key exchange
-        // we don't initialize any crypto-objects, yet - we do that, later. for now, we need the lengths to make the
-        // diffie-hellman key exchange as fast as possible
-        $decrypt = $this->_array_intersect_first($encryption_algorithms, $this->encryption_algorithms_server_to_client);
-        $decryptKeyLength = $this->_encryption_algorithm_to_key_size($decrypt);
-        if ($decryptKeyLength === null) {
-            user_error('No compatible server to client encryption algorithms found');
-            return $this->_disconnect(NET_SSH2_DISCONNECT_KEY_EXCHANGE_FAILED);
-        }
-
-        $encrypt = $this->_array_intersect_first($encryption_algorithms, $this->encryption_algorithms_client_to_server);
-        $encryptKeyLength = $this->_encryption_algorithm_to_key_size($encrypt);
-        if ($encryptKeyLength === null) {
-            user_error('No compatible client to server encryption algorithms found');
-            return $this->_disconnect(NET_SSH2_DISCONNECT_KEY_EXCHANGE_FAILED);
-        }
-
-        // through diffie-hellman key exchange a symmetric key is obtained
-        $kex_algorithm = $this->_array_intersect_first($kex_algorithms, $this->kex_algorithms);
-        if ($kex_algorithm === false) {
-            user_error('No compatible key exchange algorithms found');
-            return $this->_disconnect(NET_SSH2_DISCONNECT_KEY_EXCHANGE_FAILED);
-        }
-
-        // Only relevant in diffie-hellman-group-exchange-sha{1,256}, otherwise empty.
-        $exchange_hash_rfc4419 = '';
-
-        if ($kex_algorithm === 'curve25519-sha256@libssh.org') {
-            $x = Random::string(32);
-            $eBytes = \Sodium\crypto_box_publickey_from_secretkey($x);
-            $clientKexInitMessage = NET_SSH2_MSG_KEX_ECDH_INIT;
-            $serverKexReplyMessage = NET_SSH2_MSG_KEX_ECDH_REPLY;
-            $kexHash = new Hash('sha256');
-        } else {
-            if (strpos($kex_algorithm, 'diffie-hellman-group-exchange') === 0) {
-                $dh_group_sizes_packed = pack(
-                    'NNN',
-                    $this->kex_dh_group_size_min,
-                    $this->kex_dh_group_size_preferred,
-                    $this->kex_dh_group_size_max
-                );
-                $packet = pack(
-                    'Ca*',
-                    NET_SSH2_MSG_KEXDH_GEX_REQUEST,
-                    $dh_group_sizes_packed
-                );
-                if (!$this->_send_binary_packet($packet)) {
-                    return false;
-                }
-
-                $response = $this->_get_binary_packet();
-                if ($response === false) {
-                    user_error('Connection closed by server');
-                    return false;
-                }
-                extract(unpack('Ctype', $this->_string_shift($response, 1)));
-                if ($type != NET_SSH2_MSG_KEXDH_GEX_GROUP) {
-                    user_error('Expected SSH_MSG_KEX_DH_GEX_GROUP');
-                    return false;
-                }
-
-                if (strlen($response) < 4) {
-                    return false;
-                }
-                extract(unpack('NprimeLength', $this->_string_shift($response, 4)));
-                $primeBytes = $this->_string_shift($response, $primeLength);
-                $prime = new BigInteger($primeBytes, -256);
-
-                if (strlen($response) < 4) {
-                    return false;
-                }
-                extract(unpack('NgLength', $this->_string_shift($response, 4)));
-                $gBytes = $this->_string_shift($response, $gLength);
-                $g = new BigInteger($gBytes, -256);
-
-                $exchange_hash_rfc4419 = pack(
-                    'a*Na*Na*',
-                    $dh_group_sizes_packed,
-                    $primeLength,
-                    $primeBytes,
-                    $gLength,
-                    $gBytes
-                );
-
-                $clientKexInitMessage = NET_SSH2_MSG_KEXDH_GEX_INIT;
-                $serverKexReplyMessage = NET_SSH2_MSG_KEXDH_GEX_REPLY;
-            } else {
-                switch ($kex_algorithm) {
-                    // see http://tools.ietf.org/html/rfc2409#section-6.2 and
-                    // http://tools.ietf.org/html/rfc2412, appendex E
-                    case 'diffie-hellman-group1-sha1':
-                        $prime = 'FFFFFFFFFFFFFFFFC90FDAA22168C234C4C6628B80DC1CD129024E088A67CC74' .
-                                '020BBEA63B139B22514A08798E3404DDEF9519B3CD3A431B302B0A6DF25F1437' .
-                                '4FE1356D6D51C245E485B576625E7EC6F44C42E9A637ED6B0BFF5CB6F406B7ED' .
-                                'EE386BFB5A899FA5AE9F24117C4B1FE649286651ECE65381FFFFFFFFFFFFFFFF';
-                        break;
-                    // see http://tools.ietf.org/html/rfc3526#section-3
-                    case 'diffie-hellman-group14-sha1':
-                        $prime = 'FFFFFFFFFFFFFFFFC90FDAA22168C234C4C6628B80DC1CD129024E088A67CC74' .
-                                '020BBEA63B139B22514A08798E3404DDEF9519B3CD3A431B302B0A6DF25F1437' .
-                                '4FE1356D6D51C245E485B576625E7EC6F44C42E9A637ED6B0BFF5CB6F406B7ED' .
-                                'EE386BFB5A899FA5AE9F24117C4B1FE649286651ECE45B3DC2007CB8A163BF05' .
-                                '98DA48361C55D39A69163FA8FD24CF5F83655D23DCA3AD961C62F356208552BB' .
-                                '9ED529077096966D670C354E4ABC9804F1746C08CA18217C32905E462E36CE3B' .
-                                'E39E772C180E86039B2783A2EC07A28FB5C55DF06F4C52C9DE2BCBF695581718' .
-                                '3995497CEA956AE515D2261898FA051015728E5A8AACAA68FFFFFFFFFFFFFFFF';
-                        break;
-                }
-                // For both diffie-hellman-group1-sha1 and diffie-hellman-group14-sha1
-                // the generator field element is 2 (decimal) and the hash function is sha1.
-                $g = new BigInteger(2);
-                $prime = new BigInteger($prime, 16);
-                $clientKexInitMessage = NET_SSH2_MSG_KEXDH_INIT;
-                $serverKexReplyMessage = NET_SSH2_MSG_KEXDH_REPLY;
-            }
-
-            switch ($kex_algorithm) {
-                case 'diffie-hellman-group-exchange-sha256':
-                    $kexHash = new Hash('sha256');
-                    break;
-                default:
-                    $kexHash = new Hash('sha1');
-            }
-
-            /* To increase the speed of the key exchange, both client and server may
-            reduce the size of their private exponents.  It should be at least
-            twice as long as the key material that is generated from the shared
-            secret.  For more details, see the paper by van Oorschot and Wiener
-            [VAN-OORSCHOT].
-
-            -- http://tools.ietf.org/html/rfc4419#section-6.2 */
-            $one = new BigInteger(1);
-            $keyLength = min($kexHash->getLength(), max($encryptKeyLength, $decryptKeyLength));
-            $max = $one->bitwise_leftShift(16 * $keyLength); // 2 * 8 * $keyLength
-            $max = $max->subtract($one);
-
-            $x = $one->random($one, $max);
-            $e = $g->modPow($x, $prime);
-
-            $eBytes = $e->toBytes(true);
-        }
-        $data = pack('CNa*', $clientKexInitMessage, strlen($eBytes), $eBytes);
-
-        if (!$this->_send_binary_packet($data)) {
-            user_error('Connection closed by server');
-            return false;
-        }
-
-        $response = $this->_get_binary_packet();
-        if ($response === false) {
-            user_error('Connection closed by server');
-            return false;
-        }
-        if (!strlen($response)) {
-            return false;
-        }
-        extract(unpack('Ctype', $this->_string_shift($response, 1)));
-
-        if ($type != $serverKexReplyMessage) {
-            user_error('Expected SSH_MSG_KEXDH_REPLY');
-            return false;
-        }
-
-        if (strlen($response) < 4) {
-            return false;
-        }
-        $temp = unpack('Nlength', $this->_string_shift($response, 4));
-        $this->server_public_host_key = $server_public_host_key = $this->_string_shift($response, $temp['length']);
-
-        if (strlen($server_public_host_key) < 4) {
-            return false;
-        }
-        $temp = unpack('Nlength', $this->_string_shift($server_public_host_key, 4));
-        $public_key_format = $this->_string_shift($server_public_host_key, $temp['length']);
-
-        if (strlen($response) < 4) {
-            return false;
-        }
-        $temp = unpack('Nlength', $this->_string_shift($response, 4));
-        $fBytes = $this->_string_shift($response, $temp['length']);
-
-        if (strlen($response) < 4) {
-            return false;
-        }
-        $temp = unpack('Nlength', $this->_string_shift($response, 4));
-        $this->signature = $this->_string_shift($response, $temp['length']);
-
-        if (strlen($this->signature) < 4) {
-            return false;
-        }
-        $temp = unpack('Nlength', $this->_string_shift($this->signature, 4));
-        $this->signature_format = $this->_string_shift($this->signature, $temp['length']);
-
-        if ($kex_algorithm === 'curve25519-sha256@libssh.org') {
-            if (strlen($fBytes) !== 32) {
-                user_error('Received curve25519 public key of invalid length.');
-                return false;
-            }
-            $key = new BigInteger(\Sodium\crypto_scalarmult($x, $fBytes), 256);
-            \Sodium\memzero($x);
-        } else {
-            $f = new BigInteger($fBytes, -256);
-            $key = $f->modPow($x, $prime);
-        }
-        $keyBytes = $key->toBytes(true);
-
-        $this->exchange_hash = pack(
-            'Na*Na*Na*Na*Na*a*Na*Na*Na*',
-            strlen($this->identifier),
-            $this->identifier,
-            strlen($this->server_identifier),
-            $this->server_identifier,
-            strlen($kexinit_payload_client),
-            $kexinit_payload_client,
-            strlen($kexinit_payload_server),
-            $kexinit_payload_server,
-            strlen($this->server_public_host_key),
-            $this->server_public_host_key,
-            $exchange_hash_rfc4419,
-            strlen($eBytes),
-            $eBytes,
-            strlen($fBytes),
-            $fBytes,
-            strlen($keyBytes),
-            $keyBytes
-        );
-
-        $this->exchange_hash = $kexHash->hash($this->exchange_hash);
-
-        if ($this->session_id === false) {
-            $this->session_id = $this->exchange_hash;
-        }
-
-        $server_host_key_algorithm = $this->_array_intersect_first($server_host_key_algorithms, $this->server_host_key_algorithms);
-        if ($server_host_key_algorithm === false) {
-            user_error('No compatible server host key algorithms found');
-            return $this->_disconnect(NET_SSH2_DISCONNECT_KEY_EXCHANGE_FAILED);
-        }
-
-        if ($public_key_format != $server_host_key_algorithm || $this->signature_format != $server_host_key_algorithm) {
-            user_error('Server Host Key Algorithm Mismatch');
-            return $this->_disconnect(NET_SSH2_DISCONNECT_KEY_EXCHANGE_FAILED);
-        }
-
-        $packet = pack(
-            'C',
-            NET_SSH2_MSG_NEWKEYS
-        );
-
-        if (!$this->_send_binary_packet($packet)) {
-            return false;
-        }
-
-        $response = $this->_get_binary_packet();
-
-        if ($response === false) {
-            user_error('Connection closed by server');
-            return false;
-        }
-
-        if (!strlen($response)) {
-            return false;
-        }
-        extract(unpack('Ctype', $this->_string_shift($response, 1)));
-
-        if ($type != NET_SSH2_MSG_NEWKEYS) {
-            user_error('Expected SSH_MSG_NEWKEYS');
-            return false;
-        }
-
-        $keyBytes = pack('Na*', strlen($keyBytes), $keyBytes);
-
-        $this->encrypt = $this->_encryption_algorithm_to_crypt_instance($encrypt);
-        if ($this->encrypt) {
-            if ($this->crypto_engine) {
-                $this->encrypt->setEngine($this->crypto_engine);
-            }
-            if ($this->encrypt->block_size) {
-                $this->encrypt_block_size = $this->encrypt->block_size;
-            }
-            $this->encrypt->enableContinuousBuffer();
-            $this->encrypt->disablePadding();
-
-            $iv = $kexHash->hash($keyBytes . $this->exchange_hash . 'A' . $this->session_id);
-            while ($this->encrypt_block_size > strlen($iv)) {
-                $iv.= $kexHash->hash($keyBytes . $this->exchange_hash . $iv);
-            }
-            $this->encrypt->setIV(substr($iv, 0, $this->encrypt_block_size));
-
-            $key = $kexHash->hash($keyBytes . $this->exchange_hash . 'C' . $this->session_id);
-            while ($encryptKeyLength > strlen($key)) {
-                $key.= $kexHash->hash($keyBytes . $this->exchange_hash . $key);
-            }
-            $this->encrypt->setKey(substr($key, 0, $encryptKeyLength));
-        }
-
-        $this->decrypt = $this->_encryption_algorithm_to_crypt_instance($decrypt);
-        if ($this->decrypt) {
-            if ($this->crypto_engine) {
-                $this->decrypt->setEngine($this->crypto_engine);
-            }
-            if ($this->decrypt->block_size) {
-                $this->decrypt_block_size = $this->decrypt->block_size;
-            }
-            $this->decrypt->enableContinuousBuffer();
-            $this->decrypt->disablePadding();
-
-            $iv = $kexHash->hash($keyBytes . $this->exchange_hash . 'B' . $this->session_id);
-            while ($this->decrypt_block_size > strlen($iv)) {
-                $iv.= $kexHash->hash($keyBytes . $this->exchange_hash . $iv);
-            }
-            $this->decrypt->setIV(substr($iv, 0, $this->decrypt_block_size));
-
-            $key = $kexHash->hash($keyBytes . $this->exchange_hash . 'D' . $this->session_id);
-            while ($decryptKeyLength > strlen($key)) {
-                $key.= $kexHash->hash($keyBytes . $this->exchange_hash . $key);
-            }
-            $this->decrypt->setKey(substr($key, 0, $decryptKeyLength));
-        }
-
-        /* The "arcfour128" algorithm is the RC4 cipher, as described in
-           [SCHNEIER], using a 128-bit key.  The first 1536 bytes of keystream
-           generated by the cipher MUST be discarded, and the first byte of the
-           first encrypted packet MUST be encrypted using the 1537th byte of
-           keystream.
-
-           -- http://tools.ietf.org/html/rfc4345#section-4 */
-        if ($encrypt == 'arcfour128' || $encrypt == 'arcfour256') {
-            $this->encrypt->encrypt(str_repeat("\0", 1536));
-        }
-        if ($decrypt == 'arcfour128' || $decrypt == 'arcfour256') {
-            $this->decrypt->decrypt(str_repeat("\0", 1536));
-        }
-
-        $mac_algorithm = $this->_array_intersect_first($mac_algorithms, $this->mac_algorithms_client_to_server);
-        if ($mac_algorithm === false) {
-            user_error('No compatible client to server message authentication algorithms found');
-            return $this->_disconnect(NET_SSH2_DISCONNECT_KEY_EXCHANGE_FAILED);
-        }
-
-        $createKeyLength = 0; // ie. $mac_algorithm == 'none'
-        switch ($mac_algorithm) {
-            case 'hmac-sha2-256':
-                $this->hmac_create = new Hash('sha256');
-                $createKeyLength = 32;
-                break;
-            case 'hmac-sha1':
-                $this->hmac_create = new Hash('sha1');
-                $createKeyLength = 20;
-                break;
-            case 'hmac-sha1-96':
-                $this->hmac_create = new Hash('sha1-96');
-                $createKeyLength = 20;
-                break;
-            case 'hmac-md5':
-                $this->hmac_create = new Hash('md5');
-                $createKeyLength = 16;
-                break;
-            case 'hmac-md5-96':
-                $this->hmac_create = new Hash('md5-96');
-                $createKeyLength = 16;
-        }
-
-        $mac_algorithm = $this->_array_intersect_first($mac_algorithms, $this->mac_algorithms_server_to_client);
-        if ($mac_algorithm === false) {
-            user_error('No compatible server to client message authentication algorithms found');
-            return $this->_disconnect(NET_SSH2_DISCONNECT_KEY_EXCHANGE_FAILED);
-        }
-
-        $checkKeyLength = 0;
-        $this->hmac_size = 0;
-        switch ($mac_algorithm) {
-            case 'hmac-sha2-256':
-                $this->hmac_check = new Hash('sha256');
-                $checkKeyLength = 32;
-                $this->hmac_size = 32;
-                break;
-            case 'hmac-sha1':
-                $this->hmac_check = new Hash('sha1');
-                $checkKeyLength = 20;
-                $this->hmac_size = 20;
-                break;
-            case 'hmac-sha1-96':
-                $this->hmac_check = new Hash('sha1-96');
-                $checkKeyLength = 20;
-                $this->hmac_size = 12;
-                break;
-            case 'hmac-md5':
-                $this->hmac_check = new Hash('md5');
-                $checkKeyLength = 16;
-                $this->hmac_size = 16;
-                break;
-            case 'hmac-md5-96':
-                $this->hmac_check = new Hash('md5-96');
-                $checkKeyLength = 16;
-                $this->hmac_size = 12;
-        }
-
-        $key = $kexHash->hash($keyBytes . $this->exchange_hash . 'E' . $this->session_id);
-        while ($createKeyLength > strlen($key)) {
-            $key.= $kexHash->hash($keyBytes . $this->exchange_hash . $key);
-        }
-        $this->hmac_create->setKey(substr($key, 0, $createKeyLength));
-
-        $key = $kexHash->hash($keyBytes . $this->exchange_hash . 'F' . $this->session_id);
-        while ($checkKeyLength > strlen($key)) {
-            $key.= $kexHash->hash($keyBytes . $this->exchange_hash . $key);
-        }
-        $this->hmac_check->setKey(substr($key, 0, $checkKeyLength));
-
-        $compression_algorithm = $this->_array_intersect_first($compression_algorithms, $this->compression_algorithms_server_to_client);
-        if ($compression_algorithm === false) {
-            user_error('No compatible server to client compression algorithms found');
-            return $this->_disconnect(NET_SSH2_DISCONNECT_KEY_EXCHANGE_FAILED);
-        }
-        $this->decompress = $compression_algorithm == 'zlib';
-
-        $compression_algorithm = $this->_array_intersect_first($compression_algorithms, $this->compression_algorithms_client_to_server);
-        if ($compression_algorithm === false) {
-            user_error('No compatible client to server compression algorithms found');
-            return $this->_disconnect(NET_SSH2_DISCONNECT_KEY_EXCHANGE_FAILED);
-        }
-        $this->compress = $compression_algorithm == 'zlib';
-
-        return true;
-    }
-
-    /**
-     * Maps an encryption algorithm name to the number of key bytes.
-     *
-     * @param string $algorithm Name of the encryption algorithm
-     * @return int|null Number of bytes as an integer or null for unknown
-     * @access private
-     */
-    function _encryption_algorithm_to_key_size($algorithm)
-    {
-        switch ($algorithm) {
-            case 'none':
-                return 0;
-            case 'aes128-cbc':
-            case 'aes128-ctr':
-            case 'arcfour':
-            case 'arcfour128':
-            case 'blowfish-cbc':
-            case 'blowfish-ctr':
-            case 'twofish128-cbc':
-            case 'twofish128-ctr':
-                return 16;
-            case '3des-cbc':
-            case '3des-ctr':
-            case 'aes192-cbc':
-            case 'aes192-ctr':
-            case 'twofish192-cbc':
-            case 'twofish192-ctr':
-                return 24;
-            case 'aes256-cbc':
-            case 'aes256-ctr':
-            case 'arcfour256':
-            case 'twofish-cbc':
-            case 'twofish256-cbc':
-            case 'twofish256-ctr':
-                return 32;
-        }
-        return null;
-    }
-
-    /**
-     * Maps an encryption algorithm name to an instance of a subclass of
-     * \phpseclib\Crypt\Base.
-     *
-     * @param string $algorithm Name of the encryption algorithm
-     * @return mixed Instance of \phpseclib\Crypt\Base or null for unknown
-     * @access private
-     */
-    function _encryption_algorithm_to_crypt_instance($algorithm)
-    {
-        switch ($algorithm) {
-            case '3des-cbc':
-                return new TripleDES();
-            case '3des-ctr':
-                return new TripleDES(Base::MODE_CTR);
-            case 'aes256-cbc':
-            case 'aes192-cbc':
-            case 'aes128-cbc':
-                return new Rijndael();
-            case 'aes256-ctr':
-            case 'aes192-ctr':
-            case 'aes128-ctr':
-                return new Rijndael(Base::MODE_CTR);
-            case 'blowfish-cbc':
-                return new Blowfish();
-            case 'blowfish-ctr':
-                return new Blowfish(Base::MODE_CTR);
-            case 'twofish128-cbc':
-            case 'twofish192-cbc':
-            case 'twofish256-cbc':
-            case 'twofish-cbc':
-                return new Twofish();
-            case 'twofish128-ctr':
-            case 'twofish192-ctr':
-            case 'twofish256-ctr':
-                return new Twofish(Base::MODE_CTR);
-            case 'arcfour':
-            case 'arcfour128':
-            case 'arcfour256':
-                return new RC4();
-        }
-        return null;
-    }
-
-    /**
-     * Login
-     *
-     * The $password parameter can be a plaintext password, a \phpseclib\Crypt\RSA object or an array
-     *
-     * @param string $username
-     * @param mixed $password
-     * @param mixed $...
-     * @return bool
-     * @see self::_login()
-     * @access public
-     */
-    function login($username)
-    {
-        $args = func_get_args();
-        return call_user_func_array(array(&$this, '_login'), $args);
-    }
-
-    /**
-     * Login Helper
-     *
-     * @param string $username
-     * @param mixed $password
-     * @param mixed $...
-     * @return bool
-     * @see self::_login_helper()
-     * @access private
-     */
-    function _login($username)
-    {
-        if (!($this->bitmap & self::MASK_CONSTRUCTOR)) {
-            if (!$this->_connect()) {
-                return false;
-            }
-        }
-
-        $args = array_slice(func_get_args(), 1);
-        if (empty($args)) {
-            return $this->_login_helper($username);
-        }
-
-        foreach ($args as $arg) {
-            if ($this->_login_helper($username, $arg)) {
-                return true;
-            }
-        }
-        return false;
-    }
-
-    /**
-     * Login Helper
-     *
-     * @param string $username
-     * @param string $password
-     * @return bool
-     * @access private
-     * @internal It might be worthwhile, at some point, to protect against {@link http://tools.ietf.org/html/rfc4251#section-9.3.9 traffic analysis}
-     *           by sending dummy SSH_MSG_IGNORE messages.
-     */
-    function _login_helper($username, $password = null)
-    {
-        if (!($this->bitmap & self::MASK_CONNECTED)) {
-            return false;
-        }
-
-        if (!($this->bitmap & self::MASK_LOGIN_REQ)) {
-            $packet = pack(
-                'CNa*',
-                NET_SSH2_MSG_SERVICE_REQUEST,
-                strlen('ssh-userauth'),
-                'ssh-userauth'
-            );
-
-            if (!$this->_send_binary_packet($packet)) {
-                return false;
-            }
-
-            $response = $this->_get_binary_packet();
-            if ($response === false) {
-                user_error('Connection closed by server');
-                return false;
-            }
-
-            if (strlen($response) < 4) {
-                return false;
-            }
-            extract(unpack('Ctype', $this->_string_shift($response, 1)));
-
-            if ($type != NET_SSH2_MSG_SERVICE_ACCEPT) {
-                user_error('Expected SSH_MSG_SERVICE_ACCEPT');
-                return false;
-            }
-            $this->bitmap |= self::MASK_LOGIN_REQ;
-        }
-
-        if (strlen($this->last_interactive_response)) {
-            return !is_string($password) && !is_array($password) ? false : $this->_keyboard_interactive_process($password);
-        }
-
-        if ($password instanceof RSA) {
-            return $this->_privatekey_login($username, $password);
-        } elseif ($password instanceof Agent) {
-            return $this->_ssh_agent_login($username, $password);
-        }
-
-        if (is_array($password)) {
-            if ($this->_keyboard_interactive_login($username, $password)) {
-                $this->bitmap |= self::MASK_LOGIN;
-                return true;
-            }
-            return false;
-        }
-
-        if (!isset($password)) {
-            $packet = pack(
-                'CNa*Na*Na*',
-                NET_SSH2_MSG_USERAUTH_REQUEST,
-                strlen($username),
-                $username,
-                strlen('ssh-connection'),
-                'ssh-connection',
-                strlen('none'),
-                'none'
-            );
-
-            if (!$this->_send_binary_packet($packet)) {
-                return false;
-            }
-
-            $response = $this->_get_binary_packet();
-            if ($response === false) {
-                user_error('Connection closed by server');
-                return false;
-            }
-
-            if (!strlen($response)) {
-                return false;
-            }
-            extract(unpack('Ctype', $this->_string_shift($response, 1)));
-
-            switch ($type) {
-                case NET_SSH2_MSG_USERAUTH_SUCCESS:
-                    $this->bitmap |= self::MASK_LOGIN;
-                    return true;
-                //case NET_SSH2_MSG_USERAUTH_FAILURE:
-                default:
-                    return false;
-            }
-        }
-
-        $packet = pack(
-            'CNa*Na*Na*CNa*',
-            NET_SSH2_MSG_USERAUTH_REQUEST,
-            strlen($username),
-            $username,
-            strlen('ssh-connection'),
-            'ssh-connection',
-            strlen('password'),
-            'password',
-            0,
-            strlen($password),
-            $password
-        );
-
-        // remove the username and password from the logged packet
-        if (!defined('NET_SSH2_LOGGING')) {
-            $logged = null;
-        } else {
-            $logged = pack(
-                'CNa*Na*Na*CNa*',
-                NET_SSH2_MSG_USERAUTH_REQUEST,
-                strlen('username'),
-                'username',
-                strlen('ssh-connection'),
-                'ssh-connection',
-                strlen('password'),
-                'password',
-                0,
-                strlen('password'),
-                'password'
-            );
-        }
-
-        if (!$this->_send_binary_packet($packet, $logged)) {
-            return false;
-        }
-
-        $response = $this->_get_binary_packet();
-        if ($response === false) {
-            user_error('Connection closed by server');
-            return false;
-        }
-
-        if (!strlen($response)) {
-            return false;
-        }
-        extract(unpack('Ctype', $this->_string_shift($response, 1)));
-
-        switch ($type) {
-            case NET_SSH2_MSG_USERAUTH_PASSWD_CHANGEREQ: // in theory, the password can be changed
-                if (defined('NET_SSH2_LOGGING')) {
-                    $this->message_number_log[count($this->message_number_log) - 1] = 'NET_SSH2_MSG_USERAUTH_PASSWD_CHANGEREQ';
-                }
-                if (strlen($response) < 4) {
-                    return false;
-                }
-                extract(unpack('Nlength', $this->_string_shift($response, 4)));
-                $this->errors[] = 'SSH_MSG_USERAUTH_PASSWD_CHANGEREQ: ' . utf8_decode($this->_string_shift($response, $length));
-                return $this->_disconnect(NET_SSH2_DISCONNECT_AUTH_CANCELLED_BY_USER);
-            case NET_SSH2_MSG_USERAUTH_FAILURE:
-                // can we use keyboard-interactive authentication?  if not then either the login is bad or the server employees
-                // multi-factor authentication
-                if (strlen($response) < 4) {
-                    return false;
-                }
-                extract(unpack('Nlength', $this->_string_shift($response, 4)));
-                $auth_methods = explode(',', $this->_string_shift($response, $length));
-                if (!strlen($response)) {
-                    return false;
-                }
-                extract(unpack('Cpartial_success', $this->_string_shift($response, 1)));
-                $partial_success = $partial_success != 0;
-
-                if (!$partial_success && in_array('keyboard-interactive', $auth_methods)) {
-                    if ($this->_keyboard_interactive_login($username, $password)) {
-                        $this->bitmap |= self::MASK_LOGIN;
-                        return true;
-                    }
-                    return false;
-                }
-                return false;
-            case NET_SSH2_MSG_USERAUTH_SUCCESS:
-                $this->bitmap |= self::MASK_LOGIN;
-                return true;
-        }
-
-        return false;
-    }
-
-    /**
-     * Login via keyboard-interactive authentication
-     *
-     * See {@link http://tools.ietf.org/html/rfc4256 RFC4256} for details.  This is not a full-featured keyboard-interactive authenticator.
-     *
-     * @param string $username
-     * @param string $password
-     * @return bool
-     * @access private
-     */
-    function _keyboard_interactive_login($username, $password)
-    {
-        $packet = pack(
-            'CNa*Na*Na*Na*Na*',
-            NET_SSH2_MSG_USERAUTH_REQUEST,
-            strlen($username),
-            $username,
-            strlen('ssh-connection'),
-            'ssh-connection',
-            strlen('keyboard-interactive'),
-            'keyboard-interactive',
-            0,
-            '',
-            0,
-            ''
-        );
-
-        if (!$this->_send_binary_packet($packet)) {
-            return false;
-        }
-
-        return $this->_keyboard_interactive_process($password);
-    }
-
-    /**
-     * Handle the keyboard-interactive requests / responses.
-     *
-     * @param string $responses...
-     * @return bool
-     * @access private
-     */
-    function _keyboard_interactive_process()
-    {
-        $responses = func_get_args();
-
-        if (strlen($this->last_interactive_response)) {
-            $response = $this->last_interactive_response;
-        } else {
-            $orig = $response = $this->_get_binary_packet();
-            if ($response === false) {
-                user_error('Connection closed by server');
-                return false;
-            }
-        }
-
-        if (!strlen($response)) {
-            return false;
-        }
-        extract(unpack('Ctype', $this->_string_shift($response, 1)));
-
-        switch ($type) {
-            case NET_SSH2_MSG_USERAUTH_INFO_REQUEST:
-                if (strlen($response) < 4) {
-                    return false;
-                }
-                extract(unpack('Nlength', $this->_string_shift($response, 4)));
-                $this->_string_shift($response, $length); // name; may be empty
-                if (strlen($response) < 4) {
-                    return false;
-                }
-                extract(unpack('Nlength', $this->_string_shift($response, 4)));
-                $this->_string_shift($response, $length); // instruction; may be empty
-                if (strlen($response) < 4) {
-                    return false;
-                }
-                extract(unpack('Nlength', $this->_string_shift($response, 4)));
-                $this->_string_shift($response, $length); // language tag; may be empty
-                if (strlen($response) < 4) {
-                    return false;
-                }
-                extract(unpack('Nnum_prompts', $this->_string_shift($response, 4)));
-
-                for ($i = 0; $i < count($responses); $i++) {
-                    if (is_array($responses[$i])) {
-                        foreach ($responses[$i] as $key => $value) {
-                            $this->keyboard_requests_responses[$key] = $value;
-                        }
-                        unset($responses[$i]);
-                    }
-                }
-                $responses = array_values($responses);
-
-                if (isset($this->keyboard_requests_responses)) {
-                    for ($i = 0; $i < $num_prompts; $i++) {
-                        if (strlen($response) < 4) {
-                            return false;
-                        }
-                        extract(unpack('Nlength', $this->_string_shift($response, 4)));
-                        // prompt - ie. "Password: "; must not be empty
-                        $prompt = $this->_string_shift($response, $length);
-                        //$echo = $this->_string_shift($response) != chr(0);
-                        foreach ($this->keyboard_requests_responses as $key => $value) {
-                            if (substr($prompt, 0, strlen($key)) == $key) {
-                                $responses[] = $value;
-                                break;
-                            }
-                        }
-                    }
-                }
-
-                // see http://tools.ietf.org/html/rfc4256#section-3.2
-                if (strlen($this->last_interactive_response)) {
-                    $this->last_interactive_response = '';
-                } elseif (defined('NET_SSH2_LOGGING')) {
-                    $this->message_number_log[count($this->message_number_log) - 1] = str_replace(
-                        'UNKNOWN',
-                        'NET_SSH2_MSG_USERAUTH_INFO_REQUEST',
-                        $this->message_number_log[count($this->message_number_log) - 1]
-                    );
-                }
-
-                if (!count($responses) && $num_prompts) {
-                    $this->last_interactive_response = $orig;
-                    return false;
-                }
-
-                /*
-                   After obtaining the requested information from the user, the client
-                   MUST respond with an SSH_MSG_USERAUTH_INFO_RESPONSE message.
-                */
-                // see http://tools.ietf.org/html/rfc4256#section-3.4
-                $packet = $logged = pack('CN', NET_SSH2_MSG_USERAUTH_INFO_RESPONSE, count($responses));
-                for ($i = 0; $i < count($responses); $i++) {
-                    $packet.= pack('Na*', strlen($responses[$i]), $responses[$i]);
-                    $logged.= pack('Na*', strlen('dummy-answer'), 'dummy-answer');
-                }
-
-                if (!$this->_send_binary_packet($packet, $logged)) {
-                    return false;
-                }
-
-                if (defined('NET_SSH2_LOGGING') && NET_SSH2_LOGGING == self::LOG_COMPLEX) {
-                    $this->message_number_log[count($this->message_number_log) - 1] = str_replace(
-                        'UNKNOWN',
-                        'NET_SSH2_MSG_USERAUTH_INFO_RESPONSE',
-                        $this->message_number_log[count($this->message_number_log) - 1]
-                    );
-                }
-
-                /*
-                   After receiving the response, the server MUST send either an
-                   SSH_MSG_USERAUTH_SUCCESS, SSH_MSG_USERAUTH_FAILURE, or another
-                   SSH_MSG_USERAUTH_INFO_REQUEST message.
-                */
-                // maybe phpseclib should force close the connection after x request / responses?  unless something like that is done
-                // there could be an infinite loop of request / responses.
-                return $this->_keyboard_interactive_process();
-            case NET_SSH2_MSG_USERAUTH_SUCCESS:
-                return true;
-            case NET_SSH2_MSG_USERAUTH_FAILURE:
-                return false;
-        }
-
-        return false;
-    }
-
-    /**
-     * Login with an ssh-agent provided key
-     *
-     * @param string $username
-     * @param \phpseclib\System\SSH\Agent $agent
-     * @return bool
-     * @access private
-     */
-    function _ssh_agent_login($username, $agent)
-    {
-        $this->agent = $agent;
-        $keys = $agent->requestIdentities();
-        foreach ($keys as $key) {
-            if ($this->_privatekey_login($username, $key)) {
-                return true;
-            }
-        }
-
-        return false;
-    }
-
-    /**
-     * Login with an RSA private key
-     *
-     * @param string $username
-     * @param \phpseclib\Crypt\RSA $password
-     * @return bool
-     * @access private
-     * @internal It might be worthwhile, at some point, to protect against {@link http://tools.ietf.org/html/rfc4251#section-9.3.9 traffic analysis}
-     *           by sending dummy SSH_MSG_IGNORE messages.
-     */
-    function _privatekey_login($username, $privatekey)
-    {
-        // see http://tools.ietf.org/html/rfc4253#page-15
-        $publickey = $privatekey->getPublicKey(RSA::PUBLIC_FORMAT_RAW);
-        if ($publickey === false) {
-            return false;
-        }
-
-        $publickey = array(
-            'e' => $publickey['e']->toBytes(true),
-            'n' => $publickey['n']->toBytes(true)
-        );
-        $publickey = pack(
-            'Na*Na*Na*',
-            strlen('ssh-rsa'),
-            'ssh-rsa',
-            strlen($publickey['e']),
-            $publickey['e'],
-            strlen($publickey['n']),
-            $publickey['n']
-        );
-
-        $part1 = pack(
-            'CNa*Na*Na*',
-            NET_SSH2_MSG_USERAUTH_REQUEST,
-            strlen($username),
-            $username,
-            strlen('ssh-connection'),
-            'ssh-connection',
-            strlen('publickey'),
-            'publickey'
-        );
-        $part2 = pack('Na*Na*', strlen('ssh-rsa'), 'ssh-rsa', strlen($publickey), $publickey);
-
-        $packet = $part1 . chr(0) . $part2;
-        if (!$this->_send_binary_packet($packet)) {
-            return false;
-        }
-
-        $response = $this->_get_binary_packet();
-        if ($response === false) {
-            user_error('Connection closed by server');
-            return false;
-        }
-
-        if (!strlen($response)) {
-            return false;
-        }
-        extract(unpack('Ctype', $this->_string_shift($response, 1)));
-
-        switch ($type) {
-            case NET_SSH2_MSG_USERAUTH_FAILURE:
-                if (strlen($response) < 4) {
-                    return false;
-                }
-                extract(unpack('Nlength', $this->_string_shift($response, 4)));
-                $this->errors[] = 'SSH_MSG_USERAUTH_FAILURE: ' . $this->_string_shift($response, $length);
-                return false;
-            case NET_SSH2_MSG_USERAUTH_PK_OK:
-                // we'll just take it on faith that the public key blob and the public key algorithm name are as
-                // they should be
-                if (defined('NET_SSH2_LOGGING') && NET_SSH2_LOGGING == self::LOG_COMPLEX) {
-                    $this->message_number_log[count($this->message_number_log) - 1] = str_replace(
-                        'UNKNOWN',
-                        'NET_SSH2_MSG_USERAUTH_PK_OK',
-                        $this->message_number_log[count($this->message_number_log) - 1]
-                    );
-                }
-        }
-
-        $packet = $part1 . chr(1) . $part2;
-        $privatekey->setSignatureMode(RSA::SIGNATURE_PKCS1);
-        $signature = $privatekey->sign(pack('Na*a*', strlen($this->session_id), $this->session_id, $packet));
-        $signature = pack('Na*Na*', strlen('ssh-rsa'), 'ssh-rsa', strlen($signature), $signature);
-        $packet.= pack('Na*', strlen($signature), $signature);
-
-        if (!$this->_send_binary_packet($packet)) {
-            return false;
-        }
-
-        $response = $this->_get_binary_packet();
-        if ($response === false) {
-            user_error('Connection closed by server');
-            return false;
-        }
-
-        if (!strlen($response)) {
-            return false;
-        }
-        extract(unpack('Ctype', $this->_string_shift($response, 1)));
-
-        switch ($type) {
-            case NET_SSH2_MSG_USERAUTH_FAILURE:
-                // either the login is bad or the server employs multi-factor authentication
-                return false;
-            case NET_SSH2_MSG_USERAUTH_SUCCESS:
-                $this->bitmap |= self::MASK_LOGIN;
-                return true;
-        }
-
-        return false;
-    }
-
-    /**
-     * Set Timeout
-     *
-     * $ssh->exec('ping 127.0.0.1'); on a Linux host will never return and will run indefinitely.  setTimeout() makes it so it'll timeout.
-     * Setting $timeout to false or 0 will mean there is no timeout.
-     *
-     * @param mixed $timeout
-     * @access public
-     */
-    function setTimeout($timeout)
-    {
-        $this->timeout = $this->curTimeout = $timeout;
-    }
-
-    /**
-     * Get the output from stdError
-     *
-     * @access public
-     */
-    function getStdError()
-    {
-        return $this->stdErrorLog;
-    }
-
-    /**
-     * Execute Command
-     *
-     * If $callback is set to false then \phpseclib\Net\SSH2::_get_channel_packet(self::CHANNEL_EXEC) will need to be called manually.
-     * In all likelihood, this is not a feature you want to be taking advantage of.
-     *
-     * @param string $command
-     * @param Callback $callback
-     * @return string
-     * @access public
-     */
-    function exec($command, $callback = null)
-    {
-        $this->curTimeout = $this->timeout;
-        $this->is_timeout = false;
-        $this->stdErrorLog = '';
-
-        if (!$this->isAuthenticated()) {
-            return false;
-        }
-
-        if ($this->in_request_pty_exec) {
-            user_error('If you want to run multiple exec()\'s you will need to disable (and re-enable if appropriate) a PTY for each one.');
-            return false;
-        }
-
-        // RFC4254 defines the (client) window size as "bytes the other party can send before it must wait for the window to
-        // be adjusted".  0x7FFFFFFF is, at 2GB, the max size.  technically, it should probably be decremented, but,
-        // honestly, if you're transferring more than 2GB, you probably shouldn't be using phpseclib, anyway.
-        // see http://tools.ietf.org/html/rfc4254#section-5.2 for more info
-        $this->window_size_server_to_client[self::CHANNEL_EXEC] = $this->window_size;
-        // 0x8000 is the maximum max packet size, per http://tools.ietf.org/html/rfc4253#section-6.1, although since PuTTy
-        // uses 0x4000, that's what will be used here, as well.
-        $packet_size = 0x4000;
-
-        $packet = pack(
-            'CNa*N3',
-            NET_SSH2_MSG_CHANNEL_OPEN,
-            strlen('session'),
-            'session',
-            self::CHANNEL_EXEC,
-            $this->window_size_server_to_client[self::CHANNEL_EXEC],
-            $packet_size
-        );
-
-        if (!$this->_send_binary_packet($packet)) {
-            return false;
-        }
-
-        $this->channel_status[self::CHANNEL_EXEC] = NET_SSH2_MSG_CHANNEL_OPEN;
-
-        $response = $this->_get_channel_packet(self::CHANNEL_EXEC);
-        if ($response === false) {
-            return false;
-        }
-
-        if ($this->request_pty === true) {
-            $terminal_modes = pack('C', NET_SSH2_TTY_OP_END);
-            $packet = pack(
-                'CNNa*CNa*N5a*',
-                NET_SSH2_MSG_CHANNEL_REQUEST,
-                $this->server_channels[self::CHANNEL_EXEC],
-                strlen('pty-req'),
-                'pty-req',
-                1,
-                strlen('vt100'),
-                'vt100',
-                $this->windowColumns,
-                $this->windowRows,
-                0,
-                0,
-                strlen($terminal_modes),
-                $terminal_modes
-            );
-
-            if (!$this->_send_binary_packet($packet)) {
-                return false;
-            }
-
-            $response = $this->_get_binary_packet();
-            if ($response === false) {
-                user_error('Connection closed by server');
-                return false;
-            }
-
-            if (!strlen($response)) {
-                return false;
-            }
-            list(, $type) = unpack('C', $this->_string_shift($response, 1));
-
-            switch ($type) {
-                case NET_SSH2_MSG_CHANNEL_SUCCESS:
-                    break;
-                case NET_SSH2_MSG_CHANNEL_FAILURE:
-                default:
-                    user_error('Unable to request pseudo-terminal');
-                    return $this->_disconnect(NET_SSH2_DISCONNECT_BY_APPLICATION);
-            }
-            $this->in_request_pty_exec = true;
-        }
-
-        // sending a pty-req SSH_MSG_CHANNEL_REQUEST message is unnecessary and, in fact, in most cases, slows things
-        // down.  the one place where it might be desirable is if you're doing something like \phpseclib\Net\SSH2::exec('ping localhost &').
-        // with a pty-req SSH_MSG_CHANNEL_REQUEST, exec() will return immediately and the ping process will then
-        // then immediately terminate.  without such a request exec() will loop indefinitely.  the ping process won't end but
-        // neither will your script.
-
-        // although, in theory, the size of SSH_MSG_CHANNEL_REQUEST could exceed the maximum packet size established by
-        // SSH_MSG_CHANNEL_OPEN_CONFIRMATION, RFC4254#section-5.1 states that the "maximum packet size" refers to the
-        // "maximum size of an individual data packet". ie. SSH_MSG_CHANNEL_DATA.  RFC4254#section-5.2 corroborates.
-        $packet = pack(
-            'CNNa*CNa*',
-            NET_SSH2_MSG_CHANNEL_REQUEST,
-            $this->server_channels[self::CHANNEL_EXEC],
-            strlen('exec'),
-            'exec',
-            1,
-            strlen($command),
-            $command
-        );
-        if (!$this->_send_binary_packet($packet)) {
-            return false;
-        }
-
-        $this->channel_status[self::CHANNEL_EXEC] = NET_SSH2_MSG_CHANNEL_REQUEST;
-
-        $response = $this->_get_channel_packet(self::CHANNEL_EXEC);
-        if ($response === false) {
-            return false;
-        }
-
-        $this->channel_status[self::CHANNEL_EXEC] = NET_SSH2_MSG_CHANNEL_DATA;
-
-        if ($callback === false || $this->in_request_pty_exec) {
-            return true;
-        }
-
-        $output = '';
-        while (true) {
-            $temp = $this->_get_channel_packet(self::CHANNEL_EXEC);
-            switch (true) {
-                case $temp === true:
-                    return is_callable($callback) ? true : $output;
-                case $temp === false:
-                    return false;
-                default:
-                    if (is_callable($callback)) {
-                        if (call_user_func($callback, $temp) === true) {
-                            $this->_close_channel(self::CHANNEL_EXEC);
-                            return true;
-                        }
-                    } else {
-                        $output.= $temp;
-                    }
-            }
-        }
-    }
-
-    /**
-     * Creates an interactive shell
-     *
-     * @see self::read()
-     * @see self::write()
-     * @return bool
-     * @access private
-     */
-    function _initShell()
-    {
-        if ($this->in_request_pty_exec === true) {
-            return true;
-        }
-
-        $this->window_size_server_to_client[self::CHANNEL_SHELL] = $this->window_size;
-        $packet_size = 0x4000;
-
-        $packet = pack(
-            'CNa*N3',
-            NET_SSH2_MSG_CHANNEL_OPEN,
-            strlen('session'),
-            'session',
-            self::CHANNEL_SHELL,
-            $this->window_size_server_to_client[self::CHANNEL_SHELL],
-            $packet_size
-        );
-
-        if (!$this->_send_binary_packet($packet)) {
-            return false;
-        }
-
-        $this->channel_status[self::CHANNEL_SHELL] = NET_SSH2_MSG_CHANNEL_OPEN;
-
-        $response = $this->_get_channel_packet(self::CHANNEL_SHELL);
-        if ($response === false) {
-            return false;
-        }
-
-        $terminal_modes = pack('C', NET_SSH2_TTY_OP_END);
-        $packet = pack(
-            'CNNa*CNa*N5a*',
-            NET_SSH2_MSG_CHANNEL_REQUEST,
-            $this->server_channels[self::CHANNEL_SHELL],
-            strlen('pty-req'),
-            'pty-req',
-            1,
-            strlen('vt100'),
-            'vt100',
-            $this->windowColumns,
-            $this->windowRows,
-            0,
-            0,
-            strlen($terminal_modes),
-            $terminal_modes
-        );
-
-        if (!$this->_send_binary_packet($packet)) {
-            return false;
-        }
-
-        $response = $this->_get_binary_packet();
-        if ($response === false) {
-            user_error('Connection closed by server');
-            return false;
-        }
-
-        if (!strlen($response)) {
-            return false;
-        }
-        list(, $type) = unpack('C', $this->_string_shift($response, 1));
-
-        switch ($type) {
-            case NET_SSH2_MSG_CHANNEL_SUCCESS:
-            // if a pty can't be opened maybe commands can still be executed
-            case NET_SSH2_MSG_CHANNEL_FAILURE:
-                break;
-            default:
-                user_error('Unable to request pseudo-terminal');
-                return $this->_disconnect(NET_SSH2_DISCONNECT_BY_APPLICATION);
-        }
-
-        $packet = pack(
-            'CNNa*C',
-            NET_SSH2_MSG_CHANNEL_REQUEST,
-            $this->server_channels[self::CHANNEL_SHELL],
-            strlen('shell'),
-            'shell',
-            1
-        );
-        if (!$this->_send_binary_packet($packet)) {
-            return false;
-        }
-
-        $this->channel_status[self::CHANNEL_SHELL] = NET_SSH2_MSG_CHANNEL_REQUEST;
-
-        $response = $this->_get_channel_packet(self::CHANNEL_SHELL);
-        if ($response === false) {
-            return false;
-        }
-
-        $this->channel_status[self::CHANNEL_SHELL] = NET_SSH2_MSG_CHANNEL_DATA;
-
-        $this->bitmap |= self::MASK_SHELL;
-
-        return true;
-    }
-
-    /**
-     * Return the channel to be used with read() / write()
-     *
-     * @see self::read()
-     * @see self::write()
-     * @return int
-     * @access public
-     */
-    function _get_interactive_channel()
-    {
-        switch (true) {
-            case $this->in_subsystem:
-                return self::CHANNEL_SUBSYSTEM;
-            case $this->in_request_pty_exec:
-                return self::CHANNEL_EXEC;
-            default:
-                return self::CHANNEL_SHELL;
-        }
-    }
-
-    /**
-     * Return an available open channel
-     *
-     * @return int
-     * @access public
-     */
-    function _get_open_channel()
-    {
-        $channel = self::CHANNEL_EXEC;
-        do {
-            if (isset($this->channel_status[$channel]) && $this->channel_status[$channel] == NET_SSH2_MSG_CHANNEL_OPEN) {
-                return $channel;
-            }
-        } while ($channel++ < self::CHANNEL_SUBSYSTEM);
-
-        return false;
-    }
-
-    /**
-     * Returns the output of an interactive shell
-     *
-     * Returns when there's a match for $expect, which can take the form of a string literal or,
-     * if $mode == self::READ_REGEX, a regular expression.
-     *
-     * @see self::write()
-     * @param string $expect
-     * @param int $mode
-     * @return string
-     * @access public
-     */
-    function read($expect = '', $mode = self::READ_SIMPLE)
-    {
-        $this->curTimeout = $this->timeout;
-        $this->is_timeout = false;
-
-        if (!$this->isAuthenticated()) {
-            user_error('Operation disallowed prior to login()');
-            return false;
-        }
-
-        if (!($this->bitmap & self::MASK_SHELL) && !$this->_initShell()) {
-            user_error('Unable to initiate an interactive shell session');
-            return false;
-        }
-
-        $channel = $this->_get_interactive_channel();
-
-        $match = $expect;
-        while (true) {
-            if ($mode == self::READ_REGEX) {
-                preg_match($expect, substr($this->interactiveBuffer, -1024), $matches);
-                $match = isset($matches[0]) ? $matches[0] : '';
-            }
-            $pos = strlen($match) ? strpos($this->interactiveBuffer, $match) : false;
-            if ($pos !== false) {
-                return $this->_string_shift($this->interactiveBuffer, $pos + strlen($match));
-            }
-            $response = $this->_get_channel_packet($channel);
-            if (is_bool($response)) {
-                $this->in_request_pty_exec = false;
-                return $response ? $this->_string_shift($this->interactiveBuffer, strlen($this->interactiveBuffer)) : false;
-            }
-
-            $this->interactiveBuffer.= $response;
-        }
-    }
-
-    /**
-     * Inputs a command into an interactive shell.
-     *
-     * @see self::read()
-     * @param string $cmd
-     * @return bool
-     * @access public
-     */
-    function write($cmd)
-    {
-        if (!$this->isAuthenticated()) {
-            user_error('Operation disallowed prior to login()');
-            return false;
-        }
-
-        if (!($this->bitmap & self::MASK_SHELL) && !$this->_initShell()) {
-            user_error('Unable to initiate an interactive shell session');
-            return false;
-        }
-
-        return $this->_send_channel_packet($this->_get_interactive_channel(), $cmd);
-    }
-
-    /**
-     * Start a subsystem.
-     *
-     * Right now only one subsystem at a time is supported. To support multiple subsystem's stopSubsystem() could accept
-     * a string that contained the name of the subsystem, but at that point, only one subsystem of each type could be opened.
-     * To support multiple subsystem's of the same name maybe it'd be best if startSubsystem() generated a new channel id and
-     * returns that and then that that was passed into stopSubsystem() but that'll be saved for a future date and implemented
-     * if there's sufficient demand for such a feature.
-     *
-     * @see self::stopSubsystem()
-     * @param string $subsystem
-     * @return bool
-     * @access public
-     */
-    function startSubsystem($subsystem)
-    {
-        $this->window_size_server_to_client[self::CHANNEL_SUBSYSTEM] = $this->window_size;
-
-        $packet = pack(
-            'CNa*N3',
-            NET_SSH2_MSG_CHANNEL_OPEN,
-            strlen('session'),
-            'session',
-            self::CHANNEL_SUBSYSTEM,
-            $this->window_size,
-            0x4000
-        );
-
-        if (!$this->_send_binary_packet($packet)) {
-            return false;
-        }
-
-        $this->channel_status[self::CHANNEL_SUBSYSTEM] = NET_SSH2_MSG_CHANNEL_OPEN;
-
-        $response = $this->_get_channel_packet(self::CHANNEL_SUBSYSTEM);
-        if ($response === false) {
-            return false;
-        }
-
-        $packet = pack(
-            'CNNa*CNa*',
-            NET_SSH2_MSG_CHANNEL_REQUEST,
-            $this->server_channels[self::CHANNEL_SUBSYSTEM],
-            strlen('subsystem'),
-            'subsystem',
-            1,
-            strlen($subsystem),
-            $subsystem
-        );
-        if (!$this->_send_binary_packet($packet)) {
-            return false;
-        }
-
-        $this->channel_status[self::CHANNEL_SUBSYSTEM] = NET_SSH2_MSG_CHANNEL_REQUEST;
-
-        $response = $this->_get_channel_packet(self::CHANNEL_SUBSYSTEM);
-
-        if ($response === false) {
-            return false;
-        }
-
-        $this->channel_status[self::CHANNEL_SUBSYSTEM] = NET_SSH2_MSG_CHANNEL_DATA;
-
-        $this->bitmap |= self::MASK_SHELL;
-        $this->in_subsystem = true;
-
-        return true;
-    }
-
-    /**
-     * Stops a subsystem.
-     *
-     * @see self::startSubsystem()
-     * @return bool
-     * @access public
-     */
-    function stopSubsystem()
-    {
-        $this->in_subsystem = false;
-        $this->_close_channel(self::CHANNEL_SUBSYSTEM);
-        return true;
-    }
-
-    /**
-     * Closes a channel
-     *
-     * If read() timed out you might want to just close the channel and have it auto-restart on the next read() call
-     *
-     * @access public
-     */
-    function reset()
-    {
-        $this->_close_channel($this->_get_interactive_channel());
-    }
-
-    /**
-     * Is timeout?
-     *
-     * Did exec() or read() return because they timed out or because they encountered the end?
-     *
-     * @access public
-     */
-    function isTimeout()
-    {
-        return $this->is_timeout;
-    }
-
-    /**
-     * Disconnect
-     *
-     * @access public
-     */
-    function disconnect()
-    {
-        $this->_disconnect(NET_SSH2_DISCONNECT_BY_APPLICATION);
-        if (isset($this->realtime_log_file) && is_resource($this->realtime_log_file)) {
-            fclose($this->realtime_log_file);
-        }
-    }
-
-    /**
-     * Destructor.
-     *
-     * Will be called, automatically, if you're supporting just PHP5.  If you're supporting PHP4, you'll need to call
-     * disconnect().
-     *
-     * @access public
-     */
-    function __destruct()
-    {
-        $this->disconnect();
-    }
-
-    /**
-     * Is the connection still active?
-     *
-     * @return bool
-     * @access public
-     */
-    function isConnected()
-    {
-        return (bool) ($this->bitmap & self::MASK_CONNECTED);
-    }
-
-    /**
-     * Have you successfully been logged in?
-     *
-     * @return bool
-     * @access public
-     */
-    function isAuthenticated()
-    {
-        return (bool) ($this->bitmap & self::MASK_LOGIN);
-    }
-
-    /**
-     * Gets Binary Packets
-     *
-     * See '6. Binary Packet Protocol' of rfc4253 for more info.
-     *
-     * @see self::_send_binary_packet()
-     * @return string
-     * @access private
-     */
-    function _get_binary_packet()
-    {
-        if (!is_resource($this->fsock) || feof($this->fsock)) {
-            user_error('Connection closed prematurely');
-            $this->bitmap = 0;
-            return false;
-        }
-
-        $start = microtime(true);
-        $raw = stream_get_contents($this->fsock, $this->decrypt_block_size);
-
-        if (!strlen($raw)) {
-            return '';
-        }
-
-        if ($this->decrypt !== false) {
-            $raw = $this->decrypt->decrypt($raw);
-        }
-        if ($raw === false) {
-            user_error('Unable to decrypt content');
-            return false;
-        }
-
-        if (strlen($raw) < 5) {
-            return false;
-        }
-        extract(unpack('Npacket_length/Cpadding_length', $this->_string_shift($raw, 5)));
-
-        $remaining_length = $packet_length + 4 - $this->decrypt_block_size;
-
-        // quoting ,
-        // "implementations SHOULD check that the packet length is reasonable"
-        // PuTTY uses 0x9000 as the actual max packet size and so to shall we
-        if ($remaining_length < -$this->decrypt_block_size || $remaining_length > 0x9000 || $remaining_length % $this->decrypt_block_size != 0) {
-            user_error('Invalid size');
-            return false;
-        }
-
-        $buffer = '';
-        while ($remaining_length > 0) {
-            $temp = stream_get_contents($this->fsock, $remaining_length);
-            if ($temp === false || feof($this->fsock)) {
-                user_error('Error reading from socket');
-                $this->bitmap = 0;
-                return false;
-            }
-            $buffer.= $temp;
-            $remaining_length-= strlen($temp);
-        }
-        $stop = microtime(true);
-        if (strlen($buffer)) {
-            $raw.= $this->decrypt !== false ? $this->decrypt->decrypt($buffer) : $buffer;
-        }
-
-        $payload = $this->_string_shift($raw, $packet_length - $padding_length - 1);
-        $padding = $this->_string_shift($raw, $padding_length); // should leave $raw empty
-
-        if ($this->hmac_check !== false) {
-            $hmac = stream_get_contents($this->fsock, $this->hmac_size);
-            if ($hmac === false || strlen($hmac) != $this->hmac_size) {
-                user_error('Error reading socket');
-                $this->bitmap = 0;
-                return false;
-            } elseif ($hmac != $this->hmac_check->hash(pack('NNCa*', $this->get_seq_no, $packet_length, $padding_length, $payload . $padding))) {
-                user_error('Invalid HMAC');
-                return false;
-            }
-        }
-
-        //if ($this->decompress) {
-        //    $payload = gzinflate(substr($payload, 2));
-        //}
-
-        $this->get_seq_no++;
-
-        if (defined('NET_SSH2_LOGGING')) {
-            $current = microtime(true);
-            $message_number = isset($this->message_numbers[ord($payload[0])]) ? $this->message_numbers[ord($payload[0])] : 'UNKNOWN (' . ord($payload[0]) . ')';
-            $message_number = '<- ' . $message_number .
-                              ' (since last: ' . round($current - $this->last_packet, 4) . ', network: ' . round($stop - $start, 4) . 's)';
-            $this->_append_log($message_number, $payload);
-            $this->last_packet = $current;
-        }
-
-        return $this->_filter($payload);
-    }
-
-    /**
-     * Filter Binary Packets
-     *
-     * Because some binary packets need to be ignored...
-     *
-     * @see self::_get_binary_packet()
-     * @return string
-     * @access private
-     */
-    function _filter($payload)
-    {
-        switch (ord($payload[0])) {
-            case NET_SSH2_MSG_DISCONNECT:
-                $this->_string_shift($payload, 1);
-                if (strlen($payload) < 8) {
-                    return false;
-                }
-                extract(unpack('Nreason_code/Nlength', $this->_string_shift($payload, 8)));
-                $this->errors[] = 'SSH_MSG_DISCONNECT: ' . $this->disconnect_reasons[$reason_code] . "\r\n" . utf8_decode($this->_string_shift($payload, $length));
-                $this->bitmap = 0;
-                return false;
-            case NET_SSH2_MSG_IGNORE:
-                $payload = $this->_get_binary_packet();
-                break;
-            case NET_SSH2_MSG_DEBUG:
-                $this->_string_shift($payload, 2);
-                if (strlen($payload) < 4) {
-                    return false;
-                }
-                extract(unpack('Nlength', $this->_string_shift($payload, 4)));
-                $this->errors[] = 'SSH_MSG_DEBUG: ' . utf8_decode($this->_string_shift($payload, $length));
-                $payload = $this->_get_binary_packet();
-                break;
-            case NET_SSH2_MSG_UNIMPLEMENTED:
-                return false;
-            case NET_SSH2_MSG_KEXINIT:
-                if ($this->session_id !== false) {
-                    if (!$this->_key_exchange($payload)) {
-                        $this->bitmap = 0;
-                        return false;
-                    }
-                    $payload = $this->_get_binary_packet();
-                }
-        }
-
-        // see http://tools.ietf.org/html/rfc4252#section-5.4; only called when the encryption has been activated and when we haven't already logged in
-        if (($this->bitmap & self::MASK_CONNECTED) && !$this->isAuthenticated() && ord($payload[0]) == NET_SSH2_MSG_USERAUTH_BANNER) {
-            $this->_string_shift($payload, 1);
-            if (strlen($payload) < 4) {
-                return false;
-            }
-            extract(unpack('Nlength', $this->_string_shift($payload, 4)));
-            $this->banner_message = utf8_decode($this->_string_shift($payload, $length));
-            $payload = $this->_get_binary_packet();
-        }
-
-        // only called when we've already logged in
-        if (($this->bitmap & self::MASK_CONNECTED) && $this->isAuthenticated()) {
-            switch (ord($payload[0])) {
-                case NET_SSH2_MSG_GLOBAL_REQUEST: // see http://tools.ietf.org/html/rfc4254#section-4
-                    if (strlen($payload) < 4) {
-                        return false;
-                    }
-                    extract(unpack('Nlength', $this->_string_shift($payload, 4)));
-                    $this->errors[] = 'SSH_MSG_GLOBAL_REQUEST: ' . $this->_string_shift($payload, $length);
-
-                    if (!$this->_send_binary_packet(pack('C', NET_SSH2_MSG_REQUEST_FAILURE))) {
-                        return $this->_disconnect(NET_SSH2_DISCONNECT_BY_APPLICATION);
-                    }
-
-                    $payload = $this->_get_binary_packet();
-                    break;
-                case NET_SSH2_MSG_CHANNEL_OPEN: // see http://tools.ietf.org/html/rfc4254#section-5.1
-                    $this->_string_shift($payload, 1);
-                    if (strlen($payload) < 4) {
-                        return false;
-                    }
-                    extract(unpack('Nlength', $this->_string_shift($payload, 4)));
-                    $data = $this->_string_shift($payload, $length);
-                    if (strlen($payload) < 4) {
-                        return false;
-                    }
-                    extract(unpack('Nserver_channel', $this->_string_shift($payload, 4)));
-                    switch ($data) {
-                        case 'auth-agent':
-                        case 'auth-agent@openssh.com':
-                            if (isset($this->agent)) {
-                                $new_channel = self::CHANNEL_AGENT_FORWARD;
-
-                                if (strlen($payload) < 8) {
-                                    return false;
-                                }
-                                extract(unpack('Nremote_window_size', $this->_string_shift($payload, 4)));
-                                extract(unpack('Nremote_maximum_packet_size', $this->_string_shift($payload, 4)));
-
-                                $this->packet_size_client_to_server[$new_channel] = $remote_window_size;
-                                $this->window_size_server_to_client[$new_channel] = $remote_maximum_packet_size;
-                                $this->window_size_client_to_server[$new_channel] = $this->window_size;
-
-                                $packet_size = 0x4000;
-
-                                $packet = pack(
-                                    'CN4',
-                                    NET_SSH2_MSG_CHANNEL_OPEN_CONFIRMATION,
-                                    $server_channel,
-                                    $new_channel,
-                                    $packet_size,
-                                    $packet_size
-                                );
-
-                                $this->server_channels[$new_channel] = $server_channel;
-                                $this->channel_status[$new_channel] = NET_SSH2_MSG_CHANNEL_OPEN_CONFIRMATION;
-                                if (!$this->_send_binary_packet($packet)) {
-                                    return false;
-                                }
-                            }
-                            break;
-                        default:
-                            $packet = pack(
-                                'CN3a*Na*',
-                                NET_SSH2_MSG_REQUEST_FAILURE,
-                                $server_channel,
-                                NET_SSH2_OPEN_ADMINISTRATIVELY_PROHIBITED,
-                                0,
-                                '',
-                                0,
-                                ''
-                            );
-
-                            if (!$this->_send_binary_packet($packet)) {
-                                return $this->_disconnect(NET_SSH2_DISCONNECT_BY_APPLICATION);
-                            }
-                    }
-                    $payload = $this->_get_binary_packet();
-                    break;
-                case NET_SSH2_MSG_CHANNEL_WINDOW_ADJUST:
-                    $this->_string_shift($payload, 1);
-                    if (strlen($payload) < 8) {
-                        return false;
-                    }
-                    extract(unpack('Nchannel', $this->_string_shift($payload, 4)));
-                    extract(unpack('Nwindow_size', $this->_string_shift($payload, 4)));
-                    $this->window_size_client_to_server[$channel]+= $window_size;
-
-                    $payload = ($this->bitmap & self::MASK_WINDOW_ADJUST) ? true : $this->_get_binary_packet();
-            }
-        }
-
-        return $payload;
-    }
-
-    /**
-     * Enable Quiet Mode
-     *
-     * Suppress stderr from output
-     *
-     * @access public
-     */
-    function enableQuietMode()
-    {
-        $this->quiet_mode = true;
-    }
-
-    /**
-     * Disable Quiet Mode
-     *
-     * Show stderr in output
-     *
-     * @access public
-     */
-    function disableQuietMode()
-    {
-        $this->quiet_mode = false;
-    }
-
-    /**
-     * Returns whether Quiet Mode is enabled or not
-     *
-     * @see self::enableQuietMode()
-     * @see self::disableQuietMode()
-     * @access public
-     * @return bool
-     */
-    function isQuietModeEnabled()
-    {
-        return $this->quiet_mode;
-    }
-
-    /**
-     * Enable request-pty when using exec()
-     *
-     * @access public
-     */
-    function enablePTY()
-    {
-        $this->request_pty = true;
-    }
-
-    /**
-     * Disable request-pty when using exec()
-     *
-     * @access public
-     */
-    function disablePTY()
-    {
-        if ($this->in_request_pty_exec) {
-            $this->_close_channel(self::CHANNEL_EXEC);
-            $this->in_request_pty_exec = false;
-        }
-        $this->request_pty = false;
-    }
-
-    /**
-     * Returns whether request-pty is enabled or not
-     *
-     * @see self::enablePTY()
-     * @see self::disablePTY()
-     * @access public
-     * @return bool
-     */
-    function isPTYEnabled()
-    {
-        return $this->request_pty;
-    }
-
-    /**
-     * Gets channel data
-     *
-     * Returns the data as a string if it's available and false if not.
-     *
-     * @param $client_channel
-     * @return mixed
-     * @access private
-     */
-    function _get_channel_packet($client_channel, $skip_extended = false)
-    {
-        if (!empty($this->channel_buffers[$client_channel])) {
-            return array_shift($this->channel_buffers[$client_channel]);
-        }
-
-        while (true) {
-            if ($this->curTimeout) {
-                if ($this->curTimeout < 0) {
-                    $this->is_timeout = true;
-                    return true;
-                }
-
-                $read = array($this->fsock);
-                $write = $except = null;
-
-                $start = microtime(true);
-                $sec = floor($this->curTimeout);
-                $usec = 1000000 * ($this->curTimeout - $sec);
-                // on windows this returns a "Warning: Invalid CRT parameters detected" error
-                if (!@stream_select($read, $write, $except, $sec, $usec) && !count($read)) {
-                    $this->is_timeout = true;
-                    return true;
-                }
-                $elapsed = microtime(true) - $start;
-                $this->curTimeout-= $elapsed;
-            }
-
-            $response = $this->_get_binary_packet();
-            if ($response === false) {
-                user_error('Connection closed by server');
-                return false;
-            }
-            if ($client_channel == -1 && $response === true) {
-                return true;
-            }
-            if (!strlen($response)) {
-                return '';
-            }
-
-            if (!strlen($response)) {
-                return false;
-            }
-            extract(unpack('Ctype', $this->_string_shift($response, 1)));
-
-            if (strlen($response) < 4) {
-                return false;
-            }
-            if ($type == NET_SSH2_MSG_CHANNEL_OPEN) {
-                extract(unpack('Nlength', $this->_string_shift($response, 4)));
-            } else {
-                extract(unpack('Nchannel', $this->_string_shift($response, 4)));
-            }
-
-            // will not be setup yet on incoming channel open request
-            if (isset($channel) && isset($this->channel_status[$channel]) && isset($this->window_size_server_to_client[$channel])) {
-                $this->window_size_server_to_client[$channel]-= strlen($response);
-
-                // resize the window, if appropriate
-                if ($this->window_size_server_to_client[$channel] < 0) {
-                    $packet = pack('CNN', NET_SSH2_MSG_CHANNEL_WINDOW_ADJUST, $this->server_channels[$channel], $this->window_size);
-                    if (!$this->_send_binary_packet($packet)) {
-                        return false;
-                    }
-                    $this->window_size_server_to_client[$channel]+= $this->window_size;
-                }
-
-                switch ($this->channel_status[$channel]) {
-                    case NET_SSH2_MSG_CHANNEL_OPEN:
-                        switch ($type) {
-                            case NET_SSH2_MSG_CHANNEL_OPEN_CONFIRMATION:
-                                if (strlen($response) < 4) {
-                                    return false;
-                                }
-                                extract(unpack('Nserver_channel', $this->_string_shift($response, 4)));
-                                $this->server_channels[$channel] = $server_channel;
-                                if (strlen($response) < 4) {
-                                    return false;
-                                }
-                                extract(unpack('Nwindow_size', $this->_string_shift($response, 4)));
-                                if ($window_size < 0) {
-                                    $window_size&= 0x7FFFFFFF;
-                                    $window_size+= 0x80000000;
-                                }
-                                $this->window_size_client_to_server[$channel] = $window_size;
-                                if (strlen($response) < 4) {
-                                     return false;
-                                }
-                                $temp = unpack('Npacket_size_client_to_server', $this->_string_shift($response, 4));
-                                $this->packet_size_client_to_server[$channel] = $temp['packet_size_client_to_server'];
-                                $result = $client_channel == $channel ? true : $this->_get_channel_packet($client_channel, $skip_extended);
-                                $this->_on_channel_open();
-                                return $result;
-                            //case NET_SSH2_MSG_CHANNEL_OPEN_FAILURE:
-                            default:
-                                user_error('Unable to open channel');
-                                return $this->_disconnect(NET_SSH2_DISCONNECT_BY_APPLICATION);
-                        }
-                        break;
-                    case NET_SSH2_MSG_CHANNEL_REQUEST:
-                        switch ($type) {
-                            case NET_SSH2_MSG_CHANNEL_SUCCESS:
-                                return true;
-                            case NET_SSH2_MSG_CHANNEL_FAILURE:
-                                return false;
-                            default:
-                                user_error('Unable to fulfill channel request');
-                                return $this->_disconnect(NET_SSH2_DISCONNECT_BY_APPLICATION);
-                        }
-                    case NET_SSH2_MSG_CHANNEL_CLOSE:
-                        return $type == NET_SSH2_MSG_CHANNEL_CLOSE ? true : $this->_get_channel_packet($client_channel, $skip_extended);
-                }
-            }
-
-            // ie. $this->channel_status[$channel] == NET_SSH2_MSG_CHANNEL_DATA
-
-            switch ($type) {
-                case NET_SSH2_MSG_CHANNEL_DATA:
-                    /*
-                    if ($channel == self::CHANNEL_EXEC) {
-                        // SCP requires null packets, such as this, be sent.  further, in the case of the ssh.com SSH server
-                        // this actually seems to make things twice as fast.  more to the point, the message right after
-                        // SSH_MSG_CHANNEL_DATA (usually SSH_MSG_IGNORE) won't block for as long as it would have otherwise.
-                        // in OpenSSH it slows things down but only by a couple thousandths of a second.
-                        $this->_send_channel_packet($channel, chr(0));
-                    }
-                    */
-                    if (strlen($response) < 4) {
-                        return false;
-                    }
-                    extract(unpack('Nlength', $this->_string_shift($response, 4)));
-                    $data = $this->_string_shift($response, $length);
-
-                    if ($channel == self::CHANNEL_AGENT_FORWARD) {
-                        $agent_response = $this->agent->_forward_data($data);
-                        if (!is_bool($agent_response)) {
-                            $this->_send_channel_packet($channel, $agent_response);
-                        }
-                        break;
-                    }
-
-                    if ($client_channel == $channel) {
-                        return $data;
-                    }
-                    if (!isset($this->channel_buffers[$channel])) {
-                        $this->channel_buffers[$channel] = array();
-                    }
-                    $this->channel_buffers[$channel][] = $data;
-                    break;
-                case NET_SSH2_MSG_CHANNEL_EXTENDED_DATA:
-                    /*
-                    if ($client_channel == self::CHANNEL_EXEC) {
-                        $this->_send_channel_packet($client_channel, chr(0));
-                    }
-                    */
-                    // currently, there's only one possible value for $data_type_code: NET_SSH2_EXTENDED_DATA_STDERR
-                    if (strlen($response) < 8) {
-                        return false;
-                    }
-                    extract(unpack('Ndata_type_code/Nlength', $this->_string_shift($response, 8)));
-                    $data = $this->_string_shift($response, $length);
-                    $this->stdErrorLog.= $data;
-                    if ($skip_extended || $this->quiet_mode) {
-                        break;
-                    }
-                    if ($client_channel == $channel) {
-                        return $data;
-                    }
-                    if (!isset($this->channel_buffers[$channel])) {
-                        $this->channel_buffers[$channel] = array();
-                    }
-                    $this->channel_buffers[$channel][] = $data;
-                    break;
-                case NET_SSH2_MSG_CHANNEL_REQUEST:
-                    if (strlen($response) < 4) {
-                        return false;
-                    }
-                    extract(unpack('Nlength', $this->_string_shift($response, 4)));
-                    $value = $this->_string_shift($response, $length);
-                    switch ($value) {
-                        case 'exit-signal':
-                            $this->_string_shift($response, 1);
-                            if (strlen($response) < 4) {
-                                return false;
-                            }
-                            extract(unpack('Nlength', $this->_string_shift($response, 4)));
-                            $this->errors[] = 'SSH_MSG_CHANNEL_REQUEST (exit-signal): ' . $this->_string_shift($response, $length);
-                            $this->_string_shift($response, 1);
-                            if (strlen($response) < 4) {
-                                return false;
-                            }
-                            extract(unpack('Nlength', $this->_string_shift($response, 4)));
-                            if ($length) {
-                                $this->errors[count($this->errors)].= "\r\n" . $this->_string_shift($response, $length);
-                            }
-
-                            $this->_send_binary_packet(pack('CN', NET_SSH2_MSG_CHANNEL_EOF, $this->server_channels[$client_channel]));
-                            $this->_send_binary_packet(pack('CN', NET_SSH2_MSG_CHANNEL_CLOSE, $this->server_channels[$channel]));
-
-                            $this->channel_status[$channel] = NET_SSH2_MSG_CHANNEL_EOF;
-
-                            break;
-                        case 'exit-status':
-                            if (strlen($response) < 5) {
-                                return false;
-                            }
-                            extract(unpack('Cfalse/Nexit_status', $this->_string_shift($response, 5)));
-                            $this->exit_status = $exit_status;
-
-                            // "The client MAY ignore these messages."
-                            // -- http://tools.ietf.org/html/rfc4254#section-6.10
-
-                            break;
-                        default:
-                            // "Some systems may not implement signals, in which case they SHOULD ignore this message."
-                            //  -- http://tools.ietf.org/html/rfc4254#section-6.9
-                            break;
-                    }
-                    break;
-                case NET_SSH2_MSG_CHANNEL_CLOSE:
-                    $this->curTimeout = 0;
-
-                    if ($this->bitmap & self::MASK_SHELL) {
-                        $this->bitmap&= ~self::MASK_SHELL;
-                    }
-                    if ($this->channel_status[$channel] != NET_SSH2_MSG_CHANNEL_EOF) {
-                        $this->_send_binary_packet(pack('CN', NET_SSH2_MSG_CHANNEL_CLOSE, $this->server_channels[$channel]));
-                    }
-
-                    $this->channel_status[$channel] = NET_SSH2_MSG_CHANNEL_CLOSE;
-                    if ($client_channel == $channel) {
-                        return true;
-                    }
-                case NET_SSH2_MSG_CHANNEL_EOF:
-                    break;
-                default:
-                    user_error('Error reading channel data');
-                    return $this->_disconnect(NET_SSH2_DISCONNECT_BY_APPLICATION);
-            }
-        }
-    }
-
-    /**
-     * Sends Binary Packets
-     *
-     * See '6. Binary Packet Protocol' of rfc4253 for more info.
-     *
-     * @param string $data
-     * @param string $logged
-     * @see self::_get_binary_packet()
-     * @return bool
-     * @access private
-     */
-    function _send_binary_packet($data, $logged = null)
-    {
-        if (!is_resource($this->fsock) || feof($this->fsock)) {
-            user_error('Connection closed prematurely');
-            $this->bitmap = 0;
-            return false;
-        }
-
-        //if ($this->compress) {
-        //    // the -4 removes the checksum:
-        //    // http://php.net/function.gzcompress#57710
-        //    $data = substr(gzcompress($data), 0, -4);
-        //}
-
-        // 4 (packet length) + 1 (padding length) + 4 (minimal padding amount) == 9
-        $packet_length = strlen($data) + 9;
-        // round up to the nearest $this->encrypt_block_size
-        $packet_length+= (($this->encrypt_block_size - 1) * $packet_length) % $this->encrypt_block_size;
-        // subtracting strlen($data) is obvious - subtracting 5 is necessary because of packet_length and padding_length
-        $padding_length = $packet_length - strlen($data) - 5;
-        $padding = Random::string($padding_length);
-
-        // we subtract 4 from packet_length because the packet_length field isn't supposed to include itself
-        $packet = pack('NCa*', $packet_length - 4, $padding_length, $data . $padding);
-
-        $hmac = $this->hmac_create !== false ? $this->hmac_create->hash(pack('Na*', $this->send_seq_no, $packet)) : '';
-        $this->send_seq_no++;
-
-        if ($this->encrypt !== false) {
-            $packet = $this->encrypt->encrypt($packet);
-        }
-
-        $packet.= $hmac;
-
-        $start = microtime(true);
-        $result = strlen($packet) == fputs($this->fsock, $packet);
-        $stop = microtime(true);
-
-        if (defined('NET_SSH2_LOGGING')) {
-            $current = microtime(true);
-            $message_number = isset($this->message_numbers[ord($data[0])]) ? $this->message_numbers[ord($data[0])] : 'UNKNOWN (' . ord($data[0]) . ')';
-            $message_number = '-> ' . $message_number .
-                              ' (since last: ' . round($current - $this->last_packet, 4) . ', network: ' . round($stop - $start, 4) . 's)';
-            $this->_append_log($message_number, isset($logged) ? $logged : $data);
-            $this->last_packet = $current;
-        }
-
-        return $result;
-    }
-
-    /**
-     * Logs data packets
-     *
-     * Makes sure that only the last 1MB worth of packets will be logged
-     *
-     * @param string $data
-     * @access private
-     */
-    function _append_log($message_number, $message)
-    {
-        // remove the byte identifying the message type from all but the first two messages (ie. the identification strings)
-        if (strlen($message_number) > 2) {
-            $this->_string_shift($message);
-        }
-
-        switch (NET_SSH2_LOGGING) {
-            // useful for benchmarks
-            case self::LOG_SIMPLE:
-                $this->message_number_log[] = $message_number;
-                break;
-            // the most useful log for SSH2
-            case self::LOG_COMPLEX:
-                $this->message_number_log[] = $message_number;
-                $this->log_size+= strlen($message);
-                $this->message_log[] = $message;
-                while ($this->log_size > self::LOG_MAX_SIZE) {
-                    $this->log_size-= strlen(array_shift($this->message_log));
-                    array_shift($this->message_number_log);
-                }
-                break;
-            // dump the output out realtime; packets may be interspersed with non packets,
-            // passwords won't be filtered out and select other packets may not be correctly
-            // identified
-            case self::LOG_REALTIME:
-                switch (PHP_SAPI) {
-                    case 'cli':
-                        $start = $stop = "\r\n";
-                        break;
-                    default:
-                        $start = '
';
-                        $stop = '
';
-                }
-                echo $start . $this->_format_log(array($message), array($message_number)) . $stop;
-                @flush();
-                @ob_flush();
-                break;
-            // basically the same thing as self::LOG_REALTIME with the caveat that self::LOG_REALTIME_FILE
-            // needs to be defined and that the resultant log file will be capped out at self::LOG_MAX_SIZE.
-            // the earliest part of the log file is denoted by the first <<< START >>> and is not going to necessarily
-            // at the beginning of the file
-            case self::LOG_REALTIME_FILE:
-                if (!isset($this->realtime_log_file)) {
-                    // PHP doesn't seem to like using constants in fopen()
-                    $filename = self::LOG_REALTIME_FILENAME;
-                    $fp = fopen($filename, 'w');
-                    $this->realtime_log_file = $fp;
-                }
-                if (!is_resource($this->realtime_log_file)) {
-                    break;
-                }
-                $entry = $this->_format_log(array($message), array($message_number));
-                if ($this->realtime_log_wrap) {
-                    $temp = "<<< START >>>\r\n";
-                    $entry.= $temp;
-                    fseek($this->realtime_log_file, ftell($this->realtime_log_file) - strlen($temp));
-                }
-                $this->realtime_log_size+= strlen($entry);
-                if ($this->realtime_log_size > self::LOG_MAX_SIZE) {
-                    fseek($this->realtime_log_file, 0);
-                    $this->realtime_log_size = strlen($entry);
-                    $this->realtime_log_wrap = true;
-                }
-                fputs($this->realtime_log_file, $entry);
-        }
-    }
-
-    /**
-     * Sends channel data
-     *
-     * Spans multiple SSH_MSG_CHANNEL_DATAs if appropriate
-     *
-     * @param int $client_channel
-     * @param string $data
-     * @return bool
-     * @access private
-     */
-    function _send_channel_packet($client_channel, $data)
-    {
-        while (strlen($data)) {
-            if (!$this->window_size_client_to_server[$client_channel]) {
-                $this->bitmap^= self::MASK_WINDOW_ADJUST;
-                // using an invalid channel will let the buffers be built up for the valid channels
-                $this->_get_channel_packet(-1);
-                $this->bitmap^= self::MASK_WINDOW_ADJUST;
-            }
-
-            /* The maximum amount of data allowed is determined by the maximum
-               packet size for the channel, and the current window size, whichever
-               is smaller.
-                 -- http://tools.ietf.org/html/rfc4254#section-5.2 */
-            $max_size = min(
-                $this->packet_size_client_to_server[$client_channel],
-                $this->window_size_client_to_server[$client_channel]
-            );
-
-            $temp = $this->_string_shift($data, $max_size);
-            $packet = pack(
-                'CN2a*',
-                NET_SSH2_MSG_CHANNEL_DATA,
-                $this->server_channels[$client_channel],
-                strlen($temp),
-                $temp
-            );
-            $this->window_size_client_to_server[$client_channel]-= strlen($temp);
-            if (!$this->_send_binary_packet($packet)) {
-                return false;
-            }
-        }
-
-        return true;
-    }
-
-    /**
-     * Closes and flushes a channel
-     *
-     * \phpseclib\Net\SSH2 doesn't properly close most channels.  For exec() channels are normally closed by the server
-     * and for SFTP channels are presumably closed when the client disconnects.  This functions is intended
-     * for SCP more than anything.
-     *
-     * @param int $client_channel
-     * @param bool $want_reply
-     * @return bool
-     * @access private
-     */
-    function _close_channel($client_channel, $want_reply = false)
-    {
-        // see http://tools.ietf.org/html/rfc4254#section-5.3
-
-        $this->_send_binary_packet(pack('CN', NET_SSH2_MSG_CHANNEL_EOF, $this->server_channels[$client_channel]));
-
-        if (!$want_reply) {
-            $this->_send_binary_packet(pack('CN', NET_SSH2_MSG_CHANNEL_CLOSE, $this->server_channels[$client_channel]));
-        }
-
-        $this->channel_status[$client_channel] = NET_SSH2_MSG_CHANNEL_CLOSE;
-
-        $this->curTimeout = 0;
-
-        while (!is_bool($this->_get_channel_packet($client_channel))) {
-        }
-
-        if ($want_reply) {
-            $this->_send_binary_packet(pack('CN', NET_SSH2_MSG_CHANNEL_CLOSE, $this->server_channels[$client_channel]));
-        }
-
-        if ($this->bitmap & self::MASK_SHELL) {
-            $this->bitmap&= ~self::MASK_SHELL;
-        }
-    }
-
-    /**
-     * Disconnect
-     *
-     * @param int $reason
-     * @return bool
-     * @access private
-     */
-    function _disconnect($reason)
-    {
-        if ($this->bitmap & self::MASK_CONNECTED) {
-            $data = pack('CNNa*Na*', NET_SSH2_MSG_DISCONNECT, $reason, 0, '', 0, '');
-            $this->_send_binary_packet($data);
-            $this->bitmap = 0;
-            fclose($this->fsock);
-            return false;
-        }
-    }
-
-    /**
-     * String Shift
-     *
-     * Inspired by array_shift
-     *
-     * @param string $string
-     * @param int $index
-     * @return string
-     * @access private
-     */
-    function _string_shift(&$string, $index = 1)
-    {
-        $substr = substr($string, 0, $index);
-        $string = substr($string, $index);
-        return $substr;
-    }
-
-    /**
-     * Define Array
-     *
-     * Takes any number of arrays whose indices are integers and whose values are strings and defines a bunch of
-     * named constants from it, using the value as the name of the constant and the index as the value of the constant.
-     * If any of the constants that would be defined already exists, none of the constants will be defined.
-     *
-     * @param array $array
-     * @access private
-     */
-    function _define_array()
-    {
-        $args = func_get_args();
-        foreach ($args as $arg) {
-            foreach ($arg as $key => $value) {
-                if (!defined($value)) {
-                    define($value, $key);
-                } else {
-                    break 2;
-                }
-            }
-        }
-    }
-
-    /**
-     * Returns a log of the packets that have been sent and received.
-     *
-     * Returns a string if NET_SSH2_LOGGING == self::LOG_COMPLEX, an array if NET_SSH2_LOGGING == self::LOG_SIMPLE and false if !defined('NET_SSH2_LOGGING')
-     *
-     * @access public
-     * @return array|false|string
-     */
-    function getLog()
-    {
-        if (!defined('NET_SSH2_LOGGING')) {
-            return false;
-        }
-
-        switch (NET_SSH2_LOGGING) {
-            case self::LOG_SIMPLE:
-                return $this->message_number_log;
-            case self::LOG_COMPLEX:
-                $log = $this->_format_log($this->message_log, $this->message_number_log);
-                return PHP_SAPI == 'cli' ? $log : '
' . $log . '
';
-            default:
-                return false;
-        }
-    }
-
-    /**
-     * Formats a log for printing
-     *
-     * @param array $message_log
-     * @param array $message_number_log
-     * @access private
-     * @return string
-     */
-    function _format_log($message_log, $message_number_log)
-    {
-        $output = '';
-        for ($i = 0; $i < count($message_log); $i++) {
-            $output.= $message_number_log[$i] . "\r\n";
-            $current_log = $message_log[$i];
-            $j = 0;
-            do {
-                if (strlen($current_log)) {
-                    $output.= str_pad(dechex($j), 7, '0', STR_PAD_LEFT) . '0  ';
-                }
-                $fragment = $this->_string_shift($current_log, $this->log_short_width);
-                $hex = substr(preg_replace_callback('#.#s', array($this, '_format_log_helper'), $fragment), strlen($this->log_boundary));
-                // replace non ASCII printable characters with dots
-                // http://en.wikipedia.org/wiki/ASCII#ASCII_printable_characters
-                // also replace < with a . since < messes up the output on web browsers
-                $raw = preg_replace('#[^\x20-\x7E]|<#', '.', $fragment);
-                $output.= str_pad($hex, $this->log_long_width - $this->log_short_width, ' ') . $raw . "\r\n";
-                $j++;
-            } while (strlen($current_log));
-            $output.= "\r\n";
-        }
-
-        return $output;
-    }
-
-    /**
-     * Helper function for _format_log
-     *
-     * For use with preg_replace_callback()
-     *
-     * @param array $matches
-     * @access private
-     * @return string
-     */
-    function _format_log_helper($matches)
-    {
-        return $this->log_boundary . str_pad(dechex(ord($matches[0])), 2, '0', STR_PAD_LEFT);
-    }
-
-    /**
-     * Helper function for agent->_on_channel_open()
-     *
-     * Used when channels are created to inform agent
-     * of said channel opening. Must be called after
-     * channel open confirmation received
-     *
-     * @access private
-     */
-    function _on_channel_open()
-    {
-        if (isset($this->agent)) {
-            $this->agent->_on_channel_open($this);
-        }
-    }
-
-    /**
-     * Returns the first value of the intersection of two arrays or false if
-     * the intersection is empty. The order is defined by the first parameter.
-     *
-     * @param array $array1
-     * @param array $array2
-     * @return mixed False if intersection is empty, else intersected value.
-     * @access private
-     */
-    function _array_intersect_first($array1, $array2)
-    {
-        foreach ($array1 as $value) {
-            if (in_array($value, $array2)) {
-                return $value;
-            }
-        }
-        return false;
-    }
-
-    /**
-     * Returns all errors
-     *
-     * @return string[]
-     * @access public
-     */
-    function getErrors()
-    {
-        return $this->errors;
-    }
-
-    /**
-     * Returns the last error
-     *
-     * @return string
-     * @access public
-     */
-    function getLastError()
-    {
-        $count = count($this->errors);
-
-        if ($count > 0) {
-            return $this->errors[$count - 1];
-        }
-    }
-
-    /**
-     * Return the server identification.
-     *
-     * @return string
-     * @access public
-     */
-    function getServerIdentification()
-    {
-        $this->_connect();
-
-        return $this->server_identifier;
-    }
-
-    /**
-     * Return a list of the key exchange algorithms the server supports.
-     *
-     * @return array
-     * @access public
-     */
-    function getKexAlgorithms()
-    {
-        $this->_connect();
-
-        return $this->kex_algorithms;
-    }
-
-    /**
-     * Return a list of the host key (public key) algorithms the server supports.
-     *
-     * @return array
-     * @access public
-     */
-    function getServerHostKeyAlgorithms()
-    {
-        $this->_connect();
-
-        return $this->server_host_key_algorithms;
-    }
-
-    /**
-     * Return a list of the (symmetric key) encryption algorithms the server supports, when receiving stuff from the client.
-     *
-     * @return array
-     * @access public
-     */
-    function getEncryptionAlgorithmsClient2Server()
-    {
-        $this->_connect();
-
-        return $this->encryption_algorithms_client_to_server;
-    }
-
-    /**
-     * Return a list of the (symmetric key) encryption algorithms the server supports, when sending stuff to the client.
-     *
-     * @return array
-     * @access public
-     */
-    function getEncryptionAlgorithmsServer2Client()
-    {
-        $this->_connect();
-
-        return $this->encryption_algorithms_server_to_client;
-    }
-
-    /**
-     * Return a list of the MAC algorithms the server supports, when receiving stuff from the client.
-     *
-     * @return array
-     * @access public
-     */
-    function getMACAlgorithmsClient2Server()
-    {
-        $this->_connect();
-
-        return $this->mac_algorithms_client_to_server;
-    }
-
-    /**
-     * Return a list of the MAC algorithms the server supports, when sending stuff to the client.
-     *
-     * @return array
-     * @access public
-     */
-    function getMACAlgorithmsServer2Client()
-    {
-        $this->_connect();
-
-        return $this->mac_algorithms_server_to_client;
-    }
-
-    /**
-     * Return a list of the compression algorithms the server supports, when receiving stuff from the client.
-     *
-     * @return array
-     * @access public
-     */
-    function getCompressionAlgorithmsClient2Server()
-    {
-        $this->_connect();
-
-        return $this->compression_algorithms_client_to_server;
-    }
-
-    /**
-     * Return a list of the compression algorithms the server supports, when sending stuff to the client.
-     *
-     * @return array
-     * @access public
-     */
-    function getCompressionAlgorithmsServer2Client()
-    {
-        $this->_connect();
-
-        return $this->compression_algorithms_server_to_client;
-    }
-
-    /**
-     * Return a list of the languages the server supports, when sending stuff to the client.
-     *
-     * @return array
-     * @access public
-     */
-    function getLanguagesServer2Client()
-    {
-        $this->_connect();
-
-        return $this->languages_server_to_client;
-    }
-
-    /**
-     * Return a list of the languages the server supports, when receiving stuff from the client.
-     *
-     * @return array
-     * @access public
-     */
-    function getLanguagesClient2Server()
-    {
-        $this->_connect();
-
-        return $this->languages_client_to_server;
-    }
-
-    /**
-     * Returns the banner message.
-     *
-     * Quoting from the RFC, "in some jurisdictions, sending a warning message before
-     * authentication may be relevant for getting legal protection."
-     *
-     * @return string
-     * @access public
-     */
-    function getBannerMessage()
-    {
-        return $this->banner_message;
-    }
-
-    /**
-     * Returns the server public host key.
-     *
-     * Caching this the first time you connect to a server and checking the result on subsequent connections
-     * is recommended.  Returns false if the server signature is not signed correctly with the public host key.
-     *
-     * @return mixed
-     * @access public
-     */
-    function getServerPublicHostKey()
-    {
-        if (!($this->bitmap & self::MASK_CONSTRUCTOR)) {
-            if (!$this->_connect()) {
-                return false;
-            }
-        }
-
-        $signature = $this->signature;
-        $server_public_host_key = $this->server_public_host_key;
-
-        if (strlen($server_public_host_key) < 4) {
-            return false;
-        }
-        extract(unpack('Nlength', $this->_string_shift($server_public_host_key, 4)));
-        $this->_string_shift($server_public_host_key, $length);
-
-        if ($this->signature_validated) {
-            return $this->bitmap ?
-                $this->signature_format . ' ' . base64_encode($this->server_public_host_key) :
-                false;
-        }
-
-        $this->signature_validated = true;
-
-        switch ($this->signature_format) {
-            case 'ssh-dss':
-                $zero = new BigInteger();
-
-                if (strlen($server_public_host_key) < 4) {
-                    return false;
-                }
-                $temp = unpack('Nlength', $this->_string_shift($server_public_host_key, 4));
-                $p = new BigInteger($this->_string_shift($server_public_host_key, $temp['length']), -256);
-
-                if (strlen($server_public_host_key) < 4) {
-                    return false;
-                }
-                $temp = unpack('Nlength', $this->_string_shift($server_public_host_key, 4));
-                $q = new BigInteger($this->_string_shift($server_public_host_key, $temp['length']), -256);
-
-                if (strlen($server_public_host_key) < 4) {
-                    return false;
-                }
-                $temp = unpack('Nlength', $this->_string_shift($server_public_host_key, 4));
-                $g = new BigInteger($this->_string_shift($server_public_host_key, $temp['length']), -256);
-
-                if (strlen($server_public_host_key) < 4) {
-                    return false;
-                }
-                $temp = unpack('Nlength', $this->_string_shift($server_public_host_key, 4));
-                $y = new BigInteger($this->_string_shift($server_public_host_key, $temp['length']), -256);
-
-                /* The value for 'dss_signature_blob' is encoded as a string containing
-                   r, followed by s (which are 160-bit integers, without lengths or
-                   padding, unsigned, and in network byte order). */
-                $temp = unpack('Nlength', $this->_string_shift($signature, 4));
-                if ($temp['length'] != 40) {
-                    user_error('Invalid signature');
-                    return $this->_disconnect(NET_SSH2_DISCONNECT_KEY_EXCHANGE_FAILED);
-                }
-
-                $r = new BigInteger($this->_string_shift($signature, 20), 256);
-                $s = new BigInteger($this->_string_shift($signature, 20), 256);
-
-                switch (true) {
-                    case $r->equals($zero):
-                    case $r->compare($q) >= 0:
-                    case $s->equals($zero):
-                    case $s->compare($q) >= 0:
-                        user_error('Invalid signature');
-                        return $this->_disconnect(NET_SSH2_DISCONNECT_KEY_EXCHANGE_FAILED);
-                }
-
-                $w = $s->modInverse($q);
-
-                $u1 = $w->multiply(new BigInteger(sha1($this->exchange_hash), 16));
-                list(, $u1) = $u1->divide($q);
-
-                $u2 = $w->multiply($r);
-                list(, $u2) = $u2->divide($q);
-
-                $g = $g->modPow($u1, $p);
-                $y = $y->modPow($u2, $p);
-
-                $v = $g->multiply($y);
-                list(, $v) = $v->divide($p);
-                list(, $v) = $v->divide($q);
-
-                if (!$v->equals($r)) {
-                    user_error('Bad server signature');
-                    return $this->_disconnect(NET_SSH2_DISCONNECT_HOST_KEY_NOT_VERIFIABLE);
-                }
-
-                break;
-            case 'ssh-rsa':
-                if (strlen($server_public_host_key) < 4) {
-                    return false;
-                }
-                $temp = unpack('Nlength', $this->_string_shift($server_public_host_key, 4));
-                $e = new BigInteger($this->_string_shift($server_public_host_key, $temp['length']), -256);
-
-                if (strlen($server_public_host_key) < 4) {
-                    return false;
-                }
-                $temp = unpack('Nlength', $this->_string_shift($server_public_host_key, 4));
-                $rawN = $this->_string_shift($server_public_host_key, $temp['length']);
-                $n = new BigInteger($rawN, -256);
-                $nLength = strlen(ltrim($rawN, "\0"));
-
-                /*
-                if (strlen($signature) < 4) {
-                    return false;
-                }
-                $temp = unpack('Nlength', $this->_string_shift($signature, 4));
-                $signature = $this->_string_shift($signature, $temp['length']);
-
-                $rsa = new RSA();
-                $rsa->setSignatureMode(RSA::SIGNATURE_PKCS1);
-                $rsa->loadKey(array('e' => $e, 'n' => $n), RSA::PUBLIC_FORMAT_RAW);
-                if (!$rsa->verify($this->exchange_hash, $signature)) {
-                    user_error('Bad server signature');
-                    return $this->_disconnect(NET_SSH2_DISCONNECT_HOST_KEY_NOT_VERIFIABLE);
-                }
-                */
-
-                if (strlen($signature) < 4) {
-                    return false;
-                }
-                $temp = unpack('Nlength', $this->_string_shift($signature, 4));
-                $s = new BigInteger($this->_string_shift($signature, $temp['length']), 256);
-
-                // validate an RSA signature per "8.2 RSASSA-PKCS1-v1_5", "5.2.2 RSAVP1", and "9.1 EMSA-PSS" in the
-                // following URL:
-                // ftp://ftp.rsasecurity.com/pub/pkcs/pkcs-1/pkcs-1v2-1.pdf
-
-                // also, see SSHRSA.c (rsa2_verifysig) in PuTTy's source.
-
-                if ($s->compare(new BigInteger()) < 0 || $s->compare($n->subtract(new BigInteger(1))) > 0) {
-                    user_error('Invalid signature');
-                    return $this->_disconnect(NET_SSH2_DISCONNECT_KEY_EXCHANGE_FAILED);
-                }
-
-                $s = $s->modPow($e, $n);
-                $s = $s->toBytes();
-
-                $h = pack('N4H*', 0x00302130, 0x0906052B, 0x0E03021A, 0x05000414, sha1($this->exchange_hash));
-                $h = chr(0x01) . str_repeat(chr(0xFF), $nLength - 2 - strlen($h)) . $h;
-
-                if ($s != $h) {
-                    user_error('Bad server signature');
-                    return $this->_disconnect(NET_SSH2_DISCONNECT_HOST_KEY_NOT_VERIFIABLE);
-                }
-                break;
-            default:
-                user_error('Unsupported signature format');
-                return $this->_disconnect(NET_SSH2_DISCONNECT_HOST_KEY_NOT_VERIFIABLE);
-        }
-
-        return $this->signature_format . ' ' . base64_encode($this->server_public_host_key);
-    }
-
-    /**
-     * Returns the exit status of an SSH command or false.
-     *
-     * @return false|int
-     * @access public
-     */
-    function getExitStatus()
-    {
-        if (is_null($this->exit_status)) {
-            return false;
-        }
-        return $this->exit_status;
-    }
-
-    /**
-     * Returns the number of columns for the terminal window size.
-     *
-     * @return int
-     * @access public
-     */
-    function getWindowColumns()
-    {
-        return $this->windowColumns;
-    }
-
-    /**
-     * Returns the number of rows for the terminal window size.
-     *
-     * @return int
-     * @access public
-     */
-    function getWindowRows()
-    {
-        return $this->windowRows;
-    }
-
-    /**
-     * Sets the number of columns for the terminal window size.
-     *
-     * @param int $value
-     * @access public
-     */
-    function setWindowColumns($value)
-    {
-        $this->windowColumns = $value;
-    }
-
-    /**
-     * Sets the number of rows for the terminal window size.
-     *
-     * @param int $value
-     * @access public
-     */
-    function setWindowRows($value)
-    {
-        $this->windowRows = $value;
-    }
-
-    /**
-     * Sets the number of columns and rows for the terminal window size.
-     *
-     * @param int $columns
-     * @param int $rows
-     * @access public
-     */
-    function setWindowSize($columns = 80, $rows = 24)
-    {
-        $this->windowColumns = $columns;
-        $this->windowRows = $rows;
-    }
-}
diff --git a/mayor-orig/www/include/share/googleapi/phpseclib/phpseclib/phpseclib/System/SSH/Agent.php b/mayor-orig/www/include/share/googleapi/phpseclib/phpseclib/phpseclib/System/SSH/Agent.php
deleted file mode 100644
index a4ff0549..00000000
--- a/mayor-orig/www/include/share/googleapi/phpseclib/phpseclib/phpseclib/System/SSH/Agent.php
+++ /dev/null
@@ -1,308 +0,0 @@
-
- * login('username', $agent)) {
- *        exit('Login Failed');
- *    }
- *
- *    echo $ssh->exec('pwd');
- *    echo $ssh->exec('ls -la');
- * ?>
- * 
- *
- * @category  System
- * @package   SSH\Agent
- * @author    Jim Wigginton 
- * @copyright 2014 Jim Wigginton
- * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
- * @link      http://phpseclib.sourceforge.net
- * @internal  See http://api.libssh.org/rfc/PROTOCOL.agent
- */
-
-namespace phpseclib\System\SSH;
-
-use phpseclib\Crypt\RSA;
-use phpseclib\System\SSH\Agent\Identity;
-
-/**
- * Pure-PHP ssh-agent client identity factory
- *
- * requestIdentities() method pumps out \phpseclib\System\SSH\Agent\Identity objects
- *
- * @package SSH\Agent
- * @author  Jim Wigginton 
- * @access  internal
- */
-class Agent
-{
-    /**#@+
-     * Message numbers
-     *
-     * @access private
-     */
-    // to request SSH1 keys you have to use SSH_AGENTC_REQUEST_RSA_IDENTITIES (1)
-    const SSH_AGENTC_REQUEST_IDENTITIES = 11;
-    // this is the SSH2 response; the SSH1 response is SSH_AGENT_RSA_IDENTITIES_ANSWER (2).
-    const SSH_AGENT_IDENTITIES_ANSWER = 12;
-    // the SSH1 request is SSH_AGENTC_RSA_CHALLENGE (3)
-    const SSH_AGENTC_SIGN_REQUEST = 13;
-    // the SSH1 response is SSH_AGENT_RSA_RESPONSE (4)
-    const SSH_AGENT_SIGN_RESPONSE = 14;
-    /**#@-*/
-
-    /**@+
-     * Agent forwarding status
-     *
-     * @access private
-     */
-    // no forwarding requested and not active
-    const FORWARD_NONE = 0;
-    // request agent forwarding when opportune
-    const FORWARD_REQUEST = 1;
-    // forwarding has been request and is active
-    const FORWARD_ACTIVE = 2;
-    /**#@-*/
-
-    /**
-     * Unused
-     */
-    const SSH_AGENT_FAILURE = 5;
-
-    /**
-     * Socket Resource
-     *
-     * @var resource
-     * @access private
-     */
-    var $fsock;
-
-    /**
-     * Agent forwarding status
-     *
-     * @access private
-     */
-    var $forward_status = self::FORWARD_NONE;
-
-    /**
-     * Buffer for accumulating forwarded authentication
-     * agent data arriving on SSH data channel destined
-     * for agent unix socket
-     *
-     * @access private
-     */
-    var $socket_buffer = '';
-
-    /**
-     * Tracking the number of bytes we are expecting
-     * to arrive for the agent socket on the SSH data
-     * channel
-     */
-    var $expected_bytes = 0;
-
-    /**
-     * Default Constructor
-     *
-     * @return \phpseclib\System\SSH\Agent
-     * @access public
-     */
-    function __construct()
-    {
-        switch (true) {
-            case isset($_SERVER['SSH_AUTH_SOCK']):
-                $address = $_SERVER['SSH_AUTH_SOCK'];
-                break;
-            case isset($_ENV['SSH_AUTH_SOCK']):
-                $address = $_ENV['SSH_AUTH_SOCK'];
-                break;
-            default:
-                user_error('SSH_AUTH_SOCK not found');
-                return false;
-        }
-
-        $this->fsock = fsockopen('unix://' . $address, 0, $errno, $errstr);
-        if (!$this->fsock) {
-            user_error("Unable to connect to ssh-agent (Error $errno: $errstr)");
-        }
-    }
-
-    /**
-     * Request Identities
-     *
-     * See "2.5.2 Requesting a list of protocol 2 keys"
-     * Returns an array containing zero or more \phpseclib\System\SSH\Agent\Identity objects
-     *
-     * @return array
-     * @access public
-     */
-    function requestIdentities()
-    {
-        if (!$this->fsock) {
-            return array();
-        }
-
-        $packet = pack('NC', 1, self::SSH_AGENTC_REQUEST_IDENTITIES);
-        if (strlen($packet) != fputs($this->fsock, $packet)) {
-            user_error('Connection closed while requesting identities');
-        }
-
-        $length = current(unpack('N', fread($this->fsock, 4)));
-        $type = ord(fread($this->fsock, 1));
-        if ($type != self::SSH_AGENT_IDENTITIES_ANSWER) {
-            user_error('Unable to request identities');
-        }
-
-        $identities = array();
-        $keyCount = current(unpack('N', fread($this->fsock, 4)));
-        for ($i = 0; $i < $keyCount; $i++) {
-            $length = current(unpack('N', fread($this->fsock, 4)));
-            $key_blob = fread($this->fsock, $length);
-            $key_str = 'ssh-rsa ' . base64_encode($key_blob);
-            $length = current(unpack('N', fread($this->fsock, 4)));
-            if ($length) {
-                $key_str.= ' ' . fread($this->fsock, $length);
-            }
-            $length = current(unpack('N', substr($key_blob, 0, 4)));
-            $key_type = substr($key_blob, 4, $length);
-            switch ($key_type) {
-                case 'ssh-rsa':
-                    $key = new RSA();
-                    $key->loadKey($key_str);
-                    break;
-                case 'ssh-dss':
-                    // not currently supported
-                    break;
-            }
-            // resources are passed by reference by default
-            if (isset($key)) {
-                $identity = new Identity($this->fsock);
-                $identity->setPublicKey($key);
-                $identity->setPublicKeyBlob($key_blob);
-                $identities[] = $identity;
-                unset($key);
-            }
-        }
-
-        return $identities;
-    }
-
-    /**
-     * Signal that agent forwarding should
-     * be requested when a channel is opened
-     *
-     * @param Net_SSH2 $ssh
-     * @return bool
-     * @access public
-     */
-    function startSSHForwarding($ssh)
-    {
-        if ($this->forward_status == self::FORWARD_NONE) {
-            $this->forward_status = self::FORWARD_REQUEST;
-        }
-    }
-
-    /**
-     * Request agent forwarding of remote server
-     *
-     * @param Net_SSH2 $ssh
-     * @return bool
-     * @access private
-     */
-    function _request_forwarding($ssh)
-    {
-        $request_channel = $ssh->_get_open_channel();
-        if ($request_channel === false) {
-            return false;
-        }
-
-        $packet = pack(
-            'CNNa*C',
-            NET_SSH2_MSG_CHANNEL_REQUEST,
-            $ssh->server_channels[$request_channel],
-            strlen('auth-agent-req@openssh.com'),
-            'auth-agent-req@openssh.com',
-            1
-        );
-
-        $ssh->channel_status[$request_channel] = NET_SSH2_MSG_CHANNEL_REQUEST;
-
-        if (!$ssh->_send_binary_packet($packet)) {
-            return false;
-        }
-
-        $response = $ssh->_get_channel_packet($request_channel);
-        if ($response === false) {
-            return false;
-        }
-
-        $ssh->channel_status[$request_channel] = NET_SSH2_MSG_CHANNEL_OPEN;
-        $this->forward_status = self::FORWARD_ACTIVE;
-
-        return true;
-    }
-
-    /**
-     * On successful channel open
-     *
-     * This method is called upon successful channel
-     * open to give the SSH Agent an opportunity
-     * to take further action. i.e. request agent forwarding
-     *
-     * @param Net_SSH2 $ssh
-     * @access private
-     */
-    function _on_channel_open($ssh)
-    {
-        if ($this->forward_status == self::FORWARD_REQUEST) {
-            $this->_request_forwarding($ssh);
-        }
-    }
-
-    /**
-     * Forward data to SSH Agent and return data reply
-     *
-     * @param string $data
-     * @return data from SSH Agent
-     * @access private
-     */
-    function _forward_data($data)
-    {
-        if ($this->expected_bytes > 0) {
-            $this->socket_buffer.= $data;
-            $this->expected_bytes -= strlen($data);
-        } else {
-            $agent_data_bytes = current(unpack('N', $data));
-            $current_data_bytes = strlen($data);
-            $this->socket_buffer = $data;
-            if ($current_data_bytes != $agent_data_bytes + 4) {
-                $this->expected_bytes = ($agent_data_bytes + 4) - $current_data_bytes;
-                return false;
-            }
-        }
-
-        if (strlen($this->socket_buffer) != fwrite($this->fsock, $this->socket_buffer)) {
-            user_error('Connection closed attempting to forward data to SSH agent');
-        }
-
-        $this->socket_buffer = '';
-        $this->expected_bytes = 0;
-
-        $agent_reply_bytes = current(unpack('N', fread($this->fsock, 4)));
-
-        $agent_reply_data = fread($this->fsock, $agent_reply_bytes);
-        $agent_reply_data = current(unpack('a*', $agent_reply_data));
-
-        return pack('Na*', $agent_reply_bytes, $agent_reply_data);
-    }
-}
diff --git a/mayor-orig/www/include/share/googleapi/phpseclib/phpseclib/phpseclib/System/SSH/Agent/Identity.php b/mayor-orig/www/include/share/googleapi/phpseclib/phpseclib/phpseclib/System/SSH/Agent/Identity.php
deleted file mode 100644
index b8cc6cde..00000000
--- a/mayor-orig/www/include/share/googleapi/phpseclib/phpseclib/phpseclib/System/SSH/Agent/Identity.php
+++ /dev/null
@@ -1,158 +0,0 @@
-
- * @copyright 2009 Jim Wigginton
- * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
- * @link      http://phpseclib.sourceforge.net
- * @internal  See http://api.libssh.org/rfc/PROTOCOL.agent
- */
-
-namespace phpseclib\System\SSH\Agent;
-
-use phpseclib\System\SSH\Agent;
-
-/**
- * Pure-PHP ssh-agent client identity object
- *
- * Instantiation should only be performed by \phpseclib\System\SSH\Agent class.
- * This could be thought of as implementing an interface that phpseclib\Crypt\RSA
- * implements. ie. maybe a Net_SSH_Auth_PublicKey interface or something.
- * The methods in this interface would be getPublicKey and sign since those are the
- * methods phpseclib looks for to perform public key authentication.
- *
- * @package SSH\Agent
- * @author  Jim Wigginton 
- * @access  internal
- */
-class Identity
-{
-    /**
-     * Key Object
-     *
-     * @var \phpseclib\Crypt\RSA
-     * @access private
-     * @see self::getPublicKey()
-     */
-    var $key;
-
-    /**
-     * Key Blob
-     *
-     * @var string
-     * @access private
-     * @see self::sign()
-     */
-    var $key_blob;
-
-    /**
-     * Socket Resource
-     *
-     * @var resource
-     * @access private
-     * @see self::sign()
-     */
-    var $fsock;
-
-    /**
-     * Default Constructor.
-     *
-     * @param resource $fsock
-     * @return \phpseclib\System\SSH\Agent\Identity
-     * @access private
-     */
-    function __construct($fsock)
-    {
-        $this->fsock = $fsock;
-    }
-
-    /**
-     * Set Public Key
-     *
-     * Called by \phpseclib\System\SSH\Agent::requestIdentities()
-     *
-     * @param \phpseclib\Crypt\RSA $key
-     * @access private
-     */
-    function setPublicKey($key)
-    {
-        $this->key = $key;
-        $this->key->setPublicKey();
-    }
-
-    /**
-     * Set Public Key
-     *
-     * Called by \phpseclib\System\SSH\Agent::requestIdentities(). The key blob could be extracted from $this->key
-     * but this saves a small amount of computation.
-     *
-     * @param string $key_blob
-     * @access private
-     */
-    function setPublicKeyBlob($key_blob)
-    {
-        $this->key_blob = $key_blob;
-    }
-
-    /**
-     * Get Public Key
-     *
-     * Wrapper for $this->key->getPublicKey()
-     *
-     * @param int $format optional
-     * @return mixed
-     * @access public
-     */
-    function getPublicKey($format = null)
-    {
-        return !isset($format) ? $this->key->getPublicKey() : $this->key->getPublicKey($format);
-    }
-
-    /**
-     * Set Signature Mode
-     *
-     * Doesn't do anything as ssh-agent doesn't let you pick and choose the signature mode. ie.
-     * ssh-agent's only supported mode is \phpseclib\Crypt\RSA::SIGNATURE_PKCS1
-     *
-     * @param int $mode
-     * @access public
-     */
-    function setSignatureMode($mode)
-    {
-    }
-
-    /**
-     * Create a signature
-     *
-     * See "2.6.2 Protocol 2 private key signature request"
-     *
-     * @param string $message
-     * @return string
-     * @access public
-     */
-    function sign($message)
-    {
-        // the last parameter (currently 0) is for flags and ssh-agent only defines one flag (for ssh-dss): SSH_AGENT_OLD_SIGNATURE
-        $packet = pack('CNa*Na*N', Agent::SSH_AGENTC_SIGN_REQUEST, strlen($this->key_blob), $this->key_blob, strlen($message), $message, 0);
-        $packet = pack('Na*', strlen($packet), $packet);
-        if (strlen($packet) != fputs($this->fsock, $packet)) {
-            user_error('Connection closed during signing');
-        }
-
-        $length = current(unpack('N', fread($this->fsock, 4)));
-        $type = ord(fread($this->fsock, 1));
-        if ($type != Agent::SSH_AGENT_SIGN_RESPONSE) {
-            user_error('Unable to retrieve signature');
-        }
-
-        $signature_blob = fread($this->fsock, $length - 1);
-        // the only other signature format defined - ssh-dss - is the same length as ssh-rsa
-        // the + 12 is for the other various SSH added length fields
-        return substr($signature_blob, strlen('ssh-rsa') + 12);
-    }
-}
diff --git a/mayor-orig/www/include/share/googleapi/phpseclib/phpseclib/phpseclib/bootstrap.php b/mayor-orig/www/include/share/googleapi/phpseclib/phpseclib/phpseclib/bootstrap.php
deleted file mode 100644
index 0da0999f..00000000
--- a/mayor-orig/www/include/share/googleapi/phpseclib/phpseclib/phpseclib/bootstrap.php
+++ /dev/null
@@ -1,16 +0,0 @@
-=5.3.0"
-    },
-    "autoload": {
-        "psr-4": {
-            "Psr\\Cache\\": "src/"
-        }
-    },
-    "extra": {
-        "branch-alias": {
-            "dev-master": "1.0.x-dev"
-        }
-    }
-}
diff --git a/mayor-orig/www/include/share/googleapi/psr/cache/src/CacheException.php b/mayor-orig/www/include/share/googleapi/psr/cache/src/CacheException.php
deleted file mode 100644
index e27f22f8..00000000
--- a/mayor-orig/www/include/share/googleapi/psr/cache/src/CacheException.php
+++ /dev/null
@@ -1,10 +0,0 @@
-=5.3.0"
-    },
-    "autoload": {
-        "psr-4": {
-            "Psr\\Http\\Message\\": "src/"
-        }
-    },
-    "extra": {
-        "branch-alias": {
-            "dev-master": "1.0.x-dev"
-        }
-    }
-}
diff --git a/mayor-orig/www/include/share/googleapi/psr/http-message/src/MessageInterface.php b/mayor-orig/www/include/share/googleapi/psr/http-message/src/MessageInterface.php
deleted file mode 100644
index dd46e5ec..00000000
--- a/mayor-orig/www/include/share/googleapi/psr/http-message/src/MessageInterface.php
+++ /dev/null
@@ -1,187 +0,0 @@
-getHeaders() as $name => $values) {
-     *         echo $name . ": " . implode(", ", $values);
-     *     }
-     *
-     *     // Emit headers iteratively:
-     *     foreach ($message->getHeaders() as $name => $values) {
-     *         foreach ($values as $value) {
-     *             header(sprintf('%s: %s', $name, $value), false);
-     *         }
-     *     }
-     *
-     * While header names are not case-sensitive, getHeaders() will preserve the
-     * exact case in which headers were originally specified.
-     *
-     * @return string[][] Returns an associative array of the message's headers. Each
-     *     key MUST be a header name, and each value MUST be an array of strings
-     *     for that header.
-     */
-    public function getHeaders();
-
-    /**
-     * Checks if a header exists by the given case-insensitive name.
-     *
-     * @param string $name Case-insensitive header field name.
-     * @return bool Returns true if any header names match the given header
-     *     name using a case-insensitive string comparison. Returns false if
-     *     no matching header name is found in the message.
-     */
-    public function hasHeader($name);
-
-    /**
-     * Retrieves a message header value by the given case-insensitive name.
-     *
-     * This method returns an array of all the header values of the given
-     * case-insensitive header name.
-     *
-     * If the header does not appear in the message, this method MUST return an
-     * empty array.
-     *
-     * @param string $name Case-insensitive header field name.
-     * @return string[] An array of string values as provided for the given
-     *    header. If the header does not appear in the message, this method MUST
-     *    return an empty array.
-     */
-    public function getHeader($name);
-
-    /**
-     * Retrieves a comma-separated string of the values for a single header.
-     *
-     * This method returns all of the header values of the given
-     * case-insensitive header name as a string concatenated together using
-     * a comma.
-     *
-     * NOTE: Not all header values may be appropriately represented using
-     * comma concatenation. For such headers, use getHeader() instead
-     * and supply your own delimiter when concatenating.
-     *
-     * If the header does not appear in the message, this method MUST return
-     * an empty string.
-     *
-     * @param string $name Case-insensitive header field name.
-     * @return string A string of values as provided for the given header
-     *    concatenated together using a comma. If the header does not appear in
-     *    the message, this method MUST return an empty string.
-     */
-    public function getHeaderLine($name);
-
-    /**
-     * Return an instance with the provided value replacing the specified header.
-     *
-     * While header names are case-insensitive, the casing of the header will
-     * be preserved by this function, and returned from getHeaders().
-     *
-     * This method MUST be implemented in such a way as to retain the
-     * immutability of the message, and MUST return an instance that has the
-     * new and/or updated header and value.
-     *
-     * @param string $name Case-insensitive header field name.
-     * @param string|string[] $value Header value(s).
-     * @return static
-     * @throws \InvalidArgumentException for invalid header names or values.
-     */
-    public function withHeader($name, $value);
-
-    /**
-     * Return an instance with the specified header appended with the given value.
-     *
-     * Existing values for the specified header will be maintained. The new
-     * value(s) will be appended to the existing list. If the header did not
-     * exist previously, it will be added.
-     *
-     * This method MUST be implemented in such a way as to retain the
-     * immutability of the message, and MUST return an instance that has the
-     * new header and/or value.
-     *
-     * @param string $name Case-insensitive header field name to add.
-     * @param string|string[] $value Header value(s).
-     * @return static
-     * @throws \InvalidArgumentException for invalid header names or values.
-     */
-    public function withAddedHeader($name, $value);
-
-    /**
-     * Return an instance without the specified header.
-     *
-     * Header resolution MUST be done without case-sensitivity.
-     *
-     * This method MUST be implemented in such a way as to retain the
-     * immutability of the message, and MUST return an instance that removes
-     * the named header.
-     *
-     * @param string $name Case-insensitive header field name to remove.
-     * @return static
-     */
-    public function withoutHeader($name);
-
-    /**
-     * Gets the body of the message.
-     *
-     * @return StreamInterface Returns the body as a stream.
-     */
-    public function getBody();
-
-    /**
-     * Return an instance with the specified message body.
-     *
-     * The body MUST be a StreamInterface object.
-     *
-     * This method MUST be implemented in such a way as to retain the
-     * immutability of the message, and MUST return a new instance that has the
-     * new body stream.
-     *
-     * @param StreamInterface $body Body.
-     * @return static
-     * @throws \InvalidArgumentException When the body is not valid.
-     */
-    public function withBody(StreamInterface $body);
-}
diff --git a/mayor-orig/www/include/share/googleapi/psr/http-message/src/RequestInterface.php b/mayor-orig/www/include/share/googleapi/psr/http-message/src/RequestInterface.php
deleted file mode 100644
index a96d4fd6..00000000
--- a/mayor-orig/www/include/share/googleapi/psr/http-message/src/RequestInterface.php
+++ /dev/null
@@ -1,129 +0,0 @@
-getQuery()`
-     * or from the `QUERY_STRING` server param.
-     *
-     * @return array
-     */
-    public function getQueryParams();
-
-    /**
-     * Return an instance with the specified query string arguments.
-     *
-     * These values SHOULD remain immutable over the course of the incoming
-     * request. They MAY be injected during instantiation, such as from PHP's
-     * $_GET superglobal, or MAY be derived from some other value such as the
-     * URI. In cases where the arguments are parsed from the URI, the data
-     * MUST be compatible with what PHP's parse_str() would return for
-     * purposes of how duplicate query parameters are handled, and how nested
-     * sets are handled.
-     *
-     * Setting query string arguments MUST NOT change the URI stored by the
-     * request, nor the values in the server params.
-     *
-     * This method MUST be implemented in such a way as to retain the
-     * immutability of the message, and MUST return an instance that has the
-     * updated query string arguments.
-     *
-     * @param array $query Array of query string arguments, typically from
-     *     $_GET.
-     * @return static
-     */
-    public function withQueryParams(array $query);
-
-    /**
-     * Retrieve normalized file upload data.
-     *
-     * This method returns upload metadata in a normalized tree, with each leaf
-     * an instance of Psr\Http\Message\UploadedFileInterface.
-     *
-     * These values MAY be prepared from $_FILES or the message body during
-     * instantiation, or MAY be injected via withUploadedFiles().
-     *
-     * @return array An array tree of UploadedFileInterface instances; an empty
-     *     array MUST be returned if no data is present.
-     */
-    public function getUploadedFiles();
-
-    /**
-     * Create a new instance with the specified uploaded files.
-     *
-     * This method MUST be implemented in such a way as to retain the
-     * immutability of the message, and MUST return an instance that has the
-     * updated body parameters.
-     *
-     * @param array $uploadedFiles An array tree of UploadedFileInterface instances.
-     * @return static
-     * @throws \InvalidArgumentException if an invalid structure is provided.
-     */
-    public function withUploadedFiles(array $uploadedFiles);
-
-    /**
-     * Retrieve any parameters provided in the request body.
-     *
-     * If the request Content-Type is either application/x-www-form-urlencoded
-     * or multipart/form-data, and the request method is POST, this method MUST
-     * return the contents of $_POST.
-     *
-     * Otherwise, this method may return any results of deserializing
-     * the request body content; as parsing returns structured content, the
-     * potential types MUST be arrays or objects only. A null value indicates
-     * the absence of body content.
-     *
-     * @return null|array|object The deserialized body parameters, if any.
-     *     These will typically be an array or object.
-     */
-    public function getParsedBody();
-
-    /**
-     * Return an instance with the specified body parameters.
-     *
-     * These MAY be injected during instantiation.
-     *
-     * If the request Content-Type is either application/x-www-form-urlencoded
-     * or multipart/form-data, and the request method is POST, use this method
-     * ONLY to inject the contents of $_POST.
-     *
-     * The data IS NOT REQUIRED to come from $_POST, but MUST be the results of
-     * deserializing the request body content. Deserialization/parsing returns
-     * structured data, and, as such, this method ONLY accepts arrays or objects,
-     * or a null value if nothing was available to parse.
-     *
-     * As an example, if content negotiation determines that the request data
-     * is a JSON payload, this method could be used to create a request
-     * instance with the deserialized parameters.
-     *
-     * This method MUST be implemented in such a way as to retain the
-     * immutability of the message, and MUST return an instance that has the
-     * updated body parameters.
-     *
-     * @param null|array|object $data The deserialized body data. This will
-     *     typically be in an array or object.
-     * @return static
-     * @throws \InvalidArgumentException if an unsupported argument type is
-     *     provided.
-     */
-    public function withParsedBody($data);
-
-    /**
-     * Retrieve attributes derived from the request.
-     *
-     * The request "attributes" may be used to allow injection of any
-     * parameters derived from the request: e.g., the results of path
-     * match operations; the results of decrypting cookies; the results of
-     * deserializing non-form-encoded message bodies; etc. Attributes
-     * will be application and request specific, and CAN be mutable.
-     *
-     * @return array Attributes derived from the request.
-     */
-    public function getAttributes();
-
-    /**
-     * Retrieve a single derived request attribute.
-     *
-     * Retrieves a single derived request attribute as described in
-     * getAttributes(). If the attribute has not been previously set, returns
-     * the default value as provided.
-     *
-     * This method obviates the need for a hasAttribute() method, as it allows
-     * specifying a default value to return if the attribute is not found.
-     *
-     * @see getAttributes()
-     * @param string $name The attribute name.
-     * @param mixed $default Default value to return if the attribute does not exist.
-     * @return mixed
-     */
-    public function getAttribute($name, $default = null);
-
-    /**
-     * Return an instance with the specified derived request attribute.
-     *
-     * This method allows setting a single derived request attribute as
-     * described in getAttributes().
-     *
-     * This method MUST be implemented in such a way as to retain the
-     * immutability of the message, and MUST return an instance that has the
-     * updated attribute.
-     *
-     * @see getAttributes()
-     * @param string $name The attribute name.
-     * @param mixed $value The value of the attribute.
-     * @return static
-     */
-    public function withAttribute($name, $value);
-
-    /**
-     * Return an instance that removes the specified derived request attribute.
-     *
-     * This method allows removing a single derived request attribute as
-     * described in getAttributes().
-     *
-     * This method MUST be implemented in such a way as to retain the
-     * immutability of the message, and MUST return an instance that removes
-     * the attribute.
-     *
-     * @see getAttributes()
-     * @param string $name The attribute name.
-     * @return static
-     */
-    public function withoutAttribute($name);
-}
diff --git a/mayor-orig/www/include/share/googleapi/psr/http-message/src/StreamInterface.php b/mayor-orig/www/include/share/googleapi/psr/http-message/src/StreamInterface.php
deleted file mode 100644
index f68f3912..00000000
--- a/mayor-orig/www/include/share/googleapi/psr/http-message/src/StreamInterface.php
+++ /dev/null
@@ -1,158 +0,0 @@
-
-     * [user-info@]host[:port]
-     * 

-     *
-     * If the port component is not set or is the standard port for the current
-     * scheme, it SHOULD NOT be included.
-     *
-     * @see https://tools.ietf.org/html/rfc3986#section-3.2
-     * @return string The URI authority, in "[user-info@]host[:port]" format.
-     */
-    public function getAuthority();
-
-    /**
-     * Retrieve the user information component of the URI.
-     *
-     * If no user information is present, this method MUST return an empty
-     * string.
-     *
-     * If a user is present in the URI, this will return that value;
-     * additionally, if the password is also present, it will be appended to the
-     * user value, with a colon (":") separating the values.
-     *
-     * The trailing "@" character is not part of the user information and MUST
-     * NOT be added.
-     *
-     * @return string The URI user information, in "username[:password]" format.
-     */
-    public function getUserInfo();
-
-    /**
-     * Retrieve the host component of the URI.
-     *
-     * If no host is present, this method MUST return an empty string.
-     *
-     * The value returned MUST be normalized to lowercase, per RFC 3986
-     * Section 3.2.2.
-     *
-     * @see http://tools.ietf.org/html/rfc3986#section-3.2.2
-     * @return string The URI host.
-     */
-    public function getHost();
-
-    /**
-     * Retrieve the port component of the URI.
-     *
-     * If a port is present, and it is non-standard for the current scheme,
-     * this method MUST return it as an integer. If the port is the standard port
-     * used with the current scheme, this method SHOULD return null.
-     *
-     * If no port is present, and no scheme is present, this method MUST return
-     * a null value.
-     *
-     * If no port is present, but a scheme is present, this method MAY return
-     * the standard port for that scheme, but SHOULD return null.
-     *
-     * @return null|int The URI port.
-     */
-    public function getPort();
-
-    /**
-     * Retrieve the path component of the URI.
-     *
-     * The path can either be empty or absolute (starting with a slash) or
-     * rootless (not starting with a slash). Implementations MUST support all
-     * three syntaxes.
-     *
-     * Normally, the empty path "" and absolute path "/" are considered equal as
-     * defined in RFC 7230 Section 2.7.3. But this method MUST NOT automatically
-     * do this normalization because in contexts with a trimmed base path, e.g.
-     * the front controller, this difference becomes significant. It's the task
-     * of the user to handle both "" and "/".
-     *
-     * The value returned MUST be percent-encoded, but MUST NOT double-encode
-     * any characters. To determine what characters to encode, please refer to
-     * RFC 3986, Sections 2 and 3.3.
-     *
-     * As an example, if the value should include a slash ("/") not intended as
-     * delimiter between path segments, that value MUST be passed in encoded
-     * form (e.g., "%2F") to the instance.
-     *
-     * @see https://tools.ietf.org/html/rfc3986#section-2
-     * @see https://tools.ietf.org/html/rfc3986#section-3.3
-     * @return string The URI path.
-     */
-    public function getPath();
-
-    /**
-     * Retrieve the query string of the URI.
-     *
-     * If no query string is present, this method MUST return an empty string.
-     *
-     * The leading "?" character is not part of the query and MUST NOT be
-     * added.
-     *
-     * The value returned MUST be percent-encoded, but MUST NOT double-encode
-     * any characters. To determine what characters to encode, please refer to
-     * RFC 3986, Sections 2 and 3.4.
-     *
-     * As an example, if a value in a key/value pair of the query string should
-     * include an ampersand ("&") not intended as a delimiter between values,
-     * that value MUST be passed in encoded form (e.g., "%26") to the instance.
-     *
-     * @see https://tools.ietf.org/html/rfc3986#section-2
-     * @see https://tools.ietf.org/html/rfc3986#section-3.4
-     * @return string The URI query string.
-     */
-    public function getQuery();
-
-    /**
-     * Retrieve the fragment component of the URI.
-     *
-     * If no fragment is present, this method MUST return an empty string.
-     *
-     * The leading "#" character is not part of the fragment and MUST NOT be
-     * added.
-     *
-     * The value returned MUST be percent-encoded, but MUST NOT double-encode
-     * any characters. To determine what characters to encode, please refer to
-     * RFC 3986, Sections 2 and 3.5.
-     *
-     * @see https://tools.ietf.org/html/rfc3986#section-2
-     * @see https://tools.ietf.org/html/rfc3986#section-3.5
-     * @return string The URI fragment.
-     */
-    public function getFragment();
-
-    /**
-     * Return an instance with the specified scheme.
-     *
-     * This method MUST retain the state of the current instance, and return
-     * an instance that contains the specified scheme.
-     *
-     * Implementations MUST support the schemes "http" and "https" case
-     * insensitively, and MAY accommodate other schemes if required.
-     *
-     * An empty scheme is equivalent to removing the scheme.
-     *
-     * @param string $scheme The scheme to use with the new instance.
-     * @return static A new instance with the specified scheme.
-     * @throws \InvalidArgumentException for invalid or unsupported schemes.
-     */
-    public function withScheme($scheme);
-
-    /**
-     * Return an instance with the specified user information.
-     *
-     * This method MUST retain the state of the current instance, and return
-     * an instance that contains the specified user information.
-     *
-     * Password is optional, but the user information MUST include the
-     * user; an empty string for the user is equivalent to removing user
-     * information.
-     *
-     * @param string $user The user name to use for authority.
-     * @param null|string $password The password associated with $user.
-     * @return static A new instance with the specified user information.
-     */
-    public function withUserInfo($user, $password = null);
-
-    /**
-     * Return an instance with the specified host.
-     *
-     * This method MUST retain the state of the current instance, and return
-     * an instance that contains the specified host.
-     *
-     * An empty host value is equivalent to removing the host.
-     *
-     * @param string $host The hostname to use with the new instance.
-     * @return static A new instance with the specified host.
-     * @throws \InvalidArgumentException for invalid hostnames.
-     */
-    public function withHost($host);
-
-    /**
-     * Return an instance with the specified port.
-     *
-     * This method MUST retain the state of the current instance, and return
-     * an instance that contains the specified port.
-     *
-     * Implementations MUST raise an exception for ports outside the
-     * established TCP and UDP port ranges.
-     *
-     * A null value provided for the port is equivalent to removing the port
-     * information.
-     *
-     * @param null|int $port The port to use with the new instance; a null value
-     *     removes the port information.
-     * @return static A new instance with the specified port.
-     * @throws \InvalidArgumentException for invalid ports.
-     */
-    public function withPort($port);
-
-    /**
-     * Return an instance with the specified path.
-     *
-     * This method MUST retain the state of the current instance, and return
-     * an instance that contains the specified path.
-     *
-     * The path can either be empty or absolute (starting with a slash) or
-     * rootless (not starting with a slash). Implementations MUST support all
-     * three syntaxes.
-     *
-     * If the path is intended to be domain-relative rather than path relative then
-     * it must begin with a slash ("/"). Paths not starting with a slash ("/")
-     * are assumed to be relative to some base path known to the application or
-     * consumer.
-     *
-     * Users can provide both encoded and decoded path characters.
-     * Implementations ensure the correct encoding as outlined in getPath().
-     *
-     * @param string $path The path to use with the new instance.
-     * @return static A new instance with the specified path.
-     * @throws \InvalidArgumentException for invalid paths.
-     */
-    public function withPath($path);
-
-    /**
-     * Return an instance with the specified query string.
-     *
-     * This method MUST retain the state of the current instance, and return
-     * an instance that contains the specified query string.
-     *
-     * Users can provide both encoded and decoded query characters.
-     * Implementations ensure the correct encoding as outlined in getQuery().
-     *
-     * An empty query string value is equivalent to removing the query string.
-     *
-     * @param string $query The query string to use with the new instance.
-     * @return static A new instance with the specified query string.
-     * @throws \InvalidArgumentException for invalid query strings.
-     */
-    public function withQuery($query);
-
-    /**
-     * Return an instance with the specified URI fragment.
-     *
-     * This method MUST retain the state of the current instance, and return
-     * an instance that contains the specified URI fragment.
-     *
-     * Users can provide both encoded and decoded fragment characters.
-     * Implementations ensure the correct encoding as outlined in getFragment().
-     *
-     * An empty fragment value is equivalent to removing the fragment.
-     *
-     * @param string $fragment The fragment to use with the new instance.
-     * @return static A new instance with the specified fragment.
-     */
-    public function withFragment($fragment);
-
-    /**
-     * Return the string representation as a URI reference.
-     *
-     * Depending on which components of the URI are present, the resulting
-     * string is either a full URI or relative reference according to RFC 3986,
-     * Section 4.1. The method concatenates the various components of the URI,
-     * using the appropriate delimiters:
-     *
-     * - If a scheme is present, it MUST be suffixed by ":".
-     * - If an authority is present, it MUST be prefixed by "//".
-     * - The path can be concatenated without delimiters. But there are two
-     *   cases where the path has to be adjusted to make the URI reference
-     *   valid as PHP does not allow to throw an exception in __toString():
-     *     - If the path is rootless and an authority is present, the path MUST
-     *       be prefixed by "/".
-     *     - If the path is starting with more than one "/" and no authority is
-     *       present, the starting slashes MUST be reduced to one.
-     * - If a query is present, it MUST be prefixed by "?".
-     * - If a fragment is present, it MUST be prefixed by "#".
-     *
-     * @see http://tools.ietf.org/html/rfc3986#section-4.1
-     * @return string
-     */
-    public function __toString();
-}
diff --git a/mayor-orig/www/include/share/googleapi/psr/log/.gitignore b/mayor-orig/www/include/share/googleapi/psr/log/.gitignore
deleted file mode 100644
index 22d0d82f..00000000
--- a/mayor-orig/www/include/share/googleapi/psr/log/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-vendor
diff --git a/mayor-orig/www/include/share/googleapi/psr/log/LICENSE b/mayor-orig/www/include/share/googleapi/psr/log/LICENSE
deleted file mode 100644
index 474c952b..00000000
--- a/mayor-orig/www/include/share/googleapi/psr/log/LICENSE
+++ /dev/null
@@ -1,19 +0,0 @@
-Copyright (c) 2012 PHP Framework Interoperability Group
-
-Permission is hereby granted, free of charge, to any person obtaining a copy 
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights 
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell 
-copies of the Software, and to permit persons to whom the Software is 
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in 
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-THE SOFTWARE.
diff --git a/mayor-orig/www/include/share/googleapi/psr/log/Psr/Log/AbstractLogger.php b/mayor-orig/www/include/share/googleapi/psr/log/Psr/Log/AbstractLogger.php
deleted file mode 100644
index 90e721af..00000000
--- a/mayor-orig/www/include/share/googleapi/psr/log/Psr/Log/AbstractLogger.php
+++ /dev/null
@@ -1,128 +0,0 @@
-log(LogLevel::EMERGENCY, $message, $context);
-    }
-
-    /**
-     * Action must be taken immediately.
-     *
-     * Example: Entire website down, database unavailable, etc. This should
-     * trigger the SMS alerts and wake you up.
-     *
-     * @param string $message
-     * @param array  $context
-     *
-     * @return void
-     */
-    public function alert($message, array $context = array())
-    {
-        $this->log(LogLevel::ALERT, $message, $context);
-    }
-
-    /**
-     * Critical conditions.
-     *
-     * Example: Application component unavailable, unexpected exception.
-     *
-     * @param string $message
-     * @param array  $context
-     *
-     * @return void
-     */
-    public function critical($message, array $context = array())
-    {
-        $this->log(LogLevel::CRITICAL, $message, $context);
-    }
-
-    /**
-     * Runtime errors that do not require immediate action but should typically
-     * be logged and monitored.
-     *
-     * @param string $message
-     * @param array  $context
-     *
-     * @return void
-     */
-    public function error($message, array $context = array())
-    {
-        $this->log(LogLevel::ERROR, $message, $context);
-    }
-
-    /**
-     * Exceptional occurrences that are not errors.
-     *
-     * Example: Use of deprecated APIs, poor use of an API, undesirable things
-     * that are not necessarily wrong.
-     *
-     * @param string $message
-     * @param array  $context
-     *
-     * @return void
-     */
-    public function warning($message, array $context = array())
-    {
-        $this->log(LogLevel::WARNING, $message, $context);
-    }
-
-    /**
-     * Normal but significant events.
-     *
-     * @param string $message
-     * @param array  $context
-     *
-     * @return void
-     */
-    public function notice($message, array $context = array())
-    {
-        $this->log(LogLevel::NOTICE, $message, $context);
-    }
-
-    /**
-     * Interesting events.
-     *
-     * Example: User logs in, SQL logs.
-     *
-     * @param string $message
-     * @param array  $context
-     *
-     * @return void
-     */
-    public function info($message, array $context = array())
-    {
-        $this->log(LogLevel::INFO, $message, $context);
-    }
-
-    /**
-     * Detailed debug information.
-     *
-     * @param string $message
-     * @param array  $context
-     *
-     * @return void
-     */
-    public function debug($message, array $context = array())
-    {
-        $this->log(LogLevel::DEBUG, $message, $context);
-    }
-}
diff --git a/mayor-orig/www/include/share/googleapi/psr/log/Psr/Log/InvalidArgumentException.php b/mayor-orig/www/include/share/googleapi/psr/log/Psr/Log/InvalidArgumentException.php
deleted file mode 100644
index 67f852d1..00000000
--- a/mayor-orig/www/include/share/googleapi/psr/log/Psr/Log/InvalidArgumentException.php
+++ /dev/null
@@ -1,7 +0,0 @@
-logger = $logger;
-    }
-}
diff --git a/mayor-orig/www/include/share/googleapi/psr/log/Psr/Log/LoggerInterface.php b/mayor-orig/www/include/share/googleapi/psr/log/Psr/Log/LoggerInterface.php
deleted file mode 100644
index 5ea72438..00000000
--- a/mayor-orig/www/include/share/googleapi/psr/log/Psr/Log/LoggerInterface.php
+++ /dev/null
@@ -1,123 +0,0 @@
-log(LogLevel::EMERGENCY, $message, $context);
-    }
-
-    /**
-     * Action must be taken immediately.
-     *
-     * Example: Entire website down, database unavailable, etc. This should
-     * trigger the SMS alerts and wake you up.
-     *
-     * @param string $message
-     * @param array  $context
-     *
-     * @return void
-     */
-    public function alert($message, array $context = array())
-    {
-        $this->log(LogLevel::ALERT, $message, $context);
-    }
-
-    /**
-     * Critical conditions.
-     *
-     * Example: Application component unavailable, unexpected exception.
-     *
-     * @param string $message
-     * @param array  $context
-     *
-     * @return void
-     */
-    public function critical($message, array $context = array())
-    {
-        $this->log(LogLevel::CRITICAL, $message, $context);
-    }
-
-    /**
-     * Runtime errors that do not require immediate action but should typically
-     * be logged and monitored.
-     *
-     * @param string $message
-     * @param array  $context
-     *
-     * @return void
-     */
-    public function error($message, array $context = array())
-    {
-        $this->log(LogLevel::ERROR, $message, $context);
-    }
-
-    /**
-     * Exceptional occurrences that are not errors.
-     *
-     * Example: Use of deprecated APIs, poor use of an API, undesirable things
-     * that are not necessarily wrong.
-     *
-     * @param string $message
-     * @param array  $context
-     *
-     * @return void
-     */
-    public function warning($message, array $context = array())
-    {
-        $this->log(LogLevel::WARNING, $message, $context);
-    }
-
-    /**
-     * Normal but significant events.
-     *
-     * @param string $message
-     * @param array  $context
-     *
-     * @return void
-     */
-    public function notice($message, array $context = array())
-    {
-        $this->log(LogLevel::NOTICE, $message, $context);
-    }
-
-    /**
-     * Interesting events.
-     *
-     * Example: User logs in, SQL logs.
-     *
-     * @param string $message
-     * @param array  $context
-     *
-     * @return void
-     */
-    public function info($message, array $context = array())
-    {
-        $this->log(LogLevel::INFO, $message, $context);
-    }
-
-    /**
-     * Detailed debug information.
-     *
-     * @param string $message
-     * @param array  $context
-     *
-     * @return void
-     */
-    public function debug($message, array $context = array())
-    {
-        $this->log(LogLevel::DEBUG, $message, $context);
-    }
-
-    /**
-     * Logs with an arbitrary level.
-     *
-     * @param mixed  $level
-     * @param string $message
-     * @param array  $context
-     *
-     * @return void
-     */
-    abstract public function log($level, $message, array $context = array());
-}
diff --git a/mayor-orig/www/include/share/googleapi/psr/log/Psr/Log/NullLogger.php b/mayor-orig/www/include/share/googleapi/psr/log/Psr/Log/NullLogger.php
deleted file mode 100644
index d8cd682c..00000000
--- a/mayor-orig/www/include/share/googleapi/psr/log/Psr/Log/NullLogger.php
+++ /dev/null
@@ -1,28 +0,0 @@
-logger) { }`
- * blocks.
- */
-class NullLogger extends AbstractLogger
-{
-    /**
-     * Logs with an arbitrary level.
-     *
-     * @param mixed  $level
-     * @param string $message
-     * @param array  $context
-     *
-     * @return void
-     */
-    public function log($level, $message, array $context = array())
-    {
-        // noop
-    }
-}
diff --git a/mayor-orig/www/include/share/googleapi/psr/log/Psr/Log/Test/LoggerInterfaceTest.php b/mayor-orig/www/include/share/googleapi/psr/log/Psr/Log/Test/LoggerInterfaceTest.php
deleted file mode 100644
index a0391a52..00000000
--- a/mayor-orig/www/include/share/googleapi/psr/log/Psr/Log/Test/LoggerInterfaceTest.php
+++ /dev/null
@@ -1,140 +0,0 @@
- ".
-     *
-     * Example ->error('Foo') would yield "error Foo".
-     *
-     * @return string[]
-     */
-    abstract public function getLogs();
-
-    public function testImplements()
-    {
-        $this->assertInstanceOf('Psr\Log\LoggerInterface', $this->getLogger());
-    }
-
-    /**
-     * @dataProvider provideLevelsAndMessages
-     */
-    public function testLogsAtAllLevels($level, $message)
-    {
-        $logger = $this->getLogger();
-        $logger->{$level}($message, array('user' => 'Bob'));
-        $logger->log($level, $message, array('user' => 'Bob'));
-
-        $expected = array(
-            $level.' message of level '.$level.' with context: Bob',
-            $level.' message of level '.$level.' with context: Bob',
-        );
-        $this->assertEquals($expected, $this->getLogs());
-    }
-
-    public function provideLevelsAndMessages()
-    {
-        return array(
-            LogLevel::EMERGENCY => array(LogLevel::EMERGENCY, 'message of level emergency with context: {user}'),
-            LogLevel::ALERT => array(LogLevel::ALERT, 'message of level alert with context: {user}'),
-            LogLevel::CRITICAL => array(LogLevel::CRITICAL, 'message of level critical with context: {user}'),
-            LogLevel::ERROR => array(LogLevel::ERROR, 'message of level error with context: {user}'),
-            LogLevel::WARNING => array(LogLevel::WARNING, 'message of level warning with context: {user}'),
-            LogLevel::NOTICE => array(LogLevel::NOTICE, 'message of level notice with context: {user}'),
-            LogLevel::INFO => array(LogLevel::INFO, 'message of level info with context: {user}'),
-            LogLevel::DEBUG => array(LogLevel::DEBUG, 'message of level debug with context: {user}'),
-        );
-    }
-
-    /**
-     * @expectedException \Psr\Log\InvalidArgumentException
-     */
-    public function testThrowsOnInvalidLevel()
-    {
-        $logger = $this->getLogger();
-        $logger->log('invalid level', 'Foo');
-    }
-
-    public function testContextReplacement()
-    {
-        $logger = $this->getLogger();
-        $logger->info('{Message {nothing} {user} {foo.bar} a}', array('user' => 'Bob', 'foo.bar' => 'Bar'));
-
-        $expected = array('info {Message {nothing} Bob Bar a}');
-        $this->assertEquals($expected, $this->getLogs());
-    }
-
-    public function testObjectCastToString()
-    {
-        if (method_exists($this, 'createPartialMock')) {
-            $dummy = $this->createPartialMock('Psr\Log\Test\DummyTest', array('__toString'));
-        } else {
-            $dummy = $this->getMock('Psr\Log\Test\DummyTest', array('__toString'));
-        }
-        $dummy->expects($this->once())
-            ->method('__toString')
-            ->will($this->returnValue('DUMMY'));
-
-        $this->getLogger()->warning($dummy);
-
-        $expected = array('warning DUMMY');
-        $this->assertEquals($expected, $this->getLogs());
-    }
-
-    public function testContextCanContainAnything()
-    {
-        $context = array(
-            'bool' => true,
-            'null' => null,
-            'string' => 'Foo',
-            'int' => 0,
-            'float' => 0.5,
-            'nested' => array('with object' => new DummyTest),
-            'object' => new \DateTime,
-            'resource' => fopen('php://memory', 'r'),
-        );
-
-        $this->getLogger()->warning('Crazy context data', $context);
-
-        $expected = array('warning Crazy context data');
-        $this->assertEquals($expected, $this->getLogs());
-    }
-
-    public function testContextExceptionKeyCanBeExceptionOrOtherValues()
-    {
-        $logger = $this->getLogger();
-        $logger->warning('Random message', array('exception' => 'oops'));
-        $logger->critical('Uncaught Exception!', array('exception' => new \LogicException('Fail')));
-
-        $expected = array(
-            'warning Random message',
-            'critical Uncaught Exception!'
-        );
-        $this->assertEquals($expected, $this->getLogs());
-    }
-}
-
-class DummyTest
-{
-    public function __toString()
-    {
-    }
-}
diff --git a/mayor-orig/www/include/share/googleapi/psr/log/README.md b/mayor-orig/www/include/share/googleapi/psr/log/README.md
deleted file mode 100644
index 574bc1cb..00000000
--- a/mayor-orig/www/include/share/googleapi/psr/log/README.md
+++ /dev/null
@@ -1,45 +0,0 @@
-PSR Log
-=======
-
-This repository holds all interfaces/classes/traits related to
-[PSR-3](https://github.com/php-fig/fig-standards/blob/master/accepted/PSR-3-logger-interface.md).
-
-Note that this is not a logger of its own. It is merely an interface that
-describes a logger. See the specification for more details.
-
-Usage
------
-
-If you need a logger, you can use the interface like this:
-
-```php
-logger = $logger;
-    }
-
-    public function doSomething()
-    {
-        if ($this->logger) {
-            $this->logger->info('Doing work');
-        }
-
-        // do something useful
-    }
-}
-```
-
-You can then pick one of the implementations of the interface to get a logger.
-
-If you want to implement the interface, you can require this package and
-implement `Psr\Log\LoggerInterface` in your code. Please read the
-[specification text](https://github.com/php-fig/fig-standards/blob/master/accepted/PSR-3-logger-interface.md)
-for details.
diff --git a/mayor-orig/www/include/share/googleapi/psr/log/composer.json b/mayor-orig/www/include/share/googleapi/psr/log/composer.json
deleted file mode 100644
index 87934d70..00000000
--- a/mayor-orig/www/include/share/googleapi/psr/log/composer.json
+++ /dev/null
@@ -1,26 +0,0 @@
-{
-    "name": "psr/log",
-    "description": "Common interface for logging libraries",
-    "keywords": ["psr", "psr-3", "log"],
-    "homepage": "https://github.com/php-fig/log",
-    "license": "MIT",
-    "authors": [
-        {
-            "name": "PHP-FIG",
-            "homepage": "http://www.php-fig.org/"
-        }
-    ],
-    "require": {
-        "php": ">=5.3.0"
-    },
-    "autoload": {
-        "psr-4": {
-            "Psr\\Log\\": "Psr/Log/"
-        }
-    },
-    "extra": {
-        "branch-alias": {
-            "dev-master": "1.0.x-dev"
-        }
-    }
-}
diff --git a/mayor-orig/www/include/share/net/class.smtp.php b/mayor-orig/www/include/share/net/class.smtp.php
deleted file mode 100644
index 81a85d08..00000000
--- a/mayor-orig/www/include/share/net/class.smtp.php
+++ /dev/null
@@ -1,1152 +0,0 @@
-
- * @author Jim Jagielski (jimjag) 
- * @author Andy Prevost (codeworxtech) 
- * @author Brent R. Matzelle (original founder)
- * @copyright 2014 Marcus Bointon
- * @copyright 2010 - 2012 Jim Jagielski
- * @copyright 2004 - 2009 Andy Prevost
- * @license http://www.gnu.org/copyleft/lesser.html GNU Lesser General Public License
- * @note This program is distributed in the hope that it will be useful - WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.
- */
-
-/**
- * PHPMailer RFC821 SMTP email transport class.
- * Implements RFC 821 SMTP commands and provides some utility methods for sending mail to an SMTP server.
- * @package PHPMailer
- * @author Chris Ryan
- * @author Marcus Bointon 
- */
-class SMTP
-{
-    /**
-     * The PHPMailer SMTP version number.
-     * @type string
-     */
-    const VERSION = '5.2.9';
-
-    /**
-     * SMTP line break constant.
-     * @type string
-     */
-    const CRLF = "\r\n";
-
-    /**
-     * The SMTP port to use if one is not specified.
-     * @type integer
-     */
-    const DEFAULT_SMTP_PORT = 25;
-
-    /**
-     * The maximum line length allowed by RFC 2822 section 2.1.1
-     * @type integer
-     */
-    const MAX_LINE_LENGTH = 998;
-
-    /**
-     * Debug level for no output
-     */
-    const DEBUG_OFF = 0;
-
-    /**
-     * Debug level to show client -> server messages
-     */
-    const DEBUG_CLIENT = 1;
-
-    /**
-     * Debug level to show client -> server and server -> client messages
-     */
-    const DEBUG_SERVER = 2;
-
-    /**
-     * Debug level to show connection status, client -> server and server -> client messages
-     */
-    const DEBUG_CONNECTION = 3;
-
-    /**
-     * Debug level to show all messages
-     */
-    const DEBUG_LOWLEVEL = 4;
-
-    /**
-     * The PHPMailer SMTP Version number.
-     * @type string
-     * @deprecated Use the `VERSION` constant instead
-     * @see SMTP::VERSION
-     */
-    public $Version = '5.2.9';
-
-    /**
-     * SMTP server port number.
-     * @type integer
-     * @deprecated This is only ever used as a default value, so use the `DEFAULT_SMTP_PORT` constant instead
-     * @see SMTP::DEFAULT_SMTP_PORT
-     */
-    public $SMTP_PORT = 25;
-
-    /**
-     * SMTP reply line ending.
-     * @type string
-     * @deprecated Use the `CRLF` constant instead
-     * @see SMTP::CRLF
-     */
-    public $CRLF = "\r\n";
-
-    /**
-     * Debug output level.
-     * Options:
-     * * self::DEBUG_OFF (`0`) No debug output, default
-     * * self::DEBUG_CLIENT (`1`) Client commands
-     * * self::DEBUG_SERVER (`2`) Client commands and server responses
-     * * self::DEBUG_CONNECTION (`3`) As DEBUG_SERVER plus connection status
-     * * self::DEBUG_LOWLEVEL (`4`) Low-level data output, all messages
-     * @type integer
-     */
-    public $do_debug = self::DEBUG_OFF;
-
-    /**
-     * How to handle debug output.
-     * Options:
-     * * `echo` Output plain-text as-is, appropriate for CLI
-     * * `html` Output escaped, line breaks converted to `
`, appropriate for browser output
-     * * `error_log` Output to error log as configured in php.ini
-     *
-     * Alternatively, you can provide a callable expecting two params: a message string and the debug level:
-     * 
-     * $smtp->Debugoutput = function($str, $level) {echo "debug level $level; message: $str";};
-     * 
-     * @type string|callable
-     */
-    public $Debugoutput = 'echo';
-
-    /**
-     * Whether to use VERP.
-     * @link http://en.wikipedia.org/wiki/Variable_envelope_return_path
-     * @link http://www.postfix.org/VERP_README.html Info on VERP
-     * @type boolean
-     */
-    public $do_verp = false;
-
-    /**
-     * The timeout value for connection, in seconds.
-     * Default of 5 minutes (300sec) is from RFC2821 section 4.5.3.2
-     * This needs to be quite high to function correctly with hosts using greetdelay as an anti-spam measure.
-     * @link http://tools.ietf.org/html/rfc2821#section-4.5.3.2
-     * @type integer
-     */
-    public $Timeout = 300;
-
-    /**
-     * How long to wait for commands to complete, in seconds.
-     * Default of 5 minutes (300sec) is from RFC2821 section 4.5.3.2
-     * @type integer
-     */
-    public $Timelimit = 300;
-
-    /**
-     * The socket for the server connection.
-     * @type resource
-     */
-    protected $smtp_conn;
-
-    /**
-     * Error information, if any, for the last SMTP command.
-     * @type array
-     */
-    protected $error = array(
-        'error' => '',
-        'detail' => '',
-        'smtp_code' => '',
-        'smtp_code_ex' => ''
-    );
-
-    /**
-     * The reply the server sent to us for HELO.
-     * If null, no HELO string has yet been received.
-     * @type string|null
-     */
-    protected $helo_rply = null;
-
-    /**
-     * The set of SMTP extensions sent in reply to EHLO command.
-     * Indexes of the array are extension names.
-     * Value at index 'HELO' or 'EHLO' (according to command that was sent)
-     * represents the server name. In case of HELO it is the only element of the array.
-     * Other values can be boolean TRUE or an array containing extension options.
-     * If null, no HELO/EHLO string has yet been received.
-     * @type array|null
-     */
-    protected $server_caps = null;
-
-    /**
-     * The most recent reply received from the server.
-     * @type string
-     */
-    protected $last_reply = '';
-
-    /**
-     * Output debugging info via a user-selected method.
-     * @see SMTP::$Debugoutput
-     * @see SMTP::$do_debug
-     * @param string $str Debug string to output
-     * @param integer $level The debug level of this message; see DEBUG_* constants
-     * @return void
-     */
-    protected function edebug($str, $level = 0)
-    {
-        if ($level > $this->do_debug) {
-            return;
-        }
-        //Avoid clash with built-in function names
-        if (!in_array($this->Debugoutput, array('error_log', 'html', 'echo')) and is_callable($this->Debugoutput)) {
-            call_user_func($this->Debugoutput, $str, $this->do_debug);
-            return;
-        }
-        switch ($this->Debugoutput) {
-            case 'error_log':
-                //Don't output, just log
-                error_log($str);
-                break;
-            case 'html':
-                //Cleans up output a bit for a better looking, HTML-safe output
-                echo htmlentities(
-                    preg_replace('/[\r\n]+/', '', $str),
-                    ENT_QUOTES,
-                    'UTF-8'
-                )
-                . "
\n";
-                break;
-            case 'echo':
-            default:
-                //Normalize line breaks
-                $str = preg_replace('/(\r\n|\r|\n)/ms', "\n", $str);
-                echo gmdate('Y-m-d H:i:s') . "\t" . str_replace(
-                    "\n",
-                    "\n                   \t                  ",
-                    trim($str)
-                )."\n";
-        }
-    }
-
-    /**
-     * Connect to an SMTP server.
-     * @param string $host SMTP server IP or host name
-     * @param integer $port The port number to connect to
-     * @param integer $timeout How long to wait for the connection to open
-     * @param array $options An array of options for stream_context_create()
-     * @access public
-     * @return boolean
-     */
-    public function connect($host, $port = null, $timeout = 30, $options = array())
-    {
-        static $streamok;
-        //This is enabled by default since 5.0.0 but some providers disable it
-        //Check this once and cache the result
-        if (is_null($streamok)) {
-            $streamok = function_exists('stream_socket_client');
-        }
-        // Clear errors to avoid confusion
-        $this->setError('');
-        // Make sure we are __not__ connected
-        if ($this->connected()) {
-            // Already connected, generate error
-            $this->setError('Already connected to a server');
-            return false;
-        }
-        if (empty($port)) {
-            $port = self::DEFAULT_SMTP_PORT;
-        }
-        // Connect to the SMTP server
-        $this->edebug(
-            "Connection: opening to $host:$port, t=$timeout, opt=".var_export($options, true),
-            self::DEBUG_CONNECTION
-        );
-        $errno = 0;
-        $errstr = '';
-        if ($streamok) {
-            $socket_context = stream_context_create($options);
-            //Suppress errors; connection failures are handled at a higher level
-            $this->smtp_conn = @stream_socket_client(
-                $host . ":" . $port,
-                $errno,
-                $errstr,
-                $timeout,
-                STREAM_CLIENT_CONNECT,
-                $socket_context
-            );
-        } else {
-            //Fall back to fsockopen which should work in more places, but is missing some features
-            $this->edebug(
-                "Connection: stream_socket_client not available, falling back to fsockopen",
-                self::DEBUG_CONNECTION
-            );
-            $this->smtp_conn = fsockopen(
-                $host,
-                $port,
-                $errno,
-                $errstr,
-                $timeout
-            );
-        }
-        // Verify we connected properly
-        if (!is_resource($this->smtp_conn)) {
-            $this->setError(
-                'Failed to connect to server',
-                $errno,
-                $errstr
-            );
-            $this->edebug(
-                'SMTP ERROR: ' . $this->error['error']
-                . ": $errstr ($errno)",
-                self::DEBUG_CLIENT
-            );
-            return false;
-        }
-        $this->edebug('Connection: opened', self::DEBUG_CONNECTION);
-        // SMTP server can take longer to respond, give longer timeout for first read
-        // Windows does not have support for this timeout function
-        if (substr(PHP_OS, 0, 3) != 'WIN') {
-            $max = ini_get('max_execution_time');
-            // Don't bother if unlimited
-            if ($max != 0 && $timeout > $max) {
-                @set_time_limit($timeout);
-            }
-            stream_set_timeout($this->smtp_conn, $timeout, 0);
-        }
-        // Get any announcement
-        $announce = $this->get_lines();
-        $this->edebug('SERVER -> CLIENT: ' . $announce, self::DEBUG_SERVER);
-        return true;
-    }
-
-    /**
-     * Initiate a TLS (encrypted) session.
-     * @access public
-     * @return boolean
-     */
-    public function startTLS()
-    {
-        if (!$this->sendCommand('STARTTLS', 'STARTTLS', 220)) {
-            return false;
-        }
-        // Begin encrypted connection
-        if (!stream_socket_enable_crypto(
-            $this->smtp_conn,
-            true,
-            STREAM_CRYPTO_METHOD_TLS_CLIENT
-        )) {
-            return false;
-        }
-        return true;
-    }
-
-    /**
-     * Perform SMTP authentication.
-     * Must be run after hello().
-     * @see hello()
-     * @param string $username    The user name
-     * @param string $password    The password
-     * @param string $authtype    The auth type (PLAIN, LOGIN, NTLM, CRAM-MD5)
-     * @param string $realm       The auth realm for NTLM
-     * @param string $workstation The auth workstation for NTLM
-     * @access public
-     * @return boolean True if successfully authenticated.
-     */
-    public function authenticate(
-        $username,
-        $password,
-        $authtype = null,
-        $realm = '',
-        $workstation = ''
-    ) {
-        if (!$this->server_caps) {
-            $this->setError('Authentication is not allowed before HELO/EHLO');
-            return false;
-        }
-
-        if (array_key_exists('EHLO', $this->server_caps)) {
-        // SMTP extensions are available. Let's try to find a proper authentication method
-
-            if (!array_key_exists('AUTH', $this->server_caps)) {
-                $this->setError('Authentication is not allowed at this stage');
-                // 'at this stage' means that auth may be allowed after the stage changes
-                // e.g. after STARTTLS
-                return false;
-            }
-
-            self::edebug('Auth method requested: ' . ($authtype ? $authtype : 'UNKNOWN'), self::DEBUG_LOWLEVEL);
-            self::edebug(
-                'Auth methods available on the server: ' . implode(',', $this->server_caps['AUTH']),
-                self::DEBUG_LOWLEVEL
-            );
-
-            if (empty($authtype)) {
-                foreach (array('LOGIN', 'CRAM-MD5', 'NTLM', 'PLAIN') as $method) {
-                    if (in_array($method, $this->server_caps['AUTH'])) {
-                        $authtype = $method;
-                        break;
-                    }
-                }
-                if (empty($authtype)) {
-                    $this->setError('No supported authentication methods found');
-                    return false;
-                }
-                self::edebug('Auth method selected: '.$authtype, self::DEBUG_LOWLEVEL);
-            }
-
-            if (!in_array($authtype, $this->server_caps['AUTH'])) {
-                $this->setError("The requested authentication method \"$authtype\" is not supported by the server");
-                return false;
-            }
-        } elseif (empty($authtype)) {
-            $authtype = 'LOGIN';
-        }
-        switch ($authtype) {
-            case 'PLAIN':
-                // Start authentication
-                if (!$this->sendCommand('AUTH', 'AUTH PLAIN', 334)) {
-                    return false;
-                }
-                // Send encoded username and password
-                if (!$this->sendCommand(
-                    'User & Password',
-                    base64_encode("\0" . $username . "\0" . $password),
-                    235
-                )
-                ) {
-                    return false;
-                }
-                break;
-            case 'LOGIN':
-                // Start authentication
-                if (!$this->sendCommand('AUTH', 'AUTH LOGIN', 334)) {
-                    return false;
-                }
-                if (!$this->sendCommand("Username", base64_encode($username), 334)) {
-                    return false;
-                }
-                if (!$this->sendCommand("Password", base64_encode($password), 235)) {
-                    return false;
-                }
-                break;
-            case 'NTLM':
-                /*
-                 * ntlm_sasl_client.php
-                 * Bundled with Permission
-                 *
-                 * How to telnet in windows:
-                 * http://technet.microsoft.com/en-us/library/aa995718%28EXCHG.65%29.aspx
-                 * PROTOCOL Docs http://curl.haxx.se/rfc/ntlm.html#ntlmSmtpAuthentication
-                 */
-                require_once 'extras/ntlm_sasl_client.php';
-                $temp = new stdClass;
-                $ntlm_client = new ntlm_sasl_client_class;
-                //Check that functions are available
-                if (!$ntlm_client->Initialize($temp)) {
-                    $this->setError($temp->error);
-                    $this->edebug(
-                        'You need to enable some modules in your php.ini file: '
-                        . $this->error['error'],
-                        self::DEBUG_CLIENT
-                    );
-                    return false;
-                }
-                //msg1
-                $msg1 = $ntlm_client->TypeMsg1($realm, $workstation); //msg1
-
-                if (!$this->sendCommand(
-                    'AUTH NTLM',
-                    'AUTH NTLM ' . base64_encode($msg1),
-                    334
-                )
-                ) {
-                    return false;
-                }
-                //Though 0 based, there is a white space after the 3 digit number
-                //msg2
-                $challenge = substr($this->last_reply, 3);
-                $challenge = base64_decode($challenge);
-                $ntlm_res = $ntlm_client->NTLMResponse(
-                    substr($challenge, 24, 8),
-                    $password
-                );
-                //msg3
-                $msg3 = $ntlm_client->TypeMsg3(
-                    $ntlm_res,
-                    $username,
-                    $realm,
-                    $workstation
-                );
-                // send encoded username
-                return $this->sendCommand('Username', base64_encode($msg3), 235);
-            case 'CRAM-MD5':
-                // Start authentication
-                if (!$this->sendCommand('AUTH CRAM-MD5', 'AUTH CRAM-MD5', 334)) {
-                    return false;
-                }
-                // Get the challenge
-                $challenge = base64_decode(substr($this->last_reply, 4));
-
-                // Build the response
-                $response = $username . ' ' . $this->hmac($challenge, $password);
-
-                // send encoded credentials
-                return $this->sendCommand('Username', base64_encode($response), 235);
-            default:
-                $this->setError("Authentication method \"$authtype\" is not supported");
-                return false;
-        }
-        return true;
-    }
-
-    /**
-     * Calculate an MD5 HMAC hash.
-     * Works like hash_hmac('md5', $data, $key)
-     * in case that function is not available
-     * @param string $data The data to hash
-     * @param string $key  The key to hash with
-     * @access protected
-     * @return string
-     */
-    protected function hmac($data, $key)
-    {
-        if (function_exists('hash_hmac')) {
-            return hash_hmac('md5', $data, $key);
-        }
-
-        // The following borrowed from
-        // http://php.net/manual/en/function.mhash.php#27225
-
-        // RFC 2104 HMAC implementation for php.
-        // Creates an md5 HMAC.
-        // Eliminates the need to install mhash to compute a HMAC
-        // by Lance Rushing
-
-        $bytelen = 64; // byte length for md5
-        if (strlen($key) > $bytelen) {
-            $key = pack('H*', md5($key));
-        }
-        $key = str_pad($key, $bytelen, chr(0x00));
-        $ipad = str_pad('', $bytelen, chr(0x36));
-        $opad = str_pad('', $bytelen, chr(0x5c));
-        $k_ipad = $key ^ $ipad;
-        $k_opad = $key ^ $opad;
-
-        return md5($k_opad . pack('H*', md5($k_ipad . $data)));
-    }
-
-    /**
-     * Check connection state.
-     * @access public
-     * @return boolean True if connected.
-     */
-    public function connected()
-    {
-        if (is_resource($this->smtp_conn)) {
-            $sock_status = stream_get_meta_data($this->smtp_conn);
-            if ($sock_status['eof']) {
-                // The socket is valid but we are not connected
-                $this->edebug(
-                    'SMTP NOTICE: EOF caught while checking if connected',
-                    self::DEBUG_CLIENT
-                );
-                $this->close();
-                return false;
-            }
-            return true; // everything looks good
-        }
-        return false;
-    }
-
-    /**
-     * Close the socket and clean up the state of the class.
-     * Don't use this function without first trying to use QUIT.
-     * @see quit()
-     * @access public
-     * @return void
-     */
-    public function close()
-    {
-        $this->setError('');
-        $this->server_caps = null;
-        $this->helo_rply = null;
-        if (is_resource($this->smtp_conn)) {
-            // close the connection and cleanup
-            fclose($this->smtp_conn);
-            $this->smtp_conn = null; //Makes for cleaner serialization
-            $this->edebug('Connection: closed', self::DEBUG_CONNECTION);
-        }
-    }
-
-    /**
-     * Send an SMTP DATA command.
-     * Issues a data command and sends the msg_data to the server,
-     * finializing the mail transaction. $msg_data is the message
-     * that is to be send with the headers. Each header needs to be
-     * on a single line followed by a  with the message headers
-     * and the message body being separated by and additional .
-     * Implements rfc 821: DATA 
-     * @param string $msg_data Message data to send
-     * @access public
-     * @return boolean
-     */
-    public function data($msg_data)
-    {
-        //This will use the standard timelimit
-        if (!$this->sendCommand('DATA', 'DATA', 354)) {
-            return false;
-        }
-
-        /* The server is ready to accept data!
-         * According to rfc821 we should not send more than 1000 characters on a single line (including the CRLF)
-         * so we will break the data up into lines by \r and/or \n then if needed we will break each of those into
-         * smaller lines to fit within the limit.
-         * We will also look for lines that start with a '.' and prepend an additional '.'.
-         * NOTE: this does not count towards line-length limit.
-         */
-
-        // Normalize line breaks before exploding
-        $lines = explode("\n", str_replace(array("\r\n", "\r"), "\n", $msg_data));
-
-        /* To distinguish between a complete RFC822 message and a plain message body, we check if the first field
-         * of the first line (':' separated) does not contain a space then it _should_ be a header and we will
-         * process all lines before a blank line as headers.
-         */
-
-        $field = substr($lines[0], 0, strpos($lines[0], ':'));
-        $in_headers = false;
-        if (!empty($field) && strpos($field, ' ') === false) {
-            $in_headers = true;
-        }
-
-        foreach ($lines as $line) {
-            $lines_out = array();
-            if ($in_headers and $line == '') {
-                $in_headers = false;
-            }
-            //Break this line up into several smaller lines if it's too long
-            //Micro-optimisation: isset($str[$len]) is faster than (strlen($str) > $len),
-            while (isset($line[self::MAX_LINE_LENGTH])) {
-                //Working backwards, try to find a space within the last MAX_LINE_LENGTH chars of the line to break on
-                //so as to avoid breaking in the middle of a word
-                $pos = strrpos(substr($line, 0, self::MAX_LINE_LENGTH), ' ');
-                //Deliberately matches both false and 0
-                if (!$pos) {
-                    //No nice break found, add a hard break
-                    $pos = self::MAX_LINE_LENGTH - 1;
-                    $lines_out[] = substr($line, 0, $pos);
-                    $line = substr($line, $pos);
-                } else {
-                    //Break at the found point
-                    $lines_out[] = substr($line, 0, $pos);
-                    //Move along by the amount we dealt with
-                    $line = substr($line, $pos + 1);
-                }
-                //If processing headers add a LWSP-char to the front of new line RFC822 section 3.1.1
-                if ($in_headers) {
-                    $line = "\t" . $line;
-                }
-            }
-            $lines_out[] = $line;
-
-            //Send the lines to the server
-            foreach ($lines_out as $line_out) {
-                //RFC2821 section 4.5.2
-                if (!empty($line_out) and $line_out[0] == '.') {
-                    $line_out = '.' . $line_out;
-                }
-                $this->client_send($line_out . self::CRLF);
-            }
-        }
-
-        //Message data has been sent, complete the command
-        //Increase timelimit for end of DATA command
-        $savetimelimit = $this->Timelimit;
-        $this->Timelimit = $this->Timelimit * 2;
-        $result = $this->sendCommand('DATA END', '.', 250);
-        //Restore timelimit
-        $this->Timelimit = $savetimelimit;
-        return $result;
-    }
-
-    /**
-     * Send an SMTP HELO or EHLO command.
-     * Used to identify the sending server to the receiving server.
-     * This makes sure that client and server are in a known state.
-     * Implements RFC 821: HELO   
-     * and RFC 2821 EHLO.
-     * @param string $host The host name or IP to connect to
-     * @access public
-     * @return boolean
-     */
-    public function hello($host = '')
-    {
-        //Try extended hello first (RFC 2821)
-        return (boolean)($this->sendHello('EHLO', $host) or $this->sendHello('HELO', $host));
-    }
-
-    /**
-     * Send an SMTP HELO or EHLO command.
-     * Low-level implementation used by hello()
-     * @see hello()
-     * @param string $hello The HELO string
-     * @param string $host The hostname to say we are
-     * @access protected
-     * @return boolean
-     */
-    protected function sendHello($hello, $host)
-    {
-        $noerror = $this->sendCommand($hello, $hello . ' ' . $host, 250);
-        $this->helo_rply = $this->last_reply;
-        if ($noerror) {
-            $this->parseHelloFields($hello);
-        } else {
-            $this->server_caps = null;
-        }
-        return $noerror;
-    }
-
-    /**
-     * Parse a reply to HELO/EHLO command to discover server extensions.
-     * In case of HELO, the only parameter that can be discovered is a server name.
-     * @access protected
-     * @param string $type - 'HELO' or 'EHLO'
-     */
-    protected function parseHelloFields($type)
-    {
-        $this->server_caps = array();
-        $lines = explode("\n", $this->last_reply);
-        foreach ($lines as $n => $s) {
-            $s = trim(substr($s, 4));
-            if (!$s) {
-                continue;
-            }
-            $fields = explode(' ', $s);
-            if (!empty($fields)) {
-                if (!$n) {
-                    $name = $type;
-                    $fields = $fields[0];
-                } else {
-                    $name = array_shift($fields);
-                    if ($name == 'SIZE') {
-                        $fields = ($fields) ? $fields[0] : 0;
-                    }
-                }
-                $this->server_caps[$name] = ($fields ? $fields : true);
-            }
-        }
-    }
-
-    /**
-     * Send an SMTP MAIL command.
-     * Starts a mail transaction from the email address specified in
-     * $from. Returns true if successful or false otherwise. If True
-     * the mail transaction is started and then one or more recipient
-     * commands may be called followed by a data command.
-     * Implements rfc 821: MAIL  FROM: 
-     * @param string $from Source address of this message
-     * @access public
-     * @return boolean
-     */
-    public function mail($from)
-    {
-        $useVerp = ($this->do_verp ? ' XVERP' : '');
-        return $this->sendCommand(
-            'MAIL FROM',
-            'MAIL FROM:<' . $from . '>' . $useVerp,
-            250
-        );
-    }
-
-    /**
-     * Send an SMTP QUIT command.
-     * Closes the socket if there is no error or the $close_on_error argument is true.
-     * Implements from rfc 821: QUIT 
-     * @param boolean $close_on_error Should the connection close if an error occurs?
-     * @access public
-     * @return boolean
-     */
-    public function quit($close_on_error = true)
-    {
-        $noerror = $this->sendCommand('QUIT', 'QUIT', 221);
-        $err = $this->error; //Save any error
-        if ($noerror or $close_on_error) {
-            $this->close();
-            $this->error = $err; //Restore any error from the quit command
-        }
-        return $noerror;
-    }
-
-    /**
-     * Send an SMTP RCPT command.
-     * Sets the TO argument to $toaddr.
-     * Returns true if the recipient was accepted false if it was rejected.
-     * Implements from rfc 821: RCPT  TO: 
-     * @param string $toaddr The address the message is being sent to
-     * @access public
-     * @return boolean
-     */
-    public function recipient($toaddr)
-    {
-        return $this->sendCommand(
-            'RCPT TO',
-            'RCPT TO:<' . $toaddr . '>',
-            array(250, 251)
-        );
-    }
-
-    /**
-     * Send an SMTP RSET command.
-     * Abort any transaction that is currently in progress.
-     * Implements rfc 821: RSET 
-     * @access public
-     * @return boolean True on success.
-     */
-    public function reset()
-    {
-        return $this->sendCommand('RSET', 'RSET', 250);
-    }
-
-    /**
-     * Send a command to an SMTP server and check its return code.
-     * @param string $command       The command name - not sent to the server
-     * @param string $commandstring The actual command to send
-     * @param integer|array $expect     One or more expected integer success codes
-     * @access protected
-     * @return boolean True on success.
-     */
-    protected function sendCommand($command, $commandstring, $expect)
-    {
-        if (!$this->connected()) {
-            $this->setError("Called $command without being connected");
-            return false;
-        }
-        $this->client_send($commandstring . self::CRLF);
-
-        $this->last_reply = $this->get_lines();
-        // Fetch SMTP code and possible error code explanation
-        $matches = array();
-        if (preg_match("/^([0-9]{3})[ -](?:([0-9]\\.[0-9]\\.[0-9]) )?/", $this->last_reply, $matches)) {
-            $code = $matches[1];
-            $code_ex = (count($matches) > 2 ? $matches[2] : null);
-            // Cut off error code from each response line
-            $detail = preg_replace(
-                "/{$code}[ -]".($code_ex ? str_replace('.', '\\.', $code_ex).' ' : '')."/m",
-                '',
-                $this->last_reply
-            );
-        } else {
-            // Fall back to simple parsing if regex fails
-            $code = substr($this->last_reply, 0, 3);
-            $code_ex = null;
-            $detail = substr($this->last_reply, 4);
-        }
-
-        $this->edebug('SERVER -> CLIENT: ' . $this->last_reply, self::DEBUG_SERVER);
-
-        if (!in_array($code, (array)$expect)) {
-            $this->setError(
-                "$command command failed",
-                $detail,
-                $code,
-                $code_ex
-            );
-            $this->edebug(
-                'SMTP ERROR: ' . $this->error['error'] . ': ' . $this->last_reply,
-                self::DEBUG_CLIENT
-            );
-            return false;
-        }
-
-        $this->setError('');
-        return true;
-    }
-
-    /**
-     * Send an SMTP SAML command.
-     * Starts a mail transaction from the email address specified in $from.
-     * Returns true if successful or false otherwise. If True
-     * the mail transaction is started and then one or more recipient
-     * commands may be called followed by a data command. This command
-     * will send the message to the users terminal if they are logged
-     * in and send them an email.
-     * Implements rfc 821: SAML  FROM: 
-     * @param string $from The address the message is from
-     * @access public
-     * @return boolean
-     */
-    public function sendAndMail($from)
-    {
-        return $this->sendCommand('SAML', "SAML FROM:$from", 250);
-    }
-
-    /**
-     * Send an SMTP VRFY command.
-     * @param string $name The name to verify
-     * @access public
-     * @return boolean
-     */
-    public function verify($name)
-    {
-        return $this->sendCommand('VRFY', "VRFY $name", array(250, 251));
-    }
-
-    /**
-     * Send an SMTP NOOP command.
-     * Used to keep keep-alives alive, doesn't actually do anything
-     * @access public
-     * @return boolean
-     */
-    public function noop()
-    {
-        return $this->sendCommand('NOOP', 'NOOP', 250);
-    }
-
-    /**
-     * Send an SMTP TURN command.
-     * This is an optional command for SMTP that this class does not support.
-     * This method is here to make the RFC821 Definition complete for this class
-     * and _may_ be implemented in future
-     * Implements from rfc 821: TURN 
-     * @access public
-     * @return boolean
-     */
-    public function turn()
-    {
-        $this->setError('The SMTP TURN command is not implemented');
-        $this->edebug('SMTP NOTICE: ' . $this->error['error'], self::DEBUG_CLIENT);
-        return false;
-    }
-
-    /**
-     * Send raw data to the server.
-     * @param string $data The data to send
-     * @access public
-     * @return integer|boolean The number of bytes sent to the server or false on error
-     */
-    public function client_send($data)
-    {
-        $this->edebug("CLIENT -> SERVER: $data", self::DEBUG_CLIENT);
-        return fwrite($this->smtp_conn, $data);
-    }
-
-    /**
-     * Get the latest error.
-     * @access public
-     * @return array
-     */
-    public function getError()
-    {
-        return $this->error;
-    }
-
-    /**
-     * Get SMTP extensions available on the server
-     * @access public
-     * @return array|null
-     */
-    public function getServerExtList()
-    {
-        return $this->server_caps;
-    }
-
-    /**
-     * A multipurpose method
-     * The method works in three ways, dependent on argument value and current state
-     *   1. HELO/EHLO was not sent - returns null and set up $this->error
-     *   2. HELO was sent
-     *     $name = 'HELO': returns server name
-     *     $name = 'EHLO': returns boolean false
-     *     $name = any string: returns null and set up $this->error
-     *   3. EHLO was sent
-     *     $name = 'HELO'|'EHLO': returns server name
-     *     $name = any string: if extension $name exists, returns boolean True
-     *       or its options. Otherwise returns boolean False
-     * In other words, one can use this method to detect 3 conditions:
-     *  - null returned: handshake was not or we don't know about ext (refer to $this->error)
-     *  - false returned: the requested feature exactly not exists
-     *  - positive value returned: the requested feature exists
-     * @param string $name Name of SMTP extension or 'HELO'|'EHLO'
-     * @return mixed
-     */
-    public function getServerExt($name)
-    {
-        if (!$this->server_caps) {
-            $this->setError('No HELO/EHLO was sent');
-            return null;
-        }
-
-        // the tight logic knot ;)
-        if (!array_key_exists($name, $this->server_caps)) {
-            if ($name == 'HELO') {
-                return $this->server_caps['EHLO'];
-            }
-            if ($name == 'EHLO' || array_key_exists('EHLO', $this->server_caps)) {
-                return false;
-            }
-            $this->setError('HELO handshake was used. Client knows nothing about server extensions');
-            return null;
-        }
-
-        return $this->server_caps[$name];
-    }
-
-    /**
-     * Get the last reply from the server.
-     * @access public
-     * @return string
-     */
-    public function getLastReply()
-    {
-        return $this->last_reply;
-    }
-
-    /**
-     * Read the SMTP server's response.
-     * Either before eof or socket timeout occurs on the operation.
-     * With SMTP we can tell if we have more lines to read if the
-     * 4th character is '-' symbol. If it is a space then we don't
-     * need to read anything else.
-     * @access protected
-     * @return string
-     */
-    protected function get_lines()
-    {
-        // If the connection is bad, give up straight away
-        if (!is_resource($this->smtp_conn)) {
-            return '';
-        }
-        $data = '';
-        $endtime = 0;
-        stream_set_timeout($this->smtp_conn, $this->Timeout);
-        if ($this->Timelimit > 0) {
-            $endtime = time() + $this->Timelimit;
-        }
-        while (is_resource($this->smtp_conn) && !feof($this->smtp_conn)) {
-            $str = @fgets($this->smtp_conn, 515);
-            $this->edebug("SMTP -> get_lines(): \$data was \"$data\"", self::DEBUG_LOWLEVEL);
-            $this->edebug("SMTP -> get_lines(): \$str is \"$str\"", self::DEBUG_LOWLEVEL);
-            $data .= $str;
-            $this->edebug("SMTP -> get_lines(): \$data is \"$data\"", self::DEBUG_LOWLEVEL);
-            // If 4th character is a space, we are done reading, break the loop, micro-optimisation over strlen
-            if ((isset($str[3]) and $str[3] == ' ')) {
-                break;
-            }
-            // Timed-out? Log and break
-            $info = stream_get_meta_data($this->smtp_conn);
-            if ($info['timed_out']) {
-                $this->edebug(
-                    'SMTP -> get_lines(): timed-out (' . $this->Timeout . ' sec)',
-                    self::DEBUG_LOWLEVEL
-                );
-                break;
-            }
-            // Now check if reads took too long
-            if ($endtime and time() > $endtime) {
-                $this->edebug(
-                    'SMTP -> get_lines(): timelimit reached ('.
-                    $this->Timelimit . ' sec)',
-                    self::DEBUG_LOWLEVEL
-                );
-                break;
-            }
-        }
-        return $data;
-    }
-
-    /**
-     * Enable or disable VERP address generation.
-     * @param boolean $enabled
-     */
-    public function setVerp($enabled = false)
-    {
-        $this->do_verp = $enabled;
-    }
-
-    /**
-     * Get VERP address generation mode.
-     * @return boolean
-     */
-    public function getVerp()
-    {
-        return $this->do_verp;
-    }
-
-    /**
-     * Set error messages and codes.
-     * @param string $message The error message
-     * @param string $detail Further detail on the error
-     * @param string $smtp_code An associated SMTP error code
-     * @param string $smtp_code_ex Extended SMTP code
-     */
-    protected function setError($message, $detail = '', $smtp_code = '', $smtp_code_ex = '')
-    {
-        $this->error = array(
-            'error' => $message,
-            'detail' => $detail,
-            'smtp_code' => $smtp_code,
-            'smtp_code_ex' => $smtp_code_ex
-        );
-    }
-
-    /**
-     * Set debug output method.
-     * @param string|callable $method The name of the mechanism to use for debugging output, or a callable to handle it.
-     */
-    public function setDebugOutput($method = 'echo')
-    {
-        $this->Debugoutput = $method;
-    }
-
-    /**
-     * Get debug output method.
-     * @return string
-     */
-    public function getDebugOutput()
-    {
-        return $this->Debugoutput;
-    }
-
-    /**
-     * Set debug output level.
-     * @param integer $level
-     */
-    public function setDebugLevel($level = 0)
-    {
-        $this->do_debug = $level;
-    }
-
-    /**
-     * Get debug output level.
-     * @return integer
-     */
-    public function getDebugLevel()
-    {
-        return $this->do_debug;
-    }
-
-    /**
-     * Set SMTP timeout.
-     * @param integer $timeout
-     */
-    public function setTimeout($timeout = 0)
-    {
-        $this->Timeout = $timeout;
-    }
-
-    /**
-     * Get SMTP timeout.
-     * @return integer
-     */
-    public function getTimeout()
-    {
-        return $this->Timeout;
-    }
-}
diff --git a/mayor-orig/www/include/share/net/facebook.php b/mayor-orig/www/include/share/net/facebook.php
deleted file mode 100644
index 74721a0a..00000000
--- a/mayor-orig/www/include/share/net/facebook.php
+++ /dev/null
@@ -1,70 +0,0 @@
- __FB_APP_ID,
-    		'app_secret' => __FB_APP_SECRET,
-    		'default_graph_version' => 'v2.5',
-	    ));
-	    $helper = $fb->getJavaScriptHelper();
-	    try {
-    		$accessToken = $helper->getAccessToken();
-	    } catch(Facebook\Exceptions\FacebookResponseException $e) {
-    		// When Graph returns an error
-    		$_SESSION['alert'][] = 'info::facebook gráf hiba: ' . $e->getMessage();
-	    } catch(Facebook\Exceptions\FacebookSDKException $e) {
-    		// When validation fails or other local issues
-    		$_SESSION['alert'][] = 'info::facebook SDK hiba: ' . $e->getMessage();
-	    }
-	    if (isset($accessToken)) {
-    		$_SESSION['facebook_access_token'] = (string) $accessToken;
-    		$_SESSION['facebook_access_token_object'] = $accessToken;
-		try {
-    		    $response = $fb->get('/me?fields=id,name,email',$accessToken);
-		    $userNode = $response->getGraphUser();
-		    $fbUserId = $userNode->getField('id');
-		    //$fbUserCn = $userNode->getField('name');
-		    //$fbUserEmail = $userNode->getField('email');
-		} catch (Facebook\Exceptions\FacebookSDKException $e) {
-		    $_SESSION['alert'][] = 'info::facebook gráf hiba: ' . $e->getMessage();
-		    return false;
-		}
-    		/* mayor auth start */
-		$accountInformation=array();
-		$toPolicy = 'public';
-		$data = getUserByFbUserId($fbUserId);
-		if ($data === false) {
-		    $_SESSION['alert'][] = 'info:Nincs ilyen user (még) a MaYoR-ral összekötve, kérjük jelentkezz be jelszóval!';
-		} elseif (is_array($data)) {
-		    // Ha van, akkor ki az? Mert ő bemehet.
-		    return array('userAccount'=>$data['userAccount'],'toPolicy'=>$data['policy'],'fbUserEmail'=>$data['fbUserEmail'],'studyId'=>$data['studyId'],'fbUserCn'=>$data['fbUserCn'],'accessToken'=>$accessToken);
-		}
-		/* mayor auth stop */
-	    } else {
-		$_SESSION['alert'][] = 'info::facebook:nem érvényes accessToken';
-	    }
-	    /* facebook login stop */
-	}
-        return false;
-}
-
-function getUserByFbUserId($fbUserId) {
-        if ($fbUserId=='') return false;
-        $q = "SELECT * FROM facebookConnect WHERE fbUserId='%s' ORDER BY policy LIMIT 1";
-        $v = array('fbUserId'=>$fbUserId);
-        $record = db_query($q,array('fv'=>'getUserByFbUserId','modul'=>'login','result'=>'record','values'=>$v));
-        return $record;
-}
-
-?>
diff --git a/mayor-orig/www/include/share/net/googleapi.php b/mayor-orig/www/include/share/net/googleapi.php
deleted file mode 100644
index bfe3642d..00000000
--- a/mayor-orig/www/include/share/net/googleapi.php
+++ /dev/null
@@ -1,65 +0,0 @@
-setAuthConfig($oauth_credentials);
-	    $client->setClientId(__GOOGLEAPI_CLIENT_ID);
-	    $client->setClientSecret(__GOOGLEAPI_CLIENT_SECRET);
-	    $client->setRedirectUri($redirect_uri);
-	    $client->setScopes('email');
-
-	    try {
-		$payload = $client->verifyIdToken($_GET['id_token']);
-	    } catch(Exception $e) {
-    		$_SESSION['alert'][] = 'info::googleapi SDK hiba: ' . $e->getMessage();
-	    }
-	    if (isset($payload['sub'])) { // subject
-    		$_SESSION['googleapi_object'] = $payload;
-    		// mayor auth start
-		$accountInformation=array();
-		$toPolicy = 'public';
-		$data = getUserByGoogleSub($payload['sub']); // subject=google user id
-		if ($data === false) {
-		    $_SESSION['alert'][] = 'info:Nincs ilyen user (még) a MaYoR-ral összekötve, kérjük jelentkezz be jelszóval!';
-		} elseif (is_array($data)) {
-		    // Ha van, akkor ki az? Mert ő bemehet.
-		    setGoogleToken($payload['sub'],$_GET['id_token']); // a verifyIdToken igazolja
-		    return array('userAccount'=>$data['userAccount'],'toPolicy'=>$data['policy'],'googleUserEmail'=>$data['googleUserEmail'],'studyId'=>$data['studyId'],'googleUserCn'=>$data['googleUserCn'],'accessToken'=>$accessToken);
-		}
-		/* mayor auth stop */
-	    } else {
-		$_SESSION['alert'][] = 'info::googleapi:nem érvényes accessToken';
-	    }
-	    /* googleapi login stop */
-	}
-        return false;
-}
-
-function getUserByGoogleSub($googleSub) {
-        if ($googleSub=='') return false;
-        $q = "SELECT * FROM googleConnect WHERE googleSub='%s' ORDER BY policy LIMIT 1";
-        $v = array($googleSub);
-        $record = db_query($q,array('fv'=>'getUserByGoogleSub','modul'=>'login','result'=>'record','values'=>$v));
-        return $record;
-}
-
-function setGoogleToken($googleSub, $id_token) {
-        if ($googleSub=='') return false;
-        if ($id_token=='') return false;
-	$_SESSION['googleapi_id_token'] = $id_token;
-}
-
-?>
diff --git a/mayor-orig/www/include/share/net/phpmailer.php b/mayor-orig/www/include/share/net/phpmailer.php
deleted file mode 100644
index 5bbaec78..00000000
--- a/mayor-orig/www/include/share/net/phpmailer.php
+++ /dev/null
@@ -1,3552 +0,0 @@
-
- * @author Jim Jagielski (jimjag) 
- * @author Andy Prevost (codeworxtech) 
- * @author Brent R. Matzelle (original founder)
- * @copyright 2012 - 2014 Marcus Bointon
- * @copyright 2010 - 2012 Jim Jagielski
- * @copyright 2004 - 2009 Andy Prevost
- * @license http://www.gnu.org/copyleft/lesser.html GNU Lesser General Public License
- * @note This program is distributed in the hope that it will be useful - WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.
- */
-
-/**
- * PHPMailer - PHP email creation and transport class.
- * @package PHPMailer
- * @author Marcus Bointon (Synchro/coolbru) 
- * @author Jim Jagielski (jimjag) 
- * @author Andy Prevost (codeworxtech) 
- * @author Brent R. Matzelle (original founder)
- */
-class PHPMailer
-{
-    /**
-     * The PHPMailer Version number.
-     * @type string
-     */
-    public $Version = '5.2.9';
-
-    /**
-     * Email priority.
-     * Options: 1 = High, 3 = Normal, 5 = low.
-     * @type integer
-     */
-    public $Priority = 3;
-
-    /**
-     * The character set of the message.
-     * @type string
-     */
-    public $CharSet = 'utf-8';
-
-    /**
-     * The MIME Content-type of the message.
-     * @type string
-     */
-    public $ContentType = 'text/plain';
-
-    /**
-     * The message encoding.
-     * Options: "8bit", "7bit", "binary", "base64", and "quoted-printable".
-     * @type string
-     */
-    public $Encoding = '8bit';
-
-    /**
-     * Holds the most recent mailer error message.
-     * @type string
-     */
-    public $ErrorInfo = '';
-
-    /**
-     * The From email address for the message.
-     * @type string
-     */
-    public $From = 'root@localhost';
-
-    /**
-     * The From name of the message.
-     * @type string
-     */
-    public $FromName = 'Root User';
-
-    /**
-     * The Sender email (Return-Path) of the message.
-     * If not empty, will be sent via -f to sendmail or as 'MAIL FROM' in smtp mode.
-     * @type string
-     */
-    public $Sender = '';
-
-    /**
-     * The Return-Path of the message.
-     * If empty, it will be set to either From or Sender.
-     * @type string
-     * @deprecated Email senders should never set a return-path header;
-     * it's the receiver's job (RFC5321 section 4.4), so this no longer does anything.
-     * @link https://tools.ietf.org/html/rfc5321#section-4.4 RFC5321 reference
-     */
-    public $ReturnPath = '';
-
-    /**
-     * The Subject of the message.
-     * @type string
-     */
-    public $Subject = '';
-
-    /**
-     * An HTML or plain text message body.
-     * If HTML then call isHTML(true).
-     * @type string
-     */
-    public $Body = '';
-
-    /**
-     * The plain-text message body.
-     * This body can be read by mail clients that do not have HTML email
-     * capability such as mutt & Eudora.
-     * Clients that can read HTML will view the normal Body.
-     * @type string
-     */
-    public $AltBody = '';
-
-    /**
-     * An iCal message part body.
-     * Only supported in simple alt or alt_inline message types
-     * To generate iCal events, use the bundled extras/EasyPeasyICS.php class or iCalcreator
-     * @link http://sprain.ch/blog/downloads/php-class-easypeasyics-create-ical-files-with-php/
-     * @link http://kigkonsult.se/iCalcreator/
-     * @type string
-     */
-    public $Ical = '';
-
-    /**
-     * The complete compiled MIME message body.
-     * @access protected
-     * @type string
-     */
-    protected $MIMEBody = '';
-
-    /**
-     * The complete compiled MIME message headers.
-     * @type string
-     * @access protected
-     */
-    protected $MIMEHeader = '';
-
-    /**
-     * Extra headers that createHeader() doesn't fold in.
-     * @type string
-     * @access protected
-     */
-    protected $mailHeader = '';
-
-    /**
-     * Word-wrap the message body to this number of chars.
-     * Set to 0 to not wrap. A useful value here is 78, for RFC2822 section 2.1.1 compliance.
-     * @type integer
-     */
-    public $WordWrap = 0;
-
-    /**
-     * Which method to use to send mail.
-     * Options: "mail", "sendmail", or "smtp".
-     * @type string
-     */
-    public $Mailer = 'mail';
-
-    /**
-     * The path to the sendmail program.
-     * @type string
-     */
-    public $Sendmail = '/usr/sbin/sendmail';
-
-    /**
-     * Whether mail() uses a fully sendmail-compatible MTA.
-     * One which supports sendmail's "-oi -f" options.
-     * @type boolean
-     */
-    public $UseSendmailOptions = true;
-
-    /**
-     * Path to PHPMailer plugins.
-     * Useful if the SMTP class is not in the PHP include path.
-     * @type string
-     * @deprecated Should not be needed now there is an autoloader.
-     */
-    public $PluginDir = '';
-
-    /**
-     * The email address that a reading confirmation should be sent to.
-     * @type string
-     */
-    public $ConfirmReadingTo = '';
-
-    /**
-     * The hostname to use in Message-Id and Received headers
-     * and as default HELO string.
-     * If empty, the value returned
-     * by SERVER_NAME is used or 'localhost.localdomain'.
-     * @type string
-     */
-    public $Hostname = '';
-
-    /**
-     * An ID to be used in the Message-Id header.
-     * If empty, a unique id will be generated.
-     * @type string
-     */
-    public $MessageID = '';
-
-    /**
-     * The message Date to be used in the Date header.
-     * If empty, the current date will be added.
-     * @type string
-     */
-    public $MessageDate = '';
-
-    /**
-     * SMTP hosts.
-     * Either a single hostname or multiple semicolon-delimited hostnames.
-     * You can also specify a different port
-     * for each host by using this format: [hostname:port]
-     * (e.g. "smtp1.example.com:25;smtp2.example.com").
-     * You can also specify encryption type, for example:
-     * (e.g. "tls://smtp1.example.com:587;ssl://smtp2.example.com:465").
-     * Hosts will be tried in order.
-     * @type string
-     */
-    public $Host = 'localhost';
-
-    /**
-     * The default SMTP server port.
-     * @type integer
-     * @TODO Why is this needed when the SMTP class takes care of it?
-     */
-    public $Port = 25;
-
-    /**
-     * The SMTP HELO of the message.
-     * Default is $Hostname.
-     * @type string
-     * @see PHPMailer::$Hostname
-     */
-    public $Helo = '';
-
-    /**
-     * The secure connection prefix.
-     * Options: "", "ssl" or "tls"
-     * @type string
-     */
-    public $SMTPSecure = '';
-
-    /**
-     * Whether to use SMTP authentication.
-     * Uses the Username and Password properties.
-     * @type boolean
-     * @see PHPMailer::$Username
-     * @see PHPMailer::$Password
-     */
-    public $SMTPAuth = false;
-
-    /**
-     * SMTP username.
-     * @type string
-     */
-    public $Username = '';
-
-    /**
-     * SMTP password.
-     * @type string
-     */
-    public $Password = '';
-
-    /**
-     * SMTP auth type.
-     * Options are LOGIN (default), PLAIN, NTLM, CRAM-MD5
-     * @type string
-     */
-    public $AuthType = '';
-
-    /**
-     * SMTP realm.
-     * Used for NTLM auth
-     * @type string
-     */
-    public $Realm = '';
-
-    /**
-     * SMTP workstation.
-     * Used for NTLM auth
-     * @type string
-     */
-    public $Workstation = '';
-
-    /**
-     * The SMTP server timeout in seconds.
-     * Default of 5 minutes (300sec) is from RFC2821 section 4.5.3.2
-     * @type integer
-     */
-    public $Timeout = 300;
-
-    /**
-     * SMTP class debug output mode.
-     * Debug output level.
-     * Options:
-     * * `0` No output
-     * * `1` Commands
-     * * `2` Data and commands
-     * * `3` As 2 plus connection status
-     * * `4` Low-level data output
-     * @type integer
-     * @see SMTP::$do_debug
-     */
-    public $SMTPDebug = 0;
-
-    /**
-     * How to handle debug output.
-     * Options:
-     * * `echo` Output plain-text as-is, appropriate for CLI
-     * * `html` Output escaped, line breaks converted to `
`, appropriate for browser output
-     * * `error_log` Output to error log as configured in php.ini
-     *
-     * Alternatively, you can provide a callable expecting two params: a message string and the debug level:
-     * 
-     * $mail->Debugoutput = function($str, $level) {echo "debug level $level; message: $str";};
-     * 
-     * @type string|callable
-     * @see SMTP::$Debugoutput
-     */
-    public $Debugoutput = 'echo';
-
-    /**
-     * Whether to keep SMTP connection open after each message.
-     * If this is set to true then to close the connection
-     * requires an explicit call to smtpClose().
-     * @type boolean
-     */
-    public $SMTPKeepAlive = false;
-
-    /**
-     * Whether to split multiple to addresses into multiple messages
-     * or send them all in one message.
-     * @type boolean
-     */
-    public $SingleTo = false;
-
-    /**
-     * Storage for addresses when SingleTo is enabled.
-     * @type array
-     * @TODO This should really not be public
-     */
-    public $SingleToArray = array();
-
-    /**
-     * Whether to generate VERP addresses on send.
-     * Only applicable when sending via SMTP.
-     * @link http://en.wikipedia.org/wiki/Variable_envelope_return_path
-     * @link http://www.postfix.org/VERP_README.html Postfix VERP info
-     * @type boolean
-     */
-    public $do_verp = false;
-
-    /**
-     * Whether to allow sending messages with an empty body.
-     * @type boolean
-     */
-    public $AllowEmpty = false;
-
-    /**
-     * The default line ending.
-     * @note The default remains "\n". We force CRLF where we know
-     *        it must be used via self::CRLF.
-     * @type string
-     */
-    public $LE = "\n";
-
-    /**
-     * DKIM selector.
-     * @type string
-     */
-    public $DKIM_selector = '';
-
-    /**
-     * DKIM Identity.
-     * Usually the email address used as the source of the email
-     * @type string
-     */
-    public $DKIM_identity = '';
-
-    /**
-     * DKIM passphrase.
-     * Used if your key is encrypted.
-     * @type string
-     */
-    public $DKIM_passphrase = '';
-
-    /**
-     * DKIM signing domain name.
-     * @example 'example.com'
-     * @type string
-     */
-    public $DKIM_domain = '';
-
-    /**
-     * DKIM private key file path.
-     * @type string
-     */
-    public $DKIM_private = '';
-
-    /**
-     * Callback Action function name.
-     *
-     * The function that handles the result of the send email action.
-     * It is called out by send() for each email sent.
-     *
-     * Value can be any php callable: http://www.php.net/is_callable
-     *
-     * Parameters:
-     *   boolean $result        result of the send action
-     *   string  $to            email address of the recipient
-     *   string  $cc            cc email addresses
-     *   string  $bcc           bcc email addresses
-     *   string  $subject       the subject
-     *   string  $body          the email body
-     *   string  $from          email address of sender
-     * @type string
-     */
-    public $action_function = '';
-
-    /**
-     * What to put in the X-Mailer header.
-     * Options: An empty string for PHPMailer default, whitespace for none, or a string to use
-     * @type string
-     */
-    public $XMailer = '';
-
-    /**
-     * An instance of the SMTP sender class.
-     * @type SMTP
-     * @access protected
-     */
-    protected $smtp = null;
-
-    /**
-     * The array of 'to' addresses.
-     * @type array
-     * @access protected
-     */
-    protected $to = array();
-
-    /**
-     * The array of 'cc' addresses.
-     * @type array
-     * @access protected
-     */
-    protected $cc = array();
-
-    /**
-     * The array of 'bcc' addresses.
-     * @type array
-     * @access protected
-     */
-    protected $bcc = array();
-
-    /**
-     * The array of reply-to names and addresses.
-     * @type array
-     * @access protected
-     */
-    protected $ReplyTo = array();
-
-    /**
-     * An array of all kinds of addresses.
-     * Includes all of $to, $cc, $bcc
-     * @type array
-     * @access protected
-     */
-    protected $all_recipients = array();
-
-    /**
-     * The array of attachments.
-     * @type array
-     * @access protected
-     */
-    protected $attachment = array();
-
-    /**
-     * The array of custom headers.
-     * @type array
-     * @access protected
-     */
-    protected $CustomHeader = array();
-
-    /**
-     * The most recent Message-ID (including angular brackets).
-     * @type string
-     * @access protected
-     */
-    protected $lastMessageID = '';
-
-    /**
-     * The message's MIME type.
-     * @type string
-     * @access protected
-     */
-    protected $message_type = '';
-
-    /**
-     * The array of MIME boundary strings.
-     * @type array
-     * @access protected
-     */
-    protected $boundary = array();
-
-    /**
-     * The array of available languages.
-     * @type array
-     * @access protected
-     */
-    protected $language = array();
-
-    /**
-     * The number of errors encountered.
-     * @type integer
-     * @access protected
-     */
-    protected $error_count = 0;
-
-    /**
-     * The S/MIME certificate file path.
-     * @type string
-     * @access protected
-     */
-    protected $sign_cert_file = '';
-
-    /**
-     * The S/MIME key file path.
-     * @type string
-     * @access protected
-     */
-    protected $sign_key_file = '';
-
-    /**
-     * The optional S/MIME extra certificates ("CA Chain") file path.
-     * @type string
-     * @access protected
-     */
-    protected $sign_extracerts_file = '';
-
-    /**
-     * The S/MIME password for the key.
-     * Used only if the key is encrypted.
-     * @type string
-     * @access protected
-     */
-    protected $sign_key_pass = '';
-
-    /**
-     * Whether to throw exceptions for errors.
-     * @type boolean
-     * @access protected
-     */
-    protected $exceptions = false;
-
-    /**
-     * Error severity: message only, continue processing.
-     */
-    const STOP_MESSAGE = 0;
-
-    /**
-     * Error severity: message, likely ok to continue processing.
-     */
-    const STOP_CONTINUE = 1;
-
-    /**
-     * Error severity: message, plus full stop, critical error reached.
-     */
-    const STOP_CRITICAL = 2;
-
-    /**
-     * SMTP RFC standard line ending.
-     */
-    const CRLF = "\r\n";
-
-    /**
-     * Constructor.
-     * @param boolean $exceptions Should we throw external exceptions?
-     */
-    public function __construct($exceptions = false)
-    {
-        $this->exceptions = (boolean)$exceptions;
-    }
-
-    /**
-     * Destructor.
-     */
-    public function __destruct()
-    {
-        //Close any open SMTP connection nicely
-        if ($this->Mailer == 'smtp') {
-            $this->smtpClose();
-        }
-    }
-
-    /**
-     * Call mail() in a safe_mode-aware fashion.
-     * Also, unless sendmail_path points to sendmail (or something that
-     * claims to be sendmail), don't pass params (not a perfect fix,
-     * but it will do)
-     * @param string $to To
-     * @param string $subject Subject
-     * @param string $body Message Body
-     * @param string $header Additional Header(s)
-     * @param string $params Params
-     * @access private
-     * @return boolean
-     */
-    private function mailPassthru($to, $subject, $body, $header, $params)
-    {
-        //Check overloading of mail function to avoid double-encoding
-        if (ini_get('mbstring.func_overload') & 1) {
-            $subject = $this->secureHeader($subject);
-        } else {
-            $subject = $this->encodeHeader($this->secureHeader($subject));
-        }
-        if (ini_get('safe_mode') || !($this->UseSendmailOptions)) {
-            $result = @mail($to, $subject, $body, $header);
-        } else {
-            $result = @mail($to, $subject, $body, $header, $params);
-        }
-        return $result;
-    }
-
-    /**
-     * Output debugging info via user-defined method.
-     * Only generates output if SMTP debug output is enabled (@see SMTP::$do_debug).
-     * @see PHPMailer::$Debugoutput
-     * @see PHPMailer::$SMTPDebug
-     * @param string $str
-     */
-    protected function edebug($str)
-    {
-        if ($this->SMTPDebug <= 0) {
-            return;
-        }
-        //Avoid clash with built-in function names
-        if (!in_array($this->Debugoutput, array('error_log', 'html', 'echo')) and is_callable($this->Debugoutput)) {
-            call_user_func($this->Debugoutput, $str, $this->SMTPDebug);
-            return;
-        }
-        switch ($this->Debugoutput) {
-            case 'error_log':
-                //Don't output, just log
-                error_log($str);
-                break;
-            case 'html':
-                //Cleans up output a bit for a better looking, HTML-safe output
-                echo htmlentities(
-                    preg_replace('/[\r\n]+/', '', $str),
-                    ENT_QUOTES,
-                    'UTF-8'
-                )
-                . "
\n";
-                break;
-            case 'echo':
-            default:
-                //Normalize line breaks
-                $str = preg_replace('/(\r\n|\r|\n)/ms', "\n", $str);
-                echo gmdate('Y-m-d H:i:s') . "\t" . str_replace(
-                    "\n",
-                    "\n                   \t                  ",
-                    trim($str)
-                ) . "\n";
-        }
-    }
-
-    /**
-     * Sets message type to HTML or plain.
-     * @param boolean $isHtml True for HTML mode.
-     * @return void
-     */
-    public function isHTML($isHtml = true)
-    {
-        if ($isHtml) {
-            $this->ContentType = 'text/html';
-        } else {
-            $this->ContentType = 'text/plain';
-        }
-    }
-
-    /**
-     * Send messages using SMTP.
-     * @return void
-     */
-    public function isSMTP()
-    {
-        $this->Mailer = 'smtp';
-    }
-
-    /**
-     * Send messages using PHP's mail() function.
-     * @return void
-     */
-    public function isMail()
-    {
-        $this->Mailer = 'mail';
-    }
-
-    /**
-     * Send messages using $Sendmail.
-     * @return void
-     */
-    public function isSendmail()
-    {
-        $ini_sendmail_path = ini_get('sendmail_path');
-
-        if (!stristr($ini_sendmail_path, 'sendmail')) {
-            $this->Sendmail = '/usr/sbin/sendmail';
-        } else {
-            $this->Sendmail = $ini_sendmail_path;
-        }
-        $this->Mailer = 'sendmail';
-    }
-
-    /**
-     * Send messages using qmail.
-     * @return void
-     */
-    public function isQmail()
-    {
-        $ini_sendmail_path = ini_get('sendmail_path');
-
-        if (!stristr($ini_sendmail_path, 'qmail')) {
-            $this->Sendmail = '/var/qmail/bin/qmail-inject';
-        } else {
-            $this->Sendmail = $ini_sendmail_path;
-        }
-        $this->Mailer = 'qmail';
-    }
-
-    /**
-     * Add a "To" address.
-     * @param string $address
-     * @param string $name
-     * @return boolean true on success, false if address already used
-     */
-    public function addAddress($address, $name = '')
-    {
-        return $this->addAnAddress('to', $address, $name);
-    }
-
-    /**
-     * Add a "CC" address.
-     * @note: This function works with the SMTP mailer on win32, not with the "mail" mailer.
-     * @param string $address
-     * @param string $name
-     * @return boolean true on success, false if address already used
-     */
-    public function addCC($address, $name = '')
-    {
-        return $this->addAnAddress('cc', $address, $name);
-    }
-
-    /**
-     * Add a "BCC" address.
-     * @note: This function works with the SMTP mailer on win32, not with the "mail" mailer.
-     * @param string $address
-     * @param string $name
-     * @return boolean true on success, false if address already used
-     */
-    public function addBCC($address, $name = '')
-    {
-        return $this->addAnAddress('bcc', $address, $name);
-    }
-
-    /**
-     * Add a "Reply-to" address.
-     * @param string $address
-     * @param string $name
-     * @return boolean
-     */
-    public function addReplyTo($address, $name = '')
-    {
-        return $this->addAnAddress('Reply-To', $address, $name);
-    }
-
-    /**
-     * Add an address to one of the recipient arrays.
-     * Addresses that have been added already return false, but do not throw exceptions
-     * @param string $kind One of 'to', 'cc', 'bcc', 'ReplyTo'
-     * @param string $address The email address to send to
-     * @param string $name
-     * @throws phpmailerException
-     * @return boolean true on success, false if address already used or invalid in some way
-     * @access protected
-     */
-    protected function addAnAddress($kind, $address, $name = '')
-    {
-        if (!preg_match('/^(to|cc|bcc|Reply-To)$/', $kind)) {
-            $this->setError($this->lang('Invalid recipient array') . ': ' . $kind);
-            $this->edebug($this->lang('Invalid recipient array') . ': ' . $kind);
-            if ($this->exceptions) {
-                throw new phpmailerException('Invalid recipient array: ' . $kind);
-            }
-            return false;
-        }
-        $address = trim($address);
-        $name = trim(preg_replace('/[\r\n]+/', '', $name)); //Strip breaks and trim
-        if (!$this->validateAddress($address)) {
-            $this->setError($this->lang('invalid_address') . ': ' . $address);
-            $this->edebug($this->lang('invalid_address') . ': ' . $address);
-            if ($this->exceptions) {
-                throw new phpmailerException($this->lang('invalid_address') . ': ' . $address);
-            }
-            return false;
-        }
-        if ($kind != 'Reply-To') {
-            if (!isset($this->all_recipients[strtolower($address)])) {
-                array_push($this->$kind, array($address, $name));
-                $this->all_recipients[strtolower($address)] = true;
-                return true;
-            }
-        } else {
-            if (!array_key_exists(strtolower($address), $this->ReplyTo)) {
-                $this->ReplyTo[strtolower($address)] = array($address, $name);
-                return true;
-            }
-        }
-        return false;
-    }
-
-    /**
-     * Set the From and FromName properties.
-     * @param string $address
-     * @param string $name
-     * @param boolean $auto Whether to also set the Sender address, defaults to true
-     * @throws phpmailerException
-     * @return boolean
-     */
-    public function setFrom($address, $name = '', $auto = true)
-    {
-        $address = trim($address);
-        $name = trim(preg_replace('/[\r\n]+/', '', $name)); //Strip breaks and trim
-        if (!$this->validateAddress($address)) {
-            $this->setError($this->lang('invalid_address') . ': ' . $address);
-            $this->edebug($this->lang('invalid_address') . ': ' . $address);
-            if ($this->exceptions) {
-                throw new phpmailerException($this->lang('invalid_address') . ': ' . $address);
-            }
-            return false;
-        }
-        $this->From = $address;
-        $this->FromName = $name;
-        if ($auto) {
-            if (empty($this->Sender)) {
-                $this->Sender = $address;
-            }
-        }
-        return true;
-    }
-
-    /**
-     * Return the Message-ID header of the last email.
-     * Technically this is the value from the last time the headers were created,
-     * but it's also the message ID of the last sent message except in
-     * pathological cases.
-     * @return string
-     */
-    public function getLastMessageID()
-    {
-        return $this->lastMessageID;
-    }
-
-    /**
-     * Check that a string looks like an email address.
-     * @param string $address The email address to check
-     * @param string $patternselect A selector for the validation pattern to use :
-     * * `auto` Pick strictest one automatically;
-     * * `pcre8` Use the squiloople.com pattern, requires PCRE > 8.0, PHP >= 5.3.2, 5.2.14;
-     * * `pcre` Use old PCRE implementation;
-     * * `php` Use PHP built-in FILTER_VALIDATE_EMAIL; same as pcre8 but does not allow 'dotless' domains;
-     * * `html5` Use the pattern given by the HTML5 spec for 'email' type form input elements.
-     * * `noregex` Don't use a regex: super fast, really dumb.
-     * @return boolean
-     * @static
-     * @access public
-     */
-    public static function validateAddress($address, $patternselect = 'auto')
-    {
-        if (!$patternselect or $patternselect == 'auto') {
-            //Check this constant first so it works when extension_loaded() is disabled by safe mode
-            //Constant was added in PHP 5.2.4
-            if (defined('PCRE_VERSION')) {
-                //This pattern can get stuck in a recursive loop in PCRE <= 8.0.2
-                if (version_compare(PCRE_VERSION, '8.0.3') >= 0) {
-                    $patternselect = 'pcre8';
-                } else {
-                    $patternselect = 'pcre';
-                }
-            } elseif (function_exists('extension_loaded') and extension_loaded('pcre')) {
-                //Fall back to older PCRE
-                $patternselect = 'pcre';
-            } else {
-                //Filter_var appeared in PHP 5.2.0 and does not require the PCRE extension
-                if (version_compare(PHP_VERSION, '5.2.0') >= 0) {
-                    $patternselect = 'php';
-                } else {
-                    $patternselect = 'noregex';
-                }
-            }
-        }
-        switch ($patternselect) {
-            case 'pcre8':
-                /**
-                 * Uses the same RFC5322 regex on which FILTER_VALIDATE_EMAIL is based, but allows dotless domains.
-                 * @link http://squiloople.com/2009/12/20/email-address-validation/
-                 * @copyright 2009-2010 Michael Rushton
-                 * Feel free to use and redistribute this code. But please keep this copyright notice.
-                 */
-                return (boolean)preg_match(
-                    '/^(?!(?>(?1)"?(?>\\\[ -~]|[^"])"?(?1)){255,})(?!(?>(?1)"?(?>\\\[ -~]|[^"])"?(?1)){65,}@)' .
-                    '((?>(?>(?>((?>(?>(?>\x0D\x0A)?[\t ])+|(?>[\t ]*\x0D\x0A)?[\t ]+)?)(\((?>(?2)' .
-                    '(?>[\x01-\x08\x0B\x0C\x0E-\'*-\[\]-\x7F]|\\\[\x00-\x7F]|(?3)))*(?2)\)))+(?2))|(?2))?)' .
-                    '([!#-\'*+\/-9=?^-~-]+|"(?>(?2)(?>[\x01-\x08\x0B\x0C\x0E-!#-\[\]-\x7F]|\\\[\x00-\x7F]))*' .
-                    '(?2)")(?>(?1)\.(?1)(?4))*(?1)@(?!(?1)[a-z0-9-]{64,})(?1)(?>([a-z0-9](?>[a-z0-9-]*[a-z0-9])?)' .
-                    '(?>(?1)\.(?!(?1)[a-z0-9-]{64,})(?1)(?5)){0,126}|\[(?:(?>IPv6:(?>([a-f0-9]{1,4})(?>:(?6)){7}' .
-                    '|(?!(?:.*[a-f0-9][:\]]){8,})((?6)(?>:(?6)){0,6})?::(?7)?))|(?>(?>IPv6:(?>(?6)(?>:(?6)){5}:' .
-                    '|(?!(?:.*[a-f0-9]:){6,})(?8)?::(?>((?6)(?>:(?6)){0,4}):)?))?(25[0-5]|2[0-4][0-9]|1[0-9]{2}' .
-                    '|[1-9]?[0-9])(?>\.(?9)){3}))\])(?1)$/isD',
-                    $address
-                );
-            case 'pcre':
-                //An older regex that doesn't need a recent PCRE
-                return (boolean)preg_match(
-                    '/^(?!(?>"?(?>\\\[ -~]|[^"])"?){255,})(?!(?>"?(?>\\\[ -~]|[^"])"?){65,}@)(?>' .
-                    '[!#-\'*+\/-9=?^-~-]+|"(?>(?>[\x01-\x08\x0B\x0C\x0E-!#-\[\]-\x7F]|\\\[\x00-\xFF]))*")' .
-                    '(?>\.(?>[!#-\'*+\/-9=?^-~-]+|"(?>(?>[\x01-\x08\x0B\x0C\x0E-!#-\[\]-\x7F]|\\\[\x00-\xFF]))*"))*' .
-                    '@(?>(?![a-z0-9-]{64,})(?>[a-z0-9](?>[a-z0-9-]*[a-z0-9])?)(?>\.(?![a-z0-9-]{64,})' .
-                    '(?>[a-z0-9](?>[a-z0-9-]*[a-z0-9])?)){0,126}|\[(?:(?>IPv6:(?>(?>[a-f0-9]{1,4})(?>:' .
-                    '[a-f0-9]{1,4}){7}|(?!(?:.*[a-f0-9][:\]]){8,})(?>[a-f0-9]{1,4}(?>:[a-f0-9]{1,4}){0,6})?' .
-                    '::(?>[a-f0-9]{1,4}(?>:[a-f0-9]{1,4}){0,6})?))|(?>(?>IPv6:(?>[a-f0-9]{1,4}(?>:' .
-                    '[a-f0-9]{1,4}){5}:|(?!(?:.*[a-f0-9]:){6,})(?>[a-f0-9]{1,4}(?>:[a-f0-9]{1,4}){0,4})?' .
-                    '::(?>(?:[a-f0-9]{1,4}(?>:[a-f0-9]{1,4}){0,4}):)?))?(?>25[0-5]|2[0-4][0-9]|1[0-9]{2}' .
-                    '|[1-9]?[0-9])(?>\.(?>25[0-5]|2[0-4][0-9]|1[0-9]{2}|[1-9]?[0-9])){3}))\])$/isD',
-                    $address
-                );
-            case 'html5':
-                /**
-                 * This is the pattern used in the HTML5 spec for validation of 'email' type form input elements.
-                 * @link http://www.whatwg.org/specs/web-apps/current-work/#e-mail-state-(type=email)
-                 */
-                return (boolean)preg_match(
-                    '/^[a-zA-Z0-9.!#$%&\'*+\/=?^_`{|}~-]+@[a-zA-Z0-9](?:[a-zA-Z0-9-]{0,61}' .
-                    '[a-zA-Z0-9])?(?:\.[a-zA-Z0-9](?:[a-zA-Z0-9-]{0,61}[a-zA-Z0-9])?)*$/sD',
-                    $address
-                );
-            case 'noregex':
-                //No PCRE! Do something _very_ approximate!
-                //Check the address is 3 chars or longer and contains an @ that's not the first or last char
-                return (strlen($address) >= 3
-                    and strpos($address, '@') >= 1
-                    and strpos($address, '@') != strlen($address) - 1);
-            case 'php':
-            default:
-                return (boolean)filter_var($address, FILTER_VALIDATE_EMAIL);
-        }
-    }
-
-    /**
-     * Create a message and send it.
-     * Uses the sending method specified by $Mailer.
-     * @throws phpmailerException
-     * @return boolean false on error - See the ErrorInfo property for details of the error.
-     */
-    public function send()
-    {
-        try {
-            if (!$this->preSend()) {
-                return false;
-            }
-            return $this->postSend();
-        } catch (phpmailerException $exc) {
-            $this->mailHeader = '';
-            $this->setError($exc->getMessage());
-            if ($this->exceptions) {
-                throw $exc;
-            }
-            return false;
-        }
-    }
-
-    /**
-     * Prepare a message for sending.
-     * @throws phpmailerException
-     * @return boolean
-     */
-    public function preSend()
-    {
-        try {
-            $this->mailHeader = '';
-            if ((count($this->to) + count($this->cc) + count($this->bcc)) < 1) {
-                throw new phpmailerException($this->lang('provide_address'), self::STOP_CRITICAL);
-            }
-
-            // Set whether the message is multipart/alternative
-            if (!empty($this->AltBody)) {
-                $this->ContentType = 'multipart/alternative';
-            }
-
-            $this->error_count = 0; // reset errors
-            $this->setMessageType();
-            // Refuse to send an empty message unless we are specifically allowing it
-            if (!$this->AllowEmpty and empty($this->Body)) {
-                throw new phpmailerException($this->lang('empty_message'), self::STOP_CRITICAL);
-            }
-
-            $this->MIMEHeader = $this->createHeader();
-            $this->MIMEBody = $this->createBody();
-
-            // To capture the complete message when using mail(), create
-            // an extra header list which createHeader() doesn't fold in
-            if ($this->Mailer == 'mail') {
-                if (count($this->to) > 0) {
-                    $this->mailHeader .= $this->addrAppend('To', $this->to);
-                } else {
-                    $this->mailHeader .= $this->headerLine('To', 'undisclosed-recipients:;');
-                }
-                $this->mailHeader .= $this->headerLine(
-                    'Subject',
-                    $this->encodeHeader($this->secureHeader(trim($this->Subject)))
-                );
-            }
-
-            // Sign with DKIM if enabled
-            if (!empty($this->DKIM_domain)
-                && !empty($this->DKIM_private)
-                && !empty($this->DKIM_selector)
-                && file_exists($this->DKIM_private)) {
-                $header_dkim = $this->DKIM_Add(
-                    $this->MIMEHeader . $this->mailHeader,
-                    $this->encodeHeader($this->secureHeader($this->Subject)),
-                    $this->MIMEBody
-                );
-                $this->MIMEHeader = rtrim($this->MIMEHeader, "\r\n ") . self::CRLF .
-                    str_replace("\r\n", "\n", $header_dkim) . self::CRLF;
-            }
-            return true;
-        } catch (phpmailerException $exc) {
-            $this->setError($exc->getMessage());
-            if ($this->exceptions) {
-                throw $exc;
-            }
-            return false;
-        }
-    }
-
-    /**
-     * Actually send a message.
-     * Send the email via the selected mechanism
-     * @throws phpmailerException
-     * @return boolean
-     */
-    public function postSend()
-    {
-        try {
-            // Choose the mailer and send through it
-            switch ($this->Mailer) {
-                case 'sendmail':
-                case 'qmail':
-                    return $this->sendmailSend($this->MIMEHeader, $this->MIMEBody);
-                case 'smtp':
-                    return $this->smtpSend($this->MIMEHeader, $this->MIMEBody);
-                case 'mail':
-                    return $this->mailSend($this->MIMEHeader, $this->MIMEBody);
-                default:
-                    $sendMethod = $this->Mailer.'Send';
-                    if (method_exists($this, $sendMethod)) {
-                        return $this->$sendMethod($this->MIMEHeader, $this->MIMEBody);
-                    }
-
-                    return $this->mailSend($this->MIMEHeader, $this->MIMEBody);
-            }
-        } catch (phpmailerException $exc) {
-            $this->setError($exc->getMessage());
-            $this->edebug($exc->getMessage());
-            if ($this->exceptions) {
-                throw $exc;
-            }
-        }
-        return false;
-    }
-
-    /**
-     * Send mail using the $Sendmail program.
-     * @param string $header The message headers
-     * @param string $body The message body
-     * @see PHPMailer::$Sendmail
-     * @throws phpmailerException
-     * @access protected
-     * @return boolean
-     */
-    protected function sendmailSend($header, $body)
-    {
-        if ($this->Sender != '') {
-            if ($this->Mailer == 'qmail') {
-                $sendmail = sprintf('%s -f%s', escapeshellcmd($this->Sendmail), escapeshellarg($this->Sender));
-            } else {
-                $sendmail = sprintf('%s -oi -f%s -t', escapeshellcmd($this->Sendmail), escapeshellarg($this->Sender));
-            }
-        } else {
-            if ($this->Mailer == 'qmail') {
-                $sendmail = sprintf('%s', escapeshellcmd($this->Sendmail));
-            } else {
-                $sendmail = sprintf('%s -oi -t', escapeshellcmd($this->Sendmail));
-            }
-        }
-        if ($this->SingleTo) {
-            foreach ($this->SingleToArray as $toAddr) {
-                if (!@$mail = popen($sendmail, 'w')) {
-                    throw new phpmailerException($this->lang('execute') . $this->Sendmail, self::STOP_CRITICAL);
-                }
-                fputs($mail, 'To: ' . $toAddr . "\n");
-                fputs($mail, $header);
-                fputs($mail, $body);
-                $result = pclose($mail);
-                $this->doCallback(
-                    ($result == 0),
-                    array($toAddr),
-                    $this->cc,
-                    $this->bcc,
-                    $this->Subject,
-                    $body,
-                    $this->From
-                );
-                if ($result != 0) {
-                    throw new phpmailerException($this->lang('execute') . $this->Sendmail, self::STOP_CRITICAL);
-                }
-            }
-        } else {
-            if (!@$mail = popen($sendmail, 'w')) {
-                throw new phpmailerException($this->lang('execute') . $this->Sendmail, self::STOP_CRITICAL);
-            }
-            fputs($mail, $header);
-            fputs($mail, $body);
-            $result = pclose($mail);
-            $this->doCallback(($result == 0), $this->to, $this->cc, $this->bcc, $this->Subject, $body, $this->From);
-            if ($result != 0) {
-                throw new phpmailerException($this->lang('execute') . $this->Sendmail, self::STOP_CRITICAL);
-            }
-        }
-        return true;
-    }
-
-    /**
-     * Send mail using the PHP mail() function.
-     * @param string $header The message headers
-     * @param string $body The message body
-     * @link http://www.php.net/manual/en/book.mail.php
-     * @throws phpmailerException
-     * @access protected
-     * @return boolean
-     */
-    protected function mailSend($header, $body)
-    {
-        $toArr = array();
-        foreach ($this->to as $toaddr) {
-            $toArr[] = $this->addrFormat($toaddr);
-        }
-        $to = implode(', ', $toArr);
-
-        if (empty($this->Sender)) {
-            $params = ' ';
-        } else {
-            $params = sprintf('-f%s', $this->Sender);
-        }
-        if ($this->Sender != '' and !ini_get('safe_mode')) {
-            $old_from = ini_get('sendmail_from');
-            ini_set('sendmail_from', $this->Sender);
-        }
-        $result = false;
-        if ($this->SingleTo && count($toArr) > 1) {
-            foreach ($toArr as $toAddr) {
-                $result = $this->mailPassthru($toAddr, $this->Subject, $body, $header, $params);
-                $this->doCallback($result, array($toAddr), $this->cc, $this->bcc, $this->Subject, $body, $this->From);
-            }
-        } else {
-            $result = $this->mailPassthru($to, $this->Subject, $body, $header, $params);
-            $this->doCallback($result, $this->to, $this->cc, $this->bcc, $this->Subject, $body, $this->From);
-        }
-        if (isset($old_from)) {
-            ini_set('sendmail_from', $old_from);
-        }
-        if (!$result) {
-            throw new phpmailerException($this->lang('instantiate'), self::STOP_CRITICAL);
-        }
-        return true;
-    }
-
-    /**
-     * Get an instance to use for SMTP operations.
-     * Override this function to load your own SMTP implementation
-     * @return SMTP
-     */
-    public function getSMTPInstance()
-    {
-        if (!is_object($this->smtp)) {
-            $this->smtp = new SMTP;
-        }
-        return $this->smtp;
-    }
-
-    /**
-     * Send mail via SMTP.
-     * Returns false if there is a bad MAIL FROM, RCPT, or DATA input.
-     * Uses the PHPMailerSMTP class by default.
-     * @see PHPMailer::getSMTPInstance() to use a different class.
-     * @param string $header The message headers
-     * @param string $body The message body
-     * @throws phpmailerException
-     * @uses SMTP
-     * @access protected
-     * @return boolean
-     */
-    protected function smtpSend($header, $body)
-    {
-        $bad_rcpt = array();
-        if (!$this->smtpConnect()) {
-            throw new phpmailerException($this->lang('smtp_connect_failed'), self::STOP_CRITICAL);
-        }
-        if ('' == $this->Sender) {
-            $smtp_from = $this->From;
-        } else {
-            $smtp_from = $this->Sender;
-        }
-        if (!$this->smtp->mail($smtp_from)) {
-            $this->setError($this->lang('from_failed') . $smtp_from . ' : ' . implode(',', $this->smtp->getError()));
-            throw new phpmailerException($this->ErrorInfo, self::STOP_CRITICAL);
-        }
-
-        // Attempt to send to all recipients
-        foreach (array($this->to, $this->cc, $this->bcc) as $togroup) {
-            foreach ($togroup as $to) {
-                if (!$this->smtp->recipient($to[0])) {
-                    $error = $this->smtp->getError();
-                    $bad_rcpt[] = array('to' => $to[0], 'error' => $error['detail']);
-                    $isSent = false;
-                } else {
-                    $isSent = true;
-                }
-                $this->doCallback($isSent, array($to[0]), array(), array(), $this->Subject, $body, $this->From);
-            }
-        }
-
-        // Only send the DATA command if we have viable recipients
-        if ((count($this->all_recipients) > count($bad_rcpt)) and !$this->smtp->data($header . $body)) {
-            throw new phpmailerException($this->lang('data_not_accepted'), self::STOP_CRITICAL);
-        }
-        if ($this->SMTPKeepAlive) {
-            $this->smtp->reset();
-        } else {
-            $this->smtp->quit();
-            $this->smtp->close();
-        }
-        //Create error message for any bad addresses
-        if (count($bad_rcpt) > 0) {
-            $errstr = '';
-            foreach ($bad_rcpt as $bad) {
-                $errstr .= $bad['to'] . ': ' . $bad['error'];
-            }
-            throw new phpmailerException(
-                $this->lang('recipients_failed') . $errstr,
-                self::STOP_CONTINUE
-            );
-        }
-        return true;
-    }
-
-    /**
-     * Initiate a connection to an SMTP server.
-     * Returns false if the operation failed.
-     * @param array $options An array of options compatible with stream_context_create()
-     * @uses SMTP
-     * @access public
-     * @throws phpmailerException
-     * @return boolean
-     */
-    public function smtpConnect($options = array())
-    {
-        if (is_null($this->smtp)) {
-            $this->smtp = $this->getSMTPInstance();
-        }
-
-        // Already connected?
-        if ($this->smtp->connected()) {
-            return true;
-        }
-
-        $this->smtp->setTimeout($this->Timeout);
-        $this->smtp->setDebugLevel($this->SMTPDebug);
-        $this->smtp->setDebugOutput($this->Debugoutput);
-        $this->smtp->setVerp($this->do_verp);
-        $hosts = explode(';', $this->Host);
-        $lastexception = null;
-
-        foreach ($hosts as $hostentry) {
-            $hostinfo = array();
-            if (!preg_match('/^((ssl|tls):\/\/)*([a-zA-Z0-9\.-]*):?([0-9]*)$/', trim($hostentry), $hostinfo)) {
-                // Not a valid host entry
-                continue;
-            }
-            // $hostinfo[2]: optional ssl or tls prefix
-            // $hostinfo[3]: the hostname
-            // $hostinfo[4]: optional port number
-            // The host string prefix can temporarily override the current setting for SMTPSecure
-            // If it's not specified, the default value is used
-            $prefix = '';
-            $secure = $this->SMTPSecure;
-            $tls = ($this->SMTPSecure == 'tls');
-            if ('ssl' == $hostinfo[2] or ('' == $hostinfo[2] and 'ssl' == $this->SMTPSecure)) {
-                $prefix = 'ssl://';
-                $tls = false; // Can't have SSL and TLS at the same time
-                $secure = 'ssl';
-            } elseif ($hostinfo[2] == 'tls') {
-                $tls = true;
-                // tls doesn't use a prefix
-                $secure = 'tls';
-            }
-            //Do we need the OpenSSL extension?
-            if ('tls' === $secure or 'ssl' === $secure) {
-                //Check for an OpenSSL constant rather than using extension_loaded, which is sometimes disabled
-                if (!defined('OPENSSL_ALGO_SHA1')) {
-                    throw new phpmailerException($this->lang('extension_missing').'openssl', self::STOP_CRITICAL);
-                }
-            }
-            $host = $hostinfo[3];
-            $port = $this->Port;
-            $tport = (integer)$hostinfo[4];
-            if ($tport > 0 and $tport < 65536) {
-                $port = $tport;
-            }
-            if ($this->smtp->connect($prefix . $host, $port, $this->Timeout, $options)) {
-                try {
-                    if ($this->Helo) {
-                        $hello = $this->Helo;
-                    } else {
-                        $hello = $this->serverHostname();
-                    }
-                    $this->smtp->hello($hello);
-
-                    if ($tls) {
-                        if (!$this->smtp->startTLS()) {
-                            throw new phpmailerException($this->lang('connect_host'));
-                        }
-                        // We must resend HELO after tls negotiation
-                        $this->smtp->hello($hello);
-                    }
-                    if ($this->SMTPAuth) {
-                        if (!$this->smtp->authenticate(
-                            $this->Username,
-                            $this->Password,
-                            $this->AuthType,
-                            $this->Realm,
-                            $this->Workstation
-                        )
-                        ) {
-                            throw new phpmailerException($this->lang('authenticate'));
-                        }
-                    }
-                    return true;
-                } catch (phpmailerException $exc) {
-                    $lastexception = $exc;
-                    $this->edebug($exc->getMessage());
-                    // We must have connected, but then failed TLS or Auth, so close connection nicely
-                    $this->smtp->quit();
-                }
-            }
-        }
-        // If we get here, all connection attempts have failed, so close connection hard
-        $this->smtp->close();
-        // As we've caught all exceptions, just report whatever the last one was
-        if ($this->exceptions and !is_null($lastexception)) {
-            throw $lastexception;
-        }
-        return false;
-    }
-
-    /**
-     * Close the active SMTP session if one exists.
-     * @return void
-     */
-    public function smtpClose()
-    {
-        if ($this->smtp !== null) {
-            if ($this->smtp->connected()) {
-                $this->smtp->quit();
-                $this->smtp->close();
-            }
-        }
-    }
-
-    /**
-     * Set the language for error messages.
-     * Returns false if it cannot load the language file.
-     * The default language is English.
-     * @param string $langcode ISO 639-1 2-character language code (e.g. French is "fr")
-     * @param string $lang_path Path to the language file directory, with trailing separator (slash)
-     * @return boolean
-     * @access public
-     */
-    public function setLanguage($langcode = 'en', $lang_path = '')
-    {
-        // Define full set of translatable strings in English
-        $PHPMAILER_LANG = array(
-            'authenticate' => 'SMTP Error: Could not authenticate.',
-            'connect_host' => 'SMTP Error: Could not connect to SMTP host.',
-            'data_not_accepted' => 'SMTP Error: data not accepted.',
-            'empty_message' => 'Message body empty',
-            'encoding' => 'Unknown encoding: ',
-            'execute' => 'Could not execute: ',
-            'file_access' => 'Could not access file: ',
-            'file_open' => 'File Error: Could not open file: ',
-            'from_failed' => 'The following From address failed: ',
-            'instantiate' => 'Could not instantiate mail function.',
-            'invalid_address' => 'Invalid address',
-            'mailer_not_supported' => ' mailer is not supported.',
-            'provide_address' => 'You must provide at least one recipient email address.',
-            'recipients_failed' => 'SMTP Error: The following recipients failed: ',
-            'signing' => 'Signing Error: ',
-            'smtp_connect_failed' => 'SMTP connect() failed.',
-            'smtp_error' => 'SMTP server error: ',
-            'variable_set' => 'Cannot set or reset variable: ',
-            'extension_missing' => 'Extension missing: '
-        );
-        if (empty($lang_path)) {
-            // Calculate an absolute path so it can work if CWD is not here
-            $lang_path = dirname(__FILE__). DIRECTORY_SEPARATOR . 'language'. DIRECTORY_SEPARATOR;
-        }
-        $foundlang = true;
-        $lang_file = $lang_path . 'phpmailer.lang-' . $langcode . '.php';
-        // There is no English translation file
-        if ($langcode != 'en') {
-            // Make sure language file path is readable
-            if (!is_readable($lang_file)) {
-                $foundlang = false;
-            } else {
-                // Overwrite language-specific strings.
-                // This way we'll never have missing translation keys.
-                $foundlang = include $lang_file;
-            }
-        }
-        $this->language = $PHPMAILER_LANG;
-        return (boolean)$foundlang; // Returns false if language not found
-    }
-
-    /**
-     * Get the array of strings for the current language.
-     * @return array
-     */
-    public function getTranslations()
-    {
-        return $this->language;
-    }
-
-    /**
-     * Create recipient headers.
-     * @access public
-     * @param string $type
-     * @param array $addr An array of recipient,
-     * where each recipient is a 2-element indexed array with element 0 containing an address
-     * and element 1 containing a name, like:
-     * array(array('joe@example.com', 'Joe User'), array('zoe@example.com', 'Zoe User'))
-     * @return string
-     */
-    public function addrAppend($type, $addr)
-    {
-        $addresses = array();
-        foreach ($addr as $address) {
-            $addresses[] = $this->addrFormat($address);
-        }
-        return $type . ': ' . implode(', ', $addresses) . $this->LE;
-    }
-
-    /**
-     * Format an address for use in a message header.
-     * @access public
-     * @param array $addr A 2-element indexed array, element 0 containing an address, element 1 containing a name
-     *      like array('joe@example.com', 'Joe User')
-     * @return string
-     */
-    public function addrFormat($addr)
-    {
-        if (empty($addr[1])) { // No name provided
-            return $this->secureHeader($addr[0]);
-        } else {
-            return $this->encodeHeader($this->secureHeader($addr[1]), 'phrase') . ' <' . $this->secureHeader(
-                $addr[0]
-            ) . '>';
-        }
-    }
-
-    /**
-     * Word-wrap message.
-     * For use with mailers that do not automatically perform wrapping
-     * and for quoted-printable encoded messages.
-     * Original written by philippe.
-     * @param string $message The message to wrap
-     * @param integer $length The line length to wrap to
-     * @param boolean $qp_mode Whether to run in Quoted-Printable mode
-     * @access public
-     * @return string
-     */
-    public function wrapText($message, $length, $qp_mode = false)
-    {
-        if ($qp_mode) {
-            $soft_break = sprintf(' =%s', $this->LE);
-        } else {
-            $soft_break = $this->LE;
-        }
-        // If utf-8 encoding is used, we will need to make sure we don't
-        // split multibyte characters when we wrap
-        $is_utf8 = (strtolower($this->CharSet) == 'utf-8');
-        $lelen = strlen($this->LE);
-        $crlflen = strlen(self::CRLF);
-
-        $message = $this->fixEOL($message);
-        //Remove a trailing line break
-        if (substr($message, -$lelen) == $this->LE) {
-            $message = substr($message, 0, -$lelen);
-        }
-
-        //Split message into lines
-        $lines = explode($this->LE, $message);
-        //Message will be rebuilt in here
-        $message = '';
-        foreach ($lines as $line) {
-            $words = explode(' ', $line);
-            $buf = '';
-            $firstword = true;
-            foreach ($words as $word) {
-                if ($qp_mode and (strlen($word) > $length)) {
-                    $space_left = $length - strlen($buf) - $crlflen;
-                    if (!$firstword) {
-                        if ($space_left > 20) {
-                            $len = $space_left;
-                            if ($is_utf8) {
-                                $len = $this->utf8CharBoundary($word, $len);
-                            } elseif (substr($word, $len - 1, 1) == '=') {
-                                $len--;
-                            } elseif (substr($word, $len - 2, 1) == '=') {
-                                $len -= 2;
-                            }
-                            $part = substr($word, 0, $len);
-                            $word = substr($word, $len);
-                            $buf .= ' ' . $part;
-                            $message .= $buf . sprintf('=%s', self::CRLF);
-                        } else {
-                            $message .= $buf . $soft_break;
-                        }
-                        $buf = '';
-                    }
-                    while (strlen($word) > 0) {
-                        if ($length <= 0) {
-                            break;
-                        }
-                        $len = $length;
-                        if ($is_utf8) {
-                            $len = $this->utf8CharBoundary($word, $len);
-                        } elseif (substr($word, $len - 1, 1) == '=') {
-                            $len--;
-                        } elseif (substr($word, $len - 2, 1) == '=') {
-                            $len -= 2;
-                        }
-                        $part = substr($word, 0, $len);
-                        $word = substr($word, $len);
-
-                        if (strlen($word) > 0) {
-                            $message .= $part . sprintf('=%s', self::CRLF);
-                        } else {
-                            $buf = $part;
-                        }
-                    }
-                } else {
-                    $buf_o = $buf;
-                    if (!$firstword) {
-                        $buf .= ' ';
-                    }
-                    $buf .= $word;
-
-                    if (strlen($buf) > $length and $buf_o != '') {
-                        $message .= $buf_o . $soft_break;
-                        $buf = $word;
-                    }
-                }
-                $firstword = false;
-            }
-            $message .= $buf . self::CRLF;
-        }
-
-        return $message;
-    }
-
-    /**
-     * Find the last character boundary prior to $maxLength in a utf-8
-     * quoted-printable encoded string.
-     * Original written by Colin Brown.
-     * @access public
-     * @param string $encodedText utf-8 QP text
-     * @param integer $maxLength Find the last character boundary prior to this length
-     * @return integer
-     */
-    public function utf8CharBoundary($encodedText, $maxLength)
-    {
-        $foundSplitPos = false;
-        $lookBack = 3;
-        while (!$foundSplitPos) {
-            $lastChunk = substr($encodedText, $maxLength - $lookBack, $lookBack);
-            $encodedCharPos = strpos($lastChunk, '=');
-            if (false !== $encodedCharPos) {
-                // Found start of encoded character byte within $lookBack block.
-                // Check the encoded byte value (the 2 chars after the '=')
-                $hex = substr($encodedText, $maxLength - $lookBack + $encodedCharPos + 1, 2);
-                $dec = hexdec($hex);
-                if ($dec < 128) {
-                    // Single byte character.
-                    // If the encoded char was found at pos 0, it will fit
-                    // otherwise reduce maxLength to start of the encoded char
-                    if ($encodedCharPos > 0) {
-                        $maxLength = $maxLength - ($lookBack - $encodedCharPos);
-                    }
-                    $foundSplitPos = true;
-                } elseif ($dec >= 192) {
-                    // First byte of a multi byte character
-                    // Reduce maxLength to split at start of character
-                    $maxLength = $maxLength - ($lookBack - $encodedCharPos);
-                    $foundSplitPos = true;
-                } elseif ($dec < 192) {
-                    // Middle byte of a multi byte character, look further back
-                    $lookBack += 3;
-                }
-            } else {
-                // No encoded character found
-                $foundSplitPos = true;
-            }
-        }
-        return $maxLength;
-    }
-
-    /**
-     * Apply word wrapping to the message body.
-     * Wraps the message body to the number of chars set in the WordWrap property.
-     * You should only do this to plain-text bodies as wrapping HTML tags may break them.
-     * This is called automatically by createBody(), so you don't need to call it yourself.
-     * @access public
-     * @return void
-     */
-    public function setWordWrap()
-    {
-        if ($this->WordWrap < 1) {
-            return;
-        }
-
-        switch ($this->message_type) {
-            case 'alt':
-            case 'alt_inline':
-            case 'alt_attach':
-            case 'alt_inline_attach':
-                $this->AltBody = $this->wrapText($this->AltBody, $this->WordWrap);
-                break;
-            default:
-                $this->Body = $this->wrapText($this->Body, $this->WordWrap);
-                break;
-        }
-    }
-
-    /**
-     * Assemble message headers.
-     * @access public
-     * @return string The assembled headers
-     */
-    public function createHeader()
-    {
-        $result = '';
-
-        // Set the boundaries
-        $uniq_id = md5(uniqid(time()));
-        $this->boundary[1] = 'b1_' . $uniq_id;
-        $this->boundary[2] = 'b2_' . $uniq_id;
-        $this->boundary[3] = 'b3_' . $uniq_id;
-
-        if ($this->MessageDate == '') {
-            $this->MessageDate = self::rfcDate();
-        }
-        $result .= $this->headerLine('Date', $this->MessageDate);
-
-
-        // To be created automatically by mail()
-        if ($this->SingleTo) {
-            if ($this->Mailer != 'mail') {
-                foreach ($this->to as $toaddr) {
-                    $this->SingleToArray[] = $this->addrFormat($toaddr);
-                }
-            }
-        } else {
-            if (count($this->to) > 0) {
-                if ($this->Mailer != 'mail') {
-                    $result .= $this->addrAppend('To', $this->to);
-                }
-            } elseif (count($this->cc) == 0) {
-                $result .= $this->headerLine('To', 'undisclosed-recipients:;');
-            }
-        }
-
-        $result .= $this->addrAppend('From', array(array(trim($this->From), $this->FromName)));
-
-        // sendmail and mail() extract Cc from the header before sending
-        if (count($this->cc) > 0) {
-            $result .= $this->addrAppend('Cc', $this->cc);
-        }
-
-        // sendmail and mail() extract Bcc from the header before sending
-        if ((
-                $this->Mailer == 'sendmail' or $this->Mailer == 'qmail' or $this->Mailer == 'mail'
-            )
-            and count($this->bcc) > 0
-        ) {
-            $result .= $this->addrAppend('Bcc', $this->bcc);
-        }
-
-        if (count($this->ReplyTo) > 0) {
-            $result .= $this->addrAppend('Reply-To', $this->ReplyTo);
-        }
-
-        // mail() sets the subject itself
-        if ($this->Mailer != 'mail') {
-            $result .= $this->headerLine('Subject', $this->encodeHeader($this->secureHeader($this->Subject)));
-        }
-
-        if ($this->MessageID != '') {
-            $this->lastMessageID = $this->MessageID;
-        } else {
-            $this->lastMessageID = sprintf('<%s@%s>', $uniq_id, $this->ServerHostname());
-        }
-        $result .= $this->headerLine('Message-ID', $this->lastMessageID);
-        $result .= $this->headerLine('X-Priority', $this->Priority);
-        if ($this->XMailer == '') {
-            $result .= $this->headerLine(
-                'X-Mailer',
-                'PHPMailer ' . $this->Version . ' (https://github.com/PHPMailer/PHPMailer/)'
-            );
-        } else {
-            $myXmailer = trim($this->XMailer);
-            if ($myXmailer) {
-                $result .= $this->headerLine('X-Mailer', $myXmailer);
-            }
-        }
-
-        if ($this->ConfirmReadingTo != '') {
-            $result .= $this->headerLine('Disposition-Notification-To', '<' . trim($this->ConfirmReadingTo) . '>');
-        }
-
-        // Add custom headers
-        foreach ($this->CustomHeader as $header) {
-            $result .= $this->headerLine(
-                trim($header[0]),
-                $this->encodeHeader(trim($header[1]))
-            );
-        }
-        if (!$this->sign_key_file) {
-            $result .= $this->headerLine('MIME-Version', '1.0');
-            $result .= $this->getMailMIME();
-        }
-
-        return $result;
-    }
-
-    /**
-     * Get the message MIME type headers.
-     * @access public
-     * @return string
-     */
-    public function getMailMIME()
-    {
-        $result = '';
-        $ismultipart = true;
-        switch ($this->message_type) {
-            case 'inline':
-                $result .= $this->headerLine('Content-Type', 'multipart/related;');
-                $result .= $this->textLine("\tboundary=\"" . $this->boundary[1] . '"');
-                break;
-            case 'attach':
-            case 'inline_attach':
-            case 'alt_attach':
-            case 'alt_inline_attach':
-                $result .= $this->headerLine('Content-Type', 'multipart/mixed;');
-                $result .= $this->textLine("\tboundary=\"" . $this->boundary[1] . '"');
-                break;
-            case 'alt':
-            case 'alt_inline':
-                $result .= $this->headerLine('Content-Type', 'multipart/alternative;');
-                $result .= $this->textLine("\tboundary=\"" . $this->boundary[1] . '"');
-                break;
-            default:
-                // Catches case 'plain': and case '':
-                $result .= $this->textLine('Content-Type: ' . $this->ContentType . '; charset=' . $this->CharSet);
-                $ismultipart = false;
-                break;
-        }
-        // RFC1341 part 5 says 7bit is assumed if not specified
-        if ($this->Encoding != '7bit') {
-            // RFC 2045 section 6.4 says multipart MIME parts may only use 7bit, 8bit or binary CTE
-            if ($ismultipart) {
-                if ($this->Encoding == '8bit') {
-                    $result .= $this->headerLine('Content-Transfer-Encoding', '8bit');
-                }
-                // The only remaining alternatives are quoted-printable and base64, which are both 7bit compatible
-            } else {
-                $result .= $this->headerLine('Content-Transfer-Encoding', $this->Encoding);
-            }
-        }
-
-        if ($this->Mailer != 'mail') {
-            $result .= $this->LE;
-        }
-
-        return $result;
-    }
-
-    /**
-     * Returns the whole MIME message.
-     * Includes complete headers and body.
-     * Only valid post preSend().
-     * @see PHPMailer::preSend()
-     * @access public
-     * @return string
-     */
-    public function getSentMIMEMessage()
-    {
-        return $this->MIMEHeader . $this->mailHeader . self::CRLF . $this->MIMEBody;
-    }
-
-    /**
-     * Assemble the message body.
-     * Returns an empty string on failure.
-     * @access public
-     * @throws phpmailerException
-     * @return string The assembled message body
-     */
-    public function createBody()
-    {
-        $body = '';
-
-        if ($this->sign_key_file) {
-            $body .= $this->getMailMIME() . $this->LE;
-        }
-
-        $this->setWordWrap();
-
-        $bodyEncoding = $this->Encoding;
-        $bodyCharSet = $this->CharSet;
-        if ($bodyEncoding == '8bit' and !$this->has8bitChars($this->Body)) {
-            $bodyEncoding = '7bit';
-            $bodyCharSet = 'us-ascii';
-        }
-        $altBodyEncoding = $this->Encoding;
-        $altBodyCharSet = $this->CharSet;
-        if ($altBodyEncoding == '8bit' and !$this->has8bitChars($this->AltBody)) {
-            $altBodyEncoding = '7bit';
-            $altBodyCharSet = 'us-ascii';
-        }
-        //Use this as a preamble in all multipart message types
-        $mimepre = "This is a multi-part message in MIME format." . $this->LE . $this->LE;
-        switch ($this->message_type) {
-            case 'inline':
-                $body .= $mimepre;
-                $body .= $this->getBoundary($this->boundary[1], $bodyCharSet, '', $bodyEncoding);
-                $body .= $this->encodeString($this->Body, $bodyEncoding);
-                $body .= $this->LE . $this->LE;
-                $body .= $this->attachAll('inline', $this->boundary[1]);
-                break;
-            case 'attach':
-                $body .= $mimepre;
-                $body .= $this->getBoundary($this->boundary[1], $bodyCharSet, '', $bodyEncoding);
-                $body .= $this->encodeString($this->Body, $bodyEncoding);
-                $body .= $this->LE . $this->LE;
-                $body .= $this->attachAll('attachment', $this->boundary[1]);
-                break;
-            case 'inline_attach':
-                $body .= $mimepre;
-                $body .= $this->textLine('--' . $this->boundary[1]);
-                $body .= $this->headerLine('Content-Type', 'multipart/related;');
-                $body .= $this->textLine("\tboundary=\"" . $this->boundary[2] . '"');
-                $body .= $this->LE;
-                $body .= $this->getBoundary($this->boundary[2], $bodyCharSet, '', $bodyEncoding);
-                $body .= $this->encodeString($this->Body, $bodyEncoding);
-                $body .= $this->LE . $this->LE;
-                $body .= $this->attachAll('inline', $this->boundary[2]);
-                $body .= $this->LE;
-                $body .= $this->attachAll('attachment', $this->boundary[1]);
-                break;
-            case 'alt':
-                $body .= $mimepre;
-                $body .= $this->getBoundary($this->boundary[1], $altBodyCharSet, 'text/plain', $altBodyEncoding);
-                $body .= $this->encodeString($this->AltBody, $altBodyEncoding);
-                $body .= $this->LE . $this->LE;
-                $body .= $this->getBoundary($this->boundary[1], $bodyCharSet, 'text/html', $bodyEncoding);
-                $body .= $this->encodeString($this->Body, $bodyEncoding);
-                $body .= $this->LE . $this->LE;
-                if (!empty($this->Ical)) {
-                    $body .= $this->getBoundary($this->boundary[1], '', 'text/calendar; method=REQUEST', '');
-                    $body .= $this->encodeString($this->Ical, $this->Encoding);
-                    $body .= $this->LE . $this->LE;
-                }
-                $body .= $this->endBoundary($this->boundary[1]);
-                break;
-            case 'alt_inline':
-                $body .= $mimepre;
-                $body .= $this->getBoundary($this->boundary[1], $altBodyCharSet, 'text/plain', $altBodyEncoding);
-                $body .= $this->encodeString($this->AltBody, $altBodyEncoding);
-                $body .= $this->LE . $this->LE;
-                $body .= $this->textLine('--' . $this->boundary[1]);
-                $body .= $this->headerLine('Content-Type', 'multipart/related;');
-                $body .= $this->textLine("\tboundary=\"" . $this->boundary[2] . '"');
-                $body .= $this->LE;
-                $body .= $this->getBoundary($this->boundary[2], $bodyCharSet, 'text/html', $bodyEncoding);
-                $body .= $this->encodeString($this->Body, $bodyEncoding);
-                $body .= $this->LE . $this->LE;
-                $body .= $this->attachAll('inline', $this->boundary[2]);
-                $body .= $this->LE;
-                $body .= $this->endBoundary($this->boundary[1]);
-                break;
-            case 'alt_attach':
-                $body .= $mimepre;
-                $body .= $this->textLine('--' . $this->boundary[1]);
-                $body .= $this->headerLine('Content-Type', 'multipart/alternative;');
-                $body .= $this->textLine("\tboundary=\"" . $this->boundary[2] . '"');
-                $body .= $this->LE;
-                $body .= $this->getBoundary($this->boundary[2], $altBodyCharSet, 'text/plain', $altBodyEncoding);
-                $body .= $this->encodeString($this->AltBody, $altBodyEncoding);
-                $body .= $this->LE . $this->LE;
-                $body .= $this->getBoundary($this->boundary[2], $bodyCharSet, 'text/html', $bodyEncoding);
-                $body .= $this->encodeString($this->Body, $bodyEncoding);
-                $body .= $this->LE . $this->LE;
-                $body .= $this->endBoundary($this->boundary[2]);
-                $body .= $this->LE;
-                $body .= $this->attachAll('attachment', $this->boundary[1]);
-                break;
-            case 'alt_inline_attach':
-                $body .= $mimepre;
-                $body .= $this->textLine('--' . $this->boundary[1]);
-                $body .= $this->headerLine('Content-Type', 'multipart/alternative;');
-                $body .= $this->textLine("\tboundary=\"" . $this->boundary[2] . '"');
-                $body .= $this->LE;
-                $body .= $this->getBoundary($this->boundary[2], $altBodyCharSet, 'text/plain', $altBodyEncoding);
-                $body .= $this->encodeString($this->AltBody, $altBodyEncoding);
-                $body .= $this->LE . $this->LE;
-                $body .= $this->textLine('--' . $this->boundary[2]);
-                $body .= $this->headerLine('Content-Type', 'multipart/related;');
-                $body .= $this->textLine("\tboundary=\"" . $this->boundary[3] . '"');
-                $body .= $this->LE;
-                $body .= $this->getBoundary($this->boundary[3], $bodyCharSet, 'text/html', $bodyEncoding);
-                $body .= $this->encodeString($this->Body, $bodyEncoding);
-                $body .= $this->LE . $this->LE;
-                $body .= $this->attachAll('inline', $this->boundary[3]);
-                $body .= $this->LE;
-                $body .= $this->endBoundary($this->boundary[2]);
-                $body .= $this->LE;
-                $body .= $this->attachAll('attachment', $this->boundary[1]);
-                break;
-            default:
-                // catch case 'plain' and case ''
-                $body .= $this->encodeString($this->Body, $bodyEncoding);
-                break;
-        }
-
-        if ($this->isError()) {
-            $body = '';
-        } elseif ($this->sign_key_file) {
-            try {
-                if (!defined('PKCS7_TEXT')) {
-                    throw new phpmailerException($this->lang('extension_missing') . 'openssl');
-                }
-                // @TODO would be nice to use php://temp streams here, but need to wrap for PHP < 5.1
-                $file = tempnam(sys_get_temp_dir(), 'mail');
-                if (false === file_put_contents($file, $body)) {
-                    throw new phpmailerException($this->lang('signing') . ' Could not write temp file');
-                }
-                $signed = tempnam(sys_get_temp_dir(), 'signed');
-                //Workaround for PHP bug https://bugs.php.net/bug.php?id=69197
-                if (empty($this->sign_extracerts_file)) {
-                    $sign = @openssl_pkcs7_sign(
-                        $file,
-                        $signed,
-                        'file://' . realpath($this->sign_cert_file),
-                        array('file://' . realpath($this->sign_key_file), $this->sign_key_pass),
-                        null
-                    );
-                } else {
-                    $sign = @openssl_pkcs7_sign(
-                        $file,
-                        $signed,
-                        'file://' . realpath($this->sign_cert_file),
-                        array('file://' . realpath($this->sign_key_file), $this->sign_key_pass),
-                        null,
-                        PKCS7_DETACHED,
-                        $this->sign_extracerts_file
-                    );
-                }
-                if ($sign) {
-                    @unlink($file);
-                    $body = file_get_contents($signed);
-                    @unlink($signed);
-                    //The message returned by openssl contains both headers and body, so need to split them up
-                    $parts = explode("\n\n", $body, 2);
-                    $this->MIMEHeader .= $parts[0] . $this->LE . $this->LE;
-                    $body = $parts[1];
-                } else {
-                    @unlink($file);
-                    @unlink($signed);
-                    throw new phpmailerException($this->lang('signing') . openssl_error_string());
-                }
-            } catch (phpmailerException $exc) {
-                $body = '';
-                if ($this->exceptions) {
-                    throw $exc;
-                }
-            }
-        }
-        return $body;
-    }
-
-    /**
-     * Return the start of a message boundary.
-     * @access protected
-     * @param string $boundary
-     * @param string $charSet
-     * @param string $contentType
-     * @param string $encoding
-     * @return string
-     */
-    protected function getBoundary($boundary, $charSet, $contentType, $encoding)
-    {
-        $result = '';
-        if ($charSet == '') {
-            $charSet = $this->CharSet;
-        }
-        if ($contentType == '') {
-            $contentType = $this->ContentType;
-        }
-        if ($encoding == '') {
-            $encoding = $this->Encoding;
-        }
-        $result .= $this->textLine('--' . $boundary);
-        $result .= sprintf('Content-Type: %s; charset=%s', $contentType, $charSet);
-        $result .= $this->LE;
-        // RFC1341 part 5 says 7bit is assumed if not specified
-        if ($encoding != '7bit') {
-            $result .= $this->headerLine('Content-Transfer-Encoding', $encoding);
-        }
-        $result .= $this->LE;
-
-        return $result;
-    }
-
-    /**
-     * Return the end of a message boundary.
-     * @access protected
-     * @param string $boundary
-     * @return string
-     */
-    protected function endBoundary($boundary)
-    {
-        return $this->LE . '--' . $boundary . '--' . $this->LE;
-    }
-
-    /**
-     * Set the message type.
-     * PHPMailer only supports some preset message types,
-     * not arbitrary MIME structures.
-     * @access protected
-     * @return void
-     */
-    protected function setMessageType()
-    {
-        $type = array();
-        if ($this->alternativeExists()) {
-            $type[] = 'alt';
-        }
-        if ($this->inlineImageExists()) {
-            $type[] = 'inline';
-        }
-        if ($this->attachmentExists()) {
-            $type[] = 'attach';
-        }
-        $this->message_type = implode('_', $type);
-        if ($this->message_type == '') {
-            $this->message_type = 'plain';
-        }
-    }
-
-    /**
-     * Format a header line.
-     * @access public
-     * @param string $name
-     * @param string $value
-     * @return string
-     */
-    public function headerLine($name, $value)
-    {
-        return $name . ': ' . $value . $this->LE;
-    }
-
-    /**
-     * Return a formatted mail line.
-     * @access public
-     * @param string $value
-     * @return string
-     */
-    public function textLine($value)
-    {
-        return $value . $this->LE;
-    }
-
-    /**
-     * Add an attachment from a path on the filesystem.
-     * Returns false if the file could not be found or read.
-     * @param string $path Path to the attachment.
-     * @param string $name Overrides the attachment name.
-     * @param string $encoding File encoding (see $Encoding).
-     * @param string $type File extension (MIME) type.
-     * @param string $disposition Disposition to use
-     * @throws phpmailerException
-     * @return boolean
-     */
-    public function addAttachment($path, $name = '', $encoding = 'base64', $type = '', $disposition = 'attachment')
-    {
-        try {
-            if (!@is_file($path)) {
-                throw new phpmailerException($this->lang('file_access') . $path, self::STOP_CONTINUE);
-            }
-
-            // If a MIME type is not specified, try to work it out from the file name
-            if ($type == '') {
-                $type = self::filenameToType($path);
-            }
-
-            $filename = basename($path);
-            if ($name == '') {
-                $name = $filename;
-            }
-
-            $this->attachment[] = array(
-                0 => $path,
-                1 => $filename,
-                2 => $name,
-                3 => $encoding,
-                4 => $type,
-                5 => false, // isStringAttachment
-                6 => $disposition,
-                7 => 0
-            );
-
-        } catch (phpmailerException $exc) {
-            $this->setError($exc->getMessage());
-            $this->edebug($exc->getMessage());
-            if ($this->exceptions) {
-                throw $exc;
-            }
-            return false;
-        }
-        return true;
-    }
-
-    /**
-     * Return the array of attachments.
-     * @return array
-     */
-    public function getAttachments()
-    {
-        return $this->attachment;
-    }
-
-    /**
-     * Attach all file, string, and binary attachments to the message.
-     * Returns an empty string on failure.
-     * @access protected
-     * @param string $disposition_type
-     * @param string $boundary
-     * @return string
-     */
-    protected function attachAll($disposition_type, $boundary)
-    {
-        // Return text of body
-        $mime = array();
-        $cidUniq = array();
-        $incl = array();
-
-        // Add all attachments
-        foreach ($this->attachment as $attachment) {
-            // Check if it is a valid disposition_filter
-            if ($attachment[6] == $disposition_type) {
-                // Check for string attachment
-                $string = '';
-                $path = '';
-                $bString = $attachment[5];
-                if ($bString) {
-                    $string = $attachment[0];
-                } else {
-                    $path = $attachment[0];
-                }
-
-                $inclhash = md5(serialize($attachment));
-                if (in_array($inclhash, $incl)) {
-                    continue;
-                }
-                $incl[] = $inclhash;
-                $name = $attachment[2];
-                $encoding = $attachment[3];
-                $type = $attachment[4];
-                $disposition = $attachment[6];
-                $cid = $attachment[7];
-                if ($disposition == 'inline' && isset($cidUniq[$cid])) {
-                    continue;
-                }
-                $cidUniq[$cid] = true;
-
-                $mime[] = sprintf('--%s%s', $boundary, $this->LE);
-                $mime[] = sprintf(
-                    'Content-Type: %s; name="%s"%s',
-                    $type,
-                    $this->encodeHeader($this->secureHeader($name)),
-                    $this->LE
-                );
-                // RFC1341 part 5 says 7bit is assumed if not specified
-                if ($encoding != '7bit') {
-                    $mime[] = sprintf('Content-Transfer-Encoding: %s%s', $encoding, $this->LE);
-                }
-
-                if ($disposition == 'inline') {
-                    $mime[] = sprintf('Content-ID: <%s>%s', $cid, $this->LE);
-                }
-
-                // If a filename contains any of these chars, it should be quoted,
-                // but not otherwise: RFC2183 & RFC2045 5.1
-                // Fixes a warning in IETF's msglint MIME checker
-                // Allow for bypassing the Content-Disposition header totally
-                if (!(empty($disposition))) {
-                    $encoded_name = $this->encodeHeader($this->secureHeader($name));
-                    if (preg_match('/[ \(\)<>@,;:\\"\/\[\]\?=]/', $encoded_name)) {
-                        $mime[] = sprintf(
-                            'Content-Disposition: %s; filename="%s"%s',
-                            $disposition,
-                            $encoded_name,
-                            $this->LE . $this->LE
-                        );
-                    } else {
-                        $mime[] = sprintf(
-                            'Content-Disposition: %s; filename=%s%s',
-                            $disposition,
-                            $encoded_name,
-                            $this->LE . $this->LE
-                        );
-                    }
-                } else {
-                    $mime[] = $this->LE;
-                }
-
-                // Encode as string attachment
-                if ($bString) {
-                    $mime[] = $this->encodeString($string, $encoding);
-                    if ($this->isError()) {
-                        return '';
-                    }
-                    $mime[] = $this->LE . $this->LE;
-                } else {
-                    $mime[] = $this->encodeFile($path, $encoding);
-                    if ($this->isError()) {
-                        return '';
-                    }
-                    $mime[] = $this->LE . $this->LE;
-                }
-            }
-        }
-
-        $mime[] = sprintf('--%s--%s', $boundary, $this->LE);
-
-        return implode('', $mime);
-    }
-
-    /**
-     * Encode a file attachment in requested format.
-     * Returns an empty string on failure.
-     * @param string $path The full path to the file
-     * @param string $encoding The encoding to use; one of 'base64', '7bit', '8bit', 'binary', 'quoted-printable'
-     * @throws phpmailerException
-     * @see EncodeFile(encodeFile
-     * @access protected
-     * @return string
-     */
-    protected function encodeFile($path, $encoding = 'base64')
-    {
-        try {
-            if (!is_readable($path)) {
-                throw new phpmailerException($this->lang('file_open') . $path, self::STOP_CONTINUE);
-            }
-            $magic_quotes = get_magic_quotes_runtime();
-            if ($magic_quotes) {
-                if (version_compare(PHP_VERSION, '5.3.0', '<')) {
-                    set_magic_quotes_runtime(false);
-                } else {
-                    //Doesn't exist in PHP 5.4, but we don't need to check because
-                    //get_magic_quotes_runtime always returns false in 5.4+
-                    //so it will never get here
-                    ini_set('magic_quotes_runtime', false);
-                }
-            }
-            $file_buffer = file_get_contents($path);
-            $file_buffer = $this->encodeString($file_buffer, $encoding);
-            if ($magic_quotes) {
-                if (version_compare(PHP_VERSION, '5.3.0', '<')) {
-                    set_magic_quotes_runtime($magic_quotes);
-                } else {
-                    ini_set('magic_quotes_runtime', $magic_quotes);
-                }
-            }
-            return $file_buffer;
-        } catch (Exception $exc) {
-            $this->setError($exc->getMessage());
-            return '';
-        }
-    }
-
-    /**
-     * Encode a string in requested format.
-     * Returns an empty string on failure.
-     * @param string $str The text to encode
-     * @param string $encoding The encoding to use; one of 'base64', '7bit', '8bit', 'binary', 'quoted-printable'
-     * @access public
-     * @return string
-     */
-    public function encodeString($str, $encoding = 'base64')
-    {
-        $encoded = '';
-        switch (strtolower($encoding)) {
-            case 'base64':
-                $encoded = chunk_split(base64_encode($str), 76, $this->LE);
-                break;
-            case '7bit':
-            case '8bit':
-                $encoded = $this->fixEOL($str);
-                // Make sure it ends with a line break
-                if (substr($encoded, -(strlen($this->LE))) != $this->LE) {
-                    $encoded .= $this->LE;
-                }
-                break;
-            case 'binary':
-                $encoded = $str;
-                break;
-            case 'quoted-printable':
-                $encoded = $this->encodeQP($str);
-                break;
-            default:
-                $this->setError($this->lang('encoding') . $encoding);
-                break;
-        }
-        return $encoded;
-    }
-
-    /**
-     * Encode a header string optimally.
-     * Picks shortest of Q, B, quoted-printable or none.
-     * @access public
-     * @param string $str
-     * @param string $position
-     * @return string
-     */
-    public function encodeHeader($str, $position = 'text')
-    {
-        $matchcount = 0;
-        switch (strtolower($position)) {
-            case 'phrase':
-                if (!preg_match('/[\200-\377]/', $str)) {
-                    // Can't use addslashes as we don't know the value of magic_quotes_sybase
-                    $encoded = addcslashes($str, "\0..\37\177\\\"");
-                    if (($str == $encoded) && !preg_match('/[^A-Za-z0-9!#$%&\'*+\/=?^_`{|}~ -]/', $str)) {
-                        return ($encoded);
-                    } else {
-                        return ("\"$encoded\"");
-                    }
-                }
-                $matchcount = preg_match_all('/[^\040\041\043-\133\135-\176]/', $str, $matches);
-                break;
-            /** @noinspection PhpMissingBreakStatementInspection */
-            case 'comment':
-                $matchcount = preg_match_all('/[()"]/', $str, $matches);
-                // Intentional fall-through
-            case 'text':
-            default:
-                $matchcount += preg_match_all('/[\000-\010\013\014\016-\037\177-\377]/', $str, $matches);
-                break;
-        }
-
-        //There are no chars that need encoding
-        if ($matchcount == 0) {
-            return ($str);
-        }
-
-        $maxlen = 75 - 7 - strlen($this->CharSet);
-        // Try to select the encoding which should produce the shortest output
-        if ($matchcount > strlen($str) / 3) {
-            // More than a third of the content will need encoding, so B encoding will be most efficient
-            $encoding = 'B';
-            if (function_exists('mb_strlen') && $this->hasMultiBytes($str)) {
-                // Use a custom function which correctly encodes and wraps long
-                // multibyte strings without breaking lines within a character
-                $encoded = $this->base64EncodeWrapMB($str, "\n");
-            } else {
-                $encoded = base64_encode($str);
-                $maxlen -= $maxlen % 4;
-                $encoded = trim(chunk_split($encoded, $maxlen, "\n"));
-            }
-        } else {
-            $encoding = 'Q';
-            $encoded = $this->encodeQ($str, $position);
-            $encoded = $this->wrapText($encoded, $maxlen, true);
-            $encoded = str_replace('=' . self::CRLF, "\n", trim($encoded));
-        }
-
-        $encoded = preg_replace('/^(.*)$/m', ' =?' . $this->CharSet . "?$encoding?\\1?=", $encoded);
-        $encoded = trim(str_replace("\n", $this->LE, $encoded));
-
-        return $encoded;
-    }
-
-    /**
-     * Check if a string contains multi-byte characters.
-     * @access public
-     * @param string $str multi-byte text to wrap encode
-     * @return boolean
-     */
-    public function hasMultiBytes($str)
-    {
-        if (function_exists('mb_strlen')) {
-            return (strlen($str) > mb_strlen($str, $this->CharSet));
-        } else { // Assume no multibytes (we can't handle without mbstring functions anyway)
-            return false;
-        }
-    }
-
-    /**
-     * Does a string contain any 8-bit chars (in any charset)?
-     * @param string $text
-     * @return boolean
-     */
-    public function has8bitChars($text)
-    {
-        return (boolean)preg_match('/[\x80-\xFF]/', $text);
-    }
-
-    /**
-     * Encode and wrap long multibyte strings for mail headers
-     * without breaking lines within a character.
-     * Adapted from a function by paravoid
-     * @link http://www.php.net/manual/en/function.mb-encode-mimeheader.php#60283
-     * @access public
-     * @param string $str multi-byte text to wrap encode
-     * @param string $linebreak string to use as linefeed/end-of-line
-     * @return string
-     */
-    public function base64EncodeWrapMB($str, $linebreak = null)
-    {
-        $start = '=?' . $this->CharSet . '?B?';
-        $end = '?=';
-        $encoded = '';
-        if ($linebreak === null) {
-            $linebreak = $this->LE;
-        }
-
-        $mb_length = mb_strlen($str, $this->CharSet);
-        // Each line must have length <= 75, including $start and $end
-        $length = 75 - strlen($start) - strlen($end);
-        // Average multi-byte ratio
-        $ratio = $mb_length / strlen($str);
-        // Base64 has a 4:3 ratio
-        $avgLength = floor($length * $ratio * .75);
-
-        for ($i = 0; $i < $mb_length; $i += $offset) {
-            $lookBack = 0;
-            do {
-                $offset = $avgLength - $lookBack;
-                $chunk = mb_substr($str, $i, $offset, $this->CharSet);
-                $chunk = base64_encode($chunk);
-                $lookBack++;
-            } while (strlen($chunk) > $length);
-            $encoded .= $chunk . $linebreak;
-        }
-
-        // Chomp the last linefeed
-        $encoded = substr($encoded, 0, -strlen($linebreak));
-        return $encoded;
-    }
-
-    /**
-     * Encode a string in quoted-printable format.
-     * According to RFC2045 section 6.7.
-     * @access public
-     * @param string $string The text to encode
-     * @param integer $line_max Number of chars allowed on a line before wrapping
-     * @return string
-     * @link http://www.php.net/manual/en/function.quoted-printable-decode.php#89417 Adapted from this comment
-     */
-    public function encodeQP($string, $line_max = 76)
-    {
-        // Use native function if it's available (>= PHP5.3)
-        if (function_exists('quoted_printable_encode')) {
-            return $this->fixEOL(quoted_printable_encode($string));
-        }
-        // Fall back to a pure PHP implementation
-        $string = str_replace(
-            array('%20', '%0D%0A.', '%0D%0A', '%'),
-            array(' ', "\r\n=2E", "\r\n", '='),
-            rawurlencode($string)
-        );
-        $string = preg_replace('/[^\r\n]{' . ($line_max - 3) . '}[^=\r\n]{2}/', "$0=\r\n", $string);
-        return $this->fixEOL($string);
-    }
-
-    /**
-     * Backward compatibility wrapper for an old QP encoding function that was removed.
-     * @see PHPMailer::encodeQP()
-     * @access public
-     * @param string $string
-     * @param integer $line_max
-     * @param boolean $space_conv
-     * @return string
-     * @deprecated Use encodeQP instead.
-     */
-    public function encodeQPphp(
-        $string,
-        $line_max = 76,
-        /** @noinspection PhpUnusedParameterInspection */ $space_conv = false
-    ) {
-        return $this->encodeQP($string, $line_max);
-    }
-
-    /**
-     * Encode a string using Q encoding.
-     * @link http://tools.ietf.org/html/rfc2047
-     * @param string $str the text to encode
-     * @param string $position Where the text is going to be used, see the RFC for what that means
-     * @access public
-     * @return string
-     */
-    public function encodeQ($str, $position = 'text')
-    {
-        // There should not be any EOL in the string
-        $pattern = '';
-        $encoded = str_replace(array("\r", "\n"), '', $str);
-        switch (strtolower($position)) {
-            case 'phrase':
-                // RFC 2047 section 5.3
-                $pattern = '^A-Za-z0-9!*+\/ -';
-                break;
-            /** @noinspection PhpMissingBreakStatementInspection */
-            case 'comment':
-                // RFC 2047 section 5.2
-                $pattern = '\(\)"';
-                // intentional fall-through
-                // for this reason we build the $pattern without including delimiters and []
-            case 'text':
-            default:
-                // RFC 2047 section 5.1
-                // Replace every high ascii, control, =, ? and _ characters
-                $pattern = '\000-\011\013\014\016-\037\075\077\137\177-\377' . $pattern;
-                break;
-        }
-        $matches = array();
-        if (preg_match_all("/[{$pattern}]/", $encoded, $matches)) {
-            // If the string contains an '=', make sure it's the first thing we replace
-            // so as to avoid double-encoding
-            $eqkey = array_search('=', $matches[0]);
-            if (false !== $eqkey) {
-                unset($matches[0][$eqkey]);
-                array_unshift($matches[0], '=');
-            }
-            foreach (array_unique($matches[0]) as $char) {
-                $encoded = str_replace($char, '=' . sprintf('%02X', ord($char)), $encoded);
-            }
-        }
-        // Replace every spaces to _ (more readable than =20)
-        return str_replace(' ', '_', $encoded);
-    }
-
-
-    /**
-     * Add a string or binary attachment (non-filesystem).
-     * This method can be used to attach ascii or binary data,
-     * such as a BLOB record from a database.
-     * @param string $string String attachment data.
-     * @param string $filename Name of the attachment.
-     * @param string $encoding File encoding (see $Encoding).
-     * @param string $type File extension (MIME) type.
-     * @param string $disposition Disposition to use
-     * @return void
-     */
-    public function addStringAttachment(
-        $string,
-        $filename,
-        $encoding = 'base64',
-        $type = '',
-        $disposition = 'attachment'
-    ) {
-        // If a MIME type is not specified, try to work it out from the file name
-        if ($type == '') {
-            $type = self::filenameToType($filename);
-        }
-        // Append to $attachment array
-        $this->attachment[] = array(
-            0 => $string,
-            1 => $filename,
-            2 => basename($filename),
-            3 => $encoding,
-            4 => $type,
-            5 => true, // isStringAttachment
-            6 => $disposition,
-            7 => 0
-        );
-    }
-
-    /**
-     * Add an embedded (inline) attachment from a file.
-     * This can include images, sounds, and just about any other document type.
-     * These differ from 'regular' attachments in that they are intended to be
-     * displayed inline with the message, not just attached for download.
-     * This is used in HTML messages that embed the images
-     * the HTML refers to using the $cid value.
-     * @param string $path Path to the attachment.
-     * @param string $cid Content ID of the attachment; Use this to reference
-     *        the content when using an embedded image in HTML.
-     * @param string $name Overrides the attachment name.
-     * @param string $encoding File encoding (see $Encoding).
-     * @param string $type File MIME type.
-     * @param string $disposition Disposition to use
-     * @return boolean True on successfully adding an attachment
-     */
-    public function addEmbeddedImage($path, $cid, $name = '', $encoding = 'base64', $type = '', $disposition = 'inline')
-    {
-        if (!@is_file($path)) {
-            $this->setError($this->lang('file_access') . $path);
-            return false;
-        }
-
-        // If a MIME type is not specified, try to work it out from the file name
-        if ($type == '') {
-            $type = self::filenameToType($path);
-        }
-
-        $filename = basename($path);
-        if ($name == '') {
-            $name = $filename;
-        }
-
-        // Append to $attachment array
-        $this->attachment[] = array(
-            0 => $path,
-            1 => $filename,
-            2 => $name,
-            3 => $encoding,
-            4 => $type,
-            5 => false, // isStringAttachment
-            6 => $disposition,
-            7 => $cid
-        );
-        return true;
-    }
-
-    /**
-     * Add an embedded stringified attachment.
-     * This can include images, sounds, and just about any other document type.
-     * Be sure to set the $type to an image type for images:
-     * JPEG images use 'image/jpeg', GIF uses 'image/gif', PNG uses 'image/png'.
-     * @param string $string The attachment binary data.
-     * @param string $cid Content ID of the attachment; Use this to reference
-     *        the content when using an embedded image in HTML.
-     * @param string $name
-     * @param string $encoding File encoding (see $Encoding).
-     * @param string $type MIME type.
-     * @param string $disposition Disposition to use
-     * @return boolean True on successfully adding an attachment
-     */
-    public function addStringEmbeddedImage(
-        $string,
-        $cid,
-        $name = '',
-        $encoding = 'base64',
-        $type = '',
-        $disposition = 'inline'
-    ) {
-        // If a MIME type is not specified, try to work it out from the name
-        if ($type == '') {
-            $type = self::filenameToType($name);
-        }
-
-        // Append to $attachment array
-        $this->attachment[] = array(
-            0 => $string,
-            1 => $name,
-            2 => $name,
-            3 => $encoding,
-            4 => $type,
-            5 => true, // isStringAttachment
-            6 => $disposition,
-            7 => $cid
-        );
-        return true;
-    }
-
-    /**
-     * Check if an inline attachment is present.
-     * @access public
-     * @return boolean
-     */
-    public function inlineImageExists()
-    {
-        foreach ($this->attachment as $attachment) {
-            if ($attachment[6] == 'inline') {
-                return true;
-            }
-        }
-        return false;
-    }
-
-    /**
-     * Check if an attachment (non-inline) is present.
-     * @return boolean
-     */
-    public function attachmentExists()
-    {
-        foreach ($this->attachment as $attachment) {
-            if ($attachment[6] == 'attachment') {
-                return true;
-            }
-        }
-        return false;
-    }
-
-    /**
-     * Check if this message has an alternative body set.
-     * @return boolean
-     */
-    public function alternativeExists()
-    {
-        return !empty($this->AltBody);
-    }
-
-    /**
-     * Clear all To recipients.
-     * @return void
-     */
-    public function clearAddresses()
-    {
-        foreach ($this->to as $to) {
-            unset($this->all_recipients[strtolower($to[0])]);
-        }
-        $this->to = array();
-    }
-
-    /**
-     * Clear all CC recipients.
-     * @return void
-     */
-    public function clearCCs()
-    {
-        foreach ($this->cc as $cc) {
-            unset($this->all_recipients[strtolower($cc[0])]);
-        }
-        $this->cc = array();
-    }
-
-    /**
-     * Clear all BCC recipients.
-     * @return void
-     */
-    public function clearBCCs()
-    {
-        foreach ($this->bcc as $bcc) {
-            unset($this->all_recipients[strtolower($bcc[0])]);
-        }
-        $this->bcc = array();
-    }
-
-    /**
-     * Clear all ReplyTo recipients.
-     * @return void
-     */
-    public function clearReplyTos()
-    {
-        $this->ReplyTo = array();
-    }
-
-    /**
-     * Clear all recipient types.
-     * @return void
-     */
-    public function clearAllRecipients()
-    {
-        $this->to = array();
-        $this->cc = array();
-        $this->bcc = array();
-        $this->all_recipients = array();
-    }
-
-    /**
-     * Clear all filesystem, string, and binary attachments.
-     * @return void
-     */
-    public function clearAttachments()
-    {
-        $this->attachment = array();
-    }
-
-    /**
-     * Clear all custom headers.
-     * @return void
-     */
-    public function clearCustomHeaders()
-    {
-        $this->CustomHeader = array();
-    }
-
-    /**
-     * Add an error message to the error container.
-     * @access protected
-     * @param string $msg
-     * @return void
-     */
-    protected function setError($msg)
-    {
-        $this->error_count++;
-        if ($this->Mailer == 'smtp' and !is_null($this->smtp)) {
-            $lasterror = $this->smtp->getError();
-            if (!empty($lasterror['error'])) {
-                $msg .= $this->lang('smtp_error') . $lasterror['error'];
-                if (!empty($lasterror['detail'])) {
-                    $msg .= ' Detail: '. $lasterror['detail'];
-                }
-                if (!empty($lasterror['smtp_code'])) {
-                    $msg .= ' SMTP code: ' . $lasterror['smtp_code'];
-                }
-                if (!empty($lasterror['smtp_code_ex'])) {
-                    $msg .= ' Additional SMTP info: ' . $lasterror['smtp_code_ex'];
-                }
-            }
-        }
-        $this->ErrorInfo = $msg;
-    }
-
-    /**
-     * Return an RFC 822 formatted date.
-     * @access public
-     * @return string
-     * @static
-     */
-    public static function rfcDate()
-    {
-        // Set the time zone to whatever the default is to avoid 500 errors
-        // Will default to UTC if it's not set properly in php.ini
-        date_default_timezone_set(@date_default_timezone_get());
-        return date('D, j M Y H:i:s O');
-    }
-
-    /**
-     * Get the server hostname.
-     * Returns 'localhost.localdomain' if unknown.
-     * @access protected
-     * @return string
-     */
-    protected function serverHostname()
-    {
-        $result = 'localhost.localdomain';
-        if (!empty($this->Hostname)) {
-            $result = $this->Hostname;
-        } elseif (isset($_SERVER) and array_key_exists('SERVER_NAME', $_SERVER) and !empty($_SERVER['SERVER_NAME'])) {
-            $result = $_SERVER['SERVER_NAME'];
-        } elseif (function_exists('gethostname') && gethostname() !== false) {
-            $result = gethostname();
-        } elseif (php_uname('n') !== false) {
-            $result = php_uname('n');
-        }
-        return $result;
-    }
-
-    /**
-     * Get an error message in the current language.
-     * @access protected
-     * @param string $key
-     * @return string
-     */
-    protected function lang($key)
-    {
-        if (count($this->language) < 1) {
-            $this->setLanguage('en'); // set the default language
-        }
-
-        if (array_key_exists($key, $this->language)) {
-            return $this->language[$key];
-        } else {
-            //Return the key as a fallback
-            return $key;
-        }
-    }
-
-    /**
-     * Check if an error occurred.
-     * @access public
-     * @return boolean True if an error did occur.
-     */
-    public function isError()
-    {
-        return ($this->error_count > 0);
-    }
-
-    /**
-     * Ensure consistent line endings in a string.
-     * Changes every end of line from CRLF, CR or LF to $this->LE.
-     * @access public
-     * @param string $str String to fixEOL
-     * @return string
-     */
-    public function fixEOL($str)
-    {
-        // Normalise to \n
-        $nstr = str_replace(array("\r\n", "\r"), "\n", $str);
-        // Now convert LE as needed
-        if ($this->LE !== "\n") {
-            $nstr = str_replace("\n", $this->LE, $nstr);
-        }
-        return $nstr;
-    }
-
-    /**
-     * Add a custom header.
-     * $name value can be overloaded to contain
-     * both header name and value (name:value)
-     * @access public
-     * @param string $name Custom header name
-     * @param string $value Header value
-     * @return void
-     */
-    public function addCustomHeader($name, $value = null)
-    {
-        if ($value === null) {
-            // Value passed in as name:value
-            $this->CustomHeader[] = explode(':', $name, 2);
-        } else {
-            $this->CustomHeader[] = array($name, $value);
-        }
-    }
-
-    /**
-     * Returns all custom headers
-     *
-     * @return array
-     */
-    public function getCustomHeaders()
-    {
-        return $this->CustomHeader;
-    }
-
-    /**
-     * Create a message from an HTML string.
-     * Automatically makes modifications for inline images and backgrounds
-     * and creates a plain-text version by converting the HTML.
-     * Overwrites any existing values in $this->Body and $this->AltBody
-     * @access public
-     * @param string $message HTML message string
-     * @param string $basedir baseline directory for path
-     * @param boolean|callable $advanced Whether to use the internal HTML to text converter
-     *    or your own custom converter @see html2text()
-     * @return string $message
-     */
-    public function msgHTML($message, $basedir = '', $advanced = false)
-    {
-        preg_match_all('/(src|background)=["\'](.*)["\']/Ui', $message, $images);
-        if (isset($images[2])) {
-            foreach ($images[2] as $imgindex => $url) {
-                // Convert data URIs into embedded images
-                if (preg_match('#^data:(image[^;,]*)(;base64)?,#', $url, $match)) {
-                    $data = substr($url, strpos($url, ','));
-                    if ($match[2]) {
-                        $data = base64_decode($data);
-                    } else {
-                        $data = rawurldecode($data);
-                    }
-                    $cid = md5($url) . '@phpmailer.0'; // RFC2392 S 2
-                    if ($this->addStringEmbeddedImage($data, $cid, '', 'base64', $match[1])) {
-                        $message = str_replace(
-                            $images[0][$imgindex],
-                            $images[1][$imgindex] . '="cid:' . $cid . '"',
-                            $message
-                        );
-                    }
-                } elseif (!preg_match('#^[A-z]+://#', $url)) {
-                    // Do not change urls for absolute images (thanks to corvuscorax)
-                    $filename = basename($url);
-                    $directory = dirname($url);
-                    if ($directory == '.') {
-                        $directory = '';
-                    }
-                    $cid = md5($url) . '@phpmailer.0'; // RFC2392 S 2
-                    if (strlen($basedir) > 1 && substr($basedir, -1) != '/') {
-                        $basedir .= '/';
-                    }
-                    if (strlen($directory) > 1 && substr($directory, -1) != '/') {
-                        $directory .= '/';
-                    }
-                    if ($this->addEmbeddedImage(
-                        $basedir . $directory . $filename,
-                        $cid,
-                        $filename,
-                        'base64',
-                        self::_mime_types((string)self::mb_pathinfo($filename, PATHINFO_EXTENSION))
-                    )
-                    ) {
-                        $message = preg_replace(
-                            '/' . $images[1][$imgindex] . '=["\']' . preg_quote($url, '/') . '["\']/Ui',
-                            $images[1][$imgindex] . '="cid:' . $cid . '"',
-                            $message
-                        );
-                    }
-                }
-            }
-        }
-        $this->isHTML(true);
-        // Convert all message body line breaks to CRLF, makes quoted-printable encoding work much better
-        $this->Body = $this->normalizeBreaks($message);
-        $this->AltBody = $this->normalizeBreaks($this->html2text($message, $advanced));
-        if (empty($this->AltBody)) {
-            $this->AltBody = 'To view this email message, open it in a program that understands HTML!' .
-                self::CRLF . self::CRLF;
-        }
-        return $this->Body;
-    }
-
-    /**
-     * Convert an HTML string into plain text.
-     * This is used by msgHTML().
-     * Note - older versions of this function used a bundled advanced converter
-     * which was been removed for license reasons in #232
-     * Example usage:
-     * 
-     * // Use default conversion
-     * $plain = $mail->html2text($html);
-     * // Use your own custom converter
-     * $plain = $mail->html2text($html, function($html) {
-     *     $converter = new MyHtml2text($html);
-     *     return $converter->get_text();
-     * });
-     * 
-     * @param string $html The HTML text to convert
-     * @param boolean|callable $advanced Any boolean value to use the internal converter,
-     *   or provide your own callable for custom conversion.
-     * @return string
-     */
-    public function html2text($html, $advanced = false)
-    {
-        if (is_callable($advanced)) {
-            return call_user_func($advanced, $html);
-        }
-        return html_entity_decode(
-            trim(strip_tags(preg_replace('/<(head|title|style|script)[^>]*>.*?<\/\\1>/si', '', $html))),
-            ENT_QUOTES,
-            $this->CharSet
-        );
-    }
-
-    /**
-     * Get the MIME type for a file extension.
-     * @param string $ext File extension
-     * @access public
-     * @return string MIME type of file.
-     * @static
-     */
-    public static function _mime_types($ext = '')
-    {
-        $mimes = array(
-            'xl'    => 'application/excel',
-            'js'    => 'application/javascript',
-            'hqx'   => 'application/mac-binhex40',
-            'cpt'   => 'application/mac-compactpro',
-            'bin'   => 'application/macbinary',
-            'doc'   => 'application/msword',
-            'word'  => 'application/msword',
-            'class' => 'application/octet-stream',
-            'dll'   => 'application/octet-stream',
-            'dms'   => 'application/octet-stream',
-            'exe'   => 'application/octet-stream',
-            'lha'   => 'application/octet-stream',
-            'lzh'   => 'application/octet-stream',
-            'psd'   => 'application/octet-stream',
-            'sea'   => 'application/octet-stream',
-            'so'    => 'application/octet-stream',
-            'oda'   => 'application/oda',
-            'pdf'   => 'application/pdf',
-            'ai'    => 'application/postscript',
-            'eps'   => 'application/postscript',
-            'ps'    => 'application/postscript',
-            'smi'   => 'application/smil',
-            'smil'  => 'application/smil',
-            'mif'   => 'application/vnd.mif',
-            'xls'   => 'application/vnd.ms-excel',
-            'ppt'   => 'application/vnd.ms-powerpoint',
-            'wbxml' => 'application/vnd.wap.wbxml',
-            'wmlc'  => 'application/vnd.wap.wmlc',
-            'dcr'   => 'application/x-director',
-            'dir'   => 'application/x-director',
-            'dxr'   => 'application/x-director',
-            'dvi'   => 'application/x-dvi',
-            'gtar'  => 'application/x-gtar',
-            'php3'  => 'application/x-httpd-php',
-            'php4'  => 'application/x-httpd-php',
-            'php'   => 'application/x-httpd-php',
-            'phtml' => 'application/x-httpd-php',
-            'phps'  => 'application/x-httpd-php-source',
-            'swf'   => 'application/x-shockwave-flash',
-            'sit'   => 'application/x-stuffit',
-            'tar'   => 'application/x-tar',
-            'tgz'   => 'application/x-tar',
-            'xht'   => 'application/xhtml+xml',
-            'xhtml' => 'application/xhtml+xml',
-            'zip'   => 'application/zip',
-            'mid'   => 'audio/midi',
-            'midi'  => 'audio/midi',
-            'mp2'   => 'audio/mpeg',
-            'mp3'   => 'audio/mpeg',
-            'mpga'  => 'audio/mpeg',
-            'aif'   => 'audio/x-aiff',
-            'aifc'  => 'audio/x-aiff',
-            'aiff'  => 'audio/x-aiff',
-            'ram'   => 'audio/x-pn-realaudio',
-            'rm'    => 'audio/x-pn-realaudio',
-            'rpm'   => 'audio/x-pn-realaudio-plugin',
-            'ra'    => 'audio/x-realaudio',
-            'wav'   => 'audio/x-wav',
-            'bmp'   => 'image/bmp',
-            'gif'   => 'image/gif',
-            'jpeg'  => 'image/jpeg',
-            'jpe'   => 'image/jpeg',
-            'jpg'   => 'image/jpeg',
-            'png'   => 'image/png',
-            'tiff'  => 'image/tiff',
-            'tif'   => 'image/tiff',
-            'eml'   => 'message/rfc822',
-            'css'   => 'text/css',
-            'html'  => 'text/html',
-            'htm'   => 'text/html',
-            'shtml' => 'text/html',
-            'log'   => 'text/plain',
-            'text'  => 'text/plain',
-            'txt'   => 'text/plain',
-            'rtx'   => 'text/richtext',
-            'rtf'   => 'text/rtf',
-            'vcf'   => 'text/vcard',
-            'vcard' => 'text/vcard',
-            'xml'   => 'text/xml',
-            'xsl'   => 'text/xml',
-            'mpeg'  => 'video/mpeg',
-            'mpe'   => 'video/mpeg',
-            'mpg'   => 'video/mpeg',
-            'mov'   => 'video/quicktime',
-            'qt'    => 'video/quicktime',
-            'rv'    => 'video/vnd.rn-realvideo',
-            'avi'   => 'video/x-msvideo',
-            'movie' => 'video/x-sgi-movie'
-        );
-        if (array_key_exists(strtolower($ext), $mimes)) {
-            return $mimes[strtolower($ext)];
-        }
-        return 'application/octet-stream';
-    }
-
-    /**
-     * Map a file name to a MIME type.
-     * Defaults to 'application/octet-stream', i.e.. arbitrary binary data.
-     * @param string $filename A file name or full path, does not need to exist as a file
-     * @return string
-     * @static
-     */
-    public static function filenameToType($filename)
-    {
-        // In case the path is a URL, strip any query string before getting extension
-        $qpos = strpos($filename, '?');
-        if (false !== $qpos) {
-            $filename = substr($filename, 0, $qpos);
-        }
-        $pathinfo = self::mb_pathinfo($filename);
-        return self::_mime_types($pathinfo['extension']);
-    }
-
-    /**
-     * Multi-byte-safe pathinfo replacement.
-     * Drop-in replacement for pathinfo(), but multibyte-safe, cross-platform-safe, old-version-safe.
-     * Works similarly to the one in PHP >= 5.2.0
-     * @link http://www.php.net/manual/en/function.pathinfo.php#107461
-     * @param string $path A filename or path, does not need to exist as a file
-     * @param integer|string $options Either a PATHINFO_* constant,
-     *      or a string name to return only the specified piece, allows 'filename' to work on PHP < 5.2
-     * @return string|array
-     * @static
-     */
-    public static function mb_pathinfo($path, $options = null)
-    {
-        $ret = array('dirname' => '', 'basename' => '', 'extension' => '', 'filename' => '');
-        $pathinfo = array();
-        if (preg_match('%^(.*?)[\\\\/]*(([^/\\\\]*?)(\.([^\.\\\\/]+?)|))[\\\\/\.]*$%im', $path, $pathinfo)) {
-            if (array_key_exists(1, $pathinfo)) {
-                $ret['dirname'] = $pathinfo[1];
-            }
-            if (array_key_exists(2, $pathinfo)) {
-                $ret['basename'] = $pathinfo[2];
-            }
-            if (array_key_exists(5, $pathinfo)) {
-                $ret['extension'] = $pathinfo[5];
-            }
-            if (array_key_exists(3, $pathinfo)) {
-                $ret['filename'] = $pathinfo[3];
-            }
-        }
-        switch ($options) {
-            case PATHINFO_DIRNAME:
-            case 'dirname':
-                return $ret['dirname'];
-            case PATHINFO_BASENAME:
-            case 'basename':
-                return $ret['basename'];
-            case PATHINFO_EXTENSION:
-            case 'extension':
-                return $ret['extension'];
-            case PATHINFO_FILENAME:
-            case 'filename':
-                return $ret['filename'];
-            default:
-                return $ret;
-        }
-    }
-
-    /**
-     * Set or reset instance properties.
-     * You should avoid this function - it's more verbose, less efficient, more error-prone and
-     * harder to debug than setting properties directly.
-     * Usage Example:
-     * `$mail->set('SMTPSecure', 'tls');`
-     *   is the same as:
-     * `$mail->SMTPSecure = 'tls';`
-     * @access public
-     * @param string $name The property name to set
-     * @param mixed $value The value to set the property to
-     * @return boolean
-     * @TODO Should this not be using the __set() magic function?
-     */
-    public function set($name, $value = '')
-    {
-        if (property_exists($this, $name)) {
-            $this->$name = $value;
-            return true;
-        } else {
-            $this->setError($this->lang('variable_set') . $name);
-            return false;
-        }
-    }
-
-    /**
-     * Strip newlines to prevent header injection.
-     * @access public
-     * @param string $str
-     * @return string
-     */
-    public function secureHeader($str)
-    {
-        return trim(str_replace(array("\r", "\n"), '', $str));
-    }
-
-    /**
-     * Normalize line breaks in a string.
-     * Converts UNIX LF, Mac CR and Windows CRLF line breaks into a single line break format.
-     * Defaults to CRLF (for message bodies) and preserves consecutive breaks.
-     * @param string $text
-     * @param string $breaktype What kind of line break to use, defaults to CRLF
-     * @return string
-     * @access public
-     * @static
-     */
-    public static function normalizeBreaks($text, $breaktype = "\r\n")
-    {
-        return preg_replace('/(\r\n|\r|\n)/ms', $breaktype, $text);
-    }
-
-
-    /**
-     * Set the public and private key files and password for S/MIME signing.
-     * @access public
-     * @param string $cert_filename
-     * @param string $key_filename
-     * @param string $key_pass Password for private key
-     * @param string $extracerts_filename Optional path to chain certificate
-     */
-    public function sign($cert_filename, $key_filename, $key_pass, $extracerts_filename = '')
-    {
-        $this->sign_cert_file = $cert_filename;
-        $this->sign_key_file = $key_filename;
-        $this->sign_key_pass = $key_pass;
-        $this->sign_extracerts_file = $extracerts_filename;
-    }
-
-    /**
-     * Quoted-Printable-encode a DKIM header.
-     * @access public
-     * @param string $txt
-     * @return string
-     */
-    public function DKIM_QP($txt)
-    {
-        $line = '';
-        for ($i = 0; $i < strlen($txt); $i++) {
-            $ord = ord($txt[$i]);
-            if (((0x21 <= $ord) && ($ord <= 0x3A)) || $ord == 0x3C || ((0x3E <= $ord) && ($ord <= 0x7E))) {
-                $line .= $txt[$i];
-            } else {
-                $line .= '=' . sprintf('%02X', $ord);
-            }
-        }
-        return $line;
-    }
-
-    /**
-     * Generate a DKIM signature.
-     * @access public
-     * @param string $signHeader
-     * @throws phpmailerException
-     * @return string
-     */
-    public function DKIM_Sign($signHeader)
-    {
-        if (!defined('PKCS7_TEXT')) {
-            if ($this->exceptions) {
-                throw new phpmailerException($this->lang('extension_missing') . 'openssl');
-            }
-            return '';
-        }
-        $privKeyStr = file_get_contents($this->DKIM_private);
-        if ($this->DKIM_passphrase != '') {
-            $privKey = openssl_pkey_get_private($privKeyStr, $this->DKIM_passphrase);
-        } else {
-            $privKey = $privKeyStr;
-        }
-        if (openssl_sign($signHeader, $signature, $privKey)) {
-            return base64_encode($signature);
-        }
-        return '';
-    }
-
-    /**
-     * Generate a DKIM canonicalization header.
-     * @access public
-     * @param string $signHeader Header
-     * @return string
-     */
-    public function DKIM_HeaderC($signHeader)
-    {
-        $signHeader = preg_replace('/\r\n\s+/', ' ', $signHeader);
-        $lines = explode("\r\n", $signHeader);
-        foreach ($lines as $key => $line) {
-            list($heading, $value) = explode(':', $line, 2);
-            $heading = strtolower($heading);
-            $value = preg_replace('/\s+/', ' ', $value); // Compress useless spaces
-            $lines[$key] = $heading . ':' . trim($value); // Don't forget to remove WSP around the value
-        }
-        $signHeader = implode("\r\n", $lines);
-        return $signHeader;
-    }
-
-    /**
-     * Generate a DKIM canonicalization body.
-     * @access public
-     * @param string $body Message Body
-     * @return string
-     */
-    public function DKIM_BodyC($body)
-    {
-        if ($body == '') {
-            return "\r\n";
-        }
-        // stabilize line endings
-        $body = str_replace("\r\n", "\n", $body);
-        $body = str_replace("\n", "\r\n", $body);
-        // END stabilize line endings
-        while (substr($body, strlen($body) - 4, 4) == "\r\n\r\n") {
-            $body = substr($body, 0, strlen($body) - 2);
-        }
-        return $body;
-    }
-
-    /**
-     * Create the DKIM header and body in a new message header.
-     * @access public
-     * @param string $headers_line Header lines
-     * @param string $subject Subject
-     * @param string $body Body
-     * @return string
-     */
-    public function DKIM_Add($headers_line, $subject, $body)
-    {
-        $DKIMsignatureType = 'rsa-sha1'; // Signature & hash algorithms
-        $DKIMcanonicalization = 'relaxed/simple'; // Canonicalization of header/body
-        $DKIMquery = 'dns/txt'; // Query method
-        $DKIMtime = time(); // Signature Timestamp = seconds since 00:00:00 - Jan 1, 1970 (UTC time zone)
-        $subject_header = "Subject: $subject";
-        $headers = explode($this->LE, $headers_line);
-        $from_header = '';
-        $to_header = '';
-        $current = '';
-        foreach ($headers as $header) {
-            if (strpos($header, 'From:') === 0) {
-                $from_header = $header;
-                $current = 'from_header';
-            } elseif (strpos($header, 'To:') === 0) {
-                $to_header = $header;
-                $current = 'to_header';
-            } else {
-                if (!empty($$current) && strpos($header, ' =?') === 0) {
-                    $$current .= $header;
-                } else {
-                    $current = '';
-                }
-            }
-        }
-        $from = str_replace('|', '=7C', $this->DKIM_QP($from_header));
-        $to = str_replace('|', '=7C', $this->DKIM_QP($to_header));
-        $subject = str_replace(
-            '|',
-            '=7C',
-            $this->DKIM_QP($subject_header)
-        ); // Copied header fields (dkim-quoted-printable)
-        $body = $this->DKIM_BodyC($body);
-        $DKIMlen = strlen($body); // Length of body
-        $DKIMb64 = base64_encode(pack('H*', sha1($body))); // Base64 of packed binary SHA-1 hash of body
-        if ('' == $this->DKIM_identity) {
-            $ident = '';
-        } else {
-            $ident = ' i=' . $this->DKIM_identity . ';';
-        }
-        $dkimhdrs = 'DKIM-Signature: v=1; a=' .
-            $DKIMsignatureType . '; q=' .
-            $DKIMquery . '; l=' .
-            $DKIMlen . '; s=' .
-            $this->DKIM_selector .
-            ";\r\n" .
-            "\tt=" . $DKIMtime . '; c=' . $DKIMcanonicalization . ";\r\n" .
-            "\th=From:To:Subject;\r\n" .
-            "\td=" . $this->DKIM_domain . ';' . $ident . "\r\n" .
-            "\tz=$from\r\n" .
-            "\t|$to\r\n" .
-            "\t|$subject;\r\n" .
-            "\tbh=" . $DKIMb64 . ";\r\n" .
-            "\tb=";
-        $toSign = $this->DKIM_HeaderC(
-            $from_header . "\r\n" . $to_header . "\r\n" . $subject_header . "\r\n" . $dkimhdrs
-        );
-        $signed = $this->DKIM_Sign($toSign);
-        return $dkimhdrs . $signed . "\r\n";
-    }
-
-    /**
-     * Allows for public read access to 'to' property.
-     * @access public
-     * @return array
-     */
-    public function getToAddresses()
-    {
-        return $this->to;
-    }
-
-    /**
-     * Allows for public read access to 'cc' property.
-     * @access public
-     * @return array
-     */
-    public function getCcAddresses()
-    {
-        return $this->cc;
-    }
-
-    /**
-     * Allows for public read access to 'bcc' property.
-     * @access public
-     * @return array
-     */
-    public function getBccAddresses()
-    {
-        return $this->bcc;
-    }
-
-    /**
-     * Allows for public read access to 'ReplyTo' property.
-     * @access public
-     * @return array
-     */
-    public function getReplyToAddresses()
-    {
-        return $this->ReplyTo;
-    }
-
-    /**
-     * Allows for public read access to 'all_recipients' property.
-     * @access public
-     * @return array
-     */
-    public function getAllRecipientAddresses()
-    {
-        return $this->all_recipients;
-    }
-
-    /**
-     * Perform a callback.
-     * @param boolean $isSent
-     * @param array $to
-     * @param array $cc
-     * @param array $bcc
-     * @param string $subject
-     * @param string $body
-     * @param string $from
-     */
-    protected function doCallback($isSent, $to, $cc, $bcc, $subject, $body, $from)
-    {
-        if (!empty($this->action_function) && is_callable($this->action_function)) {
-            $params = array($isSent, $to, $cc, $bcc, $subject, $body, $from);
-            call_user_func_array($this->action_function, $params);
-        }
-    }
-}
-
-/**
- * PHPMailer exception handler
- * @package PHPMailer
- */
-class phpmailerException extends Exception
-{
-    /**
-     * Prettify error message output
-     * @return string
-     */
-    public function errorMessage()
-    {
-        $errorMsg = '' . $this->getMessage() . "
\n";
-        return $errorMsg;
-    }
-}
diff --git a/mayor-orig/www/include/share/net/rest.php b/mayor-orig/www/include/share/net/rest.php
deleted file mode 100644
index beace19a..00000000
--- a/mayor-orig/www/include/share/net/rest.php
+++ /dev/null
@@ -1,188 +0,0 @@
- array('txt'=>'Continue', 				'class'=>'Informational'),
-    101 => array('txt'=>'Switching Protocols', 			'class'=>'Informational'),
-    200 => array('txt'=>'OK', 					'class'=>'Successful'),
-    201 => array('txt'=>'Created', 				'class'=>'Successful'),
-    202 => array('txt'=>'Accepted', 				'class'=>'Successful'),
-    203 => array('txt'=>'Non-Authoritative Information', 	'class'=>'Successful'),
-    204 => array('txt'=>'No Content', 				'class'=>'Successful'),
-    205 => array('txt'=>'Reset Content', 			'class'=>'Successful'),
-    206 => array('txt'=>'Partial Content', 			'class'=>'Successful'),
-    300 => array('txt'=>'Multiple Choices', 			'class'=>'Redirection'),
-    301 => array('txt'=>'Moved Permanently', 			'class'=>'Redirection'),
-    302 => array('txt'=>'Found', 				'class'=>'Redirection'),
-    303 => array('txt'=>'See Other', 				'class'=>'Redirection'),
-    304 => array('txt'=>'Not Modified', 			'class'=>'Redirection'),
-    305 => array('txt'=>'Use Proxy', 				'class'=>'Redirection'),
-    306 => array('txt'=>'(Unused)', 				'class'=>'Redirection'),
-    307 => array('txt'=>'Temporary Redirect', 			'class'=>'Redirection'),
-    400 => array('txt'=>'Bad Request', 				'class'=>'Client Error'),
-    401 => array('txt'=>'Unauthorized', 			'class'=>'Client Error'),
-    402 => array('txt'=>'Payment Required', 			'class'=>'Client Error'),
-    403 => array('txt'=>'Forbidden', 				'class'=>'Client Error'),
-    404 => array('txt'=>'Not Found', 				'class'=>'Client Error'),
-    405 => array('txt'=>'Method Not Allowed', 			'class'=>'Client Error'),
-    406 => array('txt'=>'Not Acceptable', 			'class'=>'Client Error'),
-    407 => array('txt'=>'Proxy Authentication Required', 	'class'=>'Client Error'),
-    408 => array('txt'=>'Request Timeout', 			'class'=>'Client Error'),
-    409 => array('txt'=>'Conflict', 				'class'=>'Client Error'),
-    410 => array('txt'=>'Gone', 				'class'=>'Client Error'),
-    411 => array('txt'=>'Length Required', 			'class'=>'Client Error'),
-    412 => array('txt'=>'Precondition Failed', 			'class'=>'Client Error'),
-    413 => array('txt'=>'Request Entity Too Large', 		'class'=>'Client Error'),
-    414 => array('txt'=>'Request-URI Too Long', 		'class'=>'Client Error'),
-    415 => array('txt'=>'Unsupported Media Type', 		'class'=>'Client Error'),
-    416 => array('txt'=>'Requested Range Not Satisfiable', 	'class'=>'Client Error'),
-    417 => array('txt'=>'Expectation Failed', 			'class'=>'Client Error'),
-    500 => array('txt'=>'Internal Server Error', 		'class'=>'Server Error'),
-    501 => array('txt'=>'Not Implemented', 			'class'=>'Server Error'),
-    502 => array('txt'=>'Bad Gateway', 				'class'=>'Server Error'),
-    503 => array('txt'=>'Service Unavailable', 			'class'=>'Server Error'),
-    504 => array('txt'=>'Gateway Timeout', 			'class'=>'Server Error'),
-    505 => array('txt'=>'HTTP Version Not Supported', 		'class'=>'Server Error')
-);
-
-/**
- * REST hívás JSON kódolt adatokkal
- *     $url - a resource azonsosító
- *     $verb - GET (lekérdezés), POST (módosítás), DELETE (törlés)
- *     $params - azátadandó paraméterek asszociatív tömbje
-**/
-
-function restRequest($url, $verb, $params) {
-    $header = array(
-	'Accept: text/plain',
-	'Content-Type: application/json',
-    );
-    $params['name'] = 'Naplo';
-    $forcePostParams = ($verb != 'GET'); // A SuliX megvalósítás POST paraméterként (tehát a message body-ban) várja a paramétereket
-    return rest_helper($url, array(json_encode($params, JSON_FORCE_OBJECT)), $verb, 'json', $header, $forcePostParams);
-}
-
-/**
- * Általános REST hívás megadható metódussal, visszatérési érték:
- *   $ret [http]
- *	    [status]
- *	    [header][-indexed-]
- *	  [result][-asszoc-]
-**/
-function rest_helper($url, $params = null, $verb = 'GET', $format = 'json', $header = array(), $forcePostParams = false) {
-
-    $cparams = array(
-	'http' => array(
-    	    'method' => $verb,
-	    'header' => implode("\r\n", $header),
-    	    'ignore_errors' => true
-	)
-    );
-    if ($params !== null) {
-	$params = http_build_query($params);
-	if ($verb == 'POST' || $forcePostParams === true) {
-    	    $cparams['http']['content'] = $params;
-	} else {
-    	    $url .= '?' . $params;
-	}
-    }
-
-    $context = stream_context_create($cparams);
-    $fp = fopen($url, 'rb', false, $context);
-
-    if (!$fp) {
-	$res = false;
-    } else {
-	$meta = stream_get_meta_data($fp);
-	$ret['http']['status'] = explode(' ', $meta['wrapper_data'][0])[1];
-	for ($i = 1; $i < count($meta['wrapper_data']); $i++) {
-	    $tmp = explode(': ', $meta['wrapper_data'][$i]);
-	    $ret['http']['header'][ $tmp[0] ] = $tmp[1];
-	}
-	//var_dump($meta['wrapper_data']);
-	$res = stream_get_contents($fp);
-    }
-
-    if ($res === false) {
-	throw new Exception("$verb $url failed: $php_errormsg");
-    }
-
-    switch ($format) {
-	case 'json':
-    	    $ret['result'] = json_decode($res, true);
-    	    if ($ret['result'] === null) {
-    		throw new Exception("failed to decode $res as json");
-    	    }
-    	    return $ret;
-
-	case 'xml':
-    	    $ret['result'] = simplexml_load_string($res);
-    	    if ($ret['result'] === null) {
-    		throw new Exception("failed to decode $res as xml");
-    	    }
-    	    return $ret;
-    }
-    $ret['result'] = $res;
-    return $ret;
-}
-
-/*
-
-// http://wezfurlong.org/blog/2006/nov/http-post-from-php-without-curl/
-// Az eredeti kód...
-
-function rest_helper($url, $params = null, $verb = 'GET', $format = 'json')
-{
-  $cparams = array(
-    'http' => array(
-      'method' => $verb,
-      'ignore_errors' => true
-    )
-  );
-  if ($params !== null) {
-    $params = http_build_query($params);
-    if ($verb == 'POST') {
-      $cparams['http']['content'] = $params;
-    } else {
-      $url .= '?' . $params;
-    }
-  }
-
-  $context = stream_context_create($cparams);
-  $fp = fopen($url, 'rb', false, $context);
-  if (!$fp) {
-    $res = false;
-  } else {
-    // If you're trying to troubleshoot problems, try uncommenting the
-    // next two lines; it will show you the HTTP response headers across
-    // all the redirects:
-     $meta = stream_get_meta_data($fp);
-     var_dump($meta['wrapper_data'][0]);
-    $res = stream_get_contents($fp);
-  }
-
-  if ($res === false) {
-    throw new Exception("$verb $url failed: $php_errormsg");
-  }
-
-  switch ($format) {
-    case 'json':
-      $r = json_decode($res);
-      if ($r === null) {
-        throw new Exception("failed to decode $res as json");
-      }
-      return $r;
-
-    case 'xml':
-      $r = simplexml_load_string($res);
-      if ($r === null) {
-        throw new Exception("failed to decode $res as xml");
-      }
-      return $r;
-  }
-  return $res;
-}
-
-*/
-
-
-?>
\ No newline at end of file
diff --git a/mayor-orig/www/include/share/net/upload.php b/mayor-orig/www/include/share/net/upload.php
deleted file mode 100644
index a909f6c2..00000000
--- a/mayor-orig/www/include/share/net/upload.php
+++ /dev/null
@@ -1,58 +0,0 @@
- 1000000) {
-        throw new RuntimeException('Túl nagy a file!');
-    }
-
-    $finfo = new finfo(FILEINFO_MIME_TYPE);
-    if (false === $ext = array_search(
-        $finfo->file($_FILES['upfile']['tmp_name']),
-        array(
-            'jpg' => 'image/jpeg',
-            'png' => 'image/png',
-            'gif' => 'image/gif',
-        ),
-        true
-    )) {
-        throw new RuntimeException('Nem kép!');
-    }
-
-    // You should name it uniquely.
-    // DO NOT USE $_FILES['upfile']['name'] WITHOUT ANY VALIDATION !!
-    // On this example, obtain safe unique name from its binary data.
-    if (!move_uploaded_file($_FILES['upfile']['tmp_name'],$WHERE['subdir'].'/'.$WHERE['filename'])) {
-        throw new RuntimeException('Nem tudtuk átmozgatni. Van jogunk írni a célkönyvtárba?');
-    }
-
-    } catch (RuntimeException $e) {
-	$_SESSION['alert'][] = 'info::'.$e->getMessage();
-    }
-}
-?>
\ No newline at end of file
diff --git a/mayor-orig/www/include/share/print/pdf.php b/mayor-orig/www/include/share/print/pdf.php
deleted file mode 100644
index 41fe55c8..00000000
--- a/mayor-orig/www/include/share/print/pdf.php
+++ /dev/null
@@ -1,270 +0,0 @@
-'); // a . engedélyezett
-	$replace = array('_','_','_','_','_','_','_','_','_','_','_','_');
-	return str_replace($search,$replace,$fileName);
-    }
-
-    function pdfLaTeX($TeX, $fileName) { // Beszúrt képekkel problémája van a pdflatex-nek
-
-	global $policy, $page, $sub, $f;
-
-	$dir = _DOWNLOADDIR."/$policy/$page/$sub/$f";
-
-	// könyvtár ellenőrzése
-        $ftex = fopen($dir.'/'.$fileName.'.tex', 'w');
-        if (!$ftex) {
-	    $_SESSION['alert'][] = 'message:file_write_failure:'.$dir.'/'.$fileName.'.tex';
-	    return false;
-	}
-        fputs($ftex, $TeX);
-        fclose($ftex);
-
-        exec('HOME=/tmp && export HOME && cd '.$dir.' && pdflatex -output-directory '.$dir.' "'.$dir.'/'.$fileName.'.tex"');
-	return true;
-
-    }
-
-    function pdfLaTeXTwice($TeX, $fileName) { // Pl. longtable miatt kétszer kell futtatni...
-
-	global $policy, $page, $sub, $f;
-
-	$dir = _DOWNLOADDIR."/$policy/$page/$sub/$f";
-
-	// könyvtár ellenőrzése
-        $ftex = fopen($dir.'/'.$fileName.'.tex', 'w');
-        if (!$ftex) {
-	    $_SESSION['alert'][] = 'message:file_write_failure:'.$dir.'/'.$fileName.'.tex';
-	    return false;
-	}
-        fputs($ftex, $TeX);
-        fclose($ftex);
-
-        exec('HOME=/tmp && export HOME && cd '.$dir.' && pdflatex -output-directory '.$dir.' "'.$dir.'/'.$fileName.'.tex"');
-        exec('HOME=/tmp && export HOME && cd '.$dir.' && pdflatex -output-directory '.$dir.' "'.$dir.'/'.$fileName.'.tex"');
-	return true;
-
-    }
-
-    function pdfLaTeXA4($TeX, $fileName) { // TeX --> DVI --> PS --> PDF - így jók a képek
-
-	global $policy, $page, $sub, $f;
-
-	$dir = _DOWNLOADDIR."/$policy/$page/$sub/$f";
-
-	// könyvtár ellenőrzése
-        $ftex = @fopen($dir.'/'.$fileName.'.tex', 'w');
-        if (!$ftex) {
-	    $_SESSION['alert'][] = 'message:file_write_failure:'.$dir.'/'.$fileName.'-A4.tex';
-	    return false;
-	}
-        fputs($ftex, $TeX);
-        fclose($ftex);
-//        exec('cd '.$dir.' && pdflatex -output-directory '.$dir.' '.$dir.'/'.$fileName.'-A4.tex');
-
-        exec('HOME=/tmp && export HOME && cd '.$dir.' && latex "'.$dir.'/'.$fileName.'.tex"');
-        exec('HOME=/tmp && export HOME && cd '.$dir.' && dvips -R0 -t a4 "'.$dir.'/'.$fileName.'.dvi"');
-        exec('HOME=/tmp && export HOME && cd '.$dir.' && ps2pdf "'.$dir.'/'.$fileName.'.ps"');
-
-	return true;
-
-    }
-
-    function pdfLaTeXA4Split($TeX, $fileName) { // TeX --> DVI --> PS --> PDF --> pdftk --> zip - lapokra szétvágott
-
-	global $policy, $page, $sub, $f;
-
-	$dir = _DOWNLOADDIR."/$policy/$page/$sub/$f";
-
-	// könyvtár ellenőrzése
-        $ftex = @fopen($dir.'/'.$fileName.'.tex', 'w');
-        if (!$ftex) {
-	    $_SESSION['alert'][] = 'message:file_write_failure:'.$dir.'/'.$fileName.'-A4.tex';
-	    return false;
-	}
-        fputs($ftex, $TeX);
-        fclose($ftex);
-
-        exec('HOME=/tmp && export HOME && cd '.$dir.' && latex "'.$dir.'/'.$fileName.'.tex"');
-        exec('HOME=/tmp && export HOME && cd '.$dir.' && dvips -R0 -t a4 "'.$dir.'/'.$fileName.'.dvi"');
-        exec('HOME=/tmp && export HOME && cd '.$dir.' && ps2pdf "'.$dir.'/'.$fileName.'.ps"');
-
-	exec('HOME=/tmp && export HOME && cd '.$dir.' && mkdir -p '.$dir.'/'.$fileName);
-	exec('HOME=/tmp && export HOME && cd '.$dir.'/'.$fileName.' && pdftk ../'.$fileName.'.pdf burst');
-	exec('HOME=/tmp && export HOME && cd '.$dir.' && zip -r '.$fileName.'.zip '.$fileName );
-	exec('HOME=/tmp && export HOME && cd '.$dir.' && rm -r '.$dir.'/'.$fileName);
-
-	return true;
-
-    }
-
-
-    function pdfLaTeXA5($TeX, $fileName) {
-
-	global $policy, $page, $sub, $f;
-
-	$dir = _DOWNLOADDIR."/$policy/$page/$sub/$f";
-
-	// könyvtár ellenőrzése
-        $ftex = fopen($dir.'/'.$fileName.'-A5.tex', 'w');
-        if (!$ftex) {
-	    $_SESSION['alert'][] = 'message:file_write_failure:'.$dir.'/'.$fileName.'-A5.tex';
-	    return false;
-	}
-        fputs($ftex, $TeX);
-        fclose($ftex);
-//        exec('cd '.$dir.' && pdflatex -output-directory '.$dir.' '.$dir.'/'.$fileName.'-A5.tex');
-
-        exec('HOME=/tmp && export HOME && cd '.$dir.' && latex "'.$dir.'/'.$fileName.'-A5.tex"');
-        exec('HOME=/tmp && export HOME && cd '.$dir.' && dvips -R0 -t a5 "'.$dir.'/'.$fileName.'-A5.dvi"');
-        exec('HOME=/tmp && export HOME && cd '.$dir.' && ps2pdf "'.$dir.'/'.$fileName.'-A5.ps"');
-
-        $TeX = '\documentclass[a4paper,landscape,10pt]{article}'."\n";
-        $TeX .= '\usepackage[final]{pdfpages}'."\n";
-        $TeX .= '\begin{document}'."\n";
-        $TeX .= '\includepdf[nup=2x1, pages={-}]{'.$dir.'/'.$fileName.'-A5.pdf}'."\n";
-        $TeX .= '\end{document}'."\n";
-
-        $ftex = fopen($dir.'/'.$fileName.'.tex', 'w');
-        if (!$ftex) {
-	    $_SESSION['alert'][] = 'message:file_write_failure:'.$dir.'/'.$fileName.'.tex';
-	    return false;
-	}
-        fputs($ftex, $TeX);
-        fclose($ftex);
-	exec('HOME=/tmp && export HOME && cd '.$dir.' && rm "'.$dir.'/'.$fileName.'.aux"');
-        exec('HOME=/tmp && export HOME && cd '.$dir.' && pdflatex -output-directory '.$dir.' "'.$dir.'/'.$fileName.'.tex"');
-
-	return true;
-
-    }
-
-    function pdfLaTeXA5Booklet($TeX, $fileName) {
-
-	global $policy, $page, $sub, $f;
-
-	$dir = _DOWNLOADDIR."/$policy/$page/$sub/$f";
-
-	// könyvtár ellenőrzése
-        $ftex = fopen($dir.'/'.$fileName.'-A5.tex', 'w');
-        if (!$ftex) {
-	    $_SESSION['alert'][] = 'message:file_write_failure:'.$dir.'/'.$fileName.'-A5.tex';
-	    return false;
-	}
-        fputs($ftex, $TeX);
-        fclose($ftex);
-//        exec('cd '.$dir.' && pdflatex -output-directory '.$dir.' '.$dir.'/'.$fileName.'-A5.tex');
-
-        exec('HOME=/tmp && export HOME && cd '.$dir.' && latex "'.$dir.'/'.$fileName.'-A5.tex"');
-        exec('HOME=/tmp && export HOME && cd '.$dir.' && dvips -R0 -t a5 "'.$dir.'/'.$fileName.'-A5.dvi"');
-        exec('HOME=/tmp && export HOME && cd '.$dir.' && ps2pdf "'.$dir.'/'.$fileName.'-A5.ps"');
-
-        $TeX = '\documentclass[a4paper,landscape,10pt]{article}'."\n";
-        $TeX .= '\usepackage[final]{pdfpages}'."\n";
-        $TeX .= '\begin{document}'."\n";
-        $TeX .= '\includepdf[nup=2x1, pages={-}, signature*=4]{'.$dir.'/'.$fileName.'-A5.pdf}'."\n";
-        $TeX .= '\end{document}'."\n";
-
-        $ftex = fopen($dir.'/'.$fileName.'.tex', 'w');
-        if (!$ftex) {
-	    $_SESSION['alert'][] = 'message:file_write_failure:'.$dir.'/'.$fileName.'.tex';
-	    return false;
-	}
-        fputs($ftex, $TeX);
-        fclose($ftex);
-	exec('HOME=/tmp && export HOME && cd '.$dir.' && rm "'.$dir.'/'.$fileName.'.aux"');
-        exec('HOME=/tmp && export HOME && cd '.$dir.' && pdflatex -output-directory '.$dir.' "'.$dir.'/'.$fileName.'.tex"');
-
-	return true;
-
-    }
-
-    function pdfLaTeXA5Booklets($TeX, $fileName) {
-
-	global $policy, $page, $sub, $f;
-
-	define('__A5BOOKLETSCUTHERE','%%% cut here %%%');
-
-	$dir = _DOWNLOADDIR."/$policy/$page/$sub/$f";
-
-	// könyvtár ellenőrzése
-        $ftex = fopen($dir.'/'.$fileName.'-A5.tex', 'w');
-        if (!$ftex) {
-	    $_SESSION['alert'][] = 'message:file_write_failure:'.$dir.'/'.$fileName.'-A5.tex';
-	    return false;
-	}
-	// A forrást szétvágjuk több darabba a "%%% cut here %%%" string mentén
-	$T[] = explode(__A5BOOKLETSCUTHERE, $TeX);
-// Itt tart a félkész fejlesztés... :)
-        fputs($ftex, $TeX);
-        fclose($ftex);
-//        exec('cd '.$dir.' && pdflatex -output-directory '.$dir.' '.$dir.'/'.$fileName.'-A5.tex');
-
-        exec('HOME=/tmp && export HOME && cd '.$dir.' && latex "'.$dir.'/'.$fileName.'-A5.tex"');
-        exec('HOME=/tmp && export HOME && cd '.$dir.' && dvips -R0 -t a5 "'.$dir.'/'.$fileName.'-A5.dvi"');
-        exec('HOME=/tmp && export HOME && cd '.$dir.' && ps2pdf "'.$dir.'/'.$fileName.'-A5.ps"');
-
-        $TeX = '\documentclass[a4paper,landscape,10pt]{article}'."\n";
-        $TeX .= '\usepackage[final]{pdfpages}'."\n";
-        $TeX .= '\begin{document}'."\n";
-        $TeX .= '\includepdf[nup=2x1, pages={-}, signature*=4]{'.$dir.'/'.$fileName.'-A5.pdf}'."\n";
-        $TeX .= '\end{document}'."\n";
-
-        $ftex = fopen($dir.'/'.$fileName.'.tex', 'w');
-        if (!$ftex) {
-	    $_SESSION['alert'][] = 'message:file_write_failure:'.$dir.'/'.$fileName.'.tex';
-	    return false;
-	}
-        fputs($ftex, $TeX);
-        fclose($ftex);
-	exec('HOME=/tmp && export HOME && cd '.$dir.' && rm "'.$dir.'/'.$fileName.'.aux"');
-        exec('HOME=/tmp && export HOME && cd '.$dir.' && pdflatex -output-directory '.$dir.' "'.$dir.'/'.$fileName.'.tex"');
-
-	return true;
-
-    }
-
-
-
-    function pdfLaTeXA6($TeX, $fileName) {
-
-	global $policy, $page, $sub, $f;
-
-	$dir = _DOWNLOADDIR."/$policy/$page/$sub/$f";
-
-	// könyvtár ellenőrzése
-        $ftex = fopen($dir.'/'.$fileName.'-A6.tex', 'w');
-        if (!$ftex) {
-	    $_SESSION['alert'][] = 'message:file_write_failure:'.$dir.'/'.$fileName.'-A6.tex';
-	    return false;
-	}
-        fputs($ftex, $TeX);
-        fclose($ftex);
-        exec('HOME=/tmp && export HOME && cd '.$dir.' && pdflatex -output-directory '.$dir.' "'.$dir.'/'.$fileName.'-A6.tex"');
-
-        $TeX = '\documentclass[a4paper,10pt]{article}'."\n";
-        $TeX .= '\usepackage[final]{pdfpages}'."\n";
-        $TeX .= '\begin{document}'."\n";
-        $TeX .= '\includepdf[nup=2x2, pages={-}]{'.$dir.'/'.$fileName.'-A6.pdf}'."\n";
-        $TeX .= '\end{document}'."\n";
-
-        $ftex = fopen($dir.'/'.$fileName.'.tex', 'w');
-        if (!$ftex) {
-	    $_SESSION['alert'][] = 'message:file_write_failure:'.$dir.'/'.$fileName.'.tex';
-	    return false;
-	}
-        fputs($ftex, $TeX);
-        fclose($ftex);
-	exec('HOME=/tmp && export HOME && cd '.$dir.' && rm "'.$dir.'/'.$fileName.'.aux"');
-        exec('HOME=/tmp && export HOME && cd '.$dir.' && pdflatex -output-directory '.$dir.' "'.$dir.'/'.$fileName.'.tex"');
-
-	return true;
-
-    }
-
-?>
diff --git a/mayor-orig/www/include/share/session/accountInfo.php b/mayor-orig/www/include/share/session/accountInfo.php
deleted file mode 100644
index 104416ec..00000000
--- a/mayor-orig/www/include/share/session/accountInfo.php
+++ /dev/null
@@ -1,39 +0,0 @@
-'*', 'withNewAccounts' => true)) {
-
-        global $AUTH;
-
-        require_once('include/backend/'.$AUTH[$toPolicy]['backend'].'/session/accountInfo.php');
-        $func = $AUTH[$toPolicy]['backend'].'GetAccountInfo';
-        return $func($userAccount, $toPolicy, $SET);
-
-
-    }
-
-##########################################################
-# getUserInfo - felhasználói információk (keretrendszer)
-##########################################################
-
-    function getUserInfo($userAccount, $toPolicy = _POLICY) {
-
-        global $AUTH;
-
-        require_once('include/backend/'.$AUTH[$toPolicy]['backend'].'/session/accountInfo.php');
-        $func = $AUTH[$toPolicy]['backend'].'GetUserInfo';
-        return $func($userAccount, $toPolicy);
-
-    }
-
-?>
\ No newline at end of file
diff --git a/mayor-orig/www/include/share/session/attrs.php b/mayor-orig/www/include/share/session/attrs.php
deleted file mode 100644
index c7ebafb7..00000000
--- a/mayor-orig/www/include/share/session/attrs.php
+++ /dev/null
@@ -1,63 +0,0 @@
- array('desc' => _ATTR_USERACCOUNT, 'type' => 'text'),
-        'userCn' => array('desc' => _ATTR_USERCN, 'type' => 'text'),
-        'userPassword' => array('desc' => _ATTR_USERPASSWORD, 'type' => 'text'),
-	'uidNumber' => array('desc' => _ATTR_UIDNUMBER, 'type' => 'text'),
-        'mail' => array('desc' => _ATTR_MAIL, 'type' => 'text'),
-        'telephoneNumber' => array('desc' => _ATTR_TELEPHONENUMBER, 'type' => 'text'),
-        'studyId' => array('desc' => _ATTR_STUDYID, 'type' => 'text'),
-        'shadowLastChange' => array('desc' => _ATTR_SHADOWLASTCHANGE, 'type' => 'text'),
-        'shadowMin' => array('desc' => _ATTR_SHADOWMIN, 'type' => 'text'),
-        'shadowMax' => array('desc' => _ATTR_SHADOWMAX, 'type' => 'text'),
-        'shadowWarning' => array('desc' => _ATTR_SHADOWWARNING, 'type' => 'text'),
-        'shadowInactive' => array('desc' => _ATTR_SHADOWINACTIVE, 'type' => 'text'),
-        'shadowExpire' => array('desc' => _ATTR_SHADOWEXPIRE, 'type' => 'text'),
-	'groupCn' => array('desc' => _ATTR_GROUPCN, 'type' => 'text'),
-	'groupDesc' => array('desc' => _ATTR_GROUPDESC, 'type' => 'text'),
-	'member' => array('desc' => _ATTR_MEMBER, 'type' => 'select'),
-    );
-
-
-    
-?>
diff --git a/mayor-orig/www/include/share/session/base.php b/mayor-orig/www/include/share/session/base.php
deleted file mode 100644
index 337c72df..00000000
--- a/mayor-orig/www/include/share/session/base.php
+++ /dev/null
@@ -1,173 +0,0 @@
-0) return $return;
-	else {
-    	    $return = array();
-	    if (is_array($AUTH[$toPolicy]['categories']))
-    		foreach ($AUTH[$toPolicy]['categories'] as $key => $category) {
-        	    if (memberOf($userAccount, $category, $toPolicy)) {
-			$return[] = $category;
-		    }
-		    if ($cacheable) _registerToCache('aCat',implode(';',$return),$toPolicy); // ha több csoport tagja is, ";"
-    		}
-    	    return $return;
-	}
-    }
-
-    function _queryCache($kulcs, $policy, $rType="indexed") {
-	$v = array(_SESSIONID,$kulcs,$policy);
-    	return db_query("SELECT `ertek` FROM `cache` WHERE sessionID='%s' AND dt>NOW() - INTERVAL 5 MINUTE AND `kulcs`='%s' AND policy='%s'", array('fv' => 'getAccountCategories', 'modul' => 'login', 'result' => $rType, 'values'=>$v));
-    }
-
-    function _registerToCache($kulcs,$ertek,$policy) {
-	$v = array(_SESSIONID,$policy,$kulcs,$ertek);
-    	db_query("REPLACE INTO `cache` (sessionID,policy,kulcs,ertek,dt) VALUES ('%s','%s','%s','%s',NOW())", array('fv' => 'cache', 'modul' => 'login', 'result' => 'indexed', 'values'=>$v));
-    }
-
-    function _maintainCache() {
-	$q = "DELETE FROM `cache` WHERE dt 'cache', 'modul' => 'login', 'result' => 'indexed', 'values'=>$v));
-    }
-
-    function _clearSessionCache($sessionID) {
-	$q = "DELETE FROM `cache` WHERE sessionID  IN ('%s','%s')";
-	$v = array(_SESSIONID,$sessionID);
-	db_query($q, array('debug'=>false,'fv' => 'cache', 'modul' => 'login', 'result' => 'indexed', 'values'=>$v));
-    }
-
-######################################################
-# getBackendAttrs - az adott policy backend-jéhez tartozó attribútumok - session modul
-######################################################
-
-    function getBackendAttrs($type = 'Account', $toPolicy = _POLICY) {
-
-	global $AUTH;
-	require_once('include/backend/'.$AUTH[$toPolicy]['backend'].'/session/base.php');
-
-        global $AUTH;
-	$attrArrayName = $AUTH[$toPolicy]['backend'].$type.'AttrDef';
-	global $$attrArrayName;
-	$backendAttrDef = $$attrArrayName;
-
-        // Válogassuk ki az olvasható attribútumokat
-	reset($backendAttrDef);
-        foreach ($backendAttrDef as $attr => $def) {
-
-            if (!isset($def['rights']) || $def['rights'] == '') {
-		$rigths = _DEFAULT_LDAP_RIGHTS; //LDAP???
-		$backendAttrDef[$attr]['rights'] = $rights;
-	    } else $rights = $def['rights'];
-
-            if ($rights[_ACCESS_AS] != '-') $attrList[] = $attr;
-
-        }
-	return array($attrList,$backendAttrDef);
-
-    }
-
-######################################################################
-# Utolsó bejelentkezés dátuma
-######################################################################
-
-    function getLastLoginDt($toPolicy, $userAccount=_USERACCOUNT, $lr = null) {
-	$q = "SELECT dt FROM loginLog WHERE policy='%s' AND userAccount='%s' AND flag=0 ORDER BY dt DESC LIMIT 1";
-	return db_query($q , array('fv' => 'getLastLoginDt', 'modul' => 'login', 'result' => 'value', 'values' => array($toPolicy,$userAccount)), $lr);
-    }
-
-######################################################################
-# Hibás bejelentkezések száma, a legutolsó sikeres bejelentkezés óta
-######################################################################
-
-    function getFailedLoginCount($toPolicy, $userAccount=_USERACCOUNT, $lr = null) {
-	if ($sinceDt == '') $sinceDt = getLastLoginDt($toPolicy, $userAccount, $lr);
-	$q = "SELECT COUNT(*) AS db FROM loginLog WHERE policy='%s' AND userAccount='%s' AND dt>'%s' AND flag>0";
-	return db_query($q , array('fv' => 'getFailedLoginCount', 'modul' => 'login', 'result' => 'value', 'values' => array($toPolicy, $userAccount, $sinceDt)), $lr);
-    }
-
-?>
diff --git a/mayor-orig/www/include/share/session/close.php b/mayor-orig/www/include/share/session/close.php
deleted file mode 100644
index 2c321ef0..00000000
--- a/mayor-orig/www/include/share/session/close.php
+++ /dev/null
@@ -1,98 +0,0 @@
- 0) {
-	    $q = "DELETE FROM session WHERE activity + INTERVAL "._SESSION_MAX_IDLE_TIME." HOUR < NOW()";
-	    return db_query($q, array('fv' => 'closeIdleSessions', 'modul' => 'login', 'result' => 'affected rows'));
-	} else {
-	    return true;
-	}
-    }
-
-##########################################################
-# Kitörli az összes adott session-höz tartozó bejegyzést (policy-től függetlenül).
-##########################################################
-
-    function closeSession($sessionID = '') {
-	// _SESSIONID csak validUser esetén van, de mi lehet, hogy másik policy-ből jöttünk!
-	if ($sessionID == '') $sessionID = $_REQUEST['sessionID'];
-	_clearSessionCache($sessionID);
-	unsetTokenCookies();
-	$q = "DELETE FROM session WHERE sessionID='%s'";
-	return db_query($q, array('fv' => 'closeSession', 'modul' => 'login', 'result' => 'affected rows', 'values' => array($sessionID)));
-    }
-
-##########################################################
-# Kitörli az összes adott userAccount/policy-hez tartozó bejegyzést( (esetleg több sessionID-t is).
-##########################################################
-
-    function closeUserSessions($userAccount = '', $policy = '') {
-	if ($userAccount == '') $userAccount = _USERACCOUNT;
-	if ($policy == '') $policy = _POLICY;
-	$q = "DELETE FROM session WHERE userAccount='%s' and policy='%s'";
-	return db_query($q, array('fv' => 'closeUserSessions', 'modul' => 'login', 'result' => 'affected rows', 'values' => array($userAccount, $policy)));
-    }
-
-##########################################################
-# Kitörli az összes "elavult" session-t.
-##########################################################
-
-    function closeOldSessions() {
-	if (defined('_SESSION_MAX_TIME') and _SESSION_MAX_TIME > 0) {
-	    $dt = date('Y-m-d H:i:s', mktime(date('H')-_SESSION_MAX_TIME,date('i'),date('s'),date('m'),date('d'),date('Y')));
-	    $q = "DELETE FROM session WHERE dt<'%s'";
-	    return db_query($q, array('fv' => 'closeOldSessions', 'modul' => 'login', 'result' => 'affected rows', 'values' => array($dt)));
-	}
-    }
-
-##########################################################
-# Kitörli az összes "elavult" és lejart session-t.
-##########################################################
-    function closeOldAndIdleSessions() {
-	if (
-	    (defined('SESSION_MAX_TIME') and _SESSION_MAX_TIME > 0)
-	    || (defined('_SESSION_MAX_IDLE_TIME') and _SESSION_MAX_IDLE_TIME > 0)
-	) {
-		
-	    $q = ''; $v = array();
-	    if (defined('_SESSION_MAX_TIME') and _SESSION_MAX_TIME > 0) {
-		$dt = date('Y-m-d H:i:s', mktime(date('H')-_SESSION_MAX_TIME,date('i'),date('s'),date('m'),date('d'),date('Y')));
-		$q = "DELETE FROM session WHERE dt<'%s'";
-		$v = array($dt);
-	    }
-	    if (defined('_SESSION_MAX_IDLE_TIME') and _SESSION_MAX_IDLE_TIME > 0) {
-		if ($q == '') $q = "DELETE FROM session WHERE activity + INTERVAL "._SESSION_MAX_IDLE_TIME." HOUR < NOW()";
-		else $q .= " OR activity + INTERVAL "._SESSION_MAX_IDLE_TIME." HOUR < NOW()";
-	    }
-	    if ($q == '') return true;
-	    else return db_query($q, array('fv' => 'closeOldAndIdleSessions', 'modul' => 'login', 'result' => 'affected rows', 'values' => $v));
-
-	} else {
-	    return true;
-	}
-
-    }
-
-##########################################################
-# Kitörli az összes session-t.
-##########################################################
-
-    function closeAllSession() {
-	return db_query("DELETE FROM session", array('fv' => 'closeAllSession', 'modul' => 'login', 'result' => 'affected rows'));
-    }
-
-?>
diff --git a/mayor-orig/www/include/share/ssl/ssl.php b/mayor-orig/www/include/share/ssl/ssl.php
deleted file mode 100644
index 61b6ca1b..00000000
--- a/mayor-orig/www/include/share/ssl/ssl.php
+++ /dev/null
@@ -1,461 +0,0 @@
-getResponse()
-
-    Küldés:
-	    __construct
-		getSSLKeyPair
-		_genSessionKey
-	    setRemoteNodeId
-		_setRemotePublicKey
-		    getSslPublicKeyByNodeId
-	    setRemoteHost (HOST, publicKey)
-		_setRemotePublicKey
-	    setRequestTarget (PSF)
-	    sendRequest
-		_prepareRequest
-		_encodeRequest($ADAT)
-		    AES::encrypt !! json, base64 - nincs AES :(
-		    _sessionKeyEncode
-		_curlGet --> response
-		_decodeRequest !! jelenleg csak json...
-		_sessionKeyDecode
-		json_decode - AES::decrypt
-*/
-
-    function getSslKeyPair() {
-	$q = "SELECT * FROM mayorSsl";
-	$r = db_query($q, array('fv'=>'getSslKeyPair','modul'=>'login','result'=>'record'));
-	if ($r=='') {
-		$SSLKeyPair = generateSSLKeyPair();
-		$secret = sha1(mt_rand(100000000000000,999999999999999));
-		$q = "INSERT INTO mayorSsl (privateKey,publicKey,secret) VALUES ('%s','%s','%s')";
-		$values = array($SSLKeyPair['privateKey'],$SSLKeyPair['publicKey'],$secret);
-		$r = db_query($q, array('fv'=>'getSslKeyPair','modul'=>'login', 'values'=>$values));
-		return $SSLKeyPair;
-	} else {
-	    return $r;
-	}
-    }
-
-    function generateSSLKeyPair() {
-        $SSL_KEY_PAIR=openssl_pkey_new();
-        // Get private key
-        openssl_pkey_export($SSL_KEY_PAIR, $privatekey);
-        // Get public key
-        $publickey=openssl_pkey_get_details($SSL_KEY_PAIR);                                                                                                                                                
-        $publickey=$publickey["key"];                                                                                                                                                                                               
-	return array('fv'=>'geneateSslKeyPair','privateKey'=>$privatekey,'publicKey'=>$publickey);                        
-    }
-    function setNodeId($nodeId, $publicKey) {
-	$q = "UPDATE mayorSsl SET nodeId=%u where publicKey='%s'";
-	$v = array($nodeId, $publicKey);
-	return db_query($q, array('debug'=>false,'fv'=>'setNodeId','modul'=>'login', 'values'=>$v));
-    }
-
-    function getSslPublicKey() {
-	$SSLKeyPair = getSslKeyPair();
-	return $SSLKeyPair['publicKey'];
-    }
-
-    function getSslPublicKeyByNodeId($nodeId) {
-	if (is_numeric($nodeId)) {
-	    $q = "SELECT publicKey FROM mayorKeychain WHERE valid=1 AND nodeId='%u'";
-	    $values = array($nodeId);
-	    $result = db_query($q, array('debug'=>false,'fv'=>'getSslPublicKeyByNodeId','modul'=>'login', 'values'=>$values,'result'=>'value'));
-	    if ($result=='') return false;
-	    else return $result;
-	} else {
-	    return false;
-	}
-    }
-
-    function getPublicDataFromLocalKeychain($nodeId) {
-	if (is_numeric($nodeId)) {
-	    // lekérdezés a helyi adatbázisból
-	    $q = "SELECT * FROM mayorKeychain WHERE valid=1 AND nodeId='%u'";
-	    $values = array($nodeId);
-	    $result = db_query($q, array('debug'=>false,'fv'=>'getPublicDataFromLocalKeychain','modul'=>'login', 'values'=>$values,'result'=>'record'));
-	    if ($result=='') return false;
-	    else return $result;
-	} elseif (is_null($nodeId)) {
-	    // Az összes eltárolt node adatának lekérdezése
-	    $q = "SELECT * FROM mayorKeychain WHERE valid=1 ORDER BY nodeTipus DESC, nev";
-	    $result = db_query($q, array('debug'=>false,'fv'=>'getPublicDataFromLocalKeychain','modul'=>'login','result'=>'indexed'));
-	    if ($result=='') return false;
-	    else return $result;	    
-	}
-    }
-
-    function addPublicDataToLocalKeychain($DATA) {
-	// egy új rekord felvétele...
-	$fields = array_keys($DATA);
-	$values = array_values($DATA);
-	$q = "INSERT INTO mayorKeychain (".implode(',', array_fill(0, count($fields), "%s")).") VALUES (".implode(',', array_fill(0, count($values), "'%s'")).")";
-	$v = array_merge($fields, $values);
-	$r = db_query($q, array('debug'=>false,'func'=>'addPublicDataToLocalKeychain','modul'=>'login','values'=>$v,'result'=>'insert'));
-	return $r;
-    }
-    function removeNodeFromLocalKeychain($nodeId) {
-	$q = "DELETE FROM mayorKeychain WHERE nodeId=%u";
-	$v = array($nodeId);
-	$r = db_query($q, array('debug'=>false,'func'=>'removeNodeFromLocalKeychain','modul'=>'login','values'=>$v));
-	return $r;	
-    }
-    function sendPublicRequest($data) {
-	if (defined('_DEVEL') && _DEVEL===true) $host = 'localhost';
-	else $host = 'www.mayor.hu';
-	$url = "https://$host/index.php?page=portal&sub=regisztracio&f=regisztracio&skin=ajax";
-	$salt_name='MS_'.sha1('portal_regisztracio_regisztracio');
-            $ch = curl_init();
-            curl_setopt($ch, CURLOPT_RETURNTRANSFER, true); // a választ feldolgozzuk
-            curl_setopt($ch, CURLOPT_URL, $url);
-            curl_setopt($ch, CURLOPT_SSL_VERIFYPEER, false);
-            curl_setopt($ch, CURLOPT_SSL_VERIFYSTATUS, false);
-            curl_setopt($ch, CURLOPT_SSL_VERIFYHOST, 2);
-            curl_setopt($ch, CURLOPT_SSL_VERIFYHOST, false); // a helyi gépen nekem ez kellett :(
-            curl_setopt($ch, CURLOPT_HEADER, 0);
-//          curl_setopt($ch, CURLOPT_TIMEOUT,60);
-            curl_setopt($ch, CURLOPT_USERAGENT, "MaYoR-registration (php; cURL)");
-            curl_setopt($ch, CURLOPT_VERBOSE, true);
-	    // Cookie
-	    curl_setopt($ch, CURLOPT_COOKIE, $salt_name.'=portal_regisztracio_regisztracio');
-            // POST
-            curl_setopt($ch, CURLOPT_POST, true);
-            curl_setopt($ch, CURLOPT_POSTFIELDS, http_build_query($data));
-         
-            $response = curl_exec($ch);
-            $INFO = curl_getinfo($ch); // ha kell
-            if ($INFO['http_code'] == 200) { // minden ok
-                //dump($INFO['url']);
-                //dump("response:",$response);
-            } else {
-                echo 'URL';
-                dump($INFO['http_code'],$response,$INFO);
-                throw new Exception($INFO['http_code']);
-            }
-            curl_close($ch);
-
-        return $response;
-    }
-    
-//function base64url_encode($data) { 
-//  return rtrim(strtr(base64_encode($data), '+/', '-_'), '='); 
-//} 
-//function base64url_decode($data) { 
-//  return base64_decode(str_pad(strtr($data, '-_', '+/'), strlen($data) % 4, '=', STR_PAD_RIGHT)); 
-//}
-function random_str($length, $keyspace = '0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ')
-{
-    $str = '';
-    $max = mb_strlen($keyspace, '8bit') - 1;
-    for ($i = 0; $i < $length; ++$i) {
-        $str .= $keyspace[random_int(0, $max)];
-    }
-    return $str;
-}
-    /* symmetric cryptographic module */
-    class AES {
-
-	public function __construct() { }
-	public function encrypt($data, $key) {
-	    $data = urlencode($data);
-
-//	    $return = $data;
-//	    $return = $key . $data;
-//	    $return = openssl_encrypt($data, 'aes-256-cbc', $key, OPENSSL_RAW_DATA);
-//	    $return = db_query("SELECT aes_encrypt('%s','%s')",array('fv'=>'class AES','result'=>'value','modul'=>'login','values'=>array($data,$key)));
-
-	    if (function_exists('mcrypt_encrypt')) {
-		$return = mcrypt_encrypt(MCRYPT_RIJNDAEL_128,$key,$data,MCRYPT_MODE_CBC,"\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0");
-	    } else {
-		$_SESSION['alert'][] = 'info:mcrypt függvény nem található (tipp! telepítsd a php5-mcrypt csomagot a szerverre)';
-	    }
-	    return base64_encode($return);
-	}
-	public function decrypt($data,$key) {
-	    $data = base64_decode($data);
-
-//	    $return = $data;
-//	    $return = substr($data,strlen($key));
-//	    $return = openssl_decrypt($data, 'aes-256-cbc', $key, OPENSSL_RAW_DATA);
-//	    $return = db_query("SELECT aes_decrypt('%s','%s')",array('fv'=>'class AES','result'=>'value','modul'=>'login','values'=>array($data,$key)));
-	    if (function_exists('mcrypt_decrypt')) {
-		$return = mcrypt_decrypt(MCRYPT_RIJNDAEL_128,$key,$data,MCRYPT_MODE_CBC,"\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0");
-	    } else {
-		$_SESSION['alert'][] = 'info:mcrypt függvény nem található (tipp! telepítsd a php5-mcrypt csomagot a szerverre)';
-	    }
-	    return trim(urldecode($return));
-	}
-    }
-
-    class Interconnect {
-
-	/*  A: küldő, B: fogadó használja  */
-
-	private $sessionKey;	// egy kommunikációhoz használt session kulcs
-	private $KP;		// a saját kulcspárom
-	private $nodeId;
-	private $privateKey;
-	private $publicKey;
-	private $remotePublicKey;
-	private $remoteNodeId;
-	private $remoteHost;
-	private $psf;
-	private $myRequest;		// a küldendő kérés (object)
-	private $myResponse;		// a küldendő válasz (object)
-	private $incomingRequest;	// a beérkező kérés (object)
-	private $incomingResponse;	// a beérkező válasz (object)
-	private $status;		// a művelet eredményességéek visszajelzése, hibaok kódja...
-	private $controllerNodeId = '09862967'; // Ez van jelenleg az adatbázisban...
-
-	/* Konstruktor */
-	public function __construct() {
-	    $this->sessionKey  = $this->_genSessionKey();
-	    $this->KP = getSSLKeyPair();
-	    $this->nodeId = $this->KP['nodeId'];
-	    $this->privateKey = $this->KP['privateKey'];
-	    $this->publicKey = $this->KP['publicKey'];
-	    $this->status = 'ok:created';
-	    $this->psf = 'page=rpc&f=rpc';
-	}
-	/* Privát metódusok */
-//        private function _yconv($get) {
-//            $get = str_replace(' ','+',$get);   // hm. erre miért van szükség??? autokonverzió?
-//            $get = str_replace('\/','/',$get);  // hm. erre miért van szükség??? autokonverzió?
-//            $get = str_replace('\\','',$get);  // hm. erre miért van szükség??? autokonverzió?\"'
-//            return $get;
-//        }
-	private function _curlGet($data) {
-	    $host = $this->remoteHost;
-	    $url = $this->remoteHost."/index.php?skin=rpc&".$this->psf;
-	    //dump('url',$url);
-	    $ch = curl_init();
-	    curl_setopt($ch, CURLOPT_RETURNTRANSFER, true); // a választ feldolgozzuk
-	    curl_setopt($ch, CURLOPT_URL, $url);
-	    curl_setopt($ch, CURLOPT_SSL_VERIFYPEER, false);
-	    curl_setopt($ch, CURLOPT_SSL_VERIFYSTATUS, false);
-	    curl_setopt($ch, CURLOPT_SSL_VERIFYHOST, 2);
-	    curl_setopt($ch, CURLOPT_SSL_VERIFYHOST, false); // a helyi gépen nekem ez kellett :(
-	    curl_setopt($ch, CURLOPT_HEADER, 0); 
-//	    curl_setopt($ch, CURLOPT_TIMEOUT,60);
-	    curl_setopt($ch, CURLOPT_USERAGENT, "MaYoR-interconnect (php; cURL)");
-	    curl_setopt($ch, CURLOPT_VERBOSE, true);
-	    // POST
-	    $data['senderNodeId'] = $this->nodeId;
-	    curl_setopt($ch, CURLOPT_POST, true);
-	    curl_setopt($ch, CURLOPT_POSTFIELDS, http_build_query($data));
-
-	    $response = curl_exec($ch);
-	    $INFO = curl_getinfo($ch); // ha kell
-	    if ($INFO['http_code'] == 200) { // minden ok
-		//dump($INFO['url']);
-		//dump($response);
-	    } else {
-		echo 'URL';
-		dump($response,$INFO);
-		throw new Exception($INFO['http_code']);
-	    }
-	    curl_close($ch);
-	    return $response;
-	}
-	private function _genSessionKey() {
-	    return base64_encode(pack('N6', mt_rand(), mt_rand(), mt_rand(),mt_rand(), mt_rand(), mt_rand()));
-	    //return random_str( 32 );
-	}
-	private function _sessionKeyEncode() {
-	    $crypttext = '';
-	    $res = openssl_public_encrypt($this->sessionKey, $crypttext, $this->remotePublicKey); // majd a távoli publikus kulccal
-    	    return base64_encode($crypttext);
-	}
-	private function _sessionKeyDecode($in) {
-	    $decodedtext = '';
-    	    $res = openssl_private_decrypt(base64_decode($in), $decodedtext, $this->privateKey); // a saját privát kulccsal
-    	    return $decodedtext;
-	}
-	private function _genHash($in) {
-	    // hash generálás
-	    return hash('sha256', $in, false);
-	}
-	private function _hashEncode($in) {
-	    // a mi privát kulcsunkkal...
-    	    $res = openssl_private_encrypt($in, $encodedHash, $this->privateKey); // a saját privát kulccsal
-    	    return base64_encode($encodedHash);
-	}
-	private function _hashDecode($in) {
-	    // a remotePublic-kal
-	    $res = openssl_public_decrypt(base64_decode($in), $decodedHash, $this->remotePublicKey); // majd a távoli publikus kulccal
-    	    return $decodedHash;
-	}
-	private function _verifyHash($PACKED) {
-	    return ($this->_genHash($PACKED['details']))===($this->_hashDecode($PACKED['hashEncoded']));
-	}
-	private function _packData($DATA) { // --> array(details|sessionKeyEncoded)
-	    $ADAT['details'] = AES::encrypt(json_encode($DATA),$this->sessionKey); // implicit base64_encode
-	    $ADAT['hashEncoded'] = $this->_hashEncode($this->_genHash($ADAT['details'])); 
-	    $ADAT['sessionKeyEncoded'] = $this->_sessionKeyEncode(); // implicit base64_encode
-	    $ADAT['status'] = $this->status;
-	    return $ADAT;
-	}
-	private function _unpackData($PACKED) { // packed[details] --> object !! feltesszük, hogy már be van állítva a sessionKey, ellenőrizve van a hash!
-	    return json_decode(AES::decrypt($PACKED['details'],$this->sessionKey), true);
-	}
-	private function _encodeRequest($IN = array()) { // HTTP GET paraméter
-	    return urlencode(json_encode($IN)); 
-	}
-	private function _decodeRequest($IN) { // HTTP GET paraméter
-	    return json_decode($IN, true);
-	}
-	private function _encodeResponse($IN=array()) { // HTTP - tartalom
-	    return json_encode($IN);
-	}
-	private function _decodeResponse($IN=array()) { // HTTP - tartalom
-	    return json_decode($IN, true);
-	}
-	/* Publikus metódusok */
-	public function setRequestTarget($target) {
-	    if ($target == 'controller') $this->psf='page=rpc&sub=controller&f=rpc';
-	    else if ($target == 'naplo') $this->psf='page=rpc&sub=naplo&f=rpc';
-	    else $this->psf='page=rpc&f=rpc'; // alap funkciók
-	}
-	public function getRegistrationDataByNodeId($nodeId) { // feltesszük, hogy valid
-	    $origRemoteNodeId = $this->remoteNodeId;
-	    $this->setRemoteHostByNodeId($this->controllerNodeId);
-	    $ret = $this->sendRequest(array('func'=>'getPublicDataByNodeId', 'nodeId'=>$nodeId));
-	    $this->setRemoteHostByNodeId($origRemoteNodeId);
-
-	    return $ret;
-	}
-	public function getPublicDataByNodeId($nodeId) {
-	    if (defined('_DEVEL') && _DEVEL===true) {
-		// A helyi gép adatait adjuk meg
-		$ret = array('nodeId'=>$this->nodeId, 'url'=>'https://localhost','publicKey'=>$this->publicKey);
-	    } else {
-		if ($nodeId == '') $nodeId = $this->controllerNodeId;
-		// Adott nodeId adatainak lekérdezése a helyi adatbázisból
-		$ret = getPublicDataFromLocalKeychain($nodeId);
-		if ($ret === false) {
-		    $RPC = new Interconnect();
-		    $RPC->setRequestTarget('controller');
-		    $RPC->setRemoteHostByNodeId($this->controllerNodeId);
-		    $ret2 = $RPC->sendRequest(array('func'=>'getPublicDataByNodeId', 'nodeId'=>$nodeId));
-		    $ret = $ret2['nodeData'];
-		    foreach (array(
-			'regId','dij','utemezes','egyebTamogatas','szamlazasiCim','szamlaHelyseg','szamlaIrsz','szamlaKozteruletNev',
-			'szamlaKozteruletJelleg','szamlaHazszam'
-		    ) as $field) {
-			unset($ret[$field]);
-		    }
-		    if (is_array($ret)) addPublicDataToLocalKeychain($ret);
-/*
-		} elseif (false) {
-		    // Adott nodeId adatainak lekérdezése a www.mayor.hu-tól (controller) Interconnect-tel
-		    $origRemoteNodeId = $this->remoteNodeId;
-		    $origPsf = $this->psf;
-		    $this->setRequestTarget('controller');
-		    $this->setRemoteHostByNodeId($this->controllerNodeId);
-		    $ret2 = $this->sendRequest(array('func'=>'getPublicDataByNodeId', 'nodeId'=>$nodeId));
-		    $ret = $ret2['nodeData'];
-		    foreach (array(
-			'regId','dij','utemezes','egyebTamogatas','szamlazasiCim','szamlaHelyseg','szamlaIrsz','szamlaKozteruletNev',
-			'szamlaKozteruletJelleg','szamlaHazszam'
-		    ) as $field) {
-			unset($ret[$field]);
-		    }
-		    if (is_array($ret)) addPublicDataToLocalKeychain($ret);
-		    if ($origRemoteNodeId!='') $this->setRemoteHostByNodeId($origRemoteNodeId);		    
-		    $this->psf = $origPsf;
-*/
-		}
-	    }
-	    return $ret;
-    	}
-	public function setRemoteHostByNodeId($nodeId) {
-	    $rData = $this->getPublicDataByNodeId($nodeId);
-	    if (is_array($rData)) {
-		$this->remoteHost = $rData['url'];
-		$this->remoteNodeId = $rData['nodeId'];
-		$this->remotePublicKey = $rData['publicKey'];
-		$this->status = 'ok:remoteHost';
-	    } else {
-		$this->remoteHost = ''; // controller
-		$this->remoteNodeId = $this->controllerNodeId;
-		$this->remotePublicKey = $rData['publicKey'];
-		$this->status = 'ok:remoteHostController';
-	    }
-	}
-	/* A oldal */
-	public function sendRequest($ADAT = array()) {
-	    $PACKED = $this->_packData($ADAT);
-	    $this->myRequest = $PACKED;
-	    // $this->myRequest = $this->_encodeRequest($PACKED);
-
-	    $response = $this->_curlGet($this->myRequest);
-
-	    $decodedResponse = $this->_decodeResponse($response);
-	    if ($this->sessionKey === $this->_sessionKeyDecode($decodedResponse['sessionKeyEncoded'])) {
-		if ($this->_verifyHash($decodedResponse)) {
-		    $this->incomingResponse = $this->_unpackData($decodedResponse);
-		    $this->status = 'ok:success response';
-		} else {
-		    $this->incomingResponse = false;
-		    $this->status = 'error:wrong response hash';
-		}
-	    } else {
-		$this->status = 'error:wrong response sessionKey ('.($this->sessionKey).' != '.($this->_sessionKeyDecode($decodedResponse['sessionKeyEncoded'])).') response: '.$response;
-		$this->incomingResponse = false;
-	    }
-	    return $this->incomingResponse;
-	}
-	/* B oldal! */
-	public function processRequest() { 	// rights.php
-	    $PACKED = $_POST;
-	    $this->sessionKey = $this->_sessionKeyDecode($PACKED['sessionKeyEncoded']);
-	    if ($this->_verifyHash($PACKED)) {
-		$this->incomingRequest = $this->_unpackData($PACKED);
-openlog("MaYoR", LOG_PID | LOG_PERROR, LOG_LOCAL0);
-syslog(LOG_WARNING, "Data unpacked: ".(json_encode($this->incomingRequest))." {$_SERVER['REMOTE_ADDR']} ({$_SERVER['HTTP_USER_AGENT']})");
-closelog();
-		$this->status = 'ok:success request';
-	    } else {
-		$this->incomingRequest = false;
-		$this->status = 'error:wrong request hash';		
-	    }
-	    return $this->incomingRequest;
-	}
-	public function setResponse($DATA) { // ez kell a pre-be
-	    $this->myResponse = $this->_encodeResponse($this->_packData($DATA));
-	}
-	public function sendResponse() { // skin=rpc - csak ki kell írnunk az elküldendő adatsort - ezt a skin csinálja
-	    echo $this->myResponse;
-	}
-	public function getIncomingRequest() { return $this->incomingRequest; } // a pre-ben
-
-	public function getPublicKey() { return $this->publicKey; }
-	public function getSessionKey() { return $this->sessionKey; }
-	public function getStatus() { return $this->status; }
-	public function getRemoteNodeId() { return $this->remoteNodeId; }
-	public function getControllerNodeId() { return $this->controllerNodeId; }
-	public function getNodeId() { return $this->nodeId; }
-    }
-
-
-?>
diff --git a/mayor-orig/www/include/share/str/hyphen.php b/mayor-orig/www/include/share/str/hyphen.php
deleted file mode 100644
index 0973e4d9..00000000
--- a/mayor-orig/www/include/share/str/hyphen.php
+++ /dev/null
@@ -1,104 +0,0 @@
- mb_convert_encoding('ű', 'ISO-8859-2', 'UTF-8'),
-	    mb_convert_encoding('Ž', 'ISO-8859-2', 'UTF-8') => mb_convert_encoding('ő', 'ISO-8859-2', 'UTF-8'));
-
-	if (file_exists($this->patternFilePath)) {
-	    $fp = fopen($this->patternFilePath, 'r');
-	    while ($aLine = fgets($fp, 128)) {
-		// deprecated // if (!ereg('[\\%{}]', $aLine)) {
-		if (!preg_match('#[\\%{}]#', $aLine)) {
-		    // Cork --> ISO-8859-2 kódolás
-		    $aLine = strtr($aLine, $mbConv);
-		    $letter = false;
-		    $key = $value = '';
-		    $aLine = chop($aLine);
-		    for ($i = 0; $i < strlen($aLine); $i++) {
-			// deprecated // if (ereg('[0-9]',$aLine[$i])) {
-			if (preg_match('#[0-9]#',$aLine[$i])) {
-			    $value .= $aLine[$i];
-			    $letter = false;
-			} else {
-			    if ($letter) $value .= '0';
-			    $key .= $aLine[$i];
-			    $letter = true;
-			} 
-		    }
-		    if ($letter) $value .= '0';
-		    if (!is_array($Patterns[strlen($key)])) $Patterns[strlen($key)] = array();
-		    $Patterns[strlen($key)][$key] = $value;
-		    $patterns++;
-		} else {
-		    //if (ereg('\\message\{(.*)\}', $aLine, $reg)) echo $reg[1]."\n";
-		}
-	    }
-	} else { $GLOBALS['alert'][] = 'message:file_not_found:'.($this->patternFilePath); }
-	for ($i = 0; $i < count($Patterns); $i++) {
-	    if (!is_array($Patterns[$i])) $Patterns[$i] = array();
-	}
-	$this->Patterns = $Patterns;
-    }
-    function getPattern($key, $value) {
-	$pattern = '';
-	if (strlen($value) > strlen($key)) { $pattern = $value[0]; $value = substr($value, 1); }
-	for ($i = 0; $i < strlen($key); $i++) {
-	    $pattern .= $key[$i];
-	    if (isset($value[$i])) $pattern .= $value[$i];
-	}
-	$pattern = str_replace('0','',$pattern);
-	return $pattern;
-    }
-    public function hyphen($word) {
-	$word = mb_convert_encoding($word, 'ISO-8859-2', 'UTF-8');
-	if (strlen($word) > 1) {
-
-	    $key = '.'.$word.'.';
-	    $value = str_repeat('0', strlen($key));
-	    $key = strtr($key, mb_convert_encoding('A-ZÁÄÉÍÓÖŐÚÜŰ', 'ISO-8859-2', 'UTF-8'), mb_convert_encoding('a-záäéíóöőúüű', 'ISO-8859-2', 'UTF-8'));
-    	    $pattern = '';
-	    for ($i = 1; $i <= strlen($key); $i++) {
-		for ($j = 0; $j <= strlen($key)-$i; $j++) {
-		    if (is_array($this->Patterns[$i]) && ($pattern = $this->Patterns[$i][ substr($key, $j, $i) ])) {
-        		for ($k = 0; $k < strlen($pattern); $k++) {
-			    if ($value[$j + $i - strlen($pattern) + $k] < $pattern[$k])
-                		$value[$j + $i - strlen($pattern) + $k] = $pattern[$k];
-        		}
-		    }
-		}
-	    }
-	    $hyphenated = '';
-	    for ($i = 0; $i <= strlen($word)-2; $i++) {
-		$hyphenated .= $word[$i];
-		// deprecated // if (ereg('[13579]', $value[$i+1])) $hyphenated .= '-';
-		if (preg_match('#[13579]#', $value[$i+1])) $hyphenated .= '-';
-	    }
-	    $hyphenated .= substr($word, -1);
-	} else {
-	    $hyphenated = $word;
-	}
-	return mb_convert_encoding($hyphenated, 'UTF-8', 'ISO-8859-2');
-    }
-}
-
-$huHyphen = new huHyphen();
-//while gets
-//  break if $_=="\n"
-//  test.hyphen($_.strip)
-//end
-
-//$test->hyphen(trim('állomásfőnök'));
-//$test->hyphen(trim('álamigazgatás'));
-//$test->hyphen(trim('informatika alapismeretek, programozás'));
-
-?>
diff --git a/mayor-orig/www/include/share/str/tex.php b/mayor-orig/www/include/share/str/tex.php
deleted file mode 100644
index 76cf5117..00000000
--- a/mayor-orig/www/include/share/str/tex.php
+++ /dev/null
@@ -1,51 +0,0 @@
- "'", ## ezt kell kiszedni 2.0-ban
-                        '+' => '$+$',
-                        '/' => '$/$',
-                        '*' => '$*$',
-                        '=' => '$=$',
-                        '<' => '$<$',
-                        '>' => '$>$',
-                        '{' => '$\{$',
-                        '}' => '$\}$',
-                        '#' => '\#',
-                        '%' => '\%',
-                        '_' => '\_',
-                        '&' => '\&',
-                        '~' => ' ',
-			'…' => '...',
-			'´' => '\'',
-                        '^' => '(exp)',
-//                        '~' => '\~\ ',
-//                        '$' => '\$',
-//                        "\\" => '$\backslash$'
-                );
-	if (__NYOMTATAS_XETEX) {
-    	    $trans['^'] = '\^\ ';
-	}
-        return strtr(strtr($szoveg, array('$' => '\$', "\\" => '$\backslash$')), $trans);
-    }
-
-    function LaTeXSpecialChars($szoveg) {
-        $trans = array(
-                        '_' => '\_',
-			'#' => '\#',
-			'$' => '\$',
-			'%' => '\%',
-			'&' => '\&',
-			'~' => '\verb|~|',
-			'^' => '\verb|^|',
-			'{' => '\{',
-			'}' => '\}',
-			'\\' => '$\backslash$',
-// 0160 => 0032, // valami' spéci szóköz --> sima szóköz
-                );
-        return strtr($szoveg,$trans);
-    }
-
-
-
-?>
-- 
cgit v1.2.3